[137582] trunk/dports/lang/php
ryandesign at macports.org
ryandesign at macports.org
Sun Jun 14 22:31:02 PDT 2015
Revision: 137582
https://trac.macports.org/changeset/137582
Author: ryandesign at macports.org
Date: 2015-06-14 22:31:02 -0700 (Sun, 14 Jun 2015)
Log Message:
-----------
php: add php70 version 7.0.0alpha1
Modified Paths:
--------------
trunk/dports/lang/php/Portfile
Added Paths:
-----------
trunk/dports/lang/php/files/mod_php.conf.in
trunk/dports/lang/php/files/patch-php70-ext-gd-config.m4.diff
trunk/dports/lang/php/files/patch-php70-iODBC.diff
trunk/dports/lang/php/files/patch-php70-sapi-fpm-php-fpm.conf.in.diff
trunk/dports/lang/php/files/patch-php70-scripts-php-config.in.diff
trunk/dports/lang/php/files/patch-php70-unixODBC.diff
trunk/dports/lang/php/files/php70
Removed Paths:
-------------
trunk/dports/lang/php/files/mod_php.conf
Modified: trunk/dports/lang/php/Portfile
===================================================================
--- trunk/dports/lang/php/Portfile 2015-06-15 03:24:40 UTC (rev 137581)
+++ trunk/dports/lang/php/Portfile 2015-06-15 05:31:02 UTC (rev 137582)
@@ -21,7 +21,7 @@
scripting.
# The list of PHP branches this port provides.
-php.branches 5.2 5.3 5.4 5.5 5.6
+php.branches 5.2 5.3 5.4 5.5 5.6 7.0
# Fix for users specifying the subport name with the wrong case.
set subport [string tolower ${subport}]
@@ -109,21 +109,20 @@
checksums rmd160 f5dbf5fd8ed76b20429187cdde1558be63009f3a \
sha256 1af720c955b0a57aa47606e928616e84c78868aff2a5f269c70601a77d6da8c1
}
+ 7.0 {
+ # 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 7.0.0alpha1
+ homepage http://qa.php.net/
+ master_sites http://downloads.php.net/~ab/
+ use_xz yes
+ checksums rmd160 e664b23c34a98bc1607dc9d1ad024e6cbaa77730 \
+ sha256 241245f438531bca27c2be527b90918b2b007349e20334b47652a294085a9b7d
+ livecheck.url ${homepage}
+ livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar
+ }
}
-# 7.0 {
-# # 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 7.0
-# homepage http://qa.php.net/
-# master_sites http://downloads.php.net/tyrael/
-# use_xz yes
-# checksums md5 0123456789 \
-# rmd160 0123456789 \
-# sha256 0123456789
-# 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
# "port info" will show newer versions before older versions.
@@ -136,7 +135,11 @@
if {[regexp "^${php}" ${subport}]} {
-dist_subdir php${major}
+if {[vercmp ${major} 5] > 0} {
+ dist_subdir ${php}
+} else {
+ dist_subdir php${major}
+}
if {[is_sapi_subport]} {
@@ -408,14 +411,15 @@
configure.args-append --with-apxs2=${apxs}
- build.target libs/libphp5.bundle
+ build.target libs/libphp${major}.bundle
destroot.violate_mtree yes
destroot {
xinstall -m 755 -d ${destroot}${moduledir} ${destroot}${confdir}/extra
- xinstall -m 644 ${worksrcpath}/libs/libphp5.so ${destroot}${moduledir}/mod_${php}.so
- xinstall -m 644 ${filespath}/mod_php.conf ${destroot}${confdir}/extra/mod_${php}.conf
+ xinstall -m 644 ${worksrcpath}/libs/libphp${major}.so ${destroot}${moduledir}/mod_${php}.so
+ xinstall -m 644 ${filespath}/mod_php.conf.in ${destroot}${confdir}/extra/mod_${php}.conf
+ reinplace s/@MAJOR@/${major}/g ${destroot}${confdir}/extra/mod_${php}.conf
}
notes-append "
@@ -618,10 +622,12 @@
--with-zlib-dir=${prefix} \
--enable-gd-native-ttf
+ if {[vercmp ${branch} 7] < 0} {
variant t1lib description {Add PostScript Type 1 font support with t1lib} {
depends_lib-append port:t1lib
configure.args-append --with-t1lib=${prefix}
}
+ }
}
subport ${php}-gettext {
@@ -753,6 +759,7 @@
configure.args-append --with-mcrypt=${prefix}
}
+if {[vercmp ${branch} 7] < 0} {
subport ${php}-mssql {
php.extensions mssql pdo_dblib
@@ -768,14 +775,21 @@
configure.args-append --with-mssql=${prefix} \
--with-pdo-dblib=${prefix}
}
+}
subport ${php}-mysql {
- php.extensions mysql mysqli pdo_mysql
+ php.extensions mysqli pdo_mysql
+ if {[vercmp ${branch} 7] < 0} {
+ php.extensions-prepend mysql
+ }
categories-append databases
- description a PHP interface to MySQL databases, including the \
- mysql, mysqli and pdo_mysql extensions
+ description a PHP interface to MySQL databases, including the
+ if {[vercmp ${branch} 7] < 0} {
+ description-append mysql,
+ }
+ description-append mysqli and pdo_mysql extensions
long_description ${description}
@@ -946,6 +960,11 @@
}
}
+# php70-opcache @7.0.0alpha1 fails:
+# too few arguments provided to function-like macro invocation
+# use of undeclared identifier 'accel_xlat_get'
+# too many arguments to function call, expected 4, have 5
+if {[vercmp ${branch} 7] < 0} {
if {[vercmp ${branch} 5.5] >= 0} {
subport ${php}-opcache {
php.extensions.zend opcache
@@ -965,6 +984,7 @@
}
}
}
+}
subport ${php}-openssl {
categories-append devel security
@@ -987,6 +1007,9 @@
--with-openssl=${prefix}
}
+# php70-oracle @7.0.0alpha1 fails:
+# too many arguments to function call, expected 2, have 3
+if {[vercmp ${branch} 7] < 0} {
subport ${php}-oracle {
php.extensions oci8 pdo_oci
@@ -1011,6 +1034,7 @@
--with-pdo-oci=instantclient,${lib_dir},${library_version}
}
}
+}
subport ${php}-pcntl {
categories-append sysutils
@@ -1270,6 +1294,7 @@
# These variables are not only required by the subsequent code but also by
# preceding code in phase blocks.
set branch ${subport_branch}
+set major [lindex [split ${branch} .] 0]
set php php[php.suffix_from_branch ${branch}]
if {${name} eq ${subport}} {
Deleted: trunk/dports/lang/php/files/mod_php.conf
===================================================================
--- trunk/dports/lang/php/files/mod_php.conf 2015-06-15 03:24:40 UTC (rev 137581)
+++ trunk/dports/lang/php/files/mod_php.conf 2015-06-15 05:31:02 UTC (rev 137582)
@@ -1,6 +0,0 @@
-<IfModule mod_php5.c>
-
-AddType application/x-httpd-php .php
-AddType application/x-httpd-php-source .phps
-
-</IfModule>
Copied: trunk/dports/lang/php/files/mod_php.conf.in (from rev 137579, trunk/dports/lang/php/files/mod_php.conf)
===================================================================
--- trunk/dports/lang/php/files/mod_php.conf.in (rev 0)
+++ trunk/dports/lang/php/files/mod_php.conf.in 2015-06-15 05:31:02 UTC (rev 137582)
@@ -0,0 +1,6 @@
+<IfModule mod_php at MAJOR@.c>
+
+AddType application/x-httpd-php .php
+AddType application/x-httpd-php-source .phps
+
+</IfModule>
Copied: trunk/dports/lang/php/files/patch-php70-ext-gd-config.m4.diff (from rev 137543, trunk/dports/lang/php/files/patch-php56-ext-gd-config.m4.diff)
===================================================================
--- trunk/dports/lang/php/files/patch-php70-ext-gd-config.m4.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php70-ext-gd-config.m4.diff 2015-06-15 05:31:02 UTC (rev 137582)
@@ -0,0 +1,47 @@
+--- ext/gd/config.m4.orig 2015-06-10 03:49:51.000000000 -0500
++++ ext/gd/config.m4 2015-06-13 22:14:06.000000000 -0500
+@@ -72,7 +72,7 @@
+ AC_DEFUN([PHP_GD_VPX],[
+ if test "$PHP_VPX_DIR" != "no"; then
+
+- for i in $PHP_VPX_DIR /usr/local /usr; do
++ for i in $PHP_VPX_DIR; do
+ test -f $i/include/vpx_codec.h || test -f $i/include/vpx/vpx_codec.h && GD_VPX_DIR=$i && break
+ done
+
+@@ -98,7 +98,7 @@
+ AC_DEFUN([PHP_GD_JPEG],[
+ if test "$PHP_JPEG_DIR" != "no"; then
+
+- for i in $PHP_JPEG_DIR /usr/local /usr; do
++ for i in $PHP_JPEG_DIR; do
+ test -f $i/include/jpeglib.h && GD_JPEG_DIR=$i && break
+ done
+
+@@ -123,7 +123,7 @@
+ AC_DEFUN([PHP_GD_PNG],[
+ if test "$PHP_PNG_DIR" != "no"; then
+
+- for i in $PHP_PNG_DIR /usr/local /usr; do
++ for i in $PHP_PNG_DIR; do
+ test -f $i/include/png.h && GD_PNG_DIR=$i && break
+ done
+
+@@ -154,7 +154,7 @@
+ AC_DEFUN([PHP_GD_XPM],[
+ if test "$PHP_XPM_DIR" != "no"; then
+
+- for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
++ for i in $PHP_XPM_DIR; do
+ test -f $i/include/xpm.h && GD_XPM_DIR=$i && GD_XPM_INC=$i && break
+ test -f $i/include/X11/xpm.h && GD_XPM_DIR=$i && GD_XPM_INC=$i/X11 && break
+ done
+@@ -181,7 +181,7 @@
+ AC_DEFUN([PHP_GD_FREETYPE2],[
+ if test "$PHP_FREETYPE_DIR" != "no"; then
+
+- for i in $PHP_FREETYPE_DIR /usr/local /usr; do
++ for i in $PHP_FREETYPE_DIR; do
+ if test -f "$i/bin/freetype-config"; then
+ FREETYPE2_DIR=$i
+ FREETYPE2_CONFIG="$i/bin/freetype-config"
Copied: trunk/dports/lang/php/files/patch-php70-iODBC.diff (from rev 137543, trunk/dports/lang/php/files/patch-php56-iODBC.diff)
===================================================================
--- trunk/dports/lang/php/files/patch-php70-iODBC.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php70-iODBC.diff 2015-06-15 05:31:02 UTC (rev 137582)
@@ -0,0 +1,18 @@
+--- ext/odbc/config.m4.orig 2015-04-15 13:05:57.000000000 -0500
++++ ext/odbc/config.m4 2015-04-17 20:15:12.000000000 -0500
+@@ -104,6 +104,7 @@
+ [ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0300.
+ Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300)
+
++:<<'MACPORTS_DISABLED'
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(adabas,,
+ [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
+@@ -386,6 +387,7 @@
+ fi
+ fi
+
++MACPORTS_DISABLED
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(iodbc,,
+ [ --with-iodbc[=DIR] Include iODBC support [/usr/local]])
Copied: trunk/dports/lang/php/files/patch-php70-sapi-fpm-php-fpm.conf.in.diff (from rev 137543, trunk/dports/lang/php/files/patch-php56-sapi-fpm-php-fpm.conf.in.diff)
===================================================================
--- trunk/dports/lang/php/files/patch-php70-sapi-fpm-php-fpm.conf.in.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php70-sapi-fpm-php-fpm.conf.in.diff 2015-06-15 05:31:02 UTC (rev 137582)
@@ -0,0 +1,41 @@
+--- a/sapi/fpm/php-fpm.conf.in.orig 2015-06-10 03:49:51.000000000 -0500
++++ b/sapi/fpm/php-fpm.conf.in 2015-06-13 22:03:00.000000000 -0500
+@@ -14,14 +14,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
+@@ -34,7 +34,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: no set
+ ; process.priority = -19
+
+-; 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-php70-scripts-php-config.in.diff (from rev 137543, trunk/dports/lang/php/files/patch-php56-scripts-php-config.in.diff)
===================================================================
--- trunk/dports/lang/php/files/patch-php70-scripts-php-config.in.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php70-scripts-php-config.in.diff 2015-06-15 05:31:02 UTC (rev 137582)
@@ -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-php70-unixODBC.diff (from rev 137543, trunk/dports/lang/php/files/patch-php56-unixODBC.diff)
===================================================================
--- trunk/dports/lang/php/files/patch-php70-unixODBC.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php70-unixODBC.diff 2015-06-15 05:31:02 UTC (rev 137582)
@@ -0,0 +1,18 @@
+--- ext/odbc/config.m4.orig 2015-04-15 13:05:57.000000000 -0500
++++ ext/odbc/config.m4 2015-04-17 20:13:57.000000000 -0500
+@@ -104,6 +104,7 @@
+ [ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0300.
+ Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300)
+
++:<<'MACPORTS_DISABLED'
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(adabas,,
+ [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
+@@ -446,6 +447,7 @@
+ fi
+ fi
+
++MACPORTS_DISABLED
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(unixODBC,,
+ [ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]])
Copied: trunk/dports/lang/php/files/php70 (from rev 137543, trunk/dports/lang/php/files/php56)
===================================================================
--- trunk/dports/lang/php/files/php70 (rev 0)
+++ trunk/dports/lang/php/files/php70 2015-06-15 05:31:02 UTC (rev 137582)
@@ -0,0 +1,6 @@
+bin/php70
+bin/php-config70
+bin/phpize70
+share/man/man1/php70.1.gz
+share/man/man1/php-config70.1.gz
+share/man/man1/phpize70.1.gz
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150614/1a0a0675/attachment.html>
More information about the macports-changes
mailing list