diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-09-18 06:49:37 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-09-18 06:49:37 +0000 |
| commit | 9c0caae1c20155b432bb0feb074a8fd9cc1c12bc (patch) | |
| tree | 534d0190982c831de589344c3003940ec6f2d6b1 /x11 | |
| parent | Followup commit: Unbreak XFree86-4-Server-snap on -stable -- gcc 2 has no (diff) | |
Update to GNOME 2.4.0. For all the goodies on what's changed, known issues,
future plans, etc., please see http://www.gnome.org/start/2.4/.
This commit represents work done by adamw, bland, and myself as well as
many other contributers:
Koop Mast <einekoai@chello.nl>
Akifyev Sergey <asa@gascom.ru>
Franz Klammer <klammer@webonaut.com>
Øyvind Kolbu <oyvind@kebab.gaffel.nu>
Thomas E. Zander <riggs@rrr.de>
Jeremy Messenger <mezz7@cox.net>
Without these contirbuters, and our faithful users, GNOME 2.4.0 would not
be possible.
Please check the FreeBSD GNOME site for any FreeBSD gotchas, as well as
general FAQs and documentation (GNOME 2.4 updates to be posted soon). The
best way to upgrade so that you get all shared library dependencies is:
portupgrade -rf -m BATCH=yes atk
portupgrade -R -m BATCH=yes gnome2
Approved by: portmgr (kris, will, myself implicitly)
Requested by: re as well as many other users
Diffstat (limited to 'x11')
81 files changed, 1303 insertions, 1312 deletions
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile index a7936f0e8f8a..1b1bbdd63130 100644 --- a/x11/gdm2/Makefile +++ b/x11/gdm2/Makefile @@ -6,7 +6,8 @@ # PORTNAME= gdm2 -PORTVERSION= 2.4.1.6 +PORTVERSION= 2.4.4.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 @@ -23,10 +24,12 @@ USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui librsvg2 GNU_CONFIGURE= yes USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" GDMDIR?= ${PREFIX}/etc/gdm +MAN1= gdm.1 + .include <bsd.port.pre.mk> .if exists(/usr/include/security/pam_misc.h) @@ -35,15 +38,6 @@ PLIST_SUB= PAM_MISC="" PLIST_SUB= PAM_MISC="@comment " .endif -.if !defined(BATCH) && !defined(PACKAGE_BUILDING) -IS_INTERACTIVE= yes -.endif - -.if !defined(BATCH) && !defined(PACKAGE_BUILDING) -pre-fetch: - ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL -.endif - post-extract: @${SED} -e "s,%%PREFIX%%,${PREFIX},g" \ ${FILESDIR}/gdm.sh.sample > ${WRKSRC}/gdm.sh.sample diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo index c864a5809534..2e71c2da729e 100644 --- a/x11/gdm2/distinfo +++ b/x11/gdm2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gdm-2.4.1.6.tar.bz2) = ef8cba099c650bd46661b764db2717bd +MD5 (gnome2/gdm-2.4.4.1.tar.bz2) = 50e5fd07bf1a15b1638f41787415f81c diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab index 10b04a198600..c3380dabafba 100644 --- a/x11/gdm2/files/patch-ab +++ b/x11/gdm2/files/patch-ab @@ -1,84 +1,47 @@ ---- config/gdm.conf.in.orig Fri Aug 23 18:53:53 2002 -+++ config/gdm.conf.in Sun Oct 13 17:57:14 2002 -@@ -33,14 +33,14 @@ - # The gdm configuration program that is run from the login screen, you should - # probably leave this alone - Configurator=@EXPANDED_GDMCONFIGDIR@/gdmsetup --disable-sound --disable-crash-dialog --GnomeDefaultSession=@EXPANDED_DATADIR@/gnome/default.session -+GnomeDefaultSession=@EXPANDED_DATADIR@/default.session - # The chooser program. Must output the chosen host on stdout, probably you - # should leave this alone - Chooser=@EXPANDED_BINDIR@/gdmchooser - # Default path to set. The profile scripts will likely override this - DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@ - # Default path for root. The profile scripts will likely override this --RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@ -+RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@ - DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm/Init - # Greeter for local (non-xdmcp) logins. Change gdmlogin to gdmgreeter to - # get the new graphical greeter. -@@ -57,7 +57,7 @@ +--- config/gdm.conf.in.orig Wed Aug 20 13:40:45 2003 ++++ config/gdm.conf.in Wed Aug 20 22:29:47 2003 +@@ -73,7 +73,7 @@ # To try to kill all clients started at greeter time or in the Init script. # doesn't always work, only if those clients have a window of their own - KillInitClients=true --LogDir=@EXPANDED_AUTHDIR@ + #KillInitClients=true +-LogDir=@EXPANDED_LOGDIR@ +LogDir=/var/log # You should probably never change this value unless you have a weird setup PidFile=/var/run/gdm.pid - PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/ -@@ -72,7 +72,7 @@ + # Note that a post login script is run before a PreSession script. +@@ -93,7 +93,7 @@ # Reboot, Halt and suspend commands, you can add different commands # separated by a semicolon and gdm will use the first one it can find - RebootCommand=/sbin/shutdown -r now;/usr/sbin/shutdown -r now --HaltCommand=/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now + #RebootCommand=/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now +-#HaltCommand=/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now +HaltCommand=/sbin/shutdown -p now;/usr/sbin/shutdown -p now - SuspendCommand= + #SuspendCommand= # Probably should not touch the below this is the standard setup ServAuthDir=@EXPANDED_AUTHDIR@ -@@ -84,16 +84,16 @@ - UserAuthFBDir=/tmp - UserAuthFile=.Xauthority - # The X server to use if we can't figure out what else to run. --StandardXServer=/usr/X11R6/bin/X -+StandardXServer=@EXPANDED_BINDIR@/X - # The maximum number of flexible X servers to run. - FlexibleXServers=5 - # the X nest command --Xnest=/usr/X11R6/bin/Xnest -name Xnest -+Xnest=@EXPANDED_BINDIR@/Xnest -name Xnest - # Automatic VT allocation. Right now only works on Linux. This way +@@ -123,7 +123,7 @@ # we force X to use specific vts. turn VTAllocation to false if this # is causing problems. - FirstVT=7 --VTAllocation=true + #FirstVT=7 +-#VTAllocation=true +VTAllocation=false - - [security] - # If any distributions ship with this one off, they should be shot -@@ -153,7 +153,7 @@ + # Should double login be treated with a warning (and possibility to change + # vts on linux systems for console logins) + #DoubleLoginWarning=true +@@ -200,7 +200,7 @@ # The 'theme'. By default we're using the default gtk theme # Of course assuming that gtk got installed in the same prefix, # if not change this. --GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk/gtkrc +-#GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk/gtkrc +GtkRC=@EXPANDED_DATADIR@/../themes/Default/gtk-2.0/gtkrc # Maximum size of an icon, larger icons are scaled down - MaxIconWidth=128 - MaxIconHeight=128 -@@ -281,7 +281,7 @@ - # Definition of the standard X server. - [server-Standard] - name=Standard server --command=/usr/X11R6/bin/X -+command=@EXPANDED_BINDIR@/X vt9 - flexible=true - - # To use this server type you should add -query host or -indirect host -@@ -289,7 +289,7 @@ - [server-Terminal] - name=Terminal server - # Add -terminate to make things behave more nicely --command=/usr/X11R6/bin/X -terminate -+command=@EXPANDED_BINDIR@/X -terminate - # Make this not appear in the flexible servers (we need extra params - # anyway, and terminate would be bad for xdmcp) - flexible=false + #MaxIconWidth=128 + #MaxIconHeight=128 +@@ -372,7 +372,7 @@ + # to the command line + [server-Chooser] + name=Chooser server +-command=@X_SERVER@ ++command=@X_SERVER@ vt9 + # Make this not appear in the flexible servers for now, but if you + # wish to allow a chooser server then make this true. This is the + # only way to make a flexible chooser server that behaves nicely. diff --git a/x11/gdm2/files/patch-at b/x11/gdm2/files/patch-at deleted file mode 100644 index 2e73a9b0b71f..000000000000 --- a/x11/gdm2/files/patch-at +++ /dev/null @@ -1,11 +0,0 @@ ---- utils/Makefile.in.orig Tue May 21 00:01:55 2002 -+++ utils/Makefile.in Tue May 21 00:02:20 2002 -@@ -160,7 +160,7 @@ - gdmmktemp_SOURCES = gdmmktemp.c - - --gdmaskpass_LDADD = $(INTLLIBS) -lpam -lpam_misc -+gdmaskpass_LDADD = $(INTLLIBS) -lpam - - - gdmopen_LDADD = $(INTLLIBS) diff --git a/x11/gdm2/files/patch-config_Makefile.in b/x11/gdm2/files/patch-config_Makefile.in deleted file mode 100644 index 0f65061f2425..000000000000 --- a/x11/gdm2/files/patch-config_Makefile.in +++ /dev/null @@ -1,101 +0,0 @@ ---- config/Makefile.in.orig Tue Aug 20 16:46:29 2002 -+++ config/Makefile.in Tue Aug 20 17:03:19 2002 -@@ -286,71 +286,73 @@ - fi - $(INSTALL_DATA) gdm.conf $(DESTDIR)$(confdir)/factory-gdm.conf - -- $(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing -+ if test '!' -f $(DESTDIR)$(confdir)/XKeepsCrashing; then \ -+ $(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing; \ -+ fi -+ $(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/factory-XKeepsCrashing - -- -if test -f $(DESTDIR)$(localedir)/locale.alias; then \ -- cp -f $(DESTDIR)$(localedir)/locale.alias $(DESTDIR)$(localedir)/locale.alias.orig; \ -+ if test '!' -f $(DESTDIR)$(localedir)/locale.alias; then \ -+ $(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/locale.alias; \ - fi -- $(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/locale.alias -+ $(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/factory-locale.alias - - if test '!' -d $(DESTDIR)$(sessdir); then \ - $(mkinstalldirs) $(DESTDIR)$(sessdir); \ - chmod 755 $(DESTDIR)$(sessdir); \ - fi - -- -if test -f $(DESTDIR)$(sessdir)/Xsession; then \ -- cp -f $(DESTDIR)$(sessdir)/Xsession $(DESTDIR)$(sessdir)/Xsession.orig; \ -+ if test '!' -f $(DESTDIR)$(sessdir)/Xsession; then \ -+ $(INSTALL_SCRIPT) Xsession $(DESTDIR)$(sessdir)/Xsession; \ - fi -- $(INSTALL_SCRIPT) Xsession $(DESTDIR)$(sessdir)/Xsession -+ $(INSTALL_SCRIPT) Xsession $(DESTDIR)$(sessdir)/factory-Xsession - -- -if test -f $(DESTDIR)$(sessdir)/Gnome; then \ -- cp -f $(DESTDIR)$(sessdir)/Gnome $(DESTDIR)$(sessdir)/Gnome.orig; \ -+ if test '!' -f $(DESTDIR)$(sessdir)/Gnome; then \ -+ $(INSTALL_SCRIPT) Gnome $(DESTDIR)$(sessdir)/Gnome; \ - fi -- $(INSTALL_SCRIPT) Gnome $(DESTDIR)$(sessdir)/Gnome -+ $(INSTALL_SCRIPT) Gnome $(DESTDIR)$(sessdir)/factory-Gnome - - -if test -f /usr/bin/switchdesk; then \ -- if test -f $(DESTDIR)$(sessdir)/Default; then \ -- cp -f $(DESTDIR)$(sessdir)/Default $(DESTDIR)$(sessdir)/Default.orig; \ -+ if test '!' -f $(DESTDIR)$(sessdir)/Default; then \ -+ $(LN_S) -f $(sessdir)/Xsession $(DESTDIR)$(sessdir)/Default; \ - fi; \ -- $(LN_S) -f Xsession $(DESTDIR)$(sessdir)/Default; \ - fi - - if test '!' -d $(DESTDIR)$(initdir); then \ - $(mkinstalldirs) $(DESTDIR)$(initdir); \ - chmod 755 $(DESTDIR)$(initdir); \ - fi -- -if test -f $(DESTDIR)$(initdir)/Default; then \ -- cp -f $(DESTDIR)$(initdir)/Default $(DESTDIR)$(initdir)/Default.orig; \ -+ if test '!' -f $(DESTDIR)$(initdir)/Default; then \ -+ $(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/Default; \ - fi -- $(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/Default -+ $(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/factory-Default - - if test '!' -d $(DESTDIR)$(predir); then \ - $(mkinstalldirs) $(DESTDIR)$(predir); \ - chmod 755 $(DESTDIR)$(predir); \ - fi -- -if test -f $(DESTDIR)$(predir)/Default; then \ -- cp -f $(DESTDIR)$(predir)/Default $(DESTDIR)$(predir)/Default.orig; \ -+ if test '!' -f $(DESTDIR)$(predir)/Default; then \ -+ $(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/Default; \ - fi -- $(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/Default -+ $(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/factory-Default - - if test '!' -d $(DESTDIR)$(postdir); then \ - $(mkinstalldirs) $(DESTDIR)$(postdir); \ - chmod 755 $(DESTDIR)$(postdir); \ - fi -- -if test -f $(DESTDIR)$(postdir)/Default; then \ -- cp -f $(DESTDIR)$(postdir)/Default $(DESTDIR)$(postdir)/Default.orig; \ -+ if test '!' -f $(DESTDIR)$(postdir)/Default; then \ -+ $(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/Default; \ - fi -- $(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/Default -+ $(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/factory-Default - - if test '!' -d $(DESTDIR)$(gnomercdir); then \ - $(mkinstalldirs) $(DESTDIR)$(gnomercdir); \ - chmod 755 $(DESTDIR)$(gnomercdir); \ - fi - -- -if test -f $(DESTDIR)$(gnomercdir)/gnomerc; then \ -- cp -f $(DESTDIR)$(gnomercdir)/gnomerc $(DESTDIR)$(gnomercdir)/gnomerc.orig; \ -+ if test '!' -f $(DESTDIR)$(gnomercdir)/gnomerc; then \ -+ $(INSTALL_SCRIPT) gnomerc $(DESTDIR)$(gnomercdir)/gnomerc; \ - fi -- $(INSTALL_SCRIPT) gnomerc $(DESTDIR)$(gnomercdir)/gnomerc -+ $(INSTALL_SCRIPT) gnomerc $(DESTDIR)$(gnomercdir)/factory-gnomerc - - if test '!' -d $(DESTDIR)$(authdir); then \ - $(mkinstalldirs) $(DESTDIR)$(authdir); \ diff --git a/x11/gdm2/files/patch-config_PostSession b/x11/gdm2/files/patch-config_PostSession deleted file mode 100644 index 98433e06673e..000000000000 --- a/x11/gdm2/files/patch-config_PostSession +++ /dev/null @@ -1,11 +0,0 @@ ---- config/PostSession.orig Wed Dec 4 14:05:13 2002 -+++ config/PostSession Wed Dec 4 14:05:34 2002 -@@ -2,7 +2,7 @@ - - PATH=/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin:$PATH - --if command -v sessreg > /dev/null 2>&1; then -+if /usr/bin/which -s sessreg > /dev/null 2>&1; then - sessreg -d -w /var/log/wtmp -u /var/run/utmp -x "$X_SERVERS" -h "$REMOTE_HOST" -l $DISPLAY $USER - fi - exit 0 diff --git a/x11/gdm2/files/patch-config_PreSession b/x11/gdm2/files/patch-config_PreSession deleted file mode 100644 index 4a37fa9db2f9..000000000000 --- a/x11/gdm2/files/patch-config_PreSession +++ /dev/null @@ -1,16 +0,0 @@ ---- config/PreSession.orig Wed Dec 4 14:05:38 2002 -+++ config/PreSession Wed Dec 4 14:06:04 2002 -@@ -8,11 +8,11 @@ - # - PATH=/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin:$PATH - --if command -v xsetroot > /dev/null 2>&1; then -+if /usr/bin/which -s xsetroot > /dev/null 2>&1; then - xsetroot -cursor_name left_ptr -solid "#363047" - fi - --if command -v sessreg > /dev/null 2>&1; then -+if /usr/bin/which -s sessreg > /dev/null 2>&1; then - # some output for easy debugging - echo "$0: Registering your session with wtmp and utmp" - echo "$0: running: sessreg -a -w /var/log/wtmp -u /var/run/utmp -x \"$X_SERVERS\" -h \"$REMOTE_HOST\" -l $DISPLAY $USER" diff --git a/x11/gdm2/files/patch-config_locale.alias b/x11/gdm2/files/patch-config_locale.alias index c29dfa7f5bcb..45001031a696 100644 --- a/x11/gdm2/files/patch-config_locale.alias +++ b/x11/gdm2/files/patch-config_locale.alias @@ -1,5 +1,5 @@ ---- config/locale.alias.orig Sat Mar 15 05:31:02 2003 -+++ config/locale.alias Mon May 5 21:44:02 2003 +--- config/locale.alias.orig Thu May 15 22:56:46 2003 ++++ config/locale.alias Mon Sep 15 23:41:05 2003 @@ -14,76 +14,36 @@ # # - George @@ -83,30 +83,30 @@ +Croatian hr_HR.UTF-8,hr_HR.ISO_8859-2 +Czech cs_CZ.UTF-8,cs_CZ.ISO_8859-2 +Danish da_DK.UTF-8,da_DK.ISO_8859-1 -+Dutch nl_NL.UTF-8,nl_NL.ISO_8859-1 ++Dutch nl_NL.UTF-8,nl_NL.ISO_8859-15 +Estonian et_EE.UTF-8,et_EE.ISO_8859-15 +English(American) en_US.UTF-8,en_US.ISO_8859-1 +English(Australian) en_AU.UTF-8,en_AU.ISO_8859-1 +English(British) en_GB.UTF-8,en_GB.ISO_8859-1 -+Finnish fi_FI.UTF-8,fi_FI.ISO_8859-1 -+French fr_FR.UTF-8,fr_FR.ISO_8859-1 -+German de_DE.UTF-8,de_DE.ISO_8859-1 ++Finnish fi_FI.UTF-8,fi_FI.ISO_8859-15 ++French fr_FR.UTF-8,fr_FR.ISO_8859-15 ++German de_DE.UTF-8,de_DE.ISO_8859-15 +Greek el_GR.UTF-8,el_GR.ISO_8859-7 +Hungarian hu_HU.UTF-8,hu_HU.ISO_8859-2 +Icelandic is_IS.UTF-8,is_IS.ISO_8859-1 -+Italian it_IT.UTF-8,it_IT.ISO_8859-1 ++Italian it_IT.UTF-8,it_IT.ISO_8859-15 +Japanese ja_JP.UTF-8,ja_JP.EUC +Korean ko_KR.UTF-8,ko_KR.EUC +Lithuanian lt_LT.UTF-8,lt_LT.ISO_8859-4 +Norwegian(bokmal) no_NO.UTF-8,no_NO.ISO_8859-1 +Polish pl_PL.UTF-8,pl_PL.ISO_8859-2 -+Portuguese pt_PT.UTF-8,pt_PT.ISO_8859-1 ++Portuguese pt_PT.UTF-8,pt_PT.ISO_8859-15 +Portuguese(Brazilian) pt_BR.UTF-8,pt_BR.ISO8859-1 +Romanian ro_RO.UTF-8,ro_RO.ISO8859-2 +Russian ru_RU.UTF-8,ru_RU.ISO_8859-5 +Slovak sk_SK.UTF-8,sk_SK.ISO_8859-2 +Slovenian sl_SI.UTF-8,sl_SI.ISO_8859-2 -+Spanish es_ES.UTF-8,es_ES.ISO_8859-1 ++Spanish es_ES.UTF-8,es_ES.ISO_8859-15 +Swedish sv_SE.UTF-8,sv_SE.ISO_8859-1 +Turkish tr_TR.UTF-8,tr_TR.ISO_8859-9 +Ukrainian uk_UA.UTF-8,uk_UA.ISO8859-5 diff --git a/x11/gdm2/files/patch-configure b/x11/gdm2/files/patch-configure index e6e122ab8c2d..cbbc44334163 100644 --- a/x11/gdm2/files/patch-configure +++ b/x11/gdm2/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon May 5 12:32:19 2003 -+++ configure Mon May 5 21:45:38 2003 -@@ -9772,6 +9772,8 @@ +--- configure.orig Sat Jun 28 18:15:07 2003 ++++ configure Sat Jun 28 18:15:08 2003 +@@ -20222,6 +20222,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ diff --git a/x11/gdm2/files/patch-daemon_gdm.c b/x11/gdm2/files/patch-daemon_gdm.c index 76c115f8b982..787890f2a06e 100644 --- a/x11/gdm2/files/patch-daemon_gdm.c +++ b/x11/gdm2/files/patch-daemon_gdm.c @@ -1,6 +1,6 @@ ---- daemon/gdm.c.orig Thu May 30 11:02:29 2002 -+++ daemon/gdm.c Thu May 30 10:59:19 2002 -@@ -36,7 +36,7 @@ +--- daemon/gdm.c.orig Wed Jun 25 17:04:49 2003 ++++ daemon/gdm.c Sat Jun 28 18:17:44 2003 +@@ -38,7 +38,7 @@ #include <locale.h> /* This should be moved to auth.c I suppose */ diff --git a/x11/gdm2/files/patch-daemon_slave.c b/x11/gdm2/files/patch-daemon_slave.c deleted file mode 100644 index 27ac0544a6df..000000000000 --- a/x11/gdm2/files/patch-daemon_slave.c +++ /dev/null @@ -1,12 +0,0 @@ ---- daemon/slave.c.orig Wed Sep 18 02:25:09 2002 -+++ daemon/slave.c Wed Sep 18 02:25:15 2002 -@@ -2327,7 +2327,8 @@ - if (setusercontext (NULL, pwent, pwent->pw_uid, - LOGIN_SETLOGIN | LOGIN_SETPATH | - LOGIN_SETPRIORITY | LOGIN_SETRESOURCES | -- LOGIN_SETUMASK | LOGIN_SETUSER) < 0) -+ LOGIN_SETUMASK | LOGIN_SETUSER | -+ LOGIN_SETENV) < 0) - gdm_child_exit (DISPLAY_REMANAGE, - _("%s: setusercontext() failed for %s. " - "Aborting."), "gdm_slave_session_start", diff --git a/x11/gdm2/files/patch-gui::gdmsetup.c b/x11/gdm2/files/patch-gui::gdmsetup.c deleted file mode 100644 index 33924be670f7..000000000000 --- a/x11/gdm2/files/patch-gui::gdmsetup.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gui/gdmsetup.c.orig Sun Aug 4 16:08:52 2002 -+++ gui/gdmsetup.c Sun Aug 4 16:09:09 2002 -@@ -1512,7 +1512,7 @@ - success = TRUE; - - /* HACK! */ -- cmd = g_strdup_printf ("/bin/chown -R root.root %s", dir); -+ cmd = g_strdup_printf ("/usr/sbin/chown -R gdm:gdm %s", dir); - system (cmd); - g_free (cmd); - diff --git a/x11/gdm2/files/patch-gui_gdmphotosetup.c b/x11/gdm2/files/patch-gui_gdmphotosetup.c deleted file mode 100644 index 6121bdf93f9f..000000000000 --- a/x11/gdm2/files/patch-gui_gdmphotosetup.c +++ /dev/null @@ -1,10 +0,0 @@ ---- gui/gdmphotosetup.c.orig Mon May 5 21:47:14 2003 -+++ gui/gdmphotosetup.c Mon May 5 21:47:39 2003 -@@ -22,6 +22,7 @@ - #include <libgnome/libgnome.h> - #include <libgnomeui/libgnomeui.h> - #include <sys/types.h> -+#include <signal.h> - #include <sys/stat.h> - #include <fcntl.h> - #include <errno.h> diff --git a/x11/gdm2/files/patch-ltmain.sh b/x11/gdm2/files/patch-ltmain.sh index c99e4f3bc218..04395ca76c1d 100644 --- a/x11/gdm2/files/patch-ltmain.sh +++ b/x11/gdm2/files/patch-ltmain.sh @@ -1,5 +1,5 @@ ---- ltmain.sh.orig Tue Jul 1 14:15:27 2003 -+++ ltmain.sh Fri Aug 1 15:54:24 2003 +--- ltmain.sh.orig Tue Jun 24 14:39:01 2003 ++++ ltmain.sh Sat Jun 28 18:20:02 2003 @@ -1280,7 +1280,7 @@ esac elif test "X$arg" = "X-lc_r"; then diff --git a/x11/gdm2/pkg-install b/x11/gdm2/pkg-install index e373a44e33ca..b8f29b328edf 100644 --- a/x11/gdm2/pkg-install +++ b/x11/gdm2/pkg-install @@ -40,7 +40,3 @@ if [ "$2" = "POST-INSTALL" ]; then ${CHMOD} 0750 ${PKG_PREFIX}/share/gnome/gdm exit 0 fi - -if [ -z "${BATCH}" ]; then - /usr/bin/dialog --yesno "GDM may contain vulnerabilities leading local root compromise, and it is reported widely with various security sites and groups. It is not recommended that this port be installed in public environment. Do you wish to accept the security risk and build GDM anyway?" 10 60 || /usr/bin/false -fi diff --git a/x11/gdm2/pkg-message b/x11/gdm2/pkg-message index 91ce3698bdce..6f3b7dcba333 100644 --- a/x11/gdm2/pkg-message +++ b/x11/gdm2/pkg-message @@ -1,20 +1,25 @@ GDM is installed. -Please note the following: -- This port has been tested on 5.0-CURRENT and 4.4-RELEASE and higher. -- If you are running a version of FreeBSD prior to 4.5-PRERELEASE, you should - append these lines to your /etc/pam.conf, otherwise GDM will refuse all - logins: +Do _NOT_ use /etc/ttys to start gdm at boot time. This will result in gdm +hanging or restarting constantly. Instead, copy the included gdm.sh.sample +script to gdm.sh, and restart. This script is found, by default, in +/usr/X11R6/etc/rc.d. -# gdm config -gdm auth requisite pam_unix.so try_first_pass -gdm account requisite pam_unix.so try_first_pass -gdm session required pam_permit.so +GDM uses its own locale.alias file to determine its language and especially +the GNOME-2 fontencoding. This file is located, by default, in +/usr/X11R6/etc/gdm/locale.alias. By default, the character set for every +county using the EURO currency is set to ISO8859-15 in order to enable the +EURO sign. If you don't feel comfortable with this, edit this file according +to your preferences. -- Do _NOT_ use /etc/ttys to start gdm at boot time. This will result in gdm - hanging or restarting constantly. Instead, copy the included gdm.sh.sample - script to gdm.sh, and restart. This script is found, by default, in - /usr/X11R6/etc/rc.d. +If you are running 5.x and you are running 5.1-RELEASE or earlier, GDM will +fail to work due to a bug in OpenPAM. You can download a patch from +http://www.FreeBSD.org/~marcus/pam_get_user.c.diff. You must also have the +FreeBSD src tree on your system. Do the following to apply the patch: -These notes were written by: Yukihiro Nakai <nakai@FreeBSD.org> -and updated by: Joe Marcus Clarke <marcus@FreeBSD.org> +# cd /usr +# patch -p < /path/to/pam_get_user.c.diff + + +Then rebuild and install world. Note, this bug does _NOT_ affect FreeBSD +4.x. diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist index 2068ea98c795..d5a0e5916241 100644 --- a/x11/gdm2/pkg-plist +++ b/x11/gdm2/pkg-plist @@ -6,42 +6,35 @@ bin/gdmchooser bin/gdmflexiserver bin/gdmgreeter bin/gdmlogin -bin/gdmmktemp bin/gdmphotosetup bin/gdmsetup bin/gdmthemetester -@unexec if cmp -s %D/etc/gdm/Init/Default %D/etc/gdm/Init/factory-Default; then rm -f %D/etc/gdm/Init/Default; fi -etc/gdm/Init/factory-Default -@exec [ -f %B/Default ] || cp %B/%f %B/Default -@unexec if cmp -s %D/etc/gdm/PostSession/Default %D/etc/gdm/PostSession/factory-Default; then rm -f %D/etc/gdm/PostSession/Default; fi -etc/gdm/PostSession/factory-Default -@exec [ -f %B/Default ] || cp %B/%f %B/Default -@unexec if cmp -s %D/etc/gdm/PreSession/Default %D/etc/gdm/PreSession/factory-Default; then rm -f %D/etc/gdm/PreSession/Default; fi -etc/gdm/PreSession/factory-Default -@exec [ -f %B/Default ] || cp %B/%f %B/Default -@unexec if cmp -s %D/etc/gdm/Sessions/Gnome %D/etc/gdm/Sessions/factory-Gnome; then rm -f %D/etc/gdm/Sessions/Gnome; fi -etc/gdm/Sessions/factory-Gnome -@exec [ -f %B/Gnome ] || cp %B/%f %B/Gnome -@unexec if cmp -s %D/etc/gdm/Sessions/Xsession %D/etc/gdm/Sessions/factory-Xsession; then rm -f %D/etc/gdm/Sessions/Xsession; fi -etc/gdm/Sessions/factory-Xsession -@exec [ -f %B/Xsession ] || cp %B/%f %B/Xsession -@unexec if cmp -s %D/etc/gdm/XKeepsCrashing %D/etc/gdm/factory-XKeepsCrashing; then rm -f %D/etc/gdm/XKeepsCrashing; fi -etc/gdm/factory-XKeepsCrashing -@exec [ -f %B/XKeepsCrashing ] || cp %B/%f %B/XKeepsCrashing -@unexec if cmp -s %D/etc/gdm/gnomerc %D/etc/gdm/factory-gnomerc; then rm -f %D/etc/gdm/gnomerc; fi -etc/gdm/factory-gnomerc -@exec [ -f %B/gnomerc ] || cp %B/%f %B/gnomerc +etc/dm/Sessions/Default.desktop +etc/dm/Sessions/gnome.desktop +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/gdm.conf %D/etc/gdm/factory-gdm.conf; then rm -f %D/etc/gdm/gdm.conf; fi etc/gdm/factory-gdm.conf @exec [ -f %B/gdm.conf ] || cp %B/%f %B/gdm.conf -@unexec if cmp -s %D/etc/gdm/locale.alias %D/etc/gdm/factory-locale.alias; then rm -f %D/etc/gdm/locale.alias; fi -etc/gdm/factory-locale.alias -@exec [ -f %B/locale.alias ] || cp %B/%f %B/locale.alias +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/rc.d/gdm.sh.sample +lib/gtk-2.0/modules/libdwellmouselistener.so +lib/gtk-2.0/modules/libkeymouselistener.so +%%PAM_MISC%%libexec/gdmaskpass +libexec/gdmtranslate sbin/gdm-restart sbin/gdm-safe-restart sbin/gdm-stop -%%PAM_MISC%%sbin/gdmaskpass sbin/gdmconfig share/gnome/applications/gdmflexiserver-xnest.desktop share/gnome/applications/gdmflexiserver.desktop @@ -49,6 +42,15 @@ share/gnome/applications/gdmsetup.desktop share/gnome/capplets/gdmphotosetup.desktop share/gnome/gdm/gdmchooser.glade share/gnome/gdm/gdmsetup.glade +share/gnome/gdm/themes/happygnome-list/GdmGreeterTheme.desktop +share/gnome/gdm/themes/happygnome-list/background.svg +share/gnome/gdm/themes/happygnome-list/disconnect.png +share/gnome/gdm/themes/happygnome-list/gnome-logo.png +share/gnome/gdm/themes/happygnome-list/happygnome.xml +share/gnome/gdm/themes/happygnome-list/options.png +share/gnome/gdm/themes/happygnome-list/screenshot.png +share/gnome/gdm/themes/happygnome-list/session.png +share/gnome/gdm/themes/happygnome-list/system.png share/gnome/gdm/themes/happygnome/GdmGreeterTheme.desktop share/gnome/gdm/themes/happygnome/background.svg share/gnome/gdm/themes/happygnome/disconnect.png @@ -65,6 +67,10 @@ share/gnome/gdm/themes/circles/flower.png share/gnome/gdm/themes/circles/help.png share/gnome/gdm/themes/circles/options.png share/gnome/gdm/themes/circles/screenshot.png +share/gnome/help/gdm/C/gdm.xml +share/gnome/help/gdm/C/legal.xml +share/gnome/omf/gdm/gdm-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gdm-foot-logo.png share/gnome/pixmaps/gdm.png share/gnome/pixmaps/login-photo.png @@ -78,6 +84,7 @@ share/locale/bg/LC_MESSAGES/gdm-2.4.mo share/locale/bn/LC_MESSAGES/gdm-2.4.mo share/locale/ca/LC_MESSAGES/gdm-2.4.mo share/locale/cs/LC_MESSAGES/gdm-2.4.mo +share/locale/cy/LC_MESSAGES/gdm-2.4.mo share/locale/da/LC_MESSAGES/gdm-2.4.mo share/locale/de/LC_MESSAGES/gdm-2.4.mo share/locale/el/LC_MESSAGES/gdm-2.4.mo @@ -112,6 +119,7 @@ share/locale/ro/LC_MESSAGES/gdm-2.4.mo share/locale/ru/LC_MESSAGES/gdm-2.4.mo share/locale/sk/LC_MESSAGES/gdm-2.4.mo share/locale/sl/LC_MESSAGES/gdm-2.4.mo +share/locale/sq/LC_MESSAGES/gdm-2.4.mo share/locale/sr/LC_MESSAGES/gdm-2.4.mo share/locale/sr@Latn/LC_MESSAGES/gdm-2.4.mo share/locale/sv/LC_MESSAGES/gdm-2.4.mo @@ -123,7 +131,13 @@ share/locale/vi/LC_MESSAGES/gdm-2.4.mo share/locale/wa/LC_MESSAGES/gdm-2.4.mo share/locale/zh_CN/LC_MESSAGES/gdm-2.4.mo share/locale/zh_TW/LC_MESSAGES/gdm-2.4.mo +@dirrm share/gnome/omf/gdm +@dirrm share/gnome/help/gdm/C @dirrm share/gnome/gdm/themes/happygnome +@dirrm share/gnome/gdm/themes/happygnome-list @dirrm share/gnome/gdm/themes/circles @dirrm share/gnome/gdm/themes @dirrm etc/pam.d +@dirrm etc/gdm/modules +@unexec /bin/rmdir %D/etc/dm 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-C.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 9bef6cc276b8..0a07d795a9cc 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomeapplets2 -PORTVERSION= 2.2.2 -PORTREVISION= 3 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-applets/2.2 +MASTER_SITE_SUBDIR= sources/gnome-applets/2.4 DISTNAME= gnome-applets-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo index e16c408d8425..52d4f73acccc 100644 --- a/x11/gnome-applets/distinfo +++ b/x11/gnome-applets/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-applets-2.2.2.tar.bz2) = d8a8fdbae66274bab4a309073d2072ab +MD5 (gnome2/gnome-applets-2.4.0.tar.bz2) = c17dba203ea379af5da056862672026c diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa index ffe06143e3f0..7c9edcd6d43a 100644 --- a/x11/gnome-applets/files/patch-aa +++ b/x11/gnome-applets/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Mon Dec 16 17:15:36 2002 -+++ configure Thu Dec 19 13:43:27 2002 -@@ -7862,6 +7862,7 @@ +--- configure.orig Sun Jun 1 13:55:59 2003 ++++ configure Mon Jun 2 02:36:19 2003 +@@ -7863,6 +7863,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,7 +8,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -12328,6 +12329,7 @@ +@@ -11202,6 +11203,7 @@ *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";; *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";; *netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";; @@ -16,28 +16,7 @@ *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;; esac case "$host" in -@@ -12391,6 +12393,20 @@ - fi - - ;; -+ i386-*-freebsd*) -+ HAVE_LIBAPM=no -+if test "x$HAVE_LIBAPM" = "xyes"; then -+ HAVE_LIBAPM_TRUE= -+ HAVE_LIBAPM_FALSE='#' -+else -+ HAVE_LIBAPM_TRUE='#' -+ HAVE_LIBAPM_FALSE= -+fi -+ ;; -+ *-*-freebsd*) -+ build_battstat_applet=no -+ -+ ;; - *-*-linux*) - echo "$as_me:$LINENO: checking for apm_read in -lapm" >&5 - echo $ECHO_N "checking for apm_read in -lapm... $ECHO_C" >&6 -@@ -13688,14 +13704,14 @@ +@@ -12771,14 +12773,14 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" cat >>confdefs.h <<_ACEOF diff --git a/x11/gnome-applets/files/patch-battstat_Makefile.in b/x11/gnome-applets/files/patch-battstat_Makefile.in index f47e6bab6dae..1908749369cb 100644 --- a/x11/gnome-applets/files/patch-battstat_Makefile.in +++ b/x11/gnome-applets/files/patch-battstat_Makefile.in @@ -1,21 +1,21 @@ ---- battstat/Makefile.in.orig Thu Dec 19 13:50:27 2002 -+++ battstat/Makefile.in Thu Dec 19 13:51:02 2002 -@@ -148,11 +148,11 @@ +--- battstat/Makefile.in.orig Sun Jun 29 16:43:23 2003 ++++ battstat/Makefile.in Sun Jun 29 16:45:10 2003 +@@ -146,11 +146,11 @@ pixmapsdir = $(datadir)/pixmaps pixmaps_DATA = battstat.png - @HAVE_LIBAPM_TRUE@APMLIB = @HAVE_LIBAPM_TRUE@-lapm --@HAVE_LIBAPM_FALSE@APMLIB = @HAVE_LIBAPM_FALSE@apmlib/libapm.a -+@HAVE_LIBAPM_FALSE@APMLIB = + @HAVE_LIBAPM_TRUE@APMLIB = -lapm +-@HAVE_LIBAPM_FALSE@APMLIB = apmlib/libapm.a ++@HAVE_LIBAPM_FALSE@APMLIB = @HAVE_LIBAPM_TRUE@APMDIR = --@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_FALSE@apmlib -+@HAVE_LIBAPM_FALSE@APMDIR = +-@HAVE_LIBAPM_FALSE@APMDIR = apmlib ++@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_TRUE@APMINC = --@HAVE_LIBAPM_FALSE@APMINC = @HAVE_LIBAPM_FALSE@-Iapmlib/ -+@HAVE_LIBAPM_FALSE@APMINC = +-@HAVE_LIBAPM_FALSE@APMINC = -Iapmlib/ ++@HAVE_LIBAPM_FALSE@APMINC = SUBDIRS = docs sounds $(APMDIR) -@@ -223,8 +223,7 @@ +@@ -199,8 +199,7 @@ @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = \ @HAVE_LIBAPM_TRUE@$(top_builddir)/screen-exec/libscreen-exec.la @HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES = \ diff --git a/x11/gnome-applets/files/patch-charpick_charpick.c b/x11/gnome-applets/files/patch-charpick_charpick.c new file mode 100644 index 000000000000..7d0ee91eb476 --- /dev/null +++ b/x11/gnome-applets/files/patch-charpick_charpick.c @@ -0,0 +1,11 @@ +--- charpick/charpick.c.orig Wed Sep 10 13:33:00 2003 ++++ charpick/charpick.c Wed Sep 10 13:33:19 2003 +@@ -3,7 +3,7 @@ + */ + + #include <config.h> +-#ifndef sun ++#if !defined(sun) && !defined(__FreeBSD__) + #include <tgmath.h> + #endif + #include <panel-applet.h> diff --git a/x11/gnome-applets/files/patch-gweather::Locations b/x11/gnome-applets/files/patch-gweather::Locations deleted file mode 100644 index 3e14e26d8de3..000000000000 --- a/x11/gnome-applets/files/patch-gweather::Locations +++ /dev/null @@ -1,35 +0,0 @@ - -$FreeBSD$ - ---- gweather/Locations.orig Wed May 15 00:32:46 2002 -+++ gweather/Locations Tue May 21 19:00:43 2002 -@@ -1588,7 +1588,7 @@ - - [EU] - name=Europe --states=AB OS BE BA BG CZ HR CY DK EE FI FR MK DE GI GR HU IE IS IT LV LT LU MT MD NL NO PL PT RO RU SK SI SP SE CH TR UK YU -+states=AB OS BE BA BG CZ HR CY DK EE FI FR MK DE GI GR HU IE IS IT LV LT LU MT MD NL NO PL PT RO RU SK SI SP SE CH TR UA UK YU - - [EU_AB] - name=Albania -@@ -1857,6 +1857,20 @@ - loc50=Yakutsk UEEE ------ --- - loc51=Yekaterinburg USSS ------ --- - loc52=Yuzhno-Sakhalinsk UHSS ------ --- -+ -+[EU_UA] -+name=Ukraine -+loc0=Kiev UKBB ------ --- -+loc1=Donetsk UKCC ------ --- -+loc2=Dnepropetrovsk UKDD ------ --- -+loc3=Krivoy\\ Rog UKDR ------ --- -+loc4=Simferopol UKFF ------ --- -+loc5=Kharkov UKHH ------ --- -+loc6=Ivano-frankovsk UKLI ------ --- -+loc7=Lvov UKLL ------ --- -+loc8=Rovno UKLR ------ --- -+loc9=Uzhgorod UKLU ------ --- -+loc10=Odessa UKOO ------ --- - - [EU_SK] - name=Slovakia diff --git a/x11/gnome-applets/files/patch-stickynotes_Makefile.in b/x11/gnome-applets/files/patch-stickynotes_Makefile.in new file mode 100644 index 000000000000..973b7e342c3e --- /dev/null +++ b/x11/gnome-applets/files/patch-stickynotes_Makefile.in @@ -0,0 +1,11 @@ +--- stickynotes/Makefile.in.orig Thu Aug 28 01:00:09 2003 ++++ stickynotes/Makefile.in Thu Aug 28 01:00:26 2003 +@@ -142,7 +142,7 @@ + + SUBDIRS = pixmaps docs + +-CFLAGS = -Wall -g ++CFLAGS += -Wall -g + + INCLUDES = -I. -I$(srcdir) $(GNOME_APPLETS_CFLAGS) $(LIBGLADE_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DSTICKYNOTES_GLADEDIR=\"$(gladedir)\" -DSTICKYNOTES_ICONDIR=\"$(icondir)\" + diff --git a/x11/gnome-applets/files/patch-wireless_wireless-applet.c b/x11/gnome-applets/files/patch-wireless_wireless-applet.c index 3b247a47b947..5c1e32e88b09 100644 --- a/x11/gnome-applets/files/patch-wireless_wireless-applet.c +++ b/x11/gnome-applets/files/patch-wireless_wireless-applet.c @@ -1,6 +1,6 @@ ---- wireless/wireless-applet.c.orig Mon May 19 00:50:43 2003 -+++ wireless/wireless-applet.c Wed Aug 20 12:12:05 2003 -@@ -30,12 +30,27 @@ +--- wireless/wireless-applet.c.orig Sat Aug 23 09:10:54 2003 ++++ wireless/wireless-applet.c Thu Aug 28 00:44:16 2003 +@@ -30,12 +30,25 @@ #include <math.h> #include <dirent.h> @@ -10,10 +10,8 @@ +#include <net/if.h> +#include <net/if_var.h> +#include <dev/an/if_aironet_ieee.h> -+#if __FreeBSD_version >= 460100 +#include <dev/wi/if_wavelan_ieee.h> +#endif -+#endif + #include <gnome.h> #include <panel-applet.h> @@ -28,32 +26,33 @@ #define CFG_UPDATE_INTERVAL 2 typedef enum { -@@ -93,6 +108,14 @@ +@@ -89,6 +102,12 @@ WirelessApplet *applet); static void wireless_applet_about_cb (BonoboUIComponent *uic, WirelessApplet *applet); +#ifdef __FreeBSD__ +static int an_getval(WirelessApplet *applet, char *device, struct an_req *areq); +static void get_an_data(WirelessApplet *applet, char *device, long int *level); -+#if __FreeBSD_version >= 460100 +static int wi_getval(WirelessApplet *applet, char *device, struct wi_req *areq); +static void get_wi_data(WirelessApplet *applet, char *device, long int *level); +#endif -+#endif static const BonoboUIVerb wireless_menu_verbs [] = { BONOBO_UI_UNSAFE_VERB ("WirelessProperties", -@@ -150,7 +173,9 @@ +@@ -143,9 +162,11 @@ g_free (tmp); /* Update the image */ +#ifndef __FreeBSD__ - percent = CLAMP (percent, 0, 100); + percent = CLAMP (percent, -1, 100); +#endif - if (applet->pixmaps[percent] != applet->current_pixmap) - { -@@ -234,6 +259,7 @@ +- if (percent < 0) ++ if (percent < 0 || percent > 100) + state = PIX_BROKEN; + else if (percent == 0) + state = PIX_NO_LINK; +@@ -176,6 +197,7 @@ int percent; /* Calculate the percentage based on the link quality */ @@ -61,7 +60,7 @@ if (level < 0) { percent = -1; } else { -@@ -244,8 +270,11 @@ +@@ -186,6 +208,9 @@ percent = CLAMP (percent, 0, 100); } } @@ -69,17 +68,13 @@ + percent = (int)level; +#endif -- if (percent < 0) { -+ if (percent < 0 || percent > 100) { - applet->state = BUSTED_LINK; - wireless_applet_animation_state (applet); - } else if (percent == 0) { -@@ -387,22 +416,182 @@ - applet->show_dialogs = show; + wireless_applet_draw (applet, percent); + } +@@ -228,22 +253,179 @@ + } } +#ifdef __FreeBSD__ -+#if __FreeBSD_version >= 460100 +static int +wi_getval(WirelessApplet *applet, char *device, struct wi_req *wreq) +{ @@ -135,7 +130,7 @@ + + return; +} -+#endif ++ +static int +an_getval(WirelessApplet *applet, char *device, struct an_req *areq) +{ @@ -244,7 +239,6 @@ + wireless_applet_update_state (applet, device, 0, level, 0); + } + } -+#if __FreeBSD_version >= 460100 + else + if (g_strncasecmp(device, "wi", 2)==0) { + applet->devices = g_list_prepend (applet->devices, g_strdup (device)); @@ -253,13 +247,12 @@ + wireless_applet_update_state (applet, device, 0, level, 0); + } + } -+#endif + ifs++; +#else char *ptr; fgets (line, 256, applet->file); -@@ -435,6 +624,7 @@ +@@ -276,6 +458,7 @@ wireless_applet_update_state (applet, device, link, level, noise); } } @@ -267,7 +260,7 @@ } while (1); if (g_list_length (applet->devices)==1) { -@@ -446,17 +636,23 @@ +@@ -287,17 +470,23 @@ } /* rewind the /proc/net/wireless file */ @@ -291,7 +284,7 @@ wireless_applet_read_device_state (applet); -@@ -522,6 +718,7 @@ +@@ -344,6 +533,7 @@ static void start_file_read (WirelessApplet *applet) { @@ -299,7 +292,7 @@ applet->file = fopen ("/proc/net/wireless", "rt"); if (applet->file == NULL) { gtk_tooltips_set_tip (applet->tips, -@@ -530,6 +727,7 @@ +@@ -352,6 +542,7 @@ NULL); show_error_dialog (_("There doesn't seem to be any wireless devices configured on your system.\nPlease verify your configuration if you think this is incorrect.")); } @@ -307,7 +300,7 @@ } static void -@@ -775,8 +973,10 @@ +@@ -577,8 +768,10 @@ applet->prefs = NULL; } @@ -317,4 +310,4 @@ +#endif } - static GtkWidget * + static void diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist index afbdd9de3754..73b9b72d75d2 100644 --- a/x11/gnome-applets/pkg-plist +++ b/x11/gnome-applets/pkg-plist @@ -1,4 +1,8 @@ bin/gkb_xmmap +bin/gnome-keyboard-layout +etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/defaults/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/settings/%gconf.xml %%BATTERY%%etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/%gconf.xml %%BATTERY%%etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet/%gconf.xml @@ -15,12 +19,19 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gtik/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gtik/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gweather/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gweather/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/multiload/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/defaults/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/settings/%gconf.xml %%BATTERY%%etc/gconf/schemas/battstat.schemas etc/gconf/schemas/cdplayer.schemas etc/gconf/schemas/charpick.schemas @@ -29,11 +40,16 @@ etc/gconf/schemas/geyes.schemas etc/gconf/schemas/gkb.schemas etc/gconf/schemas/gtik.schemas etc/gconf/schemas/gweather.schemas +etc/gconf/schemas/mailcheck.schemas etc/gconf/schemas/mini-commander.schemas +etc/gconf/schemas/mixer.schemas etc/gconf/schemas/modemlights.schemas etc/gconf/schemas/multiload.schemas +etc/gconf/schemas/stickynotes.schemas %%BATTERY%%etc/sound/events/battstat_applet.soundlist -%%BATTERY%%libdata/bonobo/servers/GNOME_BattstatApplet.server +etc/sound/events/mailcheck.soundlist +libdata/bonobo/servers/GNOME_AccessxStatusApplet.server +libdata/bonobo/servers/GNOME_BattstatApplet.server libdata/bonobo/servers/GNOME_CDPlayerApplet.server libdata/bonobo/servers/GNOME_CharpickerApplet.server libdata/bonobo/servers/GNOME_DriveMountApplet.server @@ -41,11 +57,14 @@ libdata/bonobo/servers/GNOME_GWeatherApplet_Factory.server libdata/bonobo/servers/GNOME_GeyesApplet.server libdata/bonobo/servers/GNOME_GtikApplet.server libdata/bonobo/servers/GNOME_KeyboardApplet_Factory.server +libdata/bonobo/servers/GNOME_MailcheckApplet_Factory.server libdata/bonobo/servers/GNOME_MiniCommanderApplet.server libdata/bonobo/servers/GNOME_MixerApplet.server libdata/bonobo/servers/GNOME_ModemLightsApplet.server libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server +libdata/bonobo/servers/GNOME_StickyNotesApplet.server +libexec/accessx-status-applet %%BATTERY%%libexec/battstat-applet-2 libexec/cdplayer_applet2 libexec/charpick_applet2 @@ -55,10 +74,12 @@ libexec/gkb-applet-2 libexec/gnome-applets/mc-install-default-macros libexec/gtik2_applet2 libexec/gweather-applet-2 +libexec/mailcheck-applet libexec/mini_commander_applet libexec/mixer_applet2 libexec/modemlights_applet2 libexec/multiload-applet-2 +libexec/stickynotes_applet libexec/wireless-applet %%BATTERY%%share/gnome/battstat_applet/battstat_applet.glade share/gnome/gen_util/mini-commander.glade @@ -93,7 +114,7 @@ share/gnome/gkb/Belgian.keyprop share/gnome/gkb/BulgarianCyril.keyprop share/gnome/gkb/CA_English.keyprop share/gnome/gkb/CH_German_x.keyprop -share/gnome/gkb/CS_Czech.keyprop +share/gnome/gkb/CZ_Czech.keyprop share/gnome/gkb/CZ_Czech_Slovak.keyprop share/gnome/gkb/CZ_Czech_x.keyprop share/gnome/gkb/DE_German.keyprop @@ -115,10 +136,6 @@ share/gnome/gkb/FR_French_x.keyprop share/gnome/gkb/FrenchCanadian.keyprop share/gnome/gkb/FrenchCanadian2.keyprop share/gnome/gkb/FrenchSwiss.keyprop -share/gnome/gkb/GB-102.keyprop -share/gnome/gkb/GB.keyprop -share/gnome/gkb/GB_English.keyprop -share/gnome/gkb/GB_English_x.keyprop share/gnome/gkb/GE_Georgian_x.keyprop share/gnome/gkb/GR_Greek.keyprop share/gnome/gkb/GR_Greek_x.keyprop @@ -171,11 +188,16 @@ share/gnome/gkb/RU_Russian_x.keyprop share/gnome/gkb/RU_Russian_x_rev.keyprop share/gnome/gkb/RussianCyril.keyprop share/gnome/gkb/SE_Swedish.keyprop +share/gnome/gkb/SE_Swedish_x.keyprop share/gnome/gkb/SI_Slovenian.keyprop +share/gnome/gkb/SI_Slovenian_x.keyprop share/gnome/gkb/SR_Dutch.keyprop share/gnome/gkb/Slovak.keyprop +share/gnome/gkb/Slovene.keyprop share/gnome/gkb/Slovenian.keyprop share/gnome/gkb/Swedish.keyprop +share/gnome/gkb/Syriac.keyprop +share/gnome/gkb/Syriac_Phonetic.keyprop share/gnome/gkb/TH_Thai.keyprop share/gnome/gkb/TH_Thai_x.keyprop share/gnome/gkb/TR-f.keyprop @@ -185,8 +207,12 @@ share/gnome/gkb/TR_Turkish_x.keyprop share/gnome/gkb/Thai.keyprop share/gnome/gkb/Thai2.keyprop share/gnome/gkb/UA_Ukrainian.keyprop +share/gnome/gkb/UK-102.keyprop share/gnome/gkb/UK-x86.keyprop share/gnome/gkb/UK.keyprop +share/gnome/gkb/UK_English.keyprop +share/gnome/gkb/UK_English_x.keyprop +share/gnome/gkb/UK_United_Kingdom.keyprop share/gnome/gkb/US-101.keyprop share/gnome/gkb/US-101A-x86.keyprop share/gnome/gkb/US-84.keyprop @@ -201,9 +227,11 @@ share/gnome/gkb/US_English.keyprop share/gnome/gkb/US_international.keyprop share/gnome/gkb/VN_Vietnamese.keyprop share/gnome/gkb/YU_Serb_x.keyprop +share/gnome/gkb/YU_Serbo-Croatian_x.keyprop share/gnome/gkb/Yugoslav.keyprop share/gnome/gkb/presets.xml -%%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml +share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.xml +share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml share/gnome/gnome-2.0/ui/GNOME_CDPlayerApplet.xml share/gnome/gnome-2.0/ui/GNOME_CharpickerApplet.xml share/gnome/gnome-2.0/ui/GNOME_DriveMountApplet.xml @@ -211,18 +239,22 @@ share/gnome/gnome-2.0/ui/GNOME_GWeatherApplet.xml share/gnome/gnome-2.0/ui/GNOME_GeyesApplet.xml share/gnome/gnome-2.0/ui/GNOME_GtikApplet.xml share/gnome/gnome-2.0/ui/GNOME_KeyboardApplet.xml +share/gnome/gnome-2.0/ui/GNOME_MailCheckApplet.xml share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml share/gnome/gnome-2.0/ui/GNOME_ModemlightsApplet.xml share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml +share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml share/gnome/gnome-2.0/ui/GNOME_WirelessApplet.xml share/gnome/gweather/Locations +share/gnome/help/accessx-status/C/accessx-status.xml +share/gnome/help/accessx-status/C/figures/accessx-status-applet.png +share/gnome/help/accessx-status/C/legal.xml %%BATTERY%%share/gnome/help/battstat/C/battstat.xml %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-apperance.png %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet.png %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-general.png %%BATTERY%%share/gnome/help/battstat/C/legal.xml -%%BATTERY%%share/gnome/help/battstat/C/topic.dat %%BATTERY%%share/gnome/help/battstat/ja/battstat.xml %%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-apperance.png %%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-applet.png @@ -232,12 +264,14 @@ share/gnome/help/cdplayer/C/cdplayer.xml share/gnome/help/cdplayer/C/figures/cdplayer_applet.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_eject.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/C/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/C/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/C/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_prevtrack.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_stop.png share/gnome/help/cdplayer/C/legal.xml -share/gnome/help/cdplayer/C/topic.dat share/gnome/help/cdplayer/de/cdplayer.xml share/gnome/help/cdplayer/de/figures/cdplayer_applet.png share/gnome/help/cdplayer/de/figures/cdplayer_applet_eject.png @@ -256,7 +290,6 @@ share/gnome/help/cdplayer/es/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/es/figures/cdplayer_applet_prevtrack.png share/gnome/help/cdplayer/es/figures/cdplayer_applet_stop.png share/gnome/help/cdplayer/es/legal.xml -share/gnome/help/cdplayer/es/topic.dat share/gnome/help/cdplayer/fr/cdplayer.xml share/gnome/help/cdplayer/fr/figures/cdplayer_applet.png share/gnome/help/cdplayer/fr/figures/cdplayer_applet_eject.png @@ -279,12 +312,14 @@ share/gnome/help/cdplayer/ja/cdplayer.xml share/gnome/help/cdplayer/ja/figures/cdplayer_applet.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_eject.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/ja/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/ja/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_prevtrack.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_stop.png share/gnome/help/cdplayer/ja/legal.xml -share/gnome/help/cdplayer/ja/topic.dat share/gnome/help/cdplayer/ko/cdplayer.xml share/gnome/help/cdplayer/ko/figures/cdplayer_applet.png share/gnome/help/cdplayer/ko/figures/cdplayer_applet_eject.png @@ -322,51 +357,69 @@ share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_prevtrack.png share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_stop.png share/gnome/help/cdplayer/zh_TW/legal.xml share/gnome/help/char-palette/C/char-palette.xml -share/gnome/help/char-palette/C/figures/charpick_applet.png +share/gnome/help/char-palette/C/figures/charpalette_applet.png +share/gnome/help/char-palette/C/figures/charpalette_chargroup.png share/gnome/help/char-palette/C/figures/charpick_characters.png -share/gnome/help/char-palette/C/figures/charpick_chargroup.png share/gnome/help/char-palette/C/legal.xml 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_applet.png share/gnome/help/char-palette/de/figures/charpick_characters.png share/gnome/help/char-palette/de/figures/charpick_chargroup.png share/gnome/help/char-palette/de/legal.xml share/gnome/help/char-palette/es/char-palette.xml +share/gnome/help/char-palette/es/figures/charpalette_applet.png +share/gnome/help/char-palette/es/figures/charpalette_chargroup.png share/gnome/help/char-palette/es/figures/charpick_applet.png share/gnome/help/char-palette/es/figures/charpick_characters.png share/gnome/help/char-palette/es/figures/charpick_chargroup.png share/gnome/help/char-palette/es/legal.xml share/gnome/help/char-palette/fr/char-palette.xml +share/gnome/help/char-palette/fr/figures/charpalette_applet.png +share/gnome/help/char-palette/fr/figures/charpalette_chargroup.png share/gnome/help/char-palette/fr/figures/charpick_applet.png share/gnome/help/char-palette/fr/figures/charpick_characters.png share/gnome/help/char-palette/fr/figures/charpick_chargroup.png share/gnome/help/char-palette/fr/legal.xml share/gnome/help/char-palette/it/char-palette.xml +share/gnome/help/char-palette/it/figures/charpalette_applet.png +share/gnome/help/char-palette/it/figures/charpalette_chargroup.png share/gnome/help/char-palette/it/figures/charpick_applet.png share/gnome/help/char-palette/it/figures/charpick_characters.png share/gnome/help/char-palette/it/figures/charpick_chargroup.png share/gnome/help/char-palette/it/legal.xml share/gnome/help/char-palette/ja/char-palette.xml +share/gnome/help/char-palette/ja/figures/charpalette_applet.png +share/gnome/help/char-palette/ja/figures/charpalette_chargroup.png share/gnome/help/char-palette/ja/figures/charpick_applet.png share/gnome/help/char-palette/ja/figures/charpick_characters.png share/gnome/help/char-palette/ja/figures/charpick_chargroup.png share/gnome/help/char-palette/ja/legal.xml share/gnome/help/char-palette/ko/char-palette.xml +share/gnome/help/char-palette/ko/figures/charpalette_applet.png +share/gnome/help/char-palette/ko/figures/charpalette_chargroup.png share/gnome/help/char-palette/ko/figures/charpick_applet.png share/gnome/help/char-palette/ko/figures/charpick_characters.png share/gnome/help/char-palette/ko/figures/charpick_chargroup.png share/gnome/help/char-palette/ko/legal.xml share/gnome/help/char-palette/sv/char-palette.xml +share/gnome/help/char-palette/sv/figures/charpalette_applet.png +share/gnome/help/char-palette/sv/figures/charpalette_chargroup.png share/gnome/help/char-palette/sv/figures/charpick_applet.png share/gnome/help/char-palette/sv/figures/charpick_characters.png share/gnome/help/char-palette/sv/figures/charpick_chargroup.png share/gnome/help/char-palette/sv/legal.xml share/gnome/help/char-palette/zh_CN/char-palette.xml +share/gnome/help/char-palette/zh_CN/figures/charpalette_applet.png +share/gnome/help/char-palette/zh_CN/figures/charpalette_chargroup.png share/gnome/help/char-palette/zh_CN/figures/charpick_applet.png share/gnome/help/char-palette/zh_CN/figures/charpick_characters.png share/gnome/help/char-palette/zh_CN/figures/charpick_chargroup.png share/gnome/help/char-palette/zh_CN/legal.xml share/gnome/help/char-palette/zh_TW/char-palette.xml +share/gnome/help/char-palette/zh_TW/figures/charpalette_applet.png +share/gnome/help/char-palette/zh_TW/figures/charpalette_chargroup.png share/gnome/help/char-palette/zh_TW/figures/charpick_applet.png share/gnome/help/char-palette/zh_TW/figures/charpick_characters.png share/gnome/help/char-palette/zh_TW/figures/charpick_chargroup.png @@ -410,34 +463,40 @@ share/gnome/help/drivemount/C/legal.xml share/gnome/help/geyes/C/figures/geyes_applet.png share/gnome/help/geyes/C/geyes.xml share/gnome/help/geyes/C/legal.xml -share/gnome/help/geyes/C/topic.dat share/gnome/help/geyes/de/figures/geyes_applet.png +share/gnome/help/geyes/de/figures/geyes_settings.png share/gnome/help/geyes/de/geyes.xml share/gnome/help/geyes/de/legal.xml share/gnome/help/geyes/es/figures/geyes_applet.png +share/gnome/help/geyes/es/figures/geyes_settings.png share/gnome/help/geyes/es/geyes.xml share/gnome/help/geyes/es/legal.xml -share/gnome/help/geyes/es/topic.dat share/gnome/help/geyes/fr/figures/geyes_applet.png +share/gnome/help/geyes/fr/figures/geyes_settings.png share/gnome/help/geyes/fr/geyes.xml share/gnome/help/geyes/fr/legal.xml share/gnome/help/geyes/it/figures/geyes_applet.png +share/gnome/help/geyes/it/figures/geyes_settings.png share/gnome/help/geyes/it/geyes.xml share/gnome/help/geyes/it/legal.xml -share/gnome/help/geyes/it/topic.dat share/gnome/help/geyes/ja/figures/geyes_applet.png +share/gnome/help/geyes/ja/figures/geyes_settings.png share/gnome/help/geyes/ja/geyes.xml share/gnome/help/geyes/ja/legal.xml share/gnome/help/geyes/ko/figures/geyes_applet.png +share/gnome/help/geyes/ko/figures/geyes_settings.png share/gnome/help/geyes/ko/geyes.xml share/gnome/help/geyes/ko/legal.xml share/gnome/help/geyes/sv/figures/geyes_applet.png +share/gnome/help/geyes/sv/figures/geyes_settings.png share/gnome/help/geyes/sv/geyes.xml share/gnome/help/geyes/sv/legal.xml share/gnome/help/geyes/zh_CN/figures/geyes_applet.png +share/gnome/help/geyes/zh_CN/figures/geyes_settings.png share/gnome/help/geyes/zh_CN/geyes.xml share/gnome/help/geyes/zh_CN/legal.xml share/gnome/help/geyes/zh_TW/figures/geyes_applet.png +share/gnome/help/geyes/zh_TW/figures/geyes_settings.png share/gnome/help/geyes/zh_TW/geyes.xml share/gnome/help/geyes/zh_TW/legal.xml share/gnome/help/gkb/C/figures/gkb_applet.png @@ -501,80 +560,172 @@ share/gnome/help/gtik2_applet2/zh_TW/figures/gtik_applet.png share/gnome/help/gtik2_applet2/zh_TW/gtik2_applet2.xml share/gnome/help/gtik2_applet2/zh_TW/legal.xml share/gnome/help/gweather/C/figures/gweather_applet.png +share/gnome/help/gweather/C/figures/gweather_settings.png +share/gnome/help/gweather/C/figures/gweather_weather.png share/gnome/help/gweather/C/gweather.xml share/gnome/help/gweather/C/legal.xml -share/gnome/help/gweather/C/topic.dat share/gnome/help/gweather/de/figures/gweather_applet.png +share/gnome/help/gweather/de/figures/gweather_settings.png +share/gnome/help/gweather/de/figures/gweather_weather.png share/gnome/help/gweather/de/gweather.xml share/gnome/help/gweather/de/legal.xml share/gnome/help/gweather/es/figures/gweather_applet.png +share/gnome/help/gweather/es/figures/gweather_settings.png +share/gnome/help/gweather/es/figures/gweather_weather.png share/gnome/help/gweather/es/gweather.xml share/gnome/help/gweather/es/legal.xml share/gnome/help/gweather/fr/figures/gweather_applet.png +share/gnome/help/gweather/fr/figures/gweather_settings.png +share/gnome/help/gweather/fr/figures/gweather_weather.png share/gnome/help/gweather/fr/gweather.xml share/gnome/help/gweather/fr/legal.xml +share/gnome/help/gweather/it/figures/gweather_applet.png +share/gnome/help/gweather/it/figures/gweather_settings.png +share/gnome/help/gweather/it/figures/gweather_weather.png +share/gnome/help/gweather/it/gweather.xml +share/gnome/help/gweather/it/legal.xml share/gnome/help/gweather/ja/figures/gweather_applet.png +share/gnome/help/gweather/ja/figures/gweather_settings.png +share/gnome/help/gweather/ja/figures/gweather_weather.png share/gnome/help/gweather/ja/gweather.xml share/gnome/help/gweather/ja/legal.xml share/gnome/help/gweather/ko/figures/gweather_applet.png +share/gnome/help/gweather/ko/figures/gweather_settings.png +share/gnome/help/gweather/ko/figures/gweather_weather.png share/gnome/help/gweather/ko/gweather.xml share/gnome/help/gweather/ko/legal.xml share/gnome/help/gweather/sv/figures/gweather_applet.png +share/gnome/help/gweather/sv/figures/gweather_settings.png +share/gnome/help/gweather/sv/figures/gweather_weather.png share/gnome/help/gweather/sv/gweather.xml share/gnome/help/gweather/sv/legal.xml share/gnome/help/gweather/zh_CN/figures/gweather_applet.png +share/gnome/help/gweather/zh_CN/figures/gweather_settings.png +share/gnome/help/gweather/zh_CN/figures/gweather_weather.png share/gnome/help/gweather/zh_CN/gweather.xml share/gnome/help/gweather/zh_CN/legal.xml share/gnome/help/gweather/zh_TW/figures/gweather_applet.png +share/gnome/help/gweather/zh_TW/figures/gweather_settings.png +share/gnome/help/gweather/zh_TW/figures/gweather_weather.png share/gnome/help/gweather/zh_TW/gweather.xml share/gnome/help/gweather/zh_TW/legal.xml -share/gnome/help/gweather_applet/it/figures/gweather_applet.png -share/gnome/help/gweather_applet/it/figures/gweather_settings.png -share/gnome/help/gweather_applet/it/figures/gweather_weather.png -share/gnome/help/gweather_applet/it/gweather.sgml -share/gnome/help/gweather_applet/it/gweather_applet.sgml -share/gnome/help/gweather_applet/it/ln10.html -share/gnome/help/gweather_applet/it/t1.html -share/gnome/help/gweather_applet/it/topic.dat -share/gnome/help/mixer_applet/it/figures/mixer_applet.png -share/gnome/help/mixer_applet/it/ln10.html -share/gnome/help/mixer_applet/it/mixer.sgml -share/gnome/help/mixer_applet/it/mixer_applet.sgml -share/gnome/help/mixer_applet/it/t1.html -share/gnome/help/mixer_applet/it/topic.dat +share/gnome/help/mailcheck/C/figures/mailcheck_applet.png +share/gnome/help/mailcheck/C/legal.xml +share/gnome/help/mailcheck/C/mailcheck.xml +share/gnome/help/mailcheck/de/figures/mailcheck-applet.png +share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/de/figures/mailcheck_applet.png +share/gnome/help/mailcheck/de/legal.xml +share/gnome/help/mailcheck/de/mailcheck.xml +share/gnome/help/mailcheck/es/figures/mailcheck-applet.png +share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/es/figures/mailcheck_applet.png +share/gnome/help/mailcheck/es/legal.xml +share/gnome/help/mailcheck/es/mailcheck.xml +share/gnome/help/mailcheck/fr/figures/mailcheck-applet.png +share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/fr/figures/mailcheck_applet.png +share/gnome/help/mailcheck/fr/legal.xml +share/gnome/help/mailcheck/fr/mailcheck.xml +share/gnome/help/mailcheck/it/figures/mailcheck-applet.png +share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/it/figures/mailcheck_applet.png +share/gnome/help/mailcheck/it/legal.xml +share/gnome/help/mailcheck/it/mailcheck.xml +share/gnome/help/mailcheck/ja/figures/mailcheck_applet.png +share/gnome/help/mailcheck/ja/legal.xml +share/gnome/help/mailcheck/ja/mailcheck.xml +share/gnome/help/mailcheck/ko/figures/mailcheck-applet.png +share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/ko/figures/mailcheck_applet.png +share/gnome/help/mailcheck/ko/legal.xml +share/gnome/help/mailcheck/ko/mailcheck.xml +share/gnome/help/mailcheck/sv/figures/mailcheck-applet.png +share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/sv/figures/mailcheck_applet.png +share/gnome/help/mailcheck/sv/legal.xml +share/gnome/help/mailcheck/sv/mailcheck.xml +share/gnome/help/mailcheck/zh_CN/figures/mailcheck-applet.png +share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/zh_CN/figures/mailcheck_applet.png +share/gnome/help/mailcheck/zh_CN/legal.xml +share/gnome/help/mailcheck/zh_CN/mailcheck.xml +share/gnome/help/mailcheck/zh_TW/figures/mailcheck-applet.png +share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/zh_TW/figures/mailcheck_applet.png +share/gnome/help/mailcheck/zh_TW/legal.xml +share/gnome/help/mailcheck/zh_TW/mailcheck.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/C/topic.dat +share/gnome/help/mixer_applet2/de/figures/mixer_applet.png share/gnome/help/mixer_applet2/de/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/de/legal.xml share/gnome/help/mixer_applet2/de/mixer_applet2.xml +share/gnome/help/mixer_applet2/es/figures/mixer_applet.png share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/es/legal.xml share/gnome/help/mixer_applet2/es/mixer_applet2.xml -share/gnome/help/mixer_applet2/es/topic.dat +share/gnome/help/mixer_applet2/fr/figures/mixer_applet.png share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/fr/legal.xml share/gnome/help/mixer_applet2/fr/mixer_applet2.xml +share/gnome/help/mixer_applet2/ja/figures/mixer_applet.png share/gnome/help/mixer_applet2/ja/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/ja/legal.xml share/gnome/help/mixer_applet2/ja/mixer_applet2.xml +share/gnome/help/mixer_applet2/ko/figures/mixer_applet.png share/gnome/help/mixer_applet2/ko/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/ko/legal.xml share/gnome/help/mixer_applet2/ko/mixer_applet2.xml +share/gnome/help/mixer_applet2/sv/figures/mixer_applet.png share/gnome/help/mixer_applet2/sv/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/sv/legal.xml share/gnome/help/mixer_applet2/sv/mixer_applet2.xml +share/gnome/help/mixer_applet2/zh_CN/figures/mixer_applet.png share/gnome/help/mixer_applet2/zh_CN/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/zh_CN/legal.xml share/gnome/help/mixer_applet2/zh_CN/mixer_applet2.xml +share/gnome/help/mixer_applet2/zh_TW/figures/mixer_applet.png share/gnome/help/mixer_applet2/zh_TW/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/zh_TW/legal.xml share/gnome/help/mixer_applet2/zh_TW/mixer_applet2.xml +share/gnome/help/modemlights/C/figures/modemlights-advanced.png +share/gnome/help/modemlights/C/figures/modemlights-advpref.png +share/gnome/help/modemlights/C/figures/modemlights-color.png +share/gnome/help/modemlights/C/figures/modemlights-general.png +share/gnome/help/modemlights/C/figures/modemlights-prefs.png +share/gnome/help/modemlights/C/figures/modemlights.png +share/gnome/help/modemlights/C/figures/modemlights_applet.png +share/gnome/help/modemlights/C/figures/modemlights_applet_advanced.png +share/gnome/help/modemlights/C/figures/modemlights_applet_awaiting.png +share/gnome/help/modemlights/C/figures/modemlights_applet_button.png +share/gnome/help/modemlights/C/figures/modemlights_applet_button_2.png +share/gnome/help/modemlights/C/figures/modemlights_applet_colors.png +share/gnome/help/modemlights/C/figures/modemlights_applet_connected.png +share/gnome/help/modemlights/C/figures/modemlights_applet_general.png +share/gnome/help/modemlights/C/figures/modemlights_applet_if_connect.png +share/gnome/help/modemlights/C/figures/modemlights_applet_not_connected.png +share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_connecting.png +share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_display.png +share/gnome/help/modemlights/C/legal.xml +share/gnome/help/modemlights/C/modemlights.xml +share/gnome/help/stickynotes_applet/C/legal.xml +share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml +share/gnome/omf/gnome-applets/accessx-status-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/accessx-status-C.omf 2>/dev/null || /usr/bin/true %%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf -@exec scrollkeeper-install -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true %%BATTERY%%share/gnome/omf/gnome-applets/battstat-ja.omf -@exec scrollkeeper-install -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/cdplayer-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/cdplayer-de.omf @@ -717,8 +868,26 @@ share/gnome/omf/gnome-applets/gweather-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gweather_applet-it.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather_applet-it.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-applets/mixer_applet-it.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-de.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-de.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-fr.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-fr.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-ja.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-ja.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-ko.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-ko.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-sv.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-zh_CN.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-zh_TW.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/mixer_applet2-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/mixer_applet2-de.omf @@ -737,6 +906,46 @@ share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/modemlights-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/modemlights-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/stickynotes_applet-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-C.omf 2>/dev/null || /usr/bin/true +share/gnome/pixmaps/accessx-status-applet/ax-applet.png +share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png +share/gnome/pixmaps/accessx-status-applet/ax-key-base.png +share/gnome/pixmaps/accessx-status-applet/ax-key-inverse.png +share/gnome/pixmaps/accessx-status-applet/ax-key-no.png +share/gnome/pixmaps/accessx-status-applet/ax-key-none.png +share/gnome/pixmaps/accessx-status-applet/ax-key-yes.png +share/gnome/pixmaps/accessx-status-applet/ax-slowkeys-no.png +share/gnome/pixmaps/accessx-status-applet/ax-slowkeys-pending.png +share/gnome/pixmaps/accessx-status-applet/ax-slowkeys-yes.png +share/gnome/pixmaps/accessx-status-applet/ax-slowkeys.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-base.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-default-left.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-default-middle.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-default-right.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-pressed-left.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-pressed-middle.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-pressed-right.png +share/gnome/pixmaps/accessx-status-applet/sticky-alt-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-alt-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-alt-none.png +share/gnome/pixmaps/accessx-status-applet/sticky-ctrl-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-ctrl-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-ctrl-none.png +share/gnome/pixmaps/accessx-status-applet/sticky-hyper-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-hyper-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-hyper-none.png +share/gnome/pixmaps/accessx-status-applet/sticky-meta-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-meta-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-meta-none.png +share/gnome/pixmaps/accessx-status-applet/sticky-shift-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-shift-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-shift-none.png +share/gnome/pixmaps/accessx-status-applet/sticky-super-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-super-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-super-none.png %%BATTERY%%share/gnome/pixmaps/battstat.png share/gnome/pixmaps/charpick.png share/gnome/pixmaps/drivemount-applet.png @@ -754,7 +963,6 @@ share/gnome/pixmaps/gkb/br.png share/gnome/pixmaps/gkb/by.png share/gnome/pixmaps/gkb/ca.png share/gnome/pixmaps/gkb/ch.png -share/gnome/pixmaps/gkb/cs.png share/gnome/pixmaps/gkb/cu.png share/gnome/pixmaps/gkb/cz.png share/gnome/pixmaps/gkb/de.png @@ -767,7 +975,6 @@ share/gnome/pixmaps/gkb/es.png share/gnome/pixmaps/gkb/eu.png share/gnome/pixmaps/gkb/fi.png share/gnome/pixmaps/gkb/fr.png -share/gnome/pixmaps/gkb/gb.png share/gnome/pixmaps/gkb/ge.png share/gnome/pixmaps/gkb/gkb.png share/gnome/pixmaps/gkb/gr.png @@ -802,13 +1009,12 @@ share/gnome/pixmaps/gkb/qc.png share/gnome/pixmaps/gkb/ro.png share/gnome/pixmaps/gkb/ru.png share/gnome/pixmaps/gkb/sa.png +share/gnome/pixmaps/gkb/sd.png share/gnome/pixmaps/gkb/se.png share/gnome/pixmaps/gkb/si.png share/gnome/pixmaps/gkb/sk.png share/gnome/pixmaps/gkb/so.png share/gnome/pixmaps/gkb/sr.png -share/gnome/pixmaps/gkb/su.png -share/gnome/pixmaps/gkb/sv.png share/gnome/pixmaps/gkb/sy.png share/gnome/pixmaps/gkb/th.png share/gnome/pixmaps/gkb/tn.png @@ -826,6 +1032,12 @@ share/gnome/pixmaps/gnome-cpu.png share/gnome/pixmaps/gnome-eyes.png share/gnome/pixmaps/gnome-mini-commander.png share/gnome/pixmaps/gweather/tstorm.xpm +share/gnome/pixmaps/mailcheck/eclouds.png +share/gnome/pixmaps/mailcheck/email-e.png +share/gnome/pixmaps/mailcheck/email-eclouds.png +share/gnome/pixmaps/mailcheck/email-tiny.png +share/gnome/pixmaps/mailcheck/email.png +share/gnome/pixmaps/mailcheck/tux-anim.png share/gnome/pixmaps/mini-commander/browser-mini.xpm share/gnome/pixmaps/mini-commander/history-mini.xpm share/gnome/pixmaps/mixer/gnome-mixer-applet.png @@ -834,6 +1046,13 @@ share/gnome/pixmaps/mixer/volume-medium.png share/gnome/pixmaps/mixer/volume-min.png share/gnome/pixmaps/mixer/volume-mute.png share/gnome/pixmaps/mixer/volume-zero.png +share/gnome/pixmaps/stickynotes/close.png +share/gnome/pixmaps/stickynotes/locked.png +share/gnome/pixmaps/stickynotes/resize_se.png +share/gnome/pixmaps/stickynotes/resize_sw.png +share/gnome/pixmaps/stickynotes/stickynotes.png +share/gnome/pixmaps/stickynotes/stickynotes_prelight.png +share/gnome/pixmaps/stickynotes/unlocked.png share/gnome/pixmaps/wireless-applet/broken-0.png share/gnome/pixmaps/wireless-applet/no-link-0.png share/gnome/pixmaps/wireless-applet/signal-1-40.png @@ -841,6 +1060,7 @@ share/gnome/pixmaps/wireless-applet/signal-41-60.png share/gnome/pixmaps/wireless-applet/signal-61-80.png share/gnome/pixmaps/wireless-applet/signal-81-100.png share/gnome/pixmaps/wireless-applet/wireless-applet.png +share/gnome/stickynotes/stickynotes.glade share/gnome/wireless-applet/wireless-applet.glade share/gnome/xmodmap/xmodmap.am share/gnome/xmodmap/xmodmap.ar @@ -889,9 +1109,9 @@ share/gnome/xmodmap/xmodmap.lt_b share/gnome/xmodmap/xmodmap.lt_p share/gnome/xmodmap/xmodmap.mk share/gnome/xmodmap/xmodmap.mn +share/gnome/xmodmap/xmodmap.mn-phonet share/gnome/xmodmap/xmodmap.mn-rev share/gnome/xmodmap/xmodmap.mn-uni -share/gnome/xmodmap/xmodmap.mn-yawerty share/gnome/xmodmap/xmodmap.nl share/gnome/xmodmap/xmodmap.no share/gnome/xmodmap/xmodmap.pl @@ -932,8 +1152,10 @@ share/locale/ar/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/bg/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/cy/LC_MESSAGES/gnome-applets-2.0.mo share/locale/da/LC_MESSAGES/gnome-applets-2.0.mo share/locale/de/LC_MESSAGES/gnome-applets-2.0.mo share/locale/el/LC_MESSAGES/gnome-applets-2.0.mo @@ -949,6 +1171,7 @@ share/locale/gl/LC_MESSAGES/gnome-applets-2.0.mo share/locale/he/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hu/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo @@ -979,8 +1202,16 @@ share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/wireless-applet +@dirrm share/gnome/stickynotes @dirrm share/gnome/pixmaps/wireless-applet +@dirrm share/gnome/pixmaps/stickynotes @dirrm share/gnome/pixmaps/mixer +@dirrm share/gnome/pixmaps/accessx-status-applet +@dirrm share/gnome/help/stickynotes_applet/C +@dirrm share/gnome/help/stickynotes_applet +@dirrm share/gnome/help/modemlights/C/figures +@dirrm share/gnome/help/modemlights/C +@dirrm share/gnome/help/modemlights @dirrm share/gnome/help/mixer_applet2/zh_TW/figures @dirrm share/gnome/help/mixer_applet2/zh_TW @dirrm share/gnome/help/mixer_applet2/zh_CN/figures @@ -1000,14 +1231,27 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/mixer_applet2/C/figures @dirrm share/gnome/help/mixer_applet2/C @dirrm share/gnome/help/mixer_applet2 -@dirrm share/gnome/help/mixer_applet/it/stylesheet-images -@dirrm share/gnome/help/mixer_applet/it/figures -@dirrm share/gnome/help/mixer_applet/it -@dirrm share/gnome/help/mixer_applet -@dirrm share/gnome/help/gweather_applet/it/stylesheet-images -@dirrm share/gnome/help/gweather_applet/it/figures -@dirrm share/gnome/help/gweather_applet/it -@dirrm share/gnome/help/gweather_applet +@dirrm share/gnome/help/mailcheck/zh_TW/figures +@dirrm share/gnome/help/mailcheck/zh_TW +@dirrm share/gnome/help/mailcheck/zh_CN/figures +@dirrm share/gnome/help/mailcheck/zh_CN +@dirrm share/gnome/help/mailcheck/sv/figures +@dirrm share/gnome/help/mailcheck/sv +@dirrm share/gnome/help/mailcheck/ko/figures +@dirrm share/gnome/help/mailcheck/ko +@dirrm share/gnome/help/mailcheck/ja/figures +@dirrm share/gnome/help/mailcheck/ja +@dirrm share/gnome/help/mailcheck/it/figures +@dirrm share/gnome/help/mailcheck/it +@dirrm share/gnome/help/mailcheck/fr/figures +@dirrm share/gnome/help/mailcheck/fr +@dirrm share/gnome/help/mailcheck/es/figures +@dirrm share/gnome/help/mailcheck/es +@dirrm share/gnome/help/mailcheck/de/figures +@dirrm share/gnome/help/mailcheck/de +@dirrm share/gnome/help/mailcheck/C/figures +@dirrm share/gnome/help/mailcheck/C +@dirrm share/gnome/help/mailcheck @dirrm share/gnome/help/gweather/zh_TW/figures @dirrm share/gnome/help/gweather/zh_TW @dirrm share/gnome/help/gweather/zh_CN/figures @@ -1018,6 +1262,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/gweather/ko @dirrm share/gnome/help/gweather/ja/figures @dirrm share/gnome/help/gweather/ja +@dirrm share/gnome/help/gweather/it/figures +@dirrm share/gnome/help/gweather/it @dirrm share/gnome/help/gweather/fr/figures @dirrm share/gnome/help/gweather/fr @dirrm share/gnome/help/gweather/es/figures @@ -1161,14 +1407,24 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo %%BATTERY%%@dirrm share/gnome/help/battstat/C/figures %%BATTERY%%@dirrm share/gnome/help/battstat/C %%BATTERY%%@dirrm share/gnome/help/battstat +@dirrm share/gnome/help/accessx-status/C/figures +@dirrm share/gnome/help/accessx-status/C +@dirrm share/gnome/help/accessx-status %%BATTERY%%@dirrm share/gnome/battstat_applet @dirrm libexec/gnome-applets +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/settings +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/defaults +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet/prefs +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gweather/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gweather @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtik/prefs @@ -1185,8 +1441,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet %%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs %%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet -@unexec scrollkeeper-uninstall -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true +@dirrm etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/settings +@dirrm etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/defaults +@dirrm etc/gconf/gconf.xml.defaults/apps/stickynotes_applet +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/accessx-status-C.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-de.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-es.omf 2>/dev/null || /usr/bin/true @@ -1258,7 +1518,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather_applet-it.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-de.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-fr.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-ja.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-ko.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-sv.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-de.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-es.omf 2>/dev/null || /usr/bin/true @@ -1268,3 +1537,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/modemlights-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-C.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index 8ae160c83395..e25f33c070e9 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomedesktop -PORTVERSION= 2.2.2 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-desktop/2.2 +MASTER_SITE_SUBDIR= sources/gnome-desktop/2.4 DISTNAME= gnome-desktop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -26,12 +26,10 @@ USE_GMAKE= yes USE_BISON= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes +CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAN1= gnome-about.1 -post-patch: - @${REINPLACE_CMD} -E -e 's|GNOME_VENDOR=.*$$|GNOME_VENDOR="FreeBSD GNOME Project"|' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo index 1ef3d1c22b0e..9c50bf9f39fb 100644 --- a/x11/gnome-desktop/distinfo +++ b/x11/gnome-desktop/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-desktop-2.2.2.tar.bz2) = 335e6109abc5a04e69ab574464af1900 +MD5 (gnome2/gnome-desktop-2.4.0.tar.bz2) = 183c14d192bdd41bd34578e8e7dc55f1 diff --git a/x11/gnome-desktop/files/patch-configure b/x11/gnome-desktop/files/patch-configure index 943558a25604..caf5b493a9eb 100644 --- a/x11/gnome-desktop/files/patch-configure +++ b/x11/gnome-desktop/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Mar 10 16:54:58 2003 -+++ configure Sun Apr 6 16:11:00 2003 -@@ -7987,6 +7987,7 @@ +--- configure.orig Sun May 4 06:56:20 2003 ++++ configure Sun May 4 19:20:27 2003 +@@ -8374,6 +8374,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist index 2cd64cb14824..ac57d75634de 100644 --- a/x11/gnome-desktop/pkg-plist +++ b/x11/gnome-desktop/pkg-plist @@ -6,61 +6,46 @@ lib/libgnome-desktop-2.a lib/libgnome-desktop-2.so lib/libgnome-desktop-2.so.3 libdata/pkgconfig/gnome-desktop-2.0.pc -share/gnome/gnome-about/contributors.dat +share/gnome/gnome-about/gnome-64.gif share/gnome/gnome-about/gnome-version.xml +share/gnome/gnome-about/headers/header-bg-ancient01a.png +share/gnome/gnome-about/headers/header-bg-city01.png +share/gnome/gnome-about/headers/header-bg-clouds01.png +share/gnome/gnome-about/headers/header-bg-clouds02.png +share/gnome/gnome-about/headers/header-bg-hills01.png +share/gnome/gnome-about/headers/header-bg-landscape01.png +share/gnome/gnome-about/headers/header-bg-mountains01.png +share/gnome/gnome-about/headers/header-bg-snow01.png +share/gnome/gnome-about/headers/header-bg-sunset01.png share/gnome/help/fdl/C/fdl.xml share/gnome/help/gnome-feedback/C/gnome-feedback.xml share/gnome/help/gpl/C/gpl.xml share/gnome/help/lgpl/C/lgpl.xml -share/gnome/vfolders/Accessories.directory -share/gnome/vfolders/Applications.directory -share/gnome/vfolders/Development.directory -share/gnome/vfolders/Games.directory -share/gnome/vfolders/Graphics.directory -share/gnome/vfolders/Internet.directory -share/gnome/vfolders/Multimedia.directory -share/gnome/vfolders/Office.directory -share/gnome/vfolders/Root.directory -share/gnome/vfolders/Settings.directory -share/gnome/vfolders/System.directory share/gnome/pixmaps/advanced-directory.png share/gnome/pixmaps/apple-green.png share/gnome/pixmaps/apple-red.png -share/gnome/pixmaps/cdeappmenu.png -share/gnome/pixmaps/gnome-amusements.png share/gnome/pixmaps/gnome-aorta.png share/gnome/pixmaps/gnome-applets.png share/gnome/pixmaps/gnome-applications.png -share/gnome/pixmaps/gnome-audio2.png +share/gnome/pixmaps/gnome-background-image.png +share/gnome/pixmaps/gnome-background-pattern.png share/gnome/pixmaps/gnome-background.png share/gnome/pixmaps/gnome-calc2.png share/gnome/pixmaps/gnome-calc3.png share/gnome/pixmaps/gnome-calendar.png -share/gnome/pixmaps/gnome-cardgame.png share/gnome/pixmaps/gnome-ccbackground.png share/gnome/pixmaps/gnome-ccdesktop.png share/gnome/pixmaps/gnome-ccdialog.png -share/gnome/pixmaps/gnome-cckeyboard-bell.png -share/gnome/pixmaps/gnome-cckeyboard.png share/gnome/pixmaps/gnome-ccmime.png share/gnome/pixmaps/gnome-ccperiph.png share/gnome/pixmaps/gnome-ccscreensaver.png -share/gnome/pixmaps/gnome-ccthemes.png share/gnome/pixmaps/gnome-ccwindowmanager.png -share/gnome/pixmaps/gnome-clock.png share/gnome/pixmaps/gnome-color-browser.png share/gnome/pixmaps/gnome-color-xterm.png share/gnome/pixmaps/gnome-computer.png share/gnome/pixmaps/gnome-cromagnon.png share/gnome/pixmaps/gnome-day.png share/gnome/pixmaps/gnome-debian.png -share/gnome/pixmaps/gnome-devel.png -share/gnome/pixmaps/gnome-die1.png -share/gnome/pixmaps/gnome-die2.png -share/gnome/pixmaps/gnome-die3.png -share/gnome/pixmaps/gnome-die4.png -share/gnome/pixmaps/gnome-die5.png -share/gnome/pixmaps/gnome-die6.png share/gnome/pixmaps/gnome-diskfree.png share/gnome/pixmaps/gnome-emacs.png share/gnome/pixmaps/gnome-eterm.png @@ -68,27 +53,17 @@ share/gnome/pixmaps/gnome-favorites.png share/gnome/pixmaps/gnome-file-c.png share/gnome/pixmaps/gnome-file-h.png share/gnome/pixmaps/gnome-folder.png -share/gnome/pixmaps/gnome-gegl.png -share/gnome/pixmaps/gnome-gegl2-2.png -share/gnome/pixmaps/gnome-gegl2.png share/gnome/pixmaps/gnome-gemvt.png share/gnome/pixmaps/gnome-gimp.png -share/gnome/pixmaps/gnome-globe.png share/gnome/pixmaps/gnome-gmenu.png share/gnome/pixmaps/gnome-gmush.png -share/gnome/pixmaps/gnome-gnomine.png share/gnome/pixmaps/gnome-gnomoku.png -share/gnome/pixmaps/gnome-graphics.png -share/gnome/pixmaps/gnome-gsame.png -share/gnome/pixmaps/gnome-help.png share/gnome/pixmaps/gnome-home.png share/gnome/pixmaps/gnome-html.png share/gnome/pixmaps/gnome-image-gif.png share/gnome/pixmaps/gnome-image-jpeg.png share/gnome/pixmaps/gnome-irc.png -share/gnome/pixmaps/gnome-joystick.png share/gnome/pixmaps/gnome-laptop.png -share/gnome/pixmaps/gnome-lockscreen.png share/gnome/pixmaps/gnome-log.png share/gnome/pixmaps/gnome-logo-icon-transparent.png share/gnome/pixmaps/gnome-logo-icon.png @@ -101,26 +76,15 @@ share/gnome/pixmaps/gnome-money.png share/gnome/pixmaps/gnome-monitor.png share/gnome/pixmaps/gnome-month.png share/gnome/pixmaps/gnome-mouse.png -share/gnome/pixmaps/gnome-multimedia.png share/gnome/pixmaps/gnome-networktool.png share/gnome/pixmaps/gnome-news.png share/gnome/pixmaps/gnome-note.png -share/gnome/pixmaps/gnome-panel-type-corner.png -share/gnome/pixmaps/gnome-panel-type-edge.png -share/gnome/pixmaps/gnome-panel-type-floating.png -share/gnome/pixmaps/gnome-panel-type-menu.png -share/gnome/pixmaps/gnome-panel-type-sliding.png -share/gnome/pixmaps/gnome-panel.png share/gnome/pixmaps/gnome-qeye.png -share/gnome/pixmaps/gnome-run.png -share/gnome/pixmaps/gnome-screenshot.png share/gnome/pixmaps/gnome-session.png share/gnome/pixmaps/gnome-set-time.png -share/gnome/pixmaps/gnome-settings.png share/gnome/pixmaps/gnome-spider.png share/gnome/pixmaps/gnome-squeak.png share/gnome/pixmaps/gnome-suse.png -share/gnome/pixmaps/gnome-system.png share/gnome/pixmaps/gnome-talk.png share/gnome/pixmaps/gnome-term-linux.png share/gnome/pixmaps/gnome-term-linux2.png @@ -129,7 +93,6 @@ share/gnome/pixmaps/gnome-term-tiger.png share/gnome/pixmaps/gnome-term.png share/gnome/pixmaps/gnome-tigert.png share/gnome/pixmaps/gnome-touristinfo.png -share/gnome/pixmaps/gnome-unknown.png share/gnome/pixmaps/gnome-user-interface.png share/gnome/pixmaps/gnome-util.png share/gnome/pixmaps/gnome-week.png @@ -141,17 +104,19 @@ share/gnome/pixmaps/gtkvim.png share/gnome/pixmaps/kterm.xpm share/gnome/pixmaps/launcher-program.png share/gnome/pixmaps/monitor.png -share/gnome/pixmaps/panel-arrow-down.png -share/gnome/pixmaps/panel-arrow-left.png -share/gnome/pixmaps/panel-arrow-right.png -share/gnome/pixmaps/panel-arrow-up.png -share/gnome/pixmaps/panel-corner-left.png -share/gnome/pixmaps/panel-corner-right.png -share/gnome/pixmaps/panel-drawer.png -share/gnome/pixmaps/panel-folder.png -share/gnome/pixmaps/panel-knob.png -share/gnome/pixmaps/panel-menu-main.png share/gnome/pixmaps/vnterm.xpm +share/gnome/vfolders/Accessories.directory +share/gnome/vfolders/Applications.directory +share/gnome/vfolders/Development.directory +share/gnome/vfolders/Games.directory +share/gnome/vfolders/Graphics.directory +share/gnome/vfolders/Internet.directory +share/gnome/vfolders/Multimedia.directory +share/gnome/vfolders/Office.directory +share/gnome/vfolders/Other.directory +share/gnome/vfolders/Root.directory +share/gnome/vfolders/Settings.directory +share/gnome/vfolders/System.directory share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo @@ -161,6 +126,7 @@ share/locale/bn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/bs/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ca/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/cs/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/cy/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/da/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/de/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/el/LC_MESSAGES/gnome-desktop-2.0.mo @@ -183,12 +149,14 @@ share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/kn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/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/mk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ml/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/no/LC_MESSAGES/gnome-desktop-2.0.mo @@ -218,6 +186,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo @dirrm share/gnome/help/gnome-feedback/C @dirrm share/gnome/help/gnome-feedback @dirrm share/gnome/help/fdl/C/figures +@dirrm share/gnome/gnome-about/headers @dirrm include/gnome-desktop-2.0/libgnomeui @dirrm include/gnome-desktop-2.0/libgnome @dirrm include/gnome-desktop-2.0 diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index caa6e7f78e31..04ca2e79ad48 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomepanel -PORTVERSION= 2.2.2.2 -PORTREVISION= 1 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-panel/2.2 +MASTER_SITE_SUBDIR= sources/gnome-panel/2.4 DISTNAME= gnome-panel-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,7 +20,7 @@ USE_BZIP2= yes INSTALLS_SHLIB= yes USE_X_PREFIX= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier libwnck gnomedesktop +USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop libwnck GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes USE_LIBTOOL= yes diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index a70a16998277..36e659c41882 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-panel-2.2.2.2.tar.bz2) = 0fffc658f22e367ba33997dcf180ef17 +MD5 (gnome2/gnome-panel-2.4.0.tar.bz2) = 9a81f7ebbb450611a28783900f5f2cbc diff --git a/x11/gnome-panel/files/patch-applets::gen_util::clock.c b/x11/gnome-panel/files/patch-applets_clock_clock.c index 96f5d3f44c48..976764570ff1 100644 --- a/x11/gnome-panel/files/patch-applets::gen_util::clock.c +++ b/x11/gnome-panel/files/patch-applets_clock_clock.c @@ -1,8 +1,8 @@ $FreeBSD$ ---- applets/gen_util/clock.c 2002/05/14 14:08:16 1.1 -+++ applets/gen_util/clock.c 2002/05/14 14:12:56 +--- applets/clock/clock.c 2002/05/14 14:08:16 1.1 ++++ applets/clock/clock.c 2002/05/14 14:12:56 @@ -14,7 +14,9 @@ #include <dirent.h> #include <string.h> diff --git a/x11/gnome-panel/files/patch-gnome-panel_panel.c b/x11/gnome-panel/files/patch-gnome-panel_panel.c deleted file mode 100644 index 4c51bc47f38c..000000000000 --- a/x11/gnome-panel/files/patch-gnome-panel_panel.c +++ /dev/null @@ -1,25 +0,0 @@ ---- gnome-panel/panel.c.orig Fri Aug 1 21:48:35 2003 -+++ gnome-panel/panel.c Fri Aug 1 21:48:37 2003 -@@ -569,18 +569,18 @@ - - if (pd->menu) - g_object_unref (pd->menu); -- pd->menu = NULL; -- -- pd->panel = NULL; - - if (pd->deactivate_idle != 0) - g_source_remove (pd->deactivate_idle); -- pd->deactivate_idle = 0; - - g_object_set_data (G_OBJECT (widget), "PanelData", NULL); - - panel_list = g_slist_remove (panel_list, pd); - g_free (pd); -+ -+ pd->menu = NULL; -+ pd->panel = NULL; -+ pd->deactivate_idle = 0; - } - - static void diff --git a/x11/gnome-panel/pkg-descr b/x11/gnome-panel/pkg-descr index 3abe6bcbf5fd..5e73398913a9 100644 --- a/x11/gnome-panel/pkg-descr +++ b/x11/gnome-panel/pkg-descr @@ -1,3 +1,3 @@ -Panel component for the GNOME 2.0 Desktop. +Panel component for the GNOME 2 Desktop. WWW: http://www.gnome.org/ diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist index d3632109b400..d6d24dc543ef 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -5,23 +5,30 @@ bin/gnome-panel-screenshot bin/panel-test-applets etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot/%gconf.xml etc/gconf/gconf.xml.defaults/apps/panel/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/clock/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/mixer/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/show_desktop_button/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_list/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_menu/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/workspace_switcher/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/general/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/menu_bar/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/nautilus_launcher/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/terminal_launcher/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel/%gconf.xml etc/gconf/gconf.xml.defaults/apps/panel/global/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome_panel_screenshot/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/general/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/00000001/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/00000002/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000001/%gconf.xml @@ -36,60 +43,67 @@ etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/ etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000001/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000002/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/general/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/panels/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/panels/00000001/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/panel/general/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/global/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/panel/objects/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels/background/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet/prefs/%gconf.xml etc/gconf/schemas/clock.schemas etc/gconf/schemas/fish.schemas etc/gconf/schemas/gnome-panel-screenshot.schemas -etc/gconf/schemas/mailcheck.schemas -etc/gconf/schemas/pager.schemas -etc/gconf/schemas/panel-global-config.schemas -etc/gconf/schemas/panel-per-panel-config.schemas -etc/gconf/schemas/tasklist.schemas -etc/sound/events/mailcheck.soundlist +etc/gconf/schemas/panel-compatibility.schemas +etc/gconf/schemas/panel-default-setup.entries +etc/gconf/schemas/panel-general.schemas +etc/gconf/schemas/panel-global.schemas +etc/gconf/schemas/panel-object.schemas +etc/gconf/schemas/panel-toplevel.schemas +etc/gconf/schemas/window-list.schemas +etc/gconf/schemas/workspace-switcher.schemas include/panel-2.0/GNOME_Panel.h include/panel-2.0/panel-applet-gconf.h include/panel-2.0/panel-applet.h -lib/libgen_util_applet-2.so +lib/libclock-applet-2.so lib/libpanel-applet-2.a lib/libpanel-applet-2.so lib/libpanel-applet-2.so.0 +libdata/bonobo/servers/GNOME_ClockApplet_Factory.server libdata/bonobo/servers/GNOME_FishApplet_Factory.server -libdata/bonobo/servers/GNOME_GenUtilApplet_Factory.server libdata/bonobo/servers/GNOME_NotificationAreaApplet.server libdata/bonobo/servers/GNOME_Panel.server +libdata/bonobo/servers/GNOME_Wncklet_Factory.server libdata/pkgconfig/libpanelapplet-2.0.pc libexec/fish-applet-2 libexec/notification-area-applet +libexec/wnck-applet share/doc/panel-applet/applet-popups.html share/doc/panel-applet/applet-porting.html share/doc/panel-applet/applet-writing.html share/doc/panel-applet/index.sgml share/doc/panel-applet/libpanel-applet.html share/doc/panel-applet/multi-applets.html +share/doc/panel-applet/panel-applet-panel-applet-gconf-utilities.html share/doc/panel-applet/panel-applet.html share/doc/panel-applet/panel-signals.html share/doc/panel-applet/panelapplet.html share/doc/panel-applet/server-files.html share/doc/panel-applet/session-saving.html share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop -share/gnome/fish/fish.glade -share/gnome/gen_util/pager.glade -share/gnome/gen_util/tasklist.glade share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml -share/gnome/gnome-2.0/ui/GNOME_MailCheckApplet.xml share/gnome/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml -share/gnome/gnome-2.0/ui/GNOME_PagerApplet.xml share/gnome/gnome-2.0/ui/GNOME_Panel_Popup.xml share/gnome/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml -share/gnome/gnome-2.0/ui/GNOME_TasklistApplet.xml +share/gnome/gnome-2.0/ui/GNOME_WindowListApplet.xml +share/gnome/gnome-2.0/ui/GNOME_WindowMenuApplet.xml +share/gnome/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml +share/gnome/gnome-panel/glade/fish.glade share/gnome/gnome-panel/glade/panel-test-applets.glade +share/gnome/gnome-panel/glade/window-list.glade +share/gnome/gnome-panel/glade/workspace-switcher.glade share/gnome/gnome-panelrc share/gnome/help/clock/C/clock.xml share/gnome/help/clock/C/figures/clock_applet.png @@ -159,63 +173,6 @@ share/gnome/help/fish-applet-2/zh_TW/figures/fish_applet.png share/gnome/help/fish-applet-2/zh_TW/figures/fish_settings.png share/gnome/help/fish-applet-2/zh_TW/fish-applet-2.xml share/gnome/help/fish-applet-2/zh_TW/legal.xml -share/gnome/help/mailcheck/C/figures/mailcheck_applet.png -share/gnome/help/mailcheck/C/legal.xml -share/gnome/help/mailcheck/C/mailcheck.xml -share/gnome/help/mailcheck/de/figures/mailcheck-applet.png -share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/de/figures/mailcheck_applet.png -share/gnome/help/mailcheck/de/legal.xml -share/gnome/help/mailcheck/de/mailcheck.xml -share/gnome/help/mailcheck/es/figures/mailcheck-applet.png -share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/es/figures/mailcheck_applet.png -share/gnome/help/mailcheck/es/legal.xml -share/gnome/help/mailcheck/es/mailcheck.xml -share/gnome/help/mailcheck/fr/figures/mailcheck-applet.png -share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/fr/figures/mailcheck_applet.png -share/gnome/help/mailcheck/fr/legal.xml -share/gnome/help/mailcheck/fr/mailcheck.xml -share/gnome/help/mailcheck/it/figures/mailcheck-applet.png -share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/it/figures/mailcheck_applet.png -share/gnome/help/mailcheck/it/legal.xml -share/gnome/help/mailcheck/it/mailcheck.xml -share/gnome/help/mailcheck/ja/figures/mailcheck_applet.png -share/gnome/help/mailcheck/ja/legal.xml -share/gnome/help/mailcheck/ja/mailcheck.xml -share/gnome/help/mailcheck/ko/figures/mailcheck-applet.png -share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/ko/figures/mailcheck_applet.png -share/gnome/help/mailcheck/ko/legal.xml -share/gnome/help/mailcheck/ko/mailcheck.xml -share/gnome/help/mailcheck/sv/figures/mailcheck-applet.png -share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/sv/figures/mailcheck_applet.png -share/gnome/help/mailcheck/sv/legal.xml -share/gnome/help/mailcheck/sv/mailcheck.xml -share/gnome/help/mailcheck/zh_CN/figures/mailcheck-applet.png -share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/zh_CN/figures/mailcheck_applet.png -share/gnome/help/mailcheck/zh_CN/legal.xml -share/gnome/help/mailcheck/zh_CN/mailcheck.xml -share/gnome/help/mailcheck/zh_TW/figures/mailcheck-applet.png -share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/zh_TW/figures/mailcheck_applet.png -share/gnome/help/mailcheck/zh_TW/legal.xml -share/gnome/help/mailcheck/zh_TW/mailcheck.xml -share/gnome/help/notification-area/C/figures/notification-area.png -share/gnome/help/notification-area/C/legal.xml -share/gnome/help/notification-area/C/notification-area.xml share/gnome/help/window-list/C/figures/window_list_applet.png share/gnome/help/window-list/C/figures/window_list_group_applet.png share/gnome/help/window-list/C/legal.xml @@ -343,28 +300,6 @@ share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-de.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-de.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-es.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-es.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-fr.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-fr.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-it.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-it.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-ja.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-ja.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-ko.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-ko.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-sv.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-sv.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-zh_CN.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-zh_TW.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/notification-area-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/window-list-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/window-list-de.omf @@ -407,18 +342,31 @@ share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/panel/gnome-panel-preferences.glade share/gnome/panel/gnome-panel-screenshot.glade +share/gnome/panel/panel-properties-dialog.glade +share/gnome/panel/panel-run-dialog.glade +share/gnome/pixmaps/cdeappmenu.png share/gnome/pixmaps/fish/fishanim.png share/gnome/pixmaps/fish/footguy.png share/gnome/pixmaps/fish/monkey.png share/gnome/pixmaps/fish/oldwanda.png +share/gnome/pixmaps/gnome-amusements.png +share/gnome/pixmaps/gnome-clock.png share/gnome/pixmaps/gnome-fish.png +share/gnome/pixmaps/gnome-gegl.png +share/gnome/pixmaps/gnome-gegl2-2.png +share/gnome/pixmaps/gnome-gegl2.png +share/gnome/pixmaps/gnome-main-menu.png +share/gnome/pixmaps/gnome-panel-type-corner.png +share/gnome/pixmaps/gnome-panel-type-edge.png +share/gnome/pixmaps/gnome-panel-type-floating.png +share/gnome/pixmaps/gnome-panel-type-menu.png +share/gnome/pixmaps/gnome-panel-type-sliding.png +share/gnome/pixmaps/gnome-panel.png +share/gnome/pixmaps/gnome-run.png +share/gnome/pixmaps/gnome-screenshot.png share/gnome/pixmaps/gnome-show-desktop.png -share/gnome/pixmaps/mailcheck/eclouds.png -share/gnome/pixmaps/mailcheck/email-e.png -share/gnome/pixmaps/mailcheck/email-eclouds.png -share/gnome/pixmaps/mailcheck/email-tiny.png -share/gnome/pixmaps/mailcheck/email.png -share/gnome/pixmaps/mailcheck/tux-anim.png +share/gnome/pixmaps/panel-drawer.png +share/gnome/pixmaps/panel-force-quit.png share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo @@ -521,30 +469,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/window-list/C/figures @dirrm share/gnome/help/window-list/C @dirrm share/gnome/help/window-list -@dirrm share/gnome/help/notification-area/C/figures -@dirrm share/gnome/help/notification-area/C -@dirrm share/gnome/help/notification-area -@dirrm share/gnome/help/mailcheck/zh_TW/figures -@dirrm share/gnome/help/mailcheck/zh_TW -@dirrm share/gnome/help/mailcheck/zh_CN/figures -@dirrm share/gnome/help/mailcheck/zh_CN -@dirrm share/gnome/help/mailcheck/sv/figures -@dirrm share/gnome/help/mailcheck/sv -@dirrm share/gnome/help/mailcheck/ko/figures -@dirrm share/gnome/help/mailcheck/ko -@dirrm share/gnome/help/mailcheck/ja/figures -@dirrm share/gnome/help/mailcheck/ja -@dirrm share/gnome/help/mailcheck/it/figures -@dirrm share/gnome/help/mailcheck/it -@dirrm share/gnome/help/mailcheck/fr/figures -@dirrm share/gnome/help/mailcheck/fr -@dirrm share/gnome/help/mailcheck/es/figures -@dirrm share/gnome/help/mailcheck/es -@dirrm share/gnome/help/mailcheck/de/figures -@dirrm share/gnome/help/mailcheck/de -@dirrm share/gnome/help/mailcheck/C/figures -@dirrm share/gnome/help/mailcheck/C -@dirrm share/gnome/help/mailcheck @dirrm share/gnome/help/fish-applet-2/zh_TW/figures @dirrm share/gnome/help/fish-applet-2/zh_TW @dirrm share/gnome/help/fish-applet-2/zh_CN/figures @@ -589,17 +513,17 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/clock @dirrm share/gnome/gnome-panel/glade @dirrm share/gnome/gnome-panel -@dirrm share/gnome/gen_util -@dirrm share/gnome/fish @dirrm share/doc/panel-applet @dirrm include/panel-2.0 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/prefs -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet/prefs +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet/prefs +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels/background +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/objects @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/global -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/panels/00000001 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/panels -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/general -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/general @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000002 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000001 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels @@ -614,23 +538,30 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000001 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/00000002 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/00000001 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/general -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/prefs -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_panel_screenshot @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet @dirrm etc/gconf/gconf.xml.defaults/apps/panel/global +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/terminal_launcher +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/nautilus_launcher +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/menu_bar +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/general +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/workspace_switcher +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_menu +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_list +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/show_desktop_button +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/mixer +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/clock +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup @dirrm etc/gconf/gconf.xml.defaults/apps/panel @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true @@ -653,17 +584,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-de.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-es.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-fr.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-it.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-ja.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-ko.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-sv.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-de.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-es.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 1c434ac65945..48f0b8e7bbb9 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -6,16 +6,11 @@ # PORTNAME= gnomesession -PORTVERSION= 2.2.2 -PORTREVISION= 1 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome -MASTER_SITES= ${MASTER_SITE_GNOME} \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= sources/gnome-session/2.2 \ - marcus/:local +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/gnome-session/2.4 DISTNAME= gnome-session-${PORTVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - splash.png:local DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -27,18 +22,11 @@ USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui USE_GMAKE= yes USE_LIBTOOL= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \ gnome-session-save.1 MAN5= default.session.5 -post-extract: - @${CP} ${DISTDIR}/${DIST_SUBDIR}/splash.png ${WRKDIR} - -post-install: - ${INSTALL_DATA} ${WRKDIR}/splash.png \ - ${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png - .include <bsd.port.mk> diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index 81c567b465b0..93da50979a59 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,2 +1 @@ -MD5 (gnome2/gnome-session-2.2.2.tar.bz2) = 7dcfea0d925ddecb7c9700ddf597b17c -MD5 (gnome2/splash.png) = 244d7cadfb0f5e7ba624a1d4e749a312 +MD5 (gnome2/gnome-session-2.4.0.tar.bz2) = 6a7acf3429b927c69e18019f9ec6fa9f diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist index 75f1650b4f35..d4fc0ded7788 100644 --- a/x11/gnome-session/pkg-plist +++ b/x11/gnome-session/pkg-plist @@ -1,5 +1,6 @@ bin/gnome-session bin/gnome-session-properties +bin/gnome-session-remove bin/gnome-session-save bin/gnome-smproxy bin/gnome-wm @@ -16,15 +17,17 @@ share/locale/am/LC_MESSAGES/gnome-session-2.0.mo share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo share/locale/az/LC_MESSAGES/gnome-session-2.0.mo share/locale/be/LC_MESSAGES/gnome-session-2.0.mo +share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo share/locale/bs/LC_MESSAGES/gnome-session-2.0.mo share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo -share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo share/locale/ca/LC_MESSAGES/gnome-session-2.0.mo share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo +share/locale/cy/LC_MESSAGES/gnome-session-2.0.mo share/locale/da/LC_MESSAGES/gnome-session-2.0.mo share/locale/de/LC_MESSAGES/gnome-session-2.0.mo share/locale/el/LC_MESSAGES/gnome-session-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-session-2.0.mo +share/locale/eo/LC_MESSAGES/gnome-session-2.0.mo share/locale/es/LC_MESSAGES/gnome-session-2.0.mo share/locale/et/LC_MESSAGES/gnome-session-2.0.mo share/locale/eu/LC_MESSAGES/gnome-session-2.0.mo @@ -37,6 +40,7 @@ share/locale/he/LC_MESSAGES/gnome-session-2.0.mo share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo share/locale/hu/LC_MESSAGES/gnome-session-2.0.mo share/locale/id/LC_MESSAGES/gnome-session-2.0.mo +share/locale/is/LC_MESSAGES/gnome-session-2.0.mo share/locale/it/LC_MESSAGES/gnome-session-2.0.mo share/locale/ja/LC_MESSAGES/gnome-session-2.0.mo share/locale/kn/LC_MESSAGES/gnome-session-2.0.mo @@ -62,13 +66,13 @@ share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo share/locale/sr@Latn/LC_MESSAGES/gnome-session-2.0.mo share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo +share/locale/th/LC_MESSAGES/gnome-session-2.0.mo share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo -@dirrm share/gnome/omf/gnome-core @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/options @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-session/options diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index e6c8538e5c8f..edcdf8d713dd 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnometerminal -PORTVERSION= 2.2.2 +PORTVERSION= 2.4.0.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-terminal/2.2 +MASTER_SITE_SUBDIR= sources/gnome-terminal/2.4 DISTNAME= gnome-terminal-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,17 +20,9 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui +USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui vte USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -.if defined(WITH_ZVT) -CONFIGURE_ARGS= --with-widget=zvt -USE_GNOME+= libzvt -.else -CONFIGURE_ARGS= --with-widget=vte -USE_GNOME+= vte -.endif - .include <bsd.port.mk> diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo index a11d0bf0d30e..dafc5d297de9 100644 --- a/x11/gnome-terminal/distinfo +++ b/x11/gnome-terminal/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-terminal-2.2.2.tar.bz2) = 30140540966ba84597e257054a232e99 +MD5 (gnome2/gnome-terminal-2.4.0.1.tar.bz2) = 6d939e67c052e43686e2357e8083ad66 diff --git a/x11/gnome-terminal/files/patch-src_terminal-widget-zvt.c b/x11/gnome-terminal/files/patch-src_terminal-widget-zvt.c deleted file mode 100644 index 84c13e0aaed1..000000000000 --- a/x11/gnome-terminal/files/patch-src_terminal-widget-zvt.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/terminal-widget-zvt.c.orig Wed Feb 12 18:06:32 2003 -+++ src/terminal-widget-zvt.c Wed Feb 12 18:05:20 2003 -@@ -1132,8 +1132,8 @@ - terminal_widget_set_pango_font (GtkWidget *widget, - const PangoFontDescription *font_desc) - { -- g_return_if_fail (font_desc != NULL); -- zvt_term_set_pango_font (ZVT_TERM (widget), font_desc); -+ /*g_return_if_fail (font_desc != NULL); -+ zvt_term_set_pango_font (ZVT_TERM (widget), font_desc);*/ - } - - gboolean diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist index 1ab44e46820f..b101373be612 100644 --- a/x11/gnome-terminal/pkg-plist +++ b/x11/gnome-terminal/pkg-plist @@ -11,6 +11,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default/%gconf.xml etc/gconf/schemas/gnome-terminal.schemas libdata/bonobo/servers/gnome-terminal.server +share/gnome/application-registry/gnome-terminal.applications share/gnome/applications/gnome-terminal.desktop share/gnome/gnome-terminal/glade/gnome-terminal.glade2 share/gnome/help/gnome-terminal/C/figures/gnome-terminal-default.png @@ -96,8 +97,10 @@ share/locale/ar/LC_MESSAGES/gnome-terminal.mo share/locale/az/LC_MESSAGES/gnome-terminal.mo share/locale/be/LC_MESSAGES/gnome-terminal.mo share/locale/bg/LC_MESSAGES/gnome-terminal.mo +share/locale/bn/LC_MESSAGES/gnome-terminal.mo share/locale/ca/LC_MESSAGES/gnome-terminal.mo share/locale/cs/LC_MESSAGES/gnome-terminal.mo +share/locale/cy/LC_MESSAGES/gnome-terminal.mo share/locale/da/LC_MESSAGES/gnome-terminal.mo share/locale/de/LC_MESSAGES/gnome-terminal.mo share/locale/el/LC_MESSAGES/gnome-terminal.mo @@ -107,9 +110,12 @@ share/locale/et/LC_MESSAGES/gnome-terminal.mo share/locale/fa/LC_MESSAGES/gnome-terminal.mo share/locale/fi/LC_MESSAGES/gnome-terminal.mo share/locale/fr/LC_MESSAGES/gnome-terminal.mo +share/locale/ga/LC_MESSAGES/gnome-terminal.mo share/locale/gl/LC_MESSAGES/gnome-terminal.mo share/locale/he/LC_MESSAGES/gnome-terminal.mo +share/locale/hi/LC_MESSAGES/gnome-terminal.mo share/locale/hu/LC_MESSAGES/gnome-terminal.mo +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/ko/LC_MESSAGES/gnome-terminal.mo @@ -132,14 +138,12 @@ 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/sv/LC_MESSAGES/gnome-terminal.mo -share/locale/ta/LC_MESSAGES/gnome-terminal.mo share/locale/tr/LC_MESSAGES/gnome-terminal.mo share/locale/uk/LC_MESSAGES/gnome-terminal.mo share/locale/vi/LC_MESSAGES/gnome-terminal.mo share/locale/wa/LC_MESSAGES/gnome-terminal.mo share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo -@dirrm share/gnome/omf/gnome-terminal @dirrm share/gnome/help/gnome-terminal/zh_TW/figures @dirrm share/gnome/help/gnome-terminal/zh_TW @dirrm share/gnome/help/gnome-terminal/zh_CN/figures @@ -160,7 +164,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo @dirrm share/gnome/help/gnome-terminal/es @dirrm share/gnome/help/gnome-terminal/de/figures @dirrm share/gnome/help/gnome-terminal/de -@dirrm share/gnome/help/gnome-terminal/C/figures @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile index 6123bbef2171..f0c1a113d8fa 100644 --- a/x11/gnome2-fifth-toe/Makefile +++ b/x11/gnome2-fifth-toe/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnome2-fifth-toe -PORTVERSION= 2.2.2 -PORTREVISION= 1 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -24,7 +23,6 @@ RUN_DEPENDS= gnumeric:${PORTSDIR}/math/gnumeric2 \ gimp-1.3:${PORTSDIR}/graphics/gimp-devel \ sodipodi:${PORTSDIR}/graphics/sodipodi \ gnomeicu:${PORTSDIR}/net/gnomeicu2 \ - gcalctool:${PORTSDIR}/math/gcalctool \ gthumb:${PORTSDIR}/graphics/gthumb2 \ mergeant:${PORTSDIR}/databases/mergeant \ ghex2:${PORTSDIR}/editors/ghex2 \ @@ -32,25 +30,18 @@ RUN_DEPENDS= gnumeric:${PORTSDIR}/math/gnumeric2 \ gob2:${PORTSDIR}/devel/gob2 \ gtetrinet:${PORTSDIR}/games/gtetrinet \ ${X11BASE}/lib/gaim/docklet.so:${PORTSDIR}/net/gaim \ - gnomemeeting:${PORTSDIR}/net/gnomemeeting \ - gnome-font-viewer:${PORTSDIR}/x11-fonts/fontilus \ - seahorse:${PORTSDIR}/security/seahorse \ - totem:${PORTSDIR}/multimedia/totem \ sawfish:${PORTSDIR}/x11-wm/sawfish2 \ dia:${PORTSDIR}/graphics/dia \ mrproject:${PORTSDIR}/deskutils/mrproject \ - ${X11BASE}/libexec/stickynotes_applet:${PORTSDIR}/misc/stickynotes_applet \ tsclient:${PORTSDIR}/net/tsclient \ - zenity:${PORTSDIR}/x11/zenity \ - gucharmap:${PORTSDIR}/deskutils/gucharmap \ regexxer:${PORTSDIR}/devel/regexxer \ - galeon:${PORTSDIR}/www/galeon2 \ streamtuner:${PORTSDIR}/audio/streamtuner \ - gok:${PORTSDIR}/sysutils/gok \ meld:${PORTSDIR}/textproc/meld \ gcompris:${PORTSDIR}/games/gcompris2 \ - gurlchecker:${PORTSDIR}/www/gurlchecker \ + galeon:${PORTSDIR}/www/galeon2 \ gswitchit-properties-capplet:${PORTSDIR}/x11/gswitchit \ + totem:${PORTSDIR}/multimedia/totem \ + seahorse:${PORTSDIR}/security/seahorse \ workrave:${PORTSDIR}/x11/workrave NO_BUILD= yes diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index f95aaaf239a3..9f4b03562e1e 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnome2 -PORTVERSION= 2.2.2 -PORTREVISION= 2 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -18,7 +17,7 @@ COMMENT= The "meta-port" for the GNOME 2 integrated X11 desktop RUN_DEPENDS= ${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \ gnome-cd:${PORTSDIR}/audio/gnomemedia2 \ - gnome-calculator:${PORTSDIR}/deskutils/gnomeutils2 \ + gnome-dictionary:${PORTSDIR}/deskutils/gnomeutils2 \ eog:${PORTSDIR}/graphics/eog2 \ gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \ gconf-editor:${PORTSDIR}/sysutils/gconf-editor \ @@ -26,7 +25,6 @@ RUN_DEPENDS= ${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \ gedit:${PORTSDIR}/editors/gedit2 \ gnome-terminal:${PORTSDIR}/x11/gnometerminal \ gnome-session:${PORTSDIR}/x11/gnomesession \ - metacity:${PORTSDIR}/x11-wm/metacity \ bug-buddy:${PORTSDIR}/devel/bugbuddy2 \ gnome-system-monitor:${PORTSDIR}/sysutils/gnomesystemmonitor \ nautilus:${PORTSDIR}/x11-fm/nautilus2 \ @@ -36,21 +34,27 @@ RUN_DEPENDS= ${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \ ${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnomeuserdocs2 \ ${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnomeaudio2 \ ${X11BASE}/libdata/pkgconfig/libgail-gnome.pc:${PORTSDIR}/x11-toolkits/libgail-gnome \ - ${X11BASE}/libdata/pkgconfig/vte.pc:${PORTSDIR}/x11-toolkits/vte \ - ${X11BASE}/libdata/pkgconfig/libzvt-2.0.pc:${PORTSDIR}/x11-toolkits/libzvt \ file-roller:${PORTSDIR}/archivers/fileroller \ ${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-toolkits/gnome-themes \ ggv:${PORTSDIR}/print/ggv2 \ - gnome-pkgview:${PORTSDIR}/sysutils/gnome-pkgview \ acme:${PORTSDIR}/multimedia/acme \ + gok:${PORTSDIR}/sysutils/gok \ + gpdf:${PORTSDIR}/graphics/gpdf \ + nautilus-cd-burner:${PORTSDIR}/sysutils/nautilus-cd-burner \ + gcalctool:${PORTSDIR}/math/gcalctool \ + gucharmap:${PORTSDIR}/deskutils/gucharmap \ + zenity:${PORTSDIR}/x11/zenity \ gst-thumbnail:${PORTSDIR}/multimedia/nautilus-media \ - ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera + ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ + gnomemeeting:${PORTSDIR}/net/gnomemeeting \ + epiphany:${PORTSDIR}/www/epiphany \ + gnopernicus:${PORTSDIR}/x11/gnopernicus NO_BUILD= yes USE_PYTHON= yes -.if !defined(PACKAGE_BUILDING) +.if !defined(BATCH) && !defined(PACKAGE_BUILDING) pre-configure: @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .endif diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile index 9bef6cc276b8..0a07d795a9cc 100644 --- a/x11/gnomeapplets2/Makefile +++ b/x11/gnomeapplets2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomeapplets2 -PORTVERSION= 2.2.2 -PORTREVISION= 3 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-applets/2.2 +MASTER_SITE_SUBDIR= sources/gnome-applets/2.4 DISTNAME= gnome-applets-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo index e16c408d8425..52d4f73acccc 100644 --- a/x11/gnomeapplets2/distinfo +++ b/x11/gnomeapplets2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-applets-2.2.2.tar.bz2) = d8a8fdbae66274bab4a309073d2072ab +MD5 (gnome2/gnome-applets-2.4.0.tar.bz2) = c17dba203ea379af5da056862672026c diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa index ffe06143e3f0..7c9edcd6d43a 100644 --- a/x11/gnomeapplets2/files/patch-aa +++ b/x11/gnomeapplets2/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Mon Dec 16 17:15:36 2002 -+++ configure Thu Dec 19 13:43:27 2002 -@@ -7862,6 +7862,7 @@ +--- configure.orig Sun Jun 1 13:55:59 2003 ++++ configure Mon Jun 2 02:36:19 2003 +@@ -7863,6 +7863,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,7 +8,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -12328,6 +12329,7 @@ +@@ -11202,6 +11203,7 @@ *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";; *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";; *netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";; @@ -16,28 +16,7 @@ *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;; esac case "$host" in -@@ -12391,6 +12393,20 @@ - fi - - ;; -+ i386-*-freebsd*) -+ HAVE_LIBAPM=no -+if test "x$HAVE_LIBAPM" = "xyes"; then -+ HAVE_LIBAPM_TRUE= -+ HAVE_LIBAPM_FALSE='#' -+else -+ HAVE_LIBAPM_TRUE='#' -+ HAVE_LIBAPM_FALSE= -+fi -+ ;; -+ *-*-freebsd*) -+ build_battstat_applet=no -+ -+ ;; - *-*-linux*) - echo "$as_me:$LINENO: checking for apm_read in -lapm" >&5 - echo $ECHO_N "checking for apm_read in -lapm... $ECHO_C" >&6 -@@ -13688,14 +13704,14 @@ +@@ -12771,14 +12773,14 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" cat >>confdefs.h <<_ACEOF diff --git a/x11/gnomeapplets2/files/patch-battstat_Makefile.in b/x11/gnomeapplets2/files/patch-battstat_Makefile.in index f47e6bab6dae..1908749369cb 100644 --- a/x11/gnomeapplets2/files/patch-battstat_Makefile.in +++ b/x11/gnomeapplets2/files/patch-battstat_Makefile.in @@ -1,21 +1,21 @@ ---- battstat/Makefile.in.orig Thu Dec 19 13:50:27 2002 -+++ battstat/Makefile.in Thu Dec 19 13:51:02 2002 -@@ -148,11 +148,11 @@ +--- battstat/Makefile.in.orig Sun Jun 29 16:43:23 2003 ++++ battstat/Makefile.in Sun Jun 29 16:45:10 2003 +@@ -146,11 +146,11 @@ pixmapsdir = $(datadir)/pixmaps pixmaps_DATA = battstat.png - @HAVE_LIBAPM_TRUE@APMLIB = @HAVE_LIBAPM_TRUE@-lapm --@HAVE_LIBAPM_FALSE@APMLIB = @HAVE_LIBAPM_FALSE@apmlib/libapm.a -+@HAVE_LIBAPM_FALSE@APMLIB = + @HAVE_LIBAPM_TRUE@APMLIB = -lapm +-@HAVE_LIBAPM_FALSE@APMLIB = apmlib/libapm.a ++@HAVE_LIBAPM_FALSE@APMLIB = @HAVE_LIBAPM_TRUE@APMDIR = --@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_FALSE@apmlib -+@HAVE_LIBAPM_FALSE@APMDIR = +-@HAVE_LIBAPM_FALSE@APMDIR = apmlib ++@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_TRUE@APMINC = --@HAVE_LIBAPM_FALSE@APMINC = @HAVE_LIBAPM_FALSE@-Iapmlib/ -+@HAVE_LIBAPM_FALSE@APMINC = +-@HAVE_LIBAPM_FALSE@APMINC = -Iapmlib/ ++@HAVE_LIBAPM_FALSE@APMINC = SUBDIRS = docs sounds $(APMDIR) -@@ -223,8 +223,7 @@ +@@ -199,8 +199,7 @@ @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = \ @HAVE_LIBAPM_TRUE@$(top_builddir)/screen-exec/libscreen-exec.la @HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES = \ diff --git a/x11/gnomeapplets2/files/patch-charpick_charpick.c b/x11/gnomeapplets2/files/patch-charpick_charpick.c new file mode 100644 index 000000000000..7d0ee91eb476 --- /dev/null +++ b/x11/gnomeapplets2/files/patch-charpick_charpick.c @@ -0,0 +1,11 @@ +--- charpick/charpick.c.orig Wed Sep 10 13:33:00 2003 ++++ charpick/charpick.c Wed Sep 10 13:33:19 2003 +@@ -3,7 +3,7 @@ + */ + + #include <config.h> +-#ifndef sun ++#if !defined(sun) && !defined(__FreeBSD__) + #include <tgmath.h> + #endif + #include <panel-applet.h> diff --git a/x11/gnomeapplets2/files/patch-gweather::Locations b/x11/gnomeapplets2/files/patch-gweather::Locations deleted file mode 100644 index 3e14e26d8de3..000000000000 --- a/x11/gnomeapplets2/files/patch-gweather::Locations +++ /dev/null @@ -1,35 +0,0 @@ - -$FreeBSD$ - ---- gweather/Locations.orig Wed May 15 00:32:46 2002 -+++ gweather/Locations Tue May 21 19:00:43 2002 -@@ -1588,7 +1588,7 @@ - - [EU] - name=Europe --states=AB OS BE BA BG CZ HR CY DK EE FI FR MK DE GI GR HU IE IS IT LV LT LU MT MD NL NO PL PT RO RU SK SI SP SE CH TR UK YU -+states=AB OS BE BA BG CZ HR CY DK EE FI FR MK DE GI GR HU IE IS IT LV LT LU MT MD NL NO PL PT RO RU SK SI SP SE CH TR UA UK YU - - [EU_AB] - name=Albania -@@ -1857,6 +1857,20 @@ - loc50=Yakutsk UEEE ------ --- - loc51=Yekaterinburg USSS ------ --- - loc52=Yuzhno-Sakhalinsk UHSS ------ --- -+ -+[EU_UA] -+name=Ukraine -+loc0=Kiev UKBB ------ --- -+loc1=Donetsk UKCC ------ --- -+loc2=Dnepropetrovsk UKDD ------ --- -+loc3=Krivoy\\ Rog UKDR ------ --- -+loc4=Simferopol UKFF ------ --- -+loc5=Kharkov UKHH ------ --- -+loc6=Ivano-frankovsk UKLI ------ --- -+loc7=Lvov UKLL ------ --- -+loc8=Rovno UKLR ------ --- -+loc9=Uzhgorod UKLU ------ --- -+loc10=Odessa UKOO ------ --- - - [EU_SK] - name=Slovakia diff --git a/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in b/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in new file mode 100644 index 000000000000..973b7e342c3e --- /dev/null +++ b/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in @@ -0,0 +1,11 @@ +--- stickynotes/Makefile.in.orig Thu Aug 28 01:00:09 2003 ++++ stickynotes/Makefile.in Thu Aug 28 01:00:26 2003 +@@ -142,7 +142,7 @@ + + SUBDIRS = pixmaps docs + +-CFLAGS = -Wall -g ++CFLAGS += -Wall -g + + INCLUDES = -I. -I$(srcdir) $(GNOME_APPLETS_CFLAGS) $(LIBGLADE_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DSTICKYNOTES_GLADEDIR=\"$(gladedir)\" -DSTICKYNOTES_ICONDIR=\"$(icondir)\" + diff --git a/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c b/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c index 3b247a47b947..5c1e32e88b09 100644 --- a/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c +++ b/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c @@ -1,6 +1,6 @@ ---- wireless/wireless-applet.c.orig Mon May 19 00:50:43 2003 -+++ wireless/wireless-applet.c Wed Aug 20 12:12:05 2003 -@@ -30,12 +30,27 @@ +--- wireless/wireless-applet.c.orig Sat Aug 23 09:10:54 2003 ++++ wireless/wireless-applet.c Thu Aug 28 00:44:16 2003 +@@ -30,12 +30,25 @@ #include <math.h> #include <dirent.h> @@ -10,10 +10,8 @@ +#include <net/if.h> +#include <net/if_var.h> +#include <dev/an/if_aironet_ieee.h> -+#if __FreeBSD_version >= 460100 +#include <dev/wi/if_wavelan_ieee.h> +#endif -+#endif + #include <gnome.h> #include <panel-applet.h> @@ -28,32 +26,33 @@ #define CFG_UPDATE_INTERVAL 2 typedef enum { -@@ -93,6 +108,14 @@ +@@ -89,6 +102,12 @@ WirelessApplet *applet); static void wireless_applet_about_cb (BonoboUIComponent *uic, WirelessApplet *applet); +#ifdef __FreeBSD__ +static int an_getval(WirelessApplet *applet, char *device, struct an_req *areq); +static void get_an_data(WirelessApplet *applet, char *device, long int *level); -+#if __FreeBSD_version >= 460100 +static int wi_getval(WirelessApplet *applet, char *device, struct wi_req *areq); +static void get_wi_data(WirelessApplet *applet, char *device, long int *level); +#endif -+#endif static const BonoboUIVerb wireless_menu_verbs [] = { BONOBO_UI_UNSAFE_VERB ("WirelessProperties", -@@ -150,7 +173,9 @@ +@@ -143,9 +162,11 @@ g_free (tmp); /* Update the image */ +#ifndef __FreeBSD__ - percent = CLAMP (percent, 0, 100); + percent = CLAMP (percent, -1, 100); +#endif - if (applet->pixmaps[percent] != applet->current_pixmap) - { -@@ -234,6 +259,7 @@ +- if (percent < 0) ++ if (percent < 0 || percent > 100) + state = PIX_BROKEN; + else if (percent == 0) + state = PIX_NO_LINK; +@@ -176,6 +197,7 @@ int percent; /* Calculate the percentage based on the link quality */ @@ -61,7 +60,7 @@ if (level < 0) { percent = -1; } else { -@@ -244,8 +270,11 @@ +@@ -186,6 +208,9 @@ percent = CLAMP (percent, 0, 100); } } @@ -69,17 +68,13 @@ + percent = (int)level; +#endif -- if (percent < 0) { -+ if (percent < 0 || percent > 100) { - applet->state = BUSTED_LINK; - wireless_applet_animation_state (applet); - } else if (percent == 0) { -@@ -387,22 +416,182 @@ - applet->show_dialogs = show; + wireless_applet_draw (applet, percent); + } +@@ -228,22 +253,179 @@ + } } +#ifdef __FreeBSD__ -+#if __FreeBSD_version >= 460100 +static int +wi_getval(WirelessApplet *applet, char *device, struct wi_req *wreq) +{ @@ -135,7 +130,7 @@ + + return; +} -+#endif ++ +static int +an_getval(WirelessApplet *applet, char *device, struct an_req *areq) +{ @@ -244,7 +239,6 @@ + wireless_applet_update_state (applet, device, 0, level, 0); + } + } -+#if __FreeBSD_version >= 460100 + else + if (g_strncasecmp(device, "wi", 2)==0) { + applet->devices = g_list_prepend (applet->devices, g_strdup (device)); @@ -253,13 +247,12 @@ + wireless_applet_update_state (applet, device, 0, level, 0); + } + } -+#endif + ifs++; +#else char *ptr; fgets (line, 256, applet->file); -@@ -435,6 +624,7 @@ +@@ -276,6 +458,7 @@ wireless_applet_update_state (applet, device, link, level, noise); } } @@ -267,7 +260,7 @@ } while (1); if (g_list_length (applet->devices)==1) { -@@ -446,17 +636,23 @@ +@@ -287,17 +470,23 @@ } /* rewind the /proc/net/wireless file */ @@ -291,7 +284,7 @@ wireless_applet_read_device_state (applet); -@@ -522,6 +718,7 @@ +@@ -344,6 +533,7 @@ static void start_file_read (WirelessApplet *applet) { @@ -299,7 +292,7 @@ applet->file = fopen ("/proc/net/wireless", "rt"); if (applet->file == NULL) { gtk_tooltips_set_tip (applet->tips, -@@ -530,6 +727,7 @@ +@@ -352,6 +542,7 @@ NULL); show_error_dialog (_("There doesn't seem to be any wireless devices configured on your system.\nPlease verify your configuration if you think this is incorrect.")); } @@ -307,7 +300,7 @@ } static void -@@ -775,8 +973,10 @@ +@@ -577,8 +768,10 @@ applet->prefs = NULL; } @@ -317,4 +310,4 @@ +#endif } - static GtkWidget * + static void diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist index afbdd9de3754..73b9b72d75d2 100644 --- a/x11/gnomeapplets2/pkg-plist +++ b/x11/gnomeapplets2/pkg-plist @@ -1,4 +1,8 @@ bin/gkb_xmmap +bin/gnome-keyboard-layout +etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/defaults/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/settings/%gconf.xml %%BATTERY%%etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/%gconf.xml %%BATTERY%%etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet/%gconf.xml @@ -15,12 +19,19 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gtik/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gtik/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gweather/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gweather/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/multiload/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/defaults/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/settings/%gconf.xml %%BATTERY%%etc/gconf/schemas/battstat.schemas etc/gconf/schemas/cdplayer.schemas etc/gconf/schemas/charpick.schemas @@ -29,11 +40,16 @@ etc/gconf/schemas/geyes.schemas etc/gconf/schemas/gkb.schemas etc/gconf/schemas/gtik.schemas etc/gconf/schemas/gweather.schemas +etc/gconf/schemas/mailcheck.schemas etc/gconf/schemas/mini-commander.schemas +etc/gconf/schemas/mixer.schemas etc/gconf/schemas/modemlights.schemas etc/gconf/schemas/multiload.schemas +etc/gconf/schemas/stickynotes.schemas %%BATTERY%%etc/sound/events/battstat_applet.soundlist -%%BATTERY%%libdata/bonobo/servers/GNOME_BattstatApplet.server +etc/sound/events/mailcheck.soundlist +libdata/bonobo/servers/GNOME_AccessxStatusApplet.server +libdata/bonobo/servers/GNOME_BattstatApplet.server libdata/bonobo/servers/GNOME_CDPlayerApplet.server libdata/bonobo/servers/GNOME_CharpickerApplet.server libdata/bonobo/servers/GNOME_DriveMountApplet.server @@ -41,11 +57,14 @@ libdata/bonobo/servers/GNOME_GWeatherApplet_Factory.server libdata/bonobo/servers/GNOME_GeyesApplet.server libdata/bonobo/servers/GNOME_GtikApplet.server libdata/bonobo/servers/GNOME_KeyboardApplet_Factory.server +libdata/bonobo/servers/GNOME_MailcheckApplet_Factory.server libdata/bonobo/servers/GNOME_MiniCommanderApplet.server libdata/bonobo/servers/GNOME_MixerApplet.server libdata/bonobo/servers/GNOME_ModemLightsApplet.server libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server +libdata/bonobo/servers/GNOME_StickyNotesApplet.server +libexec/accessx-status-applet %%BATTERY%%libexec/battstat-applet-2 libexec/cdplayer_applet2 libexec/charpick_applet2 @@ -55,10 +74,12 @@ libexec/gkb-applet-2 libexec/gnome-applets/mc-install-default-macros libexec/gtik2_applet2 libexec/gweather-applet-2 +libexec/mailcheck-applet libexec/mini_commander_applet libexec/mixer_applet2 libexec/modemlights_applet2 libexec/multiload-applet-2 +libexec/stickynotes_applet libexec/wireless-applet %%BATTERY%%share/gnome/battstat_applet/battstat_applet.glade share/gnome/gen_util/mini-commander.glade @@ -93,7 +114,7 @@ share/gnome/gkb/Belgian.keyprop share/gnome/gkb/BulgarianCyril.keyprop share/gnome/gkb/CA_English.keyprop share/gnome/gkb/CH_German_x.keyprop -share/gnome/gkb/CS_Czech.keyprop +share/gnome/gkb/CZ_Czech.keyprop share/gnome/gkb/CZ_Czech_Slovak.keyprop share/gnome/gkb/CZ_Czech_x.keyprop share/gnome/gkb/DE_German.keyprop @@ -115,10 +136,6 @@ share/gnome/gkb/FR_French_x.keyprop share/gnome/gkb/FrenchCanadian.keyprop share/gnome/gkb/FrenchCanadian2.keyprop share/gnome/gkb/FrenchSwiss.keyprop -share/gnome/gkb/GB-102.keyprop -share/gnome/gkb/GB.keyprop -share/gnome/gkb/GB_English.keyprop -share/gnome/gkb/GB_English_x.keyprop share/gnome/gkb/GE_Georgian_x.keyprop share/gnome/gkb/GR_Greek.keyprop share/gnome/gkb/GR_Greek_x.keyprop @@ -171,11 +188,16 @@ share/gnome/gkb/RU_Russian_x.keyprop share/gnome/gkb/RU_Russian_x_rev.keyprop share/gnome/gkb/RussianCyril.keyprop share/gnome/gkb/SE_Swedish.keyprop +share/gnome/gkb/SE_Swedish_x.keyprop share/gnome/gkb/SI_Slovenian.keyprop +share/gnome/gkb/SI_Slovenian_x.keyprop share/gnome/gkb/SR_Dutch.keyprop share/gnome/gkb/Slovak.keyprop +share/gnome/gkb/Slovene.keyprop share/gnome/gkb/Slovenian.keyprop share/gnome/gkb/Swedish.keyprop +share/gnome/gkb/Syriac.keyprop +share/gnome/gkb/Syriac_Phonetic.keyprop share/gnome/gkb/TH_Thai.keyprop share/gnome/gkb/TH_Thai_x.keyprop share/gnome/gkb/TR-f.keyprop @@ -185,8 +207,12 @@ share/gnome/gkb/TR_Turkish_x.keyprop share/gnome/gkb/Thai.keyprop share/gnome/gkb/Thai2.keyprop share/gnome/gkb/UA_Ukrainian.keyprop +share/gnome/gkb/UK-102.keyprop share/gnome/gkb/UK-x86.keyprop share/gnome/gkb/UK.keyprop +share/gnome/gkb/UK_English.keyprop +share/gnome/gkb/UK_English_x.keyprop +share/gnome/gkb/UK_United_Kingdom.keyprop share/gnome/gkb/US-101.keyprop share/gnome/gkb/US-101A-x86.keyprop share/gnome/gkb/US-84.keyprop @@ -201,9 +227,11 @@ share/gnome/gkb/US_English.keyprop share/gnome/gkb/US_international.keyprop share/gnome/gkb/VN_Vietnamese.keyprop share/gnome/gkb/YU_Serb_x.keyprop +share/gnome/gkb/YU_Serbo-Croatian_x.keyprop share/gnome/gkb/Yugoslav.keyprop share/gnome/gkb/presets.xml -%%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml +share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.xml +share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml share/gnome/gnome-2.0/ui/GNOME_CDPlayerApplet.xml share/gnome/gnome-2.0/ui/GNOME_CharpickerApplet.xml share/gnome/gnome-2.0/ui/GNOME_DriveMountApplet.xml @@ -211,18 +239,22 @@ share/gnome/gnome-2.0/ui/GNOME_GWeatherApplet.xml share/gnome/gnome-2.0/ui/GNOME_GeyesApplet.xml share/gnome/gnome-2.0/ui/GNOME_GtikApplet.xml share/gnome/gnome-2.0/ui/GNOME_KeyboardApplet.xml +share/gnome/gnome-2.0/ui/GNOME_MailCheckApplet.xml share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml share/gnome/gnome-2.0/ui/GNOME_ModemlightsApplet.xml share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml +share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml share/gnome/gnome-2.0/ui/GNOME_WirelessApplet.xml share/gnome/gweather/Locations +share/gnome/help/accessx-status/C/accessx-status.xml +share/gnome/help/accessx-status/C/figures/accessx-status-applet.png +share/gnome/help/accessx-status/C/legal.xml %%BATTERY%%share/gnome/help/battstat/C/battstat.xml %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-apperance.png %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet.png %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-general.png %%BATTERY%%share/gnome/help/battstat/C/legal.xml -%%BATTERY%%share/gnome/help/battstat/C/topic.dat %%BATTERY%%share/gnome/help/battstat/ja/battstat.xml %%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-apperance.png %%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-applet.png @@ -232,12 +264,14 @@ share/gnome/help/cdplayer/C/cdplayer.xml share/gnome/help/cdplayer/C/figures/cdplayer_applet.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_eject.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/C/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/C/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/C/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_prevtrack.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_stop.png share/gnome/help/cdplayer/C/legal.xml -share/gnome/help/cdplayer/C/topic.dat share/gnome/help/cdplayer/de/cdplayer.xml share/gnome/help/cdplayer/de/figures/cdplayer_applet.png share/gnome/help/cdplayer/de/figures/cdplayer_applet_eject.png @@ -256,7 +290,6 @@ share/gnome/help/cdplayer/es/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/es/figures/cdplayer_applet_prevtrack.png share/gnome/help/cdplayer/es/figures/cdplayer_applet_stop.png share/gnome/help/cdplayer/es/legal.xml -share/gnome/help/cdplayer/es/topic.dat share/gnome/help/cdplayer/fr/cdplayer.xml share/gnome/help/cdplayer/fr/figures/cdplayer_applet.png share/gnome/help/cdplayer/fr/figures/cdplayer_applet_eject.png @@ -279,12 +312,14 @@ share/gnome/help/cdplayer/ja/cdplayer.xml share/gnome/help/cdplayer/ja/figures/cdplayer_applet.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_eject.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/ja/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/ja/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_prevtrack.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_stop.png share/gnome/help/cdplayer/ja/legal.xml -share/gnome/help/cdplayer/ja/topic.dat share/gnome/help/cdplayer/ko/cdplayer.xml share/gnome/help/cdplayer/ko/figures/cdplayer_applet.png share/gnome/help/cdplayer/ko/figures/cdplayer_applet_eject.png @@ -322,51 +357,69 @@ share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_prevtrack.png share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_stop.png share/gnome/help/cdplayer/zh_TW/legal.xml share/gnome/help/char-palette/C/char-palette.xml -share/gnome/help/char-palette/C/figures/charpick_applet.png +share/gnome/help/char-palette/C/figures/charpalette_applet.png +share/gnome/help/char-palette/C/figures/charpalette_chargroup.png share/gnome/help/char-palette/C/figures/charpick_characters.png -share/gnome/help/char-palette/C/figures/charpick_chargroup.png share/gnome/help/char-palette/C/legal.xml 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_applet.png share/gnome/help/char-palette/de/figures/charpick_characters.png share/gnome/help/char-palette/de/figures/charpick_chargroup.png share/gnome/help/char-palette/de/legal.xml share/gnome/help/char-palette/es/char-palette.xml +share/gnome/help/char-palette/es/figures/charpalette_applet.png +share/gnome/help/char-palette/es/figures/charpalette_chargroup.png share/gnome/help/char-palette/es/figures/charpick_applet.png share/gnome/help/char-palette/es/figures/charpick_characters.png share/gnome/help/char-palette/es/figures/charpick_chargroup.png share/gnome/help/char-palette/es/legal.xml share/gnome/help/char-palette/fr/char-palette.xml +share/gnome/help/char-palette/fr/figures/charpalette_applet.png +share/gnome/help/char-palette/fr/figures/charpalette_chargroup.png share/gnome/help/char-palette/fr/figures/charpick_applet.png share/gnome/help/char-palette/fr/figures/charpick_characters.png share/gnome/help/char-palette/fr/figures/charpick_chargroup.png share/gnome/help/char-palette/fr/legal.xml share/gnome/help/char-palette/it/char-palette.xml +share/gnome/help/char-palette/it/figures/charpalette_applet.png +share/gnome/help/char-palette/it/figures/charpalette_chargroup.png share/gnome/help/char-palette/it/figures/charpick_applet.png share/gnome/help/char-palette/it/figures/charpick_characters.png share/gnome/help/char-palette/it/figures/charpick_chargroup.png share/gnome/help/char-palette/it/legal.xml share/gnome/help/char-palette/ja/char-palette.xml +share/gnome/help/char-palette/ja/figures/charpalette_applet.png +share/gnome/help/char-palette/ja/figures/charpalette_chargroup.png share/gnome/help/char-palette/ja/figures/charpick_applet.png share/gnome/help/char-palette/ja/figures/charpick_characters.png share/gnome/help/char-palette/ja/figures/charpick_chargroup.png share/gnome/help/char-palette/ja/legal.xml share/gnome/help/char-palette/ko/char-palette.xml +share/gnome/help/char-palette/ko/figures/charpalette_applet.png +share/gnome/help/char-palette/ko/figures/charpalette_chargroup.png share/gnome/help/char-palette/ko/figures/charpick_applet.png share/gnome/help/char-palette/ko/figures/charpick_characters.png share/gnome/help/char-palette/ko/figures/charpick_chargroup.png share/gnome/help/char-palette/ko/legal.xml share/gnome/help/char-palette/sv/char-palette.xml +share/gnome/help/char-palette/sv/figures/charpalette_applet.png +share/gnome/help/char-palette/sv/figures/charpalette_chargroup.png share/gnome/help/char-palette/sv/figures/charpick_applet.png share/gnome/help/char-palette/sv/figures/charpick_characters.png share/gnome/help/char-palette/sv/figures/charpick_chargroup.png share/gnome/help/char-palette/sv/legal.xml share/gnome/help/char-palette/zh_CN/char-palette.xml +share/gnome/help/char-palette/zh_CN/figures/charpalette_applet.png +share/gnome/help/char-palette/zh_CN/figures/charpalette_chargroup.png share/gnome/help/char-palette/zh_CN/figures/charpick_applet.png share/gnome/help/char-palette/zh_CN/figures/charpick_characters.png share/gnome/help/char-palette/zh_CN/figures/charpick_chargroup.png share/gnome/help/char-palette/zh_CN/legal.xml share/gnome/help/char-palette/zh_TW/char-palette.xml +share/gnome/help/char-palette/zh_TW/figures/charpalette_applet.png +share/gnome/help/char-palette/zh_TW/figures/charpalette_chargroup.png share/gnome/help/char-palette/zh_TW/figures/charpick_applet.png share/gnome/help/char-palette/zh_TW/figures/charpick_characters.png share/gnome/help/char-palette/zh_TW/figures/charpick_chargroup.png @@ -410,34 +463,40 @@ share/gnome/help/drivemount/C/legal.xml share/gnome/help/geyes/C/figures/geyes_applet.png share/gnome/help/geyes/C/geyes.xml share/gnome/help/geyes/C/legal.xml -share/gnome/help/geyes/C/topic.dat share/gnome/help/geyes/de/figures/geyes_applet.png +share/gnome/help/geyes/de/figures/geyes_settings.png share/gnome/help/geyes/de/geyes.xml share/gnome/help/geyes/de/legal.xml share/gnome/help/geyes/es/figures/geyes_applet.png +share/gnome/help/geyes/es/figures/geyes_settings.png share/gnome/help/geyes/es/geyes.xml share/gnome/help/geyes/es/legal.xml -share/gnome/help/geyes/es/topic.dat share/gnome/help/geyes/fr/figures/geyes_applet.png +share/gnome/help/geyes/fr/figures/geyes_settings.png share/gnome/help/geyes/fr/geyes.xml share/gnome/help/geyes/fr/legal.xml share/gnome/help/geyes/it/figures/geyes_applet.png +share/gnome/help/geyes/it/figures/geyes_settings.png share/gnome/help/geyes/it/geyes.xml share/gnome/help/geyes/it/legal.xml -share/gnome/help/geyes/it/topic.dat share/gnome/help/geyes/ja/figures/geyes_applet.png +share/gnome/help/geyes/ja/figures/geyes_settings.png share/gnome/help/geyes/ja/geyes.xml share/gnome/help/geyes/ja/legal.xml share/gnome/help/geyes/ko/figures/geyes_applet.png +share/gnome/help/geyes/ko/figures/geyes_settings.png share/gnome/help/geyes/ko/geyes.xml share/gnome/help/geyes/ko/legal.xml share/gnome/help/geyes/sv/figures/geyes_applet.png +share/gnome/help/geyes/sv/figures/geyes_settings.png share/gnome/help/geyes/sv/geyes.xml share/gnome/help/geyes/sv/legal.xml share/gnome/help/geyes/zh_CN/figures/geyes_applet.png +share/gnome/help/geyes/zh_CN/figures/geyes_settings.png share/gnome/help/geyes/zh_CN/geyes.xml share/gnome/help/geyes/zh_CN/legal.xml share/gnome/help/geyes/zh_TW/figures/geyes_applet.png +share/gnome/help/geyes/zh_TW/figures/geyes_settings.png share/gnome/help/geyes/zh_TW/geyes.xml share/gnome/help/geyes/zh_TW/legal.xml share/gnome/help/gkb/C/figures/gkb_applet.png @@ -501,80 +560,172 @@ share/gnome/help/gtik2_applet2/zh_TW/figures/gtik_applet.png share/gnome/help/gtik2_applet2/zh_TW/gtik2_applet2.xml share/gnome/help/gtik2_applet2/zh_TW/legal.xml share/gnome/help/gweather/C/figures/gweather_applet.png +share/gnome/help/gweather/C/figures/gweather_settings.png +share/gnome/help/gweather/C/figures/gweather_weather.png share/gnome/help/gweather/C/gweather.xml share/gnome/help/gweather/C/legal.xml -share/gnome/help/gweather/C/topic.dat share/gnome/help/gweather/de/figures/gweather_applet.png +share/gnome/help/gweather/de/figures/gweather_settings.png +share/gnome/help/gweather/de/figures/gweather_weather.png share/gnome/help/gweather/de/gweather.xml share/gnome/help/gweather/de/legal.xml share/gnome/help/gweather/es/figures/gweather_applet.png +share/gnome/help/gweather/es/figures/gweather_settings.png +share/gnome/help/gweather/es/figures/gweather_weather.png share/gnome/help/gweather/es/gweather.xml share/gnome/help/gweather/es/legal.xml share/gnome/help/gweather/fr/figures/gweather_applet.png +share/gnome/help/gweather/fr/figures/gweather_settings.png +share/gnome/help/gweather/fr/figures/gweather_weather.png share/gnome/help/gweather/fr/gweather.xml share/gnome/help/gweather/fr/legal.xml +share/gnome/help/gweather/it/figures/gweather_applet.png +share/gnome/help/gweather/it/figures/gweather_settings.png +share/gnome/help/gweather/it/figures/gweather_weather.png +share/gnome/help/gweather/it/gweather.xml +share/gnome/help/gweather/it/legal.xml share/gnome/help/gweather/ja/figures/gweather_applet.png +share/gnome/help/gweather/ja/figures/gweather_settings.png +share/gnome/help/gweather/ja/figures/gweather_weather.png share/gnome/help/gweather/ja/gweather.xml share/gnome/help/gweather/ja/legal.xml share/gnome/help/gweather/ko/figures/gweather_applet.png +share/gnome/help/gweather/ko/figures/gweather_settings.png +share/gnome/help/gweather/ko/figures/gweather_weather.png share/gnome/help/gweather/ko/gweather.xml share/gnome/help/gweather/ko/legal.xml share/gnome/help/gweather/sv/figures/gweather_applet.png +share/gnome/help/gweather/sv/figures/gweather_settings.png +share/gnome/help/gweather/sv/figures/gweather_weather.png share/gnome/help/gweather/sv/gweather.xml share/gnome/help/gweather/sv/legal.xml share/gnome/help/gweather/zh_CN/figures/gweather_applet.png +share/gnome/help/gweather/zh_CN/figures/gweather_settings.png +share/gnome/help/gweather/zh_CN/figures/gweather_weather.png share/gnome/help/gweather/zh_CN/gweather.xml share/gnome/help/gweather/zh_CN/legal.xml share/gnome/help/gweather/zh_TW/figures/gweather_applet.png +share/gnome/help/gweather/zh_TW/figures/gweather_settings.png +share/gnome/help/gweather/zh_TW/figures/gweather_weather.png share/gnome/help/gweather/zh_TW/gweather.xml share/gnome/help/gweather/zh_TW/legal.xml -share/gnome/help/gweather_applet/it/figures/gweather_applet.png -share/gnome/help/gweather_applet/it/figures/gweather_settings.png -share/gnome/help/gweather_applet/it/figures/gweather_weather.png -share/gnome/help/gweather_applet/it/gweather.sgml -share/gnome/help/gweather_applet/it/gweather_applet.sgml -share/gnome/help/gweather_applet/it/ln10.html -share/gnome/help/gweather_applet/it/t1.html -share/gnome/help/gweather_applet/it/topic.dat -share/gnome/help/mixer_applet/it/figures/mixer_applet.png -share/gnome/help/mixer_applet/it/ln10.html -share/gnome/help/mixer_applet/it/mixer.sgml -share/gnome/help/mixer_applet/it/mixer_applet.sgml -share/gnome/help/mixer_applet/it/t1.html -share/gnome/help/mixer_applet/it/topic.dat +share/gnome/help/mailcheck/C/figures/mailcheck_applet.png +share/gnome/help/mailcheck/C/legal.xml +share/gnome/help/mailcheck/C/mailcheck.xml +share/gnome/help/mailcheck/de/figures/mailcheck-applet.png +share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/de/figures/mailcheck_applet.png +share/gnome/help/mailcheck/de/legal.xml +share/gnome/help/mailcheck/de/mailcheck.xml +share/gnome/help/mailcheck/es/figures/mailcheck-applet.png +share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/es/figures/mailcheck_applet.png +share/gnome/help/mailcheck/es/legal.xml +share/gnome/help/mailcheck/es/mailcheck.xml +share/gnome/help/mailcheck/fr/figures/mailcheck-applet.png +share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/fr/figures/mailcheck_applet.png +share/gnome/help/mailcheck/fr/legal.xml +share/gnome/help/mailcheck/fr/mailcheck.xml +share/gnome/help/mailcheck/it/figures/mailcheck-applet.png +share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/it/figures/mailcheck_applet.png +share/gnome/help/mailcheck/it/legal.xml +share/gnome/help/mailcheck/it/mailcheck.xml +share/gnome/help/mailcheck/ja/figures/mailcheck_applet.png +share/gnome/help/mailcheck/ja/legal.xml +share/gnome/help/mailcheck/ja/mailcheck.xml +share/gnome/help/mailcheck/ko/figures/mailcheck-applet.png +share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/ko/figures/mailcheck_applet.png +share/gnome/help/mailcheck/ko/legal.xml +share/gnome/help/mailcheck/ko/mailcheck.xml +share/gnome/help/mailcheck/sv/figures/mailcheck-applet.png +share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/sv/figures/mailcheck_applet.png +share/gnome/help/mailcheck/sv/legal.xml +share/gnome/help/mailcheck/sv/mailcheck.xml +share/gnome/help/mailcheck/zh_CN/figures/mailcheck-applet.png +share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/zh_CN/figures/mailcheck_applet.png +share/gnome/help/mailcheck/zh_CN/legal.xml +share/gnome/help/mailcheck/zh_CN/mailcheck.xml +share/gnome/help/mailcheck/zh_TW/figures/mailcheck-applet.png +share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/zh_TW/figures/mailcheck_applet.png +share/gnome/help/mailcheck/zh_TW/legal.xml +share/gnome/help/mailcheck/zh_TW/mailcheck.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/C/topic.dat +share/gnome/help/mixer_applet2/de/figures/mixer_applet.png share/gnome/help/mixer_applet2/de/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/de/legal.xml share/gnome/help/mixer_applet2/de/mixer_applet2.xml +share/gnome/help/mixer_applet2/es/figures/mixer_applet.png share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/es/legal.xml share/gnome/help/mixer_applet2/es/mixer_applet2.xml -share/gnome/help/mixer_applet2/es/topic.dat +share/gnome/help/mixer_applet2/fr/figures/mixer_applet.png share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/fr/legal.xml share/gnome/help/mixer_applet2/fr/mixer_applet2.xml +share/gnome/help/mixer_applet2/ja/figures/mixer_applet.png share/gnome/help/mixer_applet2/ja/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/ja/legal.xml share/gnome/help/mixer_applet2/ja/mixer_applet2.xml +share/gnome/help/mixer_applet2/ko/figures/mixer_applet.png share/gnome/help/mixer_applet2/ko/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/ko/legal.xml share/gnome/help/mixer_applet2/ko/mixer_applet2.xml +share/gnome/help/mixer_applet2/sv/figures/mixer_applet.png share/gnome/help/mixer_applet2/sv/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/sv/legal.xml share/gnome/help/mixer_applet2/sv/mixer_applet2.xml +share/gnome/help/mixer_applet2/zh_CN/figures/mixer_applet.png share/gnome/help/mixer_applet2/zh_CN/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/zh_CN/legal.xml share/gnome/help/mixer_applet2/zh_CN/mixer_applet2.xml +share/gnome/help/mixer_applet2/zh_TW/figures/mixer_applet.png share/gnome/help/mixer_applet2/zh_TW/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/zh_TW/legal.xml share/gnome/help/mixer_applet2/zh_TW/mixer_applet2.xml +share/gnome/help/modemlights/C/figures/modemlights-advanced.png +share/gnome/help/modemlights/C/figures/modemlights-advpref.png +share/gnome/help/modemlights/C/figures/modemlights-color.png +share/gnome/help/modemlights/C/figures/modemlights-general.png +share/gnome/help/modemlights/C/figures/modemlights-prefs.png +share/gnome/help/modemlights/C/figures/modemlights.png +share/gnome/help/modemlights/C/figures/modemlights_applet.png +share/gnome/help/modemlights/C/figures/modemlights_applet_advanced.png +share/gnome/help/modemlights/C/figures/modemlights_applet_awaiting.png +share/gnome/help/modemlights/C/figures/modemlights_applet_button.png +share/gnome/help/modemlights/C/figures/modemlights_applet_button_2.png +share/gnome/help/modemlights/C/figures/modemlights_applet_colors.png +share/gnome/help/modemlights/C/figures/modemlights_applet_connected.png +share/gnome/help/modemlights/C/figures/modemlights_applet_general.png +share/gnome/help/modemlights/C/figures/modemlights_applet_if_connect.png +share/gnome/help/modemlights/C/figures/modemlights_applet_not_connected.png +share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_connecting.png +share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_display.png +share/gnome/help/modemlights/C/legal.xml +share/gnome/help/modemlights/C/modemlights.xml +share/gnome/help/stickynotes_applet/C/legal.xml +share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml +share/gnome/omf/gnome-applets/accessx-status-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/accessx-status-C.omf 2>/dev/null || /usr/bin/true %%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf -@exec scrollkeeper-install -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true %%BATTERY%%share/gnome/omf/gnome-applets/battstat-ja.omf -@exec scrollkeeper-install -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/cdplayer-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/cdplayer-de.omf @@ -717,8 +868,26 @@ share/gnome/omf/gnome-applets/gweather-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gweather_applet-it.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather_applet-it.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-applets/mixer_applet-it.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-de.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-de.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-fr.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-fr.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-ja.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-ja.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-ko.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-ko.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-sv.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-zh_CN.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-zh_TW.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/mixer_applet2-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/mixer_applet2-de.omf @@ -737,6 +906,46 @@ share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/modemlights-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/modemlights-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/stickynotes_applet-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-C.omf 2>/dev/null || /usr/bin/true +share/gnome/pixmaps/accessx-status-applet/ax-applet.png +share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png +share/gnome/pixmaps/accessx-status-applet/ax-key-base.png +share/gnome/pixmaps/accessx-status-applet/ax-key-inverse.png +share/gnome/pixmaps/accessx-status-applet/ax-key-no.png +share/gnome/pixmaps/accessx-status-applet/ax-key-none.png +share/gnome/pixmaps/accessx-status-applet/ax-key-yes.png +share/gnome/pixmaps/accessx-status-applet/ax-slowkeys-no.png +share/gnome/pixmaps/accessx-status-applet/ax-slowkeys-pending.png +share/gnome/pixmaps/accessx-status-applet/ax-slowkeys-yes.png +share/gnome/pixmaps/accessx-status-applet/ax-slowkeys.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-base.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-default-left.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-default-middle.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-default-right.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-pressed-left.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-pressed-middle.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-pressed-right.png +share/gnome/pixmaps/accessx-status-applet/sticky-alt-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-alt-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-alt-none.png +share/gnome/pixmaps/accessx-status-applet/sticky-ctrl-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-ctrl-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-ctrl-none.png +share/gnome/pixmaps/accessx-status-applet/sticky-hyper-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-hyper-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-hyper-none.png +share/gnome/pixmaps/accessx-status-applet/sticky-meta-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-meta-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-meta-none.png +share/gnome/pixmaps/accessx-status-applet/sticky-shift-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-shift-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-shift-none.png +share/gnome/pixmaps/accessx-status-applet/sticky-super-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-super-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-super-none.png %%BATTERY%%share/gnome/pixmaps/battstat.png share/gnome/pixmaps/charpick.png share/gnome/pixmaps/drivemount-applet.png @@ -754,7 +963,6 @@ share/gnome/pixmaps/gkb/br.png share/gnome/pixmaps/gkb/by.png share/gnome/pixmaps/gkb/ca.png share/gnome/pixmaps/gkb/ch.png -share/gnome/pixmaps/gkb/cs.png share/gnome/pixmaps/gkb/cu.png share/gnome/pixmaps/gkb/cz.png share/gnome/pixmaps/gkb/de.png @@ -767,7 +975,6 @@ share/gnome/pixmaps/gkb/es.png share/gnome/pixmaps/gkb/eu.png share/gnome/pixmaps/gkb/fi.png share/gnome/pixmaps/gkb/fr.png -share/gnome/pixmaps/gkb/gb.png share/gnome/pixmaps/gkb/ge.png share/gnome/pixmaps/gkb/gkb.png share/gnome/pixmaps/gkb/gr.png @@ -802,13 +1009,12 @@ share/gnome/pixmaps/gkb/qc.png share/gnome/pixmaps/gkb/ro.png share/gnome/pixmaps/gkb/ru.png share/gnome/pixmaps/gkb/sa.png +share/gnome/pixmaps/gkb/sd.png share/gnome/pixmaps/gkb/se.png share/gnome/pixmaps/gkb/si.png share/gnome/pixmaps/gkb/sk.png share/gnome/pixmaps/gkb/so.png share/gnome/pixmaps/gkb/sr.png -share/gnome/pixmaps/gkb/su.png -share/gnome/pixmaps/gkb/sv.png share/gnome/pixmaps/gkb/sy.png share/gnome/pixmaps/gkb/th.png share/gnome/pixmaps/gkb/tn.png @@ -826,6 +1032,12 @@ share/gnome/pixmaps/gnome-cpu.png share/gnome/pixmaps/gnome-eyes.png share/gnome/pixmaps/gnome-mini-commander.png share/gnome/pixmaps/gweather/tstorm.xpm +share/gnome/pixmaps/mailcheck/eclouds.png +share/gnome/pixmaps/mailcheck/email-e.png +share/gnome/pixmaps/mailcheck/email-eclouds.png +share/gnome/pixmaps/mailcheck/email-tiny.png +share/gnome/pixmaps/mailcheck/email.png +share/gnome/pixmaps/mailcheck/tux-anim.png share/gnome/pixmaps/mini-commander/browser-mini.xpm share/gnome/pixmaps/mini-commander/history-mini.xpm share/gnome/pixmaps/mixer/gnome-mixer-applet.png @@ -834,6 +1046,13 @@ share/gnome/pixmaps/mixer/volume-medium.png share/gnome/pixmaps/mixer/volume-min.png share/gnome/pixmaps/mixer/volume-mute.png share/gnome/pixmaps/mixer/volume-zero.png +share/gnome/pixmaps/stickynotes/close.png +share/gnome/pixmaps/stickynotes/locked.png +share/gnome/pixmaps/stickynotes/resize_se.png +share/gnome/pixmaps/stickynotes/resize_sw.png +share/gnome/pixmaps/stickynotes/stickynotes.png +share/gnome/pixmaps/stickynotes/stickynotes_prelight.png +share/gnome/pixmaps/stickynotes/unlocked.png share/gnome/pixmaps/wireless-applet/broken-0.png share/gnome/pixmaps/wireless-applet/no-link-0.png share/gnome/pixmaps/wireless-applet/signal-1-40.png @@ -841,6 +1060,7 @@ share/gnome/pixmaps/wireless-applet/signal-41-60.png share/gnome/pixmaps/wireless-applet/signal-61-80.png share/gnome/pixmaps/wireless-applet/signal-81-100.png share/gnome/pixmaps/wireless-applet/wireless-applet.png +share/gnome/stickynotes/stickynotes.glade share/gnome/wireless-applet/wireless-applet.glade share/gnome/xmodmap/xmodmap.am share/gnome/xmodmap/xmodmap.ar @@ -889,9 +1109,9 @@ share/gnome/xmodmap/xmodmap.lt_b share/gnome/xmodmap/xmodmap.lt_p share/gnome/xmodmap/xmodmap.mk share/gnome/xmodmap/xmodmap.mn +share/gnome/xmodmap/xmodmap.mn-phonet share/gnome/xmodmap/xmodmap.mn-rev share/gnome/xmodmap/xmodmap.mn-uni -share/gnome/xmodmap/xmodmap.mn-yawerty share/gnome/xmodmap/xmodmap.nl share/gnome/xmodmap/xmodmap.no share/gnome/xmodmap/xmodmap.pl @@ -932,8 +1152,10 @@ share/locale/ar/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/bg/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/cy/LC_MESSAGES/gnome-applets-2.0.mo share/locale/da/LC_MESSAGES/gnome-applets-2.0.mo share/locale/de/LC_MESSAGES/gnome-applets-2.0.mo share/locale/el/LC_MESSAGES/gnome-applets-2.0.mo @@ -949,6 +1171,7 @@ share/locale/gl/LC_MESSAGES/gnome-applets-2.0.mo share/locale/he/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hu/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo @@ -979,8 +1202,16 @@ share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/wireless-applet +@dirrm share/gnome/stickynotes @dirrm share/gnome/pixmaps/wireless-applet +@dirrm share/gnome/pixmaps/stickynotes @dirrm share/gnome/pixmaps/mixer +@dirrm share/gnome/pixmaps/accessx-status-applet +@dirrm share/gnome/help/stickynotes_applet/C +@dirrm share/gnome/help/stickynotes_applet +@dirrm share/gnome/help/modemlights/C/figures +@dirrm share/gnome/help/modemlights/C +@dirrm share/gnome/help/modemlights @dirrm share/gnome/help/mixer_applet2/zh_TW/figures @dirrm share/gnome/help/mixer_applet2/zh_TW @dirrm share/gnome/help/mixer_applet2/zh_CN/figures @@ -1000,14 +1231,27 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/mixer_applet2/C/figures @dirrm share/gnome/help/mixer_applet2/C @dirrm share/gnome/help/mixer_applet2 -@dirrm share/gnome/help/mixer_applet/it/stylesheet-images -@dirrm share/gnome/help/mixer_applet/it/figures -@dirrm share/gnome/help/mixer_applet/it -@dirrm share/gnome/help/mixer_applet -@dirrm share/gnome/help/gweather_applet/it/stylesheet-images -@dirrm share/gnome/help/gweather_applet/it/figures -@dirrm share/gnome/help/gweather_applet/it -@dirrm share/gnome/help/gweather_applet +@dirrm share/gnome/help/mailcheck/zh_TW/figures +@dirrm share/gnome/help/mailcheck/zh_TW +@dirrm share/gnome/help/mailcheck/zh_CN/figures +@dirrm share/gnome/help/mailcheck/zh_CN +@dirrm share/gnome/help/mailcheck/sv/figures +@dirrm share/gnome/help/mailcheck/sv +@dirrm share/gnome/help/mailcheck/ko/figures +@dirrm share/gnome/help/mailcheck/ko +@dirrm share/gnome/help/mailcheck/ja/figures +@dirrm share/gnome/help/mailcheck/ja +@dirrm share/gnome/help/mailcheck/it/figures +@dirrm share/gnome/help/mailcheck/it +@dirrm share/gnome/help/mailcheck/fr/figures +@dirrm share/gnome/help/mailcheck/fr +@dirrm share/gnome/help/mailcheck/es/figures +@dirrm share/gnome/help/mailcheck/es +@dirrm share/gnome/help/mailcheck/de/figures +@dirrm share/gnome/help/mailcheck/de +@dirrm share/gnome/help/mailcheck/C/figures +@dirrm share/gnome/help/mailcheck/C +@dirrm share/gnome/help/mailcheck @dirrm share/gnome/help/gweather/zh_TW/figures @dirrm share/gnome/help/gweather/zh_TW @dirrm share/gnome/help/gweather/zh_CN/figures @@ -1018,6 +1262,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/gweather/ko @dirrm share/gnome/help/gweather/ja/figures @dirrm share/gnome/help/gweather/ja +@dirrm share/gnome/help/gweather/it/figures +@dirrm share/gnome/help/gweather/it @dirrm share/gnome/help/gweather/fr/figures @dirrm share/gnome/help/gweather/fr @dirrm share/gnome/help/gweather/es/figures @@ -1161,14 +1407,24 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo %%BATTERY%%@dirrm share/gnome/help/battstat/C/figures %%BATTERY%%@dirrm share/gnome/help/battstat/C %%BATTERY%%@dirrm share/gnome/help/battstat +@dirrm share/gnome/help/accessx-status/C/figures +@dirrm share/gnome/help/accessx-status/C +@dirrm share/gnome/help/accessx-status %%BATTERY%%@dirrm share/gnome/battstat_applet @dirrm libexec/gnome-applets +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/settings +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/defaults +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet/prefs +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gweather/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gweather @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtik/prefs @@ -1185,8 +1441,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet %%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs %%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet -@unexec scrollkeeper-uninstall -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true +@dirrm etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/settings +@dirrm etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/defaults +@dirrm etc/gconf/gconf.xml.defaults/apps/stickynotes_applet +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/accessx-status-C.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-de.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-es.omf 2>/dev/null || /usr/bin/true @@ -1258,7 +1518,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather_applet-it.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-de.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-fr.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-ja.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-ko.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-sv.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-de.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-es.omf 2>/dev/null || /usr/bin/true @@ -1268,3 +1537,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/modemlights-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-C.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile index 8ae160c83395..e25f33c070e9 100644 --- a/x11/gnomedesktop/Makefile +++ b/x11/gnomedesktop/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomedesktop -PORTVERSION= 2.2.2 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-desktop/2.2 +MASTER_SITE_SUBDIR= sources/gnome-desktop/2.4 DISTNAME= gnome-desktop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -26,12 +26,10 @@ USE_GMAKE= yes USE_BISON= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes +CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAN1= gnome-about.1 -post-patch: - @${REINPLACE_CMD} -E -e 's|GNOME_VENDOR=.*$$|GNOME_VENDOR="FreeBSD GNOME Project"|' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo index 1ef3d1c22b0e..9c50bf9f39fb 100644 --- a/x11/gnomedesktop/distinfo +++ b/x11/gnomedesktop/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-desktop-2.2.2.tar.bz2) = 335e6109abc5a04e69ab574464af1900 +MD5 (gnome2/gnome-desktop-2.4.0.tar.bz2) = 183c14d192bdd41bd34578e8e7dc55f1 diff --git a/x11/gnomedesktop/files/patch-configure b/x11/gnomedesktop/files/patch-configure index 943558a25604..caf5b493a9eb 100644 --- a/x11/gnomedesktop/files/patch-configure +++ b/x11/gnomedesktop/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Mar 10 16:54:58 2003 -+++ configure Sun Apr 6 16:11:00 2003 -@@ -7987,6 +7987,7 @@ +--- configure.orig Sun May 4 06:56:20 2003 ++++ configure Sun May 4 19:20:27 2003 +@@ -8374,6 +8374,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist index 2cd64cb14824..ac57d75634de 100644 --- a/x11/gnomedesktop/pkg-plist +++ b/x11/gnomedesktop/pkg-plist @@ -6,61 +6,46 @@ lib/libgnome-desktop-2.a lib/libgnome-desktop-2.so lib/libgnome-desktop-2.so.3 libdata/pkgconfig/gnome-desktop-2.0.pc -share/gnome/gnome-about/contributors.dat +share/gnome/gnome-about/gnome-64.gif share/gnome/gnome-about/gnome-version.xml +share/gnome/gnome-about/headers/header-bg-ancient01a.png +share/gnome/gnome-about/headers/header-bg-city01.png +share/gnome/gnome-about/headers/header-bg-clouds01.png +share/gnome/gnome-about/headers/header-bg-clouds02.png +share/gnome/gnome-about/headers/header-bg-hills01.png +share/gnome/gnome-about/headers/header-bg-landscape01.png +share/gnome/gnome-about/headers/header-bg-mountains01.png +share/gnome/gnome-about/headers/header-bg-snow01.png +share/gnome/gnome-about/headers/header-bg-sunset01.png share/gnome/help/fdl/C/fdl.xml share/gnome/help/gnome-feedback/C/gnome-feedback.xml share/gnome/help/gpl/C/gpl.xml share/gnome/help/lgpl/C/lgpl.xml -share/gnome/vfolders/Accessories.directory -share/gnome/vfolders/Applications.directory -share/gnome/vfolders/Development.directory -share/gnome/vfolders/Games.directory -share/gnome/vfolders/Graphics.directory -share/gnome/vfolders/Internet.directory -share/gnome/vfolders/Multimedia.directory -share/gnome/vfolders/Office.directory -share/gnome/vfolders/Root.directory -share/gnome/vfolders/Settings.directory -share/gnome/vfolders/System.directory share/gnome/pixmaps/advanced-directory.png share/gnome/pixmaps/apple-green.png share/gnome/pixmaps/apple-red.png -share/gnome/pixmaps/cdeappmenu.png -share/gnome/pixmaps/gnome-amusements.png share/gnome/pixmaps/gnome-aorta.png share/gnome/pixmaps/gnome-applets.png share/gnome/pixmaps/gnome-applications.png -share/gnome/pixmaps/gnome-audio2.png +share/gnome/pixmaps/gnome-background-image.png +share/gnome/pixmaps/gnome-background-pattern.png share/gnome/pixmaps/gnome-background.png share/gnome/pixmaps/gnome-calc2.png share/gnome/pixmaps/gnome-calc3.png share/gnome/pixmaps/gnome-calendar.png -share/gnome/pixmaps/gnome-cardgame.png share/gnome/pixmaps/gnome-ccbackground.png share/gnome/pixmaps/gnome-ccdesktop.png share/gnome/pixmaps/gnome-ccdialog.png -share/gnome/pixmaps/gnome-cckeyboard-bell.png -share/gnome/pixmaps/gnome-cckeyboard.png share/gnome/pixmaps/gnome-ccmime.png share/gnome/pixmaps/gnome-ccperiph.png share/gnome/pixmaps/gnome-ccscreensaver.png -share/gnome/pixmaps/gnome-ccthemes.png share/gnome/pixmaps/gnome-ccwindowmanager.png -share/gnome/pixmaps/gnome-clock.png share/gnome/pixmaps/gnome-color-browser.png share/gnome/pixmaps/gnome-color-xterm.png share/gnome/pixmaps/gnome-computer.png share/gnome/pixmaps/gnome-cromagnon.png share/gnome/pixmaps/gnome-day.png share/gnome/pixmaps/gnome-debian.png -share/gnome/pixmaps/gnome-devel.png -share/gnome/pixmaps/gnome-die1.png -share/gnome/pixmaps/gnome-die2.png -share/gnome/pixmaps/gnome-die3.png -share/gnome/pixmaps/gnome-die4.png -share/gnome/pixmaps/gnome-die5.png -share/gnome/pixmaps/gnome-die6.png share/gnome/pixmaps/gnome-diskfree.png share/gnome/pixmaps/gnome-emacs.png share/gnome/pixmaps/gnome-eterm.png @@ -68,27 +53,17 @@ share/gnome/pixmaps/gnome-favorites.png share/gnome/pixmaps/gnome-file-c.png share/gnome/pixmaps/gnome-file-h.png share/gnome/pixmaps/gnome-folder.png -share/gnome/pixmaps/gnome-gegl.png -share/gnome/pixmaps/gnome-gegl2-2.png -share/gnome/pixmaps/gnome-gegl2.png share/gnome/pixmaps/gnome-gemvt.png share/gnome/pixmaps/gnome-gimp.png -share/gnome/pixmaps/gnome-globe.png share/gnome/pixmaps/gnome-gmenu.png share/gnome/pixmaps/gnome-gmush.png -share/gnome/pixmaps/gnome-gnomine.png share/gnome/pixmaps/gnome-gnomoku.png -share/gnome/pixmaps/gnome-graphics.png -share/gnome/pixmaps/gnome-gsame.png -share/gnome/pixmaps/gnome-help.png share/gnome/pixmaps/gnome-home.png share/gnome/pixmaps/gnome-html.png share/gnome/pixmaps/gnome-image-gif.png share/gnome/pixmaps/gnome-image-jpeg.png share/gnome/pixmaps/gnome-irc.png -share/gnome/pixmaps/gnome-joystick.png share/gnome/pixmaps/gnome-laptop.png -share/gnome/pixmaps/gnome-lockscreen.png share/gnome/pixmaps/gnome-log.png share/gnome/pixmaps/gnome-logo-icon-transparent.png share/gnome/pixmaps/gnome-logo-icon.png @@ -101,26 +76,15 @@ share/gnome/pixmaps/gnome-money.png share/gnome/pixmaps/gnome-monitor.png share/gnome/pixmaps/gnome-month.png share/gnome/pixmaps/gnome-mouse.png -share/gnome/pixmaps/gnome-multimedia.png share/gnome/pixmaps/gnome-networktool.png share/gnome/pixmaps/gnome-news.png share/gnome/pixmaps/gnome-note.png -share/gnome/pixmaps/gnome-panel-type-corner.png -share/gnome/pixmaps/gnome-panel-type-edge.png -share/gnome/pixmaps/gnome-panel-type-floating.png -share/gnome/pixmaps/gnome-panel-type-menu.png -share/gnome/pixmaps/gnome-panel-type-sliding.png -share/gnome/pixmaps/gnome-panel.png share/gnome/pixmaps/gnome-qeye.png -share/gnome/pixmaps/gnome-run.png -share/gnome/pixmaps/gnome-screenshot.png share/gnome/pixmaps/gnome-session.png share/gnome/pixmaps/gnome-set-time.png -share/gnome/pixmaps/gnome-settings.png share/gnome/pixmaps/gnome-spider.png share/gnome/pixmaps/gnome-squeak.png share/gnome/pixmaps/gnome-suse.png -share/gnome/pixmaps/gnome-system.png share/gnome/pixmaps/gnome-talk.png share/gnome/pixmaps/gnome-term-linux.png share/gnome/pixmaps/gnome-term-linux2.png @@ -129,7 +93,6 @@ share/gnome/pixmaps/gnome-term-tiger.png share/gnome/pixmaps/gnome-term.png share/gnome/pixmaps/gnome-tigert.png share/gnome/pixmaps/gnome-touristinfo.png -share/gnome/pixmaps/gnome-unknown.png share/gnome/pixmaps/gnome-user-interface.png share/gnome/pixmaps/gnome-util.png share/gnome/pixmaps/gnome-week.png @@ -141,17 +104,19 @@ share/gnome/pixmaps/gtkvim.png share/gnome/pixmaps/kterm.xpm share/gnome/pixmaps/launcher-program.png share/gnome/pixmaps/monitor.png -share/gnome/pixmaps/panel-arrow-down.png -share/gnome/pixmaps/panel-arrow-left.png -share/gnome/pixmaps/panel-arrow-right.png -share/gnome/pixmaps/panel-arrow-up.png -share/gnome/pixmaps/panel-corner-left.png -share/gnome/pixmaps/panel-corner-right.png -share/gnome/pixmaps/panel-drawer.png -share/gnome/pixmaps/panel-folder.png -share/gnome/pixmaps/panel-knob.png -share/gnome/pixmaps/panel-menu-main.png share/gnome/pixmaps/vnterm.xpm +share/gnome/vfolders/Accessories.directory +share/gnome/vfolders/Applications.directory +share/gnome/vfolders/Development.directory +share/gnome/vfolders/Games.directory +share/gnome/vfolders/Graphics.directory +share/gnome/vfolders/Internet.directory +share/gnome/vfolders/Multimedia.directory +share/gnome/vfolders/Office.directory +share/gnome/vfolders/Other.directory +share/gnome/vfolders/Root.directory +share/gnome/vfolders/Settings.directory +share/gnome/vfolders/System.directory share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo @@ -161,6 +126,7 @@ share/locale/bn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/bs/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ca/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/cs/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/cy/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/da/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/de/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/el/LC_MESSAGES/gnome-desktop-2.0.mo @@ -183,12 +149,14 @@ share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/kn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/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/mk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ml/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/no/LC_MESSAGES/gnome-desktop-2.0.mo @@ -218,6 +186,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo @dirrm share/gnome/help/gnome-feedback/C @dirrm share/gnome/help/gnome-feedback @dirrm share/gnome/help/fdl/C/figures +@dirrm share/gnome/gnome-about/headers @dirrm include/gnome-desktop-2.0/libgnomeui @dirrm include/gnome-desktop-2.0/libgnome @dirrm include/gnome-desktop-2.0 diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile index caa6e7f78e31..04ca2e79ad48 100644 --- a/x11/gnomepanel/Makefile +++ b/x11/gnomepanel/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomepanel -PORTVERSION= 2.2.2.2 -PORTREVISION= 1 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-panel/2.2 +MASTER_SITE_SUBDIR= sources/gnome-panel/2.4 DISTNAME= gnome-panel-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,7 +20,7 @@ USE_BZIP2= yes INSTALLS_SHLIB= yes USE_X_PREFIX= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier libwnck gnomedesktop +USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop libwnck GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes USE_LIBTOOL= yes diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo index a70a16998277..36e659c41882 100644 --- a/x11/gnomepanel/distinfo +++ b/x11/gnomepanel/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-panel-2.2.2.2.tar.bz2) = 0fffc658f22e367ba33997dcf180ef17 +MD5 (gnome2/gnome-panel-2.4.0.tar.bz2) = 9a81f7ebbb450611a28783900f5f2cbc diff --git a/x11/gnomepanel/files/patch-applets::gen_util::clock.c b/x11/gnomepanel/files/patch-applets_clock_clock.c index 96f5d3f44c48..976764570ff1 100644 --- a/x11/gnomepanel/files/patch-applets::gen_util::clock.c +++ b/x11/gnomepanel/files/patch-applets_clock_clock.c @@ -1,8 +1,8 @@ $FreeBSD$ ---- applets/gen_util/clock.c 2002/05/14 14:08:16 1.1 -+++ applets/gen_util/clock.c 2002/05/14 14:12:56 +--- applets/clock/clock.c 2002/05/14 14:08:16 1.1 ++++ applets/clock/clock.c 2002/05/14 14:12:56 @@ -14,7 +14,9 @@ #include <dirent.h> #include <string.h> diff --git a/x11/gnomepanel/files/patch-gnome-panel_panel.c b/x11/gnomepanel/files/patch-gnome-panel_panel.c deleted file mode 100644 index 4c51bc47f38c..000000000000 --- a/x11/gnomepanel/files/patch-gnome-panel_panel.c +++ /dev/null @@ -1,25 +0,0 @@ ---- gnome-panel/panel.c.orig Fri Aug 1 21:48:35 2003 -+++ gnome-panel/panel.c Fri Aug 1 21:48:37 2003 -@@ -569,18 +569,18 @@ - - if (pd->menu) - g_object_unref (pd->menu); -- pd->menu = NULL; -- -- pd->panel = NULL; - - if (pd->deactivate_idle != 0) - g_source_remove (pd->deactivate_idle); -- pd->deactivate_idle = 0; - - g_object_set_data (G_OBJECT (widget), "PanelData", NULL); - - panel_list = g_slist_remove (panel_list, pd); - g_free (pd); -+ -+ pd->menu = NULL; -+ pd->panel = NULL; -+ pd->deactivate_idle = 0; - } - - static void diff --git a/x11/gnomepanel/pkg-descr b/x11/gnomepanel/pkg-descr index 3abe6bcbf5fd..5e73398913a9 100644 --- a/x11/gnomepanel/pkg-descr +++ b/x11/gnomepanel/pkg-descr @@ -1,3 +1,3 @@ -Panel component for the GNOME 2.0 Desktop. +Panel component for the GNOME 2 Desktop. WWW: http://www.gnome.org/ diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist index d3632109b400..d6d24dc543ef 100644 --- a/x11/gnomepanel/pkg-plist +++ b/x11/gnomepanel/pkg-plist @@ -5,23 +5,30 @@ bin/gnome-panel-screenshot bin/panel-test-applets etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot/%gconf.xml etc/gconf/gconf.xml.defaults/apps/panel/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/clock/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/mixer/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/show_desktop_button/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_list/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_menu/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/workspace_switcher/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/general/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/menu_bar/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/nautilus_launcher/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/terminal_launcher/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel/%gconf.xml etc/gconf/gconf.xml.defaults/apps/panel/global/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome_panel_screenshot/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/general/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/00000001/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/00000002/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000001/%gconf.xml @@ -36,60 +43,67 @@ etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/ etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000001/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000002/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/general/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/panels/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/panels/00000001/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/panel/general/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/global/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/panel/objects/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels/background/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet/prefs/%gconf.xml etc/gconf/schemas/clock.schemas etc/gconf/schemas/fish.schemas etc/gconf/schemas/gnome-panel-screenshot.schemas -etc/gconf/schemas/mailcheck.schemas -etc/gconf/schemas/pager.schemas -etc/gconf/schemas/panel-global-config.schemas -etc/gconf/schemas/panel-per-panel-config.schemas -etc/gconf/schemas/tasklist.schemas -etc/sound/events/mailcheck.soundlist +etc/gconf/schemas/panel-compatibility.schemas +etc/gconf/schemas/panel-default-setup.entries +etc/gconf/schemas/panel-general.schemas +etc/gconf/schemas/panel-global.schemas +etc/gconf/schemas/panel-object.schemas +etc/gconf/schemas/panel-toplevel.schemas +etc/gconf/schemas/window-list.schemas +etc/gconf/schemas/workspace-switcher.schemas include/panel-2.0/GNOME_Panel.h include/panel-2.0/panel-applet-gconf.h include/panel-2.0/panel-applet.h -lib/libgen_util_applet-2.so +lib/libclock-applet-2.so lib/libpanel-applet-2.a lib/libpanel-applet-2.so lib/libpanel-applet-2.so.0 +libdata/bonobo/servers/GNOME_ClockApplet_Factory.server libdata/bonobo/servers/GNOME_FishApplet_Factory.server -libdata/bonobo/servers/GNOME_GenUtilApplet_Factory.server libdata/bonobo/servers/GNOME_NotificationAreaApplet.server libdata/bonobo/servers/GNOME_Panel.server +libdata/bonobo/servers/GNOME_Wncklet_Factory.server libdata/pkgconfig/libpanelapplet-2.0.pc libexec/fish-applet-2 libexec/notification-area-applet +libexec/wnck-applet share/doc/panel-applet/applet-popups.html share/doc/panel-applet/applet-porting.html share/doc/panel-applet/applet-writing.html share/doc/panel-applet/index.sgml share/doc/panel-applet/libpanel-applet.html share/doc/panel-applet/multi-applets.html +share/doc/panel-applet/panel-applet-panel-applet-gconf-utilities.html share/doc/panel-applet/panel-applet.html share/doc/panel-applet/panel-signals.html share/doc/panel-applet/panelapplet.html share/doc/panel-applet/server-files.html share/doc/panel-applet/session-saving.html share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop -share/gnome/fish/fish.glade -share/gnome/gen_util/pager.glade -share/gnome/gen_util/tasklist.glade share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml -share/gnome/gnome-2.0/ui/GNOME_MailCheckApplet.xml share/gnome/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml -share/gnome/gnome-2.0/ui/GNOME_PagerApplet.xml share/gnome/gnome-2.0/ui/GNOME_Panel_Popup.xml share/gnome/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml -share/gnome/gnome-2.0/ui/GNOME_TasklistApplet.xml +share/gnome/gnome-2.0/ui/GNOME_WindowListApplet.xml +share/gnome/gnome-2.0/ui/GNOME_WindowMenuApplet.xml +share/gnome/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml +share/gnome/gnome-panel/glade/fish.glade share/gnome/gnome-panel/glade/panel-test-applets.glade +share/gnome/gnome-panel/glade/window-list.glade +share/gnome/gnome-panel/glade/workspace-switcher.glade share/gnome/gnome-panelrc share/gnome/help/clock/C/clock.xml share/gnome/help/clock/C/figures/clock_applet.png @@ -159,63 +173,6 @@ share/gnome/help/fish-applet-2/zh_TW/figures/fish_applet.png share/gnome/help/fish-applet-2/zh_TW/figures/fish_settings.png share/gnome/help/fish-applet-2/zh_TW/fish-applet-2.xml share/gnome/help/fish-applet-2/zh_TW/legal.xml -share/gnome/help/mailcheck/C/figures/mailcheck_applet.png -share/gnome/help/mailcheck/C/legal.xml -share/gnome/help/mailcheck/C/mailcheck.xml -share/gnome/help/mailcheck/de/figures/mailcheck-applet.png -share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/de/figures/mailcheck_applet.png -share/gnome/help/mailcheck/de/legal.xml -share/gnome/help/mailcheck/de/mailcheck.xml -share/gnome/help/mailcheck/es/figures/mailcheck-applet.png -share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/es/figures/mailcheck_applet.png -share/gnome/help/mailcheck/es/legal.xml -share/gnome/help/mailcheck/es/mailcheck.xml -share/gnome/help/mailcheck/fr/figures/mailcheck-applet.png -share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/fr/figures/mailcheck_applet.png -share/gnome/help/mailcheck/fr/legal.xml -share/gnome/help/mailcheck/fr/mailcheck.xml -share/gnome/help/mailcheck/it/figures/mailcheck-applet.png -share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/it/figures/mailcheck_applet.png -share/gnome/help/mailcheck/it/legal.xml -share/gnome/help/mailcheck/it/mailcheck.xml -share/gnome/help/mailcheck/ja/figures/mailcheck_applet.png -share/gnome/help/mailcheck/ja/legal.xml -share/gnome/help/mailcheck/ja/mailcheck.xml -share/gnome/help/mailcheck/ko/figures/mailcheck-applet.png -share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/ko/figures/mailcheck_applet.png -share/gnome/help/mailcheck/ko/legal.xml -share/gnome/help/mailcheck/ko/mailcheck.xml -share/gnome/help/mailcheck/sv/figures/mailcheck-applet.png -share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/sv/figures/mailcheck_applet.png -share/gnome/help/mailcheck/sv/legal.xml -share/gnome/help/mailcheck/sv/mailcheck.xml -share/gnome/help/mailcheck/zh_CN/figures/mailcheck-applet.png -share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/zh_CN/figures/mailcheck_applet.png -share/gnome/help/mailcheck/zh_CN/legal.xml -share/gnome/help/mailcheck/zh_CN/mailcheck.xml -share/gnome/help/mailcheck/zh_TW/figures/mailcheck-applet.png -share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/zh_TW/figures/mailcheck_applet.png -share/gnome/help/mailcheck/zh_TW/legal.xml -share/gnome/help/mailcheck/zh_TW/mailcheck.xml -share/gnome/help/notification-area/C/figures/notification-area.png -share/gnome/help/notification-area/C/legal.xml -share/gnome/help/notification-area/C/notification-area.xml share/gnome/help/window-list/C/figures/window_list_applet.png share/gnome/help/window-list/C/figures/window_list_group_applet.png share/gnome/help/window-list/C/legal.xml @@ -343,28 +300,6 @@ share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-de.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-de.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-es.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-es.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-fr.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-fr.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-it.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-it.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-ja.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-ja.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-ko.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-ko.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-sv.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-sv.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-zh_CN.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-zh_TW.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/notification-area-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/window-list-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/window-list-de.omf @@ -407,18 +342,31 @@ share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/panel/gnome-panel-preferences.glade share/gnome/panel/gnome-panel-screenshot.glade +share/gnome/panel/panel-properties-dialog.glade +share/gnome/panel/panel-run-dialog.glade +share/gnome/pixmaps/cdeappmenu.png share/gnome/pixmaps/fish/fishanim.png share/gnome/pixmaps/fish/footguy.png share/gnome/pixmaps/fish/monkey.png share/gnome/pixmaps/fish/oldwanda.png +share/gnome/pixmaps/gnome-amusements.png +share/gnome/pixmaps/gnome-clock.png share/gnome/pixmaps/gnome-fish.png +share/gnome/pixmaps/gnome-gegl.png +share/gnome/pixmaps/gnome-gegl2-2.png +share/gnome/pixmaps/gnome-gegl2.png +share/gnome/pixmaps/gnome-main-menu.png +share/gnome/pixmaps/gnome-panel-type-corner.png +share/gnome/pixmaps/gnome-panel-type-edge.png +share/gnome/pixmaps/gnome-panel-type-floating.png +share/gnome/pixmaps/gnome-panel-type-menu.png +share/gnome/pixmaps/gnome-panel-type-sliding.png +share/gnome/pixmaps/gnome-panel.png +share/gnome/pixmaps/gnome-run.png +share/gnome/pixmaps/gnome-screenshot.png share/gnome/pixmaps/gnome-show-desktop.png -share/gnome/pixmaps/mailcheck/eclouds.png -share/gnome/pixmaps/mailcheck/email-e.png -share/gnome/pixmaps/mailcheck/email-eclouds.png -share/gnome/pixmaps/mailcheck/email-tiny.png -share/gnome/pixmaps/mailcheck/email.png -share/gnome/pixmaps/mailcheck/tux-anim.png +share/gnome/pixmaps/panel-drawer.png +share/gnome/pixmaps/panel-force-quit.png share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo @@ -521,30 +469,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/window-list/C/figures @dirrm share/gnome/help/window-list/C @dirrm share/gnome/help/window-list -@dirrm share/gnome/help/notification-area/C/figures -@dirrm share/gnome/help/notification-area/C -@dirrm share/gnome/help/notification-area -@dirrm share/gnome/help/mailcheck/zh_TW/figures -@dirrm share/gnome/help/mailcheck/zh_TW -@dirrm share/gnome/help/mailcheck/zh_CN/figures -@dirrm share/gnome/help/mailcheck/zh_CN -@dirrm share/gnome/help/mailcheck/sv/figures -@dirrm share/gnome/help/mailcheck/sv -@dirrm share/gnome/help/mailcheck/ko/figures -@dirrm share/gnome/help/mailcheck/ko -@dirrm share/gnome/help/mailcheck/ja/figures -@dirrm share/gnome/help/mailcheck/ja -@dirrm share/gnome/help/mailcheck/it/figures -@dirrm share/gnome/help/mailcheck/it -@dirrm share/gnome/help/mailcheck/fr/figures -@dirrm share/gnome/help/mailcheck/fr -@dirrm share/gnome/help/mailcheck/es/figures -@dirrm share/gnome/help/mailcheck/es -@dirrm share/gnome/help/mailcheck/de/figures -@dirrm share/gnome/help/mailcheck/de -@dirrm share/gnome/help/mailcheck/C/figures -@dirrm share/gnome/help/mailcheck/C -@dirrm share/gnome/help/mailcheck @dirrm share/gnome/help/fish-applet-2/zh_TW/figures @dirrm share/gnome/help/fish-applet-2/zh_TW @dirrm share/gnome/help/fish-applet-2/zh_CN/figures @@ -589,17 +513,17 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/clock @dirrm share/gnome/gnome-panel/glade @dirrm share/gnome/gnome-panel -@dirrm share/gnome/gen_util -@dirrm share/gnome/fish @dirrm share/doc/panel-applet @dirrm include/panel-2.0 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/prefs -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet/prefs +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet/prefs +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels/background +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/objects @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/global -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/panels/00000001 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/panels -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/general -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/general @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000002 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000001 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels @@ -614,23 +538,30 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000001 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/00000002 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/00000001 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/general -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/prefs -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_panel_screenshot @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet @dirrm etc/gconf/gconf.xml.defaults/apps/panel/global +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/terminal_launcher +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/nautilus_launcher +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/menu_bar +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/general +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/workspace_switcher +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_menu +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_list +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/show_desktop_button +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/mixer +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/clock +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup @dirrm etc/gconf/gconf.xml.defaults/apps/panel @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true @@ -653,17 +584,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-de.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-es.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-fr.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-it.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-ja.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-ko.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-sv.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-de.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-es.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile index 1c434ac65945..48f0b8e7bbb9 100644 --- a/x11/gnomesession/Makefile +++ b/x11/gnomesession/Makefile @@ -6,16 +6,11 @@ # PORTNAME= gnomesession -PORTVERSION= 2.2.2 -PORTREVISION= 1 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome -MASTER_SITES= ${MASTER_SITE_GNOME} \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= sources/gnome-session/2.2 \ - marcus/:local +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/gnome-session/2.4 DISTNAME= gnome-session-${PORTVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - splash.png:local DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -27,18 +22,11 @@ USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui USE_GMAKE= yes USE_LIBTOOL= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \ gnome-session-save.1 MAN5= default.session.5 -post-extract: - @${CP} ${DISTDIR}/${DIST_SUBDIR}/splash.png ${WRKDIR} - -post-install: - ${INSTALL_DATA} ${WRKDIR}/splash.png \ - ${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png - .include <bsd.port.mk> diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo index 81c567b465b0..93da50979a59 100644 --- a/x11/gnomesession/distinfo +++ b/x11/gnomesession/distinfo @@ -1,2 +1 @@ -MD5 (gnome2/gnome-session-2.2.2.tar.bz2) = 7dcfea0d925ddecb7c9700ddf597b17c -MD5 (gnome2/splash.png) = 244d7cadfb0f5e7ba624a1d4e749a312 +MD5 (gnome2/gnome-session-2.4.0.tar.bz2) = 6a7acf3429b927c69e18019f9ec6fa9f diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist index 75f1650b4f35..d4fc0ded7788 100644 --- a/x11/gnomesession/pkg-plist +++ b/x11/gnomesession/pkg-plist @@ -1,5 +1,6 @@ bin/gnome-session bin/gnome-session-properties +bin/gnome-session-remove bin/gnome-session-save bin/gnome-smproxy bin/gnome-wm @@ -16,15 +17,17 @@ share/locale/am/LC_MESSAGES/gnome-session-2.0.mo share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo share/locale/az/LC_MESSAGES/gnome-session-2.0.mo share/locale/be/LC_MESSAGES/gnome-session-2.0.mo +share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo share/locale/bs/LC_MESSAGES/gnome-session-2.0.mo share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo -share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo share/locale/ca/LC_MESSAGES/gnome-session-2.0.mo share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo +share/locale/cy/LC_MESSAGES/gnome-session-2.0.mo share/locale/da/LC_MESSAGES/gnome-session-2.0.mo share/locale/de/LC_MESSAGES/gnome-session-2.0.mo share/locale/el/LC_MESSAGES/gnome-session-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-session-2.0.mo +share/locale/eo/LC_MESSAGES/gnome-session-2.0.mo share/locale/es/LC_MESSAGES/gnome-session-2.0.mo share/locale/et/LC_MESSAGES/gnome-session-2.0.mo share/locale/eu/LC_MESSAGES/gnome-session-2.0.mo @@ -37,6 +40,7 @@ share/locale/he/LC_MESSAGES/gnome-session-2.0.mo share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo share/locale/hu/LC_MESSAGES/gnome-session-2.0.mo share/locale/id/LC_MESSAGES/gnome-session-2.0.mo +share/locale/is/LC_MESSAGES/gnome-session-2.0.mo share/locale/it/LC_MESSAGES/gnome-session-2.0.mo share/locale/ja/LC_MESSAGES/gnome-session-2.0.mo share/locale/kn/LC_MESSAGES/gnome-session-2.0.mo @@ -62,13 +66,13 @@ share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo share/locale/sr@Latn/LC_MESSAGES/gnome-session-2.0.mo share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo +share/locale/th/LC_MESSAGES/gnome-session-2.0.mo share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo -@dirrm share/gnome/omf/gnome-core @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/options @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-session/options diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile index e6c8538e5c8f..edcdf8d713dd 100644 --- a/x11/gnometerminal/Makefile +++ b/x11/gnometerminal/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnometerminal -PORTVERSION= 2.2.2 +PORTVERSION= 2.4.0.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-terminal/2.2 +MASTER_SITE_SUBDIR= sources/gnome-terminal/2.4 DISTNAME= gnome-terminal-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,17 +20,9 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui +USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui vte USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -.if defined(WITH_ZVT) -CONFIGURE_ARGS= --with-widget=zvt -USE_GNOME+= libzvt -.else -CONFIGURE_ARGS= --with-widget=vte -USE_GNOME+= vte -.endif - .include <bsd.port.mk> diff --git a/x11/gnometerminal/distinfo b/x11/gnometerminal/distinfo index a11d0bf0d30e..dafc5d297de9 100644 --- a/x11/gnometerminal/distinfo +++ b/x11/gnometerminal/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-terminal-2.2.2.tar.bz2) = 30140540966ba84597e257054a232e99 +MD5 (gnome2/gnome-terminal-2.4.0.1.tar.bz2) = 6d939e67c052e43686e2357e8083ad66 diff --git a/x11/gnometerminal/files/patch-src_terminal-widget-zvt.c b/x11/gnometerminal/files/patch-src_terminal-widget-zvt.c deleted file mode 100644 index 84c13e0aaed1..000000000000 --- a/x11/gnometerminal/files/patch-src_terminal-widget-zvt.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/terminal-widget-zvt.c.orig Wed Feb 12 18:06:32 2003 -+++ src/terminal-widget-zvt.c Wed Feb 12 18:05:20 2003 -@@ -1132,8 +1132,8 @@ - terminal_widget_set_pango_font (GtkWidget *widget, - const PangoFontDescription *font_desc) - { -- g_return_if_fail (font_desc != NULL); -- zvt_term_set_pango_font (ZVT_TERM (widget), font_desc); -+ /*g_return_if_fail (font_desc != NULL); -+ zvt_term_set_pango_font (ZVT_TERM (widget), font_desc);*/ - } - - gboolean diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist index 1ab44e46820f..b101373be612 100644 --- a/x11/gnometerminal/pkg-plist +++ b/x11/gnometerminal/pkg-plist @@ -11,6 +11,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default/%gconf.xml etc/gconf/schemas/gnome-terminal.schemas libdata/bonobo/servers/gnome-terminal.server +share/gnome/application-registry/gnome-terminal.applications share/gnome/applications/gnome-terminal.desktop share/gnome/gnome-terminal/glade/gnome-terminal.glade2 share/gnome/help/gnome-terminal/C/figures/gnome-terminal-default.png @@ -96,8 +97,10 @@ share/locale/ar/LC_MESSAGES/gnome-terminal.mo share/locale/az/LC_MESSAGES/gnome-terminal.mo share/locale/be/LC_MESSAGES/gnome-terminal.mo share/locale/bg/LC_MESSAGES/gnome-terminal.mo +share/locale/bn/LC_MESSAGES/gnome-terminal.mo share/locale/ca/LC_MESSAGES/gnome-terminal.mo share/locale/cs/LC_MESSAGES/gnome-terminal.mo +share/locale/cy/LC_MESSAGES/gnome-terminal.mo share/locale/da/LC_MESSAGES/gnome-terminal.mo share/locale/de/LC_MESSAGES/gnome-terminal.mo share/locale/el/LC_MESSAGES/gnome-terminal.mo @@ -107,9 +110,12 @@ share/locale/et/LC_MESSAGES/gnome-terminal.mo share/locale/fa/LC_MESSAGES/gnome-terminal.mo share/locale/fi/LC_MESSAGES/gnome-terminal.mo share/locale/fr/LC_MESSAGES/gnome-terminal.mo +share/locale/ga/LC_MESSAGES/gnome-terminal.mo share/locale/gl/LC_MESSAGES/gnome-terminal.mo share/locale/he/LC_MESSAGES/gnome-terminal.mo +share/locale/hi/LC_MESSAGES/gnome-terminal.mo share/locale/hu/LC_MESSAGES/gnome-terminal.mo +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/ko/LC_MESSAGES/gnome-terminal.mo @@ -132,14 +138,12 @@ 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/sv/LC_MESSAGES/gnome-terminal.mo -share/locale/ta/LC_MESSAGES/gnome-terminal.mo share/locale/tr/LC_MESSAGES/gnome-terminal.mo share/locale/uk/LC_MESSAGES/gnome-terminal.mo share/locale/vi/LC_MESSAGES/gnome-terminal.mo share/locale/wa/LC_MESSAGES/gnome-terminal.mo share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo -@dirrm share/gnome/omf/gnome-terminal @dirrm share/gnome/help/gnome-terminal/zh_TW/figures @dirrm share/gnome/help/gnome-terminal/zh_TW @dirrm share/gnome/help/gnome-terminal/zh_CN/figures @@ -160,7 +164,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo @dirrm share/gnome/help/gnome-terminal/es @dirrm share/gnome/help/gnome-terminal/de/figures @dirrm share/gnome/help/gnome-terminal/de -@dirrm share/gnome/help/gnome-terminal/C/figures @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile index 75d9b48355f0..650b22d2eba8 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -6,20 +6,20 @@ # PORTNAME= yelp -PORTVERSION= 2.2.3 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= A help browser for GNOME 2.0 desktop +COMMENT= A help browser for the GNOME 2 desktop USE_BZIP2= yes USE_X_PREFIX= yes +USE_GMAKE= yes USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack libgnomeui libgtkhtml -USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo index 99b002995697..c1e18360b234 100644 --- a/x11/yelp/distinfo +++ b/x11/yelp/distinfo @@ -1 +1 @@ -MD5 (gnome2/yelp-2.2.3.tar.bz2) = 46727cccf4e8d17ec5102e8274b5145c +MD5 (gnome2/yelp-2.4.0.tar.bz2) = 98529a608fd28b9db065d887039df16d diff --git a/x11/yelp/files/patch-configure b/x11/yelp/files/patch-configure index a6e8fbc286f0..20702046e4a8 100644 --- a/x11/yelp/files/patch-configure +++ b/x11/yelp/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Tue May 28 02:02:29 2002 -+++ configure Tue May 28 02:03:10 2002 -@@ -7381,6 +7381,7 @@ +--- configure.orig Tue Aug 12 03:36:10 2003 ++++ configure Tue Aug 12 10:30:37 2003 +@@ -18129,6 +18129,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,12 +8,18 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -9979,7 +9980,7 @@ +@@ -20408,12 +20409,12 @@ YELP_MODULES="gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0" -YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| sed -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//'`" +YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| xargs -n1 echo -n ' -I '`" - echo "$as_me:9984: checking for bzread in -lbz2" >&5 - echo $ECHO_N "checking for bzread in -lbz2... $ECHO_C" >&6 + + + case $host in +- *-linux-gnu | *-irix6*) ++ *-linux-gnu | *-irix6* | *-freebsd*) + cat >>confdefs.h <<\_ACEOF + #define HAVE_MAN_WHEREIS 1 + _ACEOF diff --git a/x11/yelp/files/patch-src_man2html_yelp-man2html.c b/x11/yelp/files/patch-src_man2html_yelp-man2html.c new file mode 100644 index 000000000000..e30c81ba0d7e --- /dev/null +++ b/x11/yelp/files/patch-src_man2html_yelp-man2html.c @@ -0,0 +1,55 @@ +--- src/man2html/yelp-man2html.c.orig Tue Jun 24 05:03:50 2003 ++++ src/man2html/yelp-man2html.c Thu Aug 14 15:47:14 2003 +@@ -129,6 +129,7 @@ + #include <string.h> + #include <sys/stat.h> + #include <dirent.h> ++#include <sys/param.h> + #include <sys/types.h> + #include <time.h> + #include <sys/time.h> +@@ -3727,6 +3728,9 @@ + main(int argc, char **argv) + { + char *t=NULL; ++#ifdef __FreeBSD__ ++ char *source=NULL; ++#endif + int i,len; + char *buf; + char *h = '\0'; +@@ -3845,6 +3849,24 @@ + * right. + */ + ++#ifdef __FreeBSD__ ++ if ((source = strstr(output, "source: ")) != NULL) ++ { ++ int j; ++ for(i = 8, j = 0; i < strlen(source); i++) ++ { ++ if (!g_ascii_isspace((unsigned char)source[i]) && source[i] != ')') ++ { ++ output[j++] = source[i]; ++ } ++ } ++ output[j] = '\0'; ++ } else { ++ i = strlen(output) - 1; ++ while (g_ascii_isspace((unsigned char)output[i])) ++ output[i--] = '\0'; ++ } ++#else + len = strlen(output); + for(i = 0; i < len; i++) + { +@@ -3855,8 +3877,7 @@ + i = strlen(output) - 1; + while (g_ascii_isspace((unsigned char)output[i])) + output[i--] = '\0'; +- +- ++#endif + if (output[0]) { + #ifdef HAVE_LIBBZ2 + if(strstr(output,".bz2")) diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist index 4cfeb4c42f5f..8d2e137bebb1 100644 --- a/x11/yelp/pkg-plist +++ b/x11/yelp/pkg-plist @@ -1,9 +1,10 @@ -bin/gman bin/gnome-help bin/yelp bin/yelp-pregenerate libdata/bonobo/servers/GNOME_Yelp.server libexec/yelp-db2html +libexec/yelp-info2html +libexec/yelp-man2html share/gnome/applications/yelp.desktop share/gnome/images/yelp/bcg.png share/gnome/images/yelp/empty.png @@ -126,14 +127,19 @@ share/gnome/sgml/docbook/yelp/docbook/html/verbatim.xsl share/gnome/sgml/docbook/yelp/docbook/html/xref.xsl share/gnome/sgml/docbook/yelp/docbook/images/blank.png share/gnome/sgml/docbook/yelp/docbook/images/caution.png +share/gnome/sgml/docbook/yelp/docbook/images/home.png share/gnome/sgml/docbook/yelp/docbook/images/important.png +share/gnome/sgml/docbook/yelp/docbook/images/next.png share/gnome/sgml/docbook/yelp/docbook/images/note.png +share/gnome/sgml/docbook/yelp/docbook/images/prev.png share/gnome/sgml/docbook/yelp/docbook/images/tip.png +share/gnome/sgml/docbook/yelp/docbook/images/up.png share/gnome/sgml/docbook/yelp/docbook/images/warning.png share/gnome/sgml/docbook/yelp/docbook/lib/lib.xsl share/gnome/sgml/docbook/yelp/l10n.xml share/gnome/sgml/docbook/yelp/yelp-custom.xsl share/gnome/sgml/docbook/yelp/yelp-customization.xsl +share/gnome/sgml/docbook/yelp/yelp-functions.xsl share/gnome/yelp/catalog share/gnome/yelp/important_docs.xml share/gnome/yelp/ui/yelp.glade @@ -145,6 +151,7 @@ share/locale/bg/LC_MESSAGES/yelp.mo share/locale/bn/LC_MESSAGES/yelp.mo share/locale/ca/LC_MESSAGES/yelp.mo share/locale/cs/LC_MESSAGES/yelp.mo +share/locale/cy/LC_MESSAGES/yelp.mo share/locale/da/LC_MESSAGES/yelp.mo share/locale/de/LC_MESSAGES/yelp.mo share/locale/el/LC_MESSAGES/yelp.mo @@ -165,11 +172,13 @@ share/locale/it/LC_MESSAGES/yelp.mo share/locale/ja/LC_MESSAGES/yelp.mo share/locale/kn/LC_MESSAGES/yelp.mo share/locale/ko/LC_MESSAGES/yelp.mo +share/locale/li/LC_MESSAGES/yelp.mo share/locale/lv/LC_MESSAGES/yelp.mo share/locale/mk/LC_MESSAGES/yelp.mo share/locale/ml/LC_MESSAGES/yelp.mo share/locale/mn/LC_MESSAGES/yelp.mo share/locale/ms/LC_MESSAGES/yelp.mo +share/locale/ne/LC_MESSAGES/yelp.mo share/locale/nl/LC_MESSAGES/yelp.mo share/locale/nn/LC_MESSAGES/yelp.mo share/locale/no/LC_MESSAGES/yelp.mo @@ -180,9 +189,9 @@ share/locale/ro/LC_MESSAGES/yelp.mo share/locale/ru/LC_MESSAGES/yelp.mo share/locale/sk/LC_MESSAGES/yelp.mo share/locale/sl/LC_MESSAGES/yelp.mo +share/locale/sq/LC_MESSAGES/yelp.mo share/locale/sr/LC_MESSAGES/yelp.mo share/locale/sr@Latn/LC_MESSAGES/yelp.mo -share/locale/sq/LC_MESSAGES/yelp.mo share/locale/sv/LC_MESSAGES/yelp.mo share/locale/ta/LC_MESSAGES/yelp.mo share/locale/th/LC_MESSAGES/yelp.mo diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index c68b229832ba..9007fff3da61 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -6,7 +6,7 @@ # PORTNAME= zenity -PORTVERSION= 1.4 +PORTVERSION= 1.6 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION} diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo index e36aadb47e8a..9208b33d35ad 100644 --- a/x11/zenity/distinfo +++ b/x11/zenity/distinfo @@ -1 +1 @@ -MD5 (gnome2/zenity-1.4.tar.bz2) = 213bfc04d5ef0e9b685f948f78169850 +MD5 (gnome2/zenity-1.6.tar.bz2) = edba02f625368eb993fcce385149c09c diff --git a/x11/zenity/files/patch-src_Makefile.in b/x11/zenity/files/patch-src_Makefile.in deleted file mode 100644 index 04cc8c376391..000000000000 --- a/x11/zenity/files/patch-src_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig Fri Jun 13 16:09:01 2003 -+++ src/Makefile.in Fri Jun 13 16:11:45 2003 -@@ -318,7 +318,7 @@ - check: check-am - installcheck-am: - installcheck: installcheck-am --install-exec-am: install-binPROGRAMS install-binSCRIPTS -+install-exec-am: install-binPROGRAMS - install-exec: install-exec-am - - install-data-am: install-gladeDATA diff --git a/x11/zenity/files/patch-src_main.c b/x11/zenity/files/patch-src_main.c new file mode 100644 index 000000000000..e382df057830 --- /dev/null +++ b/x11/zenity/files/patch-src_main.c @@ -0,0 +1,10 @@ +--- src/main.c.orig Mon Aug 25 02:53:00 2003 ++++ src/main.c Mon Aug 25 02:53:31 2003 +@@ -25,6 +25,7 @@ + #include "zenity.h" + #include <stdlib.h> + #include <popt.h> ++#include <locale.h> + #include <langinfo.h> + + typedef enum { diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist index 195d5c972e69..b6d62fb390ac 100644 --- a/x11/zenity/pkg-plist +++ b/x11/zenity/pkg-plist @@ -1,3 +1,4 @@ +bin/gdialog bin/zenity share/gnome/omf/zenity/zenity-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/zenity/zenity-C.omf 2>/dev/null || /usr/bin/true |