Revision: 92549 https://trac.macports.org/changeset/92549 Author: ryandesign@macports.org Date: 2012-04-30 22:13:23 -0700 (Mon, 30 Apr 2012) Log Message: ----------- php: patchfiles per ${php} Modified Paths: -------------- users/ryandesign/ports/lang/php/Portfile Added Paths: ----------- users/ryandesign/ports/lang/php/files/patch-php53-iODBC.diff users/ryandesign/ports/lang/php/files/patch-php53-sapi-fpm-php-fpm.conf.in.diff users/ryandesign/ports/lang/php/files/patch-php53-scripts-php-config.in.diff users/ryandesign/ports/lang/php/files/patch-php53-unixODBC.diff users/ryandesign/ports/lang/php/files/patch-php54-iODBC.diff users/ryandesign/ports/lang/php/files/patch-php54-sapi-fpm-php-fpm.conf.in.diff users/ryandesign/ports/lang/php/files/patch-php54-scripts-php-config.in.diff users/ryandesign/ports/lang/php/files/patch-php54-unixODBC.diff Removed Paths: ------------- users/ryandesign/ports/lang/php/files/patch-iODBC.diff users/ryandesign/ports/lang/php/files/patch-sapi-fpm-php-fpm.conf.in.diff users/ryandesign/ports/lang/php/files/patch-scripts-php-config.in.diff users/ryandesign/ports/lang/php/files/patch-unixODBC.diff Modified: users/ryandesign/ports/lang/php/Portfile =================================================================== --- users/ryandesign/ports/lang/php/Portfile 2012-05-01 04:39:43 UTC (rev 92548) +++ users/ryandesign/ports/lang/php/Portfile 2012-05-01 05:13:23 UTC (rev 92549) @@ -132,7 +132,7 @@ # Use -p1 to accommodate the Suhosin patch patch.pre_args -p1 - patchfiles patch-scripts-php-config.in.diff + patchfiles patch-${php}-scripts-php-config.in.diff if {${configure.compiler} == "clang"} { configure.compiler llvm-gcc-4.2 @@ -346,7 +346,7 @@ set fpmuser nobody set fpmgroup nobody - patchfiles-append patch-sapi-fpm-php-fpm.conf.in.diff + patchfiles-append patch-${php}-sapi-fpm-php-fpm.conf.in.diff post-patch { reinplace "s|@PHP@|${php}|g" ${worksrcpath}/sapi/fpm/php-fpm.conf.in @@ -669,7 +669,7 @@ variant iodbc conflicts unixodbc description {Use iODBC} { depends_lib-append port:libiodbc - patchfiles-append patch-iODBC.diff + patchfiles-append patch-${php}-iODBC.diff configure.args-append --with-iODBC=${prefix} \ --with-pdo-odbc=iODBC,${prefix} @@ -678,7 +678,7 @@ variant unixodbc conflicts iodbc description {Use unixODBC} { depends_lib-append port:unixODBC - patchfiles-append patch-unixODBC.diff + patchfiles-append patch-${php}-unixODBC.diff configure.args-append --with-unixODBC=${prefix} \ --with-pdo-odbc=unixODBC,${prefix} Deleted: users/ryandesign/ports/lang/php/files/patch-iODBC.diff =================================================================== --- users/ryandesign/ports/lang/php/files/patch-iODBC.diff 2012-05-01 04:39:43 UTC (rev 92548) +++ users/ryandesign/ports/lang/php/files/patch-iODBC.diff 2012-05-01 05:13:23 UTC (rev 92549) @@ -1,18 +0,0 @@ ---- ext/odbc/config.m4.orig 2007-07-31 08:02:00.000000000 -0500 -+++ ext/odbc/config.m4 2010-08-05 21:21:54.000000000 -0500 -@@ -99,6 +99,7 @@ - dnl - dnl configure options - dnl -+:<<'MACPORTS_DISABLED' - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(adabas,, - [ --with-adabas[=DIR] Include Adabas D support [/usr/local]]) -@@ -363,6 +364,7 @@ - AC_MSG_RESULT([$ext_ouput]) - fi - fi -+MACPORTS_DISABLED - - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(iodbc,, Copied: users/ryandesign/ports/lang/php/files/patch-php53-iODBC.diff (from rev 92544, users/ryandesign/ports/lang/php/files/patch-iODBC.diff) =================================================================== --- users/ryandesign/ports/lang/php/files/patch-php53-iODBC.diff (rev 0) +++ users/ryandesign/ports/lang/php/files/patch-php53-iODBC.diff 2012-05-01 05:13:23 UTC (rev 92549) @@ -0,0 +1,18 @@ +--- ext/odbc/config.m4.orig 2007-07-31 08:02:00.000000000 -0500 ++++ ext/odbc/config.m4 2010-08-05 21:21:54.000000000 -0500 +@@ -99,6 +99,7 @@ + dnl + dnl configure options + dnl ++:<<'MACPORTS_DISABLED' + if test -z "$ODBC_TYPE"; then + PHP_ARG_WITH(adabas,, + [ --with-adabas[=DIR] Include Adabas D support [/usr/local]]) +@@ -363,6 +364,7 @@ + AC_MSG_RESULT([$ext_ouput]) + fi + fi ++MACPORTS_DISABLED + + if test -z "$ODBC_TYPE"; then + PHP_ARG_WITH(iodbc,, Copied: users/ryandesign/ports/lang/php/files/patch-php53-sapi-fpm-php-fpm.conf.in.diff (from rev 92544, users/ryandesign/ports/lang/php/files/patch-sapi-fpm-php-fpm.conf.in.diff) =================================================================== --- users/ryandesign/ports/lang/php/files/patch-php53-sapi-fpm-php-fpm.conf.in.diff (rev 0) +++ users/ryandesign/ports/lang/php/files/patch-php53-sapi-fpm-php-fpm.conf.in.diff 2012-05-01 05:13:23 UTC (rev 92549) @@ -0,0 +1,41 @@ +--- a/sapi/fpm/php-fpm.conf.in.orig 2011-10-08 16:04:10.000000000 -0500 ++++ b/sapi/fpm/php-fpm.conf.in 2012-02-13 18:51:53.000000000 -0600 +@@ -22,14 +22,14 @@ + ; Pid file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: none +-;pid = run/php-fpm.pid ++;pid = run/@PHP@/php-fpm.pid + + ; Error log file + ; If it's set to "syslog", log is sent to syslogd instead of being written + ; in a local file. + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: log/php-fpm.log +-;error_log = log/php-fpm.log ++error_log = log/@PHP@/php-fpm.log + + ; syslog_facility is used to specify what type of program is logging the + ; message. This lets syslogd specify that messages from different facilities +@@ -42,7 +42,7 @@ + ; instances running on the same server, you can change the default value + ; which must suit common needs. + ; Default Value: php-fpm +-;syslog.ident = php-fpm ++syslog.ident = @PHP@-fpm + + ; Log level + ; Possible Values: alert, error, warning, notice, debug +@@ -76,9 +76,10 @@ + ; Default Value: 0 + ; process.max = 128 + +-; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging. ++; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging ++; or for use with launchd. + ; Default Value: yes +-;daemonize = yes ++daemonize = no + + ; Set open file descriptor rlimit for the master process. + ; Default Value: system defined value Copied: users/ryandesign/ports/lang/php/files/patch-php53-scripts-php-config.in.diff (from rev 92544, users/ryandesign/ports/lang/php/files/patch-scripts-php-config.in.diff) =================================================================== --- users/ryandesign/ports/lang/php/files/patch-php53-scripts-php-config.in.diff (rev 0) +++ users/ryandesign/ports/lang/php/files/patch-php53-scripts-php-config.in.diff 2012-05-01 05:13:23 UTC (rev 92549) @@ -0,0 +1,11 @@ +--- a/scripts/php-config.in.orig 2011-04-18 06:13:37.000000000 -0500 ++++ b/scripts/php-config.in 2012-05-01 00:05:54.000000000 -0500 +@@ -6,7 +6,7 @@ + version="@PHP_VERSION@" + vernum="@PHP_VERSION_ID@" + include_dir="@includedir@/php" +-includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib" ++includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib -I@prefix@/include" + ldflags="@PHP_LDFLAGS@" + libs="@EXTRA_LIBS@" + extension_dir='@EXTENSION_DIR@' Copied: users/ryandesign/ports/lang/php/files/patch-php53-unixODBC.diff (from rev 92544, users/ryandesign/ports/lang/php/files/patch-unixODBC.diff) =================================================================== --- users/ryandesign/ports/lang/php/files/patch-php53-unixODBC.diff (rev 0) +++ users/ryandesign/ports/lang/php/files/patch-php53-unixODBC.diff 2012-05-01 05:13:23 UTC (rev 92549) @@ -0,0 +1,18 @@ +--- ext/odbc/config.m4.orig 2007-07-31 08:02:00.000000000 -0500 ++++ ext/odbc/config.m4 2009-12-12 20:32:00.000000000 -0600 +@@ -99,6 +99,7 @@ + dnl + dnl configure options + dnl ++:<<'MACPORTS_DISABLED' + if test -z "$ODBC_TYPE"; then + PHP_ARG_WITH(adabas,, + [ --with-adabas[=DIR] Include Adabas D support [/usr/local]]) +@@ -404,6 +405,7 @@ + AC_MSG_RESULT([$ext_output]) + fi + fi ++MACPORTS_DISABLED + + if test -z "$ODBC_TYPE"; then + PHP_ARG_WITH(unixODBC,, Copied: users/ryandesign/ports/lang/php/files/patch-php54-iODBC.diff (from rev 92544, users/ryandesign/ports/lang/php/files/patch-iODBC.diff) =================================================================== --- users/ryandesign/ports/lang/php/files/patch-php54-iODBC.diff (rev 0) +++ users/ryandesign/ports/lang/php/files/patch-php54-iODBC.diff 2012-05-01 05:13:23 UTC (rev 92549) @@ -0,0 +1,18 @@ +--- ext/odbc/config.m4.orig 2007-07-31 08:02:00.000000000 -0500 ++++ ext/odbc/config.m4 2010-08-05 21:21:54.000000000 -0500 +@@ -99,6 +99,7 @@ + dnl + dnl configure options + dnl ++:<<'MACPORTS_DISABLED' + if test -z "$ODBC_TYPE"; then + PHP_ARG_WITH(adabas,, + [ --with-adabas[=DIR] Include Adabas D support [/usr/local]]) +@@ -363,6 +364,7 @@ + AC_MSG_RESULT([$ext_ouput]) + fi + fi ++MACPORTS_DISABLED + + if test -z "$ODBC_TYPE"; then + PHP_ARG_WITH(iodbc,, Copied: users/ryandesign/ports/lang/php/files/patch-php54-sapi-fpm-php-fpm.conf.in.diff (from rev 92544, users/ryandesign/ports/lang/php/files/patch-sapi-fpm-php-fpm.conf.in.diff) =================================================================== --- users/ryandesign/ports/lang/php/files/patch-php54-sapi-fpm-php-fpm.conf.in.diff (rev 0) +++ users/ryandesign/ports/lang/php/files/patch-php54-sapi-fpm-php-fpm.conf.in.diff 2012-05-01 05:13:23 UTC (rev 92549) @@ -0,0 +1,41 @@ +--- a/sapi/fpm/php-fpm.conf.in.orig 2011-10-08 16:04:10.000000000 -0500 ++++ b/sapi/fpm/php-fpm.conf.in 2012-02-13 18:51:53.000000000 -0600 +@@ -22,14 +22,14 @@ + ; Pid file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: none +-;pid = run/php-fpm.pid ++;pid = run/@PHP@/php-fpm.pid + + ; Error log file + ; If it's set to "syslog", log is sent to syslogd instead of being written + ; in a local file. + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: log/php-fpm.log +-;error_log = log/php-fpm.log ++error_log = log/@PHP@/php-fpm.log + + ; syslog_facility is used to specify what type of program is logging the + ; message. This lets syslogd specify that messages from different facilities +@@ -42,7 +42,7 @@ + ; instances running on the same server, you can change the default value + ; which must suit common needs. + ; Default Value: php-fpm +-;syslog.ident = php-fpm ++syslog.ident = @PHP@-fpm + + ; Log level + ; Possible Values: alert, error, warning, notice, debug +@@ -76,9 +76,10 @@ + ; Default Value: 0 + ; process.max = 128 + +-; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging. ++; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging ++; or for use with launchd. + ; Default Value: yes +-;daemonize = yes ++daemonize = no + + ; Set open file descriptor rlimit for the master process. + ; Default Value: system defined value Copied: users/ryandesign/ports/lang/php/files/patch-php54-scripts-php-config.in.diff (from rev 92544, users/ryandesign/ports/lang/php/files/patch-scripts-php-config.in.diff) =================================================================== --- users/ryandesign/ports/lang/php/files/patch-php54-scripts-php-config.in.diff (rev 0) +++ users/ryandesign/ports/lang/php/files/patch-php54-scripts-php-config.in.diff 2012-05-01 05:13:23 UTC (rev 92549) @@ -0,0 +1,11 @@ +--- a/scripts/php-config.in.orig 2011-05-15 01:09:21.000000000 -0500 ++++ b/scripts/php-config.in 2011-10-04 05:45:52.000000000 -0500 +@@ -7,7 +7,7 @@ + version="@PHP_VERSION@" + vernum="@PHP_VERSION_ID@" + include_dir="@includedir@/php" +-includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib" ++includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib -I@prefix@/include" + ldflags="@PHP_LDFLAGS@" + libs="@EXTRA_LIBS@" + extension_dir='@EXTENSION_DIR@' Copied: users/ryandesign/ports/lang/php/files/patch-php54-unixODBC.diff (from rev 92544, users/ryandesign/ports/lang/php/files/patch-unixODBC.diff) =================================================================== --- users/ryandesign/ports/lang/php/files/patch-php54-unixODBC.diff (rev 0) +++ users/ryandesign/ports/lang/php/files/patch-php54-unixODBC.diff 2012-05-01 05:13:23 UTC (rev 92549) @@ -0,0 +1,18 @@ +--- ext/odbc/config.m4.orig 2007-07-31 08:02:00.000000000 -0500 ++++ ext/odbc/config.m4 2009-12-12 20:32:00.000000000 -0600 +@@ -99,6 +99,7 @@ + dnl + dnl configure options + dnl ++:<<'MACPORTS_DISABLED' + if test -z "$ODBC_TYPE"; then + PHP_ARG_WITH(adabas,, + [ --with-adabas[=DIR] Include Adabas D support [/usr/local]]) +@@ -404,6 +405,7 @@ + AC_MSG_RESULT([$ext_output]) + fi + fi ++MACPORTS_DISABLED + + if test -z "$ODBC_TYPE"; then + PHP_ARG_WITH(unixODBC,, Deleted: users/ryandesign/ports/lang/php/files/patch-sapi-fpm-php-fpm.conf.in.diff =================================================================== --- users/ryandesign/ports/lang/php/files/patch-sapi-fpm-php-fpm.conf.in.diff 2012-05-01 04:39:43 UTC (rev 92548) +++ users/ryandesign/ports/lang/php/files/patch-sapi-fpm-php-fpm.conf.in.diff 2012-05-01 05:13:23 UTC (rev 92549) @@ -1,41 +0,0 @@ ---- a/sapi/fpm/php-fpm.conf.in.orig 2011-10-08 16:04:10.000000000 -0500 -+++ b/sapi/fpm/php-fpm.conf.in 2012-02-13 18:51:53.000000000 -0600 -@@ -22,14 +22,14 @@ - ; Pid file - ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ - ; Default Value: none --;pid = run/php-fpm.pid -+;pid = run/@PHP@/php-fpm.pid - - ; Error log file - ; If it's set to "syslog", log is sent to syslogd instead of being written - ; in a local file. - ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ - ; Default Value: log/php-fpm.log --;error_log = log/php-fpm.log -+error_log = log/@PHP@/php-fpm.log - - ; syslog_facility is used to specify what type of program is logging the - ; message. This lets syslogd specify that messages from different facilities -@@ -42,7 +42,7 @@ - ; instances running on the same server, you can change the default value - ; which must suit common needs. - ; Default Value: php-fpm --;syslog.ident = php-fpm -+syslog.ident = @PHP@-fpm - - ; Log level - ; Possible Values: alert, error, warning, notice, debug -@@ -76,9 +76,10 @@ - ; Default Value: 0 - ; process.max = 128 - --; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging. -+; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging -+; or for use with launchd. - ; Default Value: yes --;daemonize = yes -+daemonize = no - - ; Set open file descriptor rlimit for the master process. - ; Default Value: system defined value Deleted: users/ryandesign/ports/lang/php/files/patch-scripts-php-config.in.diff =================================================================== --- users/ryandesign/ports/lang/php/files/patch-scripts-php-config.in.diff 2012-05-01 04:39:43 UTC (rev 92548) +++ users/ryandesign/ports/lang/php/files/patch-scripts-php-config.in.diff 2012-05-01 05:13:23 UTC (rev 92549) @@ -1,11 +0,0 @@ ---- a/scripts/php-config.in.orig 2011-05-15 01:09:21.000000000 -0500 -+++ b/scripts/php-config.in 2011-10-04 05:45:52.000000000 -0500 -@@ -7,7 +7,7 @@ - version="@PHP_VERSION@" - vernum="@PHP_VERSION_ID@" - include_dir="@includedir@/php" --includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib" -+includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib -I@prefix@/include" - ldflags="@PHP_LDFLAGS@" - libs="@EXTRA_LIBS@" - extension_dir='@EXTENSION_DIR@' Deleted: users/ryandesign/ports/lang/php/files/patch-unixODBC.diff =================================================================== --- users/ryandesign/ports/lang/php/files/patch-unixODBC.diff 2012-05-01 04:39:43 UTC (rev 92548) +++ users/ryandesign/ports/lang/php/files/patch-unixODBC.diff 2012-05-01 05:13:23 UTC (rev 92549) @@ -1,18 +0,0 @@ ---- ext/odbc/config.m4.orig 2007-07-31 08:02:00.000000000 -0500 -+++ ext/odbc/config.m4 2009-12-12 20:32:00.000000000 -0600 -@@ -99,6 +99,7 @@ - dnl - dnl configure options - dnl -+:<<'MACPORTS_DISABLED' - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(adabas,, - [ --with-adabas[=DIR] Include Adabas D support [/usr/local]]) -@@ -404,6 +405,7 @@ - AC_MSG_RESULT([$ext_output]) - fi - fi -+MACPORTS_DISABLED - - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(unixODBC,,