o Add default overload extension.

o Add WITH_REGEX_TYPE knob [1].
o Small fixes.

PR:		ports/54061
Requsted by:	Jens Rehsack [1]
Submitted by:	Alex Dupre <sysadmin@alexdupre.com> (maintainer)

4 files changed, 34 insertions, 15 deletions

diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index ee2be246c65a..b3693984520d 100644
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -7,9 +7,9 @@
 # There are many ways to select which extensions you want to enable, either
 # in interactive mode or in batch mode.
 #
-# By default, the enabled extensions are: CTYPE, MYSQL, PCRE, POSIX, SESSION,
-# TOKENIZER, XML and ZLIB. This behaviour can be changed overriding the
-# PHP4_OPTIONS variable (e.g. PHP4_OPTIONS="EXT1 EXT2 EXT3").
+# By default, the enabled extensions are: CTYPE, MYSQL, OVERLOAD, PCRE, POSIX,
+# SESSION, TOKENIZER, XML and ZLIB. This behaviour can be changed overriding
+# the PHP4_OPTIONS variable (e.g. PHP4_OPTIONS="EXT1 EXT2 EXT3").
 #
 # Another way is to use the WITH_<EXT> and WITHOUT_<EXT> knobs, for additional
 # and default extensions respectively (implies batch mode).
@@ -71,6 +71,18 @@ CONFIGURE_ARGS=	--enable-versioning \
 		--with-zlib-dir=/usr \
 		--disable-all
 
+.if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php"
+CONFIGURE_ARGS+=--with-regex=php
+.else
+.if ${WITH_REGEX_TYPE} == "system"
+CONFIGURE_ARGS+=--with-regex=system
+.else
+.if ${WITH_REGEX_TYPE} == "apache"
+CONFIGURE_ARGS+=--with-regex=apache
+.endif
+.endif
+.endif
+
 EXT_DIR=	20020429
 SAPI_FILE=	"@comment "
 
@@ -107,9 +119,9 @@ SAPI_FILE=	"bin/php"
 ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DBASE DBX DOMXML \
 		DOMXSLT EXIF FILEPRO FRIBIDI FTP GD GDBM GETTEXT GMP HYPERWAVE \
 		ICONV IMAP INTERBASE INIFILE MBSTRING MCAL MCVE MCRYPT MHASH \
-		MIME MING MYSQL NCURSES OPENLDAP OPENSSL ORACLE PCNTL PCRE \
-		PDFLIB POSIX POSTGRESQL PSPELL READLINE RECODE SESSION SHMOP \
-		SNMP SOCKETS SYBASEDB SYBASECT SYSVSEM SYSVSHM TOKENIZER \
+		MIME MING MYSQL NCURSES OPENLDAP OPENSSL ORACLE OVERLOAD PCNTL \
+		PCRE PDFLIB POSIX POSTGRESQL PSPELL READLINE RECODE SESSION \
+		SHMOP SNMP SOCKETS SYBASEDB SYBASECT SYSVSEM SYSVSHM TOKENIZER \
 		UNIXODBC WDDX XML XMLRPC XSLT YAZ YP ZIP ZLIB
 
 .for opt in ${ALL_OPTIONS}
@@ -161,7 +173,7 @@ PLIST_SUB+=	SAPI_FILE=${SAPI_FILE} \
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 PHP4_OPTFILE?=	${HOME}/php4_options
 
-PHP4_OPTIONS?=	CTYPE MYSQL PCRE POSIX SESSION TOKENIZER XML ZLIB
+PHP4_OPTIONS?=	CTYPE MYSQL OVERLOAD PCRE POSIX SESSION TOKENIZER XML ZLIB
 
 .for opt in ${ALL_OPTIONS}
 .if defined(WITH_${opt})
@@ -202,18 +214,18 @@ WITH_DOMXML=	yes
 WITH_ICONV_DEP=	yes
 .endif
 
-.if defined(WITH_POSTGRESQL)
-WITH_OPENSSL_DEP=	yes
-.endif
-
 .if defined(WITH_SNMP)
 WITH_OPENSSL=	yes
 .endif
 
-.if defined(WITH_WDDX) || defined(WITH_XMLRPC) || defined(WITH_XSLT)
+.if defined(WITH_XMLRPC) || defined(WITH_XSLT)
 WITH_XML_DEP=	yes
 .endif
 
+.if defined(WITH_WDDX)
+WITH_XML=	yes
+.endif
+
 .if defined(WITH_BCMATH)
 CONFIGURE_ARGS+=--enable-bcmath
 .endif
@@ -296,6 +308,7 @@ LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 CONFIGURE_ARGS+=--with-gd \
 		--enable-gd-native-ttf \
+		--enable-gd-jis-conv \
 		--with-freetype-dir=${LOCALBASE} \
 		--with-jpeg-dir=${LOCALBASE} \
 		--with-png-dir=${LOCALBASE}
@@ -446,6 +459,10 @@ RUN_DEPENDS+=	${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-
 CONFIGURE_ARGS+=--with-oracle=${LOCALBASE}/oracle7
 .endif
 
+.if defined(WITH_OVERLOAD)
+CONFIGURE_ARGS+=--enable-overload
+.endif
+
 .if defined(WITH_PCNTL)
 CONFIGURE_ARGS+=--enable-pcntl
 .endif
diff --git a/lang/php4/pkg-message b/lang/php4/pkg-message
index 6c74a09e8126..f25442446668 100644
--- a/lang/php4/pkg-message
+++ b/lang/php4/pkg-message
@@ -2,8 +2,8 @@
 
 You have installed the php4 package.
 
-Have a look at the php4 port if you need additional extensions
-other than ctype, MySQL, PCRE, POSIX, session, tokenizer, XML and ZLIB.
+Have a look at the php4 port if you need additional extensions other than
+CTYPE, MYSQL, OVERLOAD, PCRE, POSIX, SESSION, TOKENIZER, XML and ZLIB.
 
 You can find it at
 ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/lang/php4.tar
diff --git a/lang/php4/scripts/configure.php b/lang/php4/scripts/configure.php
index 2bfa37b5c889..97c8cf2eea3a 100644
--- a/lang/php4/scripts/configure.php
+++ b/lang/php4/scripts/configure.php
@@ -54,6 +54,7 @@ NCURSES		"ncurses support (CLI only)" ${WITH_NCURSES:-OFF} \
 OPENLDAP	"OpenLDAP support" ${WITH_OPENLDAP:-OFF} \
 OPENSSL		"OpenSSL support" ${WITH_OPENSSL:-OFF} \
 ORACLE		"Oracle support" ${WITH_ORACLE:-OFF} \
+OVERLOAD	"user-space object overloading support" ${WITH_OVERLOAD:-OFF} \
 PCNTL		"pcntl support (CLI only)" ${WITH_PCNTL:-OFF} \
 PCRE		"Perl Compatible Regular Expression support" ${WITH_PCRE:-OFF} \
 PDFLIB		"PDFlib support" ${WITH_PDFLIB:-OFF} \
@@ -72,7 +73,7 @@ SYSVSEM		"System V semaphore support" ${WITH_SYSVSEM:-OFF} \
 SYSVSHM		"System V shared memory support" ${WITH_SYSVSHM:-OFF} \
 TOKENIZER	"tokenizer support" ${WITH_TOKENIZER:-OFF} \
 UNIXODBC	"unixODBC support" ${WITH_UNIXODBC:-OFF} \
-WDDX		"WDDX support" ${WITH_WDDX:-OFF} \
+WDDX		"WDDX support (implies XML)" ${WITH_WDDX:-OFF} \
 XML		"XML support" ${WITH_XML:-OFF} \
 XMLRPC		"XMLRPC-EPI support" ${WITH_XMLRPC:-OFF} \
 XSLT		"XSLT Sablotron support" ${WITH_XSLT:-OFF} \
diff --git a/lang/php4/scripts/php4_options b/lang/php4/scripts/php4_options
index 2774596d3f85..4682abcd60b9 100644
--- a/lang/php4/scripts/php4_options
+++ b/lang/php4/scripts/php4_options
@@ -34,6 +34,7 @@ WITH_NCURSES=OFF
 WITH_OPENLDAP=OFF
 WITH_OPENSSL=OFF
 WITH_ORACLE=OFF
+WITH_OVERLOAD=ON
 WITH_PCNTL=OFF
 WITH_PCRE=ON
 WITH_PDFLIB=OFF