Disable gstreamer support; libcanberra has native support for sndio(7).

audio/libcanberra/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2011/09/24 06:45:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.27 2011/09/30 06:51:31 ajacoutot Exp $
 
 COMMENT-main=	implementation of the Freedesktop sound theme spec.
 COMMENT-gtk=	gtk+2 helper for libcanberra
@@ -11,9 +11,9 @@ PKGNAME-main=	${DISTNAME}
 PKGNAME-gtk=	libcanberra-gtk-${V}
 PKGNAME-gtk3=	libcanberra-gtk3-${V}
 
-REVISION-main=	0
+REVISION-main=	1
-REVISION-gtk=	1
+REVISION-gtk=	2
-REVISION-gtk3=	0
+REVISION-gtk3=	1
 
 SHARED_LIBS +=  canberra             2.0      # 2.5
 SHARED_LIBS +=  canberra-gtk3        1.8      # 1.8
@@ -33,25 +33,26 @@ PERMIT_DISTFILES_FTP=   Yes
 
 MASTER_SITES=	${HOMEPAGE}
 
-WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 ltdl m ogg
+cWANTLIB += ltdl m ogg vorbis vorbisfile
-WANTLIB += pcre vorbis vorbisfile z
 
-WANTLIB-main += ${WANTLIB} gstreamer-0.10 sndio xml2
+WANTLIB-main += ${cWANTLIB} sndio
 
-WANTLIB-gtk += ${WANTLIB}
+WANTLIB-gtk += ${cWANTLIB} ${MODGETTEXT_WANTLIB}
 WANTLIB-gtk += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 WANTLIB-gtk += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo canberra
-WANTLIB-gtk += drm expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB-gtk += drm expat ffi fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
-WANTLIB-gtk += gio-2.0 gtk-x11-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB-gtk += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
-WANTLIB-gtk += pixman-1 png pthread-stubs xcb xcb-render xcb-shm
+WANTLIB-gtk += gtk-x11-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
+WANTLIB-gtk += pixman-1 png pthread-stubs xcb xcb-render xcb-shm z
 
-WANTLIB-gtk3 += ${WANTLIB}
+WANTLIB-gtk3 += ${cWANTLIB} ${MODGETTEXT_WANTLIB}
 WANTLIB-gtk3 += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 WANTLIB-gtk3 += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo
-WANTLIB-gtk3 += cairo-gobject canberra drm expat fontconfig freetype
+WANTLIB-gtk3 += cairo-gobject canberra drm expat ffi fontconfig freetype
-WANTLIB-gtk3 += gdk-3 gdk_pixbuf-2.0 gio-2.0 gtk-3 pango-1.0 pangocairo-1.0
+WANTLIB-gtk3 += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB-gtk3 += pangoft2-1.0 pixman-1 png pthread pthread-stubs xcb
+WANTLIB-gtk3 += gthread-2.0 gtk-3 kvm pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB-gtk3 += xcb-render xcb-shm
+WANTLIB-gtk3 += pcre pixman-1 png pthread pthread-stubs xcb xcb-render
+WANTLIB-gtk3 += xcb-shm z
 
 MODULES=		devel/gettext \
 			devel/gconf2
@@ -69,20 +70,21 @@ AUTOMAKE_VERSION= 	1.10
 BUILD_DEPENDS=		${MODGNU_AUTOCONF_DEPENDS} \
 			${MODGNU_AUTOMAKE_DEPENDS}
 
-LIB_DEPENDS-main=	${MODGETTEXT_LIB_DEPENDS} \
+LIB_DEPENDS-main=	textproc/libxml \
 			audio/libvorbis \
-			devel/libtool,-ltdl \
+			devel/libtool,-ltdl
-			multimedia/gstreamer-0.10/core
+RUN_DEPENDS-main=	audio/sound-theme-freedesktop>=0.6
-RUN_DEPENDS-main=	${MODGETTEXT_RUN_DEPENDS} \
-			audio/sound-theme-freedesktop>=0.6
 
 LIB_DEPENDS-gtk=	${BASE_PKGPATH} \
+			${MODGETTEXT_LIB_DEPENDS} \
 			x11/gtk+2
-RUN_DEPENDS-gtk=	${MODGCONF2_RUN_DEPENDS}
+RUN_DEPENDS-gtk=	${MODGCONF2_RUN_DEPENDS} \
+			${MODGETTEXT_RUN_DEPENDS}
 
 LIB_DEPENDS-gtk3=	${BASE_PKGPATH} \
+			${MODGETTEXT_LIB_DEPENDS} \
 			x11/gtk+3
-RUN_DEPENDS-gtk3=	# empty
+RUN_DEPENDS-gtk3=	${MODGETTEXT_RUN_DEPENDS}
 
 USE_LIBTOOL=		Yes
 USE_GMAKE=		Yes
@@ -91,13 +93,14 @@ CONFIGURE_STYLE=	 gnu
 CONFIGURE_ARGS= 	${CONFIGURE_SHARED} \
 			--localstatedir="/var" \
 			--enable-sndio \
