[pkgsrc/trunk]: pkgsrc/www bl3ify

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/www bl3ify
From: xtraeme <xtraeme%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:58:24 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/2a463084dacd
branches:  trunk
changeset: 473839:2a463084dacd
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sat Apr 24 23:03:25 2004 +0000

description:
bl3ify

diffstat:

 www/ap-php4/Makefile     |   7 +++----
 www/php4-apc/Makefile    |   5 ++---
 www/php4-curl/Makefile   |   6 +++---
 www/php4/Makefile        |   4 ++--
 www/php4/Makefile.module |  11 ++++-------
 www/php4/Makefile.php    |   4 ++--
 www/php4/buildlink3.mk   |  19 +++++++++++++++++++
 www/php4/pear.mk         |   4 ++--
 8 files changed, 37 insertions(+), 23 deletions(-)

diffs (189 lines):

diff -r 407ea476358c -r 2a463084dacd www/ap-php4/Makefile
--- a/www/ap-php4/Makefile      Sat Apr 24 23:02:35 2004 +0000
+++ b/www/ap-php4/Makefile      Sat Apr 24 23:03:25 2004 +0000
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.36 2004/02/14 17:21:54 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2004/04/24 23:03:25 xtraeme Exp $
 #
 
 PKGNAME=               ap-php-${PHP_BASE_VERS}
 PKGREVISION=           # empty
 COMMENT=               Apache (${PKG_APACHE}) module for PHP4
 
-DEPENDS+=              php>=${PHP_BASE_VERS}:../../www/php4
-
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 APACHE_MODULE=         YES
 SHLIBTOOL_OVERRIDE=    libtool
 
@@ -25,5 +23,6 @@
                        ${PREFIX}/lib/httpd/mod_php4.so;        \
        fi
 
+.include "../../www/php4/buildlink3.mk"
 .include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 407ea476358c -r 2a463084dacd www/php4-apc/Makefile
--- a/www/php4-apc/Makefile     Sat Apr 24 23:02:35 2004 +0000
+++ b/www/php4-apc/Makefile     Sat Apr 24 23:03:25 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/04/24 22:46:13 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2004/04/24 23:03:25 xtraeme Exp $
 
 DISTNAME=      apc-1.1.0pl1
 PKGNAME=       php-apc-1.1.0.1
@@ -14,7 +14,7 @@
 EXTRACT_ELEMENTS=      # empty
 
 WRKSRC=                        ${WRKDIR}/${DISTNAME}
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 DISTINFO_FILE=         ${.CURDIR}/distinfo
 
 .include "../../www/php4/Makefile.module"
@@ -32,5 +32,4 @@
                GORY_DETAILS INSTALL LICENSE README.compiler ${DOCDIR}
        cd ${WRKSRC}; ${INSTALL_DATA} extras/apcinfo.php ${EGDIR}
 
-.include "../../www/php4/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 407ea476358c -r 2a463084dacd www/php4-curl/Makefile
--- a/www/php4-curl/Makefile    Sat Apr 24 23:02:35 2004 +0000
+++ b/www/php4-curl/Makefile    Sat Apr 24 23:03:25 2004 +0000
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.3 2004/03/26 02:27:58 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/24 23:03:25 xtraeme Exp $
 
 MODNAME=               curl
 PKGREVISION=           1
 CATEGORIES+=           www
 COMMENT=               PHP4 extension for curl functions
 
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 
 .include "../../www/php4/Makefile.module"
 
 CONFIGURE_ARGS+=       --with-curl=shared,${BUILDLINK_PREFIX.curl}
 
-.include "../../www/curl/buildlink2.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 407ea476358c -r 2a463084dacd www/php4/Makefile
--- a/www/php4/Makefile Sat Apr 24 23:02:35 2004 +0000
+++ b/www/php4/Makefile Sat Apr 24 23:03:25 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2004/02/14 17:21:54 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2004/04/24 23:03:25 xtraeme Exp $
 
 PKGNAME=               php-${PHP_BASE_VERS}
 CATEGORIES+=           lang
@@ -6,7 +6,7 @@
 
 CONFLICTS+=            ap-php-4.0.3pl1
 
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 USE_PKGINSTALL=                YES
 # PHP uses libtool inconsistently for CGI/CLI build; don't sanify for now
 # LIBTOOL_OVERRIDE=    libtool
diff -r 407ea476358c -r 2a463084dacd www/php4/Makefile.module
--- a/www/php4/Makefile.module  Sat Apr 24 23:02:35 2004 +0000
+++ b/www/php4/Makefile.module  Sat Apr 24 23:03:25 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.module,v 1.24 2004/03/14 20:07:06 jlam Exp $
+# $NetBSD: Makefile.module,v 1.25 2004/04/24 23:03:25 xtraeme Exp $
 #
 # This Makefile is provided to ease creating PHP4 packages for the extension
 # modules distributed in the PHP4 sources.
