diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2007-03-19 05:14:07 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2007-03-19 05:14:07 +0000 |
| commit | 951c257ea3655de6e80c26a36c18c69ee8047ea8 (patch) | |
| tree | 249b59a23d9c6fae8db5e5639385f6273d237705 /x11 | |
| parent | 91926e92b73e3751382216a16044c5d8b24ad126 (diff) | |
| download | ports-951c257ea3655de6e80c26a36c18c69ee8047ea8.tar.gz ports-951c257ea3655de6e80c26a36c18c69ee8047ea8.zip | |
Notes
Diffstat (limited to 'x11')
69 files changed, 829 insertions, 1461 deletions
diff --git a/x11/Makefile b/x11/Makefile index f0056554cdc7..612579011750 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -156,6 +156,7 @@ SUBDIR += libgnome SUBDIR += libgnome-java SUBDIR += libgnome-reference + SUBDIR += libgnomekbd SUBDIR += libgnomemm SUBDIR += libgnomemm26 SUBDIR += libsx diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile index c40a7e73e5f0..2fa0af68fb2a 100644 --- a/x11/fast-user-switch-applet/Makefile +++ b/x11/fast-user-switch-applet/Makefile @@ -3,11 +3,10 @@ # Whom: Alexander Nedotsukov <bland@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.17 2006/09/04 22:53:22 ahze Exp $ -# +# $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.22 2007/02/27 20:35:24 mezz Exp $ PORTNAME= fast-user-switch-applet -PORTVERSION= 2.16.3 +PORTVERSION= 2.17.4 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11/fast-user-switch-applet/distinfo b/x11/fast-user-switch-applet/distinfo index 254ba269dc6a..49e1fcf19e42 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.16.3.tar.bz2) = 16fe9bb182fd96ebbc65c53c5aaf6752 -SHA256 (gnome2/fast-user-switch-applet-2.16.3.tar.bz2) = 262155853f82acbfbd0a843393fd5ca533db6c67eeaf5d7b2e8c2659050b1b86 -SIZE (gnome2/fast-user-switch-applet-2.16.3.tar.bz2) = 756732 +MD5 (gnome2/fast-user-switch-applet-2.17.4.tar.bz2) = 23bd4568f7d152ec4364c41ab0e10527 +SHA256 (gnome2/fast-user-switch-applet-2.17.4.tar.bz2) = 110b0c06a9c5c04202fa6c1a902832486ad3b5b3229b5bc07f7b93048dfcce81 +SIZE (gnome2/fast-user-switch-applet-2.17.4.tar.bz2) = 759599 diff --git a/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c b/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c index 80e25d0fe1ed..a38c96493386 100644 --- a/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c +++ b/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c @@ -1,10 +1,10 @@ ---- src/gdm-queue.c.orig Fri Feb 2 23:52:26 2007 -+++ src/gdm-queue.c Fri Feb 2 23:52:32 2007 -@@ -32,6 +32,7 @@ +--- src/gdm-queue.c.orig Thu Nov 16 12:39:45 2006 ++++ src/gdm-queue.c Thu Nov 16 12:40:17 2006 +@@ -31,6 +31,7 @@ + #include <sys/socket.h> #include <sys/un.h> #include <errno.h> - #include <stdio.h> +#include <signal.h> + #include <stdio.h> #include "gdm-queue.h" - diff --git a/x11/fast-user-switch-applet/pkg-plist b/x11/fast-user-switch-applet/pkg-plist index d34592325030..ab453477e9d0 100644 --- a/x11/fast-user-switch-applet/pkg-plist +++ b/x11/fast-user-switch-applet/pkg-plist @@ -10,6 +10,13 @@ share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet-text. share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet-username.png share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet.png share/gnome/help/fast-user-switch-applet/C/legal.xml +share/gnome/help/fast-user-switch-applet/en_GB/fast-user-switch-applet.xml +share/gnome/help/fast-user-switch-applet/en_GB/figures/fast_user_switch_applet-context.png +share/gnome/help/fast-user-switch-applet/en_GB/figures/fast_user_switch_applet-icon.png +share/gnome/help/fast-user-switch-applet/en_GB/figures/fast_user_switch_applet-prefs.png +share/gnome/help/fast-user-switch-applet/en_GB/figures/fast_user_switch_applet-text.png +share/gnome/help/fast-user-switch-applet/en_GB/figures/fast_user_switch_applet-username.png +share/gnome/help/fast-user-switch-applet/en_GB/figures/fast_user_switch_applet.png share/gnome/help/fast-user-switch-applet/es/fast-user-switch-applet.xml share/gnome/help/fast-user-switch-applet/es/figures/fast_user_switch_applet-context.png share/gnome/help/fast-user-switch-applet/es/figures/fast_user_switch_applet-icon.png @@ -46,6 +53,7 @@ share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-text 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-en_GB.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-fr.omf share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-pa.omf @@ -111,21 +119,6 @@ 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 -@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 -@dirrm share/gnome/help/fast-user-switch-applet/pa -@dirrm share/gnome/help/fast-user-switch-applet/fr/figures -@dirrm share/gnome/help/fast-user-switch-applet/fr -@dirrm share/gnome/help/fast-user-switch-applet/es/figures -@dirrm share/gnome/help/fast-user-switch-applet/es -@dirrm share/gnome/help/fast-user-switch-applet/C/figures -@dirrm share/gnome/help/fast-user-switch-applet/C -@dirrm share/gnome/help/fast-user-switch-applet -@dirrm share/gnome/fast-user-switch-applet @dirrmtry share/locale/zh_TW/LC_MESSAGES @dirrmtry share/locale/zh_TW @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -168,3 +161,20 @@ share/locale/zh_TW/LC_MESSAGES/fast-user-switch-applet.mo @dirrmtry share/locale/ca @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@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 +@dirrm share/gnome/help/fast-user-switch-applet/pa +@dirrm share/gnome/help/fast-user-switch-applet/fr/figures +@dirrm share/gnome/help/fast-user-switch-applet/fr +@dirrm share/gnome/help/fast-user-switch-applet/es/figures +@dirrm share/gnome/help/fast-user-switch-applet/es +@dirrm share/gnome/help/fast-user-switch-applet/en_GB/figures +@dirrm share/gnome/help/fast-user-switch-applet/en_GB +@dirrm share/gnome/help/fast-user-switch-applet/C/figures +@dirrm share/gnome/help/fast-user-switch-applet/C +@dirrm share/gnome/help/fast-user-switch-applet +@dirrm share/gnome/fast-user-switch-applet diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index adbe16e487a1..fe1b390f608c 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.44 2006/10/03 13:36:08 ahze Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.58 2007/03/12 16:56:06 marcus Exp $ # PORTNAME= gdm -PORTVERSION= 2.16.5 +PORTVERSION= 2.18.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -31,7 +31,8 @@ USE_GMAKE= yes USE_GNOME= gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \ gnomeprefix GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man +CONFIGURE_ARGS= --mandir=${PREFIX}/man \ + --with-console-kit=no CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ GTKDOC="false" diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index 787d2d8ec241..3caa1e92dbfa 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gdm-2.16.5.tar.bz2) = 8f223458b0e957650f6d865a06a271e4 -SHA256 (gnome2/gdm-2.16.5.tar.bz2) = 9347f06782da70352eb7e236613599362aff5b319d23be178b36a0a4424ba010 -SIZE (gnome2/gdm-2.16.5.tar.bz2) = 3136620 +MD5 (gnome2/gdm-2.18.0.tar.bz2) = a569a8275f0e0396e6ef5f63c5f56ad5 +SHA256 (gnome2/gdm-2.18.0.tar.bz2) = 6619ef1ba04f4408f181b1a6c1d8a86f791706e22e0e2803153dbd5554a18053 +SIZE (gnome2/gdm-2.18.0.tar.bz2) = 3461709 diff --git a/x11/gdm/files/extra-patch-daemon_slave.c b/x11/gdm/files/extra-patch-daemon_slave.c index 81521bb3b85a..2d609cf2faec 100644 --- a/x11/gdm/files/extra-patch-daemon_slave.c +++ b/x11/gdm/files/extra-patch-daemon_slave.c @@ -1,6 +1,6 @@ ---- daemon/slave.c.orig Wed Jun 1 20:49:30 2005 -+++ daemon/slave.c Wed Jun 1 20:50:45 2005 -@@ -344,8 +344,7 @@ +--- daemon/slave.c.orig Sat Oct 28 22:38:51 2006 ++++ daemon/slave.c Tue Oct 31 12:33:41 2006 +@@ -321,8 +321,7 @@ run_session_output (gboolean read_until_ break; } @@ -10,7 +10,7 @@ continue; /* write until we succeed in writing something */ -@@ -367,13 +366,6 @@ +@@ -344,13 +343,6 @@ run_session_output (gboolean read_until_ } d->xsession_errors_bytes += r; diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in index 8217bb283942..21b493a0595b 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.8 2006/10/10 20:22:24 mezz Exp $ +# $MCom: ports/x11/gdm/files/gdm.in,v 1.12 2007/02/16 18:14:26 mezz Exp $ # PROVIDE: gdm # REQUIRE: LOGIN cleanvar moused diff --git a/x11/gdm/files/patch-config_locale.alias b/x11/gdm/files/patch-config_locale.alias index 8de8f08b0e29..8f264dbe4812 100644 --- a/x11/gdm/files/patch-config_locale.alias +++ b/x11/gdm/files/patch-config_locale.alias @@ -1,26 +1,29 @@ --- config/locale.alias.orig Sat Jun 11 02:01:45 2005 +++ config/locale.alias Sat Jun 11 03:34:22 2005 -@@ -14,104 +14,56 @@ +@@ -14,132 +14,57 @@ # # - George --Afrikaans af_ZA.UTF-8,af_ZA --Albanian sq_AL.UTF-8,sq_AL +-C(POSIX) C,POSIX +-Afrikaans af_ZA.UTF-8,af_ZA +-Albanian sq_AL.UTF-8,sq_AL -Amharic am_ET.UTF-8,am_ET -Arabic(Egypt) ar_EG.UTF-8,ar_EG -Arabic(Lebanon) ar_LB.UTF-8,ar_LB +-Arabic(SaudiArabia) ar_SA.UTF-8,ar_SA -Armenian hy_AM.UTF-8,hy_AM -Azerbaijani az_AZ.UTF-8,az_AZ -Azerbaijani(Iran) az_IR.UTF-8,az_IR -Basque eu_ES.UTF-8,eu_ES --Belarusian be_BY.UTF-8,be_BY +-Belarusian be_BY.UTF-8,be_BY -Bengali bn_BD.UTF-8,bn_BD --Bengali(India) bn_IN.UTF-8,bn_IN +-Bengali(India) bn_IN.UTF-8,bn_IN -Bosnian bs_BA.UTF-8,bs_BA -Breton br_FR.UTF-8,br_FR -Bulgarian bg_BG.UTF-8,bg_BG -Catalan ca_ES.UTF-8,ca_ES -Chinese(ChinaMainland) zh_CN.UTF-8,zh_CN +-Chinese(GB18030) zh_CN.GB18030 -Chinese(Hong-Kong) zh_HK.UTF-8,zh_HK -Chinese(Singapore) zh_SG.UTF-8,zh_SG -Chinese(Taiwan) zh_TW.UTF-8,zh_TW @@ -28,35 +31,42 @@ -Czech cs_CZ.UTF-8,cs_CZ -Danish da_DK.UTF-8,da_DK -Dutch nl_NL.UTF-8,nl_NL --English(USA) en_US.UTF-8,en_US +-Dutch(Belgium) nl_BE.UTF-8,nl_BE -English(Australia) en_AU.UTF-8,en_AU --English(UK) en_GB.UTF-8,en_GB -English(Canada) en_CA.UTF-8,en_CA -English(Ireland) en_IE.UTF-8,en_IE +-English(Malta) en_MT.UTF-8,en_MT +-English(NewZealand) en_NZ.UTF-8,en_NZ -English(SouthAfrica) en_ZA.UTF-8,en_ZA +-English(UK) en_GB.UTF-8,en_GB +-English(USA) en_US.UTF-8,en_US -Esperanto eo.UTF-8,eo -Estonian et_EE.UTF-8,et_EE -Finnish fi_FI.UTF-8,fi_FI -French fr_FR.UTF-8,fr_FR -French(Belgium) fr_BE.UTF-8,fr_BE +-French(Canada) fr_CA.UTF-8,fr_CA +-French(Luxembourg) fr_LU.UTF-8,fr_LU -French(Switzerland) fr_CH.UTF-8,fr_CH -Galician gl_ES.UTF-8,gl_ES -German de_DE.UTF-8,de_DE -German(Austria) de_AT.UTF-8,de_AT -German(Switzerland) de_CH.UTF-8,de_CH +-German(Luxembourg) de_LU.UTF-8,de_LU -Greek el_GR.UTF-8,el_GR --Gujarati gu_IN.UTF-8,gu_IN +-Greek(Cyprus) el_CY.UTF-8,el_CY +-Gujarati gu_IN.UTF-8,gu_IN -Hebrew he_IL.UTF-8,he_IL -Hindi hi_IN.UTF-8,hi_IN -Hungarian hu_HU.UTF-8,hu_HU -Icelandic is_IS.UTF-8,is_IS --Indonesian id_ID.UTF-8,id_ID --Interlingua ia.UTF-8,ia +-Indonesian id_ID.UTF-8,id_ID +-Interlingua ia.UTF-8,ia -Irish ga_IE.UTF-8,ga_IE -Italian it_IT.UTF-8,it_IT -Japanese ja_JP.UTF-8,ja_JP -Kannada kn_IN.UTF-8,kn_IN --Kinyarwanda rw_RW.UTF-8,rw_RW +-Kinyarwanda rw_RW.UTF-8,rw_RW -Korean ko_KR.UTF-8,ko_KR -Latvian lv_LV.UTF-8,lv_LV -Limburgish li_NL.UTF-8,li_NL @@ -64,30 +74,48 @@ -Limburgish(Germany) li_DE.UTF-8,li_DE -Lithuanian lt_LT.UTF-8,lt_LT -Macedonian mk_MK.UTF-8,mk_MK --Malayalam ml_IN.UTF-8,ml_IN +-Malayalam ml_IN.UTF-8,ml_IN -Malay ms_MY.UTF-8,ms_MY +-Maltese mt_MT.UTF-8,mt_MT -Maori mi_NZ.UTF-8,mi_NZ -Marathi mr_IN.UTF-8,mr_IN -Mongolian mn_MN.UTF-8,mn_MN -Nepali ne_NP.UTF-8,ne_NP --NorthernSotho nso_ZA.UTF-8,nso_ZA +-NorthernSotho nso_ZA.UTF-8,nso_ZA -Norwegian(bokmal) nb_NO.UTF-8,nb_NO,no_NO.UTF-8,no_NO -Norwegian(nynorsk) nn_NO.UTF-8,nn_NO -Oriya or_IN.UTF-8,or_IN --Panjabi pa_IN.UTF-8,pa_IN -Persian fa_IR.UTF-8,fa_IR -Polish pl_PL.UTF-8,pl_PL -Portuguese(Brazilian) pt_BR.UTF-8,pt_BR -Portuguese pt_PT.UTF-8,pt_PT +-Punjabi pa_IN.UTF-8,pa_IN -Romanian ro_RO.UTF-8,ro_RO -Russian ru_RU.UTF-8,ru_RU -Serbian sr_CS.UTF-8,sr_CS,sr_YU@cyrillic,sr_YU +-Serbian(Montenegro) sr_ME.UTF-8
+-Serbian(Serbia) sr_RS.UTF-8
+-Serbian(Bosnia) sh_BA.UTF-8,sh_BA -Serbian(Latin) sr_CS.UTF-8@Latn,sr_CS@Latn,sr_YU@Latn -Serbian(Jekavian) sr_CS.UTF-8@ije,sr_CS@ije,sr_YU@ije -Slovak sk_SK.UTF-8,sk_SK -Slovenian sl_SI.UTF-8,sl_SI -Spanish es_ES.UTF-8,es_ES +-Spanish(Argentina) es_AR.UTF-8,es_AR +-Spanish(Bolivia) es_BO.UTF-8,es_BO +-Spanish(Chile) es_CL.UTF-8,es_CL +-Spanish(Colombia) es_CO.UTF-8,es_CO +-Spanish(CostaRica) es_CR.UTF-8,es_CR +-Spanish(Ecuador) es_EC.UTF-8,es_EC +-Spanish(Guatemala) es_GT.UTF-8,es_GT -Spanish(Mexico) es_MX.UTF-8,es_MX +-Spanish(Nicaragua) es_NI.UTF-8,es_NI +-Spanish(Panama) es_PA.UTF-8,es_PA +-Spanish(Peru) es_PE.UTF-8,es_PE +-Spanish(Paraguay) es_PY.UTF-8,es_PY +-Spanish(ElSalvador) es_SV.UTF-8,es_SV +-Spanish(Uruguay) es_UY.UTF-8,es_UY +-Spanish(Venezuela) es_VE.UTF-8,es_VE -Swedish(Finland) sv_FI.UTF-8,sv_FI -Swedish sv_SE.UTF-8,sv_SE -Tagalog tl_PH.UTF-8,tl_PH @@ -105,6 +133,7 @@ -Xhosa xh_ZA.UTF-8,xh_ZA -Yiddish yi.UTF-8,yi -Zulu zu_ZA.UTF-8,zu_ZA ++C(POSIX) C,POSIX +Afrikaans af_ZA.UTF-8,af_ZA.ISO8859-15,af_ZA.ISO8859-1 +Amharic am_ET.UTF-8 +Armenian hy_AM.UTF-8 diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist index e889e924e9b9..4bcfd78dceac 100644 --- a/x11/gdm/pkg-plist +++ b/x11/gdm/pkg-plist @@ -206,7 +206,6 @@ 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 @@ -264,6 +263,7 @@ share/locale/zu/LC_MESSAGES/gdm.mo @dirrm etc/gdm @dirrmtry etc/dm/Sessions @dirrmtry etc/dm +@dirrmtry sbin @dirrmtry share/gnome/log/gdm @dirrmtry share/gnome/log @unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true @@ -286,8 +286,6 @@ share/locale/zu/LC_MESSAGES/gdm.mo @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 diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 65bc73beac0d..ecb39d9b3e66 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -3,12 +3,11 @@ # 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 $ +# $MCom: ports/x11/gnome-applets/Makefile,v 1.152 2007/03/12 17:47:04 marcus Exp $ # PORTNAME= gnome-applets -PORTVERSION= 2.16.2 -PORTREVISION= 1 +PORTVERSION= 2.18.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -17,13 +16,13 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Applets components for the GNOME 2 Desktop Environment -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/system-tools-backends \ - ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \ + ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ xklavier.11:${PORTSDIR}/x11/libxklavier \ - gucharmap.5:${PORTSDIR}/deskutils/gucharmap -RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/system-tools-backends \ - ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center + gucharmap.6:${PORTSDIR}/deskutils/gucharmap +RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \ + ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center USE_GETTEXT= yes USE_BZIP2= yes @@ -34,7 +33,7 @@ INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \ - gail gnomedocutils + gail gnomedocutils libgnomekbd WANT_GNOME= yes USE_GSTREAMER= yes GNU_CONFIGURE= yes @@ -101,6 +100,8 @@ PLIST_SUB+= PYTHON="@comment " post-patch: @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \ ${WRKSRC}/libgweather/weather-met.c + @${REINPLACE_CMD} -e 's|system-tools-backends|system-tools-backends-2.0|g' \ + ${WRKSRC}/configure .if !defined(USE_PYTHON) @${REINPLACE_CMD} -e 's|HAVE_PYGTK="yes"|HAVE_PYGTK="no"|' \ ${WRKSRC}/configure diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo index ae985f3f785a..14fb514cff2b 100644 --- a/x11/gnome-applets/distinfo +++ b/x11/gnome-applets/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-applets-2.16.2.tar.bz2) = 1a46b8557ff05ca75e7db6adb4dd6707 -SHA256 (gnome2/gnome-applets-2.16.2.tar.bz2) = de3c9d92c5da1597dbcdc5d4a7554235006d0bf6432f97ab7b0a6a5a47dbb67b -SIZE (gnome2/gnome-applets-2.16.2.tar.bz2) = 7127753 +MD5 (gnome2/gnome-applets-2.18.0.tar.bz2) = db3ef99c00335798f30fc0a9162c0257 +SHA256 (gnome2/gnome-applets-2.18.0.tar.bz2) = f8f23e0c5e156afb0811d7a7fcbfec8dc667b8e35fa8a1cfff0b4866014c2157 +SIZE (gnome2/gnome-applets-2.18.0.tar.bz2) = 7133902 diff --git a/x11/gnome-applets/files/patch-cpufreq-freebsd b/x11/gnome-applets/files/patch-cpufreq-freebsd index 53841b6d7346..e7f0e210d28d 100644 --- a/x11/gnome-applets/files/patch-cpufreq-freebsd +++ b/x11/gnome-applets/files/patch-cpufreq-freebsd @@ -63,52 +63,6 @@ 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 @@ @@ -161,9 +115,111 @@ +CPUFreqMonitor *cpufreq_monitor_sysctl_new (guint cpu); + +#endif /* __CPUFREQ_MONITOR_SYSCTL_H__ */ ---- 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 @@ +--- 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" + #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__ + + #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); ++ } else { ++ 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-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/sysctl.h> ++#endif + #include <sys/stat.h> + #include <fcntl.h> + #include <unistd.h> +@@ -30,6 +33,24 @@ + + #include "cpufreq-utils.h" + ++#ifdef __FreeBSD__ ++guint ++cpufreq_utils_get_n_cpus (void) ++{ ++ size_t len; ++ static guint n_cpus = 0; ++ ++ if (n_cpus > 0) ++ return n_cpus; ++ ++ len = sizeof (n_cpus); ++ if (sysctlbyname ("hw.ncpu", &n_cpus, &len, NULL, 0) == -1) { ++ return 1; ++ } ++ ++ 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__ */ + + void + cpufreq_utils_display_error (const gchar *message, +--- cpufreq/src/cpufreq-monitor-sysctl.c.orig Wed Feb 28 14:03:58 2007 ++++ cpufreq/src/cpufreq-monitor-sysctl.c Wed Feb 28 14:28:47 2007 +@@ -0,0 +1,176 @@ +/* + * Copyright (C) 2001, 2002 Free Software Foundation + * @@ -203,6 +259,7 @@ + +static gboolean cpufreq_monitor_sysctl_run (CPUFreqMonitor *monitor); +static GList *cpufreq_monitor_sysctl_get_available_frequencies (CPUFreqMonitor *monitor); ++static GList *cpufreq_monitor_sysctl_get_available_governors (CPUFreqMonitor *monitor); + +static gboolean cpufreq_monitor_sysctl_get (gpointer gdata); + @@ -220,6 +277,7 @@ + + monitor_class->run = cpufreq_monitor_sysctl_run; + monitor_class->get_available_frequencies = cpufreq_monitor_sysctl_get_available_frequencies; ++ monitor_class->get_available_governors = cpufreq_monitor_sysctl_get_available_governors; +} + +CPUFreqMonitor * @@ -242,7 +300,7 @@ + guint mon_cpu; + GList *list; + -+ list = cpufreq_monitor_get_available_frequencies (CPUFREQ_MONITOR (monitor)); ++ list = cpufreq_monitor_sysctl_get_available_frequencies (CPUFREQ_MONITOR (monitor)); + + fmax = atoi ((gchar *) list->data); + fmin = atoi ((gchar *) g_list_nth_data (list, (g_list_length (list) - 1))); @@ -263,9 +321,10 @@ + else if (ifreq == fmin) + governor = g_strdup ("economy"); + else -+ governor = g_strdup ("other"); ++ governor = g_strdup ("userspace"); + + g_object_set (G_OBJECT (monitor), ++ "online", TRUE, + "governor", governor, + "frequency", ifreq, + "max-frequency", fmax, @@ -324,106 +383,62 @@ + + return (list); +} -+#endif /* __FreeBSD__ */ ---- 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" - #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__ - - #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); -+ } else { -+ 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-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/sysctl.h> -+#endif - #include <sys/stat.h> - #include <fcntl.h> - #include <unistd.h> -@@ -30,6 +33,24 @@ - - #include "cpufreq-utils.h" - -+#ifdef __FreeBSD__ -+guint -+cpufreq_utils_get_n_cpus (void) ++static GList * ++cpufreq_monitor_sysctl_get_available_governors (CPUFreqMonitor *monitor) +{ -+ size_t len; -+ static guint n_cpus = 0; ++ GList *list = NULL; + -+ if (n_cpus > 0) -+ return n_cpus; ++ list = g_list_prepend (list, g_strdup ("performance")); ++ list = g_list_prepend (list, g_strdup ("userspace")); ++ list = g_list_prepend (list, g_strdup ("economy")); + -+ len = sizeof (n_cpus); -+ if (sysctlbyname ("hw.ncpu", &n_cpus, &len, NULL, 0) == -1) { -+ return 1; -+ } -+ -+ return n_cpus; ++ return list; +} -+#else - guint - cpufreq_utils_get_n_cpus (void) - { -@@ -72,6 +93,7 @@ cpufreq_utils_get_n_cpus (void) - - return 1; - } +#endif /* __FreeBSD__ */ - - void - cpufreq_utils_display_error (const gchar *message, +--- cpufreq/src/Makefile.in.orig Mon Mar 12 11:58:09 2007 ++++ cpufreq/src/Makefile.in Mon Mar 12 12:12:06 2007 +@@ -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 \ +@@ -411,6 +414,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 +@@ -496,6 +500,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@ diff --git a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd index 8a7ea857c103..8d459fdeef11 100644 --- a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd +++ b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd @@ -1,47 +1,3 @@ ---- 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 @@ @@ -234,3 +190,47 @@ + + return TRUE; +} +--- cpufreq/src/cpufreq-selector/Makefile.in.orig Mon Mar 12 11:58:09 2007 ++++ cpufreq/src/cpufreq-selector/Makefile.in Mon Mar 12 12:12:33 2007 +@@ -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) \ +@@ -75,6 +77,7 @@ 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-sysfs.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector-sysctl.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/main.Po + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -385,6 +388,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 + +@@ -466,6 +470,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@ diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist index 91659e166533..411ee4906704 100644 --- a/x11/gnome-applets/pkg-plist +++ b/x11/gnome-applets/pkg-plist @@ -1,13 +1,6 @@ %%CPUFREQ%%bin/cpufreq-selector -bin/gswitchit-plugins-capplet %%PYTHON%%bin/invest-chart %%BATTERY%%etc/sound/events/battstat_applet.soundlist -include/libgswitchit/gnome-kbd-indicator.h -include/libgswitchit/gswitchit-config.h -include/libgswitchit/gswitchit-plugin.h -include/libgswitchit/gswitchit-plugins-app.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 @@ -59,7 +52,6 @@ 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 %%BATTERY%%libexec/battstat-applet-2 @@ -78,7 +70,6 @@ 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 @@ -116,7 +107,6 @@ 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 @@ -153,6 +143,18 @@ share/gnome/help/accessx-status/bg/figures/accessx_sticky-keys.png share/gnome/help/accessx-status/bg/figures/accessx_sticky-meta-key.png share/gnome/help/accessx-status/bg/figures/accessx_sticky-shift-key.png share/gnome/help/accessx-status/bg/figures/accessx_sticky-windows-key.png +share/gnome/help/accessx-status/en_GB/accessx-status.xml +share/gnome/help/accessx-status/en_GB/figures/accessx-status-applet.png +share/gnome/help/accessx-status/en_GB/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/en_GB/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/en_GB/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/en_GB/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-windows-key.png share/gnome/help/accessx-status/es/accessx-status.xml share/gnome/help/accessx-status/es/figures/accessx-status-applet.png share/gnome/help/accessx-status/es/figures/accessx-status-disabled.png @@ -238,6 +240,12 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png %%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-credits-hal.png %%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-preferences.png %%BATTERY%%share/gnome/help/battstat/bg/figures/context-menu.png +%%BATTERY%%share/gnome/help/battstat/en_GB/battstat.xml +%%BATTERY%%share/gnome/help/battstat/en_GB/figures/battstat-applet-expanded.png +%%BATTERY%%share/gnome/help/battstat/en_GB/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/en_GB/figures/battstat-credits-hal.png +%%BATTERY%%share/gnome/help/battstat/en_GB/figures/battstat-preferences.png +%%BATTERY%%share/gnome/help/battstat/en_GB/figures/context-menu.png %%BATTERY%%share/gnome/help/battstat/es/battstat.xml %%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet-expanded.png %%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet.png @@ -250,6 +258,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/pa/battstat.xml +%%BATTERY%%share/gnome/help/battstat/pa/figures/battstat-applet-expanded.png +%%BATTERY%%share/gnome/help/battstat/pa/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/pa/figures/battstat-credits-hal.png +%%BATTERY%%share/gnome/help/battstat/pa/figures/battstat-preferences.png +%%BATTERY%%share/gnome/help/battstat/pa/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 @@ -273,6 +287,11 @@ share/gnome/help/char-palette/bg/figures/charpalette_applet.png share/gnome/help/char-palette/bg/figures/charpalette_chargroup.png share/gnome/help/char-palette/bg/figures/charpick-preferences.png share/gnome/help/char-palette/bg/figures/charpick_characters.png +share/gnome/help/char-palette/en_GB/char-palette.xml +share/gnome/help/char-palette/en_GB/figures/charpalette_applet.png +share/gnome/help/char-palette/en_GB/figures/charpalette_chargroup.png +share/gnome/help/char-palette/en_GB/figures/charpick-preferences.png +share/gnome/help/char-palette/en_GB/figures/charpick_characters.png share/gnome/help/char-palette/es/char-palette.xml share/gnome/help/char-palette/es/figures/charpalette_applet.png share/gnome/help/char-palette/es/figures/charpalette_chargroup.png @@ -344,6 +363,16 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-selector.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/legal.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/cpufreq-applet.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-100.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-25.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-50.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-applet-preferences-smp.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-applet-selector-both.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-applet.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/cpufreq-applet.xml %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-100.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-25.png @@ -411,6 +440,12 @@ share/gnome/help/drivemount/C/figures/drivemount-applet_mount.png share/gnome/help/drivemount/C/figures/drivemount-applet_open.png share/gnome/help/drivemount/C/figures/drivemount-applet_status.png share/gnome/help/drivemount/C/legal.xml +share/gnome/help/drivemount/en_GB/drivemount.xml +share/gnome/help/drivemount/en_GB/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/en_GB/figures/drivemount-applet_example.png +share/gnome/help/drivemount/en_GB/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/en_GB/figures/drivemount-applet_open.png +share/gnome/help/drivemount/en_GB/figures/drivemount-applet_status.png share/gnome/help/drivemount/es/drivemount.xml share/gnome/help/drivemount/es/figures/drivemount-applet_eject.png share/gnome/help/drivemount/es/figures/drivemount-applet_example.png @@ -435,6 +470,12 @@ 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/ru/drivemount.xml +share/gnome/help/drivemount/ru/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/ru/figures/drivemount-applet_example.png +share/gnome/help/drivemount/ru/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/ru/figures/drivemount-applet_open.png +share/gnome/help/drivemount/ru/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 @@ -458,6 +499,8 @@ share/gnome/help/geyes/C/geyes.xml share/gnome/help/geyes/C/legal.xml share/gnome/help/geyes/bg/figures/geyes_applet.png share/gnome/help/geyes/bg/geyes.xml +share/gnome/help/geyes/en_GB/figures/geyes_applet.png +share/gnome/help/geyes/en_GB/geyes.xml share/gnome/help/geyes/es/figures/geyes_applet.png share/gnome/help/geyes/es/geyes.xml share/gnome/help/geyes/fr/figures/geyes_applet.png @@ -472,8 +515,10 @@ 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/en_GB/gswitchit.xml share/gnome/help/gswitchit/es/gswitchit.xml share/gnome/help/gswitchit/fr/gswitchit.xml +share/gnome/help/gswitchit/ru/gswitchit.xml share/gnome/help/gswitchit/sv/gswitchit.xml share/gnome/help/gswitchit/uk/gswitchit.xml share/gnome/help/gweather/C/figures/gweather-details.png @@ -492,6 +537,21 @@ share/gnome/help/gweather/C/figures/stock_weather-storm.png share/gnome/help/gweather/C/figures/stock_weather-sunny.png share/gnome/help/gweather/C/gweather.xml share/gnome/help/gweather/C/legal.xml +share/gnome/help/gweather/en_GB/figures/gweather-details.png +share/gnome/help/gweather/en_GB/figures/gweather-menu-prefs.png +share/gnome/help/gweather/en_GB/figures/gweather-prefs-general.png +share/gnome/help/gweather/en_GB/figures/gweather-prefs-locations.png +share/gnome/help/gweather/en_GB/figures/gweather_applet.png +share/gnome/help/gweather/en_GB/figures/stock_weather-cloudy.png +share/gnome/help/gweather/en_GB/figures/stock_weather-few-clouds.png +share/gnome/help/gweather/en_GB/figures/stock_weather-fog.png +share/gnome/help/gweather/en_GB/figures/stock_weather-night-clear.png +share/gnome/help/gweather/en_GB/figures/stock_weather-night-few-clouds.png +share/gnome/help/gweather/en_GB/figures/stock_weather-showers.png +share/gnome/help/gweather/en_GB/figures/stock_weather-snow.png +share/gnome/help/gweather/en_GB/figures/stock_weather-storm.png +share/gnome/help/gweather/en_GB/figures/stock_weather-sunny.png +share/gnome/help/gweather/en_GB/gweather.xml share/gnome/help/gweather/es/figures/gweather-details.png share/gnome/help/gweather/es/figures/gweather-menu-prefs.png share/gnome/help/gweather/es/figures/gweather-prefs-general.png @@ -537,6 +597,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/pa/figures/gweather-details.png +share/gnome/help/gweather/pa/figures/gweather-menu-prefs.png +share/gnome/help/gweather/pa/figures/gweather-prefs-general.png +share/gnome/help/gweather/pa/figures/gweather-prefs-locations.png +share/gnome/help/gweather/pa/figures/gweather_applet.png +share/gnome/help/gweather/pa/figures/stock_weather-cloudy.png +share/gnome/help/gweather/pa/figures/stock_weather-few-clouds.png +share/gnome/help/gweather/pa/figures/stock_weather-fog.png +share/gnome/help/gweather/pa/figures/stock_weather-night-clear.png +share/gnome/help/gweather/pa/figures/stock_weather-night-few-clouds.png +share/gnome/help/gweather/pa/figures/stock_weather-showers.png +share/gnome/help/gweather/pa/figures/stock_weather-snow.png +share/gnome/help/gweather/pa/figures/stock_weather-storm.png +share/gnome/help/gweather/pa/figures/stock_weather-sunny.png +share/gnome/help/gweather/pa/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 @@ -570,12 +645,18 @@ share/gnome/help/gweather/uk/gweather.xml share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/C/legal.xml share/gnome/help/mixer_applet2/C/mixer_applet2.xml +share/gnome/help/mixer_applet2/en_GB/figures/volumecontrol_applet.png +share/gnome/help/mixer_applet2/en_GB/mixer_applet2.xml share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/es/mixer_applet2.xml share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/fr/mixer_applet2.xml share/gnome/help/mixer_applet2/it/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/it/mixer_applet2.xml +share/gnome/help/mixer_applet2/pa/figures/volumecontrol_applet.png +share/gnome/help/mixer_applet2/pa/mixer_applet2.xml +share/gnome/help/mixer_applet2/ru/figures/volumecontrol_applet.png +share/gnome/help/mixer_applet2/ru/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 @@ -585,6 +666,10 @@ share/gnome/help/multiload/C/figures/system-monitor-applet_window.png share/gnome/help/multiload/C/figures/system_monitor.png share/gnome/help/multiload/C/legal.xml share/gnome/help/multiload/C/multiload.xml +share/gnome/help/multiload/en_GB/figures/multiload-preferences.png +share/gnome/help/multiload/en_GB/figures/system-monitor-applet_window.png +share/gnome/help/multiload/en_GB/figures/system_monitor.png +share/gnome/help/multiload/en_GB/multiload.xml share/gnome/help/multiload/es/figures/multiload-preferences.png share/gnome/help/multiload/es/figures/system-monitor-applet_window.png share/gnome/help/multiload/es/figures/system_monitor.png @@ -593,6 +678,14 @@ 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/pa/figures/multiload-preferences.png +share/gnome/help/multiload/pa/figures/system-monitor-applet_window.png +share/gnome/help/multiload/pa/figures/system_monitor.png +share/gnome/help/multiload/pa/multiload.xml +share/gnome/help/multiload/ru/figures/multiload-preferences.png +share/gnome/help/multiload/ru/figures/system-monitor-applet_window.png +share/gnome/help/multiload/ru/figures/system_monitor.png +share/gnome/help/multiload/ru/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 @@ -608,6 +701,12 @@ share/gnome/help/stickynotes_applet/C/figures/stickynotes-prefs.png share/gnome/help/stickynotes_applet/C/figures/stickynotes_applet.png share/gnome/help/stickynotes_applet/C/legal.xml share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/en_GB/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/en_GB/figures/stickynote-right-menu-new.png +share/gnome/help/stickynotes_applet/en_GB/figures/stickynotes-note-prefs.png +share/gnome/help/stickynotes_applet/en_GB/figures/stickynotes-prefs.png +share/gnome/help/stickynotes_applet/en_GB/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/en_GB/stickynotes_applet.xml share/gnome/help/stickynotes_applet/es/figures/stickynote-right-menu-lock.png share/gnome/help/stickynotes_applet/es/figures/stickynote-right-menu-new.png share/gnome/help/stickynotes_applet/es/figures/stickynotes-note-prefs.png @@ -620,6 +719,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/pa/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/pa/figures/stickynote-right-menu-new.png +share/gnome/help/stickynotes_applet/pa/figures/stickynotes-note-prefs.png +share/gnome/help/stickynotes_applet/pa/figures/stickynotes-prefs.png +share/gnome/help/stickynotes_applet/pa/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/pa/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 @@ -635,6 +740,8 @@ share/gnome/help/stickynotes_applet/uk/stickynotes_applet.xml share/gnome/help/trashapplet/C/figures/trash-applet.png share/gnome/help/trashapplet/C/legal.xml share/gnome/help/trashapplet/C/trashapplet.xml +share/gnome/help/trashapplet/en_GB/figures/trash-applet.png +share/gnome/help/trashapplet/en_GB/trashapplet.xml share/gnome/help/trashapplet/es/figures/trash-applet.png share/gnome/help/trashapplet/es/trashapplet.xml share/gnome/help/trashapplet/fr/figures/trash-applet.png @@ -653,6 +760,7 @@ share/gnome/help/trashapplet/uk/figures/trash-applet.png share/gnome/help/trashapplet/uk/trashapplet.xml share/gnome/omf/accessx-status/accessx-status-C.omf share/gnome/omf/accessx-status/accessx-status-bg.omf +share/gnome/omf/accessx-status/accessx-status-en_GB.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 @@ -661,12 +769,15 @@ 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-en_GB.omf %%BATTERY%%share/gnome/omf/battstat/battstat-es.omf %%BATTERY%%share/gnome/omf/battstat/battstat-fr.omf +%%BATTERY%%share/gnome/omf/battstat/battstat-pa.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 +share/gnome/omf/char-palette/char-palette-en_GB.omf share/gnome/omf/char-palette/char-palette-es.omf share/gnome/omf/char-palette/char-palette-fr.omf share/gnome/omf/char-palette/char-palette-it.omf @@ -681,6 +792,7 @@ share/gnome/omf/char-palette/char-palette-uk.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-en_GB.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 @@ -688,15 +800,18 @@ share/gnome/omf/char-palette/char-palette-uk.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-en_GB.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-ru.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-en_GB.omf share/gnome/omf/geyes/geyes-es.omf share/gnome/omf/geyes/geyes-fr.omf share/gnome/omf/geyes/geyes-it.omf @@ -704,33 +819,46 @@ 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-en_GB.omf share/gnome/omf/gswitchit/gswitchit-es.omf share/gnome/omf/gswitchit/gswitchit-fr.omf +share/gnome/omf/gswitchit/gswitchit-ru.omf share/gnome/omf/gswitchit/gswitchit-sv.omf share/gnome/omf/gswitchit/gswitchit-uk.omf share/gnome/omf/gweather/gweather-C.omf +share/gnome/omf/gweather/gweather-en_GB.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-pa.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-en_GB.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-pa.omf +share/gnome/omf/mixer_applet2/mixer_applet2-ru.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-en_GB.omf share/gnome/omf/multiload/multiload-es.omf share/gnome/omf/multiload/multiload-fr.omf +share/gnome/omf/multiload/multiload-pa.omf +share/gnome/omf/multiload/multiload-ru.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-en_GB.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-pa.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-en_GB.omf share/gnome/omf/trashapplet/trashapplet-es.omf share/gnome/omf/trashapplet/trashapplet-fr.omf share/gnome/omf/trashapplet/trashapplet-it.omf @@ -1028,6 +1156,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/trashapplet/fr @dirrm share/gnome/help/trashapplet/es/figures @dirrm share/gnome/help/trashapplet/es +@dirrm share/gnome/help/trashapplet/en_GB/figures +@dirrm share/gnome/help/trashapplet/en_GB @dirrm share/gnome/help/trashapplet/C/figures @dirrm share/gnome/help/trashapplet/C @dirrm share/gnome/help/trashapplet @@ -1035,10 +1165,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @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/pa/figures +@dirrm share/gnome/help/stickynotes_applet/pa @dirrm share/gnome/help/stickynotes_applet/fr/figures @dirrm share/gnome/help/stickynotes_applet/fr @dirrm share/gnome/help/stickynotes_applet/es/figures @dirrm share/gnome/help/stickynotes_applet/es +@dirrm share/gnome/help/stickynotes_applet/en_GB/figures +@dirrm share/gnome/help/stickynotes_applet/en_GB @dirrm share/gnome/help/stickynotes_applet/C/figures @dirrm share/gnome/help/stickynotes_applet/C @dirrm share/gnome/help/stickynotes_applet @@ -1046,10 +1180,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/multiload/uk @dirrm share/gnome/help/multiload/sv/figures @dirrm share/gnome/help/multiload/sv +@dirrm share/gnome/help/multiload/ru/figures +@dirrm share/gnome/help/multiload/ru +@dirrm share/gnome/help/multiload/pa/figures +@dirrm share/gnome/help/multiload/pa @dirrm share/gnome/help/multiload/fr/figures @dirrm share/gnome/help/multiload/fr @dirrm share/gnome/help/multiload/es/figures @dirrm share/gnome/help/multiload/es +@dirrm share/gnome/help/multiload/en_GB/figures +@dirrm share/gnome/help/multiload/en_GB @dirrm share/gnome/help/multiload/C/figures @dirrm share/gnome/help/multiload/C @dirrm share/gnome/help/multiload @@ -1057,12 +1197,18 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @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/ru/figures +@dirrm share/gnome/help/mixer_applet2/ru +@dirrm share/gnome/help/mixer_applet2/pa/figures +@dirrm share/gnome/help/mixer_applet2/pa @dirrm share/gnome/help/mixer_applet2/it/figures @dirrm share/gnome/help/mixer_applet2/it @dirrm share/gnome/help/mixer_applet2/fr/figures @dirrm share/gnome/help/mixer_applet2/fr @dirrm share/gnome/help/mixer_applet2/es/figures @dirrm share/gnome/help/mixer_applet2/es +@dirrm share/gnome/help/mixer_applet2/en_GB/figures +@dirrm share/gnome/help/mixer_applet2/en_GB @dirrm share/gnome/help/mixer_applet2/C/figures @dirrm share/gnome/help/mixer_applet2/C @dirrm share/gnome/help/mixer_applet2 @@ -1070,19 +1216,25 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/gweather/uk @dirrm share/gnome/help/gweather/sv/figures @dirrm share/gnome/help/gweather/sv +@dirrm share/gnome/help/gweather/pa/figures +@dirrm share/gnome/help/gweather/pa @dirrm share/gnome/help/gweather/nl/figures @dirrm share/gnome/help/gweather/nl @dirrm share/gnome/help/gweather/fr/figures @dirrm share/gnome/help/gweather/fr @dirrm share/gnome/help/gweather/es/figures @dirrm share/gnome/help/gweather/es +@dirrm share/gnome/help/gweather/en_GB/figures +@dirrm share/gnome/help/gweather/en_GB @dirrm share/gnome/help/gweather/C/figures @dirrm share/gnome/help/gweather/C @dirrm share/gnome/help/gweather @dirrm share/gnome/help/gswitchit/uk @dirrm share/gnome/help/gswitchit/sv +@dirrm share/gnome/help/gswitchit/ru @dirrm share/gnome/help/gswitchit/fr @dirrm share/gnome/help/gswitchit/es +@dirrm share/gnome/help/gswitchit/en_GB @dirrm share/gnome/help/gswitchit/C @dirrm share/gnome/help/gswitchit @dirrm share/gnome/help/geyes/uk/figures @@ -1097,6 +1249,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/geyes/fr @dirrm share/gnome/help/geyes/es/figures @dirrm share/gnome/help/geyes/es +@dirrm share/gnome/help/geyes/en_GB/figures +@dirrm share/gnome/help/geyes/en_GB @dirrm share/gnome/help/geyes/bg/figures @dirrm share/gnome/help/geyes/bg @dirrm share/gnome/help/geyes/C/figures @@ -1108,6 +1262,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/drivemount/uk @dirrm share/gnome/help/drivemount/sv/figures @dirrm share/gnome/help/drivemount/sv +@dirrm share/gnome/help/drivemount/ru/figures +@dirrm share/gnome/help/drivemount/ru @dirrm share/gnome/help/drivemount/pa/figures @dirrm share/gnome/help/drivemount/pa @dirrm share/gnome/help/drivemount/it/figures @@ -1116,6 +1272,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/drivemount/fr @dirrm share/gnome/help/drivemount/es/figures @dirrm share/gnome/help/drivemount/es +@dirrm share/gnome/help/drivemount/en_GB/figures +@dirrm share/gnome/help/drivemount/en_GB @dirrm share/gnome/help/drivemount/C/figures @dirrm share/gnome/help/drivemount/C @dirrm share/gnome/help/drivemount @@ -1131,6 +1289,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo %%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/en_GB/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/en_GB %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet @@ -1161,6 +1321,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/char-palette/fr @dirrm share/gnome/help/char-palette/es/figures @dirrm share/gnome/help/char-palette/es +@dirrm share/gnome/help/char-palette/en_GB/figures +@dirrm share/gnome/help/char-palette/en_GB @dirrm share/gnome/help/char-palette/bg/figures @dirrm share/gnome/help/char-palette/bg @dirrm share/gnome/help/char-palette/C/figures @@ -1170,10 +1332,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo %%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/pa/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/pa %%BATTERY%%@dirrm share/gnome/help/battstat/fr/figures %%BATTERY%%@dirrm share/gnome/help/battstat/fr %%BATTERY%%@dirrm share/gnome/help/battstat/es/figures %%BATTERY%%@dirrm share/gnome/help/battstat/es +%%BATTERY%%@dirrm share/gnome/help/battstat/en_GB/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/en_GB %%BATTERY%%@dirrm share/gnome/help/battstat/bg/figures %%BATTERY%%@dirrm share/gnome/help/battstat/bg %%BATTERY%%@dirrm share/gnome/help/battstat/C/figures @@ -1191,6 +1357,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/accessx-status/fr @dirrm share/gnome/help/accessx-status/es/figures @dirrm share/gnome/help/accessx-status/es +@dirrm share/gnome/help/accessx-status/en_GB/figures +@dirrm share/gnome/help/accessx-status/en_GB @dirrm share/gnome/help/accessx-status/bg/figures @dirrm share/gnome/help/accessx-status/bg @dirrm share/gnome/help/accessx-status/C/figures @@ -1209,7 +1377,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @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 diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index 6afa316d1b9b..576e2a8ad768 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-desktop/Makefile,v 1.105 2006/10/03 01:38:25 ahze Exp $ +# $MCom: ports/x11/gnome-desktop/Makefile,v 1.112 2007/03/13 12:15:44 ahze Exp $ # PORTNAME= gnome-desktop -PORTVERSION= 2.16.3 +PORTVERSION= 2.18.0 PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo index bf62a9902c55..fe407cef090c 100644 --- a/x11/gnome-desktop/distinfo +++ b/x11/gnome-desktop/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-desktop-2.16.3.tar.bz2) = 42c21d18589f4955bb0d70c82236d999 -SHA256 (gnome2/gnome-desktop-2.16.3.tar.bz2) = 1cff15d7e83572d7d510e6a48277f6741a7612bc3d2b6ac3344af8bd6ecc0769 -SIZE (gnome2/gnome-desktop-2.16.3.tar.bz2) = 1201741 +MD5 (gnome2/gnome-desktop-2.18.0.tar.bz2) = 3fdea4f0188e5b1c19beb0dd0cbd317e +SHA256 (gnome2/gnome-desktop-2.18.0.tar.bz2) = e8b6e23c2833cf1905c402c79a2aebdbb283cbd0930ec3119e564a18bfe1e98b +SIZE (gnome2/gnome-desktop-2.18.0.tar.bz2) = 1234276 diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist index 5f7d6d681051..0620f7da8fd6 100644 --- a/x11/gnome-desktop/pkg-plist +++ b/x11/gnome-desktop/pkg-plist @@ -31,6 +31,7 @@ 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/vi/gpl.xml share/gnome/help/gpl/zh_CN/gpl.xml share/gnome/help/lgpl/C/lgpl.xml share/gnome/help/lgpl/es/lgpl.xml @@ -51,6 +52,7 @@ 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-vi.omf share/gnome/omf/gpl/gpl-zh_CN.omf share/gnome/omf/lgpl/lgpl-C.omf share/gnome/omf/lgpl/lgpl-es.omf @@ -136,6 +138,7 @@ share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/be/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/be@latin/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 @@ -220,30 +223,6 @@ 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 -@dirrm share/gnome/omf/lgpl -@dirrm share/gnome/omf/gpl -@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/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 @@ -318,5 +297,32 @@ share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo @dirrmtry share/locale/ca @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin @dirrmtry share/locale/be/LC_MESSAGES @dirrmtry share/locale/be +@dirrm share/gnome/omf/lgpl +@dirrm share/gnome/omf/gpl +@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/vi +@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/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 diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile index 26c86ecf496d..bde46e8025cc 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.39 2006/10/03 11:32:43 ahze Exp $ +# $MCom: ports/x11/gnome-menus/Makefile,v 1.50 2007/03/12 22:36:46 marcus Exp $ # PORTNAME= gnome-menus -PORTVERSION= 2.16.1 +PORTVERSION= 2.18.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo index 40c830018d7e..752542ac91f2 100644 --- a/x11/gnome-menus/distinfo +++ b/x11/gnome-menus/distinfo @@ -1,3 +1,3 @@ -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 +MD5 (gnome2/gnome-menus-2.18.0.tar.bz2) = 746f336d4fd427cb2db1691bc53a49d4 +SHA256 (gnome2/gnome-menus-2.18.0.tar.bz2) = f73372cb9f895ae4cee35d56868fcee3e3182aea52f20ce29ffb2aaf86403f1d +SIZE (gnome2/gnome-menus-2.18.0.tar.bz2) = 434900 diff --git a/x11/gnome-menus/files/patch-layout::preferences.menu b/x11/gnome-menus/files/patch-layout::preferences.menu index fef1dc0dca96..705e0e6cd2ee 100644 --- a/x11/gnome-menus/files/patch-layout::preferences.menu +++ b/x11/gnome-menus/files/patch-layout::preferences.menu @@ -1,5 +1,5 @@ ---- layout/preferences.menu.orig Sat Dec 11 07:58:50 2004 -+++ layout/preferences.menu Tue Mar 1 01:28:57 2005 +--- layout/preferences.menu.orig Tue Feb 13 04:18:01 2007 ++++ layout/preferences.menu Tue Feb 13 16:54:35 2007 @@ -9,12 +9,15 @@ <DefaultAppDirs/> <DefaultDirectoryDirs/> @@ -24,11 +24,11 @@ <Include> <And> + <Not> -+ <Or> -+ <Category>Qt</Category> -+ <Category>KDE</Category> -+ </Or> -+ </Not> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ </Not> <Category>Settings</Category> <Category>Accessibility</Category> </And> diff --git a/x11/gnome-menus/files/patch-layout::settings.menu b/x11/gnome-menus/files/patch-layout::settings.menu deleted file mode 100644 index 115f03ce7599..000000000000 --- a/x11/gnome-menus/files/patch-layout::settings.menu +++ /dev/null @@ -1,22 +0,0 @@ ---- layout/settings.menu.orig Thu Apr 14 17:36:13 2005 -+++ layout/settings.menu Tue May 17 18:42:56 2005 -@@ -25,10 +25,19 @@ - <Directory>System-Settings.directory</Directory> - <Include> - <And> -+ <Not> -+ <Or> -+ <Category>Qt</Category> -+ <Category>KDE</Category> -+ </Or> -+ </Not> - <Category>Settings</Category> - <Category>System</Category> - </And> - </Include> - </Menu> <!-- End System Settings --> -+ -+ <!-- Read in overrides and child menus from settings-merged/ --> -+ <DefaultMergeDirs/> - - </Menu> <!-- End Applications --> diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist index 1a63a7cb3952..59cea97cb008 100644 --- a/x11/gnome-menus/pkg-plist +++ b/x11/gnome-menus/pkg-plist @@ -19,18 +19,24 @@ share/gnome/desktop-directories/Development.directory share/gnome/desktop-directories/Education.directory share/gnome/desktop-directories/Games.directory share/gnome/desktop-directories/Graphics.directory +share/gnome/desktop-directories/Hardware.directory share/gnome/desktop-directories/Internet.directory +share/gnome/desktop-directories/InternetAndNetwork.directory share/gnome/desktop-directories/KDE.directory +share/gnome/desktop-directories/LookAndFeel.directory share/gnome/desktop-directories/Multimedia.directory share/gnome/desktop-directories/Office.directory share/gnome/desktop-directories/Other.directory +share/gnome/desktop-directories/Personal.directory share/gnome/desktop-directories/Preferences.directory share/gnome/desktop-directories/Settings-Accessibility.directory share/gnome/desktop-directories/Settings.directory share/gnome/desktop-directories/System-Settings.directory share/gnome/desktop-directories/System-Tools.directory +share/gnome/desktop-directories/System.directory share/locale/ar/LC_MESSAGES/gnome-menus.mo share/locale/be/LC_MESSAGES/gnome-menus.mo +share/locale/be@latin/LC_MESSAGES/gnome-menus.mo share/locale/bg/LC_MESSAGES/gnome-menus.mo share/locale/bn/LC_MESSAGES/gnome-menus.mo share/locale/bn_IN/LC_MESSAGES/gnome-menus.mo @@ -44,14 +50,15 @@ share/locale/dz/LC_MESSAGES/gnome-menus.mo share/locale/el/LC_MESSAGES/gnome-menus.mo share/locale/en_CA/LC_MESSAGES/gnome-menus.mo share/locale/en_GB/LC_MESSAGES/gnome-menus.mo +share/locale/eo/LC_MESSAGES/gnome-menus.mo share/locale/es/LC_MESSAGES/gnome-menus.mo share/locale/et/LC_MESSAGES/gnome-menus.mo 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/gn/LC_MESSAGES/gnome-menus.mo share/locale/gu/LC_MESSAGES/gnome-menus.mo share/locale/he/LC_MESSAGES/gnome-menus.mo share/locale/hi/LC_MESSAGES/gnome-menus.mo @@ -105,8 +112,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo @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 @@ -167,5 +172,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo @dirrmtry share/locale/ca @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin @dirrmtry share/locale/be/LC_MESSAGES @dirrmtry share/locale/be diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 9cf74ebad1c8..976d9b8060cb 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-panel/Makefile,v 1.140 2006/10/03 11:29:52 ahze Exp $ +# $MCom: ports/x11/gnome-panel/Makefile,v 1.146 2007/03/14 21:00:05 marcus Exp $ # PORTNAME= gnome-panel -PORTVERSION= 2.16.3 -PORTREVISION?= 0 +PORTVERSION= 2.18.0 +PORTREVISION?= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-panel/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -72,6 +72,8 @@ post-patch: @${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po} .endfor .endif + @${REINPLACE_CMD} -e 's|True|true|' \ + ${WRKSRC}/gnome-panel/gnome-panel.desktop.in .include <bsd.port.post.mk> diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index 2a80242ea95a..658514901f7a 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-panel-2.16.3.tar.bz2) = 4af0a1ecb940f2bb27a27db50e3071c8 -SHA256 (gnome2/gnome-panel-2.16.3.tar.bz2) = 16e44673e3a660585cb007c54d7b5e0aa5fe26e979090926cc55322bb6d0d67e -SIZE (gnome2/gnome-panel-2.16.3.tar.bz2) = 2692203 +MD5 (gnome2/gnome-panel-2.18.0.tar.bz2) = 67ab5a4df1817fe14572d9e366664665 +SHA256 (gnome2/gnome-panel-2.18.0.tar.bz2) = 856c5205878bd0bee4bc7e62bdc7ecfce560aa233d2acfaf17a61d5ec446ef46 +SIZE (gnome2/gnome-panel-2.18.0.tar.bz2) = 2706385 diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist index 70c9d7a51a4e..7737022ecf19 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -24,6 +24,7 @@ libexec/clock-applet libexec/fish-applet-2 libexec/notification-area-applet libexec/wnck-applet +share/gnome/applications/gnome-panel.desktop share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml share/gnome/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml @@ -60,6 +61,9 @@ share/gnome/help/clock/nl/legal.xml share/gnome/help/clock/pa/clock.xml share/gnome/help/clock/pa/figures/clock_applet.png share/gnome/help/clock/pa/legal.xml +share/gnome/help/clock/ru/clock.xml +share/gnome/help/clock/ru/figures/clock_applet.png +share/gnome/help/clock/ru/legal.xml share/gnome/help/clock/sr/clock.xml share/gnome/help/clock/sr/figures/clock_applet.png share/gnome/help/clock/sr/legal.xml @@ -142,6 +146,14 @@ share/gnome/help/window-list/ko/figures/window_list_group.png 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/pa/figures/window_list_applet.png +share/gnome/help/window-list/pa/figures/window_list_group_applet.png +share/gnome/help/window-list/pa/legal.xml +share/gnome/help/window-list/pa/window-list.xml +share/gnome/help/window-list/ru/figures/window_list_applet.png +share/gnome/help/window-list/ru/figures/window_list_group_applet.png +share/gnome/help/window-list/ru/legal.xml +share/gnome/help/window-list/ru/window-list.xml share/gnome/help/window-list/sv/figures/window_list_applet.png share/gnome/help/window-list/sv/figures/window_list_group_applet.png share/gnome/help/window-list/sv/legal.xml @@ -185,6 +197,12 @@ share/gnome/help/workspace-switcher/ko/workspace-switcher.xml 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/pa/figures/workspace_switcher_applet.png +share/gnome/help/workspace-switcher/pa/legal.xml +share/gnome/help/workspace-switcher/pa/workspace-switcher.xml +share/gnome/help/workspace-switcher/ru/figures/workspace_switcher_applet.png +share/gnome/help/workspace-switcher/ru/legal.xml +share/gnome/help/workspace-switcher/ru/workspace-switcher.xml share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/sv/legal.xml share/gnome/help/workspace-switcher/sv/workspace-switcher.xml @@ -209,6 +227,7 @@ share/gnome/omf/clock/clock-ja.omf share/gnome/omf/clock/clock-ko.omf share/gnome/omf/clock/clock-nl.omf share/gnome/omf/clock/clock-pa.omf +share/gnome/omf/clock/clock-ru.omf share/gnome/omf/clock/clock-sr.omf share/gnome/omf/clock/clock-sv.omf share/gnome/omf/clock/clock-uk.omf @@ -238,6 +257,8 @@ share/gnome/omf/window-list/window-list-C.omf share/gnome/omf/window-list/window-list-es.omf share/gnome/omf/window-list/window-list-fr.omf share/gnome/omf/window-list/window-list-it.omf +share/gnome/omf/window-list/window-list-pa.omf +share/gnome/omf/window-list/window-list-ru.omf share/gnome/omf/window-list/window-list-sv.omf share/gnome/omf/window-list/window-list-uk.omf share/gnome/omf/window-list/window-list-zh_CN.omf @@ -246,6 +267,8 @@ share/gnome/omf/workspace-switcher/workspace-switcher-es.omf share/gnome/omf/workspace-switcher/workspace-switcher-fr.omf share/gnome/omf/workspace-switcher/workspace-switcher-it.omf share/gnome/omf/workspace-switcher/workspace-switcher-nl.omf +share/gnome/omf/workspace-switcher/workspace-switcher-pa.omf +share/gnome/omf/workspace-switcher/workspace-switcher-ru.omf share/gnome/omf/workspace-switcher/workspace-switcher-sv.omf share/gnome/omf/workspace-switcher/workspace-switcher-uk.omf share/gnome/panel/glade/fish.glade @@ -265,6 +288,7 @@ 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-launcher.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 @@ -275,6 +299,7 @@ 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-launcher.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 @@ -285,6 +310,7 @@ 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-launcher.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 @@ -295,6 +321,7 @@ 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-launcher.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 @@ -305,6 +332,7 @@ 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-launcher.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 @@ -411,6 +439,10 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/workspace-switcher/uk @dirrm share/gnome/help/workspace-switcher/sv/figures @dirrm share/gnome/help/workspace-switcher/sv +@dirrm share/gnome/help/workspace-switcher/ru/figures +@dirrm share/gnome/help/workspace-switcher/ru +@dirrm share/gnome/help/workspace-switcher/pa/figures +@dirrm share/gnome/help/workspace-switcher/pa @dirrm share/gnome/help/workspace-switcher/nl/figures @dirrm share/gnome/help/workspace-switcher/nl @dirrm share/gnome/help/workspace-switcher/ko/figures @@ -436,6 +468,10 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/window-list/uk @dirrm share/gnome/help/window-list/sv/figures @dirrm share/gnome/help/window-list/sv +@dirrm share/gnome/help/window-list/ru/figures +@dirrm share/gnome/help/window-list/ru +@dirrm share/gnome/help/window-list/pa/figures +@dirrm share/gnome/help/window-list/pa @dirrm share/gnome/help/window-list/ko/figures @dirrm share/gnome/help/window-list/ko @dirrm share/gnome/help/window-list/ja/figures @@ -485,6 +521,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/clock/sv @dirrm share/gnome/help/clock/sr/figures @dirrm share/gnome/help/clock/sr +@dirrm share/gnome/help/clock/ru/figures +@dirrm share/gnome/help/clock/ru @dirrm share/gnome/help/clock/pa/figures @dirrm share/gnome/help/clock/pa @dirrm share/gnome/help/clock/nl/figures diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index 2d68d715bc3f..82369530afc7 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.58 2006/10/07 19:45:39 marcus Exp $ +# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.71 2007/03/12 21:25:30 marcus Exp $ # PORTNAME= gnome-screensaver -PORTVERSION= 2.16.3 +PORTVERSION= 2.18.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -16,7 +16,6 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME screen saver and locker -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib RUN_DEPENDS= xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks USE_BZIP2= yes @@ -24,7 +23,8 @@ USE_XLIB= yes USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomemenus +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomemenus \ + libgnomekbd CONFIGURE_ARGS= --with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \ --with-xscreensaverdir=${XSCREENSAVER_DIR} \ --with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks @@ -43,10 +43,6 @@ OPTIONS= PAM "Pluggable Authentication Module support" off .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -BROKEN= Does not build on 4.X -.endif - .if !defined(WITH_PAM) CONFIGURE_ARGS+= --disable-pam .endif @@ -62,6 +58,7 @@ pre-install: post-install: ${CHOWN} root ${PREFIX}/libexec/gnome-screensaver-dialog ${CHMOD} +s ${PREFIX}/libexec/gnome-screensaver-dialog + ${MKDIR} ${PREFIX}/${SCREENSAVER_DIR} cd ${PREFIX}/${SCREENSAVER_DIR} && \ ${FIND} -s ${XSCREENSAVER_DIR} -maxdepth 1 -type f -name "*.xml" | \ ${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \ diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo index 12ac659ae359..ae7e9343ba0f 100644 --- a/x11/gnome-screensaver/distinfo +++ b/x11/gnome-screensaver/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-screensaver-2.16.3.tar.bz2) = cbd3e3b96b24038c7838b89acae318dd -SHA256 (gnome2/gnome-screensaver-2.16.3.tar.bz2) = c07bb2b7d9e32851fc119092ca604a7054ef88804f831daaf3122a02f38761c7 -SIZE (gnome2/gnome-screensaver-2.16.3.tar.bz2) = 2034974 +MD5 (gnome2/gnome-screensaver-2.18.0.tar.bz2) = c123d954b215d970dad117b15ca46cd7 +SHA256 (gnome2/gnome-screensaver-2.18.0.tar.bz2) = 7651a7c1205d2bc207ac6c317017b469efca9274b4ad4eb6ed739ea6293ce163 +SIZE (gnome2/gnome-screensaver-2.18.0.tar.bz2) = 2012668 diff --git a/x11/gnome-screensaver/files/patch-src_gs-auth-pam.c b/x11/gnome-screensaver/files/patch-src_gs-auth-pam.c deleted file mode 100644 index 94d68b8f3a57..000000000000 --- a/x11/gnome-screensaver/files/patch-src_gs-auth-pam.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 350da74d6592..a60b97fdcef7 100644 --- a/x11/gnome-screensaver/pkg-plist +++ b/x11/gnome-screensaver/pkg-plist @@ -9,211 +9,10 @@ libexec/gnome-screensaver/floaters libexec/gnome-screensaver/popsquares libexec/gnome-screensaver/slideshow share/gnome/applications/gnome-screensaver-preferences.desktop -share/gnome/applications/screensavers/anemone.desktop -share/gnome/applications/screensavers/anemotaxis.desktop -share/gnome/applications/screensavers/antinspect.desktop -share/gnome/applications/screensavers/antmaze.desktop -share/gnome/applications/screensavers/antspotlight.desktop -share/gnome/applications/screensavers/apollonian.desktop -share/gnome/applications/screensavers/apple2.desktop -share/gnome/applications/screensavers/atlantis.desktop -share/gnome/applications/screensavers/attraction.desktop -share/gnome/applications/screensavers/atunnel.desktop -share/gnome/applications/screensavers/barcode.desktop -share/gnome/applications/screensavers/blaster.desktop -share/gnome/applications/screensavers/blinkbox.desktop -share/gnome/applications/screensavers/blitspin.desktop -share/gnome/applications/screensavers/blocktube.desktop -share/gnome/applications/screensavers/boing.desktop -share/gnome/applications/screensavers/bouboule.desktop -share/gnome/applications/screensavers/bouncingcow.desktop -share/gnome/applications/screensavers/boxed.desktop -share/gnome/applications/screensavers/boxfit.desktop -share/gnome/applications/screensavers/braid.desktop -share/gnome/applications/screensavers/bsod.desktop -share/gnome/applications/screensavers/bubble3d.desktop -share/gnome/applications/screensavers/bubbles.desktop -share/gnome/applications/screensavers/bumps.desktop -share/gnome/applications/screensavers/cage.desktop -share/gnome/applications/screensavers/carousel.desktop -share/gnome/applications/screensavers/ccurve.desktop -share/gnome/applications/screensavers/celtic.desktop -share/gnome/applications/screensavers/circuit.desktop -share/gnome/applications/screensavers/cloudlife.desktop -share/gnome/applications/screensavers/compass.desktop -share/gnome/applications/screensavers/coral.desktop share/gnome/applications/screensavers/cosmos-slideshow.desktop -share/gnome/applications/screensavers/crackberg.desktop -share/gnome/applications/screensavers/critical.desktop -share/gnome/applications/screensavers/crystal.desktop -share/gnome/applications/screensavers/cube21.desktop -share/gnome/applications/screensavers/cubenetic.desktop -share/gnome/applications/screensavers/cubestorm.desktop -share/gnome/applications/screensavers/cynosure.desktop -share/gnome/applications/screensavers/dangerball.desktop -share/gnome/applications/screensavers/decayscreen.desktop -share/gnome/applications/screensavers/deco.desktop -share/gnome/applications/screensavers/deluxe.desktop -share/gnome/applications/screensavers/demon.desktop -share/gnome/applications/screensavers/discrete.desktop -share/gnome/applications/screensavers/distort.desktop -share/gnome/applications/screensavers/drift.desktop -share/gnome/applications/screensavers/endgame.desktop -share/gnome/applications/screensavers/engine.desktop -share/gnome/applications/screensavers/epicycle.desktop -share/gnome/applications/screensavers/eruption.desktop -share/gnome/applications/screensavers/euler2d.desktop -share/gnome/applications/screensavers/extrusion.desktop -share/gnome/applications/screensavers/fadeplot.desktop -share/gnome/applications/screensavers/fiberlamp.desktop -share/gnome/applications/screensavers/fireworkx.desktop -share/gnome/applications/screensavers/flag.desktop -share/gnome/applications/screensavers/flame.desktop -share/gnome/applications/screensavers/flipflop.desktop -share/gnome/applications/screensavers/flipscreen3d.desktop -share/gnome/applications/screensavers/fliptext.desktop -share/gnome/applications/screensavers/flow.desktop -share/gnome/applications/screensavers/fluidballs.desktop -share/gnome/applications/screensavers/flurry.desktop -share/gnome/applications/screensavers/flyingtoasters.desktop -share/gnome/applications/screensavers/fontglide.desktop share/gnome/applications/screensavers/footlogo-floaters.desktop -share/gnome/applications/screensavers/forest.desktop -share/gnome/applications/screensavers/fuzzyflakes.desktop -share/gnome/applications/screensavers/galaxy.desktop -share/gnome/applications/screensavers/gears.desktop -share/gnome/applications/screensavers/gflux.desktop -share/gnome/applications/screensavers/glblur.desktop -share/gnome/applications/screensavers/gleidescope.desktop -share/gnome/applications/screensavers/glforestfire.desktop -share/gnome/applications/screensavers/glhanoi.desktop -share/gnome/applications/screensavers/glknots.desktop -share/gnome/applications/screensavers/glmatrix.desktop -share/gnome/applications/screensavers/glplanet.desktop -share/gnome/applications/screensavers/glslideshow.desktop -share/gnome/applications/screensavers/glsnake.desktop -share/gnome/applications/screensavers/gltext.desktop -share/gnome/applications/screensavers/goop.desktop -share/gnome/applications/screensavers/grav.desktop -share/gnome/applications/screensavers/greynetic.desktop -share/gnome/applications/screensavers/halftone.desktop -share/gnome/applications/screensavers/halo.desktop -share/gnome/applications/screensavers/helix.desktop -share/gnome/applications/screensavers/hopalong.desktop -share/gnome/applications/screensavers/hyperball.desktop -share/gnome/applications/screensavers/hypercube.desktop -share/gnome/applications/screensavers/hypertorus.desktop -share/gnome/applications/screensavers/ifs.desktop -share/gnome/applications/screensavers/imsmap.desktop -share/gnome/applications/screensavers/interaggregate.desktop -share/gnome/applications/screensavers/interference.desktop -share/gnome/applications/screensavers/intermomentary.desktop -share/gnome/applications/screensavers/jigglypuff.desktop -share/gnome/applications/screensavers/jigsaw.desktop -share/gnome/applications/screensavers/juggle.desktop -share/gnome/applications/screensavers/juggler3d.desktop -share/gnome/applications/screensavers/julia.desktop -share/gnome/applications/screensavers/kaleidescope.desktop -share/gnome/applications/screensavers/klein.desktop -share/gnome/applications/screensavers/kumppa.desktop -share/gnome/applications/screensavers/lament.desktop -share/gnome/applications/screensavers/laser.desktop -share/gnome/applications/screensavers/lavalite.desktop -share/gnome/applications/screensavers/lightning.desktop -share/gnome/applications/screensavers/lisa.desktop -share/gnome/applications/screensavers/lissie.desktop -share/gnome/applications/screensavers/lmorph.desktop -share/gnome/applications/screensavers/loop.desktop -share/gnome/applications/screensavers/maze.desktop -share/gnome/applications/screensavers/memscroller.desktop -share/gnome/applications/screensavers/menger.desktop -share/gnome/applications/screensavers/metaballs.desktop -share/gnome/applications/screensavers/mirrorblob.desktop -share/gnome/applications/screensavers/mismunch.desktop -share/gnome/applications/screensavers/moebius.desktop -share/gnome/applications/screensavers/moire.desktop -share/gnome/applications/screensavers/moire2.desktop -share/gnome/applications/screensavers/molecule.desktop -share/gnome/applications/screensavers/morph3d.desktop -share/gnome/applications/screensavers/mountain.desktop -share/gnome/applications/screensavers/munch.desktop -share/gnome/applications/screensavers/nerverot.desktop -share/gnome/applications/screensavers/noof.desktop -share/gnome/applications/screensavers/noseguy.desktop -share/gnome/applications/screensavers/pacman.desktop -share/gnome/applications/screensavers/pedal.desktop -share/gnome/applications/screensavers/penetrate.desktop -share/gnome/applications/screensavers/penrose.desktop share/gnome/applications/screensavers/personal-slideshow.desktop -share/gnome/applications/screensavers/petri.desktop -share/gnome/applications/screensavers/phosphor.desktop -share/gnome/applications/screensavers/piecewise.desktop -share/gnome/applications/screensavers/pinion.desktop -share/gnome/applications/screensavers/pipes.desktop -share/gnome/applications/screensavers/polyhedra.desktop -share/gnome/applications/screensavers/polyominoes.desktop -share/gnome/applications/screensavers/polytopes.desktop -share/gnome/applications/screensavers/pong.desktop share/gnome/applications/screensavers/popsquares.desktop -share/gnome/applications/screensavers/providence.desktop -share/gnome/applications/screensavers/pulsar.desktop -share/gnome/applications/screensavers/pyro.desktop -share/gnome/applications/screensavers/qix.desktop -share/gnome/applications/screensavers/queens.desktop -share/gnome/applications/screensavers/rd-bomb.desktop -share/gnome/applications/screensavers/ripples.desktop -share/gnome/applications/screensavers/rocks.desktop -share/gnome/applications/screensavers/rorschach.desktop -share/gnome/applications/screensavers/rotor.desktop -share/gnome/applications/screensavers/rotzoomer.desktop -share/gnome/applications/screensavers/rubik.desktop -share/gnome/applications/screensavers/sballs.desktop -share/gnome/applications/screensavers/shadebobs.desktop -share/gnome/applications/screensavers/sierpinski.desktop -share/gnome/applications/screensavers/sierpinski3d.desktop -share/gnome/applications/screensavers/slidescreen.desktop -share/gnome/applications/screensavers/slip.desktop -share/gnome/applications/screensavers/sonar.desktop -share/gnome/applications/screensavers/speedmine.desktop -share/gnome/applications/screensavers/sphere.desktop -share/gnome/applications/screensavers/spheremonics.desktop -share/gnome/applications/screensavers/spiral.desktop -share/gnome/applications/screensavers/spotlight.desktop -share/gnome/applications/screensavers/sproingies.desktop -share/gnome/applications/screensavers/squiral.desktop -share/gnome/applications/screensavers/stairs.desktop -share/gnome/applications/screensavers/starfish.desktop -share/gnome/applications/screensavers/starwars.desktop -share/gnome/applications/screensavers/stonerview.desktop -share/gnome/applications/screensavers/strange.desktop -share/gnome/applications/screensavers/substrate.desktop -share/gnome/applications/screensavers/superquadrics.desktop -share/gnome/applications/screensavers/swirl.desktop -share/gnome/applications/screensavers/t3d.desktop -share/gnome/applications/screensavers/tangram.desktop -share/gnome/applications/screensavers/thornbird.desktop -share/gnome/applications/screensavers/timetunnel.desktop -share/gnome/applications/screensavers/triangle.desktop -share/gnome/applications/screensavers/truchet.desktop -share/gnome/applications/screensavers/twang.desktop -share/gnome/applications/screensavers/vermiculate.desktop -share/gnome/applications/screensavers/vidwhacker.desktop -share/gnome/applications/screensavers/vines.desktop -share/gnome/applications/screensavers/wander.desktop -share/gnome/applications/screensavers/webcollage.desktop -share/gnome/applications/screensavers/whirlwindwarp.desktop -share/gnome/applications/screensavers/whirlygig.desktop -share/gnome/applications/screensavers/worm.desktop -share/gnome/applications/screensavers/wormhole.desktop -share/gnome/applications/screensavers/xanalogtv.desktop -share/gnome/applications/screensavers/xflame.desktop -share/gnome/applications/screensavers/xjack.desktop -share/gnome/applications/screensavers/xlyap.desktop -share/gnome/applications/screensavers/xmatrix.desktop -share/gnome/applications/screensavers/xrayswarm.desktop -share/gnome/applications/screensavers/xspirograph.desktop -share/gnome/applications/screensavers/xteevee.desktop -share/gnome/applications/screensavers/zoom.desktop share/gnome/desktop-directories/gnome-screensaver.directory share/gnome/gnome-screensaver/gnome-screensaver-preferences.glade share/gnome/gnome-screensaver/lock-dialog-default.glade diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 0aecfac1bbd4..de1faae3983e 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -3,17 +3,16 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-session/Makefile,v 1.96 2006/10/07 19:45:39 marcus Exp $ +# $MCom: ports/x11/gnome-session/Makefile,v 1.110 2007/03/18 20:55:55 marcus Exp $ # PORTNAME= gnome-session -PORTVERSION= 2.16.3 +PORTVERSION= 2.18.0 +PORTREVISION= 3 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ - ${MASTER_SITE_LOCAL:S/$/:local/} \ - http://people.FreeBSD.org/~adamw/images/gnome_splashes/2.12/:local -MASTER_SITE_SUBDIR= sources/gnome-session/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \ - adamw/:local + http://www.marcuscom.com/downloads/:local +MASTER_SITE_SUBDIR= sources/gnome-session/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${SPLASHES}:local DIST_SUBDIR= gnome2 @@ -27,6 +26,7 @@ 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 +INSTALLS_ICONS= yes USE_GETTEXT= yes USE_BZIP2= yes USE_XLIB= yes @@ -34,6 +34,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --mandir=${PREFIX}/man CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" @@ -42,18 +43,18 @@ MAN1= gnome-session.1 gnome-wm.1 session-properties.1 \ MAN5= default.session.5 GCONF_SCHEMAS= gnome-session.schemas -SPLASHES= freebsd-splashes-gnome-2.12.1.tar +SPLASHES= freebsd-splashes-gnome-2.18_1.tar post-extract: cd ${WRKDIR} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES} post-install: - ${INSTALL_DATA} ${WRKSRC}/gnome-session/gnome-splash.png \ + ${INSTALL_DATA} ${WRKSRC}/data/gnome-splash.png \ ${PREFIX}/share/gnome/pixmaps/splash/original-gnome-splash.png # ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \ # ${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png -.for splash in MaMBaNgGaoX-2.12.png adamw-piggy-2.12.png adamw-trophy-2.12.png andreas-slogan-2.12.png andreas-splash-2.12.png domix-splash-2.12.png domix-splash2-2.12.png mumija-2.12.png mumija2-2.12.png mumija3-2.12.png tremulant-2.12.png tremulant-blood-2.12.png tremulant-brushed-metal-2.12.png - ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/${splash} \ +.for splash in MaMBaNgGaoX-2.12.png adamw-piggy-2.12.png adamw-trophy-2.12.png andreas-slogan-2.12.png andreas-splash-2.12.png domix-splash-2.12.png domix-splash2-2.12.png mumija-2.12.png mumija2-2.12.png mumija3-2.12.png tremulant-2.12.png tremulant-blood-2.12.png tremulant-brushed-metal-2.12.png franz-splash_218.png adamw-bat-2.18.jpg adamw-conky-2.18.png adamw-cow-2.18.png adamw-mouth-2.18.png adamw-swing-2.18.png + ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.18/${splash} \ ${PREFIX}/share/gnome/pixmaps/splash .endfor diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index b6f8d04ceab4..b4bcd8ea2c2a 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,6 +1,6 @@ -MD5 (gnome2/gnome-session-2.16.3.tar.bz2) = d35a7f541adecc112b7c73f95353a183 -SHA256 (gnome2/gnome-session-2.16.3.tar.bz2) = 00135b65275f17343bcfc25f37249d3f6449a3c9243f60b4cd4e3d6b4505b142 -SIZE (gnome2/gnome-session-2.16.3.tar.bz2) = 683140 -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 +MD5 (gnome2/gnome-session-2.18.0.tar.bz2) = 830dbabe74474da49018889d27eefaae +SHA256 (gnome2/gnome-session-2.18.0.tar.bz2) = 4a1ce73fedcfae94673eeef2655937ff6c9ebc2f52ba817466659d2b583df330 +SIZE (gnome2/gnome-session-2.18.0.tar.bz2) = 707392 +MD5 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 80eb8c52fcf9fe977e0bf8ed48b85fe5 +SHA256 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = fcca0f6eb759a4ef0211ecd61340f84ce8ad4d7493f725ac8613724faadbb508 +SIZE (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 1630720 diff --git a/x11/gnome-session/files/patch-data_Makefile.in b/x11/gnome-session/files/patch-data_Makefile.in new file mode 100644 index 000000000000..17d12d395c3b --- /dev/null +++ b/x11/gnome-session/files/patch-data_Makefile.in @@ -0,0 +1,20 @@ +--- data/Makefile.in.orig Sun Jan 28 20:39:50 2007 ++++ data/Makefile.in Sun Jan 28 20:41:03 2007 +@@ -253,7 +253,7 @@ sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + SUBDIRS = icons +-defaultdir = $(datadir)/gnome ++defaultdir = $(datadir) + default_in_files = default.session.in + default_DATA = $(default_in_files:.session.in=.session) + settingsdir = $(datadir)/applications +@@ -271,7 +271,7 @@ EXTRA_DIST = \ + session-properties.desktop.in + + CLEANFILES = default.session gnome-session.schemas session-properties.desktop +-all: all-recursive ++all: all-recursive default.session + + .SUFFIXES: + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) diff --git a/x11/gnome-session/files/patch-dbus b/x11/gnome-session/files/patch-dbus deleted file mode 100644 index e7982166670a..000000000000 --- a/x11/gnome-session/files/patch-dbus +++ /dev/null @@ -1,429 +0,0 @@ ---- gnome-session/gsm-dbus.h.orig Sun Apr 23 23:01:47 2006 -+++ gnome-session/gsm-dbus.h Sun Apr 23 23:00:53 2006 -@@ -0,0 +1,27 @@ -+/* gsm-dbus.h - Handle the dbus-daemon process. -+ * -+ * Copyright (c) 2006 Julio M. Merino Vidal <jmmv@NetBSD.org> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+ * 02111-1307, USA. -+ */ -+ -+#ifndef GSM_DBUS_H -+#define GSM_DBUS_H -+ -+gboolean gsm_dbus_daemon_start (void); -+void gsm_dbus_daemon_stop (void); -+ -+#endif /* GSM_DBUS_H */ ---- gnome-session/gsm-dbus.c.orig Sun Apr 23 23:09:40 2006 -+++ gnome-session/gsm-dbus.c Sun Apr 23 23:10:21 2006 -@@ -0,0 +1,360 @@ -+/* gsm-dbus.c - Handle the dbus-daemon process. -+ * -+ * Copyright (c) 2006 Julio M. Merino Vidal <jmmv@NetBSD.org> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+ * 02111-1307, USA. -+ */ -+ -+#if HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include <sys/wait.h> -+ -+#include <errno.h> -+#include <fcntl.h> -+#include <limits.h> -+#include <signal.h> -+#include <stdlib.h> -+#include <unistd.h> -+ -+#include <glib.h> -+#include <glib/gprintf.h> -+ -+#include "gsm-dbus.h" -+ -+static pid_t dbus_daemon_pid = 0; -+ -+static gboolean have_dbus_daemon (void); -+static gboolean have_running_instance (void); -+static int read_line (int, char *, ssize_t); -+static void start_child (int, int); -+static void start_parent (int, int, pid_t); -+ -+/* --------------------------------------------------------------------- -+ * PUBLIC INTERFACE -+ * --------------------------------------------------------------------- */ -+ -+/* -+ * Starts the dbus-daemon if not already running and attaches it to the -+ * current environment by defining DBUS_SESSION_BUS_ADDRESS. Returns -+ * true if we launch a new dbus-daemon so that we know if we have to call -+ * gsm_dbus_daemon_stop later on or not. -+ * -+ * This function can only be called if dbus-daemon is not already running -+ * (i.e., if gnome-session is starting up or if gsm_dbus_daemon_stop was -+ * previously called). -+ */ -+gboolean -+gsm_dbus_daemon_start (void) -+{ -+ int address_pipe[2]; -+ int pid_pipe[2]; -+ pid_t tmp_pid; -+ -+ g_assert (dbus_daemon_pid == 0); -+ -+ if (have_running_instance ()) -+ return FALSE; -+ if (! have_dbus_daemon ()) -+ return FALSE; -+ -+ /* -+ * At this point, dbus-daemon is not running for the current session -+ * and the binary exists. Spawn it. -+ */ -+ -+ if (pipe (address_pipe) == -1) -+ { -+ g_printerr ("Cannot create address pipe for dbus-daemon\n"); -+ return FALSE; -+ } -+ -+ if (pipe (pid_pipe) == -1) -+ { -+ close (address_pipe[0]); -+ close (address_pipe[1]); -+ g_printerr ("Cannot create pid pipe for dbus-daemon\n"); -+ return FALSE; -+ } -+ -+ tmp_pid = fork (); -+ if (tmp_pid == -1) -+ { -+ close (address_pipe[0]); -+ close (address_pipe[1]); -+ close (pid_pipe[0]); -+ close (pid_pipe[1]); -+ g_printerr ("Cannot create child process for dbus-daemon\n"); -+ return FALSE; -+ } -+ else if (tmp_pid == 0) -+ { -+ close (address_pipe[0]); -+ close (pid_pipe[0]); -+ start_child (address_pipe[1], pid_pipe[1]); -+ /* NOTREACHED */ -+ } -+ else -+ { -+ close (address_pipe[1]); -+ close (pid_pipe[1]); -+ start_parent (address_pipe[0], pid_pipe[0], tmp_pid); -+ } -+ -+ g_assert (dbus_daemon_pid != 0); -+ return TRUE; -+} -+ -+/* -+ * Stops the running dbus-daemon. Can only be called if we own the process; -+ * i.e., if gsm_dbus_daemon_start returned true. -+ */ -+void -+gsm_dbus_daemon_stop (void) -+{ -+ g_assert (dbus_daemon_pid != 0); -+ -+ if (kill (dbus_daemon_pid, SIGTERM) == -1) -+ g_printerr ("Failed to kill dbus-daemon (pid %d)\n", -+ dbus_daemon_pid); -+ else -+ { -+ dbus_daemon_pid = 0; -+ g_unsetenv ("DBUS_SESSION_BUS_ADDRESS"); -+ } -+} -+ -+/* --------------------------------------------------------------------- -+ * PRIVATE FUNCTIONS -+ * --------------------------------------------------------------------- */ -+ -+/* -+ * Check whether the dbus-daemon binary is in the path and raise an -+ * appropriate error message if it is not. -+ */ -+static gboolean -+have_dbus_daemon (void) -+{ -+ gboolean result; -+ gchar *file_name; -+ -+ file_name = g_find_program_in_path ("dbus-daemon"); -+ if (file_name == NULL) -+ g_printerr ("Cannot locate dbus-daemon\n"); -+ result = file_name != NULL; -+ g_free (file_name); -+ -+ return result; -+} -+ -+/* -+ * Check whether there is a dbus-daemon session instance currently running -+ * (not spawned by us). If there is, do nothing and return TRUE. -+ */ -+static gboolean -+have_running_instance (void) -+{ -+ const gchar *address_str; -+ -+ g_assert (dbus_daemon_pid == 0); -+ -+ address_str = g_getenv ("DBUS_SESSION_BUS_ADDRESS"); -+ return address_str != NULL; -+} -+ -+/* -+ * Reads a single line from the given file descriptor and stores it in the -+ * buffer pointed to by 'buf'. -+ * -+ * After finding the first new line character, the function returns. This -+ * is to avoid reading dbus' pid multiple times from its file descriptor. -+ */ -+static int -+read_line (int fd, char *buf, ssize_t bufsize) -+{ -+ gboolean discard, done; -+ ssize_t bytes; -+ -+ bytes = 0; -+ discard = FALSE; -+ done = FALSE; -+ do -+ { -+ ssize_t i, result; -+ -+ result = read (fd, &buf[bytes], bufsize - bytes); -+ if (result < 0) -+ return -1; -+ else if (result > 0 && !discard) -+ { -+ if (bytes + result < bufsize) -+ bytes += result; -+ else -+ bytes = bufsize - 1; -+ } -+ else -+ done = TRUE; -+ -+ for (i = 0; !discard && i < bytes; i++) -+ if (buf[i] == '\n') -+ { -+ buf[i] = '\0'; -+ discard = TRUE; -+ } -+ } -+ while (!done); -+ -+ g_assert (bytes >= 0 && bytes < bufsize); -+ buf[bytes] = '\0'; -+ -+ return bytes; -+} -+ -+/* -+ * Code run by the child process after the fork to launch dbus-demon. -+ * -+ * As the child, this execs dbus-daemon, connecting it to the appropriate -+ * file descriptors. -+ */ -+static void -+start_child (int address_fd, int pid_fd) -+{ -+ gchar address_str[16]; -+ gchar pid_str[16]; -+ int fd; -+ long open_max; -+ -+ open_max = sysconf (_SC_OPEN_MAX); -+ for (fd = 0; fd < open_max; fd++) -+ { -+ if (fd != STDIN_FILENO && fd != STDOUT_FILENO && fd != STDERR_FILENO && -+ fd != address_fd && fd != pid_fd) -+ fcntl (fd, F_SETFD, FD_CLOEXEC); -+ } -+ -+ g_snprintf (address_str, sizeof (address_str), "%d", address_fd); -+ g_snprintf (pid_str, sizeof (pid_str), "%d", pid_fd); -+ -+ execlp ("dbus-daemon", -+ "dbus-daemon", -+ "--fork", -+ "--print-address", address_str, -+ "--print-pid", pid_str, -+ "--session", -+ NULL); -+ -+ g_printerr ("Could not launch dbus-daemon\n"); -+ -+ exit (EXIT_FAILURE); -+} -+ -+/* -+ * Code run by the parent process after the fork to launch dbus-demon. -+ * -+ * As the parent, this waits until dbus-daemon forks itself again and -+ * fetches its address and pid to later take its ownership. -+ */ -+static void -+start_parent (int address_fd, int pid_fd, pid_t child) -+{ -+ char address_str[256]; -+ char pid_str[256]; -+ char *tmp_ep; -+ int exitstat; -+ unsigned long tmp_num; -+ ssize_t bytes; -+ -+ g_assert (child > 0); -+ -+ /* -+ * dbus-daemon --fork causes our child process to exit prematurely -+ * because it is not the real daemon. See if it worked correctly -+ * and clean it up to avoid a zombie. -+ * -+ * Life could be much easier if dbus-daemon had a --no-fork flag. -+ * But, as it hasn't it, we cannot assume that it will not fork, -+ * because we have no control over its configuration file. -+ */ -+ if (waitpid (child, &exitstat, 0) == -1) -+ { -+ close (address_fd); -+ close (pid_fd); -+ -+ g_printerr ("Failed to get dbus-daemon status\n"); -+ return; -+ } -+ if (!WIFEXITED (exitstat) || WEXITSTATUS (exitstat) != EXIT_SUCCESS) -+ { -+ close (address_fd); -+ close (pid_fd); -+ -+ g_printerr ("dbus-daemon exited unexpectedly\n"); -+ return; -+ } -+ -+ /* -+ * Fetch dbus-daemon address. -+ */ -+ bytes = read_line (address_fd, address_str, sizeof (address_str)); -+ if (bytes == -1 || bytes == 0) -+ { -+ close (address_fd); -+ close (pid_fd); -+ -+ g_printerr ("Failed to get dbus-daemon's address\n"); -+ return; -+ } -+ -+ /* -+ * Fetch dbus-daemon pid. -+ */ -+ bytes = read_line (pid_fd, pid_str, sizeof (pid_str)); -+ if (bytes == -1 || bytes == 0) -+ { -+ close (address_fd); -+ close (pid_fd); -+ -+ g_printerr ("Failed to get dbus-daemon's pid\n"); -+ return; -+ } -+ -+ close (address_fd); -+ close (pid_fd); -+ -+ /* -+ * Convert the string printed in pid_fd to a pid value. Do the usual -+ * strtoul dance to check for a valid number. -+ */ -+ errno = 0; -+ tmp_num = strtoul(pid_str, &tmp_ep, 10); -+ if (pid_str[0] == '\0' || *tmp_ep != '\0') -+ { -+ g_printerr ("dbus-daemon pid invalid (not a number)\n"); -+ return; -+ } -+ if (errno == ERANGE && tmp_num == ULONG_MAX) -+ { -+ g_printerr ("dbus-daemon pid invalid (out of range)\n"); -+ return; -+ } -+ dbus_daemon_pid = tmp_num; -+ -+ /* -+ * All right! Tell our future children about the new born dbus-daemon. -+ */ -+ g_setenv ("DBUS_SESSION_BUS_ADDRESS", address_str, TRUE); -+} ---- 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_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in index a80f576a42a3..b07ad029e3dd 100644 --- a/x11/gnome-session/files/patch-gnome-session_Makefile.in +++ b/x11/gnome-session/files/patch-gnome-session_Makefile.in @@ -1,14 +1,5 @@ --- gnome-session/Makefile.in.orig Sun Apr 23 23:01:30 2006 +++ gnome-session/Makefile.in Sun Apr 23 23:06:41 2006 -@@ -67,7 +67,7 @@ am_gnome_session_OBJECTS = manager.$(OBJ - remote.$(OBJEXT) logout.$(OBJEXT) splash-widget.$(OBJEXT) \ - gsm-xrandr.$(OBJEXT) gsm-keyring.$(OBJEXT) gsm-gsd.$(OBJEXT) \ - gsm-protocol.$(OBJEXT) gsm-remote-desktop.$(OBJEXT) \ -- gsm-sound.$(OBJEXT) gsm-at-startup.$(OBJEXT) \ -+ gsm-sound.$(OBJEXT) gsm-at-startup.$(OBJEXT) gsm-dbus.$(OBJEXT) \ - gsm-multiscreen.$(OBJEXT) gsm-typebuiltins.$(OBJEXT) \ - gdm-logout-action.$(OBJEXT) util.$(OBJEXT) $(am__objects_1) - gnome_session_OBJECTS = $(am_gnome_session_OBJECTS) @@ -310,7 +310,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ @@ -18,20 +9,3 @@ INCLUDES = \ $(GNOME_SESSION_CFLAGS) \ $(STANDARD_PROPERTIES_CFLAGS) \ -@@ -386,6 +386,8 @@ gnome_session_SOURCES = \ - splash-widget.h \ - gsm-xrandr.c \ - gsm-xrandr.h \ -+ gsm-dbus.c \ -+ gsm-dbus.h \ - gsm-keyring.c \ - gsm-keyring.h \ - gsm-gsd.c \ -@@ -610,6 +612,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-sound.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-typebuiltins.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-xrandr.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-dbus.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ice.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logout-test.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logout.Po@am__quote@ diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-dbus.c b/x11/gnome-session/files/patch-gnome-session_gsm-dbus.c new file mode 100644 index 000000000000..76de78b45ffe --- /dev/null +++ b/x11/gnome-session/files/patch-gnome-session_gsm-dbus.c @@ -0,0 +1,35 @@ +--- gnome-session/gsm-dbus.c.orig Mon Jan 8 17:32:28 2007 ++++ gnome-session/gsm-dbus.c Thu Jan 11 13:17:41 2007 +@@ -281,6 +281,7 @@ start_parent (int address_fd, int pid_fd + int exitstat; + unsigned long tmp_num; + ssize_t bytes; ++ int i; + + g_assert (child > 0); + +@@ -326,14 +327,17 @@ start_parent (int address_fd, int pid_fd + /* + * Fetch dbus-daemon pid. + */ +- bytes = read_line (pid_fd, pid_str, sizeof (pid_str)); +- if (bytes == -1 || bytes == 0) ++ for (i = 0; i < 2; i++) + { +- close (address_fd); +- close (pid_fd); +- +- g_printerr ("Failed to get dbus-daemon's pid\n"); +- return; ++ bytes = read_line (pid_fd, pid_str, sizeof (pid_str)); ++ if (bytes == -1 || bytes == 0) ++ { ++ close (address_fd); ++ close (pid_fd); ++ ++ g_printerr ("Failed to get dbus-daemon's pid\n"); ++ return; ++ } + } + + close (address_fd); diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist index 71e9b3048ab3..14d40f3c9f84 100644 --- a/x11/gnome-session/pkg-plist +++ b/x11/gnome-session/pkg-plist @@ -5,7 +5,6 @@ bin/gnome-session-save bin/gnome-wm share/gnome/applications/session-properties.desktop share/gnome/default.session -share/gnome/default.wm share/gnome/pixmaps/splash/MaMBaNgGaoX-2.12.png share/gnome/pixmaps/splash/adamw-piggy-2.12.png share/gnome/pixmaps/splash/adamw-trophy-2.12.png @@ -13,6 +12,7 @@ share/gnome/pixmaps/splash/andreas-slogan-2.12.png share/gnome/pixmaps/splash/andreas-splash-2.12.png share/gnome/pixmaps/splash/domix-splash-2.12.png share/gnome/pixmaps/splash/domix-splash2-2.12.png +share/gnome/pixmaps/splash/franz-splash_218.png share/gnome/pixmaps/splash/gnome-splash.png share/gnome/pixmaps/splash/mumija-2.12.png share/gnome/pixmaps/splash/mumija2-2.12.png @@ -21,6 +21,11 @@ share/gnome/pixmaps/splash/original-gnome-splash.png share/gnome/pixmaps/splash/tremulant-2.12.png share/gnome/pixmaps/splash/tremulant-blood-2.12.png share/gnome/pixmaps/splash/tremulant-brushed-metal-2.12.png +share/icons/hicolor/16x16/apps/session-properties.png +share/icons/hicolor/22x22/apps/session-properties.png +share/icons/hicolor/24x24/apps/session-properties.png +share/icons/hicolor/32x32/apps/session-properties.png +share/icons/hicolor/scalable/apps/session-properties.svg share/locale/af/LC_MESSAGES/gnome-session-2.0.mo share/locale/am/LC_MESSAGES/gnome-session-2.0.mo share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index 4d4ef119304a..d2ffb54683ca 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-terminal/Makefile,v 1.81 2006/10/03 10:31:27 ahze Exp $ +# $MCom: ports/x11/gnome-terminal/Makefile,v 1.86 2007/03/13 00:46:19 mezz Exp $ # PORTNAME= gnome-terminal -PORTVERSION= 2.16.1 -PORTREVISION= 1 +PORTVERSION= 2.18.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo index 8338f725a82c..e260d03784fd 100644 --- a/x11/gnome-terminal/distinfo +++ b/x11/gnome-terminal/distinfo @@ -1,3 +1,3 @@ -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 +MD5 (gnome2/gnome-terminal-2.18.0.tar.bz2) = 15ba4f3a9851d63d8c06b8f67210dde9 +SHA256 (gnome2/gnome-terminal-2.18.0.tar.bz2) = 75414d332003d19b003a47c0e93f3983a5586f1bb28dceec350cdcd7d3450834 +SIZE (gnome2/gnome-terminal-2.18.0.tar.bz2) = 1906547 diff --git a/x11/gnome-terminal/files/patch-src_terminal-window.c b/x11/gnome-terminal/files/patch-src_terminal-window.c deleted file mode 100644 index 8052c81135b5..000000000000 --- a/x11/gnome-terminal/files/patch-src_terminal-window.c +++ /dev/null @@ -1,276 +0,0 @@ ---- src/terminal-window.c.orig Fri Sep 1 01:34:03 2006 -+++ src/terminal-window.c Wed Oct 18 15:32:15 2006 -@@ -157,6 +157,9 @@ - const char *dir); - static void new_window_callback (GtkWidget *menuitem, - TerminalWindow *window); -+static void size_request_callback (GtkWidget *widget, -+ GtkRequisition *requisition, -+ TerminalWindow *window); - static void new_tab_callback (GtkWidget *menuitem, - TerminalWindow *window); - static gboolean key_press_callback (GtkWidget *widget, -@@ -237,6 +240,8 @@ - - static void terminal_window_show (GtkWidget *widget); - -+static void update_geometry (TerminalWindow *window); -+ - static gboolean confirm_close_window (TerminalWindow *window); - - static gpointer parent_class; -@@ -871,7 +876,12 @@ - gtk_box_pack_end (GTK_BOX (window->priv->main_vbox), - window->priv->notebook, - TRUE, TRUE, 0); -- -+ -+ g_signal_connect (G_OBJECT (window->priv->main_vbox), -+ "size_request", -+ G_CALLBACK (size_request_callback), -+ window); -+ - mi = append_menuitem (window->priv->menubar, - "", NULL, - NULL, NULL); -@@ -1506,14 +1516,6 @@ - gtk_widget_hide (window->priv->menubar); - } - reset_menubar_labels (window); -- -- if (window->priv->active_term) -- { --#ifdef DEBUG_GEOMETRY -- g_fprintf (stderr,"setting size after toggling menubar visibility\n"); --#endif -- terminal_window_set_size (window, window->priv->active_term, TRUE); -- } - } - - gboolean -@@ -1531,98 +1533,21 @@ - } - - void --terminal_window_set_size (TerminalWindow *window, -- TerminalScreen *screen, -- gboolean even_if_mapped) --{ -- terminal_window_set_size_force_grid (window, screen, even_if_mapped, -1, -1); --} -- --void --terminal_window_set_size_force_grid (TerminalWindow *window, -- TerminalScreen *screen, -- gboolean even_if_mapped, -- int force_grid_width, -- int force_grid_height) --{ -- /* Owen's hack from gnome-terminal */ -- GtkWidget *widget; -- GtkWidget *app; -- GtkRequisition toplevel_request; -- GtkRequisition widget_request; -- int w, h; -- int char_width; -- int char_height; -- int grid_width; -- int grid_height; -- int xpad; -- int ypad; -- -- /* be sure our geometry is up-to-date */ -- terminal_window_update_geometry (window); -- widget = terminal_screen_get_widget (screen); -- -- app = gtk_widget_get_toplevel (widget); -- g_assert (app != NULL); -- -- gtk_widget_size_request (app, &toplevel_request); -- gtk_widget_size_request (widget, &widget_request); -- --#ifdef DEBUG_GEOMETRY -- g_fprintf (stderr,"set size: toplevel %dx%d widget %dx%d\n", -- toplevel_request.width, toplevel_request.height, -- widget_request.width, widget_request.height); --#endif -- -- w = toplevel_request.width - widget_request.width; -- h = toplevel_request.height - widget_request.height; -- -- terminal_widget_get_cell_size (widget, &char_width, &char_height); -- terminal_widget_get_size (widget, &grid_width, &grid_height); -- -- if (force_grid_width >= 0) -- grid_width = force_grid_width; -- if (force_grid_height >= 0) -- grid_height = force_grid_height; -- -- terminal_widget_get_padding (widget, &xpad, &ypad); -- -- w += xpad + char_width * grid_width; -- h += ypad + char_height * grid_height; -- --#ifdef DEBUG_GEOMETRY -- g_fprintf (stderr,"set size: grid %dx%d force %dx%d setting %dx%d pixels\n", -- grid_width, grid_height, force_grid_width, force_grid_height, w, h); --#endif -- -- if (even_if_mapped && GTK_WIDGET_MAPPED (app)) { -- gtk_window_resize (GTK_WINDOW (app), w, h); -- } -- else { -- gtk_window_set_default_size (GTK_WINDOW (app), w, h); -- } --} -- --void - terminal_window_set_active (TerminalWindow *window, - TerminalScreen *screen) - { -- GtkWidget *widget; - TerminalProfile *profile; -+ GtkWidget *old_widget, *new_widget; - - if (window->priv->active_term == screen) - return; - -- widget = terminal_screen_get_widget (screen); -- - profile = terminal_screen_get_profile (screen); - -- if (!GTK_WIDGET_REALIZED (widget)) -- gtk_widget_realize (widget); /* we need this for the char width */ -- -+ old_widget = terminal_screen_get_widget (window->priv->active_term); - window->priv->active_term = screen; -+ new_widget = terminal_screen_get_widget (window->priv->active_term); - -- terminal_window_update_geometry (window); - terminal_window_update_icon (window); - - /* Override menubar setting if it wasn't restored from session */ -@@ -1641,11 +1566,13 @@ - gtk_notebook_page_num (GTK_NOTEBOOK (window->priv->notebook), - GTK_WIDGET (screen))); - -- /* set size of window to current grid size */ --#ifdef DEBUG_GEOMETRY -- g_fprintf (stderr,"setting size after flipping notebook pages\n"); --#endif -- terminal_window_set_size (window, screen, TRUE); -+ /* Make sure that the widget is no longer hidden due to the workaround */ -+ gtk_widget_show (new_widget); -+ /* Workaround to remove gtknotebook's feature of computing its size based on -+ * all pages. When the widget is hidden, its size will not be taken into -+ * account. -+ */ -+ if (old_widget != NULL) gtk_widget_hide (old_widget); - - update_copy_sensitivity (window); - -@@ -1704,18 +1631,12 @@ - GtkWidget* page_widget; - TerminalScreen *screen; - GtkWidget *menu_item; -- int old_grid_width, old_grid_height; -- GtkWidget *old_widget; -- -- old_widget = NULL; -- old_grid_width = -1; -- old_grid_height = -1; -+ GtkWidget *old_widget, *new_widget; - - if (window->priv->active_term == NULL) - return; - - old_widget = terminal_screen_get_widget (window->priv->active_term); -- terminal_widget_get_size (old_widget, &old_grid_width, &old_grid_height); - - page_widget = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), - page_num); -@@ -1725,17 +1646,19 @@ - screen = TERMINAL_SCREEN (page_widget); - - g_assert (screen); -- -+ - terminal_window_set_active (window, screen); -- -- /* This is so we maintain the same grid moving among tabs with -- * different fonts. -- */ --#ifdef DEBUG_GEOMETRY -- g_fprintf (stderr,"setting size in switch_page handler\n"); --#endif -- terminal_window_set_size_force_grid (window, screen, TRUE, old_grid_width, old_grid_height); - -+ new_widget = terminal_screen_get_widget (screen); -+ -+ if (old_widget != new_widget) { -+ int old_grid_width, old_grid_height; -+ /* This is so that we maintain the same grid */ -+ terminal_widget_get_size (old_widget, &old_grid_width, &old_grid_height); -+ terminal_widget_set_size (new_widget, old_grid_width, old_grid_height); -+ gtk_widget_queue_resize_no_redraw (new_widget); -+ } -+ - update_tab_sensitivity (window); - - menu_item = screen_get_menuitem (screen); -@@ -1836,7 +1759,6 @@ - TerminalScreen *screen, - TerminalWindow *window) - { -- gboolean single; - /* Called from terminal_notebook_move_tab() */ - if (find_screen (window, screen) != NULL) { - g_assert (terminal_screen_get_window (screen) == window); -@@ -1868,11 +1790,6 @@ - reset_tab_menuitems (window); - update_tab_sensitivity (window); - -- /* The tab bar may have disappeared */ -- single = g_list_length (window->priv->terms) == 1; -- if (single) -- terminal_window_set_size (window, window->priv->active_term, TRUE); -- - /* Close window if no more terminals */ - if (window->priv->terms == NULL) - gtk_widget_destroy (GTK_WIDGET (window)); -@@ -1921,7 +1838,7 @@ - } - - void --terminal_window_update_geometry (TerminalWindow *window) -+update_geometry (TerminalWindow *window) - { - GdkGeometry hints; - GtkWidget *widget; -@@ -2264,6 +2181,26 @@ - NULL, name, -1); - - g_free (geometry); -+} -+ -+static void -+size_request_callback (GtkWidget *widget, -+ GtkRequisition *requisition, -+ TerminalWindow *window) -+{ -+ if (!window->priv->active_term) -+ return; -+ -+#ifdef DEBUG_GEOMETRY -+ g_fprintf (stderr, "vbox size-request callback with size %dx%d\n", -+ requisition->width, requisition->height); -+#endif -+ -+ if (GTK_WIDGET_MAPPED (window)) { -+ gtk_window_resize (GTK_WINDOW (window), requisition->width, -+ requisition->height); -+ } -+ update_geometry (window); - } - - static void diff --git a/x11/gnome-terminal/files/patch-src_terminal-window.h b/x11/gnome-terminal/files/patch-src_terminal-window.h deleted file mode 100644 index f62e9f6571d2..000000000000 --- a/x11/gnome-terminal/files/patch-src_terminal-window.h +++ /dev/null @@ -1,18 +0,0 @@ ---- src/terminal-window.h.orig Mon Jul 10 20:32:21 2006 -+++ src/terminal-window.h Wed Oct 18 15:32:15 2006 -@@ -77,15 +77,6 @@ - int terminal_window_get_screen_count (TerminalWindow *window); - - void terminal_window_update_icon (TerminalWindow *window); --void terminal_window_update_geometry (TerminalWindow *window); --void terminal_window_set_size (TerminalWindow *window, -- TerminalScreen *screen, -- gboolean even_if_mapped); --void terminal_window_set_size_force_grid (TerminalWindow *window, -- TerminalScreen *screen, -- gboolean even_if_mapped, -- int force_grid_width, -- int force_grid_height); - - void terminal_window_set_fullscreen (TerminalWindow *window, - gboolean setting); diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist index efd1e99662db..30f3fb1b1463 100644 --- a/x11/gnome-terminal/pkg-plist +++ b/x11/gnome-terminal/pkg-plist @@ -4,7 +4,6 @@ share/gnome/applications/gnome-terminal.desktop share/gnome/gnome-terminal/glade/gnome-terminal.glade2 share/gnome/help/gnome-terminal/C/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/C/figures/gnome-terminal-tabbed.png -share/gnome/help/gnome-terminal/C/figures/terminal_window.png share/gnome/help/gnome-terminal/C/gnome-terminal.xml share/gnome/help/gnome-terminal/C/legal.xml share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-default.png @@ -19,18 +18,13 @@ share/gnome/help/gnome-terminal/de/gnome-terminal.xml share/gnome/help/gnome-terminal/de/legal.xml share/gnome/help/gnome-terminal/es/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/es/figures/gnome-terminal-tabbed.png -share/gnome/help/gnome-terminal/es/figures/terminal_window.png share/gnome/help/gnome-terminal/es/gnome-terminal.xml -share/gnome/help/gnome-terminal/es/legal.xml 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/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 share/gnome/help/gnome-terminal/it/gnome-terminal.xml -share/gnome/help/gnome-terminal/it/legal.xml share/gnome/help/gnome-terminal/ja/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/ja/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/ja/figures/terminal_window.png @@ -48,12 +42,10 @@ share/gnome/help/gnome-terminal/ro/gnome-terminal.xml share/gnome/help/gnome-terminal/ro/legal.xml 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/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 -share/gnome/help/gnome-terminal/uk/legal.xml share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/zh_CN/figures/terminal_window.png diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile index dd7c0e41a46e..eedff80413d3 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.79 2006/07/19 06:00:46 ahze Exp $ +# $MCom: ports/x11/gnome2-fifth-toe/Makefile,v 1.81 2007/03/14 21:39:30 marcus Exp $ # PORTREVISION= 0 @@ -21,7 +21,6 @@ RUN_DEPENDS= pan:${PORTSDIR}/news/pan \ ${LOCALBASE}/lib/gaim/docklet.so:${PORTSDIR}/net-im/gaim \ tsclient:${PORTSDIR}/net/tsclient \ galeon:${PORTSDIR}/www/galeon \ - seahorse:${PORTSDIR}/security/seahorse \ ${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 \ diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile index 2ecbf0e833e7..c30e821ce096 100644 --- a/x11/gnome2-lite/Makefile +++ b/x11/gnome2-lite/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome2-lite/Makefile,v 1.50 2006/10/14 06:34:16 marcus Exp $ +# $MCom: ports/x11/gnome2-lite/Makefile,v 1.54 2007/03/02 15:38:59 ahze Exp $ # PORTREVISION= 0 @@ -32,7 +32,7 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applet 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 + totem:${PORTSDIR}/multimedia/totem MASTERDIR= ${.CURDIR}/../gnome2 CONFLICTS= gnome2-[0-9]* diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile index 355346c9c1f9..3572e8356e81 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.73 2006/10/08 03:46:18 mezz Exp $ +# $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.76 2007/03/14 21:39:31 marcus Exp $ # PORTREVISION= 0 @@ -12,7 +12,7 @@ PKGNAMESUFFIX= -power-tools COMMENT= The 'Geektoys' for the GNOME 2 power user -RUN_DEPENDS= ${LOCALBASE}/lib/epiphany/2.16/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \ +RUN_DEPENDS= ${LOCALBASE}/lib/epiphany/2.18/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \ gnome-pkgview:${PORTSDIR}/sysutils/gnome-pkgview \ ${LOCALBASE}/libexec/netspeed_applet2:${PORTSDIR}/net/netspeed_applet \ ${LOCALBASE}/sbin/gkrellmd:${PORTSDIR}/sysutils/gkrellm2 \ diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index 8f950c08e3ea..96d94061c599 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome2/Makefile,v 1.182 2006/10/14 06:34:16 marcus Exp $ +# $MCom: ports/x11/gnome2/Makefile,v 1.201 2007/03/14 21:39:30 marcus Exp $ # PORTNAME= gnome2 -PORTVERSION= 2.16.3 +PORTVERSION= 2.18.0 PORTREVISION?= 0 CATEGORIES?= x11 gnome MASTER_SITES= # empty @@ -43,15 +43,15 @@ RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ ${LOCALBASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnome-netstatus \ dasher:${PORTSDIR}/accessibility/dasher \ - evolution-2.8:${PORTSDIR}/mail/evolution \ + evolution-2.10:${PORTSDIR}/mail/evolution \ ${LOCALBASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \ network-admin:${PORTSDIR}/sysutils/gnome-system-tools \ gnome-nettool:${PORTSDIR}/net/gnome-nettool \ vino-session:${PORTSDIR}/net/vino \ - exchange-connector-setup-2.8:${PORTSDIR}/mail/evolution-exchange \ + exchange-connector-setup-2.10:${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 \ + totem:${PORTSDIR}/multimedia/totem \ gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \ ${LOCALBASE}/share/gnome/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \ sound-juicer:${PORTSDIR}/audio/sound-juicer \ @@ -65,8 +65,8 @@ RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple gnome-volume-manager:${PORTSDIR}/sysutils/gnome-volume-manager \ orca:${PORTSDIR}/accessibility/orca \ gnome-mount:${PORTSDIR}/sysutils/gnome-mount \ - ekiga:${PORTSDIR}/net/ekiga \ - ${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon + ${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon \ + seahorse:${PORTSDIR}/security/seahorse NO_BUILD= yes @@ -88,9 +88,12 @@ RUN_DEPENDS+= yelp:${PORTSDIR}/x11/yelp \ epiphany:${PORTSDIR}/www/epiphany .endif .if ${.CURDIR:T}!="gnome2-lite" -.if ${ARCH} == "i386" +.if ${ARCH} == "i386" || ${ARCH} == "amd64" RUN_DEPENDS+= tomboy:${PORTSDIR}/deskutils/tomboy .endif +.if ${OSVERSION}>=600000 +RUN_DEPENDS+= ekiga:${PORTSDIR}/net/ekiga +.endif .endif .endif diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 9f75d138d598..663e96d9aa44 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -3,11 +3,11 @@ # Whom: Yukihiro Nakai <Nakai@technologist.com> # # $FreeBSD$ -# $MCom: ports/x11/libgnome/Makefile,v 1.86 2006/09/04 18:09:21 marcus Exp $ +# $MCom: ports/x11/libgnome/Makefile,v 1.100 2007/03/12 15:49:09 ahze Exp $ # PORTNAME= libgnome -PORTVERSION= 2.16.0 +PORTVERSION= 2.18.0 PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -52,7 +52,9 @@ GCONF_SCHEMAS= desktop_gnome_accessibility_keyboard.schemas \ desktop_gnome_peripherals_keyboard.schemas \ desktop_gnome_peripherals_mouse.schemas \ desktop_gnome_sound.schemas desktop_gnome_thumbnailers.schemas \ - desktop_gnome_typing_break.schemas + desktop_gnome_typing_break.schemas \ + desktop_gnome_applications_at_mobility.schemas \ + desktop_gnome_applications_at_visual.schemas post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo index b1d8dd00d5ff..c9dc30c0be72 100644 --- a/x11/libgnome/distinfo +++ b/x11/libgnome/distinfo @@ -1,3 +1,3 @@ -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 +MD5 (gnome2/libgnome-2.18.0.tar.bz2) = 73426589d7c6fa3266fe4e8f3be2f5b5 +SHA256 (gnome2/libgnome-2.18.0.tar.bz2) = 53e3b241343c7ea9c4a8db4ca898fd7020c281f1400826d899b841d760dd5ba9 +SIZE (gnome2/libgnome-2.18.0.tar.bz2) = 1082802 diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in index c1cc3758947a..3cfaf607920c 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.7 2006/07/23 17:22:34 mezz Exp $ +# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.10 2007/02/16 18:14:27 mezz Exp $ # # Restore gconf keys of gnomevfs2. diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index 246d33231ca7..bfd82da029ec 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -38,9 +38,11 @@ share/locale/cs/LC_MESSAGES/libgnome-2.0.mo share/locale/cy/LC_MESSAGES/libgnome-2.0.mo share/locale/da/LC_MESSAGES/libgnome-2.0.mo share/locale/de/LC_MESSAGES/libgnome-2.0.mo +share/locale/dz/LC_MESSAGES/libgnome-2.0.mo share/locale/el/LC_MESSAGES/libgnome-2.0.mo share/locale/en_CA/LC_MESSAGES/libgnome-2.0.mo share/locale/en_GB/LC_MESSAGES/libgnome-2.0.mo +share/locale/eo/LC_MESSAGES/libgnome-2.0.mo share/locale/es/LC_MESSAGES/libgnome-2.0.mo share/locale/et/LC_MESSAGES/libgnome-2.0.mo share/locale/eu/LC_MESSAGES/libgnome-2.0.mo @@ -144,6 +146,8 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo @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 diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile new file mode 100644 index 000000000000..db661e438d67 --- /dev/null +++ b/x11/libgnomekbd/Makefile @@ -0,0 +1,33 @@ +# New ports collection makefile for: libgnomekbd +# Date created: 2006-11-07 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/x11/libgnomekbd/Makefile,v 1.5 2007/03/12 01:37:17 mezz Exp $ +# + +PORTNAME= libgnomekbd +PORTVERSION= 2.18.0 +CATEGORIES= x11 gnome +MASTER_SITES= GNOME +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= GNOME keyboard shared library + +LIB_DEPENDS= xklavier.11:${PORTSDIR}/x11/libxklavier \ + dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib + +USE_BZIP2= yes +USE_GNOME= libgnomeui gnometarget gnomeprefix gnomehack +GNU_CONFIGURE= yes +INSTALLS_ICONS= yes +USE_GETTEXT= yes +USE_LDCONFIG= yes +USE_GMAKE= yes + +GCONF_SCHEMAS= desktop_gnome_peripherals_keyboard_xkb.schemas +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" + +.include <bsd.port.mk> diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo new file mode 100644 index 000000000000..378f82cf5fd4 --- /dev/null +++ b/x11/libgnomekbd/distinfo @@ -0,0 +1,3 @@ +MD5 (gnome2/libgnomekbd-2.18.0.tar.bz2) = f176e026158f678144511fb343ec7269 +SHA256 (gnome2/libgnomekbd-2.18.0.tar.bz2) = a5f6c32671c8b4870e407d16f1c709564d486cf9ac7617163430d7a7f7af331e +SIZE (gnome2/libgnomekbd-2.18.0.tar.bz2) = 332463 diff --git a/x11/libgnomekbd/pkg-descr b/x11/libgnomekbd/pkg-descr new file mode 100644 index 000000000000..a4b625c78120 --- /dev/null +++ b/x11/libgnomekbd/pkg-descr @@ -0,0 +1 @@ +GNOME keyboard shared library diff --git a/x11/libgnomekbd/pkg-plist b/x11/libgnomekbd/pkg-plist new file mode 100644 index 000000000000..f4ca7d9fb9ce --- /dev/null +++ b/x11/libgnomekbd/pkg-plist @@ -0,0 +1,30 @@ +bin/gkbd-indicator-plugins-capplet +include/libgnomekbd/gkbd-config-registry-client.h +include/libgnomekbd/gkbd-config-registry.h +include/libgnomekbd/gkbd-desktop-config.h +include/libgnomekbd/gkbd-indicator-config.h +include/libgnomekbd/gkbd-indicator-plugin.h +include/libgnomekbd/gkbd-indicator.h +include/libgnomekbd/gkbd-keyboard-config.h +include/libgnomekbd/gkbd-keyboard-drawing.h +include/libgnomekbd/gkbd-util.h +lib/libgnomekbd.a +lib/libgnomekbd.la +lib/libgnomekbd.so +lib/libgnomekbd.so.1 +lib/libgnomekbdui.a +lib/libgnomekbdui.la +lib/libgnomekbdui.so +lib/libgnomekbdui.so.1 +libdata/pkgconfig/libgnomekbd.pc +libdata/pkgconfig/libgnomekbdui.pc +share/gnome/applications/gkbd-indicator-plugins-capplet.desktop +share/gnome/libgnomekbd/glade/gkbd-indicator-plugins.glade +share/icons/hicolor/48x48/apps/gkbd-indicator-plugins-capplet.png +share/locale/bg/LC_MESSAGES/libgnomekbd.mo +share/locale/ja/LC_MESSAGES/libgnomekbd.mo +share/locale/nb/LC_MESSAGES/libgnomekbd.mo +share/locale/ru/LC_MESSAGES/libgnomekbd.mo +@dirrm share/gnome/libgnomekbd/glade +@dirrm share/gnome/libgnomekbd +@dirrm include/libgnomekbd diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile index 6ec24e022a30..dadd8226120e 100644 --- a/x11/libgnomemm26/Makefile +++ b/x11/libgnomemm26/Makefile @@ -3,11 +3,11 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/x11/libgnomemm26/Makefile,v 1.10 2006/08/21 15:25:07 ahze Exp $ +# $MCom: ports/x11/libgnomemm26/Makefile,v 1.12 2007/03/10 05:37:03 marcus Exp $ # PORTNAME= libgnomemm -PORTVERSION= 2.16.0 +PORTVERSION= 2.18.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11/libgnomemm26/distinfo b/x11/libgnomemm26/distinfo index 0b20f59ebc30..afa6cee74da9 100644 --- a/x11/libgnomemm26/distinfo +++ b/x11/libgnomemm26/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomemm-2.16.0.tar.bz2) = 2971eea9ebe6041735375e765322c51f -SHA256 (gnome2/libgnomemm-2.16.0.tar.bz2) = 4a90c066a09539e159e1abfd2acbc189e814f558e4e0ef33e46b5fc8af57b2d5 -SIZE (gnome2/libgnomemm-2.16.0.tar.bz2) = 256478 +MD5 (gnome2/libgnomemm-2.18.0.tar.bz2) = da6d481fc4a7fb0084d0e48f5c182112 +SHA256 (gnome2/libgnomemm-2.18.0.tar.bz2) = 043a9bedcc55296981934acf19ecfb428bdc1710baaed6c82470ea38f7bca182 +SIZE (gnome2/libgnomemm-2.18.0.tar.bz2) = 252070 diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index ea20a7162988..b61e50b2a49f 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -3,14 +3,13 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/libxklavier/Makefile,v 1.28 2006/09/10 00:51:15 mezz Exp $ +# $MCom: ports/x11/libxklavier/Makefile,v 1.32 2007/02/24 21:00:46 mezz Exp $ # PORTNAME= libxklavier -PORTVERSION= 2.91 -PORTREVISION= 5 +PORTVERSION= 3.1 PORTEPOCH= 1 -CATEGORIES= x11 +CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gswitchit @@ -34,10 +33,4 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ PLIST_SUB= VERSION=${PORTVERSION} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -IGNORE= does not build on 4.X -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo index 8456fa5a39e7..83004073cea0 100644 --- a/x11/libxklavier/distinfo +++ b/x11/libxklavier/distinfo @@ -1,3 +1,3 @@ -MD5 (libxklavier-2.91.tar.gz) = 53d9864d165c86edb6a67f7ebe140814 -SHA256 (libxklavier-2.91.tar.gz) = 25c51adea53aed005d8b586289759e7402594d3326cd2f89bcdac54568c38f9b -SIZE (libxklavier-2.91.tar.gz) = 455935 +MD5 (libxklavier-3.1.tar.gz) = 56c4bea91ccbd0d09e3bcf58dff5732a +SHA256 (libxklavier-3.1.tar.gz) = 0aa3bbc4d374cb5b24cf081eabe9b79d1caa5e5c1ea80c57ebd82f08eb56670e +SIZE (libxklavier-3.1.tar.gz) = 472712 diff --git a/x11/libxklavier/files/patch-configure b/x11/libxklavier/files/patch-configure index 4de85e18100f..d6d10d94182c 100644 --- a/x11/libxklavier/files/patch-configure +++ b/x11/libxklavier/files/patch-configure @@ -1,33 +1,35 @@ ---- configure.orig Mon Dec 13 00:57:33 2004 -+++ configure Mon Dec 13 00:58:14 2004 -@@ -20135,9 +20135,9 @@ +--- configure.orig Sat Nov 4 15:13:39 2006 ++++ configure Sat Nov 4 15:14:10 2006 +@@ -23045,9 +23045,9 @@ fi - echo "$as_me:$LINENO: checking whether at least one libxklavier backend is enabled" >&5 - echo $ECHO_N "checking whether at least one libxklavier backend is enabled... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether at least one libxklavier backend is enabled" >&5 + echo $ECHO_N "checking whether at least one libxklavier backend is enabled... $ECHO_C" >&6; } -if test \( "$enable_xkb_support" == "yes" -a \ -- "$xkb_headers_present" == "yes" \) -o \ -- "$enable_xmm_support" == "yes" ; then +- "$libxkbfile_present" == "yes" \) -o \ +- "$enable_xmodmap_support" == "yes" ; then +if test \( "$enable_xkb_support" = "yes" -a \ -+ "$xkb_headers_present" = "yes" \) -o \ -+ "$enable_xmm_support" = "yes" ; then - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 ++ "$libxkbfile_present" = "yes" \) -o \ ++ "$enable_xmodmap_support" = "yes" ; then + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } else -@@ -21744,14 +21744,14 @@ +@@ -24885,8 +24885,8 @@ fi echo '**********************************************************' echo ' Libxklavier is configured with the following backends:' -if test "$enable_xkb_support" == "yes" ; then -- if test "$xkb_headers_present" == "yes" ; then +- if test "$libxkbfile_present" == "yes" ; then +if test "$enable_xkb_support" = "yes" ; then -+ if test "$xkb_headers_present" = "yes" ; then - echo ' XKB (libxkbfile headers are present)' - else - echo ' XKB (but libxkbfile headers are NOT present)' ++ if test "$libxkbfile_present" = "yes" ; then + echo " XKB, libxkbfile is present" + echo " default ruleset: $xkb_default_ruleset" + echo " base: $xkb_base" +@@ -24894,7 +24894,7 @@ if test "$enable_xkb_support" == "yes" ; + echo " XKB, libxkbfile is NOT present" fi fi --if test "$enable_xmm_support" == "yes" ; then -+if test "$enable_xmm_support" = "yes" ; then - echo ' xmodmap' +-if test "$enable_xmodmap_support" == "yes" ; then ++if test "$enable_xmodmap_support" = "yes" ; then + echo " xmodmap, default ruleset: $xmodmap_default_ruleset" + echo " base: $xmodmap_base" fi - echo '**********************************************************' diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_config.c b/x11/libxklavier/files/patch-libxklavier_xklavier_config.c deleted file mode 100644 index fe26e5ca94ed..000000000000 --- a/x11/libxklavier/files/patch-libxklavier_xklavier_config.c +++ /dev/null @@ -1,24 +0,0 @@ ---- libxklavier/xklavier_config.c.orig Sat Apr 15 21:04:38 2006 -+++ libxklavier/xklavier_config.c Tue Feb 27 14:57:27 2007 -@@ -243,7 +243,7 @@ - return FALSE; - - nodes = xpath_obj->nodesetval; -- if (nodes != NULL && nodes->nodeTab != NULL) { -+ if (nodes != NULL && nodes->nodeTab != NULL && nodes->nodeNr > 0) { - rv = xkl_read_config_item(*nodes->nodeTab, pitem); - if (pnode != NULL) { - *pnode = *nodes->nodeTab; -@@ -275,7 +275,11 @@ - gchar * - xkl_strings_concat_comma_separated(gchar ** array) - { -- return g_strjoinv(",", array); -+ if (array) { -+ return g_strjoinv(",", array); -+ } else { -+ return g_strdup(""); -+ } - } - - void diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c b/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c deleted file mode 100644 index 91d73cf112a3..000000000000 --- a/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libxklavier/xklavier_config_i18n.c.orig Tue Jun 13 00:12:44 2006 -+++ libxklavier/xklavier_config_i18n.c Tue Jun 13 00:13:05 2006 -@@ -108,7 +108,7 @@ xkl_locale_from_utf8(const gchar * utf8s - iconv_t converter; - gchar converted[XKL_MAX_CI_DESC_LENGTH]; - gchar *converted_start = converted; -- gchar *utf_start = (char *) utf8string; -+ const gchar *utf_start = (const char *) utf8string; - size_t clen = XKL_MAX_CI_DESC_LENGTH - 1; - const gchar *charset; - diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c b/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c deleted file mode 100644 index 200a1bda64f9..000000000000 --- a/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libxklavier/xklavier_xmm.c.orig Sat Dec 16 01:25:29 2006 -+++ libxklavier/xklavier_xmm.c Sat Dec 16 01:29:39 2006 -@@ -107,7 +107,7 @@ xkl_xmm_find_switch_option(XklEngine * e - const XmmSwitchOption *rv = xkl_xmm_shortcut_get_current(engine); - - if (rv != NULL) { -- XmmShortcut *sc = rv->shortcuts; -+ const XmmShortcut *sc = rv->shortcuts; - while (sc->keysym != XK_VoidSymbol) { - if ((XKeysymToKeycode - (xkl_engine_get_display(engine), diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist index 8b2c1b17f954..af1dcbcf8cf2 100644 --- a/x11/libxklavier/pkg-plist +++ b/x11/libxklavier/pkg-plist @@ -10,6 +10,7 @@ lib/libxklavier.so lib/libxklavier.so.11 libdata/pkgconfig/libxklavier.pc %%DOCSDIR%%/ch01.html +%%DOCSDIR%%/ch02.html %%DOCSDIR%%/home.png %%DOCSDIR%%/index.html %%DOCSDIR%%/index.sgml diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile index 03195f98705d..67eadf042aeb 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -3,11 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/yelp/Makefile,v 1.105 2006/10/07 17:10:08 marcus Exp $ +# $MCom: ports/x11/yelp/Makefile,v 1.110 2007/03/14 17:45:40 marcus Exp $ # PORTNAME= yelp -PORTVERSION= 2.16.2 +PORTVERSION= 2.18.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo index ca399af3d6d9..71d58cb478bc 100644 --- a/x11/yelp/distinfo +++ b/x11/yelp/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/yelp-2.16.2.tar.bz2) = ac55332d62c1871b3de92b5c1f0befaa -SHA256 (gnome2/yelp-2.16.2.tar.bz2) = d3582665af98c8f4fd2f3c62d378360ea4de699bfe9e7213054071462f0650d5 -SIZE (gnome2/yelp-2.16.2.tar.bz2) = 858693 +MD5 (gnome2/yelp-2.18.0.tar.bz2) = bc40ea281cdfa256c7da0d0b7fe8191b +SHA256 (gnome2/yelp-2.18.0.tar.bz2) = b02e8f518830d5f2f1a2106995c6ccaefa02c1bc4be2767356f4c386b2579836 +SIZE (gnome2/yelp-2.18.0.tar.bz2) = 897798 diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index a65b9948dec9..c931ad460d43 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.69 2006/10/03 11:37:08 ahze Exp $ +# $MCom: ports/x11/zenity/Makefile,v 1.77 2007/03/11 19:58:27 mezz Exp $ # PORTNAME= zenity -PORTVERSION= 2.16.3 +PORTVERSION= 2.18.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo index 98ca4151d333..1b6ad666c42d 100644 --- a/x11/zenity/distinfo +++ b/x11/zenity/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/zenity-2.16.3.tar.bz2) = 773579408f3237b38fa4d18a182c0ca6 -SHA256 (gnome2/zenity-2.16.3.tar.bz2) = 8055b439842db072c4d38e042c3786e80ebad5429180a46625e6cc4bfb648273 -SIZE (gnome2/zenity-2.16.3.tar.bz2) = 1525997 +MD5 (gnome2/zenity-2.18.0.tar.bz2) = f1a69577b9802b4031f53ff1bdd4989c +SHA256 (gnome2/zenity-2.18.0.tar.bz2) = c2a3312317502a1e727ab9473d201ca6a11bdaf817aac4c8dcf6453b172ccec7 +SIZE (gnome2/zenity-2.18.0.tar.bz2) = 1534768 diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist index 3fdb6673849a..336291cbe3d9 100644 --- a/x11/zenity/pkg-plist +++ b/x11/zenity/pkg-plist @@ -134,6 +134,7 @@ 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/mg/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 @@ -215,6 +216,8 @@ share/locale/zh_TW/LC_MESSAGES/zenity.mo @dirrmtry share/locale/ne @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 |