Presenting GNOME 2.12 for FreeBSD. The release is chock full of bug fixes

and new features.  Don't believe me?  Then see for yourself at
http://www.gnome.org/start/2.12/notes/en/.

DO NOT USE portupgrade by itself to upgrade to GNOME 2.12.  Instead, use
the gnome_upgrade.sh script from
http://www.marcuscom.com/downloads/gnome_upgrade212.sh.  This script will
circumvent some potential pitfalls users can see if they use portupgrade
by itself.

In keeping with tradition, GNOME 2.12 for FreeBSD comes with a special
splash screen.  The winner of this release's contest is
Dominique Goncalves <dominique.goncalves@gmail.com>.  His splash screen
was inspired by http://art.gnome.org/contests/2.12-splash/83.

The FreeBSD GNOME Team would lank to thank the following users for
their contributions to this release:

Matthew Luckie <mjl@luckie.org.nz>
ade
sajd on #freebsd-gnome
Caelian on #freebsd-gnome
mnag
Yasuda Keisuke <kysd@po.harenet.ne.jp>
Mark Hobden <markhobden@gmail.com>
Sergey Akifyev <asa@agava.com>
Andreas Kohn

For more information on GNOME on FreeBSD, checkout
http://www.FreeBSD.org/gnome/.  The 2.12 documentation will be
posted shortly.

12 files changed, 159 insertions, 122 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 51946794819..d1236e0f19f 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,13 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gnomemedia2/Makefile,v 1.79 2005/09/04 21:49:55 marcus Exp $
 #
 
 PORTNAME=	gnomemedia2
-PORTVERSION=	2.10.2
+PORTVERSION=	2.12.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-media/2.10
+MASTER_SITE_SUBDIR=	sources/gnome-media/2.12
 DISTNAME=	gnome-media-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -20,7 +21,7 @@ USE_BZIP2=	yes
 INSTALLS_OMF=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 GNOME_DESKTOP_VERSION=2
@@ -31,7 +32,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	CDDB-Slave2.schemas gnome-audio-profiles.schemas \
-		gnome-cd.schemas gnome-sound-recorder.schemas
+		gnome-cd.schemas gnome-sound-recorder.schemas \
+		gnome-volume-control.schemas
 
 .include <bsd.port.pre.mk>
 
@@ -43,10 +45,5 @@ post-patch:
 .else
 	@${REINPLACE_CMD} -e 's|%%CDROM%%|acd0c|' ${WRKSRC}/configure
 .endif
-.if ${OSVERSION} < 504000
-	@${REINPLACE_CMD} -e 's|lrint|rint|' \
-		${WRKSRC}/gnome-cd/gst-cdparanoia-cdrom.c \
-		${WRKSRC}/gst-mixer/src/volume.c
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index ecdc3f5b955..97a4c2785c3 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-media-2.10.2.tar.bz2) = 3d73cd40cfa52c5eef882302f92c60d6
-SIZE (gnome2/gnome-media-2.10.2.tar.bz2) = 3328141
+MD5 (gnome2/gnome-media-2.12.0.tar.bz2) = 74d9a78f7269602e033ab1a4a144afdf
+SIZE (gnome2/gnome-media-2.12.0.tar.bz2) = 3444233
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index d4b0694c11e..b5e234a8959 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -42,7 +42,7 @@ share/gnome/gnome-media/pixmaps/play.png
 share/gnome/gnome-media/pixmaps/record.png
 share/gnome/gnome-media/pixmaps/tone.png
 share/gnome/gnome-media/pixmaps/video.png
-share/gnome/gnome-sound-recorder/ui/gsr.xml
+share/gnome/gnome-sound-recorder/ui/ui.xml
 share/gnome/gstreamer-properties/glade/gstreamer-properties.glade
 share/gnome/gstreamer-properties/icons/gstreamer-properties.png
 share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png
@@ -161,6 +161,20 @@ share/gnome/help/gnome-cd/ko/figures/rewind_button.png
 share/gnome/help/gnome-cd/ko/figures/stop_button.png
 share/gnome/help/gnome-cd/ko/gnome-cd.xml
 share/gnome/help/gnome-cd/ko/legal.xml
