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

For the ap2 flavour, strip the unwanted subpackages from MULTI_PACKAGES rather

Browse Source 
than BUILD_PACKAGES (which is for pseudo-flavours). Reported by naddy.
This commit is contained in:
sthen 2012-11-30 12:56:02 +00:00
parent a8d644cf9e
commit 87bb29524a
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lang/php/5.2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.32 2012/11/28 10:47:12 sthen Exp $
# $OpenBSD: Makefile,v 1.33 2012/11/30 12:56:02 sthen Exp $
# doesn't set USE_LIBTOOL but use the bundled one because it needs some
# specific options we don't have.
@ -41,9 +41,4 @@ CONFIGURE_ARGS+= --with-sybase-ct=shared,${LOCALBASE}
LIB_DEPENDS-sybase_ct= databases/freetds
WANTLIB-sybase_ct= c ct pthread
.include <bsd.port.arch.mk>
.if ${FLAVOR:L:Map2}
BUILD_PACKAGES := ${BUILD_PACKAGES:N-fastcgi}
.endif
.include <bsd.port.mk>

7
lang/php/5.3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.43 2012/11/28 10:47:12 sthen Exp $
# $OpenBSD: Makefile,v 1.44 2012/11/30 12:56:02 sthen Exp $
BROKEN-hppa = no __sync_bool_compare_and_swap support nor asm fallback
@ -29,9 +29,4 @@ CONFIGURE_ARGS+= --enable-pcntl=shared
LIB_DEPENDS-pcntl=
WANTLIB-pcntl= c pthread
.include <bsd.port.arch.mk>
.if ${FLAVOR:L:Map2}
BUILD_PACKAGES := ${BUILD_PACKAGES:N-fpm:N-fastcgi}
.endif
.include <bsd.port.mk>

6
lang/php/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.34 2012/11/28 10:47:12 sthen Exp $
# $OpenBSD: Makefile.inc,v 1.35 2012/11/30 12:56:02 sthen Exp $
# This port currently only works with archs supporting dynamic loading
# and has Apache that supports DSO's.
@ -341,6 +341,10 @@ pre-configure:
${WRKSRC}/scripts/phpize.in \
${WRKSRC}/scripts/php-config.in
.if ${FLAVOR:L:Map2}
MULTI_PACKAGES := ${MULTI_PACKAGES:N-fpm:N-fastcgi}
.endif
.for i in ${MULTI_PACKAGES:N-main:N-fastcgi:N-fpm:N-pcntl:S/-//g}
MODULE_NAME-${i}= ${i}
DESCR-${i}= ${.CURDIR}/../files/DESCR-${i}