[pkgsrc/trunk]: pkgsrc/lang/php54 Correct condition for NetBSD 6.0 and later ...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/73165c66335b
branches:  trunk
changeset: 621415:73165c66335b
user:      taca <taca%pkgsrc.org@localhost>
date:      Mon Jul 08 13:16:21 2013 +0000

description:
Correct condition for NetBSD 6.0 and later to fix build problem on NetBSD
6.0.  Reported by J?«Órn Clausen as PR pkg/48029.

diffstat:

 lang/php54/distinfo                          |   3 ++-
 lang/php54/patches/patch-main_streams_cast.c |  15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)

diffs (36 lines):

diff -r 4ab4b60cc454 -r 73165c66335b lang/php54/distinfo
--- a/lang/php54/distinfo       Mon Jul 08 12:16:26 2013 +0000
+++ b/lang/php54/distinfo       Mon Jul 08 13:16:21 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2013/07/07 13:37:53 taca Exp $
+$NetBSD: distinfo,v 1.20 2013/07/08 13:16:21 taca Exp $
 
 SHA1 (php-5.4.17.tar.bz2) = 7151b2cef85aaf3c2109ee28e88d01ddb6274d5b
 RMD160 (php-5.4.17.tar.bz2) = b167420094885593f068bcd3a012452a0156bb5b
@@ -13,6 +13,7 @@
 SHA1 (patch-ext_phar_Makefile.frag) = 1af23d9135557bc7ba2f3627b317d4cbef37aaba
 SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c
 SHA1 (patch-ext_standard_basic__functions.c) = 563fe67eb78b786cd46195026381ef22128e0841
+SHA1 (patch-main_streams_cast.c) = 955aee9efb4868e00fbfc443bb7d92c71844a853
 SHA1 (patch-php.ini-development) = 79512bd276adaed6bcf5f7f28e965f8a6b589add
 SHA1 (patch-php.ini-production) = f5d275abe7668a139999b3607e99f271450f56ae
 SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d
diff -r 4ab4b60cc454 -r 73165c66335b lang/php54/patches/patch-main_streams_cast.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php54/patches/patch-main_streams_cast.c      Mon Jul 08 13:16:21 2013 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-main_streams_cast.c,v 1.3 2013/07/08 13:16:21 taca Exp $
+
+* For NetBSD 6.0+, __NetBSD_Version__ should includes 600000000.
+
+--- main/streams/cast.c.orig   2013-07-03 06:10:53.000000000 +0000
++++ main/streams/cast.c
+@@ -33,7 +33,7 @@
+ #if defined(HAVE_FUNOPEN) && !defined(HAVE_FOPENCOOKIE)
+ 
+ /* NetBSD 6.0+ uses off_t instead of fpos_t in funopen */
+-# if defined(__NetBSD__) && (__NetBSD_Version__ > 600000000)
++# if defined(__NetBSD__) && (__NetBSD_Version__ >= 600000000)
+ #  define PHP_FPOS_T off_t
+ # else
+ #  define PHP_FPOS_T fpos_t