From cbca6afbb8bd6ff1e5a948656aeb261ee4e89d12 Mon Sep 17 00:00:00 2001 From: espie Date: Sun, 29 Jan 2012 14:53:20 +0000 Subject: [PATCH] allow for simultaneous install of 5.2 and 5.3 extensions. This solves some nasty 5.0 -> current update problems. Up to 5.0, lots of php-using packages were depending on php-mysql-5.2. So the dependencies would update to php-mysql-5.2 from current. BUT the php-using packages are now depending on 5.3 -> internal conflict ! With this change, things work again. After the update, you end up with php-mysql-5.2 AND php-mysql-5.3, you can then try pkg_delete -a to weed out "unneeded" php*-5.2 okay sthen@, ajacoutot@ --- lang/php/5.2/Makefile | 10 +++++----- lang/php/5.2/pkg/PLIST-bz2 | 4 +++- lang/php/5.2/pkg/PLIST-curl | 4 +++- lang/php/5.2/pkg/PLIST-dba | 4 +++- lang/php/5.2/pkg/PLIST-dbase | 4 +++- lang/php/5.2/pkg/PLIST-fastcgi | 4 +++- lang/php/5.2/pkg/PLIST-gd | 4 +++- lang/php/5.2/pkg/PLIST-gmp | 4 +++- lang/php/5.2/pkg/PLIST-imap | 4 +++- lang/php/5.2/pkg/PLIST-ldap | 4 +++- lang/php/5.2/pkg/PLIST-mcrypt | 4 +++- lang/php/5.2/pkg/PLIST-mhash | 4 +++- lang/php/5.2/pkg/PLIST-mssql | 4 +++- lang/php/5.2/pkg/PLIST-mysql | 4 +++- lang/php/5.2/pkg/PLIST-mysqli | 4 +++- lang/php/5.2/pkg/PLIST-ncurses | 4 +++- lang/php/5.2/pkg/PLIST-odbc | 4 +++- lang/php/5.2/pkg/PLIST-pdo_dblib | 4 +++- lang/php/5.2/pkg/PLIST-pdo_mysql | 4 +++- lang/php/5.2/pkg/PLIST-pdo_pgsql | 4 +++- lang/php/5.2/pkg/PLIST-pdo_sqlite | 4 +++- lang/php/5.2/pkg/PLIST-pgsql | 4 +++- lang/php/5.2/pkg/PLIST-pspell | 4 +++- lang/php/5.2/pkg/PLIST-shmop | 4 +++- lang/php/5.2/pkg/PLIST-snmp | 4 +++- lang/php/5.2/pkg/PLIST-soap | 4 +++- lang/php/5.2/pkg/PLIST-sqlite | 4 +++- lang/php/5.2/pkg/PLIST-sybase_ct | 4 +++- lang/php/5.2/pkg/PLIST-tidy | 4 +++- lang/php/5.2/pkg/PLIST-xmlrpc | 4 +++- lang/php/5.2/pkg/PLIST-xsl | 4 +++- lang/php/5.3/Makefile | 7 ++++--- lang/php/5.3/pkg/PLIST-bz2 | 4 +++- lang/php/5.3/pkg/PLIST-curl | 4 +++- lang/php/5.3/pkg/PLIST-dba | 4 +++- lang/php/5.3/pkg/PLIST-fastcgi | 4 +++- lang/php/5.3/pkg/PLIST-fpm | 4 +++- lang/php/5.3/pkg/PLIST-gd | 4 +++- lang/php/5.3/pkg/PLIST-gmp | 4 +++- lang/php/5.3/pkg/PLIST-imap | 4 +++- lang/php/5.3/pkg/PLIST-ldap | 4 +++- lang/php/5.3/pkg/PLIST-mcrypt | 4 +++- lang/php/5.3/pkg/PLIST-mssql | 4 +++- lang/php/5.3/pkg/PLIST-mysql | 4 +++- lang/php/5.3/pkg/PLIST-mysqli | 4 +++- lang/php/5.3/pkg/PLIST-odbc | 4 +++- lang/php/5.3/pkg/PLIST-pcntl | 6 ++++-- lang/php/5.3/pkg/PLIST-pdo_dblib | 4 +++- lang/php/5.3/pkg/PLIST-pdo_mysql | 4 +++- lang/php/5.3/pkg/PLIST-pdo_pgsql | 4 +++- lang/php/5.3/pkg/PLIST-pdo_sqlite | 4 +++- lang/php/5.3/pkg/PLIST-pgsql | 4 +++- lang/php/5.3/pkg/PLIST-pspell | 4 +++- lang/php/5.3/pkg/PLIST-shmop | 4 +++- lang/php/5.3/pkg/PLIST-snmp | 4 +++- lang/php/5.3/pkg/PLIST-soap | 4 +++- lang/php/5.3/pkg/PLIST-sqlite | 4 +++- lang/php/5.3/pkg/PLIST-tidy | 4 +++- lang/php/5.3/pkg/PLIST-xmlrpc | 4 +++- lang/php/5.3/pkg/PLIST-xsl | 4 +++- 60 files changed, 184 insertions(+), 67 deletions(-) diff --git a/lang/php/5.2/Makefile b/lang/php/5.2/Makefile index ed7ec8f7705..125927953c4 100644 --- a/lang/php/5.2/Makefile +++ b/lang/php/5.2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2012/01/25 11:17:22 sthen Exp $ +# $OpenBSD: Makefile,v 1.22 2012/01/29 14:53:20 espie Exp $ # doesn't set USE_LIBTOOL but use the bundled one because it needs some # specific options we don't have. @@ -8,11 +8,11 @@ V= 5.2.17 SUHOSIN_PHPV= 5.2.16 SUHOSIN_P_V= 0.9.7 -REVISION= 4 +REVISION= 5 REVISION-main= 8 -REVISION-fastcgi= 8 -REVISION-snmp= 5 -REVISION-gd= 5 +REVISION-fastcgi= 9 +REVISION-snmp= 6 +REVISION-gd= 6 INI_TEMPLATES= dist recommended diff --git a/lang/php/5.2/pkg/PLIST-bz2 b/lang/php/5.2/pkg/PLIST-bz2 index da1981e62dd..1fafcfc0278 100644 --- a/lang/php/5.2/pkg/PLIST-bz2 +++ b/lang/php/5.2/pkg/PLIST-bz2 @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-bz2,v 1.3 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-bz2,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-bz2->=5.2,<5.3 @conflict php5-bz2->=5.2 @pkgpath www/php5/extensions,-bz2 lib/php-${PV}/modules/bz2.so diff --git a/lang/php/5.2/pkg/PLIST-curl b/lang/php/5.2/pkg/PLIST-curl index 8bd75ec8d89..f8ace5b9f27 100644 --- a/lang/php/5.2/pkg/PLIST-curl +++ b/lang/php/5.2/pkg/PLIST-curl @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-curl,v 1.4 2011/05/12 17:07:20 sthen Exp $ +@comment $OpenBSD: PLIST-curl,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-curl->=5.2,<5.3 @conflict php5-curl->=5.2 @pkgpath www/php5/extensions,-curl lib/php-${PV}/modules/curl.so diff --git a/lang/php/5.2/pkg/PLIST-dba b/lang/php/5.2/pkg/PLIST-dba index 3433da4329e..59e229a35c0 100644 --- a/lang/php/5.2/pkg/PLIST-dba +++ b/lang/php/5.2/pkg/PLIST-dba @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-dba,v 1.3 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-dba,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-dba->=5.2,<5.3 @conflict php5-dba->=5.2 @pkgpath www/php5/extensions,-dba lib/php-${PV}/modules/dba.so diff --git a/lang/php/5.2/pkg/PLIST-dbase b/lang/php/5.2/pkg/PLIST-dbase index d7597cca075..468d4dc08b8 100644 --- a/lang/php/5.2/pkg/PLIST-dbase +++ b/lang/php/5.2/pkg/PLIST-dbase @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-dbase,v 1.2 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-dbase,v 1.3 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-dbase->=5.2,<5.3 @conflict php5-dbase->=5.2 @pkgpath www/php5/extensions,-dbase lib/php-${PV}/modules/dbase.so diff --git a/lang/php/5.2/pkg/PLIST-fastcgi b/lang/php/5.2/pkg/PLIST-fastcgi index d8bb0271c9e..360eaddc965 100644 --- a/lang/php/5.2/pkg/PLIST-fastcgi +++ b/lang/php/5.2/pkg/PLIST-fastcgi @@ -1,2 +1,4 @@ -@comment $OpenBSD: PLIST-fastcgi,v 1.2 2011/07/09 00:41:44 robert Exp $ +@comment $OpenBSD: PLIST-fastcgi,v 1.3 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-fastcgi->=5.2,<5.3 @bin bin/php-fastcgi-${PV} diff --git a/lang/php/5.2/pkg/PLIST-gd b/lang/php/5.2/pkg/PLIST-gd index 3bbaaeca91d..75d6147883b 100644 --- a/lang/php/5.2/pkg/PLIST-gd +++ b/lang/php/5.2/pkg/PLIST-gd @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-gd,v 1.4 2011/07/26 10:54:07 sthen Exp $ +@comment $OpenBSD: PLIST-gd,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-gd->=5.2,<5.3 @conflict php5-gd->=5.2 @pkgpath www/php5/extensions,-gd[,no_x11] lib/php-${PV}/modules/gd.so diff --git a/lang/php/5.2/pkg/PLIST-gmp b/lang/php/5.2/pkg/PLIST-gmp index 0a450aa07a8..93ff15dee6e 100644 --- a/lang/php/5.2/pkg/PLIST-gmp +++ b/lang/php/5.2/pkg/PLIST-gmp @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-gmp,v 1.3 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-gmp,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-gmp->=5.2,<5.3 @conflict php5-gmp->=5.2 @pkgpath www/php5/extensions,-gmp lib/php-${PV}/modules/gmp.so diff --git a/lang/php/5.2/pkg/PLIST-imap b/lang/php/5.2/pkg/PLIST-imap index 5c6f4681242..f5e2e73670d 100644 --- a/lang/php/5.2/pkg/PLIST-imap +++ b/lang/php/5.2/pkg/PLIST-imap @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-imap,v 1.3 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-imap,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-imap->=5.2,<5.3 @conflict php5-imap->=5.2 @pkgpath www/php5/extensions,-imap lib/php-${PV}/modules/imap.so diff --git a/lang/php/5.2/pkg/PLIST-ldap b/lang/php/5.2/pkg/PLIST-ldap index f6faa5bd506..70ad0d9961a 100644 --- a/lang/php/5.2/pkg/PLIST-ldap +++ b/lang/php/5.2/pkg/PLIST-ldap @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-ldap,v 1.3 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-ldap,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-ldap->=5.2,<5.3 @conflict php5-ldap->=5.2 @pkgpath www/php5/extensions,-ldap lib/php-${PV}/modules/ldap.so diff --git a/lang/php/5.2/pkg/PLIST-mcrypt b/lang/php/5.2/pkg/PLIST-mcrypt index dbfcb6ec803..1b3b68bd041 100644 --- a/lang/php/5.2/pkg/PLIST-mcrypt +++ b/lang/php/5.2/pkg/PLIST-mcrypt @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-mcrypt,v 1.3 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-mcrypt,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-mcrypt->=5.2,<5.3 @conflict php5-mcrypt->=5.2 @pkgpath www/php5/extensions,-mcrypt lib/php-${PV}/modules/mcrypt.so diff --git a/lang/php/5.2/pkg/PLIST-mhash b/lang/php/5.2/pkg/PLIST-mhash index ba961dc51e0..d5f0653d6d2 100644 --- a/lang/php/5.2/pkg/PLIST-mhash +++ b/lang/php/5.2/pkg/PLIST-mhash @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-mhash,v 1.2 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-mhash,v 1.3 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-mhash->=5.2,<5.3 @conflict php5-mhash->=5.2 @pkgpath www/php5/extensions,-mhash lib/php-${PV}/modules/mhash.so diff --git a/lang/php/5.2/pkg/PLIST-mssql b/lang/php/5.2/pkg/PLIST-mssql index 6eb39cafe6d..8d7e7fa52d5 100644 --- a/lang/php/5.2/pkg/PLIST-mssql +++ b/lang/php/5.2/pkg/PLIST-mssql @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-mssql,v 1.3 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-mssql,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-mssql->=5.2,<5.3 @conflict php5-mssql->=5.2 @pkgpath www/php5/extensions,-mssql lib/php-${PV}/modules/mssql.so diff --git a/lang/php/5.2/pkg/PLIST-mysql b/lang/php/5.2/pkg/PLIST-mysql index a2d9e5afe27..0bfe2b345b1 100644 --- a/lang/php/5.2/pkg/PLIST-mysql +++ b/lang/php/5.2/pkg/PLIST-mysql @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-mysql,v 1.3 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-mysql,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-mysql->=5.2,<5.3 @conflict php5-mysql->=5.2 @pkgpath www/php5/extensions,-mysql lib/php-${PV}/modules/mysql.so diff --git a/lang/php/5.2/pkg/PLIST-mysqli b/lang/php/5.2/pkg/PLIST-mysqli index f99085af02e..5c365418ac6 100644 --- a/lang/php/5.2/pkg/PLIST-mysqli +++ b/lang/php/5.2/pkg/PLIST-mysqli @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-mysqli,v 1.3 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-mysqli,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-mysqli->=5.2,<5.3 @conflict php5-mysqli->=5.2 @pkgpath www/php5/extensions,-mysqli lib/php-${PV}/modules/mysqli.so diff --git a/lang/php/5.2/pkg/PLIST-ncurses b/lang/php/5.2/pkg/PLIST-ncurses index a7fc58e5900..9ce11219c08 100644 --- a/lang/php/5.2/pkg/PLIST-ncurses +++ b/lang/php/5.2/pkg/PLIST-ncurses @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-ncurses,v 1.2 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-ncurses,v 1.3 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-ncurses->=5.2,<5.3 @conflict php5-ncurses->=5.2 @pkgpath www/php5/extensions,-ncurses lib/php-${PV}/modules/ncurses.so diff --git a/lang/php/5.2/pkg/PLIST-odbc b/lang/php/5.2/pkg/PLIST-odbc index 30568d75dcf..f25b112409a 100644 --- a/lang/php/5.2/pkg/PLIST-odbc +++ b/lang/php/5.2/pkg/PLIST-odbc @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-odbc,v 1.3 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-odbc,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-odbc->=5.2,<5.3 @conflict php5-odbc->=5.2 @pkgpath www/php5/extensions,-odbc lib/php-${PV}/modules/odbc.so diff --git a/lang/php/5.2/pkg/PLIST-pdo_dblib b/lang/php/5.2/pkg/PLIST-pdo_dblib index ccb18edd2b5..80b4db3a4a8 100644 --- a/lang/php/5.2/pkg/PLIST-pdo_dblib +++ b/lang/php/5.2/pkg/PLIST-pdo_dblib @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-pdo_dblib,v 1.3 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-pdo_dblib,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-pdo_dblib->=5.2,<5.3 @conflict php5-pdo_dblib->=5.2 @pkgpath www/php5/extensions,-pdo_dblib lib/php-${PV}/modules/pdo_dblib.so diff --git a/lang/php/5.2/pkg/PLIST-pdo_mysql b/lang/php/5.2/pkg/PLIST-pdo_mysql index 584690f05bc..7f430673e6c 100644 --- a/lang/php/5.2/pkg/PLIST-pdo_mysql +++ b/lang/php/5.2/pkg/PLIST-pdo_mysql @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-pdo_mysql,v 1.3 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-pdo_mysql,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-pdo_mysql->=5.2,<5.3 @conflict php5-pdo_mysql->=5.2 @pkgpath www/php5/extensions,-pdo_mysql lib/php-${PV}/modules/pdo_mysql.so diff --git a/lang/php/5.2/pkg/PLIST-pdo_pgsql b/lang/php/5.2/pkg/PLIST-pdo_pgsql index 219b91db03c..bb938e5fad6 100644 --- a/lang/php/5.2/pkg/PLIST-pdo_pgsql +++ b/lang/php/5.2/pkg/PLIST-pdo_pgsql @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-pdo_pgsql,v 1.3 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-pdo_pgsql,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-pdo_pgsql->=5.2,<5.3 @conflict php5-pdo_pgsql->=5.2 @pkgpath www/php5/extensions,-pdo_pgsql lib/php-${PV}/modules/pdo_pgsql.so diff --git a/lang/php/5.2/pkg/PLIST-pdo_sqlite b/lang/php/5.2/pkg/PLIST-pdo_sqlite index cdf027c9779..20409bcb930 100644 --- a/lang/php/5.2/pkg/PLIST-pdo_sqlite +++ b/lang/php/5.2/pkg/PLIST-pdo_sqlite @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-pdo_sqlite,v 1.3 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-pdo_sqlite,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-pdo_sqlite->=5.2,<5.3 @conflict php5-pdo_sqlite->=5.2 @pkgpath www/php5/extensions,-pdo_sqlite lib/php-${PV}/modules/pdo_sqlite.so diff --git a/lang/php/5.2/pkg/PLIST-pgsql b/lang/php/5.2/pkg/PLIST-pgsql index e493cb7233a..e49c59d8770 100644 --- a/lang/php/5.2/pkg/PLIST-pgsql +++ b/lang/php/5.2/pkg/PLIST-pgsql @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-pgsql,v 1.3 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-pgsql,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-pgsql->=5.2,<5.3 @conflict php5-pgsql->=5.2 @pkgpath www/php5/extensions,-pgsql lib/php-${PV}/modules/pgsql.so diff --git a/lang/php/5.2/pkg/PLIST-pspell b/lang/php/5.2/pkg/PLIST-pspell index 73a0f108345..4d21393788b 100644 --- a/lang/php/5.2/pkg/PLIST-pspell +++ b/lang/php/5.2/pkg/PLIST-pspell @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-pspell,v 1.3 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-pspell,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-pspell->=5.2,<5.3 @conflict php5-pspell->=5.2 @pkgpath www/php5/extensions,-pspell lib/php-${PV}/modules/pspell.so diff --git a/lang/php/5.2/pkg/PLIST-shmop b/lang/php/5.2/pkg/PLIST-shmop index 695d26b8375..a66d0819668 100644 --- a/lang/php/5.2/pkg/PLIST-shmop +++ b/lang/php/5.2/pkg/PLIST-shmop @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-shmop,v 1.3 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-shmop,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-shmop->=5.2,<5.3 @conflict php5-shmop->=5.2 @pkgpath www/php5/extensions,-shmop lib/php-${PV}/modules/shmop.so diff --git a/lang/php/5.2/pkg/PLIST-snmp b/lang/php/5.2/pkg/PLIST-snmp index 535aeb0b6d9..8120cc32c43 100644 --- a/lang/php/5.2/pkg/PLIST-snmp +++ b/lang/php/5.2/pkg/PLIST-snmp @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-snmp,v 1.3 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-snmp,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-snmp->=5.2,<5.3 @conflict php5-snmp->=5.2 @pkgpath www/php5/extensions,-snmp lib/php-${PV}/modules/snmp.so diff --git a/lang/php/5.2/pkg/PLIST-soap b/lang/php/5.2/pkg/PLIST-soap index 6d675ab1a5c..96ec962d18e 100644 --- a/lang/php/5.2/pkg/PLIST-soap +++ b/lang/php/5.2/pkg/PLIST-soap @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-soap,v 1.3 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-soap,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-soap->=5.2,<5.3 @conflict php5-soap->=5.2 @pkgpath www/php5/extensions,-soap lib/php-${PV}/modules/soap.so diff --git a/lang/php/5.2/pkg/PLIST-sqlite b/lang/php/5.2/pkg/PLIST-sqlite index 0236c18c5aa..3e1de1bf65e 100644 --- a/lang/php/5.2/pkg/PLIST-sqlite +++ b/lang/php/5.2/pkg/PLIST-sqlite @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-sqlite,v 1.3 2010/06/29 01:10:44 robert Exp $ +@comment $OpenBSD: PLIST-sqlite,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-sqlite->=5.2,<5.3 @conflict php5-sqlite->=5.2 @pkgpath www/php5/extensions,-sqlite lib/php-${PV}/modules/sqlite.so diff --git a/lang/php/5.2/pkg/PLIST-sybase_ct b/lang/php/5.2/pkg/PLIST-sybase_ct index 23efc2bb360..7a1ce77caa7 100644 --- a/lang/php/5.2/pkg/PLIST-sybase_ct +++ b/lang/php/5.2/pkg/PLIST-sybase_ct @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-sybase_ct,v 1.2 2010/06/29 01:10:45 robert Exp $ +@comment $OpenBSD: PLIST-sybase_ct,v 1.3 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-sybase_ct->=5.2,<5.3 @conflict php5-sybase_ct->=5.2 @pkgpath www/php5/extensions,-sybase_ct lib/php-${PV}/modules/sybase_ct.so diff --git a/lang/php/5.2/pkg/PLIST-tidy b/lang/php/5.2/pkg/PLIST-tidy index 650f57cff38..3dfceabac66 100644 --- a/lang/php/5.2/pkg/PLIST-tidy +++ b/lang/php/5.2/pkg/PLIST-tidy @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-tidy,v 1.3 2010/06/29 01:10:45 robert Exp $ +@comment $OpenBSD: PLIST-tidy,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-tidy->=5.2,<5.3 @conflict php5-tidy->=5.2 @pkgpath www/php5/extensions,-tidy lib/php-${PV}/modules/tidy.so diff --git a/lang/php/5.2/pkg/PLIST-xmlrpc b/lang/php/5.2/pkg/PLIST-xmlrpc index a0c0cbab40e..885c30bd36c 100644 --- a/lang/php/5.2/pkg/PLIST-xmlrpc +++ b/lang/php/5.2/pkg/PLIST-xmlrpc @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-xmlrpc,v 1.3 2010/06/29 01:10:45 robert Exp $ +@comment $OpenBSD: PLIST-xmlrpc,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-xmlrpc->=5.2,<5.3 @conflict php5-xmlrpc->=5.2 @pkgpath www/php5/extensions,-xmlrpc lib/php-${PV}/modules/xmlrpc.so diff --git a/lang/php/5.2/pkg/PLIST-xsl b/lang/php/5.2/pkg/PLIST-xsl index 1182b85f25f..dc4fd82e030 100644 --- a/lang/php/5.2/pkg/PLIST-xsl +++ b/lang/php/5.2/pkg/PLIST-xsl @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-xsl,v 1.3 2010/06/29 01:10:45 robert Exp $ +@comment $OpenBSD: PLIST-xsl,v 1.4 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-xsl->=5.2,<5.3 @conflict php5-xsl->=5.2 @pkgpath www/php5/extensions,-xsl lib/php-${PV}/modules/xsl.so diff --git a/lang/php/5.3/Makefile b/lang/php/5.3/Makefile index f2063c12e57..5a3ee21ecaf 100644 --- a/lang/php/5.3/Makefile +++ b/lang/php/5.3/Makefile @@ -1,12 +1,13 @@ -# $OpenBSD: Makefile,v 1.22 2012/01/25 11:17:22 sthen Exp $ +# $OpenBSD: Makefile,v 1.23 2012/01/29 14:53:21 espie Exp $ PV= 5.3 V= ${PV}.9 SUHOSIN_PHPV= ${V} SUHOSIN_P_V= 0.9.10 +REVISION= 0 REVISION-main= 1 -REVISION-fastcgi= 1 -REVISION-fpm= 0 +REVISION-fastcgi= 2 +REVISION-fpm= 1 INI_TEMPLATES= development production diff --git a/lang/php/5.3/pkg/PLIST-bz2 b/lang/php/5.3/pkg/PLIST-bz2 index 926f8f2d7cc..bbf13cc1176 100644 --- a/lang/php/5.3/pkg/PLIST-bz2 +++ b/lang/php/5.3/pkg/PLIST-bz2 @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-bz2,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-bz2,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-bz2->=5.3,<5.4 @conflict php5-bz2->=5.2 lib/php-${PV}/modules/bz2.so share/examples/php-${PV}/bz2.ini diff --git a/lang/php/5.3/pkg/PLIST-curl b/lang/php/5.3/pkg/PLIST-curl index ee9ccd6eda7..4bd7b6e3246 100644 --- a/lang/php/5.3/pkg/PLIST-curl +++ b/lang/php/5.3/pkg/PLIST-curl @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-curl,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-curl,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-curl->=5.3,<5.4 @conflict php5-curl->=5.2 lib/php-${PV}/modules/curl.so share/examples/php-${PV}/curl.ini diff --git a/lang/php/5.3/pkg/PLIST-dba b/lang/php/5.3/pkg/PLIST-dba index a7164e5fc2e..e72a83a18fb 100644 --- a/lang/php/5.3/pkg/PLIST-dba +++ b/lang/php/5.3/pkg/PLIST-dba @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-dba,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-dba,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-dba->=5.3,<5.4 @conflict php5-dba->=5.2 lib/php-${PV}/modules/dba.so share/examples/php-${PV}/dba.ini diff --git a/lang/php/5.3/pkg/PLIST-fastcgi b/lang/php/5.3/pkg/PLIST-fastcgi index d8bb0271c9e..8584a44b38e 100644 --- a/lang/php/5.3/pkg/PLIST-fastcgi +++ b/lang/php/5.3/pkg/PLIST-fastcgi @@ -1,2 +1,4 @@ -@comment $OpenBSD: PLIST-fastcgi,v 1.2 2011/07/09 00:41:44 robert Exp $ +@comment $OpenBSD: PLIST-fastcgi,v 1.3 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-fastcgi->=5.3,<5.4 @bin bin/php-fastcgi-${PV} diff --git a/lang/php/5.3/pkg/PLIST-fpm b/lang/php/5.3/pkg/PLIST-fpm index 084ab810e40..42ea7ba5831 100644 --- a/lang/php/5.3/pkg/PLIST-fpm +++ b/lang/php/5.3/pkg/PLIST-fpm @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-fpm,v 1.1 2011/08/27 13:13:13 robert Exp $ +@comment $OpenBSD: PLIST-fpm,v 1.2 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-fpm->=5.3,<5.4 @man man/man8/php-fpm-${PV}.8 @bin sbin/php-fpm-${PV} share/examples/php-${PV}/php-fpm.conf diff --git a/lang/php/5.3/pkg/PLIST-gd b/lang/php/5.3/pkg/PLIST-gd index f244e47675e..29ff758b0ed 100644 --- a/lang/php/5.3/pkg/PLIST-gd +++ b/lang/php/5.3/pkg/PLIST-gd @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-gd,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-gd,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-gd->=5.3,<5.4 @conflict php5-gd->=5.2 lib/php-${PV}/modules/gd.so share/examples/php-${PV}/gd.ini diff --git a/lang/php/5.3/pkg/PLIST-gmp b/lang/php/5.3/pkg/PLIST-gmp index 6316952bac3..7456ef11254 100644 --- a/lang/php/5.3/pkg/PLIST-gmp +++ b/lang/php/5.3/pkg/PLIST-gmp @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-gmp,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-gmp,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-gmp->=5.3,<5.4 @conflict php5-gmp->=5.2 lib/php-${PV}/modules/gmp.so share/examples/php-${PV}/gmp.ini diff --git a/lang/php/5.3/pkg/PLIST-imap b/lang/php/5.3/pkg/PLIST-imap index ee0fe1b8718..fc2a31d4fb3 100644 --- a/lang/php/5.3/pkg/PLIST-imap +++ b/lang/php/5.3/pkg/PLIST-imap @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-imap,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-imap,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-imap->=5.3,<5.4 @conflict php5-imap->=5.2 lib/php-${PV}/modules/imap.so share/examples/php-${PV}/imap.ini diff --git a/lang/php/5.3/pkg/PLIST-ldap b/lang/php/5.3/pkg/PLIST-ldap index b65658c539c..4b92aa58559 100644 --- a/lang/php/5.3/pkg/PLIST-ldap +++ b/lang/php/5.3/pkg/PLIST-ldap @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-ldap,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-ldap,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-ldap->=5.3,<5.4 @conflict php5-ldap->=5.2 lib/php-${PV}/modules/ldap.so share/examples/php-${PV}/ldap.ini diff --git a/lang/php/5.3/pkg/PLIST-mcrypt b/lang/php/5.3/pkg/PLIST-mcrypt index 903fd4039fd..15dd77c1889 100644 --- a/lang/php/5.3/pkg/PLIST-mcrypt +++ b/lang/php/5.3/pkg/PLIST-mcrypt @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-mcrypt,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-mcrypt,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-mcrypt->=5.3,<5.4 @conflict php5-mcrypt->=5.2 lib/php-${PV}/modules/mcrypt.so share/examples/php-${PV}/mcrypt.ini diff --git a/lang/php/5.3/pkg/PLIST-mssql b/lang/php/5.3/pkg/PLIST-mssql index 4c2086f914f..4613a5f6639 100644 --- a/lang/php/5.3/pkg/PLIST-mssql +++ b/lang/php/5.3/pkg/PLIST-mssql @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-mssql,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-mssql,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-mssql->=5.3,<5.4 @conflict php5-mssql->=5.2 lib/php-${PV}/modules/mssql.so share/examples/php-${PV}/mssql.ini diff --git a/lang/php/5.3/pkg/PLIST-mysql b/lang/php/5.3/pkg/PLIST-mysql index f51ce57ab4f..9b2e877fce9 100644 --- a/lang/php/5.3/pkg/PLIST-mysql +++ b/lang/php/5.3/pkg/PLIST-mysql @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-mysql,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-mysql,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-mysql->=5.3,<5.4 @conflict php5-mysql->=5.2 lib/php-${PV}/modules/mysql.so share/examples/php-${PV}/mysql.ini diff --git a/lang/php/5.3/pkg/PLIST-mysqli b/lang/php/5.3/pkg/PLIST-mysqli index bcc81827785..6131b2f9a60 100644 --- a/lang/php/5.3/pkg/PLIST-mysqli +++ b/lang/php/5.3/pkg/PLIST-mysqli @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-mysqli,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-mysqli,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-mysqli->=5.3,<5.4 @conflict php5-mysqli->=5.2 lib/php-${PV}/modules/mysqli.so share/examples/php-${PV}/mysqli.ini diff --git a/lang/php/5.3/pkg/PLIST-odbc b/lang/php/5.3/pkg/PLIST-odbc index f04fd758b21..c32804db931 100644 --- a/lang/php/5.3/pkg/PLIST-odbc +++ b/lang/php/5.3/pkg/PLIST-odbc @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-odbc,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-odbc,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-odbc->=5.3,<5.4 @conflict php5-odbc->=5.2 lib/php-${PV}/modules/odbc.so share/examples/php-${PV}/odbc.ini diff --git a/lang/php/5.3/pkg/PLIST-pcntl b/lang/php/5.3/pkg/PLIST-pcntl index 74d7a9049d8..8b1c54a2f78 100644 --- a/lang/php/5.3/pkg/PLIST-pcntl +++ b/lang/php/5.3/pkg/PLIST-pcntl @@ -1,6 +1,8 @@ -@comment $OpenBSD: PLIST-pcntl,v 1.1 2011/11/17 12:52:27 robert Exp $ +@comment $OpenBSD: PLIST-pcntl,v 1.2 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-pcntl->=5.3,<5.4 @conflict php5-pcntl->=5.2 -@conflict pecl-pctnl-* +@conflict pecl-pcntl-* @pkgpath www/pecl-pcntl lib/php-${PV}/modules/pcntl.so share/examples/php-${PV}/pcntl.ini diff --git a/lang/php/5.3/pkg/PLIST-pdo_dblib b/lang/php/5.3/pkg/PLIST-pdo_dblib index 3e5004796e8..16168a4c956 100644 --- a/lang/php/5.3/pkg/PLIST-pdo_dblib +++ b/lang/php/5.3/pkg/PLIST-pdo_dblib @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-pdo_dblib,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-pdo_dblib,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-pdo_dblib->=5.3,<5.4 @conflict php5-pdo_dblib->=5.2 lib/php-${PV}/modules/pdo_dblib.so share/examples/php-${PV}/pdo_dblib.ini diff --git a/lang/php/5.3/pkg/PLIST-pdo_mysql b/lang/php/5.3/pkg/PLIST-pdo_mysql index 578fa3ab44a..8fc604b14c5 100644 --- a/lang/php/5.3/pkg/PLIST-pdo_mysql +++ b/lang/php/5.3/pkg/PLIST-pdo_mysql @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-pdo_mysql,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-pdo_mysql,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-pdo_mysql->=5.3,<5.4 @conflict php5-pdo_mysql->=5.2 lib/php-${PV}/modules/pdo_mysql.so share/examples/php-${PV}/pdo_mysql.ini diff --git a/lang/php/5.3/pkg/PLIST-pdo_pgsql b/lang/php/5.3/pkg/PLIST-pdo_pgsql index 3f430b6d125..63da2b6d554 100644 --- a/lang/php/5.3/pkg/PLIST-pdo_pgsql +++ b/lang/php/5.3/pkg/PLIST-pdo_pgsql @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-pdo_pgsql,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-pdo_pgsql,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-pdo_pgsql->=5.3,<5.4 @conflict php5-pdo_pgsql->=5.2 lib/php-${PV}/modules/pdo_pgsql.so share/examples/php-${PV}/pdo_pgsql.ini diff --git a/lang/php/5.3/pkg/PLIST-pdo_sqlite b/lang/php/5.3/pkg/PLIST-pdo_sqlite index d0f18ad56c6..605f8f018e4 100644 --- a/lang/php/5.3/pkg/PLIST-pdo_sqlite +++ b/lang/php/5.3/pkg/PLIST-pdo_sqlite @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-pdo_sqlite,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-pdo_sqlite,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-pdo_sqlite->=5.3,<5.4 @conflict php5-pdo_sqlite->=5.2 lib/php-${PV}/modules/pdo_sqlite.so share/examples/php-${PV}/pdo_sqlite.ini diff --git a/lang/php/5.3/pkg/PLIST-pgsql b/lang/php/5.3/pkg/PLIST-pgsql index 65d3f6d7df3..a5e94eeccbe 100644 --- a/lang/php/5.3/pkg/PLIST-pgsql +++ b/lang/php/5.3/pkg/PLIST-pgsql @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-pgsql,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-pgsql,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-pgsql->=5.3,<5.4 @conflict php5-pgsql->=5.2 lib/php-${PV}/modules/pgsql.so share/examples/php-${PV}/pgsql.ini diff --git a/lang/php/5.3/pkg/PLIST-pspell b/lang/php/5.3/pkg/PLIST-pspell index d88b7734fd0..fb3adb48a11 100644 --- a/lang/php/5.3/pkg/PLIST-pspell +++ b/lang/php/5.3/pkg/PLIST-pspell @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-pspell,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-pspell,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-pspell->=5.3,<5.4 @conflict php5-pspell->=5.2 lib/php-${PV}/modules/pspell.so share/examples/php-${PV}/pspell.ini diff --git a/lang/php/5.3/pkg/PLIST-shmop b/lang/php/5.3/pkg/PLIST-shmop index 0d4892aa5d8..75f4e7a3c64 100644 --- a/lang/php/5.3/pkg/PLIST-shmop +++ b/lang/php/5.3/pkg/PLIST-shmop @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-shmop,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-shmop,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-shmop->=5.3,<5.4 @conflict php5-shmop->=5.2 lib/php-${PV}/modules/shmop.so share/examples/php-${PV}/shmop.ini diff --git a/lang/php/5.3/pkg/PLIST-snmp b/lang/php/5.3/pkg/PLIST-snmp index 2d2cb7a97a0..2fe291df04f 100644 --- a/lang/php/5.3/pkg/PLIST-snmp +++ b/lang/php/5.3/pkg/PLIST-snmp @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-snmp,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-snmp,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-snmp->=5.3,<5.4 @conflict php5-snmp->=5.2 lib/php-${PV}/modules/snmp.so share/examples/php-${PV}/snmp.ini diff --git a/lang/php/5.3/pkg/PLIST-soap b/lang/php/5.3/pkg/PLIST-soap index 78fc2318580..570ab2cc755 100644 --- a/lang/php/5.3/pkg/PLIST-soap +++ b/lang/php/5.3/pkg/PLIST-soap @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-soap,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-soap,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-soap->=5.3,<5.4 @conflict php5-soap->=5.2 lib/php-${PV}/modules/soap.so share/examples/php-${PV}/soap.ini diff --git a/lang/php/5.3/pkg/PLIST-sqlite b/lang/php/5.3/pkg/PLIST-sqlite index 5d88f5635e2..2d640570660 100644 --- a/lang/php/5.3/pkg/PLIST-sqlite +++ b/lang/php/5.3/pkg/PLIST-sqlite @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-sqlite,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-sqlite,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-sqlite->=5.3,<5.4 @conflict php5-sqlite->=5.2 lib/php-${PV}/modules/sqlite.so share/examples/php-${PV}/sqlite.ini diff --git a/lang/php/5.3/pkg/PLIST-tidy b/lang/php/5.3/pkg/PLIST-tidy index 14c81ce80c8..1ef70e229db 100644 --- a/lang/php/5.3/pkg/PLIST-tidy +++ b/lang/php/5.3/pkg/PLIST-tidy @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-tidy,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-tidy,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-tidy->=5.3,<5.4 @conflict php5-tidy->=5.2 lib/php-${PV}/modules/tidy.so share/examples/php-${PV}/tidy.ini diff --git a/lang/php/5.3/pkg/PLIST-xmlrpc b/lang/php/5.3/pkg/PLIST-xmlrpc index c906e8a04b1..e76a1019376 100644 --- a/lang/php/5.3/pkg/PLIST-xmlrpc +++ b/lang/php/5.3/pkg/PLIST-xmlrpc @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-xmlrpc,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-xmlrpc,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-xmlrpc->=5.3,<5.4 @conflict php5-xmlrpc->=5.2 lib/php-${PV}/modules/xmlrpc.so share/examples/php-${PV}/xmlrpc.ini diff --git a/lang/php/5.3/pkg/PLIST-xsl b/lang/php/5.3/pkg/PLIST-xsl index a5a9383353e..08f9b7311de 100644 --- a/lang/php/5.3/pkg/PLIST-xsl +++ b/lang/php/5.3/pkg/PLIST-xsl @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-xsl,v 1.4 2011/05/12 14:30:12 robert Exp $ +@comment $OpenBSD: PLIST-xsl,v 1.5 2012/01/29 14:53:21 espie Exp $ +@option no-default-conflict +@conflict php-xsl->=5.3,<5.4 @conflict php5-xsl->=5.2 lib/php-${PV}/modules/xsl.so share/examples/php-${PV}/xsl.ini