6 files changed, 59 insertions, 22 deletions

diff --git a/audio/muine/Makefile b/audio/muine/Makefile
index 58a872c85dd2..06ba38cf9553 100644
--- a/audio/muine/Makefile
+++ b/audio/muine/Makefile
@@ -3,14 +3,13 @@
 # Whom:				Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 #
 # $FreeBSD$
-#   $Id: Makefile,v 1.43 2006/01/11 03:11:16 tmclau02 Exp $
+#   $Id: Makefile,v 1.45 2006/02/15 17:16:54 tmclau02 Exp $
 #
 
 PORTNAME=	muine
-PORTVERSION=	0.8.3
-PORTREVISION=	10
+PORTVERSION=	0.8.4
 CATEGORIES=	audio gnome
-MASTER_SITES=	http://muine.gooeylinux.org/
+MASTER_SITES=	http://muine-player.org/releases/
 
 MAINTAINER=	bsd-sharp-list@forge.novell.com
 COMMENT=	Mono based Gnome audio player
@@ -18,7 +17,8 @@ COMMENT=	Mono based Gnome audio player
 LIB_DEPENDS=	FLAC.7:${PORTSDIR}/audio/flac \
 		id3tag.0:${PORTSDIR}/audio/libid3tag \
 		gdbm:${PORTSDIR}/databases/gdbm \
-		vorbis.3:${PORTSDIR}/audio/libvorbis
+		vorbis.3:${PORTSDIR}/audio/libvorbis \
+		musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
 BUILD_DEPENDS=	gapi2-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp20 \
 		${LOCALBASE}/lib/mono/dbus-sharp/dbus-sharp.dll:${PORTSDIR}/devel/dbus-sharp
 RUN_DEPENDS=	gapi2-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp20 \
@@ -55,6 +55,8 @@ USE_GSTREAMER+=	gconf
 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
 
 post-install:
 	${MKDIR} ${PREFIX}/lib/muine/plugins
