CVS commit: pkgsrc/lang/php70

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Mar 23 09:50:36 UTC 2017

Modified Files:
        pkgsrc/lang/php70: distinfo
Added Files:
        pkgsrc/lang/php70/patches: patch-main_php__config.h.in

Log Message:
Fix the macro tests for fpclassify(3) functions.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/lang/php70/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/php70/patches/patch-main_php__config.h.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/php70/distinfo
diff -u pkgsrc/lang/php70/distinfo:1.29 pkgsrc/lang/php70/distinfo:1.30
--- pkgsrc/lang/php70/distinfo:1.29     Fri Mar 17 15:34:15 2017
+++ pkgsrc/lang/php70/distinfo  Thu Mar 23 09:50:36 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2017/03/17 15:34:15 taca Exp $
+$NetBSD: distinfo,v 1.30 2017/03/23 09:50:36 jperkin Exp $
 
 SHA1 (php-7.0.17.tar.bz2) = 6c20436c50fdf342891f836f2864a43fdbe0bf71
 RMD160 (php-7.0.17.tar.bz2) = 2f4dd83e4d4253aaad45fa5f28cd973815382edb
@@ -18,6 +18,7 @@ SHA1 (patch-ext_recode_recode.c) = a97a1
 SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5
 SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56
 SHA1 (patch-ext_tidy_tidy.c) = 420559f0b36d054e4d954e666be2a519b67e1b84
+SHA1 (patch-main_php__config.h.in) = d70a1b53c5e31c37a7bc2703304318d15c371a0a
 SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5
 SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd
 SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89

Added files:

Index: pkgsrc/lang/php70/patches/patch-main_php__config.h.in
diff -u /dev/null pkgsrc/lang/php70/patches/patch-main_php__config.h.in:1.1
--- /dev/null   Thu Mar 23 09:50:36 2017
+++ pkgsrc/lang/php70/patches/patch-main_php__config.h.in       Thu Mar 23 09:50:36 2017
@@ -0,0 +1,33 @@
+$NetBSD: patch-main_php__config.h.in,v 1.1 2017/03/23 09:50:36 jperkin Exp $
+
+Fix tests for defines which are 0/1 not defined/undefined.
+
+--- main/php_config.h.in.orig  2017-03-14 11:26:16.000000000 +0000
++++ main/php_config.h.in
+@@ -2530,7 +2530,7 @@ int zend_sprintf(char *buffer, const cha
+ #endif
+ 
+ #ifndef zend_isnan
+-#ifdef HAVE_DECL_ISNAN
++#if HAVE_DECL_ISNAN == 1
+ #define zend_isnan(a) isnan(a)
+ #elif defined(HAVE_FPCLASS)
+ #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+@@ -2539,7 +2539,7 @@ int zend_sprintf(char *buffer, const cha
+ #endif
+ #endif
+ 
+-#ifdef HAVE_DECL_ISINF
++#if HAVE_DECL_ISINF == 1
+ #define zend_isinf(a) isinf(a)
+ #elif defined(INFINITY)
+ /* Might not work, but is required by ISO C99 */
+@@ -2550,7 +2550,7 @@ int zend_sprintf(char *buffer, const cha
+ #define zend_isinf(a) 0
+ #endif
+ 
+-#if defined(HAVE_DECL_ISFINITE)
++#if HAVE_DECL_ISFINITE == 1
+ #define zend_finite(a) isfinite(a)
+ #elif defined(HAVE_FINITE)
+ #define zend_finite(a) finite(a)