diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-04-30 00:47:21 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-04-30 00:47:21 +0000 |
| commit | 798e9bed2a389dce8a970e15b68176fd49f442db (patch) | |
| tree | 9dc5597aab073298ec381964f72cd853b3dd366c /x11 | |
| parent | 48b92584b0722f7f6ca412e6cfe16f1381e043cc (diff) | |
| download | ports-798e9bed2a389dce8a970e15b68176fd49f442db.tar.gz ports-798e9bed2a389dce8a970e15b68176fd49f442db.zip | |
Notes
Diffstat (limited to 'x11')
92 files changed, 2209 insertions, 835 deletions
diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile index d935dbf4fe31..a5066dfde616 100644 --- a/x11/fast-user-switch-applet/Makefile +++ b/x11/fast-user-switch-applet/Makefile @@ -3,24 +3,25 @@ # Whom: Alexander Nedotsukov <bland@FreeBSD.org> # # $FreeBSD$ -# +# $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.12 2006/04/13 07:52:39 bland Exp $ PORTNAME= fast-user-switch-applet -PORTVERSION= 0.2.4 +PORTVERSION= 2.14.1 CATEGORIES= x11 gnome -MASTER_SITES= http://ignore-your.tv/downloads/fusa/ \ - ${MASTER_SITE_LOCAL:S/%SUBDIR%/bland/} +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 -MAINTAINER= bland@FreeBSD.org +MAINTAINER= gnome@FreeBSD.org COMMENT= Fast user switching applet for GNOME +USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomehack intlhack gnomeprefix gtk20 gnomepanel GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gdm-config=${X11BASE}/etc/gdm/gdm.conf -USE_REINPLACE= yes +CONFIGURE_ARGS= --with-gdm-config=${X11BASE}/etc/gdm/custom.conf \ + --with-gdm-setup=${X11BASE}/sbin/gdmsetup GCONF_SCHEMAS= fast-user-switch-applet.schemas INSTALLS_OMF= yes diff --git a/x11/fast-user-switch-applet/distinfo b/x11/fast-user-switch-applet/distinfo index 01a8ddca1a30..8a83abaae87f 100644 --- a/x11/fast-user-switch-applet/distinfo +++ b/x11/fast-user-switch-applet/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/fast-user-switch-applet-0.2.4.tar.gz) = 263c12c7a0a043582ec4a0c900e84961 -SHA256 (gnome2/fast-user-switch-applet-0.2.4.tar.gz) = ff7348db5020852aca15f6034af1706b9254a87c86c2a4ec8c35a423aa79ab3e -SIZE (gnome2/fast-user-switch-applet-0.2.4.tar.gz) = 530165 +MD5 (gnome2/fast-user-switch-applet-2.14.1.tar.bz2) = 2cca4e96a27810738ce4def15bd49c8a +SHA256 (gnome2/fast-user-switch-applet-2.14.1.tar.bz2) = cc3373b2079a4b0358a62040eb6d82cb8292cf2bbb5f2c56167f2c415a85c3b0 +SIZE (gnome2/fast-user-switch-applet-2.14.1.tar.bz2) = 491189 diff --git a/x11/fast-user-switch-applet/pkg-plist b/x11/fast-user-switch-applet/pkg-plist index b0a9470b7bb9..f68644981ae3 100644 --- a/x11/fast-user-switch-applet/pkg-plist +++ b/x11/fast-user-switch-applet/pkg-plist @@ -3,15 +3,46 @@ libexec/fast-user-switch-applet share/gnome/fast-user-switch-applet/ui.glade share/gnome/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml share/gnome/help/fast-user-switch-applet/C/fast-user-switch-applet.xml +share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet-context.png +share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet-icon.png +share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet-prefs.png +share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet-text.png +share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet-username.png +share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet.png share/gnome/help/fast-user-switch-applet/C/legal.xml share/gnome/help/fast-user-switch-applet/es/fast-user-switch-applet.xml +share/gnome/help/fast-user-switch-applet/es/figures/fast_user_switch_applet-context.png +share/gnome/help/fast-user-switch-applet/es/figures/fast_user_switch_applet-icon.png +share/gnome/help/fast-user-switch-applet/es/figures/fast_user_switch_applet-prefs.png +share/gnome/help/fast-user-switch-applet/es/figures/fast_user_switch_applet-text.png +share/gnome/help/fast-user-switch-applet/es/figures/fast_user_switch_applet-username.png +share/gnome/help/fast-user-switch-applet/es/figures/fast_user_switch_applet.png +share/gnome/help/fast-user-switch-applet/pa/fast-user-switch-applet.xml +share/gnome/help/fast-user-switch-applet/pa/figures/fast_user_switch_applet-context.png +share/gnome/help/fast-user-switch-applet/pa/figures/fast_user_switch_applet-icon.png +share/gnome/help/fast-user-switch-applet/pa/figures/fast_user_switch_applet-prefs.png +share/gnome/help/fast-user-switch-applet/pa/figures/fast_user_switch_applet-text.png +share/gnome/help/fast-user-switch-applet/pa/figures/fast_user_switch_applet-username.png +share/gnome/help/fast-user-switch-applet/pa/figures/fast_user_switch_applet.png share/gnome/help/fast-user-switch-applet/sr/fast-user-switch-applet.xml +share/gnome/help/fast-user-switch-applet/sr/figures/fast_user_switch_applet-context.png +share/gnome/help/fast-user-switch-applet/sr/figures/fast_user_switch_applet-icon.png +share/gnome/help/fast-user-switch-applet/sr/figures/fast_user_switch_applet-prefs.png +share/gnome/help/fast-user-switch-applet/sr/figures/fast_user_switch_applet-text.png +share/gnome/help/fast-user-switch-applet/sr/figures/fast_user_switch_applet-username.png +share/gnome/help/fast-user-switch-applet/sr/figures/fast_user_switch_applet.png share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-C.omf share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-es.omf +share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-pa.omf share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-sr.omf @dirrm share/gnome/omf/fast-user-switch-applet +@dirrm share/gnome/help/fast-user-switch-applet/sr/figures @dirrm share/gnome/help/fast-user-switch-applet/sr +@dirrm share/gnome/help/fast-user-switch-applet/pa/figures +@dirrm share/gnome/help/fast-user-switch-applet/pa +@dirrm share/gnome/help/fast-user-switch-applet/es/figures @dirrm share/gnome/help/fast-user-switch-applet/es +@dirrm share/gnome/help/fast-user-switch-applet/C/figures @dirrm share/gnome/help/fast-user-switch-applet/C @dirrm share/gnome/help/fast-user-switch-applet @dirrm share/gnome/fast-user-switch-applet diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 4e26bb410594..8196ee761a8b 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,30 +3,29 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gdm/Makefile,v 1.29 2006/04/26 19:40:44 marcus Exp $ # PORTNAME= gdm -PORTVERSION= 2.8.0.7 -PORTREVISION= 3 +PORTVERSION= 2.14.4 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 version of xdm display manager USE_BZIP2= yes +USE_GETTEXT= yes USE_X_PREFIX= yes INSTALLS_OMF= yes -USE_RC_SUBR= gdm.sh +INSTALLS_ICONS= yes +USE_RC_SUBR= gdm USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gnomehier libgnomeui librsvg2 +USE_GNOME= gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \ + gnomeprefix GNU_CONFIGURE= yes -USE_REINPLACE= yes -CONFIGURE_ARGS= --localstatedir=/var --datadir=${PREFIX}/share/gnome \ - --with-html-dir=${GNOME_HTML_DIR} \ - --disable-gtk-doc \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ GTKDOC="false" @@ -34,9 +33,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ GDMDIR?= ${PREFIX}/etc/gdm PKGMESSAGE= ${WRKDIR}/pkg-message +GNOME_LOCALSTATEDIR= /var + MAN1= gdm.1 -OPTIONS= IPV6 "Enable IPv6 support" off +OPTIONS= IPV6 "Enable IPv6 support" on .include <bsd.port.pre.mk> @@ -52,7 +53,7 @@ PLIST_SUB+= PAM_MISC="" PLIST_SUB+= PAM_MISC="@comment " .endif -.if defined(WITH_IPV6) +.if !defined(WITHOUT_IPV6) CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 @@ -70,6 +71,8 @@ post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif + ${INSTALL_DATA} ${WRKSRC}/config/gdm.conf-custom \ + ${PREFIX}/etc/gdm/custom.conf.default @${MKDIR} ${PREFIX}/etc/gdm/Sessions @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \ | /usr/bin/fmt 75 79 > ${PKGMESSAGE} diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index 722b409079fa..c877394be637 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gdm-2.8.0.7.tar.bz2) = 566a1e3d656b6b536414f287ead2db7e -SHA256 (gnome2/gdm-2.8.0.7.tar.bz2) = bd83a23cad86de545f57a7c38cb9b7fa52aedc5bd2f8103f1cc7a35b0bfc6a10 -SIZE (gnome2/gdm-2.8.0.7.tar.bz2) = 2777760 +MD5 (gnome2/gdm-2.14.4.tar.bz2) = 04cbd92e0c264787328e3373da3ebc11 +SHA256 (gnome2/gdm-2.14.4.tar.bz2) = 0050b544e87bc09290433e477bd4043c644f8dc9b03531b135fa5f5b3b1395b6 +SIZE (gnome2/gdm-2.14.4.tar.bz2) = 3041769 diff --git a/x11/gdm/files/gdm.sh.in b/x11/gdm/files/gdm.in index 816c2d283dd7..1b9d3e640ade 100644 --- a/x11/gdm/files/gdm.sh.in +++ b/x11/gdm/files/gdm.in @@ -1,5 +1,6 @@ #!/bin/sh # $FreeBSD$ +# $MCom: ports/x11/gdm/files/gdm.in,v 1.5 2006/03/06 19:02:27 marcus Exp $ # PROVIDE: gdm # REQUIRE: LOGIN cleanvar moused diff --git a/x11/gdm/files/patch-config_gdm.conf.in b/x11/gdm/files/patch-config_gdm.conf.in index 60781d1af357..43e2c566c5a1 100644 --- a/x11/gdm/files/patch-config_gdm.conf.in +++ b/x11/gdm/files/patch-config_gdm.conf.in @@ -1,35 +1,26 @@ ---- config/gdm.conf.in.orig Thu Oct 6 19:25:45 2005 -+++ config/gdm.conf.in Mon Dec 5 21:56:18 2005 -@@ -76,7 +76,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_LOGDIR@ -+LogDir=/var/log - # You should probably never change this value unless you have a weird setup - PidFile=/var/run/gdm.pid - # Note that a post login script is run before a PreSession script. -@@ -131,11 +131,11 @@ +--- config/gdm.conf.in.orig Fri Apr 7 15:47:20 2006 ++++ config/gdm.conf.in Wed Apr 12 01:53:30 2006 +@@ -156,11 +156,11 @@ StandardXServer=@X_SERVER@ #FlexiReapDelayMinutes=5 - # the X nest command + # The X nest command. Xnest=@X_XNEST_PATH@/Xnest @X_XNEST_CONFIG_OPTIONS@ --# Automatic VT allocation. Right now only works on Linux. This way +-# Automatic VT allocation. Right now only works on Linux. This way we force +# Automatic VT allocation. This way - # we force X to use specific vts. turn VTAllocation to false if this - # is causing problems. + # X to use specific vts. turn VTAllocation to false if this is causing + # problems. -#FirstVT=7 -#VTAllocation=true +FirstVT=9 +VTAllocation=true - # Should double login be treated with a warning (and possibility to change - # vts on linux and freebsd systems for console logins) + # Should double login be treated with a warning (and possibility to change VT's + # on Linux and FreeBSD systems for console logins) #DoubleLoginWarning=true -@@ -250,7 +250,7 @@ - # The specific gtkrc file we use. It should be the full path to the gtkrc - # that we need. Unless you need a specific gtkrc that doesn't correspond to - # a specific theme, then just use the GtkTheme key --#GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk-2.0/gtkrc -+#GtkRC=@EXPANDED_DATADIR@/../themes/Default/gtk-2.0/gtkrc +@@ -283,7 +283,7 @@ Enable=false + # The specific gtkrc file we use. It should be the full path to the gtkrc that + # we need. Unless you need a specific gtkrc that doesn't correspond to a + # specific theme, then just use the GtkTheme key. +-#GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc ++#GtkRC=@datadir@/../themes/Default/gtk-2.0/gtkrc - # The GTK+ theme to use for the gui + # The GTK+ theme to use for the GUI. #GtkTheme=Default diff --git a/x11/gdm/files/patch-config_locale.alias b/x11/gdm/files/patch-config_locale.alias index ca653e463eec..c983c422eb75 100644 --- a/x11/gdm/files/patch-config_locale.alias +++ b/x11/gdm/files/patch-config_locale.alias @@ -34,7 +34,7 @@ -English(Canada) en_CA.UTF-8,en_CA -English(Ireland) en_IE.UTF-8,en_IE -English(SouthAfrica) en_ZA.UTF-8,en_ZA --Esparanto eo.UTF-8,eo +-Esperanto eo.UTF-8,eo -Estonian et_EE.UTF-8,et_EE -Finnish fi_FI.UTF-8,fi_FI -French fr_FR.UTF-8,fr_FR diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure index 72f2005ff721..ae54f1460b87 100644 --- a/x11/gdm/files/patch-configure +++ b/x11/gdm/files/patch-configure @@ -1,17 +1,17 @@ ---- configure.orig Sat Jun 11 03:35:18 2005 -+++ configure Sat Jun 11 03:43:21 2005 -@@ -22412,6 +22412,8 @@ +--- configure.orig Wed Mar 29 13:51:40 2006 ++++ configure Wed Mar 29 14:15:56 2006 +@@ -22965,6 +22965,8 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include <sys/types.h> +#include <sys/socket.h> $ac_includes_default - int - main () -@@ -30210,6 +30212,13 @@ - SUSPEND_COMMAND="/usr/openwin/bin/sys-suspend -n" + #include <$ac_header> + _ACEOF +@@ -32415,6 +32417,13 @@ case "$host" in XSESSION_SHELL=/bin/ksh + SOUND_PROGRAM=/usr/bin/audioplay ;; +*freebsd*) + GDM_USER_PATH="/bin:/usr/bin" diff --git a/x11/gdm/files/patch-daemon_gdmconfig.c b/x11/gdm/files/patch-daemon_gdmconfig.c new file mode 100644 index 000000000000..9ebf10c997e1 --- /dev/null +++ b/x11/gdm/files/patch-daemon_gdmconfig.c @@ -0,0 +1,10 @@ +--- daemon/gdmconfig.c.orig Thu Jan 5 16:57:06 2006 ++++ daemon/gdmconfig.c Thu Jan 5 16:57:44 2006 +@@ -39,6 +39,7 @@ + #include <fcntl.h> + #include <sys/types.h> + #include <sys/stat.h> ++#include <sys/resource.h> + #include <signal.h> + #include <pwd.h> + #include <grp.h> diff --git a/x11/gdm/files/patch-daemon_server.c b/x11/gdm/files/patch-daemon_server.c new file mode 100644 index 000000000000..57f028bfd263 --- /dev/null +++ b/x11/gdm/files/patch-daemon_server.c @@ -0,0 +1,10 @@ +--- daemon/server.c.orig Thu Jan 5 16:58:37 2006 ++++ daemon/server.c Thu Jan 5 16:58:46 2006 +@@ -29,6 +29,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/wait.h> ++#include <sys/resource.h> + #include <strings.h> + #include <signal.h> + #include <syslog.h> diff --git a/x11/gdm/files/patch-gui_greeter_gdmthemetester.in b/x11/gdm/files/patch-gui_greeter_gdmthemetester.in new file mode 100644 index 000000000000..988efc3fbd84 --- /dev/null +++ b/x11/gdm/files/patch-gui_greeter_gdmthemetester.in @@ -0,0 +1,112 @@ +--- gui/greeter/gdmthemetester.in.orig Wed Apr 12 01:57:25 2006 ++++ gui/greeter/gdmthemetester.in Wed Apr 12 01:57:12 2006 +@@ -0,0 +1,109 @@ ++#!/bin/sh ++ ++gdmwhich () { ++ COMMAND="$1" ++ OUTPUT= ++ IFS=: ++ for dir in $PATH ++ do ++ if test -x "$dir/$COMMAND" ; then ++ if test "x$OUTPUT" = "x" ; then ++ OUTPUT="$dir/$COMMAND" ++ fi ++ fi ++ done ++ IFS=$OLD_IFS ++ echo "$OUTPUT" ++} ++ ++echo ++echo "GDM Theme Tester" ++echo ++echo "Be sure to test all the environments:" ++echo " console, console-timed, flexi, remote-flexi, xdmcp" ++echo "Also be sure to test using caps lock" ++echo ++ ++XNEST=`gdmwhich Xnest` ++GDMXNEST=`gdmwhich gdmXnest` ++GDMGREETER="@libexecdir@/gdmgreeter" ++ ++if [ x$XNEST = x ]; then ++ echo "ERROR: Xnest not found" ++ echo "" ++ exit 1 ++fi ++ ++if [ x$GDMXNEST = x ]; then ++ echo "ERROR: gdmXnest not found" ++ echo "" ++ exit 1 ++fi ++ ++if [ x$GDMGREETER = x ]; then ++ echo "ERROR: gdmgreeter not found" ++ echo "" ++ exit 1 ++fi ++ ++USAGE=" ++Usage: $0 <environment> <theme> ++<environment> is one of: console, console-timed, flexi, remote-flexi, xdmcp ++<theme> is either the path of the theme or the name of an installed theme ++ ++If you set the environment variable XNESTSIZE to <width>x<height> (e.g. 800x600) ++you can test the greeter at that resolution ++" ++if [ "$#" != 2 ]; then ++ echo "$USAGE" ++ exit 1 ++fi ++ ++GDM_THEME="$2" ++DOING_GDM_DEVELOPMENT=yes ++GDM_PARENT_DISPLAY="$DISPLAY" ++export GDM_THEME DOING_GDM_DEVELOPMENT GDM_PARENT_DISPLAY ++ ++case $1 in ++console) ++ GDM_IS_LOCAL=yes ++ export GDM_IS_LOCAL ++ ;; ++console-timed) ++ GDM_IS_LOCAL=yes ++ GDM_FAKE_TIMED=yes ++ export GDM_IS_LOCAL GDM_FAKE_TIMED ++ ;; ++flexi) ++ GDM_IS_LOCAL=yes ++ GDM_FLEXI_SERVER=yes ++ export GDM_IS_LOCAL GDM_FLEXI_SERVER ++ ;; ++remote-flexi) ++ GDM_FLEXI_SERVER=yes ++ export GDM_FLEXI_SERVER ++ ;; ++xdmcp) ++ ;; ++*) ++ echo "$USAGE" ++ exit 1 ++ ;; ++esac ++ ++if [ "x$XNESTSIZE" = x ] ; then ++ eval `gdmXnest -b` ++else ++ eval `gdmXnest -b -o "-geometry $XNESTSIZE"` ++fi ++export DISPLAY ++ ++if [ "x$GDM_PARENT_DISPLAY" = "x$DISPLAY" ]; then ++ echo "ERROR: Can't start the Xnest server" ++ exit 1 ++fi ++ ++# This may not be necessary ++sleep 1 ++ ++@libexecdir@/gdmgreeter diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist index efcba3605e39..7288ec2f5d69 100644 --- a/x11/gdm/pkg-plist +++ b/x11/gdm/pkg-plist @@ -11,9 +11,9 @@ 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/custom.conf %D/etc/gdm/custom.conf.default; then rm -f %D/etc/gdm/custom.conf; fi +etc/gdm/custom.conf.default +@exec [ -f %B/custom.conf ] || cp %B/%f %B/custom.conf etc/gdm/locale.alias @unexec if cmp -s %D/etc/gdm/modules/AccessDwellMouseEvents %D/etc/gdm/modules/factory-AccessDwellMouseEvents; then rm -f %D/etc/gdm/modules/AccessDwellMouseEvents; fi etc/gdm/modules/factory-AccessDwellMouseEvents @@ -29,8 +29,8 @@ lib/gtk-2.0/modules/libkeymouselistener.la lib/gtk-2.0/modules/libkeymouselistener.so %%PAM_MISC%%libexec/gdmaskpass libexec/gdmchooser -libexec/gdmlogin libexec/gdmgreeter +libexec/gdmlogin libexec/gdmtranslate sbin/gdm sbin/gdm-binary @@ -43,6 +43,8 @@ share/gnome/applications/gdmflexiserver.desktop share/gnome/applications/gdmphotosetup.desktop share/gnome/applications/gdmsetup.desktop share/gnome/gdm/BuiltInSessions/default.desktop +share/gnome/gdm/defaults.conf +share/gnome/gdm/factory-defaults.conf share/gnome/gdm/gdmchooser.glade share/gnome/gdm/gdmphotosetup.glade share/gnome/gdm/gdmsetup.glade @@ -55,22 +57,16 @@ share/gnome/gdm/themes/circles/options.png share/gnome/gdm/themes/circles/screenshot.png share/gnome/gdm/themes/happygnome-list/GdmGreeterTheme.desktop share/gnome/gdm/themes/happygnome-list/background.svg -share/gnome/gdm/themes/happygnome-list/disconnect.png -share/gnome/gdm/themes/happygnome-list/gnome-logo.png +share/gnome/gdm/themes/happygnome-list/gnome-logo.svg share/gnome/gdm/themes/happygnome-list/happygnome.xml share/gnome/gdm/themes/happygnome-list/options.png share/gnome/gdm/themes/happygnome-list/screenshot.png -share/gnome/gdm/themes/happygnome-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 -share/gnome/gdm/themes/happygnome/gnome-logo.png +share/gnome/gdm/themes/happygnome/gnome-logo.svg share/gnome/gdm/themes/happygnome/happygnome.xml share/gnome/gdm/themes/happygnome/options.png share/gnome/gdm/themes/happygnome/screenshot.png -share/gnome/gdm/themes/happygnome/session.png -share/gnome/gdm/themes/happygnome/system.png share/gnome/help/gdm/C/gdm.xml share/gnome/help/gdm/C/legal.xml share/gnome/help/gdm/de/figures/gdm_window.png @@ -94,6 +90,8 @@ share/gnome/help/gdm/ko/legal.xml share/gnome/help/gdm/sv/figures/gdm_window.png share/gnome/help/gdm/sv/gdm.xml share/gnome/help/gdm/sv/legal.xml +share/gnome/help/gdm/uk/gdm.xml +share/gnome/help/gdm/uk/legal.xml share/gnome/help/gdm/zh_CN/figures/gdm_window.png share/gnome/help/gdm/zh_CN/gdm.xml share/gnome/help/gdm/zh_CN/legal.xml @@ -111,6 +109,7 @@ share/gnome/omf/gdm/gdm-it.omf share/gnome/omf/gdm/gdm-ja.omf share/gnome/omf/gdm/gdm-ko.omf share/gnome/omf/gdm/gdm-sv.omf +share/gnome/omf/gdm/gdm-uk.omf share/gnome/omf/gdm/gdm-zh_CN.omf share/gnome/omf/gdm/gdm-zh_HK.omf share/gnome/omf/gdm/gdm-zh_TW.omf @@ -162,6 +161,7 @@ share/locale/cs/LC_MESSAGES/gdm.mo share/locale/cy/LC_MESSAGES/gdm.mo share/locale/da/LC_MESSAGES/gdm.mo share/locale/de/LC_MESSAGES/gdm.mo +share/locale/dz/LC_MESSAGES/gdm.mo share/locale/el/LC_MESSAGES/gdm.mo share/locale/en_CA/LC_MESSAGES/gdm.mo share/locale/en_GB/LC_MESSAGES/gdm.mo @@ -182,6 +182,7 @@ share/locale/id/LC_MESSAGES/gdm.mo share/locale/is/LC_MESSAGES/gdm.mo share/locale/it/LC_MESSAGES/gdm.mo share/locale/ja/LC_MESSAGES/gdm.mo +share/locale/ka/LC_MESSAGES/gdm.mo share/locale/ko/LC_MESSAGES/gdm.mo share/locale/ku/LC_MESSAGES/gdm.mo share/locale/lt/LC_MESSAGES/gdm.mo @@ -196,7 +197,6 @@ share/locale/nb/LC_MESSAGES/gdm.mo share/locale/ne/LC_MESSAGES/gdm.mo share/locale/nl/LC_MESSAGES/gdm.mo share/locale/nn/LC_MESSAGES/gdm.mo -share/locale/no/LC_MESSAGES/gdm.mo share/locale/nso/LC_MESSAGES/gdm.mo share/locale/pa/LC_MESSAGES/gdm.mo share/locale/pl/LC_MESSAGES/gdm.mo @@ -219,11 +219,27 @@ share/locale/vi/LC_MESSAGES/gdm.mo share/locale/wa/LC_MESSAGES/gdm.mo share/locale/xh/LC_MESSAGES/gdm.mo share/locale/zh_CN/LC_MESSAGES/gdm.mo +share/locale/zh_HK/LC_MESSAGES/gdm.mo share/locale/zh_TW/LC_MESSAGES/gdm.mo share/locale/zu/LC_MESSAGES/gdm.mo +@dirrmtry share/locale/zu/LC_MESSAGES +@dirrmtry share/locale/zu +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/nso/LC_MESSAGES +@dirrmtry share/locale/nso +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/mi/LC_MESSAGES +@dirrmtry share/locale/mi @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz @dirrm share/gnome/xsessions +@dirrm share/gnome/pixmaps/faces @dirrm share/gnome/omf/gdm @dirrm share/gnome/help/gdm/zh_TW/figures @dirrm share/gnome/help/gdm/zh_TW @@ -231,6 +247,7 @@ share/locale/zu/LC_MESSAGES/gdm.mo @dirrm share/gnome/help/gdm/zh_HK @dirrm share/gnome/help/gdm/zh_CN/figures @dirrm share/gnome/help/gdm/zh_CN +@dirrm share/gnome/help/gdm/uk @dirrm share/gnome/help/gdm/sv/figures @dirrm share/gnome/help/gdm/sv @dirrm share/gnome/help/gdm/ko/figures @@ -247,13 +264,12 @@ share/locale/zu/LC_MESSAGES/gdm.mo @dirrm share/gnome/help/gdm/de @dirrm share/gnome/help/gdm/C @dirrm share/gnome/help/gdm -@dirrm share/gnome/gdm/themes/happygnome @dirrm share/gnome/gdm/themes/happygnome-list +@dirrm share/gnome/gdm/themes/happygnome @dirrm share/gnome/gdm/themes/circles @dirrm share/gnome/gdm/themes @dirrm share/gnome/gdm/BuiltInSessions @dirrm share/gnome/gdm -@dirrm share/gnome/pixmaps/faces @dirrm etc/pam.d @dirrm etc/gdm/modules @dirrm etc/gdm/Sessions @@ -262,10 +278,10 @@ share/locale/zu/LC_MESSAGES/gdm.mo @dirrm etc/gdm/PostLogin @dirrm etc/gdm/Init @dirrm etc/gdm -@unexec /bin/rmdir %D/etc/dm/Sessions 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/etc/dm 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/sbin 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/gnome/log/gdm 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/gnome/log 2>/dev/null || /usr/bin/true +@dirrmtry etc/dm/Sessions +@dirrmtry etc/dm +@dirrmtry sbin +@dirrmtry share/gnome/log/gdm +@dirrmtry share/gnome/log @unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true @unexec /bin/rm -rf /var/log/gdm 2>/dev/null || /usr/bin/true diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index e2b745126db9..4e6cd0755f3b 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -3,14 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnomeapplets2/Makefile,v 1.94 2005/10/08 19:41:40 marcus Exp $ +# $MCom: ports/x11/gnomeapplets2/Makefile,v 1.111 2006/04/13 07:52:40 bland Exp $ # PORTNAME= gnomeapplets2 -PORTVERSION= 2.12.3 +PORTVERSION= 2.14.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-applets/2.12 +MASTER_SITE_SUBDIR= sources/gnome-applets/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= gnome-applets-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,28 +18,30 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Applets components for the Gnome 2 Desktop Environment BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-system-tools.pc:${PORTSDIR}/sysutils/gnomesystemtools -LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop2 \ +LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop2 \ xklavier.10:${PORTSDIR}/x11/libxklavier \ gucharmap.4:${PORTSDIR}/deskutils/gucharmap RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/gnomesystemtools +USE_GETTEXT= yes USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 INSTALLS_OMF= yes INSTALLS_ICONS= yes +INSTALLS_SHLIB= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \ gail gnomedocutils USE_GSTREAMER= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ +CONFIGURE_ARGS= --with-gstreamer=0.10 +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ FREEBSD_SYS=${FREEBSD_SYS} GCONF_SCHEMAS= charpick.schemas drivemount.schemas geyes.schemas \ gswitchit.schemas gtik.schemas gweather.schemas \ - mini-commander-global.schemas mini-commander.schemas \ mixer.schemas multiload.schemas \ stickynotes.schemas @@ -47,6 +49,11 @@ FREEBSD_SYS?= /usr/src/sys .include <bsd.port.pre.mk> +.if exists(${LOCALBASE}/libdata/pkgconfig/libnotify.pc) || \ + defined(WITH_LIBNOTIFY) +LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify +.endif + .if ${ARCH} != "i386" && ${ARCH} != "amd64" CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC" PLIST_SUB= BATTERY="@comment " @@ -62,4 +69,8 @@ PLIST_SUB+= CPUFREQ="" GCONF_SCHEMAS+= cpufreq-applet.schemas .endif +post-patch: + @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \ + ${WRKSRC}/libgweather/weather-met.c + .include <bsd.port.post.mk> diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo index b84b0032da13..6236e73545a6 100644 --- a/x11/gnome-applets/distinfo +++ b/x11/gnome-applets/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-applets-2.12.3.tar.bz2) = 39987d3e8726e58a6a72047ada05e25d -SHA256 (gnome2/gnome-applets-2.12.3.tar.bz2) = a994896e9cb5b0527616ac7713cfbc3c5c24d03c18c4b4463ec8db442619f946 -SIZE (gnome2/gnome-applets-2.12.3.tar.bz2) = 5515981 +MD5 (gnome2/gnome-applets-2.14.1.tar.bz2) = 1b5e834450812a6a3e7ab00652587ef4 +SHA256 (gnome2/gnome-applets-2.14.1.tar.bz2) = d8bf2dcebbe632c13f3268e6903640561be89a95cc8a8868453ca6600e962db9 +SIZE (gnome2/gnome-applets-2.14.1.tar.bz2) = 6608312 diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa index 48b84e4569f6..a5233ffe0e9d 100644 --- a/x11/gnome-applets/files/patch-aa +++ b/x11/gnome-applets/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Sat Jul 16 12:55:48 2005 -+++ configure Sat Jul 16 13:04:33 2005 -@@ -23272,8 +23272,7 @@ +--- configure.orig Sun Feb 12 14:11:21 2006 ++++ configure Sun Feb 12 14:12:00 2006 +@@ -23361,8 +23361,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -10,44 +10,35 @@ GNOMELOCALEDIR="$ac_define_dir" -@@ -25126,7 +25125,7 @@ +@@ -25392,7 +25391,7 @@ ;; # list of supported OS cores that do not use libapm -- i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*) -+ i386-*-freebsd*|amd64-*-freebsd*|*-*-netbsd*|*-*-openbsd*) +- i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu) ++ i386-*-freebsd*|amd64-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu) if -n "${OS_SYS}" ; then ACPIINC="-I${OS_SYS}" else -@@ -25406,7 +25405,7 @@ - APPLET_MIXER_FALSE= - fi - --if test x"$P_MIXER" == x"mixer"; then -+if test x"$P_MIXER" = x"mixer"; then - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - else -@@ -25983,7 +25982,7 @@ +@@ -26469,7 +26468,7 @@ fi -if test "x$SU_TOOL" == "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then +if test "x$SU_TOOL" = "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then - { echo "$as_me:$LINENO: WARNING: *** \`modemlights' applet will not be built ***" >&5 - echo "$as_me: WARNING: *** \`modemlights' applet will not be built ***" >&2;} + { echo "$as_me:$LINENO: WARNING: *** modemlights applet will not be built ***" >&5 + echo "$as_me: WARNING: *** modemlights applet will not be built ***" >&2;} else -@@ -26119,6 +26118,9 @@ - echo "${ECHO_T}yes" >&6 +@@ -26633,6 +26632,9 @@ + *linux*) build_cpufreq_applet=yes ;; + i386-*-freebsd*|amd64-*-freebsd*) + build_cpufreq_applet=yes + ;; *) - echo "warning: ${host} is not supported by cpufreq applet, not building" >&2 - build_cpufreq_applet=no -@@ -26409,7 +26411,7 @@ + { echo "$as_me:$LINENO: WARNING: ${host} is not supported by cpufreq applet, not building" >&5 + echo "$as_me: WARNING: ${host} is not supported by cpufreq applet, not building" >&2;} +@@ -27109,7 +27111,7 @@ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" @@ -56,7 +47,7 @@ pixmapsdir="${datadir}/pixmaps" -@@ -26423,8 +26425,7 @@ +@@ -27123,8 +27125,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -66,7 +57,7 @@ GNOME_ICONDIR="$ac_define_dir" -@@ -26436,8 +26437,7 @@ +@@ -27136,8 +27137,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -76,7 +67,7 @@ GNOME_PIXMAPSDIR="$ac_define_dir" -@@ -26449,8 +26449,7 @@ +@@ -27149,8 +27149,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -86,7 +77,7 @@ GNOME_GLADEDIR="$ac_define_dir" -@@ -26462,8 +26461,7 @@ +@@ -27162,8 +27161,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -96,7 +87,7 @@ DATADIR="$ac_define_dir" -@@ -26475,8 +26473,7 @@ +@@ -27175,8 +27173,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -106,7 +97,7 @@ SYSCONFDIR="$ac_define_dir" -@@ -26488,8 +26485,7 @@ +@@ -27188,8 +27185,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -116,7 +107,7 @@ LIBDIR="$ac_define_dir" -@@ -26501,8 +26497,7 @@ +@@ -27201,8 +27197,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' diff --git a/x11/gnome-applets/files/patch-drivemount_drive-button.c b/x11/gnome-applets/files/patch-drivemount_drive-button.c deleted file mode 100644 index f26e3121ee4b..000000000000 --- a/x11/gnome-applets/files/patch-drivemount_drive-button.c +++ /dev/null @@ -1,48 +0,0 @@ ---- drivemount/drive-button.c.orig Tue Aug 23 05:16:27 2005 -+++ drivemount/drive-button.c Tue Aug 23 20:37:43 2005 -@@ -24,6 +24,7 @@ - # include <config.h> - #endif - -+#include <string.h> - #include "drive-button.h" - #include <glib/gi18n.h> - #include <gdk/gdkkeysyms.h> -@@ -710,11 +711,13 @@ run_command (DriveButton *self, const ch - - GList *volumes; - GnomeVFSVolume *volume; -+ char *uri; -+ char *mount_path; - - volumes = gnome_vfs_drive_get_mounted_volumes (self->drive); - volume = GNOME_VFS_VOLUME (volumes->data); -- char *uri = gnome_vfs_volume_get_activation_uri (volume); -- char *mount_path = gnome_vfs_get_local_path_from_uri (uri); -+ uri = gnome_vfs_volume_get_activation_uri (volume); -+ mount_path = gnome_vfs_get_local_path_from_uri (uri); - g_free (uri); - - gnome_vfs_drive_get_display_name (self->drive); -@@ -794,6 +797,11 @@ drive_button_ensure_popup (DriveButton * - char *display_name, *tmp, *label; - int action; - GtkWidget *item; -+ GList *volumes; -+ GnomeVFSVolume *volume = NULL; -+ GnomeVFSDeviceType volume_type; -+ GCallback callback; -+ const char *action_icon = GTK_STOCK_OPEN; - - if (self->popup_menu) return; - -@@ -869,8 +877,7 @@ drive_button_ensure_popup (DriveButton * - g_free (display_name); - display_name = tmp; - -- GCallback callback = G_CALLBACK (open_drive); -- const char *action_icon = GTK_STOCK_OPEN; -+ callback = G_CALLBACK (open_drive); - - switch (device_type) { - case GNOME_VFS_DEVICE_TYPE_VIDEO_DVD: diff --git a/x11/gnome-applets/files/patch-gswitchit_gswitchit-applet.c b/x11/gnome-applets/files/patch-gswitchit_gswitchit-applet.c deleted file mode 100644 index 5abf18032f00..000000000000 --- a/x11/gnome-applets/files/patch-gswitchit_gswitchit-applet.c +++ /dev/null @@ -1,61 +0,0 @@ ---- gswitchit/gswitchit-applet.c.orig Sun Aug 7 18:07:33 2005 -+++ gswitchit/gswitchit-applet.c Sun Aug 7 18:10:07 2005 -@@ -331,6 +331,10 @@ GSwitchItAppletPrepareDrawing (GSwitchIt - XklConfigItem configItem; - GtkWidget *align, *label; - static GHashTable *shortDescrs = NULL; -+ gpointer pcounter = NULL; -+ char *prevLayoutName = NULL; -+ char *labelTitle = NULL; -+ int counter = 0; - if (group == 0) - shortDescrs = g_hash_table_new_full (g_str_hash, g_str_equal, - g_free, NULL); -@@ -363,10 +367,6 @@ GSwitchItAppletPrepareDrawing (GSwitchIt - if (layoutName == NULL) - layoutName = g_strdup ("?"); - -- gpointer pcounter = NULL; -- char *prevLayoutName = NULL; -- char *labelTitle = NULL; -- int counter = 0; - if (g_hash_table_lookup_extended (shortDescrs, layoutName, - (gpointer*)&prevLayoutName, &pcounter)) - { -@@ -599,6 +599,13 @@ GSwitchItAppletCmdPreview (BonoboUICompo - groupsLevels, groupsLevels + 1, groupsLevels + 2, groupsLevels + 3 }; - XklState *xklState = XklGetCurrentState (); - gpointer p = g_hash_table_lookup (globals.previewDialogs, GINT_TO_POINTER (xklState->group)); -+#ifdef HAVE_XKB -+ GladeXML *gladeData; -+ GtkWidget *dialog; -+ GtkWidget *kbdraw; -+ XkbComponentNamesRec componentNames; -+ XklConfigRec xklData; -+#endif - if (p != NULL) - { - /* existing window */ -@@ -606,11 +613,10 @@ GSwitchItAppletCmdPreview (BonoboUICompo - return; - } - #ifdef HAVE_XKB -- GladeXML *gladeData = glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade", "gswitchit_layout_view", NULL); -- GtkWidget *dialog = -+ gladeData = glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade", "gswitchit_layout_view", NULL); -+ dialog = - glade_xml_get_widget (gladeData, "gswitchit_layout_view"); -- GtkWidget *kbdraw = keyboard_drawing_new (); -- XkbComponentNamesRec componentNames; -+ kbdraw = keyboard_drawing_new (); - - if (xklState->group >= 0 && - xklState->group < g_slist_length (globals.groupNames)) -@@ -624,7 +630,6 @@ GSwitchItAppletCmdPreview (BonoboUICompo - - keyboard_drawing_set_groups_levels (KEYBOARD_DRAWING (kbdraw), pGroupsLevels); - -- XklConfigRec xklData; - XklConfigRecInit (&xklData); - if (XklConfigGetFromServer (&xklData)) - { diff --git a/x11/gnome-applets/files/patch-gweather_weather-iwin.c b/x11/gnome-applets/files/patch-gweather_weather-iwin.c deleted file mode 100644 index 14c0190b2eed..000000000000 --- a/x11/gnome-applets/files/patch-gweather_weather-iwin.c +++ /dev/null @@ -1,9 +0,0 @@ ---- gweather/weather-iwin.c.orig Tue Dec 21 18:42:38 2004 -+++ gweather/weather-iwin.c Tue Dec 21 18:42:47 2004 -@@ -1,5 +1,6 @@ - /* $Id: patch-gweather_weather-iwin.c,v 1.1 2004/12/22 00:06:21 marcus Exp $ */ - -+#include <sys/types.h> - #include <regex.h> - #include <gnome.h> - #include "weather.h" diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist index 964c3e8c541f..42368d3b5a50 100644 --- a/x11/gnome-applets/pkg-plist +++ b/x11/gnome-applets/pkg-plist @@ -3,6 +3,13 @@ bin/gswitchit-plugins-capplet %%BATTERY%%etc/sound/events/battstat_applet.soundlist include/libgswitchit/gswitchit_config.h include/libgswitchit/gswitchit_plugin.h +include/libgweather/gweather-gconf.h +include/libgweather/gweather-prefs.h +include/libgweather/weather.h +lib/libgweather.a +lib/libgweather.la +lib/libgweather.so +lib/libgweather.so.0 libdata/bonobo/servers/GNOME_AccessxStatusApplet.server %%BATTERY%%libdata/bonobo/servers/GNOME_BattstatApplet.server libdata/bonobo/servers/GNOME_CDPlayerApplet.server @@ -23,17 +30,16 @@ libdata/bonobo/servers/GNOME_Panel_TrashApplet.server libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server libdata/bonobo/servers/GNOME_StickyNotesApplet.server libdata/pkgconfig/gswitchit.pc +libdata/pkgconfig/gweather.pc libexec/accessx-status-applet %%BATTERY%%libexec/battstat-applet-2 libexec/charpick_applet2 %%CPUFREQ%%libexec/cpufreq-applet libexec/drivemount_applet2 libexec/geyes_applet2 -libexec/gnome-applets/mc-install-default-macros libexec/gnome-keyboard-applet libexec/gtik2_applet2 libexec/gweather-applet-2 -libexec/mini_commander_applet libexec/mixer_applet2 libexec/modem_applet libexec/multiload-applet-2 @@ -49,7 +55,6 @@ share/gnome/gnome-2.0/ui/GNOME_GSwitchItApplet.xml share/gnome/gnome-2.0/ui/GNOME_GWeatherApplet.xml share/gnome/gnome-2.0/ui/GNOME_GeyesApplet.xml share/gnome/gnome-2.0/ui/GNOME_GtikApplet.xml -share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml share/gnome/gnome-2.0/ui/GNOME_ModemLights.xml share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml @@ -74,7 +79,6 @@ share/gnome/gnome-applets/geyes/Horrid/horrid_pupil.png %%CPUFREQ%%share/gnome/gnome-applets/glade/cpufreq-preferences.glade share/gnome/gnome-applets/glade/gswitchit-plugins.glade share/gnome/gnome-applets/glade/gswitchit.glade -share/gnome/gnome-applets/glade/mini-commander.glade share/gnome/gnome-applets/glade/modemlights.glade share/gnome/gnome-applets/glade/stickynotes.glade share/gnome/gnome-applets/glade/trashapplet.glade @@ -93,6 +97,18 @@ share/gnome/help/accessx-status/C/figures/accessx_sticky-meta-key.png share/gnome/help/accessx-status/C/figures/accessx_sticky-shift-key.png share/gnome/help/accessx-status/C/figures/accessx_sticky-windows-key.png share/gnome/help/accessx-status/C/legal.xml +share/gnome/help/accessx-status/bg/accessx-status.xml +share/gnome/help/accessx-status/bg/figures/accessx-status-applet.png +share/gnome/help/accessx-status/bg/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/bg/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/bg/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/bg/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/bg/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/bg/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/bg/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/bg/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/bg/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/bg/figures/accessx_sticky-windows-key.png share/gnome/help/accessx-status/es/accessx-status.xml share/gnome/help/accessx-status/es/figures/accessx-status-applet.png share/gnome/help/accessx-status/es/figures/accessx-status-disabled.png @@ -148,12 +164,24 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-preferences.png %%BATTERY%%share/gnome/help/battstat/C/figures/context-menu.png %%BATTERY%%share/gnome/help/battstat/C/legal.xml +%%BATTERY%%share/gnome/help/battstat/bg/battstat.xml +%%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-applet-expanded.png +%%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-credits-hal.png +%%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-preferences.png +%%BATTERY%%share/gnome/help/battstat/bg/figures/context-menu.png %%BATTERY%%share/gnome/help/battstat/es/battstat.xml %%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet-expanded.png %%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet.png %%BATTERY%%share/gnome/help/battstat/es/figures/battstat-credits-hal.png %%BATTERY%%share/gnome/help/battstat/es/figures/battstat-preferences.png %%BATTERY%%share/gnome/help/battstat/es/figures/context-menu.png +%%BATTERY%%share/gnome/help/battstat/fr/battstat.xml +%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet-expanded.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-credits-hal.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-preferences.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/context-menu.png %%BATTERY%%share/gnome/help/battstat/uk/battstat.xml %%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet-expanded.png %%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet.png @@ -166,11 +194,21 @@ share/gnome/help/char-palette/C/figures/charpalette_chargroup.png share/gnome/help/char-palette/C/figures/charpick-preferences.png share/gnome/help/char-palette/C/figures/charpick_characters.png share/gnome/help/char-palette/C/legal.xml +share/gnome/help/char-palette/bg/char-palette.xml +share/gnome/help/char-palette/bg/figures/charpalette_applet.png +share/gnome/help/char-palette/bg/figures/charpalette_chargroup.png +share/gnome/help/char-palette/bg/figures/charpick-preferences.png +share/gnome/help/char-palette/bg/figures/charpick_characters.png 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-preferences.png share/gnome/help/char-palette/es/figures/charpick_characters.png +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-preferences.png +share/gnome/help/char-palette/fr/figures/charpick_characters.png 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 @@ -191,23 +229,6 @@ share/gnome/help/char-palette/uk/figures/charpalette_applet.png share/gnome/help/char-palette/uk/figures/charpalette_chargroup.png share/gnome/help/char-palette/uk/figures/charpick-preferences.png share/gnome/help/char-palette/uk/figures/charpick_characters.png -share/gnome/help/command-line/C/command-line.xml -share/gnome/help/command-line/C/figures/command-line.png -share/gnome/help/command-line/C/figures/prefs-macros.png -share/gnome/help/command-line/C/figures/prefs.png -share/gnome/help/command-line/C/legal.xml -share/gnome/help/command-line/es/command-line.xml -share/gnome/help/command-line/es/figures/command-line.png -share/gnome/help/command-line/es/figures/prefs-macros.png -share/gnome/help/command-line/es/figures/prefs.png -share/gnome/help/command-line/pt_BR/command-line.xml -share/gnome/help/command-line/pt_BR/figures/command-line.png -share/gnome/help/command-line/pt_BR/figures/prefs-macros.png -share/gnome/help/command-line/pt_BR/figures/prefs.png -share/gnome/help/command-line/uk/command-line.xml -share/gnome/help/command-line/uk/figures/command-line.png -share/gnome/help/command-line/uk/figures/prefs-macros.png -share/gnome/help/command-line/uk/figures/prefs.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/cpufreq-applet.xml %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-100.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-25.png @@ -229,6 +250,16 @@ share/gnome/help/command-line/uk/figures/prefs.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector-both.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/cpufreq-applet.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-100.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-25.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-50.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-preferences-smp.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-selector-both.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/cpufreq-applet.xml %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-100.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-25.png @@ -252,6 +283,12 @@ share/gnome/help/drivemount/es/figures/drivemount-applet_example.png share/gnome/help/drivemount/es/figures/drivemount-applet_mount.png share/gnome/help/drivemount/es/figures/drivemount-applet_open.png share/gnome/help/drivemount/es/figures/drivemount-applet_status.png +share/gnome/help/drivemount/fr/drivemount.xml +share/gnome/help/drivemount/fr/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/fr/figures/drivemount-applet_example.png +share/gnome/help/drivemount/fr/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/fr/figures/drivemount-applet_open.png +share/gnome/help/drivemount/fr/figures/drivemount-applet_status.png share/gnome/help/drivemount/it/drivemount.xml share/gnome/help/drivemount/it/figures/drivemount-applet_eject.png share/gnome/help/drivemount/it/figures/drivemount-applet_example.png @@ -273,10 +310,16 @@ share/gnome/help/drivemount/uk/figures/drivemount-applet_status.png 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/bg/figures/geyes_applet.png +share/gnome/help/geyes/bg/geyes.xml share/gnome/help/geyes/es/figures/geyes_applet.png share/gnome/help/geyes/es/geyes.xml +share/gnome/help/geyes/fr/figures/geyes_applet.png +share/gnome/help/geyes/fr/geyes.xml share/gnome/help/geyes/it/figures/geyes_applet.png share/gnome/help/geyes/it/geyes.xml +share/gnome/help/geyes/ru/figures/geyes_applet.png +share/gnome/help/geyes/ru/geyes.xml share/gnome/help/geyes/uk/figures/geyes_applet.png share/gnome/help/geyes/uk/geyes.xml share/gnome/help/gswitchit/C/gswitchit.xml @@ -289,6 +332,8 @@ share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml share/gnome/help/gtik2_applet2/C/legal.xml share/gnome/help/gtik2_applet2/es/figures/gtik_applet.png share/gnome/help/gtik2_applet2/es/gtik2_applet2.xml +share/gnome/help/gtik2_applet2/fr/figures/gtik_applet.png +share/gnome/help/gtik2_applet2/fr/gtik2_applet2.xml share/gnome/help/gtik2_applet2/uk/figures/gtik_applet.png share/gnome/help/gtik2_applet2/uk/gtik2_applet2.xml share/gnome/help/gweather/C/figures/gweather-details.png @@ -322,6 +367,36 @@ share/gnome/help/gweather/es/figures/stock_weather-snow.png share/gnome/help/gweather/es/figures/stock_weather-storm.png share/gnome/help/gweather/es/figures/stock_weather-sunny.png share/gnome/help/gweather/es/gweather.xml +share/gnome/help/gweather/fr/figures/gweather-details.png +share/gnome/help/gweather/fr/figures/gweather-menu-prefs.png +share/gnome/help/gweather/fr/figures/gweather-prefs-general.png +share/gnome/help/gweather/fr/figures/gweather-prefs-locations.png +share/gnome/help/gweather/fr/figures/gweather_applet.png +share/gnome/help/gweather/fr/figures/stock_weather-cloudy.png +share/gnome/help/gweather/fr/figures/stock_weather-few-clouds.png +share/gnome/help/gweather/fr/figures/stock_weather-fog.png +share/gnome/help/gweather/fr/figures/stock_weather-night-clear.png +share/gnome/help/gweather/fr/figures/stock_weather-night-few-clouds.png +share/gnome/help/gweather/fr/figures/stock_weather-showers.png +share/gnome/help/gweather/fr/figures/stock_weather-snow.png +share/gnome/help/gweather/fr/figures/stock_weather-storm.png +share/gnome/help/gweather/fr/figures/stock_weather-sunny.png +share/gnome/help/gweather/fr/gweather.xml +share/gnome/help/gweather/nl/figures/gweather-details.png +share/gnome/help/gweather/nl/figures/gweather-menu-prefs.png +share/gnome/help/gweather/nl/figures/gweather-prefs-general.png +share/gnome/help/gweather/nl/figures/gweather-prefs-locations.png +share/gnome/help/gweather/nl/figures/gweather_applet.png +share/gnome/help/gweather/nl/figures/stock_weather-cloudy.png +share/gnome/help/gweather/nl/figures/stock_weather-few-clouds.png +share/gnome/help/gweather/nl/figures/stock_weather-fog.png +share/gnome/help/gweather/nl/figures/stock_weather-night-clear.png +share/gnome/help/gweather/nl/figures/stock_weather-night-few-clouds.png +share/gnome/help/gweather/nl/figures/stock_weather-showers.png +share/gnome/help/gweather/nl/figures/stock_weather-snow.png +share/gnome/help/gweather/nl/figures/stock_weather-storm.png +share/gnome/help/gweather/nl/figures/stock_weather-sunny.png +share/gnome/help/gweather/nl/gweather.xml share/gnome/help/gweather/uk/figures/gweather-details.png share/gnome/help/gweather/uk/figures/gweather-menu-prefs.png share/gnome/help/gweather/uk/figures/gweather-prefs-general.png @@ -342,6 +417,10 @@ share/gnome/help/mixer_applet2/C/legal.xml share/gnome/help/mixer_applet2/C/mixer_applet2.xml share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/es/mixer_applet2.xml +share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png +share/gnome/help/mixer_applet2/fr/mixer_applet2.xml +share/gnome/help/mixer_applet2/it/figures/volumecontrol_applet.png +share/gnome/help/mixer_applet2/it/mixer_applet2.xml share/gnome/help/mixer_applet2/uk/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/uk/mixer_applet2.xml share/gnome/help/multiload/C/figures/multiload-preferences.png @@ -353,6 +432,10 @@ share/gnome/help/multiload/es/figures/multiload-preferences.png share/gnome/help/multiload/es/figures/system-monitor-applet_window.png share/gnome/help/multiload/es/figures/system_monitor.png share/gnome/help/multiload/es/multiload.xml +share/gnome/help/multiload/fr/figures/multiload-preferences.png +share/gnome/help/multiload/fr/figures/system-monitor-applet_window.png +share/gnome/help/multiload/fr/figures/system_monitor.png +share/gnome/help/multiload/fr/multiload.xml share/gnome/help/multiload/uk/figures/multiload-preferences.png share/gnome/help/multiload/uk/figures/system-monitor-applet_window.png share/gnome/help/multiload/uk/figures/system_monitor.png @@ -370,6 +453,12 @@ share/gnome/help/stickynotes_applet/es/figures/stickynotes-note-prefs.png share/gnome/help/stickynotes_applet/es/figures/stickynotes-prefs.png share/gnome/help/stickynotes_applet/es/figures/stickynotes_applet.png share/gnome/help/stickynotes_applet/es/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/fr/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/fr/figures/stickynote-right-menu-new.png +share/gnome/help/stickynotes_applet/fr/figures/stickynotes-note-prefs.png +share/gnome/help/stickynotes_applet/fr/figures/stickynotes-prefs.png +share/gnome/help/stickynotes_applet/fr/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/fr/stickynotes_applet.xml share/gnome/help/stickynotes_applet/uk/figures/stickynote-right-menu-lock.png share/gnome/help/stickynotes_applet/uk/figures/stickynote-right-menu-new.png share/gnome/help/stickynotes_applet/uk/figures/stickynotes-note-prefs.png @@ -385,39 +474,49 @@ share/gnome/help/trashapplet/fr/figures/trash-applet.png share/gnome/help/trashapplet/fr/trashapplet.xml share/gnome/help/trashapplet/it/figures/trash-applet.png share/gnome/help/trashapplet/it/trashapplet.xml +share/gnome/help/trashapplet/nl/figures/trash-applet.png +share/gnome/help/trashapplet/nl/trashapplet.xml share/gnome/help/trashapplet/pa/figures/trash-applet.png share/gnome/help/trashapplet/pa/trashapplet.xml +share/gnome/help/trashapplet/ru/figures/trash-applet.png +share/gnome/help/trashapplet/ru/trashapplet.xml share/gnome/help/trashapplet/uk/figures/trash-applet.png share/gnome/help/trashapplet/uk/trashapplet.xml share/gnome/omf/accessx-status/accessx-status-C.omf +share/gnome/omf/accessx-status/accessx-status-bg.omf share/gnome/omf/accessx-status/accessx-status-es.omf share/gnome/omf/accessx-status/accessx-status-fr.omf share/gnome/omf/accessx-status/accessx-status-it.omf share/gnome/omf/accessx-status/accessx-status-uk.omf %%BATTERY%%share/gnome/omf/battstat/battstat-C.omf +%%BATTERY%%share/gnome/omf/battstat/battstat-bg.omf %%BATTERY%%share/gnome/omf/battstat/battstat-es.omf +%%BATTERY%%share/gnome/omf/battstat/battstat-fr.omf %%BATTERY%%share/gnome/omf/battstat/battstat-uk.omf share/gnome/omf/char-palette/char-palette-C.omf +share/gnome/omf/char-palette/char-palette-bg.omf share/gnome/omf/char-palette/char-palette-es.omf +share/gnome/omf/char-palette/char-palette-fr.omf share/gnome/omf/char-palette/char-palette-it.omf share/gnome/omf/char-palette/char-palette-nl.omf share/gnome/omf/char-palette/char-palette-pt_BR.omf share/gnome/omf/char-palette/char-palette-uk.omf -share/gnome/omf/command-line/command-line-C.omf -share/gnome/omf/command-line/command-line-es.omf -share/gnome/omf/command-line/command-line-pt_BR.omf -share/gnome/omf/command-line/command-line-uk.omf %%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-C.omf %%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-es.omf +%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-nl.omf %%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-uk.omf share/gnome/omf/drivemount/drivemount-C.omf share/gnome/omf/drivemount/drivemount-es.omf +share/gnome/omf/drivemount/drivemount-fr.omf share/gnome/omf/drivemount/drivemount-it.omf share/gnome/omf/drivemount/drivemount-pa.omf share/gnome/omf/drivemount/drivemount-uk.omf share/gnome/omf/geyes/geyes-C.omf +share/gnome/omf/geyes/geyes-bg.omf share/gnome/omf/geyes/geyes-es.omf +share/gnome/omf/geyes/geyes-fr.omf share/gnome/omf/geyes/geyes-it.omf +share/gnome/omf/geyes/geyes-ru.omf share/gnome/omf/geyes/geyes-uk.omf share/gnome/omf/gswitchit/gswitchit-C.omf share/gnome/omf/gswitchit/gswitchit-es.omf @@ -425,24 +524,33 @@ share/gnome/omf/gswitchit/gswitchit-fr.omf share/gnome/omf/gswitchit/gswitchit-uk.omf share/gnome/omf/gtik2_applet2/gtik2_applet2-C.omf share/gnome/omf/gtik2_applet2/gtik2_applet2-es.omf +share/gnome/omf/gtik2_applet2/gtik2_applet2-fr.omf share/gnome/omf/gtik2_applet2/gtik2_applet2-uk.omf share/gnome/omf/gweather/gweather-C.omf share/gnome/omf/gweather/gweather-es.omf +share/gnome/omf/gweather/gweather-fr.omf +share/gnome/omf/gweather/gweather-nl.omf share/gnome/omf/gweather/gweather-uk.omf share/gnome/omf/mixer_applet2/mixer_applet2-C.omf share/gnome/omf/mixer_applet2/mixer_applet2-es.omf +share/gnome/omf/mixer_applet2/mixer_applet2-fr.omf +share/gnome/omf/mixer_applet2/mixer_applet2-it.omf share/gnome/omf/mixer_applet2/mixer_applet2-uk.omf share/gnome/omf/multiload/multiload-C.omf share/gnome/omf/multiload/multiload-es.omf +share/gnome/omf/multiload/multiload-fr.omf share/gnome/omf/multiload/multiload-uk.omf share/gnome/omf/stickynotes_applet/stickynotes_applet-C.omf share/gnome/omf/stickynotes_applet/stickynotes_applet-es.omf +share/gnome/omf/stickynotes_applet/stickynotes_applet-fr.omf share/gnome/omf/stickynotes_applet/stickynotes_applet-uk.omf share/gnome/omf/trashapplet/trashapplet-C.omf share/gnome/omf/trashapplet/trashapplet-es.omf share/gnome/omf/trashapplet/trashapplet-fr.omf share/gnome/omf/trashapplet/trashapplet-it.omf +share/gnome/omf/trashapplet/trashapplet-nl.omf share/gnome/omf/trashapplet/trashapplet-pa.omf +share/gnome/omf/trashapplet/trashapplet-ru.omf share/gnome/omf/trashapplet/trashapplet-uk.omf share/gnome/pixmaps/accessx-status-applet/ax-applet.png share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png @@ -583,7 +691,6 @@ share/icons/hicolor/48x48/apps/ax-applet.png share/icons/hicolor/48x48/apps/charpick.png share/icons/hicolor/48x48/apps/gnome-cpu.png share/icons/hicolor/48x48/apps/gnome-eyes.png -share/icons/hicolor/48x48/apps/gnome-mini-commander.png share/icons/hicolor/48x48/apps/gnome-modem.png share/icons/hicolor/48x48/apps/gnome-money.png share/icons/hicolor/48x48/apps/gswitchit-applet.png @@ -600,6 +707,7 @@ 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/dz/LC_MESSAGES/gnome-applets-2.0.mo share/locale/el/LC_MESSAGES/gnome-applets-2.0.mo share/locale/en_CA/LC_MESSAGES/gnome-applets-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-applets-2.0.mo @@ -621,7 +729,10 @@ share/locale/id/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/ka/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/ku/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/ky/LC_MESSAGES/gnome-applets-2.0.mo share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo share/locale/mk/LC_MESSAGES/gnome-applets-2.0.mo @@ -655,19 +766,28 @@ share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo share/locale/xh/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/zh_HK/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo -@unexec /bin/rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/xh 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/te/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/te 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/rw 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/48x48 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons 2>/dev/null || /usr/bin/true +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons @dirrm share/gnome/pixmaps/stickynotes %%CPUFREQ%%@dirrm share/gnome/pixmaps/cpufreq-applet @dirrm share/gnome/pixmaps/accessx-status-applet @@ -681,18 +801,21 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/omf/geyes @dirrm share/gnome/omf/drivemount %%CPUFREQ%%@dirrm share/gnome/omf/cpufreq-applet -@dirrm share/gnome/omf/command-line @dirrm share/gnome/omf/char-palette %%BATTERY%%@dirrm share/gnome/omf/battstat @dirrm share/gnome/omf/accessx-status @dirrm share/gnome/help/trashapplet/uk/figures @dirrm share/gnome/help/trashapplet/uk +@dirrm share/gnome/help/trashapplet/ru/figures +@dirrm share/gnome/help/trashapplet/ru @dirrm share/gnome/help/trashapplet/pa/figures @dirrm share/gnome/help/trashapplet/pa -@dirrm share/gnome/help/trashapplet/fr/figures -@dirrm share/gnome/help/trashapplet/fr +@dirrm share/gnome/help/trashapplet/nl/figures +@dirrm share/gnome/help/trashapplet/nl @dirrm share/gnome/help/trashapplet/it/figures @dirrm share/gnome/help/trashapplet/it +@dirrm share/gnome/help/trashapplet/fr/figures +@dirrm share/gnome/help/trashapplet/fr @dirrm share/gnome/help/trashapplet/es/figures @dirrm share/gnome/help/trashapplet/es @dirrm share/gnome/help/trashapplet/C/figures @@ -700,6 +823,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/trashapplet @dirrm share/gnome/help/stickynotes_applet/uk/figures @dirrm share/gnome/help/stickynotes_applet/uk +@dirrm share/gnome/help/stickynotes_applet/fr/figures +@dirrm share/gnome/help/stickynotes_applet/fr @dirrm share/gnome/help/stickynotes_applet/es/figures @dirrm share/gnome/help/stickynotes_applet/es @dirrm share/gnome/help/stickynotes_applet/C/figures @@ -707,6 +832,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/stickynotes_applet @dirrm share/gnome/help/multiload/uk/figures @dirrm share/gnome/help/multiload/uk +@dirrm share/gnome/help/multiload/fr/figures +@dirrm share/gnome/help/multiload/fr @dirrm share/gnome/help/multiload/es/figures @dirrm share/gnome/help/multiload/es @dirrm share/gnome/help/multiload/C/figures @@ -714,6 +841,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/multiload @dirrm share/gnome/help/mixer_applet2/uk/figures @dirrm share/gnome/help/mixer_applet2/uk +@dirrm share/gnome/help/mixer_applet2/it/figures +@dirrm share/gnome/help/mixer_applet2/it +@dirrm share/gnome/help/mixer_applet2/fr/figures +@dirrm share/gnome/help/mixer_applet2/fr @dirrm share/gnome/help/mixer_applet2/es/figures @dirrm share/gnome/help/mixer_applet2/es @dirrm share/gnome/help/mixer_applet2/C/figures @@ -721,6 +852,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/mixer_applet2 @dirrm share/gnome/help/gweather/uk/figures @dirrm share/gnome/help/gweather/uk +@dirrm share/gnome/help/gweather/nl/figures +@dirrm share/gnome/help/gweather/nl +@dirrm share/gnome/help/gweather/fr/figures +@dirrm share/gnome/help/gweather/fr @dirrm share/gnome/help/gweather/es/figures @dirrm share/gnome/help/gweather/es @dirrm share/gnome/help/gweather/C/figures @@ -728,6 +863,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/gweather @dirrm share/gnome/help/gtik2_applet2/uk/figures @dirrm share/gnome/help/gtik2_applet2/uk +@dirrm share/gnome/help/gtik2_applet2/fr/figures +@dirrm share/gnome/help/gtik2_applet2/fr @dirrm share/gnome/help/gtik2_applet2/es/figures @dirrm share/gnome/help/gtik2_applet2/es @dirrm share/gnome/help/gtik2_applet2/C/figures @@ -740,10 +877,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/gswitchit @dirrm share/gnome/help/geyes/uk/figures @dirrm share/gnome/help/geyes/uk +@dirrm share/gnome/help/geyes/ru/figures +@dirrm share/gnome/help/geyes/ru @dirrm share/gnome/help/geyes/it/figures @dirrm share/gnome/help/geyes/it +@dirrm share/gnome/help/geyes/fr/figures +@dirrm share/gnome/help/geyes/fr @dirrm share/gnome/help/geyes/es/figures @dirrm share/gnome/help/geyes/es +@dirrm share/gnome/help/geyes/bg/figures +@dirrm share/gnome/help/geyes/bg @dirrm share/gnome/help/geyes/C/figures @dirrm share/gnome/help/geyes/C @dirrm share/gnome/help/geyes @@ -753,6 +896,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/drivemount/pa @dirrm share/gnome/help/drivemount/it/figures @dirrm share/gnome/help/drivemount/it +@dirrm share/gnome/help/drivemount/fr/figures +@dirrm share/gnome/help/drivemount/fr @dirrm share/gnome/help/drivemount/es/figures @dirrm share/gnome/help/drivemount/es @dirrm share/gnome/help/drivemount/C/figures @@ -760,20 +905,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/drivemount %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet -@dirrm share/gnome/help/command-line/uk/figures -@dirrm share/gnome/help/command-line/uk -@dirrm share/gnome/help/command-line/pt_BR/figures -@dirrm share/gnome/help/command-line/pt_BR -@dirrm share/gnome/help/command-line/es/figures -@dirrm share/gnome/help/command-line/es -@dirrm share/gnome/help/command-line/C/figures -@dirrm share/gnome/help/command-line/C -@dirrm share/gnome/help/command-line @dirrm share/gnome/help/char-palette/uk/figures @dirrm share/gnome/help/char-palette/uk @dirrm share/gnome/help/char-palette/pt_BR/figures @@ -782,15 +920,23 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/char-palette/nl @dirrm share/gnome/help/char-palette/it/figures @dirrm share/gnome/help/char-palette/it +@dirrm share/gnome/help/char-palette/fr/figures +@dirrm share/gnome/help/char-palette/fr @dirrm share/gnome/help/char-palette/es/figures @dirrm share/gnome/help/char-palette/es +@dirrm share/gnome/help/char-palette/bg/figures +@dirrm share/gnome/help/char-palette/bg @dirrm share/gnome/help/char-palette/C/figures @dirrm share/gnome/help/char-palette/C @dirrm share/gnome/help/char-palette %%BATTERY%%@dirrm share/gnome/help/battstat/uk/figures %%BATTERY%%@dirrm share/gnome/help/battstat/uk +%%BATTERY%%@dirrm share/gnome/help/battstat/fr/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/fr %%BATTERY%%@dirrm share/gnome/help/battstat/es/figures %%BATTERY%%@dirrm share/gnome/help/battstat/es +%%BATTERY%%@dirrm share/gnome/help/battstat/bg/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/bg %%BATTERY%%@dirrm share/gnome/help/battstat/C/figures %%BATTERY%%@dirrm share/gnome/help/battstat/C %%BATTERY%%@dirrm share/gnome/help/battstat @@ -802,6 +948,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/accessx-status/fr @dirrm share/gnome/help/accessx-status/es/figures @dirrm share/gnome/help/accessx-status/es +@dirrm share/gnome/help/accessx-status/bg/figures +@dirrm share/gnome/help/accessx-status/bg @dirrm share/gnome/help/accessx-status/C/figures @dirrm share/gnome/help/accessx-status/C @dirrm share/gnome/help/accessx-status @@ -814,5 +962,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/gnome-applets/geyes/Bizarre @dirrm share/gnome/gnome-applets/geyes @dirrm share/gnome/gnome-applets -@dirrm libexec/gnome-applets +@dirrm include/libgweather @dirrm include/libgswitchit diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index cc11fda744cc..f35b0147eb41 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -3,15 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnomedesktop/Makefile,v 1.74 2005/10/03 15:18:36 ahze Exp $ +# $MCom: ports/x11/gnomedesktop/Makefile,v 1.90 2006/04/13 07:52:40 bland Exp $ # PORTNAME= gnomedesktop -PORTVERSION= 2.12.3 -PORTREVISION= 1 +PORTVERSION= 2.14.1.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-desktop/2.12 +MASTER_SITE_SUBDIR= sources/gnome-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= gnome-desktop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,15 +20,15 @@ COMMENT= Additional UI API for GNOME 2 USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes -USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils \ ltverhack GNOME_DESKTOP_VERSION=2 +USE_GETTEXT= yes USE_GMAKE= yes USE_BISON= yes INSTALLS_OMF= yes INSTALLS_SHLIB= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" \ --with-kde-datadir=${LOCALBASE}/share CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo index cf73ed69cd6d..f6ae5c885bda 100644 --- a/x11/gnome-desktop/distinfo +++ b/x11/gnome-desktop/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-desktop-2.12.3.tar.bz2) = 387efe89249c61e512812568047be654 -SHA256 (gnome2/gnome-desktop-2.12.3.tar.bz2) = 9224155eff36fc4a3e0995adf61407c4cdf023c9efda80c6f857fbfbe27184b9 -SIZE (gnome2/gnome-desktop-2.12.3.tar.bz2) = 1036062 +MD5 (gnome2/gnome-desktop-2.14.1.1.tar.bz2) = f3ffb360681c1dc17d1856f19a59e88f +SHA256 (gnome2/gnome-desktop-2.14.1.1.tar.bz2) = 82c9de6ca3507dceb347deda069faf3dd22a412d3bf8944618fbb57656815244 +SIZE (gnome2/gnome-desktop-2.14.1.1.tar.bz2) = 1173965 diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist index ca229e89c004..fd92d45b9628 100644 --- a/x11/gnome-desktop/pkg-plist +++ b/x11/gnome-desktop/pkg-plist @@ -7,6 +7,20 @@ lib/libgnome-desktop-2.la lib/libgnome-desktop-2.so lib/libgnome-desktop-2.so.2 libdata/pkgconfig/gnome-desktop-2.0.pc +share/doc/gnome-desktop/GnomeDItemEdit.html +share/doc/gnome-desktop/GnomeHint.html +share/doc/gnome-desktop/ch01.html +share/doc/gnome-desktop/gnome-desktop-GnomeDesktopItem.html +share/doc/gnome-desktop/gnome-desktop.devhelp +share/doc/gnome-desktop/gnome-desktop.devhelp2 +share/doc/gnome-desktop/home.png +share/doc/gnome-desktop/index.html +share/doc/gnome-desktop/index.sgml +share/doc/gnome-desktop/intro.html +share/doc/gnome-desktop/left.png +share/doc/gnome-desktop/right.png +share/doc/gnome-desktop/style.css +share/doc/gnome-desktop/up.png share/gnome/applications/gnome-about.desktop share/gnome/gnome-about/gnome-64.png share/gnome/gnome-about/gnome-version.xml @@ -21,26 +35,44 @@ 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/fdl/es/fdl.xml +share/gnome/help/fdl/fr/fdl.xml +share/gnome/help/fdl/uk/fdl.xml share/gnome/help/gnome-feedback/C/gnome-feedback.xml share/gnome/help/gnome-feedback/es/gnome-feedback.xml +share/gnome/help/gnome-feedback/fr/gnome-feedback.xml +share/gnome/help/gnome-feedback/it/gnome-feedback.xml +share/gnome/help/gnome-feedback/uk/gnome-feedback.xml share/gnome/help/gpl/C/gpl.xml share/gnome/help/gpl/es/gpl.xml share/gnome/help/gpl/fi/gpl.xml +share/gnome/help/gpl/fr/gpl.xml share/gnome/help/gpl/pa/gpl.xml +share/gnome/help/gpl/uk/gpl.xml share/gnome/help/lgpl/C/lgpl.xml share/gnome/help/lgpl/es/lgpl.xml +share/gnome/help/lgpl/fr/lgpl.xml share/gnome/help/lgpl/pa/lgpl.xml +share/gnome/help/lgpl/uk/lgpl.xml share/gnome/omf/fdl/fdl-C.omf share/gnome/omf/fdl/fdl-es.omf +share/gnome/omf/fdl/fdl-fr.omf +share/gnome/omf/fdl/fdl-uk.omf share/gnome/omf/gnome-feedback/gnome-feedback-C.omf share/gnome/omf/gnome-feedback/gnome-feedback-es.omf +share/gnome/omf/gnome-feedback/gnome-feedback-fr.omf +share/gnome/omf/gnome-feedback/gnome-feedback-it.omf +share/gnome/omf/gnome-feedback/gnome-feedback-uk.omf share/gnome/omf/gpl/gpl-C.omf share/gnome/omf/gpl/gpl-es.omf share/gnome/omf/gpl/gpl-fi.omf +share/gnome/omf/gpl/gpl-fr.omf share/gnome/omf/gpl/gpl-pa.omf +share/gnome/omf/gpl/gpl-uk.omf share/gnome/omf/lgpl/lgpl-C.omf share/gnome/omf/lgpl/lgpl-es.omf +share/gnome/omf/lgpl/lgpl-fr.omf share/gnome/omf/lgpl/lgpl-pa.omf +share/gnome/omf/lgpl/lgpl-uk.omf share/gnome/pixmaps/apple-green.png share/gnome/pixmaps/apple-red.png share/gnome/pixmaps/gnome-aorta.png @@ -128,6 +160,7 @@ 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/dz/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/el/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/en_CA/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-desktop-2.0.mo @@ -150,9 +183,11 @@ share/locale/id/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/is/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/ka/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/ku/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/ky/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo @@ -200,24 +235,38 @@ share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo @dirrmtry share/locale/yo @dirrmtry share/locale/ug/LC_MESSAGES @dirrmtry share/locale/ug +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz @dirrm share/gnome/omf/lgpl @dirrm share/gnome/omf/gpl @dirrm share/gnome/omf/gnome-feedback @dirrm share/gnome/omf/fdl +@dirrm share/gnome/help/lgpl/uk @dirrm share/gnome/help/lgpl/pa +@dirrm share/gnome/help/lgpl/fr @dirrm share/gnome/help/lgpl/es +@dirrm share/gnome/help/gpl/uk @dirrm share/gnome/help/gpl/pa +@dirrm share/gnome/help/gpl/fr @dirrm share/gnome/help/gpl/fi @dirrm share/gnome/help/gpl/es -@dirrm share/gnome/help/fdl/es +@dirrm share/gnome/help/gnome-feedback/uk +@dirrm share/gnome/help/gnome-feedback/it +@dirrm share/gnome/help/gnome-feedback/fr @dirrm share/gnome/help/gnome-feedback/es @dirrm share/gnome/help/gnome-feedback/C @dirrm share/gnome/help/gnome-feedback +@dirrm share/gnome/help/fdl/uk +@dirrm share/gnome/help/fdl/fr +@dirrm share/gnome/help/fdl/es @dirrm share/gnome/gnome-about/headers +@dirrm share/doc/gnome-desktop @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-menus/Makefile b/x11/gnome-menus/Makefile index 2b04a083b71a..0b3b692e9fce 100644 --- a/x11/gnome-menus/Makefile +++ b/x11/gnome-menus/Makefile @@ -3,31 +3,36 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-menus/Makefile,v 1.21 2005/09/08 18:04:51 marcus Exp $ +# $MCom: ports/x11/gnome-menus/Makefile,v 1.29 2006/04/13 13:04:49 ahze Exp $ # PORTNAME= gnome-menus -PORTVERSION= 2.12.0 -PORTREVISION= 2 +PORTVERSION= 2.14.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Implementation of the FreeDesktop Desktop Menu Spec +USE_GETTEXT= yes USE_BZIP2= yes USE_X_PREFIX= yes -USE_REINPLACE= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomevfs2 ltverhack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:15 USE_PYTHON= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +.include <bsd.port.pre.mk> + +.if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM) +USE_FAM= yes +.endif + post-patch: @${REINPLACE_CMD} -e 's|/usr/share/gnome|${X11BASE}/share/gnome|g' \ ${WRKSRC}/layout/applications.menu \ @@ -41,4 +46,4 @@ post-install: @${MKDIR} ${PREFIX}/share/gnome/desktop-directories @${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/desktop-directories -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo index 7a00a1d9cb81..49becc359005 100644 --- a/x11/gnome-menus/distinfo +++ b/x11/gnome-menus/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-menus-2.12.0.tar.bz2) = 615392c4f729f70c03aa3aa7dbe40a95 -SHA256 (gnome2/gnome-menus-2.12.0.tar.bz2) = f77192ca0b909000f675ad3cd520c313431ee117d554102c7ea486f76f396f6b -SIZE (gnome2/gnome-menus-2.12.0.tar.bz2) = 393280 +MD5 (gnome2/gnome-menus-2.14.0.tar.bz2) = 7aa0c08fc8b9caabb4be46e1cfb595fc +SHA256 (gnome2/gnome-menus-2.14.0.tar.bz2) = 07985a597e825cab86e3b0a46d6bdc89f2545dd57ee4cf5ea781ab4f37cd60a3 +SIZE (gnome2/gnome-menus-2.14.0.tar.bz2) = 408473 diff --git a/x11/gnome-menus/files/patch-Makefile.in b/x11/gnome-menus/files/patch-Makefile.in index 510f1140fb48..995bf4c2e5e8 100644 --- a/x11/gnome-menus/files/patch-Makefile.in +++ b/x11/gnome-menus/files/patch-Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.orig Thu Sep 8 13:59:53 2005 -+++ Makefile.in Thu Sep 8 14:00:08 2005 +--- Makefile.in.orig Thu Apr 13 08:59:30 2006 ++++ Makefile.in Thu Apr 13 08:59:38 2006 @@ -205,7 +205,7 @@ target_alias = @target_alias@ NULL = diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist index 81576978b409..b5a4b5e1700a 100644 --- a/x11/gnome-menus/pkg-plist +++ b/x11/gnome-menus/pkg-plist @@ -31,11 +31,14 @@ share/gnome/desktop-directories/System-Settings.directory share/gnome/desktop-directories/System-Tools.directory share/locale/ar/LC_MESSAGES/gnome-menus.mo share/locale/bg/LC_MESSAGES/gnome-menus.mo +share/locale/bn/LC_MESSAGES/gnome-menus.mo +share/locale/br/LC_MESSAGES/gnome-menus.mo share/locale/ca/LC_MESSAGES/gnome-menus.mo share/locale/cs/LC_MESSAGES/gnome-menus.mo share/locale/cy/LC_MESSAGES/gnome-menus.mo share/locale/da/LC_MESSAGES/gnome-menus.mo share/locale/de/LC_MESSAGES/gnome-menus.mo +share/locale/dz/LC_MESSAGES/gnome-menus.mo share/locale/el/LC_MESSAGES/gnome-menus.mo share/locale/en_CA/LC_MESSAGES/gnome-menus.mo share/locale/en_GB/LC_MESSAGES/gnome-menus.mo @@ -54,8 +57,13 @@ share/locale/hy/LC_MESSAGES/gnome-menus.mo share/locale/id/LC_MESSAGES/gnome-menus.mo share/locale/it/LC_MESSAGES/gnome-menus.mo share/locale/ja/LC_MESSAGES/gnome-menus.mo +share/locale/ka/LC_MESSAGES/gnome-menus.mo share/locale/ko/LC_MESSAGES/gnome-menus.mo +share/locale/ku/LC_MESSAGES/gnome-menus.mo +share/locale/ky/LC_MESSAGES/gnome-menus.mo share/locale/lt/LC_MESSAGES/gnome-menus.mo +share/locale/lv/LC_MESSAGES/gnome-menus.mo +share/locale/mg/LC_MESSAGES/gnome-menus.mo share/locale/mk/LC_MESSAGES/gnome-menus.mo share/locale/mr/LC_MESSAGES/gnome-menus.mo share/locale/ms/LC_MESSAGES/gnome-menus.mo @@ -76,21 +84,38 @@ share/locale/sq/LC_MESSAGES/gnome-menus.mo share/locale/sr/LC_MESSAGES/gnome-menus.mo share/locale/sr@Latn/LC_MESSAGES/gnome-menus.mo share/locale/sv/LC_MESSAGES/gnome-menus.mo +share/locale/te/LC_MESSAGES/gnome-menus.mo share/locale/th/LC_MESSAGES/gnome-menus.mo share/locale/tr/LC_MESSAGES/gnome-menus.mo +share/locale/ug/LC_MESSAGES/gnome-menus.mo share/locale/uk/LC_MESSAGES/gnome-menus.mo share/locale/vi/LC_MESSAGES/gnome-menus.mo share/locale/xh/LC_MESSAGES/gnome-menus.mo share/locale/zh_CN/LC_MESSAGES/gnome-menus.mo +share/locale/zh_HK/LC_MESSAGES/gnome-menus.mo share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/mg/LC_MESSAGES +@dirrmtry share/locale/mg +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/br/LC_MESSAGES +@dirrmtry share/locale/br @dirrm share/gnome/desktop-directories @dirrm include/gnome-menus @dirrm etc/xdg/menus diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 3771e92fc1d9..06d7aebc679d 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -3,15 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnomepanel/Makefile,v 1.109 2005/10/08 19:41:40 marcus Exp $ +# $MCom: ports/x11/gnomepanel/Makefile,v 1.128 2006/04/13 07:52:40 bland Exp $ # PORTNAME= gnomepanel -PORTVERSION= 2.12.3 -PORTREVISION= 1 +PORTVERSION= 2.14.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-panel/2.12 +MASTER_SITE_SUBDIR= sources/gnome-panel/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= gnome-panel-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,18 +19,18 @@ COMMENT= Panel component for the GNOME 2 Desktop RUN_DEPENDS= gnome-menu-editor:${PORTSDIR}/deskutils/gnome-menu-editor +USE_GETTEXT= yes USE_BZIP2= yes INSTALLS_OMF= yes INSTALLS_SHLIB= yes INSTALLS_ICONS= yes USE_X_PREFIX= yes -USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \ libwnck gnomemenus gnomedocutils ltverhack WANT_GNOME= yes GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share \ --with-kde-docdir=${LOCALBASE}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -59,8 +58,6 @@ CONFIGURE_ARGS+=--disable-eds .endif post-patch: - @${REINPLACE_CMD} -e 's|evolution.desktop|evolution-2.4.desktop|g' \ - ${WRKSRC}/gnome-panel/panel-default-setup.entries.in .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \ ( ${OSVERSION} < 503101 ) .for po in da.po it.po zh_CN.po zh_TW.po diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index d40395919ba0..b8fcfffc8c2b 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-panel-2.12.3.tar.bz2) = 50a27090f7c667536e4bb5b077428853 -SHA256 (gnome2/gnome-panel-2.12.3.tar.bz2) = a819b55a9616954edb4f69587be570e1d9fc1516c7c63b4f7e67d0b7a3994902 -SIZE (gnome2/gnome-panel-2.12.3.tar.bz2) = 2464381 +MD5 (gnome2/gnome-panel-2.14.1.tar.bz2) = 1f5bc59c7c49cf90a797d892ab3ea05f +SHA256 (gnome2/gnome-panel-2.14.1.tar.bz2) = f7019f6f42ed323edcc5dc865638d7cb65e8c35a1403f67788a58cc8b3f5944e +SIZE (gnome2/gnome-panel-2.14.1.tar.bz2) = 2539786 diff --git a/x11/gnome-panel/files/patch-applets_clock_clock.c b/x11/gnome-panel/files/patch-applets_clock_clock.c index ccf5378b135f..981e4b4f2022 100644 --- a/x11/gnome-panel/files/patch-applets_clock_clock.c +++ b/x11/gnome-panel/files/patch-applets_clock_clock.c @@ -1,5 +1,5 @@ ---- applets/clock/clock.c.orig Tue Jan 13 11:55:58 2004 -+++ applets/clock/clock.c Wed Jan 14 15:43:39 2004 +--- applets/clock/clock.c.orig Mon Oct 24 02:25:11 2005 ++++ applets/clock/clock.c Tue Nov 22 02:47:05 2005 @@ -47,7 +47,9 @@ #include <dirent.h> #include <string.h> @@ -10,7 +10,7 @@ #include <panel-applet.h> #include <panel-applet-gconf.h> -@@ -539,7 +541,11 @@ +@@ -545,7 +547,11 @@ clock_locale_format (void) { const char *am; diff --git a/x11/gnome-panel/files/patch-gnome-panel_egg-recent-model.c b/x11/gnome-panel/files/patch-gnome-panel_egg-recent-model.c deleted file mode 100644 index c74812db8450..000000000000 --- a/x11/gnome-panel/files/patch-gnome-panel_egg-recent-model.c +++ /dev/null @@ -1,20 +0,0 @@ ---- gnome-panel/egg-recent-model.c.orig Wed Dec 21 16:58:46 2005 -+++ gnome-panel/egg-recent-model.c Wed Dec 21 16:59:03 2005 -@@ -942,7 +942,7 @@ - static gboolean - egg_recent_model_lock_file (FILE *file) - { --#ifdef F_TLOCK -+#ifdef HAVE_LOCKF - int fd; - gint try = 5; - -@@ -980,7 +980,7 @@ - static gboolean - egg_recent_model_unlock_file (FILE *file) - { --#ifdef F_TLOCK -+#ifdef HAVE_LOCKF - int fd; - - rewind (file); diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist index c7b9f1bfac1e..855d2c4a37a7 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -98,10 +98,6 @@ share/gnome/help/fish-applet-2/de/figures/fish_applet.png share/gnome/help/fish-applet-2/de/figures/fish_settings.png share/gnome/help/fish-applet-2/de/fish-applet-2.xml share/gnome/help/fish-applet-2/de/legal.xml -share/gnome/help/fish-applet-2/fr/figures/fish_applet.png -share/gnome/help/fish-applet-2/fr/figures/fish_settings.png -share/gnome/help/fish-applet-2/fr/fish-applet-2.xml -share/gnome/help/fish-applet-2/fr/legal.xml share/gnome/help/fish-applet-2/ja/figures/fish_applet.png share/gnome/help/fish-applet-2/ja/fish-applet-2.xml share/gnome/help/fish-applet-2/ja/legal.xml @@ -127,6 +123,9 @@ share/gnome/help/fish/C/legal.xml share/gnome/help/fish/es/figures/fish_applet.png share/gnome/help/fish/es/fish.xml share/gnome/help/fish/es/legal.xml +share/gnome/help/fish/fr/figures/fish_applet.png +share/gnome/help/fish/fr/fish.xml +share/gnome/help/fish/fr/legal.xml share/gnome/help/fish/it/figures/fish_applet.png share/gnome/help/fish/it/fish.xml share/gnome/help/fish/it/legal.xml @@ -147,7 +146,6 @@ share/gnome/help/window-list/es/figures/window_list_group_applet.png share/gnome/help/window-list/es/legal.xml share/gnome/help/window-list/es/window-list.xml share/gnome/help/window-list/fr/figures/window_list_applet.png -share/gnome/help/window-list/fr/figures/window_list_group.png share/gnome/help/window-list/fr/figures/window_list_group_applet.png share/gnome/help/window-list/fr/legal.xml share/gnome/help/window-list/fr/window-list.xml @@ -194,7 +192,6 @@ share/gnome/help/workspace-switcher/es/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/es/legal.xml share/gnome/help/workspace-switcher/es/workspace-switcher.xml share/gnome/help/workspace-switcher/fr/figures/workspace_switcher_applet.png -share/gnome/help/workspace-switcher/fr/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/fr/legal.xml share/gnome/help/workspace-switcher/fr/workspace-switcher.xml share/gnome/help/workspace-switcher/it/figures/workspace_switcher_applet.png @@ -229,8 +226,8 @@ share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl share/gnome/omf/clock/clock-C.omf share/gnome/omf/clock/clock-de.omf share/gnome/omf/clock/clock-es.omf -share/gnome/omf/clock/clock-it.omf share/gnome/omf/clock/clock-fr.omf +share/gnome/omf/clock/clock-it.omf share/gnome/omf/clock/clock-ja.omf share/gnome/omf/clock/clock-ko.omf share/gnome/omf/clock/clock-nl.omf @@ -242,31 +239,22 @@ share/gnome/omf/clock/clock-zh_CN.omf share/gnome/omf/clock/clock-zh_TW.omf share/gnome/omf/fish/fish-C.omf share/gnome/omf/fish/fish-es.omf +share/gnome/omf/fish/fish-fr.omf share/gnome/omf/fish/fish-it.omf share/gnome/omf/fish/fish-uk.omf -share/gnome/omf/gnome-panel/clock-de.omf -share/gnome/omf/gnome-panel/clock-fr.omf -share/gnome/omf/gnome-panel/clock-ja.omf -share/gnome/omf/gnome-panel/clock-ko.omf -share/gnome/omf/gnome-panel/clock-sv.omf -share/gnome/omf/gnome-panel/clock-zh_CN.omf -share/gnome/omf/gnome-panel/clock-zh_TW.omf share/gnome/omf/gnome-panel/fish-applet-2-de.omf -share/gnome/omf/gnome-panel/fish-applet-2-fr.omf share/gnome/omf/gnome-panel/fish-applet-2-ja.omf share/gnome/omf/gnome-panel/fish-applet-2-ko.omf share/gnome/omf/gnome-panel/fish-applet-2-sv.omf share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf share/gnome/omf/gnome-panel/window-list-de.omf -share/gnome/omf/gnome-panel/window-list-fr.omf share/gnome/omf/gnome-panel/window-list-ja.omf share/gnome/omf/gnome-panel/window-list-ko.omf share/gnome/omf/gnome-panel/window-list-sv.omf share/gnome/omf/gnome-panel/window-list-zh_CN.omf share/gnome/omf/gnome-panel/window-list-zh_TW.omf share/gnome/omf/gnome-panel/workspace-switcher-de.omf -share/gnome/omf/gnome-panel/workspace-switcher-fr.omf share/gnome/omf/gnome-panel/workspace-switcher-ja.omf share/gnome/omf/gnome-panel/workspace-switcher-ko.omf share/gnome/omf/gnome-panel/workspace-switcher-sv.omf @@ -274,10 +262,12 @@ share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf share/gnome/omf/window-list/window-list-C.omf share/gnome/omf/window-list/window-list-es.omf +share/gnome/omf/window-list/window-list-fr.omf share/gnome/omf/window-list/window-list-it.omf share/gnome/omf/window-list/window-list-uk.omf share/gnome/omf/workspace-switcher/workspace-switcher-C.omf share/gnome/omf/workspace-switcher/workspace-switcher-es.omf +share/gnome/omf/workspace-switcher/workspace-switcher-fr.omf share/gnome/omf/workspace-switcher/workspace-switcher-it.omf share/gnome/omf/workspace-switcher/workspace-switcher-nl.omf share/gnome/omf/workspace-switcher/workspace-switcher-uk.omf @@ -297,6 +287,7 @@ share/icons/hicolor/48x48/apps/gnome-fish.png share/icons/hicolor/48x48/apps/gnome-gegl.png share/icons/hicolor/48x48/apps/gnome-main-menu.png share/icons/hicolor/48x48/apps/panel-force-quit.png +share/icons/hicolor/48x48/apps/panel-separator.png share/locale/af/LC_MESSAGES/gnome-panel-2.0.mo share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo @@ -305,11 +296,13 @@ share/locale/be/LC_MESSAGES/gnome-panel-2.0.mo share/locale/bg/LC_MESSAGES/gnome-panel-2.0.mo share/locale/bn/LC_MESSAGES/gnome-panel-2.0.mo share/locale/bs/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/br/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ca/LC_MESSAGES/gnome-panel-2.0.mo share/locale/cs/LC_MESSAGES/gnome-panel-2.0.mo share/locale/cy/LC_MESSAGES/gnome-panel-2.0.mo share/locale/da/LC_MESSAGES/gnome-panel-2.0.mo share/locale/de/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/dz/LC_MESSAGES/gnome-panel-2.0.mo share/locale/el/LC_MESSAGES/gnome-panel-2.0.mo share/locale/en_CA/LC_MESSAGES/gnome-panel-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-panel-2.0.mo @@ -331,8 +324,10 @@ share/locale/hy/LC_MESSAGES/gnome-panel-2.0.mo share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/ka/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ku/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/ky/LC_MESSAGES/gnome-panel-2.0.mo share/locale/li/LC_MESSAGES/gnome-panel-2.0.mo share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo @@ -378,8 +373,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK @dirrmtry share/locale/yi/LC_MESSAGES @dirrmtry share/locale/yi @dirrmtry share/locale/xh/LC_MESSAGES @@ -394,8 +387,14 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrmtry share/locale/mr @dirrmtry share/locale/mi/LC_MESSAGES @dirrmtry share/locale/mi +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky +@dirrmtry share/locale/ka/LC_MESSAGES +@dirrmtry share/locale/ka @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy +@dirrmtry share/locale/br/LC_MESSAGES +@dirrmtry share/locale/br @dirrm share/gnome/panel/pixmaps @dirrm share/gnome/panel/glade @dirrm share/gnome/omf/workspace-switcher @@ -462,8 +461,6 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/fish-applet-2/ko @dirrm share/gnome/help/fish-applet-2/ja/figures @dirrm share/gnome/help/fish-applet-2/ja -@dirrm share/gnome/help/fish-applet-2/fr/figures -@dirrm share/gnome/help/fish-applet-2/fr @dirrm share/gnome/help/fish-applet-2/de/figures @dirrm share/gnome/help/fish-applet-2/de @dirrm share/gnome/help/fish-applet-2 @@ -471,6 +468,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/fish/uk @dirrm share/gnome/help/fish/it/figures @dirrm share/gnome/help/fish/it +@dirrm share/gnome/help/fish/fr/figures +@dirrm share/gnome/help/fish/fr @dirrm share/gnome/help/fish/es/figures @dirrm share/gnome/help/fish/es @dirrm share/gnome/help/fish/C/figures diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index 85c84cc859db..2f16db01e622 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -3,15 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.23 2005/11/03 19:04:24 marcus Exp $ +# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.36 2006/04/13 07:52:40 bland Exp $ # PORTNAME= gnome-screensaver -PORTVERSION= 0.0.24 -PORTREVISION= 1 +PORTVERSION= 2.14.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME screen saver and locker @@ -22,11 +21,10 @@ RUN_DEPENDS= xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_REINPLACE= yes GNU_CONFIGURE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomemenus CONFIGURE_ARGS= --disable-pam \ - --with-gdm-config=${X11BASE}/etc/gdm/gdm.conf \ + --with-gdm-config=${X11BASE}/etc/gdm/custom.conf \ --with-xscreensaverdir=${XSCREENSAVER_DIR} \ --with-xscreensaverhackdir=${X11BASE}/bin/xscreensaver-hacks CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -41,7 +39,7 @@ XSCREENSAVER_DIR= ${X11BASE}/share/xscreensaver/config .include <bsd.port.pre.mk> .if ${OSVERSION} < 500000 -BROKEN= "Does not build on 4.X" +BROKEN= Does not build on 4.X .endif post-patch: diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo index 8cc7b9e172f7..e61ff6d26ce8 100644 --- a/x11/gnome-screensaver/distinfo +++ b/x11/gnome-screensaver/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome-screensaver-0.0.24.tar.bz2) = 767ac5360e7ba1c218cad725b21f78e1 -SHA256 (gnome-screensaver-0.0.24.tar.bz2) = f846cc6a04edbe47f283c0199cfb1e36b61667f8e0698da818d69fa0e71e4b11 -SIZE (gnome-screensaver-0.0.24.tar.bz2) = 1880715 +MD5 (gnome-screensaver-2.14.1.tar.bz2) = 59181612c8a5c8be7f0a392baba5245d +SHA256 (gnome-screensaver-2.14.1.tar.bz2) = a29fb020d036a430f5975c07fb058df32b8ed36d9709239c54ce3493941cb95d +SIZE (gnome-screensaver-2.14.1.tar.bz2) = 1913984 diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist index b28466983a84..48be81fe6464 100644 --- a/x11/gnome-screensaver/pkg-plist +++ b/x11/gnome-screensaver/pkg-plist @@ -2,6 +2,7 @@ bin/gnome-screensaver bin/gnome-screensaver-command bin/gnome-screensaver-preferences etc/xdg/menus/gnome-screensavers.menu +libdata/pkgconfig/gnome-screensaver.pc libexec/gnome-screensaver-dialog libexec/gnome-screensaver/floaters libexec/gnome-screensaver/popsquares @@ -24,26 +25,40 @@ share/gnome/pixmaps/backgrounds/cosmos/sombrero.jpg share/gnome/pixmaps/backgrounds/cosmos/whirlpool.jpg share/gnome/pixmaps/gnome-logo-white.svg share/locale/bg/LC_MESSAGES/gnome-screensaver.mo +share/locale/bn/LC_MESSAGES/gnome-screensaver.mo share/locale/ca/LC_MESSAGES/gnome-screensaver.mo share/locale/cs/LC_MESSAGES/gnome-screensaver.mo +share/locale/cy/LC_MESSAGES/gnome-screensaver.mo +share/locale/da/LC_MESSAGES/gnome-screensaver.mo share/locale/de/LC_MESSAGES/gnome-screensaver.mo +share/locale/dz/LC_MESSAGES/gnome-screensaver.mo +share/locale/el/LC_MESSAGES/gnome-screensaver.mo share/locale/en_CA/LC_MESSAGES/gnome-screensaver.mo share/locale/en_GB/LC_MESSAGES/gnome-screensaver.mo share/locale/es/LC_MESSAGES/gnome-screensaver.mo +share/locale/et/LC_MESSAGES/gnome-screensaver.mo share/locale/fi/LC_MESSAGES/gnome-screensaver.mo share/locale/fr/LC_MESSAGES/gnome-screensaver.mo share/locale/gl/LC_MESSAGES/gnome-screensaver.mo share/locale/gu/LC_MESSAGES/gnome-screensaver.mo +share/locale/hi/LC_MESSAGES/gnome-screensaver.mo share/locale/hu/LC_MESSAGES/gnome-screensaver.mo share/locale/it/LC_MESSAGES/gnome-screensaver.mo share/locale/ja/LC_MESSAGES/gnome-screensaver.mo +share/locale/ka/LC_MESSAGES/gnome-screensaver.mo +share/locale/ko/LC_MESSAGES/gnome-screensaver.mo +share/locale/ku/LC_MESSAGES/gnome-screensaver.mo share/locale/lt/LC_MESSAGES/gnome-screensaver.mo +share/locale/mk/LC_MESSAGES/gnome-screensaver.mo share/locale/nb/LC_MESSAGES/gnome-screensaver.mo share/locale/nl/LC_MESSAGES/gnome-screensaver.mo share/locale/no/LC_MESSAGES/gnome-screensaver.mo share/locale/pa/LC_MESSAGES/gnome-screensaver.mo +share/locale/pl/LC_MESSAGES/gnome-screensaver.mo +share/locale/pt/LC_MESSAGES/gnome-screensaver.mo share/locale/pt_BR/LC_MESSAGES/gnome-screensaver.mo share/locale/sk/LC_MESSAGES/gnome-screensaver.mo +share/locale/sq/LC_MESSAGES/gnome-screensaver.mo share/locale/sr/LC_MESSAGES/gnome-screensaver.mo share/locale/sr@Latn/LC_MESSAGES/gnome-screensaver.mo share/locale/sv/LC_MESSAGES/gnome-screensaver.mo @@ -51,7 +66,10 @@ share/locale/th/LC_MESSAGES/gnome-screensaver.mo share/locale/uk/LC_MESSAGES/gnome-screensaver.mo share/locale/vi/LC_MESSAGES/gnome-screensaver.mo share/locale/zh_CN/LC_MESSAGES/gnome-screensaver.mo +share/locale/zh_HK/LC_MESSAGES/gnome-screensaver.mo share/locale/zh_TW/LC_MESSAGES/gnome-screensaver.mo +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz @dirrm share/gnome/pixmaps/backgrounds/cosmos @dirrm share/gnome/pixmaps/backgrounds @dirrm libexec/gnome-screensaver diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 13ebb139a868..fcdee9b27fe1 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -3,17 +3,17 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnomesession/Makefile,v 1.67 2005/10/31 19:46:29 adamw Exp $ +# $MCom: ports/x11/gnomesession/Makefile,v 1.83 2006/04/24 03:18:23 marcus Exp $ # PORTNAME= gnomesession -PORTVERSION= 2.12.0 -PORTREVISION= 1 +PORTVERSION= 2.14.1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ ${MASTER_SITE_LOCAL:S/$/:local/} \ http://people.FreeBSD.org/~adamw/images/gnome_splashes/2.12/:local -MASTER_SITE_SUBDIR= sources/gnome-session/2.12 \ +MASTER_SITE_SUBDIR= sources/gnome-session/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \ adamw/:local DISTNAME= gnome-session-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -24,9 +24,11 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= gnome@FreeBSD.org COMMENT= Session component for the GNOME 2 desktop +USE_GETTEXT= yes USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui +USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop +GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -45,9 +47,9 @@ post-extract: post-install: ${INSTALL_DATA} ${WRKSRC}/gnome-session/gnome-splash.png \ ${PREFIX}/share/gnome/pixmaps/splash/original-gnome-splash.png - ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \ - ${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png -.for splash in MaMBaNgGaoX-2.12.png adamw-piggy-2.12.png adamw-trophy-2.12.png andreas-slogan-2.12.png andreas-splash-2.12.png domix-splash-2.12.png domix-splash2-2.12.png mumija-2.12.png mumija2-2.12.png mumija3-2.12.png tremulant-2.12.png tremulant-blood-2.12.png tremulant-brushed-metal-2.12.png +# ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \ +# ${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png +.for splash in MaMBaNgGaoX-2.12.png adamw-piggy-2.12.png adamw-trophy-2.12.png andreas-slogan-2.12.png andreas-splash-2.12.png domix-splash-2.12.png domix-splash2-2.12.png mumija-2.12.png mumija2-2.12.png mumija3-2.12.png tremulant-2.12.png tremulant-blood-2.12.png tremulant-brushed-metal-2.12.png ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/${splash} \ ${PREFIX}/share/gnome/pixmaps/splash .endfor diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index e4097a691860..f516a270fc4e 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,6 +1,6 @@ -MD5 (gnome2/gnome-session-2.12.0.tar.bz2) = 835e9340d23e139430224b931ff4c597 -SHA256 (gnome2/gnome-session-2.12.0.tar.bz2) = 713d1b56339dd19707edf056e08c2a0659a1430b56b4c12f759cc25f3664bb9b -SIZE (gnome2/gnome-session-2.12.0.tar.bz2) = 864397 +MD5 (gnome2/gnome-session-2.14.1.tar.bz2) = 0b7a0fa918f7d0565d6487d06fa4489d +SHA256 (gnome2/gnome-session-2.14.1.tar.bz2) = 5ff345552ed7f71540abbe1753e650c2a5bfad50f1acce958f664bf3a9d7e9c2 +SIZE (gnome2/gnome-session-2.14.1.tar.bz2) = 655320 MD5 (gnome2/freebsd-splashes-gnome-2.12.1.tar) = 4a098f0f2295c3333acff185d4bed5aa SHA256 (gnome2/freebsd-splashes-gnome-2.12.1.tar) = c7008fc8f43cf07e3d84cbf0bd9b2846fa31aaf37d4f97993b185b4155f8ee27 SIZE (gnome2/freebsd-splashes-gnome-2.12.1.tar) = 1280000 diff --git a/x11/gnome-session/files/patch-dbus b/x11/gnome-session/files/patch-dbus new file mode 100644 index 000000000000..edd18bfec916 --- /dev/null +++ b/x11/gnome-session/files/patch-dbus @@ -0,0 +1,429 @@ +--- gnome-session/main.c.orig Tue Mar 21 12:37:40 2006 ++++ gnome-session/main.c Sun Apr 23 23:05:38 2006 +@@ -43,6 +43,7 @@ + #include "command.h" + #include "splash-widget.h" + #include "util.h" ++#include "gsm-dbus.h" + #include "gsm-sound.h" + #include "gsm-gsd.h" + #include "gsm-keyring.h" +@@ -334,6 +335,7 @@ main (int argc, char *argv[]) + char *display_str; + char **versions; + GConfClient *gconf_client; ++ gboolean dbus_daemon_owner; + + if (getenv ("GSM_VERBOSE_DEBUG")) + gsm_set_verbose (TRUE); +@@ -415,6 +417,7 @@ main (int argc, char *argv[]) + fprintf (stderr, "SESSION_MANAGER=%s\n", getenv ("SESSION_MANAGER")); + gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-session.png"); + ++ dbus_daemon_owner = gsm_dbus_daemon_start (); + + /* Make sure children see the right value for DISPLAY. This is + useful if --display was specified on the command line. */ +@@ -495,6 +498,9 @@ main (int argc, char *argv[]) + gsm_sound_logout (); + + gsm_keyring_daemon_stop (); ++ ++ if (dbus_daemon_owner) ++ gsm_dbus_daemon_stop (); + + g_object_unref (gconf_client); + gsm_shutdown_gconfd (); +--- gnome-session/gsm-dbus.h.orig Sun Apr 23 23:01:47 2006 ++++ gnome-session/gsm-dbus.h Sun Apr 23 23:00:53 2006 +@@ -0,0 +1,27 @@ ++/* gsm-dbus.h - Handle the dbus-daemon process. ++ * ++ * Copyright (c) 2006 Julio M. Merino Vidal <jmmv@NetBSD.org> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2, or (at your option) ++ * any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++ * 02111-1307, USA. ++ */ ++ ++#ifndef GSM_DBUS_H ++#define GSM_DBUS_H ++ ++gboolean gsm_dbus_daemon_start (void); ++void gsm_dbus_daemon_stop (void); ++ ++#endif /* GSM_DBUS_H */ +--- gnome-session/gsm-dbus.c.orig Sun Apr 23 23:09:40 2006 ++++ gnome-session/gsm-dbus.c Sun Apr 23 23:10:21 2006 +@@ -0,0 +1,360 @@ ++/* gsm-dbus.c - Handle the dbus-daemon process. ++ * ++ * Copyright (c) 2006 Julio M. Merino Vidal <jmmv@NetBSD.org> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2, or (at your option) ++ * any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++ * 02111-1307, USA. ++ */ ++ ++#if HAVE_CONFIG_H ++#include "config.h" ++#endif ++ ++#include <sys/wait.h> ++ ++#include <errno.h> ++#include <fcntl.h> ++#include <limits.h> ++#include <signal.h> ++#include <stdlib.h> ++#include <unistd.h> ++ ++#include <glib.h> ++#include <glib/gprintf.h> ++ ++#include "gsm-dbus.h" ++ ++static pid_t dbus_daemon_pid = 0; ++ ++static gboolean have_dbus_daemon (void); ++static gboolean have_running_instance (void); ++static int read_line (int, char *, ssize_t); ++static void start_child (int, int); ++static void start_parent (int, int, pid_t); ++ ++/* --------------------------------------------------------------------- ++ * PUBLIC INTERFACE ++ * --------------------------------------------------------------------- */ ++ ++/* ++ * Starts the dbus-daemon if not already running and attaches it to the ++ * current environment by defining DBUS_SESSION_BUS_ADDRESS. Returns ++ * true if we launch a new dbus-daemon so that we know if we have to call ++ * gsm_dbus_daemon_stop later on or not. ++ * ++ * This function can only be called if dbus-daemon is not already running ++ * (i.e., if gnome-session is starting up or if gsm_dbus_daemon_stop was ++ * previously called). ++ */ ++gboolean ++gsm_dbus_daemon_start (void) ++{ ++ int address_pipe[2]; ++ int pid_pipe[2]; ++ pid_t tmp_pid; ++ ++ g_assert (dbus_daemon_pid == 0); ++ ++ if (have_running_instance ()) ++ return FALSE; ++ if (! have_dbus_daemon ()) ++ return FALSE; ++ ++ /* ++ * At this point, dbus-daemon is not running for the current session ++ * and the binary exists. Spawn it. ++ */ ++ ++ if (pipe (address_pipe) == -1) ++ { ++ g_printerr ("Cannot create address pipe for dbus-daemon\n"); ++ return FALSE; ++ } ++ ++ if (pipe (pid_pipe) == -1) ++ { ++ close (address_pipe[0]); ++ close (address_pipe[1]); ++ g_printerr ("Cannot create pid pipe for dbus-daemon\n"); ++ return FALSE; ++ } ++ ++ tmp_pid = fork (); ++ if (tmp_pid == -1) ++ { ++ close (address_pipe[0]); ++ close (address_pipe[1]); ++ close (pid_pipe[0]); ++ close (pid_pipe[1]); ++ g_printerr ("Cannot create child process for dbus-daemon\n"); ++ return FALSE; ++ } ++ else if (tmp_pid == 0) ++ { ++ close (address_pipe[0]); ++ close (pid_pipe[0]); ++ start_child (address_pipe[1], pid_pipe[1]); ++ /* NOTREACHED */ ++ } ++ else ++ { ++ close (address_pipe[1]); ++ close (pid_pipe[1]); ++ start_parent (address_pipe[0], pid_pipe[0], tmp_pid); ++ } ++ ++ g_assert (dbus_daemon_pid != 0); ++ return TRUE; ++} ++ ++/* ++ * Stops the running dbus-daemon. Can only be called if we own the process; ++ * i.e., if gsm_dbus_daemon_start returned true. ++ */ ++void ++gsm_dbus_daemon_stop (void) ++{ ++ g_assert (dbus_daemon_pid != 0); ++ ++ if (kill (dbus_daemon_pid, SIGTERM) == -1) ++ g_printerr ("Failed to kill dbus-daemon (pid %d)\n", ++ dbus_daemon_pid); ++ else ++ { ++ dbus_daemon_pid = 0; ++ g_unsetenv ("DBUS_SESSION_BUS_ADDRESS"); ++ } ++} ++ ++/* --------------------------------------------------------------------- ++ * PRIVATE FUNCTIONS ++ * --------------------------------------------------------------------- */ ++ ++/* ++ * Check whether the dbus-daemon binary is in the path and raise an ++ * appropriate error message if it is not. ++ */ ++static gboolean ++have_dbus_daemon (void) ++{ ++ gboolean result; ++ gchar *file_name; ++ ++ file_name = g_find_program_in_path ("dbus-daemon"); ++ if (file_name == NULL) ++ g_printerr ("Cannot locate dbus-daemon\n"); ++ result = file_name != NULL; ++ g_free (file_name); ++ ++ return result; ++} ++ ++/* ++ * Check whether there is a dbus-daemon session instance currently running ++ * (not spawned by us). If there is, do nothing and return TRUE. ++ */ ++static gboolean ++have_running_instance (void) ++{ ++ const gchar *address_str; ++ ++ g_assert (dbus_daemon_pid == 0); ++ ++ address_str = g_getenv ("DBUS_SESSION_BUS_ADDRESS"); ++ return address_str != NULL; ++} ++ ++/* ++ * Reads a single line from the given file descriptor and stores it in the ++ * buffer pointed to by 'buf'. ++ * ++ * After finding the first new line character, the function returns. This ++ * is to avoid reading dbus' pid multiple times from its file descriptor. ++ */ ++static int ++read_line (int fd, char *buf, ssize_t bufsize) ++{ ++ gboolean discard, done; ++ ssize_t bytes; ++ ++ bytes = 0; ++ discard = FALSE; ++ done = FALSE; ++ do ++ { ++ ssize_t i, result; ++ ++ result = read (fd, &buf[bytes], bufsize - bytes); ++ if (result < 0) ++ return -1; ++ else if (result > 0 && !discard) ++ { ++ if (bytes + result < bufsize) ++ bytes += result; ++ else ++ bytes = bufsize - 1; ++ } ++ else ++ done = TRUE; ++ ++ for (i = 0; !discard && i < bytes; i++) ++ if (buf[i] == '\n') ++ { ++ buf[i] = '\0'; ++ discard = TRUE; ++ } ++ } ++ while (!done); ++ ++ g_assert (bytes >= 0 && bytes < bufsize); ++ buf[bytes] = '\0'; ++ ++ return bytes; ++} ++ ++/* ++ * Code run by the child process after the fork to launch dbus-demon. ++ * ++ * As the child, this execs dbus-daemon, connecting it to the appropriate ++ * file descriptors. ++ */ ++static void ++start_child (int address_fd, int pid_fd) ++{ ++ gchar address_str[16]; ++ gchar pid_str[16]; ++ int fd; ++ long open_max; ++ ++ open_max = sysconf (_SC_OPEN_MAX); ++ for (fd = 0; fd < open_max; fd++) ++ { ++ if (fd != STDIN_FILENO && fd != STDOUT_FILENO && fd != STDERR_FILENO && ++ fd != address_fd && fd != pid_fd) ++ fcntl (fd, F_SETFD, FD_CLOEXEC); ++ } ++ ++ g_snprintf (address_str, sizeof (address_str), "%d", address_fd); ++ g_snprintf (pid_str, sizeof (pid_str), "%d", pid_fd); ++ ++ execlp ("dbus-daemon", ++ "dbus-daemon", ++ "--fork", ++ "--print-address", address_str, ++ "--print-pid", pid_str, ++ "--session", ++ NULL); ++ ++ g_printerr ("Could not launch dbus-daemon\n"); ++ ++ exit (EXIT_FAILURE); ++} ++ ++/* ++ * Code run by the parent process after the fork to launch dbus-demon. ++ * ++ * As the parent, this waits until dbus-daemon forks itself again and ++ * fetches its address and pid to later take its ownership. ++ */ ++static void ++start_parent (int address_fd, int pid_fd, pid_t child) ++{ ++ char address_str[256]; ++ char pid_str[256]; ++ char *tmp_ep; ++ int exitstat; ++ unsigned long tmp_num; ++ ssize_t bytes; ++ ++ g_assert (child > 0); ++ ++ /* ++ * dbus-daemon --fork causes our child process to exit prematurely ++ * because it is not the real daemon. See if it worked correctly ++ * and clean it up to avoid a zombie. ++ * ++ * Life could be much easier if dbus-daemon had a --no-fork flag. ++ * But, as it hasn't it, we cannot assume that it will not fork, ++ * because we have no control over its configuration file. ++ */ ++ if (waitpid (child, &exitstat, 0) == -1) ++ { ++ close (address_fd); ++ close (pid_fd); ++ ++ g_printerr ("Failed to get dbus-daemon status\n"); ++ return; ++ } ++ if (!WIFEXITED (exitstat) || WEXITSTATUS (exitstat) != EXIT_SUCCESS) ++ { ++ close (address_fd); ++ close (pid_fd); ++ ++ g_printerr ("dbus-daemon exited unexpectedly\n"); ++ return; ++ } ++ ++ /* ++ * Fetch dbus-daemon address. ++ */ ++ bytes = read_line (address_fd, address_str, sizeof (address_str)); ++ if (bytes == -1 || bytes == 0) ++ { ++ close (address_fd); ++ close (pid_fd); ++ ++ g_printerr ("Failed to get dbus-daemon's address\n"); ++ return; ++ } ++ ++ /* ++ * Fetch dbus-daemon pid. ++ */ ++ bytes = read_line (pid_fd, pid_str, sizeof (pid_str)); ++ if (bytes == -1 || bytes == 0) ++ { ++ close (address_fd); ++ close (pid_fd); ++ ++ g_printerr ("Failed to get dbus-daemon's pid\n"); ++ return; ++ } ++ ++ close (address_fd); ++ close (pid_fd); ++ ++ /* ++ * Convert the string printed in pid_fd to a pid value. Do the usual ++ * strtoul dance to check for a valid number. ++ */ ++ errno = 0; ++ tmp_num = strtoul(pid_str, &tmp_ep, 10); ++ if (pid_str[0] == '\0' || *tmp_ep != '\0') ++ { ++ g_printerr ("dbus-daemon pid invalid (not a number)\n"); ++ return; ++ } ++ if (errno == ERANGE && tmp_num == ULONG_MAX) ++ { ++ g_printerr ("dbus-daemon pid invalid (out of range)\n"); ++ return; ++ } ++ dbus_daemon_pid = tmp_num; ++ ++ /* ++ * All right! Tell our future children about the new born dbus-daemon. ++ */ ++ g_setenv ("DBUS_SESSION_BUS_ADDRESS", address_str, TRUE); ++} diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in index ed0b6ac56866..a80f576a42a3 100644 --- a/x11/gnome-session/files/patch-gnome-session_Makefile.in +++ b/x11/gnome-session/files/patch-gnome-session_Makefile.in @@ -1,11 +1,37 @@ ---- gnome-session/Makefile.in.orig Tue Nov 30 14:07:39 2004 -+++ gnome-session/Makefile.in Tue Nov 30 14:07:51 2004 -@@ -209,7 +209,7 @@ +--- gnome-session/Makefile.in.orig Sun Apr 23 23:01:30 2006 ++++ gnome-session/Makefile.in Sun Apr 23 23:06:41 2006 +@@ -67,7 +67,7 @@ am_gnome_session_OBJECTS = manager.$(OBJ + remote.$(OBJEXT) logout.$(OBJEXT) splash-widget.$(OBJEXT) \ + gsm-xrandr.$(OBJEXT) gsm-keyring.$(OBJEXT) gsm-gsd.$(OBJEXT) \ + gsm-protocol.$(OBJEXT) gsm-remote-desktop.$(OBJEXT) \ +- gsm-sound.$(OBJEXT) gsm-at-startup.$(OBJEXT) \ ++ gsm-sound.$(OBJEXT) gsm-at-startup.$(OBJEXT) gsm-dbus.$(OBJEXT) \ + gsm-multiscreen.$(OBJEXT) gsm-typebuiltins.$(OBJEXT) \ + gdm-logout-action.$(OBJEXT) util.$(OBJEXT) $(am__objects_1) + gnome_session_OBJECTS = $(am_gnome_session_OBJECTS) +@@ -310,7 +310,7 @@ sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ target_alias = @target_alias@ NULL = - -defaultdir = $(datadir)/gnome +defaultdir = $(datadir) - INCLUDES = \ $(GNOME_SESSION_CFLAGS) \ + $(STANDARD_PROPERTIES_CFLAGS) \ +@@ -386,6 +386,8 @@ gnome_session_SOURCES = \ + splash-widget.h \ + gsm-xrandr.c \ + gsm-xrandr.h \ ++ gsm-dbus.c \ ++ gsm-dbus.h \ + gsm-keyring.c \ + gsm-keyring.h \ + gsm-gsd.c \ +@@ -610,6 +612,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-sound.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-typebuiltins.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-xrandr.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-dbus.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ice.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logout-test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logout.Po@am__quote@ diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-at-startup.c b/x11/gnome-session/files/patch-gnome-session_gsm-at-startup.c new file mode 100644 index 000000000000..da4950d05c95 --- /dev/null +++ b/x11/gnome-session/files/patch-gnome-session_gsm-at-startup.c @@ -0,0 +1,10 @@ +--- gnome-session/gsm-at-startup.c.orig Mon Apr 17 18:00:38 2006 ++++ gnome-session/gsm-at-startup.c Mon Apr 17 18:00:57 2006 +@@ -2,6 +2,7 @@ + #include <string.h> + + #include "gsm-at-startup.h" ++#include "util.h" + + #include <gdk/gdk.h> + #include <libgnome/libgnome.h> diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-xrandr.c b/x11/gnome-session/files/patch-gnome-session_gsm-xrandr.c new file mode 100644 index 000000000000..8eae88069c51 --- /dev/null +++ b/x11/gnome-session/files/patch-gnome-session_gsm-xrandr.c @@ -0,0 +1,10 @@ +--- gnome-session/gsm-xrandr.c.orig Mon Apr 17 17:59:38 2006 ++++ gnome-session/gsm-xrandr.c Mon Apr 17 17:59:50 2006 +@@ -3,6 +3,7 @@ + #include <gconf/gconf-client.h> + + #include "gsm-xrandr.h" ++#include "util.h" + + #ifdef HAVE_RANDR + #include <stdio.h> diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist index 17d898f1ee23..882701bbd503 100644 --- a/x11/gnome-session/pkg-plist +++ b/x11/gnome-session/pkg-plist @@ -34,6 +34,7 @@ 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/dz/LC_MESSAGES/gnome-session-2.0.mo share/locale/el/LC_MESSAGES/gnome-session-2.0.mo share/locale/en_CA/LC_MESSAGES/gnome-session-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-session-2.0.mo @@ -56,8 +57,10 @@ 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/ka/LC_MESSAGES/gnome-session-2.0.mo share/locale/kn/LC_MESSAGES/gnome-session-2.0.mo share/locale/ko/LC_MESSAGES/gnome-session-2.0.mo +share/locale/ku/LC_MESSAGES/gnome-session-2.0.mo share/locale/lt/LC_MESSAGES/gnome-session-2.0.mo share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo share/locale/mi/LC_MESSAGES/gnome-session-2.0.mo @@ -94,7 +97,14 @@ share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo +share/locale/zh_HK/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo -@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index c1c5d6bcecde..a8578865b0f7 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -3,24 +3,24 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnometerminal/Makefile,v 1.52 2005/10/14 20:39:58 adamw Exp $ +# $MCom: ports/x11/gnometerminal/Makefile,v 1.69 2006/04/13 07:52:41 bland Exp $ # PORTNAME= gnometerminal -PORTVERSION= 2.12.0 +PORTVERSION= 2.14.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-terminal/2.12 +MASTER_SITE_SUBDIR= sources/gnome-terminal/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= gnome-terminal-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Terminal component for the GNOME 2 Desktop +USE_GETTEXT= yes USE_BZIP2= yes INSTALLS_OMF= yes USE_X_PREFIX= yes -USE_REINPLACE= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui vte GNU_CONFIGURE= yes diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo index 951536429cf1..73abf3d6655d 100644 --- a/x11/gnome-terminal/distinfo +++ b/x11/gnome-terminal/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-terminal-2.12.0.tar.bz2) = 483c9397dd165845e2528a80e3df6dfc -SHA256 (gnome2/gnome-terminal-2.12.0.tar.bz2) = e515509f2d07ab1360723b70345ac18b44c5525abc31cce48f135b43fbb444cc -SIZE (gnome2/gnome-terminal-2.12.0.tar.bz2) = 1684178 +MD5 (gnome2/gnome-terminal-2.14.1.tar.bz2) = 7abe60db5359c88392d2b4f0d5587ef5 +SHA256 (gnome2/gnome-terminal-2.14.1.tar.bz2) = c1e7674bb75343db89ad6769bc2d7ecfb115d9eda02035d374d8c4d952091647 +SIZE (gnome2/gnome-terminal-2.14.1.tar.bz2) = 1783063 diff --git a/x11/gnome-terminal/files/patch-src::terminal-screen.c b/x11/gnome-terminal/files/patch-src::terminal-screen.c deleted file mode 100644 index 0198f748c37d..000000000000 --- a/x11/gnome-terminal/files/patch-src::terminal-screen.c +++ /dev/null @@ -1,23 +0,0 @@ ---- src/terminal-screen.c.orig Fri Jul 1 20:37:58 2005 -+++ src/terminal-screen.c Tue Jul 5 13:26:21 2005 -@@ -248,16 +248,16 @@ terminal_screen_init (TerminalScreen *sc - #define URLPATH "/[" PATHCHARS "]*[^]'.}>) \t\r\n,\\\"]" - - terminal_widget_match_add (screen->priv->term, -- "\\<(" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_AS_IS); -+ "[[:<:]](" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_AS_IS); - - terminal_widget_match_add (screen->priv->term, -- "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_DEFAULT_TO_HTTP); -+ "[[:<:]]<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_DEFAULT_TO_HTTP); - - terminal_widget_match_add (screen->priv->term, -- "\\<(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", FLAVOR_MAILTO); -+ "[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", FLAVOR_MAILTO); - - terminal_widget_match_add (screen->priv->term, -- "\\<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS); -+ "[[:<:]]<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS); - - - terminal_screen_setup_dnd (screen); diff --git a/x11/gnome-terminal/files/patch-src_terminal-screen.c b/x11/gnome-terminal/files/patch-src_terminal-screen.c new file mode 100644 index 000000000000..0f5c397cbadd --- /dev/null +++ b/x11/gnome-terminal/files/patch-src_terminal-screen.c @@ -0,0 +1,33 @@ +--- src/terminal-screen.c.orig Sun Apr 2 18:27:36 2006 ++++ src/terminal-screen.c Sun Apr 2 18:42:41 2006 +@@ -278,22 +278,22 @@ terminal_screen_init (TerminalScreen *sc + #define URLPATH "/[" PATHCHARS "]*[^]'.}>) \t\r\n,\\\"]" + + terminal_widget_match_add (screen->priv->term, +- "\\<" SCHEME "//(" USER "@)?[" HOSTCHARS ".]+" +- "(:[0-9]+)?(" URLPATH ")?\\>", FLAVOR_AS_IS); ++ "[[:<:]]" SCHEME "//(" USER "@)?[" HOSTCHARS ".]+" ++ "(:[0-9]+)?(" URLPATH ")?[[:>:]]", FLAVOR_AS_IS); + + terminal_widget_match_add (screen->priv->term, +- "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+" +- "(:[0-9]+)?(" URLPATH ")?\\>", ++ "[[:<:]](www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+" ++ "(:[0-9]+)?(" URLPATH ")?[[:>:]]", + FLAVOR_DEFAULT_TO_HTTP); + + terminal_widget_match_add (screen->priv->term, +- "\\<(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9]" +- "[a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", ++ "[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9]" ++ "[a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+[[:>:]]", + FLAVOR_EMAIL); + + terminal_widget_match_add (screen->priv->term, +- "\\<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+" +- "@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS); ++ "[[:<:]]news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+" ++ "@[" HOSTCHARS ".]+(:[0-9]+)?[[:>:]]", FLAVOR_AS_IS); + + terminal_screen_setup_dnd (screen); + diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist index 721f659b8cd1..380a52ff47c5 100644 --- a/x11/gnome-terminal/pkg-plist +++ b/x11/gnome-terminal/pkg-plist @@ -1,6 +1,5 @@ bin/gnome-terminal 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 @@ -8,6 +7,11 @@ share/gnome/help/gnome-terminal/C/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/C/figures/terminal_window.png share/gnome/help/gnome-terminal/C/gnome-terminal.xml share/gnome/help/gnome-terminal/C/legal.xml +share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-default.png +share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-tabbed.png +share/gnome/help/gnome-terminal/bg/figures/terminal_window.png +share/gnome/help/gnome-terminal/bg/gnome-terminal.xml +share/gnome/help/gnome-terminal/bg/legal.xml share/gnome/help/gnome-terminal/de/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/de/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/de/figures/terminal_window.png @@ -63,6 +67,7 @@ share/gnome/help/gnome-terminal/zh_TW/figures/terminal_window.png share/gnome/help/gnome-terminal/zh_TW/gnome-terminal.xml share/gnome/help/gnome-terminal/zh_TW/legal.xml share/gnome/omf/gnome-terminal/gnome-terminal-C.omf +share/gnome/omf/gnome-terminal/gnome-terminal-bg.omf share/gnome/omf/gnome-terminal/gnome-terminal-de.omf share/gnome/omf/gnome-terminal/gnome-terminal-es.omf share/gnome/omf/gnome-terminal/gnome-terminal-fr.omf @@ -82,11 +87,13 @@ 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/bs/LC_MESSAGES/gnome-terminal.mo +share/locale/br/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/dz/LC_MESSAGES/gnome-terminal.mo share/locale/el/LC_MESSAGES/gnome-terminal.mo share/locale/en_CA/LC_MESSAGES/gnome-terminal.mo share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo @@ -108,6 +115,7 @@ 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 +share/locale/ku/LC_MESSAGES/gnome-terminal.mo share/locale/lt/LC_MESSAGES/gnome-terminal.mo share/locale/lv/LC_MESSAGES/gnome-terminal.mo share/locale/mk/LC_MESSAGES/gnome-terminal.mo @@ -141,6 +149,12 @@ share/locale/wa/LC_MESSAGES/gnome-terminal.mo share/locale/xh/LC_MESSAGES/gnome-terminal.mo share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/br/LC_MESSAGES +@dirrmtry share/locale/br @dirrm share/gnome/omf/gnome-terminal @dirrm share/gnome/help/gnome-terminal/zh_TW/figures @dirrm share/gnome/help/gnome-terminal/zh_TW @@ -164,6 +178,8 @@ 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/bg/figures +@dirrm share/gnome/help/gnome-terminal/bg @dirrm share/gnome/help/gnome-terminal/C/figures @dirrm share/gnome/help/gnome-terminal/C @dirrm share/gnome/help/gnome-terminal diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile index 5373d3d287fc..ec6c42772c62 100644 --- a/x11/gnome2-fifth-toe/Makefile +++ b/x11/gnome2-fifth-toe/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome2-fifth-toe/Makefile,v 1.73 2005/08/26 03:21:23 marcus Exp $ +# $MCom: ports/x11/gnome2-fifth-toe/Makefile,v 1.77 2006/02/03 05:53:28 marcus Exp $ # PORTREVISION= 0 @@ -34,8 +34,7 @@ RUN_DEPENDS= pan:${PORTSDIR}/news/pan2 \ nautilus-sendto:${PORTSDIR}/deskutils/nautilus-sendto \ goobox:${PORTSDIR}/audio/goobox \ inkscape:${PORTSDIR}/graphics/inkscape \ - gpdf:${PORTSDIR}/graphics/gpdf \ - ggv:${PORTSDIR}/print/ggv + atomix:${PORTSDIR}/games/atomix MASTERDIR= ${.CURDIR}/../gnome2 GNOME_SLAVE= yes diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile index dab054657c59..906590c8b629 100644 --- a/x11/gnome2-lite/Makefile +++ b/x11/gnome2-lite/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome2-lite/Makefile,v 1.43 2005/09/25 23:58:48 marcus Exp $ +# $MCom: ports/x11/gnome2-lite/Makefile,v 1.45 2005/11/17 23:20:32 marcus Exp $ # PORTREVISION= 0 diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile index f9cafff37b70..313ad12b0154 100644 --- a/x11/gnome2-power-tools/Makefile +++ b/x11/gnome2-power-tools/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.62 2005/10/06 01:26:06 marcus Exp $ +# $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.69 2006/04/24 02:51:14 mezz Exp $ # PORTREVISION= 0 @@ -12,7 +12,7 @@ PKGNAMESUFFIX= -power-tools COMMENT= "Geektoys" for the GNOME 2 power user -RUN_DEPENDS= ${X11BASE}/lib/epiphany/1.8/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \ +RUN_DEPENDS= ${X11BASE}/lib/epiphany/2.14/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \ gnome-pkgview:${PORTSDIR}/sysutils/gnome-pkgview \ ${X11BASE}/libexec/netspeed_applet2:${PORTSDIR}/net/netspeed_applet \ ${LOCALBASE}/sbin/gkrellmd:${PORTSDIR}/sysutils/gkrellm2 \ @@ -23,13 +23,11 @@ RUN_DEPENDS= ${X11BASE}/lib/epiphany/1.8/extensions/libgesturesextension.so:${PO gnomesu:${PORTSDIR}/security/libgnomesu \ bpm:${PORTSDIR}/sysutils/bpm \ gnome-file-share-properties:${PORTSDIR}/www/gnome-user-share \ - gnome-menu-editor:${PORTSDIR}/deskutils/gnome-menu-editor \ serpentine:${PORTSDIR}/sysutils/serpentine \ devilspie:${PORTSDIR}/x11-wm/devilspie \ ${X11BASE}/lib/nautilus/extensions-1.0/libnautilus-open-terminal.so:${PORTSDIR}/deskutils/nautilus-open-terminal \ gtweakui-menus:${PORTSDIR}/deskutils/gtweakui \ gnome-art:${PORTSDIR}/x11-themes/gnome-art \ - ${X11BASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \ brightside:${PORTSDIR}/x11/brightside \ evolution-gconf-filter-exchange:${PORTSDIR}/devel/evolution-gconf-tools \ ${X11BASE}/libexec/quick-lounge-applet:${PORTSDIR}/misc/quick-lounge-applet \ diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index 31394fc417a8..ace0debec7d6 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome2/Makefile,v 1.122 2005/10/06 01:26:06 marcus Exp $ +# $MCom: ports/x11/gnome2/Makefile,v 1.142 2006/04/23 20:10:22 marcus Exp $ # PORTNAME= gnome2 -PORTVERSION= 2.12.3 +PORTVERSION= 2.14.1 PORTREVISION?= 0 CATEGORIES?= x11 gnome MASTER_SITES= # empty @@ -45,21 +45,23 @@ RUN_DEPENDS?= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 gnopernicus:${PORTSDIR}/accessibility/gnopernicus \ ${X11BASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnomenetstatus \ dasher:${PORTSDIR}/accessibility/dasher \ - evolution-2.4:${PORTSDIR}/mail/evolution \ + evolution-2.6:${PORTSDIR}/mail/evolution \ ${X11BASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \ network-admin:${PORTSDIR}/sysutils/gnomesystemtools \ gnome-nettool:${PORTSDIR}/net/gnomenettool \ vino-session:${PORTSDIR}/net/vino \ - ximian-connector-setup-2.4:${PORTSDIR}/mail/evolution-exchange \ - ${X11BASE}/lib/gstreamer-0.8/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \ - ${X11BASE}/lib/gstreamer-0.8/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \ + ximian-connector-setup-2.6:${PORTSDIR}/mail/evolution-exchange \ + ${X11BASE}/lib/gstreamer-0.10/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \ + ${X11BASE}/lib/gstreamer-0.10/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \ totem:${PORTSDIR}/multimedia/totem-gstreamer \ gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \ ${X11BASE}/share/gnome/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \ sound-juicer:${PORTSDIR}/audio/sound-juicer \ gnome-keyring-manager:${PORTSDIR}/security/gnomekeyringmanager \ ${X11BASE}/libdata/pkgconfig/libgtkhtml-2.0.pc:${PORTSDIR}/www/libgtkhtml \ - evince:${PORTSDIR}/graphics/evince + evince:${PORTSDIR}/graphics/evince \ + ${X11BASE}/libexec/fast-user-switch-applet:${PORTSDIR}/x11/fast-user-switch-applet \ + ${X11BASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet NO_BUILD= yes @@ -73,7 +75,7 @@ pre-configure: .endif .if !defined(GNOME_SLAVE) || ${.CURDIR:T}=="gnome2-lite" -OPTIONS= GNOME_SCREENSAVER "Use gnome-screensaver as screensaver app" off +OPTIONS= XSCREENSAVER "Use xscreensaver as screen saver app" off .endif do-install: # empty @@ -84,10 +86,15 @@ do-install: # empty .if ${ARCH} == "i386" || ${OSVERSION} > 500035 RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany .endif +.if ${.CURDIR:T}!="gnome2-lite" +.if ${ARCH}!="sparc64" || ${OSVERSION} >= 700003 +RUN_DEPENDS+= ekiga:${PORTSDIR}/net/ekiga +.endif +.endif .endif .if ${.CURDIR}==${MASTERDIR} || ${.CURDIR:T}=="gnome2-lite" -.if !defined(WITH_GNOME_SCREENSAVER) +.if defined(WITH_XSCREENSAVER) RUN_DEPENDS+= ${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome .else RUN_DEPENDS+= gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile index e2b745126db9..4e6cd0755f3b 100644 --- a/x11/gnomeapplets2/Makefile +++ b/x11/gnomeapplets2/Makefile @@ -3,14 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnomeapplets2/Makefile,v 1.94 2005/10/08 19:41:40 marcus Exp $ +# $MCom: ports/x11/gnomeapplets2/Makefile,v 1.111 2006/04/13 07:52:40 bland Exp $ # PORTNAME= gnomeapplets2 -PORTVERSION= 2.12.3 +PORTVERSION= 2.14.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-applets/2.12 +MASTER_SITE_SUBDIR= sources/gnome-applets/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= gnome-applets-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,28 +18,30 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Applets components for the Gnome 2 Desktop Environment BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-system-tools.pc:${PORTSDIR}/sysutils/gnomesystemtools -LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop2 \ +LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop2 \ xklavier.10:${PORTSDIR}/x11/libxklavier \ gucharmap.4:${PORTSDIR}/deskutils/gucharmap RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/gnomesystemtools +USE_GETTEXT= yes USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 INSTALLS_OMF= yes INSTALLS_ICONS= yes +INSTALLS_SHLIB= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \ gail gnomedocutils USE_GSTREAMER= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ +CONFIGURE_ARGS= --with-gstreamer=0.10 +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ FREEBSD_SYS=${FREEBSD_SYS} GCONF_SCHEMAS= charpick.schemas drivemount.schemas geyes.schemas \ gswitchit.schemas gtik.schemas gweather.schemas \ - mini-commander-global.schemas mini-commander.schemas \ mixer.schemas multiload.schemas \ stickynotes.schemas @@ -47,6 +49,11 @@ FREEBSD_SYS?= /usr/src/sys .include <bsd.port.pre.mk> +.if exists(${LOCALBASE}/libdata/pkgconfig/libnotify.pc) || \ + defined(WITH_LIBNOTIFY) +LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify +.endif + .if ${ARCH} != "i386" && ${ARCH} != "amd64" CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC" PLIST_SUB= BATTERY="@comment " @@ -62,4 +69,8 @@ PLIST_SUB+= CPUFREQ="" GCONF_SCHEMAS+= cpufreq-applet.schemas .endif +post-patch: + @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \ + ${WRKSRC}/libgweather/weather-met.c + .include <bsd.port.post.mk> diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo index b84b0032da13..6236e73545a6 100644 --- a/x11/gnomeapplets2/distinfo +++ b/x11/gnomeapplets2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-applets-2.12.3.tar.bz2) = 39987d3e8726e58a6a72047ada05e25d -SHA256 (gnome2/gnome-applets-2.12.3.tar.bz2) = a994896e9cb5b0527616ac7713cfbc3c5c24d03c18c4b4463ec8db442619f946 -SIZE (gnome2/gnome-applets-2.12.3.tar.bz2) = 5515981 +MD5 (gnome2/gnome-applets-2.14.1.tar.bz2) = 1b5e834450812a6a3e7ab00652587ef4 +SHA256 (gnome2/gnome-applets-2.14.1.tar.bz2) = d8bf2dcebbe632c13f3268e6903640561be89a95cc8a8868453ca6600e962db9 +SIZE (gnome2/gnome-applets-2.14.1.tar.bz2) = 6608312 diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa index 48b84e4569f6..a5233ffe0e9d 100644 --- a/x11/gnomeapplets2/files/patch-aa +++ b/x11/gnomeapplets2/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Sat Jul 16 12:55:48 2005 -+++ configure Sat Jul 16 13:04:33 2005 -@@ -23272,8 +23272,7 @@ +--- configure.orig Sun Feb 12 14:11:21 2006 ++++ configure Sun Feb 12 14:12:00 2006 +@@ -23361,8 +23361,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -10,44 +10,35 @@ GNOMELOCALEDIR="$ac_define_dir" -@@ -25126,7 +25125,7 @@ +@@ -25392,7 +25391,7 @@ ;; # list of supported OS cores that do not use libapm -- i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*) -+ i386-*-freebsd*|amd64-*-freebsd*|*-*-netbsd*|*-*-openbsd*) +- i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu) ++ i386-*-freebsd*|amd64-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu) if -n "${OS_SYS}" ; then ACPIINC="-I${OS_SYS}" else -@@ -25406,7 +25405,7 @@ - APPLET_MIXER_FALSE= - fi - --if test x"$P_MIXER" == x"mixer"; then -+if test x"$P_MIXER" = x"mixer"; then - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - else -@@ -25983,7 +25982,7 @@ +@@ -26469,7 +26468,7 @@ fi -if test "x$SU_TOOL" == "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then +if test "x$SU_TOOL" = "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then - { echo "$as_me:$LINENO: WARNING: *** \`modemlights' applet will not be built ***" >&5 - echo "$as_me: WARNING: *** \`modemlights' applet will not be built ***" >&2;} + { echo "$as_me:$LINENO: WARNING: *** modemlights applet will not be built ***" >&5 + echo "$as_me: WARNING: *** modemlights applet will not be built ***" >&2;} else -@@ -26119,6 +26118,9 @@ - echo "${ECHO_T}yes" >&6 +@@ -26633,6 +26632,9 @@ + *linux*) build_cpufreq_applet=yes ;; + i386-*-freebsd*|amd64-*-freebsd*) + build_cpufreq_applet=yes + ;; *) - echo "warning: ${host} is not supported by cpufreq applet, not building" >&2 - build_cpufreq_applet=no -@@ -26409,7 +26411,7 @@ + { echo "$as_me:$LINENO: WARNING: ${host} is not supported by cpufreq applet, not building" >&5 + echo "$as_me: WARNING: ${host} is not supported by cpufreq applet, not building" >&2;} +@@ -27109,7 +27111,7 @@ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" @@ -56,7 +47,7 @@ pixmapsdir="${datadir}/pixmaps" -@@ -26423,8 +26425,7 @@ +@@ -27123,8 +27125,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -66,7 +57,7 @@ GNOME_ICONDIR="$ac_define_dir" -@@ -26436,8 +26437,7 @@ +@@ -27136,8 +27137,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -76,7 +67,7 @@ GNOME_PIXMAPSDIR="$ac_define_dir" -@@ -26449,8 +26449,7 @@ +@@ -27149,8 +27149,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -86,7 +77,7 @@ GNOME_GLADEDIR="$ac_define_dir" -@@ -26462,8 +26461,7 @@ +@@ -27162,8 +27161,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -96,7 +87,7 @@ DATADIR="$ac_define_dir" -@@ -26475,8 +26473,7 @@ +@@ -27175,8 +27173,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -106,7 +97,7 @@ SYSCONFDIR="$ac_define_dir" -@@ -26488,8 +26485,7 @@ +@@ -27188,8 +27185,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -116,7 +107,7 @@ LIBDIR="$ac_define_dir" -@@ -26501,8 +26497,7 @@ +@@ -27201,8 +27197,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' diff --git a/x11/gnomeapplets2/files/patch-drivemount_drive-button.c b/x11/gnomeapplets2/files/patch-drivemount_drive-button.c deleted file mode 100644 index f26e3121ee4b..000000000000 --- a/x11/gnomeapplets2/files/patch-drivemount_drive-button.c +++ /dev/null @@ -1,48 +0,0 @@ ---- drivemount/drive-button.c.orig Tue Aug 23 05:16:27 2005 -+++ drivemount/drive-button.c Tue Aug 23 20:37:43 2005 -@@ -24,6 +24,7 @@ - # include <config.h> - #endif - -+#include <string.h> - #include "drive-button.h" - #include <glib/gi18n.h> - #include <gdk/gdkkeysyms.h> -@@ -710,11 +711,13 @@ run_command (DriveButton *self, const ch - - GList *volumes; - GnomeVFSVolume *volume; -+ char *uri; -+ char *mount_path; - - volumes = gnome_vfs_drive_get_mounted_volumes (self->drive); - volume = GNOME_VFS_VOLUME (volumes->data); -- char *uri = gnome_vfs_volume_get_activation_uri (volume); -- char *mount_path = gnome_vfs_get_local_path_from_uri (uri); -+ uri = gnome_vfs_volume_get_activation_uri (volume); -+ mount_path = gnome_vfs_get_local_path_from_uri (uri); - g_free (uri); - - gnome_vfs_drive_get_display_name (self->drive); -@@ -794,6 +797,11 @@ drive_button_ensure_popup (DriveButton * - char *display_name, *tmp, *label; - int action; - GtkWidget *item; -+ GList *volumes; -+ GnomeVFSVolume *volume = NULL; -+ GnomeVFSDeviceType volume_type; -+ GCallback callback; -+ const char *action_icon = GTK_STOCK_OPEN; - - if (self->popup_menu) return; - -@@ -869,8 +877,7 @@ drive_button_ensure_popup (DriveButton * - g_free (display_name); - display_name = tmp; - -- GCallback callback = G_CALLBACK (open_drive); -- const char *action_icon = GTK_STOCK_OPEN; -+ callback = G_CALLBACK (open_drive); - - switch (device_type) { - case GNOME_VFS_DEVICE_TYPE_VIDEO_DVD: diff --git a/x11/gnomeapplets2/files/patch-gswitchit_gswitchit-applet.c b/x11/gnomeapplets2/files/patch-gswitchit_gswitchit-applet.c deleted file mode 100644 index 5abf18032f00..000000000000 --- a/x11/gnomeapplets2/files/patch-gswitchit_gswitchit-applet.c +++ /dev/null @@ -1,61 +0,0 @@ ---- gswitchit/gswitchit-applet.c.orig Sun Aug 7 18:07:33 2005 -+++ gswitchit/gswitchit-applet.c Sun Aug 7 18:10:07 2005 -@@ -331,6 +331,10 @@ GSwitchItAppletPrepareDrawing (GSwitchIt - XklConfigItem configItem; - GtkWidget *align, *label; - static GHashTable *shortDescrs = NULL; -+ gpointer pcounter = NULL; -+ char *prevLayoutName = NULL; -+ char *labelTitle = NULL; -+ int counter = 0; - if (group == 0) - shortDescrs = g_hash_table_new_full (g_str_hash, g_str_equal, - g_free, NULL); -@@ -363,10 +367,6 @@ GSwitchItAppletPrepareDrawing (GSwitchIt - if (layoutName == NULL) - layoutName = g_strdup ("?"); - -- gpointer pcounter = NULL; -- char *prevLayoutName = NULL; -- char *labelTitle = NULL; -- int counter = 0; - if (g_hash_table_lookup_extended (shortDescrs, layoutName, - (gpointer*)&prevLayoutName, &pcounter)) - { -@@ -599,6 +599,13 @@ GSwitchItAppletCmdPreview (BonoboUICompo - groupsLevels, groupsLevels + 1, groupsLevels + 2, groupsLevels + 3 }; - XklState *xklState = XklGetCurrentState (); - gpointer p = g_hash_table_lookup (globals.previewDialogs, GINT_TO_POINTER (xklState->group)); -+#ifdef HAVE_XKB -+ GladeXML *gladeData; -+ GtkWidget *dialog; -+ GtkWidget *kbdraw; -+ XkbComponentNamesRec componentNames; -+ XklConfigRec xklData; -+#endif - if (p != NULL) - { - /* existing window */ -@@ -606,11 +613,10 @@ GSwitchItAppletCmdPreview (BonoboUICompo - return; - } - #ifdef HAVE_XKB -- GladeXML *gladeData = glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade", "gswitchit_layout_view", NULL); -- GtkWidget *dialog = -+ gladeData = glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade", "gswitchit_layout_view", NULL); -+ dialog = - glade_xml_get_widget (gladeData, "gswitchit_layout_view"); -- GtkWidget *kbdraw = keyboard_drawing_new (); -- XkbComponentNamesRec componentNames; -+ kbdraw = keyboard_drawing_new (); - - if (xklState->group >= 0 && - xklState->group < g_slist_length (globals.groupNames)) -@@ -624,7 +630,6 @@ GSwitchItAppletCmdPreview (BonoboUICompo - - keyboard_drawing_set_groups_levels (KEYBOARD_DRAWING (kbdraw), pGroupsLevels); - -- XklConfigRec xklData; - XklConfigRecInit (&xklData); - if (XklConfigGetFromServer (&xklData)) - { diff --git a/x11/gnomeapplets2/files/patch-gweather_weather-iwin.c b/x11/gnomeapplets2/files/patch-gweather_weather-iwin.c deleted file mode 100644 index 14c0190b2eed..000000000000 --- a/x11/gnomeapplets2/files/patch-gweather_weather-iwin.c +++ /dev/null @@ -1,9 +0,0 @@ ---- gweather/weather-iwin.c.orig Tue Dec 21 18:42:38 2004 -+++ gweather/weather-iwin.c Tue Dec 21 18:42:47 2004 -@@ -1,5 +1,6 @@ - /* $Id: patch-gweather_weather-iwin.c,v 1.1 2004/12/22 00:06:21 marcus Exp $ */ - -+#include <sys/types.h> - #include <regex.h> - #include <gnome.h> - #include "weather.h" diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist index 964c3e8c541f..42368d3b5a50 100644 --- a/x11/gnomeapplets2/pkg-plist +++ b/x11/gnomeapplets2/pkg-plist @@ -3,6 +3,13 @@ bin/gswitchit-plugins-capplet %%BATTERY%%etc/sound/events/battstat_applet.soundlist include/libgswitchit/gswitchit_config.h include/libgswitchit/gswitchit_plugin.h +include/libgweather/gweather-gconf.h +include/libgweather/gweather-prefs.h +include/libgweather/weather.h +lib/libgweather.a +lib/libgweather.la +lib/libgweather.so +lib/libgweather.so.0 libdata/bonobo/servers/GNOME_AccessxStatusApplet.server %%BATTERY%%libdata/bonobo/servers/GNOME_BattstatApplet.server libdata/bonobo/servers/GNOME_CDPlayerApplet.server @@ -23,17 +30,16 @@ libdata/bonobo/servers/GNOME_Panel_TrashApplet.server libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server libdata/bonobo/servers/GNOME_StickyNotesApplet.server libdata/pkgconfig/gswitchit.pc +libdata/pkgconfig/gweather.pc libexec/accessx-status-applet %%BATTERY%%libexec/battstat-applet-2 libexec/charpick_applet2 %%CPUFREQ%%libexec/cpufreq-applet libexec/drivemount_applet2 libexec/geyes_applet2 -libexec/gnome-applets/mc-install-default-macros libexec/gnome-keyboard-applet libexec/gtik2_applet2 libexec/gweather-applet-2 -libexec/mini_commander_applet libexec/mixer_applet2 libexec/modem_applet libexec/multiload-applet-2 @@ -49,7 +55,6 @@ share/gnome/gnome-2.0/ui/GNOME_GSwitchItApplet.xml share/gnome/gnome-2.0/ui/GNOME_GWeatherApplet.xml share/gnome/gnome-2.0/ui/GNOME_GeyesApplet.xml share/gnome/gnome-2.0/ui/GNOME_GtikApplet.xml -share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml share/gnome/gnome-2.0/ui/GNOME_ModemLights.xml share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml @@ -74,7 +79,6 @@ share/gnome/gnome-applets/geyes/Horrid/horrid_pupil.png %%CPUFREQ%%share/gnome/gnome-applets/glade/cpufreq-preferences.glade share/gnome/gnome-applets/glade/gswitchit-plugins.glade share/gnome/gnome-applets/glade/gswitchit.glade -share/gnome/gnome-applets/glade/mini-commander.glade share/gnome/gnome-applets/glade/modemlights.glade share/gnome/gnome-applets/glade/stickynotes.glade share/gnome/gnome-applets/glade/trashapplet.glade @@ -93,6 +97,18 @@ share/gnome/help/accessx-status/C/figures/accessx_sticky-meta-key.png share/gnome/help/accessx-status/C/figures/accessx_sticky-shift-key.png share/gnome/help/accessx-status/C/figures/accessx_sticky-windows-key.png share/gnome/help/accessx-status/C/legal.xml +share/gnome/help/accessx-status/bg/accessx-status.xml +share/gnome/help/accessx-status/bg/figures/accessx-status-applet.png +share/gnome/help/accessx-status/bg/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/bg/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/bg/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/bg/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/bg/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/bg/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/bg/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/bg/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/bg/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/bg/figures/accessx_sticky-windows-key.png share/gnome/help/accessx-status/es/accessx-status.xml share/gnome/help/accessx-status/es/figures/accessx-status-applet.png share/gnome/help/accessx-status/es/figures/accessx-status-disabled.png @@ -148,12 +164,24 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-preferences.png %%BATTERY%%share/gnome/help/battstat/C/figures/context-menu.png %%BATTERY%%share/gnome/help/battstat/C/legal.xml +%%BATTERY%%share/gnome/help/battstat/bg/battstat.xml +%%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-applet-expanded.png +%%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-credits-hal.png +%%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-preferences.png +%%BATTERY%%share/gnome/help/battstat/bg/figures/context-menu.png %%BATTERY%%share/gnome/help/battstat/es/battstat.xml %%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet-expanded.png %%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet.png %%BATTERY%%share/gnome/help/battstat/es/figures/battstat-credits-hal.png %%BATTERY%%share/gnome/help/battstat/es/figures/battstat-preferences.png %%BATTERY%%share/gnome/help/battstat/es/figures/context-menu.png +%%BATTERY%%share/gnome/help/battstat/fr/battstat.xml +%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet-expanded.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-credits-hal.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-preferences.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/context-menu.png %%BATTERY%%share/gnome/help/battstat/uk/battstat.xml %%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet-expanded.png %%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet.png @@ -166,11 +194,21 @@ share/gnome/help/char-palette/C/figures/charpalette_chargroup.png share/gnome/help/char-palette/C/figures/charpick-preferences.png share/gnome/help/char-palette/C/figures/charpick_characters.png share/gnome/help/char-palette/C/legal.xml +share/gnome/help/char-palette/bg/char-palette.xml +share/gnome/help/char-palette/bg/figures/charpalette_applet.png +share/gnome/help/char-palette/bg/figures/charpalette_chargroup.png +share/gnome/help/char-palette/bg/figures/charpick-preferences.png +share/gnome/help/char-palette/bg/figures/charpick_characters.png 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-preferences.png share/gnome/help/char-palette/es/figures/charpick_characters.png +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-preferences.png +share/gnome/help/char-palette/fr/figures/charpick_characters.png 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 @@ -191,23 +229,6 @@ share/gnome/help/char-palette/uk/figures/charpalette_applet.png share/gnome/help/char-palette/uk/figures/charpalette_chargroup.png share/gnome/help/char-palette/uk/figures/charpick-preferences.png share/gnome/help/char-palette/uk/figures/charpick_characters.png -share/gnome/help/command-line/C/command-line.xml -share/gnome/help/command-line/C/figures/command-line.png -share/gnome/help/command-line/C/figures/prefs-macros.png -share/gnome/help/command-line/C/figures/prefs.png -share/gnome/help/command-line/C/legal.xml -share/gnome/help/command-line/es/command-line.xml -share/gnome/help/command-line/es/figures/command-line.png -share/gnome/help/command-line/es/figures/prefs-macros.png -share/gnome/help/command-line/es/figures/prefs.png -share/gnome/help/command-line/pt_BR/command-line.xml -share/gnome/help/command-line/pt_BR/figures/command-line.png -share/gnome/help/command-line/pt_BR/figures/prefs-macros.png -share/gnome/help/command-line/pt_BR/figures/prefs.png -share/gnome/help/command-line/uk/command-line.xml -share/gnome/help/command-line/uk/figures/command-line.png -share/gnome/help/command-line/uk/figures/prefs-macros.png -share/gnome/help/command-line/uk/figures/prefs.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/cpufreq-applet.xml %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-100.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-25.png @@ -229,6 +250,16 @@ share/gnome/help/command-line/uk/figures/prefs.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector-both.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/cpufreq-applet.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-100.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-25.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-50.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-preferences-smp.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-selector-both.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/cpufreq-applet.xml %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-100.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-25.png @@ -252,6 +283,12 @@ share/gnome/help/drivemount/es/figures/drivemount-applet_example.png share/gnome/help/drivemount/es/figures/drivemount-applet_mount.png share/gnome/help/drivemount/es/figures/drivemount-applet_open.png share/gnome/help/drivemount/es/figures/drivemount-applet_status.png +share/gnome/help/drivemount/fr/drivemount.xml +share/gnome/help/drivemount/fr/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/fr/figures/drivemount-applet_example.png +share/gnome/help/drivemount/fr/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/fr/figures/drivemount-applet_open.png +share/gnome/help/drivemount/fr/figures/drivemount-applet_status.png share/gnome/help/drivemount/it/drivemount.xml share/gnome/help/drivemount/it/figures/drivemount-applet_eject.png share/gnome/help/drivemount/it/figures/drivemount-applet_example.png @@ -273,10 +310,16 @@ share/gnome/help/drivemount/uk/figures/drivemount-applet_status.png 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/bg/figures/geyes_applet.png +share/gnome/help/geyes/bg/geyes.xml share/gnome/help/geyes/es/figures/geyes_applet.png share/gnome/help/geyes/es/geyes.xml +share/gnome/help/geyes/fr/figures/geyes_applet.png +share/gnome/help/geyes/fr/geyes.xml share/gnome/help/geyes/it/figures/geyes_applet.png share/gnome/help/geyes/it/geyes.xml +share/gnome/help/geyes/ru/figures/geyes_applet.png +share/gnome/help/geyes/ru/geyes.xml share/gnome/help/geyes/uk/figures/geyes_applet.png share/gnome/help/geyes/uk/geyes.xml share/gnome/help/gswitchit/C/gswitchit.xml @@ -289,6 +332,8 @@ share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml share/gnome/help/gtik2_applet2/C/legal.xml share/gnome/help/gtik2_applet2/es/figures/gtik_applet.png share/gnome/help/gtik2_applet2/es/gtik2_applet2.xml +share/gnome/help/gtik2_applet2/fr/figures/gtik_applet.png +share/gnome/help/gtik2_applet2/fr/gtik2_applet2.xml share/gnome/help/gtik2_applet2/uk/figures/gtik_applet.png share/gnome/help/gtik2_applet2/uk/gtik2_applet2.xml share/gnome/help/gweather/C/figures/gweather-details.png @@ -322,6 +367,36 @@ share/gnome/help/gweather/es/figures/stock_weather-snow.png share/gnome/help/gweather/es/figures/stock_weather-storm.png share/gnome/help/gweather/es/figures/stock_weather-sunny.png share/gnome/help/gweather/es/gweather.xml +share/gnome/help/gweather/fr/figures/gweather-details.png +share/gnome/help/gweather/fr/figures/gweather-menu-prefs.png +share/gnome/help/gweather/fr/figures/gweather-prefs-general.png +share/gnome/help/gweather/fr/figures/gweather-prefs-locations.png +share/gnome/help/gweather/fr/figures/gweather_applet.png +share/gnome/help/gweather/fr/figures/stock_weather-cloudy.png +share/gnome/help/gweather/fr/figures/stock_weather-few-clouds.png +share/gnome/help/gweather/fr/figures/stock_weather-fog.png +share/gnome/help/gweather/fr/figures/stock_weather-night-clear.png +share/gnome/help/gweather/fr/figures/stock_weather-night-few-clouds.png +share/gnome/help/gweather/fr/figures/stock_weather-showers.png +share/gnome/help/gweather/fr/figures/stock_weather-snow.png +share/gnome/help/gweather/fr/figures/stock_weather-storm.png +share/gnome/help/gweather/fr/figures/stock_weather-sunny.png +share/gnome/help/gweather/fr/gweather.xml +share/gnome/help/gweather/nl/figures/gweather-details.png +share/gnome/help/gweather/nl/figures/gweather-menu-prefs.png +share/gnome/help/gweather/nl/figures/gweather-prefs-general.png +share/gnome/help/gweather/nl/figures/gweather-prefs-locations.png +share/gnome/help/gweather/nl/figures/gweather_applet.png +share/gnome/help/gweather/nl/figures/stock_weather-cloudy.png +share/gnome/help/gweather/nl/figures/stock_weather-few-clouds.png +share/gnome/help/gweather/nl/figures/stock_weather-fog.png +share/gnome/help/gweather/nl/figures/stock_weather-night-clear.png +share/gnome/help/gweather/nl/figures/stock_weather-night-few-clouds.png +share/gnome/help/gweather/nl/figures/stock_weather-showers.png +share/gnome/help/gweather/nl/figures/stock_weather-snow.png +share/gnome/help/gweather/nl/figures/stock_weather-storm.png +share/gnome/help/gweather/nl/figures/stock_weather-sunny.png +share/gnome/help/gweather/nl/gweather.xml share/gnome/help/gweather/uk/figures/gweather-details.png share/gnome/help/gweather/uk/figures/gweather-menu-prefs.png share/gnome/help/gweather/uk/figures/gweather-prefs-general.png @@ -342,6 +417,10 @@ share/gnome/help/mixer_applet2/C/legal.xml share/gnome/help/mixer_applet2/C/mixer_applet2.xml share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/es/mixer_applet2.xml +share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png +share/gnome/help/mixer_applet2/fr/mixer_applet2.xml +share/gnome/help/mixer_applet2/it/figures/volumecontrol_applet.png +share/gnome/help/mixer_applet2/it/mixer_applet2.xml share/gnome/help/mixer_applet2/uk/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/uk/mixer_applet2.xml share/gnome/help/multiload/C/figures/multiload-preferences.png @@ -353,6 +432,10 @@ share/gnome/help/multiload/es/figures/multiload-preferences.png share/gnome/help/multiload/es/figures/system-monitor-applet_window.png share/gnome/help/multiload/es/figures/system_monitor.png share/gnome/help/multiload/es/multiload.xml +share/gnome/help/multiload/fr/figures/multiload-preferences.png +share/gnome/help/multiload/fr/figures/system-monitor-applet_window.png +share/gnome/help/multiload/fr/figures/system_monitor.png +share/gnome/help/multiload/fr/multiload.xml share/gnome/help/multiload/uk/figures/multiload-preferences.png share/gnome/help/multiload/uk/figures/system-monitor-applet_window.png share/gnome/help/multiload/uk/figures/system_monitor.png @@ -370,6 +453,12 @@ share/gnome/help/stickynotes_applet/es/figures/stickynotes-note-prefs.png share/gnome/help/stickynotes_applet/es/figures/stickynotes-prefs.png share/gnome/help/stickynotes_applet/es/figures/stickynotes_applet.png share/gnome/help/stickynotes_applet/es/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/fr/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/fr/figures/stickynote-right-menu-new.png +share/gnome/help/stickynotes_applet/fr/figures/stickynotes-note-prefs.png +share/gnome/help/stickynotes_applet/fr/figures/stickynotes-prefs.png +share/gnome/help/stickynotes_applet/fr/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/fr/stickynotes_applet.xml share/gnome/help/stickynotes_applet/uk/figures/stickynote-right-menu-lock.png share/gnome/help/stickynotes_applet/uk/figures/stickynote-right-menu-new.png share/gnome/help/stickynotes_applet/uk/figures/stickynotes-note-prefs.png @@ -385,39 +474,49 @@ share/gnome/help/trashapplet/fr/figures/trash-applet.png share/gnome/help/trashapplet/fr/trashapplet.xml share/gnome/help/trashapplet/it/figures/trash-applet.png share/gnome/help/trashapplet/it/trashapplet.xml +share/gnome/help/trashapplet/nl/figures/trash-applet.png +share/gnome/help/trashapplet/nl/trashapplet.xml share/gnome/help/trashapplet/pa/figures/trash-applet.png share/gnome/help/trashapplet/pa/trashapplet.xml +share/gnome/help/trashapplet/ru/figures/trash-applet.png +share/gnome/help/trashapplet/ru/trashapplet.xml share/gnome/help/trashapplet/uk/figures/trash-applet.png share/gnome/help/trashapplet/uk/trashapplet.xml share/gnome/omf/accessx-status/accessx-status-C.omf +share/gnome/omf/accessx-status/accessx-status-bg.omf share/gnome/omf/accessx-status/accessx-status-es.omf share/gnome/omf/accessx-status/accessx-status-fr.omf share/gnome/omf/accessx-status/accessx-status-it.omf share/gnome/omf/accessx-status/accessx-status-uk.omf %%BATTERY%%share/gnome/omf/battstat/battstat-C.omf +%%BATTERY%%share/gnome/omf/battstat/battstat-bg.omf %%BATTERY%%share/gnome/omf/battstat/battstat-es.omf +%%BATTERY%%share/gnome/omf/battstat/battstat-fr.omf %%BATTERY%%share/gnome/omf/battstat/battstat-uk.omf share/gnome/omf/char-palette/char-palette-C.omf +share/gnome/omf/char-palette/char-palette-bg.omf share/gnome/omf/char-palette/char-palette-es.omf +share/gnome/omf/char-palette/char-palette-fr.omf share/gnome/omf/char-palette/char-palette-it.omf share/gnome/omf/char-palette/char-palette-nl.omf share/gnome/omf/char-palette/char-palette-pt_BR.omf share/gnome/omf/char-palette/char-palette-uk.omf -share/gnome/omf/command-line/command-line-C.omf -share/gnome/omf/command-line/command-line-es.omf -share/gnome/omf/command-line/command-line-pt_BR.omf -share/gnome/omf/command-line/command-line-uk.omf %%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-C.omf %%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-es.omf +%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-nl.omf %%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-uk.omf share/gnome/omf/drivemount/drivemount-C.omf share/gnome/omf/drivemount/drivemount-es.omf +share/gnome/omf/drivemount/drivemount-fr.omf share/gnome/omf/drivemount/drivemount-it.omf share/gnome/omf/drivemount/drivemount-pa.omf share/gnome/omf/drivemount/drivemount-uk.omf share/gnome/omf/geyes/geyes-C.omf +share/gnome/omf/geyes/geyes-bg.omf share/gnome/omf/geyes/geyes-es.omf +share/gnome/omf/geyes/geyes-fr.omf share/gnome/omf/geyes/geyes-it.omf +share/gnome/omf/geyes/geyes-ru.omf share/gnome/omf/geyes/geyes-uk.omf share/gnome/omf/gswitchit/gswitchit-C.omf share/gnome/omf/gswitchit/gswitchit-es.omf @@ -425,24 +524,33 @@ share/gnome/omf/gswitchit/gswitchit-fr.omf share/gnome/omf/gswitchit/gswitchit-uk.omf share/gnome/omf/gtik2_applet2/gtik2_applet2-C.omf share/gnome/omf/gtik2_applet2/gtik2_applet2-es.omf +share/gnome/omf/gtik2_applet2/gtik2_applet2-fr.omf share/gnome/omf/gtik2_applet2/gtik2_applet2-uk.omf share/gnome/omf/gweather/gweather-C.omf share/gnome/omf/gweather/gweather-es.omf +share/gnome/omf/gweather/gweather-fr.omf +share/gnome/omf/gweather/gweather-nl.omf share/gnome/omf/gweather/gweather-uk.omf share/gnome/omf/mixer_applet2/mixer_applet2-C.omf share/gnome/omf/mixer_applet2/mixer_applet2-es.omf +share/gnome/omf/mixer_applet2/mixer_applet2-fr.omf +share/gnome/omf/mixer_applet2/mixer_applet2-it.omf share/gnome/omf/mixer_applet2/mixer_applet2-uk.omf share/gnome/omf/multiload/multiload-C.omf share/gnome/omf/multiload/multiload-es.omf +share/gnome/omf/multiload/multiload-fr.omf share/gnome/omf/multiload/multiload-uk.omf share/gnome/omf/stickynotes_applet/stickynotes_applet-C.omf share/gnome/omf/stickynotes_applet/stickynotes_applet-es.omf +share/gnome/omf/stickynotes_applet/stickynotes_applet-fr.omf share/gnome/omf/stickynotes_applet/stickynotes_applet-uk.omf share/gnome/omf/trashapplet/trashapplet-C.omf share/gnome/omf/trashapplet/trashapplet-es.omf share/gnome/omf/trashapplet/trashapplet-fr.omf share/gnome/omf/trashapplet/trashapplet-it.omf +share/gnome/omf/trashapplet/trashapplet-nl.omf share/gnome/omf/trashapplet/trashapplet-pa.omf +share/gnome/omf/trashapplet/trashapplet-ru.omf share/gnome/omf/trashapplet/trashapplet-uk.omf share/gnome/pixmaps/accessx-status-applet/ax-applet.png share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png @@ -583,7 +691,6 @@ share/icons/hicolor/48x48/apps/ax-applet.png share/icons/hicolor/48x48/apps/charpick.png share/icons/hicolor/48x48/apps/gnome-cpu.png share/icons/hicolor/48x48/apps/gnome-eyes.png -share/icons/hicolor/48x48/apps/gnome-mini-commander.png share/icons/hicolor/48x48/apps/gnome-modem.png share/icons/hicolor/48x48/apps/gnome-money.png share/icons/hicolor/48x48/apps/gswitchit-applet.png @@ -600,6 +707,7 @@ 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/dz/LC_MESSAGES/gnome-applets-2.0.mo share/locale/el/LC_MESSAGES/gnome-applets-2.0.mo share/locale/en_CA/LC_MESSAGES/gnome-applets-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-applets-2.0.mo @@ -621,7 +729,10 @@ share/locale/id/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/ka/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/ku/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/ky/LC_MESSAGES/gnome-applets-2.0.mo share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo share/locale/mk/LC_MESSAGES/gnome-applets-2.0.mo @@ -655,19 +766,28 @@ share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo share/locale/xh/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/zh_HK/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo -@unexec /bin/rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/xh 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/te/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/te 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/rw 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/48x48 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons 2>/dev/null || /usr/bin/true +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons @dirrm share/gnome/pixmaps/stickynotes %%CPUFREQ%%@dirrm share/gnome/pixmaps/cpufreq-applet @dirrm share/gnome/pixmaps/accessx-status-applet @@ -681,18 +801,21 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/omf/geyes @dirrm share/gnome/omf/drivemount %%CPUFREQ%%@dirrm share/gnome/omf/cpufreq-applet -@dirrm share/gnome/omf/command-line @dirrm share/gnome/omf/char-palette %%BATTERY%%@dirrm share/gnome/omf/battstat @dirrm share/gnome/omf/accessx-status @dirrm share/gnome/help/trashapplet/uk/figures @dirrm share/gnome/help/trashapplet/uk +@dirrm share/gnome/help/trashapplet/ru/figures +@dirrm share/gnome/help/trashapplet/ru @dirrm share/gnome/help/trashapplet/pa/figures @dirrm share/gnome/help/trashapplet/pa -@dirrm share/gnome/help/trashapplet/fr/figures -@dirrm share/gnome/help/trashapplet/fr +@dirrm share/gnome/help/trashapplet/nl/figures +@dirrm share/gnome/help/trashapplet/nl @dirrm share/gnome/help/trashapplet/it/figures @dirrm share/gnome/help/trashapplet/it +@dirrm share/gnome/help/trashapplet/fr/figures +@dirrm share/gnome/help/trashapplet/fr @dirrm share/gnome/help/trashapplet/es/figures @dirrm share/gnome/help/trashapplet/es @dirrm share/gnome/help/trashapplet/C/figures @@ -700,6 +823,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/trashapplet @dirrm share/gnome/help/stickynotes_applet/uk/figures @dirrm share/gnome/help/stickynotes_applet/uk +@dirrm share/gnome/help/stickynotes_applet/fr/figures +@dirrm share/gnome/help/stickynotes_applet/fr @dirrm share/gnome/help/stickynotes_applet/es/figures @dirrm share/gnome/help/stickynotes_applet/es @dirrm share/gnome/help/stickynotes_applet/C/figures @@ -707,6 +832,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/stickynotes_applet @dirrm share/gnome/help/multiload/uk/figures @dirrm share/gnome/help/multiload/uk +@dirrm share/gnome/help/multiload/fr/figures +@dirrm share/gnome/help/multiload/fr @dirrm share/gnome/help/multiload/es/figures @dirrm share/gnome/help/multiload/es @dirrm share/gnome/help/multiload/C/figures @@ -714,6 +841,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/multiload @dirrm share/gnome/help/mixer_applet2/uk/figures @dirrm share/gnome/help/mixer_applet2/uk +@dirrm share/gnome/help/mixer_applet2/it/figures +@dirrm share/gnome/help/mixer_applet2/it +@dirrm share/gnome/help/mixer_applet2/fr/figures +@dirrm share/gnome/help/mixer_applet2/fr @dirrm share/gnome/help/mixer_applet2/es/figures @dirrm share/gnome/help/mixer_applet2/es @dirrm share/gnome/help/mixer_applet2/C/figures @@ -721,6 +852,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/mixer_applet2 @dirrm share/gnome/help/gweather/uk/figures @dirrm share/gnome/help/gweather/uk +@dirrm share/gnome/help/gweather/nl/figures +@dirrm share/gnome/help/gweather/nl +@dirrm share/gnome/help/gweather/fr/figures +@dirrm share/gnome/help/gweather/fr @dirrm share/gnome/help/gweather/es/figures @dirrm share/gnome/help/gweather/es @dirrm share/gnome/help/gweather/C/figures @@ -728,6 +863,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/gweather @dirrm share/gnome/help/gtik2_applet2/uk/figures @dirrm share/gnome/help/gtik2_applet2/uk +@dirrm share/gnome/help/gtik2_applet2/fr/figures +@dirrm share/gnome/help/gtik2_applet2/fr @dirrm share/gnome/help/gtik2_applet2/es/figures @dirrm share/gnome/help/gtik2_applet2/es @dirrm share/gnome/help/gtik2_applet2/C/figures @@ -740,10 +877,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/gswitchit @dirrm share/gnome/help/geyes/uk/figures @dirrm share/gnome/help/geyes/uk +@dirrm share/gnome/help/geyes/ru/figures +@dirrm share/gnome/help/geyes/ru @dirrm share/gnome/help/geyes/it/figures @dirrm share/gnome/help/geyes/it +@dirrm share/gnome/help/geyes/fr/figures +@dirrm share/gnome/help/geyes/fr @dirrm share/gnome/help/geyes/es/figures @dirrm share/gnome/help/geyes/es +@dirrm share/gnome/help/geyes/bg/figures +@dirrm share/gnome/help/geyes/bg @dirrm share/gnome/help/geyes/C/figures @dirrm share/gnome/help/geyes/C @dirrm share/gnome/help/geyes @@ -753,6 +896,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/drivemount/pa @dirrm share/gnome/help/drivemount/it/figures @dirrm share/gnome/help/drivemount/it +@dirrm share/gnome/help/drivemount/fr/figures +@dirrm share/gnome/help/drivemount/fr @dirrm share/gnome/help/drivemount/es/figures @dirrm share/gnome/help/drivemount/es @dirrm share/gnome/help/drivemount/C/figures @@ -760,20 +905,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/drivemount %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet -@dirrm share/gnome/help/command-line/uk/figures -@dirrm share/gnome/help/command-line/uk -@dirrm share/gnome/help/command-line/pt_BR/figures -@dirrm share/gnome/help/command-line/pt_BR -@dirrm share/gnome/help/command-line/es/figures -@dirrm share/gnome/help/command-line/es -@dirrm share/gnome/help/command-line/C/figures -@dirrm share/gnome/help/command-line/C -@dirrm share/gnome/help/command-line @dirrm share/gnome/help/char-palette/uk/figures @dirrm share/gnome/help/char-palette/uk @dirrm share/gnome/help/char-palette/pt_BR/figures @@ -782,15 +920,23 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/char-palette/nl @dirrm share/gnome/help/char-palette/it/figures @dirrm share/gnome/help/char-palette/it +@dirrm share/gnome/help/char-palette/fr/figures +@dirrm share/gnome/help/char-palette/fr @dirrm share/gnome/help/char-palette/es/figures @dirrm share/gnome/help/char-palette/es +@dirrm share/gnome/help/char-palette/bg/figures +@dirrm share/gnome/help/char-palette/bg @dirrm share/gnome/help/char-palette/C/figures @dirrm share/gnome/help/char-palette/C @dirrm share/gnome/help/char-palette %%BATTERY%%@dirrm share/gnome/help/battstat/uk/figures %%BATTERY%%@dirrm share/gnome/help/battstat/uk +%%BATTERY%%@dirrm share/gnome/help/battstat/fr/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/fr %%BATTERY%%@dirrm share/gnome/help/battstat/es/figures %%BATTERY%%@dirrm share/gnome/help/battstat/es +%%BATTERY%%@dirrm share/gnome/help/battstat/bg/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/bg %%BATTERY%%@dirrm share/gnome/help/battstat/C/figures %%BATTERY%%@dirrm share/gnome/help/battstat/C %%BATTERY%%@dirrm share/gnome/help/battstat @@ -802,6 +948,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/accessx-status/fr @dirrm share/gnome/help/accessx-status/es/figures @dirrm share/gnome/help/accessx-status/es +@dirrm share/gnome/help/accessx-status/bg/figures +@dirrm share/gnome/help/accessx-status/bg @dirrm share/gnome/help/accessx-status/C/figures @dirrm share/gnome/help/accessx-status/C @dirrm share/gnome/help/accessx-status @@ -814,5 +962,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/gnome-applets/geyes/Bizarre @dirrm share/gnome/gnome-applets/geyes @dirrm share/gnome/gnome-applets -@dirrm libexec/gnome-applets +@dirrm include/libgweather @dirrm include/libgswitchit diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile index cc11fda744cc..f35b0147eb41 100644 --- a/x11/gnomedesktop/Makefile +++ b/x11/gnomedesktop/Makefile @@ -3,15 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnomedesktop/Makefile,v 1.74 2005/10/03 15:18:36 ahze Exp $ +# $MCom: ports/x11/gnomedesktop/Makefile,v 1.90 2006/04/13 07:52:40 bland Exp $ # PORTNAME= gnomedesktop -PORTVERSION= 2.12.3 -PORTREVISION= 1 +PORTVERSION= 2.14.1.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-desktop/2.12 +MASTER_SITE_SUBDIR= sources/gnome-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= gnome-desktop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,15 +20,15 @@ COMMENT= Additional UI API for GNOME 2 USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes -USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils \ ltverhack GNOME_DESKTOP_VERSION=2 +USE_GETTEXT= yes USE_GMAKE= yes USE_BISON= yes INSTALLS_OMF= yes INSTALLS_SHLIB= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" \ --with-kde-datadir=${LOCALBASE}/share CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo index cf73ed69cd6d..f6ae5c885bda 100644 --- a/x11/gnomedesktop/distinfo +++ b/x11/gnomedesktop/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-desktop-2.12.3.tar.bz2) = 387efe89249c61e512812568047be654 -SHA256 (gnome2/gnome-desktop-2.12.3.tar.bz2) = 9224155eff36fc4a3e0995adf61407c4cdf023c9efda80c6f857fbfbe27184b9 -SIZE (gnome2/gnome-desktop-2.12.3.tar.bz2) = 1036062 +MD5 (gnome2/gnome-desktop-2.14.1.1.tar.bz2) = f3ffb360681c1dc17d1856f19a59e88f +SHA256 (gnome2/gnome-desktop-2.14.1.1.tar.bz2) = 82c9de6ca3507dceb347deda069faf3dd22a412d3bf8944618fbb57656815244 +SIZE (gnome2/gnome-desktop-2.14.1.1.tar.bz2) = 1173965 diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist index ca229e89c004..fd92d45b9628 100644 --- a/x11/gnomedesktop/pkg-plist +++ b/x11/gnomedesktop/pkg-plist @@ -7,6 +7,20 @@ lib/libgnome-desktop-2.la lib/libgnome-desktop-2.so lib/libgnome-desktop-2.so.2 libdata/pkgconfig/gnome-desktop-2.0.pc +share/doc/gnome-desktop/GnomeDItemEdit.html +share/doc/gnome-desktop/GnomeHint.html +share/doc/gnome-desktop/ch01.html +share/doc/gnome-desktop/gnome-desktop-GnomeDesktopItem.html +share/doc/gnome-desktop/gnome-desktop.devhelp +share/doc/gnome-desktop/gnome-desktop.devhelp2 +share/doc/gnome-desktop/home.png +share/doc/gnome-desktop/index.html +share/doc/gnome-desktop/index.sgml +share/doc/gnome-desktop/intro.html +share/doc/gnome-desktop/left.png +share/doc/gnome-desktop/right.png +share/doc/gnome-desktop/style.css +share/doc/gnome-desktop/up.png share/gnome/applications/gnome-about.desktop share/gnome/gnome-about/gnome-64.png share/gnome/gnome-about/gnome-version.xml @@ -21,26 +35,44 @@ 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/fdl/es/fdl.xml +share/gnome/help/fdl/fr/fdl.xml +share/gnome/help/fdl/uk/fdl.xml share/gnome/help/gnome-feedback/C/gnome-feedback.xml share/gnome/help/gnome-feedback/es/gnome-feedback.xml +share/gnome/help/gnome-feedback/fr/gnome-feedback.xml +share/gnome/help/gnome-feedback/it/gnome-feedback.xml +share/gnome/help/gnome-feedback/uk/gnome-feedback.xml share/gnome/help/gpl/C/gpl.xml share/gnome/help/gpl/es/gpl.xml share/gnome/help/gpl/fi/gpl.xml +share/gnome/help/gpl/fr/gpl.xml share/gnome/help/gpl/pa/gpl.xml +share/gnome/help/gpl/uk/gpl.xml share/gnome/help/lgpl/C/lgpl.xml share/gnome/help/lgpl/es/lgpl.xml +share/gnome/help/lgpl/fr/lgpl.xml share/gnome/help/lgpl/pa/lgpl.xml +share/gnome/help/lgpl/uk/lgpl.xml share/gnome/omf/fdl/fdl-C.omf share/gnome/omf/fdl/fdl-es.omf +share/gnome/omf/fdl/fdl-fr.omf +share/gnome/omf/fdl/fdl-uk.omf share/gnome/omf/gnome-feedback/gnome-feedback-C.omf share/gnome/omf/gnome-feedback/gnome-feedback-es.omf +share/gnome/omf/gnome-feedback/gnome-feedback-fr.omf +share/gnome/omf/gnome-feedback/gnome-feedback-it.omf +share/gnome/omf/gnome-feedback/gnome-feedback-uk.omf share/gnome/omf/gpl/gpl-C.omf share/gnome/omf/gpl/gpl-es.omf share/gnome/omf/gpl/gpl-fi.omf +share/gnome/omf/gpl/gpl-fr.omf share/gnome/omf/gpl/gpl-pa.omf +share/gnome/omf/gpl/gpl-uk.omf share/gnome/omf/lgpl/lgpl-C.omf share/gnome/omf/lgpl/lgpl-es.omf +share/gnome/omf/lgpl/lgpl-fr.omf share/gnome/omf/lgpl/lgpl-pa.omf +share/gnome/omf/lgpl/lgpl-uk.omf share/gnome/pixmaps/apple-green.png share/gnome/pixmaps/apple-red.png share/gnome/pixmaps/gnome-aorta.png @@ -128,6 +160,7 @@ 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/dz/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/el/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/en_CA/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-desktop-2.0.mo @@ -150,9 +183,11 @@ share/locale/id/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/is/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/ka/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/ku/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/ky/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo @@ -200,24 +235,38 @@ share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo @dirrmtry share/locale/yo @dirrmtry share/locale/ug/LC_MESSAGES @dirrmtry share/locale/ug +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz @dirrm share/gnome/omf/lgpl @dirrm share/gnome/omf/gpl @dirrm share/gnome/omf/gnome-feedback @dirrm share/gnome/omf/fdl +@dirrm share/gnome/help/lgpl/uk @dirrm share/gnome/help/lgpl/pa +@dirrm share/gnome/help/lgpl/fr @dirrm share/gnome/help/lgpl/es +@dirrm share/gnome/help/gpl/uk @dirrm share/gnome/help/gpl/pa +@dirrm share/gnome/help/gpl/fr @dirrm share/gnome/help/gpl/fi @dirrm share/gnome/help/gpl/es -@dirrm share/gnome/help/fdl/es +@dirrm share/gnome/help/gnome-feedback/uk +@dirrm share/gnome/help/gnome-feedback/it +@dirrm share/gnome/help/gnome-feedback/fr @dirrm share/gnome/help/gnome-feedback/es @dirrm share/gnome/help/gnome-feedback/C @dirrm share/gnome/help/gnome-feedback +@dirrm share/gnome/help/fdl/uk +@dirrm share/gnome/help/fdl/fr +@dirrm share/gnome/help/fdl/es @dirrm share/gnome/gnome-about/headers +@dirrm share/doc/gnome-desktop @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 3771e92fc1d9..06d7aebc679d 100644 --- a/x11/gnomepanel/Makefile +++ b/x11/gnomepanel/Makefile @@ -3,15 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnomepanel/Makefile,v 1.109 2005/10/08 19:41:40 marcus Exp $ +# $MCom: ports/x11/gnomepanel/Makefile,v 1.128 2006/04/13 07:52:40 bland Exp $ # PORTNAME= gnomepanel -PORTVERSION= 2.12.3 -PORTREVISION= 1 +PORTVERSION= 2.14.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-panel/2.12 +MASTER_SITE_SUBDIR= sources/gnome-panel/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= gnome-panel-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,18 +19,18 @@ COMMENT= Panel component for the GNOME 2 Desktop RUN_DEPENDS= gnome-menu-editor:${PORTSDIR}/deskutils/gnome-menu-editor +USE_GETTEXT= yes USE_BZIP2= yes INSTALLS_OMF= yes INSTALLS_SHLIB= yes INSTALLS_ICONS= yes USE_X_PREFIX= yes -USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \ libwnck gnomemenus gnomedocutils ltverhack WANT_GNOME= yes GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share \ --with-kde-docdir=${LOCALBASE}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -59,8 +58,6 @@ CONFIGURE_ARGS+=--disable-eds .endif post-patch: - @${REINPLACE_CMD} -e 's|evolution.desktop|evolution-2.4.desktop|g' \ - ${WRKSRC}/gnome-panel/panel-default-setup.entries.in .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \ ( ${OSVERSION} < 503101 ) .for po in da.po it.po zh_CN.po zh_TW.po diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo index d40395919ba0..b8fcfffc8c2b 100644 --- a/x11/gnomepanel/distinfo +++ b/x11/gnomepanel/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-panel-2.12.3.tar.bz2) = 50a27090f7c667536e4bb5b077428853 -SHA256 (gnome2/gnome-panel-2.12.3.tar.bz2) = a819b55a9616954edb4f69587be570e1d9fc1516c7c63b4f7e67d0b7a3994902 -SIZE (gnome2/gnome-panel-2.12.3.tar.bz2) = 2464381 +MD5 (gnome2/gnome-panel-2.14.1.tar.bz2) = 1f5bc59c7c49cf90a797d892ab3ea05f +SHA256 (gnome2/gnome-panel-2.14.1.tar.bz2) = f7019f6f42ed323edcc5dc865638d7cb65e8c35a1403f67788a58cc8b3f5944e +SIZE (gnome2/gnome-panel-2.14.1.tar.bz2) = 2539786 diff --git a/x11/gnomepanel/files/patch-applets_clock_clock.c b/x11/gnomepanel/files/patch-applets_clock_clock.c index ccf5378b135f..981e4b4f2022 100644 --- a/x11/gnomepanel/files/patch-applets_clock_clock.c +++ b/x11/gnomepanel/files/patch-applets_clock_clock.c @@ -1,5 +1,5 @@ ---- applets/clock/clock.c.orig Tue Jan 13 11:55:58 2004 -+++ applets/clock/clock.c Wed Jan 14 15:43:39 2004 +--- applets/clock/clock.c.orig Mon Oct 24 02:25:11 2005 ++++ applets/clock/clock.c Tue Nov 22 02:47:05 2005 @@ -47,7 +47,9 @@ #include <dirent.h> #include <string.h> @@ -10,7 +10,7 @@ #include <panel-applet.h> #include <panel-applet-gconf.h> -@@ -539,7 +541,11 @@ +@@ -545,7 +547,11 @@ clock_locale_format (void) { const char *am; diff --git a/x11/gnomepanel/files/patch-gnome-panel_egg-recent-model.c b/x11/gnomepanel/files/patch-gnome-panel_egg-recent-model.c deleted file mode 100644 index c74812db8450..000000000000 --- a/x11/gnomepanel/files/patch-gnome-panel_egg-recent-model.c +++ /dev/null @@ -1,20 +0,0 @@ ---- gnome-panel/egg-recent-model.c.orig Wed Dec 21 16:58:46 2005 -+++ gnome-panel/egg-recent-model.c Wed Dec 21 16:59:03 2005 -@@ -942,7 +942,7 @@ - static gboolean - egg_recent_model_lock_file (FILE *file) - { --#ifdef F_TLOCK -+#ifdef HAVE_LOCKF - int fd; - gint try = 5; - -@@ -980,7 +980,7 @@ - static gboolean - egg_recent_model_unlock_file (FILE *file) - { --#ifdef F_TLOCK -+#ifdef HAVE_LOCKF - int fd; - - rewind (file); diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist index c7b9f1bfac1e..855d2c4a37a7 100644 --- a/x11/gnomepanel/pkg-plist +++ b/x11/gnomepanel/pkg-plist @@ -98,10 +98,6 @@ share/gnome/help/fish-applet-2/de/figures/fish_applet.png share/gnome/help/fish-applet-2/de/figures/fish_settings.png share/gnome/help/fish-applet-2/de/fish-applet-2.xml share/gnome/help/fish-applet-2/de/legal.xml -share/gnome/help/fish-applet-2/fr/figures/fish_applet.png -share/gnome/help/fish-applet-2/fr/figures/fish_settings.png -share/gnome/help/fish-applet-2/fr/fish-applet-2.xml -share/gnome/help/fish-applet-2/fr/legal.xml share/gnome/help/fish-applet-2/ja/figures/fish_applet.png share/gnome/help/fish-applet-2/ja/fish-applet-2.xml share/gnome/help/fish-applet-2/ja/legal.xml @@ -127,6 +123,9 @@ share/gnome/help/fish/C/legal.xml share/gnome/help/fish/es/figures/fish_applet.png share/gnome/help/fish/es/fish.xml share/gnome/help/fish/es/legal.xml +share/gnome/help/fish/fr/figures/fish_applet.png +share/gnome/help/fish/fr/fish.xml +share/gnome/help/fish/fr/legal.xml share/gnome/help/fish/it/figures/fish_applet.png share/gnome/help/fish/it/fish.xml share/gnome/help/fish/it/legal.xml @@ -147,7 +146,6 @@ share/gnome/help/window-list/es/figures/window_list_group_applet.png share/gnome/help/window-list/es/legal.xml share/gnome/help/window-list/es/window-list.xml share/gnome/help/window-list/fr/figures/window_list_applet.png -share/gnome/help/window-list/fr/figures/window_list_group.png share/gnome/help/window-list/fr/figures/window_list_group_applet.png share/gnome/help/window-list/fr/legal.xml share/gnome/help/window-list/fr/window-list.xml @@ -194,7 +192,6 @@ share/gnome/help/workspace-switcher/es/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/es/legal.xml share/gnome/help/workspace-switcher/es/workspace-switcher.xml share/gnome/help/workspace-switcher/fr/figures/workspace_switcher_applet.png -share/gnome/help/workspace-switcher/fr/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/fr/legal.xml share/gnome/help/workspace-switcher/fr/workspace-switcher.xml share/gnome/help/workspace-switcher/it/figures/workspace_switcher_applet.png @@ -229,8 +226,8 @@ share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl share/gnome/omf/clock/clock-C.omf share/gnome/omf/clock/clock-de.omf share/gnome/omf/clock/clock-es.omf -share/gnome/omf/clock/clock-it.omf share/gnome/omf/clock/clock-fr.omf +share/gnome/omf/clock/clock-it.omf share/gnome/omf/clock/clock-ja.omf share/gnome/omf/clock/clock-ko.omf share/gnome/omf/clock/clock-nl.omf @@ -242,31 +239,22 @@ share/gnome/omf/clock/clock-zh_CN.omf share/gnome/omf/clock/clock-zh_TW.omf share/gnome/omf/fish/fish-C.omf share/gnome/omf/fish/fish-es.omf +share/gnome/omf/fish/fish-fr.omf share/gnome/omf/fish/fish-it.omf share/gnome/omf/fish/fish-uk.omf -share/gnome/omf/gnome-panel/clock-de.omf -share/gnome/omf/gnome-panel/clock-fr.omf -share/gnome/omf/gnome-panel/clock-ja.omf -share/gnome/omf/gnome-panel/clock-ko.omf -share/gnome/omf/gnome-panel/clock-sv.omf -share/gnome/omf/gnome-panel/clock-zh_CN.omf -share/gnome/omf/gnome-panel/clock-zh_TW.omf share/gnome/omf/gnome-panel/fish-applet-2-de.omf -share/gnome/omf/gnome-panel/fish-applet-2-fr.omf share/gnome/omf/gnome-panel/fish-applet-2-ja.omf share/gnome/omf/gnome-panel/fish-applet-2-ko.omf share/gnome/omf/gnome-panel/fish-applet-2-sv.omf share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf share/gnome/omf/gnome-panel/window-list-de.omf -share/gnome/omf/gnome-panel/window-list-fr.omf share/gnome/omf/gnome-panel/window-list-ja.omf share/gnome/omf/gnome-panel/window-list-ko.omf share/gnome/omf/gnome-panel/window-list-sv.omf share/gnome/omf/gnome-panel/window-list-zh_CN.omf share/gnome/omf/gnome-panel/window-list-zh_TW.omf share/gnome/omf/gnome-panel/workspace-switcher-de.omf -share/gnome/omf/gnome-panel/workspace-switcher-fr.omf share/gnome/omf/gnome-panel/workspace-switcher-ja.omf share/gnome/omf/gnome-panel/workspace-switcher-ko.omf share/gnome/omf/gnome-panel/workspace-switcher-sv.omf @@ -274,10 +262,12 @@ share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf share/gnome/omf/window-list/window-list-C.omf share/gnome/omf/window-list/window-list-es.omf +share/gnome/omf/window-list/window-list-fr.omf share/gnome/omf/window-list/window-list-it.omf share/gnome/omf/window-list/window-list-uk.omf share/gnome/omf/workspace-switcher/workspace-switcher-C.omf share/gnome/omf/workspace-switcher/workspace-switcher-es.omf +share/gnome/omf/workspace-switcher/workspace-switcher-fr.omf share/gnome/omf/workspace-switcher/workspace-switcher-it.omf share/gnome/omf/workspace-switcher/workspace-switcher-nl.omf share/gnome/omf/workspace-switcher/workspace-switcher-uk.omf @@ -297,6 +287,7 @@ share/icons/hicolor/48x48/apps/gnome-fish.png share/icons/hicolor/48x48/apps/gnome-gegl.png share/icons/hicolor/48x48/apps/gnome-main-menu.png share/icons/hicolor/48x48/apps/panel-force-quit.png +share/icons/hicolor/48x48/apps/panel-separator.png share/locale/af/LC_MESSAGES/gnome-panel-2.0.mo share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo @@ -305,11 +296,13 @@ share/locale/be/LC_MESSAGES/gnome-panel-2.0.mo share/locale/bg/LC_MESSAGES/gnome-panel-2.0.mo share/locale/bn/LC_MESSAGES/gnome-panel-2.0.mo share/locale/bs/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/br/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ca/LC_MESSAGES/gnome-panel-2.0.mo share/locale/cs/LC_MESSAGES/gnome-panel-2.0.mo share/locale/cy/LC_MESSAGES/gnome-panel-2.0.mo share/locale/da/LC_MESSAGES/gnome-panel-2.0.mo share/locale/de/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/dz/LC_MESSAGES/gnome-panel-2.0.mo share/locale/el/LC_MESSAGES/gnome-panel-2.0.mo share/locale/en_CA/LC_MESSAGES/gnome-panel-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-panel-2.0.mo @@ -331,8 +324,10 @@ share/locale/hy/LC_MESSAGES/gnome-panel-2.0.mo share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/ka/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ku/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/ky/LC_MESSAGES/gnome-panel-2.0.mo share/locale/li/LC_MESSAGES/gnome-panel-2.0.mo share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo @@ -378,8 +373,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK @dirrmtry share/locale/yi/LC_MESSAGES @dirrmtry share/locale/yi @dirrmtry share/locale/xh/LC_MESSAGES @@ -394,8 +387,14 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrmtry share/locale/mr @dirrmtry share/locale/mi/LC_MESSAGES @dirrmtry share/locale/mi +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky +@dirrmtry share/locale/ka/LC_MESSAGES +@dirrmtry share/locale/ka @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy +@dirrmtry share/locale/br/LC_MESSAGES +@dirrmtry share/locale/br @dirrm share/gnome/panel/pixmaps @dirrm share/gnome/panel/glade @dirrm share/gnome/omf/workspace-switcher @@ -462,8 +461,6 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/fish-applet-2/ko @dirrm share/gnome/help/fish-applet-2/ja/figures @dirrm share/gnome/help/fish-applet-2/ja -@dirrm share/gnome/help/fish-applet-2/fr/figures -@dirrm share/gnome/help/fish-applet-2/fr @dirrm share/gnome/help/fish-applet-2/de/figures @dirrm share/gnome/help/fish-applet-2/de @dirrm share/gnome/help/fish-applet-2 @@ -471,6 +468,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/fish/uk @dirrm share/gnome/help/fish/it/figures @dirrm share/gnome/help/fish/it +@dirrm share/gnome/help/fish/fr/figures +@dirrm share/gnome/help/fish/fr @dirrm share/gnome/help/fish/es/figures @dirrm share/gnome/help/fish/es @dirrm share/gnome/help/fish/C/figures diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile index 13ebb139a868..fcdee9b27fe1 100644 --- a/x11/gnomesession/Makefile +++ b/x11/gnomesession/Makefile @@ -3,17 +3,17 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnomesession/Makefile,v 1.67 2005/10/31 19:46:29 adamw Exp $ +# $MCom: ports/x11/gnomesession/Makefile,v 1.83 2006/04/24 03:18:23 marcus Exp $ # PORTNAME= gnomesession -PORTVERSION= 2.12.0 -PORTREVISION= 1 +PORTVERSION= 2.14.1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ ${MASTER_SITE_LOCAL:S/$/:local/} \ http://people.FreeBSD.org/~adamw/images/gnome_splashes/2.12/:local -MASTER_SITE_SUBDIR= sources/gnome-session/2.12 \ +MASTER_SITE_SUBDIR= sources/gnome-session/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \ adamw/:local DISTNAME= gnome-session-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -24,9 +24,11 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= gnome@FreeBSD.org COMMENT= Session component for the GNOME 2 desktop +USE_GETTEXT= yes USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui +USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop +GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -45,9 +47,9 @@ post-extract: post-install: ${INSTALL_DATA} ${WRKSRC}/gnome-session/gnome-splash.png \ ${PREFIX}/share/gnome/pixmaps/splash/original-gnome-splash.png - ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \ - ${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png -.for splash in MaMBaNgGaoX-2.12.png adamw-piggy-2.12.png adamw-trophy-2.12.png andreas-slogan-2.12.png andreas-splash-2.12.png domix-splash-2.12.png domix-splash2-2.12.png mumija-2.12.png mumija2-2.12.png mumija3-2.12.png tremulant-2.12.png tremulant-blood-2.12.png tremulant-brushed-metal-2.12.png +# ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \ +# ${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png +.for splash in MaMBaNgGaoX-2.12.png adamw-piggy-2.12.png adamw-trophy-2.12.png andreas-slogan-2.12.png andreas-splash-2.12.png domix-splash-2.12.png domix-splash2-2.12.png mumija-2.12.png mumija2-2.12.png mumija3-2.12.png tremulant-2.12.png tremulant-blood-2.12.png tremulant-brushed-metal-2.12.png ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/${splash} \ ${PREFIX}/share/gnome/pixmaps/splash .endfor diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo index e4097a691860..f516a270fc4e 100644 --- a/x11/gnomesession/distinfo +++ b/x11/gnomesession/distinfo @@ -1,6 +1,6 @@ -MD5 (gnome2/gnome-session-2.12.0.tar.bz2) = 835e9340d23e139430224b931ff4c597 -SHA256 (gnome2/gnome-session-2.12.0.tar.bz2) = 713d1b56339dd19707edf056e08c2a0659a1430b56b4c12f759cc25f3664bb9b -SIZE (gnome2/gnome-session-2.12.0.tar.bz2) = 864397 +MD5 (gnome2/gnome-session-2.14.1.tar.bz2) = 0b7a0fa918f7d0565d6487d06fa4489d +SHA256 (gnome2/gnome-session-2.14.1.tar.bz2) = 5ff345552ed7f71540abbe1753e650c2a5bfad50f1acce958f664bf3a9d7e9c2 +SIZE (gnome2/gnome-session-2.14.1.tar.bz2) = 655320 MD5 (gnome2/freebsd-splashes-gnome-2.12.1.tar) = 4a098f0f2295c3333acff185d4bed5aa SHA256 (gnome2/freebsd-splashes-gnome-2.12.1.tar) = c7008fc8f43cf07e3d84cbf0bd9b2846fa31aaf37d4f97993b185b4155f8ee27 SIZE (gnome2/freebsd-splashes-gnome-2.12.1.tar) = 1280000 diff --git a/x11/gnomesession/files/patch-dbus b/x11/gnomesession/files/patch-dbus new file mode 100644 index 000000000000..edd18bfec916 --- /dev/null +++ b/x11/gnomesession/files/patch-dbus @@ -0,0 +1,429 @@ +--- gnome-session/main.c.orig Tue Mar 21 12:37:40 2006 ++++ gnome-session/main.c Sun Apr 23 23:05:38 2006 +@@ -43,6 +43,7 @@ + #include "command.h" + #include "splash-widget.h" + #include "util.h" ++#include "gsm-dbus.h" + #include "gsm-sound.h" + #include "gsm-gsd.h" + #include "gsm-keyring.h" +@@ -334,6 +335,7 @@ main (int argc, char *argv[]) + char *display_str; + char **versions; + GConfClient *gconf_client; ++ gboolean dbus_daemon_owner; + + if (getenv ("GSM_VERBOSE_DEBUG")) + gsm_set_verbose (TRUE); +@@ -415,6 +417,7 @@ main (int argc, char *argv[]) + fprintf (stderr, "SESSION_MANAGER=%s\n", getenv ("SESSION_MANAGER")); + gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-session.png"); + ++ dbus_daemon_owner = gsm_dbus_daemon_start (); + + /* Make sure children see the right value for DISPLAY. This is + useful if --display was specified on the command line. */ +@@ -495,6 +498,9 @@ main (int argc, char *argv[]) + gsm_sound_logout (); + + gsm_keyring_daemon_stop (); ++ ++ if (dbus_daemon_owner) ++ gsm_dbus_daemon_stop (); + + g_object_unref (gconf_client); + gsm_shutdown_gconfd (); +--- gnome-session/gsm-dbus.h.orig Sun Apr 23 23:01:47 2006 ++++ gnome-session/gsm-dbus.h Sun Apr 23 23:00:53 2006 +@@ -0,0 +1,27 @@ ++/* gsm-dbus.h - Handle the dbus-daemon process. ++ * ++ * Copyright (c) 2006 Julio M. Merino Vidal <jmmv@NetBSD.org> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2, or (at your option) ++ * any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++ * 02111-1307, USA. ++ */ ++ ++#ifndef GSM_DBUS_H ++#define GSM_DBUS_H ++ ++gboolean gsm_dbus_daemon_start (void); ++void gsm_dbus_daemon_stop (void); ++ ++#endif /* GSM_DBUS_H */ +--- gnome-session/gsm-dbus.c.orig Sun Apr 23 23:09:40 2006 ++++ gnome-session/gsm-dbus.c Sun Apr 23 23:10:21 2006 +@@ -0,0 +1,360 @@ ++/* gsm-dbus.c - Handle the dbus-daemon process. ++ * ++ * Copyright (c) 2006 Julio M. Merino Vidal <jmmv@NetBSD.org> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2, or (at your option) ++ * any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++ * 02111-1307, USA. ++ */ ++ ++#if HAVE_CONFIG_H ++#include "config.h" ++#endif ++ ++#include <sys/wait.h> ++ ++#include <errno.h> ++#include <fcntl.h> ++#include <limits.h> ++#include <signal.h> ++#include <stdlib.h> ++#include <unistd.h> ++ ++#include <glib.h> ++#include <glib/gprintf.h> ++ ++#include "gsm-dbus.h" ++ ++static pid_t dbus_daemon_pid = 0; ++ ++static gboolean have_dbus_daemon (void); ++static gboolean have_running_instance (void); ++static int read_line (int, char *, ssize_t); ++static void start_child (int, int); ++static void start_parent (int, int, pid_t); ++ ++/* --------------------------------------------------------------------- ++ * PUBLIC INTERFACE ++ * --------------------------------------------------------------------- */ ++ ++/* ++ * Starts the dbus-daemon if not already running and attaches it to the ++ * current environment by defining DBUS_SESSION_BUS_ADDRESS. Returns ++ * true if we launch a new dbus-daemon so that we know if we have to call ++ * gsm_dbus_daemon_stop later on or not. ++ * ++ * This function can only be called if dbus-daemon is not already running ++ * (i.e., if gnome-session is starting up or if gsm_dbus_daemon_stop was ++ * previously called). ++ */ ++gboolean ++gsm_dbus_daemon_start (void) ++{ ++ int address_pipe[2]; ++ int pid_pipe[2]; ++ pid_t tmp_pid; ++ ++ g_assert (dbus_daemon_pid == 0); ++ ++ if (have_running_instance ()) ++ return FALSE; ++ if (! have_dbus_daemon ()) ++ return FALSE; ++ ++ /* ++ * At this point, dbus-daemon is not running for the current session ++ * and the binary exists. Spawn it. ++ */ ++ ++ if (pipe (address_pipe) == -1) ++ { ++ g_printerr ("Cannot create address pipe for dbus-daemon\n"); ++ return FALSE; ++ } ++ ++ if (pipe (pid_pipe) == -1) ++ { ++ close (address_pipe[0]); ++ close (address_pipe[1]); ++ g_printerr ("Cannot create pid pipe for dbus-daemon\n"); ++ return FALSE; ++ } ++ ++ tmp_pid = fork (); ++ if (tmp_pid == -1) ++ { ++ close (address_pipe[0]); ++ close (address_pipe[1]); ++ close (pid_pipe[0]); ++ close (pid_pipe[1]); ++ g_printerr ("Cannot create child process for dbus-daemon\n"); ++ return FALSE; ++ } ++ else if (tmp_pid == 0) ++ { ++ close (address_pipe[0]); ++ close (pid_pipe[0]); ++ start_child (address_pipe[1], pid_pipe[1]); ++ /* NOTREACHED */ ++ } ++ else ++ { ++ close (address_pipe[1]); ++ close (pid_pipe[1]); ++ start_parent (address_pipe[0], pid_pipe[0], tmp_pid); ++ } ++ ++ g_assert (dbus_daemon_pid != 0); ++ return TRUE; ++} ++ ++/* ++ * Stops the running dbus-daemon. Can only be called if we own the process; ++ * i.e., if gsm_dbus_daemon_start returned true. ++ */ ++void ++gsm_dbus_daemon_stop (void) ++{ ++ g_assert (dbus_daemon_pid != 0); ++ ++ if (kill (dbus_daemon_pid, SIGTERM) == -1) ++ g_printerr ("Failed to kill dbus-daemon (pid %d)\n", ++ dbus_daemon_pid); ++ else ++ { ++ dbus_daemon_pid = 0; ++ g_unsetenv ("DBUS_SESSION_BUS_ADDRESS"); ++ } ++} ++ ++/* --------------------------------------------------------------------- ++ * PRIVATE FUNCTIONS ++ * --------------------------------------------------------------------- */ ++ ++/* ++ * Check whether the dbus-daemon binary is in the path and raise an ++ * appropriate error message if it is not. ++ */ ++static gboolean ++have_dbus_daemon (void) ++{ ++ gboolean result; ++ gchar *file_name; ++ ++ file_name = g_find_program_in_path ("dbus-daemon"); ++ if (file_name == NULL) ++ g_printerr ("Cannot locate dbus-daemon\n"); ++ result = file_name != NULL; ++ g_free (file_name); ++ ++ return result; ++} ++ ++/* ++ * Check whether there is a dbus-daemon session instance currently running ++ * (not spawned by us). If there is, do nothing and return TRUE. ++ */ ++static gboolean ++have_running_instance (void) ++{ ++ const gchar *address_str; ++ ++ g_assert (dbus_daemon_pid == 0); ++ ++ address_str = g_getenv ("DBUS_SESSION_BUS_ADDRESS"); ++ return address_str != NULL; ++} ++ ++/* ++ * Reads a single line from the given file descriptor and stores it in the ++ * buffer pointed to by 'buf'. ++ * ++ * After finding the first new line character, the function returns. This ++ * is to avoid reading dbus' pid multiple times from its file descriptor. ++ */ ++static int ++read_line (int fd, char *buf, ssize_t bufsize) ++{ ++ gboolean discard, done; ++ ssize_t bytes; ++ ++ bytes = 0; ++ discard = FALSE; ++ done = FALSE; ++ do ++ { ++ ssize_t i, result; ++ ++ result = read (fd, &buf[bytes], bufsize - bytes); ++ if (result < 0) ++ return -1; ++ else if (result > 0 && !discard) ++ { ++ if (bytes + result < bufsize) ++ bytes += result; ++ else ++ bytes = bufsize - 1; ++ } ++ else ++ done = TRUE; ++ ++ for (i = 0; !discard && i < bytes; i++) ++ if (buf[i] == '\n') ++ { ++ buf[i] = '\0'; ++ discard = TRUE; ++ } ++ } ++ while (!done); ++ ++ g_assert (bytes >= 0 && bytes < bufsize); ++ buf[bytes] = '\0'; ++ ++ return bytes; ++} ++ ++/* ++ * Code run by the child process after the fork to launch dbus-demon. ++ * ++ * As the child, this execs dbus-daemon, connecting it to the appropriate ++ * file descriptors. ++ */ ++static void ++start_child (int address_fd, int pid_fd) ++{ ++ gchar address_str[16]; ++ gchar pid_str[16]; ++ int fd; ++ long open_max; ++ ++ open_max = sysconf (_SC_OPEN_MAX); ++ for (fd = 0; fd < open_max; fd++) ++ { ++ if (fd != STDIN_FILENO && fd != STDOUT_FILENO && fd != STDERR_FILENO && ++ fd != address_fd && fd != pid_fd) ++ fcntl (fd, F_SETFD, FD_CLOEXEC); ++ } ++ ++ g_snprintf (address_str, sizeof (address_str), "%d", address_fd); ++ g_snprintf (pid_str, sizeof (pid_str), "%d", pid_fd); ++ ++ execlp ("dbus-daemon", ++ "dbus-daemon", ++ "--fork", ++ "--print-address", address_str, ++ "--print-pid", pid_str, ++ "--session", ++ NULL); ++ ++ g_printerr ("Could not launch dbus-daemon\n"); ++ ++ exit (EXIT_FAILURE); ++} ++ ++/* ++ * Code run by the parent process after the fork to launch dbus-demon. ++ * ++ * As the parent, this waits until dbus-daemon forks itself again and ++ * fetches its address and pid to later take its ownership. ++ */ ++static void ++start_parent (int address_fd, int pid_fd, pid_t child) ++{ ++ char address_str[256]; ++ char pid_str[256]; ++ char *tmp_ep; ++ int exitstat; ++ unsigned long tmp_num; ++ ssize_t bytes; ++ ++ g_assert (child > 0); ++ ++ /* ++ * dbus-daemon --fork causes our child process to exit prematurely ++ * because it is not the real daemon. See if it worked correctly ++ * and clean it up to avoid a zombie. ++ * ++ * Life could be much easier if dbus-daemon had a --no-fork flag. ++ * But, as it hasn't it, we cannot assume that it will not fork, ++ * because we have no control over its configuration file. ++ */ ++ if (waitpid (child, &exitstat, 0) == -1) ++ { ++ close (address_fd); ++ close (pid_fd); ++ ++ g_printerr ("Failed to get dbus-daemon status\n"); ++ return; ++ } ++ if (!WIFEXITED (exitstat) || WEXITSTATUS (exitstat) != EXIT_SUCCESS) ++ { ++ close (address_fd); ++ close (pid_fd); ++ ++ g_printerr ("dbus-daemon exited unexpectedly\n"); ++ return; ++ } ++ ++ /* ++ * Fetch dbus-daemon address. ++ */ ++ bytes = read_line (address_fd, address_str, sizeof (address_str)); ++ if (bytes == -1 || bytes == 0) ++ { ++ close (address_fd); ++ close (pid_fd); ++ ++ g_printerr ("Failed to get dbus-daemon's address\n"); ++ return; ++ } ++ ++ /* ++ * Fetch dbus-daemon pid. ++ */ ++ bytes = read_line (pid_fd, pid_str, sizeof (pid_str)); ++ if (bytes == -1 || bytes == 0) ++ { ++ close (address_fd); ++ close (pid_fd); ++ ++ g_printerr ("Failed to get dbus-daemon's pid\n"); ++ return; ++ } ++ ++ close (address_fd); ++ close (pid_fd); ++ ++ /* ++ * Convert the string printed in pid_fd to a pid value. Do the usual ++ * strtoul dance to check for a valid number. ++ */ ++ errno = 0; ++ tmp_num = strtoul(pid_str, &tmp_ep, 10); ++ if (pid_str[0] == '\0' || *tmp_ep != '\0') ++ { ++ g_printerr ("dbus-daemon pid invalid (not a number)\n"); ++ return; ++ } ++ if (errno == ERANGE && tmp_num == ULONG_MAX) ++ { ++ g_printerr ("dbus-daemon pid invalid (out of range)\n"); ++ return; ++ } ++ dbus_daemon_pid = tmp_num; ++ ++ /* ++ * All right! Tell our future children about the new born dbus-daemon. ++ */ ++ g_setenv ("DBUS_SESSION_BUS_ADDRESS", address_str, TRUE); ++} diff --git a/x11/gnomesession/files/patch-gnome-session_Makefile.in b/x11/gnomesession/files/patch-gnome-session_Makefile.in index ed0b6ac56866..a80f576a42a3 100644 --- a/x11/gnomesession/files/patch-gnome-session_Makefile.in +++ b/x11/gnomesession/files/patch-gnome-session_Makefile.in @@ -1,11 +1,37 @@ ---- gnome-session/Makefile.in.orig Tue Nov 30 14:07:39 2004 -+++ gnome-session/Makefile.in Tue Nov 30 14:07:51 2004 -@@ -209,7 +209,7 @@ +--- gnome-session/Makefile.in.orig Sun Apr 23 23:01:30 2006 ++++ gnome-session/Makefile.in Sun Apr 23 23:06:41 2006 +@@ -67,7 +67,7 @@ am_gnome_session_OBJECTS = manager.$(OBJ + remote.$(OBJEXT) logout.$(OBJEXT) splash-widget.$(OBJEXT) \ + gsm-xrandr.$(OBJEXT) gsm-keyring.$(OBJEXT) gsm-gsd.$(OBJEXT) \ + gsm-protocol.$(OBJEXT) gsm-remote-desktop.$(OBJEXT) \ +- gsm-sound.$(OBJEXT) gsm-at-startup.$(OBJEXT) \ ++ gsm-sound.$(OBJEXT) gsm-at-startup.$(OBJEXT) gsm-dbus.$(OBJEXT) \ + gsm-multiscreen.$(OBJEXT) gsm-typebuiltins.$(OBJEXT) \ + gdm-logout-action.$(OBJEXT) util.$(OBJEXT) $(am__objects_1) + gnome_session_OBJECTS = $(am_gnome_session_OBJECTS) +@@ -310,7 +310,7 @@ sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ target_alias = @target_alias@ NULL = - -defaultdir = $(datadir)/gnome +defaultdir = $(datadir) - INCLUDES = \ $(GNOME_SESSION_CFLAGS) \ + $(STANDARD_PROPERTIES_CFLAGS) \ +@@ -386,6 +386,8 @@ gnome_session_SOURCES = \ + splash-widget.h \ + gsm-xrandr.c \ + gsm-xrandr.h \ ++ gsm-dbus.c \ ++ gsm-dbus.h \ + gsm-keyring.c \ + gsm-keyring.h \ + gsm-gsd.c \ +@@ -610,6 +612,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-sound.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-typebuiltins.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-xrandr.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-dbus.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ice.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logout-test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logout.Po@am__quote@ diff --git a/x11/gnomesession/files/patch-gnome-session_gsm-at-startup.c b/x11/gnomesession/files/patch-gnome-session_gsm-at-startup.c new file mode 100644 index 000000000000..da4950d05c95 --- /dev/null +++ b/x11/gnomesession/files/patch-gnome-session_gsm-at-startup.c @@ -0,0 +1,10 @@ +--- gnome-session/gsm-at-startup.c.orig Mon Apr 17 18:00:38 2006 ++++ gnome-session/gsm-at-startup.c Mon Apr 17 18:00:57 2006 +@@ -2,6 +2,7 @@ + #include <string.h> + + #include "gsm-at-startup.h" ++#include "util.h" + + #include <gdk/gdk.h> + #include <libgnome/libgnome.h> diff --git a/x11/gnomesession/files/patch-gnome-session_gsm-xrandr.c b/x11/gnomesession/files/patch-gnome-session_gsm-xrandr.c new file mode 100644 index 000000000000..8eae88069c51 --- /dev/null +++ b/x11/gnomesession/files/patch-gnome-session_gsm-xrandr.c @@ -0,0 +1,10 @@ +--- gnome-session/gsm-xrandr.c.orig Mon Apr 17 17:59:38 2006 ++++ gnome-session/gsm-xrandr.c Mon Apr 17 17:59:50 2006 +@@ -3,6 +3,7 @@ + #include <gconf/gconf-client.h> + + #include "gsm-xrandr.h" ++#include "util.h" + + #ifdef HAVE_RANDR + #include <stdio.h> diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist index 17d898f1ee23..882701bbd503 100644 --- a/x11/gnomesession/pkg-plist +++ b/x11/gnomesession/pkg-plist @@ -34,6 +34,7 @@ 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/dz/LC_MESSAGES/gnome-session-2.0.mo share/locale/el/LC_MESSAGES/gnome-session-2.0.mo share/locale/en_CA/LC_MESSAGES/gnome-session-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-session-2.0.mo @@ -56,8 +57,10 @@ 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/ka/LC_MESSAGES/gnome-session-2.0.mo share/locale/kn/LC_MESSAGES/gnome-session-2.0.mo share/locale/ko/LC_MESSAGES/gnome-session-2.0.mo +share/locale/ku/LC_MESSAGES/gnome-session-2.0.mo share/locale/lt/LC_MESSAGES/gnome-session-2.0.mo share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo share/locale/mi/LC_MESSAGES/gnome-session-2.0.mo @@ -94,7 +97,14 @@ share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo +share/locale/zh_HK/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo -@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile index c1c5d6bcecde..a8578865b0f7 100644 --- a/x11/gnometerminal/Makefile +++ b/x11/gnometerminal/Makefile @@ -3,24 +3,24 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnometerminal/Makefile,v 1.52 2005/10/14 20:39:58 adamw Exp $ +# $MCom: ports/x11/gnometerminal/Makefile,v 1.69 2006/04/13 07:52:41 bland Exp $ # PORTNAME= gnometerminal -PORTVERSION= 2.12.0 +PORTVERSION= 2.14.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-terminal/2.12 +MASTER_SITE_SUBDIR= sources/gnome-terminal/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= gnome-terminal-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Terminal component for the GNOME 2 Desktop +USE_GETTEXT= yes USE_BZIP2= yes INSTALLS_OMF= yes USE_X_PREFIX= yes -USE_REINPLACE= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui vte GNU_CONFIGURE= yes diff --git a/x11/gnometerminal/distinfo b/x11/gnometerminal/distinfo index 951536429cf1..73abf3d6655d 100644 --- a/x11/gnometerminal/distinfo +++ b/x11/gnometerminal/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-terminal-2.12.0.tar.bz2) = 483c9397dd165845e2528a80e3df6dfc -SHA256 (gnome2/gnome-terminal-2.12.0.tar.bz2) = e515509f2d07ab1360723b70345ac18b44c5525abc31cce48f135b43fbb444cc -SIZE (gnome2/gnome-terminal-2.12.0.tar.bz2) = 1684178 +MD5 (gnome2/gnome-terminal-2.14.1.tar.bz2) = 7abe60db5359c88392d2b4f0d5587ef5 +SHA256 (gnome2/gnome-terminal-2.14.1.tar.bz2) = c1e7674bb75343db89ad6769bc2d7ecfb115d9eda02035d374d8c4d952091647 +SIZE (gnome2/gnome-terminal-2.14.1.tar.bz2) = 1783063 diff --git a/x11/gnometerminal/files/patch-src::terminal-screen.c b/x11/gnometerminal/files/patch-src::terminal-screen.c deleted file mode 100644 index 0198f748c37d..000000000000 --- a/x11/gnometerminal/files/patch-src::terminal-screen.c +++ /dev/null @@ -1,23 +0,0 @@ ---- src/terminal-screen.c.orig Fri Jul 1 20:37:58 2005 -+++ src/terminal-screen.c Tue Jul 5 13:26:21 2005 -@@ -248,16 +248,16 @@ terminal_screen_init (TerminalScreen *sc - #define URLPATH "/[" PATHCHARS "]*[^]'.}>) \t\r\n,\\\"]" - - terminal_widget_match_add (screen->priv->term, -- "\\<(" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_AS_IS); -+ "[[:<:]](" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_AS_IS); - - terminal_widget_match_add (screen->priv->term, -- "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_DEFAULT_TO_HTTP); -+ "[[:<:]]<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_DEFAULT_TO_HTTP); - - terminal_widget_match_add (screen->priv->term, -- "\\<(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", FLAVOR_MAILTO); -+ "[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", FLAVOR_MAILTO); - - terminal_widget_match_add (screen->priv->term, -- "\\<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS); -+ "[[:<:]]<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS); - - - terminal_screen_setup_dnd (screen); diff --git a/x11/gnometerminal/files/patch-src_terminal-screen.c b/x11/gnometerminal/files/patch-src_terminal-screen.c new file mode 100644 index 000000000000..0f5c397cbadd --- /dev/null +++ b/x11/gnometerminal/files/patch-src_terminal-screen.c @@ -0,0 +1,33 @@ +--- src/terminal-screen.c.orig Sun Apr 2 18:27:36 2006 ++++ src/terminal-screen.c Sun Apr 2 18:42:41 2006 +@@ -278,22 +278,22 @@ terminal_screen_init (TerminalScreen *sc + #define URLPATH "/[" PATHCHARS "]*[^]'.}>) \t\r\n,\\\"]" + + terminal_widget_match_add (screen->priv->term, +- "\\<" SCHEME "//(" USER "@)?[" HOSTCHARS ".]+" +- "(:[0-9]+)?(" URLPATH ")?\\>", FLAVOR_AS_IS); ++ "[[:<:]]" SCHEME "//(" USER "@)?[" HOSTCHARS ".]+" ++ "(:[0-9]+)?(" URLPATH ")?[[:>:]]", FLAVOR_AS_IS); + + terminal_widget_match_add (screen->priv->term, +- "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+" +- "(:[0-9]+)?(" URLPATH ")?\\>", ++ "[[:<:]](www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+" ++ "(:[0-9]+)?(" URLPATH ")?[[:>:]]", + FLAVOR_DEFAULT_TO_HTTP); + + terminal_widget_match_add (screen->priv->term, +- "\\<(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9]" +- "[a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", ++ "[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9]" ++ "[a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+[[:>:]]", + FLAVOR_EMAIL); + + terminal_widget_match_add (screen->priv->term, +- "\\<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+" +- "@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS); ++ "[[:<:]]news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+" ++ "@[" HOSTCHARS ".]+(:[0-9]+)?[[:>:]]", FLAVOR_AS_IS); + + terminal_screen_setup_dnd (screen); + diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist index 721f659b8cd1..380a52ff47c5 100644 --- a/x11/gnometerminal/pkg-plist +++ b/x11/gnometerminal/pkg-plist @@ -1,6 +1,5 @@ bin/gnome-terminal 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 @@ -8,6 +7,11 @@ share/gnome/help/gnome-terminal/C/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/C/figures/terminal_window.png share/gnome/help/gnome-terminal/C/gnome-terminal.xml share/gnome/help/gnome-terminal/C/legal.xml +share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-default.png +share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-tabbed.png +share/gnome/help/gnome-terminal/bg/figures/terminal_window.png +share/gnome/help/gnome-terminal/bg/gnome-terminal.xml +share/gnome/help/gnome-terminal/bg/legal.xml share/gnome/help/gnome-terminal/de/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/de/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/de/figures/terminal_window.png @@ -63,6 +67,7 @@ share/gnome/help/gnome-terminal/zh_TW/figures/terminal_window.png share/gnome/help/gnome-terminal/zh_TW/gnome-terminal.xml share/gnome/help/gnome-terminal/zh_TW/legal.xml share/gnome/omf/gnome-terminal/gnome-terminal-C.omf +share/gnome/omf/gnome-terminal/gnome-terminal-bg.omf share/gnome/omf/gnome-terminal/gnome-terminal-de.omf share/gnome/omf/gnome-terminal/gnome-terminal-es.omf share/gnome/omf/gnome-terminal/gnome-terminal-fr.omf @@ -82,11 +87,13 @@ 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/bs/LC_MESSAGES/gnome-terminal.mo +share/locale/br/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/dz/LC_MESSAGES/gnome-terminal.mo share/locale/el/LC_MESSAGES/gnome-terminal.mo share/locale/en_CA/LC_MESSAGES/gnome-terminal.mo share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo @@ -108,6 +115,7 @@ 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 +share/locale/ku/LC_MESSAGES/gnome-terminal.mo share/locale/lt/LC_MESSAGES/gnome-terminal.mo share/locale/lv/LC_MESSAGES/gnome-terminal.mo share/locale/mk/LC_MESSAGES/gnome-terminal.mo @@ -141,6 +149,12 @@ share/locale/wa/LC_MESSAGES/gnome-terminal.mo share/locale/xh/LC_MESSAGES/gnome-terminal.mo share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/br/LC_MESSAGES +@dirrmtry share/locale/br @dirrm share/gnome/omf/gnome-terminal @dirrm share/gnome/help/gnome-terminal/zh_TW/figures @dirrm share/gnome/help/gnome-terminal/zh_TW @@ -164,6 +178,8 @@ 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/bg/figures +@dirrm share/gnome/help/gnome-terminal/bg @dirrm share/gnome/help/gnome-terminal/C/figures @dirrm share/gnome/help/gnome-terminal/C @dirrm share/gnome/help/gnome-terminal diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 5804300133cd..8356bc83aa48 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -3,15 +3,14 @@ # Whom: Yukihiro Nakai <Nakai@technologist.com> # # $FreeBSD$ -# $MCom: ports/x11/libgnome/Makefile,v 1.61 2005/09/07 16:21:36 marcus Exp $ +# $MCom: ports/x11/libgnome/Makefile,v 1.78 2006/04/13 07:52:41 bland Exp $ # PORTNAME= libgnome -PORTVERSION= 2.12.0.1 -PORTREVISION= 1 +PORTVERSION= 2.14.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -20,16 +19,16 @@ COMMENT= Libraries for GNOME, a GNU desktop environment BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper +USE_GETTEXT= yes USE_BZIP2= yes USE_X_PREFIX= yes -USE_REINPLACE= yes USE_XPM= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack esound \ gnomevfs2 libxslt ltverhack USE_BISON= yes INSTALLS_SHLIB= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -54,6 +53,7 @@ GCONF_SCHEMAS= desktop_gnome_accessibility_keyboard.schemas \ post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/libgnome/libgnome-2.0.pc.in + @${REINPLACE_CMD} -e '/^$$/d' ${WRKSRC}/po/POTFILES.in .if defined(NOPORTDOCS) @${REINPLACE_CMD} -e 's|gnome-data po doc|gnome-data po|g' \ ${WRKSRC}/Makefile.in diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo index 3405e21e69b3..42ba5385693f 100644 --- a/x11/libgnome/distinfo +++ b/x11/libgnome/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnome-2.12.0.1.tar.bz2) = f239a7ab132d2ec9039bb2537cca1e92 -SHA256 (gnome2/libgnome-2.12.0.1.tar.bz2) = f4cd8f6df545328b2b969d1fa8762d5398f7f6c517c7fac730f1d2196e4cf624 -SIZE (gnome2/libgnome-2.12.0.1.tar.bz2) = 955235 +MD5 (gnome2/libgnome-2.14.1.tar.bz2) = bf53815df10db62bbf00defd4100b8d8 +SHA256 (gnome2/libgnome-2.14.1.tar.bz2) = 4d091bd00e01392d65a856ca5b9fe648025c5988c844d58b25341a275b760fa7 +SIZE (gnome2/libgnome-2.14.1.tar.bz2) = 995007 diff --git a/x11/libgnome/files/patch-ag b/x11/libgnome/files/patch-ag index 2caedc380d59..ceb23de357f2 100644 --- a/x11/libgnome/files/patch-ag +++ b/x11/libgnome/files/patch-ag @@ -1,7 +1,3 @@ - -$FreeBSD$ - $MCom: ports/x11/libgnome/files/patch-ag,v 1.18 2005/07/04 00:15:01 marcus Exp $ - --- libgnome/gnome-util.c 2002/03/19 17:16:21 1.1 +++ libgnome/gnome-util.c 2002/03/19 17:21:31 @@ -67,11 +67,11 @@ diff --git a/x11/libgnome/files/patch-libgnome_gnome-program.c b/x11/libgnome/files/patch-libgnome_gnome-program.c index 9dd33f9c2838..70ecbfd8fce0 100644 --- a/x11/libgnome/files/patch-libgnome_gnome-program.c +++ b/x11/libgnome/files/patch-libgnome_gnome-program.c @@ -1,6 +1,6 @@ ---- libgnome/gnome-program.c.orig Mon May 31 16:37:02 2004 -+++ libgnome/gnome-program.c Mon May 31 16:37:05 2004 -@@ -895,17 +895,17 @@ +--- libgnome/gnome-program.c.orig Tue Apr 4 06:55:12 2006 ++++ libgnome/gnome-program.c Mon Apr 10 21:07:02 2006 +@@ -936,17 +936,17 @@ gnome_program_locate_file (GnomeProgram attr_rel = ""; break; case GNOME_FILE_DOMAIN_DATADIR: @@ -21,7 +21,7 @@ attr_name = GNOME_PARAM_GNOME_DATADIR; attr_rel = "/pixmaps"; break; -@@ -917,7 +917,7 @@ +@@ -958,7 +958,7 @@ gnome_program_locate_file (GnomeProgram case GNOME_FILE_DOMAIN_HELP: prefix_rel = "/share/gnome/help"; attr_name = GNOME_PARAM_GNOME_DATADIR; @@ -30,7 +30,7 @@ break; case GNOME_FILE_DOMAIN_APP_LIBDIR: prefix_rel = "/lib"; -@@ -926,19 +926,19 @@ +@@ -967,19 +967,19 @@ gnome_program_locate_file (GnomeProgram search_path = FALSE; break; case GNOME_FILE_DOMAIN_APP_DATADIR: @@ -53,18 +53,3 @@ attr_name = GNOME_PARAM_APP_DATADIR; attr_rel = "/pixmaps"; search_path = FALSE; -@@ -959,12 +959,12 @@ - - attr_name = GNOME_PARAM_APP_DATADIR; - -- len = strlen ("/gnome/help/") + -+ len = strlen ("/help/") + - strlen (program->_priv->app_id) + 1; - attr_rel = g_alloca (len); - if (attr_rel == NULL /* bad things */) - return NULL; -- g_snprintf (attr_rel, len, "/gnome/help/%s", program->_priv->app_id); -+ g_snprintf (attr_rel, len, "/help/%s", program->_priv->app_id); - - search_path = FALSE; - break; diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in index adb5cef39218..7377058cd835 100644 --- a/x11/libgnome/files/pkg-deinstall.in +++ b/x11/libgnome/files/pkg-deinstall.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.2 2005/07/04 00:15:01 marcus Exp $ +# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.4 2005/11/16 00:04:58 ahze Exp $ # # Restore gconf keys of gnomevfs2. diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index 6f57b338254e..0b3acb8a4c1f 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -84,6 +84,7 @@ share/locale/is/LC_MESSAGES/libgnome-2.0.mo share/locale/it/LC_MESSAGES/libgnome-2.0.mo share/locale/ja/LC_MESSAGES/libgnome-2.0.mo share/locale/ko/LC_MESSAGES/libgnome-2.0.mo +share/locale/ku/LC_MESSAGES/libgnome-2.0.mo share/locale/lt/LC_MESSAGES/libgnome-2.0.mo share/locale/lv/LC_MESSAGES/libgnome-2.0.mo share/locale/mk/LC_MESSAGES/libgnome-2.0.mo @@ -95,6 +96,7 @@ share/locale/ne/LC_MESSAGES/libgnome-2.0.mo share/locale/nl/LC_MESSAGES/libgnome-2.0.mo share/locale/nn/LC_MESSAGES/libgnome-2.0.mo share/locale/no/LC_MESSAGES/libgnome-2.0.mo +share/locale/or/LC_MESSAGES/libgnome-2.0.mo share/locale/pa/LC_MESSAGES/libgnome-2.0.mo share/locale/pl/LC_MESSAGES/libgnome-2.0.mo share/locale/pt/LC_MESSAGES/libgnome-2.0.mo @@ -112,13 +114,19 @@ share/locale/sv/LC_MESSAGES/libgnome-2.0.mo share/locale/ta/LC_MESSAGES/libgnome-2.0.mo share/locale/th/LC_MESSAGES/libgnome-2.0.mo share/locale/tr/LC_MESSAGES/libgnome-2.0.mo +share/locale/tt/LC_MESSAGES/libgnome-2.0.mo share/locale/uk/LC_MESSAGES/libgnome-2.0.mo share/locale/vi/LC_MESSAGES/libgnome-2.0.mo share/locale/wa/LC_MESSAGES/libgnome-2.0.mo share/locale/xh/LC_MESSAGES/libgnome-2.0.mo share/locale/yi/LC_MESSAGES/libgnome-2.0.mo share/locale/zh_CN/LC_MESSAGES/libgnome-2.0.mo +share/locale/zh_HK/LC_MESSAGES/libgnome-2.0.mo share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/tt/LC_MESSAGES +@dirrmtry share/locale/tt @dirrm include/libgnome-2.0/libgnome @dirrm include/libgnome-2.0 %%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile index bb5718bcde0f..6b31a4b44390 100644 --- a/x11/libgnomemm26/Makefile +++ b/x11/libgnomemm26/Makefile @@ -3,15 +3,14 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/x11/libgnomemm26/Makefile,v 1.5 2005/10/14 20:39:59 adamw Exp $ +# $MCom: ports/x11/libgnomemm26/Makefile,v 1.8 2006/04/13 07:52:41 bland Exp $ # PORTNAME= libgnomemm -PORTVERSION= 2.12.1 -PORTREVISION= 1 +PORTVERSION= 2.14.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= bland@FreeBSD.org diff --git a/x11/libgnomemm26/distinfo b/x11/libgnomemm26/distinfo index 36e559f05d8d..b8a51c48cfa3 100644 --- a/x11/libgnomemm26/distinfo +++ b/x11/libgnomemm26/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomemm-2.12.1.tar.bz2) = 00882f5aba3f4c7c37c17497628d5eeb -SHA256 (gnome2/libgnomemm-2.12.1.tar.bz2) = 398e36b0457ecdf7bec62b2d6ce86d9d55f7db03bc7dc8ed9397cfe902cc3522 -SIZE (gnome2/libgnomemm-2.12.1.tar.bz2) = 250409 +MD5 (gnome2/libgnomemm-2.14.0.tar.bz2) = 8e31905b9732fdb099381569736829fa +SHA256 (gnome2/libgnomemm-2.14.0.tar.bz2) = 66cc9f99f074bcc9c2c014880ff14d0e8ec15067fff0a9f6fe7ca79f65f65500 +SIZE (gnome2/libgnomemm-2.14.0.tar.bz2) = 250757 diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile index cfdcb9e8545f..dfbba72b23bc 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -3,27 +3,27 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/yelp/Makefile,v 1.70 2005/11/28 07:30:27 ahze Exp $ +# $MCom: ports/x11/yelp/Makefile,v 1.88 2006/04/16 13:36:49 ahze Exp $ # PORTNAME= yelp -PORTVERSION= 2.12.2 -PORTREVISION= 2 +PORTVERSION= 2.14.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A help browser for the GNOME 2 desktop -USE_GECKO= firefox mozilla seamonkey thunderbird +USE_GECKO= firefox seamonkey xulrunner # mozilla +USE_GETTEXT= yes USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils \ + libgnomeprintui GNU_CONFIGURE= yes INSTALLS_ICONS= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -33,22 +33,7 @@ MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias" GCONF_SCHEMAS= yelp.schemas -OPTIONS= MAN "Enable man page support" off \ - INFO "Enable GNU info support" off - .include <bsd.port.pre.mk> .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" -.if ${OSVERSION} < 500000 -USE_GCC= 2.95 -.endif - -.if defined(WITH_MAN) -CONFIGURE_ARGS+=--enable-man -.endif - -.if defined(WITH_INFO) -CONFIGURE_ARGS+=--enable-info -.endif - .include <bsd.port.post.mk> diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo index e7956303c668..fd4d68591cd9 100644 --- a/x11/yelp/distinfo +++ b/x11/yelp/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/yelp-2.12.2.tar.bz2) = e229529aa1dacfd269024511e2c12ad2 -SHA256 (gnome2/yelp-2.12.2.tar.bz2) = ee56b279131f7d2c40da332eece9eee4a7fc4ec36425d29f201038f8a2f382c9 -SIZE (gnome2/yelp-2.12.2.tar.bz2) = 815933 +MD5 (gnome2/yelp-2.14.1.tar.bz2) = 3d569f8e9372bc88c7f9fca6a94388a9 +SHA256 (gnome2/yelp-2.14.1.tar.bz2) = db7a8c89bfdfc720a4d3f1e6883a4ac547ac039b4a32bb2b5e7546ac4d051a64 +SIZE (gnome2/yelp-2.14.1.tar.bz2) = 765371 diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist index 6bf7535b9df2..d92f49b29f35 100644 --- a/x11/yelp/pkg-plist +++ b/x11/yelp/pkg-plist @@ -14,15 +14,18 @@ share/gnome/yelp/icons/yelp-watermark-blockquote-201C.png share/gnome/yelp/icons/yelp-watermark-blockquote-201D.png share/gnome/yelp/icons/yelp-watermark-blockquote-201E.png share/gnome/yelp/important_docs.xml +share/gnome/yelp/info.xml share/gnome/yelp/man.xml share/gnome/yelp/scrollkeeper.xml share/gnome/yelp/toc.xml +share/gnome/yelp/ui/yelp-search-ui.xml share/gnome/yelp/ui/yelp-ui.xml share/gnome/yelp/ui/yelp.glade share/gnome/yelp/xslt/db-title.xsl share/gnome/yelp/xslt/db2html.xsl share/gnome/yelp/xslt/info2html.xsl share/gnome/yelp/xslt/man2html.xsl +share/gnome/yelp/xslt/search2html.xsl share/gnome/yelp/xslt/toc2html.xsl share/gnome/yelp/xslt/yelp-common.xsl share/gnome/yelp/yelp.js @@ -34,12 +37,14 @@ share/locale/az/LC_MESSAGES/yelp.mo share/locale/be/LC_MESSAGES/yelp.mo share/locale/bg/LC_MESSAGES/yelp.mo share/locale/bn/LC_MESSAGES/yelp.mo +share/locale/br/LC_MESSAGES/yelp.mo share/locale/bs/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/dz/LC_MESSAGES/yelp.mo share/locale/el/LC_MESSAGES/yelp.mo share/locale/en_CA/LC_MESSAGES/yelp.mo share/locale/en_GB/LC_MESSAGES/yelp.mo @@ -65,6 +70,7 @@ share/locale/ka/LC_MESSAGES/yelp.mo share/locale/kn/LC_MESSAGES/yelp.mo share/locale/ko/LC_MESSAGES/yelp.mo share/locale/ku/LC_MESSAGES/yelp.mo +share/locale/ky/LC_MESSAGES/yelp.mo share/locale/li/LC_MESSAGES/yelp.mo share/locale/lt/LC_MESSAGES/yelp.mo share/locale/lv/LC_MESSAGES/yelp.mo @@ -79,6 +85,7 @@ share/locale/nl/LC_MESSAGES/yelp.mo share/locale/nn/LC_MESSAGES/yelp.mo share/locale/no/LC_MESSAGES/yelp.mo share/locale/nso/LC_MESSAGES/yelp.mo +share/locale/or/LC_MESSAGES/yelp.mo share/locale/pa/LC_MESSAGES/yelp.mo share/locale/pl/LC_MESSAGES/yelp.mo share/locale/pt/LC_MESSAGES/yelp.mo @@ -102,6 +109,7 @@ share/locale/vi/LC_MESSAGES/yelp.mo share/locale/wa/LC_MESSAGES/yelp.mo share/locale/xh/LC_MESSAGES/yelp.mo share/locale/zh_CN/LC_MESSAGES/yelp.mo +share/locale/zh_HK/LC_MESSAGES/yelp.mo share/locale/zh_TW/LC_MESSAGES/yelp.mo share/locale/zu/LC_MESSAGES/yelp.mo @dirrmtry share/locale/zu/LC_MESSAGES @@ -112,8 +120,14 @@ share/locale/zu/LC_MESSAGES/yelp.mo @dirrmtry share/locale/nso @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/br/LC_MESSAGES +@dirrmtry share/locale/br @dirrm share/gnome/yelp/xslt @dirrm share/gnome/yelp/ui @dirrm share/gnome/yelp/icons diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index 8cd704bb0960..54f9389aa1fd 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -3,14 +3,14 @@ # Whom: Franz Klammer <klammer@webonaut.com> # # $FreeBSD$ -# $MCom: ports/x11/zenity/Makefile,v 1.46 2005/10/30 23:07:09 marcus Exp $ +# $MCom: ports/x11/zenity/Makefile,v 1.59 2006/04/13 07:52:41 bland Exp $ # PORTNAME= zenity -PORTVERSION= 2.12.1 +PORTVERSION= 2.14.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -24,8 +24,8 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomecanvas gconf2 gnomedocutils USE_BZIP2= yes +USE_GETTEXT= yes GNU_CONFIGURE= yes -USE_REINPLACE= yes INSTALLS_OMF= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo index f49bf113c9e5..366d8490807c 100644 --- a/x11/zenity/distinfo +++ b/x11/zenity/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/zenity-2.12.1.tar.bz2) = d8fbcf326e42b5dae70a570fad024947 -SHA256 (gnome2/zenity-2.12.1.tar.bz2) = e200d3d355b5c49c055e69033d856445fd729775eb72dc58b56b604b28775a46 -SIZE (gnome2/zenity-2.12.1.tar.bz2) = 896002 +MD5 (gnome2/zenity-2.14.1.tar.bz2) = 2445b652a93581436164cb6ad5e9c36b +SHA256 (gnome2/zenity-2.14.1.tar.bz2) = bc10b972cb0c200134e64a90eaa0c1498aa88864a777a1ce8db5127306fa81eb +SIZE (gnome2/zenity-2.14.1.tar.bz2) = 1066815 diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist index c29da1612040..d7aa84178de2 100644 --- a/x11/zenity/pkg-plist +++ b/x11/zenity/pkg-plist @@ -13,6 +13,18 @@ share/gnome/help/zenity/C/figures/zenity-text-screenshot.png share/gnome/help/zenity/C/figures/zenity-warning-screenshot.png share/gnome/help/zenity/C/legal.xml share/gnome/help/zenity/C/zenity.xml +share/gnome/help/zenity/bg/figures/zenity-calendar-screenshot.png +share/gnome/help/zenity/bg/figures/zenity-entry-screenshot.png +share/gnome/help/zenity/bg/figures/zenity-error-screenshot.png +share/gnome/help/zenity/bg/figures/zenity-fileselection-screenshot.png +share/gnome/help/zenity/bg/figures/zenity-information-screenshot.png +share/gnome/help/zenity/bg/figures/zenity-list-screenshot.png +share/gnome/help/zenity/bg/figures/zenity-notification-screenshot.png +share/gnome/help/zenity/bg/figures/zenity-progress-screenshot.png +share/gnome/help/zenity/bg/figures/zenity-question-screenshot.png +share/gnome/help/zenity/bg/figures/zenity-text-screenshot.png +share/gnome/help/zenity/bg/figures/zenity-warning-screenshot.png +share/gnome/help/zenity/bg/zenity.xml share/gnome/help/zenity/es/figures/zenity-calendar-screenshot.png share/gnome/help/zenity/es/figures/zenity-entry-screenshot.png share/gnome/help/zenity/es/figures/zenity-error-screenshot.png @@ -50,6 +62,7 @@ share/gnome/help/zenity/uk/figures/zenity-text-screenshot.png share/gnome/help/zenity/uk/figures/zenity-warning-screenshot.png share/gnome/help/zenity/uk/zenity.xml share/gnome/omf/zenity/zenity-C.omf +share/gnome/omf/zenity/zenity-bg.omf share/gnome/omf/zenity/zenity-es.omf share/gnome/omf/zenity/zenity-fr.omf share/gnome/omf/zenity/zenity-uk.omf @@ -64,6 +77,7 @@ share/gnome/zenity/zenity-file.png share/gnome/zenity/zenity-list.png share/gnome/zenity/zenity-notification.png share/gnome/zenity/zenity-progress.png +share/gnome/zenity/zenity-scale.png share/gnome/zenity/zenity-text.png share/gnome/zenity/zenity.glade share/gnome/zenity/zenity.png @@ -79,6 +93,7 @@ share/locale/cs/LC_MESSAGES/zenity-0.1.mo share/locale/cy/LC_MESSAGES/zenity-0.1.mo share/locale/da/LC_MESSAGES/zenity-0.1.mo share/locale/de/LC_MESSAGES/zenity-0.1.mo +share/locale/dz/LC_MESSAGES/zenity-0.1.mo share/locale/el/LC_MESSAGES/zenity-0.1.mo share/locale/en_CA/LC_MESSAGES/zenity-0.1.mo share/locale/en_GB/LC_MESSAGES/zenity-0.1.mo @@ -99,8 +114,10 @@ share/locale/id/LC_MESSAGES/zenity-0.1.mo share/locale/is/LC_MESSAGES/zenity-0.1.mo share/locale/it/LC_MESSAGES/zenity-0.1.mo share/locale/ja/LC_MESSAGES/zenity-0.1.mo +share/locale/ka/LC_MESSAGES/zenity-0.1.mo share/locale/kn/LC_MESSAGES/zenity-0.1.mo share/locale/ko/LC_MESSAGES/zenity-0.1.mo +share/locale/ku/LC_MESSAGES/zenity-0.1.mo share/locale/lt/LC_MESSAGES/zenity-0.1.mo share/locale/mi/LC_MESSAGES/zenity-0.1.mo share/locale/mk/LC_MESSAGES/zenity-0.1.mo @@ -112,6 +129,7 @@ share/locale/ne/LC_MESSAGES/zenity-0.1.mo share/locale/nl/LC_MESSAGES/zenity-0.1.mo share/locale/nn/LC_MESSAGES/zenity-0.1.mo share/locale/no/LC_MESSAGES/zenity-0.1.mo +share/locale/or/LC_MESSAGES/zenity-0.1.mo share/locale/pa/LC_MESSAGES/zenity-0.1.mo share/locale/pl/LC_MESSAGES/zenity-0.1.mo share/locale/pt/LC_MESSAGES/zenity-0.1.mo @@ -136,6 +154,10 @@ share/locale/zh_CN/LC_MESSAGES/zenity-0.1.mo share/locale/zh_TW/LC_MESSAGES/zenity-0.1.mo @dirrmtry share/locale/ug/LC_MESSAGES @dirrmtry share/locale/ug +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz @dirrm share/gnome/zenity/clothes @dirrm share/gnome/zenity @dirrm share/gnome/omf/zenity @@ -145,6 +167,8 @@ share/locale/zh_TW/LC_MESSAGES/zenity-0.1.mo @dirrm share/gnome/help/zenity/fr @dirrm share/gnome/help/zenity/es/figures @dirrm share/gnome/help/zenity/es +@dirrm share/gnome/help/zenity/bg/figures +@dirrm share/gnome/help/zenity/bg @dirrm share/gnome/help/zenity/C/figures @dirrm share/gnome/help/zenity/C @dirrm share/gnome/help/zenity |