update to 2.20.1

This switches to the new gnome-2.20 branch.

10 files changed, 142 insertions, 196 deletions

diff --git a/multimedia/gnome-media/Makefile b/multimedia/gnome-media/Makefile
index c960e793e0e..dd32f8b8e31 100644
--- a/multimedia/gnome-media/Makefile
+++ b/multimedia/gnome-media/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2007/09/21 13:04:06 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/11/03 16:32:49 drochner Exp $
 
-DISTNAME=		gnome-media-2.18.0
-PKGREVISION=		5
+DISTNAME=		gnome-media-2.20.1
 CATEGORIES=		multimedia gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.18/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.20/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
@@ -27,6 +26,16 @@ CONFIGURE_ENV+=		XGETTEXT=${TOOLS_PATH.xgettext:Q}
 CONFIGURE_ENV+=		CDROM_HOST="bsd"
 .endif
 
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gnome-media
+PKG_SUPPORTED_OPTIONS+=	inet6
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
 GCONF_SCHEMAS=		CDDB-Slave2.schemas
 GCONF_SCHEMAS+=	gnome-audio-profiles.schemas
 GCONF_SCHEMAS+=	gnome-sound-recorder.schemas
@@ -49,6 +58,7 @@ BUILDLINK_API_DEPENDS.libgnomeui+=		libgnomeui>=2.13.2
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-good/buildlink3.mk"
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
@@ -57,6 +67,7 @@ BUILDLINK_API_DEPENDS.libgnomeui+=		libgnomeui>=2.13.2
 #.include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/multimedia/gnome-media/PLIST b/multimedia/gnome-media/PLIST
index be2e3c9c1fb..4634affd411 100644
--- a/multimedia/gnome-media/PLIST
+++ b/multimedia/gnome-media/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2007/10/07 07:39:53 hira Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/11/03 16:32:49 drochner Exp $
 bin/cddb-slave2-properties
 bin/gnome-audio-profiles-properties
 bin/gnome-sound-recorder
@@ -45,108 +45,44 @@ share/gnome-sound-recorder/ui/ui.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/es/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/es/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/fr/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/fr/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/oc/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/oc/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/sv/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/sv/gnome-sound-recorder.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
-share/gnome/help/grecord/de/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/de/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/de/figures/grecord.png
-share/gnome/help/grecord/de/figures/grecord_window.png
-share/gnome/help/grecord/de/grecord.xml
-share/gnome/help/grecord/de/legal.xml
-share/gnome/help/grecord/es/figures/grecord-prefs-path.png
-share/gnome/help/grecord/es/figures/grecord-prefs-play.png
-share/gnome/help/grecord/es/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/es/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/es/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/es/figures/grecord.png
-share/gnome/help/grecord/es/figures/grecord_window.png
-share/gnome/help/grecord/es/grecord.xml
-share/gnome/help/grecord/es/legal.xml
-share/gnome/help/grecord/fr/figures/grecord-prefs-path.png
-share/gnome/help/grecord/fr/figures/grecord-prefs-play.png
-share/gnome/help/grecord/fr/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/fr/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/fr/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/fr/figures/grecord.png
-share/gnome/help/grecord/fr/figures/grecord_window.png
-share/gnome/help/grecord/fr/grecord.xml
-share/gnome/help/grecord/fr/legal.xml
-share/gnome/help/grecord/it/figures/grecord-prefs-path.png
-share/gnome/help/grecord/it/figures/grecord-prefs-play.png
-share/gnome/help/grecord/it/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/it/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/it/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/it/figures/grecord.png
-share/gnome/help/grecord/it/figures/grecord_window.png
-share/gnome/help/grecord/it/grecord.xml
-share/gnome/help/grecord/it/legal.xml
-share/gnome/help/grecord/ja/figures/grecord-prefs-path.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-play.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/ja/figures/grecord.png
-share/gnome/help/grecord/ja/figures/grecord_window.png
-share/gnome/help/grecord/ja/grecord.xml
-share/gnome/help/grecord/ja/legal.xml
-share/gnome/help/grecord/ko/figures/grecord-prefs-path.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-play.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/ko/figures/grecord.png
-share/gnome/help/grecord/ko/figures/grecord_window.png
-share/gnome/help/grecord/ko/grecord.xml
-share/gnome/help/grecord/ko/legal.xml
-share/gnome/help/grecord/sv/figures/grecord-prefs-path.png
-share/gnome/help/grecord/sv/figures/grecord-prefs-play.png
-share/gnome/help/grecord/sv/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/sv/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/sv/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/sv/figures/grecord.png
-share/gnome/help/grecord/sv/figures/grecord_window.png
-share/gnome/help/grecord/sv/grecord.xml
-share/gnome/help/grecord/sv/legal.xml
-share/gnome/help/grecord/zh_CN/figures/grecord-prefs-path.png
-share/gnome/help/grecord/zh_CN/figures/grecord-prefs-play.png
-share/gnome/help/grecord/zh_CN/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/zh_CN/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/zh_CN/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/zh_CN/figures/grecord.png
-share/gnome/help/grecord/zh_CN/figures/grecord_window.png
-share/gnome/help/grecord/zh_CN/grecord.xml
-share/gnome/help/grecord/zh_CN/legal.xml
-share/gnome/help/grecord/zh_TW/figures/grecord-prefs-path.png
-share/gnome/help/grecord/zh_TW/figures/grecord-prefs-play.png
-share/gnome/help/grecord/zh_TW/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/zh_TW/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/zh_TW/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/zh_TW/figures/grecord.png
-share/gnome/help/grecord/zh_TW/figures/grecord_window.png
-share/gnome/help/grecord/zh_TW/grecord.xml
-share/gnome/help/grecord/zh_TW/legal.xml
+share/gnome/help/gnome-volume-control/es/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/es/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/fr/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/fr/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/oc/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/oc/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/sv/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/sv/gnome-volume-control.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/help/gstreamer-properties/es/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/es/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/fr/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/fr/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/oc/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/oc/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/sv/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/sv/gstreamer-properties.xml
 share/gstreamer-properties/glade/gstreamer-properties.glade
 share/gstreamer-properties/icons/gstreamer-properties.png
