Presenting GNOME 2.28.1 for FreeBSD. The official release notes for this

release can be found at http://library.gnome.org/misc/release-notes/2.28/ . Officially, this is mostly a polishing release in preparation for GNOME 3.0 due in about a year. On the FreeBSD front, though, a lot went into this release. Major thanks goes to kwm and avl who did a lot of the porting work for this release. In particular, kwm brought in Evolution MAPI support for better Microsoft Exchange integration. Avl made sure that the new gobject introspection repository ports were nicely compartmentalized so that large dependencies aren't brought in wholesale. But, every GNOME team member (ahze, avl, bland, kwm, mezz, and myself) contributed to this release. Other major improvements include an updated HAL with better volume probing code, ufsid integration, and support for volume names containing spaces (big thanks to J.R. Oldroyd); a new WebKit; updated AbiWord; an updated Gimp; and a preview of the new GNOME Shell project (thanks to Pawel Worach). The FreeBSD GNOME Team would like to that the following additional contributors to this release whose patches and testing really helped make it a success: Andrius Morkunas Dominique Goncalves Eric L. Chen J.R. Oldroyd Joseph S. Atkinson Li Pawel Worach Romain TartiÃ¨re Thomas Vogt Yasuda Keisuke Rui Paulo Martin Wilke (and an extra shout out to miwi and pav for pointyhat runs) We would like to send this release out to Alexander Loginov (avl) in hopes that he feels better soon. PR: 136676 136967 138872 (obsolete with new epiphany-webkit) 139160 134737 139941 140097 140838 140929
svn path=/head/; revision=244923
2025-07-18 01:39:16 -04:00 · 2009-11-28 20:06:37 +00:00 · 2009-11-28 20:06:37 +00:00 · f76d32b8e8 · 2021-03-31 03:12:20 +00:00
commit f76d32b8e8
parent 873cae3ab4
826 changed files with 17944 additions and 7497 deletions
--- a/2
+++ b/2
@ -4224,3 +4224,5 @@ lang/erlang-doc||2009-11-27|Documentation now part of lang/erlang package
 devel/gtkmozedit||2009-11-27|No longer under development, does not build with libxul
 audio/exaile-devel|audio/exaile|2009-11-28|main port updated to latest stable version
 finance/p5-HTML-Query|www/p5-HTML-Query|2009-11-28|Moved to www category
 graphics/clutter-cairo|graphics/clutter|2009-11-28|This port is obsolete, all functionality is now in graphics/clutter
 www/galeon||2009-11-28|This port is obsolete; similar functionality can be found in www/epiphany
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@ -3,10 +3,17 @@
 #
 # $FreeBSD$
 #	$NetBSD: $
-#     $MCom: ports/Mk/bsd.gnome.mk,v 1.479 2009/03/14 05:55:36 marcus Exp $
+#     $MCom: ports/Mk/bsd.gnome.mk,v 1.486 2009/09/12 01:23:12 marcus Exp $
 #
 # Please view me with 4 column tabs!
 #######################################################
 #
 # *** WARNING: Disable MARCUSCOM before merge in FreeBSD!
 #     Please also remove this section before merging into FreeBSD.
 #
 #MARCUSCOM_CVS=yes
 # ======================= USERS =================================
 #
 # There are no significant user-definable settings in here.
@ -353,7 +360,7 @@ libgtkhtml_USE_GNOME_IMPL=libxslt gnomevfs2
 gnomedesktop_LIB_DEPENDS=	gnome-desktop-2.11:${PORTSDIR}/x11/gnome-desktop
 gnomedesktop_DETECT=		${LOCALBASE}/libdata/pkgconfig/gnome-desktop-2.0.pc
-gnomedesktop_USE_GNOME_IMPL=	libgnomeui gnomedocutils
+gnomedesktop_USE_GNOME_IMPL=	gconf2 gnomedocutils pygtk2
 gnomedesktop_GNOME_DESKTOP_VERSION=2
 gnomedesktopsharp20_DETECT=		${LOCALBASE}/libdata/pkgconfig/gnome-desktop-sharp-2.0.pc
@ -383,7 +390,7 @@ eel2_USE_GNOME_IMPL=	gnomedesktop
 gnomepanel_LIB_DEPENDS=	panel-applet-2.0:${PORTSDIR}/x11/gnome-panel
 gnomepanel_DETECT=	${LOCALBASE}/libdata/pkgconfig/libpanelapplet-2.0.pc
-gnomepanel_USE_GNOME_IMPL=gnomedesktop libwnck gnomemenus gnomedocutils librsvg2
+gnomepanel_USE_GNOME_IMPL=gnomedesktop libwnck gnomemenus gnomedocutils librsvg2 libgnomeui
 gnomepanel_GNOME_DESKTOP_VERSION=2
 nautilus2_LIB_DEPENDS=	nautilus-extension.1:${PORTSDIR}/x11-fm/nautilus
@ -401,7 +408,7 @@ gal2_USE_GNOME_IMPL=gnomeui libgnomeprintui
 gnomecontrolcenter2_LIB_DEPENDS=gnome-window-settings.1:${PORTSDIR}/sysutils/gnome-control-center
 gnomecontrolcenter2_DETECT=${LOCALBASE}/libdata/pkgconfig/gnome-window-settings-2.0.pc
-gnomecontrolcenter2_USE_GNOME_IMPL=metacity nautilus2 gnomemenus desktopfileutils libgnomekbd gnomepanel
+gnomecontrolcenter2_USE_GNOME_IMPL=metacity gnomemenus desktopfileutils libgnomekbd gnomedesktop librsvg2
 libgda2_LIB_DEPENDS=	gda-2.3:${PORTSDIR}/databases/libgda2
 libgda2_DETECT=			${LOCALBASE}/libdata/pkgconfig/libgda.pc
@ -515,8 +522,8 @@ gnomesharp20_RUN_DEPENDS=	${gnomesharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome-
 gnomesharp20_USE_GNOME_IMPL=	gnomepanel gtkhtml3 gtksharp20 librsvg2 vte
 libgnomekbd_DETECT=			${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc
-libgnomekbd_LIB_DEPENDS=	gnomekbd.3:${PORTSDIR}/x11/libgnomekbd
+libgnomekbd_LIB_DEPENDS=	gnomekbd.4:${PORTSDIR}/x11/libgnomekbd
-libgnomekbd_USE_GNOME_IMPL=	libgnomeui
+libgnomekbd_USE_GNOME_IMPL=	gconf2
 pygtksourceview_DETECT=		${LOCALBASE}/libdata/pkgconfig/pygtksourceview-2.0.pc
 pygtksourceview_BUILD_DEPENDS=	${pygtksourceview_DETECT}:${PORTSDIR}/x11-toolkits/py-gtksourceview
--- a/accessibility/Makefile
+++ b/accessibility/Makefile
@ -11,6 +11,7 @@
    SUBDIR += atk-reference
    SUBDIR += dasher
    SUBDIR += eflite
    SUBDIR += gir-repository-atk
    SUBDIR += gnome-mag
    SUBDIR += gnome-speech
    SUBDIR += gnopernicus
--- a/accessibility/accerciser/Makefile
+++ b/accessibility/accerciser/Makefile
@ -3,12 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/accessibility/accerciser/Makefile,v 1.1 2009/04/15 09:45:46 kwm Exp $
+#   $MCom: ports/accessibility/accerciser/Makefile,v 1.33 2009/09/22 05:13:26 avl Exp $
 #
 PORTNAME=	accerciser
-PORTVERSION=	1.6.1
+PORTVERSION=	1.8.0
 PORTREVISION=	1
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
--- a/accessibility/accerciser/distinfo
+++ b/accessibility/accerciser/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/accerciser-1.6.1.tar.bz2) = 9dd36435858f6eaf63694eb16584e777
+MD5 (gnome2/accerciser-1.8.0.tar.bz2) = ede1d36e9820fa441bcc24cb634d59cc
-SHA256 (gnome2/accerciser-1.6.1.tar.bz2) = 22c362a04025c876d5b454b7016edc888b737098d93b23e18f9f7cd59ba7ecf0
+SHA256 (gnome2/accerciser-1.8.0.tar.bz2) = 27fcd0e8c5d40f70e00b38bb8f2223b5fb7ef3708075f96d0d051991c259832a
-SIZE (gnome2/accerciser-1.6.1.tar.bz2) = 1345128
+SIZE (gnome2/accerciser-1.8.0.tar.bz2) = 1508187
--- a/accessibility/accerciser/pkg-plist
+++ b/accessibility/accerciser/pkg-plist
@ -139,16 +139,16 @@ bin/accerciser
 %%DATADIR%%/plugindata/validate/basic.py
 %%DATADIR%%/plugins/api_view.py
 %%DATADIR%%/plugins/console.py
 %%DATADIR%%/plugins/event_monitor.glade
 %%DATADIR%%/plugins/event_monitor.py
-%%DATADIR%%/plugins/interface_view.glade
+%%DATADIR%%/plugins/event_monitor.ui
 %%DATADIR%%/plugins/interface_view.py
 %%DATADIR%%/plugins/interface_view.ui
 %%DATADIR%%/plugins/ipython_view.py
 %%DATADIR%%/plugins/quick_select.py
 %%DATADIR%%/plugins/script_recorder.glade
 %%DATADIR%%/plugins/script_recorder.py
-%%DATADIR%%/plugins/validate.glade
+%%DATADIR%%/plugins/script_recorder.ui
 %%DATADIR%%/plugins/validate.py
 %%DATADIR%%/plugins/validate.ui
 share/applications/accerciser.desktop
 share/gnome/help/accerciser/C/accerciser.xml
 share/gnome/help/accerciser/C/figures/accerciser.png
@ -199,6 +199,12 @@ share/gnome/help/accerciser/fr/figures/api_browser.png
 share/gnome/help/accerciser/fr/figures/event_monitor.png
 share/gnome/help/accerciser/fr/figures/interface_viewer.png
 share/gnome/help/accerciser/fr/figures/script_recorder.png
 share/gnome/help/accerciser/it/accerciser.xml
 share/gnome/help/accerciser/it/figures/accerciser.png
 share/gnome/help/accerciser/it/figures/api_browser.png
 share/gnome/help/accerciser/it/figures/event_monitor.png
 share/gnome/help/accerciser/it/figures/interface_viewer.png
 share/gnome/help/accerciser/it/figures/script_recorder.png
 share/gnome/help/accerciser/oc/accerciser.xml
 share/gnome/help/accerciser/oc/figures/accerciser.png
 share/gnome/help/accerciser/oc/figures/api_browser.png
@ -217,6 +223,12 @@ share/gnome/help/accerciser/sv/figures/api_browser.png
 share/gnome/help/accerciser/sv/figures/event_monitor.png
 share/gnome/help/accerciser/sv/figures/interface_viewer.png
 share/gnome/help/accerciser/sv/figures/script_recorder.png
 share/gnome/help/accerciser/uk/accerciser.xml
 share/gnome/help/accerciser/uk/figures/accerciser.png
 share/gnome/help/accerciser/uk/figures/api_browser.png
 share/gnome/help/accerciser/uk/figures/event_monitor.png
 share/gnome/help/accerciser/uk/figures/interface_viewer.png
 share/gnome/help/accerciser/uk/figures/script_recorder.png
 share/icons/hicolor/16x16/apps/accerciser.png
 share/icons/hicolor/22x22/apps/accerciser.png
 share/icons/hicolor/32x32/apps/accerciser.png
@ -227,6 +239,7 @@ share/locale/bg/LC_MESSAGES/accerciser.mo
 share/locale/bn/LC_MESSAGES/accerciser.mo
 share/locale/bn_IN/LC_MESSAGES/accerciser.mo
 share/locale/ca/LC_MESSAGES/accerciser.mo
 share/locale/ca@valencia/LC_MESSAGES/accerciser.mo
 share/locale/cs/LC_MESSAGES/accerciser.mo
 share/locale/da/LC_MESSAGES/accerciser.mo
 share/locale/de/LC_MESSAGES/accerciser.mo
@ -235,6 +248,7 @@ share/locale/el/LC_MESSAGES/accerciser.mo
 share/locale/en_CA/LC_MESSAGES/accerciser.mo
 share/locale/en_GB/LC_MESSAGES/accerciser.mo
 share/locale/es/LC_MESSAGES/accerciser.mo
 share/locale/et/LC_MESSAGES/accerciser.mo
 share/locale/eu/LC_MESSAGES/accerciser.mo
 share/locale/fi/LC_MESSAGES/accerciser.mo
 share/locale/fr/LC_MESSAGES/accerciser.mo
@ -248,6 +262,7 @@ share/locale/ja/LC_MESSAGES/accerciser.mo
 share/locale/kn/LC_MESSAGES/accerciser.mo
 share/locale/lt/LC_MESSAGES/accerciser.mo
 share/locale/lv/LC_MESSAGES/accerciser.mo
 share/locale/mai/LC_MESSAGES/accerciser.mo
 share/locale/mk/LC_MESSAGES/accerciser.mo
 share/locale/ml/LC_MESSAGES/accerciser.mo
 share/locale/mr/LC_MESSAGES/accerciser.mo
@ -259,6 +274,7 @@ share/locale/pa/LC_MESSAGES/accerciser.mo
 share/locale/pl/LC_MESSAGES/accerciser.mo
 share/locale/pt/LC_MESSAGES/accerciser.mo
 share/locale/pt_BR/LC_MESSAGES/accerciser.mo
 share/locale/ro/LC_MESSAGES/accerciser.mo
 share/locale/ru/LC_MESSAGES/accerciser.mo
 share/locale/si/LC_MESSAGES/accerciser.mo
 share/locale/sl/LC_MESSAGES/accerciser.mo
@ -280,16 +296,22 @@ share/omf/accerciser/accerciser-en_GB.omf
 share/omf/accerciser/accerciser-el.omf
 share/omf/accerciser/accerciser-es.omf
 share/omf/accerciser/accerciser-fr.omf
 share/omf/accerciser/accerciser-it.omf
 share/omf/accerciser/accerciser-oc.omf
 share/omf/accerciser/accerciser-pt_BR.omf
 share/omf/accerciser/accerciser-sv.omf
 share/omf/accerciser/accerciser-uk.omf
@dirrm share/omf/accerciser
@dirrm share/gnome/help/accerciser/uk/figures
@dirrm share/gnome/help/accerciser/uk
@dirrm share/gnome/help/accerciser/sv/figures
@dirrm share/gnome/help/accerciser/sv
@dirrm share/gnome/help/accerciser/pt_BR/figures
@dirrm share/gnome/help/accerciser/pt_BR
@dirrm share/gnome/help/accerciser/oc/figures
@dirrm share/gnome/help/accerciser/oc
@dirrm share/gnome/help/accerciser/it/figures
@dirrm share/gnome/help/accerciser/it
@dirrm share/gnome/help/accerciser/fr/figures
@dirrm share/gnome/help/accerciser/fr
@dirrm share/gnome/help/accerciser/es/figures
@ -325,9 +347,13 @@ share/omf/accerciser/accerciser-sv.omf
@dirrmtry share/locale/si
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@ -3,12 +3,12 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/at-spi/Makefile,v 1.85 2009/03/17 13:55:06 kwm Exp $
+#   $MCom: ports/accessibility/at-spi/Makefile,v 1.89 2009/10/19 07:50:44 avl Exp $
 #
 PORTNAME=	at-spi
-PORTVERSION=	1.26.0
+PORTVERSION=	1.28.1
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
--- a/accessibility/at-spi/distinfo
+++ b/accessibility/at-spi/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/at-spi-1.26.0.tar.bz2) = 3f2f7d29b45eff08adf56af0d31d3984
+MD5 (gnome2/at-spi-1.28.1.tar.bz2) = ff29958339cbff5a0e0f34e4761e7633
-SHA256 (gnome2/at-spi-1.26.0.tar.bz2) = bb8c9473a277fa75f172fa16fb6ada85f4a919219818fd9c792f1a137bb2644d
+SHA256 (gnome2/at-spi-1.28.1.tar.bz2) = b776a85290dcfd485f0307c8fcc71a74a07874e5edbf7bba31d599e6dab3d2be
-SIZE (gnome2/at-spi-1.26.0.tar.bz2) = 829621
+SIZE (gnome2/at-spi-1.28.1.tar.bz2) = 843057
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@ -1,3 +1,4 @@
 etc/xdg/autostart/at-spi-registryd.desktop
 include/at-spi-1.0/cspi/spi-impl.h
 include/at-spi-1.0/cspi/spi-listener.h
 include/at-spi-1.0/cspi/spi-roletypes.h
@ -112,6 +113,7 @@ share/locale/bn/LC_MESSAGES/at-spi.mo
 share/locale/bn_IN/LC_MESSAGES/at-spi.mo
 share/locale/bs/LC_MESSAGES/at-spi.mo
 share/locale/ca/LC_MESSAGES/at-spi.mo
 share/locale/ca@valencia/LC_MESSAGES/at-spi.mo
 share/locale/crh/LC_MESSAGES/at-spi.mo
 share/locale/cs/LC_MESSAGES/at-spi.mo
 share/locale/cy/LC_MESSAGES/at-spi.mo
@ -140,17 +142,19 @@ share/locale/is/LC_MESSAGES/at-spi.mo
 share/locale/it/LC_MESSAGES/at-spi.mo
 share/locale/ja/LC_MESSAGES/at-spi.mo
 share/locale/ka/LC_MESSAGES/at-spi.mo
 share/locale/kn/LC_MESSAGES/at-spi.mo
 share/locale/ko/LC_MESSAGES/at-spi.mo
 share/locale/ku/LC_MESSAGES/at-spi.mo
 share/locale/lt/LC_MESSAGES/at-spi.mo
 share/locale/lv/LC_MESSAGES/at-spi.mo
 share/locale/mai/LC_MESSAGES/at-spi.mo
 share/locale/mk/LC_MESSAGES/at-spi.mo
 share/locale/ml/LC_MESSAGES/at-spi.mo
 share/locale/mn/LC_MESSAGES/at-spi.mo
 share/locale/mr/LC_MESSAGES/at-spi.mo
 share/locale/ms/LC_MESSAGES/at-spi.mo
 share/locale/nb/LC_MESSAGES/at-spi.mo
-share/locale/nds_DE/LC_MESSAGES/at-spi.mo
+share/locale/nds/LC_MESSAGES/at-spi.mo
 share/locale/ne/LC_MESSAGES/at-spi.mo
 share/locale/nl/LC_MESSAGES/at-spi.mo
 share/locale/nn/LC_MESSAGES/at-spi.mo
@ -208,8 +212,8 @@ share/locale/zh_TW/LC_MESSAGES/at-spi.mo
@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
-@dirrmtry share/locale/nds_DE/LC_MESSAGES
+@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds_DE
+@dirrmtry share/locale/nds
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/ku/LC_MESSAGES
@ -218,6 +222,8 @@ share/locale/zh_TW/LC_MESSAGES/at-spi.mo
@dirrmtry share/locale/dz
@dirrmtry share/locale/crh/LC_MESSAGES
@dirrmtry share/locale/crh
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@ -3,11 +3,11 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/atk/Makefile,v 1.95 2009/03/17 14:03:48 kwm Exp $
+#   $MCom: ports/accessibility/atk/Makefile,v 1.98 2009/09/22 10:49:14 kwm Exp $
 #
 PORTNAME=	atk
-PORTVERSION=	1.26.0
+PORTVERSION=	1.28.0
 PORTREVISION?=	0
 CATEGORIES=	accessibility devel
 MASTER_SITES=	GNOME
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/atk-1.26.0.tar.bz2) = 719229408019c548855673840679f156
+MD5 (gnome2/atk-1.28.0.tar.bz2) = 010a85478adc053c016a0a5c9bb52004
-SHA256 (gnome2/atk-1.26.0.tar.bz2) = f7993d26c3606a9b0e32d1eebe716f2294ac37fac014c47744e986fc0ff5e6d1
+SHA256 (gnome2/atk-1.28.0.tar.bz2) = e4da9fe580d2d55f4e77a138c553b4b32654dfb06bf0715592cc9dbd6355fe87
-SIZE (gnome2/atk-1.26.0.tar.bz2) = 719807
+SIZE (gnome2/atk-1.28.0.tar.bz2) = 715100
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@ -43,6 +43,7 @@ share/locale/bn/LC_MESSAGES/atk10.mo
 share/locale/bn_IN/LC_MESSAGES/atk10.mo
 share/locale/bs/LC_MESSAGES/atk10.mo
 share/locale/ca/LC_MESSAGES/atk10.mo
 share/locale/ca@valencia/LC_MESSAGES/atk10.mo
 share/locale/cs/LC_MESSAGES/atk10.mo
 share/locale/cy/LC_MESSAGES/atk10.mo
 share/locale/da/LC_MESSAGES/atk10.mo
@ -153,6 +154,8 @@ share/locale/zh_TW/LC_MESSAGES/atk10.mo
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
--- a/accessibility/gir-repository-atk/Makefile
+++ b/accessibility/gir-repository-atk/Makefile
@ -0,0 +1,15 @@
 # New ports collection makefile for:	gir-repository-atk
 # Date created:				07 September 2009
 # Whom:					Alexander Logvinov <avl@FreeBSD.org>
 #
 # $FreeBSD$
 #   $MCom: ports/accessibility/gir-repository-atk/Makefile,v 1.1 2009/09/16 02:05:10 avl Exp $
 #
 CATEGORIES=	accessibility
 MASTERDIR=	${.CURDIR}/../../devel/gir-repository
 PKGNAMESUFFIX=	-atk
 .include "${MASTERDIR}/bsd.gir.mk"
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@ -3,11 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/gnome-mag/Makefile,v 1.44 2008/09/23 20:13:54 mezz Exp $
+#   $MCom: ports/accessibility/gnome-mag/Makefile,v 1.47 2009/09/26 12:48:44 marcus Exp $
 #
 PORTNAME=	gnome-mag
-PORTVERSION=	0.15.8
+PORTVERSION=	0.15.9
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
--- a/accessibility/gnome-mag/distinfo
+++ b/accessibility/gnome-mag/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-mag-0.15.8.tar.bz2) = 654232f153051e2052d96007b8bdd273
+MD5 (gnome2/gnome-mag-0.15.9.tar.bz2) = db651bbd63f4ae3cfeb344c42f80d206
-SHA256 (gnome2/gnome-mag-0.15.8.tar.bz2) = c9ed20c85f9be37e5b90eb326e7093e46e34962ec67528f93dbd22033bd0dee2
+SHA256 (gnome2/gnome-mag-0.15.9.tar.bz2) = 6f921419143088587dce201afd972a60317ade269e47b0d67a38872a7615a025
-SIZE (gnome2/gnome-mag-0.15.8.tar.bz2) = 504849
+SIZE (gnome2/gnome-mag-0.15.9.tar.bz2) = 532685
--- a/accessibility/gnome-mag/pkg-plist
+++ b/accessibility/gnome-mag/pkg-plist
@ -77,6 +77,7 @@ share/locale/ku/LC_MESSAGES/gnome-mag.mo
 share/locale/ky/LC_MESSAGES/gnome-mag.mo
 share/locale/lt/LC_MESSAGES/gnome-mag.mo
 share/locale/lv/LC_MESSAGES/gnome-mag.mo
 share/locale/mai/LC_MESSAGES/gnome-mag.mo
 share/locale/mg/LC_MESSAGES/gnome-mag.mo
 share/locale/mi/LC_MESSAGES/gnome-mag.mo
 share/locale/mk/LC_MESSAGES/gnome-mag.mo
@ -147,6 +148,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo
@dirrmtry share/locale/mi
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@ -3,12 +3,11 @@
 # Whom:				Adam Weinberger <adamw@freebsd.org>
 #
 # $FreeBSD$
-#    $MCom: ports/accessibility/gok/Makefile,v 1.92 2009/03/17 14:42:44 kwm Exp $
+#    $MCom: ports/accessibility/gok/Makefile,v 1.106 2009/10/19 19:03:32 kwm Exp $
 #
 PORTNAME=	gok
-PORTVERSION=	2.26.0
+PORTVERSION=	2.28.1
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	accessibility sysutils gnome
 MASTER_SITES=	GNOME
@ -17,6 +16,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME On-Screen Keyboard (GOK)
 LIB_DEPENDS=	canberra-gtk.0:${PORTSDIR}/audio/libcanberra
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
@ -30,8 +31,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 GCONF_SCHEMAS=	gok.schemas
 post-patch:
 	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
 		${WRKSRC}/gok/word-complete.c
 .include <bsd.port.mk>
--- a/accessibility/gok/distinfo
+++ b/accessibility/gok/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/gok-2.26.0.tar.bz2) = 8cc28ad6010a977c9ccbe8d5b690f636
+MD5 (gnome2/gok-2.28.1.tar.bz2) = d7305f12c703e13eeaed796f996dbc86
-SHA256 (gnome2/gok-2.26.0.tar.bz2) = 787b24c7fe81bc22a3f425bc632a6712e27c616e5d4b8a1cfba9d0fbf721674a
+SHA256 (gnome2/gok-2.28.1.tar.bz2) = 121ab98605b0981c131cdc49bf190ba81e9a9d5c720fa94ed2fb3193f121e904
-SIZE (gnome2/gok-2.26.0.tar.bz2) = 1341889
+SIZE (gnome2/gok-2.28.1.tar.bz2) = 1588038
--- a/accessibility/gok/pkg-plist
+++ b/accessibility/gok/pkg-plist
@ -7,6 +7,7 @@ share/applications/gok.desktop
 %%DOCSDIR%%/ch02.html
 %%DOCSDIR%%/ch03.html
 %%DOCSDIR%%/ch04.html
 %%DOCSDIR%%/gok-GokButton.html
 %%DOCSDIR%%/gok-arraylist.html
 %%DOCSDIR%%/gok-callbacks.html
 %%DOCSDIR%%/gok-command-common.html
@ -24,6 +25,7 @@ share/applications/gok.desktop
 %%DOCSDIR%%/gok-gok-data.html
 %%DOCSDIR%%/gok-gok-editor.html
 %%DOCSDIR%%/gok-gok-feedback.html
 %%DOCSDIR%%/gok-gok-gconf-keys.html
 %%DOCSDIR%%/gok-gok-gconf.html
 %%DOCSDIR%%/gok-gok-key.html
 %%DOCSDIR%%/gok-gok-keyboard.html
