Subject: Re: Webalizer vs. libdb*
To: None <tech-pkg@NetBSD.org>
From: Martin Husemann <martin@duskware.de>
List: tech-pkg
Date: 11/12/2007 23:50:35
--ZPt4rx8FFjLCG7dd
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Wed, Nov 07, 2007 at 09:14:49PM +0100, Martin Husemann wrote:
> What is the correct way to solve this?

Thanks for all the input. I got it working by adding the attached patch
which makes configure find db2 too, and using bdb.b4.mk. I'm not sure I
got all the magic correct, so if someone could review and commit this,
that would be great.

I tested db3 and db4, but that did not work (and I didn't feel like
making more changes).

Martin

--ZPt4rx8FFjLCG7dd
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch

? patches/patch-af
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/webalizer/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- Makefile	22 Feb 2007 19:27:24 -0000	1.42
+++ Makefile	12 Nov 2007 22:43:40 -0000
@@ -73,6 +73,10 @@
 	done;
 	@${ECHO} "@dirrm ${_DOC_SUBDIR}" >> ${PLIST_ADD};
 
+USE_DB185=yes
+BDB_DEFAULT=db2
+BDB_ACCEPTED=db1 db2
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/webalizer/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo	23 Oct 2005 19:50:55 -0000	1.8
+++ distinfo	12 Nov 2007 22:43:40 -0000
@@ -1,11 +1,12 @@
 $NetBSD: distinfo,v 1.8 2005/10/23 19:50:55 heinz Exp $
 
-SHA1 (webalizer-2.01-10-src.tar.bz2) = fbf6ad78fc2b0189d065e661dc02a781e858b31a
-RMD160 (webalizer-2.01-10-src.tar.bz2) = 4605ff9bd8ec1c74680b8fbfe703f2e81ae68e20
-Size (webalizer-2.01-10-src.tar.bz2) = 252664 bytes
 SHA1 (geolizer_2.01-10-patch.20050520.tar.gz) = d297ff4ff42220e1aec648f1f1580111255c0366
 RMD160 (geolizer_2.01-10-patch.20050520.tar.gz) = 0a492c4268e4437569cf16ff2f5c88fdc04de0ca
 Size (geolizer_2.01-10-patch.20050520.tar.gz) = 39552 bytes
+SHA1 (webalizer-2.01-10-src.tar.bz2) = fbf6ad78fc2b0189d065e661dc02a781e858b31a
+RMD160 (webalizer-2.01-10-src.tar.bz2) = 4605ff9bd8ec1c74680b8fbfe703f2e81ae68e20
+Size (webalizer-2.01-10-src.tar.bz2) = 252664 bytes
 SHA1 (patch-ac) = f4885b334b3adb3f8523f959a89e6fe5f7f3b52f
 SHA1 (patch-ad) = 4ff72d4b620f64cec68bff826b84d183858c0da9
 SHA1 (patch-ae) = ea0c444408cef1be4e69b837170bbbe9a7a5150e
+SHA1 (patch-af) = 427cedafda37ecba81bd982f48a02749c87e80c5

--ZPt4rx8FFjLCG7dd
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch-af

--- configure.orig	2007-11-12 17:06:30.000000000 +0100
+++ configure	2007-11-12 17:07:14.000000000 +0100
@@ -1243,7 +1243,7 @@
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-test "$ac_cv_search_dbopen" = "no" && for i in db db1; do
+test "$ac_cv_search_dbopen" = "no" && for i in db db1 db2; do
 LIBS="-l$i  $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 1250 "configure"

--ZPt4rx8FFjLCG7dd--