Add and activate MRTG, the Multi-Router Traffic Grapher.

8 files changed, 67 insertions, 74 deletions

diff --git a/net/Makefile b/net/Makefile
index 10b1a8308d6..dd58a4b82d6 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 1998/06/26 00:26:29 christos Exp $
+# $NetBSD: Makefile,v 1.33 1998/07/13 17:56:27 tv Exp $
 # FreeBSD Id: Makefile,v 1.117 1997/08/16 03:11:52 gpalmer Exp 
 #
 
@@ -38,7 +38,7 @@
 #    SUBDIR += libsocket++
     SUBDIR += mirror
 #    SUBDIR += mpd
-#    SUBDIR += mrtg
+    SUBDIR += mrtg
 #    SUBDIR += moxftp
 #    SUBDIR += ncftp
     SUBDIR += ncftp2
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index a70f5d6f87c..45d80bed964 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,42 +1,36 @@
-# New ports collection makefile for:	MRTG
-# Version required:			2.5.1
-# Date created:				April 18th 1997
-# Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
-#
-#   $Id: Makefile,v 1.1.1.1 1998/07/13 16:59:07 tv Exp $
+# $NetBSD: Makefile,v 1.2 1998/07/13 17:56:27 tv Exp $
+# FreeBSD Id: Makefile,v 1.7 1997/12/16 19:42:17 vanilla Exp
 #
 
-DISTNAME=	mrtg-2.5.1
+DISTNAME=	mrtg-2.5.3
 CATEGORIES=	net
 MASTER_SITES=	http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/
 
-MAINTAINER=	jfitz@FreeBSD.ORG
+MAINTAINER=	tv@netbsd.org
 
-BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd
-RUN_DEPENDS=	${PREFIX}/lib/perl5/site_perl/PV.pm:${PORTSDIR}/devel/p5-PV
+DEPENDS=	gd-1.3:../../graphics/gd
 
 USE_PERL5=	YES
 
 ALL_TARGET=	rateup substitute
 
 do-install:
