ports/59591: lang/php4: fixing an issue with pear-mailparse + preparing next pear-PEAR.

[Thierry Thomas]

>Number:         59591
>Category:       ports
>Synopsis:       lang/php4: fixing an issue with pear-mailparse + preparing next pear-PEAR.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 22 09:00:28 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Thierry Thomas
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 4.9-STABLE FreeBSD 4.9-STABLE #0: Thu Nov 20 23:06:13 CET 2003 thierry at graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF020727 i386


	
>Description:
	- 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.

>How-To-Repeat:
	Try to install the port mail/pear-mailparse.

>Fix:
	Please apply the following patch.

	Remark: one new file, files/patch-scripts::Makefile.frag.

--- php4.diff begins here ---
diff -urN lang/php4.orig/Makefile lang/php4/Makefile
--- lang/php4.orig/Makefile	Thu Nov 20 19:04:54 2003
+++ lang/php4/Makefile	Sat Nov 22 16:02:04 2003
@@ -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 @@
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:release
 
 MAINTAINER?=	sysadmin at 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
@@ -176,6 +176,10 @@
 
 .if exists(${WRKDIR}/Makefile.inc)
 .include "${WRKDIR}/Makefile.inc"
+.endif
+
+.if !defined(WITHOUT_PEAR)
+WITH_XMLRPC=   yes
 .endif
 
 .if defined(WITH_CDB) || defined(WITH_DB4) || defined(WITH_GDBM) || defined(WITH_INIFILE)
diff -urN lang/php4.orig/files/patch-scripts::Makefile.frag lang/php4/files/patch-scripts::Makefile.frag
--- lang/php4.orig/files/patch-scripts::Makefile.frag	Thu Jan  1 01:00:00 1970
+++ lang/php4/files/patch-scripts::Makefile.frag	Sat Nov 22 15:33:17 2003
@@ -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 -urN lang/php4.orig/pkg-plist lang/php4/pkg-plist
--- lang/php4.orig/pkg-plist	Thu Nov 20 19:04:55 2003
+++ lang/php4/pkg-plist	Sat Nov 22 15:53:07 2003
@@ -62,6 +62,21 @@
 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 @@
 %%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Frontend/CLI.php
 @dirrm include/php/TSRM
 @dirrm include/php/Zend
+ at dirrm include/php/ext/mbstring/libmbfl/mbfl
+ at dirrm include/php/ext/mbstring/libmbfl
 @dirrm include/php/ext/mbstring
 @dirrm include/php/ext/pgsql
 @dirrm include/php/ext/session
--- php4.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: