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@
This commit is contained in:
espie 2012-01-29 14:53:20 +00:00
parent e8ba37e682
commit cbca6afbb8
60 changed files with 184 additions and 67 deletions

View File

@ -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 # doesn't set USE_LIBTOOL but use the bundled one because it needs some
# specific options we don't have. # specific options we don't have.
@ -8,11 +8,11 @@ V= 5.2.17
SUHOSIN_PHPV= 5.2.16 SUHOSIN_PHPV= 5.2.16
SUHOSIN_P_V= 0.9.7 SUHOSIN_P_V= 0.9.7
REVISION= 4 REVISION= 5
REVISION-main= 8 REVISION-main= 8
REVISION-fastcgi= 8 REVISION-fastcgi= 9
REVISION-snmp= 5 REVISION-snmp= 6
REVISION-gd= 5 REVISION-gd= 6
INI_TEMPLATES= dist recommended INI_TEMPLATES= dist recommended

View File

@ -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 @conflict php5-bz2->=5.2
@pkgpath www/php5/extensions,-bz2 @pkgpath www/php5/extensions,-bz2
lib/php-${PV}/modules/bz2.so lib/php-${PV}/modules/bz2.so

View File

@ -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 @conflict php5-curl->=5.2
@pkgpath www/php5/extensions,-curl @pkgpath www/php5/extensions,-curl
lib/php-${PV}/modules/curl.so lib/php-${PV}/modules/curl.so

View File

@ -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 @conflict php5-dba->=5.2
@pkgpath www/php5/extensions,-dba @pkgpath www/php5/extensions,-dba
lib/php-${PV}/modules/dba.so lib/php-${PV}/modules/dba.so

View File

@ -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 @conflict php5-dbase->=5.2
@pkgpath www/php5/extensions,-dbase @pkgpath www/php5/extensions,-dbase
lib/php-${PV}/modules/dbase.so lib/php-${PV}/modules/dbase.so

View File

@ -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} @bin bin/php-fastcgi-${PV}

View File

@ -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 @conflict php5-gd->=5.2
@pkgpath www/php5/extensions,-gd[,no_x11] @pkgpath www/php5/extensions,-gd[,no_x11]
lib/php-${PV}/modules/gd.so lib/php-${PV}/modules/gd.so

View File

@ -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 @conflict php5-gmp->=5.2
@pkgpath www/php5/extensions,-gmp @pkgpath www/php5/extensions,-gmp
lib/php-${PV}/modules/gmp.so lib/php-${PV}/modules/gmp.so

View File

@ -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 @conflict php5-imap->=5.2
@pkgpath www/php5/extensions,-imap @pkgpath www/php5/extensions,-imap
lib/php-${PV}/modules/imap.so lib/php-${PV}/modules/imap.so

View File

@ -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 @conflict php5-ldap->=5.2
@pkgpath www/php5/extensions,-ldap @pkgpath www/php5/extensions,-ldap
lib/php-${PV}/modules/ldap.so lib/php-${PV}/modules/ldap.so

View File

@ -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 @conflict php5-mcrypt->=5.2
@pkgpath www/php5/extensions,-mcrypt @pkgpath www/php5/extensions,-mcrypt
lib/php-${PV}/modules/mcrypt.so lib/php-${PV}/modules/mcrypt.so

View File

@ -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 @conflict php5-mhash->=5.2
@pkgpath www/php5/extensions,-mhash @pkgpath www/php5/extensions,-mhash
lib/php-${PV}/modules/mhash.so lib/php-${PV}/modules/mhash.so

View File

@ -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 @conflict php5-mssql->=5.2
@pkgpath www/php5/extensions,-mssql @pkgpath www/php5/extensions,-mssql
lib/php-${PV}/modules/mssql.so lib/php-${PV}/modules/mssql.so

View File

@ -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 @conflict php5-mysql->=5.2
@pkgpath www/php5/extensions,-mysql @pkgpath www/php5/extensions,-mysql
lib/php-${PV}/modules/mysql.so lib/php-${PV}/modules/mysql.so

View File

