aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/Makefile1
-rw-r--r--x11/gdm/Makefile49
-rw-r--r--x11/gdm/distinfo6
-rw-r--r--x11/gdm/files/extra-patch-daemon_slave.c26
-rw-r--r--x11/gdm/files/gdm.in4
-rw-r--r--x11/gdm/files/patch-common_Makefile.in20
-rw-r--r--x11/gdm/files/patch-common_gdm-address.c27
-rw-r--r--x11/gdm/files/patch-common_gdm-common.c13
-rw-r--r--x11/gdm/files/patch-common_gdm-settings-keys.h10
-rw-r--r--x11/gdm/files/patch-config.h.in12
-rw-r--r--x11/gdm/files/patch-config_gdm.conf.in17
-rw-r--r--x11/gdm/files/patch-config_locale.alias191
-rw-r--r--x11/gdm/files/patch-configure137
-rw-r--r--x11/gdm/files/patch-daemon-gdm-server.c73
-rw-r--r--x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c10
-rw-r--r--x11/gdm/files/patch-daemon_Makefile.in10
-rw-r--r--x11/gdm/files/patch-daemon_gdm-session-worker.c11
-rw-r--r--x11/gdm/files/patch-daemon_gdmconsolekit.c11
-rw-r--r--x11/gdm/files/patch-data_Xsession.in (renamed from x11/gdm/files/patch-config_Xsession.in)4
-rw-r--r--x11/gdm/files/patch-data_gconf.path9
-rw-r--r--x11/gdm/files/patch-data_gdm.schemas.in.in14
-rw-r--r--x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in7
-rw-r--r--x11/gdm/files/patch-gui_gdmchooser.c18
-rw-r--r--x11/gdm/files/patch-gui_gdmsetup.c11
-rw-r--r--x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c20
-rw-r--r--x11/gdm/files/patch-gui_simple-greeter_Makefile.in11
-rw-r--r--x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c45
-rw-r--r--x11/gdm/files/patch-gui_simple-greeter_gdm-remote-login-window.c10
-rw-r--r--x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c51
-rw-r--r--x11/gdm/pkg-install20
-rw-r--r--x11/gdm/pkg-message10
-rw-r--r--x11/gdm/pkg-plist146
-rw-r--r--x11/gegl/Makefile39
-rw-r--r--x11/gegl/distinfo3
-rw-r--r--x11/gegl/pkg-descr8
-rw-r--r--x11/gegl/pkg-plist299
-rw-r--r--x11/gnome-applets/Makefile14
-rw-r--r--x11/gnome-applets/distinfo6
-rw-r--r--x11/gnome-applets/files/patch-aa39
-rw-r--r--x11/gnome-applets/files/patch-cpufreq-selector-freebsd132
-rw-r--r--x11/gnome-applets/files/patch-invest-applet_invest_invest-applet.py8
-rw-r--r--x11/gnome-applets/files/patch-invest-applet_invest_invest-chart8
-rw-r--r--x11/gnome-applets/files/patch-mixer_applet.c11
-rw-r--r--x11/gnome-applets/files/patch-modemlights_Makefile.in10
-rw-r--r--x11/gnome-applets/pkg-plist260
-rw-r--r--x11/gnome-desktop/Makefile4
-rw-r--r--x11/gnome-desktop/distinfo6
-rw-r--r--x11/gnome-desktop/pkg-plist33
-rw-r--r--x11/gnome-menus/Makefile5
-rw-r--r--x11/gnome-menus/distinfo6
-rw-r--r--x11/gnome-menus/files/patch-layout::applications.menu171
-rw-r--r--x11/gnome-menus/files/patch-layout::preferences.menu41
-rw-r--r--x11/gnome-menus/pkg-plist36
-rw-r--r--x11/gnome-panel/Makefile11
-rw-r--r--x11/gnome-panel/distinfo6
-rw-r--r--x11/gnome-panel/files/iso3166.tab268
-rw-r--r--x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c15
-rw-r--r--x11/gnome-panel/files/patch-gnome-panel_menu.c42
-rw-r--r--x11/gnome-panel/pkg-plist72
-rw-r--r--x11/gnome-screensaver/Makefile9
-rw-r--r--x11/gnome-screensaver/distinfo6
-rw-r--r--x11/gnome-screensaver/pkg-plist10
-rw-r--r--x11/gnome-session/Makefile10
-rw-r--r--x11/gnome-session/distinfo6
-rw-r--r--x11/gnome-session/files/patch-data_Makefile.in20
-rw-r--r--x11/gnome-session/files/patch-disable_debug13
-rw-r--r--x11/gnome-session/files/patch-gnome-session_Makefile.in10
-rw-r--r--x11/gnome-session/files/patch-gnome-session_gsm-autostart-app.c10
-rw-r--r--x11/gnome-session/pkg-descr2
-rw-r--r--x11/gnome-session/pkg-plist23
-rw-r--r--x11/gnome-terminal/Makefile4
-rw-r--r--x11/gnome-terminal/distinfo6
-rw-r--r--x11/gnome-terminal/files/patch-src_terminal-screen.c82
-rw-r--r--x11/gnome-terminal/pkg-plist27
-rw-r--r--x11/gnome2-power-tools/Makefile4
-rw-r--r--x11/gnome2/Makefile39
-rw-r--r--x11/libgnome/Makefile9
-rw-r--r--x11/libgnome/distinfo6
-rw-r--r--x11/libgnome/files/pkg-deinstall.in2
-rw-r--r--x11/libgnome/pkg-plist10
-rw-r--r--x11/libgnomekbd/Makefile7
-rw-r--r--x11/libgnomekbd/distinfo6
-rw-r--r--x11/libgnomekbd/pkg-plist15
-rw-r--r--x11/libgnomemm26/Makefile5
-rw-r--r--x11/libgnomemm26/distinfo6
-rw-r--r--x11/libxklavier/Makefile13
-rw-r--r--x11/libxklavier/distinfo6
-rw-r--r--x11/libxklavier/pkg-plist8
-rw-r--r--x11/pixman/Makefile4
-rw-r--r--x11/pixman/distinfo6
-rw-r--r--x11/yelp/Makefile9
-rw-r--r--x11/yelp/distinfo6
-rw-r--r--x11/yelp/pkg-plist10
-rw-r--r--x11/zenity/Makefile5
-rw-r--r--x11/zenity/distinfo6
-rw-r--r--x11/zenity/pkg-plist37
96 files changed, 1571 insertions, 1443 deletions
diff --git a/x11/Makefile b/x11/Makefile
index 87bf80acb198..488b0064729e 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -92,6 +92,7 @@
SUBDIR += gdesklets-tasklist
SUBDIR += gdkxft
SUBDIR += gdm
+ SUBDIR += gegl
SUBDIR += ggiterm
SUBDIR += glproto
SUBDIR += gmessage
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 2daced2d3639..42a182d4b50d 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gdm/Makefile,v 1.117 2008/03/22 04:21:52 mezz Exp $
+# $MCom: ports/x11/gdm/Makefile,v 1.142 2009/01/10 01:59:22 mezz Exp $
#
PORTNAME= gdm
-PORTVERSION= 2.20.8
+PORTVERSION= 2.24.1
+PORTREVISION= 3
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,27 +17,27 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 version of xdm display manager
BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity
-LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
- ck-connector.0:${PORTSDIR}/sysutils/consolekit
+LIB_DEPENDS= ck-connector.0:${PORTSDIR}/sysutils/consolekit \
+ execinfo:${PORTSDIR}/devel/libexecinfo
RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \
- xrdb:${PORTSDIR}/x11/xrdb
+ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
USE_BZIP2= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_XORG= dmx dmxproto
-INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_RC_SUBR= gdm
USE_GNOME_SUBR= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack intlhack gnomehier librsvg2 gnomedocutils \
- gnomeprefix
+USE_GNOME= gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \
+ gnomeprefix gnomepanel
+GCONF_SCHEMAS= gdm-simple-greeter.schemas
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-working-directory=${PREFIX}/etc/gdm/home
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
GTKDOC="false"
-CONFIGURE_ARGS=--with-console-kit=yes
SUB_FILES+= gdm.pam
@@ -45,11 +46,8 @@ PKGMESSAGE= ${WRKDIR}/pkg-message
GNOME_LOCALSTATEDIR= /var
-MAN1= gdm.1
-
-OPTIONS= IPV6 "Enable IPv6 support" off \
- KEYRING "Enable GnomeKeyring/PAM integration" on \
- LOG_LIMIT "Limit ~/.xsession-errors size" on
+OPTIONS= IPV6 "Enable IPv6 support" on \
+ KEYRING "Enable GnomeKeyring/PAM integration" on
.include <bsd.port.pre.mk>
@@ -66,25 +64,28 @@ CONFIGURE_ARGS+= --enable-ipv6
CONFIGURE_ARGS+= --disable-ipv6
.endif
-.if defined(WITHOUT_LOG_LIMIT)
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-daemon_slave.c
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \
- ${WRKSRC}/config/Makefile.in
+ ${WRKSRC}/data/Makefile.in
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+ ${WRKSRC}/daemon/gdm-session-worker.c \
+ ${WRKSRC}/data/gconf.path
+ @${REINPLACE_CMD} -e 's|/bin/true|/usr/bin/true|g' \
+ ${WRKSRC}/data/session-setup.entries
@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
- ${WRKSRC}/configure ${WRKSRC}/po/*.po ${WRKSRC}/gui/*.glade \
- ${WRKSRC}/daemon/*.c ${WRKSRC}/docs/*/*.*
- @${REINPLACE_CMD} -e 's|/etc/gdm/gdm.conf|${PREFIX}/etc/gdm/gdm.conf|' \
- ${WRKSRC}/docs/gdm.1
+ ${WRKSRC}/configure ${WRKSRC}/daemon/*.c ${WRKSRC}/po/*.po
post-install:
+ ${INSTALL_DATA} ${WRKSRC}/data/gconf.path \
+ ${PREFIX}/share/gdm/gconf.path
+ ${INSTALL_DATA} ${WRKSRC}/data/session-setup.entries \
+ ${PREFIX}/share/gdm/session-setup.entries
.if !defined(PACKAGE_BUILDING)
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.endif
- ${INSTALL_DATA} ${WRKSRC}/config/gdm.conf-custom \
+ ${INSTALL_DATA} ${WRKSRC}/data/gdm.conf-custom \
${PREFIX}/etc/gdm/custom.conf.default
+ ${MKDIR} ${PREFIX}/share/xsessions
${INSTALL_DATA} ${WRKDIR}/gdm.pam ${PREFIX}/etc/pam.d/gdm
@${MKDIR} ${PREFIX}/etc/gdm/Sessions
@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index e1471686b775..70511a9d1f11 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.20.8.tar.bz2) = c183b017280e6ef25ad38d618aac2271
-SHA256 (gnome2/gdm-2.20.8.tar.bz2) = cef608d263866003f573a9b80d29c635a74ee73343d3f45bb381cf50b5c52894
-SIZE (gnome2/gdm-2.20.8.tar.bz2) = 3932232
+MD5 (gnome2/gdm-2.24.1.tar.bz2) = 31139d7a79096463b127b4790058b056
+SHA256 (gnome2/gdm-2.24.1.tar.bz2) = 8869f464818a1626e481bba5c562bdb972ffb74f1a9da91d01199fa860ee040f
+SIZE (gnome2/gdm-2.24.1.tar.bz2) = 2579979
diff --git a/x11/gdm/files/extra-patch-daemon_slave.c b/x11/gdm/files/extra-patch-daemon_slave.c
deleted file mode 100644
index b493dcd80ad9..000000000000
--- a/x11/gdm/files/extra-patch-daemon_slave.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- daemon/slave.c.orig 2007-09-17 10:45:50.000000000 -0400
-+++ daemon/slave.c 2007-09-25 13:42:06.000000000 -0400
-@@ -373,8 +373,7 @@
- break;
- }
-
-- if G_UNLIKELY (d->xsession_errors_bytes >= MAX_XSESSION_ERRORS_BYTES ||
-- got_xfsz_signal)
-+ if G_UNLIKELY (got_xfsz_signal)
- continue;
-
- /* write until we succeed in writing something */
-@@ -397,13 +396,6 @@
-
- d->xsession_errors_bytes += r;
-
-- if G_UNLIKELY (d->xsession_errors_bytes >= MAX_XSESSION_ERRORS_BYTES &&
-- ! got_xfsz_signal) {
-- VE_IGNORE_EINTR (write (d->xsession_errors_fd,
-- "\n...Too much output, ignoring rest...\n",
-- strlen ("\n...Too much output, ignoring rest...\n")));
-- }
--
- /* there wasn't more then buf available, so no need to try reading
- * again, unless we really want to */
- if (r < sizeof (buf) && ! read_until_eof)
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index 370a40fa1c02..ecb043cd5041 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,6 +1,6 @@
#!/bin/sh
# $FreeBSD$
-# $MCom: ports/x11/gdm/files/gdm.in,v 1.28 2008/03/11 04:21:47 mezz Exp $
+# $MCom: ports/x11/gdm/files/gdm.in,v 1.32 2008/08/17 17:31:43 marcus Exp $
# PROVIDE: gdm
# REQUIRE: LOGIN cleanvar moused syscons dbus
@@ -18,7 +18,7 @@ gdm_preserve_base_pam_conf=${gdm_preserve_base_pam_conf-NO}
export PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin
-name=gdm
+name="gdm"
rcvar=`set_rcvar`
command="%%PREFIX%%/sbin/${name}"
pidfile="/var/run/${name}.pid"
diff --git a/x11/gdm/files/patch-common_Makefile.in b/x11/gdm/files/patch-common_Makefile.in
new file mode 100644
index 000000000000..2ab0a50015ea
--- /dev/null
+++ b/x11/gdm/files/patch-common_Makefile.in
@@ -0,0 +1,20 @@
+--- common/Makefile.in.orig 2008-08-20 14:34:16.000000000 -0400
++++ common/Makefile.in 2008-08-20 14:36:50.000000000 -0400
+@@ -428,7 +428,8 @@ gdm_crash_logger_CPPFLAGS = \
+ -DLOCALSTATEDIR=\"$(localstatedir)\" \
+ $(NULL)
+
+-gdm_crash_logger_LDADD = $(GTHREAD_LIBS)
++gdm_crash_logger_LDADD = $(GTHREAD_LIBS) \
++ -lexecinfo
+ @MKDTEMP_MISSING_FALSE@MKDTEMP_FILES =
+ @MKDTEMP_MISSING_TRUE@MKDTEMP_FILES = mkdtemp.c mkdtemp.h
+ libgdmcommon_la_SOURCES = \
+@@ -473,6 +474,7 @@ libgdmcommon_la_CFLAGS = \
+ $(NULL)
+
+ libgdmcommon_la_LIBADD = \
++ -lexecinfo \
+ $(NULL)
+
+ libgdmcommon_la_LDFLAGS = \
diff --git a/x11/gdm/files/patch-common_gdm-address.c b/x11/gdm/files/patch-common_gdm-address.c
new file mode 100644
index 000000000000..4c38474cb637
--- /dev/null
+++ b/x11/gdm/files/patch-common_gdm-address.c
@@ -0,0 +1,27 @@
+--- common/gdm-address.c.orig 2008-04-17 23:29:27.000000000 -0400
++++ common/gdm-address.c 2008-05-02 14:36:15.000000000 -0400
+@@ -29,6 +29,8 @@
+ #include <stropts.h>
+ #endif
+ #include <string.h>
++#include <sys/types.h>
++#include <sys/param.h>
+ #ifdef HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
+@@ -37,7 +39,6 @@
+ #endif
+ #include <netdb.h>
+ #include <sys/ioctl.h>
+-#include <net/if.h>
+
+ #ifndef G_OS_WIN32
+ #include <sys/select.h>
+@@ -47,6 +48,7 @@
+ #include <winsock2.h>
+ #include <ws2tcpip.h>
+ #endif
++#include <net/if.h>
+
+ #include <glib-object.h>
+
diff --git a/x11/gdm/files/patch-common_gdm-common.c b/x11/gdm/files/patch-common_gdm-common.c
new file mode 100644
index 000000000000..9fa4acafa6c8
--- /dev/null
+++ b/x11/gdm/files/patch-common_gdm-common.c
@@ -0,0 +1,13 @@
+--- common/gdm-common.c.orig 2007-12-23 10:29:20.000000000 +0100
++++ common/gdm-common.c 2007-12-23 10:29:34.000000000 +0100
+@@ -33,6 +33,10 @@
+
+ #include "gdm-common.h"
+
++#ifndef ENODATA
++#define ENODATA EAGAIN
++#endif
++
+ void
+ gdm_set_fatal_warnings_if_unstable (void)
+ {
diff --git a/x11/gdm/files/patch-common_gdm-settings-keys.h b/x11/gdm/files/patch-common_gdm-settings-keys.h
new file mode 100644
index 000000000000..06ebc0800e18
--- /dev/null
+++ b/x11/gdm/files/patch-common_gdm-settings-keys.h
@@ -0,0 +1,10 @@
+--- common/gdm-settings-keys.h.orig 2008-02-20 16:27:34.000000000 -0500
++++ common/gdm-settings-keys.h 2008-02-25 22:23:35.000000000 -0500
+@@ -30,6 +30,7 @@ G_BEGIN_DECLS
+ #define GDM_KEY_TIMED_LOGIN_ENABLE "daemon/TimedLoginEnable"
+ #define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin"
+ #define GDM_KEY_TIMED_LOGIN_DELAY "daemon/TimedLoginDelay"
++#define GDM_KEY_VT "daemon/VT"
+
+ #define GDM_KEY_XDMCP_ENABLE "xdmcp/Enable"
+ #define GDM_KEY_MAX_PENDING "xdmcp/MaxPending"
diff --git a/x11/gdm/files/patch-config.h.in b/x11/gdm/files/patch-config.h.in
new file mode 100644
index 000000000000..d17901da1124
--- /dev/null
+++ b/x11/gdm/files/patch-config.h.in
@@ -0,0 +1,12 @@
+--- config.h.in.orig 2007-11-02 20:48:28.000000000 -0400
++++ config.h.in 2007-11-02 20:49:39.000000000 -0400
+@@ -23,6 +23,9 @@
+ #undef HAVE_LC_MESSAGES
+ #undef HAVE_LIBSM
+ #undef HAVE_LIBXDMCP
++#undef HAVE_LOGIN
++#undef HAVE_LOGOUT
++#undef HAVE_LOGWTMP
+ #undef HAVE_LOGINCAP
+ #undef HAVE_LOGINDEVPERM
+ #undef HAVE_LOGINRESTRICTIONS
diff --git a/x11/gdm/files/patch-config_gdm.conf.in b/x11/gdm/files/patch-config_gdm.conf.in
deleted file mode 100644
index 6382bd445fd8..000000000000
--- a/x11/gdm/files/patch-config_gdm.conf.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- config/gdm.conf.in.orig Mon Apr 9 01:15:16 2007
-+++ config/gdm.conf.in Mon Apr 9 09:38:08 2007
-@@ -174,11 +174,11 @@
- # using this Xnest, the value should be true.
- XnestUnscaledFontPath=@X_XNEST_UNSCALED_FONTPATH@
-
--# Automatic VT allocation. Right now only works on Linux. This way we force
-+# Automatic VT allocation. This way we force
- # X to use specific vts. Turn VTAllocation to false if this is causing
- # problems.
--#FirstVT=7
--#VTAllocation=true
-+FirstVT=9
-+VTAllocation=true
- # Should double login be treated with a warning (and possibility to change VT's
- # on Linux and FreeBSD systems for console logins)
- #DoubleLoginWarning=true
diff --git a/x11/gdm/files/patch-config_locale.alias b/x11/gdm/files/patch-config_locale.alias
deleted file mode 100644
index eb004366166d..000000000000
--- a/x11/gdm/files/patch-config_locale.alias
+++ /dev/null
@@ -1,191 +0,0 @@
---- config/locale.alias.orig 2008-03-10 21:53:02.000000000 -0500
-+++ config/locale.alias 2008-03-10 21:53:37.000000000 -0500
-@@ -14,134 +14,57 @@
- #
- # - George
-
--C(POSIX) C,POSIX
--Afrikaans af_ZA.UTF-8,af_ZA
--Albanian sq_AL.UTF-8,sq_AL
--Amharic am_ET.UTF-8,am_ET
--Arabic(Egypt) ar_EG.UTF-8,ar_EG
--Arabic(Lebanon) ar_LB.UTF-8,ar_LB
--Arabic(SaudiArabia) ar_SA.UTF-8,ar_SA
--Armenian hy_AM.UTF-8,hy_AM
--Azerbaijani az_AZ.UTF-8,az_AZ
--Azerbaijani(Iran) az_IR.UTF-8,az_IR
--Basque eu_ES.UTF-8,eu_ES
--Belarusian be_BY.UTF-8,be_BY
--Belarusian(Latin) be_BY.UTF-8@latin,be_BY@latin
--Bengali bn_BD.UTF-8,bn_BD
--Bengali(India) bn_IN.UTF-8,bn_IN
--Bosnian bs_BA.UTF-8,bs_BA
--Breton br_FR.UTF-8,br_FR
--Bulgarian bg_BG.UTF-8,bg_BG
--Catalan ca_ES.UTF-8,ca_ES
--Chinese(ChinaMainland) zh_CN.UTF-8,zh_CN
--Chinese(GB18030) zh_CN.GB18030
--Chinese(Hong-Kong) zh_HK.UTF-8,zh_HK
--Chinese(Singapore) zh_SG.UTF-8,zh_SG
--Chinese(Taiwan) zh_TW.UTF-8,zh_TW
--Croatian hr_HR.UTF-8,hr_HR
--Czech cs_CZ.UTF-8,cs_CZ
--Danish da_DK.UTF-8,da_DK
--Dutch nl_NL.UTF-8,nl_NL
--Dutch(Belgium) nl_BE.UTF-8,nl_BE
--English(Australia) en_AU.UTF-8,en_AU
--English(Canada) en_CA.UTF-8,en_CA
--English(Ireland) en_IE.UTF-8,en_IE
--English(Malta) en_MT.UTF-8,en_MT
--English(NewZealand) en_NZ.UTF-8,en_NZ
--English(SouthAfrica) en_ZA.UTF-8,en_ZA
--English(UK) en_GB.UTF-8,en_GB
--English(USA) en_US.UTF-8,en_US
--Esperanto eo.UTF-8,eo
--Estonian et_EE.UTF-8,et_EE
--Finnish fi_FI.UTF-8,fi_FI
--French fr_FR.UTF-8,fr_FR
--French(Belgium) fr_BE.UTF-8,fr_BE
--French(Canada) fr_CA.UTF-8,fr_CA
--French(Luxembourg) fr_LU.UTF-8,fr_LU
--French(Switzerland) fr_CH.UTF-8,fr_CH
--Galician gl_ES.UTF-8,gl_ES
--German de_DE.UTF-8,de_DE
--German(Austria) de_AT.UTF-8,de_AT
--German(Switzerland) de_CH.UTF-8,de_CH
--German(Luxembourg) de_LU.UTF-8,de_LU
--Greek el_GR.UTF-8,el_GR
--Greek(Cyprus) el_CY.UTF-8,el_CY
--Gujarati gu_IN.UTF-8,gu_IN
--Hebrew he_IL.UTF-8,he_IL
--Hindi hi_IN.UTF-8,hi_IN
--Hungarian hu_HU.UTF-8,hu_HU
--Icelandic is_IS.UTF-8,is_IS
--Indonesian id_ID.UTF-8,id_ID
--Interlingua ia.UTF-8,ia
--Irish ga_IE.UTF-8,ga_IE
--Italian it_IT.UTF-8,it_IT
--Japanese ja_JP.UTF-8,ja_JP
--Kannada kn_IN.UTF-8,kn_IN
--Kazakh kk_KZ.UTF-8,kk_KZ
--Kinyarwanda rw_RW.UTF-8,rw_RW
--Korean ko_KR.UTF-8,ko_KR
--Latvian lv_LV.UTF-8,lv_LV
--Limburgish li_NL.UTF-8,li_NL
--Limburgish(Belgium) li_BE.UTF-8,li_BE
--Limburgish(Germany) li_DE.UTF-8,li_DE
--Lithuanian lt_LT.UTF-8,lt_LT
--Macedonian mk_MK.UTF-8,mk_MK
--Malayalam ml_IN.UTF-8,ml_IN
--Malay ms_MY.UTF-8,ms_MY
--Maltese mt_MT.UTF-8,mt_MT
--Maori mi_NZ.UTF-8,mi_NZ
--Marathi mr_IN.UTF-8,mr_IN
--Mongolian mn_MN.UTF-8,mn_MN
--Nepali ne_NP.UTF-8,ne_NP
--NorthernSotho nso_ZA.UTF-8,nso_ZA
--Norwegian(bokmal) nb_NO.UTF-8,nb_NO,no_NO.UTF-8,no_NO
--Norwegian(nynorsk) nn_NO.UTF-8,nn_NO
--Oriya or_IN.UTF-8,or_IN
--Persian fa_IR.UTF-8,fa_IR
--Polish pl_PL.UTF-8,pl_PL
--Portuguese(Brazilian) pt_BR.UTF-8,pt_BR
--Portuguese pt_PT.UTF-8,pt_PT
--Punjabi pa_IN.UTF-8,pa_IN
--Romanian ro_RO.UTF-8,ro_RO
--Russian ru_RU.UTF-8,ru_RU
--Serbian sr_CS.UTF-8,sr_CS,sr_YU@cyrillic,sr_YU
--Serbian(Montenegro) sr_ME.UTF-8
--Serbian(Serbia) sr_RS.UTF-8
--Serbian(Bosnia) sh_BA.UTF-8,sh_BA
--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
--Spanish(Argentina) es_AR.UTF-8,es_AR
--Spanish(Bolivia) es_BO.UTF-8,es_BO
--Spanish(Chile) es_CL.UTF-8,es_CL
--Spanish(Colombia) es_CO.UTF-8,es_CO
--Spanish(CostaRica) es_CR.UTF-8,es_CR
--Spanish(Ecuador) es_EC.UTF-8,es_EC
--Spanish(Guatemala) es_GT.UTF-8,es_GT
--Spanish(Mexico) es_MX.UTF-8,es_MX
--Spanish(Nicaragua) es_NI.UTF-8,es_NI
--Spanish(Panama) es_PA.UTF-8,es_PA
--Spanish(Peru) es_PE.UTF-8,es_PE
--Spanish(Paraguay) es_PY.UTF-8,es_PY
--Spanish(ElSalvador) es_SV.UTF-8,es_SV
--Spanish(Uruguay) es_UY.UTF-8,es_UY
--Spanish(Venezuela) es_VE.UTF-8,es_VE
--Swedish(Finland) sv_FI.UTF-8,sv_FI
--Swedish sv_SE.UTF-8,sv_SE
--Tagalog tl_PH.UTF-8,tl_PH
--Tajik tg_TJ.UTF-8,tg_TJ
--Tamil ta_IN.UTF-8,ta_IN
--Telugu te_IN.UTF-8,te_IN
--Thai th_TH.UTF-8,th_TH
--Turkish tr_TR.UTF-8,tr_TR
--Ukrainian uk_UA.UTF-8,uk_UA
--Uzbek uz_UZ.UTF-8,uz_UZ
--Uzbek(Latin) uz_UZ.UTF-8@Latn,uz_UZ@Latn
--Vietnamese vi_VN.UTF-8,vi_VN
--Walloon wa_BE.UTF-8,wa_BE
--Welsh cy_GB.UTF-8,cy_GB
--Xhosa xh_ZA.UTF-8,xh_ZA
--Yiddish yi.UTF-8,yi
--Zulu zu_ZA.UTF-8,zu_ZA
-+C(POSIX) C,POSIX
-+Afrikaans af_ZA.UTF-8,af_ZA.ISO8859-15,af_ZA.ISO8859-1
-+Amharic am_ET.UTF-8
-+Armenian hy_AM.UTF-8
-+Basque eu_ES.UTF-8,eu_ES.ISO8859-15,eu_ES.ISO8859-1
-+Byelorussian be_BY.UTF-8,be_BY.CP1131,be_BY.CP1251,be_BY.ISO8859-5
-+Bulgarian bg_BG.UTF-8,bg_BG.CP1251
-+Catalan ca_ES.UTF-8,ca_ES.ISO8859-15,ca_ES.ISO8859-1
-+Chinese(simplified) zh_CN.UTF-8,zh_CN.EUC,zh_CN.eucCN
-+Chinese(traditional) zh_TW.UTF-8,zh_TW.Big5
-+Chinese(Hong-Kong) zh_HK.UTF-8,zh_HK.Big5HKSCS
-+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-15,da_DK.ISO8859-1
-+Dutch nl_NL.UTF-8,nl_NL.ISO8859-15,nl_NL.ISO8859-1
-+Dutch(Belgian) nl_BE.UTF-8,nl_BE.ISO8859-15,nl_BE.ISO8859-1
-+English(American) en_US.UTF-8,en_US.ISO8859-1,en_US.ISO8859-15
-+English(Australian) en_AU.UTF-8,en_AU.ISO8859-1,en_AU.ISO8859-15
-+English(British) en_GB.UTF-8,en_GB.ISO8859-1,en_GB.ISO8859-15
-+English(Canadian) en_CA.UTF-8,en_CA.ISO8859-1,en_CA.ISO8859-15
-+English(Irish) en_IE.UTF-8,en_IE.ISO8859-1,en_IE.ISO8859-15
-+English(New-Zealand) en_NZ.UTF-8,en_NZ.ISO8859-1,en_NZ.ISO8859-15
-+Estonian et_EE.UTF-8,et_EE.ISO8859-15
-+Finnish fi_FI.UTF-8,fi_FI.ISO8859-15,fi_FI.ISO8859-1
-+French fr_FR.UTF-8,fr_FR.ISO8859-15,fr_FR.ISO8859-1
-+French(Belgium) fr_BE.UTF-8,fr_BE.ISO8859-15,fr_BE.ISO8859-1
-+French(Canadian) fr_CA.UTF-8,fr_CA.ISO8859-1,fr_CA.ISO8859-15
-+French(Swiss) fr_CH.UTF-8,fr_CH.ISO8859-15,fr_CH.ISO8859-1
-+German de_DE.UTF-8,de_DE.ISO8859-15,de_DE.ISO8859-1
-+German(Austria) de_AT.UTF-8,de_AT.ISO8859-15,de_AT.ISO8859-1
-+German(Switzerland) de_CH.UTF-8,de_CH.ISO8859-15,de_CH.ISO8859-1
-+Greek el_GR.UTF-8,el_GR.ISO8859-7
-+Hebrew he_IL.UTF-8
-+Hindi hi_IN.ISCII-DEV
-+Hungarian hu_HU.UTF-8,hu_HU.ISO8859-2
-+Icelandic is_IS.UTF-8,is_IS.ISO8859-1,is_IS.ISO8859-15
-+Italian it_IT.UTF-8,it_IT.ISO8859-15,it_IT.ISO8859-1
-+Italian(Swiss) it_CH.UTF-8,it_CH.ISO8859-15,it_CH.ISO8859-1
-+Japanese ja_JP.UTF-8,ja_JP.EUC,ja_JP.eucJP
-+Korean ko_KR.UTF-8,ko_KR.EUC,ko_KR.eucKR
-+Lithuanian lt_LT.UTF-8,lt_LT.ISO8859-4,lt_LT.ISO8859-13
-+Norwegian(bokmal) nb_NO.UTF-8,nb_NO.ISO8859-1,nb_NO.ISO8859-15,no_NO.UTF-8,no_NO.ISO8859-1,no_NO.ISO8859-15
-+Polish pl_PL.UTF-8,pl_PL.ISO8859-2
-+Portuguese pt_PT.UTF-8,pt_PT.ISO8859-15,pt_PT.ISO8859-1
-+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
-+Serbian sr_YU.UTF-8,sr_YU.ISO8859-2,sr_YU.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,es_ES.ISO8859-1
-+Swedish sv_SV.UTF-8,sv_SE.ISO8859-1
-+Turkish tr_TR.UTF-8,tr_TR.ISO8859-9
-+Ukrainian uk_UA.UTF-8,uk_UA.ISO8859-5
diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure
deleted file mode 100644
index 18b1e2742f57..000000000000
--- a/x11/gdm/files/patch-configure
+++ /dev/null
@@ -1,137 +0,0 @@
---- configure.orig 2007-10-22 00:31:04.000000000 -0400
-+++ configure 2007-10-22 00:34:52.000000000 -0400
-@@ -29593,15 +29592,13 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_util_login" >&5
- echo "${ECHO_T}$ac_cv_lib_util_login" >&6; }
- if test $ac_cv_lib_util_login = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBUTIL 1
-+ cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LOGIN 1
- _ACEOF
--
-- LIBS="-lutil $LIBS"
--
-+
-+ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
- fi
-
--
- { echo "$as_me:$LINENO: checking for logout in -lutil" >&5
- echo $ECHO_N "checking for logout in -lutil... $ECHO_C" >&6; }
- if test "${ac_cv_lib_util_logout+set}" = set; then
-@@ -29664,12 +29661,80 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_util_logout" >&5
- echo "${ECHO_T}$ac_cv_lib_util_logout" >&6; }
- if test $ac_cv_lib_util_logout = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBUTIL 1
-+ cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LOGOUT 1
-+_ACEOF
-+
-+ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for logwtmp in -lutil" >&5
-+echo $ECHO_N "checking for logwtmp in -lutil... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_util_logwtmp+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lutil $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char logwtmp ();
-+int
-+main ()
-+{
-+return logwtmp ();
-+ ;
-+ return 0;
-+}
- _ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_lib_util_logwtmp=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-- LIBS="-lutil $LIBS"
-+ ac_cv_lib_util_logwtmp=no
-+fi
-
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_logwtmp" >&5
-+echo "${ECHO_T}$ac_cv_lib_util_logwtmp" >&6; }
-+if test $ac_cv_lib_util_logwtmp = yes; then
-+ cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LOGWTMP 1
-+_ACEOF
-+
-+ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
- fi
-
-
-@@ -33472,18 +33537,18 @@ esac
-
- # allow user to override the host-specific default
-
--test "x$GDM_USER_PATH" == x && GDM_USER_PATH=${HOST_GDM_USER_PATH}
--test "x$GDM_HALT_COMMAND" == x && GDM_HALT_COMMAND=${HOST_GDM_HALT_COMMAND}
--test "x$HALT_COMMAND" == x && HALT_COMMAND=${HOST_HALT_COMMAND}
--test "x$REBOOT_COMMAND" == x && REBOOT_COMMAND=${HOST_REBOOT_COMMAND}
--test "x$SUSPEND_COMMAND" == x && SUSPEND_COMMAND=${HOST_SUSPEND_COMMAND}
--test "x$XSESSION_SHELL" == x && XSESSION_SHELL=${HOST_XSESSION_SHELL}
--test "x$SOUND_PROGRAM" == x && SOUND_PROGRAM=${HOST_SOUND_PROGRAM}
--test "x$GDMGNOMESESSIONCMD" == x && GDMGNOMESESSIONCMD=${HOST_GDMGNOMESESSIONCMD}
--test "x$UTMP_LINE_ATTACHED" == x && UTMP_LINE_ATTACHED=${HOST_UTMP_LINE_ATTACHED}
--test "x$UTMP_LINE_REMOTE" == x && UTMP_LINE_REMOTE=${HOST_UTMP_LINE_REMOTE}
--test "x$UTMP_PSEUDO_DEVICE" == x && UTMP_PSEUDO_DEVICE=${HOST_UTMP_PSEUDO_DEVICE}
--test "x$GDM_RBAC_SYSCMD_KEYS" == x && GDM_RBAC_SYSCMD_KEYS=${HOST_GDM_RBAC_SYSCMD_KEYS}
-+test "x$GDM_USER_PATH" = x && GDM_USER_PATH=${HOST_GDM_USER_PATH}
-+test "x$GDM_HALT_COMMAND" = x && GDM_HALT_COMMAND=${HOST_GDM_HALT_COMMAND}
-+test "x$HALT_COMMAND" = x && HALT_COMMAND=${HOST_HALT_COMMAND}
-+test "x$REBOOT_COMMAND" = x && REBOOT_COMMAND=${HOST_REBOOT_COMMAND}
-+test "x$SUSPEND_COMMAND" = x && SUSPEND_COMMAND=${HOST_SUSPEND_COMMAND}
-+test "x$XSESSION_SHELL" = x && XSESSION_SHELL=${HOST_XSESSION_SHELL}
-+test "x$SOUND_PROGRAM" = x && SOUND_PROGRAM=${HOST_SOUND_PROGRAM}
-+test "x$GDMGNOMESESSIONCMD" = x && GDMGNOMESESSIONCMD=${HOST_GDMGNOMESESSIONCMD}
-+test "x$UTMP_LINE_ATTACHED" = x && UTMP_LINE_ATTACHED=${HOST_UTMP_LINE_ATTACHED}
-+test "x$UTMP_LINE_REMOTE" = x && UTMP_LINE_REMOTE=${HOST_UTMP_LINE_REMOTE}
-+test "x$UTMP_PSEUDO_DEVICE" = x && UTMP_PSEUDO_DEVICE=${HOST_UTMP_PSEUDO_DEVICE}
-+test "x$GDM_RBAC_SYSCMD_KEYS" = x && GDM_RBAC_SYSCMD_KEYS=${HOST_GDM_RBAC_SYSCMD_KEYS}
-
- # On Solaris, the /usr/bin/Xserver script is used to decide whether to
- # use Xsun or Xorg, so this is used on Solaris.
diff --git a/x11/gdm/files/patch-daemon-gdm-server.c b/x11/gdm/files/patch-daemon-gdm-server.c
new file mode 100644
index 000000000000..079c62c66b6a
--- /dev/null
+++ b/x11/gdm/files/patch-daemon-gdm-server.c
@@ -0,0 +1,73 @@
+--- daemon/gdm-server.c.orig 2008-03-17 19:11:00.000000000 -0400
++++ daemon/gdm-server.c 2008-08-25 16:11:10.000000000 -0400
+@@ -44,6 +44,10 @@
+ #include "gdm-common.h"
+ #include "gdm-signal-handler.h"
+
++#include "gdm-settings.h"
++#include "gdm-settings-direct.h"
++#include "gdm-settings-keys.h"
++
+ #include "gdm-server.h"
+
+ extern char **environ;
+@@ -77,6 +81,7 @@ struct GdmServerPrivate
+ char *parent_display_name;
+ char *parent_auth_file;
+ char *chosen_hostname;
++ char *vt;
+
+ guint child_watch_id;
+ };
+@@ -306,7 +311,7 @@ gdm_server_resolve_command_line (GdmServ
+ argv[len++] = g_strdup ("tcp");
+ }
+
+- if (vtarg != NULL && ! gotvtarg) {
++ if (vtarg != NULL && ! gotvtarg && strncmp (server->priv->display_name, ":0", 2) == 0) {
+ argv[len++] = g_strdup (vtarg);
+ }
+
+@@ -673,7 +678,7 @@ gdm_server_start (GdmServer *server)
+ gboolean res;
+
+ /* fork X server process */
+- res = gdm_server_spawn (server, NULL);
++ res = gdm_server_spawn (server, server->priv->vt);
+
+ return res;
+ }
+@@ -925,12 +930,33 @@ static void
+ gdm_server_init (GdmServer *server)
+ {
+
++ int vt;
++ gboolean has_vt;
++ GdmSettings *settings = NULL;
+ server->priv = GDM_SERVER_GET_PRIVATE (server);
+
++
++ settings = gdm_settings_new();
++ if (settings == NULL) {
++ g_assert ("Unable to initialize settings");
++ }
++
++ if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) {
++ g_assert ("Unable to initialize settings");
++ }
++
++ has_vt = gdm_settings_direct_get_int (GDM_KEY_VT, &vt);
++
++ g_object_unref (settings);
++
+ server->priv->pid = -1;
+ server->priv->command = g_strdup (X_SERVER " -br -verbose");
+ server->priv->log_dir = g_strdup (LOGDIR);
+
++ if (has_vt) {
++ server->priv->vt = g_strdup_printf ("vt %d", vt);
++ }
++
+ add_ready_handler (server);
+ }
+
diff --git a/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c b/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c
new file mode 100644
index 000000000000..e3062eeeaa89
--- /dev/null
+++ b/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c
@@ -0,0 +1,10 @@
+--- daemon/gdm-xdmcp-display-factory.c.orig 2007-11-01 10:15:58.269325570 -0400
++++ daemon/gdm-xdmcp-display-factory.c 2007-11-01 10:20:19.093220785 -0400
+@@ -35,6 +35,7 @@
+ #include <netdb.h>
+ #include <arpa/inet.h>
+ #include <net/if.h>
++#include <netinet/in.h>
+ #ifdef HAVE_SYS_SOCKIO_H
+ #include <sys/sockio.h>
+ #endif
diff --git a/x11/gdm/files/patch-daemon_Makefile.in b/x11/gdm/files/patch-daemon_Makefile.in
new file mode 100644
index 000000000000..9186a23e387f
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_Makefile.in
@@ -0,0 +1,10 @@
+--- daemon/Makefile.in.orig 2007-11-02 20:54:53.000000000 -0400
++++ daemon/Makefile.in 2007-11-02 20:55:08.000000000 -0400
+@@ -451,6 +451,7 @@ test_session_SOURCES = \
+
+ test_session_LDADD = \
+ $(DAEMON_LIBS) \
++ $(EXTRA_DAEMON_LIBS) \
+ $(PAM_LIBS) \
+ $(top_builddir)/common/libgdmcommon.la \
+ $(NULL)
diff --git a/x11/gdm/files/patch-daemon_gdm-session-worker.c b/x11/gdm/files/patch-daemon_gdm-session-worker.c
new file mode 100644
index 000000000000..5f3a1b9ee2f0
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_gdm-session-worker.c
@@ -0,0 +1,11 @@
+--- daemon/gdm-session-worker.c.orig 2008-07-30 19:15:47.000000000 -0400
++++ daemon/gdm-session-worker.c 2008-08-25 12:50:00.000000000 -0400
+@@ -332,7 +332,7 @@ gdm_session_execute (const char *file,
+ * what to search if PATH is unset. POSIX may, dunno.
+ */
+
+- path = "/bin:/usr/bin:.";
++ path = "/bin:/usr/bin:/usr/local/bin:.";
+ }
+
+ len = strlen (file) + 1;
diff --git a/x11/gdm/files/patch-daemon_gdmconsolekit.c b/x11/gdm/files/patch-daemon_gdmconsolekit.c
deleted file mode 100644
index b07647071d08..000000000000
--- a/x11/gdm/files/patch-daemon_gdmconsolekit.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- daemon/gdmconsolekit.c.orig 2007-08-30 22:57:18.000000000 -0400
-+++ daemon/gdmconsolekit.c 2007-08-30 22:57:35.000000000 -0400
-@@ -457,7 +457,7 @@ open_ck_session (struct passwd *pwent,
- char *device;
-
- /* FIXME: how does xorg construct this */
-- device = g_strdup_printf ("/dev/tty%d", d->vt);
-+ device = g_strdup_printf ("/dev/ttyv%d", d->vt - 1);
- add_param_string (&iter_struct, "x11-display-device", device);
- g_free (device);
- }
diff --git a/x11/gdm/files/patch-config_Xsession.in b/x11/gdm/files/patch-data_Xsession.in
index c2f25be0e9dd..894c97d1620c 100644
--- a/x11/gdm/files/patch-config_Xsession.in
+++ b/x11/gdm/files/patch-data_Xsession.in
@@ -1,5 +1,5 @@
---- config/Xsession.in.orig 2008-05-12 20:25:54.000000000 -0400
-+++ config/Xsession.in 2008-06-09 01:29:59.000000000 -0400
+--- data/Xsession.in.orig 2008-05-12 20:25:54.000000000 -0400
++++ data/Xsession.in 2008-06-09 01:29:59.000000000 -0400
@@ -231,12 +231,31 @@ if [ "x$command" = "xdefault" ] ; then
fi
fi
diff --git a/x11/gdm/files/patch-data_gconf.path b/x11/gdm/files/patch-data_gconf.path
new file mode 100644
index 000000000000..2efdb3cc975d
--- /dev/null
+++ b/x11/gdm/files/patch-data_gconf.path
@@ -0,0 +1,9 @@
+--- data/gconf.path.orig 2008-12-26 17:04:03.000000000 -0500
++++ data/gconf.path 2008-12-26 17:04:13.000000000 -0500
+@@ -1,5 +1,5 @@
+ # treat system-wide settings as mandatory
+-xml:readonly:/etc/gconf/gconf.xml.system
++xml:readonly:%%LOCALBASE%%/etc/gconf/gconf.xml.system
+
+ # override some settings
+ # we treat settings in this location as
diff --git a/x11/gdm/files/patch-data_gdm.schemas.in.in b/x11/gdm/files/patch-data_gdm.schemas.in.in
new file mode 100644
index 000000000000..ae5572ddde3e
--- /dev/null
+++ b/x11/gdm/files/patch-data_gdm.schemas.in.in
@@ -0,0 +1,14 @@
+--- data/gdm.schemas.in.in.orig 2007-12-13 12:14:19.000000000 -0500
++++ data/gdm.schemas.in.in 2007-12-13 12:15:05.000000000 -0500
+@@ -11,6 +11,11 @@
+ <signature>s</signature>
+ <default>gdm</default>
+ </schema>
++ <schema>
++ <key>daemon/VT</key>
++ <signature>i</signature>
++ <default>9</default>
++ </schema>
+
+ <schema>
+ <key>xdmcp/Enable</key>
diff --git a/x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in b/x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in
new file mode 100644
index 000000000000..7febf5165bdd
--- /dev/null
+++ b/x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in
@@ -0,0 +1,7 @@
+--- data/greeter-autostart/gdm-simple-greeter.desktop.in.in.orig 2008-11-23 22:22:04.000000000 -0500
++++ data/greeter-autostart/gdm-simple-greeter.desktop.in.in 2008-11-23 22:22:09.000000000 -0500
+@@ -5,4 +5,3 @@ Exec=@LIBEXECDIR@/gdm-simple-greeter
+ OnlyShowIn=GNOME;
+ X-GNOME-Autostart-Phase=Application
+ X-GNOME-Autostart-Notify=true
+-X-GNOME-AutoRestart=true
diff --git a/x11/gdm/files/patch-gui_gdmchooser.c b/x11/gdm/files/patch-gui_gdmchooser.c
deleted file mode 100644
index 42ce461e242e..000000000000
--- a/x11/gdm/files/patch-gui_gdmchooser.c
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- gui/gdmchooser.c.orig
-+++ gui/gdmchooser.c
-@@ -1123,6 +1123,12 @@
- have_ipv6 = FALSE;
- else
- have_ipv6 = TRUE;
-+ /* Net- & FreeBSD default to V6ONLY */
-+ {
-+ int no = 0;
-+ setsockopt(sockfd, IPPROTO_IPV6, IPV6_V6ONLY, &no, sizeof(no));
-+ }
-+
- #endif
- if ( ! have_ipv6) {
- if ((sockfd = socket (AF_INET, SOCK_DGRAM, 0)) == -1) {
diff --git a/x11/gdm/files/patch-gui_gdmsetup.c b/x11/gdm/files/patch-gui_gdmsetup.c
deleted file mode 100644
index 423000cb6fec..000000000000
--- a/x11/gdm/files/patch-gui_gdmsetup.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gui/gdmsetup.c.orig Thu Jun 30 16:47:06 2005
-+++ gui/gdmsetup.c Mon Jul 4 02:53:12 2005
-@@ -3270,7 +3271,7 @@ theme_install_response (GtkWidget *choos
- /* HACK! */
- argv[0] = chown;
- argv[1] = "-R";
-- argv[2] = "root:root";
-+ argv[2] = "root:wheel";
- argv[3] = quoted;
- argv[4] = NULL;
- simple_spawn_sync (argv);
diff --git a/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c b/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c
new file mode 100644
index 000000000000..6f0c08d8a00a
--- /dev/null
+++ b/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c
@@ -0,0 +1,20 @@
+--- gui/simple-chooser/gdm-host-chooser-widget.c.orig 2008-03-04 14:42:37.000000000 -0500
++++ gui/simple-chooser/gdm-host-chooser-widget.c 2008-08-03 01:48:49.000000000 -0400
+@@ -442,7 +442,7 @@ find_broadcast_addresses (GdmHostChooser
+ /* paranoia */
+ ifreq.ifr_name[sizeof (ifreq.ifr_name) - 1] = '\0';
+
+- if (ioctl (sock, SIOCGIFFLAGS, &ifreq) < 0) {
++ if ((ioctl (sock, SIOCGIFFLAGS, &ifreq) < 0) && (errno != ENXIO)) {
+ g_warning ("Could not get SIOCGIFFLAGS for %s", ifr[i].ifr_name);
+ }
+
+@@ -542,6 +542,8 @@ xdmcp_init (GdmHostChooserWidget *widget
+ #ifdef ENABLE_IPV6
+ widget->priv->socket_fd = socket (AF_INET6, SOCK_DGRAM, 0);
+ if (widget->priv->socket_fd != -1) {
++ int no = 0;
++ setsockopt(widget->priv->socket_fd, IPPROTO_IPV6, IPV6_V6ONLY, &no, sizeof(no));
+ widget->priv->have_ipv6 = TRUE;
+ }
+ #endif
diff --git a/x11/gdm/files/patch-gui_simple-greeter_Makefile.in b/x11/gdm/files/patch-gui_simple-greeter_Makefile.in
new file mode 100644
index 000000000000..56d49b99bf92
--- /dev/null
+++ b/x11/gdm/files/patch-gui_simple-greeter_Makefile.in
@@ -0,0 +1,11 @@
+--- gui/simple-greeter/Makefile.in.orig 2008-02-13 01:57:37.000000000 -0500
++++ gui/simple-greeter/Makefile.in 2008-02-13 01:57:44.000000000 -0500
+@@ -445,7 +445,7 @@ INCLUDES = \
+ -DGDMCONFDIR=\"$(gdmconfdir)\" \
+ -DDATADIR=\""$(datadir)"\" \
+ -DSYSCONFDIR=\""$(sysconfdir)"\" \
+- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
++ -DLIBLOCALEDIR=\""$(prefix)/share/locale"\" \
+ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ -DGLADEDIR=\""$(pkgdatadir)"\" \
+ -DLIBEXECDIR=\""$(libexecdir)"\" \
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
new file mode 100644
index 000000000000..9116dc917a64
--- /dev/null
+++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
@@ -0,0 +1,45 @@
+--- gui/simple-greeter/gdm-languages.c.orig 2008-11-22 17:16:42.000000000 -0500
++++ gui/simple-greeter/gdm-languages.c 2008-11-22 17:29:05.000000000 -0500
+@@ -168,13 +168,13 @@ gdm_parse_language_name (const char *nam
+ *codesetp = NULL;
+ }
+
+- if (*codesetp != NULL) {
++/* if (*codesetp != NULL) {
+ char *codeset;
+
+ codeset = normalize_codeset (*codesetp);
+ g_free (*codesetp);
+ *codesetp = codeset;
+- }
++ }*/
+ }
+
+ if (modifierp != NULL) {
+@@ -353,7 +353,7 @@ add_locale (const char *language_name)
+ if (language_name_is_utf8 (language_name)) {
+ name = g_strdup (language_name);
+ } else {
+- name = g_strdup_printf ("%s.utf8", language_name);
++ name = g_strdup_printf ("%s.UTF-8", language_name);
+
+ if (!language_name_is_utf8 (name)) {
+ g_free (name);
+@@ -482,7 +482,7 @@ select_dirs (const struct dirent *dirent
+ struct stat st;
+ char *path;
+
+- path = g_build_filename (GNOMELOCALEDIR, dirent->d_name, NULL);
++ path = g_build_filename ("/usr/share/locale", dirent->d_name, NULL);
+ if (g_stat (path, &st) == 0) {
+ mode = st.st_mode;
+ }
+@@ -502,7 +502,7 @@ collect_locales_from_directory (void)
+ int ndirents;
+ int cnt;
+
+- ndirents = scandir (GNOMELOCALEDIR, &dirents, select_dirs, alphasort);
++ ndirents = scandir ("/usr/share/locale", &dirents, select_dirs, alphasort);
+
+ for (cnt = 0; cnt < ndirents; ++cnt) {
+ add_locale (dirents[cnt]->d_name);
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-remote-login-window.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-remote-login-window.c
new file mode 100644
index 000000000000..059d72cf456b
--- /dev/null
+++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-remote-login-window.c
@@ -0,0 +1,10 @@
+--- gui/simple-greeter/gdm-remote-login-window.c.orig 2008-03-24 11:27:13.000000000 +0100
++++ gui/simple-greeter/gdm-remote-login-window.c 2008-03-24 11:27:31.000000000 +0100
+@@ -25,6 +25,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <sys/signal.h>
+ #include <errno.h>
+
+ #include <glib.h>
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
new file mode 100644
index 000000000000..d666bc1fd826
--- /dev/null
+++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
@@ -0,0 +1,51 @@
+--- gui/simple-greeter/gdm-user-manager.c.orig 2008-04-29 13:38:43.000000000 -0400
++++ gui/simple-greeter/gdm-user-manager.c 2008-05-03 13:27:52.000000000 -0400
+@@ -1269,17 +1269,23 @@ reload_passwd (GdmUserManager *manager)
+ GSList *old_users;
+ GSList *new_users;
+ GSList *list;
+- FILE *fp;
++#ifndef __FreeBSD__
++ FILE *fp;
++#endif
+
+ old_users = NULL;
+ new_users = NULL;
+
++#ifdef __FreeBSD__
++ setpwent ();
++#else
+ errno = 0;
+ fp = fopen (PATH_PASSWD, "r");
+ if (fp == NULL) {
+ g_warning ("Unable to open %s: %s", PATH_PASSWD, g_strerror (errno));
+ goto out;
+ }
++#endif
+
+ g_hash_table_foreach (manager->priv->users, listify_hash_values_hfunc, &old_users);
+ g_slist_foreach (old_users, (GFunc) g_object_ref, NULL);
+@@ -1292,7 +1298,11 @@ reload_passwd (GdmUserManager *manager)
+ }
+ }
+
++#ifdef __FreeBSD__
++ for (pwent = getpwent (); pwent != NULL; pwent = getpwent ()) {
++#else
+ for (pwent = fgetpwent (fp); pwent != NULL; pwent = fgetpwent (fp)) {
++#endif
+ GdmUser *user;
+
+ user = NULL;
+@@ -1355,7 +1365,11 @@ reload_passwd (GdmUserManager *manager)
+ out:
+ /* Cleanup */
+
++#ifdef __FreeBSD__
++ endpwent ();
++#else
+ fclose (fp);
++#endif
+
+ g_slist_foreach (new_users, (GFunc) g_object_thaw_notify, NULL);
+ g_slist_foreach (new_users, (GFunc) g_object_unref, NULL);
diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install
index b775c107227c..788a1a610c81 100644
--- a/x11/gdm/pkg-install
+++ b/x11/gdm/pkg-install
@@ -24,9 +24,13 @@ POST-INSTALL)
if ${PW} user show "${USER}" 2>/dev/null; then
echo "You already have a user \"${USER}\", so I will use it."
+ uhome=`${PW} user show ${USER} | awk -F: '{print $9}'`
+ if [ x"${uhome}" = x"/nonexistent" -o x"${uhome}" = x"/var/gdm" ]; then
+ ${PW} usermod ${USER} -d "${PKG_PREFIX}/etc/gdm/home"
+ fi
else
if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \
- -d "/nonexistent" -s /sbin/nologin -c "GNOME Display Manager"
+ -d "${PKG_PREFIX}/etc/gdm/home" -s /sbin/nologin -c "GNOME Display Manager"
then
echo "Added user \"${USER}\"."
else
@@ -36,10 +40,24 @@ POST-INSTALL)
fi
${MKDIR} -p /var/gdm
${MKDIR} -p /var/log/gdm
+ ${CHMOD} 0755 /var/log/gdm
+ ${CHOWN} root:wheel /var/log/gdm
${CHOWN} -R root:${GROUP} /var/gdm
${CHMOD} 1770 /var/gdm
+ ${MKDIR} -p /var/run/gdm
+ ${CHOWN} root:${GROUP} /var/run/gdm
+ ${CHMOD} 1777 /var/run/gdm
${CHOWN} root:wheel ${PKG_PREFIX}/share/gdm
${CHMOD} 0755 ${PKG_PREFIX}/share/gdm
+ ${MKDIR} -p ${PKG_PREFIX}/etc/gdm/home
+ ${CHOWN} root:${GROUP} ${PKG_PREFIX}/etc/gdm/home
+ ${CHMOD} 1770 ${PKG_PREFIX}/etc/gdm/home
+ install -o root -g wheel -m 444 ${PKG_PREFIX}/share/gdm/gconf.path ${PKG_PREFIX}/etc/gdm/home/.gconf.path
+ gconftool-2 --direct --config-source=xml:merged:${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory --recursive-unset /
+ gconftool-2 --direct --config-source=xml:merged:${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory --load ${PKG_PREFIX}/share/gdm/session-setup.entries
+ ${CHOWN} -R root:gdm ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory
+ ${CHMOD} 1750 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory
+ ${CHMOD} 1640 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory/*.xml
${MKDIR} -p ${PKG_PREFIX}/etc/dm/Sessions
exit 0
diff --git a/x11/gdm/pkg-message b/x11/gdm/pkg-message
index 9131c3eb44c6..03810155292d 100644
--- a/x11/gdm/pkg-message
+++ b/x11/gdm/pkg-message
@@ -1,12 +1,6 @@
GDM is installed.
-Do _NOT_ use /etc/ttys to start gdm at boot time. This will result in gdm
-hanging or restarting constantly. Instead, add gdm_enable="YES" to
+Do _NOT_ use /etc/ttys to start gdm at boot time. This will result in gdm
+hanging or restarting constantly. Instead, add gdm_enable="YES" to
/etc/rc.conf. GDM will be started automatic on the next reboot.
-GDM uses its own locale.alias file to determine its language and especially
-the GNOME 2 fontencoding. This file is located in
-%%PREFIX%%/etc/gdm/locale.alias. By default, the character set for every
-country 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.
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index ea47c5c3a2e9..d56a2a2073f7 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -1,68 +1,45 @@
-bin/gdm-dmx-reconnect-proxy
-bin/gdmXnest
-bin/gdmXnestchooser
-bin/gdmdynamic
+bin/gdm-screenshot
bin/gdmflexiserver
-bin/gdmphotosetup
-bin/gdmthemetester
+etc/dbus-1/system.d/gdm.conf
etc/gdm/Init/Default
etc/gdm/PostLogin/Default.sample
etc/gdm/PostSession/Default
etc/gdm/PreSession/Default
-etc/gdm/XKeepsCrashing
etc/gdm/Xsession
@unexec if cmp -s %D/etc/gdm/custom.conf %D/etc/gdm/custom.conf.default; then rm -f %D/etc/gdm/custom.conf; fi
etc/gdm/custom.conf.default
@exec [ -f %B/custom.conf ] || cp %B/%f %B/custom.conf
-etc/gdm/locale.alias
-@unexec if cmp -s %D/etc/gdm/modules/AccessDwellMouseEvents %D/etc/gdm/modules/factory-AccessDwellMouseEvents; then rm -f %D/etc/gdm/modules/AccessDwellMouseEvents; fi
-etc/gdm/modules/factory-AccessDwellMouseEvents
-@exec [ -f %B/AccessDwellMouseEvents ] || cp %B/%f %B/AccessDwellMouseEvents
-@unexec if cmp -s %D/etc/gdm/modules/AccessKeyMouseEvents %D/etc/gdm/modules/factory-AccessKeyMouseEvents; then rm -f %D/etc/gdm/modules/AccessKeyMouseEvents; fi
-etc/gdm/modules/factory-AccessKeyMouseEvents
-@exec [ -f %B/AccessKeyMouseEvents ] || cp %B/%f %B/AccessKeyMouseEvents
+etc/gdm/gdm.schemas
etc/pam.d/gdm
-lib/gtk-2.0/modules/libdwellmouselistener.a
-lib/gtk-2.0/modules/libdwellmouselistener.la
-lib/gtk-2.0/modules/libdwellmouselistener.so
-lib/gtk-2.0/modules/libkeymouselistener.a
-lib/gtk-2.0/modules/libkeymouselistener.la
-lib/gtk-2.0/modules/libkeymouselistener.so
-libexec/gdmchooser
-libexec/gdmgreeter
-libexec/gdmlogin
-libexec/gdmtranslate
+libdata/bonobo/servers/GNOME_FastUserSwitchApplet.server
+libexec/gdm-crash-logger
+libexec/gdm-factory-slave
+libexec/gdm-host-chooser
+libexec/gdm-product-slave
+libexec/gdm-session-worker
+libexec/gdm-simple-chooser
+libexec/gdm-simple-greeter
+libexec/gdm-simple-slave
+libexec/gdm-user-switch-applet
+libexec/gdm-xdmcp-chooser-slave
sbin/gdm
sbin/gdm-binary
sbin/gdm-restart
sbin/gdm-safe-restart
sbin/gdm-stop
-sbin/gdmsetup
-%%DATADIR%%/BuiltInSessions/default.desktop
-%%DATADIR%%/applications/gdmflexiserver-xnest.desktop
-%%DATADIR%%/applications/gdmflexiserver.desktop
-%%DATADIR%%/applications/gdmphotosetup.desktop
-%%DATADIR%%/applications/gdmsetup.desktop
-%%DATADIR%%/defaults.conf
-%%DATADIR%%/factory-defaults.conf
-%%DATADIR%%/gdmchooser.glade
-%%DATADIR%%/gdmphotosetup.glade
-%%DATADIR%%/gdmsetup.glade
-%%DATADIR%%/themes/circles/GdmGreeterTheme.desktop
-%%DATADIR%%/themes/circles/background.svg
-%%DATADIR%%/themes/circles/circles.xml
-%%DATADIR%%/themes/circles/flower.png
-%%DATADIR%%/themes/circles/screenshot.png
-%%DATADIR%%/themes/happygnome-list/GdmGreeterTheme.desktop
-%%DATADIR%%/themes/happygnome-list/background.svg
-%%DATADIR%%/themes/happygnome-list/gnome-logo.svg
-%%DATADIR%%/themes/happygnome-list/happygnome-list.xml
-%%DATADIR%%/themes/happygnome-list/screenshot.png
-%%DATADIR%%/themes/happygnome/GdmGreeterTheme.desktop
-%%DATADIR%%/themes/happygnome/background.svg
-%%DATADIR%%/themes/happygnome/gnome-logo.svg
-%%DATADIR%%/themes/happygnome/happygnome.xml
-%%DATADIR%%/themes/happygnome/screenshot.png
+%%DATADIR%%/autostart/LoginWindow/at-spi-registryd-wrapper.desktop
+%%DATADIR%%/autostart/LoginWindow/gdm-simple-greeter.desktop
+%%DATADIR%%/autostart/LoginWindow/gnome-mag.desktop
+%%DATADIR%%/autostart/LoginWindow/gnome-power-manager.desktop
+%%DATADIR%%/autostart/LoginWindow/gnome-settings-daemon.desktop
+%%DATADIR%%/autostart/LoginWindow/gok.desktop
+%%DATADIR%%/autostart/LoginWindow/metacity.desktop
+%%DATADIR%%/autostart/LoginWindow/orca-screen-reader.desktop
+%%DATADIR%%/gconf.path
+%%DATADIR%%/gdb-cmd
+%%DATADIR%%/gdm-greeter-login-window.glade
+%%DATADIR%%/session-setup.entries
+share/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
share/gnome/help/gdm/C/gdm.xml
share/gnome/help/gdm/C/legal.xml
share/gnome/help/gdm/de/gdm.xml
@@ -71,25 +48,12 @@ share/gnome/help/gdm/es/gdm.xml
share/gnome/help/gdm/fr/gdm.xml
share/gnome/help/gdm/ko/gdm.xml
share/gnome/help/gdm/oc/gdm.xml
+share/gnome/help/gdm/ru/gdm.xml
share/gnome/help/gdm/sv/gdm.xml
share/gnome/help/gdm/uk/gdm.xml
share/icons/hicolor/16x16/apps/gdm-xnest.png
-share/icons/hicolor/16x16/apps/gdmflexiserver.png
-share/icons/hicolor/16x16/apps/gdmsetup.png
-share/icons/hicolor/22x22/apps/gdmflexiserver.png
-share/icons/hicolor/22x22/apps/gdmsetup.png
-share/icons/hicolor/24x24/apps/gdmflexiserver.png
-share/icons/hicolor/24x24/apps/gdmsetup.png
+share/icons/hicolor/32x32/apps/gdm-setup.png
share/icons/hicolor/32x32/apps/gdm-xnest.png
-share/icons/hicolor/32x32/apps/gdmflexiserver.png
-share/icons/hicolor/32x32/apps/gdmsetup.png
-share/icons/hicolor/48x48/apps/gdm-login-photo.png
-share/icons/hicolor/48x48/apps/gdm-xnest.png
-share/icons/hicolor/48x48/apps/gdm.png
-share/icons/hicolor/48x48/apps/gdmflexiserver.png
-share/icons/hicolor/48x48/apps/gdmsetup.png
-share/icons/hicolor/scalable/apps/gdmflexiserver.svg
-share/icons/hicolor/scalable/apps/gdmsetup.svg
share/locale/af/LC_MESSAGES/gdm.mo
share/locale/am/LC_MESSAGES/gdm.mo
share/locale/ar/LC_MESSAGES/gdm.mo
@@ -115,6 +79,7 @@ share/locale/eu/LC_MESSAGES/gdm.mo
share/locale/fa/LC_MESSAGES/gdm.mo
share/locale/fi/LC_MESSAGES/gdm.mo
share/locale/fr/LC_MESSAGES/gdm.mo
+share/locale/fur/LC_MESSAGES/gdm.mo
share/locale/ga/LC_MESSAGES/gdm.mo
share/locale/gl/LC_MESSAGES/gdm.mo
share/locale/gu/LC_MESSAGES/gdm.mo
@@ -131,8 +96,10 @@ share/locale/ka/LC_MESSAGES/gdm.mo
share/locale/kn/LC_MESSAGES/gdm.mo
share/locale/ko/LC_MESSAGES/gdm.mo
share/locale/ku/LC_MESSAGES/gdm.mo
+share/locale/la/LC_MESSAGES/gdm.mo
share/locale/lt/LC_MESSAGES/gdm.mo
share/locale/lv/LC_MESSAGES/gdm.mo
+share/locale/mai/LC_MESSAGES/gdm.mo
share/locale/mg/LC_MESSAGES/gdm.mo
share/locale/mi/LC_MESSAGES/gdm.mo
share/locale/mk/LC_MESSAGES/gdm.mo
@@ -149,6 +116,7 @@ share/locale/oc/LC_MESSAGES/gdm.mo
share/locale/or/LC_MESSAGES/gdm.mo
share/locale/pa/LC_MESSAGES/gdm.mo
share/locale/pl/LC_MESSAGES/gdm.mo
+share/locale/ps/LC_MESSAGES/gdm.mo
share/locale/pt/LC_MESSAGES/gdm.mo
share/locale/pt_BR/LC_MESSAGES/gdm.mo
share/locale/ro/LC_MESSAGES/gdm.mo
@@ -159,15 +127,13 @@ share/locale/sk/LC_MESSAGES/gdm.mo
share/locale/sl/LC_MESSAGES/gdm.mo
share/locale/sq/LC_MESSAGES/gdm.mo
share/locale/sr/LC_MESSAGES/gdm.mo
-share/locale/sr@Latn/LC_MESSAGES/gdm.mo
+share/locale/sr@latin/LC_MESSAGES/gdm.mo
share/locale/sv/LC_MESSAGES/gdm.mo
share/locale/ta/LC_MESSAGES/gdm.mo
share/locale/te/LC_MESSAGES/gdm.mo
share/locale/th/LC_MESSAGES/gdm.mo
share/locale/tr/LC_MESSAGES/gdm.mo
share/locale/uk/LC_MESSAGES/gdm.mo
-share/locale/uz/LC_MESSAGES/gdm.mo
-share/locale/uz@cyrillic/LC_MESSAGES/gdm.mo
share/locale/vi/LC_MESSAGES/gdm.mo
share/locale/wa/LC_MESSAGES/gdm.mo
share/locale/xh/LC_MESSAGES/gdm.mo
@@ -175,15 +141,6 @@ share/locale/zh_CN/LC_MESSAGES/gdm.mo
share/locale/zh_HK/LC_MESSAGES/gdm.mo
share/locale/zh_TW/LC_MESSAGES/gdm.mo
share/locale/zu/LC_MESSAGES/gdm.mo
-share/omf/gdm/gdm-C.omf
-share/omf/gdm/gdm-de.omf
-share/omf/gdm/gdm-en_GB.omf
-share/omf/gdm/gdm-es.omf
-share/omf/gdm/gdm-fr.omf
-share/omf/gdm/gdm-ko.omf
-share/omf/gdm/gdm-oc.omf
-share/omf/gdm/gdm-sv.omf
-share/omf/gdm/gdm-uk.omf
share/pixmaps/faces/astronaut.jpg
share/pixmaps/faces/baseball.png
share/pixmaps/faces/butterfly.png
@@ -209,14 +166,17 @@ share/pixmaps/faces/sunset.jpg
share/pixmaps/faces/tennis-ball.png
share/pixmaps/faces/yellow-rose.jpg
share/pixmaps/gdm-foot-logo.png
+share/pixmaps/gdm-setup.png
+share/pixmaps/gdm-xnest.png
+share/pixmaps/gdm.png
share/pixmaps/nobody.png
share/pixmaps/nohost.png
-share/xsessions/gnome.desktop
-@dirrm share/xsessions
+@exec mkdir -p %D/share/xsessions
+@dirrmtry share/xsessions
@dirrm share/pixmaps/faces
-@dirrm share/omf/gdm
@dirrm share/gnome/help/gdm/uk
@dirrm share/gnome/help/gdm/sv
+@dirrm share/gnome/help/gdm/ru
@dirrm share/gnome/help/gdm/oc
@dirrm share/gnome/help/gdm/ko
@dirrm share/gnome/help/gdm/fr
@@ -225,40 +185,40 @@ share/xsessions/gnome.desktop
@dirrm share/gnome/help/gdm/de
@dirrm share/gnome/help/gdm/C
@dirrm share/gnome/help/gdm
-@dirrm %%DATADIR%%/themes/happygnome-list
-@dirrm %%DATADIR%%/themes/happygnome
-@dirrm %%DATADIR%%/themes/circles
-@dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%/applications
-@dirrm %%DATADIR%%/BuiltInSessions
+@dirrm %%DATADIR%%/autostart/LoginWindow
+@dirrm %%DATADIR%%/autostart
@dirrm %%DATADIR%%
-@dirrm etc/gdm/modules
@dirrm etc/gdm/Sessions
@dirrm etc/gdm/PreSession
@dirrm etc/gdm/PostSession
@dirrm etc/gdm/PostLogin
@dirrm etc/gdm/Init
-@dirrm etc/gdm
+@dirrmtry etc/gdm/home
+@dirrmtry etc/gdm
@dirrmtry etc/dm/Sessions
@dirrmtry etc/dm
+@dirrmtry sbin
@dirrmtry share/log/gdm
@dirrmtry share/log
@unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true
@unexec /bin/rm -rf /var/log/gdm 2>/dev/null || /usr/bin/true
+@unexec /bin/rm -rf /var/run/gdm 2>/dev/null || /usr/bin/true
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
-@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
-@dirrmtry share/locale/uz@cyrillic
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/si/LC_MESSAGES
@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
@dirrmtry share/locale/nso/LC_MESSAGES
@@ -269,10 +229,16 @@ share/xsessions/gnome.desktop
@dirrmtry share/locale/mi
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/la/LC_MESSAGES
+@dirrmtry share/locale/la
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
diff --git a/x11/gegl/Makefile b/x11/gegl/Makefile
new file mode 100644
index 000000000000..7832d09173ba
--- /dev/null
+++ b/x11/gegl/Makefile
@@ -0,0 +1,39 @@
+# New ports collection makefile for: gegl
+# Date created: 2008-04-14
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/x11/gegl/Makefile,v 1.3 2008/07/26 15:50:04 ahze Exp $
+
+PORTNAME= gegl
+PORTVERSION= 0.0.18
+CATEGORIES= x11
+MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
+ http://gimp.mirrors.hoobly.com/%SUBDIR%/ \
+ http://ftp.gwdg.de/pub/misc/grafik/gimp/%SUBDIR%/ \
+ ftp://ftp.fh-heilbronn.de/mirrors/ftp.gimp.org/%SUBDIR%/ \
+ ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
+ http://www.mirrorservice.org/sites/ftp.gimp.org/pub/%SUBDIR%/ \
+ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/%SUBDIR%,}
+MASTER_SITE_SUBDIR= gegl/${PORTVERSION:R}
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Generic Graphics Library: graph based image processing framework
+
+LIB_DEPENDS= babl-0.0.0:${PORTSDIR}/x11/babl \
+ avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
+ IlmImf.6:${PORTSDIR}/graphics/OpenEXR
+# cdt.4:${PORTSDIR}/graphics/graphviz
+
+USE_BZIP2= yes
+USE_LDCONFIG= yes
+USE_GNOME= gnomehack pkgconfig gtk20 librsvg2 ltverhack
+#USE_LUA= 5.1+
+USE_SDL= yes
+USE_AUTOTOOLS= libtool:15
+USE_GMAKE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+.include <bsd.port.pre.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/gegl/distinfo b/x11/gegl/distinfo
new file mode 100644
index 000000000000..5da41802dafd
--- /dev/null
+++ b/x11/gegl/distinfo
@@ -0,0 +1,3 @@
+MD5 (gegl-0.0.18.tar.bz2) = e458409440a7b51f446df321c3657e4d
+SHA256 (gegl-0.0.18.tar.bz2) = 58d5c2c415684f5744dd8dec80a1c230fc4b02ecea6c9edf3b5ef3ed4046ef93
+SIZE (gegl-0.0.18.tar.bz2) = 1204867
diff --git a/x11/gegl/pkg-descr b/x11/gegl/pkg-descr
new file mode 100644
index 000000000000..148fd5b50bc0
--- /dev/null
+++ b/x11/gegl/pkg-descr
@@ -0,0 +1,8 @@
+GEGL (Generic Graphics Library) is a graph based image processing
+framework.
+
+GEGL's original design was made to scratch GIMP's itches for a new
+compositing and processing core. This core is being designed to have
+minimal dependencies. and a simple well defined API.
+
+WWW: http://www.gegl.org/
diff --git a/x11/gegl/pkg-plist b/x11/gegl/pkg-plist
new file mode 100644
index 000000000000..6814ea550969
--- /dev/null
+++ b/x11/gegl/pkg-plist
@@ -0,0 +1,299 @@
+bin/gegl
+include/gegl-0.0/gegl-buffer.h
+include/gegl-0.0/gegl-chant.h
+include/gegl-0.0/gegl-color.h
+include/gegl-0.0/gegl-config.c
+include/gegl-0.0/gegl-curve.h
+include/gegl-0.0/gegl-paramspecs.h
+include/gegl-0.0/gegl-plugin.h
+include/gegl-0.0/gegl-utils.h
+include/gegl-0.0/gegl.h
+include/gegl-0.0/operation/gegl-operation-area-filter.h
+include/gegl-0.0/operation/gegl-operation-composer.h
+include/gegl-0.0/operation/gegl-operation-filter.h
+include/gegl-0.0/operation/gegl-operation-meta.h
+include/gegl-0.0/operation/gegl-operation-point-composer.h
+include/gegl-0.0/operation/gegl-operation-point-filter.h
+include/gegl-0.0/operation/gegl-operation-point-render.h
+include/gegl-0.0/operation/gegl-operation-sink.h
+include/gegl-0.0/operation/gegl-operation-source.h
+include/gegl-0.0/operation/gegl-operation-temporal.h
+include/gegl-0.0/operation/gegl-operation.h
+lib/gegl-0.0/add.a
+lib/gegl-0.0/add.la
+lib/gegl-0.0/add.so
+lib/gegl-0.0/affine.a
+lib/gegl-0.0/affine.la
+lib/gegl-0.0/affine.so
+lib/gegl-0.0/bilateral-filter.a
+lib/gegl-0.0/bilateral-filter.la
+lib/gegl-0.0/bilateral-filter.so
+lib/gegl-0.0/box-blur.a
+lib/gegl-0.0/box-blur.la
+lib/gegl-0.0/box-blur.so
+lib/gegl-0.0/brightness-contrast.a
+lib/gegl-0.0/brightness-contrast.la
+lib/gegl-0.0/brightness-contrast.so
+lib/gegl-0.0/c2g.a
+lib/gegl-0.0/c2g.la
+lib/gegl-0.0/c2g.so
+lib/gegl-0.0/checkerboard.a
+lib/gegl-0.0/checkerboard.la
+lib/gegl-0.0/checkerboard.so
+lib/gegl-0.0/clear.a
+lib/gegl-0.0/clear.la
+lib/gegl-0.0/clear.so
+lib/gegl-0.0/clone.a
+lib/gegl-0.0/clone.la
+lib/gegl-0.0/clone.so
+lib/gegl-0.0/color-burn.a
+lib/gegl-0.0/color-burn.la
+lib/gegl-0.0/color-burn.so
+lib/gegl-0.0/color-dodge.a
+lib/gegl-0.0/color-dodge.la
+lib/gegl-0.0/color-dodge.so
+lib/gegl-0.0/color-temperature.a
+lib/gegl-0.0/color-temperature.la
+lib/gegl-0.0/color-temperature.so
+lib/gegl-0.0/color.a
+lib/gegl-0.0/color.la
+lib/gegl-0.0/color.so
+lib/gegl-0.0/contrast-curve.a
+lib/gegl-0.0/contrast-curve.la
+lib/gegl-0.0/contrast-curve.so
+lib/gegl-0.0/convert-format.a
+lib/gegl-0.0/convert-format.la
+lib/gegl-0.0/convert-format.so
+lib/gegl-0.0/crop.a
+lib/gegl-0.0/crop.la
+lib/gegl-0.0/crop.so
+lib/gegl-0.0/darken.a
+lib/gegl-0.0/darken.la
+lib/gegl-0.0/darken.so
+lib/gegl-0.0/difference-of-gaussians.a
+lib/gegl-0.0/difference-of-gaussians.la
+lib/gegl-0.0/difference-of-gaussians.so
+lib/gegl-0.0/difference.a
+lib/gegl-0.0/difference.la
+lib/gegl-0.0/difference.so
+lib/gegl-0.0/display.a
+lib/gegl-0.0/display.la
+lib/gegl-0.0/display.so
+lib/gegl-0.0/divide.a
+lib/gegl-0.0/divide.la
+lib/gegl-0.0/divide.so
+lib/gegl-0.0/dropshadow.a
+lib/gegl-0.0/dropshadow.la
+lib/gegl-0.0/dropshadow.so
+lib/gegl-0.0/dst-atop.a
+lib/gegl-0.0/dst-atop.la
+lib/gegl-0.0/dst-atop.so
+lib/gegl-0.0/dst-in.a
+lib/gegl-0.0/dst-in.la
+lib/gegl-0.0/dst-in.so
+lib/gegl-0.0/dst-out.a
+lib/gegl-0.0/dst-out.la
+lib/gegl-0.0/dst-out.so
+lib/gegl-0.0/dst-over.a
+lib/gegl-0.0/dst-over.la
+lib/gegl-0.0/dst-over.so
+lib/gegl-0.0/dst.a
+lib/gegl-0.0/dst.la
+lib/gegl-0.0/dst.so
+lib/gegl-0.0/exclusion.a
+lib/gegl-0.0/exclusion.la
+lib/gegl-0.0/exclusion.so
+lib/gegl-0.0/exr-load.a
+lib/gegl-0.0/exr-load.la
+lib/gegl-0.0/exr-load.so
+lib/gegl-0.0/ff-load.a
+lib/gegl-0.0/ff-load.la
+lib/gegl-0.0/ff-load.so
+lib/gegl-0.0/fractal-explorer.a
+lib/gegl-0.0/fractal-explorer.la
+lib/gegl-0.0/fractal-explorer.so
+lib/gegl-0.0/gamma.a
+lib/gegl-0.0/gamma.la
+lib/gegl-0.0/gamma.so
+lib/gegl-0.0/gaussian-blur.a
+lib/gegl-0.0/gaussian-blur.la
+lib/gegl-0.0/gaussian-blur.so
+lib/gegl-0.0/grey.a
+lib/gegl-0.0/grey.la
+lib/gegl-0.0/grey.so
+lib/gegl-0.0/hard-light.a
+lib/gegl-0.0/hard-light.la
+lib/gegl-0.0/hard-light.so
+lib/gegl-0.0/introspect.a
+lib/gegl-0.0/introspect.la
+lib/gegl-0.0/introspect.so
+lib/gegl-0.0/invert.a
+lib/gegl-0.0/invert.la
+lib/gegl-0.0/invert.so
+lib/gegl-0.0/jpg-load.a
+lib/gegl-0.0/jpg-load.la
+lib/gegl-0.0/jpg-load.so
+lib/gegl-0.0/layer.a
+lib/gegl-0.0/layer.la
+lib/gegl-0.0/layer.so
+lib/gegl-0.0/levels.a
+lib/gegl-0.0/levels.la
+lib/gegl-0.0/levels.so
+lib/gegl-0.0/lighten.a
+lib/gegl-0.0/lighten.la
+lib/gegl-0.0/lighten.so
+lib/gegl-0.0/load-buffer.a
+lib/gegl-0.0/load-buffer.la
+lib/gegl-0.0/load-buffer.so
+lib/gegl-0.0/load.a
+lib/gegl-0.0/load.la
+lib/gegl-0.0/load.so
+lib/gegl-0.0/magick-load.a
+lib/gegl-0.0/magick-load.la
+lib/gegl-0.0/magick-load.so
+lib/gegl-0.0/mblur.a
+lib/gegl-0.0/mblur.la
+lib/gegl-0.0/mblur.so
+lib/gegl-0.0/mono-mixer.a
+lib/gegl-0.0/mono-mixer.la
+lib/gegl-0.0/mono-mixer.so
+lib/gegl-0.0/multiply.a
+lib/gegl-0.0/multiply.la
+lib/gegl-0.0/multiply.so
+lib/gegl-0.0/noise.a
+lib/gegl-0.0/noise.la
+lib/gegl-0.0/noise.so
+lib/gegl-0.0/nop.a
+lib/gegl-0.0/nop.la
+lib/gegl-0.0/nop.so
+lib/gegl-0.0/normal.a
+lib/gegl-0.0/normal.la
+lib/gegl-0.0/normal.so
+lib/gegl-0.0/opacity.a
+lib/gegl-0.0/opacity.la
+lib/gegl-0.0/opacity.so
+lib/gegl-0.0/open-buffer.a
+lib/gegl-0.0/open-buffer.la
+lib/gegl-0.0/open-buffer.so
+lib/gegl-0.0/over.a
+lib/gegl-0.0/over.la
+lib/gegl-0.0/over.so
+lib/gegl-0.0/overlay.a
+lib/gegl-0.0/overlay.la
+lib/gegl-0.0/overlay.so
+lib/gegl-0.0/pixbuf.a
+lib/gegl-0.0/pixbuf.la
+lib/gegl-0.0/pixbuf.so
+lib/gegl-0.0/plus.a
+lib/gegl-0.0/plus.la
+lib/gegl-0.0/plus.so
+lib/gegl-0.0/png-load.a
+lib/gegl-0.0/png-load.la
+lib/gegl-0.0/png-load.so
+lib/gegl-0.0/png-save.a
+lib/gegl-0.0/png-save.la
+lib/gegl-0.0/png-save.so
+lib/gegl-0.0/raw-load.a
+lib/gegl-0.0/raw-load.la
+lib/gegl-0.0/raw-load.so
+lib/gegl-0.0/rectangle.a
+lib/gegl-0.0/rectangle.la
+lib/gegl-0.0/rectangle.so
+lib/gegl-0.0/remap.a
+lib/gegl-0.0/remap.la
+lib/gegl-0.0/remap.so
+lib/gegl-0.0/save-buffer.a
+lib/gegl-0.0/save-buffer.la
+lib/gegl-0.0/save-buffer.so
+lib/gegl-0.0/save-pixbuf.a
+lib/gegl-0.0/save-pixbuf.la
+lib/gegl-0.0/save-pixbuf.so
+lib/gegl-0.0/screen.a
+lib/gegl-0.0/screen.la
+lib/gegl-0.0/screen.so
+lib/gegl-0.0/shift.a
+lib/gegl-0.0/shift.la
+lib/gegl-0.0/shift.so
+lib/gegl-0.0/snn-mean.a
+lib/gegl-0.0/snn-mean.la
+lib/gegl-0.0/snn-mean.so
+lib/gegl-0.0/soft-light.a
+lib/gegl-0.0/soft-light.la
+lib/gegl-0.0/soft-light.so
+lib/gegl-0.0/src-atop.a
+lib/gegl-0.0/src-atop.la
+lib/gegl-0.0/src-atop.so
+lib/gegl-0.0/src-in.a
+lib/gegl-0.0/src-in.la
+lib/gegl-0.0/src-in.so
+lib/gegl-0.0/src-out.a
+lib/gegl-0.0/src-out.la
+lib/gegl-0.0/src-out.so
+lib/gegl-0.0/src-over.a
+lib/gegl-0.0/src-over.la
+lib/gegl-0.0/src-over.so
+lib/gegl-0.0/src.a
+lib/gegl-0.0/src.la
+lib/gegl-0.0/src.so
+lib/gegl-0.0/stress.a
+lib/gegl-0.0/stress.la
+lib/gegl-0.0/stress.so
+lib/gegl-0.0/stretch-contrast.a
+lib/gegl-0.0/stretch-contrast.la
+lib/gegl-0.0/stretch-contrast.so
+lib/gegl-0.0/subtract.a
+lib/gegl-0.0/subtract.la
+lib/gegl-0.0/subtract.so
+lib/gegl-0.0/svg-huerotate.a
+lib/gegl-0.0/svg-huerotate.la
+lib/gegl-0.0/svg-huerotate.so
+lib/gegl-0.0/svg-load.a
+lib/gegl-0.0/svg-load.la
+lib/gegl-0.0/svg-load.so
+lib/gegl-0.0/svg-luminancetoalpha.a
+lib/gegl-0.0/svg-luminancetoalpha.la
+lib/gegl-0.0/svg-luminancetoalpha.so
+lib/gegl-0.0/svg-matrix.a
+lib/gegl-0.0/svg-matrix.la
+lib/gegl-0.0/svg-matrix.so
+lib/gegl-0.0/svg-multiply.a
+lib/gegl-0.0/svg-multiply.la
+lib/gegl-0.0/svg-multiply.so
+lib/gegl-0.0/svg-saturate.a
+lib/gegl-0.0/svg-saturate.la
+lib/gegl-0.0/svg-saturate.so
+lib/gegl-0.0/text.a
+lib/gegl-0.0/text.la
+lib/gegl-0.0/text.so
+lib/gegl-0.0/threshold.a
+lib/gegl-0.0/threshold.la
+lib/gegl-0.0/threshold.so
+lib/gegl-0.0/tonemap.a
+lib/gegl-0.0/tonemap.la
+lib/gegl-0.0/tonemap.so
+lib/gegl-0.0/unsharp-mask.a
+lib/gegl-0.0/unsharp-mask.la
+lib/gegl-0.0/unsharp-mask.so
+lib/gegl-0.0/v4l.a
+lib/gegl-0.0/v4l.la
+lib/gegl-0.0/v4l.so
+lib/gegl-0.0/value-invert.a
+lib/gegl-0.0/value-invert.la
+lib/gegl-0.0/value-invert.so
+lib/gegl-0.0/whitebalance.a
+lib/gegl-0.0/whitebalance.la
+lib/gegl-0.0/whitebalance.so
+lib/gegl-0.0/write-buffer.a
+lib/gegl-0.0/write-buffer.la
+lib/gegl-0.0/write-buffer.so
+lib/gegl-0.0/xor.a
+lib/gegl-0.0/xor.la
+lib/gegl-0.0/xor.so
+lib/libgegl-0.0.a
+lib/libgegl-0.0.la
+lib/libgegl-0.0.so
+lib/libgegl-0.0.so.0
+libdata/pkgconfig/gegl.pc
+@dirrm lib/gegl-0.0
+@dirrm include/gegl-0.0/operation
+@dirrm include/gegl-0.0
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 05a7a225437d..239d398a23ae 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-applets/Makefile,v 1.175 2008/03/10 20:03:41 mezz Exp $
+# $MCom: ports/x11/gnome-applets/Makefile,v 1.193 2008/12/20 20:05:50 marcus Exp $
#
PORTNAME= gnome-applets
-PORTVERSION= 2.22.3
+PORTVERSION= 2.24.2
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -20,7 +21,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${POR
LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \
gweather.1:${PORTSDIR}/net/libgweather \
xklavier.12:${PORTSDIR}/x11/libxklavier \
- gucharmap.6:${PORTSDIR}/deskutils/gucharmap
+ gucharmap.7:${PORTSDIR}/deskutils/gucharmap
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \
${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
@@ -31,13 +32,12 @@ GNOME_DESKTOP_VERSION=2
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
-USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \
- gail gnomedocutils libgnomekbd
+USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel gnomedocutils \
+ libgnomekbd
WANT_GNOME= yes
USE_GSTREAMER= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-gstreamer=0.10 \
- --enable-stickynotes
+CONFIGURE_ARGS= --with-gstreamer=0.10
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
OS_SYS="/usr/include"
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index c3fdb935ad71..293bb28a0d7a 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-applets-2.22.3.tar.bz2) = 9e64d2827b0e8d2a03ebffb2c3499566
-SHA256 (gnome2/gnome-applets-2.22.3.tar.bz2) = dac8527273b097a9e2debae2223022ac2b7d78c86643654d6ca5d0db51574c52
-SIZE (gnome2/gnome-applets-2.22.3.tar.bz2) = 7508373
+MD5 (gnome2/gnome-applets-2.24.2.tar.bz2) = 7bdfde8fd9035c41fd6d42490663c7ba
+SHA256 (gnome2/gnome-applets-2.24.2.tar.bz2) = 50bbf16de9c91fcc96156a154dabac490963fa768ecfea3c02f22bdc38c303b8
+SIZE (gnome2/gnome-applets-2.24.2.tar.bz2) = 7873299
diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa
index 7d1f860845cb..8a9822d48f15 100644
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig 2007-07-09 18:13:48.000000000 -0400
-+++ configure 2007-07-09 18:14:19.000000000 -0400
-@@ -25117,7 +25117,7 @@ _ACEOF
+--- configure.orig 2008-12-20 14:46:11.000000000 -0500
++++ configure 2008-12-20 14:54:57.000000000 -0500
+@@ -17150,7 +17150,7 @@ _ACEOF
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -9,7 +9,7 @@
ac_define_dir=`eval echo $ac_define_dir`
GNOMELOCALEDIR="$ac_define_dir"
-@@ -27157,8 +27157,8 @@ fi
+@@ -19097,8 +19097,8 @@ fi
;;
# list of supported OS cores that do not use libapm
@@ -20,16 +20,7 @@
ACPIINC="-I${OS_SYS}"
else
ACPIINC="-I/usr/src/sys"
-@@ -27924,7 +27924,7 @@ echo "${ECHO_T}no" >&6; }
- fi
-
-
-- stb="system-tools-backends"
-+ stb="system-tools-backends-2.0"
-
- if test x$PKG_CONFIG != xno ; then
- if $PKG_CONFIG --atleast-pkgconfig-version 0.12 ; then
-@@ -28166,6 +28166,9 @@ if test x$disable_cpufreq = xno; then
+@@ -20023,6 +20023,9 @@ if test x$disable_cpufreq = xno; then
*linux*)
build_cpufreq_applet=yes
;;
@@ -39,7 +30,7 @@
*)
{ echo "$as_me:$LINENO: WARNING: ${host} is not supported by cpufreq applet, not building" >&5
echo "$as_me: WARNING: ${host} is not supported by cpufreq applet, not building" >&2;}
-@@ -28684,7 +28687,7 @@ gladedir="${pkgdatadir}/glade"
+@@ -20591,7 +20594,7 @@ builderdir="${pkgdatadir}/builder"
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -48,7 +39,7 @@
ac_define_dir=`eval echo $ac_define_dir`
GNOME_ICONDIR="$ac_define_dir"
-@@ -28697,7 +28700,7 @@ _ACEOF
+@@ -20604,7 +20607,7 @@ _ACEOF
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -57,16 +48,16 @@
ac_define_dir=`eval echo $ac_define_dir`
GNOME_PIXMAPSDIR="$ac_define_dir"
-@@ -28710,7 +28713,7 @@ _ACEOF
+@@ -20617,7 +20620,7 @@ _ACEOF
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-- ac_define_dir=`eval echo $"${gladedir}"`
-+ ac_define_dir=`eval echo "${gladedir}"`
+- ac_define_dir=`eval echo $"${builderdir}"`
++ ac_define_dir=`eval echo "${builderdir}"`
ac_define_dir=`eval echo $ac_define_dir`
- GNOME_GLADEDIR="$ac_define_dir"
+ GTK_BUILDERDIR="$ac_define_dir"
-@@ -28723,7 +28726,7 @@ _ACEOF
+@@ -20630,7 +20633,7 @@ _ACEOF
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -75,7 +66,7 @@
ac_define_dir=`eval echo $ac_define_dir`
DATADIR="$ac_define_dir"
-@@ -28736,7 +28739,7 @@ _ACEOF
+@@ -20643,7 +20646,7 @@ _ACEOF
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -84,7 +75,7 @@
ac_define_dir=`eval echo $ac_define_dir`
SYSCONFDIR="$ac_define_dir"
-@@ -28749,7 +28752,7 @@ _ACEOF
+@@ -20656,7 +20659,7 @@ _ACEOF
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -93,7 +84,7 @@
ac_define_dir=`eval echo $ac_define_dir`
LIBDIR="$ac_define_dir"
-@@ -28762,7 +28765,7 @@ _ACEOF
+@@ -20669,7 +20672,7 @@ _ACEOF
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
diff --git a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
index 734bd6c74cea..5cca16dd4d9c 100644
--- a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
+++ b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
@@ -54,52 +54,6 @@
+G_END_DECLS
+
+#endif /* __CPUFREQ_SELECTOR_SYSCTL_H__ */
---- cpufreq/src/cpufreq-selector/main.c.orig Sat Jun 17 22:13:41 2006
-+++ cpufreq/src/cpufreq-selector/main.c Sat Jun 24 02:15:02 2006
-@@ -17,6 +17,7 @@
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Authors : Carlos García Campos <carlosgc@gnome.org>
-+ * Joe Marcus Clarke <marcus@FreeBSD.org>
- */
-
- #ifdef HAVE_CONFIG_H
-@@ -33,6 +34,9 @@
- #ifdef HAVE_LIBCPUFREQ
- #include "cpufreq-selector-libcpufreq.h"
- #endif
-+#ifdef __FreeBSD__
-+#include "cpufreq-selector-sysctl.h"
-+#endif /* __FreeBSD__ */
-
- static gint cpu = 0;
- static gchar *governor = NULL;
-@@ -51,6 +55,9 @@ main (gint argc, gchar **argv)
- CPUFreqSelector *selector;
- GOptionContext *context;
- GError *error = NULL;
-+#ifdef __FreeBSD__
-+ size_t len;
-+#endif
-
- if (geteuid () != 0) {
- g_printerr ("You must be root\n");
-@@ -83,10 +90,15 @@ main (gint argc, gchar **argv)
- #ifdef HAVE_LIBCPUFREQ
- selector = cpufreq_selector_libcpufreq_new (cpu);
- #else
-+#ifndef __FreeBSD__
- if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */
- selector = cpufreq_selector_sysfs_new (cpu);
- } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */
- selector = cpufreq_selector_procfs_new (cpu);
-+#else
-+ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) {
-+ selector = cpufreq_selector_sysctl_new (cpu);
-+#endif /* __FreeBSD__ */
- } else {
- g_printerr ("No cpufreq support\n");
- return 1;
--- cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.c.orig Wed Jul 26 01:34:18 2006
+++ cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.c Wed Jul 26 01:42:00 2006
@@ -0,0 +1,87 @@
@@ -190,39 +144,75 @@
+
+ return TRUE;
+}
---- cpufreq/src/cpufreq-selector/Makefile.in.orig 2007-07-30 21:08:35.000000000 -0400
-+++ cpufreq/src/cpufreq-selector/Makefile.in 2007-07-30 21:08:36.000000000 -0400
-@@ -57,13 +57,15 @@ am__cpufreq_selector_SOURCES_DIST = cpuf
- cpufreq-selector.h cpufreq-selector-sysfs.c \
- cpufreq-selector-sysfs.h cpufreq-selector-procfs.c \
- cpufreq-selector-procfs.h cpufreq-selector-libcpufreq.c \
-- cpufreq-selector-libcpufreq.h main.c
-+ cpufreq-selector-libcpufreq.h main.c \
-+ cpufreq-selector-sysctl.c cpufreq-selector-sysctl.h
+--- cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c.orig 2008-06-16 14:33:25.000000000 -0400
++++ cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c 2008-06-16 14:35:28.000000000 -0400
+@@ -27,20 +27,32 @@
+ #ifdef HAVE_LIBCPUFREQ
+ #include "cpufreq-selector-libcpufreq.h"
+ #endif
++#ifdef __FreeBSD__
++#include "cpufreq-selector-sysctl.h"
++#endif /* __FreeBSD__ */
+
+ CPUFreqSelector *
+ cpufreq_selector_factory_create_selector (guint cpu)
+ {
+ CPUFreqSelector *selector = NULL;
++#ifdef __FreeBSD__
++ size_t len;
++#endif
+
+ #ifdef HAVE_LIBCPUFREQ
+ selector = cpufreq_selector_libcpufreq_new (cpu);
+ #else
++#ifndef __FreeBSD__
+ if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */
+ selector = cpufreq_selector_sysfs_new (cpu);
+ } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */
+ selector = cpufreq_selector_procfs_new (cpu);
+ }
++#else
++ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) {
++ selector = cpufreq_selector_sysctl_new (cpu);
++ }
++#endif /* __FreeBSD__ */
+ #endif /* HAVE_LIBCPUFREQ */
+
+ return selector;
+--- cpufreq/src/cpufreq-selector/Makefile.in.orig 2008-06-16 14:26:07.000000000 -0400
++++ cpufreq/src/cpufreq-selector/Makefile.in 2008-06-16 14:38:15.000000000 -0400
+@@ -65,7 +65,7 @@ am__cpufreq_selector_SOURCES_DIST = cpuf
+ cpufreq-selector-libcpufreq.h cpufreq-selector-service.c \
+ cpufreq-selector-service.h cpufreq-selector-factory.c \
+ cpufreq-selector-factory.h cpufreq-selector-service-glue.h \
+- main.c
++ main.c cpufreq-selector-sysctl.c cpufreq-selector-sysctl.h
@HAVE_LIBCPUFREQ_TRUE@am__objects_1 = \
@HAVE_LIBCPUFREQ_TRUE@ cpufreq-selector-libcpufreq.$(OBJEXT)
- am_cpufreq_selector_OBJECTS = cpufreq-selector.$(OBJEXT) \
+ @HAVE_POLKIT_TRUE@am__objects_2 = cpufreq-selector-service.$(OBJEXT)
+@@ -74,7 +74,8 @@ am_cpufreq_selector_OBJECTS = cpufreq-se
cpufreq-selector-sysfs.$(OBJEXT) \
cpufreq-selector-procfs.$(OBJEXT) $(am__objects_1) \
-- main.$(OBJEXT)
-+ main.$(OBJEXT) \
+ $(am__objects_2) cpufreq-selector-factory.$(OBJEXT) \
+- $(am__objects_3) main.$(OBJEXT)
++ $(am__objects_3) main.$(OBJEXT) \
+ cpufreq-selector-sysctl.$(OBJEXT)
cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS)
am__DEPENDENCIES_1 =
- cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@@ -381,6 +383,7 @@ cpufreq_selector_SOURCES = \
- cpufreq-selector.c cpufreq-selector.h \
- cpufreq-selector-sysfs.c cpufreq-selector-sysfs.h \
- cpufreq-selector-procfs.c cpufreq-selector-procfs.h \
-+ cpufreq-selector-sysctl.c cpufreq-selector-sysctl.h \
- $(cpufreq_files) \
- main.c
-
-@@ -462,6 +465,7 @@ distclean-compile:
-
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-libcpufreq.Po@am__quote@
+ @HAVE_POLKIT_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
+@@ -371,6 +372,7 @@ cpufreq_selector_SOURCES = \
+ cpufreq-selector.c cpufreq-selector.h \
+ cpufreq-selector-sysfs.c cpufreq-selector-sysfs.h \
+ cpufreq-selector-procfs.c cpufreq-selector-procfs.h \
++ cpufreq-selector-sysctl.c cpufreq-selector-sysctl.h \
+ $(cpufreq_files) \
+ $(service_files) \
+ cpufreq-selector-factory.c cpufreq-selector-factory.h \
+@@ -480,6 +482,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-procfs.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-sysctl.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-service.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-sysfs.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-sysctl.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+
diff --git a/x11/gnome-applets/files/patch-invest-applet_invest_invest-applet.py b/x11/gnome-applets/files/patch-invest-applet_invest_invest-applet.py
index 0dc24164ec34..7ddb583de639 100644
--- a/x11/gnome-applets/files/patch-invest-applet_invest_invest-applet.py
+++ b/x11/gnome-applets/files/patch-invest-applet_invest_invest-applet.py
@@ -1,5 +1,5 @@
---- invest-applet/invest/invest-applet.py.orig Wed Sep 13 20:42:15 2006
-+++ invest-applet/invest/invest-applet.py Wed Sep 13 20:42:28 2006
+--- invest-applet/invest/invest-applet.py.orig 2008-03-15 19:39:32.000000000 -0400
++++ invest-applet/invest/invest-applet.py 2008-04-28 13:27:46.000000000 -0400
@@ -26,8 +26,8 @@ import invest, invest.applet, invest.def
import gettext, locale
gettext.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
@@ -8,6 +8,6 @@
-locale.textdomain(invest.defs.GETTEXT_PACKAGE)
+#locale.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
+#locale.textdomain(invest.defs.GETTEXT_PACKAGE)
- gtk.glade.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
- gtk.glade.textdomain(invest.defs.GETTEXT_PACKAGE)
+
+ from gettext import gettext as _
diff --git a/x11/gnome-applets/files/patch-invest-applet_invest_invest-chart b/x11/gnome-applets/files/patch-invest-applet_invest_invest-chart
index 2eddc8154089..aa763c16c429 100644
--- a/x11/gnome-applets/files/patch-invest-applet_invest_invest-chart
+++ b/x11/gnome-applets/files/patch-invest-applet_invest_invest-chart
@@ -1,5 +1,5 @@
---- invest-applet/invest/invest-chart.orig Wed Sep 13 20:41:18 2006
-+++ invest-applet/invest/invest-chart Wed Sep 13 20:41:33 2006
+--- invest-applet/invest/invest-chart.orig 2008-03-15 16:34:50.000000000 -0400
++++ invest-applet/invest/invest-chart 2008-04-28 13:29:13.000000000 -0400
@@ -6,8 +6,8 @@ import sys, invest.chart, gtk
import gettext, locale
gettext.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
@@ -8,6 +8,6 @@
-locale.textdomain(invest.defs.GETTEXT_PACKAGE)
+#locale.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
+#locale.textdomain(invest.defs.GETTEXT_PACKAGE)
- gtk.glade.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
- gtk.glade.textdomain(invest.defs.GETTEXT_PACKAGE)
+ if __name__ == "__main__":
+ win = invest.chart.show_chart(sys.argv[1:])
diff --git a/x11/gnome-applets/files/patch-mixer_applet.c b/x11/gnome-applets/files/patch-mixer_applet.c
deleted file mode 100644
index d7c0eb517833..000000000000
--- a/x11/gnome-applets/files/patch-mixer_applet.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- mixer/applet.c.orig Mon Nov 7 09:53:52 2005
-+++ mixer/applet.c Mon Nov 28 01:16:50 2005
-@@ -953,7 +953,7 @@ gnome_volume_applet_adjust_volume (GstMi
-
- volumes = g_new (gint, track->num_channels);
- for (n = 0; n < track->num_channels; n++)
-- volumes[n] = lrint (volume);
-+ volumes[n] = (int) rint (volume);
- gst_mixer_set_volume (mixer, track, volumes);
- g_free (volumes);
- }
diff --git a/x11/gnome-applets/files/patch-modemlights_Makefile.in b/x11/gnome-applets/files/patch-modemlights_Makefile.in
deleted file mode 100644
index 874884722127..000000000000
--- a/x11/gnome-applets/files/patch-modemlights_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- modemlights/Makefile.in.orig Fri Jan 14 00:08:52 2005
-+++ modemlights/Makefile.in Fri Jan 14 00:09:20 2005
-@@ -319,6 +319,7 @@
- modem_applet_LDADD = \
- $(GNOME_APPLETS_LIBS) \
- $(LIBGLADE_LIBS) \
-+ -lutil \
- $(MODEMLIGHTS_LIBS)
-
- uidir = $(datadir)/gnome-2.0/ui
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 9fc4e42bbfce..68f004ac32c3 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -1,5 +1,6 @@
%%CPUFREQ%%bin/cpufreq-selector
%%PYTHON%%bin/invest-chart
+%%CPUFREQ%%etc/dbus-1/system.d/org.gnome.CPUFreqSelector.conf
%%BATTERY%%etc/sound/events/battstat_applet.soundlist
%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/__init__.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/__init__.pyc
@@ -38,7 +39,6 @@ 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
-libdata/bonobo/servers/GNOME_ModemLights.server
libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server
libdata/bonobo/servers/GNOME_NullApplet_Factory.server
libdata/bonobo/servers/GNOME_Panel_TrashApplet.server
@@ -57,11 +57,12 @@ libexec/gweather-applet-2
%%PYTHON%%libexec/invest-applet
%%COMMANDER%%libexec/mini_commander_applet
libexec/mixer_applet2
-libexec/modem_applet
libexec/multiload-applet-2
libexec/null_applet
libexec/stickynotes_applet
libexec/trashapplet
+%%CPUFREQ%%share/PolicyKit/policy/org.gnome.cpufreqselector.policy
+%%CPUFREQ%%share/dbus-1/system-services/org.gnome.CPUFreqSelector.service
share/gnome-2.0/ui/GNOME_AccessxApplet.xml
%%BATTERY%%share/gnome-2.0/ui/GNOME_BattstatApplet.xml
%%CPUFREQ%%share/gnome-2.0/ui/GNOME_CPUFreqApplet.xml
@@ -72,11 +73,18 @@ share/gnome-2.0/ui/GNOME_GWeatherApplet.xml
share/gnome-2.0/ui/GNOME_GeyesApplet.xml
%%COMMANDER%%share/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml
share/gnome-2.0/ui/GNOME_MixerApplet.xml
-share/gnome-2.0/ui/GNOME_ModemLights.xml
share/gnome-2.0/ui/GNOME_MultiloadApplet.xml
share/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml
share/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
%%PYTHON%%share/gnome-2.0/ui/Invest_Applet.xml
+%%BATTERY%%%%DATADIR%%/builder/battstat_applet.ui
+%%CPUFREQ%%%%DATADIR%%/builder/cpufreq-preferences.ui
+%%PYTHON%%%%DATADIR%%/builder/financialchart.ui
+%%DATADIR%%/builder/gswitchit.ui
+%%COMMANDER%%%%DATADIR%%/builder/mini-commander.ui
+%%PYTHON%%%%DATADIR%%/builder/prefs-dialog.ui
+%%DATADIR%%/builder/stickynotes.ui
+%%DATADIR%%/builder/trashapplet-empty-progress.ui
%%DATADIR%%/geyes/Bizarre/Bizarre-eye.png
%%DATADIR%%/geyes/Bizarre/Bizarre-pupil.png
%%DATADIR%%/geyes/Bizarre/config
@@ -95,18 +103,13 @@ share/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
%%DATADIR%%/geyes/Tango/config
%%DATADIR%%/geyes/Tango/tango-eye.png
%%DATADIR%%/geyes/Tango/tango-pupil.png
-%%BATTERY%%%%DATADIR%%/glade/battstat_applet.glade
-%%CPUFREQ%%%%DATADIR%%/glade/cpufreq-preferences.glade
-%%PYTHON%%%%DATADIR%%/glade/financialchart.glade
-%%DATADIR%%/glade/gswitchit.glade
-%%COMMANDER%%%%DATADIR%%/glade/mini-commander.glade
-%%DATADIR%%/glade/modemlights.glade
-%%PYTHON%%%%DATADIR%%/glade/prefs-dialog.glade
-%%DATADIR%%/glade/stickynotes.glade
-%%DATADIR%%/glade/trashapplet-empty-progress.ui
-%%PYTHON%%%%DATADIR%%/invest-applet/invest-16.png
-%%PYTHON%%%%DATADIR%%/invest-applet/invest-button.png
-%%PYTHON%%%%DATADIR%%/invest-applet/invest.svg
+%%PYTHON%%%%DATADIR%%/invest-applet/invest-16_neutral.png
+%%PYTHON%%%%DATADIR%%/invest-applet/invest-22_down.png
+%%PYTHON%%%%DATADIR%%/invest-applet/invest-22_neutral.png
+%%PYTHON%%%%DATADIR%%/invest-applet/invest-22_up.png
+%%PYTHON%%%%DATADIR%%/invest-applet/invest_down.svg
+%%PYTHON%%%%DATADIR%%/invest-applet/invest_neutral.svg
+%%PYTHON%%%%DATADIR%%/invest-applet/invest_up.svg
share/gnome/help/accessx-status/C/accessx-status.xml
share/gnome/help/accessx-status/C/figures/accessx-status-applet.png
share/gnome/help/accessx-status/C/figures/accessx-status-disabled.png
@@ -144,6 +147,18 @@ share/gnome/help/accessx-status/ca/figures/accessx_sticky-keys.png
share/gnome/help/accessx-status/ca/figures/accessx_sticky-meta-key.png
share/gnome/help/accessx-status/ca/figures/accessx_sticky-shift-key.png
share/gnome/help/accessx-status/ca/figures/accessx_sticky-windows-key.png
+share/gnome/help/accessx-status/el/accessx-status.xml
+share/gnome/help/accessx-status/el/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/el/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/el/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/el/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/el/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/el/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/el/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/el/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/el/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/el/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/el/figures/accessx_sticky-windows-key.png
share/gnome/help/accessx-status/en_GB/accessx-status.xml
share/gnome/help/accessx-status/en_GB/figures/accessx-status-applet.png
share/gnome/help/accessx-status/en_GB/figures/accessx-status-disabled.png
@@ -204,6 +219,18 @@ share/gnome/help/accessx-status/it/figures/accessx_sticky-keys.png
share/gnome/help/accessx-status/it/figures/accessx_sticky-meta-key.png
share/gnome/help/accessx-status/it/figures/accessx_sticky-shift-key.png
share/gnome/help/accessx-status/it/figures/accessx_sticky-windows-key.png
+share/gnome/help/accessx-status/ko/accessx-status.xml
+share/gnome/help/accessx-status/ko/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/ko/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/ko/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/ko/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/ko/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/ko/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/ko/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/ko/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/ko/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/ko/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/ko/figures/accessx_sticky-windows-key.png
share/gnome/help/accessx-status/nl/accessx-status.xml
share/gnome/help/accessx-status/nl/figures/accessx-status-applet.png
share/gnome/help/accessx-status/nl/figures/accessx-status-disabled.png
@@ -265,6 +292,12 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png
%%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-credits-hal.png
%%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-preferences.png
%%BATTERY%%share/gnome/help/battstat/bg/figures/context-menu.png
+%%BATTERY%%share/gnome/help/battstat/de/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet-expanded.png
+%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-credits-hal.png
+%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-preferences.png
+%%BATTERY%%share/gnome/help/battstat/de/figures/context-menu.png
%%BATTERY%%share/gnome/help/battstat/el/battstat.xml
%%BATTERY%%share/gnome/help/battstat/el/figures/battstat-applet-expanded.png
%%BATTERY%%share/gnome/help/battstat/el/figures/battstat-applet.png
@@ -347,6 +380,11 @@ share/gnome/help/char-palette/ca/figures/charpalette_applet.png
share/gnome/help/char-palette/ca/figures/charpalette_chargroup.png
share/gnome/help/char-palette/ca/figures/charpick-preferences.png
share/gnome/help/char-palette/ca/figures/charpick_characters.png
+share/gnome/help/char-palette/de/char-palette.xml
+share/gnome/help/char-palette/de/figures/charpalette_applet.png
+share/gnome/help/char-palette/de/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/de/figures/charpick-preferences.png
+share/gnome/help/char-palette/de/figures/charpick_characters.png
share/gnome/help/char-palette/en_GB/char-palette.xml
share/gnome/help/char-palette/en_GB/figures/charpalette_applet.png
share/gnome/help/char-palette/en_GB/figures/charpalette_chargroup.png
@@ -412,6 +450,10 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
%%COMMANDER%%share/gnome/help/command-line/C/figures/prefs-macros.png
%%COMMANDER%%share/gnome/help/command-line/C/figures/prefs.png
%%COMMANDER%%share/gnome/help/command-line/C/legal.xml
+%%COMMANDER%%share/gnome/help/command-line/el/command-line.xml
+%%COMMANDER%%share/gnome/help/command-line/el/figures/command-line.png
+%%COMMANDER%%share/gnome/help/command-line/el/figures/prefs-macros.png
+%%COMMANDER%%share/gnome/help/command-line/el/figures/prefs.png
%%COMMANDER%%share/gnome/help/command-line/en_GB/command-line.xml
%%COMMANDER%%share/gnome/help/command-line/en_GB/figures/command-line.png
%%COMMANDER%%share/gnome/help/command-line/en_GB/figures/prefs-macros.png
@@ -465,6 +507,16 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-applet-selector-both.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-applet-selector.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-applet.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/de/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/de/figures/cpufreq-100.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/de/figures/cpufreq-25.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/de/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/de/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/de/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/de/figures/cpufreq-applet-preferences.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/de/figures/cpufreq-applet-selector-both.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/de/figures/cpufreq-applet-selector.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/de/figures/cpufreq-applet.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/cpufreq-applet.xml
%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-100.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-25.png
@@ -575,6 +627,26 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-selector-both.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-selector.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-100.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-25.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-applet-preferences.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-applet-selector-both.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-applet-selector.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-applet.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-100.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-25.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-applet-preferences.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-applet-selector-both.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-applet-selector.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-applet.png
share/gnome/help/drivemount/C/drivemount.xml
share/gnome/help/drivemount/C/figures/drivemount-applet_eject.png
share/gnome/help/drivemount/C/figures/drivemount-applet_example.png
@@ -582,6 +654,12 @@ share/gnome/help/drivemount/C/figures/drivemount-applet_mount.png
share/gnome/help/drivemount/C/figures/drivemount-applet_open.png
share/gnome/help/drivemount/C/figures/drivemount-applet_status.png
share/gnome/help/drivemount/C/legal.xml
+share/gnome/help/drivemount/de/drivemount.xml
+share/gnome/help/drivemount/de/figures/drivemount-applet_eject.png
+share/gnome/help/drivemount/de/figures/drivemount-applet_example.png
+share/gnome/help/drivemount/de/figures/drivemount-applet_mount.png
+share/gnome/help/drivemount/de/figures/drivemount-applet_open.png
+share/gnome/help/drivemount/de/figures/drivemount-applet_status.png
share/gnome/help/drivemount/en_GB/drivemount.xml
share/gnome/help/drivemount/en_GB/figures/drivemount-applet_eject.png
share/gnome/help/drivemount/en_GB/figures/drivemount-applet_example.png
@@ -661,6 +739,8 @@ share/gnome/help/geyes/bg/figures/geyes_applet.png
share/gnome/help/geyes/bg/geyes.xml
share/gnome/help/geyes/ca/figures/geyes_applet.png
share/gnome/help/geyes/ca/geyes.xml
+share/gnome/help/geyes/da/figures/geyes_applet.png
+share/gnome/help/geyes/da/geyes.xml
share/gnome/help/geyes/de/figures/geyes_applet.png
share/gnome/help/geyes/de/geyes.xml
share/gnome/help/geyes/en_GB/figures/geyes_applet.png
@@ -711,6 +791,21 @@ share/gnome/help/gweather/C/figures/stock_weather-storm.png
share/gnome/help/gweather/C/figures/stock_weather-sunny.png
share/gnome/help/gweather/C/gweather.xml
share/gnome/help/gweather/C/legal.xml
+share/gnome/help/gweather/de/figures/gweather-details.png
+share/gnome/help/gweather/de/figures/gweather-menu-prefs.png
+share/gnome/help/gweather/de/figures/gweather-prefs-general.png
+share/gnome/help/gweather/de/figures/gweather-prefs-locations.png
+share/gnome/help/gweather/de/figures/gweather_applet.png
+share/gnome/help/gweather/de/figures/stock_weather-cloudy.png
+share/gnome/help/gweather/de/figures/stock_weather-few-clouds.png
+share/gnome/help/gweather/de/figures/stock_weather-fog.png
+share/gnome/help/gweather/de/figures/stock_weather-night-clear.png
+share/gnome/help/gweather/de/figures/stock_weather-night-few-clouds.png
+share/gnome/help/gweather/de/figures/stock_weather-showers.png
+share/gnome/help/gweather/de/figures/stock_weather-snow.png
+share/gnome/help/gweather/de/figures/stock_weather-storm.png
+share/gnome/help/gweather/de/figures/stock_weather-sunny.png
+share/gnome/help/gweather/de/gweather.xml
share/gnome/help/gweather/en_GB/figures/gweather-details.png
share/gnome/help/gweather/en_GB/figures/gweather-menu-prefs.png
share/gnome/help/gweather/en_GB/figures/gweather-prefs-general.png
@@ -891,11 +986,21 @@ share/gnome/help/gweather/uk/figures/stock_weather-snow.png
share/gnome/help/gweather/uk/figures/stock_weather-storm.png
share/gnome/help/gweather/uk/figures/stock_weather-sunny.png
share/gnome/help/gweather/uk/gweather.xml
+%%PYTHON%%share/gnome/help/invest-applet/C/invest-applet.xml
+%%PYTHON%%share/gnome/help/invest-applet/C/legal.xml
+%%PYTHON%%share/gnome/help/invest-applet/el/invest-applet.xml
+%%PYTHON%%share/gnome/help/invest-applet/es/invest-applet.xml
+%%PYTHON%%share/gnome/help/invest-applet/fi/invest-applet.xml
+%%PYTHON%%share/gnome/help/invest-applet/sv/invest-applet.xml
share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/C/legal.xml
share/gnome/help/mixer_applet2/C/mixer_applet2.xml
share/gnome/help/mixer_applet2/ca/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/ca/mixer_applet2.xml
+share/gnome/help/mixer_applet2/de/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/de/mixer_applet2.xml
+share/gnome/help/mixer_applet2/el/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/el/mixer_applet2.xml
share/gnome/help/mixer_applet2/en_GB/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/en_GB/mixer_applet2.xml
share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png
@@ -904,6 +1009,8 @@ share/gnome/help/mixer_applet2/fi/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/fi/mixer_applet2.xml
share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/fr/mixer_applet2.xml
+share/gnome/help/mixer_applet2/hu/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/hu/mixer_applet2.xml
share/gnome/help/mixer_applet2/it/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/it/mixer_applet2.xml
share/gnome/help/mixer_applet2/ko/figures/volumecontrol_applet.png
@@ -949,6 +1056,10 @@ share/gnome/help/multiload/ko/figures/multiload-preferences.png
share/gnome/help/multiload/ko/figures/system-monitor-applet_window.png
share/gnome/help/multiload/ko/figures/system_monitor.png
share/gnome/help/multiload/ko/multiload.xml
+share/gnome/help/multiload/nl/figures/multiload-preferences.png
+share/gnome/help/multiload/nl/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/nl/figures/system_monitor.png
+share/gnome/help/multiload/nl/multiload.xml
share/gnome/help/multiload/oc/figures/multiload-preferences.png
share/gnome/help/multiload/oc/figures/system-monitor-applet_window.png
share/gnome/help/multiload/oc/figures/system_monitor.png
@@ -986,6 +1097,12 @@ share/gnome/help/stickynotes_applet/ca/figures/stickynotes-note-prefs.png
share/gnome/help/stickynotes_applet/ca/figures/stickynotes-prefs.png
share/gnome/help/stickynotes_applet/ca/figures/stickynotes_applet.png
share/gnome/help/stickynotes_applet/ca/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/de/figures/stickynote-right-menu-lock.png
+share/gnome/help/stickynotes_applet/de/figures/stickynote-right-menu-new.png
+share/gnome/help/stickynotes_applet/de/figures/stickynotes-note-prefs.png
+share/gnome/help/stickynotes_applet/de/figures/stickynotes-prefs.png
+share/gnome/help/stickynotes_applet/de/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/de/stickynotes_applet.xml
share/gnome/help/stickynotes_applet/el/figures/stickynote-right-menu-lock.png
share/gnome/help/stickynotes_applet/el/figures/stickynote-right-menu-new.png
share/gnome/help/stickynotes_applet/el/figures/stickynotes-note-prefs.png
@@ -1067,6 +1184,8 @@ share/gnome/help/trashapplet/da/figures/trash-applet.png
share/gnome/help/trashapplet/da/trashapplet.xml
share/gnome/help/trashapplet/de/figures/trash-applet.png
share/gnome/help/trashapplet/de/trashapplet.xml
+share/gnome/help/trashapplet/el/figures/trash-applet.png
+share/gnome/help/trashapplet/el/trashapplet.xml
share/gnome/help/trashapplet/en_GB/figures/trash-applet.png
share/gnome/help/trashapplet/en_GB/trashapplet.xml
share/gnome/help/trashapplet/es/figures/trash-applet.png
@@ -1075,6 +1194,8 @@ share/gnome/help/trashapplet/fi/figures/trash-applet.png
share/gnome/help/trashapplet/fi/trashapplet.xml
share/gnome/help/trashapplet/fr/figures/trash-applet.png
share/gnome/help/trashapplet/fr/trashapplet.xml
+share/gnome/help/trashapplet/hu/figures/trash-applet.png
+share/gnome/help/trashapplet/hu/trashapplet.xml
share/gnome/help/trashapplet/it/figures/trash-applet.png
share/gnome/help/trashapplet/it/trashapplet.xml
share/gnome/help/trashapplet/nl/figures/trash-applet.png
@@ -1083,40 +1204,43 @@ share/gnome/help/trashapplet/oc/figures/trash-applet.png
share/gnome/help/trashapplet/oc/trashapplet.xml
share/gnome/help/trashapplet/pa/figures/trash-applet.png
share/gnome/help/trashapplet/pa/trashapplet.xml
+share/gnome/help/trashapplet/pt_BR/figures/trash-applet.png
+share/gnome/help/trashapplet/pt_BR/trashapplet.xml
share/gnome/help/trashapplet/ru/figures/trash-applet.png
share/gnome/help/trashapplet/ru/trashapplet.xml
share/gnome/help/trashapplet/sv/figures/trash-applet.png
share/gnome/help/trashapplet/sv/trashapplet.xml
share/gnome/help/trashapplet/uk/figures/trash-applet.png
share/gnome/help/trashapplet/uk/trashapplet.xml
+share/gnome/help/trashapplet/zh_HK/figures/trash-applet.png
+share/gnome/help/trashapplet/zh_HK/trashapplet.xml
+share/gnome/help/trashapplet/zh_TW/figures/trash-applet.png
+share/gnome/help/trashapplet/zh_TW/trashapplet.xml
%%CPUFREQ%%share/icons/hicolor/16x16/apps/gnome-cpu-frequency-applet.png
share/icons/hicolor/16x16/apps/gnome-eyes-applet.png
-share/icons/hicolor/16x16/apps/gnome-modem-monitor-applet.png
share/icons/hicolor/16x16/apps/gnome-sticky-notes-applet.png
+%%PYTHON%%share/icons/hicolor/16x16/apps/invest-applet.png
%%CPUFREQ%%share/icons/hicolor/22x22/apps/gnome-cpu-frequency-applet.png
share/icons/hicolor/22x22/apps/gnome-eyes-applet.png
-share/icons/hicolor/22x22/apps/gnome-modem-monitor-applet.png
share/icons/hicolor/22x22/apps/gnome-sticky-notes-applet.png
+%%PYTHON%%share/icons/hicolor/22x22/apps/invest-applet.png
%%CPUFREQ%%share/icons/hicolor/24x24/apps/gnome-cpu-frequency-applet.png
share/icons/hicolor/24x24/apps/gnome-eyes-applet.png
-share/icons/hicolor/24x24/apps/gnome-modem-monitor-applet.png
share/icons/hicolor/24x24/apps/gnome-sticky-notes-applet.png
%%CPUFREQ%%share/icons/hicolor/32x32/apps/gnome-cpu-frequency-applet.png
share/icons/hicolor/32x32/apps/gnome-eyes-applet.png
-share/icons/hicolor/32x32/apps/gnome-modem-monitor-applet.png
share/icons/hicolor/32x32/apps/gnome-sticky-notes-applet.png
share/icons/hicolor/48x48/apps/ax-applet.png
-share/icons/hicolor/48x48/apps/charpick.png
%%COMMANDER%%share/icons/hicolor/48x48/apps/gnome-mini-commander.png
-share/icons/hicolor/48x48/apps/gswitchit-applet.png
-share/icons/hicolor/48x48/apps/gswitchit-properties-capplet.png
+%%PYTHON%%share/icons/hicolor/48x48/apps/invest-applet.png
%%CPUFREQ%%share/icons/hicolor/scalable/apps/gnome-cpu-frequency-applet.svg
share/icons/hicolor/scalable/apps/gnome-eyes-applet.svg
-share/icons/hicolor/scalable/apps/gnome-modem-monitor-applet.svg
share/icons/hicolor/scalable/apps/gnome-sticky-notes-applet.svg
+%%PYTHON%%share/icons/hicolor/scalable/apps/invest-applet.svg
share/locale/am/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/as/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/ast/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/be/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/be@latin/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1175,6 +1299,7 @@ share/locale/ku/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ky/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/mai/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/mg/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/mk/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ml/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1189,6 +1314,7 @@ share/locale/oc/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/or/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/pa/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/pl/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/ps/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/pt/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/pt_BR/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ro/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1199,7 +1325,7 @@ 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/sr@latin/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/te/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1215,17 +1341,20 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
share/omf/accessx-status/accessx-status-C.omf
share/omf/accessx-status/accessx-status-bg.omf
share/omf/accessx-status/accessx-status-ca.omf
+share/omf/accessx-status/accessx-status-el.omf
share/omf/accessx-status/accessx-status-en_GB.omf
share/omf/accessx-status/accessx-status-es.omf
share/omf/accessx-status/accessx-status-fi.omf
share/omf/accessx-status/accessx-status-fr.omf
share/omf/accessx-status/accessx-status-it.omf
+share/omf/accessx-status/accessx-status-ko.omf
share/omf/accessx-status/accessx-status-nl.omf
share/omf/accessx-status/accessx-status-oc.omf
share/omf/accessx-status/accessx-status-sv.omf
share/omf/accessx-status/accessx-status-uk.omf
%%BATTERY%%share/omf/battstat/battstat-C.omf
%%BATTERY%%share/omf/battstat/battstat-bg.omf
+%%BATTERY%%share/omf/battstat/battstat-de.omf
%%BATTERY%%share/omf/battstat/battstat-el.omf
%%BATTERY%%share/omf/battstat/battstat-en_GB.omf
%%BATTERY%%share/omf/battstat/battstat-es.omf
@@ -1240,6 +1369,7 @@ share/omf/accessx-status/accessx-status-uk.omf
share/omf/char-palette/char-palette-C.omf
share/omf/char-palette/char-palette-bg.omf
share/omf/char-palette/char-palette-ca.omf
+share/omf/char-palette/char-palette-de.omf
share/omf/char-palette/char-palette-en_GB.omf
share/omf/char-palette/char-palette-es.omf
share/omf/char-palette/char-palette-fi.omf
@@ -1253,6 +1383,7 @@ share/omf/char-palette/char-palette-ru.omf
share/omf/char-palette/char-palette-sv.omf
share/omf/char-palette/char-palette-uk.omf
%%COMMANDER%%share/omf/command-line/command-line-C.omf
+%%COMMANDER%%share/omf/command-line/command-line-el.omf
%%COMMANDER%%share/omf/command-line/command-line-en_GB.omf
%%COMMANDER%%share/omf/command-line/command-line-es.omf
%%COMMANDER%%share/omf/command-line/command-line-fr.omf
@@ -1263,6 +1394,7 @@ share/omf/char-palette/char-palette-uk.omf
%%COMMANDER%%share/omf/command-line/command-line-uk.omf
%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-C.omf
%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-ca.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-de.omf
%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-en_GB.omf
%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-es.omf
%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-fi.omf
@@ -1274,7 +1406,10 @@ share/omf/char-palette/char-palette-uk.omf
%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-sv.omf
%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-uk.omf
%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-zh_CN.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-zh_HK.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-zh_TW.omf
share/omf/drivemount/drivemount-C.omf
+share/omf/drivemount/drivemount-de.omf
share/omf/drivemount/drivemount-en_GB.omf
share/omf/drivemount/drivemount-es.omf
share/omf/drivemount/drivemount-fi.omf
@@ -1290,6 +1425,7 @@ share/omf/drivemount/drivemount-zh_CN.omf
share/omf/geyes/geyes-C.omf
share/omf/geyes/geyes-bg.omf
share/omf/geyes/geyes-ca.omf
+share/omf/geyes/geyes-da.omf
share/omf/geyes/geyes-de.omf
share/omf/geyes/geyes-en_GB.omf
share/omf/geyes/geyes-es.omf
@@ -1313,6 +1449,7 @@ share/omf/gswitchit/gswitchit-ru.omf
share/omf/gswitchit/gswitchit-sv.omf
share/omf/gswitchit/gswitchit-uk.omf
share/omf/gweather/gweather-C.omf
+share/omf/gweather/gweather-de.omf
share/omf/gweather/gweather-en_GB.omf
share/omf/gweather/gweather-es.omf
share/omf/gweather/gweather-fi.omf
@@ -1325,12 +1462,20 @@ share/omf/gweather/gweather-pt_BR.omf
share/omf/gweather/gweather-ru.omf
share/omf/gweather/gweather-sv.omf
share/omf/gweather/gweather-uk.omf
+%%PYTHON%%share/omf/invest-applet/invest-applet-C.omf
+%%PYTHON%%share/omf/invest-applet/invest-applet-el.omf
+%%PYTHON%%share/omf/invest-applet/invest-applet-es.omf
+%%PYTHON%%share/omf/invest-applet/invest-applet-fi.omf
+%%PYTHON%%share/omf/invest-applet/invest-applet-sv.omf
share/omf/mixer_applet2/mixer_applet2-C.omf
share/omf/mixer_applet2/mixer_applet2-ca.omf
+share/omf/mixer_applet2/mixer_applet2-de.omf
+share/omf/mixer_applet2/mixer_applet2-el.omf
share/omf/mixer_applet2/mixer_applet2-en_GB.omf
share/omf/mixer_applet2/mixer_applet2-es.omf
share/omf/mixer_applet2/mixer_applet2-fi.omf
share/omf/mixer_applet2/mixer_applet2-fr.omf
+share/omf/mixer_applet2/mixer_applet2-hu.omf
share/omf/mixer_applet2/mixer_applet2-it.omf
share/omf/mixer_applet2/mixer_applet2-ko.omf
share/omf/mixer_applet2/mixer_applet2-oc.omf
@@ -1346,6 +1491,7 @@ share/omf/multiload/multiload-es.omf
share/omf/multiload/multiload-fi.omf
share/omf/multiload/multiload-fr.omf
share/omf/multiload/multiload-ko.omf
+share/omf/multiload/multiload-nl.omf
share/omf/multiload/multiload-oc.omf
share/omf/multiload/multiload-pa.omf
share/omf/multiload/multiload-pt_BR.omf
@@ -1354,6 +1500,7 @@ share/omf/multiload/multiload-sv.omf
share/omf/multiload/multiload-uk.omf
share/omf/stickynotes_applet/stickynotes_applet-C.omf
share/omf/stickynotes_applet/stickynotes_applet-ca.omf
+share/omf/stickynotes_applet/stickynotes_applet-de.omf
share/omf/stickynotes_applet/stickynotes_applet-el.omf
share/omf/stickynotes_applet/stickynotes_applet-en_GB.omf
share/omf/stickynotes_applet/stickynotes_applet-es.omf
@@ -1370,17 +1517,22 @@ share/omf/trashapplet/trashapplet-C.omf
share/omf/trashapplet/trashapplet-ca.omf
share/omf/trashapplet/trashapplet-da.omf
share/omf/trashapplet/trashapplet-de.omf
+share/omf/trashapplet/trashapplet-el.omf
share/omf/trashapplet/trashapplet-en_GB.omf
share/omf/trashapplet/trashapplet-es.omf
share/omf/trashapplet/trashapplet-fi.omf
share/omf/trashapplet/trashapplet-fr.omf
+share/omf/trashapplet/trashapplet-hu.omf
share/omf/trashapplet/trashapplet-it.omf
share/omf/trashapplet/trashapplet-nl.omf
share/omf/trashapplet/trashapplet-oc.omf
share/omf/trashapplet/trashapplet-pa.omf
+share/omf/trashapplet/trashapplet-pt_BR.omf
share/omf/trashapplet/trashapplet-ru.omf
share/omf/trashapplet/trashapplet-sv.omf
share/omf/trashapplet/trashapplet-uk.omf
+share/omf/trashapplet/trashapplet-zh_HK.omf
+share/omf/trashapplet/trashapplet-zh_TW.omf
share/pixmaps/accessx-status-applet/ax-applet.png
share/pixmaps/accessx-status-applet/ax-bouncekeys.png
share/pixmaps/accessx-status-applet/ax-key-base.png
@@ -1422,7 +1574,6 @@ share/pixmaps/accessx-status-applet/sticky-super-none.png
%%CPUFREQ%%share/pixmaps/cpufreq-applet/cpufreq-50.png
%%CPUFREQ%%share/pixmaps/cpufreq-applet/cpufreq-75.png
%%CPUFREQ%%share/pixmaps/cpufreq-applet/cpufreq-na.png
-%%PYTHON%%share/pixmaps/invest-big.png
share/pixmaps/stickynotes/close.png
share/pixmaps/stickynotes/locked.png
share/pixmaps/stickynotes/resize_se.png
@@ -1521,6 +1672,7 @@ share/xmodmap/xmodmap.yu
@dirrm share/omf/stickynotes_applet
@dirrm share/omf/multiload
@dirrm share/omf/mixer_applet2
+%%PYTHON%%@dirrm share/omf/invest-applet
@dirrm share/omf/gweather
@dirrm share/omf/gswitchit
@dirrm share/omf/geyes
@@ -1530,12 +1682,18 @@ share/xmodmap/xmodmap.yu
@dirrm share/omf/char-palette
%%BATTERY%%@dirrm share/omf/battstat
@dirrm share/omf/accessx-status
+@dirrm share/gnome/help/trashapplet/zh_TW/figures
+@dirrm share/gnome/help/trashapplet/zh_TW
+@dirrm share/gnome/help/trashapplet/zh_HK/figures
+@dirrm share/gnome/help/trashapplet/zh_HK
@dirrm share/gnome/help/trashapplet/uk/figures
@dirrm share/gnome/help/trashapplet/uk
@dirrm share/gnome/help/trashapplet/sv/figures
@dirrm share/gnome/help/trashapplet/sv
@dirrm share/gnome/help/trashapplet/ru/figures
@dirrm share/gnome/help/trashapplet/ru
+@dirrm share/gnome/help/trashapplet/pt_BR/figures
+@dirrm share/gnome/help/trashapplet/pt_BR
@dirrm share/gnome/help/trashapplet/pa/figures
@dirrm share/gnome/help/trashapplet/pa
@dirrm share/gnome/help/trashapplet/oc/figures
@@ -1544,6 +1702,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/trashapplet/nl
@dirrm share/gnome/help/trashapplet/it/figures
@dirrm share/gnome/help/trashapplet/it
+@dirrm share/gnome/help/trashapplet/hu/figures
+@dirrm share/gnome/help/trashapplet/hu
@dirrm share/gnome/help/trashapplet/fr/figures
@dirrm share/gnome/help/trashapplet/fr
@dirrm share/gnome/help/trashapplet/fi/figures
@@ -1552,6 +1712,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/trashapplet/es
@dirrm share/gnome/help/trashapplet/en_GB/figures
@dirrm share/gnome/help/trashapplet/en_GB
+@dirrm share/gnome/help/trashapplet/el/figures
+@dirrm share/gnome/help/trashapplet/el
@dirrm share/gnome/help/trashapplet/de/figures
@dirrm share/gnome/help/trashapplet/de
@dirrm share/gnome/help/trashapplet/da/figures
@@ -1585,6 +1747,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/stickynotes_applet/en_GB
@dirrm share/gnome/help/stickynotes_applet/el/figures
@dirrm share/gnome/help/stickynotes_applet/el
+@dirrm share/gnome/help/stickynotes_applet/de/figures
+@dirrm share/gnome/help/stickynotes_applet/de
@dirrm share/gnome/help/stickynotes_applet/ca/figures
@dirrm share/gnome/help/stickynotes_applet/ca
@dirrm share/gnome/help/stickynotes_applet/C/figures
@@ -1602,6 +1766,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/multiload/pa
@dirrm share/gnome/help/multiload/oc/figures
@dirrm share/gnome/help/multiload/oc
+@dirrm share/gnome/help/multiload/nl/figures
+@dirrm share/gnome/help/multiload/nl
@dirrm share/gnome/help/multiload/ko/figures
@dirrm share/gnome/help/multiload/ko
@dirrm share/gnome/help/multiload/fr/figures
@@ -1633,6 +1799,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/mixer_applet2/ko
@dirrm share/gnome/help/mixer_applet2/it/figures
@dirrm share/gnome/help/mixer_applet2/it
+@dirrm share/gnome/help/mixer_applet2/hu/figures
+@dirrm share/gnome/help/mixer_applet2/hu
@dirrm share/gnome/help/mixer_applet2/fr/figures
@dirrm share/gnome/help/mixer_applet2/fr
@dirrm share/gnome/help/mixer_applet2/fi/figures
@@ -1641,11 +1809,21 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/mixer_applet2/es
@dirrm share/gnome/help/mixer_applet2/en_GB/figures
@dirrm share/gnome/help/mixer_applet2/en_GB
+@dirrm share/gnome/help/mixer_applet2/el/figures
+@dirrm share/gnome/help/mixer_applet2/el
+@dirrm share/gnome/help/mixer_applet2/de/figures
+@dirrm share/gnome/help/mixer_applet2/de
@dirrm share/gnome/help/mixer_applet2/ca/figures
@dirrm share/gnome/help/mixer_applet2/ca
@dirrm share/gnome/help/mixer_applet2/C/figures
@dirrm share/gnome/help/mixer_applet2/C
@dirrm share/gnome/help/mixer_applet2
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/sv
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/fi
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/es
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/el
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/C
+%%PYTHON%%@dirrm share/gnome/help/invest-applet
@dirrm share/gnome/help/gweather/uk/figures
@dirrm share/gnome/help/gweather/uk
@dirrm share/gnome/help/gweather/sv/figures
@@ -1670,6 +1848,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/gweather/es
@dirrm share/gnome/help/gweather/en_GB/figures
@dirrm share/gnome/help/gweather/en_GB
+@dirrm share/gnome/help/gweather/de/figures
+@dirrm share/gnome/help/gweather/de
@dirrm share/gnome/help/gweather/C/figures
@dirrm share/gnome/help/gweather/C
@dirrm share/gnome/help/gweather
@@ -1707,6 +1887,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/geyes/en_GB
@dirrm share/gnome/help/geyes/de/figures
@dirrm share/gnome/help/geyes/de
+@dirrm share/gnome/help/geyes/da/figures
+@dirrm share/gnome/help/geyes/da
@dirrm share/gnome/help/geyes/ca/figures
@dirrm share/gnome/help/geyes/ca
@dirrm share/gnome/help/geyes/bg/figures
@@ -1738,9 +1920,15 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/drivemount/es
@dirrm share/gnome/help/drivemount/en_GB/figures
@dirrm share/gnome/help/drivemount/en_GB
+@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
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_TW/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_TW
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_HK/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_HK
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_CN/figures
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_CN
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk/figures
@@ -1763,6 +1951,8 @@ share/xmodmap/xmodmap.yu
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/en_GB/figures
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/en_GB
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/de/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/de
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/ca/figures
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/ca
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C/figures
@@ -1784,6 +1974,8 @@ share/xmodmap/xmodmap.yu
%%COMMANDER%%@dirrm share/gnome/help/command-line/es
%%COMMANDER%%@dirrm share/gnome/help/command-line/en_GB/figures
%%COMMANDER%%@dirrm share/gnome/help/command-line/en_GB
+%%COMMANDER%%@dirrm share/gnome/help/command-line/el/figures
+%%COMMANDER%%@dirrm share/gnome/help/command-line/el
%%COMMANDER%%@dirrm share/gnome/help/command-line/C/figures
%%COMMANDER%%@dirrm share/gnome/help/command-line/C
%%COMMANDER%%@dirrm share/gnome/help/command-line
@@ -1811,6 +2003,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/char-palette/es
@dirrm share/gnome/help/char-palette/en_GB/figures
@dirrm share/gnome/help/char-palette/en_GB
+@dirrm share/gnome/help/char-palette/de/figures
+@dirrm share/gnome/help/char-palette/de
@dirrm share/gnome/help/char-palette/ca/figures
@dirrm share/gnome/help/char-palette/ca
@dirrm share/gnome/help/char-palette/bg/figures
@@ -1840,6 +2034,8 @@ share/xmodmap/xmodmap.yu
%%BATTERY%%@dirrm share/gnome/help/battstat/en_GB
%%BATTERY%%@dirrm share/gnome/help/battstat/el/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/el
+%%BATTERY%%@dirrm share/gnome/help/battstat/de/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/de
%%BATTERY%%@dirrm share/gnome/help/battstat/bg/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/bg
%%BATTERY%%@dirrm share/gnome/help/battstat/C/figures
@@ -1853,6 +2049,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/accessx-status/oc
@dirrm share/gnome/help/accessx-status/nl/figures
@dirrm share/gnome/help/accessx-status/nl
+@dirrm share/gnome/help/accessx-status/ko/figures
+@dirrm share/gnome/help/accessx-status/ko
@dirrm share/gnome/help/accessx-status/it/figures
@dirrm share/gnome/help/accessx-status/it
@dirrm share/gnome/help/accessx-status/fr/figures
@@ -1863,6 +2061,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/accessx-status/es
@dirrm share/gnome/help/accessx-status/en_GB/figures
@dirrm share/gnome/help/accessx-status/en_GB
+@dirrm share/gnome/help/accessx-status/el/figures
+@dirrm share/gnome/help/accessx-status/el
@dirrm share/gnome/help/accessx-status/ca/figures
@dirrm share/gnome/help/accessx-status/ca
@dirrm share/gnome/help/accessx-status/bg/figures
@@ -1871,7 +2071,6 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/accessx-status/C
@dirrm share/gnome/help/accessx-status
%%PYTHON%%@dirrm %%DATADIR%%/invest-applet
-@dirrm %%DATADIR%%/glade
@dirrm %%DATADIR%%/geyes/Tango
@dirrm %%DATADIR%%/geyes/Horrid
@dirrm %%DATADIR%%/geyes/Default-tiny
@@ -1879,6 +2078,7 @@ share/xmodmap/xmodmap.yu
@dirrm %%DATADIR%%/geyes/Bloodshot
@dirrm %%DATADIR%%/geyes/Bizarre
@dirrm %%DATADIR%%/geyes
+@dirrm %%DATADIR%%/builder
@dirrm %%DATADIR%%
%%COMMANDER%%@dirrmtry libexec/gnome-applets
%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/invest
@@ -1888,16 +2088,22 @@ share/xmodmap/xmodmap.yu
@dirrmtry share/locale/xh
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/si/LC_MESSAGES
@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@@ -1940,5 +2146,7 @@ share/xmodmap/xmodmap.yu
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 03b8a1f1bbc9..57148507ec1d 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-desktop/Makefile,v 1.138 2008/03/11 00:00:35 ahze Exp $
+# $MCom: ports/x11/gnome-desktop/Makefile,v 1.154 2008/11/25 17:20:55 mezz Exp $
#
PORTNAME= gnome-desktop
-PORTVERSION= 2.22.3
+PORTVERSION= 2.24.2
PORTREVISION?= 0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index e92e83a59be5..d940c795e514 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-desktop-2.22.3.tar.bz2) = c5e24ee437e5d98c03299b0442523a6b
-SHA256 (gnome2/gnome-desktop-2.22.3.tar.bz2) = 10c087e16c530eb2d09c5794ba5c0d6d2ec6e548860e13f31b2f2375df964dc9
-SIZE (gnome2/gnome-desktop-2.22.3.tar.bz2) = 1444103
+MD5 (gnome2/gnome-desktop-2.24.2.tar.bz2) = 57fd1002efdb8c24f72255cfe1bc497e
+SHA256 (gnome2/gnome-desktop-2.24.2.tar.bz2) = 18148db9750e407507a776641f33e7b7f9a1888300618a89185a2831e3bbbdd2
+SIZE (gnome2/gnome-desktop-2.24.2.tar.bz2) = 1509817
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index 38d6a412e780..9f51fab3dcd6 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -3,10 +3,13 @@ include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h
include/gnome-desktop-2.0/libgnomeui/gnome-bg.h
include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h
include/gnome-desktop-2.0/libgnomeui/gnome-hint.h
+include/gnome-desktop-2.0/libgnomeui/gnome-rr-config.h
+include/gnome-desktop-2.0/libgnomeui/gnome-rr-labeler.h
+include/gnome-desktop-2.0/libgnomeui/gnome-rr.h
lib/libgnome-desktop-2.a
lib/libgnome-desktop-2.la
lib/libgnome-desktop-2.so
-lib/libgnome-desktop-2.so.2
+lib/libgnome-desktop-2.so.7
libdata/pkgconfig/gnome-desktop-2.0.pc
share/applications/gnome-about.desktop
share/gnome-about/contributors.list
@@ -24,6 +27,7 @@ share/gnome-about/headers/header-bg-snow01.png
share/gnome-about/headers/header-bg-sunset01.png
share/gnome/help/fdl/C/fdl.xml
share/gnome/help/fdl/ar/fdl.xml
+share/gnome/help/fdl/de/fdl.xml
share/gnome/help/fdl/es/fdl.xml
share/gnome/help/fdl/fr/fdl.xml
share/gnome/help/fdl/hu/fdl.xml
@@ -35,6 +39,8 @@ share/gnome/help/fdl/vi/fdl.xml
share/gnome/help/gpl/C/gpl.xml
share/gnome/help/gpl/ar/gpl.xml
share/gnome/help/gpl/ca/gpl.xml
+share/gnome/help/gpl/cs/gpl.xml
+share/gnome/help/gpl/de/gpl.xml
share/gnome/help/gpl/es/gpl.xml
share/gnome/help/gpl/fi/gpl.xml
share/gnome/help/gpl/fr/gpl.xml
@@ -48,7 +54,9 @@ share/gnome/help/gpl/vi/gpl.xml
share/gnome/help/gpl/zh_CN/gpl.xml
share/gnome/help/lgpl/C/lgpl.xml
share/gnome/help/lgpl/ar/lgpl.xml
+share/gnome/help/lgpl/de/lgpl.xml
share/gnome/help/lgpl/es/lgpl.xml
+share/gnome/help/lgpl/fi/lgpl.xml
share/gnome/help/lgpl/fr/lgpl.xml
share/gnome/help/lgpl/hu/lgpl.xml
share/gnome/help/lgpl/ko/lgpl.xml
@@ -61,6 +69,7 @@ share/gnome/help/lgpl/zh_CN/lgpl.xml
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/ast/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/be/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/be@latin/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -106,6 +115,7 @@ share/locale/ky/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/mai/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/mg/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/mi/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -122,6 +132,7 @@ share/locale/oc/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/or/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/ps/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
share/locale/ro/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -132,7 +143,7 @@ share/locale/sk/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/sl/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/sq/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/sr/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/sr@latin/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/te/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -154,6 +165,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
share/omf/fdl/fdl-C.omf
share/omf/fdl/fdl-ar.omf
+share/omf/fdl/fdl-de.omf
share/omf/fdl/fdl-es.omf
share/omf/fdl/fdl-fr.omf
share/omf/fdl/fdl-hu.omf
@@ -165,6 +177,8 @@ share/omf/fdl/fdl-vi.omf
share/omf/gpl/gpl-C.omf
share/omf/gpl/gpl-ar.omf
share/omf/gpl/gpl-ca.omf
+share/omf/gpl/gpl-cs.omf
+share/omf/gpl/gpl-de.omf
share/omf/gpl/gpl-es.omf
share/omf/gpl/gpl-fi.omf
share/omf/gpl/gpl-fr.omf
@@ -178,7 +192,9 @@ share/omf/gpl/gpl-vi.omf
share/omf/gpl/gpl-zh_CN.omf
share/omf/lgpl/lgpl-C.omf
share/omf/lgpl/lgpl-ar.omf
+share/omf/lgpl/lgpl-de.omf
share/omf/lgpl/lgpl-es.omf
+share/omf/lgpl/lgpl-fi.omf
share/omf/lgpl/lgpl-fr.omf
share/omf/lgpl/lgpl-hu.omf
share/omf/lgpl/lgpl-ko.omf
@@ -272,7 +288,9 @@ share/pixmaps/vnterm.xpm
@dirrm share/gnome/help/lgpl/ko
@dirrm share/gnome/help/lgpl/hu
@dirrm share/gnome/help/lgpl/fr
+@dirrm share/gnome/help/lgpl/fi
@dirrm share/gnome/help/lgpl/es
+@dirrm share/gnome/help/lgpl/de
@dirrm share/gnome/help/lgpl/ar
@dirrm share/gnome/help/gpl/zh_CN
@dirrm share/gnome/help/gpl/vi
@@ -285,6 +303,8 @@ share/pixmaps/vnterm.xpm
@dirrm share/gnome/help/gpl/fr
@dirrm share/gnome/help/gpl/fi
@dirrm share/gnome/help/gpl/es
+@dirrm share/gnome/help/gpl/de
+@dirrm share/gnome/help/gpl/cs
@dirrm share/gnome/help/gpl/ca
@dirrm share/gnome/help/gpl/ar
@dirrm share/gnome/help/fdl/vi
@@ -295,6 +315,7 @@ share/pixmaps/vnterm.xpm
@dirrm share/gnome/help/fdl/hu
@dirrm share/gnome/help/fdl/fr
@dirrm share/gnome/help/fdl/es
+@dirrm share/gnome/help/fdl/de
@dirrm share/gnome/help/fdl/ar
@dirrm share/gnome-about/headers
@dirrmtry share/applications
@@ -319,10 +340,14 @@ share/pixmaps/vnterm.xpm
@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/si/LC_MESSAGES
@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
@dirrmtry share/locale/nso/LC_MESSAGES
@@ -333,6 +358,8 @@ share/pixmaps/vnterm.xpm
@dirrmtry share/locale/mi
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@@ -347,3 +374,5 @@ share/pixmaps/vnterm.xpm
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index acc19c213a31..264061e79925 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-menus/Makefile,v 1.74 2008/03/10 23:44:52 ahze Exp $
+# $MCom: ports/x11/gnome-menus/Makefile,v 1.88 2008/11/25 17:27:09 mezz Exp $
#
PORTNAME= gnome-menus
-PORTVERSION= 2.22.2
-PORTREVISION= 1
+PORTVERSION= 2.24.2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo
index 741021ea35d3..7786cd23a623 100644
--- a/x11/gnome-menus/distinfo
+++ b/x11/gnome-menus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-menus-2.22.2.tar.bz2) = 2bb185643632b28f4dba4b8201b8e230
-SHA256 (gnome2/gnome-menus-2.22.2.tar.bz2) = b3ef17eb05308e35e1627e5ca56b6951e9aea69cf112164ef698cdad6f44ed23
-SIZE (gnome2/gnome-menus-2.22.2.tar.bz2) = 465566
+MD5 (gnome2/gnome-menus-2.24.2.tar.bz2) = ca8e25b031fd7024b3f9abe1c6865d2c
+SHA256 (gnome2/gnome-menus-2.24.2.tar.bz2) = c28cc72e69164533e4a64270486d18b58184920ec4f4b288758758a373d45d3c
+SIZE (gnome2/gnome-menus-2.24.2.tar.bz2) = 453261
diff --git a/x11/gnome-menus/files/patch-layout::applications.menu b/x11/gnome-menus/files/patch-layout::applications.menu
index 85533b6d6c0e..116dad13f19b 100644
--- a/x11/gnome-menus/files/patch-layout::applications.menu
+++ b/x11/gnome-menus/files/patch-layout::applications.menu
@@ -1,8 +1,8 @@
---- layout/applications.menu.orig Sun Jul 8 18:04:11 2007
-+++ layout/applications.menu Sun Jul 8 18:04:35 2007
-@@ -6,24 +6,26 @@
+--- layout/applications.menu.orig 2008-04-21 15:49:29.000000000 -0400
++++ layout/applications.menu 2008-04-28 14:51:24.000000000 -0400
+@@ -6,9 +6,8 @@
<Name>Applications</Name>
- <Directory>Applications.directory</Directory>
+ <Directory>X-GNOME-Menu-Applications.directory</Directory>
- <!-- Scan legacy dirs first, as later items take priority -->
- <KDELegacyDirs/>
@@ -12,161 +12,106 @@
<LegacyDir>/usr/share/gnome/apps</LegacyDir>
<!-- Read standard .directory and .desktop file locations -->
- <DefaultAppDirs/>
- <DefaultDirectoryDirs/>
-
-- <!-- Read in overrides and child menus from applications-merged/ -->
-- <DefaultMergeDirs/>
--
- <!-- Accessories submenu -->
- <Menu>
- <Name>Accessories</Name>
- <Directory>Accessories.directory</Directory>
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
- <Category>Utility</Category>
- <Not>
- <Category>System</Category>
-@@ -38,6 +40,12 @@
- <Directory>Accessibility.directory</Directory>
- <Include>
+@@ -31,6 +30,8 @@
+ applications here -->
+ <Not><Category>Accessibility</Category></Not>
+ <Not><Category>System</Category></Not>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
+ </And>
+ </Include>
+ </Menu> <!-- End Accessories -->
+@@ -43,6 +44,8 @@
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>Accessibility</Category>
- <Not>
- <Category>Settings</Category>
-@@ -52,6 +60,12 @@
- <Directory>Development.directory</Directory>
+ <Not><Category>Settings</Category></Not>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
+ </And>
+ </Include>
+ </Menu> <!-- End Accessibility -->
+@@ -54,6 +57,8 @@
<Include>
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>Development</Category>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
<Filename>emacs.desktop</Filename>
-@@ -64,6 +78,12 @@
- <Directory>Education.directory</Directory>
+ </Include>
+@@ -66,6 +71,8 @@
<Include>
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>Education</Category>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
</Include>
-@@ -75,6 +95,12 @@
- <Directory>Games.directory</Directory>
+ </Menu> <!-- End Education -->
+@@ -77,6 +84,8 @@
<Include>
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>Game</Category>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
</Include>
-@@ -86,6 +112,12 @@
- <Directory>Graphics.directory</Directory>
+ </Menu> <!-- End Games -->
+@@ -88,6 +97,8 @@
<Include>
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>Graphics</Category>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
</Include>
-@@ -97,6 +129,12 @@
- <Directory>Internet.directory</Directory>
+ </Menu> <!-- End Graphics -->
+@@ -99,6 +110,8 @@
<Include>
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>Network</Category>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
</Include>
-@@ -108,6 +146,12 @@
- <Directory>Multimedia.directory</Directory>
+ </Menu> <!-- End Internet -->
+@@ -110,6 +123,8 @@
<Include>
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>AudioVideo</Category>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
</Include>
-@@ -119,6 +163,12 @@
- <Directory>Office.directory</Directory>
+ </Menu> <!-- End Multimedia -->
+@@ -121,6 +136,8 @@
<Include>
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>Office</Category>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
</Include>
-@@ -130,6 +180,12 @@
- <Directory>System-Tools.directory</Directory>
- <Include>
+ </Menu> <!-- End Office -->
+@@ -133,6 +150,8 @@
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>System</Category>
<Not><Category>Settings</Category></Not>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
-@@ -143,11 +199,204 @@
- <OnlyUnallocated/>
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
+ </Include>
+ </Menu> <!-- End System Tools -->
+@@ -147,8 +166,197 @@
<Not><Category>Core</Category></Not>
<Not><Category>Settings</Category></Not>
<Not><Category>Screensaver</Category></Not>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
</Include>
</Menu> <!-- End Other -->
-+
+
+ <!-- Read in overrides and child menus from applications-merged/ -->
+ <DefaultMergeDirs/>
+
@@ -353,5 +298,5 @@
+ </Include>
+ </Menu> <!-- End KOther -->
+ </Menu> <!-- KDE -->
-
++
</Menu> <!-- End Applications -->
diff --git a/x11/gnome-menus/files/patch-layout::preferences.menu b/x11/gnome-menus/files/patch-layout::preferences.menu
deleted file mode 100644
index 705e0e6cd2ee..000000000000
--- a/x11/gnome-menus/files/patch-layout::preferences.menu
+++ /dev/null
@@ -1,41 +0,0 @@
---- layout/preferences.menu.orig Tue Feb 13 04:18:01 2007
-+++ layout/preferences.menu Tue Feb 13 16:54:35 2007
-@@ -9,12 +9,15 @@
- <DefaultAppDirs/>
- <DefaultDirectoryDirs/>
-
-- <!-- Read in overrides and child menus from preferences-merged/ -->
-- <DefaultMergeDirs/>
--
- <!-- Stuff in the toplevel -->
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
- <Category>Settings</Category>
- <Not>
- <Or>
-@@ -36,10 +39,19 @@
- <Directory>Settings-Accessibility.directory</Directory>
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
- <Category>Settings</Category>
- <Category>Accessibility</Category>
- </And>
- </Include>
- </Menu>
-+
-+ <!-- Read in overrides and child menus from preferences-merged/ -->
-+ <DefaultMergeDirs/>
-
- </Menu> <!-- End Prefs -->
diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist
index 1541e93ecb50..117cf47d31ab 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -1,5 +1,4 @@
etc/xdg/menus/gnome-applications.menu
-etc/xdg/menus/preferences.menu
etc/xdg/menus/settings.menu
include/gnome-menus/gmenu-tree.h
lib/libgnome-menu.a
@@ -10,32 +9,31 @@ lib/libgnome-menu.so.2
%%PYTHON_SITELIBDIR%%/gmenu.la
%%PYTHON_SITELIBDIR%%/gmenu.so
libdata/pkgconfig/libgnome-menu.pc
-share/desktop-directories/Accessibility.directory
-share/desktop-directories/Accessories.directory
-share/desktop-directories/Applications.directory
-share/desktop-directories/Desktop.directory
+share/desktop-directories/AudioVideo.directory
share/desktop-directories/Development.directory
share/desktop-directories/Education.directory
-share/desktop-directories/Games.directory
+share/desktop-directories/Game.directory
share/desktop-directories/Graphics.directory
share/desktop-directories/Hardware.directory
-share/desktop-directories/Internet.directory
share/desktop-directories/InternetAndNetwork.directory
share/desktop-directories/KDE.directory
share/desktop-directories/LookAndFeel.directory
-share/desktop-directories/Multimedia.directory
+share/desktop-directories/Network.directory
share/desktop-directories/Office.directory
-share/desktop-directories/Other.directory
share/desktop-directories/Personal.directory
-share/desktop-directories/Preferences.directory
-share/desktop-directories/Settings-Accessibility.directory
+share/desktop-directories/Settings-System.directory
share/desktop-directories/Settings.directory
-share/desktop-directories/System-Settings.directory
share/desktop-directories/System-Tools.directory
share/desktop-directories/System.directory
+share/desktop-directories/Utility-Accessibility.directory
+share/desktop-directories/Utility.directory
+share/desktop-directories/X-GNOME-Menu-Applications.directory
+share/desktop-directories/X-GNOME-Menu-System.directory
+share/desktop-directories/X-GNOME-Other.directory
share/locale/af/LC_MESSAGES/gnome-menus.mo
share/locale/ar/LC_MESSAGES/gnome-menus.mo
share/locale/as/LC_MESSAGES/gnome-menus.mo
+share/locale/ast/LC_MESSAGES/gnome-menus.mo
share/locale/be/LC_MESSAGES/gnome-menus.mo
share/locale/be@latin/LC_MESSAGES/gnome-menus.mo
share/locale/bg/LC_MESSAGES/gnome-menus.mo
@@ -65,13 +63,16 @@ share/locale/gn/LC_MESSAGES/gnome-menus.mo
share/locale/gu/LC_MESSAGES/gnome-menus.mo
share/locale/he/LC_MESSAGES/gnome-menus.mo
share/locale/hi/LC_MESSAGES/gnome-menus.mo
+share/locale/hr/LC_MESSAGES/gnome-menus.mo
share/locale/hu/LC_MESSAGES/gnome-menus.mo
share/locale/hy/LC_MESSAGES/gnome-menus.mo
share/locale/id/LC_MESSAGES/gnome-menus.mo
share/locale/io/LC_MESSAGES/gnome-menus.mo
+share/locale/is/LC_MESSAGES/gnome-menus.mo
share/locale/it/LC_MESSAGES/gnome-menus.mo
share/locale/ja/LC_MESSAGES/gnome-menus.mo
share/locale/ka/LC_MESSAGES/gnome-menus.mo
+share/locale/kk/LC_MESSAGES/gnome-menus.mo
share/locale/kn/LC_MESSAGES/gnome-menus.mo
share/locale/ko/LC_MESSAGES/gnome-menus.mo
share/locale/ku/LC_MESSAGES/gnome-menus.mo
@@ -93,6 +94,7 @@ share/locale/oc/LC_MESSAGES/gnome-menus.mo
share/locale/or/LC_MESSAGES/gnome-menus.mo
share/locale/pa/LC_MESSAGES/gnome-menus.mo
share/locale/pl/LC_MESSAGES/gnome-menus.mo
+share/locale/ps/LC_MESSAGES/gnome-menus.mo
share/locale/pt/LC_MESSAGES/gnome-menus.mo
share/locale/pt_BR/LC_MESSAGES/gnome-menus.mo
share/locale/ro/LC_MESSAGES/gnome-menus.mo
@@ -103,7 +105,7 @@ share/locale/sk/LC_MESSAGES/gnome-menus.mo
share/locale/sl/LC_MESSAGES/gnome-menus.mo
share/locale/sq/LC_MESSAGES/gnome-menus.mo
share/locale/sr/LC_MESSAGES/gnome-menus.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-menus.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-menus.mo
share/locale/sv/LC_MESSAGES/gnome-menus.mo
share/locale/ta/LC_MESSAGES/gnome-menus.mo
share/locale/te/LC_MESSAGES/gnome-menus.mo
@@ -131,10 +133,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/si/LC_MESSAGES
@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@@ -147,6 +153,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
@dirrmtry share/locale/io/LC_MESSAGES
@dirrmtry share/locale/io
@dirrmtry share/locale/hy/LC_MESSAGES
@@ -161,5 +169,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index a534f3c5c3c8..d6fc21834590 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-panel/Makefile,v 1.177 2008/03/23 06:13:12 marcus Exp $
+# $MCom: ports/x11/gnome-panel/Makefile,v 1.195 2009/01/10 01:59:22 mezz Exp $
#
PORTNAME= gnome-panel
-PORTVERSION= 2.22.2
-PORTREVISION?= 1
+PORTVERSION= 2.24.2
+PORTREVISION?= 0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -68,11 +68,6 @@ post-patch:
${XARGS} -n 10 ${REINPLACE_CMD} -e \
's|"applications.menu"|"gnome-applications.menu"|'
-post-install:
- ${MKDIR} ${PREFIX}/share/gnome-panel
- ${INSTALL_DATA} ${FILESDIR}/iso3166.tab \
- ${PREFIX}/share/gnome-panel/iso3166.tab
-
.include <bsd.port.post.mk>
.endif
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 64b763212d0c..4f6d1f85b072 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-panel-2.22.2.tar.bz2) = 3d8aab9d476a593e731afcd60272454a
-SHA256 (gnome2/gnome-panel-2.22.2.tar.bz2) = e1ecc0ddc5a09481deb2daa1f30fa14472bfed541db46bb4f49f3d0d728b0a45
-SIZE (gnome2/gnome-panel-2.22.2.tar.bz2) = 3255261
+MD5 (gnome2/gnome-panel-2.24.2.tar.bz2) = a8c9df673e12e72694b55c665bb739dc
+SHA256 (gnome2/gnome-panel-2.24.2.tar.bz2) = 0bce9329da4850344ca49a2c0f38f7987afcb98d29e52803a3de0a4664593c57
+SIZE (gnome2/gnome-panel-2.24.2.tar.bz2) = 3353083
diff --git a/x11/gnome-panel/files/iso3166.tab b/x11/gnome-panel/files/iso3166.tab
deleted file mode 100644
index 22ff82083588..000000000000
--- a/x11/gnome-panel/files/iso3166.tab
+++ /dev/null
@@ -1,268 +0,0 @@
-# $OpenBSD: iso3166.tab,v 1.17 2007/02/02 20:26:51 millert Exp $
-# ISO 3166 alpha-2 country codes
-#
-# @(#)iso3166.tab 8.4
-#
-# From Paul Eggert (2006-09-27):
-#
-# This file contains a table with the following columns:
-# 1. ISO 3166-1 alpha-2 country code, current as of
-# ISO 3166-1 Newsletter No. V-12 (2006-09-26). See:
-# <a href="http://www.iso.org/iso/en/prods-services/iso3166ma/index.html">
-# ISO 3166 Maintenance agency (ISO 3166/MA)
-# </a>.
-# 2. The usual English name for the country,
-# chosen so that alphabetic sorting of subsets produces helpful lists.
-# This is not the same as the English name in the ISO 3166 tables.
-#
-# Columns are separated by a single tab.
-# The table is sorted by country code.
-#
-# Lines beginning with `#' are comments.
-#
-#country-
-#code country name
-AD Andorra
-AE United Arab Emirates
-AF Afghanistan
-AG Antigua & Barbuda
-AI Anguilla
-AL Albania
-AM Armenia
-AN Netherlands Antilles
-AO Angola
-AQ Antarctica
-AR Argentina
-AS Samoa (American)
-AT Austria
-AU Australia
-AW Aruba
-AX Aaland Islands
-AZ Azerbaijan
-BA Bosnia & Herzegovina
-BB Barbados
-BD Bangladesh
-BE Belgium
-BF Burkina Faso
-BG Bulgaria
-BH Bahrain
-BI Burundi
-BJ Benin
-BM Bermuda
-BN Brunei
-BO Bolivia
-BR Brazil
-BS Bahamas
-BT Bhutan
-BV Bouvet Island
-BW Botswana
-BY Belarus
-BZ Belize
-CA Canada
-CC Cocos (Keeling) Islands
-CD Congo (Dem. Rep.)
-CF Central African Rep.
-CG Congo (Rep.)
-CH Switzerland
-CI Cote d'Ivoire
-CK Cook Islands
-CL Chile
-CM Cameroon
-CN China
-CO Colombia
-CR Costa Rica
-CU Cuba
-CV Cape Verde
-CX Christmas Island
-CY Cyprus
-CZ Czech Republic
-DE Germany
-DJ Djibouti
-DK Denmark
-DM Dominica
-DO Dominican Republic
-DZ Algeria
-EC Ecuador
-EE Estonia
-EG Egypt
-EH Western Sahara
-ER Eritrea
-ES Spain
-ET Ethiopia
-FI Finland
-FJ Fiji
-FK Falkland Islands
-FM Micronesia
-FO Faroe Islands
-FR France
-GA Gabon
-GB Britain (UK)
-GD Grenada
-GE Georgia
-GF French Guiana
-GG Guernsey
-GH Ghana
-GI Gibraltar
-GL Greenland
-GM Gambia
-GN Guinea
-GP Guadeloupe
-GQ Equatorial Guinea
-GR Greece
-GS South Georgia & the South Sandwich Islands
-GT Guatemala
-GU Guam
-GW Guinea-Bissau
-GY Guyana
-HK Hong Kong
-HM Heard Island & McDonald Islands
-HN Honduras
-HR Croatia
-HT Haiti
-HU Hungary
-ID Indonesia
-IE Ireland
-IL Israel
-IM Isle of Man
-IN India
-IO British Indian Ocean Territory
-IQ Iraq
-IR Iran
-IS Iceland
-IT Italy
-JE Jersey
-JM Jamaica
-JO Jordan
-JP Japan
-KE Kenya
-KG Kyrgyzstan
-KH Cambodia
-KI Kiribati
-KM Comoros
-KN St Kitts & Nevis
-KP Korea (North)
-KR Korea (South)
-KW Kuwait
-KY Cayman Islands
-KZ Kazakhstan
-LA Laos
-LB Lebanon
-LC St Lucia
-LI Liechtenstein
-LK Sri Lanka
-LR Liberia
-LS Lesotho
-LT Lithuania
-LU Luxembourg
-LV Latvia
-LY Libya
-MA Morocco
-MC Monaco
-MD Moldova
-ME Montenegro
-MG Madagascar
-MH Marshall Islands
-MK Macedonia
-ML Mali
-MM Myanmar (Burma)
-MN Mongolia
-MO Macau
-MP Northern Mariana Islands
-MQ Martinique
-MR Mauritania
-MS Montserrat
-MT Malta
-MU Mauritius
-MV Maldives
-MW Malawi
-MX Mexico
-MY Malaysia
-MZ Mozambique
-NA Namibia
-NC New Caledonia
-NE Niger
-NF Norfolk Island
-NG Nigeria
-NI Nicaragua
-NL Netherlands
-NO Norway
-NP Nepal
-NR Nauru
-NU Niue
-NZ New Zealand
-OM Oman
-PA Panama
-PE Peru
-PF French Polynesia
-PG Papua New Guinea
-PH Philippines
-PK Pakistan
-PL Poland
-PM St Pierre & Miquelon
-PN Pitcairn
-PR Puerto Rico
-PS Palestine
-PT Portugal
-PW Palau
-PY Paraguay
-QA Qatar
-RE Reunion
-RO Romania
-RS Serbia
-RU Russia
-RW Rwanda
-SA Saudi Arabia
-SB Solomon Islands
-SC Seychelles
-SD Sudan
-SE Sweden
-SG Singapore
-SH St Helena
-SI Slovenia
-SJ Svalbard & Jan Mayen
-SK Slovakia
-SL Sierra Leone
-SM San Marino
-SN Senegal
-SO Somalia
-SR Suriname
-ST Sao Tome & Principe
-SV El Salvador
-SY Syria
-SZ Swaziland
-TC Turks & Caicos Is
-TD Chad
-TF French Southern & Antarctic Lands
-TG Togo
-TH Thailand
-TJ Tajikistan
-TK Tokelau
-TL East Timor
-TM Turkmenistan
-TN Tunisia
-TO Tonga
-TR Turkey
-TT Trinidad & Tobago
-TV Tuvalu
-TW Taiwan
-TZ Tanzania
-UA Ukraine
-UG Uganda
-UM US minor outlying islands
-US United States
-UY Uruguay
-UZ Uzbekistan
-VA Vatican City
-VC St Vincent
-VE Venezuela
-VG Virgin Islands (UK)
-VI Virgin Islands (US)
-VN Vietnam
-VU Vanuatu
-WF Wallis & Futuna
-WS Samoa (western)
-YE Yemen
-YT Mayotte
-ZA South Africa
-ZM Zambia
-ZW Zimbabwe
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c b/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c
deleted file mode 100644
index b6524a42ddd0..000000000000
--- a/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- applets/clock/clock-zonetable.c.orig 2008-04-15 16:58:01.000000000 -0400
-+++ applets/clock/clock-zonetable.c 2008-04-19 20:32:30.000000000 -0400
-@@ -18,8 +18,12 @@
- #define ISO3166_FILE SYSTEM_ZONEINFODIR"/country.tab"
- #else
- #define ZONETAB_FILE SYSTEM_ZONEINFODIR"/zone.tab"
-+#ifdef __FreeBSD__
-+#define ISO3166_FILE DATADIR"/gnome-panel/iso3166.tab"
-+#else
- #define ISO3166_FILE SYSTEM_ZONEINFODIR"/iso3166.tab"
- #endif
-+#endif
-
- static GObject *zonetable_singleton = NULL;
-
diff --git a/x11/gnome-panel/files/patch-gnome-panel_menu.c b/x11/gnome-panel/files/patch-gnome-panel_menu.c
deleted file mode 100644
index aa7aeae8c193..000000000000
--- a/x11/gnome-panel/files/patch-gnome-panel_menu.c
+++ /dev/null
@@ -1,42 +0,0 @@
---- gnome-panel/menu.c.orig Sat Mar 26 15:12:10 2005
-+++ gnome-panel/menu.c Fri Jun 3 11:17:45 2005
-@@ -1535,8 +1535,8 @@
- return NULL;
- }
-
--static void
--image_menu_shown (GtkWidget *image, gpointer data)
-+static gboolean
-+image_menu_exposed (GtkWidget *image, GdkEventExpose *event, gpointer data)
- {
- IconToLoad *new_icon;
- IconToLoad *icon;
-@@ -1545,7 +1545,7 @@
-
- /* if we've already handled this */
- if (gtk_image_get_storage_type (GTK_IMAGE (image)) != GTK_IMAGE_EMPTY)
-- return;
-+ return FALSE; /* propagate event */
-
- if (find_in_load_list (image) == NULL) {
- new_icon = icon_to_load_copy (icon);
-@@ -1554,6 +1554,8 @@
- }
- if (load_icons_id == 0)
- load_icons_id = g_idle_add (load_icons_handler, NULL);
-+
-+ return FALSE; /* propagate event */
- }
-
- static void
-@@ -1601,8 +1603,8 @@
- gtk_image_menu_item_set_image (
- GTK_IMAGE_MENU_ITEM (image_menu_item), image);
-
-- g_signal_connect_data (image, "map",
-- G_CALLBACK (image_menu_shown), icon,
-+ g_signal_connect_data (image, "expose-event",
-+ G_CALLBACK (image_menu_exposed), icon,
- (GClosureNotify) icon_to_load_free, 0);
-
- g_signal_connect (image, "destroy",
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 7d352da6d812..6a5de3dd3d01 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -44,7 +44,6 @@ share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
%%DATADIR%%/glade/panel-test-applets.glade
%%DATADIR%%/glade/window-list.glade
%%DATADIR%%/glade/workspace-switcher.glade
-%%DATADIR%%/iso3166.tab
%%DATADIR%%/pixmaps/clock-calendar-icon.png
%%DATADIR%%/pixmaps/clock-face-large.svg
%%DATADIR%%/pixmaps/clock-face-small-day.svg
@@ -68,6 +67,9 @@ share/gnome-panelrc
share/gnome/help/clock/C/clock.xml
share/gnome/help/clock/C/figures/clock_applet.png
share/gnome/help/clock/C/legal.xml
+share/gnome/help/clock/ar/clock.xml
+share/gnome/help/clock/ar/figures/clock_applet.png
+share/gnome/help/clock/ar/legal.xml
share/gnome/help/clock/ca/clock.xml
share/gnome/help/clock/ca/figures/clock_applet.png
share/gnome/help/clock/ca/legal.xml
@@ -80,6 +82,9 @@ share/gnome/help/clock/el/legal.xml
share/gnome/help/clock/es/clock.xml
share/gnome/help/clock/es/figures/clock_applet.png
share/gnome/help/clock/es/legal.xml
+share/gnome/help/clock/fi/clock.xml
+share/gnome/help/clock/fi/figures/clock_applet.png
+share/gnome/help/clock/fi/legal.xml
share/gnome/help/clock/fr/clock.xml
share/gnome/help/clock/fr/figures/clock_applet.png
share/gnome/help/clock/fr/legal.xml
@@ -113,6 +118,9 @@ share/gnome/help/clock/sr/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/th/clock.xml
+share/gnome/help/clock/th/figures/clock_applet.png
+share/gnome/help/clock/th/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
@@ -143,12 +151,18 @@ share/gnome/help/fish/C/legal.xml
share/gnome/help/fish/ca/figures/fish_applet.png
share/gnome/help/fish/ca/fish.xml
share/gnome/help/fish/ca/legal.xml
+share/gnome/help/fish/de/figures/fish_applet.png
+share/gnome/help/fish/de/fish.xml
+share/gnome/help/fish/de/legal.xml
share/gnome/help/fish/el/figures/fish_applet.png
share/gnome/help/fish/el/fish.xml
share/gnome/help/fish/el/legal.xml
share/gnome/help/fish/es/figures/fish_applet.png
share/gnome/help/fish/es/fish.xml
share/gnome/help/fish/es/legal.xml
+share/gnome/help/fish/fi/figures/fish_applet.png
+share/gnome/help/fish/fi/fish.xml
+share/gnome/help/fish/fi/legal.xml
share/gnome/help/fish/fr/figures/fish_applet.png
share/gnome/help/fish/fr/fish.xml
share/gnome/help/fish/fr/legal.xml
@@ -161,13 +175,20 @@ share/gnome/help/fish/ko/legal.xml
share/gnome/help/fish/oc/figures/fish_applet.png
share/gnome/help/fish/oc/fish.xml
share/gnome/help/fish/oc/legal.xml
+share/gnome/help/fish/ru/figures/fish_applet.png
+share/gnome/help/fish/ru/fish.xml
+share/gnome/help/fish/ru/legal.xml
share/gnome/help/fish/sv/figures/fish_applet.png
share/gnome/help/fish/sv/fish.xml
share/gnome/help/fish/sv/legal.xml
+share/gnome/help/fish/th/figures/fish_applet.png
+share/gnome/help/fish/th/fish.xml
+share/gnome/help/fish/th/legal.xml
share/gnome/help/fish/uk/figures/fish_applet.png
share/gnome/help/fish/uk/fish.xml
share/gnome/help/fish/uk/legal.xml
share/gnome/help/window-list/C/window-list.xml
+share/gnome/help/window-list/ar/window-list.xml
share/gnome/help/window-list/ca/window-list.xml
share/gnome/help/window-list/da/window-list.xml
share/gnome/help/window-list/de/figures/window_list_applet.png
@@ -177,6 +198,7 @@ share/gnome/help/window-list/de/legal.xml
share/gnome/help/window-list/de/window-list.xml
share/gnome/help/window-list/el/window-list.xml
share/gnome/help/window-list/es/window-list.xml
+share/gnome/help/window-list/fi/window-list.xml
share/gnome/help/window-list/fr/window-list.xml
share/gnome/help/window-list/it/window-list.xml
share/gnome/help/window-list/ja/figures/window_list_applet.png
@@ -196,6 +218,7 @@ share/gnome/help/window-list/zh_TW/figures/window_list_group_applet.png
share/gnome/help/window-list/zh_TW/legal.xml
share/gnome/help/window-list/zh_TW/window-list.xml
share/gnome/help/workspace-switcher/C/workspace-switcher.xml
+share/gnome/help/workspace-switcher/ar/workspace-switcher.xml
share/gnome/help/workspace-switcher/ca/workspace-switcher.xml
share/gnome/help/workspace-switcher/da/workspace-switcher.xml
share/gnome/help/workspace-switcher/de/figures/workspace_switcher_applet.png
@@ -204,6 +227,7 @@ share/gnome/help/workspace-switcher/de/legal.xml
share/gnome/help/workspace-switcher/de/workspace-switcher.xml
share/gnome/help/workspace-switcher/el/workspace-switcher.xml
share/gnome/help/workspace-switcher/es/workspace-switcher.xml
+share/gnome/help/workspace-switcher/fi/workspace-switcher.xml
share/gnome/help/workspace-switcher/fr/workspace-switcher.xml
share/gnome/help/workspace-switcher/it/workspace-switcher.xml
share/gnome/help/workspace-switcher/ja/figures/workspace_switcher_applet.png
@@ -287,6 +311,7 @@ share/locale/af/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/as/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/ast/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/be/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/be@latin/LC_MESSAGES/gnome-panel-2.0.mo
@@ -296,6 +321,7 @@ share/locale/bn_IN/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/br/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/da/LC_MESSAGES/gnome-panel-2.0.mo
@@ -321,6 +347,7 @@ share/locale/hr/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/hy/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/is/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ka/LC_MESSAGES/gnome-panel-2.0.mo
@@ -328,9 +355,11 @@ share/locale/kn/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ky/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/la/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/li/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/mai/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/mg/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/mi/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/mk/LC_MESSAGES/gnome-panel-2.0.mo
@@ -358,8 +387,8 @@ share/locale/sk/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/sl/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/sq/LC_MESSAGES/gnome-panel-2.0.mo
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/sr@latin/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/te/LC_MESSAGES/gnome-panel-2.0.mo
@@ -377,10 +406,12 @@ share/locale/zh_HK/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
share/omf/clock/clock-C.omf
+share/omf/clock/clock-ar.omf
share/omf/clock/clock-ca.omf
share/omf/clock/clock-de.omf
share/omf/clock/clock-el.omf
share/omf/clock/clock-es.omf
+share/omf/clock/clock-fi.omf
share/omf/clock/clock-fr.omf
share/omf/clock/clock-it.omf
share/omf/clock/clock-ja.omf
@@ -392,18 +423,23 @@ share/omf/clock/clock-pt_BR.omf
share/omf/clock/clock-ru.omf
share/omf/clock/clock-sr.omf
share/omf/clock/clock-sv.omf
+share/omf/clock/clock-th.omf
share/omf/clock/clock-uk.omf
share/omf/clock/clock-zh_CN.omf
share/omf/clock/clock-zh_TW.omf
share/omf/fish/fish-C.omf
share/omf/fish/fish-ca.omf
+share/omf/fish/fish-de.omf
share/omf/fish/fish-el.omf
share/omf/fish/fish-es.omf
+share/omf/fish/fish-fi.omf
share/omf/fish/fish-fr.omf
share/omf/fish/fish-it.omf
share/omf/fish/fish-ko.omf
share/omf/fish/fish-oc.omf
+share/omf/fish/fish-ru.omf
share/omf/fish/fish-sv.omf
+share/omf/fish/fish-th.omf
share/omf/fish/fish-uk.omf
share/omf/gnome-panel/fish-applet-2-de.omf
share/omf/gnome-panel/fish-applet-2-ja.omf
@@ -417,11 +453,13 @@ share/omf/gnome-panel/workspace-switcher-ja.omf
share/omf/gnome-panel/workspace-switcher-zh_CN.omf
share/omf/gnome-panel/workspace-switcher-zh_TW.omf
share/omf/window-list/window-list-C.omf
+share/omf/window-list/window-list-ar.omf
share/omf/window-list/window-list-ca.omf
share/omf/window-list/window-list-da.omf
share/omf/window-list/window-list-de.omf
share/omf/window-list/window-list-el.omf
share/omf/window-list/window-list-es.omf
+share/omf/window-list/window-list-fi.omf
share/omf/window-list/window-list-fr.omf
share/omf/window-list/window-list-it.omf
share/omf/window-list/window-list-ko.omf
@@ -432,11 +470,13 @@ share/omf/window-list/window-list-sv.omf
share/omf/window-list/window-list-uk.omf
share/omf/window-list/window-list-zh_CN.omf
share/omf/workspace-switcher/workspace-switcher-C.omf
+share/omf/workspace-switcher/workspace-switcher-ar.omf
share/omf/workspace-switcher/workspace-switcher-ca.omf
share/omf/workspace-switcher/workspace-switcher-da.omf
share/omf/workspace-switcher/workspace-switcher-de.omf
share/omf/workspace-switcher/workspace-switcher-el.omf
share/omf/workspace-switcher/workspace-switcher-es.omf
+share/omf/workspace-switcher/workspace-switcher-fi.omf
share/omf/workspace-switcher/workspace-switcher-fr.omf
share/omf/workspace-switcher/workspace-switcher-it.omf
share/omf/workspace-switcher/workspace-switcher-ko.omf
@@ -471,12 +511,14 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
@dirrm share/gnome/help/workspace-switcher/ja
@dirrm share/gnome/help/workspace-switcher/it
@dirrm share/gnome/help/workspace-switcher/fr
+@dirrm share/gnome/help/workspace-switcher/fi
@dirrm share/gnome/help/workspace-switcher/es
@dirrm share/gnome/help/workspace-switcher/el
@dirrm share/gnome/help/workspace-switcher/de/figures
@dirrm share/gnome/help/workspace-switcher/de
@dirrm share/gnome/help/workspace-switcher/da
@dirrm share/gnome/help/workspace-switcher/ca
+@dirrm share/gnome/help/workspace-switcher/ar
@dirrm share/gnome/help/workspace-switcher/C
@dirrm share/gnome/help/workspace-switcher
@dirrm share/gnome/help/window-list/zh_TW/figures
@@ -492,18 +534,24 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
@dirrm share/gnome/help/window-list/ja
@dirrm share/gnome/help/window-list/it
@dirrm share/gnome/help/window-list/fr
+@dirrm share/gnome/help/window-list/fi
@dirrm share/gnome/help/window-list/es
@dirrm share/gnome/help/window-list/el
@dirrm share/gnome/help/window-list/de/figures
@dirrm share/gnome/help/window-list/de
@dirrm share/gnome/help/window-list/da
@dirrm share/gnome/help/window-list/ca
+@dirrm share/gnome/help/window-list/ar
@dirrm share/gnome/help/window-list/C
@dirrm share/gnome/help/window-list
@dirrm share/gnome/help/fish/uk/figures
@dirrm share/gnome/help/fish/uk
+@dirrm share/gnome/help/fish/th/figures
+@dirrm share/gnome/help/fish/th
@dirrm share/gnome/help/fish/sv/figures
@dirrm share/gnome/help/fish/sv
+@dirrm share/gnome/help/fish/ru/figures
+@dirrm share/gnome/help/fish/ru
@dirrm share/gnome/help/fish/oc/figures
@dirrm share/gnome/help/fish/oc
@dirrm share/gnome/help/fish/ko/figures
@@ -512,10 +560,14 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
@dirrm share/gnome/help/fish/it
@dirrm share/gnome/help/fish/fr/figures
@dirrm share/gnome/help/fish/fr
+@dirrm share/gnome/help/fish/fi/figures
+@dirrm share/gnome/help/fish/fi
@dirrm share/gnome/help/fish/es/figures
@dirrm share/gnome/help/fish/es
@dirrm share/gnome/help/fish/el/figures
@dirrm share/gnome/help/fish/el
+@dirrm share/gnome/help/fish/de/figures
+@dirrm share/gnome/help/fish/de
@dirrm share/gnome/help/fish/ca/figures
@dirrm share/gnome/help/fish/ca
@dirrm share/gnome/help/fish/C/figures
@@ -536,6 +588,8 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
@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/th/figures
+@dirrm share/gnome/help/clock/th
@dirrm share/gnome/help/clock/sv/figures
@dirrm share/gnome/help/clock/sv
@dirrm share/gnome/help/clock/sr/figures
@@ -558,6 +612,8 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
@dirrm share/gnome/help/clock/it
@dirrm share/gnome/help/clock/fr/figures
@dirrm share/gnome/help/clock/fr
+@dirrm share/gnome/help/clock/fi/figures
+@dirrm share/gnome/help/clock/fi
@dirrm share/gnome/help/clock/es/figures
@dirrm share/gnome/help/clock/es
@dirrm share/gnome/help/clock/el/figures
@@ -566,6 +622,8 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
@dirrm share/gnome/help/clock/de
@dirrm share/gnome/help/clock/ca/figures
@dirrm share/gnome/help/clock/ca
+@dirrm share/gnome/help/clock/ar/figures
+@dirrm share/gnome/help/clock/ar
@dirrm share/gnome/help/clock/C/figures
@dirrm share/gnome/help/clock/C
@dirrm share/gnome/help/clock
@@ -586,6 +644,8 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
@dirrmtry share/locale/uz@cyrillic
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/sr@ije/LC_MESSAGES
@dirrmtry share/locale/sr@ije
@dirrmtry share/locale/si/LC_MESSAGES
@@ -604,6 +664,10 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
@dirrmtry share/locale/mi
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/la/LC_MESSAGES
+@dirrmtry share/locale/la
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@@ -614,9 +678,13 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
@dirrmtry share/locale/fur
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 55386b4ce568..c9035bd7bcd1 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.83 2008/03/11 03:13:07 mezz Exp $
+# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.99 2009/01/02 19:17:35 marcus Exp $
#
PORTNAME= gnome-screensaver
-PORTVERSION= 2.22.2
-PORTREVISION= 7
+PORTVERSION= 2.24.1
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -23,7 +23,8 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-USE_GNOME= gnomeprefix gnomehack intlhack gnomemenus libgnomekbd
+USE_GNOME= gnomeprefix gnomehack intlhack gnomemenus libgnomekbd \
+ gnomedesktop
CONFIGURE_ARGS= --with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
--with-xscreensaverdir=${XSCREENSAVER_DIR} \
--with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks
diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo
index 30c1e46395ef..c788f1277214 100644
--- a/x11/gnome-screensaver/distinfo
+++ b/x11/gnome-screensaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-screensaver-2.22.2.tar.bz2) = 496a2e0cba5c27db57a72ecf2e17f789
-SHA256 (gnome2/gnome-screensaver-2.22.2.tar.bz2) = a686d41f8623dbfc56c2c0bab5517a6380f538ed6ef7478ca51cfb9062e9f15b
-SIZE (gnome2/gnome-screensaver-2.22.2.tar.bz2) = 2042396
+MD5 (gnome2/gnome-screensaver-2.24.1.tar.bz2) = f0b9cc3108bb9105141a8c22b56bf615
+SHA256 (gnome2/gnome-screensaver-2.24.1.tar.bz2) = c8cf26fc1d402269b7030abadfdf2c6103391cf30466b3d30bc99671f4c89f7e
+SIZE (gnome2/gnome-screensaver-2.24.1.tar.bz2) = 2058780
diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist
index b54e5ce3589d..97557b557a12 100644
--- a/x11/gnome-screensaver/pkg-plist
+++ b/x11/gnome-screensaver/pkg-plist
@@ -19,6 +19,7 @@ share/desktop-directories/gnome-screensaver.directory
%%DATADIR%%/lock-dialog-default.glade
share/locale/ar/LC_MESSAGES/gnome-screensaver.mo
share/locale/as/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ast/LC_MESSAGES/gnome-screensaver.mo
share/locale/be/LC_MESSAGES/gnome-screensaver.mo
share/locale/be@latin/LC_MESSAGES/gnome-screensaver.mo
share/locale/bg/LC_MESSAGES/gnome-screensaver.mo
@@ -44,11 +45,14 @@ share/locale/gl/LC_MESSAGES/gnome-screensaver.mo
share/locale/gu/LC_MESSAGES/gnome-screensaver.mo
share/locale/he/LC_MESSAGES/gnome-screensaver.mo
share/locale/hi/LC_MESSAGES/gnome-screensaver.mo
+share/locale/hr/LC_MESSAGES/gnome-screensaver.mo
share/locale/hu/LC_MESSAGES/gnome-screensaver.mo
share/locale/id/LC_MESSAGES/gnome-screensaver.mo
+share/locale/is/LC_MESSAGES/gnome-screensaver.mo
share/locale/it/LC_MESSAGES/gnome-screensaver.mo
share/locale/ja/LC_MESSAGES/gnome-screensaver.mo
share/locale/ka/LC_MESSAGES/gnome-screensaver.mo
+share/locale/kn/LC_MESSAGES/gnome-screensaver.mo
share/locale/ko/LC_MESSAGES/gnome-screensaver.mo
share/locale/ku/LC_MESSAGES/gnome-screensaver.mo
share/locale/lt/LC_MESSAGES/gnome-screensaver.mo
@@ -76,7 +80,7 @@ share/locale/sk/LC_MESSAGES/gnome-screensaver.mo
share/locale/sl/LC_MESSAGES/gnome-screensaver.mo
share/locale/sq/LC_MESSAGES/gnome-screensaver.mo
share/locale/sr/LC_MESSAGES/gnome-screensaver.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-screensaver.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-screensaver.mo
share/locale/sv/LC_MESSAGES/gnome-screensaver.mo
share/locale/ta/LC_MESSAGES/gnome-screensaver.mo
share/locale/te/LC_MESSAGES/gnome-screensaver.mo
@@ -106,6 +110,8 @@ share/pixmaps/gnome-logo-white.svg
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/si/LC_MESSAGES
@dirrmtry share/locale/si
@dirrmtry share/locale/ps/LC_MESSAGES
@@ -124,5 +130,7 @@ share/pixmaps/gnome-logo-white.svg
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 453051987f60..bebfa085cb59 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-session/Makefile,v 1.141 2008/03/10 23:48:33 ahze Exp $
+# $MCom: ports/x11/gnome-session/Makefile,v 1.164 2008/11/25 19:25:49 marcus Exp $
#
PORTNAME= gnome-session
-PORTVERSION= 2.22.3
+PORTVERSION= 2.24.2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME \
http://www.marcuscom.com/downloads/:local
@@ -22,7 +22,8 @@ COMMENT= Session component for the GNOME 2 desktop
BUILD_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
gnome-keyring.0:${PORTSDIR}/security/gnome-keyring \
- notify.1:${PORTSDIR}/devel/libnotify
+ notify.1:${PORTSDIR}/devel/libnotify \
+ execinfo:${PORTSDIR}/devel/libexecinfo
RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \
${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo
@@ -34,6 +35,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui
GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --disable-docbook-docs
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -45,7 +47,7 @@ GCONF_SCHEMAS= gnome-session.schemas
SPLASHES= freebsd-splashes-gnome-2.18_1.tar
post-extract:
- cd ${WRKDIR} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES}
+ cd ${WRKDIR} && ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES}
post-install:
${INSTALL_DATA} ${WRKSRC}/data/gnome-splash.png \
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index e0168c18970f..2a485ff1bc98 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,6 +1,6 @@
-MD5 (gnome2/gnome-session-2.22.3.tar.bz2) = 859b61b5368aa000c9bcb8b0d0688ca2
-SHA256 (gnome2/gnome-session-2.22.3.tar.bz2) = 07ec872ae8213c4e92072ff74451caa2b6afb747fd0b07d2cea40cfcd32b7176
-SIZE (gnome2/gnome-session-2.22.3.tar.bz2) = 773853
+MD5 (gnome2/gnome-session-2.24.2.tar.bz2) = 13e882a8c73bebb5403c207da0455156
+SHA256 (gnome2/gnome-session-2.24.2.tar.bz2) = b69216120e0fa972f3fbbff36b5520979974fa665d76d8c7db59970dca61b629
+SIZE (gnome2/gnome-session-2.24.2.tar.bz2) = 800914
MD5 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 80eb8c52fcf9fe977e0bf8ed48b85fe5
SHA256 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = fcca0f6eb759a4ef0211ecd61340f84ce8ad4d7493f725ac8613724faadbb508
SIZE (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 1630720
diff --git a/x11/gnome-session/files/patch-data_Makefile.in b/x11/gnome-session/files/patch-data_Makefile.in
deleted file mode 100644
index 82e1ed49f216..000000000000
--- a/x11/gnome-session/files/patch-data_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- data/Makefile.in.orig 2008-03-01 02:09:17.000000000 -0500
-+++ data/Makefile.in 2008-03-01 02:10:21.000000000 -0500
-@@ -258,7 +258,7 @@ default_in_files = default.session.in
- default_DATA = $(default_in_files:.session.in=.session)
- xsessiondir = $(datadir)/xsessions
- xsession_in_files = gnome.desktop.in
--xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
-+xsession_DATA = # $(xsession_in_files:.desktop.in=.desktop)
- settingsdir = $(datadir)/applications
- @SESSION_TRUE@settings_in_files = session-properties.desktop.in
- @SESSION_TRUE@settings_DATA = $(settings_in_files:.desktop.in=.desktop)
-@@ -280,7 +280,7 @@ CLEANFILES = \
- gnome.desktop \
- session-properties.desktop
-
--all: all-recursive
-+all: all-recursive default.session
-
- .SUFFIXES:
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
diff --git a/x11/gnome-session/files/patch-disable_debug b/x11/gnome-session/files/patch-disable_debug
deleted file mode 100644
index 778d72c9e67f..000000000000
--- a/x11/gnome-session/files/patch-disable_debug
+++ /dev/null
@@ -1,13 +0,0 @@
---- gnome-session/main.c.orig 2008-01-16 16:48:55.000000000 -0600
-+++ gnome-session/main.c 2008-01-16 16:50:01.000000000 -0600
-@@ -626,8 +626,8 @@
- major = atoi (versions [1]);
- if ((major % 2) != 0)
- {
-- g_setenv ("G_DEBUG", "fatal_criticals", FALSE);
-- g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
-+ /* g_setenv ("G_DEBUG", "fatal_criticals", FALSE);
-+ g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL); */
- }
- }
- g_strfreev (versions);
diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in
new file mode 100644
index 000000000000..7e78d6ed5deb
--- /dev/null
+++ b/x11/gnome-session/files/patch-gnome-session_Makefile.in
@@ -0,0 +1,10 @@
+--- gnome-session/Makefile.in.orig 2008-08-20 14:29:34.000000000 -0400
++++ gnome-session/Makefile.in 2008-08-20 14:29:56.000000000 -0400
+@@ -332,6 +332,7 @@ test_client_dbus_LDADD = \
+
+ gnome_session_LDADD = \
+ -lSM -lICE \
++ -lexecinfo \
+ libgsmutil.la \
+ $(top_builddir)/egg/libeggdesktopfile.la \
+ $(GNOME_SESSION_LIBS) \
diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-autostart-app.c b/x11/gnome-session/files/patch-gnome-session_gsm-autostart-app.c
new file mode 100644
index 000000000000..3044f1b8988f
--- /dev/null
+++ b/x11/gnome-session/files/patch-gnome-session_gsm-autostart-app.c
@@ -0,0 +1,10 @@
+--- gnome-session/gsm-autostart-app.c.orig 2008-08-20 14:18:52.000000000 -0400
++++ gnome-session/gsm-autostart-app.c 2008-08-20 14:19:02.000000000 -0400
+@@ -25,6 +25,7 @@
+ #include <string.h>
+ #include <sys/wait.h>
+ #include <errno.h>
++#include <signal.h>
+
+ #include <glib.h>
+ #include <gio/gio.h>
diff --git a/x11/gnome-session/pkg-descr b/x11/gnome-session/pkg-descr
index 50986ef910b2..ee3e0826ec85 100644
--- a/x11/gnome-session/pkg-descr
+++ b/x11/gnome-session/pkg-descr
@@ -1,2 +1,4 @@
This provides session management for the GNOME 2 desktop, and
provides the tools used to start the desktop.
+
+WWW: http://www.gnome.org
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index 9c51b437c0e5..6612cb2a9c39 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -1,10 +1,18 @@
bin/gnome-session
bin/gnome-session-properties
-bin/gnome-session-remove
bin/gnome-session-save
bin/gnome-wm
+lib/gnome-session/helpers/at-spi-registryd-wrapper
+lib/gnome-session/helpers/gnome-keyring-daemon-wrapper
+lib/gnome-session/helpers/gnome-session-splash
+lib/gnome-session/helpers/gnome-settings-daemon-helper
share/applications/session-properties.desktop
-share/gnome/default.session
+%%DATADIR%%/gsm-inhibit-dialog.glade
+%%DATADIR%%/session-properties.glade
+share/gnome/autostart/at-spi-registryd-wrapper.desktop
+share/gnome/autostart/gnome-keyring-daemon-wrapper.desktop
+share/gnome/autostart/gnome-session-splash.desktop
+share/gnome/autostart/gnome-settings-daemon-helper.desktop
share/icons/hicolor/16x16/apps/session-properties.png
share/icons/hicolor/22x22/apps/session-properties.png
share/icons/hicolor/24x24/apps/session-properties.png
@@ -13,6 +21,7 @@ share/icons/hicolor/scalable/apps/session-properties.svg
share/locale/af/LC_MESSAGES/gnome-session-2.0.mo
share/locale/am/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ast/LC_MESSAGES/gnome-session-2.0.mo
share/locale/az/LC_MESSAGES/gnome-session-2.0.mo
share/locale/be/LC_MESSAGES/gnome-session-2.0.mo
share/locale/be@latin/LC_MESSAGES/gnome-session-2.0.mo
@@ -81,7 +90,7 @@ share/locale/sk/LC_MESSAGES/gnome-session-2.0.mo
share/locale/sl/LC_MESSAGES/gnome-session-2.0.mo
share/locale/sq/LC_MESSAGES/gnome-session-2.0.mo
share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-session-2.0.mo
share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo
share/locale/te/LC_MESSAGES/gnome-session-2.0.mo
@@ -117,8 +126,12 @@ share/pixmaps/splash/original-gnome-splash.png
share/pixmaps/splash/tremulant-2.12.png
share/pixmaps/splash/tremulant-blood-2.12.png
share/pixmaps/splash/tremulant-brushed-metal-2.12.png
+share/xsessions/gnome.desktop
@dirrmtry share/xsessions
+@dirrm %%DATADIR%%
@dirrmtry share/applications
+@dirrm lib/gnome-session/helpers
+@dirrm lib/gnome-session
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -127,6 +140,8 @@ share/pixmaps/splash/tremulant-brushed-metal-2.12.png
@dirrmtry share/locale/xh
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/si/LC_MESSAGES
@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@@ -153,3 +168,5 @@ share/pixmaps/splash/tremulant-brushed-metal-2.12.png
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index adf1411b5cfd..f4a01ce3972c 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-terminal/Makefile,v 1.101 2008/03/11 02:42:58 mezz Exp $
+# $MCom: ports/x11/gnome-terminal/Makefile,v 1.113 2008/11/25 05:43:25 mezz Exp $
#
PORTNAME= gnome-terminal
-PORTVERSION= 2.22.3
+PORTVERSION= 2.24.2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index e0fbe6d40c65..7e3356076669 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-terminal-2.22.3.tar.bz2) = ef61930fbafe81406c934dcf97efec09
-SHA256 (gnome2/gnome-terminal-2.22.3.tar.bz2) = fffe2b352167fa42680cae79be80c5082cd4a04f712564bc4ae5ff0253509cd7
-SIZE (gnome2/gnome-terminal-2.22.3.tar.bz2) = 1803177
+MD5 (gnome2/gnome-terminal-2.24.2.tar.bz2) = c864ee43335db306e344df41e0090d4f
+SHA256 (gnome2/gnome-terminal-2.24.2.tar.bz2) = 849597d79f2dd6eb8d4079bc0b59c0f806a691ac2af360099ef0fa1f6b91e82a
+SIZE (gnome2/gnome-terminal-2.24.2.tar.bz2) = 1854226
diff --git a/x11/gnome-terminal/files/patch-src_terminal-screen.c b/x11/gnome-terminal/files/patch-src_terminal-screen.c
deleted file mode 100644
index ed0df8903943..000000000000
--- a/x11/gnome-terminal/files/patch-src_terminal-screen.c
+++ /dev/null
@@ -1,82 +0,0 @@
---- src/terminal-screen.c.orig Wed Oct 18 15:50:28 2006
-+++ src/terminal-screen.c Wed Oct 18 15:49:42 2006
-@@ -244,6 +244,10 @@
- GtkAllocation *allocation)
- {
- GtkWidget *child;
-+ GtkAllocation old_allocation;
-+
-+ old_allocation.width = widget->allocation.width;
-+ old_allocation.height = widget->allocation.height;
-
- widget->allocation = *allocation;
-
-@@ -251,6 +255,13 @@
- g_assert (child != NULL);
-
- gtk_widget_size_allocate (child, allocation);
-+
-+ if (old_allocation.width != allocation->width ||
-+ old_allocation.height != allocation->height)
-+ {
-+ GtkWidget *term = TERMINAL_SCREEN (widget)->priv->term;
-+ gtk_widget_queue_resize_no_redraw (term);
-+ }
- }
-
- static void
-@@ -278,22 +289,22 @@
- #define URLPATH "/[" PATHCHARS "]*[^]'.}>) \t\r\n,\\\"]"
-
- terminal_widget_match_add (screen->priv->term,
-- "\\<" SCHEME "//(" USER "@)?[" HOSTCHARS ".]+"
-- "(:[0-9]+)?(" URLPATH ")?\\>/?", FLAVOR_AS_IS);
-+ "[[:<:]]" SCHEME "//(" USER "@)?[" HOSTCHARS ".]+"
-+ "(:[0-9]+)?(" URLPATH ")?[[:>:]]/?", FLAVOR_AS_IS);
-
- terminal_widget_match_add (screen->priv->term,
-- "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+"
-- "(:[0-9]+)?(" URLPATH ")?\\>/?",
-+ "[[:<:]](www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+"
-+ "(:[0-9]+)?(" URLPATH ")?[[:>:]]/?",
- FLAVOR_DEFAULT_TO_HTTP);
-
- terminal_widget_match_add (screen->priv->term,
-- "\\<(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9]"
-- "[a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>",
-+ "[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9]"
-+ "[a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+[[:>:]]",
- FLAVOR_EMAIL);
-
- terminal_widget_match_add (screen->priv->term,
-- "\\<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+"
-- "@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS);
-+ "[[:<:]]news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+"
-+ "@[" HOSTCHARS ".]+(:[0-9]+)?[[:>:]]", FLAVOR_AS_IS);
-
- terminal_screen_setup_dnd (screen);
-
-@@ -548,7 +559,6 @@
- */
- terminal_screen_update_scrollbar (screen);
- terminal_window_update_icon (screen->priv->window);
-- terminal_window_update_geometry (screen->priv->window);
- }
-
- if (GTK_WIDGET_REALIZED (screen->priv->term))
-@@ -909,7 +919,6 @@
-
- terminal_widget_set_allow_bold (term,
- terminal_profile_get_allow_bold (profile));
-- terminal_window_set_size (screen->priv->window, screen, TRUE);
- }
-
- static void
-@@ -1019,6 +1028,7 @@
- GtkWidget*
- terminal_screen_get_widget (TerminalScreen *screen)
- {
-+ if (screen == NULL) return NULL;
- return screen->priv->term;
- }
-
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index 690ad8893f3d..bef6f9e81cc3 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -1,7 +1,13 @@
bin/gnome-terminal
libdata/bonobo/servers/gnome-terminal.server
share/applications/gnome-terminal.desktop
-%%DATADIR%%/glade/gnome-terminal.glade2
+%%DATADIR%%/encodings-dialog.ui
+%%DATADIR%%/keybinding-editor.ui
+%%DATADIR%%/profile-manager.ui
+%%DATADIR%%/profile-new-dialog.ui
+%%DATADIR%%/profile-preferences.ui
+%%DATADIR%%/skey-challenge.ui
+%%DATADIR%%/terminal.xml
share/gnome/help/gnome-terminal/C/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/C/figures/gnome-terminal-tabbed.png
share/gnome/help/gnome-terminal/C/gnome-terminal.xml
@@ -13,6 +19,9 @@ share/gnome/help/gnome-terminal/bg/legal.xml
share/gnome/help/gnome-terminal/ca/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/ca/figures/gnome-terminal-tabbed.png
share/gnome/help/gnome-terminal/ca/gnome-terminal.xml
+share/gnome/help/gnome-terminal/cs/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/cs/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/cs/gnome-terminal.xml
share/gnome/help/gnome-terminal/de/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/de/figures/gnome-terminal-tabbed.png
share/gnome/help/gnome-terminal/de/gnome-terminal.xml
@@ -97,10 +106,12 @@ share/locale/id/LC_MESSAGES/gnome-terminal.mo
share/locale/it/LC_MESSAGES/gnome-terminal.mo
share/locale/ja/LC_MESSAGES/gnome-terminal.mo
share/locale/ka/LC_MESSAGES/gnome-terminal.mo
+share/locale/kn/LC_MESSAGES/gnome-terminal.mo
share/locale/ko/LC_MESSAGES/gnome-terminal.mo
share/locale/ku/LC_MESSAGES/gnome-terminal.mo
share/locale/lt/LC_MESSAGES/gnome-terminal.mo
share/locale/lv/LC_MESSAGES/gnome-terminal.mo
+share/locale/mai/LC_MESSAGES/gnome-terminal.mo
share/locale/mg/LC_MESSAGES/gnome-terminal.mo
share/locale/mk/LC_MESSAGES/gnome-terminal.mo
share/locale/ml/LC_MESSAGES/gnome-terminal.mo
@@ -115,6 +126,7 @@ share/locale/oc/LC_MESSAGES/gnome-terminal.mo
share/locale/or/LC_MESSAGES/gnome-terminal.mo
share/locale/pa/LC_MESSAGES/gnome-terminal.mo
share/locale/pl/LC_MESSAGES/gnome-terminal.mo
+share/locale/ps/LC_MESSAGES/gnome-terminal.mo
share/locale/pt/LC_MESSAGES/gnome-terminal.mo
share/locale/pt_BR/LC_MESSAGES/gnome-terminal.mo
share/locale/ro/LC_MESSAGES/gnome-terminal.mo
@@ -125,7 +137,7 @@ share/locale/sk/LC_MESSAGES/gnome-terminal.mo
share/locale/sl/LC_MESSAGES/gnome-terminal.mo
share/locale/sq/LC_MESSAGES/gnome-terminal.mo
share/locale/sr/LC_MESSAGES/gnome-terminal.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-terminal.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-terminal.mo
share/locale/sv/LC_MESSAGES/gnome-terminal.mo
share/locale/ta/LC_MESSAGES/gnome-terminal.mo
share/locale/te/LC_MESSAGES/gnome-terminal.mo
@@ -141,6 +153,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
share/omf/gnome-terminal/gnome-terminal-C.omf
share/omf/gnome-terminal/gnome-terminal-bg.omf
share/omf/gnome-terminal/gnome-terminal-ca.omf
+share/omf/gnome-terminal/gnome-terminal-cs.omf
share/omf/gnome-terminal/gnome-terminal-de.omf
share/omf/gnome-terminal/gnome-terminal-es.omf
share/omf/gnome-terminal/gnome-terminal-fr.omf
@@ -155,7 +168,6 @@ share/omf/gnome-terminal/gnome-terminal-sv.omf
share/omf/gnome-terminal/gnome-terminal-uk.omf
share/omf/gnome-terminal/gnome-terminal-zh_CN.omf
share/omf/gnome-terminal/gnome-terminal-zh_TW.omf
-share/pixmaps/gnome-terminal.png
@dirrm share/omf/gnome-terminal
@dirrm share/gnome/help/gnome-terminal/zh_TW/figures
@dirrm share/gnome/help/gnome-terminal/zh_TW
@@ -185,6 +197,8 @@ share/pixmaps/gnome-terminal.png
@dirrm share/gnome/help/gnome-terminal/es
@dirrm share/gnome/help/gnome-terminal/de/figures
@dirrm share/gnome/help/gnome-terminal/de
+@dirrm share/gnome/help/gnome-terminal/cs/figures
+@dirrm share/gnome/help/gnome-terminal/cs
@dirrm share/gnome/help/gnome-terminal/ca/figures
@dirrm share/gnome/help/gnome-terminal/ca
@dirrm share/gnome/help/gnome-terminal/bg/figures
@@ -192,7 +206,6 @@ share/pixmaps/gnome-terminal.png
@dirrm share/gnome/help/gnome-terminal/C/figures
@dirrm share/gnome/help/gnome-terminal/C
@dirrm share/gnome/help/gnome-terminal
-@dirrm %%DATADIR%%/glade
@dirrm %%DATADIR%%
@dirrmtry share/applications
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -201,16 +214,22 @@ share/pixmaps/gnome-terminal.png
@dirrmtry share/locale/xh
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/si/LC_MESSAGES
@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/hy/LC_MESSAGES
diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile
index 9a60d284c61c..8a3840e53147 100644
--- a/x11/gnome2-power-tools/Makefile
+++ b/x11/gnome2-power-tools/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.82 2008/03/12 21:19:04 marcus Exp $
+# $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.84 2008/09/30 13:18:29 kwm Exp $
#
PORTREVISION= 2
@@ -12,7 +12,7 @@ PKGNAMESUFFIX= -power-tools
COMMENT= The 'Geektoys' for the GNOME 2 power user
-RUN_DEPENDS= ${LOCALBASE}/lib/epiphany/2.22/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \
+RUN_DEPENDS= ${LOCALBASE}/lib/epiphany/2.24/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \
gnome-pkgview:${PORTSDIR}/sysutils/gnome-pkgview \
${LOCALBASE}/libexec/netspeed_applet2:${PORTSDIR}/net/netspeed_applet \
${LOCALBASE}/sbin/gkrellmd:${PORTSDIR}/sysutils/gkrellm2 \
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index e03957c7112d..f2f5a96a6d29 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome2/Makefile,v 1.236 2008/03/15 18:40:17 marcus Exp $
+# $MCom: ports/x11/gnome2/Makefile,v 1.260 2008/11/27 02:18:33 marcus Exp $
#
PORTNAME= gnome2
-PORTVERSION= 2.22.3
-PORTREVISION?= 1
+PORTVERSION= 2.24.2
+PORTREVISION?= 0
CATEGORIES?= x11 gnome
MASTER_SITES= # empty
DISTFILES= # empty
@@ -18,7 +18,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT?= The "meta-port" for the GNOME 2 integrated X11 desktop
RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets \
- gnome-cd:${PORTSDIR}/audio/gnome-media \
+ gnome-audio-profiles-properties:${PORTSDIR}/audio/gnome-media \
gnome-dictionary:${PORTSDIR}/deskutils/gnome-utils \
eog:${PORTSDIR}/graphics/eog \
gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
@@ -38,27 +38,20 @@ RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple
gok:${PORTSDIR}/accessibility/gok \
nautilus-cd-burner:${PORTSDIR}/sysutils/nautilus-cd-burner \
gcalctool:${PORTSDIR}/math/gcalctool \
- gucharmap:${PORTSDIR}/deskutils/gucharmap \
- zenity:${PORTSDIR}/x11/zenity \
${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
${LOCALBASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnome-netstatus \
dasher:${PORTSDIR}/accessibility/dasher \
evolution:${PORTSDIR}/mail/evolution \
${LOCALBASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \
network-admin:${PORTSDIR}/sysutils/gnome-system-tools \
- gnome-nettool:${PORTSDIR}/net/gnome-nettool \
- vino-session:${PORTSDIR}/net/vino \
- exchange-connector-setup-2.22:${PORTSDIR}/mail/evolution-exchange \
+ vino-passwd:${PORTSDIR}/net/vino \
+ exchange-connector-setup-2.24:${PORTSDIR}/mail/evolution-exchange \
${LOCALBASE}/lib/gstreamer-0.10/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \
${LOCALBASE}/lib/gstreamer-0.10/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \
totem:${PORTSDIR}/multimedia/totem \
gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
- ${LOCALBASE}/share/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
- sound-juicer:${PORTSDIR}/audio/sound-juicer \
- ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-2.0.pc:${PORTSDIR}/www/libgtkhtml \
+ ${LOCALBASE}/share/gnome-background-properties/gnome-nature.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
evince:${PORTSDIR}/graphics/evince \
- ${LOCALBASE}/libexec/fast-user-switch-applet:${PORTSDIR}/x11/fast-user-switch-applet \
- ${LOCALBASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \
alacarte:${PORTSDIR}/deskutils/alacarte \
gnome-power-manager:${PORTSDIR}/sysutils/gnome-power-manager \
${LOCALBASE}/libexec/gnome-volume-manager:${PORTSDIR}/sysutils/gnome-volume-manager \
@@ -66,11 +59,9 @@ RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple
gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon \
seahorse:${PORTSDIR}/security/seahorse \
- swfdec-player:${PORTSDIR}/multimedia/swfdec-gnome \
mousetweaks:${PORTSDIR}/accessibility/mousetweaks \
- vinagre:${PORTSDIR}/net/vinagre \
- cheese:${PORTSDIR}/multimedia/cheese \
- ${LOCALBASE}/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi:${PORTSDIR}/sysutils/hal-info
+ ${LOCALBASE}/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi:${PORTSDIR}/sysutils/hal-info \
+ ${LOCALBASE}/share/sounds/freedesktop/index.theme:${PORTSDIR}/audio/freedesktop-sound-theme
NO_BUILD= yes
@@ -92,8 +83,18 @@ RUN_DEPENDS+= yelp:${PORTSDIR}/x11/yelp \
epiphany:${PORTSDIR}/www/epiphany
.endif
.if ${.CURDIR:T}!="gnome2-lite"
+RUN_DEPENDS+= empathy:${PORTSDIR}/net-im/empathy \
+ cheese:${PORTSDIR}/multimedia/cheese \
+ gucharmap:${PORTSDIR}/deskutils/gucharmap \
+ sound-juicer:${PORTSDIR}/audio/sound-juicer \
+ zenity:${PORTSDIR}/x11/zenity \
+ gnome-nettool:${PORTSDIR}/net/gnome-nettool \
+ swfdec-player:${PORTSDIR}/multimedia/swfdec-gnome \
+ vinagre:${PORTSDIR}/net/vinagre \
+ ${LOCALBASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \
+ ${LOCALBASE}/lib/hamster-applet/hamster-applet:${PORTSDIR}/deskutils/hamster-applet
.if ${ARCH} == "i386"
-RUN_DEPENDS+= tomboy:${PORTSDIR}/deskutils/tomboy
+#RUN_DEPENDS+= tomboy:${PORTSDIR}/deskutils/tomboy
.endif
.if ${OSVERSION}>=600000
RUN_DEPENDS+= ekiga:${PORTSDIR}/net/ekiga
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index d50e4ad2a054..71217e722faf 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -3,12 +3,12 @@
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
-# $MCom: ports/x11/libgnome/Makefile,v 1.115 2008/03/10 15:39:00 ahze Exp $
+# $MCom: ports/x11/libgnome/Makefile,v 1.123 2008/09/22 23:01:20 kwm Exp $
#
PORTNAME= libgnome
-PORTVERSION= 2.22.0
-PORTREVISION?= 1
+PORTVERSION= 2.24.1
+PORTREVISION?= 0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,7 +17,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Libraries for GNOME, a GNU desktop environment
-#USE_BZIP2= yes
+USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
@@ -54,6 +54,7 @@ GCONF_SCHEMAS= desktop_gnome_accessibility_keyboard.schemas \
desktop_gnome_peripherals_keyboard.schemas \
desktop_gnome_peripherals_mouse.schemas \
desktop_gnome_sound.schemas \
+ desktop_gnome_thumbnail_cache.schemas \
desktop_gnome_thumbnailers.schemas \
desktop_gnome_typing_break.schemas
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index 24ddd0fdd860..e5cf9bc925b2 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnome-2.22.0.tar.gz) = 556dea8d920cb0a20a852ea36c28b58b
-SHA256 (gnome2/libgnome-2.22.0.tar.gz) = 5992dcdc6fc0f5385c9b1e6254b7a9c1fb14dc6c53f24a029c818d6519407085
-SIZE (gnome2/libgnome-2.22.0.tar.gz) = 1954010
+MD5 (gnome2/libgnome-2.24.1.tar.bz2) = 3b2a30329898b37b2461b3aa886e5ad9
+SHA256 (gnome2/libgnome-2.24.1.tar.bz2) = 16c05ef6b1bbb057ceea512300de35f2d704609d7a3cacfd5301bc1a138e015a
+SIZE (gnome2/libgnome-2.24.1.tar.bz2) = 1416606
diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in
index 7d848a121482..f55e2fb51067 100644
--- a/x11/libgnome/files/pkg-deinstall.in
+++ b/x11/libgnome/files/pkg-deinstall.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $FreeBSD$
-# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.14 2008/01/28 17:41:05 mezz Exp $
+# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.17 2008/08/06 04:22:51 mezz Exp $
#
# Restore gconf keys of gnomevfs2.
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index cd55ecea0376..d65cdfdd8fa5 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -68,6 +68,7 @@ share/locale/ko/LC_MESSAGES/libgnome-2.0.mo
share/locale/ku/LC_MESSAGES/libgnome-2.0.mo
share/locale/lt/LC_MESSAGES/libgnome-2.0.mo
share/locale/lv/LC_MESSAGES/libgnome-2.0.mo
+share/locale/mai/LC_MESSAGES/libgnome-2.0.mo
share/locale/mg/LC_MESSAGES/libgnome-2.0.mo
share/locale/mk/LC_MESSAGES/libgnome-2.0.mo
share/locale/ml/LC_MESSAGES/libgnome-2.0.mo
@@ -92,10 +93,11 @@ 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@Latn/LC_MESSAGES/libgnome-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/libgnome-2.0.mo
share/locale/sr@ije/LC_MESSAGES/libgnome-2.0.mo
share/locale/sv/LC_MESSAGES/libgnome-2.0.mo
share/locale/ta/LC_MESSAGES/libgnome-2.0.mo
+share/locale/te/LC_MESSAGES/libgnome-2.0.mo
share/locale/th/LC_MESSAGES/libgnome-2.0.mo
share/locale/tr/LC_MESSAGES/libgnome-2.0.mo
share/locale/tt/LC_MESSAGES/libgnome-2.0.mo
@@ -121,6 +123,10 @@ share/pixmaps/backgrounds/gnome/background-default.jpg
@dirrmtry share/locale/xh
@dirrmtry share/locale/tt/LC_MESSAGES
@dirrmtry share/locale/tt
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/sr@ije/LC_MESSAGES
@dirrmtry share/locale/sr@ije
@dirrmtry share/locale/si/LC_MESSAGES
@@ -133,6 +139,8 @@ share/pixmaps/backgrounds/gnome/background-default.jpg
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/fur/LC_MESSAGES
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index f138a102a791..c44b33b8c0be 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -3,12 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/libgnomekbd/Makefile,v 1.19 2008/03/20 13:08:28 marcus Exp $
+# $MCom: ports/x11/libgnomekbd/Makefile,v 1.26 2008/09/23 05:27:25 mezz Exp $
#
PORTNAME= libgnomekbd
-PORTVERSION= 2.22.0
-PORTREVISION= 2
+PORTVERSION= 2.24.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -20,7 +19,7 @@ LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
USE_BZIP2= yes
-USE_GNOME= libgnomeui gnometarget gnomeprefix gnomehack ltverhack
+USE_GNOME= gnomeprefix gnomehack ltverhack gconf2 libglade2
USE_AUTOTOOLS= libtool:15
INSTALLS_ICONS= yes
USE_GETTEXT= yes
diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo
index a4d5c97e740a..32e53cb8becf 100644
--- a/x11/libgnomekbd/distinfo
+++ b/x11/libgnomekbd/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomekbd-2.22.0.tar.bz2) = a8b64278ae3471583607d734db9347eb
-SHA256 (gnome2/libgnomekbd-2.22.0.tar.bz2) = 84ca7c6703909bccab436d631d69675c9815899752ffdf2fe76102a620f723da
-SIZE (gnome2/libgnomekbd-2.22.0.tar.bz2) = 406083
+MD5 (gnome2/libgnomekbd-2.24.0.tar.bz2) = 43e4d090bc67a1984bebf551637783fd
+SHA256 (gnome2/libgnomekbd-2.24.0.tar.bz2) = 60f093b4fcbdfa12212d6e29dc2f7802a3234d8035f45efed4b426c0bb293c5a
+SIZE (gnome2/libgnomekbd-2.24.0.tar.bz2) = 411322
diff --git a/x11/libgnomekbd/pkg-plist b/x11/libgnomekbd/pkg-plist
index 5bcddd4508b4..5801f0641b34 100644
--- a/x11/libgnomekbd/pkg-plist
+++ b/x11/libgnomekbd/pkg-plist
@@ -9,11 +9,11 @@ include/libgnomekbd/gkbd-util.h
lib/libgnomekbd.a
lib/libgnomekbd.la
lib/libgnomekbd.so
-lib/libgnomekbd.so.2
+lib/libgnomekbd.so.3
lib/libgnomekbdui.a
lib/libgnomekbdui.la
lib/libgnomekbdui.so
-lib/libgnomekbdui.so.2
+lib/libgnomekbdui.so.3
libdata/pkgconfig/libgnomekbd.pc
libdata/pkgconfig/libgnomekbdui.pc
share/applications/gkbd-indicator-plugins-capplet.desktop
@@ -37,6 +37,7 @@ share/locale/fr/LC_MESSAGES/libgnomekbd.mo
share/locale/gl/LC_MESSAGES/libgnomekbd.mo
share/locale/gu/LC_MESSAGES/libgnomekbd.mo
share/locale/he/LC_MESSAGES/libgnomekbd.mo
+share/locale/hi/LC_MESSAGES/libgnomekbd.mo
share/locale/hu/LC_MESSAGES/libgnomekbd.mo
share/locale/it/LC_MESSAGES/libgnomekbd.mo
share/locale/ja/LC_MESSAGES/libgnomekbd.mo
@@ -47,8 +48,8 @@ share/locale/mk/LC_MESSAGES/libgnomekbd.mo
share/locale/ml/LC_MESSAGES/libgnomekbd.mo
share/locale/mr/LC_MESSAGES/libgnomekbd.mo
share/locale/nb/LC_MESSAGES/libgnomekbd.mo
-share/locale/nn/LC_MESSAGES/libgnomekbd.mo
share/locale/nl/LC_MESSAGES/libgnomekbd.mo
+share/locale/nn/LC_MESSAGES/libgnomekbd.mo
share/locale/oc/LC_MESSAGES/libgnomekbd.mo
share/locale/or/LC_MESSAGES/libgnomekbd.mo
share/locale/pa/LC_MESSAGES/libgnomekbd.mo
@@ -60,9 +61,10 @@ share/locale/si/LC_MESSAGES/libgnomekbd.mo
share/locale/sl/LC_MESSAGES/libgnomekbd.mo
share/locale/sq/LC_MESSAGES/libgnomekbd.mo
share/locale/sr/LC_MESSAGES/libgnomekbd.mo
-share/locale/sr@Latn/LC_MESSAGES/libgnomekbd.mo
+share/locale/sr@latin/LC_MESSAGES/libgnomekbd.mo
share/locale/sv/LC_MESSAGES/libgnomekbd.mo
share/locale/ta/LC_MESSAGES/libgnomekbd.mo
+share/locale/te/LC_MESSAGES/libgnomekbd.mo
share/locale/th/LC_MESSAGES/libgnomekbd.mo
share/locale/tr/LC_MESSAGES/libgnomekbd.mo
share/locale/uk/LC_MESSAGES/libgnomekbd.mo
@@ -72,9 +74,14 @@ share/locale/zh_HK/LC_MESSAGES/libgnomekbd.mo
share/locale/zh_TW/LC_MESSAGES/libgnomekbd.mo
@dirrm %%DATADIR%%/glade
@dirrm %%DATADIR%%
+@dirrmtry share/applications
@dirrm include/libgnomekbd
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/si/LC_MESSAGES
@dirrmtry share/locale/si
@dirrmtry share/locale/oc/LC_MESSAGES
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index b86345be051e..869959c7147e 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -3,12 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/x11/libgnomemm26/Makefile,v 1.16 2008/03/08 16:50:27 marcus Exp $
+# $MCom: ports/x11/libgnomemm26/Makefile,v 1.18 2008/09/22 11:12:42 kwm Exp $
#
PORTNAME= libgnomemm
-PORTVERSION= 2.22.0
-PORTREVISION= 2
+PORTVERSION= 2.24.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/libgnomemm26/distinfo b/x11/libgnomemm26/distinfo
index 1de4fb030c27..d3e15fb80280 100644
--- a/x11/libgnomemm26/distinfo
+++ b/x11/libgnomemm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomemm-2.22.0.tar.bz2) = a07209b2cfbc630f8c4d46b6a6f1db32
-SHA256 (gnome2/libgnomemm-2.22.0.tar.bz2) = f9d8f5d19a53ec1f0f709adff091b6ea9e5169a09114936ccc6493808b5ddfd0
-SIZE (gnome2/libgnomemm-2.22.0.tar.bz2) = 323427
+MD5 (gnome2/libgnomemm-2.24.0.tar.bz2) = e77dd1df8e2eb1652d28e30d7c5252a4
+SHA256 (gnome2/libgnomemm-2.24.0.tar.bz2) = ef3f8bd78bd17651dc336620c942c57f78ab0fd09ec6d50df27ea90aac6c0ffd
+SIZE (gnome2/libgnomemm-2.24.0.tar.bz2) = 311206
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index c23fef5dd692..f6e56312cb50 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -3,12 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/libxklavier/Makefile,v 1.39 2008/03/20 16:07:22 mezz Exp $
+# $MCom: ports/x11/libxklavier/Makefile,v 1.45 2008/09/07 00:58:39 marcus Exp $
#
PORTNAME= libxklavier
-PORTVERSION= 3.5
-PORTREVISION= 2
+PORTVERSION= 3.7
PORTEPOCH= 1
CATEGORIES= x11 gnome
MASTER_SITES= SF
@@ -17,13 +16,15 @@ MASTER_SITE_SUBDIR= gswitchit
MAINTAINER= gnome@FreeBSD.org
COMMENT= An utility library to make XKB stuff easier
-RUN_DEPENDS= xkbcomp:${PORTSDIR}/x11/xkbcomp
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+RUN_DEPENDS= xkbcomp:${PORTSDIR}/x11/xkbcomp \
+ ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
USE_XORG= x11 xkbfile
USE_GMAKE= yes
-USE_GNOME= gnometarget gnomehack libxml2 glib20
+USE_GNOME= gnomehack libxml2 glib20 ltverhack:12
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
+USE_AUTOTOOLS= libtool:15
CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --disable-doxygen \
--with-xkb-base=${LOCALBASE}/share/X11/xkb \
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index 2b2523958002..cf8a701a5c65 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,3 +1,3 @@
-MD5 (libxklavier-3.5.tar.gz) = d0625fdd7e22dbe382af40872fbbe77b
-SHA256 (libxklavier-3.5.tar.gz) = adac155e4d6be6b5bf6283eb265048e20c37c1caa49f39845532914151172706
-SIZE (libxklavier-3.5.tar.gz) = 448663
+MD5 (libxklavier-3.7.tar.gz) = 2a6029c6879c0c442528a4c9e9680870
+SHA256 (libxklavier-3.7.tar.gz) = b0acc8f89ea8af332ebbb4cd047c05f72989d92067f88096db6cbb2c93ae87ae
+SIZE (libxklavier-3.7.tar.gz) = 416044
diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist
index 493ca170ada0..53fb1e871e29 100644
--- a/x11/libxklavier/pkg-plist
+++ b/x11/libxklavier/pkg-plist
@@ -15,10 +15,10 @@ libdata/pkgconfig/libxklavier.pc
%%DOCSDIR%%/index.html
%%DOCSDIR%%/index.sgml
%%DOCSDIR%%/left.png
-%%DOCSDIR%%/libxklavier-XklConfigItem.html
-%%DOCSDIR%%/libxklavier-XklConfigRec.html
-%%DOCSDIR%%/libxklavier-XklConfigRegistry.html
-%%DOCSDIR%%/libxklavier-XklEngine.html
+%%DOCSDIR%%/XklConfigItem.html
+%%DOCSDIR%%/XklConfigRec.html
+%%DOCSDIR%%/XklConfigRegistry.html
+%%DOCSDIR%%/XklEngine.html
%%DOCSDIR%%/libxklavier-xklavier.html
%%DOCSDIR%%/libxklavier.devhelp
%%DOCSDIR%%/libxklavier.devhelp2
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index 1b0b97016526..d86ce102c670 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= pixman
-PORTVERSION= 0.10.0
-PORTREVISION= 2
+PORTVERSION= 0.12.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -15,6 +14,7 @@ COMMENT= Low-level pixel manipulation library
XORG_CAT= lib
USE_AUTOTOOLS= libtool:15
+USE_PERL5_BUILD=yes
USE_GNOME= ltverhack:9
post-patch:
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index a24f00bb7c13..e45e92f7d5db 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/pixman-0.10.0.tar.bz2) = fb23e17a8a0308e8fad6dc153753ba9a
-SHA256 (xorg/lib/pixman-0.10.0.tar.bz2) = 2b841f49b245948b8739e55f1b663687d5b33eb2767833574f9a1f0904a1d1e4
-SIZE (xorg/lib/pixman-0.10.0.tar.bz2) = 312275
+MD5 (xorg/lib/pixman-0.12.0.tar.bz2) = 494af78c1c7d825c9ad6815d7b91f17d
+SHA256 (xorg/lib/pixman-0.12.0.tar.bz2) = a82b54382a82c2fb42f7ad2c8f363e945602a5183f6df685b69a584d3b25b228
+SIZE (xorg/lib/pixman-0.12.0.tar.bz2) = 364262
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 93eb41194983..504dc0087f3d 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -3,12 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/yelp/Makefile,v 1.122 2008/03/09 21:51:58 mezz Exp $
+# $MCom: ports/x11/yelp/Makefile,v 1.129 2008/09/23 04:41:44 mezz Exp $
#
PORTNAME= yelp
-PORTVERSION= 2.22.1
-PORTREVISION= 1
+PORTVERSION= 2.24.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -34,6 +33,4 @@ MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
GCONF_SCHEMAS= yelp.schemas
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index 0cb3f4b7e4aa..95bed6317d13 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/yelp-2.22.1.tar.bz2) = a292c6712bb820e6aa2ade84ebdc9609
-SHA256 (gnome2/yelp-2.22.1.tar.bz2) = 6e990b35d914869dc82ada4790e2215ef71c884f6ccb8acf2e7a1c7d4b6f7614
-SIZE (gnome2/yelp-2.22.1.tar.bz2) = 995734
+MD5 (gnome2/yelp-2.24.0.tar.bz2) = 15eb2f538d970600c1e0a461f7d88b55
+SHA256 (gnome2/yelp-2.24.0.tar.bz2) = 7566177d23c3cac7725981f2d04de22923499318a067044158cff17f43957a0a
+SIZE (gnome2/yelp-2.24.0.tar.bz2) = 1023876
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index b55642d47706..f3a82cdf8807 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -30,6 +30,7 @@ share/locale/eu/LC_MESSAGES/yelp.mo
share/locale/fa/LC_MESSAGES/yelp.mo
share/locale/fi/LC_MESSAGES/yelp.mo
share/locale/fr/LC_MESSAGES/yelp.mo
+share/locale/fur/LC_MESSAGES/yelp.mo
share/locale/ga/LC_MESSAGES/yelp.mo
share/locale/gl/LC_MESSAGES/yelp.mo
share/locale/gu/LC_MESSAGES/yelp.mo
@@ -44,6 +45,7 @@ share/locale/ja/LC_MESSAGES/yelp.mo
share/locale/ka/LC_MESSAGES/yelp.mo
share/locale/kn/LC_MESSAGES/yelp.mo
share/locale/ko/LC_MESSAGES/yelp.mo
+share/locale/ks/LC_MESSAGES/yelp.mo
share/locale/ku/LC_MESSAGES/yelp.mo
share/locale/ky/LC_MESSAGES/yelp.mo
share/locale/li/LC_MESSAGES/yelp.mo
@@ -75,7 +77,7 @@ share/locale/sk/LC_MESSAGES/yelp.mo
share/locale/sl/LC_MESSAGES/yelp.mo
share/locale/sq/LC_MESSAGES/yelp.mo
share/locale/sr/LC_MESSAGES/yelp.mo
-share/locale/sr@Latn/LC_MESSAGES/yelp.mo
+share/locale/sr@latin/LC_MESSAGES/yelp.mo
share/locale/sv/LC_MESSAGES/yelp.mo
share/locale/ta/LC_MESSAGES/yelp.mo
share/locale/te/LC_MESSAGES/yelp.mo
@@ -133,6 +135,8 @@ share/locale/zu/LC_MESSAGES/yelp.mo
@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/si/LC_MESSAGES
@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@@ -151,6 +155,10 @@ share/locale/zu/LC_MESSAGES/yelp.mo
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/ks/LC_MESSAGES
+@dirrmtry share/locale/ks
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index dfac6ea55dcc..84c53c113d56 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -3,12 +3,11 @@
# Whom: Franz Klammer <klammer@webonaut.com>
#
# $FreeBSD$
-# $MCom: ports/x11/zenity/Makefile,v 1.90 2008/03/10 13:46:16 ahze Exp $
+# $MCom: ports/x11/zenity/Makefile,v 1.96 2008/09/23 15:27:31 kwm Exp $
#
PORTNAME= zenity
-PORTVERSION= 2.22.1
-PORTREVISION= 1
+PORTVERSION= 2.24.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index 759db273c7d1..432f18412c69 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/zenity-2.22.1.tar.bz2) = 4e1e1f080e7253ee4f6a5cee3306c78d
-SHA256 (gnome2/zenity-2.22.1.tar.bz2) = 6a3914b927970467efb5da938c57fbe9c4078cf088e1d2accab5488ff5cba4be
-SIZE (gnome2/zenity-2.22.1.tar.bz2) = 1845688
+MD5 (gnome2/zenity-2.24.0.tar.bz2) = aa4486482210856848fa7d6634fc126a
+SHA256 (gnome2/zenity-2.24.0.tar.bz2) = ad115104eb0a9007792380857030a49b508d300c46937e330ff2b4e70fb321a7
+SIZE (gnome2/zenity-2.24.0.tar.bz2) = 2236118
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index 3ccc853a415e..0be5035d2e48 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -25,6 +25,18 @@ share/gnome/help/zenity/bg/figures/zenity-question-screenshot.png
share/gnome/help/zenity/bg/figures/zenity-text-screenshot.png
share/gnome/help/zenity/bg/figures/zenity-warning-screenshot.png
share/gnome/help/zenity/bg/zenity.xml
+share/gnome/help/zenity/de/figures/zenity-calendar-screenshot.png
+share/gnome/help/zenity/de/figures/zenity-entry-screenshot.png
+share/gnome/help/zenity/de/figures/zenity-error-screenshot.png
+share/gnome/help/zenity/de/figures/zenity-fileselection-screenshot.png
+share/gnome/help/zenity/de/figures/zenity-information-screenshot.png
+share/gnome/help/zenity/de/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/de/figures/zenity-notification-screenshot.png
+share/gnome/help/zenity/de/figures/zenity-progress-screenshot.png
+share/gnome/help/zenity/de/figures/zenity-question-screenshot.png
+share/gnome/help/zenity/de/figures/zenity-text-screenshot.png
+share/gnome/help/zenity/de/figures/zenity-warning-screenshot.png
+share/gnome/help/zenity/de/zenity.xml
share/gnome/help/zenity/en_GB/figures/zenity-calendar-screenshot.png
share/gnome/help/zenity/en_GB/figures/zenity-entry-screenshot.png
share/gnome/help/zenity/en_GB/figures/zenity-error-screenshot.png
@@ -49,6 +61,18 @@ share/gnome/help/zenity/es/figures/zenity-question-screenshot.png
share/gnome/help/zenity/es/figures/zenity-text-screenshot.png
share/gnome/help/zenity/es/figures/zenity-warning-screenshot.png
share/gnome/help/zenity/es/zenity.xml
+share/gnome/help/zenity/fi/figures/zenity-calendar-screenshot.png
+share/gnome/help/zenity/fi/figures/zenity-entry-screenshot.png
+share/gnome/help/zenity/fi/figures/zenity-error-screenshot.png
+share/gnome/help/zenity/fi/figures/zenity-fileselection-screenshot.png
+share/gnome/help/zenity/fi/figures/zenity-information-screenshot.png
+share/gnome/help/zenity/fi/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/fi/figures/zenity-notification-screenshot.png
+share/gnome/help/zenity/fi/figures/zenity-progress-screenshot.png
+share/gnome/help/zenity/fi/figures/zenity-question-screenshot.png
+share/gnome/help/zenity/fi/figures/zenity-text-screenshot.png
+share/gnome/help/zenity/fi/figures/zenity-warning-screenshot.png
+share/gnome/help/zenity/fi/zenity.xml
share/gnome/help/zenity/fr/figures/zenity-calendar-screenshot.png
share/gnome/help/zenity/fr/figures/zenity-entry-screenshot.png
share/gnome/help/zenity/fr/figures/zenity-error-screenshot.png
@@ -171,11 +195,12 @@ share/locale/pt_BR/LC_MESSAGES/zenity.mo
share/locale/ro/LC_MESSAGES/zenity.mo
share/locale/ru/LC_MESSAGES/zenity.mo
share/locale/rw/LC_MESSAGES/zenity.mo
+share/locale/si/LC_MESSAGES/zenity.mo
share/locale/sk/LC_MESSAGES/zenity.mo
share/locale/sl/LC_MESSAGES/zenity.mo
share/locale/sq/LC_MESSAGES/zenity.mo
share/locale/sr/LC_MESSAGES/zenity.mo
-share/locale/sr@Latn/LC_MESSAGES/zenity.mo
+share/locale/sr@latin/LC_MESSAGES/zenity.mo
share/locale/sv/LC_MESSAGES/zenity.mo
share/locale/ta/LC_MESSAGES/zenity.mo
share/locale/te/LC_MESSAGES/zenity.mo
@@ -190,8 +215,10 @@ share/locale/zh_HK/LC_MESSAGES/zenity.mo
share/locale/zh_TW/LC_MESSAGES/zenity.mo
share/omf/zenity/zenity-C.omf
share/omf/zenity/zenity-bg.omf
+share/omf/zenity/zenity-de.omf
share/omf/zenity/zenity-en_GB.omf
share/omf/zenity/zenity-es.omf
+share/omf/zenity/zenity-fi.omf
share/omf/zenity/zenity-fr.omf
share/omf/zenity/zenity-oc.omf
share/omf/zenity/zenity-ru.omf
@@ -225,10 +252,14 @@ share/omf/zenity/zenity-uk.omf
@dirrm share/gnome/help/zenity/oc
@dirrm share/gnome/help/zenity/fr/figures
@dirrm share/gnome/help/zenity/fr
+@dirrm share/gnome/help/zenity/fi/figures
+@dirrm share/gnome/help/zenity/fi
@dirrm share/gnome/help/zenity/es/figures
@dirrm share/gnome/help/zenity/es
@dirrm share/gnome/help/zenity/en_GB/figures
@dirrm share/gnome/help/zenity/en_GB
+@dirrm share/gnome/help/zenity/de/figures
+@dirrm share/gnome/help/zenity/de
@dirrm share/gnome/help/zenity/bg/figures
@dirrm share/gnome/help/zenity/bg
@dirrm share/gnome/help/zenity/C/figures
@@ -242,6 +273,10 @@ share/omf/zenity/zenity-uk.omf
@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/oc/LC_MESSAGES