diff options
| author | taca <taca@pkgsrc.org> | 2016-08-13 17:34:41 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2016-08-13 17:34:41 +0000 |
| commit | 577543ac7d213c065716e9890b48887fe3ed0741 (patch) | |
| tree | ed70d2940dd8f6d82048cddf9328e99f80a16958 /lang/php70 | |
| parent | 2f36fce1bfa13d8acad191cc9e331470ee0ebb9b (diff) | |
| download | pkgsrc-577543ac7d213c065716e9890b48887fe3ed0741.tar.gz | |
* Switch to use external gd (graphics/gd package).
* Use the same PKG_OPTIONS as graphics/gd.
Bump PKGREVISION of php-gd.
Diffstat (limited to 'lang/php70')
| -rw-r--r-- | lang/php70/distinfo | 4 | ||||
| -rw-r--r-- | lang/php70/patches/patch-ext_gd_config.m4 | 15 |
2 files changed, 15 insertions, 4 deletions
diff --git a/lang/php70/distinfo b/lang/php70/distinfo index 8dd5b007885..2a666e4e3fa 100644 --- a/lang/php70/distinfo +++ b/lang/php70/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2016/07/24 13:27:23 jdolecek Exp $ +$NetBSD: distinfo,v 1.17 2016/08/13 17:34:41 taca Exp $ SHA1 (php-7.0.9.tar.bz2) = bc94c0c0d548ab4b89840994f9f3b468a3d89c4b RMD160 (php-7.0.9.tar.bz2) = d6771507506336da29f88ae59e5d93da4207bfdd @@ -6,7 +6,7 @@ SHA512 (php-7.0.9.tar.bz2) = 730a59a2564a5564165d8f2ddb357658137e86915dcf05b1186 Size (php-7.0.9.tar.bz2) = 14870061 bytes SHA1 (patch-acinclude.m4) = b682280fd89950c082c2226bdb7364b0dc475bad SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c -SHA1 (patch-ext_gd_config.m4) = a7ec1bd0d876657d4b5e597b9aa1e97c2d2801e3 +SHA1 (patch-ext_gd_config.m4) = bde93678626592cdcee619189bfc6532d0913a76 SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92 SHA1 (patch-ext_pcre_pcrelib_config.h) = 0cb05c3b3bfafd8119cf43162c0f4db7f5b37ba8 SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8 diff --git a/lang/php70/patches/patch-ext_gd_config.m4 b/lang/php70/patches/patch-ext_gd_config.m4 index f06b5f892a1..a3e3acbfeae 100644 --- a/lang/php70/patches/patch-ext_gd_config.m4 +++ b/lang/php70/patches/patch-ext_gd_config.m4 @@ -1,6 +1,6 @@ -$NetBSD: patch-ext_gd_config.m4,v 1.1 2015/12/06 15:17:31 taca Exp $ +$NetBSD: patch-ext_gd_config.m4,v 1.2 2016/08/13 17:34:41 taca Exp $ ---- ext/gd/config.m4.orig 2015-12-01 13:36:33.000000000 +0000 +--- ext/gd/config.m4.orig 2016-07-20 13:11:57.000000000 +0000 +++ ext/gd/config.m4 @@ -46,18 +46,7 @@ dnl Checks for the configure options dnl @@ -47,3 +47,14 @@ $NetBSD: patch-ext_gd_config.m4,v 1.1 2015/12/06 15:17:31 taca Exp $ ],[ -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR ]) +@@ -230,7 +218,9 @@ AC_DEFUN([PHP_GD_CHECK_VERSION],[ + PHP_CHECK_LIBRARY(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1, [ ])], [], [ $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImageCreateFromWebp, [AC_DEFINE(HAVE_GD_WEBP, 1, [ ])], [], [ $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImageCreateFromJpeg, [AC_DEFINE(HAVE_GD_JPG, 1, [ ])], [], [ $GD_SHARED_LIBADD ]) +- PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm, [AC_DEFINE(HAVE_GD_XPM, 1, [ ])], [], [ $GD_SHARED_LIBADD ]) ++ if test "$PHP_XPM_DIR" != "no"; then ++ PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm, [AC_DEFINE(HAVE_GD_XPM, 1, [ ])], [], [ $GD_SHARED_LIBADD ]) ++ fi + PHP_CHECK_LIBRARY(gd, gdImageStringFT, [AC_DEFINE(HAVE_GD_FREETYPE, 1, [ ])], [], [ $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdVersionString, [AC_DEFINE(HAVE_GD_LIBVERSION, 1, [ ])], [], [ $GD_SHARED_LIBADD ]) + ]) |