bl3ify

5 files changed, 29 insertions, 13 deletions

diff --git a/www/php4/Makefile b/www/php4/Makefile
index 199aaa6db07..8ad68a8ca50 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -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 @@ COMMENT=		HTML-embedded scripting language
 
 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 --git a/www/php4/Makefile.module b/www/php4/Makefile.module
index 32e55e5d107..be35a78d47e 100644
--- a/www/php4/Makefile.module
+++ b/www/php4/Makefile.module
@@ -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 @@ EXTRACT_ELEMENTS?=	${DISTNAME}/ext/${PKGMODNAME}
 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 @@ do-module-install:
 	${INSTALL_DATA} ${MODULESDIR}/${PKGMODNAME}.so \
 		${PREFIX}/${PHP_EXTENSION_DIR}
 
-.include "../../www/php4/buildlink2.mk"
+.include "../../www/php4/buildlink3.mk"
diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php
index 909ea2d3c3f..fcac003801c 100644
--- a/www/php4/Makefile.php
+++ b/www/php4/Makefile.php
@@ -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 @@ CONFIGURE_ENV+=		EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
 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 --git a/www/php4/buildlink3.mk b/www/php4/buildlink3.mk
new file mode 100644
index 00000000000..6d67bcd4537
--- /dev/null
+++ b/www/php4/buildlink3.mk
@@ -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 --git a/www/php4/pear.mk b/www/php4/pear.mk
index 5fa17af7571..73b2ab328de 100644
--- a/www/php4/pear.mk
+++ b/www/php4/pear.mk
@@ -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"