fixed db1 problem for #65399, fixed gb-without-png-support problem for #65163

(Portage version: 2.0.51.22-r1)

7 files changed, 51 insertions, 130 deletions

diff --git a/app-admin/webalizer/ChangeLog b/app-admin/webalizer/ChangeLog
index 6882564f2486..2275f3e516b6 100644
--- a/app-admin/webalizer/ChangeLog
+++ b/app-admin/webalizer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/webalizer
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.35 2005/04/16 01:53:43 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.36 2005/07/07 00:26:22 smithj Exp $
+
+*webalizer-2.01.10-r9 (07 Jul 2005)
+
+  07 Jul 2005; Jonathan Smith <smithj@gentoo.org>
+  +files/webalizer-db4.patch, -webalizer-2.01.10-r6.ebuild,
+  -webalizer-2.01.10-r7.ebuild, +webalizer-2.01.10-r9.ebuild:
+  fixed db1 problem for #65399, fixed gb-without-png-support problem for #65163
 
 *webalizer-2.01.10-r8 (16 Apr 2005)
 
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index 079a8de8d933..cad29c5a9da6 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -1,26 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9c567af60ebde4c8c06cc6254ce012e7 webalizer-2.01.10-r7.ebuild 2483
-MD5 8583552359d0c1414cb52fa99fc5578c metadata.xml 284
 MD5 1cc4bd07d29a8799e4596ba6619b5236 ChangeLog 4646
-MD5 d74bed80f6183e16dcbd161ccde1ef3d webalizer-2.01.10-r5.ebuild 2553
-MD5 0ab2caabc1c6cbf6b9f4b8350587f931 webalizer-2.01.10-r6.ebuild 2735
+MD5 8583552359d0c1414cb52fa99fc5578c metadata.xml 284
+MD5 e4d9de412ff6d0395383898c8a15b695 webalizer-2.01.10-r9.ebuild 2981
 MD5 5833410c77eec8d9cff653e67949b5a6 webalizer-2.01.10-r4.ebuild 2056
+MD5 d74bed80f6183e16dcbd161ccde1ef3d webalizer-2.01.10-r5.ebuild 2553
 MD5 e07be0b4516c1e9044aa0c668866b570 webalizer-2.01.10-r8.ebuild 2486
 MD5 99b845afaf9f7417f82f508992e4a5ab files/digest-webalizer-2.01.10-r4 74
-MD5 e1a2a43e4148a750fc8ef91e0af3ba99 files/digest-webalizer-2.01.10-r7 157
-MD5 e1a2a43e4148a750fc8ef91e0af3ba99 files/digest-webalizer-2.01.10-r6 157
-MD5 e1a2a43e4148a750fc8ef91e0af3ba99 files/digest-webalizer-2.01.10-r8 157
 MD5 e1a2a43e4148a750fc8ef91e0af3ba99 files/digest-webalizer-2.01.10-r5 157
+MD5 e1a2a43e4148a750fc8ef91e0af3ba99 files/digest-webalizer-2.01.10-r8 157
 MD5 05805530b2e87a3d55e0056a45e330f5 files/output.c.patch 8088
+MD5 cc68675ea63960bbc80d15110e41bf74 files/webalizer-db4.patch 574
+MD5 e1a2a43e4148a750fc8ef91e0af3ba99 files/digest-webalizer-2.01.10-r9 157
+MD5 08dd05c168f790b0af0b1cb5c0fd8340 files/2.01.10/apache.webalizer 337
 MD5 173d3eb05975b2d41d2cfda193208f1a files/2.01.10/reconfig 131
 MD5 43ba0f621ebb8fd776052f4ef30f20d5 files/2.01.10/webalizer.conf 23910
-MD5 08dd05c168f790b0af0b1cb5c0fd8340 files/2.01.10/apache.webalizer 337
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCYHBQjUHll2nfF60RAkdWAJ9DVPW1BW4ObfKtFz8nh8hDUWCCCwCgvnl8
-64eeRdRsLngoJIjKWa6h3dw=
-=VxJU
------END PGP SIGNATURE-----
diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r7 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r7
deleted file mode 100644
index 1e08bbd23fa0..000000000000
--- a/app-admin/webalizer/files/digest-webalizer-2.01.10-r7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 26d0a3c142423678daed2d6f579525d8 webalizer-2.01-10-src.tar.bz2 252664
-MD5 fa2e960702c72a16707854537053a966 geolizer_2.01-10-patch.20040216.tar.bz2 27688
diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r6 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r9
index 1e08bbd23fa0..1e08bbd23fa0 100644
--- a/app-admin/webalizer/files/digest-webalizer-2.01.10-r6
+++ b/app-admin/webalizer/files/digest-webalizer-2.01.10-r9
diff --git a/app-admin/webalizer/files/webalizer-db4.patch b/app-admin/webalizer/files/webalizer-db4.patch
new file mode 100644
index 000000000000..6570c2ae8a4d
--- /dev/null
+++ b/app-admin/webalizer/files/webalizer-db4.patch
@@ -0,0 +1,11 @@
+--- configure.in        2000-10-06 09:51:49.000000000 +0200
++++ configure.in        2005-04-02 13:06:24.623616376 +0200
+@@ -71,7 +71,7 @@
+   if test "$HAVE_DB" = ""; then
+     AC_CHECK_FUNCS(dbopen)
+     if test $ac_cv_func_dbopen = no; then
+-      AC_SEARCH_LIBS(dbopen, db db1, OPTS="-DUSE_DNS ${OPTS}"; HAVE_DB="yes")
++      AC_SEARCH_LIBS(__db185_open_4001,db-4.1, OPTS="-DUSE_DNS ${OPTS}"; HAVE_DB="yes") 
+       if test "$HAVE_DB" = ""; then
+         AC_MSG_WARN(You must have a V1.85 compatable DB library!)
+         AC_MSG_WARN(DNS lookup code will be disabled...) 
diff --git a/app-admin/webalizer/webalizer-2.01.10-r6.ebuild b/app-admin/webalizer/webalizer-2.01.10-r6.ebuild
deleted file mode 100644
index 8b53cc2a8951..000000000000
--- a/app-admin/webalizer/webalizer-2.01.10-r6.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r6.ebuild,v 1.2 2005/01/01 11:35:04 eradicator Exp $
-
-# uses webapps to create directories with right permissions
-# probably slight overkil but works well
-inherit eutils webapp
-
-MY_PV=${PV/.10/-10}
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Webserver log file analyzer"
-HOMEPAGE="http://www.mrunix.net/webalizer/"
-SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
-	geoip? ( http://sysd.org/proj/geolizer_${MY_PV}-patch.20040216.tar.bz2 )"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ppc64"
-IUSE="apache2 geoip"
-
-DEPEND="=sys-libs/db-1*
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/libpng-1.2
-	>=media-libs/gd-1.8.3
-	geoip? ( dev-libs/geoip )"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	# fix --enable-dns; our db1 headers are in /usr/include/db1
-	#	mv dns_resolv.c dns_resolv.c.orig
-	#	sed -e 's%^\(#include \)\(<db.h>\)\(.*\)%\1<db1/db.h>\3%' \
-	#		dns_resolv.c.orig > dns_resolv.c
-	sed -i -e "s,db_185.h,db.h," configure
-
-	if use geoip; then
-		cd ${WORKDIR}
-		epatch ${WORKDIR}/geolizer_${MY_PV}-patch/geolizer.patch || die
-	else
-		# pretty printer for numbers
-		cd ${S} && epatch ${FILESDIR}/output.c.patch || die
-	fi
-}
-
-src_compile() {
-	if use geoip; then
-		myconf="`use_enable geoip`"
-	else
-		myconf="--enable-dns"
-	fi
-	myconf="${myconf} --with-db=/usr/include/db1/"
-	einfo "Configuration: ${myconf}"
-	econf ${myconf} || die
-	make || die
-}
-
-src_install() {
-	webapp_src_preinst
-
-	into /usr
-	dobin webalizer
-	dosym webalizer /usr/bin/webazolver
-	doman webalizer.1
-
-	insinto /etc
-	newins ${FILESDIR}/${PV}/webalizer.conf webalizer.conf
-
-	if use apache2; then
-		# patch for apache2
-		sed -i -e "s/apache/apache2/g" ${D}/etc/webalizer.conf
-		insinto /etc/apache2/conf
-	else
-		insinto /etc/apache/conf
-	fi
-
-	doins ${FILESDIR}/${PV}/webalizer.conf
-
-	use apache2 || insinto /etc/apache/conf/addon-modules
-	use apache2 || newins ${FILESDIR}/${PV}/apache.webalizer webalizer.conf
-
-	use apache2 && insinto /etc/apache2/conf/modules.d
-	use apache2 && newins ${FILESDIR}/${PV}/apache.webalizer 55_webalizer.conf
-
-	dodoc README* CHANGES Copyright sample.conf
-	webapp_hook_script ${FILESDIR}/${PV}/reconfig
-	webapp_src_install
-}
-
-pkg_postinst(){
-	if use apache2; then
-	einfo "to update your apache.conf just type"
-	einfo "echo \"Include  conf/addon-modules/webalizer.conf\" \
-		>> /etc/apache/conf/apache.conf"
-	fi
-	einfo
-	einfo "Just type webalizer to generate your stats."
-	einfo "You can also use cron to generate them e.g. every day."
-	einfo "They can be accessed via http://localhost/webalizer"
-	einfo
-	webapp_pkg_postinst
-}
diff --git a/app-admin/webalizer/webalizer-2.01.10-r7.ebuild b/app-admin/webalizer/webalizer-2.01.10-r9.ebuild
index 78c481881147..0ec5914a5283 100644
--- a/app-admin/webalizer/webalizer-2.01.10-r7.ebuild
+++ b/app-admin/webalizer/webalizer-2.01.10-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r7.ebuild,v 1.1 2005/03/01 16:15:25 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r9.ebuild,v 1.1 2005/07/07 00:26:22 smithj Exp $
 
 # uses webapps to create directories with right permissions
 # probably slight overkil but works well
