[pkgsrc/trunk]: pkgsrc/net/gtk-vnc make the "sasl" extension an option (defau...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fb20db6a15ae
branches:  trunk
changeset: 569959:fb20db6a15ae
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Thu Jan 21 17:05:59 2010 +0000

description:
make the "sasl" extension an option (default on to match previous
behaviour, although I don't see any use in the pkgsrc ecosystem),
and propagate it properly

diffstat:

 net/gtk-vnc/Makefile      |   3 +--
 net/gtk-vnc/buildlink3.mk |   8 +++++++-
 net/gtk-vnc/options.mk    |  11 +++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diffs (63 lines):

diff -r a0e8de4ea471 -r fb20db6a15ae net/gtk-vnc/Makefile
--- a/net/gtk-vnc/Makefile      Thu Jan 21 16:32:21 2010 +0000
+++ b/net/gtk-vnc/Makefile      Thu Jan 21 17:05:59 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/10/26 11:02:21 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2010/01/21 17:05:59 drochner Exp $
 #
 
 DISTNAME=      gtk-vnc-0.3.10
@@ -31,7 +31,6 @@
 #.include "../../devel/libview/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gnutls+= gnutls>=1.4.0
 .include "../../security/gnutls/buildlink3.mk"
-.include "../../security/cyrus-sasl/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=   gtk2+>=2.10.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a0e8de4ea471 -r fb20db6a15ae net/gtk-vnc/buildlink3.mk
--- a/net/gtk-vnc/buildlink3.mk Thu Jan 21 16:32:21 2010 +0000
+++ b/net/gtk-vnc/buildlink3.mk Thu Jan 21 17:05:59 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/10/26 11:02:21 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/01/21 17:05:59 drochner Exp $
 
 BUILDLINK_TREE+=       gtk-vnc
 
@@ -9,6 +9,12 @@
 BUILDLINK_ABI_DEPENDS.gtk-vnc?=        gtk-vnc>=0.3.8nb2
 BUILDLINK_PKGSRCDIR.gtk-vnc?=  ../../net/gtk-vnc
 
+pkgbase := gtk-vnc
+.include "../../mk/pkg-build-options.mk"
+.if !empty(PKG_BUILD_OPTIONS.gtk-vnc:Mvnc-sasl)
+.include "../../security/cyrus-sasl/buildlink3.mk"
+.endif
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
diff -r a0e8de4ea471 -r fb20db6a15ae net/gtk-vnc/options.mk
--- a/net/gtk-vnc/options.mk    Thu Jan 21 16:32:21 2010 +0000
+++ b/net/gtk-vnc/options.mk    Thu Jan 21 17:05:59 2010 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2009/09/14 10:07:03 tnn Exp $
+# $NetBSD: options.mk,v 1.3 2010/01/21 17:05:59 drochner Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gtk-vnc
-PKG_SUPPORTED_OPTIONS= python plugin
+PKG_SUPPORTED_OPTIONS= python plugin vnc-sasl
+PKG_SUGGESTED_OPTIONS= vnc-sasl
 
 .include "../../mk/bsd.options.mk"
 
@@ -21,3 +22,9 @@
 CONFIGURE_ARGS+=       --enable-plugin=yes
 PLIST.plugin=  yes
 .endif
+
+.if !empty(PKG_OPTIONS:Mvnc-sasl)
+.include "../../security/cyrus-sasl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-sasl
+.endif