* Modify to support gd-1.7.3.

7 files changed, 40 insertions, 15 deletions

diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index d3b898aa422..21572a07987 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/08/28 23:25:30 kim Exp $
+# $NetBSD: Makefile,v 1.11 1999/11/01 03:37:35 jlam Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/12/16 19:42:17 vanilla Exp
 #
 
@@ -16,11 +16,12 @@ MASTER_SITES=	http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/ \
 MAINTAINER=	tv@netbsd.org
 HOMEPAGE=	http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html
 
-DEPENDS=	gd-1.6.3:../../graphics/gd
+DEPENDS=	gd-1.7.3:../../graphics/gd
 
 USE_PERL5=	YES
+USE_X11=	YES
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--with-gd-inc=${PREFIX}/include --with-gd-lib=${PREFIX}/lib
+CONFIGURE_ARGS=	--with-gd-inc=${LOCALBASE}/include
 
 post-build:
 	${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/mrtg.conf.example \
diff --git a/net/mrtg/files/patch-sum b/net/mrtg/files/patch-sum
index 395d1f8d59a..f23a983a2cb 100644
--- a/net/mrtg/files/patch-sum
+++ b/net/mrtg/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:12:23 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/11/01 03:37:36 jlam Exp $
 
+MD5 (patch-aa) = 700890bdd408b85f779b88cb95a7b987
 MD5 (patch-ab) = 60d615ef73c9ab66d0127d6900b125f6
diff --git a/net/mrtg/patches/patch-aa b/net/mrtg/patches/patch-aa
new file mode 100644
index 00000000000..b9ee5c09257
--- /dev/null
+++ b/net/mrtg/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.6 1999/11/01 03:37:36 jlam Exp $
+
+--- configure.orig	Thu Aug 26 17:25:08 1999
++++ configure	Sun Oct 31 00:47:15 1999
+@@ -1053,7 +1053,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lgd -lpng -lz $LIBS"
++LIBS="-lgd -lpng -lz -lttf -lintl -lXpm -lX11 $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 1059 "configure"
+ #include "confdefs.h"
+@@ -1083,7 +1083,7 @@
+   echo "$ac_t""yes" 1>&6
+   
+   CFLAGS="$CFLAGS -DGFORM_GD=gdImagePng"
+-  LDFLAGS="$LDFLAGS -lpng -lz"
++  LDFLAGS="$LDFLAGS -lpng -lz -lttf -lintl -lXpm -lX11"
+   GDFORM_EXT=png
+         
+ else
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 819da735450..25e02d6b49f 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/08/27 09:06:37 agc Exp $
+# $NetBSD: Makefile,v 1.8 1999/11/01 03:38:18 jlam Exp $
 #
 
 DISTNAME=	webalizer-1.30-04-src
@@ -12,18 +12,19 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	mjl@emsi.priv.at
 HOMEPAGE=	http://www.mrunix.net/webalizer/
 
-DEPENDS=	gd-1.6.3:../../graphics/gd
+DEPENDS+=	gd-1.7.3:../../graphics/gd
 
 WRKSRC=		${WRKDIR}/webalizer-1.30-04
 
+USE_X11=	yes
 GNU_CONFIGURE=  yes
-CONFIGURE_ARGS= --with-gdlib=${PREFIX}/lib \
-		--with-gd=${PREFIX}/include/gd
+CONFIGURE_ARGS=	--with-gd=${LOCALBASE}/include
 
 post-patch:
 	@for f in webalizer.1; do \
-	${SED} 's:@@prefix@@:'${PREFIX}':g' ${WRKSRC}/$$f >${WRKSRC}/$$f.new && \
-		 ${MV} ${WRKSRC}/$$f.new ${WRKSRC}/$$f; \
+		${SED} 's:@@prefix@@:'${PREFIX}':g' ${WRKSRC}/$$f \
+			>${WRKSRC}/$$f.new && \
+		${MV} ${WRKSRC}/$$f.new ${WRKSRC}/$$f; \
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/webalizer/files/patch-sum b/www/webalizer/files/patch-sum
index d92e36f5d77..4cb7b80454b 100644
--- a/www/webalizer/files/patch-sum
+++ b/www/webalizer/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.3 1999/08/27 09:06:38 agc Exp $
+$NetBSD: patch-sum,v 1.4 1999/11/01 03:38:18 jlam Exp $
 
 MD5 (patch-ab) = a540e90570b7c36969beca2d8f83591c
 MD5 (patch-ac) = fe80afca67e860607c72fdc415bb6db4
-MD5 (patch-ad) = 3ece3d2388ff743bd1c4f792d9eeaf23
+MD5 (patch-ad) = a0e7c82b3e27d5dcb6a3f92f5c6e6cd9
 MD5 (patch-ae) = 0d9a905175e38ec3d0e519b6093c7cfb
diff --git a/www/webalizer/patches/patch-ad b/www/webalizer/patches/patch-ad
index 6bd18a4e342..7c5df30f730 100644
--- a/www/webalizer/patches/patch-ad
+++ b/www/webalizer/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 1999/08/27 09:06:38 agc Exp $
+$NetBSD: patch-ad,v 1.3 1999/11/01 03:38:18 jlam Exp $
 
 --- Makefile.in.orig	Tue Jun 29 06:12:40 1999
 +++ Makefile.in	Fri Aug 27 09:55:04 1999
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.2 1999/08/27 09:06:38 agc Exp $
  CC     = @CC@
  CFLAGS = @CFLAGS@
 -LIBS   = @LIBS@
-+LIBS   = @LIBS@ -lpng -lz
++LIBS   = @LIBS@ -lpng -lz -lttf -lintl -lXpm -lX11
  DEFS   = @DEFS@
  LDFLAGS= @LDFLAGS@
  INSTALL= @INSTALL@
diff --git a/www/webalizer/pkg/COMMENT b/www/webalizer/pkg/COMMENT
index 54682f7f371..7a0522ec812 100644
--- a/www/webalizer/pkg/COMMENT
+++ b/www/webalizer/pkg/COMMENT
@@ -1 +1 @@
-Web server log file analysis program.
+Web server log file analysis program