Update to version 1.20.07.

PR:		9622
Submitted by:	maintainer

7 files changed, 56 insertions, 22 deletions

diff --git a/german/webalizer/Makefile b/german/webalizer/Makefile
index 530a09b6ce91..4b737bed9f1d 100644
--- a/german/webalizer/Makefile
+++ b/german/webalizer/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	webalizer
-# Version required:	1.12
+# Version required:	1.20
 # Date created:		02.Jun 1998
 # Whom:			dirk.meyer@dinoex.sub.org
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/13 00:13:21 steve Exp $
 
-DISTNAME=	webalizer-1.12-09-src
-PKGNAME=	de-webalizer-1.12
+DISTNAME=	webalizer-1.20-07-src
+PKGNAME=	de-webalizer-1.20
 CATEGORIES=	german www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
 		ftp://ftp.dinoex.sub.de/pub/approved/
@@ -16,23 +16,29 @@ MAINTAINER=	dirk.meyer@dinoex.sub.org
 
 BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd
 
-BIN1=		webalizer
-
+BIN1=		de-webalizer
+MAN1=		de-webalizer.1
+DOC1=		CHANGES COPYING Copyright INSTALL \
+		README country-codes.txt webalizer.LSM
 WRKSRC=		${WRKDIR}
 
 post-configure:
 	@echo "config german"
-	@cd ${WRKSRC}; ln -sf webalizer_lang.german webalizer_lang.h
+	@${ECHO_MSG} "===> customizing for german"
+	@cd ${WRKSRC}; ${LN} -sf webalizer_lang.german webalizer_lang.h
 
 do-install:
 .for i in ${BIN1}
-	@${INSTALL_SCRIPT} ${WRKSRC}/${i} ${PREFIX}/bin/de-${i}
+	@${INSTALL_SCRIPT} ${WRKSRC}/webalizer ${PREFIX}/bin/${i}
 .endfor
 
 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
-.for i in CHANGES COPYING Copyright README TODO webalizer.LSM
+.for i in ${DOC1}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/de-webalizer/${i}
 .endfor
 .endif
@@ -40,5 +46,9 @@ post-install:
 .for i in msfree.gif sample.conf
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/examples/de-webalizer/${i}
 .endfor
+	@if [ ! -f ${PREFIX}/etc/webalizer.conf-dist ]; then \
+		${INSTALL_DATA} ${WRKSRC}/sample.conf \
+			${PREFIX}/etc/webalizer.conf-dist ; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/german/webalizer/distinfo b/german/webalizer/distinfo
index 330ce609afad..5cad8eec73f4 100644
--- a/german/webalizer/distinfo
+++ b/german/webalizer/distinfo
@@ -1 +1 @@
-MD5 (webalizer-1.12-09-src.tgz) = 8b0c8252e0a1657fb1c59064b53d3dc4
+MD5 (webalizer-1.20-07-src.tgz) = d81f5798b2992de6cf51c6c440b67b07
diff --git a/german/webalizer/pkg-plist b/german/webalizer/pkg-plist
index f03a659793c7..6cc1caa00f71 100644
--- a/german/webalizer/pkg-plist
+++ b/german/webalizer/pkg-plist
@@ -1,9 +1,11 @@
 bin/de-webalizer
+etc/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/TODO
+share/doc/de-webalizer/country-codes.txt
 share/doc/de-webalizer/webalizer.LSM
 @dirrm share/doc/de-webalizer
 share/examples/de-webalizer/msfree.gif
diff --git a/german/webalizer/scripts/pre-configure b/german/webalizer/scripts/pre-configure
new file mode 100644
index 000000000000..e20fe58355d5
--- /dev/null
+++ b/german/webalizer/scripts/pre-configure
@@ -0,0 +1,10 @@
+#! /bin/sh
+
+#
+# $Id: pre-configure,v 1.1 1998/07/30 13:06:44 andreas Exp $
+#
+
+# only one central config file in $PREFIX/etc
+# -andreas
+
+perl -pi -e "s=!!PREFIX!!=$PREFIX=" ${WRKSRC}/webalizer.c
diff --git a/german/webalizer2/Makefile b/german/webalizer2/Makefile
index 530a09b6ce91..4b737bed9f1d 100644
--- a/german/webalizer2/Makefile
+++ b/german/webalizer2/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	webalizer
-# Version required:	1.12
+# Version required:	1.20
 # Date created:		02.Jun 1998
 # Whom:			dirk.meyer@dinoex.sub.org
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/13 00:13:21 steve Exp $
 
-DISTNAME=	webalizer-1.12-09-src
-PKGNAME=	de-webalizer-1.12
+DISTNAME=	webalizer-1.20-07-src
+PKGNAME=	de-webalizer-1.20
 CATEGORIES=	german www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
 		ftp://ftp.dinoex.sub.de/pub/approved/
@@ -16,23 +16,29 @@ MAINTAINER=	dirk.meyer@dinoex.sub.org
 
 BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd
 
-BIN1=		webalizer
-
+BIN1=		de-webalizer
+MAN1=		de-webalizer.1
+DOC1=		CHANGES COPYING Copyright INSTALL \
+		README country-codes.txt webalizer.LSM
 WRKSRC=		${WRKDIR}
 
 post-configure:
 	@echo "config german"
-	@cd ${WRKSRC}; ln -sf webalizer_lang.german webalizer_lang.h
+	@${ECHO_MSG} "===> customizing for german"
+	@cd ${WRKSRC}; ${LN} -sf webalizer_lang.german webalizer_lang.h
 
 do-install:
 .for i in ${BIN1}
-	@${INSTALL_SCRIPT} ${WRKSRC}/${i} ${PREFIX}/bin/de-${i}
+	@${INSTALL_SCRIPT} ${WRKSRC}/webalizer ${PREFIX}/bin/${i}
 .endfor
 
 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
-.for i in CHANGES COPYING Copyright README TODO webalizer.LSM
+.for i in ${DOC1}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/de-webalizer/${i}
 .endfor
 .endif
@@ -40,5 +46,9 @@ post-install:
 .for i in msfree.gif sample.conf
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/examples/de-webalizer/${i}
 .endfor
+	@if [ ! -f ${PREFIX}/etc/webalizer.conf-dist ]; then \
+		${INSTALL_DATA} ${WRKSRC}/sample.conf \
+			${PREFIX}/etc/webalizer.conf-dist ; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/german/webalizer2/distinfo b/german/webalizer2/distinfo
index 330ce609afad..5cad8eec73f4 100644
--- a/german/webalizer2/distinfo
+++ b/german/webalizer2/distinfo
@@ -1 +1 @@
-MD5 (webalizer-1.12-09-src.tgz) = 8b0c8252e0a1657fb1c59064b53d3dc4
+MD5 (webalizer-1.20-07-src.tgz) = d81f5798b2992de6cf51c6c440b67b07
diff --git a/german/webalizer2/pkg-plist b/german/webalizer2/pkg-plist
index f03a659793c7..6cc1caa00f71 100644
--- a/german/webalizer2/pkg-plist
+++ b/german/webalizer2/pkg-plist
@@ -1,9 +1,11 @@
 bin/de-webalizer
+etc/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/TODO
+share/doc/de-webalizer/country-codes.txt
 share/doc/de-webalizer/webalizer.LSM
 @dirrm share/doc/de-webalizer
 share/examples/de-webalizer/msfree.gif