aboutsummaryrefslogtreecommitdiff
path: root/sysutils/munin-master/files/patch-Makefile.config
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/munin-master/files/patch-Makefile.config')
-rw-r--r--sysutils/munin-master/files/patch-Makefile.config29
1 files changed, 21 insertions, 8 deletions
diff --git a/sysutils/munin-master/files/patch-Makefile.config b/sysutils/munin-master/files/patch-Makefile.config
index 7e1b893d6f0f..52f43ea968a4 100644
--- a/sysutils/munin-master/files/patch-Makefile.config
+++ b/sysutils/munin-master/files/patch-Makefile.config
@@ -1,6 +1,6 @@
---- munin-1.0.0pre3.orig/Makefile.config Sun Feb 1 22:05:52 2004
-+++ munin-1.0.0pre3/Makefile.config Sat Feb 7 12:48:23 2004
-@@ -7,42 +7,46 @@
+--- munin-1.2.0rc2.orig/Makefile.config Mon Jan 10 11:38:32 2005
++++ munin-1.2.0rc2/Makefile.config Thu Feb 3 11:11:46 2005
+@@ -7,52 +7,56 @@
#
# the base of the Munin installation.
#
@@ -33,11 +33,13 @@
# Where to put internal binaries and plugin repository
-LIBDIR = $(PREFIX)/lib
-+LIBDIR = ${DATADIR}
++LIBDIR = $(DATADIR)
# Server only - Output directory
-HTMLDIR = $(PREFIX)/var/www
+-CGIDIR = $(HTMLDIR)/cgi
+HTMLDIR = $(PREFIX)/www/data/munin
++CGIDIR = $(PREFIX)/www/cgi-bin
# Client only - Where to put RRD files and other intenal data
-DBDIR = $(DESTDIR)/var/opt/munin
@@ -49,7 +51,7 @@
# Where Munin should place its logs.
-LOGDIR = $(DESTDIR)/var/log/munin
-+LOGDIR = /var/log
++LOGDIR = /var/log/munin-main
# Location of PID files and other statefiles. On the server, must be
# writable by the user "munin".
@@ -57,9 +59,20 @@
+STATEDIR = /var/run/munin
# The perl interpreter to use
- PERL = $(shell which perl)
-@@ -65,9 +69,8 @@
- GROUP = munin
+-PERL = $(shell which perl)
++# Passed in from FreeBSD port Makefile.
+
+ # The python interpreter to use (used by some plugins)
+ PYTHON = /usr/bin/env python
+
+ # Server only - Where to install the perl libraries
+-PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g")
++PERLLIB = $(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g")
+
+ # Client only - Install plugins for this architecture
+ OSTYPE = $(shell uname | tr '[A-Z]' '[a-z]')
+@@ -72,9 +76,8 @@
+ PLUGINUSER = nobody
# Which command to use to check if the USER and GROUP to run Munin as, exists.
-GETENT = $(shell which getent || which true 2>/dev/null)