From c8b1a078bac18fd2f0a93940350f22b416c41c25 Mon Sep 17 00:00:00 2001
From: sborrill <sborrill@pkgsrc.org>
Date: Fri, 12 Sep 2008 16:00:56 +0000
Subject: Make ssl support an option (that defaults to on)

---
 net/rdesktop/Makefile   |  4 +---
 net/rdesktop/options.mk | 11 ++++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'net/rdesktop')

diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile
index 5d751494f22..d7f36d1e661 100644
--- a/net/rdesktop/Makefile
+++ b/net/rdesktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2008/06/08 16:29:28 tron Exp $
+# $NetBSD: Makefile,v 1.36 2008/09/12 16:00:56 sborrill Exp $
 
 DISTNAME=		rdesktop-1.6.0
 CATEGORIES=		net
@@ -12,7 +12,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-x=${X11BASE:Q}
-CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
 
 LDFLAGS+=		${LIBOSSAUDIO}
 
@@ -28,7 +27,6 @@ SUBST_MESSAGE.audio=	Fixing hardcoded audio device.
 CONFIGURE_ARGS+=	--with-sound=oss
 .endif
 
-.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/net/rdesktop/options.mk b/net/rdesktop/options.mk
index d6397d9ab6b..de84db1e25a 100644
--- a/net/rdesktop/options.mk
+++ b/net/rdesktop/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2008/06/08 16:29:28 tron Exp $
+# $NetBSD: options.mk,v 1.2 2008/09/12 16:00:56 sborrill Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.rdesktop
-PKG_SUPPORTED_OPTIONS+=	inet6
-PKG_SUGGESTED_OPTIONS+=	inet6
+PKG_SUPPORTED_OPTIONS+=	inet6 ssl
+PKG_SUGGESTED_OPTIONS+=	inet6 ssl
 
 .include "../../mk/bsd.options.mk"
 
@@ -12,3 +12,8 @@ PKG_SUGGESTED_OPTIONS+=	inet6
 .if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGE+=	--with-ipv6
 .endif
+
+.if !empty(PKG_OPTIONS:Mssl)
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
+.include "../../security/openssl/buildlink3.mk"
+.endif
-- 
cgit v1.2.3