[patch] patch for webalizer-2.01.10-r11.ebuild

webalizer-r11.patch (text/plain), 1.25 KB, created by Sven on 2006-01-07 09:06:32 UTC

--- /usr/portage/app-admin/webalizer/webalizer-2.01.10-r11.ebuild	2006-01-06 21:57:01.000000000 +0100
+++ webalizer-2.01.10-r11.ebuild	2006-01-07 17:57:27.000000000 +0100
@@ -18,7 +18,7 @@
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ppc64"
 IUSE="apache2 geoip nls"
 
-DEPEND="=sys-libs/db-4.1*
+DEPEND="!geoip? ( =sys-libs/db-4.2* )
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/libpng-1.2
 	>=media-libs/gd-1.8.3
@@ -45,18 +45,11 @@
 src_unpack() {
 	unpack ${A} ; cd ${S}
 
-	sed -i -e "s,db_185.h,db.h," configure
-
-	# geoip patch messes up db4.1 patch, so both are dependent on geoip USE
-	# flag, even though both of the db patches do the _exact_ same thing
 	if use geoip; then
-		cd ${WORKDIR}
 		epatch ${WORKDIR}/geolizer_${MY_PV}-patch/geolizer.patch || die
-		cd ${S}
-		epatch ${FILESDIR}/${PN}-db4-with-geoip.patch || die
 	else
-		epatch ${FILESDIR}/${PN}-readability.patch || die
 		epatch ${FILESDIR}/${PN}-db4.patch || die
+		epatch ${FILESDIR}/${PN}-readability.patch || die
 	fi
 }
 
@@ -85,9 +78,8 @@
 	# stupid broken configuration file
 	autoconf
 
-	econf \
-		--with-db=/usr/include/db4.1/ \
-		${myconf} || die "econf failed"
+	# --with-db not needed, since db-ebuilds provide links
+	econf ${myconf} || die "econf failed"
 
 	emake || die "make failed"
 }