CVS commit: pkgsrc/www/curl

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jul  5 10:34:12 UTC 2017

Modified Files:
        pkgsrc/www/curl: distinfo
        pkgsrc/www/curl/patches: patch-configure

Log Message:
On Darwin, do not add special compiler flags; fixes building on High Sierra


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 pkgsrc/www/curl/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/curl/patches/patch-configure

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

Modified files:

Index: pkgsrc/www/curl/distinfo
diff -u pkgsrc/www/curl/distinfo:1.133 pkgsrc/www/curl/distinfo:1.134
--- pkgsrc/www/curl/distinfo:1.133      Wed Jun 14 07:11:41 2017
+++ pkgsrc/www/curl/distinfo    Wed Jul  5 10:34:12 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.133 2017/06/14 07:11:41 adam Exp $
+$NetBSD: distinfo,v 1.134 2017/07/05 10:34:12 adam Exp $
 
 SHA1 (curl-7.54.1.tar.bz2) = f5193316e4b5ff23505cb09bc946763d35d02cd6
 RMD160 (curl-7.54.1.tar.bz2) = 6f8eb154e020157811b72a27688840ca10321320
 SHA512 (curl-7.54.1.tar.bz2) = eb9639677f0ca1521ca631c520ab83ad071c52b31690e5e7f31546f6a44b2f11d1bb62282056cffb570eb290bf1e7830e87cb536295ac6a54a904663e795f2da
 Size (curl-7.54.1.tar.bz2) = 2612443 bytes
-SHA1 (patch-configure) = 0f065d05cdf9b36e49253481b90ee7c057e87998
+SHA1 (patch-configure) = fac0071bbb22cb379f36477e0e806a8f9f4d43eb
 SHA1 (patch-curl-config.in) = d0cc7bb6a5bf0b9257f40dcffce7093cc0098eb7
 SHA1 (patch-lib_hostcheck.c) = 8e772d3f91cdafae17281cc19004269ece0cf308

Index: pkgsrc/www/curl/patches/patch-configure
diff -u pkgsrc/www/curl/patches/patch-configure:1.1 pkgsrc/www/curl/patches/patch-configure:1.2
--- pkgsrc/www/curl/patches/patch-configure:1.1 Sun Feb 26 08:37:47 2017
+++ pkgsrc/www/curl/patches/patch-configure     Wed Jul  5 10:34:12 2017
@@ -1,11 +1,13 @@
-$NetBSD: patch-configure,v 1.1 2017/02/26 08:37:47 adam Exp $
+$NetBSD: patch-configure,v 1.2 2017/07/05 10:34:12 adam Exp $
 
 builtin krb5-config in platforms such as solaris do not support
 the gssapi option, and need an explicit -lgss
 
---- configure.orig     2017-02-23 09:52:01.000000000 +0000
+On Darwin, do not append custom CFLAGS.
+
+--- configure.orig     2017-06-14 06:10:57.000000000 +0000
 +++ configure
-@@ -3820,6 +3820,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar
+@@ -4241,6 +4241,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar
          ;;
      esac
    done
@@ -13,7 +15,7 @@ the gssapi option, and need an explicit 
    if test $xc_bad_var_cflags = yes; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5
  $as_echo "$as_me: using CFLAGS: $CFLAGS" >&6;}
-@@ -17281,7 +17282,7 @@ squeeze() {
+@@ -17702,7 +17703,7 @@ squeeze() {
  
  
        #
@@ -22,7 +24,16 @@ the gssapi option, and need an explicit 
      #
      if test "$compiler_id" = "GNU_C" ||
        test "$compiler_id" = "CLANG"; then
-@@ -21846,7 +21847,11 @@ $as_echo "yes" >&6; }
+@@ -19639,7 +19640,7 @@ $as_echo "no" >&6; }
+   tst_cflags="no"
+   case $host_os in
+     darwin*)
+-      tst_cflags="yes"
++      tst_cflags="no"
+       ;;
+   esac
+ 
+@@ -22272,7 +22273,11 @@ $as_echo "yes" >&6; }
       if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
          GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
       elif test -f "$KRB5CONFIG"; then
@@ -35,7 +46,7 @@ the gssapi option, and need an explicit 
       elif test "$GSSAPI_ROOT" != "yes"; then
          GSSAPI_INCS="-I$GSSAPI_ROOT/include"
       fi
-@@ -22019,7 +22024,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
+@@ -22445,7 +22450,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
          LIBS="-lgss $LIBS"
          ;;
       *)