summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorjdolecek <jdolecek@pkgsrc.org>2004-10-31 21:07:13 +0000
committerjdolecek <jdolecek@pkgsrc.org>2004-10-31 21:07:13 +0000
commit36d25eff74a45b672d957cd601b1005b257eab75 (patch)
tree43db2985256b44525aca65ddff538530e5c2c223 /graphics
parent6a7f2fa6c72867cf5a751db0c33a7fbc77b0eaa1 (diff)
downloadpkgsrc-36d25eff74a45b672d957cd601b1005b257eab75.tar.gz
extension modules must be able to override CONFIGURE_ARGS, so include
lang/php/ext.mk before setting CONFIGURE_ARGS
Diffstat (limited to 'graphics')
-rw-r--r--graphics/php-exif/Makefile5
-rw-r--r--graphics/php-gd/Makefile5
2 files changed, 6 insertions, 4 deletions
diff --git a/graphics/php-exif/Makefile b/graphics/php-exif/Makefile
index e16ab406745..623f1ae071d 100644
--- a/graphics/php-exif/Makefile
+++ b/graphics/php-exif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= exif
CATEGORIES+= graphics
@@ -7,7 +7,8 @@ COMMENT= PHP extension to extract information from EXIF headers
USE_BUILDLINK3= YES
+.include "../../lang/php/ext.mk"
+
CONFIGURE_ARGS+= --with-${MODNAME}=shared
-.include "../../lang/php/ext.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/php-gd/Makefile b/graphics/php-gd/Makefile
index 18d17e993f0..3c0e40b5786 100644
--- a/graphics/php-gd/Makefile
+++ b/graphics/php-gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= gd
CATEGORIES+= graphics
@@ -8,6 +8,8 @@ COMMENT= PHP extension for GD graphics library
USE_BUILDLINK3= YES
USE_X11= YES
+.include "../../lang/php/ext.mk"
+
CONFIGURE_ARGS+= --with-${MODNAME} # use bundled libgd
CONFIGURE_ARGS+= --with-jpeg-dir=${BUILDLINK_DIR}
CONFIGURE_ARGS+= --with-png-dir=${BUILDLINK_DIR}
@@ -19,7 +21,6 @@ CONFIGURE_ARGS+= --enable-${MODNAME}-native-ttf
CONFIGURE_ARGS+= --enable-${MODNAME}-jis-conv
CONFIGURE_ARGS+= --without-t1lib
-.include "../../lang/php/ext.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"