- Update to 2.15.2.1

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6291 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 17 insertions, 34 deletions

diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index c6f09f1ed..39eb24355 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Alexander Nedotsukov <bland@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/sound-juicer/Makefile,v 1.49 2006/04/14 15:06:00 ahze Exp $
+#   $MCom: ports/audio/sound-juicer/Makefile,v 1.51 2006/04/30 05:23:54 ahze Exp $
 #
 
 PORTNAME=	sound-juicer
-PORTVERSION=	2.15.1
+PORTVERSION=	2.15.2.1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index 0f5a65b5d..97f7b6078 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/sound-juicer-2.15.1.tar.bz2) = 3b3eaf9e6e34c5436fe14c276c66676d
-SHA256 (gnome2/sound-juicer-2.15.1.tar.bz2) = 8523e56c837f89d13e384373fa24dc016bae54c743782ef08051f02612f2dd19
-SIZE (gnome2/sound-juicer-2.15.1.tar.bz2) = 883013
+MD5 (gnome2/sound-juicer-2.15.2.1.tar.bz2) = 993f0e4689b8ecd0da038338bae6b1d0
+SHA256 (gnome2/sound-juicer-2.15.2.1.tar.bz2) = ca5501eca26146bbb4d5516d01ab5e4533b213c0802722d39be42738e97ca157
+SIZE (gnome2/sound-juicer-2.15.2.1.tar.bz2) = 889456
diff --git a/audio/sound-juicer/files/patch-src::Makefile.in b/audio/sound-juicer/files/patch-src::Makefile.in
index 189365e86..5162e8641 100644
--- a/audio/sound-juicer/files/patch-src::Makefile.in
+++ b/audio/sound-juicer/files/patch-src::Makefile.in
@@ -1,11 +1,11 @@
---- src/Makefile.in.orig	Mon Apr  3 23:40:45 2006
-+++ src/Makefile.in	Mon Apr  3 23:40:45 2006
-@@ -77,7 +77,7 @@ am_sound_juicer_OBJECTS = dummy.$(OBJEXT
- 	gconf-bridge.$(OBJEXT) bacon-volume.$(OBJEXT) $(am__objects_2) \
- 	$(am__objects_3) $(am__objects_4)
- sound_juicer_OBJECTS = $(am_sound_juicer_OBJECTS)
--sound_juicer_LDADD = $(LDADD)
-+sound_juicer_LDADD = $(LDADD) -lcam
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
+--- src/Makefile.in.orig	Wed May 17 14:08:25 2006
++++ src/Makefile.in	Wed May 17 14:09:00 2006
+@@ -304,7 +304,7 @@
+ 	$(BACON_FILES) \
+ 	$(ID3MUX_FILES)
+ 
+-sound_juicer_LDADD = $(top_builddir)/libjuicer/libjuicer.la
++sound_juicer_LDADD = $(top_builddir)/libjuicer/libjuicer.la -lcam
+ sound_juicer_LDFLAGS = @MEDIA_PROFILES_LIBS@ @GSTREAMER_LIBS@ \
+ 	@BURN_LIBS@ @UI_LIBS@ $(am__append_2)
+ BACON_DIR = $(srcdir)/../../libbacon/src/
diff --git a/audio/sound-juicer/files/patch-src::sj-metadata-musicbrainz.c b/audio/sound-juicer/files/patch-src::sj-metadata-musicbrainz.c
deleted file mode 100644
index c510a48dc..000000000
--- a/audio/sound-juicer/files/patch-src::sj-metadata-musicbrainz.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/sj-metadata-musicbrainz.c.orig	Mon Jan 17 13:22:54 2005
-+++ src/sj-metadata-musicbrainz.c	Mon Jan 17 13:23:02 2005
-@@ -18,7 +18,6 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
--#include "sound-juicer.h"
- 
- #include <string.h>
- #include <glib-object.h>
-@@ -32,6 +31,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- 
-+#include "sound-juicer.h"
- #include "sj-metadata-musicbrainz.h"
- #include "sj-structures.h"
- #include "sj-error.h"
diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist
index ea368bfc9..9c3e0b9fe 100644
--- a/audio/sound-juicer/pkg-plist
+++ b/audio/sound-juicer/pkg-plist
@@ -68,6 +68,7 @@ share/locale/ms/LC_MESSAGES/sound-juicer.mo
 share/locale/nb/LC_MESSAGES/sound-juicer.mo
 share/locale/ne/LC_MESSAGES/sound-juicer.mo
 share/locale/nl/LC_MESSAGES/sound-juicer.mo
+share/locale/nn/LC_MESSAGES/sound-juicer.mo
 share/locale/pa/LC_MESSAGES/sound-juicer.mo
 share/locale/pl/LC_MESSAGES/sound-juicer.mo
 share/locale/pt/LC_MESSAGES/sound-juicer.mo