? apache2.patch
? core/w-php-5.1.6-apache2
? core/w-php-5.1.6-apache2-no_x11
? extensions/apache2.patch
? extensions/w-php-5.1.6
? extensions/w-php-5.1.6-apache2
? extensions/w-php-5.1.6-apache2-no_x11
? extensions/w-php-5.1.6-apache2-no_x11-no_odbc
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/www/php5/Makefile.inc,v
retrieving revision 1.13
diff -u -r1.13 Makefile.inc
--- Makefile.inc	2006/10/24 09:30:25	1.13
+++ Makefile.inc	2007/05/30 12:40:10
@@ -20,6 +20,9 @@
 MASTER_SITES0=		http://anoncvs.silihost.hu/
 MASTER_SITES1=		http://www.hardened-php.net/suhosin/_media/
 
+FLAVORS= 		apache2 no_x11
+FLAVOR?=		apache2 no_x11
+
 # UPGRADERS: please read BOTH the PHP and Zend licenses
 # and make sure they are safe before an upgrade
 PERMIT_PACKAGE_CDROM=   Yes
@@ -34,11 +37,19 @@
 APACHE_MODULE_SUBDIR=	lib/php
 APACHE_MODULE_DIR=	${LOCALBASE}/${APACHE_MODULE_SUBDIR}
 
+.if ${FLAVOR:L:Mapache2}
+#override this for default values since apache2 isnt chrooted
+CHROOT_DIR?=		${LOCALBASE}
+PEAR_DIR?=		${CHROOT_DIR}/share/pear
+MODULES_SUBDIR=		lib/php/modules
+MODULES_DIR=		${CHROOT_DIR}/${MODULES_SUBDIR}
+.else
 # where the PEAR and extension modules are (inside the chroot)
 CHROOT_DIR?=		/var/www
 PEAR_DIR?=		${CHROOT_DIR}/pear
 MODULES_SUBDIR=		lib/php/modules
 MODULES_DIR=		${CHROOT_DIR}/${MODULES_SUBDIR}
+.endif
 
 .if ${USE_GCC3:L:Myes}
 PHP_LDFLAGS=		-lstdc++ -lm
Index: core/Makefile
===================================================================
RCS file: /cvs/ports/www/php5/core/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- core/Makefile	2006/11/25 11:09:04	1.19
+++ core/Makefile	2007/05/30 12:40:10
@@ -8,9 +8,9 @@
 FULLPKGNAME-pear= php5-pear-${V}p0
 DISTFILES=	php-${V}.tar.gz \
 		pear-${PEAR_V}.tar.gz:0
+FLAVOR?=	apache2
 
-CONFIGURE_ARGS+=--with-apxs=/usr/sbin/apxs \
-		--without-mysql \
+CONFIGURE_ARGS+=--without-mysql \
 		--enable-xml \
 		--enable-wddx \
 		--enable-cli \
@@ -51,7 +51,13 @@
 WANTLIB-pear=
 LIB_DEPENDS-pear=
 
+.if ${FLAVOR:L:Mapache2}
+CONFIGURE_ARGS+=--with-apxs2=/usr/local/sbin/apxs2
+.else
+CONFIGURE_ARGS+=--with-apxs=/usr/sbin/apxs 
+.endif
 
+
 pre-fake:
 	${INSTALL_DATA_DIR} ${PREFIX}/${APACHE_MODULE_SUBDIR}
 INSTALL_TARGET= install-headers install-build install-programs
@@ -59,24 +65,24 @@
 
 pre-configure:
 	@cd ${WRKDIR}/pear && ${PATCH} -p0 --quiet < patch-OpenBSD 
-	@perl -pi -e "s,OPENBSD_PEAR_ROOT,'${CHROOT_DIR}/pear',g" \
+	@perl -pi -e "s,OPENBSD_PEAR_ROOT,'${PEAR_DIR}',g" \
 		${WRKDIR}/pear/PEAR/Config.php ${WRKSRC}/scripts/phpize.in \
 		${WRKSRC}/scripts/php-config.in
 
 post-install:
 	${INSTALL_DATA} ${WRKBUILD}/.libs/libphp5.so \
 		${PREFIX}/${APACHE_MODULE_SUBDIR}
-	${INSTALL_DATA_DIR} ${WRKINST}/${CHROOT_DIR}/pear/lib
+	${INSTALL_DATA_DIR} ${WRKINST}/${PEAR_DIR}/lib
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/php5
 	${INSTALL_PROGRAM} ${WRKBUILD}/sapi/cli/php ${PREFIX}/bin
 	
 	@cd ${WRKDIR}/pear && ${PREFIX}/bin/php \
 		-n -dshort_open_tag=0 -dsafe_mode=0 -derror_reporting=E_ALL \
 		-ddetect_unicode=0 install-pear.php -b ${PREFIX}/bin \
-		-c ${WRKINST} -d ${WRKINST}${CHROOT_DIR}/pear *.tar 
+		-c ${WRKINST} -d ${WRKINST}${PEAR_DIR} *.tar 
 
 	@cp ${WRKDIR}/pear/PEAR/Config.php \
-		${WRKINST}${CHROOT_DIR}/pear/lib/PEAR/Config.php
+		${WRKINST}${PEAR_DIR}/lib/PEAR/Config.php
 	@perl -pi -e "s,${WRKINST},,g" ${PREFIX}/bin/pear \
 				${PREFIX}/bin/peardev \
 				${PREFIX}/bin/pecl \
@@ -86,7 +92,7 @@
 
 .for i in dist recommended
 	@sed -e 's,MODULES_DIR,${MODULES_DIR},' \
-	     -e 's,OPENBSD_INCLUDE_PATH,/pear/lib:${CHROOT_DIR}/pear/lib,' \
+	     -e 's,OPENBSD_INCLUDE_PATH,/pear/lib:${PEAR_DIR}/lib,' \
 		<${WRKSRC}/php.ini-${i} \
 		>${PREFIX}/share/examples/php5/php.ini-${i}
 .endfor
Index: extensions/Makefile
===================================================================
RCS file: /cvs/ports/www/php5/extensions/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- extensions/Makefile	2007/02/09 13:48:20	1.32
+++ extensions/Makefile	2007/05/30 12:40:10
@@ -1,6 +1,6 @@
 # $OpenBSD: Makefile,v 1.32 2007/02/09 13:48:20 bernd Exp $
 
-FULLPKGNAME-main=		php5-extensions-${V}p0
+FULLPKGNAME-main=	php5-extensions-${V}p0
 COMMENT-main=		"informational package about PHP5 extensions"
 
 MULTI_PACKAGES=	-main
@@ -9,7 +9,7 @@
 PREFIX?=		${CHROOT_DIR}
 
 FLAVORS=		no_x11
-FLAVOR?=
+FLAVOR?=		
 
 WANTLIB=		stdc++ m