diff options
Diffstat (limited to 'x11')
62 files changed, 1863 insertions, 1272 deletions
diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile index 2f2cd7e375af..30b15e42f286 100644 --- a/x11/fast-user-switch-applet/Makefile +++ b/x11/fast-user-switch-applet/Makefile @@ -3,10 +3,10 @@ # 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 $ +# $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.17 2006/09/04 22:53:22 ahze Exp $ PORTNAME= fast-user-switch-applet -PORTVERSION= 2.14.2 +PORTVERSION= 2.16.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -16,15 +16,15 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Fast user switching applet for GNOME USE_BZIP2= yes +USE_XLIB= yes USE_GETTEXT= yes -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomehack intlhack gnomeprefix gtk20 gnomepanel GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-gdm-config=${X11BASE}/etc/gdm/custom.conf \ - --with-gdm-setup=${X11BASE}/sbin/gdmsetup +CONFIGURE_ARGS= --with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \ + --with-gdm-setup=${LOCALBASE}/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 6700540de7cc..9796fd97478b 100644 --- a/x11/fast-user-switch-applet/distinfo +++ b/x11/fast-user-switch-applet/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/fast-user-switch-applet-2.14.2.tar.bz2) = 590e51fbc9dfa7e33a337d36349cf040 -SHA256 (gnome2/fast-user-switch-applet-2.14.2.tar.bz2) = 1e5b7e2ebeb54b828f00dc3e6e6387ea10d3b47df6c73f7c722b26cf3fcf147f -SIZE (gnome2/fast-user-switch-applet-2.14.2.tar.bz2) = 497832 +MD5 (gnome2/fast-user-switch-applet-2.16.0.tar.bz2) = 749de0f0279991515ca8d82526f5b329 +SHA256 (gnome2/fast-user-switch-applet-2.16.0.tar.bz2) = 64a7d04867ff03f436cd06177a9d86e19f606f84cc42f108cb50298a05af3118 +SIZE (gnome2/fast-user-switch-applet-2.16.0.tar.bz2) = 682627 diff --git a/x11/fast-user-switch-applet/pkg-plist b/x11/fast-user-switch-applet/pkg-plist index 18e11f0e114b..95d22b4c7de2 100644 --- a/x11/fast-user-switch-applet/pkg-plist +++ b/x11/fast-user-switch-applet/pkg-plist @@ -31,11 +31,21 @@ share/gnome/help/fast-user-switch-applet/sr/figures/fast_user_switch_applet-pref 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/help/fast-user-switch-applet/sv/fast-user-switch-applet.xml +share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-context.png +share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-icon.png +share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-prefs.png +share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-text.png +share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-username.png +share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet.png share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-C.omf share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-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 +share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-sv.omf share/locale/bg/LC_MESSAGES/fast-user-switch-applet.mo +share/locale/bn/LC_MESSAGES/fast-user-switch-applet.mo +share/locale/bn_IN/LC_MESSAGES/fast-user-switch-applet.mo share/locale/ca/LC_MESSAGES/fast-user-switch-applet.mo share/locale/cs/LC_MESSAGES/fast-user-switch-applet.mo share/locale/cy/LC_MESSAGES/fast-user-switch-applet.mo @@ -47,6 +57,8 @@ share/locale/en_CA/LC_MESSAGES/fast-user-switch-applet.mo share/locale/en_GB/LC_MESSAGES/fast-user-switch-applet.mo share/locale/es/LC_MESSAGES/fast-user-switch-applet.mo share/locale/et/LC_MESSAGES/fast-user-switch-applet.mo +share/locale/eu/LC_MESSAGES/fast-user-switch-applet.mo +share/locale/fa/LC_MESSAGES/fast-user-switch-applet.mo share/locale/fi/LC_MESSAGES/fast-user-switch-applet.mo share/locale/fr/LC_MESSAGES/fast-user-switch-applet.mo share/locale/gl/LC_MESSAGES/fast-user-switch-applet.mo @@ -54,33 +66,44 @@ share/locale/gu/LC_MESSAGES/fast-user-switch-applet.mo share/locale/he/LC_MESSAGES/fast-user-switch-applet.mo share/locale/hi/LC_MESSAGES/fast-user-switch-applet.mo share/locale/hu/LC_MESSAGES/fast-user-switch-applet.mo +share/locale/id/LC_MESSAGES/fast-user-switch-applet.mo share/locale/it/LC_MESSAGES/fast-user-switch-applet.mo share/locale/ja/LC_MESSAGES/fast-user-switch-applet.mo share/locale/ka/LC_MESSAGES/fast-user-switch-applet.mo share/locale/ko/LC_MESSAGES/fast-user-switch-applet.mo share/locale/lt/LC_MESSAGES/fast-user-switch-applet.mo +share/locale/lv/LC_MESSAGES/fast-user-switch-applet.mo +share/locale/mg/LC_MESSAGES/fast-user-switch-applet.mo +share/locale/mk/LC_MESSAGES/fast-user-switch-applet.mo +share/locale/ml/LC_MESSAGES/fast-user-switch-applet.mo +share/locale/mn/LC_MESSAGES/fast-user-switch-applet.mo +share/locale/mr/LC_MESSAGES/fast-user-switch-applet.mo share/locale/nb/LC_MESSAGES/fast-user-switch-applet.mo -share/locale/no/LC_MESSAGES/fast-user-switch-applet.mo +share/locale/ne/LC_MESSAGES/fast-user-switch-applet.mo +share/locale/nl/LC_MESSAGES/fast-user-switch-applet.mo +share/locale/or/LC_MESSAGES/fast-user-switch-applet.mo share/locale/pa/LC_MESSAGES/fast-user-switch-applet.mo share/locale/pl/LC_MESSAGES/fast-user-switch-applet.mo share/locale/pt/LC_MESSAGES/fast-user-switch-applet.mo share/locale/pt_BR/LC_MESSAGES/fast-user-switch-applet.mo +share/locale/ru/LC_MESSAGES/fast-user-switch-applet.mo share/locale/sk/LC_MESSAGES/fast-user-switch-applet.mo +share/locale/sl/LC_MESSAGES/fast-user-switch-applet.mo share/locale/sq/LC_MESSAGES/fast-user-switch-applet.mo share/locale/sr/LC_MESSAGES/fast-user-switch-applet.mo share/locale/sr@Latn/LC_MESSAGES/fast-user-switch-applet.mo share/locale/sv/LC_MESSAGES/fast-user-switch-applet.mo +share/locale/ta/LC_MESSAGES/fast-user-switch-applet.mo share/locale/th/LC_MESSAGES/fast-user-switch-applet.mo +share/locale/tr/LC_MESSAGES/fast-user-switch-applet.mo share/locale/uk/LC_MESSAGES/fast-user-switch-applet.mo share/locale/vi/LC_MESSAGES/fast-user-switch-applet.mo share/locale/zh_CN/LC_MESSAGES/fast-user-switch-applet.mo share/locale/zh_HK/LC_MESSAGES/fast-user-switch-applet.mo share/locale/zh_TW/LC_MESSAGES/fast-user-switch-applet.mo -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz @dirrm share/gnome/omf/fast-user-switch-applet +@dirrm share/gnome/help/fast-user-switch-applet/sv/figures +@dirrm share/gnome/help/fast-user-switch-applet/sv @dirrm share/gnome/help/fast-user-switch-applet/sr/figures @dirrm share/gnome/help/fast-user-switch-applet/sr @dirrm share/gnome/help/fast-user-switch-applet/pa/figures @@ -91,3 +114,43 @@ share/locale/zh_TW/LC_MESSAGES/fast-user-switch-applet.mo @dirrm share/gnome/help/fast-user-switch-applet/C @dirrm share/gnome/help/fast-user-switch-applet @dirrm share/gnome/fast-user-switch-applet +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/mg/LC_MESSAGES +@dirrmtry share/locale/mg +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index f7da1363d1a5..452caddc59c6 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gdm/Makefile,v 1.29 2006/04/26 19:40:44 marcus Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.44 2006/10/03 13:36:08 ahze Exp $ # PORTNAME= gdm -PORTVERSION= 2.14.10 +PORTVERSION= 2.16.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -21,7 +21,8 @@ RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity USE_BZIP2= yes USE_GETTEXT= yes -USE_X_PREFIX= yes +USE_LDCONFIG= yes +USE_XLIB= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_RC_SUBR= gdm @@ -29,6 +30,7 @@ USE_GMAKE= yes USE_GNOME= gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \ gnomeprefix GNU_CONFIGURE= yes +CONFIGURE_ARGS= --mandir=${PREFIX}/man CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ GTKDOC="false" @@ -69,6 +71,8 @@ post-patch: @${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po} .endfor .endif + @${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \ + ${WRKSRC}/config/Makefile.in post-install: .if !defined(PACKAGE_BUILDING) diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index ddbe619f9c7a..f94608cd9c4e 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gdm-2.14.10.tar.bz2) = e880558dc3574f804f3abca869992a4f -SHA256 (gnome2/gdm-2.14.10.tar.bz2) = b6c173e9e60b85fed57951b17f3d518058c3ec63cec7118a83be016bb789fbdd -SIZE (gnome2/gdm-2.14.10.tar.bz2) = 3050140 +MD5 (gnome2/gdm-2.16.1.tar.bz2) = a0bf247fdaf32add6d5a69495a433bbf +SHA256 (gnome2/gdm-2.16.1.tar.bz2) = 9733a12aacf6995dc630daf108c357c5d906fdda30de05cd9b5c26a83cf3d5f6 +SIZE (gnome2/gdm-2.16.1.tar.bz2) = 3130299 diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in index 1b9d3e640ade..6a680efd2c2d 100644 --- a/x11/gdm/files/gdm.in +++ b/x11/gdm/files/gdm.in @@ -1,6 +1,6 @@ #!/bin/sh # $FreeBSD$ -# $MCom: ports/x11/gdm/files/gdm.in,v 1.5 2006/03/06 19:02:27 marcus Exp $ +# $MCom: ports/x11/gdm/files/gdm.in,v 1.8 2006/10/10 20:22:24 mezz Exp $ # PROVIDE: gdm # REQUIRE: LOGIN cleanvar moused diff --git a/x11/gdm/files/patch-config_Makefile.in b/x11/gdm/files/patch-config_Makefile.in deleted file mode 100644 index a665e989a48c..000000000000 --- a/x11/gdm/files/patch-config_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- config/Makefile.in.orig Sat May 27 07:38:47 2006 -+++ config/Makefile.in Sat May 27 07:50:28 2006 -@@ -681,7 +681,7 @@ install-data-hook: gdm.conf gdm.conf-cus - if test '!' -d $(DESTDIR)$(logdir); then \ - $(mkinstalldirs) $(DESTDIR)$(logdir); \ - chmod 755 $(DESTDIR)$(logdir); \ -- chown root:root $(DESTDIR)$(logdir) || : ; \ -+ chown root:wheel $(DESTDIR)$(logdir) || : ; \ - fi - - if test '!' -d $(DESTDIR)$(authdir); then \ diff --git a/x11/gdm/files/patch-config_locale.alias b/x11/gdm/files/patch-config_locale.alias index a7706b4d4e55..8de8f08b0e29 100644 --- a/x11/gdm/files/patch-config_locale.alias +++ b/x11/gdm/files/patch-config_locale.alias @@ -155,6 +155,6 @@ +Slovak sk_SK.UTF-8,sk_SK.ISO8859-2 +Slovenian sl_SI.UTF-8,sl_SI.ISO8859-2 +Spanish es_ES.UTF-8,es_ES.ISO8859-15,es_ES.ISO8859-1 -+Swedish sv_SE.UTF-8,sv_SE.ISO8859-1 ++Swedish sv_SV.UTF-8,sv_SE.ISO8859-1 +Turkish tr_TR.UTF-8,tr_TR.ISO8859-9 +Ukrainian uk_UA.UTF-8,uk_UA.ISO8859-5 diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist index 7288ec2f5d69..4e5008b5047a 100644 --- a/x11/gdm/pkg-plist +++ b/x11/gdm/pkg-plist @@ -87,9 +87,6 @@ share/gnome/help/gdm/ja/legal.xml share/gnome/help/gdm/ko/figures/gdm_window.png share/gnome/help/gdm/ko/gdm.xml share/gnome/help/gdm/ko/legal.xml -share/gnome/help/gdm/sv/figures/gdm_window.png -share/gnome/help/gdm/sv/gdm.xml -share/gnome/help/gdm/sv/legal.xml share/gnome/help/gdm/uk/gdm.xml share/gnome/help/gdm/uk/legal.xml share/gnome/help/gdm/zh_CN/figures/gdm_window.png @@ -108,7 +105,6 @@ share/gnome/omf/gdm/gdm-fr.omf share/gnome/omf/gdm/gdm-it.omf share/gnome/omf/gdm/gdm-ja.omf share/gnome/omf/gdm/gdm-ko.omf -share/gnome/omf/gdm/gdm-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 @@ -155,6 +151,7 @@ share/locale/az/LC_MESSAGES/gdm.mo share/locale/be/LC_MESSAGES/gdm.mo share/locale/bg/LC_MESSAGES/gdm.mo share/locale/bn/LC_MESSAGES/gdm.mo +share/locale/bn_IN/LC_MESSAGES/gdm.mo share/locale/bs/LC_MESSAGES/gdm.mo share/locale/ca/LC_MESSAGES/gdm.mo share/locale/cs/LC_MESSAGES/gdm.mo @@ -178,6 +175,7 @@ share/locale/he/LC_MESSAGES/gdm.mo share/locale/hi/LC_MESSAGES/gdm.mo share/locale/hr/LC_MESSAGES/gdm.mo share/locale/hu/LC_MESSAGES/gdm.mo +share/locale/hy/LC_MESSAGES/gdm.mo share/locale/id/LC_MESSAGES/gdm.mo share/locale/is/LC_MESSAGES/gdm.mo share/locale/it/LC_MESSAGES/gdm.mo @@ -187,6 +185,7 @@ share/locale/ko/LC_MESSAGES/gdm.mo share/locale/ku/LC_MESSAGES/gdm.mo share/locale/lt/LC_MESSAGES/gdm.mo share/locale/lv/LC_MESSAGES/gdm.mo +share/locale/mg/LC_MESSAGES/gdm.mo share/locale/mi/LC_MESSAGES/gdm.mo share/locale/mk/LC_MESSAGES/gdm.mo share/locale/ml/LC_MESSAGES/gdm.mo @@ -198,6 +197,7 @@ share/locale/ne/LC_MESSAGES/gdm.mo share/locale/nl/LC_MESSAGES/gdm.mo share/locale/nn/LC_MESSAGES/gdm.mo share/locale/nso/LC_MESSAGES/gdm.mo +share/locale/or/LC_MESSAGES/gdm.mo share/locale/pa/LC_MESSAGES/gdm.mo share/locale/pl/LC_MESSAGES/gdm.mo share/locale/pt/LC_MESSAGES/gdm.mo @@ -205,6 +205,7 @@ share/locale/pt_BR/LC_MESSAGES/gdm.mo share/locale/ro/LC_MESSAGES/gdm.mo share/locale/ru/LC_MESSAGES/gdm.mo share/locale/rw/LC_MESSAGES/gdm.mo +share/locale/si/LC_MESSAGES/gdm.mo share/locale/sk/LC_MESSAGES/gdm.mo share/locale/sl/LC_MESSAGES/gdm.mo share/locale/sq/LC_MESSAGES/gdm.mo @@ -222,22 +223,6 @@ share/locale/zh_CN/LC_MESSAGES/gdm.mo share/locale/zh_HK/LC_MESSAGES/gdm.mo share/locale/zh_TW/LC_MESSAGES/gdm.mo share/locale/zu/LC_MESSAGES/gdm.mo -@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 @@ -248,8 +233,6 @@ share/locale/zu/LC_MESSAGES/gdm.mo @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 @dirrm share/gnome/help/gdm/ko @dirrm share/gnome/help/gdm/ja/figures @@ -285,3 +268,65 @@ share/locale/zu/LC_MESSAGES/gdm.mo @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 +@dirrmtry share/locale/zu/LC_MESSAGES +@dirrmtry share/locale/zu +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/si/LC_MESSAGES +@dirrmtry share/locale/si +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nso/LC_MESSAGES +@dirrmtry share/locale/nso +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/mi/LC_MESSAGES +@dirrmtry share/locale/mi +@dirrmtry share/locale/mg/LC_MESSAGES +@dirrmtry share/locale/mg +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 8dd7d5f2a72d..c658d8fe2cd3 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -3,44 +3,48 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnome-applets/Makefile,v 1.141 2006/10/08 02:12:50 marcus Exp $ # PORTNAME= gnome-applets -PORTVERSION= 2.14.2 -PORTREVISION= 1 +PORTVERSION= 2.16.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= Applets components for the Gnome 2 Desktop Environment +COMMENT= Applets components for the GNOME 2 Desktop Environment -BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-system-tools.pc:${PORTSDIR}/sysutils/gnome-system-tools +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/gnome-system-tools \ + ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ - xklavier.10:${PORTSDIR}/x11/libxklavier \ - gucharmap.4:${PORTSDIR}/deskutils/gucharmap -RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/gnome-system-tools + xklavier.11:${PORTSDIR}/x11/libxklavier \ + gucharmap.5:${PORTSDIR}/deskutils/gucharmap +RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/gnome-system-tools \ + ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center USE_GETTEXT= yes USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 INSTALLS_OMF= yes INSTALLS_ICONS= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \ gail gnomedocutils +WANT_GNOME= yes USE_GSTREAMER= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gstreamer=0.10 +CONFIGURE_ARGS= --with-gstreamer=0.10 \ + --enable-stickynotes 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 \ + gswitchit.schemas gweather.schemas \ mixer.schemas multiload.schemas \ stickynotes.schemas @@ -48,10 +52,15 @@ OPTIONS= MINI_COMMANDER "Enable mini-commander applet" off FREEBSD_SYS?= /usr/src/sys +.if defined(PACKAGE_BUILDING) +.undef WITHOUT_GNOME +WITH_GNOME= yes +.endif + .include <bsd.port.pre.mk> .if exists(${LOCALBASE}/libdata/pkgconfig/libnotify.pc) || \ - defined(WITH_NOTIFY) + !defined(WITHOUT_LIBNOTIFY) LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify .endif @@ -78,8 +87,23 @@ PLIST_SUB+= COMMANDER="" PLIST_SUB+= COMMANDER="@comment " .endif +.if ( exists(${pygnomedesktop_DETECT}) && exists(${pygnomeextras_DETECT}) ) || \ + ( ( ${HAVE_GNOME:Mpygnomedesktop}!="" && \ + ${HAVE_GNOME:Mpygnomeextras}!="" ) && ${ARCH}!="sparc64" ) +USE_PYTHON= yes +.include "${PORTSDIR}/Mk/bsd.python.mk" +USE_GNOME+= pygnomedesktop pygnomeextras +PLIST_SUB+= PYTHON="" +.else +PLIST_SUB+= PYTHON="@comment " +.endif + post-patch: @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \ ${WRKSRC}/libgweather/weather-met.c +.if !defined(USE_PYTHON) + @${REINPLACE_CMD} -e 's|HAVE_PYGTK="yes"|HAVE_PYGTK="no"|' \ + ${WRKSRC}/configure +.endif .include <bsd.port.post.mk> diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo index 271f8ddad68a..ddfe5f865d50 100644 --- a/x11/gnome-applets/distinfo +++ b/x11/gnome-applets/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-applets-2.14.2.tar.bz2) = e6da539e78da1256b9a9bee1301fd44f -SHA256 (gnome2/gnome-applets-2.14.2.tar.bz2) = 4bdd52b47649cfa6dc5d065201124ae02d3da593531cd0defa1a9cf7a761f1df -SIZE (gnome2/gnome-applets-2.14.2.tar.bz2) = 6601120 +MD5 (gnome2/gnome-applets-2.16.1.tar.bz2) = 0ceb0411c86304be2661bd4072662ecb +SHA256 (gnome2/gnome-applets-2.16.1.tar.bz2) = a4d30677f946a770dc7fec2022b95fef2e3823aa1b82bee36d36f7390734fd85 +SIZE (gnome2/gnome-applets-2.16.1.tar.bz2) = 6888716 diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa index df27577202ce..2e1c62bde21d 100644 --- a/x11/gnome-applets/files/patch-aa +++ b/x11/gnome-applets/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Sat May 6 14:08:13 2006 -+++ configure Sat May 6 14:13:34 2006 -@@ -23361,8 +23361,7 @@ _ACEOF +--- configure.orig Wed Jul 26 16:38:04 2006 ++++ configure Wed Jul 26 16:38:04 2006 +@@ -24860,8 +24860,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -10,7 +10,7 @@ GNOMELOCALEDIR="$ac_define_dir" -@@ -25392,8 +25391,8 @@ fi +@@ -27066,8 +27065,8 @@ ;; # list of supported OS cores that do not use libapm @@ -21,16 +21,7 @@ ACPIINC="-I${OS_SYS}" else ACPIINC="-I/usr/src/sys" -@@ -26469,7 +26468,7 @@ else - 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;} - else -@@ -26633,6 +26632,9 @@ if test x$disable_cpufreq = xno; then +@@ -28145,6 +28144,9 @@ *linux*) build_cpufreq_applet=yes ;; @@ -40,7 +31,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 @@ fi +@@ -28752,7 +28754,7 @@ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" @@ -49,7 +40,7 @@ pixmapsdir="${datadir}/pixmaps" -@@ -27123,8 +27125,7 @@ gladedir="${pkgdatadir}/glade" +@@ -28764,8 +28766,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -59,7 +50,7 @@ GNOME_ICONDIR="$ac_define_dir" -@@ -27136,8 +27137,7 @@ _ACEOF +@@ -28777,8 +28778,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -69,7 +60,7 @@ GNOME_PIXMAPSDIR="$ac_define_dir" -@@ -27149,8 +27149,7 @@ _ACEOF +@@ -28790,8 +28790,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -79,7 +70,7 @@ GNOME_GLADEDIR="$ac_define_dir" -@@ -27162,8 +27161,7 @@ _ACEOF +@@ -28803,8 +28802,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -89,7 +80,7 @@ DATADIR="$ac_define_dir" -@@ -27175,8 +27173,7 @@ _ACEOF +@@ -28816,8 +28814,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -99,7 +90,7 @@ SYSCONFDIR="$ac_define_dir" -@@ -27188,8 +27185,7 @@ _ACEOF +@@ -28829,8 +28826,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -109,7 +100,7 @@ LIBDIR="$ac_define_dir" -@@ -27201,8 +27197,7 @@ _ACEOF +@@ -28842,8 +28838,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-cpufreq-freebsd b/x11/gnome-applets/files/patch-cpufreq-freebsd index 4bed0298db89..53841b6d7346 100644 --- a/x11/gnome-applets/files/patch-cpufreq-freebsd +++ b/x11/gnome-applets/files/patch-cpufreq-freebsd @@ -1,6 +1,117 @@ ---- cpufreq/src/cpufreq-monitor-sysctl.h.orig Sun Feb 13 01:00:25 2005 -+++ cpufreq/src/cpufreq-monitor-sysctl.h Sat Feb 12 20:25:21 2005 -@@ -0,0 +1,48 @@ +--- cpufreq/src/cpufreq-monitor-cpuinfo.c.orig Thu Jun 15 01:01:54 2006 ++++ cpufreq/src/cpufreq-monitor-cpuinfo.c Sat Jun 17 13:48:19 2006 +@@ -22,6 +22,10 @@ + #include <glib.h> + #include <glib/gi18n.h> + ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#include <sys/sysctl.h> ++#endif /* __FreeBSD__ */ + #include <string.h> + #include <stdio.h> + +@@ -59,15 +63,20 @@ cpufreq_monitor_cpuinfo_new (guint cpu) + static gboolean + cpufreq_monitor_cpuinfo_run (CPUFreqMonitor *monitor) + { ++#ifndef __FreeBSD__ + gchar *file; + gchar **lines; + gchar *buffer = NULL; + gchar *p; ++#else ++ size_t len; ++#endif /* __FreeBSD__ */ + gint cpu, i; + gint cur_freq, max_freq; + gchar *governor; + GError *error = NULL; + ++#ifndef __FreeBSD__ + file = g_strdup ("/proc/cpuinfo"); + if (!g_file_get_contents (file, &buffer, NULL, &error)) { + g_warning (error->message); +@@ -112,6 +121,12 @@ cpufreq_monitor_cpuinfo_run (CPUFreqMoni + + g_strfreev (lines); + g_free (buffer); ++#else ++ len = sizeof (cpu); ++ ++ if (sysctlbyname ("hw.clockrate", &cpu, &len, NULL, 0) == -1) ++ return FALSE; ++#endif /* __FreeBSD__ */ + + governor = g_strdup (_("Frequency Scaling Unsupported")); + cur_freq = cpu * 1000; +--- cpufreq/src/cpufreq-applet.c.orig Thu Jun 15 01:01:53 2006 ++++ cpufreq/src/cpufreq-applet.c Sat Jun 17 13:42:50 2006 +@@ -17,6 +17,7 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Authors : Carlos García Campos <carlosgc@gnome.org> ++ * Joe Marcus Clarke <marcus@FreeBSD.org> + */ + + #ifdef HAVE_CONFIG_H +@@ -519,6 +524,7 @@ cpufreq_applet_about_cb (BonoboUICompone + { + static const gchar *const authors[] = { + "Carlos Garcia Campos <carlosgc@gnome.org>", ++ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD support)", + NULL + }; + static const gchar *const documenters[] = { +--- cpufreq/src/Makefile.in.orig Sat Jun 17 13:42:50 2006 ++++ cpufreq/src/Makefile.in Sat Jun 17 14:03:45 2006 +@@ -62,7 +62,8 @@ am__cpufreq_applet_SOURCES_DIST = cpufre + cpufreq-monitor-procfs.h cpufreq-monitor-sysfs.c \ + cpufreq-monitor-sysfs.h cpufreq-monitor-libcpufreq.c \ + cpufreq-monitor-libcpufreq.h cpufreq-monitor-cpuinfo.c \ +- cpufreq-monitor-cpuinfo.h ++ cpufreq-monitor-cpuinfo.h cpufreq-monitor-sysctl.c \ ++ cpufreq-monitor-sysctl.h + @HAVE_LIBCPUFREQ_TRUE@am__objects_1 = \ + @HAVE_LIBCPUFREQ_TRUE@ cpufreq-monitor-libcpufreq.$(OBJEXT) + am_cpufreq_applet_OBJECTS = cpufreq-applet.$(OBJEXT) \ +@@ -71,7 +72,8 @@ am_cpufreq_applet_OBJECTS = cpufreq-appl + cpufreq-monitor-factory.$(OBJEXT) \ + cpufreq-monitor-procfs.$(OBJEXT) \ + cpufreq-monitor-sysfs.$(OBJEXT) $(am__objects_1) \ +- cpufreq-monitor-cpuinfo.$(OBJEXT) ++ cpufreq-monitor-cpuinfo.$(OBJEXT) \ ++ cpufreq-monitor-sysctl.$(OBJEXT) + cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS) + am__DEPENDENCIES_1 = + cpufreq_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@@ -85,6 +87,7 @@ am__depfiles_maybe = depfiles + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-procfs.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysfs.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysctl.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-popup.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-prefs.Po \ +@@ -397,6 +400,7 @@ cpufreq_applet_SOURCES = \ + cpufreq-monitor.c cpufreq-monitor.h \ + cpufreq-monitor-factory.c cpufreq-monitor-factory.h \ + cpufreq-monitor-procfs.c cpufreq-monitor-procfs.h \ ++ cpufreq-monitor-sysctl.c cpufreq-monitor-sysctl.h \ + cpufreq-monitor-sysfs.c cpufreq-monitor-sysfs.h \ + $(cpufreq_files) \ + cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h +@@ -482,6 +486,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@ +--- cpufreq/src/cpufreq-monitor-sysctl.h.orig Sat Jun 17 14:05:37 2006 ++++ cpufreq/src/cpufreq-monitor-sysctl.h Sat Jun 17 14:14:13 2006 +@@ -0,0 +1,49 @@ +/* + * Copyright (C) 2001, 2002 Free Software Foundation + * @@ -25,6 +136,7 @@ +#define __CPUFREQ_MONITOR_SYSCTL_H__ + +#include <glib-object.h> ++ +#include "cpufreq-monitor.h" + +#define TYPE_CPUFREQ_MONITOR_SYSCTL (cpufreq_monitor_sysctl_get_type ()) @@ -45,13 +157,13 @@ + CPUFreqMonitorClass parent_class; +}; + -+GType cpufreq_monitor_sysctl_get_type (); ++GType cpufreq_monitor_sysctl_get_type (void) G_GNUC_CONST; +CPUFreqMonitor *cpufreq_monitor_sysctl_new (guint cpu); + +#endif /* __CPUFREQ_MONITOR_SYSCTL_H__ */ ---- cpufreq/src/cpufreq-monitor-sysctl.c.orig Sun Feb 13 03:52:42 2005 -+++ cpufreq/src/cpufreq-monitor-sysctl.c Mon Feb 14 00:42:07 2005 -@@ -0,0 +1,269 @@ +--- cpufreq/src/cpufreq-monitor-sysctl.c.orig Sat Jun 17 14:15:55 2006 ++++ cpufreq/src/cpufreq-monitor-sysctl.c Sat Jun 24 01:45:23 2006 +@@ -0,0 +1,161 @@ +/* + * Copyright (C) 2001, 2002 Free Software Foundation + * @@ -82,70 +194,32 @@ +#include <sys/sysctl.h> + +#include "cpufreq-monitor-sysctl.h" -+#include "cpufreq-monitor-protected.h" + +#define PARENT_TYPE TYPE_CPUFREQ_MONITOR + +#define CPUFREQ_MONITOR_GET_PROTECTED(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), PARENT_TYPE, CPUFreqMonitorProtected)) + +static void cpufreq_monitor_sysctl_class_init (CPUFreqMonitorSysctlClass *klass); -+static void cpufreq_monitor_sysctl_finalize (GObject *object); + -+static void cpufreq_monitor_sysctl_run (CPUFreqMonitor *monitor); ++static gboolean cpufreq_monitor_sysctl_run (CPUFreqMonitor *monitor); +static GList *cpufreq_monitor_sysctl_get_available_frequencies (CPUFreqMonitor *monitor); + +static gboolean cpufreq_monitor_sysctl_get (gpointer gdata); + -+ -+static CPUFreqMonitorClass *parent_class = NULL; -+ -+typedef struct _CPUFreqMonitorProtected CPUFreqMonitorProtected; -+ -+GType cpufreq_monitor_sysctl_get_type () -+{ -+ static GType type = 0; -+ -+ if (!type) { -+ static const GTypeInfo info = { -+ sizeof (CPUFreqMonitorSysctlClass), -+ (GBaseInitFunc) NULL, -+ (GBaseFinalizeFunc) NULL, -+ (GClassInitFunc) cpufreq_monitor_sysctl_class_init, -+ NULL, -+ NULL, -+ sizeof (CPUFreqMonitorSysctl), -+ 0, -+ NULL -+ }; -+ -+ type = g_type_register_static (PARENT_TYPE, "CPUFreqMonitorSysctl", -+ &info, 0); -+ } -+ -+ return type; -+} ++G_DEFINE_TYPE (CPUFreqMonitorSysctl, cpufreq_monitor_sysctl, CPUFREQ_TYPE_MONITOR) + +static void -+cpufreq_monitor_sysctl_class_init (CPUFreqMonitorSysctlClass *klass) ++cpufreq_monitor_sysctl_init (CPUFreqMonitorSysctl *monitor) +{ -+ GObjectClass *object_class = G_OBJECT_CLASS (klass); -+ CPUFreqMonitorClass *monitor_class = CPUFREQ_MONITOR_CLASS (klass); -+ -+ parent_class = g_type_class_peek_parent (klass); -+ -+ monitor_class->run = cpufreq_monitor_sysctl_run; -+ monitor_class->get_available_frequencies = cpufreq_monitor_sysctl_get_available_frequencies; -+ -+ object_class->finalize = cpufreq_monitor_sysctl_finalize; +} + +static void -+cpufreq_monitor_sysctl_finalize (GObject *object) ++cpufreq_monitor_sysctl_class_init (CPUFreqMonitorSysctlClass *klass) +{ -+ g_return_if_fail (IS_CPUFREQ_MONITOR_SYSCTL (object)); ++ CPUFreqMonitorClass *monitor_class = CPUFREQ_MONITOR_CLASS (klass); + -+ if (G_OBJECT_CLASS (parent_class)->finalize) -+ (* G_OBJECT_CLASS (parent_class)->finalize) (object); ++ monitor_class->run = cpufreq_monitor_sysctl_run; ++ monitor_class->get_available_frequencies = cpufreq_monitor_sysctl_get_available_frequencies; +} + +CPUFreqMonitor * @@ -159,29 +233,23 @@ +} + +static gboolean -+cpufreq_monitor_sysctl_get (gpointer gdata) ++cpufreq_monitor_sysctl_run (CPUFreqMonitor *monitor) +{ + gint fmax, fmin, ifreq; -+ gchar *freq, *perc, *unit, *governor; -+ gboolean changed; ++ gchar *governor; + size_t len; + gchar *freq_oid; -+ CPUFreqMonitorSysctl *monitor; -+ CPUFreqMonitorProtected *private; ++ guint mon_cpu; ++ GList *list; + -+ monitor = (CPUFreqMonitorSysctl *) gdata; -+ private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor)); ++ list = cpufreq_monitor_get_available_frequencies (CPUFREQ_MONITOR (monitor)); + -+ if (private->available_freqs == NULL) { -+ if (!cpufreq_monitor_sysctl_get_available_frequencies (CPUFREQ_MONITOR (monitor))) -+ return FALSE; -+ } -+ -+ fmax = atoi ((gchar *) private->available_freqs->data); -+ fmin = atoi ((gchar *) g_list_nth_data (private->available_freqs, (g_list_length (private->available_freqs) - 1))); ++ fmax = atoi ((gchar *) list->data); ++ fmin = atoi ((gchar *) g_list_nth_data (list, (g_list_length (list) - 1))); + ++ g_object_get (G_OBJECT (monitor), "cpu", &mon_cpu, NULL); + len = sizeof (ifreq); -+ freq_oid = g_strdup_printf ("dev.cpu.%d.freq", private->cpu); ++ freq_oid = g_strdup_printf ("dev.cpu.%d.freq", mon_cpu); + + if (sysctlbyname (freq_oid, &ifreq, &len, NULL, 0) == -1) { + g_free (freq_oid); @@ -189,7 +257,7 @@ + } + + ifreq *= 1000; -+ ++ + if (ifreq == fmax) + governor = g_strdup ("performance"); + else if (ifreq == fmin) @@ -197,93 +265,29 @@ + else + governor = g_strdup ("other"); + -+ freq = parent_class->get_human_readable_freq (ifreq); -+ perc = parent_class->get_human_readable_perc (fmax, ifreq); -+ unit = parent_class->get_human_readable_unit (ifreq); -+ -+ changed = FALSE; -+ -+ if (!private->governor || (g_ascii_strcasecmp (governor, private->governor) != 0)) { -+ changed = TRUE; -+ } -+ -+ if (!private->freq || (g_ascii_strcasecmp (freq, private->freq) != 0)) { -+ changed = TRUE; -+ } -+ -+ if (!private->perc || (g_ascii_strcasecmp (perc, private->perc) != 0)) { -+ changed = TRUE; -+ } -+ -+ if (!private->unit || (g_ascii_strcasecmp (unit, private->unit) != 0)) { -+ changed = TRUE; -+ } -+ -+ parent_class->free_data (CPUFREQ_MONITOR (monitor)); -+ -+ private->governor = governor; -+ private->freq = freq; -+ private->perc = perc; -+ private->unit = unit; -+ -+ if (private->governor == NULL) -+ return FALSE; -+ if (private->freq == NULL) -+ return FALSE; -+ if (private->perc == NULL) -+ return FALSE; -+ if (private->unit == NULL) -+ return FALSE; -+ -+ if (changed) -+ g_signal_emit (CPUFREQ_MONITOR (monitor), parent_class->signals[CHANGED], 0); ++ g_object_set (G_OBJECT (monitor), ++ "governor", governor, ++ "frequency", ifreq, ++ "max-frequency", fmax, ++ NULL); + + return TRUE; +} + -+static void -+cpufreq_monitor_sysctl_run (CPUFreqMonitor *monitor) -+{ -+ CPUFreqMonitorProtected *private; -+ -+ g_return_if_fail (IS_CPUFREQ_MONITOR_SYSCTL (monitor)); -+ -+ private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor)); -+ -+ if (private->timeout_handler > 0) -+ g_source_remove (private->timeout_handler); -+ -+ private->timeout_handler = g_timeout_add (1000, cpufreq_monitor_sysctl_get, (gpointer) monitor); -+} -+ -+static void -+free_string (gpointer str, gpointer gdata) -+{ -+ if (str) g_free (str); -+} -+ +static GList * +cpufreq_monitor_sysctl_get_available_frequencies (CPUFreqMonitor *monitor) +{ -+ CPUFreqMonitorProtected *private; + gchar *levels_oid, *levels; + gchar **levelsp, **l; ++ GList *list = NULL; + gint mib[4]; ++ guint mon_cpu; + size_t len; + -+ g_return_val_if_fail (IS_CPUFREQ_MONITOR_SYSCTL (monitor), NULL); -+ -+ private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor)); -+ -+ if (private->available_freqs) { -+ g_list_foreach (private->available_freqs, -+ free_string, NULL); -+ g_list_free (private->available_freqs); -+ private->available_freqs = NULL; -+ } ++ g_object_get (G_OBJECT (monitor), "cpu", &mon_cpu, NULL); + + levels_oid = g_strdup_printf ("dev.cpu.%d.freq_levels", -+ private->cpu); ++ mon_cpu); + len = 4; + sysctlnametomib (levels_oid, mib, &len); + len = sizeof (levels); @@ -295,7 +299,7 @@ + levels = g_malloc (len); + if (sysctl (mib, 4, levels, &len, NULL, 0) == -1) + return NULL; -+ ++ + levelsp = g_strsplit (levels, " ", 0); + g_free (levels); + @@ -310,219 +314,116 @@ + * mW. + */ + int freq = atoi (frpr[0]); -+ private->available_freqs = -+ g_list_append (private->available_freqs, g_strdup_printf ("%d", freq * 1000)); ++ list = ++ g_list_append (list, g_strdup_printf ("%d", freq * 1000)); + } + g_strfreev (frpr); + } + + g_strfreev (levelsp); + -+ return private->available_freqs; ++ return (list); +} +#endif /* __FreeBSD__ */ ---- cpufreq/src/cpufreq-monitor-factory.c.orig Thu Apr 14 12:11:06 2005 -+++ cpufreq/src/cpufreq-monitor-factory.c Sun Jul 3 17:09:15 2005 -@@ -17,13 +17,21 @@ +--- cpufreq/src/cpufreq-monitor-factory.c.orig Sat Jun 17 06:28:02 2006 ++++ cpufreq/src/cpufreq-monitor-factory.c Sat Jun 24 01:45:54 2006 +@@ -17,6 +17,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * Authors : Carlos García Campos <carlosgc@gnome.org> + * Joe Marcus Clarke <marcus@FreeBSD.org> */ + #ifdef HAVE_CONFIG_H +@@ -25,11 +26,18 @@ + #include <glib.h> + #include <glib/gi18n.h> +#ifdef __FreeBSD__ +#include <sys/types.h> +#include <sys/sysctl.h> +#endif /* __FreeBSD__ */ #include "cpufreq-applet.h" + #include "cpufreq-utils.h" #include "cpufreq-monitor-sysfs.h" #include "cpufreq-monitor-procfs.h" +#ifdef __FreeBSD__ +#include "cpufreq-monitor-sysctl.h" +#endif /* __FreeBSD__ */ #include "cpufreq-monitor-cpuinfo.h" - #include "cpufreq-monitor-factory.h" - -@@ -31,6 +39,7 @@ CPUFreqMonitor * + #ifdef HAVE_LIBCPUFREQ + #include "cpufreq-monitor-libcpufreq.h" +@@ -40,6 +48,7 @@ CPUFreqMonitor * cpufreq_monitor_factory_create_monitor (guint cpu) { CPUFreqMonitor *monitor = NULL; +#ifndef __FreeBSD__ - if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ - monitor = cpufreq_monitor_sysfs_new (cpu); -@@ -49,6 +58,20 @@ cpufreq_monitor_factory_create_monitor ( - - monitor = cpufreq_monitor_cpuinfo_new (cpu); + #ifdef HAVE_LIBCPUFREQ + monitor = cpufreq_monitor_libcpufreq_new (cpu); +@@ -63,6 +72,19 @@ cpufreq_monitor_factory_create_monitor ( + + monitor = cpufreq_monitor_cpuinfo_new (cpu); } +#else + size_t len; + + if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { -+ monitor = cpufreq_monitor_sysctl_new (cpu); ++ monitor = cpufreq_monitor_sysctl_new (cpu); + } else { -+ cpufreq_applet_display_error (_("CPU frequency scaling unsupported"), -+ _("You will not be able to modify the frequency of your machine. " -+ "Your machine may be misconfigured or not have hardware support " -+ "for CPU frequency scaling.")); -+ -+ monitor = cpufreq_monitor_cpuinfo_new (cpu); ++ cpufreq_utils_display_error (_("CPU frequency scaling unsupported"), ++ _("You will not be able to modify the frequency of your machine. " ++ "Your machine may be misconfigured or not have hardware support " ++ "for CPU frequency scaling.")); ++ monitor = cpufreq_monitor_cpuinfo_new (cpu); + } +#endif /* __FreeBSD__ */ - + return monitor; } ---- cpufreq/src/cpufreq-monitor-cpuinfo.c.orig Thu Apr 14 12:11:06 2005 -+++ cpufreq/src/cpufreq-monitor-cpuinfo.c Sun Jul 3 17:07:16 2005 -@@ -23,6 +23,10 @@ - #include <glib/gi18n.h> - #include <libgnomevfs/gnome-vfs.h> - +--- cpufreq/src/cpufreq-utils.c.orig Sat Aug 12 21:26:50 2006 ++++ cpufreq/src/cpufreq-utils.c Tue Aug 22 11:07:32 2006 +@@ -22,6 +22,9 @@ + #include <glib.h> + #include <gtk/gtkmessagedialog.h> + #include <sys/types.h> +#ifdef __FreeBSD__ -+#include <sys/types.h> +#include <sys/sysctl.h> -+#endif /* __FreeBSD__ */ - #include <string.h> - #include <stdio.h> - -@@ -104,6 +108,7 @@ cpufreq_monitor_cpuinfo_new (guint cpu) - static gboolean - cpufreq_monitor_cpuinfo_get (gpointer gdata) - { -+#ifndef __FreeBSD__ - GnomeVFSHandle *handle; - GnomeVFSFileSize bytes_read; - GnomeVFSResult result; -@@ -111,6 +116,9 @@ cpufreq_monitor_cpuinfo_get (gpointer gd - gchar **lines; - gchar buffer[256]; - gchar *p; -+#else -+ size_t len; -+#endif /* __FreeBSD__ */ - gchar *freq, *perc, *unit, *governor; - gint cpu, i; - CPUFreqMonitorCPUInfo *monitor; -@@ -120,6 +128,7 @@ cpufreq_monitor_cpuinfo_get (gpointer gd - - private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor)); - -+#ifndef __FreeBSD__ - uri = gnome_vfs_get_uri_from_local_path ("/proc/cpuinfo"); ++#endif + #include <sys/stat.h> + #include <fcntl.h> + #include <unistd.h> +@@ -30,6 +33,24 @@ - result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ); -@@ -180,6 +189,12 @@ cpufreq_monitor_cpuinfo_get (gpointer gd + #include "cpufreq-utils.h" - g_strfreev (lines); - g_free (file); -+#else -+ len = sizeof (cpu); -+ -+ if (sysctlbyname ("hw.clockrate", &cpu, &len, NULL, 0) == -1) -+ return FALSE; -+#endif /* __FreeBSD__ */ - - governor = g_strdup (_("Frequency Scaling Unsupported")); - freq = parent_class->get_human_readable_freq (cpu * 1000); /* kHz are expected*/ ---- cpufreq/src/cpufreq-applet.c.orig Thu Apr 14 12:11:06 2005 -+++ cpufreq/src/cpufreq-applet.c Sun Jul 3 17:28:43 2005 -@@ -17,6 +17,7 @@ - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Authors : Carlos García Campos <carlosgc@gnome.org> -+ * Joe Marcus Clarke <marcus@FreeBSD.org> - */ - - #include <config.h> -@@ -26,6 +27,10 @@ - #include <panel-applet-gconf.h> - #include <glade/glade.h> - #include <glib/gi18n.h> +#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/sysctl.h> -+#endif /* __FreeBSD__ */ - #include <string.h> - - #include "cpufreq-applet.h" -@@ -193,6 +198,7 @@ cpufreq_applet_about_cb (BonoboUICompone - { - static const gchar *authors[] = { - "Carlos Garcia Campos <carlosgc@gnome.org>", -+ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD support)", - NULL - }; - static const gchar *documenters[] = { -@@ -233,6 +239,7 @@ static gint - cpufreq_applet_get_max_cpu (void) - { - gint mcpu = -1; -+#ifndef __FreeBSD__ - gchar *file = NULL; - - do { -@@ -242,11 +249,20 @@ cpufreq_applet_get_max_cpu (void) - } while (g_file_test (file, G_FILE_TEST_EXISTS)); - g_free (file); - mcpu --; -+#else ++guint ++cpufreq_utils_get_n_cpus (void) ++{ + size_t len; ++ static guint n_cpus = 0; ++ ++ if (n_cpus > 0) ++ return n_cpus; + -+ len = sizeof (mcpu); ++ len = sizeof (n_cpus); ++ if (sysctlbyname ("hw.ncpu", &n_cpus, &len, NULL, 0) == -1) { ++ return 1; ++ } + -+ sysctlbyname ("hw.ncpu", &mcpu, &len, NULL, 0); -+ mcpu --; ++ return n_cpus; ++} ++#else + guint + cpufreq_utils_get_n_cpus (void) + { +@@ -72,6 +93,7 @@ cpufreq_utils_get_n_cpus (void) + + return 1; + } +#endif /* __FreeBSD__ */ - if (mcpu >= 0) - return mcpu; - - mcpu = -1; -+#ifndef __FreeBSD__ - file = NULL; - do { - if (file) g_free (file); -@@ -255,6 +271,7 @@ cpufreq_applet_get_max_cpu (void) - } while (g_file_test (file, G_FILE_TEST_EXISTS)); - g_free (file); - mcpu --; -+#endif - - if (mcpu >= 0) - return mcpu; ---- cpufreq/src/Makefile.in.orig Tue Oct 4 00:11:26 2005 -+++ cpufreq/src/Makefile.in Tue Oct 4 00:20:37 2005 -@@ -57,6 +57,7 @@ - cpufreq-prefs.$(OBJEXT) cpufreq-popup.$(OBJEXT) \ - cpufreq-monitor.$(OBJEXT) cpufreq-monitor-factory.$(OBJEXT) \ - cpufreq-monitor-procfs.$(OBJEXT) \ -+ cpufreq-monitor-sysctl.$(OBJEXT) \ - cpufreq-monitor-sysfs.$(OBJEXT) \ - cpufreq-monitor-cpuinfo.$(OBJEXT) - cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS) -@@ -71,6 +72,7 @@ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-factory.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-procfs.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysfs.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysctl.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-popup.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-prefs.Po -@@ -358,6 +360,7 @@ - cpufreq-monitor-protected.h \ - cpufreq-monitor-factory.c cpufreq-monitor-factory.h \ - cpufreq-monitor-procfs.c cpufreq-monitor-procfs.h \ -+ cpufreq-monitor-sysctl.c cpufreq-monitor-sysctl.h \ - cpufreq-monitor-sysfs.c cpufreq-monitor-sysfs.h \ - cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h - -@@ -441,6 +444,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@ + void + cpufreq_utils_display_error (const gchar *message, diff --git a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd index d25df35e2b5d..8a7ea857c103 100644 --- a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd +++ b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd @@ -1,6 +1,50 @@ ---- cpufreq/src/cpufreq-selector/cpufreq-sysctl.h.orig Mon Feb 14 00:38:57 2005 -+++ cpufreq/src/cpufreq-selector/cpufreq-sysctl.h Mon Feb 14 00:21:39 2005 -@@ -0,0 +1,51 @@ +--- cpufreq/src/cpufreq-selector/Makefile.in.orig Sat Jun 24 01:52:35 2006 ++++ cpufreq/src/cpufreq-selector/Makefile.in Sat Jun 24 02:14:08 2006 +@@ -58,13 +58,15 @@ am__cpufreq_selector_SOURCES_DIST = cpuf + cpufreq-selector.h cpufreq-selector-sysfs.c \ + cpufreq-selector-sysfs.h cpufreq-selector-procfs.c \ + cpufreq-selector-procfs.h cpufreq-selector-libcpufreq.c \ +- cpufreq-selector-libcpufreq.h main.c ++ cpufreq-selector-libcpufreq.h main.c \ ++ cpufreq-selector-sysctl.c cpufreq-selector-sysctl.h + @HAVE_LIBCPUFREQ_TRUE@am__objects_1 = \ + @HAVE_LIBCPUFREQ_TRUE@ cpufreq-selector-libcpufreq.$(OBJEXT) + am_cpufreq_selector_OBJECTS = cpufreq-selector.$(OBJEXT) \ + cpufreq-selector-sysfs.$(OBJEXT) \ + cpufreq-selector-procfs.$(OBJEXT) $(am__objects_1) \ +- main.$(OBJEXT) ++ main.$(OBJEXT) \ ++ cpufreq-selector-sysctl.$(OBJEXT) + cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS) + am__DEPENDENCIES_1 = + cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@@ -74,6 +76,7 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-selector-libcpufreq.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector-procfs.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector-sysctl.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector-sysfs.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/main.Po +@@ -371,6 +374,7 @@ cpufreq_selector_SOURCES = \ + cpufreq-selector.c cpufreq-selector.h \ + cpufreq-selector-sysfs.c cpufreq-selector-sysfs.h \ + cpufreq-selector-procfs.c cpufreq-selector-procfs.h \ ++ cpufreq-selector-sysctl.c cpufreq-selector-sysctl.h \ + $(cpufreq_files) \ + main.c + +@@ -451,6 +455,7 @@ distclean-compile: + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-libcpufreq.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-procfs.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-sysctl.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-sysfs.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ +--- cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.h.orig Sat Jun 24 01:52:35 2006 ++++ cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.h Sat Jun 24 02:13:05 2006 +@@ -0,0 +1,53 @@ +/* + * Copyright (C) 2001, 2002 Free Software Foundation + * @@ -21,40 +65,88 @@ + * Authors : Joe Marcus Clarke <marcus@FreeBSD.org> + */ + -+#ifndef __CPUFREQ_SYSCTL_H__ -+#define __CPUFREQ_SYSCTL_H__ ++#ifndef __CPUFREQ_SELECTOR_SYSCTL_H__ ++#define __CPUFREQ_SELECTOR_SYSCTL_H__ + +#include <glib-object.h> + -+#include "cpufreq.h" ++#include "cpufreq-selector.h" ++ ++G_BEGIN_DECLS + -+#define TYPE_CPUFREQ_SYSCTL (cpufreq_sysctl_get_type ()) -+#define CPUFREQ_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctl)) -+#define CPUFREQ_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctlClass)) -+#define IS_CPUFREQ_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CPUFREQ_SYSCTL)) -+#define IS_CPUFREQ_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CPUFREQ_SYSCTL)) -+#define CPUFREQ_SYSCTL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctlClass)) ++#define CPUFREQ_TYPE_SELECTOR_SYSCTL (cpufreq_selector_sysctl_get_type ()) ++#define CPUFREQ_SELECTOR_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CPUFREQ_TYPE_SELECTOR_SYSCTL, CPUFreqSelectorProcfs)) ++#define CPUFREQ_SELECTOR_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), CPUFREQ_TYPE_SELECTOR_SYSCTL, CPUFreqSelectorProcfsClass)) ++#define CPUFREQ_IS_SELECTOR_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CPUFREQ_TYPE_SELECTOR_SYSCTL)) ++#define CPUFREQ_IS_SELECTOR_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CPUFREQ_TYPE_SELECTOR_SYSCTL)) ++#define CPUFREQ_SELECTOR_SYSCTL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CPUFREQ_TYPE_SELECTOR_SYSCTL, CPUFreqSelectorProcfsClass)) + -+typedef struct _CPUFreqSysctl CPUFreqSysctl; -+typedef struct _CPUFreqSysctlClass CPUFreqSysctlClass; -+typedef struct _CPUFreqSysctlPriv CPUFreqSysctlPriv; ++typedef struct _CPUFreqSelectorSysctl CPUFreqSelectorSysctl; ++typedef struct _CPUFreqSelectorSysctlClass CPUFreqSelectorSysctlClass; + -+struct _CPUFreqSysctl { -+ CPUFreq parent; ++struct _CPUFreqSelectorSysctl { ++ CPUFreqSelector parent; +}; + -+struct _CPUFreqSysctlClass { -+ CPUFreqClass parent_class; ++struct _CPUFreqSelectorSysctlClass { ++ CPUFreqSelectorClass parent_class; +}; + ++GType cpufreq_selector_sysctl_get_type (void) G_GNUC_CONST; ++CPUFreqSelector *cpufreq_selector_sysctl_new (guint cpu); + -+GType cpufreq_sysctl_get_type (); -+CPUFreqSysctl *cpufreq_sysctl_new (); ++G_END_DECLS + -+#endif /* __CPUFREQ_SYSCTL_H__ */ ---- cpufreq/src/cpufreq-selector/cpufreq-sysctl.c.orig Mon Feb 14 00:38:52 2005 -+++ cpufreq/src/cpufreq-selector/cpufreq-sysctl.c Mon Feb 14 00:44:43 2005 -@@ -0,0 +1,235 @@ ++#endif /* __CPUFREQ_SELECTOR_SYSCTL_H__ */ +--- cpufreq/src/cpufreq-selector/main.c.orig Sat Jun 17 22:13:41 2006 ++++ cpufreq/src/cpufreq-selector/main.c Sat Jun 24 02:15:02 2006 +@@ -17,6 +17,7 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Authors : Carlos García Campos <carlosgc@gnome.org> ++ * Joe Marcus Clarke <marcus@FreeBSD.org> + */ + + #ifdef HAVE_CONFIG_H +@@ -33,6 +34,9 @@ + #ifdef HAVE_LIBCPUFREQ + #include "cpufreq-selector-libcpufreq.h" + #endif ++#ifdef __FreeBSD__ ++#include "cpufreq-selector-sysctl.h" ++#endif /* __FreeBSD__ */ + + static gint cpu = 0; + static gchar *governor = NULL; +@@ -51,6 +55,9 @@ main (gint argc, gchar **argv) + CPUFreqSelector *selector; + GOptionContext *context; + GError *error = NULL; ++#ifdef __FreeBSD__ ++ size_t len; ++#endif + + if (geteuid () != 0) { + g_printerr ("You must be root\n"); +@@ -83,10 +90,15 @@ main (gint argc, gchar **argv) + #ifdef HAVE_LIBCPUFREQ + selector = cpufreq_selector_libcpufreq_new (cpu); + #else ++#ifndef __FreeBSD__ + if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ + selector = cpufreq_selector_sysfs_new (cpu); + } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */ + selector = cpufreq_selector_procfs_new (cpu); ++#else ++ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { ++ selector = cpufreq_selector_sysctl_new (cpu); ++#endif /* __FreeBSD__ */ + } else { + g_printerr ("No cpufreq support\n"); + return 1; +--- cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.c.orig Wed Jul 26 01:34:18 2006 ++++ cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.c Wed Jul 26 01:42:00 2006 +@@ -0,0 +1,87 @@ +/* + * Copyright (C) 2001, 2002 Free Software Foundation + * @@ -84,290 +176,61 @@ +#include <sys/sysctl.h> +#endif /* __FreeBSD__ */ + -+#include "cpufreq-sysctl.h" -+ -+#define PARENT_TYPE TYPE_CPUFREQ -+ -+#define CPUFREQ_SYSCTL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctlPrivate)) -+ -+static void cpufreq_sysctl_init (CPUFreqSysctl *cfq); -+static void cpufreq_sysctl_class_init (CPUFreqSysctlClass *klass); -+static void cpufreq_sysctl_finalize (GObject *object); -+ -+static void cpufreq_sysctl_set_governor (CPUFreq *cfq, const gchar *governor); -+static void cpufreq_sysctl_set_frequency (CPUFreq *cfq, gint frequency); -+ -+static void cpufreq_sysctl_setup (CPUFreqSysctl *cfq); -+ -+static GObjectClass *parent_class = NULL; -+ -+typedef struct _CPUFreqSysctlPrivate CPUFreqSysctlPrivate; -+ -+struct _CPUFreqSysctlPrivate -+{ -+ gint pmax; -+}; -+ -+GType cpufreq_sysctl_get_type () -+{ -+ static GType type = 0; ++#include "cpufreq-selector-sysctl.h" + -+ if (!type) { -+ static const GTypeInfo info = { -+ sizeof (CPUFreqSysctlClass), -+ (GBaseInitFunc) NULL, -+ (GBaseFinalizeFunc) NULL, -+ (GClassInitFunc) cpufreq_sysctl_class_init, -+ NULL, -+ NULL, -+ sizeof (CPUFreqSysctl), -+ 0, -+ (GInstanceInitFunc) cpufreq_sysctl_init -+ }; ++static void cpufreq_selector_sysctl_init (CPUFreqSelectorSysctl *selector); ++static void cpufreq_selector_sysctl_class_init (CPUFreqSelectorSysctlClass *klass); + -+ type = g_type_register_static (PARENT_TYPE, "CPUFreqSysctl", -+ &info, 0); -+ } ++static gboolean cpufreq_selector_sysctl_set_frequency (CPUFreqSelector *selector, guint frequency, GError **error); ++static gboolean cpufreq_selector_sysctl_set_governor (CPUFreqSelector *selector, const gchar *governor, GError **error); + -+ return type; -+} ++G_DEFINE_TYPE (CPUFreqSelectorSysctl, cpufreq_selector_sysctl, CPUFREQ_TYPE_SELECTOR) + +static void -+cpufreq_sysctl_init (CPUFreqSysctl *cfq) ++cpufreq_selector_sysctl_init (CPUFreqSelectorSysctl *selector) +{ -+ CPUFreqSysctlPrivate *private; -+ -+ g_return_if_fail (IS_CPUFREQ_SYSCTL (cfq)); -+ -+ private = CPUFREQ_SYSCTL_GET_PRIVATE (cfq); +} + +static void -+cpufreq_sysctl_class_init (CPUFreqSysctlClass *klass) ++cpufreq_selector_sysctl_class_init (CPUFreqSelectorSysctlClass *klass) +{ -+ GObjectClass *object_class = G_OBJECT_CLASS (klass); -+ CPUFreqClass *cfq_class = CPUFREQ_CLASS (klass); -+ -+ parent_class = g_type_class_peek_parent (klass); -+ -+ g_type_class_add_private (klass, sizeof (CPUFreqSysctlPrivate)); -+ -+ cfq_class->set_governor = cpufreq_sysctl_set_governor; -+ cfq_class->set_frequency = cpufreq_sysctl_set_frequency; ++ CPUFreqSelectorClass *selector_class = CPUFREQ_SELECTOR_CLASS (klass); + -+ object_class->finalize = cpufreq_sysctl_finalize; ++ selector_class->set_frequency = cpufreq_selector_sysctl_set_frequency; ++ selector_class->set_governor = cpufreq_selector_sysctl_set_governor; +} + -+static void -+cpufreq_sysctl_finalize (GObject *object) -+{ -+ if (G_OBJECT_CLASS (parent_class)->finalize) -+ (* G_OBJECT_CLASS (parent_class)->finalize) (object); -+} -+ -+CPUFreqSysctl * -+cpufreq_sysctl_new () ++CPUFreqSelector * ++cpufreq_selector_sysctl_new (guint cpu) +{ -+ CPUFreqSysctl *cfq; -+ -+ cfq = g_object_new (TYPE_CPUFREQ_SYSCTL, NULL); ++ CPUFreqSelector *selector; + -+ cpufreq_sysctl_setup (cfq); ++ selector = CPUFREQ_SELECTOR (g_object_new (CPUFREQ_TYPE_SELECTOR_SYSCTL, ++ "cpu", cpu, NULL)); + -+ return cfq; ++ return selector; +} + -+static void -+cpufreq_sysctl_set_governor (CPUFreq *cfq, const gchar *governor) ++static gboolean ++cpufreq_selector_sysctl_set_governor (CPUFreqSelector *selector, const gchar *governor, GError **error) +{ -+ /* Not implemented. */ ++ return TRUE; +} + -+static void -+cpufreq_sysctl_set_frequency (CPUFreq *cfq, gint frequency) ++static gboolean ++cpufreq_selector_sysctl_set_frequency (CPUFreqSelector *selector, guint frequency, GError **error) +{ -+ gint cpu, i; ++ guint cpu, i; + size_t len; + gchar *freq_oid; + -+ g_return_if_fail (IS_CPUFREQ_SYSCTL (cfq)); -+ -+ g_object_get (G_OBJECT (cfq), "n_cpu", &cpu, NULL); -+ -+ frequency = (gint) ((gdouble) frequency / 1000); /* Convert back to MHz*/ -+ -+ for (i = 0; i < cpu; i++) { -+ freq_oid = g_strdup_printf ("dev.cpu.%d.freq", i); -+ -+ sysctlbyname (freq_oid, NULL, &len, &frequency, sizeof (frequency)); -+ g_free (freq_oid); -+ } -+} -+ -+ -+static void -+cpufreq_sysctl_setup (CPUFreqSysctl *cfq) -+{ -+ guint cpu; -+ gint fmax, fmin; -+ gint pmax; -+ gint ifreq; -+ gint mib[4]; -+ gchar *governor, *levels; -+ gchar **levelsp, **frpr, **l; -+ size_t len; -+ CPUFreqSysctlPrivate *private; -+ -+ g_return_if_fail (IS_CPUFREQ_SYSCTL (cfq)); -+ -+ private = CPUFREQ_SYSCTL_GET_PRIVATE (cfq); ++ g_object_get (G_OBJECT (selector), "cpu", &cpu, NULL); + -+ pmax = 100; -+ fmax = 0; -+ fmin = 0; -+ ifreq = 0; ++ frequency = (guint) ((gdouble) frequency / 1000); /* Convert back to MHz*/ ++ freq_oid = g_strdup_printf ("dev.cpu.%d.freq", (gint) cpu); + -+ private->pmax = pmax; ++ sysctlbyname (freq_oid, NULL, &len, &frequency, sizeof (frequency)); ++ g_free (freq_oid); + -+ len = sizeof (cpu); -+ -+ if (sysctlbyname ("hw.ncpu", &cpu, &len, NULL, 0) == -1) -+ cpu = 1; -+ -+ len = 4; -+ sysctlnametomib ("dev.cpu.0.freq_levels", mib, &len); -+ len = sizeof (levels); -+ -+ if (sysctl (mib, 4, NULL, &len, NULL, 0) == -1) { -+ g_warning ("Failed to fetch dev.cpu.0.freq_levels"); -+ return; -+ } -+ -+ levels = g_malloc (len); -+ if (sysctl (mib, 4, levels, &len, NULL, 0) == -1) { -+ g_warning ("Failed to fetch data for dev.cpu.0.freq_levels"); -+ return; -+ } -+ -+ levelsp = g_strsplit (levels, " ", 0); -+ g_free (levels); -+ -+ frpr = g_strsplit (levelsp[0], "/", 0); /* MAX */ -+ if (frpr && frpr[0] != NULL) -+ fmax = atoi (frpr[0]); -+ g_strfreev (frpr); -+ -+ for (l = levelsp; l && *l; l++) /* Walk to the last frequency */ -+ ; -+ -+ l --; -+ frpr = g_strsplit (*l, "/", 0); -+ if (frpr && frpr[0] != NULL) -+ fmin = atoi (frpr[0]); -+ -+ g_strfreev (frpr); -+ g_strfreev (levelsp); -+ -+ len = sizeof (ifreq); -+ if (sysctlbyname ("dev.cpu.0.freq", &ifreq, &len, NULL, 0) == -1) { -+ g_warning ("Failed to fetch data for dev.cpu.0.freq"); -+ return; -+ } -+ -+ if (ifreq == fmax) -+ governor = g_strdup ("performance"); -+ else if (ifreq == fmin) -+ governor = g_strdup ("economy"); -+ else -+ governor = g_strdup ("other"); -+ -+ fmax *= 1000; -+ fmin *= 1000; -+ -+ g_object_set (G_OBJECT (cfq), "n_cpu", cpu, -+ "sc_max", fmax, "sc_min", fmin, -+ "governor", governor, NULL); -+ -+ g_free (governor); ++ return TRUE; +} ---- cpufreq/src/cpufreq-selector/main.c.orig Sun Apr 3 12:03:13 2005 -+++ cpufreq/src/cpufreq-selector/main.c Sun Jul 3 17:16:19 2005 -@@ -17,6 +17,7 @@ - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Authors : Carlos García Campos <carlosgc@gnome.org> -+ * Joe Marcus Clarke <marcus@FreeBSD.org> - */ - - #include <glib-object.h> -@@ -26,6 +27,9 @@ - #include "cpufreq.h" - #include "cpufreq-sysfs.h" - #include "cpufreq-procfs.h" -+#ifdef __FreeBSD__ -+#include "cpufreq-sysctl.h" -+#endif /* __FreeBSD__ */ - - gint - main (gint argc, gchar **argv) -@@ -34,6 +38,9 @@ main (gint argc, gchar **argv) - static gint cpu = 0; - static gchar *governor = NULL; - static gulong frequency = 0; -+#ifdef __FreeBSD__ -+ size_t len; -+#endif /* __FreeBSD__ */ - GError *error = NULL; - CPUFreq *cfq; - -@@ -71,10 +78,15 @@ main (gint argc, gchar **argv) - - g_option_context_free (context); - -+#ifndef __FreeBSD__ - if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ - cfq = CPUFREQ (cpufreq_sysfs_new ()); - } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */ - cfq = CPUFREQ (cpufreq_procfs_new ()); -+#else -+ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { -+ cfq = CPUFREQ (cpufreq_sysctl_new ()); -+#endif /* __FreeBSD__ */ - } else { - g_print ("No cpufreq support\n"); - return 1; ---- cpufreq/src/cpufreq-selector/Makefile.in.orig Tue Oct 4 00:21:25 2005 -+++ cpufreq/src/cpufreq-selector/Makefile.in Tue Oct 4 00:27:54 2005 -@@ -55,7 +55,7 @@ - PROGRAMS = $(bin_PROGRAMS) - am_cpufreq_selector_OBJECTS = cpufreq.$(OBJEXT) \ - cpufreq-sysfs.$(OBJEXT) cpufreq-procfs.$(OBJEXT) \ -- main.$(OBJEXT) -+ cpufreq-sysctl.$(OBJEXT) main.$(OBJEXT) - cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS) - am__DEPENDENCIES_1 = - cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) -@@ -64,6 +64,7 @@ - am__depfiles_maybe = depfiles - @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-procfs.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysfs.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysctl.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq.Po ./$(DEPDIR)/main.Po - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -332,6 +333,7 @@ - cpufreq.c cpufreq.h \ - cpufreq-sysfs.c cpufreq-sysfs.h \ - cpufreq-procfs.c cpufreq-procfs.h \ -+ cpufreq-sysctl.c cpufreq-sysctl.h \ - main.c - - cpufreq_selector_LDADD = $(CPUFREQ_SELECTOR_LIBS) -lpopt -@@ -407,6 +409,7 @@ - -rm -f *.tab.c - - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-procfs.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysctl.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysfs.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ diff --git a/x11/gnome-applets/files/patch-invest-applet_invest_invest-applet.py b/x11/gnome-applets/files/patch-invest-applet_invest_invest-applet.py new file mode 100644 index 000000000000..0dc24164ec34 --- /dev/null +++ b/x11/gnome-applets/files/patch-invest-applet_invest_invest-applet.py @@ -0,0 +1,13 @@ +--- invest-applet/invest/invest-applet.py.orig Wed Sep 13 20:42:15 2006 ++++ invest-applet/invest/invest-applet.py Wed Sep 13 20:42:28 2006 +@@ -26,8 +26,8 @@ import invest, invest.applet, invest.def + import gettext, locale + gettext.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR) + gettext.textdomain(invest.defs.GETTEXT_PACKAGE) +-locale.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR) +-locale.textdomain(invest.defs.GETTEXT_PACKAGE) ++#locale.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR) ++#locale.textdomain(invest.defs.GETTEXT_PACKAGE) + gtk.glade.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR) + gtk.glade.textdomain(invest.defs.GETTEXT_PACKAGE) + diff --git a/x11/gnome-applets/files/patch-invest-applet_invest_invest-chart b/x11/gnome-applets/files/patch-invest-applet_invest_invest-chart new file mode 100644 index 000000000000..2eddc8154089 --- /dev/null +++ b/x11/gnome-applets/files/patch-invest-applet_invest_invest-chart @@ -0,0 +1,13 @@ +--- invest-applet/invest/invest-chart.orig Wed Sep 13 20:41:18 2006 ++++ invest-applet/invest/invest-chart Wed Sep 13 20:41:33 2006 +@@ -6,8 +6,8 @@ import sys, invest.chart, gtk + import gettext, locale + gettext.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR) + gettext.textdomain(invest.defs.GETTEXT_PACKAGE) +-locale.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR) +-locale.textdomain(invest.defs.GETTEXT_PACKAGE) ++#locale.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR) ++#locale.textdomain(invest.defs.GETTEXT_PACKAGE) + gtk.glade.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR) + gtk.glade.textdomain(invest.defs.GETTEXT_PACKAGE) + diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist index 2cf9c24b329f..28938b5e5944 100644 --- a/x11/gnome-applets/pkg-plist +++ b/x11/gnome-applets/pkg-plist @@ -1,8 +1,13 @@ %%CPUFREQ%%bin/cpufreq-selector bin/gswitchit-plugins-capplet +%%PYTHON%%bin/invest-chart %%BATTERY%%etc/sound/events/battstat_applet.soundlist -include/libgswitchit/gswitchit_config.h -include/libgswitchit/gswitchit_plugin.h +include/libgswitchit/gnome-kbd-indicator.h +include/libgswitchit/gswitchit-config-private.h +include/libgswitchit/gswitchit-config.h +include/libgswitchit/gswitchit-plugin.h +include/libgswitchit/keyboard-config-registry-client.h +include/libgswitchit/keyboard-config-registry.h include/libgweather/gweather-gconf.h include/libgweather/gweather-prefs.h include/libgweather/weather.h @@ -10,6 +15,30 @@ lib/libgweather.a lib/libgweather.la lib/libgweather.so lib/libgweather.so.0 +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/__init__.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/__init__.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/about.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/about.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/about.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/applet.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/applet.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/applet.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/chart.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/chart.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/chart.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/defs.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/defs.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/defs.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/preferences.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/preferences.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/preferences.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/quotes.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/quotes.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/quotes.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/widgets.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/widgets.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/widgets.pyo libdata/bonobo/servers/GNOME_AccessxStatusApplet.server %%BATTERY%%libdata/bonobo/servers/GNOME_BattstatApplet.server libdata/bonobo/servers/GNOME_CDPlayerApplet.server @@ -29,6 +58,7 @@ libdata/bonobo/servers/GNOME_NullApplet_Factory.server libdata/bonobo/servers/GNOME_Panel_TrashApplet.server libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server libdata/bonobo/servers/GNOME_StickyNotesApplet.server +%%PYTHON%%libdata/bonobo/servers/Invest_Applet.server libdata/pkgconfig/gswitchit.pc libdata/pkgconfig/gweather.pc libexec/accessx-status-applet @@ -39,8 +69,8 @@ libexec/drivemount_applet2 libexec/geyes_applet2 %%COMMANDER%%libexec/gnome-applets/mc-install-default-macros libexec/gnome-keyboard-applet -libexec/gtik2_applet2 libexec/gweather-applet-2 +%%PYTHON%%libexec/invest-applet %%COMMANDER%%libexec/mini_commander_applet libexec/mixer_applet2 libexec/modem_applet @@ -48,6 +78,8 @@ libexec/multiload-applet-2 libexec/null_applet libexec/stickynotes_applet libexec/trashapplet +share/gnome/applications/gswitchit-plugins.desktop +%%PYTHON%%share/gnome/applications/invest-chart.desktop share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.xml %%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml %%CPUFREQ%%share/gnome/gnome-2.0/ui/GNOME_CPUFreqApplet.xml @@ -56,13 +88,13 @@ share/gnome/gnome-2.0/ui/GNOME_DriveMountApplet.xml share/gnome/gnome-2.0/ui/GNOME_GSwitchItApplet.xml share/gnome/gnome-2.0/ui/GNOME_GWeatherApplet.xml share/gnome/gnome-2.0/ui/GNOME_GeyesApplet.xml -share/gnome/gnome-2.0/ui/GNOME_GtikApplet.xml %%COMMANDER%%share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml share/gnome/gnome-2.0/ui/GNOME_ModemLights.xml share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml share/gnome/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml +%%PYTHON%%share/gnome/gnome-2.0/ui/Invest_Applet.xml share/gnome/gnome-applets/geyes/Bizarre/Bizarre-eye.png share/gnome/gnome-applets/geyes/Bizarre/Bizarre-pupil.png share/gnome/gnome-applets/geyes/Bizarre/config @@ -78,16 +110,24 @@ share/gnome/gnome-applets/geyes/Default/config share/gnome/gnome-applets/geyes/Horrid/config share/gnome/gnome-applets/geyes/Horrid/horrid_eye.png share/gnome/gnome-applets/geyes/Horrid/horrid_pupil.png +share/gnome/gnome-applets/geyes/Tango/config +share/gnome/gnome-applets/geyes/Tango/tango-eye.png +share/gnome/gnome-applets/geyes/Tango/tango-pupil.png %%BATTERY%%share/gnome/gnome-applets/glade/battstat_applet.glade %%CPUFREQ%%share/gnome/gnome-applets/glade/cpufreq-preferences.glade +%%PYTHON%%share/gnome/gnome-applets/glade/financialchart.glade share/gnome/gnome-applets/glade/gswitchit-plugins.glade share/gnome/gnome-applets/glade/gswitchit.glade %%COMMANDER%%share/gnome/gnome-applets/glade/mini-commander.glade share/gnome/gnome-applets/glade/modemlights.glade +%%PYTHON%%share/gnome/gnome-applets/glade/prefs-dialog.glade share/gnome/gnome-applets/glade/stickynotes.glade share/gnome/gnome-applets/glade/trashapplet.glade share/gnome/gnome-applets/gweather/Locations.xml share/gnome/gnome-applets/gweather/locations.dtd +%%PYTHON%%share/gnome/gnome-applets/invest-applet/invest-16.png +%%PYTHON%%share/gnome/gnome-applets/invest-applet/invest-button.png +%%PYTHON%%share/gnome/gnome-applets/invest-applet/invest.svg share/gnome/help/accessx-status/C/accessx-status.xml share/gnome/help/accessx-status/C/figures/accessx-status-applet.png share/gnome/help/accessx-status/C/figures/accessx-status-disabled.png @@ -149,6 +189,30 @@ share/gnome/help/accessx-status/it/figures/accessx_sticky-keys.png share/gnome/help/accessx-status/it/figures/accessx_sticky-meta-key.png share/gnome/help/accessx-status/it/figures/accessx_sticky-shift-key.png share/gnome/help/accessx-status/it/figures/accessx_sticky-windows-key.png +share/gnome/help/accessx-status/nl/accessx-status.xml +share/gnome/help/accessx-status/nl/figures/accessx-status-applet.png +share/gnome/help/accessx-status/nl/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/nl/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/nl/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/nl/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/nl/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/nl/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/nl/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/nl/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/nl/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/nl/figures/accessx_sticky-windows-key.png +share/gnome/help/accessx-status/sv/accessx-status.xml +share/gnome/help/accessx-status/sv/figures/accessx-status-applet.png +share/gnome/help/accessx-status/sv/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/sv/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/sv/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/sv/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/sv/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/sv/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/sv/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/sv/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/sv/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/sv/figures/accessx_sticky-windows-key.png share/gnome/help/accessx-status/uk/accessx-status.xml share/gnome/help/accessx-status/uk/figures/accessx-status-applet.png share/gnome/help/accessx-status/uk/figures/accessx-status-disabled.png @@ -186,6 +250,12 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png %%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-credits-hal.png %%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-preferences.png %%BATTERY%%share/gnome/help/battstat/fr/figures/context-menu.png +%%BATTERY%%share/gnome/help/battstat/sv/battstat.xml +%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet-expanded.png +%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-credits-hal.png +%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-preferences.png +%%BATTERY%%share/gnome/help/battstat/sv/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 @@ -228,6 +298,11 @@ share/gnome/help/char-palette/pt_BR/figures/charpalette_applet.png share/gnome/help/char-palette/pt_BR/figures/charpalette_chargroup.png share/gnome/help/char-palette/pt_BR/figures/charpick-preferences.png share/gnome/help/char-palette/pt_BR/figures/charpick_characters.png +share/gnome/help/char-palette/sv/char-palette.xml +share/gnome/help/char-palette/sv/figures/charpalette_applet.png +share/gnome/help/char-palette/sv/figures/charpalette_chargroup.png +share/gnome/help/char-palette/sv/figures/charpick-preferences.png +share/gnome/help/char-palette/sv/figures/charpick_characters.png share/gnome/help/char-palette/uk/char-palette.xml share/gnome/help/char-palette/uk/figures/charpalette_applet.png share/gnome/help/char-palette/uk/figures/charpalette_chargroup.png @@ -250,6 +325,10 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png %%COMMANDER%%share/gnome/help/command-line/pt_BR/figures/command-line.png %%COMMANDER%%share/gnome/help/command-line/pt_BR/figures/prefs-macros.png %%COMMANDER%%share/gnome/help/command-line/pt_BR/figures/prefs.png +%%COMMANDER%%share/gnome/help/command-line/sv/command-line.xml +%%COMMANDER%%share/gnome/help/command-line/sv/figures/command-line.png +%%COMMANDER%%share/gnome/help/command-line/sv/figures/prefs-macros.png +%%COMMANDER%%share/gnome/help/command-line/sv/figures/prefs.png %%COMMANDER%%share/gnome/help/command-line/uk/command-line.xml %%COMMANDER%%share/gnome/help/command-line/uk/figures/command-line.png %%COMMANDER%%share/gnome/help/command-line/uk/figures/prefs-macros.png @@ -275,6 +354,16 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.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/fr/cpufreq-applet.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-100.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-25.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-50.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet-preferences-smp.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet-selector-both.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/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 @@ -285,6 +374,16 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-selector-both.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-selector.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/cpufreq-applet.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-100.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-25.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-50.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-applet-preferences-smp.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-applet-selector-both.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/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 @@ -295,6 +394,16 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-selector-both.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-selector.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/cpufreq-applet.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-100.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-25.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-50.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-preferences-smp.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-selector-both.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet.png share/gnome/help/drivemount/C/drivemount.xml share/gnome/help/drivemount/C/figures/drivemount-applet_eject.png share/gnome/help/drivemount/C/figures/drivemount-applet_example.png @@ -326,12 +435,24 @@ share/gnome/help/drivemount/pa/figures/drivemount-applet_example.png share/gnome/help/drivemount/pa/figures/drivemount-applet_mount.png share/gnome/help/drivemount/pa/figures/drivemount-applet_open.png share/gnome/help/drivemount/pa/figures/drivemount-applet_status.png +share/gnome/help/drivemount/sv/drivemount.xml +share/gnome/help/drivemount/sv/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/sv/figures/drivemount-applet_example.png +share/gnome/help/drivemount/sv/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/sv/figures/drivemount-applet_open.png +share/gnome/help/drivemount/sv/figures/drivemount-applet_status.png share/gnome/help/drivemount/uk/drivemount.xml share/gnome/help/drivemount/uk/figures/drivemount-applet_eject.png share/gnome/help/drivemount/uk/figures/drivemount-applet_example.png share/gnome/help/drivemount/uk/figures/drivemount-applet_mount.png share/gnome/help/drivemount/uk/figures/drivemount-applet_open.png share/gnome/help/drivemount/uk/figures/drivemount-applet_status.png +share/gnome/help/drivemount/zh_CN/drivemount.xml +share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_example.png +share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_open.png +share/gnome/help/drivemount/zh_CN/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 @@ -345,22 +466,16 @@ 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/sv/figures/geyes_applet.png +share/gnome/help/geyes/sv/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 share/gnome/help/gswitchit/C/legal.xml share/gnome/help/gswitchit/es/gswitchit.xml share/gnome/help/gswitchit/fr/gswitchit.xml +share/gnome/help/gswitchit/sv/gswitchit.xml share/gnome/help/gswitchit/uk/gswitchit.xml -share/gnome/help/gtik2_applet2/C/figures/gtik_applet.png -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 share/gnome/help/gweather/C/figures/gweather-menu-prefs.png share/gnome/help/gweather/C/figures/gweather-prefs-general.png @@ -422,6 +537,21 @@ share/gnome/help/gweather/nl/figures/stock_weather-snow.png share/gnome/help/gweather/nl/figures/stock_weather-storm.png share/gnome/help/gweather/nl/figures/stock_weather-sunny.png share/gnome/help/gweather/nl/gweather.xml +share/gnome/help/gweather/sv/figures/gweather-details.png +share/gnome/help/gweather/sv/figures/gweather-menu-prefs.png +share/gnome/help/gweather/sv/figures/gweather-prefs-general.png +share/gnome/help/gweather/sv/figures/gweather-prefs-locations.png +share/gnome/help/gweather/sv/figures/gweather_applet.png +share/gnome/help/gweather/sv/figures/stock_weather-cloudy.png +share/gnome/help/gweather/sv/figures/stock_weather-few-clouds.png +share/gnome/help/gweather/sv/figures/stock_weather-fog.png +share/gnome/help/gweather/sv/figures/stock_weather-night-clear.png +share/gnome/help/gweather/sv/figures/stock_weather-night-few-clouds.png +share/gnome/help/gweather/sv/figures/stock_weather-showers.png +share/gnome/help/gweather/sv/figures/stock_weather-snow.png +share/gnome/help/gweather/sv/figures/stock_weather-storm.png +share/gnome/help/gweather/sv/figures/stock_weather-sunny.png +share/gnome/help/gweather/sv/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 @@ -446,6 +576,8 @@ share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/fr/mixer_applet2.xml share/gnome/help/mixer_applet2/it/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/it/mixer_applet2.xml +share/gnome/help/mixer_applet2/sv/figures/volumecontrol_applet.png +share/gnome/help/mixer_applet2/sv/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 @@ -461,6 +593,10 @@ share/gnome/help/multiload/fr/figures/multiload-preferences.png share/gnome/help/multiload/fr/figures/system-monitor-applet_window.png share/gnome/help/multiload/fr/figures/system_monitor.png share/gnome/help/multiload/fr/multiload.xml +share/gnome/help/multiload/sv/figures/multiload-preferences.png +share/gnome/help/multiload/sv/figures/system-monitor-applet_window.png +share/gnome/help/multiload/sv/figures/system_monitor.png +share/gnome/help/multiload/sv/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 @@ -484,6 +620,12 @@ share/gnome/help/stickynotes_applet/fr/figures/stickynotes-note-prefs.png share/gnome/help/stickynotes_applet/fr/figures/stickynotes-prefs.png share/gnome/help/stickynotes_applet/fr/figures/stickynotes_applet.png share/gnome/help/stickynotes_applet/fr/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/sv/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/sv/figures/stickynote-right-menu-new.png +share/gnome/help/stickynotes_applet/sv/figures/stickynotes-note-prefs.png +share/gnome/help/stickynotes_applet/sv/figures/stickynotes-prefs.png +share/gnome/help/stickynotes_applet/sv/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/sv/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 @@ -505,6 +647,8 @@ 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/sv/figures/trash-applet.png +share/gnome/help/trashapplet/sv/trashapplet.xml share/gnome/help/trashapplet/uk/figures/trash-applet.png share/gnome/help/trashapplet/uk/trashapplet.xml share/gnome/omf/accessx-status/accessx-status-C.omf @@ -512,11 +656,14 @@ 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-nl.omf +share/gnome/omf/accessx-status/accessx-status-sv.omf share/gnome/omf/accessx-status/accessx-status-uk.omf %%BATTERY%%share/gnome/omf/battstat/battstat-C.omf %%BATTERY%%share/gnome/omf/battstat/battstat-bg.omf %%BATTERY%%share/gnome/omf/battstat/battstat-es.omf %%BATTERY%%share/gnome/omf/battstat/battstat-fr.omf +%%BATTERY%%share/gnome/omf/battstat/battstat-sv.omf %%BATTERY%%share/gnome/omf/battstat/battstat-uk.omf share/gnome/omf/char-palette/char-palette-C.omf share/gnome/omf/char-palette/char-palette-bg.omf @@ -525,54 +672,63 @@ share/gnome/omf/char-palette/char-palette-fr.omf share/gnome/omf/char-palette/char-palette-it.omf share/gnome/omf/char-palette/char-palette-nl.omf share/gnome/omf/char-palette/char-palette-pt_BR.omf +share/gnome/omf/char-palette/char-palette-sv.omf share/gnome/omf/char-palette/char-palette-uk.omf %%COMMANDER%%share/gnome/omf/command-line/command-line-C.omf %%COMMANDER%%share/gnome/omf/command-line/command-line-es.omf %%COMMANDER%%share/gnome/omf/command-line/command-line-fr.omf %%COMMANDER%%share/gnome/omf/command-line/command-line-pt_BR.omf +%%COMMANDER%%share/gnome/omf/command-line/command-line-sv.omf %%COMMANDER%%share/gnome/omf/command-line/command-line-uk.omf %%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-C.omf %%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-es.omf +%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-fr.omf %%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-nl.omf +%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-sv.omf %%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-uk.omf +%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-zh_CN.omf share/gnome/omf/drivemount/drivemount-C.omf share/gnome/omf/drivemount/drivemount-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-sv.omf share/gnome/omf/drivemount/drivemount-uk.omf +share/gnome/omf/drivemount/drivemount-zh_CN.omf share/gnome/omf/geyes/geyes-C.omf share/gnome/omf/geyes/geyes-bg.omf share/gnome/omf/geyes/geyes-es.omf share/gnome/omf/geyes/geyes-fr.omf share/gnome/omf/geyes/geyes-it.omf share/gnome/omf/geyes/geyes-ru.omf +share/gnome/omf/geyes/geyes-sv.omf share/gnome/omf/geyes/geyes-uk.omf share/gnome/omf/gswitchit/gswitchit-C.omf share/gnome/omf/gswitchit/gswitchit-es.omf share/gnome/omf/gswitchit/gswitchit-fr.omf +share/gnome/omf/gswitchit/gswitchit-sv.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-sv.omf share/gnome/omf/gweather/gweather-uk.omf share/gnome/omf/mixer_applet2/mixer_applet2-C.omf share/gnome/omf/mixer_applet2/mixer_applet2-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-sv.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-sv.omf share/gnome/omf/multiload/multiload-uk.omf share/gnome/omf/stickynotes_applet/stickynotes_applet-C.omf share/gnome/omf/stickynotes_applet/stickynotes_applet-es.omf share/gnome/omf/stickynotes_applet/stickynotes_applet-fr.omf +share/gnome/omf/stickynotes_applet/stickynotes_applet-sv.omf share/gnome/omf/stickynotes_applet/stickynotes_applet-uk.omf share/gnome/omf/trashapplet/trashapplet-C.omf share/gnome/omf/trashapplet/trashapplet-es.omf @@ -581,6 +737,7 @@ share/gnome/omf/trashapplet/trashapplet-it.omf share/gnome/omf/trashapplet/trashapplet-nl.omf share/gnome/omf/trashapplet/trashapplet-pa.omf share/gnome/omf/trashapplet/trashapplet-ru.omf +share/gnome/omf/trashapplet/trashapplet-sv.omf share/gnome/omf/trashapplet/trashapplet-uk.omf share/gnome/pixmaps/accessx-status-applet/ax-applet.png share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png @@ -622,14 +779,12 @@ share/gnome/pixmaps/accessx-status-applet/sticky-super-none.png %%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-25.png %%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-50.png %%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-75.png -%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-applet.png %%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-na.png +%%PYTHON%%share/gnome/pixmaps/invest-big.png share/gnome/pixmaps/stickynotes/close.png share/gnome/pixmaps/stickynotes/locked.png share/gnome/pixmaps/stickynotes/resize_se.png share/gnome/pixmaps/stickynotes/resize_sw.png -share/gnome/pixmaps/stickynotes/stickynotes.png -share/gnome/pixmaps/stickynotes/stickynotes_prelight.png share/gnome/pixmaps/stickynotes/unlocked.png share/gnome/xmodmap/base.xml share/gnome/xmodmap/xmodmap.am @@ -717,22 +872,38 @@ share/gnome/xmodmap/xmodmap.us.old share/gnome/xmodmap/xmodmap.us101A_x86 share/gnome/xmodmap/xmodmap.us_intl share/gnome/xmodmap/xmodmap.yu +share/icons/hicolor/16x16/apps/gnome-cpu-frequency-applet.png +share/icons/hicolor/16x16/apps/gnome-eyes-applet.png +share/icons/hicolor/16x16/apps/gnome-modem-monitor-applet.png +share/icons/hicolor/16x16/apps/gnome-sticky-notes-applet.png +share/icons/hicolor/22x22/apps/gnome-cpu-frequency-applet.png +share/icons/hicolor/22x22/apps/gnome-eyes-applet.png +share/icons/hicolor/22x22/apps/gnome-modem-monitor-applet.png +share/icons/hicolor/22x22/apps/gnome-sticky-notes-applet.png +share/icons/hicolor/24x24/apps/gnome-cpu-frequency-applet.png +share/icons/hicolor/24x24/apps/gnome-eyes-applet.png +share/icons/hicolor/24x24/apps/gnome-modem-monitor-applet.png +share/icons/hicolor/24x24/apps/gnome-sticky-notes-applet.png +share/icons/hicolor/32x32/apps/gnome-cpu-frequency-applet.png +share/icons/hicolor/32x32/apps/gnome-eyes-applet.png +share/icons/hicolor/32x32/apps/gnome-modem-monitor-applet.png +share/icons/hicolor/32x32/apps/gnome-sticky-notes-applet.png share/icons/hicolor/48x48/apps/ax-applet.png share/icons/hicolor/48x48/apps/charpick.png -share/icons/hicolor/48x48/apps/gnome-cpu.png -share/icons/hicolor/48x48/apps/gnome-eyes.png %%COMMANDER%%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 share/icons/hicolor/48x48/apps/gswitchit-properties-capplet.png +share/icons/hicolor/svgxsvg/apps/gnome-cpu-frequency-applet +share/icons/hicolor/svgxsvg/apps/gnome-eyes-applet +share/icons/hicolor/svgxsvg/apps/gnome-modem-monitor-applet +share/icons/hicolor/svgxsvg/apps/gnome-sticky-notes-applet share/locale/am/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo share/locale/be/LC_MESSAGES/gnome-applets-2.0.mo share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo share/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/br/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/bn_IN/LC_MESSAGES/gnome-applets-2.0.mo share/locale/bs/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo @@ -744,6 +915,23 @@ share/locale/el/LC_MESSAGES/gnome-applets-2.0.mo share/locale/en_CA/LC_MESSAGES/gnome-applets-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-applets-2.0.mo share/locale/es/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/es_AR/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/es_CL/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/es_CO/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/es_CR/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/es_DO/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/es_EC/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/es_ES/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/es_GT/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/es_HN/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/es_MX/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/es_NI/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/es_PA/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/es_PE/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/es_PR/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/es_SV/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/es_UY/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/es_VE/LC_MESSAGES/gnome-applets-2.0.mo share/locale/et/LC_MESSAGES/gnome-applets-2.0.mo share/locale/eu/LC_MESSAGES/gnome-applets-2.0.mo share/locale/fa/LC_MESSAGES/gnome-applets-2.0.mo @@ -767,15 +955,17 @@ 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/mg/LC_MESSAGES/gnome-applets-2.0.mo share/locale/mk/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ml/LC_MESSAGES/gnome-applets-2.0.mo share/locale/mn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/mr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nb/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ne/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/no/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/or/LC_MESSAGES/gnome-applets-2.0.mo share/locale/pa/LC_MESSAGES/gnome-applets-2.0.mo share/locale/pl/LC_MESSAGES/gnome-applets-2.0.mo share/locale/pt/LC_MESSAGES/gnome-applets-2.0.mo @@ -800,24 +990,8 @@ share/locale/xh/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_HK/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo -@dirrmtry share/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/locale/br/LC_MESSAGES -@dirrmtry share/locale/br +@dirrmtry share/icons/hicolor/svgxsvg/apps +@dirrmtry share/icons/hicolor/svgxsvg @dirrmtry share/icons/hicolor/48x48/apps @dirrmtry share/icons/hicolor/48x48 @dirrmtry share/icons/hicolor @@ -829,18 +1003,19 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/omf/stickynotes_applet @dirrm share/gnome/omf/multiload @dirrm share/gnome/omf/mixer_applet2 -%%COMMANDER%%@dirrm share/gnome/omf/command-line @dirrm share/gnome/omf/gweather -@dirrm share/gnome/omf/gtik2_applet2 @dirrm share/gnome/omf/gswitchit @dirrm share/gnome/omf/geyes @dirrm share/gnome/omf/drivemount %%CPUFREQ%%@dirrm share/gnome/omf/cpufreq-applet +%%COMMANDER%%@dirrm share/gnome/omf/command-line @dirrm share/gnome/omf/char-palette %%BATTERY%%@dirrm share/gnome/omf/battstat @dirrm share/gnome/omf/accessx-status @dirrm share/gnome/help/trashapplet/uk/figures @dirrm share/gnome/help/trashapplet/uk +@dirrm share/gnome/help/trashapplet/sv/figures +@dirrm share/gnome/help/trashapplet/sv @dirrm share/gnome/help/trashapplet/ru/figures @dirrm share/gnome/help/trashapplet/ru @dirrm share/gnome/help/trashapplet/pa/figures @@ -858,6 +1033,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/sv/figures +@dirrm share/gnome/help/stickynotes_applet/sv @dirrm share/gnome/help/stickynotes_applet/fr/figures @dirrm share/gnome/help/stickynotes_applet/fr @dirrm share/gnome/help/stickynotes_applet/es/figures @@ -867,6 +1044,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/sv/figures +@dirrm share/gnome/help/multiload/sv @dirrm share/gnome/help/multiload/fr/figures @dirrm share/gnome/help/multiload/fr @dirrm share/gnome/help/multiload/es/figures @@ -876,6 +1055,8 @@ 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/sv/figures +@dirrm share/gnome/help/mixer_applet2/sv @dirrm share/gnome/help/mixer_applet2/it/figures @dirrm share/gnome/help/mixer_applet2/it @dirrm share/gnome/help/mixer_applet2/fr/figures @@ -887,6 +1068,8 @@ 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/sv/figures +@dirrm share/gnome/help/gweather/sv @dirrm share/gnome/help/gweather/nl/figures @dirrm share/gnome/help/gweather/nl @dirrm share/gnome/help/gweather/fr/figures @@ -896,22 +1079,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/gweather/C/figures @dirrm share/gnome/help/gweather/C @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 -@dirrm share/gnome/help/gtik2_applet2/C -@dirrm share/gnome/help/gtik2_applet2 @dirrm share/gnome/help/gswitchit/uk +@dirrm share/gnome/help/gswitchit/sv @dirrm share/gnome/help/gswitchit/fr @dirrm share/gnome/help/gswitchit/es @dirrm share/gnome/help/gswitchit/C @dirrm share/gnome/help/gswitchit @dirrm share/gnome/help/geyes/uk/figures @dirrm share/gnome/help/geyes/uk +@dirrm share/gnome/help/geyes/sv/figures +@dirrm share/gnome/help/geyes/sv @dirrm share/gnome/help/geyes/ru/figures @dirrm share/gnome/help/geyes/ru @dirrm share/gnome/help/geyes/it/figures @@ -925,8 +1102,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/geyes/C/figures @dirrm share/gnome/help/geyes/C @dirrm share/gnome/help/geyes +@dirrm share/gnome/help/drivemount/zh_CN/figures +@dirrm share/gnome/help/drivemount/zh_CN @dirrm share/gnome/help/drivemount/uk/figures @dirrm share/gnome/help/drivemount/uk +@dirrm share/gnome/help/drivemount/sv/figures +@dirrm share/gnome/help/drivemount/sv @dirrm share/gnome/help/drivemount/pa/figures @dirrm share/gnome/help/drivemount/pa @dirrm share/gnome/help/drivemount/it/figures @@ -938,10 +1119,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/drivemount/C/figures @dirrm share/gnome/help/drivemount/C @dirrm share/gnome/help/drivemount +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_CN/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_CN %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/sv/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/sv %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fr/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fr %%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 @@ -949,6 +1136,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet %%COMMANDER%%@dirrm share/gnome/help/command-line/uk/figures %%COMMANDER%%@dirrm share/gnome/help/command-line/uk +%%COMMANDER%%@dirrm share/gnome/help/command-line/sv/figures +%%COMMANDER%%@dirrm share/gnome/help/command-line/sv %%COMMANDER%%@dirrm share/gnome/help/command-line/pt_BR/figures %%COMMANDER%%@dirrm share/gnome/help/command-line/pt_BR %%COMMANDER%%@dirrm share/gnome/help/command-line/fr/figures @@ -960,6 +1149,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo %%COMMANDER%%@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/sv/figures +@dirrm share/gnome/help/char-palette/sv @dirrm share/gnome/help/char-palette/pt_BR/figures @dirrm share/gnome/help/char-palette/pt_BR @dirrm share/gnome/help/char-palette/nl/figures @@ -977,6 +1168,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @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/sv/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/sv %%BATTERY%%@dirrm share/gnome/help/battstat/fr/figures %%BATTERY%%@dirrm share/gnome/help/battstat/fr %%BATTERY%%@dirrm share/gnome/help/battstat/es/figures @@ -988,6 +1181,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo %%BATTERY%%@dirrm share/gnome/help/battstat @dirrm share/gnome/help/accessx-status/uk/figures @dirrm share/gnome/help/accessx-status/uk +@dirrm share/gnome/help/accessx-status/sv/figures +@dirrm share/gnome/help/accessx-status/sv +@dirrm share/gnome/help/accessx-status/nl/figures +@dirrm share/gnome/help/accessx-status/nl @dirrm share/gnome/help/accessx-status/it/figures @dirrm share/gnome/help/accessx-status/it @dirrm share/gnome/help/accessx-status/fr/figures @@ -999,8 +1196,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/accessx-status/C/figures @dirrm share/gnome/help/accessx-status/C @dirrm share/gnome/help/accessx-status +@dirrm share/gnome/gnome-applets/invest-applet @dirrm share/gnome/gnome-applets/gweather @dirrm share/gnome/gnome-applets/glade +@dirrm share/gnome/gnome-applets/geyes/Tango @dirrm share/gnome/gnome-applets/geyes/Horrid @dirrm share/gnome/gnome-applets/geyes/Default-tiny @dirrm share/gnome/gnome-applets/geyes/Default @@ -1008,5 +1207,94 @@ 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 +%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/invest @dirrm include/libgweather @dirrm include/libgswitchit +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@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/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/es_VE/LC_MESSAGES +@dirrmtry share/locale/es_VE +@dirrmtry share/locale/es_UY/LC_MESSAGES +@dirrmtry share/locale/es_UY +@dirrmtry share/locale/es_SV/LC_MESSAGES +@dirrmtry share/locale/es_SV +@dirrmtry share/locale/es_PR/LC_MESSAGES +@dirrmtry share/locale/es_PR +@dirrmtry share/locale/es_PE/LC_MESSAGES +@dirrmtry share/locale/es_PE +@dirrmtry share/locale/es_PA/LC_MESSAGES +@dirrmtry share/locale/es_PA +@dirrmtry share/locale/es_NI/LC_MESSAGES +@dirrmtry share/locale/es_NI +@dirrmtry share/locale/es_HN/LC_MESSAGES +@dirrmtry share/locale/es_HN +@dirrmtry share/locale/es_GT/LC_MESSAGES +@dirrmtry share/locale/es_GT +@dirrmtry share/locale/es_EC/LC_MESSAGES +@dirrmtry share/locale/es_EC +@dirrmtry share/locale/es_DO/LC_MESSAGES +@dirrmtry share/locale/es_DO +@dirrmtry share/locale/es_CR/LC_MESSAGES +@dirrmtry share/locale/es_CR +@dirrmtry share/locale/es_CO/LC_MESSAGES +@dirrmtry share/locale/es_CO +@dirrmtry share/locale/es_CL/LC_MESSAGES +@dirrmtry share/locale/es_CL +@dirrmtry share/locale/es_AR/LC_MESSAGES +@dirrmtry share/locale/es_AR +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index 9f77982a84d4..7d335bd5e5c2 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -3,15 +3,15 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnomedesktop/Makefile,v 1.90 2006/04/13 07:52:40 bland Exp $ +# $MCom: ports/x11/gnome-desktop/Makefile,v 1.105 2006/10/03 01:38:25 ahze Exp $ # PORTNAME= gnome-desktop -PORTVERSION= 2.14.3 +PORTVERSION= 2.16.1 PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITE_SUBDIR= sources/gnome-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -28,9 +28,9 @@ GNOME_DESKTOP_VERSION=2 USE_GETTEXT= yes USE_GMAKE= yes USE_BISON= yes -USE_X_PREFIX= yes +USE_XLIB= yes INSTALLS_OMF= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" \ --with-kde-datadir=${LOCALBASE}/share diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo index eb2da5b52a27..ae08f08040f7 100644 --- a/x11/gnome-desktop/distinfo +++ b/x11/gnome-desktop/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-desktop-2.14.3.tar.bz2) = 2a8547ab0dcb10a1ad297874ae95b06b -SHA256 (gnome2/gnome-desktop-2.14.3.tar.bz2) = 9e477d0730fcf9736537f4a9a1f1d1ed5c6407c24f8f9d0514236e94384d6889 -SIZE (gnome2/gnome-desktop-2.14.3.tar.bz2) = 1186546 +MD5 (gnome2/gnome-desktop-2.16.1.tar.bz2) = e92edb17cd75faca45a4fe2d6806bdd8 +SHA256 (gnome2/gnome-desktop-2.16.1.tar.bz2) = 56c7dbe56e6a9fbcd3730c55892734a9daff23a86d69f49a381a4c965732f9d1 +SIZE (gnome2/gnome-desktop-2.16.1.tar.bz2) = 1230980 diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist index f70d5fc1b858..94d8084d40ea 100644 --- a/x11/gnome-desktop/pkg-plist +++ b/x11/gnome-desktop/pkg-plist @@ -22,43 +22,59 @@ 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/sv/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/ru/gnome-feedback.xml +share/gnome/help/gnome-feedback/sv/gnome-feedback.xml share/gnome/help/gnome-feedback/uk/gnome-feedback.xml +share/gnome/help/gnome-feedback/zh_CN/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/sv/gpl.xml share/gnome/help/gpl/uk/gpl.xml +share/gnome/help/gpl/zh_CN/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/sv/lgpl.xml share/gnome/help/lgpl/uk/lgpl.xml +share/gnome/help/lgpl/zh_CN/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-sv.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-ru.omf +share/gnome/omf/gnome-feedback/gnome-feedback-sv.omf share/gnome/omf/gnome-feedback/gnome-feedback-uk.omf +share/gnome/omf/gnome-feedback/gnome-feedback-zh_CN.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-sv.omf share/gnome/omf/gpl/gpl-uk.omf +share/gnome/omf/gpl/gpl-zh_CN.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-sv.omf share/gnome/omf/lgpl/lgpl-uk.omf +share/gnome/omf/lgpl/lgpl-zh_CN.omf share/gnome/pixmaps/apple-green.png share/gnome/pixmaps/apple-red.png share/gnome/pixmaps/gnome-aorta.png @@ -126,7 +142,6 @@ share/gnome/pixmaps/gnome-user-interface.png share/gnome/pixmaps/gnome-week.png share/gnome/pixmaps/gnome-windows.png share/gnome/pixmaps/gnome-word.png -share/gnome/pixmaps/gnome-workspace.png share/gnome/pixmaps/gnome-xterm.png share/gnome/pixmaps/gtkvim.png share/gnome/pixmaps/kterm.xpm @@ -139,6 +154,7 @@ share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/be/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/bg/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/bn/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/bn_IN/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/br/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/bs/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ca/LC_MESSAGES/gnome-desktop-2.0.mo @@ -177,6 +193,7 @@ share/locale/ky/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/mg/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/mi/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ml/LC_MESSAGES/gnome-desktop-2.0.mo @@ -187,7 +204,6 @@ share/locale/nb/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/no/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nso/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/or/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/pa/LC_MESSAGES/gnome-desktop-2.0.mo @@ -210,6 +226,7 @@ share/locale/tk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ug/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/ur/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/xh/LC_MESSAGES/gnome-desktop-2.0.mo @@ -219,43 +236,113 @@ share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zh_HK/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/yo/LC_MESSAGES -@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/zh_CN @dirrm share/gnome/help/lgpl/uk +@dirrm share/gnome/help/lgpl/sv @dirrm share/gnome/help/lgpl/pa @dirrm share/gnome/help/lgpl/fr @dirrm share/gnome/help/lgpl/es +@dirrm share/gnome/help/gpl/zh_CN @dirrm share/gnome/help/gpl/uk +@dirrm share/gnome/help/gpl/sv @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/gnome-feedback/zh_CN @dirrm share/gnome/help/gnome-feedback/uk +@dirrm share/gnome/help/gnome-feedback/sv +@dirrm share/gnome/help/gnome-feedback/ru @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/sv @dirrm share/gnome/help/fdl/fr @dirrm share/gnome/help/fdl/es @dirrm share/gnome/gnome-about/headers @dirrm include/gnome-desktop-2.0/libgnomeui @dirrm include/gnome-desktop-2.0/libgnome @dirrm include/gnome-desktop-2.0 +@dirrmtry share/locale/zu/LC_MESSAGES +@dirrmtry share/locale/zu +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/yo/LC_MESSAGES +@dirrmtry share/locale/yo +@dirrmtry share/locale/yi/LC_MESSAGES +@dirrmtry share/locale/yi +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/ur/LC_MESSAGES +@dirrmtry share/locale/ur +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug +@dirrmtry share/locale/tk/LC_MESSAGES +@dirrmtry share/locale/tk +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nso/LC_MESSAGES +@dirrmtry share/locale/nso +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/mi/LC_MESSAGES +@dirrmtry share/locale/mi +@dirrmtry share/locale/mg/LC_MESSAGES +@dirrmtry share/locale/mg +@dirrmtry share/locale/li/LC_MESSAGES +@dirrmtry share/locale/li +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile index 7adeffeebdc0..26c86ecf496d 100644 --- a/x11/gnome-menus/Makefile +++ b/x11/gnome-menus/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-menus/Makefile,v 1.29 2006/04/13 13:04:49 ahze Exp $ +# $MCom: ports/x11/gnome-menus/Makefile,v 1.39 2006/10/03 11:32:43 ahze Exp $ # PORTNAME= gnome-menus -PORTVERSION= 2.14.3 +PORTVERSION= 2.16.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -18,12 +18,12 @@ COMMENT= Implementation of the FreeDesktop Desktop Menu Spec USE_GETTEXT= yes USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomevfs2 ltverhack USE_AUTOTOOLS= libtool:15 USE_PYTHON= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -34,16 +34,24 @@ USE_FAM= yes .endif post-patch: - @${REINPLACE_CMD} -e 's|/usr/share/gnome|${X11BASE}/share/gnome|g' \ + @${REINPLACE_CMD} -e 's|applications.menu||' \ + ${WRKSRC}/layout/Makefile.in + @${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \ + ${WRKSRC}/util/test-menu-spec.c + @${REINPLACE_CMD} -e 's|/usr/share/gnome|${LOCALBASE}/share/gnome|g' \ ${WRKSRC}/layout/applications.menu \ ${WRKSRC}/layout/settings.menu @${SED} -e 's|/usr/local|${LOCALBASE}|g' \ < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory - @${REINPLACE_CMD} -e s'|%%X11BASE%%|${X11BASE}|g' \ + @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \ + s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/simple-editor/GMenuSimpleEditor/menutreemodel.py post-install: @${MKDIR} ${PREFIX}/share/gnome/desktop-directories - @${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/desktop-directories + @${INSTALL_DATA} ${WRKSRC}/layout/applications.menu \ + ${PREFIX}/etc/xdg/menus/gnome-applications.menu + @${INSTALL_DATA} ${WRKSRC}/KDE.directory \ + ${PREFIX}/share/gnome/desktop-directories .include <bsd.port.post.mk> diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo index f0a6d4915c21..40c830018d7e 100644 --- a/x11/gnome-menus/distinfo +++ b/x11/gnome-menus/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-menus-2.14.3.tar.bz2) = 9926e7ad14255d1a08c7e774052f8a3a -SHA256 (gnome2/gnome-menus-2.14.3.tar.bz2) = 0bc939a5c8347cfcbd83087f05f517b3a093515a93c104b833f2b05564df14d9 -SIZE (gnome2/gnome-menus-2.14.3.tar.bz2) = 406000 +MD5 (gnome2/gnome-menus-2.16.1.tar.bz2) = a5c467abe68003d23ec09a795ebfd29f +SHA256 (gnome2/gnome-menus-2.16.1.tar.bz2) = 72238f33406ada505fde8555ff93c00e7fec055a41500339b434c5445b09c87b +SIZE (gnome2/gnome-menus-2.16.1.tar.bz2) = 416053 diff --git a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py index 2306f060952e..5620119697f0 100644 --- a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py +++ b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py @@ -5,7 +5,7 @@ conf_dirs = os.environ["XDG_CONFIG_DIRS"] if not conf_dirs: - conf_dirs = "/etc/xdg" -+ conf_dirs = "%%X11BASE%%/etc/xdg" ++ conf_dirs = "%%LOCALBASE%%/etc/xdg" for conf_dir in conf_dirs.split (":"): menu_file_path = os.path.join (conf_dir, "menus", menu_file) @@ -14,7 +14,7 @@ data_dirs = os.environ["XDG_DATA_DIRS"] if not data_dirs: - data_dirs = "/usr/local/share/:/usr/share/" -+ data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/" ++ data_dirs = "%%X11BASE%%/share/gnome/:%%LOCALBASE%%/share/gnome/:%%X11BASE%%/share/:%%LOCALBASE%%/share/:/usr/share/" for data_dir in data_dirs.split (":"): retval = load_icon_from_path (os.path.join (data_dir, "pixmaps", icon_value)) diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist index 819f01166655..1a63a7cb3952 100644 --- a/x11/gnome-menus/pkg-plist +++ b/x11/gnome-menus/pkg-plist @@ -1,5 +1,5 @@ bin/gnome-menu-spec-test -etc/xdg/menus/applications.menu +etc/xdg/menus/gnome-applications.menu etc/xdg/menus/preferences.menu etc/xdg/menus/settings.menu include/gnome-menus/gmenu-tree.h @@ -30,8 +30,10 @@ share/gnome/desktop-directories/Settings.directory share/gnome/desktop-directories/System-Settings.directory share/gnome/desktop-directories/System-Tools.directory share/locale/ar/LC_MESSAGES/gnome-menus.mo +share/locale/be/LC_MESSAGES/gnome-menus.mo share/locale/bg/LC_MESSAGES/gnome-menus.mo share/locale/bn/LC_MESSAGES/gnome-menus.mo +share/locale/bn_IN/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 @@ -48,6 +50,7 @@ share/locale/eu/LC_MESSAGES/gnome-menus.mo share/locale/fa/LC_MESSAGES/gnome-menus.mo share/locale/fi/LC_MESSAGES/gnome-menus.mo share/locale/fr/LC_MESSAGES/gnome-menus.mo +share/locale/gn/LC_MESSAGES/gnome-menus.mo share/locale/gl/LC_MESSAGES/gnome-menus.mo share/locale/gu/LC_MESSAGES/gnome-menus.mo share/locale/he/LC_MESSAGES/gnome-menus.mo @@ -65,12 +68,15 @@ 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/ml/LC_MESSAGES/gnome-menus.mo +share/locale/mn/LC_MESSAGES/gnome-menus.mo share/locale/mr/LC_MESSAGES/gnome-menus.mo share/locale/ms/LC_MESSAGES/gnome-menus.mo share/locale/nb/LC_MESSAGES/gnome-menus.mo share/locale/ne/LC_MESSAGES/gnome-menus.mo share/locale/nl/LC_MESSAGES/gnome-menus.mo share/locale/nn/LC_MESSAGES/gnome-menus.mo +share/locale/or/LC_MESSAGES/gnome-menus.mo share/locale/pa/LC_MESSAGES/gnome-menus.mo share/locale/pl/LC_MESSAGES/gnome-menus.mo share/locale/pt/LC_MESSAGES/gnome-menus.mo @@ -79,10 +85,12 @@ share/locale/ro/LC_MESSAGES/gnome-menus.mo share/locale/ru/LC_MESSAGES/gnome-menus.mo share/locale/rw/LC_MESSAGES/gnome-menus.mo share/locale/sk/LC_MESSAGES/gnome-menus.mo +share/locale/sl/LC_MESSAGES/gnome-menus.mo share/locale/sq/LC_MESSAGES/gnome-menus.mo share/locale/sr/LC_MESSAGES/gnome-menus.mo share/locale/sr@Latn/LC_MESSAGES/gnome-menus.mo share/locale/sv/LC_MESSAGES/gnome-menus.mo +share/locale/ta/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 @@ -93,14 +101,44 @@ share/locale/xh/LC_MESSAGES/gnome-menus.mo share/locale/zh_CN/LC_MESSAGES/gnome-menus.mo share/locale/zh_HK/LC_MESSAGES/gnome-menus.mo share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo +@dirrm share/gnome/desktop-directories +@dirrm include/gnome-menus +@dirrmtry etc/xdg/menus +@dirrmtry etc/xdg +@dirrmtry %%PYTHON_SITELIBDIR%% +@dirrmtry %%PYTHON_LIBDIR%% +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk @dirrmtry share/locale/ug/LC_MESSAGES @dirrmtry share/locale/ug +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @@ -109,15 +147,25 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy +@dirrmtry share/locale/gn/LC_MESSAGES +@dirrmtry share/locale/gn +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el @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 -@dirrm etc/xdg -@dirrmtry %%PYTHON_SITELIBDIR%% -@dirrmtry %%PYTHON_LIBDIR%% +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 51fe15c38f06..061c0721c5cc 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnomepanel/Makefile,v 1.128 2006/04/13 07:52:40 bland Exp $ +# $MCom: ports/x11/gnome-panel/Makefile,v 1.140 2006/10/03 11:29:52 ahze Exp $ # PORTNAME= gnome-panel -PORTVERSION= 2.14.3 +PORTVERSION= 2.16.1 PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -21,12 +21,10 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) -RUN_DEPENDS= gnome-menu-editor:${PORTSDIR}/deskutils/gnome-menu-editor - USE_GETTEXT= yes -USE_X_PREFIX= yes +USE_XLIB= yes INSTALLS_OMF= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \ libwnck gnomemenus gnomedocutils ltverhack referencehack @@ -61,6 +59,11 @@ CONFIGURE_ARGS+=--disable-eds .endif post-patch: + @${REINPLACE_CMD} -e 's|evolution.desktop|evolution-2.8.desktop|g' \ + ${WRKSRC}/gnome-panel/panel-default-setup.entries + @${FIND} ${WRKSRC} -type f | \ + ${XARGS} -n 10 ${REINPLACE_CMD} -e \ + 's|"applications.menu"|"gnome-applications.menu"|' .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 5293aefd82d0..f7f0e1ad0349 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-panel-2.14.3.tar.bz2) = 14ab4c3d3ff3d0c1be397b6799a8626c -SHA256 (gnome2/gnome-panel-2.14.3.tar.bz2) = ed644b064867da915199b2e9761a3059a87bc9a03b4f1013d52a0096001bb62f -SIZE (gnome2/gnome-panel-2.14.3.tar.bz2) = 2579582 +MD5 (gnome2/gnome-panel-2.16.1.tar.bz2) = d0131e0b33a63b17b22b4d78b00291f8 +SHA256 (gnome2/gnome-panel-2.16.1.tar.bz2) = 711d7c19f0cacc5a0d0407065793c50dd7e3a154551602f4768df2da55743b23 +SIZE (gnome2/gnome-panel-2.16.1.tar.bz2) = 2689938 diff --git a/x11/gnome-panel/files/patch-applets_notification__area_eggtraymanager.c b/x11/gnome-panel/files/patch-applets_notification__area_eggtraymanager.c deleted file mode 100644 index 727a47b99ca4..000000000000 --- a/x11/gnome-panel/files/patch-applets_notification__area_eggtraymanager.c +++ /dev/null @@ -1,48 +0,0 @@ ---- applets/notification_area/eggtraymanager.c.orig Sat Dec 31 14:39:09 2005 -+++ applets/notification_area/eggtraymanager.c Mon May 15 01:36:18 2006 -@@ -291,6 +291,36 @@ - return FALSE; - } - -+static gboolean -+transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) -+{ -+ gdk_window_clear_area (widget->window, event->area.x, event->area.y, -+ event->area.width, event->area.height); -+ return FALSE; -+} -+ -+static void -+make_transparent_again (GtkWidget *widget, GtkStyle *previous_style, -+ gpointer user_data) -+{ -+ gdk_window_set_back_pixmap (widget->window, NULL, TRUE); -+} -+ -+static void -+make_transparent (GtkWidget *widget, gpointer user_data) -+{ -+ if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget)) -+ return; -+ -+ gtk_widget_set_app_paintable (widget, TRUE); -+ gtk_widget_set_double_buffered (widget, FALSE); -+ gdk_window_set_back_pixmap (widget->window, NULL, TRUE); -+ g_signal_connect (widget, "expose_event", -+ G_CALLBACK (transparent_expose_event), NULL); -+ g_signal_connect_after (widget, "style_set", -+ G_CALLBACK (make_transparent_again), NULL); -+} -+ - static void - egg_tray_manager_handle_dock_request (EggTrayManager *manager, - XClientMessageEvent *xevent) -@@ -306,6 +336,8 @@ - } - - socket = gtk_socket_new (); -+ g_signal_connect (socket, "realize", -+ G_CALLBACK (make_transparent), NULL); - - /* We need to set the child window here - * so that the client can call _get functions diff --git a/x11/gnome-panel/files/patch-applets_notification__area_main.c b/x11/gnome-panel/files/patch-applets_notification__area_main.c deleted file mode 100644 index 22802096cf28..000000000000 --- a/x11/gnome-panel/files/patch-applets_notification__area_main.c +++ /dev/null @@ -1,73 +0,0 @@ ---- applets/notification_area/main.c.orig Wed Dec 28 22:15:27 2005 -+++ applets/notification_area/main.c Mon May 15 01:36:01 2006 -@@ -159,14 +159,24 @@ - tray = all_trays->data; - - gtk_box_pack_end (GTK_BOX (tray->box), icon, FALSE, FALSE, 0); -- -+ -+ gtk_widget_hide (tray->box); - gtk_widget_show (icon); -+ gtk_widget_show (tray->box); - } - - static void - tray_removed (EggTrayManager *manager, GtkWidget *icon, void *data) - { -+ SystemTray *tray; -+ -+ if (all_trays == NULL) -+ return; -+ -+ tray = all_trays->data; - -+ gtk_widget_hide (tray->box); -+ gtk_widget_show (tray->box); - } - - static void -@@ -207,9 +217,32 @@ - gtk_widget_set_size_request (tray->box, -1, MIN_BOX_SIZE); - break; - } -+ -+ /* Force the icons to redraw their backgrounds. -+ * gtk_widget_queue_draw() doesn't work across process boundaries, -+ * so we do this instead. -+ */ -+ gtk_widget_hide (tray->box); -+ gtk_widget_show (tray->box); - } - - static void -+applet_change_background (PanelApplet *applet, -+ PanelAppletBackgroundType type, -+ GdkColor *color, -+ GdkPixmap *pixmap, -+ SystemTray *tray) -+{ -+ /* Force the icons to redraw their backgrounds. -+ * gtk_widget_queue_draw() doesn't work across process boundaries, -+ * so we do this instead. -+ */ -+ gtk_widget_hide (tray->box); -+ gtk_widget_show (tray->box); -+} -+ -+ -+static void - applet_change_orientation (PanelApplet *applet, - PanelAppletOrient orient, - SystemTray *tray) -@@ -332,6 +365,11 @@ - g_signal_connect (G_OBJECT (tray->applet), - "change_orient", - G_CALLBACK (applet_change_orientation), -+ tray); -+ -+ g_signal_connect (G_OBJECT (tray->applet), -+ "change_background", -+ G_CALLBACK (applet_change_background), - tray); - - g_signal_connect (tray->applet, diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist index 756d58483ce3..70c9d7a51a4e 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -86,10 +86,6 @@ share/gnome/help/fish-applet-2/ko/figures/fish_applet.png share/gnome/help/fish-applet-2/ko/figures/fish_settings.png share/gnome/help/fish-applet-2/ko/fish-applet-2.xml share/gnome/help/fish-applet-2/ko/legal.xml -share/gnome/help/fish-applet-2/sv/figures/fish_applet.png -share/gnome/help/fish-applet-2/sv/figures/fish_settings.png -share/gnome/help/fish-applet-2/sv/fish-applet-2.xml -share/gnome/help/fish-applet-2/sv/legal.xml share/gnome/help/fish-applet-2/zh_CN/figures/fish_applet.png share/gnome/help/fish-applet-2/zh_CN/figures/fish_settings.png share/gnome/help/fish-applet-2/zh_CN/fish-applet-2.xml @@ -147,7 +143,6 @@ share/gnome/help/window-list/ko/figures/window_list_group_applet.png share/gnome/help/window-list/ko/legal.xml share/gnome/help/window-list/ko/window-list.xml share/gnome/help/window-list/sv/figures/window_list_applet.png -share/gnome/help/window-list/sv/figures/window_list_group.png share/gnome/help/window-list/sv/figures/window_list_group_applet.png share/gnome/help/window-list/sv/legal.xml share/gnome/help/window-list/sv/window-list.xml @@ -156,7 +151,6 @@ share/gnome/help/window-list/uk/figures/window_list_group_applet.png share/gnome/help/window-list/uk/legal.xml share/gnome/help/window-list/uk/window-list.xml share/gnome/help/window-list/zh_CN/figures/window_list_applet.png -share/gnome/help/window-list/zh_CN/figures/window_list_group.png share/gnome/help/window-list/zh_CN/figures/window_list_group_applet.png share/gnome/help/window-list/zh_CN/legal.xml share/gnome/help/window-list/zh_CN/window-list.xml @@ -192,7 +186,6 @@ share/gnome/help/workspace-switcher/nl/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/nl/legal.xml share/gnome/help/workspace-switcher/nl/workspace-switcher.xml share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png -share/gnome/help/workspace-switcher/sv/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/sv/legal.xml share/gnome/help/workspace-switcher/sv/workspace-switcher.xml share/gnome/help/workspace-switcher/uk/figures/workspace_switcher_applet.png @@ -230,19 +223,15 @@ share/gnome/omf/fish/fish-uk.omf share/gnome/omf/gnome-panel/fish-applet-2-de.omf share/gnome/omf/gnome-panel/fish-applet-2-ja.omf share/gnome/omf/gnome-panel/fish-applet-2-ko.omf -share/gnome/omf/gnome-panel/fish-applet-2-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-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-ja.omf share/gnome/omf/gnome-panel/workspace-switcher-ko.omf -share/gnome/omf/gnome-panel/workspace-switcher-sv.omf share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf share/gnome/omf/window-list/window-list-C.omf @@ -271,11 +260,57 @@ share/gnome/panel/pixmaps/gnome-gegl2-2.png share/gnome/panel/pixmaps/gnome-gegl2.png share/gnome/panel/pixmaps/monkey.png share/gnome/panel/pixmaps/oldwanda.png -share/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/gnome/panel/pixmaps/wanda.png +share/icons/hicolor/16x16/apps/gnome-panel-clock.png +share/icons/hicolor/16x16/apps/gnome-panel-drawer.png +share/icons/hicolor/16x16/apps/gnome-panel-fish.png +share/icons/hicolor/16x16/apps/gnome-panel-force-quit.png +share/icons/hicolor/16x16/apps/gnome-panel-notification-area.png +share/icons/hicolor/16x16/apps/gnome-panel-separator.png +share/icons/hicolor/16x16/apps/gnome-panel-window-list.png +share/icons/hicolor/16x16/apps/gnome-panel-window-menu.png +share/icons/hicolor/16x16/apps/gnome-panel-workspace-switcher.png +share/icons/hicolor/16x16/apps/gnome-panel.png +share/icons/hicolor/22x22/apps/gnome-panel-clock.png +share/icons/hicolor/22x22/apps/gnome-panel-drawer.png +share/icons/hicolor/22x22/apps/gnome-panel-fish.png +share/icons/hicolor/22x22/apps/gnome-panel-force-quit.png +share/icons/hicolor/22x22/apps/gnome-panel-notification-area.png +share/icons/hicolor/22x22/apps/gnome-panel-separator.png +share/icons/hicolor/22x22/apps/gnome-panel-window-list.png +share/icons/hicolor/22x22/apps/gnome-panel-window-menu.png +share/icons/hicolor/22x22/apps/gnome-panel-workspace-switcher.png +share/icons/hicolor/22x22/apps/gnome-panel.png +share/icons/hicolor/24x24/apps/gnome-panel-clock.png +share/icons/hicolor/24x24/apps/gnome-panel-drawer.png +share/icons/hicolor/24x24/apps/gnome-panel-fish.png +share/icons/hicolor/24x24/apps/gnome-panel-force-quit.png +share/icons/hicolor/24x24/apps/gnome-panel-notification-area.png +share/icons/hicolor/24x24/apps/gnome-panel-separator.png +share/icons/hicolor/24x24/apps/gnome-panel-window-list.png +share/icons/hicolor/24x24/apps/gnome-panel-window-menu.png +share/icons/hicolor/24x24/apps/gnome-panel-workspace-switcher.png +share/icons/hicolor/24x24/apps/gnome-panel.png +share/icons/hicolor/32x32/apps/gnome-panel-clock.png +share/icons/hicolor/32x32/apps/gnome-panel-drawer.png +share/icons/hicolor/32x32/apps/gnome-panel-fish.png +share/icons/hicolor/32x32/apps/gnome-panel-force-quit.png +share/icons/hicolor/32x32/apps/gnome-panel-notification-area.png +share/icons/hicolor/32x32/apps/gnome-panel-separator.png +share/icons/hicolor/32x32/apps/gnome-panel-window-list.png +share/icons/hicolor/32x32/apps/gnome-panel-window-menu.png +share/icons/hicolor/32x32/apps/gnome-panel-workspace-switcher.png +share/icons/hicolor/32x32/apps/gnome-panel.png +share/icons/hicolor/scalable/apps/gnome-panel-clock.svg +share/icons/hicolor/scalable/apps/gnome-panel-drawer.svg +share/icons/hicolor/scalable/apps/gnome-panel-fish.svg +share/icons/hicolor/scalable/apps/gnome-panel-force-quit.svg +share/icons/hicolor/scalable/apps/gnome-panel-notification-area.svg +share/icons/hicolor/scalable/apps/gnome-panel-separator.svg +share/icons/hicolor/scalable/apps/gnome-panel-window-list.svg +share/icons/hicolor/scalable/apps/gnome-panel-window-menu.svg +share/icons/hicolor/scalable/apps/gnome-panel-workspace-switcher.svg +share/icons/hicolor/scalable/apps/gnome-panel.svg share/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 @@ -360,34 +395,6 @@ share/locale/zh_CN/LC_MESSAGES/gnome-panel-2.0.mo share/locale/zh_HK/LC_MESSAGES/gnome-panel-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo -@dirrmtry share/locale/zu/LC_MESSAGES -@dirrmtry share/locale/zu -@dirrmtry share/locale/yi/LC_MESSAGES -@dirrmtry share/locale/yi -@dirrmtry share/locale/xh/LC_MESSAGES -@dirrmtry share/locale/xh -@dirrmtry share/locale/sr@ije/LC_MESSAGES -@dirrmtry share/locale/sr@ije -@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/mg/LC_MESSAGES -@dirrmtry share/locale/mg -@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 -@dirrmtry share/locale/bn_IN/LC_MESSAGES -@dirrmtry share/locale/bn_IN @dirrm share/gnome/panel/pixmaps @dirrm share/gnome/panel/glade @dirrm share/gnome/omf/workspace-switcher @@ -460,8 +467,6 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/fish-applet-2/zh_TW @dirrm share/gnome/help/fish-applet-2/zh_CN/figures @dirrm share/gnome/help/fish-applet-2/zh_CN -@dirrm share/gnome/help/fish-applet-2/sv/figures -@dirrm share/gnome/help/fish-applet-2/sv @dirrm share/gnome/help/fish-applet-2/ko/figures @dirrm share/gnome/help/fish-applet-2/ko @dirrm share/gnome/help/fish-applet-2/ja/figures @@ -500,3 +505,73 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/clock/C @dirrm share/gnome/help/clock @dirrm include/panel-2.0 +@dirrmtry share/locale/zu/LC_MESSAGES +@dirrmtry share/locale/zu +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/yi/LC_MESSAGES +@dirrmtry share/locale/yi +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/sr@ije/LC_MESSAGES +@dirrmtry share/locale/sr@ije +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nso/LC_MESSAGES +@dirrmtry share/locale/nso +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/mi/LC_MESSAGES +@dirrmtry share/locale/mi +@dirrmtry share/locale/mg/LC_MESSAGES +@dirrmtry share/locale/mg +@dirrmtry share/locale/li/LC_MESSAGES +@dirrmtry share/locale/li +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index 20ac6e499dfc..efc70f133bde 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -3,37 +3,42 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.36 2006/04/13 07:52:40 bland Exp $ +# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.58 2006/10/07 19:45:39 marcus Exp $ # PORTNAME= gnome-screensaver -PORTVERSION= 2.14.3 +PORTVERSION= 2.16.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME screen saver and locker -LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib RUN_DEPENDS= xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_GMAKE= yes +USE_GETTEXT= yes GNU_CONFIGURE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomemenus -CONFIGURE_ARGS= --with-gdm-config=${X11BASE}/etc/gdm/custom.conf \ +CONFIGURE_ARGS= --with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \ --with-xscreensaverdir=${XSCREENSAVER_DIR} \ - --with-xscreensaverhackdir=${X11BASE}/bin/xscreensaver-hacks + --with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" - GCONF_SCHEMAS= gnome-screensaver.schemas PLIST= ${WRKDIR}/pkg-plist -XSCREENSAVER_DIR= ${X11BASE}/share/xscreensaver/config +XSCREENSAVER_DIR= ${LOCALBASE}/share/xscreensaver/config +SCREENSAVER_DIR= share/gnome/applications/screensavers + +XSCREENSAVER_EXCLUDE= "(popsquares.xml)" OPTIONS= PAM "Pluggable Authentication Module support" off @@ -47,25 +52,20 @@ BROKEN= Does not build on 4.X CONFIGURE_ARGS+= --disable-pam .endif -post-patch: - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \ - ${WRKSRC}/configure - pre-install: @${CP} ${.CURDIR}/pkg-plist ${PLIST} @cd ${XSCREENSAVER_DIR} && ${FIND} -s * -maxdepth 1 -type f -name "*.xml" | \ - ${SED} -e 's:^:share/gnome/gnome-screensaver/themes/xscreensaver/:' | \ + ${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \ + ${SED} -e 's:^:${SCREENSAVER_DIR}/:' | \ ${SED} -e 's:[.]xml$$:.desktop:' >> ${PLIST} - @${ECHO_CMD} @dirrm share/gnome/gnome-screensaver/themes/xscreensaver >> ${PLIST} - @${ECHO_CMD} @dirrm share/gnome/gnome-screensaver/themes >> ${PLIST} - @${ECHO_CMD} @dirrm share/gnome/gnome-screensaver >> ${PLIST} + @${ECHO_CMD} @dirrm ${SCREENSAVER_DIR} >> ${PLIST} post-install: ${CHOWN} root ${PREFIX}/libexec/gnome-screensaver-dialog ${CHMOD} +s ${PREFIX}/libexec/gnome-screensaver-dialog - ${MKDIR} ${PREFIX}/share/gnome/gnome-screensaver/themes/xscreensaver - cd ${PREFIX}/share/gnome/gnome-screensaver/themes/xscreensaver && \ + cd ${PREFIX}/${SCREENSAVER_DIR} && \ ${FIND} -s ${XSCREENSAVER_DIR} -maxdepth 1 -type f -name "*.xml" | \ + ${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \ ${XARGS} ${WRKSRC}/data/migrate-xscreensaver-config.sh .include <bsd.port.post.mk> diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo index ea6585adfd5b..ed227ab528a8 100644 --- a/x11/gnome-screensaver/distinfo +++ b/x11/gnome-screensaver/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome-screensaver-2.14.3.tar.bz2) = 2ed0b9322d284bb1739e037165ca94f2 -SHA256 (gnome-screensaver-2.14.3.tar.bz2) = 3e3fea74513361ec07ee97472be98b8df3749bd09289bcf72a341d0fbc53cdd1 -SIZE (gnome-screensaver-2.14.3.tar.bz2) = 1934769 +MD5 (gnome2/gnome-screensaver-2.16.1.tar.bz2) = af29aeb60a9908f6562664962129ff88 +SHA256 (gnome2/gnome-screensaver-2.16.1.tar.bz2) = 574dd2a987375e0087831e23d650862d5064fdfd43f951f426084cd57cdad2a9 +SIZE (gnome2/gnome-screensaver-2.16.1.tar.bz2) = 2008446 diff --git a/x11/gnome-screensaver/files/patch-src_gs-auth-pam.c b/x11/gnome-screensaver/files/patch-src_gs-auth-pam.c new file mode 100644 index 000000000000..94d68b8f3a57 --- /dev/null +++ b/x11/gnome-screensaver/files/patch-src_gs-auth-pam.c @@ -0,0 +1,11 @@ +--- src/gs-auth-pam.c.orig Mon Aug 14 19:57:29 2006 ++++ src/gs-auth-pam.c Mon Aug 14 20:07:43 2006 +@@ -204,7 +204,7 @@ pam_conversation (int + if (res) { + reply [replies].resp_retcode = PAM_SUCCESS; + } else { +- reply [replies].resp_retcode = PAM_INCOMPLETE; ++ reply [replies].resp_retcode = PAM_TRY_AGAIN; + } + } + } diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist index 4d07d26f2189..04c2d2d912db 100644 --- a/x11/gnome-screensaver/pkg-plist +++ b/x11/gnome-screensaver/pkg-plist @@ -4,16 +4,18 @@ bin/gnome-screensaver-preferences etc/xdg/menus/gnome-screensavers.menu libdata/pkgconfig/gnome-screensaver.pc libexec/gnome-screensaver-dialog +libexec/gnome-screensaver-gl-helper libexec/gnome-screensaver/floaters libexec/gnome-screensaver/popsquares libexec/gnome-screensaver/slideshow share/gnome/applications/gnome-screensaver-preferences.desktop +share/gnome/applications/screensavers/cosmos-slideshow.desktop +share/gnome/applications/screensavers/footlogo-floaters.desktop +share/gnome/applications/screensavers/personal-slideshow.desktop +share/gnome/applications/screensavers/popsquares.desktop share/gnome/desktop-directories/gnome-screensaver.directory share/gnome/gnome-screensaver/gnome-screensaver-preferences.glade -share/gnome/gnome-screensaver/themes/cosmos-slideshow.desktop -share/gnome/gnome-screensaver/themes/footlogo-floaters.desktop -share/gnome/gnome-screensaver/themes/personal-slideshow.desktop -share/gnome/gnome-screensaver/themes/popsquares.desktop +share/gnome/gnome-screensaver/lock-dialog-default.glade share/gnome/pixmaps/backgrounds/cosmos/cloud.jpg share/gnome/pixmaps/backgrounds/cosmos/comet.jpg share/gnome/pixmaps/backgrounds/cosmos/earth-horizon.jpg @@ -26,6 +28,7 @@ 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/bn_IN/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 @@ -37,6 +40,8 @@ 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/eu/LC_MESSAGES/gnome-screensaver.mo +share/locale/fa/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 @@ -52,28 +57,74 @@ 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/lv/LC_MESSAGES/gnome-screensaver.mo +share/locale/mg/LC_MESSAGES/gnome-screensaver.mo share/locale/mk/LC_MESSAGES/gnome-screensaver.mo +share/locale/ml/LC_MESSAGES/gnome-screensaver.mo +share/locale/mn/LC_MESSAGES/gnome-screensaver.mo share/locale/nb/LC_MESSAGES/gnome-screensaver.mo share/locale/ne/LC_MESSAGES/gnome-screensaver.mo share/locale/nl/LC_MESSAGES/gnome-screensaver.mo -share/locale/no/LC_MESSAGES/gnome-screensaver.mo +share/locale/or/LC_MESSAGES/gnome-screensaver.mo share/locale/pa/LC_MESSAGES/gnome-screensaver.mo share/locale/pl/LC_MESSAGES/gnome-screensaver.mo share/locale/pt/LC_MESSAGES/gnome-screensaver.mo share/locale/pt_BR/LC_MESSAGES/gnome-screensaver.mo +share/locale/ru/LC_MESSAGES/gnome-screensaver.mo share/locale/sk/LC_MESSAGES/gnome-screensaver.mo +share/locale/sl/LC_MESSAGES/gnome-screensaver.mo share/locale/sq/LC_MESSAGES/gnome-screensaver.mo share/locale/sr/LC_MESSAGES/gnome-screensaver.mo share/locale/sr@Latn/LC_MESSAGES/gnome-screensaver.mo share/locale/sv/LC_MESSAGES/gnome-screensaver.mo +share/locale/ta/LC_MESSAGES/gnome-screensaver.mo share/locale/th/LC_MESSAGES/gnome-screensaver.mo +share/locale/tr/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 share/gnome/gnome-screensaver @dirrm libexec/gnome-screensaver +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/mg/LC_MESSAGES +@dirrmtry share/locale/mg +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index b15801e9298a..aa8578a569b5 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -3,16 +3,17 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnomesession/Makefile,v 1.83 2006/04/24 03:18:23 marcus Exp $ +# $MCom: ports/x11/gnome-session/Makefile,v 1.96 2006/10/07 19:45:39 marcus Exp $ # PORTNAME= gnome-session -PORTVERSION= 2.14.3 +PORTVERSION= 2.16.1 +PORTREVISION= 1 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/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \ +MASTER_SITE_SUBDIR= sources/gnome-session/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \ adamw/:local DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${SPLASHES}:local @@ -22,9 +23,14 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= gnome@FreeBSD.org COMMENT= Session component for the GNOME 2 desktop +BUILD_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + gnome-keyring.0:${PORTSDIR}/security/gnome-keyring +RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center + USE_GETTEXT= yes USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index 3e94fa0eb81c..8b47213d8da0 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,6 +1,6 @@ -MD5 (gnome2/gnome-session-2.14.3.tar.bz2) = 34eb4641e2791ae51acf6f1edfcf3d64 -SHA256 (gnome2/gnome-session-2.14.3.tar.bz2) = 23dfb74225607c586eba3c0539cb5da0133f54b5b5f8407213893386643fa7b2 -SIZE (gnome2/gnome-session-2.14.3.tar.bz2) = 662903 +MD5 (gnome2/gnome-session-2.16.1.tar.bz2) = ef6f87cb3cc6012b212fa14353a63932 +SHA256 (gnome2/gnome-session-2.16.1.tar.bz2) = 6d6d21c6b9a4a2fe7bc288e8fdf36159444370973b4aa71dfc4c48bc0ad7cdf3 +SIZE (gnome2/gnome-session-2.16.1.tar.bz2) = 677501 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 index edd18bfec916..e7982166670a 100644 --- a/x11/gnome-session/files/patch-dbus +++ b/x11/gnome-session/files/patch-dbus @@ -1,39 +1,3 @@ ---- 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 @@ @@ -427,3 +391,39 @@ + */ + g_setenv ("DBUS_SESSION_BUS_ADDRESS", address_str, TRUE); +} +--- gnome-session/main.c.orig Wed Jul 26 08:46:36 2006 ++++ gnome-session/main.c Mon Aug 7 21:17:49 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" +@@ -329,6 +330,7 @@ + Session *the_session; + gboolean splashing; + gboolean a_t_support; ++ gboolean dbus_daemon_owner; + GError *err; + int status; + char *display_str; +@@ -419,6 +421,7 @@ + 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. */ +@@ -502,6 +505,9 @@ + gsm_sound_logout (); + + gsm_keyring_daemon_stop (); ++ ++ if (dbus_daemon_owner) ++ gsm_dbus_daemon_stop (); + + g_object_unref (gconf_client); + gsm_shutdown_gconfd (); 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 deleted file mode 100644 index da4950d05c95..000000000000 --- a/x11/gnome-session/files/patch-gnome-session_gsm-at-startup.c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index 8eae88069c51..000000000000 --- a/x11/gnome-session/files/patch-gnome-session_gsm-xrandr.c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 89f7d32ff1f6..c34e0b2bf9ad 100644 --- a/x11/gnome-session/pkg-plist +++ b/x11/gnome-session/pkg-plist @@ -28,6 +28,7 @@ share/locale/az/LC_MESSAGES/gnome-session-2.0.mo share/locale/be/LC_MESSAGES/gnome-session-2.0.mo share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo +share/locale/bn_IN/LC_MESSAGES/gnome-session-2.0.mo share/locale/bs/LC_MESSAGES/gnome-session-2.0.mo share/locale/ca/LC_MESSAGES/gnome-session-2.0.mo share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo @@ -63,6 +64,7 @@ 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/mg/LC_MESSAGES/gnome-session-2.0.mo share/locale/mi/LC_MESSAGES/gnome-session-2.0.mo share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo share/locale/ml/LC_MESSAGES/gnome-session-2.0.mo @@ -73,15 +75,14 @@ share/locale/nb/LC_MESSAGES/gnome-session-2.0.mo share/locale/ne/LC_MESSAGES/gnome-session-2.0.mo share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo -share/locale/no/LC_MESSAGES/gnome-session-2.0.mo share/locale/nso/LC_MESSAGES/gnome-session-2.0.mo +share/locale/or/LC_MESSAGES/gnome-session-2.0.mo share/locale/pa/LC_MESSAGES/gnome-session-2.0.mo share/locale/pl/LC_MESSAGES/gnome-session-2.0.mo share/locale/pt/LC_MESSAGES/gnome-session-2.0.mo share/locale/pt_BR/LC_MESSAGES/gnome-session-2.0.mo share/locale/ro/LC_MESSAGES/gnome-session-2.0.mo share/locale/ru/LC_MESSAGES/gnome-session-2.0.mo -share/locale/rw/LC_MESSAGES/gnome-session-2.0.mo share/locale/sk/LC_MESSAGES/gnome-session-2.0.mo share/locale/sl/LC_MESSAGES/gnome-session-2.0.mo share/locale/sq/LC_MESSAGES/gnome-session-2.0.mo @@ -93,6 +94,7 @@ share/locale/th/LC_MESSAGES/gnome-session-2.0.mo share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo +share/locale/rw/LC_MESSAGES/gnome-session-2.0.mo share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo @@ -100,11 +102,65 @@ 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 +@dirrmtry share/locale/zu/LC_MESSAGES +@dirrmtry share/locale/zu +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/tk/LC_MESSAGES +@dirrmtry share/locale/tk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nso/LC_MESSAGES +@dirrmtry share/locale/nso +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/mi/LC_MESSAGES +@dirrmtry share/locale/mi +@dirrmtry share/locale/mg/LC_MESSAGES +@dirrmtry share/locale/mg @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index 1ec65fad47aa..ef60118c8920 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnometerminal/Makefile,v 1.69 2006/04/13 07:52:41 bland Exp $ +# $MCom: ports/x11/gnome-terminal/Makefile,v 1.81 2006/10/03 10:31:27 ahze Exp $ # PORTNAME= gnome-terminal -PORTVERSION= 2.14.2 +PORTVERSION= 2.16.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -19,9 +19,9 @@ COMMENT= Terminal component for the GNOME 2 Desktop USE_GETTEXT= yes USE_BZIP2= yes INSTALLS_OMF= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui vte +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui vte gnomedocutils GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo index 999f8bf18e87..8338f725a82c 100644 --- a/x11/gnome-terminal/distinfo +++ b/x11/gnome-terminal/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-terminal-2.14.2.tar.bz2) = da80071cd707e89cedcfb476cab8b39a -SHA256 (gnome2/gnome-terminal-2.14.2.tar.bz2) = bd7d500b16ecf1d6189f12ea5d936c218a3e1927ee5ce39119d3aeb8015cca91 -SIZE (gnome2/gnome-terminal-2.14.2.tar.bz2) = 1791473 +MD5 (gnome2/gnome-terminal-2.16.1.tar.bz2) = 861e1b780819214b4d5a398e7999c093 +SHA256 (gnome2/gnome-terminal-2.16.1.tar.bz2) = 814ab099689aabdc6351565215ce6e5a2fc93e8b05fafd3ca70f4cefe167caf0 +SIZE (gnome2/gnome-terminal-2.16.1.tar.bz2) = 1840537 diff --git a/x11/gnome-terminal/files/patch-src_terminal-screen.c b/x11/gnome-terminal/files/patch-src_terminal-screen.c index 0f5c397cbadd..ffa05b4fcfd6 100644 --- a/x11/gnome-terminal/files/patch-src_terminal-screen.c +++ b/x11/gnome-terminal/files/patch-src_terminal-screen.c @@ -1,19 +1,19 @@ ---- src/terminal-screen.c.orig Sun Apr 2 18:27:36 2006 -+++ src/terminal-screen.c Sun Apr 2 18:42:41 2006 +--- src/terminal-screen.c.orig Wed May 17 17:02:36 2006 ++++ src/terminal-screen.c Thu May 18 15:30:27 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); +- "(:[0-9]+)?(" URLPATH ")?\\>/?", FLAVOR_AS_IS); + "[[:<:]]" SCHEME "//(" USER "@)?[" HOSTCHARS ".]+" -+ "(:[0-9]+)?(" URLPATH ")?[[:>:]]", FLAVOR_AS_IS); ++ "(:[0-9]+)?(" URLPATH ")?[[:>:]]/?", FLAVOR_AS_IS); terminal_widget_match_add (screen->priv->term, - "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+" -- "(:[0-9]+)?(" URLPATH ")?\\>", +- "(:[0-9]+)?(" URLPATH ")?\\>/?", + "[[:<:]](www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+" -+ "(:[0-9]+)?(" URLPATH ")?[[:>:]]", ++ "(:[0-9]+)?(" URLPATH ")?[[:>:]]/?", FLAVOR_DEFAULT_TO_HTTP); terminal_widget_match_add (screen->priv->term, diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist index 380a52ff47c5..efd1e99662db 100644 --- a/x11/gnome-terminal/pkg-plist +++ b/x11/gnome-terminal/pkg-plist @@ -26,7 +26,6 @@ share/gnome/help/gnome-terminal/fr/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/fr/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/fr/figures/terminal_window.png share/gnome/help/gnome-terminal/fr/gnome-terminal.xml -share/gnome/help/gnome-terminal/fr/legal.xml share/gnome/help/gnome-terminal/it/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/it/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/it/figures/terminal_window.png @@ -51,7 +50,6 @@ share/gnome/help/gnome-terminal/sv/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/sv/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/sv/figures/terminal_window.png share/gnome/help/gnome-terminal/sv/gnome-terminal.xml -share/gnome/help/gnome-terminal/sv/legal.xml share/gnome/help/gnome-terminal/uk/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/uk/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/uk/gnome-terminal.xml @@ -86,8 +84,8 @@ share/locale/az/LC_MESSAGES/gnome-terminal.mo share/locale/be/LC_MESSAGES/gnome-terminal.mo share/locale/bg/LC_MESSAGES/gnome-terminal.mo share/locale/bn/LC_MESSAGES/gnome-terminal.mo +share/locale/bn_IN/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 @@ -114,19 +112,22 @@ share/locale/hy/LC_MESSAGES/gnome-terminal.mo share/locale/id/LC_MESSAGES/gnome-terminal.mo share/locale/it/LC_MESSAGES/gnome-terminal.mo share/locale/ja/LC_MESSAGES/gnome-terminal.mo +share/locale/ka/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/mg/LC_MESSAGES/gnome-terminal.mo share/locale/mk/LC_MESSAGES/gnome-terminal.mo share/locale/ml/LC_MESSAGES/gnome-terminal.mo share/locale/mn/LC_MESSAGES/gnome-terminal.mo +share/locale/mr/LC_MESSAGES/gnome-terminal.mo share/locale/ms/LC_MESSAGES/gnome-terminal.mo share/locale/nb/LC_MESSAGES/gnome-terminal.mo share/locale/ne/LC_MESSAGES/gnome-terminal.mo share/locale/nl/LC_MESSAGES/gnome-terminal.mo share/locale/nn/LC_MESSAGES/gnome-terminal.mo -share/locale/no/LC_MESSAGES/gnome-terminal.mo +share/locale/or/LC_MESSAGES/gnome-terminal.mo share/locale/pa/LC_MESSAGES/gnome-terminal.mo share/locale/pl/LC_MESSAGES/gnome-terminal.mo share/locale/pt/LC_MESSAGES/gnome-terminal.mo @@ -148,13 +149,8 @@ share/locale/vi/LC_MESSAGES/gnome-terminal.mo 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_HK/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 @@ -185,3 +181,57 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo @dirrm share/gnome/help/gnome-terminal @dirrm share/gnome/gnome-terminal/glade @dirrm share/gnome/gnome-terminal +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/mg/LC_MESSAGES +@dirrmtry share/locale/mg +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile index 09e76f03e4ca..dd7c0e41a46e 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.77 2006/02/03 05:53:28 marcus Exp $ +# $MCom: ports/x11/gnome2-fifth-toe/Makefile,v 1.79 2006/07/19 06:00:46 ahze Exp $ # PORTREVISION= 0 @@ -18,23 +18,23 @@ RUN_DEPENDS= pan:${PORTSDIR}/news/pan \ sodipodi:${PORTSDIR}/graphics/sodipodi \ gnomeicu:${PORTSDIR}/net-im/gnomeicu \ gthumb:${PORTSDIR}/graphics/gthumb \ - ${X11BASE}/lib/gaim/docklet.so:${PORTSDIR}/net-im/gaim \ + ${LOCALBASE}/lib/gaim/docklet.so:${PORTSDIR}/net-im/gaim \ tsclient:${PORTSDIR}/net/tsclient \ galeon:${PORTSDIR}/www/galeon \ seahorse:${PORTSDIR}/security/seahorse \ - ${X11BASE}/share/gnome/themes/Gorilla/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/gnome-themes-extras \ + ${LOCALBASE}/share/gnome/themes/Gorilla/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/gnome-themes-extras \ bluefish:${PORTSDIR}/www/bluefish \ gossip:${PORTSDIR}/net-im/gossip \ - straw:${PORTSDIR}/net/straw \ liferea:${PORTSDIR}/net/liferea \ gnotime:${PORTSDIR}/deskutils/gnotime \ rhythmbox:${PORTSDIR}/audio/rhythmbox \ jamboree:${PORTSDIR}/audio/jamboree \ - ${X11BASE}/share/gnome/pixmaps/glines/classic.png:${PORTSDIR}/games/gnome-games-extra-data \ + ${LOCALBASE}/share/gnome/pixmaps/glines/classic.png:${PORTSDIR}/games/gnome-games-extra-data \ nautilus-sendto:${PORTSDIR}/deskutils/nautilus-sendto \ goobox:${PORTSDIR}/audio/goobox \ inkscape:${PORTSDIR}/graphics/inkscape \ atomix:${PORTSDIR}/games/atomix +# straw:${PORTSDIR}/net/straw MASTERDIR= ${.CURDIR}/../gnome2 GNOME_SLAVE= yes diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile index e1e414a8c0de..fd7a26d06f92 100644 --- a/x11/gnome2-lite/Makefile +++ b/x11/gnome2-lite/Makefile @@ -3,16 +3,16 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome2-lite/Makefile,v 1.45 2005/11/17 23:20:32 marcus Exp $ +# $MCom: ports/x11/gnome2-lite/Makefile,v 1.50 2006/10/14 06:34:16 marcus Exp $ # -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11 gnome PKGNAMESUFFIX= -lite COMMENT= The "meta-port" of the GNOME desktop slimmed down for FreeBSD releases -RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets \ +RUN_DEPENDS= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets \ gnome-cd:${PORTSDIR}/audio/gnome-media \ gnome-dictionary:${PORTSDIR}/deskutils/gnome-utils \ eog:${PORTSDIR}/graphics/eog \ @@ -22,16 +22,17 @@ RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets gnome-system-monitor:${PORTSDIR}/sysutils/gnome-system-monitor \ nautilus:${PORTSDIR}/x11-fm/nautilus \ yelp:${PORTSDIR}/x11/yelp \ - ${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \ - ${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \ + ${LOCALBASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \ + ${LOCALBASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \ file-roller:${PORTSDIR}/archivers/file-roller \ - ${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \ + ${LOCALBASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \ evince:${PORTSDIR}/graphics/evince \ gcalctool:${PORTSDIR}/math/gcalctool \ gucharmap:${PORTSDIR}/deskutils/gucharmap \ ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ gconf-editor:${PORTSDIR}/sysutils/gconf-editor \ gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \ + gnome-mount:${PORTSDIR}/sysutils/gnome-mount \ totem:${PORTSDIR}/multimedia/totem-gstreamer MASTERDIR= ${.CURDIR}/../gnome2 diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile index 5f135fd0c7ca..14f249d7dbc1 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.69 2006/04/24 02:51:14 mezz Exp $ +# $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.73 2006/10/08 03:46:18 mezz Exp $ # PORTREVISION= 0 @@ -12,9 +12,9 @@ PKGNAMESUFFIX= -power-tools COMMENT= The 'Geektoys' for the GNOME 2 power user -RUN_DEPENDS= ${X11BASE}/lib/epiphany/2.14/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \ +RUN_DEPENDS= ${LOCALBASE}/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}/libexec/netspeed_applet2:${PORTSDIR}/net/netspeed_applet \ ${LOCALBASE}/sbin/gkrellmd:${PORTSDIR}/sysutils/gkrellm2 \ splashsetter:${PORTSDIR}/deskutils/splashsetter \ gdesklets:${PORTSDIR}/deskutils/gdesklets \ @@ -25,12 +25,12 @@ RUN_DEPENDS= ${X11BASE}/lib/epiphany/2.14/extensions/libgesturesextension.so:${P gnome-file-share-properties:${PORTSDIR}/www/gnome-user-share \ serpentine:${PORTSDIR}/sysutils/serpentine \ devilspie:${PORTSDIR}/x11-wm/devilspie \ - ${X11BASE}/lib/nautilus/extensions-1.0/libnautilus-open-terminal.so:${PORTSDIR}/deskutils/nautilus-open-terminal \ + ${LOCALBASE}/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 \ brightside:${PORTSDIR}/x11/brightside \ evolution-gconf-filter-exchange:${PORTSDIR}/devel/evolution-gconf-tools \ - ${X11BASE}/libexec/quick-lounge-applet:${PORTSDIR}/misc/quick-lounge-applet \ + ${LOCALBASE}/libexec/quick-lounge-applet:${PORTSDIR}/misc/quick-lounge-applet \ eiciel:${PORTSDIR}/sysutils/eiciel \ gtk-send-pr:${PORTSDIR}/sysutils/gtk-send-pr \ thefish:${PORTSDIR}/sysutils/thefish \ @@ -40,5 +40,4 @@ MASTERDIR= ${.CURDIR}/../gnome2 GNOME_SLAVE= yes DESCR= ${.CURDIR}/pkg-descr - .include "${MASTERDIR}/Makefile" diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index 24091654468e..2f50ba4814b0 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome2/Makefile,v 1.142 2006/04/23 20:10:22 marcus Exp $ +# $MCom: ports/x11/gnome2/Makefile,v 1.182 2006/10/14 06:34:16 marcus Exp $ # PORTNAME= gnome2 -PORTVERSION= 2.14.3 -PORTREVISION?= 0 +PORTVERSION= 2.16.1 +PORTREVISION?= 2 CATEGORIES?= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -17,7 +17,7 @@ EXTRACT_ONLY= # empty MAINTAINER= gnome@FreeBSD.org COMMENT?= The "meta-port" for the GNOME 2 integrated X11 desktop -RUN_DEPENDS?= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets \ +RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets \ gnome-cd:${PORTSDIR}/audio/gnome-media \ gnome-dictionary:${PORTSDIR}/deskutils/gnome-utils \ eog:${PORTSDIR}/graphics/eog \ @@ -29,38 +29,43 @@ RUN_DEPENDS?= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets bug-buddy:${PORTSDIR}/devel/bug-buddy \ gnome-system-monitor:${PORTSDIR}/sysutils/gnome-system-monitor \ nautilus:${PORTSDIR}/x11-fm/nautilus \ - ${X11BASE}/sbin/gdm:${PORTSDIR}/x11/gdm \ - ${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \ - ${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \ - ${X11BASE}/libdata/pkgconfig/libgail-gnome.pc:${PORTSDIR}/x11-toolkits/libgail-gnome \ + ${LOCALBASE}/sbin/gdm:${PORTSDIR}/x11/gdm \ + ${LOCALBASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \ + ${LOCALBASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \ + ${LOCALBASE}/libdata/pkgconfig/libgail-gnome.pc:${PORTSDIR}/x11-toolkits/libgail-gnome \ file-roller:${PORTSDIR}/archivers/file-roller \ - ${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \ + ${LOCALBASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \ gok:${PORTSDIR}/accessibility/gok \ nautilus-cd-burner:${PORTSDIR}/sysutils/nautilus-cd-burner \ gcalctool:${PORTSDIR}/math/gcalctool \ gucharmap:${PORTSDIR}/deskutils/gucharmap \ zenity:${PORTSDIR}/x11/zenity \ ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ - gnopernicus:${PORTSDIR}/accessibility/gnopernicus \ - ${X11BASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnome-netstatus \ + ${LOCALBASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnome-netstatus \ dasher:${PORTSDIR}/accessibility/dasher \ - evolution-2.6:${PORTSDIR}/mail/evolution \ - ${X11BASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \ + evolution-2.8:${PORTSDIR}/mail/evolution \ + ${LOCALBASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \ network-admin:${PORTSDIR}/sysutils/gnome-system-tools \ gnome-nettool:${PORTSDIR}/net/gnome-nettool \ vino-session:${PORTSDIR}/net/vino \ - 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 \ + exchange-connector-setup-2.8:${PORTSDIR}/mail/evolution-exchange \ + ${LOCALBASE}/lib/gstreamer-0.10/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \ + ${LOCALBASE}/lib/gstreamer-0.10/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \ totem:${PORTSDIR}/multimedia/totem-gstreamer \ gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \ - ${X11BASE}/share/gnome/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \ + ${LOCALBASE}/share/gnome/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \ sound-juicer:${PORTSDIR}/audio/sound-juicer \ gnome-keyring-manager:${PORTSDIR}/security/gnome-keyring-manager \ - ${X11BASE}/libdata/pkgconfig/libgtkhtml-2.0.pc:${PORTSDIR}/www/libgtkhtml \ + ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-2.0.pc:${PORTSDIR}/www/libgtkhtml \ 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 \ + ${LOCALBASE}/libexec/fast-user-switch-applet:${PORTSDIR}/x11/fast-user-switch-applet \ + ${LOCALBASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \ + alacarte:${PORTSDIR}/deskutils/alacarte \ + gnome-power-manager:${PORTSDIR}/sysutils/gnome-power-manager \ + gnome-volume-manager:${PORTSDIR}/sysutils/gnome-volume-manager \ + orca:${PORTSDIR}/accessibility/orca \ + epiphany:${PORTSDIR}/www/epiphany \ + gnome-mount:${PORTSDIR}/sysutils/gnome-mount \ ekiga:${PORTSDIR}/net/ekiga NO_BUILD= yes @@ -78,8 +83,8 @@ do-install: # empty .include <bsd.port.pre.mk> .if !defined(GNOME_SLAVE) -.if ${ARCH} == "i386" || ${OSVERSION} > 500035 -RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany +.if ${ARCH} == "i386" +RUN_DEPENDS+= tomboy:${PORTSDIR}/deskutils/tomboy .endif .if (${ARCH}!="sparc64" || ${OSVERSION} >= 601101) && ${ARCH}!="ia64" RUN_DEPENDS+= yelp:${PORTSDIR}/x11/yelp @@ -88,7 +93,7 @@ RUN_DEPENDS+= yelp:${PORTSDIR}/x11/yelp .if ${.CURDIR}==${MASTERDIR} || ${.CURDIR:T}=="gnome2-lite" .if defined(WITH_XSCREENSAVER) -RUN_DEPENDS+= ${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome +RUN_DEPENDS+= ${LOCALBASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome .else RUN_DEPENDS+= gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver .endif diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 7f7d6cd64bae..9f75d138d598 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -3,12 +3,12 @@ # Whom: Yukihiro Nakai <Nakai@technologist.com> # # $FreeBSD$ -# $MCom: ports/x11/libgnome/Makefile,v 1.78 2006/04/13 07:52:41 bland Exp $ +# $MCom: ports/x11/libgnome/Makefile,v 1.86 2006/09/04 18:09:21 marcus Exp $ # PORTNAME= libgnome -PORTVERSION= 2.14.1 -PORTREVISION?= 1 +PORTVERSION= 2.16.0 +PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -30,8 +30,8 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack esound \ gnomevfs2 libxslt ltverhack referencehack USE_BISON= yes -USE_X_PREFIX= yes -INSTALLS_SHLIB= yes +USE_XLIB= yes +USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo index 42ba5385693f..b1d8dd00d5ff 100644 --- a/x11/libgnome/distinfo +++ b/x11/libgnome/distinfo @@ -1,3 +1,3 @@ -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 +MD5 (gnome2/libgnome-2.16.0.tar.bz2) = b3f030f6c677b0e1bcfca7c7e58d6c4a +SHA256 (gnome2/libgnome-2.16.0.tar.bz2) = 78a2d66bea1d856f06fbd3348abceded8975f09c767a17f58e1d9cd8011ab710 +SIZE (gnome2/libgnome-2.16.0.tar.bz2) = 1011194 diff --git a/x11/libgnome/files/patch-ag b/x11/libgnome/files/patch-libgnome_gnome-util.c index ceb23de357f2..1a7e49a84512 100644 --- a/x11/libgnome/files/patch-ag +++ b/x11/libgnome/files/patch-libgnome_gnome-util.c @@ -1,19 +1,19 @@ ---- 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 @@ - static char *shells [] = { +--- libgnome/gnome-util.c.orig Mon Jul 10 15:25:22 2006 ++++ libgnome/gnome-util.c Mon Jul 10 15:25:55 2006 +@@ -79,11 +79,11 @@ + const char shells [][14] = { /* Note that on some systems shells can also * be installed in /usr/bin */ - "/bin/bash", "/usr/bin/bash", - "/bin/zsh", "/usr/bin/zsh", - "/bin/tcsh", "/usr/bin/tcsh", - "/bin/ksh", "/usr/bin/ksh", -- "/bin/csh", "/bin/sh", NULL -+ "/bin/csh", "/bin/sh", +- "/bin/csh", "/bin/sh" + LOCALBASE "/bin/bash", + LOCALBASE "/bin/zsh", + LOCALBASE "/bin/ksh", + 0 ++ }; if (geteuid () == getuid () && diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in index 7377058cd835..c1cc3758947a 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.4 2005/11/16 00:04:58 ahze Exp $ +# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.7 2006/07/23 17:22:34 mezz Exp $ # # Restore gconf keys of gnomevfs2. @@ -9,11 +9,11 @@ if [ "$2" != "POST-DEINSTALL" ]; then exit 0 fi -SCHEMAS=%%X11BASE%%/etc/gconf/schemas/desktop_default_applications.schemas +SCHEMAS=%%LOCALBASE%%/etc/gconf/schemas/desktop_default_applications.schemas if [ -f ${SCHEMAS} ]; then - env GCONF_CONFIG_SOURCE=xml::%%X11BASE%%/etc/gconf/gconf.xml.defaults \ - %%X11BASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \ + env GCONF_CONFIG_SOURCE=xml::%%LOCALBASE%%/etc/gconf/gconf.xml.defaults \ + %%LOCALBASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \ > /dev/null || /usr/bin/true fi diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index 36702bbf30a3..246d33231ca7 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -31,6 +31,7 @@ share/locale/az/LC_MESSAGES/libgnome-2.0.mo share/locale/be/LC_MESSAGES/libgnome-2.0.mo share/locale/bg/LC_MESSAGES/libgnome-2.0.mo share/locale/bn/LC_MESSAGES/libgnome-2.0.mo +share/locale/bn_IN/LC_MESSAGES/libgnome-2.0.mo share/locale/bs/LC_MESSAGES/libgnome-2.0.mo share/locale/ca/LC_MESSAGES/libgnome-2.0.mo share/locale/cs/LC_MESSAGES/libgnome-2.0.mo @@ -57,6 +58,7 @@ share/locale/id/LC_MESSAGES/libgnome-2.0.mo 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/ka/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 @@ -69,7 +71,6 @@ share/locale/nb/LC_MESSAGES/libgnome-2.0.mo share/locale/ne/LC_MESSAGES/libgnome-2.0.mo share/locale/nl/LC_MESSAGES/libgnome-2.0.mo share/locale/nn/LC_MESSAGES/libgnome-2.0.mo -share/locale/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 @@ -97,9 +98,57 @@ 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 +@dirrm include/libgnome-2.0/libgnome +@dirrm include/libgnome-2.0 +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/yi/LC_MESSAGES +@dirrmtry share/locale/yi +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk @dirrmtry share/locale/tt/LC_MESSAGES @dirrmtry share/locale/tt -@dirrm include/libgnome-2.0/libgnome -@dirrm include/libgnome-2.0 +@dirrmtry share/locale/sr@ije/LC_MESSAGES +@dirrmtry share/locale/sr@ije +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile index f9d7e92d846d..174dedaa57a1 100644 --- a/x11/startup-notification/Makefile +++ b/x11/startup-notification/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# +# $MCom: ports/x11/startup-notification/Makefile,v 1.8 2006/09/10 00:51:15 mezz Exp $ PORTNAME= startup-notification PORTVERSION= 0.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ http://www.freedesktop.org/software/startup-notification/releases/ @@ -17,11 +17,11 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Library that supports startup notification spec from freedesktop.org -USE_X_PREFIX= yes +USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomehack gnometarget pkgconfig GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile index ef2c1b048914..fbaa4031c7a8 100644 --- a/x11/xscreensaver-gnome/Makefile +++ b/x11/xscreensaver-gnome/Makefile @@ -3,11 +3,11 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# +# $MCom: ports/x11/xscreensaver-gnome/Makefile,v 1.2 2006/10/07 19:20:33 ahze Exp $ PORTNAME?= xscreensaver-gnome PORTVERSION= 4.24 -PORTREVISION?= 2 +PORTREVISION?= 4 CATEGORIES= x11 gnome MASTER_SITES= http://www.jwz.org/xscreensaver/ DISTNAME= xscreensaver-${PORTVERSION} @@ -19,7 +19,7 @@ LIB_DEPENDS= gle.4:${PORTSDIR}/graphics/gle CONFLICTS?= xscreensaver-[0-9]* xscreensaver-gnome-hacks-[0-9]* -USE_X_PREFIX= yes +USE_XLIB= yes USE_XPM= yes USE_GL= yes USE_GMAKE= yes diff --git a/x11/xscreensaver-gnome/pkg-plist b/x11/xscreensaver-gnome/pkg-plist index ceb4a9534228..316072c63e5c 100644 --- a/x11/xscreensaver-gnome/pkg-plist +++ b/x11/xscreensaver-gnome/pkg-plist @@ -211,7 +211,6 @@ bin/xscreensaver-hacks/xsublim bin/xscreensaver-hacks/xteevee bin/xscreensaver-hacks/zoom bin/xscreensaver-text -lib/X11/app-defaults/XScreenSaver share/gnome/applications/gnome-screensaver-properties.desktop share/gnome/pixmaps/xscreensaver.xpm share/gnome/xscreensaver/glade/screensaver-cmndln.png @@ -453,3 +452,23 @@ share/xscreensaver/config/zoom.xml @dirrm share/gnome/xscreensaver/glade @dirrm share/gnome/xscreensaver @dirrm bin/xscreensaver-hacks +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/no/LC_MESSAGES +@dirrmtry share/locale/no +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@cwd %%X11BASE%% +lib/X11/app-defaults/XScreenSaver diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile index 20ac324c04b7..15c0d18e8325 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -3,11 +3,12 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/yelp/Makefile,v 1.88 2006/04/16 13:36:49 ahze Exp $ +# $MCom: ports/x11/yelp/Makefile,v 1.105 2006/10/07 17:10:08 marcus Exp $ # PORTNAME= yelp -PORTVERSION= 2.14.3 +PORTVERSION= 2.16.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -16,11 +17,12 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A help browser for the GNOME 2 desktop -USE_GECKO= firefox seamonkey xulrunner firefox-devel<->firefox +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +USE_GECKO= firefox seamonkey xulrunner firefox-devel<->firefox USE_GETTEXT= yes USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils \ libgnomeprintui @@ -34,6 +36,5 @@ MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias" GCONF_SCHEMAS= yelp.schemas .include <bsd.port.pre.mk> -.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" - +.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" .include <bsd.port.post.mk> diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo index 2f1c57b521b4..b5324ffab929 100644 --- a/x11/yelp/distinfo +++ b/x11/yelp/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/yelp-2.14.3.tar.bz2) = d3c4300c9a7d38ff2179b934ca5e2d1a -SHA256 (gnome2/yelp-2.14.3.tar.bz2) = 14ce66413c220eef660a8103e73089b0cb2f68cf03ef9cc38fbb1e563aa3fd98 -SIZE (gnome2/yelp-2.14.3.tar.bz2) = 779245 +MD5 (gnome2/yelp-2.16.1.tar.bz2) = b88c7607bd21d06ee37a877da6747cb3 +SHA256 (gnome2/yelp-2.16.1.tar.bz2) = 33e879be19ad57da495f8cfb075fce7022429706ff2beb6e50183e6396bf8419 +SIZE (gnome2/yelp-2.16.1.tar.bz2) = 855685 diff --git a/x11/yelp/files/patch-src_yelp-search-pager.c b/x11/yelp/files/patch-src_yelp-search-pager.c deleted file mode 100644 index 81c275b4d422..000000000000 --- a/x11/yelp/files/patch-src_yelp-search-pager.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/yelp-search-pager.c.orig Tue May 2 19:10:03 2006 -+++ src/yelp-search-pager.c Tue May 2 18:59:36 2006 -@@ -1413,7 +1413,7 @@ process_man_result (YelpSearchPager *pag - after = strstr (before, "("); - tmp = after; - -- while (!g_ascii_isspace(*tmp)) -+ while (g_ascii_isspace(*tmp)) - tmp--; - - title = g_strndup (before, tmp-before); diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist index d92f49b29f35..1a13b80ea5a8 100644 --- a/x11/yelp/pkg-plist +++ b/x11/yelp/pkg-plist @@ -1,6 +1,5 @@ bin/gnome-help bin/yelp -libdata/bonobo/servers/GNOME_Yelp.server share/gnome/applications/yelp.desktop share/gnome/yelp/default.css share/gnome/yelp/icons/yelp-icon-caution.png @@ -37,6 +36,7 @@ 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/bn_IN/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 @@ -74,16 +74,17 @@ 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 +share/locale/mg/LC_MESSAGES/yelp.mo share/locale/mk/LC_MESSAGES/yelp.mo share/locale/ml/LC_MESSAGES/yelp.mo share/locale/mn/LC_MESSAGES/yelp.mo share/locale/mr/LC_MESSAGES/yelp.mo share/locale/ms/LC_MESSAGES/yelp.mo share/locale/nb/LC_MESSAGES/yelp.mo +share/locale/nds@NFE/LC_MESSAGES/yelp.mo share/locale/ne/LC_MESSAGES/yelp.mo share/locale/nl/LC_MESSAGES/yelp.mo share/locale/nn/LC_MESSAGES/yelp.mo -share/locale/no/LC_MESSAGES/yelp.mo share/locale/nso/LC_MESSAGES/yelp.mo share/locale/or/LC_MESSAGES/yelp.mo share/locale/pa/LC_MESSAGES/yelp.mo @@ -112,23 +113,73 @@ share/locale/zh_CN/LC_MESSAGES/yelp.mo share/locale/zh_HK/LC_MESSAGES/yelp.mo share/locale/zh_TW/LC_MESSAGES/yelp.mo share/locale/zu/LC_MESSAGES/yelp.mo +@dirrm share/gnome/yelp/xslt +@dirrm share/gnome/yelp/ui +@dirrm share/gnome/yelp/icons +@dirrm share/gnome/yelp @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk @dirrmtry share/locale/ug/LC_MESSAGES @dirrmtry share/locale/ug +@dirrmtry share/locale/tg/LC_MESSAGES +@dirrmtry share/locale/tg +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl @dirrmtry share/locale/nso/LC_MESSAGES @dirrmtry share/locale/nso +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/nds@NFE/LC_MESSAGES +@dirrmtry share/locale/nds@NFE @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/mg/LC_MESSAGES +@dirrmtry share/locale/mg +@dirrmtry share/locale/li/LC_MESSAGES +@dirrmtry share/locale/li @dirrmtry share/locale/ky/LC_MESSAGES @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el @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 -@dirrm share/gnome/yelp +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index 4192e01f74b6..ab71fb9feac5 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -3,11 +3,11 @@ # Whom: Franz Klammer <klammer@webonaut.com> # # $FreeBSD$ -# $MCom: ports/x11/zenity/Makefile,v 1.59 2006/04/13 07:52:41 bland Exp $ +# $MCom: ports/x11/zenity/Makefile,v 1.69 2006/10/03 11:37:08 ahze Exp $ # PORTNAME= zenity -PORTVERSION= 2.14.3 +PORTVERSION= 2.16.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -17,16 +17,16 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Display GNOME dialogs from the command line BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper -LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper -USE_X_PREFIX= yes +USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomecanvas gconf2 gnomedocutils USE_BZIP2= yes USE_GETTEXT= yes GNU_CONFIGURE= yes INSTALLS_OMF= yes +CONFIGURE_ARGS= --mandir=${PREFIX}/man 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 475721b6dbd3..b696d89a2963 100644 --- a/x11/zenity/distinfo +++ b/x11/zenity/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/zenity-2.14.3.tar.bz2) = 00c0930abb905a5552f67ee764bd6177 -SHA256 (gnome2/zenity-2.14.3.tar.bz2) = 55b1a1fee5a5b42030c15a101b8a1c95535b5f7a596abed5caf4da550352ff27 -SIZE (gnome2/zenity-2.14.3.tar.bz2) = 1079994 +MD5 (gnome2/zenity-2.16.1.tar.bz2) = fd8748d1456a8dd74f9f1513b9aaea7d +SHA256 (gnome2/zenity-2.16.1.tar.bz2) = 8fda20c9e11b00156381559053e76ffea5569c3a4f2f3d3dec8d9a4ca5c7c618 +SIZE (gnome2/zenity-2.16.1.tar.bz2) = 1311007 diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist index bf5cc497df53..456b2825e8c4 100644 --- a/x11/zenity/pkg-plist +++ b/x11/zenity/pkg-plist @@ -49,18 +49,6 @@ share/gnome/help/zenity/fr/figures/zenity-question-screenshot.png share/gnome/help/zenity/fr/figures/zenity-text-screenshot.png share/gnome/help/zenity/fr/figures/zenity-warning-screenshot.png share/gnome/help/zenity/fr/zenity.xml -share/gnome/help/zenity/sv/figures/zenity-calendar-screenshot.png -share/gnome/help/zenity/sv/figures/zenity-entry-screenshot.png -share/gnome/help/zenity/sv/figures/zenity-error-screenshot.png -share/gnome/help/zenity/sv/figures/zenity-fileselection-screenshot.png -share/gnome/help/zenity/sv/figures/zenity-information-screenshot.png -share/gnome/help/zenity/sv/figures/zenity-list-screenshot.png -share/gnome/help/zenity/sv/figures/zenity-notification-screenshot.png -share/gnome/help/zenity/sv/figures/zenity-progress-screenshot.png -share/gnome/help/zenity/sv/figures/zenity-question-screenshot.png -share/gnome/help/zenity/sv/figures/zenity-text-screenshot.png -share/gnome/help/zenity/sv/figures/zenity-warning-screenshot.png -share/gnome/help/zenity/sv/zenity.xml share/gnome/help/zenity/uk/figures/zenity-calendar-screenshot.png share/gnome/help/zenity/uk/figures/zenity-entry-screenshot.png share/gnome/help/zenity/uk/figures/zenity-error-screenshot.png @@ -77,7 +65,6 @@ 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-sv.omf share/gnome/omf/zenity/zenity-uk.omf share/gnome/zenity/clothes/gnome-tshirt.png share/gnome/zenity/clothes/hawaii-shirt.png @@ -94,94 +81,84 @@ share/gnome/zenity/zenity-scale.png share/gnome/zenity/zenity-text.png share/gnome/zenity/zenity.glade share/gnome/zenity/zenity.png -share/locale/am/LC_MESSAGES/zenity-0.1.mo -share/locale/ar/LC_MESSAGES/zenity-0.1.mo -share/locale/az/LC_MESSAGES/zenity-0.1.mo -share/locale/be/LC_MESSAGES/zenity-0.1.mo -share/locale/bg/LC_MESSAGES/zenity-0.1.mo -share/locale/bn/LC_MESSAGES/zenity-0.1.mo -share/locale/bs/LC_MESSAGES/zenity-0.1.mo -share/locale/ca/LC_MESSAGES/zenity-0.1.mo -share/locale/cs/LC_MESSAGES/zenity-0.1.mo -share/locale/cy/LC_MESSAGES/zenity-0.1.mo -share/locale/da/LC_MESSAGES/zenity-0.1.mo -share/locale/de/LC_MESSAGES/zenity-0.1.mo -share/locale/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 -share/locale/es/LC_MESSAGES/zenity-0.1.mo -share/locale/et/LC_MESSAGES/zenity-0.1.mo -share/locale/eu/LC_MESSAGES/zenity-0.1.mo -share/locale/fa/LC_MESSAGES/zenity-0.1.mo -share/locale/fi/LC_MESSAGES/zenity-0.1.mo -share/locale/fr/LC_MESSAGES/zenity-0.1.mo -share/locale/ga/LC_MESSAGES/zenity-0.1.mo -share/locale/gl/LC_MESSAGES/zenity-0.1.mo -share/locale/gu/LC_MESSAGES/zenity-0.1.mo -share/locale/he/LC_MESSAGES/zenity-0.1.mo -share/locale/hi/LC_MESSAGES/zenity-0.1.mo -share/locale/hr/LC_MESSAGES/zenity-0.1.mo -share/locale/hu/LC_MESSAGES/zenity-0.1.mo -share/locale/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/lv/LC_MESSAGES/zenity-0.1.mo -share/locale/mi/LC_MESSAGES/zenity-0.1.mo -share/locale/mk/LC_MESSAGES/zenity-0.1.mo -share/locale/ml/LC_MESSAGES/zenity-0.1.mo -share/locale/mn/LC_MESSAGES/zenity-0.1.mo -share/locale/ms/LC_MESSAGES/zenity-0.1.mo -share/locale/nb/LC_MESSAGES/zenity-0.1.mo -share/locale/ne/LC_MESSAGES/zenity-0.1.mo -share/locale/nl/LC_MESSAGES/zenity-0.1.mo -share/locale/nn/LC_MESSAGES/zenity-0.1.mo -share/locale/no/LC_MESSAGES/zenity-0.1.mo -share/locale/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 -share/locale/pt_BR/LC_MESSAGES/zenity-0.1.mo -share/locale/ro/LC_MESSAGES/zenity-0.1.mo -share/locale/ru/LC_MESSAGES/zenity-0.1.mo -share/locale/rw/LC_MESSAGES/zenity-0.1.mo -share/locale/sk/LC_MESSAGES/zenity-0.1.mo -share/locale/sl/LC_MESSAGES/zenity-0.1.mo -share/locale/sq/LC_MESSAGES/zenity-0.1.mo -share/locale/sr/LC_MESSAGES/zenity-0.1.mo -share/locale/sr@Latn/LC_MESSAGES/zenity-0.1.mo -share/locale/sv/LC_MESSAGES/zenity-0.1.mo -share/locale/ta/LC_MESSAGES/zenity-0.1.mo -share/locale/th/LC_MESSAGES/zenity-0.1.mo -share/locale/tr/LC_MESSAGES/zenity-0.1.mo -share/locale/ug/LC_MESSAGES/zenity-0.1.mo -share/locale/uk/LC_MESSAGES/zenity-0.1.mo -share/locale/vi/LC_MESSAGES/zenity-0.1.mo -share/locale/xh/LC_MESSAGES/zenity-0.1.mo -share/locale/zh_CN/LC_MESSAGES/zenity-0.1.mo -share/locale/zh_HK/LC_MESSAGES/zenity-0.1.mo -share/locale/zh_TW/LC_MESSAGES/zenity-0.1.mo -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@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 +share/locale/am/LC_MESSAGES/zenity.mo +share/locale/ar/LC_MESSAGES/zenity.mo +share/locale/az/LC_MESSAGES/zenity.mo +share/locale/be/LC_MESSAGES/zenity.mo +share/locale/bg/LC_MESSAGES/zenity.mo +share/locale/bn/LC_MESSAGES/zenity.mo +share/locale/bn_IN/LC_MESSAGES/zenity.mo +share/locale/bs/LC_MESSAGES/zenity.mo +share/locale/ca/LC_MESSAGES/zenity.mo +share/locale/cs/LC_MESSAGES/zenity.mo +share/locale/cy/LC_MESSAGES/zenity.mo +share/locale/da/LC_MESSAGES/zenity.mo +share/locale/de/LC_MESSAGES/zenity.mo +share/locale/dz/LC_MESSAGES/zenity.mo +share/locale/el/LC_MESSAGES/zenity.mo +share/locale/en_CA/LC_MESSAGES/zenity.mo +share/locale/en_GB/LC_MESSAGES/zenity.mo +share/locale/es/LC_MESSAGES/zenity.mo +share/locale/et/LC_MESSAGES/zenity.mo +share/locale/eu/LC_MESSAGES/zenity.mo +share/locale/fa/LC_MESSAGES/zenity.mo +share/locale/fi/LC_MESSAGES/zenity.mo +share/locale/fr/LC_MESSAGES/zenity.mo +share/locale/ga/LC_MESSAGES/zenity.mo +share/locale/gl/LC_MESSAGES/zenity.mo +share/locale/gu/LC_MESSAGES/zenity.mo +share/locale/he/LC_MESSAGES/zenity.mo +share/locale/hi/LC_MESSAGES/zenity.mo +share/locale/hr/LC_MESSAGES/zenity.mo +share/locale/hu/LC_MESSAGES/zenity.mo +share/locale/id/LC_MESSAGES/zenity.mo +share/locale/is/LC_MESSAGES/zenity.mo +share/locale/it/LC_MESSAGES/zenity.mo +share/locale/ja/LC_MESSAGES/zenity.mo +share/locale/ka/LC_MESSAGES/zenity.mo +share/locale/kn/LC_MESSAGES/zenity.mo +share/locale/ko/LC_MESSAGES/zenity.mo +share/locale/ku/LC_MESSAGES/zenity.mo +share/locale/lt/LC_MESSAGES/zenity.mo +share/locale/lv/LC_MESSAGES/zenity.mo +share/locale/mi/LC_MESSAGES/zenity.mo +share/locale/mk/LC_MESSAGES/zenity.mo +share/locale/ml/LC_MESSAGES/zenity.mo +share/locale/mn/LC_MESSAGES/zenity.mo +share/locale/ms/LC_MESSAGES/zenity.mo +share/locale/nb/LC_MESSAGES/zenity.mo +share/locale/ne/LC_MESSAGES/zenity.mo +share/locale/nl/LC_MESSAGES/zenity.mo +share/locale/nn/LC_MESSAGES/zenity.mo +share/locale/or/LC_MESSAGES/zenity.mo +share/locale/pa/LC_MESSAGES/zenity.mo +share/locale/pl/LC_MESSAGES/zenity.mo +share/locale/pt/LC_MESSAGES/zenity.mo +share/locale/pt_BR/LC_MESSAGES/zenity.mo +share/locale/ro/LC_MESSAGES/zenity.mo +share/locale/ru/LC_MESSAGES/zenity.mo +share/locale/rw/LC_MESSAGES/zenity.mo +share/locale/sk/LC_MESSAGES/zenity.mo +share/locale/sl/LC_MESSAGES/zenity.mo +share/locale/sq/LC_MESSAGES/zenity.mo +share/locale/sr/LC_MESSAGES/zenity.mo +share/locale/sr@Latn/LC_MESSAGES/zenity.mo +share/locale/sv/LC_MESSAGES/zenity.mo +share/locale/ta/LC_MESSAGES/zenity.mo +share/locale/th/LC_MESSAGES/zenity.mo +share/locale/tr/LC_MESSAGES/zenity.mo +share/locale/ug/LC_MESSAGES/zenity.mo +share/locale/uk/LC_MESSAGES/zenity.mo +share/locale/vi/LC_MESSAGES/zenity.mo +share/locale/xh/LC_MESSAGES/zenity.mo +share/locale/zh_CN/LC_MESSAGES/zenity.mo +share/locale/zh_HK/LC_MESSAGES/zenity.mo +share/locale/zh_TW/LC_MESSAGES/zenity.mo @dirrm share/gnome/zenity/clothes @dirrm share/gnome/zenity @dirrm share/gnome/omf/zenity @dirrm share/gnome/help/zenity/uk/figures @dirrm share/gnome/help/zenity/uk -@dirrm share/gnome/help/zenity/sv/figures -@dirrm share/gnome/help/zenity/sv @dirrm share/gnome/help/zenity/fr/figures @dirrm share/gnome/help/zenity/fr @dirrm share/gnome/help/zenity/es/figures @@ -191,3 +168,55 @@ share/locale/zh_TW/LC_MESSAGES/zenity-0.1.mo @dirrm share/gnome/help/zenity/C/figures @dirrm share/gnome/help/zenity/C @dirrm share/gnome/help/zenity +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/mi/LC_MESSAGES +@dirrmtry share/locale/mi +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be |