o Update to 5.0.0a3 snapshot.

o Un-break port.
o A lot of fixes, taken from recent commits to php4 port.

PR:		ports/58617
Submitted by:	Alex Dupre <sysadmin@alexdupre.com> (maintainer)

6 files changed, 100 insertions, 96 deletions

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 85cf13d56727..5b7c6359d7eb 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -20,18 +20,18 @@
 #
 
 PORTNAME=	php5
-PORTVERSION=	5.0.0.a2
+PORTVERSION=	5.0.0.a3
 CATEGORIES?=	lang devel www
-MASTER_SITES=	http://www.php.net/distributions/ \
-		http://it.php.net/distributions/ \
-		http://fi.php.net/distributions/ \
-		http://de.php.net/distributions/ \
-		http://gr.php.net/distributions/ \
-		http://fr.php.net/distributions/ \
-		http://es.php.net/distributions/ \
-		http://se.php.net/distributions/ \
-		http://www.sm.FreeBSD.org/~alex/ \
-		http://downloads.php.net/jani/
+MASTER_SITES=	http://www.php.net/distributions/:release \
+		http://it.php.net/distributions/:release \
+		http://fi.php.net/distributions/:release \
+		http://de.php.net/distributions/:release \
+		http://gr.php.net/distributions/:release \
+		http://fr.php.net/distributions/:release \
+		http://es.php.net/distributions/:release \
+		http://se.php.net/distributions/:release \
+		http://www.sm.FreeBSD.org/~alex/:rc \
+		http://downloads.php.net/jani/:rc
 .if defined(WITHOUT_CLI) && !defined(WITHOUT_APACHE)
 PKGNAMEPREFIX=	mod_
 .else
@@ -44,6 +44,7 @@ PKGNAMESUFFIX=	-cli
 .endif
 .endif
 DISTNAME=	php-${PORTVERSION:S/.a/a/}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:rc
 
 MAINTAINER?=	sysadmin@alexdupre.com
 COMMENT=	PHP Scripting Language (Apache Module and CLI)
@@ -59,13 +60,10 @@ COMMENT=	PHP Apache Module
 .endif
 .endif
 
-BROKEN=		Does not compile
-
 USE_BZIP2=	yes
 USE_SUBMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_BISON=	yes
-USE_LIBTOOL_VER=14
 
 CONFIGURE_ARGS=	--enable-versioning \
 		--enable-memory-limit \
@@ -126,8 +124,8 @@ SAPI_FILE=	"bin/php"
 
 ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DB4 DBASE DBX DOM \
 		EXIF FILEPRO FTP GD GDBM GETTEXT GMP ICONV IMAP INTERBASE \
-		INIFILE MBSTRING MCAL MCVE MCRYPT MHASH MIME MING MYSQL \
-		NCURSES OPENLDAP OPENSSL ORACLE PCNTL PCRE PDFLIB POSIX \
+		INIFILE MBSTRING MCAL MCVE MCRYPT MHASH MIME MING MNOGOSEARCH \
+		MYSQL NCURSES OPENLDAP OPENSSL ORACLE PCNTL PCRE PDFLIB POSIX \
 		POSTGRESQL PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP \
 		SOCKETS SQLITE SYBASEDB SYBASECT SYSVSEM SYSVSHM TOKENIZER \
 		UNIXODBC WDDX XML XMLRPC XSL YAZ YP ZLIB
@@ -142,40 +140,6 @@ BATCH=		yes
 IS_INTERACTIVE=	yes
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=--disable-ipv6
-.endif
-
-.if !defined(WITHOUT_APACHE)
-.if exists(${LOCALBASE}/include/apache2/apr.h)
-WITH_APACHE2=	yes
-.endif
-
-APXS?=		${LOCALBASE}/sbin/apxs
-
-.if defined(WITH_APACHE2)
-APACHE_PORT?=	${PORTSDIR}/www/apache2
-CONFIGURE_ARGS+=--with-apxs2=${APXS}
-SAPI_FILE=	libexec/apache2/libphp5.so
-.else
-APACHE_PORT?=	${PORTSDIR}/www/apache13
-CONFIGURE_ARGS+=--with-apxs=${APXS}
-SAPI_FILE=	libexec/apache/libphp5.so
-.endif
-
-BUILD_DEPENDS+=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS+=	${APXS}:${APACHE_PORT}
-
-PLIST_SUB+=	APACHE=""
-.else
-PLIST_SUB+=	APACHE="@comment "
-.endif
-
-PLIST_SUB+=	SAPI_FILE=${SAPI_FILE} \
-		EXT_DIR=${EXT_DIR}
-
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 PHP5_OPTFILE?=	${HOME}/php5_options
 