+share/gnome/help/gnome-cd/nl/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/nl/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/nl/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/nl/figures/eject_button.png
+share/gnome/help/gnome-cd/nl/figures/forward_button.png
+share/gnome/help/gnome-cd/nl/figures/next_button.png
+share/gnome/help/gnome-cd/nl/figures/pause_button.png
+share/gnome/help/gnome-cd/nl/figures/play_button.png
+share/gnome/help/gnome-cd/nl/figures/preferences_button.png
+share/gnome/help/gnome-cd/nl/figures/previous_button.png
+share/gnome/help/gnome-cd/nl/figures/rewind_button.png
+share/gnome/help/gnome-cd/nl/figures/stop_button.png
+share/gnome/help/gnome-cd/nl/gnome-cd.xml
+share/gnome/help/gnome-cd/nl/legal.xml
 share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/sv/figures/cdplayer_window.png
@@ -178,6 +192,20 @@ share/gnome/help/gnome-cd/sv/figures/rewind_button.png
 share/gnome/help/gnome-cd/sv/figures/stop_button.png
 share/gnome/help/gnome-cd/sv/gnome-cd.xml
 share/gnome/help/gnome-cd/sv/legal.xml
+share/gnome/help/gnome-cd/uk/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/uk/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/uk/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/uk/figures/eject_button.png
+share/gnome/help/gnome-cd/uk/figures/forward_button.png
+share/gnome/help/gnome-cd/uk/figures/next_button.png
+share/gnome/help/gnome-cd/uk/figures/pause_button.png
+share/gnome/help/gnome-cd/uk/figures/play_button.png
+share/gnome/help/gnome-cd/uk/figures/preferences_button.png
+share/gnome/help/gnome-cd/uk/figures/previous_button.png
+share/gnome/help/gnome-cd/uk/figures/rewind_button.png
+share/gnome/help/gnome-cd/uk/figures/stop_button.png
+share/gnome/help/gnome-cd/uk/gnome-cd.xml
+share/gnome/help/gnome-cd/uk/legal.xml
 share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_window.png
@@ -215,11 +243,19 @@ share/gnome/help/gnome-cd/zh_TW/legal.xml
 share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/C/legal.xml
+share/gnome/help/gnome-sound-recorder/uk/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/uk/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/uk/legal.xml
 share/gnome/help/gnome-volume-control/C/figures/gmix-prefs.png
 share/gnome/help/gnome-volume-control/C/figures/gmix.png
 share/gnome/help/gnome-volume-control/C/figures/gnome-volume-control_window.png
 share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml
 share/gnome/help/gnome-volume-control/C/legal.xml
+share/gnome/help/gnome-volume-control/uk/figures/gmix-prefs.png
+share/gnome/help/gnome-volume-control/uk/figures/gmix.png
+share/gnome/help/gnome-volume-control/uk/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/uk/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/uk/legal.xml
 share/gnome/help/grecord/de/figures/grecord-prefs-path.png
 share/gnome/help/grecord/de/figures/grecord-prefs-play.png
 share/gnome/help/grecord/de/figures/grecord-prefs-rec.png
@@ -304,6 +340,9 @@ share/gnome/help/grecord/zh_TW/legal.xml
 share/gnome/help/gstreamer-properties/C/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/C/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/C/legal.xml
+share/gnome/help/gstreamer-properties/uk/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/uk/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/uk/legal.xml
 share/gnome/idl/GNOME_Media_CDDBSlave2.idl
 share/gnome/omf/gnome-media/gnome-cd-C.omf
 share/gnome/omf/gnome-media/gnome-cd-de.omf
@@ -312,10 +351,13 @@ share/gnome/omf/gnome-media/gnome-cd-fr.omf
 share/gnome/omf/gnome-media/gnome-cd-it.omf
 share/gnome/omf/gnome-media/gnome-cd-ja.omf
 share/gnome/omf/gnome-media/gnome-cd-ko.omf
+share/gnome/omf/gnome-media/gnome-cd-nl.omf
 share/gnome/omf/gnome-media/gnome-cd-sv.omf
+share/gnome/omf/gnome-media/gnome-cd-uk.omf
 share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf
 share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf
 share/gnome/omf/gnome-media/gnome-volume-control-C.omf
+share/gnome/omf/gnome-media/gnome-volume-control-uk.omf
 share/gnome/omf/gnome-media/grecord-C.omf
 share/gnome/omf/gnome-media/grecord-de.omf
 share/gnome/omf/gnome-media/grecord-es.omf
