diff options
| author | spz <spz@pkgsrc.org> | 2014-03-23 09:55:59 +0000 |
|---|---|---|
| committer | spz <spz@pkgsrc.org> | 2014-03-23 09:55:59 +0000 |
| commit | 06fc8203af48e0a3cbea6ff0f2967411d45c29e6 (patch) | |
| tree | 482b5bf584a42c83e753cda506ca2f9cfb12db75 /lang | |
| parent | 6ee0aaeafd66e24630a671d46a110ac9b95e5d3a (diff) | |
| download | pkgsrc-06fc8203af48e0a3cbea6ff0f2967411d45c29e6.tar.gz | |
build fix for graphics/php53-gd following the freetype2 update
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/php53/distinfo | 4 | ||||
| -rw-r--r-- | lang/php53/patches/patch-ac | 24 |
2 files changed, 24 insertions, 4 deletions
diff --git a/lang/php53/distinfo b/lang/php53/distinfo index 47b891d253a..bdd0025be14 100644 --- a/lang/php53/distinfo +++ b/lang/php53/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.71 2014/03/12 19:52:04 asau Exp $ +$NetBSD: distinfo,v 1.72 2014/03/23 09:55:59 spz Exp $ SHA1 (php-5.3.28.tar.bz2) = f985ca1f6a5f49ebfb25a08f1837a44c563b31f8 RMD160 (php-5.3.28.tar.bz2) = e4910c0c365f39a5009807801bd5ee6e25be020d @@ -8,7 +8,7 @@ RMD160 (suhosin-patch-5.3.25-0.9.10.patch.bz2) = 6c4d0cfe070802481121be465b66d3c Size (suhosin-patch-5.3.25-0.9.10.patch.bz2) = 32447 bytes SHA1 (patch-aa) = fd930d0d9b1c60e8c7c514cfb6864b61ce4d158d SHA1 (patch-ab) = 36789fea71e316d5c4358e597df1928d94f8ea6a -SHA1 (patch-ac) = e8a7218d74f2f4093acca2160693c9a245e4cfc7 +SHA1 (patch-ac) = b194eaed2d81877166b13db58b37c5ddff0210a6 SHA1 (patch-aclocal.m4) = 473b76c8575331604d30e24a08c527e15b166778 SHA1 (patch-ad) = 6b42868f41335ddfa5a8c1e982819166b05e4ad2 SHA1 (patch-ae) = 3a354cb5c1253eb375041d8ee8549c2f663e6c74 diff --git a/lang/php53/patches/patch-ac b/lang/php53/patches/patch-ac index b833d9697c7..dbb80905668 100644 --- a/lang/php53/patches/patch-ac +++ b/lang/php53/patches/patch-ac @@ -1,6 +1,8 @@ -$NetBSD: patch-ac,v 1.6 2013/07/12 00:07:04 taca Exp $ +$NetBSD: patch-ac,v 1.7 2014/03/23 09:55:59 spz Exp $ ---- ext/gd/config.m4.orig 2013-07-10 17:43:08.000000000 +0000 +Adjustments for zlib, png and freetype2 + +--- ext/gd/config.m4.orig 2013-12-10 19:04:57.000000000 +0000 +++ ext/gd/config.m4 @@ -45,18 +45,7 @@ dnl Checks for the configure options dnl @@ -47,3 +49,21 @@ $NetBSD: patch-ac,v 1.6 2013/07/12 00:07:04 taca Exp $ ],[ -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR ]) +@@ -162,7 +150,7 @@ 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 ++ if test -f "$i/include/ft2build.h" -o -f "$i/include/freetype2/ft2build.h"; then + FREETYPE2_DIR=$i + FREETYPE2_INC_DIR=$i/include/freetype2 + break +@@ -170,7 +158,7 @@ AC_DEFUN([PHP_GD_FREETYPE2],[ + done + + if test -z "$FREETYPE2_DIR"; then +- AC_MSG_ERROR([freetype.h not found.]) ++ AC_MSG_ERROR([ft2build.h not found.]) + fi + + PHP_CHECK_LIBRARY(freetype, FT_New_Face, |