We don't currently build apache2 PHP modules in bulk builds,
giovanni@ was asking about enabling this, I pointed out that the
various modules (and fpm/fastcgi) also get built again as
flavoured subpackages which seems wrong.

Wondering if anyone has comments on doing this...

Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/lang/php/Makefile.inc,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile.inc
--- Makefile.inc        23 Aug 2012 19:19:17 -0000      1.32
+++ Makefile.inc        25 Sep 2012 20:17:01 -0000
@@ -346,6 +346,9 @@ DESCR-${i}=         ${.CURDIR}/../files/DESCR-$
 MESSAGE-${i}=          ${.CURDIR}/../files/MESSAGE-ext
 UNMESSAGE-${i}=                ${.CURDIR}/../files/UNMESSAGE-ext
 PKGNAME-${i}=          php-${i}-${V}
+# don't build separate plugins for -ap2
+FULLPKGNAME-${i}=      php-${i}-${V}${FLAVOR_EXT:S/-ap2//}
+FULLPKGPATH-${i}=      ${PKGPATH},-${i}${FLAVOR_EXT:S/-ap2//:S/-/,/g}
 .if ${V:M5.2*}
 PKGSPEC-${i}=          php-${i}->=5.2,<5.3
 .else if ${V:M5.3*}
Index: 5.2/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/5.2/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- 5.2/Makefile        23 Aug 2012 19:19:17 -0000      1.30
+++ 5.2/Makefile        25 Sep 2012 20:17:01 -0000
@@ -40,4 +40,9 @@ CONFIGURE_ARGS+=        --with-sybase-ct
 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>
Index: 5.3/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/5.3/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- 5.3/Makefile        25 Sep 2012 20:16:08 -0000      1.40
+++ 5.3/Makefile        25 Sep 2012 20:17:01 -0000
@@ -29,4 +29,9 @@ 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>

Reply via email to