CVS commit: pkgsrc/lang/php55

["Jaromir Dolecek" <jdolecek%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jdolecek
Date:           Sun Jul 24 13:38:54 UTC 2016

Modified Files:
        pkgsrc/lang/php55: distinfo
Added Files:
        pkgsrc/lang/php55/patches: patch-ext_recode_recode.c

Log Message:
add patch for ext/recode/recode.c also for php55


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/lang/php55/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/php55/patches/patch-ext_recode_recode.c

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

Modified files:

Index: pkgsrc/lang/php55/distinfo
diff -u pkgsrc/lang/php55/distinfo:1.55 pkgsrc/lang/php55/distinfo:1.56
--- pkgsrc/lang/php55/distinfo:1.55     Sun Jul 24 02:15:15 2016
+++ pkgsrc/lang/php55/distinfo  Sun Jul 24 13:38:54 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2016/07/24 02:15:15 taca Exp $
+$NetBSD: distinfo,v 1.56 2016/07/24 13:38:54 jdolecek Exp $
 
 SHA1 (php-5.5.38.tar.bz2) = ac79d48510e4bfe8f376d009e3ecb5b734bbc3a1
 RMD160 (php-5.5.38.tar.bz2) = 2f1f0ff08c963975c6a624ecc83432cf48be3b39
@@ -16,6 +16,7 @@ SHA1 (patch-ext_pdo__mysql_config.m4) = 
 SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59
 SHA1 (patch-ext_phar_Makefile.frag) = f465bb5acd4bb87bb403baa98b61ac707800fd30
 SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c
+SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159
 SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = b384b9daa466f2a8a3e6cfd4ea6cff81f9342941
 SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4
 SHA1 (patch-ext_standard_php__dns.h) = 61028fffaae8d9e590cfed7dab0bcb53eb689f96

Added files:

Index: pkgsrc/lang/php55/patches/patch-ext_recode_recode.c
diff -u /dev/null pkgsrc/lang/php55/patches/patch-ext_recode_recode.c:1.1
--- /dev/null   Sun Jul 24 13:38:54 2016
+++ pkgsrc/lang/php55/patches/patch-ext_recode_recode.c Sun Jul 24 13:38:54 2016
@@ -0,0 +1,22 @@
+$NetBSD: patch-ext_recode_recode.c,v 1.1 2016/07/24 13:38:54 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>