Thu Jan 21 17:05:59 2010 UTC ()
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


(drochner)
diff -r1.3 -r1.4 pkgsrc/net/gtk-vnc/Makefile
diff -r1.4 -r1.5 pkgsrc/net/gtk-vnc/buildlink3.mk
diff -r1.2 -r1.3 pkgsrc/net/gtk-vnc/options.mk
cvs diff -r1.3 -r1.4 pkgsrc/net/gtk-vnc/Makefile (expand / switch to unified diff)

--- pkgsrc/net/gtk-vnc/Makefile 2009/10/26 11:02:21 1.3
+++ pkgsrc/net/gtk-vnc/Makefile 2010/01/21 17:05:59 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.3 2009/10/26 11:02:21 drochner Exp $ 1# $NetBSD: Makefile,v 1.4 2010/01/21 17:05:59 drochner Exp $
2# 2#
3 3
4DISTNAME= gtk-vnc-0.3.10 4DISTNAME= gtk-vnc-0.3.10
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk-vnc/0.3/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk-vnc/0.3/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://live.gnome.org/gtk-vnc 9HOMEPAGE= http://live.gnome.org/gtk-vnc
10COMMENT= VNC viewer widget for GTK 10COMMENT= VNC viewer widget for GTK
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
@@ -21,17 +21,16 @@ PY_PATCHPLIST= yes @@ -21,17 +21,16 @@ PY_PATCHPLIST= yes
21CONFIGURE_ARGS+= --with-coroutine=gthread 21CONFIGURE_ARGS+= --with-coroutine=gthread
22 22
23.include "options.mk" 23.include "options.mk"
24 24
25#VIEW_REQUIRED=0.6.0 25#VIEW_REQUIRED=0.6.0
26#libview 26#libview
27 27
28.include "../../devel/glib2/buildlink3.mk" 28.include "../../devel/glib2/buildlink3.mk"
29.include "../../devel/zlib/buildlink3.mk" 29.include "../../devel/zlib/buildlink3.mk"
30# libview is only used for an example which is not installed 30# libview is only used for an example which is not installed
31#.include "../../devel/libview/buildlink3.mk" 31#.include "../../devel/libview/buildlink3.mk"
32BUILDLINK_API_DEPENDS.gnutls+= gnutls>=1.4.0 32BUILDLINK_API_DEPENDS.gnutls+= gnutls>=1.4.0
33.include "../../security/gnutls/buildlink3.mk" 33.include "../../security/gnutls/buildlink3.mk"
34.include "../../security/cyrus-sasl/buildlink3.mk" 
35BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0 34BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0
36.include "../../x11/gtk2/buildlink3.mk" 35.include "../../x11/gtk2/buildlink3.mk"
37.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/net/gtk-vnc/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/net/gtk-vnc/buildlink3.mk 2009/10/26 11:02:21 1.4
+++ pkgsrc/net/gtk-vnc/buildlink3.mk 2010/01/21 17:05:59 1.5
@@ -1,18 +1,24 @@ @@ -1,18 +1,24 @@
1# $NetBSD: buildlink3.mk,v 1.4 2009/10/26 11:02:21 drochner Exp $ 1# $NetBSD: buildlink3.mk,v 1.5 2010/01/21 17:05:59 drochner Exp $
2 2
3BUILDLINK_TREE+= gtk-vnc 3BUILDLINK_TREE+= gtk-vnc
4 4
5.if !defined(GTK_VNC_BUILDLINK3_MK) 5.if !defined(GTK_VNC_BUILDLINK3_MK)
6GTK_VNC_BUILDLINK3_MK:= 6GTK_VNC_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.gtk-vnc+= gtk-vnc>=0.3.7 8BUILDLINK_API_DEPENDS.gtk-vnc+= gtk-vnc>=0.3.7
9BUILDLINK_ABI_DEPENDS.gtk-vnc?= gtk-vnc>=0.3.8nb2 9BUILDLINK_ABI_DEPENDS.gtk-vnc?= gtk-vnc>=0.3.8nb2
10BUILDLINK_PKGSRCDIR.gtk-vnc?= ../../net/gtk-vnc 10BUILDLINK_PKGSRCDIR.gtk-vnc?= ../../net/gtk-vnc
11 11
 12pkgbase := gtk-vnc
 13.include "../../mk/pkg-build-options.mk"
 14.if !empty(PKG_BUILD_OPTIONS.gtk-vnc:Mvnc-sasl)
 15.include "../../security/cyrus-sasl/buildlink3.mk"
 16.endif
 17
12.include "../../devel/glib2/buildlink3.mk" 18.include "../../devel/glib2/buildlink3.mk"
13.include "../../devel/zlib/buildlink3.mk" 19.include "../../devel/zlib/buildlink3.mk"
14.include "../../security/gnutls/buildlink3.mk" 20.include "../../security/gnutls/buildlink3.mk"
15.include "../../x11/gtk2/buildlink3.mk" 21.include "../../x11/gtk2/buildlink3.mk"
16.endif # GTK_VNC_BUILDLINK3_MK 22.endif # GTK_VNC_BUILDLINK3_MK
17 23
18BUILDLINK_TREE+= -gtk-vnc 24BUILDLINK_TREE+= -gtk-vnc
cvs diff -r1.2 -r1.3 pkgsrc/net/gtk-vnc/options.mk (expand / switch to unified diff)

--- pkgsrc/net/gtk-vnc/options.mk 2009/09/14 10:07:03 1.2
+++ pkgsrc/net/gtk-vnc/options.mk 2010/01/21 17:05:59 1.3
@@ -1,23 +1,30 @@ @@ -1,23 +1,30 @@
1# $NetBSD: options.mk,v 1.2 2009/09/14 10:07:03 tnn Exp $ 1# $NetBSD: options.mk,v 1.3 2010/01/21 17:05:59 drochner Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.gtk-vnc 3PKG_OPTIONS_VAR= PKG_OPTIONS.gtk-vnc
4PKG_SUPPORTED_OPTIONS= python plugin 4PKG_SUPPORTED_OPTIONS= python plugin vnc-sasl
 5PKG_SUGGESTED_OPTIONS= vnc-sasl
5 6
6.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
7 8
8PLIST_VARS= python 9PLIST_VARS= python
9.if !empty(PKG_OPTIONS:Mpython) 10.if !empty(PKG_OPTIONS:Mpython)
10.include "../../lang/python/extension.mk" 11.include "../../lang/python/extension.mk"
11.include "../../x11/py-gtk2/buildlink3.mk" 12.include "../../x11/py-gtk2/buildlink3.mk"
12USE_TOOLS+= gmake 13USE_TOOLS+= gmake
13PLIST.python= yes 14PLIST.python= yes
14.else 15.else
15CONFIGURE_ARGS+= --with-python=no 16CONFIGURE_ARGS+= --with-python=no
16.endif 17.endif
17 18
18PLIST_VARS+= plugin 19PLIST_VARS+= plugin
19.if !empty(PKG_OPTIONS:Mplugin) 20.if !empty(PKG_OPTIONS:Mplugin)
20.include "../../devel/xulrunner/buildlink3.mk" 21.include "../../devel/xulrunner/buildlink3.mk"
21CONFIGURE_ARGS+= --enable-plugin=yes 22CONFIGURE_ARGS+= --enable-plugin=yes
22PLIST.plugin= yes 23PLIST.plugin= yes
23.endif 24.endif
 25
 26.if !empty(PKG_OPTIONS:Mvnc-sasl)
 27.include "../../security/cyrus-sasl/buildlink3.mk"
 28.else
 29CONFIGURE_ARGS+= --without-sasl
 30.endif