@@ -189,6 +153,9 @@ SEL_OPTIONS+=	${opt}
 .for opt in ${PHP5_OPTIONS}
 .if !defined(WITHOUT_${opt})
 SEL_OPTIONS+=	${opt}
+.if !exists(${WRKDIR}/Makefile.inc)
+WITH_${opt}=	yes
+.endif
 .endif
 SCRIPTS_ENV+=	WITH_${opt}=ON
 .endfor
@@ -199,10 +166,6 @@ SCRIPTS_ENV+=	SEL_OPTIONS="${SEL_OPTIONS}" \
 		CAT="${CAT}" \
 		SED="${SED}"
 
-.ifmake describe
-WITH_XML=	yes
-.endif
-
 .if exists(${WRKDIR}/Makefile.inc)
 .include "${WRKDIR}/Makefile.inc"
 .endif
@@ -337,30 +300,13 @@ CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 
 .if defined(WITH_ICONV) || defined(WITH_ICONV_DEP)
 LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
+CONFIGURE_ARGS+=--with-iconv-dir=${LOCALBASE}
 .endif
 
 .if defined(WITH_ICONV)
 CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
 .endif
 
-.if defined(WITH_IMAP)
-LIB_DEPENDS+=	c-client4.8:${PORTSDIR}/mail/cclient
-.if !exists(${LOCALBASE}/lib/libc-client4.so)
-.if !defined(WITHOUT_SSL)
-CONFIGURE_ARGS+=--with-imap=${LOCALBASE} --with-imap-ssl=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--with-imap=${LOCALBASE}
-.endif
-.else
-WITH_IMAP_SSL!=/usr/bin/ldd ${LOCALBASE}/lib/libc-client4.so | ${GREP} libssl || ${TRUE}
-.if !empty(WITH_IMAP_SSL)
-CONFIGURE_ARGS+=--with-imap=${LOCALBASE} --with-imap-ssl=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--with-imap=${LOCALBASE}
-.endif
-.endif
-.endif
-
 .if defined(WITH_INIFILE)
 CONFIGURE_ARGS+=--with-inifile
 .endif
@@ -386,6 +332,7 @@ CONFIGURE_ARGS+=--with-mcve=${LOCALBASE}
 
 .if defined(WITH_MCRYPT)
 LIB_DEPENDS+=	mcrypt.8:${PORTSDIR}/security/libmcrypt
+LIB_DEPENDS+=	ltdl.4:${PORTSDIR}/devel/libltdl
 CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
 .endif
 
@@ -403,28 +350,25 @@ LIB_DEPENDS+=	ming.3:${PORTSDIR}/graphics/ming
 CONFIGURE_ARGS+=--with-ming=${LOCALBASE}
 .endif
 
+.if defined(WITH_MNOGOSEARCH)
+LIB_DEPENDS+=	udmsearch.1:${PORTSDIR}/www/mnogosearch
+CONFIGURE_ARGS+=--with-mnogosearch=${LOCALBASE}
+.endif
+
 .if defined(WITH_MYSQL)
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=--with-mysql=${LOCALBASE}
 .endif
 
-.if defined(WITH_NCURSES)
-.if ${OSVERSION} < 400000
-NCURSESBASE=	${LOCALBASE}
-LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
-.else
-NCURSESBASE=	/usr
-.endif
-CONFIGURE_ARGS+=--with-ncurses=${NCURSESBASE}
-.endif
-
 .if defined(WITH_OPENLDAP)
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 .endif
 
 .if defined(WITH_OPENSSL) || defined(WITH_OPENSSL_DEP)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL=	yes
