diff options
author | Koop Mast <kwm@FreeBSD.org> | 2013-12-24 21:22:21 +0000 |
---|---|---|
committer | Koop Mast <kwm@FreeBSD.org> | 2013-12-24 21:22:21 +0000 |
commit | b1bf1620a6571c5eb84bed4e3f06cf52094d0a48 (patch) | |
tree | 93506aaee5230ee46b75930c4b3a6b8e0f243d74 /graphics/php5-gd | |
parent | - Properly look for X11 using CMake and include the appropriate directories (diff) |
Update freetype to 2.5.2.
Remove patch to add -I/usr/local/include in freetype-config --cflags. If
ports need extra headers they should look for them, and not get them via
a side-effect.
Freetype had a header resuffle in 2.5.1, patch ports to use the new header
style.
Thanks go to bdrewery for the two exp-runs and rakuco for helping me with
some troublesome cmake ports.
PR: ports/184587
Notes
Notes:
svn path=/head/; revision=337385
Diffstat (limited to 'graphics/php5-gd')
-rw-r--r-- | graphics/php5-gd/files/patch-config.m4 | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/graphics/php5-gd/files/patch-config.m4 b/graphics/php5-gd/files/patch-config.m4 index 03b69a1c248a..8212b1b4c8fb 100644 --- a/graphics/php5-gd/files/patch-config.m4 +++ b/graphics/php5-gd/files/patch-config.m4 @@ -1,8 +1,17 @@ ---- config.m4.orig Mon May 30 01:16:41 2005 -+++ config.m4 Wed Dec 7 11:01:13 2005 -@@ -220,7 +220,7 @@ +--- config.m4.orig 2013-12-10 20:32:43.000000000 +0100 ++++ config.m4 2013-12-24 21:02:03.000000000 +0100 +@@ -193,7 +193,7 @@ + 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 ++ if test -f "$i/include/freetype2/freetype.h"; then + FREETYPE2_DIR=$i + FREETYPE2_INC_DIR=$i/include/freetype2 + break +@@ -241,7 +241,7 @@ ],[ - AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) + AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) ],[ - -L$GD_T1_DIR/$PHP_LIBDIR + -L$GD_T1_DIR/$PHP_LIBDIR -lm |