[100003] trunk/dports/lang/php
ryandesign at macports.org
ryandesign at macports.org
Fri Nov 23 15:22:38 PST 2012
Revision: 100003
https://trac.macports.org/changeset/100003
Author: ryandesign at macports.org
Date: 2012-11-23 15:22:38 -0800 (Fri, 23 Nov 2012)
Log Message:
-----------
php: add php55 subports
Modified Paths:
--------------
trunk/dports/lang/php/Portfile
Added Paths:
-----------
trunk/dports/lang/php/files/patch-php55-iODBC.diff
trunk/dports/lang/php/files/patch-php55-sapi-fpm-php-fpm.conf.in.diff
trunk/dports/lang/php/files/patch-php55-scripts-php-config.in.diff
trunk/dports/lang/php/files/patch-php55-unixODBC.diff
trunk/dports/lang/php/files/php55
Modified: trunk/dports/lang/php/Portfile
===================================================================
--- trunk/dports/lang/php/Portfile 2012-11-23 23:15:45 UTC (rev 100002)
+++ trunk/dports/lang/php/Portfile 2012-11-23 23:22:38 UTC (rev 100003)
@@ -22,7 +22,7 @@
scripting.
# The list of PHP branches this port provides.
-php.branches 5.3 5.4
+php.branches 5.3 5.4 5.5
# Fix for users specifying the subport name with the wrong case.
set subport [string tolower ${subport}]
@@ -79,6 +79,22 @@
rmd160 b1795652cea62a118453df5dc3fa62f679f93e64 \
sha256 c0649971cfa9723701d085e227376374569689689b8421e4dcfac56c2f6fcac5
}
+ 5.5 {
+ # When this becomes a stable version, remove the overrides for homepage,
+ # master_sites and livecheck, and update php.latest_stable_branch in the
+ # php-1.1 portgroup.
+ version 5.5.0alpha1
+ homepage http://qa.php.net/
+ master_sites http://downloads.php.net/dsp/
+ use_bzip2 no
+ use_xz yes
+ set suhosin_available no
+ checksums [suffix ${distname}] \
+ rmd160 cd0a19d4c53641d2dc121002c5a8755e0b56e029 \
+ sha256 e1de6e8fa25ca09eca4e58d8a6b33624dfa5d9240db64e3e37f4558fdf135c55
+ livecheck.url ${homepage}
+ livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar
+ }
}
# Iterate through branches in reverse order, so that the list of subports in
@@ -114,9 +130,7 @@
patch.pre_args -p1
patchfiles patch-${php}-scripts-php-config.in.diff
- if {${configure.compiler} == "clang"} {
- configure.compiler llvm-gcc-4.2
- }
+ compiler.blacklist clang
set phpinidir ${prefix}/etc/${php}
set extraphpinidir ${prefix}/var/db/${php}
@@ -266,11 +280,11 @@
"
}
- # Enable livecheck for the two most recent PHP branches.
- if {[vercmp ${branch} [lindex ${php.branches} end-1]] >= 0} {
+ # Enable livecheck for the two most recent stable PHP branches and the development branch.
+ if {[vercmp ${branch} [lindex ${php.branches} end-2]] >= 0} {
livecheck.type regex
- livecheck.url ${homepage}downloads.php
- livecheck.regex get/php-([strsed ${branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*)\\.tar
+ default livecheck.url ${homepage}downloads.php
+ default livecheck.regex {get/php-([strsed ${branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*)\\.tar}
}
}
Copied: trunk/dports/lang/php/files/patch-php55-iODBC.diff (from rev 99983, trunk/dports/lang/php/files/patch-php54-iODBC.diff)
===================================================================
--- trunk/dports/lang/php/files/patch-php55-iODBC.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php55-iODBC.diff 2012-11-23 23:22:38 UTC (rev 100003)
@@ -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: trunk/dports/lang/php/files/patch-php55-sapi-fpm-php-fpm.conf.in.diff (from rev 99983, trunk/dports/lang/php/files/patch-php54-sapi-fpm-php-fpm.conf.in.diff)
===================================================================
--- trunk/dports/lang/php/files/patch-php55-sapi-fpm-php-fpm.conf.in.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php55-sapi-fpm-php-fpm.conf.in.diff 2012-11-23 23:22:38 UTC (rev 100003)
@@ -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 at -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: trunk/dports/lang/php/files/patch-php55-scripts-php-config.in.diff (from rev 99983, trunk/dports/lang/php/files/patch-php54-scripts-php-config.in.diff)
===================================================================
--- trunk/dports/lang/php/files/patch-php55-scripts-php-config.in.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php55-scripts-php-config.in.diff 2012-11-23 23:22:38 UTC (rev 100003)
@@ -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 at prefix@/include"
+ ldflags="@PHP_LDFLAGS@"
+ libs="@EXTRA_LIBS@"
+ extension_dir='@EXTENSION_DIR@'
Copied: trunk/dports/lang/php/files/patch-php55-unixODBC.diff (from rev 99983, trunk/dports/lang/php/files/patch-php54-unixODBC.diff)
===================================================================
--- trunk/dports/lang/php/files/patch-php55-unixODBC.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php55-unixODBC.diff 2012-11-23 23:22:38 UTC (rev 100003)
@@ -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: trunk/dports/lang/php/files/php55 (from rev 99983, trunk/dports/lang/php/files/php54)
===================================================================
--- trunk/dports/lang/php/files/php55 (rev 0)
+++ trunk/dports/lang/php/files/php55 2012-11-23 23:22:38 UTC (rev 100003)
@@ -0,0 +1,6 @@
+bin/php55
+bin/php-config55
+bin/phpize55
+share/man/man1/php55.1.gz
+share/man/man1/php-config55.1.gz
+share/man/man1/phpize55.1.gz
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121123/c27aa689/attachment-0001.html>
More information about the macports-changes
mailing list