@@ -324,21 +366,15 @@ share/gnome/omf/gnome-media/grecord-it.omf
 share/gnome/omf/gnome-media/grecord-ja.omf
 share/gnome/omf/gnome-media/grecord-ko.omf
 share/gnome/omf/gnome-media/grecord-sv.omf
+share/gnome/omf/gnome-media/grecord-uk.omf
 share/gnome/omf/gnome-media/grecord-zh_CN.omf
 share/gnome/omf/gnome-media/grecord-zh_TW.omf
 share/gnome/omf/gnome-media/gstreamer-properties-C.omf
+share/gnome/omf/gnome-media/gstreamer-properties-uk.omf
 share/gnome/pixmaps/gnome-cd.png
 share/gnome/pixmaps/gnome-cd/cd.png
 share/gnome/pixmaps/gnome-cd/disc.png
 share/gnome/pixmaps/gnome-cd/media-eject.png
-share/gnome/pixmaps/gnome-cd/media-ffwd.png
-share/gnome/pixmaps/gnome-cd/media-next.png
-share/gnome/pixmaps/gnome-cd/media-pause.png
-share/gnome/pixmaps/gnome-cd/media-play.png
-share/gnome/pixmaps/gnome-cd/media-prev.png
-share/gnome/pixmaps/gnome-cd/media-record.png
-share/gnome/pixmaps/gnome-cd/media-rewind.png
-share/gnome/pixmaps/gnome-cd/media-stop.png
 share/gnome/pixmaps/gnome-cd/once.png
 share/gnome/pixmaps/gnome-cd/repeat.png
 share/gnome/pixmaps/gnome-cd/themes/None/None.theme
@@ -396,9 +432,6 @@ share/gnome/pixmaps/gnome-cd/themes/red-lcd/top-right.png
 share/gnome/pixmaps/gnome-cd/themes/red-lcd/top.png
 share/gnome/pixmaps/gnome-cd/track.png
 share/gnome/pixmaps/gnome-grecord.png
-share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-play.png
-share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-record.png
-share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-stop.png
 share/gnome/pixmaps/gnome-mixer.png
 share/gnome/pixmaps/gnome-reclevel.png
 share/gnome/pixmaps/gnome-vumeter.png
@@ -469,8 +502,6 @@ share/locale/wa/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/xh/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
-@dirrm share/gnome/pixmaps/gnome-media/gnome-sound-recorder
-@dirrm share/gnome/pixmaps/gnome-media
 @dirrm share/gnome/pixmaps/gnome-cd/themes/red-lcd
 @dirrm share/gnome/pixmaps/gnome-cd/themes/media
 @dirrm share/gnome/pixmaps/gnome-cd/themes/lcd
@@ -478,6 +509,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm share/gnome/pixmaps/gnome-cd/themes
 @dirrm share/gnome/pixmaps/gnome-cd
 @dirrm share/gnome/omf/gnome-media
+@dirrm share/gnome/help/gstreamer-properties/uk/figures
+@dirrm share/gnome/help/gstreamer-properties/uk
 @dirrm share/gnome/help/gstreamer-properties/C/figures
 @dirrm share/gnome/help/gstreamer-properties/C
 @dirrm share/gnome/help/gstreamer-properties
@@ -487,6 +520,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm share/gnome/help/grecord/zh_CN
 @dirrm share/gnome/help/grecord/sv/figures
 @dirrm share/gnome/help/grecord/sv
+@dirrm share/gnome/help/gnome-cd/nl/figures
+@dirrm share/gnome/help/gnome-cd/nl
 @dirrm share/gnome/help/grecord/ko/figures
 @dirrm share/gnome/help/grecord/ko
 @dirrm share/gnome/help/grecord/ja/figures
@@ -500,9 +535,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm share/gnome/help/grecord/de/figures
 @dirrm share/gnome/help/grecord/de
 @dirrm share/gnome/help/grecord
+@dirrm share/gnome/help/gnome-volume-control/uk/figures
+@dirrm share/gnome/help/gnome-volume-control/uk
 @dirrm share/gnome/help/gnome-volume-control/C/figures
 @dirrm share/gnome/help/gnome-volume-control/C
 @dirrm share/gnome/help/gnome-volume-control
+@dirrm share/gnome/help/gnome-sound-recorder/uk/figures
+@dirrm share/gnome/help/gnome-sound-recorder/uk
 @dirrm share/gnome/help/gnome-sound-recorder/C/figures
 @dirrm share/gnome/help/gnome-sound-recorder/C
 @dirrm share/gnome/help/gnome-sound-recorder
@@ -510,6 +549,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm share/gnome/help/gnome-cd/zh_TW
 @dirrm share/gnome/help/gnome-cd/zh_CN/figures
 @dirrm share/gnome/help/gnome-cd/zh_CN
+@dirrm share/gnome/help/gnome-cd/uk/figures
+@dirrm share/gnome/help/gnome-cd/uk
 @dirrm share/gnome/help/gnome-cd/sv/figures
 @dirrm share/gnome/help/gnome-cd/sv
 @dirrm share/gnome/help/gnome-cd/ko/figures
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 51946794819..d1236e0f19f 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -3,13 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gnomemedia2/Makefile,v 1.79 2005/09/04 21:49:55 marcus Exp $
 #
 
 PORTNAME=	gnomemedia2
-PORTVERSION=	2.10.2
+PORTVERSION=	2.12.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-media/2.10
+MASTER_SITE_SUBDIR=	sources/gnome-media/2.12
 DISTNAME=	gnome-media-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -20,7 +21,7 @@ USE_BZIP2=	yes
 INSTALLS_OMF=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 GNOME_DESKTOP_VERSION=2
@@ -31,7 +32,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	CDDB-Slave2.schemas gnome-audio-profiles.schemas \
-		gnome-cd.schemas gnome-sound-recorder.schemas
+		gnome-cd.schemas gnome-sound-recorder.schemas \
+		gnome-volume-control.schemas
 
 .include <bsd.port.pre.mk>
 
@@ -43,10 +45,5 @@ post-patch:
 .else
 	@${REINPLACE_CMD} -e 's|%%CDROM%%|acd0c|' ${WRKSRC}/configure
 .endif
-.if ${OSVERSION} < 504000
-	@${REINPLACE_CMD} -e 's|lrint|rint|' \
-		${WRKSRC}/gnome-cd/gst-cdparanoia-cdrom.c \
-		${WRKSRC}/gst-mixer/src/volume.c
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo
index ecdc3f5b955..97a4c2785c3 100644
--- a/audio/gnomemedia2/distinfo
+++ b/audio/gnomemedia2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-media-2.10.2.tar.bz2) = 3d73cd40cfa52c5eef882302f92c60d6
-SIZE (gnome2/gnome-media-2.10.2.tar.bz2) = 3328141
+MD5 (gnome2/gnome-media-2.12.0.tar.bz2) = 74d9a78f7269602e033ab1a4a144afdf
+SIZE (gnome2/gnome-media-2.12.0.tar.bz2) = 3444233
diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist
index d4b0694c11e..b5e234a8959 100644
--- a/audio/gnomemedia2/pkg-plist
+++ b/audio/gnomemedia2/pkg-plist
@@ -42,7 +42,7 @@ share/gnome/gnome-media/pixmaps/play.png
 share/gnome/gnome-media/pixmaps/record.png
 share/gnome/gnome-media/pixmaps/tone.png
 share/gnome/gnome-media/pixmaps/video.png
-share/gnome/gnome-sound-recorder/ui/gsr.xml
+share/gnome/gnome-sound-recorder/ui/ui.xml
 share/gnome/gstreamer-properties/glade/gstreamer-properties.glade
 share/gnome/gstreamer-properties/icons/gstreamer-properties.png
 share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png
@@ -161,6 +161,20 @@ share/gnome/help/gnome-cd/ko/figures/rewind_button.png
 share/gnome/help/gnome-cd/ko/figures/stop_button.png
 share/gnome/help/gnome-cd/ko/gnome-cd.xml
 share/gnome/help/gnome-cd/ko/legal.xml
+share/gnome/help/gnome-cd/nl/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/nl/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/nl/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/nl/figures/eject_button.png
+share/gnome/help/gnome-cd/nl/figures/forward_button.png
+share/gnome/help/gnome-cd/nl/figures/next_button.png
+share/gnome/help/gnome-cd/nl/figures/pause_button.png
+share/gnome/help/gnome-cd/nl/figures/play_button.png
+share/gnome/help/gnome-cd/nl/figures/preferences_button.png
+share/gnome/help/gnome-cd/nl/figures/previous_button.png
+share/gnome/help/gnome-cd/nl/figures/rewind_button.png
+share/gnome/help/gnome-cd/nl/figures/stop_button.png
+share/gnome/help/gnome-cd/nl/gnome-cd.xml
+share/gnome/help/gnome-cd/nl/legal.xml
 share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/sv/figures/cdplayer_window.png
