[56575] trunk/dports/lang/php52
ryandesign at macports.org
ryandesign at macports.org
Sun Aug 30 04:42:35 PDT 2009
Revision: 56575
http://trac.macports.org/changeset/56575
Author: ryandesign at macports.org
Date: 2009-08-30 04:42:34 -0700 (Sun, 30 Aug 2009)
Log Message:
-----------
php52: merge r56403 from php5: add variant for suhosin patch
Revision Links:
--------------
http://trac.macports.org/changeset/56403
Modified Paths:
--------------
trunk/dports/lang/php52/Portfile
trunk/dports/lang/php52/files/patch-bind.diff
trunk/dports/lang/php52/files/patch-ext-date-php_date.c.diff
trunk/dports/lang/php52/files/patch-ext-pdo_oci-config.m4.diff
Property Changed:
----------------
trunk/dports/lang/php52/
Property changes on: trunk/dports/lang/php52
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/lang/php5:53631,54310,54581-55557
/trunk/dports/www/php5-devel:41985
+ /trunk/dports/lang/php5:53631,54310,54581-55557,56403
/trunk/dports/www/php5-devel:41985
Modified: trunk/dports/lang/php52/Portfile
===================================================================
--- trunk/dports/lang/php52/Portfile 2009-08-30 11:29:47 UTC (rev 56574)
+++ trunk/dports/lang/php52/Portfile 2009-08-30 11:42:34 UTC (rev 56575)
@@ -25,9 +25,10 @@
be used for command-line scripting.
checksums \
- md5 15c7b5a87f57332d6fc683528e28247b \
- sha1 9a287e2791d28928fb1ee1a1167290c5005feccd \
- rmd160 9a9ec823eda9d6b3c085967e7a71f776071fc78f
+ [suffix ${distname}] \
+ md5 15c7b5a87f57332d6fc683528e28247b \
+ sha1 9a287e2791d28928fb1ee1a1167290c5005feccd \
+ rmd160 9a9ec823eda9d6b3c085967e7a71f776071fc78f
depends_build \
port:pkgconfig \
@@ -53,6 +54,8 @@
port:libpng \
port:freetype
+# Use -p1 to accommodate the Suhosin patch
+patch.pre_args -p1
patchfiles \
patch-ext-date-php_date.c.diff \
patch-bind.diff
@@ -355,6 +358,24 @@
--with-t1lib=${prefix} \
}
+variant suhosin description {Add Suhosin patch} {
+ pre-fetch {
+ if {"darwin" == ${os.platform} && ${os.major} < 9} {
+ ui_error "The suhosin variant requires Mac OS X 10.5 or greater."
+ return -code error "incompatible Mac OS X version"
+ }
+ }
+ set suhosin_patch_version ${version}-0.9.7
+ set suhosin_patch suhosin-patch-${suhosin_patch_version}.patch.gz
+ patch_sites-append http://download.suhosin.org/
+ patchfiles-append ${suhosin_patch}
+ checksums-append \
+ ${suhosin_patch} \
+ md5 41b475a469eef0eb0e7aa10a820f12b2 \
+ sha1 3768bbded0bb2376414322b26308342452cb927a \
+ rmd160 18df1686a48d652f581591115b51461e9dacf5a4
+}
+
destroot.args \
INSTALL_ROOT=${destroot}
Modified: trunk/dports/lang/php52/files/patch-bind.diff
===================================================================
--- trunk/dports/lang/php52/files/patch-bind.diff 2009-08-30 11:29:47 UTC (rev 56574)
+++ trunk/dports/lang/php52/files/patch-bind.diff 2009-08-30 11:42:34 UTC (rev 56575)
@@ -1,5 +1,5 @@
---- ext/standard/config.m4.orig 2007-07-11 06:56:03.000000000 -0500
-+++ ext/standard/config.m4 2008-11-13 02:19:46.000000000 -0600
+--- a/ext/standard/config.m4.orig 2007-07-11 06:56:03.000000000 -0500
++++ b/ext/standard/config.m4 2008-11-13 02:19:46.000000000 -0600
@@ -311,9 +311,9 @@
dnl Detect library functions needed by php dns_xxx functions
dnl ext/standard/dns.h will collect these in a single define: HAVE_DNS_FUNCS
Modified: trunk/dports/lang/php52/files/patch-ext-date-php_date.c.diff
===================================================================
--- trunk/dports/lang/php52/files/patch-ext-date-php_date.c.diff 2009-08-30 11:29:47 UTC (rev 56574)
+++ trunk/dports/lang/php52/files/patch-ext-date-php_date.c.diff 2009-08-30 11:42:34 UTC (rev 56575)
@@ -1,5 +1,5 @@
---- ext/date/php_date.c 2009-06-05 17:34:30.000000000 -0500
-+++ ext/date/php_date.c 2009-06-29 22:39:00.000000000 -0500
+--- a/ext/date/php_date.c 2009-06-05 17:34:30.000000000 -0500
++++ b/ext/date/php_date.c 2009-06-29 22:39:00.000000000 -0500
@@ -798,7 +798,7 @@
/* year */
case 'L': length = slprintf(buffer, 32, "%d", timelib_is_leap((int) t->y)); break;
Modified: trunk/dports/lang/php52/files/patch-ext-pdo_oci-config.m4.diff
===================================================================
--- trunk/dports/lang/php52/files/patch-ext-pdo_oci-config.m4.diff 2009-08-30 11:29:47 UTC (rev 56574)
+++ trunk/dports/lang/php52/files/patch-ext-pdo_oci-config.m4.diff 2009-08-30 11:42:34 UTC (rev 56575)
@@ -1,7 +1,7 @@
See http://bugs.php.net/bug.php?id=39312.
---- ext/pdo_oci/config.m4.orig 2009-01-31 18:26:43.000000000 +0100
-+++ ext/pdo_oci/config.m4 2009-01-31 18:28:46.000000000 +0100
+--- a/ext/pdo_oci/config.m4.orig 2009-01-31 18:26:43.000000000 +0100
++++ b/ext/pdo_oci/config.m4 2009-01-31 18:28:46.000000000 +0100
@@ -97,11 +97,11 @@
else
AC_MSG_ERROR([I'm too dumb to figure out where the include dir is in your Instant Client install])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090830/bea75e79/attachment-0001.html>
More information about the macports-changes
mailing list