Fri Jan 9 13:17:04 2009 UTC ()
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.


(obache)
diff -r1.44 -r1.45 pkgsrc/www/webalizer/Makefile
diff -r1.3 -r1.4 pkgsrc/www/webalizer/PLIST
diff -r1.12 -r1.13 pkgsrc/www/webalizer/distinfo
diff -r1.9 -r1.10 pkgsrc/www/webalizer/patches/patch-ad
cvs diff -r1.44 -r1.45 pkgsrc/www/webalizer/Makefile (expand / switch to unified diff)

--- pkgsrc/www/webalizer/Makefile 2008/12/01 09:45:55 1.44
+++ pkgsrc/www/webalizer/Makefile 2009/01/09 13:17:04 1.45
@@ -1,80 +1,60 @@ @@ -1,80 +1,60 @@
1# $NetBSD: Makefile,v 1.44 2008/12/01 09:45:55 tonnerre Exp $ 1# $NetBSD: Makefile,v 1.45 2009/01/09 13:17:04 obache Exp $
2# 2#
3 3
4DISTNAME= webalizer-2.20-01-src 4DISTNAME= webalizer-2.20-03-src
5PKGNAME= webalizer-2.20.1 5PKGNAME= webalizer-2.20.3
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/ \ 7MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/ \
8 http://gd.tuwien.ac.at/infosys/logeval/webalizer/ 8 http://gd.tuwien.ac.at/infosys/logeval/webalizer/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.mrunix.net/webalizer/ 12HOMEPAGE= http://www.webalizer.org/
13COMMENT= Web server log file analysis program 13COMMENT= Web server log file analysis program
14 14
15PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
 16PKG_DESTDIR_SUPPORT= user-destdir
16 17
17WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} 18WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
18GNU_CONFIGURE= YES 19GNU_CONFIGURE= YES
19CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR:Q} 20CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
20CONFIGURE_ARGS+= --enable-dns 21CONFIGURE_ARGS+= --enable-dns
21CONFIGURE_ENV+= ac_cv_GDLIB=${BUILDLINK_PREFIX.gd}/include 
22 22
23EGDIR= ${PREFIX}/share/examples 23EGDIR= ${PREFIX}/share/examples
24CONF_FILES= ${EGDIR}/webalizer.conf.sample ${PKG_SYSCONFDIR}/webalizer.conf 24CONF_FILES= ${EGDIR}/webalizer.conf.sample ${PKG_SYSCONFDIR}/webalizer.conf
25_DOC_SUBDIR= share/doc/webalizer 25DOC_SUBDIR= share/doc/webalizer
26_DOCDIR= ${PREFIX}/${_DOC_SUBDIR} 26DOCDIR= ${PREFIX}/${DOC_SUBDIR}
27_DOCFILES= CHANGES Copyright DNS.README README README.FIRST 27DOCFILES= CHANGES Copyright DNS.README README README.FIRST
28 28
29PLIST_ADD= ${WRKSRC}/.PLIST_ADD 29INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples ${DOC_SUBDIR}
30PLIST_SRC= ${PKGDIR}/PLIST ${PLIST_ADD} 
31 
32INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples ${_DOC_SUBDIR} 
33 30
34SUBST_CLASSES+= webalizer 31SUBST_CLASSES+= webalizer
35SUBST_STAGE.webalizer= post-build 32SUBST_STAGE.webalizer= post-build
36SUBST_FILES.webalizer= sample.conf webalizer.1 33SUBST_FILES.webalizer= sample.conf webalizer.1
37SUBST_SED.webalizer= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" 34SUBST_SED.webalizer= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
38 35
39PKG_OPTIONS_VAR= PKG_OPTIONS.webalizer 36PKG_OPTIONS_VAR= PKG_OPTIONS.webalizer
40PKG_SUPPORTED_OPTIONS= geoip 37PKG_SUPPORTED_OPTIONS= bzip2 geoip
41.include "../../mk/bsd.options.mk" 38.include "../../mk/bsd.options.mk"
42 39
43.if !empty(PKG_OPTIONS:Mgeoip) 40.if !empty(PKG_OPTIONS:Mbzip2)
44# we want the patch archive extracted... 41. include "../../archivers/bzip2/buildlink3.mk"
45_GEOPATCH= geolizer_2.01-10-patch 42CONFIGURE_ARGS+= --enable-bz2
46DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 43.endif # option bzip2
47DISTFILES+= ${_GEOPATCH}.20050520.tar.gz 
48 
49# ... _and_ the patch applied automatically 
50PATCHFILES= ${_GEOPATCH}.20050520.tar.gz 
51PATCH_SITES= http://sysd.org/proj/ 
52PATCH_DIST_CAT= ${GZCAT} $$patchfile | ${TAR} -Oxf - "geolizer*/geolizer.patch" 
53PATCH_DIST_STRIP= -p1 
54CONFIGURE_ARGS+= --enable-geoip 
55 
56_DOCFILES+= GeoIP.README GeoIP.INSTALL 
57 
58post-extract: 
59 cd ${WRKDIR}/${_GEOPATCH} && \ 
60 ${MV} INSTALL ${WRKSRC}/GeoIP.INSTALL &&\ 
61 ${MV} GeoIP.README ${WRKSRC} 
62 44
 45.if !empty(PKG_OPTIONS:Mgeoip)
