Ticket #20681: Portfile.diff

lang/php5/Portfile

@@ -13 +13 @@
 maintainers             ryandesign jwa
 homepage                http://www.php.net/
-master_sites            php
+##Currently, the group definition introduced w/ changeset #55557 fails,
+## because only 'www.php.net/' will work while '<lang-code>.php.net/' will
+## retrieve an error message in html format
+#master_sites            php
+master_sites            http://www.php.net/distributions/
 distname                php-${version}
 use_bzip2               yes
 platforms               darwin freebsd
 use_parallel_build      yes
+set suhosin_patch_ver   ${version}-0.9.8-BETA-1
 
 description \
@@ -28 +33 @@
 
 checksums \
-    md5     846760cd655c98dfd86d6d97c3d964b0 \
-    sha1    934700941d216c453376e3bf24347041cf12c6dc \
-    rmd160  9a71b74052b0ca515f2ddf95c051b47a73d33f44
+    ${distname}.tar.bz2 md5     846760cd655c98dfd86d6d97c3d964b0 \
+    ${distname}.tar.bz2 sha1    934700941d216c453376e3bf24347041cf12c6dc \
+    ${distname}.tar.bz2 rmd160  9a71b74052b0ca515f2ddf95c051b47a73d33f44
 
 depends_build \
@@ -435 +440 @@
 }
 
+variant suhosin description {Add suhosin patch} {
+##The following doesn't work, because I'm unable to come up with a definition which ensures that
+##patch is called with '-p1' for the suhosin patch only and with (the default) '-p0' for all other patches
+#    patch.args-append \
+#        -p1
+#    patch_sites-append \
+#        http://download.suhosin.org/
+#    checksums-append \
+#        suhosin-patch-${suhosin_patch_ver}.patch.gz    sha1 8bad461c7b16febc1d2f6bcbf4c8e10428569591 \
+#        suhosin-patch-${suhosin_patch_ver}.patch.gz    md5  62dc36545b86bf86e44ada1fccc17d0a
+#    patchfiles-append \
+#        suhosin-patch-${suhosin_patch_ver}.patch.gz
+
+##This leaves us with only two alternatives: either treat the patchfile as 'normal' file to be retrieved and
+##invoke patch 'manually' as follows, or maintain a modified local copy of the suhosin patch in our repository
+##(the chosen solution still has the disadvantage that suhosin.org is polled for the main php5 tarball)
+    master_sites-append \
+        http://download.suhosin.org/
+    checksums-append \
+        suhosin-patch-${suhosin_patch_ver}.patch.gz     sha1 8bad461c7b16febc1d2f6bcbf4c8e10428569591 \
+        suhosin-patch-${suhosin_patch_ver}.patch.gz     md5  62dc36545b86bf86e44ada1fccc17d0a
+    distfiles-append \
+         suhosin-patch-${suhosin_patch_ver}.patch.gz
+##'post-fetch' would be too early here:
+    pre-configure {
+        exec gzcat "${distpath}/suhosin-patch-${suhosin_patch_ver}.patch.gz" | patch -d "${worksrcpath}" -p1
+    }
+}
+
 test.run                yes