@@ -12,8 +12,6 @@
 PKGNAME?=              php-${MODNAME}-${PHP_BASE_VERS}
 PKGREVISION?=          # empty
 
-DEPENDS+=              php>=${PHP_BASE_VERS}:../../www/php4
-
 AUTOMAKE_REQD?=                1.7
 .include "../../mk/automake.mk"
 
@@ -25,15 +23,14 @@
 WRKSRC?=               ${WRKDIR}/${EXTRACT_ELEMENTS}
 DISTINFO_FILE?=                ${PKGDIR}/../../www/php4/distinfo
 
-PHPIZE?=               ${BUILDLINK_PREFIX.php4}/bin/phpize
-PHP_CONFIG?=           ${BUILDLINK_PREFIX.php4}/bin/php-config
+PHPIZE?=               ${BUILDLINK_PREFIX.php}/bin/phpize
+PHP_CONFIG?=           ${BUILDLINK_PREFIX.php}/bin/php-config
 
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --with-php-config=${PHP_CONFIG}
 
 USE_CONFIG_WRAPPER=    YES
 USE_LIBTOOL=           YES
-LTCONFIG_OVERRIDE=     ${WRKSRC}/ltconfig
 
 # Ensure we export symbols in the linked shared object.
 LDFLAGS+=              ${EXPORT_SYMBOLS_LDFLAGS}
@@ -64,4 +61,4 @@
        ${INSTALL_DATA} ${MODULESDIR}/${PKGMODNAME}.so \
                ${PREFIX}/${PHP_EXTENSION_DIR}
 
-.include "../../www/php4/buildlink2.mk"
+.include "../../www/php4/buildlink3.mk"
diff -r 407ea476358c -r 2a463084dacd www/php4/Makefile.php
--- a/www/php4/Makefile.php     Sat Apr 24 23:02:35 2004 +0000
+++ b/www/php4/Makefile.php     Sat Apr 24 23:03:25 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.11 2004/04/19 13:09:16 cube Exp $
+# $NetBSD: Makefile.php,v 1.12 2004/04/24 23:03:25 xtraeme Exp $
 
 .include "../../www/php4/Makefile.common"
 
@@ -42,5 +42,5 @@
 BUILD_DEFS+=           USE_SSL
 .if defined(USE_SSL) && !empty(USE_SSL:M[Yy][Ee][Ss])
 PHP5_CONFIGURE_ARGS+=  --with-openssl
-.include "../../security/openssl/buildlink2.mk"
+.include "../../security/openssl/buildlink3.mk"
 .endif
diff -r 407ea476358c -r 2a463084dacd www/php4/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/php4/buildlink3.mk    Sat Apr 24 23:03:25 2004 +0000
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/24 23:03:25 xtraeme Exp $
+
+BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
+PHP_BUILDLINK3_MK:=    ${PHP_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    php
+.endif
+
+BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nphp}
+BUILDLINK_PACKAGES+=   php
+
+.if !empty(PHP_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.php+=                php>=4.3.6
+BUILDLINK_PKGSRCDIR.php?=      ../../www/php4
+BUILDLINK_DEPMETHOD.php=       build
+.endif # PHP_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r 407ea476358c -r 2a463084dacd www/php4/pear.mk
--- a/www/php4/pear.mk  Sat Apr 24 23:02:35 2004 +0000
+++ b/www/php4/pear.mk  Sat Apr 24 23:03:25 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pear.mk,v 1.6 2004/04/20 18:44:35 jdolecek Exp $
+# $NetBSD: pear.mk,v 1.7 2004/04/24 23:03:25 xtraeme Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install pear packages.
@@ -14,7 +14,7 @@
 .if !defined(_PEAR_PACKAGE_MK)
 _PEAR_PACKAGE_MK=       # defined
 
-USE_BUILDLINK2=                        YES
+USE_BUILDLINK3=                        YES
 BUILDLINK_DEPMETHOD.php4=      full
 
 .include "../../www/php4/buildlink2.mk"
Prev by Date: [pkgsrc/trunk]: pkgsrc/www/php4 bl3ify
Next by Date: [pkgsrc/trunk]: pkgsrc/mail/spamass-milter Convert to buildlink3.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/www/php4 bl3ify
Next by Thread: [pkgsrc/trunk]: pkgsrc/mail/spamass-milter Convert to buildlink3.
Indexes:
Home | Main Index | Thread Index | Old Index