From d7a6086867ba79779f1a873f7825195af422353c Mon Sep 17 00:00:00 2001 From: jdolecek Date: Fri, 5 Nov 2004 21:44:44 +0000 Subject: it safe to include "../../lang/php/ext.mk" after extension CONFIGURE_ARGS setting now, do so for aesthetic reasons --- textproc/php4-domxml/Makefile | 7 +++---- textproc/php4-xslt/Makefile | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'textproc') diff --git a/textproc/php4-domxml/Makefile b/textproc/php4-domxml/Makefile index 475973047b6..48b7117c831 100644 --- a/textproc/php4-domxml/Makefile +++ b/textproc/php4-domxml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/10/31 21:28:51 jdolecek Exp $ +# $NetBSD: Makefile,v 1.20 2004/11/05 21:44:44 jdolecek Exp $ MODNAME= domxml CATEGORIES+= textproc @@ -7,15 +7,14 @@ COMMENT= PHP4 extension for DOM support USE_BUILDLINK3= YES -PHP_VERSION_REQD= 4 -.include "../../lang/php/ext.mk" - CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_PREFIX.libxml2} CONFIGURE_ARGS+= --with-dom=shared,${BUILDLINK_PREFIX.libxml2} CONFIGURE_ARGS+= --with-zlib-dir=${BUILDLINK_PREFIX.zlib} CONFIGURE_ARGS+= --with-dom-xslt=${BUILDLINK_PREFIX.libxslt} CONFIGURE_ARGS+= --with-dom-exslt=${BUILDLINK_PREFIX.libxslt} +PHP_VERSION_REQD= 4 +.include "../../lang/php/ext.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" diff --git a/textproc/php4-xslt/Makefile b/textproc/php4-xslt/Makefile index 114cc35d6cf..6262b76cc3f 100644 --- a/textproc/php4-xslt/Makefile +++ b/textproc/php4-xslt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/10/31 21:28:51 jdolecek Exp $ +# $NetBSD: Makefile,v 1.14 2004/11/05 21:44:44 jdolecek Exp $ MODNAME= xslt CATEGORIES+= textproc @@ -7,9 +7,6 @@ COMMENT= PHP4 extension for XSLT functions (Sablotron backend) USE_BUILDLINK3= YES -PHP_VERSION_REQD= 4 -.include "../../lang/php/ext.mk" - CONFIGURE_ARGS+= --enable-${MODNAME} CONFIGURE_ARGS+= --with-${MODNAME}-sablot=${BUILDLINK_PREFIX.sablotron} CONFIGURE_ARGS+= --with-expat-dir=${BUILDLINK_PREFIX.expat} @@ -18,6 +15,7 @@ CONFIGURE_ARGS+= --with-expat-dir=${BUILDLINK_PREFIX.expat} # or use the packaged iconv, as appropriate; using # --with-iconv=shared,${BUILDLINK_PREFIX.iconv} assumes libiconv exists +.include "../../mk/bsd.prefs.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../mk/buildlink3/bsd.builtin.mk" @@ -35,5 +33,7 @@ post-install: ${INSTALL_DATA_DIR} ${DOCDIR} cd ${WRKSRC}; ${INSTALL_DATA} README.XSLT-BACKENDS ${DOCDIR} +PHP_VERSION_REQD= 4 +.include "../../lang/php/ext.mk" .include "../../textproc/sablotron/buildlink3.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3