diff options
| -rw-r--r-- | www/webalizer/Makefile | 7 | ||||
| -rw-r--r-- | www/webalizer/PLIST | 5 | ||||
| -rw-r--r-- | www/webalizer/distinfo | 14 | ||||
| -rw-r--r-- | www/webalizer/patches/patch-ad | 44 | ||||
| -rw-r--r-- | www/webalizer/patches/patch-af | 24 |
5 files changed, 37 insertions, 57 deletions
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile index f7b815b1cf0..160f8fb69a8 100644 --- a/www/webalizer/Makefile +++ b/www/webalizer/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.43 2007/11/16 11:50:48 martin Exp $ +# $NetBSD: Makefile,v 1.44 2008/12/01 09:45:55 tonnerre Exp $ # -DISTNAME= webalizer-2.01-10-src -PKGNAME= webalizer-2.1.10 -PKGREVISION= 7 +DISTNAME= webalizer-2.20-01-src +PKGNAME= webalizer-2.20.1 CATEGORIES= www MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/ \ http://gd.tuwien.ac.at/infosys/logeval/webalizer/ diff --git a/www/webalizer/PLIST b/www/webalizer/PLIST index e4dc30fe086..6c97ec633bb 100644 --- a/www/webalizer/PLIST +++ b/www/webalizer/PLIST @@ -1,5 +1,8 @@ -@comment $NetBSD: PLIST,v 1.2 2001/12/01 15:08:02 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3 2008/12/01 09:45:55 tonnerre Exp $ +bin/wcmgr bin/webalizer bin/webazolver +man/man1/wcmgr.1 man/man1/webalizer.1 +man/man1/webazolver.1 share/examples/webalizer.conf.sample diff --git a/www/webalizer/distinfo b/www/webalizer/distinfo index a6ece17961e..1d226e88689 100644 --- a/www/webalizer/distinfo +++ b/www/webalizer/distinfo @@ -1,12 +1,8 @@ -$NetBSD: distinfo,v 1.11 2008/04/07 09:43:52 martin Exp $ +$NetBSD: distinfo,v 1.12 2008/12/01 09:45:55 tonnerre Exp $ -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 (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 (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 (patch-ac) = f4885b334b3adb3f8523f959a89e6fe5f7f3b52f -SHA1 (patch-ad) = 4ff72d4b620f64cec68bff826b84d183858c0da9 +SHA1 (patch-ad) = fea9708c791e436345cf90a5f36c003dd1b936cd SHA1 (patch-ae) = ea0c444408cef1be4e69b837170bbbe9a7a5150e -SHA1 (patch-af) = c6981b7b141e812a8b1684c4a597b375a538c597 diff --git a/www/webalizer/patches/patch-ad b/www/webalizer/patches/patch-ad index 83f0977a1fa..23153864328 100644 --- a/www/webalizer/patches/patch-ad +++ b/www/webalizer/patches/patch-ad @@ -1,22 +1,28 @@ -$NetBSD: patch-ad,v 1.8 2003/07/01 14:33:00 jwise Exp $ +$NetBSD: patch-ad,v 1.9 2008/12/01 09:45:55 tonnerre Exp $ ---- Makefile.in.orig Tue Oct 17 00:15:53 2000 +--- Makefile.in.orig 2008-07-01 00:04:39.000000000 +0200 +++ Makefile.in -@@ -24,7 +24,7 @@ - ETCDIR = @ETCDIR@ - CC = @CC@ - CFLAGS = @CFLAGS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -lpng -ljpeg -lz -lfreetype -lintl - DEFS = -DETCDIR=\"@ETCDIR@\" @DEFS@ @OPTS@ - LDFLAGS= @LDFLAGS@ - INSTALL= @INSTALL@ -@@ -86,7 +86,7 @@ - install: all - $(INSTALL_PROGRAM) webalizer ${BINDIR}/webalizer - $(INSTALL_DATA) webalizer.1 ${MANDIR}/webalizer.1 -- $(INSTALL_DATA) sample.conf ${ETCDIR}/webalizer.conf.sample -+ $(INSTALL_DATA) sample.conf ${PREFIX}/share/examples/webalizer.conf.sample - rm -f ${BINDIR}/webazolver - @LN_S@ ${BINDIR}/webalizer ${BINDIR}/webazolver +@@ -21,12 +21,12 @@ exec_prefix = @exec_prefix@ + datadir = @datarootdir@ + BINDIR = @bindir@ +-MANDIR = ${datadir}/man/man1 ++MANDIR = ${prefix}/man/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 + @LN_S@ webalizer.1 ${DESTDIR}${MANDIR}/webazolver.1 +- $(INSTALL_DATA) sample.conf ${DESTDIR}${ETCDIR}/webalizer.conf.sample ++ $(INSTALL_DATA) sample.conf ${DESTDIR}${PREFIX}/share/examples/webalizer.conf.sample + + uninstall: + rm -f ${DESTDIR}${BINDIR}/webalizer diff --git a/www/webalizer/patches/patch-af b/www/webalizer/patches/patch-af deleted file mode 100644 index e64bc658365..00000000000 --- a/www/webalizer/patches/patch-af +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-af,v 1.2 2007/11/22 15:26:15 martti Exp $ - ---- configure.orig 2000-10-06 10:51:48.000000000 +0300 -+++ configure 2007-11-22 10:52:18.000000000 +0200 -@@ -1216,8 +1216,8 @@ - cat conftest.$ac_ext >&5 - fi - rm -f conftest* --test "$ac_cv_search_dbopen" = "no" && for i in db db1; do --LIBS="-l$i $ac_func_search_save_LIBS" -+if test "$ac_cv_search_dbopen" = "no"; then -+LIBS="${BDB_LIBS} $ac_func_search_save_LIBS" - cat > conftest.$ac_ext <<EOF - #line 1223 "configure" - #include "confdefs.h" -@@ -1239,7 +1239,7 @@ - cat conftest.$ac_ext >&5 - fi - rm -f conftest* --done -+fi - LIBS="$ac_func_search_save_LIBS" - fi - |