Subject: Re: Apache 2 and PHP4 modules
To: None <tech-pkg@netbsd.org>
From: Martti Kuparinen <martti.kuparinen@iki.fi>
List: tech-pkg
Date: 11/04/2002 10:07:58
On Sun, 3 Nov 2002, Martti Kuparinen wrote:
> I tried this (--enable-experimental-zts) on 1.3.27 and 2.0.43 and they
> both worked. Does anybody know what side effects --enable-experimental-zts
Here's a new patch to try. Please let me know if this is ok to commit...
Martti
Index: databases/php4-dbase/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/php4-dbase/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- databases/php4-dbase/Makefile 2002/02/28 06:16:54 1.4
+++ databases/php4-dbase/Makefile 2002/11/04 08:05:01
@@ -5,7 +5,7 @@
PKGREVISION= # empty
COMMENT= PHP4 extension for dBase database access
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
.include "../../www/php4/Makefile.module"
Index: databases/php4-filepro/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/php4-filepro/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- databases/php4-filepro/Makefile 2002/02/28 06:16:59 1.4
+++ databases/php4-filepro/Makefile 2002/11/04 08:05:01
@@ -5,7 +5,7 @@
PKGREVISION= # empty
COMMENT= PHP4 extension for read-only filePro database access
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
.include "../../www/php4/Makefile.module"
Index: devel/php4-posix/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/php4-posix/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- devel/php4-posix/Makefile 2002/02/28 06:17:39 1.4
+++ devel/php4-posix/Makefile 2002/11/04 08:05:01
@@ -5,7 +5,7 @@
PKGREVISION= # empty
COMMENT= PHP4 extension for POSIX-like functions
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
.include "../../www/php4/Makefile.module"
Index: devel/php4-sysvsem/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/php4-sysvsem/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- devel/php4-sysvsem/Makefile 2002/02/28 06:17:49 1.5
+++ devel/php4-sysvsem/Makefile 2002/11/04 08:05:01
@@ -5,7 +5,7 @@
PKGREVISION= # empty
COMMENT= PHP4 extension for SysV semaphore support
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
.include "../../www/php4/Makefile.module"
Index: devel/php4-sysvshm/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/php4-sysvshm/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- devel/php4-sysvshm/Makefile 2002/02/28 06:17:54 1.4
+++ devel/php4-sysvshm/Makefile 2002/11/04 08:05:01
@@ -5,7 +5,7 @@
PKGREVISION= # empty
COMMENT= PHP4 extension for SysV shared memory support
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
.include "../../www/php4/Makefile.module"
Index: mail/php4-imap/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/php4-imap/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- mail/php4-imap/Makefile 2002/11/02 00:05:03 1.8
+++ mail/php4-imap/Makefile 2002/11/04 08:05:02
@@ -5,7 +5,7 @@
PKGREVISION= 1
COMMENT= PHP4 extension for IMAP (Internet Mailbox Access Protocol)
-USE_BUILDLINK2= # defined
+USE_BUILDLINK2= YES
.include "../../www/php4/Makefile.module"
Index: math/php4-bcmath/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/math/php4-bcmath/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- math/php4-bcmath/Makefile 2002/02/28 06:18:08 1.3
+++ math/php4-bcmath/Makefile 2002/11/04 08:05:02
@@ -5,7 +5,7 @@
PKGREVISION= # empty
COMMENT= PHP4 extension for bc-style arbitrary precision math
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
.include "../../www/php4/Makefile.module"
Index: misc/php4-calendar/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/misc/php4-calendar/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- misc/php4-calendar/Makefile 2002/02/28 06:18:13 1.3
+++ misc/php4-calendar/Makefile 2002/11/04 08:05:02
@@ -5,7 +5,7 @@
PKGREVISION= # empty
COMMENT= PHP4 extension for calendar conversion support
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
.include "../../www/php4/Makefile.module"
Index: misc/php4-mbstring/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/misc/php4-mbstring/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- misc/php4-mbstring/Makefile 2002/02/28 06:18:18 1.3
+++ misc/php4-mbstring/Makefile 2002/11/04 08:05:02
@@ -5,7 +5,7 @@
PKGREVISION= # empty
COMMENT= PHP4 extension for multibyte characters support (currently, Japanese only)
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
.include "../../www/php4/Makefile.module"
Index: net/php4-ftp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/php4-ftp/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- net/php4-ftp/Makefile 2002/02/28 06:18:24 1.3
+++ net/php4-ftp/Makefile 2002/11/04 08:05:02
@@ -5,7 +5,7 @@
PKGREVISION= # empty
COMMENT= PHP4 extension for FTP access
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
.include "../../www/php4/Makefile.module"
Index: net/php4-snmp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/php4-snmp/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- net/php4-snmp/Makefile 2002/07/25 17:09:34 1.1.1.1
+++ net/php4-snmp/Makefile 2002/11/04 08:05:04
@@ -5,12 +5,11 @@
PKGREVISION= # empty
COMMENT= PHP4 extension for SNMP
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
-BUILD_DEPENDS+= ucd-snmp:../../net/ucd-snmp
-
.include "../../www/php4/Makefile.module"
CONFIGURE_ARGS+= --with-${MODNAME}=${PREFIX}
+.include "../../net/ucd-snmp/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
Index: net/php4-sockets/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/php4-sockets/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- net/php4-sockets/Makefile 2002/02/28 06:18:29 1.3
+++ net/php4-sockets/Makefile 2002/11/04 08:05:04
@@ -5,7 +5,7 @@
PKGREVISION= # empty
COMMENT= PHP4 extension for sockets support
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
.include "../../www/php4/Makefile.module"
Index: net/php4-yp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/php4-yp/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- net/php4-yp/Makefile 2002/02/28 06:18:33 1.3
+++ net/php4-yp/Makefile 2002/11/04 08:05:04
@@ -5,7 +5,7 @@
PKGREVISION= # empty
COMMENT= PHP4 extension for YP domain support
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
.include "../../www/php4/Makefile.module"
Index: security/php4-mcrypt/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/php4-mcrypt/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- security/php4-mcrypt/Makefile 2002/09/23 09:22:43 1.7
+++ security/php4-mcrypt/Makefile 2002/11/04 08:05:04
@@ -5,7 +5,7 @@
PKGREVISION= # empty
COMMENT= PHP4 extension for the mcrypt crypto algorithms library
-USE_BUILDLINK2= yes
+USE_BUILDLINK2= YES
.include "../../www/php4/Makefile.module"
Index: security/php4-mhash/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/php4-mhash/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- security/php4-mhash/Makefile 2002/10/05 12:40:46 1.2
+++ security/php4-mhash/Makefile 2002/11/04 08:05:04
@@ -5,7 +5,7 @@
PKGREVISION= # empty
COMMENT= PHP4 extension for the mhash hash algorithms library
-USE_BUILDLINK2= yes
+USE_BUILDLINK2= YES
.include "../../www/php4/Makefile.module"
Index: www/ap2-php4/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/ap2-php4/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- www/ap2-php4/Makefile 2002/10/17 09:56:52 1.1.1.1
+++ www/ap2-php4/Makefile 2002/11/04 08:05:04
@@ -9,8 +9,6 @@
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 @@
${PREFIX}/lib/httpd/mod_php4.so
.include "../../www/apache2/buildlink2.mk"
-.include "../../devel/pth/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
Index: www/php4/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/www/php4/Makefile.common,v
retrieving revision 1.26
diff -u -r1.26 Makefile.common
--- www/php4/Makefile.common 2002/10/14 06:21:18 1.26
+++ www/php4/Makefile.common 2002/11/04 08:05:04
@@ -30,4 +30,10 @@
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"