+LDFLAGS+=	-lcrypto -lssl
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--with-openssl-dir=${OPENSSLBASE}
 .endif
 
@@ -486,15 +430,6 @@ CONFIGURE_ARGS+=--enable-shmop
 CONFIGURE_ARGS+=--enable-simplexml
 .endif
 
-.if defined(WITH_SNMP)
-.if exists(${LOCALBASE}/lib/libsnmp.so.4)
-LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net/net-snmp4
-.else
-LIB_DEPENDS+=	netsnmp.5:${PORTSDIR}/net/net-snmp
-.endif
-CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} --enable-ucd-snmp-hack
-.endif
-
 .if defined(WITH_SOCKETS)
 CONFIGURE_ARGS+=--enable-sockets
 .endif
@@ -536,7 +471,7 @@ CONFIGURE_ARGS+=--enable-wddx
 
 .if defined(WITH_XML) || defined(WITH_XML_DEP)
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
-CONFIGURE_ARGS+=--with-libxml-dir=${LOCALBASE}
+CONFIGURE_ARGS+=--enable-libxml --with-libxml-dir=${LOCALBASE}
 .endif
 
 .if defined(WITH_XML)
@@ -545,7 +480,7 @@ CONFIGURE_ARGS+=--enable-xml
 
 .if defined(WITH_XMLRPC)
 LIB_DEPENDS+=	expat.4:${PORTSDIR}/textproc/expat2
-CONFIGURE_ARGS+=--with-xmlrpc --with-expat-dir=${LOCALBASE} --with-iconv-dir=${LOCALBASE}
+CONFIGURE_ARGS+=--with-xmlrpc --with-expat-dir=${LOCALBASE}
 .endif
 
 .if defined(WITH_XSL)
@@ -570,6 +505,70 @@ CONFIGURE_ARGS+=--with-zlib-dir=/usr
 CONFIGURE_ARGS+=--with-zlib
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_APACHE)
+APXS?=		${LOCALBASE}/sbin/apxs
+.if exists(${LOCALBASE}/include/apache2/apr.h)
+WITH_APACHE2=	yes
+.endif
+.if defined(WITH_APACHE2)
+APACHE_PORT?=	${PORTSDIR}/www/apache2
+CONFIGURE_ARGS+=--with-apxs2=${APXS}
+SAPI_FILE=	libexec/apache2/libphp5.so
+.else
+APACHE_PORT?=	${PORTSDIR}/www/apache13
+CONFIGURE_ARGS+=--with-apxs=${APXS}
+SAPI_FILE=	libexec/apache/libphp5.so
+.endif
+BUILD_DEPENDS+=	${APXS}:${APACHE_PORT}
+RUN_DEPENDS+=	${APXS}:${APACHE_PORT}
+.endif
+
+PLIST_SUB+=	SAPI_FILE=${SAPI_FILE} \
+		EXT_DIR=${EXT_DIR}
+
+.if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6)
+CONFIGURE_ARGS+=--disable-ipv6
+.endif
+
+.if defined(WITH_IMAP)
+LIB_DEPENDS+=	c-client4.8:${PORTSDIR}/mail/cclient
+.if !exists(${LOCALBASE}/lib/libc-client4.so)
+.if !defined(WITHOUT_SSL)
+CONFIGURE_ARGS+=--with-imap=${LOCALBASE} --with-imap-ssl=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=--with-imap=${LOCALBASE}
+.endif
+.else
+WITH_IMAP_SSL!=	/usr/bin/ldd ${LOCALBASE}/lib/libc-client4.so | ${GREP} libssl || ${TRUE}
+.if !empty(WITH_IMAP_SSL)
+CONFIGURE_ARGS+=--with-imap=${LOCALBASE} --with-imap-ssl=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=--with-imap=${LOCALBASE}
+.endif
+.endif
+.endif
+
+.if defined(WITH_NCURSES)
+.if ${OSVERSION} < 400000
+NCURSESBASE=	${LOCALBASE}
+LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
+.else
+NCURSESBASE=	/usr
+.endif
+CONFIGURE_ARGS+=--with-ncurses=${NCURSESBASE}
+.endif
+
+.if defined(WITH_SNMP)
+.if exists(${LOCALBASE}/lib/libsnmp.so.4)
+LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net/net-snmp4
+.else
+LIB_DEPENDS+=	netsnmp.5:${PORTSDIR}/net/net-snmp
+.endif
+CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} --enable-ucd-snmp-hack
+.endif
+
 pre-patch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php
 
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index ca5170a04ba2..7922960fde10 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1 +1 @@
-MD5 (php-5.0.0a2.tar.bz2) = d6bba61fad4be66fb0a79791fee5cff4
+MD5 (php-5.0.0a3.tar.bz2) = f83cc6b735ccf312045d9178d107874f
diff --git a/lang/php5/files/patch-configure b/lang/php5/files/patch-configure
index 2a27455af5db..51e707bd90a5 100644
--- a/lang/php5/files/patch-configure
+++ b/lang/php5/files/patch-configure
@@ -228,7 +228,7 @@
 @@ -57066,8 +57240,8 @@
    
    echo $ac_n "checking Oracle version""... $ac_c" 1>&6
