[pkgsrc/trunk]: pkgsrc/www/webalizer The pkg did not fully work on archs with...

[martin <martin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e1153d6fefb9
branches:  trunk
changeset: 535408:e1153d6fefb9
user:      martin <martin%pkgsrc.org@localhost>
date:      Fri Nov 16 11:50:48 2007 +0000

description:
The pkg did not fully work on archs with no db1 builtin, as discussed
on tech-pkg. Thanks to various people for all the input.

diffstat:

 www/webalizer/Makefile         |   6 ++++--
 www/webalizer/distinfo         |   6 ++----
 www/webalizer/patches/patch-af |  24 ++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 6 deletions(-)

diffs (69 lines):

diff -r ac77052bfb3e -r e1153d6fefb9 www/webalizer/Makefile
--- a/www/webalizer/Makefile    Fri Nov 16 11:50:45 2007 +0000
+++ b/www/webalizer/Makefile    Fri Nov 16 11:50:48 2007 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.42 2007/02/22 19:27:24 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2007/11/16 11:50:48 martin Exp $
 #
 
 DISTNAME=      webalizer-2.01-10-src
 PKGNAME=       webalizer-2.1.10
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    www
 MASTER_SITES=  ftp://ftp.mrunix.net/pub/webalizer/ \
                http://gd.tuwien.ac.at/infosys/logeval/webalizer/
@@ -73,6 +73,8 @@
        done;
        @${ECHO} "@dirrm ${_DOC_SUBDIR}" >> ${PLIST_ADD};
 
+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"
diff -r ac77052bfb3e -r e1153d6fefb9 www/webalizer/distinfo
--- a/www/webalizer/distinfo    Fri Nov 16 11:50:45 2007 +0000
+++ b/www/webalizer/distinfo    Fri Nov 16 11:50:48 2007 +0000
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.8 2005/10/23 19:50:55 heinz Exp $
+$NetBSD: distinfo,v 1.9 2007/11/16 11:50:49 martin 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 (patch-ac) = f4885b334b3adb3f8523f959a89e6fe5f7f3b52f
 SHA1 (patch-ad) = 4ff72d4b620f64cec68bff826b84d183858c0da9
 SHA1 (patch-ae) = ea0c444408cef1be4e69b837170bbbe9a7a5150e
+SHA1 (patch-af) = 48279fd556fefe939f3e19d1d1a3591ed8ec40a7
diff -r ac77052bfb3e -r e1153d6fefb9 www/webalizer/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/webalizer/patches/patch-af    Fri Nov 16 11:50:48 2007 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-af,v 1.1 2007/11/16 11:50:49 martin Exp $
+
+--- configure.orig     2007-11-16 11:46:40.000000000 +0100
++++ configure  2007-11-16 11:49:51.000000000 +0100
+@@ -1243,8 +1243,8 @@
+   cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest*
+-test "$ac_cv_search_dbopen" = "no" && for i in db db1; do
+-LIBS="-l$i  $ac_func_search_save_LIBS"
++if test "$ac_cv_search_dbopen" = "no"; then
++LIBS="${BDB_LIBS} $ac_func_search_save_LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 1250 "configure"
+ #include "confdefs.h"
+@@ -1266,7 +1266,7 @@
+   cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest*
+-done
++fi
+ LIBS="$ac_func_search_save_LIBS"
+ fi
+