summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/mrtg/Makefile7
-rw-r--r--net/mrtg/files/md54
-rw-r--r--net/mrtg/files/patch-sum4
-rw-r--r--net/mrtg/patches/patch-aa33
4 files changed, 20 insertions, 28 deletions
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index 21572a07987..cdaeb0bd554 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 1999/11/01 03:37:35 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2000/02/07 16:44:13 tron Exp $
# FreeBSD Id: Makefile,v 1.7 1997/12/16 19:42:17 vanilla Exp
#
-DISTNAME= mrtg-2.8.8
+DISTNAME= mrtg-2.8.12
CATEGORIES= net
MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/ \
http://gd.tuwien.ac.at/infosys/network/tools/mrtg/pub/ \
@@ -21,7 +21,8 @@ DEPENDS= gd-1.7.3:../../graphics/gd
USE_PERL5= YES
USE_X11= YES
GNU_CONFIGURE= YES
-CONFIGURE_ARGS= --with-gd-inc=${LOCALBASE}/include
+CONFIGURE_ARGS+= --with-gd-inc=${LOCALBASE}/include \
+ --with-gd-lib=${LOCALBASE}/lib
post-build:
${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/mrtg.conf.example \
diff --git a/net/mrtg/files/md5 b/net/mrtg/files/md5
index 150cc266ffc..b4dbe5d105d 100644
--- a/net/mrtg/files/md5
+++ b/net/mrtg/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1999/08/28 16:46:44 kim Exp $
+$NetBSD: md5,v 1.6 2000/02/07 16:44:15 tron Exp $
-MD5 (mrtg-2.8.8.tar.gz) = 0610929a8c480cce570f810f52f5c194
+MD5 (mrtg-2.8.12.tar.gz) = 1279ae12c85c458cb5b3111fe5e01341
diff --git a/net/mrtg/files/patch-sum b/net/mrtg/files/patch-sum
index f23a983a2cb..bd832104bbf 100644
--- a/net/mrtg/files/patch-sum
+++ b/net/mrtg/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 1999/11/01 03:37:36 jlam Exp $
+$NetBSD: patch-sum,v 1.3 2000/02/07 16:44:15 tron Exp $
-MD5 (patch-aa) = 700890bdd408b85f779b88cb95a7b987
+MD5 (patch-aa) = 719dc732bdd11f18cd354ee560605420
MD5 (patch-ab) = 60d615ef73c9ab66d0127d6900b125f6
diff --git a/net/mrtg/patches/patch-aa b/net/mrtg/patches/patch-aa
index b9ee5c09257..e694f2c1dd5 100644
--- a/net/mrtg/patches/patch-aa
+++ b/net/mrtg/patches/patch-aa
@@ -1,22 +1,13 @@
-$NetBSD: patch-aa,v 1.6 1999/11/01 03:37:36 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2000/02/07 16:44:15 tron 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
+--- configure.orig Sun Feb 6 00:56:27 2000
++++ configure Mon Feb 7 17:38:11 2000
+@@ -986,7 +986,7 @@
+ fi
+
+
+-LDFLAGS="${LDFLAGS} -lgd"
++LDFLAGS="${LDFLAGS} -lgd -lttf -lintl -lXpm -lX11"
+
+ # Check whether --with-z or --without-z was given.
+ if test "${with_z+set}" = set; then