4 files changed, 12 insertions, 29 deletions

diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index 19cba312c69b..a99846cc204e 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -1,12 +1,13 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/audio/libcanberra/Makefile,v 1.28 2011/06/11 18:55:56 mezz Exp $
+#   $MCom: ports/trunk/audio/libcanberra/Makefile 20031 2014-11-02 21:47:55Z kwm $
 
 PORTNAME=	libcanberra
-PORTVERSION=	0.28
-PORTREVISION=	4
+PORTVERSION=	0.30
+PORTREVISION=	3
 CATEGORIES=	audio devel
-MASTER_SITES=	http://0pointer.de/lennart/projects/libcanberra/
+MASTER_SITES=	http://0pointer.de/lennart/projects/libcanberra/ \
+		http://pkgs.fedoraproject.org/repo/pkgs/libcanberra/libcanberra-0.30.tar.xz/34cb7e4430afaf6f447c4ebdb9b42072/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Implementation of the Freedesktop sound theme spec
@@ -17,8 +18,8 @@ LICENSE_FILE=	${WRKSRC}/LGPL
 LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
 		libltdl.so:${PORTSDIR}/devel/libltdl
 
-USES=		gmake libtool pathfix pkgconfig
-USE_GNOME=	gnomeprefix gtk20 gconf2
+USES=		gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME=	gnomeprefix gtk20 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-lynx --disable-tdb --disable-alsa
@@ -26,9 +27,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
-.if !defined(SLAVEPORT)
-GCONF_SCHEMAS=	libcanberra.schemas
-.else
+.if defined(SLAVEPORT)
 OPTIONS_DEFINE=	PULSEAUDIO GSTREAMER
 .endif
 
@@ -52,7 +51,7 @@ PLIST_SUB+=	PULSE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGSTREAMER}
-USE_GSTREAMER=	yes
+USE_GSTREAMER1=	yes
 PLIST_SUB+=	GSTREAMER=""
 .else
 CONFIGURE_ARGS+=--disable-gstreamer
diff --git a/audio/libcanberra/distinfo b/audio/libcanberra/distinfo
index 22db2558c256..4ad8988ba54d 100644
--- a/audio/libcanberra/distinfo
+++ b/audio/libcanberra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libcanberra-0.28.tar.gz) = eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c
-SIZE (libcanberra-0.28.tar.gz) = 487276
+SHA256 (libcanberra-0.30.tar.xz) = c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72
+SIZE (libcanberra-0.30.tar.xz) = 318960
diff --git a/audio/libcanberra/files/patch-configure b/audio/libcanberra/files/patch-configure
deleted file mode 100644
index c2a0d3cc8b66..000000000000
--- a/audio/libcanberra/files/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.orig	2010-07-14 13:00:51.000000000 +0200
-+++ configure	2010-07-14 13:02:26.000000000 +0200
-@@ -3273,12 +3273,6 @@
- AM_BACKSLASH='\'
- 
- 
--if type -p stow > /dev/null && test -d /usr/local/stow ; then
--   { $as_echo "$as_me:${as_lineno-$LINENO}: *** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***" >&5
--$as_echo "$as_me: *** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***" >&6;}
--   ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"
--fi
--
- #### Checks for programs. ####
- 
- 
diff --git a/audio/libcanberra/pkg-plist b/audio/libcanberra/pkg-plist
index e9fa9c5b475d..f649156de2c2 100644
--- a/audio/libcanberra/pkg-plist
+++ b/audio/libcanberra/pkg-plist
@@ -5,7 +5,7 @@ lib/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop
 lib/gtk-2.0/modules/libcanberra-gtk-module.so
 lib/libcanberra-gtk.so
 lib/libcanberra-gtk.so.0
-lib/libcanberra-gtk.so.0.1.8
+lib/libcanberra-gtk.so.0.1.9
 lib/libcanberra.so
 lib/libcanberra.so.0
 lib/libcanberra.so.0.2.5
@@ -24,7 +24,6 @@ libdata/pkgconfig/libcanberra.pc
 %%DOCSDIR%%/left.png
 %%DOCSDIR%%/libcanberra-canberra-gtk.html
 %%DOCSDIR%%/libcanberra-canberra.html
-%%DOCSDIR%%/libcanberra.devhelp
 %%DOCSDIR%%/libcanberra.devhelp2
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css