summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjdolecek <jdolecek@pkgsrc.org>2004-10-31 21:07:13 +0000
committerjdolecek <jdolecek@pkgsrc.org>2004-10-31 21:07:13 +0000
commit36d25eff74a45b672d957cd601b1005b257eab75 (patch)
tree43db2985256b44525aca65ddff538530e5c2c223
parent6a7f2fa6c72867cf5a751db0c33a7fbc77b0eaa1 (diff)
downloadpkgsrc-36d25eff74a45b672d957cd601b1005b257eab75.tar.gz
extension modules must be able to override CONFIGURE_ARGS, so include
lang/php/ext.mk before setting CONFIGURE_ARGS
-rw-r--r--archivers/php-bz2/Makefile5
-rw-r--r--archivers/php-zlib/Makefile5
-rw-r--r--converters/php-iconv/Makefile4
-rw-r--r--databases/php-dba/Makefile5
-rw-r--r--databases/php-dbase/Makefile5
-rw-r--r--databases/php-filepro/Makefile5
-rw-r--r--databases/php-ldap/Makefile5
-rw-r--r--databases/php-mssql/Makefile5
-rw-r--r--databases/php-mysql/Makefile5
-rw-r--r--databases/php-odbc/Makefile5
-rw-r--r--databases/php-pgsql/Makefile5
-rw-r--r--devel/php-gettext/Makefile5
-rw-r--r--devel/php-gmp/Makefile5
-rw-r--r--devel/php-posix/Makefile5
-rw-r--r--devel/php-shmop/Makefile5
-rw-r--r--devel/php-sysvsem/Makefile5
-rw-r--r--devel/php-sysvshm/Makefile5
-rw-r--r--graphics/php-exif/Makefile5
-rw-r--r--graphics/php-gd/Makefile5
-rw-r--r--mail/php-imap/Makefile5
-rw-r--r--misc/php-calendar/Makefile5
-rw-r--r--misc/php-mbstring/Makefile5
-rw-r--r--net/php-ftp/Makefile5
-rw-r--r--net/php-snmp/Makefile5
-rw-r--r--net/php-sockets/Makefile5
-rw-r--r--net/php-yp/Makefile5
-rw-r--r--security/php-mcrypt/Makefile5
-rw-r--r--security/php-mhash/Makefile5
-rw-r--r--security/php-openssl/Makefile5
-rw-r--r--textproc/php-wddx/Makefile5
-rw-r--r--www/php-curl/Makefile5
31 files changed, 92 insertions, 62 deletions
diff --git a/archivers/php-bz2/Makefile b/archivers/php-bz2/Makefile
index 11729a4bf33..f9a816258cc 100644
--- a/archivers/php-bz2/Makefile
+++ b/archivers/php-bz2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:13 jdolecek Exp $
MODNAME= bz2
CATEGORIES+= archivers
@@ -7,8 +7,9 @@ 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 ce676651b4e..a005a2cd7e2 100644
--- a/archivers/php-zlib/Makefile
+++ b/archivers/php-zlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:29 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:13 jdolecek Exp $
MODNAME= zlib
CATEGORIES+= archivers
@@ -7,11 +7,12 @@ 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 1a0e673143a..3efd96c278f 100644
--- a/converters/php-iconv/Makefile
+++ b/converters/php-iconv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:13 jdolecek Exp $
MODNAME= iconv
CATEGORIES+= converters
@@ -14,6 +14,7 @@ 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
@@ -23,5 +24,4 @@ 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 1d33270182a..ed25f7a0be7 100644
--- a/databases/php-dba/Makefile
+++ b/databases/php-dba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:13 jdolecek Exp $
MODNAME= dba
CATEGORIES+= databases
@@ -7,6 +7,8 @@ COMMENT= PHP extension for DBM database access
USE_BUILDLINK3= YES
+.include "../../lang/php/ext.mk"
+
CONFIGURE_ARGS+= --enable-${MODNAME}=shared
CONFIGURE_ARGS+= --without-cdb
@@ -23,5 +25,4 @@ 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 ea97c49d2ea..ca2d7886087 100644
--- a/databases/php-dbase/Makefile
+++ b/databases/php-dbase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:13 jdolecek Exp $
MODNAME= dbase
CATEGORIES+= databases
@@ -7,7 +7,8 @@ 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 ff1a53ad099..03b8c0f4200 100644
--- a/databases/php-filepro/Makefile
+++ b/databases/php-filepro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:13 jdolecek Exp $
MODNAME= filepro
CATEGORIES+= databases
@@ -7,7 +7,8 @@ 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 346b9351fb2..5b995c1d0bc 100644
--- a/databases/php-ldap/Makefile
+++ b/databases/php-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= ldap
PKGREVISION= # empty
@@ -7,8 +7,9 @@ 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 87ce66e2389..14ff0083984 100644
--- a/databases/php-mssql/Makefile
+++ b/databases/php-mssql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= mssql
CATEGORIES+= databases
@@ -6,8 +6,9 @@ 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 cc4f1812717..33819c91152 100644
--- a/databases/php-mysql/Makefile
+++ b/databases/php-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= mysql
CATEGORIES+= databases
@@ -10,10 +10,11 @@ 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 23eff4eaaad..f9655f08e3b 100644
--- a/databases/php-odbc/Makefile
+++ b/databases/php-odbc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= odbc
CATEGORIES+= databases
@@ -7,8 +7,9 @@ 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 24882ec9958..cd2c442b762 100644
--- a/databases/php-pgsql/Makefile
+++ b/databases/php-pgsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= pgsql
PKGREVISION= # empty
@@ -7,8 +7,9 @@ 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 91098510cac..8ec993b8c21 100644
--- a/devel/php-gettext/Makefile
+++ b/devel/php-gettext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= gettext
CATEGORIES+= devel
@@ -7,8 +7,9 @@ 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 ce8c3aff496..05cc445ee48 100644
--- a/devel/php-gmp/Makefile
+++ b/devel/php-gmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= gmp
CATEGORIES+= devel math
@@ -7,8 +7,9 @@ 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 b36030fd953..9cfb6888e86 100644
--- a/devel/php-posix/Makefile
+++ b/devel/php-posix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= posix
CATEGORIES+= devel
@@ -7,7 +7,8 @@ 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 487675040bd..7958b2ee109 100644
--- a/devel/php-shmop/Makefile
+++ b/devel/php-shmop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= shmop
CATEGORIES+= devel
@@ -7,7 +7,8 @@ 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 65ce16232e8..f896dbf1fd8 100644
--- a/devel/php-sysvsem/Makefile
+++ b/devel/php-sysvsem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= sysvsem
CATEGORIES+= devel
@@ -7,7 +7,8 @@ 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 980e6950af5..8f88d6df284 100644
--- a/devel/php-sysvshm/Makefile
+++ b/devel/php-sysvshm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= sysvshm
CATEGORIES+= devel
@@ -7,7 +7,8 @@ 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 e16ab406745..623f1ae071d 100644
--- a/graphics/php-exif/Makefile
+++ b/graphics/php-exif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= exif
CATEGORIES+= graphics
@@ -7,7 +7,8 @@ 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 18d17e993f0..3c0e40b5786 100644
--- a/graphics/php-gd/Makefile
+++ b/graphics/php-gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= gd
CATEGORIES+= graphics
@@ -8,6 +8,8 @@ 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}
@@ -19,7 +21,6 @@ CONFIGURE_ARGS+= --enable-${MODNAME}-native-ttf
CONFIGURE_ARGS+= --enable-${MODNAME}-jis-conv
CONFIGURE_ARGS+= --without-t1lib
-.include "../../lang/php/ext.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
diff --git a/mail/php-imap/Makefile b/mail/php-imap/Makefile
index a535552fd96..fc30367c70c 100644
--- a/mail/php-imap/Makefile
+++ b/mail/php-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= imap
PKGREVISION= # empty
@@ -8,6 +8,8 @@ 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
@@ -15,7 +17,6 @@ CONFIGURE_ENV+= ac_cv_lib_pam_pam_start=no
LIBS+= -lssl -lcrypto
-.include "../../lang/php/ext.mk"
.include "../../mail/imap-uw/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/php-calendar/Makefile b/misc/php-calendar/Makefile
index bc34e5a2d8f..e255dfbdbee 100644
--- a/misc/php-calendar/Makefile
+++ b/misc/php-calendar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= calendar
CATEGORIES+= misc
@@ -7,7 +7,8 @@ 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 4abe494a8f6..8de5d8b80d0 100644
--- a/misc/php-mbstring/Makefile
+++ b/misc/php-mbstring/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= mbstring
CATEGORIES+= misc
@@ -7,7 +7,8 @@ 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 5d59dcc4956..75f23809284 100644
--- a/net/php-ftp/Makefile
+++ b/net/php-ftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= ftp
PKGREVISION= # empty
@@ -7,12 +7,13 @@ 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 8e2d7ba004e..c9b86a6e60a 100644
--- a/net/php-snmp/Makefile
+++ b/net/php-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= snmp
CATEGORIES+= net
@@ -7,8 +7,9 @@ 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 3d3119a78bf..80e78853612 100644
--- a/net/php-sockets/Makefile
+++ b/net/php-sockets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= sockets
CATEGORIES+= net
@@ -7,7 +7,8 @@ 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 c731e3d1e74..f740b09f30c 100644
--- a/net/php-yp/Makefile
+++ b/net/php-yp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= yp
CATEGORIES+= net
@@ -7,7 +7,8 @@ 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 9f59adf4409..db32463f774 100644
--- a/security/php-mcrypt/Makefile
+++ b/security/php-mcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= mcrypt
CATEGORIES+= security
@@ -7,8 +7,9 @@ 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 0a276e79144..dc9ee67baa7 100644
--- a/security/php-mhash/Makefile
+++ b/security/php-mhash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= mhash
CATEGORIES+= security
@@ -7,8 +7,9 @@ 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 309fe65aab6..da204435814 100644
--- a/security/php-openssl/Makefile
+++ b/security/php-openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= openssl
CATEGORIES+= security
@@ -7,6 +7,8 @@ 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
@@ -16,6 +18,5 @@ 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 3ea194cc5ce..def64b5129f 100644
--- a/textproc/php-wddx/Makefile
+++ b/textproc/php-wddx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= wddx
CATEGORIES+= textproc
@@ -7,8 +7,9 @@ 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 680b2119d4b..069ccc594fd 100644
--- a/www/php-curl/Makefile
+++ b/www/php-curl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/31 19:30:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:14 jdolecek Exp $
MODNAME= curl
PKGREVISION= # empty
@@ -7,8 +7,9 @@ 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"