add patch for ext/recode/recode.c so that the variable 'program_name' required by recode library is provided unconditionally; it should not depend on whether or not program without this symbol happens to compile

4 files changed, 48 insertions, 2 deletions

diff --git a/lang/php56/distinfo b/lang/php56/distinfo
index 9dd91af24e1..9676082c272 100644
--- a/lang/php56/distinfo
+++ b/lang/php56/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2016/07/24 02:18:02 taca Exp $
+$NetBSD: distinfo,v 1.30 2016/07/24 13:27:23 jdolecek Exp $
 
 SHA1 (php-5.6.24.tar.bz2) = c2b3ad1d968fbc615702ff0860efc3b35ca1fb70
 RMD160 (php-5.6.24.tar.bz2) = 6be7a7ea3a59dbbb618cb1251caf32f5332e5def
@@ -14,6 +14,7 @@ SHA1 (patch-ext_pdo__mysql_config.m4) = 9d25c673fc151e1b8ae137f2a0fc540189ef5398
 SHA1 (patch-ext_pdo_config.m4) = f6deef3ac631769baa587dd7c27e55bd2e9ca6a5
 SHA1 (patch-ext_phar_Makefile.frag) = 1564c188e57d48f83de7c2420fdde183598539e2
 SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64
+SHA1 (patch-ext_recode_recode.c) = fb7b3863fadadcdbfd82ae49d6bc71fc381c90e2
 SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 85cd8f3e115705aa2eeab0e7229f24422e322a7f
 SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2
 SHA1 (patch-ext_standard_php__dns.h) = 57c5d6d8ae60da58925abc2c51d66b56762fecda
diff --git a/lang/php56/patches/patch-ext_recode_recode.c b/lang/php56/patches/patch-ext_recode_recode.c
new file mode 100644
index 00000000000..6d636973fe8
--- /dev/null
+++ b/lang/php56/patches/patch-ext_recode_recode.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-ext_recode_recode.c,v 1.1 2016/07/24 13:27:23 jdolecek Exp $
+
+program_name is expected variable, is required by recode 3.5 and recode 3.6 to actually work.
+
+The config.m4 test for it is broken at least for some platforms -  it only tests if program without it compiles, but on Solaris and MacOS/Darwin at least it only fails when run.
+
+--- ext/recode/recode.c.orig	2016-07-24 13:07:47.000000000 +0000
++++ ext/recode/recode.c
+@@ -29,11 +29,8 @@
+ 
+ #if HAVE_LIBRECODE
+ 
+-/* For recode 3.5 */
+-#if HAVE_BROKEN_RECODE
+-extern char *program_name;
+-char *program_name = "php";
+-#endif
++extern const char *program_name;
++const char *program_name = "php";
+ 
+ #ifdef HAVE_STDBOOL_H
+ # include <stdbool.h>
diff --git a/lang/php70/distinfo b/lang/php70/distinfo
index 5b1467ad044..8dd5b007885 100644
--- a/lang/php70/distinfo
+++ b/lang/php70/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2016/07/24 02:20:16 taca Exp $
+$NetBSD: distinfo,v 1.16 2016/07/24 13:27:23 jdolecek Exp $
 
 SHA1 (php-7.0.9.tar.bz2) = bc94c0c0d548ab4b89840994f9f3b468a3d89c4b
 RMD160 (php-7.0.9.tar.bz2) = d6771507506336da29f88ae59e5d93da4207bfdd
@@ -13,6 +13,7 @@ SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8
 SHA1 (patch-ext_pdo_config.m4) = 522281775cc0e70a135b1f813158988ef1f3e244
 SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426
 SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8
+SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159
 SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5
 SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56
 SHA1 (patch-ext_standard_php__dns.h) = 3687ceac4dff4605263b53acb761b071f7446ccb
diff --git a/lang/php70/patches/patch-ext_recode_recode.c b/lang/php70/patches/patch-ext_recode_recode.c
new file mode 100644
index 00000000000..6d636973fe8
--- /dev/null
+++ b/lang/php70/patches/patch-ext_recode_recode.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-ext_recode_recode.c,v 1.1 2016/07/24 13:27:23 jdolecek Exp $
+
+program_name is expected variable, is required by recode 3.5 and recode 3.6 to actually work.
+
+The config.m4 test for it is broken at least for some platforms -  it only tests if program without it compiles, but on Solaris and MacOS/Darwin at least it only fails when run.
+
+--- ext/recode/recode.c.orig	2016-07-24 13:07:47.000000000 +0000
++++ ext/recode/recode.c
+@@ -29,11 +29,8 @@
+ 
+ #if HAVE_LIBRECODE
+ 
+-/* For recode 3.5 */
+-#if HAVE_BROKEN_RECODE
+-extern char *program_name;
+-char *program_name = "php";
+-#endif
++extern const char *program_name;
++const char *program_name = "php";
+ 
+ #ifdef HAVE_STDBOOL_H
+ # include <stdbool.h>