63. include "../../net/GeoIP/buildlink3.mk" 46. include "../../net/GeoIP/buildlink3.mk"
 47CONFIGURE_ARGS+= --enable-geoip
 48CONFIGURE_ARGS+= --with-geodb=${BUILDLINK_PREFIX.GeoIP}/share/GeoIP
64.endif # option geoip 49.endif # option geoip
65 50
66post-install: 51post-install:
67 @${TEST} -r ${PLIST_ADD} && ${RM} ${PLIST_ADD} ; : 52.for f in ${DOCFILES}
68 @cd ${WRKSRC}; \ 53 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f}
69 for f in ${_DOCFILES}; do \ 54.endfor
70 ${INSTALL_DATA} $$f ${_DOCDIR}/$$f; \ 55
71 ${ECHO} "${_DOC_SUBDIR}/$$f" >> ${PLIST_ADD}; \ 56BUILDLINK_TRANSFORM+= l:db:db4
72 done; 57.include "../../databases/db4/buildlink3.mk"
73 @${ECHO} "@dirrm ${_DOC_SUBDIR}" >> ${PLIST_ADD}; 58.include "../../devel/zlib/buildlink3.mk"
74 
75BDB_ACCEPTED=db1 db2 
76.include "../../mk/bdb.buildlink3.mk" 
77.include "../../devel/gettext-lib/buildlink3.mk" 
78.include "../../graphics/freetype2/buildlink3.mk" 
79.include "../../graphics/gd/buildlink3.mk" 59.include "../../graphics/gd/buildlink3.mk"
80.include "../../mk/bsd.pkg.mk" 60.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/www/webalizer/PLIST (expand / switch to unified diff)

--- pkgsrc/www/webalizer/PLIST 2008/12/01 09:45:55 1.3
+++ pkgsrc/www/webalizer/PLIST 2009/01/09 13:17:04 1.4
@@ -1,8 +1,14 @@ @@ -1,8 +1,14 @@
1@comment $NetBSD: PLIST,v 1.3 2008/12/01 09:45:55 tonnerre Exp $ 1@comment $NetBSD: PLIST,v 1.4 2009/01/09 13:17:04 obache Exp $
2bin/wcmgr 2bin/wcmgr
3bin/webalizer 3bin/webalizer
4bin/webazolver 4bin/webazolver
5man/man1/wcmgr.1 5man/man1/wcmgr.1
6man/man1/webalizer.1 6man/man1/webalizer.1
7man/man1/webazolver.1 7man/man1/webazolver.1
 8share/doc/webalizer/CHANGES
 9share/doc/webalizer/Copyright
 10share/doc/webalizer/DNS.README
 11share/doc/webalizer/README
 12share/doc/webalizer/README.FIRST
8share/examples/webalizer.conf.sample 13share/examples/webalizer.conf.sample
 14@dirrm share/doc/webalizer
cvs diff -r1.12 -r1.13 pkgsrc/www/webalizer/distinfo (expand / switch to unified diff)

