mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-18 03:46:03 +00:00
94ebcf4d98
- Move some files around and adjust the plists accordingly. - Fix some directory creation / deletion in the plists. - Fix some directory ownerships. - Instead of patching the Makefile, specify installation directories on the command line. Centralize the definition of MAKE_ARGS and some other shared variables. Feature safe: yes
15 lines
1009 B
Plaintext
15 lines
1009 B
Plaintext
--- Makefile.config.orig 2009-12-30 05:55:56.000000000 -0700
|
|
+++ Makefile.config 2010-01-30 11:17:34.000000000 -0700
|
|
@@ -126,9 +129,8 @@
|
|
# Which command to use to check if the USER and GROUP to run Munin as, exists.
|
|
# These will work on most modern OSes:
|
|
#
|
|
-GETENT := $(shell which getent || which true 2>/dev/null)
|
|
-CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
|
|
-CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
|
|
+CHECKUSER:= $(shell /usr/sbin/pw user show $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
|
|
+CHECKGROUP:= $(shell /usr/sbin/pw group show $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
|
|
|
|
# For OSX, comment out the previous two lines and comment in these
|
|
#
|