Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.  This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.

5 files changed, 40 insertions, 7 deletions

diff --git a/www/php4/Makefile b/www/php4/Makefile
index 2f71cc052d1..940c1371380 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2002/02/28 06:14:46 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2002/08/25 18:40:25 jlam Exp $
 
 PKGNAME=		php-${PHP_BASE_VERS}
 PKGREVISION=		# empty
@@ -7,7 +7,7 @@ COMMENT=		HTML-embedded scripting language
 
 CONFLICTS+=		ap-php-4.0.3pl1
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 .include "Makefile.php"
 
diff --git a/www/php4/Makefile.module b/www/php4/Makefile.module
index 713a94a4bb5..5abebe016c0 100644
--- a/www/php4/Makefile.module
+++ b/www/php4/Makefile.module
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.module,v 1.15 2002/03/01 22:51:42 jlam Exp $
+# $NetBSD: Makefile.module,v 1.16 2002/08/25 18:40:25 jlam Exp $
 #
 # This Makefile is provided to ease creating PHP4 packages for the extension
 # modules distributed in the PHP4 sources.
@@ -23,6 +23,7 @@ EXTRACT_ELEMENTS?=	${DISTNAME}/ext/${PKGMODNAME}
 WRKSRC?=		${WRKDIR}/${EXTRACT_ELEMENTS}
 
 PHPIZE?=		${BUILDLINK_PREFIX.php4}/bin/phpize
+PHP_CONFIG?=		${BUILDLINK_PREFIX.php4}/bin/php-config
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-php-config=${PHP_CONFIG}
@@ -55,4 +56,4 @@ do-module-install:
 	${INSTALL_DATA} ${MODULESDIR}/${PKGMODNAME}.so \
 		${PREFIX}/${PHP_EXTENSION_DIR}
 
-.include "../../www/php4/buildlink.mk"
+.include "../../www/php4/buildlink2.mk"
diff --git a/www/php4/buildlink2.mk b/www/php4/buildlink2.mk
new file mode 100644
index 00000000000..2168f363054
--- /dev/null
+++ b/www/php4/buildlink2.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:25 jlam Exp $
+
+.if !defined(PHP4_BUILDLINK2_MK)
+PHP4_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		php4
+BUILDLINK_DEPENDS.php4?=	php>=4.1.0
+BUILDLINK_PKGSRCDIR.php4?=	../../www/php4
+
+# This adds a build-dependency as php4 has no libraries.
+BUILDLINK_DEPMETHOD.php4?=	build
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.php4=php
+BUILDLINK_PREFIX.php4_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.php4=		include/php/*/*/*.h
+BUILDLINK_FILES.php4+=		include/php/*/*.h
+BUILDLINK_FILES.php4+=		include/php/*.h
+
+BUILDLINK_TARGETS+=		php4-buildlink
+
+php4-buildlink: _BUILDLINK_USE
+
+.endif	# PHP4_BUILDLINK2_MK
diff --git a/www/php4/distinfo b/www/php4/distinfo
index 6c2e5ae17ab..7ccb6d669ea 100644
--- a/www/php4/distinfo
+++ b/www/php4/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2002/02/28 06:14:46 jlam Exp $
+$NetBSD: distinfo,v 1.9 2002/08/25 18:40:26 jlam Exp $
 
 SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466
 Size (php-4.1.2.tar.gz) = 3359964 bytes
 SHA1 (patch-aa) = 08f98c6b41c24a2aa8fa417bba50cf0cb5f711af
 SHA1 (patch-ac) = 9478c18dbe18e8c4c05dffce31fa3f923562c832
-SHA1 (patch-ad) = 3b90e5c60493689cfad5ea3563f19d03b7b3f354
+SHA1 (patch-ad) = 4ac02d0e0e5bd612254020d46292534a0e9445b0
 SHA1 (patch-ae) = e7acc06a63f47053c81ab442b53c68d89d122f78
 SHA1 (patch-af) = 34ec060ed3cdbcfc44286323f85f9938a79b0444
 SHA1 (patch-ag) = 91e84f6d6862a328d3f66f87260e8f2b2953fc11
diff --git a/www/php4/patches/patch-ad b/www/php4/patches/patch-ad
index 3cf81567ff7..58d6848539e 100644
--- a/www/php4/patches/patch-ad
+++ b/www/php4/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.7 2002/02/28 06:14:47 jlam Exp $
+$NetBSD: patch-ad,v 1.8 2002/08/25 18:40:26 jlam Exp $
 
 --- configure.orig	Wed Feb 27 04:18:32 2002
 +++ configure
@@ -45,6 +45,15 @@ $NetBSD: patch-ad,v 1.7 2002/02/28 06:14:47 jlam Exp $
    echo "$ac_t""no" 1>&6
  
  fi
+@@ -58680,7 +58662,7 @@
+ 
+ TSRM_LIB='TSRM/libtsrm.la'
+ TSRM_DIR=TSRM
+-CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/TSRM"
++INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM"
+ 
+ if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then
+   cat >> confdefs.h <<\EOF
 @@ -63418,7 +63400,7 @@
  
  if test "$enable_debug" != "yes"; then