6 files changed, 28 insertions, 20 deletions

diff --git a/www/webalizer-2/Makefile b/www/webalizer-2/Makefile
index 1d723182bca4..5c9308ea0066 100644
--- a/www/webalizer-2/Makefile
+++ b/www/webalizer-2/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	webalizer
-# Version required:	1.20
+# Version required:	1.22
 # Date created:		02.Jun 1998
 # Whom:			dirk.meyer@dinoex.sub.org
 #
-# $Id: Makefile,v 1.4 1998/08/17 00:34:42 steve Exp $
+# $Id: Makefile,v 1.5 1999/01/26 02:18:07 steve Exp $
 
-DISTNAME=	webalizer-1.20-07-src
-PKGNAME=	webalizer-1.20
+DISTNAME=	webalizer-1.22-03-src
+PKGNAME=	webalizer-1.22.3
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
 		ftp://ftp.dinoex.sub.de/pub/approved/
@@ -20,12 +20,15 @@ BIN1=		webalizer
 MAN1=		webalizer.1
 DOC1=		CHANGES COPYING Copyright INSTALL \
 		README country-codes.txt webalizer.LSM
-SUPP_LANG=	english german french spanish dutch italian polish
-WRKSRC=		${WRKDIR}
+SUPP_LANG=	english german french spanish dutch italian polish \
+		catalan czech portuguese_brazil russian slovak swedish \
+		portugues
+WRKSRC=		${WRKDIR}/webalizer-1.22-03
 
 .if defined(BATCH)
 WEBALIZER_LANG=english
 .endif
+WEBALIZER_LANG=english
 
 pre-fetch:
 .if !defined(WEBALIZER_LANG)
@@ -39,8 +42,8 @@ post-configure:
 .for i in ${SUPP_LANG}
 .if defined(WEBALIZER_LANG) && ${WEBALIZER_LANG} == ${i}
 		@${ECHO_MSG} "===> customizing for ${i}"
-		${LN} -sf ${WRKSRC}/webalizer_lang.${i} \
-			  ${WRKSRC}/webalizer_lang.h
+		@cd ${WRKSRC}; \
+		${LN} -sf lang/webalizer_lang.${i} webalizer_lang.h
 .endif
 .endfor
 
@@ -60,7 +63,7 @@ post-install:
 .endfor
 .endif
 	${MKDIR} ${PREFIX}/share/examples/webalizer
-.for i in msfree.gif sample.conf
+.for i in msfree.gif sample.conf webalizer.gif
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/examples/webalizer/${i}
 .endfor
 	@if [ ! -f ${PREFIX}/etc/webalizer.conf-dist ]; then \
diff --git a/www/webalizer-2/distinfo b/www/webalizer-2/distinfo
index 5cad8eec73f4..1fdd27707c0a 100644
--- a/www/webalizer-2/distinfo
+++ b/www/webalizer-2/distinfo
@@ -1 +1 @@
-MD5 (webalizer-1.20-07-src.tgz) = d81f5798b2992de6cf51c6c440b67b07
+MD5 (webalizer-1.22-03-src.tgz) = dd5d45a7d68b5786937766dd2876d58d
diff --git a/www/webalizer-2/pkg-plist b/www/webalizer-2/pkg-plist
index 74e25865cec9..2a3012bcea3a 100644
--- a/www/webalizer-2/pkg-plist
+++ b/www/webalizer-2/pkg-plist
@@ -10,4 +10,5 @@ share/doc/webalizer/webalizer.LSM
 @dirrm share/doc/webalizer
 share/examples/webalizer/msfree.gif
 share/examples/webalizer/sample.conf
+share/examples/webalizer/webalizer.gif
 @dirrm share/examples/webalizer
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 1d723182bca4..5c9308ea0066 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	webalizer
-# Version required:	1.20
+# Version required:	1.22
 # Date created:		02.Jun 1998
 # Whom:			dirk.meyer@dinoex.sub.org
 #
-# $Id: Makefile,v 1.4 1998/08/17 00:34:42 steve Exp $
+# $Id: Makefile,v 1.5 1999/01/26 02:18:07 steve Exp $
 
-DISTNAME=	webalizer-1.20-07-src
-PKGNAME=	webalizer-1.20
+DISTNAME=	webalizer-1.22-03-src
+PKGNAME=	webalizer-1.22.3
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
 		ftp://ftp.dinoex.sub.de/pub/approved/
@@ -20,12 +20,15 @@ BIN1=		webalizer
 MAN1=		webalizer.1
 DOC1=		CHANGES COPYING Copyright INSTALL \
 		README country-codes.txt webalizer.LSM
-SUPP_LANG=	english german french spanish dutch italian polish
-WRKSRC=		${WRKDIR}
+SUPP_LANG=	english german french spanish dutch italian polish \
+		catalan czech portuguese_brazil russian slovak swedish \
+		portugues
+WRKSRC=		${WRKDIR}/webalizer-1.22-03
 
 .if defined(BATCH)
 WEBALIZER_LANG=english
 .endif
+WEBALIZER_LANG=english
 
 pre-fetch:
 .if !defined(WEBALIZER_LANG)
@@ -39,8 +42,8 @@ post-configure:
 .for i in ${SUPP_LANG}
 .if defined(WEBALIZER_LANG) && ${WEBALIZER_LANG} == ${i}
 		@${ECHO_MSG} "===> customizing for ${i}"
-		${LN} -sf ${WRKSRC}/webalizer_lang.${i} \
-			  ${WRKSRC}/webalizer_lang.h
+		@cd ${WRKSRC}; \
+		${LN} -sf lang/webalizer_lang.${i} webalizer_lang.h
 .endif
 .endfor
 
@@ -60,7 +63,7 @@ post-install:
 .endfor
 .endif
 	${MKDIR} ${PREFIX}/share/examples/webalizer
-.for i in msfree.gif sample.conf
+.for i in msfree.gif sample.conf webalizer.gif
 	@${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 5cad8eec73f4..1fdd27707c0a 100644
--- a/www/webalizer/distinfo
+++ b/www/webalizer/distinfo
@@ -1 +1 @@
-MD5 (webalizer-1.20-07-src.tgz) = d81f5798b2992de6cf51c6c440b67b07
+MD5 (webalizer-1.22-03-src.tgz) = dd5d45a7d68b5786937766dd2876d58d
diff --git a/www/webalizer/pkg-plist b/www/webalizer/pkg-plist
index 74e25865cec9..2a3012bcea3a 100644
--- a/www/webalizer/pkg-plist
+++ b/www/webalizer/pkg-plist
@@ -10,4 +10,5 @@ share/doc/webalizer/webalizer.LSM
 @dirrm share/doc/webalizer
 share/examples/webalizer/msfree.gif
 share/examples/webalizer/sample.conf
+share/examples/webalizer/webalizer.gif
 @dirrm share/examples/webalizer