summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorjdolecek <jdolecek@pkgsrc.org>2004-11-05 17:11:39 +0000
committerjdolecek <jdolecek@pkgsrc.org>2004-11-05 17:11:39 +0000
commitaab303f56262d4491a633511c8c76a2278b5a21d (patch)
tree89a1969994af5555fc7a3f3db8d11fca07670f21 /graphics
parent4c972bb1324287da5d73cef359e1fe145b3e9b7d (diff)
downloadpkgsrc-aab303f56262d4491a633511c8c76a2278b5a21d.tar.gz
now that PHP 5.x Makefile.common doesn't pollute CONFIGURE_ARGS, it safe
to include "../../lang/php/ext.mk" after extension CONFIGURE_ARGS setting; successful build confirmed with both PHP 4.x and PHP 5.x
Diffstat (limited to 'graphics')
-rw-r--r--graphics/php-exif/Makefile5
-rw-r--r--graphics/php-gd/Makefile5
2 files changed, 4 insertions, 6 deletions
diff --git a/graphics/php-exif/Makefile b/graphics/php-exif/Makefile
index 623f1ae071d..1b124bee70b 100644
--- a/graphics/php-exif/Makefile
+++ b/graphics/php-exif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
MODNAME= exif
CATEGORIES+= graphics
@@ -7,8 +7,7 @@ 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 3c0e40b5786..e1888d321cf 100644
--- a/graphics/php-gd/Makefile
+++ b/graphics/php-gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
MODNAME= gd
CATEGORIES+= graphics
@@ -8,8 +8,6 @@ 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}
@@ -26,4 +24,5 @@ CONFIGURE_ARGS+= --without-t1lib
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/xpm/buildlink3.mk"
+.include "../../lang/php/ext.mk"
.include "../../mk/bsd.pkg.mk"