+share/icons/hicolor/48x48/apps/gnome-grecord.png
+share/icons/hicolor/48x48/apps/gnome-reclevel.png
+share/icons/hicolor/48x48/apps/gnome-vumeter.png
+share/icons/hicolor/48x48/apps/gstreamer-properties.png
 share/idl/GNOME_Media_CDDBSlave2.idl
 share/locale/am/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
@@ -197,6 +133,7 @@ share/locale/nb/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ne/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/oc/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/or/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/pa/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/pl/LC_MESSAGES/gnome-media-2.0.mo
@@ -205,6 +142,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ro/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/rw/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-media-2.0.mo
@@ -222,64 +160,44 @@ share/locale/xh/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
-share/omf/gnome-media/gnome-volume-control-C.omf
-share/omf/gnome-media/gnome-volume-control-uk.omf
-share/omf/gnome-media/grecord-C.omf
-share/omf/gnome-media/grecord-de.omf
-share/omf/gnome-media/grecord-es.omf
-share/omf/gnome-media/grecord-fr.omf
-share/omf/gnome-media/grecord-it.omf
-share/omf/gnome-media/grecord-ja.omf
-share/omf/gnome-media/grecord-ko.omf
-share/omf/gnome-media/grecord-sv.omf
-share/omf/gnome-media/grecord-uk.omf
-share/omf/gnome-media/grecord-zh_CN.omf
-share/omf/gnome-media/grecord-zh_TW.omf
-share/omf/gnome-media/gstreamer-properties-C.omf
-share/omf/gnome-media/gstreamer-properties-uk.omf
-share/pixmaps/gnome-grecord.png
-share/pixmaps/gnome-mixer.png
-share/pixmaps/gnome-reclevel.png
-share/pixmaps/gnome-vumeter.png
-share/pixmaps/gstreamer-properties.png
-@comment in xdg-dirs: @dirrm share/pixmaps
-@dirrm share/omf/gnome-media
-@comment in scrollkeeper: @dirrm share/omf
 @comment in ORBit2: @dirrm share/idl
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/gstreamer-properties/icons
 @dirrm share/gstreamer-properties/glade
 @dirrm share/gstreamer-properties
