[pkgsrc/trunk]: pkgsrc it safe to include "../../lang/php/ext.mk" after exten...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc it safe to include "../../lang/php/ext.mk" after exten...
From: jdolecek <jdolecek%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 00:47:28 +0000

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ad5801069e33
branches:  trunk
changeset: 482989:ad5801069e33
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Fri Nov 05 21:44:44 2004 +0000

description:
it safe to include "../../lang/php/ext.mk" after extension CONFIGURE_ARGS
setting now, do so for aesthetic reasons

diffstat:

 archivers/php4-zip/Makefile    |  7 +++----
 databases/php5-mysqli/Makefile |  8 ++++----
 databases/php5-sqlite/Makefile |  7 +++----
 print/php4-pdflib/Makefile     |  7 +++----
 textproc/php4-domxml/Makefile  |  7 +++----
 textproc/php4-xslt/Makefile    |  8 ++++----
 www/php4-apc/Makefile          |  7 +++----
 7 files changed, 23 insertions(+), 28 deletions(-)

diffs (183 lines):

diff -r 9d4a37dad3f7 -r ad5801069e33 archivers/php4-zip/Makefile
--- a/archivers/php4-zip/Makefile       Fri Nov 05 21:40:25 2004 +0000
+++ b/archivers/php4-zip/Makefile       Fri Nov 05 21:44:44 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/10/31 21:28:51 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2004/11/05 21:44:44 jdolecek Exp $
 
 MODNAME=               zip
 CATEGORIES+=           archivers
@@ -7,10 +7,9 @@
 
 USE_BUILDLINK3=                YES
 
+CONFIGURE_ARGS+=       --with-${MODNAME}=shared,${BUILDLINK_DIR}
+
 PHP_VERSION_REQD=      4
 .include "../../lang/php/ext.mk"
-
-CONFIGURE_ARGS+=       --with-${MODNAME}=shared,${BUILDLINK_DIR}
-
 .include "../../archivers/zziplib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 9d4a37dad3f7 -r ad5801069e33 databases/php5-mysqli/Makefile
--- a/databases/php5-mysqli/Makefile    Fri Nov 05 21:40:25 2004 +0000
+++ b/databases/php5-mysqli/Makefile    Fri Nov 05 21:44:44 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/11/01 22:08:43 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/11/05 21:44:44 jdolecek Exp $
 
 MODNAME=               mysqli
 CATEGORIES+=           databases
@@ -8,12 +8,12 @@
 
 USE_BUILDLINK3=                yes
 
+EVAL_PREFIX+=          MYSQLDIR=mysql-client
+CONFIGURE_ARGS+=       --with-${MODNAME}=${PREFIX}/bin/mysql_config
+
 PHP_VERSION_REQD=      5
 .include "../../lang/php/ext.mk"
 
-EVAL_PREFIX+=          MYSQLDIR=mysql-client
-CONFIGURE_ARGS+=       --with-${MODNAME}=${PREFIX}/bin/mysql_config
-
 MYSQL_VERSION_REQD=    41
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 9d4a37dad3f7 -r ad5801069e33 databases/php5-sqlite/Makefile
--- a/databases/php5-sqlite/Makefile    Fri Nov 05 21:40:25 2004 +0000
+++ b/databases/php5-sqlite/Makefile    Fri Nov 05 21:44:44 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 22:11:52 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/11/05 21:44:44 jdolecek Exp $
 
 MODNAME=               sqlite
 CATEGORIES+=           databases
@@ -8,10 +8,9 @@
 
 USE_BUILDLINK3=                yes
 
+CONFIGURE_ARGS+=        --with-${MODNAME}=shared,${BUILDLINK_PREFIX.sqlite}
+
 PHP_VERSION_REQD=      5
 .include "../../lang/php/ext.mk"
-
-CONFIGURE_ARGS+=        --with-${MODNAME}=shared,${BUILDLINK_PREFIX.sqlite}
-
 .include "../../databases/sqlite/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 9d4a37dad3f7 -r ad5801069e33 print/php4-pdflib/Makefile
