now that PHP 5.x Makefile.common doesn't pollute CONFIGURE_ARGS, it safe

to include "../../lang/php/ext.mk" after extension CONFIGURE_ARGS
setting; successful build confirmed with both PHP 4.x and PHP 5.x

31 files changed, 62 insertions, 92 deletions

diff --git a/archivers/php-bz2/Makefile b/archivers/php-bz2/Makefile
index f9a816258cc..58615fe1daa 100644
--- a/archivers/php-bz2/Makefile
+++ b/archivers/php-bz2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:13 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:39 jdolecek Exp $
 
 MODNAME=		bz2
 CATEGORIES+=		archivers
@@ -7,9 +7,8 @@ COMMENT=		PHP extension for bzip2 compression
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.bzip2}
 
+.include "../../lang/php/ext.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/php-zlib/Makefile b/archivers/php-zlib/Makefile
index a005a2cd7e2..cb5575f5376 100644
--- a/archivers/php-zlib/Makefile
+++ b/archivers/php-zlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:13 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:39 jdolecek Exp $
 
 MODNAME=		zlib
 CATEGORIES+=		archivers
@@ -7,12 +7,11 @@ COMMENT=		PHP extension for zlib compression
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--with-${MODNAME}-dir=${BUILDLINK_DIR}
 
 post-extract:
 	cd ${WRKSRC}; ${RM} -f config.m4; ${LN} -sf config0.m4 config.m4
 
+.include "../../lang/php/ext.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/php-iconv/Makefile b/converters/php-iconv/Makefile
index 3efd96c278f..ffafeb9abc6 100644
--- a/converters/php-iconv/Makefile
+++ b/converters/php-iconv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:13 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:39 jdolecek Exp $
 
 MODNAME=		iconv
 CATEGORIES+=		converters
@@ -14,7 +14,6 @@ USE_BUILDLINK3=		YES
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/buildlink3/bsd.builtin.mk"
-.include "../../lang/php/ext.mk"
 
 .if !empty(USE_BUILTIN.iconv:M[nN][oO])
 # use libiconv
@@ -24,4 +23,5 @@ CONFIGURE_ARGS+=	--with-iconv=shared,${BUILDLINK_PREFIX.iconv}
 CONFIGURE_ARGS+=	--with-iconv
 .endif
 
+.include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/php-dba/Makefile b/databases/php-dba/Makefile
index ed25f7a0be7..b0ef463ce74 100644
--- a/databases/php-dba/Makefile
+++ b/databases/php-dba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:13 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:39 jdolecek Exp $
 
 MODNAME=		dba
 CATEGORIES+=		databases
@@ -7,8 +7,6 @@ COMMENT=		PHP extension for DBM database access
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--enable-${MODNAME}=shared
 
 CONFIGURE_ARGS+=	--without-cdb
@@ -25,4 +23,5 @@ CONFIGURE_ARGS+=	--without-ndbm
 .include "../../databases/gdbm/buildlink3.mk"
 .endif
 
+.include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/php-dbase/Makefile b/databases/php-dbase/Makefile
index ca2d7886087..78d8ddb3b9d 100644
--- a/databases/php-dbase/Makefile
+++ b/databases/php-dbase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:13 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:39 jdolecek Exp $
 
 MODNAME=		dbase
 CATEGORIES+=		databases
@@ -7,8 +7,7 @@ COMMENT=		PHP extension for dBase database access
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared
 
+.include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/php-filepro/Makefile b/databases/php-filepro/Makefile
index 03b8c0f4200..a8272817657 100644
--- a/databases/php-filepro/Makefile
+++ b/databases/php-filepro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:13 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:39 jdolecek Exp $
 
 MODNAME=		filepro
 CATEGORIES+=		databases
@@ -7,8 +7,7 @@ COMMENT=		PHP extension for read-only filePro database access
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared
 
+.include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/php-ldap/Makefile b/databases/php-ldap/Makefile
index 5b995c1d0bc..bf6972051cd 100644
--- a/databases/php-ldap/Makefile
+++ b/databases/php-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:39 jdolecek Exp $
 
 MODNAME=		ldap
 PKGREVISION=		# empty
@@ -7,9 +7,8 @@ COMMENT=		PHP extension for LDAP database access
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.openldap}
 
