From 6e5db71f33d6f19d9bc2ccef08527c4fd58ea7ba Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Mon, 29 Jan 2001 11:34:21 +0000
Subject: Add automatic ${VARIABLE} handling for MESSAGE files. Convert most
 MESSAGE files to new syntax (${VARIABLE} gets replaced, not @VARIABLE@, nor
 @@VARIABLE@@). By default, substitutions are done for LOCALBASE, PKGNAME,
 PREFIX, X11BASE, X11PREFIX; additional patterns can be added via
 MESSAGE_SUBST. Clean up some packages while I'm there; add RCS tags to most
 MESSAGEs. Remove some uninteresting MESSAGEs.

---
 net/mrtg/Makefile    | 6 +-----
 net/mrtg/pkg/MESSAGE | 7 +++----
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'net/mrtg')

diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index aee8810ac10..4969e22c458 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2000/10/23 13:47:53 bouyer Exp $
+# $NetBSD: Makefile,v 1.21 2001/01/29 11:34:36 wiz Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/12/16 19:42:17 vanilla Exp
 #
 
@@ -33,8 +33,6 @@ CONFIGURE_ARGS+=	--with-png-lib=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-png-inc=${LOCALBASE}/include
 .endif
 
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
-
 post-build:
 	${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/mrtg.conf.example \
 	    >${WRKDIR}/mrtg.conf.example
@@ -42,8 +40,6 @@ post-build:
 	    >${WRKDIR}/netstat2mrtg
 	${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/sys2mrtg \
 	    >${WRKDIR}/sys2mrtg
-	${SED} s#@PREFIX@#${PREFIX}#g <${PKGDIR}/MESSAGE \
-	    >${MESSAGE_FILE}
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/etc/mrtg
diff --git a/net/mrtg/pkg/MESSAGE b/net/mrtg/pkg/MESSAGE
index 48b2cb7e537..ef2e8d5c3c7 100644
--- a/net/mrtg/pkg/MESSAGE
+++ b/net/mrtg/pkg/MESSAGE
@@ -1,6 +1,5 @@
 =============================================================================
-
-$NetBSD: MESSAGE,v 1.6 2000/10/20 16:07:01 bouyer Exp $
+$NetBSD: MESSAGE,v 1.7 2001/01/29 11:34:36 wiz Exp $
 
 The Multi Router Traffic Grapher is now installed.  Do note that three
 programs have changed names to more readily reflect their MRTG-specific
@@ -9,10 +8,10 @@ function; make sure to prefix them with "mrtg":
     cfgmaker -> mrtgcfgmaker
     indexmaker -> mrtgindexmaker
 
-The documentation can be found at @PREFIX@/share/doc/mrtg/manual.html;
+The documentation can be found at ${PREFIX}/share/doc/mrtg/manual.html;
 there is a .txt version there as well.
 
 A sample config file collecting various datas from a NetBSD machine can
-be found in @PREFIX@/etc/mrtg/.
+be found in ${PREFIX}/etc/mrtg/.
 
 =============================================================================
-- 
cgit v1.2.3