Tue Dec 6 08:53:48 2016 UTC ()
On Darwin, allow native iconv when Command Line Tools are not installed.


(adam)
diff -r1.21 -r1.22 pkgsrc/lang/php70/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/php70/patches/patch-acinclude.m4
cvs diff -r1.21 -r1.22 pkgsrc/lang/php70/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php70/Attic/distinfo 2016/11/12 15:38:29 1.21
+++ pkgsrc/lang/php70/Attic/distinfo 2016/12/06 08:53:48 1.22
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.21 2016/11/12 15:38:29 taca Exp $ 1$NetBSD: distinfo,v 1.22 2016/12/06 08:53:48 adam Exp $
2 2
3SHA1 (php-7.0.13.tar.bz2) = eb81c83dc4aa711926c870b4bf2f4e6ebc8ffbbb 3SHA1 (php-7.0.13.tar.bz2) = eb81c83dc4aa711926c870b4bf2f4e6ebc8ffbbb
4RMD160 (php-7.0.13.tar.bz2) = 9f6402077a57d33a99aeb3766fcfc42c25b8c88f 4RMD160 (php-7.0.13.tar.bz2) = 9f6402077a57d33a99aeb3766fcfc42c25b8c88f
5SHA512 (php-7.0.13.tar.bz2) = 53276fbd35855b9337120fd74f6932e70822b8e5508b6bed068a78805049d36960300e781ec5640f4a90f2d4a09e506084a865341d151bc5c87b7777cb5ff6a3 5SHA512 (php-7.0.13.tar.bz2) = 53276fbd35855b9337120fd74f6932e70822b8e5508b6bed068a78805049d36960300e781ec5640f4a90f2d4a09e506084a865341d151bc5c87b7777cb5ff6a3
6Size (php-7.0.13.tar.bz2) = 15239442 bytes 6Size (php-7.0.13.tar.bz2) = 15239442 bytes
7SHA1 (patch-acinclude.m4) = b682280fd89950c082c2226bdb7364b0dc475bad 7SHA1 (patch-acinclude.m4) = 81a8f33a536500978ea5a9aa2d2875c61c843e56
8SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c 8SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c
9SHA1 (patch-ext_gd_config.m4) = bde93678626592cdcee619189bfc6532d0913a76 9SHA1 (patch-ext_gd_config.m4) = bde93678626592cdcee619189bfc6532d0913a76
10SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92 10SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92
11SHA1 (patch-ext_pcre_pcrelib_config.h) = c5fba95856628f68639fe63feeef04a5f83d3916 11SHA1 (patch-ext_pcre_pcrelib_config.h) = c5fba95856628f68639fe63feeef04a5f83d3916
12SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8 12SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8
13SHA1 (patch-ext_pdo_config.m4) = 522281775cc0e70a135b1f813158988ef1f3e244 13SHA1 (patch-ext_pdo_config.m4) = 522281775cc0e70a135b1f813158988ef1f3e244
14SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426 14SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426
15SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8 15SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8
16SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159 16SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159
17SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5 17SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5
18SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56 18SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56
19SHA1 (patch-ext_standard_php__dns.h) = 3687ceac4dff4605263b53acb761b071f7446ccb 19SHA1 (patch-ext_standard_php__dns.h) = 3687ceac4dff4605263b53acb761b071f7446ccb
20SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5 20SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5
cvs diff -r1.1 -r1.2 pkgsrc/lang/php70/patches/Attic/patch-acinclude.m4 (expand / switch to unified diff)

--- pkgsrc/lang/php70/patches/Attic/patch-acinclude.m4 2015/12/06 15:17:31 1.1
+++ pkgsrc/lang/php70/patches/Attic/patch-acinclude.m4 2016/12/06 08:53:48 1.2
@@ -1,13 +1,31 @@ @@ -1,13 +1,31 @@
1$NetBSD: patch-acinclude.m4,v 1.1 2015/12/06 15:17:31 taca Exp $ 1$NetBSD: patch-acinclude.m4,v 1.2 2016/12/06 08:53:48 adam Exp $
2 2
3--- acinclude.m4.orig 2015-06-23 17:33:33.000000000 +0000 3On Darwin, allow native iconv when Command Line Tools are not installed.
 4
 5--- acinclude.m4.orig 2016-11-09 01:22:57.000000000 +0000
4+++ acinclude.m4 6+++ acinclude.m4
5@@ -2354,7 +2354,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ 7@@ -2355,7 +2355,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
6 if test "$found_openssl" = "no"; then 8 if test "$found_openssl" = "no"; then
7  9
8 if test "$PHP_OPENSSL_DIR" = "yes"; then 10 if test "$PHP_OPENSSL_DIR" = "yes"; then
9- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" 11- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
10+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /" 12+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
11 fi 13 fi
12  14
13 for i in $PHP_OPENSSL_DIR; do 15 for i in $PHP_OPENSSL_DIR; do
 16@@ -2489,7 +2489,15 @@ AC_DEFUN([PHP_SETUP_ICONV], [
 17 done
 18
 19 if test -z "$ICONV_DIR"; then
 20+ case $host_alias in
 21+ *darwin*)
 22+ ICONV_DIR=/usr
 23+ iconv_lib_name=iconv
 24+ ;;
 25+ *)
 26 AC_MSG_ERROR([Please specify the install prefix of iconv with --with-iconv=<DIR>])
 27+ ;;
 28+ esac
 29 fi
 30
 31 if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a ||