cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no-conflict is a lie, the rcscripts conflict.

Browse Source 
I'll let robert@ figure out whether he wants to version the scripts
or what...
This commit is contained in:
espie 2013-10-12 10:44:22 +00:00
parent 66d151e569
commit a9b904eb4c
6 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/php/5.3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.65 2013/08/23 10:06:45 sthen Exp $
# $OpenBSD: Makefile,v 1.66 2013/10/12 10:44:22 espie Exp $
BROKEN-hppa = no __sync_bool_compare_and_swap support nor asm fallback
@ -13,7 +13,7 @@ SUHOSIN_P_V= 0.9.10unofficial
REVISION= 0
REVISION-main= 2
REVISION-fastcgi= 2
REVISION-fpm= 2
REVISION-fpm= 3
REVISION-tidy= 1
INI_TEMPLATES= development production

4
lang/php/5.3/pkg/PLIST-fpm
View File

@ -1,6 +1,4 @@
@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
@comment $OpenBSD: PLIST-fpm,v 1.3 2013/10/12 10:44:23 espie Exp $
@man man/man8/php-fpm-${PV}.8
@bin sbin/php-fpm-${PV}
share/examples/php-${PV}/php-fpm.conf

3
lang/php/5.4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2013/09/20 20:20:10 sthen Exp $
# $OpenBSD: Makefile,v 1.12 2013/10/12 10:44:23 espie Exp $
BROKEN-hppa = no __sync_bool_compare_and_swap support nor asm fallback
@ -10,6 +10,7 @@ AUTOCONF_VERSION= 2.65
PV= 5.4
V= ${PV}.20
REVISION-fpm = 0
INI_TEMPLATES= development production

4
lang/php/5.4/pkg/PLIST-fpm
View File

@ -1,6 +1,4 @@
@comment $OpenBSD: PLIST-fpm,v 1.2 2013/08/08 19:11:57 robert Exp $
@option no-default-conflict
@conflict php-fpm->=5.4,<5.5
@comment $OpenBSD: PLIST-fpm,v 1.3 2013/10/12 10:44:23 espie Exp $
@man man/man8/php-fpm-${PV}.8
@bin sbin/php-fpm-${PV}
share/examples/php-${PV}/php-fpm.conf

3
lang/php/5.5/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2013/09/20 20:20:28 sthen Exp $
# $OpenBSD: Makefile,v 1.7 2013/10/12 10:44:23 espie Exp $
BROKEN-hppa = no __sync_bool_compare_and_swap support nor asm fallback
@ -27,6 +27,7 @@ LIB_DEPENDS-fpm= ${LIB_DEPENDS-main}
WANTLIB-fpm= ${WANTLIB-main}
RUN_DEPENDS-fpm= ${RUN_DEPENDS-main} \
php-${V}:lang/php/${PV}
REVISION-fpm= 0
# pcntl
PKGNAME-pcntl?= php-pcntl-${V}

4
lang/php/5.5/pkg/PLIST-fpm
View File

@ -1,6 +1,4 @@
@comment $OpenBSD: PLIST-fpm,v 1.2 2013/08/08 19:11:43 robert Exp $
@option no-default-conflict
@conflict php-fpm->=5.5,<5.6
@comment $OpenBSD: PLIST-fpm,v 1.3 2013/10/12 10:44:24 espie Exp $
@man man/man8/php-fpm-${PV}.8
@bin sbin/php-fpm-${PV}
share/examples/php-${PV}/php-fpm.conf