Ticket #19304: privoxy-3.0.14-beta.diff

Portfile

@@ -2 +2 @@
 
 PortSystem                      1.0
 name                            privoxy
-version                         3.0.10
+version                         3.0.14
 categories                      www security net
 maintainers                     nomaintainer
 description                     Advanced filtering web proxy
@@ -18 +18 @@
 
 homepage                        http://www.privoxy.org/
 master_sites            sourceforge:ijbswa
-distname                        ${name}-${version}-stable-src
+distname                        ${name}-${version}-beta-src
 
-checksums                       md5     01281017f28be2c7133124d1768da364 \
-                                        sha1    0ce51a8dc938fe6412daa7f6edf159b98fd66d54 \
-                                        rmd160  91c8d56b71a5c606554bf509827197d689d8fc10
+checksums           md5     10d68175f12ca354bb099b09b682c768 \
+                    sha1    ea2fdf98a5dbad368158187aa19f525997166529 \
+                    rmd160  1d4188b8549b09a1c09544ad0036c98784897fbd
 
-worksrcdir                      ${name}-${version}-stable
 
+worksrcdir                      ${name}-${version}-beta
+
 depends_lib                     port:pcre port:zlib
 
 set privoxyGroup        privoxy
@@ -64 +65 @@
                         ${destroot}${prefix}/etc/rc.d/privoxy.sh
         }
         # Rename these so local modifications are not removed on uninstall
-        foreach privoxyConf {config trust user.action} {
-                file rename ${destroot}${prefix}/etc/privoxy/${privoxyConf} \
-                        ${destroot}${prefix}/etc/privoxy/${privoxyConf}-dist \
-        }
+        foreach privoxyConf {config trust user.action user.filter match-all.action} {
+            if [file exists ${destroot}${prefix}/etc/privoxy/${privoxyConf}] {
+                file rename ${destroot}${prefix}/etc/privoxy/${privoxyConf} \
+                    ${destroot}${prefix}/etc/privoxy/${privoxyConf}-dist 
+            }
+        }
         # Remove the preinstalled log files as, otherwise, a rotation script
         # will fail when trying to rename and compress due to gzip not liking
         # multi-linked files (the one in ${prefix} and the one in
@@ -86 +89 @@
                         -group ${privoxyGroup} -owner ${privoxyUser} \
                         -permissions 0660
         }
-        foreach privoxyConf {config trust user.action} {
+        foreach privoxyConf {config trust user.action user.filter match-all.action} {
                 if ![file exists ${prefix}/etc/privoxy/${privoxyConf}] {
                         file copy ${prefix}/etc/privoxy/${privoxyConf}-dist \
                                 ${prefix}/etc/privoxy/${privoxyConf}