-@dirrm share/gnome/help/gstreamer-properties/uk/figures
-@dirrm share/gnome/help/gstreamer-properties/uk
+@dirrm share/gnome/help/gstreamer-properties/sv/figures
+@dirrm share/gnome/help/gstreamer-properties/sv
+@dirrm share/gnome/help/gstreamer-properties/oc/figures
+@dirrm share/gnome/help/gstreamer-properties/oc
+@dirrm share/gnome/help/gstreamer-properties/fr/figures
+@dirrm share/gnome/help/gstreamer-properties/fr
+@dirrm share/gnome/help/gstreamer-properties/es/figures
+@dirrm share/gnome/help/gstreamer-properties/es
 @dirrm share/gnome/help/gstreamer-properties/C/figures
 @dirrm share/gnome/help/gstreamer-properties/C
 @dirrm share/gnome/help/gstreamer-properties
-@dirrm share/gnome/help/grecord/zh_TW/figures
-@dirrm share/gnome/help/grecord/zh_TW
-@dirrm share/gnome/help/grecord/zh_CN/figures
-@dirrm share/gnome/help/grecord/zh_CN
-@dirrm share/gnome/help/grecord/sv/figures
-@dirrm share/gnome/help/grecord/sv
-@dirrm share/gnome/help/grecord/ko/figures
-@dirrm share/gnome/help/grecord/ko
-@dirrm share/gnome/help/grecord/ja/figures
-@dirrm share/gnome/help/grecord/ja
-@dirrm share/gnome/help/grecord/it/figures
-@dirrm share/gnome/help/grecord/it
-@dirrm share/gnome/help/grecord/fr/figures
-@dirrm share/gnome/help/grecord/fr
-@dirrm share/gnome/help/grecord/es/figures
-@dirrm share/gnome/help/grecord/es
-@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/sv/figures
+@dirrm share/gnome/help/gnome-volume-control/sv
+@dirrm share/gnome/help/gnome-volume-control/oc/figures
+@dirrm share/gnome/help/gnome-volume-control/oc
+@dirrm share/gnome/help/gnome-volume-control/fr/figures
+@dirrm share/gnome/help/gnome-volume-control/fr
+@dirrm share/gnome/help/gnome-volume-control/es/figures
+@dirrm share/gnome/help/gnome-volume-control/es
 @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/sv/figures
+@dirrm share/gnome/help/gnome-sound-recorder/sv
+@dirrm share/gnome/help/gnome-sound-recorder/oc/figures
+@dirrm share/gnome/help/gnome-sound-recorder/oc
+@dirrm share/gnome/help/gnome-sound-recorder/fr/figures
+@dirrm share/gnome/help/gnome-sound-recorder/fr
+@dirrm share/gnome/help/gnome-sound-recorder/es/figures
+@dirrm share/gnome/help/gnome-sound-recorder/es
 @dirrm share/gnome/help/gnome-sound-recorder/C/figures
 @dirrm share/gnome/help/gnome-sound-recorder/C
 @dirrm share/gnome/help/gnome-sound-recorder
diff --git a/multimedia/gnome-media/distinfo b/multimedia/gnome-media/distinfo
index ebdcb0c8874..ee11bb55bfa 100644
--- a/multimedia/gnome-media/distinfo
+++ b/multimedia/gnome-media/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2007/09/19 23:46:07 wiz Exp $
+$NetBSD: distinfo,v 1.5 2007/11/03 16:32:49 drochner Exp $
 
-SHA1 (gnome-media-2.18.0.tar.bz2) = 954b4d5069e29d60f28f63d3e2b7cd654247948f
-RMD160 (gnome-media-2.18.0.tar.bz2) = 7968d0cd5c00b0b36cbdc9c6c0eb1e5a35936e5f
-Size (gnome-media-2.18.0.tar.bz2) = 3007639 bytes
+SHA1 (gnome-media-2.20.1.tar.bz2) = ac05a883f45e50c18770d9714f26d41adcb8dc77
+RMD160 (gnome-media-2.20.1.tar.bz2) = 1dfb8f6d03a85c2c0e2c59cd479f3136121a0836
+Size (gnome-media-2.20.1.tar.bz2) = 1927211 bytes
 SHA1 (patch-aa) = 022c909690b5521a93e1ce0eab025eb4c1598181
 SHA1 (patch-ab) = 5b48beaf188f916cc9052b3c1ac2978258f73e0d
