[pkgsrc/trunk]: pkgsrc/net/rdesktop Make ssl support an option (that defaults...

[sborrill <sborrill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2cfc44578c34
branches:  trunk
changeset: 547129:2cfc44578c34
user:      sborrill <sborrill%pkgsrc.org@localhost>
date:      Fri Sep 12 16:00:56 2008 +0000

description:
Make ssl support an option (that defaults to on)

diffstat:

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

diffs (49 lines):

diff -r 6a631a0471db -r 2cfc44578c34 net/rdesktop/Makefile
--- a/net/rdesktop/Makefile     Fri Sep 12 15:14:59 2008 +0000
+++ b/net/rdesktop/Makefile     Fri Sep 12 16:00:56 2008 +0000
@@ -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 @@
 
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --with-x=${X11BASE:Q}
-CONFIGURE_ARGS+=       --with-openssl=${SSLBASE:Q}
 
 LDFLAGS+=              ${LIBOSSAUDIO}
 
@@ -28,7 +27,6 @@
 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 -r 6a631a0471db -r 2cfc44578c34 net/rdesktop/options.mk
--- a/net/rdesktop/options.mk   Fri Sep 12 15:14:59 2008 +0000
+++ b/net/rdesktop/options.mk   Fri Sep 12 16:00:56 2008 +0000
@@ -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 @@
 .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