Update Webalizer to 2.20.3.

Pkgsrc changes:
 * Change HOMEPAGE to redirected one.
 * Add DESTDIR support (should be since 2.20.1)
 * Change to use --sysconfdir (should be since 2.20.1)
 * Add bzip2 support.
 * GeoIP support was added since 2.20.1, no need extra pach files anymore.
   Fixes PR 40344.
 * Changed to use db4 APIs since 2.20.1, dns support back again.
 * gettext and freetype2 are not used directly, remove dependency.
 * zlib is used directly, add dependency.
 * Honor PKGMANDIR.
 * Change complex PLIST handlings for docs to simply.
 * Change not to use prefix '_' in package specific variables.

Upstream changes:
 This fixes a missing memory dealocation call in the DNS lookup code, a kludge
 to handle largefile support in the current zlib compression code on some
 platforms, and some minor configure script corrections.

4 files changed, 40 insertions, 60 deletions

diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 160f8fb69a8..90dd494be7b 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -1,35 +1,32 @@
-# $NetBSD: Makefile,v 1.44 2008/12/01 09:45:55 tonnerre Exp $
+# $NetBSD: Makefile,v 1.45 2009/01/09 13:17:04 obache Exp $
 #
 
-DISTNAME=	webalizer-2.20-01-src
-PKGNAME=	webalizer-2.20.1
+DISTNAME=	webalizer-2.20-03-src
+PKGNAME=	webalizer-2.20.3
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
 		http://gd.tuwien.ac.at/infosys/logeval/webalizer/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.mrunix.net/webalizer/
+HOMEPAGE=	http://www.webalizer.org/
 COMMENT=	Web server log file analysis program
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}/${DISTNAME:S/-src//}
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--enable-dns
-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
+DOC_SUBDIR=	share/doc/webalizer
+DOCDIR=		${PREFIX}/${DOC_SUBDIR}
+DOCFILES=	CHANGES Copyright DNS.README README README.FIRST
 
-PLIST_ADD=	${WRKSRC}/.PLIST_ADD
-PLIST_SRC=	${PKGDIR}/PLIST ${PLIST_ADD}
-
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/examples ${_DOC_SUBDIR}
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/examples ${DOC_SUBDIR}
 
 SUBST_CLASSES+=		webalizer
 SUBST_STAGE.webalizer=	post-build
@@ -37,44 +34,27 @@ 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
+PKG_SUPPORTED_OPTIONS=	bzip2 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}
+.if !empty(PKG_OPTIONS:Mbzip2)
+.  include "../../archivers/bzip2/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-bz2
+.endif # option bzip2
 
+.if !empty(PKG_OPTIONS:Mgeoip)
 .  include "../../net/GeoIP/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-geoip
+CONFIGURE_ARGS+=	--with-geodb=${BUILDLINK_PREFIX.GeoIP}/share/GeoIP
 .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};
+.for f in ${DOCFILES}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f}
+.endfor
 
-BDB_ACCEPTED=db1 db2
-.include "../../mk/bdb.buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
+BUILDLINK_TRANSFORM+=	l:db:db4
+.include "../../databases/db4/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/webalizer/PLIST b/www/webalizer/PLIST
index 6c97ec633bb..7269dda6fe5 100644
--- a/www/webalizer/PLIST
+++ b/www/webalizer/PLIST
@@ -1,8 +1,14 @@
-@comment $NetBSD: PLIST,v 1.3 2008/12/01 09:45:55 tonnerre Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/01/09 13:17:04 obache Exp $
 bin/wcmgr
 bin/webalizer
 bin/webazolver
 man/man1/wcmgr.1
 man/man1/webalizer.1
 man/man1/webazolver.1
+share/doc/webalizer/CHANGES
+share/doc/webalizer/Copyright
+share/doc/webalizer/DNS.README
+share/doc/webalizer/README
+share/doc/webalizer/README.FIRST
 share/examples/webalizer.conf.sample
+@dirrm share/doc/webalizer
diff --git a/www/webalizer/distinfo b/www/webalizer/distinfo
index 1d226e88689..b4160775e60 100644
--- a/www/webalizer/distinfo
+++ b/www/webalizer/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2008/12/01 09:45:55 tonnerre Exp $
+$NetBSD: distinfo,v 1.13 2009/01/09 13:17:04 obache Exp $
 
-SHA1 (webalizer-2.20-01-src.tar.bz2) = f8b646b4e097e4c2784377648602e315f23e8a70
-RMD160 (webalizer-2.20-01-src.tar.bz2) = fab671a54d8e2c3d8b4d310264f6f77bc0baa558
-Size (webalizer-2.20-01-src.tar.bz2) = 302017 bytes
+SHA1 (webalizer-2.20-03-src.tar.bz2) = 693bab5eaad705d998802d7c908422014dc2888b
+RMD160 (webalizer-2.20-03-src.tar.bz2) = 790d52ddbac5e0912d2eb0c36b6f13bc272793f8
+Size (webalizer-2.20-03-src.tar.bz2) = 304868 bytes
 SHA1 (patch-ac) = f4885b334b3adb3f8523f959a89e6fe5f7f3b52f
-SHA1 (patch-ad) = fea9708c791e436345cf90a5f36c003dd1b936cd
+SHA1 (patch-ad) = 09e9ca7fd61b0ad13306e98a644f362a932fcf3b
 SHA1 (patch-ae) = ea0c444408cef1be4e69b837170bbbe9a7a5150e
diff --git a/www/webalizer/patches/patch-ad b/www/webalizer/patches/patch-ad
index 23153864328..40658563df9 100644
--- a/www/webalizer/patches/patch-ad
+++ b/www/webalizer/patches/patch-ad
@@ -1,22 +1,16 @@
-$NetBSD: patch-ad,v 1.9 2008/12/01 09:45:55 tonnerre Exp $
+$NetBSD: patch-ad,v 1.10 2009/01/09 13:17:04 obache Exp $
 
---- Makefile.in.orig	2008-07-01 00:04:39.000000000 +0200
+--- Makefile.in.orig	2008-06-30 22:04:39.000000000 +0000
 +++ Makefile.in
-@@ -21,12 +21,12 @@ exec_prefix     = @exec_prefix@
+@@ -21,7 +21,7 @@ exec_prefix     = @exec_prefix@
  datadir         = @datarootdir@
  
  BINDIR          = @bindir@
 -MANDIR          = ${datadir}/man/man1
-+MANDIR          = ${prefix}/man/man1
++MANDIR          = @mandir@/man1
  ETCDIR          = @sysconfdir@
  GEODB           = @GEODB_LOC@
  CC              = @CC@
- CFLAGS          = @CFLAGS@ @CPPFLAGS@
--LIBS            = @LIBS@
-+LIBS            = @LIBS@ -lpng -ljpeg -lz -lfreetype -lintl
- WCMGR_LIBS      = @WCMGR_LIBS@
- DEFS            = -DETCDIR=\"${ETCDIR}\" -DGEODB_LOC=\"${GEODB}\" @DEFS@ @OPTS@
- LDFLAGS         = @LDFLAGS@
 @@ -102,7 +102,7 @@ install: all
  	$(INSTALL_DATA) wcmgr.1 ${DESTDIR}${MANDIR}/wcmgr.1
  	rm -f ${DESTDIR}${MANDIR}/webazolver.1