+.include "../../lang/php/ext.mk"
 .include "../../databases/openldap/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/php-mssql/Makefile b/databases/php-mssql/Makefile
index 14ff0083984..759d21f73be 100644
--- a/databases/php-mssql/Makefile
+++ b/databases/php-mssql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:39 jdolecek Exp $
 
 MODNAME=		mssql
 CATEGORIES+=		databases
@@ -6,9 +6,8 @@ COMMENT=		PHP extension for MS SQL databases
 
 USE_BUILDLINK3=		yes
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_DIR}/freetds
 
+.include "../../lang/php/ext.mk"
 .include "../../databases/freetds/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/php-mysql/Makefile b/databases/php-mysql/Makefile
index 33819c91152..875d72289d9 100644
--- a/databases/php-mysql/Makefile
+++ b/databases/php-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:39 jdolecek Exp $
 
 MODNAME=		mysql
 CATEGORIES+=		databases
@@ -10,11 +10,10 @@ MAINTAINER=		tech-pkg@NetBSD.org
 USE_BUILDLINK3=		yes
 USE_PHP_EXT_PATCHES=	yes
 
-.include "../../lang/php/ext.mk"
-
 EVAL_PREFIX+=		MYSQLDIR=mysql-client
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${MYSQLDIR}
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/mysql
 
+.include "../../lang/php/ext.mk"
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/php-odbc/Makefile b/databases/php-odbc/Makefile
index f9655f08e3b..8c66ceb6595 100644
--- a/databases/php-odbc/Makefile
+++ b/databases/php-odbc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:39 jdolecek Exp $
 
 MODNAME=		odbc
 CATEGORIES+=		databases
@@ -7,9 +7,8 @@ COMMENT=		PHP extension for ODBC access
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--with-unixODBC=shared,${BUILDLINK_PREFIX.unixodbc}
 
+.include "../../lang/php/ext.mk"
 .include "../../databases/unixodbc/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/php-pgsql/Makefile b/databases/php-pgsql/Makefile
index cd2c442b762..b6f56038ae7 100644
--- a/databases/php-pgsql/Makefile
+++ b/databases/php-pgsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:39 jdolecek Exp $
 
 MODNAME=		pgsql
 PKGREVISION=		# empty
@@ -7,9 +7,8 @@ COMMENT=		PHP extension for PostgreSQL databases
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${PGSQL_PREFIX}
 
+.include "../../lang/php/ext.mk"
 .include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/php-gettext/Makefile b/devel/php-gettext/Makefile
index 8ec993b8c21..75107066995 100644
--- a/devel/php-gettext/Makefile
+++ b/devel/php-gettext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:39 jdolecek Exp $
 
 MODNAME=		gettext
 CATEGORIES+=		devel
@@ -7,9 +7,8 @@ COMMENT=		PHP extension for gettext support
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.gettext}
 
+.include "../../lang/php/ext.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/php-gmp/Makefile b/devel/php-gmp/Makefile
index 05cc445ee48..e63b7f5340c 100644
--- a/devel/php-gmp/Makefile
+++ b/devel/php-gmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:39 jdolecek Exp $
 
 MODNAME=		gmp
 CATEGORIES+=		devel math
@@ -7,9 +7,8 @@ COMMENT=		PHP extension for arbitrary precision math
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.gmp}
 
+.include "../../lang/php/ext.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/php-posix/Makefile b/devel/php-posix/Makefile
index 9cfb6888e86..17bfc8b39bf 100644
--- a/devel/php-posix/Makefile
+++ b/devel/php-posix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:39 jdolecek Exp $
 
 MODNAME=		posix
 CATEGORIES+=		devel
@@ -7,8 +7,7 @@ COMMENT=		PHP extension for POSIX-like functions
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--enable-${MODNAME}=shared
 
+.include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/php-shmop/Makefile b/devel/php-shmop/Makefile
index 7958b2ee109..62153f2e236 100644
--- a/devel/php-shmop/Makefile
+++ b/devel/php-shmop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:39 jdolecek Exp $
 
 MODNAME=		shmop
 CATEGORIES+=		devel
@@ -7,8 +7,7 @@ COMMENT=		PHP extension for simple SysV shared memory operations
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--enable-${MODNAME}=shared,${BUILDLINK_DIR}
 
