diff options
| -rw-r--r-- | chat/weechat/options.mk | 3 | ||||
| -rw-r--r-- | databases/freetds/options.mk | 4 | ||||
| -rw-r--r-- | net/filezilla/Makefile | 3 | ||||
| -rw-r--r-- | net/lftp/options.mk | 4 | ||||
| -rw-r--r-- | www/elinks/Makefile | 4 | ||||
| -rw-r--r-- | www/elinks/options.mk | 5 |
6 files changed, 9 insertions, 14 deletions
diff --git a/chat/weechat/options.mk b/chat/weechat/options.mk index ea0b18df5d1..f2236b7fbd0 100644 --- a/chat/weechat/options.mk +++ b/chat/weechat/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2009/07/18 06:04:33 tonio Exp $ +# $NetBSD: options.mk,v 1.8 2012/01/09 14:53:31 drochner Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.weechat PKG_SUPPORTED_OPTIONS= charset gnutls python lua wide-curses perl ruby @@ -17,7 +17,6 @@ CONFIGURE_ARGS+= --disable-charset .if !empty(PKG_OPTIONS:Mgnutls) .include "../../security/gnutls/buildlink3.mk" -.include "../../security/gnutls/libgnutls-config.mk" .endif .if !empty(PKG_OPTIONS:Mwide-curses) diff --git a/databases/freetds/options.mk b/databases/freetds/options.mk index 6c7d0243ca6..76216cc2874 100644 --- a/databases/freetds/options.mk +++ b/databases/freetds/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2011/10/17 03:44:54 sbd Exp $ +# $NetBSD: options.mk,v 1.8 2012/01/09 14:53:31 drochner Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.freetds PKG_OPTIONS_OPTIONAL_GROUPS+= odbc tls @@ -48,8 +48,8 @@ CONFIGURE_ARGS+= --disable-odbc ### Use GNU TLS for TLSv1 encrypted session to MSSQL servers. ### .if !empty(PKG_OPTIONS:Mgnutls) +USE_TOOLS+= pkg-config .include "../../security/gnutls/buildlink3.mk" -.include "../../security/gnutls/libgnutls-config.mk" CONFIGURE_ARGS+= --with-gnutls .else CONFIGURE_ARGS+= --without-gnutls diff --git a/net/filezilla/Makefile b/net/filezilla/Makefile index 2f8d5e85296..2c08342ae49 100644 --- a/net/filezilla/Makefile +++ b/net/filezilla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2011/12/21 14:06:43 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2012/01/09 14:53:31 drochner Exp $ # VERSION= 3.5.0 @@ -33,7 +33,6 @@ CONFIGURE_ARGS+= --with-tinyxml=builtin .include "../../devel/libidn/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../security/gnutls/buildlink3.mk" -.include "../../security/gnutls/libgnutls-config.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../x11/wxGTK28/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/lftp/options.mk b/net/lftp/options.mk index 8cf857ff7c7..884830761b4 100644 --- a/net/lftp/options.mk +++ b/net/lftp/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.11 2011/03/10 23:38:42 pettai Exp $ +# $NetBSD: options.mk,v 1.12 2012/01/09 14:53:31 drochner Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.lftp @@ -16,8 +16,8 @@ PKG_SUGGESTED_OPTIONS= ssl ### .if !empty(PKG_OPTIONS:Mgnutls) CONFIGURE_ARGS+= --without-openssl +USE_TOOLS+= pkg-config . include "../../security/gnutls/buildlink3.mk" -. include "../../security/gnutls/libgnutls-config.mk" .elif !empty(PKG_OPTIONS:Mssl) CONFIGURE_ARGS+= --without-gnutls CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} diff --git a/www/elinks/Makefile b/www/elinks/Makefile index 7448eb48449..90cd80c3b23 100644 --- a/www/elinks/Makefile +++ b/www/elinks/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2011/06/14 13:36:34 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2012/01/09 14:53:31 drochner Exp $ DISTNAME= elinks-0.12pre5 PKGNAME= ${DISTNAME:S/pre/rc/} @@ -15,7 +15,7 @@ PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config CONFIGURE_ARGS+= --datadir=${PREFIX}/share/${PKGBASE} CONFIGURE_ARGS+= --enable-256-colors diff --git a/www/elinks/options.mk b/www/elinks/options.mk index a155b6acf88..0bb59d96b02 100644 --- a/www/elinks/options.mk +++ b/www/elinks/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.12 2011/11/22 14:09:49 gdt Exp $ +# $NetBSD: options.mk,v 1.13 2012/01/09 14:53:31 drochner Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.elinks PKG_SUPPORTED_OPTIONS+= bittorrent nntp javascript finger gopher @@ -68,10 +68,7 @@ CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} .elif !empty(PKG_OPTIONS:Mgnutls) .include "../../security/gnutls/buildlink3.mk" -.include "../../security/gnutls/libgnutls-config.mk" -CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include -CONFIGURE_ARGS+= --with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib CONFIGURE_ARGS+= --without-openssl .endif |