aboutsummaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/alltray/Makefile4
-rw-r--r--x11/apwal/Makefile5
-rw-r--r--x11/brightside/Makefile2
-rw-r--r--x11/brightside/pkg-plist30
-rw-r--r--x11/fast-user-switch-applet/Makefile5
-rw-r--r--x11/fast-user-switch-applet/distinfo6
-rw-r--r--x11/fast-user-switch-applet/files/patch-src_gdm-queue.c17
-rw-r--r--x11/fast-user-switch-applet/pkg-plist59
-rw-r--r--x11/gcursor/Makefile4
-rw-r--r--x11/gcursor/pkg-plist7
-rw-r--r--x11/gdesklets-tasklist/Makefile4
-rw-r--r--x11/gdesklets-tasklist/pkg-message2
-rw-r--r--x11/gdesklets-tasklist/pkg-plist8
-rw-r--r--x11/gdkxft/Makefile5
-rw-r--r--x11/gdkxft/pkg-plist10
-rw-r--r--x11/gdm/Makefile8
-rw-r--r--x11/gdm/distinfo6
-rw-r--r--x11/gdm/files/extra-patch-daemon_slave.c18
-rw-r--r--x11/gdm/files/gdm.in2
-rw-r--r--x11/gdm/files/patch-config_gdm.conf.in11
-rw-r--r--x11/gdm/files/patch-configure137
-rw-r--r--x11/gdm/files/patch-daemon_gdmconsolekit.c11
-rw-r--r--x11/gdm/pkg-install4
-rw-r--r--x11/gdm/pkg-plist213
-rw-r--r--x11/gnome-applets/Makefile12
-rw-r--r--x11/gnome-applets/distinfo6
-rw-r--r--x11/gnome-applets/files/patch-aa70
-rw-r--r--x11/gnome-applets/files/patch-cpufreq-freebsd20
-rw-r--r--x11/gnome-applets/files/patch-cpufreq-selector-freebsd18
-rw-r--r--x11/gnome-applets/pkg-plist843
-rw-r--r--x11/gnome-desktop/Makefile4
-rw-r--r--x11/gnome-desktop/distinfo6
-rw-r--r--x11/gnome-desktop/pkg-plist315
-rw-r--r--x11/gnome-libs/Makefile8
-rw-r--r--x11/gnome-libs/files/patch-aa3
-rw-r--r--x11/gnome-libs/files/patch-ad20
-rw-r--r--x11/gnome-libs/files/patch-bb3
-rw-r--r--x11/gnome-libs/files/patch-bg3
-rw-r--r--x11/gnome-libs/files/patch-bi3
-rw-r--r--x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in5
-rw-r--r--x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in5
-rw-r--r--x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in5
-rw-r--r--x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in5
-rw-r--r--x11/gnome-libs/files/patch-libart_lgpl::configure3
-rw-r--r--x11/gnome-libs/files/patch-po::Makefile.in.in3
-rw-r--r--x11/gnome-libs/pkg-plist89
-rw-r--r--x11/gnome-menus/Makefile7
-rw-r--r--x11/gnome-menus/distinfo6
-rw-r--r--x11/gnome-menus/files/patch-layout::applications.menu16
-rw-r--r--x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py2
-rw-r--r--x11/gnome-menus/pkg-plist59
-rw-r--r--x11/gnome-panel/Makefile4
-rw-r--r--x11/gnome-panel/distinfo6
-rw-r--r--x11/gnome-panel/files/patch-po_ja.po26
-rw-r--r--x11/gnome-panel/files/patch-po_ko.po40
-rw-r--r--x11/gnome-panel/pkg-plist324
-rw-r--r--x11/gnome-screensaver/Makefile8
-rw-r--r--x11/gnome-screensaver/distinfo6
-rw-r--r--x11/gnome-screensaver/pkg-plist53
-rw-r--r--x11/gnome-session/Makefile14
-rw-r--r--x11/gnome-session/distinfo6
-rw-r--r--x11/gnome-session/files/patch-data_Makefile.in9
-rw-r--r--x11/gnome-session/files/patch-gnome-session_Makefile.in11
-rw-r--r--x11/gnome-session/pkg-plist54
-rw-r--r--x11/gnome-terminal/Makefile4
-rw-r--r--x11/gnome-terminal/distinfo6
-rw-r--r--x11/gnome-terminal/pkg-plist63
-rw-r--r--x11/gnome2-fifth-toe/Makefile9
-rw-r--r--x11/gnome2-lite/Makefile6
-rw-r--r--x11/gnome2-power-tools/Makefile4
-rw-r--r--x11/gnome2/Makefile18
-rw-r--r--x11/gsynaptics/pkg-plist1
-rw-r--r--x11/gtstarter/Makefile7
-rw-r--r--x11/gtstarter/distinfo6
-rw-r--r--x11/gtstarter/pkg-plist3
-rw-r--r--x11/libcapplet/Makefile9
-rw-r--r--x11/libcapplet/pkg-plist2
-rw-r--r--x11/libgnome/Makefile10
-rw-r--r--x11/libgnome/distinfo6
-rw-r--r--x11/libgnome/files/patch-libgnome::Makefile.in9
-rw-r--r--x11/libgnome/files/patch-libgnome_gnome-program.c55
-rw-r--r--x11/libgnome/files/pkg-deinstall.in2
-rw-r--r--x11/libgnome/pkg-plist14
-rw-r--r--x11/libgnomekbd/Makefile8
-rw-r--r--x11/libgnomekbd/distinfo6
-rw-r--r--x11/libgnomekbd/pkg-plist29
-rw-r--r--x11/libgnomemm26/Makefile5
-rw-r--r--x11/libgnomemm26/distinfo6
-rw-r--r--x11/libxklavier/Makefile20
-rw-r--r--x11/libxklavier/distinfo6
-rw-r--r--x11/libxklavier/files/patch-configure35
-rw-r--r--x11/libxklavier/pkg-plist2
-rw-r--r--x11/multi-gnome-terminal/Makefile7
-rw-r--r--x11/multi-gnome-terminal/pkg-plist58
-rw-r--r--x11/ruby-gnome2/Makefile2
-rw-r--r--x11/ruby-gnome2/Makefile.common9
-rw-r--r--x11/ruby-gnome2/distinfo6
-rw-r--r--x11/trayer/Makefile6
-rw-r--r--x11/workrave/Makefile1
-rw-r--r--x11/workrave/pkg-plist118
-rw-r--r--x11/xscreensaver-gnome/Makefile7
-rw-r--r--x11/xscreensaver-gnome/files/patch-ab9
-rw-r--r--x11/xscreensaver-gnome/pkg-plist25
-rw-r--r--x11/xscreensaver-kde/Makefile6
-rw-r--r--x11/yelp/Makefile8
-rw-r--r--x11/yelp/distinfo6
-rw-r--r--x11/yelp/pkg-plist77
-rw-r--r--x11/zenity/Makefile12
-rw-r--r--x11/zenity/distinfo6
-rw-r--r--x11/zenity/pkg-plist83
110 files changed, 1877 insertions, 1598 deletions
diff --git a/x11/alltray/Makefile b/x11/alltray/Makefile
index 8390958579e8..252e0e60a91b 100644
--- a/x11/alltray/Makefile
+++ b/x11/alltray/Makefile
@@ -7,7 +7,7 @@
PORTNAME= alltray
PORTVERSION= 0.69
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -37,7 +37,7 @@ post-patch:
@${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/lib/Makefile.in
@${REINPLACE_CMD} -e 's|-L/usr/X11R6/lib||' ${WRKSRC}/src/Makefile.in
@${REINPLACE_CMD} -e 's|/etc/gconf|${LOCALBASE}/etc/gconf|; \
- /THEME_DIR1/ s|/usr/share/|${LOCALBASE}/share/gnome/themes/|' \
+ /THEME_DIR1/ s|/usr/share/|${LOCALBASE}/share/themes/|' \
${WRKSRC}/src/gnome_theme.c
@${REINPLACE_CMD} -e 's|liballtray\.so\.0\.0\.0|liballtray.so.0|; \
s|/usr/lib|${PREFIX}/lib|' ${WRKSRC}/src/child.c
diff --git a/x11/apwal/Makefile b/x11/apwal/Makefile
index 711b8e5ff415..31a0f5f7d1d3 100644
--- a/x11/apwal/Makefile
+++ b/x11/apwal/Makefile
@@ -7,7 +7,7 @@
PORTNAME= apwal
PORTVERSION= 0.4.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://apwal.free.fr/download/
@@ -24,7 +24,8 @@ PLIST_FILES= bin/apwal bin/apwal-editor
post-patch:
@${CP} ${FILESDIR}/group_member.c ${WRKSRC}
- @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share/gnome|g' ${WRKSRC}/cereimg.c ${WRKSRC}/../example/apwalrc.xml
+ @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \
+ ${WRKSRC}/cereimg.c ${WRKSRC}/../example/apwalrc.xml
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/apwal ${PREFIX}/bin
diff --git a/x11/brightside/Makefile b/x11/brightside/Makefile
index 9bd61f528d3f..c5d91513b4f8 100644
--- a/x11/brightside/Makefile
+++ b/x11/brightside/Makefile
@@ -7,7 +7,7 @@
PORTNAME= brightside
PORTVERSION= 1.4.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://files.catmur.co.uk/brightside/
diff --git a/x11/brightside/pkg-plist b/x11/brightside/pkg-plist
index 746479636cea..6577e14dc7af 100644
--- a/x11/brightside/pkg-plist
+++ b/x11/brightside/pkg-plist
@@ -1,19 +1,19 @@
bin/brightside
bin/brightside-properties
-share/gnome/brightside/brightside-16.png
-share/gnome/brightside/brightside-48.png
-share/gnome/brightside/brightside-brightness.png
-share/gnome/brightside/brightside-properties.glade
-share/gnome/brightside/brightside.glade
-share/gnome/brightside/brightside.svg
-share/gnome/brightside/custom-action.glade
-share/gnome/brightside/dpms.png
-share/gnome/brightside/gnome-lockscreen.png
-share/gnome/brightside/gnome-speakernotes-muted.png
-share/gnome/brightside/gnome-speakernotes.png
-share/gnome/brightside/xscreensaver.png
-share/gnome/control-center-2.0/capplets/brightside.desktop
-share/gnome/pixmaps/brightside-48.png
+share/brightside/brightside-16.png
+share/brightside/brightside-48.png
+share/brightside/brightside-brightness.png
+share/brightside/brightside-properties.glade
+share/brightside/brightside.glade
+share/brightside/brightside.svg
+share/brightside/custom-action.glade
+share/brightside/dpms.png
+share/brightside/gnome-lockscreen.png
+share/brightside/gnome-speakernotes-muted.png
+share/brightside/gnome-speakernotes.png
+share/brightside/xscreensaver.png
+share/control-center-2.0/capplets/brightside.desktop
+share/pixmaps/brightside-48.png
share/locale/am/LC_MESSAGES/Brightside.mo
share/locale/ar/LC_MESSAGES/Brightside.mo
share/locale/az/LC_MESSAGES/Brightside.mo
@@ -66,4 +66,4 @@ share/locale/uk/LC_MESSAGES/Brightside.mo
share/locale/vi/LC_MESSAGES/Brightside.mo
share/locale/zh_CN/LC_MESSAGES/Brightside.mo
share/locale/zh_TW/LC_MESSAGES/Brightside.mo
-@dirrm share/gnome/brightside
+@dirrm share/brightside
diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile
index 3eb4f29c792d..8cc82c3b54b4 100644
--- a/x11/fast-user-switch-applet/Makefile
+++ b/x11/fast-user-switch-applet/Makefile
@@ -3,11 +3,10 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.22 2007/02/27 20:35:24 mezz Exp $
+# $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.28 2007/09/18 15:01:12 ahze Exp $
PORTNAME= fast-user-switch-applet
-PORTVERSION= 2.18.0
-PORTREVISION= 1
+PORTVERSION= 2.20.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/fast-user-switch-applet/distinfo b/x11/fast-user-switch-applet/distinfo
index 78f157034b79..1a39f7b9e781 100644
--- a/x11/fast-user-switch-applet/distinfo
+++ b/x11/fast-user-switch-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/fast-user-switch-applet-2.18.0.tar.bz2) = aefe9ea3aecc908336ae909aeee385b5
-SHA256 (gnome2/fast-user-switch-applet-2.18.0.tar.bz2) = eec13f4a8d35e5b43ad78589dd02c255748a3d24be8da7c018f2a7e5fcb87436
-SIZE (gnome2/fast-user-switch-applet-2.18.0.tar.bz2) = 761628
+MD5 (gnome2/fast-user-switch-applet-2.20.0.tar.bz2) = 1d1fd25b5599f7656e3fa89aa913137c
+SHA256 (gnome2/fast-user-switch-applet-2.20.0.tar.bz2) = c7123f132aff47978e754d83cd5e449a4e02e215466fc3fc2f3bc81fb5cec5fd
+SIZE (gnome2/fast-user-switch-applet-2.20.0.tar.bz2) = 777118
diff --git a/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c b/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c
index a38c96493386..cd89dc462d8a 100644
--- a/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c
+++ b/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c
@@ -1,10 +1,19 @@
---- src/gdm-queue.c.orig Thu Nov 16 12:39:45 2006
-+++ src/gdm-queue.c Thu Nov 16 12:40:17 2006
-@@ -31,6 +31,7 @@
- #include <sys/socket.h>
+--- src/gdm-queue.c.orig 2007-04-09 12:01:03.000000000 -0400
++++ src/gdm-queue.c 2007-08-08 15:18:12.000000000 -0400
+@@ -32,6 +32,7 @@
+ #include <sys/stat.h>
#include <sys/un.h>
#include <errno.h>
+#include <signal.h>
#include <stdio.h>
#include "gdm-queue.h"
+@@ -237,7 +238,7 @@ gboolean gdm_run_queue (void *dummy)
+
+ if (stat (GDM_NEW_SOCKET_FILENAME, &file_stat) == 0)
+ strcpy (addr.sun_path, GDM_NEW_SOCKET_FILENAME);
+- if (stat (GDM_OLD_SOCKET_FILENAME, &file_stat) == 0)
++ else if (stat (GDM_OLD_SOCKET_FILENAME, &file_stat) == 0)
+ strcpy (addr.sun_path, GDM_OLD_SOCKET_FILENAME);
+ else
+ g_error ("Can't find gdm socket!");
diff --git a/x11/fast-user-switch-applet/pkg-plist b/x11/fast-user-switch-applet/pkg-plist
index eba6ee79cf16..6c9de7ec4923 100644
--- a/x11/fast-user-switch-applet/pkg-plist
+++ b/x11/fast-user-switch-applet/pkg-plist
@@ -1,7 +1,7 @@
libdata/bonobo/servers/GNOME_FastUserSwitchApplet.server
libexec/fast-user-switch-applet
-share/gnome/fast-user-switch-applet/ui.glade
-share/gnome/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
+%%DATADIR%%/ui.glade
+share/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
share/gnome/help/fast-user-switch-applet/C/fast-user-switch-applet.xml
share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet-context.png
share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet-icon.png
@@ -31,6 +31,13 @@ share/gnome/help/fast-user-switch-applet/fr/figures/fast_user_switch_applet-pref
share/gnome/help/fast-user-switch-applet/fr/figures/fast_user_switch_applet-text.png
share/gnome/help/fast-user-switch-applet/fr/figures/fast_user_switch_applet-username.png
share/gnome/help/fast-user-switch-applet/fr/figures/fast_user_switch_applet.png
+share/gnome/help/fast-user-switch-applet/oc/fast-user-switch-applet.xml
+share/gnome/help/fast-user-switch-applet/oc/figures/fast_user_switch_applet-context.png
+share/gnome/help/fast-user-switch-applet/oc/figures/fast_user_switch_applet-icon.png
+share/gnome/help/fast-user-switch-applet/oc/figures/fast_user_switch_applet-prefs.png
+share/gnome/help/fast-user-switch-applet/oc/figures/fast_user_switch_applet-text.png
+share/gnome/help/fast-user-switch-applet/oc/figures/fast_user_switch_applet-username.png
+share/gnome/help/fast-user-switch-applet/oc/figures/fast_user_switch_applet.png
share/gnome/help/fast-user-switch-applet/pa/fast-user-switch-applet.xml
share/gnome/help/fast-user-switch-applet/pa/figures/fast_user_switch_applet-context.png
share/gnome/help/fast-user-switch-applet/pa/figures/fast_user_switch_applet-icon.png
@@ -52,13 +59,6 @@ share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-pref
share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-text.png
share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-username.png
share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet.png
-share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-C.omf
-share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-en_GB.omf
-share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-es.omf
-share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-fr.omf
-share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-pa.omf
-share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-sr.omf
-share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-sv.omf
share/locale/ar/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/bg/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/bn/LC_MESSAGES/fast-user-switch-applet.mo
@@ -99,6 +99,7 @@ share/locale/mr/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/nb/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/ne/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/nl/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/oc/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/or/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/pa/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/pl/LC_MESSAGES/fast-user-switch-applet.mo
@@ -119,25 +120,23 @@ share/locale/vi/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/zh_CN/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/zh_HK/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/zh_TW/LC_MESSAGES/fast-user-switch-applet.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrm share/gnome/omf/fast-user-switch-applet
+share/omf/fast-user-switch-applet/fast-user-switch-applet-C.omf
+share/omf/fast-user-switch-applet/fast-user-switch-applet-en_GB.omf
+share/omf/fast-user-switch-applet/fast-user-switch-applet-es.omf
+share/omf/fast-user-switch-applet/fast-user-switch-applet-fr.omf
+share/omf/fast-user-switch-applet/fast-user-switch-applet-oc.omf
+share/omf/fast-user-switch-applet/fast-user-switch-applet-pa.omf
+share/omf/fast-user-switch-applet/fast-user-switch-applet-sr.omf
+share/omf/fast-user-switch-applet/fast-user-switch-applet-sv.omf
+@dirrm share/omf/fast-user-switch-applet
@dirrm share/gnome/help/fast-user-switch-applet/sv/figures
@dirrm share/gnome/help/fast-user-switch-applet/sv
@dirrm share/gnome/help/fast-user-switch-applet/sr/figures
@dirrm share/gnome/help/fast-user-switch-applet/sr
@dirrm share/gnome/help/fast-user-switch-applet/pa/figures
@dirrm share/gnome/help/fast-user-switch-applet/pa
+@dirrm share/gnome/help/fast-user-switch-applet/oc/figures
+@dirrm share/gnome/help/fast-user-switch-applet/oc
@dirrm share/gnome/help/fast-user-switch-applet/fr/figures
@dirrm share/gnome/help/fast-user-switch-applet/fr
@dirrm share/gnome/help/fast-user-switch-applet/es/figures
@@ -147,4 +146,18 @@ share/locale/zh_TW/LC_MESSAGES/fast-user-switch-applet.mo
@dirrm share/gnome/help/fast-user-switch-applet/C/figures
@dirrm share/gnome/help/fast-user-switch-applet/C
@dirrm share/gnome/help/fast-user-switch-applet
-@dirrm share/gnome/fast-user-switch-applet
+@dirrm %%DATADIR%%
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/x11/gcursor/Makefile b/x11/gcursor/Makefile
index e81e6775e462..9fbbb9393362 100644
--- a/x11/gcursor/Makefile
+++ b/x11/gcursor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gcursor
PORTVERSION= 0.061
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11 gnome
MASTER_SITES= http://download.qballcow.nl/programs/gcursor/
@@ -29,8 +29,6 @@ DOCS= AUTHORS COPYING ChangeLog INSTALL TODO
post-patch:
@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \
s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/gcursor.c
- @${REINPLACE_CMD} -e 's|share/applications|share/gnome/applications|g' \
- ${WRKSRC}/data/Makefile.in
.ifndef (NOPORTDOCS)
post-install:
diff --git a/x11/gcursor/pkg-plist b/x11/gcursor/pkg-plist
index 820f5ac5066a..a884872f6e09 100644
--- a/x11/gcursor/pkg-plist
+++ b/x11/gcursor/pkg-plist
@@ -4,10 +4,11 @@ bin/gcursor
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/applications/gcursor.desktop
-share/gnome/gcursor/gcursor.glade
+share/applications/gcursor.desktop
+share/gcursor/gcursor.glade
share/locale/de/LC_MESSAGES/gcursor.mo
share/locale/es/LC_MESSAGES/gcursor.mo
share/locale/sv/LC_MESSAGES/gcursor.mo
-@dirrm share/gnome/gcursor
+@dirrm share/gcursor
%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
diff --git a/x11/gdesklets-tasklist/Makefile b/x11/gdesklets-tasklist/Makefile
index ed3412021bdb..e55337a4ae2a 100644
--- a/x11/gdesklets-tasklist/Makefile
+++ b/x11/gdesklets-tasklist/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tasklist
PORTVERSION= 0.10
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11 gnome
MASTER_SITES= http://gdesklets.zencomputer.ca/
PKGNAMEPREFIX= gdesklets-
@@ -21,7 +21,7 @@ RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets
USE_XLIB= yes
NAME= tasklist
-DATADIR= ${PREFIX}/share/gnome
+DATADIR= ${PREFIX}/share
PKGMESSAGE= ${WRKDIR}/pkg-message
WRKSRC= ${WRKDIR}/${PORTNAME}-desklet-${PORTVERSION}
diff --git a/x11/gdesklets-tasklist/pkg-message b/x11/gdesklets-tasklist/pkg-message
index 7ee64d1a84cd..ebf3c223a9be 100644
--- a/x11/gdesklets-tasklist/pkg-message
+++ b/x11/gdesklets-tasklist/pkg-message
@@ -1,5 +1,5 @@
To add this desklet to your desktop:
- gdesklets open %%PREFIX%%/share/gnome/gdesklets/Displays/%%NAME%%/%%NAME%%.display
+ gdesklets open %%PREFIX%%/share/gdesklets/Displays/%%NAME%%/%%NAME%%.display
diff --git a/x11/gdesklets-tasklist/pkg-plist b/x11/gdesklets-tasklist/pkg-plist
index 34837bf19ea8..9e41ee90119d 100644
--- a/x11/gdesklets-tasklist/pkg-plist
+++ b/x11/gdesklets-tasklist/pkg-plist
@@ -1,4 +1,4 @@
-share/gnome/gdesklets/Displays/tasklist/preview.png
-share/gnome/gdesklets/Displays/tasklist/tasklist.display
-share/gnome/gdesklets/Displays/tasklist/README
-@dirrm share/gnome/gdesklets/Displays/tasklist
+share/gdesklets/Displays/tasklist/preview.png
+share/gdesklets/Displays/tasklist/tasklist.display
+share/gdesklets/Displays/tasklist/README
+@dirrm share/gdesklets/Displays/tasklist
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index e7c412168f94..0d80cff74bcf 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gdkxft
PORTVERSION= 1.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -24,7 +24,7 @@ WANT_GNOME= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lgnuregex -liconv" \
+CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -lgnuregex -liconv" \
CFLAGS="${CFLAGS} `pkg-config xft --cflags`"
CONFIGURE_ARGS= --sbindir=${PREFIX}/bin
USE_LDCONFIG= yes
@@ -49,7 +49,6 @@ post-patch:
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
's|src capplet|src @BUILD_CAPPLET_TRUE@capplet|g ; \
s|DESTDIR)\$$(datadir|DESTDIR)\$$(pkgdatadir|g ; \
- s|/gnome/apps/|/apps/|g ; \
s|la_LDFLAGS =.*$$|la_LDFLAGS = -module -avoid-version|g'
.for file in gdkxft_sysinstall.in gdkxft.c generate.pl
@${REINPLACE_CMD} -e 's|<regex.h>|<gnuregex.h>|g ; \
diff --git a/x11/gdkxft/pkg-plist b/x11/gdkxft/pkg-plist
index 1ff25eefda34..17aff6656a3b 100644
--- a/x11/gdkxft/pkg-plist
+++ b/x11/gdkxft/pkg-plist
@@ -5,9 +5,9 @@ lib/libgdkxft.a
lib/libgdkxft.la
lib/libgdkxft.so
%%PORTDOCS%%share/doc/gdkxft/README
-%%GNOME:%%share/gnome/apps/Settings/UIOptions/gdkxft.desktop
-%%GNOME:%%share/gnome/control-center/UIOptions/gdkxft.desktop
-%%GNOME:%%share/gnome/gdkxft/gdkxft-capplet.glade
-%%GNOME:%%share/gnome/pixmaps/gdkxft.png
-%%GNOME:%%@dirrm share/gnome/gdkxft
+%%GNOME:%%share/apps/Settings/UIOptions/gdkxft.desktop
+%%GNOME:%%share/control-center/UIOptions/gdkxft.desktop
+%%GNOME:%%share/gdkxft/gdkxft-capplet.glade
+%%GNOME:%%share/pixmaps/gdkxft.png
+%%GNOME:%%@dirrm share/gdkxft
%%PORTDOCS%%@dirrm share/doc/gdkxft
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index a54a1c443c46..023393457a2a 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gdm/Makefile,v 1.58 2007/03/12 16:56:06 marcus Exp $
+# $MCom: ports/x11/gdm/Makefile,v 1.80 2007/10/22 04:42:08 marcus Exp $
#
PORTNAME= gdm
-PORTVERSION= 2.18.4
+PORTVERSION= 2.20.1
PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -84,9 +84,9 @@ post-patch:
${WRKSRC}/config/Makefile.in
@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
${WRKSRC}/configure ${WRKSRC}/po/*.po ${WRKSRC}/gui/*.glade \
- ${WRKSRC}/daemon/*.c ${WRKSRC}/docs/*/*.xml
+ ${WRKSRC}/daemon/*.c ${WRKSRC}/docs/*/*.*
@${REINPLACE_CMD} -e 's|/etc/gdm/gdm.conf|${PREFIX}/etc/gdm/gdm.conf|' \
- ${WRKSRC}/docs/gdm.1
+ ${WRKSRC}/docs/gdm.1
post-install:
.if !defined(PACKAGE_BUILDING)
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 21dd4a4ea27e..c5f473bb23ca 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.18.4.tar.bz2) = 53e5f5820fa67abf55c37ea7570807b7
-SHA256 (gnome2/gdm-2.18.4.tar.bz2) = 1491178239060f14d7258e94fb511ae056da6b5525d6a64b69be45fe061342c3
-SIZE (gnome2/gdm-2.18.4.tar.bz2) = 3459899
+MD5 (gnome2/gdm-2.20.1.tar.bz2) = ed7b7efcb7fd97cc400e2416e0093e71
+SHA256 (gnome2/gdm-2.20.1.tar.bz2) = b916867853c0e4ef5b8e76a58baa28ff666fd3da741438c595b5f23d031501d7
+SIZE (gnome2/gdm-2.20.1.tar.bz2) = 3774217
diff --git a/x11/gdm/files/extra-patch-daemon_slave.c b/x11/gdm/files/extra-patch-daemon_slave.c
index 2d609cf2faec..b493dcd80ad9 100644
--- a/x11/gdm/files/extra-patch-daemon_slave.c
+++ b/x11/gdm/files/extra-patch-daemon_slave.c
@@ -1,6 +1,6 @@
---- daemon/slave.c.orig Sat Oct 28 22:38:51 2006
-+++ daemon/slave.c Tue Oct 31 12:33:41 2006
-@@ -321,8 +321,7 @@ run_session_output (gboolean read_until_
+--- daemon/slave.c.orig 2007-09-17 10:45:50.000000000 -0400
++++ daemon/slave.c 2007-09-25 13:42:06.000000000 -0400
+@@ -373,8 +373,7 @@
break;
}
@@ -10,17 +10,17 @@
continue;
/* write until we succeed in writing something */
-@@ -344,13 +343,6 @@ run_session_output (gboolean read_until_
- }
+@@ -397,13 +396,6 @@
d->xsession_errors_bytes += r;
--
+
- if G_UNLIKELY (d->xsession_errors_bytes >= MAX_XSESSION_ERRORS_BYTES &&
- ! got_xfsz_signal) {
- VE_IGNORE_EINTR (write (d->xsession_errors_fd,
-- "\n...Too much output, ignoring rest...\n",
-- strlen ("\n...Too much output, ignoring rest...\n")));
+- "\n...Too much output, ignoring rest...\n",
+- strlen ("\n...Too much output, ignoring rest...\n")));
- }
-
+-
/* there wasn't more then buf available, so no need to try reading
* again, unless we really want to */
+ if (r < sizeof (buf) && ! read_until_eof)
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index 21b493a0595b..9b11f3fb3ee2 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,6 +1,6 @@
#!/bin/sh
# $FreeBSD$
-# $MCom: ports/x11/gdm/files/gdm.in,v 1.12 2007/02/16 18:14:26 mezz Exp $
+# $MCom: ports/x11/gdm/files/gdm.in,v 1.15 2007/08/15 17:52:06 mezz Exp $
# PROVIDE: gdm
# REQUIRE: LOGIN cleanvar moused
diff --git a/x11/gdm/files/patch-config_gdm.conf.in b/x11/gdm/files/patch-config_gdm.conf.in
index 0eeb4bfc5562..6382bd445fd8 100644
--- a/x11/gdm/files/patch-config_gdm.conf.in
+++ b/x11/gdm/files/patch-config_gdm.conf.in
@@ -6,7 +6,7 @@
-# Automatic VT allocation. Right now only works on Linux. This way we force
+# Automatic VT allocation. This way we force
- # X to use specific vts. turn VTAllocation to false if this is causing
+ # X to use specific vts. Turn VTAllocation to false if this is causing
# problems.
-#FirstVT=7
-#VTAllocation=true
@@ -15,12 +15,3 @@
# Should double login be treated with a warning (and possibility to change VT's
# on Linux and FreeBSD systems for console logins)
#DoubleLoginWarning=true
-@@ -305,7 +305,7 @@
- # The specific gtkrc file we use. It should be the full path to the gtkrc that
- # we need. Unless you need a specific gtkrc that doesn't correspond to a
- # specific theme, then just use the GtkTheme key.
--#GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc
-+#GtkRC=@datadir@/../themes/Default/gtk-2.0/gtkrc
-
- # The GTK+ theme to use for the GUI.
- #GtkTheme=Default
diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure
new file mode 100644
index 000000000000..18b1e2742f57
--- /dev/null
+++ b/x11/gdm/files/patch-configure
@@ -0,0 +1,137 @@
+--- configure.orig 2007-10-22 00:31:04.000000000 -0400
++++ configure 2007-10-22 00:34:52.000000000 -0400
+@@ -29593,15 +29592,13 @@ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_util_login" >&5
+ echo "${ECHO_T}$ac_cv_lib_util_login" >&6; }
+ if test $ac_cv_lib_util_login = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBUTIL 1
++ cat >>confdefs.h <<\_ACEOF
++#define HAVE_LOGIN 1
+ _ACEOF
+-
+- LIBS="-lutil $LIBS"
+-
++
++ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
+ fi
+
+-
+ { echo "$as_me:$LINENO: checking for logout in -lutil" >&5
+ echo $ECHO_N "checking for logout in -lutil... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_util_logout+set}" = set; then
+@@ -29664,12 +29661,80 @@ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_util_logout" >&5
+ echo "${ECHO_T}$ac_cv_lib_util_logout" >&6; }
+ if test $ac_cv_lib_util_logout = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBUTIL 1
++ cat >>confdefs.h <<\_ACEOF
++#define HAVE_LOGOUT 1
++_ACEOF
++
++ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
++fi
++
++{ echo "$as_me:$LINENO: checking for logwtmp in -lutil" >&5
++echo $ECHO_N "checking for logwtmp in -lutil... $ECHO_C" >&6; }
++if test "${ac_cv_lib_util_logwtmp+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lutil $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char logwtmp ();
++int
++main ()
++{
++return logwtmp ();
++ ;
++ return 0;
++}
+ _ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ ac_cv_lib_util_logwtmp=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- LIBS="-lutil $LIBS"
++ ac_cv_lib_util_logwtmp=no
++fi
+
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_logwtmp" >&5
++echo "${ECHO_T}$ac_cv_lib_util_logwtmp" >&6; }
++if test $ac_cv_lib_util_logwtmp = yes; then
++ cat >>confdefs.h <<\_ACEOF
++#define HAVE_LOGWTMP 1
++_ACEOF
++
++ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
+ fi
+
+
+@@ -33472,18 +33537,18 @@ esac
+
+ # allow user to override the host-specific default
+
+-test "x$GDM_USER_PATH" == x && GDM_USER_PATH=${HOST_GDM_USER_PATH}
+-test "x$GDM_HALT_COMMAND" == x && GDM_HALT_COMMAND=${HOST_GDM_HALT_COMMAND}
+-test "x$HALT_COMMAND" == x && HALT_COMMAND=${HOST_HALT_COMMAND}
+-test "x$REBOOT_COMMAND" == x && REBOOT_COMMAND=${HOST_REBOOT_COMMAND}
+-test "x$SUSPEND_COMMAND" == x && SUSPEND_COMMAND=${HOST_SUSPEND_COMMAND}
+-test "x$XSESSION_SHELL" == x && XSESSION_SHELL=${HOST_XSESSION_SHELL}
+-test "x$SOUND_PROGRAM" == x && SOUND_PROGRAM=${HOST_SOUND_PROGRAM}
+-test "x$GDMGNOMESESSIONCMD" == x && GDMGNOMESESSIONCMD=${HOST_GDMGNOMESESSIONCMD}
+-test "x$UTMP_LINE_ATTACHED" == x && UTMP_LINE_ATTACHED=${HOST_UTMP_LINE_ATTACHED}
+-test "x$UTMP_LINE_REMOTE" == x && UTMP_LINE_REMOTE=${HOST_UTMP_LINE_REMOTE}
+-test "x$UTMP_PSEUDO_DEVICE" == x && UTMP_PSEUDO_DEVICE=${HOST_UTMP_PSEUDO_DEVICE}
+-test "x$GDM_RBAC_SYSCMD_KEYS" == x && GDM_RBAC_SYSCMD_KEYS=${HOST_GDM_RBAC_SYSCMD_KEYS}
++test "x$GDM_USER_PATH" = x && GDM_USER_PATH=${HOST_GDM_USER_PATH}
++test "x$GDM_HALT_COMMAND" = x && GDM_HALT_COMMAND=${HOST_GDM_HALT_COMMAND}
++test "x$HALT_COMMAND" = x && HALT_COMMAND=${HOST_HALT_COMMAND}
++test "x$REBOOT_COMMAND" = x && REBOOT_COMMAND=${HOST_REBOOT_COMMAND}
++test "x$SUSPEND_COMMAND" = x && SUSPEND_COMMAND=${HOST_SUSPEND_COMMAND}
++test "x$XSESSION_SHELL" = x && XSESSION_SHELL=${HOST_XSESSION_SHELL}
++test "x$SOUND_PROGRAM" = x && SOUND_PROGRAM=${HOST_SOUND_PROGRAM}
++test "x$GDMGNOMESESSIONCMD" = x && GDMGNOMESESSIONCMD=${HOST_GDMGNOMESESSIONCMD}
++test "x$UTMP_LINE_ATTACHED" = x && UTMP_LINE_ATTACHED=${HOST_UTMP_LINE_ATTACHED}
++test "x$UTMP_LINE_REMOTE" = x && UTMP_LINE_REMOTE=${HOST_UTMP_LINE_REMOTE}
++test "x$UTMP_PSEUDO_DEVICE" = x && UTMP_PSEUDO_DEVICE=${HOST_UTMP_PSEUDO_DEVICE}
++test "x$GDM_RBAC_SYSCMD_KEYS" = x && GDM_RBAC_SYSCMD_KEYS=${HOST_GDM_RBAC_SYSCMD_KEYS}
+
+ # On Solaris, the /usr/bin/Xserver script is used to decide whether to
+ # use Xsun or Xorg, so this is used on Solaris.
diff --git a/x11/gdm/files/patch-daemon_gdmconsolekit.c b/x11/gdm/files/patch-daemon_gdmconsolekit.c
new file mode 100644
index 000000000000..b07647071d08
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_gdmconsolekit.c
@@ -0,0 +1,11 @@
+--- daemon/gdmconsolekit.c.orig 2007-08-30 22:57:18.000000000 -0400
++++ daemon/gdmconsolekit.c 2007-08-30 22:57:35.000000000 -0400
+@@ -457,7 +457,7 @@ open_ck_session (struct passwd *pwent,
+ char *device;
+
+ /* FIXME: how does xorg construct this */
+- device = g_strdup_printf ("/dev/tty%d", d->vt);
++ device = g_strdup_printf ("/dev/ttyv%d", d->vt - 1);
+ add_param_string (&iter_struct, "x11-display-device", device);
+ g_free (device);
+ }
diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install
index bcce174fd151..b775c107227c 100644
--- a/x11/gdm/pkg-install
+++ b/x11/gdm/pkg-install
@@ -38,8 +38,8 @@ POST-INSTALL)
${MKDIR} -p /var/log/gdm
${CHOWN} -R root:${GROUP} /var/gdm
${CHMOD} 1770 /var/gdm
- ${CHOWN} root:wheel ${PKG_PREFIX}/share/gnome/gdm
- ${CHMOD} 0755 ${PKG_PREFIX}/share/gnome/gdm
+ ${CHOWN} root:wheel ${PKG_PREFIX}/share/gdm
+ ${CHMOD} 0755 ${PKG_PREFIX}/share/gdm
${MKDIR} -p ${PKG_PREFIX}/etc/dm/Sessions
exit 0
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 72961e6973a5..2a17308472eb 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -38,112 +38,47 @@ sbin/gdm-restart
sbin/gdm-safe-restart
sbin/gdm-stop
sbin/gdmsetup
-share/gnome/applications/gdmflexiserver-xnest.desktop
-share/gnome/applications/gdmflexiserver.desktop
-share/gnome/applications/gdmphotosetup.desktop
-share/gnome/applications/gdmsetup.desktop
-share/gnome/gdm/BuiltInSessions/default.desktop
-share/gnome/gdm/defaults.conf
-share/gnome/gdm/factory-defaults.conf
-share/gnome/gdm/gdmchooser.glade
-share/gnome/gdm/gdmphotosetup.glade
-share/gnome/gdm/gdmsetup.glade
-share/gnome/gdm/themes/circles/GdmGreeterTheme.desktop
-share/gnome/gdm/themes/circles/background.svg
-share/gnome/gdm/themes/circles/circles.xml
-share/gnome/gdm/themes/circles/flower.png
-share/gnome/gdm/themes/circles/help.png
-share/gnome/gdm/themes/circles/options.png
-share/gnome/gdm/themes/circles/screenshot.png
-share/gnome/gdm/themes/happygnome-list/GdmGreeterTheme.desktop
-share/gnome/gdm/themes/happygnome-list/background.svg
-share/gnome/gdm/themes/happygnome-list/gnome-logo.svg
-share/gnome/gdm/themes/happygnome-list/happygnome.xml
-share/gnome/gdm/themes/happygnome-list/options.png
-share/gnome/gdm/themes/happygnome-list/screenshot.png
-share/gnome/gdm/themes/happygnome/GdmGreeterTheme.desktop
-share/gnome/gdm/themes/happygnome/background.svg
-share/gnome/gdm/themes/happygnome/gnome-logo.svg
-share/gnome/gdm/themes/happygnome/happygnome.xml
-share/gnome/gdm/themes/happygnome/options.png
-share/gnome/gdm/themes/happygnome/screenshot.png
+%%DATADIR%%/BuiltInSessions/default.desktop
+%%DATADIR%%/applications/gdmflexiserver-xnest.desktop
+%%DATADIR%%/applications/gdmflexiserver.desktop
+%%DATADIR%%/applications/gdmphotosetup.desktop
+%%DATADIR%%/applications/gdmsetup.desktop
+%%DATADIR%%/defaults.conf
+%%DATADIR%%/factory-defaults.conf
+%%DATADIR%%/gdmchooser.glade
+%%DATADIR%%/gdmphotosetup.glade
+%%DATADIR%%/gdmsetup.glade
+%%DATADIR%%/themes/circles/GdmGreeterTheme.desktop
+%%DATADIR%%/themes/circles/background.svg
+%%DATADIR%%/themes/circles/circles.xml
+%%DATADIR%%/themes/circles/flower.png
+%%DATADIR%%/themes/circles/screenshot.png
+%%DATADIR%%/themes/happygnome-list/GdmGreeterTheme.desktop
+%%DATADIR%%/themes/happygnome-list/background.svg
+%%DATADIR%%/themes/happygnome-list/gnome-logo.svg
+%%DATADIR%%/themes/happygnome-list/happygnome-list.xml
+%%DATADIR%%/themes/happygnome-list/screenshot.png
+%%DATADIR%%/themes/happygnome/GdmGreeterTheme.desktop
+%%DATADIR%%/themes/happygnome/background.svg
+%%DATADIR%%/themes/happygnome/gnome-logo.svg
+%%DATADIR%%/themes/happygnome/happygnome.xml
+%%DATADIR%%/themes/happygnome/screenshot.png
share/gnome/help/gdm/C/gdm.xml
share/gnome/help/gdm/C/legal.xml
-share/gnome/help/gdm/de/figures/gdm_window.png
-share/gnome/help/gdm/de/gdm.xml
-share/gnome/help/gdm/de/legal.xml
-share/gnome/help/gdm/es/figures/gdm_window.png
+share/gnome/help/gdm/en_GB/gdm.xml
share/gnome/help/gdm/es/gdm.xml
-share/gnome/help/gdm/es/legal.xml
-share/gnome/help/gdm/fr/figures/gdm_window.png
share/gnome/help/gdm/fr/gdm.xml
-share/gnome/help/gdm/fr/legal.xml
-share/gnome/help/gdm/it/figures/gdm_window.png
-share/gnome/help/gdm/it/gdm.xml
-share/gnome/help/gdm/it/legal.xml
-share/gnome/help/gdm/ja/figures/gdm_window.png
-share/gnome/help/gdm/ja/gdm.xml
-share/gnome/help/gdm/ja/legal.xml
-share/gnome/help/gdm/ko/figures/gdm_window.png
share/gnome/help/gdm/ko/gdm.xml
-share/gnome/help/gdm/ko/legal.xml
+share/gnome/help/gdm/oc/gdm.xml
+share/gnome/help/gdm/sv/gdm.xml
share/gnome/help/gdm/uk/gdm.xml
-share/gnome/help/gdm/uk/legal.xml
-share/gnome/help/gdm/zh_CN/figures/gdm_window.png
-share/gnome/help/gdm/zh_CN/gdm.xml
-share/gnome/help/gdm/zh_CN/legal.xml
-share/gnome/help/gdm/zh_HK/figures/gdm_window.png
-share/gnome/help/gdm/zh_HK/gdm.xml
-share/gnome/help/gdm/zh_HK/legal.xml
-share/gnome/help/gdm/zh_TW/figures/gdm_window.png
-share/gnome/help/gdm/zh_TW/gdm.xml
-share/gnome/help/gdm/zh_TW/legal.xml
-share/gnome/omf/gdm/gdm-C.omf
-share/gnome/omf/gdm/gdm-de.omf
-share/gnome/omf/gdm/gdm-es.omf
-share/gnome/omf/gdm/gdm-fr.omf
-share/gnome/omf/gdm/gdm-it.omf
-share/gnome/omf/gdm/gdm-ja.omf
-share/gnome/omf/gdm/gdm-ko.omf
-share/gnome/omf/gdm/gdm-uk.omf
-share/gnome/omf/gdm/gdm-zh_CN.omf
-share/gnome/omf/gdm/gdm-zh_HK.omf
-share/gnome/omf/gdm/gdm-zh_TW.omf
-share/gnome/pixmaps/faces/astronaut.jpg
-share/gnome/pixmaps/faces/baseball.png
-share/gnome/pixmaps/faces/butterfly.png
-share/gnome/pixmaps/faces/cat-eye.jpg
-share/gnome/pixmaps/faces/chess.jpg
-share/gnome/pixmaps/faces/coffee.jpg
-share/gnome/pixmaps/faces/dice.jpg
-share/gnome/pixmaps/faces/energy-arc.jpg
-share/gnome/pixmaps/faces/fish.jpg
-share/gnome/pixmaps/faces/flake.jpg
-share/gnome/pixmaps/faces/flower.jpg
-share/gnome/pixmaps/faces/grapes.jpg
-share/gnome/pixmaps/faces/guitar.jpg
-share/gnome/pixmaps/faces/launch.jpg
-share/gnome/pixmaps/faces/leaf.jpg
-share/gnome/pixmaps/faces/lightning.jpg
-share/gnome/pixmaps/faces/penguin.jpg
-share/gnome/pixmaps/faces/puppy.jpg
-share/gnome/pixmaps/faces/sky.jpg
-share/gnome/pixmaps/faces/soccerball.png
-share/gnome/pixmaps/faces/sunflower.jpg
-share/gnome/pixmaps/faces/sunset.jpg
-share/gnome/pixmaps/faces/tennis-ball.png
-share/gnome/pixmaps/faces/yellow-rose.jpg
-share/gnome/pixmaps/gdm-foot-logo.png
-share/gnome/pixmaps/gdm-setup.png
-share/gnome/pixmaps/gdm-xnest.png
-share/gnome/pixmaps/gdm.png
-share/gnome/pixmaps/login-photo.png
-share/gnome/pixmaps/nobody.png
-share/gnome/pixmaps/nohost.png
-share/gnome/xsessions/gnome.desktop
share/icons/hicolor/16x16/apps/gdm-xnest.png
share/icons/hicolor/32x32/apps/gdm-setup.png
share/icons/hicolor/32x32/apps/gdm-xnest.png
+share/icons/hicolor/48x48/apps/gdm-login-photo.png
+share/icons/hicolor/48x48/apps/gdm-setup.png
+share/icons/hicolor/48x48/apps/gdm-xnest.png
+share/icons/hicolor/48x48/apps/gdm.png
share/locale/af/LC_MESSAGES/gdm.mo
share/locale/am/LC_MESSAGES/gdm.mo
share/locale/ar/LC_MESSAGES/gdm.mo
@@ -182,6 +117,7 @@ share/locale/is/LC_MESSAGES/gdm.mo
share/locale/it/LC_MESSAGES/gdm.mo
share/locale/ja/LC_MESSAGES/gdm.mo
share/locale/ka/LC_MESSAGES/gdm.mo
+share/locale/kn/LC_MESSAGES/gdm.mo
share/locale/ko/LC_MESSAGES/gdm.mo
share/locale/ku/LC_MESSAGES/gdm.mo
share/locale/lt/LC_MESSAGES/gdm.mo
@@ -207,6 +143,7 @@ share/locale/pt_BR/LC_MESSAGES/gdm.mo
share/locale/ro/LC_MESSAGES/gdm.mo
share/locale/ru/LC_MESSAGES/gdm.mo
share/locale/rw/LC_MESSAGES/gdm.mo
+share/locale/si/LC_MESSAGES/gdm.mo
share/locale/sk/LC_MESSAGES/gdm.mo
share/locale/sl/LC_MESSAGES/gdm.mo
share/locale/sq/LC_MESSAGES/gdm.mo
@@ -214,6 +151,7 @@ share/locale/sr/LC_MESSAGES/gdm.mo
share/locale/sr@Latn/LC_MESSAGES/gdm.mo
share/locale/sv/LC_MESSAGES/gdm.mo
share/locale/ta/LC_MESSAGES/gdm.mo
+share/locale/te/LC_MESSAGES/gdm.mo
share/locale/th/LC_MESSAGES/gdm.mo
share/locale/tr/LC_MESSAGES/gdm.mo
share/locale/uk/LC_MESSAGES/gdm.mo
@@ -224,36 +162,61 @@ share/locale/zh_CN/LC_MESSAGES/gdm.mo
share/locale/zh_HK/LC_MESSAGES/gdm.mo
share/locale/zh_TW/LC_MESSAGES/gdm.mo
share/locale/zu/LC_MESSAGES/gdm.mo
-@dirrm share/gnome/xsessions
-@dirrm share/gnome/pixmaps/faces
-@dirrm share/gnome/omf/gdm
-@dirrm share/gnome/help/gdm/zh_TW/figures
-@dirrm share/gnome/help/gdm/zh_TW
-@dirrm share/gnome/help/gdm/zh_HK/figures
-@dirrm share/gnome/help/gdm/zh_HK
-@dirrm share/gnome/help/gdm/zh_CN/figures
-@dirrm share/gnome/help/gdm/zh_CN
+share/omf/gdm/gdm-C.omf
+share/omf/gdm/gdm-en_GB.omf
+share/omf/gdm/gdm-es.omf
+share/omf/gdm/gdm-fr.omf
+share/omf/gdm/gdm-ko.omf
+share/omf/gdm/gdm-oc.omf
+share/omf/gdm/gdm-sv.omf
+share/omf/gdm/gdm-uk.omf
+share/pixmaps/faces/astronaut.jpg
+share/pixmaps/faces/baseball.png
+share/pixmaps/faces/butterfly.png
+share/pixmaps/faces/cat-eye.jpg
+share/pixmaps/faces/chess.jpg
+share/pixmaps/faces/coffee.jpg
+share/pixmaps/faces/dice.jpg
+share/pixmaps/faces/energy-arc.jpg
+share/pixmaps/faces/fish.jpg
+share/pixmaps/faces/flake.jpg
+share/pixmaps/faces/flower.jpg
+share/pixmaps/faces/grapes.jpg
+share/pixmaps/faces/guitar.jpg
+share/pixmaps/faces/launch.jpg
+share/pixmaps/faces/leaf.jpg
+share/pixmaps/faces/lightning.jpg
+share/pixmaps/faces/penguin.jpg
+share/pixmaps/faces/puppy.jpg
+share/pixmaps/faces/sky.jpg
+share/pixmaps/faces/soccerball.png
+share/pixmaps/faces/sunflower.jpg
+share/pixmaps/faces/sunset.jpg
+share/pixmaps/faces/tennis-ball.png
+share/pixmaps/faces/yellow-rose.jpg
+share/pixmaps/gdm-foot-logo.png
+share/pixmaps/nobody.png
+share/pixmaps/nohost.png
+share/xsessions/gnome.desktop
+@dirrm share/xsessions
+@dirrm share/pixmaps/faces
+@dirrm share/omf/gdm
@dirrm share/gnome/help/gdm/uk
-@dirrm share/gnome/help/gdm/ko/figures
+@dirrm share/gnome/help/gdm/sv
+@dirrm share/gnome/help/gdm/oc
@dirrm share/gnome/help/gdm/ko
-@dirrm share/gnome/help/gdm/ja/figures
-@dirrm share/gnome/help/gdm/ja
-@dirrm share/gnome/help/gdm/it/figures
-@dirrm share/gnome/help/gdm/it
-@dirrm share/gnome/help/gdm/fr/figures
@dirrm share/gnome/help/gdm/fr
-@dirrm share/gnome/help/gdm/es/figures
@dirrm share/gnome/help/gdm/es
-@dirrm share/gnome/help/gdm/de/figures
-@dirrm share/gnome/help/gdm/de
+@dirrm share/gnome/help/gdm/en_GB
@dirrm share/gnome/help/gdm/C
@dirrm share/gnome/help/gdm
-@dirrm share/gnome/gdm/themes/happygnome-list
-@dirrm share/gnome/gdm/themes/happygnome
-@dirrm share/gnome/gdm/themes/circles
-@dirrm share/gnome/gdm/themes
-@dirrm share/gnome/gdm/BuiltInSessions
-@dirrm share/gnome/gdm
+@dirrm %%DATADIR%%/themes/happygnome-list
+@dirrm %%DATADIR%%/themes/happygnome
+@dirrm %%DATADIR%%/themes/circles
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/applications
+@dirrm %%DATADIR%%/BuiltInSessions
+@dirrm %%DATADIR%%
@dirrm etc/gdm/modules
@dirrm etc/gdm/Sessions
@dirrm etc/gdm/PreSession
@@ -264,8 +227,8 @@ share/locale/zu/LC_MESSAGES/gdm.mo
@dirrmtry etc/dm/Sessions
@dirrmtry etc/dm
@dirrmtry sbin
-@dirrmtry share/gnome/log/gdm
-@dirrmtry share/gnome/log
+@dirrmtry share/log/gdm
+@dirrmtry share/log
@unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true
@unexec /bin/rm -rf /var/log/gdm 2>/dev/null || /usr/bin/true
@dirrmtry share/locale/zu/LC_MESSAGES
@@ -274,6 +237,10 @@ share/locale/zu/LC_MESSAGES/gdm.mo
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/oc/LC_MESSAGES
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 885b47ad9e7b..0745ce4215d0 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-applets/Makefile,v 1.152 2007/03/12 17:47:04 marcus Exp $
+# $MCom: ports/x11/gnome-applets/Makefile,v 1.165 2007/09/16 17:19:03 ahze Exp $
#
PORTNAME= gnome-applets
-PORTVERSION= 2.18.0
-PORTREVISION= 4
+PORTVERSION= 2.20.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -45,8 +44,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
OS_SYS="/usr/include"
GCONF_SCHEMAS= charpick.schemas drivemount.schemas geyes.schemas \
- gswitchit.schemas gweather.schemas \
- mixer.schemas multiload.schemas \
+ gweather.schemas mixer.schemas multiload.schemas \
stickynotes.schemas
OPTIONS= MINI_COMMANDER "Enable mini-commander applet" off
@@ -99,8 +97,8 @@ PLIST_SUB+= PYTHON="@comment "
post-patch:
@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \
${WRKSRC}/libgweather/weather-met.c
- @${REINPLACE_CMD} -e 's|system-tools-backends|system-tools-backends-2.0|g' \
- ${WRKSRC}/configure
+ @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|" == "|" = "|g'
.if !defined(USE_PYTHON)
@${REINPLACE_CMD} -e 's|HAVE_PYGTK="yes"|HAVE_PYGTK="no"|' \
${WRKSRC}/configure
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index 14fb514cff2b..cbb7fa73c51f 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-applets-2.18.0.tar.bz2) = db3ef99c00335798f30fc0a9162c0257
-SHA256 (gnome2/gnome-applets-2.18.0.tar.bz2) = f8f23e0c5e156afb0811d7a7fcbfec8dc667b8e35fa8a1cfff0b4866014c2157
-SIZE (gnome2/gnome-applets-2.18.0.tar.bz2) = 7133902
+MD5 (gnome2/gnome-applets-2.20.0.tar.bz2) = 985cfc3c58a72e1a92201bf4a4873b87
+SHA256 (gnome2/gnome-applets-2.20.0.tar.bz2) = 7a0f23a99c6c2166786578ede34a81939aa771d25502c33e9c29236a8233acff
+SIZE (gnome2/gnome-applets-2.20.0.tar.bz2) = 7488862
diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa
index 2e1c62bde21d..7d1f860845cb 100644
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-aa
@@ -1,16 +1,15 @@
---- configure.orig Wed Jul 26 16:38:04 2006
-+++ configure Wed Jul 26 16:38:04 2006
-@@ -24860,8 +24860,7 @@
+--- configure.orig 2007-07-09 18:13:48.000000000 -0400
++++ configure 2007-07-09 18:14:19.000000000 -0400
+@@ -25117,7 +25117,7 @@ _ACEOF
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-- ac_define_dir=`eval echo $"${prefix}/share/locale"`
-- ac_define_dir=`eval echo $ac_define_dir`
-+ ac_define_dir=`eval echo "${prefix}/share/locale"`
+- ac_define_dir=`eval echo $"${datadir}/locale"`
++ ac_define_dir=`eval echo "${datadir}/locale"`
+ ac_define_dir=`eval echo $ac_define_dir`
GNOMELOCALEDIR="$ac_define_dir"
-
-@@ -27066,8 +27065,8 @@
+@@ -27157,8 +27157,8 @@ fi
;;
# list of supported OS cores that do not use libapm
@@ -21,7 +20,16 @@
ACPIINC="-I${OS_SYS}"
else
ACPIINC="-I/usr/src/sys"
-@@ -28145,6 +28144,9 @@
+@@ -27924,7 +27924,7 @@ echo "${ECHO_T}no" >&6; }
+ fi
+
+
+- stb="system-tools-backends"
++ stb="system-tools-backends-2.0"
+
+ if test x$PKG_CONFIG != xno ; then
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.12 ; then
+@@ -28166,6 +28166,9 @@ if test x$disable_cpufreq = xno; then
*linux*)
build_cpufreq_applet=yes
;;
@@ -31,82 +39,66 @@
*)
{ echo "$as_me:$LINENO: WARNING: ${host} is not supported by cpufreq applet, not building" >&5
echo "$as_me: WARNING: ${host} is not supported by cpufreq applet, not building" >&2;}
-@@ -28752,7 +28754,7 @@
- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
-
-
--iconsdir="${datadir}/icons"
-+iconsdir="${prefix}/share/icons"
-
- pixmapsdir="${datadir}/pixmaps"
-
-@@ -28764,8 +28766,7 @@
+@@ -28684,7 +28687,7 @@ gladedir="${pkgdatadir}/glade"
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- ac_define_dir=`eval echo $"${iconsdir}"`
-- ac_define_dir=`eval echo $ac_define_dir`
+ ac_define_dir=`eval echo "${iconsdir}"`
+ ac_define_dir=`eval echo $ac_define_dir`
GNOME_ICONDIR="$ac_define_dir"
-
-@@ -28777,8 +28778,7 @@
+@@ -28697,7 +28700,7 @@ _ACEOF
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- ac_define_dir=`eval echo $"${pixmapsdir}"`
-- ac_define_dir=`eval echo $ac_define_dir`
+ ac_define_dir=`eval echo "${pixmapsdir}"`
+ ac_define_dir=`eval echo $ac_define_dir`
GNOME_PIXMAPSDIR="$ac_define_dir"
-
-@@ -28790,8 +28790,7 @@
+@@ -28710,7 +28713,7 @@ _ACEOF
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- ac_define_dir=`eval echo $"${gladedir}"`
-- ac_define_dir=`eval echo $ac_define_dir`
+ ac_define_dir=`eval echo "${gladedir}"`
+ ac_define_dir=`eval echo $ac_define_dir`
GNOME_GLADEDIR="$ac_define_dir"
-
-@@ -28803,8 +28802,7 @@
+@@ -28723,7 +28726,7 @@ _ACEOF
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- ac_define_dir=`eval echo $"${datadir}"`
-- ac_define_dir=`eval echo $ac_define_dir`
+ ac_define_dir=`eval echo "${datadir}"`
+ ac_define_dir=`eval echo $ac_define_dir`
DATADIR="$ac_define_dir"
-
-@@ -28816,8 +28814,7 @@
+@@ -28736,7 +28739,7 @@ _ACEOF
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- ac_define_dir=`eval echo $"${sysconfdir}"`
-- ac_define_dir=`eval echo $ac_define_dir`
+ ac_define_dir=`eval echo "${sysconfdir}"`
+ ac_define_dir=`eval echo $ac_define_dir`
SYSCONFDIR="$ac_define_dir"
-
-@@ -28829,8 +28826,7 @@
+@@ -28749,7 +28752,7 @@ _ACEOF
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- ac_define_dir=`eval echo $"${libdir}"`
-- ac_define_dir=`eval echo $ac_define_dir`
+ ac_define_dir=`eval echo "${libdir}"`
+ ac_define_dir=`eval echo $ac_define_dir`
LIBDIR="$ac_define_dir"
-
-@@ -28842,8 +28838,7 @@
+@@ -28762,7 +28765,7 @@ _ACEOF
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- ac_define_dir=`eval echo $"$prefix"`
-- ac_define_dir=`eval echo $ac_define_dir`
+ ac_define_dir=`eval echo "$prefix"`
+ ac_define_dir=`eval echo $ac_define_dir`
PREFIX="$ac_define_dir"
-
diff --git a/x11/gnome-applets/files/patch-cpufreq-freebsd b/x11/gnome-applets/files/patch-cpufreq-freebsd
index 5c7f4dfa71d6..a597e6725bd0 100644
--- a/x11/gnome-applets/files/patch-cpufreq-freebsd
+++ b/x11/gnome-applets/files/patch-cpufreq-freebsd
@@ -396,9 +396,9 @@
+ return list;
+}
+#endif /* __FreeBSD__ */
---- cpufreq/src/Makefile.in.orig Mon Mar 12 11:58:09 2007
-+++ cpufreq/src/Makefile.in Mon Mar 12 12:12:06 2007
-@@ -62,7 +62,8 @@ am__cpufreq_applet_SOURCES_DIST = cpufre
+--- cpufreq/src/Makefile.in.orig 2007-07-30 21:06:58.000000000 -0400
++++ cpufreq/src/Makefile.in 2007-07-30 21:06:58.000000000 -0400
+@@ -61,7 +61,8 @@ am__cpufreq_applet_SOURCES_DIST = cpufre
cpufreq-monitor-procfs.h cpufreq-monitor-sysfs.c \
cpufreq-monitor-sysfs.h cpufreq-monitor-libcpufreq.c \
cpufreq-monitor-libcpufreq.h cpufreq-monitor-cpuinfo.c \
@@ -408,7 +408,7 @@
@HAVE_LIBCPUFREQ_TRUE@am__objects_1 = \
@HAVE_LIBCPUFREQ_TRUE@ cpufreq-monitor-libcpufreq.$(OBJEXT)
am_cpufreq_applet_OBJECTS = cpufreq-applet.$(OBJEXT) \
-@@ -71,7 +72,8 @@ am_cpufreq_applet_OBJECTS = cpufreq-appl
+@@ -70,7 +71,8 @@ am_cpufreq_applet_OBJECTS = cpufreq-appl
cpufreq-monitor-factory.$(OBJEXT) \
cpufreq-monitor-procfs.$(OBJEXT) \
cpufreq-monitor-sysfs.$(OBJEXT) $(am__objects_1) \
@@ -418,15 +418,7 @@
cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS)
am__DEPENDENCIES_1 =
cpufreq_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@@ -85,6 +87,7 @@ am__depfiles_maybe = depfiles
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-procfs.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysfs.Po \
-+@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysctl.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-popup.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-prefs.Po \
-@@ -411,6 +414,7 @@ cpufreq_applet_SOURCES = \
+@@ -402,6 +404,7 @@ cpufreq_applet_SOURCES = \
cpufreq-monitor.c cpufreq-monitor.h \
cpufreq-monitor-factory.c cpufreq-monitor-factory.h \
cpufreq-monitor-procfs.c cpufreq-monitor-procfs.h \
@@ -434,7 +426,7 @@
cpufreq-monitor-sysfs.c cpufreq-monitor-sysfs.h \
$(cpufreq_files) \
cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h
-@@ -496,6 +500,7 @@ distclean-compile:
+@@ -487,6 +490,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@
diff --git a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
index 0647e375d529..734bd6c74cea 100644
--- a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
+++ b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
@@ -190,9 +190,9 @@
+
+ return TRUE;
+}
---- cpufreq/src/cpufreq-selector/Makefile.in.orig Mon Mar 12 11:58:09 2007
-+++ cpufreq/src/cpufreq-selector/Makefile.in Mon Mar 12 12:12:33 2007
-@@ -58,13 +58,15 @@ am__cpufreq_selector_SOURCES_DIST = cpuf
+--- cpufreq/src/cpufreq-selector/Makefile.in.orig 2007-07-30 21:08:35.000000000 -0400
++++ cpufreq/src/cpufreq-selector/Makefile.in 2007-07-30 21:08:36.000000000 -0400
+@@ -57,13 +57,15 @@ am__cpufreq_selector_SOURCES_DIST = cpuf
cpufreq-selector.h cpufreq-selector-sysfs.c \
cpufreq-selector-sysfs.h cpufreq-selector-procfs.c \
cpufreq-selector-procfs.h cpufreq-selector-libcpufreq.c \
@@ -210,15 +210,7 @@
cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS)
am__DEPENDENCIES_1 =
cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@@ -75,6 +77,7 @@ am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-selector-libcpufreq.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector-procfs.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector-sysfs.Po \
-+@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector-sysctl.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/main.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -385,6 +388,7 @@ cpufreq_selector_SOURCES = \
+@@ -381,6 +383,7 @@ cpufreq_selector_SOURCES = \
cpufreq-selector.c cpufreq-selector.h \
cpufreq-selector-sysfs.c cpufreq-selector-sysfs.h \
cpufreq-selector-procfs.c cpufreq-selector-procfs.h \
@@ -226,7 +218,7 @@
$(cpufreq_files) \
main.c
-@@ -466,6 +470,7 @@ distclean-compile:
+@@ -462,6 +465,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-libcpufreq.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-procfs.Po@am__quote@
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 6a2c5d8cf349..aab3b345a88c 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -70,54 +70,53 @@ libexec/multiload-applet-2
libexec/null_applet
libexec/stickynotes_applet
libexec/trashapplet
-%%PYTHON%%share/gnome/applications/invest-chart.desktop
-share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.xml
-%%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml
-%%CPUFREQ%%share/gnome/gnome-2.0/ui/GNOME_CPUFreqApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_CharpickerApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_DriveMountApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_GSwitchItApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_GWeatherApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_GeyesApplet.xml
-%%COMMANDER%%share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_ModemLights.xml
-share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
-%%PYTHON%%share/gnome/gnome-2.0/ui/Invest_Applet.xml
-share/gnome/gnome-applets/geyes/Bizarre/Bizarre-eye.png
-share/gnome/gnome-applets/geyes/Bizarre/Bizarre-pupil.png
-share/gnome/gnome-applets/geyes/Bizarre/config
-share/gnome/gnome-applets/geyes/Bloodshot/Bloodshot-eye.png
-share/gnome/gnome-applets/geyes/Bloodshot/Bloodshot-pupil.png
-share/gnome/gnome-applets/geyes/Bloodshot/config
-share/gnome/gnome-applets/geyes/Default-tiny/Default-tiny-eye.png
-share/gnome/gnome-applets/geyes/Default-tiny/Default-tiny-pupil.png
-share/gnome/gnome-applets/geyes/Default-tiny/config
-share/gnome/gnome-applets/geyes/Default/Default-eye.png
-share/gnome/gnome-applets/geyes/Default/Default-pupil.png
-share/gnome/gnome-applets/geyes/Default/config
-share/gnome/gnome-applets/geyes/Horrid/config
-share/gnome/gnome-applets/geyes/Horrid/horrid_eye.png
-share/gnome/gnome-applets/geyes/Horrid/horrid_pupil.png
-share/gnome/gnome-applets/geyes/Tango/config
-share/gnome/gnome-applets/geyes/Tango/tango-eye.png
-share/gnome/gnome-applets/geyes/Tango/tango-pupil.png
-%%BATTERY%%share/gnome/gnome-applets/glade/battstat_applet.glade
-%%CPUFREQ%%share/gnome/gnome-applets/glade/cpufreq-preferences.glade
-%%PYTHON%%share/gnome/gnome-applets/glade/financialchart.glade
-share/gnome/gnome-applets/glade/gswitchit.glade
-%%COMMANDER%%share/gnome/gnome-applets/glade/mini-commander.glade
-share/gnome/gnome-applets/glade/modemlights.glade
-%%PYTHON%%share/gnome/gnome-applets/glade/prefs-dialog.glade
-share/gnome/gnome-applets/glade/stickynotes.glade
-share/gnome/gnome-applets/glade/trashapplet.glade
-share/gnome/gnome-applets/gweather/Locations.xml
-share/gnome/gnome-applets/gweather/locations.dtd
-%%PYTHON%%share/gnome/gnome-applets/invest-applet/invest-16.png
-%%PYTHON%%share/gnome/gnome-applets/invest-applet/invest-button.png
-%%PYTHON%%share/gnome/gnome-applets/invest-applet/invest.svg
+share/gnome-2.0/ui/GNOME_AccessxApplet.xml
+%%BATTERY%%share/gnome-2.0/ui/GNOME_BattstatApplet.xml
+%%CPUFREQ%%share/gnome-2.0/ui/GNOME_CPUFreqApplet.xml
+share/gnome-2.0/ui/GNOME_CharpickerApplet.xml
+share/gnome-2.0/ui/GNOME_DriveMountApplet.xml
+share/gnome-2.0/ui/GNOME_GSwitchItApplet.xml
+share/gnome-2.0/ui/GNOME_GWeatherApplet.xml
+share/gnome-2.0/ui/GNOME_GeyesApplet.xml
+%%COMMANDER%%share/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml
+share/gnome-2.0/ui/GNOME_MixerApplet.xml
+share/gnome-2.0/ui/GNOME_ModemLights.xml
+share/gnome-2.0/ui/GNOME_MultiloadApplet.xml
+share/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml
+share/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
+%%PYTHON%%share/gnome-2.0/ui/Invest_Applet.xml
+%%DATADIR%%/geyes/Bizarre/Bizarre-eye.png
+%%DATADIR%%/geyes/Bizarre/Bizarre-pupil.png
+%%DATADIR%%/geyes/Bizarre/config
+%%DATADIR%%/geyes/Bloodshot/Bloodshot-eye.png
+%%DATADIR%%/geyes/Bloodshot/Bloodshot-pupil.png
+%%DATADIR%%/geyes/Bloodshot/config
+%%DATADIR%%/geyes/Default-tiny/Default-tiny-eye.png
+%%DATADIR%%/geyes/Default-tiny/Default-tiny-pupil.png
+%%DATADIR%%/geyes/Default-tiny/config
+%%DATADIR%%/geyes/Default/Default-eye.png
+%%DATADIR%%/geyes/Default/Default-pupil.png
+%%DATADIR%%/geyes/Default/config
+%%DATADIR%%/geyes/Horrid/config
+%%DATADIR%%/geyes/Horrid/horrid_eye.png
+%%DATADIR%%/geyes/Horrid/horrid_pupil.png
+%%DATADIR%%/geyes/Tango/config
+%%DATADIR%%/geyes/Tango/tango-eye.png
+%%DATADIR%%/geyes/Tango/tango-pupil.png
+%%BATTERY%%%%DATADIR%%/glade/battstat_applet.glade
+%%CPUFREQ%%%%DATADIR%%/glade/cpufreq-preferences.glade
+%%PYTHON%%%%DATADIR%%/glade/financialchart.glade
+%%DATADIR%%/glade/gswitchit.glade
+%%COMMANDER%%%%DATADIR%%/glade/mini-commander.glade
+%%DATADIR%%/glade/modemlights.glade
+%%PYTHON%%%%DATADIR%%/glade/prefs-dialog.glade
+%%DATADIR%%/glade/stickynotes.glade
+%%DATADIR%%/glade/trashapplet.glade
+%%DATADIR%%/gweather/Locations.xml
+%%DATADIR%%/gweather/locations.dtd
+%%PYTHON%%%%DATADIR%%/invest-applet/invest-16.png
+%%PYTHON%%%%DATADIR%%/invest-applet/invest-button.png
+%%PYTHON%%%%DATADIR%%/invest-applet/invest.svg
share/gnome/help/accessx-status/C/accessx-status.xml
share/gnome/help/accessx-status/C/figures/accessx-status-applet.png
share/gnome/help/accessx-status/C/figures/accessx-status-disabled.png
@@ -143,6 +142,18 @@ share/gnome/help/accessx-status/bg/figures/accessx_sticky-keys.png
share/gnome/help/accessx-status/bg/figures/accessx_sticky-meta-key.png
share/gnome/help/accessx-status/bg/figures/accessx_sticky-shift-key.png
share/gnome/help/accessx-status/bg/figures/accessx_sticky-windows-key.png
+share/gnome/help/accessx-status/ca/accessx-status.xml
+share/gnome/help/accessx-status/ca/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/ca/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/ca/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/ca/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/ca/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/ca/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/ca/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/ca/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/ca/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/ca/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/ca/figures/accessx_sticky-windows-key.png
share/gnome/help/accessx-status/en_GB/accessx-status.xml
share/gnome/help/accessx-status/en_GB/figures/accessx-status-applet.png
share/gnome/help/accessx-status/en_GB/figures/accessx-status-disabled.png
@@ -203,6 +214,18 @@ share/gnome/help/accessx-status/nl/figures/accessx_sticky-keys.png
share/gnome/help/accessx-status/nl/figures/accessx_sticky-meta-key.png
share/gnome/help/accessx-status/nl/figures/accessx_sticky-shift-key.png
share/gnome/help/accessx-status/nl/figures/accessx_sticky-windows-key.png
+share/gnome/help/accessx-status/oc/accessx-status.xml
+share/gnome/help/accessx-status/oc/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/oc/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/oc/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/oc/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/oc/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/oc/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/oc/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/oc/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/oc/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/oc/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/oc/figures/accessx_sticky-windows-key.png
share/gnome/help/accessx-status/sv/accessx-status.xml
share/gnome/help/accessx-status/sv/figures/accessx-status-applet.png
share/gnome/help/accessx-status/sv/figures/accessx-status-disabled.png
@@ -258,6 +281,12 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png
%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-credits-hal.png
%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-preferences.png
%%BATTERY%%share/gnome/help/battstat/fr/figures/context-menu.png
+%%BATTERY%%share/gnome/help/battstat/oc/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/oc/figures/battstat-applet-expanded.png
+%%BATTERY%%share/gnome/help/battstat/oc/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/oc/figures/battstat-credits-hal.png
+%%BATTERY%%share/gnome/help/battstat/oc/figures/battstat-preferences.png
+%%BATTERY%%share/gnome/help/battstat/oc/figures/context-menu.png
%%BATTERY%%share/gnome/help/battstat/pa/battstat.xml
%%BATTERY%%share/gnome/help/battstat/pa/figures/battstat-applet-expanded.png
%%BATTERY%%share/gnome/help/battstat/pa/figures/battstat-applet.png
@@ -312,11 +341,21 @@ share/gnome/help/char-palette/nl/figures/charpalette_applet.png
share/gnome/help/char-palette/nl/figures/charpalette_chargroup.png
share/gnome/help/char-palette/nl/figures/charpick-preferences.png
share/gnome/help/char-palette/nl/figures/charpick_characters.png
+share/gnome/help/char-palette/oc/char-palette.xml
+share/gnome/help/char-palette/oc/figures/charpalette_applet.png
+share/gnome/help/char-palette/oc/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/oc/figures/charpick-preferences.png
+share/gnome/help/char-palette/oc/figures/charpick_characters.png
share/gnome/help/char-palette/pt_BR/char-palette.xml
share/gnome/help/char-palette/pt_BR/figures/charpalette_applet.png
share/gnome/help/char-palette/pt_BR/figures/charpalette_chargroup.png
share/gnome/help/char-palette/pt_BR/figures/charpick-preferences.png
share/gnome/help/char-palette/pt_BR/figures/charpick_characters.png
+share/gnome/help/char-palette/ru/char-palette.xml
+share/gnome/help/char-palette/ru/figures/charpalette_applet.png
+share/gnome/help/char-palette/ru/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/ru/figures/charpick-preferences.png
+share/gnome/help/char-palette/ru/figures/charpick_characters.png
share/gnome/help/char-palette/sv/char-palette.xml
share/gnome/help/char-palette/sv/figures/charpalette_applet.png
share/gnome/help/char-palette/sv/figures/charpalette_chargroup.png
@@ -344,6 +383,10 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
%%COMMANDER%%share/gnome/help/command-line/fr/figures/command-line.png
%%COMMANDER%%share/gnome/help/command-line/fr/figures/prefs-macros.png
%%COMMANDER%%share/gnome/help/command-line/fr/figures/prefs.png
+%%COMMANDER%%share/gnome/help/command-line/oc/command-line.xml
+%%COMMANDER%%share/gnome/help/command-line/oc/figures/command-line.png
+%%COMMANDER%%share/gnome/help/command-line/oc/figures/prefs-macros.png
+%%COMMANDER%%share/gnome/help/command-line/oc/figures/prefs.png
%%COMMANDER%%share/gnome/help/command-line/pt_BR/command-line.xml
%%COMMANDER%%share/gnome/help/command-line/pt_BR/figures/command-line.png
%%COMMANDER%%share/gnome/help/command-line/pt_BR/figures/prefs-macros.png
@@ -367,6 +410,16 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-selector.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/legal.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-100.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-25.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-applet-preferences.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-applet-selector-both.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-applet-selector.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-applet.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/cpufreq-applet.xml
%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-100.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-25.png
@@ -407,6 +460,26 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-selector-both.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-selector.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-100.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-25.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-applet-preferences.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-applet-selector-both.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-applet-selector.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-applet.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/figures/cpufreq-100.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/figures/cpufreq-25.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/figures/cpufreq-applet-preferences.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/figures/cpufreq-applet-selector-both.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/figures/cpufreq-applet-selector.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/figures/cpufreq-applet.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/cpufreq-applet.xml
%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-100.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-25.png
@@ -468,6 +541,12 @@ share/gnome/help/drivemount/it/figures/drivemount-applet_example.png
share/gnome/help/drivemount/it/figures/drivemount-applet_mount.png
share/gnome/help/drivemount/it/figures/drivemount-applet_open.png
share/gnome/help/drivemount/it/figures/drivemount-applet_status.png
+share/gnome/help/drivemount/oc/drivemount.xml
+share/gnome/help/drivemount/oc/figures/drivemount-applet_eject.png
+share/gnome/help/drivemount/oc/figures/drivemount-applet_example.png
+share/gnome/help/drivemount/oc/figures/drivemount-applet_mount.png
+share/gnome/help/drivemount/oc/figures/drivemount-applet_open.png
+share/gnome/help/drivemount/oc/figures/drivemount-applet_status.png
share/gnome/help/drivemount/pa/drivemount.xml
share/gnome/help/drivemount/pa/figures/drivemount-applet_eject.png
share/gnome/help/drivemount/pa/figures/drivemount-applet_example.png
@@ -503,6 +582,8 @@ share/gnome/help/geyes/C/geyes.xml
share/gnome/help/geyes/C/legal.xml
share/gnome/help/geyes/bg/figures/geyes_applet.png
share/gnome/help/geyes/bg/geyes.xml
+share/gnome/help/geyes/ca/figures/geyes_applet.png
+share/gnome/help/geyes/ca/geyes.xml
share/gnome/help/geyes/en_GB/figures/geyes_applet.png
share/gnome/help/geyes/en_GB/geyes.xml
share/gnome/help/geyes/es/figures/geyes_applet.png
@@ -511,6 +592,8 @@ share/gnome/help/geyes/fr/figures/geyes_applet.png
share/gnome/help/geyes/fr/geyes.xml
share/gnome/help/geyes/it/figures/geyes_applet.png
share/gnome/help/geyes/it/geyes.xml
+share/gnome/help/geyes/oc/figures/geyes_applet.png
+share/gnome/help/geyes/oc/geyes.xml
share/gnome/help/geyes/ru/figures/geyes_applet.png
share/gnome/help/geyes/ru/geyes.xml
share/gnome/help/geyes/sv/figures/geyes_applet.png
@@ -519,9 +602,11 @@ share/gnome/help/geyes/uk/figures/geyes_applet.png
share/gnome/help/geyes/uk/geyes.xml
share/gnome/help/gswitchit/C/gswitchit.xml
share/gnome/help/gswitchit/C/legal.xml
+share/gnome/help/gswitchit/el/gswitchit.xml
share/gnome/help/gswitchit/en_GB/gswitchit.xml
share/gnome/help/gswitchit/es/gswitchit.xml
share/gnome/help/gswitchit/fr/gswitchit.xml
+share/gnome/help/gswitchit/oc/gswitchit.xml
share/gnome/help/gswitchit/ru/gswitchit.xml
share/gnome/help/gswitchit/sv/gswitchit.xml
share/gnome/help/gswitchit/uk/gswitchit.xml
@@ -601,6 +686,21 @@ share/gnome/help/gweather/nl/figures/stock_weather-snow.png
share/gnome/help/gweather/nl/figures/stock_weather-storm.png
share/gnome/help/gweather/nl/figures/stock_weather-sunny.png
share/gnome/help/gweather/nl/gweather.xml
+share/gnome/help/gweather/oc/figures/gweather-details.png
+share/gnome/help/gweather/oc/figures/gweather-menu-prefs.png
+share/gnome/help/gweather/oc/figures/gweather-prefs-general.png
+share/gnome/help/gweather/oc/figures/gweather-prefs-locations.png
+share/gnome/help/gweather/oc/figures/gweather_applet.png
+share/gnome/help/gweather/oc/figures/stock_weather-cloudy.png
+share/gnome/help/gweather/oc/figures/stock_weather-few-clouds.png
+share/gnome/help/gweather/oc/figures/stock_weather-fog.png
+share/gnome/help/gweather/oc/figures/stock_weather-night-clear.png
+share/gnome/help/gweather/oc/figures/stock_weather-night-few-clouds.png
+share/gnome/help/gweather/oc/figures/stock_weather-showers.png
+share/gnome/help/gweather/oc/figures/stock_weather-snow.png
+share/gnome/help/gweather/oc/figures/stock_weather-storm.png
+share/gnome/help/gweather/oc/figures/stock_weather-sunny.png
+share/gnome/help/gweather/oc/gweather.xml
share/gnome/help/gweather/pa/figures/gweather-details.png
share/gnome/help/gweather/pa/figures/gweather-menu-prefs.png
share/gnome/help/gweather/pa/figures/gweather-prefs-general.png
@@ -649,6 +749,8 @@ share/gnome/help/gweather/uk/gweather.xml
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/ca/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/ca/mixer_applet2.xml
share/gnome/help/mixer_applet2/en_GB/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/en_GB/mixer_applet2.xml
share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png
@@ -657,6 +759,8 @@ share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/fr/mixer_applet2.xml
share/gnome/help/mixer_applet2/it/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/it/mixer_applet2.xml
+share/gnome/help/mixer_applet2/oc/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/oc/mixer_applet2.xml
share/gnome/help/mixer_applet2/pa/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/pa/mixer_applet2.xml
share/gnome/help/mixer_applet2/ru/figures/volumecontrol_applet.png
@@ -670,6 +774,10 @@ share/gnome/help/multiload/C/figures/system-monitor-applet_window.png
share/gnome/help/multiload/C/figures/system_monitor.png
share/gnome/help/multiload/C/legal.xml
share/gnome/help/multiload/C/multiload.xml
+share/gnome/help/multiload/ca/figures/multiload-preferences.png
+share/gnome/help/multiload/ca/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/ca/figures/system_monitor.png
+share/gnome/help/multiload/ca/multiload.xml
share/gnome/help/multiload/en_GB/figures/multiload-preferences.png
share/gnome/help/multiload/en_GB/figures/system-monitor-applet_window.png
share/gnome/help/multiload/en_GB/figures/system_monitor.png
@@ -682,6 +790,10 @@ share/gnome/help/multiload/fr/figures/multiload-preferences.png
share/gnome/help/multiload/fr/figures/system-monitor-applet_window.png
share/gnome/help/multiload/fr/figures/system_monitor.png
share/gnome/help/multiload/fr/multiload.xml
+share/gnome/help/multiload/oc/figures/multiload-preferences.png
+share/gnome/help/multiload/oc/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/oc/figures/system_monitor.png
+share/gnome/help/multiload/oc/multiload.xml
share/gnome/help/multiload/pa/figures/multiload-preferences.png
share/gnome/help/multiload/pa/figures/system-monitor-applet_window.png
share/gnome/help/multiload/pa/figures/system_monitor.png
@@ -723,6 +835,12 @@ share/gnome/help/stickynotes_applet/fr/figures/stickynotes-note-prefs.png
share/gnome/help/stickynotes_applet/fr/figures/stickynotes-prefs.png
share/gnome/help/stickynotes_applet/fr/figures/stickynotes_applet.png
share/gnome/help/stickynotes_applet/fr/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/oc/figures/stickynote-right-menu-lock.png
+share/gnome/help/stickynotes_applet/oc/figures/stickynote-right-menu-new.png
+share/gnome/help/stickynotes_applet/oc/figures/stickynotes-note-prefs.png
+share/gnome/help/stickynotes_applet/oc/figures/stickynotes-prefs.png
+share/gnome/help/stickynotes_applet/oc/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/oc/stickynotes_applet.xml
share/gnome/help/stickynotes_applet/pa/figures/stickynote-right-menu-lock.png
share/gnome/help/stickynotes_applet/pa/figures/stickynote-right-menu-new.png
share/gnome/help/stickynotes_applet/pa/figures/stickynotes-note-prefs.png
@@ -754,6 +872,8 @@ share/gnome/help/trashapplet/it/figures/trash-applet.png
share/gnome/help/trashapplet/it/trashapplet.xml
share/gnome/help/trashapplet/nl/figures/trash-applet.png
share/gnome/help/trashapplet/nl/trashapplet.xml
+share/gnome/help/trashapplet/oc/figures/trash-applet.png
+share/gnome/help/trashapplet/oc/trashapplet.xml
share/gnome/help/trashapplet/pa/figures/trash-applet.png
share/gnome/help/trashapplet/pa/trashapplet.xml
share/gnome/help/trashapplet/ru/figures/trash-applet.png
@@ -762,249 +882,6 @@ share/gnome/help/trashapplet/sv/figures/trash-applet.png
share/gnome/help/trashapplet/sv/trashapplet.xml
share/gnome/help/trashapplet/uk/figures/trash-applet.png
share/gnome/help/trashapplet/uk/trashapplet.xml
-share/gnome/omf/accessx-status/accessx-status-C.omf
-share/gnome/omf/accessx-status/accessx-status-bg.omf
-share/gnome/omf/accessx-status/accessx-status-en_GB.omf
-share/gnome/omf/accessx-status/accessx-status-es.omf
-share/gnome/omf/accessx-status/accessx-status-fr.omf
-share/gnome/omf/accessx-status/accessx-status-it.omf
-share/gnome/omf/accessx-status/accessx-status-nl.omf
-share/gnome/omf/accessx-status/accessx-status-sv.omf
-share/gnome/omf/accessx-status/accessx-status-uk.omf
-%%BATTERY%%share/gnome/omf/battstat/battstat-C.omf
-%%BATTERY%%share/gnome/omf/battstat/battstat-bg.omf
-%%BATTERY%%share/gnome/omf/battstat/battstat-en_GB.omf
-%%BATTERY%%share/gnome/omf/battstat/battstat-es.omf
-%%BATTERY%%share/gnome/omf/battstat/battstat-fr.omf
-%%BATTERY%%share/gnome/omf/battstat/battstat-pa.omf
-%%BATTERY%%share/gnome/omf/battstat/battstat-sv.omf
-%%BATTERY%%share/gnome/omf/battstat/battstat-uk.omf
-share/gnome/omf/char-palette/char-palette-C.omf
-share/gnome/omf/char-palette/char-palette-bg.omf
-share/gnome/omf/char-palette/char-palette-en_GB.omf
-share/gnome/omf/char-palette/char-palette-es.omf
-share/gnome/omf/char-palette/char-palette-fr.omf
-share/gnome/omf/char-palette/char-palette-it.omf
-share/gnome/omf/char-palette/char-palette-nl.omf
-share/gnome/omf/char-palette/char-palette-pt_BR.omf
-share/gnome/omf/char-palette/char-palette-sv.omf
-share/gnome/omf/char-palette/char-palette-uk.omf
-%%COMMANDER%%share/gnome/omf/command-line/command-line-C.omf
-%%COMMANDER%%share/gnome/omf/command-line/command-line-en_GB.omf
-%%COMMANDER%%share/gnome/omf/command-line/command-line-es.omf
-%%COMMANDER%%share/gnome/omf/command-line/command-line-fr.omf
-%%COMMANDER%%share/gnome/omf/command-line/command-line-pt_BR.omf
-%%COMMANDER%%share/gnome/omf/command-line/command-line-sv.omf
-%%COMMANDER%%share/gnome/omf/command-line/command-line-uk.omf
-%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-C.omf
-%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-en_GB.omf
-%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-es.omf
-%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-fr.omf
-%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-nl.omf
-%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-sv.omf
-%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-uk.omf
-%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-zh_CN.omf
-share/gnome/omf/drivemount/drivemount-C.omf
-share/gnome/omf/drivemount/drivemount-en_GB.omf
-share/gnome/omf/drivemount/drivemount-es.omf
-share/gnome/omf/drivemount/drivemount-fr.omf
-share/gnome/omf/drivemount/drivemount-it.omf
-share/gnome/omf/drivemount/drivemount-pa.omf
-share/gnome/omf/drivemount/drivemount-ru.omf
-share/gnome/omf/drivemount/drivemount-sv.omf
-share/gnome/omf/drivemount/drivemount-uk.omf
-share/gnome/omf/drivemount/drivemount-zh_CN.omf
-share/gnome/omf/geyes/geyes-C.omf
-share/gnome/omf/geyes/geyes-bg.omf
-share/gnome/omf/geyes/geyes-en_GB.omf
-share/gnome/omf/geyes/geyes-es.omf
-share/gnome/omf/geyes/geyes-fr.omf
-share/gnome/omf/geyes/geyes-it.omf
-share/gnome/omf/geyes/geyes-ru.omf
-share/gnome/omf/geyes/geyes-sv.omf
-share/gnome/omf/geyes/geyes-uk.omf
-share/gnome/omf/gswitchit/gswitchit-C.omf
-share/gnome/omf/gswitchit/gswitchit-en_GB.omf
-share/gnome/omf/gswitchit/gswitchit-es.omf
-share/gnome/omf/gswitchit/gswitchit-fr.omf
-share/gnome/omf/gswitchit/gswitchit-ru.omf
-share/gnome/omf/gswitchit/gswitchit-sv.omf
-share/gnome/omf/gswitchit/gswitchit-uk.omf
-share/gnome/omf/gweather/gweather-C.omf
-share/gnome/omf/gweather/gweather-en_GB.omf
-share/gnome/omf/gweather/gweather-es.omf
-share/gnome/omf/gweather/gweather-fr.omf
-share/gnome/omf/gweather/gweather-nl.omf
-share/gnome/omf/gweather/gweather-pa.omf
-share/gnome/omf/gweather/gweather-sv.omf
-share/gnome/omf/gweather/gweather-uk.omf
-share/gnome/omf/mixer_applet2/mixer_applet2-C.omf
-share/gnome/omf/mixer_applet2/mixer_applet2-en_GB.omf
-share/gnome/omf/mixer_applet2/mixer_applet2-es.omf
-share/gnome/omf/mixer_applet2/mixer_applet2-fr.omf
-share/gnome/omf/mixer_applet2/mixer_applet2-it.omf
-share/gnome/omf/mixer_applet2/mixer_applet2-pa.omf
-share/gnome/omf/mixer_applet2/mixer_applet2-ru.omf
-share/gnome/omf/mixer_applet2/mixer_applet2-sv.omf
-share/gnome/omf/mixer_applet2/mixer_applet2-uk.omf
-share/gnome/omf/multiload/multiload-C.omf
-share/gnome/omf/multiload/multiload-en_GB.omf
-share/gnome/omf/multiload/multiload-es.omf
-share/gnome/omf/multiload/multiload-fr.omf
-share/gnome/omf/multiload/multiload-pa.omf
-share/gnome/omf/multiload/multiload-ru.omf
-share/gnome/omf/multiload/multiload-sv.omf
-share/gnome/omf/multiload/multiload-uk.omf
-share/gnome/omf/stickynotes_applet/stickynotes_applet-C.omf
-share/gnome/omf/stickynotes_applet/stickynotes_applet-en_GB.omf
-share/gnome/omf/stickynotes_applet/stickynotes_applet-es.omf
-share/gnome/omf/stickynotes_applet/stickynotes_applet-fr.omf
-share/gnome/omf/stickynotes_applet/stickynotes_applet-pa.omf
-share/gnome/omf/stickynotes_applet/stickynotes_applet-sv.omf
-share/gnome/omf/stickynotes_applet/stickynotes_applet-uk.omf
-share/gnome/omf/trashapplet/trashapplet-C.omf
-share/gnome/omf/trashapplet/trashapplet-en_GB.omf
-share/gnome/omf/trashapplet/trashapplet-es.omf
-share/gnome/omf/trashapplet/trashapplet-fr.omf
-share/gnome/omf/trashapplet/trashapplet-it.omf
-share/gnome/omf/trashapplet/trashapplet-nl.omf
-share/gnome/omf/trashapplet/trashapplet-pa.omf
-share/gnome/omf/trashapplet/trashapplet-ru.omf
-share/gnome/omf/trashapplet/trashapplet-sv.omf
-share/gnome/omf/trashapplet/trashapplet-uk.omf
-share/gnome/pixmaps/accessx-status-applet/ax-applet.png
-share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png
-share/gnome/pixmaps/accessx-status-applet/ax-key-base.png
-share/gnome/pixmaps/accessx-status-applet/ax-key-inverse.png
-share/gnome/pixmaps/accessx-status-applet/ax-key-no.png
-share/gnome/pixmaps/accessx-status-applet/ax-key-none.png
-share/gnome/pixmaps/accessx-status-applet/ax-key-yes.png
-share/gnome/pixmaps/accessx-status-applet/ax-slowkeys-no.png
-share/gnome/pixmaps/accessx-status-applet/ax-slowkeys-pending.png
-share/gnome/pixmaps/accessx-status-applet/ax-slowkeys-yes.png
-share/gnome/pixmaps/accessx-status-applet/ax-slowkeys.png
-share/gnome/pixmaps/accessx-status-applet/mousekeys-base.png
-share/gnome/pixmaps/accessx-status-applet/mousekeys-default-left.png
-share/gnome/pixmaps/accessx-status-applet/mousekeys-default-middle.png
-share/gnome/pixmaps/accessx-status-applet/mousekeys-default-right.png
-share/gnome/pixmaps/accessx-status-applet/mousekeys-pressed-left.png
-share/gnome/pixmaps/accessx-status-applet/mousekeys-pressed-middle.png
-share/gnome/pixmaps/accessx-status-applet/mousekeys-pressed-right.png
-share/gnome/pixmaps/accessx-status-applet/sticky-alt-latched.png
-share/gnome/pixmaps/accessx-status-applet/sticky-alt-locked.png
-share/gnome/pixmaps/accessx-status-applet/sticky-alt-none.png
-share/gnome/pixmaps/accessx-status-applet/sticky-ctrl-latched.png
-share/gnome/pixmaps/accessx-status-applet/sticky-ctrl-locked.png
-share/gnome/pixmaps/accessx-status-applet/sticky-ctrl-none.png
-share/gnome/pixmaps/accessx-status-applet/sticky-hyper-latched.png
-share/gnome/pixmaps/accessx-status-applet/sticky-hyper-locked.png
-share/gnome/pixmaps/accessx-status-applet/sticky-hyper-none.png
-share/gnome/pixmaps/accessx-status-applet/sticky-meta-latched.png
-share/gnome/pixmaps/accessx-status-applet/sticky-meta-locked.png
-share/gnome/pixmaps/accessx-status-applet/sticky-meta-none.png
-share/gnome/pixmaps/accessx-status-applet/sticky-shift-latched.png
-share/gnome/pixmaps/accessx-status-applet/sticky-shift-locked.png
-share/gnome/pixmaps/accessx-status-applet/sticky-shift-none.png
-share/gnome/pixmaps/accessx-status-applet/sticky-super-latched.png
-share/gnome/pixmaps/accessx-status-applet/sticky-super-locked.png
-share/gnome/pixmaps/accessx-status-applet/sticky-super-none.png
-%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-100.png
-%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-25.png
-%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-50.png
-%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-75.png
-%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-na.png
-%%PYTHON%%share/gnome/pixmaps/invest-big.png
-share/gnome/pixmaps/stickynotes/close.png
-share/gnome/pixmaps/stickynotes/locked.png
-share/gnome/pixmaps/stickynotes/resize_se.png
-share/gnome/pixmaps/stickynotes/resize_sw.png
-share/gnome/pixmaps/stickynotes/unlocked.png
-share/gnome/xmodmap/base.xml
-share/gnome/xmodmap/xmodmap.am
-share/gnome/xmodmap/xmodmap.ar
-share/gnome/xmodmap/xmodmap.be
-share/gnome/xmodmap/xmodmap.bg
-share/gnome/xmodmap/xmodmap.br
-share/gnome/xmodmap/xmodmap.ch
-share/gnome/xmodmap/xmodmap.ch_de
-share/gnome/xmodmap/xmodmap.ch_fr
-share/gnome/xmodmap/xmodmap.cz
-share/gnome/xmodmap/xmodmap.de
-share/gnome/xmodmap/xmodmap.de-apple
-share/gnome/xmodmap/xmodmap.dk
-share/gnome/xmodmap/xmodmap.dvorak
-share/gnome/xmodmap/xmodmap.ee
-share/gnome/xmodmap/xmodmap.es
-share/gnome/xmodmap/xmodmap.es_x86
-share/gnome/xmodmap/xmodmap.fi
-share/gnome/xmodmap/xmodmap.fr
-share/gnome/xmodmap/xmodmap.fr-2
-share/gnome/xmodmap/xmodmap.fr_x86
-share/gnome/xmodmap/xmodmap.gb
-share/gnome/xmodmap/xmodmap.gb-102
-share/gnome/xmodmap/xmodmap.gb-105
-share/gnome/xmodmap/xmodmap.ge_la
-share/gnome/xmodmap/xmodmap.ge_ru
-share/gnome/xmodmap/xmodmap.gr
-share/gnome/xmodmap/xmodmap.hu
-share/gnome/xmodmap/xmodmap.hu-101-lat1
-share/gnome/xmodmap/xmodmap.hu-101-lat2
-share/gnome/xmodmap/xmodmap.hu-ibm
-share/gnome/xmodmap/xmodmap.hu-lat1
-share/gnome/xmodmap/xmodmap.hu-sun-lat2
-share/gnome/xmodmap/xmodmap.hu.old
-share/gnome/xmodmap/xmodmap.hu_latin1
-share/gnome/xmodmap/xmodmap.hu_x86
-share/gnome/xmodmap/xmodmap.il
-share/gnome/xmodmap/xmodmap.il_phonetic
-share/gnome/xmodmap/xmodmap.is
-share/gnome/xmodmap/xmodmap.it
-share/gnome/xmodmap/xmodmap.jp
-share/gnome/xmodmap/xmodmap.kr
-share/gnome/xmodmap/xmodmap.la
-share/gnome/xmodmap/xmodmap.lt
-share/gnome/xmodmap/xmodmap.lt_b
-share/gnome/xmodmap/xmodmap.lt_p
-share/gnome/xmodmap/xmodmap.mk
-share/gnome/xmodmap/xmodmap.mn
-share/gnome/xmodmap/xmodmap.mn-phonet
-share/gnome/xmodmap/xmodmap.mn-rev
-share/gnome/xmodmap/xmodmap.mn-uni
-share/gnome/xmodmap/xmodmap.nl
-share/gnome/xmodmap/xmodmap.no
-share/gnome/xmodmap/xmodmap.pl
-share/gnome/xmodmap/xmodmap.pl2
-share/gnome/xmodmap/xmodmap.pt
-share/gnome/xmodmap/xmodmap.pt-dead
-share/gnome/xmodmap/xmodmap.qc
-share/gnome/xmodmap/xmodmap.qc-2
-share/gnome/xmodmap/xmodmap.ro
-share/gnome/xmodmap/xmodmap.ru
-share/gnome/xmodmap/xmodmap.ru-rev
-share/gnome/xmodmap/xmodmap.ru_yawerty
-share/gnome/xmodmap/xmodmap.se
-share/gnome/xmodmap/xmodmap.sf
-share/gnome/xmodmap/xmodmap.sg
-share/gnome/xmodmap/xmodmap.si
-share/gnome/xmodmap/xmodmap.sk
-share/gnome/xmodmap/xmodmap.th
-share/gnome/xmodmap/xmodmap.tr_f
-share/gnome/xmodmap/xmodmap.tr_q
-share/gnome/xmodmap/xmodmap.uk
-share/gnome/xmodmap/xmodmap.uk_x86
-share/gnome/xmodmap/xmodmap.us
-share/gnome/xmodmap/xmodmap.us-101
-share/gnome/xmodmap/xmodmap.us-84
-share/gnome/xmodmap/xmodmap.us-dec
-share/gnome/xmodmap/xmodmap.us-ibm
-share/gnome/xmodmap/xmodmap.us-int
-share/gnome/xmodmap/xmodmap.us-mac
-share/gnome/xmodmap/xmodmap.us-sgi-101
-share/gnome/xmodmap/xmodmap.us-sun
-share/gnome/xmodmap/xmodmap.us.old
-share/gnome/xmodmap/xmodmap.us101A_x86
-share/gnome/xmodmap/xmodmap.us_intl
-share/gnome/xmodmap/xmodmap.yu
%%CPUFREQ%%share/icons/hicolor/16x16/apps/gnome-cpu-frequency-applet.png
share/icons/hicolor/16x16/apps/gnome-eyes-applet.png
share/icons/hicolor/16x16/apps/gnome-modem-monitor-applet.png
@@ -1026,14 +903,16 @@ share/icons/hicolor/48x48/apps/charpick.png
%%COMMANDER%%share/icons/hicolor/48x48/apps/gnome-mini-commander.png
share/icons/hicolor/48x48/apps/gswitchit-applet.png
share/icons/hicolor/48x48/apps/gswitchit-properties-capplet.png
-%%CPUFREQ%%share/icons/hicolor/svgxsvg/apps/gnome-cpu-frequency-applet
-share/icons/hicolor/svgxsvg/apps/gnome-eyes-applet
-share/icons/hicolor/svgxsvg/apps/gnome-modem-monitor-applet
-share/icons/hicolor/svgxsvg/apps/gnome-sticky-notes-applet
+%%CPUFREQ%%share/icons/hicolor/scalable/apps/gnome-cpu-frequency-applet.svg
+share/icons/hicolor/scalable/apps/gnome-eyes-applet.svg
+share/icons/hicolor/scalable/apps/gnome-modem-monitor-applet.svg
+share/icons/hicolor/scalable/apps/gnome-sticky-notes-applet.svg
share/locale/am/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/as/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/be/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/be@latin/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/bn_IN/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1098,6 +977,7 @@ share/locale/nb/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ne/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/oc/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/or/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/pa/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/pl/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1106,6 +986,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ro/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ru/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/rw/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/sk/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/sl/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/sq/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1123,26 +1004,286 @@ share/locale/xh/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/zh_HK/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
-@dirrmtry share/icons/hicolor/svgxsvg/apps
-@dirrmtry share/icons/hicolor/svgxsvg
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@dirrm share/gnome/pixmaps/stickynotes
-%%CPUFREQ%%@dirrm share/gnome/pixmaps/cpufreq-applet
-@dirrm share/gnome/pixmaps/accessx-status-applet
-@dirrm share/gnome/omf/trashapplet
-@dirrm share/gnome/omf/stickynotes_applet
-@dirrm share/gnome/omf/multiload
-@dirrm share/gnome/omf/mixer_applet2
-@dirrm share/gnome/omf/gweather
-@dirrm share/gnome/omf/gswitchit
-@dirrm share/gnome/omf/geyes
-@dirrm share/gnome/omf/drivemount
-%%CPUFREQ%%@dirrm share/gnome/omf/cpufreq-applet
-%%COMMANDER%%@dirrm share/gnome/omf/command-line
-@dirrm share/gnome/omf/char-palette
-%%BATTERY%%@dirrm share/gnome/omf/battstat
-@dirrm share/gnome/omf/accessx-status
+share/omf/accessx-status/accessx-status-C.omf
+share/omf/accessx-status/accessx-status-bg.omf
+share/omf/accessx-status/accessx-status-ca.omf
+share/omf/accessx-status/accessx-status-en_GB.omf
+share/omf/accessx-status/accessx-status-es.omf
+share/omf/accessx-status/accessx-status-fr.omf
+share/omf/accessx-status/accessx-status-it.omf
+share/omf/accessx-status/accessx-status-nl.omf
+share/omf/accessx-status/accessx-status-oc.omf
+share/omf/accessx-status/accessx-status-sv.omf
+share/omf/accessx-status/accessx-status-uk.omf
+%%BATTERY%%share/omf/battstat/battstat-C.omf
+%%BATTERY%%share/omf/battstat/battstat-bg.omf
+%%BATTERY%%share/omf/battstat/battstat-en_GB.omf
+%%BATTERY%%share/omf/battstat/battstat-es.omf
+%%BATTERY%%share/omf/battstat/battstat-fr.omf
+%%BATTERY%%share/omf/battstat/battstat-oc.omf
+%%BATTERY%%share/omf/battstat/battstat-pa.omf
+%%BATTERY%%share/omf/battstat/battstat-sv.omf
+%%BATTERY%%share/omf/battstat/battstat-uk.omf
+share/omf/char-palette/char-palette-C.omf
+share/omf/char-palette/char-palette-bg.omf
+share/omf/char-palette/char-palette-en_GB.omf
+share/omf/char-palette/char-palette-es.omf
+share/omf/char-palette/char-palette-fr.omf
+share/omf/char-palette/char-palette-it.omf
+share/omf/char-palette/char-palette-nl.omf
+share/omf/char-palette/char-palette-oc.omf
+share/omf/char-palette/char-palette-pt_BR.omf
+share/omf/char-palette/char-palette-ru.omf
+share/omf/char-palette/char-palette-sv.omf
+share/omf/char-palette/char-palette-uk.omf
+%%COMMANDER%%share/omf/command-line/command-line-C.omf
+%%COMMANDER%%share/omf/command-line/command-line-en_GB.omf
+%%COMMANDER%%share/omf/command-line/command-line-es.omf
+%%COMMANDER%%share/omf/command-line/command-line-fr.omf
+%%COMMANDER%%share/omf/command-line/command-line-oc.omf
+%%COMMANDER%%share/omf/command-line/command-line-pt_BR.omf
+%%COMMANDER%%share/omf/command-line/command-line-sv.omf
+%%COMMANDER%%share/omf/command-line/command-line-uk.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-C.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-ca.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-en_GB.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-es.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-fr.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-nl.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-oc.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-ru.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-sv.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-uk.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-zh_CN.omf
+share/omf/drivemount/drivemount-C.omf
+share/omf/drivemount/drivemount-en_GB.omf
+share/omf/drivemount/drivemount-es.omf
+share/omf/drivemount/drivemount-fr.omf
+share/omf/drivemount/drivemount-it.omf
+share/omf/drivemount/drivemount-oc.omf
+share/omf/drivemount/drivemount-pa.omf
+share/omf/drivemount/drivemount-ru.omf
+share/omf/drivemount/drivemount-sv.omf
+share/omf/drivemount/drivemount-uk.omf
+share/omf/drivemount/drivemount-zh_CN.omf
+share/omf/geyes/geyes-C.omf
+share/omf/geyes/geyes-bg.omf
+share/omf/geyes/geyes-ca.omf
+share/omf/geyes/geyes-en_GB.omf
+share/omf/geyes/geyes-es.omf
+share/omf/geyes/geyes-fr.omf
+share/omf/geyes/geyes-it.omf
+share/omf/geyes/geyes-oc.omf
+share/omf/geyes/geyes-ru.omf
+share/omf/geyes/geyes-sv.omf
+share/omf/geyes/geyes-uk.omf
+share/omf/gswitchit/gswitchit-C.omf
+share/omf/gswitchit/gswitchit-el.omf
+share/omf/gswitchit/gswitchit-en_GB.omf
+share/omf/gswitchit/gswitchit-es.omf
+share/omf/gswitchit/gswitchit-fr.omf
+share/omf/gswitchit/gswitchit-oc.omf
+share/omf/gswitchit/gswitchit-ru.omf
+share/omf/gswitchit/gswitchit-sv.omf
+share/omf/gswitchit/gswitchit-uk.omf
+share/omf/gweather/gweather-C.omf
+share/omf/gweather/gweather-en_GB.omf
+share/omf/gweather/gweather-es.omf
+share/omf/gweather/gweather-fr.omf
+share/omf/gweather/gweather-nl.omf
+share/omf/gweather/gweather-oc.omf
+share/omf/gweather/gweather-pa.omf
+share/omf/gweather/gweather-sv.omf
+share/omf/gweather/gweather-uk.omf
+share/omf/mixer_applet2/mixer_applet2-C.omf
+share/omf/mixer_applet2/mixer_applet2-ca.omf
+share/omf/mixer_applet2/mixer_applet2-en_GB.omf
+share/omf/mixer_applet2/mixer_applet2-es.omf
+share/omf/mixer_applet2/mixer_applet2-fr.omf
+share/omf/mixer_applet2/mixer_applet2-it.omf
+share/omf/mixer_applet2/mixer_applet2-oc.omf
+share/omf/mixer_applet2/mixer_applet2-pa.omf
+share/omf/mixer_applet2/mixer_applet2-ru.omf
+share/omf/mixer_applet2/mixer_applet2-sv.omf
+share/omf/mixer_applet2/mixer_applet2-uk.omf
+share/omf/multiload/multiload-C.omf
+share/omf/multiload/multiload-ca.omf
+share/omf/multiload/multiload-en_GB.omf
+share/omf/multiload/multiload-es.omf
+share/omf/multiload/multiload-fr.omf
+share/omf/multiload/multiload-oc.omf
+share/omf/multiload/multiload-pa.omf
+share/omf/multiload/multiload-ru.omf
+share/omf/multiload/multiload-sv.omf
+share/omf/multiload/multiload-uk.omf
+share/omf/stickynotes_applet/stickynotes_applet-C.omf
+share/omf/stickynotes_applet/stickynotes_applet-en_GB.omf
+share/omf/stickynotes_applet/stickynotes_applet-es.omf
+share/omf/stickynotes_applet/stickynotes_applet-fr.omf
+share/omf/stickynotes_applet/stickynotes_applet-oc.omf
+share/omf/stickynotes_applet/stickynotes_applet-pa.omf
+share/omf/stickynotes_applet/stickynotes_applet-sv.omf
+share/omf/stickynotes_applet/stickynotes_applet-uk.omf
+share/omf/trashapplet/trashapplet-C.omf
+share/omf/trashapplet/trashapplet-en_GB.omf
+share/omf/trashapplet/trashapplet-es.omf
+share/omf/trashapplet/trashapplet-fr.omf
+share/omf/trashapplet/trashapplet-it.omf
+share/omf/trashapplet/trashapplet-nl.omf
+share/omf/trashapplet/trashapplet-oc.omf
+share/omf/trashapplet/trashapplet-pa.omf
+share/omf/trashapplet/trashapplet-ru.omf
+share/omf/trashapplet/trashapplet-sv.omf
+share/omf/trashapplet/trashapplet-uk.omf
+share/pixmaps/accessx-status-applet/ax-applet.png
+share/pixmaps/accessx-status-applet/ax-bouncekeys.png
+share/pixmaps/accessx-status-applet/ax-key-base.png
+share/pixmaps/accessx-status-applet/ax-key-inverse.png
+share/pixmaps/accessx-status-applet/ax-key-no.png
+share/pixmaps/accessx-status-applet/ax-key-none.png
+share/pixmaps/accessx-status-applet/ax-key-yes.png
+share/pixmaps/accessx-status-applet/ax-slowkeys-no.png
+share/pixmaps/accessx-status-applet/ax-slowkeys-pending.png
+share/pixmaps/accessx-status-applet/ax-slowkeys-yes.png
+share/pixmaps/accessx-status-applet/ax-slowkeys.png
+share/pixmaps/accessx-status-applet/mousekeys-base.png
+share/pixmaps/accessx-status-applet/mousekeys-default-left.png
+share/pixmaps/accessx-status-applet/mousekeys-default-middle.png
+share/pixmaps/accessx-status-applet/mousekeys-default-right.png
+share/pixmaps/accessx-status-applet/mousekeys-pressed-left.png
+share/pixmaps/accessx-status-applet/mousekeys-pressed-middle.png
+share/pixmaps/accessx-status-applet/mousekeys-pressed-right.png
+share/pixmaps/accessx-status-applet/sticky-alt-latched.png
+share/pixmaps/accessx-status-applet/sticky-alt-locked.png
+share/pixmaps/accessx-status-applet/sticky-alt-none.png
+share/pixmaps/accessx-status-applet/sticky-ctrl-latched.png
+share/pixmaps/accessx-status-applet/sticky-ctrl-locked.png
+share/pixmaps/accessx-status-applet/sticky-ctrl-none.png
+share/pixmaps/accessx-status-applet/sticky-hyper-latched.png
+share/pixmaps/accessx-status-applet/sticky-hyper-locked.png
+share/pixmaps/accessx-status-applet/sticky-hyper-none.png
+share/pixmaps/accessx-status-applet/sticky-meta-latched.png
+share/pixmaps/accessx-status-applet/sticky-meta-locked.png
+share/pixmaps/accessx-status-applet/sticky-meta-none.png
+share/pixmaps/accessx-status-applet/sticky-shift-latched.png
+share/pixmaps/accessx-status-applet/sticky-shift-locked.png
+share/pixmaps/accessx-status-applet/sticky-shift-none.png
+share/pixmaps/accessx-status-applet/sticky-super-latched.png
+share/pixmaps/accessx-status-applet/sticky-super-locked.png
+share/pixmaps/accessx-status-applet/sticky-super-none.png
+%%CPUFREQ%%share/pixmaps/cpufreq-applet/cpufreq-100.png
+%%CPUFREQ%%share/pixmaps/cpufreq-applet/cpufreq-25.png
+%%CPUFREQ%%share/pixmaps/cpufreq-applet/cpufreq-50.png
+%%CPUFREQ%%share/pixmaps/cpufreq-applet/cpufreq-75.png
+%%CPUFREQ%%share/pixmaps/cpufreq-applet/cpufreq-na.png
+%%PYTHON%%share/pixmaps/invest-big.png
+share/pixmaps/stickynotes/close.png
+share/pixmaps/stickynotes/locked.png
+share/pixmaps/stickynotes/resize_se.png
+share/pixmaps/stickynotes/resize_sw.png
+share/pixmaps/stickynotes/unlocked.png
+share/xmodmap/base.xml
+share/xmodmap/xmodmap.am
+share/xmodmap/xmodmap.ar
+share/xmodmap/xmodmap.be
+share/xmodmap/xmodmap.bg
+share/xmodmap/xmodmap.br
+share/xmodmap/xmodmap.ch
+share/xmodmap/xmodmap.ch_de
+share/xmodmap/xmodmap.ch_fr
+share/xmodmap/xmodmap.cz
+share/xmodmap/xmodmap.de
+share/xmodmap/xmodmap.de-apple
+share/xmodmap/xmodmap.dk
+share/xmodmap/xmodmap.dvorak
+share/xmodmap/xmodmap.ee
+share/xmodmap/xmodmap.es
+share/xmodmap/xmodmap.es_x86
+share/xmodmap/xmodmap.fi
+share/xmodmap/xmodmap.fr
+share/xmodmap/xmodmap.fr-2
+share/xmodmap/xmodmap.fr_x86
+share/xmodmap/xmodmap.gb
+share/xmodmap/xmodmap.gb-102
+share/xmodmap/xmodmap.gb-105
+share/xmodmap/xmodmap.ge_la
+share/xmodmap/xmodmap.ge_ru
+share/xmodmap/xmodmap.gr
+share/xmodmap/xmodmap.hu
+share/xmodmap/xmodmap.hu-101-lat1
+share/xmodmap/xmodmap.hu-101-lat2
+share/xmodmap/xmodmap.hu-ibm
+share/xmodmap/xmodmap.hu-lat1
+share/xmodmap/xmodmap.hu-sun-lat2
+share/xmodmap/xmodmap.hu.old
+share/xmodmap/xmodmap.hu_latin1
+share/xmodmap/xmodmap.hu_x86
+share/xmodmap/xmodmap.il
+share/xmodmap/xmodmap.il_phonetic
+share/xmodmap/xmodmap.is
+share/xmodmap/xmodmap.it
+share/xmodmap/xmodmap.jp
+share/xmodmap/xmodmap.kr
+share/xmodmap/xmodmap.la
+share/xmodmap/xmodmap.lt
+share/xmodmap/xmodmap.lt_b
+share/xmodmap/xmodmap.lt_p
+share/xmodmap/xmodmap.mk
+share/xmodmap/xmodmap.mn
+share/xmodmap/xmodmap.mn-phonet
+share/xmodmap/xmodmap.mn-rev
+share/xmodmap/xmodmap.mn-uni
+share/xmodmap/xmodmap.nl
+share/xmodmap/xmodmap.no
+share/xmodmap/xmodmap.pl
+share/xmodmap/xmodmap.pl2
+share/xmodmap/xmodmap.pt
+share/xmodmap/xmodmap.pt-dead
+share/xmodmap/xmodmap.qc
+share/xmodmap/xmodmap.qc-2
+share/xmodmap/xmodmap.ro
+share/xmodmap/xmodmap.ru
+share/xmodmap/xmodmap.ru-rev
+share/xmodmap/xmodmap.ru_yawerty
+share/xmodmap/xmodmap.se
+share/xmodmap/xmodmap.sf
+share/xmodmap/xmodmap.sg
+share/xmodmap/xmodmap.si
+share/xmodmap/xmodmap.sk
+share/xmodmap/xmodmap.th
+share/xmodmap/xmodmap.tr_f
+share/xmodmap/xmodmap.tr_q
+share/xmodmap/xmodmap.uk
+share/xmodmap/xmodmap.uk_x86
+share/xmodmap/xmodmap.us
+share/xmodmap/xmodmap.us-101
+share/xmodmap/xmodmap.us-84
+share/xmodmap/xmodmap.us-dec
+share/xmodmap/xmodmap.us-ibm
+share/xmodmap/xmodmap.us-int
+share/xmodmap/xmodmap.us-mac
+share/xmodmap/xmodmap.us-sgi-101
+share/xmodmap/xmodmap.us-sun
+share/xmodmap/xmodmap.us.old
+share/xmodmap/xmodmap.us101A_x86
+share/xmodmap/xmodmap.us_intl
+share/xmodmap/xmodmap.yu
+@dirrm share/pixmaps/stickynotes
+%%CPUFREQ%%@dirrm share/pixmaps/cpufreq-applet
+@dirrm share/pixmaps/accessx-status-applet
+@dirrm share/omf/trashapplet
+@dirrm share/omf/stickynotes_applet
+@dirrm share/omf/multiload
+@dirrm share/omf/mixer_applet2
+@dirrm share/omf/gweather
+@dirrm share/omf/gswitchit
+@dirrm share/omf/geyes
+@dirrm share/omf/drivemount
+%%CPUFREQ%%@dirrm share/omf/cpufreq-applet
+%%COMMANDER%%@dirrm share/omf/command-line
+@dirrm share/omf/char-palette
+%%BATTERY%%@dirrm share/omf/battstat
+@dirrm share/omf/accessx-status
@dirrm share/gnome/help/trashapplet/uk/figures
@dirrm share/gnome/help/trashapplet/uk
@dirrm share/gnome/help/trashapplet/sv/figures
@@ -1151,6 +1292,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/trashapplet/ru
@dirrm share/gnome/help/trashapplet/pa/figures
@dirrm share/gnome/help/trashapplet/pa
+@dirrm share/gnome/help/trashapplet/oc/figures
+@dirrm share/gnome/help/trashapplet/oc
@dirrm share/gnome/help/trashapplet/nl/figures
@dirrm share/gnome/help/trashapplet/nl
@dirrm share/gnome/help/trashapplet/it/figures
@@ -1170,6 +1313,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/stickynotes_applet/sv
@dirrm share/gnome/help/stickynotes_applet/pa/figures
@dirrm share/gnome/help/stickynotes_applet/pa
+@dirrm share/gnome/help/stickynotes_applet/oc/figures
+@dirrm share/gnome/help/stickynotes_applet/oc
@dirrm share/gnome/help/stickynotes_applet/fr/figures
@dirrm share/gnome/help/stickynotes_applet/fr
@dirrm share/gnome/help/stickynotes_applet/es/figures
@@ -1187,12 +1332,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/multiload/ru
@dirrm share/gnome/help/multiload/pa/figures
@dirrm share/gnome/help/multiload/pa
+@dirrm share/gnome/help/multiload/oc/figures
+@dirrm share/gnome/help/multiload/oc
@dirrm share/gnome/help/multiload/fr/figures
@dirrm share/gnome/help/multiload/fr
@dirrm share/gnome/help/multiload/es/figures
@dirrm share/gnome/help/multiload/es
@dirrm share/gnome/help/multiload/en_GB/figures
@dirrm share/gnome/help/multiload/en_GB
+@dirrm share/gnome/help/multiload/ca/figures
+@dirrm share/gnome/help/multiload/ca
@dirrm share/gnome/help/multiload/C/figures
@dirrm share/gnome/help/multiload/C
@dirrm share/gnome/help/multiload
@@ -1204,6 +1353,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/mixer_applet2/ru
@dirrm share/gnome/help/mixer_applet2/pa/figures
@dirrm share/gnome/help/mixer_applet2/pa
+@dirrm share/gnome/help/mixer_applet2/oc/figures
+@dirrm share/gnome/help/mixer_applet2/oc
@dirrm share/gnome/help/mixer_applet2/it/figures
@dirrm share/gnome/help/mixer_applet2/it
@dirrm share/gnome/help/mixer_applet2/fr/figures
@@ -1212,6 +1363,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/mixer_applet2/es
@dirrm share/gnome/help/mixer_applet2/en_GB/figures
@dirrm share/gnome/help/mixer_applet2/en_GB
+@dirrm share/gnome/help/mixer_applet2/ca/figures
+@dirrm share/gnome/help/mixer_applet2/ca
@dirrm share/gnome/help/mixer_applet2/C/figures
@dirrm share/gnome/help/mixer_applet2/C
@dirrm share/gnome/help/mixer_applet2
@@ -1221,6 +1374,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/gweather/sv
@dirrm share/gnome/help/gweather/pa/figures
@dirrm share/gnome/help/gweather/pa
+@dirrm share/gnome/help/gweather/oc/figures
+@dirrm share/gnome/help/gweather/oc
@dirrm share/gnome/help/gweather/nl/figures
@dirrm share/gnome/help/gweather/nl
@dirrm share/gnome/help/gweather/fr/figures
@@ -1235,9 +1390,11 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/gswitchit/uk
@dirrm share/gnome/help/gswitchit/sv
@dirrm share/gnome/help/gswitchit/ru
+@dirrm share/gnome/help/gswitchit/oc
@dirrm share/gnome/help/gswitchit/fr
@dirrm share/gnome/help/gswitchit/es
@dirrm share/gnome/help/gswitchit/en_GB
+@dirrm share/gnome/help/gswitchit/el
@dirrm share/gnome/help/gswitchit/C
@dirrm share/gnome/help/gswitchit
@dirrm share/gnome/help/geyes/uk/figures
@@ -1246,6 +1403,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/geyes/sv
@dirrm share/gnome/help/geyes/ru/figures
@dirrm share/gnome/help/geyes/ru
+@dirrm share/gnome/help/geyes/oc/figures
+@dirrm share/gnome/help/geyes/oc
@dirrm share/gnome/help/geyes/it/figures
@dirrm share/gnome/help/geyes/it
@dirrm share/gnome/help/geyes/fr/figures
@@ -1254,6 +1413,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/geyes/es
@dirrm share/gnome/help/geyes/en_GB/figures
@dirrm share/gnome/help/geyes/en_GB
+@dirrm share/gnome/help/geyes/ca/figures
+@dirrm share/gnome/help/geyes/ca
@dirrm share/gnome/help/geyes/bg/figures
@dirrm share/gnome/help/geyes/bg
@dirrm share/gnome/help/geyes/C/figures
@@ -1269,6 +1430,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/drivemount/ru
@dirrm share/gnome/help/drivemount/pa/figures
@dirrm share/gnome/help/drivemount/pa
+@dirrm share/gnome/help/drivemount/oc/figures
+@dirrm share/gnome/help/drivemount/oc
@dirrm share/gnome/help/drivemount/it/figures
@dirrm share/gnome/help/drivemount/it
@dirrm share/gnome/help/drivemount/fr/figures
@@ -1286,6 +1449,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/sv/figures
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/sv
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/ru/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/ru
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/oc/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/oc
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl/figures
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fr/figures
@@ -1294,6 +1461,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/en_GB/figures
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/en_GB
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/ca/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/ca
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C/figures
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet
@@ -1303,6 +1472,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
%%COMMANDER%%@dirrm share/gnome/help/command-line/sv
%%COMMANDER%%@dirrm share/gnome/help/command-line/pt_BR/figures
%%COMMANDER%%@dirrm share/gnome/help/command-line/pt_BR
+%%COMMANDER%%@dirrm share/gnome/help/command-line/oc/figures
+%%COMMANDER%%@dirrm share/gnome/help/command-line/oc
%%COMMANDER%%@dirrm share/gnome/help/command-line/fr/figures
%%COMMANDER%%@dirrm share/gnome/help/command-line/fr
%%COMMANDER%%@dirrm share/gnome/help/command-line/es/figures
@@ -1316,8 +1487,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/char-palette/uk
@dirrm share/gnome/help/char-palette/sv/figures
@dirrm share/gnome/help/char-palette/sv
+@dirrm share/gnome/help/char-palette/ru/figures
+@dirrm share/gnome/help/char-palette/ru
@dirrm share/gnome/help/char-palette/pt_BR/figures
@dirrm share/gnome/help/char-palette/pt_BR
+@dirrm share/gnome/help/char-palette/oc/figures
+@dirrm share/gnome/help/char-palette/oc
@dirrm share/gnome/help/char-palette/nl/figures
@dirrm share/gnome/help/char-palette/nl
@dirrm share/gnome/help/char-palette/it/figures
@@ -1339,6 +1514,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
%%BATTERY%%@dirrm share/gnome/help/battstat/sv
%%BATTERY%%@dirrm share/gnome/help/battstat/pa/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/pa
+%%BATTERY%%@dirrm share/gnome/help/battstat/oc/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/oc
%%BATTERY%%@dirrm share/gnome/help/battstat/fr/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/fr
%%BATTERY%%@dirrm share/gnome/help/battstat/es/figures
@@ -1354,6 +1531,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/accessx-status/uk
@dirrm share/gnome/help/accessx-status/sv/figures
@dirrm share/gnome/help/accessx-status/sv
+@dirrm share/gnome/help/accessx-status/oc/figures
+@dirrm share/gnome/help/accessx-status/oc
@dirrm share/gnome/help/accessx-status/nl/figures
@dirrm share/gnome/help/accessx-status/nl
@dirrm share/gnome/help/accessx-status/it/figures
@@ -1364,23 +1543,25 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/accessx-status/es
@dirrm share/gnome/help/accessx-status/en_GB/figures
@dirrm share/gnome/help/accessx-status/en_GB
+@dirrm share/gnome/help/accessx-status/ca/figures
+@dirrm share/gnome/help/accessx-status/ca
@dirrm share/gnome/help/accessx-status/bg/figures
@dirrm share/gnome/help/accessx-status/bg
@dirrm share/gnome/help/accessx-status/C/figures
@dirrm share/gnome/help/accessx-status/C
@dirrm share/gnome/help/accessx-status
-%%PYTHON%%@dirrm share/gnome/gnome-applets/invest-applet
-@dirrm share/gnome/gnome-applets/gweather
-@dirrm share/gnome/gnome-applets/glade
-@dirrm share/gnome/gnome-applets/geyes/Tango
-@dirrm share/gnome/gnome-applets/geyes/Horrid
-@dirrm share/gnome/gnome-applets/geyes/Default-tiny
-@dirrm share/gnome/gnome-applets/geyes/Default
-@dirrm share/gnome/gnome-applets/geyes/Bloodshot
-@dirrm share/gnome/gnome-applets/geyes/Bizarre
-@dirrm share/gnome/gnome-applets/geyes
-@dirrm share/gnome/gnome-applets
-%%COMMANDER%%@dirrm libexec/gnome-applets
+%%PYTHON%%@dirrm %%DATADIR%%/invest-applet
+@dirrm %%DATADIR%%/gweather
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%/geyes/Tango
+@dirrm %%DATADIR%%/geyes/Horrid
+@dirrm %%DATADIR%%/geyes/Default-tiny
+@dirrm %%DATADIR%%/geyes/Default
+@dirrm %%DATADIR%%/geyes/Bloodshot
+@dirrm %%DATADIR%%/geyes/Bizarre
+@dirrm %%DATADIR%%/geyes
+@dirrm %%DATADIR%%
+%%COMMANDER%%@dirrmtry libexec/gnome-applets
%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/invest
@dirrm include/libgweather
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -1389,8 +1570,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrmtry share/locale/xh
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@@ -1435,3 +1620,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index a89bb978fe2d..8a1388ad5a36 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-desktop/Makefile,v 1.112 2007/03/13 12:15:44 ahze Exp $
+# $MCom: ports/x11/gnome-desktop/Makefile,v 1.127 2007/10/17 21:36:13 mezz Exp $
#
PORTNAME= gnome-desktop
-PORTVERSION= 2.18.3
+PORTVERSION= 2.20.1
PORTREVISION?= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 1731b7eda864..1c2a077101d9 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-desktop-2.18.3.tar.bz2) = 98de3b7d0da690da8b94cddc74f3914b
-SHA256 (gnome2/gnome-desktop-2.18.3.tar.bz2) = 8997a2ceca2dbb28fb402e23ea5f255b68c59ea4f932b253e2843bfe62af7c64
-SIZE (gnome2/gnome-desktop-2.18.3.tar.bz2) = 1306654
+MD5 (gnome2/gnome-desktop-2.20.1.tar.bz2) = 19912d1e1743960ebf824684cdf8f097
+SHA256 (gnome2/gnome-desktop-2.20.1.tar.bz2) = f94a3e8962980628ae8a18135c419d239109cf1f68b4d8de7e4739194cf53391
+SIZE (gnome2/gnome-desktop-2.20.1.tar.bz2) = 1356668
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index 9535ff1fde10..2d1c2909b170 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -7,25 +7,29 @@ lib/libgnome-desktop-2.la
lib/libgnome-desktop-2.so
lib/libgnome-desktop-2.so.2
libdata/pkgconfig/gnome-desktop-2.0.pc
-share/gnome/applications/gnome-about.desktop
-share/gnome/gnome-about/gnome-64.png
-share/gnome/gnome-about/gnome-version.xml
-share/gnome/gnome-about/headers/header-bg-ancient01a.png
-share/gnome/gnome-about/headers/header-bg-city01.png
-share/gnome/gnome-about/headers/header-bg-clouds01.png
-share/gnome/gnome-about/headers/header-bg-clouds02.png
-share/gnome/gnome-about/headers/header-bg-hills01.png
-share/gnome/gnome-about/headers/header-bg-landscape01.png
-share/gnome/gnome-about/headers/header-bg-mountains01.png
-share/gnome/gnome-about/headers/header-bg-snow01.png
-share/gnome/gnome-about/headers/header-bg-sunset01.png
+share/applications/gnome-about.desktop
+share/gnome-about/contributors.list
+share/gnome-about/foundation-members.list
+share/gnome-about/gnome-64.png
+share/gnome-about/gnome-version.xml
+share/gnome-about/headers/header-bg-ancient01a.png
+share/gnome-about/headers/header-bg-city01.png
+share/gnome-about/headers/header-bg-clouds01.png
+share/gnome-about/headers/header-bg-clouds02.png
+share/gnome-about/headers/header-bg-hills01.png
+share/gnome-about/headers/header-bg-landscape01.png
+share/gnome-about/headers/header-bg-mountains01.png
+share/gnome-about/headers/header-bg-snow01.png
+share/gnome-about/headers/header-bg-sunset01.png
share/gnome/help/fdl/C/fdl.xml
share/gnome/help/fdl/ar/fdl.xml
share/gnome/help/fdl/es/fdl.xml
share/gnome/help/fdl/fr/fdl.xml
share/gnome/help/fdl/ko/fdl.xml
+share/gnome/help/fdl/oc/fdl.xml
share/gnome/help/fdl/sv/fdl.xml
share/gnome/help/fdl/uk/fdl.xml
+share/gnome/help/fdl/vi/fdl.xml
share/gnome/help/gpl/C/gpl.xml
share/gnome/help/gpl/ar/gpl.xml
share/gnome/help/gpl/ca/gpl.xml
@@ -33,6 +37,7 @@ share/gnome/help/gpl/es/gpl.xml
share/gnome/help/gpl/fi/gpl.xml
share/gnome/help/gpl/fr/gpl.xml
share/gnome/help/gpl/ko/gpl.xml
+share/gnome/help/gpl/oc/gpl.xml
share/gnome/help/gpl/pa/gpl.xml
share/gnome/help/gpl/sv/gpl.xml
share/gnome/help/gpl/uk/gpl.xml
@@ -43,110 +48,12 @@ share/gnome/help/lgpl/ar/lgpl.xml
share/gnome/help/lgpl/es/lgpl.xml
share/gnome/help/lgpl/fr/lgpl.xml
share/gnome/help/lgpl/ko/lgpl.xml
+share/gnome/help/lgpl/oc/lgpl.xml
share/gnome/help/lgpl/pa/lgpl.xml
share/gnome/help/lgpl/sv/lgpl.xml
share/gnome/help/lgpl/uk/lgpl.xml
+share/gnome/help/lgpl/vi/lgpl.xml
share/gnome/help/lgpl/zh_CN/lgpl.xml
-share/gnome/omf/fdl/fdl-C.omf
-share/gnome/omf/fdl/fdl-ar.omf
-share/gnome/omf/fdl/fdl-es.omf
-share/gnome/omf/fdl/fdl-fr.omf
-share/gnome/omf/fdl/fdl-ko.omf
-share/gnome/omf/fdl/fdl-sv.omf
-share/gnome/omf/fdl/fdl-uk.omf
-share/gnome/omf/gpl/gpl-C.omf
-share/gnome/omf/gpl/gpl-ar.omf
-share/gnome/omf/gpl/gpl-ca.omf
-share/gnome/omf/gpl/gpl-es.omf
-share/gnome/omf/gpl/gpl-fi.omf
-share/gnome/omf/gpl/gpl-fr.omf
-share/gnome/omf/gpl/gpl-ko.omf
-share/gnome/omf/gpl/gpl-pa.omf
-share/gnome/omf/gpl/gpl-sv.omf
-share/gnome/omf/gpl/gpl-uk.omf
-share/gnome/omf/gpl/gpl-vi.omf
-share/gnome/omf/gpl/gpl-zh_CN.omf
-share/gnome/omf/lgpl/lgpl-C.omf
-share/gnome/omf/lgpl/lgpl-ar.omf
-share/gnome/omf/lgpl/lgpl-es.omf
-share/gnome/omf/lgpl/lgpl-fr.omf
-share/gnome/omf/lgpl/lgpl-ko.omf
-share/gnome/omf/lgpl/lgpl-pa.omf
-share/gnome/omf/lgpl/lgpl-sv.omf
-share/gnome/omf/lgpl/lgpl-uk.omf
-share/gnome/omf/lgpl/lgpl-zh_CN.omf
-share/gnome/pixmaps/apple-green.png
-share/gnome/pixmaps/apple-red.png
-share/gnome/pixmaps/gnome-aorta.png
-share/gnome/pixmaps/gnome-applets.png
-share/gnome/pixmaps/gnome-background-image.png
-share/gnome/pixmaps/gnome-background-pattern.png
-share/gnome/pixmaps/gnome-background.png
-share/gnome/pixmaps/gnome-calc2.png
-share/gnome/pixmaps/gnome-calc3.png
-share/gnome/pixmaps/gnome-calendar.png
-share/gnome/pixmaps/gnome-ccbackground.png
-share/gnome/pixmaps/gnome-ccdesktop.png
-share/gnome/pixmaps/gnome-ccdialog.png
-share/gnome/pixmaps/gnome-ccmime.png
-share/gnome/pixmaps/gnome-ccperiph.png
-share/gnome/pixmaps/gnome-ccscreensaver.png
-share/gnome/pixmaps/gnome-ccwindowmanager.png
-share/gnome/pixmaps/gnome-color-browser.png
-share/gnome/pixmaps/gnome-color-xterm.png
-share/gnome/pixmaps/gnome-computer.png
-share/gnome/pixmaps/gnome-cromagnon.png
-share/gnome/pixmaps/gnome-day.png
-share/gnome/pixmaps/gnome-debian.png
-share/gnome/pixmaps/gnome-diskfree.png
-share/gnome/pixmaps/gnome-emacs.png
-share/gnome/pixmaps/gnome-eterm.png
-share/gnome/pixmaps/gnome-file-c.png
-share/gnome/pixmaps/gnome-file-h.png
-share/gnome/pixmaps/gnome-folder.png
-share/gnome/pixmaps/gnome-gemvt.png
-share/gnome/pixmaps/gnome-gimp.png
-share/gnome/pixmaps/gnome-gmenu.png
-share/gnome/pixmaps/gnome-gmush.png
-share/gnome/pixmaps/gnome-gnomoku.png
-share/gnome/pixmaps/gnome-home.png
-share/gnome/pixmaps/gnome-html.png
-share/gnome/pixmaps/gnome-image-gif.png
-share/gnome/pixmaps/gnome-image-jpeg.png
-share/gnome/pixmaps/gnome-irc.png
-share/gnome/pixmaps/gnome-laptop.png
-share/gnome/pixmaps/gnome-log.png
-share/gnome/pixmaps/gnome-logo-icon-transparent.png
-share/gnome/pixmaps/gnome-logo-icon.png
-share/gnome/pixmaps/gnome-logo-large.png
-share/gnome/pixmaps/gnome-mdi.png
-share/gnome/pixmaps/gnome-mnemonic.png
-share/gnome/pixmaps/gnome-month.png
-share/gnome/pixmaps/gnome-mouse.png
-share/gnome/pixmaps/gnome-news.png
-share/gnome/pixmaps/gnome-note.png
-share/gnome/pixmaps/gnome-qeye.png
-share/gnome/pixmaps/gnome-set-time.png
-share/gnome/pixmaps/gnome-spider.png
-share/gnome/pixmaps/gnome-squeak.png
-share/gnome/pixmaps/gnome-suse.png
-share/gnome/pixmaps/gnome-talk.png
-share/gnome/pixmaps/gnome-term-linux.png
-share/gnome/pixmaps/gnome-term-linux2.png
-share/gnome/pixmaps/gnome-term-night.png
-share/gnome/pixmaps/gnome-term-tiger.png
-share/gnome/pixmaps/gnome-term.png
-share/gnome/pixmaps/gnome-tigert.png
-share/gnome/pixmaps/gnome-touristinfo.png
-share/gnome/pixmaps/gnome-user-interface.png
-share/gnome/pixmaps/gnome-week.png
-share/gnome/pixmaps/gnome-windows.png
-share/gnome/pixmaps/gnome-word.png
-share/gnome/pixmaps/gnome-xterm.png
-share/gnome/pixmaps/gtkvim.png
-share/gnome/pixmaps/kterm.xpm
-share/gnome/pixmaps/monitor.png
-share/gnome/pixmaps/vnterm.xpm
share/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -215,6 +122,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ro/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ru/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/rw/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/sk/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/sl/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/sq/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -229,7 +137,7 @@ share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ug/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ur/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/uz/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/xh/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -239,6 +147,148 @@ share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zh_HK/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
+share/omf/fdl/fdl-C.omf
+share/omf/fdl/fdl-ar.omf
+share/omf/fdl/fdl-es.omf
+share/omf/fdl/fdl-fr.omf
+share/omf/fdl/fdl-ko.omf
+share/omf/fdl/fdl-oc.omf
+share/omf/fdl/fdl-sv.omf
+share/omf/fdl/fdl-uk.omf
+share/omf/fdl/fdl-vi.omf
+share/omf/gpl/gpl-C.omf
+share/omf/gpl/gpl-ar.omf
+share/omf/gpl/gpl-ca.omf
+share/omf/gpl/gpl-es.omf
+share/omf/gpl/gpl-fi.omf
+share/omf/gpl/gpl-fr.omf
+share/omf/gpl/gpl-ko.omf
+share/omf/gpl/gpl-oc.omf
+share/omf/gpl/gpl-pa.omf
+share/omf/gpl/gpl-sv.omf
+share/omf/gpl/gpl-uk.omf
+share/omf/gpl/gpl-vi.omf
+share/omf/gpl/gpl-zh_CN.omf
+share/omf/lgpl/lgpl-C.omf
+share/omf/lgpl/lgpl-ar.omf
+share/omf/lgpl/lgpl-es.omf
+share/omf/lgpl/lgpl-fr.omf
+share/omf/lgpl/lgpl-ko.omf
+share/omf/lgpl/lgpl-oc.omf
+share/omf/lgpl/lgpl-pa.omf
+share/omf/lgpl/lgpl-sv.omf
+share/omf/lgpl/lgpl-uk.omf
+share/omf/lgpl/lgpl-vi.omf
+share/omf/lgpl/lgpl-zh_CN.omf
+share/pixmaps/apple-green.png
+share/pixmaps/apple-red.png
+share/pixmaps/gnome-aorta.png
+share/pixmaps/gnome-applets.png
+share/pixmaps/gnome-background-image.png
+share/pixmaps/gnome-background-pattern.png
+share/pixmaps/gnome-background.png
+share/pixmaps/gnome-calc2.png
+share/pixmaps/gnome-calc3.png
+share/pixmaps/gnome-calendar.png
+share/pixmaps/gnome-ccbackground.png
+share/pixmaps/gnome-ccdesktop.png
+share/pixmaps/gnome-ccdialog.png
+share/pixmaps/gnome-ccmime.png
+share/pixmaps/gnome-ccperiph.png
+share/pixmaps/gnome-ccscreensaver.png
+share/pixmaps/gnome-ccwindowmanager.png
+share/pixmaps/gnome-color-browser.png
+share/pixmaps/gnome-color-xterm.png
+share/pixmaps/gnome-computer.png
+share/pixmaps/gnome-cromagnon.png
+share/pixmaps/gnome-day.png
+share/pixmaps/gnome-debian.png
+share/pixmaps/gnome-diskfree.png
+share/pixmaps/gnome-emacs.png
+share/pixmaps/gnome-eterm.png
+share/pixmaps/gnome-file-c.png
+share/pixmaps/gnome-file-h.png
+share/pixmaps/gnome-folder.png
+share/pixmaps/gnome-gemvt.png
+share/pixmaps/gnome-gimp.png
+share/pixmaps/gnome-gmenu.png
+share/pixmaps/gnome-gmush.png
+share/pixmaps/gnome-gnomoku.png
+share/pixmaps/gnome-home.png
+share/pixmaps/gnome-html.png
+share/pixmaps/gnome-image-gif.png
+share/pixmaps/gnome-image-jpeg.png
+share/pixmaps/gnome-irc.png
+share/pixmaps/gnome-laptop.png
+share/pixmaps/gnome-log.png
+share/pixmaps/gnome-logo-icon-transparent.png
+share/pixmaps/gnome-logo-icon.png
+share/pixmaps/gnome-logo-large.png
+share/pixmaps/gnome-mdi.png
+share/pixmaps/gnome-mnemonic.png
+share/pixmaps/gnome-month.png
+share/pixmaps/gnome-mouse.png
+share/pixmaps/gnome-news.png
+share/pixmaps/gnome-note.png
+share/pixmaps/gnome-qeye.png
+share/pixmaps/gnome-set-time.png
+share/pixmaps/gnome-spider.png
+share/pixmaps/gnome-squeak.png
+share/pixmaps/gnome-suse.png
+share/pixmaps/gnome-talk.png
+share/pixmaps/gnome-term-linux.png
+share/pixmaps/gnome-term-linux2.png
+share/pixmaps/gnome-term-night.png
+share/pixmaps/gnome-term-tiger.png
+share/pixmaps/gnome-term.png
+share/pixmaps/gnome-tigert.png
+share/pixmaps/gnome-touristinfo.png
+share/pixmaps/gnome-user-interface.png
+share/pixmaps/gnome-week.png
+share/pixmaps/gnome-windows.png
+share/pixmaps/gnome-word.png
+share/pixmaps/gnome-xterm.png
+share/pixmaps/gtkvim.png
+share/pixmaps/kterm.xpm
+share/pixmaps/monitor.png
+share/pixmaps/vnterm.xpm
+@dirrm share/omf/lgpl
+@dirrm share/omf/gpl
+@dirrm share/omf/fdl
+@dirrm share/gnome/help/lgpl/zh_CN
+@dirrm share/gnome/help/lgpl/vi
+@dirrm share/gnome/help/lgpl/uk
+@dirrm share/gnome/help/lgpl/sv
+@dirrm share/gnome/help/lgpl/pa
+@dirrm share/gnome/help/lgpl/oc
+@dirrm share/gnome/help/lgpl/ko
+@dirrm share/gnome/help/lgpl/fr
+@dirrm share/gnome/help/lgpl/es
+@dirrm share/gnome/help/lgpl/ar
+@dirrm share/gnome/help/gpl/zh_CN
+@dirrm share/gnome/help/gpl/vi
+@dirrm share/gnome/help/gpl/uk
+@dirrm share/gnome/help/gpl/sv
+@dirrm share/gnome/help/gpl/pa
+@dirrm share/gnome/help/gpl/oc
+@dirrm share/gnome/help/gpl/ko
+@dirrm share/gnome/help/gpl/fr
+@dirrm share/gnome/help/gpl/fi
+@dirrm share/gnome/help/gpl/es
+@dirrm share/gnome/help/gpl/ca
+@dirrm share/gnome/help/gpl/ar
+@dirrm share/gnome/help/fdl/vi
+@dirrm share/gnome/help/fdl/uk
+@dirrm share/gnome/help/fdl/sv
+@dirrm share/gnome/help/fdl/oc
+@dirrm share/gnome/help/fdl/ko
+@dirrm share/gnome/help/fdl/fr
+@dirrm share/gnome/help/fdl/es
+@dirrm share/gnome/help/fdl/ar
+@dirrm share/gnome-about/headers
+@dirrm include/gnome-desktop-2.0/libgnomeui
+@dirrm include/gnome-desktop-2.0/libgnome
+@dirrm include/gnome-desktop-2.0
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -249,14 +299,16 @@ share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
@dirrmtry share/locale/yi
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
-@dirrmtry share/locale/uz/LC_MESSAGES
-@dirrmtry share/locale/uz
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
@dirrmtry share/locale/ur/LC_MESSAGES
@dirrmtry share/locale/ur
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/oc/LC_MESSAGES
@@ -281,35 +333,4 @@ share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
-@dirrm share/gnome/omf/lgpl
-@dirrm share/gnome/omf/gpl
-@dirrm share/gnome/omf/fdl
-@dirrm share/gnome/help/lgpl/zh_CN
-@dirrm share/gnome/help/lgpl/uk
-@dirrm share/gnome/help/lgpl/sv
-@dirrm share/gnome/help/lgpl/pa
-@dirrm share/gnome/help/lgpl/ko
-@dirrm share/gnome/help/lgpl/fr
-@dirrm share/gnome/help/lgpl/es
-@dirrm share/gnome/help/lgpl/ar
-@dirrm share/gnome/help/gpl/zh_CN
-@dirrm share/gnome/help/gpl/vi
-@dirrm share/gnome/help/gpl/uk
-@dirrm share/gnome/help/gpl/sv
-@dirrm share/gnome/help/gpl/pa
-@dirrm share/gnome/help/gpl/ko
-@dirrm share/gnome/help/gpl/fr
-@dirrm share/gnome/help/gpl/fi
-@dirrm share/gnome/help/gpl/es
-@dirrm share/gnome/help/gpl/ca
-@dirrm share/gnome/help/gpl/ar
-@dirrm share/gnome/help/fdl/uk
-@dirrm share/gnome/help/fdl/sv
-@dirrm share/gnome/help/fdl/ko
-@dirrm share/gnome/help/fdl/fr
-@dirrm share/gnome/help/fdl/es
-@dirrm share/gnome/help/fdl/ar
-@dirrm share/gnome/gnome-about/headers
-@dirrm include/gnome-desktop-2.0/libgnomeui
-@dirrm include/gnome-desktop-2.0/libgnome
-@dirrm include/gnome-desktop-2.0
+@dirrmtry share/applications
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index f67e9b38520e..52d1f30f022c 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -3,12 +3,12 @@
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-libs/Makefile,v 1.2 2006/09/10 00:51:15 mezz Exp $
+# $MCom: ports/x11/gnome-libs/Makefile,v 1.7 2007/08/04 03:51:32 marcus Exp $
#
PORTNAME= gnome-libs
PORTVERSION= 1.4.2
-PORTREVISION= 7
+PORTREVISION= 10
CATEGORIES?= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-libs/1.4
@@ -17,8 +17,8 @@ DIST_SUBDIR= gnome
MAINTAINER?= gnome@FreeBSD.org
COMMENT= Libraries for GNOME, a GNU desktop environment
-BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
+RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
USE_BZIP2= yes
USE_XLIB= yes
diff --git a/x11/gnome-libs/files/patch-aa b/x11/gnome-libs/files/patch-aa
index 1af3d26ce2ef..8ec33082e174 100644
--- a/x11/gnome-libs/files/patch-aa
+++ b/x11/gnome-libs/files/patch-aa
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- configure.orig Mon Apr 29 12:07:59 2002
+++ configure Mon Apr 29 12:08:54 2002
@@ -5339,6 +5339,7 @@
diff --git a/x11/gnome-libs/files/patch-ad b/x11/gnome-libs/files/patch-ad
deleted file mode 100644
index 32e656859e37..000000000000
--- a/x11/gnome-libs/files/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgnome/gnome-help.c.orig Thu Apr 8 15:01:21 1999
-+++ libgnome/gnome-help.c Mon Jul 12 10:29:11 1999
-@@ -69,7 +69,7 @@
- lang= language_list->data;
-
- buf= g_string_new (NULL);
-- g_string_sprintf (buf, "gnome/help/%s/%s/%s", app, lang, path);
-+ g_string_sprintf (buf, "help/%s/%s/%s", app, lang, path);
- res= (gchar *)gnome_unconditional_datadir_file (buf->str);
- p = strrchr (res, '#');
- if (p) {
-@@ -118,7 +118,7 @@
- if (!res)
- {
- buf = g_string_new(NULL);
-- g_string_sprintf(buf, "gnome/help/%s/C/%s", app, path);
-+ g_string_sprintf(buf, "help/%s/C/%s", app, path);
- res = (gchar *)gnome_unconditional_datadir_file(buf->str);
- g_string_free(buf, TRUE);
- }
diff --git a/x11/gnome-libs/files/patch-bb b/x11/gnome-libs/files/patch-bb
index a1daaf14fc52..d6564a00e8c5 100644
--- a/x11/gnome-libs/files/patch-bb
+++ b/x11/gnome-libs/files/patch-bb
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- gtk-xmhtml/Makefile.in.orig Mon Jan 14 12:02:33 2002
+++ gtk-xmhtml/Makefile.in Mon Jan 14 12:03:13 2002
@@ -151,7 +151,7 @@
diff --git a/x11/gnome-libs/files/patch-bg b/x11/gnome-libs/files/patch-bg
index 401724e01ed0..87aecf289d82 100644
--- a/x11/gnome-libs/files/patch-bg
+++ b/x11/gnome-libs/files/patch-bg
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- zvt/Makefile.in.orig Sat Apr 6 19:22:07 2002
+++ zvt/Makefile.in Sat Apr 6 19:23:02 2002
@@ -20,7 +20,7 @@
diff --git a/x11/gnome-libs/files/patch-bi b/x11/gnome-libs/files/patch-bi
index dd39ef04d88e..3b2325030f35 100644
--- a/x11/gnome-libs/files/patch-bi
+++ b/x11/gnome-libs/files/patch-bi
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- libart_lgpl/Makefile.in.orig Sun Jun 23 11:41:23 2002
+++ libart_lgpl/Makefile.in Sun Jun 23 11:42:23 2002
@@ -145,7 +145,7 @@
diff --git a/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in
index b98c5295317b..17709b79f18f 100644
--- a/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in
+++ b/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in
@@ -1,13 +1,10 @@
-
-$FreeBSD$
-
--- devel-docs/gnome/Makefile.in 2002/05/01 01:47:18 1.1
+++ devel-docs/gnome/Makefile.in 2002/05/01 01:50:40
@@ -158,7 +158,7 @@
# The directory containing the source code (if it contains documentation).
DOC_SOURCE_DIR = $(GNOME_LIBS_DIR)/libgnome
--HTML_DIR = $(datadir)/html
+-HTML_DIR = $(datadir)/gnome/html
+HTML_DIR = $(prefix)/share/doc/gnomelibs
TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
diff --git a/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in
index 9266154be01a..de8b5960f7c1 100644
--- a/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in
+++ b/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in
@@ -1,13 +1,10 @@
-
-$FreeBSD$
-
--- devel-docs/gnomeui/Makefile.in 2002/05/01 01:47:18 1.1
+++ devel-docs/gnomeui/Makefile.in 2002/05/01 01:50:55
@@ -161,7 +161,7 @@
CFLAGS = `gnome-config --cflags gnomeui`
LDFLAGS = `gnome-config --libs gnomeui`
--HTML_DIR = $(datadir)/html
+-HTML_DIR = $(datadir)/gnome/html
+HTML_DIR = $(prefix)/share/doc/gnomelibs
TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
diff --git a/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in
index e7cc10f89a6b..e5a6981cdb86 100644
--- a/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in
+++ b/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in
@@ -1,13 +1,10 @@
-
-$FreeBSD$
-
--- devel-docs/gnorba/Makefile.in 2002/05/01 01:47:18 1.1
+++ devel-docs/gnorba/Makefile.in 2002/05/01 01:51:15
@@ -158,7 +158,7 @@
# The directory containing the source code (if it contains documentation).
DOC_SOURCE_DIR = $(GNOME_LIBS_DIR)/libgnorba
--HTML_DIR = $(datadir)/html
+-HTML_DIR = $(datadir)/gnome/html
+HTML_DIR = $(prefix)/share/doc/gnomelibs
TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
diff --git a/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in
index c03007ea3a2d..60b6affec183 100644
--- a/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in
+++ b/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in
@@ -1,13 +1,10 @@
-
-$FreeBSD$
-
--- devel-docs/zvt/Makefile.in 2002/05/01 01:47:18 1.1
+++ devel-docs/zvt/Makefile.in 2002/05/01 01:51:06
@@ -158,7 +158,7 @@
# The directory containing the source code (if it contains documentation).
DOC_SOURCE_DIR = $(GNOME_LIBS_DIR)/zvt
--HTML_DIR = $(datadir)/html
+-HTML_DIR = $(datadir)/gnome/html
+HTML_DIR = $(prefix)/share/doc/gnomelibs
TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
diff --git a/x11/gnome-libs/files/patch-libart_lgpl::configure b/x11/gnome-libs/files/patch-libart_lgpl::configure
index 2ee4ceb2e6b1..2f4ef6723578 100644
--- a/x11/gnome-libs/files/patch-libart_lgpl::configure
+++ b/x11/gnome-libs/files/patch-libart_lgpl::configure
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- libart_lgpl/configure 2002/04/29 09:45:17 1.1
+++ libart_lgpl/configure 2002/04/29 09:45:37
@@ -5090,6 +5090,7 @@
diff --git a/x11/gnome-libs/files/patch-po::Makefile.in.in b/x11/gnome-libs/files/patch-po::Makefile.in.in
index 68b6a8c98491..8cd933b46112 100644
--- a/x11/gnome-libs/files/patch-po::Makefile.in.in
+++ b/x11/gnome-libs/files/patch-po::Makefile.in.in
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- po/Makefile.in.in 2002/01/14 11:02:35 1.1
+++ po/Makefile.in.in 2002/01/14 11:02:49
@@ -106,7 +106,7 @@
diff --git a/x11/gnome-libs/pkg-plist b/x11/gnome-libs/pkg-plist
index bf413271bf18..64c3256df41a 100644
--- a/x11/gnome-libs/pkg-plist
+++ b/x11/gnome-libs/pkg-plist
@@ -382,30 +382,30 @@ share/doc/libart/problems.html
share/doc/libart/sample-display.html
share/doc/libart/sample.html
share/doc/libart/x35.html
-share/gnome/doc/gnome-doc
-share/gnome/doc/gnome-doc.1
-share/gnome/doc/gnome-doc.el
-share/gnome/doc/gnome-mkstub.1
-share/gnome/doc/mkstub
-share/gnome/gtkrc
-share/gnome/gtkrc.el
-share/gnome/gtkrc.eo
-share/gnome/gtkrc.he
-share/gnome/gtkrc.hy
-share/gnome/gtkrc.iso88592
-share/gnome/gtkrc.iso88595
-share/gnome/gtkrc.ja
-share/gnome/gtkrc.ka_GE.georgianacademy
-share/gnome/gtkrc.ka_GE.georgianps
-share/gnome/gtkrc.ko
-share/gnome/gtkrc.ru
-share/gnome/gtkrc.th
-share/gnome/gtkrc.tr
-share/gnome/gtkrc.uk
-share/gnome/gtkrc.vi_VN.tcvn
-share/gnome/gtkrc.vi_VN.viscii
-share/gnome/gtkrc.zh_CN
-share/gnome/gtkrc.zh_TW.Big5
+share/doc/gnome-doc
+share/doc/gnome-doc.1
+share/doc/gnome-doc.el
+share/doc/gnome-mkstub.1
+share/doc/mkstub
+share/gtkrc
+share/gtkrc.el
+share/gtkrc.eo
+share/gtkrc.he
+share/gtkrc.hy
+share/gtkrc.iso88592
+share/gtkrc.iso88595
+share/gtkrc.ja
+share/gtkrc.ka_GE.georgianacademy
+share/gtkrc.ka_GE.georgianps
+share/gtkrc.ko
+share/gtkrc.ru
+share/gtkrc.th
+share/gtkrc.tr
+share/gtkrc.uk
+share/gtkrc.vi_VN.tcvn
+share/gtkrc.vi_VN.viscii
+share/gtkrc.zh_CN
+share/gtkrc.zh_TW.Big5
share/gnome/help/gnome-dev-info/C/addauth.html
share/gnome/help/gnome-dev-info/C/altpol.html
share/gnome/help/gnome-dev-info/C/arch.html
@@ -485,25 +485,25 @@ share/gnome/help/gnome-dev-info/C/x1453.html
share/gnome/help/gnome-dev-info/C/x2161.html
share/gnome/help/gnome-dev-info/C/x2674.html
share/gnome/help/gnome-dev-info/C/x671.html
-share/gnome/idl/GnomeObject.idl
-share/gnome/idl/Table.idl
-share/gnome/idl/desktop-editor.idl
-share/gnome/idl/desktop-textviewer.idl
-share/gnome/idl/gnome-factory.idl
-share/gnome/idl/gnome-unknown.idl
-share/gnome/idl/name-service.idl
-share/gnome/mime-info/gnome.mime
-share/gnome/pixmaps/calculator-font.png
-share/gnome/pixmaps/gnome-default-dlg.png
-share/gnome/pixmaps/gnome-error.png
-share/gnome/pixmaps/gnome-info.png
-share/gnome/pixmaps/gnome-question.png
-share/gnome/pixmaps/gnome-warning.png
-share/gnome/pixmaps/no.xpm
-share/gnome/pixmaps/yes.xpm
-share/gnome/type-convert/gnome-make-postscript-mimes
-share/gnome/type-convert/postscript.convert
-share/gnome/type-convert/type.convert
+share/idl/GnomeObject.idl
+share/idl/Table.idl
+share/idl/desktop-editor.idl
+share/idl/desktop-textviewer.idl
+share/idl/gnome-factory.idl
+share/idl/gnome-unknown.idl
+share/idl/name-service.idl
+share/mime-info/gnome.mime
+share/pixmaps/calculator-font.png
+share/pixmaps/gnome-default-dlg.png
+share/pixmaps/gnome-error.png
+share/pixmaps/gnome-info.png
+share/pixmaps/gnome-question.png
+share/pixmaps/gnome-warning.png
+share/pixmaps/no.xpm
+share/pixmaps/yes.xpm
+share/type-convert/gnome-make-postscript-mimes
+share/type-convert/postscript.convert
+share/type-convert/type.convert
share/locale/az/LC_MESSAGES/gnome-libs.mo
share/locale/ca/LC_MESSAGES/gnome-libs.mo
share/locale/cs/LC_MESSAGES/gnome-libs.mo
@@ -546,10 +546,9 @@ share/locale/vi/LC_MESSAGES/gnome-libs.mo
share/locale/wa/LC_MESSAGES/gnome-libs.mo
share/locale/zh_CN/LC_MESSAGES/gnome-libs.mo
share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo
-@dirrm share/gnome/type-convert
+@dirrm share/type-convert
@dirrm share/gnome/help/gnome-dev-info/C
@dirrm share/gnome/help/gnome-dev-info
-@dirrm share/gnome/doc
@dirrm share/doc/libart
@dirrm %%DOCSDIR%%/zvt
@dirrm %%DOCSDIR%%/gnorba
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index f7a92dc1551d..4767ebecfee7 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-menus/Makefile,v 1.50 2007/03/12 22:36:46 marcus Exp $
+# $MCom: ports/x11/gnome-menus/Makefile,v 1.64 2007/10/15 21:09:56 mezz Exp $
#
PORTNAME= gnome-menus
-PORTVERSION= 2.18.3
+PORTVERSION= 2.20.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -47,10 +47,9 @@ post-patch:
${WRKSRC}/simple-editor/GMenuSimpleEditor/menutreemodel.py
post-install:
- @${MKDIR} ${PREFIX}/share/gnome/desktop-directories
@${INSTALL_DATA} ${WRKSRC}/layout/applications.menu \
${PREFIX}/etc/xdg/menus/gnome-applications.menu
@${INSTALL_DATA} ${WRKSRC}/KDE.directory \
- ${PREFIX}/share/gnome/desktop-directories
+ ${PREFIX}/share/desktop-directories
.include <bsd.port.post.mk>
diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo
index c67b66ede9b9..5e0997dd714e 100644
--- a/x11/gnome-menus/distinfo
+++ b/x11/gnome-menus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-menus-2.18.3.tar.bz2) = e2b97b01b33b9744baf26982a8ad588a
-SHA256 (gnome2/gnome-menus-2.18.3.tar.bz2) = c6c0b9a93426dbdcb47fb7e586b9d910e2dbc0e9c894c0f322d08971a7b70933
-SIZE (gnome2/gnome-menus-2.18.3.tar.bz2) = 437539
+MD5 (gnome2/gnome-menus-2.20.1.tar.bz2) = ad141dc4d5e485e613b68f9fa58bae5f
+SHA256 (gnome2/gnome-menus-2.20.1.tar.bz2) = f6c147983b8c2a6ed0798667d9bd2f58a47b6e6b8e4ab850f83db82beda6badb
+SIZE (gnome2/gnome-menus-2.20.1.tar.bz2) = 450569
diff --git a/x11/gnome-menus/files/patch-layout::applications.menu b/x11/gnome-menus/files/patch-layout::applications.menu
index a3644747b8dc..85533b6d6c0e 100644
--- a/x11/gnome-menus/files/patch-layout::applications.menu
+++ b/x11/gnome-menus/files/patch-layout::applications.menu
@@ -1,5 +1,5 @@
---- layout/applications.menu.orig Wed Mar 9 11:49:53 2005
-+++ layout/applications.menu Fri Mar 25 11:45:09 2005
+--- layout/applications.menu.orig Sun Jul 8 18:04:11 2007
++++ layout/applications.menu Sun Jul 8 18:04:35 2007
@@ -6,24 +6,26 @@
<Name>Applications</Name>
<Directory>Applications.directory</Directory>
@@ -60,7 +60,7 @@
</And>
<Filename>emacs.desktop</Filename>
@@ -64,6 +78,12 @@
- <Directory>Edutainment.directory</Directory>
+ <Directory>Education.directory</Directory>
<Include>
<And>
+ <Not>
@@ -160,9 +160,9 @@
+ <Category>KDE</Category>
+ </Or>
+ </Not>
- <Category>Application</Category>
<Not><Category>Core</Category></Not>
<Not><Category>Settings</Category></Not>
+ <Not><Category>Screensaver</Category></Not>
</And>
</Include>
</Menu> <!-- End Other -->
@@ -227,10 +227,10 @@
+ </Include>
+ </Menu> <!-- End KDevelopment Tools -->
+
-+ <!-- KEdutainment -->
++ <!-- KEducation -->
+ <Menu>
-+ <Name>Edutainment</Name>
-+ <Directory>Edutainment.directory</Directory>
++ <Name>Education</Name>
++ <Directory>Education.directory</Directory>
+ <Include>
+ <And>
+ <Or>
@@ -240,7 +240,7 @@
+ <Category>Education</Category>
+ </And>
+ </Include>
-+ </Menu> <!-- End KEdutainment -->
++ </Menu> <!-- End KEducation -->
+
+ <!-- KGames -->
+ <Menu>
diff --git a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
index 5272bec03af4..b134a5817e56 100644
--- a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
+++ b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
@@ -14,7 +14,7 @@
data_dirs = os.environ["XDG_DATA_DIRS"]
if not data_dirs:
- data_dirs = "/usr/local/share/:/usr/share/"
-+ data_dirs = "%%LOCALBASE%%/share/gnome/:%%LOCALBASE%%/share/:/usr/share/"
++ data_dirs = "%%LOCALBASE%%/share/"
for data_dir in data_dirs.split (":"):
retval = load_icon_from_path (os.path.join (data_dir, "pixmaps", icon_value))
diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist
index 6aaf768d7018..793995388be1 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -11,30 +11,31 @@ lib/libgnome-menu.so.2
%%PYTHON_SITELIBDIR%%/gmenu.la
%%PYTHON_SITELIBDIR%%/gmenu.so
libdata/pkgconfig/libgnome-menu.pc
-share/gnome/desktop-directories/Accessibility.directory
-share/gnome/desktop-directories/Accessories.directory
-share/gnome/desktop-directories/Applications.directory
-share/gnome/desktop-directories/Desktop.directory
-share/gnome/desktop-directories/Development.directory
-share/gnome/desktop-directories/Education.directory
-share/gnome/desktop-directories/Games.directory
-share/gnome/desktop-directories/Graphics.directory
-share/gnome/desktop-directories/Hardware.directory
-share/gnome/desktop-directories/Internet.directory
-share/gnome/desktop-directories/InternetAndNetwork.directory
-share/gnome/desktop-directories/KDE.directory
-share/gnome/desktop-directories/LookAndFeel.directory
-share/gnome/desktop-directories/Multimedia.directory
-share/gnome/desktop-directories/Office.directory
-share/gnome/desktop-directories/Other.directory
-share/gnome/desktop-directories/Personal.directory
-share/gnome/desktop-directories/Preferences.directory
-share/gnome/desktop-directories/Settings-Accessibility.directory
-share/gnome/desktop-directories/Settings.directory
-share/gnome/desktop-directories/System-Settings.directory
-share/gnome/desktop-directories/System-Tools.directory
-share/gnome/desktop-directories/System.directory
+share/desktop-directories/Accessibility.directory
+share/desktop-directories/Accessories.directory
+share/desktop-directories/Applications.directory
+share/desktop-directories/Desktop.directory
+share/desktop-directories/Development.directory
+share/desktop-directories/Education.directory
+share/desktop-directories/Games.directory
+share/desktop-directories/Graphics.directory
+share/desktop-directories/Hardware.directory
+share/desktop-directories/Internet.directory
+share/desktop-directories/InternetAndNetwork.directory
+share/desktop-directories/KDE.directory
+share/desktop-directories/LookAndFeel.directory
+share/desktop-directories/Multimedia.directory
+share/desktop-directories/Office.directory
+share/desktop-directories/Other.directory
+share/desktop-directories/Personal.directory
+share/desktop-directories/Preferences.directory
+share/desktop-directories/Settings-Accessibility.directory
+share/desktop-directories/Settings.directory
+share/desktop-directories/System-Settings.directory
+share/desktop-directories/System-Tools.directory
+share/desktop-directories/System.directory
share/locale/ar/LC_MESSAGES/gnome-menus.mo
+share/locale/as/LC_MESSAGES/gnome-menus.mo
share/locale/be/LC_MESSAGES/gnome-menus.mo
share/locale/be@latin/LC_MESSAGES/gnome-menus.mo
share/locale/bg/LC_MESSAGES/gnome-menus.mo
@@ -57,6 +58,7 @@ share/locale/eu/LC_MESSAGES/gnome-menus.mo
share/locale/fa/LC_MESSAGES/gnome-menus.mo
share/locale/fi/LC_MESSAGES/gnome-menus.mo
share/locale/fr/LC_MESSAGES/gnome-menus.mo
+share/locale/ga/LC_MESSAGES/gnome-menus.mo
share/locale/gl/LC_MESSAGES/gnome-menus.mo
share/locale/gn/LC_MESSAGES/gnome-menus.mo
share/locale/gu/LC_MESSAGES/gnome-menus.mo
@@ -68,6 +70,7 @@ share/locale/id/LC_MESSAGES/gnome-menus.mo
share/locale/it/LC_MESSAGES/gnome-menus.mo
share/locale/ja/LC_MESSAGES/gnome-menus.mo
share/locale/ka/LC_MESSAGES/gnome-menus.mo
+share/locale/kn/LC_MESSAGES/gnome-menus.mo
share/locale/ko/LC_MESSAGES/gnome-menus.mo
share/locale/ku/LC_MESSAGES/gnome-menus.mo
share/locale/ky/LC_MESSAGES/gnome-menus.mo
@@ -92,6 +95,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-menus.mo
share/locale/ro/LC_MESSAGES/gnome-menus.mo
share/locale/ru/LC_MESSAGES/gnome-menus.mo
share/locale/rw/LC_MESSAGES/gnome-menus.mo
+share/locale/si/LC_MESSAGES/gnome-menus.mo
share/locale/sk/LC_MESSAGES/gnome-menus.mo
share/locale/sl/LC_MESSAGES/gnome-menus.mo
share/locale/sq/LC_MESSAGES/gnome-menus.mo
@@ -104,12 +108,13 @@ share/locale/th/LC_MESSAGES/gnome-menus.mo
share/locale/tr/LC_MESSAGES/gnome-menus.mo
share/locale/ug/LC_MESSAGES/gnome-menus.mo
share/locale/uk/LC_MESSAGES/gnome-menus.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-menus.mo
share/locale/vi/LC_MESSAGES/gnome-menus.mo
share/locale/xh/LC_MESSAGES/gnome-menus.mo
share/locale/zh_CN/LC_MESSAGES/gnome-menus.mo
share/locale/zh_HK/LC_MESSAGES/gnome-menus.mo
share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
-@dirrm share/gnome/desktop-directories
+@dirrmtry share/desktop-directories
@dirrm include/gnome-menus
@dirrmtry etc/xdg/menus
@dirrmtry etc/xdg
@@ -117,10 +122,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/oc/LC_MESSAGES
@@ -143,3 +152,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index ad6f6de021a0..b9aa1f0997fd 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-panel/Makefile,v 1.146 2007/03/14 21:00:05 marcus Exp $
+# $MCom: ports/x11/gnome-panel/Makefile,v 1.161 2007/10/15 21:34:24 mezz Exp $
#
PORTNAME= gnome-panel
-PORTVERSION= 2.18.3
+PORTVERSION= 2.20.1
PORTREVISION?= 0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index ddf8ddfd5f63..1f542a4af209 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-panel-2.18.3.tar.bz2) = 545348de234fa8222e328fa7f3a5ba71
-SHA256 (gnome2/gnome-panel-2.18.3.tar.bz2) = efb12148ace94612b47add4060dd9ae088b47e09e5c4c223f8ab7e1c7dcc9410
-SIZE (gnome2/gnome-panel-2.18.3.tar.bz2) = 2722555
+MD5 (gnome2/gnome-panel-2.20.1.tar.bz2) = 87ef96c2cbb8ecaa328420c0d31cc4c0
+SHA256 (gnome2/gnome-panel-2.20.1.tar.bz2) = 3ec39b085b905946fa891cb01ae320166a85e11e850f29bf622057a00a4d1b01
+SIZE (gnome2/gnome-panel-2.20.1.tar.bz2) = 2820992
diff --git a/x11/gnome-panel/files/patch-po_ja.po b/x11/gnome-panel/files/patch-po_ja.po
index 1d3343b4140e..5a71e3919398 100644
--- a/x11/gnome-panel/files/patch-po_ja.po
+++ b/x11/gnome-panel/files/patch-po_ja.po
@@ -1,20 +1,20 @@
---- po/ja.po.orig Mon Mar 7 23:15:19 2005
-+++ po/ja.po Fri Apr 8 14:12:28 2005
-@@ -105,7 +105,7 @@
+--- po/ja.po.orig 2007-08-13 19:37:02.000000000 -0400
++++ po/ja.po 2007-08-14 17:00:06.000000000 -0400
+@@ -97,7 +97,7 @@ msgstr "%k:%M"
+ #. * possible.
+ #: ../applets/clock/calendar-window.c:234
+ msgid "%b %d"
+-msgstr "%b%e日"
++msgstr "%B%e日"
+
+ #: ../applets/clock/calendar-window.c:742
+ msgid "_Tasks"
+@@ -138,7 +138,7 @@ msgstr "%k:%M:%S"
#.
- #: ../applets/clock/clock.c:281
+ #: ../applets/clock/clock.c:369
msgid "%a %b %e"
-msgstr "%b%e日 (%a)"
+msgstr "%B%e日 (%a)"
#. translators: reverse the order of these arguments
#. * if the time should come before the
-@@ -138,7 +138,7 @@
- #. we will display the start date in the most abbreviated way possible.
- #: ../applets/clock/clock.c:591
- msgid "%b %d"
--msgstr "%b%e日"
-+msgstr "%B%e日"
-
- #: ../applets/clock/clock.c:890
- msgid "Tasks"
diff --git a/x11/gnome-panel/files/patch-po_ko.po b/x11/gnome-panel/files/patch-po_ko.po
index 7dbd45da700a..45d98a92c0be 100644
--- a/x11/gnome-panel/files/patch-po_ko.po
+++ b/x11/gnome-panel/files/patch-po_ko.po
@@ -1,38 +1,38 @@
---- po/ko.po.orig Wed Sep 21 02:37:42 2005
-+++ po/ko.po Fri Feb 3 15:58:18 2006
-@@ -98,7 +98,7 @@
+--- po/ko.po.orig Sun Jul 8 18:23:19 2007
++++ po/ko.po Sun Jul 8 18:26:46 2007
+@@ -88,7 +88,7 @@
+ #. * possible.
+ #: ../applets/clock/calendar-window.c:233
+ msgid "%b %d"
+-msgstr "%b %e일"
++msgstr "%B %e일"
+
+ #: ../applets/clock/calendar-window.c:741
+ msgid "_Tasks"
+@@ -129,7 +129,7 @@
#.
- #: ../applets/clock/clock.c:279
+ #: ../applets/clock/clock.c:367
msgid "%a %b %e"
-msgstr "%b %e일 (%a)"
+msgstr "%B %e일 (%a)"
#. translators: reverse the order of these arguments
#. * if the time should come before the
-@@ -125,7 +125,7 @@
+@@ -156,7 +156,7 @@
#. Show date in tooltip
- #: ../applets/clock/clock.c:378
+ #: ../applets/clock/clock.c:520
msgid "%A %B %d"
-msgstr "%b %e일 %A"
+msgstr "%B %e일 %A"
- #: ../applets/clock/clock.c:390
- msgid "Click to view your appointments and tasks"
-@@ -139,7 +139,7 @@
- #. we will display the start date in the most abbreviated way possible.
- #: ../applets/clock/clock.c:598
- msgid "%b %d"
--msgstr "%b %e일"
-+msgstr "%B %e일"
-
- #: ../applets/clock/clock.c:925
- msgid "Tasks"
-@@ -171,7 +171,7 @@
+ #: ../applets/clock/clock.c:534
+ msgid "Click to hide your appointments and tasks"
+@@ -188,7 +188,7 @@
- #: ../applets/clock/clock.c:1767
+ #: ../applets/clock/clock.c:1073
msgid "%A, %B %d %Y"
-msgstr "%Y년 %b %e일 %A"
+msgstr "%Y년 %B %e일 %A"
- #: ../applets/clock/clock.c:1824
+ #: ../applets/clock/clock.c:1148
#, c-format
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 96b87b383e19..717d6d3cf887 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -24,22 +24,43 @@ libexec/clock-applet
libexec/fish-applet-2
libexec/notification-area-applet
libexec/wnck-applet
-share/gnome/applications/gnome-panel.desktop
-share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_Panel_Popup.xml
-share/gnome/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_WindowListApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_WindowMenuApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
-share/gnome/gnome-panelrc
+share/applications/gnome-panel.desktop
+share/gnome-2.0/ui/GNOME_ClockApplet.xml
+share/gnome-2.0/ui/GNOME_FishApplet.xml
+share/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
+share/gnome-2.0/ui/GNOME_Panel_Popup.xml
+share/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml
+share/gnome-2.0/ui/GNOME_WindowListApplet.xml
+share/gnome-2.0/ui/GNOME_WindowMenuApplet.xml
+share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
+%%DATADIR%%/glade/fish.glade
+%%DATADIR%%/glade/panel-properties-dialog.glade
+%%DATADIR%%/glade/panel-run-dialog.glade
+%%DATADIR%%/glade/panel-test-applets.glade
+%%DATADIR%%/glade/timezone.glade
+%%DATADIR%%/glade/window-list.glade
+%%DATADIR%%/glade/workspace-switcher.glade
+%%DATADIR%%/pixmaps/fishanim.png
+%%DATADIR%%/pixmaps/footguy.png
+%%DATADIR%%/pixmaps/gnome-gegl2-2.png
+%%DATADIR%%/pixmaps/gnome-gegl2.png
+%%DATADIR%%/pixmaps/monkey.png
+%%DATADIR%%/pixmaps/oldwanda.png
+%%DATADIR%%/pixmaps/wanda.png
+%%DATADIR%%/pixmaps/world_map-960.png
+share/gnome-panelrc
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/ca/clock.xml
+share/gnome/help/clock/ca/figures/clock_applet.png
+share/gnome/help/clock/ca/legal.xml
share/gnome/help/clock/de/clock.xml
share/gnome/help/clock/de/figures/clock_applet.png
share/gnome/help/clock/de/legal.xml
+share/gnome/help/clock/el/clock.xml
+share/gnome/help/clock/el/figures/clock_applet.png
+share/gnome/help/clock/el/legal.xml
share/gnome/help/clock/es/clock.xml
share/gnome/help/clock/es/figures/clock_applet.png
share/gnome/help/clock/es/legal.xml
@@ -58,6 +79,9 @@ share/gnome/help/clock/ko/legal.xml
share/gnome/help/clock/nl/clock.xml
share/gnome/help/clock/nl/figures/clock_applet.png
share/gnome/help/clock/nl/legal.xml
+share/gnome/help/clock/oc/clock.xml
+share/gnome/help/clock/oc/figures/clock_applet.png
+share/gnome/help/clock/oc/legal.xml
share/gnome/help/clock/pa/clock.xml
share/gnome/help/clock/pa/figures/clock_applet.png
share/gnome/help/clock/pa/legal.xml
@@ -86,10 +110,6 @@ share/gnome/help/fish-applet-2/de/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/fish-applet-2/ko/figures/fish_applet.png
-share/gnome/help/fish-applet-2/ko/figures/fish_settings.png
-share/gnome/help/fish-applet-2/ko/fish-applet-2.xml
-share/gnome/help/fish-applet-2/ko/legal.xml
share/gnome/help/fish-applet-2/zh_CN/figures/fish_applet.png
share/gnome/help/fish-applet-2/zh_CN/figures/fish_settings.png
share/gnome/help/fish-applet-2/zh_CN/fish-applet-2.xml
@@ -101,6 +121,12 @@ share/gnome/help/fish-applet-2/zh_TW/legal.xml
share/gnome/help/fish/C/figures/fish_applet.png
share/gnome/help/fish/C/fish.xml
share/gnome/help/fish/C/legal.xml
+share/gnome/help/fish/ca/figures/fish_applet.png
+share/gnome/help/fish/ca/fish.xml
+share/gnome/help/fish/ca/legal.xml
+share/gnome/help/fish/el/figures/fish_applet.png
+share/gnome/help/fish/el/fish.xml
+share/gnome/help/fish/el/legal.xml
share/gnome/help/fish/es/figures/fish_applet.png
share/gnome/help/fish/es/fish.xml
share/gnome/help/fish/es/legal.xml
@@ -110,105 +136,66 @@ share/gnome/help/fish/fr/legal.xml
share/gnome/help/fish/it/figures/fish_applet.png
share/gnome/help/fish/it/fish.xml
share/gnome/help/fish/it/legal.xml
+share/gnome/help/fish/ko/figures/fish_applet.png
+share/gnome/help/fish/ko/fish.xml
+share/gnome/help/fish/ko/legal.xml
+share/gnome/help/fish/oc/figures/fish_applet.png
+share/gnome/help/fish/oc/fish.xml
+share/gnome/help/fish/oc/legal.xml
share/gnome/help/fish/sv/figures/fish_applet.png
share/gnome/help/fish/sv/fish.xml
share/gnome/help/fish/sv/legal.xml
share/gnome/help/fish/uk/figures/fish_applet.png
share/gnome/help/fish/uk/fish.xml
share/gnome/help/fish/uk/legal.xml
-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/ca/window-list.xml
share/gnome/help/window-list/de/figures/window_list_applet.png
share/gnome/help/window-list/de/figures/window_list_group.png
share/gnome/help/window-list/de/figures/window_list_group_applet.png
share/gnome/help/window-list/de/legal.xml
share/gnome/help/window-list/de/window-list.xml
-share/gnome/help/window-list/es/figures/window_list_applet.png
-share/gnome/help/window-list/es/figures/window_list_group_applet.png
-share/gnome/help/window-list/es/legal.xml
+share/gnome/help/window-list/el/window-list.xml
share/gnome/help/window-list/es/window-list.xml
-share/gnome/help/window-list/fr/figures/window_list_applet.png
-share/gnome/help/window-list/fr/figures/window_list_group_applet.png
-share/gnome/help/window-list/fr/legal.xml
share/gnome/help/window-list/fr/window-list.xml
-share/gnome/help/window-list/it/figures/window_list_applet.png
-share/gnome/help/window-list/it/figures/window_list_group_applet.png
-share/gnome/help/window-list/it/legal.xml
share/gnome/help/window-list/it/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/window-list/ko/figures/window_list_applet.png
-share/gnome/help/window-list/ko/figures/window_list_group.png
-share/gnome/help/window-list/ko/figures/window_list_group_applet.png
-share/gnome/help/window-list/ko/legal.xml
share/gnome/help/window-list/ko/window-list.xml
-share/gnome/help/window-list/pa/figures/window_list_applet.png
-share/gnome/help/window-list/pa/figures/window_list_group_applet.png
-share/gnome/help/window-list/pa/legal.xml
+share/gnome/help/window-list/oc/window-list.xml
share/gnome/help/window-list/pa/window-list.xml
-share/gnome/help/window-list/ru/figures/window_list_applet.png
-share/gnome/help/window-list/ru/figures/window_list_group_applet.png
-share/gnome/help/window-list/ru/legal.xml
share/gnome/help/window-list/ru/window-list.xml
-share/gnome/help/window-list/sv/figures/window_list_applet.png
-share/gnome/help/window-list/sv/figures/window_list_group_applet.png
-share/gnome/help/window-list/sv/legal.xml
share/gnome/help/window-list/sv/window-list.xml
-share/gnome/help/window-list/uk/figures/window_list_applet.png
-share/gnome/help/window-list/uk/figures/window_list_group_applet.png
-share/gnome/help/window-list/uk/legal.xml
share/gnome/help/window-list/uk/window-list.xml
-share/gnome/help/window-list/zh_CN/figures/window_list_applet.png
-share/gnome/help/window-list/zh_CN/figures/window_list_group_applet.png
-share/gnome/help/window-list/zh_CN/legal.xml
share/gnome/help/window-list/zh_CN/window-list.xml
share/gnome/help/window-list/zh_TW/figures/window_list_applet.png
share/gnome/help/window-list/zh_TW/figures/window_list_group.png
share/gnome/help/window-list/zh_TW/figures/window_list_group_applet.png
share/gnome/help/window-list/zh_TW/legal.xml
share/gnome/help/window-list/zh_TW/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/ca/workspace-switcher.xml
share/gnome/help/workspace-switcher/de/figures/workspace_switcher_applet.png
share/gnome/help/workspace-switcher/de/figures/workspacelist_applet.png
share/gnome/help/workspace-switcher/de/legal.xml
share/gnome/help/workspace-switcher/de/workspace-switcher.xml
-share/gnome/help/workspace-switcher/es/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/es/legal.xml
+share/gnome/help/workspace-switcher/el/workspace-switcher.xml
share/gnome/help/workspace-switcher/es/workspace-switcher.xml
-share/gnome/help/workspace-switcher/fr/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/fr/legal.xml
share/gnome/help/workspace-switcher/fr/workspace-switcher.xml
-share/gnome/help/workspace-switcher/it/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/it/legal.xml
share/gnome/help/workspace-switcher/it/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/help/workspace-switcher/ko/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/ko/figures/workspacelist_applet.png
-share/gnome/help/workspace-switcher/ko/legal.xml
share/gnome/help/workspace-switcher/ko/workspace-switcher.xml
-share/gnome/help/workspace-switcher/nl/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/nl/legal.xml
share/gnome/help/workspace-switcher/nl/workspace-switcher.xml
-share/gnome/help/workspace-switcher/pa/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/pa/legal.xml
+share/gnome/help/workspace-switcher/oc/workspace-switcher.xml
share/gnome/help/workspace-switcher/pa/workspace-switcher.xml
-share/gnome/help/workspace-switcher/ru/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/ru/legal.xml
share/gnome/help/workspace-switcher/ru/workspace-switcher.xml
-share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/sv/legal.xml
share/gnome/help/workspace-switcher/sv/workspace-switcher.xml
-share/gnome/help/workspace-switcher/uk/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/uk/legal.xml
share/gnome/help/workspace-switcher/uk/workspace-switcher.xml
+share/gnome/help/workspace-switcher/vi/workspace-switcher.xml
share/gnome/help/workspace-switcher/zh_CN/figures/workspace_switcher_applet.png
share/gnome/help/workspace-switcher/zh_CN/figures/workspacelist_applet.png
share/gnome/help/workspace-switcher/zh_CN/legal.xml
@@ -217,73 +204,6 @@ share/gnome/help/workspace-switcher/zh_TW/figures/workspace_switcher_applet.png
share/gnome/help/workspace-switcher/zh_TW/figures/workspacelist_applet.png
share/gnome/help/workspace-switcher/zh_TW/legal.xml
share/gnome/help/workspace-switcher/zh_TW/workspace-switcher.xml
-share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl
-share/gnome/omf/clock/clock-C.omf
-share/gnome/omf/clock/clock-de.omf
-share/gnome/omf/clock/clock-es.omf
-share/gnome/omf/clock/clock-fr.omf
-share/gnome/omf/clock/clock-it.omf
-share/gnome/omf/clock/clock-ja.omf
-share/gnome/omf/clock/clock-ko.omf
-share/gnome/omf/clock/clock-nl.omf
-share/gnome/omf/clock/clock-pa.omf
-share/gnome/omf/clock/clock-ru.omf
-share/gnome/omf/clock/clock-sr.omf
-share/gnome/omf/clock/clock-sv.omf
-share/gnome/omf/clock/clock-uk.omf
-share/gnome/omf/clock/clock-zh_CN.omf
-share/gnome/omf/clock/clock-zh_TW.omf
-share/gnome/omf/fish/fish-C.omf
-share/gnome/omf/fish/fish-es.omf
-share/gnome/omf/fish/fish-fr.omf
-share/gnome/omf/fish/fish-it.omf
-share/gnome/omf/fish/fish-sv.omf
-share/gnome/omf/fish/fish-uk.omf
-share/gnome/omf/gnome-panel/fish-applet-2-de.omf
-share/gnome/omf/gnome-panel/fish-applet-2-ja.omf
-share/gnome/omf/gnome-panel/fish-applet-2-ko.omf
-share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf
-share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf
-share/gnome/omf/gnome-panel/window-list-de.omf
-share/gnome/omf/gnome-panel/window-list-ja.omf
-share/gnome/omf/gnome-panel/window-list-ko.omf
-share/gnome/omf/gnome-panel/window-list-zh_TW.omf
-share/gnome/omf/gnome-panel/workspace-switcher-de.omf
-share/gnome/omf/gnome-panel/workspace-switcher-ja.omf
-share/gnome/omf/gnome-panel/workspace-switcher-ko.omf
-share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf
-share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf
-share/gnome/omf/window-list/window-list-C.omf
-share/gnome/omf/window-list/window-list-es.omf
-share/gnome/omf/window-list/window-list-fr.omf
-share/gnome/omf/window-list/window-list-it.omf
-share/gnome/omf/window-list/window-list-pa.omf
-share/gnome/omf/window-list/window-list-ru.omf
-share/gnome/omf/window-list/window-list-sv.omf
-share/gnome/omf/window-list/window-list-uk.omf
-share/gnome/omf/window-list/window-list-zh_CN.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-C.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-es.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-fr.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-it.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-nl.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-pa.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-ru.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-sv.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-uk.omf
-share/gnome/panel/glade/fish.glade
-share/gnome/panel/glade/panel-properties-dialog.glade
-share/gnome/panel/glade/panel-run-dialog.glade
-share/gnome/panel/glade/panel-test-applets.glade
-share/gnome/panel/glade/window-list.glade
-share/gnome/panel/glade/workspace-switcher.glade
-share/gnome/panel/pixmaps/fishanim.png
-share/gnome/panel/pixmaps/footguy.png
-share/gnome/panel/pixmaps/gnome-gegl2-2.png
-share/gnome/panel/pixmaps/gnome-gegl2.png
-share/gnome/panel/pixmaps/monkey.png
-share/gnome/panel/pixmaps/oldwanda.png
-share/gnome/panel/pixmaps/wanda.png
share/icons/hicolor/16x16/apps/gnome-panel-clock.png
share/icons/hicolor/16x16/apps/gnome-panel-drawer.png
share/icons/hicolor/16x16/apps/gnome-panel-fish.png
@@ -339,6 +259,7 @@ share/icons/hicolor/scalable/apps/gnome-panel-window-list.svg
share/icons/hicolor/scalable/apps/gnome-panel-window-menu.svg
share/icons/hicolor/scalable/apps/gnome-panel-workspace-switcher.svg
share/icons/hicolor/scalable/apps/gnome-panel.svg
+share/idl/gnome-panel-2.0/GNOME_Panel.idl
share/locale/af/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
@@ -378,6 +299,7 @@ share/locale/id/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/ka/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/kn/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ky/LC_MESSAGES/gnome-panel-2.0.mo
@@ -405,6 +327,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ro/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ru/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/rw/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/sk/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/sl/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/sq/LC_MESSAGES/gnome-panel-2.0.mo
@@ -417,6 +340,8 @@ share/locale/te/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/th/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/uz/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/vi/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/xh/LC_MESSAGES/gnome-panel-2.0.mo
@@ -425,88 +350,147 @@ share/locale/zh_CN/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/zh_HK/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
-@dirrm share/gnome/panel/pixmaps
-@dirrm share/gnome/panel/glade
-@dirrm share/gnome/omf/workspace-switcher
-@dirrm share/gnome/omf/window-list
-@dirrm share/gnome/omf/gnome-panel
-@dirrm share/gnome/omf/fish
-@dirrm share/gnome/omf/clock
-@dirrm share/gnome/idl/gnome-panel-2.0
+share/omf/clock/clock-C.omf
+share/omf/clock/clock-ca.omf
+share/omf/clock/clock-de.omf
+share/omf/clock/clock-el.omf
+share/omf/clock/clock-es.omf
+share/omf/clock/clock-fr.omf
+share/omf/clock/clock-it.omf
+share/omf/clock/clock-ja.omf
+share/omf/clock/clock-ko.omf
+share/omf/clock/clock-nl.omf
+share/omf/clock/clock-oc.omf
+share/omf/clock/clock-pa.omf
+share/omf/clock/clock-ru.omf
+share/omf/clock/clock-sr.omf
+share/omf/clock/clock-sv.omf
+share/omf/clock/clock-uk.omf
+share/omf/clock/clock-zh_CN.omf
+share/omf/clock/clock-zh_TW.omf
+share/omf/fish/fish-C.omf
+share/omf/fish/fish-ca.omf
+share/omf/fish/fish-el.omf
+share/omf/fish/fish-es.omf
+share/omf/fish/fish-fr.omf
+share/omf/fish/fish-it.omf
+share/omf/fish/fish-ko.omf
+share/omf/fish/fish-oc.omf
+share/omf/fish/fish-sv.omf
+share/omf/fish/fish-uk.omf
+share/omf/gnome-panel/fish-applet-2-de.omf
+share/omf/gnome-panel/fish-applet-2-ja.omf
+share/omf/gnome-panel/fish-applet-2-zh_CN.omf
+share/omf/gnome-panel/fish-applet-2-zh_TW.omf
+share/omf/gnome-panel/window-list-de.omf
+share/omf/gnome-panel/window-list-ja.omf
+share/omf/gnome-panel/window-list-zh_TW.omf
+share/omf/gnome-panel/workspace-switcher-de.omf
+share/omf/gnome-panel/workspace-switcher-ja.omf
+share/omf/gnome-panel/workspace-switcher-zh_CN.omf
+share/omf/gnome-panel/workspace-switcher-zh_TW.omf
+share/omf/window-list/window-list-C.omf
+share/omf/window-list/window-list-ca.omf
+share/omf/window-list/window-list-de.omf
+share/omf/window-list/window-list-el.omf
+share/omf/window-list/window-list-es.omf
+share/omf/window-list/window-list-fr.omf
+share/omf/window-list/window-list-it.omf
+share/omf/window-list/window-list-ko.omf
+share/omf/window-list/window-list-oc.omf
+share/omf/window-list/window-list-pa.omf
+share/omf/window-list/window-list-ru.omf
+share/omf/window-list/window-list-sv.omf
+share/omf/window-list/window-list-uk.omf
+share/omf/window-list/window-list-zh_CN.omf
+share/omf/workspace-switcher/workspace-switcher-C.omf
+share/omf/workspace-switcher/workspace-switcher-ca.omf
+share/omf/workspace-switcher/workspace-switcher-de.omf
+share/omf/workspace-switcher/workspace-switcher-el.omf
+share/omf/workspace-switcher/workspace-switcher-es.omf
+share/omf/workspace-switcher/workspace-switcher-fr.omf
+share/omf/workspace-switcher/workspace-switcher-it.omf
+share/omf/workspace-switcher/workspace-switcher-ko.omf
+share/omf/workspace-switcher/workspace-switcher-nl.omf
+share/omf/workspace-switcher/workspace-switcher-oc.omf
+share/omf/workspace-switcher/workspace-switcher-pa.omf
+share/omf/workspace-switcher/workspace-switcher-ru.omf
+share/omf/workspace-switcher/workspace-switcher-sv.omf
+share/omf/workspace-switcher/workspace-switcher-uk.omf
+share/omf/workspace-switcher/workspace-switcher-vi.omf
+@dirrm share/omf/workspace-switcher
+@dirrm share/omf/window-list
+@dirrm share/omf/gnome-panel
+@dirrm share/omf/fish
+@dirrm share/omf/clock
+@dirrm share/idl/gnome-panel-2.0
@dirrm share/gnome/help/workspace-switcher/zh_TW/figures
@dirrm share/gnome/help/workspace-switcher/zh_TW
@dirrm share/gnome/help/workspace-switcher/zh_CN/figures
@dirrm share/gnome/help/workspace-switcher/zh_CN
-@dirrm share/gnome/help/workspace-switcher/uk/figures
+@dirrm share/gnome/help/workspace-switcher/vi
@dirrm share/gnome/help/workspace-switcher/uk
-@dirrm share/gnome/help/workspace-switcher/sv/figures
@dirrm share/gnome/help/workspace-switcher/sv
-@dirrm share/gnome/help/workspace-switcher/ru/figures
@dirrm share/gnome/help/workspace-switcher/ru
-@dirrm share/gnome/help/workspace-switcher/pa/figures
@dirrm share/gnome/help/workspace-switcher/pa
-@dirrm share/gnome/help/workspace-switcher/nl/figures
+@dirrm share/gnome/help/workspace-switcher/oc
@dirrm share/gnome/help/workspace-switcher/nl
-@dirrm share/gnome/help/workspace-switcher/ko/figures
@dirrm share/gnome/help/workspace-switcher/ko
@dirrm share/gnome/help/workspace-switcher/ja/figures
@dirrm share/gnome/help/workspace-switcher/ja
-@dirrm share/gnome/help/workspace-switcher/it/figures
@dirrm share/gnome/help/workspace-switcher/it
-@dirrm share/gnome/help/workspace-switcher/fr/figures
@dirrm share/gnome/help/workspace-switcher/fr
-@dirrm share/gnome/help/workspace-switcher/es/figures
@dirrm share/gnome/help/workspace-switcher/es
+@dirrm share/gnome/help/workspace-switcher/el
@dirrm share/gnome/help/workspace-switcher/de/figures
@dirrm share/gnome/help/workspace-switcher/de
-@dirrm share/gnome/help/workspace-switcher/C/figures
+@dirrm share/gnome/help/workspace-switcher/ca
@dirrm share/gnome/help/workspace-switcher/C
@dirrm share/gnome/help/workspace-switcher
@dirrm share/gnome/help/window-list/zh_TW/figures
@dirrm share/gnome/help/window-list/zh_TW
-@dirrm share/gnome/help/window-list/zh_CN/figures
@dirrm share/gnome/help/window-list/zh_CN
-@dirrm share/gnome/help/window-list/uk/figures
@dirrm share/gnome/help/window-list/uk
-@dirrm share/gnome/help/window-list/sv/figures
@dirrm share/gnome/help/window-list/sv
-@dirrm share/gnome/help/window-list/ru/figures
@dirrm share/gnome/help/window-list/ru
-@dirrm share/gnome/help/window-list/pa/figures
@dirrm share/gnome/help/window-list/pa
-@dirrm share/gnome/help/window-list/ko/figures
+@dirrm share/gnome/help/window-list/oc
@dirrm share/gnome/help/window-list/ko
@dirrm share/gnome/help/window-list/ja/figures
@dirrm share/gnome/help/window-list/ja
-@dirrm share/gnome/help/window-list/it/figures
@dirrm share/gnome/help/window-list/it
-@dirrm share/gnome/help/window-list/fr/figures
@dirrm share/gnome/help/window-list/fr
-@dirrm share/gnome/help/window-list/es/figures
@dirrm share/gnome/help/window-list/es
+@dirrm share/gnome/help/window-list/el
@dirrm share/gnome/help/window-list/de/figures
@dirrm share/gnome/help/window-list/de
-@dirrm share/gnome/help/window-list/C/figures
+@dirrm share/gnome/help/window-list/ca
@dirrm share/gnome/help/window-list/C
@dirrm share/gnome/help/window-list
@dirrm share/gnome/help/fish/uk/figures
@dirrm share/gnome/help/fish/uk
@dirrm share/gnome/help/fish/sv/figures
@dirrm share/gnome/help/fish/sv
+@dirrm share/gnome/help/fish/oc/figures
+@dirrm share/gnome/help/fish/oc
+@dirrm share/gnome/help/fish/ko/figures
+@dirrm share/gnome/help/fish/ko
@dirrm share/gnome/help/fish/it/figures
@dirrm share/gnome/help/fish/it
@dirrm share/gnome/help/fish/fr/figures
@dirrm share/gnome/help/fish/fr
@dirrm share/gnome/help/fish/es/figures
@dirrm share/gnome/help/fish/es
+@dirrm share/gnome/help/fish/el/figures
+@dirrm share/gnome/help/fish/el
+@dirrm share/gnome/help/fish/ca/figures
+@dirrm share/gnome/help/fish/ca
@dirrm share/gnome/help/fish/C/figures
@dirrm share/gnome/help/fish/C
@dirrm share/gnome/help/fish-applet-2/zh_TW/figures
@dirrm share/gnome/help/fish-applet-2/zh_TW
@dirrm share/gnome/help/fish-applet-2/zh_CN/figures
@dirrm share/gnome/help/fish-applet-2/zh_CN
-@dirrm share/gnome/help/fish-applet-2/ko/figures
-@dirrm share/gnome/help/fish-applet-2/ko
@dirrm share/gnome/help/fish-applet-2/ja/figures
@dirrm share/gnome/help/fish-applet-2/ja
@dirrm share/gnome/help/fish-applet-2/de/figures
@@ -527,6 +511,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm share/gnome/help/clock/ru
@dirrm share/gnome/help/clock/pa/figures
@dirrm share/gnome/help/clock/pa
+@dirrm share/gnome/help/clock/oc/figures
+@dirrm share/gnome/help/clock/oc
@dirrm share/gnome/help/clock/nl/figures
@dirrm share/gnome/help/clock/nl
@dirrm share/gnome/help/clock/ko/figures
@@ -539,11 +525,18 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm share/gnome/help/clock/fr
@dirrm share/gnome/help/clock/es/figures
@dirrm share/gnome/help/clock/es
+@dirrm share/gnome/help/clock/el/figures
+@dirrm share/gnome/help/clock/el
@dirrm share/gnome/help/clock/de/figures
@dirrm share/gnome/help/clock/de
+@dirrm share/gnome/help/clock/ca/figures
+@dirrm share/gnome/help/clock/ca
@dirrm share/gnome/help/clock/C/figures
@dirrm share/gnome/help/clock/C
@dirrm share/gnome/help/clock
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
@dirrm include/panel-2.0
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@@ -553,10 +546,14 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
@dirrmtry share/locale/yi
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@ije/LC_MESSAGES
@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/oc/LC_MESSAGES
@@ -581,3 +578,4 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/applications
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 1d1493ea1b23..2f6d1e58a864 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.71 2007/03/12 21:25:30 marcus Exp $
+# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.80 2007/09/18 16:46:42 marcus Exp $
#
PORTNAME= gnome-screensaver
-PORTVERSION= 2.18.2
+PORTVERSION= 2.20.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -28,14 +28,14 @@ USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomemenus \
CONFIGURE_ARGS= --with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
--with-xscreensaverdir=${XSCREENSAVER_DIR} \
--with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= gnome-screensaver.schemas
PLIST= ${WRKDIR}/pkg-plist
XSCREENSAVER_DIR= ${LOCALBASE}/share/xscreensaver/config
-SCREENSAVER_DIR= share/gnome/applications/screensavers
+SCREENSAVER_DIR= share/applications/screensavers
XSCREENSAVER_EXCLUDE= "(popsquares.xml)"
diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo
index 3503180103f1..e83e9955e264 100644
--- a/x11/gnome-screensaver/distinfo
+++ b/x11/gnome-screensaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-screensaver-2.18.2.tar.bz2) = b5931e1f39c62acee0df1fcf016ddc39
-SHA256 (gnome2/gnome-screensaver-2.18.2.tar.bz2) = 428d67dfbfb9fcc69144133e309093877ed0684a4c44afa1f859424159707f5e
-SIZE (gnome2/gnome-screensaver-2.18.2.tar.bz2) = 2023290
+MD5 (gnome2/gnome-screensaver-2.20.0.tar.bz2) = d166a3ebf69289331b2ebcf5c0187fd9
+SHA256 (gnome2/gnome-screensaver-2.20.0.tar.bz2) = 9ee744058d2c7139634543951a62828b2e1b69fe33cf0b5456737e9c5201dbb9
+SIZE (gnome2/gnome-screensaver-2.20.0.tar.bz2) = 2013842
diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist
index bf4bf213dc8f..fd8810021e01 100644
--- a/x11/gnome-screensaver/pkg-plist
+++ b/x11/gnome-screensaver/pkg-plist
@@ -8,24 +8,14 @@ libexec/gnome-screensaver-gl-helper
libexec/gnome-screensaver/floaters
libexec/gnome-screensaver/popsquares
libexec/gnome-screensaver/slideshow
-share/gnome/applications/gnome-screensaver-preferences.desktop
-share/gnome/applications/screensavers/cosmos-slideshow.desktop
-share/gnome/applications/screensavers/footlogo-floaters.desktop
-share/gnome/applications/screensavers/personal-slideshow.desktop
-share/gnome/applications/screensavers/popsquares.desktop
-share/gnome/desktop-directories/gnome-screensaver.directory
-share/gnome/gnome-screensaver/gnome-screensaver-preferences.glade
-share/gnome/gnome-screensaver/lock-dialog-default.glade
-share/gnome/pixmaps/backgrounds/cosmos/cloud.jpg
-share/gnome/pixmaps/backgrounds/cosmos/comet.jpg
-share/gnome/pixmaps/backgrounds/cosmos/earth-horizon.jpg
-share/gnome/pixmaps/backgrounds/cosmos/earthrise.jpg
-share/gnome/pixmaps/backgrounds/cosmos/galaxy-ngc3370.jpg
-share/gnome/pixmaps/backgrounds/cosmos/helix-nebula.jpg
-share/gnome/pixmaps/backgrounds/cosmos/jupiter.jpg
-share/gnome/pixmaps/backgrounds/cosmos/sombrero.jpg
-share/gnome/pixmaps/backgrounds/cosmos/whirlpool.jpg
-share/gnome/pixmaps/gnome-logo-white.svg
+share/applications/gnome-screensaver-preferences.desktop
+share/applications/screensavers/cosmos-slideshow.desktop
+share/applications/screensavers/footlogo-floaters.desktop
+share/applications/screensavers/personal-slideshow.desktop
+share/applications/screensavers/popsquares.desktop
+share/desktop-directories/gnome-screensaver.directory
+%%DATADIR%%/gnome-screensaver-preferences.glade
+%%DATADIR%%/lock-dialog-default.glade
share/locale/ar/LC_MESSAGES/gnome-screensaver.mo
share/locale/be@latin/LC_MESSAGES/gnome-screensaver.mo
share/locale/bg/LC_MESSAGES/gnome-screensaver.mo
@@ -66,12 +56,15 @@ share/locale/mn/LC_MESSAGES/gnome-screensaver.mo
share/locale/nb/LC_MESSAGES/gnome-screensaver.mo
share/locale/ne/LC_MESSAGES/gnome-screensaver.mo
share/locale/nl/LC_MESSAGES/gnome-screensaver.mo
+share/locale/oc/LC_MESSAGES/gnome-screensaver.mo
share/locale/or/LC_MESSAGES/gnome-screensaver.mo
share/locale/pa/LC_MESSAGES/gnome-screensaver.mo
share/locale/pl/LC_MESSAGES/gnome-screensaver.mo
share/locale/pt/LC_MESSAGES/gnome-screensaver.mo
share/locale/pt_BR/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ro/LC_MESSAGES/gnome-screensaver.mo
share/locale/ru/LC_MESSAGES/gnome-screensaver.mo
+share/locale/si/LC_MESSAGES/gnome-screensaver.mo
share/locale/sk/LC_MESSAGES/gnome-screensaver.mo
share/locale/sl/LC_MESSAGES/gnome-screensaver.mo
share/locale/sq/LC_MESSAGES/gnome-screensaver.mo
@@ -79,6 +72,7 @@ share/locale/sr/LC_MESSAGES/gnome-screensaver.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-screensaver.mo
share/locale/sv/LC_MESSAGES/gnome-screensaver.mo
share/locale/ta/LC_MESSAGES/gnome-screensaver.mo
+share/locale/te/LC_MESSAGES/gnome-screensaver.mo
share/locale/th/LC_MESSAGES/gnome-screensaver.mo
share/locale/tr/LC_MESSAGES/gnome-screensaver.mo
share/locale/uk/LC_MESSAGES/gnome-screensaver.mo
@@ -86,12 +80,28 @@ share/locale/vi/LC_MESSAGES/gnome-screensaver.mo
share/locale/zh_CN/LC_MESSAGES/gnome-screensaver.mo
share/locale/zh_HK/LC_MESSAGES/gnome-screensaver.mo
share/locale/zh_TW/LC_MESSAGES/gnome-screensaver.mo
-@dirrm share/gnome/pixmaps/backgrounds/cosmos
-@dirrm share/gnome/pixmaps/backgrounds
-@dirrm share/gnome/gnome-screensaver
+share/pixmaps/backgrounds/cosmos/cloud.jpg
+share/pixmaps/backgrounds/cosmos/comet.jpg
+share/pixmaps/backgrounds/cosmos/earth-horizon.jpg
+share/pixmaps/backgrounds/cosmos/earthrise.jpg
+share/pixmaps/backgrounds/cosmos/galaxy-ngc3370.jpg
+share/pixmaps/backgrounds/cosmos/helix-nebula.jpg
+share/pixmaps/backgrounds/cosmos/jupiter.jpg
+share/pixmaps/backgrounds/cosmos/sombrero.jpg
+share/pixmaps/backgrounds/cosmos/whirlpool.jpg
+share/pixmaps/gnome-logo-white.svg
+@dirrm share/pixmaps/backgrounds/cosmos
+@dirrm share/pixmaps/backgrounds
+@dirrm %%DATADIR%%
@dirrm libexec/gnome-screensaver
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@@ -102,3 +112,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-screensaver.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/applications
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index f2e11dfacbe6..ca5af031b52b 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-session/Makefile,v 1.110 2007/03/18 20:55:55 marcus Exp $
+# $MCom: ports/x11/gnome-session/Makefile,v 1.126 2007/10/19 08:41:21 bland Exp $
#
PORTNAME= gnome-session
-PORTVERSION= 2.18.3
+PORTVERSION= 2.20.1
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://www.marcuscom.com/downloads/:local
@@ -23,7 +24,8 @@ COMMENT= Session component for the GNOME 2 desktop
BUILD_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
-RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
+RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center \
+ ${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo
INSTALLS_ICONS= yes
USE_GETTEXT= yes
@@ -48,12 +50,12 @@ post-extract:
post-install:
${INSTALL_DATA} ${WRKSRC}/data/gnome-splash.png \
- ${PREFIX}/share/gnome/pixmaps/splash/original-gnome-splash.png
+ ${PREFIX}/share/pixmaps/splash/original-gnome-splash.png
# ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \
-# ${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png
+# ${PREFIX}/share/pixmaps/splash/gnome-splash.png
.for splash in MaMBaNgGaoX-2.12.png adamw-piggy-2.12.png adamw-trophy-2.12.png andreas-slogan-2.12.png andreas-splash-2.12.png domix-splash-2.12.png domix-splash2-2.12.png mumija-2.12.png mumija2-2.12.png mumija3-2.12.png tremulant-2.12.png tremulant-blood-2.12.png tremulant-brushed-metal-2.12.png franz-splash_218.png adamw-bat-2.18.jpg adamw-conky-2.18.png adamw-cow-2.18.png adamw-mouth-2.18.png adamw-swing-2.18.png
${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.18/${splash} \
- ${PREFIX}/share/gnome/pixmaps/splash
+ ${PREFIX}/share/pixmaps/splash
.endfor
.include <bsd.port.mk>
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 749f1b40a18e..edb41056bac1 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,6 +1,6 @@
-MD5 (gnome2/gnome-session-2.18.3.tar.bz2) = 59b6809ed1d8e39c1550217e665c75df
-SHA256 (gnome2/gnome-session-2.18.3.tar.bz2) = 87f8dd9b89953e6bfaad98d1b50fd48517334588d0da9d038218751943dfc10a
-SIZE (gnome2/gnome-session-2.18.3.tar.bz2) = 716092
+MD5 (gnome2/gnome-session-2.20.1.tar.bz2) = 8c9c2940957dc0140a23ef638d23fb35
+SHA256 (gnome2/gnome-session-2.20.1.tar.bz2) = 134d102f7f6dc889158c262488b98c843616fa8aef23ce3aaa923366076a6a29
+SIZE (gnome2/gnome-session-2.20.1.tar.bz2) = 759126
MD5 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 80eb8c52fcf9fe977e0bf8ed48b85fe5
SHA256 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = fcca0f6eb759a4ef0211ecd61340f84ce8ad4d7493f725ac8613724faadbb508
SIZE (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 1630720
diff --git a/x11/gnome-session/files/patch-data_Makefile.in b/x11/gnome-session/files/patch-data_Makefile.in
index 17d12d395c3b..8fcdd3e2c5e7 100644
--- a/x11/gnome-session/files/patch-data_Makefile.in
+++ b/x11/gnome-session/files/patch-data_Makefile.in
@@ -1,14 +1,5 @@
--- data/Makefile.in.orig Sun Jan 28 20:39:50 2007
+++ data/Makefile.in Sun Jan 28 20:41:03 2007
-@@ -253,7 +253,7 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- SUBDIRS = icons
--defaultdir = $(datadir)/gnome
-+defaultdir = $(datadir)
- default_in_files = default.session.in
- default_DATA = $(default_in_files:.session.in=.session)
- settingsdir = $(datadir)/applications
@@ -271,7 +271,7 @@ EXTRA_DIST = \
session-properties.desktop.in
diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in
deleted file mode 100644
index b07ad029e3dd..000000000000
--- a/x11/gnome-session/files/patch-gnome-session_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-session/Makefile.in.orig Sun Apr 23 23:01:30 2006
-+++ gnome-session/Makefile.in Sun Apr 23 23:06:41 2006
-@@ -310,7 +310,7 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- NULL =
--defaultdir = $(datadir)/gnome
-+defaultdir = $(datadir)
- INCLUDES = \
- $(GNOME_SESSION_CFLAGS) \
- $(STANDARD_PROPERTIES_CFLAGS) \
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index 7e58bdc56660..d90630fed19f 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -3,29 +3,8 @@ bin/gnome-session-properties
bin/gnome-session-remove
bin/gnome-session-save
bin/gnome-wm
-share/gnome/applications/session-properties.desktop
+share/applications/session-properties.desktop
share/gnome/default.session
-share/gnome/pixmaps/splash/MaMBaNgGaoX-2.12.png
-share/gnome/pixmaps/splash/adamw-bat-2.18.jpg
-share/gnome/pixmaps/splash/adamw-conky-2.18.png
-share/gnome/pixmaps/splash/adamw-cow-2.18.png
-share/gnome/pixmaps/splash/adamw-mouth-2.18.png
-share/gnome/pixmaps/splash/adamw-piggy-2.12.png
-share/gnome/pixmaps/splash/adamw-swing-2.18.png
-share/gnome/pixmaps/splash/adamw-trophy-2.12.png
-share/gnome/pixmaps/splash/andreas-slogan-2.12.png
-share/gnome/pixmaps/splash/andreas-splash-2.12.png
-share/gnome/pixmaps/splash/domix-splash-2.12.png
-share/gnome/pixmaps/splash/domix-splash2-2.12.png
-share/gnome/pixmaps/splash/franz-splash_218.png
-share/gnome/pixmaps/splash/gnome-splash.png
-share/gnome/pixmaps/splash/mumija-2.12.png
-share/gnome/pixmaps/splash/mumija2-2.12.png
-share/gnome/pixmaps/splash/mumija3-2.12.png
-share/gnome/pixmaps/splash/original-gnome-splash.png
-share/gnome/pixmaps/splash/tremulant-2.12.png
-share/gnome/pixmaps/splash/tremulant-blood-2.12.png
-share/gnome/pixmaps/splash/tremulant-brushed-metal-2.12.png
share/icons/hicolor/16x16/apps/session-properties.png
share/icons/hicolor/22x22/apps/session-properties.png
share/icons/hicolor/24x24/apps/session-properties.png
@@ -36,6 +15,7 @@ share/locale/am/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo
share/locale/az/LC_MESSAGES/gnome-session-2.0.mo
share/locale/be/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/be@latin/LC_MESSAGES/gnome-session-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo
share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo
share/locale/bn_IN/LC_MESSAGES/gnome-session-2.0.mo
@@ -95,6 +75,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ro/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ru/LC_MESSAGES/gnome-session-2.0.mo
share/locale/rw/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-session-2.0.mo
share/locale/sk/LC_MESSAGES/gnome-session-2.0.mo
share/locale/sl/LC_MESSAGES/gnome-session-2.0.mo
share/locale/sq/LC_MESSAGES/gnome-session-2.0.mo
@@ -102,6 +83,7 @@ share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-session-2.0.mo
share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/te/LC_MESSAGES/gnome-session-2.0.mo
share/locale/th/LC_MESSAGES/gnome-session-2.0.mo
share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo
@@ -113,12 +95,37 @@ share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zh_HK/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
+share/pixmaps/splash/MaMBaNgGaoX-2.12.png
+share/pixmaps/splash/adamw-bat-2.18.jpg
+share/pixmaps/splash/adamw-conky-2.18.png
+share/pixmaps/splash/adamw-cow-2.18.png
+share/pixmaps/splash/adamw-mouth-2.18.png
+share/pixmaps/splash/adamw-piggy-2.12.png
+share/pixmaps/splash/adamw-swing-2.18.png
+share/pixmaps/splash/adamw-trophy-2.12.png
+share/pixmaps/splash/andreas-slogan-2.12.png
+share/pixmaps/splash/andreas-splash-2.12.png
+share/pixmaps/splash/domix-splash-2.12.png
+share/pixmaps/splash/domix-splash2-2.12.png
+share/pixmaps/splash/franz-splash_218.png
+share/pixmaps/splash/gnome-splash.png
+share/pixmaps/splash/mumija-2.12.png
+share/pixmaps/splash/mumija2-2.12.png
+share/pixmaps/splash/mumija3-2.12.png
+share/pixmaps/splash/original-gnome-splash.png
+share/pixmaps/splash/tremulant-2.12.png
+share/pixmaps/splash/tremulant-blood-2.12.png
+share/pixmaps/splash/tremulant-brushed-metal-2.12.png
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/oc/LC_MESSAGES
@@ -139,3 +146,6 @@ share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/applications
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 35276e2e5f37..68a3ec1da2ed 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-terminal/Makefile,v 1.86 2007/03/13 00:46:19 mezz Exp $
+# $MCom: ports/x11/gnome-terminal/Makefile,v 1.92 2007/09/18 13:06:26 ahze Exp $
#
PORTNAME= gnome-terminal
-PORTVERSION= 2.18.1
+PORTVERSION= 2.18.2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index a136df8d7b36..eaa330cc1f82 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-terminal-2.18.1.tar.bz2) = c1902cf4727f4cd976d6cc0beb1c03fe
-SHA256 (gnome2/gnome-terminal-2.18.1.tar.bz2) = a66701d5c247c092d9b52ee2209cdb8094f5ce2ab339ee78738ccdb3a0b81cdb
-SIZE (gnome2/gnome-terminal-2.18.1.tar.bz2) = 1995096
+MD5 (gnome2/gnome-terminal-2.18.2.tar.bz2) = a54b010cdeb1e908cad6085bf9de87c4
+SHA256 (gnome2/gnome-terminal-2.18.2.tar.bz2) = f046e938f14aa2ec5cc6db5a85d7ffaf470b3cc233257ca55d2fa7530daa28d1
+SIZE (gnome2/gnome-terminal-2.18.2.tar.bz2) = 2057415
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index cefb430b0f52..f69d5bcef194 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -1,7 +1,7 @@
bin/gnome-terminal
libdata/bonobo/servers/gnome-terminal.server
-share/gnome/applications/gnome-terminal.desktop
-share/gnome/gnome-terminal/glade/gnome-terminal.glade2
+share/applications/gnome-terminal.desktop
+%%DATADIR%%/glade/gnome-terminal.glade2
share/gnome/help/gnome-terminal/C/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/C/figures/gnome-terminal-tabbed.png
share/gnome/help/gnome-terminal/C/gnome-terminal.xml
@@ -11,11 +11,12 @@ share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-tabbed.png
share/gnome/help/gnome-terminal/bg/figures/terminal_window.png
share/gnome/help/gnome-terminal/bg/gnome-terminal.xml
share/gnome/help/gnome-terminal/bg/legal.xml
+share/gnome/help/gnome-terminal/ca/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/ca/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/ca/gnome-terminal.xml
share/gnome/help/gnome-terminal/de/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/de/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/de/figures/terminal_window.png
share/gnome/help/gnome-terminal/de/gnome-terminal.xml
-share/gnome/help/gnome-terminal/de/legal.xml
share/gnome/help/gnome-terminal/es/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/es/figures/gnome-terminal-tabbed.png
share/gnome/help/gnome-terminal/es/gnome-terminal.xml
@@ -32,9 +33,10 @@ share/gnome/help/gnome-terminal/ja/gnome-terminal.xml
share/gnome/help/gnome-terminal/ja/legal.xml
share/gnome/help/gnome-terminal/ko/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/ko/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/ko/figures/terminal_window.png
share/gnome/help/gnome-terminal/ko/gnome-terminal.xml
-share/gnome/help/gnome-terminal/ko/legal.xml
+share/gnome/help/gnome-terminal/oc/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/oc/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/oc/gnome-terminal.xml
share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-tabbed.png
share/gnome/help/gnome-terminal/ro/figures/terminal_window.png
@@ -59,23 +61,9 @@ share/gnome/help/gnome-terminal/zh_TW/figures/gnome-terminal-tabbed.png
share/gnome/help/gnome-terminal/zh_TW/figures/terminal_window.png
share/gnome/help/gnome-terminal/zh_TW/gnome-terminal.xml
share/gnome/help/gnome-terminal/zh_TW/legal.xml
-share/gnome/omf/gnome-terminal/gnome-terminal-C.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-bg.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-de.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-es.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-fr.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-it.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-ja.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-ko.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-ru.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-sv.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-uk.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-zh_CN.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-zh_TW.omf
-share/gnome/pixmaps/gnome-terminal.png
share/locale/am/LC_MESSAGES/gnome-terminal.mo
share/locale/ar/LC_MESSAGES/gnome-terminal.mo
+share/locale/as/LC_MESSAGES/gnome-terminal.mo
share/locale/az/LC_MESSAGES/gnome-terminal.mo
share/locale/be/LC_MESSAGES/gnome-terminal.mo
share/locale/be@latin/LC_MESSAGES/gnome-terminal.mo
@@ -133,6 +121,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-terminal.mo
share/locale/ro/LC_MESSAGES/gnome-terminal.mo
share/locale/ru/LC_MESSAGES/gnome-terminal.mo
share/locale/rw/LC_MESSAGES/gnome-terminal.mo
+share/locale/si/LC_MESSAGES/gnome-terminal.mo
share/locale/sk/LC_MESSAGES/gnome-terminal.mo
share/locale/sl/LC_MESSAGES/gnome-terminal.mo
share/locale/sq/LC_MESSAGES/gnome-terminal.mo
@@ -149,7 +138,24 @@ share/locale/xh/LC_MESSAGES/gnome-terminal.mo
share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo
share/locale/zh_HK/LC_MESSAGES/gnome-terminal.mo
share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
-@dirrm share/gnome/omf/gnome-terminal
+share/omf/gnome-terminal/gnome-terminal-C.omf
+share/omf/gnome-terminal/gnome-terminal-bg.omf
+share/omf/gnome-terminal/gnome-terminal-ca.omf
+share/omf/gnome-terminal/gnome-terminal-de.omf
+share/omf/gnome-terminal/gnome-terminal-es.omf
+share/omf/gnome-terminal/gnome-terminal-fr.omf
+share/omf/gnome-terminal/gnome-terminal-it.omf
+share/omf/gnome-terminal/gnome-terminal-ja.omf
+share/omf/gnome-terminal/gnome-terminal-ko.omf
+share/omf/gnome-terminal/gnome-terminal-oc.omf
+share/omf/gnome-terminal/gnome-terminal-ro.omf
+share/omf/gnome-terminal/gnome-terminal-ru.omf
+share/omf/gnome-terminal/gnome-terminal-sv.omf
+share/omf/gnome-terminal/gnome-terminal-uk.omf
+share/omf/gnome-terminal/gnome-terminal-zh_CN.omf
+share/omf/gnome-terminal/gnome-terminal-zh_TW.omf
+share/pixmaps/gnome-terminal.png
+@dirrm share/omf/gnome-terminal
@dirrm share/gnome/help/gnome-terminal/zh_TW/figures
@dirrm share/gnome/help/gnome-terminal/zh_TW
@dirrm share/gnome/help/gnome-terminal/zh_CN/figures
@@ -162,6 +168,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
@dirrm share/gnome/help/gnome-terminal/ru
@dirrm share/gnome/help/gnome-terminal/ro/figures
@dirrm share/gnome/help/gnome-terminal/ro
+@dirrm share/gnome/help/gnome-terminal/oc/figures
+@dirrm share/gnome/help/gnome-terminal/oc
@dirrm share/gnome/help/gnome-terminal/ko/figures
@dirrm share/gnome/help/gnome-terminal/ko
@dirrm share/gnome/help/gnome-terminal/ja/figures
@@ -174,17 +182,21 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
@dirrm share/gnome/help/gnome-terminal/es
@dirrm share/gnome/help/gnome-terminal/de/figures
@dirrm share/gnome/help/gnome-terminal/de
+@dirrm share/gnome/help/gnome-terminal/ca/figures
+@dirrm share/gnome/help/gnome-terminal/ca
@dirrm share/gnome/help/gnome-terminal/bg/figures
@dirrm share/gnome/help/gnome-terminal/bg
@dirrm share/gnome/help/gnome-terminal/C/figures
@dirrm share/gnome/help/gnome-terminal/C
@dirrm share/gnome/help/gnome-terminal
-@dirrm share/gnome/gnome-terminal/glade
-@dirrm share/gnome/gnome-terminal
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/oc/LC_MESSAGES
@@ -203,3 +215,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
+@dirrmtry share/applications
diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile
index 82094d0f3d26..73a606a105b9 100644
--- a/x11/gnome2-fifth-toe/Makefile
+++ b/x11/gnome2-fifth-toe/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome2-fifth-toe/Makefile,v 1.83 2007/04/03 01:14:24 ahze Exp $
+# $MCom: ports/x11/gnome2-fifth-toe/Makefile,v 1.92 2007/10/18 23:45:20 marcus Exp $
#
PORTREVISION= 0
@@ -21,17 +21,18 @@ RUN_DEPENDS= pan:${PORTSDIR}/news/pan \
pidgin:${PORTSDIR}/net-im/pidgin \
tsclient:${PORTSDIR}/net/tsclient \
galeon:${PORTSDIR}/www/galeon \
- ${LOCALBASE}/share/gnome/themes/Gorilla/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/gnome-themes-extras \
+ ${LOCALBASE}/share/icons/Foxtrot/index.theme:${PORTSDIR}/x11-themes/gnome-themes-extras \
bluefish:${PORTSDIR}/www/bluefish \
gossip:${PORTSDIR}/net-im/gossip \
liferea:${PORTSDIR}/net/liferea \
gnotime:${PORTSDIR}/deskutils/gnotime \
rhythmbox:${PORTSDIR}/audio/rhythmbox \
- ${LOCALBASE}/share/gnome/pixmaps/glines/classic.png:${PORTSDIR}/games/gnome-games-extra-data \
+ ${LOCALBASE}/share/pixmaps/glines/classic.png:${PORTSDIR}/games/gnome-games-extra-data \
nautilus-sendto:${PORTSDIR}/deskutils/nautilus-sendto \
inkscape:${PORTSDIR}/graphics/inkscape \
atomix:${PORTSDIR}/games/atomix \
- straw:${PORTSDIR}/net/straw
+ straw:${PORTSDIR}/net/straw \
+ ${LOCALBASE}/share/gnome/help/gdp-handbook/C/builddocs.xml:${PORTSDIR}/misc/gnome-devel-docs
MASTERDIR= ${.CURDIR}/../gnome2
GNOME_SLAVE= yes
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index c30e821ce096..76509fc2c6bb 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome2-lite/Makefile,v 1.54 2007/03/02 15:38:59 ahze Exp $
+# $MCom: ports/x11/gnome2-lite/Makefile,v 1.60 2007/08/15 17:52:07 mezz Exp $
#
PORTREVISION= 0
@@ -22,13 +22,13 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applet
gnome-system-monitor:${PORTSDIR}/sysutils/gnome-system-monitor \
nautilus:${PORTSDIR}/x11-fm/nautilus \
${LOCALBASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \
- ${LOCALBASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \
+ ${LOCALBASE}/share/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \
file-roller:${PORTSDIR}/archivers/file-roller \
${LOCALBASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
evince:${PORTSDIR}/graphics/evince \
gcalctool:${PORTSDIR}/math/gcalctool \
gucharmap:${PORTSDIR}/deskutils/gucharmap \
- ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
+ ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile
index 3572e8356e81..b9fa5664607c 100644
--- a/x11/gnome2-power-tools/Makefile
+++ b/x11/gnome2-power-tools/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.76 2007/03/14 21:39:31 marcus Exp $
+# $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.79 2007/10/18 23:45:20 marcus Exp $
#
PORTREVISION= 0
@@ -12,7 +12,7 @@ PKGNAMESUFFIX= -power-tools
COMMENT= The 'Geektoys' for the GNOME 2 power user
-RUN_DEPENDS= ${LOCALBASE}/lib/epiphany/2.18/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \
+RUN_DEPENDS= ${LOCALBASE}/lib/epiphany/2.20/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \
gnome-pkgview:${PORTSDIR}/sysutils/gnome-pkgview \
${LOCALBASE}/libexec/netspeed_applet2:${PORTSDIR}/net/netspeed_applet \
${LOCALBASE}/sbin/gkrellmd:${PORTSDIR}/sysutils/gkrellm2 \
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 8de9418f46af..0762f2f7f850 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome2/Makefile,v 1.201 2007/03/14 21:39:30 marcus Exp $
+# $MCom: ports/x11/gnome2/Makefile,v 1.221 2007/10/18 23:45:19 marcus Exp $
#
PORTNAME= gnome2
-PORTVERSION= 2.18.3
+PORTVERSION= 2.20.1
PORTREVISION?= 0
CATEGORIES?= x11 gnome
MASTER_SITES= # empty
@@ -31,7 +31,7 @@ RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple
nautilus:${PORTSDIR}/x11-fm/nautilus \
${LOCALBASE}/sbin/gdm:${PORTSDIR}/x11/gdm \
${LOCALBASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \
- ${LOCALBASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \
+ ${LOCALBASE}/share/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \
${LOCALBASE}/libdata/pkgconfig/libgail-gnome.pc:${PORTSDIR}/x11-toolkits/libgail-gnome \
file-roller:${PORTSDIR}/archivers/file-roller \
${LOCALBASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
@@ -40,20 +40,20 @@ RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple
gcalctool:${PORTSDIR}/math/gcalctool \
gucharmap:${PORTSDIR}/deskutils/gucharmap \
zenity:${PORTSDIR}/x11/zenity \
- ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
+ ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
${LOCALBASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnome-netstatus \
dasher:${PORTSDIR}/accessibility/dasher \
- evolution-2.10:${PORTSDIR}/mail/evolution \
+ evolution:${PORTSDIR}/mail/evolution \
${LOCALBASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \
network-admin:${PORTSDIR}/sysutils/gnome-system-tools \
gnome-nettool:${PORTSDIR}/net/gnome-nettool \
vino-session:${PORTSDIR}/net/vino \
- exchange-connector-setup-2.10:${PORTSDIR}/mail/evolution-exchange \
+ exchange-connector-setup-2.12:${PORTSDIR}/mail/evolution-exchange \
${LOCALBASE}/lib/gstreamer-0.10/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \
${LOCALBASE}/lib/gstreamer-0.10/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \
totem:${PORTSDIR}/multimedia/totem \
gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
- ${LOCALBASE}/share/gnome/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
+ ${LOCALBASE}/share/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
sound-juicer:${PORTSDIR}/audio/sound-juicer \
gnome-keyring-manager:${PORTSDIR}/security/gnome-keyring-manager \
${LOCALBASE}/libdata/pkgconfig/libgtkhtml-2.0.pc:${PORTSDIR}/www/libgtkhtml \
@@ -88,7 +88,7 @@ RUN_DEPENDS+= yelp:${PORTSDIR}/x11/yelp \
epiphany:${PORTSDIR}/www/epiphany
.endif
.if ${.CURDIR:T}!="gnome2-lite"
-.if ${ARCH} == "i386" && ${OSVERSION} < 700042
+.if ${ARCH} == "i386"
RUN_DEPENDS+= tomboy:${PORTSDIR}/deskutils/tomboy
.endif
.if ${OSVERSION}>=600000
@@ -99,7 +99,7 @@ RUN_DEPENDS+= ekiga:${PORTSDIR}/net/ekiga
.if ${.CURDIR}==${MASTERDIR} || ${.CURDIR:T}=="gnome2-lite"
.if defined(WITH_XSCREENSAVER)
-RUN_DEPENDS+= ${LOCALBASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
+RUN_DEPENDS+= ${LOCALBASE}/share/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
.else
RUN_DEPENDS+= gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver
.endif
diff --git a/x11/gsynaptics/pkg-plist b/x11/gsynaptics/pkg-plist
index 055dee05dfe9..65810d0a7be5 100644
--- a/x11/gsynaptics/pkg-plist
+++ b/x11/gsynaptics/pkg-plist
@@ -9,6 +9,5 @@ share/locale/ja/LC_MESSAGES/gsynaptics.mo
share/locale/zh_CN/LC_MESSAGES/gsynaptics.mo
share/locale/zh_TW/LC_MESSAGES/gsynaptics.mo
share/pixmaps/touchpad.png
-@dirrmtry share/gnome/autostart
@dirrmtry share/applications
@dirrm share/gsynaptics
diff --git a/x11/gtstarter/Makefile b/x11/gtstarter/Makefile
index 2f9d41d63b5f..264329475700 100644
--- a/x11/gtstarter/Makefile
+++ b/x11/gtstarter/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gtstarter
-PORTVERSION= 0.4.6.2
-PORTREVISION= 1
+PORTVERSION= 0.4.6.3
CATEGORIES= x11 gnome
MASTER_SITES= http://webonaut.com/distfiles/${PORTNAME}/
@@ -20,7 +19,7 @@ USE_PYTHON= yes
USE_GNOME= pygnome2 pygnomeextras gnomeprefix
do-build:
- @${REINPLACE_CMD} -e 's|/usr/X11R6|${PREFIX}|g' \
+ @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \
${WRKSRC}/*.py ${WRKSRC}/*.server
@${FIND} ${WRKSRC} -name '*.bak' -delete
@${FIND} ${WRKSRC} -name '*.orig' -delete
@@ -33,7 +32,7 @@ do-install:
@${INSTALL_SCRIPT} ${WRKSRC}/*.py* \
${PREFIX}/libexec/${PORTNAME}/
@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop \
- ${PREFIX}/share/gnome/applications/
+ ${PREFIX}/share/applications/
@${INSTALL_DATA} ${WRKSRC}/*.server \
${PREFIX}/libdata/bonobo/servers/
@${LN} -sf ${PREFIX}/libexec/${PORTNAME}/${PORTNAME} \
diff --git a/x11/gtstarter/distinfo b/x11/gtstarter/distinfo
index a8cb3c41c45e..3ae279de3f00 100644
--- a/x11/gtstarter/distinfo
+++ b/x11/gtstarter/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtstarter-0.4.6.2.tar.bz2) = 494035fdc7c5bd5049116d05558b704c
-SHA256 (gtstarter-0.4.6.2.tar.bz2) = 4a1d2ffbeb91f1103c654ba23f63594ea3589ca41b1484ca8fe7f48812eed088
-SIZE (gtstarter-0.4.6.2.tar.bz2) = 6168
+MD5 (gtstarter-0.4.6.3.tar.bz2) = 842d36f88da9fdbc1ffba31ee01b7438
+SHA256 (gtstarter-0.4.6.3.tar.bz2) = 2047b5d51312fe58b60d1dc15c01b25db25212a87b34a57c2797057ddffb7363
+SIZE (gtstarter-0.4.6.3.tar.bz2) = 6136
diff --git a/x11/gtstarter/pkg-plist b/x11/gtstarter/pkg-plist
index 223f7f867088..2d60f028675c 100644
--- a/x11/gtstarter/pkg-plist
+++ b/x11/gtstarter/pkg-plist
@@ -5,5 +5,6 @@ libexec/gtstarter/gtstarter_lib.py
libexec/gtstarter/gtstarter_lib.pyc
libexec/gtstarter/gtstarter
libdata/bonobo/servers/GTStarterApplet.server
-share/gnome/applications/gtstarter.desktop
+share/applications/gtstarter.desktop
@dirrm libexec/gtstarter
+@dirrmtry share/applications
diff --git a/x11/libcapplet/Makefile b/x11/libcapplet/Makefile
index 44281ffe1248..bbfcbbca3c98 100644
--- a/x11/libcapplet/Makefile
+++ b/x11/libcapplet/Makefile
@@ -3,11 +3,12 @@
# Whom: Maxim Soboleb <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/libcapplet/Makefile,v 1.4 2006/10/07 19:06:46 ahze Exp $
+# $MCom: ports/x11/libcapplet/Makefile,v 1.7 2007/05/19 21:36:29 marcus Exp $
+#
PORTNAME= libcapplet
PORTVERSION= 1.4.0.5
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11 gnome
MASTER_SITES= http://people.freebsd.org/~sobomax/
DIST_SUBDIR= gnome
@@ -35,8 +36,8 @@ do-install:
${MKDIR} ${PREFIX}/include/libcapplet1
${INSTALL_DATA} ${WRKSRC}/capplet-widget.h \
${PREFIX}/include/libcapplet1
- ${MKDIR} ${PREFIX}/share/gnome/idl
- ${INSTALL_DATA} ${WRKSRC}/control-center.idl ${PREFIX}/share/gnome/idl
+ ${MKDIR} ${PREFIX}/share/idl
+ ${INSTALL_DATA} ${WRKSRC}/control-center.idl ${PREFIX}/share/idl
${INSTALL_SCRIPT} ${WRKSRC}/cappletConf.sh ${PREFIX}/etc
.include <bsd.port.post.mk>
diff --git a/x11/libcapplet/pkg-plist b/x11/libcapplet/pkg-plist
index 1f2ac5c47e46..906f23b6cdfc 100644
--- a/x11/libcapplet/pkg-plist
+++ b/x11/libcapplet/pkg-plist
@@ -3,5 +3,5 @@ include/libcapplet1/capplet-widget.h
lib/libcapplet.a
lib/libcapplet.so
lib/libcapplet.so.5
-share/gnome/idl/control-center.idl
+share/idl/control-center.idl
@dirrm include/libcapplet1
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index c623a8e30cd0..cc476664cc1b 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -3,12 +3,12 @@
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
-# $MCom: ports/x11/libgnome/Makefile,v 1.100 2007/03/12 15:49:09 ahze Exp $
+# $MCom: ports/x11/libgnome/Makefile,v 1.110 2007/10/17 21:36:13 mezz Exp $
#
PORTNAME= libgnome
-PORTVERSION= 2.18.0
-PORTREVISION?= 2
+PORTVERSION= 2.20.1.1
+PORTREVISION?= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -21,8 +21,8 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
-BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
+RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
USE_GETTEXT= yes
USE_XPM= yes
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index c9dc30c0be72..0d26b855320a 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnome-2.18.0.tar.bz2) = 73426589d7c6fa3266fe4e8f3be2f5b5
-SHA256 (gnome2/libgnome-2.18.0.tar.bz2) = 53e3b241343c7ea9c4a8db4ca898fd7020c281f1400826d899b841d760dd5ba9
-SIZE (gnome2/libgnome-2.18.0.tar.bz2) = 1082802
+MD5 (gnome2/libgnome-2.20.1.1.tar.bz2) = cfab025a8b9a19cdae1c64f8b005c513
+SHA256 (gnome2/libgnome-2.20.1.1.tar.bz2) = d5b66f1beeefe3b61b654fa4d9c35b642fd73e310da1dd241e0ccb99dc93adec
+SIZE (gnome2/libgnome-2.20.1.1.tar.bz2) = 1370144
diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in
index 5a240a06a94c..efac650ba5a4 100644
--- a/x11/libgnome/files/patch-libgnome::Makefile.in
+++ b/x11/libgnome/files/patch-libgnome::Makefile.in
@@ -1,12 +1,11 @@
---- libgnome/Makefile.in.orig Mon May 31 16:33:14 2004
-+++ libgnome/Makefile.in Mon May 31 16:33:45 2004
-@@ -211,6 +211,9 @@
+--- libgnome/Makefile.in.orig Tue May 29 22:16:13 2007
++++ libgnome/Makefile.in Tue May 29 22:16:58 2007
+@@ -280,6 +280,8 @@
+ LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome
-
INCLUDES = \
+ -DPREFIX=\""$(PREFIX)"\" \
+ -DLOCALBASE=\""$(LOCALBASE)"\" \
-+ -DX11BASE=\""$(X11BASE)"\" \
-I.. \
-I$(srcdir)/.. \
$(WARN_CFLAGS) \
diff --git a/x11/libgnome/files/patch-libgnome_gnome-program.c b/x11/libgnome/files/patch-libgnome_gnome-program.c
deleted file mode 100644
index 70ecbfd8fce0..000000000000
--- a/x11/libgnome/files/patch-libgnome_gnome-program.c
+++ /dev/null
@@ -1,55 +0,0 @@
---- libgnome/gnome-program.c.orig Tue Apr 4 06:55:12 2006
-+++ libgnome/gnome-program.c Mon Apr 10 21:07:02 2006
-@@ -936,17 +936,17 @@ gnome_program_locate_file (GnomeProgram
- attr_rel = "";
- break;
- case GNOME_FILE_DOMAIN_DATADIR:
-- prefix_rel = "/share";
-+ prefix_rel = "/share/gnome";
- attr_name = GNOME_PARAM_GNOME_DATADIR;
- attr_rel = "";
- break;
- case GNOME_FILE_DOMAIN_SOUND:
-- prefix_rel = "/share/sounds";
-+ prefix_rel = "/share/gnome/sounds";
- attr_name = GNOME_PARAM_GNOME_DATADIR;
- attr_rel = "/sounds";
- break;
- case GNOME_FILE_DOMAIN_PIXMAP:
-- prefix_rel = "/share/pixmaps";
-+ prefix_rel = "/share/gnome/pixmaps";
- attr_name = GNOME_PARAM_GNOME_DATADIR;
- attr_rel = "/pixmaps";
- break;
-@@ -958,7 +958,7 @@ gnome_program_locate_file (GnomeProgram
- case GNOME_FILE_DOMAIN_HELP:
- prefix_rel = "/share/gnome/help";
- attr_name = GNOME_PARAM_GNOME_DATADIR;
-- attr_rel = "/gnome/help";
-+ attr_rel = "/help";
- break;
- case GNOME_FILE_DOMAIN_APP_LIBDIR:
- prefix_rel = "/lib";
-@@ -967,19 +967,19 @@ gnome_program_locate_file (GnomeProgram
- search_path = FALSE;
- break;
- case GNOME_FILE_DOMAIN_APP_DATADIR:
-- prefix_rel = "/share";
-+ prefix_rel = "/share/gnome";
- attr_name = GNOME_PARAM_APP_DATADIR;
- attr_rel = "";
- search_path = FALSE;
- break;
- case GNOME_FILE_DOMAIN_APP_SOUND:
-- prefix_rel = "/share/sounds";
-+ prefix_rel = "/share/gnome/sounds";
- attr_name = GNOME_PARAM_APP_DATADIR;
- attr_rel = "/sounds";
- search_path = FALSE;
- break;
- case GNOME_FILE_DOMAIN_APP_PIXMAP:
-- prefix_rel = "/share/pixmaps";
-+ prefix_rel = "/share/gnome/pixmaps";
- attr_name = GNOME_PARAM_APP_DATADIR;
- attr_rel = "/pixmaps";
- search_path = FALSE;
diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in
index 3cfaf607920c..37c981693b8b 100644
--- a/x11/libgnome/files/pkg-deinstall.in
+++ b/x11/libgnome/files/pkg-deinstall.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $FreeBSD$
-# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.10 2007/02/16 18:14:27 mezz Exp $
+# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.12 2007/04/26 14:17:52 ahze Exp $
#
# Restore gconf keys of gnomevfs2.
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 1eb129280b30..47b38ad06555 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -25,8 +25,10 @@ lib/libgnome-2.so
lib/libgnome-2.so.0
libdata/bonobo/servers/GNOME_Moniker_std.server
libdata/pkgconfig/libgnome-2.0.pc
+share/gnome-background-properties/gnome-default.xml
share/locale/am/LC_MESSAGES/libgnome-2.0.mo
share/locale/ar/LC_MESSAGES/libgnome-2.0.mo
+share/locale/as/LC_MESSAGES/libgnome-2.0.mo
share/locale/az/LC_MESSAGES/libgnome-2.0.mo
share/locale/be/LC_MESSAGES/libgnome-2.0.mo
share/locale/bg/LC_MESSAGES/libgnome-2.0.mo
@@ -65,6 +67,7 @@ share/locale/ko/LC_MESSAGES/libgnome-2.0.mo
share/locale/ku/LC_MESSAGES/libgnome-2.0.mo
share/locale/lt/LC_MESSAGES/libgnome-2.0.mo
share/locale/lv/LC_MESSAGES/libgnome-2.0.mo
+share/locale/mg/LC_MESSAGES/libgnome-2.0.mo
share/locale/mk/LC_MESSAGES/libgnome-2.0.mo
share/locale/ml/LC_MESSAGES/libgnome-2.0.mo
share/locale/mn/LC_MESSAGES/libgnome-2.0.mo
@@ -73,6 +76,7 @@ share/locale/nb/LC_MESSAGES/libgnome-2.0.mo
share/locale/ne/LC_MESSAGES/libgnome-2.0.mo
share/locale/nl/LC_MESSAGES/libgnome-2.0.mo
share/locale/nn/LC_MESSAGES/libgnome-2.0.mo
+share/locale/oc/LC_MESSAGES/libgnome-2.0.mo
share/locale/or/LC_MESSAGES/libgnome-2.0.mo
share/locale/pa/LC_MESSAGES/libgnome-2.0.mo
share/locale/pl/LC_MESSAGES/libgnome-2.0.mo
@@ -100,6 +104,10 @@ share/locale/yi/LC_MESSAGES/libgnome-2.0.mo
share/locale/zh_CN/LC_MESSAGES/libgnome-2.0.mo
share/locale/zh_HK/LC_MESSAGES/libgnome-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
+share/pixmaps/backgrounds/gnome/background-default.jpg
+@dirrm share/pixmaps/backgrounds/gnome
+@dirrm share/pixmaps/backgrounds
+@dirrmtry share/gnome-background-properties
@dirrm include/libgnome-2.0/libgnome
@dirrm include/libgnome-2.0
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -114,9 +122,15 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
@dirrmtry share/locale/sr@ije
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 415a065145b8..85a453f578eb 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/libgnomekbd/Makefile,v 1.5 2007/03/12 01:37:17 mezz Exp $
+# $MCom: ports/x11/libgnomekbd/Makefile,v 1.13 2007/09/17 14:06:48 ahze Exp $
#
PORTNAME= libgnomekbd
-PORTVERSION= 2.18.2
+PORTVERSION= 2.20.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -25,8 +25,8 @@ INSTALLS_ICONS= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= desktop_gnome_peripherals_keyboard_xkb.schemas
diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo
index 8d54198cf908..931fde380f27 100644
--- a/x11/libgnomekbd/distinfo
+++ b/x11/libgnomekbd/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomekbd-2.18.2.tar.bz2) = e99a9f1de689ba3c0ad03fadd55dd3e4
-SHA256 (gnome2/libgnomekbd-2.18.2.tar.bz2) = af7d2135e404564bafa8bb580ed7668098c507f1a4c6385d5d09a2eba02f3799
-SIZE (gnome2/libgnomekbd-2.18.2.tar.bz2) = 359702
+MD5 (gnome2/libgnomekbd-2.20.0.tar.bz2) = 0b495d355e25c3531419cb3996be7e28
+SHA256 (gnome2/libgnomekbd-2.20.0.tar.bz2) = b82310e5d319ac1ba33d008360c4fae128f1b68768f1e51ff1021b60c19a900c
+SIZE (gnome2/libgnomekbd-2.20.0.tar.bz2) = 392206
diff --git a/x11/libgnomekbd/pkg-plist b/x11/libgnomekbd/pkg-plist
index d955958218b3..e198161eecc8 100644
--- a/x11/libgnomekbd/pkg-plist
+++ b/x11/libgnomekbd/pkg-plist
@@ -18,38 +18,59 @@ lib/libgnomekbdui.so
lib/libgnomekbdui.so.1
libdata/pkgconfig/libgnomekbd.pc
libdata/pkgconfig/libgnomekbdui.pc
-share/gnome/applications/gkbd-indicator-plugins-capplet.desktop
-share/gnome/libgnomekbd/glade/gkbd-indicator-plugins.glade
+share/applications/gkbd-indicator-plugins-capplet.desktop
share/icons/hicolor/48x48/apps/gkbd-indicator-plugins-capplet.png
+%%DATADIR%%/glade/gkbd-indicator-plugins.glade
share/locale/ar/LC_MESSAGES/libgnomekbd.mo
share/locale/be@latin/LC_MESSAGES/libgnomekbd.mo
share/locale/bg/LC_MESSAGES/libgnomekbd.mo
+share/locale/bn_IN/LC_MESSAGES/libgnomekbd.mo
share/locale/ca/LC_MESSAGES/libgnomekbd.mo
share/locale/da/LC_MESSAGES/libgnomekbd.mo
+share/locale/de/LC_MESSAGES/libgnomekbd.mo
share/locale/dz/LC_MESSAGES/libgnomekbd.mo
share/locale/el/LC_MESSAGES/libgnomekbd.mo
share/locale/en_GB/LC_MESSAGES/libgnomekbd.mo
share/locale/es/LC_MESSAGES/libgnomekbd.mo
+share/locale/et/LC_MESSAGES/libgnomekbd.mo
+share/locale/fi/LC_MESSAGES/libgnomekbd.mo
share/locale/fr/LC_MESSAGES/libgnomekbd.mo
share/locale/gl/LC_MESSAGES/libgnomekbd.mo
share/locale/gu/LC_MESSAGES/libgnomekbd.mo
share/locale/hu/LC_MESSAGES/libgnomekbd.mo
share/locale/it/LC_MESSAGES/libgnomekbd.mo
share/locale/ja/LC_MESSAGES/libgnomekbd.mo
+share/locale/ka/LC_MESSAGES/libgnomekbd.mo
share/locale/ko/LC_MESSAGES/libgnomekbd.mo
share/locale/lt/LC_MESSAGES/libgnomekbd.mo
share/locale/mk/LC_MESSAGES/libgnomekbd.mo
share/locale/nb/LC_MESSAGES/libgnomekbd.mo
+share/locale/nl/LC_MESSAGES/libgnomekbd.mo
+share/locale/oc/LC_MESSAGES/libgnomekbd.mo
+share/locale/or/LC_MESSAGES/libgnomekbd.mo
share/locale/pa/LC_MESSAGES/libgnomekbd.mo
+share/locale/pl/LC_MESSAGES/libgnomekbd.mo
share/locale/pt/LC_MESSAGES/libgnomekbd.mo
share/locale/pt_BR/LC_MESSAGES/libgnomekbd.mo
share/locale/ru/LC_MESSAGES/libgnomekbd.mo
+share/locale/si/LC_MESSAGES/libgnomekbd.mo
share/locale/sv/LC_MESSAGES/libgnomekbd.mo
+share/locale/ta/LC_MESSAGES/libgnomekbd.mo
+share/locale/th/LC_MESSAGES/libgnomekbd.mo
share/locale/uk/LC_MESSAGES/libgnomekbd.mo
-@dirrm share/gnome/libgnomekbd/glade
-@dirrm share/gnome/libgnomekbd
+share/locale/vi/LC_MESSAGES/libgnomekbd.mo
+share/locale/zh_CN/LC_MESSAGES/libgnomekbd.mo
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
@dirrm include/libgnomekbd
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/applications
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index ce58b9f1cde4..6e7db08070b5 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -3,12 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/x11/libgnomemm26/Makefile,v 1.12 2007/03/10 05:37:03 marcus Exp $
+# $MCom: ports/x11/libgnomemm26/Makefile,v 1.14 2007/09/17 03:10:06 marcus Exp $
#
PORTNAME= libgnomemm
-PORTVERSION= 2.18.0
-PORTREVISION= 1
+PORTVERSION= 2.20.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/libgnomemm26/distinfo b/x11/libgnomemm26/distinfo
index afa6cee74da9..862b17d72c20 100644
--- a/x11/libgnomemm26/distinfo
+++ b/x11/libgnomemm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomemm-2.18.0.tar.bz2) = da6d481fc4a7fb0084d0e48f5c182112
-SHA256 (gnome2/libgnomemm-2.18.0.tar.bz2) = 043a9bedcc55296981934acf19ecfb428bdc1710baaed6c82470ea38f7bca182
-SIZE (gnome2/libgnomemm-2.18.0.tar.bz2) = 252070
+MD5 (gnome2/libgnomemm-2.20.0.tar.bz2) = 6263d15a96c34a73964be37c4e9a261f
+SHA256 (gnome2/libgnomemm-2.20.0.tar.bz2) = 4118936224bec44913e11b6b850ae33512c7aa8fde5524d171fcc7eafe1c5aa8
+SIZE (gnome2/libgnomemm-2.20.0.tar.bz2) = 248837
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index c66d736635f4..64f69d0c2249 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -3,12 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/libxklavier/Makefile,v 1.32 2007/02/24 21:00:46 mezz Exp $
+# $MCom: ports/x11/libxklavier/Makefile,v 1.35 2007/09/10 15:36:39 mezz Exp $
#
PORTNAME= libxklavier
-PORTVERSION= 3.2
-PORTREVISION= 2
+PORTVERSION= 3.3
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -25,16 +25,20 @@ USE_GNOME= gnometarget gnomehack libxml2 glib20
USE_LDCONFIG= yes
USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --disable-doxygen \
- --with-xkb-base=${X11BASE}/share/X11/xkb \
- --with-xkb-bin-base=${X11BASE}/bin \
- --with-xmodmap-base=${LOCALBASE}/share/gnome/xmodmap \
+ --with-xkb-base=${LOCALBASE}/share/X11/xkb \
+ --with-xkb-bin-base=${LOCALBASE}/bin \
+ --with-xmodmap-base=${LOCALBASE}/share/xmodmap \
--disable-gtk-doc \
--with-html-dir=${GNOME_HTML_DIR}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib"
PLIST_SUB= VERSION=${PORTVERSION}
+post-patch:
+ @${REINPLACE_CMD} -e 's|== "yes|= "yes|g' \
+ ${WRKSRC}/configure
+
.include <bsd.port.mk>
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index 7a05cc44ff13..9c48625aed65 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,3 +1,3 @@
-MD5 (libxklavier-3.2.tar.gz) = 8f89a65b2d0aa8f8f5979c7d9de3d051
-SHA256 (libxklavier-3.2.tar.gz) = a82f36b5a7a766e66b46866b81c9a20a23c9de33cc0ee6e2480b560d1e50d942
-SIZE (libxklavier-3.2.tar.gz) = 466656
+MD5 (libxklavier-3.3.tar.gz) = 0b9a62ad4f007e6c42a70a4f6e0aecbf
+SHA256 (libxklavier-3.3.tar.gz) = 050a14ddeda0bbf5c742cb60dee56de48736968d050543fc2e46bcd2e1837870
+SIZE (libxklavier-3.3.tar.gz) = 475629
diff --git a/x11/libxklavier/files/patch-configure b/x11/libxklavier/files/patch-configure
deleted file mode 100644
index d6d10d94182c..000000000000
--- a/x11/libxklavier/files/patch-configure
+++ /dev/null
@@ -1,35 +0,0 @@
---- configure.orig Sat Nov 4 15:13:39 2006
-+++ configure Sat Nov 4 15:14:10 2006
-@@ -23045,9 +23045,9 @@ fi
-
- { echo "$as_me:$LINENO: checking whether at least one libxklavier backend is enabled" >&5
- echo $ECHO_N "checking whether at least one libxklavier backend is enabled... $ECHO_C" >&6; }
--if test \( "$enable_xkb_support" == "yes" -a \
-- "$libxkbfile_present" == "yes" \) -o \
-- "$enable_xmodmap_support" == "yes" ; then
-+if test \( "$enable_xkb_support" = "yes" -a \
-+ "$libxkbfile_present" = "yes" \) -o \
-+ "$enable_xmodmap_support" = "yes" ; then
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
- else
-@@ -24885,8 +24885,8 @@ fi
-
- echo '**********************************************************'
- echo ' Libxklavier is configured with the following backends:'
--if test "$enable_xkb_support" == "yes" ; then
-- if test "$libxkbfile_present" == "yes" ; then
-+if test "$enable_xkb_support" = "yes" ; then
-+ if test "$libxkbfile_present" = "yes" ; then
- echo " XKB, libxkbfile is present"
- echo " default ruleset: $xkb_default_ruleset"
- echo " base: $xkb_base"
-@@ -24894,7 +24894,7 @@ if test "$enable_xkb_support" == "yes" ;
- echo " XKB, libxkbfile is NOT present"
- fi
- fi
--if test "$enable_xmodmap_support" == "yes" ; then
-+if test "$enable_xmodmap_support" = "yes" ; then
- echo " xmodmap, default ruleset: $xmodmap_default_ruleset"
- echo " base: $xmodmap_base"
- fi
diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist
index af1dcbcf8cf2..caf0c1705393 100644
--- a/x11/libxklavier/pkg-plist
+++ b/x11/libxklavier/pkg-plist
@@ -1,9 +1,9 @@
-include/libxklavier/xklavier.h
include/libxklavier/xkl_config_item.h
include/libxklavier/xkl_config_rec.h
include/libxklavier/xkl_config_registry.h
include/libxklavier/xkl_engine.h
include/libxklavier/xkl_engine_marshal.h
+include/libxklavier/xklavier.h
lib/libxklavier.a
lib/libxklavier.la
lib/libxklavier.so
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index 34370c360929..26b49d4103ca 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -3,11 +3,12 @@
# Whom: Frederic Dubuy <fdubuy@free.fr>
#
# $FreeBSD$
-# $MCom: ports/x11/multi-gnome-terminal/Makefile,v 1.1 2006/10/04 20:27:01 ahze Exp $
+# $MCom: ports/x11/multi-gnome-terminal/Makefile,v 1.3 2007/08/07 03:43:51 mezz Exp $
+#
PORTNAME= multi-gnome-terminal
PORTVERSION= 1.6.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= multignometerm
@@ -29,6 +30,6 @@ post-patch:
post-install:
${INSTALL_DATA} ${WRKSRC}/pixmaps/multignometerm.png \
- ${PREFIX}/share/gnome/pixmaps/multignometerm.png
+ ${PREFIX}/share/pixmaps/multignometerm.png
.include <bsd.port.mk>
diff --git a/x11/multi-gnome-terminal/pkg-plist b/x11/multi-gnome-terminal/pkg-plist
index 8b23fd5565c0..0340f8f07d0e 100644
--- a/x11/multi-gnome-terminal/pkg-plist
+++ b/x11/multi-gnome-terminal/pkg-plist
@@ -137,35 +137,35 @@ share/gnome/help/multi-gnome-terminal/no/stylesheet-images/toc-plus.gif
share/gnome/help/multi-gnome-terminal/no/stylesheet-images/up.gif
share/gnome/help/multi-gnome-terminal/no/stylesheet-images/warning.gif
share/gnome/help/multi-gnome-terminal/no/topic.dat
-share/gnome/idl/MultiTerminal.idl
-share/gnome/mgt/glade/edit_cmd.glade
-share/gnome/mgt/glade/multi-gnome-terminal.glade
-share/gnome/mgt/glade/search.glade
-share/gnome/mgt/glade/win_keys.glade
-share/gnome/mgt/glade/win_prefs.glade
-share/gnome/omf/mgt/multi-gnome-terminal-C.omf
-share/gnome/pixmaps/mgt/MGT_bb_back.png
-share/gnome/pixmaps/mgt/MGT_bb_forward.png
-share/gnome/pixmaps/mgt/MGT_bb_newshell.png
-share/gnome/pixmaps/mgt/MGT_bb_remove.png
-share/gnome/pixmaps/mgt/MGT_bb_title.png
-share/gnome/pixmaps/mgt/MGT_tb_back.png
-share/gnome/pixmaps/mgt/MGT_tb_forward.png
-share/gnome/pixmaps/mgt/MGT_tb_newmc.png
-share/gnome/pixmaps/mgt/MGT_tb_newroot.png
-share/gnome/pixmaps/mgt/MGT_tb_newshell.png
-share/gnome/pixmaps/mgt/MGT_tb_remove.png
-share/gnome/pixmaps/mgt/MGT_tb_title.png
-share/gnome/pixmaps/mgt/arrow_left2.png
-share/gnome/pixmaps/mgt/arrow_right2.png
-share/gnome/pixmaps/mgt/gnome-notepad.png
-share/gnome/pixmaps/mgt/multignometerm.png
-share/gnome/pixmaps/mgt/panel-folder.png
-share/gnome/pixmaps/multignometerm.png
-@dirrm share/gnome/pixmaps/mgt
-@dirrm share/gnome/omf/mgt
-@dirrm share/gnome/mgt/glade
-@dirrm share/gnome/mgt
+share/idl/MultiTerminal.idl
+share/mgt/glade/edit_cmd.glade
+share/mgt/glade/multi-gnome-terminal.glade
+share/mgt/glade/search.glade
+share/mgt/glade/win_keys.glade
+share/mgt/glade/win_prefs.glade
+share/omf/mgt/multi-gnome-terminal-C.omf
+share/pixmaps/mgt/MGT_bb_back.png
+share/pixmaps/mgt/MGT_bb_forward.png
+share/pixmaps/mgt/MGT_bb_newshell.png
+share/pixmaps/mgt/MGT_bb_remove.png
+share/pixmaps/mgt/MGT_bb_title.png
+share/pixmaps/mgt/MGT_tb_back.png
+share/pixmaps/mgt/MGT_tb_forward.png
+share/pixmaps/mgt/MGT_tb_newmc.png
+share/pixmaps/mgt/MGT_tb_newroot.png
+share/pixmaps/mgt/MGT_tb_newshell.png
+share/pixmaps/mgt/MGT_tb_remove.png
+share/pixmaps/mgt/MGT_tb_title.png
+share/pixmaps/mgt/arrow_left2.png
+share/pixmaps/mgt/arrow_right2.png
+share/pixmaps/mgt/gnome-notepad.png
+share/pixmaps/mgt/multignometerm.png
+share/pixmaps/mgt/panel-folder.png
+share/pixmaps/multignometerm.png
+@dirrm share/pixmaps/mgt
+@dirrm share/omf/mgt
+@dirrm share/mgt/glade
+@dirrm share/mgt
@dirrm share/gnome/help/multi-gnome-terminal/no/stylesheet-images
@dirrm share/gnome/help/multi-gnome-terminal/no/figures
@dirrm share/gnome/help/multi-gnome-terminal/no
diff --git a/x11/ruby-gnome2/Makefile b/x11/ruby-gnome2/Makefile
index 867ab8647c92..baa7bca5f216 100644
--- a/x11/ruby-gnome2/Makefile
+++ b/x11/ruby-gnome2/Makefile
@@ -3,7 +3,7 @@
# Whom: Akinori MUSHA aka knu <knu@idaemons.org>
#
# $FreeBSD$
-# $MCom: ports/x11/ruby-gnome2/Makefile,v 1.2 2005/10/17 07:05:42 mezz Exp $
+# $MCom: ports/x11/ruby-gnome2/Makefile,v 1.6 2007/10/05 05:12:56 mezz Exp $
#
PORTNAME= gnome2
diff --git a/x11/ruby-gnome2/Makefile.common b/x11/ruby-gnome2/Makefile.common
index 594d00c334d5..922d24482b3a 100644
--- a/x11/ruby-gnome2/Makefile.common
+++ b/x11/ruby-gnome2/Makefile.common
@@ -1,14 +1,17 @@
# $FreeBSD$
-RUBY_GNOME_VERSION= 0.16.0
+RUBY_GNOME_VERSION= 0.16.0.20071004 #YYYYMMDD
#RUBY_GNOME_SNAPSHOTDATE= 20061130
.if defined(RUBY_GNOME_SNAPSHOTDATE)
RUBY_GNOME_PORTVERSION= ${RUBY_GNOME_VERSION}.${RUBY_GNOME_SNAPSHOTDATE}
.else
RUBY_GNOME_PORTVERSION= ${RUBY_GNOME_VERSION}
.endif
-RUBY_GNOME_MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-RUBY_GNOME_MASTER_SITE_SUBDIR= ruby-gnome2
+#RUBY_GNOME_MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+#RUBY_GNOME_MASTER_SITE_SUBDIR= ruby-gnome2
+RUBY_GNOME_MASTER_SITES= ${MASTER_SITE_LOCAL} \
+ http://people.freebsd.org/~mezz/distfiles/
+RUBY_GNOME_MASTER_SITE_SUBDIR= mezz
RUBY_GNOME_DISTNAME= ruby-gnome2-all-${RUBY_GNOME_VERSION:S/r/rev/}
CONFIGURE_ARGS+= --ruby=${RUBY}
diff --git a/x11/ruby-gnome2/distinfo b/x11/ruby-gnome2/distinfo
index b1981b93f7dc..e206847bea11 100644
--- a/x11/ruby-gnome2/distinfo
+++ b/x11/ruby-gnome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/ruby-gnome2-all-0.16.0.tar.gz) = b3b4f81ef0fe2ce6b3f965bb7c6d3686
-SHA256 (ruby/ruby-gnome2-all-0.16.0.tar.gz) = 0910f08c5224bc39aad66c46b506e5c97e260475ede6b427d5365a9ef2d69ad4
-SIZE (ruby/ruby-gnome2-all-0.16.0.tar.gz) = 1208856
+MD5 (ruby/ruby-gnome2-all-0.16.0.20071004.tar.gz) = ebc465e0a27c3f8f78bdb3d08dc50379
+SHA256 (ruby/ruby-gnome2-all-0.16.0.20071004.tar.gz) = 62d346af997a8bd071c13a1c9ff2232dea02569caf1656880b8abd843ba7d58e
+SIZE (ruby/ruby-gnome2-all-0.16.0.20071004.tar.gz) = 1346048
diff --git a/x11/trayer/Makefile b/x11/trayer/Makefile
index 6feb85453241..c510461a7cc6 100644
--- a/x11/trayer/Makefile
+++ b/x11/trayer/Makefile
@@ -3,6 +3,7 @@
# Whom: Alexey Mikhailov <karma@ez.pereslavl.ru>
#
# $FreeBSD$
+#
PORTNAME= trayer
PORTVERSION= 1.0
@@ -29,6 +30,10 @@ PORTDOCS= README CREDITS CHANGELOG
PLIST_FILES= bin/trayer
+post-patch:
+ @${REINPLACE_CMD} -e 's|-D.*_DISABLE_DEPRECATED||g' \
+ ${WRKSRC}/Makefile.common
+
post-install:
${MKDIR} ${DOCSDIR}
.if !defined(NOPORTDOCS)
@@ -36,4 +41,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
.endfor
.endif
+
.include <bsd.port.mk>
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index d737119f4e98..205ecb72b172 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -7,6 +7,7 @@
PORTNAME= workrave
PORTVERSION= 1.8.5
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= SF
diff --git a/x11/workrave/pkg-plist b/x11/workrave/pkg-plist
index eb35165fb597..c4f6560436e6 100644
--- a/x11/workrave/pkg-plist
+++ b/x11/workrave/pkg-plist
@@ -3,60 +3,60 @@ etc/sound/events/workrave.soundlist
%%GNOME%%libdata/bonobo/servers/Workrave-Applet.server
%%GNOME%%libdata/bonobo/servers/Workrave-Control.server
%%GNOME%%libexec/workrave-applet
-%%GNOME%%share/gnome/gnome-2.0/ui/GNOME_WorkraveApplet.xml
-share/gnome/pixmaps/workrave/workrave-icon-huge.png
-share/gnome/sounds/workrave/break-ignored.wav
-share/gnome/sounds/workrave/break-prelude.wav
-share/gnome/sounds/workrave/daily-limit.wav
-share/gnome/sounds/workrave/exercise-ended.wav
-share/gnome/sounds/workrave/exercises-ended.wav
-share/gnome/sounds/workrave/micro-break-ended.wav
-share/gnome/sounds/workrave/micro-break-started.wav
-share/gnome/sounds/workrave/rest-break-ended.wav
-share/gnome/sounds/workrave/rest-break-started.wav
-share/gnome/workrave/exercises/backward-shoulder-stretch.png
-share/gnome/workrave/exercises/chair-pushup-1.png
-share/gnome/workrave/exercises/chair-pushup-2.png
-share/gnome/workrave/exercises/depth-focus-1.png
-share/gnome/workrave/exercises/depth-focus-2.png
-share/gnome/workrave/exercises/exercises.xml
-share/gnome/workrave/exercises/eye-darkness.png
-share/gnome/workrave/exercises/finger-stretch-1.png
-share/gnome/workrave/exercises/finger-stretch-2.png
-share/gnome/workrave/exercises/fist-roll-1.png
-share/gnome/workrave/exercises/fist-roll-2.png
-share/gnome/workrave/exercises/monitor-border-1.png
-share/gnome/workrave/exercises/monitor-border-2.png
-share/gnome/workrave/exercises/monitor-border-3.png
-share/gnome/workrave/exercises/monitor-border-4.png
-share/gnome/workrave/exercises/neck-tilt-stretch-1.png
-share/gnome/workrave/exercises/neck-tilt-stretch-2.png
-share/gnome/workrave/exercises/rotate-arm.png
-share/gnome/workrave/exercises/shoulder-arm-stretch.png
-share/gnome/workrave/exercises/turn-head-1.png
-share/gnome/workrave/exercises/turn-head-2.png
-share/gnome/workrave/exercises/wrist-lower-arm-desk-stretch-1.png
-share/gnome/workrave/images/daily-limit.png
-share/gnome/workrave/images/display.png
-share/gnome/workrave/images/lock.png
-share/gnome/workrave/images/micro-break.png
-share/gnome/workrave/images/monitoring.png
-share/gnome/workrave/images/network.png
-share/gnome/workrave/images/prelude-hint-sad.png
-share/gnome/workrave/images/prelude-hint.png
-share/gnome/workrave/images/rest-break.png
-share/gnome/workrave/images/shutdown.png
-share/gnome/workrave/images/time.png
-share/gnome/workrave/images/timer-daily.png
-share/gnome/workrave/images/timer-micro-break.png
-share/gnome/workrave/images/timer-rest-break.png
-share/gnome/workrave/images/workrave-icon-huge.png
-share/gnome/workrave/images/workrave-icon-large.png
-share/gnome/workrave/images/workrave-icon-medium.png
-share/gnome/workrave/images/workrave-icon-small.png
-share/gnome/workrave/images/workrave-quiet-icon-medium.png
-share/gnome/workrave/images/workrave-suspended-icon-medium.png
-share/gnome/workrave/images/workrave.png
+%%GNOME%%share/gnome-2.0/ui/GNOME_WorkraveApplet.xml
+share/pixmaps/workrave/workrave-icon-huge.png
+share/sounds/workrave/break-ignored.wav
+share/sounds/workrave/break-prelude.wav
+share/sounds/workrave/daily-limit.wav
+share/sounds/workrave/exercise-ended.wav
+share/sounds/workrave/exercises-ended.wav
+share/sounds/workrave/micro-break-ended.wav
+share/sounds/workrave/micro-break-started.wav
+share/sounds/workrave/rest-break-ended.wav
+share/sounds/workrave/rest-break-started.wav
+share/workrave/exercises/backward-shoulder-stretch.png
+share/workrave/exercises/chair-pushup-1.png
+share/workrave/exercises/chair-pushup-2.png
+share/workrave/exercises/depth-focus-1.png
+share/workrave/exercises/depth-focus-2.png
+share/workrave/exercises/exercises.xml
+share/workrave/exercises/eye-darkness.png
+share/workrave/exercises/finger-stretch-1.png
+share/workrave/exercises/finger-stretch-2.png
+share/workrave/exercises/fist-roll-1.png
+share/workrave/exercises/fist-roll-2.png
+share/workrave/exercises/monitor-border-1.png
+share/workrave/exercises/monitor-border-2.png
+share/workrave/exercises/monitor-border-3.png
+share/workrave/exercises/monitor-border-4.png
+share/workrave/exercises/neck-tilt-stretch-1.png
+share/workrave/exercises/neck-tilt-stretch-2.png
+share/workrave/exercises/rotate-arm.png
+share/workrave/exercises/shoulder-arm-stretch.png
+share/workrave/exercises/turn-head-1.png
+share/workrave/exercises/turn-head-2.png
+share/workrave/exercises/wrist-lower-arm-desk-stretch-1.png
+share/workrave/images/daily-limit.png
+share/workrave/images/display.png
+share/workrave/images/lock.png
+share/workrave/images/micro-break.png
+share/workrave/images/monitoring.png
+share/workrave/images/network.png
+share/workrave/images/prelude-hint-sad.png
+share/workrave/images/prelude-hint.png
+share/workrave/images/rest-break.png
+share/workrave/images/shutdown.png
+share/workrave/images/time.png
+share/workrave/images/timer-daily.png
+share/workrave/images/timer-micro-break.png
+share/workrave/images/timer-rest-break.png
+share/workrave/images/workrave-icon-huge.png
+share/workrave/images/workrave-icon-large.png
+share/workrave/images/workrave-icon-medium.png
+share/workrave/images/workrave-icon-small.png
+share/workrave/images/workrave-quiet-icon-medium.png
+share/workrave/images/workrave-suspended-icon-medium.png
+share/workrave/images/workrave.png
%%NLS%%share/locale/bg/LC_MESSAGES/workrave.mo
%%NLS%%share/locale/ca/LC_MESSAGES/workrave.mo
%%NLS%%share/locale/cs/LC_MESSAGES/workrave.mo
@@ -83,8 +83,8 @@ share/gnome/workrave/images/workrave.png
%%NLS%%share/locale/tr/LC_MESSAGES/workrave.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/workrave.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/workrave.mo
-@dirrm share/gnome/workrave/images
-@dirrm share/gnome/workrave/exercises
-@dirrm share/gnome/workrave
-@dirrm share/gnome/sounds/workrave
-@dirrm share/gnome/pixmaps/workrave
+@dirrm share/workrave/images
+@dirrm share/workrave/exercises
+@dirrm share/workrave
+@dirrm share/sounds/workrave
+@dirrm share/pixmaps/workrave
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 0182dc861001..12ae2dc840fc 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -3,11 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/xscreensaver-gnome/Makefile,v 1.2 2006/10/07 19:20:33 ahze Exp $
+# $MCom: ports/x11/xscreensaver-gnome/Makefile,v 1.5 2007/08/15 18:29:16 mezz Exp $
+#
PORTNAME?= xscreensaver-gnome
PORTVERSION= 4.24
-PORTREVISION?= 5
+PORTREVISION?= 6
CATEGORIES= x11 gnome
MASTER_SITES= http://www.jwz.org/xscreensaver/
DISTNAME= xscreensaver-${PORTVERSION}
@@ -96,7 +97,7 @@ post-patch:
@${REINPLACE_CMD} -e 's| ||' \
${WRKSRC}/hacks/glx/klein.c
@${REINPLACE_CMD} -E -e 's|^[[:space:]]*GL_LIBS="${PTHREAD_LIBS}"|#|g ; \
- s|/usr/X11R6|${X11BASE}|g' \
+ s|/usr/X11R6|${LOCALBASE}|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|<util.h>|<libutil.h>|' \
${WRKSRC}/hacks/phosphor.c ${WRKSRC}/hacks/apple2-main.c
diff --git a/x11/xscreensaver-gnome/files/patch-ab b/x11/xscreensaver-gnome/files/patch-ab
index 5e896db2d49b..dce689cd2cbf 100644
--- a/x11/xscreensaver-gnome/files/patch-ab
+++ b/x11/xscreensaver-gnome/files/patch-ab
@@ -9,12 +9,3 @@
OBJCC="$OBJCC -Wall"
# supposedly gcc 3.4 will have "-Wdeclaration-after-statement"
# and then perhaps we can do without -pedantic?
-@@ -14516,7 +14516,7 @@
- GTK_DATADIR=""
- if test "$have_gtk" = yes; then
- GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
-- GTK_DATADIR="$GTK_DATADIR/share"
-+ GTK_DATADIR="$GTK_DATADIR/share/gnome"
- fi
-
- if test "$have_gtk" = yes; then
diff --git a/x11/xscreensaver-gnome/pkg-plist b/x11/xscreensaver-gnome/pkg-plist
index 58871d231409..0e309bef1bbd 100644
--- a/x11/xscreensaver-gnome/pkg-plist
+++ b/x11/xscreensaver-gnome/pkg-plist
@@ -211,15 +211,15 @@ bin/xscreensaver-hacks/xsublim
bin/xscreensaver-hacks/xteevee
bin/xscreensaver-hacks/zoom
bin/xscreensaver-text
-share/gnome/applications/gnome-screensaver-properties.desktop
-share/gnome/pixmaps/xscreensaver.xpm
-share/gnome/xscreensaver/glade/screensaver-cmndln.png
-share/gnome/xscreensaver/glade/screensaver-colorselector.png
-share/gnome/xscreensaver/glade/screensaver-diagnostic.png
-share/gnome/xscreensaver/glade/screensaver-locking.png
-share/gnome/xscreensaver/glade/screensaver-power.png
-share/gnome/xscreensaver/glade/screensaver-snap.png
-share/gnome/xscreensaver/glade/xscreensaver-demo.glade2
+share/applications/gnome-screensaver-properties.desktop
+share/pixmaps/xscreensaver.xpm
+share/xscreensaver/glade/screensaver-cmndln.png
+share/xscreensaver/glade/screensaver-colorselector.png
+share/xscreensaver/glade/screensaver-diagnostic.png
+share/xscreensaver/glade/screensaver-locking.png
+share/xscreensaver/glade/screensaver-power.png
+share/xscreensaver/glade/screensaver-snap.png
+share/xscreensaver/glade/xscreensaver-demo.glade2
share/locale/ca/LC_MESSAGES/xscreensaver.mo
share/locale/da/LC_MESSAGES/xscreensaver.mo
share/locale/de/LC_MESSAGES/xscreensaver.mo
@@ -449,8 +449,9 @@ share/xscreensaver/config/xteevee.xml
share/xscreensaver/config/zoom.xml
@dirrm share/xscreensaver/config
@dirrm share/xscreensaver
-@dirrm share/gnome/xscreensaver/glade
-@dirrm share/gnome/xscreensaver
+@dirrm share/xscreensaver/glade
+@dirrm share/xscreensaver
@dirrm bin/xscreensaver-hacks
-@cwd %%X11BASE%%
+@cwd %%LOCALBASE%%
lib/X11/app-defaults/XScreenSaver
+@dirrmtry share/applications
diff --git a/x11/xscreensaver-kde/Makefile b/x11/xscreensaver-kde/Makefile
index 2c0b71b8cc39..673e6e5c49ce 100644
--- a/x11/xscreensaver-kde/Makefile
+++ b/x11/xscreensaver-kde/Makefile
@@ -34,7 +34,7 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${LOCALBASE}/share/gnome/applications/gnome-screensaver-properties.desktop)
+.if exists(${LOCALBASE}/share/applications/gnome-screensaver-properties.desktop)
WITH_XSGNOME= yes
.elif exists(${LOCALBASE}/bin/screensaver)
WITH_XSGNOME= yes
@@ -48,8 +48,8 @@ RUN_DEPENDS+= xscreensaver:${PORTSDIR}/x11/xscreensaver
.endif # defined(WITH_XS)
.if defined(WITH_XSGNOME)
-BUILD_DEPENDS+= ${LOCALBASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
-RUN_DEPENDS+= ${LOCALBASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
+BUILD_DEPENDS+= ${LOCALBASE}/share/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
+RUN_DEPENDS+= ${LOCALBASE}/share/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
.endif # defined(WITH_XSGNOME)
pre-configure:
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index b014892f06f4..c32be1a305ea 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -3,12 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/yelp/Makefile,v 1.110 2007/03/14 17:45:40 marcus Exp $
+# $MCom: ports/x11/yelp/Makefile,v 1.117 2007/09/18 16:50:09 marcus Exp $
#
PORTNAME= yelp
-PORTVERSION= 2.18.1
-PORTREVISION= 1
+PORTVERSION= 2.20.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,7 +16,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A help browser for the GNOME 2 desktop
-LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+ rarian.0:${PORTSDIR}/textproc/rarian
USE_GECKO= firefox xulrunner firefox-devel<->firefox
USE_GETTEXT= yes
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index b906d1dba010..4d65e16ff4f2 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/yelp-2.18.1.tar.bz2) = 84abbfe7e042706cbf21752957e29bf3
-SHA256 (gnome2/yelp-2.18.1.tar.bz2) = 3add75de19550015a526a875bca66be81f73910561f1a84493d76d990717d1fa
-SIZE (gnome2/yelp-2.18.1.tar.bz2) = 900142
+MD5 (gnome2/yelp-2.20.0.tar.bz2) = 8902618c343093b1c64ee6d647ec41ed
+SHA256 (gnome2/yelp-2.20.0.tar.bz2) = 0f4e1c5f3c4bf8d5109794b4d0a340ed847d49381d42968beb405f14b68c61ed
+SIZE (gnome2/yelp-2.20.0.tar.bz2) = 903106
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index c2846177fdc2..9d5800d0c26b 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -1,39 +1,40 @@
bin/gnome-help
bin/yelp
-share/gnome/applications/yelp.desktop
-share/gnome/yelp/default.css
-share/gnome/yelp/icons/yelp-icon-caution.png
-share/gnome/yelp/icons/yelp-icon-important.png
-share/gnome/yelp/icons/yelp-icon-note.png
-share/gnome/yelp/icons/yelp-icon-tip.png
-share/gnome/yelp/icons/yelp-icon-warning.png
-share/gnome/yelp/icons/yelp-watermark-blockquote-00AB.png
-share/gnome/yelp/icons/yelp-watermark-blockquote-00BB.png
-share/gnome/yelp/icons/yelp-watermark-blockquote-201C.png
-share/gnome/yelp/icons/yelp-watermark-blockquote-201D.png
-share/gnome/yelp/icons/yelp-watermark-blockquote-201E.png
-share/gnome/yelp/important_docs.xml
-share/gnome/yelp/info.xml
-share/gnome/yelp/man.xml
-share/gnome/yelp/scrollkeeper.xml
-share/gnome/yelp/toc.xml
-share/gnome/yelp/ui/yelp-search-ui.xml
-share/gnome/yelp/ui/yelp-ui.xml
-share/gnome/yelp/ui/yelp.glade
-share/gnome/yelp/xslt/db-title.xsl
-share/gnome/yelp/xslt/db2html.xsl
-share/gnome/yelp/xslt/info2html.xsl
-share/gnome/yelp/xslt/man2html.xsl
-share/gnome/yelp/xslt/search2html.xsl
-share/gnome/yelp/xslt/toc2html.xsl
-share/gnome/yelp/xslt/yelp-common.xsl
-share/gnome/yelp/yelp.js
+share/applications/yelp.desktop
+share/yelp/default.css
+share/yelp/icons/yelp-icon-caution.png
+share/yelp/icons/yelp-icon-important.png
+share/yelp/icons/yelp-icon-note.png
+share/yelp/icons/yelp-icon-tip.png
+share/yelp/icons/yelp-icon-warning.png
+share/yelp/icons/yelp-watermark-blockquote-00AB.png
+share/yelp/icons/yelp-watermark-blockquote-00BB.png
+share/yelp/icons/yelp-watermark-blockquote-201C.png
+share/yelp/icons/yelp-watermark-blockquote-201D.png
+share/yelp/icons/yelp-watermark-blockquote-201E.png
+share/yelp/important_docs.xml
+share/yelp/info.xml
+share/yelp/man.xml
+share/yelp/scrollkeeper.xml
+share/yelp/toc.xml
+share/yelp/ui/yelp-search-ui.xml
+share/yelp/ui/yelp-ui.xml
+share/yelp/ui/yelp.glade
+share/yelp/xslt/db-title.xsl
+share/yelp/xslt/db2html.xsl
+share/yelp/xslt/info2html.xsl
+share/yelp/xslt/man2html.xsl
+share/yelp/xslt/search2html.xsl
+share/yelp/xslt/toc2html.xsl
+share/yelp/xslt/yelp-common.xsl
+share/yelp/yelp.js
share/icons/hicolor/192x192/apps/yelp-icon-big.png
share/locale/af/LC_MESSAGES/yelp.mo
share/locale/am/LC_MESSAGES/yelp.mo
share/locale/ar/LC_MESSAGES/yelp.mo
share/locale/az/LC_MESSAGES/yelp.mo
share/locale/be/LC_MESSAGES/yelp.mo
+share/locale/be@latin/LC_MESSAGES/yelp.mo
share/locale/bg/LC_MESSAGES/yelp.mo
share/locale/bn/LC_MESSAGES/yelp.mo
share/locale/bn_IN/LC_MESSAGES/yelp.mo
@@ -86,6 +87,7 @@ share/locale/ne/LC_MESSAGES/yelp.mo
share/locale/nl/LC_MESSAGES/yelp.mo
share/locale/nn/LC_MESSAGES/yelp.mo
share/locale/nso/LC_MESSAGES/yelp.mo
+share/locale/oc/LC_MESSAGES/yelp.mo
share/locale/or/LC_MESSAGES/yelp.mo
share/locale/pa/LC_MESSAGES/yelp.mo
share/locale/pl/LC_MESSAGES/yelp.mo
@@ -94,6 +96,7 @@ share/locale/pt_BR/LC_MESSAGES/yelp.mo
share/locale/ro/LC_MESSAGES/yelp.mo
share/locale/ru/LC_MESSAGES/yelp.mo
share/locale/rw/LC_MESSAGES/yelp.mo
+share/locale/si/LC_MESSAGES/yelp.mo
share/locale/sk/LC_MESSAGES/yelp.mo
share/locale/sl/LC_MESSAGES/yelp.mo
share/locale/sq/LC_MESSAGES/yelp.mo
@@ -101,6 +104,7 @@ share/locale/sr/LC_MESSAGES/yelp.mo
share/locale/sr@Latn/LC_MESSAGES/yelp.mo
share/locale/sv/LC_MESSAGES/yelp.mo
share/locale/ta/LC_MESSAGES/yelp.mo
+share/locale/te/LC_MESSAGES/yelp.mo
share/locale/tg/LC_MESSAGES/yelp.mo
share/locale/th/LC_MESSAGES/yelp.mo
share/locale/tr/LC_MESSAGES/yelp.mo
@@ -113,10 +117,10 @@ share/locale/zh_CN/LC_MESSAGES/yelp.mo
share/locale/zh_HK/LC_MESSAGES/yelp.mo
share/locale/zh_TW/LC_MESSAGES/yelp.mo
share/locale/zu/LC_MESSAGES/yelp.mo
-@dirrm share/gnome/yelp/xslt
-@dirrm share/gnome/yelp/ui
-@dirrm share/gnome/yelp/icons
-@dirrm share/gnome/yelp
+@dirrm share/yelp/xslt
+@dirrm share/yelp/ui
+@dirrm share/yelp/icons
+@dirrm share/yelp
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -125,8 +129,14 @@ share/locale/zu/LC_MESSAGES/yelp.mo
@dirrmtry share/locale/xh
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
@dirrmtry share/locale/nso/LC_MESSAGES
@dirrmtry share/locale/nso
@dirrmtry share/locale/nds@NFE/LC_MESSAGES
@@ -143,3 +153,6 @@ share/locale/zu/LC_MESSAGES/yelp.mo
@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/applications
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index c8727ca30603..a4bd361d41d0 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -3,11 +3,11 @@
# Whom: Franz Klammer <klammer@webonaut.com>
#
# $FreeBSD$
-# $MCom: ports/x11/zenity/Makefile,v 1.77 2007/03/11 19:58:27 mezz Exp $
+# $MCom: ports/x11/zenity/Makefile,v 1.87 2007/09/17 20:34:06 ahze Exp $
#
PORTNAME= zenity
-PORTVERSION= 2.18.2
+PORTVERSION= 2.20.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,8 +16,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Display GNOME dialogs from the command line
-BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
+RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
USE_XLIB= yes
USE_GMAKE= yes
@@ -33,8 +33,4 @@ MAN1= zenity.1
CONFLICTS= gtkada-1.2.*
-pre-configure:
- @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
- 's|@DATADIRNAME@|share|'
-
.include <bsd.port.mk>
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index 782940456e59..b33e0c475830 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/zenity-2.18.2.tar.bz2) = 6eb60cebdfddd7f9ad302d0b5477382e
-SHA256 (gnome2/zenity-2.18.2.tar.bz2) = 6cef03198402125dfe56591c1db1f6e95075b9e4cb9e5ff3ac8e05ae38008813
-SIZE (gnome2/zenity-2.18.2.tar.bz2) = 1752871
+MD5 (gnome2/zenity-2.20.0.tar.bz2) = 64992cdbb38c9f8ea8cd9ea07c1dfc38
+SHA256 (gnome2/zenity-2.20.0.tar.bz2) = 811a27ef5ed951ceb4874f8d19a5a79a0c9802571822cc342e706839768b2ac1
+SIZE (gnome2/zenity-2.20.0.tar.bz2) = 1787052
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index 32293545e64c..8082156fb76f 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -25,6 +25,18 @@ share/gnome/help/zenity/bg/figures/zenity-question-screenshot.png
share/gnome/help/zenity/bg/figures/zenity-text-screenshot.png
share/gnome/help/zenity/bg/figures/zenity-warning-screenshot.png
share/gnome/help/zenity/bg/zenity.xml
+share/gnome/help/zenity/en_GB/figures/zenity-calendar-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-entry-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-error-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-fileselection-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-information-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-notification-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-progress-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-question-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-text-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-warning-screenshot.png
+share/gnome/help/zenity/en_GB/zenity.xml
share/gnome/help/zenity/es/figures/zenity-calendar-screenshot.png
share/gnome/help/zenity/es/figures/zenity-entry-screenshot.png
share/gnome/help/zenity/es/figures/zenity-error-screenshot.png
@@ -49,6 +61,18 @@ share/gnome/help/zenity/fr/figures/zenity-question-screenshot.png
share/gnome/help/zenity/fr/figures/zenity-text-screenshot.png
share/gnome/help/zenity/fr/figures/zenity-warning-screenshot.png
share/gnome/help/zenity/fr/zenity.xml
+share/gnome/help/zenity/oc/figures/zenity-calendar-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-entry-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-error-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-fileselection-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-information-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-notification-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-progress-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-question-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-text-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-warning-screenshot.png
+share/gnome/help/zenity/oc/zenity.xml
share/gnome/help/zenity/ru/figures/zenity-calendar-screenshot.png
share/gnome/help/zenity/ru/figures/zenity-entry-screenshot.png
share/gnome/help/zenity/ru/figures/zenity-error-screenshot.png
@@ -85,28 +109,6 @@ share/gnome/help/zenity/uk/figures/zenity-question-screenshot.png
share/gnome/help/zenity/uk/figures/zenity-text-screenshot.png
share/gnome/help/zenity/uk/figures/zenity-warning-screenshot.png
share/gnome/help/zenity/uk/zenity.xml
-share/gnome/omf/zenity/zenity-C.omf
-share/gnome/omf/zenity/zenity-bg.omf
-share/gnome/omf/zenity/zenity-es.omf
-share/gnome/omf/zenity/zenity-fr.omf
-share/gnome/omf/zenity/zenity-ru.omf
-share/gnome/omf/zenity/zenity-sv.omf
-share/gnome/omf/zenity/zenity-uk.omf
-share/gnome/zenity/clothes/gnome-tshirt.png
-share/gnome/zenity/clothes/hawaii-shirt.png
-share/gnome/zenity/clothes/monk.png
-share/gnome/zenity/clothes/sunglasses.png
-share/gnome/zenity/clothes/surfboard.png
-share/gnome/zenity/zenity-calendar.png
-share/gnome/zenity/zenity-entry.png
-share/gnome/zenity/zenity-file.png
-share/gnome/zenity/zenity-list.png
-share/gnome/zenity/zenity-notification.png
-share/gnome/zenity/zenity-progress.png
-share/gnome/zenity/zenity-scale.png
-share/gnome/zenity/zenity-text.png
-share/gnome/zenity/zenity.glade
-share/gnome/zenity/zenity.png
share/locale/am/LC_MESSAGES/zenity.mo
share/locale/ar/LC_MESSAGES/zenity.mo
share/locale/az/LC_MESSAGES/zenity.mo
@@ -157,6 +159,7 @@ share/locale/nb/LC_MESSAGES/zenity.mo
share/locale/ne/LC_MESSAGES/zenity.mo
share/locale/nl/LC_MESSAGES/zenity.mo
share/locale/nn/LC_MESSAGES/zenity.mo
+share/locale/oc/LC_MESSAGES/zenity.mo
share/locale/or/LC_MESSAGES/zenity.mo
share/locale/pa/LC_MESSAGES/zenity.mo
share/locale/pl/LC_MESSAGES/zenity.mo
@@ -181,19 +184,47 @@ share/locale/xh/LC_MESSAGES/zenity.mo
share/locale/zh_CN/LC_MESSAGES/zenity.mo
share/locale/zh_HK/LC_MESSAGES/zenity.mo
share/locale/zh_TW/LC_MESSAGES/zenity.mo
-@dirrm share/gnome/zenity/clothes
-@dirrm share/gnome/zenity
-@dirrm share/gnome/omf/zenity
+share/omf/zenity/zenity-C.omf
+share/omf/zenity/zenity-bg.omf
+share/omf/zenity/zenity-en_GB.omf
+share/omf/zenity/zenity-es.omf
+share/omf/zenity/zenity-fr.omf
+share/omf/zenity/zenity-oc.omf
+share/omf/zenity/zenity-ru.omf
+share/omf/zenity/zenity-sv.omf
+share/omf/zenity/zenity-uk.omf
+%%DATADIR%%/clothes/gnome-tshirt.png
+%%DATADIR%%/clothes/hawaii-shirt.png
+%%DATADIR%%/clothes/monk.png
+%%DATADIR%%/clothes/sunglasses.png
+%%DATADIR%%/clothes/surfboard.png
+%%DATADIR%%/zenity-calendar.png
+%%DATADIR%%/zenity-entry.png
+%%DATADIR%%/zenity-file.png
+%%DATADIR%%/zenity-list.png
+%%DATADIR%%/zenity-notification.png
+%%DATADIR%%/zenity-progress.png
+%%DATADIR%%/zenity-scale.png
+%%DATADIR%%/zenity-text.png
+%%DATADIR%%/zenity.glade
+%%DATADIR%%/zenity.png
+@dirrm %%DATADIR%%/clothes
+@dirrm %%DATADIR%%
+@dirrm share/omf/zenity
@dirrm share/gnome/help/zenity/uk/figures
@dirrm share/gnome/help/zenity/uk
@dirrm share/gnome/help/zenity/sv/figures
@dirrm share/gnome/help/zenity/sv
@dirrm share/gnome/help/zenity/ru/figures
@dirrm share/gnome/help/zenity/ru
+@dirrm share/gnome/help/zenity/oc/figures
+@dirrm share/gnome/help/zenity/oc
@dirrm share/gnome/help/zenity/fr/figures
@dirrm share/gnome/help/zenity/fr
@dirrm share/gnome/help/zenity/es/figures
@dirrm share/gnome/help/zenity/es
+@dirrm share/gnome/help/zenity/en_GB/figures
+@dirrm share/gnome/help/zenity/en_GB
@dirrm share/gnome/help/zenity/bg/figures
@dirrm share/gnome/help/zenity/bg
@dirrm share/gnome/help/zenity/C/figures
@@ -207,6 +238,8 @@ share/locale/zh_TW/LC_MESSAGES/zenity.mo
@dirrmtry share/locale/ug
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
@dirrmtry share/locale/mi/LC_MESSAGES
@dirrmtry share/locale/mi
@dirrmtry share/locale/mg/LC_MESSAGES