Update to the latest GNOME 2 snapshot.

6 files changed, 60 insertions, 24 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index fd537277cfe..30e865c0359 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomemedia2
-PORTVERSION=	1.547.0
+PORTVERSION=	1.999999999.0 # Uh, a little crazy, don't you think?
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020607
 DISTNAME=	gnome-media-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -17,7 +17,7 @@ MAINTAINER=	gnome@FreeBSD.org
 
 RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
 LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
-		gailutil.13:${PORTSDIR}/x11-toolkits/gail
+		gailutil.15:${PORTSDIR}/x11-toolkits/gail
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index ed636d19caa..02a41161046 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-media-1.547.0.tar.bz2) = 1d472fb7e301be1856d1d8d87a86026e
+MD5 (gnome2/gnome-media-1.999999999.0.tar.bz2) = d148d8d3049edaf2d18e52258f73cab7
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index d22c68d84a3..05fbd0006b0 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -28,25 +28,40 @@ share/gnome/applications/gnome-volume-control.desktop
 share/gnome/applications/reclevel.desktop
 share/gnome/applications/vumeter.desktop
 share/gnome/control-center-2.0/capplets/cddb-slave.desktop
-share/gnome/help/gmix/C/figures/gmix-prefs.png
-share/gnome/help/gmix/C/figures/gmix.png
-share/gnome/help/gmix/C/gmix.xml
-share/gnome/help/gmix/C/legal.xml
-share/gnome/help/gmix/C/topic.dat
+share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/C/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/C/figures/eject_button.png
+share/gnome/help/gnome-cd/C/figures/forward_button.png
 share/gnome/help/gnome-cd/C/figures/gnome-cd-prefs.png
 share/gnome/help/gnome-cd/C/figures/gnome-cd-track.png
 share/gnome/help/gnome-cd/C/figures/gnome-cd.png
+share/gnome/help/gnome-cd/C/figures/next_button.png
+share/gnome/help/gnome-cd/C/figures/pause_button.png
+share/gnome/help/gnome-cd/C/figures/play_button.png
+share/gnome/help/gnome-cd/C/figures/preferences_button.png
+share/gnome/help/gnome-cd/C/figures/previous_button.png
+share/gnome/help/gnome-cd/C/figures/rewind_button.png
+share/gnome/help/gnome-cd/C/figures/stop_button.png
 share/gnome/help/gnome-cd/C/gnome-cd.xml
 share/gnome/help/gnome-cd/C/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/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/C/legal.xml
 share/gnome/help/grecord/C/figures/grecord-prefs-path.png
 share/gnome/help/grecord/C/figures/grecord-prefs-play.png
 share/gnome/help/grecord/C/figures/grecord-prefs-rec.png
 share/gnome/help/grecord/C/figures/grecord-prefs-sound.png
 share/gnome/help/grecord/C/figures/grecord-prefs-ui.png
 share/gnome/help/grecord/C/figures/grecord.png
+share/gnome/help/grecord/C/figures/grecord_window.png
 share/gnome/help/grecord/C/grecord.xml
 share/gnome/help/grecord/C/legal.xml
 share/gnome/idl/GNOME_Media_CDDBSlave2.idl
+share/gnome/omf/gnome-media/gnome-cd-C.omf
+share/gnome/omf/gnome-media/gnome-volume-control-C.omf
+share/gnome/omf/gnome-media/grecord-C.omf
 share/gnome/pixmaps/gnome-cd.png
 share/gnome/pixmaps/gnome-cd/a-eject-menu.png
 share/gnome/pixmaps/gnome-cd/a-eject-pressed.png
@@ -171,6 +186,7 @@ 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
+share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-media-2.0.mo
@@ -205,6 +221,7 @@ share/locale/sl/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/vi/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/wa/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
@@ -215,15 +232,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm share/gnome/pixmaps/gnome-cd/themes/lcd
 @dirrm share/gnome/pixmaps/gnome-cd/themes
 @dirrm share/gnome/pixmaps/gnome-cd
+@dirrm share/gnome/omf/gnome-media
 @dirrm share/gnome/help/grecord/C/figures
 @dirrm share/gnome/help/grecord/C
 @dirrm share/gnome/help/grecord
+@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-cd/C/figures
 @dirrm share/gnome/help/gnome-cd/C
 @dirrm share/gnome/help/gnome-cd
-@dirrm share/gnome/help/gmix/C/figures
-@dirrm share/gnome/help/gmix/C
-@dirrm share/gnome/help/gmix
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index fd537277cfe..30e865c0359 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomemedia2
-PORTVERSION=	1.547.0
+PORTVERSION=	1.999999999.0 # Uh, a little crazy, don't you think?
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020607
 DISTNAME=	gnome-media-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -17,7 +17,7 @@ MAINTAINER=	gnome@FreeBSD.org
 
 RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
 LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
-		gailutil.13:${PORTSDIR}/x11-toolkits/gail
+		gailutil.15:${PORTSDIR}/x11-toolkits/gail
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo
index ed636d19caa..02a41161046 100644
--- a/audio/gnomemedia2/distinfo
+++ b/audio/gnomemedia2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-media-1.547.0.tar.bz2) = 1d472fb7e301be1856d1d8d87a86026e
+MD5 (gnome2/gnome-media-1.999999999.0.tar.bz2) = d148d8d3049edaf2d18e52258f73cab7
diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist
index d22c68d84a3..05fbd0006b0 100644
--- a/audio/gnomemedia2/pkg-plist
+++ b/audio/gnomemedia2/pkg-plist
@@ -28,25 +28,40 @@ share/gnome/applications/gnome-volume-control.desktop
 share/gnome/applications/reclevel.desktop
 share/gnome/applications/vumeter.desktop
 share/gnome/control-center-2.0/capplets/cddb-slave.desktop
-share/gnome/help/gmix/C/figures/gmix-prefs.png
-share/gnome/help/gmix/C/figures/gmix.png
-share/gnome/help/gmix/C/gmix.xml
-share/gnome/help/gmix/C/legal.xml
-share/gnome/help/gmix/C/topic.dat
+share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/C/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/C/figures/eject_button.png
+share/gnome/help/gnome-cd/C/figures/forward_button.png
 share/gnome/help/gnome-cd/C/figures/gnome-cd-prefs.png
 share/gnome/help/gnome-cd/C/figures/gnome-cd-track.png
 share/gnome/help/gnome-cd/C/figures/gnome-cd.png
+share/gnome/help/gnome-cd/C/figures/next_button.png
+share/gnome/help/gnome-cd/C/figures/pause_button.png
+share/gnome/help/gnome-cd/C/figures/play_button.png
+share/gnome/help/gnome-cd/C/figures/preferences_button.png
+share/gnome/help/gnome-cd/C/figures/previous_button.png
+share/gnome/help/gnome-cd/C/figures/rewind_button.png
+share/gnome/help/gnome-cd/C/figures/stop_button.png
 share/gnome/help/gnome-cd/C/gnome-cd.xml
 share/gnome/help/gnome-cd/C/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/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/C/legal.xml
 share/gnome/help/grecord/C/figures/grecord-prefs-path.png
 share/gnome/help/grecord/C/figures/grecord-prefs-play.png
 share/gnome/help/grecord/C/figures/grecord-prefs-rec.png
 share/gnome/help/grecord/C/figures/grecord-prefs-sound.png
 share/gnome/help/grecord/C/figures/grecord-prefs-ui.png
 share/gnome/help/grecord/C/figures/grecord.png
+share/gnome/help/grecord/C/figures/grecord_window.png
 share/gnome/help/grecord/C/grecord.xml
 share/gnome/help/grecord/C/legal.xml
 share/gnome/idl/GNOME_Media_CDDBSlave2.idl
+share/gnome/omf/gnome-media/gnome-cd-C.omf
+share/gnome/omf/gnome-media/gnome-volume-control-C.omf
+share/gnome/omf/gnome-media/grecord-C.omf
 share/gnome/pixmaps/gnome-cd.png
 share/gnome/pixmaps/gnome-cd/a-eject-menu.png
 share/gnome/pixmaps/gnome-cd/a-eject-pressed.png
@@ -171,6 +186,7 @@ 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
+share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-media-2.0.mo
@@ -205,6 +221,7 @@ share/locale/sl/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/vi/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/wa/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
@@ -215,15 +232,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm share/gnome/pixmaps/gnome-cd/themes/lcd
 @dirrm share/gnome/pixmaps/gnome-cd/themes
 @dirrm share/gnome/pixmaps/gnome-cd
+@dirrm share/gnome/omf/gnome-media
 @dirrm share/gnome/help/grecord/C/figures
 @dirrm share/gnome/help/grecord/C
 @dirrm share/gnome/help/grecord
+@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-cd/C/figures
 @dirrm share/gnome/help/gnome-cd/C
 @dirrm share/gnome/help/gnome-cd
-@dirrm share/gnome/help/gmix/C/figures
-@dirrm share/gnome/help/gmix/C
-@dirrm share/gnome/help/gmix
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd