diff options
| author | drochner <drochner> | 2010-01-21 17:05:59 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2010-01-21 17:05:59 +0000 |
| commit | 4e810a117eb13abd31399ff4cdc916edac2fa15f (patch) | |
| tree | cb4a00790bc35ff15598dae044d3bfa3df30fefb /net | |
| parent | 8b2ce64e364569f85968b4f0557ee37a5bd3d2da (diff) | |
| download | pkgsrc-4e810a117eb13abd31399ff4cdc916edac2fa15f.tar.gz | |
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 (limited to 'net')
| -rw-r--r-- | net/gtk-vnc/Makefile | 3 | ||||
| -rw-r--r-- | net/gtk-vnc/buildlink3.mk | 8 | ||||
| -rw-r--r-- | net/gtk-vnc/options.mk | 11 |
3 files changed, 17 insertions, 5 deletions
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile index 93f23f133c6..03eb189bdb5 100644 --- a/net/gtk-vnc/Makefile +++ b/net/gtk-vnc/Makefile @@ -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 @@ CONFIGURE_ARGS+= --with-coroutine=gthread #.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 --git a/net/gtk-vnc/buildlink3.mk b/net/gtk-vnc/buildlink3.mk index f8e447613fe..1dbef2cceb1 100644 --- a/net/gtk-vnc/buildlink3.mk +++ b/net/gtk-vnc/buildlink3.mk @@ -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_API_DEPENDS.gtk-vnc+= gtk-vnc>=0.3.7 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 --git a/net/gtk-vnc/options.mk b/net/gtk-vnc/options.mk index 8ec74909f6a..a315ab64497 100644 --- a/net/gtk-vnc/options.mk +++ b/net/gtk-vnc/options.mk @@ -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 @@ PLIST_VARS+= plugin 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 |