o Upgrade to 1.30-04

o Use new API for GD functions

PR:		ports/12857
Submitted by:	Dirk Meyer <dirk.meyer@dinoex.sub.org>

o Pass information to configure that will allow this port to work
  for people with alternative PREFIXes
o Make this port respect CFLAGS
o Change BUILD_DEPENDS on the static gd library to a LIB_DEPENDS on the
  shared library, which is what this port really uses.
o Remove a patch and a one-line(functionally) script and simply use a perl
  command in pre-configure:

6 files changed, 96 insertions, 14 deletions

diff --git a/www/webalizer-2/Makefile b/www/webalizer-2/Makefile
index 1936b03ebfc0..38348e742f6b 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.7 1999/06/10 08:15:16 steve Exp $
+# $Id: Makefile,v 1.8 1999/07/04 18:54:16 obrien Exp $
 
-DISTNAME=	webalizer-1.22-06-src
-PKGNAME=	webalizer-1.22.6
+DISTNAME=	webalizer-1.30-04-src
+PKGNAME=	webalizer-1.30.4
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
 		ftp://ftp.dinoex.sub.de/pub/approved/
@@ -14,10 +14,11 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	dirk.meyer@dinoex.sub.org
 
-BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.0:${PORTSDIR}/graphics/gd
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--with-gdlib=${PREFIX}/lib \
+			--with-gd=${PREFIX}/include/gd
 BIN1=		webalizer
 MAN1=		webalizer.1
 DOC1=		CHANGES COPYING Copyright INSTALL \
@@ -26,7 +27,8 @@ 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
+WRKSRC=		${WRKDIR}/webalizer-1.30-04
+MAKE_ARGS+=	CFLAGS="${CFLAGS}"
 
 .if defined(BATCH)
 WEBALIZER_LANG=english
@@ -37,6 +39,7 @@ 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}
diff --git a/www/webalizer-2/distinfo b/www/webalizer-2/distinfo
index fa726a9f3f2e..d76656ba4079 100644
--- a/www/webalizer-2/distinfo
+++ b/www/webalizer-2/distinfo
@@ -1 +1 @@
-MD5 (webalizer-1.22-06-src.tgz) = 9123858212879731d134555253ef23b1
+MD5 (webalizer-1.30-04-src.tgz) = f151b5e811bcdaa4ba72bca447f5cd44
diff --git a/www/webalizer-2/files/patch-ad b/www/webalizer-2/files/patch-ad
new file mode 100644
index 000000000000..d0c305c1ac57
--- /dev/null
+++ b/www/webalizer-2/files/patch-ad
@@ -0,0 +1,38 @@
+--- graphs.c.orig	Tue Jun 15 06:33:40 1999
++++ graphs.c	Sat Jul 31 10:43:48 1999
+@@ -285,7 +285,7 @@
+    /* save gif image */
+    if ((out = fopen(fname, "wb")) != NULL)
+    {
+-      gdImageGif(im, out);
++      gdImagePng(im, out);
+       fclose(out);
+    }
+    /* deallocate memory */
+@@ -501,7 +501,7 @@
+    /* open file for writing */
+    if ((out = fopen(fname, "wb")) != NULL)
+    {
+-      gdImageGif(im, out);
++      gdImagePng(im, out);
+       fclose(out);
+    }
+    /* deallocate memory */
+@@ -614,7 +614,7 @@
+    /* save as gif file */
+    if ( (out = fopen(fname, "wb")) != NULL)
+    {
+-      gdImageGif(im, out);
++      gdImagePng(im, out);
+       fclose(out);
+    }
+    /* deallocate memory */
+@@ -700,7 +700,7 @@
+    /* save gif image */
+    if ((out = fopen(fname, "wb")) != NULL)
+    {
+-      gdImageGif(im, out);
++      gdImagePng(im, out);
+       fclose(out);
+    }
+    /* deallocate memory */
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 1936b03ebfc0..38348e742f6b 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.7 1999/06/10 08:15:16 steve Exp $
+# $Id: Makefile,v 1.8 1999/07/04 18:54:16 obrien Exp $
 
-DISTNAME=	webalizer-1.22-06-src
-PKGNAME=	webalizer-1.22.6
+DISTNAME=	webalizer-1.30-04-src
+PKGNAME=	webalizer-1.30.4
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
 		ftp://ftp.dinoex.sub.de/pub/approved/
@@ -14,10 +14,11 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	dirk.meyer@dinoex.sub.org
 
-BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.0:${PORTSDIR}/graphics/gd
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--with-gdlib=${PREFIX}/lib \
+			--with-gd=${PREFIX}/include/gd
 BIN1=		webalizer
 MAN1=		webalizer.1
 DOC1=		CHANGES COPYING Copyright INSTALL \
@@ -26,7 +27,8 @@ 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
+WRKSRC=		${WRKDIR}/webalizer-1.30-04
+MAKE_ARGS+=	CFLAGS="${CFLAGS}"
 
 .if defined(BATCH)
 WEBALIZER_LANG=english
@@ -37,6 +39,7 @@ 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}
diff --git a/www/webalizer/distinfo b/www/webalizer/distinfo
index fa726a9f3f2e..d76656ba4079 100644
--- a/www/webalizer/distinfo
+++ b/www/webalizer/distinfo
@@ -1 +1 @@
-MD5 (webalizer-1.22-06-src.tgz) = 9123858212879731d134555253ef23b1
+MD5 (webalizer-1.30-04-src.tgz) = f151b5e811bcdaa4ba72bca447f5cd44
diff --git a/www/webalizer/files/patch-ad b/www/webalizer/files/patch-ad
new file mode 100644
index 000000000000..d0c305c1ac57
--- /dev/null
+++ b/www/webalizer/files/patch-ad
@@ -0,0 +1,38 @@
+--- graphs.c.orig	Tue Jun 15 06:33:40 1999
++++ graphs.c	Sat Jul 31 10:43:48 1999
+@@ -285,7 +285,7 @@
+    /* save gif image */
+    if ((out = fopen(fname, "wb")) != NULL)
+    {
+-      gdImageGif(im, out);
++      gdImagePng(im, out);
+       fclose(out);
+    }
+    /* deallocate memory */
+@@ -501,7 +501,7 @@
+    /* open file for writing */
+    if ((out = fopen(fname, "wb")) != NULL)
+    {
+-      gdImageGif(im, out);
++      gdImagePng(im, out);
+       fclose(out);
+    }
+    /* deallocate memory */
+@@ -614,7 +614,7 @@
+    /* save as gif file */
+    if ( (out = fopen(fname, "wb")) != NULL)
+    {
+-      gdImageGif(im, out);
++      gdImagePng(im, out);
+       fclose(out);
+    }
+    /* deallocate memory */
+@@ -700,7 +700,7 @@
+    /* save gif image */
+    if ((out = fopen(fname, "wb")) != NULL)
+    {
+-      gdImageGif(im, out);
++      gdImagePng(im, out);
+       fclose(out);
+    }
+    /* deallocate memory */