- Update to 2.11.1

- Fix bug with IPv6 support on non-IPv6 enabled systems
- Tidy up Makefile
- Move patch-aa to Makefile
- ok'ed bouyer@

Changes 2.11.1, 2005-01-05
--------------------------
From: Artyom Adjemov <one.bofh location gmail.com>
* new Windows docu ... running mrtg as an nt service with srvany.

From: Joe Pruett <joey location clean.q7.com>
* fixed snmp options parsing in MRTG_lib.pm to allow for !

From: Tobi

* fixed secondmean and logscale to actually issue the propper
  options for rateup.
* fixed compilation of rateup.exe for windows to get the new strftime
  function to be actually used ...

Changes 2.11.00, 2004-12-08
---------------------------

From: Al Payne <apayne location pleiades.com>
* integrated support for dellLan in cfgmaker
* reindented cfgmaker

From: Mike Nealon <mnealon location conversent.com>
      and Larry Fahnoe <fahnoe@FahnoeTech.com>
* fix cfgmaker handling of 'lowspeed' highSpeed interfaces

From: Tobi Oetiker
* reindent rateup.c
* remove @ signs from mail addresses in change log
* added if_MTU variable to cfgmaker
* make windows users happy. rateup.exe now uses a special strftime.c
  that knows about %V and will thus provided propper ISO week numbers for
  windows as well. Changed the default week format to V.

From: zurkabsd location yahoo.com.cn
* new chinese translation

From: Jaime Damiao Anjos Cadete <jaime.d.cadete location ptprime.pt>
* put -lm into LIBS to make sure it comes last

From: Ian Duplisse <i.duplisse location cablelabs.com>
* remove the flattening of peaks from the code in rateup.c this does not reflect
  what actually happens

From: John Van Essen <vanes002 location umn.edu>
* fix handling of unknonwn (-1) data in rateup ...

From: Benjamin Despres <http://users.tmok.com/~pla/email_me.shtml>
* Logscale and Secondmean logarithmic scaling for rateup

From: alex <alex location craxor.com>
* contributed mrtg message dll. Added note about it to mrtg-reference.pod

From: Mateusz <mateusz location republika.pl>
* support option derive is using rrdtool logging

From: Ulf Härnhammar <Ulf.Harnhammar.9485 location student.uu.se>
* prevent potential buffer overflow in ratup due to 'strange' input files

Changes 2.10.15, 2004-08-08
---------------------------

From: NormW <normw location bocnet.com.au>
* patches for netware support

From: Tobi
* the optional Conversion function wants to have the original
  data pulled in via snmp to work with, mapping \n and \r to nothing
  and stripping spaces must happen later.
* better error message for missing library
* Updated to snmp_session 1.05

From: Fuminori -Tany- Tanizaki <tany location tany.org>
* fix for cuin and cout values saved in html comments

From: Tom Pala <gotar location pld-linux.org>
* fix for polish translation

From: Georgi Georgiev <chutz location gg3.net>
* nodetach option for running mrtg under daemontools

From: Jozsef Szilagyi <j.szilagyi location atlastelecom.ro>
* fixed indexmaker. added missing last for  --section=portname code

From: Bartosz Kwitniewski <zerg2000 location lurker.ath.cx>
* fixed scaling bug in rateup (unsigned long) should have been long long

From: Mike Mitchell <mcm location unx.sas.com>
* fix indexmaker when used with 14all

3 files changed, 25 insertions, 32 deletions

diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index 0eea41c0a57..c25a8a30afe 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2004/12/31 10:08:42 minskim Exp $
+# $NetBSD: Makefile,v 1.57 2005/01/22 15:07:01 adrianp Exp $
 
-DISTNAME=	mrtg-2.10.15
-PKGREVISION=	2
+DISTNAME=	mrtg-2.11.1
 CATEGORIES=	net
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \
 		ftp://ftp.sunet.se/pub/network/monitoring/mrtg/ \
@@ -33,9 +32,14 @@ GNU_CONFIGURE=	YES
 USE_PKGINSTALL=	YES
 
 BUILD_DEFS+=	USE_INET6