-			--enable-gstreamer \
+			--disable-gstreamer \
 			--disable-oss \
 			--disable-alsa \
 			--disable-pulse \
 			--disable-tdb \
 			--disable-udev \
-			--disable-gtk-doc
+			--disable-gtk-doc \
+			--disable-gtk-doc-html
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 

audio/libcanberra/patches/patch-Makefile_am

@@ -0,0 +1,19 @@
+$OpenBSD: patch-Makefile_am,v 1.6 2011/09/30 06:51:31 ajacoutot Exp $
+
+XXX
+/bin/sh[1]: ELF: not found
+/bin/sh[2]: ˙˙˙
+ySu~%=i: not found
+/bin/sh[418]: syntax error: `(' unexpected
+
+--- Makefile.am.orig	Fri Sep 30 08:25:13 2011
++++ Makefile.am	Fri Sep 30 08:25:19 2011
+@@ -26,7 +26,7 @@ EXTRA_DIST = \
+ 	vala/libcanberra.vapi \
+ 	vala/libcanberra-gtk.vapi
+ 
+-SUBDIRS = src gtkdoc doc
++SUBDIRS = src doc
+ 
+ MAINTAINERCLEANFILES = README
+ noinst_DATA = README

audio/libcanberra/patches/patch-gtkdoc_gtk-doc_make

@@ -1,67 +0,0 @@
-$OpenBSD: patch-gtkdoc_gtk-doc_make,v 1.3 2011/04/13 06:47:22 ajacoutot Exp $
---- gtkdoc/gtk-doc.make.orig	Thu Feb 24 23:06:45 2011
-+++ gtkdoc/gtk-doc.make	Tue Apr 12 15:02:53 2011
-@@ -4,15 +4,15 @@
- # Everything below here is generic #
- ####################################
- 
--if GTK_DOC_USE_LIBTOOL
--GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+#if GTK_DOC_USE_LIBTOOL
-+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
- GTKDOC_RUN = $(LIBTOOL) --mode=execute
--else
--GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
--GTKDOC_RUN =
--endif
-+#else
-+#GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+#GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-+#GTKDOC_RUN = sh -c
-+#endif
- 
- # We set GPATH here; this gives us semantics for GNU make
- # which are more like other make's VPATH, when it comes to
-@@ -48,22 +48,7 @@ REPORT_FILES = \
- 
- CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
- 
--if ENABLE_GTK_DOC
--if GTK_DOC_BUILD_HTML
--HTML_BUILD_STAMP=html-build.stamp
--else
--HTML_BUILD_STAMP=
--endif
--if GTK_DOC_BUILD_PDF
--PDF_BUILD_STAMP=pdf-build.stamp
--else
--PDF_BUILD_STAMP=
--endif
--
--all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
--else
- all-local:
--endif
- 
- docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
- 
-@@ -209,13 +194,13 @@ uninstall-local:
- #
- # Require gtk-doc when making dist
- #
--if ENABLE_GTK_DOC
-+#if ENABLE_GTK_DOC
-+#dist-check-gtkdoc:
-+#else
- dist-check-gtkdoc:
--else
--dist-check-gtkdoc:
- 	@echo "*** gtk-doc must be installed and enabled in order to make dist"
- 	@false
--endif
-+#endif
- 
- dist-hook: dist-check-gtkdoc dist-hook-local
- 	mkdir $(distdir)/html

audio/libcanberra/pkg/PFRAG.shared-main

@@ -1,5 +1,4 @@
-@comment $OpenBSD: PFRAG.shared-main,v 1.1 2011/04/13 06:47:22 ajacoutot Exp $
+@comment $OpenBSD: PFRAG.shared-main,v 1.2 2011/09/30 06:51:32 ajacoutot Exp $
-lib/libcanberra-${V}/libcanberra-gstreamer.so
 lib/libcanberra-${V}/libcanberra-multi.so
 lib/libcanberra-${V}/libcanberra-null.so
 lib/libcanberra-${V}/libcanberra-sndio.so

audio/libcanberra/pkg/PLIST-main

@@ -1,12 +1,10 @@
-@comment $OpenBSD: PLIST-main,v 1.2 2011/04/27 12:07:53 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.3 2011/09/30 06:51:32 ajacoutot Exp $
-@pkgpath audio/libcanberra
 @conflict libcanberra-<gtk-0.28p0
+@pkgpath audio/libcanberra
 %%SHARED%%
-include/canberra.h
 include/canberra-gtk.h
+include/canberra.h
 lib/libcanberra-${V}/
-@comment lib/libcanberra-${V}/libcanberra-gstreamer.a
-@comment lib/libcanberra-${V}/libcanberra-gstreamer.la
 @comment lib/libcanberra-${V}/libcanberra-multi.a
 @comment lib/libcanberra-${V}/libcanberra-multi.la
 @comment lib/libcanberra-${V}/libcanberra-null.a
@@ -18,7 +16,6 @@ lib/libcanberra.la
 lib/pkgconfig/libcanberra.pc
 share/doc/libcanberra/
 share/doc/libcanberra/README
-@comment share/gtk-doc/html/libcanberra/
 share/vala/
 share/vala/vapi/
 share/vala/vapi/libcanberra.vapi