Sync w/ FreeBSD ports. x11 and x11-* left to go.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17058 df743ca5-7f9a-e211-a948-0013205c9059

15 files changed, 36 insertions, 392 deletions

diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 85a1272f1..9bb2e8a53 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/sysutils/brasero/Makefile,v 1.89 2011/08/24 10:40:41 kwm Exp $
+#    $MCom: ports/sysutils/brasero/Makefile,v 1.90 2012/08/17 19:06:46 kwm Exp $
 
 PORTNAME=	brasero
 PORTVERSION=	2.32.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils audio multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -20,7 +20,8 @@ LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify \
 		totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \
 		canberra-gtk.0:${PORTSDIR}/audio/libcanberra
 RUN_DEPENDS=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
-		cdrdao:${PORTSDIR}/sysutils/cdrdao
+		cdrdao:${PORTSDIR}/sysutils/cdrdao \
+		yelp:${PORTSDIR}/x11/yelp
 
 CONFLICTS=	brasero-3.[0-9]*
 
diff --git a/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c b/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c
new file mode 100644
index 000000000..74f10adc0
--- /dev/null
+++ b/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c
@@ -0,0 +1,13 @@
+--- libbrasero-media/scsi-cam.c.orig	2012-02-11 21:16:20.000000000 -0500
++++ libbrasero-media/scsi-cam.c	2012-02-11 21:17:13.000000000 -0500
+@@ -103,6 +103,10 @@ brasero_scsi_command_issue_sync (gpointe
+ 	else if (cmd->info->direction & BRASERO_SCSI_WRITE)
+ 		direction = CAM_DIR_OUT;
+ 
++	if (size == 0)
++		direction = CAM_DIR_NONE;
++	direction |= CAM_DEV_QFRZDIS;
++
+ 	g_assert (direction > -1);
+ 
+ 	cam_fill_csio(&cam_ccb.csio,
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index a82e82f6f..6b83bbe3f 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gconf-editor/Makefile,v 1.88 2011/04/30 20:43:25 mezz Exp $
+#   $MCom: ports/sysutils/gconf-editor/Makefile,v 1.89 2012/08/17 19:06:46 kwm Exp $
 #
 
 PORTNAME=	gconf-editor
 PORTVERSION=	2.32.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index fdb58759f..c1505fdbb 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.218 2011/06/03 21:27:50 mezz Exp $
+#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.219 2012/08/17 19:06:47 kwm Exp $
 #
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	2.32.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
deleted file mode 100644
index d27d2c61e..000000000
--- a/sysutils/gnome-settings-daemon/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# New ports collection makefile for:	gnome-settings-daemon
-# Date created:				14 Jan 2008
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom$
-#
-
-PORTNAME=	gnome-settings-daemon
-PORTVERSION=	2.32.1
-PORTREVISION=	4
-CATEGORIES=	sysutils gnome
-MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME 2 settings daemon
-
-LIB_DEPENDS=	canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
-		notify.4:${PORTSDIR}/devel/libnotify \
-		gdbm.4:${PORTSDIR}/databases/gdbm \
-		nss3.1:${PORTSDIR}/security/nss
-RUN_DEPENDS=	xrdb:${PORTSDIR}/x11/xrdb
-
-CONFLICTS=	gnome-settings-daemon-3.[0-9]*
-
-USE_XORG=	xxf86misc
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack gnomedesktop libgnomekbd
-USE_GETTEXT=	yes
-USE_GSTREAMER=	good
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-INSTALLS_ICONS=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-OPTIONS=	PULSEAUDIO "Enable Pulseaudio support" On
-
-GCONF_SCHEMAS=	apps_gnome_settings_daemon_housekeeping.schemas \
-		apps_gnome_settings_daemon_keybindings.schemas \
-		apps_gnome_settings_daemon_xrandr.schemas \
-		desktop_gnome_font_rendering.schemas \
-		desktop_gnome_keybindings.schemas \
-		desktop_gnome_peripherals_smartcard.schemas \
-		desktop_gnome_peripherals_touchpad.schemas \
-		gnome-settings-daemon.schemas
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITHOUT_PULSEAUDIO)
-CONFIGURE_ARGS+=--disable-pulse
-PLIST_SUB+=	PULSEAUDIO="@comment "
-.else
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
-CONFIGURE_ARGS+=--enable-pulse
-PLIST_SUB+=	PULSEAUDIO=""
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
deleted file mode 100644
index 4720b385e..000000000
--- a/sysutils/gnome-settings-daemon/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gnome2/gnome-settings-daemon-2.32.1.tar.bz2) = 0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86
-SIZE (gnome2/gnome-settings-daemon-2.32.1.tar.bz2) = 1331850
diff --git a/sysutils/gnome-settings-daemon/files/patch-libnotify b/sysutils/gnome-settings-daemon/files/patch-libnotify
deleted file mode 100644
index 1166875bf..000000000
--- a/sysutils/gnome-settings-daemon/files/patch-libnotify
+++ /dev/null
@@ -1,58 +0,0 @@
-From e1ab570b0dce479ba235e5542ea07d1b5bafc4c9 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <jmccann@redhat.com>
-Date: Tue, 12 Oct 2010 03:35:45 +0000
-Subject: Require libnotify 0.6.0
-
----
-diff --git a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
-index 9ca820a..f5964b9 100644
---- plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
-+++ plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
-@@ -608,9 +608,7 @@ ax_slowkeys_warning_post_bubble (GsdA11yKeyboardManager *manager,
-         gsd_a11y_keyboard_manager_ensure_status_icon (manager);
-         manager->priv->notification = notify_notification_new (title,
-                                                                message,
--                                                               "preferences-desktop-accessibility",
--                                                               NULL);
--        notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
-+                                                               "preferences-desktop-accessibility");
-         notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
- 
-         notify_notification_add_action (manager->priv->notification,
-@@ -747,9 +745,7 @@ ax_stickykeys_warning_post_bubble (GsdA11yKeyboardManager *manager,
-         gsd_a11y_keyboard_manager_ensure_status_icon (manager);
-         manager->priv->notification = notify_notification_new (title,
-                                                                message,
--                                                               "preferences-desktop-accessibility",
--                                                               NULL);
--        notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
-+                                                               "preferences-desktop-accessibility");
-         notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
- 
-         notify_notification_add_action (manager->priv->notification,
-diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
-index 02536a3..ef57d5b 100644
---- plugins/xrandr/gsd-xrandr-manager.c
-+++ plugins/xrandr/gsd-xrandr-manager.c
-@@ -1084,16 +1084,9 @@ error_message (GsdXrandrManager *mgr, const char *primary_text, GError *error_to
- 
-         g_assert (error_to_display == NULL || secondary_text == NULL);
- 
--        if (priv->status_icon)
--                notification = notify_notification_new_with_status_icon (primary_text,
--                                                                         error_to_display ? error_to_display->message : secondary_text,
--                                                                         GSD_XRANDR_ICON_NAME,
--                                                                         priv->status_icon);
--        else
--                notification = notify_notification_new (primary_text,
--                                                        error_to_display ? error_to_display->message : secondary_text,
--                                                        GSD_XRANDR_ICON_NAME,
--                                                        NULL);
-+        notification = notify_notification_new (primary_text,
-+                                                error_to_display ? error_to_display->message : secondary_text,
-+                                                GSD_XRANDR_ICON_NAME);
- 
-         notify_notification_show (notification, NULL); /* NULL-GError */
- #else
---
-cgit v0.8.3.4
diff --git a/sysutils/gnome-settings-daemon/pkg-descr b/sysutils/gnome-settings-daemon/pkg-descr
deleted file mode 100644
index 9ce205e84..000000000
--- a/sysutils/gnome-settings-daemon/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-GNOME 2 settings daemon.
-
-WWW: http://www.gnome.org
diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist
deleted file mode 100644
index 054cf6ea3..000000000
--- a/sysutils/gnome-settings-daemon/pkg-plist
+++ /dev/null
@@ -1,246 +0,0 @@
-etc/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf
-etc/xdg/autostart/gnome-settings-daemon.desktop
-include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h
-include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-plugin.h
-lib/gnome-settings-daemon-2.0/a11y-keyboard.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/background.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/clipboard.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/font.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/housekeeping.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/keybindings.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/keyboard.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/liba11y-keyboard.a
-lib/gnome-settings-daemon-2.0/liba11y-keyboard.la
-lib/gnome-settings-daemon-2.0/liba11y-keyboard.so
-lib/gnome-settings-daemon-2.0/libbackground.a
-lib/gnome-settings-daemon-2.0/libbackground.la
-lib/gnome-settings-daemon-2.0/libbackground.so
-lib/gnome-settings-daemon-2.0/libclipboard.a
-lib/gnome-settings-daemon-2.0/libclipboard.la
-lib/gnome-settings-daemon-2.0/libclipboard.so
-lib/gnome-settings-daemon-2.0/libfont.a
-lib/gnome-settings-daemon-2.0/libfont.la
-lib/gnome-settings-daemon-2.0/libfont.so
-lib/gnome-settings-daemon-2.0/libhousekeeping.a
-lib/gnome-settings-daemon-2.0/libhousekeeping.la
-lib/gnome-settings-daemon-2.0/libhousekeeping.so
-lib/gnome-settings-daemon-2.0/libkeybindings.a
-lib/gnome-settings-daemon-2.0/libkeybindings.la
-lib/gnome-settings-daemon-2.0/libkeybindings.so
-lib/gnome-settings-daemon-2.0/libkeyboard.a
-lib/gnome-settings-daemon-2.0/libkeyboard.la
-lib/gnome-settings-daemon-2.0/libkeyboard.so
-%%PULSEAUDIO%%lib/gnome-settings-daemon-2.0/libmedia-keys.a
-%%PULSEAUDIO%%lib/gnome-settings-daemon-2.0/libmedia-keys.la
-%%PULSEAUDIO%%lib/gnome-settings-daemon-2.0/libmedia-keys.so
-lib/gnome-settings-daemon-2.0/libmouse.a
-lib/gnome-settings-daemon-2.0/libmouse.la
-lib/gnome-settings-daemon-2.0/libmouse.so
-lib/gnome-settings-daemon-2.0/libsmartcard.a
-lib/gnome-settings-daemon-2.0/libsmartcard.la
-lib/gnome-settings-daemon-2.0/libsmartcard.so
-lib/gnome-settings-daemon-2.0/libsound.a
-lib/gnome-settings-daemon-2.0/libsound.la
-lib/gnome-settings-daemon-2.0/libsound.so
-lib/gnome-settings-daemon-2.0/libtyping-break.a
-lib/gnome-settings-daemon-2.0/libtyping-break.la
-lib/gnome-settings-daemon-2.0/libtyping-break.so
-lib/gnome-settings-daemon-2.0/libxrandr.a
-lib/gnome-settings-daemon-2.0/libxrandr.la
-lib/gnome-settings-daemon-2.0/libxrandr.so
-lib/gnome-settings-daemon-2.0/libxrdb.a
-lib/gnome-settings-daemon-2.0/libxrdb.la
-lib/gnome-settings-daemon-2.0/libxrdb.so
-lib/gnome-settings-daemon-2.0/libxsettings.a
-lib/gnome-settings-daemon-2.0/libxsettings.la
-lib/gnome-settings-daemon-2.0/libxsettings.so
-%%PULSEAUDIO%%lib/gnome-settings-daemon-2.0/media-keys.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/mouse.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/smartcard.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/sound.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/typing-break.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/xrandr.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/xrdb.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/xsettings.gnome-settings-plugin
-libdata/pkgconfig/gnome-settings-daemon.pc
-libexec/gnome-settings-daemon
-libexec/gsd-datetime-mechanism
-libexec/gsd-locate-pointer
-share/dbus-1/services/org.gnome.SettingsDaemon.service
-share/dbus-1/system-services/org.gnome.SettingsDaemon.DateTimeMechanism.service
-share/gnome-control-center/keybindings/50-accessibility.xml
-%%DATADIR%%/acme.ui
-%%DATADIR%%/gsd-a11y-preferences-dialog.ui
-%%DATADIR%%/icons/hicolor/64x64/devices/kbd-capslock-off.png
-%%DATADIR%%/icons/hicolor/64x64/devices/kbd-capslock-on.png
-%%DATADIR%%/icons/hicolor/64x64/devices/kbd-numlock-off.png
-%%DATADIR%%/icons/hicolor/64x64/devices/kbd-numlock-on.png
-%%DATADIR%%/icons/hicolor/64x64/devices/kbd-scrolllock-off.png
-%%DATADIR%%/icons/hicolor/64x64/devices/kbd-scrolllock-on.png
-%%DATADIR%%/modmap-dialog.ui
-%%DATADIR%%/xrdb/Editres.ad
-%%DATADIR%%/xrdb/Emacs.ad
-%%DATADIR%%/xrdb/General.ad
-%%DATADIR%%/xrdb/Motif.ad
-%%DATADIR%%/xrdb/Tk.ad
-%%DATADIR%%/xrdb/Xaw.ad
-share/icons/hicolor/16x16/actions/touchpad-disabled.png
-share/icons/hicolor/16x16/actions/touchpad-enabled.png
-share/icons/hicolor/16x16/apps/gsd-xrandr.png
-share/icons/hicolor/22x22/actions/touchpad-disabled.png
-share/icons/hicolor/22x22/actions/touchpad-enabled.png
-share/icons/hicolor/22x22/apps/gsd-xrandr.png
-share/icons/hicolor/24x24/actions/touchpad-disabled.png
-share/icons/hicolor/24x24/actions/touchpad-enabled.png
-share/icons/hicolor/24x24/apps/gsd-xrandr.png
-share/icons/hicolor/32x32/actions/touchpad-disabled.png
-share/icons/hicolor/32x32/actions/touchpad-enabled.png
-share/icons/hicolor/32x32/apps/gsd-xrandr.png
-share/icons/hicolor/scalable/actions/touchpad-disabled.svg
-share/icons/hicolor/scalable/actions/touchpad-enabled.svg
-share/icons/hicolor/scalable/apps/gsd-xrandr.svg
-share/locale/af/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/am/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ar/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/as/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ast/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/az/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/be/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/be@latin/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/bg/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/bn/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/br/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/bs/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ca/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ca@valencia/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/crh/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/cs/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/cy/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/da/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/de/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/dz/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/el/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/en@shaw/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/en_CA/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/en_GB/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/es/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/et/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/eu/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/fa/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/fi/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/fr/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ga/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/gl/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/gu/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/he/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/hi/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/hr/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/hu/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/id/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/is/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/it/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ja/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ka/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/kn/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ko/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ku/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/lt/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/lv/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/mai/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/mg/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/mk/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ml/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/mn/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/mr/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ms/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/nb/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/nds/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ne/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/nl/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/nn/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/nso/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/oc/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/or/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/pa/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/pl/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/pt/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ro/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ru/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/rw/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/si/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/sk/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/sl/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/sq/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/sr/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/sr@latin/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/sv/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ta/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/te/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/th/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/tr/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/uk/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/vi/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/wa/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/xh/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo
-share/polkit-1/actions/org.gnome.settingsdaemon.datetimemechanism.policy
-@dirrm %%DATADIR%%/xrdb
-@dirrm %%DATADIR%%/icons/hicolor/64x64/devices
-@dirrm %%DATADIR%%/icons/hicolor/64x64
-@dirrm %%DATADIR%%/icons/hicolor
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%
-@dirrm lib/gnome-settings-daemon-2.0
-@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
-@dirrm include/gnome-settings-daemon-2.0
-@dirrmtry etc/gnome-settings-daemon/xrandr
-@dirrmtry etc/gnome-settings-daemon
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@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/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nso/LC_MESSAGES
-@dirrmtry share/locale/nso
-@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/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@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
-@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
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 3daad3951..f9a8e7270 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.144 2011/04/30 20:43:26 mezz Exp $
+#   $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.145 2012/08/17 19:06:47 kwm Exp $
 #
 
 PORTNAME=	gnome-system-monitor
 PORTVERSION=	2.28.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile
index 0409920cd..1697b1717 100644
--- a/sysutils/polkit-gnome/Makefile
+++ b/sysutils/polkit-gnome/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Koop Mast<kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/polkit-gnome/Makefile,v 1.17 2011/03/04 12:35:48 kwm Exp $
+#   $MCom: ports/sysutils/polkit-gnome/Makefile,v 1.18 2011/10/07 14:50:51 kwm Exp $
 #
 
 PORTNAME=	polkit-gnome
@@ -12,7 +12,7 @@ CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME frontend to the PolicKit framework
+COMMENT=	GNOME frontend to the PolicyKit framework
 
 LIB_DEPENDS=	polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
 
diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
index a372ca6b8..bada92017 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Koop Mast<kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/polkit/Makefile,v 1.19 2012/08/04 21:04:25 kwm Exp $
+#   $MCom: ports/sysutils/polkit/Makefile,v 1.20 2012/08/17 19:06:47 kwm Exp $
 #
 
 PORTNAME=	polkit
@@ -21,7 +21,6 @@ RUN_DEPENDS=	${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-i
 		dbus-launch:${PORTSDIR}/devel/dbus
 
 USE_GNOME=	gnomehack glib20 intlhack
-USE_PKGCONFIG=	build
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index 9f48df195..16154d858 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.62 2011/04/04 09:06:08 kwm Exp $
+#   $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.63 2012/08/17 19:06:47 kwm Exp $
 #
 
 PORTNAME=	system-tools-backends
@@ -15,10 +15,10 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Backend system admin scripts for gnome-system-tools
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus
+BUILD_DEPENDS=	p5-Net-DBus>=0:${PORTSDIR}/devel/p5-Net-DBus
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus
+RUN_DEPENDS=	p5-Net-DBus>=0:${PORTSDIR}/devel/p5-Net-DBus
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/system-tools-backends/files/patch-Utils_Platform.pm b/sysutils/system-tools-backends/files/patch-Utils_Platform.pm
index c22ec910f..7b98580f1 100644
--- a/sysutils/system-tools-backends/files/patch-Utils_Platform.pm
+++ b/sysutils/system-tools-backends/files/patch-Utils_Platform.pm
@@ -1,18 +1,20 @@
---- Utils/Platform.pm.orig	2010-04-02 00:17:39.000000000 +0200
-+++ Utils/Platform.pm	2010-04-02 00:18:30.000000000 +0200
-@@ -73,6 +73,7 @@ my $PLATFORM_INFO = {
+--- Utils/Platform.pm.orig	2010-03-31 12:55:43.000000000 +0400
++++ Utils/Platform.pm	2012-03-15 18:24:46.000000000 +0400
+@@ -73,6 +73,8 @@
    "freebsd-6"       => [ "FreeBSD", "6", "" ],
    "freebsd-7"       => [ "FreeBSD", "7", "" ],
    "freebsd-8"       => [ "FreeBSD", "8", "" ],
 +  "freebsd-9"       => [ "FreeBSD", "9", "" ],
++  "freebsd-10"      => [ "FreeBSD", "10", "" ],
    "gentoo"          => [ "Gentoo Linux", "", "" ],
    "vlos-1.2"        => [ "Vida Linux OS", "1.2" ],
    "archlinux"       => [ "Arch Linux", "", "" ],
-@@ -126,6 +127,7 @@ sub ensure_distro_map
+@@ -126,6 +128,8 @@
       "freebsd-6"        => "freebsd-5",
       "freebsd-7"        => "freebsd-5",
       "freebsd-8"        => "freebsd-5",
 +     "freebsd-9"        => "freebsd-5",
++     "freebsd-10"       => "freebsd-5",
       "openna-1.0"       => "redhat-6.2",
       "pld-1.1"          => "pld-1.0",
       "pld-1.99"         => "pld-1.0",
diff --git a/sysutils/zeitgeist/Makefile b/sysutils/zeitgeist/Makefile
index 83cb19604..2c2d4d76c 100644
--- a/sysutils/zeitgeist/Makefile
+++ b/sysutils/zeitgeist/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/sysutils/zeitgeist/Makefile,v 1.5 2012/02/10 10:53:16 kwm Exp $
+#    $MCom: ports/sysutils/zeitgeist/Makefile,v 1.6 2012/08/17 19:06:47 kwm Exp $
 #
 
 PORTNAME=	zeitgeist
@@ -16,7 +16,6 @@ COMMENT=	Event logging framework - engine
 
 BUILD_DEPENDS=	rapper:${PORTSDIR}/textproc/raptor2 \
 		${PYTHON_SITELIBDIR}/rdflib/__init__.py:${PORTSDIR}/textproc/py-rdflib
-
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \
 		${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus