Updated to version 2.1.10nb4.

Pkgsrc changes:
  - Fix of PR pkg/29201: Applied optional GeoIP patch proposed in the PR
    (option geoip).
  - Converted the post-build target to the "subst" framework.
  - Removed an unnecessary CONFIGURE_ENV (setting a variable internal to
    autoconf).
  - We install now some documentation files.

Description of GeoIP patch:
===========================
By default, Webalizer uses DNS suffix to guess country and produce geographic
stats. Some WWW hostings (mostly free ones) has reverse DNS feature disabled,
so there's no DNS, and consequently no geographic stats. Well, Webalizer *has*
internal Reverse DNS feature (aka "Webazolver"). But it's too slow, even
running 100 threads. So, is there any other way? Sure! It's GeoIP library!

GeoIP is a C library that enables the user to find the country that any
IP address or hostname originates from.  It uses a file based database
that is accurate as of March 2002.  This database simply contains IP blocks
as keys, and countries as values.  This database should be more complete and
accurate than using reverse DNS lookups.

2 files changed, 54 insertions, 13 deletions

diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index f1bd3e6e336..ce8ff0bc577 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.34 2005/04/11 21:48:02 tv Exp $
+# $NetBSD: Makefile,v 1.35 2005/10/23 19:50:55 heinz Exp $
 #
 
 DISTNAME=	webalizer-2.01-10-src
 PKGNAME=	webalizer-2.1.10
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
-		ftp://webalizer.dexa.org/pub/webalizer/ \
 		http://gd.tuwien.ac.at/infosys/logeval/webalizer/
 EXTRACT_SUFX=	.tar.bz2
 
@@ -25,18 +24,57 @@ CONFIGURE_ENV+=		ac_cv_GDLIB=${BUILDLINK_PREFIX.gd}/include
 
 EGDIR=		${PREFIX}/share/examples
 CONF_FILES=	${EGDIR}/webalizer.conf.sample ${PKG_SYSCONFDIR}/webalizer.conf
+_DOC_SUBDIR=	share/doc/webalizer
+_DOCDIR=	${PREFIX}/${_DOC_SUBDIR}
+_DOCFILES=	CHANGES Copyright DNS.README README README.FIRST
 
-INSTALLATION_DIRS=	bin man/man1 share/examples
+PLIST_ADD=	${WRKSRC}/.PLIST_ADD
+PLIST_SRC=	${PKGDIR}/PLIST ${PLIST_ADD}
+
+INSTALLATION_DIRS=	bin man/man1 share/examples ${_DOC_SUBDIR}
+
+SUBST_CLASSES+=		webalizer
+SUBST_STAGE.webalizer=	post-build
+SUBST_FILES.webalizer=	sample.conf webalizer.1
+SUBST_SED.webalizer=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.webalizer
+PKG_SUPPORTED_OPTIONS=  geoip
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgeoip)
+# we want the patch archive extracted...
+_GEOPATCH=		geolizer_2.01-10-patch
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=		${_GEOPATCH}.20050520.tar.gz
+
+# ... _and_ the patch applied automatically
+PATCHFILES=		${_GEOPATCH}.20050520.tar.gz
+PATCH_SITES=		http://sysd.org/proj/
+PATCH_DIST_CAT=		${GZCAT} $$patchfile | ${TAR} -Oxf - "geolizer*/geolizer.patch"
+PATCH_DIST_STRIP=	-p1
+CONFIGURE_ARGS+=	--enable-geoip
+
+_DOCFILES+=		GeoIP.README GeoIP.INSTALL
+
+post-extract:
+	cd ${WRKDIR}/${_GEOPATCH} &&			\
+		${MV} INSTALL ${WRKSRC}/GeoIP.INSTALL &&\
+		${MV} GeoIP.README ${WRKSRC}
+
+.  include "../../net/GeoIP/buildlink3.mk"
+.endif # option geoip
+
+post-install:
+	@${TEST} -r ${PLIST_ADD} && ${RM} ${PLIST_ADD} ; :
+	@cd ${WRKSRC};						\
+	for f in ${_DOCFILES}; do				\
+		${INSTALL_DATA} $$f ${_DOCDIR}/$$f;		\
+		${ECHO} "${_DOC_SUBDIR}/$$f" >> ${PLIST_ADD};	\
+	done;
+	@${ECHO} "@dirrm ${_DOC_SUBDIR}" >> ${PLIST_ADD};
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
-
-post-build:
-	cd ${WRKSRC}; for file in sample.conf webalizer.1; do		\
-		${SED}	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"	\
-			$${file} > $${file}.fixed;			\
-		${MV} -f ${WRKSRC}/$${file}.fixed ${WRKSRC}/$${file};	\
-	done
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/webalizer/distinfo b/www/webalizer/distinfo
index 18b078b1b3e..57cf3fda2fc 100644
--- a/www/webalizer/distinfo
+++ b/www/webalizer/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 14:08:40 wiz Exp $
+$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 (patch-ac) = f4885b334b3adb3f8523f959a89e6fe5f7f3b52f
 SHA1 (patch-ad) = 4ff72d4b620f64cec68bff826b84d183858c0da9
 SHA1 (patch-ae) = ea0c444408cef1be4e69b837170bbbe9a7a5150e