Ticket #19304: privoxy-3.0.12-1.diff

Portfile

@@ -2 +2 @@
 
 PortSystem                      1.0
 name                            privoxy
-version                         3.0.10
+version                         3.0.12
 categories                      www security net
 maintainers                     nomaintainer
 description                     Advanced filtering web proxy
@@ -20 +20 @@
 master_sites            sourceforge:ijbswa
 distname                        ${name}-${version}-stable-src
 
-checksums                       md5     01281017f28be2c7133124d1768da364 \
-                                        sha1    0ce51a8dc938fe6412daa7f6edf159b98fd66d54 \
-                                        rmd160  91c8d56b71a5c606554bf509827197d689d8fc10
+checksums           md5     c973e608d27b248ef567b47664308da1 \
+                    sha1    1118d6a7b4980f26c9ad0902c0e6af5aaaf1a640 \
+                    rmd160  32509b897e073f1cc100b8a4a157d19a219b51cd
 
 worksrcdir                      ${name}-${version}-stable
 
@@ -64 +64 @@
                         ${destroot}${prefix}/etc/rc.d/privoxy.sh
         }
         # Rename these so local modifications are not removed on uninstall
-        foreach privoxyConf {config trust user.action} {
+        foreach privoxyConf {config.new trust.new user.action.new user.filter.new} {
+            if [file exists ${destroot}${prefix}/etc/privoxy/${privoxyConf}] {
                 file rename ${destroot}${prefix}/etc/privoxy/${privoxyConf} \
-                        ${destroot}${prefix}/etc/privoxy/${privoxyConf}-dist \
+                        ${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
@@ -88 +90 @@
         }
         foreach privoxyConf {config trust user.action} {
                 if ![file exists ${prefix}/etc/privoxy/${privoxyConf}] {
-                        file copy ${prefix}/etc/privoxy/${privoxyConf}-dist \
+                        file copy ${prefix}/etc/privoxy/${privoxyConf}.new \
                                 ${prefix}/etc/privoxy/${privoxyConf}
                         file attributes ${prefix}/etc/privoxy/${privoxyConf} \
                                 -group ${privoxyGroup} -owner ${privoxyUser} \