@@ -178,6 +192,20 @@ share/gnome/help/gnome-cd/sv/figures/rewind_button.png
 share/gnome/help/gnome-cd/sv/figures/stop_button.png
 share/gnome/help/gnome-cd/sv/gnome-cd.xml
 share/gnome/help/gnome-cd/sv/legal.xml
+share/gnome/help/gnome-cd/uk/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/uk/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/uk/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/uk/figures/eject_button.png
+share/gnome/help/gnome-cd/uk/figures/forward_button.png
+share/gnome/help/gnome-cd/uk/figures/next_button.png
+share/gnome/help/gnome-cd/uk/figures/pause_button.png
+share/gnome/help/gnome-cd/uk/figures/play_button.png
+share/gnome/help/gnome-cd/uk/figures/preferences_button.png
+share/gnome/help/gnome-cd/uk/figures/previous_button.png
+share/gnome/help/gnome-cd/uk/figures/rewind_button.png
+share/gnome/help/gnome-cd/uk/figures/stop_button.png
+share/gnome/help/gnome-cd/uk/gnome-cd.xml
+share/gnome/help/gnome-cd/uk/legal.xml
 share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_window.png
@@ -215,11 +243,19 @@ share/gnome/help/gnome-cd/zh_TW/legal.xml
 share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/C/legal.xml
+share/gnome/help/gnome-sound-recorder/uk/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/uk/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/uk/legal.xml
 share/gnome/help/gnome-volume-control/C/figures/gmix-prefs.png
 share/gnome/help/gnome-volume-control/C/figures/gmix.png
 share/gnome/help/gnome-volume-control/C/figures/gnome-volume-control_window.png
 share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml
 share/gnome/help/gnome-volume-control/C/legal.xml
+share/gnome/help/gnome-volume-control/uk/figures/gmix-prefs.png
+share/gnome/help/gnome-volume-control/uk/figures/gmix.png
+share/gnome/help/gnome-volume-control/uk/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/uk/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/uk/legal.xml
 share/gnome/help/grecord/de/figures/grecord-prefs-path.png
 share/gnome/help/grecord/de/figures/grecord-prefs-play.png
 share/gnome/help/grecord/de/figures/grecord-prefs-rec.png
@@ -304,6 +340,9 @@ share/gnome/help/grecord/zh_TW/legal.xml
 share/gnome/help/gstreamer-properties/C/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/C/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/C/legal.xml
+share/gnome/help/gstreamer-properties/uk/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/uk/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/uk/legal.xml
 share/gnome/idl/GNOME_Media_CDDBSlave2.idl
 share/gnome/omf/gnome-media/gnome-cd-C.omf
 share/gnome/omf/gnome-media/gnome-cd-de.omf
@@ -312,10 +351,13 @@ share/gnome/omf/gnome-media/gnome-cd-fr.omf
 share/gnome/omf/gnome-media/gnome-cd-it.omf
 share/gnome/omf/gnome-media/gnome-cd-ja.omf
 share/gnome/omf/gnome-media/gnome-cd-ko.omf
+share/gnome/omf/gnome-media/gnome-cd-nl.omf
 share/gnome/omf/gnome-media/gnome-cd-sv.omf
+share/gnome/omf/gnome-media/gnome-cd-uk.omf
 share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf
 share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf
 share/gnome/omf/gnome-media/gnome-volume-control-C.omf
+share/gnome/omf/gnome-media/gnome-volume-control-uk.omf
 share/gnome/omf/gnome-media/grecord-C.omf
 share/gnome/omf/gnome-media/grecord-de.omf
 share/gnome/omf/gnome-media/grecord-es.omf
@@ -324,21 +366,15 @@ share/gnome/omf/gnome-media/grecord-it.omf
 share/gnome/omf/gnome-media/grecord-ja.omf
 share/gnome/omf/gnome-media/grecord-ko.omf
 share/gnome/omf/gnome-media/grecord-sv.omf
+share/gnome/omf/gnome-media/grecord-uk.omf
 share/gnome/omf/gnome-media/grecord-zh_CN.omf
 share/gnome/omf/gnome-media/grecord-zh_TW.omf
 share/gnome/omf/gnome-media/gstreamer-properties-C.omf
+share/gnome/omf/gnome-media/gstreamer-properties-uk.omf
 share/gnome/pixmaps/gnome-cd.png
 share/gnome/pixmaps/gnome-cd/cd.png
 share/gnome/pixmaps/gnome-cd/disc.png
 share/gnome/pixmaps/gnome-cd/media-eject.png
-share/gnome/pixmaps/gnome-cd/media-ffwd.png
-share/gnome/pixmaps/gnome-cd/media-next.png
-share/gnome/pixmaps/gnome-cd/media-pause.png
-share/gnome/pixmaps/gnome-cd/media-play.png
-share/gnome/pixmaps/gnome-cd/media-prev.png
-share/gnome/pixmaps/gnome-cd/media-record.png
-share/gnome/pixmaps/gnome-cd/media-rewind.png
-share/gnome/pixmaps/gnome-cd/media-stop.png
 share/gnome/pixmaps/gnome-cd/once.png
 share/gnome/pixmaps/gnome-cd/repeat.png
 share/gnome/pixmaps/gnome-cd/themes/None/None.theme
@@ -396,9 +432,6 @@ share/gnome/pixmaps/gnome-cd/themes/red-lcd/top-right.png
 share/gnome/pixmaps/gnome-cd/themes/red-lcd/top.png
 share/gnome/pixmaps/gnome-cd/track.png
 share/gnome/pixmaps/gnome-grecord.png
-share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-play.png
-share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-record.png
-share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-stop.png
 share/gnome/pixmaps/gnome-mixer.png
 share/gnome/pixmaps/gnome-reclevel.png
 share/gnome/pixmaps/gnome-vumeter.png
@@ -469,8 +502,6 @@ share/locale/wa/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/xh/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
-@dirrm share/gnome/pixmaps/gnome-media/gnome-sound-recorder
-@dirrm share/gnome/pixmaps/gnome-media
 @dirrm share/gnome/pixmaps/gnome-cd/themes/red-lcd
 @dirrm share/gnome/pixmaps/gnome-cd/themes/media
 @dirrm share/gnome/pixmaps/gnome-cd/themes/lcd
@@ -478,6 +509,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm share/gnome/pixmaps/gnome-cd/themes
 @dirrm share/gnome/pixmaps/gnome-cd
 @dirrm share/gnome/omf/gnome-media
+@dirrm share/gnome/help/gstreamer-properties/uk/figures
+@dirrm share/gnome/help/gstreamer-properties/uk
 @dirrm share/gnome/help/gstreamer-properties/C/figures
 @dirrm share/gnome/help/gstreamer-properties/C
 @dirrm share/gnome/help/gstreamer-properties
@@ -487,6 +520,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm share/gnome/help/grecord/zh_CN
 @dirrm share/gnome/help/grecord/sv/figures
 @dirrm share/gnome/help/grecord/sv
+@dirrm share/gnome/help/gnome-cd/nl/figures
+@dirrm share/gnome/help/gnome-cd/nl
 @dirrm share/gnome/help/grecord/ko/figures
 @dirrm share/gnome/help/grecord/ko
 @dirrm share/gnome/help/grecord/ja/figures
@@ -500,9 +535,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm share/gnome/help/grecord/de/figures
 @dirrm share/gnome/help/grecord/de
 @dirrm share/gnome/help/grecord
+@dirrm share/gnome/help/gnome-volume-control/uk/figures
+@dirrm share/gnome/help/gnome-volume-control/uk
 @dirrm share/gnome/help/gnome-volume-control/C/figures
 @dirrm share/gnome/help/gnome-volume-control/C
 @dirrm share/gnome/help/gnome-volume-control
+@dirrm share/gnome/help/gnome-sound-recorder/uk/figures
+@dirrm share/gnome/help/gnome-sound-recorder/uk
 @dirrm share/gnome/help/gnome-sound-recorder/C/figures
 @dirrm share/gnome/help/gnome-sound-recorder/C
 @dirrm share/gnome/help/gnome-sound-recorder
@@ -510,6 +549,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm share/gnome/help/gnome-cd/zh_TW
 @dirrm share/gnome/help/gnome-cd/zh_CN/figures
 @dirrm share/gnome/help/gnome-cd/zh_CN
