summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authordrochner <drochner>2012-01-09 14:53:31 +0000
committerdrochner <drochner>2012-01-09 14:53:31 +0000
commit1ef3310a3bf7f822c4adcd55958a7cc7e80f1b54 (patch)
treedd941643282dbdaf377fc9d31f02786d407395ff /net
parent39c83d4d0ba7144fbbb95f8523df8246d7665644 (diff)
downloadpkgsrc-1ef3310a3bf7f822c4adcd55958a7cc7e80f1b54.tar.gz
clean up in some cases where the faked "libgnutls-config" script
is not needed anymore
Diffstat (limited to 'net')
-rw-r--r--net/filezilla/Makefile3
-rw-r--r--net/lftp/options.mk4
2 files changed, 3 insertions, 4 deletions
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}