Copyright update; geoip library fix

4 files changed, 28 insertions, 18 deletions

diff --git a/app-admin/webalizer/ChangeLog b/app-admin/webalizer/ChangeLog
index 5fc07842b8d7..b6aa16a25e3b 100644
--- a/app-admin/webalizer/ChangeLog
+++ b/app-admin/webalizer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/webalizer
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.27 2004/07/06 23:17:12 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.28 2004/07/09 10:53:36 satya Exp $
+
+  09 Jul 2004; Christian Andreetta <satya@gentoo.org>
+  webalizer-2.01.10-r4.ebuild, webalizer-2.01.10-r5.ebuild:
+  Copyright update; geoip library fix
 
   07 Jul 2004; Anders Rune Jensen <arj@gentoo.org> webalizer-2.01.10-r5.ebuild,
   webalizer-2.01.10-r5.ebuild:
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index 69693b3b7112..112cf3a379fe 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -1,9 +1,9 @@
+MD5 8a6cabf4e962d7e3e3ea006bb49d6918 webalizer-2.01.10-r5.ebuild 2441
+MD5 57fbddb95ca254c42ae7d65e0e8ce8a3 webalizer-2.01.10-r4.ebuild 1951
 MD5 befab9531fb7ce3ecc713758874d551b ChangeLog 3639
 MD5 aa1e0b2898261e1a69ca61b5afbf0c6d metadata.xml 431
-MD5 9786083b9f1a8bf3626a2050bc43c5aa webalizer-2.01.10-r4.ebuild 2053
-MD5 ce53b55044833915cf0f8a1243f7ba68 webalizer-2.01.10-r5.ebuild 2478
+MD5 05805530b2e87a3d55e0056a45e330f5 files/output.c.patch 8088
 MD5 99b845afaf9f7417f82f508992e4a5ab files/digest-webalizer-2.01.10-r4 74
 MD5 e1a2a43e4148a750fc8ef91e0af3ba99 files/digest-webalizer-2.01.10-r5 157
-MD5 05805530b2e87a3d55e0056a45e330f5 files/output.c.patch 8088
 MD5 bb80d72389a599d8f2aabaa609407a4a files/2.01.10/apache.webalizer 333
 MD5 43ba0f621ebb8fd776052f4ef30f20d5 files/2.01.10/webalizer.conf 23910
diff --git a/app-admin/webalizer/webalizer-2.01.10-r4.ebuild b/app-admin/webalizer/webalizer-2.01.10-r4.ebuild
index a9b46bfcdb48..41877d93d9a4 100644
--- a/app-admin/webalizer/webalizer-2.01.10-r4.ebuild
+++ b/app-admin/webalizer/webalizer-2.01.10-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r4.ebuild,v 1.13 2004/06/30 17:08:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r4.ebuild,v 1.14 2004/07/09 10:53:36 satya Exp $
 
 MY_P=${P/.10/-10}
 S=${WORKDIR}/${MY_P}
diff --git a/app-admin/webalizer/webalizer-2.01.10-r5.ebuild b/app-admin/webalizer/webalizer-2.01.10-r5.ebuild
index 394140ba901f..f92319b497be 100644
--- a/app-admin/webalizer/webalizer-2.01.10-r5.ebuild
+++ b/app-admin/webalizer/webalizer-2.01.10-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r5.ebuild,v 1.9 2004/07/06 23:17:12 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r5.ebuild,v 1.10 2004/07/09 10:53:36 satya Exp $
 
 inherit eutils
 
@@ -26,23 +26,29 @@ DEPEND="=sys-libs/db-1*
 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
+	#	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} && unpack geolizer_${MY_PV}-patch.20040216.tar.bz2 )
+	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
-
-	# pretty printer for numbers
-	epatch ${FILESDIR}/output.c.patch || die
 }
 
 src_compile() {
-	myconf="`use_enable geoip`"
-	econf ${myconf} --enable-dns --with-db=/usr/include/db1/ || die
+	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
 }