diff --git a/audio/muine/distinfo b/audio/muine/distinfo
index 46d268377336..b16c78e52d7d 100644
--- a/audio/muine/distinfo
+++ b/audio/muine/distinfo
@@ -1,3 +1,3 @@
-MD5 (muine-0.8.3.tar.gz) = 4e21eeb8e809bebf1e13540e44a6259d
-SHA256 (muine-0.8.3.tar.gz) = 9bc7cdce0366c9bc306e51a21eac0dde9d8cfc1d2a874ed2cd3660c53263901c
-SIZE (muine-0.8.3.tar.gz) = 769686
+MD5 (muine-0.8.4.tar.gz) = 215dab4b1a0022deadb848b646640514
+SHA256 (muine-0.8.4.tar.gz) = 2a2b97f1c61ff6a2b030074c2a104b067c8a13ff1cb4952bf06caa08c86bdde4
+SIZE (muine-0.8.4.tar.gz) = 703273
diff --git a/audio/muine/files/patch-plugins_Makefile.in b/audio/muine/files/patch-plugins_Makefile.in
new file mode 100644
index 000000000000..a7ee11d11d3f
--- /dev/null
+++ b/audio/muine/files/patch-plugins_Makefile.in
@@ -0,0 +1,42 @@
+--- plugins/Makefile.in.orig	Wed Feb 15 02:50:49 2006
++++ plugins/Makefile.in	Wed Feb 15 10:42:55 2006
+@@ -503,7 +503,8 @@
+ 	done
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(LTLIBRARIES) $(DATA)
++#all-am: Makefile $(LTLIBRARIES) $(DATA)
++all-am:
+ 
+ installdirs:
+ 	$(mkinstalldirs) $(DESTDIR)$(muinelibdir) $(DESTDIR)$(plugindir)
+@@ -551,7 +552,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-muinelibLTLIBRARIES install-pluginDATA
++#install-data-am: install-muinelibLTLIBRARIES install-pluginDATA
+ 
+ install-exec-am:
+ 
+@@ -602,14 +603,14 @@
+ TrayIcon.dll: $(TRAY_ICON_CSFILES) $(top_builddir)/PluginLib/muine-plugin.dll
+ 	$(CSC) -target:library $(LIBFLAGS) -out:$@ $(TRAY_ICON_CSFILES) $(TRAY_ICON_EXTRA_CSFILES) $(ASSEMBLIES) $(TRAY_ICON_EXTRA_ASSEMBLIES) $(TRAY_ICON_RESOURCES)
+ 
+-InotifyPlugin.dll: $(INOTIFY_CSFILES) $(top_builddir)/PluginLib/muine-plugin.dll
+-	$(CSC) -unsafe -target:library $(LIBFLAGS) -out:$@ $(INOTIFY_CSFILES) $(ASSEMBLIES) $(INOTIFY_EXTRA_ASSEMBLIES)
++#InotifyPlugin.dll: $(INOTIFY_CSFILES) $(top_builddir)/PluginLib/muine-plugin.dll
++#	$(CSC) -unsafe -target:library $(LIBFLAGS) -out:$@ $(INOTIFY_CSFILES) $(ASSEMBLIES) $(INOTIFY_EXTRA_ASSEMBLIES)
+ 
+-InotifyPlugin.dll.config: $(srcdir)/InotifyPlugin.dll.config.in
+-	sed -e "s|\@pkglibdir\@|$(pkglibdir)|" \
+-	< $^ > $@
++#InotifyPlugin.dll.config: $(srcdir)/InotifyPlugin.dll.config.in
++#	sed -e "s|\@pkglibdir\@|$(pkglibdir)|" \
++#	< $^ > $@
+ 
+-all: DashboardPlugin.dll TrayIcon.dll InotifyPlugin.dll
++all: DashboardPlugin.dll TrayIcon.dll
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/audio/muine/files/patch-src_PlaylistWindow.cs b/audio/muine/files/patch-src_PlaylistWindow.cs
deleted file mode 100644
index 410ecd0e949d..000000000000
--- a/audio/muine/files/patch-src_PlaylistWindow.cs
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/PlaylistWindow.cs.orig	Sun May  1 12:25:15 2005
-+++ src/PlaylistWindow.cs	Fri Sep  9 20:12:56 2005
-@@ -431,7 +431,7 @@
- 		public void RestorePlaylist ()
- 		{
- 			// Load last playlist
--			if (!File.Exists (FileUtils.PlaylistFile))
-+			if (!System.IO.File.Exists (FileUtils.PlaylistFile))
- 				return;
- 
- 			OpenPlaylistInternal (FileUtils.PlaylistFile,
diff --git a/audio/muine/pkg-descr b/audio/muine/pkg-descr
index bb5e79c228f6..738c7a973e35 100644
--- a/audio/muine/pkg-descr
+++ b/audio/muine/pkg-descr
@@ -9,4 +9,4 @@ Muine is a music player for GNOME using Mono. It features:
 * A system tray icon
 * Translations into many languages
 
-WWW: http://muine.gooeylinux.org/
+WWW: http://muine-player.org
diff --git a/audio/muine/pkg-plist b/audio/muine/pkg-plist
index 548b325bd21e..b2cbc3403aa1 100644
--- a/audio/muine/pkg-plist
+++ b/audio/muine/pkg-plist
@@ -39,6 +39,7 @@ share/locale/ko/LC_MESSAGES/muine.mo
 share/locale/lt/LC_MESSAGES/muine.mo
 share/locale/ms/LC_MESSAGES/muine.mo
 share/locale/nb/LC_MESSAGES/muine.mo
+share/locale/ne/LC_MESSAGES/muine.mo
 share/locale/nl/LC_MESSAGES/muine.mo
 share/locale/no/LC_MESSAGES/muine.mo
 share/locale/pl/LC_MESSAGES/muine.mo
@@ -47,12 +48,15 @@ share/locale/pt_BR/LC_MESSAGES/muine.mo
 share/locale/ro/LC_MESSAGES/muine.mo
 share/locale/ru/LC_MESSAGES/muine.mo
 share/locale/rw/LC_MESSAGES/muine.mo
+share/locale/sk/LC_MESSAGES/muine.mo
 share/locale/sr/LC_MESSAGES/muine.mo
 share/locale/sr@Latn/LC_MESSAGES/muine.mo
 share/locale/sv/LC_MESSAGES/muine.mo
+share/locale/uk/LC_MESSAGES/muine.mo
+share/locale/vi/LC_MESSAGES/muine.mo
 share/locale/zh_CN/LC_MESSAGES/muine.mo
-@dirrm lib/muine/plugins
-@dirrm lib/muine
+@dirrmtry lib/muine/plugins
+@dirrmtry lib/muine
 @dirrm lib/mono/muine
 @dirrm lib/mono/gac/muine-plugin/1.0.0.0__e6bf890338fa2913
 @dirrm lib/mono/gac/muine-plugin