@ -183,6 +185,16 @@ share/gnome/help/gok/C/legal.xml
 %%DATADIR%%/ca/quit.kbd
 %%DATADIR%%/ca/text-operations.kbd
 %%DATADIR%%/ca/valuator.kbd
 %%DATADIR%%/ca@valencia/gok-controls.kbd
 %%DATADIR%%/ca@valencia/hide.kbd
 %%DATADIR%%/ca@valencia/launcher.kbd
 %%DATADIR%%/ca@valencia/main.kbd
 %%DATADIR%%/ca@valencia/mouse.kbd
 %%DATADIR%%/ca@valencia/move-resize.kbd
 %%DATADIR%%/ca@valencia/numberpad.kbd
 %%DATADIR%%/ca@valencia/quit.kbd
 %%DATADIR%%/ca@valencia/text-operations.kbd
 %%DATADIR%%/ca@valencia/valuator.kbd
 %%DATADIR%%/cs/gok-controls.kbd
 %%DATADIR%%/cs/hide.kbd
 %%DATADIR%%/cs/launcher.kbd
@ -351,8 +363,6 @@ share/gnome/help/gok/C/legal.xml
 %%DATADIR%%/glade/gok.glade2
 %%DATADIR%%/gok.rc
 %%DATADIR%%/goklogo.png
 %%DATADIR%%/goksound1.wav
 %%DATADIR%%/goksound2.wav
 %%DATADIR%%/gu/gok-controls.kbd
 %%DATADIR%%/gu/hide.kbd
 %%DATADIR%%/gu/launcher.kbd
@ -868,6 +878,7 @@ share/locale/bg/LC_MESSAGES/gok.mo
 share/locale/bn/LC_MESSAGES/gok.mo
 share/locale/bn_IN/LC_MESSAGES/gok.mo
 share/locale/ca/LC_MESSAGES/gok.mo
 share/locale/ca@valencia/LC_MESSAGES/gok.mo
 share/locale/cs/LC_MESSAGES/gok.mo
 share/locale/cy/LC_MESSAGES/gok.mo
 share/locale/da/LC_MESSAGES/gok.mo
@ -935,6 +946,10 @@ share/locale/zh_HK/LC_MESSAGES/gok.mo
 share/locale/zh_TW/LC_MESSAGES/gok.mo
 share/omf/gok/gok-C.omf
 share/pixmaps/gok.png
 share/sounds/freedesktop/stereo/goksound1.wav
 share/sounds/freedesktop/stereo/goksound2.wav
@dirrmtry share/sounds/freedesktop/stereo
@dirrmtry share/sounds/freedesktop
@dirrm share/omf/gok
@dirrm %%DATADIR%%/zh_TW
@dirrm %%DATADIR%%/zh_HK
@ -1002,6 +1017,7 @@ share/pixmaps/gok.png
@dirrm %%DATADIR%%/da
@dirrm %%DATADIR%%/cy
@dirrm %%DATADIR%%/cs
@dirrm %%DATADIR%%/ca@valencia
@dirrm %%DATADIR%%/ca
@dirrm %%DATADIR%%/bn_IN
@dirrm %%DATADIR%%/bn
@ -1014,9 +1030,9 @@ share/pixmaps/gok.png
@dirrm %%DATADIR%%/am
@dirrm %%DATADIR%%/C
@dirrm %%DATADIR%%
@dirrm %%DOCSDIR%%
@dirrm share/gnome/help/gok/C
@dirrm share/gnome/help/gok
@dirrm %%DOCSDIR%%
@dirrmtry share/applications
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@ -1038,6 +1054,8 @@ share/pixmaps/gok.png
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/as/LC_MESSAGES
--- a/accessibility/mousetweaks/Makefile
+++ b/accessibility/mousetweaks/Makefile
@ -3,12 +3,11 @@
 # Whom:				Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/mousetweaks/Makefile,v 1.26 2009/03/17 16:17:01 kwm Exp $
+#   $MCom: ports/accessibility/mousetweaks/Makefile,v 1.37 2009/10/19 18:20:53 kwm Exp $
 #
 PORTNAME=	mousetweaks
-PORTVERSION=	2.26.3
+PORTVERSION=	2.28.1
 PORTREVISION=	1
 CATEGORIES=	accessibility
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
--- a/accessibility/mousetweaks/distinfo
+++ b/accessibility/mousetweaks/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/mousetweaks-2.26.3.tar.bz2) = e4d5941b555de97c8880ea8b01310776
+MD5 (gnome2/mousetweaks-2.28.1.tar.bz2) = a6d786f4df2be96202d76c4c0e6ba43c
-SHA256 (gnome2/mousetweaks-2.26.3.tar.bz2) = 16a490d155643fbe71b78e7d9b0044acb080e3bb14a39aa7ad5eb296d24d3277
+SHA256 (gnome2/mousetweaks-2.28.1.tar.bz2) = 8e99c8af3676ae913edd168aaca612401c7cf8dc22f0ba7cc21d5f1ca87c5874
-SIZE (gnome2/mousetweaks-2.26.3.tar.bz2) = 1172768
+SIZE (gnome2/mousetweaks-2.28.1.tar.bz2) = 2013922
--- a/accessibility/mousetweaks/pkg-plist
+++ b/accessibility/mousetweaks/pkg-plist
@ -19,6 +19,36 @@ share/gnome/help/mousetweaks/C/figures/mouse-a11y-ssc-delay-slider.png
 share/gnome/help/mousetweaks/C/figures/mouse-a11y-tab.png
 share/gnome/help/mousetweaks/C/legal.xml
 share/gnome/help/mousetweaks/C/mousetweaks.xml
 share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-checkbox.png
 share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-click-type-applet.png
 share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-click-type-window.png
 share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-ctw-checkbox.png
 share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-delay-slider.png
 share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-gesture-mapping.png
 share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-mode-choice.png
 share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-motion-treshold.png
 share/gnome/help/mousetweaks/ca/figures/mouse-a11y-pointer-capture-context-menu.png
 share/gnome/help/mousetweaks/ca/figures/mouse-a11y-pointer-capture-locked.png
 share/gnome/help/mousetweaks/ca/figures/mouse-a11y-pointer-capture-preferences.png
 share/gnome/help/mousetweaks/ca/figures/mouse-a11y-ssc-checkbox.png
 share/gnome/help/mousetweaks/ca/figures/mouse-a11y-ssc-delay-slider.png
 share/gnome/help/mousetweaks/ca/figures/mouse-a11y-tab.png
 share/gnome/help/mousetweaks/ca/mousetweaks.xml
 share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-checkbox.png
 share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-click-type-applet.png
 share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-click-type-window.png
 share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-ctw-checkbox.png
 share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-delay-slider.png
 share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-gesture-mapping.png
 share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-mode-choice.png
 share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-motion-treshold.png
 share/gnome/help/mousetweaks/cs/figures/mouse-a11y-pointer-capture-context-menu.png
 share/gnome/help/mousetweaks/cs/figures/mouse-a11y-pointer-capture-locked.png
 share/gnome/help/mousetweaks/cs/figures/mouse-a11y-pointer-capture-preferences.png
 share/gnome/help/mousetweaks/cs/figures/mouse-a11y-ssc-checkbox.png
 share/gnome/help/mousetweaks/cs/figures/mouse-a11y-ssc-delay-slider.png
 share/gnome/help/mousetweaks/cs/figures/mouse-a11y-tab.png
 share/gnome/help/mousetweaks/cs/mousetweaks.xml
 share/gnome/help/mousetweaks/de/figures/mouse-a11y-dwell-checkbox.png
 share/gnome/help/mousetweaks/de/figures/mouse-a11y-dwell-click-type-applet.png
 share/gnome/help/mousetweaks/de/figures/mouse-a11y-dwell-click-type-window.png
@ -142,8 +172,10 @@ share/gnome/help/mousetweaks/sv/mousetweaks.xml
 share/locale/ar/LC_MESSAGES/mousetweaks.mo
 share/locale/as/LC_MESSAGES/mousetweaks.mo
 share/locale/bg/LC_MESSAGES/mousetweaks.mo
 share/locale/bn/LC_MESSAGES/mousetweaks.mo
 share/locale/bn_IN/LC_MESSAGES/mousetweaks.mo
 share/locale/ca/LC_MESSAGES/mousetweaks.mo
 share/locale/ca@valencia/LC_MESSAGES/mousetweaks.mo
 share/locale/cs/LC_MESSAGES/mousetweaks.mo
 share/locale/da/LC_MESSAGES/mousetweaks.mo
 share/locale/de/LC_MESSAGES/mousetweaks.mo
@ -164,6 +196,7 @@ share/locale/ja/LC_MESSAGES/mousetweaks.mo
 share/locale/kn/LC_MESSAGES/mousetweaks.mo
 share/locale/ko/LC_MESSAGES/mousetweaks.mo
 share/locale/lt/LC_MESSAGES/mousetweaks.mo
 share/locale/mai/LC_MESSAGES/mousetweaks.mo
 share/locale/mk/LC_MESSAGES/mousetweaks.mo
 share/locale/ml/LC_MESSAGES/mousetweaks.mo
 share/locale/mr/LC_MESSAGES/mousetweaks.mo
@ -180,6 +213,8 @@ share/locale/ro/LC_MESSAGES/mousetweaks.mo
 share/locale/ru/LC_MESSAGES/mousetweaks.mo
 share/locale/sl/LC_MESSAGES/mousetweaks.mo
 share/locale/sq/LC_MESSAGES/mousetweaks.mo
 share/locale/sr/LC_MESSAGES/mousetweaks.mo
 share/locale/sr@latin/LC_MESSAGES/mousetweaks.mo
 share/locale/sv/LC_MESSAGES/mousetweaks.mo
 share/locale/ta/LC_MESSAGES/mousetweaks.mo
 share/locale/te/LC_MESSAGES/mousetweaks.mo
@ -200,6 +235,8 @@ share/locale/zh_TW/LC_MESSAGES/mousetweaks.mo
 %%DATADIR%%/right-click.png
 %%DATADIR%%/single-click.png
 share/omf/mousetweaks/mousetweaks-C.omf
 share/omf/mousetweaks/mousetweaks-ca.omf
 share/omf/mousetweaks/mousetweaks-cs.omf
 share/omf/mousetweaks/mousetweaks-de.omf
 share/omf/mousetweaks/mousetweaks-el.omf
 share/omf/mousetweaks/mousetweaks-en_GB.omf
@ -224,6 +261,10 @@ share/omf/mousetweaks/mousetweaks-sv.omf
@dirrm share/gnome/help/mousetweaks/en_GB
@dirrm share/gnome/help/mousetweaks/el/figures
@dirrm share/gnome/help/mousetweaks/el
@dirrm share/gnome/help/mousetweaks/cs/figures
@dirrm share/gnome/help/mousetweaks/cs
@dirrm share/gnome/help/mousetweaks/ca/figures
@dirrm share/gnome/help/mousetweaks/ca
@dirrm share/gnome/help/mousetweaks/de/figures
@dirrm share/gnome/help/mousetweaks/de
@dirrm share/gnome/help/mousetweaks/C/figures
@ -233,12 +274,16 @@ share/omf/mousetweaks/mousetweaks-sv.omf
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
-@dirrmtry share/locale/kn/LC_MESSAGES
+@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/kn
+@dirrmtry share/locale/mai
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/as/LC_MESSAGES
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/accessibility/orca/Makefile,v 1.3 2009/04/15 09:42:54 kwm Exp $
+#   $MCom: ports/accessibility/orca/Makefile,v 1.73 2009/10/19 20:01:51 kwm Exp $
 #
 PORTNAME=	orca
-PORTVERSION=	2.26.3
+PORTVERSION=	2.28.1
 PORTREVISION=	1
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
--- a/accessibility/orca/distinfo
+++ b/accessibility/orca/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/orca-2.26.3.tar.bz2) = 72dbf273bedd214e9023725690fb61b7
+MD5 (gnome2/orca-2.28.1.tar.bz2) = f1f8682b66fc0c122d344ddd9a4787ad
-SHA256 (gnome2/orca-2.26.3.tar.bz2) = 27a51f210cc18c9ebe1741bb87c8da5abd9b2fc8664a7accd241ed07f024b7d8
+SHA256 (gnome2/orca-2.28.1.tar.bz2) = dace4d689b4fbae507d0fa0a9c485cc51e72844048c50ea77bb0c9161b246fcd
-SIZE (gnome2/orca-2.26.3.tar.bz2) = 2250070
+SIZE (gnome2/orca-2.28.1.tar.bz2) = 2176412
--- a/accessibility/orca/files/patch-src_orca_orca.in
+++ b/accessibility/orca/files/patch-src_orca_orca.in
@ -1,21 +1,15 @@
--- src/orca/orca.in.orig	2009-01-23 22:39:27.000000000 +0100
+--- src/orca/orca.in.orig	2009-07-17 10:44:34.000000000 +1000
-+++ src/orca/orca.in	2009-02-21 22:50:38.000000000 +0100
+++ src/orca/orca.in	2009-07-17 10:46:14.000000000 +1000
@@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
 #
 # Orca
 #
@@ -30,7 +30,7 @@
 # Set the user's $PATH for this script.
 #
-export PATH="${PATH}:/usr/ccs/bin:/usr/bin:/usr/sbin:/bin:/usr/sfw/bin:/usr/openwin/bin:/usr/X11R6/bin"
+-PATH="${PATH}:/usr/ccs/bin:/usr/bin:/usr/sbin:/bin:/usr/sfw/bin:/usr/openwin/bin:/usr/X11R6/bin"
-+export PATH="${PATH}:/usr/bin:/usr/sbin:/bin:/usr/local/bin"
+PATH="${PATH}:/usr/bin:/usr/sbin:/bin:/usr/local/bin"
 export PATH
 # Save the arguments away.
