Sun Sep 20 10:44:51 2009 UTC ()
Don't do crazy CFLAGS 's/-I/-isystem /' substitutions in configure.
(this prevented pkgsrc wrappers from doing their work)


(tnn)
diff -r1.60 -r1.61 pkgsrc/www/curl/distinfo
diff -r1.13 -r1.14 pkgsrc/www/curl/patches/patch-aa
cvs diff -r1.60 -r1.61 pkgsrc/www/curl/distinfo (expand / switch to unified diff)

--- pkgsrc/www/curl/distinfo 2009/08/16 13:47:35 1.60
+++ pkgsrc/www/curl/distinfo 2009/09/20 10:44:51 1.61
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.60 2009/08/16 13:47:35 wiz Exp $ 1$NetBSD: distinfo,v 1.61 2009/09/20 10:44:51 tnn Exp $
2 2
3SHA1 (curl-7.19.6.tar.bz2) = b7cb98c7a6577de7073d0b0c23eecdb8ed993e8e 3SHA1 (curl-7.19.6.tar.bz2) = b7cb98c7a6577de7073d0b0c23eecdb8ed993e8e
4RMD160 (curl-7.19.6.tar.bz2) = 7627d78ec681a513972be0cb5473b26805f44d83 4RMD160 (curl-7.19.6.tar.bz2) = 7627d78ec681a513972be0cb5473b26805f44d83
5Size (curl-7.19.6.tar.bz2) = 2347791 bytes 5Size (curl-7.19.6.tar.bz2) = 2347791 bytes
6SHA1 (patch-aa) = 2f9651c723ed91efecc7e565e74bc7740628163f 6SHA1 (patch-aa) = dd7708e359f63552970640366855fbf8669461df
cvs diff -r1.13 -r1.14 pkgsrc/www/curl/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/www/curl/patches/Attic/patch-aa 2009/01/08 16:25:45 1.13
+++ pkgsrc/www/curl/patches/Attic/patch-aa 2009/09/20 10:44:51 1.14
@@ -1,27 +1,36 @@ @@ -1,27 +1,36 @@
1$NetBSD: patch-aa,v 1.13 2009/01/08 16:25:45 wiz Exp $ 1$NetBSD: patch-aa,v 1.14 2009/09/20 10:44:51 tnn Exp $
2 2
3--- configure.orig 2008-11-10 16:23:17.000000000 +0100 3--- configure.orig 2009-07-22 22:11:25.000000000 +0200
4+++ configure 4+++ configure
5@@ -31645,7 +31645,7 @@ echo "${ECHO_T}yes" >&6; } 5@@ -16858,7 +16858,7 @@ squeeze() {
 6
 7
 8 #
 9- if test "$compiler_id" != "unknown"; then
 10+ if false; then
 11 #
 12 if test "$compiler_id" = "GNU_C"; then
 13
 14@@ -23439,7 +23439,7 @@ $as_echo "yes" >&6; }
6 GSSAPI_LIBS=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi` 15 GSSAPI_LIBS=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
7 elif test "$GSSAPI_ROOT" != "yes"; then 16 elif test "$GSSAPI_ROOT" != "yes"; then
8 GSSAPI_INCS="-I$GSSAPI_ROOT/include" 17 GSSAPI_INCS="-I$GSSAPI_ROOT/include"
9- GSSAPI_LIBS="-lgssapi" 18- GSSAPI_LIBS="-lgssapi"
10+ GSSAPI_LIBS="-lgssapi -lkrb5" 19+ GSSAPI_LIBS="-lgssapi -lkrb5"
11 fi 20 fi
12 fi 21 fi
13  22
14@@ -32192,13 +32192,13 @@ _ACEOF 23@@ -23996,13 +23996,13 @@ _ACEOF
15 LIBS="$LIBS $gss_libs" 24 LIBS="$LIBS $gss_libs"
16 elif test "$GSSAPI_ROOT" != "yes"; then 25 elif test "$GSSAPI_ROOT" != "yes"; then
17 LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff" 26 LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"
18- LIBS="$LIBS -lgssapi" 27- LIBS="$LIBS -lgssapi"
19+ LIBS="$LIBS -lgssapi -lkrb5" 28+ LIBS="$LIBS -lgssapi -lkrb5"
20 else 29 else
21- LIBS="$LIBS -lgssapi" 30- LIBS="$LIBS -lgssapi"
22+ LIBS="$LIBS -lgssapi -lkrb5" 31+ LIBS="$LIBS -lgssapi -lkrb5"
23 fi 32 fi
24 else 33 else
25 LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR" 34 LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR"
26- LIBS="$LIBS -lgssapi" 35- LIBS="$LIBS -lgssapi"
27+ LIBS="$LIBS -lgssapi -lkrb5" 36+ LIBS="$LIBS -lgssapi -lkrb5"