Revision: 53129 http://trac.macports.org/changeset/53129 Author: ryandesign@macports.org Date: 2009-06-29 21:53:03 -0700 (Mon, 29 Jun 2009) Log Message: ----------- php5-devel: merge from php5 r53127: fix date("Y") returning "0000" on PowerPC; see http://lists.macosforge.org/pipermail/macports-users/2009-June/015743.html Modified Paths: -------------- trunk/dports/lang/php5-devel/Portfile Added Paths: ----------- trunk/dports/lang/php5-devel/files/patch-ext-date-php_date.c.diff Property Changed: ---------------- trunk/dports/lang/php5-devel/ Property changes on: trunk/dports/lang/php5-devel ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/dports/lang/php5:52241-52279 + /trunk/dports/lang/php5:52241-52279,53127 Modified: trunk/dports/lang/php5-devel/Portfile =================================================================== --- trunk/dports/lang/php5-devel/Portfile 2009-06-30 04:52:51 UTC (rev 53128) +++ trunk/dports/lang/php5-devel/Portfile 2009-06-30 04:53:03 UTC (rev 53129) @@ -5,6 +5,7 @@ name php5-devel epoch 1 version 5.3.0RC4 +revision 1 set major [lindex [split ${version} .] 0] set my_name php${major} dist_subdir ${my_name} @@ -58,6 +59,7 @@ port:freetype patchfiles \ + patch-ext-date-php_date.c.diff \ patch-bind.diff use_autoconf yes Copied: trunk/dports/lang/php5-devel/files/patch-ext-date-php_date.c.diff (from rev 53127, trunk/dports/lang/php5/files/patch-ext-date-php_date.c.diff) =================================================================== --- trunk/dports/lang/php5-devel/files/patch-ext-date-php_date.c.diff (rev 0) +++ trunk/dports/lang/php5-devel/files/patch-ext-date-php_date.c.diff 2009-06-30 04:53:03 UTC (rev 53129) @@ -0,0 +1,11 @@ +--- ext/date/php_date.c 2009-06-17 12:56:17.000000000 -0500 ++++ ext/date/php_date.c 2009-06-29 23:27:55.000000000 -0500 +@@ -1050,7 +1050,7 @@ + /* year */ + case 'L': length = slprintf(buffer, 32, "%d", timelib_is_leap((int) t->y)); break; + case 'y': length = slprintf(buffer, 32, "%02d", (int) t->y % 100); break; +- case 'Y': length = slprintf(buffer, 32, "%s%04ld", t->y < 0 ? "-" : "", llabs((timelib_sll) t->y)); break; ++ case 'Y': length = slprintf(buffer, 32, "%s%04lld", t->y < 0 ? "-" : "", llabs((timelib_sll) t->y)); break; + + /* time */ + case 'a': length = slprintf(buffer, 32, "%s", t->h >= 12 ? "pm" : "am"); break;