Presenting GNOME 2.20.1 and all related works for FreeBSD. The official

GNOME 2.20 release notes can be found at
http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).

The FreeBSD GNOME team would also like to thank our various testers and
contributors:

Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)

PRs fixed in this release:

111272, 113470, 115995, 116338

3 files changed, 49 insertions, 23 deletions

diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 02b0e4973acd..3b25d746a009 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Alexander Nedotsukov <bland@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/sound-juicer/Makefile,v 1.61 2006/10/01 16:32:05 ahze Exp $
+#   $MCom: ports/audio/sound-juicer/Makefile,v 1.71 2007/10/15 00:27:00 marcus Exp $
 #
 
 PORTNAME=	sound-juicer
-PORTVERSION=	2.16.4
-PORTREVISION=	1
+PORTVERSION=	2.20.1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,7 +18,8 @@ COMMENT=	Clean, mean and lean CD ripper for GNOME2
 
 LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
-		cdio.7:${PORTSDIR}/sysutils/libcdio
+		cdio.7:${PORTSDIR}/sysutils/libcdio \
+    		tag.5:${PORTSDIR}/audio/taglib
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index 0930bee78d7a..cc9d09126b7b 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/sound-juicer-2.16.4.tar.bz2) = bcf1f77027b1d1d4c1667b20c6448122
-SHA256 (gnome2/sound-juicer-2.16.4.tar.bz2) = db90283d1eca9e7a1cc986a13b222ad60f3b48333bce9f275dd3861c11124371
-SIZE (gnome2/sound-juicer-2.16.4.tar.bz2) = 1270126
+MD5 (gnome2/sound-juicer-2.20.1.tar.bz2) = cea3c67215c99acf513ee7ea4b5eba7b
+SHA256 (gnome2/sound-juicer-2.20.1.tar.bz2) = 6ac84544386ef7f690330d7f92f6c2f64da752c0f5cd60501a792b23f325a9ab
+SIZE (gnome2/sound-juicer-2.20.1.tar.bz2) = 1412335
diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist
index 5310f1442d23..9b4c1e883cb3 100644
--- a/audio/sound-juicer/pkg-plist
+++ b/audio/sound-juicer/pkg-plist
@@ -1,10 +1,15 @@
 bin/sound-juicer
-share/gnome/applications/sound-juicer.desktop
+share/applications/sound-juicer.desktop
 share/gnome/help/sound-juicer/C/fdl-appendix.xml
 share/gnome/help/sound-juicer/C/figures/prefs.png
 share/gnome/help/sound-juicer/C/figures/startup.png
 share/gnome/help/sound-juicer/C/legal.xml
 share/gnome/help/sound-juicer/C/sound-juicer.xml
+share/gnome/help/sound-juicer/de/fdl-appendix.xml
+share/gnome/help/sound-juicer/de/figures/prefs.png
+share/gnome/help/sound-juicer/de/figures/startup.png
+share/gnome/help/sound-juicer/de/legal.xml
+share/gnome/help/sound-juicer/de/sound-juicer.xml
 share/gnome/help/sound-juicer/el/fdl-appendix.xml
 share/gnome/help/sound-juicer/el/figures/prefs.png
 share/gnome/help/sound-juicer/el/figures/startup.png
@@ -30,6 +35,11 @@ share/gnome/help/sound-juicer/nl/figures/prefs.png
 share/gnome/help/sound-juicer/nl/figures/startup.png
 share/gnome/help/sound-juicer/nl/legal.xml
 share/gnome/help/sound-juicer/nl/sound-juicer.xml
+share/gnome/help/sound-juicer/oc/fdl-appendix.xml
+share/gnome/help/sound-juicer/oc/figures/prefs.png
+share/gnome/help/sound-juicer/oc/figures/startup.png
+share/gnome/help/sound-juicer/oc/legal.xml
+share/gnome/help/sound-juicer/oc/sound-juicer.xml
 share/gnome/help/sound-juicer/sv/fdl-appendix.xml
 share/gnome/help/sound-juicer/sv/figures/prefs.png
 share/gnome/help/sound-juicer/sv/figures/startup.png
@@ -40,17 +50,6 @@ share/gnome/help/sound-juicer/uk/figures/prefs.png
 share/gnome/help/sound-juicer/uk/figures/startup.png
 share/gnome/help/sound-juicer/uk/legal.xml
 share/gnome/help/sound-juicer/uk/sound-juicer.xml
-share/gnome/omf/sound-juicer/sound-juicer-C.omf
-share/gnome/omf/sound-juicer/sound-juicer-el.omf
-share/gnome/omf/sound-juicer/sound-juicer-en_GB.omf
-share/gnome/omf/sound-juicer/sound-juicer-es.omf
-share/gnome/omf/sound-juicer/sound-juicer-fr.omf
-share/gnome/omf/sound-juicer/sound-juicer-nl.omf
-share/gnome/omf/sound-juicer/sound-juicer-sv.omf
-share/gnome/omf/sound-juicer/sound-juicer-uk.omf
-share/gnome/sound-juicer/sj-play.png
-share/gnome/sound-juicer/sj-record.png
-share/gnome/sound-juicer/sound-juicer.glade
 share/icons/hicolor/16x16/apps/sound-juicer.png
 share/icons/hicolor/22x22/apps/sound-juicer.png
 share/icons/hicolor/24x24/apps/sound-juicer.png