@@ -18,12 +18,22 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ppc64"
 IUSE="apache2 geoip"
 
-DEPEND="=sys-libs/db-1*
+DEPEND="=sys-libs/db-4.1*
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/libpng-1.2
 	>=media-libs/gd-1.8.3
 	geoip? ( dev-libs/geoip )"
 
+pkg_setup() {
+	webapp_pkg_setup
+	# prevents "undefined reference" errors... see bug #65163
+	if ! built_with_use media-libs/gd png; then
+		ewarn "media-libs/gd must be built with png for this package"
+		ewarn "to function."
+		die "recompile gd with USE=\"png\""
+	fi
+}
+
 src_unpack() {
 	unpack ${A} ; cd ${S}
 	# fix --enable-dns; our db1 headers are in /usr/include/db1
@@ -39,18 +49,22 @@ src_unpack() {
 		# pretty printer for numbers
 		cd ${S} && epatch ${FILESDIR}/output.c.patch || die
 	fi
+
+	# this enables the package to use db4.1, fixing bug #65399
+	epatch ${FILESDIR}/${PN}-db4.patch
 }
 
 src_compile() {
+	local myconf
 	if use geoip; then
-		myconf="`use_enable geoip`"
+		myconf="--enable-geoip"
 	else
 		myconf="--enable-dns"
 	fi
-	myconf="${myconf} --with-db=/usr/include/db1/"
-	einfo "Configuration: ${myconf}"
-	econf ${myconf} || die
-	make || die
+	myconf="${myconf} --with-db=/usr/include/db4.1/"
+	autoconf # stupid broken configure file
+	econf ${myconf} || die "econf failed"
+	emake || die "make failed"
 }
 
 src_install() {
@@ -67,9 +81,9 @@ src_install() {
 	if use apache2; then
 		# patch for apache2
 		sed -i -e "s/apache/apache2/g" ${D}/etc/webalizer.conf
-		insinto /etc/apache2/conf
+		insinto ${APACHE2_CONFDIR}
 	else
-		insinto /etc/apache/conf
+		insinto ${APACHE1_CONFDIR}
 	fi
 
 	doins ${FILESDIR}/${PV}/webalizer.conf
@@ -88,6 +102,8 @@ src_install() {
 
 pkg_postinst(){
 	einfo
+	einfo "It is suggested that you restart apache before using webalizer"
+	einfo
 	einfo "Just type webalizer to generate your stats."
 	einfo "You can also use cron to generate them e.g. every day."
 	einfo "They can be accessed via http://localhost/webalizer"