Install GD and MBSTRINGS header files for pdflib and mailparse extensions.

6 files changed, 90 insertions, 8 deletions

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index f88f9382ec78..f52a6e3f15ba 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -22,7 +22,7 @@
 
 PORTNAME=	php5
 PORTVERSION=	5.0.0.r3
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,}
 MASTER_SITE_SUBDIR=	distributions/:release
diff --git a/lang/php5/files/patch-scripts::Makefile.frag b/lang/php5/files/patch-scripts::Makefile.frag
index 4ec4bb75f2c3..3089a9adf3a9 100644
--- a/lang/php5/files/patch-scripts::Makefile.frag
+++ b/lang/php5/files/patch-scripts::Makefile.frag
@@ -1,10 +1,19 @@
---- scripts/Makefile.frag.orig	Mon Dec  1 17:07:00 2003
-+++ scripts/Makefile.frag	Mon Dec 22 12:05:56 2003
-@@ -32,7 +32,6 @@
+--- scripts/Makefile.frag.orig	Mon Jun 28 10:41:39 2004
++++ scripts/Makefile.frag	Mon Jun 28 10:47:24 2004
+@@ -29,12 +29,15 @@
+ 	main/ \
+ 	main/streams/ \
+ 	regex/ \
++	ext/gd/ \
++	ext/gd/libgd/ \
+ 	ext/libxml/ \
  	ext/standard/ \
  	ext/session/ \
  	ext/xml/ \
 -	ext/xml/expat/ \
  	ext/mbstring/ \
++	ext/mbstring/libmbfl/ \
++	ext/mbstring/libmbfl/mbfl/ \
  	ext/sqlite/libsqlite/src/sqlite.h
  
+ install-headers:
diff --git a/lang/php5/pkg-plist b/lang/php5/pkg-plist
index 3147b9db3538..293e320ad596 100644
--- a/lang/php5/pkg-plist
+++ b/lang/php5/pkg-plist
@@ -67,12 +67,40 @@ include/php/Zend/zend_ts_hash.h
 include/php/Zend/zend_types.h
 include/php/Zend/zend_variables.h
 include/php/acconfig.h
+include/php/ext/gd/gdcache.h
+include/php/ext/gd/gdttf.h
+include/php/ext/gd/libgd/gd.h
+include/php/ext/gd/libgd/gd_io.h
+include/php/ext/gd/libgd/gdcache.h
+include/php/ext/gd/libgd/gdfontg.h
+include/php/ext/gd/libgd/gdfontl.h
+include/php/ext/gd/libgd/gdfontmb.h
+include/php/ext/gd/libgd/gdfonts.h
+include/php/ext/gd/libgd/gdfontt.h
+include/php/ext/gd/libgd/gdhelpers.h
+include/php/ext/gd/libgd/jisx0208.h
+include/php/ext/gd/libgd/wbmp.h
+include/php/ext/gd/php_gd.h
 include/php/ext/libxml/php_libxml.h
 include/php/ext/mbstring/mb_gpc.h
 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/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/session/mod_files.h
 include/php/ext/session/mod_mm.h
 include/php/ext/session/mod_user.h
@@ -230,7 +258,11 @@ lib/php/build/shtool
 %%CLI%%%%PEAR%%share/pear/bootstrap/XML/RPC/Server.php
 @dirrm include/php/TSRM
 @dirrm include/php/Zend
+@dirrm include/php/ext/gd/libgd
+@dirrm include/php/ext/gd
 @dirrm include/php/ext/libxml
+@dirrm include/php/ext/mbstring/libmbfl/mbfl
+@dirrm include/php/ext/mbstring/libmbfl
 @dirrm include/php/ext/mbstring
 @dirrm include/php/ext/session
 @dirrm include/php/ext/sqlite/libsqlite/src
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index f88f9382ec78..f52a6e3f15ba 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -22,7 +22,7 @@
 
 PORTNAME=	php5
 PORTVERSION=	5.0.0.r3
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,}
 MASTER_SITE_SUBDIR=	distributions/:release
diff --git a/lang/php53/files/patch-scripts::Makefile.frag b/lang/php53/files/patch-scripts::Makefile.frag
index 4ec4bb75f2c3..3089a9adf3a9 100644
--- a/lang/php53/files/patch-scripts::Makefile.frag
+++ b/lang/php53/files/patch-scripts::Makefile.frag
@@ -1,10 +1,19 @@
---- scripts/Makefile.frag.orig	Mon Dec  1 17:07:00 2003
-+++ scripts/Makefile.frag	Mon Dec 22 12:05:56 2003
-@@ -32,7 +32,6 @@
+--- scripts/Makefile.frag.orig	Mon Jun 28 10:41:39 2004
++++ scripts/Makefile.frag	Mon Jun 28 10:47:24 2004
+@@ -29,12 +29,15 @@
+ 	main/ \
+ 	main/streams/ \
+ 	regex/ \
++	ext/gd/ \
++	ext/gd/libgd/ \
+ 	ext/libxml/ \
  	ext/standard/ \
  	ext/session/ \
  	ext/xml/ \
 -	ext/xml/expat/ \
  	ext/mbstring/ \
++	ext/mbstring/libmbfl/ \
++	ext/mbstring/libmbfl/mbfl/ \
  	ext/sqlite/libsqlite/src/sqlite.h
  
+ install-headers:
diff --git a/lang/php53/pkg-plist b/lang/php53/pkg-plist
index 3147b9db3538..293e320ad596 100644
--- a/lang/php53/pkg-plist
+++ b/lang/php53/pkg-plist
@@ -67,12 +67,40 @@ include/php/Zend/zend_ts_hash.h
 include/php/Zend/zend_types.h
 include/php/Zend/zend_variables.h
 include/php/acconfig.h
+include/php/ext/gd/gdcache.h
+include/php/ext/gd/gdttf.h
+include/php/ext/gd/libgd/gd.h
+include/php/ext/gd/libgd/gd_io.h
+include/php/ext/gd/libgd/gdcache.h
+include/php/ext/gd/libgd/gdfontg.h
+include/php/ext/gd/libgd/gdfontl.h
+include/php/ext/gd/libgd/gdfontmb.h
+include/php/ext/gd/libgd/gdfonts.h
+include/php/ext/gd/libgd/gdfontt.h
+include/php/ext/gd/libgd/gdhelpers.h
+include/php/ext/gd/libgd/jisx0208.h
+include/php/ext/gd/libgd/wbmp.h
+include/php/ext/gd/php_gd.h
 include/php/ext/libxml/php_libxml.h
 include/php/ext/mbstring/mb_gpc.h
 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/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/session/mod_files.h
 include/php/ext/session/mod_mm.h
 include/php/ext/session/mod_user.h
@@ -230,7 +258,11 @@ lib/php/build/shtool
 %%CLI%%%%PEAR%%share/pear/bootstrap/XML/RPC/Server.php
 @dirrm include/php/TSRM
 @dirrm include/php/Zend
+@dirrm include/php/ext/gd/libgd
+@dirrm include/php/ext/gd
 @dirrm include/php/ext/libxml
+@dirrm include/php/ext/mbstring/libmbfl/mbfl
+@dirrm include/php/ext/mbstring/libmbfl
 @dirrm include/php/ext/mbstring
 @dirrm include/php/ext/session
 @dirrm include/php/ext/sqlite/libsqlite/src