+@dirrm share/gnome/help/gnome-cd/uk/figures
+@dirrm share/gnome/help/gnome-cd/uk
 @dirrm share/gnome/help/gnome-cd/sv/figures
 @dirrm share/gnome/help/gnome-cd/sv
 @dirrm share/gnome/help/gnome-cd/ko/figures
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index a4bea860dbd..c3df43e8d17 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -3,13 +3,14 @@
 # Whom:			Alexander Nedotsukov <bland@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/sound-juicer/Makefile,v 1.29 2005/09/19 13:18:32 marcus Exp $
 #
 
 PORTNAME=	sound-juicer
-PORTVERSION=	2.10.1
+PORTVERSION=	2.12.2
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,9 +24,10 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner
+USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner \
+		gnomedocutils
 USE_GSTREAMER=	cdparanoia vorbis flac gconf
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--enable-ignore-missing-cd
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index 3227b069b84..49c965a6529 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/sound-juicer-2.10.1.tar.bz2) = 59a5e142cf39152bcbc1467d02e4494a
-SIZE (gnome2/sound-juicer-2.10.1.tar.bz2) = 518894
+MD5 (gnome2/sound-juicer-2.12.2.tar.bz2) = e7e873cc77a002eb0d9c4cf502bd343d
+SIZE (gnome2/sound-juicer-2.12.2.tar.bz2) = 573186
diff --git a/audio/sound-juicer/files/patch-src::Makefile.in b/audio/sound-juicer/files/patch-src::Makefile.in
index 46002055199..187926fc41e 100644
--- a/audio/sound-juicer/files/patch-src::Makefile.in
+++ b/audio/sound-juicer/files/patch-src::Makefile.in
@@ -1,15 +1,15 @@
---- src/Makefile.in.orig	Mon Feb  7 02:21:49 2005
-+++ src/Makefile.in	Mon Feb  7 02:22:46 2005
-@@ -61,7 +61,7 @@
- 	sj-about.$(OBJEXT) sj-extracting.$(OBJEXT) $(am__objects_1) \
- 	$(am__objects_2)
+--- src/Makefile.in.orig	Tue Aug 23 20:23:29 2005
++++ src/Makefile.in	Tue Aug 23 20:23:57 2005
+@@ -63,7 +63,7 @@
+ 	sj-about.$(OBJEXT) sj-extracting.$(OBJEXT) \
+ 	bacon-volume.$(OBJEXT) $(am__objects_1) $(am__objects_2)
  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
-@@ -233,7 +233,7 @@
+@@ -257,7 +257,7 @@
  target_alias = @target_alias@
  
  # General compiler flags
diff --git a/audio/sound-juicer/files/patch-src::sj-genres.c b/audio/sound-juicer/files/patch-src::sj-genres.c
deleted file mode 100644
index 5bbf888cbed..00000000000
--- a/audio/sound-juicer/files/patch-src::sj-genres.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/sj-genres.c.orig	Mon Jan 17 13:22:28 2005
-+++ src/sj-genres.c	Mon Jan 17 13:22:34 2005
-@@ -20,9 +20,9 @@
-  * Authors: Ross Burton <ross@burtonini.com>
-  */
- 
--#include "sound-juicer.h"
- 
- #include <glib/gi18n.h>
-+#include "sound-juicer.h"
- 
- #include "sj-genres.h"
- 
diff --git a/audio/sound-juicer/files/patch-src::sj-util.c b/audio/sound-juicer/files/patch-src::sj-util.c
deleted file mode 100644
index b29d97bbd4f..00000000000
--- a/audio/sound-juicer/files/patch-src::sj-util.c
+++ /dev/null
@@ -1,43 +0,0 @@
---- src/sj-util.c.orig	Tue Feb  8 14:06:57 2005
-+++ src/sj-util.c	Tue Feb  8 14:25:03 2005
-@@ -157,6 +157,15 @@
-   if (fd < 0) {
-     return FALSE;
-   }
-+#if defined(__FreeBSD__)
-+  status = FALSE;
-+
-+  ioctl (fd, CDIOCCLOSE);
-+
-+  close (fd);
-+
-+  return status;
-+#else
-   
-   status = ioctl (fd, CDROM_DRIVE_STATUS, CDSL_CURRENT);
-   if (status < 0) {
-@@ -167,6 +176,7 @@
-   close (fd);
-   
-   return status == CDS_TRAY_OPEN;
-+#endif
- }
- 
- gboolean is_audio_cd (const char *device)
-@@ -191,7 +201,7 @@
-     default:
-       return FALSE;
-   }
--
-+/*
-   fd = open (device, O_RDONLY | O_NONBLOCK | O_EXCL);
-   if (fd <0) {
-     return FALSE;
-@@ -206,6 +216,7 @@
-   close (fd);
- 
-   return status == CDS_AUDIO;
-+  */
- }
- 
- /* Pass NULL to use g_free */
diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist
index af795151e07..e3ebca0dda0 100644
--- a/audio/sound-juicer/pkg-plist
+++ b/audio/sound-juicer/pkg-plist
@@ -1,13 +1,21 @@
 bin/sound-juicer
 share/gnome/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/omf/sound-juicer/sound-juicer-manual-C.omf
