aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2003-04-04 07:53:18 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2003-04-04 07:53:18 +0000
commit6d6bbc2970b369f625318989ca23683ae67be9a7 (patch)
tree0d62eaf25fec82bfb17d06e4f149395e9e372513
parent46b82b34008265593881bcf108f35296a6cd3545 (diff)
downloadports-6d6bbc2970b369f625318989ca23683ae67be9a7.tar.gz
ports-6d6bbc2970b369f625318989ca23683ae67be9a7.zip
Notes
-rw-r--r--games/gnome-games/Makefile2
-rw-r--r--games/gnome-games/distinfo2
-rw-r--r--games/gnome-games/files/patch-freecell_gdk-card-image_gdk-card-image.c17
-rw-r--r--games/gnome-games/pkg-plist9
-rw-r--r--games/gnomegames2/Makefile2
-rw-r--r--games/gnomegames2/distinfo2
-rw-r--r--games/gnomegames2/files/patch-freecell_gdk-card-image_gdk-card-image.c17
-rw-r--r--games/gnomegames2/pkg-plist9
-rw-r--r--sysutils/gnome-control-center/Makefile2
-rw-r--r--sysutils/gnome-control-center/distinfo2
-rw-r--r--sysutils/gnome-control-center/pkg-plist2
-rw-r--r--sysutils/gnomecontrolcenter2/Makefile2
-rw-r--r--sysutils/gnomecontrolcenter2/distinfo2
-rw-r--r--sysutils/gnomecontrolcenter2/pkg-plist2
-rw-r--r--x11-themes/gnome-themes/Makefile8
-rw-r--r--x11-themes/gnome-themes/distinfo2
-rw-r--r--x11-themes/gnome-themes/files/patch-configure83
-rw-r--r--x11-toolkits/gnome-themes/Makefile8
-rw-r--r--x11-toolkits/gnome-themes/distinfo2
-rw-r--r--x11-toolkits/gnome-themes/files/patch-configure83
-rw-r--r--x11/gnome-desktop/Makefile2
-rw-r--r--x11/gnome-desktop/distinfo2
-rw-r--r--x11/gnome-desktop/pkg-plist7
-rw-r--r--x11/gnome-panel/Makefile3
-rw-r--r--x11/gnome-panel/distinfo2
-rw-r--r--x11/gnome-panel/files/patch-applets_notification_area_eggtraymanager.c11
-rw-r--r--x11/gnome-panel/files/patch-doc_reference_panel-applet_Makefile.in11
-rw-r--r--x11/gnome-panel/pkg-plist44
-rw-r--r--x11/gnome-session/Makefile2
-rw-r--r--x11/gnome-session/distinfo2
-rw-r--r--x11/gnome-session/pkg-plist3
-rw-r--r--x11/gnomedesktop/Makefile2
-rw-r--r--x11/gnomedesktop/distinfo2
-rw-r--r--x11/gnomedesktop/pkg-plist7
-rw-r--r--x11/gnomepanel/Makefile3
-rw-r--r--x11/gnomepanel/distinfo2
-rw-r--r--x11/gnomepanel/files/patch-applets_notification_area_eggtraymanager.c11
-rw-r--r--x11/gnomepanel/files/patch-doc_reference_panel-applet_Makefile.in11
-rw-r--r--x11/gnomepanel/pkg-plist44
-rw-r--r--x11/gnomesession/Makefile2
-rw-r--r--x11/gnomesession/distinfo2
-rw-r--r--x11/gnomesession/pkg-plist3
42 files changed, 322 insertions, 114 deletions
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index d46a85a97b87..1e99259b25fa 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnomegames2
-PORTVERSION= 2.2.0
+PORTVERSION= 2.2.1
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-games/2.2
diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo
index 4b49a8fbb5d0..97b59f44a41a 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-games-2.2.0.tar.bz2) = 6bcb214c267faa51cfa002b607d87164
+MD5 (gnome2/gnome-games-2.2.1.tar.bz2) = 15b47c5f3cba31aaadd21ea51af2833b
diff --git a/games/gnome-games/files/patch-freecell_gdk-card-image_gdk-card-image.c b/games/gnome-games/files/patch-freecell_gdk-card-image_gdk-card-image.c
deleted file mode 100644
index 33f940e2e02b..000000000000
--- a/games/gnome-games/files/patch-freecell_gdk-card-image_gdk-card-image.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- freecell/gdk-card-image/gdk-card-image.c.orig Tue Jul 23 20:46:35 2002
-+++ freecell/gdk-card-image/gdk-card-image.c Tue Jul 23 20:52:20 2002
-@@ -27,13 +27,8 @@
-
- #include <config.h>
- #include <gnome.h>
--#ifdef HAVE_SYS_DIRENT_H
--#include <sys/dirent.h>
--#elif defined(HAVE_SYS_DIR_H)
--#include <sys/dir.h>
--#else
-+#include <sys/types.h>
- #include <dirent.h>
--#endif
-
- #ifdef __osf__
- #undef HAVE_STRUCT_DIRECT
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index 4b820549cadc..8a9b5ff0b027 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -736,8 +736,11 @@ share/gnome/xbill/pixmaps/suse.xpm
share/gnome/xbill/pixmaps/toaster.xpm
share/gnome/xbill/pixmaps/turbolinux.xpm
share/gnome/xbill/pixmaps/wingdows.xpm
-share/locale/bg/LC_MESSAGES/gnome-games.mo
+share/locale/am/LC_MESSAGES/gnome-games.mo
+share/locale/ar/LC_MESSAGES/gnome-games.mo
share/locale/be/LC_MESSAGES/gnome-games.mo
+share/locale/bg/LC_MESSAGES/gnome-games.mo
+share/locale/bn/LC_MESSAGES/gnome-games.mo
share/locale/ca/LC_MESSAGES/gnome-games.mo
share/locale/cs/LC_MESSAGES/gnome-games.mo
share/locale/da/LC_MESSAGES/gnome-games.mo
@@ -747,6 +750,7 @@ share/locale/en_GB/LC_MESSAGES/gnome-games.mo
share/locale/es/LC_MESSAGES/gnome-games.mo
share/locale/et/LC_MESSAGES/gnome-games.mo
share/locale/eu/LC_MESSAGES/gnome-games.mo
+share/locale/fa/LC_MESSAGES/gnome-games.mo
share/locale/fi/LC_MESSAGES/gnome-games.mo
share/locale/fr/LC_MESSAGES/gnome-games.mo
share/locale/ga/LC_MESSAGES/gnome-games.mo
@@ -757,6 +761,9 @@ share/locale/it/LC_MESSAGES/gnome-games.mo
share/locale/ja/LC_MESSAGES/gnome-games.mo
share/locale/ko/LC_MESSAGES/gnome-games.mo
share/locale/lt/LC_MESSAGES/gnome-games.mo
+share/locale/lv/LC_MESSAGES/gnome-games.mo
+share/locale/mk/LC_MESSAGES/gnome-games.mo
+share/locale/mn/LC_MESSAGES/gnome-games.mo
share/locale/ms/LC_MESSAGES/gnome-games.mo
share/locale/nl/LC_MESSAGES/gnome-games.mo
share/locale/nn/LC_MESSAGES/gnome-games.mo
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index d46a85a97b87..1e99259b25fa 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnomegames2
-PORTVERSION= 2.2.0
+PORTVERSION= 2.2.1
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-games/2.2
diff --git a/games/gnomegames2/distinfo b/games/gnomegames2/distinfo
index 4b49a8fbb5d0..97b59f44a41a 100644
--- a/games/gnomegames2/distinfo
+++ b/games/gnomegames2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-games-2.2.0.tar.bz2) = 6bcb214c267faa51cfa002b607d87164
+MD5 (gnome2/gnome-games-2.2.1.tar.bz2) = 15b47c5f3cba31aaadd21ea51af2833b
diff --git a/games/gnomegames2/files/patch-freecell_gdk-card-image_gdk-card-image.c b/games/gnomegames2/files/patch-freecell_gdk-card-image_gdk-card-image.c
deleted file mode 100644
index 33f940e2e02b..000000000000
--- a/games/gnomegames2/files/patch-freecell_gdk-card-image_gdk-card-image.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- freecell/gdk-card-image/gdk-card-image.c.orig Tue Jul 23 20:46:35 2002
-+++ freecell/gdk-card-image/gdk-card-image.c Tue Jul 23 20:52:20 2002
-@@ -27,13 +27,8 @@
-
- #include <config.h>
- #include <gnome.h>
--#ifdef HAVE_SYS_DIRENT_H
--#include <sys/dirent.h>
--#elif defined(HAVE_SYS_DIR_H)
--#include <sys/dir.h>
--#else
-+#include <sys/types.h>
- #include <dirent.h>
--#endif
-
- #ifdef __osf__
- #undef HAVE_STRUCT_DIRECT
diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist
index 4b820549cadc..8a9b5ff0b027 100644
--- a/games/gnomegames2/pkg-plist
+++ b/games/gnomegames2/pkg-plist
@@ -736,8 +736,11 @@ share/gnome/xbill/pixmaps/suse.xpm
share/gnome/xbill/pixmaps/toaster.xpm
share/gnome/xbill/pixmaps/turbolinux.xpm
share/gnome/xbill/pixmaps/wingdows.xpm
-share/locale/bg/LC_MESSAGES/gnome-games.mo
+share/locale/am/LC_MESSAGES/gnome-games.mo
+share/locale/ar/LC_MESSAGES/gnome-games.mo
share/locale/be/LC_MESSAGES/gnome-games.mo
+share/locale/bg/LC_MESSAGES/gnome-games.mo
+share/locale/bn/LC_MESSAGES/gnome-games.mo
share/locale/ca/LC_MESSAGES/gnome-games.mo
share/locale/cs/LC_MESSAGES/gnome-games.mo
share/locale/da/LC_MESSAGES/gnome-games.mo
@@ -747,6 +750,7 @@ share/locale/en_GB/LC_MESSAGES/gnome-games.mo
share/locale/es/LC_MESSAGES/gnome-games.mo
share/locale/et/LC_MESSAGES/gnome-games.mo
share/locale/eu/LC_MESSAGES/gnome-games.mo
+share/locale/fa/LC_MESSAGES/gnome-games.mo
share/locale/fi/LC_MESSAGES/gnome-games.mo
share/locale/fr/LC_MESSAGES/gnome-games.mo
share/locale/ga/LC_MESSAGES/gnome-games.mo
@@ -757,6 +761,9 @@ share/locale/it/LC_MESSAGES/gnome-games.mo
share/locale/ja/LC_MESSAGES/gnome-games.mo
share/locale/ko/LC_MESSAGES/gnome-games.mo
share/locale/lt/LC_MESSAGES/gnome-games.mo
+share/locale/lv/LC_MESSAGES/gnome-games.mo
+share/locale/mk/LC_MESSAGES/gnome-games.mo
+share/locale/mn/LC_MESSAGES/gnome-games.mo
share/locale/ms/LC_MESSAGES/gnome-games.mo
share/locale/nl/LC_MESSAGES/gnome-games.mo
share/locale/nn/LC_MESSAGES/gnome-games.mo
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index ee529056f949..dea17a848e0d 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnomecontrolcenter2
-PORTVERSION= 2.2.0.1
+PORTVERSION= 2.2.1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/control-center/2.2
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 0dbd8f05e367..a11db7bdbdd9 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1 +1 @@
-MD5 (gnome2/control-center-2.2.0.1.tar.bz2) = b17bc2ecf9a38614310c54c5f88ffc55
+MD5 (gnome2/control-center-2.2.1.tar.bz2) = a39858a9ed4fa4aed8c3cecde72bbe9b
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 7619910cb51b..cea6a0718cb2 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -129,6 +129,7 @@ share/locale/el/LC_MESSAGES/control-center-2.0.mo
share/locale/en_GB/LC_MESSAGES/control-center-2.0.mo
share/locale/es/LC_MESSAGES/control-center-2.0.mo
share/locale/et/LC_MESSAGES/control-center-2.0.mo
+share/locale/fa/LC_MESSAGES/control-center-2.0.mo
share/locale/fi/LC_MESSAGES/control-center-2.0.mo
share/locale/fr/LC_MESSAGES/control-center-2.0.mo
share/locale/ga/LC_MESSAGES/control-center-2.0.mo
@@ -154,6 +155,7 @@ share/locale/ro/LC_MESSAGES/control-center-2.0.mo
share/locale/ru/LC_MESSAGES/control-center-2.0.mo
share/locale/sk/LC_MESSAGES/control-center-2.0.mo
share/locale/sl/LC_MESSAGES/control-center-2.0.mo
+share/locale/sq/LC_MESSAGES/control-center-2.0.mo
share/locale/sv/LC_MESSAGES/control-center-2.0.mo
share/locale/ta/LC_MESSAGES/control-center-2.0.mo
share/locale/tr/LC_MESSAGES/control-center-2.0.mo
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index ee529056f949..dea17a848e0d 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnomecontrolcenter2
-PORTVERSION= 2.2.0.1
+PORTVERSION= 2.2.1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/control-center/2.2
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 0dbd8f05e367..a11db7bdbdd9 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/control-center-2.2.0.1.tar.bz2) = b17bc2ecf9a38614310c54c5f88ffc55
+MD5 (gnome2/control-center-2.2.1.tar.bz2) = a39858a9ed4fa4aed8c3cecde72bbe9b
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 7619910cb51b..cea6a0718cb2 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -129,6 +129,7 @@ share/locale/el/LC_MESSAGES/control-center-2.0.mo
share/locale/en_GB/LC_MESSAGES/control-center-2.0.mo
share/locale/es/LC_MESSAGES/control-center-2.0.mo
share/locale/et/LC_MESSAGES/control-center-2.0.mo
+share/locale/fa/LC_MESSAGES/control-center-2.0.mo
share/locale/fi/LC_MESSAGES/control-center-2.0.mo
share/locale/fr/LC_MESSAGES/control-center-2.0.mo
share/locale/ga/LC_MESSAGES/control-center-2.0.mo
@@ -154,6 +155,7 @@ share/locale/ro/LC_MESSAGES/control-center-2.0.mo
share/locale/ru/LC_MESSAGES/control-center-2.0.mo
share/locale/sk/LC_MESSAGES/control-center-2.0.mo
share/locale/sl/LC_MESSAGES/control-center-2.0.mo
+share/locale/sq/LC_MESSAGES/control-center-2.0.mo
share/locale/sv/LC_MESSAGES/control-center-2.0.mo
share/locale/ta/LC_MESSAGES/control-center-2.0.mo
share/locale/tr/LC_MESSAGES/control-center-2.0.mo
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index 8888d0c79b9f..6bdb1fd624e3 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gnome-themes
-PORTVERSION= 2.2
-PORTREVISION= 1
+PORTVERSION= 2.2.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2
@@ -24,7 +23,12 @@ RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libthinice.so:${PORTSDIR}/x11-
USE_BZIP2= yes
USE_X_PREFIX= yes
+USE_REINPLACE= yes
USE_LIBTOOL= yes
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+post-patch:
+ @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g'
+
.include <bsd.port.mk>
diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo
index a0b32f0fe100..1437e8984b35 100644
--- a/x11-themes/gnome-themes/distinfo
+++ b/x11-themes/gnome-themes/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-themes-2.2.tar.bz2) = 18f9b8cea0469bf2ae934024c6f4fa9d
+MD5 (gnome2/gnome-themes-2.2.1.tar.bz2) = 55cdb9dc45256207e08d0654035c2b2a
diff --git a/x11-themes/gnome-themes/files/patch-configure b/x11-themes/gnome-themes/files/patch-configure
index 8afd3d20e32f..2a763b11ffe5 100644
--- a/x11-themes/gnome-themes/files/patch-configure
+++ b/x11-themes/gnome-themes/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Mon Feb 3 20:16:09 2003
-+++ configure Mon Feb 3 20:16:31 2003
-@@ -7640,6 +7640,7 @@
+--- configure.orig Wed Mar 12 07:49:35 2003
++++ configure Thu Mar 13 23:50:27 2003
+@@ -7641,6 +7641,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,3 +8,80 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -7707,22 +7708,16 @@
+ echo "$as_me:$LINENO: checking for gtk+-2.0 >= 1.3.11
+ gdk-pixbuf-2.0 >= 1.3.11
+ gtk-engines-2
+- gtk-thinice-engine-2
+- libgnomeui-2.0
+- libglade-2.0" >&5
++ gtk-thinice-engine-2" >&5
+ echo $ECHO_N "checking for gtk+-2.0 >= 1.3.11
+ gdk-pixbuf-2.0 >= 1.3.11
+ gtk-engines-2
+- gtk-thinice-engine-2
+- libgnomeui-2.0
+- libglade-2.0... $ECHO_C" >&6
++ gtk-thinice-engine-2... $ECHO_C" >&6
+
+ if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.11
+ gdk-pixbuf-2.0 >= 1.3.11
+ gtk-engines-2
+- gtk-thinice-engine-2
+- libgnomeui-2.0
+- libglade-2.0" ; then
++ gtk-thinice-engine-2" ; then
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ succeeded=yes
+@@ -7732,9 +7727,7 @@
+ GTKTHEME_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.11
+ gdk-pixbuf-2.0 >= 1.3.11
+ gtk-engines-2
+- gtk-thinice-engine-2
+- libgnomeui-2.0
+- libglade-2.0"`
++ gtk-thinice-engine-2"`
+ echo "$as_me:$LINENO: result: $GTKTHEME_CFLAGS" >&5
+ echo "${ECHO_T}$GTKTHEME_CFLAGS" >&6
+
+@@ -7743,9 +7736,7 @@
+ GTKTHEME_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.11
+ gdk-pixbuf-2.0 >= 1.3.11
+ gtk-engines-2
+- gtk-thinice-engine-2
+- libgnomeui-2.0
+- libglade-2.0"`
++ gtk-thinice-engine-2"`
+ echo "$as_me:$LINENO: result: $GTKTHEME_LIBS" >&5
+ echo "${ECHO_T}$GTKTHEME_LIBS" >&6
+ else
+@@ -7756,9 +7747,7 @@
+ GTKTHEME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 1.3.11
+ gdk-pixbuf-2.0 >= 1.3.11
+ gtk-engines-2
+- gtk-thinice-engine-2
+- libgnomeui-2.0
+- libglade-2.0"`
++ gtk-thinice-engine-2"`
+ echo $GTKTHEME_PKG_ERRORS
+ fi
+
+@@ -7776,15 +7765,11 @@
+ { { echo "$as_me:$LINENO: error: Library requirements (gtk+-2.0 >= 1.3.11
+ gdk-pixbuf-2.0 >= 1.3.11
+ gtk-engines-2
+- gtk-thinice-engine-2
+- libgnomeui-2.0
+- libglade-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
++ gtk-thinice-engine-2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+ echo "$as_me: error: Library requirements (gtk+-2.0 >= 1.3.11
+ gdk-pixbuf-2.0 >= 1.3.11
+ gtk-engines-2
+- gtk-thinice-engine-2
+- libgnomeui-2.0
+- libglade-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
++ gtk-thinice-engine-2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
diff --git a/x11-toolkits/gnome-themes/Makefile b/x11-toolkits/gnome-themes/Makefile
index 8888d0c79b9f..6bdb1fd624e3 100644
--- a/x11-toolkits/gnome-themes/Makefile
+++ b/x11-toolkits/gnome-themes/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gnome-themes
-PORTVERSION= 2.2
-PORTREVISION= 1
+PORTVERSION= 2.2.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2
@@ -24,7 +23,12 @@ RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libthinice.so:${PORTSDIR}/x11-
USE_BZIP2= yes
USE_X_PREFIX= yes
+USE_REINPLACE= yes
USE_LIBTOOL= yes
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+post-patch:
+ @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g'
+
.include <bsd.port.mk>
diff --git a/x11-toolkits/gnome-themes/distinfo b/x11-toolkits/gnome-themes/distinfo
index a0b32f0fe100..1437e8984b35 100644
--- a/x11-toolkits/gnome-themes/distinfo
+++ b/x11-toolkits/gnome-themes/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-themes-2.2.tar.bz2) = 18f9b8cea0469bf2ae934024c6f4fa9d
+MD5 (gnome2/gnome-themes-2.2.1.tar.bz2) = 55cdb9dc45256207e08d0654035c2b2a
diff --git a/x11-toolkits/gnome-themes/files/patch-configure b/x11-toolkits/gnome-themes/files/patch-configure
index 8afd3d20e32f..2a763b11ffe5 100644
--- a/x11-toolkits/gnome-themes/files/patch-configure
+++ b/x11-toolkits/gnome-themes/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Mon Feb 3 20:16:09 2003
-+++ configure Mon Feb 3 20:16:31 2003
-@@ -7640,6 +7640,7 @@
+--- configure.orig Wed Mar 12 07:49:35 2003
++++ configure Thu Mar 13 23:50:27 2003
+@@ -7641,6 +7641,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,3 +8,80 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -7707,22 +7708,16 @@
+ echo "$as_me:$LINENO: checking for gtk+-2.0 >= 1.3.11
+ gdk-pixbuf-2.0 >= 1.3.11
+ gtk-engines-2
+- gtk-thinice-engine-2
+- libgnomeui-2.0
+- libglade-2.0" >&5
++ gtk-thinice-engine-2" >&5
+ echo $ECHO_N "checking for gtk+-2.0 >= 1.3.11
+ gdk-pixbuf-2.0 >= 1.3.11
+ gtk-engines-2
+- gtk-thinice-engine-2
+- libgnomeui-2.0
+- libglade-2.0... $ECHO_C" >&6
++ gtk-thinice-engine-2... $ECHO_C" >&6
+
+ if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.11
+ gdk-pixbuf-2.0 >= 1.3.11
+ gtk-engines-2
+- gtk-thinice-engine-2
+- libgnomeui-2.0
+- libglade-2.0" ; then
++ gtk-thinice-engine-2" ; then
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ succeeded=yes
+@@ -7732,9 +7727,7 @@
+ GTKTHEME_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.11
+ gdk-pixbuf-2.0 >= 1.3.11
+ gtk-engines-2
+- gtk-thinice-engine-2
+- libgnomeui-2.0
+- libglade-2.0"`
++ gtk-thinice-engine-2"`
+ echo "$as_me:$LINENO: result: $GTKTHEME_CFLAGS" >&5
+ echo "${ECHO_T}$GTKTHEME_CFLAGS" >&6
+
+@@ -7743,9 +7736,7 @@
+ GTKTHEME_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.11
+ gdk-pixbuf-2.0 >= 1.3.11
+ gtk-engines-2
+- gtk-thinice-engine-2
+- libgnomeui-2.0
+- libglade-2.0"`
++ gtk-thinice-engine-2"`
+ echo "$as_me:$LINENO: result: $GTKTHEME_LIBS" >&5
+ echo "${ECHO_T}$GTKTHEME_LIBS" >&6
+ else
+@@ -7756,9 +7747,7 @@
+ GTKTHEME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 1.3.11
+ gdk-pixbuf-2.0 >= 1.3.11
+ gtk-engines-2
+- gtk-thinice-engine-2
+- libgnomeui-2.0
+- libglade-2.0"`
++ gtk-thinice-engine-2"`
+ echo $GTKTHEME_PKG_ERRORS
+ fi
+
+@@ -7776,15 +7765,11 @@
+ { { echo "$as_me:$LINENO: error: Library requirements (gtk+-2.0 >= 1.3.11
+ gdk-pixbuf-2.0 >= 1.3.11
+ gtk-engines-2
+- gtk-thinice-engine-2
+- libgnomeui-2.0
+- libglade-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
++ gtk-thinice-engine-2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+ echo "$as_me: error: Library requirements (gtk+-2.0 >= 1.3.11
+ gdk-pixbuf-2.0 >= 1.3.11
+ gtk-engines-2
+- gtk-thinice-engine-2
+- libgnomeui-2.0
+- libglade-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
++ gtk-thinice-engine-2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index e52b579c5693..7bfa555a2eb7 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnomedesktop
-PORTVERSION= 2.2.0.1
+PORTVERSION= 2.2.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-desktop/2.2
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 3ebb8fa8c311..9b5c1ebfe7b5 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-2.2.0.1.tar.bz2) = 5463b9a864447d670d1ea40de2022519
+MD5 (gnome2/gnome-desktop-2.2.1.tar.bz2) = 95e6cf32afb647fdbb14d5c782b4ea9d
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index c1eb5c92f788..d778276271c5 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -152,10 +152,12 @@ share/gnome/pixmaps/panel-folder.png
share/gnome/pixmaps/panel-knob.png
share/gnome/pixmaps/panel-menu-main.png
share/gnome/pixmaps/vnterm.xpm
+share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/be/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/bn/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -163,9 +165,11 @@ share/locale/da/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/de/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/el/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/eo/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/es/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/et/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/eu/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/fa/LC_MESSAGES/gnome-desktop-2.0.mo
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
@@ -173,8 +177,11 @@ share/locale/gl/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/he/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/id/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/is/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/kn/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
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 87bd6d503664..d355b8bc4cd0 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gnomepanel
-PORTVERSION= 2.2.0.1
-PORTREVISION= 1
+PORTVERSION= 2.2.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-panel/2.2
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index e6e3514326ed..d336743cb7db 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-2.2.0.1.tar.bz2) = cd8a74425cadadc8d10ab1fe5e9e3fe8
+MD5 (gnome2/gnome-panel-2.2.1.tar.bz2) = 5d859216e411d5c557b241fbd71fe110
diff --git a/x11/gnome-panel/files/patch-applets_notification_area_eggtraymanager.c b/x11/gnome-panel/files/patch-applets_notification_area_eggtraymanager.c
deleted file mode 100644
index 8cab3bb47c83..000000000000
--- a/x11/gnome-panel/files/patch-applets_notification_area_eggtraymanager.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- applets/notification_area/eggtraymanager.c.orig Wed Feb 12 20:37:06 2003
-+++ applets/notification_area/eggtraymanager.c Wed Feb 12 20:37:35 2003
-@@ -399,7 +399,7 @@
-
- invisible = manager->invisible;
-
-- display = GDK_WINDOW_XDISPLAY (manager->invisible);
-+ display = GDK_WINDOW_XDISPLAY (manager->invisible->window);
-
- if (XGetSelectionOwner (display, manager->selection_atom) ==
- GDK_WINDOW_XWINDOW (manager->invisible->window))
diff --git a/x11/gnome-panel/files/patch-doc_reference_panel-applet_Makefile.in b/x11/gnome-panel/files/patch-doc_reference_panel-applet_Makefile.in
deleted file mode 100644
index 0d70349ad28d..000000000000
--- a/x11/gnome-panel/files/patch-doc_reference_panel-applet_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/reference/panel-applet/Makefile.in.orig Tue Apr 30 23:24:10 2002
-+++ doc/reference/panel-applet/Makefile.in Tue Apr 30 23:28:36 2002
-@@ -149,7 +149,7 @@
- DOC_MODULE = panel-applet
-
- # Where the html is to be installed
--HTML_DIR = $(datadir)/gtk-doc/html
-+HTML_DIR = $(prefix)/share/doc
-
- # The top-level SGML file. Change it if you want.
- DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index ab12b3dc1371..190577061c55 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -94,12 +94,21 @@ share/gnome/gnome-panel/glade/panel-test-applets.glade
share/gnome/help/clock/C/clock.xml
share/gnome/help/clock/C/figures/clock_applet.png
share/gnome/help/clock/C/legal.xml
+share/gnome/help/clock/ja/clock.xml
+share/gnome/help/clock/ja/figures/clock_applet.png
+share/gnome/help/clock/ja/legal.xml
share/gnome/help/fish-applet-2/C/figures/fish_applet.png
share/gnome/help/fish-applet-2/C/fish-applet-2.xml
share/gnome/help/fish-applet-2/C/legal.xml
+share/gnome/help/fish-applet-2/ja/figures/fish_applet.png
+share/gnome/help/fish-applet-2/ja/fish-applet-2.xml
+share/gnome/help/fish-applet-2/ja/legal.xml
share/gnome/help/mailcheck/C/figures/mailcheck_applet.png
share/gnome/help/mailcheck/C/legal.xml
share/gnome/help/mailcheck/C/mailcheck.xml
+share/gnome/help/mailcheck/ja/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/ja/legal.xml
+share/gnome/help/mailcheck/ja/mailcheck.xml
share/gnome/help/notification-area/C/figures/notification-area.png
share/gnome/help/notification-area/C/legal.xml
share/gnome/help/notification-area/C/notification-area.xml
@@ -107,22 +116,39 @@ share/gnome/help/window-list/C/figures/window_list_applet.png
share/gnome/help/window-list/C/figures/window_list_group_applet.png
share/gnome/help/window-list/C/legal.xml
share/gnome/help/window-list/C/window-list.xml
+share/gnome/help/window-list/ja/figures/window_list_applet.png
+share/gnome/help/window-list/ja/figures/window_list_group_applet.png
+share/gnome/help/window-list/ja/legal.xml
+share/gnome/help/window-list/ja/window-list.xml
share/gnome/help/workspace-switcher/C/figures/workspace_switcher_applet.png
share/gnome/help/workspace-switcher/C/legal.xml
share/gnome/help/workspace-switcher/C/workspace-switcher.xml
+share/gnome/help/workspace-switcher/ja/figures/workspace_switcher_applet.png
+share/gnome/help/workspace-switcher/ja/legal.xml
+share/gnome/help/workspace-switcher/ja/workspace-switcher.xml
share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl
share/gnome/omf/gnome-panel/clock-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/clock-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-ja.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/fish-applet-2-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/fish-applet-2-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ja.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/mailcheck-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/mailcheck-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-ja.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/notification-area-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/window-list-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/window-list-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-ja.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/workspace-switcher-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/workspace-switcher-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ja.omf 2>/dev/null || /usr/bin/true
share/gnome/panel/gnome-panel-preferences.glade
share/gnome/panel/gnome-panel-screenshot.glade
share/gnome/pixmaps/fish/fishanim.png
@@ -148,9 +174,11 @@ share/locale/da/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/de/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/el/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/eo/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/es/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/et/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/eu/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/fa/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/fi/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/fr/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo
@@ -160,6 +188,7 @@ share/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/li/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
@@ -188,21 +217,31 @@ share/locale/zh_CN/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm share/gnome/omf/gnome-panel
@dirrm share/gnome/idl/gnome-panel-2.0
+@dirrm share/gnome/help/workspace-switcher/ja/figures
+@dirrm share/gnome/help/workspace-switcher/ja
@dirrm share/gnome/help/workspace-switcher/C/figures
@dirrm share/gnome/help/workspace-switcher/C
@dirrm share/gnome/help/workspace-switcher
+@dirrm share/gnome/help/window-list/ja/figures
+@dirrm share/gnome/help/window-list/ja
@dirrm share/gnome/help/window-list/C/figures
@dirrm share/gnome/help/window-list/C
@dirrm share/gnome/help/window-list
@dirrm share/gnome/help/notification-area/C/figures
@dirrm share/gnome/help/notification-area/C
@dirrm share/gnome/help/notification-area
+@dirrm share/gnome/help/mailcheck/ja/figures
+@dirrm share/gnome/help/mailcheck/ja
@dirrm share/gnome/help/mailcheck/C/figures
@dirrm share/gnome/help/mailcheck/C
@dirrm share/gnome/help/mailcheck
+@dirrm share/gnome/help/fish-applet-2/ja/figures
+@dirrm share/gnome/help/fish-applet-2/ja
@dirrm share/gnome/help/fish-applet-2/C/figures
@dirrm share/gnome/help/fish-applet-2/C
@dirrm share/gnome/help/fish-applet-2
+@dirrm share/gnome/help/clock/ja/figures
+@dirrm share/gnome/help/clock/ja
@dirrm share/gnome/help/clock/C/figures
@dirrm share/gnome/help/clock/C
@dirrm share/gnome/help/clock
@@ -253,8 +292,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm etc/gconf/gconf.xml.defaults/apps/panel
@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-ja.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ja.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-ja.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-ja.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ja.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index bd607a331673..68c8f60fd939 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnomesession
-PORTVERSION= 2.2.0.2
+PORTVERSION= 2.2.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-session/2.2
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 7a3e911c6bc1..95302d4e2b06 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-session-2.2.0.2.tar.bz2) = e53f68858792c99ee71954f1fef11bc3
+MD5 (gnome2/gnome-session-2.2.1.tar.bz2) = 53330d8b034d75c9e6d3e79e7314eb77
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index 6f959c8d2217..c88a201e4964 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -27,6 +27,7 @@ share/locale/en_GB/LC_MESSAGES/gnome-session-2.0.mo
share/locale/es/LC_MESSAGES/gnome-session-2.0.mo
share/locale/et/LC_MESSAGES/gnome-session-2.0.mo
share/locale/eu/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/fa/LC_MESSAGES/gnome-session-2.0.mo
share/locale/fi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/fr/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ga/LC_MESSAGES/gnome-session-2.0.mo
@@ -34,8 +35,10 @@ share/locale/gl/LC_MESSAGES/gnome-session-2.0.mo
share/locale/he/LC_MESSAGES/gnome-session-2.0.mo
share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/id/LC_MESSAGES/gnome-session-2.0.mo
share/locale/it/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/kn/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-session-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-session-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index e52b579c5693..7bfa555a2eb7 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnomedesktop
-PORTVERSION= 2.2.0.1
+PORTVERSION= 2.2.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-desktop/2.2
diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo
index 3ebb8fa8c311..9b5c1ebfe7b5 100644
--- a/x11/gnomedesktop/distinfo
+++ b/x11/gnomedesktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-2.2.0.1.tar.bz2) = 5463b9a864447d670d1ea40de2022519
+MD5 (gnome2/gnome-desktop-2.2.1.tar.bz2) = 95e6cf32afb647fdbb14d5c782b4ea9d
diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist
index c1eb5c92f788..d778276271c5 100644
--- a/x11/gnomedesktop/pkg-plist
+++ b/x11/gnomedesktop/pkg-plist
@@ -152,10 +152,12 @@ share/gnome/pixmaps/panel-folder.png
share/gnome/pixmaps/panel-knob.png
share/gnome/pixmaps/panel-menu-main.png
share/gnome/pixmaps/vnterm.xpm
+share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/be/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/bn/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -163,9 +165,11 @@ share/locale/da/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/de/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/el/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/eo/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/es/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/et/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/eu/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/fa/LC_MESSAGES/gnome-desktop-2.0.mo
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
@@ -173,8 +177,11 @@ share/locale/gl/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/he/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/id/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/is/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/kn/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
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index 87bd6d503664..d355b8bc4cd0 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gnomepanel
-PORTVERSION= 2.2.0.1
-PORTREVISION= 1
+PORTVERSION= 2.2.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-panel/2.2
diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo
index e6e3514326ed..d336743cb7db 100644
--- a/x11/gnomepanel/distinfo
+++ b/x11/gnomepanel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-2.2.0.1.tar.bz2) = cd8a74425cadadc8d10ab1fe5e9e3fe8
+MD5 (gnome2/gnome-panel-2.2.1.tar.bz2) = 5d859216e411d5c557b241fbd71fe110
diff --git a/x11/gnomepanel/files/patch-applets_notification_area_eggtraymanager.c b/x11/gnomepanel/files/patch-applets_notification_area_eggtraymanager.c
deleted file mode 100644
index 8cab3bb47c83..000000000000
--- a/x11/gnomepanel/files/patch-applets_notification_area_eggtraymanager.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- applets/notification_area/eggtraymanager.c.orig Wed Feb 12 20:37:06 2003
-+++ applets/notification_area/eggtraymanager.c Wed Feb 12 20:37:35 2003
-@@ -399,7 +399,7 @@
-
- invisible = manager->invisible;
-
-- display = GDK_WINDOW_XDISPLAY (manager->invisible);
-+ display = GDK_WINDOW_XDISPLAY (manager->invisible->window);
-
- if (XGetSelectionOwner (display, manager->selection_atom) ==
- GDK_WINDOW_XWINDOW (manager->invisible->window))
diff --git a/x11/gnomepanel/files/patch-doc_reference_panel-applet_Makefile.in b/x11/gnomepanel/files/patch-doc_reference_panel-applet_Makefile.in
deleted file mode 100644
index 0d70349ad28d..000000000000
--- a/x11/gnomepanel/files/patch-doc_reference_panel-applet_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/reference/panel-applet/Makefile.in.orig Tue Apr 30 23:24:10 2002
-+++ doc/reference/panel-applet/Makefile.in Tue Apr 30 23:28:36 2002
-@@ -149,7 +149,7 @@
- DOC_MODULE = panel-applet
-
- # Where the html is to be installed
--HTML_DIR = $(datadir)/gtk-doc/html
-+HTML_DIR = $(prefix)/share/doc
-
- # The top-level SGML file. Change it if you want.
- DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index ab12b3dc1371..190577061c55 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -94,12 +94,21 @@ share/gnome/gnome-panel/glade/panel-test-applets.glade
share/gnome/help/clock/C/clock.xml
share/gnome/help/clock/C/figures/clock_applet.png
share/gnome/help/clock/C/legal.xml
+share/gnome/help/clock/ja/clock.xml
+share/gnome/help/clock/ja/figures/clock_applet.png
+share/gnome/help/clock/ja/legal.xml
share/gnome/help/fish-applet-2/C/figures/fish_applet.png
share/gnome/help/fish-applet-2/C/fish-applet-2.xml
share/gnome/help/fish-applet-2/C/legal.xml
+share/gnome/help/fish-applet-2/ja/figures/fish_applet.png
+share/gnome/help/fish-applet-2/ja/fish-applet-2.xml
+share/gnome/help/fish-applet-2/ja/legal.xml
share/gnome/help/mailcheck/C/figures/mailcheck_applet.png
share/gnome/help/mailcheck/C/legal.xml
share/gnome/help/mailcheck/C/mailcheck.xml
+share/gnome/help/mailcheck/ja/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/ja/legal.xml
+share/gnome/help/mailcheck/ja/mailcheck.xml
share/gnome/help/notification-area/C/figures/notification-area.png
share/gnome/help/notification-area/C/legal.xml
share/gnome/help/notification-area/C/notification-area.xml
@@ -107,22 +116,39 @@ share/gnome/help/window-list/C/figures/window_list_applet.png
share/gnome/help/window-list/C/figures/window_list_group_applet.png
share/gnome/help/window-list/C/legal.xml
share/gnome/help/window-list/C/window-list.xml
+share/gnome/help/window-list/ja/figures/window_list_applet.png
+share/gnome/help/window-list/ja/figures/window_list_group_applet.png
+share/gnome/help/window-list/ja/legal.xml
+share/gnome/help/window-list/ja/window-list.xml
share/gnome/help/workspace-switcher/C/figures/workspace_switcher_applet.png
share/gnome/help/workspace-switcher/C/legal.xml
share/gnome/help/workspace-switcher/C/workspace-switcher.xml
+share/gnome/help/workspace-switcher/ja/figures/workspace_switcher_applet.png
+share/gnome/help/workspace-switcher/ja/legal.xml
+share/gnome/help/workspace-switcher/ja/workspace-switcher.xml
share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl
share/gnome/omf/gnome-panel/clock-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/clock-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-ja.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/fish-applet-2-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/fish-applet-2-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ja.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/mailcheck-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/mailcheck-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-ja.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/notification-area-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/window-list-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/window-list-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-ja.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/workspace-switcher-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/workspace-switcher-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ja.omf 2>/dev/null || /usr/bin/true
share/gnome/panel/gnome-panel-preferences.glade
share/gnome/panel/gnome-panel-screenshot.glade
share/gnome/pixmaps/fish/fishanim.png
@@ -148,9 +174,11 @@ share/locale/da/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/de/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/el/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/eo/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/es/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/et/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/eu/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/fa/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/fi/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/fr/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo
@@ -160,6 +188,7 @@ share/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/li/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
@@ -188,21 +217,31 @@ share/locale/zh_CN/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm share/gnome/omf/gnome-panel
@dirrm share/gnome/idl/gnome-panel-2.0
+@dirrm share/gnome/help/workspace-switcher/ja/figures
+@dirrm share/gnome/help/workspace-switcher/ja
@dirrm share/gnome/help/workspace-switcher/C/figures
@dirrm share/gnome/help/workspace-switcher/C
@dirrm share/gnome/help/workspace-switcher
+@dirrm share/gnome/help/window-list/ja/figures
+@dirrm share/gnome/help/window-list/ja
@dirrm share/gnome/help/window-list/C/figures
@dirrm share/gnome/help/window-list/C
@dirrm share/gnome/help/window-list
@dirrm share/gnome/help/notification-area/C/figures
@dirrm share/gnome/help/notification-area/C
@dirrm share/gnome/help/notification-area
+@dirrm share/gnome/help/mailcheck/ja/figures
+@dirrm share/gnome/help/mailcheck/ja
@dirrm share/gnome/help/mailcheck/C/figures
@dirrm share/gnome/help/mailcheck/C
@dirrm share/gnome/help/mailcheck
+@dirrm share/gnome/help/fish-applet-2/ja/figures
+@dirrm share/gnome/help/fish-applet-2/ja
@dirrm share/gnome/help/fish-applet-2/C/figures
@dirrm share/gnome/help/fish-applet-2/C
@dirrm share/gnome/help/fish-applet-2
+@dirrm share/gnome/help/clock/ja/figures
+@dirrm share/gnome/help/clock/ja
@dirrm share/gnome/help/clock/C/figures
@dirrm share/gnome/help/clock/C
@dirrm share/gnome/help/clock
@@ -253,8 +292,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm etc/gconf/gconf.xml.defaults/apps/panel
@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-ja.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ja.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-ja.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-ja.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ja.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index bd607a331673..68c8f60fd939 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnomesession
-PORTVERSION= 2.2.0.2
+PORTVERSION= 2.2.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-session/2.2
diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo
index 7a3e911c6bc1..95302d4e2b06 100644
--- a/x11/gnomesession/distinfo
+++ b/x11/gnomesession/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-session-2.2.0.2.tar.bz2) = e53f68858792c99ee71954f1fef11bc3
+MD5 (gnome2/gnome-session-2.2.1.tar.bz2) = 53330d8b034d75c9e6d3e79e7314eb77
diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist
index 6f959c8d2217..c88a201e4964 100644
--- a/x11/gnomesession/pkg-plist
+++ b/x11/gnomesession/pkg-plist
@@ -27,6 +27,7 @@ share/locale/en_GB/LC_MESSAGES/gnome-session-2.0.mo
share/locale/es/LC_MESSAGES/gnome-session-2.0.mo
share/locale/et/LC_MESSAGES/gnome-session-2.0.mo
share/locale/eu/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/fa/LC_MESSAGES/gnome-session-2.0.mo
share/locale/fi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/fr/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ga/LC_MESSAGES/gnome-session-2.0.mo
@@ -34,8 +35,10 @@ share/locale/gl/LC_MESSAGES/gnome-session-2.0.mo
share/locale/he/LC_MESSAGES/gnome-session-2.0.mo
share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/id/LC_MESSAGES/gnome-session-2.0.mo
share/locale/it/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/kn/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-session-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-session-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo