Trying to fix build problem on NetBSD current recently.

4 files changed, 66 insertions, 2 deletions

diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 91842f64fe4..c5be38effff 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.91 2011/08/20 14:50:51 taca Exp $
+$NetBSD: distinfo,v 1.92 2012/02/02 15:44:21 taca Exp $
 
 SHA1 (php-5.2.17/php-5.2.17.tar.bz2) = d68f3b09f766990d815a3c4c63c157db8dab8095
 RMD160 (php-5.2.17/php-5.2.17.tar.bz2) = 567fa8d718b93fb83a89494c83a8bec224ac99e9
@@ -17,12 +17,17 @@ SHA1 (patch-ap) = 5eb0e0e4244a993da93e36f8fcb5553454207fce
 SHA1 (patch-aq) = 0c9d48547da2fa80aa8357d23ad8505d1c0330df
 SHA1 (patch-ar) = 2d74ec926cc00bfbb67d16210af78c33ad9ac38d
 SHA1 (patch-as) = f7ce5caffe2acdd1f8e9fc8ae6c7ba1d8c6a25c1
+SHA1 (patch-ext_date_lib_parse__date.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-ext_exif_exif.c) = 0a6ab268751e633510cb6b334b1bdb84a014b528
+SHA1 (patch-ext_pdo_pdo__sql__parser.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-ext_shmop_shmop.c) = 6e11b87dd71ff26357b14b61df626c40b40a022d
 SHA1 (patch-ext_sockets_sockets.c) = f01eb6020450a62c305bdf59e12eeacbe8764be7
+SHA1 (patch-ext_standard_url__scanner__ex.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-ext_standard_var__unserializer.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-ext_zip_lib_zip__name__locate.c) = 4030e37ae4f93dbcb1a3a937a5407c2c406a49d6
 SHA1 (patch-ext_zip_php__zip.c) = 134fa566a689d72d63a2fa0aa5c96c4595619089
 SHA1 (patch-main_rfc1867.c) = 89a1a0e52402a8f8f1cc5b1ec007f5ab1ab69dc2
 SHA1 (patch-main_snprintf.c) = cb112df0cadf84aaeee5987169a31460989995a8
 SHA1 (patch-main_snprintf.h) = 86ae4c1c8ae9183254e9914cb56d3df999f719cf
 SHA1 (patch-main_spprintf.c) = 0fe0888b612402c41f040c8781df7f1a7ca66275
+SHA1 (patch-main_streams_cast.c) = 0e69cad7d6451b18ec844cc8ea6d18eaf0748530
diff --git a/lang/php5/patches/patch-main_streams_cast.c b/lang/php5/patches/patch-main_streams_cast.c
new file mode 100644
index 00000000000..3cc8837f768
--- /dev/null
+++ b/lang/php5/patches/patch-main_streams_cast.c
@@ -0,0 +1,29 @@
+$NetBSD: patch-main_streams_cast.c,v 1.1 2012/02/02 15:44:22 taca Exp $
+
+Fix build problem of newer NetBSD.
+
+--- main/streams/cast.c.orig	2010-01-19 13:44:08.000000000 +0000
++++ main/streams/cast.c
+@@ -34,7 +34,7 @@
+ typedef struct {
+ 	int (*reader)(void *, char *, int);
+ 	int (*writer)(void *, const char *, int);
+-	fpos_t (*seeker)(void *, fpos_t, int);
++	off_t (*seeker)(void *, off_t, int);
+ 	int (*closer)(void *);
+ } COOKIE_IO_FUNCTIONS_T;
+ 
+@@ -68,11 +68,11 @@ static int stream_cookie_writer(void *co
+ 	return php_stream_write((php_stream *)cookie, (char *)buffer, size);
+ }
+ 
+-static fpos_t stream_cookie_seeker(void *cookie, off_t position, int whence)
++static off_t stream_cookie_seeker(void *cookie, off_t position, int whence)
+ {
+ 	TSRMLS_FETCH();
+ 
+-	return (fpos_t)php_stream_seek((php_stream *)cookie, position, whence);
++	return (off_t)php_stream_seek((php_stream *)cookie, position, whence);
+ }
+ 
+ static int stream_cookie_closer(void *cookie)
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index 45d6fa49c0f..8bc1d2d3223 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2012/01/20 03:22:08 taca Exp $
+$NetBSD: distinfo,v 1.32 2012/02/02 15:44:09 taca Exp $
 
 SHA1 (php-5.3.9/php-5.3.9.tar.bz2) = fe0626735c3d9dd370cef9bdcfe9506629449f51
 RMD160 (php-5.3.9/php-5.3.9.tar.bz2) = 428ed51982637f092c43369cf5cfb284d58da3f6
@@ -17,4 +17,5 @@ SHA1 (patch-ah) = b20c29c64b3099f77855a5ec28960dc1c4f65c83
 SHA1 (patch-ai) = d4766893a2c47a4e4a744248dda265b0a9a66a1f
 SHA1 (patch-aj) = d611d13fcc28c5d2b9e9586832ce4b8ae5707b48
 SHA1 (patch-al) = fbbee5502e0cd1c47c6e7c15e0d54746414ec32e
+SHA1 (patch-main_streams_cast.c) = c169ccb73dc660e40eff9f9e168374f35eedadad
 SHA1 (patch-php__mssql.c) = b46c688ff2d8da33ca2f9beb0eb9182b6edf7e23
diff --git a/lang/php53/patches/patch-main_streams_cast.c b/lang/php53/patches/patch-main_streams_cast.c
new file mode 100644
index 00000000000..f62d5f05729
--- /dev/null
+++ b/lang/php53/patches/patch-main_streams_cast.c
@@ -0,0 +1,29 @@
+$NetBSD: patch-main_streams_cast.c,v 1.1 2012/02/02 15:44:09 taca Exp $
+
+Fix build problem of newer NetBSD.
+
+--- main/streams/cast.c.orig	2012-01-01 13:15:04.000000000 +0000
++++ main/streams/cast.c
+@@ -34,7 +34,7 @@
+ typedef struct {
+ 	int (*reader)(void *, char *, int);
+ 	int (*writer)(void *, const char *, int);
+-	fpos_t (*seeker)(void *, fpos_t, int);
++	off_t (*seeker)(void *, off_t, int);
+ 	int (*closer)(void *);
+ } COOKIE_IO_FUNCTIONS_T;
+ 
+@@ -68,11 +68,11 @@ static int stream_cookie_writer(void *co
+ 	return php_stream_write((php_stream *)cookie, (char *)buffer, size);
+ }
+ 
+-static fpos_t stream_cookie_seeker(void *cookie, off_t position, int whence)
++static off_t stream_cookie_seeker(void *cookie, off_t position, int whence)
+ {
+ 	TSRMLS_FETCH();
+ 
+-	return (fpos_t)php_stream_seek((php_stream *)cookie, position, whence);
++	return (off_t)php_stream_seek((php_stream *)cookie, position, whence);
+ }
+ 
+ static int stream_cookie_closer(void *cookie)