diff options
| author | agc <agc> | 2012-12-17 23:26:47 +0000 |
|---|---|---|
| committer | agc <agc> | 2012-12-17 23:26:47 +0000 |
| commit | d01fa04c0a0cb378408ebfa2d9f5dd644e91043a (patch) | |
| tree | eaebb5b446d337b619f2378ceef3535687702124 | |
| parent | 8a3f6b8f3ebe73b7430f990b37be3fbbb65bc986 (diff) | |
| download | pkgsrc-d01fa04c0a0cb378408ebfa2d9f5dd644e91043a.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.
| -rw-r--r-- | mk/defaults/options.description | 1 | ||||
| -rw-r--r-- | www/curl/Makefile | 3 | ||||
| -rw-r--r-- | www/curl/options.mk | 13 |
3 files changed, 12 insertions, 5 deletions
diff --git a/mk/defaults/options.description b/mk/defaults/options.description index 7fbe6c8a447..590f970db35 100644 --- a/mk/defaults/options.description +++ b/mk/defaults/options.description @@ -364,6 +364,7 @@ libgcrypt Use GNU cryptographic library. libgme Enable Game_Music_Emu video game music file library support. libgpod Enable libgpod support. libiconv-cp932 Add supplemental support for CP932. +libidn Add support for libidn text conversion. libind Add Indian script support using libind. liblqr Enable liblqr (liquid rescale) support. libmms Enable streaming from mms:// URLS using libmms. 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 |