- since 4.3.4, php4 does not install libmbfl headers, but they

  are still needed for PECL extensions that rely on mbstring
  (e.g. mail/pear-mailparse, currently broken);

Remark: the proposed patch comes from PHP's CVS (please see
<http://groups.google.com/groups?selm=cvswez1068253752%40cvsserver>).

- the next release of devel/pear-PEAR (1.3) depends of the extension
  xmlrpc;

- since I'm there, let slaves ports replace COMMENT.

PR:		ports/59591
Submitted By:	Thierry Thomas <thierry@pompo.net>
Approved By:	maintainer

3 files changed, 36 insertions, 2 deletions

diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index 2f24f3ebeb92..c66d937b6112 100644
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -21,7 +21,7 @@
 
 PORTNAME=	php4
 PORTVERSION=	4.3.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	lang devel www
 MASTER_SITES=	http://www.php.net/distributions/:release \
 		http://it.php.net/distributions/:release \
@@ -48,7 +48,7 @@ DISTNAME=	php-${PORTVERSION:S/.r/RC/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:release
 
 MAINTAINER?=	sysadmin@alexdupre.com
-COMMENT=	PHP Scripting Language (Apache Module and CLI)
+COMMENT?=	PHP Scripting Language (Apache Module and CLI)
 .if defined(WITHOUT_APACHE)
 .if defined(WITHOUT_CLI)
 COMMENT=	PHP Common Gateway Interface
@@ -178,6 +178,12 @@ SCRIPTS_ENV+=	SEL_OPTIONS="${SEL_OPTIONS}" \
 .include "${WRKDIR}/Makefile.inc"
 .endif
 
+.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)
 WITH_DBA=	yes
 .endif
diff --git a/lang/php4/files/patch-scripts::Makefile.frag b/lang/php4/files/patch-scripts::Makefile.frag
new file mode 100644
index 000000000000..0d522f07c4a6
--- /dev/null
+++ b/lang/php4/files/patch-scripts::Makefile.frag
@@ -0,0 +1,11 @@
+--- scripts/Makefile.frag.orig	Fri Sep 19 07:35:21 2003
++++ scripts/Makefile.frag	Sat Nov 22 15:32:41 2003
+@@ -32,6 +32,8 @@
+ 	ext/xml/expat \
+ 	main \
+ 	ext/mbstring \
++	ext/mbstring/libmbfl \
++	ext/mbstring/libmbfl/mbfl \
+ 	ext/pgsql \
+ 	regex
+ 
diff --git a/lang/php4/pkg-plist b/lang/php4/pkg-plist
index f571a859f4f3..9c99cdb71ce2 100644
--- a/lang/php4/pkg-plist
+++ b/lang/php4/pkg-plist
@@ -62,6 +62,21 @@ include/php/ext/mbstring/mbstring.h
 include/php/ext/mbstring/php_mbregex.h
 include/php/ext/mbstring/php_unicode.h
 include/php/ext/mbstring/unicode_data.h
+include/php/ext/mbstring/libmbfl/config.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfilter.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_consts.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_convert.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_defs.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_ident.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_language.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_string.h
 include/php/ext/pgsql/php_pgsql.h
 include/php/ext/session/mod_files.h
 include/php/ext/session/mod_mm.h
@@ -215,6 +230,8 @@ lib/php/build/shtool
 %%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Frontend/CLI.php
 @dirrm include/php/TSRM
 @dirrm include/php/Zend
+@dirrm include/php/ext/mbstring/libmbfl/mbfl
+@dirrm include/php/ext/mbstring/libmbfl
 @dirrm include/php/ext/mbstring
 @dirrm include/php/ext/pgsql
 @dirrm include/php/ext/session