- make this work with apache2

- buildlink2

17 files changed, 39 insertions, 37 deletions

diff --git a/databases/php4-dbase/Makefile b/databases/php4-dbase/Makefile
index 93f77c5e8e9..87700d405c5 100644
--- a/databases/php4-dbase/Makefile
+++ b/databases/php4-dbase/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2002/02/28 06:16:54 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/11/05 07:33:13 martti Exp $
 
 MODNAME=		dbase
 CATEGORIES+=		databases
 PKGREVISION=		# empty
 COMMENT=		PHP4 extension for dBase database access
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 .include "../../www/php4/Makefile.module"
 
diff --git a/databases/php4-filepro/Makefile b/databases/php4-filepro/Makefile
index b26e49683d6..0ffba5b0afe 100644
--- a/databases/php4-filepro/Makefile
+++ b/databases/php4-filepro/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2002/02/28 06:16:59 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/11/05 07:33:14 martti Exp $
 
 MODNAME=		filepro
 CATEGORIES+=		databases
 PKGREVISION=		# empty
 COMMENT=		PHP4 extension for read-only filePro database access
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 .include "../../www/php4/Makefile.module"
 
diff --git a/devel/php4-posix/Makefile b/devel/php4-posix/Makefile
index 250c55aa52d..de1a5a846fe 100644
--- a/devel/php4-posix/Makefile
+++ b/devel/php4-posix/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2002/02/28 06:17:39 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/11/05 07:33:15 martti Exp $
 
 MODNAME=		posix
 CATEGORIES+=		devel
 PKGREVISION=		# empty
 COMMENT=		PHP4 extension for POSIX-like functions
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 .include "../../www/php4/Makefile.module"
 
diff --git a/devel/php4-sysvsem/Makefile b/devel/php4-sysvsem/Makefile
index 53ceada4bfe..8bb18768a7d 100644
--- a/devel/php4-sysvsem/Makefile
+++ b/devel/php4-sysvsem/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2002/02/28 06:17:49 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/11/05 07:33:15 martti Exp $
 
 MODNAME=		sysvsem
 CATEGORIES+=		devel
 PKGREVISION=		# empty
 COMMENT=		PHP4 extension for SysV semaphore support
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2= 	YES
 
 .include "../../www/php4/Makefile.module"
 
diff --git a/devel/php4-sysvshm/Makefile b/devel/php4-sysvshm/Makefile
index 4a03dc6ae83..c08000e1ac8 100644
--- a/devel/php4-sysvshm/Makefile
+++ b/devel/php4-sysvshm/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2002/02/28 06:17:54 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/11/05 07:33:15 martti Exp $
 
 MODNAME=		sysvshm
 CATEGORIES+=		devel
 PKGREVISION=		# empty
 COMMENT=		PHP4 extension for SysV shared memory support
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 .include "../../www/php4/Makefile.module"
 
diff --git a/mail/php4-imap/Makefile b/mail/php4-imap/Makefile
index 26c59312305..ca6d771eb86 100644
--- a/mail/php4-imap/Makefile
+++ b/mail/php4-imap/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2002/11/02 00:05:03 elric Exp $
+# $NetBSD: Makefile,v 1.9 2002/11/05 07:33:16 martti Exp $
 
 MODNAME=		imap
 CATEGORIES+=		mail
 PKGREVISION=		1
 COMMENT=		PHP4 extension for IMAP (Internet Mailbox Access Protocol)
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK2=		YES
 
 .include "../../www/php4/Makefile.module"
 
diff --git a/math/php4-bcmath/Makefile b/math/php4-bcmath/Makefile
index 009cddb1e2c..ead8ecbc3c5 100644
--- a/math/php4-bcmath/Makefile
+++ b/math/php4-bcmath/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2002/02/28 06:18:08 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/11/05 07:33:16 martti Exp $
 
 MODNAME=		bcmath
 CATEGORIES+=		math
 PKGREVISION=		# empty
 COMMENT=		PHP4 extension for bc-style arbitrary precision math
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 .include "../../www/php4/Makefile.module"
 
diff --git a/misc/php4-calendar/Makefile b/misc/php4-calendar/Makefile
index becf3635e0f..e35c083698d 100644
--- a/misc/php4-calendar/Makefile
+++ b/misc/php4-calendar/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2002/02/28 06:18:13 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/11/05 07:33:16 martti Exp $
 
 MODNAME=		calendar
 CATEGORIES+=		misc
 PKGREVISION=		# empty
 COMMENT=		PHP4 extension for calendar conversion support
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2= 	YES
 
 .include "../../www/php4/Makefile.module"
 
diff --git a/misc/php4-mbstring/Makefile b/misc/php4-mbstring/Makefile
index f3d27ed7f7f..2bedd26f3a6 100644
--- a/misc/php4-mbstring/Makefile
+++ b/misc/php4-mbstring/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2002/02/28 06:18:18 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/11/05 07:33:17 martti Exp $
 
 MODNAME=		mbstring
 CATEGORIES+=		misc
 PKGREVISION=		# empty
 COMMENT=		PHP4 extension for multibyte characters support (currently, Japanese only)
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 .include "../../www/php4/Makefile.module"
 
