[pkgsrc/pkgsrc-2008Q1]: pkgsrc/www/curl pullup ticket #2375 - requested by dh...

[rtr <rtr%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7f65e6466dc3
branches:  pkgsrc-2008Q1
changeset: 540335:7f65e6466dc3
user:      rtr <rtr%pkgsrc.org@localhost>
date:      Tue May 13 12:55:30 2008 +0000

description:
pullup ticket #2375 - requested by dholland
curl: fix broken build on netbsd 3

revisions pulled up:
- pkgsrc/www/curl/Makefile              1.82
- pkgsrc/www/curl/distinfo              1.55
- pkgsrc/www/curl/patches/patch-aa      1.12

   Module Name: pkgsrc
   Committed By:        dholland
   Date:                Mon May 12 20:37:06 UTC 2008

   Modified Files:
        pkgsrc/www/curl: Makefile distinfo
   Added Files:
        pkgsrc/www/curl/patches: patch-aa

   Log Message:
   Add explicit -lkrb5 with -lgssapi, when enabled. Fixes broken build
   on NetBSD 3.x. PR pkg/38331. PKGREVISION++.
   Ok: joerg

diffstat:

 www/curl/Makefile         |   4 ++--
 www/curl/distinfo         |   3 ++-
 www/curl/patches/patch-aa |  29 +++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)

diffs (57 lines):

diff -r 439dd2535e72 -r 7f65e6466dc3 www/curl/Makefile
--- a/www/curl/Makefile Tue May 13 12:35:44 2008 +0000
+++ b/www/curl/Makefile Tue May 13 12:55:30 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2008/03/10 18:35:54 drochner Exp $
+# $NetBSD: Makefile,v 1.80.2.1 2008/05/13 12:55:30 rtr Exp $
 
 DISTNAME=      curl-7.18.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  http://curl.haxx.se/download/ \
                ftp://ftp.sunet.se/pub/www/utilities/curl/
diff -r 439dd2535e72 -r 7f65e6466dc3 www/curl/distinfo
--- a/www/curl/distinfo Tue May 13 12:35:44 2008 +0000
+++ b/www/curl/distinfo Tue May 13 12:55:30 2008 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.54 2008/03/02 14:40:26 bjs Exp $
+$NetBSD: distinfo,v 1.54.2.1 2008/05/13 12:55:30 rtr Exp $
 
 SHA1 (curl-7.18.0.tar.bz2) = f561a6a1f285c22d1f6a54b4dfa19b6cb9362c2a
 RMD160 (curl-7.18.0.tar.bz2) = f25ec844e7ef6221719439b3214fd3c3a42f5604
 Size (curl-7.18.0.tar.bz2) = 1779421 bytes
+SHA1 (patch-aa) = e9bf335832b55aa3a0ff12fa6a958594c961b3ad
diff -r 439dd2535e72 -r 7f65e6466dc3 www/curl/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/curl/patches/patch-aa Tue May 13 12:55:30 2008 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-aa,v 1.11.18.1 2008/05/13 12:55:30 rtr Exp $
+
+--- configure.orig     2008-01-28 06:59:49.000000000 -0500
++++ configure  2008-03-29 12:29:42.000000000 -0400
+@@ -25049,7 +25049,7 @@
+         GSSAPI_LIBS=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
+      elif test "$GSSAPI_ROOT" != "yes"; then
+         GSSAPI_INCS="-I$GSSAPI_ROOT/include"
+-        GSSAPI_LIBS="-lgssapi"
++        GSSAPI_LIBS="-lgssapi -lkrb5"
+      fi
+   fi
+ 
+@@ -25516,12 +25516,12 @@
+         gss_ldflags=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
+         LDFLAGS="$LDFLAGS $gss_ldflags"
+      elif test "$GSSAPI_ROOT" != "yes"; then
+-        LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff -lgssapi"
++        LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff -lgssapi -lkrb5"
+      else
+-        LDFLAGS="$LDFLAGS -lgssapi"
++        LDFLAGS="$LDFLAGS -lgssapi -lkrb5"
+      fi
+   else
+-     LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR -lgssapi"
++     LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR -lgssapi -lkrb5"
+   fi
+ else
+   CPPFLAGS="$save_CPPFLAGS"