[21345] trunk/dports/www/privoxy

source_changes at macosforge.org source_changes at macosforge.org
Sun Jan 21 06:09:59 PST 2007


Revision: 21345
          http://trac.macosforge.org/projects/macports/changeset/21345
Author:   css at macports.org
Date:     2007-01-21 06:09:59 -0800 (Sun, 21 Jan 2007)

Log Message:
-----------
Updated privoxy to 3.0.6 (#11196)

Modified Paths:
--------------
    trunk/dports/www/privoxy/Portfile
    trunk/dports/www/privoxy/files/patch-GNUmakefile.in

Modified: trunk/dports/www/privoxy/Portfile
===================================================================
--- trunk/dports/www/privoxy/Portfile	2007-01-21 12:23:44 UTC (rev 21344)
+++ trunk/dports/www/privoxy/Portfile	2007-01-21 14:09:59 UTC (rev 21345)
@@ -2,8 +2,7 @@
 
 PortSystem			1.0
 name				privoxy
-version				3.0.3-2
-revision			3
+version				3.0.6
 categories			www security net
 maintainers			nomaintainer at macports.org
 description			Advanced filtering web proxy
@@ -19,11 +18,12 @@
 
 homepage			http://www.privoxy.org/
 master_sites		sourceforge:ijbswa
-distname			${name}-${version}-stable.src
+distname			${name}-${version}-stable-src
 
-checksums			md5 d7f6c2fcb926e6110659de6e866b21e4
+checksums			md5 c3b34c620e1174f0c0b91aa2a04ceae4 \
+				sha1 6369c02ef6e044d23fd1d90f6523b489abe58c0c
 
-worksrcdir			${name}-3.0.3-stable
+worksrcdir			${name}-${version}-stable
 
 depends_lib			lib:libpcre:pcre
 
@@ -32,14 +32,6 @@
 
 patchfiles			patch-GNUmakefile.in
 
-use_autoconf		yes
-
-configure.env		CPPFLAGS="-I${prefix}/include" LDFLAGS="-L${prefix}/lib"
-configure.args		--disable-dynamic-pcrs --with-user=${privoxyUser} \
-					--with-group=${privoxyGroup} \
-					--sysconfdir=${prefix}/etc/${name} \
-					--mandir=${prefix}/share/man
-
 pre-configure {
 	addgroup	${privoxyGroup}
 	adduser		${privoxyUser} gid=[existsgroup ${privoxyGroup}]
@@ -47,6 +39,13 @@
 	system "autoheader"
 }
 
+use_autoconf		yes
+configure.env		CPPFLAGS="-I${prefix}/include" LDFLAGS="-L${prefix}/lib"
+configure.args		--disable-dynamic-pcrs --with-user=${privoxyUser} \
+					--with-group=${privoxyGroup} \
+					--sysconfdir=${prefix}/etc/${name} \
+					--mandir=${prefix}/share/man
+
 destroot.keepdirs	${destroot}${prefix}/var/log/privoxy \
 					${destroot}${prefix}/var/run
 
@@ -99,8 +98,6 @@
 }
 
 platform darwin {
-	patchfiles-append	patch-jcc.h
-
 	startupitem.create			yes
 	startupitem.name			Privoxy
 	startupitem.start			"\[ -f \"${prefix}/etc/privoxy/config\" \] \\"

Modified: trunk/dports/www/privoxy/files/patch-GNUmakefile.in
===================================================================
--- trunk/dports/www/privoxy/files/patch-GNUmakefile.in	2007-01-21 12:23:44 UTC (rev 21344)
+++ trunk/dports/www/privoxy/files/patch-GNUmakefile.in	2007-01-21 14:09:59 UTC (rev 21345)
@@ -1,5 +1,5 @@
---- GNUmakefile.in.orig	Tue Feb 17 07:13:27 2004
-+++ GNUmakefile.in	Sat May  1 20:30:55 2004
+--- GNUmakefile.in.orig	2006-12-28 12:34:14.000000000 -0600
++++ GNUmakefile.in	2006-12-28 13:15:27.000000000 -0600
 @@ -67,6 +67,8 @@
  LOGS_DEST    = $(VAR_DEST)/log/privoxy
  PIDS_DEST    = $(VAR_DEST)/run
@@ -18,7 +18,7 @@
  
  
  #############################################################################
-@@ -1087,22 +1089,22 @@
+@@ -1086,23 +1088,23 @@
  
  	@$(ECHO) "Creating directories, and preparing $(PROGRAM_V) installation"
  	$(CHMOD) $(DIR_MODE) $(MKDIR)
@@ -36,6 +36,7 @@
 +	$(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(DESTDIR)$(SBIN_DEST)
       
  	@# Install the DOCS and man page. install-sh only does one file at a time.
+ 	@# FIXME: only handles jpegs.
  	- at if [ $(check_doc) = 0 ]; then \
 -		DOC=$(DOC_DEST) ;\
 +		DOC=$(DESTDIR)$(DOC_DEST) ;\
@@ -49,8 +50,8 @@
  	if [ -d "$(DOK_WEB)" ]; then \
  		$(ECHO) Installing FAQ, Manual, and other docs to $$DOC;\
            for i in user-manual developer-manual faq; do \
-@@ -1122,8 +1124,8 @@
- 		$(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $$DOC;\
+@@ -1123,8 +1125,8 @@
+ 		$(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $$DOC/user-manual;\
  	fi
  	@# Not all platforms support gzipped man pages.
 -	@$(ECHO) Installing man page to $(MAN_DEST)/privoxy.1
@@ -60,7 +61,7 @@
  
  	@# Change the config file default directories according to the configured ones
  	@$(ECHO) Rewriting config for this installation
-@@ -1139,9 +1141,9 @@
+@@ -1145,9 +1147,9 @@
  	@# Install the config support files. Test for root install, and abort 
  	@# if there is no privoxy user, and no other user was enabled during 
  	@# configure. Later, install init script if appropriate.
@@ -72,15 +73,21 @@
  	done
  
  	@# FIXME: group/user validation is overly convoluted.
-@@ -1179,32 +1181,32 @@
+@@ -1185,36 +1187,36 @@
  		fi ;\
  		INSTALL_CONF="$(INSTALL_R)" ;\
  	fi ;\
 -	$(ECHO) Installing configuration files to $(CONF_DEST);\
 +	$(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
  	for i in $(CONFIGS); do \
--		if [ -s "$(CONF_DEST)/$$i" ] ; then \
-+		if [ -s "$(DESTDIR)$(CONF_DEST)/$$i" ] ; then \
+ 		if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] || [ "$$i" = "standard.action" ]; then \
+-			$(RM) $(CONF_DEST)/$$i ;\
++			$(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
+ 			$(ECHO) Installing fresh $$i;\
+-			$(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST) || exit 1;\
+-		elif [ -s "$(CONF_DEST)/$$i" ]; then \
++			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
++		elif [ -s "$(DESTDIR)$(CONF_DEST)/$$i" ]; then \
  			$(ECHO) Installing $$i as $$i.new ;\
 -			$(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST)/$$i.new || exit 1;\
 +			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
@@ -116,8 +123,8 @@
  	if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \
  		if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \
                 $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \
-@@ -1234,7 +1236,7 @@
- 	fi
+@@ -1245,7 +1247,7 @@
+ 	$(RM) config.base config.tmp
  	@# mmmmm, good.
  	@$(ECHO) "$(PROGRAM_V) installation succeeded!"
 -	@$(ECHO) "The Privoxy configuration files have been installed in $(CONF_DEST)"

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070121/27a9a62d/attachment.html


More information about the macports-changes mailing list