Update "mrtg" package to version 2.8.12:

- make -M and -r work in indexmaker
- hungarian translation
- NoSpaceChar option. Supresses SPACE normally inserted between local value
  and PRE or APPEND value.
- new features for cfgmaker --iponly, --options, --workdir
- make RunAsDaemon work ...
- Daemon mode now forks into background after cfgcheck
- Remove locks after sig INT and TERM
- make indexmaker ignore default values
- added ThreshDesc config option. Its value is assigned to the env variable
  THRESH_DESC before and of the Thresh-Action scripts are called.
- bugfix for big5 locale
- bugfix for norwegian.pmd
- it is RunAsDaemon and not RunAsDeamon
- update for rrdtool integration 14all.cgi to 0.16
- updated danish translation
- have cfgmaker put specific comments into the mrtg.cfg file
  regarding the reason for droping a certain interface ..
- Added RunAsDeamon mode. Start mrtg only once. No Cron necessary.
- linux ip-filter integration in contrib
- version 2.2 of mrtgmk in contrib
- catalan locales
- rateup.c fix for kMG override bug
- allow to set ShortLegend to ''
- better parsing of PageTop with intexmakers -P option
- fix for spanish translation (uptime had some probmlems)
- contrib: switchmaker produces mrtg cfg files for Cisco Catylst 5XXX
- made sure -lm comes last when linking ...
- converted remaining gifs to png
- make sure AbsMax is not smaller than MaxBytes
- translation to icelandic
- added japanese translations for ISO-2022-JP and EUC-JP
- added turkish translation
- update for rrdtool integration 14all.cgi
- Added more modular translation system
- Added German Translation
- Chinese Translation
- cfgmaker_ip ... keep first address and not last ..
- Malayan translation
- restored mibhelp to its old glory ..
- added ability to index interfaces by physical address analog to
  the existing IP stuff ... there is now also a cfgmaker_phys
- polish translation
- graphing fix for rateup ...
- cpuinfo contrib
- contrib cisco config tftp
- updates and bugfixes for mrtgmk v2.0
- fix for -F/-f in indexmaker
- fix for view type in indexmaker
- cisco accounting contrib
- added -lm to LIBS in configure.in
- patching system for languages ... check translate directory
- NSI (Network Status Imager for MRTG) contrib
- updates for mrtg-archiver

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