@ -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 @conflict php5-mysqli->=5.2
@pkgpath www/php5/extensions,-mysqli @pkgpath www/php5/extensions,-mysqli
lib/php-${PV}/modules/mysqli.so lib/php-${PV}/modules/mysqli.so

View File

@ -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 @conflict php5-ncurses->=5.2
@pkgpath www/php5/extensions,-ncurses @pkgpath www/php5/extensions,-ncurses
lib/php-${PV}/modules/ncurses.so lib/php-${PV}/modules/ncurses.so

View File

@ -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 @conflict php5-odbc->=5.2
@pkgpath www/php5/extensions,-odbc @pkgpath www/php5/extensions,-odbc
lib/php-${PV}/modules/odbc.so lib/php-${PV}/modules/odbc.so

View File

@ -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 @conflict php5-pdo_dblib->=5.2
@pkgpath www/php5/extensions,-pdo_dblib @pkgpath www/php5/extensions,-pdo_dblib
lib/php-${PV}/modules/pdo_dblib.so lib/php-${PV}/modules/pdo_dblib.so

View File

@ -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 @conflict php5-pdo_mysql->=5.2
@pkgpath www/php5/extensions,-pdo_mysql @pkgpath www/php5/extensions,-pdo_mysql
lib/php-${PV}/modules/pdo_mysql.so lib/php-${PV}/modules/pdo_mysql.so

View File

@ -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 @conflict php5-pdo_pgsql->=5.2
@pkgpath www/php5/extensions,-pdo_pgsql @pkgpath www/php5/extensions,-pdo_pgsql
lib/php-${PV}/modules/pdo_pgsql.so lib/php-${PV}/modules/pdo_pgsql.so

View File

@ -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 @conflict php5-pdo_sqlite->=5.2
@pkgpath www/php5/extensions,-pdo_sqlite @pkgpath www/php5/extensions,-pdo_sqlite
lib/php-${PV}/modules/pdo_sqlite.so lib/php-${PV}/modules/pdo_sqlite.so

View File

@ -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 @conflict php5-pgsql->=5.2
@pkgpath www/php5/extensions,-pgsql @pkgpath www/php5/extensions,-pgsql
lib/php-${PV}/modules/pgsql.so lib/php-${PV}/modules/pgsql.so

View File

@ -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 @conflict php5-pspell->=5.2
@pkgpath www/php5/extensions,-pspell @pkgpath www/php5/extensions,-pspell
lib/php-${PV}/modules/pspell.so lib/php-${PV}/modules/pspell.so

View File

@ -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 @conflict php5-shmop->=5.2
@pkgpath www/php5/extensions,-shmop @pkgpath www/php5/extensions,-shmop
lib/php-${PV}/modules/shmop.so lib/php-${PV}/modules/shmop.so

View File

@ -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 @conflict php5-snmp->=5.2
@pkgpath www/php5/extensions,-snmp @pkgpath www/php5/extensions,-snmp
lib/php-${PV}/modules/snmp.so lib/php-${PV}/modules/snmp.so

View File

@ -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 @conflict php5-soap->=5.2
@pkgpath www/php5/extensions,-soap @pkgpath www/php5/extensions,-soap
lib/php-${PV}/modules/soap.so lib/php-${PV}/modules/soap.so

View File

@ -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 @conflict php5-sqlite->=5.2
@pkgpath www/php5/extensions,-sqlite @pkgpath www/php5/extensions,-sqlite
lib/php-${PV}/modules/sqlite.so lib/php-${PV}/modules/sqlite.so

View File

@ -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 @conflict php5-sybase_ct->=5.2
@pkgpath www/php5/extensions,-sybase_ct @pkgpath www/php5/extensions,-sybase_ct
lib/php-${PV}/modules/sybase_ct.so lib/php-${PV}/modules/sybase_ct.so

View File

@ -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 @conflict php5-tidy->=5.2
@pkgpath www/php5/extensions,-tidy @pkgpath www/php5/extensions,-tidy
lib/php-${PV}/modules/tidy.so lib/php-${PV}/modules/tidy.so

View File

