tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Patch to www/curl for libidn



Hi,

Does anyone have any problem with the attached patch to make libidn
support in curl switchable - default is on, still, but allows us to
build curl without libidn support.  One of the reasons for this is
that libidn is:

LICENSE=        gnu-gpl-v3 AND gnu-lgpl-v2.1

Thanks,
Alistair
Index: mk/defaults/options.description
===================================================================
RCS file: /cvsroot/pkgsrc/mk/defaults/options.description,v
retrieving revision 1.408
diff -u -r1.408 options.description
--- mk/defaults/options.description     24 Nov 2012 22:28:36 -0000      1.408
+++ mk/defaults/options.description     16 Dec 2012 19:21:31 -0000
@@ -361,6 +361,7 @@
 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.
Index: www/curl/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/curl/Makefile,v
retrieving revision 1.120
diff -u -r1.120 Makefile
--- www/curl/Makefile   16 Dec 2012 01:52:38 -0000      1.120
+++ www/curl/Makefile   16 Dec 2012 19:21:31 -0000
@@ -52,7 +52,6 @@
                        ${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"
Index: www/curl/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/curl/options.mk,v
retrieving revision 1.9
diff -u -r1.9 options.mk
--- www/curl/options.mk 12 Oct 2012 07:36:11 -0000      1.9
+++ www/curl/options.mk 16 Dec 2012 19:21:31 -0000
@@ -1,8 +1,8 @@
 # $NetBSD: options.mk,v 1.9 2012/10/12 07:36:11 adam 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 @@
 .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


Home | Main Index | Thread Index | Old Index