diff options
| author | agc <agc@pkgsrc.org> | 2012-12-17 23:26:47 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2012-12-17 23:26:47 +0000 |
| commit | 2d24f7827fd3787a1d884537e32c78a32580c87e (patch) | |
| tree | eaebb5b446d337b619f2378ceef3535687702124 /www/curl | |
| parent | 7148fe207da809fadc48ba9004ba28a65a25a66c (diff) | |
| download | pkgsrc-2d24f7827fd3787a1d884537e32c78a32580c87e.tar.gz | |
Add a libidn option (defaulting to on) which allows libidn support to be
turned off in www/curl.
Modify the curl package to be aware of the libidn option. Ensure default
is on.
No functional change, so no version number bump.
Diffstat (limited to 'www/curl')
| -rw-r--r-- | www/curl/Makefile | 3 | ||||
| -rw-r--r-- | www/curl/options.mk | 13 |
2 files changed, 11 insertions, 5 deletions
diff --git a/www/curl/Makefile b/www/curl/Makefile index ed290259830..bad5443c8c7 100644 --- a/www/curl/Makefile +++ b/www/curl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.120 2012/12/16 01:52:38 obache Exp $ +# $NetBSD: Makefile,v 1.121 2012/12/17 23:26:47 agc Exp $ DISTNAME= curl-7.28.1 PKGREVISION= 1 @@ -52,7 +52,6 @@ post-install: ${DESTDIR}${PREFIX}/share/examples/curl; \ done -.include "../../devel/libidn/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/curl/options.mk b/www/curl/options.mk index a44ed279c65..04b1dfedf94 100644 --- a/www/curl/options.mk +++ b/www/curl/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.9 2012/10/12 07:36:11 adam Exp $ +# $NetBSD: options.mk,v 1.10 2012/12/17 23:26:47 agc Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.curl -PKG_SUPPORTED_OPTIONS= inet6 libssh2 gssapi ldap rtmp -PKG_SUGGESTED_OPTIONS= inet6 +PKG_SUPPORTED_OPTIONS= inet6 libssh2 gssapi ldap rtmp libidn +PKG_SUGGESTED_OPTIONS= inet6 libidn .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == NetBSD @@ -47,3 +47,10 @@ CONFIGURE_ARGS+= --with-librtmp .else CONFIGURE_ARGS+= --without-librtmp .endif + +.if !empty(PKG_OPTIONS:Mlibidn) +.include "../../devel/libidn/buildlink3.mk" +CONFIGURE_ARGS+= --with-libidn +.else +CONFIGURE_ARGS+= --without-libidn +.endif |