Update to version 1.22.6.

PR:		12101
Submitted by:	maintainer

6 files changed, 34 insertions, 40 deletions

diff --git a/www/webalizer-2/Makefile b/www/webalizer-2/Makefile
index 5c9308ea0066..7cc52ef68962 100644
--- a/www/webalizer-2/Makefile
+++ b/www/webalizer-2/Makefile
@@ -3,10 +3,10 @@
 # Date created:		02.Jun 1998
 # Whom:			dirk.meyer@dinoex.sub.org
 #
-# $Id: Makefile,v 1.5 1999/01/26 02:18:07 steve Exp $
+# $Id: Makefile,v 1.6 1999/03/31 15:15:13 steve Exp $
 
-DISTNAME=	webalizer-1.22-03-src
-PKGNAME=	webalizer-1.22.3
+DISTNAME=	webalizer-1.22-06-src
+PKGNAME=	webalizer-1.22.6
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
 		ftp://ftp.dinoex.sub.de/pub/approved/
@@ -16,19 +16,25 @@ MAINTAINER=	dirk.meyer@dinoex.sub.org
 
 BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd
 
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX}
 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 \
-		catalan czech portuguese_brazil russian slovak swedish \
-		portugues
-WRKSRC=		${WRKDIR}/webalizer-1.22-03
+SUPP_LANG=	catalan chinese czech dutch english french \
+		german italian korean polish portuguese \
+		portuguese_brazil romanian russain slowak \
+		spanish swedish
+WRKSRC=		${WRKDIR}/webalizer-1.22-06
 
 .if defined(BATCH)
 WEBALIZER_LANG=english
 .endif
-WEBALIZER_LANG=english
+
+.if defined(WEBALIZER_LANG)
+CONFIGURE_ARGS+=	--with-language=${WEBALIZER_LANG}
+.endif
 
 pre-fetch:
 .if !defined(WEBALIZER_LANG)
@@ -38,15 +44,6 @@ pre-fetch:
 .endfor
 .endif
 
-post-configure:
-.for i in ${SUPP_LANG}
-.if defined(WEBALIZER_LANG) && ${WEBALIZER_LANG} == ${i}
-		@${ECHO_MSG} "===> customizing for ${i}"
-		@cd ${WRKSRC}; \
-		${LN} -sf lang/webalizer_lang.${i} webalizer_lang.h
-.endif
-.endfor
-
 do-install:
 .for i in ${BIN1}
 	@${INSTALL_SCRIPT} ${WRKSRC}/${i} ${PREFIX}/bin/${i}
diff --git a/www/webalizer-2/distinfo b/www/webalizer-2/distinfo
index 1fdd27707c0a..fa726a9f3f2e 100644
--- a/www/webalizer-2/distinfo
+++ b/www/webalizer-2/distinfo
@@ -1 +1 @@
-MD5 (webalizer-1.22-03-src.tgz) = dd5d45a7d68b5786937766dd2876d58d
+MD5 (webalizer-1.22-06-src.tgz) = 9123858212879731d134555253ef23b1
diff --git a/www/webalizer-2/pkg-descr b/www/webalizer-2/pkg-descr
index 34f71ecc24ad..dacae2914b73 100644
--- a/www/webalizer-2/pkg-descr
+++ b/www/webalizer-2/pkg-descr
@@ -16,7 +16,7 @@ of these which it attempts to handle intelligently.
 Keywords:      Web Analysis, Log Analysis, Usage Statistics, Linux, Unix 
 Author:        Bradford L. Barrett 
 Maintained-by: Bradford L. Barrett 
-WWW:  http://www.mrunix.net/webalizer/ 
-Original-site: ftp://www.mrunix.net/pub/webalizer/
+WWW: http://www.mrunix.net/webalizer/ 
+FTP: ftp://www.mrunix.net/pub/webalizer/
 Platforms:     Linux, SCO, other UNIX's 
 Copying-policy: GPL
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 5c9308ea0066..7cc52ef68962 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -3,10 +3,10 @@
 # Date created:		02.Jun 1998
 # Whom:			dirk.meyer@dinoex.sub.org
 #
-# $Id: Makefile,v 1.5 1999/01/26 02:18:07 steve Exp $
+# $Id: Makefile,v 1.6 1999/03/31 15:15:13 steve Exp $
 
-DISTNAME=	webalizer-1.22-03-src
-PKGNAME=	webalizer-1.22.3
+DISTNAME=	webalizer-1.22-06-src
+PKGNAME=	webalizer-1.22.6
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
 		ftp://ftp.dinoex.sub.de/pub/approved/
@@ -16,19 +16,25 @@ MAINTAINER=	dirk.meyer@dinoex.sub.org
 
 BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd
 
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX}
 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 \
-		catalan czech portuguese_brazil russian slovak swedish \
-		portugues
-WRKSRC=		${WRKDIR}/webalizer-1.22-03
+SUPP_LANG=	catalan chinese czech dutch english french \
+		german italian korean polish portuguese \
+		portuguese_brazil romanian russain slowak \
+		spanish swedish
+WRKSRC=		${WRKDIR}/webalizer-1.22-06
 
 .if defined(BATCH)
 WEBALIZER_LANG=english
 .endif
-WEBALIZER_LANG=english
+
+.if defined(WEBALIZER_LANG)
+CONFIGURE_ARGS+=	--with-language=${WEBALIZER_LANG}
+.endif
 
 pre-fetch:
 .if !defined(WEBALIZER_LANG)
@@ -38,15 +44,6 @@ pre-fetch:
 .endfor
 .endif
 
-post-configure:
-.for i in ${SUPP_LANG}
-.if defined(WEBALIZER_LANG) && ${WEBALIZER_LANG} == ${i}
-		@${ECHO_MSG} "===> customizing for ${i}"
-		@cd ${WRKSRC}; \
-		${LN} -sf lang/webalizer_lang.${i} webalizer_lang.h
-.endif
-.endfor
-
 do-install:
 .for i in ${BIN1}
 	@${INSTALL_SCRIPT} ${WRKSRC}/${i} ${PREFIX}/bin/${i}
diff --git a/www/webalizer/distinfo b/www/webalizer/distinfo
index 1fdd27707c0a..fa726a9f3f2e 100644
--- a/www/webalizer/distinfo
+++ b/www/webalizer/distinfo
@@ -1 +1 @@
-MD5 (webalizer-1.22-03-src.tgz) = dd5d45a7d68b5786937766dd2876d58d
+MD5 (webalizer-1.22-06-src.tgz) = 9123858212879731d134555253ef23b1
diff --git a/www/webalizer/pkg-descr b/www/webalizer/pkg-descr
index 34f71ecc24ad..dacae2914b73 100644
--- a/www/webalizer/pkg-descr
+++ b/www/webalizer/pkg-descr
@@ -16,7 +16,7 @@ of these which it attempts to handle intelligently.
 Keywords:      Web Analysis, Log Analysis, Usage Statistics, Linux, Unix 
 Author:        Bradford L. Barrett 
 Maintained-by: Bradford L. Barrett 
-WWW:  http://www.mrunix.net/webalizer/ 
-Original-site: ftp://www.mrunix.net/pub/webalizer/
+WWW: http://www.mrunix.net/webalizer/ 
+FTP: ftp://www.mrunix.net/pub/webalizer/
 Platforms:     Linux, SCO, other UNIX's 
 Copying-policy: GPL