4 files changed, 60 insertions, 47 deletions

diff --git a/german/webalizer2/Makefile b/german/webalizer2/Makefile
index b9303d239ccd..772918ed9efb 100644
--- a/german/webalizer2/Makefile
+++ b/german/webalizer2/Makefile
@@ -1,58 +1,68 @@
-# New ports collection makefile for:	webalizer
+# New ports collection makefile for:	webalizer2
 # Date created:		02.Jun 1998
 # Whom:			dirk.meyer@dinoex.sub.org
 #
 # $FreeBSD$
 
 PORTNAME=	webalizer
-PORTVERSION=	1.30.4
+PORTVERSION=	2.0.12
 CATEGORIES=	german www
-MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
-		ftp://ftp.lan-ks.de/pub/approved/
-DISTNAME=	webalizer-1.30-04-src
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/pre-release/ \
+		ftp://ftp.lan-ks.de/pub/FreeBSD/distfiles/
+PKGNAMEPREFIX=	de-
+DISTNAME=	webalizer-2.00-12-src
 
 MAINTAINER=	dirk.meyer@dinoex.sub.org
 
-LIB_DEPENDS=	gd.1:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.0:${PORTSDIR}/graphics/gd
+
+NO_LATEST_LINK=	yes
 
 WEBALIZER_LANG= german
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-gdlib=${PREFIX}/lib \
+CONFIGURE_ARGS+=	--enable-dns \
+			--with-gdlib=${PREFIX}/lib \
 			--with-gd=${PREFIX}/include/gd \
 			--with-language=${WEBALIZER_LANG}
 CONFIGURE_ENV+=	LDFLAGS="-L${PREFIX}/lib"
-BIN1=		de-webalizer
-MAN1=		de-webalizer.1
+MAKE_ARGS+=	CFLAGS="${CFLAGS}"
+MAN1=		${PKGNAMEPREFIX}webalizer.1
 DOC1=		CHANGES COPYING Copyright INSTALL \
-		README country-codes.txt webalizer.LSM
+		README README.FIRST DNS.README country-codes.txt
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src$//}
+PLIST_SUB+=	PKGNAMEPREFIX=${PKGNAMEPREFIX}
 
 pre-configure:
 	@${PERL5} -pi -e "s=/etc=${PREFIX}/etc=" ${WRKSRC}/webalizer.c
+	@${PERL5} -pi -e "s=webalizer.conf=${PKGNAMEPREFIX}webalizer.conf=" \
+		${WRKSRC}/webalizer.c
 
 do-install:
-.for i in ${BIN1}
-	@${INSTALL_SCRIPT} ${WRKSRC}/webalizer ${PREFIX}/bin/${i}
-.endfor
+	@${INSTALL_PROGRAM} ${WRKSRC}/webalizer \
+		${PREFIX}/bin/${PKGNAMEPREFIX}webalizer
+	${LN} -sf ${PKGNAMEPREFIX}webalizer \
+		${PREFIX}/bin/${PKGNAMEPREFIX}webazolver
 
 post-install:
 .for i in ${MAN1}
 	${INSTALL_MAN} ${WRKSRC}/webalizer.1 ${PREFIX}/man/man1/${i}
 .endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/de-webalizer
+	${MKDIR} ${PREFIX}/share/doc/${PKGNAMEPREFIX}webalizer
 .for i in ${DOC1}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/de-webalizer/${i}
+	@${INSTALL_DATA} ${WRKSRC}/${i} \
+		${PREFIX}/share/doc/${PKGNAMEPREFIX}webalizer/${i}
 .endfor
 .endif
-	${MKDIR} ${PREFIX}/share/examples/de-webalizer
-.for i in msfree.gif sample.conf webalizer.gif
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/examples/de-webalizer/${i}
+	${MKDIR} ${PREFIX}/share/examples/${PKGNAMEPREFIX}webalizer
+.for i in msfree.png sample.conf webalizer.png
+	@${INSTALL_DATA} ${WRKSRC}/${i} \
+		${PREFIX}/share/examples/${PKGNAMEPREFIX}webalizer/${i}
 .endfor
-	@if [ ! -f ${PREFIX}/etc/de-webalizer.conf-dist ]; then \
+	@if [ ! -f ${PREFIX}/etc/${PKGNAMEPREFIX}webalizer.conf-dist ]; then \
 		${INSTALL_DATA} ${WRKSRC}/sample.conf \
-			${PREFIX}/etc/de-webalizer.conf-dist ; \
+			${PREFIX}/etc/${PKGNAMEPREFIX}webalizer.conf-dist ; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/german/webalizer2/distinfo b/german/webalizer2/distinfo
index d76656ba4079..9b8eac429675 100644
--- a/german/webalizer2/distinfo
+++ b/german/webalizer2/distinfo
@@ -1 +1 @@
-MD5 (webalizer-1.30-04-src.tgz) = f151b5e811bcdaa4ba72bca447f5cd44
+MD5 (webalizer-2.00-12-src.tar.bz2) = dca81378603370a27e6d1e3992ec74aa
diff --git a/german/webalizer2/pkg-descr b/german/webalizer2/pkg-descr
index dacae2914b73..f805f48673c7 100644
--- a/german/webalizer2/pkg-descr
+++ b/german/webalizer2/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/german/webalizer2/pkg-plist b/german/webalizer2/pkg-plist
index 569836e96537..bf10122c70e9 100644
--- a/german/webalizer2/pkg-plist
+++ b/german/webalizer2/pkg-plist
@@ -1,14 +1,16 @@
-bin/de-webalizer
-etc/de-webalizer.conf-dist
-share/doc/de-webalizer/CHANGES
-share/doc/de-webalizer/COPYING
-share/doc/de-webalizer/Copyright
-share/doc/de-webalizer/INSTALL
-share/doc/de-webalizer/README
-share/doc/de-webalizer/country-codes.txt
-share/doc/de-webalizer/webalizer.LSM
-@dirrm share/doc/de-webalizer
-share/examples/de-webalizer/msfree.gif
-share/examples/de-webalizer/sample.conf
-share/examples/de-webalizer/webalizer.gif
-@dirrm share/examples/de-webalizer
+bin/%%PKGNAMEPREFIX%%webalizer
+@unexec rm -f %B/%%PKGNAMEPREFIX%%webazolver
+etc/%%PKGNAMEPREFIX%%webalizer.conf-dist
+share/doc/%%PKGNAMEPREFIX%%webalizer/CHANGES
+share/doc/%%PKGNAMEPREFIX%%webalizer/COPYING
+share/doc/%%PKGNAMEPREFIX%%webalizer/Copyright
+share/doc/%%PKGNAMEPREFIX%%webalizer/DNS.README
+share/doc/%%PKGNAMEPREFIX%%webalizer/INSTALL
+share/doc/%%PKGNAMEPREFIX%%webalizer/README
+share/doc/%%PKGNAMEPREFIX%%webalizer/README.FIRST
+share/doc/%%PKGNAMEPREFIX%%webalizer/country-codes.txt
+@dirrm share/doc/%%PKGNAMEPREFIX%%webalizer
+share/examples/%%PKGNAMEPREFIX%%webalizer/msfree.png
+share/examples/%%PKGNAMEPREFIX%%webalizer/sample.conf
+share/examples/%%PKGNAMEPREFIX%%webalizer/webalizer.png
+@dirrm share/examples/%%PKGNAMEPREFIX%%webalizer