+share/gnome/help/sound-juicer/es/fdl-appendix.xml
+share/gnome/help/sound-juicer/es/legal.xml
+share/gnome/help/sound-juicer/es/sound-juicer.xml
+share/gnome/help/sound-juicer/uk/fdl-appendix.xml
+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-es.omf
+share/gnome/omf/sound-juicer/sound-juicer-uk.omf
 share/gnome/pixmaps/sound-juicer.png
 share/gnome/sound-juicer/orange-slice.png
+share/gnome/sound-juicer/sj-play.png
+share/gnome/sound-juicer/sj-record.png
 share/gnome/sound-juicer/sound-juicer.glade
 share/locale/ar/LC_MESSAGES/sound-juicer.mo
 share/locale/az/LC_MESSAGES/sound-juicer.mo
@@ -15,6 +23,7 @@ share/locale/be/LC_MESSAGES/sound-juicer.mo
 share/locale/bg/LC_MESSAGES/sound-juicer.mo
 share/locale/ca/LC_MESSAGES/sound-juicer.mo
 share/locale/cs/LC_MESSAGES/sound-juicer.mo
+share/locale/cy/LC_MESSAGES/sound-juicer.mo
 share/locale/da/LC_MESSAGES/sound-juicer.mo
 share/locale/de/LC_MESSAGES/sound-juicer.mo
 share/locale/el/LC_MESSAGES/sound-juicer.mo
@@ -23,8 +32,10 @@ share/locale/en_GB/LC_MESSAGES/sound-juicer.mo
 share/locale/es/LC_MESSAGES/sound-juicer.mo
 share/locale/et/LC_MESSAGES/sound-juicer.mo
 share/locale/eu/LC_MESSAGES/sound-juicer.mo
+share/locale/fa/LC_MESSAGES/sound-juicer.mo
 share/locale/fi/LC_MESSAGES/sound-juicer.mo
 share/locale/fr/LC_MESSAGES/sound-juicer.mo
+share/locale/gl/LC_MESSAGES/sound-juicer.mo
 share/locale/gu/LC_MESSAGES/sound-juicer.mo
 share/locale/hi/LC_MESSAGES/sound-juicer.mo
 share/locale/hr/LC_MESSAGES/sound-juicer.mo
@@ -48,18 +59,22 @@ 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/sk/LC_MESSAGES/sound-juicer.mo
 share/locale/sq/LC_MESSAGES/sound-juicer.mo
 share/locale/sr/LC_MESSAGES/sound-juicer.mo
 share/locale/sr@Latn/LC_MESSAGES/sound-juicer.mo
 share/locale/sv/LC_MESSAGES/sound-juicer.mo
+share/locale/ta/LC_MESSAGES/sound-juicer.mo
 share/locale/th/LC_MESSAGES/sound-juicer.mo
 share/locale/tr/LC_MESSAGES/sound-juicer.mo
+share/locale/ug/LC_MESSAGES/sound-juicer.mo
 share/locale/uk/LC_MESSAGES/sound-juicer.mo
 share/locale/xh/LC_MESSAGES/sound-juicer.mo
 share/locale/zh_CN/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
-@dirrm share/gnome/help/sound-juicer/C/figures
+@dirrm share/gnome/help/sound-juicer/uk
+@dirrm share/gnome/help/sound-juicer/es
 @dirrm share/gnome/help/sound-juicer/C
 @dirrm share/gnome/help/sound-juicer