- Add sysvmsg extension [1]

- Add XML_RPC to PEAR bootstrap [2]
- Use the official pcre fix [3]
- Bump PORTREVISION

Requested by:	Andy Smith <andy@strugglers.net> [1]
Submitted by:	thierry [2]
Obtained from:	php CVS [3]

6 files changed, 64 insertions, 38 deletions

diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index 4a47600a5c5f..42990cf8458e 100644
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -21,6 +21,7 @@
 
 PORTNAME=	php4
 PORTVERSION=	4.3.6
+PORTREVISION=	1
 CATEGORIES?=	lang devel www
 MASTER_SITES=	http://www.php.net/distributions/:release \
 		http://it.php.net/distributions/:release \
@@ -136,8 +137,8 @@ ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DB4 DBASE DBX DIO \
 		MCRYPT MHASH MIME MING MNOGOSEARCH MSSQL 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
+		SYBASEDB SYBASECT SYSVMSG SYSVSEM SYSVSHM TOKENIZER UNIXODBC \
+		WDDX XML XMLRPC XSLT YAZ YP ZIP ZLIB
 
 .for opt in ${ALL_OPTIONS}
 .if defined(WITH_${opt}) || defined(WITHOUT_${opt})
@@ -182,7 +183,6 @@ SCRIPTS_ENV+=	SEL_OPTIONS="${SEL_OPTIONS}" \
 .if !defined(WITHOUT_CLI) && !defined(WITHOUT_PEAR)
 WITH_PCRE=	yes
 WITH_XML=	yes
-WITH_XMLRPC=	yes
 .endif
 
 .if defined(WITH_CDB) || defined(WITH_DB4) || defined(WITH_GDBM) || defined(WITH_INIFILE)
@@ -495,6 +495,10 @@ LIB_DEPENDS+=	ct.2:${PORTSDIR}/databases/freetds
 CONFIGURE_ARGS+=--with-sybase-ct=${LOCALBASE}
 .endif
 
+.if defined(WITH_SYSVMSG)
+CONFIGURE_ARGS+=--enable-sysvmsg
+.endif
+
 .if defined(WITH_SYSVSEM)
 CONFIGURE_ARGS+=--enable-sysvsem
 .endif
diff --git a/lang/php4/files/patch-ext::pcre::php_pcre.c b/lang/php4/files/patch-ext::pcre::php_pcre.c
index c9efc2e0d480..164f47283c36 100644
--- a/lang/php4/files/patch-ext::pcre::php_pcre.c
+++ b/lang/php4/files/patch-ext::pcre::php_pcre.c
@@ -1,10 +1,30 @@
---- ext/pcre/php_pcre.c.orig	Fri Apr 16 09:21:14 2004
-+++ ext/pcre/php_pcre.c	Fri Apr 16 09:23:36 2004
-@@ -106,15 +106,6 @@
- 	REGISTER_LONG_CONSTANT("PREG_SPLIT_DELIM_CAPTURE", PREG_SPLIT_DELIM_CAPTURE, CONST_CS | CONST_PERSISTENT);
+--- ext/pcre/php_pcre.c.orig	Sun Feb  1 20:56:16 2004
++++ ext/pcre/php_pcre.c	Sat May  8 00:50:32 2004
+@@ -47,20 +47,6 @@
+ 
+ ZEND_DECLARE_MODULE_GLOBALS(pcre)
+ 
+-
+-static void *php_pcre_malloc(size_t size)
+-{
+-	return pemalloc(size, 1);
+-}
+-
+-
+-static void php_pcre_free(void *ptr)
+-{
+-	if (ptr)
+-	pefree(ptr, 1);
+-}
+-
+-
+ static void php_free_pcre_cache(void *data)
+ {
+ 	pcre_cache_entry *pce = (pcre_cache_entry *) data;
+@@ -107,14 +93,6 @@
  	REGISTER_LONG_CONSTANT("PREG_SPLIT_OFFSET_CAPTURE", PREG_SPLIT_OFFSET_CAPTURE, CONST_CS | CONST_PERSISTENT);
  	REGISTER_LONG_CONSTANT("PREG_GREP_INVERT", PREG_GREP_INVERT, CONST_CS | CONST_PERSISTENT);
--
+ 
 -	pcre_malloc = php_pcre_malloc;
 -	pcre_free = php_pcre_free;
 -
@@ -16,29 +36,12 @@
  	return SUCCESS;
  }
  /* }}} */
-@@ -130,6 +121,16 @@
- }
- /* }}} */
+@@ -548,7 +526,7 @@
+ 					}
+ 				}
  
