Update to 2.12.0.

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

6 files changed, 86 insertions, 20 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 9c2e4d138..f7efe3736 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/gnomemedia2/Makefile,v 1.77 2005/07/13 19:54:07 ahze Exp $
+#   $MCom: ports/audio/gnomemedia2/Makefile,v 1.78 2005/08/08 17:18:50 kwm Exp $
 #
 
 PORTNAME=	gnomemedia2
-PORTVERSION=	2.11.91
+PORTVERSION=	2.12.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-media/2.11
+MASTER_SITE_SUBDIR=	sources/gnome-media/2.12
 DISTNAME=	gnome-media-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -45,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 c35413065..97a4c2785 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-media-2.11.91.tar.bz2) = 32e0ed9f33fb1101b291ed8e6df8a0f9
-SIZE (gnome2/gnome-media-2.11.91.tar.bz2) = 3421489
+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 3fa41c4e6..b5e234a89 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -192,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
@@ -229,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
@@ -318,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
@@ -328,9 +353,11 @@ 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
@@ -339,9 +366,11 @@ 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
@@ -402,6 +431,7 @@ share/gnome/pixmaps/gnome-cd/themes/red-lcd/top-left.png
 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-mixer.png
 share/gnome/pixmaps/gnome-reclevel.png
 share/gnome/pixmaps/gnome-vumeter.png
@@ -479,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
@@ -503,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
@@ -513,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 9c2e4d138..f7efe3736 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/gnomemedia2/Makefile,v 1.77 2005/07/13 19:54:07 ahze Exp $
+#   $MCom: ports/audio/gnomemedia2/Makefile,v 1.78 2005/08/08 17:18:50 kwm Exp $
 #
 
 PORTNAME=	gnomemedia2
-PORTVERSION=	2.11.91
+PORTVERSION=	2.12.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-media/2.11
+MASTER_SITE_SUBDIR=	sources/gnome-media/2.12
 DISTNAME=	gnome-media-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -45,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 c35413065..97a4c2785 100644
--- a/audio/gnomemedia2/distinfo
+++ b/audio/gnomemedia2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-media-2.11.91.tar.bz2) = 32e0ed9f33fb1101b291ed8e6df8a0f9
-SIZE (gnome2/gnome-media-2.11.91.tar.bz2) = 3421489
+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 3fa41c4e6..b5e234a89 100644
--- a/audio/gnomemedia2/pkg-plist
+++ b/audio/gnomemedia2/pkg-plist
@@ -192,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
@@ -229,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
@@ -318,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
@@ -328,9 +353,11 @@ 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
@@ -339,9 +366,11 @@ 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
@@ -402,6 +431,7 @@ share/gnome/pixmaps/gnome-cd/themes/red-lcd/top-left.png
 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-mixer.png
 share/gnome/pixmaps/gnome-reclevel.png
 share/gnome/pixmaps/gnome-vumeter.png
@@ -479,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
@@ -503,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
@@ -513,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