3 files changed, 10 insertions, 54 deletions

diff --git a/audio/muine/Makefile b/audio/muine/Makefile
index c40116c74c1e..0b8a1ee4fcce 100644
--- a/audio/muine/Makefile
+++ b/audio/muine/Makefile
@@ -7,69 +7,39 @@
 #
 
 PORTNAME=	muine
-PORTVERSION=	0.8.10
-PORTREVISION=	2
+PORTVERSION=	0.8.11
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Mono based Gnome audio player
 
-BROKEN=		doesn't build and is apparently unmaintained
-
 LIB_DEPENDS=	FLAC.10:${PORTSDIR}/audio/flac \
 		id3tag.0:${PORTSDIR}/audio/libid3tag \
 		gdbm:${PORTSDIR}/databases/gdbm \
 		vorbis.4:${PORTSDIR}/audio/libvorbis \
 		musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib \
+		${LOCALBASE}/libdata/pkgconfig/taglib-sharp.pc:${PORTSDIR}/audio/taglib-sharp
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix gnomehack intltool libgnomeui gnomesharp20
+USE_GSTREAMER=	gconf
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		GACUTIL_FLAGS="/package muine /gacdir $(libdir) /root $(libdir)"
-
-CONFIGURE_ARGS+=	--enable-compile-warnings=maximum
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	muine.schemas
 
-OPTIONS=	XINE "Enable Xine backend" off \
-		FAAD "Enable faad support" off
-
-.include <bsd.port.pre.mk>
-.if defined (WITH_FAAD)
-LIB_DEPENDS+=	faad.2:${PORTSDIR}/audio/faad
-.else
-CONFIGURE_ARGS+=	--disable-faad2
-.endif
-
-.if defined (WITH_XINE)
-CONFIGURE_ARGS+=	--enable-xine=yes
-LIB_DEPENDS+=	xine.1:${PORTSDIR}/multimedia/libxine
-.else
-USE_GSTREAMER+=	gconf
-CONFIGURE_ARGS+=	--enable-gstreamer=0.10
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|(libdir)/dbus-1.0|(prefix)/share/dbus-1|g' \
-		${WRKSRC}/data/Makefile.in
 	@${REINPLACE_CMD} -e 's|libmusicbrainz.so.4|libmusicbrainz.so|g' \
 		${WRKSRC}/src/muine.exe.config.in
 	@${REINPLACE_CMD} -e 's|/bin/bash|/usr/bin/env bash|g' \
 		${WRKSRC}/src/muine.in
 
-post-install:
-	${MKDIR} ${PREFIX}/lib/muine/plugins
-.for _plugin in TrayIcon.dll
-	${INSTALL_DATA} ${WRKSRC}/plugins/${_plugin} ${PREFIX}/lib/muine/plugins
-.endfor
-
-.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/muine/distinfo b/audio/muine/distinfo
index 6cad722cb1cf..e32ea76b8c33 100644
--- a/audio/muine/distinfo
+++ b/audio/muine/distinfo
@@ -1,3 +1,3 @@
-MD5 (muine-0.8.10.tar.gz) = b44cb7a30010e98686b1f4a7759c776d
-SHA256 (muine-0.8.10.tar.gz) = d6503a5c01344b4402bd7150f1cd1ab561beb6bd778ee1ca35fea8ccbdecc045
-SIZE (muine-0.8.10.tar.gz) = 781734
+MD5 (muine-0.8.11.tar.gz) = e506fc40dd4f9aa0c30cb002e1b2b7b4
+SHA256 (muine-0.8.11.tar.gz) = be0caa9aaecaf46d22def5a731d4cb10a27caf1bd4a8bc9e82a85990f36b84e5
+SIZE (muine-0.8.11.tar.gz) = 804303
diff --git a/audio/muine/files/patch-src_Makefile.in b/audio/muine/files/patch-src_Makefile.in
deleted file mode 100644
index 66d555c95fde..000000000000
--- a/audio/muine/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/Makefile.in.orig
-+++ src/Makefile.in
-@@ -563,7 +563,7 @@
- 
- # FIXME MONO_XMLSERIALIZER_THS=no works around Ximian Bugzilla #58194
- AmazonSearchService.cs: AmazonSearchService.wsdl
--	MONO_XMLSERIALIZER_THS=no wsdl -namespace:Amazon $(srcdir)/AmazonSearchService.wsdl
-+	MONO_XMLSERIALIZER_THS=no wsdl1 -namespace:Amazon $(srcdir)/AmazonSearchService.wsdl
- 
- $(WRAPPER): $(srcdir)/$(WRAPPER).in
- 	sed -e "s|\@prefix\@|$(prefix)|g" 		\