@@ -58,6 +57,7 @@ share/icons/hicolor/scalable/apps/sound-juicer.svg
 share/locale/ar/LC_MESSAGES/sound-juicer.mo
 share/locale/az/LC_MESSAGES/sound-juicer.mo
 share/locale/be/LC_MESSAGES/sound-juicer.mo
+share/locale/be@latin/LC_MESSAGES/sound-juicer.mo
 share/locale/bg/LC_MESSAGES/sound-juicer.mo
 share/locale/bn/LC_MESSAGES/sound-juicer.mo
 share/locale/bn_IN/LC_MESSAGES/sound-juicer.mo
@@ -99,6 +99,7 @@ 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/oc/LC_MESSAGES/sound-juicer.mo
 share/locale/or/LC_MESSAGES/sound-juicer.mo
 share/locale/pa/LC_MESSAGES/sound-juicer.mo
 share/locale/pl/LC_MESSAGES/sound-juicer.mo
@@ -107,6 +108,7 @@ share/locale/pt_BR/LC_MESSAGES/sound-juicer.mo
 share/locale/ro/LC_MESSAGES/sound-juicer.mo
 share/locale/ru/LC_MESSAGES/sound-juicer.mo
 share/locale/rw/LC_MESSAGES/sound-juicer.mo
+share/locale/si/LC_MESSAGES/sound-juicer.mo
 share/locale/sk/LC_MESSAGES/sound-juicer.mo
 share/locale/sl/LC_MESSAGES/sound-juicer.mo
 share/locale/sq/LC_MESSAGES/sound-juicer.mo
@@ -123,22 +125,39 @@ share/locale/xh/LC_MESSAGES/sound-juicer.mo
 share/locale/zh_CN/LC_MESSAGES/sound-juicer.mo
 share/locale/zh_HK/LC_MESSAGES/sound-juicer.mo
 share/locale/zh_TW/LC_MESSAGES/sound-juicer.mo
-@dirrm share/gnome/sound-juicer
-@dirrm share/gnome/omf/sound-juicer
+share/omf/sound-juicer/sound-juicer-C.omf
+share/omf/sound-juicer/sound-juicer-de.omf
+share/omf/sound-juicer/sound-juicer-el.omf
+share/omf/sound-juicer/sound-juicer-en_GB.omf
+share/omf/sound-juicer/sound-juicer-es.omf
+share/omf/sound-juicer/sound-juicer-fr.omf
+share/omf/sound-juicer/sound-juicer-nl.omf
+share/omf/sound-juicer/sound-juicer-oc.omf
+share/omf/sound-juicer/sound-juicer-sv.omf
+share/omf/sound-juicer/sound-juicer-uk.omf
+%%DATADIR%%/sj-play.png
+%%DATADIR%%/sj-record.png
+%%DATADIR%%/sound-juicer.glade
+@dirrm %%DATADIR%%
+@dirrm share/omf/sound-juicer
 @dirrm share/gnome/help/sound-juicer/uk/figures
 @dirrm share/gnome/help/sound-juicer/uk
 @dirrm share/gnome/help/sound-juicer/sv/figures
 @dirrm share/gnome/help/sound-juicer/sv
+@dirrm share/gnome/help/sound-juicer/oc/figures
+@dirrm share/gnome/help/sound-juicer/oc
 @dirrm share/gnome/help/sound-juicer/nl/figures
 @dirrm share/gnome/help/sound-juicer/nl
 @dirrm share/gnome/help/sound-juicer/fr/figures
 @dirrm share/gnome/help/sound-juicer/fr
 @dirrm share/gnome/help/sound-juicer/es/figures
 @dirrm share/gnome/help/sound-juicer/es
-@dirrm share/gnome/help/sound-juicer/el/figures
-@dirrm share/gnome/help/sound-juicer/el
 @dirrm share/gnome/help/sound-juicer/en_GB/figures
 @dirrm share/gnome/help/sound-juicer/en_GB
+@dirrm share/gnome/help/sound-juicer/el/figures
+@dirrm share/gnome/help/sound-juicer/el
+@dirrm share/gnome/help/sound-juicer/de/figures
+@dirrm share/gnome/help/sound-juicer/de
 @dirrm share/gnome/help/sound-juicer/C/figures
 @dirrm share/gnome/help/sound-juicer/C
 @dirrm share/gnome/help/sound-juicer
@@ -148,11 +167,18 @@ share/locale/zh_TW/LC_MESSAGES/sound-juicer.mo
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/applications