[149462] trunk/dports/lang/php/files

22 Jun 2016

Revision: 149462
          https://trac.macports.org/changeset/149462
Author:   ryandesign@macports.org
Date:     2016-06-22 00:11:36 -0700 (Wed, 22 Jun 2016)
Log Message:
-----------
php: bring back the php70 patches mistakenly deleted in r149431 (#51683)

Revision Links:
--------------
    https://trac.macports.org/changeset/149431

Added Paths:
-----------
    trunk/dports/lang/php/files/patch-php70-ext-gd-config.m4.diff
    trunk/dports/lang/php/files/patch-php70-ext-tidy-tidy.c.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

Copied: trunk/dports/lang/php/files/patch-php70-ext-gd-config.m4.diff (from rev 149430, trunk/dports/lang/php/files/patch-php70-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	2016-06-22 07:11:36 UTC (rev 149462)
@@ -0,0 +1,56 @@
+--- ext/gd/config.m4.orig	2015-07-21 14:00:36.000000000 -0500
++++ ext/gd/config.m4	2015-07-26 13:56:55.000000000 -0500
+@@ -72,7 +72,7 @@
+ AC_DEFUN([PHP_GD_WEBP],[
+   if test "$PHP_WEBP_DIR" != "no"; then
+ 
+-    for i in $PHP_WEBP_DIR /usr/local /usr; do
++    for i in $PHP_WEBP_DIR; do
+       test -f $i/include/webp/decode.h && GD_WEBP_DIR=$i && break
+     done
+ 
+@@ -80,7 +80,7 @@
+       AC_MSG_ERROR([webp/decode.h not found.])
+     fi
+ 
+-    for i in $PHP_WEBP_DIR /usr/local /usr; do
++    for i in $PHP_WEBP_DIR; do
+       test -f $i/include/webp/encode.h && GD_WEBP_DIR=$i && break
+     done
+ 
+@@ -106,7 +106,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
+ 
+@@ -131,7 +131,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
+ 
+@@ -162,7 +162,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
+@@ -189,7 +189,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"


Property changes on: trunk/dports/lang/php/files/patch-php70-ext-gd-config.m4.diff
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/dports/www/php5-devel/files/patch-php70-ext-gd-config.m4.diff:41985

Copied: trunk/dports/lang/php/files/patch-php70-ext-tidy-tidy.c.diff (from rev 149430, trunk/dports/lang/php/files/patch-php70-ext-tidy-tidy.c.diff)
===================================================================
--- trunk/dports/lang/php/files/patch-php70-ext-tidy-tidy.c.diff	                        (rev 0)
+++ trunk/dports/lang/php/files/patch-php70-ext-tidy-tidy.c.diff	2016-06-22 07:11:36 UTC (rev 149462)
@@ -0,0 +1,11 @@
+--- ext/tidy/tidy.c.orig	2015-09-16 07:49:50.000000000 -0500
++++ ext/tidy/tidy.c	2015-09-19 14:18:11.000000000 -0500
+@@ -31,7 +31,7 @@
+ #include "ext/standard/info.h"
+ 
+ #include "tidy.h"
+-#include "buffio.h"
++#include "tidybuffio.h"
+ 
+ /* compatibility with older versions of libtidy */
+ #ifndef TIDY_CALL


Property changes on: trunk/dports/lang/php/files/patch-php70-ext-tidy-tidy.c.diff
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/dports/www/php5-devel/files/patch-php70-ext-tidy-tidy.c.diff:41985

Copied: trunk/dports/lang/php/files/patch-php70-iODBC.diff (from rev 149430, trunk/dports/lang/php/files/patch-php70-iODBC.diff)
===================================================================
--- trunk/dports/lang/php/files/patch-php70-iODBC.diff	                        (rev 0)
+++ trunk/dports/lang/php/files/patch-php70-iODBC.diff	2016-06-22 07:11:36 UTC (rev 149462)
@@ -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]])


Property changes on: trunk/dports/lang/php/files/patch-php70-iODBC.diff
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/dports/www/php5-devel/files/patch-php70-iODBC.diff:41985

Copied: trunk/dports/lang/php/files/patch-php70-sapi-fpm-php-fpm.conf.in.diff (from rev 149430, trunk/dports/lang/php/files/patch-php70-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	2016-06-22 07:11:36 UTC (rev 149462)
@@ -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@-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


Property changes on: trunk/dports/lang/php/files/patch-php70-sapi-fpm-php-fpm.conf.in.diff
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/dports/www/php5-devel/files/patch-php70-sapi-fpm-php-fpm.conf.in.diff:41985

Copied: trunk/dports/lang/php/files/patch-php70-scripts-php-config.in.diff (from rev 149430, trunk/dports/lang/php/files/patch-php70-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	2016-06-22 07:11:36 UTC (rev 149462)
@@ -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@'


Property changes on: trunk/dports/lang/php/files/patch-php70-scripts-php-config.in.diff
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/dports/www/php5-devel/files/patch-php70-scripts-php-config.in.diff:41985

Copied: trunk/dports/lang/php/files/patch-php70-unixODBC.diff (from rev 149430, trunk/dports/lang/php/files/patch-php70-unixODBC.diff)
===================================================================
--- trunk/dports/lang/php/files/patch-php70-unixODBC.diff	                        (rev 0)
+++ trunk/dports/lang/php/files/patch-php70-unixODBC.diff	2016-06-22 07:11:36 UTC (rev 149462)
@@ -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]])


Property changes on: trunk/dports/lang/php/files/patch-php70-unixODBC.diff
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/dports/www/php5-devel/files/patch-php70-unixODBC.diff:41985

    

ryandesign＠macports.org

tags

participants (1)