aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessibility/at-spi/Makefile2
-rw-r--r--accessibility/atk/Makefile2
-rw-r--r--accessibility/gail/Makefile2
-rw-r--r--audio/gnome-media/Makefile2
-rw-r--r--audio/gnomemedia2/Makefile2
-rw-r--r--deskutils/gnome-utils/Makefile4
-rw-r--r--deskutils/gnome-utils/distinfo2
-rw-r--r--deskutils/gnomeutils2/Makefile4
-rw-r--r--deskutils/gnomeutils2/distinfo2
-rw-r--r--devel/ORBit2/Makefile4
-rw-r--r--devel/ORBit2/distinfo2
-rw-r--r--devel/atk/Makefile2
-rw-r--r--devel/bonobo-activation/Makefile5
-rw-r--r--devel/bonobo-activation/distinfo2
-rw-r--r--devel/bonobo-activation/files/patch-server::activation-server-main.c22
-rw-r--r--devel/bonobo-activation/pkg-plist33
-rw-r--r--devel/bugbuddy2/Makefile2
-rw-r--r--devel/gconf2/Makefile2
-rw-r--r--devel/glib20/Makefile2
-rw-r--r--devel/gnome-common/Makefile2
-rw-r--r--devel/gnome-vfs/Makefile4
-rw-r--r--devel/gnome-vfs/distinfo2
-rw-r--r--devel/gnome-vfs/files/patch-aa22
-rw-r--r--devel/gnome-vfs/files/patch-ab15
-rw-r--r--devel/gnome-vfs/pkg-plist11
-rw-r--r--devel/gnomecommon/Makefile2
-rw-r--r--devel/gnomevfs2/Makefile4
-rw-r--r--devel/gnomevfs2/distinfo2
-rw-r--r--devel/gnomevfs2/files/patch-aa22
-rw-r--r--devel/gnomevfs2/files/patch-ab15
-rw-r--r--devel/gnomevfs2/pkg-plist11
-rw-r--r--devel/libIDL/Makefile2
-rw-r--r--devel/libbonobo/Makefile4
-rw-r--r--devel/libbonobo/distinfo2
-rw-r--r--devel/libbonobo/pkg-plist38
-rw-r--r--devel/libglade2/Makefile2
-rw-r--r--devel/libgtop2/Makefile2
-rw-r--r--devel/pkg-config/Makefile2
-rw-r--r--devel/pkgconfig/Makefile2
-rw-r--r--editors/gedit2/Makefile4
-rw-r--r--editors/gedit2/distinfo2
-rw-r--r--games/gnome-games/Makefile2
-rw-r--r--games/gnomegames2/Makefile2
-rw-r--r--graphics/libart_lgpl/Makefile2
-rw-r--r--graphics/libart_lgpl2/Makefile2
-rw-r--r--graphics/libgnomecanvas/Makefile2
-rw-r--r--graphics/librsvg2/Makefile2
-rw-r--r--lang/librep2/Makefile5
-rw-r--r--lang/librep2/distinfo2
-rw-r--r--misc/gnome-mime-data/Makefile2
-rw-r--r--misc/gnomemimedata/Makefile2
-rw-r--r--misc/gnomeutils2/Makefile4
-rw-r--r--misc/gnomeutils2/distinfo2
-rw-r--r--net/linc/Makefile4
-rw-r--r--net/linc/distinfo2
-rw-r--r--print/libgnomeprint/Makefile2
-rw-r--r--sysutils/gconf-editor/Makefile4
-rw-r--r--sysutils/gconf-editor/distinfo2
-rw-r--r--sysutils/gconf-editor/pkg-plist20
-rw-r--r--sysutils/gnome-control-center/Makefile2
-rw-r--r--sysutils/gnome-system-monitor/Makefile6
-rw-r--r--sysutils/gnome-system-monitor/distinfo2
-rw-r--r--sysutils/gnome-system-monitor/pkg-plist42
-rw-r--r--sysutils/gnomecontrolcenter2/Makefile2
-rw-r--r--sysutils/gnomesystemmonitor/Makefile6
-rw-r--r--sysutils/gnomesystemmonitor/distinfo2
-rw-r--r--sysutils/gnomesystemmonitor/pkg-plist42
-rw-r--r--www/libgtkhtml/Makefile2
-rw-r--r--x11-fm/nautilus2/Makefile4
-rw-r--r--x11-fm/nautilus2/distinfo2
-rw-r--r--x11-fm/nautilus2/files/patch-aa16
-rw-r--r--x11-fm/nautilus2/pkg-plist4
-rw-r--r--x11-toolkits/at-spi/Makefile2
-rw-r--r--x11-toolkits/eel2/Makefile4
-rw-r--r--x11-toolkits/eel2/distinfo2
-rw-r--r--x11-toolkits/eel2/pkg-plist1
-rw-r--r--x11-toolkits/gail/Makefile2
-rw-r--r--x11-toolkits/gtk20/Makefile2
-rw-r--r--x11-toolkits/gtk30/Makefile2
-rw-r--r--x11-toolkits/libbonoboui/Makefile4
-rw-r--r--x11-toolkits/libbonoboui/distinfo2
-rw-r--r--x11-toolkits/libbonoboui/pkg-plist1
-rw-r--r--x11-toolkits/libgail-gnome/Makefile2
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile2
-rw-r--r--x11-toolkits/libgnomeui/Makefile4
-rw-r--r--x11-toolkits/libgnomeui/distinfo2
-rw-r--r--x11-toolkits/libwnck/Makefile4
-rw-r--r--x11-toolkits/libwnck/distinfo2
-rw-r--r--x11-toolkits/libwnck/pkg-plist2
-rw-r--r--x11-toolkits/libzvt/Makefile2
-rw-r--r--x11-toolkits/pango/Makefile2
-rw-r--r--x11-toolkits/rep-gtk2/Makefile4
-rw-r--r--x11-toolkits/rep-gtk2/distinfo2
-rw-r--r--x11-wm/sawfish2/Makefile5
-rw-r--r--x11-wm/sawfish2/distinfo2
-rw-r--r--x11-wm/sawfish2/files/patch-lisp_sawfish_wm_gnome_integration.jl29
-rw-r--r--x11-wm/sawfish2/pkg-plist3
-rw-r--r--x11/gdm2/Makefile2
-rw-r--r--x11/gnome-applets/Makefile5
-rw-r--r--x11/gnome-applets/distinfo2
-rw-r--r--x11/gnome-applets/pkg-plist32
-rw-r--r--x11/gnome-desktop/Makefile4
-rw-r--r--x11/gnome-desktop/distinfo2
-rw-r--r--x11/gnome-desktop/pkg-plist3
-rw-r--r--x11/gnome-panel/Makefile7
-rw-r--r--x11/gnome-panel/distinfo2
-rw-r--r--x11/gnome-panel/pkg-plist5
-rw-r--r--x11/gnome-session/Makefile2
-rw-r--r--x11/gnome-terminal/Makefile2
-rw-r--r--x11/gnomeapplets2/Makefile5
-rw-r--r--x11/gnomeapplets2/distinfo2
-rw-r--r--x11/gnomeapplets2/pkg-plist32
-rw-r--r--x11/gnomedesktop/Makefile4
-rw-r--r--x11/gnomedesktop/distinfo2
-rw-r--r--x11/gnomedesktop/pkg-plist3
-rw-r--r--x11/gnomepanel/Makefile7
-rw-r--r--x11/gnomepanel/distinfo2
-rw-r--r--x11/gnomepanel/pkg-plist5
-rw-r--r--x11/gnomesession/Makefile2
-rw-r--r--x11/gnometerminal/Makefile2
-rw-r--r--x11/libgnome/Makefile5
-rw-r--r--x11/libgnome/distinfo2
-rw-r--r--x11/libgnome/pkg-plist13
-rw-r--r--x11/yelp/Makefile5
-rw-r--r--x11/yelp/distinfo2
-rw-r--r--x11/yelp/files/patch-configure17
-rw-r--r--x11/yelp/files/patch-src_yelp-info.c19
-rw-r--r--x11/yelp/pkg-plist4
128 files changed, 427 insertions, 328 deletions
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 188b038aa126..a2085a3ad436 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.12.1
PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 632abdc25b07..2193f771abcb 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -9,7 +9,7 @@ PORTNAME= atk
PORTVERSION= 1.0.1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
#MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
# ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
# http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index 9e9801b4e014..eee9799586ad 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gail
PORTVERSION= 0.13
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 3625cb325a8e..fd537277cfe6 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomemedia2
PORTVERSION= 1.547.0
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-media-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 3625cb325a8e..fd537277cfe6 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomemedia2
PORTVERSION= 1.547.0
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-media-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index a0e1e7923e94..34aa6340e1de 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= gnomeutils2
-PORTVERSION= 1.105.0
+PORTVERSION= 1.106.0
PORTEPOCH= 1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index 064c3d82f1c1..4c4239694ed2 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-utils-1.105.0.tar.bz2) = 401bda405425ec429608e55ee4ad2b46
+MD5 (gnome2/gnome-utils-1.106.0.tar.bz2) = d119a8d4f75ff0fdc51cb09e26e00164
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index a0e1e7923e94..34aa6340e1de 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= gnomeutils2
-PORTVERSION= 1.105.0
+PORTVERSION= 1.106.0
PORTEPOCH= 1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo
index 064c3d82f1c1..4c4239694ed2 100644
--- a/deskutils/gnomeutils2/distinfo
+++ b/deskutils/gnomeutils2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-utils-1.105.0.tar.bz2) = 401bda405425ec429608e55ee4ad2b46
+MD5 (gnome2/gnome-utils-1.106.0.tar.bz2) = d119a8d4f75ff0fdc51cb09e26e00164
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 4016e71a5048..c2c59471377e 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= ORBit2
-PORTVERSION= 2.3.109
+PORTVERSION= 2.3.110
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo
index 9dcf73a09907..e52aa19ede8a 100644
--- a/devel/ORBit2/distinfo
+++ b/devel/ORBit2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/ORBit2-2.3.109.tar.bz2) = e18fb3dce4b87a075f119631e692ee93
+MD5 (gnome2/ORBit2-2.3.110.tar.bz2) = 302dfd638348b950272aef8038f6d9b6
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index 632abdc25b07..2193f771abcb 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -9,7 +9,7 @@ PORTNAME= atk
PORTVERSION= 1.0.1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
#MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
# ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
# http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index cecae1275e5d..c396657057c3 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= bonobo-activation
-PORTVERSION= 0.9.8
-PORTREVISION= 1
+PORTVERSION= 0.9.9
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/bonobo-activation/distinfo b/devel/bonobo-activation/distinfo
index 5f48cdc49a54..3cdd9b57aa00 100644
--- a/devel/bonobo-activation/distinfo
+++ b/devel/bonobo-activation/distinfo
@@ -1 +1 @@
-MD5 (gnome2/bonobo-activation-0.9.8.tar.bz2) = bb38e37eddfcc5ef3cd8bbc32ce1fd02
+MD5 (gnome2/bonobo-activation-0.9.9.tar.bz2) = 088decd1510740ff16b2e5e6940e4a18
diff --git a/devel/bonobo-activation/files/patch-server::activation-server-main.c b/devel/bonobo-activation/files/patch-server::activation-server-main.c
index ce51f3ef7905..730d9d6cfe26 100644
--- a/devel/bonobo-activation/files/patch-server::activation-server-main.c
+++ b/devel/bonobo-activation/files/patch-server::activation-server-main.c
@@ -1,14 +1,14 @@
$FreeBSD$
---- server/activation-server-main.c 2002/02/13 17:50:37 1.1
-+++ server/activation-server-main.c 2002/02/13 17:51:02
-@@ -196,7 +196,7 @@
- g_string_append (gnome_od_source_dir,
- gnome_dirs[i]);
- g_string_append (gnome_od_source_dir,
-- "/lib/bonobo/servers:");
-+ "/libdata/bonobo/servers:");
- }
- g_strfreev (gnome_dirs);
- g_string_append_c (real_od_source_dir, ':');
+--- server/activation-server-main.c.orig Tue May 14 04:51:55 2002
++++ server/activation-server-main.c Mon May 27 13:36:25 2002
+@@ -127,7 +127,7 @@
+ g_string_append (gnome_od_source_dir,
+ gnome_dirs[i]);
+ g_string_append (gnome_od_source_dir,
+- "/lib/bonobo/servers:");
++ "/libdata/bonobo/servers:");
+ }
+ g_strfreev (gnome_dirs);
+ g_string_append_c (real_od_source_dir, ':');
diff --git a/devel/bonobo-activation/pkg-plist b/devel/bonobo-activation/pkg-plist
index 81ec58d36501..8211ea59d255 100644
--- a/devel/bonobo-activation/pkg-plist
+++ b/devel/bonobo-activation/pkg-plist
@@ -26,6 +26,38 @@ libdata/bonobo/servers/broken.server
libdata/bonobo/servers/empty.server
libdata/bonobo/servers/plugin.server
libdata/pkgconfig/bonobo-activation-2.0.pc
+share/doc/bonobo-activation/api-reference.html
+share/doc/bonobo-activation/architecture.html
+share/doc/bonobo-activation/async-activation.html
+share/doc/bonobo-activation/attribute-tag.html
+share/doc/bonobo-activation/bonobo-activation-debugging.html
+share/doc/bonobo-activation/bonobo-activation-initialization.html
+share/doc/bonobo-activation/bonobo-activation-query-and-activation.html
+share/doc/bonobo-activation/bonobo-activation-registration.html
+share/doc/bonobo-activation/bonobo-activation-utilities.html
+share/doc/bonobo-activation/bonobo-activation.png
+share/doc/bonobo-activation/checklist.html
+share/doc/bonobo-activation/configuring.html
+share/doc/bonobo-activation/fdl-section1.html
+share/doc/bonobo-activation/fdl-section10.html
+share/doc/bonobo-activation/fdl-section2.html
+share/doc/bonobo-activation/fdl-section3.html
+share/doc/bonobo-activation/fdl-section4.html
+share/doc/bonobo-activation/fdl-section5.html
+share/doc/bonobo-activation/fdl-section6.html
+share/doc/bonobo-activation/fdl-section7.html
+share/doc/bonobo-activation/fdl-section8.html
+share/doc/bonobo-activation/fdl-section9.html
+share/doc/bonobo-activation/fdl-using.html
+share/doc/bonobo-activation/fdl.html
+share/doc/bonobo-activation/index.html
+share/doc/bonobo-activation/index.sgml
+share/doc/bonobo-activation/migrating.html
+share/doc/bonobo-activation/query-langage.html
+share/doc/bonobo-activation/query-syntax.html
+share/doc/bonobo-activation/server-arch.html
+share/doc/bonobo-activation/server-xml-reference.html
+share/doc/bonobo-activation/tutorial.html
share/idl/bonobo-activation-2.0/Bonobo_ActivationContext.idl
share/idl/bonobo-activation-2.0/Bonobo_Activation_types.idl
share/idl/bonobo-activation-2.0/Bonobo_GenericFactory.idl
@@ -61,6 +93,7 @@ share/locale/sv/LC_MESSAGES/bonobo-activation.mo
share/locale/ta/LC_MESSAGES/bonobo-activation.mo
share/locale/tr/LC_MESSAGES/bonobo-activation.mo
share/locale/uk/LC_MESSAGES/bonobo-activation.mo
+share/locale/vi/LC_MESSAGES/bonobo-activation.mo
share/locale/zh_CN/LC_MESSAGES/bonobo-activation.mo
share/locale/zh_TW/LC_MESSAGES/bonobo-activation.mo
@dirrm share/idl/bonobo-activation-2.0
diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile
index 0b76b3be970a..fdf2a391bba4 100644
--- a/devel/bugbuddy2/Makefile
+++ b/devel/bugbuddy2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= bugbuddy2
PORTVERSION= 2.1.6
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= bug-buddy-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 595547e65bd1..1d6588037493 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gconf2
PORTVERSION= 1.1.10
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= GConf-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 0745456d10a6..9c06b4430789 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -9,7 +9,7 @@ PORTNAME= glib
PORTVERSION= 2.0.1
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta5,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020525,} \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index 600ae0d73aee..16fba134ac52 100644
--- a/devel/gnome-common/Makefile
+++ b/devel/gnome-common/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomecommon
PORTVERSION= 1.2.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-common-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index f6d9c85ec9fc..4b6686cde745 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomevfs2
-PORTVERSION= 1.9.15
+PORTVERSION= 1.9.16
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-vfs-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index c013614b090e..2bb5f1f241e0 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-1.9.15.tar.bz2) = b4897314329a7d59b1e774c55af84118
+MD5 (gnome2/gnome-vfs-1.9.16.tar.bz2) = 161ccd037041ae92fd742ac4705b4bb6
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index 735db4eb7963..9eb96806f017 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Sat May 11 19:15:25 2002
-+++ configure Sat May 11 19:17:52 2002
-@@ -7207,6 +7207,7 @@
+--- configure.orig Mon May 27 14:03:09 2002
++++ configure Mon May 27 14:04:14 2002
+@@ -7224,6 +7224,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,18 +8,18 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -11987,8 +11988,8 @@
+@@ -12140,8 +12141,8 @@
done
fi
--echo "$as_me:11990: checking for bzCompressInit in -lbz2" >&5
+-echo "$as_me:12143: checking for bzCompressInit in -lbz2" >&5
-echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:11990: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo "$as_me:12143: checking for BZ2_bzCompressInit in -lbz2" >&5
+echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6
if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -12004,11 +12005,11 @@
+@@ -12157,11 +12158,11 @@
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
@@ -33,16 +33,16 @@
;
return 0;
}
-@@ -12337,7 +12338,7 @@
+@@ -12490,7 +12491,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl"
cat >conftest.$ac_ext <<_ACEOF
- #line 12342 "configure"
+ #line 12495 "configure"
#include "confdefs.h"
-@@ -12388,9 +12389,9 @@
+@@ -12541,9 +12542,9 @@
msg_openssl="yes"
if test x$with_openssl_libs != x/usr/lib; then
@@ -54,7 +54,7 @@
fi
if true; then
-@@ -13476,7 +13477,7 @@
+@@ -14134,7 +14135,7 @@
s,@ORBIT_IDL@,$ORBIT_IDL,;t t
s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
diff --git a/devel/gnome-vfs/files/patch-ab b/devel/gnome-vfs/files/patch-ab
index 3e204f19a3ef..cd5b093a93d8 100644
--- a/devel/gnome-vfs/files/patch-ab
+++ b/devel/gnome-vfs/files/patch-ab
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- Makefile.in 2002/02/16 13:04:16 1.1
-+++ Makefile.in 2002/02/16 13:09:12
-@@ -165,7 +165,7 @@
+--- Makefile.in.orig Mon May 27 13:58:39 2002
++++ Makefile.in Mon May 27 13:59:22 2002
+@@ -169,7 +169,7 @@
- SUBDIRS_GNOME = monikers doc
+ SUBDIRS_GNOME = monikers doc schemas
--SUBDIRS = libgnomevfs modules devel-docs doc test monikers po
-+SUBDIRS = libgnomevfs modules devel-docs doc monikers po
+-SUBDIRS = libgnomevfs modules schemas devel-docs doc test monikers po
++SUBDIRS = libgnomevfs modules schemas devel-docs doc monikers po
EXTRA_DIST = HACKING TODO autogen.sh gnome-vfs.spec gnome-vfs-2.0.pc.in gnome-vfs-module-2.0.pc.in intltool-extract.in intltool-merge.in intltool-update.in
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 3bd672c7b373..f6b772730152 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -1,3 +1,8 @@
+etc/gconf/gconf.xml.defaults/schemas/system/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/system/http_proxy/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/http_proxy/%gconf.xml
+etc/gconf/schemas/system_http_proxy.schemas
etc/gnome-vfs-2.0/modules/default-modules.conf
etc/gnome-vfs-2.0/vfolders/applications.vfolder-info
etc/gnome-vfs-2.0/vfolders/preferences.vfolder-info
@@ -51,6 +56,7 @@ lib/gnome-vfs-2.0/modules/libgzip.so
lib/gnome-vfs-2.0/modules/libhttp.so
lib/gnome-vfs-2.0/modules/libnntp.so
lib/gnome-vfs-2.0/modules/libssh.so
+lib/gnome-vfs-2.0/modules/libtar.so
lib/gnome-vfs-2.0/modules/libvfolder-desktop.so
lib/gnome-vfs-2.0/modules/libvfs-pipe.so
lib/gnome-vfs-2.0/modules/libvfs-test.so
@@ -133,6 +139,7 @@ share/locale/fi/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -168,4 +175,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
@dirrm etc/gnome-vfs-2.0/vfolders
@dirrm etc/gnome-vfs-2.0/modules
@dirrm etc/gnome-vfs-2.0
+@dirrm etc/gconf/gconf.xml.defaults/system/http_proxy
+@dirrm etc/gconf/gconf.xml.defaults/system
+@dirrm etc/gconf/gconf.xml.defaults/schemas/system/http_proxy
+@dirrm etc/gconf/gconf.xml.defaults/schemas/system
@unexec /bin/rmdir %D/lib/vfs 2>/dev/null || /usr/bin/true
diff --git a/devel/gnomecommon/Makefile b/devel/gnomecommon/Makefile
index 600ae0d73aee..16fba134ac52 100644
--- a/devel/gnomecommon/Makefile
+++ b/devel/gnomecommon/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomecommon
PORTVERSION= 1.2.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-common-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index f6d9c85ec9fc..4b6686cde745 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomevfs2
-PORTVERSION= 1.9.15
+PORTVERSION= 1.9.16
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-vfs-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index c013614b090e..2bb5f1f241e0 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-1.9.15.tar.bz2) = b4897314329a7d59b1e774c55af84118
+MD5 (gnome2/gnome-vfs-1.9.16.tar.bz2) = 161ccd037041ae92fd742ac4705b4bb6
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index 735db4eb7963..9eb96806f017 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Sat May 11 19:15:25 2002
-+++ configure Sat May 11 19:17:52 2002
-@@ -7207,6 +7207,7 @@
+--- configure.orig Mon May 27 14:03:09 2002
++++ configure Mon May 27 14:04:14 2002
+@@ -7224,6 +7224,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,18 +8,18 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -11987,8 +11988,8 @@
+@@ -12140,8 +12141,8 @@
done
fi
--echo "$as_me:11990: checking for bzCompressInit in -lbz2" >&5
+-echo "$as_me:12143: checking for bzCompressInit in -lbz2" >&5
-echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:11990: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo "$as_me:12143: checking for BZ2_bzCompressInit in -lbz2" >&5
+echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6
if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -12004,11 +12005,11 @@
+@@ -12157,11 +12158,11 @@
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
@@ -33,16 +33,16 @@
;
return 0;
}
-@@ -12337,7 +12338,7 @@
+@@ -12490,7 +12491,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl"
cat >conftest.$ac_ext <<_ACEOF
- #line 12342 "configure"
+ #line 12495 "configure"
#include "confdefs.h"
-@@ -12388,9 +12389,9 @@
+@@ -12541,9 +12542,9 @@
msg_openssl="yes"
if test x$with_openssl_libs != x/usr/lib; then
@@ -54,7 +54,7 @@
fi
if true; then
-@@ -13476,7 +13477,7 @@
+@@ -14134,7 +14135,7 @@
s,@ORBIT_IDL@,$ORBIT_IDL,;t t
s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
diff --git a/devel/gnomevfs2/files/patch-ab b/devel/gnomevfs2/files/patch-ab
index 3e204f19a3ef..cd5b093a93d8 100644
--- a/devel/gnomevfs2/files/patch-ab
+++ b/devel/gnomevfs2/files/patch-ab
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- Makefile.in 2002/02/16 13:04:16 1.1
-+++ Makefile.in 2002/02/16 13:09:12
-@@ -165,7 +165,7 @@
+--- Makefile.in.orig Mon May 27 13:58:39 2002
++++ Makefile.in Mon May 27 13:59:22 2002
+@@ -169,7 +169,7 @@
- SUBDIRS_GNOME = monikers doc
+ SUBDIRS_GNOME = monikers doc schemas
--SUBDIRS = libgnomevfs modules devel-docs doc test monikers po
-+SUBDIRS = libgnomevfs modules devel-docs doc monikers po
+-SUBDIRS = libgnomevfs modules schemas devel-docs doc test monikers po
++SUBDIRS = libgnomevfs modules schemas devel-docs doc monikers po
EXTRA_DIST = HACKING TODO autogen.sh gnome-vfs.spec gnome-vfs-2.0.pc.in gnome-vfs-module-2.0.pc.in intltool-extract.in intltool-merge.in intltool-update.in
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index 3bd672c7b373..f6b772730152 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -1,3 +1,8 @@
+etc/gconf/gconf.xml.defaults/schemas/system/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/system/http_proxy/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/http_proxy/%gconf.xml
+etc/gconf/schemas/system_http_proxy.schemas
etc/gnome-vfs-2.0/modules/default-modules.conf
etc/gnome-vfs-2.0/vfolders/applications.vfolder-info
etc/gnome-vfs-2.0/vfolders/preferences.vfolder-info
@@ -51,6 +56,7 @@ lib/gnome-vfs-2.0/modules/libgzip.so
lib/gnome-vfs-2.0/modules/libhttp.so
lib/gnome-vfs-2.0/modules/libnntp.so
lib/gnome-vfs-2.0/modules/libssh.so
+lib/gnome-vfs-2.0/modules/libtar.so
lib/gnome-vfs-2.0/modules/libvfolder-desktop.so
lib/gnome-vfs-2.0/modules/libvfs-pipe.so
lib/gnome-vfs-2.0/modules/libvfs-test.so
@@ -133,6 +139,7 @@ share/locale/fi/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -168,4 +175,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
@dirrm etc/gnome-vfs-2.0/vfolders
@dirrm etc/gnome-vfs-2.0/modules
@dirrm etc/gnome-vfs-2.0
+@dirrm etc/gconf/gconf.xml.defaults/system/http_proxy
+@dirrm etc/gconf/gconf.xml.defaults/system
+@dirrm etc/gconf/gconf.xml.defaults/schemas/system/http_proxy
+@dirrm etc/gconf/gconf.xml.defaults/schemas/system
@unexec /bin/rmdir %D/lib/vfs 2>/dev/null || /usr/bin/true
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index 36fc8db1f606..40d0971313b1 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libIDL
PORTVERSION= 0.7.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 0bec4b46f2a2..37df58ef2e75 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libbonobo
-PORTVERSION= 1.116.0
+PORTVERSION= 1.117.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index 848f5a137553..23c1f81a5c1e 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libbonobo-1.116.0.tar.bz2) = a4c5c79d6997c3073806d602930a0a5d
+MD5 (gnome2/libbonobo-1.117.0.tar.bz2) = e3ecc01f2f250b3143f0dee600f42e80
diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist
index a5cea661738e..42f96a1f0898 100644
--- a/devel/libbonobo/pkg-plist
+++ b/devel/libbonobo/pkg-plist
@@ -40,6 +40,43 @@ lib/orbit-2.0/Bonobo_module.so
libdata/bonobo/servers/Bonobo_Moniker_std.server
libdata/bonobo/servers/Bonobo_Sample_Echo.server
libdata/pkgconfig/libbonobo-2.0.pc
+share/doc/libbonobo/c4.html
+share/doc/libbonobo/index.html
+share/doc/libbonobo/index.sgml
+share/doc/libbonobo/libbonobo-bonobo-arg.html
+share/doc/libbonobo/libbonobo-bonobo-config-database.html
+share/doc/libbonobo/libbonobo-bonobo-context.html
+share/doc/libbonobo/libbonobo-bonobo-event-source.html
+share/doc/libbonobo/libbonobo-bonobo-exception.html
+share/doc/libbonobo/libbonobo-bonobo-generic-factory.html
+share/doc/libbonobo/libbonobo-bonobo-i18n.html
+share/doc/libbonobo/libbonobo-bonobo-item-container.html
+share/doc/libbonobo/libbonobo-bonobo-item-handler.html
+share/doc/libbonobo/libbonobo-bonobo-listener.html
+share/doc/libbonobo/libbonobo-bonobo-macros.html
+share/doc/libbonobo/libbonobo-bonobo-main.html
+share/doc/libbonobo/libbonobo-bonobo-moniker-context.html
+share/doc/libbonobo/libbonobo-bonobo-moniker-extender.html
+share/doc/libbonobo/libbonobo-bonobo-moniker-simple.html
+share/doc/libbonobo/libbonobo-bonobo-moniker-util.html
+share/doc/libbonobo/libbonobo-bonobo-moniker.html
+share/doc/libbonobo/libbonobo-bonobo-object.html
+share/doc/libbonobo/libbonobo-bonobo-persist-client.html
+share/doc/libbonobo/libbonobo-bonobo-persist-file.html
+share/doc/libbonobo/libbonobo-bonobo-persist-stream.html
+share/doc/libbonobo/libbonobo-bonobo-persist.html
+share/doc/libbonobo/libbonobo-bonobo-property-bag-client.html
+share/doc/libbonobo/libbonobo-bonobo-property-bag.html
+share/doc/libbonobo/libbonobo-bonobo-running-context.html
+share/doc/libbonobo/libbonobo-bonobo-shlib-factory.html
+share/doc/libbonobo/libbonobo-bonobo-shutdown.html
+share/doc/libbonobo/libbonobo-bonobo-storage-memory.html
+share/doc/libbonobo/libbonobo-bonobo-storage.html
+share/doc/libbonobo/libbonobo-bonobo-stream-client.html
+share/doc/libbonobo/libbonobo-bonobo-stream-memory.html
+share/doc/libbonobo/libbonobo-bonobo-transient.html
+share/doc/libbonobo/libbonobo-bonobo-types.html
+share/doc/libbonobo/libbonobo-bonobo-xobject.html
share/idl/bonobo-2.0/Bonobo.idl
share/idl/bonobo-2.0/Bonobo_Canvas.idl
share/idl/bonobo-2.0/Bonobo_Clipboard.idl
@@ -81,6 +118,7 @@ share/locale/sv/LC_MESSAGES/libbonobo-2.0.mo
share/locale/ta/LC_MESSAGES/libbonobo-2.0.mo
share/locale/tr/LC_MESSAGES/libbonobo-2.0.mo
share/locale/uk/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/vi/LC_MESSAGES/libbonobo-2.0.mo
share/locale/zh_CN/LC_MESSAGES/libbonobo-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
@dirrm share/idl/bonobo-2.0
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 8ce63dbb769f..956bce6087e1 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libglade2
PORTVERSION= 1.99.12
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 19a287df7619..71f46b7afddc 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.90.2
PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= libgtop-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index f3d1830b8935..84859e59f874 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pkgconfig
PORTVERSION= 0.12.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile
index f3d1830b8935..84859e59f874 100644
--- a/devel/pkgconfig/Makefile
+++ b/devel/pkgconfig/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pkgconfig
PORTVERSION= 0.12.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index 9329640c1c24..f4b082028341 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gedit2
-PORTVERSION= 1.119.0
+PORTVERSION= 1.120.0
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/editors/gedit2/distinfo b/editors/gedit2/distinfo
index f89fb90ee672..39aa19f8a25e 100644
--- a/editors/gedit2/distinfo
+++ b/editors/gedit2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gedit2-1.119.0.tar.bz2) = f43637331c04264a3980766758baa6c9
+MD5 (gnome2/gedit2-1.120.0.tar.bz2) = 7ddec48fcbaf0763764d8b7219db1bbf
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index aeae92642895..f9c346cb31e4 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomegames2
PORTVERSION= 1.92.0
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-games-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index aeae92642895..f9c346cb31e4 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomegames2
PORTVERSION= 1.92.0
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-games-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile
index adfc8cc0f5f4..8c58e8d29deb 100644
--- a/graphics/libart_lgpl/Makefile
+++ b/graphics/libart_lgpl/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libart_lgpl2
PORTVERSION= 2.3.8
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/graphics/libart_lgpl2/Makefile b/graphics/libart_lgpl2/Makefile
index adfc8cc0f5f4..8c58e8d29deb 100644
--- a/graphics/libart_lgpl2/Makefile
+++ b/graphics/libart_lgpl2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libart_lgpl2
PORTVERSION= 2.3.8
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index fc7e287ce974..456e58b64d43 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libgnomecanvas
PORTVERSION= 1.117.0
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index fd3f4e43f7cb..6f934093b105 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= librsvg2
PORTVERSION= 1.1.6
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
DISTNAME= librsvg-${PORTVERSION}
diff --git a/lang/librep2/Makefile b/lang/librep2/Makefile
index ba875fad49a0..c07ffd88ccde 100644
--- a/lang/librep2/Makefile
+++ b/lang/librep2/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= librep2
-PORTVERSION= 2002.05.02
-PORTREVISION= 1
+PORTVERSION= 2002.05.24
CATEGORIES= lang gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= librep-${PORTVERSION:S/./-/g}
DIST_SUBDIR= gnome2
diff --git a/lang/librep2/distinfo b/lang/librep2/distinfo
index 7acf71a6f929..7a262fd1257c 100644
--- a/lang/librep2/distinfo
+++ b/lang/librep2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/librep-2002-05-02.tar.bz2) = 6ed777d23f73b2b1770d72d31c3fbe2a
+MD5 (gnome2/librep-2002-05-24.tar.bz2) = fb602ca56b34331ecca60e894ced4d42
diff --git a/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile
index 5b65ea0f48e2..bb81e484db29 100644
--- a/misc/gnome-mime-data/Makefile
+++ b/misc/gnome-mime-data/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomemimedata
PORTVERSION= 1.0.8
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-mime-data-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/misc/gnomemimedata/Makefile b/misc/gnomemimedata/Makefile
index 5b65ea0f48e2..bb81e484db29 100644
--- a/misc/gnomemimedata/Makefile
+++ b/misc/gnomemimedata/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomemimedata
PORTVERSION= 1.0.8
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-mime-data-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile
index a0e1e7923e94..34aa6340e1de 100644
--- a/misc/gnomeutils2/Makefile
+++ b/misc/gnomeutils2/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= gnomeutils2
-PORTVERSION= 1.105.0
+PORTVERSION= 1.106.0
PORTEPOCH= 1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/misc/gnomeutils2/distinfo b/misc/gnomeutils2/distinfo
index 064c3d82f1c1..4c4239694ed2 100644
--- a/misc/gnomeutils2/distinfo
+++ b/misc/gnomeutils2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-utils-1.105.0.tar.bz2) = 401bda405425ec429608e55ee4ad2b46
+MD5 (gnome2/gnome-utils-1.106.0.tar.bz2) = d119a8d4f75ff0fdc51cb09e26e00164
diff --git a/net/linc/Makefile b/net/linc/Makefile
index f14514c07aac..7aae851e2ee0 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= linc
-PORTVERSION= 0.1.21
+PORTVERSION= 0.1.22
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/net/linc/distinfo b/net/linc/distinfo
index c4260032ba5a..a2bc689e414d 100644
--- a/net/linc/distinfo
+++ b/net/linc/distinfo
@@ -1 +1 @@
-MD5 (gnome2/linc-0.1.21.tar.bz2) = 2ade39312be6bfc7e85b2e106218c8c1
+MD5 (gnome2/linc-0.1.22.tar.bz2) = e1238441707b4650aeecd3a1ad45c406
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index cc0a45258418..45f5e9065058 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libgnomeprint
PORTVERSION= 1.113.0
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index d612a3891446..5e86403a6ea7 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gconf-editor
-PORTVERSION= 0.1
+PORTVERSION= 0.2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo
index 53f8b1a19031..961baf923cd5 100644
--- a/sysutils/gconf-editor/distinfo
+++ b/sysutils/gconf-editor/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gconf-editor-0.1.tar.bz2) = 1db6f1a8a585272056b4eb57c20809dd
+MD5 (gnome2/gconf-editor-0.2.tar.bz2) = 5d2453640f1cdafdd108176c3376f879
diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist
index f03d3c86cde2..e5494de83384 100644
--- a/sysutils/gconf-editor/pkg-plist
+++ b/sysutils/gconf-editor/pkg-plist
@@ -12,7 +12,27 @@ share/gnome/pixmaps/gconf-editor/folder-closed.png
share/gnome/pixmaps/gconf-editor/folder-open.png
share/gnome/pixmaps/gconf-editor/stock-about-16.png
share/locale/az/LC_MESSAGES/gconf-editor.mo
+share/locale/da/LC_MESSAGES/gconf-editor.mo
+share/locale/de/LC_MESSAGES/gconf-editor.mo
+share/locale/el/LC_MESSAGES/gconf-editor.mo
+share/locale/es/LC_MESSAGES/gconf-editor.mo
+share/locale/et/LC_MESSAGES/gconf-editor.mo
+share/locale/fr/LC_MESSAGES/gconf-editor.mo
+share/locale/hi/LC_MESSAGES/gconf-editor.mo
+share/locale/hu/LC_MESSAGES/gconf-editor.mo
+share/locale/it/LC_MESSAGES/gconf-editor.mo
+share/locale/ja/LC_MESSAGES/gconf-editor.mo
+share/locale/ko/LC_MESSAGES/gconf-editor.mo
share/locale/ms/LC_MESSAGES/gconf-editor.mo
share/locale/no/LC_MESSAGES/gconf-editor.mo
+share/locale/pl/LC_MESSAGES/gconf-editor.mo
+share/locale/pt/LC_MESSAGES/gconf-editor.mo
+share/locale/ru/LC_MESSAGES/gconf-editor.mo
+share/locale/sk/LC_MESSAGES/gconf-editor.mo
+share/locale/sl/LC_MESSAGES/gconf-editor.mo
share/locale/sv/LC_MESSAGES/gconf-editor.mo
+share/locale/uk/LC_MESSAGES/gconf-editor.mo
+share/locale/vi/LC_MESSAGES/gconf-editor.mo
+share/locale/zh_CN/LC_MESSAGES/gconf-editor.mo
+share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo
@dirrm share/gnome/pixmaps/gconf-editor
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 169f8c22213f..4bdc252d6b37 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomecontrolcenter2
PORTVERSION= 1.99.10
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= control-center-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index f5daab730521..18e7bb03dc7f 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomesystemmonitor
-PORTVERSION= 1.1.6
+PORTVERSION= 1.1.7
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020501
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-system-monitor-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -17,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org
LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
gtop-2.0.2:${PORTSDIR}/devel/libgtop2 \
- wnck-1.2:${PORTSDIR}/x11-toolkits/libwnck
+ wnck-1.4:${PORTSDIR}/x11-toolkits/libwnck
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index 99918ccc16df..fa6c7004b126 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-system-monitor-1.1.6.tar.bz2) = e3ae3f26951d4863e3035646f4187459
+MD5 (gnome2/gnome-system-monitor-1.1.7.tar.bz2) = 6573093ff335e7e2f0b140e854110299
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index e586f8dcf913..cbe747b899a5 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -9,46 +9,52 @@ etc/gconf/gconf.xml.defaults/schemas/apps/procman/memmapstree/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/procman/proctree/%gconf.xml
etc/gconf/schemas/gnome-system-monitor.schemas
share/gnome/applications/gnome-system-monitor.desktop
-share/gnome/help/procman/C/figures/addColumn.png
-share/gnome/help/procman/C/figures/changePriority.png
-share/gnome/help/procman/C/figures/colorPanel.png
-share/gnome/help/procman/C/figures/columnContextMenu.png
-share/gnome/help/procman/C/figures/memoryMaps.png
-share/gnome/help/procman/C/figures/moreInfo.png
-share/gnome/help/procman/C/figures/processListing.png
-share/gnome/help/procman/C/figures/sortButton.png
-share/gnome/help/procman/C/figures/sortMenu.png
-share/gnome/help/procman/C/figures/sortMenu2.png
-share/gnome/help/procman/C/figures/systemMonitor.png
-share/gnome/help/procman/C/figures/viewMenu.png
-share/gnome/help/procman/C/legal.xml
-share/gnome/help/procman/C/procman.xml
-share/gnome/omf/gnome-core/procman-C.omf
+share/gnome/help/gnome-system-monitor/C/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/C/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/C/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/C/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/C/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/C/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/C/figures/processListing.png
+share/gnome/help/gnome-system-monitor/C/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/C/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/C/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/C/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/C/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/C/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/C/legal.xml
+share/gnome/omf/gnome-core/gnome-system-monitor-C.omf
share/gnome/pixmaps/procman.png
+share/locale/az/LC_MESSAGES/gnome-system-monitor.mo
share/locale/da/LC_MESSAGES/gnome-system-monitor.mo
share/locale/de/LC_MESSAGES/gnome-system-monitor.mo
share/locale/es/LC_MESSAGES/gnome-system-monitor.mo
share/locale/fr/LC_MESSAGES/gnome-system-monitor.mo
share/locale/gl/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/hu/LC_MESSAGES/gnome-system-monitor.mo
share/locale/it/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ja/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ko/LC_MESSAGES/gnome-system-monitor.mo
share/locale/lv/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/mk/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ms/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/nl/LC_MESSAGES/gnome-system-monitor.mo
share/locale/no/LC_MESSAGES/gnome-system-monitor.mo
share/locale/pl/LC_MESSAGES/gnome-system-monitor.mo
share/locale/pt/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ru/LC_MESSAGES/gnome-system-monitor.mo
share/locale/sk/LC_MESSAGES/gnome-system-monitor.mo
share/locale/sl/LC_MESSAGES/gnome-system-monitor.mo
share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo
share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo
share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo
share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
-@dirrm share/gnome/help/procman/C/figures
-@dirrm share/gnome/help/procman/C
-@dirrm share/gnome/help/procman
+@dirrm share/gnome/help/gnome-system-monitor/C/figures
+@dirrm share/gnome/help/gnome-system-monitor/C
+@dirrm share/gnome/help/gnome-system-monitor
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/procman/proctree
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/procman/memmapstree
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/procman/disktree
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 169f8c22213f..4bdc252d6b37 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomecontrolcenter2
PORTVERSION= 1.99.10
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= control-center-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index f5daab730521..18e7bb03dc7f 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomesystemmonitor
-PORTVERSION= 1.1.6
+PORTVERSION= 1.1.7
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020501
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-system-monitor-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -17,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org
LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
gtop-2.0.2:${PORTSDIR}/devel/libgtop2 \
- wnck-1.2:${PORTSDIR}/x11-toolkits/libwnck
+ wnck-1.4:${PORTSDIR}/x11-toolkits/libwnck
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo
index 99918ccc16df..fa6c7004b126 100644
--- a/sysutils/gnomesystemmonitor/distinfo
+++ b/sysutils/gnomesystemmonitor/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-system-monitor-1.1.6.tar.bz2) = e3ae3f26951d4863e3035646f4187459
+MD5 (gnome2/gnome-system-monitor-1.1.7.tar.bz2) = 6573093ff335e7e2f0b140e854110299
diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist
index e586f8dcf913..cbe747b899a5 100644
--- a/sysutils/gnomesystemmonitor/pkg-plist
+++ b/sysutils/gnomesystemmonitor/pkg-plist
@@ -9,46 +9,52 @@ etc/gconf/gconf.xml.defaults/schemas/apps/procman/memmapstree/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/procman/proctree/%gconf.xml
etc/gconf/schemas/gnome-system-monitor.schemas
share/gnome/applications/gnome-system-monitor.desktop
-share/gnome/help/procman/C/figures/addColumn.png
-share/gnome/help/procman/C/figures/changePriority.png
-share/gnome/help/procman/C/figures/colorPanel.png
-share/gnome/help/procman/C/figures/columnContextMenu.png
-share/gnome/help/procman/C/figures/memoryMaps.png
-share/gnome/help/procman/C/figures/moreInfo.png
-share/gnome/help/procman/C/figures/processListing.png
-share/gnome/help/procman/C/figures/sortButton.png
-share/gnome/help/procman/C/figures/sortMenu.png
-share/gnome/help/procman/C/figures/sortMenu2.png
-share/gnome/help/procman/C/figures/systemMonitor.png
-share/gnome/help/procman/C/figures/viewMenu.png
-share/gnome/help/procman/C/legal.xml
-share/gnome/help/procman/C/procman.xml
-share/gnome/omf/gnome-core/procman-C.omf
+share/gnome/help/gnome-system-monitor/C/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/C/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/C/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/C/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/C/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/C/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/C/figures/processListing.png
+share/gnome/help/gnome-system-monitor/C/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/C/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/C/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/C/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/C/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/C/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/C/legal.xml
+share/gnome/omf/gnome-core/gnome-system-monitor-C.omf
share/gnome/pixmaps/procman.png
+share/locale/az/LC_MESSAGES/gnome-system-monitor.mo
share/locale/da/LC_MESSAGES/gnome-system-monitor.mo
share/locale/de/LC_MESSAGES/gnome-system-monitor.mo
share/locale/es/LC_MESSAGES/gnome-system-monitor.mo
share/locale/fr/LC_MESSAGES/gnome-system-monitor.mo
share/locale/gl/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/hu/LC_MESSAGES/gnome-system-monitor.mo
share/locale/it/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ja/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ko/LC_MESSAGES/gnome-system-monitor.mo
share/locale/lv/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/mk/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ms/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/nl/LC_MESSAGES/gnome-system-monitor.mo
share/locale/no/LC_MESSAGES/gnome-system-monitor.mo
share/locale/pl/LC_MESSAGES/gnome-system-monitor.mo
share/locale/pt/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ru/LC_MESSAGES/gnome-system-monitor.mo
share/locale/sk/LC_MESSAGES/gnome-system-monitor.mo
share/locale/sl/LC_MESSAGES/gnome-system-monitor.mo
share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo
share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo
share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo
share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
-@dirrm share/gnome/help/procman/C/figures
-@dirrm share/gnome/help/procman/C
-@dirrm share/gnome/help/procman
+@dirrm share/gnome/help/gnome-system-monitor/C/figures
+@dirrm share/gnome/help/gnome-system-monitor/C
+@dirrm share/gnome/help/gnome-system-monitor
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/procman/proctree
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/procman/memmapstree
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/procman/disktree
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 3e2cd0464897..1d8ce3dc4ec2 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libgtkhtml
PORTVERSION= 1.99.7
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 820774037a98..2da8b85e050f 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= nautilus2
-PORTVERSION= 1.1.16
+PORTVERSION= 1.1.17
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
DISTNAME= nautilus-${PORTVERSION}
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index 76c3658eb785..4f5c69535381 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/nautilus-1.1.16.tar.bz2) = 182bc2ec3b04c8442496244fa696a781
+MD5 (gnome2/nautilus-1.1.17.tar.bz2) = 2c12ff181865d1690fe21bb320f779eb
diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa
index e8202cff9feb..1352642e2602 100644
--- a/x11-fm/nautilus2/files/patch-aa
+++ b/x11-fm/nautilus2/files/patch-aa
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig Fri May 17 18:08:30 2002
-+++ configure Fri May 17 18:09:02 2002
-@@ -7480,6 +7480,7 @@
+--- configure.orig Tue May 28 00:57:18 2002
++++ configure Tue May 28 01:00:25 2002
+@@ -7495,6 +7495,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,7 +8,7 @@ $FreeBSD$
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -12030,14 +12031,14 @@
+@@ -12398,14 +12399,14 @@
LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`"
@@ -28,7 +25,7 @@ $FreeBSD$
COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0"
COMPONENT_CFLAGS="`$PKG_CONFIG --cflags $COMPONENT_MODULES`"
-@@ -12746,9 +12747,9 @@
+@@ -13114,9 +13115,9 @@
s,@ORBIT_CONFIG@,$ORBIT_CONFIG,;t t
s,@ORBIT_IDL@,$ORBIT_IDL,;t t
s,@ORBIT_CFLAGS@,$ORBIT_CFLAGS,;t t
@@ -40,13 +37,12 @@ $FreeBSD$
s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
s,@ALLOCA@,$ALLOCA,;t t
s,@USE_NLS@,$USE_NLS,;t t
-@@ -12799,23 +12800,23 @@
+@@ -13171,22 +13172,22 @@
s,@HAVE_JW_FALSE@,$HAVE_JW_FALSE,;t t
s,@HAVE_JW@,$HAVE_JW,;t t
s,@MEDUSA_CFLAGS@,$MEDUSA_CFLAGS,;t t
-s,@MEDUSA_LIBS@,$MEDUSA_LIBS,;t t
+s~@MEDUSA_LIBS@~$MEDUSA_LIBS~;t t
- s,@LIBPNG@,$LIBPNG,;t t
s,@LIBJPEG@,$LIBJPEG,;t t
s,@GIMPHWRAPBOX_CFLAGS@,$GIMPHWRAPBOX_CFLAGS,;t t
s,@LIBNAUTILUS_CFLAGS@,$LIBNAUTILUS_CFLAGS,;t t
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index 62a3a7d41bf8..a6dcde2304f7 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -2,9 +2,7 @@ bin/nautilus
bin/nautilus-adapter
bin/nautilus-content-loser
bin/nautilus-hardware-view
-bin/nautilus-history-view
bin/nautilus-music-view
-bin/nautilus-notes
bin/nautilus-sample-content-view
bin/nautilus-sidebar-loser
bin/nautilus-text-view
@@ -44,6 +42,8 @@ include/libnautilus/nautilus-view.h
lib/libnautilus-adapter.a
lib/libnautilus-adapter.so
lib/libnautilus-adapter.so.2
+lib/libnautilus-history-view.so
+lib/libnautilus-notes-view.so
lib/libnautilus-private.a
lib/libnautilus-private.so
lib/libnautilus-private.so.2
diff --git a/x11-toolkits/at-spi/Makefile b/x11-toolkits/at-spi/Makefile
index 188b038aa126..a2085a3ad436 100644
--- a/x11-toolkits/at-spi/Makefile
+++ b/x11-toolkits/at-spi/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.12.1
PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/eel2/Makefile b/x11-toolkits/eel2/Makefile
index aede6af7b686..6106a3d1c979 100644
--- a/x11-toolkits/eel2/Makefile
+++ b/x11-toolkits/eel2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= eel2
-PORTVERSION= 1.1.14
+PORTVERSION= 1.1.15
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
DISTNAME= eel-${PORTVERSION}
diff --git a/x11-toolkits/eel2/distinfo b/x11-toolkits/eel2/distinfo
index 80b08a508504..b07e3dfe6d55 100644
--- a/x11-toolkits/eel2/distinfo
+++ b/x11-toolkits/eel2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/eel-1.1.14.tar.bz2) = 67f9dfbe4fd24ab6d97e2b237701ba58
+MD5 (gnome2/eel-1.1.15.tar.bz2) = f9136c5b1bf500af3336e0557a2fdb2a
diff --git a/x11-toolkits/eel2/pkg-plist b/x11-toolkits/eel2/pkg-plist
index 679735c8ba35..cd976ffaad83 100644
--- a/x11-toolkits/eel2/pkg-plist
+++ b/x11-toolkits/eel2/pkg-plist
@@ -72,6 +72,7 @@ share/locale/ja/LC_MESSAGES/eel-2.0.mo
share/locale/ko/LC_MESSAGES/eel-2.0.mo
share/locale/lt/LC_MESSAGES/eel-2.0.mo
share/locale/lv/LC_MESSAGES/eel-2.0.mo
+share/locale/mk/LC_MESSAGES/eel-2.0.mo
share/locale/ms/LC_MESSAGES/eel-2.0.mo
share/locale/nl/LC_MESSAGES/eel-2.0.mo
share/locale/nn/LC_MESSAGES/eel-2.0.mo
diff --git a/x11-toolkits/gail/Makefile b/x11-toolkits/gail/Makefile
index 9e9801b4e014..eee9799586ad 100644
--- a/x11-toolkits/gail/Makefile
+++ b/x11-toolkits/gail/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gail
PORTVERSION= 0.13
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 4abd484e0112..6e68aa5b0bec 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk
PORTVERSION= 2.0.2
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta5,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020525,} \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 4abd484e0112..6e68aa5b0bec 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk
PORTVERSION= 2.0.2
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta5,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020525,} \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 9c0186522d20..dcf56d4909ce 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libbonoboui
-PORTVERSION= 1.116.0
+PORTVERSION= 1.117.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo
index 00e7af6698d2..439a9a5594b7 100644
--- a/x11-toolkits/libbonoboui/distinfo
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libbonoboui-1.116.0.tar.bz2) = db9796cb3ed29f189a86f72105746c57
+MD5 (gnome2/libbonoboui-1.117.0.tar.bz2) = 291b7ff71a5c7b6e2a8dc022eaa965a4
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index 64e394a3eb2e..16af03bc8e47 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -63,6 +63,7 @@ share/locale/sv/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/ta/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/tr/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/uk/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/vi/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/wa/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/zh_CN/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libbonoboui-2.0.mo
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index 339fd03a4104..668cb234cd53 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.5.0
PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index a1e49d5a5df8..9f8b25beb260 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libgnomeprintui
PORTVERSION= 1.113.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 7db4ce357f38..d6e10e0a7c75 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libgnomeui
-PORTVERSION= 1.117.0
+PORTVERSION= 1.117.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index cbd0499c4ee2..0b79ddb87c2e 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeui-1.117.0.tar.bz2) = 73d78f8a28c04d53fd2662dfde4dccc4
+MD5 (gnome2/libgnomeui-1.117.1.tar.bz2) = db23a8f8c7ede92c057a94eea40981fa
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 74b8d19b5b2b..a0aa448722e1 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libwnck
-PORTVERSION= 0.10
+PORTVERSION= 0.12
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo
index 632c961d4537..4b6c6b800054 100644
--- a/x11-toolkits/libwnck/distinfo
+++ b/x11-toolkits/libwnck/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libwnck-0.10.tar.bz2) = 807eb95515bbefae96142b69ae1b0c20
+MD5 (gnome2/libwnck-0.12.tar.bz2) = 262dc0cdb49df6a2a7838834b7842276
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index 80514055e608..9741c86d8e98 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -11,7 +11,7 @@ include/libwnck-1.0/libwnck/wnck-enum-types.h
include/libwnck-1.0/libwnck/workspace.h
lib/libwnck-1.a
lib/libwnck-1.so
-lib/libwnck-1.so.2
+lib/libwnck-1.so.4
libdata/pkgconfig/libwnck-1.0.pc
share/locale/az/LC_MESSAGES/libwnck.mo
share/locale/da/LC_MESSAGES/libwnck.mo
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index 697839e594e0..0860a08a701a 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libzvt
PORTVERSION= 1.115.2
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index fa0f467e1c00..3feb66e32ed1 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pango
PORTVERSION= 1.0.1
PORTREVISION= 1
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta5,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020525,} \
ftp://ftp.gtk.org/pub/gtk/v1.3/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.3/ \
http://www.ameth.org/gimp/gtk/v1.3/
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index 4673d90427cb..984925f890b4 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= rep-gtk2
-PORTVERSION= 2002.05.02
+PORTVERSION= 2002.05.24
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= rep-gtk-${PORTVERSION:S/./-/g}
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/rep-gtk2/distinfo b/x11-toolkits/rep-gtk2/distinfo
index e896ea4099d9..4dbc00966907 100644
--- a/x11-toolkits/rep-gtk2/distinfo
+++ b/x11-toolkits/rep-gtk2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/rep-gtk-2002-05-02.tar.bz2) = 79ee1c8dca2179a7c6748293cadcdc26
+MD5 (gnome2/rep-gtk-2002-05-24.tar.bz2) = f8e665f588929cc5a5df9b1c72d54ea9
diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile
index f47136af27d9..6bb7166387c6 100644
--- a/x11-wm/sawfish2/Makefile
+++ b/x11-wm/sawfish2/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= sawfish2
-PORTVERSION= 2002.05.02
-PORTREVISION= 1
+PORTVERSION= 2002.05.24
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= sawfish-${PORTVERSION:S/./-/g}
DIST_SUBDIR= gnome2
diff --git a/x11-wm/sawfish2/distinfo b/x11-wm/sawfish2/distinfo
index 46cef6cfd163..82877ab811cd 100644
--- a/x11-wm/sawfish2/distinfo
+++ b/x11-wm/sawfish2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/sawfish-2002-05-02.tar.bz2) = bb3b6a5dc19257bcbbdf3d8cd97eb8fd
+MD5 (gnome2/sawfish-2002-05-24.tar.bz2) = e6b01c0c7b37e2ecfc27c8b544258d98
diff --git a/x11-wm/sawfish2/files/patch-lisp_sawfish_wm_gnome_integration.jl b/x11-wm/sawfish2/files/patch-lisp_sawfish_wm_gnome_integration.jl
deleted file mode 100644
index 0341e02592b4..000000000000
--- a/x11-wm/sawfish2/files/patch-lisp_sawfish_wm_gnome_integration.jl
+++ /dev/null
@@ -1,29 +0,0 @@
---- lisp/sawfish/wm/gnome/integration.jl.orig Sat May 25 15:55:29 2002
-+++ lisp/sawfish/wm/gnome/integration.jl Sat May 25 15:55:31 2002
-@@ -19,8 +19,6 @@
- ;; along with sawmill; see the file COPYING. If not, write to
- ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
--(eval-when-compile (require 'sawfish.wm.commands.xterm))
--
- (define-structure sawfish.wm.gnome.integration ()
-
- (open rep
-@@ -28,7 +26,8 @@
- sawfish.wm.gnome.menus
- sawfish.wm.menus
- sawfish.wm.custom
-- sawfish.wm.commands.help)
-+ sawfish.wm.commands.help
-+ sawfish.wm.commands.xterm)
-
- (define-structure-alias gnome-int sawfish.wm.gnome.integration)
-
-@@ -46,6 +45,7 @@
- (put 'gnome-use-capplet 'custom-obsolete t)
-
- ;; invoke the GNOME terminal instead of xterm
-+ (eval-when-compile (require 'sawfish.wm.commands.xterm))
- (unless (variable-customized-p 'xterm-program)
- (setq xterm-program "gnome-terminal"))
-
diff --git a/x11-wm/sawfish2/pkg-plist b/x11-wm/sawfish2/pkg-plist
index 3eb41eb0391f..15ade8487f06 100644
--- a/x11-wm/sawfish2/pkg-plist
+++ b/x11-wm/sawfish2/pkg-plist
@@ -87,6 +87,7 @@ share/locale/sl/LC_MESSAGES/sawfish.mo
share/locale/sv/LC_MESSAGES/sawfish.mo
share/locale/tr/LC_MESSAGES/sawfish.mo
share/locale/uk/LC_MESSAGES/sawfish.mo
+share/locale/vi/LC_MESSAGES/sawfish.mo
share/locale/wa/LC_MESSAGES/sawfish.mo
share/locale/zh_CN/LC_MESSAGES/sawfish.mo
share/locale/zh_TW/LC_MESSAGES/sawfish.mo
@@ -391,6 +392,8 @@ share/sawfish/%%VERSION%%/lisp/sawfish/wm/util/window-outline.jl
share/sawfish/%%VERSION%%/lisp/sawfish/wm/util/window-outline.jlc
share/sawfish/%%VERSION%%/lisp/sawfish/wm/util/with-output.jl
share/sawfish/%%VERSION%%/lisp/sawfish/wm/util/with-output.jlc
+share/sawfish/%%VERSION%%/lisp/sawfish/wm/util/workarea.jl
+share/sawfish/%%VERSION%%/lisp/sawfish/wm/util/workarea.jlc
share/sawfish/%%VERSION%%/lisp/sawfish/wm/viewport.jl
share/sawfish/%%VERSION%%/lisp/sawfish/wm/viewport.jlc
share/sawfish/%%VERSION%%/lisp/sawfish/wm/window-anim.jl
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 52061616e2a3..85137a6252e9 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gdm2
PORTVERSION= 2.3.90.3
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gdm-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index a15e0b692fe3..a1f254d8d71c 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= gnomeapplets2
-PORTVERSION= 1.102.1
-PORTREVISION= 1
+PORTVERSION= 1.103.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-applets-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index d9acd878c002..a9908b3ef575 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-applets-1.102.1.tar.bz2) = b3352bc38788295e200eedfc3da5dabe
+MD5 (gnome2/gnome-applets-1.103.0.tar.bz2) = 899f2e0dac0df07e1e79317ddd91b85e
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index c69b86c3faa7..48ada08139fa 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -200,6 +200,12 @@ share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml
share/gnome/gweather/Locations
share/gnome/help/cdplayer/C/cdplayer.xml
share/gnome/help/cdplayer/C/figures/cdplayer_applet.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_eject.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_playing.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_playpause.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_prevtrack.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_stop.png
share/gnome/help/cdplayer/C/legal.xml
share/gnome/help/cdplayer/C/topic.dat
share/gnome/help/char-palette/C/char-palette.xml
@@ -218,17 +224,20 @@ share/gnome/help/gtik2_applet2/C/figures/gtik_applet.png
share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml
share/gnome/help/gtik2_applet2/C/legal.xml
share/gnome/help/gweather/C/figures/gweather_applet.png
-share/gnome/help/gweather/C/figures/gweather_settings.png
-share/gnome/help/gweather/C/figures/gweather_weather.png
share/gnome/help/gweather/C/gweather.xml
share/gnome/help/gweather/C/legal.xml
share/gnome/help/gweather/C/topic.dat
-share/gnome/omf/gnome-applets/cdplayer_applet-C.omf
+share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/C/legal.xml
+share/gnome/help/mixer_applet2/C/mixer_applet2.xml
+share/gnome/help/mixer_applet2/C/topic.dat
+share/gnome/omf/gnome-applets/cdplayer-C.omf
share/gnome/omf/gnome-applets/char-palette-C.omf
share/gnome/omf/gnome-applets/command-line-C.omf
share/gnome/omf/gnome-applets/geyes-C.omf
share/gnome/omf/gnome-applets/gtik2_applet2-C.omf
-share/gnome/omf/gnome-applets/gweather_applet-C.omf
+share/gnome/omf/gnome-applets/gweather-C.omf
+share/gnome/omf/gnome-applets/mixer_applet2-C.omf
share/gnome/pixmaps/battstat.png
share/gnome/pixmaps/charpick.png
share/gnome/pixmaps/drivemount-applet.png
@@ -435,12 +444,27 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/pixmaps/gweather
@dirrm share/gnome/pixmaps/gkb
@dirrm share/gnome/omf/gnome-applets
+@dirrm share/gnome/help/mixer_applet2/C/figures
+@dirrm share/gnome/help/mixer_applet2/C
+@dirrm share/gnome/help/mixer_applet2
+@dirrm share/gnome/help/gweather/C/figures
+@dirrm share/gnome/help/gweather/C
+@dirrm share/gnome/help/gweather
+@dirrm share/gnome/help/gtik2_applet2/C/figures
+@dirrm share/gnome/help/gtik2_applet2/C
+@dirrm share/gnome/help/gtik2_applet2
+@dirrm share/gnome/help/geyes/C/figures
+@dirrm share/gnome/help/geyes/C
+@dirrm share/gnome/help/geyes
@dirrm share/gnome/help/command-line/C/figures
@dirrm share/gnome/help/command-line/C
@dirrm share/gnome/help/command-line
@dirrm share/gnome/help/char-palette/C/figures
@dirrm share/gnome/help/char-palette/C
@dirrm share/gnome/help/char-palette
+@dirrm share/gnome/help/cdplayer/C/figures
+@dirrm share/gnome/help/cdplayer/C
+@dirrm share/gnome/help/cdplayer
@dirrm share/gnome/gweather
@dirrm share/gnome/gkb
@dirrm share/gnome/geyes/Horrid
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index f167d6c7260e..836f0bb3381b 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomedesktop
-PORTVERSION= 1.5.19
+PORTVERSION= 1.5.20
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-desktop-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 45e9c13f6ce5..4794ea4cbf02 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-1.5.19.tar.bz2) = e7cce4ee06d204c9dcc6118cae21e847
+MD5 (gnome2/gnome-desktop-1.5.20.tar.bz2) = 6276d06e37fc5d954ea0b9b1f2107b1c
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index a506e4e8c8d4..e590b8fa56b4 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -114,6 +114,7 @@ share/gnome/pixmaps/gnome-panel-type-sliding.png
share/gnome/pixmaps/gnome-panel.png
share/gnome/pixmaps/gnome-qeye.png
share/gnome/pixmaps/gnome-run.png
+share/gnome/pixmaps/gnome-screenshot.png
share/gnome/pixmaps/gnome-session.png
share/gnome/pixmaps/gnome-set-time.png
share/gnome/pixmaps/gnome-settings.png
@@ -167,12 +168,14 @@ share/locale/fi/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/fr/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ga/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/hi/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 58caf809b294..2000a3db95a5 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -6,17 +6,16 @@
#
PORTNAME= gnomepanel
-PORTVERSION= 1.5.21
-PORTREVISION= 1
+PORTVERSION= 1.5.22
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-panel-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= wnck-1.2:${PORTSDIR}/x11-toolkits/libwnck \
+LIB_DEPENDS= wnck-1.4:${PORTSDIR}/x11-toolkits/libwnck \
gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop
USE_BZIP2= yes
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index d7317b5b99d9..a54fc7b7ae38 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-1.5.21.tar.bz2) = 1de639dcbb3f8f33833e8bd57790d692
+MD5 (gnome2/gnome-panel-1.5.22.tar.bz2) = 74f20921f67fa23bcf6f2bc046653f1e
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index cbcafeee13cf..2c8eefaaf9dc 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -8,8 +8,6 @@ etc/gconf/gconf.xml.defaults/apps/panel/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/panel/global/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/%gconf.xml
@@ -169,6 +167,7 @@ share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo
@@ -250,8 +249,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet
@dirrm etc/gconf/gconf.xml.defaults/apps/panel/global
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 302733eb2cbb..ef8749b4521c 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomesession
PORTVERSION= 1.5.19
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-session-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index ebe585c1272c..9d50cd2ad709 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnometerminal
PORTVERSION= 1.9.6
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-terminal-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index a15e0b692fe3..a1f254d8d71c 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= gnomeapplets2
-PORTVERSION= 1.102.1
-PORTREVISION= 1
+PORTVERSION= 1.103.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-applets-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
index d9acd878c002..a9908b3ef575 100644
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-applets-1.102.1.tar.bz2) = b3352bc38788295e200eedfc3da5dabe
+MD5 (gnome2/gnome-applets-1.103.0.tar.bz2) = 899f2e0dac0df07e1e79317ddd91b85e
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index c69b86c3faa7..48ada08139fa 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -200,6 +200,12 @@ share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml
share/gnome/gweather/Locations
share/gnome/help/cdplayer/C/cdplayer.xml
share/gnome/help/cdplayer/C/figures/cdplayer_applet.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_eject.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_playing.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_playpause.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_prevtrack.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_stop.png
share/gnome/help/cdplayer/C/legal.xml
share/gnome/help/cdplayer/C/topic.dat
share/gnome/help/char-palette/C/char-palette.xml
@@ -218,17 +224,20 @@ share/gnome/help/gtik2_applet2/C/figures/gtik_applet.png
share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml
share/gnome/help/gtik2_applet2/C/legal.xml
share/gnome/help/gweather/C/figures/gweather_applet.png
-share/gnome/help/gweather/C/figures/gweather_settings.png
-share/gnome/help/gweather/C/figures/gweather_weather.png
share/gnome/help/gweather/C/gweather.xml
share/gnome/help/gweather/C/legal.xml
share/gnome/help/gweather/C/topic.dat
-share/gnome/omf/gnome-applets/cdplayer_applet-C.omf
+share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/C/legal.xml
+share/gnome/help/mixer_applet2/C/mixer_applet2.xml
+share/gnome/help/mixer_applet2/C/topic.dat
+share/gnome/omf/gnome-applets/cdplayer-C.omf
share/gnome/omf/gnome-applets/char-palette-C.omf
share/gnome/omf/gnome-applets/command-line-C.omf
share/gnome/omf/gnome-applets/geyes-C.omf
share/gnome/omf/gnome-applets/gtik2_applet2-C.omf
-share/gnome/omf/gnome-applets/gweather_applet-C.omf
+share/gnome/omf/gnome-applets/gweather-C.omf
+share/gnome/omf/gnome-applets/mixer_applet2-C.omf
share/gnome/pixmaps/battstat.png
share/gnome/pixmaps/charpick.png
share/gnome/pixmaps/drivemount-applet.png
@@ -435,12 +444,27 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/pixmaps/gweather
@dirrm share/gnome/pixmaps/gkb
@dirrm share/gnome/omf/gnome-applets
+@dirrm share/gnome/help/mixer_applet2/C/figures
+@dirrm share/gnome/help/mixer_applet2/C
+@dirrm share/gnome/help/mixer_applet2
+@dirrm share/gnome/help/gweather/C/figures
+@dirrm share/gnome/help/gweather/C
+@dirrm share/gnome/help/gweather
+@dirrm share/gnome/help/gtik2_applet2/C/figures
+@dirrm share/gnome/help/gtik2_applet2/C
+@dirrm share/gnome/help/gtik2_applet2
+@dirrm share/gnome/help/geyes/C/figures
+@dirrm share/gnome/help/geyes/C
+@dirrm share/gnome/help/geyes
@dirrm share/gnome/help/command-line/C/figures
@dirrm share/gnome/help/command-line/C
@dirrm share/gnome/help/command-line
@dirrm share/gnome/help/char-palette/C/figures
@dirrm share/gnome/help/char-palette/C
@dirrm share/gnome/help/char-palette
+@dirrm share/gnome/help/cdplayer/C/figures
+@dirrm share/gnome/help/cdplayer/C
+@dirrm share/gnome/help/cdplayer
@dirrm share/gnome/gweather
@dirrm share/gnome/gkb
@dirrm share/gnome/geyes/Horrid
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index f167d6c7260e..836f0bb3381b 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomedesktop
-PORTVERSION= 1.5.19
+PORTVERSION= 1.5.20
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-desktop-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo
index 45e9c13f6ce5..4794ea4cbf02 100644
--- a/x11/gnomedesktop/distinfo
+++ b/x11/gnomedesktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-1.5.19.tar.bz2) = e7cce4ee06d204c9dcc6118cae21e847
+MD5 (gnome2/gnome-desktop-1.5.20.tar.bz2) = 6276d06e37fc5d954ea0b9b1f2107b1c
diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist
index a506e4e8c8d4..e590b8fa56b4 100644
--- a/x11/gnomedesktop/pkg-plist
+++ b/x11/gnomedesktop/pkg-plist
@@ -114,6 +114,7 @@ share/gnome/pixmaps/gnome-panel-type-sliding.png
share/gnome/pixmaps/gnome-panel.png
share/gnome/pixmaps/gnome-qeye.png
share/gnome/pixmaps/gnome-run.png
+share/gnome/pixmaps/gnome-screenshot.png
share/gnome/pixmaps/gnome-session.png
share/gnome/pixmaps/gnome-set-time.png
share/gnome/pixmaps/gnome-settings.png
@@ -167,12 +168,14 @@ share/locale/fi/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/fr/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ga/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/hi/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index 58caf809b294..2000a3db95a5 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -6,17 +6,16 @@
#
PORTNAME= gnomepanel
-PORTVERSION= 1.5.21
-PORTREVISION= 1
+PORTVERSION= 1.5.22
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-panel-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= wnck-1.2:${PORTSDIR}/x11-toolkits/libwnck \
+LIB_DEPENDS= wnck-1.4:${PORTSDIR}/x11-toolkits/libwnck \
gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop
USE_BZIP2= yes
diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo
index d7317b5b99d9..a54fc7b7ae38 100644
--- a/x11/gnomepanel/distinfo
+++ b/x11/gnomepanel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-1.5.21.tar.bz2) = 1de639dcbb3f8f33833e8bd57790d692
+MD5 (gnome2/gnome-panel-1.5.22.tar.bz2) = 74f20921f67fa23bcf6f2bc046653f1e
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index cbcafeee13cf..2c8eefaaf9dc 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -8,8 +8,6 @@ etc/gconf/gconf.xml.defaults/apps/panel/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/panel/global/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/%gconf.xml
@@ -169,6 +167,7 @@ share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo
@@ -250,8 +249,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet
@dirrm etc/gconf/gconf.xml.defaults/apps/panel/global
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index 302733eb2cbb..ef8749b4521c 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomesession
PORTVERSION= 1.5.19
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-session-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index ebe585c1272c..9d50cd2ad709 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnometerminal
PORTVERSION= 1.9.6
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME= gnome-terminal-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index ea2ee34daa62..c82d2bf4216c 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= libgnome
-PORTVERSION= 1.117.0
-PORTREVISION= 2
+PORTVERSION= 1.117.1
CATEGORIES?= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER?= gnome@FreeBSD.org
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index 8c24d34981b4..8b21e2b0e9f0 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnome-1.117.0.tar.bz2) = 154158d266dbc2f18b76157191e3750e
+MD5 (gnome2/libgnome-1.117.1.tar.bz2) = 665b6c80370b4ecf1737db59a8582ea8
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index d91a7e6ea3d4..e0345d2ccc86 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -7,7 +7,6 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/keyboard/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/applications/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/applications/browser/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/applications/editor/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/applications/help_viewer/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/applications/window_manager/%gconf.xml
@@ -19,9 +18,7 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/sound/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ftp/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/unknown/%gconf.xml
@@ -31,7 +28,6 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/keyboard/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/browser/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/editor/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/help_viewer/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/window_manager/%gconf.xml
@@ -43,15 +39,12 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/%gconf.x
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ftp/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/unknown/%gconf.xml
etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas
etc/gconf/schemas/desktop_gnome_applications_browser.schemas
-etc/gconf/schemas/desktop_gnome_applications_editor.schemas
etc/gconf/schemas/desktop_gnome_applications_help_viewer.schemas
etc/gconf/schemas/desktop_gnome_applications_terminal.schemas
etc/gconf/schemas/desktop_gnome_applications_window_manager.schemas
@@ -127,9 +120,7 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/unknown
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ftp
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse
@@ -141,7 +132,6 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/window_manager
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/help_viewer
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/editor
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/browser
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/keyboard
@@ -151,9 +141,7 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/unknown
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ftp
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/sound
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse
@@ -165,7 +153,6 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/window_manager
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/help_viewer
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/editor
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/browser
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/keyboard
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 112d0139068b..dbc7e2606889 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= yelp
-PORTVERSION= 0.7
-PORTREVISION= 1
+PORTVERSION= 0.8
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index ab45419dc8a7..c0b7f04dddc8 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1 +1 @@
-MD5 (gnome2/yelp-0.7.tar.bz2) = 7394c5ab597a3a4188c96e5720600381
+MD5 (gnome2/yelp-0.8.tar.bz2) = 0590082e2d0ecf1da3bef4019cb08130
diff --git a/x11/yelp/files/patch-configure b/x11/yelp/files/patch-configure
index 16961b59b62f..a6e8fbc286f0 100644
--- a/x11/yelp/files/patch-configure
+++ b/x11/yelp/files/patch-configure
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig Mon May 20 15:11:25 2002
-+++ configure Mon May 20 15:12:24 2002
-@@ -7374,6 +7374,7 @@
+--- configure.orig Tue May 28 02:02:29 2002
++++ configure Tue May 28 02:03:10 2002
+@@ -7381,6 +7381,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,12 +8,12 @@ $FreeBSD$
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9978,7 +9979,7 @@
+@@ -9979,7 +9980,7 @@
- YELP_MODULES="libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0"
+ YELP_MODULES="gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0"
--YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| sed -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//'`"
+-YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| sed -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//'`"
+YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| xargs -n1 echo -n ' -I '`"
- echo "$as_me:9983: checking for bzread in -lbz2" >&5
+ echo "$as_me:9984: checking for bzread in -lbz2" >&5
echo $ECHO_N "checking for bzread in -lbz2... $ECHO_C" >&6
diff --git a/x11/yelp/files/patch-src_yelp-info.c b/x11/yelp/files/patch-src_yelp-info.c
deleted file mode 100644
index 6013c2faf2af..000000000000
--- a/x11/yelp/files/patch-src_yelp-info.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/yelp-info.c.orig Mon May 20 17:53:50 2002
-+++ src/yelp-info.c Mon May 20 17:54:27 2002
-@@ -105,7 +105,6 @@
- struct stat stat_dir2;
- GSList *info_list = NULL;
- GSList *node;
-- YelpSection *section;
- gchar **infopathes;
- gchar *infopath;
- gint i;
-@@ -141,7 +140,7 @@
-
- for (node = info_list; node; node = node->next) {
- g_node_append_data (root, node->data);
-- *index = g_list_prepend (*index, section);
-+ *index = g_list_prepend (*index, node->data);
- }
-
- g_slist_free (info_list);
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index 104aefe92305..ff8a8894291d 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -2,6 +2,9 @@ bin/gnome-help
bin/yelp
libdata/bonobo/servers/GNOME_Yelp.server
share/gnome/applications/yelp.desktop
+share/gnome/images/yelp/bcg.png
+share/gnome/images/yelp/empty.png
+share/gnome/images/yelp/gnome2-button.png
share/gnome/sgml/docbook/yelp/l10n.xml
share/gnome/sgml/docbook/yelp/yelp-custom.xsl
share/gnome/sgml/docbook/yelp/yelp-customization.xsl
@@ -37,3 +40,4 @@ share/locale/zh_CN/LC_MESSAGES/yelp.mo
share/locale/zh_TW/LC_MESSAGES/yelp.mo
@dirrm share/gnome/yelp
@dirrm share/gnome/sgml/docbook/yelp
+@dirrm share/gnome/images/yelp