summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorminskim <minskim@pkgsrc.org>2004-12-31 10:08:42 +0000
committerminskim <minskim@pkgsrc.org>2004-12-31 10:08:42 +0000
commit75a9857f97292b7fb188530d8ce1f97bab457e20 (patch)
tree0144eaae498b4dadb14f49e58bab46b9a2a45d66
parent5a07a52e1e027355f44e72e001d4ccf3ffb3a76a (diff)
downloadpkgsrc-75a9857f97292b7fb188530d8ce1f97bab457e20.tar.gz
Set the path to perl in scripts correctly using REPLACE_PERL. Noted
by Martti Kuparinen on tech-pkg@. Bump PKGREVISION.
-rw-r--r--net/mrtg/Makefile5
-rw-r--r--net/mrtg/distinfo4
-rw-r--r--net/mrtg/patches/patch-ac17
3 files changed, 16 insertions, 10 deletions
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index ca331c435b3..0eea41c0a57 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2004/10/03 00:17:55 tv Exp $
+# $NetBSD: Makefile,v 1.56 2004/12/31 10:08:42 minskim Exp $
DISTNAME= mrtg-2.10.15
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \
ftp://ftp.sunet.se/pub/network/monitoring/mrtg/ \
@@ -43,6 +43,7 @@ CONFIGURE_ARGS+= --with-png-lib=${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-png-inc=${LOCALBASE}/include
.endif
+REPLACE_PERL= bin/cfgmaker bin/indexmaker bin/mrtg
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
CONF_FILES= ${EGDIR}/mrtg.conf ${PKG_SYSCONFDIR}/mrtg.conf
diff --git a/net/mrtg/distinfo b/net/mrtg/distinfo
index 2358efb84c3..f6a996b3183 100644
--- a/net/mrtg/distinfo
+++ b/net/mrtg/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2004/08/30 18:40:14 martti Exp $
+$NetBSD: distinfo,v 1.16 2004/12/31 10:08:42 minskim Exp $
SHA1 (mrtg-2.10.15.tar.gz) = 03505fb686d17c95f504b82baedbcc10aa6d1a71
Size (mrtg-2.10.15.tar.gz) = 1105158 bytes
SHA1 (patch-aa) = 15b23737797e274018187ea74919c1affa02372c
SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c
-SHA1 (patch-ac) = fbb1c3306f05d0e5c4c3fba210bf29719dd20278
+SHA1 (patch-ac) = 7c451660aa1ad5f380896b8c3e39927bc72957ec
SHA1 (patch-ad) = bdcea3ea03b988a675552c74eefe0b3278d7349b
SHA1 (patch-ae) = 0583ab18c911b2ff32bce7da8c61cdb82f28f90a
diff --git a/net/mrtg/patches/patch-ac b/net/mrtg/patches/patch-ac
index 6e19e4121dd..3bab845c44b 100644
--- a/net/mrtg/patches/patch-ac
+++ b/net/mrtg/patches/patch-ac
@@ -1,8 +1,13 @@
-$NetBSD: patch-ac,v 1.5 2004/02/15 07:34:03 martti Exp $
+$NetBSD: patch-ac,v 1.6 2004/12/31 10:08:42 minskim Exp $
---- Makefile.in.orig Mon Jan 19 09:28:44 2004
-+++ Makefile.in Sun Feb 15 09:18:46 2004
-@@ -40,2 +40,3 @@
- $(PERL) -0777 -p -i~ -e 's@GRAPHFMT="...";@GRAPHFMT="$(GDFORM_EXT)";@' $(top_srcdir)/bin/mrtg $(top_srcdir)/bin/indexmaker
-+ $(PERL) -0777 -p -i~ -e "s@__PREFIX__@${prefix}@g" $(top_srcdir)/bin/cfgmaker $(top_srcdir)/bin/mrtg $(top_srcdir)/bin/indexmaker
+--- Makefile.in.orig 2004-08-08 04:49:14.000000000 -0500
++++ Makefile.in
+@@ -27,7 +27,7 @@ LIBS = @LIBS@
+ INSTALL = @INSTALL@
+ MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs
+-all: bin/rateup subst
++all: bin/rateup
+
+ bin/rateup: bin/rateup.o
+ LD_RUN_PATH=$(LD_RUN_PATH) $(CC) bin/rateup.o -o bin/rateup $(LDFLAGS) $(LIBS)