diff options
author | dholland <dholland> | 2008-05-12 20:37:06 +0000 |
---|---|---|
committer | dholland <dholland> | 2008-05-12 20:37:06 +0000 |
commit | 1206932d22b1967663ab706c864312279e95c7bf (patch) | |
tree | 96b29caf847afece1289d1c82254b708bee43c98 | |
parent | 83b0232baa791c7a8b124d5fb490ba8b005561c0 (diff) | |
download | pkgsrc-1206932d22b1967663ab706c864312279e95c7bf.tar.gz |
Add explicit -lkrb5 with -lgssapi, when enabled. Fixes broken build
on NetBSD 3.x. PR pkg/38331. PKGREVISION++.
Ok: joerg
-rw-r--r-- | www/curl/Makefile | 4 | ||||
-rw-r--r-- | www/curl/distinfo | 3 | ||||
-rw-r--r-- | www/curl/patches/patch-aa | 29 |
3 files changed, 33 insertions, 3 deletions
diff --git a/www/curl/Makefile b/www/curl/Makefile index 4d411a44aa6..9bd05124fe7 100644 --- a/www/curl/Makefile +++ b/www/curl/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.81 2008/05/02 05:08:22 xtraeme Exp $ +# $NetBSD: Makefile,v 1.82 2008/05/12 20:37:06 dholland 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 --git a/www/curl/distinfo b/www/curl/distinfo index 4b226d80c11..0f77c3facc9 100644 --- a/www/curl/distinfo +++ b/www/curl/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.54 2008/03/02 14:40:26 bjs Exp $ +$NetBSD: distinfo,v 1.55 2008/05/12 20:37:06 dholland 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 --git a/www/curl/patches/patch-aa b/www/curl/patches/patch-aa new file mode 100644 index 00000000000..da983574515 --- /dev/null +++ b/www/curl/patches/patch-aa @@ -0,0 +1,29 @@ +$NetBSD: patch-aa,v 1.12 2008/05/12 20:37:06 dholland 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" |