- echo "configure:58744: checking Oracle version" >&5
+ echo "configure:59505: checking Oracle version" >&5
 -  if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
 -  	ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/  */:/g' | cut -d: -f 6 | cut -c 2-4`
 +  if test -s "$ORACLE_DIR/ocommon/install/partial.prd"; then
diff --git a/lang/php5/pkg-plist b/lang/php5/pkg-plist
index c995849b2e32..55b68d7d6a2a 100644
--- a/lang/php5/pkg-plist
+++ b/lang/php5/pkg-plist
@@ -41,7 +41,9 @@ include/php/Zend/zend_indent.h
 include/php/Zend/zend_ini.h
 include/php/Zend/zend_ini_parser.h
 include/php/Zend/zend_ini_scanner.h
+include/php/Zend/zend_interfaces.h
 include/php/Zend/zend_istdiostream.h
+include/php/Zend/zend_iterators.h
 include/php/Zend/zend_language_parser.h
 include/php/Zend/zend_language_scanner.h
 include/php/Zend/zend_list.h
@@ -123,6 +125,7 @@ include/php/ext/standard/php_standard.h
 include/php/ext/standard/php_string.h
 include/php/ext/standard/php_sunfuncs.h
 include/php/ext/standard/php_type.h
+include/php/ext/standard/php_uuencode.h
 include/php/ext/standard/php_var.h
 include/php/ext/standard/php_versioning.h
 include/php/ext/standard/proc_open.h
diff --git a/lang/php5/scripts/configure.php b/lang/php5/scripts/configure.php
index a71c2c46392f..ac8ae69106f1 100644
--- a/lang/php5/scripts/configure.php
+++ b/lang/php5/scripts/configure.php
@@ -47,6 +47,7 @@ MCRYPT		"Encryption support" ${WITH_MCRYPT:-OFF} \
 MHASH		"Crypto-hashing support" ${WITH_MHASH:-OFF} \
 MIME		"mime_magic support" ${WITH_MIME:-OFF} \
 MING		"ming shockwave flash support" ${WITH_MING:-OFF} \
+MNOGOSEARCH	"mnoGoSearch support" ${WITH_MNOGOSEARCH:-OFF} \
 MYSQL		"MySQL database support" ${WITH_MYSQL:-OFF} \
 NCURSES		"ncurses support (CLI only)" ${WITH_NCURSES:-OFF} \
 OPENLDAP	"OpenLDAP support" ${WITH_OPENLDAP:-OFF} \
diff --git a/lang/php5/scripts/php5_options b/lang/php5/scripts/php5_options
index fdcc40d3a137..2558d9436f7e 100644
--- a/lang/php5/scripts/php5_options
+++ b/lang/php5/scripts/php5_options
@@ -27,6 +27,7 @@ WITH_MCRYPT=OFF
 WITH_MHASH=OFF
 WITH_MIME=OFF
 WITH_MING=OFF
+WITH_MNOGOSEARCH=OFF
 WITH_MYSQL=OFF
 WITH_NCURSES=OFF
 WITH_OPENLDAP=OFF