@ -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 @conflict php5-xmlrpc->=5.2
@pkgpath www/php5/extensions,-xmlrpc @pkgpath www/php5/extensions,-xmlrpc
lib/php-${PV}/modules/xmlrpc.so lib/php-${PV}/modules/xmlrpc.so

View File

@ -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 @conflict php5-xsl->=5.2
@pkgpath www/php5/extensions,-xsl @pkgpath www/php5/extensions,-xsl
lib/php-${PV}/modules/xsl.so lib/php-${PV}/modules/xsl.so

View File

@ -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 PV= 5.3
V= ${PV}.9 V= ${PV}.9
SUHOSIN_PHPV= ${V} SUHOSIN_PHPV= ${V}
SUHOSIN_P_V= 0.9.10 SUHOSIN_P_V= 0.9.10
REVISION= 0
REVISION-main= 1 REVISION-main= 1
REVISION-fastcgi= 1 REVISION-fastcgi= 2
REVISION-fpm= 0 REVISION-fpm= 1
INI_TEMPLATES= development production INI_TEMPLATES= development production

View File

@ -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 @conflict php5-bz2->=5.2
lib/php-${PV}/modules/bz2.so lib/php-${PV}/modules/bz2.so
share/examples/php-${PV}/bz2.ini share/examples/php-${PV}/bz2.ini

View File

@ -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 @conflict php5-curl->=5.2
lib/php-${PV}/modules/curl.so lib/php-${PV}/modules/curl.so
share/examples/php-${PV}/curl.ini share/examples/php-${PV}/curl.ini

View File

@ -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 @conflict php5-dba->=5.2
lib/php-${PV}/modules/dba.so lib/php-${PV}/modules/dba.so
share/examples/php-${PV}/dba.ini share/examples/php-${PV}/dba.ini

View File

@ -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} @bin bin/php-fastcgi-${PV}

View File

@ -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 @man man/man8/php-fpm-${PV}.8
@bin sbin/php-fpm-${PV} @bin sbin/php-fpm-${PV}
share/examples/php-${PV}/php-fpm.conf share/examples/php-${PV}/php-fpm.conf

View File

@ -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 @conflict php5-gd->=5.2
lib/php-${PV}/modules/gd.so lib/php-${PV}/modules/gd.so
share/examples/php-${PV}/gd.ini share/examples/php-${PV}/gd.ini

View File

@ -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 @conflict php5-gmp->=5.2
lib/php-${PV}/modules/gmp.so lib/php-${PV}/modules/gmp.so
share/examples/php-${PV}/gmp.ini share/examples/php-${PV}/gmp.ini

View File

@ -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 @conflict php5-imap->=5.2
lib/php-${PV}/modules/imap.so lib/php-${PV}/modules/imap.so
share/examples/php-${PV}/imap.ini share/examples/php-${PV}/imap.ini

View File

@ -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 @conflict php5-ldap->=5.2
lib/php-${PV}/modules/ldap.so lib/php-${PV}/modules/ldap.so
share/examples/php-${PV}/ldap.ini share/examples/php-${PV}/ldap.ini

View File

@ -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 @conflict php5-mcrypt->=5.2
lib/php-${PV}/modules/mcrypt.so lib/php-${PV}/modules/mcrypt.so
share/examples/php-${PV}/mcrypt.ini share/examples/php-${PV}/mcrypt.ini

View File

@ -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 @conflict php5-mssql->=5.2
lib/php-${PV}/modules/mssql.so lib/php-${PV}/modules/mssql.so
share/examples/php-${PV}/mssql.ini share/examples/php-${PV}/mssql.ini

View File

@ -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 @conflict php5-mysql->=5.2
lib/php-${PV}/modules/mysql.so lib/php-${PV}/modules/mysql.so
share/examples/php-${PV}/mysql.ini share/examples/php-${PV}/mysql.ini

View File

@ -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 @conflict php5-mysqli->=5.2
lib/php-${PV}/modules/mysqli.so lib/php-${PV}/modules/mysqli.so
share/examples/php-${PV}/mysqli.ini share/examples/php-${PV}/mysqli.ini

View File