+LDFLAGS+=	-lgd -lttf -lintl -ljpeg
 
 .include "../../mk/bsd.prefs.mk"
 
+.if defined(USE_INET6) && ${USE_INET6} == "YES"
+.include "../../net/p5-INET6/buildlink3.mk"
+.endif
+
 .if ${OPSYS} == "SunOS"
 CONFIGURE_ARGS+=	--with-z-lib=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-z-inc=${LOCALBASE}/include
@@ -48,15 +52,21 @@ EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 
 CONF_FILES=	${EGDIR}/mrtg.conf ${PKG_SYSCONFDIR}/mrtg.conf
 
-post-build:
-	${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/mrtg.conf.example \
-	    >${WRKDIR}/mrtg.conf.example
-	${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/netstat2mrtg \
-	    >${WRKDIR}/netstat2mrtg
-	${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/sys2mrtg \
-	    >${WRKDIR}/sys2mrtg
-	${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/envstat2mrtg \
-	    >${WRKDIR}/envstat2mrtg
+SUBST_CLASSES+=		files
+SUBST_STAGE.files=	post-patch
+SUBST_FILES.files=	${WRKDIR}/mrtg.conf.example ${WRKDIR}/netstat2mrtg \
+			${WRKDIR}/sys2mrtg ${WRKDIR}/envstat2mrtg	
+SUBST_SED.files=	-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_MESSAGE.files=	"Fixing default configuration files."
+
+.include "../../graphics/freetype-lib/buildlink3.mk"
+.include "../../graphics/gd/buildlink3.mk"
+
+post-extract:
+	@${CP} ${FILESDIR}/mrtg.conf.example ${WRKDIR}
+	@${CP} ${FILESDIR}/netstat2mrtg ${WRKDIR}
+	@${CP} ${FILESDIR}/sys2mrtg ${WRKDIR}
+	@${CP} ${FILESDIR}/envstat2mrtg ${WRKDIR}
 
 do-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
@@ -92,7 +102,4 @@ do-install:
 	  ${INSTALL_SCRIPT} ${WRKSRC}/bin/$$FILE ${PREFIX}/bin/mrtg$$FILE; \
 	done
 
-.include "../../graphics/freetype-lib/buildlink3.mk"
-.include "../../graphics/gd/buildlink3.mk"
-.include "../../net/p5-INET6/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/mrtg/distinfo b/net/mrtg/distinfo
index 7bc21417ea7..b87ce4ce587 100644
--- a/net/mrtg/distinfo
+++ b/net/mrtg/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.17 2004/12/31 10:44:27 minskim Exp $
+$NetBSD: distinfo,v 1.18 2005/01/22 15:07:01 adrianp Exp $
 
-SHA1 (mrtg-2.10.15.tar.gz) = 03505fb686d17c95f504b82baedbcc10aa6d1a71
-Size (mrtg-2.10.15.tar.gz) = 1105158 bytes
-SHA1 (patch-aa) = 15b23737797e274018187ea74919c1affa02372c
+SHA1 (mrtg-2.11.1.tar.gz) = cc682e23db63696b83438a0ee21d0718f04104cb
+Size (mrtg-2.11.1.tar.gz) = 1118175 bytes
 SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c
 SHA1 (patch-ac) = 591006bc9732f1ce59d0cd1d93348c6578089744
 SHA1 (patch-ad) = bdcea3ea03b988a675552c74eefe0b3278d7349b
diff --git a/net/mrtg/patches/patch-aa b/net/mrtg/patches/patch-aa
deleted file mode 100644
index 3d48654c62a..00000000000
--- a/net/mrtg/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.16 2004/06/20 21:53:18 xtraeme Exp $
-
---- configure.orig	Fri Dec  5 00:11:29 2003
-+++ configure	Sun Dec  7 15:36:34 2003
-@@ -3526,7 +3526,7 @@
- fi;
- 
- 
--LDFLAGS="${LDFLAGS} ${MATHLIBS}"
-+LDFLAGS="${LDFLAGS} ${MATHLIBS} -lgd -lttf -lintl -ljpeg"
- 
- GDEXTRALIB=""
- echo "$as_me:$LINENO: checking for gdImageGif in -lgd" >&5