--- pkgsrc/www/webalizer/distinfo 2008/12/01 09:45:55 1.12
+++ pkgsrc/www/webalizer/distinfo 2009/01/09 13:17:04 1.13
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.12 2008/12/01 09:45:55 tonnerre Exp $ 1$NetBSD: distinfo,v 1.13 2009/01/09 13:17:04 obache Exp $
2 2
3SHA1 (webalizer-2.20-01-src.tar.bz2) = f8b646b4e097e4c2784377648602e315f23e8a70 3SHA1 (webalizer-2.20-03-src.tar.bz2) = 693bab5eaad705d998802d7c908422014dc2888b
4RMD160 (webalizer-2.20-01-src.tar.bz2) = fab671a54d8e2c3d8b4d310264f6f77bc0baa558 4RMD160 (webalizer-2.20-03-src.tar.bz2) = 790d52ddbac5e0912d2eb0c36b6f13bc272793f8
5Size (webalizer-2.20-01-src.tar.bz2) = 302017 bytes 5Size (webalizer-2.20-03-src.tar.bz2) = 304868 bytes
6SHA1 (patch-ac) = f4885b334b3adb3f8523f959a89e6fe5f7f3b52f 6SHA1 (patch-ac) = f4885b334b3adb3f8523f959a89e6fe5f7f3b52f
7SHA1 (patch-ad) = fea9708c791e436345cf90a5f36c003dd1b936cd 7SHA1 (patch-ad) = 09e9ca7fd61b0ad13306e98a644f362a932fcf3b
8SHA1 (patch-ae) = ea0c444408cef1be4e69b837170bbbe9a7a5150e 8SHA1 (patch-ae) = ea0c444408cef1be4e69b837170bbbe9a7a5150e
cvs diff -r1.9 -r1.10 pkgsrc/www/webalizer/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/www/webalizer/patches/patch-ad 2008/12/01 09:45:55 1.9
+++ pkgsrc/www/webalizer/patches/patch-ad 2009/01/09 13:17:04 1.10
@@ -1,28 +1,22 @@ @@ -1,28 +1,22 @@
1$NetBSD: patch-ad,v 1.9 2008/12/01 09:45:55 tonnerre Exp $ 1$NetBSD: patch-ad,v 1.10 2009/01/09 13:17:04 obache Exp $
2 2
3--- Makefile.in.orig 2008-07-01 00:04:39.000000000 +0200 3--- Makefile.in.orig 2008-06-30 22:04:39.000000000 +0000
4+++ Makefile.in 4+++ Makefile.in
5@@ -21,12 +21,12 @@ exec_prefix = @exec_prefix@ 5@@ -21,7 +21,7 @@ exec_prefix = @exec_prefix@
6 datadir = @datarootdir@ 6 datadir = @datarootdir@
7  7
8 BINDIR = @bindir@ 8 BINDIR = @bindir@
9-MANDIR = ${datadir}/man/man1 9-MANDIR = ${datadir}/man/man1
10+MANDIR = ${prefix}/man/man1 10+MANDIR = @mandir@/man1
11 ETCDIR = @sysconfdir@ 11 ETCDIR = @sysconfdir@
12 GEODB = @GEODB_LOC@ 12 GEODB = @GEODB_LOC@
13 CC = @CC@ 13 CC = @CC@
14 CFLAGS = @CFLAGS@ @CPPFLAGS@ 
15-LIBS = @LIBS@ 
16+LIBS = @LIBS@ -lpng -ljpeg -lz -lfreetype -lintl 
17 WCMGR_LIBS = @WCMGR_LIBS@ 
18 DEFS = -DETCDIR=\"${ETCDIR}\" -DGEODB_LOC=\"${GEODB}\" @DEFS@ @OPTS@ 
19 LDFLAGS = @LDFLAGS@ 
20@@ -102,7 +102,7 @@ install: all 14@@ -102,7 +102,7 @@ install: all
21 $(INSTALL_DATA) wcmgr.1 ${DESTDIR}${MANDIR}/wcmgr.1 15 $(INSTALL_DATA) wcmgr.1 ${DESTDIR}${MANDIR}/wcmgr.1
22 rm -f ${DESTDIR}${MANDIR}/webazolver.1 16 rm -f ${DESTDIR}${MANDIR}/webazolver.1
23 @LN_S@ webalizer.1 ${DESTDIR}${MANDIR}/webazolver.1 17 @LN_S@ webalizer.1 ${DESTDIR}${MANDIR}/webazolver.1
24- $(INSTALL_DATA) sample.conf ${DESTDIR}${ETCDIR}/webalizer.conf.sample 18- $(INSTALL_DATA) sample.conf ${DESTDIR}${ETCDIR}/webalizer.conf.sample
25+ $(INSTALL_DATA) sample.conf ${DESTDIR}${PREFIX}/share/examples/webalizer.conf.sample 19+ $(INSTALL_DATA) sample.conf ${DESTDIR}${PREFIX}/share/examples/webalizer.conf.sample
26  20
27 uninstall: 21 uninstall:
28 rm -f ${DESTDIR}${BINDIR}/webalizer 22 rm -f ${DESTDIR}${BINDIR}/webalizer