- enable the gtk+2 part of libcanberra

- set use_x11

maybe we can split this into subpackages..anyone? ;-)

audio/libcanberra/Makefile

@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2008/10/24 13:26:14 jasper Exp $
+# $OpenBSD: Makefile,v 1.3 2008/11/19 08:06:03 jasper Exp $
 
 COMMENT=		implementation of the Freedesktop sound theme spec.
 
 DISTNAME=		libcanberra-0.10
-SHARED_LIBS +=	canberra             0.1      # .1.3
+PKGNAME=		${DISTNAME}p0
+SHARED_LIBS +=  canberra             0.1      # .1.3
+SHARED_LIBS +=  canberra-gtk         0.0      # .0.4
 CATEGORIES=		audio devel
 
 HOMEPAGE=		http://0pointer.de/lennart/projects/libcanberra/
@@ -16,8 +18,11 @@ PERMIT_DISTFILES_FTP=   Yes
 
 MASTER_SITES=		${HOMEPAGE}
 
-WANTLIB=		glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 m ogg \
-			pcre xml2 z
+WANTLIB=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
+		Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \
+		freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 \
+		gthread-2.0 m ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 \
+		pcre pixman-1 png pthread xml2 z
 
 MODULES=		devel/gettext
 
@@ -25,16 +30,17 @@ BUILD_DEPENDS=		${RUN_DEPENDS}
 RUN_DEPENDS=		::devel/gconf2
 LIB_DEPENDS=		vorbis,vorbisfile::audio/libvorbis \
 			ltdl::devel/libtool,-ltdl \
-			gstreamer-0.10::multimedia/gstreamer-0.10/core
+			gstreamer-0.10::multimedia/gstreamer-0.10/core \
+			gdk_pixbuf-2.0.>=1400.0,gdk-x11-2.0.>=1400.0,gtk-x11-2.0.>=1400.0::x11/gtk+2
 
+USE_X11=		Yes
 USE_LIBTOOL=		Yes
 USE_GMAKE=		Yes
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/libcanberra \
 			--disable-schemas-install \
-			--localstatedir="/var" \
-			--disable-gtk # Needs GTK+2 > 2.13.4
+			--localstatedir="/var"
 CONFIGURE_ENV+=         LDFLAGS="-L${LOCALBASE}/lib" \
                         CPPFLAGS="-I${LOCALBASE}/include"
 

audio/libcanberra/patches/patch-src_Makefile_in

@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2008/09/26 12:01:43 jasper Exp $
-
-As long as we don't build the GTK+ modules, this only creates
-empty directories.
-
---- src/Makefile.in.orig	Thu Sep 25 23:11:36 2008
-+++ src/Makefile.in	Thu Sep 25 23:12:57 2008
-@@ -1322,8 +1322,7 @@ info: info-am
- 
- info-am:
- 
--install-data-am: install-gnomeautostartDATA \
--	install-gnomeshutdownSCRIPTS install-gtkmoduleLTLIBRARIES \
-+install-data-am: install-gtkmoduleLTLIBRARIES \
- 	install-includeHEADERS install-pluginLTLIBRARIES
- 
- install-dvi: install-dvi-am

audio/libcanberra/pkg/PFRAG.shared

@@ -1,4 +1,6 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2008/09/26 12:01:43 jasper Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.2 2008/11/19 08:06:03 jasper Exp $
+lib/gtk-2.0/modules/libcanberra-gtk-module.so
+@lib lib/libcanberra-gtk.so.${LIBcanberra-gtk_VERSION}
 @lib lib/libcanberra.so.${LIBcanberra_VERSION}
 lib/libcanberra/libcanberra-gstreamer.so
 lib/libcanberra/libcanberra-multi.so

audio/libcanberra/pkg/PLIST

@@ -1,7 +1,15 @@
-@comment $OpenBSD: PLIST,v 1.2 2008/10/24 13:26:14 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.3 2008/11/19 08:06:03 jasper Exp $
 %%SHARED%%
+@bin bin/canberra-gtk-play
+include/canberra-gtk.h
 include/canberra.h
+lib/gtk-2.0/
+lib/gtk-2.0/modules/
+lib/gtk-2.0/modules/libcanberra-gtk-module.a
+lib/gtk-2.0/modules/libcanberra-gtk-module.la
 lib/libcanberra/
+lib/libcanberra-gtk.a
+lib/libcanberra-gtk.la
 lib/libcanberra.a
 lib/libcanberra.la
 lib/libcanberra/libcanberra-gstreamer.a
@@ -12,11 +20,15 @@ lib/libcanberra/libcanberra-null.a
 lib/libcanberra/libcanberra-null.la
 lib/libcanberra/libcanberra-oss.a
 lib/libcanberra/libcanberra-oss.la
-lib/pkgconfig/
+lib/pkgconfig/libcanberra-gtk.pc
 lib/pkgconfig/libcanberra.pc
 share/doc/libcanberra/
 share/doc/libcanberra/README
-share/gtk-doc/
+share/gnome/
+share/gnome/autostart/
+share/gnome/autostart/libcanberra-login-sound.desktop
+share/gnome/shutdown/
+share/gnome/shutdown/libcanberra-logout-sound.sh
 share/gtk-doc/html/
 share/gtk-doc/html/libcanberra/
 share/gtk-doc/html/libcanberra/ch01.html