@ -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 @conflict php5-odbc->=5.2
lib/php-${PV}/modules/odbc.so lib/php-${PV}/modules/odbc.so
share/examples/php-${PV}/odbc.ini share/examples/php-${PV}/odbc.ini

View File

@ -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 php5-pcntl->=5.2
@conflict pecl-pctnl-* @conflict pecl-pcntl-*
@pkgpath www/pecl-pcntl @pkgpath www/pecl-pcntl
lib/php-${PV}/modules/pcntl.so lib/php-${PV}/modules/pcntl.so
share/examples/php-${PV}/pcntl.ini share/examples/php-${PV}/pcntl.ini

View File

@ -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 @conflict php5-pdo_dblib->=5.2
lib/php-${PV}/modules/pdo_dblib.so lib/php-${PV}/modules/pdo_dblib.so
share/examples/php-${PV}/pdo_dblib.ini share/examples/php-${PV}/pdo_dblib.ini

View File

@ -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 @conflict php5-pdo_mysql->=5.2
lib/php-${PV}/modules/pdo_mysql.so lib/php-${PV}/modules/pdo_mysql.so
share/examples/php-${PV}/pdo_mysql.ini share/examples/php-${PV}/pdo_mysql.ini

View File

@ -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 @conflict php5-pdo_pgsql->=5.2
lib/php-${PV}/modules/pdo_pgsql.so lib/php-${PV}/modules/pdo_pgsql.so
share/examples/php-${PV}/pdo_pgsql.ini share/examples/php-${PV}/pdo_pgsql.ini

View File

@ -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 @conflict php5-pdo_sqlite->=5.2
lib/php-${PV}/modules/pdo_sqlite.so lib/php-${PV}/modules/pdo_sqlite.so
share/examples/php-${PV}/pdo_sqlite.ini share/examples/php-${PV}/pdo_sqlite.ini

View File

@ -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 @conflict php5-pgsql->=5.2
lib/php-${PV}/modules/pgsql.so lib/php-${PV}/modules/pgsql.so
share/examples/php-${PV}/pgsql.ini share/examples/php-${PV}/pgsql.ini

View File

@ -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 @conflict php5-pspell->=5.2
lib/php-${PV}/modules/pspell.so lib/php-${PV}/modules/pspell.so
share/examples/php-${PV}/pspell.ini share/examples/php-${PV}/pspell.ini

View File

@ -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 @conflict php5-shmop->=5.2
lib/php-${PV}/modules/shmop.so lib/php-${PV}/modules/shmop.so
share/examples/php-${PV}/shmop.ini share/examples/php-${PV}/shmop.ini

View File

@ -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 @conflict php5-snmp->=5.2
lib/php-${PV}/modules/snmp.so lib/php-${PV}/modules/snmp.so
share/examples/php-${PV}/snmp.ini share/examples/php-${PV}/snmp.ini

View File

@ -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 @conflict php5-soap->=5.2
lib/php-${PV}/modules/soap.so lib/php-${PV}/modules/soap.so
share/examples/php-${PV}/soap.ini share/examples/php-${PV}/soap.ini

View File

@ -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 @conflict php5-sqlite->=5.2
lib/php-${PV}/modules/sqlite.so lib/php-${PV}/modules/sqlite.so
share/examples/php-${PV}/sqlite.ini share/examples/php-${PV}/sqlite.ini

View File

@ -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 @conflict php5-tidy->=5.2
lib/php-${PV}/modules/tidy.so lib/php-${PV}/modules/tidy.so
share/examples/php-${PV}/tidy.ini share/examples/php-${PV}/tidy.ini

View File

@ -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 @conflict php5-xmlrpc->=5.2
lib/php-${PV}/modules/xmlrpc.so lib/php-${PV}/modules/xmlrpc.so
share/examples/php-${PV}/xmlrpc.ini share/examples/php-${PV}/xmlrpc.ini

View File

@ -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 @conflict php5-xsl->=5.2
lib/php-${PV}/modules/xsl.so lib/php-${PV}/modules/xsl.so
share/examples/php-${PV}/xsl.ini share/examples/php-${PV}/xsl.ini