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.

26 files changed, 212 insertions, 41 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index 965fef03d7e..82ef0c96559 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2002/08/01 00:58:33 mycroft Exp $
+# $NetBSD: Makefile,v 1.104 2002/08/25 18:40:16 jlam Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
@@ -36,7 +36,7 @@ COMMENT=		Apache HTTP (Web) server
 CONFLICTS=		apache-*ssl-[0-9]* apache6-[0-9]*
 
 EXTRACT_ONLY=		${DISTFILES:N*.gif}
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 HAS_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-layout="${WRKDIR}/config.layout:pkgsrc"
 CONFIGURE_ARGS+=	--enable-module=most				\
@@ -48,7 +48,7 @@ CONFIGURE_ARGS+=	--without-confadjust
 CONFIGURE_ARGS+=	--with-perl=${PERL5}
 CONFIGURE_ARGS+=	--with-port=80
 CONFIGURE_ENV+=		OPTIM="${APACHE_CUSTOM_CFLAGS}"
-CONFIGURE_ENV+=		EAPI_MM="${BUILDLINK_DIR}"
+CONFIGURE_ENV+=		EAPI_MM="${BUILDLINK_PREFIX.libmm}"
 CONFIGURE_ENV+=		BINOWN=${BINOWN} BINGRP=${BINGRP}
 
 .include "../../mk/bsd.prefs.mk"
@@ -113,7 +113,7 @@ MAKE_ENV+=		LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
 
 .if (${OPSYS} == "SunOS")
 LDFLAGS+=		-Wl,-R/usr/ucblib -L/usr/ucblib
-CONFIGURE_ENV+=		INCLUDES="-I${BUILDLINK_DIR}/include/db2"
+CONFIGURE_ENV+=		INCLUDES="-I${BUILDLINK_PREFIX.db2}/include/db2"
 CONFIGURE_ENV+=		LIBS="-ldbm -ldb2"
 BUILDLINK_DEPENDS.db=	db>=2.7.7
 .include "../../databases/db/buildlink.mk"