--- a/print/php4-pdflib/Makefile        Fri Nov 05 21:40:25 2004 +0000
+++ b/print/php4-pdflib/Makefile        Fri Nov 05 21:44:44 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/10/31 21:28:51 jdolecek Exp $
+# $NetBSD: Makefile,v 1.13 2004/11/05 21:44:44 jdolecek Exp $
 
 MODNAME=               pdf
 PKGNAME=               php-pdflib-${PHP_BASE_VERS}
@@ -8,14 +8,13 @@
 
 USE_BUILDLINK3=                YES
 
-PHP_VERSION_REQD=      4
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=       --with-pdflib=shared,${BUILDLINK_PREFIX.pdflib}
 CONFIGURE_ARGS+=       --with-jpeg-dir=shared,${BUILDLINK_PREFIX.jpeg}
 CONFIGURE_ARGS+=       --with-png-dir=shared,${BUILDLINK_PREFIX.png}
 CONFIGURE_ARGS+=       --with-tiff-dir=shared,${BUILDLINK_PREFIX.tiff}
 CONFIGURE_ENV+=                PHP_ZLIB_DIR=${BUILDLINK_PREFIX.zlib}
 
+PHP_VERSION_REQD=      4
+.include "../../lang/php/ext.mk"
 .include "../../print/pdflib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 9d4a37dad3f7 -r ad5801069e33 textproc/php4-domxml/Makefile
--- a/textproc/php4-domxml/Makefile     Fri Nov 05 21:40:25 2004 +0000
+++ b/textproc/php4-domxml/Makefile     Fri Nov 05 21:44:44 2004 +0000
@@ -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 @@
 
 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 -r 9d4a37dad3f7 -r ad5801069e33 textproc/php4-xslt/Makefile
--- a/textproc/php4-xslt/Makefile       Fri Nov 05 21:40:25 2004 +0000
+++ b/textproc/php4-xslt/Makefile       Fri Nov 05 21:44:44 2004 +0000
@@ -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 @@
 
 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 @@
 # 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 @@
        ${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"
diff -r 9d4a37dad3f7 -r ad5801069e33 www/php4-apc/Makefile
--- a/www/php4-apc/Makefile     Fri Nov 05 21:40:25 2004 +0000
+++ b/www/php4-apc/Makefile     Fri Nov 05 21:44:44 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/11/02 20:08:15 jdolecek Exp $
+# $NetBSD: Makefile,v 1.14 2004/11/05 21:44:44 jdolecek Exp $
 
 DISTNAME=      APC-2.0.4
 PKGNAME=       php-${DISTNAME:tl}
@@ -17,9 +17,6 @@
 USE_BUILDLINK3=                YES
 DISTINFO_FILE=         ${.CURDIR}/distinfo
 
-PHP_VERSION_REQD=      4               # PHP 4.x only
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=       --enable-${MODNAME}
 
 PLIST_SRC+=            ${.CURDIR}/PLIST.extras
@@ -31,4 +28,6 @@
        cd ${WRKSRC}; ${INSTALL_DATA} \
                INSTALL LICENSE NOTICE ${DOCDIR}
 
+PHP_VERSION_REQD=      4               # PHP 4.x only
+.include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"

Prev by Date: [pkgsrc/trunk]: pkgsrc/lang/php use ${PKG_PHP} instead of PHP${PKG_PHP_VERSION}
Next by Date: [pkgsrc/trunk]: pkgsrc/security/gnupg-devel Update to gnupg-devel-1.9.11nb1:
Previous by Thread: [pkgsrc/trunk]: pkgsrc/lang/php use ${PKG_PHP} instead of PHP${PKG_PHP_VERSION}
Next by Thread: [pkgsrc/trunk]: pkgsrc/security/gnupg-devel Update to gnupg-devel-1.9.11nb1:
Indexes:

Home | Main Index | Thread Index | Old Index