do not conflict with the -fastcgi subpackage

This commit is contained in:
robert 2011-03-21 21:39:45 +00:00
parent f2ea762c7e
commit 28a8dffc1d
2 changed files with 4 additions and 7 deletions

View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.6 2011/03/21 19:50:18 jasper Exp $
# $OpenBSD: Makefile,v 1.7 2011/03/21 21:39:45 robert Exp $
PV= 5.3
V= ${PV}.5
SUHOSIN_PHPV= ${PV}.4
SUHOSIN_P_V= 0.9.10
REVISION-main= 1
REVISION-fastcgi= 0
REVISION-main= 2
REVISION-fastcgi= 1
INI_TEMPLATES= development production

View File

@ -1,13 +1,10 @@
@comment $OpenBSD: PLIST-main,v 1.3 2011/01/05 09:31:23 robert Exp $
@comment $OpenBSD: PLIST-main,v 1.4 2011/03/21 21:39:45 robert Exp $
@option no-default-conflict
@conflict php->=5.3,<5.4
@conflict php-fastcgi->=5.3,<5.4
@conflict php5-core->=5.2
@conflict php5-core-fastcgi->=5.2
@pkgpath lang/php/5.3
@pkgpath lang/php/5.3,-fastcgi
@pkgpath www/php5/core
@pkgpath www/php5/core,-fastcgi
@pkgpath www/php5/extensions,-mbstring
%%SHARED%%
@comment @exec install -d ${PHP_CONFIG_PATH}/php-${PV}/