aboutsummaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2004-04-05 03:11:39 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2004-04-05 03:11:39 +0000
commitc4851e78e4f63338fe9a4883e5b7a0370dce27f7 (patch)
tree3910aa2e83f782cec94f15b4547dadb741cd29ce /x11
parentf82c84522b047dd99c6f9d85ce3e07217ccce7df (diff)
downloadports-c4851e78e4f63338fe9a4883e5b7a0370dce27f7.tar.gz
ports-c4851e78e4f63338fe9a4883e5b7a0370dce27f7.zip
Notes
Diffstat (limited to 'x11')
-rw-r--r--x11/gdm2/Makefile17
-rw-r--r--x11/gdm2/distinfo4
-rw-r--r--x11/gdm2/files/patch-ab26
-rw-r--r--x11/gdm2/files/patch-config_locale.alias84
-rw-r--r--x11/gdm2/pkg-descr5
-rw-r--r--x11/gdm2/pkg-install10
-rw-r--r--x11/gdm2/pkg-message21
-rw-r--r--x11/gdm2/pkg-plist101
-rw-r--r--x11/gnome-applets/Makefile16
-rw-r--r--x11/gnome-applets/distinfo4
-rw-r--r--x11/gnome-applets/files/patch-aa30
-rw-r--r--x11/gnome-applets/files/patch-battstat_Makefile.in27
-rw-r--r--x11/gnome-applets/files/patch-multiload::linux-proc.c84
-rw-r--r--x11/gnome-applets/files/patch-stickynotes_Makefile.in11
-rw-r--r--x11/gnome-applets/files/patch-wireless_wireless-applet.c39
-rw-r--r--x11/gnome-applets/pkg-descr2
-rw-r--r--x11/gnome-applets/pkg-plist730
-rw-r--r--x11/gnome-desktop/Makefile8
-rw-r--r--x11/gnome-desktop/distinfo4
-rw-r--r--x11/gnome-desktop/files/patch-configure10
-rw-r--r--x11/gnome-desktop/pkg-descr3
-rw-r--r--x11/gnome-desktop/pkg-plist29
-rw-r--r--x11/gnome-panel/Makefile15
-rw-r--r--x11/gnome-panel/distinfo4
-rw-r--r--x11/gnome-panel/files/patch-applets_clock_clock.c25
-rw-r--r--x11/gnome-panel/files/patch-configure11
-rw-r--r--x11/gnome-panel/files/patch-po_da.po29
-rw-r--r--x11/gnome-panel/files/patch-po_it.po59
-rw-r--r--x11/gnome-panel/files/patch-po_zh_TW.po20
-rw-r--r--x11/gnome-panel/pkg-descr2
-rw-r--r--x11/gnome-panel/pkg-plist54
-rw-r--r--x11/gnome-session/Makefile16
-rw-r--r--x11/gnome-session/distinfo8
-rw-r--r--x11/gnome-session/files/patch-configure10
-rw-r--r--x11/gnome-session/files/patch-gnome-session_gnome-session.schemas.in.in11
-rw-r--r--x11/gnome-session/pkg-descr4
-rw-r--r--x11/gnome-session/pkg-plist4
-rw-r--r--x11/gnome-terminal/Makefile8
-rw-r--r--x11/gnome-terminal/distinfo4
-rw-r--r--x11/gnome-terminal/files/patch-configure10
-rw-r--r--x11/gnome-terminal/pkg-descr2
-rw-r--r--x11/gnome-terminal/pkg-plist4
-rw-r--r--x11/gnome2-fifth-toe/Makefile11
-rw-r--r--x11/gnome2-fifth-toe/pkg-descr5
-rw-r--r--x11/gnome2-lite/Makefile5
-rw-r--r--x11/gnome2-lite/pkg-descr15
-rw-r--r--x11/gnome2-lite/pkg-install4
-rw-r--r--x11/gnome2-power-tools/Makefile14
-rw-r--r--x11/gnome2-power-tools/pkg-descr8
-rw-r--r--x11/gnome2/Makefile15
-rw-r--r--x11/gnome2/pkg-descr13
-rw-r--r--x11/gnome2/pkg-install4
-rw-r--r--x11/gnomeapplets2/Makefile16
-rw-r--r--x11/gnomeapplets2/distinfo4
-rw-r--r--x11/gnomeapplets2/files/patch-aa30
-rw-r--r--x11/gnomeapplets2/files/patch-battstat_Makefile.in27
-rw-r--r--x11/gnomeapplets2/files/patch-multiload::linux-proc.c84
-rw-r--r--x11/gnomeapplets2/files/patch-stickynotes_Makefile.in11
-rw-r--r--x11/gnomeapplets2/files/patch-wireless_wireless-applet.c39
-rw-r--r--x11/gnomeapplets2/pkg-descr2
-rw-r--r--x11/gnomeapplets2/pkg-plist730
-rw-r--r--x11/gnomedesktop/Makefile8
-rw-r--r--x11/gnomedesktop/distinfo4
-rw-r--r--x11/gnomedesktop/files/patch-configure10
-rw-r--r--x11/gnomedesktop/pkg-descr3
-rw-r--r--x11/gnomedesktop/pkg-plist29
-rw-r--r--x11/gnomepanel/Makefile15
-rw-r--r--x11/gnomepanel/distinfo4
-rw-r--r--x11/gnomepanel/files/patch-applets_clock_clock.c25
-rw-r--r--x11/gnomepanel/files/patch-configure11
-rw-r--r--x11/gnomepanel/files/patch-po_da.po29
-rw-r--r--x11/gnomepanel/files/patch-po_it.po59
-rw-r--r--x11/gnomepanel/files/patch-po_zh_TW.po20
-rw-r--r--x11/gnomepanel/pkg-descr2
-rw-r--r--x11/gnomepanel/pkg-plist54
-rw-r--r--x11/gnomesession/Makefile16
-rw-r--r--x11/gnomesession/distinfo8
-rw-r--r--x11/gnomesession/files/patch-configure10
-rw-r--r--x11/gnomesession/files/patch-gnome-session_gnome-session.schemas.in.in11
-rw-r--r--x11/gnomesession/pkg-descr4
-rw-r--r--x11/gnomesession/pkg-plist4
-rw-r--r--x11/gnometerminal/Makefile8
-rw-r--r--x11/gnometerminal/distinfo4
-rw-r--r--x11/gnometerminal/files/patch-configure10
-rw-r--r--x11/gnometerminal/pkg-descr2
-rw-r--r--x11/gnometerminal/pkg-plist4
-rw-r--r--x11/libgnome/Makefile8
-rw-r--r--x11/libgnome/distinfo4
-rw-r--r--x11/libgnome/files/patch-libgnome::Makefile.in19
-rw-r--r--x11/libgnome/pkg-descr2
-rw-r--r--x11/libgnome/pkg-plist47
-rw-r--r--x11/libxklavier/Makefile3
-rw-r--r--x11/libxklavier/distinfo4
-rw-r--r--x11/libxklavier/pkg-descr3
-rw-r--r--x11/libxklavier/pkg-plist37
-rw-r--r--x11/startup-notification/Makefile10
-rw-r--r--x11/startup-notification/distinfo4
-rw-r--r--x11/startup-notification/files/patch-configure10
-rw-r--r--x11/yelp/Makefile11
-rw-r--r--x11/yelp/distinfo4
-rw-r--r--x11/yelp/files/patch-configure30
-rw-r--r--x11/yelp/files/patch-src_man2html_yelp-man2html.c55
-rw-r--r--x11/yelp/files/patch-stylesheets_yelp-custom.xml9
-rw-r--r--x11/yelp/pkg-descr4
-rw-r--r--x11/yelp/pkg-plist191
-rw-r--r--x11/zenity/Makefile9
-rw-r--r--x11/zenity/distinfo4
-rw-r--r--x11/zenity/pkg-descr7
-rw-r--r--x11/zenity/pkg-plist73
109 files changed, 2134 insertions, 1370 deletions
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 99b9aec6880d..1a6eadf946e4 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= gdm2
-PORTVERSION= 2.4.4.7
-PORTREVISION= 2
+PORTVERSION= 2.6.0.0
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6
DISTNAME= gdm-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -19,14 +19,14 @@ COMMENT= GNOME 2 version of xdm display manager
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_REINPLACE= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix intlhack gnomehack gnomehier libgnomeui librsvg2
+USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui librsvg2
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
GDMDIR?= ${PREFIX}/etc/gdm
+PKGMESSAGE= ${WRKDIR}/pkg-message
MAN1= gdm.1
@@ -42,16 +42,13 @@ post-extract:
@${SED} -e "s,%%PREFIX%%,${PREFIX},g" \
${FILESDIR}/gdm.sh.sample > ${WRKSRC}/gdm.sh.sample
-post-patch:
-.if ${OSVERSION} >= 450002 && ${OSVERSION} < 500000 || ${OSVERSION} >= 500020
- @${REINPLACE_CMD} -E -e 's/(..)\.EUC/\1.euc\1/' ${WRKSRC}/config/locale.alias
-.endif
-
post-install:
.if !defined(PACKAGE_BUILDING)
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.endif
@${INSTALL_SCRIPT} ${WRKSRC}/gdm.sh.sample ${PREFIX}/etc/rc.d
+ @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \
+ | /usr/bin/fmt 75 79 > ${PKGMESSAGE}
@${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo
index 015a197fff22..43b847b7a871 100644
--- a/x11/gdm2/distinfo
+++ b/x11/gdm2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gdm-2.4.4.7.tar.bz2) = a3d2f243c4f42e2542bda8cb5fb9a7c5
-SIZE (gnome2/gdm-2.4.4.7.tar.bz2) = 2430455
+MD5 (gnome2/gdm-2.6.0.0.tar.bz2) = 3dbf4074a4ec78627a5d099d30126d45
+SIZE (gnome2/gdm-2.6.0.0.tar.bz2) = 2850702
diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab
index 11f4da7ee56b..cc11b86e69c2 100644
--- a/x11/gdm2/files/patch-ab
+++ b/x11/gdm2/files/patch-ab
@@ -1,6 +1,6 @@
---- config/gdm.conf.in.orig Fri Oct 10 16:57:25 2003
-+++ config/gdm.conf.in Thu Oct 16 14:33:28 2003
-@@ -73,7 +73,7 @@
+--- config/gdm.conf.in.orig Thu Feb 12 14:22:36 2004
++++ config/gdm.conf.in Sat Mar 6 17:22:29 2004
+@@ -77,7 +77,7 @@
# To try to kill all clients started at greeter time or in the Init script.
# doesn't always work, only if those clients have a window of their own
#KillInitClients=true
@@ -9,7 +9,7 @@
# You should probably never change this value unless you have a weird setup
PidFile=/var/run/gdm.pid
# Note that a post login script is run before a PreSession script.
-@@ -93,7 +93,7 @@
+@@ -97,7 +97,7 @@
# Reboot, Halt and suspend commands, you can add different commands
# separated by a semicolon and gdm will use the first one it can find
#RebootCommand=/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now
@@ -18,7 +18,7 @@
#SuspendCommand=
# Probably should not touch the below this is the standard setup
ServAuthDir=@EXPANDED_AUTHDIR@
-@@ -127,7 +127,7 @@
+@@ -136,7 +136,7 @@
# we force X to use specific vts. turn VTAllocation to false if this
# is causing problems.
#FirstVT=7
@@ -27,16 +27,16 @@
# Should double login be treated with a warning (and possibility to change
# vts on linux systems for console logins)
#DoubleLoginWarning=true
-@@ -211,7 +211,7 @@
- # The 'theme'. By default we're using the default gtk theme
- # Of course assuming that gtk got installed in the same prefix,
- # if not change this.
+@@ -232,7 +232,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=@EXPANDED_DATADIR@/themes/Default/gtk/gtkrc
+GtkRC=@EXPANDED_DATADIR@/../themes/Default/gtk-2.0/gtkrc
- # Maximum size of an icon, larger icons are scaled down
- #MaxIconWidth=128
- #MaxIconHeight=128
-@@ -364,7 +364,7 @@
+
+ # The GTK+ theme to use for the gui
+ #GtkTheme=Default
+@@ -415,7 +415,7 @@
# Definition of the standard X server.
[server-Standard]
name=Standard server
diff --git a/x11/gdm2/files/patch-config_locale.alias b/x11/gdm2/files/patch-config_locale.alias
index 8ac5400b0567..7e944b8d2900 100644
--- a/x11/gdm2/files/patch-config_locale.alias
+++ b/x11/gdm2/files/patch-config_locale.alias
@@ -1,6 +1,6 @@
---- config/locale.alias.orig Thu May 15 22:56:46 2003
-+++ config/locale.alias Mon Sep 15 23:41:05 2003
-@@ -14,76 +14,36 @@
+--- config/locale.alias.orig Sun Feb 29 12:56:10 2004
++++ config/locale.alias Sat Mar 6 17:45:16 2004
+@@ -14,79 +14,43 @@
#
# - George
@@ -25,6 +25,7 @@
-English(American) en_US.UTF-8,en_US
-English(Australian) en_AU.UTF-8,en_AU
-English(British) en_GB.UTF-8,en_GB
+-English(Canadian) en_CA.UTF-8,en_CA
-English(Ireland) en_IE.UTF-8,en_IE
-Estonian et_EE.UTF-8,et_EE
-Finnish fi_FI.UTF-8,fi_FI
@@ -61,7 +62,9 @@
-Portuguese pt_PT.UTF-8,pt_PT
-Romanian ro_RO.UTF-8,ro_RO
-Russian ru_RU.UTF-8,ru_RU
--Serbian sr_YU.UTF-8,sr_YU
+-Serbian sr_CS.UTF-8,sr_CS,sr_YU@cyrillic,sr_YU
+-Serbian(Latin) sr_CS.UTF-8@Latn,sr_CS@Latn,sr_YU@Latn
+-Serbian(Jekavian) sr_CS.UTF-8@ije,sr_CS@ije,sr_YU@ije
-Slovak sk_SK.UTF-8,sk_SK
-Slovenian sl_SI.UTF-8,sl_SI
-Spanish es_ES.UTF-8,es_ES
@@ -77,36 +80,43 @@
-Walloon wa_BE.UTF-8,wa_BE
-Welsh cy_GB.UTF-8,cy_GB
-Yiddish yi.UTF-8,yi
-+Bulgarian bg_BG.UTF-8,bg_BG.CP1251
-+Chinese(simplified) zh_CN.UTF-8,zh_CN.EUC
-+Chinese(traditional) zh_TW.UTF-8,zh_TW.Big5
-+Croatian hr_HR.UTF-8,hr_HR.ISO8859-2
-+Czech cs_CZ.UTF-8,cs_CZ.ISO8859-2
-+Danish da_DK.UTF-8,da_DK.ISO8859-1
-+Dutch nl_NL.UTF-8,nl_NL.ISO8859-15
-+Estonian et_EE.UTF-8,et_EE.ISO8859-15
-+English(American) en_US.UTF-8,en_US.ISO8859-1
-+English(Australian) en_AU.UTF-8,en_AU.ISO8859-1
-+English(British) en_GB.UTF-8,en_GB.ISO8859-1
-+Finnish fi_FI.UTF-8,fi_FI.ISO8859-15
-+French fr_FR.UTF-8,fr_FR.ISO8859-15
-+German de_DE.UTF-8,de_DE.ISO8859-15
-+Greek el_GR.UTF-8,el_GR.ISO8859-7
-+Hungarian hu_HU.UTF-8,hu_HU.ISO8859-2
-+Icelandic is_IS.UTF-8,is_IS.ISO8859-1
-+Italian it_IT.UTF-8,it_IT.ISO8859-15
-+Japanese ja_JP.UTF-8,ja_JP.EUC
-+Korean ko_KR.UTF-8,ko_KR.EUC
-+Lithuanian lt_LT.UTF-8,lt_LT.ISO8859-4
-+Norwegian(bokmal) no_NO.UTF-8,no_NO.ISO8859-1
-+Polish pl_PL.UTF-8,pl_PL.ISO8859-2
-+Portuguese pt_PT.UTF-8,pt_PT.ISO8859-15
-+Portuguese(Brazilian) pt_BR.UTF-8,pt_BR.ISO8859-1
-+Romanian ro_RO.UTF-8,ro_RO.ISO8859-2
-+Russian ru_RU.UTF-8,ru_RU.ISO8859-5
-+Slovak sk_SK.UTF-8,sk_SK.ISO8859-2
-+Slovenian sl_SI.UTF-8,sl_SI.ISO8859-2
-+Spanish es_ES.UTF-8,es_ES.ISO8859-15
-+Swedish sv_SE.UTF-8,sv_SE.ISO8859-1
-+Turkish tr_TR.UTF-8,tr_TR.ISO8859-9
-+Ukrainian uk_UA.UTF-8,uk_UA.ISO8859-5
++Afrikaans af_ZA.ISO8859-15,af_ZA.ISO8859-1
++Amharic am_ET.UTF-8
++Byelorussian be_BY.CP1131,be_BY.CP1251,be_BY.ISO8859-5
++Bulgarian bg_BG.CP1251
++Catalan ca_ES.ISO8859-15,ca_ES.ISO8859-1
++Chinese(simplified) zh_CN.EUC,zh_CN.eucCN
++Chinese(traditional) zh_TW.Big5
++Croatian hr_HR.ISO8859-2
++Czech cs_CZ.ISO8859-2
++Danish da_DK.ISO8859-15,da_DK.ISO8859-1
++Dutch nl_NL.ISO8859-15,nl_NL.ISO8859-1
++English(American) en_US.ISO8859-1,en_US.ISO8859-15
++English(Australian) en_AU.ISO8859-1,en_AU.ISO8859-15
++English(British) en_GB.ISO8859-1,en_GB.ISO8859-15
++English(Canadian) en_CA.ISO8859-1,en_CA.ISO8859-15
++Estonian et_EE.ISO8859-15
++Finnish fi_FI.ISO8859-15,fi_FI.ISO8859-1
++French fr_FR.ISO8859-15,fr_FR.ISO8859-1
++German de_DE.ISO8859-15,de_DE.ISO8859-1
++Greek el_GR.ISO8859-7
++Hindi hi_IN.ISCII-DEV
++Hungarian hu_HU.ISO8859-2
++Icelandic is_IS.ISO8859-1,is_IS.ISO8859-15
++Italian it_IT.ISO8859-15,it_IT.ISO8859-1
++Italian(Swiss) it_CH.ISO8859-15,it_CH.ISO8859-1
++Japanese ja_JP.EUC,ja_JP.eucJP
++Korean ko_KR.EUC,ko_KR.eucKR
++Lithuanian lt_LT.ISO8859-4,lt_LT.ISO8859-13
++Norwegian(bokmal) no_NO.ISO8859-1,no_NO.ISO8859-15
++Polish pl_PL.ISO8859-2
++Portuguese pt_PT.ISO8859-15,pt_PT.ISO8859-1
++Portuguese(Brazilian) pt_BR.ISO8859-1
++Romanian ro_RO.ISO8859-2
++Russian ru_RU.ISO8859-5
++Slovak sk_SK.ISO8859-2
++Slovenian sl_SI.ISO8859-2
++Spanish es_ES.ISO8859-15,es_ES.ISO8859-1
++Swedish sv_SE.ISO8859-1
++Turkish tr_TR.ISO8859-9
++Ukrainian uk_UA.ISO8859-5
diff --git a/x11/gdm2/pkg-descr b/x11/gdm2/pkg-descr
index 85c150c4c6f2..2485dadfecef 100644
--- a/x11/gdm2/pkg-descr
+++ b/x11/gdm2/pkg-descr
@@ -1,3 +1,2 @@
-The GNOME 2.0 version of the xdm display manager. It has support for
-face pixmaps, multiple sessions plus clean shutdowns from the login
-menu.
+The GNOME 2.0 version of the xdm display manager. It supports user
+icons, multiple sessions, and clean system shutdowns.
diff --git a/x11/gdm2/pkg-install b/x11/gdm2/pkg-install
index b8f29b328edf..13e26f4bfba2 100644
--- a/x11/gdm2/pkg-install
+++ b/x11/gdm2/pkg-install
@@ -1,10 +1,7 @@
#!/bin/sh
-if [ -n "${PACKAGE_BUILDING}" ]; then
- exit 0
-fi
-
-if [ "$2" = "POST-INSTALL" ]; then
+case $2 in
+POST-INSTALL)
USER=gdm
GROUP=${USER}
UID=92
@@ -39,4 +36,5 @@ if [ "$2" = "POST-INSTALL" ]; then
${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/share/gnome/gdm ${PKG_PREFIX}/etc/gdm
${CHMOD} 0750 ${PKG_PREFIX}/share/gnome/gdm
exit 0
-fi
+ ;;
+esac
diff --git a/x11/gdm2/pkg-message b/x11/gdm2/pkg-message
index 03665d14d573..b2e15c7ab690 100644
--- a/x11/gdm2/pkg-message
+++ b/x11/gdm2/pkg-message
@@ -1,25 +1,26 @@
GDM is installed.
-Do _NOT_ use /etc/ttys to start gdm at boot time. This will result in gdm
-hanging or restarting constantly. Instead, copy the included gdm.sh.sample
-script to gdm.sh, and restart. This script is found, by default, in
-/usr/X11R6/etc/rc.d.
+Do _NOT_ use /etc/ttys to start gdm at boot time. This will result in gdm
+hanging or restarting constantly. Instead, copy the included gdm.sh.sample
+script to gdm.sh, and restart. This script is found in
+%%PREFIX%%/etc/rc.d.
GDM uses its own locale.alias file to determine its language and especially
-the GNOME-2 fontencoding. This file is located, by default, in
-/usr/X11R6/etc/gdm/locale.alias. By default, the character set for every
-county using the EURO currency is set to ISO8859-15 in order to enable the
-EURO sign. If you don't feel comfortable with this, edit this file according
+the GNOME 2 fontencoding. This file is located in
+%%PREFIX%%/etc/gdm/locale.alias. By default, the character set for every
+county using the EURO currency is set to ISO8859-15 in order to enable the
+EURO sign. If you do not feel comfortable with this, edit this file according
to your preferences.
-If you are running 5.x and you are running 5.1-RELEASE or earlier, GDM will
+If you are running 5.X and you are running 5.1-RELEASE or earlier, GDM will
fail to work due to a bug in OpenPAM. You can download a patch from
http://www.FreeBSD.org/~marcus/pam_get_user.c.diff. You must also have the
FreeBSD src tree on your system. Do the following to apply the patch:
# cd /usr
+
# patch -p < /path/to/pam_get_user.c.diff
Then rebuild and install world. Note, this bug does _NOT_ affect FreeBSD
-4.x.
+4.X.
diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist
index d585f33133d2..0c5d3bcc764c 100644
--- a/x11/gdm2/pkg-plist
+++ b/x11/gdm2/pkg-plist
@@ -9,7 +9,6 @@ bin/gdmlogin
bin/gdmphotosetup
bin/gdmsetup
bin/gdmthemetester
-etc/dm/Sessions/default.desktop
etc/gdm/Init/Default
etc/gdm/PostLogin/Default.sample
etc/gdm/PostSession/Default
@@ -39,8 +38,16 @@ share/gnome/applications/gdmflexiserver-xnest.desktop
share/gnome/applications/gdmflexiserver.desktop
share/gnome/applications/gdmsetup.desktop
share/gnome/capplets/gdmphotosetup.desktop
+share/gnome/gdm/BuiltInSessions/default.desktop
share/gnome/gdm/gdmchooser.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/disconnect.png
@@ -59,17 +66,60 @@ share/gnome/gdm/themes/happygnome/options.png
share/gnome/gdm/themes/happygnome/screenshot.png
share/gnome/gdm/themes/happygnome/session.png
share/gnome/gdm/themes/happygnome/system.png
-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/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/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/sv/figures/gdm_window.png
+share/gnome/help/gdm/sv/gdm.xml
+share/gnome/help/gdm/sv/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
@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gdm/gdm-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gdm/gdm-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gdm/gdm-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gdm/gdm-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gdm/gdm-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gdm/gdm-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gdm/gdm-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gdm/gdm-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gdm/gdm-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-zh_HK.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gdm/gdm-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/pixmaps/gdm-foot-logo.png
share/gnome/pixmaps/gdm.png
share/gnome/pixmaps/login-photo.png
@@ -88,6 +138,7 @@ share/locale/cy/LC_MESSAGES/gdm-2.4.mo
share/locale/da/LC_MESSAGES/gdm-2.4.mo
share/locale/de/LC_MESSAGES/gdm-2.4.mo
share/locale/el/LC_MESSAGES/gdm-2.4.mo
+share/locale/en_CA/LC_MESSAGES/gdm-2.4.mo
share/locale/es/LC_MESSAGES/gdm-2.4.mo
share/locale/et/LC_MESSAGES/gdm-2.4.mo
share/locale/eu/LC_MESSAGES/gdm-2.4.mo
@@ -98,6 +149,7 @@ share/locale/ga/LC_MESSAGES/gdm-2.4.mo
share/locale/gl/LC_MESSAGES/gdm-2.4.mo
share/locale/he/LC_MESSAGES/gdm-2.4.mo
share/locale/hi/LC_MESSAGES/gdm-2.4.mo
+share/locale/hr/LC_MESSAGES/gdm-2.4.mo
share/locale/hu/LC_MESSAGES/gdm-2.4.mo
share/locale/id/LC_MESSAGES/gdm-2.4.mo
share/locale/is/LC_MESSAGES/gdm-2.4.mo
@@ -134,15 +186,48 @@ share/locale/zh_CN/LC_MESSAGES/gdm-2.4.mo
share/locale/zh_TW/LC_MESSAGES/gdm-2.4.mo
@dirrm share/gnome/xsessions
@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
+@dirrm share/gnome/help/gdm/sv/figures
+@dirrm share/gnome/help/gdm/sv
+@dirrm share/gnome/help/gdm/ko/figures
+@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/C
@dirrm share/gnome/help/gdm
@dirrm share/gnome/gdm/themes/happygnome
@dirrm share/gnome/gdm/themes/happygnome-list
@dirrm share/gnome/gdm/themes/circles
@dirrm share/gnome/gdm/themes
+@dirrm share/gnome/gdm/BuiltInSessions
@dirrm etc/pam.d
@dirrm etc/gdm/modules
@dirrm etc/gdm/PostLogin
@unexec /bin/rmdir %D/etc/dm/Sessions 2>/dev/null || /usr/bin/true
@unexec /bin/rmdir %D/etc/dm 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/gnome/log/gdm 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/gnome/log 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-zh_HK.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-zh_TW.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index ca1d3573a6ff..d8acc579f014 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -6,24 +6,25 @@
#
PORTNAME= gnomeapplets2
-PORTVERSION= 2.4.2
-PORTREVISION= 1
+PORTVERSION= 2.6.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-applets/2.4
+MASTER_SITE_SUBDIR= sources/gnome-applets/2.6
DISTNAME= gnome-applets-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Applets components for the Gnome 2 Desktop Environment
-LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop2
+LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop2 \
+ xklavier.8:${PORTSDIR}/x11/libxklavier
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_REINPLACE= yes
GNOME_DESKTOP_VERSION=2
-USE_GNOME= gnomehier gnomeprefix gnomehack gnomepanel gail
+USE_GNOME= gnomehier gnomeprefix gnomehack intlhack lthack gnomepanel gail
USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -31,9 +32,10 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
.include <bsd.port.pre.mk>
.if ${ARCH} != "i386"
-PLIST_SUB= BATTERY="@comment "
+CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC"
+PLIST_SUB= BATTERY="@comment "
.else
-PLIST_SUB= BATTERY=""
+PLIST_SUB= BATTERY=""
.endif
.include <bsd.port.post.mk>
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index f42065cf1b1e..aa222f7bdcb0 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-applets-2.4.2.tar.bz2) = 3a59c7f5b452e4f9675dfce44a2b3433
-SIZE (gnome2/gnome-applets-2.4.2.tar.bz2) = 4057266
+MD5 (gnome2/gnome-applets-2.6.0.tar.bz2) = 9c2dcde8fc94dd43f8aa7be52ca9c103
+SIZE (gnome2/gnome-applets-2.6.0.tar.bz2) = 4643605
diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa
index 6638e387efc9..73b0823ce82e 100644
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-aa
@@ -1,14 +1,6 @@
---- configure.orig Mon Sep 8 20:00:28 2003
-+++ configure Wed Sep 24 23:29:28 2003
-@@ -8250,6 +8250,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -11792,6 +11793,7 @@
+--- configure.orig Sun Feb 22 19:22:49 2004
++++ configure Sun Feb 22 19:24:33 2004
+@@ -22912,6 +22912,7 @@
*irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";;
*linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";;
*netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";;
@@ -16,16 +8,16 @@
*solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;;
esac
case "$host" in
-@@ -11856,7 +11858,7 @@
+@@ -23034,7 +23035,7 @@
;;
- # list of supported OS cores
-- *-*-linux*|*-*-freebsd*|*-*-openbsd*)
-+ *-*-linux*|i386-*-freebsd*|*-*-openbsd*)
- echo "$as_me:$LINENO: checking for apm_read in -lapm" >&5
- echo $ECHO_N "checking for apm_read in -lapm... $ECHO_C" >&6
- if test "${ac_cv_lib_apm_apm_read+set}" = set; then
-@@ -13646,14 +13648,14 @@
+ # list of supported OS cores that do not use libapm
+- *-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
++ i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
+ ;;
+ *)
+ echo "warning: ${host} is not supported by battstat_applet, not building" >&2
+@@ -24905,14 +24906,14 @@
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
cat >>confdefs.h <<_ACEOF
diff --git a/x11/gnome-applets/files/patch-battstat_Makefile.in b/x11/gnome-applets/files/patch-battstat_Makefile.in
deleted file mode 100644
index 6ddfc03c3b07..000000000000
--- a/x11/gnome-applets/files/patch-battstat_Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
---- battstat/Makefile.in.orig Tue Sep 23 00:11:20 2003
-+++ battstat/Makefile.in Tue Sep 23 00:14:03 2003
-@@ -154,11 +154,11 @@
- pixmapsdir = $(datadir)/pixmaps
- pixmaps_DATA = battstat.png
- @HAVE_LIBAPM_TRUE@APMLIB = @HAVE_LIBAPM_TRUE@-lapm
--@HAVE_LIBAPM_FALSE@APMLIB = @HAVE_LIBAPM_FALSE@apmlib/libapm.a
-+@HAVE_LIBAPM_FALSE@APMLIB =
- @HAVE_LIBAPM_TRUE@APMDIR =
--@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_FALSE@apmlib
-+@HAVE_LIBAPM_FALSE@APMDIR =
- @HAVE_LIBAPM_TRUE@APMINC =
--@HAVE_LIBAPM_FALSE@APMINC = @HAVE_LIBAPM_FALSE@-Iapmlib/
-+@HAVE_LIBAPM_FALSE@APMINC =
-
- SUBDIRS = docs sounds $(APMDIR)
-
-@@ -230,8 +230,7 @@
- @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = \
- @HAVE_LIBAPM_TRUE@$(top_builddir)/screen-exec/libscreen-exec.la
- @HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES = \
--@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la \
--@HAVE_LIBAPM_FALSE@apmlib/libapm.a
-+@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la
- battstat_applet_2_LDFLAGS =
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/x11/gnome-applets/files/patch-multiload::linux-proc.c b/x11/gnome-applets/files/patch-multiload::linux-proc.c
deleted file mode 100644
index 9eb916f2b59f..000000000000
--- a/x11/gnome-applets/files/patch-multiload::linux-proc.c
+++ /dev/null
@@ -1,84 +0,0 @@
---- multiload/linux-proc.c.orig Thu Jul 10 04:26:58 2003
-+++ multiload/linux-proc.c Mon Nov 17 23:54:38 2003
-@@ -5,12 +5,17 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <assert.h>
-+#ifdef __FreeBSD__
-+#include <sys/socket.h>
-+#include <net/if.h>
-+#endif
-
- #include <glibtop.h>
- #include <glibtop/cpu.h>
- #include <glibtop/mem.h>
- #include <glibtop/swap.h>
- #include <glibtop/loadavg.h>
-+#include <glibtop/netload.h>
-
- #include "linux-proc.h"
-
-@@ -33,6 +38,10 @@
- static unsigned needed_loadavg_flags =
- (1 << GLIBTOP_LOADAVG_LOADAVG);
-
-+static unsigned needed_netload_flags =
-+(1 << GLIBTOP_NETLOAD_IF_FLAGS) +
-+(1 << GLIBTOP_NETLOAD_BYTES_TOTAL);
-+
- void
- GetLoad (int Maximum, int data [4], LoadGraph *g)
- {
-@@ -236,6 +245,44 @@
- int delta[COUNT_TYPES], i;
- static int ticks = 0;
- static gulong past[COUNT_TYPES] = {0};
-+#ifdef __FreeBSD__
-+ struct if_nameindex *ifindex, *ifptr;
-+ static int max = 500;
-+
-+ ifindex = if_nameindex();
-+ if (!ifindex)
-+ return;
-+
-+ memset(present, 0, sizeof (present));
-+
-+ for (ifptr = ifindex; ifptr->if_index && ifptr->if_name; ifptr++)
-+ {
-+ int index;
-+ glibtop_netload netload;
-+
-+ glibtop_get_netload(&netload, ifptr->if_name);
-+ if (!netload.flags)
-+ continue;
-+
-+ assert ((netload.flags & needed_netload_flags) == needed_netload_flags);
-+
-+ if (!(netload.if_flags & (1L << GLIBTOP_IF_FLAGS_UP)))
-+ continue;
-+ if (netload.if_flags & (1L << GLIBTOP_IF_FLAGS_LOOPBACK))
-+ continue;
-+
-+ if (netload.if_flags & (1L << GLIBTOP_IF_FLAGS_POINTOPOINT)) {
-+ index = strncmp(ifptr->if_name, "sl", 2) ? PPP_COUNT : SLIP_COUNT;
-+ } else {
-+ index = ETH_COUNT;
-+ }
-+
-+ present[index] += netload.bytes_total;
-+ }
-+
-+ if_freenameindex(ifindex);
-+
-+#else
- static char *netdevfmt = NULL;
- char *cp, buffer[256];
- FILE *fp;
-@@ -317,6 +364,7 @@
- }
-
- fclose(fp);
-+#endif
-
- for (i = 0; i < 5; i++)
- data[i] = 0;
diff --git a/x11/gnome-applets/files/patch-stickynotes_Makefile.in b/x11/gnome-applets/files/patch-stickynotes_Makefile.in
deleted file mode 100644
index 973b7e342c3e..000000000000
--- a/x11/gnome-applets/files/patch-stickynotes_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- stickynotes/Makefile.in.orig Thu Aug 28 01:00:09 2003
-+++ stickynotes/Makefile.in Thu Aug 28 01:00:26 2003
-@@ -142,7 +142,7 @@
-
- SUBDIRS = pixmaps docs
-
--CFLAGS = -Wall -g
-+CFLAGS += -Wall -g
-
- INCLUDES = -I. -I$(srcdir) $(GNOME_APPLETS_CFLAGS) $(LIBGLADE_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DSTICKYNOTES_GLADEDIR=\"$(gladedir)\" -DSTICKYNOTES_ICONDIR=\"$(icondir)\"
-
diff --git a/x11/gnome-applets/files/patch-wireless_wireless-applet.c b/x11/gnome-applets/files/patch-wireless_wireless-applet.c
index 1f1af0974a9d..650c4694ad35 100644
--- a/x11/gnome-applets/files/patch-wireless_wireless-applet.c
+++ b/x11/gnome-applets/files/patch-wireless_wireless-applet.c
@@ -1,5 +1,5 @@
---- wireless/wireless-applet.c.orig Mon Oct 27 15:52:14 2003
-+++ wireless/wireless-applet.c Fri Jan 16 16:47:14 2004
+--- wireless/wireless-applet.c.orig Tue Oct 21 19:06:53 2003
++++ wireless/wireless-applet.c Sat Jan 3 19:26:43 2004
@@ -30,6 +30,15 @@
#include <math.h>
#include <dirent.h>
@@ -72,7 +72,7 @@
wireless_applet_draw (applet, percent);
}
-@@ -235,22 +260,180 @@
+@@ -235,22 +260,179 @@
}
}
@@ -116,7 +116,7 @@
+static void
+get_wi_data (WirelessApplet *applet, char *device, long int *level)
+{
-+ struct wi_req wreq;
++ struct wi_req wreq;
+ long int signal_strength;
+
+ bzero((char *)&wreq, sizeof(wreq));
@@ -156,9 +156,9 @@
+
+ if (ioctl(s, SIOCGAIRONET, &ifr) == -1) {
+ gtk_tooltips_set_tip (applet->tips,
-+ GTK_WIDGET (applet),
-+ "ioctl Error",
-+ NULL);
++ GTK_WIDGET (applet),
++ "ioctl Error",
++ NULL);
+ return 0;
+ }
+
@@ -169,7 +169,7 @@
+static void
+get_an_data (WirelessApplet *applet, char *device, long int *level)
+{
-+ struct an_req areq;
++ struct an_req areq;
+ struct an_ltv_status *sts;
+#ifdef AN_RID_RSSI_MAP
+ struct an_ltv_rssi_map an_rssimap;
@@ -192,13 +192,13 @@
+#ifdef AN_RID_RSSI_MAP
+ if (rssimap_valid)
+ signal_strength = (long int)(an_rssimap.an_entries[
-+ sts->an_normalized_strength].an_rss_pct);
++ sts->an_normalized_strength].an_rss_pct);
+ else
+ signal_strength = (long int)(sts->an_normalized_strength);
+#else
+ signal_strength = (long int)(sts->an_normalized_rssi);
+#endif
-+
++
+ memcpy(level, &signal_strength, sizeof(level));
+}
+#endif
@@ -230,14 +230,14 @@
/* Here we begin to suck... */
do {
+#ifdef __FreeBSD__
-+ if (ifs == NULL || ifs->if_name == NULL) {
++ if (ifs == NULL || ifs->if_name == NULL) {
+ break;
+ }
-+ strlcpy(device, ifs->if_name, 6);
++ strlcpy(device, ifs->if_name, 6);
+ if (g_strncasecmp(device, "an", 2)==0) {
+ applet->devices = g_list_prepend (applet->devices, g_strdup (device));
+ if (g_strcasecmp(applet->device, device)==0) {
-+ get_an_data(applet, device, &level);
++ get_an_data(applet, device, &level);
+ wireless_applet_update_state (applet, device, 0, level, 0);
+ }
+ }
@@ -245,17 +245,16 @@
+ if (g_strncasecmp(device, "wi", 2)==0 || g_strncasecmp(device, "ath", 3)==0) {
+ applet->devices = g_list_prepend (applet->devices, g_strdup (device));
+ if (g_strcasecmp(applet->device, device)==0) {
-+ get_wi_data(applet, device, &level);
++ get_wi_data(applet, device, &level);
+ wireless_applet_update_state (applet, device, 0, level, 0);
+ }
+ }
+ ifs++;
+#else
-+
char *ptr;
fgets (line, 256, applet->file);
-@@ -283,6 +466,7 @@
+@@ -283,6 +465,7 @@
wireless_applet_update_state (applet, device, link, level, noise);
}
}
@@ -263,7 +262,7 @@
} while (1);
if (g_list_length (applet->devices)==1) {
-@@ -294,17 +478,23 @@
+@@ -294,17 +477,23 @@
}
/* rewind the /proc/net/wireless file */
@@ -287,7 +286,7 @@
wireless_applet_read_device_state (applet);
-@@ -351,6 +541,7 @@
+@@ -351,6 +540,7 @@
static void
start_file_read (WirelessApplet *applet)
{
@@ -295,7 +294,7 @@
applet->file = fopen ("/proc/net/wireless", "rt");
if (applet->file == NULL) {
gtk_tooltips_set_tip (applet->tips,
-@@ -359,6 +550,7 @@
+@@ -359,6 +549,7 @@
NULL);
show_error_dialog (_("There doesn't seem to be any wireless devices configured on your system.\nPlease verify your configuration if you think this is incorrect."));
}
@@ -303,7 +302,7 @@
}
static void
-@@ -646,8 +838,10 @@
+@@ -646,8 +837,10 @@
applet->prefs = NULL;
}
diff --git a/x11/gnome-applets/pkg-descr b/x11/gnome-applets/pkg-descr
index c93d4bc89a04..5f715cf9a438 100644
--- a/x11/gnome-applets/pkg-descr
+++ b/x11/gnome-applets/pkg-descr
@@ -1,3 +1,3 @@
-Applets components for the Gnome 2.0 Desktop Environment
+Panel applets for the Gnome 2.0 Desktop Environment.
WWW: http://www.gnome.org/
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index f673803f1995..119fd3e38b2f 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -1,5 +1,8 @@
bin/gkb_xmmap
bin/gnome-keyboard-layout
+bin/gswitchit-plugins-capplet
+etc/gconf/gconf.xml.defaults/apps/gswitchit/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gswitchit/Applet/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/defaults/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/settings/%gconf.xml
@@ -15,6 +18,8 @@ etc/gconf/gconf.xml.defaults/schemas/apps/geyes/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/geyes/prefs/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gkb-applet/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gkb-applet/prefs/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/Applet/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gtik/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gtik/prefs/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gweather/%gconf.xml
@@ -38,6 +43,7 @@ etc/gconf/schemas/charpick.schemas
etc/gconf/schemas/drivemount.schemas
etc/gconf/schemas/geyes.schemas
etc/gconf/schemas/gkb.schemas
+etc/gconf/schemas/gswitchit.schemas
etc/gconf/schemas/gtik.schemas
etc/gconf/schemas/gweather.schemas
etc/gconf/schemas/mailcheck.schemas
@@ -48,15 +54,17 @@ etc/gconf/schemas/multiload.schemas
etc/gconf/schemas/stickynotes.schemas
%%BATTERY%%etc/sound/events/battstat_applet.soundlist
etc/sound/events/mailcheck.soundlist
+include/libgswitchit/gswitchit_plugin.h
+include/libgswitchit/gswitchit_xkb_config.h
libdata/bonobo/servers/GNOME_AccessxStatusApplet.server
-%%BATTERY%%libdata/bonobo/servers/GNOME_BattstatApplet.server
+libdata/bonobo/servers/GNOME_BattstatApplet.server
libdata/bonobo/servers/GNOME_CDPlayerApplet.server
libdata/bonobo/servers/GNOME_CharpickerApplet.server
libdata/bonobo/servers/GNOME_DriveMountApplet.server
libdata/bonobo/servers/GNOME_GWeatherApplet_Factory.server
libdata/bonobo/servers/GNOME_GeyesApplet.server
libdata/bonobo/servers/GNOME_GtikApplet.server
-libdata/bonobo/servers/GNOME_KeyboardApplet_Factory.server
+libdata/bonobo/servers/GNOME_KeyboardApplet.server
libdata/bonobo/servers/GNOME_MailcheckApplet_Factory.server
libdata/bonobo/servers/GNOME_MiniCommanderApplet.server
libdata/bonobo/servers/GNOME_MixerApplet.server
@@ -64,14 +72,15 @@ libdata/bonobo/servers/GNOME_ModemLightsApplet.server
libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server
libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server
libdata/bonobo/servers/GNOME_StickyNotesApplet.server
+libdata/pkgconfig/gswitchit.pc
libexec/accessx-status-applet
%%BATTERY%%libexec/battstat-applet-2
libexec/cdplayer_applet2
libexec/charpick_applet2
libexec/drivemount_applet2
libexec/geyes_applet2
-libexec/gkb-applet-2
libexec/gnome-applets/mc-install-default-macros
+libexec/gnome-keyboard-applet
libexec/gtik2_applet2
libexec/gweather-applet-2
libexec/mailcheck-applet
@@ -231,10 +240,11 @@ share/gnome/gkb/YU_Serbo-Croatian_x.keyprop
share/gnome/gkb/Yugoslav.keyprop
share/gnome/gkb/presets.xml
share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.xml
-%%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml
+share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml
share/gnome/gnome-2.0/ui/GNOME_CDPlayerApplet.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
share/gnome/gnome-2.0/ui/GNOME_GtikApplet.xml
@@ -246,20 +256,144 @@ share/gnome/gnome-2.0/ui/GNOME_ModemlightsApplet.xml
share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml
share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
share/gnome/gnome-2.0/ui/GNOME_WirelessApplet.xml
+share/gnome/gswitchit/gswitchit-plugins.glade
+share/gnome/gswitchit/gswitchit-properties.glade
share/gnome/gweather/Locations
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/legal.xml
%%BATTERY%%share/gnome/help/battstat/C/battstat.xml
-%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-apperance.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/ac_small.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/battery_small.png
%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet.png
-%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-general.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/warning_small.png
%%BATTERY%%share/gnome/help/battstat/C/legal.xml
+%%BATTERY%%share/gnome/help/battstat/de/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/de/figures/ac_small.png
+%%BATTERY%%share/gnome/help/battstat/de/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/de/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/de/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/de/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/de/figures/battery_small.png
+%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/de/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/de/figures/warning_small.png
+%%BATTERY%%share/gnome/help/battstat/de/legal.xml
+%%BATTERY%%share/gnome/help/battstat/es/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/es/figures/ac_small.png
+%%BATTERY%%share/gnome/help/battstat/es/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/es/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/es/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/es/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/es/figures/battery_small.png
+%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/es/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/es/figures/warning_small.png
+%%BATTERY%%share/gnome/help/battstat/es/legal.xml
+%%BATTERY%%share/gnome/help/battstat/fr/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/fr/figures/ac_small.png
+%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/fr/figures/battery_small.png
+%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/fr/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/fr/figures/warning_small.png
+%%BATTERY%%share/gnome/help/battstat/fr/legal.xml
+%%BATTERY%%share/gnome/help/battstat/it/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/it/figures/ac_small.png
+%%BATTERY%%share/gnome/help/battstat/it/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/it/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/it/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/it/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/it/figures/battery_small.png
+%%BATTERY%%share/gnome/help/battstat/it/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/it/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/it/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/it/figures/warning_small.png
+%%BATTERY%%share/gnome/help/battstat/it/legal.xml
%%BATTERY%%share/gnome/help/battstat/ja/battstat.xml
-%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-apperance.png
+%%BATTERY%%share/gnome/help/battstat/ja/figures/ac_small.png
+%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/ja/figures/battery_small.png
%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-applet.png
-%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-general.png
+%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/ja/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/ja/figures/warning_small.png
%%BATTERY%%share/gnome/help/battstat/ja/legal.xml
+%%BATTERY%%share/gnome/help/battstat/ko/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/ko/figures/ac_small.png
+%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/ko/figures/battery_small.png
+%%BATTERY%%share/gnome/help/battstat/ko/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/ko/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/ko/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/ko/figures/warning_small.png
+%%BATTERY%%share/gnome/help/battstat/ko/legal.xml
+%%BATTERY%%share/gnome/help/battstat/sv/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/sv/figures/ac_small.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/battery_small.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/warning_small.png
+%%BATTERY%%share/gnome/help/battstat/sv/legal.xml
+%%BATTERY%%share/gnome/help/battstat/zh_CN/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/ac_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battery_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/warning_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/legal.xml
+%%BATTERY%%share/gnome/help/battstat/zh_HK/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/ac_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battery_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/warning_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_HK/legal.xml
+%%BATTERY%%share/gnome/help/battstat/zh_TW/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/ac_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battery_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/warning_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_TW/legal.xml
share/gnome/help/cdplayer/C/cdplayer.xml
share/gnome/help/cdplayer/C/figures/cdplayer_applet.png
share/gnome/help/cdplayer/C/figures/cdplayer_applet_eject.png
@@ -276,6 +410,9 @@ share/gnome/help/cdplayer/de/cdplayer.xml
share/gnome/help/cdplayer/de/figures/cdplayer_applet.png
share/gnome/help/cdplayer/de/figures/cdplayer_applet_eject.png
share/gnome/help/cdplayer/de/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/de/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/de/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/de/figures/cdplayer_applet_playafterpause.png
share/gnome/help/cdplayer/de/figures/cdplayer_applet_playing.png
share/gnome/help/cdplayer/de/figures/cdplayer_applet_playpause.png
share/gnome/help/cdplayer/de/figures/cdplayer_applet_prevtrack.png
@@ -285,6 +422,9 @@ share/gnome/help/cdplayer/es/cdplayer.xml
share/gnome/help/cdplayer/es/figures/cdplayer_applet.png
share/gnome/help/cdplayer/es/figures/cdplayer_applet_eject.png
share/gnome/help/cdplayer/es/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/es/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/es/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/es/figures/cdplayer_applet_playafterpause.png
share/gnome/help/cdplayer/es/figures/cdplayer_applet_playing.png
share/gnome/help/cdplayer/es/figures/cdplayer_applet_playpause.png
share/gnome/help/cdplayer/es/figures/cdplayer_applet_prevtrack.png
@@ -294,6 +434,9 @@ share/gnome/help/cdplayer/fr/cdplayer.xml
share/gnome/help/cdplayer/fr/figures/cdplayer_applet.png
share/gnome/help/cdplayer/fr/figures/cdplayer_applet_eject.png
share/gnome/help/cdplayer/fr/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/fr/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/fr/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playafterpause.png
share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playing.png
share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playpause.png
share/gnome/help/cdplayer/fr/figures/cdplayer_applet_prevtrack.png
@@ -303,6 +446,9 @@ share/gnome/help/cdplayer/it/cdplayer.xml
share/gnome/help/cdplayer/it/figures/cdplayer_applet.png
share/gnome/help/cdplayer/it/figures/cdplayer_applet_eject.png
share/gnome/help/cdplayer/it/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/it/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/it/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/it/figures/cdplayer_applet_playafterpause.png
share/gnome/help/cdplayer/it/figures/cdplayer_applet_playing.png
share/gnome/help/cdplayer/it/figures/cdplayer_applet_playpause.png
share/gnome/help/cdplayer/it/figures/cdplayer_applet_prevtrack.png
@@ -324,6 +470,9 @@ share/gnome/help/cdplayer/ko/cdplayer.xml
share/gnome/help/cdplayer/ko/figures/cdplayer_applet.png
share/gnome/help/cdplayer/ko/figures/cdplayer_applet_eject.png
share/gnome/help/cdplayer/ko/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/ko/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/ko/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playafterpause.png
share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playing.png
share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playpause.png
share/gnome/help/cdplayer/ko/figures/cdplayer_applet_prevtrack.png
@@ -333,6 +482,9 @@ share/gnome/help/cdplayer/sv/cdplayer.xml
share/gnome/help/cdplayer/sv/figures/cdplayer_applet.png
share/gnome/help/cdplayer/sv/figures/cdplayer_applet_eject.png
share/gnome/help/cdplayer/sv/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/sv/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/sv/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playafterpause.png
share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playing.png
share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playpause.png
share/gnome/help/cdplayer/sv/figures/cdplayer_applet_prevtrack.png
@@ -342,15 +494,33 @@ share/gnome/help/cdplayer/zh_CN/cdplayer.xml
share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet.png
share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_eject.png
share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playafterpause.png
share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playing.png
share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playpause.png
share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_prevtrack.png
share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_stop.png
share/gnome/help/cdplayer/zh_CN/legal.xml
+share/gnome/help/cdplayer/zh_HK/cdplayer.xml
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_eject.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playafterpause.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playing.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playpause.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_prevtrack.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_stop.png
+share/gnome/help/cdplayer/zh_HK/legal.xml
share/gnome/help/cdplayer/zh_TW/cdplayer.xml
share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet.png
share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_eject.png
share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playafterpause.png
share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playing.png
share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playpause.png
share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_prevtrack.png
@@ -389,13 +559,6 @@ share/gnome/help/char-palette/it/figures/charpick_applet.png
share/gnome/help/char-palette/it/figures/charpick_characters.png
share/gnome/help/char-palette/it/figures/charpick_chargroup.png
share/gnome/help/char-palette/it/legal.xml
-share/gnome/help/char-palette/ja/char-palette.xml
-share/gnome/help/char-palette/ja/figures/charpalette_applet.png
-share/gnome/help/char-palette/ja/figures/charpalette_chargroup.png
-share/gnome/help/char-palette/ja/figures/charpick_applet.png
-share/gnome/help/char-palette/ja/figures/charpick_characters.png
-share/gnome/help/char-palette/ja/figures/charpick_chargroup.png
-share/gnome/help/char-palette/ja/legal.xml
share/gnome/help/char-palette/ko/char-palette.xml
share/gnome/help/char-palette/ko/figures/charpalette_applet.png
share/gnome/help/char-palette/ko/figures/charpalette_chargroup.png
@@ -417,6 +580,10 @@ share/gnome/help/char-palette/zh_CN/figures/charpick_applet.png
share/gnome/help/char-palette/zh_CN/figures/charpick_characters.png
share/gnome/help/char-palette/zh_CN/figures/charpick_chargroup.png
share/gnome/help/char-palette/zh_CN/legal.xml
+share/gnome/help/char-palette/zh_HK/char-palette.xml
+share/gnome/help/char-palette/zh_HK/figures/charpalette_applet.png
+share/gnome/help/char-palette/zh_HK/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/zh_HK/legal.xml
share/gnome/help/char-palette/zh_TW/char-palette.xml
share/gnome/help/char-palette/zh_TW/figures/charpalette_applet.png
share/gnome/help/char-palette/zh_TW/figures/charpalette_chargroup.png
@@ -451,15 +618,89 @@ share/gnome/help/command-line/sv/legal.xml
share/gnome/help/command-line/zh_CN/command-line.xml
share/gnome/help/command-line/zh_CN/figures/command-line.png
share/gnome/help/command-line/zh_CN/legal.xml
+share/gnome/help/command-line/zh_HK/command-line.xml
+share/gnome/help/command-line/zh_HK/figures/command-line.png
+share/gnome/help/command-line/zh_HK/legal.xml
share/gnome/help/command-line/zh_TW/command-line.xml
share/gnome/help/command-line/zh_TW/figures/command-line.png
share/gnome/help/command-line/zh_TW/legal.xml
share/gnome/help/drivemount/C/drivemount.xml
+share/gnome/help/drivemount/C/figures/drivemount-applet_window.png
share/gnome/help/drivemount/C/figures/drivemount_applet_all.png
share/gnome/help/drivemount/C/figures/drivemount_applet_floppy.png
share/gnome/help/drivemount/C/figures/drivemount_applet_settings.png
share/gnome/help/drivemount/C/figures/drivemount_applet_tooltip.png
share/gnome/help/drivemount/C/legal.xml
+share/gnome/help/drivemount/de/drivemount.xml
+share/gnome/help/drivemount/de/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/de/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/de/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/de/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/de/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/de/legal.xml
+share/gnome/help/drivemount/es/drivemount.xml
+share/gnome/help/drivemount/es/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/es/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/es/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/es/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/es/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/es/legal.xml
+share/gnome/help/drivemount/fr/drivemount.xml
+share/gnome/help/drivemount/fr/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/fr/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/fr/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/fr/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/fr/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/fr/legal.xml
+share/gnome/help/drivemount/it/drivemount.xml
+share/gnome/help/drivemount/it/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/it/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/it/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/it/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/it/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/it/legal.xml
+share/gnome/help/drivemount/ja/drivemount.xml
+share/gnome/help/drivemount/ja/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/ja/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/ja/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/ja/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/ja/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/ja/legal.xml
+share/gnome/help/drivemount/ko/drivemount.xml
+share/gnome/help/drivemount/ko/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/ko/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/ko/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/ko/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/ko/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/ko/legal.xml
+share/gnome/help/drivemount/sv/drivemount.xml
+share/gnome/help/drivemount/sv/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/sv/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/sv/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/sv/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/sv/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/sv/legal.xml
+share/gnome/help/drivemount/zh_CN/drivemount.xml
+share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/zh_CN/legal.xml
+share/gnome/help/drivemount/zh_HK/drivemount.xml
+share/gnome/help/drivemount/zh_HK/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/zh_HK/legal.xml
+share/gnome/help/drivemount/zh_TW/drivemount.xml
+share/gnome/help/drivemount/zh_TW/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/zh_TW/legal.xml
share/gnome/help/geyes/C/figures/geyes_applet.png
share/gnome/help/geyes/C/geyes.xml
share/gnome/help/geyes/C/legal.xml
@@ -495,6 +736,9 @@ share/gnome/help/geyes/zh_CN/figures/geyes_applet.png
share/gnome/help/geyes/zh_CN/figures/geyes_settings.png
share/gnome/help/geyes/zh_CN/geyes.xml
share/gnome/help/geyes/zh_CN/legal.xml
+share/gnome/help/geyes/zh_HK/figures/geyes_applet.png
+share/gnome/help/geyes/zh_HK/geyes.xml
+share/gnome/help/geyes/zh_HK/legal.xml
share/gnome/help/geyes/zh_TW/figures/geyes_applet.png
share/gnome/help/geyes/zh_TW/figures/geyes_settings.png
share/gnome/help/geyes/zh_TW/geyes.xml
@@ -526,6 +770,9 @@ share/gnome/help/gkb/sv/legal.xml
share/gnome/help/gkb/zh_CN/figures/gkb_applet.png
share/gnome/help/gkb/zh_CN/gkb.xml
share/gnome/help/gkb/zh_CN/legal.xml
+share/gnome/help/gkb/zh_HK/figures/gkb_applet.png
+share/gnome/help/gkb/zh_HK/gkb.xml
+share/gnome/help/gkb/zh_HK/legal.xml
share/gnome/help/gkb/zh_TW/figures/gkb_applet.png
share/gnome/help/gkb/zh_TW/gkb.xml
share/gnome/help/gkb/zh_TW/legal.xml
@@ -556,6 +803,9 @@ share/gnome/help/gtik2_applet2/sv/legal.xml
share/gnome/help/gtik2_applet2/zh_CN/figures/gtik_applet.png
share/gnome/help/gtik2_applet2/zh_CN/gtik2_applet2.xml
share/gnome/help/gtik2_applet2/zh_CN/legal.xml
+share/gnome/help/gtik2_applet2/zh_HK/figures/gtik_applet.png
+share/gnome/help/gtik2_applet2/zh_HK/gtik2_applet2.xml
+share/gnome/help/gtik2_applet2/zh_HK/legal.xml
share/gnome/help/gtik2_applet2/zh_TW/figures/gtik_applet.png
share/gnome/help/gtik2_applet2/zh_TW/gtik2_applet2.xml
share/gnome/help/gtik2_applet2/zh_TW/legal.xml
@@ -604,6 +854,11 @@ share/gnome/help/gweather/zh_CN/figures/gweather_settings.png
share/gnome/help/gweather/zh_CN/figures/gweather_weather.png
share/gnome/help/gweather/zh_CN/gweather.xml
share/gnome/help/gweather/zh_CN/legal.xml
+share/gnome/help/gweather/zh_HK/figures/gweather_applet.png
+share/gnome/help/gweather/zh_HK/figures/gweather_settings.png
+share/gnome/help/gweather/zh_HK/figures/gweather_weather.png
+share/gnome/help/gweather/zh_HK/gweather.xml
+share/gnome/help/gweather/zh_HK/legal.xml
share/gnome/help/gweather/zh_TW/figures/gweather_applet.png
share/gnome/help/gweather/zh_TW/figures/gweather_settings.png
share/gnome/help/gweather/zh_TW/figures/gweather_weather.png
@@ -636,6 +891,11 @@ share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailcheck.png
share/gnome/help/mailcheck/it/figures/mailcheck_applet.png
share/gnome/help/mailcheck/it/legal.xml
share/gnome/help/mailcheck/it/mailcheck.xml
+share/gnome/help/mailcheck/ja/figures/charpalette_applet.png
+share/gnome/help/mailcheck/ja/figures/charpalette_chargroup.png
+share/gnome/help/mailcheck/ja/figures/charpick_applet.png
+share/gnome/help/mailcheck/ja/figures/charpick_characters.png
+share/gnome/help/mailcheck/ja/figures/charpick_chargroup.png
share/gnome/help/mailcheck/ja/figures/mailcheck_applet.png
share/gnome/help/mailcheck/ja/legal.xml
share/gnome/help/mailcheck/ja/mailcheck.xml
@@ -657,6 +917,9 @@ share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailcheck.png
share/gnome/help/mailcheck/zh_CN/figures/mailcheck_applet.png
share/gnome/help/mailcheck/zh_CN/legal.xml
share/gnome/help/mailcheck/zh_CN/mailcheck.xml
+share/gnome/help/mailcheck/zh_HK/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/zh_HK/legal.xml
+share/gnome/help/mailcheck/zh_HK/mailcheck.xml
share/gnome/help/mailcheck/zh_TW/figures/mailcheck-applet.png
share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailbox.png
share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailcheck.png
@@ -678,6 +941,10 @@ share/gnome/help/mixer_applet2/fr/figures/mixer_applet.png
share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/fr/legal.xml
share/gnome/help/mixer_applet2/fr/mixer_applet2.xml
+share/gnome/help/mixer_applet2/it/figures/mixer_applet.png
+share/gnome/help/mixer_applet2/it/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/it/legal.xml
+share/gnome/help/mixer_applet2/it/mixer_applet2.xml
share/gnome/help/mixer_applet2/ja/figures/mixer_applet.png
share/gnome/help/mixer_applet2/ja/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/ja/legal.xml
@@ -694,6 +961,9 @@ share/gnome/help/mixer_applet2/zh_CN/figures/mixer_applet.png
share/gnome/help/mixer_applet2/zh_CN/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/zh_CN/legal.xml
share/gnome/help/mixer_applet2/zh_CN/mixer_applet2.xml
+share/gnome/help/mixer_applet2/zh_HK/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/zh_HK/legal.xml
+share/gnome/help/mixer_applet2/zh_HK/mixer_applet2.xml
share/gnome/help/mixer_applet2/zh_TW/figures/mixer_applet.png
share/gnome/help/mixer_applet2/zh_TW/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/zh_TW/legal.xml
@@ -718,16 +988,139 @@ share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_connecting.png
share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_display.png
share/gnome/help/modemlights/C/legal.xml
share/gnome/help/modemlights/C/modemlights.xml
+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/figures/system_monitor_prefs.png
+share/gnome/help/multiload/C/legal.xml
+share/gnome/help/multiload/C/multiload.xml
+share/gnome/help/multiload/de/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/de/legal.xml
+share/gnome/help/multiload/de/multiload.xml
+share/gnome/help/multiload/es/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/es/legal.xml
+share/gnome/help/multiload/es/multiload.xml
+share/gnome/help/multiload/fr/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/fr/legal.xml
+share/gnome/help/multiload/fr/multiload.xml
+share/gnome/help/multiload/it/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/it/legal.xml
+share/gnome/help/multiload/it/multiload.xml
+share/gnome/help/multiload/ja/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/ja/legal.xml
+share/gnome/help/multiload/ja/multiload.xml
+share/gnome/help/multiload/ko/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/ko/legal.xml
+share/gnome/help/multiload/ko/multiload.xml
+share/gnome/help/multiload/sv/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/sv/legal.xml
+share/gnome/help/multiload/sv/multiload.xml
+share/gnome/help/multiload/zh_CN/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/zh_CN/legal.xml
+share/gnome/help/multiload/zh_CN/multiload.xml
+share/gnome/help/multiload/zh_HK/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/zh_HK/legal.xml
+share/gnome/help/multiload/zh_HK/multiload.xml
+share/gnome/help/multiload/zh_TW/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/zh_TW/legal.xml
+share/gnome/help/multiload/zh_TW/multiload.xml
share/gnome/help/stickynotes_applet/C/legal.xml
share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/de/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/de/legal.xml
+share/gnome/help/stickynotes_applet/de/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/es/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/es/legal.xml
+share/gnome/help/stickynotes_applet/es/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/fr/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/fr/legal.xml
+share/gnome/help/stickynotes_applet/fr/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/it/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/it/legal.xml
+share/gnome/help/stickynotes_applet/it/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/ja/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/ja/legal.xml
+share/gnome/help/stickynotes_applet/ja/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/ko/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/ko/legal.xml
+share/gnome/help/stickynotes_applet/ko/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/sv/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/sv/legal.xml
+share/gnome/help/stickynotes_applet/sv/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/zh_CN/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/zh_CN/legal.xml
+share/gnome/help/stickynotes_applet/zh_CN/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/zh_HK/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/zh_HK/legal.xml
+share/gnome/help/stickynotes_applet/zh_HK/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/zh_TW/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/zh_TW/legal.xml
+share/gnome/help/stickynotes_applet/zh_TW/stickynotes_applet.xml
share/gnome/help/wireless/C/legal.xml
share/gnome/help/wireless/C/wireless.xml
+share/gnome/help/wireless/de/figures/wireless_applet_conn.png
+share/gnome/help/wireless/de/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/de/legal.xml
+share/gnome/help/wireless/de/wireless.xml
+share/gnome/help/wireless/es/figures/wireless_applet_conn.png
+share/gnome/help/wireless/es/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/es/legal.xml
+share/gnome/help/wireless/es/wireless.xml
+share/gnome/help/wireless/fr/figures/wireless_applet_conn.png
+share/gnome/help/wireless/fr/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/fr/legal.xml
+share/gnome/help/wireless/fr/wireless.xml
+share/gnome/help/wireless/it/figures/wireless_applet_conn.png
+share/gnome/help/wireless/it/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/it/legal.xml
+share/gnome/help/wireless/it/wireless.xml
+share/gnome/help/wireless/ja/figures/wireless_applet_conn.png
+share/gnome/help/wireless/ja/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/ja/legal.xml
+share/gnome/help/wireless/ja/wireless.xml
+share/gnome/help/wireless/ko/figures/wireless_applet_conn.png
+share/gnome/help/wireless/ko/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/ko/legal.xml
+share/gnome/help/wireless/ko/wireless.xml
+share/gnome/help/wireless/sv/figures/wireless_applet_conn.png
+share/gnome/help/wireless/sv/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/sv/legal.xml
+share/gnome/help/wireless/sv/wireless.xml
+share/gnome/help/wireless/zh_CN/figures/wireless_applet_conn.png
+share/gnome/help/wireless/zh_CN/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/zh_CN/legal.xml
+share/gnome/help/wireless/zh_CN/wireless.xml
+share/gnome/help/wireless/zh_HK/figures/wireless_applet_conn.png
+share/gnome/help/wireless/zh_HK/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/zh_HK/legal.xml
+share/gnome/help/wireless/zh_HK/wireless.xml
+share/gnome/help/wireless/zh_TW/figures/wireless_applet_conn.png
+share/gnome/help/wireless/zh_TW/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/zh_TW/legal.xml
+share/gnome/help/wireless/zh_TW/wireless.xml
share/gnome/omf/gnome-applets/accessx-status-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/accessx-status-C.omf 2>/dev/null || /usr/bin/true
%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf
%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%share/gnome/omf/gnome-applets/battstat-de.omf
+%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-de.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%share/gnome/omf/gnome-applets/battstat-es.omf
+%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-es.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%share/gnome/omf/gnome-applets/battstat-fr.omf
+%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-fr.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%share/gnome/omf/gnome-applets/battstat-it.omf
+%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-it.omf 2>/dev/null || /usr/bin/true
%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ja.omf
%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ko.omf
+%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-ko.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%share/gnome/omf/gnome-applets/battstat-sv.omf
+%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-sv.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_CN.omf
+%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-zh_CN.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_HK.omf
+%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-zh_HK.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_TW.omf
+%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/cdplayer-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-C.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/cdplayer-de.omf
@@ -746,6 +1139,8 @@ share/gnome/omf/gnome-applets/cdplayer-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-sv.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/cdplayer-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/cdplayer-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_HK.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/cdplayer-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/char-palette-C.omf
@@ -758,14 +1153,14 @@ share/gnome/omf/gnome-applets/char-palette-fr.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-fr.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/char-palette-it.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-it.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-applets/char-palette-ja.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-ja.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/char-palette-ko.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-ko.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/char-palette-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-sv.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/char-palette-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/char-palette-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-zh_HK.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/char-palette-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/command-line-C.omf
@@ -786,10 +1181,32 @@ share/gnome/omf/gnome-applets/command-line-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/command-line-sv.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/command-line-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/command-line-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/command-line-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/command-line-zh_HK.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/command-line-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/command-line-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/drivemount-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/drivemount-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/drivemount-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/drivemount-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/drivemount-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/drivemount-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/drivemount-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/drivemount-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/drivemount-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/drivemount-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-zh_HK.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/drivemount-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/geyes-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-C.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/geyes-de.omf
@@ -808,6 +1225,8 @@ share/gnome/omf/gnome-applets/geyes-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-sv.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/geyes-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/geyes-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-zh_HK.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/geyes-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/gkb-C.omf
@@ -828,6 +1247,8 @@ share/gnome/omf/gnome-applets/gkb-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-sv.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/gkb-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/gkb-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-zh_HK.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/gkb-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/gtik2_applet2-C.omf
@@ -848,6 +1269,8 @@ share/gnome/omf/gnome-applets/gtik2_applet2-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-sv.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/gtik2_applet2-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/gtik2_applet2-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_HK.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/gtik2_applet2-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/gweather-C.omf
@@ -868,6 +1291,8 @@ share/gnome/omf/gnome-applets/gweather-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather-sv.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/gweather-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/gweather-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather-zh_HK.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/gweather-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/mailcheck-C.omf
@@ -888,6 +1313,8 @@ share/gnome/omf/gnome-applets/mailcheck-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-sv.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/mailcheck-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/mailcheck-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_HK.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/mailcheck-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/mixer_applet2-C.omf
@@ -898,6 +1325,8 @@ share/gnome/omf/gnome-applets/mixer_applet2-es.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-es.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/mixer_applet2-fr.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/mixer_applet2-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-it.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/mixer_applet2-ja.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-ja.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/mixer_applet2-ko.omf
@@ -906,14 +1335,78 @@ share/gnome/omf/gnome-applets/mixer_applet2-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-sv.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/mixer_applet2-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_HK.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/modemlights-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/modemlights-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-zh_HK.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/stickynotes_applet-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/stickynotes_applet-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/stickynotes_applet-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/stickynotes_applet-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/stickynotes_applet-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/stickynotes_applet-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/stickynotes_applet-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/stickynotes_applet-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/stickynotes_applet-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/stickynotes_applet-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_HK.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/stickynotes_applet-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/wireless-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/wireless-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/wireless-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/wireless-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/wireless-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/wireless-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/wireless-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/wireless-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/wireless-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/wireless-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-zh_HK.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/wireless-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-zh_TW.omf 2>/dev/null || /usr/bin/true
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
@@ -1031,11 +1524,11 @@ share/gnome/pixmaps/gkb/uy.png
share/gnome/pixmaps/gkb/vn.png
share/gnome/pixmaps/gkb/ye.png
share/gnome/pixmaps/gkb/yu.png
-share/gnome/pixmaps/gnome-cdplayer-icon.png
share/gnome/pixmaps/gnome-cpu.png
share/gnome/pixmaps/gnome-eyes.png
share/gnome/pixmaps/gnome-mini-commander.png
-share/gnome/pixmaps/gweather/tstorm.xpm
+share/gnome/pixmaps/gswitchit-applet.png
+share/gnome/pixmaps/gswitchit-properties-capplet.png
share/gnome/pixmaps/mailcheck/eclouds.png
share/gnome/pixmaps/mailcheck/email-e.png
share/gnome/pixmaps/mailcheck/email-eclouds.png
@@ -1163,6 +1656,7 @@ share/locale/cy/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/da/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/de/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/el/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/es/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/et/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1174,6 +1668,7 @@ share/locale/ga/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/he/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1195,10 +1690,12 @@ share/locale/ro/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ru/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
share/locale/sr/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/sv/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ta/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/th/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1211,15 +1708,80 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/pixmaps/stickynotes
@dirrm share/gnome/pixmaps/mixer
@dirrm share/gnome/pixmaps/accessx-status-applet
+@dirrm share/gnome/help/wireless/zh_TW/figures
+@dirrm share/gnome/help/wireless/zh_TW
+@dirrm share/gnome/help/wireless/zh_HK/figures
+@dirrm share/gnome/help/wireless/zh_HK
+@dirrm share/gnome/help/wireless/zh_CN/figures
+@dirrm share/gnome/help/wireless/zh_CN
+@dirrm share/gnome/help/wireless/sv/figures
+@dirrm share/gnome/help/wireless/sv
+@dirrm share/gnome/help/wireless/ko/figures
+@dirrm share/gnome/help/wireless/ko
+@dirrm share/gnome/help/wireless/ja/figures
+@dirrm share/gnome/help/wireless/ja
+@dirrm share/gnome/help/wireless/it/figures
+@dirrm share/gnome/help/wireless/it
+@dirrm share/gnome/help/wireless/fr/figures
+@dirrm share/gnome/help/wireless/fr
+@dirrm share/gnome/help/wireless/es/figures
+@dirrm share/gnome/help/wireless/es
+@dirrm share/gnome/help/wireless/de/figures
+@dirrm share/gnome/help/wireless/de
@dirrm share/gnome/help/wireless/C
@dirrm share/gnome/help/wireless
+@dirrm share/gnome/help/stickynotes_applet/zh_TW/figures
+@dirrm share/gnome/help/stickynotes_applet/zh_TW
+@dirrm share/gnome/help/stickynotes_applet/zh_HK/figures
+@dirrm share/gnome/help/stickynotes_applet/zh_HK
+@dirrm share/gnome/help/stickynotes_applet/zh_CN/figures
+@dirrm share/gnome/help/stickynotes_applet/zh_CN
+@dirrm share/gnome/help/stickynotes_applet/sv/figures
+@dirrm share/gnome/help/stickynotes_applet/sv
+@dirrm share/gnome/help/stickynotes_applet/ko/figures
+@dirrm share/gnome/help/stickynotes_applet/ko
+@dirrm share/gnome/help/stickynotes_applet/ja/figures
+@dirrm share/gnome/help/stickynotes_applet/ja
+@dirrm share/gnome/help/stickynotes_applet/it/figures
+@dirrm share/gnome/help/stickynotes_applet/it
+@dirrm share/gnome/help/stickynotes_applet/fr/figures
+@dirrm share/gnome/help/stickynotes_applet/fr
+@dirrm share/gnome/help/stickynotes_applet/es/figures
+@dirrm share/gnome/help/stickynotes_applet/es
+@dirrm share/gnome/help/stickynotes_applet/de/figures
+@dirrm share/gnome/help/stickynotes_applet/de
@dirrm share/gnome/help/stickynotes_applet/C
@dirrm share/gnome/help/stickynotes_applet
+@dirrm share/gnome/help/multiload/zh_TW/figures
+@dirrm share/gnome/help/multiload/zh_TW
+@dirrm share/gnome/help/multiload/zh_HK/figures
+@dirrm share/gnome/help/multiload/zh_HK
+@dirrm share/gnome/help/multiload/zh_CN/figures
+@dirrm share/gnome/help/multiload/zh_CN
+@dirrm share/gnome/help/multiload/sv/figures
+@dirrm share/gnome/help/multiload/sv
+@dirrm share/gnome/help/multiload/ko/figures
+@dirrm share/gnome/help/multiload/ko
+@dirrm share/gnome/help/multiload/ja/figures
+@dirrm share/gnome/help/multiload/ja
+@dirrm share/gnome/help/multiload/it/figures
+@dirrm share/gnome/help/multiload/it
+@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/de/figures
+@dirrm share/gnome/help/multiload/de
+@dirrm share/gnome/help/multiload/C/figures
+@dirrm share/gnome/help/multiload/C
+@dirrm share/gnome/help/multiload
@dirrm share/gnome/help/modemlights/C/figures
@dirrm share/gnome/help/modemlights/C
@dirrm share/gnome/help/modemlights
@dirrm share/gnome/help/mixer_applet2/zh_TW/figures
@dirrm share/gnome/help/mixer_applet2/zh_TW
+@dirrm share/gnome/help/mixer_applet2/zh_HK/figures
+@dirrm share/gnome/help/mixer_applet2/zh_HK
@dirrm share/gnome/help/mixer_applet2/zh_CN/figures
@dirrm share/gnome/help/mixer_applet2/zh_CN
@dirrm share/gnome/help/mixer_applet2/sv/figures
@@ -1228,6 +1790,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/mixer_applet2/ko
@dirrm share/gnome/help/mixer_applet2/ja/figures
@dirrm share/gnome/help/mixer_applet2/ja
+@dirrm share/gnome/help/mixer_applet2/it/figures
+@dirrm share/gnome/help/mixer_applet2/it
@dirrm share/gnome/help/mixer_applet2/fr/figures
@dirrm share/gnome/help/mixer_applet2/fr
@dirrm share/gnome/help/mixer_applet2/es/figures
@@ -1239,6 +1803,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/mixer_applet2
@dirrm share/gnome/help/mailcheck/zh_TW/figures
@dirrm share/gnome/help/mailcheck/zh_TW
+@dirrm share/gnome/help/mailcheck/zh_HK/figures
+@dirrm share/gnome/help/mailcheck/zh_HK
@dirrm share/gnome/help/mailcheck/zh_CN/figures
@dirrm share/gnome/help/mailcheck/zh_CN
@dirrm share/gnome/help/mailcheck/sv/figures
@@ -1260,6 +1826,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/mailcheck
@dirrm share/gnome/help/gweather/zh_TW/figures
@dirrm share/gnome/help/gweather/zh_TW
+@dirrm share/gnome/help/gweather/zh_HK/figures
+@dirrm share/gnome/help/gweather/zh_HK
@dirrm share/gnome/help/gweather/zh_CN/figures
@dirrm share/gnome/help/gweather/zh_CN
@dirrm share/gnome/help/gweather/sv/figures
@@ -1281,6 +1849,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/gweather
@dirrm share/gnome/help/gtik2_applet2/zh_TW/figures
@dirrm share/gnome/help/gtik2_applet2/zh_TW
+@dirrm share/gnome/help/gtik2_applet2/zh_HK/figures
+@dirrm share/gnome/help/gtik2_applet2/zh_HK
@dirrm share/gnome/help/gtik2_applet2/zh_CN/figures
@dirrm share/gnome/help/gtik2_applet2/zh_CN
@dirrm share/gnome/help/gtik2_applet2/sv/figures
@@ -1302,6 +1872,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/gtik2_applet2
@dirrm share/gnome/help/gkb/zh_TW/figures
@dirrm share/gnome/help/gkb/zh_TW
+@dirrm share/gnome/help/gkb/zh_HK/figures
+@dirrm share/gnome/help/gkb/zh_HK
@dirrm share/gnome/help/gkb/zh_CN/figures
@dirrm share/gnome/help/gkb/zh_CN
@dirrm share/gnome/help/gkb/sv/figures
@@ -1323,6 +1895,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/gkb
@dirrm share/gnome/help/geyes/zh_TW/figures
@dirrm share/gnome/help/geyes/zh_TW
+@dirrm share/gnome/help/geyes/zh_HK/figures
+@dirrm share/gnome/help/geyes/zh_HK
@dirrm share/gnome/help/geyes/zh_CN/figures
@dirrm share/gnome/help/geyes/zh_CN
@dirrm share/gnome/help/geyes/sv/figures
@@ -1342,11 +1916,33 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/geyes/C/figures
@dirrm share/gnome/help/geyes/C
@dirrm share/gnome/help/geyes
+@dirrm share/gnome/help/drivemount/zh_TW/figures
+@dirrm share/gnome/help/drivemount/zh_TW
+@dirrm share/gnome/help/drivemount/zh_HK/figures
+@dirrm share/gnome/help/drivemount/zh_HK
+@dirrm share/gnome/help/drivemount/zh_CN/figures
+@dirrm share/gnome/help/drivemount/zh_CN
+@dirrm share/gnome/help/drivemount/sv/figures
+@dirrm share/gnome/help/drivemount/sv
+@dirrm share/gnome/help/drivemount/ko/figures
+@dirrm share/gnome/help/drivemount/ko
+@dirrm share/gnome/help/drivemount/ja/figures
+@dirrm share/gnome/help/drivemount/ja
+@dirrm share/gnome/help/drivemount/it/figures
+@dirrm share/gnome/help/drivemount/it
+@dirrm share/gnome/help/drivemount/fr/figures
+@dirrm share/gnome/help/drivemount/fr
+@dirrm share/gnome/help/drivemount/es/figures
+@dirrm share/gnome/help/drivemount/es
+@dirrm share/gnome/help/drivemount/de/figures
+@dirrm share/gnome/help/drivemount/de
@dirrm share/gnome/help/drivemount/C/figures
@dirrm share/gnome/help/drivemount/C
@dirrm share/gnome/help/drivemount
@dirrm share/gnome/help/command-line/zh_TW/figures
@dirrm share/gnome/help/command-line/zh_TW
+@dirrm share/gnome/help/command-line/zh_HK/figures
+@dirrm share/gnome/help/command-line/zh_HK
@dirrm share/gnome/help/command-line/zh_CN/figures
@dirrm share/gnome/help/command-line/zh_CN
@dirrm share/gnome/help/command-line/sv/figures
@@ -1368,14 +1964,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/command-line
@dirrm share/gnome/help/char-palette/zh_TW/figures
@dirrm share/gnome/help/char-palette/zh_TW
+@dirrm share/gnome/help/char-palette/zh_HK/figures
+@dirrm share/gnome/help/char-palette/zh_HK
@dirrm share/gnome/help/char-palette/zh_CN/figures
@dirrm share/gnome/help/char-palette/zh_CN
@dirrm share/gnome/help/char-palette/sv/figures
@dirrm share/gnome/help/char-palette/sv
@dirrm share/gnome/help/char-palette/ko/figures
@dirrm share/gnome/help/char-palette/ko
-@dirrm share/gnome/help/char-palette/ja/figures
-@dirrm share/gnome/help/char-palette/ja
@dirrm share/gnome/help/char-palette/it/figures
@dirrm share/gnome/help/char-palette/it
@dirrm share/gnome/help/char-palette/fr/figures
@@ -1389,6 +1985,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/char-palette
@dirrm share/gnome/help/cdplayer/zh_TW/figures
@dirrm share/gnome/help/cdplayer/zh_TW
+@dirrm share/gnome/help/cdplayer/zh_HK/figures
+@dirrm share/gnome/help/cdplayer/zh_HK
@dirrm share/gnome/help/cdplayer/zh_CN/figures
@dirrm share/gnome/help/cdplayer/zh_CN
@dirrm share/gnome/help/cdplayer/sv/figures
@@ -1408,17 +2006,42 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/cdplayer/C/figures
@dirrm share/gnome/help/cdplayer/C
@dirrm share/gnome/help/cdplayer
+%%BATTERY%%@dirrm share/gnome/help/battstat/zh_TW/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/zh_TW
+%%BATTERY%%@dirrm share/gnome/help/battstat/zh_HK/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/zh_HK
+%%BATTERY%%@dirrm share/gnome/help/battstat/zh_CN/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/zh_CN
+%%BATTERY%%@dirrm share/gnome/help/battstat/sv/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/sv
+%%BATTERY%%@dirrm share/gnome/help/battstat/ko/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/ko
%%BATTERY%%@dirrm share/gnome/help/battstat/ja/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/ja
+%%BATTERY%%@dirrm share/gnome/help/battstat/it/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/it
+%%BATTERY%%@dirrm share/gnome/help/battstat/fr/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/fr
+%%BATTERY%%@dirrm share/gnome/help/battstat/es/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/es
+%%BATTERY%%@dirrm share/gnome/help/battstat/de/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/de
%%BATTERY%%@dirrm share/gnome/help/battstat/C/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/C
%%BATTERY%%@dirrm share/gnome/help/battstat
@dirrm share/gnome/help/accessx-status/C/figures
@dirrm share/gnome/help/accessx-status/C
@dirrm share/gnome/help/accessx-status
+@dirrm share/gnome/gswitchit
+@dirrm share/gnome/geyes/Horrid
+@dirrm share/gnome/geyes/Default-tiny
+@dirrm share/gnome/geyes/Default
+@dirrm share/gnome/geyes/Bloodshot
+@dirrm share/gnome/geyes/Bizarre
@dirrm share/gnome/gen_util
%%BATTERY%%@dirrm share/gnome/battstat_applet
@dirrm libexec/gnome-applets
+@dirrm include/libgswitchit
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/settings
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/defaults
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet
@@ -1436,6 +2059,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gweather
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtik/prefs
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtik
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/Applet
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gkb-applet/prefs
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gkb-applet
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/geyes/prefs
@@ -1451,9 +2076,20 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/settings
@dirrm etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/defaults
@dirrm etc/gconf/gconf.xml.defaults/apps/stickynotes_applet
+@dirrm etc/gconf/gconf.xml.defaults/apps/gswitchit/Applet
+@dirrm etc/gconf/gconf.xml.defaults/apps/gswitchit
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/accessx-status-C.omf 2>/dev/null || /usr/bin/true
%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-de.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-es.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-fr.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-it.omf 2>/dev/null || /usr/bin/true
%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-ko.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-sv.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-zh_CN.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-zh_HK.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-es.omf 2>/dev/null || /usr/bin/true
@@ -1463,16 +2099,17 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-sv.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_HK.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-es.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-fr.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-it.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-ja.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-sv.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-zh_HK.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-de.omf 2>/dev/null || /usr/bin/true
@@ -1483,8 +2120,19 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-sv.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-zh_HK.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-zh_HK.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-es.omf 2>/dev/null || /usr/bin/true
@@ -1494,6 +2142,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-sv.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-zh_HK.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-de.omf 2>/dev/null || /usr/bin/true
@@ -1504,6 +2153,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-sv.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_HK.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-de.omf 2>/dev/null || /usr/bin/true
@@ -1514,6 +2164,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-sv.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_HK.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-de.omf 2>/dev/null || /usr/bin/true
@@ -1524,6 +2175,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-sv.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-zh_HK.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-de.omf 2>/dev/null || /usr/bin/true
@@ -1534,16 +2186,50 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-sv.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_HK.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-es.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-it.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-ja.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-sv.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_HK.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/modemlights-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-zh_HK.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_HK.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-zh_HK.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-zh_TW.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index bfd82d8dd2ec..e27e91a8da7d 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= gnomedesktop
-PORTVERSION= 2.4.1.1
-PORTREVISION= 2
+PORTVERSION= 2.6.0.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-desktop/2.4
+MASTER_SITE_SUBDIR= sources/gnome-desktop/2.6
DISTNAME= gnome-desktop-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -20,7 +19,8 @@ COMMENT= Additional UI API for GNOME 2
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_XPM= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui
+USE_REINPLACE= yes
+USE_GNOME= gnomeprefix gnomehack intlhack lthack gnomehier libgnomeui
GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
USE_BISON= yes
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 886b1521819b..213352fd1c8d 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-desktop-2.4.1.1.tar.bz2) = c85489c7befc79b5cc9bda1b2006cacc
-SIZE (gnome2/gnome-desktop-2.4.1.1.tar.bz2) = 1054097
+MD5 (gnome2/gnome-desktop-2.6.0.1.tar.bz2) = 2d40b7d7a15f23770265246979529327
+SIZE (gnome2/gnome-desktop-2.6.0.1.tar.bz2) = 1077853
diff --git a/x11/gnome-desktop/files/patch-configure b/x11/gnome-desktop/files/patch-configure
deleted file mode 100644
index caf5b493a9eb..000000000000
--- a/x11/gnome-desktop/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Sun May 4 06:56:20 2003
-+++ configure Sun May 4 19:20:27 2003
-@@ -8374,6 +8374,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11/gnome-desktop/pkg-descr b/x11/gnome-desktop/pkg-descr
index 500857a54f14..bda4df7913d6 100644
--- a/x11/gnome-desktop/pkg-descr
+++ b/x11/gnome-desktop/pkg-descr
@@ -1,4 +1,3 @@
-This is a collection of APIs not included in libgnomeui as they have
-not undergone sufficient testing.
+This is a collection of APIs not included in libgnomeui.
WWW: http://www.gnome.org/
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index a3384f7d3a88..9a87be2a25b4 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -21,6 +21,14 @@ share/gnome/help/fdl/C/fdl.xml
share/gnome/help/gnome-feedback/C/gnome-feedback.xml
share/gnome/help/gpl/C/gpl.xml
share/gnome/help/lgpl/C/lgpl.xml
+share/gnome/omf/gnome-desktop/fdl-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/fdl-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/gnome-feedback-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/gnome-feedback-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/gpl-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/gpl-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/lgpl-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/lgpl-C.omf 2>/dev/null || /usr/bin/true
share/gnome/pixmaps/advanced-directory.png
share/gnome/pixmaps/apple-green.png
share/gnome/pixmaps/apple-red.png
@@ -117,6 +125,7 @@ share/gnome/vfolders/Other.directory
share/gnome/vfolders/Root.directory
share/gnome/vfolders/Settings.directory
share/gnome/vfolders/System.directory
+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
share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -131,6 +140,7 @@ share/locale/cy/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/da/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/de/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/el/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/eo/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/es/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -143,6 +153,7 @@ share/locale/ga/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/he/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/hi/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/id/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/is/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -162,6 +173,7 @@ share/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/no/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/pa/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/pl/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/pt/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/pt_BR/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -175,6 +187,7 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/sv/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ta/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/tk/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -182,13 +195,21 @@ share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
-@dirrm share/gnome/help/lgpl/C/figures
-@dirrm share/gnome/help/gpl/C/figures
-@dirrm share/gnome/help/gnome-feedback/C/figures
+@dirrm share/gnome/omf/gnome-desktop
+@dirrm share/gnome/help/lgpl/C
+@dirrm share/gnome/help/lgpl
+@dirrm share/gnome/help/gpl/C
+@dirrm share/gnome/help/gpl
@dirrm share/gnome/help/gnome-feedback/C
@dirrm share/gnome/help/gnome-feedback
-@dirrm share/gnome/help/fdl/C/figures
+@dirrm share/gnome/help/fdl/C
+@dirrm share/gnome/help/fdl
@dirrm share/gnome/gnome-about/headers
+@dirrm share/gnome/gnome-about
@dirrm include/gnome-desktop-2.0/libgnomeui
@dirrm include/gnome-desktop-2.0/libgnome
@dirrm include/gnome-desktop-2.0
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/fdl-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/gnome-feedback-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/gpl-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/lgpl-C.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 56398c8c4dd0..36c2fefb4f95 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= gnomepanel
-PORTVERSION= 2.4.2
-PORTREVISION= 1
+PORTVERSION= 2.6.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-panel/2.4
+MASTER_SITE_SUBDIR= sources/gnome-panel/2.6
DISTNAME= gnome-panel-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -20,8 +19,9 @@ COMMENT= Panel component for the GNOME 2 Desktop
USE_BZIP2= yes
INSTALLS_SHLIB= yes
USE_X_PREFIX= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop libwnck lthack \
- intlhack
+USE_REINPLACE= yes
+USE_GNOME= gnomeprefix gnomehack gnomehier intlhack lthack gnomedesktop \
+ libwnck
GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
USE_LIBTOOL_VER=13
@@ -32,4 +32,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
MAN1= gnome-panel.1 gnome-panel-preferences.1
+post-patch:
+.for po in da.po it.po zh_TW.po
+ @${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po}
+.endfor
+
.include <bsd.port.mk>
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 2e18221ce043..922d7c3b0c78 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-panel-2.4.2.tar.bz2) = d62da1f6cb129f65206a945d93a2fa85
-SIZE (gnome2/gnome-panel-2.4.2.tar.bz2) = 2662404
+MD5 (gnome2/gnome-panel-2.6.0.tar.bz2) = 9e0ad03c9266d342b99837ca4e947b55
+SIZE (gnome2/gnome-panel-2.6.0.tar.bz2) = 2933581
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock.c b/x11/gnome-panel/files/patch-applets_clock_clock.c
index 976764570ff1..ccf5378b135f 100644
--- a/x11/gnome-panel/files/patch-applets_clock_clock.c
+++ b/x11/gnome-panel/files/patch-applets_clock_clock.c
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- applets/clock/clock.c 2002/05/14 14:08:16 1.1
-+++ applets/clock/clock.c 2002/05/14 14:12:56
-@@ -14,7 +14,9 @@
+--- applets/clock/clock.c.orig Tue Jan 13 11:55:58 2004
++++ applets/clock/clock.c Wed Jan 14 15:43:39 2004
+@@ -47,7 +47,9 @@
#include <dirent.h>
#include <string.h>
#include <time.h>
@@ -13,15 +10,15 @@ $FreeBSD$
#include <panel-applet.h>
#include <panel-applet-gconf.h>
-@@ -684,7 +686,11 @@
- cd->hourformat = panel_applet_gconf_get_int (applet, KEY_HOUR_FORMAT, &error);
- if (error || (cd->hourformat != 12 && cd->hourformat != 24)) {
- /* if value is not valid, set it according to locale */
+@@ -539,7 +541,11 @@
+ {
+ const char *am;
+
+#ifdef HAVE_LANGINFO_H
- const char *am = nl_langinfo (AM_STR);
+ am = nl_langinfo (AM_STR);
+#else
-+ const char *am = "AM";
++ am = "AM";
+#endif
- cd->hourformat = (am[0] == '\0') ? 24 : 12;
+ return (am[0] == '\0') ? CLOCK_FORMAT_24 : CLOCK_FORMAT_12;
+ }
- if (error)
diff --git a/x11/gnome-panel/files/patch-configure b/x11/gnome-panel/files/patch-configure
new file mode 100644
index 000000000000..732f3a86022c
--- /dev/null
+++ b/x11/gnome-panel/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig Wed Jan 14 15:54:42 2004
++++ configure Wed Jan 14 15:55:13 2004
+@@ -5536,7 +5536,7 @@
+
+
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+- inttypes.h stdint.h unistd.h
++ inttypes.h stdint.h unistd.h langinfo.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
diff --git a/x11/gnome-panel/files/patch-po_da.po b/x11/gnome-panel/files/patch-po_da.po
deleted file mode 100644
index 96bfea954001..000000000000
--- a/x11/gnome-panel/files/patch-po_da.po
+++ /dev/null
@@ -1,29 +0,0 @@
---- po/da.po.orig Wed Oct 1 15:54:18 2003
-+++ po/da.po Wed Oct 1 15:56:23 2003
-@@ -48,7 +48,7 @@
-
- #: applets/clock/clock.c:227
- msgid "%a %b %d"
--msgstr "%a %-d. %b"
-+msgstr "%a %d. %b"
-
- #. translators: reverse the order of these arguments
- #. * if the time should come before the
-@@ -75,7 +75,7 @@
- #. Show date in tooltip
- #: applets/clock/clock.c:344
- msgid "%A %B %d"
--msgstr "%A den %-d. %B"
-+msgstr "%A den %d. %B"
-
- #: applets/clock/clock.c:472
- msgid "Calendar"
-@@ -95,7 +95,7 @@
-
- #: applets/clock/clock.c:809
- msgid "%A, %B %d %Y"
--msgstr "%A, %-d. %B %Y"
-+msgstr "%A, %d. %B %Y"
-
- #: applets/clock/clock.c:850
- #, c-format
diff --git a/x11/gnome-panel/files/patch-po_it.po b/x11/gnome-panel/files/patch-po_it.po
deleted file mode 100644
index 00118bd344bc..000000000000
--- a/x11/gnome-panel/files/patch-po_it.po
+++ /dev/null
@@ -1,59 +0,0 @@
---- po/it.po.orig Wed Oct 1 15:55:34 2003
-+++ po/it.po Wed Oct 1 15:56:12 2003
-@@ -17,23 +17,23 @@
-
- #: applets/clock/clock.c:219
- msgid "%l:%M:%S %p"
--msgstr "%-I.%M.%S %p"
-+msgstr "%I.%M.%S %p"
-
- #: applets/clock/clock.c:219
- msgid "%l:%M %p"
--msgstr "%-I.%M %p"
-+msgstr "%I.%M %p"
-
- #: applets/clock/clock.c:221 applets/clock/clock.c:773
- msgid "%H:%M:%S"
--msgstr "%-H.%M.%S"
-+msgstr "%H.%M.%S"
-
- #: applets/clock/clock.c:221 applets/clock/clock.c:775
- msgid "%H:%M"
--msgstr "%-H.%M"
-+msgstr "%H.%M"
-
- #: applets/clock/clock.c:227
- msgid "%a %b %d"
--msgstr "%a %-d %b"
-+msgstr "%a %d %b"
-
- #. translators: reverse the order of these arguments
- #. * if the time should come before the
-@@ -60,7 +60,7 @@
- #. Show date in tooltip
- #: applets/clock/clock.c:344
- msgid "%A %B %d"
--msgstr "%A %-d %B"
-+msgstr "%A %d %B"
-
- #: applets/clock/clock.c:472
- msgid "Calendar"
-@@ -72,15 +72,15 @@
-
- #: applets/clock/clock.c:768
- msgid "%I:%M:%S %p"
--msgstr "%-I.%M.%S %p"
-+msgstr "%I.%M.%S %p"
-
- #: applets/clock/clock.c:770
- msgid "%I:%M %p"
--msgstr "%-I.%M %p"
-+msgstr "%I.%M %p"
-
- #: applets/clock/clock.c:809
- msgid "%A, %B %d %Y"
--msgstr "%A, %-d %B %Y"
-+msgstr "%A, %d %B %Y"
-
- #: applets/clock/clock.c:850
- #, c-format
diff --git a/x11/gnome-panel/files/patch-po_zh_TW.po b/x11/gnome-panel/files/patch-po_zh_TW.po
deleted file mode 100644
index 3e7e16c45ddb..000000000000
--- a/x11/gnome-panel/files/patch-po_zh_TW.po
+++ /dev/null
@@ -1,20 +0,0 @@
---- po/zh_TW.po.orig Wed Oct 1 15:57:10 2003
-+++ po/zh_TW.po Wed Oct 1 15:57:19 2003
-@@ -40,7 +40,7 @@
-
- #: applets/clock/clock.c:227
- msgid "%a %b %d"
--msgstr "%-m月%-d日(%a)"
-+msgstr "%m月%d日(%a)"
-
- #. translators: reverse the order of these arguments
- #. * if the time should come before the
-@@ -67,7 +67,7 @@
- #. Show date in tooltip
- #: applets/clock/clock.c:344
- msgid "%A %B %d"
--msgstr "%-m月%-d日(%A)"
-+msgstr "%m月%d日(%A)"
-
- #: applets/clock/clock.c:472
- msgid "Calendar"
diff --git a/x11/gnome-panel/pkg-descr b/x11/gnome-panel/pkg-descr
index 5e73398913a9..263044b5e130 100644
--- a/x11/gnome-panel/pkg-descr
+++ b/x11/gnome-panel/pkg-descr
@@ -1,3 +1,3 @@
-Panel component for the GNOME 2 Desktop.
+This drives the GNOME 2 panel.
WWW: http://www.gnome.org/
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index f10b99a60775..e691400d6c7d 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -64,9 +64,9 @@ etc/gconf/schemas/panel-toplevel.schemas
etc/gconf/schemas/window-list.schemas
etc/gconf/schemas/workspace-switcher.schemas
include/panel-2.0/GNOME_Panel.h
+include/panel-2.0/panel-applet-enums.h
include/panel-2.0/panel-applet-gconf.h
include/panel-2.0/panel-applet.h
-lib/libclock-applet-2.so
lib/libpanel-applet-2.a
lib/libpanel-applet-2.so
lib/libpanel-applet-2.so.0
@@ -76,21 +76,27 @@ libdata/bonobo/servers/GNOME_NotificationAreaApplet.server
libdata/bonobo/servers/GNOME_Panel.server
libdata/bonobo/servers/GNOME_Wncklet_Factory.server
libdata/pkgconfig/libpanelapplet-2.0.pc
+libexec/clock-applet
libexec/fish-applet-2
libexec/notification-area-applet
libexec/wnck-applet
+share/doc/panel-applet/PanelApplet.html
share/doc/panel-applet/applet-popups.html
share/doc/panel-applet/applet-porting.html
share/doc/panel-applet/applet-writing.html
+share/doc/panel-applet/home.png
+share/doc/panel-applet/index.html
share/doc/panel-applet/index.sgml
-share/doc/panel-applet/libpanel-applet.html
+share/doc/panel-applet/left.png
share/doc/panel-applet/multi-applets.html
-share/doc/panel-applet/panel-applet-panel-applet-gconf-utilities.html
+share/doc/panel-applet/panel-applet-Panel-Applet-GConf-Utilities.html
+share/doc/panel-applet/panel-applet.devhelp
share/doc/panel-applet/panel-applet.html
share/doc/panel-applet/panel-signals.html
-share/doc/panel-applet/panelapplet.html
+share/doc/panel-applet/right.png
share/doc/panel-applet/server-files.html
share/doc/panel-applet/session-saving.html
+share/doc/panel-applet/up.png
share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop
share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml
share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml
@@ -129,9 +135,6 @@ share/gnome/help/clock/ko/legal.xml
share/gnome/help/clock/sv/clock.xml
share/gnome/help/clock/sv/figures/clock_applet.png
share/gnome/help/clock/sv/legal.xml
-share/gnome/help/clock/uk/clock.xml
-share/gnome/help/clock/uk/figures/clock_applet.png
-share/gnome/help/clock/uk/legal.xml
share/gnome/help/clock/zh_CN/clock.xml
share/gnome/help/clock/zh_CN/figures/clock_applet.png
share/gnome/help/clock/zh_CN/legal.xml
@@ -168,9 +171,6 @@ share/gnome/help/fish-applet-2/sv/figures/fish_applet.png
share/gnome/help/fish-applet-2/sv/figures/fish_settings.png
share/gnome/help/fish-applet-2/sv/fish-applet-2.xml
share/gnome/help/fish-applet-2/sv/legal.xml
-share/gnome/help/fish-applet-2/uk/figures/fish_applet.png
-share/gnome/help/fish-applet-2/uk/fish-applet-2.xml
-share/gnome/help/fish-applet-2/uk/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
@@ -217,10 +217,6 @@ share/gnome/help/window-list/sv/figures/window_list_group.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.png
share/gnome/help/window-list/zh_CN/figures/window_list_group_applet.png
@@ -261,9 +257,6 @@ share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png
share/gnome/help/workspace-switcher/sv/figures/workspacelist_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/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
@@ -289,8 +282,6 @@ share/gnome/omf/gnome-panel/clock-ko.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-ko.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/clock-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-sv.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-panel/clock-uk.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-uk.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/clock-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-zh_CN.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/clock-zh_TW.omf
@@ -311,8 +302,6 @@ share/gnome/omf/gnome-panel/fish-applet-2-ko.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ko.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/fish-applet-2-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-sv.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-panel/fish-applet-2-uk.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-uk.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf
@@ -333,8 +322,6 @@ share/gnome/omf/gnome-panel/window-list-ko.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-ko.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/window-list-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-sv.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-panel/window-list-uk.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-uk.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/window-list-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-zh_CN.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/window-list-zh_TW.omf
@@ -355,8 +342,6 @@ share/gnome/omf/gnome-panel/workspace-switcher-ko.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ko.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/workspace-switcher-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-sv.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-panel/workspace-switcher-uk.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-uk.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf
@@ -385,7 +370,6 @@ share/gnome/pixmaps/gnome-panel-type-sliding.png
share/gnome/pixmaps/gnome-panel.png
share/gnome/pixmaps/gnome-run.png
share/gnome/pixmaps/gnome-screenshot.png
-share/gnome/pixmaps/gnome-show-desktop.png
share/gnome/pixmaps/panel-drawer.png
share/gnome/pixmaps/panel-force-quit.png
share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
@@ -400,6 +384,7 @@ share/locale/cy/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/da/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/de/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/el/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/eo/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/es/LC_MESSAGES/gnome-panel-2.0.mo
@@ -412,6 +397,7 @@ share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/he/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/hi/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
@@ -423,10 +409,12 @@ share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/mk/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ml/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/mr/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/no/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/pa/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/pl/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/pt/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/pt_BR/LC_MESSAGES/gnome-panel-2.0.mo
@@ -437,8 +425,10 @@ share/locale/sl/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/sq/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/sr/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/sr@ije/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/sv/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ta/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/vi/LC_MESSAGES/gnome-panel-2.0.mo
@@ -452,8 +442,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@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/uk
@dirrm share/gnome/help/workspace-switcher/sv/figures
@dirrm share/gnome/help/workspace-switcher/sv
@dirrm share/gnome/help/workspace-switcher/ko/figures
@@ -475,8 +463,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@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/ko/figures
@@ -498,8 +484,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@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/uk/figures
-@dirrm share/gnome/help/fish-applet-2/uk
@dirrm share/gnome/help/fish-applet-2/sv/figures
@dirrm share/gnome/help/fish-applet-2/sv
@dirrm share/gnome/help/fish-applet-2/ko/figures
@@ -521,8 +505,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm share/gnome/help/clock/zh_TW
@dirrm share/gnome/help/clock/zh_CN/figures
@dirrm share/gnome/help/clock/zh_CN
-@dirrm share/gnome/help/clock/uk/figures
-@dirrm share/gnome/help/clock/uk
@dirrm share/gnome/help/clock/sv/figures
@dirrm share/gnome/help/clock/sv
@dirrm share/gnome/help/clock/ko/figures
@@ -601,7 +583,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-ja.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-uk.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-zh_CN.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true
@@ -612,7 +593,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ja.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-uk.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true
@@ -623,7 +603,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-ja.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-uk.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-zh_CN.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true
@@ -634,6 +613,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ja.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-uk.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 6dbda489a1a5..857eaa4af5c1 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -6,16 +6,16 @@
#
PORTNAME= gnomesession
-PORTVERSION= 2.4.2
-PORTREVISION= 1
+PORTVERSION= 2.6.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME} \
+ http://people.FreeBSD.org/~marcus/:local \
${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR= sources/gnome-session/2.4 \
+MASTER_SITE_SUBDIR= sources/gnome-session/2.6 \
marcus/:local
DISTNAME= gnome-session-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- splash.png:local
+ ${SPLASH_IMG}:local
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -23,7 +23,7 @@ COMMENT= Session component for the GNOME 2 desktop
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui
+USE_GNOME= gnomeprefix gnomehack gnomehier intlhack lthack libgnomeui
USE_GMAKE= yes
USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
@@ -33,11 +33,13 @@ MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \
gnome-session-save.1
MAN5= default.session.5
+SPLASH_IMG= gnome-splash04-12.png
+
post-extract:
- @${CP} ${DISTDIR}/${DIST_SUBDIR}/splash.png ${WRKDIR}
+ @${CP} ${DISTDIR}/${DIST_SUBDIR}/${SPLASH_IMG} ${WRKDIR}
post-install:
- ${INSTALL_DATA} ${WRKDIR}/splash.png \
+ ${INSTALL_DATA} ${WRKDIR}/${SPLASH_IMG} \
${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png
.include <bsd.port.mk>
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 0a06b2a8ed0e..56764710a045 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnome2/gnome-session-2.4.2.tar.bz2) = fc2e6d9c71b4d1fe08ec329d7e03684e
-SIZE (gnome2/gnome-session-2.4.2.tar.bz2) = 911570
-MD5 (gnome2/splash.png) = bd73a8a1f0c97aac669045f6b9b1fe02
-SIZE (gnome2/splash.png) = 59161
+MD5 (gnome2/gnome-session-2.6.0.tar.bz2) = 42018f3e5f201a4f449de444c600ce29
+SIZE (gnome2/gnome-session-2.6.0.tar.bz2) = 836172
+MD5 (gnome2/gnome-splash04-12.png) = a26cafb0ccffd5e173d7255e683faafd
+SIZE (gnome2/gnome-splash04-12.png) = 75841
diff --git a/x11/gnome-session/files/patch-configure b/x11/gnome-session/files/patch-configure
deleted file mode 100644
index 61084626cb14..000000000000
--- a/x11/gnome-session/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Wed May 8 14:27:04 2002
-+++ configure Wed May 8 14:27:23 2002
-@@ -7232,6 +7232,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11/gnome-session/files/patch-gnome-session_gnome-session.schemas.in.in b/x11/gnome-session/files/patch-gnome-session_gnome-session.schemas.in.in
deleted file mode 100644
index 9bd6c9a2cf68..000000000000
--- a/x11/gnome-session/files/patch-gnome-session_gnome-session.schemas.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-session/gnome-session.schemas.in.in.orig Mon Oct 14 17:18:15 2002
-+++ gnome-session/gnome-session.schemas.in.in Mon Oct 14 17:17:44 2002
-@@ -50,7 +50,7 @@
- <applyto>/apps/gnome-session/options/splash_image</applyto>
- <owner>gnome</owner>
- <type>string</type>
-- <default>@prefix@/share/pixmaps/splash/gnome-splash.png</default>
-+ <default>@datadir@/pixmaps/splash/gnome-splash.png</default>
- <locale name="C">
- <short>Splash Screen Image</short>
- <long>Preferred Image to use for the splash screen when logging in to the GNOME Desktop</long>
diff --git a/x11/gnome-session/pkg-descr b/x11/gnome-session/pkg-descr
index e0a6dd0276ff..50986ef910b2 100644
--- a/x11/gnome-session/pkg-descr
+++ b/x11/gnome-session/pkg-descr
@@ -1,2 +1,2 @@
-Session component for the GNOME 2.0 desktop. This package contains the
-commands needed to start GNOME 2.0.
+This provides session management for the GNOME 2 desktop, and
+provides the tools used to start the desktop.
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index d4fc0ded7788..355893a4e9d8 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -26,6 +26,7 @@ share/locale/cy/LC_MESSAGES/gnome-session-2.0.mo
share/locale/da/LC_MESSAGES/gnome-session-2.0.mo
share/locale/de/LC_MESSAGES/gnome-session-2.0.mo
share/locale/el/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-session-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-session-2.0.mo
share/locale/eo/LC_MESSAGES/gnome-session-2.0.mo
share/locale/es/LC_MESSAGES/gnome-session-2.0.mo
@@ -38,6 +39,7 @@ share/locale/ga/LC_MESSAGES/gnome-session-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-session-2.0.mo
share/locale/he/LC_MESSAGES/gnome-session-2.0.mo
share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-session-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-session-2.0.mo
share/locale/id/LC_MESSAGES/gnome-session-2.0.mo
share/locale/is/LC_MESSAGES/gnome-session-2.0.mo
@@ -50,10 +52,12 @@ share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo
share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ml/LC_MESSAGES/gnome-session-2.0.mo
share/locale/mn/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/mr/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo
share/locale/no/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/pa/LC_MESSAGES/gnome-session-2.0.mo
share/locale/pl/LC_MESSAGES/gnome-session-2.0.mo
share/locale/pt/LC_MESSAGES/gnome-session-2.0.mo
share/locale/pt_BR/LC_MESSAGES/gnome-session-2.0.mo
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index d9e6311b68f2..377dc9186d6b 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= gnometerminal
-PORTVERSION= 2.4.2
-PORTREVISION= 1
+PORTVERSION= 2.6.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-terminal/2.4
+MASTER_SITE_SUBDIR= sources/gnome-terminal/2.6
DISTNAME= gnome-terminal-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -19,8 +18,9 @@ COMMENT= Terminal component for the GNOME 2 Desktop
USE_BZIP2= yes
USE_X_PREFIX= yes
+USE_REINPLACE= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui vte
+USE_GNOME= gnomeprefix gnomehack intlhack lthack gnomehier libgnomeui vte
USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index 44e6dc6d5d8b..c497086810d0 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-terminal-2.4.2.tar.bz2) = ce7e5a207eb48c5ef23325c406536c33
-SIZE (gnome2/gnome-terminal-2.4.2.tar.bz2) = 1658743
+MD5 (gnome2/gnome-terminal-2.6.0.tar.bz2) = bbb9d4d6bddaec8611d4c002842ec5b8
+SIZE (gnome2/gnome-terminal-2.6.0.tar.bz2) = 1911916
diff --git a/x11/gnome-terminal/files/patch-configure b/x11/gnome-terminal/files/patch-configure
deleted file mode 100644
index b393b3039c70..000000000000
--- a/x11/gnome-terminal/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Thu May 2 00:36:18 2002
-+++ configure Thu May 2 00:37:15 2002
-@@ -6414,6 +6414,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11/gnome-terminal/pkg-descr b/x11/gnome-terminal/pkg-descr
index eca945789b32..1193c30f736a 100644
--- a/x11/gnome-terminal/pkg-descr
+++ b/x11/gnome-terminal/pkg-descr
@@ -1,3 +1,3 @@
-Terminal component for the GNOME 2.0 Desktop.
+Default terminal emulator for the GNOME 2.0 Desktop.
WWW: http://www.gnome.org/
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index 43c24a4f2676..d3648bdea305 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -104,6 +104,7 @@ share/locale/cy/LC_MESSAGES/gnome-terminal.mo
share/locale/da/LC_MESSAGES/gnome-terminal.mo
share/locale/de/LC_MESSAGES/gnome-terminal.mo
share/locale/el/LC_MESSAGES/gnome-terminal.mo
+share/locale/en_CA/LC_MESSAGES/gnome-terminal.mo
share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo
share/locale/es/LC_MESSAGES/gnome-terminal.mo
share/locale/et/LC_MESSAGES/gnome-terminal.mo
@@ -114,6 +115,7 @@ share/locale/ga/LC_MESSAGES/gnome-terminal.mo
share/locale/gl/LC_MESSAGES/gnome-terminal.mo
share/locale/he/LC_MESSAGES/gnome-terminal.mo
share/locale/hi/LC_MESSAGES/gnome-terminal.mo
+share/locale/hr/LC_MESSAGES/gnome-terminal.mo
share/locale/hu/LC_MESSAGES/gnome-terminal.mo
share/locale/id/LC_MESSAGES/gnome-terminal.mo
share/locale/it/LC_MESSAGES/gnome-terminal.mo
@@ -126,6 +128,7 @@ share/locale/ml/LC_MESSAGES/gnome-terminal.mo
share/locale/mn/LC_MESSAGES/gnome-terminal.mo
share/locale/ms/LC_MESSAGES/gnome-terminal.mo
share/locale/nl/LC_MESSAGES/gnome-terminal.mo
+share/locale/nn/LC_MESSAGES/gnome-terminal.mo
share/locale/no/LC_MESSAGES/gnome-terminal.mo
share/locale/pl/LC_MESSAGES/gnome-terminal.mo
share/locale/pt/LC_MESSAGES/gnome-terminal.mo
@@ -139,6 +142,7 @@ share/locale/sr/LC_MESSAGES/gnome-terminal.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-terminal.mo
share/locale/sv/LC_MESSAGES/gnome-terminal.mo
share/locale/ta/LC_MESSAGES/gnome-terminal.mo
+share/locale/th/LC_MESSAGES/gnome-terminal.mo
share/locale/tr/LC_MESSAGES/gnome-terminal.mo
share/locale/uk/LC_MESSAGES/gnome-terminal.mo
share/locale/vi/LC_MESSAGES/gnome-terminal.mo
diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile
index 0da63b4583d6..d26cdc2ac887 100644
--- a/x11/gnome2-fifth-toe/Makefile
+++ b/x11/gnome2-fifth-toe/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnome2-fifth-toe
-PORTVERSION= 2.4.2
+PORTVERSION= 2.6.0
CATEGORIES= x11 gnome
MASTER_SITES= # empty
DISTFILES= # empty
@@ -25,16 +25,17 @@ RUN_DEPENDS= pan:${PORTSDIR}/news/pan2 \
tsclient:${PORTSDIR}/net/tsclient \
galeon:${PORTSDIR}/www/galeon2 \
seahorse:${PORTSDIR}/security/seahorse \
- ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libindustrial.so:${PORTSDIR}/x11-toolkits/gnome-themes-extras \
+ ${X11BASE}/lib/gtk-2.0/2.4.0/engines/libindustrial.so:${PORTSDIR}/x11-toolkits/gnome-themes-extras \
bluefish:${PORTSDIR}/www/bluefish-devel \
gossip:${PORTSDIR}/net/gossip \
inkscape:${PORTSDIR}/graphics/inkscape \
straw:${PORTSDIR}/net/straw \
liferea:${PORTSDIR}/net/liferea \
- rhythmbox:${PORTSDIR}/audio/rhythmbox \
- jamboree:${PORTSDIR}/audio/jamboree \
+ gnotime:${PORTSDIR}/deskutils/gnotime \
sound-juicer:${PORTSDIR}/audio/sound-juicer \
- gnotime:${PORTSDIR}/deskutils/gnotime
+ rhythmbox:${PORTSDIR}/audio/rhythmbox
+# not yet buildable under GNOME 2.5
+# jamboree:${PORTSDIR}/audio/jamboree
.if !defined(PACKAGE_BUILDING) && !defined(PARALLEL_PACKAGE_BUILD)
RUN_DEPENDS+= totem:${PORTSDIR}/multimedia/totem
diff --git a/x11/gnome2-fifth-toe/pkg-descr b/x11/gnome2-fifth-toe/pkg-descr
index 0de4441563e8..afa6e891d983 100644
--- a/x11/gnome2-fifth-toe/pkg-descr
+++ b/x11/gnome2-fifth-toe/pkg-descr
@@ -1,7 +1,8 @@
GNOME 2 "Fifth Toe"
The Fifth Toe is a collection of stable GNOME 2 applications that
-many users expect to be part of a usable desktop. This includes image
-manipulation programs, chat applications, music and multimedia players, etc.
+many users expect to be part of a usable desktop. Included are image
+manipulation programs, chat applications, music and multimedia players,
+much more.
WWW: http://www.FreeBSD.org/gnome/
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index f691b5ee1c35..23389eccc204 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnome2
-PORTVERSION= 2.4.2
+PORTVERSION= 2.6.0
CATEGORIES= x11 gnome
MASTER_SITES= # empty
PKGNAMESUFFIX= -lite
@@ -36,7 +36,8 @@ RUN_DEPENDS= ${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \
gcalctool:${PORTSDIR}/math/gcalctool \
gucharmap:${PORTSDIR}/deskutils/gucharmap \
gst-thumbnail:${PORTSDIR}/multimedia/nautilus-media \
- ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
+ ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
+ gconf-editor:${PORTSDIR}/sysutils/gconf-editor
NO_BUILD= yes
diff --git a/x11/gnome2-lite/pkg-descr b/x11/gnome2-lite/pkg-descr
index 4fd87114cf26..1c85098c16ff 100644
--- a/x11/gnome2-lite/pkg-descr
+++ b/x11/gnome2-lite/pkg-descr
@@ -1,8 +1,15 @@
GNU Network Object Model Environment
-This package does not contain anything by itself -- it is a
-"meta-port" that depends on other GNOME packages. Its sole purpose is
-to require dependencies so users can install the basic set of
-components necessary to start a GNOME 2 desktop session.
+This metaport installs the pieces of the GNOME 2 desktop that
+are needed to provide a functional desktop. x11/gnome2
+contains the full version of the GNOME 2 desktop environment.
+
+Other popular GNOME applications can be installed from the other
+GNOME 2 metaports:
+
+ * x11/gnome2-fifth-toe
+ * x11/gnome2-power-tools
+ * editors/gnome2-office
+ * devel/gnome2-hacker-tools
WWW: http://www.FreeBSD.org/gnome/
diff --git a/x11/gnome2-lite/pkg-install b/x11/gnome2-lite/pkg-install
index 892e5ee4c4cd..2480ec6099a7 100644
--- a/x11/gnome2-lite/pkg-install
+++ b/x11/gnome2-lite/pkg-install
@@ -1,9 +1,5 @@
#!/bin/sh
-if [ -n "${PACKAGE_BUILDING}" ]; then
- exit 0
-fi
-
PATH=/bin:/usr/bin:/sbin:/usr/sbin:${PATH}
export PATH
diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile
index 022b1cb72b16..7a17343ca01d 100644
--- a/x11/gnome2-power-tools/Makefile
+++ b/x11/gnome2-power-tools/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnome2-power-tools
-PORTVERSION= 2.4.2
+PORTVERSION= 2.6.0
CATEGORIES= x11 gnome
MASTER_SITES= # empty
DISTFILES= # empty
@@ -15,18 +15,14 @@ EXTRACT_ONLY= # empty
MAINTAINER= gnome@FreeBSD.org
COMMENT= "Geektoys" for the GNOME 2 power user
-RUN_DEPENDS= ${X11BASE}/lib/gnome-vfs-2.0/modules/libsmb.so:${PORTSDIR}/devel/gnomevfs-extras \
+RUN_DEPENDS= ${X11BASE}/lib/epiphany/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \
gnome-pkgview:${PORTSDIR}/sysutils/gnome-pkgview \
- ${X11BASE}/lib/libquicklounge-applet.so:${PORTSDIR}/misc/quick-lounge-applet \
- gswitchit-plugins-capplet:${PORTSDIR}/x11/gswitchit \
- dasher:${PORTSDIR}/accessibility/dasher \
+ ${X11BASE}/libexec/quick-lounge-applet:${PORTSDIR}/misc/quick-lounge-applet \
${X11BASE}/libexec/netspeed_applet2:${PORTSDIR}/net/netspeed_applet \
- ${X11BASE}/lib/gedit-2/plugins/libasciitable.so:${PORTSDIR}/editors/gedit-plugins \
- gdesklets:${PORTSDIR}/deskutils/gdesklets \
${LOCALBASE}/sbin/gkrellmd:${PORTSDIR}/sysutils/gkrellm2 \
- ${X11BASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnomenetstatus \
splashsetter:${PORTSDIR}/deskutils/splashsetter \
- gnome-netinfo:${PORTSDIR}/net/gnomenetwork
+ gnome-netinfo:${PORTSDIR}/net/gnomenetwork \
+ gdesklets:${PORTSDIR}/deskutils/gdesklets
NO_BUILD= yes
diff --git a/x11/gnome2-power-tools/pkg-descr b/x11/gnome2-power-tools/pkg-descr
index a5e962aa0cbb..041e159b9219 100644
--- a/x11/gnome2-power-tools/pkg-descr
+++ b/x11/gnome2-power-tools/pkg-descr
@@ -1,11 +1,11 @@
GNOME 2 Power Tools
Power Tools is every GNOME geek's Batbelt. It fills the gap between the
-core GNOME Desktop, which tries to be a relevant set of modules for all users;
-and the Fifth Toe, which is the collection of the coolest and most useful
-GNOME applications.
+core GNOME Desktop, which tries to be a relevant set of modules for all
+users; and the Fifth Toe, which is the collection of the coolest and most
+useful GNOME applications.
-This collection consists of utilities and applets for the technically minded
+This collection consists of utilities and applets for the technically-minded
GNOME user. It also contains many useful add-on utilities for some of the
applications found in the Desktop and Fifth Toe.
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 1e53eaad346c..87f504646fc9 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnome2
-PORTVERSION= 2.4.2
+PORTVERSION= 2.6.0
CATEGORIES= x11 gnome
MASTER_SITES= # empty
DISTFILES= # empty
@@ -37,7 +37,6 @@ RUN_DEPENDS= ${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \
file-roller:${PORTSDIR}/archivers/fileroller \
${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-toolkits/gnome-themes \
ggv:${PORTSDIR}/print/ggv2 \
- acme:${PORTSDIR}/multimedia/acme \
gok:${PORTSDIR}/accessibility/gok \
gpdf:${PORTSDIR}/graphics/gpdf \
nautilus-cd-burner:${PORTSDIR}/sysutils/nautilus-cd-burner \
@@ -46,14 +45,14 @@ RUN_DEPENDS= ${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \
zenity:${PORTSDIR}/x11/zenity \
gst-thumbnail:${PORTSDIR}/multimedia/nautilus-media \
${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
- gnopernicus:${PORTSDIR}/accessibility/gnopernicus
+ gnopernicus:${PORTSDIR}/accessibility/gnopernicus \
+ ${X11BASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnomenetstatus \
+ dasher:${PORTSDIR}/accessibility/dasher
NO_BUILD= yes
USE_PYTHON= yes
-CONFLICTS= gnome2-lite*
-
.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
pre-configure:
@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
@@ -63,12 +62,12 @@ do-install: # empty
.include <bsd.port.pre.mk>
-.if ${ARCH} != "amd64" && ( ${ARCH} == "i386" || ${OSVERSION} > 500035 )
+.if ${ARCH} == "i386" || ${OSVERSION} > 500035
RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany
.endif
-#.if ${ARCH} == "i386"
+.if ${ARCH} == "i386"
#RUN_DEPENDS+= gnomemeeting:${PORTSDIR}/net/gnomemeeting
-#.endif
+.endif
.include <bsd.port.post.mk>
diff --git a/x11/gnome2/pkg-descr b/x11/gnome2/pkg-descr
index 8632de99722e..a7051fc7b5cd 100644
--- a/x11/gnome2/pkg-descr
+++ b/x11/gnome2/pkg-descr
@@ -1,9 +1,12 @@
GNU Network Object Model Environment
-This package does not contain anything by itself -- it is a
-"meta-port" that depends on other GNOME packages. Its sole purpose is
-to require dependencies so users can install this package only and
-have all the GNOME 2 stuff pulled in by the port/package dependency
-mechanism.
+This metaport installs the entire GNOME 2 desktop, including
+the the most common user applications. Other popular GNOME
+applications can be installed from the other GNOME 2 metaports:
+
+ * x11/gnome2-fifth-toe
+ * x11/gnome2-power-tools
+ * editors/gnome2-office
+ * devel/gnome2-hacker-tools
WWW: http://www.FreeBSD.org/gnome/
diff --git a/x11/gnome2/pkg-install b/x11/gnome2/pkg-install
index 1324bb12a5b0..870432d238a3 100644
--- a/x11/gnome2/pkg-install
+++ b/x11/gnome2/pkg-install
@@ -1,9 +1,5 @@
#!/bin/sh
-if [ -n "${PACKAGE_BUILDING}" ]; then
- exit 0
-fi
-
PATH=/bin:/usr/bin:/sbin:/usr/sbin:${PATH}
export PATH
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index ca1d3573a6ff..d8acc579f014 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -6,24 +6,25 @@
#
PORTNAME= gnomeapplets2
-PORTVERSION= 2.4.2
-PORTREVISION= 1
+PORTVERSION= 2.6.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-applets/2.4
+MASTER_SITE_SUBDIR= sources/gnome-applets/2.6
DISTNAME= gnome-applets-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Applets components for the Gnome 2 Desktop Environment
-LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop2
+LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop2 \
+ xklavier.8:${PORTSDIR}/x11/libxklavier
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_REINPLACE= yes
GNOME_DESKTOP_VERSION=2
-USE_GNOME= gnomehier gnomeprefix gnomehack gnomepanel gail
+USE_GNOME= gnomehier gnomeprefix gnomehack intlhack lthack gnomepanel gail
USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -31,9 +32,10 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
.include <bsd.port.pre.mk>
.if ${ARCH} != "i386"
-PLIST_SUB= BATTERY="@comment "
+CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC"
+PLIST_SUB= BATTERY="@comment "
.else
-PLIST_SUB= BATTERY=""
+PLIST_SUB= BATTERY=""
.endif
.include <bsd.port.post.mk>
diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
index f42065cf1b1e..aa222f7bdcb0 100644
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-applets-2.4.2.tar.bz2) = 3a59c7f5b452e4f9675dfce44a2b3433
-SIZE (gnome2/gnome-applets-2.4.2.tar.bz2) = 4057266
+MD5 (gnome2/gnome-applets-2.6.0.tar.bz2) = 9c2dcde8fc94dd43f8aa7be52ca9c103
+SIZE (gnome2/gnome-applets-2.6.0.tar.bz2) = 4643605
diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa
index 6638e387efc9..73b0823ce82e 100644
--- a/x11/gnomeapplets2/files/patch-aa
+++ b/x11/gnomeapplets2/files/patch-aa
@@ -1,14 +1,6 @@
---- configure.orig Mon Sep 8 20:00:28 2003
-+++ configure Wed Sep 24 23:29:28 2003
-@@ -8250,6 +8250,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -11792,6 +11793,7 @@
+--- configure.orig Sun Feb 22 19:22:49 2004
++++ configure Sun Feb 22 19:24:33 2004
+@@ -22912,6 +22912,7 @@
*irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";;
*linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";;
*netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";;
@@ -16,16 +8,16 @@
*solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;;
esac
case "$host" in
-@@ -11856,7 +11858,7 @@
+@@ -23034,7 +23035,7 @@
;;
- # list of supported OS cores
-- *-*-linux*|*-*-freebsd*|*-*-openbsd*)
-+ *-*-linux*|i386-*-freebsd*|*-*-openbsd*)
- echo "$as_me:$LINENO: checking for apm_read in -lapm" >&5
- echo $ECHO_N "checking for apm_read in -lapm... $ECHO_C" >&6
- if test "${ac_cv_lib_apm_apm_read+set}" = set; then
-@@ -13646,14 +13648,14 @@
+ # list of supported OS cores that do not use libapm
+- *-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
++ i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
+ ;;
+ *)
+ echo "warning: ${host} is not supported by battstat_applet, not building" >&2
+@@ -24905,14 +24906,14 @@
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
cat >>confdefs.h <<_ACEOF
diff --git a/x11/gnomeapplets2/files/patch-battstat_Makefile.in b/x11/gnomeapplets2/files/patch-battstat_Makefile.in
deleted file mode 100644
index 6ddfc03c3b07..000000000000
--- a/x11/gnomeapplets2/files/patch-battstat_Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
---- battstat/Makefile.in.orig Tue Sep 23 00:11:20 2003
-+++ battstat/Makefile.in Tue Sep 23 00:14:03 2003
-@@ -154,11 +154,11 @@
- pixmapsdir = $(datadir)/pixmaps
- pixmaps_DATA = battstat.png
- @HAVE_LIBAPM_TRUE@APMLIB = @HAVE_LIBAPM_TRUE@-lapm
--@HAVE_LIBAPM_FALSE@APMLIB = @HAVE_LIBAPM_FALSE@apmlib/libapm.a
-+@HAVE_LIBAPM_FALSE@APMLIB =
- @HAVE_LIBAPM_TRUE@APMDIR =
--@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_FALSE@apmlib
-+@HAVE_LIBAPM_FALSE@APMDIR =
- @HAVE_LIBAPM_TRUE@APMINC =
--@HAVE_LIBAPM_FALSE@APMINC = @HAVE_LIBAPM_FALSE@-Iapmlib/
-+@HAVE_LIBAPM_FALSE@APMINC =
-
- SUBDIRS = docs sounds $(APMDIR)
-
-@@ -230,8 +230,7 @@
- @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = \
- @HAVE_LIBAPM_TRUE@$(top_builddir)/screen-exec/libscreen-exec.la
- @HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES = \
--@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la \
--@HAVE_LIBAPM_FALSE@apmlib/libapm.a
-+@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la
- battstat_applet_2_LDFLAGS =
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/x11/gnomeapplets2/files/patch-multiload::linux-proc.c b/x11/gnomeapplets2/files/patch-multiload::linux-proc.c
deleted file mode 100644
index 9eb916f2b59f..000000000000
--- a/x11/gnomeapplets2/files/patch-multiload::linux-proc.c
+++ /dev/null
@@ -1,84 +0,0 @@
---- multiload/linux-proc.c.orig Thu Jul 10 04:26:58 2003
-+++ multiload/linux-proc.c Mon Nov 17 23:54:38 2003
-@@ -5,12 +5,17 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <assert.h>
-+#ifdef __FreeBSD__
-+#include <sys/socket.h>
-+#include <net/if.h>
-+#endif
-
- #include <glibtop.h>
- #include <glibtop/cpu.h>
- #include <glibtop/mem.h>
- #include <glibtop/swap.h>
- #include <glibtop/loadavg.h>
-+#include <glibtop/netload.h>
-
- #include "linux-proc.h"
-
-@@ -33,6 +38,10 @@
- static unsigned needed_loadavg_flags =
- (1 << GLIBTOP_LOADAVG_LOADAVG);
-
-+static unsigned needed_netload_flags =
-+(1 << GLIBTOP_NETLOAD_IF_FLAGS) +
-+(1 << GLIBTOP_NETLOAD_BYTES_TOTAL);
-+
- void
- GetLoad (int Maximum, int data [4], LoadGraph *g)
- {
-@@ -236,6 +245,44 @@
- int delta[COUNT_TYPES], i;
- static int ticks = 0;
- static gulong past[COUNT_TYPES] = {0};
-+#ifdef __FreeBSD__
-+ struct if_nameindex *ifindex, *ifptr;
-+ static int max = 500;
-+
-+ ifindex = if_nameindex();
-+ if (!ifindex)
-+ return;
-+
-+ memset(present, 0, sizeof (present));
-+
-+ for (ifptr = ifindex; ifptr->if_index && ifptr->if_name; ifptr++)
-+ {
-+ int index;
-+ glibtop_netload netload;
-+
-+ glibtop_get_netload(&netload, ifptr->if_name);
-+ if (!netload.flags)
-+ continue;
-+
-+ assert ((netload.flags & needed_netload_flags) == needed_netload_flags);
-+
-+ if (!(netload.if_flags & (1L << GLIBTOP_IF_FLAGS_UP)))
-+ continue;
-+ if (netload.if_flags & (1L << GLIBTOP_IF_FLAGS_LOOPBACK))
-+ continue;
-+
-+ if (netload.if_flags & (1L << GLIBTOP_IF_FLAGS_POINTOPOINT)) {
-+ index = strncmp(ifptr->if_name, "sl", 2) ? PPP_COUNT : SLIP_COUNT;
-+ } else {
-+ index = ETH_COUNT;
-+ }
-+
-+ present[index] += netload.bytes_total;
-+ }
-+
-+ if_freenameindex(ifindex);
-+
-+#else
- static char *netdevfmt = NULL;
- char *cp, buffer[256];
- FILE *fp;
-@@ -317,6 +364,7 @@
- }
-
- fclose(fp);
-+#endif
-
- for (i = 0; i < 5; i++)
- data[i] = 0;
diff --git a/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in b/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in
deleted file mode 100644
index 973b7e342c3e..000000000000
--- a/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- stickynotes/Makefile.in.orig Thu Aug 28 01:00:09 2003
-+++ stickynotes/Makefile.in Thu Aug 28 01:00:26 2003
-@@ -142,7 +142,7 @@
-
- SUBDIRS = pixmaps docs
-
--CFLAGS = -Wall -g
-+CFLAGS += -Wall -g
-
- INCLUDES = -I. -I$(srcdir) $(GNOME_APPLETS_CFLAGS) $(LIBGLADE_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DSTICKYNOTES_GLADEDIR=\"$(gladedir)\" -DSTICKYNOTES_ICONDIR=\"$(icondir)\"
-
diff --git a/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c b/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c
index 1f1af0974a9d..650c4694ad35 100644
--- a/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c
+++ b/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c
@@ -1,5 +1,5 @@
---- wireless/wireless-applet.c.orig Mon Oct 27 15:52:14 2003
-+++ wireless/wireless-applet.c Fri Jan 16 16:47:14 2004
+--- wireless/wireless-applet.c.orig Tue Oct 21 19:06:53 2003
++++ wireless/wireless-applet.c Sat Jan 3 19:26:43 2004
@@ -30,6 +30,15 @@
#include <math.h>
#include <dirent.h>
@@ -72,7 +72,7 @@
wireless_applet_draw (applet, percent);
}
-@@ -235,22 +260,180 @@
+@@ -235,22 +260,179 @@
}
}
@@ -116,7 +116,7 @@
+static void
+get_wi_data (WirelessApplet *applet, char *device, long int *level)
+{
-+ struct wi_req wreq;
++ struct wi_req wreq;
+ long int signal_strength;
+
+ bzero((char *)&wreq, sizeof(wreq));
@@ -156,9 +156,9 @@
+
+ if (ioctl(s, SIOCGAIRONET, &ifr) == -1) {
+ gtk_tooltips_set_tip (applet->tips,
-+ GTK_WIDGET (applet),
-+ "ioctl Error",
-+ NULL);
++ GTK_WIDGET (applet),
++ "ioctl Error",
++ NULL);
+ return 0;
+ }
+
@@ -169,7 +169,7 @@
+static void
+get_an_data (WirelessApplet *applet, char *device, long int *level)
+{
-+ struct an_req areq;
++ struct an_req areq;
+ struct an_ltv_status *sts;
+#ifdef AN_RID_RSSI_MAP
+ struct an_ltv_rssi_map an_rssimap;
@@ -192,13 +192,13 @@
+#ifdef AN_RID_RSSI_MAP
+ if (rssimap_valid)
+ signal_strength = (long int)(an_rssimap.an_entries[
-+ sts->an_normalized_strength].an_rss_pct);
++ sts->an_normalized_strength].an_rss_pct);
+ else
+ signal_strength = (long int)(sts->an_normalized_strength);
+#else
+ signal_strength = (long int)(sts->an_normalized_rssi);
+#endif
-+
++
+ memcpy(level, &signal_strength, sizeof(level));
+}
+#endif
@@ -230,14 +230,14 @@
/* Here we begin to suck... */
do {
+#ifdef __FreeBSD__
-+ if (ifs == NULL || ifs->if_name == NULL) {
++ if (ifs == NULL || ifs->if_name == NULL) {
+ break;
+ }
-+ strlcpy(device, ifs->if_name, 6);
++ strlcpy(device, ifs->if_name, 6);
+ if (g_strncasecmp(device, "an", 2)==0) {
+ applet->devices = g_list_prepend (applet->devices, g_strdup (device));
+ if (g_strcasecmp(applet->device, device)==0) {
-+ get_an_data(applet, device, &level);
++ get_an_data(applet, device, &level);
+ wireless_applet_update_state (applet, device, 0, level, 0);
+ }
+ }
@@ -245,17 +245,16 @@
+ if (g_strncasecmp(device, "wi", 2)==0 || g_strncasecmp(device, "ath", 3)==0) {
+ applet->devices = g_list_prepend (applet->devices, g_strdup (device));
+ if (g_strcasecmp(applet->device, device)==0) {
-+ get_wi_data(applet, device, &level);
++ get_wi_data(applet, device, &level);
+ wireless_applet_update_state (applet, device, 0, level, 0);
+ }
+ }
+ ifs++;
+#else
-+
char *ptr;
fgets (line, 256, applet->file);
-@@ -283,6 +466,7 @@
+@@ -283,6 +465,7 @@
wireless_applet_update_state (applet, device, link, level, noise);
}
}
@@ -263,7 +262,7 @@
} while (1);
if (g_list_length (applet->devices)==1) {
-@@ -294,17 +478,23 @@
+@@ -294,17 +477,23 @@
}
/* rewind the /proc/net/wireless file */
@@ -287,7 +286,7 @@
wireless_applet_read_device_state (applet);
-@@ -351,6 +541,7 @@
+@@ -351,6 +540,7 @@
static void
start_file_read (WirelessApplet *applet)
{
@@ -295,7 +294,7 @@
applet->file = fopen ("/proc/net/wireless", "rt");
if (applet->file == NULL) {
gtk_tooltips_set_tip (applet->tips,
-@@ -359,6 +550,7 @@
+@@ -359,6 +549,7 @@
NULL);
show_error_dialog (_("There doesn't seem to be any wireless devices configured on your system.\nPlease verify your configuration if you think this is incorrect."));
}
@@ -303,7 +302,7 @@
}
static void
-@@ -646,8 +838,10 @@
+@@ -646,8 +837,10 @@
applet->prefs = NULL;
}
diff --git a/x11/gnomeapplets2/pkg-descr b/x11/gnomeapplets2/pkg-descr
index c93d4bc89a04..5f715cf9a438 100644
--- a/x11/gnomeapplets2/pkg-descr
+++ b/x11/gnomeapplets2/pkg-descr
@@ -1,3 +1,3 @@
-Applets components for the Gnome 2.0 Desktop Environment
+Panel applets for the Gnome 2.0 Desktop Environment.
WWW: http://www.gnome.org/
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index f673803f1995..119fd3e38b2f 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -1,5 +1,8 @@
bin/gkb_xmmap
bin/gnome-keyboard-layout
+bin/gswitchit-plugins-capplet
+etc/gconf/gconf.xml.defaults/apps/gswitchit/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gswitchit/Applet/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/defaults/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/settings/%gconf.xml
@@ -15,6 +18,8 @@ etc/gconf/gconf.xml.defaults/schemas/apps/geyes/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/geyes/prefs/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gkb-applet/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gkb-applet/prefs/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/Applet/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gtik/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gtik/prefs/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gweather/%gconf.xml
@@ -38,6 +43,7 @@ etc/gconf/schemas/charpick.schemas
etc/gconf/schemas/drivemount.schemas
etc/gconf/schemas/geyes.schemas
etc/gconf/schemas/gkb.schemas
+etc/gconf/schemas/gswitchit.schemas
etc/gconf/schemas/gtik.schemas
etc/gconf/schemas/gweather.schemas
etc/gconf/schemas/mailcheck.schemas
@@ -48,15 +54,17 @@ etc/gconf/schemas/multiload.schemas
etc/gconf/schemas/stickynotes.schemas
%%BATTERY%%etc/sound/events/battstat_applet.soundlist
etc/sound/events/mailcheck.soundlist
+include/libgswitchit/gswitchit_plugin.h
+include/libgswitchit/gswitchit_xkb_config.h
libdata/bonobo/servers/GNOME_AccessxStatusApplet.server
-%%BATTERY%%libdata/bonobo/servers/GNOME_BattstatApplet.server
+libdata/bonobo/servers/GNOME_BattstatApplet.server
libdata/bonobo/servers/GNOME_CDPlayerApplet.server
libdata/bonobo/servers/GNOME_CharpickerApplet.server
libdata/bonobo/servers/GNOME_DriveMountApplet.server
libdata/bonobo/servers/GNOME_GWeatherApplet_Factory.server
libdata/bonobo/servers/GNOME_GeyesApplet.server
libdata/bonobo/servers/GNOME_GtikApplet.server
-libdata/bonobo/servers/GNOME_KeyboardApplet_Factory.server
+libdata/bonobo/servers/GNOME_KeyboardApplet.server
libdata/bonobo/servers/GNOME_MailcheckApplet_Factory.server
libdata/bonobo/servers/GNOME_MiniCommanderApplet.server
libdata/bonobo/servers/GNOME_MixerApplet.server
@@ -64,14 +72,15 @@ libdata/bonobo/servers/GNOME_ModemLightsApplet.server
libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server
libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server
libdata/bonobo/servers/GNOME_StickyNotesApplet.server
+libdata/pkgconfig/gswitchit.pc
libexec/accessx-status-applet
%%BATTERY%%libexec/battstat-applet-2
libexec/cdplayer_applet2
libexec/charpick_applet2
libexec/drivemount_applet2
libexec/geyes_applet2
-libexec/gkb-applet-2
libexec/gnome-applets/mc-install-default-macros
+libexec/gnome-keyboard-applet
libexec/gtik2_applet2
libexec/gweather-applet-2
libexec/mailcheck-applet
@@ -231,10 +240,11 @@ share/gnome/gkb/YU_Serbo-Croatian_x.keyprop
share/gnome/gkb/Yugoslav.keyprop
share/gnome/gkb/presets.xml
share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.xml
-%%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml
+share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml
share/gnome/gnome-2.0/ui/GNOME_CDPlayerApplet.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
share/gnome/gnome-2.0/ui/GNOME_GtikApplet.xml
@@ -246,20 +256,144 @@ share/gnome/gnome-2.0/ui/GNOME_ModemlightsApplet.xml
share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml
share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
share/gnome/gnome-2.0/ui/GNOME_WirelessApplet.xml
+share/gnome/gswitchit/gswitchit-plugins.glade
+share/gnome/gswitchit/gswitchit-properties.glade
share/gnome/gweather/Locations
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/legal.xml
%%BATTERY%%share/gnome/help/battstat/C/battstat.xml
-%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-apperance.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/ac_small.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/battery_small.png
%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet.png
-%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-general.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/warning_small.png
%%BATTERY%%share/gnome/help/battstat/C/legal.xml
+%%BATTERY%%share/gnome/help/battstat/de/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/de/figures/ac_small.png
+%%BATTERY%%share/gnome/help/battstat/de/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/de/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/de/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/de/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/de/figures/battery_small.png
+%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/de/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/de/figures/warning_small.png
+%%BATTERY%%share/gnome/help/battstat/de/legal.xml
+%%BATTERY%%share/gnome/help/battstat/es/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/es/figures/ac_small.png
+%%BATTERY%%share/gnome/help/battstat/es/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/es/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/es/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/es/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/es/figures/battery_small.png
+%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/es/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/es/figures/warning_small.png
+%%BATTERY%%share/gnome/help/battstat/es/legal.xml
+%%BATTERY%%share/gnome/help/battstat/fr/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/fr/figures/ac_small.png
+%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/fr/figures/battery_small.png
+%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/fr/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/fr/figures/warning_small.png
+%%BATTERY%%share/gnome/help/battstat/fr/legal.xml
+%%BATTERY%%share/gnome/help/battstat/it/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/it/figures/ac_small.png
+%%BATTERY%%share/gnome/help/battstat/it/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/it/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/it/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/it/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/it/figures/battery_small.png
+%%BATTERY%%share/gnome/help/battstat/it/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/it/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/it/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/it/figures/warning_small.png
+%%BATTERY%%share/gnome/help/battstat/it/legal.xml
%%BATTERY%%share/gnome/help/battstat/ja/battstat.xml
-%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-apperance.png
+%%BATTERY%%share/gnome/help/battstat/ja/figures/ac_small.png
+%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/ja/figures/battery_small.png
%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-applet.png
-%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-general.png
+%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/ja/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/ja/figures/warning_small.png
%%BATTERY%%share/gnome/help/battstat/ja/legal.xml
+%%BATTERY%%share/gnome/help/battstat/ko/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/ko/figures/ac_small.png
+%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/ko/figures/battery_small.png
+%%BATTERY%%share/gnome/help/battstat/ko/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/ko/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/ko/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/ko/figures/warning_small.png
+%%BATTERY%%share/gnome/help/battstat/ko/legal.xml
+%%BATTERY%%share/gnome/help/battstat/sv/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/sv/figures/ac_small.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/battery_small.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/warning_small.png
+%%BATTERY%%share/gnome/help/battstat/sv/legal.xml
+%%BATTERY%%share/gnome/help/battstat/zh_CN/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/ac_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battery_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/warning_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/legal.xml
+%%BATTERY%%share/gnome/help/battstat/zh_HK/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/ac_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battery_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/warning_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_HK/legal.xml
+%%BATTERY%%share/gnome/help/battstat/zh_TW/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/ac_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_green.png
+%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_orange.png
+%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_red.png
+%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_yellow.png
+%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battery_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battstat-applet_window.png
+%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/flash_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/warning_small.png
+%%BATTERY%%share/gnome/help/battstat/zh_TW/legal.xml
share/gnome/help/cdplayer/C/cdplayer.xml
share/gnome/help/cdplayer/C/figures/cdplayer_applet.png
share/gnome/help/cdplayer/C/figures/cdplayer_applet_eject.png
@@ -276,6 +410,9 @@ share/gnome/help/cdplayer/de/cdplayer.xml
share/gnome/help/cdplayer/de/figures/cdplayer_applet.png
share/gnome/help/cdplayer/de/figures/cdplayer_applet_eject.png
share/gnome/help/cdplayer/de/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/de/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/de/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/de/figures/cdplayer_applet_playafterpause.png
share/gnome/help/cdplayer/de/figures/cdplayer_applet_playing.png
share/gnome/help/cdplayer/de/figures/cdplayer_applet_playpause.png
share/gnome/help/cdplayer/de/figures/cdplayer_applet_prevtrack.png
@@ -285,6 +422,9 @@ share/gnome/help/cdplayer/es/cdplayer.xml
share/gnome/help/cdplayer/es/figures/cdplayer_applet.png
share/gnome/help/cdplayer/es/figures/cdplayer_applet_eject.png
share/gnome/help/cdplayer/es/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/es/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/es/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/es/figures/cdplayer_applet_playafterpause.png
share/gnome/help/cdplayer/es/figures/cdplayer_applet_playing.png
share/gnome/help/cdplayer/es/figures/cdplayer_applet_playpause.png
share/gnome/help/cdplayer/es/figures/cdplayer_applet_prevtrack.png
@@ -294,6 +434,9 @@ share/gnome/help/cdplayer/fr/cdplayer.xml
share/gnome/help/cdplayer/fr/figures/cdplayer_applet.png
share/gnome/help/cdplayer/fr/figures/cdplayer_applet_eject.png
share/gnome/help/cdplayer/fr/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/fr/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/fr/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playafterpause.png
share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playing.png
share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playpause.png
share/gnome/help/cdplayer/fr/figures/cdplayer_applet_prevtrack.png
@@ -303,6 +446,9 @@ share/gnome/help/cdplayer/it/cdplayer.xml
share/gnome/help/cdplayer/it/figures/cdplayer_applet.png
share/gnome/help/cdplayer/it/figures/cdplayer_applet_eject.png
share/gnome/help/cdplayer/it/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/it/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/it/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/it/figures/cdplayer_applet_playafterpause.png
share/gnome/help/cdplayer/it/figures/cdplayer_applet_playing.png
share/gnome/help/cdplayer/it/figures/cdplayer_applet_playpause.png
share/gnome/help/cdplayer/it/figures/cdplayer_applet_prevtrack.png
@@ -324,6 +470,9 @@ share/gnome/help/cdplayer/ko/cdplayer.xml
share/gnome/help/cdplayer/ko/figures/cdplayer_applet.png
share/gnome/help/cdplayer/ko/figures/cdplayer_applet_eject.png
share/gnome/help/cdplayer/ko/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/ko/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/ko/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playafterpause.png
share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playing.png
share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playpause.png
share/gnome/help/cdplayer/ko/figures/cdplayer_applet_prevtrack.png
@@ -333,6 +482,9 @@ share/gnome/help/cdplayer/sv/cdplayer.xml
share/gnome/help/cdplayer/sv/figures/cdplayer_applet.png
share/gnome/help/cdplayer/sv/figures/cdplayer_applet_eject.png
share/gnome/help/cdplayer/sv/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/sv/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/sv/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playafterpause.png
share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playing.png
share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playpause.png
share/gnome/help/cdplayer/sv/figures/cdplayer_applet_prevtrack.png
@@ -342,15 +494,33 @@ share/gnome/help/cdplayer/zh_CN/cdplayer.xml
share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet.png
share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_eject.png
share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playafterpause.png
share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playing.png
share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playpause.png
share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_prevtrack.png
share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_stop.png
share/gnome/help/cdplayer/zh_CN/legal.xml
+share/gnome/help/cdplayer/zh_HK/cdplayer.xml
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_eject.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playafterpause.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playing.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playpause.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_prevtrack.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_stop.png
+share/gnome/help/cdplayer/zh_HK/legal.xml
share/gnome/help/cdplayer/zh_TW/cdplayer.xml
share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet.png
share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_eject.png
share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playafterpause.png
share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playing.png
share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playpause.png
share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_prevtrack.png
@@ -389,13 +559,6 @@ share/gnome/help/char-palette/it/figures/charpick_applet.png
share/gnome/help/char-palette/it/figures/charpick_characters.png
share/gnome/help/char-palette/it/figures/charpick_chargroup.png
share/gnome/help/char-palette/it/legal.xml
-share/gnome/help/char-palette/ja/char-palette.xml
-share/gnome/help/char-palette/ja/figures/charpalette_applet.png
-share/gnome/help/char-palette/ja/figures/charpalette_chargroup.png
-share/gnome/help/char-palette/ja/figures/charpick_applet.png
-share/gnome/help/char-palette/ja/figures/charpick_characters.png
-share/gnome/help/char-palette/ja/figures/charpick_chargroup.png
-share/gnome/help/char-palette/ja/legal.xml
share/gnome/help/char-palette/ko/char-palette.xml
share/gnome/help/char-palette/ko/figures/charpalette_applet.png
share/gnome/help/char-palette/ko/figures/charpalette_chargroup.png
@@ -417,6 +580,10 @@ share/gnome/help/char-palette/zh_CN/figures/charpick_applet.png
share/gnome/help/char-palette/zh_CN/figures/charpick_characters.png
share/gnome/help/char-palette/zh_CN/figures/charpick_chargroup.png
share/gnome/help/char-palette/zh_CN/legal.xml
+share/gnome/help/char-palette/zh_HK/char-palette.xml
+share/gnome/help/char-palette/zh_HK/figures/charpalette_applet.png
+share/gnome/help/char-palette/zh_HK/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/zh_HK/legal.xml
share/gnome/help/char-palette/zh_TW/char-palette.xml
share/gnome/help/char-palette/zh_TW/figures/charpalette_applet.png
share/gnome/help/char-palette/zh_TW/figures/charpalette_chargroup.png
@@ -451,15 +618,89 @@ share/gnome/help/command-line/sv/legal.xml
share/gnome/help/command-line/zh_CN/command-line.xml
share/gnome/help/command-line/zh_CN/figures/command-line.png
share/gnome/help/command-line/zh_CN/legal.xml
+share/gnome/help/command-line/zh_HK/command-line.xml
+share/gnome/help/command-line/zh_HK/figures/command-line.png
+share/gnome/help/command-line/zh_HK/legal.xml
share/gnome/help/command-line/zh_TW/command-line.xml
share/gnome/help/command-line/zh_TW/figures/command-line.png
share/gnome/help/command-line/zh_TW/legal.xml
share/gnome/help/drivemount/C/drivemount.xml
+share/gnome/help/drivemount/C/figures/drivemount-applet_window.png
share/gnome/help/drivemount/C/figures/drivemount_applet_all.png
share/gnome/help/drivemount/C/figures/drivemount_applet_floppy.png
share/gnome/help/drivemount/C/figures/drivemount_applet_settings.png
share/gnome/help/drivemount/C/figures/drivemount_applet_tooltip.png
share/gnome/help/drivemount/C/legal.xml
+share/gnome/help/drivemount/de/drivemount.xml
+share/gnome/help/drivemount/de/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/de/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/de/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/de/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/de/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/de/legal.xml
+share/gnome/help/drivemount/es/drivemount.xml
+share/gnome/help/drivemount/es/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/es/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/es/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/es/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/es/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/es/legal.xml
+share/gnome/help/drivemount/fr/drivemount.xml
+share/gnome/help/drivemount/fr/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/fr/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/fr/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/fr/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/fr/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/fr/legal.xml
+share/gnome/help/drivemount/it/drivemount.xml
+share/gnome/help/drivemount/it/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/it/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/it/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/it/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/it/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/it/legal.xml
+share/gnome/help/drivemount/ja/drivemount.xml
+share/gnome/help/drivemount/ja/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/ja/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/ja/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/ja/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/ja/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/ja/legal.xml
+share/gnome/help/drivemount/ko/drivemount.xml
+share/gnome/help/drivemount/ko/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/ko/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/ko/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/ko/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/ko/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/ko/legal.xml
+share/gnome/help/drivemount/sv/drivemount.xml
+share/gnome/help/drivemount/sv/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/sv/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/sv/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/sv/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/sv/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/sv/legal.xml
+share/gnome/help/drivemount/zh_CN/drivemount.xml
+share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/zh_CN/legal.xml
+share/gnome/help/drivemount/zh_HK/drivemount.xml
+share/gnome/help/drivemount/zh_HK/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/zh_HK/legal.xml
+share/gnome/help/drivemount/zh_TW/drivemount.xml
+share/gnome/help/drivemount/zh_TW/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/zh_TW/legal.xml
share/gnome/help/geyes/C/figures/geyes_applet.png
share/gnome/help/geyes/C/geyes.xml
share/gnome/help/geyes/C/legal.xml
@@ -495,6 +736,9 @@ share/gnome/help/geyes/zh_CN/figures/geyes_applet.png
share/gnome/help/geyes/zh_CN/figures/geyes_settings.png
share/gnome/help/geyes/zh_CN/geyes.xml
share/gnome/help/geyes/zh_CN/legal.xml
+share/gnome/help/geyes/zh_HK/figures/geyes_applet.png
+share/gnome/help/geyes/zh_HK/geyes.xml
+share/gnome/help/geyes/zh_HK/legal.xml
share/gnome/help/geyes/zh_TW/figures/geyes_applet.png
share/gnome/help/geyes/zh_TW/figures/geyes_settings.png
share/gnome/help/geyes/zh_TW/geyes.xml
@@ -526,6 +770,9 @@ share/gnome/help/gkb/sv/legal.xml
share/gnome/help/gkb/zh_CN/figures/gkb_applet.png
share/gnome/help/gkb/zh_CN/gkb.xml
share/gnome/help/gkb/zh_CN/legal.xml
+share/gnome/help/gkb/zh_HK/figures/gkb_applet.png
+share/gnome/help/gkb/zh_HK/gkb.xml
+share/gnome/help/gkb/zh_HK/legal.xml
share/gnome/help/gkb/zh_TW/figures/gkb_applet.png
share/gnome/help/gkb/zh_TW/gkb.xml
share/gnome/help/gkb/zh_TW/legal.xml
@@ -556,6 +803,9 @@ share/gnome/help/gtik2_applet2/sv/legal.xml
share/gnome/help/gtik2_applet2/zh_CN/figures/gtik_applet.png
share/gnome/help/gtik2_applet2/zh_CN/gtik2_applet2.xml
share/gnome/help/gtik2_applet2/zh_CN/legal.xml
+share/gnome/help/gtik2_applet2/zh_HK/figures/gtik_applet.png
+share/gnome/help/gtik2_applet2/zh_HK/gtik2_applet2.xml
+share/gnome/help/gtik2_applet2/zh_HK/legal.xml
share/gnome/help/gtik2_applet2/zh_TW/figures/gtik_applet.png
share/gnome/help/gtik2_applet2/zh_TW/gtik2_applet2.xml
share/gnome/help/gtik2_applet2/zh_TW/legal.xml
@@ -604,6 +854,11 @@ share/gnome/help/gweather/zh_CN/figures/gweather_settings.png
share/gnome/help/gweather/zh_CN/figures/gweather_weather.png
share/gnome/help/gweather/zh_CN/gweather.xml
share/gnome/help/gweather/zh_CN/legal.xml
+share/gnome/help/gweather/zh_HK/figures/gweather_applet.png
+share/gnome/help/gweather/zh_HK/figures/gweather_settings.png
+share/gnome/help/gweather/zh_HK/figures/gweather_weather.png
+share/gnome/help/gweather/zh_HK/gweather.xml
+share/gnome/help/gweather/zh_HK/legal.xml
share/gnome/help/gweather/zh_TW/figures/gweather_applet.png
share/gnome/help/gweather/zh_TW/figures/gweather_settings.png
share/gnome/help/gweather/zh_TW/figures/gweather_weather.png
@@ -636,6 +891,11 @@ share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailcheck.png
share/gnome/help/mailcheck/it/figures/mailcheck_applet.png
share/gnome/help/mailcheck/it/legal.xml
share/gnome/help/mailcheck/it/mailcheck.xml
+share/gnome/help/mailcheck/ja/figures/charpalette_applet.png
+share/gnome/help/mailcheck/ja/figures/charpalette_chargroup.png
+share/gnome/help/mailcheck/ja/figures/charpick_applet.png
+share/gnome/help/mailcheck/ja/figures/charpick_characters.png
+share/gnome/help/mailcheck/ja/figures/charpick_chargroup.png
share/gnome/help/mailcheck/ja/figures/mailcheck_applet.png
share/gnome/help/mailcheck/ja/legal.xml
share/gnome/help/mailcheck/ja/mailcheck.xml
@@ -657,6 +917,9 @@ share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailcheck.png
share/gnome/help/mailcheck/zh_CN/figures/mailcheck_applet.png
share/gnome/help/mailcheck/zh_CN/legal.xml
share/gnome/help/mailcheck/zh_CN/mailcheck.xml
+share/gnome/help/mailcheck/zh_HK/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/zh_HK/legal.xml
+share/gnome/help/mailcheck/zh_HK/mailcheck.xml
share/gnome/help/mailcheck/zh_TW/figures/mailcheck-applet.png
share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailbox.png
share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailcheck.png
@@ -678,6 +941,10 @@ share/gnome/help/mixer_applet2/fr/figures/mixer_applet.png
share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/fr/legal.xml
share/gnome/help/mixer_applet2/fr/mixer_applet2.xml
+share/gnome/help/mixer_applet2/it/figures/mixer_applet.png
+share/gnome/help/mixer_applet2/it/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/it/legal.xml
+share/gnome/help/mixer_applet2/it/mixer_applet2.xml
share/gnome/help/mixer_applet2/ja/figures/mixer_applet.png
share/gnome/help/mixer_applet2/ja/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/ja/legal.xml
@@ -694,6 +961,9 @@ share/gnome/help/mixer_applet2/zh_CN/figures/mixer_applet.png
share/gnome/help/mixer_applet2/zh_CN/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/zh_CN/legal.xml
share/gnome/help/mixer_applet2/zh_CN/mixer_applet2.xml
+share/gnome/help/mixer_applet2/zh_HK/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/zh_HK/legal.xml
+share/gnome/help/mixer_applet2/zh_HK/mixer_applet2.xml
share/gnome/help/mixer_applet2/zh_TW/figures/mixer_applet.png
share/gnome/help/mixer_applet2/zh_TW/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/zh_TW/legal.xml
@@ -718,16 +988,139 @@ share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_connecting.png
share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_display.png
share/gnome/help/modemlights/C/legal.xml
share/gnome/help/modemlights/C/modemlights.xml
+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/figures/system_monitor_prefs.png
+share/gnome/help/multiload/C/legal.xml
+share/gnome/help/multiload/C/multiload.xml
+share/gnome/help/multiload/de/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/de/legal.xml
+share/gnome/help/multiload/de/multiload.xml
+share/gnome/help/multiload/es/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/es/legal.xml
+share/gnome/help/multiload/es/multiload.xml
+share/gnome/help/multiload/fr/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/fr/legal.xml
+share/gnome/help/multiload/fr/multiload.xml
+share/gnome/help/multiload/it/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/it/legal.xml
+share/gnome/help/multiload/it/multiload.xml
+share/gnome/help/multiload/ja/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/ja/legal.xml
+share/gnome/help/multiload/ja/multiload.xml
+share/gnome/help/multiload/ko/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/ko/legal.xml
+share/gnome/help/multiload/ko/multiload.xml
+share/gnome/help/multiload/sv/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/sv/legal.xml
+share/gnome/help/multiload/sv/multiload.xml
+share/gnome/help/multiload/zh_CN/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/zh_CN/legal.xml
+share/gnome/help/multiload/zh_CN/multiload.xml
+share/gnome/help/multiload/zh_HK/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/zh_HK/legal.xml
+share/gnome/help/multiload/zh_HK/multiload.xml
+share/gnome/help/multiload/zh_TW/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/zh_TW/legal.xml
+share/gnome/help/multiload/zh_TW/multiload.xml
share/gnome/help/stickynotes_applet/C/legal.xml
share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/de/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/de/legal.xml
+share/gnome/help/stickynotes_applet/de/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/es/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/es/legal.xml
+share/gnome/help/stickynotes_applet/es/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/fr/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/fr/legal.xml
+share/gnome/help/stickynotes_applet/fr/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/it/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/it/legal.xml
+share/gnome/help/stickynotes_applet/it/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/ja/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/ja/legal.xml
+share/gnome/help/stickynotes_applet/ja/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/ko/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/ko/legal.xml
+share/gnome/help/stickynotes_applet/ko/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/sv/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/sv/legal.xml
+share/gnome/help/stickynotes_applet/sv/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/zh_CN/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/zh_CN/legal.xml
+share/gnome/help/stickynotes_applet/zh_CN/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/zh_HK/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/zh_HK/legal.xml
+share/gnome/help/stickynotes_applet/zh_HK/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/zh_TW/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/zh_TW/legal.xml
+share/gnome/help/stickynotes_applet/zh_TW/stickynotes_applet.xml
share/gnome/help/wireless/C/legal.xml
share/gnome/help/wireless/C/wireless.xml
+share/gnome/help/wireless/de/figures/wireless_applet_conn.png
+share/gnome/help/wireless/de/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/de/legal.xml
+share/gnome/help/wireless/de/wireless.xml
+share/gnome/help/wireless/es/figures/wireless_applet_conn.png
+share/gnome/help/wireless/es/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/es/legal.xml
+share/gnome/help/wireless/es/wireless.xml
+share/gnome/help/wireless/fr/figures/wireless_applet_conn.png
+share/gnome/help/wireless/fr/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/fr/legal.xml
+share/gnome/help/wireless/fr/wireless.xml
+share/gnome/help/wireless/it/figures/wireless_applet_conn.png
+share/gnome/help/wireless/it/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/it/legal.xml
+share/gnome/help/wireless/it/wireless.xml
+share/gnome/help/wireless/ja/figures/wireless_applet_conn.png
+share/gnome/help/wireless/ja/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/ja/legal.xml
+share/gnome/help/wireless/ja/wireless.xml
+share/gnome/help/wireless/ko/figures/wireless_applet_conn.png
+share/gnome/help/wireless/ko/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/ko/legal.xml
+share/gnome/help/wireless/ko/wireless.xml
+share/gnome/help/wireless/sv/figures/wireless_applet_conn.png
+share/gnome/help/wireless/sv/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/sv/legal.xml
+share/gnome/help/wireless/sv/wireless.xml
+share/gnome/help/wireless/zh_CN/figures/wireless_applet_conn.png
+share/gnome/help/wireless/zh_CN/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/zh_CN/legal.xml
+share/gnome/help/wireless/zh_CN/wireless.xml
+share/gnome/help/wireless/zh_HK/figures/wireless_applet_conn.png
+share/gnome/help/wireless/zh_HK/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/zh_HK/legal.xml
+share/gnome/help/wireless/zh_HK/wireless.xml
+share/gnome/help/wireless/zh_TW/figures/wireless_applet_conn.png
+share/gnome/help/wireless/zh_TW/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/zh_TW/legal.xml
+share/gnome/help/wireless/zh_TW/wireless.xml
share/gnome/omf/gnome-applets/accessx-status-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/accessx-status-C.omf 2>/dev/null || /usr/bin/true
%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf
%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%share/gnome/omf/gnome-applets/battstat-de.omf
+%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-de.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%share/gnome/omf/gnome-applets/battstat-es.omf
+%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-es.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%share/gnome/omf/gnome-applets/battstat-fr.omf
+%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-fr.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%share/gnome/omf/gnome-applets/battstat-it.omf
+%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-it.omf 2>/dev/null || /usr/bin/true
%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ja.omf
%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ko.omf
+%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-ko.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%share/gnome/omf/gnome-applets/battstat-sv.omf
+%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-sv.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_CN.omf
+%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-zh_CN.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_HK.omf
+%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-zh_HK.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_TW.omf
+%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/cdplayer-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-C.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/cdplayer-de.omf
@@ -746,6 +1139,8 @@ share/gnome/omf/gnome-applets/cdplayer-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-sv.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/cdplayer-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/cdplayer-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_HK.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/cdplayer-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/char-palette-C.omf
@@ -758,14 +1153,14 @@ share/gnome/omf/gnome-applets/char-palette-fr.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-fr.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/char-palette-it.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-it.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-applets/char-palette-ja.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-ja.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/char-palette-ko.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-ko.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/char-palette-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-sv.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/char-palette-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/char-palette-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-zh_HK.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/char-palette-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/command-line-C.omf
@@ -786,10 +1181,32 @@ share/gnome/omf/gnome-applets/command-line-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/command-line-sv.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/command-line-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/command-line-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/command-line-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/command-line-zh_HK.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/command-line-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/command-line-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/drivemount-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/drivemount-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/drivemount-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/drivemount-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/drivemount-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/drivemount-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/drivemount-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/drivemount-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/drivemount-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/drivemount-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-zh_HK.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/drivemount-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/geyes-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-C.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/geyes-de.omf
@@ -808,6 +1225,8 @@ share/gnome/omf/gnome-applets/geyes-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-sv.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/geyes-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/geyes-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-zh_HK.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/geyes-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/gkb-C.omf
@@ -828,6 +1247,8 @@ share/gnome/omf/gnome-applets/gkb-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-sv.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/gkb-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/gkb-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-zh_HK.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/gkb-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/gtik2_applet2-C.omf
@@ -848,6 +1269,8 @@ share/gnome/omf/gnome-applets/gtik2_applet2-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-sv.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/gtik2_applet2-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/gtik2_applet2-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_HK.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/gtik2_applet2-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/gweather-C.omf
@@ -868,6 +1291,8 @@ share/gnome/omf/gnome-applets/gweather-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather-sv.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/gweather-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/gweather-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather-zh_HK.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/gweather-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/mailcheck-C.omf
@@ -888,6 +1313,8 @@ share/gnome/omf/gnome-applets/mailcheck-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-sv.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/mailcheck-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/mailcheck-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_HK.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/mailcheck-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/mixer_applet2-C.omf
@@ -898,6 +1325,8 @@ share/gnome/omf/gnome-applets/mixer_applet2-es.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-es.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/mixer_applet2-fr.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/mixer_applet2-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-it.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/mixer_applet2-ja.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-ja.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/mixer_applet2-ko.omf
@@ -906,14 +1335,78 @@ share/gnome/omf/gnome-applets/mixer_applet2-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-sv.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/mixer_applet2-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_HK.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/modemlights-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/modemlights-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-zh_HK.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/multiload-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/stickynotes_applet-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/stickynotes_applet-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/stickynotes_applet-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/stickynotes_applet-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/stickynotes_applet-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/stickynotes_applet-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/stickynotes_applet-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/stickynotes_applet-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/stickynotes_applet-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/stickynotes_applet-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_HK.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/stickynotes_applet-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/wireless-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/wireless-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/wireless-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/wireless-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/wireless-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/wireless-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/wireless-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/wireless-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/wireless-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/wireless-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-zh_HK.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/wireless-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-zh_TW.omf 2>/dev/null || /usr/bin/true
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
@@ -1031,11 +1524,11 @@ share/gnome/pixmaps/gkb/uy.png
share/gnome/pixmaps/gkb/vn.png
share/gnome/pixmaps/gkb/ye.png
share/gnome/pixmaps/gkb/yu.png
-share/gnome/pixmaps/gnome-cdplayer-icon.png
share/gnome/pixmaps/gnome-cpu.png
share/gnome/pixmaps/gnome-eyes.png
share/gnome/pixmaps/gnome-mini-commander.png
-share/gnome/pixmaps/gweather/tstorm.xpm
+share/gnome/pixmaps/gswitchit-applet.png
+share/gnome/pixmaps/gswitchit-properties-capplet.png
share/gnome/pixmaps/mailcheck/eclouds.png
share/gnome/pixmaps/mailcheck/email-e.png
share/gnome/pixmaps/mailcheck/email-eclouds.png
@@ -1163,6 +1656,7 @@ share/locale/cy/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/da/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/de/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/el/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/es/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/et/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1174,6 +1668,7 @@ share/locale/ga/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/he/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1195,10 +1690,12 @@ share/locale/ro/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ru/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
share/locale/sr/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/sv/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ta/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/th/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1211,15 +1708,80 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/pixmaps/stickynotes
@dirrm share/gnome/pixmaps/mixer
@dirrm share/gnome/pixmaps/accessx-status-applet
+@dirrm share/gnome/help/wireless/zh_TW/figures
+@dirrm share/gnome/help/wireless/zh_TW
+@dirrm share/gnome/help/wireless/zh_HK/figures
+@dirrm share/gnome/help/wireless/zh_HK
+@dirrm share/gnome/help/wireless/zh_CN/figures
+@dirrm share/gnome/help/wireless/zh_CN
+@dirrm share/gnome/help/wireless/sv/figures
+@dirrm share/gnome/help/wireless/sv
+@dirrm share/gnome/help/wireless/ko/figures
+@dirrm share/gnome/help/wireless/ko
+@dirrm share/gnome/help/wireless/ja/figures
+@dirrm share/gnome/help/wireless/ja
+@dirrm share/gnome/help/wireless/it/figures
+@dirrm share/gnome/help/wireless/it
+@dirrm share/gnome/help/wireless/fr/figures
+@dirrm share/gnome/help/wireless/fr
+@dirrm share/gnome/help/wireless/es/figures
+@dirrm share/gnome/help/wireless/es
+@dirrm share/gnome/help/wireless/de/figures
+@dirrm share/gnome/help/wireless/de
@dirrm share/gnome/help/wireless/C
@dirrm share/gnome/help/wireless
+@dirrm share/gnome/help/stickynotes_applet/zh_TW/figures
+@dirrm share/gnome/help/stickynotes_applet/zh_TW
+@dirrm share/gnome/help/stickynotes_applet/zh_HK/figures
+@dirrm share/gnome/help/stickynotes_applet/zh_HK
+@dirrm share/gnome/help/stickynotes_applet/zh_CN/figures
+@dirrm share/gnome/help/stickynotes_applet/zh_CN
+@dirrm share/gnome/help/stickynotes_applet/sv/figures
+@dirrm share/gnome/help/stickynotes_applet/sv
+@dirrm share/gnome/help/stickynotes_applet/ko/figures
+@dirrm share/gnome/help/stickynotes_applet/ko
+@dirrm share/gnome/help/stickynotes_applet/ja/figures
+@dirrm share/gnome/help/stickynotes_applet/ja
+@dirrm share/gnome/help/stickynotes_applet/it/figures
+@dirrm share/gnome/help/stickynotes_applet/it
+@dirrm share/gnome/help/stickynotes_applet/fr/figures
+@dirrm share/gnome/help/stickynotes_applet/fr
+@dirrm share/gnome/help/stickynotes_applet/es/figures
+@dirrm share/gnome/help/stickynotes_applet/es
+@dirrm share/gnome/help/stickynotes_applet/de/figures
+@dirrm share/gnome/help/stickynotes_applet/de
@dirrm share/gnome/help/stickynotes_applet/C
@dirrm share/gnome/help/stickynotes_applet
+@dirrm share/gnome/help/multiload/zh_TW/figures
+@dirrm share/gnome/help/multiload/zh_TW
+@dirrm share/gnome/help/multiload/zh_HK/figures
+@dirrm share/gnome/help/multiload/zh_HK
+@dirrm share/gnome/help/multiload/zh_CN/figures
+@dirrm share/gnome/help/multiload/zh_CN
+@dirrm share/gnome/help/multiload/sv/figures
+@dirrm share/gnome/help/multiload/sv
+@dirrm share/gnome/help/multiload/ko/figures
+@dirrm share/gnome/help/multiload/ko
+@dirrm share/gnome/help/multiload/ja/figures
+@dirrm share/gnome/help/multiload/ja
+@dirrm share/gnome/help/multiload/it/figures
+@dirrm share/gnome/help/multiload/it
+@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/de/figures
+@dirrm share/gnome/help/multiload/de
+@dirrm share/gnome/help/multiload/C/figures
+@dirrm share/gnome/help/multiload/C
+@dirrm share/gnome/help/multiload
@dirrm share/gnome/help/modemlights/C/figures
@dirrm share/gnome/help/modemlights/C
@dirrm share/gnome/help/modemlights
@dirrm share/gnome/help/mixer_applet2/zh_TW/figures
@dirrm share/gnome/help/mixer_applet2/zh_TW
+@dirrm share/gnome/help/mixer_applet2/zh_HK/figures
+@dirrm share/gnome/help/mixer_applet2/zh_HK
@dirrm share/gnome/help/mixer_applet2/zh_CN/figures
@dirrm share/gnome/help/mixer_applet2/zh_CN
@dirrm share/gnome/help/mixer_applet2/sv/figures
@@ -1228,6 +1790,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/mixer_applet2/ko
@dirrm share/gnome/help/mixer_applet2/ja/figures
@dirrm share/gnome/help/mixer_applet2/ja
+@dirrm share/gnome/help/mixer_applet2/it/figures
+@dirrm share/gnome/help/mixer_applet2/it
@dirrm share/gnome/help/mixer_applet2/fr/figures
@dirrm share/gnome/help/mixer_applet2/fr
@dirrm share/gnome/help/mixer_applet2/es/figures
@@ -1239,6 +1803,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/mixer_applet2
@dirrm share/gnome/help/mailcheck/zh_TW/figures
@dirrm share/gnome/help/mailcheck/zh_TW
+@dirrm share/gnome/help/mailcheck/zh_HK/figures
+@dirrm share/gnome/help/mailcheck/zh_HK
@dirrm share/gnome/help/mailcheck/zh_CN/figures
@dirrm share/gnome/help/mailcheck/zh_CN
@dirrm share/gnome/help/mailcheck/sv/figures
@@ -1260,6 +1826,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/mailcheck
@dirrm share/gnome/help/gweather/zh_TW/figures
@dirrm share/gnome/help/gweather/zh_TW
+@dirrm share/gnome/help/gweather/zh_HK/figures
+@dirrm share/gnome/help/gweather/zh_HK
@dirrm share/gnome/help/gweather/zh_CN/figures
@dirrm share/gnome/help/gweather/zh_CN
@dirrm share/gnome/help/gweather/sv/figures
@@ -1281,6 +1849,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/gweather
@dirrm share/gnome/help/gtik2_applet2/zh_TW/figures
@dirrm share/gnome/help/gtik2_applet2/zh_TW
+@dirrm share/gnome/help/gtik2_applet2/zh_HK/figures
+@dirrm share/gnome/help/gtik2_applet2/zh_HK
@dirrm share/gnome/help/gtik2_applet2/zh_CN/figures
@dirrm share/gnome/help/gtik2_applet2/zh_CN
@dirrm share/gnome/help/gtik2_applet2/sv/figures
@@ -1302,6 +1872,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/gtik2_applet2
@dirrm share/gnome/help/gkb/zh_TW/figures
@dirrm share/gnome/help/gkb/zh_TW
+@dirrm share/gnome/help/gkb/zh_HK/figures
+@dirrm share/gnome/help/gkb/zh_HK
@dirrm share/gnome/help/gkb/zh_CN/figures
@dirrm share/gnome/help/gkb/zh_CN
@dirrm share/gnome/help/gkb/sv/figures
@@ -1323,6 +1895,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/gkb
@dirrm share/gnome/help/geyes/zh_TW/figures
@dirrm share/gnome/help/geyes/zh_TW
+@dirrm share/gnome/help/geyes/zh_HK/figures
+@dirrm share/gnome/help/geyes/zh_HK
@dirrm share/gnome/help/geyes/zh_CN/figures
@dirrm share/gnome/help/geyes/zh_CN
@dirrm share/gnome/help/geyes/sv/figures
@@ -1342,11 +1916,33 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/geyes/C/figures
@dirrm share/gnome/help/geyes/C
@dirrm share/gnome/help/geyes
+@dirrm share/gnome/help/drivemount/zh_TW/figures
+@dirrm share/gnome/help/drivemount/zh_TW
+@dirrm share/gnome/help/drivemount/zh_HK/figures
+@dirrm share/gnome/help/drivemount/zh_HK
+@dirrm share/gnome/help/drivemount/zh_CN/figures
+@dirrm share/gnome/help/drivemount/zh_CN
+@dirrm share/gnome/help/drivemount/sv/figures
+@dirrm share/gnome/help/drivemount/sv
+@dirrm share/gnome/help/drivemount/ko/figures
+@dirrm share/gnome/help/drivemount/ko
+@dirrm share/gnome/help/drivemount/ja/figures
+@dirrm share/gnome/help/drivemount/ja
+@dirrm share/gnome/help/drivemount/it/figures
+@dirrm share/gnome/help/drivemount/it
+@dirrm share/gnome/help/drivemount/fr/figures
+@dirrm share/gnome/help/drivemount/fr
+@dirrm share/gnome/help/drivemount/es/figures
+@dirrm share/gnome/help/drivemount/es
+@dirrm share/gnome/help/drivemount/de/figures
+@dirrm share/gnome/help/drivemount/de
@dirrm share/gnome/help/drivemount/C/figures
@dirrm share/gnome/help/drivemount/C
@dirrm share/gnome/help/drivemount
@dirrm share/gnome/help/command-line/zh_TW/figures
@dirrm share/gnome/help/command-line/zh_TW
+@dirrm share/gnome/help/command-line/zh_HK/figures
+@dirrm share/gnome/help/command-line/zh_HK
@dirrm share/gnome/help/command-line/zh_CN/figures
@dirrm share/gnome/help/command-line/zh_CN
@dirrm share/gnome/help/command-line/sv/figures
@@ -1368,14 +1964,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/command-line
@dirrm share/gnome/help/char-palette/zh_TW/figures
@dirrm share/gnome/help/char-palette/zh_TW
+@dirrm share/gnome/help/char-palette/zh_HK/figures
+@dirrm share/gnome/help/char-palette/zh_HK
@dirrm share/gnome/help/char-palette/zh_CN/figures
@dirrm share/gnome/help/char-palette/zh_CN
@dirrm share/gnome/help/char-palette/sv/figures
@dirrm share/gnome/help/char-palette/sv
@dirrm share/gnome/help/char-palette/ko/figures
@dirrm share/gnome/help/char-palette/ko
-@dirrm share/gnome/help/char-palette/ja/figures
-@dirrm share/gnome/help/char-palette/ja
@dirrm share/gnome/help/char-palette/it/figures
@dirrm share/gnome/help/char-palette/it
@dirrm share/gnome/help/char-palette/fr/figures
@@ -1389,6 +1985,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/char-palette
@dirrm share/gnome/help/cdplayer/zh_TW/figures
@dirrm share/gnome/help/cdplayer/zh_TW
+@dirrm share/gnome/help/cdplayer/zh_HK/figures
+@dirrm share/gnome/help/cdplayer/zh_HK
@dirrm share/gnome/help/cdplayer/zh_CN/figures
@dirrm share/gnome/help/cdplayer/zh_CN
@dirrm share/gnome/help/cdplayer/sv/figures
@@ -1408,17 +2006,42 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/cdplayer/C/figures
@dirrm share/gnome/help/cdplayer/C
@dirrm share/gnome/help/cdplayer
+%%BATTERY%%@dirrm share/gnome/help/battstat/zh_TW/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/zh_TW
+%%BATTERY%%@dirrm share/gnome/help/battstat/zh_HK/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/zh_HK
+%%BATTERY%%@dirrm share/gnome/help/battstat/zh_CN/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/zh_CN
+%%BATTERY%%@dirrm share/gnome/help/battstat/sv/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/sv
+%%BATTERY%%@dirrm share/gnome/help/battstat/ko/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/ko
%%BATTERY%%@dirrm share/gnome/help/battstat/ja/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/ja
+%%BATTERY%%@dirrm share/gnome/help/battstat/it/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/it
+%%BATTERY%%@dirrm share/gnome/help/battstat/fr/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/fr
+%%BATTERY%%@dirrm share/gnome/help/battstat/es/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/es
+%%BATTERY%%@dirrm share/gnome/help/battstat/de/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/de
%%BATTERY%%@dirrm share/gnome/help/battstat/C/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/C
%%BATTERY%%@dirrm share/gnome/help/battstat
@dirrm share/gnome/help/accessx-status/C/figures
@dirrm share/gnome/help/accessx-status/C
@dirrm share/gnome/help/accessx-status
+@dirrm share/gnome/gswitchit
+@dirrm share/gnome/geyes/Horrid
+@dirrm share/gnome/geyes/Default-tiny
+@dirrm share/gnome/geyes/Default
+@dirrm share/gnome/geyes/Bloodshot
+@dirrm share/gnome/geyes/Bizarre
@dirrm share/gnome/gen_util
%%BATTERY%%@dirrm share/gnome/battstat_applet
@dirrm libexec/gnome-applets
+@dirrm include/libgswitchit
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/settings
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/defaults
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet
@@ -1436,6 +2059,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gweather
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtik/prefs
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtik
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/Applet
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gkb-applet/prefs
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gkb-applet
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/geyes/prefs
@@ -1451,9 +2076,20 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/settings
@dirrm etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/defaults
@dirrm etc/gconf/gconf.xml.defaults/apps/stickynotes_applet
+@dirrm etc/gconf/gconf.xml.defaults/apps/gswitchit/Applet
+@dirrm etc/gconf/gconf.xml.defaults/apps/gswitchit
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/accessx-status-C.omf 2>/dev/null || /usr/bin/true
%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-de.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-es.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-fr.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-it.omf 2>/dev/null || /usr/bin/true
%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-ko.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-sv.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-zh_CN.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-zh_HK.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-es.omf 2>/dev/null || /usr/bin/true
@@ -1463,16 +2099,17 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-sv.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_HK.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-es.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-fr.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-it.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-ja.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-sv.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-zh_HK.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-de.omf 2>/dev/null || /usr/bin/true
@@ -1483,8 +2120,19 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-sv.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-zh_HK.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-zh_HK.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-es.omf 2>/dev/null || /usr/bin/true
@@ -1494,6 +2142,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-sv.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-zh_HK.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-de.omf 2>/dev/null || /usr/bin/true
@@ -1504,6 +2153,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-sv.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_HK.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-de.omf 2>/dev/null || /usr/bin/true
@@ -1514,6 +2164,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-sv.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_HK.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-de.omf 2>/dev/null || /usr/bin/true
@@ -1524,6 +2175,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-sv.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-zh_HK.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-de.omf 2>/dev/null || /usr/bin/true
@@ -1534,16 +2186,50 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-sv.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_HK.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-es.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-it.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-ja.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-sv.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_HK.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/modemlights-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-zh_HK.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_HK.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-zh_HK.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-zh_TW.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index bfd82d8dd2ec..e27e91a8da7d 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= gnomedesktop
-PORTVERSION= 2.4.1.1
-PORTREVISION= 2
+PORTVERSION= 2.6.0.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-desktop/2.4
+MASTER_SITE_SUBDIR= sources/gnome-desktop/2.6
DISTNAME= gnome-desktop-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -20,7 +19,8 @@ COMMENT= Additional UI API for GNOME 2
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_XPM= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui
+USE_REINPLACE= yes
+USE_GNOME= gnomeprefix gnomehack intlhack lthack gnomehier libgnomeui
GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
USE_BISON= yes
diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo
index 886b1521819b..213352fd1c8d 100644
--- a/x11/gnomedesktop/distinfo
+++ b/x11/gnomedesktop/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-desktop-2.4.1.1.tar.bz2) = c85489c7befc79b5cc9bda1b2006cacc
-SIZE (gnome2/gnome-desktop-2.4.1.1.tar.bz2) = 1054097
+MD5 (gnome2/gnome-desktop-2.6.0.1.tar.bz2) = 2d40b7d7a15f23770265246979529327
+SIZE (gnome2/gnome-desktop-2.6.0.1.tar.bz2) = 1077853
diff --git a/x11/gnomedesktop/files/patch-configure b/x11/gnomedesktop/files/patch-configure
deleted file mode 100644
index caf5b493a9eb..000000000000
--- a/x11/gnomedesktop/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Sun May 4 06:56:20 2003
-+++ configure Sun May 4 19:20:27 2003
-@@ -8374,6 +8374,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11/gnomedesktop/pkg-descr b/x11/gnomedesktop/pkg-descr
index 500857a54f14..bda4df7913d6 100644
--- a/x11/gnomedesktop/pkg-descr
+++ b/x11/gnomedesktop/pkg-descr
@@ -1,4 +1,3 @@
-This is a collection of APIs not included in libgnomeui as they have
-not undergone sufficient testing.
+This is a collection of APIs not included in libgnomeui.
WWW: http://www.gnome.org/
diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist
index a3384f7d3a88..9a87be2a25b4 100644
--- a/x11/gnomedesktop/pkg-plist
+++ b/x11/gnomedesktop/pkg-plist
@@ -21,6 +21,14 @@ share/gnome/help/fdl/C/fdl.xml
share/gnome/help/gnome-feedback/C/gnome-feedback.xml
share/gnome/help/gpl/C/gpl.xml
share/gnome/help/lgpl/C/lgpl.xml
+share/gnome/omf/gnome-desktop/fdl-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/fdl-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/gnome-feedback-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/gnome-feedback-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/gpl-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/gpl-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/lgpl-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/lgpl-C.omf 2>/dev/null || /usr/bin/true
share/gnome/pixmaps/advanced-directory.png
share/gnome/pixmaps/apple-green.png
share/gnome/pixmaps/apple-red.png
@@ -117,6 +125,7 @@ share/gnome/vfolders/Other.directory
share/gnome/vfolders/Root.directory
share/gnome/vfolders/Settings.directory
share/gnome/vfolders/System.directory
+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
share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -131,6 +140,7 @@ share/locale/cy/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/da/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/de/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/el/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/eo/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/es/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -143,6 +153,7 @@ share/locale/ga/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/he/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/hi/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/id/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/is/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -162,6 +173,7 @@ share/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/no/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/pa/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/pl/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/pt/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/pt_BR/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -175,6 +187,7 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/sv/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ta/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/tk/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -182,13 +195,21 @@ share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
-@dirrm share/gnome/help/lgpl/C/figures
-@dirrm share/gnome/help/gpl/C/figures
-@dirrm share/gnome/help/gnome-feedback/C/figures
+@dirrm share/gnome/omf/gnome-desktop
+@dirrm share/gnome/help/lgpl/C
+@dirrm share/gnome/help/lgpl
+@dirrm share/gnome/help/gpl/C
+@dirrm share/gnome/help/gpl
@dirrm share/gnome/help/gnome-feedback/C
@dirrm share/gnome/help/gnome-feedback
-@dirrm share/gnome/help/fdl/C/figures
+@dirrm share/gnome/help/fdl/C
+@dirrm share/gnome/help/fdl
@dirrm share/gnome/gnome-about/headers
+@dirrm share/gnome/gnome-about
@dirrm include/gnome-desktop-2.0/libgnomeui
@dirrm include/gnome-desktop-2.0/libgnome
@dirrm include/gnome-desktop-2.0
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/fdl-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/gnome-feedback-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/gpl-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/lgpl-C.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index 56398c8c4dd0..36c2fefb4f95 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= gnomepanel
-PORTVERSION= 2.4.2
-PORTREVISION= 1
+PORTVERSION= 2.6.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-panel/2.4
+MASTER_SITE_SUBDIR= sources/gnome-panel/2.6
DISTNAME= gnome-panel-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -20,8 +19,9 @@ COMMENT= Panel component for the GNOME 2 Desktop
USE_BZIP2= yes
INSTALLS_SHLIB= yes
USE_X_PREFIX= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop libwnck lthack \
- intlhack
+USE_REINPLACE= yes
+USE_GNOME= gnomeprefix gnomehack gnomehier intlhack lthack gnomedesktop \
+ libwnck
GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
USE_LIBTOOL_VER=13
@@ -32,4 +32,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
MAN1= gnome-panel.1 gnome-panel-preferences.1
+post-patch:
+.for po in da.po it.po zh_TW.po
+ @${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po}
+.endfor
+
.include <bsd.port.mk>
diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo
index 2e18221ce043..922d7c3b0c78 100644
--- a/x11/gnomepanel/distinfo
+++ b/x11/gnomepanel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-panel-2.4.2.tar.bz2) = d62da1f6cb129f65206a945d93a2fa85
-SIZE (gnome2/gnome-panel-2.4.2.tar.bz2) = 2662404
+MD5 (gnome2/gnome-panel-2.6.0.tar.bz2) = 9e0ad03c9266d342b99837ca4e947b55
+SIZE (gnome2/gnome-panel-2.6.0.tar.bz2) = 2933581
diff --git a/x11/gnomepanel/files/patch-applets_clock_clock.c b/x11/gnomepanel/files/patch-applets_clock_clock.c
index 976764570ff1..ccf5378b135f 100644
--- a/x11/gnomepanel/files/patch-applets_clock_clock.c
+++ b/x11/gnomepanel/files/patch-applets_clock_clock.c
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- applets/clock/clock.c 2002/05/14 14:08:16 1.1
-+++ applets/clock/clock.c 2002/05/14 14:12:56
-@@ -14,7 +14,9 @@
+--- applets/clock/clock.c.orig Tue Jan 13 11:55:58 2004
++++ applets/clock/clock.c Wed Jan 14 15:43:39 2004
+@@ -47,7 +47,9 @@
#include <dirent.h>
#include <string.h>
#include <time.h>
@@ -13,15 +10,15 @@ $FreeBSD$
#include <panel-applet.h>
#include <panel-applet-gconf.h>
-@@ -684,7 +686,11 @@
- cd->hourformat = panel_applet_gconf_get_int (applet, KEY_HOUR_FORMAT, &error);
- if (error || (cd->hourformat != 12 && cd->hourformat != 24)) {
- /* if value is not valid, set it according to locale */
+@@ -539,7 +541,11 @@
+ {
+ const char *am;
+
+#ifdef HAVE_LANGINFO_H
- const char *am = nl_langinfo (AM_STR);
+ am = nl_langinfo (AM_STR);
+#else
-+ const char *am = "AM";
++ am = "AM";
+#endif
- cd->hourformat = (am[0] == '\0') ? 24 : 12;
+ return (am[0] == '\0') ? CLOCK_FORMAT_24 : CLOCK_FORMAT_12;
+ }
- if (error)
diff --git a/x11/gnomepanel/files/patch-configure b/x11/gnomepanel/files/patch-configure
new file mode 100644
index 000000000000..732f3a86022c
--- /dev/null
+++ b/x11/gnomepanel/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig Wed Jan 14 15:54:42 2004
++++ configure Wed Jan 14 15:55:13 2004
+@@ -5536,7 +5536,7 @@
+
+
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+- inttypes.h stdint.h unistd.h
++ inttypes.h stdint.h unistd.h langinfo.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
diff --git a/x11/gnomepanel/files/patch-po_da.po b/x11/gnomepanel/files/patch-po_da.po
deleted file mode 100644
index 96bfea954001..000000000000
--- a/x11/gnomepanel/files/patch-po_da.po
+++ /dev/null
@@ -1,29 +0,0 @@
---- po/da.po.orig Wed Oct 1 15:54:18 2003
-+++ po/da.po Wed Oct 1 15:56:23 2003
-@@ -48,7 +48,7 @@
-
- #: applets/clock/clock.c:227
- msgid "%a %b %d"
--msgstr "%a %-d. %b"
-+msgstr "%a %d. %b"
-
- #. translators: reverse the order of these arguments
- #. * if the time should come before the
-@@ -75,7 +75,7 @@
- #. Show date in tooltip
- #: applets/clock/clock.c:344
- msgid "%A %B %d"
--msgstr "%A den %-d. %B"
-+msgstr "%A den %d. %B"
-
- #: applets/clock/clock.c:472
- msgid "Calendar"
-@@ -95,7 +95,7 @@
-
- #: applets/clock/clock.c:809
- msgid "%A, %B %d %Y"
--msgstr "%A, %-d. %B %Y"
-+msgstr "%A, %d. %B %Y"
-
- #: applets/clock/clock.c:850
- #, c-format
diff --git a/x11/gnomepanel/files/patch-po_it.po b/x11/gnomepanel/files/patch-po_it.po
deleted file mode 100644
index 00118bd344bc..000000000000
--- a/x11/gnomepanel/files/patch-po_it.po
+++ /dev/null
@@ -1,59 +0,0 @@
---- po/it.po.orig Wed Oct 1 15:55:34 2003
-+++ po/it.po Wed Oct 1 15:56:12 2003
-@@ -17,23 +17,23 @@
-
- #: applets/clock/clock.c:219
- msgid "%l:%M:%S %p"
--msgstr "%-I.%M.%S %p"
-+msgstr "%I.%M.%S %p"
-
- #: applets/clock/clock.c:219
- msgid "%l:%M %p"
--msgstr "%-I.%M %p"
-+msgstr "%I.%M %p"
-
- #: applets/clock/clock.c:221 applets/clock/clock.c:773
- msgid "%H:%M:%S"
--msgstr "%-H.%M.%S"
-+msgstr "%H.%M.%S"
-
- #: applets/clock/clock.c:221 applets/clock/clock.c:775
- msgid "%H:%M"
--msgstr "%-H.%M"
-+msgstr "%H.%M"
-
- #: applets/clock/clock.c:227
- msgid "%a %b %d"
--msgstr "%a %-d %b"
-+msgstr "%a %d %b"
-
- #. translators: reverse the order of these arguments
- #. * if the time should come before the
-@@ -60,7 +60,7 @@
- #. Show date in tooltip
- #: applets/clock/clock.c:344
- msgid "%A %B %d"
--msgstr "%A %-d %B"
-+msgstr "%A %d %B"
-
- #: applets/clock/clock.c:472
- msgid "Calendar"
-@@ -72,15 +72,15 @@
-
- #: applets/clock/clock.c:768
- msgid "%I:%M:%S %p"
--msgstr "%-I.%M.%S %p"
-+msgstr "%I.%M.%S %p"
-
- #: applets/clock/clock.c:770
- msgid "%I:%M %p"
--msgstr "%-I.%M %p"
-+msgstr "%I.%M %p"
-
- #: applets/clock/clock.c:809
- msgid "%A, %B %d %Y"
--msgstr "%A, %-d %B %Y"
-+msgstr "%A, %d %B %Y"
-
- #: applets/clock/clock.c:850
- #, c-format
diff --git a/x11/gnomepanel/files/patch-po_zh_TW.po b/x11/gnomepanel/files/patch-po_zh_TW.po
deleted file mode 100644
index 3e7e16c45ddb..000000000000
--- a/x11/gnomepanel/files/patch-po_zh_TW.po
+++ /dev/null
@@ -1,20 +0,0 @@
---- po/zh_TW.po.orig Wed Oct 1 15:57:10 2003
-+++ po/zh_TW.po Wed Oct 1 15:57:19 2003
-@@ -40,7 +40,7 @@
-
- #: applets/clock/clock.c:227
- msgid "%a %b %d"
--msgstr "%-m月%-d日(%a)"
-+msgstr "%m月%d日(%a)"
-
- #. translators: reverse the order of these arguments
- #. * if the time should come before the
-@@ -67,7 +67,7 @@
- #. Show date in tooltip
- #: applets/clock/clock.c:344
- msgid "%A %B %d"
--msgstr "%-m月%-d日(%A)"
-+msgstr "%m月%d日(%A)"
-
- #: applets/clock/clock.c:472
- msgid "Calendar"
diff --git a/x11/gnomepanel/pkg-descr b/x11/gnomepanel/pkg-descr
index 5e73398913a9..263044b5e130 100644
--- a/x11/gnomepanel/pkg-descr
+++ b/x11/gnomepanel/pkg-descr
@@ -1,3 +1,3 @@
-Panel component for the GNOME 2 Desktop.
+This drives the GNOME 2 panel.
WWW: http://www.gnome.org/
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index f10b99a60775..e691400d6c7d 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -64,9 +64,9 @@ etc/gconf/schemas/panel-toplevel.schemas
etc/gconf/schemas/window-list.schemas
etc/gconf/schemas/workspace-switcher.schemas
include/panel-2.0/GNOME_Panel.h
+include/panel-2.0/panel-applet-enums.h
include/panel-2.0/panel-applet-gconf.h
include/panel-2.0/panel-applet.h
-lib/libclock-applet-2.so
lib/libpanel-applet-2.a
lib/libpanel-applet-2.so
lib/libpanel-applet-2.so.0
@@ -76,21 +76,27 @@ libdata/bonobo/servers/GNOME_NotificationAreaApplet.server
libdata/bonobo/servers/GNOME_Panel.server
libdata/bonobo/servers/GNOME_Wncklet_Factory.server
libdata/pkgconfig/libpanelapplet-2.0.pc
+libexec/clock-applet
libexec/fish-applet-2
libexec/notification-area-applet
libexec/wnck-applet
+share/doc/panel-applet/PanelApplet.html
share/doc/panel-applet/applet-popups.html
share/doc/panel-applet/applet-porting.html
share/doc/panel-applet/applet-writing.html
+share/doc/panel-applet/home.png
+share/doc/panel-applet/index.html
share/doc/panel-applet/index.sgml
-share/doc/panel-applet/libpanel-applet.html
+share/doc/panel-applet/left.png
share/doc/panel-applet/multi-applets.html
-share/doc/panel-applet/panel-applet-panel-applet-gconf-utilities.html
+share/doc/panel-applet/panel-applet-Panel-Applet-GConf-Utilities.html
+share/doc/panel-applet/panel-applet.devhelp
share/doc/panel-applet/panel-applet.html
share/doc/panel-applet/panel-signals.html
-share/doc/panel-applet/panelapplet.html
+share/doc/panel-applet/right.png
share/doc/panel-applet/server-files.html
share/doc/panel-applet/session-saving.html
+share/doc/panel-applet/up.png
share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop
share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml
share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml
@@ -129,9 +135,6 @@ share/gnome/help/clock/ko/legal.xml
share/gnome/help/clock/sv/clock.xml
share/gnome/help/clock/sv/figures/clock_applet.png
share/gnome/help/clock/sv/legal.xml
-share/gnome/help/clock/uk/clock.xml
-share/gnome/help/clock/uk/figures/clock_applet.png
-share/gnome/help/clock/uk/legal.xml
share/gnome/help/clock/zh_CN/clock.xml
share/gnome/help/clock/zh_CN/figures/clock_applet.png
share/gnome/help/clock/zh_CN/legal.xml
@@ -168,9 +171,6 @@ share/gnome/help/fish-applet-2/sv/figures/fish_applet.png
share/gnome/help/fish-applet-2/sv/figures/fish_settings.png
share/gnome/help/fish-applet-2/sv/fish-applet-2.xml
share/gnome/help/fish-applet-2/sv/legal.xml
-share/gnome/help/fish-applet-2/uk/figures/fish_applet.png
-share/gnome/help/fish-applet-2/uk/fish-applet-2.xml
-share/gnome/help/fish-applet-2/uk/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
@@ -217,10 +217,6 @@ share/gnome/help/window-list/sv/figures/window_list_group.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.png
share/gnome/help/window-list/zh_CN/figures/window_list_group_applet.png
@@ -261,9 +257,6 @@ share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png
share/gnome/help/workspace-switcher/sv/figures/workspacelist_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/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
@@ -289,8 +282,6 @@ share/gnome/omf/gnome-panel/clock-ko.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-ko.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/clock-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-sv.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-panel/clock-uk.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-uk.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/clock-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-zh_CN.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/clock-zh_TW.omf
@@ -311,8 +302,6 @@ share/gnome/omf/gnome-panel/fish-applet-2-ko.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ko.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/fish-applet-2-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-sv.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-panel/fish-applet-2-uk.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-uk.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf
@@ -333,8 +322,6 @@ share/gnome/omf/gnome-panel/window-list-ko.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-ko.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/window-list-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-sv.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-panel/window-list-uk.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-uk.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/window-list-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-zh_CN.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/window-list-zh_TW.omf
@@ -355,8 +342,6 @@ share/gnome/omf/gnome-panel/workspace-switcher-ko.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ko.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/workspace-switcher-sv.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-sv.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-panel/workspace-switcher-uk.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-uk.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf
@@ -385,7 +370,6 @@ share/gnome/pixmaps/gnome-panel-type-sliding.png
share/gnome/pixmaps/gnome-panel.png
share/gnome/pixmaps/gnome-run.png
share/gnome/pixmaps/gnome-screenshot.png
-share/gnome/pixmaps/gnome-show-desktop.png
share/gnome/pixmaps/panel-drawer.png
share/gnome/pixmaps/panel-force-quit.png
share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
@@ -400,6 +384,7 @@ share/locale/cy/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/da/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/de/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/el/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/eo/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/es/LC_MESSAGES/gnome-panel-2.0.mo
@@ -412,6 +397,7 @@ share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/he/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/hi/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
@@ -423,10 +409,12 @@ share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/mk/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ml/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/mr/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/no/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/pa/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/pl/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/pt/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/pt_BR/LC_MESSAGES/gnome-panel-2.0.mo
@@ -437,8 +425,10 @@ share/locale/sl/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/sq/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/sr/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/sr@ije/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/sv/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ta/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/vi/LC_MESSAGES/gnome-panel-2.0.mo
@@ -452,8 +442,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@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/uk
@dirrm share/gnome/help/workspace-switcher/sv/figures
@dirrm share/gnome/help/workspace-switcher/sv
@dirrm share/gnome/help/workspace-switcher/ko/figures
@@ -475,8 +463,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@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/ko/figures
@@ -498,8 +484,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@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/uk/figures
-@dirrm share/gnome/help/fish-applet-2/uk
@dirrm share/gnome/help/fish-applet-2/sv/figures
@dirrm share/gnome/help/fish-applet-2/sv
@dirrm share/gnome/help/fish-applet-2/ko/figures
@@ -521,8 +505,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm share/gnome/help/clock/zh_TW
@dirrm share/gnome/help/clock/zh_CN/figures
@dirrm share/gnome/help/clock/zh_CN
-@dirrm share/gnome/help/clock/uk/figures
-@dirrm share/gnome/help/clock/uk
@dirrm share/gnome/help/clock/sv/figures
@dirrm share/gnome/help/clock/sv
@dirrm share/gnome/help/clock/ko/figures
@@ -601,7 +583,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-ja.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-uk.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-zh_CN.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true
@@ -612,7 +593,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ja.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-uk.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true
@@ -623,7 +603,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-ja.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-uk.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-zh_CN.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true
@@ -634,6 +613,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ja.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ko.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-uk.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index 6dbda489a1a5..857eaa4af5c1 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -6,16 +6,16 @@
#
PORTNAME= gnomesession
-PORTVERSION= 2.4.2
-PORTREVISION= 1
+PORTVERSION= 2.6.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME} \
+ http://people.FreeBSD.org/~marcus/:local \
${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR= sources/gnome-session/2.4 \
+MASTER_SITE_SUBDIR= sources/gnome-session/2.6 \
marcus/:local
DISTNAME= gnome-session-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- splash.png:local
+ ${SPLASH_IMG}:local
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -23,7 +23,7 @@ COMMENT= Session component for the GNOME 2 desktop
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui
+USE_GNOME= gnomeprefix gnomehack gnomehier intlhack lthack libgnomeui
USE_GMAKE= yes
USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
@@ -33,11 +33,13 @@ MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \
gnome-session-save.1
MAN5= default.session.5
+SPLASH_IMG= gnome-splash04-12.png
+
post-extract:
- @${CP} ${DISTDIR}/${DIST_SUBDIR}/splash.png ${WRKDIR}
+ @${CP} ${DISTDIR}/${DIST_SUBDIR}/${SPLASH_IMG} ${WRKDIR}
post-install:
- ${INSTALL_DATA} ${WRKDIR}/splash.png \
+ ${INSTALL_DATA} ${WRKDIR}/${SPLASH_IMG} \
${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png
.include <bsd.port.mk>
diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo
index 0a06b2a8ed0e..56764710a045 100644
--- a/x11/gnomesession/distinfo
+++ b/x11/gnomesession/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnome2/gnome-session-2.4.2.tar.bz2) = fc2e6d9c71b4d1fe08ec329d7e03684e
-SIZE (gnome2/gnome-session-2.4.2.tar.bz2) = 911570
-MD5 (gnome2/splash.png) = bd73a8a1f0c97aac669045f6b9b1fe02
-SIZE (gnome2/splash.png) = 59161
+MD5 (gnome2/gnome-session-2.6.0.tar.bz2) = 42018f3e5f201a4f449de444c600ce29
+SIZE (gnome2/gnome-session-2.6.0.tar.bz2) = 836172
+MD5 (gnome2/gnome-splash04-12.png) = a26cafb0ccffd5e173d7255e683faafd
+SIZE (gnome2/gnome-splash04-12.png) = 75841
diff --git a/x11/gnomesession/files/patch-configure b/x11/gnomesession/files/patch-configure
deleted file mode 100644
index 61084626cb14..000000000000
--- a/x11/gnomesession/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Wed May 8 14:27:04 2002
-+++ configure Wed May 8 14:27:23 2002
-@@ -7232,6 +7232,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11/gnomesession/files/patch-gnome-session_gnome-session.schemas.in.in b/x11/gnomesession/files/patch-gnome-session_gnome-session.schemas.in.in
deleted file mode 100644
index 9bd6c9a2cf68..000000000000
--- a/x11/gnomesession/files/patch-gnome-session_gnome-session.schemas.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-session/gnome-session.schemas.in.in.orig Mon Oct 14 17:18:15 2002
-+++ gnome-session/gnome-session.schemas.in.in Mon Oct 14 17:17:44 2002
-@@ -50,7 +50,7 @@
- <applyto>/apps/gnome-session/options/splash_image</applyto>
- <owner>gnome</owner>
- <type>string</type>
-- <default>@prefix@/share/pixmaps/splash/gnome-splash.png</default>
-+ <default>@datadir@/pixmaps/splash/gnome-splash.png</default>
- <locale name="C">
- <short>Splash Screen Image</short>
- <long>Preferred Image to use for the splash screen when logging in to the GNOME Desktop</long>
diff --git a/x11/gnomesession/pkg-descr b/x11/gnomesession/pkg-descr
index e0a6dd0276ff..50986ef910b2 100644
--- a/x11/gnomesession/pkg-descr
+++ b/x11/gnomesession/pkg-descr
@@ -1,2 +1,2 @@
-Session component for the GNOME 2.0 desktop. This package contains the
-commands needed to start GNOME 2.0.
+This provides session management for the GNOME 2 desktop, and
+provides the tools used to start the desktop.
diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist
index d4fc0ded7788..355893a4e9d8 100644
--- a/x11/gnomesession/pkg-plist
+++ b/x11/gnomesession/pkg-plist
@@ -26,6 +26,7 @@ share/locale/cy/LC_MESSAGES/gnome-session-2.0.mo
share/locale/da/LC_MESSAGES/gnome-session-2.0.mo
share/locale/de/LC_MESSAGES/gnome-session-2.0.mo
share/locale/el/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-session-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-session-2.0.mo
share/locale/eo/LC_MESSAGES/gnome-session-2.0.mo
share/locale/es/LC_MESSAGES/gnome-session-2.0.mo
@@ -38,6 +39,7 @@ share/locale/ga/LC_MESSAGES/gnome-session-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-session-2.0.mo
share/locale/he/LC_MESSAGES/gnome-session-2.0.mo
share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-session-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-session-2.0.mo
share/locale/id/LC_MESSAGES/gnome-session-2.0.mo
share/locale/is/LC_MESSAGES/gnome-session-2.0.mo
@@ -50,10 +52,12 @@ share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo
share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ml/LC_MESSAGES/gnome-session-2.0.mo
share/locale/mn/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/mr/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo
share/locale/no/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/pa/LC_MESSAGES/gnome-session-2.0.mo
share/locale/pl/LC_MESSAGES/gnome-session-2.0.mo
share/locale/pt/LC_MESSAGES/gnome-session-2.0.mo
share/locale/pt_BR/LC_MESSAGES/gnome-session-2.0.mo
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index d9e6311b68f2..377dc9186d6b 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= gnometerminal
-PORTVERSION= 2.4.2
-PORTREVISION= 1
+PORTVERSION= 2.6.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-terminal/2.4
+MASTER_SITE_SUBDIR= sources/gnome-terminal/2.6
DISTNAME= gnome-terminal-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -19,8 +18,9 @@ COMMENT= Terminal component for the GNOME 2 Desktop
USE_BZIP2= yes
USE_X_PREFIX= yes
+USE_REINPLACE= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui vte
+USE_GNOME= gnomeprefix gnomehack intlhack lthack gnomehier libgnomeui vte
USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/gnometerminal/distinfo b/x11/gnometerminal/distinfo
index 44e6dc6d5d8b..c497086810d0 100644
--- a/x11/gnometerminal/distinfo
+++ b/x11/gnometerminal/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-terminal-2.4.2.tar.bz2) = ce7e5a207eb48c5ef23325c406536c33
-SIZE (gnome2/gnome-terminal-2.4.2.tar.bz2) = 1658743
+MD5 (gnome2/gnome-terminal-2.6.0.tar.bz2) = bbb9d4d6bddaec8611d4c002842ec5b8
+SIZE (gnome2/gnome-terminal-2.6.0.tar.bz2) = 1911916
diff --git a/x11/gnometerminal/files/patch-configure b/x11/gnometerminal/files/patch-configure
deleted file mode 100644
index b393b3039c70..000000000000
--- a/x11/gnometerminal/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Thu May 2 00:36:18 2002
-+++ configure Thu May 2 00:37:15 2002
-@@ -6414,6 +6414,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11/gnometerminal/pkg-descr b/x11/gnometerminal/pkg-descr
index eca945789b32..1193c30f736a 100644
--- a/x11/gnometerminal/pkg-descr
+++ b/x11/gnometerminal/pkg-descr
@@ -1,3 +1,3 @@
-Terminal component for the GNOME 2.0 Desktop.
+Default terminal emulator for the GNOME 2.0 Desktop.
WWW: http://www.gnome.org/
diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist
index 43c24a4f2676..d3648bdea305 100644
--- a/x11/gnometerminal/pkg-plist
+++ b/x11/gnometerminal/pkg-plist
@@ -104,6 +104,7 @@ share/locale/cy/LC_MESSAGES/gnome-terminal.mo
share/locale/da/LC_MESSAGES/gnome-terminal.mo
share/locale/de/LC_MESSAGES/gnome-terminal.mo
share/locale/el/LC_MESSAGES/gnome-terminal.mo
+share/locale/en_CA/LC_MESSAGES/gnome-terminal.mo
share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo
share/locale/es/LC_MESSAGES/gnome-terminal.mo
share/locale/et/LC_MESSAGES/gnome-terminal.mo
@@ -114,6 +115,7 @@ share/locale/ga/LC_MESSAGES/gnome-terminal.mo
share/locale/gl/LC_MESSAGES/gnome-terminal.mo
share/locale/he/LC_MESSAGES/gnome-terminal.mo
share/locale/hi/LC_MESSAGES/gnome-terminal.mo
+share/locale/hr/LC_MESSAGES/gnome-terminal.mo
share/locale/hu/LC_MESSAGES/gnome-terminal.mo
share/locale/id/LC_MESSAGES/gnome-terminal.mo
share/locale/it/LC_MESSAGES/gnome-terminal.mo
@@ -126,6 +128,7 @@ share/locale/ml/LC_MESSAGES/gnome-terminal.mo
share/locale/mn/LC_MESSAGES/gnome-terminal.mo
share/locale/ms/LC_MESSAGES/gnome-terminal.mo
share/locale/nl/LC_MESSAGES/gnome-terminal.mo
+share/locale/nn/LC_MESSAGES/gnome-terminal.mo
share/locale/no/LC_MESSAGES/gnome-terminal.mo
share/locale/pl/LC_MESSAGES/gnome-terminal.mo
share/locale/pt/LC_MESSAGES/gnome-terminal.mo
@@ -139,6 +142,7 @@ share/locale/sr/LC_MESSAGES/gnome-terminal.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-terminal.mo
share/locale/sv/LC_MESSAGES/gnome-terminal.mo
share/locale/ta/LC_MESSAGES/gnome-terminal.mo
+share/locale/th/LC_MESSAGES/gnome-terminal.mo
share/locale/tr/LC_MESSAGES/gnome-terminal.mo
share/locale/uk/LC_MESSAGES/gnome-terminal.mo
share/locale/vi/LC_MESSAGES/gnome-terminal.mo
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index db28208248d6..7db61fe4291d 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= libgnome
-PORTVERSION= 2.4.0
-PORTREVISION= 4
+PORTVERSION= 2.6.0
CATEGORIES?= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6
DIST_SUBDIR= gnome2
MAINTAINER?= gnome@FreeBSD.org
@@ -23,7 +22,8 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_XPM= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier esound gnomevfs2 libxslt
+USE_GNOME= gnomeprefix gnomehack gnomehier intlhack esound gnomevfs2 \
+ libxslt
USE_BISON= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL_VER=13
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index fdfafd2acacb..7c8c192bb53a 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnome-2.4.0.tar.bz2) = caec1e12d64b98a2925a4317ac16429f
-SIZE (gnome2/libgnome-2.4.0.tar.bz2) = 964070
+MD5 (gnome2/libgnome-2.6.0.tar.bz2) = c3fd920119581ba1da531222ed69a5e0
+SIZE (gnome2/libgnome-2.6.0.tar.bz2) = 1070613
diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in
index 4a73422b2c2e..a3e14ed9e902 100644
--- a/x11/libgnome/files/patch-libgnome::Makefile.in
+++ b/x11/libgnome/files/patch-libgnome::Makefile.in
@@ -1,11 +1,12 @@
---- libgnome/Makefile.in.orig Sat Jun 14 05:07:39 2003
-+++ libgnome/Makefile.in Sat Jun 14 05:10:06 2003
-@@ -156,7 +156,7 @@
-
+--- libgnome/Makefile.in.orig Wed Feb 25 01:17:58 2004
++++ libgnome/Makefile.in Wed Feb 25 01:20:59 2004
+@@ -159,6 +159,9 @@
libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome
--INCLUDES = -I.. -I$(srcdir)/.. $(WARN_CFLAGS) $(LIBGNOME_CFLAGS) -DG_DISABLE_DEPRECATED -DLIBGNOME_PREFIX=\""$(prefix)"\" -DLIBGNOME_LIBDIR=\""$(libdir)"\" -DLIBGNOME_DATADIR=\""$(datadir)"\" -DLIBGNOME_BINDIR=\""$(bindir)"\" -DLIBGNOME_LOCALSTATEDIR=\""$(localstatedir)"\" -DLIBGNOME_LOCALEDIR=\""$(gnomelocaledir)"\" -DLIBGNOME_SYSCONFDIR=\""$(sysconfdir)"\" -DVERSION=\""$(VERSION)"\" -DGNOMEVFSVERSION=\"$(GNOME_VFS_VERSION)\" -DG_LOG_DOMAIN=\"Gnome\"
-+INCLUDES = -DPREFIX=\""$(PREFIX)"\" -DLOCALBASE=\""$(LOCALBASE)"\" -DX11BASE=\""$(X11BASE)"\" -I.. -I$(srcdir)/.. $(WARN_CFLAGS) $(LIBGNOME_CFLAGS) -DG_DISABLE_DEPRECATED -DLIBGNOME_PREFIX=\""$(prefix)"\" -DLIBGNOME_LIBDIR=\""$(libdir)"\" -DLIBGNOME_DATADIR=\""$(datadir)"\" -DLIBGNOME_BINDIR=\""$(bindir)"\" -DLIBGNOME_LOCALSTATEDIR=\""$(localstatedir)"\" -DLIBGNOME_LOCALEDIR=\""$(gnomelocaledir)"\" -DLIBGNOME_SYSCONFDIR=\""$(sysconfdir)"\" -DVERSION=\""$(VERSION)"\" -DGNOMEVFSVERSION=\"$(GNOME_VFS_VERSION)\" -DG_LOG_DOMAIN=\"Gnome\"
-
-
- libgnome_2_la_SOURCES = libgnometypebuiltins.h libgnometypebuiltins.c gnome-config.c gnome-sound.c gnome-triggers.c gnome-triggersP.h gnome-program.c gnome-help.c gnome-exec.c gnome-gconf.c gnome-gconfP.h gnome-i18n.c gnome-i18nP.h gnome-url.c gnome-util.c gnome-score.c gnome-init.c
+ INCLUDES = \
++ -DPREFIX=\""$(PREFIX)"\" \
++ -DLOCALBASE=\""$(LOCALBASE)"\" \
++ -DX11BASE=\""$(X11BASE)"\" \
+ -I.. \
+ -I$(srcdir)/.. \
+ $(WARN_CFLAGS) \
diff --git a/x11/libgnome/pkg-descr b/x11/libgnome/pkg-descr
index f7f15642367f..b78aaf2ccde6 100644
--- a/x11/libgnome/pkg-descr
+++ b/x11/libgnome/pkg-descr
@@ -1,3 +1,3 @@
-Libraries for GNOME, a GNU desktop environment
+LibGnome provides the non-GUI backend for the GNOME environment.
WWW: http://www.gnome.org/
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 109fc1e85184..3f2d20d23f62 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -10,19 +10,13 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/applications/window_manager/%gconf.xm
etc/gconf/gconf.xml.defaults/desktop/gnome/background/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/file_views/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/interface/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/lockdown/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/sound/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/typing_break/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/keyboard/%gconf.xml
@@ -35,19 +29,13 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/window_manager/%
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/background/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/file-views/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/interface/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/lockdown/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/typing_break/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash/%gconf.xml
etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas
etc/gconf/schemas/desktop_gnome_accessibility_startup.schemas
etc/gconf/schemas/desktop_gnome_applications_browser.schemas
@@ -57,12 +45,12 @@ etc/gconf/schemas/desktop_gnome_applications_window_manager.schemas
etc/gconf/schemas/desktop_gnome_background.schemas
etc/gconf/schemas/desktop_gnome_file_views.schemas
etc/gconf/schemas/desktop_gnome_interface.schemas
+etc/gconf/schemas/desktop_gnome_lockdown.schemas
etc/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas
etc/gconf/schemas/desktop_gnome_peripherals_mouse.schemas
etc/gconf/schemas/desktop_gnome_sound.schemas
etc/gconf/schemas/desktop_gnome_thumbnailers.schemas
etc/gconf/schemas/desktop_gnome_typing_break.schemas
-etc/gconf/schemas/desktop_gnome_url_handlers.schemas
etc/sound/events/gnome-2.soundlist
etc/sound/events/gtk-events-2.soundlist
include/libgnome-2.0/libgnome/gnome-config.h
@@ -83,7 +71,7 @@ include/libgnome-2.0/libgnome/libgnometypebuiltins.h
lib/bonobo/monikers/libmoniker_extra_2.so
lib/libgnome-2.a
lib/libgnome-2.so
-lib/libgnome-2.so.400
+lib/libgnome-2.so.600
libdata/bonobo/servers/GNOME_Moniker_std.server
libdata/pkgconfig/libgnome-2.0.pc
share/doc/libgnome/ch01s02.html
@@ -94,6 +82,7 @@ share/doc/libgnome/home.png
share/doc/libgnome/index.html
share/doc/libgnome/index.sgml
share/doc/libgnome/left.png
+share/doc/libgnome/libgnome.html
share/doc/libgnome/libgnome-gnome-config.html
share/doc/libgnome/libgnome-gnome-exec.html
share/doc/libgnome/libgnome-gnome-gconf.html
@@ -108,7 +97,6 @@ share/doc/libgnome/libgnome-gnome-url.html
share/doc/libgnome/libgnome-gnome-util.html
share/doc/libgnome/libgnome-libgnometypebuiltins.html
share/doc/libgnome/libgnome.devhelp
-share/doc/libgnome/libgnome.html
share/doc/libgnome/right.png
share/doc/libgnome/up.png
share/locale/am/LC_MESSAGES/libgnome-2.0.mo
@@ -124,6 +112,7 @@ share/locale/cy/LC_MESSAGES/libgnome-2.0.mo
share/locale/da/LC_MESSAGES/libgnome-2.0.mo
share/locale/de/LC_MESSAGES/libgnome-2.0.mo
share/locale/el/LC_MESSAGES/libgnome-2.0.mo
+share/locale/en_CA/LC_MESSAGES/libgnome-2.0.mo
share/locale/en_GB/LC_MESSAGES/libgnome-2.0.mo
share/locale/es/LC_MESSAGES/libgnome-2.0.mo
share/locale/et/LC_MESSAGES/libgnome-2.0.mo
@@ -135,6 +124,7 @@ share/locale/ga/LC_MESSAGES/libgnome-2.0.mo
share/locale/gl/LC_MESSAGES/libgnome-2.0.mo
share/locale/he/LC_MESSAGES/libgnome-2.0.mo
share/locale/hi/LC_MESSAGES/libgnome-2.0.mo
+share/locale/hr/LC_MESSAGES/libgnome-2.0.mo
share/locale/hu/LC_MESSAGES/libgnome-2.0.mo
share/locale/id/LC_MESSAGES/libgnome-2.0.mo
share/locale/is/LC_MESSAGES/libgnome-2.0.mo
@@ -159,6 +149,7 @@ share/locale/sk/LC_MESSAGES/libgnome-2.0.mo
share/locale/sl/LC_MESSAGES/libgnome-2.0.mo
share/locale/sq/LC_MESSAGES/libgnome-2.0.mo
share/locale/sr/LC_MESSAGES/libgnome-2.0.mo
+share/locale/sr@ije/LC_MESSAGES/libgnome-2.0.mo
share/locale/sr@Latn/LC_MESSAGES/libgnome-2.0.mo
share/locale/sv/LC_MESSAGES/libgnome-2.0.mo
share/locale/ta/LC_MESSAGES/libgnome-2.0.mo
@@ -173,19 +164,13 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
@dirrm share/doc/libgnome
@dirrm include/libgnome-2.0/libgnome
@dirrm include/libgnome-2.0
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/typing_break
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/lockdown
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/interface
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/file-views
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/background
@@ -193,23 +178,16 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/help_viewer
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/browser
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/startup
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/keyboard
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/typing_break
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/sound
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/lockdown
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/interface
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/file_views
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/background
@@ -217,7 +195,10 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/help_viewer
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/browser
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/startup
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/keyboard
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility
+etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/%gconf.xml
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 2f0e35f6b2f9..1ce158f366fe 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libxklavier
-PORTVERSION= 0.96
-PORTREVISION= 1
+PORTVERSION= 1.00
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index 9ee97d4cfbac..342f10e681e1 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,2 +1,2 @@
-MD5 (libxklavier-0.96.tar.gz) = e95baf323e145403a1cd4f9405da60da
-SIZE (libxklavier-0.96.tar.gz) = 395211
+MD5 (libxklavier-1.00.tar.gz) = 38b5d5589aeeda0a1d8f2e43ff798a6a
+SIZE (libxklavier-1.00.tar.gz) = 408974
diff --git a/x11/libxklavier/pkg-descr b/x11/libxklavier/pkg-descr
index 89144da3c35c..d5000e3ad156 100644
--- a/x11/libxklavier/pkg-descr
+++ b/x11/libxklavier/pkg-descr
@@ -1,3 +1,4 @@
-Libxklavier is an utility to make XKB stuff easier.
+Libxklavier is a utility to simplify setting and changing
+keyboard layouts.
WWW: http://gswitchit.sourceforge.net/
diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist
index f80dbc6dea38..d58809c9513d 100644
--- a/x11/libxklavier/pkg-plist
+++ b/x11/libxklavier/pkg-plist
@@ -2,43 +2,8 @@ include/libxklavier/xklavier.h
include/libxklavier/xklavier_config.h
lib/libxklavier.a
lib/libxklavier.so
-lib/libxklavier.so.7
+lib/libxklavier.so.8
libdata/pkgconfig/libxklavier.pc
-share/doc/libxklavier-%%VERSION%%/html/annotated.html
-share/doc/libxklavier-%%VERSION%%/html/doxygen.css
-share/doc/libxklavier-%%VERSION%%/html/doxygen.png
-share/doc/libxklavier-%%VERSION%%/html/files.html
-share/doc/libxklavier-%%VERSION%%/html/functions.html
-share/doc/libxklavier-%%VERSION%%/html/globals.html
-share/doc/libxklavier-%%VERSION%%/html/group__activation.html
-share/doc/libxklavier-%%VERSION%%/html/group__callbacks.html
-share/doc/libxklavier-%%VERSION%%/html/group__currents.html
-share/doc/libxklavier-%%VERSION%%/html/group__debugerr.html
-share/doc/libxklavier-%%VERSION%%/html/group__enum.html
-share/doc/libxklavier-%%VERSION%%/html/group__lookup.html
-share/doc/libxklavier-%%VERSION%%/html/group__props.html
-share/doc/libxklavier-%%VERSION%%/html/group__settings.html
-share/doc/libxklavier-%%VERSION%%/html/group__wininfo.html
-share/doc/libxklavier-%%VERSION%%/html/group__xkbevents.html
-share/doc/libxklavier-%%VERSION%%/html/group__xkbgroup.html
-share/doc/libxklavier-%%VERSION%%/html/group__xkbinfo.html
-share/doc/libxklavier-%%VERSION%%/html/group__xklconfig.html
-share/doc/libxklavier-%%VERSION%%/html/group__xklconfiginitterm.html
-share/doc/libxklavier-%%VERSION%%/html/group__xklinitterm.html
-share/doc/libxklavier-%%VERSION%%/html/index.html
-share/doc/libxklavier-%%VERSION%%/html/modules.html
-share/doc/libxklavier-%%VERSION%%/html/structXklState-members.html
-share/doc/libxklavier-%%VERSION%%/html/structXklState.html
-share/doc/libxklavier-%%VERSION%%/html/struct__XklConfigItem-members.html
-share/doc/libxklavier-%%VERSION%%/html/struct__XklConfigItem.html
-share/doc/libxklavier-%%VERSION%%/html/struct__XklConfigRec-members.html
-share/doc/libxklavier-%%VERSION%%/html/struct__XklConfigRec.html
-share/doc/libxklavier-%%VERSION%%/html/xklavier_8h-source.html
-share/doc/libxklavier-%%VERSION%%/html/xklavier_8h.html
-share/doc/libxklavier-%%VERSION%%/html/xklavier__config_8h-source.html
-share/doc/libxklavier-%%VERSION%%/html/xklavier__config_8h.html
share/libxklavier/xfree86.xml
@dirrm share/libxklavier
-@dirrm share/doc/libxklavier-%%VERSION%%/html
-@dirrm share/doc/libxklavier-%%VERSION%%
@dirrm include/libxklavier
diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile
index 247dbd8a1c07..35166f2afb4e 100644
--- a/x11/startup-notification/Makefile
+++ b/x11/startup-notification/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= startup-notification
-PORTVERSION= 0.5
-PORTREVISION= 2
+PORTVERSION= 0.6
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.5
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.6
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -19,11 +18,10 @@ COMMENT= Library that supports startup notification spec from freedesktop.org
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier pkgconfig
+USE_GNOME= gnomeprefix gnomehack gnomehier lthack gnometarget pkgconfig
USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+ LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
diff --git a/x11/startup-notification/distinfo b/x11/startup-notification/distinfo
index 134f0107e7f6..6521f3f222e3 100644
--- a/x11/startup-notification/distinfo
+++ b/x11/startup-notification/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/startup-notification-0.5.tar.bz2) = 193cde48ed7ceaf346bd65590acc101c
-SIZE (gnome2/startup-notification-0.5.tar.bz2) = 156294
+MD5 (gnome2/startup-notification-0.6.tar.bz2) = d53172f761ea974e5d5f73f9b785294c
+SIZE (gnome2/startup-notification-0.6.tar.bz2) = 206341
diff --git a/x11/startup-notification/files/patch-configure b/x11/startup-notification/files/patch-configure
deleted file mode 100644
index 18ddad392e1e..000000000000
--- a/x11/startup-notification/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Thu Nov 14 13:11:13 2002
-+++ configure Thu Nov 14 13:11:36 2002
-@@ -7203,6 +7203,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 297cb3c6887c..458e5b649072 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= yelp
-PORTVERSION= 2.4.2
-PORTREVISION= 2
+PORTVERSION= 2.6.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -20,14 +19,10 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_GNOME= gnomeprefix gnomehack libgnomeui libgtkhtml
+USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libgtkhtml lthack
USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
-post-patch:
- @${REINPLACE_CMD} -e 's|\@prefix\@/share|\@datadir\@|g' \
- ${WRKSRC}/stylesheets/docbook/catalog.in
-
.include <bsd.port.mk>
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index 0f194b313fb0..bf1c70bc7d94 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/yelp-2.4.2.tar.bz2) = ee89f4d0886f7c3be1b9f6894a57ec1b
-SIZE (gnome2/yelp-2.4.2.tar.bz2) = 598274
+MD5 (gnome2/yelp-2.6.0.tar.bz2) = 50c7684b0239f3841e022603a15e4bfa
+SIZE (gnome2/yelp-2.6.0.tar.bz2) = 512061
diff --git a/x11/yelp/files/patch-configure b/x11/yelp/files/patch-configure
index 20702046e4a8..7e0c0705f738 100644
--- a/x11/yelp/files/patch-configure
+++ b/x11/yelp/files/patch-configure
@@ -1,25 +1,11 @@
---- configure.orig Tue Aug 12 03:36:10 2003
-+++ configure Tue Aug 12 10:30:37 2003
-@@ -18129,6 +18129,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -20408,12 +20409,12 @@
+--- configure.orig Mon Mar 22 19:14:23 2004
++++ configure Mon Mar 22 19:14:23 2004
+@@ -9879,7 +9879,7 @@
YELP_MODULES="gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0"
--YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| sed -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//'`"
-+YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| xargs -n1 echo -n ' -I '`"
-
-
-
- case $host in
-- *-linux-gnu | *-irix6*)
-+ *-linux-gnu | *-irix6* | *-freebsd*)
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_MAN_WHEREIS 1
- _ACEOF
+-idl_dirs="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0`"
++idl_dirs="`$PKG_CONFIG --variable=idldir libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0`"
+ for ac_prog in gsed sed
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
diff --git a/x11/yelp/files/patch-src_man2html_yelp-man2html.c b/x11/yelp/files/patch-src_man2html_yelp-man2html.c
deleted file mode 100644
index e30c81ba0d7e..000000000000
--- a/x11/yelp/files/patch-src_man2html_yelp-man2html.c
+++ /dev/null
@@ -1,55 +0,0 @@
---- src/man2html/yelp-man2html.c.orig Tue Jun 24 05:03:50 2003
-+++ src/man2html/yelp-man2html.c Thu Aug 14 15:47:14 2003
-@@ -129,6 +129,7 @@
- #include <string.h>
- #include <sys/stat.h>
- #include <dirent.h>
-+#include <sys/param.h>
- #include <sys/types.h>
- #include <time.h>
- #include <sys/time.h>
-@@ -3727,6 +3728,9 @@
- main(int argc, char **argv)
- {
- char *t=NULL;
-+#ifdef __FreeBSD__
-+ char *source=NULL;
-+#endif
- int i,len;
- char *buf;
- char *h = '\0';
-@@ -3845,6 +3849,24 @@
- * right.
- */
-
-+#ifdef __FreeBSD__
-+ if ((source = strstr(output, "source: ")) != NULL)
-+ {
-+ int j;
-+ for(i = 8, j = 0; i < strlen(source); i++)
-+ {
-+ if (!g_ascii_isspace((unsigned char)source[i]) && source[i] != ')')
-+ {
-+ output[j++] = source[i];
-+ }
-+ }
-+ output[j] = '\0';
-+ } else {
-+ i = strlen(output) - 1;
-+ while (g_ascii_isspace((unsigned char)output[i]))
-+ output[i--] = '\0';
-+ }
-+#else
- len = strlen(output);
- for(i = 0; i < len; i++)
- {
-@@ -3855,8 +3877,7 @@
- i = strlen(output) - 1;
- while (g_ascii_isspace((unsigned char)output[i]))
- output[i--] = '\0';
--
--
-+#endif
- if (output[0]) {
- #ifdef HAVE_LIBBZ2
- if(strstr(output,".bz2"))
diff --git a/x11/yelp/files/patch-stylesheets_yelp-custom.xml b/x11/yelp/files/patch-stylesheets_yelp-custom.xml
deleted file mode 100644
index e753d3632e2f..000000000000
--- a/x11/yelp/files/patch-stylesheets_yelp-custom.xml
+++ /dev/null
@@ -1,9 +0,0 @@
---- stylesheets/yelp-custom.xsl.orig Mon Jan 5 22:58:54 2004
-+++ stylesheets/yelp-custom.xsl Mon Jan 5 22:59:07 2004
-@@ -1,5 +1,6 @@
- <?xml version='1.0'?>
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-+ xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
- version='1.0'
- xmlns="http://www.w3.org/TR/xhtml1/transitional"
- exclude-result-prefixes="#default">
diff --git a/x11/yelp/pkg-descr b/x11/yelp/pkg-descr
index 5267ad53bb4e..d38af5629561 100644
--- a/x11/yelp/pkg-descr
+++ b/x11/yelp/pkg-descr
@@ -1,4 +1,4 @@
-Yelp is a help browser for GNOME 2.0. The name Yelp was suggested by Daniel
-Lundin. Yelp is pronounced the same as the swedish word for 'help'.
+Yelp is a help browser for GNOME 2.0 that displays GNOME
+help documents, info pages, manpages, and more.
WWW: http://www.gnome.org/
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index 5f47bf1e90d8..e17bc9e4f42e 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -1,147 +1,47 @@
bin/gnome-help
bin/yelp
-bin/yelp-pregenerate
libdata/bonobo/servers/GNOME_Yelp.server
-libexec/yelp-db2html
-libexec/yelp-info2html
-libexec/yelp-man2html
share/gnome/applications/yelp.desktop
-share/gnome/images/yelp/bcg.png
-share/gnome/images/yelp/empty.png
-share/gnome/images/yelp/gnome2-button.png
-share/gnome/sgml/docbook/yelp/docbook/VERSION
-share/gnome/sgml/docbook/yelp/docbook/common/af.xml
-share/gnome/sgml/docbook/yelp/docbook/common/ca.xml
-share/gnome/sgml/docbook/yelp/docbook/common/common.xsl
-share/gnome/sgml/docbook/yelp/docbook/common/cs.xml
-share/gnome/sgml/docbook/yelp/docbook/common/da.xml
-share/gnome/sgml/docbook/yelp/docbook/common/de.xml
-share/gnome/sgml/docbook/yelp/docbook/common/el.xml
-share/gnome/sgml/docbook/yelp/docbook/common/en.xml
-share/gnome/sgml/docbook/yelp/docbook/common/es.xml
-share/gnome/sgml/docbook/yelp/docbook/common/et.xml
-share/gnome/sgml/docbook/yelp/docbook/common/eu.xml
-share/gnome/sgml/docbook/yelp/docbook/common/fi.xml
-share/gnome/sgml/docbook/yelp/docbook/common/fr.xml
-share/gnome/sgml/docbook/yelp/docbook/common/gentext.xsl
-share/gnome/sgml/docbook/yelp/docbook/common/hu.xml
-share/gnome/sgml/docbook/yelp/docbook/common/id.xml
-share/gnome/sgml/docbook/yelp/docbook/common/it.xml
-share/gnome/sgml/docbook/yelp/docbook/common/ja.xml
-share/gnome/sgml/docbook/yelp/docbook/common/ko.xml
-share/gnome/sgml/docbook/yelp/docbook/common/l10n.dtd
-share/gnome/sgml/docbook/yelp/docbook/common/l10n.xml
-share/gnome/sgml/docbook/yelp/docbook/common/l10n.xsl
-share/gnome/sgml/docbook/yelp/docbook/common/labels.xsl
-share/gnome/sgml/docbook/yelp/docbook/common/nl.xml
-share/gnome/sgml/docbook/yelp/docbook/common/nn.xml
-share/gnome/sgml/docbook/yelp/docbook/common/no.xml
-share/gnome/sgml/docbook/yelp/docbook/common/pl.xml
-share/gnome/sgml/docbook/yelp/docbook/common/pt.xml
-share/gnome/sgml/docbook/yelp/docbook/common/pt_br.xml
-share/gnome/sgml/docbook/yelp/docbook/common/ro.xml
-share/gnome/sgml/docbook/yelp/docbook/common/ru.xml
-share/gnome/sgml/docbook/yelp/docbook/common/sk.xml
-share/gnome/sgml/docbook/yelp/docbook/common/sl.xml
-share/gnome/sgml/docbook/yelp/docbook/common/sr.xml
-share/gnome/sgml/docbook/yelp/docbook/common/subtitles.xsl
-share/gnome/sgml/docbook/yelp/docbook/common/sv.xml
-share/gnome/sgml/docbook/yelp/docbook/common/table.xsl
-share/gnome/sgml/docbook/yelp/docbook/common/th.xml
-share/gnome/sgml/docbook/yelp/docbook/common/titles.xsl
-share/gnome/sgml/docbook/yelp/docbook/common/tr.xml
-share/gnome/sgml/docbook/yelp/docbook/common/uk.xml
-share/gnome/sgml/docbook/yelp/docbook/common/xh.xml
-share/gnome/sgml/docbook/yelp/docbook/common/zh_cn.xml
-share/gnome/sgml/docbook/yelp/docbook/common/zh_tw.xml
-share/gnome/sgml/docbook/yelp/docbook/dtd/calstblx.dtd
-share/gnome/sgml/docbook/yelp/docbook/dtd/catalog
-share/gnome/sgml/docbook/yelp/docbook/dtd/dbcentx.mod
-share/gnome/sgml/docbook/yelp/docbook/dtd/dbgenent.mod
-share/gnome/sgml/docbook/yelp/docbook/dtd/dbhierx.mod
-share/gnome/sgml/docbook/yelp/docbook/dtd/dbnotnx.mod
-share/gnome/sgml/docbook/yelp/docbook/dtd/dbpoolx.mod
-share/gnome/sgml/docbook/yelp/docbook/dtd/docbookx.dtd
-share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-amsa.ent
-share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-amsb.ent
-share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-amsc.ent
-share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-amsn.ent
-share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-amso.ent
-share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-amsr.ent
-share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-box.ent
-share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-cyr1.ent
-share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-cyr2.ent
-share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-dia.ent
-share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-grk1.ent
-share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-grk2.ent
-share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-grk3.ent
-share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-grk4.ent
-share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-lat1.ent
-share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-lat2.ent
-share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-num.ent
-share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-pub.ent
-share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-tech.ent
-share/gnome/sgml/docbook/yelp/docbook/dtd/soextblx.dtd
-share/gnome/sgml/docbook/yelp/docbook/html/admon.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/autoidx.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/autotoc.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/biblio.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/block.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/calc-chunks.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/callout.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/changebars.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/chunk-experimental.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/chunk.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/chunker.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/component.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/division.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/docbook.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/ebnf.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/expchunk.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/footnote.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/formal.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/glossary.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/graphics.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/html.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/index.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/info.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/inline.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/keywords.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/lists.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/math.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/oldchunker.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/onechunk.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/param.xml
-share/gnome/sgml/docbook/yelp/docbook/html/param.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/pi.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/qandaset.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/refentry.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/sections.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/synop.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/table.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/titlepage.templates.xml
-share/gnome/sgml/docbook/yelp/docbook/html/titlepage.templates.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/titlepage.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/toc.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/verbatim.xsl
-share/gnome/sgml/docbook/yelp/docbook/html/xref.xsl
-share/gnome/sgml/docbook/yelp/docbook/images/blank.png
-share/gnome/sgml/docbook/yelp/docbook/images/caution.png
-share/gnome/sgml/docbook/yelp/docbook/images/home.png
-share/gnome/sgml/docbook/yelp/docbook/images/important.png
-share/gnome/sgml/docbook/yelp/docbook/images/next.png
-share/gnome/sgml/docbook/yelp/docbook/images/note.png
-share/gnome/sgml/docbook/yelp/docbook/images/prev.png
-share/gnome/sgml/docbook/yelp/docbook/images/tip.png
-share/gnome/sgml/docbook/yelp/docbook/images/up.png
-share/gnome/sgml/docbook/yelp/docbook/images/warning.png
-share/gnome/sgml/docbook/yelp/docbook/lib/lib.xsl
+share/gnome/sgml/docbook/yelp/db2html-admon.xsl
+share/gnome/sgml/docbook/yelp/db2html-biblio.xsl
+share/gnome/sgml/docbook/yelp/db2html-block.xsl
+share/gnome/sgml/docbook/yelp/db2html-callout.xsl
+share/gnome/sgml/docbook/yelp/db2html-chunk.xsl
+share/gnome/sgml/docbook/yelp/db2html-common.xsl
+share/gnome/sgml/docbook/yelp/db2html-division.xsl
+share/gnome/sgml/docbook/yelp/db2html-ebnf.xsl
+share/gnome/sgml/docbook/yelp/db2html-footnote.xsl
+share/gnome/sgml/docbook/yelp/db2html-glossary.xsl
+share/gnome/sgml/docbook/yelp/db2html-header.xsl
+share/gnome/sgml/docbook/yelp/db2html-html.xsl
+share/gnome/sgml/docbook/yelp/db2html-index.xsl
+share/gnome/sgml/docbook/yelp/db2html-inline.xsl
+share/gnome/sgml/docbook/yelp/db2html-list.xsl
+share/gnome/sgml/docbook/yelp/db2html-math.xsl
+share/gnome/sgml/docbook/yelp/db2html-media.xsl
+share/gnome/sgml/docbook/yelp/db2html-navbar.xsl
+share/gnome/sgml/docbook/yelp/db2html-param.xsl
+share/gnome/sgml/docbook/yelp/db2html-qanda.xsl
+share/gnome/sgml/docbook/yelp/db2html-refentry.xsl
+share/gnome/sgml/docbook/yelp/db2html-suppressed.xsl
+share/gnome/sgml/docbook/yelp/db2html-synopsis.xsl
+share/gnome/sgml/docbook/yelp/db2html-table.xsl
+share/gnome/sgml/docbook/yelp/db2html-title.xsl
+share/gnome/sgml/docbook/yelp/db2html-titlepage.xsl
+share/gnome/sgml/docbook/yelp/db2html-toc.xsl
+share/gnome/sgml/docbook/yelp/db2html-xref.xsl
+share/gnome/sgml/docbook/yelp/db2html.xsl
+share/gnome/sgml/docbook/yelp/gettext.xsl
share/gnome/sgml/docbook/yelp/l10n.xml
-share/gnome/sgml/docbook/yelp/yelp-custom.xsl
-share/gnome/sgml/docbook/yelp/yelp-customization.xsl
-share/gnome/sgml/docbook/yelp/yelp-functions.xsl
-share/gnome/yelp/catalog
+share/gnome/sgml/docbook/yelp/man2html.xsl
+share/gnome/yelp/default.css
+share/gnome/yelp/icons/caution.png
+share/gnome/yelp/icons/important.png
+share/gnome/yelp/icons/note.png
+share/gnome/yelp/icons/tip.png
+share/gnome/yelp/icons/warning.png
share/gnome/yelp/important_docs.xml
+share/gnome/yelp/toc.xml
share/gnome/yelp/ui/yelp.glade
share/locale/am/LC_MESSAGES/yelp.mo
share/locale/ar/LC_MESSAGES/yelp.mo
@@ -155,6 +55,8 @@ share/locale/cy/LC_MESSAGES/yelp.mo
share/locale/da/LC_MESSAGES/yelp.mo
share/locale/de/LC_MESSAGES/yelp.mo
share/locale/el/LC_MESSAGES/yelp.mo
+share/locale/en_CA/LC_MESSAGES/yelp.mo
+share/locale/en_GB/LC_MESSAGES/yelp.mo
share/locale/eo/LC_MESSAGES/yelp.mo
share/locale/es/LC_MESSAGES/yelp.mo
share/locale/et/LC_MESSAGES/yelp.mo
@@ -165,6 +67,7 @@ share/locale/ga/LC_MESSAGES/yelp.mo
share/locale/gl/LC_MESSAGES/yelp.mo
share/locale/he/LC_MESSAGES/yelp.mo
share/locale/hi/LC_MESSAGES/yelp.mo
+share/locale/hr/LC_MESSAGES/yelp.mo
share/locale/hu/LC_MESSAGES/yelp.mo
share/locale/id/LC_MESSAGES/yelp.mo
share/locale/is/LC_MESSAGES/yelp.mo
@@ -184,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/no/LC_MESSAGES/yelp.mo
+share/locale/pa/LC_MESSAGES/yelp.mo
share/locale/pl/LC_MESSAGES/yelp.mo
share/locale/pt/LC_MESSAGES/yelp.mo
share/locale/pt_BR/LC_MESSAGES/yelp.mo
@@ -204,13 +108,8 @@ share/locale/wa/LC_MESSAGES/yelp.mo
share/locale/zh_CN/LC_MESSAGES/yelp.mo
share/locale/zh_TW/LC_MESSAGES/yelp.mo
@dirrm share/gnome/yelp/ui
+@dirrm share/gnome/yelp/icons
@dirrm share/gnome/yelp
-@dirrm share/gnome/sgml/docbook/yelp/docbook/lib
-@dirrm share/gnome/sgml/docbook/yelp/docbook/images
-@dirrm share/gnome/sgml/docbook/yelp/docbook/html
-@dirrm share/gnome/sgml/docbook/yelp/docbook/dtd/ent
-@dirrm share/gnome/sgml/docbook/yelp/docbook/dtd
-@dirrm share/gnome/sgml/docbook/yelp/docbook/common
-@dirrm share/gnome/sgml/docbook/yelp/docbook
@dirrm share/gnome/sgml/docbook/yelp
-@dirrm share/gnome/images/yelp
+@dirrm share/gnome/sgml/docbook
+@dirrm share/gnome/sgml
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 8e3f85bd910d..101c9a7fc002 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -6,12 +6,11 @@
#
PORTNAME= zenity
-PORTVERSION= 1.8
-PORTREVISION= 1
+PORTVERSION= 2.6.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION}
-DIST_SUBDIR= gnome2
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6
+DIST_SUBDIR= gnome2
MAINTAINER= klammer@webonaut.com
COMMENT= Display GNOME dialogs from the command line
@@ -33,8 +32,6 @@ MAN1= zenity.1
CONFLICTS= gtkada-1.2.*
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
-
pre-configure:
@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
's|@DATADIRNAME@|share|'
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index 23099319f87d..e799a4fb343f 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/zenity-1.8.tar.bz2) = 28dc31137f8eb983a26b198b3d93e2d4
-SIZE (gnome2/zenity-1.8.tar.bz2) = 440948
+MD5 (gnome2/zenity-2.6.0.tar.bz2) = 4799af349c692f6a421d751711a81331
+SIZE (gnome2/zenity-2.6.0.tar.bz2) = 611617
diff --git a/x11/zenity/pkg-descr b/x11/zenity/pkg-descr
index 34a2188c0603..384c19680d45 100644
--- a/x11/zenity/pkg-descr
+++ b/x11/zenity/pkg-descr
@@ -1,4 +1,3 @@
-This is zenity - a rewrite of gdialog, the GNOME port of dialog
-which allows you to display dialog boxes from the commandline
-and shell scripts. If you understand, things are just as they
-are. If you don't understand, things are just as they are.
+Zenity allows dialog boxes to be created and displayed from the
+commandline. This provides a simple way to create a GUI for
+a shell script.
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index b6d62fb390ac..7f585be8ab44 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -1,7 +1,5 @@
bin/gdialog
bin/zenity
-share/gnome/omf/zenity/zenity-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/zenity/zenity-C.omf 2>/dev/null || /usr/bin/true
share/gnome/help/zenity/C/figures/zenity-calendar-screenshot.png
share/gnome/help/zenity/C/figures/zenity-entry-screenshot.png
share/gnome/help/zenity/C/figures/zenity-error-screenshot.png
@@ -14,6 +12,22 @@ share/gnome/help/zenity/C/figures/zenity-text-screenshot.png
share/gnome/help/zenity/C/figures/zenity-warning-screenshot.png
share/gnome/help/zenity/C/legal.xml
share/gnome/help/zenity/C/zenity.xml
+share/gnome/help/zenity/sr/figures/zenity-calendar-screenshot.png
+share/gnome/help/zenity/sr/figures/zenity-entry-screenshot.png
+share/gnome/help/zenity/sr/figures/zenity-error-screenshot.png
+share/gnome/help/zenity/sr/figures/zenity-fileselection-screenshot.png
+share/gnome/help/zenity/sr/figures/zenity-information-screenshot.png
+share/gnome/help/zenity/sr/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/sr/figures/zenity-progress-screenshot.png
+share/gnome/help/zenity/sr/figures/zenity-question-screenshot.png
+share/gnome/help/zenity/sr/figures/zenity-text-screenshot.png
+share/gnome/help/zenity/sr/figures/zenity-warning-screenshot.png
+share/gnome/help/zenity/sr/legal.xml
+share/gnome/help/zenity/sr/zenity.xml
+share/gnome/omf/zenity/zenity-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/zenity/zenity-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/zenity/zenity-sr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/zenity/zenity-sr.omf 2>/dev/null || /usr/bin/true
share/gnome/zenity/clothes/gnome-tshirt.png
share/gnome/zenity/clothes/hawaii-shirt.png
share/gnome/zenity/clothes/monk.png
@@ -27,10 +41,65 @@ share/gnome/zenity/zenity-progress.png
share/gnome/zenity/zenity-text.png
share/gnome/zenity/zenity.glade
share/gnome/zenity/zenity.png
+share/locale/am/LC_MESSAGES/zenity-0.1.mo
+share/locale/ar/LC_MESSAGES/zenity-0.1.mo
+share/locale/az/LC_MESSAGES/zenity-0.1.mo
+share/locale/be/LC_MESSAGES/zenity-0.1.mo
+share/locale/bn/LC_MESSAGES/zenity-0.1.mo
+share/locale/ca/LC_MESSAGES/zenity-0.1.mo
+share/locale/cs/LC_MESSAGES/zenity-0.1.mo
+share/locale/cy/LC_MESSAGES/zenity-0.1.mo
+share/locale/da/LC_MESSAGES/zenity-0.1.mo
+share/locale/de/LC_MESSAGES/zenity-0.1.mo
+share/locale/el/LC_MESSAGES/zenity-0.1.mo
+share/locale/en_GB/LC_MESSAGES/zenity-0.1.mo
+share/locale/es/LC_MESSAGES/zenity-0.1.mo
+share/locale/et/LC_MESSAGES/zenity-0.1.mo
+share/locale/eu/LC_MESSAGES/zenity-0.1.mo
+share/locale/fa/LC_MESSAGES/zenity-0.1.mo
+share/locale/fi/LC_MESSAGES/zenity-0.1.mo
+share/locale/fr/LC_MESSAGES/zenity-0.1.mo
+share/locale/ga/LC_MESSAGES/zenity-0.1.mo
+share/locale/hi/LC_MESSAGES/zenity-0.1.mo
+share/locale/hr/LC_MESSAGES/zenity-0.1.mo
+share/locale/hu/LC_MESSAGES/zenity-0.1.mo
+share/locale/is/LC_MESSAGES/zenity-0.1.mo
+share/locale/it/LC_MESSAGES/zenity-0.1.mo
+share/locale/ja/LC_MESSAGES/zenity-0.1.mo
+share/locale/ko/LC_MESSAGES/zenity-0.1.mo
+share/locale/lt/LC_MESSAGES/zenity-0.1.mo
+share/locale/ml/LC_MESSAGES/zenity-0.1.mo
+share/locale/mn/LC_MESSAGES/zenity-0.1.mo
+share/locale/ms/LC_MESSAGES/zenity-0.1.mo
+share/locale/ne/LC_MESSAGES/zenity-0.1.mo
+share/locale/nl/LC_MESSAGES/zenity-0.1.mo
+share/locale/nn/LC_MESSAGES/zenity-0.1.mo
+share/locale/no/LC_MESSAGES/zenity-0.1.mo
+share/locale/pa/LC_MESSAGES/zenity-0.1.mo
+share/locale/pl/LC_MESSAGES/zenity-0.1.mo
+share/locale/pt/LC_MESSAGES/zenity-0.1.mo
+share/locale/pt_BR/LC_MESSAGES/zenity-0.1.mo
+share/locale/ro/LC_MESSAGES/zenity-0.1.mo
+share/locale/ru/LC_MESSAGES/zenity-0.1.mo
+share/locale/sk/LC_MESSAGES/zenity-0.1.mo
+share/locale/sl/LC_MESSAGES/zenity-0.1.mo
+share/locale/sq/LC_MESSAGES/zenity-0.1.mo
+share/locale/sr/LC_MESSAGES/zenity-0.1.mo
+share/locale/sr@Latn/LC_MESSAGES/zenity-0.1.mo
+share/locale/sv/LC_MESSAGES/zenity-0.1.mo
+share/locale/ta/LC_MESSAGES/zenity-0.1.mo
+share/locale/th/LC_MESSAGES/zenity-0.1.mo
+share/locale/uk/LC_MESSAGES/zenity-0.1.mo
+share/locale/vi/LC_MESSAGES/zenity-0.1.mo
+share/locale/zh_CN/LC_MESSAGES/zenity-0.1.mo
+share/locale/zh_TW/LC_MESSAGES/zenity-0.1.mo
@dirrm share/gnome/omf/zenity
@dirrm share/gnome/help/zenity/C/figures
@dirrm share/gnome/help/zenity/C
+@dirrm share/gnome/help/zenity/sr/figures
+@dirrm share/gnome/help/zenity/sr
@dirrm share/gnome/help/zenity
@dirrm share/gnome/zenity/clothes
@dirrm share/gnome/zenity
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/zenity/zenity-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/zenity/zenity-sr.omf 2>/dev/null || /usr/bin/true