Mon Dec 20 08:40:19 2010 UTC ()
Remove hardcoding of /usr/pkg, use $(LOCALBASE) instead.
Part of fixing PR#34977.


(he)
diff -r1.3 -r1.4 pkgsrc/sysutils/munin-doc/distinfo
diff -r1.2 -r1.3 pkgsrc/sysutils/munin-doc/patches/patch-aa
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/munin-doc/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/munin-doc/Attic/distinfo 2006/12/05 14:53:32 1.3
+++ pkgsrc/sysutils/munin-doc/Attic/distinfo 2010/12/20 08:40:19 1.4
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.3 2006/12/05 14:53:32 xtraeme Exp $ 1$NetBSD: distinfo,v 1.4 2010/12/20 08:40:19 he Exp $
2 2
3SHA1 (munin_1.3.2.tar.gz) = 575c1dc3373e2e001accd1920fd815d9b875c95a 3SHA1 (munin_1.3.2.tar.gz) = 575c1dc3373e2e001accd1920fd815d9b875c95a
4RMD160 (munin_1.3.2.tar.gz) = 7bcc16d00ad28731041015ef240144ed0c4fdeb4 4RMD160 (munin_1.3.2.tar.gz) = 7bcc16d00ad28731041015ef240144ed0c4fdeb4
5Size (munin_1.3.2.tar.gz) = 309319 bytes 5Size (munin_1.3.2.tar.gz) = 309319 bytes
6SHA1 (patch-aa) = f17112a37d968d507bee23069d580c98ee8b1807 6SHA1 (patch-aa) = 88e5e98f6ea901d1291c73812a92ba452fe76570
7SHA1 (patch-ad) = 8accd3875324035f2c95903fc37cee4b4a55948a 7SHA1 (patch-ad) = 8accd3875324035f2c95903fc37cee4b4a55948a
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/munin-doc/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/sysutils/munin-doc/patches/Attic/patch-aa 2006/07/02 10:37:29 1.2
+++ pkgsrc/sysutils/munin-doc/patches/Attic/patch-aa 2010/12/20 08:40:19 1.3
@@ -1,26 +1,28 @@ @@ -1,26 +1,28 @@
1$NetBSD: patch-aa,v 1.2 2006/07/02 10:37:29 rillig Exp $ 1$NetBSD: patch-aa,v 1.3 2010/12/20 08:40:19 he Exp $
 2
 3Redefine where we install this package.
2 4
3--- Makefile.config.orig 2005-01-10 11:38:22.000000000 +0100 5--- Makefile.config.orig 2005-01-10 11:38:22.000000000 +0100
4+++ Makefile.config 6+++ Makefile.config
5@@ -7,32 +7,36 @@ 7@@ -7,32 +7,36 @@
6 # 8 #
7 # the base of the Munin installation. 9 # the base of the Munin installation.
8 #  10 #
9-PREFIX = $(DESTDIR)/opt/munin 11-PREFIX = $(DESTDIR)/opt/munin
10+ifdef PREFIX 12+ifdef PREFIX
11+UPREFIX = $(DESTDIR)$(PREFIX) 13+UPREFIX = $(DESTDIR)$(PREFIX)
12+else 14+else
13+UPREFIX= = $(DESTDIR)/usr/pkg 15+UPREFIX= = $(DESTDIR)$(LOCALBASE)
14+endif 16+endif
15  17
16 # Where Munin keeps its configurations (server.conf, client.conf, ++) 18 # Where Munin keeps its configurations (server.conf, client.conf, ++)
17-CONFDIR = $(DESTDIR)/etc/opt/munin 19-CONFDIR = $(DESTDIR)/etc/opt/munin
18+CONFDIR = $(UPREFIX)/etc/munin 20+CONFDIR = $(UPREFIX)/etc/munin
19  21
20 # Server only - where to put munin-cron 22 # Server only - where to put munin-cron
21-BINDIR = $(PREFIX)/bin 23-BINDIR = $(PREFIX)/bin
22+BINDIR = $(UPREFIX)/bin 24+BINDIR = $(UPREFIX)/bin
23  25
24 # Client only - where to put munin-node, munin-node-configure, and munin-run 26 # Client only - where to put munin-node, munin-node-configure, and munin-run
25-SBINDIR = $(PREFIX)/sbin 27-SBINDIR = $(PREFIX)/sbin
26+SBINDIR = $(UPREFIX)/sbin 28+SBINDIR = $(UPREFIX)/sbin