SF.net SVN: gar:[23996] csw/mgar/pkg/privoxy/trunk

[dmichelsen at users.sourceforge.net]

Revision: 23996
          http://sourceforge.net/p/gar/code/23996
Author:   dmichelsen
Date:     2014-08-14 12:15:06 +0000 (Thu, 14 Aug 2014)
Log Message:
-----------
privoxy/trunk: Adjust locations and ownership

Modified Paths:
--------------
    csw/mgar/pkg/privoxy/trunk/Makefile
    csw/mgar/pkg/privoxy/trunk/files/cswprivoxy

Modified: csw/mgar/pkg/privoxy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/privoxy/trunk/Makefile	2014-08-14 11:38:10 UTC (rev 23995)
+++ csw/mgar/pkg/privoxy/trunk/Makefile	2014-08-14 12:15:06 UTC (rev 23996)
@@ -22,6 +22,7 @@
 DISTNAME = $(NAME)-$(VERSION)-stable
 DISTFILES += $(DISTNAME)-src.tar.gz
 DISTFILES += cswprivoxy
+EXPANDVARS += cswprivoxy
 DISTFILES += cswusergroup
 
 VENDOR_URL = http://www.privoxy.org/
@@ -39,6 +40,14 @@
 CONFFILES += user.filter
 PRESERVECONF += $(addprefix $(sysconfdir)/,$(CONFFILES))
 
+PIDDIR = $(localstatedir)/privoxy
+
+PROTOTYPE_MODIFIERS += chownprivoxy
+PROTOTYPE_FILES_chownprivoxy += $(PIDDIR)
+PROTOTYPE_FILES_chownprivoxy += $(sysconfdir)(/.*)?
+PROTOTYPE_USER_chownprivoxy = privoxy
+PROTOTYPE_GROUP_chownprivoxy = privoxy
+
 # This is just an example
 CHECKPKG_OVERRIDES_CSWprivoxy += file-with-bad-content|/usr/share|root/etc/opt/csw/privoxy/config.CSW
 
@@ -48,8 +57,8 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 
 # Supress sub directories for logs and pid file
-INSTALL_ARGS += LOGS_DEST=$(localstatedir)
-INSTALL_ARGS += PIDS_DEST=$(localstatedir)
+INSTALL_ARGS += LOGS_DEST=$(localstatedir)/privoxy
+INSTALL_ARGS += PIDS_DEST=$(localstatedir)/privoxy
 
 include gar/category.mk
 
@@ -71,4 +80,6 @@
 		@echo --- Installing cswinitsmf file ---
 		ginstall -d $(DESTDIR)/etc/opt/csw/init.d
 		cp $(WORKDIR)/cswprivoxy $(DESTDIR)/etc/opt/csw/init.d/
+
+		mkdir -p $(DESTDIR)$(PIDDIR)
 		@$(MAKECOOKIE)

Modified: csw/mgar/pkg/privoxy/trunk/files/cswprivoxy
===================================================================
--- csw/mgar/pkg/privoxy/trunk/files/cswprivoxy	2014-08-14 11:38:10 UTC (rev 23995)
+++ csw/mgar/pkg/privoxy/trunk/files/cswprivoxy	2014-08-14 12:15:06 UTC (rev 23996)
@@ -102,10 +102,10 @@
 # Path to executable.
 P_DAEMON=privoxy
 # Full path to location of Privoxy config file. 
-P_CONF_FILE=/opt/csw/etc/privoxy/config
+P_CONF_FILE=@sysconfdir@/config
 # Full path to PID file location. Location must be writable by 
 # whoever runs this script and by Privoxy itself.
-P_PIDFILE=/var/opt/csw/privoxy/privoxy.pid
+P_PIDFILE=@PIDDIR@/privoxy.pid
 # If uncommented, this script will try to run as USER=privoxy, which
 # may require special handling of config, *.action, trust, logfile, 
 # jarfile, and pidfile.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.