Date: 28 May 2002 02:31:31 -0400 From: Joe Marcus Clarke <marcus@FreeBSD.org> To: gnome@FreeBSD.org Subject: Uber patch for latest GNOME 2 snapshot Message-ID: <1022567491.278.15.camel@gyros.marcuscom.com>
next in thread | raw e-mail | index | archive | help
--=-2uW3o8WR++PnYDKcY3F7
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Here is a patch to bring FreeBSD's GNOME 2 components up to the
20020525, "Stay on target!" snapshot.
I have tested to make sure all help documents show up, the
dark-gnome.jpg missing file error is no longer thrown, sawfish correctly
restores saved settings, and nautilus no longer SIGABRTs on exit.
(Sorry, Franz, I wasn't able to test your issue yet).
Unless anyone sees any glaring errors, I'll commit this later today.
It's too late for me to touch CVS now ;-).
Joe
--=-2uW3o8WR++PnYDKcY3F7
Content-Disposition: attachment; filename=gnome2.diff
Content-Transfer-Encoding: quoted-printable
Content-Type: text/x-patch; name=gnome2.diff; charset=ISO8859-1
diff -ruN ORBit2.orig/Makefile ORBit2/Makefile
--- devel/ORBit2.orig/Makefile Mon May 27 13:50:45 2002
+++ devel/ORBit2/Makefile Mon May 27 13:45:01 2002
@@ -6,10 +6,10 @@
#
=20
PORTNAME=3D ORBit2
-PORTVERSION=3D 2.3.109
+PORTVERSION=3D 2.3.110
CATEGORIES=3D devel gnome
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR=3D gnome2
=20
MAINTAINER=3D gnome@FreeBSD.org
diff -ruN ORBit2.orig/distinfo ORBit2/distinfo
--- devel/ORBit2.orig/distinfo Mon May 27 13:50:45 2002
+++ devel/ORBit2/distinfo Mon May 27 13:45:06 2002
@@ -1 +1 @@
-MD5 (gnome2/ORBit2-2.3.109.tar.bz2) =3D e18fb3dce4b87a075f119631e692ee93
+MD5 (gnome2/ORBit2-2.3.110.tar.bz2) =3D 302dfd638348b950272aef8038f6d9b6
diff -ruN bonobo-activation.orig/Makefile bonobo-activation/Makefile
--- devel/bonobo-activation.orig/Makefile Mon May 27 13:43:36 2002
+++ devel/bonobo-activation/Makefile Mon May 27 13:34:31 2002
@@ -6,11 +6,10 @@
#
=20
PORTNAME=3D bonobo-activation
-PORTVERSION=3D 0.9.8
-PORTREVISION=3D 1
+PORTVERSION=3D 0.9.9
CATEGORIES=3D devel
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR=3D gnome2
=20
MAINTAINER=3D gnome@FreeBSD.org
diff -ruN bonobo-activation.orig/distinfo bonobo-activation/distinfo
--- devel/bonobo-activation.orig/distinfo Mon May 27 13:43:36 2002
+++ devel/bonobo-activation/distinfo Mon May 27 13:34:37 2002
@@ -1 +1 @@
-MD5 (gnome2/bonobo-activation-0.9.8.tar.bz2) =3D bb38e37eddfcc5ef3cd8bbc32=
ce1fd02
+MD5 (gnome2/bonobo-activation-0.9.9.tar.bz2) =3D 088decd1510740ff16b2e5e69=
40e4a18
diff -ruN bonobo-activation.orig/files/patch-server::activation-server-main=
.c bonobo-activation/files/patch-server::activation-server-main.c
--- devel/bonobo-activation.orig/files/patch-server::activation-server-main=
.c Mon May 27 13:43:36 2002
+++ devel/bonobo-activation/files/patch-server::activation-server-main.c Mo=
n May 27 13:37:20 2002
@@ -1,14 +1,14 @@
=20
-$FreeBSD: ports/devel/bonobo-activation/files/patch-server::activation-ser=
ver-main.c,v 1.1 2002/02/13 18:02:20 sobomax Exp $
+$FreeBSD$
=20
---- 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 -ruN bonobo-activation.orig/pkg-plist bonobo-activation/pkg-plist
--- devel/bonobo-activation.orig/pkg-plist Mon May 27 13:43:36 2002
+++ devel/bonobo-activation/pkg-plist Mon May 27 13:40:56 2002
@@ -26,6 +26,38 @@
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/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 -ruN eel2.orig/Makefile eel2/Makefile
--- x11-toolkits/eel2.orig/Makefile Mon May 27 23:53:43 2002
+++ x11-toolkits/eel2/Makefile Mon May 27 23:42:17 2002
@@ -6,10 +6,10 @@
#
=20
PORTNAME=3D eel2
-PORTVERSION=3D 1.1.14
+PORTVERSION=3D 1.1.15
CATEGORIES=3D x11-toolkits gnome
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR=3D gnome2
DISTNAME=3D eel-${PORTVERSION}
=20
diff -ruN eel2.orig/distinfo eel2/distinfo
--- x11-toolkits/eel2.orig/distinfo Mon May 27 23:53:43 2002
+++ x11-toolkits/eel2/distinfo Mon May 27 23:42:23 2002
@@ -1 +1 @@
-MD5 (gnome2/eel-1.1.14.tar.bz2) =3D 67f9dfbe4fd24ab6d97e2b237701ba58
+MD5 (gnome2/eel-1.1.15.tar.bz2) =3D f9136c5b1bf500af3336e0557a2fdb2a
diff -ruN eel2.orig/pkg-plist eel2/pkg-plist
--- x11-toolkits/eel2.orig/pkg-plist Mon May 27 23:53:43 2002
+++ x11-toolkits/eel2/pkg-plist Mon May 27 23:48:10 2002
@@ -72,6 +72,7 @@
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 -ruN eog2.orig/Makefile eog2/Makefile
--- graphics/eog2.orig/Makefile Tue May 28 00:02:44 2002
+++ graphics/eog2/Makefile Tue May 28 00:00:07 2002
@@ -6,10 +6,10 @@
#
=20
PORTNAME=3D eog2
-PORTVERSION=3D 0.117.0
+PORTVERSION=3D 0.118.0
CATEGORIES=3D graphics gnome
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME=3D eog-${PORTVERSION}
DIST_SUBDIR=3D gnome2
=20
diff -ruN eog2.orig/distinfo eog2/distinfo
--- graphics/eog2.orig/distinfo Tue May 28 00:02:44 2002
+++ graphics/eog2/distinfo Mon May 27 23:56:38 2002
@@ -1 +1 @@
-MD5 (gnome2/eog-0.117.0.tar.bz2) =3D c2ba1375e542eee624209d9c029a3da6
+MD5 (gnome2/eog-0.118.0.tar.bz2) =3D fae0e84698a995d835710b77b0240222
diff -ruN eog2.orig/pkg-plist eog2/pkg-plist
--- graphics/eog2.orig/pkg-plist Tue May 28 00:02:44 2002
+++ graphics/eog2/pkg-plist Mon May 27 23:59:53 2002
@@ -56,6 +56,8 @@
share/locale/ta/LC_MESSAGES/eog.mo
share/locale/tr/LC_MESSAGES/eog.mo
share/locale/uk/LC_MESSAGES/eog.mo
+share/locale/vi/LC_MESSAGES/eog.mo
+share/locale/wa/LC_MESSAGES/eog.mo
share/locale/zh_CN/LC_MESSAGES/eog.mo
share/locale/zh_TW/LC_MESSAGES/eog.mo
@dirrm share/gnome/pixmaps/eog
diff -ruN gconf-editor.orig/Makefile gconf-editor/Makefile
--- sysutils/gconf-editor.orig/Makefile Tue May 28 00:09:56 2002
+++ sysutils/gconf-editor/Makefile Tue May 28 00:04:44 2002
@@ -6,10 +6,10 @@
#
=20
PORTNAME=3D gconf-editor
-PORTVERSION=3D 0.1
+PORTVERSION=3D 0.2
CATEGORIES=3D sysutils gnome
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR=3D gnome2
=20
MAINTAINER=3D gnome@FreeBSD.org
diff -ruN gconf-editor.orig/distinfo gconf-editor/distinfo
--- sysutils/gconf-editor.orig/distinfo Tue May 28 00:09:56 2002
+++ sysutils/gconf-editor/distinfo Tue May 28 00:04:55 2002
@@ -1 +1 @@
-MD5 (gnome2/gconf-editor-0.1.tar.bz2) =3D 1db6f1a8a585272056b4eb57c20809dd
+MD5 (gnome2/gconf-editor-0.2.tar.bz2) =3D 5d2453640f1cdafdd108176c3376f879
diff -ruN gconf-editor.orig/pkg-plist gconf-editor/pkg-plist
--- sysutils/gconf-editor.orig/pkg-plist Tue May 28 00:09:56 2002
+++ sysutils/gconf-editor/pkg-plist Tue May 28 00:06:54 2002
@@ -12,7 +12,27 @@
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 -ruN gedit2.orig/Makefile gedit2/Makefile
--- editors/gedit2.orig/Makefile Tue May 28 00:38:58 2002
+++ editors/gedit2/Makefile Tue May 28 00:39:35 2002
@@ -6,10 +6,10 @@
#
=20
PORTNAME=3D gedit2
-PORTVERSION=3D 1.119.0
+PORTVERSION=3D 1.120.0
CATEGORIES=3D editors gnome
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR=3D gnome2
=20
MAINTAINER=3D gnome@FreeBSD.org
diff -ruN gedit2.orig/distinfo gedit2/distinfo
--- editors/gedit2.orig/distinfo Tue May 28 00:38:58 2002
+++ editors/gedit2/distinfo Tue May 28 00:12:08 2002
@@ -1 +1 @@
-MD5 (gnome2/gedit2-1.119.0.tar.bz2) =3D f43637331c04264a3980766758baa6c9
+MD5 (gnome2/gedit2-1.120.0.tar.bz2) =3D 7ddec48fcbaf0763764d8b7219db1bbf
diff -ruN gnomeapplets2.orig/Makefile gnomeapplets2/Makefile
--- x11/gnomeapplets2.orig/Makefile Mon May 27 23:14:11 2002
+++ x11/gnomeapplets2/Makefile Mon May 27 23:06:02 2002
@@ -6,11 +6,10 @@
#
=20
PORTNAME=3D gnomeapplets2
-PORTVERSION=3D 1.102.1
-PORTREVISION=3D 1
+PORTVERSION=3D 1.103.0
CATEGORIES=3D x11 gnome
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME=3D gnome-applets-${PORTVERSION}
DIST_SUBDIR=3D gnome2
=20
diff -ruN gnomeapplets2.orig/distinfo gnomeapplets2/distinfo
--- x11/gnomeapplets2.orig/distinfo Mon May 27 23:14:11 2002
+++ x11/gnomeapplets2/distinfo Mon May 27 22:47:06 2002
@@ -1 +1 @@
-MD5 (gnome2/gnome-applets-1.102.1.tar.bz2) =3D b3352bc38788295e200eedfc3da=
5dabe
+MD5 (gnome2/gnome-applets-1.103.0.tar.bz2) =3D 899f2e0dac0df07e1e79317ddd9=
1b85e
diff -ruN gnomeapplets2.orig/pkg-plist gnomeapplets2/pkg-plist
--- x11/gnomeapplets2.orig/pkg-plist Mon May 27 23:14:11 2002
+++ x11/gnomeapplets2/pkg-plist Mon May 27 23:04:47 2002
@@ -200,6 +200,12 @@
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/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 @@
@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 -ruN gnomedesktop.orig/Makefile gnomedesktop/Makefile
--- x11/gnomedesktop.orig/Makefile Mon May 27 15:31:17 2002
+++ x11/gnomedesktop/Makefile Mon May 27 15:25:46 2002
@@ -6,10 +6,10 @@
#
=20
PORTNAME=3D gnomedesktop
-PORTVERSION=3D 1.5.19
+PORTVERSION=3D 1.5.20
CATEGORIES=3D x11 gnome
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME=3D gnome-desktop-${PORTVERSION}
DIST_SUBDIR=3D gnome2
=20
diff -ruN gnomedesktop.orig/distinfo gnomedesktop/distinfo
--- x11/gnomedesktop.orig/distinfo Mon May 27 15:31:17 2002
+++ x11/gnomedesktop/distinfo Mon May 27 15:26:07 2002
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-1.5.19.tar.bz2) =3D e7cce4ee06d204c9dcc6118cae21=
e847
+MD5 (gnome2/gnome-desktop-1.5.20.tar.bz2) =3D 6276d06e37fc5d954ea0b9b1f210=
7b1c
diff -ruN gnomedesktop.orig/pkg-plist gnomedesktop/pkg-plist
--- x11/gnomedesktop.orig/pkg-plist Mon May 27 15:31:17 2002
+++ x11/gnomedesktop/pkg-plist Mon May 27 15:28:29 2002
@@ -114,6 +114,7 @@
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/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 -ruN gnomepanel.orig/Makefile gnomepanel/Makefile
--- x11/gnomepanel.orig/Makefile Mon May 27 15:45:35 2002
+++ x11/gnomepanel/Makefile Mon May 27 15:40:01 2002
@@ -6,17 +6,16 @@
#
=20
PORTNAME=3D gnomepanel
-PORTVERSION=3D 1.5.21
-PORTREVISION=3D 1
+PORTVERSION=3D 1.5.22
CATEGORIES=3D x11 gnome
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME=3D gnome-panel-${PORTVERSION}
DIST_SUBDIR=3D gnome2
=20
MAINTAINER=3D gnome@FreeBSD.org
=20
-LIB_DEPENDS=3D wnck-1.2:${PORTSDIR}/x11-toolkits/libwnck \
+LIB_DEPENDS=3D wnck-1.4:${PORTSDIR}/x11-toolkits/libwnck \
gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop
=20
USE_BZIP2=3D yes
diff -ruN gnomepanel.orig/distinfo gnomepanel/distinfo
--- x11/gnomepanel.orig/distinfo Mon May 27 15:45:35 2002
+++ x11/gnomepanel/distinfo Mon May 27 15:32:54 2002
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-1.5.21.tar.bz2) =3D 1de639dcbb3f8f33833e8bd57790d6=
92
+MD5 (gnome2/gnome-panel-1.5.22.tar.bz2) =3D 74f20921f67fa23bcf6f2bc046653f=
1e
diff -ruN gnomepanel.orig/pkg-plist gnomepanel/pkg-plist
--- x11/gnomepanel.orig/pkg-plist Mon May 27 15:45:35 2002
+++ x11/gnomepanel/pkg-plist Mon May 27 15:38:57 2002
@@ -8,8 +8,6 @@
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.xm=
l
etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/%gconf.xml
@@ -169,6 +167,7 @@
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 @@
@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 -ruN gnomesystemmonitor.orig/Makefile gnomesystemmonitor/Makefile
--- sysutils/gnomesystemmonitor.orig/Makefile Mon May 27 23:40:16 2002
+++ sysutils/gnomesystemmonitor/Makefile Mon May 27 23:35:43 2002
@@ -6,10 +6,10 @@
#
=20
PORTNAME=3D gnomesystemmonitor
-PORTVERSION=3D 1.1.6
+PORTVERSION=3D 1.1.7
CATEGORIES=3D sysutils gnome
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020501
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME=3D gnome-system-monitor-${PORTVERSION}
DIST_SUBDIR=3D gnome2
=20
@@ -17,7 +17,7 @@
=20
LIB_DEPENDS=3D 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
=20
USE_BZIP2=3D yes
USE_X_PREFIX=3D yes
diff -ruN gnomesystemmonitor.orig/distinfo gnomesystemmonitor/distinfo
--- sysutils/gnomesystemmonitor.orig/distinfo Mon May 27 23:40:16 2002
+++ sysutils/gnomesystemmonitor/distinfo Mon May 27 23:26:50 2002
@@ -1 +1 @@
-MD5 (gnome2/gnome-system-monitor-1.1.6.tar.bz2) =3D e3ae3f26951d4863e30356=
46f4187459
+MD5 (gnome2/gnome-system-monitor-1.1.7.tar.bz2) =3D 6573093ff335e7e2f0b140=
e854110299
diff -ruN gnomesystemmonitor.orig/pkg-plist gnomesystemmonitor/pkg-plist
--- sysutils/gnomesystemmonitor.orig/pkg-plist Mon May 27 23:40:16 2002
+++ sysutils/gnomesystemmonitor/pkg-plist Mon May 27 23:34:14 2002
@@ -9,46 +9,52 @@
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 -ruN gnomeutils2.orig/Makefile gnomeutils2/Makefile
--- misc/gnomeutils2.orig/Makefile Mon May 27 23:24:21 2002
+++ misc/gnomeutils2/Makefile Mon May 27 23:21:19 2002
@@ -6,11 +6,11 @@
#
=20
PORTNAME=3D gnomeutils2
-PORTVERSION=3D 1.105.0
+PORTVERSION=3D 1.106.0
PORTEPOCH=3D 1
CATEGORIES=3D misc gnome
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME=3D gnome-utils-${PORTVERSION}
DIST_SUBDIR=3D gnome2
=20
diff -ruN gnomeutils2.orig/distinfo gnomeutils2/distinfo
--- misc/gnomeutils2.orig/distinfo Mon May 27 23:24:21 2002
+++ misc/gnomeutils2/distinfo Mon May 27 23:17:31 2002
@@ -1 +1 @@
-MD5 (gnome2/gnome-utils-1.105.0.tar.bz2) =3D 401bda405425ec429608e55ee4ad2=
b46
+MD5 (gnome2/gnome-utils-1.106.0.tar.bz2) =3D d119a8d4f75ff0fdc51cb09e26e00=
164
diff -ruN gnomevfs2.orig/Makefile gnomevfs2/Makefile
--- devel/gnomevfs2.orig/Makefile Mon May 27 14:26:41 2002
+++ devel/gnomevfs2/Makefile Mon May 27 14:23:14 2002
@@ -6,10 +6,10 @@
#
=20
PORTNAME=3D gnomevfs2
-PORTVERSION=3D 1.9.15
+PORTVERSION=3D 1.9.16
CATEGORIES=3D devel gnome
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME=3D gnome-vfs-${PORTVERSION}
DIST_SUBDIR=3D gnome2
=20
diff -ruN gnomevfs2.orig/distinfo gnomevfs2/distinfo
--- devel/gnomevfs2.orig/distinfo Mon May 27 14:26:41 2002
+++ devel/gnomevfs2/distinfo Mon May 27 13:55:36 2002
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-1.9.15.tar.bz2) =3D b4897314329a7d59b1e774c55af84118
+MD5 (gnome2/gnome-vfs-1.9.16.tar.bz2) =3D 161ccd037041ae92fd742ac4705b4bb6
diff -ruN gnomevfs2.orig/files/patch-aa gnomevfs2/files/patch-aa
--- devel/gnomevfs2.orig/files/patch-aa Mon May 27 14:26:41 2002
+++ devel/gnomevfs2/files/patch-aa Mon May 27 14:04:23 2002
@@ -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 @@
=20
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS=3D"$ac_aux_dir/ltmain.sh"
@@ -8,18 +8,18 @@
=20
# Always use our own libtool.
LIBTOOL=3D'$(SHELL) $(top_builddir)/libtool'
-@@ -11987,8 +11988,8 @@
+@@ -12140,8 +12141,8 @@
done
fi
=20
--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}" =3D 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
=20
- LDFLAGS=3D"$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
+ LDFLAGS=3D"$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 @@
=20
msg_openssl=3D"yes"
if test x$with_openssl_libs !=3D x/usr/lib; then
@@ -54,7 +54,7 @@
fi
=20
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 -ruN gnomevfs2.orig/files/patch-ab gnomevfs2/files/patch-ab
--- devel/gnomevfs2.orig/files/patch-ab Mon May 27 14:26:41 2002
+++ devel/gnomevfs2/files/patch-ab Mon May 27 13:59:32 2002
@@ -1,14 +1,11 @@
-
-$FreeBSD: ports/devel/gnomevfs2/files/patch-ab,v 1.9 2002/02/16 17:36:46 s=
obomax Exp $
-
---- 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 @@
=20
- SUBDIRS_GNOME =3D monikers doc
+ SUBDIRS_GNOME =3D monikers doc schemas
=20
--SUBDIRS =3D libgnomevfs modules devel-docs doc test =
monikers po
-+SUBDIRS =3D libgnomevfs modules devel-docs doc monike=
rs po
+-SUBDIRS =3D libgnomevfs modules schemas devel-docs do=
c test monikers po
++SUBDIRS =3D libgnomevfs modules schemas devel-docs do=
c monikers po
=20
=20
EXTRA_DIST =3D 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 -ruN gnomevfs2.orig/pkg-plist gnomevfs2/pkg-plist
--- devel/gnomevfs2.orig/pkg-plist Mon May 27 14:26:41 2002
+++ devel/gnomevfs2/pkg-plist Mon May 27 14:22:32 2002
@@ -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/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/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 @@
@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 -ruN libbonobo.orig/Makefile libbonobo/Makefile
--- devel/libbonobo.orig/Makefile Mon May 27 14:35:46 2002
+++ devel/libbonobo/Makefile Mon May 27 14:28:11 2002
@@ -6,10 +6,10 @@
#
=20
PORTNAME=3D libbonobo
-PORTVERSION=3D 1.116.0
+PORTVERSION=3D 1.117.0
CATEGORIES=3D devel
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR=3D gnome2
=20
MAINTAINER=3D gnome@FreeBSD.org
diff -ruN libbonobo.orig/distinfo libbonobo/distinfo
--- devel/libbonobo.orig/distinfo Mon May 27 14:35:46 2002
+++ devel/libbonobo/distinfo Mon May 27 14:28:18 2002
@@ -1 +1 @@
-MD5 (gnome2/libbonobo-1.116.0.tar.bz2) =3D a4c5c79d6997c3073806d602930a0a5=
d
+MD5 (gnome2/libbonobo-1.117.0.tar.bz2) =3D e3ecc01f2f250b3143f0dee600f42e8=
0
diff -ruN libbonobo.orig/pkg-plist libbonobo/pkg-plist
--- devel/libbonobo.orig/pkg-plist Mon May 27 14:35:46 2002
+++ devel/libbonobo/pkg-plist Mon May 27 14:32:12 2002
@@ -40,6 +40,43 @@
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/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 -ruN libbonoboui.orig/Makefile libbonoboui/Makefile
--- x11-toolkits/libbonoboui.orig/Makefile Mon May 27 15:02:12 2002
+++ x11-toolkits/libbonoboui/Makefile Mon May 27 14:50:24 2002
@@ -6,10 +6,10 @@
#
=20
PORTNAME=3D libbonoboui
-PORTVERSION=3D 1.116.0
+PORTVERSION=3D 1.117.0
CATEGORIES=3D x11-toolkits gnome
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR=3D gnome2
=20
MAINTAINER=3D gnome@FreeBSD.org
diff -ruN libbonoboui.orig/distinfo libbonoboui/distinfo
--- x11-toolkits/libbonoboui.orig/distinfo Mon May 27 15:02:12 2002
+++ x11-toolkits/libbonoboui/distinfo Mon May 27 14:50:33 2002
@@ -1 +1 @@
-MD5 (gnome2/libbonoboui-1.116.0.tar.bz2) =3D db9796cb3ed29f189a86f72105746=
c57
+MD5 (gnome2/libbonoboui-1.117.0.tar.bz2) =3D 291b7ff71a5c7b6e2a8dc022eaa96=
5a4
diff -ruN libbonoboui.orig/pkg-plist libbonoboui/pkg-plist
--- x11-toolkits/libbonoboui.orig/pkg-plist Mon May 27 15:02:12 2002
+++ x11-toolkits/libbonoboui/pkg-plist Mon May 27 14:56:18 2002
@@ -63,6 +63,7 @@
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 -ruN libgnome.orig/Makefile libgnome/Makefile
--- x11/libgnome.orig/Makefile Mon May 27 14:49:23 2002
+++ x11/libgnome/Makefile Mon May 27 14:45:37 2002
@@ -6,11 +6,10 @@
#
=20
PORTNAME=3D libgnome
-PORTVERSION=3D 1.117.0
-PORTREVISION=3D 2
+PORTVERSION=3D 1.117.1
CATEGORIES?=3D x11 gnome
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR=3D gnome2
=20
MAINTAINER?=3D gnome@FreeBSD.org
diff -ruN libgnome.orig/distinfo libgnome/distinfo
--- x11/libgnome.orig/distinfo Mon May 27 14:49:23 2002
+++ x11/libgnome/distinfo Mon May 27 14:37:47 2002
@@ -1 +1 @@
-MD5 (gnome2/libgnome-1.117.0.tar.bz2) =3D 154158d266dbc2f18b76157191e3750e
+MD5 (gnome2/libgnome-1.117.1.tar.bz2) =3D 665b6c80370b4ecf1737db59a8582ea8
diff -ruN libgnome.orig/pkg-plist libgnome/pkg-plist
--- x11/libgnome.orig/pkg-plist Mon May 27 14:49:23 2002
+++ x11/libgnome/pkg-plist Mon May 27 14:44:43 2002
@@ -7,7 +7,6 @@
etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/keyboard/%gconf.x=
ml
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.xm=
l
etc/gconf/gconf.xml.defaults/desktop/gnome/applications/window_manager/%gc=
onf.xml
@@ -19,9 +18,7 @@
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/keyboard/=
%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/browser/%g=
conf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/editor/%gc=
onf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/help_viewe=
r/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal/%=
gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/window_man=
ager/%gconf.xml
@@ -43,15 +39,12 @@
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse/%gcon=
f.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/%gco=
nf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http/%gcon=
f.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info/%gcon=
f.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/%g=
conf.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 @@
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/unk=
nown
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/inf=
o
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/htt=
p
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghe=
lp
-@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/mous=
e
@@ -141,7 +132,6 @@
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/win=
dow_manager
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/ter=
minal
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/hel=
p_viewer
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/edi=
tor
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/bro=
wser
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/ke=
yboard
@@ -151,9 +141,7 @@
@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 @@
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/window_mana=
ger
@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 -ruN libgnomeui.orig/Makefile libgnomeui/Makefile
--- x11-toolkits/libgnomeui.orig/Makefile Mon May 27 15:17:13 2002
+++ x11-toolkits/libgnomeui/Makefile Mon May 27 15:03:26 2002
@@ -6,10 +6,10 @@
#
=20
PORTNAME=3D libgnomeui
-PORTVERSION=3D 1.117.0
+PORTVERSION=3D 1.117.1
CATEGORIES=3D x11-toolkits gnome
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR=3D gnome2
=20
MAINTAINER=3D gnome@FreeBSD.org
diff -ruN libgnomeui.orig/distinfo libgnomeui/distinfo
--- x11-toolkits/libgnomeui.orig/distinfo Mon May 27 15:17:13 2002
+++ x11-toolkits/libgnomeui/distinfo Mon May 27 15:03:50 2002
@@ -1 +1 @@
-MD5 (gnome2/libgnomeui-1.117.0.tar.bz2) =3D 73d78f8a28c04d53fd2662dfde4dcc=
c4
+MD5 (gnome2/libgnomeui-1.117.1.tar.bz2) =3D db23a8f8c7ede92c057a94eea40981=
fa
diff -ruN librep2.orig/Makefile librep2/Makefile
--- lang/librep2.orig/Makefile Tue May 28 00:53:02 2002
+++ lang/librep2/Makefile Tue May 28 00:40:59 2002
@@ -6,11 +6,10 @@
#
=20
PORTNAME=3D librep2
-PORTVERSION=3D 2002.05.02
-PORTREVISION=3D 1
+PORTVERSION=3D 2002.05.24
CATEGORIES=3D lang gnome
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME=3D librep-${PORTVERSION:S/./-/g}
DIST_SUBDIR=3D gnome2
=20
diff -ruN librep2.orig/distinfo librep2/distinfo
--- lang/librep2.orig/distinfo Tue May 28 00:53:02 2002
+++ lang/librep2/distinfo Tue May 28 00:41:29 2002
@@ -1 +1 @@
-MD5 (gnome2/librep-2002-05-02.tar.bz2) =3D 6ed777d23f73b2b1770d72d31c3fbe2=
a
+MD5 (gnome2/librep-2002-05-24.tar.bz2) =3D fb602ca56b34331ecca60e894ced4d4=
2
diff -ruN libwnck.orig/Makefile libwnck/Makefile
--- x11-toolkits/libwnck.orig/Makefile Mon May 27 15:24:26 2002
+++ x11-toolkits/libwnck/Makefile Mon May 27 15:18:29 2002
@@ -6,10 +6,10 @@
#
=20
PORTNAME=3D libwnck
-PORTVERSION=3D 0.10
+PORTVERSION=3D 0.12
CATEGORIES=3D x11-toolkits gnome
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR=3D gnome2
=20
MAINTAINER=3D gnome@FreeBSD.org
diff -ruN libwnck.orig/distinfo libwnck/distinfo
--- x11-toolkits/libwnck.orig/distinfo Mon May 27 15:24:26 2002
+++ x11-toolkits/libwnck/distinfo Mon May 27 15:18:34 2002
@@ -1 +1 @@
-MD5 (gnome2/libwnck-0.10.tar.bz2) =3D 807eb95515bbefae96142b69ae1b0c20
+MD5 (gnome2/libwnck-0.12.tar.bz2) =3D 262dc0cdb49df6a2a7838834b7842276
diff -ruN libwnck.orig/pkg-plist libwnck/pkg-plist
--- x11-toolkits/libwnck.orig/pkg-plist Mon May 27 15:24:26 2002
+++ x11-toolkits/libwnck/pkg-plist Mon May 27 15:20:27 2002
@@ -11,7 +11,7 @@
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 -ruN linc.orig/Makefile linc/Makefile
--- net/linc.orig/Makefile Mon May 27 13:53:06 2002
+++ net/linc/Makefile Mon May 27 13:51:30 2002
@@ -6,10 +6,10 @@
#
=20
PORTNAME=3D linc
-PORTVERSION=3D 0.1.21
+PORTVERSION=3D 0.1.22
CATEGORIES=3D net
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR=3D gnome2
=20
MAINTAINER=3D gnome@FreeBSD.org
diff -ruN linc.orig/distinfo linc/distinfo
--- net/linc.orig/distinfo Mon May 27 13:53:06 2002
+++ net/linc/distinfo Mon May 27 13:51:36 2002
@@ -1 +1 @@
-MD5 (gnome2/linc-0.1.21.tar.bz2) =3D 2ade39312be6bfc7e85b2e106218c8c1
+MD5 (gnome2/linc-0.1.22.tar.bz2) =3D e1238441707b4650aeecd3a1ad45c406
diff -ruN nautilus2.orig/Makefile nautilus2/Makefile
--- x11-fm/nautilus2.orig/Makefile Tue May 28 01:36:52 2002
+++ x11-fm/nautilus2/Makefile Tue May 28 01:37:21 2002
@@ -6,10 +6,10 @@
#
=20
PORTNAME=3D nautilus2
-PORTVERSION=3D 1.1.16
+PORTVERSION=3D 1.1.17
CATEGORIES=3D x11-fm gnome
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR=3D gnome2
DISTNAME=3D nautilus-${PORTVERSION}
=20
diff -ruN nautilus2.orig/distinfo nautilus2/distinfo
--- x11-fm/nautilus2.orig/distinfo Tue May 28 01:36:52 2002
+++ x11-fm/nautilus2/distinfo Tue May 28 00:55:23 2002
@@ -1 +1 @@
-MD5 (gnome2/nautilus-1.1.16.tar.bz2) =3D 182bc2ec3b04c8442496244fa696a781
+MD5 (gnome2/nautilus-1.1.17.tar.bz2) =3D 2c12ff181865d1690fe21bb320f779eb
diff -ruN nautilus2.orig/files/patch-aa nautilus2/files/patch-aa
--- x11-fm/nautilus2.orig/files/patch-aa Tue May 28 01:36:52 2002
+++ x11-fm/nautilus2/files/patch-aa Tue May 28 01:00:36 2002
@@ -1,9 +1,6 @@
-
-$FreeBSD: ports/x11-fm/nautilus2/files/patch-aa,v 1.12 2002/05/20 18:03:39=
sobomax Exp $
-
---- 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 @@
=20
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS=3D"$ac_aux_dir/ltmain.sh"
@@ -11,7 +8,7 @@
=20
# Always use our own libtool.
LIBTOOL=3D'$(SHELL) $(top_builddir)/libtool'
-@@ -12030,14 +12031,14 @@
+@@ -12398,14 +12399,14 @@
=20
LIBNAUTILUS_LIBS=3D"`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`"
=20
@@ -28,7 +25,7 @@
=20
COMPONENT_MODULES=3D"eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0"
COMPONENT_CFLAGS=3D"`$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 @@
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 -ruN nautilus2.orig/pkg-plist nautilus2/pkg-plist
--- x11-fm/nautilus2.orig/pkg-plist Tue May 28 01:36:52 2002
+++ x11-fm/nautilus2/pkg-plist Tue May 28 01:19:29 2002
@@ -2,9 +2,7 @@
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 @@
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 -ruN rep-gtk2.orig/Makefile rep-gtk2/Makefile
--- x11-toolkits/rep-gtk2.orig/Makefile Tue May 28 01:46:32 2002
+++ x11-toolkits/rep-gtk2/Makefile Tue May 28 01:42:07 2002
@@ -6,10 +6,10 @@
#
=20
PORTNAME=3D rep-gtk2
-PORTVERSION=3D 2002.05.02
+PORTVERSION=3D 2002.05.24
CATEGORIES=3D x11-toolkits
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME=3D rep-gtk-${PORTVERSION:S/./-/g}
DIST_SUBDIR=3D gnome2
=20
diff -ruN rep-gtk2.orig/distinfo rep-gtk2/distinfo
--- x11-toolkits/rep-gtk2.orig/distinfo Tue May 28 01:46:32 2002
+++ x11-toolkits/rep-gtk2/distinfo Tue May 28 01:42:31 2002
@@ -1 +1 @@
-MD5 (gnome2/rep-gtk-2002-05-02.tar.bz2) =3D 79ee1c8dca2179a7c6748293cadcdc=
26
+MD5 (gnome2/rep-gtk-2002-05-24.tar.bz2) =3D f8e665f588929cc5a5df9b1c72d54e=
a9
diff -ruN sawfish2.orig/Makefile sawfish2/Makefile
--- x11-wm/sawfish2.orig/Makefile Tue May 28 01:59:51 2002
+++ x11-wm/sawfish2/Makefile Tue May 28 01:49:34 2002
@@ -6,11 +6,10 @@
#
=20
PORTNAME=3D sawfish2
-PORTVERSION=3D 2002.05.02
-PORTREVISION=3D 1
+PORTVERSION=3D 2002.05.24
CATEGORIES=3D x11-wm
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DISTNAME=3D sawfish-${PORTVERSION:S/./-/g}
DIST_SUBDIR=3D gnome2
=20
diff -ruN sawfish2.orig/distinfo sawfish2/distinfo
--- x11-wm/sawfish2.orig/distinfo Tue May 28 01:59:51 2002
+++ x11-wm/sawfish2/distinfo Tue May 28 01:50:00 2002
@@ -1 +1 @@
-MD5 (gnome2/sawfish-2002-05-02.tar.bz2) =3D bb3b6a5dc19257bcbbdf3d8cd97eb8=
fd
+MD5 (gnome2/sawfish-2002-05-24.tar.bz2) =3D e6b01c0c7b37e2ecfc27c8b544258d=
98
diff -ruN sawfish2.orig/files/patch-lisp_sawfish_wm_gnome_integration.jl sa=
wfish2/files/patch-lisp_sawfish_wm_gnome_integration.jl
--- x11-wm/sawfish2.orig/files/patch-lisp_sawfish_wm_gnome_integration.jl T=
ue May 28 01:59:51 2002
+++ x11-wm/sawfish2/files/patch-lisp_sawfish_wm_gnome_integration.jl Wed De=
c 31 19:00:00 1969
@@ -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.
-=20
--(eval-when-compile (require 'sawfish.wm.commands.xterm))
--
- (define-structure sawfish.wm.gnome.integration ()
-=20
- (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)
-=20
- (define-structure-alias gnome-int sawfish.wm.gnome.integration)
-=20
-@@ -46,6 +45,7 @@
- (put 'gnome-use-capplet 'custom-obsolete t)
-=20
- ;; 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"))
-=20
diff -ruN sawfish2.orig/pkg-plist sawfish2/pkg-plist
--- x11-wm/sawfish2.orig/pkg-plist Tue May 28 01:59:51 2002
+++ x11-wm/sawfish2/pkg-plist Tue May 28 01:55:20 2002
@@ -87,6 +87,7 @@
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.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 -ruN yelp.orig/Makefile yelp/Makefile
--- x11/yelp.orig/Makefile Tue May 28 02:09:15 2002
+++ x11/yelp/Makefile Tue May 28 02:01:27 2002
@@ -6,11 +6,10 @@
#
=20
PORTNAME=3D yelp
-PORTVERSION=3D 0.7
-PORTREVISION=3D 1
+PORTVERSION=3D 0.8
CATEGORIES=3D x11 gnome
MASTER_SITES=3D ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=3D pre-gnome2/releases/gnome-2.0-desktop-20020525
DIST_SUBDIR=3D gnome2
=20
MAINTAINER=3D gnome@FreeBSD.org
diff -ruN yelp.orig/distinfo yelp/distinfo
--- x11/yelp.orig/distinfo Tue May 28 02:09:15 2002
+++ x11/yelp/distinfo Tue May 28 02:01:33 2002
@@ -1 +1 @@
-MD5 (gnome2/yelp-0.7.tar.bz2) =3D 7394c5ab597a3a4188c96e5720600381
+MD5 (gnome2/yelp-0.8.tar.bz2) =3D 0590082e2d0ecf1da3bef4019cb08130
diff -ruN yelp.orig/files/patch-configure yelp/files/patch-configure
--- x11/yelp.orig/files/patch-configure Tue May 28 02:09:15 2002
+++ x11/yelp/files/patch-configure Tue May 28 02:03:20 2002
@@ -1,9 +1,6 @@
-
-$FreeBSD: ports/x11/yelp/files/patch-configure,v 1.1 2002/05/20 18:06:55 s=
obomax Exp $
-
---- 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 @@
=20
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS=3D"$ac_aux_dir/ltmain.sh"
@@ -11,12 +8,12 @@
=20
# Always use our own libtool.
LIBTOOL=3D'$(SHELL) $(top_builddir)/libtool'
-@@ -9978,7 +9979,7 @@
+@@ -9979,7 +9980,7 @@
=20
- YELP_MODULES=3D"libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0=
"
+ YELP_MODULES=3D"gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0"
=20
--YELP_IDL_INCLUDES=3D"`$PKG_CONFIG --variable=3Didldir libgtkhtml-2.0 gnom=
e-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=3D"`$PKG_CONFIG --variable=3Didldir gnome-vfs-2.0 libgn=
omeui-2.0 libbonobo-2.0 bonobo-activation-2.0| sed -e 's/^/ /' -e 's/ \+$//=
' -e 's/ \+/ -I /g' -e 's/^ \+//'`"
+YELP_IDL_INCLUDES=3D"`$PKG_CONFIG --variable=3Didldir libgtkhtml-2.0 gnom=
e-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| xargs -n1 ech=
o -n ' -I '`"
=20
- 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 -ruN yelp.orig/files/patch-src_yelp-info.c yelp/files/patch-src_yelp-i=
nfo.c
--- x11/yelp.orig/files/patch-src_yelp-info.c Tue May 28 02:09:15 2002
+++ x11/yelp/files/patch-src_yelp-info.c Wed Dec 31 19:00:00 1969
@@ -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 =3D NULL;
- GSList *node;
-- YelpSection *section;
- gchar **infopathes;
- gchar *infopath;
- gint i;
-@@ -141,7 +140,7 @@
-=20
- for (node =3D info_list; node; node =3D node->next) {
- g_node_append_data (root, node->data);
-- *index =3D g_list_prepend (*index, section);
-+ *index =3D g_list_prepend (*index, node->data);
- }
-=20
- g_slist_free (info_list);
diff -ruN yelp.orig/pkg-plist yelp/pkg-plist
--- x11/yelp.orig/pkg-plist Tue May 28 02:09:15 2002
+++ x11/yelp/pkg-plist Tue May 28 02:07:11 2002
@@ -2,6 +2,9 @@
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_TW/LC_MESSAGES/yelp.mo
@dirrm share/gnome/yelp
@dirrm share/gnome/sgml/docbook/yelp
+@dirrm share/gnome/images/yelp
--=-2uW3o8WR++PnYDKcY3F7--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-gnome" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1022567491.278.15.camel>