-		${MKDIR} -p -m 755 ${PREFIX}/etc/mrtg
-		${MKDIR} -p -m 755 ${PREFIX}/lib/perl5/site_perl
-		${MKDIR} -p -m 755 ${PREFIX}/share/mrtg
-		${MKDIR} -p -m 755 ${PREFIX}/share/doc/mrtg
-		for file in readme.html readme.txt mibhelp.txt INSTALL COPYING COPYRIGHT Changes Contributors Todo; do \
-			${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/share/doc/mrtg/; \
-		done
-		for file in ${WRKSRC}/*.gif; do \
-			${INSTALL_DATA} $$file ${PREFIX}/share/mrtg/; \
-		done
-		for file in SNMP_Session.pm BER.pm; do \
-			${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/lib/perl5/site_perl/; \
-		done
-		${INSTALL_PROGRAM} ${WRKSRC}/rateup ${PREFIX}/bin/
-		for file in mrtg cfgmaker convert indexmaker; do \
-			${INSTALL_SCRIPT} ${WRKSRC}/$$file ${PREFIX}/bin/; \
-		done
-		${INSTALL_DATA} ${WRKSRC}/mrtg.cfg-dist ${PREFIX}/etc/mrtg
+	${INSTALL_DATA_DIR} ${PREFIX}/etc/mrtg
+	${INSTALL_DATA_DIR} ${PREFIX}/share/mrtg
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mrtg
+	for file in mrtg-conf.html mrtg-conf.txt readme.html readme.txt mibhelp.txt COPYING COPYRIGHT; do \
+		${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/share/doc/mrtg/; \
+	done
+	for file in ${WRKSRC}/*.gif; do \
+		${INSTALL_DATA} $$file ${PREFIX}/share/mrtg/; \
+	done
+	${INSTALL_PROGRAM} ${WRKSRC}/rateup ${PREFIX}/libexec/
+	${INSTALL_SCRIPT} ${WRKSRC}/mrtg ${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/BER.pm ${WRKSRC}/SNMP_Session.pm \
+		${PREFIX}/lib/perl5/site_perl/
+	for file in cfgmaker convert indexmaker; do \
+		${INSTALL_SCRIPT} ${WRKSRC}/$$file ${PREFIX}/bin/mrtg$$file; \
+	done
+	@${CAT} ${PKGDIR}/MESSAGE
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/mrtg/files/md5 b/net/mrtg/files/md5
index 418a2968054..27861e8ef57 100644
--- a/net/mrtg/files/md5
+++ b/net/mrtg/files/md5
@@ -1 +1 @@
-MD5 (mrtg-2.5.1.tar.gz) = 0add21fd0a743e459e26fdc93666be74
+MD5 (mrtg-2.5.3.tar.gz) = 32d4da17cedbbd2b3a999edfc389e4a0
diff --git a/net/mrtg/patches/patch-aa b/net/mrtg/patches/patch-aa
index 52db1499814..e9b3b68f731 100644
--- a/net/mrtg/patches/patch-aa
+++ b/net/mrtg/patches/patch-aa
@@ -1,35 +1,22 @@
---- Makefile.orig	Sat Oct 25 20:00:59 1997
-+++ Makefile	Sat Dec  6 09:33:47 1997
-@@ -5,17 +5,17 @@
- SHELL=/bin/sh
+--- Makefile.orig	Mon Jul 13 13:02:23 1998
++++ Makefile	Mon Jul 13 13:04:02 1998
+@@ -6,16 +6,16 @@
  # GD_INCLUDE 
  # The path to the include files for the gd graphics library.
--#GD_INCLUDE=/usr/local/include/gd
+ #GD_INCLUDE=/usr/local/include/gd
 -GD_INCLUDE=gd1.2
-+GD_INCLUDE=/usr/local/include/gd
-+#GD_INCLUDE=gd1.2
++GD_INCLUDE=${PREFIX}/include/gd
  
  # GD_LIB
  # The path to the gd graphics library: libgd.a
--#GD_LIB=/usr/local/lib
+ #GD_LIB=/usr/local/lib
 -GD_LIB=gd1.2
-+GD_LIB=/usr/local/lib
-+#GD_LIB=gd1.2
++GD_LIB=${PREFIX}/lib
  
  # Where is perl 5 on this machine
--# PERL=/usr/local/bin/perl
+ # PERL=/usr/local/bin/perl
 -PERL=/usr/local/gnu/bin/perl5
-+PERL=/usr/local/bin/perl
-+#PERL=/usr/local/gnu/bin/perl5
++PERL=${PREFIX}/bin/perl
  
  
  # CC
-@@ -26,7 +26,7 @@
- # CFLAGS
- # Enter '-g' to include debugging info, or '-O2' to optimize
- # for gcc
--CFLAGS=-g -O -Wall
-+CFLAGS+=-Wall
- 
- # for sparcworks
- #CFLAGS=-g
diff --git a/net/mrtg/patches/patch-ab b/net/mrtg/patches/patch-ab
index 8831292ca28..9e6e6131902 100644
--- a/net/mrtg/patches/patch-ab
+++ b/net/mrtg/patches/patch-ab
@@ -1,11 +1,11 @@
---- mrtg.cfg-dist.orig	Fri Oct 24 21:35:55 1997
-+++ mrtg.cfg-dist	Sat Dec  6 09:34:48 1997
-@@ -21,7 +21,7 @@
+--- mrtg.orig	Mon Jul 13 13:17:55 1998
++++ mrtg	Mon Jul 13 13:19:52 1998
+@@ -54,7 +54,7 @@
+   }
+   die "ERROR: Can\'t find location of mrtg executable\n" 
+     unless $main::binpath; 
+-  unshift (@INC,$main::binpath);
++  $main::binpath .= "/../libexec"
+ }
  
- # Where should the logfiles, and webpages be created?
- 
--# WorkDir: /usr/tardis/pub/www/stats/mrtg
-+WorkDir: /usr/local/www/data/mrtg
- 
- # --------------------------
- # Optional Global Parameters
+ ###
diff --git a/net/mrtg/pkg/COMMENT b/net/mrtg/pkg/COMMENT
index 7720201d06d..bd19adb06fe 100644
--- a/net/mrtg/pkg/COMMENT
+++ b/net/mrtg/pkg/COMMENT
@@ -1 +1 @@
-the multi-router traffic grapher
+The Multi-Router Traffic Grapher
diff --git a/net/mrtg/pkg/MESSAGE b/net/mrtg/pkg/MESSAGE
new file mode 100644
index 00000000000..f7cf7a79eb4
--- /dev/null
+++ b/net/mrtg/pkg/MESSAGE
@@ -0,0 +1,14 @@
+=============================================================================
+
+The Multi Router Traffic Grapher is now installed.  Do note that three
+programs have changed names to more readily reflect their MRTG-specific
+function; make sure to prefix them with "mrtg":
+
+    cfgmaker -> mrtgcfgmaker
+    convert -> mrtgconvert
+    indexmaker -> mrtgindexmaker
+
+The documentation can be found at $PREFIX/share/doc/mrtg/readme.html
+(where $PREFIX is typically /usr/pkg); there is a .txt version there as well.
+
+=============================================================================
diff --git a/net/mrtg/pkg/PLIST b/net/mrtg/pkg/PLIST
index e2563b5a78a..5a7524c6680 100644
--- a/net/mrtg/pkg/PLIST
+++ b/net/mrtg/pkg/PLIST
@@ -1,22 +1,20 @@
-bin/cfgmaker
-bin/convert
-bin/indexmaker
+@comment $NetBSD: PLIST,v 1.2 1998/07/13 17:56:28 tv Exp $
+bin/mrtgcfgmaker
+bin/mrtgconvert
+bin/mrtgindexmaker
 bin/mrtg
-bin/rateup
-etc/mrtg/mrtg.cfg-dist
 lib/perl5/site_perl/BER.pm
 lib/perl5/site_perl/SNMP_Session.pm
+libexec/rateup
 share/mrtg/mrtg-l.gif
 share/mrtg/mrtg-m.gif
 share/mrtg/mrtg-r.gif
 share/mrtg/mrtg-ti.gif
 share/doc/mrtg/COPYING
 share/doc/mrtg/COPYRIGHT
-share/doc/mrtg/INSTALL
-share/doc/mrtg/Changes
-share/doc/mrtg/Contributors
-share/doc/mrtg/Todo
 share/doc/mrtg/mibhelp.txt
+share/doc/mrtg/mrtg-conf.html
+share/doc/mrtg/mrtg-conf.txt
 share/doc/mrtg/readme.html
 share/doc/mrtg/readme.txt
 @dirrm etc/mrtg