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

[dmichelsen at users.sourceforge.net]

Revision: 23313
          http://sourceforge.net/p/gar/code/23313
Author:   dmichelsen
Date:     2014-04-02 15:11:35 +0000 (Wed, 02 Apr 2014)
Log Message:
-----------
privoxy/trunk: Update to 3.0.21 and latest standards

Modified Paths:
--------------
    csw/mgar/pkg/privoxy/trunk/Makefile
    csw/mgar/pkg/privoxy/trunk/checksums

Modified: csw/mgar/pkg/privoxy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/privoxy/trunk/Makefile	2014-04-02 14:33:12 UTC (rev 23312)
+++ csw/mgar/pkg/privoxy/trunk/Makefile	2014-04-02 15:11:35 UTC (rev 23313)
@@ -4,7 +4,7 @@
 # least) log rotation.
 #
 NAME = privoxy
-VERSION = 3.0.12
+VERSION = 3.0.21
 GARTYPE = v2
 
 DESCRIPTION = A web proxy with advanced filtering capabilities
@@ -19,52 +19,56 @@
 
 MASTER_SITES = $(SF_MIRRORS)
 SF_PROJECT = ijbswa
-DISTFILES  = $(NAME)-$(VERSION)-stable-src.tar.gz
 DISTNAME = $(NAME)-$(VERSION)-stable
+DISTFILES += $(DISTNAME)-src.tar.gz
+DISTFILES += cswprivoxy
+DISTFILES += cswusergroup
 
-SPKG_SOURCEURL = http://www.privoxy.org/
-SPKG_CLASSES = none cswusergroup cswcpsampleconf cswinitsmf
+VENDOR_URL = http://www.privoxy.org/
+RUNTIME_DEP_PKGS_CSWprivoxy += CSWlibpcre1
+RUNTIME_DEP_PKGS_CSWprivoxy += CSWlibpcreposix0
+RUNTIME_DEP_PKGS_CSWprivoxy += CSWlibz1
 
-RUNTIME_DEP_PKGS = CSWclassutils CSWpcrert CSWzlib
+sysconfdir = /etc$(prefix)/privoxy
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)-stable-src.tar.gz
+INITSMF += /etc/opt/csw/init.d/cswprivoxy
+USERGROUP += /opt/csw/etc/pkg/CSWprivoxy/cswusergroup
 
+CONFFILES += config
+CONFFILES += user.action
+CONFFILES += user.filter
+PRESERVECONF += $(addprefix $(sysconfdir)/,$(CONFFILES))
+
+# This is just an example
+CHECKPKG_OVERRIDES_CSWprivoxy += file-with-bad-content|/usr/share|root/etc/opt/csw/privoxy/config.CSW
+
+# There is no testsuite
 TEST_SCRIPTS =
 
-sysconfdir = /opt/csw/etc/privoxy
-localstatedir = /var/opt/csw/privoxy
-
 CONFIGURE_ARGS = $(DIRPATHS)
 
 # Supress sub directories for logs and pid file
-INSTALL_ARGS = LOGS_DEST=$(localstatedir) PIDS_DEST=$(localstatedir)
+INSTALL_ARGS += LOGS_DEST=$(localstatedir)
+INSTALL_ARGS += PIDS_DEST=$(localstatedir)
 
-PROTOTYPE_FILTER  = awk '\
-        $$$$3 ~ /\/init.d\/cswprivoxy$$$$/ { $$$$2 = "cswinitsmf" } \
-        $$$$3 ~ /cswusergroup$$$$/ { $$$$2 = "cswusergroup" } \
-        $$$$3 ~ /.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \
-         { print }'
-
 include gar/category.mk
 
 pre-configure-modulated:
-		@perl -pi -e 's|-Wall||' $(WORKSRC)/GNUmakefile.in
-		@cd $(WORKSRC) && autoheader && autoconf
+		perl -pi -e 's|-Wall||' $(WORKSRC)/GNUmakefile.in
+		cd $(WORKSRC) && autoheader && autoconf
 		@$(MAKECOOKIE)
 
 
-post-install-modulated: CONFFILES := config user.action user.filter
 post-install-modulated:
 		@echo --- Installing cswusergroup file ---
-		@ginstall -d $(DESTDIR)/opt/csw/etc/pkg/CSWprivoxy/
-		@cp $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWprivoxy/
+		ginstall -d $(DESTDIR)/opt/csw/etc/pkg/CSWprivoxy/
+		cp $(WORKDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWprivoxy/
 
 		@echo --- Installing cpsampleconf config files ---
 		$(foreach C,$(CONFFILES), \
 			mv $(DESTDIR)$(sysconfdir)/$(C) $(DESTDIR)$(sysconfdir)/$(C).CSW; )
 
 		@echo --- Installing cswinitsmf file ---
-		@ginstall -d $(DESTDIR)/etc/opt/csw/init.d
-		@cp $(FILEDIR)/cswprivoxy $(DESTDIR)/etc/opt/csw/init.d/
+		ginstall -d $(DESTDIR)/etc/opt/csw/init.d
+		cp $(WORKDIR)/cswprivoxy $(DESTDIR)/etc/opt/csw/init.d/
 		@$(MAKECOOKIE)

Modified: csw/mgar/pkg/privoxy/trunk/checksums
===================================================================
--- csw/mgar/pkg/privoxy/trunk/checksums	2014-04-02 14:33:12 UTC (rev 23312)
+++ csw/mgar/pkg/privoxy/trunk/checksums	2014-04-02 15:11:35 UTC (rev 23313)
@@ -1 +1 @@
-c973e608d27b248ef567b47664308da1  download/privoxy-3.0.12-stable-src.tar.gz
+79558f2545cfcf9731f7de611646d837  privoxy-3.0.21-stable-src.tar.gz

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