diff --git a/net/php4-ftp/Makefile b/net/php4-ftp/Makefile
index 13700e78636..86e26d12971 100644
--- a/net/php4-ftp/Makefile
+++ b/net/php4-ftp/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2002/02/28 06:18:24 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/11/05 07:33:17 martti Exp $
 
 MODNAME=		ftp
 CATEGORIES+=		net
 PKGREVISION=		# empty
 COMMENT=		PHP4 extension for FTP access
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 .include "../../www/php4/Makefile.module"
 
diff --git a/net/php4-snmp/Makefile b/net/php4-snmp/Makefile
index f30a395296d..f41f9f28073 100644
--- a/net/php4-snmp/Makefile
+++ b/net/php4-snmp/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/25 17:09:34 jonb Exp $
+# $NetBSD: Makefile,v 1.2 2002/11/05 07:33:18 martti Exp $
 
 MODNAME=		snmp
 CATEGORIES+=		net
 PKGREVISION=		# empty
 COMMENT=		PHP4 extension for SNMP
 
-USE_BUILDLINK_ONLY=	YES
-
-BUILD_DEPENDS+= ucd-snmp:../../net/ucd-snmp
+USE_BUILDLINK2=		YES
 
 .include "../../www/php4/Makefile.module"
 
 CONFIGURE_ARGS+=	--with-${MODNAME}=${PREFIX}
 
+.include "../../net/ucd-snmp/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/php4-sockets/Makefile b/net/php4-sockets/Makefile
index f0be4c0d680..661d182472b 100644
--- a/net/php4-sockets/Makefile
+++ b/net/php4-sockets/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2002/02/28 06:18:29 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/11/05 07:33:18 martti Exp $
 
 MODNAME=		sockets
 CATEGORIES+=		net
 PKGREVISION=		# empty
 COMMENT=		PHP4 extension for sockets support
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 .include "../../www/php4/Makefile.module"
 
diff --git a/net/php4-yp/Makefile b/net/php4-yp/Makefile
index 6e68795ed22..8972b71ebed 100644
--- a/net/php4-yp/Makefile
+++ b/net/php4-yp/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2002/02/28 06:18:33 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/11/05 07:33:18 martti Exp $
 
 MODNAME=		yp
 CATEGORIES+=		net
 PKGREVISION=		# empty
 COMMENT=		PHP4 extension for YP domain support
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 .include "../../www/php4/Makefile.module"
 
diff --git a/security/php4-mcrypt/Makefile b/security/php4-mcrypt/Makefile
index 72022a05a40..0c0c186e8c7 100644
--- a/security/php4-mcrypt/Makefile
+++ b/security/php4-mcrypt/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2002/09/23 09:22:43 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/11/05 07:33:19 martti Exp $
 
 MODNAME=		mcrypt
 CATEGORIES+=		security
 PKGREVISION=		# empty
 COMMENT=		PHP4 extension for the mcrypt crypto algorithms library
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK2=		YES
 
 .include "../../www/php4/Makefile.module"
 
diff --git a/security/php4-mhash/Makefile b/security/php4-mhash/Makefile
index 202049e001d..a6fef301018 100644
--- a/security/php4-mhash/Makefile
+++ b/security/php4-mhash/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2002/10/05 12:40:46 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/11/05 07:33:19 martti Exp $
 
 MODNAME=		mhash
 CATEGORIES+=		security
 PKGREVISION=		# empty
 COMMENT=		PHP4 extension for the mhash hash algorithms library
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK2=		YES
 
 .include "../../www/php4/Makefile.module"
 
diff --git a/www/ap2-php4/Makefile b/www/ap2-php4/Makefile
index c376d0d6107..cf40d463567 100644
--- a/www/ap2-php4/Makefile
+++ b/www/ap2-php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/10/17 09:56:52 martti Exp $
+# $NetBSD: Makefile,v 1.2 2002/11/05 07:33:19 martti Exp $
 
 PKGNAME=		ap2-php-${PHP_BASE_VERS}
 PKGREVISION=		# empty
@@ -9,8 +9,6 @@ DEPENDS+=		php>=${PHP_BASE_VERS}:../../www/php4
 USE_BUILDLINK2=		YES
 APACHE_MODULE=		YES
 
-CONFIGURE_ARGS+=	--with-tsrm-pth
-
 .include "../../www/php4/Makefile.php"
 
 # Ensure we export symbols in the linked shared object.
@@ -21,5 +19,4 @@ do-install:
 		${PREFIX}/lib/httpd/mod_php4.so
 
 .include "../../www/apache2/buildlink2.mk"
-.include "../../devel/pth/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common
index a7a1c9a38cf..5e6f6bb49c3 100644
--- a/www/php4/Makefile.common
+++ b/www/php4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2002/10/14 06:21:18 martti Exp $
+# $NetBSD: Makefile.common,v 1.27 2002/11/05 07:33:20 martti Exp $
 
 DISTNAME?=		php-${PHP_DIST_VERS}
 CATEGORIES+=		www php4
@@ -30,4 +30,10 @@ PLIST_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
 
 PKG_SYSCONFVAR?=	php
 
+USE_BUILDLINK2=		YES
+
+CONFIGURE_ARGS+=	--enable-experimental-zts
+CONFIGURE_ARGS+=	--with-tsrm-pth
+
+.include "../../devel/pth/buildlink2.mk"
 .include "../../mk/bsd.prefs.mk"