CVS commit: pkgsrc/www/curl

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Nov  3 09:40:37 UTC 2017

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

Log Message:
curl: Don't strip out user-supplied debug flags.


To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 pkgsrc/www/curl/distinfo
cvs rdiff -u -r1.2 -r1.3 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.138 pkgsrc/www/curl/distinfo:1.139
--- pkgsrc/www/curl/distinfo:1.138      Mon Oct 23 06:59:36 2017
+++ pkgsrc/www/curl/distinfo    Fri Nov  3 09:40:37 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.138 2017/10/23 06:59:36 adam Exp $
+$NetBSD: distinfo,v 1.139 2017/11/03 09:40:37 jperkin Exp $
 
 SHA1 (curl-7.56.1.tar.bz2) = f17b8f71f801b266828067f6f7c0e950509890b9
 RMD160 (curl-7.56.1.tar.bz2) = ee08c268c414be3d2c9a0bbcb9b7fbcfb33f48e9
 SHA512 (curl-7.56.1.tar.bz2) = f8a602e6890b2791ea9199c80801ffd027980de3733d4ab001ee80b5167f840cc821c6fe7852087c88a471edc9d3f328cf660af3e2c6f7139d6c8de62b0ade68
 Size (curl-7.56.1.tar.bz2) = 2824548 bytes
-SHA1 (patch-configure) = fac0071bbb22cb379f36477e0e806a8f9f4d43eb
+SHA1 (patch-configure) = ba8abac55f11a53d07235e57d21ce5b32a421902
 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.2 pkgsrc/www/curl/patches/patch-configure:1.3
--- pkgsrc/www/curl/patches/patch-configure:1.2 Wed Jul  5 10:34:12 2017
+++ pkgsrc/www/curl/patches/patch-configure     Fri Nov  3 09:40:37 2017
@@ -1,13 +1,15 @@
-$NetBSD: patch-configure,v 1.2 2017/07/05 10:34:12 adam Exp $
+$NetBSD: patch-configure,v 1.3 2017/11/03 09:40:37 jperkin Exp $
 
 builtin krb5-config in platforms such as solaris do not support
 the gssapi option, and need an explicit -lgss
 
 On Darwin, do not append custom CFLAGS.
 
---- configure.orig     2017-06-14 06:10:57.000000000 +0000
+Do not strip debug flags.
+
+--- configure.orig     2017-10-17 14:31:48.000000000 +0000
 +++ configure
-@@ -4241,6 +4241,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar
+@@ -4272,6 +4272,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar
          ;;
      esac
    done
@@ -15,7 +17,7 @@ On Darwin, do not append custom CFLAGS.
    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;}
-@@ -17702,7 +17703,7 @@ squeeze() {
+@@ -17159,7 +17160,7 @@ squeeze() {
  
  
        #
@@ -24,7 +26,21 @@ On Darwin, do not append custom CFLAGS.
      #
      if test "$compiler_id" = "GNU_C" ||
        test "$compiler_id" = "CLANG"; then
-@@ -19639,7 +19640,7 @@ $as_echo "no" >&6; }
+@@ -17482,13 +17483,6 @@ $as_echo_n "checking if compiler accepts
+       tmp_options="$flags_dbg_off"
+     fi
+     #
+-    if test "$flags_prefer_cppflags" = "yes"; then
+-      CPPFLAGS="$tmp_CPPFLAGS $tmp_options"
+-      CFLAGS="$tmp_CFLAGS"
+-    else
+-      CPPFLAGS="$tmp_CPPFLAGS"
+-      CFLAGS="$tmp_CFLAGS $tmp_options"
+-    fi
+     squeeze CPPFLAGS
+     squeeze CFLAGS
+ 
+@@ -19122,7 +19116,7 @@ $as_echo "no" >&6; }
    tst_cflags="no"
    case $host_os in
      darwin*)
@@ -33,7 +49,7 @@ On Darwin, do not append custom CFLAGS.
        ;;
    esac
  
-@@ -22272,7 +22273,11 @@ $as_echo "yes" >&6; }
+@@ -21788,7 +21782,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
@@ -46,7 +62,7 @@ On Darwin, do not append custom CFLAGS.
       elif test "$GSSAPI_ROOT" != "yes"; then
          GSSAPI_INCS="-I$GSSAPI_ROOT/include"
       fi
-@@ -22445,7 +22450,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
+@@ -21961,7 +21959,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
          LIBS="-lgss $LIBS"
          ;;
       *)