+.include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/php-sysvsem/Makefile b/devel/php-sysvsem/Makefile
index f896dbf1fd8..4ec9b388f72 100644
--- a/devel/php-sysvsem/Makefile
+++ b/devel/php-sysvsem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
 
 MODNAME=		sysvsem
 CATEGORIES+=		devel
@@ -7,8 +7,7 @@ COMMENT=		PHP extension for SysV semaphore support
 
 USE_BUILDLINK3= 	YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--enable-${MODNAME}=shared,${BUILDLINK_DIR}
 
+.include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/php-sysvshm/Makefile b/devel/php-sysvshm/Makefile
index 8f88d6df284..19e72177c00 100644
--- a/devel/php-sysvshm/Makefile
+++ b/devel/php-sysvshm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
 
 MODNAME=		sysvshm
 CATEGORIES+=		devel
@@ -7,8 +7,7 @@ COMMENT=		PHP extension for SysV shared memory support
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--enable-${MODNAME}=shared,${BUILDLINK_DIR}
 
+.include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/php-exif/Makefile b/graphics/php-exif/Makefile
index 623f1ae071d..1b124bee70b 100644
--- a/graphics/php-exif/Makefile
+++ b/graphics/php-exif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
 
 MODNAME=		exif
 CATEGORIES+=		graphics
@@ -7,8 +7,7 @@ COMMENT=		PHP extension to extract information from EXIF headers
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared
 
+.include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/php-gd/Makefile b/graphics/php-gd/Makefile
index 3c0e40b5786..e1888d321cf 100644
--- a/graphics/php-gd/Makefile
+++ b/graphics/php-gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
 
 MODNAME=		gd
 CATEGORIES+=		graphics
@@ -8,8 +8,6 @@ COMMENT=		PHP extension for GD graphics library
 USE_BUILDLINK3=		YES
 USE_X11=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--with-${MODNAME}	# use bundled libgd
 CONFIGURE_ARGS+=	--with-jpeg-dir=${BUILDLINK_DIR}
 CONFIGURE_ARGS+=	--with-png-dir=${BUILDLINK_DIR}
@@ -26,4 +24,5 @@ CONFIGURE_ARGS+=	--without-t1lib
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
+.include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/php-imap/Makefile b/mail/php-imap/Makefile
index fc30367c70c..a109aba0300 100644
--- a/mail/php-imap/Makefile
+++ b/mail/php-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
 
 MODNAME=		imap
 PKGREVISION=		# empty
@@ -8,8 +8,6 @@ COMMENT=		PHP extension for IMAP (Internet Mailbox Access Protocol)
 USE_BUILDLINK3=		YES
 USE_PHP_EXT_PATCHES=	yes
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.imap-uw}
 CONFIGURE_ARGS+=	--with-${MODNAME}-ssl=${SSLBASE}
 CONFIGURE_ARGS+=	--with-${MODNAME}-linkage
@@ -19,4 +17,5 @@ LIBS+=			-lssl -lcrypto
 
 .include "../../mail/imap-uw/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/php-calendar/Makefile b/misc/php-calendar/Makefile
index e255dfbdbee..90e0111d71c 100644
--- a/misc/php-calendar/Makefile
+++ b/misc/php-calendar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
 
 MODNAME=		calendar
 CATEGORIES+=		misc
@@ -7,8 +7,7 @@ COMMENT=		PHP extension for calendar conversion support
 
 USE_BUILDLINK3= 	YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--enable-${MODNAME}
 
+.include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/php-mbstring/Makefile b/misc/php-mbstring/Makefile
index 8de5d8b80d0..7ff738a3542 100644
--- a/misc/php-mbstring/Makefile
+++ b/misc/php-mbstring/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
 
 MODNAME=		mbstring
 CATEGORIES+=		misc
