diff options
| author | drochner <drochner@pkgsrc.org> | 2008-03-10 18:35:54 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2008-03-10 18:35:54 +0000 |
| commit | fcd5cc0af744abd921cdc98ee5eef6620310b094 (patch) | |
| tree | a136078dbec2cc0b74c39adee7dd45c64701e07d /www | |
| parent | 16edcb2fd89f356e6b4964a3a626813e2011b39d (diff) | |
| download | pkgsrc-fcd5cc0af744abd921cdc98ee5eef6620310b094.tar.gz | |
-make the gssapi option default on NetBSD (where Kerberos comes for free)
(suggested by Todd Kover in PR pkg/36144)
-propagate the krb dependency through bl3 if necessary
-bump PKGREVISION
Diffstat (limited to 'www')
| -rw-r--r-- | www/curl/Makefile | 3 | ||||
| -rw-r--r-- | www/curl/buildlink3.mk | 5 | ||||
| -rw-r--r-- | www/curl/options.mk | 7 |
3 files changed, 12 insertions, 3 deletions
diff --git a/www/curl/Makefile b/www/curl/Makefile index 5dee1ab3caf..3019ec10e2f 100644 --- a/www/curl/Makefile +++ b/www/curl/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.79 2008/03/02 14:40:26 bjs Exp $ +# $NetBSD: Makefile,v 1.80 2008/03/10 18:35:54 drochner Exp $ DISTNAME= curl-7.18.0 +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= http://curl.haxx.se/download/ \ ftp://ftp.sunet.se/pub/www/utilities/curl/ diff --git a/www/curl/buildlink3.mk b/www/curl/buildlink3.mk index 80ae9f32f09..269f5071aee 100644 --- a/www/curl/buildlink3.mk +++ b/www/curl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2008/03/02 14:40:26 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2008/03/10 18:35:54 drochner Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ CURL_BUILDLINK3_MK:= ${CURL_BUILDLINK3_MK}+ @@ -21,6 +21,9 @@ pkgbase:= curl . if !empty(PKG_BUILD_OPTIONS.curl:Mlibssh2) . include "../../security/libssh2/buildlink3.mk" . endif +. if !empty(PKG_BUILD_OPTIONS.curl:Mgssapi) +. include "../../mk/krb5.buildlink3.mk" +. endif .endif # CURL_BUILDLINK3_MK .include "../../devel/libidn/buildlink3.mk" diff --git a/www/curl/options.mk b/www/curl/options.mk index 3f23f3c7152..8baef87cb1a 100644 --- a/www/curl/options.mk +++ b/www/curl/options.mk @@ -1,7 +1,12 @@ -# $NetBSD: options.mk,v 1.3 2008/03/03 18:48:21 drochner Exp $ +# $NetBSD: options.mk,v 1.4 2008/03/10 18:35:54 drochner Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.curl PKG_SUPPORTED_OPTIONS= inet6 libssh2 gssapi +.include "../../mk/bsd.prefs.mk" +.if ${OPSYS} == NetBSD +# Kerberos is built in - no additional dependency +PKG_SUGGESTED_OPTIONS+= gssapi +.endif .include "../../mk/bsd.options.mk" |