-SHA1 (patch-ac) = f720c2e252ab6576868f212cd51cd3cd4ef24d47
+SHA1 (patch-ac) = 9a85ad16eb5fdda6e391d4f750e2bfd655bcdc07
diff --git a/multimedia/gnome-media/patches/patch-ac b/multimedia/gnome-media/patches/patch-ac
index 3e24626d2bf..121b8897a61 100644
--- a/multimedia/gnome-media/patches/patch-ac
+++ b/multimedia/gnome-media/patches/patch-ac
@@ -1,26 +1,26 @@
-$NetBSD: patch-ac,v 1.3 2007/09/19 23:46:07 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2007/11/03 16:32:49 drochner Exp $
 
---- configure.orig	2007-04-05 20:11:16.000000000 +0200
+--- configure.orig	2007-09-19 12:00:40.000000000 +0200
 +++ configure
-@@ -5808,7 +5808,7 @@ if test "${enable_cddbslave+set}" = set;
- else
+@@ -6419,7 +6419,7 @@ else
    enable_cddbslave=yes
- fi;
+ fi
+ 
 -if test "x$enable_cddbslave" == "xyes"; then
 +if test "x$enable_cddbslave" = "xyes"; then
  
  pkg_failed=no
- echo "$as_me:$LINENO: checking for CDDBSLAVE" >&5
-@@ -6750,7 +6750,7 @@ if test "${enable_profiles+set}" = set; 
- else
+ { echo "$as_me:$LINENO: checking for CDDBSLAVE" >&5
+@@ -7314,7 +7314,7 @@ else
    enable_profiles=yes
- fi;
+ fi
+ 
 -if test "x$enable_profiles" == "xyes"; then
 +if test "x$enable_profiles" = "xyes"; then
  
  pkg_failed=no
- echo "$as_me:$LINENO: checking for GMP" >&5
-@@ -6967,7 +6967,7 @@ echo "$as_me: WARNING:  Grecord will be 
+ { echo "$as_me:$LINENO: checking for GMP" >&5
+@@ -7535,7 +7535,7 @@ echo "$as_me: WARNING:  Grecord will be 
    PROGRAMS_GRECORD_ERROR="	gnome media profiles is disabled"
  fi
  
@@ -29,25 +29,25 @@ $NetBSD: patch-ac,v 1.3 2007/09/19 23:46:07 wiz Exp $
    PROGRAMS_GRECORD="grecord"
  
    gst010_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-0.10`
-@@ -24186,7 +24186,7 @@ if test "${enable_vumeter+set}" = set; t
- else
+@@ -25100,7 +25100,7 @@ else
    enable_vumeter=yes
- fi;
+ fi
+ 
 -if test -n "$we_have_esd" && test "x$enable_vumeter" == "xyes"; then
 +if test -n "$we_have_esd" && test "x$enable_vumeter" = "xyes"; then
  
  pkg_failed=no
- echo "$as_me:$LINENO: checking for VUMETER" >&5
-@@ -24304,7 +24304,7 @@ if test "${enable_gnomecd+set}" = set; t
- else
+ { echo "$as_me:$LINENO: checking for VUMETER" >&5
+@@ -25220,7 +25220,7 @@ else
    enable_gnomecd=yes
- fi;
+ fi
+ 
 -if test "x$enable_gnomecd" == "xyes"; then
 +if test "x$enable_gnomecd" = "xyes"; then
  
  pkg_failed=no
- echo "$as_me:$LINENO: checking for GNOMECD" >&5
-@@ -24640,7 +24640,7 @@ fi
+ { echo "$as_me:$LINENO: checking for GNOMECD" >&5
+@@ -25564,7 +25564,7 @@ fi
  
  
  
@@ -56,19 +56,19 @@ $NetBSD: patch-ac,v 1.3 2007/09/19 23:46:07 wiz Exp $
    cdrom_header=""
  
  for ac_header in linux/cdrom.h
-@@ -25510,7 +25510,7 @@ if test "${enable_gstprops+set}" = set; 
- else
+@@ -26392,7 +26392,7 @@ else
    enable_gstprops=yes
- fi;
+ fi
+ 
 -if test "x$HAVE_GST" = "xyes" && test "x$enable_gstprops" == "xyes";
 +if test "x$HAVE_GST" = "xyes" && test "x$enable_gstprops" = "xyes";
  then
-       COMMON_MODULES="gconf-2.0 libgnomeui-2.0 libglade-2.0 >= 1.99.12 gstreamer-$GST_MAJORMINOR"
+       COMMON_MODULES="gconf-2.0 libgnomeui-2.0 libglade-2.0 >= 1.99.12 gstreamer-$GST_MAJORMINOR gstreamer-plugins-base-$GST_MAJORMINOR >= $GSTPB_REQ"
  
-@@ -25673,7 +25673,7 @@ if test "${enable_gstmix+set}" = set; th
- else
+@@ -26555,7 +26555,7 @@ else
    enable_gstmix=yes
- fi;
+ fi
+ 
 -if test "x$HAVE_GST" = "xyes" && test "x$enable_gstmix" == "xyes";
 +if test "x$HAVE_GST" = "xyes" && test "x$enable_gstmix" = "xyes";
  then
diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile
index 76ed412b505..fdc0ba2be10 100644
--- a/net/bug-buddy/Makefile
+++ b/net/bug-buddy/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.57 2007/09/21 13:04:10 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2007/11/03 16:35:49 drochner Exp $
 #
 
-DISTNAME=		bug-buddy-2.18.1
-PKGREVISION=		4
+DISTNAME=		bug-buddy-2.20.1
 CATEGORIES=		net gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/bug-buddy/2.18/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/bug-buddy/2.20/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -16,9 +15,14 @@ USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		YES
+USE_LANGUAGES=		c c++
+CPPFLAGS+=	-I${LOCALBASE}/include/libelf
 
 GCONF_SCHEMAS=		bug-buddy.schemas
 
+#XXX optional?
+CONFIGURE_ARGS+=	--disable-eds
+
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.9.0
 BUILDLINK_API_DEPENDS.libsoup-devel+=	libsoup-devel>=2.2.96
 
@@ -30,10 +34,11 @@ BUILDLINK_API_DEPENDS.libsoup-devel+=	libsoup-devel>=2.2.96
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
+.include "../../devel/libelf/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
-.include "../../mail/evolution-data-server/buildlink3.mk"
+#XXX optional?
+#.include "../../mail/evolution-data-server/buildlink3.mk"
 .include "../../net/libsoup-devel/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
diff --git a/net/bug-buddy/PLIST b/net/bug-buddy/PLIST
index c9924822aff..0671ac1de86 100644
--- a/net/bug-buddy/PLIST
+++ b/net/bug-buddy/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.16 2007/09/25 10:54:17 hira Exp $
+@comment $NetBSD: PLIST,v 1.17 2007/11/03 16:35:49 drochner Exp $
 bin/bug-buddy
+lib/gtk-2.0/modules/libgnomebreakpad.la
 share/applications/bug-buddy.desktop
-share/bug-buddy/bug-buddy.glade
+share/bug-buddy/bug-buddy.gtkbuilder
 share/bug-buddy/bug-buddy.menu
 share/bug-buddy/bug-buddy.png
 share/bug-buddy/bugzilla/gnome.bugzilla
@@ -17,8 +18,10 @@ share/gconf/schemas/bug-buddy.schemas
 share/icons/hicolor/48x48/apps/bug-buddy.png
 share/locale/am/LC_MESSAGES/bug-buddy.mo
 share/locale/ar/LC_MESSAGES/bug-buddy.mo
+share/locale/as/LC_MESSAGES/bug-buddy.mo
 share/locale/az/LC_MESSAGES/bug-buddy.mo
 share/locale/be/LC_MESSAGES/bug-buddy.mo
+share/locale/be@latin/LC_MESSAGES/bug-buddy.mo
 share/locale/bg/LC_MESSAGES/bug-buddy.mo
 share/locale/bn/LC_MESSAGES/bug-buddy.mo
 share/locale/bn_IN/LC_MESSAGES/bug-buddy.mo
@@ -65,6 +68,7 @@ share/locale/nb/LC_MESSAGES/bug-buddy.mo
 share/locale/ne/LC_MESSAGES/bug-buddy.mo
 share/locale/nl/LC_MESSAGES/bug-buddy.mo
 share/locale/nn/LC_MESSAGES/bug-buddy.mo
+share/locale/oc/LC_MESSAGES/bug-buddy.mo
 share/locale/or/LC_MESSAGES/bug-buddy.mo
 share/locale/pa/LC_MESSAGES/bug-buddy.mo
 share/locale/pl/LC_MESSAGES/bug-buddy.mo
@@ -73,6 +77,7 @@ share/locale/pt_BR/LC_MESSAGES/bug-buddy.mo
 share/locale/ro/LC_MESSAGES/bug-buddy.mo
 share/locale/ru/LC_MESSAGES/bug-buddy.mo
 share/locale/rw/LC_MESSAGES/bug-buddy.mo
+share/locale/si/LC_MESSAGES/bug-buddy.mo
 share/locale/sk/LC_MESSAGES/bug-buddy.mo
 share/locale/sl/LC_MESSAGES/bug-buddy.mo
 share/locale/sq/LC_MESSAGES/bug-buddy.mo
@@ -80,10 +85,12 @@ share/locale/sr/LC_MESSAGES/bug-buddy.mo
 share/locale/sr@Latn/LC_MESSAGES/bug-buddy.mo
 share/locale/sv/LC_MESSAGES/bug-buddy.mo
 share/locale/ta/LC_MESSAGES/bug-buddy.mo
+share/locale/te/LC_MESSAGES/bug-buddy.mo
 share/locale/th/LC_MESSAGES/bug-buddy.mo
 share/locale/tr/LC_MESSAGES/bug-buddy.mo
 share/locale/ug/LC_MESSAGES/bug-buddy.mo
 share/locale/uk/LC_MESSAGES/bug-buddy.mo
+share/locale/uz@cyrillic/LC_MESSAGES/bug-buddy.mo
 share/locale/vi/LC_MESSAGES/bug-buddy.mo
 share/locale/wa/LC_MESSAGES/bug-buddy.mo
 share/locale/xh/LC_MESSAGES/bug-buddy.mo
@@ -98,3 +105,4 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
 @dirrm share/bug-buddy/bugzilla
 @dirrm share/bug-buddy
 @comment in xdg-dirs: @dirrm share/applications
+@comment in gtk2: @dirrm lib/gtk-2.0/modules
diff --git a/net/bug-buddy/distinfo b/net/bug-buddy/distinfo
index 4f31455baf1..12ae87d5a49 100644
--- a/net/bug-buddy/distinfo
+++ b/net/bug-buddy/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2007/04/10 20:25:03 drochner Exp $
+$NetBSD: distinfo,v 1.15 2007/11/03 16:35:49 drochner Exp $
 
-SHA1 (bug-buddy-2.18.1.tar.bz2) = b5b8e7c157cb7d462bd2a1ae81ee9b4f498f76fa
-RMD160 (bug-buddy-2.18.1.tar.bz2) = cc2cc78554885ff8f36fcd8075e00d5e58c70831
-Size (bug-buddy-2.18.1.tar.bz2) = 553967 bytes
+SHA1 (bug-buddy-2.20.1.tar.bz2) = ef6f82b2444e3b72bd6ac4197086d9b1697ae928
+RMD160 (bug-buddy-2.20.1.tar.bz2) = a7b62bcaf15cd44404a351f286c4a2b90bb569b9
+Size (bug-buddy-2.20.1.tar.bz2) = 1070862 bytes
diff --git a/sysutils/gnome-menus/Makefile b/sysutils/gnome-menus/Makefile
index 1665fa6cd5a..322eda2e240 100644
--- a/sysutils/gnome-menus/Makefile
+++ b/sysutils/gnome-menus/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2007/09/21 13:04:18 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2007/11/03 16:34:56 drochner Exp $
 #
 
-DISTNAME=	gnome-menus-2.18.3
-PKGREVISION=	2
+DISTNAME=	gnome-menus-2.20.1
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-menus/2.18/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-menus/2.20/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
diff --git a/sysutils/gnome-menus/PLIST b/sysutils/gnome-menus/PLIST
index 07d0ebb4b21..3258845aa20 100644
--- a/sysutils/gnome-menus/PLIST
+++ b/sysutils/gnome-menus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2007/07/12 19:30:36 drochner Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/11/03 16:34:56 drochner Exp $
 bin/gnome-menu-spec-test
 include/gnome-menus/gmenu-tree.h
 lib/libgnome-menu.la
@@ -29,6 +29,7 @@ share/examples/gnome-menus/xdg/menus/applications.menu
 share/examples/gnome-menus/xdg/menus/preferences.menu
 share/examples/gnome-menus/xdg/menus/settings.menu
 share/locale/ar/LC_MESSAGES/gnome-menus.mo
+share/locale/as/LC_MESSAGES/gnome-menus.mo
 share/locale/be/LC_MESSAGES/gnome-menus.mo
 share/locale/be@latin/LC_MESSAGES/gnome-menus.mo
 share/locale/bg/LC_MESSAGES/gnome-menus.mo
@@ -51,6 +52,7 @@ share/locale/eu/LC_MESSAGES/gnome-menus.mo
 share/locale/fa/LC_MESSAGES/gnome-menus.mo
 share/locale/fi/LC_MESSAGES/gnome-menus.mo
 share/locale/fr/LC_MESSAGES/gnome-menus.mo
+share/locale/ga/LC_MESSAGES/gnome-menus.mo
 share/locale/gl/LC_MESSAGES/gnome-menus.mo
 share/locale/gn/LC_MESSAGES/gnome-menus.mo
 share/locale/gu/LC_MESSAGES/gnome-menus.mo
@@ -62,6 +64,7 @@ share/locale/id/LC_MESSAGES/gnome-menus.mo
 share/locale/it/LC_MESSAGES/gnome-menus.mo
 share/locale/ja/LC_MESSAGES/gnome-menus.mo
 share/locale/ka/LC_MESSAGES/gnome-menus.mo
+share/locale/kn/LC_MESSAGES/gnome-menus.mo
 share/locale/ko/LC_MESSAGES/gnome-menus.mo
 share/locale/ku/LC_MESSAGES/gnome-menus.mo
 share/locale/ky/LC_MESSAGES/gnome-menus.mo
@@ -86,6 +89,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-menus.mo
 share/locale/ro/LC_MESSAGES/gnome-menus.mo
 share/locale/ru/LC_MESSAGES/gnome-menus.mo
 share/locale/rw/LC_MESSAGES/gnome-menus.mo
+share/locale/si/LC_MESSAGES/gnome-menus.mo
 share/locale/sk/LC_MESSAGES/gnome-menus.mo
 share/locale/sl/LC_MESSAGES/gnome-menus.mo
 share/locale/sq/LC_MESSAGES/gnome-menus.mo
@@ -98,6 +102,7 @@ share/locale/th/LC_MESSAGES/gnome-menus.mo
 share/locale/tr/LC_MESSAGES/gnome-menus.mo
 share/locale/ug/LC_MESSAGES/gnome-menus.mo
 share/locale/uk/LC_MESSAGES/gnome-menus.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-menus.mo
 share/locale/vi/LC_MESSAGES/gnome-menus.mo
 share/locale/xh/LC_MESSAGES/gnome-menus.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-menus.mo
diff --git a/sysutils/gnome-menus/distinfo b/sysutils/gnome-menus/distinfo
index 9764eff1bd0..5e312aebb7d 100644
--- a/sysutils/gnome-menus/distinfo
+++ b/sysutils/gnome-menus/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2007/07/12 19:30:36 drochner Exp $
+$NetBSD: distinfo,v 1.12 2007/11/03 16:34:56 drochner Exp $
 
-SHA1 (gnome-menus-2.18.3.tar.bz2) = c50f2503f59b61269a6056d09118f5e04a57ca72
-RMD160 (gnome-menus-2.18.3.tar.bz2) = 06f26fc98db6650526fdb7bb3557f80b3a598ece
-Size (gnome-menus-2.18.3.tar.bz2) = 437539 bytes
+SHA1 (gnome-menus-2.20.1.tar.bz2) = 8e7500e17fba464e37708c433793bcdcb1b385b4
+RMD160 (gnome-menus-2.20.1.tar.bz2) = 8ffef9d7e76c9876df720436feb99ab36404ee9d
+Size (gnome-menus-2.20.1.tar.bz2) = 450569 bytes