-+/* {{{ PHP_RINIT_FUNCTION(pcre) */
-+static PHP_RINIT_FUNCTION(pcre)
-+{
-+	pcre_malloc = php_pcre_malloc;
-+	pcre_free = php_pcre_free;
-+
-+	return SUCCESS;
-+}
-+/* }}} */
-+
- /* {{{ pcre_get_compiled_regex
-  */
- PHPAPI pcre* pcre_get_compiled_regex(char *regex, pcre_extra **extra, int *preg_options) {
-@@ -1527,7 +1528,7 @@
- 	pcre_functions,
- 	PHP_MINIT(pcre),
- 	PHP_MSHUTDOWN(pcre),
--	NULL,
-+	PHP_RINIT(pcre),
- 	NULL,
- 	PHP_MINFO(pcre),
- 	NO_VERSION_YET,
+-				php_pcre_free((void *) stringlist);
++				pcre_free((void *) stringlist);
+ 			}
+ 		}
+ 		else { /* Failed to match */
diff --git a/lang/php4/files/patch-pear::Makefile.frag b/lang/php4/files/patch-pear::Makefile.frag
index 060066c367b6..ee24944b46c6 100644
--- a/lang/php4/files/patch-pear::Makefile.frag
+++ b/lang/php4/files/patch-pear::Makefile.frag
@@ -1,6 +1,14 @@
---- pear/Makefile.frag.orig	Sat Apr 12 01:48:37 2003
-+++ pear/Makefile.frag	Sat May 17 10:08:54 2003
-@@ -13,10 +13,13 @@
+--- pear/Makefile.frag.orig	Tue Sep  2 03:30:13 2003
++++ pear/Makefile.frag	Thu Apr 22 23:52:40 2004
+@@ -1,6 +1,7 @@
+ # -*- makefile -*-
+ 
+ peardir=$(PEAR_INSTALLDIR)
++XML_RPC_ver=1.1.0
+ 
+ # Skip all php.ini files altogether
+ PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0
+@@ -13,10 +14,18 @@
  
  install-pear:
  	@echo "Installing PEAR environment:      $(INSTALL_ROOT)$(peardir)/"
@@ -12,11 +20,16 @@
 -	fi
 +	@$(mkinstalldirs) $(INSTALL_ROOT)$(peardir)/bootstrap \
 +		$(INSTALL_ROOT)$(peardir)/bootstrap/Archive \
-+		$(INSTALL_ROOT)$(peardir)/bootstrap/Console
++		$(INSTALL_ROOT)$(peardir)/bootstrap/Console \
++		$(INSTALL_ROOT)$(peardir)/bootstrap/XML \
++		$(INSTALL_ROOT)$(peardir)/bootstrap/XML/RPC
 +	@cp $(srcdir)/PEAR.php $(srcdir)/System.php \
 +		$(INSTALL_ROOT)$(peardir)/bootstrap
 +	@cp $(srcdir)/Archive/*.php $(INSTALL_ROOT)$(peardir)/bootstrap/Archive
 +	@cp $(srcdir)/Console/*.php $(INSTALL_ROOT)$(peardir)/bootstrap/Console
 +	@cp -R $(srcdir)/OS $(INSTALL_ROOT)$(peardir)/bootstrap
 +	@cp -R $(srcdir)/PEAR $(INSTALL_ROOT)$(peardir)/bootstrap
++	@tar xf $(srcdir)/packages/XML_RPC-$(XML_RPC_ver).tar
++	@cp XML_RPC-$(XML_RPC_ver)/RPC.php $(INSTALL_ROOT)$(peardir)/bootstrap/XML
++	@cp XML_RPC-$(XML_RPC_ver)/Server.php $(INSTALL_ROOT)$(peardir)/bootstrap/XML/RPC
  
diff --git a/lang/php4/pkg-plist b/lang/php4/pkg-plist
index c4c7abef9c8c..497d2199bf64 100644
--- a/lang/php4/pkg-plist
+++ b/lang/php4/pkg-plist
@@ -223,11 +223,13 @@ lib/php/build/shtool
 %%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Dependency.php
 %%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Downloader.php
 %%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/ErrorStack.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Frontend/CLI.php
 %%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Installer.php
 %%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Packager.php
 %%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Registry.php
 %%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Remote.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Frontend/CLI.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/XML/RPC.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/XML/RPC/Server.php
 @dirrm include/php/TSRM
 @dirrm include/php/Zend
 @dirrm include/php/ext/mbstring/libmbfl/mbfl
@@ -250,5 +252,7 @@ lib/php/build/shtool
 %%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/PEAR/Command
 %%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/PEAR/Frontend
 %%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/PEAR
+%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/XML/RPC
+%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/XML
 %%CLI%%%%PEAR%%@dirrm share/pear/bootstrap
 %%CLI%%%%PEAR%%@unexec rmdir %D/share/pear 2> /dev/null || true
diff --git a/lang/php4/scripts/configure.php b/lang/php4/scripts/configure.php
index 90615afa8b0f..c32d26415506 100644
--- a/lang/php4/scripts/configure.php
+++ b/lang/php4/scripts/configure.php
@@ -73,6 +73,7 @@ SNMP		"SNMP support (implies OPENSSL)" ${WITH_SNMP:-OFF} \
 SOCKETS		"sockets support" ${WITH_SOCKETS:-OFF} \
 SYBASEDB	"Sybase database support (DB-lib)" ${WITH_SYBASEDB:-OFF} \
 SYBASECT	"Sybase database support (CT-lib)" ${WITH_SYBASECT:-OFF} \
+SYSVMSG		"System V message support" ${WITH_SYSVMSG:-OFF} \
 SYSVSEM		"System V semaphore support" ${WITH_SYSVSEM:-OFF} \
 SYSVSHM		"System V shared memory support" ${WITH_SYSVSHM:-OFF} \
 TOKENIZER	"tokenizer support" ${WITH_TOKENIZER:-OFF} \
diff --git a/lang/php4/scripts/php4_options b/lang/php4/scripts/php4_options
index bb5c725248af..2dab37c0f336 100644
--- a/lang/php4/scripts/php4_options
+++ b/lang/php4/scripts/php4_options
@@ -53,6 +53,7 @@ WITH_SNMP=OFF
 WITH_SOCKETS=OFF
 WITH_SYBASEDB=OFF
 WITH_SYBASECT=OFF
+WITH_SYSVMSG=OFF
 WITH_SYSVSEM=OFF
 WITH_SYSVSHM=OFF
 WITH_TOKENIZER=ON