@@ -7,8 +7,7 @@ COMMENT=		PHP extension for multibyte characters support (currently, Japanese on
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--enable-${MODNAME}=shared,${BUILDLINK_DIR}
 
+.include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/php-ftp/Makefile b/net/php-ftp/Makefile
index 75f23809284..734d63006e3 100644
--- a/net/php-ftp/Makefile
+++ b/net/php-ftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
 
 MODNAME=		ftp
 PKGREVISION=		# empty
@@ -7,13 +7,12 @@ COMMENT=		PHP extension for FTP access
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--enable-${MODNAME}
 
 # adjust so that the pkg gets built with SSL support
 LIBS+=			-lssl -lcrypto
 CFLAGS+=		-DHAVE_OPENSSL_EXT
 
+.include "../../lang/php/ext.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/php-snmp/Makefile b/net/php-snmp/Makefile
index c9b86a6e60a..7dbdbf131f9 100644
--- a/net/php-snmp/Makefile
+++ b/net/php-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
 
 MODNAME=		snmp
 CATEGORIES+=		net
@@ -7,9 +7,8 @@ COMMENT=		PHP extension for SNMP
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--with-${MODNAME}=${PREFIX}
 
+.include "../../lang/php/ext.mk"
 .include "../../net/net-snmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/php-sockets/Makefile b/net/php-sockets/Makefile
index 80e78853612..ce40a0108a1 100644
--- a/net/php-sockets/Makefile
+++ b/net/php-sockets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
 
 MODNAME=		sockets
 CATEGORIES+=		net
@@ -7,8 +7,7 @@ COMMENT=		PHP extension for sockets support
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--enable-${MODNAME}=shared,${BUILDLINK_DIR}
 
+.include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/php-yp/Makefile b/net/php-yp/Makefile
index f740b09f30c..ee34cc42531 100644
--- a/net/php-yp/Makefile
+++ b/net/php-yp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
 
 MODNAME=		yp
 CATEGORIES+=		net
@@ -7,8 +7,7 @@ COMMENT=		PHP extension for YP domain support
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--enable-${MODNAME}=shared,${BUILDLINK_DIR}
 
+.include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/php-mcrypt/Makefile b/security/php-mcrypt/Makefile
index db32463f774..0be95a8466e 100644
--- a/security/php-mcrypt/Makefile
+++ b/security/php-mcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
 
 MODNAME=		mcrypt
 CATEGORIES+=		security
@@ -7,9 +7,8 @@ COMMENT=		PHP extension for the mcrypt crypto algorithms library
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.libmcrypt}
 
+.include "../../lang/php/ext.mk"
 .include "../../security/libmcrypt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/php-mhash/Makefile b/security/php-mhash/Makefile
index dc9ee67baa7..09cb3fa4473 100644
--- a/security/php-mhash/Makefile
+++ b/security/php-mhash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
 
 MODNAME=		mhash
 CATEGORIES+=		security
@@ -7,9 +7,8 @@ COMMENT=		PHP extension for the mhash hash algorithms library
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.mhash}
 
+.include "../../lang/php/ext.mk"
 .include "../../security/mhash/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/php-openssl/Makefile b/security/php-openssl/Makefile
index da204435814..d5349d20de0 100644
--- a/security/php-openssl/Makefile
+++ b/security/php-openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
 
 MODNAME=		openssl
 CATEGORIES+=		security
@@ -7,8 +7,6 @@ COMMENT=		PHP extension for the OpenSSL library
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.openssl}
 
 # the config test for -lssl fails to link in -lcrypto; just force it
@@ -18,5 +16,6 @@ CONFIGURE_ENV+=		ac_cv_lib_ssl_SSL_CTX_set_ssl_version=yes
 post-extract:
 	cd ${WRKSRC} && ln -s config0.m4 config.m4
 
+.include "../../lang/php/ext.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/php-wddx/Makefile b/textproc/php-wddx/Makefile
index def64b5129f..bd7bdd7f681 100644
--- a/textproc/php-wddx/Makefile
+++ b/textproc/php-wddx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
 
 MODNAME=		wddx
 CATEGORIES+=		textproc
@@ -7,9 +7,8 @@ COMMENT=		PHP extension for WDDX support
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--enable-${MODNAME}=shared,${BUILDLINK_PREFIX.expat}
 
+.include "../../lang/php/ext.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/php-curl/Makefile b/www/php-curl/Makefile
index 069ccc594fd..6a413d384cb 100644
--- a/www/php-curl/Makefile
+++ b/www/php-curl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
 
 MODNAME=		curl
 PKGREVISION=		# empty
@@ -7,9 +7,8 @@ COMMENT=		PHP extension for curl functions
 
 USE_BUILDLINK3=		YES
 
-.include "../../lang/php/ext.mk"
-
 CONFIGURE_ARGS+=	--with-curl=shared,${BUILDLINK_PREFIX.curl}
 
+.include "../../lang/php/ext.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"