Make gtk an option (enabled by default): helps dealing with the package on Mac OS X when GTK has been built with Quartz backend

3 files changed, 29 insertions, 14 deletions

diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index 724959b0906..88bab96a051 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/04/22 13:42:39 obache Exp $
+# $NetBSD: Makefile,v 1.16 2011/05/12 13:39:09 adam Exp $
 
 DISTNAME=	libcanberra-0.26
 PKGREVISION=	2
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config gmake
-GCONF_SCHEMAS+=	libcanberra.schemas
 
 PKGCONFIG_OVERRIDE+=	libcanberra-gtk.pc.in
 PKGCONFIG_OVERRIDE+=	libcanberra.pc.in
@@ -34,12 +33,13 @@ TOOLS_NOOP+=		gtkdoc-rebase
 
 PLIST_VARS+=		oss
 
+.include "options.mk"
+
 #.include "../../devel/libltdl/convenience.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .if ${OSS_TYPE} != "none"
diff --git a/audio/libcanberra/PLIST b/audio/libcanberra/PLIST
index 041ed25e283..4fdf9587d55 100644
--- a/audio/libcanberra/PLIST
+++ b/audio/libcanberra/PLIST
@@ -1,21 +1,21 @@
-@comment $NetBSD: PLIST,v 1.6 2010/09/21 01:16:28 obache Exp $
-bin/canberra-gtk-play
-include/canberra-gtk.h
+@comment $NetBSD: PLIST,v 1.7 2011/05/12 13:39:09 adam Exp $
+${PLIST.gtk}bin/canberra-gtk-play
+${PLIST.gtk}include/canberra-gtk.h
 include/canberra.h
-lib/gtk-2.0/modules/libcanberra-gtk-module.la
+${PLIST.gtk}lib/gtk-2.0/modules/libcanberra-gtk-module.la
 lib/${PKGNAME}/libcanberra-gstreamer.la
 lib/${PKGNAME}/libcanberra-multi.la
 lib/${PKGNAME}/libcanberra-null.la
 ${PLIST.oss}lib/${PKGNAME}/libcanberra-oss.la
-lib/libcanberra-gtk.la
+${PLIST.gtk}lib/libcanberra-gtk.la
 lib/libcanberra.la
-lib/pkgconfig/libcanberra-gtk.pc
+${PLIST.gtk}lib/pkgconfig/libcanberra-gtk.pc
 lib/pkgconfig/libcanberra.pc
 share/doc/libcanberra/README
-share/gconf/schemas/libcanberra.schemas
-share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
-share/gnome/autostart/libcanberra-login-sound.desktop
-share/gnome/shutdown/libcanberra-logout-sound.sh
+${PLIST.gtk}share/gconf/schemas/libcanberra.schemas
+${PLIST.gtk}share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
+${PLIST.gtk}share/gnome/autostart/libcanberra-login-sound.desktop
+${PLIST.gtk}share/gnome/shutdown/libcanberra-logout-sound.sh
 share/gtk-doc/html/libcanberra/ch01.html
 share/gtk-doc/html/libcanberra/home.png
 share/gtk-doc/html/libcanberra/index.html
@@ -28,5 +28,5 @@ share/gtk-doc/html/libcanberra/libcanberra.devhelp2
 share/gtk-doc/html/libcanberra/right.png
 share/gtk-doc/html/libcanberra/style.css
 share/gtk-doc/html/libcanberra/up.png
-share/vala/vapi/libcanberra-gtk.vapi
+${PLIST.gtk}share/vala/vapi/libcanberra-gtk.vapi
 share/vala/vapi/libcanberra.vapi
diff --git a/audio/libcanberra/options.mk b/audio/libcanberra/options.mk
new file mode 100644
index 00000000000..7b8b267952e
--- /dev/null
+++ b/audio/libcanberra/options.mk
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2011/05/12 13:39:24 adam Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.libcanberra
+PKG_SUPPORTED_OPTIONS=	gtk
+PKG_SUGGESTED_OPTIONS=	gtk
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		gtk
+
+.if !empty(PKG_OPTIONS:Mgtk)
+GCONF_SCHEMAS+=		libcanberra.schemas
+PLIST.gtk=		yes
+.include "../../x11/gtk2/buildlink3.mk"
+.endif