- #
+@@ -84,7 +84,7 @@ restoreXmodmap()
@@ -83,7 +83,7 @@
 cleanup()
 {
     USERID=`id | cut -f2 -d= | cut -f1 -d\(`
@ -24,21 +18,3 @@
 	egrep "orca[.]orca|OAFIID[:]GNOME_Speech|OAFIID[:]GNOME_Magnifier|festival [-][-]server"|\
 	grep -v grep | awk '{ print $1 }'`
     IFS='
@@ -137,7 +137,7 @@
     fi
 fi
 -if [ `grep -c "\-q" <<< $ARGS` -gt 0 ] ; then
 +if [ `echo $ARGS | grep -c "\-q"` -gt 0 ] ; then
     # If the user has done -q or --quit, that means to tell any
     # existing orca process to quit.  So, we just do a cleanup.
     #
@@ -154,7 +154,7 @@
     if [ "x$ARGS" = "x" ] ; then
         CLEANUP=1
     else
 -        CLEANUP=`egrep -c "\-s|\-t|\-n|\-u|\-e|\-d" <<< $ARGS`
 +        CLEANUP=`echo $ARGS | egrep -c "\-s|\-t|\-n|\-u|\-e|\-d"`
     fi
     # Clean up before running orca to get anything that might
--- a/accessibility/orca/pkg-plist
+++ b/accessibility/orca/pkg-plist
@ -17,11 +17,9 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/braille.py
 %%PYTHON_SITELIBDIR%%/orca/braille.pyc
 %%PYTHON_SITELIBDIR%%/orca/braille.pyo
-%%PYTHON_SITELIBDIR%%/orca/braillegenerator.py
+%%PYTHON_SITELIBDIR%%/orca/braille_generator.py
-%%PYTHON_SITELIBDIR%%/orca/braillegenerator.pyc
+%%PYTHON_SITELIBDIR%%/orca/braille_generator.pyc
-%%PYTHON_SITELIBDIR%%/orca/braillegenerator.pyo
+%%PYTHON_SITELIBDIR%%/orca/braille_generator.pyo
 %%PYTHON_SITELIBDIR%%/orca/brlmodule.la
 %%PYTHON_SITELIBDIR%%/orca/brlmodule.so
 %%PYTHON_SITELIBDIR%%/orca/brlmon.py
 %%PYTHON_SITELIBDIR%%/orca/brlmon.pyc
 %%PYTHON_SITELIBDIR%%/orca/brlmon.pyo
@ -55,6 +53,12 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/focus_tracking_presenter.py
 %%PYTHON_SITELIBDIR%%/orca/focus_tracking_presenter.pyc
 %%PYTHON_SITELIBDIR%%/orca/focus_tracking_presenter.pyo
 %%PYTHON_SITELIBDIR%%/orca/formatting.py
 %%PYTHON_SITELIBDIR%%/orca/formatting.pyc
 %%PYTHON_SITELIBDIR%%/orca/formatting.pyo
 %%PYTHON_SITELIBDIR%%/orca/generator.py
 %%PYTHON_SITELIBDIR%%/orca/generator.pyc
 %%PYTHON_SITELIBDIR%%/orca/generator.pyo
 %%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.py
 %%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.pyc
 %%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.pyo
@ -85,9 +89,9 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/orca_console_prefs.py
 %%PYTHON_SITELIBDIR%%/orca/orca_console_prefs.pyc
 %%PYTHON_SITELIBDIR%%/orca/orca_console_prefs.pyo
-%%PYTHON_SITELIBDIR%%/orca/orca_glade.py
+%%PYTHON_SITELIBDIR%%/orca/orca_gtkbuilder.py
-%%PYTHON_SITELIBDIR%%/orca/orca_glade.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca_gtkbuilder.pyc
-%%PYTHON_SITELIBDIR%%/orca/orca_glade.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca_gtkbuilder.pyo
 %%PYTHON_SITELIBDIR%%/orca/orca_gui_find.py
 %%PYTHON_SITELIBDIR%%/orca/orca_gui_find.pyc
 %%PYTHON_SITELIBDIR%%/orca/orca_gui_find.pyo
@ -160,21 +164,24 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/acroread.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/acroread.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/acroread.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/ddu.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/ddu.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/ddu.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__init__.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__init__.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__init__.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/formatting.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/formatting.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/formatting.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/script.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/script.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/speech_generator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/speech_generator.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/speech_generator.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/where_am_i.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/where_am_i.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/where_am_i.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__init__.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__init__.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__init__.pyo
@ -184,9 +191,6 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/speech_generator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/speech_generator.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/speech_generator.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/where_am_i.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/where_am_i.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/where_am_i.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin.pyo
@ -220,12 +224,12 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__init__.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__init__.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__init__.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/formatting.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/formatting.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/formatting.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/script.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/script.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/speech_generator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/speech_generator.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/speech_generator.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2.pyo
@ -247,6 +251,21 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/__init__.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/__init__.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/__init__.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/braille_generator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/braille_generator.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/braille_generator.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/speech_generator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/speech_generator.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/speech_generator.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/tutorialgenerator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/tutorialgenerator.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/tutorialgenerator.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.pyo
@ -259,9 +278,6 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/speech_generator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/speech_generator.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/speech_generator.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/where_am_i.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/where_am_i.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/where_am_i.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__init__.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__init__.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__init__.pyo
@ -280,6 +296,9 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/braille_generator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/braille_generator.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/braille_generator.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/formatting.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/formatting.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/formatting.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/script.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/script.pyo
@ -292,6 +311,9 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/braille_generator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/braille_generator.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/braille_generator.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/formatting.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/formatting.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/formatting.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script.pyo
@ -301,9 +323,9 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/speech_generator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/speech_generator.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/speech_generator.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/where_am_i.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/structural_navigation.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/where_am_i.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/structural_navigation.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/where_am_i.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/structural_navigation.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp.pyo
@ -322,6 +344,9 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/braille_generator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/braille_generator.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/braille_generator.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/formatting.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/formatting.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/formatting.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script.pyo
@ -334,24 +359,18 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/structural_navigation.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/structural_navigation.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/structural_navigation.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/where_am_i.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/where_am_i.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/where_am_i.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__init__.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__init__.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__init__.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/formatting.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/formatting.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/formatting.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/script.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/script.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speechgenerator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speech_generator.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speechgenerator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speech_generator.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speechgenerator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speech_generator.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/where_am_I.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/where_am_I.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/where_am_I.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/VCL.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/VCL.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/VCL.pyo
@ -361,15 +380,18 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/settings.py
 %%PYTHON_SITELIBDIR%%/orca/settings.pyc
 %%PYTHON_SITELIBDIR%%/orca/settings.pyo
 %%PYTHON_SITELIBDIR%%/orca/sound.py
 %%PYTHON_SITELIBDIR%%/orca/sound.pyc
 %%PYTHON_SITELIBDIR%%/orca/sound.pyo
 %%PYTHON_SITELIBDIR%%/orca/speech.py
 %%PYTHON_SITELIBDIR%%/orca/speech.pyc
 %%PYTHON_SITELIBDIR%%/orca/speech.pyo
 %%PYTHON_SITELIBDIR%%/orca/speech_generator.py
 %%PYTHON_SITELIBDIR%%/orca/speech_generator.pyc
 %%PYTHON_SITELIBDIR%%/orca/speech_generator.pyo
 %%PYTHON_SITELIBDIR%%/orca/speechdispatcherfactory.py
 %%PYTHON_SITELIBDIR%%/orca/speechdispatcherfactory.pyc
 %%PYTHON_SITELIBDIR%%/orca/speechdispatcherfactory.pyo
 %%PYTHON_SITELIBDIR%%/orca/speechgenerator.py
 %%PYTHON_SITELIBDIR%%/orca/speechgenerator.pyc
 %%PYTHON_SITELIBDIR%%/orca/speechgenerator.pyo
 %%PYTHON_SITELIBDIR%%/orca/speechserver.py
 %%PYTHON_SITELIBDIR%%/orca/speechserver.pyc
 %%PYTHON_SITELIBDIR%%/orca/speechserver.pyo
@ -397,6 +419,7 @@ share/locale/bg/LC_MESSAGES/orca.mo
 share/locale/bn/LC_MESSAGES/orca.mo
 share/locale/bn_IN/LC_MESSAGES/orca.mo
 share/locale/ca/LC_MESSAGES/orca.mo
 share/locale/ca@valencia/LC_MESSAGES/orca.mo
 share/locale/cs/LC_MESSAGES/orca.mo
 share/locale/cy/LC_MESSAGES/orca.mo
 share/locale/da/LC_MESSAGES/orca.mo
@ -410,6 +433,7 @@ share/locale/et/LC_MESSAGES/orca.mo
 share/locale/eu/LC_MESSAGES/orca.mo
 share/locale/fi/LC_MESSAGES/orca.mo
 share/locale/fr/LC_MESSAGES/orca.mo
 share/locale/ga/LC_MESSAGES/orca.mo
 share/locale/gl/LC_MESSAGES/orca.mo
 share/locale/gu/LC_MESSAGES/orca.mo
 share/locale/he/LC_MESSAGES/orca.mo
@ -453,11 +477,13 @@ share/locale/vi/LC_MESSAGES/orca.mo
 share/locale/zh_CN/LC_MESSAGES/orca.mo
 share/locale/zh_HK/LC_MESSAGES/orca.mo
 share/locale/zh_TW/LC_MESSAGES/orca.mo
-%%DATADIR%%/glade/orca-find.glade
+%%DATADIR%%/ui/orca-advanced-magnification.ui
-%%DATADIR%%/glade/orca-mainwin.glade
+%%DATADIR%%/ui/orca-find.ui
-%%DATADIR%%/glade/orca-quit.glade
+%%DATADIR%%/ui/orca-mainwin.ui
-%%DATADIR%%/glade/orca-setup.glade
+%%DATADIR%%/ui/orca-preferences-warning.ui
-@dirrm %%DATADIR%%/glade
+%%DATADIR%%/ui/orca-quit.ui
 %%DATADIR%%/ui/orca-setup.ui
@dirrm %%DATADIR%%/ui
@dirrm %%DATADIR%%
@dirrmtry share/applications
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge
@ -467,6 +493,7 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool
@ -493,5 +520,7 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo
@dirrmtry share/locale/mai
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@ -3,12 +3,11 @@
 # Whom:					Anders Nordby <anders@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/archivers/file-roller/Makefile,v 1.3 2009/04/15 22:32:08 kwm Exp $
+#   $MCom: ports/archivers/file-roller/Makefile,v 1.165 2009/10/19 19:48:22 kwm Exp $
 #
 PORTNAME=	file-roller
-PORTVERSION=	2.26.3
+PORTVERSION=	2.28.1
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	GNOME
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/file-roller-2.26.3.tar.bz2) = 1876e9807a12c37f9bb2d00807905755
+MD5 (gnome2/file-roller-2.28.1.tar.bz2) = fcba40a9aa04386dec961a2f776777c5
-SHA256 (gnome2/file-roller-2.26.3.tar.bz2) = 06ec16ab8b1c9d0a1b3d40d2d63cd8170776bcc44ffa1f48e0403a9e23aef769
+SHA256 (gnome2/file-roller-2.28.1.tar.bz2) = ce1b18d0ec5e383ef64def91b67c96cebd8adfb99ac3b4bcac0ae40c90a12250
-SIZE (gnome2/file-roller-2.26.3.tar.bz2) = 1561967
+SIZE (gnome2/file-roller-2.28.1.tar.bz2) = 1736551
--- a/archivers/file-roller/files/patch-src_fr-enum-types.c
+++ b/archivers/file-roller/files/patch-src_fr-enum-types.c
@ -1,11 +0,0 @@
 --- src/fr-enum-types.c.orig	2009-06-30 20:34:58.000000000 +1000
 +++ src/fr-enum-types.c	2009-06-30 20:35:02.000000000 +1000
@@ -4,7 +4,7 @@
 #include <glib-object.h>
 /* enumerations from "../../src/typedefs.h" */
 -#include "../../src/typedefs.h"
 +#include "typedefs.h"
 GType
 fr_compression_get_type (void)
 {
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@ -2,6 +2,7 @@ bin/file-roller
 %%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-fileroller.la
 %%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-fileroller.so
 libexec/file-roller/isoinfo.sh
 libexec/file-roller/rpm2cpio
 share/applications/file-roller.desktop
 %%DATADIR%%/icons/hicolor/16x16/actions/add-files-to-archive.png
 %%DATADIR%%/icons/hicolor/16x16/actions/add-folder-to-archive.png
@ -37,6 +38,12 @@ share/gnome/help/file-roller/ca/figures/file-roller_main_window.png
 share/gnome/help/file-roller/ca/figures/file-roller_rightarrow.png
 share/gnome/help/file-roller/ca/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/ca/file-roller.xml
 share/gnome/help/file-roller/cs/figures/file-roller_home.png
 share/gnome/help/file-roller/cs/figures/file-roller_leftarrow.png
 share/gnome/help/file-roller/cs/figures/file-roller_main_window.png
 share/gnome/help/file-roller/cs/figures/file-roller_rightarrow.png
 share/gnome/help/file-roller/cs/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/cs/file-roller.xml
 share/gnome/help/file-roller/de/figures/file-roller_home.png
 share/gnome/help/file-roller/de/figures/file-roller_leftarrow.png
 share/gnome/help/file-roller/de/figures/file-roller_main_window.png
@ -134,6 +141,7 @@ share/locale/bn_IN/LC_MESSAGES/file-roller.mo
 share/locale/br/LC_MESSAGES/file-roller.mo
 share/locale/bs/LC_MESSAGES/file-roller.mo
 share/locale/ca/LC_MESSAGES/file-roller.mo
 share/locale/ca@valencia/LC_MESSAGES/file-roller.mo
 share/locale/cs/LC_MESSAGES/file-roller.mo
 share/locale/cy/LC_MESSAGES/file-roller.mo
 share/locale/da/LC_MESSAGES/file-roller.mo
@ -162,6 +170,7 @@ share/locale/is/LC_MESSAGES/file-roller.mo
 share/locale/it/LC_MESSAGES/file-roller.mo
 share/locale/ja/LC_MESSAGES/file-roller.mo
 share/locale/ka/LC_MESSAGES/file-roller.mo
 share/locale/kk/LC_MESSAGES/file-roller.mo
 share/locale/kn/LC_MESSAGES/file-roller.mo
 share/locale/ko/LC_MESSAGES/file-roller.mo
 share/locale/ku/LC_MESSAGES/file-roller.mo
@ -211,6 +220,7 @@ share/locale/zh_HK/LC_MESSAGES/file-roller.mo
 share/locale/zh_TW/LC_MESSAGES/file-roller.mo
 share/omf/file-roller/file-roller-C.omf
 share/omf/file-roller/file-roller-ca.omf
 share/omf/file-roller/file-roller-cs.omf
 share/omf/file-roller/file-roller-bg.omf
 share/omf/file-roller/file-roller-de.omf
 share/omf/file-roller/file-roller-el.omf
@ -252,6 +262,8 @@ share/omf/file-roller/file-roller-vi.omf
@dirrm share/gnome/help/file-roller/el
@dirrm share/gnome/help/file-roller/de/figures
@dirrm share/gnome/help/file-roller/de
@dirrm share/gnome/help/file-roller/cs/figures
@dirrm share/gnome/help/file-roller/cs
@dirrm share/gnome/help/file-roller/ca/figures
@dirrm share/gnome/help/file-roller/ca
@dirrm share/gnome/help/file-roller/bg/figures
@ -301,12 +313,16 @@ share/omf/file-roller/file-roller-vi.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
@dirrmtry share/locale/fur
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
--- a/audio/audacity-devel/Makefile
+++ b/audio/audacity-devel/Makefile
@ -6,6 +6,7 @@
 PORTNAME=	audacity
 PORTVERSION=	1.3.9
 PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		SF/${PORTNAME}/${PORTNAME}-unstable/${PORTVERSION}
--- a/audio/audacity-devel/files/patch-src_AudacityApp.cpp
+++ b/audio/audacity-devel/files/patch-src_AudacityApp.cpp
@ -0,0 +1,30 @@
 --- src/AudacityApp.cpp.orig	2009-11-27 00:27:29.000000000 +0100
 +++ src/AudacityApp.cpp	2009-11-27 00:48:36.000000000 +0100
@@ -23,6 +23,15 @@ It handles initialization and terminatio
 #include "Audacity.h" // This should always be included first
 +/*
 + * Get Gtk.h and Glib.h included and working around that glib got
 + * a GSocket class now 
 + */
 +#include <dlfcn.h>
 +#define GSocket GlibGSocket
 +#include <gtk/gtk.h>
 +#undef GSocket
 +
 #include <wx/defs.h>
 #include <wx/app.h>
 #include <wx/docview.h>
@@ -328,8 +337,11 @@ void QuitAudacity()
 // Most of this was taken from nsNativeAppSupportUnix.cpp from Mozilla.
 ///////////////////////////////////////////////////////////////////////////////
 +/* moved up so it doesn't undefs GSocket from wxgtk */
 +/*
 #include <dlfcn.h>
 #include <gtk/gtk.h>
 +*/
 typedef struct _GnomeProgram GnomeProgram;
 typedef struct _GnomeModuleInfo GnomeModuleInfo;
--- a/audio/freedesktop-sound-theme/Makefile
+++ b/audio/freedesktop-sound-theme/Makefile
@ -3,13 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/freedesktop-sound-theme/Makefile,v 1.2 2008/12/21 20:39:32 marcus Exp $
+#   $MCom: ports/audio/freedesktop-sound-theme/Makefile,v 1.6 2009/11/27 22:09:57 marcus Exp $
 #
 PORTNAME=	freedesktop-sound-theme
-PORTVERSION=	0.2
+PORTVERSION=	0.7
 CATEGORIES=	audio gnome
-MASTER_SITES=	http://people.freedesktop.org/~mccann/dist/
+MASTER_SITES=	LOCAL
 MASTER_SITE_SUBDIR=	kwm
 DISTNAME=	sound-theme-freedesktop-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
--- a/audio/freedesktop-sound-theme/distinfo
+++ b/audio/freedesktop-sound-theme/distinfo
@ -1,3 +1,3 @@
-MD5 (sound-theme-freedesktop-0.2.tar.bz2) = 45c8383071d5c6514aa1899e2d0fc675
+MD5 (sound-theme-freedesktop-0.7.tar.bz2) = c55786fdc4455f7437cc6fe49ea13ed8
-SHA256 (sound-theme-freedesktop-0.2.tar.bz2) = cc7b5320bef9088d77aa11e6041bf6019152dac51cc7beef7a256484faf5b683
+SHA256 (sound-theme-freedesktop-0.7.tar.bz2) = 5a0d064fa4a6880438e46739ce8a8eebb9b8a0a7da723fc37585bbc18a076404
-SIZE (sound-theme-freedesktop-0.2.tar.bz2) = 852304
+SIZE (sound-theme-freedesktop-0.7.tar.bz2) = 505168
--- a/audio/freedesktop-sound-theme/pkg-plist
+++ b/audio/freedesktop-sound-theme/pkg-plist
@ -1,43 +1,38 @@
 share/sounds/freedesktop/index.theme
-share/sounds/freedesktop/stereo/audio-channel-front-center.ogg
+share/sounds/freedesktop/stereo/alarm-clock-elapsed.oga
-share/sounds/freedesktop/stereo/audio-channel-front-left.ogg
+share/sounds/freedesktop/stereo/audio-channel-front-center.oga
-share/sounds/freedesktop/stereo/audio-channel-front-right.ogg
+share/sounds/freedesktop/stereo/audio-channel-front-left.oga
-share/sounds/freedesktop/stereo/audio-channel-rear-center.ogg
+share/sounds/freedesktop/stereo/audio-channel-front-right.oga
-share/sounds/freedesktop/stereo/audio-channel-rear-left.ogg
+share/sounds/freedesktop/stereo/audio-channel-rear-center.oga
-share/sounds/freedesktop/stereo/audio-channel-rear-right.ogg
+share/sounds/freedesktop/stereo/audio-channel-rear-left.oga
-share/sounds/freedesktop/stereo/audio-channel-side-left.ogg
+share/sounds/freedesktop/stereo/audio-channel-rear-right.oga
-share/sounds/freedesktop/stereo/audio-channel-side-right.ogg
+share/sounds/freedesktop/stereo/audio-channel-side-left.oga
-share/sounds/freedesktop/stereo/audio-test-signal.ogg
+share/sounds/freedesktop/stereo/audio-channel-side-right.oga
-share/sounds/freedesktop/stereo/battery-low.ogg
+share/sounds/freedesktop/stereo/audio-test-signal.oga
-share/sounds/freedesktop/stereo/bell.ogg
+share/sounds/freedesktop/stereo/audio-volume-change.oga
-share/sounds/freedesktop/stereo/button-pressed.ogg
+share/sounds/freedesktop/stereo/bell.oga
-share/sounds/freedesktop/stereo/button-toggle-off.ogg
+share/sounds/freedesktop/stereo/camera-shutter.oga
-share/sounds/freedesktop/stereo/button-toggle-on.ogg
+share/sounds/freedesktop/stereo/complete.oga
-share/sounds/freedesktop/stereo/complete-media-burn.ogg
+share/sounds/freedesktop/stereo/device-added.oga
-share/sounds/freedesktop/stereo/desktop-login.ogg
+share/sounds/freedesktop/stereo/device-removed.oga
-share/sounds/freedesktop/stereo/desktop-logout.ogg
+share/sounds/freedesktop/stereo/dialog-error.oga
-share/sounds/freedesktop/stereo/dialog-cancel.ogg
+share/sounds/freedesktop/stereo/dialog-information.oga
-share/sounds/freedesktop/stereo/dialog-error.ogg
+share/sounds/freedesktop/stereo/dialog-warning.oga
-share/sounds/freedesktop/stereo/dialog-information.ogg
+share/sounds/freedesktop/stereo/message-new-instant.oga
-share/sounds/freedesktop/stereo/dialog-ok.ogg
+share/sounds/freedesktop/stereo/message.oga
-share/sounds/freedesktop/stereo/dialog-question.ogg
+share/sounds/freedesktop/stereo/network-connectivity-established.oga
-share/sounds/freedesktop/stereo/dialog-warning.ogg
+share/sounds/freedesktop/stereo/network-connectivity-lost.oga
-share/sounds/freedesktop/stereo/link-pressed.ogg
+share/sounds/freedesktop/stereo/phone-incoming-call.oga
-share/sounds/freedesktop/stereo/menu-click.ogg
+share/sounds/freedesktop/stereo/phone-outgoing-busy.oga
-share/sounds/freedesktop/stereo/message-new-email.ogg
+share/sounds/freedesktop/stereo/phone-outgoing-calling.oga
-share/sounds/freedesktop/stereo/message-new-instant.ogg
+share/sounds/freedesktop/stereo/power-plug.oga
-share/sounds/freedesktop/stereo/phone-incoming-call.ogg
+share/sounds/freedesktop/stereo/power-unplug.oga
-share/sounds/freedesktop/stereo/phone-outgoing-busy.ogg
+share/sounds/freedesktop/stereo/screen-capture.oga
-share/sounds/freedesktop/stereo/power-unplug.ogg
+share/sounds/freedesktop/stereo/service-login.oga
-share/sounds/freedesktop/stereo/service-login.ogg
+share/sounds/freedesktop/stereo/service-logout.oga
-share/sounds/freedesktop/stereo/service-logout.ogg
+share/sounds/freedesktop/stereo/suspend-error.oga
-share/sounds/freedesktop/stereo/suspend-error.ogg
+share/sounds/freedesktop/stereo/trash-empty.oga
-share/sounds/freedesktop/stereo/trash-empty.ogg
+share/sounds/freedesktop/stereo/window-attention.oga
-share/sounds/freedesktop/stereo/window-close.ogg
+share/sounds/freedesktop/stereo/window-question.oga
 share/sounds/freedesktop/stereo/window-maximized.ogg
 share/sounds/freedesktop/stereo/window-minimized.ogg
 share/sounds/freedesktop/stereo/window-move-start.ogg
 share/sounds/freedesktop/stereo/window-move-stop.ogg
 share/sounds/freedesktop/stereo/window-slide.ogg
@dirrm share/sounds/freedesktop/stereo
@dirrm share/sounds/freedesktop
--- a/audio/gmpc-wikipedia/Makefile
+++ b/audio/gmpc-wikipedia/Makefile
@ -7,6 +7,7 @@
 PORTNAME=	gmpc-wikipedia
 PORTVERSION=	0.19.0
 PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
@ -16,7 +17,7 @@ COMMENT=	Wikipedia info for gmpc
 LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd \
 		curl.5:${PORTSDIR}/ftp/curl \
-		webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
+		webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPEND=	gmpc:${PORTSDIR}/audio/gmpc
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/gnome-media/Makefile,v 1.130 2009/03/17 22:20:16 kwm Exp $
+#   $MCom: ports/audio/gnome-media/Makefile,v 1.147 2009/11/26 06:20:13 marcus Exp $
 #
 PORTNAME=	gnome-media
-PORTVERSION=	2.26.0
+PORTVERSION=	2.28.1
-PORTREVISION=	7
+PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -16,7 +16,9 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Multimedia applications for the GNOME 2 desktop
 BUILD_DEPENDS=	xml2po:${PORTSDIR}/textproc/gnome-doc-utils
 LIB_DEPENDS=	canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
    		pulse.0:${PORTSDIR}/audio/pulseaudio \
 		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
 USE_BZIP2=	yes
@ -27,58 +29,14 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 libgnomeui libxml2 \
+USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 libxml2 libglade2 \
 		gconf2
 USE_GSTREAMER=	gconf good
 CONFIGURE_ARGS=	--disable-gstmix
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 GCONF_SCHEMAS=	gnome-audio-profiles.schemas \
 		gnome-sound-recorder.schemas
-OPTIONS=	ESOUND "Enable the EsounD module" on \
+.include <bsd.port.mk>
 		IPV6 "Enable support for IPv6" on \
 		PULSEAUDIO "Enable the PulseAudio module" on
 .include <bsd.port.pre.mk>
 .if defined(WITH_ESOUND)
 USE_GSTREAMER+=	esound
 PLIST_SUB+=	VUMETER=""
 .else
 CONFIGURE_ARGS+=--disable-esound --disable-esdtest
 PLIST_SUB+=	VUMETER="@comment "
 .endif
 .if defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=--disable-ipv6
 .endif
 .if defined(WITH_PULSEAUDIO)
 LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
 PLIST_SUB+=	PULSE=""
 .else
 CONFIGURE_ARGS+=--disable-pulseaudio
 PLIST_SUB+=	PULSE="@comment "
 .endif
 .if defined(WITH_ESOUND) && defined(WITHOUT_PULSEAUDIO)
 CONFIGURE_ARGS+=--enable-gstmix
 PLIST_SUB+=	GSTMIX=""
 GCONF_SCHEMAS+=	gnome-volume-control.schemas
 .else
 CONFIGURE_ARGS+=--disable-gstmix
 PLIST_SUB+=	GSTMIX="@comment "
 .endif
 .if defined(WITH_ESOUND) || defined(WITH_PULSEAUDIO)
 PLIST_SUB+=	GVC=""
 .else
 PLIST_SUB+=	GVC="@comment "
 .endif
 post-patch:
 	@${REINPLACE_CMD} -e 's|== "xyes|= "xyes|g' \
 		${WRKSRC}/configure
 .include <bsd.port.post.mk>
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-media-2.26.0.tar.bz2) = 3d519bc7d812aed8f6e4288b6d3cdf26
+MD5 (gnome2/gnome-media-2.28.1.tar.bz2) = 44fa273824cb18bb3118756d4bef69e6
-SHA256 (gnome2/gnome-media-2.26.0.tar.bz2) = 39e7646d0790e05a010da1eb2d7552dcb5311abd72f001477c9c465d7146b9f7
+SHA256 (gnome2/gnome-media-2.28.1.tar.bz2) = 1a1efc4f8f0b127cde4839d64343a5041c00ffb87597d45aabd4e22c4422eed0
-SIZE (gnome2/gnome-media-2.26.0.tar.bz2) = 2662523
+SIZE (gnome2/gnome-media-2.28.1.tar.bz2) = 2557601
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@ -1,9 +1,9 @@
 bin/gnome-audio-profiles-properties
 bin/gnome-sound-recorder
-%%GVC%%bin/gnome-volume-control
+bin/gnome-volume-control
-%%GVC%%bin/gnome-volume-control-applet
+bin/gnome-volume-control-applet
 bin/gstreamer-properties
-%%GVC%%etc/xdg/autostart/gnome-volume-control-applet.desktop
+etc/xdg/autostart/gnome-volume-control-applet.desktop
 include/gnome-media/profiles/audio-profile-choose.h
 include/gnome-media/profiles/audio-profile-edit.h
 include/gnome-media/profiles/audio-profile.h
@ -18,40 +18,46 @@ lib/libgnome-media-profiles.so
 lib/libgnome-media-profiles.so.0
 libdata/pkgconfig/gnome-media-profiles.pc
 share/applications/gnome-sound-recorder.desktop
-%%GVC%%share/applications/gnome-volume-control.desktop
+share/applications/gnome-volume-control.desktop
 share/applications/gstreamer-properties.desktop
 %%DATADIR%%/glade/gnome-audio-profiles.glade2
-%%GVC%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-high.png
-%%GVC%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-low.png
-%%GVC%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-medium.png
-%%GVC%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-muted.png
-%%GVC%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-high.png
-%%GVC%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-low.png
-%%GVC%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-medium.png
-%%GVC%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-muted.png
-%%GVC%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-high.png
-%%GVC%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-low.png
-%%GVC%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-medium.png
-%%GVC%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-muted.png
-%%GVC%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-high.png
-%%GVC%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-low.png
-%%GVC%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-medium.png
-%%GVC%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-muted.png
-%%GVC%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-high.svg
+%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-high.svg
-%%GVC%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-low.svg
+%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-low.svg
-%%GVC%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-medium.svg
+%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-medium.svg
-%%GVC%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-muted.svg
+%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-muted.svg
 %%GSTMIX%%%%DATADIR%%/pixmaps/chain-broken.png
 %%GSTMIX%%%%DATADIR%%/pixmaps/chain.png
 %%DATADIR%%/sounds/gnome-sounds-default.xml
 share/gnome-sound-recorder/ui/ui.xml
 share/gnome/help/gnome-audio-profiles/C/figures/gnome-audio-profiles-profile-window.png
 share/gnome/help/gnome-audio-profiles/C/figures/gnome-audio-profiles-profiles-window.png
 share/gnome/help/gnome-audio-profiles/C/gnome-audio-profiles.xml
 share/gnome/help/gnome-audio-profiles/C/legal.xml
 share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/C/legal.xml
 share/gnome/help/gnome-sound-recorder/ca/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/ca/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/cs/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/cs/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/de/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/de/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/el/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/el/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/en_GB/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/en_GB/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/es/figures/grecord_window.png
@ -68,32 +74,19 @@ share/gnome/help/gnome-sound-recorder/sv/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/sv/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/uk/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/uk/gnome-sound-recorder.xml
-%%GSTMIX%%share/gnome/help/gnome-volume-control/C/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-sound-recorder/zh_CN/figures/grecord_window.png
-%%GSTMIX%%share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml
+share/gnome/help/gnome-sound-recorder/zh_CN/gnome-sound-recorder.xml
 %%GSTMIX%%share/gnome/help/gnome-volume-control/C/legal.xml
 %%GSTMIX%%share/gnome/help/gnome-volume-control/ca/figures/gnome-volume-control_window.png
 %%GSTMIX%%share/gnome/help/gnome-volume-control/ca/gnome-volume-control.xml
 %%GSTMIX%%share/gnome/help/gnome-volume-control/de/figures/gnome-volume-control_window.png
 %%GSTMIX%%share/gnome/help/gnome-volume-control/de/gnome-volume-control.xml
 %%GSTMIX%%share/gnome/help/gnome-volume-control/es/figures/gnome-volume-control_window.png
 %%GSTMIX%%share/gnome/help/gnome-volume-control/es/gnome-volume-control.xml
 %%GSTMIX%%share/gnome/help/gnome-volume-control/fr/figures/gnome-volume-control_window.png
 %%GSTMIX%%share/gnome/help/gnome-volume-control/fr/gnome-volume-control.xml
 %%GSTMIX%%share/gnome/help/gnome-volume-control/it/figures/gnome-volume-control_window.png
 %%GSTMIX%%share/gnome/help/gnome-volume-control/it/gnome-volume-control.xml
 %%GSTMIX%%share/gnome/help/gnome-volume-control/oc/figures/gnome-volume-control_window.png
 %%GSTMIX%%share/gnome/help/gnome-volume-control/oc/gnome-volume-control.xml
 %%GSTMIX%%share/gnome/help/gnome-volume-control/ru/figures/gnome-volume-control_window.png
 %%GSTMIX%%share/gnome/help/gnome-volume-control/ru/gnome-volume-control.xml
 %%GSTMIX%%share/gnome/help/gnome-volume-control/sv/figures/gnome-volume-control_window.png
 %%GSTMIX%%share/gnome/help/gnome-volume-control/sv/gnome-volume-control.xml
 share/gnome/help/gstreamer-properties/C/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/C/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/C/legal.xml
 share/gnome/help/gstreamer-properties/ca/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/ca/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/cs/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/cs/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/de/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/de/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/el/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/el/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/en_GB/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/en_GB/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/es/figures/gstreamer_properties_window.png
@ -104,38 +97,38 @@ share/gnome/help/gstreamer-properties/it/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/it/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/oc/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/oc/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/pt_BR/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/pt_BR/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/ru/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/ru/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/sv/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/sv/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/th/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/th/gstreamer-properties.xml
-share/gstreamer-properties/glade/gstreamer-properties.glade
+share/gnome/help/gstreamer-properties/zh_CN/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/zh_CN/gstreamer-properties.xml
 share/gstreamer-properties/gstreamer-properties.ui
 share/gstreamer-properties/icons/gstreamer-properties.png
 share/icons/hicolor/16x16/apps/gnome-sound-recorder.png
-%%GVC%%share/icons/hicolor/16x16/apps/gnome-volume-control.png
+share/icons/hicolor/16x16/apps/gnome-volume-control.png
-%%GVC%%share/icons/hicolor/16x16/apps/gnome-volume-control.svg
+share/icons/hicolor/16x16/apps/gnome-volume-control.svg
 %%GSTMIX%%share/icons/hicolor/16x16/devices/gvc-3d-sound.png
 %%GSTMIX%%share/icons/hicolor/16x16/devices/gvc-headphones.png
 %%GSTMIX%%share/icons/hicolor/16x16/devices/gvc-line-in.png
 %%GSTMIX%%share/icons/hicolor/16x16/devices/gvc-tone.png
 %%GSTMIX%%share/icons/hicolor/16x16/status/audio-input-microphone-muted.png
 share/icons/hicolor/22x22/apps/gnome-sound-recorder.png
-%%GVC%%share/icons/hicolor/22x22/apps/gnome-volume-control.png
+share/icons/hicolor/22x22/apps/gnome-volume-control.png
-%%GVC%%share/icons/hicolor/22x22/apps/gnome-volume-control.svg
+share/icons/hicolor/22x22/apps/gnome-volume-control.svg
 share/icons/hicolor/24x24/apps/gnome-sound-recorder.png
-%%GVC%%share/icons/hicolor/24x24/apps/gnome-volume-control.png
+share/icons/hicolor/24x24/apps/gnome-volume-control.png
 share/icons/hicolor/32x32/apps/gnome-sound-recorder.png
-%%GVC%%share/icons/hicolor/32x32/apps/gnome-volume-control.png
+share/icons/hicolor/32x32/apps/gnome-volume-control.png
-%%GVC%%share/icons/hicolor/32x32/apps/gnome-volume-control.svg
+share/icons/hicolor/32x32/apps/gnome-volume-control.svg
 share/icons/hicolor/48x48/apps/gnome-sound-recorder.png
-%%GVC%%share/icons/hicolor/48x48/apps/gnome-volume-control.png
+share/icons/hicolor/48x48/apps/gnome-volume-control.png
 share/icons/hicolor/48x48/apps/gstreamer-properties.png
 share/icons/hicolor/scalable/apps/gnome-sound-recorder.svg
-%%GVC%%share/icons/hicolor/scalable/apps/gnome-volume-control.svg
+share/icons/hicolor/scalable/apps/gnome-volume-control.svg
 share/locale/am/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/as/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ast/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/be@latin/LC_MESSAGES/gnome-media-2.0.mo
@ -145,6 +138,7 @@ share/locale/bn_IN/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/br/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/bs/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ca@valencia/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/cy/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-media-2.0.mo
@ -214,29 +208,27 @@ share/locale/xh/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 share/omf/gnome-audio-profiles/gnome-audio-profiles-C.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-C.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-ca.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-cs.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-de.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-el.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-en_GB.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-es.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-fr.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-it.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-oc.omf
 share/omf/gstreamer-properties/gstreamer-properties-pt_BR.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-ru.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-sv.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-uk.omf
-%%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-C.omf
+share/omf/gnome-sound-recorder/gnome-sound-recorder-zh_CN.omf
 %%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-ca.omf
 %%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-de.omf
 %%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-es.omf
 %%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-fr.omf
 %%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-it.omf
 %%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-oc.omf
 %%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-ru.omf
 %%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-sv.omf
 share/omf/gstreamer-properties/gstreamer-properties-C.omf
 share/omf/gstreamer-properties/gstreamer-properties-ca.omf
 share/omf/gstreamer-properties/gstreamer-properties-cs.omf
 share/omf/gstreamer-properties/gstreamer-properties-de.omf
 share/omf/gstreamer-properties/gstreamer-properties-el.omf
 share/omf/gstreamer-properties/gstreamer-properties-en_GB.omf
 share/omf/gstreamer-properties/gstreamer-properties-es.omf
 share/omf/gstreamer-properties/gstreamer-properties-fr.omf
@ -245,6 +237,7 @@ share/omf/gstreamer-properties/gstreamer-properties-oc.omf
 share/omf/gstreamer-properties/gstreamer-properties-ru.omf
 share/omf/gstreamer-properties/gstreamer-properties-sv.omf
 share/omf/gstreamer-properties/gstreamer-properties-th.omf
 share/omf/gstreamer-properties/gstreamer-properties-zh_CN.omf
 share/sounds/gnome/default/alerts/bark.ogg
 share/sounds/gnome/default/alerts/drip.ogg
 share/sounds/gnome/default/alerts/glass.ogg
@ -253,17 +246,20 @@ share/sounds/gnome/default/alerts/sonar.ogg
@dirrm share/sounds/gnome/default
@dirrm share/sounds/gnome
@dirrm share/omf/gstreamer-properties
 %%GSTMIX%%@dirrm share/omf/gnome-volume-control
@dirrm share/omf/gnome-sound-recorder
@dirrm share/omf/gnome-audio-profiles
@dirrm share/gstreamer-properties/icons
@dirrm share/gstreamer-properties/glade
@dirrm share/gstreamer-properties
@dirrm share/gnome/help/gstreamer-properties/zh_CN/figures
@dirrm share/gnome/help/gstreamer-properties/zh_CN
@dirrm share/gnome/help/gstreamer-properties/th/figures
@dirrm share/gnome/help/gstreamer-properties/th
@dirrm share/gnome/help/gstreamer-properties/sv/figures
@dirrm share/gnome/help/gstreamer-properties/sv
@dirrm share/gnome/help/gstreamer-properties/ru/figures
@dirrm share/gnome/help/gstreamer-properties/ru
@dirrm share/gnome/help/gstreamer-properties/pt_BR/figures
@dirrm share/gnome/help/gstreamer-properties/pt_BR
@dirrm share/gnome/help/gstreamer-properties/oc/figures
@dirrm share/gnome/help/gstreamer-properties/oc
@dirrm share/gnome/help/gstreamer-properties/it/figures
@ -274,32 +270,19 @@ share/sounds/gnome/default/alerts/sonar.ogg
@dirrm share/gnome/help/gstreamer-properties/es
@dirrm share/gnome/help/gstreamer-properties/en_GB/figures
@dirrm share/gnome/help/gstreamer-properties/en_GB
@dirrm share/gnome/help/gstreamer-properties/el/figures
@dirrm share/gnome/help/gstreamer-properties/el
@dirrm share/gnome/help/gstreamer-properties/de/figures
@dirrm share/gnome/help/gstreamer-properties/de
@dirrm share/gnome/help/gstreamer-properties/cs/figures
@dirrm share/gnome/help/gstreamer-properties/cs
@dirrm share/gnome/help/gstreamer-properties/ca/figures
@dirrm share/gnome/help/gstreamer-properties/ca
@dirrm share/gnome/help/gstreamer-properties/C/figures
@dirrm share/gnome/help/gstreamer-properties/C
@dirrm share/gnome/help/gstreamer-properties
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/sv/figures
+@dirrm share/gnome/help/gnome-sound-recorder/zh_CN/figures
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/sv
+@dirrm share/gnome/help/gnome-sound-recorder/zh_CN
 %%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/ru/figures
 %%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/ru
 %%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/oc/figures
 %%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/oc
 %%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/it/figures
 %%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/it
 %%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/fr/figures
 %%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/fr
 %%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/es/figures
 %%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/es
 %%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/de/figures
 %%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/de
 %%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/ca/figures
 %%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/ca
 %%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/C/figures
 %%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/C
 %%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control
@dirrm share/gnome/help/gnome-sound-recorder/uk/figures
@dirrm share/gnome/help/gnome-sound-recorder/uk
@dirrm share/gnome/help/gnome-sound-recorder/sv/figures
@ -316,29 +299,35 @@ share/sounds/gnome/default/alerts/sonar.ogg
@dirrm share/gnome/help/gnome-sound-recorder/es
@dirrm share/gnome/help/gnome-sound-recorder/en_GB/figures
@dirrm share/gnome/help/gnome-sound-recorder/en_GB
@dirrm share/gnome/help/gnome-sound-recorder/el/figures
@dirrm share/gnome/help/gnome-sound-recorder/el
@dirrm share/gnome/help/gnome-sound-recorder/de/figures
@dirrm share/gnome/help/gnome-sound-recorder/de
@dirrm share/gnome/help/gnome-sound-recorder/cs/figures
@dirrm share/gnome/help/gnome-sound-recorder/cs
@dirrm share/gnome/help/gnome-sound-recorder/ca/figures
@dirrm share/gnome/help/gnome-sound-recorder/ca
@dirrm share/gnome/help/gnome-sound-recorder/C/figures
@dirrm share/gnome/help/gnome-sound-recorder/C
@dirrm share/gnome/help/gnome-sound-recorder
@dirrm share/gnome/help/gnome-audio-profiles/C/figures
@dirrm share/gnome/help/gnome-audio-profiles/C
@dirrm share/gnome/help/gnome-audio-profiles
@dirrm share/gnome-sound-recorder/ui
@dirrm share/gnome-sound-recorder
@dirrm %%DATADIR%%/sounds
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/scalable/status
+@dirrm %%DATADIR%%/icons/hicolor/scalable/status
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/scalable
+@dirrm %%DATADIR%%/icons/hicolor/scalable
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/32x32/status
+@dirrm %%DATADIR%%/icons/hicolor/32x32/status
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/32x32
+@dirrm %%DATADIR%%/icons/hicolor/32x32
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/24x24/status
+@dirrm %%DATADIR%%/icons/hicolor/24x24/status
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/24x24
+@dirrm %%DATADIR%%/icons/hicolor/24x24
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/22x22/status
+@dirrm %%DATADIR%%/icons/hicolor/22x22/status
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/22x22
+@dirrm %%DATADIR%%/icons/hicolor/22x22
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/16x16/status
+@dirrm %%DATADIR%%/icons/hicolor/16x16/status
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/16x16
+@dirrm %%DATADIR%%/icons/hicolor/16x16
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons/hicolor
-%%GVC%%@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/icons
 %%GSTMIX%%@dirrm %%DATADIR%%/pixmaps
@dirrm %%DATADIR%%/glade
@dirrm %%DATADIR%%
@dirrmtry share/applications
@ -368,9 +357,13 @@ share/sounds/gnome/default/alerts/sonar.ogg
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@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/ast/LC_MESSAGES
@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
--- a/audio/gstreamer-plugins-cdparanoia/Makefile
+++ b/audio/gstreamer-plugins-cdparanoia/Makefile
@ -3,10 +3,10 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/gstreamer-plugins-cdparanoia/Makefile,v 1.6 2008/03/21 04:01:31 ahze Exp $
+#   $MCom: ports/audio/gstreamer-plugins-cdparanoia/Makefile,v 1.8 2009/11/17 19:08:45 kwm Exp $
 #
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	audio
 COMMENT=	Gstreamer CDDA extraction (aka audio ripping) plugin
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@ -6,8 +6,7 @@
 #
 PORTNAME=	libcanberra
-PORTVERSION=	0.10
+PORTVERSION=	0.22
 PORTREVISION=	5
 CATEGORIES=	audio devel
 MASTER_SITES=	http://0pointer.de/lennart/projects/libcanberra/
@ -20,7 +19,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20 ltverhack gconf2
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:22 libltdl:22
-CONFIGURE_ARGS=	--disable-lynx
+CONFIGURE_ARGS=	--disable-lynx --disable-tdb
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@ -29,6 +28,8 @@ GCONF_SCHEMAS=	libcanberra.schemas
 OPTIONS=	PULSE "Enable Pulse Audio support" off \
 		GSTREAMER "Enable GStreamer audio support" off
 PLIST_SUB=	VERSION=${PORTVERSION}
 .include <bsd.port.pre.mk>
 .if !defined(WITHOUT_PULSE)
--- a/audio/libcanberra/distinfo
+++ b/audio/libcanberra/distinfo
@ -1,3 +1,3 @@
-MD5 (libcanberra-0.10.tar.gz) = 2623370bfcecaeecaeb85e5ec445f340
+MD5 (libcanberra-0.22.tar.gz) = e24e2f956fedfbcc58edfa40471b18d8
-SHA256 (libcanberra-0.10.tar.gz) = b0e3cb59e605412a52352cf9cf36344b165463d4e65916c95deb73fc51838272
+SHA256 (libcanberra-0.22.tar.gz) = 6a87737c3d045549a4a9c789cfc565a48185a586aa1a59243dea6421e9978581
-SIZE (libcanberra-0.10.tar.gz) = 826222
+SIZE (libcanberra-0.22.tar.gz) = 459404
--- a/audio/libcanberra/files/patch-Makefile.in
+++ b/audio/libcanberra/files/patch-Makefile.in
@ -1,28 +0,0 @@
 --- Makefile.in.orig	2008-12-20 13:42:12.000000000 -0500
 +++ Makefile.in	2008-12-20 20:43:22.000000000 -0500
@@ -271,7 +271,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 dist_doc_DATA = README
 EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas
 -SUBDIRS = src gtkdoc libltdl doc
 +SUBDIRS = src gtkdoc doc
 MAINTAINERCLEANFILES = README
 noinst_DATA = README
 pkgconfigdir = $(prefix)/libdata/pkgconfig
@@ -794,11 +794,11 @@ uninstall-am: uninstall-dist_docDATA uni
 @GCONF_SCHEMAS_INSTALL_TRUE@install-data-local:
 -@GCONF_SCHEMAS_INSTALL_TRUE@                if test -z "$(DESTDIR)" ; then \
 -@GCONF_SCHEMAS_INSTALL_TRUE@                        for p in $(schemas_DATA) ; do \
 -@GCONF_SCHEMAS_INSTALL_TRUE@                                GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \
 -@GCONF_SCHEMAS_INSTALL_TRUE@                        done \
 -@GCONF_SCHEMAS_INSTALL_TRUE@                fi
 +@GCONF_SCHEMAS_INSTALL_TRUE@	if test -z "$(DESTDIR)" ; then \
 +@GCONF_SCHEMAS_INSTALL_TRUE@		for p in $(schemas_DATA) ; do \
 +@GCONF_SCHEMAS_INSTALL_TRUE@			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/$$p ; \
 +@GCONF_SCHEMAS_INSTALL_TRUE@		done ; \
 +@GCONF_SCHEMAS_INSTALL_TRUE@	fi
 @GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:
 README:
--- a/audio/libcanberra/files/patch-configure
+++ b/audio/libcanberra/files/patch-configure
@ -1,27 +0,0 @@
 --- configure.orig	2008-12-19 19:07:23.000000000 -0500
 +++ configure	2008-12-19 19:08:01.000000000 -0500
@@ -791,7 +791,6 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 -enable_option_checking=no
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 GTK_DOC_USE_LIBTOOL_FALSE
@@ -878,7 +877,6 @@ USE_VERSION_SCRIPT_FALSE
 USE_VERSION_SCRIPT_TRUE
 OS_IS_WIN32_FALSE
 OS_IS_WIN32_TRUE
 -subdirs
 LIBLTDL
 LTDLINCL
 LIBTOOL
@@ -1054,7 +1052,7 @@ TDB_CFLAGS
 TDB_LIBS
 VORBIS_CFLAGS
 VORBIS_LIBS'
 -ac_subdirs_all='libltdl'
 +
 # Initialize some variables set by options.
 ac_init_help=
--- a/audio/libcanberra/files/patch-src_libcanberra-login-sound.desktop.in
+++ b/audio/libcanberra/files/patch-src_libcanberra-login-sound.desktop.in
@ -1,30 +0,0 @@
 From 5081594cb8cbb69fc282260388b2bb0164ce31dd Mon Sep 17 00:00:00 2001
 From: Lennart Poettering <lennart@poettering.net>
 Date: Sun, 14 Dec 2008 22:04:01 +0100
 Subject: [PATCH] Run lc-l-s in "Application" phase of gnome-session
 There is no need to make g-s wait for this lc-l-s when it plays the
 welcome tune. Hence move it to "Application" phase instead of "Desktop"
 phase.
 This is a result of a discussion with Behdad Esfahbod to optimize the
 login time.
 ---
 src/libcanberra-login-sound.desktop.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
 diff --git a/src/libcanberra-login-sound.desktop.in b/src/libcanberra-login-sound.desktop.in
 index 5b4cf7f..9fcf357 100644
 --- src/libcanberra-login-sound.desktop.in
 +++ src/libcanberra-login-sound.desktop.in
@@ -4,6 +4,6 @@ Name=GNOME Login Sound
 Exec=@bindir@/canberra-gtk-play --id="desktop-login" --description="GNOME Login"
 OnlyShowIn=GNOME;
 AutostartCondition=GNOME /desktop/gnome/sound/event_sounds
 -X-GNOME-Autostart-Phase=Desktop
 +X-GNOME-Autostart-Phase=Application
 X-GNOME-Provides=login-sound
 X-GNOME-Autostart-Notify=true
 -- 
 1.6.0.5
--- a/audio/libcanberra/files/patch-src_oss.c
+++ b/audio/libcanberra/files/patch-src_oss.c
@ -1,15 +1,6 @@
--- src/oss.c.orig	2008-09-01 19:53:47.000000000 -0400
+--- src/oss.c.orig	2009-08-26 21:58:16.000000000 -0400
-+++ src/oss.c	2008-12-21 13:51:09.000000000 -0500
+++ src/oss.c	2009-11-25 20:47:07.000000000 -0500
-@@ -235,7 +235,7 @@ static int open_oss(ca_context *c, struc
+@@ -260,7 +260,7 @@ static int open_oss(ca_context *c, struc
     ca_return_val_if_fail(c, CA_ERROR_INVALID);
     ca_return_val_if_fail(c->private, CA_ERROR_STATE);
     ca_return_val_if_fail(out, CA_ERROR_INVALID);
 -    ca_return_val_if_fail(ca_sound_file_get_nchannels(out->file) > 2, CA_ERROR_NOTSUPPORTED);
 +    ca_return_val_if_fail(ca_sound_file_get_nchannels(out->file) <= 2, CA_ERROR_NOTSUPPORTED);
     p = PRIVATE(c);
@@ -258,7 +258,7 @@ static int open_oss(ca_context *c, struc
             val = AFMT_S16_NE;
             break;
         case CA_SAMPLE_S16RE:
@ -18,11 +9,3 @@
             val = AFMT_S16_BE;
 #else
             val = AFMT_S16_LE;
@@ -423,6 +423,7 @@ int driver_play(ca_context *c, uint32_t 
     out->callback = cb;
     out->userdata = userdata;
     out->pipe_fd[0] = out->pipe_fd[1] = -1;
 +    out->pcm = -1;
     if (pipe(out->pipe_fd) < 0) {
         ret = CA_ERROR_SYSTEM;
--- a/audio/libcanberra/pkg-plist
+++ b/audio/libcanberra/pkg-plist
@ -15,18 +15,18 @@ lib/libcanberra.so.0
 %%GSTREAMER%%lib/libcanberra/libcanberra-gstreamer.a
 %%GSTREAMER%%lib/libcanberra/libcanberra-gstreamer.la
 %%GSTREAMER%%lib/libcanberra/libcanberra-gstreamer.so
-lib/libcanberra/libcanberra-multi.a
+lib/libcanberra-%%VERSION%%/libcanberra-multi.a
-lib/libcanberra/libcanberra-multi.la
+lib/libcanberra-%%VERSION%%/libcanberra-multi.la
-lib/libcanberra/libcanberra-multi.so
+lib/libcanberra-%%VERSION%%/libcanberra-multi.so
-lib/libcanberra/libcanberra-null.a
+lib/libcanberra-%%VERSION%%/libcanberra-null.a
-lib/libcanberra/libcanberra-null.la
+lib/libcanberra-%%VERSION%%/libcanberra-null.la
-lib/libcanberra/libcanberra-null.so
+lib/libcanberra-%%VERSION%%/libcanberra-null.so
-lib/libcanberra/libcanberra-oss.a
+lib/libcanberra-%%VERSION%%/libcanberra-oss.a
-lib/libcanberra/libcanberra-oss.la
+lib/libcanberra-%%VERSION%%/libcanberra-oss.la
-lib/libcanberra/libcanberra-oss.so
+lib/libcanberra-%%VERSION%%/libcanberra-oss.so
-%%PULSE%%lib/libcanberra/libcanberra-pulse.a
+%%PULSE%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.a
-%%PULSE%%lib/libcanberra/libcanberra-pulse.la
+%%PULSE%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.la
-%%PULSE%%lib/libcanberra/libcanberra-pulse.so
+%%PULSE%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.so
 libdata/pkgconfig/libcanberra-gtk.pc
 libdata/pkgconfig/libcanberra.pc
 %%DOCSDIR%%/README
@ -42,8 +42,14 @@ libdata/pkgconfig/libcanberra.pc
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
 share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
 share/gnome/autostart/libcanberra-login-sound.desktop
 share/gnome/shutdown/libcanberra-logout-sound.sh
 share/vala/vapi/libcanberra-gtk.vapi
 share/vala/vapi/libcanberra.vapi
@dirrmtry share/gnome/shutdown
@dirrmtry share/gdm/autostart/LoginWindow
@dirrmtry share/gdm/autostart
@dirrmtry share/gdm
@dirrm %%DOCSDIR%%
-@dirrm lib/libcanberra
+@dirrm lib/libcanberra-%%VERSION%%
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@ -3,11 +3,15 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/audio/pulseaudio/Makefile,v 1.5 2009/07/20 21:26:40 marcus Exp $
+#   $MCom: ports/audio/pulseaudio/Makefile,v 1.21 2009/11/28 19:08:20 marcus Exp $
 #
 # !!!NOTE!!! Any PORTVERSION update to this port must be accompanied by
 # PORTREVISION bumps to audio/gnome-media, sysutils/gnome-settings-daemon,
 # and audio/gstreamer-plugins-pulse.
 #
 PORTNAME=	pulseaudio
-PORTVERSION=	0.9.19
+PORTVERSION=	0.9.21
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@ -1,3 +1,3 @@
-MD5 (pulseaudio-0.9.19.tar.gz) = 02adc2b99252675f0271db3b9edd432e
+MD5 (pulseaudio-0.9.21.tar.gz) = 76e623c4c72e2258bc8bdeb1599bad74
-SHA256 (pulseaudio-0.9.19.tar.gz) = e47e27083deb79571fb2b9215874ddc26d77c3dec2a7dc8de5ecec9058e4b806
+SHA256 (pulseaudio-0.9.21.tar.gz) = 94e22356ac70ee95388ae58da90d88c6b3186d1938618d21671627ff56cee254
-SIZE (pulseaudio-0.9.19.tar.gz) = 2029090
+SIZE (pulseaudio-0.9.21.tar.gz) = 2056896
--- a/audio/pulseaudio/files/patch-configure
+++ b/audio/pulseaudio/files/patch-configure
@ -1,27 +1,23 @@
--- configure.orig	2008-07-26 15:15:12.000000000 -0400
+--- configure.orig	2009-11-24 16:31:47.000000000 +0100
-+++ configure	2008-07-26 15:15:35.000000000 -0400
+++ configure	2009-11-24 16:32:35.000000000 +0100
-@@ -25321,6 +25321,7 @@ $as_echo_n "checking whether to check fo
+@@ -13586,6 +13586,7 @@
    check_inconsistencies=yes
    case "${host_cpu}-${host_os}" in
      *-darwin*) check_inconsistencies=no ;;
 +     *-freebsd*) check_inconsistencies=no ;;
    esac
    if test x"$GCC" != xyes -o "x$check_inconsistencies" != xyes ; then
-       { $as_echo "$as_me:$LINENO: result: no" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-@@ -32654,9 +32655,9 @@ _ACEOF
+@@ -18007,7 +18008,7 @@
 else
-   { { $as_echo "$as_me:$LINENO: error: *** libatomic-ops headers not found" >&5
+-   as_fn_error "*** libatomic-ops headers not found" "$LINENO" 5
-$as_echo "$as_me: error: *** libatomic-ops headers not found" >&2;}
+#   as_fn_error "*** libatomic-ops headers not found" "$LINENO" 5
 -   { (exit 1); exit 1; }; }
 +#   { { $as_echo "$as_me:$LINENO: error: *** libatomic-ops headers not found" >&5
 +#$as_echo "$as_me: error: *** libatomic-ops headers not found" >&2;}
 +#   { (exit 1); exit 1; }; }
 fi
-@@ -32664,9 +32665,9 @@ done
+@@ -18015,9 +18016,9 @@
    # Win32 does not need the lib and breaks horribly if we try to include it
@ -32,5 +28,5 @@
 +#       LIBS="$LIBS -latomic_ops"
 +#   fi
 else
-    { $as_echo "$as_me:$LINENO: result: no" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
--- a/audio/pulseaudio/files/patch-src_pulsecore_shm.c
+++ b/audio/pulseaudio/files/patch-src_pulsecore_shm.c
@ -1,7 +1,7 @@
--- src/pulsecore/shm.c.orig	2007-10-28 15:13:53.000000000 -0400
+--- src/pulsecore/shm.c.orig	2009-08-19 10:17:06.000000000 +0800
-+++ src/pulsecore/shm.c	2008-01-01 16:19:19.000000000 -0500
+++ src/pulsecore/shm.c	2009-11-11 21:25:03.000000000 +0800
-@@ -80,7 +80,7 @@ struct shm_marker {
+@@ -91,7 +91,7 @@
- };
+ #define SHM_MARKER_SIZE PA_ALIGN(sizeof(struct shm_marker))
 static char *segment_name(char *fn, size_t l, unsigned id) {
 -    pa_snprintf(fn, l, "/pulse-shm-%u", id);
@ -9,3 +9,12 @@
     return fn;
 }
@@ -142,7 +142,7 @@
         pa_random(&m->id, sizeof(m->id));
         segment_name(fn, sizeof(fn), m->id);
 -        if ((fd = shm_open(fn, O_RDWR|O_CREAT|O_EXCL, mode & 0444)) < 0) {
 +        if ((fd = shm_open(fn, O_RDWR|O_CREAT|O_EXCL, mode & 0644)) < 0) {
             pa_log("shm_open() failed: %s", pa_cstrerror(errno));
             goto fail;
         }
--- a/audio/pulseaudio/files/patch-src_tests_rtstutter.c
+++ b/audio/pulseaudio/files/patch-src_tests_rtstutter.c
@ -0,0 +1,27 @@
 --- src/tests/rtstutter.c.orig	2009-07-23 15:40:47.000000000 +0200
 +++ src/tests/rtstutter.c	2009-11-24 16:26:36.000000000 +0100
@@ -31,6 +31,11 @@
 #include <string.h>
 #include <pthread.h>
 +#ifdef HAVE_PTHREAD_SETAFFINITY_NP 
 +#include <sys/param.h>
 +#include <sys/cpuset.h> 
 +#endif
 +
 #include <pulse/timeval.h>
 #include <pulse/gccmacro.h>
@@ -44,8 +49,12 @@
 static void* work(void *p) {
 #ifdef HAVE_PTHREAD_SETAFFINITY_NP
 +#ifdef __FreeBSD__
 +    cpuset_t mask;
 +#else
     cpu_set_t mask;
 #endif
 +#endif
     struct sched_param param;
     pa_log_notice("CPU%i: Created thread.", PA_PTR_TO_UINT(p));
--- a/audio/pulseaudio/pkg-plist
+++ b/audio/pulseaudio/pkg-plist
@ -11,6 +11,7 @@ bin/parecord
 bin/pasuspender
 bin/pax11publish
 bin/pulseaudio
 bin/start-pulseaudio-kde
 bin/start-pulseaudio-x11
 etc/dbus-1/system.d/pulseaudio-system.conf
@unexec if cmp -s %D/etc/pulse/client.conf %D/etc/pulse/client.conf-dist; then rm -f %D/etc/pulse/client.conf; fi
@ -26,12 +27,14 @@ etc/pulse/default.pa-dist
 etc/pulse/system.pa-dist
@exec [ -f %B/system.pa ] || cp %B/%f %B/system.pa
 etc/xdg/autostart/pulseaudio.desktop
 etc/xdg/autostart/pulseaudio-kde.desktop
 %%AVAHI%%include/pulse/browser.h
 include/pulse/cdecl.h
 include/pulse/channelmap.h
 include/pulse/context.h
 include/pulse/def.h
 include/pulse/error.h
 include/pulse/ext-device-manager.h
 include/pulse/ext-stream-restore.h
 include/pulse/gccmacro.h
 include/pulse/glib-mainloop.h
@ -81,6 +84,8 @@ lib/libpulsedsp.a
 lib/libpulsedsp.so
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.a
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so
 lib/pulse-%%PULSE_VERSION%%/modules/libcli.a
 lib/pulse-%%PULSE_VERSION%%/modules/libcli.so
 lib/pulse-%%PULSE_VERSION%%/modules/liboss-util.a
@ -230,6 +235,7 @@ share/locale/fi/LC_MESSAGES/pulseaudio.mo
 share/locale/fr/LC_MESSAGES/pulseaudio.mo
 share/locale/gu/LC_MESSAGES/pulseaudio.mo
 share/locale/hi/LC_MESSAGES/pulseaudio.mo
 share/locale/hu/LC_MESSAGES/pulseaudio.mo
 share/locale/it/LC_MESSAGES/pulseaudio.mo
 share/locale/ja/LC_MESSAGES/pulseaudio.mo
 share/locale/kn/LC_MESSAGES/pulseaudio.mo
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@ -3,11 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/rhythmbox/Makefile,v 1.97 2009/04/09 03:24:06 mezz Exp $
+#   $MCom: ports/audio/rhythmbox/Makefile,v 1.103 2009/11/22 22:09:39 marcus Exp $
 #
 PORTNAME=	rhythmbox
 PORTVERSION=	0.12.6
 PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -23,7 +24,7 @@ LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
 		soup-2.4.1:${PORTSDIR}/devel/libsoup \
 		gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
-		brasero-media.1:${PORTSDIR}/sysutils/brasero
+		brasero-media.2:${PORTSDIR}/sysutils/brasero
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@ -3,12 +3,11 @@
 # Whom:			Alexander Nedotsukov <bland@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/sound-juicer/Makefile,v 1.91 2009/03/18 04:24:29 marcus Exp $
+#   $MCom: ports/audio/sound-juicer/Makefile,v 1.96 2009/11/26 08:20:43 marcus Exp $
 #
 PORTNAME=	sound-juicer
-PORTVERSION=	2.26.1
+PORTVERSION=	2.28.1
 PORTREVISION=	2
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -19,11 +18,11 @@ COMMENT=	Clean, mean and lean CD ripper for GNOME2
 LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
    		musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \
 		gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
-		cdio.12:${PORTSDIR}/sysutils/libcdio \
+		cdio.8:${PORTSDIR}/sysutils/libcdio \
    		tag.6:${PORTSDIR}/audio/taglib \
 		canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		brasero-media.1:${PORTSDIR}/sysutils/brasero
+		brasero-media.2:${PORTSDIR}/sysutils/brasero
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/sound-juicer-2.26.1.tar.bz2) = 68d085cb577af88553f2dcaf3a0fc2a1
+MD5 (gnome2/sound-juicer-2.28.1.tar.bz2) = 680c036ca9b062fe198fada30edbf534
-SHA256 (gnome2/sound-juicer-2.26.1.tar.bz2) = 5e6220158270b5f76e6a9f74f597837b41000c695e4ae81254dd945024c0c9e5
+SHA256 (gnome2/sound-juicer-2.28.1.tar.bz2) = 3142cce899812c6fb8c7145d52323f07d6ecfd6ca0503f4c7a32a12c00b8910c
-SIZE (gnome2/sound-juicer-2.26.1.tar.bz2) = 1993986
+SIZE (gnome2/sound-juicer-2.28.1.tar.bz2) = 2159961
--- a/audio/sound-juicer/pkg-plist
+++ b/audio/sound-juicer/pkg-plist
@ -12,6 +12,10 @@ share/gnome/help/sound-juicer/ca/figures/prefs.png
 share/gnome/help/sound-juicer/ca/figures/startup.png
 share/gnome/help/sound-juicer/ca/legal.xml
 share/gnome/help/sound-juicer/ca/sound-juicer.xml
 share/gnome/help/sound-juicer/cs/figures/prefs.png
 share/gnome/help/sound-juicer/cs/figures/startup.png
 share/gnome/help/sound-juicer/cs/legal.xml
 share/gnome/help/sound-juicer/cs/sound-juicer.xml
 share/gnome/help/sound-juicer/de/figures/prefs.png
 share/gnome/help/sound-juicer/de/figures/startup.png
 share/gnome/help/sound-juicer/de/legal.xml
@ -80,6 +84,7 @@ share/locale/bn/LC_MESSAGES/sound-juicer.mo
 share/locale/bn_IN/LC_MESSAGES/sound-juicer.mo
 share/locale/br/LC_MESSAGES/sound-juicer.mo
 share/locale/ca/LC_MESSAGES/sound-juicer.mo
 share/locale/ca@valencia/LC_MESSAGES/sound-juicer.mo
 share/locale/cs/LC_MESSAGES/sound-juicer.mo
 share/locale/cy/LC_MESSAGES/sound-juicer.mo
 share/locale/da/LC_MESSAGES/sound-juicer.mo
@ -88,12 +93,14 @@ share/locale/dz/LC_MESSAGES/sound-juicer.mo
 share/locale/el/LC_MESSAGES/sound-juicer.mo
 share/locale/en_CA/LC_MESSAGES/sound-juicer.mo
 share/locale/en_GB/LC_MESSAGES/sound-juicer.mo
 share/locale/en@shaw/LC_MESSAGES/sound-juicer.mo
 share/locale/es/LC_MESSAGES/sound-juicer.mo
 share/locale/et/LC_MESSAGES/sound-juicer.mo
 share/locale/eu/LC_MESSAGES/sound-juicer.mo
 share/locale/fa/LC_MESSAGES/sound-juicer.mo
 share/locale/fi/LC_MESSAGES/sound-juicer.mo
 share/locale/fr/LC_MESSAGES/sound-juicer.mo
 share/locale/ga/LC_MESSAGES/sound-juicer.mo
 share/locale/gl/LC_MESSAGES/sound-juicer.mo
 share/locale/gu/LC_MESSAGES/sound-juicer.mo
 share/locale/he/LC_MESSAGES/sound-juicer.mo
@ -109,6 +116,7 @@ share/locale/ko/LC_MESSAGES/sound-juicer.mo
 share/locale/ku/LC_MESSAGES/sound-juicer.mo
 share/locale/lt/LC_MESSAGES/sound-juicer.mo
 share/locale/lv/LC_MESSAGES/sound-juicer.mo
 share/locale/mai/LC_MESSAGES/sound-juicer.mo
 share/locale/mk/LC_MESSAGES/sound-juicer.mo
 share/locale/ml/LC_MESSAGES/sound-juicer.mo
 share/locale/mn/LC_MESSAGES/sound-juicer.mo
@ -148,6 +156,7 @@ share/locale/zh_TW/LC_MESSAGES/sound-juicer.mo
 share/omf/sound-juicer/sound-juicer-C.omf
 share/omf/sound-juicer/sound-juicer-ar.omf
 share/omf/sound-juicer/sound-juicer-ca.omf
 share/omf/sound-juicer/sound-juicer-cs.omf
 share/omf/sound-juicer/sound-juicer-de.omf
 share/omf/sound-juicer/sound-juicer-el.omf
 share/omf/sound-juicer/sound-juicer-en_GB.omf
@ -190,6 +199,8 @@ share/omf/sound-juicer/sound-juicer-uk.omf
@dirrm share/gnome/help/sound-juicer/el
@dirrm share/gnome/help/sound-juicer/de/figures
@dirrm share/gnome/help/sound-juicer/de
@dirrm share/gnome/help/sound-juicer/cs/figures
@dirrm share/gnome/help/sound-juicer/cs
@dirrm share/gnome/help/sound-juicer/ca/figures
@dirrm share/gnome/help/sound-juicer/ca
@dirrm share/gnome/help/sound-juicer/ar/figures
@ -218,10 +229,16 @@ share/omf/sound-juicer/sound-juicer-uk.omf
@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
--- a/cad/geda-gattrib/Makefile
+++ b/cad/geda-gattrib/Makefile
@ -7,7 +7,7 @@
 PORTNAME=	gattrib
 PORTVERSION=	1.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/release/v1.4/${PORTVERSION}/ \
@ -45,5 +45,8 @@ post-patch:
 	@${REINPLACE_CMD} -E \
 		-e "s,^(DATADIR[[:space:]]*=[[:space:]]*)gEDA,\1geda," \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|>n_bytes|>x_n_bytes|g' \
 		-e 's|>text_size|>x_text_size|g' \
 		${WRKSRC}/src/gtkitementry_2_2.c
 .include <bsd.port.mk>
--- a/converters/pdf2djvu/Makefile
+++ b/converters/pdf2djvu/Makefile
@ -7,6 +7,7 @@
 PORTNAME=	pdf2djvu
 PORTVERSION=	0.5.11
 PORTREVISION=	1
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFFIX}
@ -15,7 +16,7 @@ MAINTAINER=	darcsis@gmail.com
 COMMENT=	Pdf2djvu creates DjVu files from PDF files
 BUILD_DEPENDS=	${LOCALBASE}/include/pstreams/pstream.h:${PORTSDIR}/devel/pstreams
-LIB_DEPENDS=	poppler.4:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS=	poppler.5:${PORTSDIR}/graphics/poppler
 LIB_DEPENDS+=	djvulibre.22:${PORTSDIR}/graphics/djvulibre-nox11
 GNU_CONFIGURE=	yes
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/databases/evolution-data-server/Makefile,v 1.5 2009/04/15 23:04:33 kwm Exp $
+#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.181 2009/10/18 04:17:46 marcus Exp $
 #
 PORTNAME=	evolution-data-server
-PORTVERSION=	2.26.3
+PORTVERSION=	2.28.1
 PORTREVISION=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -27,8 +26,8 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_BISON=	build
 USE_GETTEXT=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui ltverhack \
+USE_GNOME=	gnomeprefix gnomehack intlhack ltverhack ltasneededhack \
-		ltasneededhack
+		libglade2 libbonobo
 USE_OPENLDAP=	yes
 USE_AUTOTOOLS=	libtool:22
 USE_BDB=	41+
@ -41,7 +40,7 @@ CONFIGURE_ARGS=	--enable-static \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-PLIST_SUB=	VERSION="2.26" EVO_VERSION="1.2"
+PLIST_SUB=	VERSION="2.28" EVO_VERSION="1.2"
 #OPTIONS=	IMAP4	"Enable experimental IMAP4 backend" off
 OPTIONS=	WEATHER "Enable weather calendar backend" on
@ -82,7 +81,8 @@ pre-everything::
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g ; \
-		s|heimlibs=".*"|heimlibs="${KRB5_LIB}"|g' \
+		s|heimlibs=".*"|heimlibs="${KRB5_LIB}"|g ; \
 		s|-Wmissing-include-dirs||g' \
 			${WRKSRC}/configure
 .include <bsd.port.post.mk>
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-data-server-2.26.3.tar.bz2) = 01205605a598253bc227ff360c7c3dad
+MD5 (gnome2/evolution-data-server-2.28.1.tar.bz2) = ea516bef48900020c4f137514123e34d
-SHA256 (gnome2/evolution-data-server-2.26.3.tar.bz2) = ed2698d64dc663900b50f7a461d79c25e310462b7d41b1073257cbf950e75071
+SHA256 (gnome2/evolution-data-server-2.28.1.tar.bz2) = 651de21c10765d4b6503ff59aa50c8b9e1bc704d94341d9a275e3b50d68dae8a
-SIZE (gnome2/evolution-data-server-2.26.3.tar.bz2) = 7167764
+SIZE (gnome2/evolution-data-server-2.28.1.tar.bz2) = 22309681
--- a/databases/evolution-data-server/files/patch-configure
+++ b/databases/evolution-data-server/files/patch-configure
@ -1,8 +1,8 @@
--- configure.orig	Mon Jun 18 23:55:48 2007
+--- configure.orig	2009-08-24 10:39:07.000000000 +0200
-+++ configure	Mon Jun 18 23:56:20 2007
+++ configure	2009-08-24 10:44:47.000000000 +0200
-@@ -24562,6 +24562,14 @@ case "$host" in
+@@ -15988,6 +15988,14 @@ cat >>confdefs.h <<\_ACEOF
-     # AC_CACHE_VAL(have_addrinfo, [have_addrinfo=yes])
+ _ACEOF
-     # AC_DEFINE(_WIN32_WINNT, 0x501, [To get getaddrinfo etc declarations])
+ 
 	;;
 +*freebsd*)
 +	os_win32=no
@ -12,19 +12,10 @@
 +	SOFTOKN3_LIB='-lsoftokn3'
 +	LIBEXECDIR_IN_SERVER_FILE="$libexecdir"
 +	;;
- *)  os_win32=no
+ *)
 	os_win32=no
 	NO_UNDEFINED=''
-     SOCKET_LIBS=''
+@@ -24777,7 +24785,7 @@ idldir='${datadir}'/idl/evolution-data-s
@@ -28651,7 +28659,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 		#include <sys/socket.h>
 		#include <netinet/in.h>
 		#include <netdb.h>
 -
 +		#include <stdio.h>
 int
 main ()
@@ -33825,7 +33833,7 @@ idldir='${datadir}'/idl/evolution-data-s
 imagesdir='${datadir}'/pixmaps/evolution-data-server
--- a/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in
+++ b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in
@ -1,22 +1,11 @@
--- docs/reference/camel/Makefile.in.orig	2009-07-04 12:06:59.000000000 +0200
+--- docs/reference/camel/Makefile.in.orig	2009-07-27 22:42:25.000000000 +0200
-+++ docs/reference/camel/Makefile.in	2009-07-04 12:23:53.000000000 +0200
+++ docs/reference/camel/Makefile.in	2009-07-27 22:42:50.000000000 +0200
-@@ -127,7 +127,7 @@
+@@ -137,7 +137,7 @@ GNOME_PLATFORM_LIBS = @GNOME_PLATFORM_LI
 GOBJECT_QUERY = @GOBJECT_QUERY@
 GREP = @GREP@
 HAVE_JW = @HAVE_JW@
 -HTML_DIR = $(datadir)/gtk-doc/html
-+HTML_DIR = $(prefix)/share/doc
+HTML_DIR = $(datadir)/doc
 ICONV_CFLAGS = @ICONV_CFLAGS@
 ICONV_LIBS = @ICONV_LIBS@
 IDL_INCLUDES = @IDL_INCLUDES@
-@@ -731,8 +731,9 @@
+ INSTALL = @INSTALL@
 	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
 	  fi; \
 -	  $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
 +	  cp -R html/* $(HTML_DIR)/camel; \
 	fi
 +#	  $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
 uninstall-local:
 	@if test -n "$(DOC_MODULE_VERSION)"; then \
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@ -183,6 +183,7 @@ include/evolution-data-server-%%VERSION%%/libebook/e-vcard.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-check-timezones.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-component.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-recur.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-system-timezone.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-time-util.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-types.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-util.h
@ -203,8 +204,10 @@ include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/Evolution-DataServer-Calendar.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-cache.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-factory.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-file-store.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-loader-factory.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sexp.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-store.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sync.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-util.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend.h
@ -579,6 +582,7 @@ share/doc/libecal/ix01.html
 share/doc/libecal/left.png
 share/doc/libecal/libecal-e-cal-check-timezones.html
 share/doc/libecal/libecal-e-cal-recur.html
 share/doc/libecal/libecal-e-cal-system-timezone.html
 share/doc/libecal/libecal-e-cal-time-util.html
 share/doc/libecal/libecal-e-cal-types.html
 share/doc/libecal/libecal-e-cal-util.html
@ -601,9 +605,6 @@ share/doc/libedata-book/index.html
 share/doc/libedata-book/index.sgml
 share/doc/libedata-book/ix01.html
 share/doc/libedata-book/left.png
 share/doc/libedata-book/libedata-book-EDataBookFactory.html
 share/doc/libedata-book/libedata-book-e-book-backend-db-cache.html
 share/doc/libedata-book/libedata-book-ximian-vcard.html
 share/doc/libedata-book/libedata-book.devhelp
 share/doc/libedata-book/libedata-book.devhelp2
 share/doc/libedata-book/right.png
@ -623,7 +624,6 @@ share/doc/libedata-cal/index.html
 share/doc/libedata-cal/index.sgml
 share/doc/libedata-cal/ix01.html
 share/doc/libedata-cal/left.png
 share/doc/libedata-cal/libedata-cal-e-cal-backend-util.html
 share/doc/libedata-cal/libedata-cal.devhelp
 share/doc/libedata-cal/libedata-cal.devhelp2
 share/doc/libedata-cal/right.png
@ -647,7 +647,6 @@ share/doc/libedataserver/left.png
 share/doc/libedataserver/libedataserver-EFlag.html
 share/doc/libedataserver/libedataserver-EProxy.html
 share/doc/libedataserver/libedataserver-ESExp.html
 share/doc/libedataserver/libedataserver-Version-Information.html
 share/doc/libedataserver/libedataserver-e-categories.html
 share/doc/libedataserver/libedataserver-e-iconv.html
 share/doc/libedataserver/libedataserver-e-memory.html
@ -683,10 +682,6 @@ share/doc/libedataserverui/index.html
 share/doc/libedataserverui/index.sgml
 share/doc/libedataserverui/ix01.html
 share/doc/libedataserverui/left.png
 share/doc/libedataserverui/libedataserverui-ECategoryCompletion.html
 share/doc/libedataserverui/libedataserverui-ECellRendererColor.html
 share/doc/libedataserverui/libedataserverui-e-book-auth-util.html
 share/doc/libedataserverui/libedataserverui-e-data-server-ui-marshal.html
 share/doc/libedataserverui/libedataserverui-e-passwords.html
 share/doc/libedataserverui/libedataserverui.devhelp
 share/doc/libedataserverui/libedataserverui.devhelp2
@ -703,6 +698,7 @@ share/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer.idl
 share/locale/am/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ar/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/as/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ast/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/be/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@ -710,6 +706,7 @@ share/locale/bn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/bn_IN/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/bs/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ca@valencia/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/cy/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/da/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@ -849,7 +846,11 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/ast/LC_MESSAGES
@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@ -3,12 +3,11 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/glom/Makefile,v 1.24 2009/03/17 16:33:41 kwm Exp $
+#   $MCom: ports/databases/glom/Makefile,v 1.28 2009/10/11 10:43:05 kwm Exp $
 #
 PORTNAME=	glom
-PORTVERSION=	1.10.1
+PORTVERSION=	1.12.2
 PORTREVISION=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -16,8 +15,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	GNOME database designer and user interface
-LIB_DEPENDS=	bakery-2.6:${PORTSDIR}/x11-toolkits/bakery \
+LIB_DEPENDS=	gdamm-4.0.12:${PORTSDIR}/databases/libgdamm \
-		gdamm-4.0.11:${PORTSDIR}/databases/libgdamm \
+		gconfmm-2.0.1:${PORTSDIR}/devel/gconfmm \
 		gtksourceviewmm-2.0.2:${PORTSDIR}/x11-toolkits/libgtksourceviewmm \
 		avahi-ui.0:${PORTSDIR}/net/avahi-gtk \
 		epc-1.0.2:${PORTSDIR}/www/libepc \
--- a/databases/glom/distinfo
+++ b/databases/glom/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/glom-1.10.1.tar.bz2) = 611a9cc73aadd1ff5fdc4dd81e240822
+MD5 (gnome2/glom-1.12.2.tar.bz2) = 8f4de116f28501decc0df956ee003809
-SHA256 (gnome2/glom-1.10.1.tar.bz2) = 76018d2e942ee7581b58c45bb045d35ff465ab3efd86d4bfecd6c8f543b96ce6
+SHA256 (gnome2/glom-1.12.2.tar.bz2) = 5ce8bc49d9d6402db540d14c8c16a2407cbf7a588139a4e2942442ead1952992
-SIZE (gnome2/glom-1.10.1.tar.bz2) = 3308723
+SIZE (gnome2/glom-1.12.2.tar.bz2) = 3239342
--- a/databases/glom/pkg-plist
+++ b/databases/glom/pkg-plist
@ -1,59 +1,57 @@
 bin/glom
-include/glom-1.0/libglom/appstate.h
+include/glom-1.12/libglom/appstate.h
-include/glom-1.0/libglom/data_structure/field.h
+include/glom-1.12/libglom/data_structure/field.h
-include/glom-1.0/libglom/data_structure/fieldtypes.h
+include/glom-1.12/libglom/data_structure/fieldtypes.h
-include/glom-1.0/libglom/data_structure/foundset.h
+include/glom-1.12/libglom/data_structure/foundset.h
-include/glom-1.0/libglom/data_structure/glomconversions.h
+include/glom-1.12/libglom/data_structure/glomconversions.h
-include/glom-1.0/libglom/data_structure/groupinfo.h
+include/glom-1.12/libglom/data_structure/groupinfo.h
-include/glom-1.0/libglom/data_structure/iso_codes.h
+include/glom-1.12/libglom/data_structure/layout/custom_title.h
-include/glom-1.0/libglom/data_structure/layout/custom_title.h
+include/glom-1.12/libglom/data_structure/layout/fieldformatting.h
-include/glom-1.0/libglom/data_structure/layout/fieldformatting.h
+include/glom-1.12/libglom/data_structure/layout/layoutgroup.h
-include/glom-1.0/libglom/data_structure/layout/layoutgroup.h
+include/glom-1.12/libglom/data_structure/layout/layoutitem.h
-include/glom-1.0/libglom/data_structure/layout/layoutitem.h
+include/glom-1.12/libglom/data_structure/layout/layoutitem_button.h
-include/glom-1.0/libglom/data_structure/layout/layoutitem_button.h
+include/glom-1.12/libglom/data_structure/layout/layoutitem_calendarportal.h
-include/glom-1.0/libglom/data_structure/layout/layoutitem_calendarportal.h
+include/glom-1.12/libglom/data_structure/layout/layoutitem_field.h
-include/glom-1.0/libglom/data_structure/layout/layoutitem_field.h
+include/glom-1.12/libglom/data_structure/layout/layoutitem_image.h
-include/glom-1.0/libglom/data_structure/layout/layoutitem_image.h
+include/glom-1.12/libglom/data_structure/layout/layoutitem_line.h
-include/glom-1.0/libglom/data_structure/layout/layoutitem_line.h
+include/glom-1.12/libglom/data_structure/layout/layoutitem_notebook.h
-include/glom-1.0/libglom/data_structure/layout/layoutitem_notebook.h
+include/glom-1.12/libglom/data_structure/layout/layoutitem_placeholder.h
-include/glom-1.0/libglom/data_structure/layout/layoutitem_placeholder.h
+include/glom-1.12/libglom/data_structure/layout/layoutitem_portal.h
-include/glom-1.0/libglom/data_structure/layout/layoutitem_portal.h
+include/glom-1.12/libglom/data_structure/layout/layoutitem_text.h
-include/glom-1.0/libglom/data_structure/layout/layoutitem_text.h
+include/glom-1.12/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h
-include/glom-1.0/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h
+include/glom-1.12/libglom/data_structure/layout/report_parts/layoutitem_footer.h
-include/glom-1.0/libglom/data_structure/layout/report_parts/layoutitem_footer.h
+include/glom-1.12/libglom/data_structure/layout/report_parts/layoutitem_groupby.h
-include/glom-1.0/libglom/data_structure/layout/report_parts/layoutitem_groupby.h
+include/glom-1.12/libglom/data_structure/layout/report_parts/layoutitem_header.h
-include/glom-1.0/libglom/data_structure/layout/report_parts/layoutitem_header.h
+include/glom-1.12/libglom/data_structure/layout/report_parts/layoutitem_summary.h
-include/glom-1.0/libglom/data_structure/layout/report_parts/layoutitem_summary.h
+include/glom-1.12/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h
-include/glom-1.0/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h
+include/glom-1.12/libglom/data_structure/layout/usesrelationship.h
-include/glom-1.0/libglom/data_structure/layout/usesrelationship.h
+include/glom-1.12/libglom/data_structure/numeric_format.h
-include/glom-1.0/libglom/data_structure/numeric_format.h
+include/glom-1.12/libglom/data_structure/parameternamegenerator.h
-include/glom-1.0/libglom/data_structure/parameternamegenerator.h
+include/glom-1.12/libglom/data_structure/print_layout.h
-include/glom-1.0/libglom/data_structure/print_layout.h
+include/glom-1.12/libglom/data_structure/privileges.h
-include/glom-1.0/libglom/data_structure/privileges.h
+include/glom-1.12/libglom/data_structure/relationship.h
-include/glom-1.0/libglom/data_structure/relationship.h
+include/glom-1.12/libglom/data_structure/report.h
-include/glom-1.0/libglom/data_structure/report.h
+include/glom-1.12/libglom/data_structure/system_prefs.h
-include/glom-1.0/libglom/data_structure/system_prefs.h
+include/glom-1.12/libglom/data_structure/tableinfo.h
-include/glom-1.0/libglom/data_structure/tableinfo.h
+include/glom-1.12/libglom/data_structure/translatable_item.h
-include/glom-1.0/libglom/data_structure/translatable_item.h
+include/glom-1.12/libglom/document/bakery/document.h
-include/glom-1.0/libglom/document/document_glom.h
+include/glom-1.12/libglom/document/bakery/document_xml.h
-include/glom-1.0/libglom/document/view.h
+include/glom-1.12/libglom/document/bakery/view/view.h
-include/glom-1.0/libglom/libglom_config.h
+include/glom-1.12/libglom/document/bakery/view/view_composite.h
-include/glom-1.0/libglom/sharedptr.h
+include/glom-1.12/libglom/document/bakery/view/viewbase.h
-include/glom-1.0/libglom/standard_table_prefs_fields.h
+include/glom-1.12/libglom/document/document.h
-lib/libglom-1.0.a
+include/glom-1.12/libglom/document/view.h
-lib/libglom-1.0.la
+include/glom-1.12/libglom/init.h
-lib/libglom-1.0.so
+include/glom-1.12/libglom/libglom_config.h
-lib/libglom-1.0.so.0
+include/glom-1.12/libglom/sharedptr.h
-%%PYTHON_SITELIBDIR%%/glom.a
+include/glom-1.12/libglom/standard_table_prefs_fields.h
-%%PYTHON_SITELIBDIR%%/glom.la
+lib/libglom-1.12.la
-%%PYTHON_SITELIBDIR%%/glom.so
+lib/libglom-1.12.so
-libdata/pkgconfig/glom-1.0.pc
+lib/libglom-1.12.so.0
 %%PYTHON_SITELIBDIR%%/glom_1_12.la
 %%PYTHON_SITELIBDIR%%/glom_1_12.so
 libdata/pkgconfig/glom-1.12.pc
 share/applications/glom.desktop
 %%DATADIR%%/doc/examples/example_film_manager.glom
 %%DATADIR%%/doc/examples/example_lesson_planner.glom
 %%DATADIR%%/doc/examples/example_music_collection.glom
 %%DATADIR%%/doc/examples/example_project_manager.glom
 %%DATADIR%%/doc/examples/example_smallbusiness.glom
 %%DATADIR%%/glade/glom_developer.glade
 %%DATADIR%%/glade/glom.glade
 %%DATADIR%%/glom_document.dtd
@ -68,6 +66,12 @@ share/applications/glom.desktop
 %%DATADIR%%/pixmaps/glom-text.png
 %%DATADIR%%/xslt/print_details_to_html.xsl
 %%DATADIR%%/xslt/print_report_to_html.xsl
 %%DOCSDIR%%/examples/README
 %%DOCSDIR%%/examples/example_film_manager.glom
 %%DOCSDIR%%/examples/example_lesson_planner.glom
 %%DOCSDIR%%/examples/example_music_collection.glom
 %%DOCSDIR%%/examples/example_project_manager.glom
 %%DOCSDIR%%/examples/example_smallbusiness.glom
 share/gnome/help/glom/C/figures/glom_data_details.png
 share/gnome/help/glom/C/figures/glom_data_list.png
 share/gnome/help/glom/C/figures/glom_design_fields.png
@ -176,8 +180,6 @@ share/gnome/help/glom/sv/figures/glom_tables.png
 share/gnome/help/glom/sv/figures/start.png
 share/gnome/help/glom/sv/glom.xml
 share/gnome/help/glom/sv/legal.xml
 share/mime-info/glom.keys
 share/mime-info/glom.mime
 share/icons/hicolor/16x16/apps/glom.png
 share/icons/hicolor/22x22/apps/glom.png
 share/icons/hicolor/24x24/apps/glom.png
@ -211,6 +213,7 @@ share/locale/sv/LC_MESSAGES/glom.mo
 share/locale/tr/LC_MESSAGES/glom.mo
 share/locale/vi/LC_MESSAGES/glom.mo
 share/locale/zh_CN/LC_MESSAGES/glom.mo
 share/mime/application/x-glom.xml
 share/mime/packages/glom.xml
 share/omf/glom/glom-C.omf
 share/omf/glom/glom-de.omf
@ -232,11 +235,10 @@ share/omf/glom/glom-sv.omf
@dirrm share/gnome/help/glom/C/figures
@dirrm share/gnome/help/glom/C
@dirrm share/gnome/help/glom
@dirrm %%DOCSDIR%%/examples
@dirrm %%DATADIR%%/xslt
@dirrm %%DATADIR%%/pixmaps
@dirrm %%DATADIR%%/glade
@dirrm %%DATADIR%%/doc/examples
@dirrm %%DATADIR%%/doc
@dirrm %%DATADIR%%
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@ -245,9 +247,11 @@ share/omf/glom/glom-sv.omf
@dirrmtry share/locale/rw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrm include/glom-1.0/libglom/document
+@dirrm include/glom-1.12/libglom/document/bakery/view
-@dirrm include/glom-1.0/libglom/data_structure/layout/report_parts
+@dirrm include/glom-1.12/libglom/document/bakery
-@dirrm include/glom-1.0/libglom/data_structure/layout
+@dirrm include/glom-1.12/libglom/document
-@dirrm include/glom-1.0/libglom/data_structure
+@dirrm include/glom-1.12/libglom/data_structure/layout/report_parts
-@dirrm include/glom-1.0/libglom
+@dirrm include/glom-1.12/libglom/data_structure/layout
-@dirrm include/glom-1.0
+@dirrm include/glom-1.12/libglom/data_structure
@dirrm include/glom-1.12/libglom
@dirrm include/glom-1.12
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@ -3,12 +3,11 @@
 # Whom:                 Alexander Nedotsukov <bland@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgdamm/Makefile,v 1.15 2009/04/09 03:24:07 mezz Exp $
+#   $MCom: ports/databases/libgdamm/Makefile,v 1.18 2009/11/28 05:58:58 mezz Exp $
 #
 PORTNAME=	libgdamm
-PORTVERSION=	3.99.16
+PORTVERSION=	3.99.17.1
 PORTREVISION=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -25,10 +24,6 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack libgda4
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--enable-static
+CONFIGURE_ARGS=	--enable-static --disable-documentation
 post-patch:
 	@${REINPLACE_CMD} -e "s|\(-lglibmm\)|-L\$$(GMM_PROCDIR)/../.. \1|" \
 		${WRKSRC}/tools/extra_defs_gen/Makefile.in
 .include <bsd.port.mk>
--- a/databases/libgdamm/distinfo
+++ b/databases/libgdamm/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/libgdamm-3.99.16.tar.bz2) = 975e90bfaa21491c71cbe12741b24ba2
+MD5 (gnome2/libgdamm-3.99.17.1.tar.bz2) = 227d838905b45e8ccd6440cf661630fc
-SHA256 (gnome2/libgdamm-3.99.16.tar.bz2) = 37189b5ebbfb05f9b2916bc6f36bf770139dcf9c983b65d2c47eb6d337e38a3d
+SHA256 (gnome2/libgdamm-3.99.17.1.tar.bz2) = d3078223d4589ee69af94a649a156a933cc8b058fc24064fd440724f234a50db
-SIZE (gnome2/libgdamm-3.99.16.tar.bz2) = 836649
+SIZE (gnome2/libgdamm-3.99.17.1.tar.bz2) = 924028
--- a/databases/libgdamm/pkg-plist
+++ b/databases/libgdamm/pkg-plist
@ -67,19 +67,16 @@ include/libgdamm-4.0/libgdamm/set.h
 include/libgdamm-4.0/libgdamm/sqlparser.h
 include/libgdamm-4.0/libgdamm/statement.h
 include/libgdamm-4.0/libgdamm/transactionstatus.h
 include/libgdamm-4.0/libgdamm/throw_exception.h
 include/libgdamm-4.0/libgdamm/value.h
 include/libgdamm-4.0/libgdamm/wrap_init.h
 include/libgdamm-4.0/libgdamm/xatransaction.h
 lib/libgdamm-4.0.a
 lib/libgdamm-4.0.la
 lib/libgdamm-4.0.so
-lib/libgdamm-4.0.so.11
+lib/libgdamm-4.0.so.12
 lib/libgdamm-4.0/include/libgdammconfig.h
 lib/libgdamm-4.0/proc/m4/convert.m4
 lib/libgdamm-4.0/proc/m4/convert_libgdamm.m4
 libdata/pkgconfig/libgdamm-4.0.pc
@dirrm lib/libgdamm-4.0/proc/m4
@dirrm lib/libgdamm-4.0/proc
@dirrm lib/libgdamm-4.0/include
@dirrm lib/libgdamm-4.0
@dirrm include/libgdamm-4.0/libgdamm/private
--- a/databases/mysql-gui-tools/Makefile
+++ b/databases/mysql-gui-tools/Makefile
@ -8,6 +8,7 @@
 PORTNAME=	mysql-gui-tools
 PORTVERSION=	5.0r14
 PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQLGUITools
@ -24,15 +25,16 @@ OPTIONS=	QUERY_BROWSER	"Build the MySQL Query Browser"	on \
 		ADMINISTRATOR	"Build the MySQL Administrator"	on
 USE_AUTOTOOLS=	autoconf:262 libtool:22 automake:110
-USE_GNOME=	gnomelibs libglade2 gtkhtml3 libgnomeprint intlhack gtksourceview
+USE_GNOME=	libgnome libglade2 gtkhtml3 libgnomeprint intlhack gtksourceview
 USE_GL=		gl glut
 USE_GMAKE=	yes
 DATADIR=	${PREFIX}/share/mysql-gui
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=	--with-gtkhtml=libgtkhtml-3.14
 .include <bsd.port.pre.mk>
--- a/databases/mysql-gui-tools/files/patch-query-browser-configure.in
+++ b/databases/mysql-gui-tools/files/patch-query-browser-configure.in
@ -0,0 +1,21 @@
 --- query-browser/configure.in.orig	2009-09-27 23:40:34.000000000 +0200
 +++ query-browser/configure.in	2009-09-27 23:41:02.000000000 +0200
@@ -66,7 +66,7 @@
      gtkhtml=$withval, gtkhtml=libgtkhtml-3.0)
 -PKG_CHECK_MODULES(GLIB, [glib-2.0 libxml-2.0 >= 2.6.2])
 +PKG_CHECK_MODULES(GLIB, [glib-2.0 libxml-2.0 >= 2.6.2 libgnome-2.0])
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
@@ -74,7 +74,8 @@
 			gthread-2.0
 			libxml-2.0 >= 2.6.2
                         $gtkhtml
 -                        gtkmm-2.4])
 +                        gtkmm-2.4
 +			libgnome-2.0])
 AC_SUBST(GNOME_CFLAGS)
 AC_SUBST(GNOME_LIBS)
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@ -87,6 +87,7 @@
    SUBDIR += gnome-main-menu
    SUBDIR += gnome-pim
    SUBDIR += gnome-utils
    SUBDIR += gnote
    SUBDIR += gnotime
    SUBDIR += gnustep-notebook
    SUBDIR += gnustep-wrapper
--- a/deskutils/alacarte/Makefile
+++ b/deskutils/alacarte/Makefile
@ -3,12 +3,11 @@
 # Whom:					FreeBSD GNOME Team
 #
 # $FreeBSD$
-#    $MCom: ports/deskutils/alacarte/Makefile,v 1.20 2008/09/29 15:18:59 marcus Exp $
+#    $MCom: ports/deskutils/alacarte/Makefile,v 1.23 2009/09/21 16:31:27 kwm Exp $
 #
 PORTNAME=	alacarte
-PORTVERSION=	0.12.1
+PORTVERSION=	0.12.4
 PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
--- a/deskutils/alacarte/distinfo
+++ b/deskutils/alacarte/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/alacarte-0.12.1.tar.bz2) = c6d77f7e5ee6129532e4bb1a35a07194
+MD5 (gnome2/alacarte-0.12.4.tar.bz2) = 914f863f6bd152b4ab6407d07d853f45
-SHA256 (gnome2/alacarte-0.12.1.tar.bz2) = 1991b715431e792976644cc49c90b44dd010245b6c54312b67e0587bcb741d19
+SHA256 (gnome2/alacarte-0.12.4.tar.bz2) = f5bccd47d96b22ee73cf537d86bb90cb7b7e0f70ac68253fe512540e5bf64823
-SIZE (gnome2/alacarte-0.12.1.tar.bz2) = 181165
+SIZE (gnome2/alacarte-0.12.4.tar.bz2) = 189318
--- a/deskutils/alacarte/pkg-plist
+++ b/deskutils/alacarte/pkg-plist
@ -31,9 +31,12 @@ share/locale/bem/LC_MESSAGES/alacarte.mo
 share/locale/bg/LC_MESSAGES/alacarte.mo
 share/locale/bn/LC_MESSAGES/alacarte.mo
 share/locale/bn_IN/LC_MESSAGES/alacarte.mo
 share/locale/br/LC_MESSAGES/alacarte.mo
 share/locale/ca/LC_MESSAGES/alacarte.mo
 share/locale/ca@valencia/LC_MESSAGES/alacarte.mo
 share/locale/crh/LC_MESSAGES/alacarte.mo
 share/locale/cs/LC_MESSAGES/alacarte.mo
 share/locale/cy/LC_MESSAGES/alacarte.mo
 share/locale/da/LC_MESSAGES/alacarte.mo
 share/locale/de/LC_MESSAGES/alacarte.mo
 share/locale/dz/LC_MESSAGES/alacarte.mo
@ -66,12 +69,14 @@ share/locale/ko/LC_MESSAGES/alacarte.mo
 share/locale/ku/LC_MESSAGES/alacarte.mo
 share/locale/lt/LC_MESSAGES/alacarte.mo
 share/locale/lv/LC_MESSAGES/alacarte.mo
 share/locale/mai/LC_MESSAGES/alacarte.mo
 share/locale/mg/LC_MESSAGES/alacarte.mo
 share/locale/mk/LC_MESSAGES/alacarte.mo
 share/locale/ml/LC_MESSAGES/alacarte.mo
 share/locale/mn/LC_MESSAGES/alacarte.mo
 share/locale/mr/LC_MESSAGES/alacarte.mo
 share/locale/nb/LC_MESSAGES/alacarte.mo
 share/locale/nds/LC_MESSAGES/alacarte.mo
 share/locale/nl/LC_MESSAGES/alacarte.mo
 share/locale/nn/LC_MESSAGES/alacarte.mo
 share/locale/oc/LC_MESSAGES/alacarte.mo
@ -119,10 +124,14 @@ share/locale/zh_TW/LC_MESSAGES/alacarte.mo
@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
@dirrmtry share/locale/nds/LC_MESSAGES
@dirrmtry share/locale/nds
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/kk/LC_MESSAGES
@ -135,6 +144,8 @@ share/locale/zh_TW/LC_MESSAGES/alacarte.mo
@dirrmtry share/locale/dz
@dirrmtry share/locale/crh/LC_MESSAGES
@dirrmtry share/locale/crh
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/bem/LC_MESSAGES
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@ -3,12 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/deskutils/deskbar-applet/Makefile,v 1.3 2009/04/15 15:18:16 kwm Exp $
+#   $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.109 2009/09/22 10:54:20 kwm Exp $
 #
 PORTNAME=	deskbar-applet
-PORTVERSION=	2.26.2
+PORTVERSION=	2.28.0
 PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -18,7 +17,7 @@ COMMENT=	Omnipresent versatile search interface
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus \
-		${PYTHON_SITELIBDIR}/simplejson-2.0.9-py${PYTHON_VER}-${OPSYS:L}-${_OSRELEASE}-${ARCH}.egg:${PORTSDIR}/devel/py-simplejson
+		${LOCALBASE}/share/doc/py26-simplejson:${PORTSDIR}/devel/py-simplejson
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
--- a/deskutils/deskbar-applet/distinfo
+++ b/deskutils/deskbar-applet/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/deskbar-applet-2.26.2.tar.bz2) = 82bca281838b38b3d9c682ab839b7b6b
+MD5 (gnome2/deskbar-applet-2.28.0.tar.bz2) = dae686b2958688f15bb365afd8485c8e
-SHA256 (gnome2/deskbar-applet-2.26.2.tar.bz2) = 9c40f81d96c172311f4ca4c05c6718401d0958a3eb0dd7bee1dae580be0d78f6
+SHA256 (gnome2/deskbar-applet-2.28.0.tar.bz2) = bdac5c8a3595078911c1aba9f1013c936cdaaed41efbd87d092dfbc04b0ea2cb
-SIZE (gnome2/deskbar-applet-2.26.2.tar.bz2) = 981493
+SIZE (gnome2/deskbar-applet-2.28.0.tar.bz2) = 1087593
--- a/deskutils/deskbar-applet/pkg-plist
+++ b/deskutils/deskbar-applet/pkg-plist
@ -1,70 +1,70 @@
-lib/deskbar-applet/deskbar-applet
+libexec/deskbar-applet/deskbar-applet
-lib/deskbar-applet/modules-2.20-compatible/beagle-live.py
+libexec/deskbar-applet/modules-2.20-compatible/beagle-live.py
-lib/deskbar-applet/modules-2.20-compatible/beagle-live.pyc
+libexec/deskbar-applet/modules-2.20-compatible/beagle-live.pyc
-lib/deskbar-applet/modules-2.20-compatible/beagle-live.pyo
+libexec/deskbar-applet/modules-2.20-compatible/beagle-live.pyo
-lib/deskbar-applet/modules-2.20-compatible/beagle-static.py
+libexec/deskbar-applet/modules-2.20-compatible/beagle-static.py
-lib/deskbar-applet/modules-2.20-compatible/beagle-static.pyc
+libexec/deskbar-applet/modules-2.20-compatible/beagle-static.pyc
-lib/deskbar-applet/modules-2.20-compatible/beagle-static.pyo
+libexec/deskbar-applet/modules-2.20-compatible/beagle-static.pyo
-lib/deskbar-applet/modules-2.20-compatible/calculator.py
+libexec/deskbar-applet/modules-2.20-compatible/calculator.py
-lib/deskbar-applet/modules-2.20-compatible/calculator.pyc
+libexec/deskbar-applet/modules-2.20-compatible/calculator.pyc
-lib/deskbar-applet/modules-2.20-compatible/calculator.pyo
+libexec/deskbar-applet/modules-2.20-compatible/calculator.pyo
-lib/deskbar-applet/modules-2.20-compatible/desklicious.py
+libexec/deskbar-applet/modules-2.20-compatible/desklicious.py
-lib/deskbar-applet/modules-2.20-compatible/desklicious.pyc
+libexec/deskbar-applet/modules-2.20-compatible/desklicious.pyc
-lib/deskbar-applet/modules-2.20-compatible/desklicious.pyo
+libexec/deskbar-applet/modules-2.20-compatible/desklicious.pyo
-lib/deskbar-applet/modules-2.20-compatible/epiphany.py
+libexec/deskbar-applet/modules-2.20-compatible/epiphany.py
-lib/deskbar-applet/modules-2.20-compatible/epiphany.pyc
+libexec/deskbar-applet/modules-2.20-compatible/epiphany.pyc
-lib/deskbar-applet/modules-2.20-compatible/epiphany.pyo
+libexec/deskbar-applet/modules-2.20-compatible/epiphany.pyo
-%%EVO%%lib/deskbar-applet/modules-2.20-compatible/evolution.py
+%%EVO%%libexec/deskbar-applet/modules-2.20-compatible/evolution.py
-%%EVO%%lib/deskbar-applet/modules-2.20-compatible/evolution.pyc
+%%EVO%%libexec/deskbar-applet/modules-2.20-compatible/evolution.pyc
-%%EVO%%lib/deskbar-applet/modules-2.20-compatible/evolution.pyo
+%%EVO%%libexec/deskbar-applet/modules-2.20-compatible/evolution.pyo
-lib/deskbar-applet/modules-2.20-compatible/files.py
+libexec/deskbar-applet/modules-2.20-compatible/files.py
-lib/deskbar-applet/modules-2.20-compatible/files.pyc
+libexec/deskbar-applet/modules-2.20-compatible/files.pyc
-lib/deskbar-applet/modules-2.20-compatible/files.pyo
+libexec/deskbar-applet/modules-2.20-compatible/files.pyo
-lib/deskbar-applet/modules-2.20-compatible/gdmactions.py
+libexec/deskbar-applet/modules-2.20-compatible/gdmactions.py
-lib/deskbar-applet/modules-2.20-compatible/gdmactions.pyc
+libexec/deskbar-applet/modules-2.20-compatible/gdmactions.pyc
-lib/deskbar-applet/modules-2.20-compatible/gdmactions.pyo
+libexec/deskbar-applet/modules-2.20-compatible/gdmactions.pyo
-lib/deskbar-applet/modules-2.20-compatible/googlecodesearch.py
+libexec/deskbar-applet/modules-2.20-compatible/googlecodesearch.py
-lib/deskbar-applet/modules-2.20-compatible/googlecodesearch.pyc
+libexec/deskbar-applet/modules-2.20-compatible/googlecodesearch.pyc
-lib/deskbar-applet/modules-2.20-compatible/googlecodesearch.pyo
+libexec/deskbar-applet/modules-2.20-compatible/googlecodesearch.pyo
-lib/deskbar-applet/modules-2.20-compatible/googlesearch.py
+libexec/deskbar-applet/modules-2.20-compatible/googlesearch.py
-lib/deskbar-applet/modules-2.20-compatible/googlesearch.pyc
+libexec/deskbar-applet/modules-2.20-compatible/googlesearch.pyc
-lib/deskbar-applet/modules-2.20-compatible/googlesearch.pyo
+libexec/deskbar-applet/modules-2.20-compatible/googlesearch.pyo
-lib/deskbar-applet/modules-2.20-compatible/history.py
+libexec/deskbar-applet/modules-2.20-compatible/history.py
-lib/deskbar-applet/modules-2.20-compatible/history.pyc
+libexec/deskbar-applet/modules-2.20-compatible/history.pyc
-lib/deskbar-applet/modules-2.20-compatible/history.pyo
+libexec/deskbar-applet/modules-2.20-compatible/history.pyo
-lib/deskbar-applet/modules-2.20-compatible/iswitch-window.py
+libexec/deskbar-applet/modules-2.20-compatible/iswitch-window.py
-lib/deskbar-applet/modules-2.20-compatible/iswitch-window.pyc
+libexec/deskbar-applet/modules-2.20-compatible/iswitch-window.pyc
-lib/deskbar-applet/modules-2.20-compatible/iswitch-window.pyo
+libexec/deskbar-applet/modules-2.20-compatible/iswitch-window.pyo
-lib/deskbar-applet/modules-2.20-compatible/mozilla.py
+libexec/deskbar-applet/modules-2.20-compatible/mozilla.py
-lib/deskbar-applet/modules-2.20-compatible/mozilla.pyc
+libexec/deskbar-applet/modules-2.20-compatible/mozilla.pyc
-lib/deskbar-applet/modules-2.20-compatible/mozilla.pyo
+libexec/deskbar-applet/modules-2.20-compatible/mozilla.pyo
-lib/deskbar-applet/modules-2.20-compatible/opensearch.py
+libexec/deskbar-applet/modules-2.20-compatible/opensearch.py
-lib/deskbar-applet/modules-2.20-compatible/opensearch.pyc
+libexec/deskbar-applet/modules-2.20-compatible/opensearch.pyc
-lib/deskbar-applet/modules-2.20-compatible/opensearch.pyo
+libexec/deskbar-applet/modules-2.20-compatible/opensearch.pyo
-lib/deskbar-applet/modules-2.20-compatible/programs.py
+libexec/deskbar-applet/modules-2.20-compatible/programs.py
-lib/deskbar-applet/modules-2.20-compatible/programs.pyc
+libexec/deskbar-applet/modules-2.20-compatible/programs.pyc
-lib/deskbar-applet/modules-2.20-compatible/programs.pyo
+libexec/deskbar-applet/modules-2.20-compatible/programs.pyo
-lib/deskbar-applet/modules-2.20-compatible/recent.py
+libexec/deskbar-applet/modules-2.20-compatible/recent.py
-lib/deskbar-applet/modules-2.20-compatible/recent.pyc
+libexec/deskbar-applet/modules-2.20-compatible/recent.pyc
-lib/deskbar-applet/modules-2.20-compatible/recent.pyo
+libexec/deskbar-applet/modules-2.20-compatible/recent.pyo
-lib/deskbar-applet/modules-2.20-compatible/templates.py
+libexec/deskbar-applet/modules-2.20-compatible/templates.py
-lib/deskbar-applet/modules-2.20-compatible/templates.pyc
+libexec/deskbar-applet/modules-2.20-compatible/templates.pyc
-lib/deskbar-applet/modules-2.20-compatible/templates.pyo
+libexec/deskbar-applet/modules-2.20-compatible/templates.pyo
-lib/deskbar-applet/modules-2.20-compatible/tomboy.py
+libexec/deskbar-applet/modules-2.20-compatible/tomboy.py
-lib/deskbar-applet/modules-2.20-compatible/tomboy.pyc
+libexec/deskbar-applet/modules-2.20-compatible/tomboy.pyc
-lib/deskbar-applet/modules-2.20-compatible/tomboy.pyo
+libexec/deskbar-applet/modules-2.20-compatible/tomboy.pyo
-lib/deskbar-applet/modules-2.20-compatible/twitter.py
+libexec/deskbar-applet/modules-2.20-compatible/twitter.py
-lib/deskbar-applet/modules-2.20-compatible/twitter.pyc
+libexec/deskbar-applet/modules-2.20-compatible/twitter.pyc
-lib/deskbar-applet/modules-2.20-compatible/twitter.pyo
+libexec/deskbar-applet/modules-2.20-compatible/twitter.pyo
-lib/deskbar-applet/modules-2.20-compatible/web_address.py
+libexec/deskbar-applet/modules-2.20-compatible/web_address.py
-lib/deskbar-applet/modules-2.20-compatible/web_address.pyc
+libexec/deskbar-applet/modules-2.20-compatible/web_address.pyc
-lib/deskbar-applet/modules-2.20-compatible/web_address.pyo
+libexec/deskbar-applet/modules-2.20-compatible/web_address.pyo
-lib/deskbar-applet/modules-2.20-compatible/wikipedia-suggest.py
+libexec/deskbar-applet/modules-2.20-compatible/wikipedia-suggest.py
-lib/deskbar-applet/modules-2.20-compatible/wikipedia-suggest.pyc
+libexec/deskbar-applet/modules-2.20-compatible/wikipedia-suggest.pyc
-lib/deskbar-applet/modules-2.20-compatible/wikipedia-suggest.pyo
+libexec/deskbar-applet/modules-2.20-compatible/wikipedia-suggest.pyo
-lib/deskbar-applet/modules-2.20-compatible/yahoo.py
+libexec/deskbar-applet/modules-2.20-compatible/yahoo.py
-lib/deskbar-applet/modules-2.20-compatible/yahoo.pyc
+libexec/deskbar-applet/modules-2.20-compatible/yahoo.pyc
-lib/deskbar-applet/modules-2.20-compatible/yahoo.pyo
+libexec/deskbar-applet/modules-2.20-compatible/yahoo.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/__init__.py
 %%PYTHON_SITELIBDIR%%/deskbar/__init__.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/__init__.pyo
@ -176,11 +176,6 @@ lib/deskbar-applet/modules-2.20-compatible/yahoo.pyo
 %%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/handlers/evolution/__init__.pyo
 %%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/handlers/evolution/_evolution.la
 %%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/handlers/evolution/_evolution.so
 %%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient/__init__.py
 %%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient/__init__.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient/__init__.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient/_gdmclient.la
 %%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient/_gdmclient.so
 %%PYTHON_SITELIBDIR%%/deskbar/interfaces/Action.py
 %%PYTHON_SITELIBDIR%%/deskbar/interfaces/Action.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/interfaces/Action.pyo
@ -323,6 +318,12 @@ share/gnome/help/deskbar/C/legal.xml
 share/gnome/help/deskbar/ca/deskbar.xml
 share/gnome/help/deskbar/ca/figures/deskbar-applet.png
 share/gnome/help/deskbar/ca/legal.xml
 share/gnome/help/deskbar/cs/deskbar.xml
 share/gnome/help/deskbar/cs/figures/deskbar-applet.png
 share/gnome/help/deskbar/cs/legal.xml
 share/gnome/help/deskbar/da/deskbar.xml
 share/gnome/help/deskbar/da/figures/deskbar-applet.png
 share/gnome/help/deskbar/da/legal.xml
 share/gnome/help/deskbar/de/deskbar.xml
 share/gnome/help/deskbar/de/figures/deskbar-applet.png
 share/gnome/help/deskbar/de/legal.xml
@ -373,7 +374,9 @@ share/locale/be@latin/LC_MESSAGES/deskbar-applet.mo
 share/locale/bg/LC_MESSAGES/deskbar-applet.mo
 share/locale/bn/LC_MESSAGES/deskbar-applet.mo
 share/locale/bn_IN/LC_MESSAGES/deskbar-applet.mo
 share/locale/br/LC_MESSAGES/deskbar-applet.mo
 share/locale/ca/LC_MESSAGES/deskbar-applet.mo
 share/locale/ca@valencia/LC_MESSAGES/deskbar-applet.mo
 share/locale/cs/LC_MESSAGES/deskbar-applet.mo
 share/locale/cy/LC_MESSAGES/deskbar-applet.mo
 share/locale/da/LC_MESSAGES/deskbar-applet.mo
@ -388,6 +391,7 @@ share/locale/eu/LC_MESSAGES/deskbar-applet.mo
 share/locale/fa/LC_MESSAGES/deskbar-applet.mo
 share/locale/fi/LC_MESSAGES/deskbar-applet.mo
 share/locale/fr/LC_MESSAGES/deskbar-applet.mo
 share/locale/ga/LC_MESSAGES/deskbar-applet.mo
 share/locale/gl/LC_MESSAGES/deskbar-applet.mo
 share/locale/gu/LC_MESSAGES/deskbar-applet.mo
 share/locale/he/LC_MESSAGES/deskbar-applet.mo
@ -403,6 +407,7 @@ share/locale/ko/LC_MESSAGES/deskbar-applet.mo
 share/locale/ku/LC_MESSAGES/deskbar-applet.mo
 share/locale/lt/LC_MESSAGES/deskbar-applet.mo
 share/locale/lv/LC_MESSAGES/deskbar-applet.mo
 share/locale/mai/LC_MESSAGES/deskbar-applet.mo
 share/locale/mg/LC_MESSAGES/deskbar-applet.mo
 share/locale/mk/LC_MESSAGES/deskbar-applet.mo
 share/locale/ml/LC_MESSAGES/deskbar-applet.mo
@ -439,6 +444,8 @@ share/locale/zh_HK/LC_MESSAGES/deskbar-applet.mo
 share/locale/zh_TW/LC_MESSAGES/deskbar-applet.mo
 share/omf/deskbar/deskbar-C.omf
 share/omf/deskbar/deskbar-ca.omf
 share/omf/deskbar/deskbar-cs.omf
 share/omf/deskbar/deskbar-da.omf
 share/omf/deskbar/deskbar-de.omf
 share/omf/deskbar/deskbar-el.omf
 share/omf/deskbar/deskbar-en_GB.omf
@ -476,6 +483,10 @@ share/omf/deskbar/deskbar-zh_CN.omf
@dirrm share/gnome/help/deskbar/el
@dirrm share/gnome/help/deskbar/de/figures
@dirrm share/gnome/help/deskbar/de
@dirrm share/gnome/help/deskbar/da/figures
@dirrm share/gnome/help/deskbar/da
@dirrm share/gnome/help/deskbar/cs/figures
@dirrm share/gnome/help/deskbar/cs
@dirrm share/gnome/help/deskbar/ca/figures
@dirrm share/gnome/help/deskbar/ca
@dirrm share/gnome/help/deskbar/C/figures
@ -489,7 +500,6 @@ share/omf/deskbar/deskbar-zh_CN.omf
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/osutils
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/interfaces
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient
 %%EVO%%@dirrm %%PYTHON_SITELIBDIR%%/deskbar/handlers/evolution
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/handlers/actions
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/handlers
@ -498,8 +508,8 @@ share/omf/deskbar/deskbar-zh_CN.omf
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/core/_userdirs
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/core
@dirrm %%PYTHON_SITELIBDIR%%/deskbar
-@dirrm lib/deskbar-applet/modules-2.20-compatible
+@dirrm libexec/deskbar-applet/modules-2.20-compatible
-@dirrm lib/deskbar-applet
+@dirrm libexec/deskbar-applet
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/te/LC_MESSAGES
@ -516,10 +526,14 @@ share/omf/deskbar/deskbar-zh_CN.omf
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
--- a/deskutils/evolution-jescs/Makefile
+++ b/deskutils/evolution-jescs/Makefile
@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.35 2009/03/16 08:49:02 kwm Exp $
+#   $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.40 2009/11/28 05:58:58 mezz Exp $
 #
 PORTNAME=	evolution-jescs
-PORTVERSION=	2.26.0
+PORTVERSION=	2.28.0
 PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -29,8 +28,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_JOBS_UNSAFE=	yes
-EVO_VERSION=	2.26
+EVO_VERSION=	2.28
-PLIST_SUB=	EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.26"
+PLIST_SUB=	EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.28"
 post-patch:
 	@${REINPLACE_CMD} -e 's|libdir/bonobo/servers|prefix/libdata/bonobo/servers|g' \
--- a/deskutils/evolution-jescs/distinfo
+++ b/deskutils/evolution-jescs/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-jescs-2.26.0.tar.bz2) = dd59c0d9589f5ad4755fa4e473d7fe1f
+MD5 (gnome2/evolution-jescs-2.28.0.tar.bz2) = d1231c8d51502930e910dc2b17f7c947
-SHA256 (gnome2/evolution-jescs-2.26.0.tar.bz2) = cff3cf2a9ce7e68d879ef0ba47884ebbe4cdec94b7872f3ef285153bb389a8b9
+SHA256 (gnome2/evolution-jescs-2.28.0.tar.bz2) = 0441955260762aedbc705776c738c25b43855c2511c7a7b20ed806a140c40948
-SIZE (gnome2/evolution-jescs-2.26.0.tar.bz2) = 537795
+SIZE (gnome2/evolution-jescs-2.28.0.tar.bz2) = 602247
--- a/deskutils/evolution-jescs/pkg-plist
+++ b/deskutils/evolution-jescs/pkg-plist
@ -17,6 +17,7 @@ share/icons/hicolor/24x24/apps/sun-connector.png
 share/icons/hicolor/32x32/apps/sun-connector.png
 share/icons/hicolor/48x48/apps/sun-connector.png
 share/locale/ar/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/bn_IN/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
@ -26,12 +27,19 @@ share/locale/en_GB/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/es/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/fi/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/fr/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/gu/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/hi/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/it/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/ja/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/kn/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/ko/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/ml/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/mr/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/nb/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/nl/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/oc/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/or/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/pa/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/pl/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/pt/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/pt_BR/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
@ -40,6 +48,9 @@ share/locale/rw/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/sk/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/sq/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/sv/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/ta/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/te/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/th/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/uk/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/vi/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
@ -53,9 +64,13 @@ share/locale/zh_TW/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
@dirrmtry share/evolution/%%EVO_VERSION%%/icons/hicolor/16x16/categories
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/gnome-utils/Makefile,v 1.135 2009/03/21 21:35:37 marcus Exp $
+#   $MCom: ports/deskutils/gnome-utils/Makefile,v 1.143 2009/10/22 14:08:07 kwm Exp $
 #
 PORTNAME=	gnome-utils
-PORTVERSION=	2.26.0
+PORTVERSION=	2.28.1
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
@ -17,7 +16,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 support utilities
-LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop
+LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
 		canberra-gtk.0:${PORTSDIR}/audio/libcanberra
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
@ -26,16 +26,18 @@ USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomepanel \
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomepanel ltverhack
 		libgnomeprintui gnomedesktop ltverhack
 USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-MAN1=		gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1 \
+MAN1=		gnome-dictionary.1 gnome-screenshot.1 gnome-search-tool.1 \
-		baobab.1
+		gnome-system-log.1 baobab.1
 GCONF_SCHEMAS=	gnome-dictionary.schemas gnome-screenshot.schemas \
 		gnome-search-tool.schemas baobab.schemas \
 		gnome-system-log.schemas
 post-patch:
 	@${RM} ${WRKSRC}/gsearchtool/gnome-search-tool.schemas
 .include <bsd.port.mk>
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-utils-2.26.0.tar.bz2) = 667400cfb9bee954028024ac3cf91a09
+MD5 (gnome2/gnome-utils-2.28.1.tar.bz2) = 3c811993191ae0bbf8666405a504288a
-SHA256 (gnome2/gnome-utils-2.26.0.tar.bz2) = 8407acc4f1839d86157d4eb19406cb8c0762729af8d0ddcc288844ffc9ecb120
+SHA256 (gnome2/gnome-utils-2.28.1.tar.bz2) = 15fc1d7e01b959ba9f412fa28ca020ddd3e0dfbd6b73918ec75ce6d0e9492ea9
-SIZE (gnome2/gnome-utils-2.26.0.tar.bz2) = 6882359
+SIZE (gnome2/gnome-utils-2.28.1.tar.bz2) = 6827650
--- a/deskutils/gnome-utils/files/patch-logview_gtkmessagearea.c
+++ b/deskutils/gnome-utils/files/patch-logview_gtkmessagearea.c
@ -1,11 +0,0 @@
 --- logview/gtkmessagearea.c.orig	2009-03-21 17:23:53.000000000 -0400
 +++ logview/gtkmessagearea.c	2009-03-21 17:24:08.000000000 -0400
@@ -33,6 +33,8 @@
 #include "gtkmessagearea.h"
 +#include <stdlib.h>
 +
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@ -62,15 +62,18 @@ share/applications/gnome-dictionary.desktop
 share/applications/gnome-screenshot.desktop
 share/applications/gnome-search-tool.desktop
 share/applications/gnome-system-log.desktop
-share/baobab/pixmaps/baobab.glade
+share/baobab/baobab-dialog-scan-props.ui
 share/baobab/baobab-main-window.ui
 share/baobab/pixmaps/shot.png
 share/gdict-1.0/sources/default.desktop
 share/gdict-1.0/sources/spanish.desktop
 share/gdict-1.0/sources/thai.desktop
 share/gnome-2.0/ui/GNOME_DictionaryApplet.xml
-share/gnome-dictionary/gnome-dictionary-preferences.glade
+share/gnome-dictionary/gnome-dictionary-preferences.ui
 share/gnome-dictionary/gnome-dictionary-source.ui
 share/gnome-dictionary/gnome-dictionary-ui.xml
 share/gnome-screenshot/gnome-screenshot.ui
 %%DATADIR%%/logview-filter.ui
 %%DATADIR%%/logview-toolbar.xml
 share/gnome/help/baobab/C/baobab.xml
 share/gnome/help/baobab/C/figures/baobab_fullscan.png
@ -113,6 +116,14 @@ share/gnome/help/baobab/de/figures/baobab_ringschart1.png
 share/gnome/help/baobab/de/figures/baobab_ringschart2.png
 share/gnome/help/baobab/de/figures/baobab_treemaps.png
 share/gnome/help/baobab/de/figures/baobab_window.png
 share/gnome/help/baobab/el/baobab.xml
 share/gnome/help/baobab/el/figures/baobab_fullscan.png
 share/gnome/help/baobab/el/figures/baobab_prefs.png
 share/gnome/help/baobab/el/figures/baobab_remote.png
 share/gnome/help/baobab/el/figures/baobab_ringschart1.png
 share/gnome/help/baobab/el/figures/baobab_ringschart2.png
 share/gnome/help/baobab/el/figures/baobab_treemaps.png
 share/gnome/help/baobab/el/figures/baobab_window.png
 share/gnome/help/baobab/en_GB/baobab.xml
 share/gnome/help/baobab/en_GB/figures/baobab_fullscan.png
 share/gnome/help/baobab/en_GB/figures/baobab_prefs.png
@ -201,6 +212,14 @@ share/gnome/help/baobab/uk/figures/baobab_ringschart1.png
 share/gnome/help/baobab/uk/figures/baobab_ringschart2.png
 share/gnome/help/baobab/uk/figures/baobab_treemaps.png
 share/gnome/help/baobab/uk/figures/baobab_window.png
 share/gnome/help/baobab/zh_CN/baobab.xml
 share/gnome/help/baobab/zh_CN/figures/baobab_fullscan.png
 share/gnome/help/baobab/zh_CN/figures/baobab_prefs.png
 share/gnome/help/baobab/zh_CN/figures/baobab_remote.png
 share/gnome/help/baobab/zh_CN/figures/baobab_ringschart1.png
 share/gnome/help/baobab/zh_CN/figures/baobab_ringschart2.png
 share/gnome/help/baobab/zh_CN/figures/baobab_treemaps.png
 share/gnome/help/baobab/zh_CN/figures/baobab_window.png
 share/gnome/help/baobab/zh_HK/baobab.xml
 share/gnome/help/baobab/zh_HK/figures/baobab_fullscan.png
 share/gnome/help/baobab/zh_HK/figures/baobab_prefs.png
@ -236,6 +255,15 @@ share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-lookup.png
 share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-preferences-print.png
 share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-preferences-source.png
 share/gnome/help/gnome-dictionary/ca/gnome-dictionary.xml
 share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-add-source.png
 share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-applet-window.png
 share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-applet.png
 share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-application.png
 share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-find.png
 share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-lookup.png
 share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-preferences-print.png
 share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-preferences-source.png
 share/gnome/help/gnome-dictionary/cs/gnome-dictionary.xml
 share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-add-source.png
 share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-applet-window.png
 share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-applet.png
@ -349,8 +377,12 @@ share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/C/legal.xml
 share/gnome/help/gnome-search-tool/ca/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/ca/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/cs/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/cs/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/de/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/de/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/el/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/el/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/en_GB/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/en_GB/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/es/figures/gnome-search-tool_window.png
@ -409,6 +441,7 @@ share/omf/baobab/baobab-ca.omf
 share/omf/baobab/baobab-cs.omf
 share/omf/baobab/baobab-da.omf
 share/omf/baobab/baobab-de.omf
 share/omf/baobab/baobab-el.omf
 share/omf/baobab/baobab-en_GB.omf
 share/omf/baobab/baobab-es.omf
 share/omf/baobab/baobab-eu.omf
@ -420,10 +453,12 @@ share/omf/baobab/baobab-pl.omf
 share/omf/baobab/baobab-ru.omf
 share/omf/baobab/baobab-sv.omf
 share/omf/baobab/baobab-uk.omf
 share/omf/baobab/baobab-zh_CN.omf
 share/omf/baobab/baobab-zh_HK.omf
 share/omf/baobab/baobab-zh_TW.omf
 share/omf/gnome-dictionary/gnome-dictionary-C.omf
 share/omf/gnome-dictionary/gnome-dictionary-ca.omf
 share/omf/gnome-dictionary/gnome-dictionary-cs.omf
 share/omf/gnome-dictionary/gnome-dictionary-de.omf
 share/omf/gnome-dictionary/gnome-dictionary-el.omf
 share/omf/gnome-dictionary/gnome-dictionary-en_GB.omf
@ -438,7 +473,9 @@ share/omf/gnome-dictionary/gnome-dictionary-sv.omf
 share/omf/gnome-dictionary/gnome-dictionary-uk.omf
 share/omf/gnome-search-tool/gnome-search-tool-C.omf
 share/omf/gnome-search-tool/gnome-search-tool-ca.omf
 share/omf/gnome-search-tool/gnome-search-tool-cs.omf
 share/omf/gnome-search-tool/gnome-search-tool-de.omf
 share/omf/gnome-search-tool/gnome-search-tool-el.omf
 share/omf/gnome-search-tool/gnome-search-tool-en_GB.omf
 share/omf/gnome-search-tool/gnome-search-tool-es.omf
 share/omf/gnome-search-tool/gnome-search-tool-eu.omf
@ -478,8 +515,10 @@ share/locale/be@latin/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/bn/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/br/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/bs/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ca@valencia/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/cy/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-utils-2.0.mo
@ -504,7 +543,6 @@ share/locale/hu/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/id/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ka/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/kn/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ku/LC_MESSAGES/gnome-utils-2.0.mo
@ -531,7 +569,6 @@ share/locale/pt_BR/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ro/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/rw/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/si/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-utils-2.0.mo
@ -607,8 +644,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/gnome-search-tool/es
@dirrm share/gnome/help/gnome-search-tool/en_GB/figures
@dirrm share/gnome/help/gnome-search-tool/en_GB
@dirrm share/gnome/help/gnome-search-tool/el/figures
@dirrm share/gnome/help/gnome-search-tool/el
@dirrm share/gnome/help/gnome-search-tool/de/figures
@dirrm share/gnome/help/gnome-search-tool/de
@dirrm share/gnome/help/gnome-search-tool/cs/figures
@dirrm share/gnome/help/gnome-search-tool/cs
@dirrm share/gnome/help/gnome-search-tool/ca/figures
@dirrm share/gnome/help/gnome-search-tool/ca
@dirrm share/gnome/help/gnome-search-tool/C/figures
@ -638,6 +679,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/gnome-dictionary/el
@dirrm share/gnome/help/gnome-dictionary/de/figures
@dirrm share/gnome/help/gnome-dictionary/de
@dirrm share/gnome/help/gnome-dictionary/cs/figures
@dirrm share/gnome/help/gnome-dictionary/cs
@dirrm share/gnome/help/gnome-dictionary/ca/figures
@dirrm share/gnome/help/gnome-dictionary/ca
@dirrm share/gnome/help/gnome-dictionary/C/figures
@ -647,6 +690,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/baobab/zh_TW
@dirrm share/gnome/help/baobab/zh_HK/figures
@dirrm share/gnome/help/baobab/zh_HK
@dirrm share/gnome/help/baobab/zh_CN/figures
@dirrm share/gnome/help/baobab/zh_CN
@dirrm share/gnome/help/baobab/uk/figures
@dirrm share/gnome/help/baobab/uk
@dirrm share/gnome/help/baobab/sv/figures
@ -669,6 +714,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/baobab/es
@dirrm share/gnome/help/baobab/en_GB/figures
@dirrm share/gnome/help/baobab/en_GB
@dirrm share/gnome/help/baobab/el/figures
@dirrm share/gnome/help/baobab/el
@dirrm share/gnome/help/baobab/de/figures
@dirrm share/gnome/help/baobab/de
@dirrm share/gnome/help/baobab/da/figures
@ -699,8 +746,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/si/LC_MESSAGES
@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/ps/LC_MESSAGES
@ -717,6 +762,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
--- a/deskutils/gnote/Makefile
+++ b/deskutils/gnote/Makefile
@ -0,0 +1,60 @@
 # New ports collection makefile for:	gnote
 # Date created:				20 July 2009
 # Whom:					Mezz <mezz@FreeBSD.org>
 #
 # $FreeBSD$
 #   $MCom: ports/deskutils/gnote/Makefile,v 1.6 2009/11/28 17:54:22 kwm Exp $
 #
 PORTNAME=	gnote
 PORTVERSION=	0.6.3
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A port of Tomboy to C++, note taking application
 LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
 		gtkspell.0:${PORTSDIR}/textproc/gtkspell \
 		boost_filesystem.4:${PORTSDIR}/devel/boost-libs \
 		uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix gconf2 intltool ltverhack gnomepanel
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 GCONF_SCHEMAS=	gnote.schemas
 USE_AUTOTOOLS=	libtool:22
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		PANELAPPLET_LIBDIR="${PREFIX}/libdata"
 CONFIGURE_ARGS=	--disable-dbus
 DOCS=		AUTHORS COPYING ChangeLog NEWS README TODO
 MAN1=		gnote.1
 .if !defined(WITHOUT_APPLET)
 LIB_DEPENDS+=	panelappletmm-2.6:${PORTSDIR}/x11-toolkits/libpanelappletmm
 CONFIGURE_ARGS+=--enable-applet
 PLIST_SUB+=	APPLET=""
 .else
 CONFIGURE_ARGS+=--disable-applet
 PLIST_SUB+=	APPLET="@comment "
 .endif
 PLIST_SUB+=	VERSION=${PORTVERSION}
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/include/boost|${LOCALBASE}/include/boost|g' \
 		${WRKSRC}/configure
 .ifndef (NOPORTDOCS)
 post-install:
 	@${MKDIR} ${DOCSDIR}
 .for i in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
 .include <bsd.port.mk>
--- a/deskutils/gnote/distinfo
+++ b/deskutils/gnote/distinfo
@ -0,0 +1,3 @@
 MD5 (gnote-0.6.3.tar.gz) = 84df707352eae288d1d8536796ab41f8
 SHA256 (gnote-0.6.3.tar.gz) = affd34cef21883ab831b901a82804dd3bde03dc621ec4cda7ddb2f5b66ce13d9
 SIZE (gnote-0.6.3.tar.gz) = 1754426
--- a/deskutils/gnote/files/patch-src_sharp_datetime.cpp
+++ b/deskutils/gnote/files/patch-src_sharp_datetime.cpp
@ -0,0 +1,36 @@
 --- src/sharp/datetime.cpp.orig	2009-07-21 22:13:30.000000000 -0500
 +++ src/sharp/datetime.cpp	2009-07-21 22:25:29.000000000 -0500
@@ -69,14 +69,14 @@
   int DateTime::year() const
   {
     struct tm result;
 -    localtime_r(&m_date.tv_sec, &result);
 +    localtime_r((const time_t *)&m_date.tv_sec, &result);
     return result.tm_year;
   }
   int DateTime::day_of_year() const
   {
     struct tm result;
 -    localtime_r(&m_date.tv_sec, &result);
 +    localtime_r((const time_t *)&m_date.tv_sec, &result);
     return result.tm_yday;
   }
@@ -95,14 +95,14 @@
   std::string DateTime::to_string(const char * format) const
   {
     struct tm result; 
 -    return _to_string(format, localtime_r(&m_date.tv_sec, &result));
 +    return _to_string(format, localtime_r((const time_t *)&m_date.tv_sec, &result));
   }
   std::string DateTime::to_short_time_string() const
   {
     struct tm result;
 -    return _to_string("%R", localtime_r(&m_date.tv_sec, &result));
 +    return _to_string("%R", localtime_r((const time_t *)&m_date.tv_sec, &result));
   }
   std::string DateTime::to_iso8601() const
--- a/deskutils/gnote/pkg-descr
+++ b/deskutils/gnote/pkg-descr
@ -0,0 +1,6 @@
 Gnote is a port of Tomboy to C++. 
 It is the same note taking application, including most of the add-ins (more
 are to come). Synchronization support is being worked on.
 WWW: http://live.gnome.org/Gnote
--- a/deskutils/gnote/pkg-plist
+++ b/deskutils/gnote/pkg-plist
@ -0,0 +1,244 @@
 bin/gnote
 lib/gnote/addins/%%VERSION%%/backlinks.a
 lib/gnote/addins/%%VERSION%%/backlinks.la
 lib/gnote/addins/%%VERSION%%/backlinks.so
 lib/gnote/addins/%%VERSION%%/bugzilla.a
 lib/gnote/addins/%%VERSION%%/bugzilla.la
 lib/gnote/addins/%%VERSION%%/bugzilla.so
 lib/gnote/addins/%%VERSION%%/exporttohtml.a
 lib/gnote/addins/%%VERSION%%/exporttohtml.la
 lib/gnote/addins/%%VERSION%%/exporttohtml.so
 lib/gnote/addins/%%VERSION%%/fixedwidth.a
 lib/gnote/addins/%%VERSION%%/fixedwidth.la
 lib/gnote/addins/%%VERSION%%/fixedwidth.so
 lib/gnote/addins/%%VERSION%%/inserttimestamp.a
 lib/gnote/addins/%%VERSION%%/inserttimestamp.la
 lib/gnote/addins/%%VERSION%%/inserttimestamp.so
 lib/gnote/addins/%%VERSION%%/printnotes.a
 lib/gnote/addins/%%VERSION%%/printnotes.la
 lib/gnote/addins/%%VERSION%%/printnotes.so
 lib/gnote/addins/%%VERSION%%/stickynoteimport.a
 lib/gnote/addins/%%VERSION%%/stickynoteimport.la
 lib/gnote/addins/%%VERSION%%/stickynoteimport.so
 lib/gnote/addins/%%VERSION%%/tomboyimport.a
 lib/gnote/addins/%%VERSION%%/tomboyimport.la
 lib/gnote/addins/%%VERSION%%/tomboyimport.so
 lib/gnote/addins/%%VERSION%%/underline.a
 lib/gnote/addins/%%VERSION%%/underline.la
 lib/gnote/addins/%%VERSION%%/underline.so
 %%APPLET%%libdata/bonobo/servers/GNOME_GnoteApplet.server
 %%APPLET%%libexec/gnote-applet
 share/applications/gnote.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 share/gnome/help/gnote/C/figures/add-notebook-search.png
 share/gnome/help/gnote/C/figures/add-to-notebook.png
 share/gnome/help/gnote/C/figures/delete-notebook.png
 share/gnome/help/gnote/C/figures/gnote-main-menu.png
 share/gnome/help/gnote/C/figures/gnote-new-note.png
 share/gnome/help/gnote/C/figures/gnote-panel.png
 share/gnome/help/gnote/C/figures/gnote-pindown.png
 share/gnome/help/gnote/C/figures/gnote-pinup.png
 share/gnome/help/gnote/C/figures/gnote-preferences-add-ins.png
 share/gnome/help/gnote/C/figures/gnote-preferences-editing.png
 share/gnome/help/gnote/C/figures/gnote-preferences-hotkeys.png
 share/gnome/help/gnote/C/figures/gnote-preferences-synchronization.png
 share/gnome/help/gnote/C/figures/gnote-tools.png
 share/gnome/help/gnote/C/figures/move-notes-search.png
 share/gnome/help/gnote/C/figures/new-notebook.png
 share/gnome/help/gnote/C/figures/note-template.png
 share/gnome/help/gnote/C/figures/notebook-icon.png
 share/gnome/help/gnote/C/gnote.xml
 share/gnome/help/gnote/C/legal.xml
 share/gnome/help/gnote/de/figures/add-notebook-search.png
 share/gnome/help/gnote/de/figures/add-to-notebook.png
 share/gnome/help/gnote/de/figures/delete-notebook.png
 share/gnome/help/gnote/de/figures/gnote-main-menu.png
 share/gnome/help/gnote/de/figures/gnote-new-note.png
 share/gnome/help/gnote/de/figures/gnote-panel.png
 share/gnome/help/gnote/de/figures/gnote-pindown.png
 share/gnome/help/gnote/de/figures/gnote-pinup.png
 share/gnome/help/gnote/de/figures/gnote-preferences-add-ins.png
 share/gnome/help/gnote/de/figures/gnote-preferences-editing.png
 share/gnome/help/gnote/de/figures/gnote-preferences-hotkeys.png
 share/gnome/help/gnote/de/figures/gnote-preferences-synchronization.png
 share/gnome/help/gnote/de/figures/gnote-tools.png
 share/gnome/help/gnote/de/figures/move-notes-search.png
 share/gnome/help/gnote/de/figures/new-notebook.png
 share/gnome/help/gnote/de/figures/note-template.png
 share/gnome/help/gnote/de/figures/notebook-icon.png
 share/gnome/help/gnote/de/gnote.xml
 share/gnome/help/gnote/de/legal.xml
 share/gnome/help/gnote/el/figures/add-notebook-search.png
 share/gnome/help/gnote/el/figures/add-to-notebook.png
 share/gnome/help/gnote/el/figures/delete-notebook.png
 share/gnome/help/gnote/el/figures/gnote-main-menu.png
 share/gnome/help/gnote/el/figures/gnote-new-note.png
 share/gnome/help/gnote/el/figures/gnote-panel.png
 share/gnome/help/gnote/el/figures/gnote-pindown.png
 share/gnome/help/gnote/el/figures/gnote-pinup.png
 share/gnome/help/gnote/el/figures/gnote-preferences-add-ins.png
 share/gnome/help/gnote/el/figures/gnote-preferences-editing.png
 share/gnome/help/gnote/el/figures/gnote-preferences-hotkeys.png
 share/gnome/help/gnote/el/figures/gnote-preferences-synchronization.png
 share/gnome/help/gnote/el/figures/gnote-tools.png
 share/gnome/help/gnote/el/figures/move-notes-search.png
 share/gnome/help/gnote/el/figures/new-notebook.png
 share/gnome/help/gnote/el/figures/note-template.png
 share/gnome/help/gnote/el/figures/notebook-icon.png
 share/gnome/help/gnote/el/gnote.xml
 share/gnome/help/gnote/el/legal.xml
 share/gnome/help/gnote/es/figures/add-notebook-search.png
 share/gnome/help/gnote/es/figures/add-to-notebook.png
 share/gnome/help/gnote/es/figures/delete-notebook.png
 share/gnome/help/gnote/es/figures/gnote-main-menu.png
 share/gnome/help/gnote/es/figures/gnote-new-note.png
 share/gnome/help/gnote/es/figures/gnote-panel.png
 share/gnome/help/gnote/es/figures/gnote-pindown.png
 share/gnome/help/gnote/es/figures/gnote-pinup.png
 share/gnome/help/gnote/es/figures/gnote-preferences-add-ins.png
 share/gnome/help/gnote/es/figures/gnote-preferences-editing.png
 share/gnome/help/gnote/es/figures/gnote-preferences-hotkeys.png
 share/gnome/help/gnote/es/figures/gnote-preferences-synchronization.png
 share/gnome/help/gnote/es/figures/gnote-tools.png
 share/gnome/help/gnote/es/figures/move-notes-search.png
 share/gnome/help/gnote/es/figures/new-notebook.png
 share/gnome/help/gnote/es/figures/note-template.png
 share/gnome/help/gnote/es/figures/notebook-icon.png
 share/gnome/help/gnote/es/gnote.xml
 share/gnome/help/gnote/es/legal.xml
 share/gnome/help/gnote/sv/figures/add-notebook-search.png
 share/gnome/help/gnote/sv/figures/add-to-notebook.png
 share/gnome/help/gnote/sv/figures/delete-notebook.png
 share/gnome/help/gnote/sv/figures/gnote-main-menu.png
 share/gnome/help/gnote/sv/figures/gnote-new-note.png
 share/gnome/help/gnote/sv/figures/gnote-panel.png
 share/gnome/help/gnote/sv/figures/gnote-pindown.png
 share/gnome/help/gnote/sv/figures/gnote-pinup.png
 share/gnome/help/gnote/sv/figures/gnote-preferences-add-ins.png
 share/gnome/help/gnote/sv/figures/gnote-preferences-editing.png
 share/gnome/help/gnote/sv/figures/gnote-preferences-hotkeys.png
 share/gnome/help/gnote/sv/figures/gnote-preferences-synchronization.png
 share/gnome/help/gnote/sv/figures/gnote-tools.png
 share/gnome/help/gnote/sv/figures/move-notes-search.png
 share/gnome/help/gnote/sv/figures/new-notebook.png
 share/gnome/help/gnote/sv/figures/note-template.png
 share/gnome/help/gnote/sv/figures/notebook-icon.png
 share/gnome/help/gnote/sv/gnote.xml
 share/gnome/help/gnote/sv/legal.xml
 %%DATADIR%%/GNOME_GnoteApplet.xml
 %%DATADIR%%/UIManagerLayout.xml
 %%DATADIR%%/exporttohtml.xsl
 %%DATADIR%%/icons/hicolor/16x16/actions/note-new.png
 %%DATADIR%%/icons/hicolor/16x16/actions/notebook-new.png
 %%DATADIR%%/icons/hicolor/16x16/apps/bug.png
 %%DATADIR%%/icons/hicolor/16x16/places/note.png
 %%DATADIR%%/icons/hicolor/16x16/places/notebook.png
 %%DATADIR%%/icons/hicolor/16x16/status/pin-active.png
 %%DATADIR%%/icons/hicolor/16x16/status/pin-down.png
 %%DATADIR%%/icons/hicolor/16x16/status/pin-up.png
 %%DATADIR%%/icons/hicolor/22x22/actions/filter-note-all.png
 %%DATADIR%%/icons/hicolor/22x22/actions/filter-note-unfiled.png
 %%DATADIR%%/icons/hicolor/22x22/actions/note-new.png
 %%DATADIR%%/icons/hicolor/22x22/actions/notebook-new.png
 %%DATADIR%%/icons/hicolor/22x22/places/note.png
 %%DATADIR%%/icons/hicolor/22x22/places/notebook.png
 %%DATADIR%%/icons/hicolor/24x24/actions/filter-note-all.png
 %%DATADIR%%/icons/hicolor/24x24/actions/filter-note-unfiled.png
 %%DATADIR%%/icons/hicolor/24x24/actions/note-new.png
 %%DATADIR%%/icons/hicolor/24x24/actions/notebook-new.png
 %%DATADIR%%/icons/hicolor/24x24/places/note.png
 %%DATADIR%%/icons/hicolor/24x24/places/notebook.png
 %%DATADIR%%/icons/hicolor/48x48/actions/notebook-new.png
 %%DATADIR%%/icons/hicolor/scalable/actions/notebook-new.svg
 share/icons/hicolor/16x16/apps/gnote.png
 share/icons/hicolor/22x22/apps/gnote.png
 share/icons/hicolor/24x24/apps/gnote.png
 share/icons/hicolor/32x32/apps/gnote.png
 share/icons/hicolor/48x48/apps/gnote.png
 share/icons/hicolor/scalable/apps/gnote.svg
 share/locale/ar/LC_MESSAGES/gnote.mo
 share/locale/as/LC_MESSAGES/gnote.mo
 share/locale/bn_IN/LC_MESSAGES/gnote.mo
 share/locale/ca/LC_MESSAGES/gnote.mo
 share/locale/cs/LC_MESSAGES/gnote.mo
 share/locale/de/LC_MESSAGES/gnote.mo
 share/locale/el/LC_MESSAGES/gnote.mo
 share/locale/en_GB/LC_MESSAGES/gnote.mo
 share/locale/es/LC_MESSAGES/gnote.mo
 share/locale/fr/LC_MESSAGES/gnote.mo
 share/locale/gl/LC_MESSAGES/gnote.mo
 share/locale/gu/LC_MESSAGES/gnote.mo
 share/locale/he/LC_MESSAGES/gnote.mo
 share/locale/hu/LC_MESSAGES/gnote.mo
 share/locale/id/LC_MESSAGES/gnote.mo
 share/locale/it/LC_MESSAGES/gnote.mo
 share/locale/ja/LC_MESSAGES/gnote.mo
 share/locale/kn/LC_MESSAGES/gnote.mo
 share/locale/ko/LC_MESSAGES/gnote.mo
 share/locale/lt/LC_MESSAGES/gnote.mo
 share/locale/mr/LC_MESSAGES/gnote.mo
 share/locale/or/LC_MESSAGES/gnote.mo
 share/locale/pa/LC_MESSAGES/gnote.mo
 share/locale/pl/LC_MESSAGES/gnote.mo
 share/locale/pt/LC_MESSAGES/gnote.mo
 share/locale/pt_BR/LC_MESSAGES/gnote.mo
 share/locale/ru/LC_MESSAGES/gnote.mo
 share/locale/sl/LC_MESSAGES/gnote.mo
 share/locale/sv/LC_MESSAGES/gnote.mo
 share/locale/ta/LC_MESSAGES/gnote.mo
 share/locale/te/LC_MESSAGES/gnote.mo
 share/locale/th/LC_MESSAGES/gnote.mo
 share/locale/zh_CN/LC_MESSAGES/gnote.mo
 share/omf/gnote/gnote-C.omf
 share/omf/gnote/gnote-de.omf
 share/omf/gnote/gnote-el.omf
 share/omf/gnote/gnote-es.omf
 share/omf/gnote/gnote-sv.omf
@dirrm share/omf/gnote
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
@dirrm %%DATADIR%%/icons/hicolor/scalable/actions
@dirrm %%DATADIR%%/icons/hicolor/scalable
@dirrm %%DATADIR%%/icons/hicolor/48x48/actions
@dirrm %%DATADIR%%/icons/hicolor/48x48
@dirrm %%DATADIR%%/icons/hicolor/24x24/places
@dirrm %%DATADIR%%/icons/hicolor/24x24/actions
@dirrm %%DATADIR%%/icons/hicolor/24x24
@dirrm %%DATADIR%%/icons/hicolor/22x22/places
@dirrm %%DATADIR%%/icons/hicolor/22x22/actions
@dirrm %%DATADIR%%/icons/hicolor/22x22
@dirrm %%DATADIR%%/icons/hicolor/16x16/status
@dirrm %%DATADIR%%/icons/hicolor/16x16/places
@dirrm %%DATADIR%%/icons/hicolor/16x16/apps
@dirrm %%DATADIR%%/icons/hicolor/16x16/actions
@dirrm %%DATADIR%%/icons/hicolor/16x16
@dirrm %%DATADIR%%/icons/hicolor
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%
@dirrm share/gnome/help/gnote/sv/figures
@dirrm share/gnome/help/gnote/sv
@dirrm share/gnome/help/gnote/es/figures
@dirrm share/gnome/help/gnote/es
@dirrm share/gnome/help/gnote/el/figures
@dirrm share/gnome/help/gnote/el
@dirrm share/gnome/help/gnote/de/figures
@dirrm share/gnome/help/gnote/de
@dirrm share/gnome/help/gnote/C/figures
@dirrm share/gnome/help/gnote/C
@dirrm share/gnome/help/gnote
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrmtry share/applications
@dirrmtry lib/gnote/addins/%%VERSION%%
@dirrmtry lib/gnote/addins
@dirrmtry lib/gnote
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@ -3,12 +3,12 @@
 # Whom:			Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/gnotime/Makefile,v 1.21 2007/05/19 21:36:03 marcus Exp $
+#   $MCom: ports/deskutils/gnotime/Makefile,v 1.24 2009/11/28 05:58:58 mezz Exp $
 #
 PORTNAME=	gnotime
 PORTVERSION=	2.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	SF/gttr/${PORTNAME}/${PORTNAME}-${PORTVERSION}:gttr SF/gttr/${PORTNAME}/${PORTNAME}-${PORTVERSION}:qof
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:gttr \
@ -36,8 +36,8 @@ GCONF_SCHEMAS=	gnotime.schemas
 QOF_DISTNAME=	qof-0.7.5
 QOF_WRKSRC=	${WRKDIR}/${QOF_DISTNAME}
-CPPFLAGS=	-I${LOCALBASE}/include
+CPPFLAGS=	-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
-LDFLAGS=	-L${LOCALBASE}/lib
+LDFLAGS=	-L${LOCALBASE}/lib `pkg-config --libs libgnomeui-2.0`
 LIBQOF_CFLAGS=	-I${QOF_WRKSRC}/qof
 LIBQOF_LIBS=	-L${QOF_WRKSRC}/qof/.libs -lqof
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/gucharmap/Makefile,v 1.60 2009/03/16 07:50:48 kwm Exp $
+#   $MCom: ports/deskutils/gucharmap/Makefile,v 1.65 2009/11/28 05:58:59 mezz Exp $
 #
 PORTNAME=	gucharmap
-PORTVERSION=	2.26.3.1
+PORTVERSION=	2.28.1
 PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
--- a/deskutils/gucharmap/distinfo
+++ b/deskutils/gucharmap/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/gucharmap-2.26.3.1.tar.bz2) = 3d13ad452860b1facc9765713bc96d33
+MD5 (gnome2/gucharmap-2.28.1.tar.bz2) = 409a08462fab85daa5523e950a794561
-SHA256 (gnome2/gucharmap-2.26.3.1.tar.bz2) = 4dc5406543b93068a9cb9debdd3be96cd28301ce8c8562ba8fcfefca2f1fb2ff
+SHA256 (gnome2/gucharmap-2.28.1.tar.bz2) = 91e909a1223b60a466ca2001b41de43ca7e26104d7f4da6422ecbdc07970eee3
-SIZE (gnome2/gucharmap-2.26.3.1.tar.bz2) = 3059234
+SIZE (gnome2/gucharmap-2.28.1.tar.bz2) = 3073003
--- a/deskutils/gucharmap/pkg-plist
+++ b/deskutils/gucharmap/pkg-plist
@ -83,14 +83,17 @@ share/locale/af/LC_MESSAGES/gucharmap.mo
 share/locale/am/LC_MESSAGES/gucharmap.mo
 share/locale/ar/LC_MESSAGES/gucharmap.mo
 share/locale/as/LC_MESSAGES/gucharmap.mo
 share/locale/ast/LC_MESSAGES/gucharmap.mo
 share/locale/az/LC_MESSAGES/gucharmap.mo
 share/locale/be/LC_MESSAGES/gucharmap.mo
 share/locale/be@latin/LC_MESSAGES/gucharmap.mo
 share/locale/bg/LC_MESSAGES/gucharmap.mo
 share/locale/bn/LC_MESSAGES/gucharmap.mo
 share/locale/bn_IN/LC_MESSAGES/gucharmap.mo
 share/locale/br/LC_MESSAGES/gucharmap.mo
 share/locale/bs/LC_MESSAGES/gucharmap.mo
 share/locale/ca/LC_MESSAGES/gucharmap.mo
 share/locale/ca@valencia/LC_MESSAGES/gucharmap.mo
 share/locale/cs/LC_MESSAGES/gucharmap.mo
 share/locale/cy/LC_MESSAGES/gucharmap.mo
 share/locale/da/LC_MESSAGES/gucharmap.mo
@ -247,9 +250,13 @@ share/omf/gucharmap/gucharmap-zh_TW.omf
@dirrmtry share/locale/mai
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@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/ast/LC_MESSAGES
@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
--- a/deskutils/hamster-applet/Makefile
+++ b/deskutils/hamster-applet/Makefile
@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/hamster-applet/Makefile,v 1.18 2009/03/21 21:05:56 marcus Exp $
+#   $MCom: ports/deskutils/hamster-applet/Makefile,v 1.29 2009/10/20 17:53:42 kwm Exp $
 #
 PORTNAME=	hamster-applet
-PORTVERSION=	2.26.3
+PORTVERSION=	2.28.1
 PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
--- a/deskutils/hamster-applet/distinfo
+++ b/deskutils/hamster-applet/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/hamster-applet-2.26.3.tar.bz2) = bc40602ef88e23e0a8c37c7086e953e7
+MD5 (gnome2/hamster-applet-2.28.1.tar.bz2) = f4c68e02b487b9e0d284e63a411d8cdd
-SHA256 (gnome2/hamster-applet-2.26.3.tar.bz2) = c0b7e444b8981593723cc3ab3063450f2a96d5f295a4011ae9d37e28754a3f76
+SHA256 (gnome2/hamster-applet-2.28.1.tar.bz2) = ab9ae10380aeb0aea09e42fd5e7ebd7b09116c0608740b5fa9eda8433d9e31c9
-SIZE (gnome2/hamster-applet-2.26.3.tar.bz2) = 428731
+SIZE (gnome2/hamster-applet-2.28.1.tar.bz2) = 517073
--- a/deskutils/hamster-applet/files/patch-hamster_init.py
+++ b/deskutils/hamster-applet/files/patch-hamster_init.py
@ -1,10 +0,0 @@
 --- hamster/__init__.py.orig	2008-08-07 10:53:47.000000000 -0400
 +++ hamster/__init__.py	2008-08-07 10:54:01.000000000 -0400
@@ -74,6 +74,7 @@ if not exists(USER_HAMSTER_DIR):
 if not exists(HAMSTER_DB):
     print "Database not found in %s - installing default from %s!" % (HAMSTER_DB, SHARED_DATA_DIR)
     copyfile(join(SHARED_DATA_DIR, DB_FILE), HAMSTER_DB)
 +    os.chmod(HAMSTER_DB, 0644)
 # Init storage
--- a/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py
+++ b/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py
@ -1,17 +1,23 @@
--- hamster/hamster-applet.py.orig	2009-02-13 16:02:00.000000000 -0500
+--- hamster/hamster-applet.py.orig	2009-07-19 21:41:20.000000000 +1000
-+++ hamster/hamster-applet.py	2009-02-27 19:50:13.000000000 -0500
+++ hamster/hamster-applet.py	2009-07-19 21:41:46.000000000 +1000
-@@ -52,10 +52,10 @@ if hasattr(gettext, 'bind_textdomain_cod
+@@ -37,14 +37,14 @@ from hamster import defs
-     gettext.bind_textdomain_codeset('hamster-applet','UTF-8')
+ from hamster.configuration import runtime
 gettext.textdomain('hamster-applet')
-locale.bindtextdomain('hamster-applet', locale_dir)
+ # Setup i18n
-if hasattr(locale, 'bind_textdomain_codeset'):
+-locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
-    locale.bind_textdomain_codeset('hamster-applet','UTF-8')
+#locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
 -locale.textdomain('hamster-applet')
 +#locale.bindtextdomain('hamster-applet', locale_dir)
 +#if hasattr(locale, 'bind_textdomain_codeset'):
 +#    locale.bind_textdomain_codeset('hamster-applet','UTF-8')
 +#locale.textdomain('hamster-applet')
- hamster.__init_db()
+-for module in (gettext, locale):
- import hamster.applet
+-    module.bindtextdomain('hamster-applet', locale_dir)
 -    module.textdomain('hamster-applet')
 +#for module in (gettext, locale):
 +#    module.bindtextdomain('hamster-applet', locale_dir)
 +#    module.textdomain('hamster-applet')
 -    if hasattr(module, 'bind_textdomain_codeset'):
 -        module.bind_textdomain_codeset('hamster-applet','UTF-8')
 +#    if hasattr(module, 'bind_textdomain_codeset'):
 +#        module.bind_textdomain_codeset('hamster-applet','UTF-8')
 from hamster.applet import HamsterApplet
--- a/deskutils/hamster-applet/pkg-plist
+++ b/deskutils/hamster-applet/pkg-plist
@ -1,7 +1,4 @@
 lib/hamster-applet/hamster-applet
 %%PYTHON_SITELIBDIR%%/hamster/Configuration.py
 %%PYTHON_SITELIBDIR%%/hamster/Configuration.pyc
 %%PYTHON_SITELIBDIR%%/hamster/Configuration.pyo
 %%PYTHON_SITELIBDIR%%/hamster/KeyBinder.py
 %%PYTHON_SITELIBDIR%%/hamster/KeyBinder.pyc
 %%PYTHON_SITELIBDIR%%/hamster/KeyBinder.pyo
@ -11,15 +8,15 @@ lib/hamster-applet/hamster-applet
 %%PYTHON_SITELIBDIR%%/hamster/about.py
 %%PYTHON_SITELIBDIR%%/hamster/about.pyc
 %%PYTHON_SITELIBDIR%%/hamster/about.pyo
 %%PYTHON_SITELIBDIR%%/hamster/add_custom_fact.py
 %%PYTHON_SITELIBDIR%%/hamster/add_custom_fact.pyc
 %%PYTHON_SITELIBDIR%%/hamster/add_custom_fact.pyo
 %%PYTHON_SITELIBDIR%%/hamster/applet.py
 %%PYTHON_SITELIBDIR%%/hamster/applet.pyc
 %%PYTHON_SITELIBDIR%%/hamster/applet.pyo
 %%PYTHON_SITELIBDIR%%/hamster/charting.py
 %%PYTHON_SITELIBDIR%%/hamster/charting.pyc
 %%PYTHON_SITELIBDIR%%/hamster/charting.pyo
 %%PYTHON_SITELIBDIR%%/hamster/configuration.py
 %%PYTHON_SITELIBDIR%%/hamster/configuration.pyc
 %%PYTHON_SITELIBDIR%%/hamster/configuration.pyo
 %%PYTHON_SITELIBDIR%%/hamster/db.py
 %%PYTHON_SITELIBDIR%%/hamster/db.pyc
 %%PYTHON_SITELIBDIR%%/hamster/db.pyo
@ -29,12 +26,21 @@ lib/hamster-applet/hamster-applet
 %%PYTHON_SITELIBDIR%%/hamster/dispatcher.py
 %%PYTHON_SITELIBDIR%%/hamster/dispatcher.pyc
 %%PYTHON_SITELIBDIR%%/hamster/dispatcher.pyo
 %%PYTHON_SITELIBDIR%%/hamster/edit_activity.py
 %%PYTHON_SITELIBDIR%%/hamster/edit_activity.pyc
 %%PYTHON_SITELIBDIR%%/hamster/edit_activity.pyo
 %%PYTHON_SITELIBDIR%%/hamster/eds.py
 %%PYTHON_SITELIBDIR%%/hamster/eds.pyc
 %%PYTHON_SITELIBDIR%%/hamster/eds.pyo
 %%PYTHON_SITELIBDIR%%/hamster/graphics.py
 %%PYTHON_SITELIBDIR%%/hamster/graphics.pyc
 %%PYTHON_SITELIBDIR%%/hamster/graphics.pyo
 %%PYTHON_SITELIBDIR%%/hamster/hamsterdbus.py
 %%PYTHON_SITELIBDIR%%/hamster/hamsterdbus.pyc
 %%PYTHON_SITELIBDIR%%/hamster/hamsterdbus.pyo
 %%PYTHON_SITELIBDIR%%/hamster/i18n.py
 %%PYTHON_SITELIBDIR%%/hamster/i18n.pyc
 %%PYTHON_SITELIBDIR%%/hamster/i18n.pyo
 %%PYTHON_SITELIBDIR%%/hamster/idle.py
 %%PYTHON_SITELIBDIR%%/hamster/idle.pyc
 %%PYTHON_SITELIBDIR%%/hamster/idle.pyo
@ -58,18 +64,21 @@ lib/hamster-applet/hamster-applet
 %%PYTHON_SITELIBDIR%%/hamster/stuff.py
 %%PYTHON_SITELIBDIR%%/hamster/stuff.pyc
 %%PYTHON_SITELIBDIR%%/hamster/stuff.pyo
 %%PYTHON_SITELIBDIR%%/hamster/widgets.py
 %%PYTHON_SITELIBDIR%%/hamster/widgets.pyc
 %%PYTHON_SITELIBDIR%%/hamster/widgets.pyo
 libdata/bonobo/servers/Hamster_Applet.server
 share/gnome-control-center/keybindings/99-hamster-applet.xml
 %%DATADIR%%/Hamster_Applet.xml
-%%DATADIR%%/add_custom_fact.glade
+%%DATADIR%%/applet.ui
 %%DATADIR%%/art/hamster-applet.png
 %%DATADIR%%/art/stock_calendar-view-day.png
 %%DATADIR%%/art/stock_calendar-view-month.png
 %%DATADIR%%/art/stock_calendar-view-week.png
 %%DATADIR%%/edit_activity.ui
 %%DATADIR%%/hamster.db
-%%DATADIR%%/menu.glade
+%%DATADIR%%/preferences.ui
-%%DATADIR%%/preferences.glade
+%%DATADIR%%/stats.ui
 %%DATADIR%%/stats.glade
 share/icons/hicolor/16x16/apps/hamster-applet.png
 share/icons/hicolor/22x22/apps/hamster-applet.png
 share/icons/hicolor/32x32/apps/hamster-applet.png
@ -77,7 +86,9 @@ share/icons/hicolor/48x48/apps/hamster-applet.png
 share/icons/hicolor/scalable/apps/hamster-applet.svg
 share/locale/ar/LC_MESSAGES/hamster-applet.mo
 share/locale/as/LC_MESSAGES/hamster-applet.mo
 share/locale/be/LC_MESSAGES/hamster-applet.mo
 share/locale/bg/LC_MESSAGES/hamster-applet.mo
 share/locale/bn/LC_MESSAGES/hamster-applet.mo
 share/locale/bn_IN/LC_MESSAGES/hamster-applet.mo
 share/locale/ca/LC_MESSAGES/hamster-applet.mo
 share/locale/ca@valencia/LC_MESSAGES/hamster-applet.mo
@ -103,6 +114,7 @@ share/locale/ko/LC_MESSAGES/hamster-applet.mo
 share/locale/ku/LC_MESSAGES/hamster-applet.mo
 share/locale/lt/LC_MESSAGES/hamster-applet.mo
 share/locale/lv/LC_MESSAGES/hamster-applet.mo
 share/locale/mai/LC_MESSAGES/hamster-applet.mo
 share/locale/mk/LC_MESSAGES/hamster-applet.mo
 share/locale/ml/LC_MESSAGES/hamster-applet.mo
 share/locale/mr/LC_MESSAGES/hamster-applet.mo
@ -115,6 +127,7 @@ share/locale/pt/LC_MESSAGES/hamster-applet.mo
 share/locale/pt_BR/LC_MESSAGES/hamster-applet.mo
 share/locale/ro/LC_MESSAGES/hamster-applet.mo
 share/locale/ru/LC_MESSAGES/hamster-applet.mo
 share/locale/si/LC_MESSAGES/hamster-applet.mo
 share/locale/sl/LC_MESSAGES/hamster-applet.mo
 share/locale/sq/LC_MESSAGES/hamster-applet.mo
 share/locale/sr/LC_MESSAGES/hamster-applet.mo
@ -123,8 +136,8 @@ share/locale/sv/LC_MESSAGES/hamster-applet.mo
 share/locale/ta/LC_MESSAGES/hamster-applet.mo
 share/locale/te/LC_MESSAGES/hamster-applet.mo
 share/locale/th/LC_MESSAGES/hamster-applet.mo
 share/locale/uk/LC_MESSAGES/hamster-applet.mo
 share/locale/tr/LC_MESSAGES/hamster-applet.mo
 share/locale/uk/LC_MESSAGES/hamster-applet.mo
 share/locale/vi/LC_MESSAGES/hamster-applet.mo
 share/locale/zh_CN/LC_MESSAGES/hamster-applet.mo
 share/locale/zh_HK/LC_MESSAGES/hamster-applet.mo
@ -140,10 +153,12 @@ share/locale/zh_TW/LC_MESSAGES/hamster-applet.mo
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/ro
+@dirrmtry share/locale/si
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
--- a/Show more
+++ b/Show more