[Midnightbsd-cvs] mports: lang/php5: Build bundled pcre with php now.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Build bundled pcre with php now.  This fixes several problems.

Modified Files:
--------------
    mports/lang/php5:
        Makefile (r1.22 -> r1.23)
        Makefile.ext (r1.11 -> r1.12)
        pkg-plist (r1.3 -> r1.4)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/lang/php5/pkg-plist,v
retrieving revision 1.3
retrieving revision 1.4
diff -L lang/php5/pkg-plist -L lang/php5/pkg-plist -u -r1.3 -r1.4
--- lang/php5/pkg-plist
+++ lang/php5/pkg-plist
@@ -72,6 +72,13 @@
 include/php/ext/date/lib/timelib_structs.h
 include/php/ext/date/php_date.h
 include/php/ext/libxml/php_libxml.h
+include/php/ext/pcre/pcrelib/config.h
+include/php/ext/pcre/pcrelib/pcre.h
+include/php/ext/pcre/pcrelib/pcre_internal.h
+include/php/ext/pcre/pcrelib/pcreposix.h
+include/php/ext/pcre/pcrelib/ucp.h
+include/php/ext/pcre/pcrelib/ucptable.h
+include/php/ext/pcre/php_pcre.h
 include/php/ext/standard/base64.h
 include/php/ext/standard/basic_functions.h
 include/php/ext/standard/crc32.h
@@ -199,6 +206,8 @@
 @dirrm include/php/ext/date/lib
 @dirrm include/php/ext/date
 @dirrm include/php/ext/libxml
+ at dirrm include/php/ext/pcre/pcrelib
+ at dirrm include/php/ext/pcre
 @dirrm include/php/ext/standard
 @dirrmtry include/php/ext
 @dirrm include/php/main/streams
Index: Makefile.ext
===================================================================
RCS file: /home/cvs/mports/lang/php5/Makefile.ext,v
retrieving revision 1.11
retrieving revision 1.12
diff -L lang/php5/Makefile.ext -L lang/php5/Makefile.ext -u -r1.11 -r1.12
--- lang/php5/Makefile.ext
+++ lang/php5/Makefile.ext
@@ -245,12 +245,6 @@
 CONFIGURE_ARGS+=--enable-pcntl
 .endif
 
-.if ${PHP_MODNAME} == "pcre"
-CONFIGURE_ARGS+=--with-pcre-regex=yes
-
-PHP_HEADER_DIRS=pcrelib
-.endif
-
 .if ${PHP_MODNAME} == "pdo"
 CONFIGURE_ARGS+=--enable-pdo
 .endif
@@ -393,7 +387,7 @@
 
 USE_GNOME=	libxml2
 
-USE_PHP=	pcre simplexml
+USE_PHP=	simplexml
 USE_PHP_BUILD=	yes
 .endif
 
@@ -589,11 +583,6 @@
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
 .endif
 
-.if ${PHP_MODNAME} == "pcre"
-post-extract:
-	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
-.endif
-
 .if ${PHP_MODNAME} == "oci8" || ${PHP_MODNAME} == "pdo_oci"
 pre-configure:
 	@cd ${WRKSRC}; \
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/lang/php5/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -L lang/php5/Makefile -L lang/php5/Makefile -u -r1.22 -r1.23
--- lang/php5/Makefile
+++ lang/php5/Makefile
@@ -25,13 +25,15 @@
 .if !defined(PKGNAMESUFFIX)
 USE_AUTOTOOLS=	autoconf:262
 
-CONFIGURE_ARGS=	--enable-versioning \
+CONFIGURE_ARGS=	\
+		--enable-versioning \
 		--enable-memory-limit \
 		--with-layout=GNU \
 		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--disable-all \
 		--enable-libxml \
 		--with-libxml-dir=${LOCALBASE} \
+		--with-pcre-regex=yes \
 		--enable-reflection \
 		--program-prefix=""
 
@@ -161,6 +163,10 @@
 	@${ECHO_CMD} "PHP_VER=5" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
+	@${ECHO_CMD} "PHP_EXT_INC=pcre" >> ${WRKDIR}/php.conf
+
+test: build
+	@(cd ${WRKSRC} && ${MAKE} test)
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc