summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorminskim <minskim@pkgsrc.org>2004-12-31 10:44:27 +0000
committerminskim <minskim@pkgsrc.org>2004-12-31 10:44:27 +0000
commit81a18abcecd7cf858994f5d508e80cd70f53672d (patch)
tree326403ff749c57c5a81f7106eae91f061bf495f6
parent58f82d2bdb6faffb70f9968c3d2f43971b80b812 (diff)
downloadpkgsrc-81a18abcecd7cf858994f5d508e80cd70f53672d.tar.gz
Add the __PREFIX__ replacement back, which was deleted by mistake in
the previous commit. No PKGREIVISION bump since it was bumped in minutes ago.
-rw-r--r--net/mrtg/distinfo4
-rw-r--r--net/mrtg/patches/patch-ac17
2 files changed, 11 insertions, 10 deletions
diff --git a/net/mrtg/distinfo b/net/mrtg/distinfo
index f6a996b3183..7bc21417ea7 100644
--- a/net/mrtg/distinfo
+++ b/net/mrtg/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2004/12/31 10:08:42 minskim Exp $
+$NetBSD: distinfo,v 1.17 2004/12/31 10:44:27 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) = 7c451660aa1ad5f380896b8c3e39927bc72957ec
+SHA1 (patch-ac) = 591006bc9732f1ce59d0cd1d93348c6578089744
SHA1 (patch-ad) = bdcea3ea03b988a675552c74eefe0b3278d7349b
SHA1 (patch-ae) = 0583ab18c911b2ff32bce7da8c61cdb82f28f90a
diff --git a/net/mrtg/patches/patch-ac b/net/mrtg/patches/patch-ac
index 3bab845c44b..0a0a519c453 100644
--- a/net/mrtg/patches/patch-ac
+++ b/net/mrtg/patches/patch-ac
@@ -1,13 +1,14 @@
-$NetBSD: patch-ac,v 1.6 2004/12/31 10:08:42 minskim Exp $
+$NetBSD: patch-ac,v 1.7 2004/12/31 10:44:27 minskim Exp $
--- 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
+@@ -36,8 +36,8 @@ bin/rateup.o: $(top_srcdir)/src/rateup.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $(top_srcdir)/src/rateup.c -o bin/rateup.o
--all: bin/rateup subst
-+all: bin/rateup
+ subst:
+- $(PERL) -0777 -p -i~ -e 's@^#!\s*/\S*perl@#! $(PERL)@' $(top_srcdir)/bin/cfgmaker $(top_srcdir)/bin/indexmaker $(top_srcdir)/bin/mrtg
+ $(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
- bin/rateup: bin/rateup.o
- LD_RUN_PATH=$(LD_RUN_PATH) $(CC) bin/rateup.o -o bin/rateup $(LDFLAGS) $(LIBS)
+ clean:
+ -rm -f bin/rateup