5 files changed, 71 insertions, 7 deletions

diff --git a/audio/libcanberra-gtk3/Makefile b/audio/libcanberra-gtk3/Makefile
new file mode 100644
index 000000000000..e03105ad5d81
--- /dev/null
+++ b/audio/libcanberra-gtk3/Makefile
@@ -0,0 +1,40 @@
+# New ports collection makefile for:	libcanberra
+# Date created:				05 August 2008
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/audio/libcanberra-gtk3/Makefile,v 1.8 2011/03/16 10:24:48 kwm Exp $
+#
+
+PORTREVISION=	1
+CATEGORIES=	audio devel
+PKGNAMESUFFIX=	-gtk3
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Implementation of the Freedesktop sound theme spec
+
+MASTERDIR=	${.CURDIR}/../../audio/libcanberra
+SLAVEPORT=	gtk3
+PLIST=		${.CURDIR}/pkg-plist
+
+do-build:
+	cd ${WRKSRC} && ${GMAKE} libcanberra-gtk3.pc
+	cd ${WRKSRC}/src && ${GMAKE} libcanberra-gtk3.la
+	cd ${WRKSRC}/src && ${GMAKE} libcanberra-gtk3-module.la
+# fix the .la file so it doesn't point to the build dir anymore.
+	@${REINPLACE_CMD} -e '/^relink_command/ d' \
+		-e 's|${WRKSRC}/src/libcanberra.la|${LOCALBASE}/lib/libcanberra.la|g' \
+		${WRKSRC}/src/.libs/libcanberra-gtk3.la
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/libcanberra-gtk3.pc \
+		${PREFIX}/libdata/pkgconfig/
+.for i in .a .la .so .so.0
+	${INSTALL_DATA} ${WRKSRC}/src/.libs/libcanberra-gtk3${i} \
+		${PREFIX}/lib/
+.endfor
+	cd ${WRKSRC}/src && ${GMAKE} install-gtk3moduleLTLIBRARIES
+	cd ${PREFIX}/lib/gtk-3.0/modules && \
+		${LN} -sf libcanberra-gtk3-module.so libcanberra-gtk-module.so
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/libcanberra-gtk3/pkg-plist b/audio/libcanberra-gtk3/pkg-plist
new file mode 100644
index 000000000000..9a3276d53376
--- /dev/null
+++ b/audio/libcanberra-gtk3/pkg-plist
@@ -0,0 +1,9 @@
+lib/gtk-3.0/modules/libcanberra-gtk-module.so
+lib/gtk-3.0/modules/libcanberra-gtk3-module.a
+lib/gtk-3.0/modules/libcanberra-gtk3-module.la
+lib/gtk-3.0/modules/libcanberra-gtk3-module.so
+lib/libcanberra-gtk3.a
+lib/libcanberra-gtk3.la
+lib/libcanberra-gtk3.so
+lib/libcanberra-gtk3.so.0
+libdata/pkgconfig/libcanberra-gtk3.pc
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index f8ff95d363ef..bd094df89ad8 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -3,10 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#   $MCom: ports/audio/libcanberra/Makefile,v 1.28 2011/06/11 18:55:56 mezz Exp $
 
 PORTNAME=	libcanberra
-PORTVERSION=	0.26
+PORTVERSION=	0.28
+PORTREVISION=	1
 CATEGORIES=	audio devel
 MASTER_SITES=	http://0pointer.de/lennart/projects/libcanberra/
 
@@ -21,19 +22,28 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20 ltverhack gconf2
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool libltdl
-CONFIGURE_ARGS=	--disable-lynx --disable-tdb --disable-gtk3
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--disable-lynx --disable-tdb --disable-alsa
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
+.if !defined(SLAVEPORT)
 GCONF_SCHEMAS=	libcanberra.schemas
 
 OPTIONS=	PULSE "Enable Pulse Audio support" off \
 		GSTREAMER "Enable GStreamer audio support" off
+.endif
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
+.if defined(SLAVEPORT)
+USE_GNOME+=	gtk30
+LIB_DEPENDS+=	canberra.0:${PORTSDIR}/audio/libcanberra
+CONFIGURE_ARGS+=--enable-gtk3
+.else
+CONFIGURE_ARGS+=--disable-gtk3
+
 .if !defined(WITHOUT_PULSE)
 LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
 PLIST_SUB+=	PULSE=""
@@ -50,6 +60,8 @@ CONFIGURE_ARGS+=--disable-gstreamer
 PLIST_SUB+=	GSTREAMER="@comment "
 .endif
 
+.endif # end slaveport
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
 	    	${WRKSRC}/configure
diff --git a/audio/libcanberra/distinfo b/audio/libcanberra/distinfo
index 19779ba38ea8..22db2558c256 100644
--- a/audio/libcanberra/distinfo
+++ b/audio/libcanberra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libcanberra-0.26.tar.gz) = 4b5d8d2c2835133620adbc53745dd107b6e58b9a2963059e8f457143fee00982
-SIZE (libcanberra-0.26.tar.gz) = 463209
+SHA256 (libcanberra-0.28.tar.gz) = eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c
+SIZE (libcanberra-0.28.tar.gz) = 487276
diff --git a/audio/libcanberra/pkg-plist b/audio/libcanberra/pkg-plist
index af83fe4edc75..305764c1d46f 100644
--- a/audio/libcanberra/pkg-plist
+++ b/audio/libcanberra/pkg-plist
@@ -1,6 +1,7 @@
 bin/canberra-gtk-play
 include/canberra-gtk.h
 include/canberra.h
+lib/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop
 lib/gtk-2.0/modules/libcanberra-gtk-module.a
 lib/gtk-2.0/modules/libcanberra-gtk-module.la
 lib/gtk-2.0/modules/libcanberra-gtk-module.so
@@ -52,4 +53,6 @@ share/vala/vapi/libcanberra.vapi
 @dirrmtry share/gdm/autostart
 @dirrmtry share/gdm
 @dirrm %%DOCSDIR%%
+@dirrm lib/gnome-settings-daemon-3.0/gtk-modules
+@dirrm lib/gnome-settings-daemon-3.0
 @dirrm lib/libcanberra-%%VERSION%%