pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc now that PHP 5.x Makefile.common doesn't pollute CONFI...
details: https://anonhg.NetBSD.org/pkgsrc/rev/b2f420cb7440
branches: trunk
changeset: 482955:b2f420cb7440
user: jdolecek <jdolecek%pkgsrc.org@localhost>
date: Fri Nov 05 17:11:39 2004 +0000
description:
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
diffstat:
archivers/php-bz2/Makefile | 5 ++---
archivers/php-zlib/Makefile | 5 ++---
converters/php-iconv/Makefile | 4 ++--
databases/php-dba/Makefile | 5 ++---
databases/php-dbase/Makefile | 5 ++---
databases/php-filepro/Makefile | 5 ++---
databases/php-ldap/Makefile | 5 ++---
databases/php-mssql/Makefile | 5 ++---
databases/php-mysql/Makefile | 5 ++---
databases/php-odbc/Makefile | 5 ++---
databases/php-pgsql/Makefile | 5 ++---
devel/php-gettext/Makefile | 5 ++---
devel/php-gmp/Makefile | 5 ++---
devel/php-posix/Makefile | 5 ++---
devel/php-shmop/Makefile | 5 ++---
devel/php-sysvsem/Makefile | 5 ++---
devel/php-sysvshm/Makefile | 5 ++---
graphics/php-exif/Makefile | 5 ++---
graphics/php-gd/Makefile | 5 ++---
mail/php-imap/Makefile | 5 ++---
misc/php-calendar/Makefile | 5 ++---
misc/php-mbstring/Makefile | 5 ++---
net/php-ftp/Makefile | 5 ++---
net/php-snmp/Makefile | 5 ++---
net/php-sockets/Makefile | 5 ++---
net/php-yp/Makefile | 5 ++---
security/php-mcrypt/Makefile | 5 ++---
security/php-mhash/Makefile | 5 ++---
security/php-openssl/Makefile | 5 ++---
textproc/php-wddx/Makefile | 5 ++---
www/php-curl/Makefile | 5 ++---
31 files changed, 62 insertions(+), 92 deletions(-)
diffs (truncated from 638 to 300 lines):
diff -r 5efdbde8adfd -r b2f420cb7440 archivers/php-bz2/Makefile
--- a/archivers/php-bz2/Makefile Fri Nov 05 17:01:35 2004 +0000
+++ b/archivers/php-bz2/Makefile Fri Nov 05 17:11:39 2004 +0000
@@ -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 @@
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 -r 5efdbde8adfd -r b2f420cb7440 archivers/php-zlib/Makefile
--- a/archivers/php-zlib/Makefile Fri Nov 05 17:01:35 2004 +0000
+++ b/archivers/php-zlib/Makefile Fri Nov 05 17:11:39 2004 +0000
@@ -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 @@
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 -r 5efdbde8adfd -r b2f420cb7440 converters/php-iconv/Makefile
--- a/converters/php-iconv/Makefile Fri Nov 05 17:01:35 2004 +0000
+++ b/converters/php-iconv/Makefile Fri Nov 05 17:11:39 2004 +0000
@@ -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 @@
.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
.endif
+.include "../../lang/php/ext.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 5efdbde8adfd -r b2f420cb7440 databases/php-dba/Makefile
--- a/databases/php-dba/Makefile Fri Nov 05 17:01:35 2004 +0000
+++ b/databases/php-dba/Makefile Fri Nov 05 17:11:39 2004 +0000
@@ -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 @@
USE_BUILDLINK3= YES
-.include "../../lang/php/ext.mk"
-
CONFIGURE_ARGS+= --enable-${MODNAME}=shared
CONFIGURE_ARGS+= --without-cdb
@@ -25,4 +23,5 @@
.include "../../databases/gdbm/buildlink3.mk"
.endif
+.include "../../lang/php/ext.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 5efdbde8adfd -r b2f420cb7440 databases/php-dbase/Makefile
--- a/databases/php-dbase/Makefile Fri Nov 05 17:01:35 2004 +0000
+++ b/databases/php-dbase/Makefile Fri Nov 05 17:11:39 2004 +0000
@@ -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 @@
USE_BUILDLINK3= YES
-.include "../../lang/php/ext.mk"
-
CONFIGURE_ARGS+= --with-${MODNAME}=shared
+.include "../../lang/php/ext.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 5efdbde8adfd -r b2f420cb7440 databases/php-filepro/Makefile
--- a/databases/php-filepro/Makefile Fri Nov 05 17:01:35 2004 +0000
+++ b/databases/php-filepro/Makefile Fri Nov 05 17:11:39 2004 +0000
@@ -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 @@
USE_BUILDLINK3= YES
-.include "../../lang/php/ext.mk"
-
CONFIGURE_ARGS+= --with-${MODNAME}=shared
+.include "../../lang/php/ext.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 5efdbde8adfd -r b2f420cb7440 databases/php-ldap/Makefile
--- a/databases/php-ldap/Makefile Fri Nov 05 17:01:35 2004 +0000
+++ b/databases/php-ldap/Makefile Fri Nov 05 17:11:39 2004 +0000
@@ -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 @@
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 -r 5efdbde8adfd -r b2f420cb7440 databases/php-mssql/Makefile
--- a/databases/php-mssql/Makefile Fri Nov 05 17:01:35 2004 +0000
+++ b/databases/php-mssql/Makefile Fri Nov 05 17:11:39 2004 +0000
@@ -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 @@
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 -r 5efdbde8adfd -r b2f420cb7440 databases/php-mysql/Makefile
--- a/databases/php-mysql/Makefile Fri Nov 05 17:01:35 2004 +0000
+++ b/databases/php-mysql/Makefile Fri Nov 05 17:11:39 2004 +0000
@@ -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 @@
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 -r 5efdbde8adfd -r b2f420cb7440 databases/php-odbc/Makefile
--- a/databases/php-odbc/Makefile Fri Nov 05 17:01:35 2004 +0000
+++ b/databases/php-odbc/Makefile Fri Nov 05 17:11:39 2004 +0000
@@ -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 @@
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 -r 5efdbde8adfd -r b2f420cb7440 databases/php-pgsql/Makefile
--- a/databases/php-pgsql/Makefile Fri Nov 05 17:01:35 2004 +0000
+++ b/databases/php-pgsql/Makefile Fri Nov 05 17:11:39 2004 +0000
@@ -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 @@
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 -r 5efdbde8adfd -r b2f420cb7440 devel/php-gettext/Makefile
--- a/devel/php-gettext/Makefile Fri Nov 05 17:01:35 2004 +0000
+++ b/devel/php-gettext/Makefile Fri Nov 05 17:11:39 2004 +0000
@@ -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 @@
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 -r 5efdbde8adfd -r b2f420cb7440 devel/php-gmp/Makefile
--- a/devel/php-gmp/Makefile Fri Nov 05 17:01:35 2004 +0000
+++ b/devel/php-gmp/Makefile Fri Nov 05 17:11:39 2004 +0000
@@ -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 @@
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 -r 5efdbde8adfd -r b2f420cb7440 devel/php-posix/Makefile
--- a/devel/php-posix/Makefile Fri Nov 05 17:01:35 2004 +0000
+++ b/devel/php-posix/Makefile Fri Nov 05 17:11:39 2004 +0000
@@ -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 @@
USE_BUILDLINK3= YES
-.include "../../lang/php/ext.mk"
-
CONFIGURE_ARGS+= --enable-${MODNAME}=shared
+.include "../../lang/php/ext.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 5efdbde8adfd -r b2f420cb7440 devel/php-shmop/Makefile
--- a/devel/php-shmop/Makefile Fri Nov 05 17:01:35 2004 +0000
+++ b/devel/php-shmop/Makefile Fri Nov 05 17:11:39 2004 +0000
@@ -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 @@
Home |
Main Index |
Thread Index |
Old Index