Update to version 2.1.5

PR: 21876
Submitted by: MAINTAINER

4 files changed, 36 insertions, 33 deletions

diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 04fe566b1680..852ac9b8674b 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -6,34 +6,36 @@
 #
 
 PORTNAME=	webalizer
-PORTVERSION= 	1.30.4
+PORTVERSION=	2.1.5
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
 		ftp://ftp.lan-ks.de/pub/FreeBSD/distfiles/
-DISTNAME=	${PORTNAME}-1.30-04-src
-EXTRACT_SUFX=	.tgz
+DISTNAME=	${PORTNAME}-2.01-05-src
 
 MAINTAINER=	dirk.meyer@dinoex.sub.org
 
 LIB_DEPENDS=	gd.1:${PORTSDIR}/graphics/gd
 
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-gdlib=${PREFIX}/lib \
+CONFIGURE_ARGS+=	--enable-dns \
+			--with-etcdir=${PREFIX}/etc \
+			--with-gdlib=${PREFIX}/lib \
 			--with-gd=${PREFIX}/include/gd
 CONFIGURE_ENV+=	LDFLAGS="-L${PREFIX}/lib"
 
-BIN1=		webalizer
 MAN1=		webalizer.1
 DOC1=		CHANGES COPYING Copyright INSTALL \
-		README country-codes.txt webalizer.LSM
-SUPP_LANG=	catalan chinese czech dutch english french \
-		german italian korean polish portuguese \
-		portuguese_brazil romanian russain slowak \
-		spanish swedish
+		README README.FIRST DNS.README country-codes.txt
+SUPP_LANG=	catalan chinese czech danish dutch english estonian \
+		finnish french german greek hungarian indonesian \
+		italian korean polish portuguese portuguese_brazil \
+		romanian russain slowak slovene spanish swedish turkish
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src$//}
 MAKE_ARGS+=	CFLAGS="${CFLAGS}"
 
 .if defined(BATCH)
+# no cosmetique spaces allowed
 WEBALIZER_LANG=english
 .endif
 
@@ -42,18 +44,16 @@ CONFIGURE_ARGS+=	--with-language=${WEBALIZER_LANG}
 .endif
 
 pre-configure:
-	@${PERL5} -pi -e "s=/etc=${PREFIX}/etc=" ${WRKSRC}/webalizer.c
 .if !defined(WEBALIZER_LANG)
 	@${ECHO_MSG} "You can customize the language by typing"
-.for i in ${SUPP_LANG}
-		@${ECHO_MSG} "make WEBALIZER_LANG=${i}"
-.endfor
+	@${ECHO_MSG} "       make WEBALIZER_LANG=<lang>"
+	@${ECHO_MSG} "where <lang> is one of:"
+	@${ECHO_MSG} ${SUPP_LANG}
 .endif
 
 do-install:
-.for i in ${BIN1}
-	@${INSTALL_SCRIPT} ${WRKSRC}/${i} ${PREFIX}/bin/${i}
-.endfor
+	${INSTALL_PROGRAM} ${WRKSRC}/webalizer ${PREFIX}/bin
+	${LN} -sf webalizer ${PREFIX}/bin/webazolver
 
 post-install:
 .for i in ${MAN1}
@@ -66,7 +66,7 @@ post-install:
 .endfor
 .endif
 	${MKDIR} ${PREFIX}/share/examples/webalizer
-.for i in msfree.gif sample.conf webalizer.gif
+.for i in msfree.png sample.conf webalizer.png
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/examples/webalizer/${i}
 .endfor
 	@if [ ! -f ${PREFIX}/etc/webalizer.conf-dist ]; then \
diff --git a/www/webalizer/distinfo b/www/webalizer/distinfo
index d76656ba4079..6d54ad0a73c3 100644
--- a/www/webalizer/distinfo
+++ b/www/webalizer/distinfo
@@ -1 +1 @@
-MD5 (webalizer-1.30-04-src.tgz) = f151b5e811bcdaa4ba72bca447f5cd44
+MD5 (webalizer-2.01-05-src.tar.bz2) = ab45bc2c7893c00370a1fcbd9b71232e
diff --git a/www/webalizer/pkg-descr b/www/webalizer/pkg-descr
index dacae2914b73..f805f48673c7 100644
--- a/www/webalizer/pkg-descr
+++ b/www/webalizer/pkg-descr
@@ -1,22 +1,23 @@
 What is The Webalizer?
 ----------------------
 
-The Webalizer is a web server log file analysis program which produces
-usage statistics in HTML format for viewing with a browser.  The results
-are presented in both columnar and graphical format, which facilitates
-interpretation.  Yearly, monthly, daily and hourly usage statistics are
-presented, along with the ability to display usage by site, URL, referrer,
-user agent (browser) and country (user agent and referrer are only
-available if your web server procduces Combined log format files).
-
-The Webalizer supports CLF (common log format) log files, as well as
-Combined log formats as defined by NCSA and others, and variations
-of these which it attempts to handle intelligently.
+A fast, free web server log file analysis program.  Produces
+HTML output for viewing with a web browser.  Written in C on
+a Linux platform, however designed to be as ANSI/POSIX
+compliant as possible so porting to other UNIX platforms should
+be painless.  Binary distributions for most popular platforms
+are available.  Features multiple language support, incremental
+processing capabilities, reverse DNS lookup support, export via
+tab seperated ascii files to popular databases and spreadsheets,
+and much more.  Supports standard CLF and combined logs, as well
+as wu-ftpd xferlog and squid proxy logs, which can be either in
+standard text format or gzip compressed.
 
 Keywords:      Web Analysis, Log Analysis, Usage Statistics, Linux, Unix 
 Author:        Bradford L. Barrett 
 Maintained-by: Bradford L. Barrett 
 WWW: http://www.mrunix.net/webalizer/ 
+Alternate-site:http://samhain.unix.cslab.tuwien.ac.at/webalizer/
 FTP: ftp://www.mrunix.net/pub/webalizer/
 Platforms:     Linux, SCO, other UNIX's 
 Copying-policy: GPL
diff --git a/www/webalizer/pkg-plist b/www/webalizer/pkg-plist
index 2a3012bcea3a..7fe02d55fe8b 100644
--- a/www/webalizer/pkg-plist
+++ b/www/webalizer/pkg-plist
@@ -1,14 +1,16 @@
 bin/webalizer
+@unexec rm -f %B/webazolver
 etc/webalizer.conf-dist
 share/doc/webalizer/CHANGES
 share/doc/webalizer/COPYING
 share/doc/webalizer/Copyright
 share/doc/webalizer/INSTALL
+share/doc/webalizer/DNS.README
 share/doc/webalizer/README
+share/doc/webalizer/README.FIRST
 share/doc/webalizer/country-codes.txt
-share/doc/webalizer/webalizer.LSM
 @dirrm share/doc/webalizer
-share/examples/webalizer/msfree.gif
+share/examples/webalizer/msfree.png
 share/examples/webalizer/sample.conf
-share/examples/webalizer/webalizer.gif
+share/examples/webalizer/webalizer.png
 @dirrm share/examples/webalizer