diff options
| author | taca <taca> | 2016-08-13 17:34:41 +0000 |
|---|---|---|
| committer | taca <taca> | 2016-08-13 17:34:41 +0000 |
| commit | ca8ec52a9fc7805031916ee9b5c32a24ee560277 (patch) | |
| tree | d55ba021ff7ab0c90335122fc99379a26522e0e1 /graphics/php-gd | |
| parent | cdfee4ad4cba90b7903114d3e2ea7a705ca1e30b (diff) | |
| download | pkgsrc-ca8ec52a9fc7805031916ee9b5c32a24ee560277.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 'graphics/php-gd')
| -rw-r--r-- | graphics/php-gd/Makefile | 12 | ||||
| -rw-r--r-- | graphics/php-gd/options.mk | 14 |
2 files changed, 20 insertions, 6 deletions
diff --git a/graphics/php-gd/Makefile b/graphics/php-gd/Makefile index ae49145ca39..9e73d076090 100644 --- a/graphics/php-gd/Makefile +++ b/graphics/php-gd/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.37 2015/03/20 16:33:28 taca Exp $ +# $NetBSD: Makefile,v 1.38 2016/08/13 17:34:41 taca Exp $ MODNAME= gd +PKGREVISION= 1 CATEGORIES+= graphics COMMENT= PHP extension for GD graphics library @@ -9,7 +10,7 @@ CONFLICTS= php-gd-[0-9]* # XXX we use bundled GD so that extension is usable also by non-threaded # PHP, such as CLI/CGI version or ap-php on Apache 1.x. -CONFIGURE_ARGS+= --with-${MODNAME} +CONFIGURE_ARGS+= --with-${MODNAME}=${BUILDLINK_DIR:Q} CONFIGURE_ARGS+= --with-jpeg-dir=${BUILDLINK_DIR:Q} CONFIGURE_ARGS+= --with-png-dir=${BUILDLINK_DIR:Q} CONFIGURE_ARGS+= --with-zlib-dir=${BUILDLINK_DIR:Q} @@ -20,9 +21,8 @@ CONFIGURE_ARGS+= --without-t1lib USE_PHP_EXT_PATCHES= yes -.include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/freetype2/buildlink3.mk" -.include "../../mk/jpeg.buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" +.include "options.mk" + +.include "../../graphics/gd/buildlink3.mk" .include "../../lang/php/ext.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/php-gd/options.mk b/graphics/php-gd/options.mk new file mode 100644 index 00000000000..d2ce3bb5200 --- /dev/null +++ b/graphics/php-gd/options.mk @@ -0,0 +1,14 @@ +# $NetBSD: options.mk,v 1.1 2016/08/13 17:34:41 taca Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.gd +PKG_SUPPORTED_OPTIONS= x11 + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mx11) +.include "../../x11/libXpm/buildlink3.mk" +CONFIGURE_ENV+= X11BASE=${X11BASE} +CONFIGURE_ARGS+= --with-xpm-dir=${BUILDLINK_PREFIX.libXpm} +.else +CONFIGURE_ARGS+= --with-xpm-dir=no +.endif |