@@ -187,7 +187,8 @@ post-install:
 	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
 	${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache
 
-.include "../../devel/libmm/buildlink.mk"
-.include "../../textproc/expat/buildlink.mk"
+.include "../../devel/libmm/buildlink2.mk"
+.include "../../textproc/expat/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/apache/PLIST b/www/apache/PLIST
index b7c37dcfef4..fab804af501 100644
--- a/www/apache/PLIST
+++ b/www/apache/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/06/20 17:12:37 taca Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/08/25 18:40:17 jlam Exp $
 bin/checkgid
 bin/dbmmanage
 bin/htdigest
diff --git a/www/apache/PLIST.shared b/www/apache/PLIST.shared
index afcaaa7fe70..d8f6ea7d8fd 100644
--- a/www/apache/PLIST.shared
+++ b/www/apache/PLIST.shared
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.shared,v 1.3 2002/07/30 18:40:14 wiz Exp $
+@comment $NetBSD: PLIST.shared,v 1.4 2002/08/25 18:40:17 jlam Exp $
 lib/httpd/httpd.exp
 lib/httpd/mod_define.so
 lib/httpd/mod_proxy.so
diff --git a/www/apache/buildlink2.mk b/www/apache/buildlink2.mk
new file mode 100644
index 00000000000..f370d53398b
--- /dev/null
+++ b/www/apache/buildlink2.mk
@@ -0,0 +1,33 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:17 jlam Exp $
+
+.if !defined(APACHE_BUILDLINK2_MK)
+APACHE_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		apache
+BUILDLINK_DEPENDS.apache?=	apache{,6}-1.3.*
+BUILDLINK_PKGSRCDIR.apache?=	../../www/apache
+
+# For "apxs":
+BUILD_DEPENDS+=			perl>=${PERL5_REQD}:../../lang/perl5
+.if defined(APACHE_MODULE)
+BUILDLINK_DEPMETHOD.apache?=	full
+.else
+BUILDLINK_DEPMETHOD.apache?=	build
+.endif
+
+EVAL_PREFIX+=				BUILDLINK_PREFIX.apache=apache
+BUILDLINK_PREFIX.apache_DEFAULT=	${LOCALBASE}
+
+BUILDLINK_FILES.apache=		include/httpd/*/*.[ch]
+BUILDLINK_FILES.apache+=	include/httpd/*.[ch]
+
+BUILDLINK_TARGETS+=	apache-buildlink
+
+APXS?=			${BUILDLINK_PREFIX.apache}/sbin/apxs
+.if defined(GNU_CONFIGURE)
+CONFIGURE_ARGS+=	--with-apxs="${APXS}"
+.endif
+
+apache-buildlink: _BUILDLINK_USE
+
+.endif	# APACHE_BUILDLINK2_MK
diff --git a/www/apache/distinfo b/www/apache/distinfo
index d07d4a48d57..fb0883bf773 100644
--- a/www/apache/distinfo
+++ b/www/apache/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2002/06/24 16:26:19 taca Exp $
+$NetBSD: distinfo,v 1.22 2002/08/25 18:40:18 jlam Exp $
 
 SHA1 (apache_1.3.26.tar.gz) = c8ab59541267c3e570592115b280e6cb2fb2b30f
 Size (apache_1.3.26.tar.gz) = 2303147 bytes
diff --git a/www/apache/files/apache.sh b/www/apache/files/apache.sh
index afe01833999..67879c0f02f 100644
--- a/www/apache/files/apache.sh
+++ b/www/apache/files/apache.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: apache.sh,v 1.20 2002/07/07 00:45:18 tv Exp $
+# $NetBSD: apache.sh,v 1.21 2002/08/25 18:40:18 jlam Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
diff --git a/www/apache/files/config.layout b/www/apache/files/config.layout
index 78cd648c07a..0c17293071d 100644
--- a/www/apache/files/config.layout
+++ b/www/apache/files/config.layout
@@ -1,4 +1,4 @@
-# $NetBSD: config.layout,v 1.5 2002/07/30 18:40:14 wiz Exp $
+# $NetBSD: config.layout,v 1.6 2002/08/25 18:40:19 jlam Exp $
 
 <Layout pkgsrc>
 prefix: @PREFIX@
diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa
index 7b5809cd53e..ea099ea49b5 100644
--- a/www/apache/patches/patch-aa
+++ b/www/apache/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.19 2002/06/20 17:12:37 taca Exp $
+$NetBSD: patch-aa,v 1.20 2002/08/25 18:40:19 jlam Exp $
 
 --- Makefile.tmpl.orig	Fri Jun 21 02:02:43 2002
 +++ Makefile.tmpl
diff --git a/www/apache/patches/patch-ao b/www/apache/patches/patch-ao
index f2ca851a12c..40a221d0ad9 100644
--- a/www/apache/patches/patch-ao
+++ b/www/apache/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.1 2002/06/20 17:12:37 taca Exp $
+$NetBSD: patch-ao,v 1.2 2002/08/25 18:40:19 jlam Exp $
 
 --- configure.orig	Thu Jun 20 20:56:07 2002
 +++ configure
diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile
index 933a32f4888..bec3d6255db 100644
--- a/www/libghttp/Makefile
+++ b/www/libghttp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/06/30 09:59:50 zuntum Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/25 18:40:20 jlam Exp $
 
 DISTNAME=		libghttp-1.0.9
 CATEGORIES=		www gnome
@@ -8,7 +8,7 @@ MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME http client library
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/www/libghttp/buildlink2.mk b/www/libghttp/buildlink2.mk
new file mode 100644
index 00000000000..befd6555ef3
--- /dev/null
+++ b/www/libghttp/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:20 jlam Exp $
+
+.if !defined(LIBGHTTP_BUILDLINK2_MK)
+LIBGHTTP_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		libghttp
+BUILDLINK_DEPENDS.libghttp?=	libghttp>=1.0.9
+BUILDLINK_PKGSRCDIR.libghttp?=	../../www/libghttp
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.libghttp=libghttp
+BUILDLINK_PREFIX.libghttp_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libghttp=	include/ghttp*
+BUILDLINK_FILES.libghttp+=	lib/libghttp.*
+
+BUILDLINK_TARGETS+=	libghttp-buildlink
+
+libghttp-buildlink: _BUILDLINK_USE
+
+.endif	# LIBGHTTP_BUILDLINK2_MK
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 46bc7ef163b..ac6830e2c3d 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2002/08/07 15:56:22 fredb Exp $
+# $NetBSD: Makefile,v 1.36 2002/08/25 18:40:21 jlam Exp $
 
 DISTNAME=		w3c-libwww-5.3.2
 PKGNAME=		libwww-5.3.2
@@ -13,14 +13,14 @@ COMMENT=		The W3C Reference Library
 
 BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 USE_PERL5=		build
 
-GNU_CONFIGURE=		yes
+GNU_CONFIGURE=		YES
 CONFIGURE_ARGS=		--with-zlib --with-regex --without-x
-CONFIGURE_ARGS+=	--with-ssl="${BUILDLINK_PREFIX.openssl}"
+CONFIGURE_ARGS+=	--with-ssl="${SSLBASE}"
 
 DOCDIR=			${PREFIX}/share/doc/libwww
 LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
@@ -31,6 +31,22 @@ pre-configure:
 	    ${LOCALBASE}/bin/automake && \
 	    ${LOCALBASE}/bin/autoconf
 
-.include "../../devel/zlib/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
+.include "../../mk/bsd.prefs.mk"
+
+# Include SOCKS firewall support
+.if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5)
+.if ${USE_SOCKS} == 4
+.include "../../net/socks4/buildlink.mk"
+CONFIGURE_ARGS+= 	--with-socks4=${BUILDLINK_PREFIX.socks4}/lib/libsocks4.a
+CONFIGURE_ARGS+=	--with-socks5=no
+.else
+.include "../../net/socks5/buildlink.mk"
+CONFIGURE_ARGS+=	--with-socks4=no
+CONFIGURE_ARGS+= 	--with-socks5=${BUILDLINK_prefix.socks5}/lib/libsocks5.a
+.endif
+.endif
+
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/libwww/buildlink.mk b/www/libwww/buildlink.mk
index e2e252eedba..b620fff587b 100644
--- a/www/libwww/buildlink.mk
+++ b/www/libwww/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.9 2002/07/15 14:39:21 fredb Exp $
+# $NetBSD: buildlink.mk,v 1.10 2002/08/25 18:40:21 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libwww.
 #
diff --git a/www/libwww/buildlink2.mk b/www/libwww/buildlink2.mk
new file mode 100644
index 00000000000..e77dbf5150a
--- /dev/null
+++ b/www/libwww/buildlink2.mk
@@ -0,0 +1,45 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:22 jlam Exp $
+
+.if !defined(LIBWWW_BUILDLINK2_MK)
+LIBWWW_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		libwww
+BUILDLINK_DEPENDS.libwww?=	libwww>=5.3.2nb2
+BUILDLINK_PKGSRCDIR.libwww?=	../../www/libwww
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.libwww=libwww
+BUILDLINK_PREFIX.libwww_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libwww=		include/wwwconf.h
+BUILDLINK_FILES.libwww+=	include/w3c-libwww/*
+BUILDLINK_FILES.libwww+=	lib/libmd5.*
+BUILDLINK_FILES.libwww+=	lib/libpics.*
+BUILDLINK_FILES.libwww+=	lib/libwwwapp.*
+BUILDLINK_FILES.libwww+=	lib/libwwwcache.*
+BUILDLINK_FILES.libwww+=	lib/libwwwcore.*
+BUILDLINK_FILES.libwww+=	lib/libwwwdir.*
+BUILDLINK_FILES.libwww+=	lib/libwwwfile.*
+BUILDLINK_FILES.libwww+=	lib/libwwwftp.*
+BUILDLINK_FILES.libwww+=	lib/libwwwgopher.*
+BUILDLINK_FILES.libwww+=	lib/libwwwhttp.*
+BUILDLINK_FILES.libwww+=	lib/libwwwhtml.*
+BUILDLINK_FILES.libwww+=	lib/libwwwinit.*
+BUILDLINK_FILES.libwww+=	lib/libwwwmime.*
+BUILDLINK_FILES.libwww+=	lib/libwwwmux.*
+BUILDLINK_FILES.libwww+=	lib/libwwwnews.*
+BUILDLINK_FILES.libwww+=	lib/libwwwssl.*
+BUILDLINK_FILES.libwww+=	lib/libwwwstream.*
+BUILDLINK_FILES.libwww+=	lib/libwwwtelnet.*
+BUILDLINK_FILES.libwww+=	lib/libwwwtrans.*
+BUILDLINK_FILES.libwww+=	lib/libwwwutils.*
+BUILDLINK_FILES.libwww+=	lib/libwwwxml.*
+BUILDLINK_FILES.libwww+=	lib/libwwwzip.*
+BUILDLINK_FILES.libwww+=	lib/libxmlparse.*
+BUILDLINK_FILES.libwww+=	lib/libxmltok.*
+
+.include "../../devel/zlib/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	libwww-buildlink
+
+libwww-buildlink: _BUILDLINK_USE
+
+.endif	# LIBWWW_BUILDLINK2_MK
diff --git a/www/libwww/distinfo b/www/libwww/distinfo
index 75a9e5def45..8db016f4bbb 100644
--- a/www/libwww/distinfo
+++ b/www/libwww/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/08/07 15:56:23 fredb Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 18:40:22 jlam Exp $
 
 SHA1 (w3c-libwww-5.3.2.tar.gz) = c50f3624889b3a0ebc720264a1b9b64990457516
 Size (w3c-libwww-5.3.2.tar.gz) = 1956340 bytes
diff --git a/www/libwww/patches/patch-ah b/www/libwww/patches/patch-ah
index b49fcc8a4cc..506d67faf0c 100644
--- a/www/libwww/patches/patch-ah
+++ b/www/libwww/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.5 2002/08/07 15:56:24 fredb Exp $
+$NetBSD: patch-ah,v 1.6 2002/08/25 18:40:23 jlam Exp $
 --- configure.in.orig	Thu Dec 14 11:49:06 2000
 +++ configure.in	Tue Aug 28 17:09:57 2001
 @@ -213,7 +213,12 @@
diff --git a/www/libwww/patches/patch-aj b/www/libwww/patches/patch-aj
index ba756c65bc7..ccb68746dd4 100644
--- a/www/libwww/patches/patch-aj
+++ b/www/libwww/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.2 2002/05/20 19:07:42 cjep Exp $
+$NetBSD: patch-aj,v 1.3 2002/08/25 18:40:23 jlam Exp $
 --- acinclude.m4.orig	Tue Aug 28 14:56:47 2001
 +++ acinclude.m4	Tue Aug 28 14:58:27 2001
 @@ -251,19 +251,6 @@
diff --git a/www/neon/Makefile b/www/neon/Makefile
index 310b0de6dd7..cf579b3a883 100644
--- a/www/neon/Makefile
+++ b/www/neon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/08/03 01:24:53 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 18:40:23 jlam Exp $
 
 DISTNAME=		neon-0.21.3
 CATEGORIES=		www
@@ -9,17 +9,18 @@ HOMEPAGE=		http://www.webdav.org/neon/
 COMMENT=		HTTP and WebDAV client library
 
 USE_GMAKE=		# defined
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=		# defined
 
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GNU_CONFIGURE=		# defined
-CONFIGURE_ARGS+=	--with-ssl
-CONFIGURE_ARGS+=	--enable-libxml
+CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
+CONFIGURE_ARGS+=	--with-libxml1
 CONFIGURE_ARGS+=	--enable-shared
 
-.include "../../devel/zlib/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
-.include "../../textproc/libxml/buildlink.mk"
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+.include "../../textproc/libxml/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/neon/PLIST b/www/neon/PLIST
index de6103fe233..ae1b590e508 100644
--- a/www/neon/PLIST
+++ b/www/neon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/03 01:24:53 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 18:40:24 jlam Exp $
 bin/neon-config
 include/neon/ne_207.h
 include/neon/ne_acl.h
diff --git a/www/neon/buildlink2.mk b/www/neon/buildlink2.mk
new file mode 100644
index 00000000000..02a5bea42e4
--- /dev/null
+++ b/www/neon/buildlink2.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:24 jlam Exp $
+
+.if !defined(NEON_BUILDLINK2_MK)
+NEON_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		neon
+BUILDLINK_DEPENDS.neon?=	neon>=0.19.3
+BUILDLINK_PKGSRCDIR.neon?=	../../www/neon
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.neon=neon
+BUILDLINK_PREFIX.neon_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.neon=		include/neon/*
+BUILDLINK_FILES.neon+=		lib/libneon.*
+
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+.include "../../textproc/libxml/buildlink2.mk"
+
+BUILDLINK_TARGETS+=		neon-buildlink
+
+neon-buildlink: _BUILDLINK_USE
+
+.endif	# NEON_BUILDLINK2_MK
diff --git a/www/neon/distinfo b/www/neon/distinfo
index 059e8319a57..f4d2db7a732 100644
--- a/www/neon/distinfo
+++ b/www/neon/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/08/03 01:24:53 hubertf Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 18:40:24 jlam Exp $
 
 SHA1 (neon-0.21.3.tar.gz) = 42f72fc2ebb29d9b687d5549bdd81742689f4846
 Size (neon-0.21.3.tar.gz) = 476601 bytes
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