CVS commit: pkgsrc/lang/php56

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Dec  5 18:17:12 UTC 2016

Modified Files:
        pkgsrc/lang/php56: distinfo
        pkgsrc/lang/php56/patches: patch-acinclude.m4

Log Message:
On Darwin, allow native iconv when Command Line Tools are not installed.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/lang/php56/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php56/patches/patch-acinclude.m4

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

Modified files:

Index: pkgsrc/lang/php56/distinfo
diff -u pkgsrc/lang/php56/distinfo:1.36 pkgsrc/lang/php56/distinfo:1.37
--- pkgsrc/lang/php56/distinfo:1.36     Sat Nov 12 15:34:00 2016
+++ pkgsrc/lang/php56/distinfo  Mon Dec  5 18:17:11 2016
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.36 2016/11/12 15:34:00 taca Exp $
+$NetBSD: distinfo,v 1.37 2016/12/05 18:17:11 adam Exp $
 
 SHA1 (php-5.6.28.tar.bz2) = 57fa0f8a69ecebc6da4fb79162ed8b1f9a6248db
 RMD160 (php-5.6.28.tar.bz2) = 8444619a3dd44d6db049d8783fc77b86f42a2cca
 SHA512 (php-5.6.28.tar.bz2) = 57efbbf422b74d74cdbc701ada03e3eb517bbc543169de642bada5843f612e2f1a43f1654b0ab92d015d3d1e777ac15c630d05f98f0ee259f2e3c0ba63b9dbc2
 Size (php-5.6.28.tar.bz2) = 14987935 bytes
-SHA1 (patch-acinclude.m4) = b38fc34c3a3847dc317e8e286612b21ec8fd5ce8
+SHA1 (patch-acinclude.m4) = 34d38d2538cc00932cdfcc80d1d4a91632cd15d0
 SHA1 (patch-configure) = 5d76f71aa903efa3c3491b908ff76419aa4af27c
 SHA1 (patch-ext_gd_config.m4) = b92ab4c7fe8aceaef7787a607a7d2eac258fee19
 SHA1 (patch-ext_imap_config.m4) = 9c6ed6966366c4fe1b7cfd34b5910e2ff0e68577

Index: pkgsrc/lang/php56/patches/patch-acinclude.m4
diff -u pkgsrc/lang/php56/patches/patch-acinclude.m4:1.1 pkgsrc/lang/php56/patches/patch-acinclude.m4:1.2
--- pkgsrc/lang/php56/patches/patch-acinclude.m4:1.1    Mon Nov 24 15:37:08 2014
+++ pkgsrc/lang/php56/patches/patch-acinclude.m4        Mon Dec  5 18:17:11 2016
@@ -1,6 +1,8 @@
-$NetBSD: patch-acinclude.m4,v 1.1 2014/11/24 15:37:08 taca Exp $
+$NetBSD: patch-acinclude.m4,v 1.2 2016/12/05 18:17:11 adam Exp $
 
---- acinclude.m4.orig  2014-11-12 13:52:21.000000000 +0000
+On Darwin, allow native iconv when Command Line Tools are not installed.
+
+--- acinclude.m4.orig  2016-11-09 01:22:57.000000000 +0000
 +++ acinclude.m4
 @@ -2354,7 +2354,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
    if test "$found_openssl" = "no"; then
@@ -11,3 +13,19 @@ $NetBSD: patch-acinclude.m4,v 1.1 2014/1
      fi
  
      for i in $PHP_OPENSSL_DIR; do
+@@ -2488,7 +2488,15 @@ AC_DEFUN([PHP_SETUP_ICONV], [
+     done
+ 
+     if test -z "$ICONV_DIR"; then
++    case $host_alias in
++    *darwin*)
++      ICONV_DIR=/usr
++      iconv_lib_name=iconv
++      ;;
++    *)
+       AC_MSG_ERROR([Please specify the install prefix of iconv with --with-iconv=<DIR>])
++      ;;
++    esac
+     fi
+   
+     if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a ||