diff options
Diffstat (limited to 'x11')
48 files changed, 450 insertions, 270 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index dfadb4c668f0..69a41b9c4bcd 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -8,6 +8,7 @@ PORTNAME= gdm PORTVERSION= 2.30.5 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -43,7 +44,8 @@ USE_GNOME= gnomehack intlhack gnomehier gconf2 librsvg2 \ gnomedocutils gnomeprefix gnomepanel GCONF_SCHEMAS= gdm-simple-greeter.schemas GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-working-directory=${PREFIX}/etc/gdm/home +CONFIGURE_ARGS= --with-working-directory=${PREFIX}/etc/gdm/home \ + --with-at-spi-registryd-directory=${LOCALBASE}/libexec CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAS_SA_LEN" \ LDFLAGS="-L${LOCALBASE}/lib" \ LIBS="-lm" \ @@ -64,7 +66,7 @@ OPTIONS= IPV6 "Enable IPv6 support" off \ .if defined(WITHOUT_KEYRING) SUB_LIST+= PAM_KEYRING=\# .else -RUN_DEPENDS+= ${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring +LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring SUB_LIST+= PAM_KEYRING= .endif diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 8e21730d9789..ed3915304eac 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.211 2010/03/28 17:55:31 marcus Exp $ +# $MCom: ports/x11/gnome-applets/Makefile,v 1.216 2010/09/27 10:14:28 kwm Exp $ # PORTNAME= gnome-applets -PORTVERSION= 2.30.0 -PORTREVISION= 3 +PORTVERSION= 2.32.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -80,9 +79,9 @@ GCONF_SCHEMAS+= cpufreq-applet.schemas .if defined(WITH_MINI_COMMANDER) CONFIGURE_ARGS+= --enable-mini-commander GCONF_SCHEMAS+= mini-commander-global.schemas mini-commander.schemas -PLIST_SUB+= COMMANDER="" +PLIST_SUB+= COMMANDER="" OLDCOMMANDER="@comment " .else -PLIST_SUB+= COMMANDER="@comment " +PLIST_SUB+= COMMANDER="@comment " OLDCOMMANDER="" .endif .if ( exists(${pygnomedesktop_DETECT}) ) || \ diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo index 01f4c787073b..539d23dcd8b0 100644 --- a/x11/gnome-applets/distinfo +++ b/x11/gnome-applets/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-applets-2.30.0.tar.bz2) = 2afcbedc10b1a0e8072ac4eefdc8d770 -SHA256 (gnome2/gnome-applets-2.30.0.tar.bz2) = 41489fbb1f8352a306cde6676dfaf1e497bfbca960454f7251c4fd92920bba5d -SIZE (gnome2/gnome-applets-2.30.0.tar.bz2) = 9919459 +MD5 (gnome2/gnome-applets-2.32.0.tar.bz2) = d2fb61c5cfdba1f87302d972bc62dd81 +SHA256 (gnome2/gnome-applets-2.32.0.tar.bz2) = 3b2611b3253ed5418f37c83d710918e93476a783637ddb4ef7e5eab7a83a4c1b +SIZE (gnome2/gnome-applets-2.32.0.tar.bz2) = 10065202 diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist index c5a575959073..0602ba569b99 100644 --- a/x11/gnome-applets/pkg-plist +++ b/x11/gnome-applets/pkg-plist @@ -14,9 +14,15 @@ %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/chart.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/chart.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/chart.pyo +lib/python2.6/site-packages/invest/currencies.py +lib/python2.6/site-packages/invest/currencies.pyc +lib/python2.6/site-packages/invest/currencies.pyo %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/defs.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/defs.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/defs.pyo +lib/python2.6/site-packages/invest/help.py +lib/python2.6/site-packages/invest/help.pyc +lib/python2.6/site-packages/invest/help.pyo %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/networkmanager.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/networkmanager.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/networkmanager.pyo @@ -29,24 +35,13 @@ %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/widgets.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/widgets.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/widgets.pyo -libdata/bonobo/servers/GNOME_AccessxStatusApplet.server -%%BATTERY%%libdata/bonobo/servers/GNOME_BattstatApplet.server libdata/bonobo/servers/GNOME_CDPlayerApplet.server -%%CPUFREQ%%libdata/bonobo/servers/GNOME_CPUFreqApplet.server -libdata/bonobo/servers/GNOME_CharpickerApplet.server -libdata/bonobo/servers/GNOME_DriveMountApplet.server -libdata/bonobo/servers/GNOME_GWeatherApplet_Factory.server -libdata/bonobo/servers/GNOME_GeyesApplet.server %%PYTHON%%libdata/bonobo/servers/GNOME_GtikApplet.server libdata/bonobo/servers/GNOME_KeyboardApplet.server libdata/bonobo/servers/GNOME_MailcheckApplet_Factory.server -libdata/bonobo/servers/GNOME_MiniCommanderApplet.server -libdata/bonobo/servers/GNOME_MixerApplet.server -libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server +%%OLDCOMMANDER%%libdata/bonobo/servers/GNOME_MiniCommanderApplet.server libdata/bonobo/servers/GNOME_NullApplet_Factory.server -libdata/bonobo/servers/GNOME_Panel_TrashApplet.server libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server -libdata/bonobo/servers/GNOME_StickyNotesApplet.server %%PYTHON%%libdata/bonobo/servers/Invest_Applet.server libexec/accessx-status-applet %%BATTERY%%libexec/battstat-applet-2 @@ -63,20 +58,44 @@ libexec/multiload-applet-2 libexec/null_applet libexec/stickynotes_applet libexec/trashapplet +share/dbus-1/services/org.gnome.panel.applet.AccessxStatusAppletFactory.service +%%BATTERY%%share/dbus-1/services/org.gnome.panel.applet.BattstatAppletFactory.service +%%CPUFREQ%%share/dbus-1/services/org.gnome.panel.applet.CPUFreqAppletFactory.service +share/dbus-1/services/org.gnome.panel.applet.CharpickerAppletFactory.service +share/dbus-1/services/org.gnome.panel.applet.DriveMountAppletFactory.service +share/dbus-1/services/org.gnome.panel.applet.GWeatherAppletFactory.service +share/dbus-1/services/org.gnome.panel.applet.GeyesAppletFactory.service +%%COMMANDER%%share/dbus-1/services/org.gnome.panel.applet.MiniCommanderAppletFactory.service +share/dbus-1/services/org.gnome.panel.applet.MixerAppletFactory.service +share/dbus-1/services/org.gnome.panel.applet.MultiLoadAppletFactory.service +share/dbus-1/services/org.gnome.panel.applet.StickyNotesAppletFactory.service +share/dbus-1/services/org.gnome.panel.applet.TrashAppletFactory.service %%CPUFREQ%%share/dbus-1/system-services/org.gnome.CPUFreqSelector.service -share/gnome-2.0/ui/GNOME_AccessxApplet.xml -%%BATTERY%%share/gnome-2.0/ui/GNOME_BattstatApplet.xml -%%CPUFREQ%%share/gnome-2.0/ui/GNOME_CPUFreqApplet.xml -share/gnome-2.0/ui/GNOME_CharpickerApplet.xml -share/gnome-2.0/ui/GNOME_DriveMountApplet.xml -share/gnome-2.0/ui/GNOME_GWeatherApplet.xml -share/gnome-2.0/ui/GNOME_GeyesApplet.xml -%%COMMANDER%%share/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml -share/gnome-2.0/ui/GNOME_MixerApplet.xml -share/gnome-2.0/ui/GNOME_MultiloadApplet.xml -share/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml -share/gnome-2.0/ui/GNOME_StickyNotesApplet.xml +share/gnome-2.0/ui/accessx-status-applet-menu.xml +%%BATTERY%%share/gnome-2.0/ui/battstat-applet-menu.xml +share/gnome-2.0/ui/charpick-applet-menu.xml +%%CPUFREQ%%share/gnome-2.0/ui/cpufreq-applet-menu.xml +share/gnome-2.0/ui/drivemount-applet-menu.xml +share/gnome-2.0/ui/geyes-applet-menu.xml +share/gnome-2.0/ui/gweather-applet-menu.xml +%%COMMANDER%%share/gnome-2.0/ui/mini-commander-applet-menu.xml +share/gnome-2.0/ui/mixer-applet-menu.xml +share/gnome-2.0/ui/multiload-applet-menu.xml +share/gnome-2.0/ui/stickynotes-applet-menu.xml +share/gnome-2.0/ui/trashapplet-menu.xml %%PYTHON%%share/gnome-2.0/ui/Invest_Applet.xml +share/gnome-panel/applets/org.gnome.applets.AccessxStatusApplet.panel-applet +%%BATTERY%%share/gnome-panel/applets/org.gnome.applets.BattstatApplet.panel-applet +%%CPUFREQ%%share/gnome-panel/applets/org.gnome.applets.CPUFreqApplet.panel-applet +share/gnome-panel/applets/org.gnome.applets.CharpickerApplet.panel-applet +share/gnome-panel/applets/org.gnome.applets.DriveMountApplet.panel-applet +share/gnome-panel/applets/org.gnome.applets.GWeatherApplet.panel-applet +share/gnome-panel/applets/org.gnome.applets.GeyesApplet.panel-applet +%%COMMANDER%%share/gnome-panel/applets/org.gnome.applets.MiniCommanderApplet.panel-applet +share/gnome-panel/applets/org.gnome.applets.MixerApplet.panel-applet +share/gnome-panel/applets/org.gnome.applets.MultiLoadApplet.panel-applet +share/gnome-panel/applets/org.gnome.applets.StickyNotesApplet.panel-applet +share/gnome-panel/applets/org.gnome.applets.TrashApplet.panel-applet %%BATTERY%%%%DATADIR%%/builder/battstat_applet.ui %%CPUFREQ%%%%DATADIR%%/builder/cpufreq-preferences.ui %%PYTHON%%%%DATADIR%%/builder/financialchart.ui @@ -242,6 +261,18 @@ share/gnome/help/accessx-status/fr/figures/accessx_sticky-keys.png share/gnome/help/accessx-status/fr/figures/accessx_sticky-meta-key.png share/gnome/help/accessx-status/fr/figures/accessx_sticky-shift-key.png share/gnome/help/accessx-status/fr/figures/accessx_sticky-windows-key.png +share/gnome/help/accessx-status/gl/accessx-status.xml +share/gnome/help/accessx-status/gl/figures/accessx-status-applet.png +share/gnome/help/accessx-status/gl/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/gl/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/gl/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/gl/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/gl/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/gl/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/gl/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/gl/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/gl/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/gl/figures/accessx_sticky-windows-key.png share/gnome/help/accessx-status/it/accessx-status.xml share/gnome/help/accessx-status/it/figures/accessx-status-applet.png share/gnome/help/accessx-status/it/figures/accessx-status-disabled.png @@ -819,6 +850,12 @@ share/gnome/help/drivemount/cs/figures/drivemount-applet_example.png share/gnome/help/drivemount/cs/figures/drivemount-applet_mount.png share/gnome/help/drivemount/cs/figures/drivemount-applet_open.png share/gnome/help/drivemount/cs/figures/drivemount-applet_status.png +share/gnome/help/drivemount/da/drivemount.xml +share/gnome/help/drivemount/da/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/da/figures/drivemount-applet_example.png +share/gnome/help/drivemount/da/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/da/figures/drivemount-applet_open.png +share/gnome/help/drivemount/da/figures/drivemount-applet_status.png share/gnome/help/drivemount/de/drivemount.xml share/gnome/help/drivemount/de/figures/drivemount-applet_eject.png share/gnome/help/drivemount/de/figures/drivemount-applet_example.png @@ -1255,16 +1292,26 @@ share/gnome/help/gweather/zh_CN/figures/stock_weather-snow.png share/gnome/help/gweather/zh_CN/figures/stock_weather-storm.png share/gnome/help/gweather/zh_CN/figures/stock_weather-sunny.png share/gnome/help/gweather/zh_CN/gweather.xml +%%PYTHON%%share/gnome/help/invest-applet/C/figures/symbol-search.png %%PYTHON%%share/gnome/help/invest-applet/C/invest-applet.xml %%PYTHON%%share/gnome/help/invest-applet/C/legal.xml +%%PYTHON%%share/gnome/help/invest-applet/ca/figures/symbol-search.png %%PYTHON%%share/gnome/help/invest-applet/ca/invest-applet.xml -%%PYTHON%%share/gnome/help/invest-applet/en_GB/invest-applet.xml +%%PYTHON%%share/gnome/help/invest-applet/de/figures/symbol-search.png %%PYTHON%%share/gnome/help/invest-applet/de/invest-applet.xml +%%PYTHON%%share/gnome/help/invest-applet/el/figures/symbol-search.png %%PYTHON%%share/gnome/help/invest-applet/el/invest-applet.xml +%%PYTHON%%share/gnome/help/invest-applet/en_GB/figures/symbol-search.png +%%PYTHON%%share/gnome/help/invest-applet/en_GB/invest-applet.xml +%%PYTHON%%share/gnome/help/invest-applet/es/figures/symbol-search.png %%PYTHON%%share/gnome/help/invest-applet/es/invest-applet.xml +%%PYTHON%%share/gnome/help/invest-applet/fi/figures/symbol-search.png %%PYTHON%%share/gnome/help/invest-applet/fi/invest-applet.xml +%%PYTHON%%share/gnome/help/invest-applet/ru/figures/symbol-search.png %%PYTHON%%share/gnome/help/invest-applet/ru/invest-applet.xml +%%PYTHON%%share/gnome/help/invest-applet/sv/figures/symbol-search.png %%PYTHON%%share/gnome/help/invest-applet/sv/invest-applet.xml +%%PYTHON%%share/gnome/help/invest-applet/zh_CN/figures/symbol-search.png %%PYTHON%%share/gnome/help/invest-applet/zh_CN/invest-applet.xml share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/C/legal.xml @@ -1596,6 +1643,7 @@ share/locale/el/LC_MESSAGES/gnome-applets-2.0.mo share/locale/en_CA/LC_MESSAGES/gnome-applets-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-applets-2.0.mo share/locale/en@shaw/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/eo/LC_MESSAGES/gnome-applets-2.0.mo share/locale/es/LC_MESSAGES/gnome-applets-2.0.mo share/locale/es_AR/LC_MESSAGES/gnome-applets-2.0.mo share/locale/es_CL/LC_MESSAGES/gnome-applets-2.0.mo @@ -1632,6 +1680,7 @@ share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ka/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/kk/LC_MESSAGES/gnome-applets-2.0.mo share/locale/kn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ku/LC_MESSAGES/gnome-applets-2.0.mo @@ -1670,6 +1719,7 @@ share/locale/ta/LC_MESSAGES/gnome-applets-2.0.mo share/locale/te/LC_MESSAGES/gnome-applets-2.0.mo share/locale/th/LC_MESSAGES/gnome-applets-2.0.mo share/locale/tr/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/ug/LC_MESSAGES/gnome-applets-2.0.mo share/locale/uk/LC_MESSAGES/gnome-applets-2.0.mo share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo @@ -1688,6 +1738,7 @@ share/omf/accessx-status/accessx-status-es.omf share/omf/accessx-status/accessx-status-eu.omf share/omf/accessx-status/accessx-status-fi.omf share/omf/accessx-status/accessx-status-fr.omf +share/omf/accessx-status/accessx-status-gl.omf share/omf/accessx-status/accessx-status-it.omf share/omf/accessx-status/accessx-status-ko.omf share/omf/accessx-status/accessx-status-nl.omf @@ -1771,6 +1822,7 @@ share/omf/char-palette/char-palette-zh_CN.omf share/omf/drivemount/drivemount-C.omf share/omf/drivemount/drivemount-ca.omf share/omf/drivemount/drivemount-cs.omf +share/omf/drivemount/drivemount-da.omf share/omf/drivemount/drivemount-de.omf share/omf/drivemount/drivemount-el.omf share/omf/drivemount/drivemount-en_GB.omf @@ -2237,15 +2289,25 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/mixer_applet2/C/figures @dirrm share/gnome/help/mixer_applet2/C @dirrm share/gnome/help/mixer_applet2 +%%PYTHON%%@dirrm share/gnome/help/invest-applet/zh_CN/figures %%PYTHON%%@dirrm share/gnome/help/invest-applet/zh_CN +%%PYTHON%%@dirrm share/gnome/help/invest-applet/sv/figures %%PYTHON%%@dirrm share/gnome/help/invest-applet/sv +%%PYTHON%%@dirrm share/gnome/help/invest-applet/ru/figures %%PYTHON%%@dirrm share/gnome/help/invest-applet/ru +%%PYTHON%%@dirrm share/gnome/help/invest-applet/fi/figures %%PYTHON%%@dirrm share/gnome/help/invest-applet/fi +%%PYTHON%%@dirrm share/gnome/help/invest-applet/es/figures %%PYTHON%%@dirrm share/gnome/help/invest-applet/es -%%PYTHON%%@dirrm share/gnome/help/invest-applet/el +%%PYTHON%%@dirrm share/gnome/help/invest-applet/en_GB/figures %%PYTHON%%@dirrm share/gnome/help/invest-applet/en_GB +%%PYTHON%%@dirrm share/gnome/help/invest-applet/el/figures +%%PYTHON%%@dirrm share/gnome/help/invest-applet/el +%%PYTHON%%@dirrm share/gnome/help/invest-applet/de/figures %%PYTHON%%@dirrm share/gnome/help/invest-applet/de +%%PYTHON%%@dirrm share/gnome/help/invest-applet/ca/figures %%PYTHON%%@dirrm share/gnome/help/invest-applet/ca +%%PYTHON%%@dirrm share/gnome/help/invest-applet/C/figures %%PYTHON%%@dirrm share/gnome/help/invest-applet/C %%PYTHON%%@dirrm share/gnome/help/invest-applet @dirrm share/gnome/help/gweather/zh_CN/figures @@ -2364,6 +2426,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/drivemount/el @dirrm share/gnome/help/drivemount/de/figures @dirrm share/gnome/help/drivemount/de +@dirrm share/gnome/help/drivemount/da/figures +@dirrm share/gnome/help/drivemount/da @dirrm share/gnome/help/drivemount/cs/figures @dirrm share/gnome/help/drivemount/cs @dirrm share/gnome/help/drivemount/ca/figures @@ -2535,6 +2599,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/accessx-status/ko @dirrm share/gnome/help/accessx-status/it/figures @dirrm share/gnome/help/accessx-status/it +@dirrm share/gnome/help/accessx-status/gl/figures +@dirrm share/gnome/help/accessx-status/gl @dirrm share/gnome/help/accessx-status/fr/figures @dirrm share/gnome/help/accessx-status/fr @dirrm share/gnome/help/accessx-status/fi/figures @@ -2559,6 +2625,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/accessx-status/C @dirrm share/gnome/help/accessx-status %%PYTHON%%@dirrm %%DATADIR%%/invest-applet +@dirrmtry share/gnome-panel/applets +@dirrmtry share/gnome-panel @dirrm %%DATADIR%%/geyes/Tango @dirrm %%DATADIR%%/geyes/Horrid @dirrm %%DATADIR%%/geyes/Default-tiny @@ -2574,6 +2642,8 @@ share/xmodmap/xmodmap.yu @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @@ -2596,6 +2666,8 @@ share/xmodmap/xmodmap.yu @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/kk/LC_MESSAGES +@dirrmtry share/locale/kk @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy @dirrmtry share/locale/es_VE/LC_MESSAGES diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index cd1be1754099..8b4f2d832897 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-stable/x11/gnome-desktop/Makefile,v 1.5 2010/06/23 19:15:14 kwm Exp $ +# $MCom: ports/x11/gnome-desktop/Makefile,v 1.190 2010/11/17 12:03:52 kwm Exp $ # PORTNAME= gnome-desktop -PORTVERSION= 2.30.2 +PORTVERSION= 2.32.1 PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= GNOME diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo index 71da28feed6c..2f432d4f6689 100644 --- a/x11/gnome-desktop/distinfo +++ b/x11/gnome-desktop/distinfo @@ -1,3 +1,2 @@ -MD5 (gnome2/gnome-desktop-2.30.2.tar.bz2) = 49f06f91b0579c6e5a07ff8195945629 -SHA256 (gnome2/gnome-desktop-2.30.2.tar.bz2) = 089c672cd70617541a9e4a827467af43266357e0c3635fc875b86b9b902084d8 -SIZE (gnome2/gnome-desktop-2.30.2.tar.bz2) = 1665808 +SHA256 (gnome2/gnome-desktop-2.32.1.tar.bz2) = 55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d +SIZE (gnome2/gnome-desktop-2.32.1.tar.bz2) = 1633847 diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist index 75ca3939c16f..5e9dc85e77d5 100644 --- a/x11/gnome-desktop/pkg-plist +++ b/x11/gnome-desktop/pkg-plist @@ -79,6 +79,7 @@ share/gnome/help/lgpl/zh_CN/lgpl.xml share/libgnome-desktop/pnp.ids share/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/an/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/as/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ast/LC_MESSAGES/gnome-desktop-2.0.mo @@ -431,3 +432,5 @@ share/pixmaps/vnterm.xpm @dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as +@dirrmtry share/locale/an/LC_MESSAGES +@dirrmtry share/locale/an diff --git a/x11/gnome-launch-box/Makefile b/x11/gnome-launch-box/Makefile index 0c8644eb783a..d84568032537 100644 --- a/x11/gnome-launch-box/Makefile +++ b/x11/gnome-launch-box/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-launch-box PORTVERSION= 20060112 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= jylefort diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile index b944b214c44f..cdf43017c376 100644 --- a/x11/gnome-menus/Makefile +++ b/x11/gnome-menus/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/x11/gnome-menus/Makefile,v 1.9 2010/06/23 19:26:18 kwm Exp $ +# $MCom: ports/x11/gnome-menus/Makefile,v 1.110 2010/11/17 11:29:19 kwm Exp $ # PORTNAME= gnome-menus -PORTVERSION= 2.30.2 +PORTVERSION= 2.30.5 +PORTREVISION= 0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo index eec8ec568c99..a11734649c75 100644 --- a/x11/gnome-menus/distinfo +++ b/x11/gnome-menus/distinfo @@ -1,3 +1,2 @@ -MD5 (gnome2/gnome-menus-2.30.2.tar.bz2) = 5ca9935f50c939881689c48f59348426 -SHA256 (gnome2/gnome-menus-2.30.2.tar.bz2) = 3cfb41586cda5892aea929ff9b327cbabc37a15971fdc6c6d4334d2488bb3233 -SIZE (gnome2/gnome-menus-2.30.2.tar.bz2) = 464086 +SHA256 (gnome2/gnome-menus-2.30.5.tar.bz2) = 6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa +SIZE (gnome2/gnome-menus-2.30.5.tar.bz2) = 471327 diff --git a/x11/gnome-menus/files/patch-Makefile.in b/x11/gnome-menus/files/patch-Makefile.in index 621e0233ce97..915e1b5a1f82 100644 --- a/x11/gnome-menus/files/patch-Makefile.in +++ b/x11/gnome-menus/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Mon Jul 24 15:57:52 2006 -+++ Makefile.in Mon Jul 24 15:58:05 2006 -@@ -244,7 +244,7 @@ sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - NULL = --@HAVE_PYTHON_TRUE@PYTHON_SUBDIRS = python simple-editor -+@HAVE_PYTHON_TRUE@PYTHON_SUBDIRS = python - ALL_SUBDIRS = \ - po \ - libmenu \ +--- Makefile.in.orig 2010-09-27 14:11:42.000000000 +0000 ++++ Makefile.in 2010-09-27 14:12:05.000000000 +0000 +@@ -33,7 +33,7 @@ + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-@HAVE_PYTHON_TRUE@am__append_1 = python simple-editor ++@HAVE_PYTHON_TRUE@am__append_1 = python + subdir = . + DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ diff --git a/x11/gnome-menus/files/patch-util_Makefile.in b/x11/gnome-menus/files/patch-util_Makefile.in index fd9b0fcf098b..658861905565 100644 --- a/x11/gnome-menus/files/patch-util_Makefile.in +++ b/x11/gnome-menus/files/patch-util_Makefile.in @@ -1,10 +1,10 @@ ---- util/Makefile.in.orig 2009-10-18 19:06:36.000000000 -0400 -+++ util/Makefile.in 2009-10-18 19:10:40.000000000 -0400 -@@ -313,6 +313,7 @@ gnome_menu_spec_test_SOURCES = \ +--- util/Makefile.in.orig 2010-09-27 14:12:22.000000000 +0000 ++++ util/Makefile.in 2010-09-27 14:13:51.000000000 +0000 +@@ -298,6 +298,7 @@ + test-menu-spec.c gnome_menu_spec_test_LDADD = \ - ../libmenu/libgnome-menu.la \ -+ %%PTHREAD_LIBS%% \ ++ %%PTHREAD_LIBS%% \ $(GLIB_LIBS) \ - $(NULL) + ../libmenu/libgnome-menu.la diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist index ff466cc19618..f94508732644 100644 --- a/x11/gnome-menus/pkg-plist +++ b/x11/gnome-menus/pkg-plist @@ -65,10 +65,12 @@ 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/fur/LC_MESSAGES/gnome-menus.mo +share/locale/fy/LC_MESSAGES/gnome-menus.mo share/locale/ga/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/gv/LC_MESSAGES/gnome-menus.mo share/locale/ha/LC_MESSAGES/gnome-menus.mo share/locale/he/LC_MESSAGES/gnome-menus.mo share/locale/hi/LC_MESSAGES/gnome-menus.mo @@ -82,6 +84,7 @@ share/locale/is/LC_MESSAGES/gnome-menus.mo share/locale/it/LC_MESSAGES/gnome-menus.mo share/locale/ja/LC_MESSAGES/gnome-menus.mo share/locale/ka/LC_MESSAGES/gnome-menus.mo +share/locale/kg/LC_MESSAGES/gnome-menus.mo share/locale/kk/LC_MESSAGES/gnome-menus.mo share/locale/kn/LC_MESSAGES/gnome-menus.mo share/locale/ko/LC_MESSAGES/gnome-menus.mo @@ -174,6 +177,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo @dirrmtry share/locale/ku @dirrmtry share/locale/kk/LC_MESSAGES @dirrmtry share/locale/kk +@dirrmtry share/locale/kg/LC_MESSAGES +@dirrmtry share/locale/kg @dirrmtry share/locale/io/LC_MESSAGES @dirrmtry share/locale/io @dirrmtry share/locale/ig/LC_MESSAGES @@ -182,8 +187,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo @dirrmtry share/locale/hy @dirrmtry share/locale/ha/LC_MESSAGES @dirrmtry share/locale/ha +@dirrmtry share/locale/gv/LC_MESSAGES +@dirrmtry share/locale/gv @dirrmtry share/locale/gn/LC_MESSAGES @dirrmtry share/locale/gn +@dirrmtry share/locale/fy/LC_MESSAGES +@dirrmtry share/locale/fy @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur @dirrmtry share/locale/en@shaw/LC_MESSAGES diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 9345359e5632..b23c8312eb8d 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-stable/x11/gnome-panel/Makefile,v 1.5 2010/06/23 21:59:12 kwm Exp $ +# $MCom: ports/x11/gnome-panel/Makefile,v 1.230 2010/11/17 13:01:32 kwm Exp $ # PORTNAME= gnome-panel -PORTVERSION= 2.30.2 -PORTREVISION?= 1 +PORTVERSION= 2.32.1 +PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -21,16 +21,16 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) LIB_DEPENDS= gweather.1:${PORTSDIR}/net/libgweather \ - canberra-gtk.0:${PORTSDIR}/audio/libcanberra \ - polkit-gnome.0:${PORTSDIR}/sysutils/policykit-gnome + dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + canberra-gtk.0:${PORTSDIR}/audio/libcanberra USE_GETTEXT= yes +USE_XORG= ice sm x11 xau xrandr INSTALLS_OMF= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop librsvg2 \ - libwnck gnomemenus gnomedocutils ltverhack referencehack \ - libbonoboui +USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop libwnck gnomemenus \ + gnomedocutils ltverhack referencehack librsvg2 WANT_GNOME= yes GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes @@ -47,7 +47,8 @@ GCONF_SCHEMAS= clock.schemas fish.schemas \ panel-toplevel.schemas window-list.schemas \ workspace-switcher.schemas -OPTIONS= EVOLUTION "use the Evolution calendar if installed" on +OPTIONS= EVOLUTION "use the Evolution calendar if installed" on \ + BONOBO "Support for bonobo applets aka Gnome 2 applets" on .if defined(PACKAGE_BUILDING) .undef WITHOUT_GNOME @@ -58,11 +59,20 @@ WITH_GNOME= yes .if !defined(WITHOUT_EVOLUTION) && ${HAVE_GNOME:Mevolutiondataserver}!="" USE_GNOME+= evolutiondataserver -CONFIGURE_ARGS+=--enable-eds +#CONFIGURE_ARGS+=--enable-eds .else CONFIGURE_ARGS+=--disable-eds .endif +.if defined(WITH_BONOBO) +USE_GNOME+= libbonoboui +CONFIGURE_ARGS+=--enable-bonobo +PLIST_SUB+= BONOBO="" +.else +CONFIGURE_ARGS+=--disable-bonobo +PLIST_SUB+= BONOBO="@comment " +.endif + post-patch: @${FIND} ${WRKSRC} -type f | \ ${XARGS} -n 10 ${REINPLACE_CMD} -e \ @@ -71,6 +81,10 @@ post-patch: ${WRKSRC}/help/clock/Makefile.in \ ${WRKSRC}/help/fish/Makefile.in +post-install: + @${MKDIR} ${PREFIX}/lib/gnome-panel/modules + -${LOCALBASE}/bin/gio-querymodules ${PREFIX}/lib/gnome-panel/modules + .include <bsd.port.post.mk> .endif diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index 210adb38c35b..d0b90eeb508f 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,3 +1,2 @@ -MD5 (gnome2/gnome-panel-2.30.2.tar.bz2) = 11b6db12223c70a218a2f4602b1683cc -SHA256 (gnome2/gnome-panel-2.30.2.tar.bz2) = f0171c55ecdf4970f819cce66de0db99bbe43832e8a284ea0dd0c89d7d12e7b6 -SIZE (gnome2/gnome-panel-2.30.2.tar.bz2) = 3125757 +SHA256 (gnome2/gnome-panel-2.32.1.tar.bz2) = 8f7828eb7a21c817a73b697844a4e20256059b32386414a10f97d51e7d9fca5f +SIZE (gnome2/gnome-panel-2.32.1.tar.bz2) = 3132156 diff --git a/x11/gnome-panel/files/patch-po_ko.po b/x11/gnome-panel/files/patch-po_ko.po deleted file mode 100644 index 7de508a0eba4..000000000000 --- a/x11/gnome-panel/files/patch-po_ko.po +++ /dev/null @@ -1,29 +0,0 @@ ---- po/ko.po.orig 2008-02-26 18:15:58.000000000 +0100 -+++ po/ko.po 2008-02-26 18:16:31.000000000 +0100 -@@ -95,7 +95,7 @@ msgstr "%H:%M" - #. * possible. - #: ../applets/clock/calendar-window.c:250 - msgid "%b %d" --msgstr "%b %e일" -+msgstr "%B %e일" - - #: ../applets/clock/calendar-window.c:765 - msgid "Tasks" -@@ -146,7 +146,7 @@ msgstr "%H:%M:%S" - #. - #: ../applets/clock/clock.c:443 - msgid "%a %b %e" --msgstr "%b %e일 (%a)" -+msgstr "%B %e일 (%a)" - - #. translators: reverse the order of these arguments - #. * if the time should come before the -@@ -207,7 +207,7 @@ msgstr "%p %I:%M" - - #: ../applets/clock/clock.c:1590 - msgid "%A, %B %d %Y" --msgstr "%Y년 %b %e일 %A" -+msgstr "%Y년 %B %e일 %A" - - #: ../applets/clock/clock.c:1665 - #, c-format diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist index 1d349e92627e..1f93a7f91a44 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -1,48 +1,67 @@ bin/gnome-desktop-item-edit bin/gnome-panel bin/panel-test-applets -etc/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf +%%BONOBO%%bin/panel-test-applets-bonobo @unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || /usr/bin/true @unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true etc/gconf/schemas/panel-default-setup.entries @exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true @exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || /usr/bin/true -include/panel-2.0/GNOME_Panel.h -include/panel-2.0/panel-applet-enums.h -include/panel-2.0/panel-applet-gconf.h -include/panel-2.0/panel-applet.h -lib/libpanel-applet-2.a -lib/libpanel-applet-2.la -lib/libpanel-applet-2.so -lib/libpanel-applet-2.so.0 -libdata/bonobo/servers/GNOME_ClockApplet_Factory.server -libdata/bonobo/servers/GNOME_FishApplet_Factory.server -libdata/bonobo/servers/GNOME_NotificationAreaApplet.server -libdata/bonobo/servers/GNOME_Wncklet_Factory.server -libdata/pkgconfig/libpanelapplet-2.0.pc +%%BONOBO%%include/panel-2.0/GNOME_Panel.h +%%BONOBO%%include/panel-2.0/panel-applet-enums.h +%%BONOBO%%include/panel-2.0/panel-applet-gconf.h +%%BONOBO%%include/panel-2.0/panel-applet.h +include/gnome-panel-3.0/libpanel-applet/panel-applet-enums.h +include/gnome-panel-3.0/libpanel-applet/panel-applet-gconf.h +include/gnome-panel-3.0/libpanel-applet/panel-applet.h +lib/girepository-1.0/PanelApplet-3.0.typelib +@exec mkdir -p %D/lib/gnome-panel/modules +%%BONOBO%%lib/gnome-panel/modules/libpanel-applets-bonobo.a +%%BONOBO%%lib/gnome-panel/modules/libpanel-applets-bonobo.la +%%BONOBO%%lib/gnome-panel/modules/libpanel-applets-bonobo.so +@exec %%LOCALBASE%%/bin/gio-querymodules %D/lib/gnome-panel/modules 2>1/dev/null || /usr/bin/true +@unexec /bin/rm -f %D/lib/gnome-panel/modules/giomodule.cache +%%BONOBO%%lib/libpanel-applet-2.a +%%BONOBO%%lib/libpanel-applet-2.la +%%BONOBO%%lib/libpanel-applet-2.so +%%BONOBO%%lib/libpanel-applet-2.so.0 +lib/libpanel-applet-3.a +lib/libpanel-applet-3.la +lib/libpanel-applet-3.so +lib/libpanel-applet-3.so.0 +%%BONOBO%%libdata/pkgconfig/libpanelapplet-2.0.pc +libdata/pkgconfig/libpanelapplet-3.0.pc libexec/clock-applet -libexec/fish-applet-2 -libexec/gnome-clock-applet-mechanism +libexec/fish-applet libexec/gnome-panel-add libexec/notification-area-applet libexec/wnck-applet share/applications/gnome-panel.desktop -share/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service -share/gnome-2.0/ui/GNOME_ClockApplet.xml -share/gnome-2.0/ui/GNOME_FishApplet.xml -share/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml -share/gnome-2.0/ui/GNOME_Panel_Popup.xml -share/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml -share/gnome-2.0/ui/GNOME_WindowListApplet.xml -share/gnome-2.0/ui/GNOME_WindowMenuApplet.xml -share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml +share/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service +share/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service +share/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service +share/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service +%%BONOBO%%share/gnome-2.0/ui/GNOME_Panel_Popup.xml +share/gir-1.0/PanelApplet-3.0.gir +%%DATADIR%%/applets/org.gnome.panel.ClockApplet.panel-applet +%%DATADIR%%/applets/org.gnome.panel.FishApplet.panel-applet +%%DATADIR%%/applets/org.gnome.panel.NotificationAreaApplet.panel-applet +%%DATADIR%%/applets/org.gnome.panel.Wncklet.panel-applet %%DATADIR%%/ui/clock.ui +%%DATADIR%%/ui/clock-menu.xml %%DATADIR%%/ui/fish.ui +%%DATADIR%%/ui/fish-menu.xml +%%DATADIR%%/ui/notification-area-menu.xml +%%BONOBO%%%%DATADIR%%/ui/panel-test-applets-bonobo.ui %%DATADIR%%/ui/panel-properties-dialog.ui %%DATADIR%%/ui/panel-run-dialog.ui +%%DATADIR%%/ui/showdesktop-menu.xml %%DATADIR%%/ui/panel-test-applets.ui %%DATADIR%%/ui/window-list.ui +%%DATADIR%%/ui/window-list-menu.xml +%%DATADIR%%/ui/window-menu-menu.xml %%DATADIR%%/ui/workspace-switcher.ui +%%DATADIR%%/ui/workspace-switcher-menu.xml %%DATADIR%%/pixmaps/clock-calendar-icon.png %%DATADIR%%/pixmaps/clock-face-large.svg %%DATADIR%%/pixmaps/clock-face-small-day.svg @@ -61,7 +80,6 @@ share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml %%DATADIR%%/pixmaps/monkey.png %%DATADIR%%/pixmaps/oldwanda.png %%DATADIR%%/pixmaps/wanda.png -%%DATADIR%%/pixmaps/world_map-960.png share/gnome-panelrc share/gnome/help/clock/C/clock.xml share/gnome/help/clock/C/figures/clock_applet.png @@ -126,6 +144,9 @@ share/gnome/help/clock/pt_BR/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/sl/clock.xml +share/gnome/help/clock/sl/figures/clock_applet.png +share/gnome/help/clock/sl/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 @@ -180,6 +201,9 @@ share/gnome/help/fish/fr/legal.xml share/gnome/help/fish/it/figures/fish_applet.png share/gnome/help/fish/it/fish.xml share/gnome/help/fish/it/legal.xml +share/gnome/help/fish/ja/figures/fish_applet.png +share/gnome/help/fish/ja/fish.xml +share/gnome/help/fish/ja/legal.xml share/gnome/help/fish/ko/figures/fish_applet.png share/gnome/help/fish/ko/fish.xml share/gnome/help/fish/ko/legal.xml @@ -189,6 +213,9 @@ share/gnome/help/fish/oc/legal.xml share/gnome/help/fish/ru/figures/fish_applet.png share/gnome/help/fish/ru/fish.xml share/gnome/help/fish/ru/legal.xml +share/gnome/help/fish/sl/figures/fish_applet.png +share/gnome/help/fish/sl/fish.xml +share/gnome/help/fish/sl/legal.xml share/gnome/help/fish/sv/figures/fish_applet.png share/gnome/help/fish/sv/fish.xml share/gnome/help/fish/sv/legal.xml @@ -257,7 +284,7 @@ share/icons/hicolor/scalable/apps/gnome-panel-window-list.svg share/icons/hicolor/scalable/apps/gnome-panel-window-menu.svg share/icons/hicolor/scalable/apps/gnome-panel-workspace-switcher.svg share/icons/hicolor/scalable/apps/gnome-panel.svg -share/idl/gnome-panel-2.0/GNOME_Panel.idl +%%BONOBO%%share/idl/gnome-panel-2.0/GNOME_Panel.idl share/locale/af/LC_MESSAGES/gnome-panel-2.0.mo share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo @@ -291,9 +318,11 @@ share/locale/fa/LC_MESSAGES/gnome-panel-2.0.mo share/locale/fi/LC_MESSAGES/gnome-panel-2.0.mo share/locale/fr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/fur/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/fy/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo share/locale/gu/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/gv/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ha/LC_MESSAGES/gnome-panel-2.0.mo share/locale/he/LC_MESSAGES/gnome-panel-2.0.mo share/locale/hi/LC_MESSAGES/gnome-panel-2.0.mo @@ -306,6 +335,7 @@ share/locale/is/LC_MESSAGES/gnome-panel-2.0.mo share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ka/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/kk/LC_MESSAGES/gnome-panel-2.0.mo share/locale/kn/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ku/LC_MESSAGES/gnome-panel-2.0.mo @@ -350,6 +380,7 @@ share/locale/ta/LC_MESSAGES/gnome-panel-2.0.mo share/locale/te/LC_MESSAGES/gnome-panel-2.0.mo share/locale/th/LC_MESSAGES/gnome-panel-2.0.mo share/locale/tr/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/ug/LC_MESSAGES/gnome-panel-2.0.mo share/locale/uk/LC_MESSAGES/gnome-panel-2.0.mo share/locale/uz/LC_MESSAGES/gnome-panel-2.0.mo share/locale/uz@cyrillic/LC_MESSAGES/gnome-panel-2.0.mo @@ -383,6 +414,7 @@ share/omf/clock/clock-pa.omf share/omf/clock/clock-pt.omf share/omf/clock/clock-pt_BR.omf share/omf/clock/clock-ru.omf +share/omf/clock/clock-sl.omf share/omf/clock/clock-sr.omf share/omf/clock/clock-sv.omf share/omf/clock/clock-th.omf @@ -401,17 +433,18 @@ share/omf/fish/fish-eu.omf share/omf/fish/fish-fi.omf share/omf/fish/fish-fr.omf share/omf/fish/fish-it.omf +share/omf/fish/fish-ja.omf share/omf/fish/fish-ko.omf share/omf/fish/fish-oc.omf share/omf/fish/fish-ru.omf +share/omf/fish/fish-sl.omf share/omf/fish/fish-sv.omf share/omf/fish/fish-th.omf share/omf/fish/fish-uk.omf share/omf/fish/fish-zh_CN.omf -share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrm share/omf/fish @dirrm share/omf/clock -@dirrm share/idl/gnome-panel-2.0 +%%BONOBO%%@dirrm share/idl/gnome-panel-2.0 @dirrm share/gnome/help/fish/zh_CN/figures @dirrm share/gnome/help/fish/zh_CN @dirrm share/gnome/help/fish/uk/figures @@ -420,12 +453,16 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrm share/gnome/help/fish/th @dirrm share/gnome/help/fish/sv/figures @dirrm share/gnome/help/fish/sv +@dirrm share/gnome/help/fish/sl/figures +@dirrm share/gnome/help/fish/sl @dirrm share/gnome/help/fish/ru/figures @dirrm share/gnome/help/fish/ru @dirrm share/gnome/help/fish/oc/figures @dirrm share/gnome/help/fish/oc @dirrm share/gnome/help/fish/ko/figures @dirrm share/gnome/help/fish/ko +@dirrm share/gnome/help/fish/ja/figures +@dirrm share/gnome/help/fish/ja @dirrm share/gnome/help/fish/it/figures @dirrm share/gnome/help/fish/it @dirrm share/gnome/help/fish/fr/figures @@ -463,6 +500,8 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrm share/gnome/help/clock/sv @dirrm share/gnome/help/clock/sr/figures @dirrm share/gnome/help/clock/sr +@dirrm share/gnome/help/clock/sl/figures +@dirrm share/gnome/help/clock/sl @dirrm share/gnome/help/clock/ru/figures @dirrm share/gnome/help/clock/ru @dirrm share/gnome/help/clock/pt_BR/figures @@ -508,9 +547,14 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrm share/gnome/help/clock @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%%/ui +@dirrm %%DATADIR%%/applets @dirrm %%DATADIR%% @dirrmtry share/applications -@dirrm include/panel-2.0 +@dirrmtry lib/gnome-panel/modules +@dirrmtry lib/gnome-panel +@dirrm include/gnome-panel-3.0/libpanel-applet +@dirrm include/gnome-panel-3.0 +%%BONOBO%%@dirrm include/panel-2.0 @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -523,6 +567,8 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrmtry share/locale/xh @dirrmtry share/locale/uz@cyrillic/LC_MESSAGES @dirrmtry share/locale/uz@cyrillic +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @@ -555,12 +601,18 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/kk/LC_MESSAGES +@dirrmtry share/locale/kk @dirrmtry share/locale/ig/LC_MESSAGES @dirrmtry share/locale/ig @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy @dirrmtry share/locale/ha/LC_MESSAGES @dirrmtry share/locale/ha +@dirrmtry share/locale/gv/LC_MESSAGES +@dirrmtry share/locale/gv +@dirrmtry share/locale/fy/LC_MESSAGES +@dirrmtry share/locale/fy @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur @dirrmtry share/locale/en@shaw/LC_MESSAGES diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index 1e04e4206ef4..53db051654d3 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.118 2010/04/01 13:10:41 kwm Exp $ +# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.121 2010/09/30 19:51:41 kwm Exp $ # PORTNAME= gnome-screensaver -PORTVERSION= 2.30.0 -PORTREVISION= 2 +PORTVERSION= 2.30.2 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo index 5cf7179b9bdf..58e63346c711 100644 --- a/x11/gnome-screensaver/distinfo +++ b/x11/gnome-screensaver/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-screensaver-2.30.0.tar.bz2) = a18086bf2191795d87b7ea80b7b66daa -SHA256 (gnome2/gnome-screensaver-2.30.0.tar.bz2) = f653d3e4a872d435bce9d74ea8d14e54090c4c803521d5fe940e948c1dccc060 -SIZE (gnome2/gnome-screensaver-2.30.0.tar.bz2) = 4803639 +MD5 (gnome2/gnome-screensaver-2.30.2.tar.bz2) = 0fbe6e610e6847ac1e69d49b1e1f0582 +SHA256 (gnome2/gnome-screensaver-2.30.2.tar.bz2) = dd52ef278b23ec5abe5974548c2d576eeaeb5294c85e9f2efd6231ecc9ca09fa +SIZE (gnome2/gnome-screensaver-2.30.2.tar.bz2) = 4814653 diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist index 8922fb86e9be..4333ecdb345d 100644 --- a/x11/gnome-screensaver/pkg-plist +++ b/x11/gnome-screensaver/pkg-plist @@ -15,6 +15,7 @@ share/applications/screensavers/cosmos-slideshow.desktop share/applications/screensavers/footlogo-floaters.desktop share/applications/screensavers/personal-slideshow.desktop share/applications/screensavers/popsquares.desktop +share/dbus-1/services/org.gnome.ScreenSaver.service share/desktop-directories/gnome-screensaver.directory %%DATADIR%%/gnome-screensaver-preferences.ui %%DATADIR%%/lock-dialog-default.ui diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 2db2990f916e..bb2d8155f528 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -3,23 +3,20 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/x11/gnome-session/Makefile,v 1.6 2010/06/24 10:03:55 kwm Exp $ +# $MCom: ports/x11/gnome-session/Makefile,v 1.187 2010/11/17 12:00:11 kwm Exp $ # PORTNAME= gnome-session -PORTVERSION= 2.30.2 -PORTREVISION= 1 +PORTVERSION= 2.32.1 CATEGORIES= x11 gnome -MASTER_SITES= GNOME \ - http://www.marcuscom.com/downloads/:local -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - ${SPLASHES}:local +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= gnome@FreeBSD.org COMMENT= Session component for the GNOME 2 desktop +CONFLICTS= gnome-session-2.31.* gnome-session-2.90.* gnome-session-3.* + BUILD_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \ @@ -33,7 +30,7 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gno INSTALLS_ICONS= yes USE_GETTEXT= yes USE_BZIP2= yes -USE_XORG= ice sm xau xext xrandr +USE_XORG= ice sm xau xrandr USE_GNOME= gnomeprefix gnomehack intlhack gconf2 GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes @@ -47,19 +44,4 @@ MAN1= gnome-session.1 gnome-wm.1 gnome-session-properties.1 \ gnome-session-save.1 GCONF_SCHEMAS= gnome-session.schemas -SPLASHES= freebsd-splashes-gnome-2.18_1.tar - -post-extract: - cd ${WRKDIR} && ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES} - -post-install: - ${INSTALL_DATA} ${WRKSRC}/data/gnome-splash.png \ - ${PREFIX}/share/pixmaps/splash/original-gnome-splash.png -# ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \ -# ${PREFIX}/share/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 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/pixmaps/splash -.endfor - .include <bsd.port.mk> diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index cf107957e7e9..6ad5a364611b 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,6 +1,2 @@ -MD5 (gnome2/gnome-session-2.30.2.tar.bz2) = d93a2da931ac0b9c0d98f6b68a17a730 -SHA256 (gnome2/gnome-session-2.30.2.tar.bz2) = ea7b5d8b254eba0f4ee5f737ed3686fca4fa734ad54a20f206534241f6aef4ec -SIZE (gnome2/gnome-session-2.30.2.tar.bz2) = 817580 -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 +SHA256 (gnome2/gnome-session-2.32.1.tar.bz2) = 22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a +SIZE (gnome2/gnome-session-2.32.1.tar.bz2) = 774842 diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist index cff118134b1e..bacb06aac336 100644 --- a/x11/gnome-session/pkg-plist +++ b/x11/gnome-session/pkg-plist @@ -2,10 +2,6 @@ bin/gnome-session bin/gnome-session-properties bin/gnome-session-save bin/gnome-wm -etc/xdg/autostart/gnome-session-splash.desktop -etc/xdg/autostart/gnome-settings-daemon-helper.desktop -libexec/gnome-session/helpers/gnome-session-splash -libexec/gnome-session/helpers/gnome-settings-daemon-helper share/applications/session-properties.desktop %%DATADIR%%/gsm-inhibit-dialog.ui %%DATADIR%%/session-properties.ui @@ -48,6 +44,7 @@ share/locale/fa/LC_MESSAGES/gnome-session-2.0.mo share/locale/fi/LC_MESSAGES/gnome-session-2.0.mo share/locale/fr/LC_MESSAGES/gnome-session-2.0.mo share/locale/fur/LC_MESSAGES/gnome-session-2.0.mo +share/locale/fy/LC_MESSAGES/gnome-session-2.0.mo share/locale/ga/LC_MESSAGES/gnome-session-2.0.mo share/locale/gl/LC_MESSAGES/gnome-session-2.0.mo share/locale/gu/LC_MESSAGES/gnome-session-2.0.mo @@ -101,6 +98,7 @@ share/locale/sr@latin/LC_MESSAGES/gnome-session-2.0.mo share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo share/locale/te/LC_MESSAGES/gnome-session-2.0.mo +share/locale/ug/LC_MESSAGES/gnome-session-2.0.mo share/locale/th/LC_MESSAGES/gnome-session-2.0.mo share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo @@ -115,33 +113,10 @@ share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_HK/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo -share/pixmaps/splash/MaMBaNgGaoX-2.12.png -share/pixmaps/splash/adamw-bat-2.18.jpg -share/pixmaps/splash/adamw-conky-2.18.png -share/pixmaps/splash/adamw-cow-2.18.png -share/pixmaps/splash/adamw-mouth-2.18.png -share/pixmaps/splash/adamw-piggy-2.12.png -share/pixmaps/splash/adamw-swing-2.18.png -share/pixmaps/splash/adamw-trophy-2.12.png -share/pixmaps/splash/andreas-slogan-2.12.png -share/pixmaps/splash/andreas-splash-2.12.png -share/pixmaps/splash/domix-splash-2.12.png -share/pixmaps/splash/domix-splash2-2.12.png -share/pixmaps/splash/franz-splash_218.png -share/pixmaps/splash/gnome-splash.png -share/pixmaps/splash/mumija-2.12.png -share/pixmaps/splash/mumija2-2.12.png -share/pixmaps/splash/mumija3-2.12.png -share/pixmaps/splash/original-gnome-splash.png -share/pixmaps/splash/tremulant-2.12.png -share/pixmaps/splash/tremulant-blood-2.12.png -share/pixmaps/splash/tremulant-brushed-metal-2.12.png share/xsessions/gnome.desktop @dirrmtry share/xsessions @dirrm %%DATADIR%% @dirrmtry share/applications -@dirrm libexec/gnome-session/helpers -@dirrm libexec/gnome-session @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -152,6 +127,8 @@ share/xsessions/gnome.desktop @dirrmtry share/locale/xh @dirrmtry share/locale/uz@cyrillic/LC_MESSAGES @dirrmtry share/locale/uz@cyrillic +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @@ -184,6 +161,8 @@ share/xsessions/gnome.desktop @dirrmtry share/locale/hy @dirrmtry share/locale/ha/LC_MESSAGES @dirrmtry share/locale/ha +@dirrmtry share/locale/fy/LC_MESSAGES +@dirrmtry share/locale/fy @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur @dirrmtry share/locale/en@shaw/LC_MESSAGES diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile index 5537d50e4303..7ecc0b0985bd 100644 --- a/x11/gnome-shell/Makefile +++ b/x11/gnome-shell/Makefile @@ -3,13 +3,13 @@ # Whom: Pawel Worach <pawel.worach@gmail.com> # # $FreeBSD$ -# $MCom: ports/x11/gnome-shell/Makefile,v 1.11 2010/03/29 11:42:11 kwm Exp $ +# $MCom: ports/x11/gnome-shell/Makefile,v 1.16 2010/11/20 15:05:25 kwm Exp $ # PORTNAME= gnome-shell -PORTVERSION= 2.29.1 +PORTVERSION= 2.31.2 PORTREVISION= 1 -CATEGORIES= x11 +CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -23,6 +23,8 @@ LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification \ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \ glxinfo:${PORTSDIR}/graphics/mesa-demos +BROKEN= Doesn't build + USE_BZIP2= yes USE_XORG= x11 xfixes sm USE_GETTEXT= yes diff --git a/x11/gnome-shell/distinfo b/x11/gnome-shell/distinfo index 088b45374d71..f32fae96ea7f 100644 --- a/x11/gnome-shell/distinfo +++ b/x11/gnome-shell/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-shell-2.29.1.tar.bz2) = dc98591ba7fe8acb92292bc0b2f9d246 -SHA256 (gnome2/gnome-shell-2.29.1.tar.bz2) = 710b863c0beea45543f8057d31b028ec85e19efeedda2b964d784d6fc1729c0b -SIZE (gnome2/gnome-shell-2.29.1.tar.bz2) = 669050 +MD5 (gnome2/gnome-shell-2.31.2.tar.bz2) = 42f593eddbe3dcc2552f8ac2ca3748b6 +SHA256 (gnome2/gnome-shell-2.31.2.tar.bz2) = cf16167cf2354f57431125b38a7b3de424c3c9d3d44627c52ee4596694ee80f2 +SIZE (gnome2/gnome-shell-2.31.2.tar.bz2) = 692948 diff --git a/x11/gnome-shell/files/patch-src_Makefile.in b/x11/gnome-shell/files/patch-src_Makefile.in deleted file mode 100644 index 592ea873a8f7..000000000000 --- a/x11/gnome-shell/files/patch-src_Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ ---- src/Makefile.in.orig 2009-08-29 12:13:13.000000000 +0200 -+++ src/Makefile.in 2009-08-29 12:13:25.000000000 +0200 -@@ -492,7 +492,6 @@ libtray_la_CPPFLAGS = $(tray_cflags) - libtray_la_LDFLAGS = $(LDADD) - gnome_shell_cflags = \ - $(MUTTER_PLUGIN_CFLAGS) \ -- $(LIBGNOMEUI_CFLAGS) \ - -I$(srcdir)/tray \ - -DGETTEXT_PACKAGE=\"gnome-shell\" \ - -DLOCALEDIR=\"$(datadir)/locale\" \ -@@ -548,7 +547,6 @@ libgnome_shell_la_gir_sources = \ - libgnome_shell_la_LDFLAGS = -avoid-version -module - libgnome_shell_la_LIBADD = \ - $(MUTTER_PLUGIN_LIBS) \ -- $(LIBGNOMEUI_LIBS) \ - libbig-1.0.la \ - libgdmuser-1.0.la \ - libtray.la diff --git a/x11/gnome-shell/files/patch-src_gnome-shell-plugin.c b/x11/gnome-shell/files/patch-src_gnome-shell-plugin.c new file mode 100644 index 000000000000..90359fa33e6d --- /dev/null +++ b/x11/gnome-shell/files/patch-src_gnome-shell-plugin.c @@ -0,0 +1,26 @@ +--- src/gnome-shell-plugin.c.orig 2010-06-06 22:53:13.000000000 +0200 ++++ src/gnome-shell-plugin.c 2010-06-06 22:56:03.000000000 +0200 +@@ -38,7 +38,6 @@ + #include <gjs/gjs.h> + #include <girepository.h> + #include <gmodule.h> +-#include <malloc.h> + #include <stdlib.h> + #include <string.h> + +@@ -238,6 +237,7 @@ + malloc_statistics_callback (ShellPerfLog *perf_log, + gpointer data) + { ++#if defined(__linux__) + struct mallinfo info = mallinfo (); + + shell_perf_log_update_statistic_i (perf_log, +@@ -249,6 +249,7 @@ + shell_perf_log_update_statistic_i (perf_log, + "malloc.usedSize", + info.uordblks); ++#endif + } + + static void diff --git a/x11/gnome-shell/pkg-plist b/x11/gnome-shell/pkg-plist index 32918573d672..4d53b86016de 100644 --- a/x11/gnome-shell/pkg-plist +++ b/x11/gnome-shell/pkg-plist @@ -1,5 +1,5 @@ bin/gnome-shell -lib/gnome-shell/Big-1.0.typelib +bin/gnome-shell-clock-preferences lib/gnome-shell/Gdm-1.0.typelib lib/gnome-shell/Shell-0.1.typelib lib/gnome-shell/St-1.0.typelib @@ -7,14 +7,21 @@ lib/mutter/plugins/libgnome-shell.a lib/mutter/plugins/libgnome-shell.la lib/mutter/plugins/libgnome-shell.so share/applications/gnome-shell.desktop +share/applications/gnome-shell-clock-preferences.desktop +%%DATADIR%%/clock-preferences.ui %%DATADIR%%/images/close-black.svg %%DATADIR%%/images/magnifier.svg %%DATADIR%%/js/misc/docInfo.js %%DATADIR%%/js/misc/format.js +%%DATADIR%%/js/misc/gnomeSession.js %%DATADIR%%/js/misc/params.js +%%DATADIR%%/js/misc/telepathy.js +%%DATADIR%%/js/perf/core.js +%%DATADIR%%/js/prefs/clockPreferences.js %%DATADIR%%/js/ui/altTab.js %%DATADIR%%/js/ui/appDisplay.js %%DATADIR%%/js/ui/appFavorites.js +%%DATADIR%%/js/ui/boxpointer.js %%DATADIR%%/js/ui/calendar.js %%DATADIR%%/js/ui/chrome.js %%DATADIR%%/js/ui/dash.js @@ -26,6 +33,8 @@ share/applications/gnome-shell.desktop %%DATADIR%%/js/ui/lightbox.js %%DATADIR%%/js/ui/link.js %%DATADIR%%/js/ui/lookingGlass.js +%%DATADIR%%/js/ui/magnifier.js +%%DATADIR%%/js/ui/magnifierDBus.js %%DATADIR%%/js/ui/main.js %%DATADIR%%/js/ui/messageTray.js %%DATADIR%%/js/ui/notificationDaemon.js @@ -33,13 +42,12 @@ share/applications/gnome-shell.desktop %%DATADIR%%/js/ui/placeDisplay.js %%DATADIR%%/js/ui/panel.js %%DATADIR%%/js/ui/runDialog.js +%%DATADIR%%/js/ui/scripting.js %%DATADIR%%/js/ui/search.js %%DATADIR%%/js/ui/shellDBus.js %%DATADIR%%/js/ui/statusMenu.js -%%DATADIR%%/js/ui/sidebar.js +%%DATADIR%%/js/ui/telepathyClient.js %%DATADIR%%/js/ui/tweener.js -%%DATADIR%%/js/ui/widget.js -%%DATADIR%%/js/ui/widgetBox.js %%DATADIR%%/js/ui/windowAttentionHandler.js %%DATADIR%%/js/ui/windowManager.js %%DATADIR%%/js/ui/workspace.js @@ -97,10 +105,13 @@ share/locale/sr/LC_MESSAGES/gnome-shell.mo share/locale/sr@latin/LC_MESSAGES/gnome-shell.mo share/locale/sv/LC_MESSAGES/gnome-shell.mo share/locale/tr/LC_MESSAGES/gnome-shell.mo +share/locale/uk/LC_MESSAGES/gnome-shell.mo share/locale/vi/LC_MESSAGES/gnome-shell.mo share/locale/zh_CN/LC_MESSAGES/gnome-shell.mo @dirrm %%DATADIR%%/theme @dirrm %%DATADIR%%/js/ui +@dirrm %%DATADIR%%/js/prefs +@dirrm %%DATADIR%%/js/perf @dirrm %%DATADIR%%/js/misc @dirrm %%DATADIR%%/js @dirrm %%DATADIR%%/images diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index 16e39bc24606..f50fa6f59c4c 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/x11/gnome-terminal/Makefile,v 1.5 2010/06/23 15:06:11 kwm Exp $ +# $MCom: ports/x11/gnome-terminal/Makefile,v 1.137 2010/11/13 13:25:22 kwm Exp $ # PORTNAME= gnome-terminal -PORTVERSION= 2.30.2 +PORTVERSION= 2.32.1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -30,7 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GCONF_SCHEMAS= gnome-terminal.schemas -post-configure: - @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f +post-patch: + ${FIND} ${WRKSRC} -type f -exec ${TOUCH} -f {} \; .include <bsd.port.mk> diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo index 8312385db372..0c439fb39077 100644 --- a/x11/gnome-terminal/distinfo +++ b/x11/gnome-terminal/distinfo @@ -1,3 +1,2 @@ -MD5 (gnome2/gnome-terminal-2.30.2.tar.bz2) = 74c4528f00067072c2bd867d1f8fe844 -SHA256 (gnome2/gnome-terminal-2.30.2.tar.bz2) = 2c7af2250698b9f9f53c6eaa93211c1118cf2c7e29cbbacfd1e8a6a10069e07a -SIZE (gnome2/gnome-terminal-2.30.2.tar.bz2) = 2250070 +SHA256 (gnome2/gnome-terminal-2.32.1.tar.bz2) = 7f41e4b185a2cf65ff417b89e429fc3b625c5e3f042ee1763bda6490fa4676fb +SIZE (gnome2/gnome-terminal-2.32.1.tar.bz2) = 2319315 diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist index 04dd19834a12..ec21cc0a5953 100644 --- a/x11/gnome-terminal/pkg-plist +++ b/x11/gnome-terminal/pkg-plist @@ -1,6 +1,7 @@ bin/gnome-terminal share/applications/gnome-terminal.desktop %%DATADIR%%/encodings-dialog.ui +%%DATADIR%%/find-dialog.ui %%DATADIR%%/keybinding-editor.ui %%DATADIR%%/profile-manager.ui %%DATADIR%%/profile-new-dialog.ui @@ -98,6 +99,7 @@ share/locale/dz/LC_MESSAGES/gnome-terminal.mo share/locale/el/LC_MESSAGES/gnome-terminal.mo share/locale/en_CA/LC_MESSAGES/gnome-terminal.mo share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo +share/locale/eo/LC_MESSAGES/gnome-terminal.mo share/locale/es/LC_MESSAGES/gnome-terminal.mo share/locale/et/LC_MESSAGES/gnome-terminal.mo share/locale/en@shaw/LC_MESSAGES/gnome-terminal.mo @@ -118,6 +120,7 @@ share/locale/id/LC_MESSAGES/gnome-terminal.mo share/locale/it/LC_MESSAGES/gnome-terminal.mo share/locale/ja/LC_MESSAGES/gnome-terminal.mo share/locale/ka/LC_MESSAGES/gnome-terminal.mo +share/locale/kk/LC_MESSAGES/gnome-terminal.mo share/locale/kn/LC_MESSAGES/gnome-terminal.mo share/locale/ko/LC_MESSAGES/gnome-terminal.mo share/locale/ku/LC_MESSAGES/gnome-terminal.mo @@ -156,6 +159,7 @@ share/locale/ta/LC_MESSAGES/gnome-terminal.mo share/locale/te/LC_MESSAGES/gnome-terminal.mo share/locale/th/LC_MESSAGES/gnome-terminal.mo share/locale/tr/LC_MESSAGES/gnome-terminal.mo +share/locale/ug/LC_MESSAGES/gnome-terminal.mo share/locale/uk/LC_MESSAGES/gnome-terminal.mo share/locale/vi/LC_MESSAGES/gnome-terminal.mo share/locale/wa/LC_MESSAGES/gnome-terminal.mo @@ -234,6 +238,8 @@ share/omf/gnome-terminal/gnome-terminal-zh_TW.omf @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @@ -256,6 +262,8 @@ share/omf/gnome-terminal/gnome-terminal-zh_TW.omf @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/kk/LC_MESSAGES +@dirrmtry share/locale/kk @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy @dirrmtry share/locale/fur/LC_MESSAGES diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index 24f846db9ced..be378b84d7a1 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/x11/gnome2/Makefile,v 1.9 2010/06/24 12:38:52 kwm Exp $ +# $MCom: ports/x11/gnome2/Makefile,v 1.300 2010/11/18 01:37:46 kwm Exp $ # PORTNAME= gnome2 -PORTVERSION= 2.30.2 +PORTVERSION= 2.32.1 PORTREVISION?= 0 CATEGORIES?= x11 gnome MASTER_SITES= # empty @@ -32,7 +32,6 @@ RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple ${LOCALBASE}/sbin/gdm:${PORTSDIR}/x11/gdm \ ${LOCALBASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \ ${LOCALBASE}/share/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \ - ${LOCALBASE}/libdata/pkgconfig/libgail-gnome.pc:${PORTSDIR}/x11-toolkits/libgail-gnome \ file-roller:${PORTSDIR}/archivers/file-roller \ ${LOCALBASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \ gok:${PORTSDIR}/accessibility/gok \ @@ -44,7 +43,7 @@ RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple ${LOCALBASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \ network-admin:${PORTSDIR}/sysutils/gnome-system-tools \ vino-passwd:${PORTSDIR}/net/vino \ - exchange-connector-setup-2.30:${PORTSDIR}/mail/evolution-exchange \ + exchange-connector-setup-2.32:${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 \ @@ -93,7 +92,7 @@ RUN_DEPENDS+= empathy:${PORTSDIR}/net-im/empathy \ gnome-file-share-properties:${PORTSDIR}/www/gnome-user-share \ ${LOCALBASE}/libexec/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \ ${LOCALBASE}/lib/hamster-applet/hamster-applet:${PORTSDIR}/deskutils/hamster-applet \ - ${LOCALBASE}/lib/gtk-2.0/modules/at-spi-dbus/modules/libatk-bridge.so:${PORTSDIR}/accessibility/at-spi2-atk \ + ${LOCALBASE}/lib/gtk-2.0/modules/libatk-bridge.so:${PORTSDIR}/accessibility/at-spi \ gpk-application:${PORTSDIR}/ports-mgmt/gnome-packagekit .if ${OSVERSION}>=800000 RUN_DEPENDS+= cheese:${PORTSDIR}/multimedia/cheese diff --git a/x11/gtkchtheme/files/patch-Makefile b/x11/gtkchtheme/files/patch-Makefile new file mode 100644 index 000000000000..e5078502d48e --- /dev/null +++ b/x11/gtkchtheme/files/patch-Makefile @@ -0,0 +1,11 @@ +--- Makefile.orig 2010-10-31 11:27:20.000000000 +0100 ++++ Makefile 2010-10-31 11:27:35.000000000 +0100 +@@ -4,7 +4,7 @@ CFLAGS := $(if $(RPM_OPT_FLAGS), $(RPM_O + + LDFLAGS = $(shell pkg-config --libs gtk+-2.0) + CFLAGS += -Wall +-CFLAGS += $(shell pkg-config --cflags gtk+-2.0) -DGTK_DISABLE_BROKEN -DGTK_DISABLE_DEPRECATED ++CFLAGS += $(shell pkg-config --cflags gtk+-2.0) -DGTK_DISABLE_BROKEN + CFLAGS += -DPROJNAME='"$(PROJNAME)"' -DVERSION='"$(VERSION)"' + CPPFLAGS = + CXXFLAGS = diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 9020210e9d39..b1d8c41e0503 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -3,12 +3,12 @@ # Whom: Yukihiro Nakai <Nakai@technologist.com> # # $FreeBSD$ -# $MCom: ports/x11/libgnome/Makefile,v 1.131 2010/04/01 14:49:19 kwm Exp $ +# $MCom: ports/x11/libgnome/Makefile,v 1.135 2010/09/27 20:06:45 kwm Exp $ # PORTNAME= libgnome -PORTVERSION= 2.30.0 -PORTREVISION?= 1 +PORTVERSION= 2.32.0 +PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -21,6 +21,7 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian +LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian USE_GETTEXT= yes diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo index 25b5f11516c0..b7349b379240 100644 --- a/x11/libgnome/distinfo +++ b/x11/libgnome/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnome-2.30.0.tar.bz2) = 1f85adc40b242b953c0e96ad017c2616 -SHA256 (gnome2/libgnome-2.30.0.tar.bz2) = 3ed932b94f16614cb03c7661f39b574845970c6ce3ca46e46338409283856f1f -SIZE (gnome2/libgnome-2.30.0.tar.bz2) = 1736034 +MD5 (gnome2/libgnome-2.32.0.tar.bz2) = b27a0c61918fad8492d84b407a72bd7c +SHA256 (gnome2/libgnome-2.32.0.tar.bz2) = d65e49bf075eb2b3efebec38ceb409693154d18396365765da1a71630bc3dd02 +SIZE (gnome2/libgnome-2.32.0.tar.bz2) = 1731179 diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in index ef1c2e727f69..9b21e3ab66ab 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.26 2010/04/02 21:50:07 kwm Exp $ +# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.29 2010/09/28 15:55:50 kwm Exp $ # # Restore gconf keys of gnomevfs2. diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index 8acd7b31795d..a1f0d36255c2 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -69,6 +69,7 @@ share/locale/is/LC_MESSAGES/libgnome-2.0.mo share/locale/it/LC_MESSAGES/libgnome-2.0.mo share/locale/ja/LC_MESSAGES/libgnome-2.0.mo share/locale/ka/LC_MESSAGES/libgnome-2.0.mo +share/locale/kk/LC_MESSAGES/libgnome-2.0.mo share/locale/kn/LC_MESSAGES/libgnome-2.0.mo share/locale/ko/LC_MESSAGES/libgnome-2.0.mo share/locale/ku/LC_MESSAGES/libgnome-2.0.mo @@ -152,6 +153,8 @@ share/pixmaps/backgrounds/gnome/background-default.jpg @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/kk/LC_MESSAGES +@dirrmtry share/locale/kk @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur @dirrmtry share/locale/en@shaw/LC_MESSAGES diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile index 786e98354497..58c0f58a5cb2 100644 --- a/x11/libgnomekbd/Makefile +++ b/x11/libgnomekbd/Makefile @@ -3,11 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/x11/libgnomekbd/Makefile,v 1.1 2010/06/23 21:37:12 kwm Exp $ +# $MCom: ports/x11/libgnomekbd/Makefile,v 1.48 2010/09/28 08:01:11 kwm Exp $ # PORTNAME= libgnomekbd -PORTVERSION= 2.30.2 +PORTVERSION= 2.32.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -29,8 +29,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GCONF_SCHEMAS= desktop_gnome_peripherals_keyboard_xkb.schemas -post-patch: - @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ - 's|-Werror||g' +#post-patch: +# @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ +# 's|-Werror||g' .include <bsd.port.mk> diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo index 75e3e64135d1..7868e298bf9f 100644 --- a/x11/libgnomekbd/distinfo +++ b/x11/libgnomekbd/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomekbd-2.30.2.tar.bz2) = 2fe73ebfd40801655e0aa3f85cefa873 -SHA256 (gnome2/libgnomekbd-2.30.2.tar.bz2) = 3270d8470f5bd4d7e867f22330180a4429ae0f1d685db0bfa4c126699309e1a6 -SIZE (gnome2/libgnomekbd-2.30.2.tar.bz2) = 405388 +MD5 (gnome2/libgnomekbd-2.32.0.tar.bz2) = de32a6e3e3464b566eecdc4332bf34bd +SHA256 (gnome2/libgnomekbd-2.32.0.tar.bz2) = ddd52c4cc7d83ad7ef964a1bcb4db87407e65b00ffc3e70c088ca4ee7383d256 +SIZE (gnome2/libgnomekbd-2.32.0.tar.bz2) = 410928 diff --git a/x11/libgnomekbd/pkg-plist b/x11/libgnomekbd/pkg-plist index 0225e40bef24..35a4af6da56e 100644 --- a/x11/libgnomekbd/pkg-plist +++ b/x11/libgnomekbd/pkg-plist @@ -20,6 +20,7 @@ libdata/pkgconfig/libgnomekbdui.pc share/applications/gkbd-indicator-plugins-capplet.desktop %%DATADIR%%/ui/gkbd-indicator-plugins.ui %%DATADIR%%/ui/gkbd-indicator-plugins_add.ui +%%DATADIR%%/ui/show-layout.ui share/locale/ar/LC_MESSAGES/libgnomekbd.mo share/locale/as/LC_MESSAGES/libgnomekbd.mo share/locale/ast/LC_MESSAGES/libgnomekbd.mo @@ -36,6 +37,7 @@ share/locale/dz/LC_MESSAGES/libgnomekbd.mo share/locale/el/LC_MESSAGES/libgnomekbd.mo share/locale/en_GB/LC_MESSAGES/libgnomekbd.mo share/locale/en@shaw/LC_MESSAGES/libgnomekbd.mo +share/locale/eo/LC_MESSAGES/libgnomekbd.mo share/locale/es/LC_MESSAGES/libgnomekbd.mo share/locale/et/LC_MESSAGES/libgnomekbd.mo share/locale/eu/LC_MESSAGES/libgnomekbd.mo @@ -47,6 +49,7 @@ share/locale/gu/LC_MESSAGES/libgnomekbd.mo share/locale/he/LC_MESSAGES/libgnomekbd.mo share/locale/hi/LC_MESSAGES/libgnomekbd.mo share/locale/hu/LC_MESSAGES/libgnomekbd.mo +share/locale/id/LC_MESSAGES/libgnomekbd.mo share/locale/it/LC_MESSAGES/libgnomekbd.mo share/locale/ja/LC_MESSAGES/libgnomekbd.mo share/locale/ka/LC_MESSAGES/libgnomekbd.mo @@ -58,6 +61,7 @@ share/locale/mai/LC_MESSAGES/libgnomekbd.mo share/locale/mk/LC_MESSAGES/libgnomekbd.mo share/locale/ml/LC_MESSAGES/libgnomekbd.mo share/locale/mr/LC_MESSAGES/libgnomekbd.mo +share/locale/ms/LC_MESSAGES/libgnomekbd.mo share/locale/nb/LC_MESSAGES/libgnomekbd.mo share/locale/nl/LC_MESSAGES/libgnomekbd.mo share/locale/nn/LC_MESSAGES/libgnomekbd.mo diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile index d66a541af416..3ca5225067ad 100644 --- a/x11/startup-notification/Makefile +++ b/x11/startup-notification/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/startup-notification/Makefile,v 1.8 2006/09/10 00:51:15 mezz Exp $ +# $MCom: ports/x11/startup-notification/Makefile,v 1.10 2010/07/21 18:04:43 mezz Exp $ # PORTNAME= startup-notification PORTVERSION= 0.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= http://www.freedesktop.org/software/startup-notification/releases/ DIST_SUBDIR= gnome2 @@ -18,13 +18,14 @@ COMMENT= Library that supports startup notification spec from freedesktop.org LIB_DEPENDS= xcb-aux.0:${PORTSDIR}/x11/xcb-util -USE_XORG= x11 ice sm +USE_XORG= x11 USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes -USE_GNOME= gnomehack gnometarget pkgconfig +USE_GNOME= gnomehack gnometarget pkgconfig ltasneededhack GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS+=ac_cv_lib_ICE_IceConnectionNumber=no .include <bsd.port.mk> diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile index bbd19f347fb2..df720e976ec5 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -3,12 +3,12 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/yelp/Makefile,v 1.154 2010/04/27 13:32:17 kwm Exp $ +# $MCom: ports/x11/yelp/Makefile,v 1.164 2010/10/18 13:37:34 kwm Exp $ # PORTNAME= yelp -PORTVERSION= 2.30.1 -PORTREVISION= 2 +PORTVERSION= 2.30.2 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,6 +20,8 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ startup-notification-1.0:${PORTSDIR}/x11/startup-notification \ rarian.0:${PORTSDIR}/textproc/rarian +CONFLICTS= yelp-2.31.* + USE_GECKO= libxul USE_GETTEXT= yes USE_BZIP2= yes diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo index ef7c6f151f27..0d552a50699d 100644 --- a/x11/yelp/distinfo +++ b/x11/yelp/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/yelp-2.30.1.tar.bz2) = afd638cdaea1fcb9821ece88b819a022 -SHA256 (gnome2/yelp-2.30.1.tar.bz2) = 4b453e994f8e57bc5c4637dba2c315536f30e90741b74b0bee218cbb436eb20c -SIZE (gnome2/yelp-2.30.1.tar.bz2) = 1139961 +MD5 (gnome2/yelp-2.30.2.tar.bz2) = d745dafd0c134e726511894621d9b050 +SHA256 (gnome2/yelp-2.30.2.tar.bz2) = 5f8c35847bdae654e21cbba66865d6b582d9fc80a059ad29081bb87e146bb165 +SIZE (gnome2/yelp-2.30.2.tar.bz2) = 1159521 diff --git a/x11/yelp/files/patch-src_yelp-window.c b/x11/yelp/files/patch-src_yelp-window.c new file mode 100644 index 000000000000..37acdfcc501a --- /dev/null +++ b/x11/yelp/files/patch-src_yelp-window.c @@ -0,0 +1,37 @@ +--- src/yelp-window.c.orig 2010-10-16 23:06:05.000000000 +0400 ++++ src/yelp-window.c 2010-10-17 03:58:57.000000000 +0400 +@@ -1555,28 +1555,26 @@ + + gtk_label_set_mnemonic_widget (GTK_LABEL (label), priv->find_entry); + +- box = gtk_hbox_new (FALSE, 0); + arrow = gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_NONE); + label = gtk_label_new_with_mnemonic (_("Find _Previous")); +- gtk_box_pack_start (GTK_BOX (box), arrow, FALSE, FALSE, 0); +- gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); +- priv->find_prev = gtk_tool_button_new (box, NULL); ++ priv->find_prev = gtk_tool_button_new (arrow, NULL); ++ gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (priv->find_prev), label); + g_signal_connect (priv->find_prev, + "clicked", + G_CALLBACK (window_find_clicked_cb), + window); ++ gtk_tool_item_set_is_important (priv->find_prev, TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (find_bar), priv->find_prev, -1); + +- box = gtk_hbox_new (FALSE, 0); + arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE); + label = gtk_label_new_with_mnemonic (_("Find _Next")); +- gtk_box_pack_start (GTK_BOX (box), arrow, FALSE, FALSE, 0); +- gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); +- priv->find_next = gtk_tool_button_new (box, NULL); ++ priv->find_next = gtk_tool_button_new (arrow, NULL); ++ gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (priv->find_next), label); + g_signal_connect (priv->find_next, + "clicked", + G_CALLBACK (window_find_clicked_cb), + window); ++ gtk_tool_item_set_is_important (priv->find_next, TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (find_bar), priv->find_next, -1); + + priv->find_sep = gtk_separator_tool_item_new (); diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist index 903c7d3c5d98..4321292b2453 100644 --- a/x11/yelp/pkg-plist +++ b/x11/yelp/pkg-plist @@ -47,6 +47,7 @@ share/locale/is/LC_MESSAGES/yelp.mo share/locale/it/LC_MESSAGES/yelp.mo share/locale/ja/LC_MESSAGES/yelp.mo share/locale/ka/LC_MESSAGES/yelp.mo +share/locale/kk/LC_MESSAGES/yelp.mo share/locale/kn/LC_MESSAGES/yelp.mo share/locale/ko/LC_MESSAGES/yelp.mo share/locale/ks/LC_MESSAGES/yelp.mo @@ -178,6 +179,8 @@ share/locale/zu/LC_MESSAGES/yelp.mo @dirrmtry share/locale/ku @dirrmtry share/locale/ks/LC_MESSAGES @dirrmtry share/locale/ks +@dirrmtry share/locale/kk/LC_MESSAGES +@dirrmtry share/locale/kk @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur @dirrmtry share/locale/en@shaw/LC_MESSAGES diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index 58d35aa1f4a9..aae55592f2bc 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -3,12 +3,11 @@ # Whom: Franz Klammer <klammer@webonaut.com> # # $FreeBSD$ -# $MCom: ports/x11/zenity/Makefile,v 1.104 2010/03/29 03:35:02 avl Exp $ +# $MCom: ports/x11/zenity/Makefile,v 1.111 2010/11/16 10:25:21 kwm Exp $ # PORTNAME= zenity -PORTVERSION= 2.30.0 -PORTREVISION= 1 +PORTVERSION= 2.32.1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo index c04f3737c50f..5457446a907d 100644 --- a/x11/zenity/distinfo +++ b/x11/zenity/distinfo @@ -1,3 +1,2 @@ -MD5 (gnome2/zenity-2.30.0.tar.bz2) = 15ba2f27d5e1a79c996e5e53e16f4380 -SHA256 (gnome2/zenity-2.30.0.tar.bz2) = d42a9be6f77eb018fb8c5967094db86604271f342dd15b6e6101338d82f923ff -SIZE (gnome2/zenity-2.30.0.tar.bz2) = 3095111 +SHA256 (gnome2/zenity-2.32.1.tar.bz2) = 8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac +SIZE (gnome2/zenity-2.32.1.tar.bz2) = 3128666 diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist index 5678c826ec1c..96e303ee51db 100644 --- a/x11/zenity/pkg-plist +++ b/x11/zenity/pkg-plist @@ -193,6 +193,18 @@ share/gnome/help/zenity/uk/figures/zenity-question-screenshot.png share/gnome/help/zenity/uk/figures/zenity-text-screenshot.png share/gnome/help/zenity/uk/figures/zenity-warning-screenshot.png share/gnome/help/zenity/uk/zenity.xml +share/gnome/help/zenity/zh_CN/figures/zenity-calendar-screenshot.png +share/gnome/help/zenity/zh_CN/figures/zenity-entry-screenshot.png +share/gnome/help/zenity/zh_CN/figures/zenity-error-screenshot.png +share/gnome/help/zenity/zh_CN/figures/zenity-fileselection-screenshot.png +share/gnome/help/zenity/zh_CN/figures/zenity-information-screenshot.png +share/gnome/help/zenity/zh_CN/figures/zenity-list-screenshot.png +share/gnome/help/zenity/zh_CN/figures/zenity-notification-screenshot.png +share/gnome/help/zenity/zh_CN/figures/zenity-progress-screenshot.png +share/gnome/help/zenity/zh_CN/figures/zenity-question-screenshot.png +share/gnome/help/zenity/zh_CN/figures/zenity-text-screenshot.png +share/gnome/help/zenity/zh_CN/figures/zenity-warning-screenshot.png +share/gnome/help/zenity/zh_CN/zenity.xml share/locale/am/LC_MESSAGES/zenity.mo share/locale/ar/LC_MESSAGES/zenity.mo share/locale/as/LC_MESSAGES/zenity.mo @@ -294,6 +306,7 @@ share/omf/zenity/zenity-pt_BR.omf share/omf/zenity/zenity-ru.omf share/omf/zenity/zenity-sv.omf share/omf/zenity/zenity-uk.omf +share/omf/zenity/zenity-zh_CN.omf %%DATADIR%%/clothes/gnome-tshirt.png %%DATADIR%%/clothes/hawaii-shirt.png %%DATADIR%%/clothes/monk.png @@ -350,6 +363,8 @@ share/omf/zenity/zenity-uk.omf @dirrmtry share/locale/be@latin @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as +@dirrm share/gnome/help/zenity/zh_CN/figures +@dirrm share/gnome/help/zenity/zh_CN @dirrm share/gnome/help/zenity/uk/figures @dirrm share/gnome/help/zenity/uk @dirrm share/gnome/help/zenity/sv/figures |