[114097] trunk/dports
ryandesign at macports.org
ryandesign at macports.org
Thu Nov 28 22:01:05 PST 2013
Revision: 114097
https://trac.macports.org/changeset/114097
Author: ryandesign at macports.org
Date: 2013-11-28 22:01:05 -0800 (Thu, 28 Nov 2013)
Log Message:
-----------
php-gd: fix build with freetype 2.5.1 (#41585); never look for dependencies in /usr or /usr/local or /usr/X11R6
Modified Paths:
--------------
trunk/dports/lang/php/Portfile
trunk/dports/php/php5-gd/Portfile
Added Paths:
-----------
trunk/dports/lang/php/files/patch-php53-ext-gd-config.m4.diff
trunk/dports/lang/php/files/patch-php54-ext-gd-config.m4.diff
trunk/dports/lang/php/files/patch-php55-ext-gd-config.m4.diff
trunk/dports/php/php5-gd/files/
trunk/dports/php/php5-gd/files/patch-ext-gd-config.m4.diff
Modified: trunk/dports/lang/php/Portfile
===================================================================
--- trunk/dports/lang/php/Portfile 2013-11-29 02:11:12 UTC (rev 114096)
+++ trunk/dports/lang/php/Portfile 2013-11-29 06:01:05 UTC (rev 114097)
@@ -527,6 +527,8 @@
port:libpng \
port:zlib
+ patchfiles-append patch-${php}-ext-gd-config.m4.diff
+
configure.args-append --with-freetype-dir=${prefix} \
--with-jpeg-dir=${prefix} \
--with-png-dir=${prefix} \
Added: trunk/dports/lang/php/files/patch-php53-ext-gd-config.m4.diff
===================================================================
--- trunk/dports/lang/php/files/patch-php53-ext-gd-config.m4.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php53-ext-gd-config.m4.diff 2013-11-29 06:01:05 UTC (rev 114097)
@@ -0,0 +1,52 @@
+--- ext/gd/config.m4.orig 2013-07-10 12:43:08.000000000 -0500
++++ ext/gd/config.m4 2013-11-28 23:40:14.000000000 -0600
+@@ -71,7 +71,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
+
+@@ -96,7 +96,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
+
+@@ -127,7 +127,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/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break
+ done
+
+@@ -161,12 +161,10 @@
+ AC_DEFUN([PHP_GD_FREETYPE2],[
+ if test "$PHP_FREETYPE_DIR" != "no"; then
+
+- for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+- if test -f "$i/include/freetype2/freetype/freetype.h"; then
++ for i in $PHP_FREETYPE_DIR; do
+ FREETYPE2_DIR=$i
+ FREETYPE2_INC_DIR=$i/include/freetype2
+ break
+- fi
+ done
+
+ if test -z "$FREETYPE2_DIR"; then
+@@ -194,7 +192,7 @@
+ AC_DEFUN([PHP_GD_T1LIB],[
+ if test "$PHP_T1LIB" != "no"; then
+
+- for i in $PHP_T1LIB /usr/local /usr; do
++ for i in $PHP_T1LIB; do
+ test -f "$i/include/t1lib.h" && GD_T1_DIR=$i && break
+ done
+
Added: trunk/dports/lang/php/files/patch-php54-ext-gd-config.m4.diff
===================================================================
--- trunk/dports/lang/php/files/patch-php54-ext-gd-config.m4.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php54-ext-gd-config.m4.diff 2013-11-29 06:01:05 UTC (rev 114097)
@@ -0,0 +1,61 @@
+--- ext/gd/config.m4.orig 2013-11-13 00:46:59.000000000 -0600
++++ ext/gd/config.m4 2013-11-28 23:55:35.000000000 -0600
+@@ -76,7 +76,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
+
+@@ -102,7 +102,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
+
+@@ -127,7 +127,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
+
+@@ -158,7 +158,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/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break
+ done
+
+@@ -192,12 +192,10 @@
+ AC_DEFUN([PHP_GD_FREETYPE2],[
+ if test "$PHP_FREETYPE_DIR" != "no"; then
+
+- for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+- if test -f "$i/include/freetype2/freetype/freetype.h"; then
++ for i in $PHP_FREETYPE_DIR; do
+ FREETYPE2_DIR=$i
+ FREETYPE2_INC_DIR=$i/include/freetype2
+ break
+- fi
+ done
+
+ if test -z "$FREETYPE2_DIR"; then
+@@ -225,7 +223,7 @@
+ AC_DEFUN([PHP_GD_T1LIB],[
+ if test "$PHP_T1LIB" != "no"; then
+
+- for i in $PHP_T1LIB /usr/local /usr; do
++ for i in $PHP_T1LIB; do
+ test -f "$i/include/t1lib.h" && GD_T1_DIR=$i && break
+ done
+
Added: trunk/dports/lang/php/files/patch-php55-ext-gd-config.m4.diff
===================================================================
--- trunk/dports/lang/php/files/patch-php55-ext-gd-config.m4.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php55-ext-gd-config.m4.diff 2013-11-29 06:01:05 UTC (rev 114097)
@@ -0,0 +1,61 @@
+--- ext/gd/config.m4.orig 2013-11-12 08:17:27.000000000 -0600
++++ ext/gd/config.m4 2013-11-28 23:53:42.000000000 -0600
+@@ -75,7 +75,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
+
+@@ -101,7 +101,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
+
+@@ -126,7 +126,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
+
+@@ -157,7 +157,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
+@@ -184,12 +184,10 @@
+ AC_DEFUN([PHP_GD_FREETYPE2],[
+ if test "$PHP_FREETYPE_DIR" != "no"; then
+
+- for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+- if test -f "$i/include/freetype2/freetype/freetype.h"; then
++ for i in $PHP_FREETYPE_DIR; do
+ FREETYPE2_DIR=$i
+ FREETYPE2_INC_DIR=$i/include/freetype2
+ break
+- fi
+ done
+
+ if test -z "$FREETYPE2_DIR"; then
+@@ -217,7 +215,7 @@
+ AC_DEFUN([PHP_GD_T1LIB],[
+ if test "$PHP_T1LIB" != "no"; then
+
+- for i in $PHP_T1LIB /usr/local /usr; do
++ for i in $PHP_T1LIB; do
+ test -f "$i/include/t1lib.h" && GD_T1_DIR=$i && break
+ done
+
Modified: trunk/dports/php/php5-gd/Portfile
===================================================================
--- trunk/dports/php/php5-gd/Portfile 2013-11-29 02:11:12 UTC (rev 114096)
+++ trunk/dports/php/php5-gd/Portfile 2013-11-29 06:01:05 UTC (rev 114097)
@@ -22,6 +22,8 @@
port:libpng \
port:zlib
+patchfiles patch-ext-gd-config.m4.diff
+
configure.args-append --with-freetype-dir=${prefix} \
--with-jpeg-dir=${prefix} \
--with-png-dir=${prefix} \
Added: trunk/dports/php/php5-gd/files/patch-ext-gd-config.m4.diff
===================================================================
--- trunk/dports/php/php5-gd/files/patch-ext-gd-config.m4.diff (rev 0)
+++ trunk/dports/php/php5-gd/files/patch-ext-gd-config.m4.diff 2013-11-29 06:01:05 UTC (rev 114097)
@@ -0,0 +1,52 @@
+--- ext/gd/config.m4.orig 2013-07-10 12:43:08.000000000 -0500
++++ ext/gd/config.m4 2013-11-28 23:40:14.000000000 -0600
+@@ -71,7 +71,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
+
+@@ -96,7 +96,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
+
+@@ -127,7 +127,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/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break
+ done
+
+@@ -161,12 +161,10 @@
+ AC_DEFUN([PHP_GD_FREETYPE2],[
+ if test "$PHP_FREETYPE_DIR" != "no"; then
+
+- for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+- if test -f "$i/include/freetype2/freetype/freetype.h"; then
++ for i in $PHP_FREETYPE_DIR; do
+ FREETYPE2_DIR=$i
+ FREETYPE2_INC_DIR=$i/include/freetype2
+ break
+- fi
+ done
+
+ if test -z "$FREETYPE2_DIR"; then
+@@ -194,7 +192,7 @@
+ AC_DEFUN([PHP_GD_T1LIB],[
+ if test "$PHP_T1LIB" != "no"; then
+
+- for i in $PHP_T1LIB /usr/local /usr; do
++ for i in $PHP_T1LIB; do
+ test -f "$i/include/t1lib.h" && GD_T1_DIR=$i && break
+ done
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131128/54bb8f03/attachment-0001.html>
More information about the macports-changes
mailing list