author: Joe Marcus Clarke <marcus@FreeBSD.org> 2006-10-14 08:35:50 +0000
committer: Joe Marcus Clarke <marcus@FreeBSD.org> 2006-10-14 08:35:50 +0000
commit: f1bb12de8e50bf76ae21f37debda60994ec7fd99 (patch)
tree: 1671d4beef381f12d939e34b344eb385a3af4f19 /sysutils
parent: 29adee7bb42244f34736c5c24ed18a9b269d0925 (diff)
67 files changed, 2021 insertions, 247 deletions
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 21b6c917854d..7c1a2d3d45bd 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gconf-editor/Makefile,v 1.50 2006/04/24 07:23:03 marcus Exp $
+#   $MCom: ports/sysutils/gconf-editor/Makefile,v 1.56 2006/09/05 00:53:22 ahze Exp $
 #
 
 PORTNAME=	gconf-editor
-PORTVERSION=	2.14.0
-PORTREVISION=	1
+PORTVERSION=	2.16.0
 PORTEPOCH=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -20,11 +19,11 @@ COMMENT=	A gconf database editor for the GNOME 2 environment
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui
+USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui gnomedocutils
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo
index 1ced8c304901..7b6a548e0c3d 100644
--- a/sysutils/gconf-editor/distinfo
+++ b/sysutils/gconf-editor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gconf-editor-2.14.0.tar.bz2) = eb8b979464f6e383e5a27b57ee4e8382
-SHA256 (gnome2/gconf-editor-2.14.0.tar.bz2) = 974e1ba2c6bb650ee638a80e81174582123d7bfbe14cccf613542dd103e2b554
-SIZE (gnome2/gconf-editor-2.14.0.tar.bz2) = 541099
+MD5 (gnome2/gconf-editor-2.16.0.tar.bz2) = e52b3177ef6ebd1fcf2c84acbe90a663
+SHA256 (gnome2/gconf-editor-2.16.0.tar.bz2) = efee1e2e65e280abe30b94b20b59d24d2c71e55e5ad26cb3041966a32b436786
+SIZE (gnome2/gconf-editor-2.16.0.tar.bz2) = 528644
diff --git a/sysutils/gconf-editor/files/patch-src_gconf-editor-window.c b/sysutils/gconf-editor/files/patch-src_gconf-editor-window.c
deleted file mode 100644
index 7ff0eb544269..000000000000
--- a/sysutils/gconf-editor/files/patch-src_gconf-editor-window.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gconf-editor-window.c.orig	Mon Apr 24 03:19:49 2006
-+++ src/gconf-editor-window.c	Mon Apr 24 03:20:00 2006
-@@ -950,7 +950,7 @@ gconf_editor_gconf_value_changed (GConfC
- 		gconf_add_recent_key (window, key);
- 	}
- 
--	g_free (value);
-+	gconf_value_free (value);
- 	g_free (key);
- 	gtk_tree_path_free (path);
- }
diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist
index 757d163f7474..a2ee10cc1863 100644
--- a/sysutils/gconf-editor/pkg-plist
+++ b/sysutils/gconf-editor/pkg-plist
@@ -1,25 +1,9 @@
 bin/gconf-editor
 share/gnome/applications/gconf-editor.desktop
-share/gnome/help/gconf-editor/C/figures/entry-blank.png
-share/gnome/help/gconf-editor/C/figures/entry-bool.png
-share/gnome/help/gconf-editor/C/figures/entry-list.png
-share/gnome/help/gconf-editor/C/figures/entry-number.png
-share/gnome/help/gconf-editor/C/figures/entry-schema.png
-share/gnome/help/gconf-editor/C/figures/entry-string.png
 share/gnome/help/gconf-editor/C/figures/gconf_editor_anno_window.png
 share/gnome/help/gconf-editor/C/gconf-editor.xml
 share/gnome/help/gconf-editor/C/legal.xml
-share/gnome/help/gconf-editor/uk/figures/entry-blank.png
-share/gnome/help/gconf-editor/uk/figures/entry-bool.png
-share/gnome/help/gconf-editor/uk/figures/entry-list.png
-share/gnome/help/gconf-editor/uk/figures/entry-number.png
-share/gnome/help/gconf-editor/uk/figures/entry-schema.png
-share/gnome/help/gconf-editor/uk/figures/entry-string.png
-share/gnome/help/gconf-editor/uk/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/uk/gconf-editor.xml
-share/gnome/help/gconf-editor/uk/legal.xml
 share/gnome/omf/gconf-editor/gconf-editor-C.omf
-share/gnome/omf/gconf-editor/gconf-editor-uk.omf
 share/gnome/pixmaps/gconf-editor/entry-blank.png
 share/gnome/pixmaps/gconf-editor/entry-bool.png
 share/gnome/pixmaps/gconf-editor/entry-list.png
@@ -35,6 +19,7 @@ share/locale/az/LC_MESSAGES/gconf-editor.mo
 share/locale/be/LC_MESSAGES/gconf-editor.mo
 share/locale/bg/LC_MESSAGES/gconf-editor.mo
 share/locale/bn/LC_MESSAGES/gconf-editor.mo
+share/locale/bn_IN/LC_MESSAGES/gconf-editor.mo
 share/locale/br/LC_MESSAGES/gconf-editor.mo
 share/locale/bs/LC_MESSAGES/gconf-editor.mo
 share/locale/ca/LC_MESSAGES/gconf-editor.mo
@@ -42,6 +27,7 @@ share/locale/cs/LC_MESSAGES/gconf-editor.mo
 share/locale/cy/LC_MESSAGES/gconf-editor.mo
 share/locale/da/LC_MESSAGES/gconf-editor.mo
 share/locale/de/LC_MESSAGES/gconf-editor.mo
+share/locale/dz/LC_MESSAGES/gconf-editor.mo
 share/locale/el/LC_MESSAGES/gconf-editor.mo
 share/locale/en_CA/LC_MESSAGES/gconf-editor.mo
 share/locale/en_GB/LC_MESSAGES/gconf-editor.mo
@@ -61,12 +47,14 @@ share/locale/hu/LC_MESSAGES/gconf-editor.mo
 share/locale/id/LC_MESSAGES/gconf-editor.mo
 share/locale/it/LC_MESSAGES/gconf-editor.mo
 share/locale/ja/LC_MESSAGES/gconf-editor.mo
+share/locale/ka/LC_MESSAGES/gconf-editor.mo
 share/locale/kn/LC_MESSAGES/gconf-editor.mo
 share/locale/ko/LC_MESSAGES/gconf-editor.mo
 share/locale/ku/LC_MESSAGES/gconf-editor.mo
 share/locale/li/LC_MESSAGES/gconf-editor.mo
 share/locale/lt/LC_MESSAGES/gconf-editor.mo
 share/locale/lv/LC_MESSAGES/gconf-editor.mo
+share/locale/mg/LC_MESSAGES/gconf-editor.mo
 share/locale/mk/LC_MESSAGES/gconf-editor.mo
 share/locale/ml/LC_MESSAGES/gconf-editor.mo
 share/locale/mn/LC_MESSAGES/gconf-editor.mo
@@ -75,7 +63,6 @@ share/locale/ms/LC_MESSAGES/gconf-editor.mo
 share/locale/nb/LC_MESSAGES/gconf-editor.mo
 share/locale/ne/LC_MESSAGES/gconf-editor.mo
 share/locale/nl/LC_MESSAGES/gconf-editor.mo
-share/locale/no/LC_MESSAGES/gconf-editor.mo
 share/locale/or/LC_MESSAGES/gconf-editor.mo
 share/locale/pa/LC_MESSAGES/gconf-editor.mo
 share/locale/pl/LC_MESSAGES/gconf-editor.mo
@@ -101,26 +88,64 @@ share/locale/xh/LC_MESSAGES/gconf-editor.mo
 share/locale/zh_CN/LC_MESSAGES/gconf-editor.mo
 share/locale/zh_HK/LC_MESSAGES/gconf-editor.mo
 share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo
+@dirrm share/gnome/pixmaps/gconf-editor
+@dirrm share/gnome/omf/gconf-editor
+@dirrm share/gnome/help/gconf-editor/C/figures
+@dirrm share/gnome/help/gconf-editor/C
+@dirrm share/gnome/help/gconf-editor
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
-@dirrm share/gnome/pixmaps/gconf-editor
-@dirrm share/gnome/omf/gconf-editor
-@dirrm share/gnome/help/gconf-editor/uk/figures
-@dirrm share/gnome/help/gconf-editor/uk
-@dirrm share/gnome/help/gconf-editor/C/figures
-@dirrm share/gnome/help/gconf-editor/C
-@dirrm share/gnome/help/gconf-editor
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 2eee7b0ba1e9..0e5618fb9ee7 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,10 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.120 2006/10/03 00:02:39 ahze Exp $
 #
 
 PORTNAME=	gnome-control-center
-PORTVERSION=	2.14.2
+PORTVERSION=	2.16.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,11 +17,11 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Control center for GNOME 2 project
 
-LIB_DEPENDS=	xklavier.10:${PORTSDIR}/x11/libxklavier
+LIB_DEPENDS=	xklavier.11:${PORTSDIR}/x11/libxklavier
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GSTREAMER=	good
@@ -30,9 +31,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack metacity nautilus2 \
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--enable-gstreamer=0.10 \
-		--disable-hal
+USE_LDCONFIG=	yes
+CONFIGURE_ARGS=	--enable-gstreamer=0.10
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index a40a62155be1..4e1ba827dfb1 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/control-center-2.14.2.tar.bz2) = 08711b0f14584e7eaa9f4c275085ab36
-SHA256 (gnome2/control-center-2.14.2.tar.bz2) = c0b428127f0e57921a36aff246f4a1b9d71c727506794afe7a778c2095b740d8
-SIZE (gnome2/control-center-2.14.2.tar.bz2) = 1864719
+MD5 (gnome2/control-center-2.16.1.tar.bz2) = be0e16ef4e42677ebeb0b580d0c9cf3f
+SHA256 (gnome2/control-center-2.16.1.tar.bz2) = eb78914d1d783e06c7b2ae04adf738750b6c00d146a47d591497a9a354afbb35
+SIZE (gnome2/control-center-2.16.1.tar.bz2) = 1992731
diff --git a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c
index 49727c882a89..69c01de97138 100644
--- a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c
+++ b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c
@@ -1,25 +1,15 @@
---- capplets/about-me/gnome-about-me-password.c.orig	Mon Nov 28 10:02:57 2005
-+++ capplets/about-me/gnome-about-me-password.c	Wed Dec 14 13:56:42 2005
-@@ -25,7 +25,9 @@
- #  include <config.h>
+--- capplets/about-me/gnome-about-me-password.c.orig	Sun Jun 11 04:50:31 2006
++++ capplets/about-me/gnome-about-me-password.c	Tue Jun 13 00:02:27 2006
+@@ -52,6 +52,12 @@
+ #include <signal.h>
  #endif
  
-+#ifndef __FreeBSD__
- #include <stropts.h>
-+#endif
- #include <gnome.h>
- #include <pwd.h>
- #include <stdlib.h>
-@@ -45,6 +47,12 @@
- 
- #if __sun
- #include <sys/types.h>
-+#include <signal.h>
-+#endif
-+
 +#if __FreeBSD__
 +#include <sys/types.h>
 +#include <libutil.h>
- #include <signal.h>
- #endif
++#include <signal.h>
++#endif
++
+ #include "capplet-util.h"
+ #include "eel-alert-dialog.h"
  
diff --git a/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c b/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c
deleted file mode 100644
index ab7180f75c17..000000000000
--- a/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig	Wed Jul 27 13:48:58 2005
-+++ capplets/keyboard/gnome-keyboard-properties-xkbot.c	Wed Jul 27 13:49:37 2005
-@@ -265,11 +265,12 @@
-                                          GladeXML * dialog)
- {
-   GtkWidget *expander, *align, *vbox;
-+  gchar *utfGroupName, *titlemarkup;
- 
-   GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
- 
--  gchar *utfGroupName = xci_desc_to_utf8 (configItem);
--  gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
-+  utfGroupName = xci_desc_to_utf8 (configItem);
-+  titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
- 
-   expander = gtk_expander_new (titlemarkup);
-   g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free);
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
index d8e861724bd3..94466c8551f1 100644
--- a/sysutils/gnome-control-center/files/patch-configure
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Jan 13 02:39:28 2005
-+++ configure	Thu Jan 13 02:39:28 2005
-@@ -22221,6 +22221,7 @@
+--- configure.orig	Thu Jul 13 12:02:50 2006
++++ configure	Thu Jul 13 12:04:24 2006
+@@ -22229,6 +22229,7 @@ echo $ECHO_N "checking for $ac_func... $
  if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -8,7 +8,16 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27490,7 +27491,7 @@
+@@ -28440,7 +28441,7 @@ BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG 
+ 
+ 
+ # dbus directory
+-DBUS_SERVICES_DIR='$(datadir)'"/dbus-1/services"
++DBUS_SERVICES_DIR='$(prefix)'"/share/dbus-1/services"
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -29126,7 +29127,7 @@ fi
  
  
  cat >>confdefs.h <<_ACEOF
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index faafe835eab5..bc35a765b962 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -21,6 +21,7 @@ bin/gnome-window-properties
 bin/themus-theme-applier
 etc/gnome-vfs-2.0/modules/font-method.conf
 etc/gnome-vfs-2.0/modules/theme-method.conf
+include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h
 include/gnome-window-settings-2.0/gnome-window-manager.h
 include/gnome-window-settings-2.0/gnome-wm-manager.h
 lib/gnome-vfs-2.0/modules/libfont-method.a
@@ -42,9 +43,10 @@ lib/nautilus/extensions-1.0/libnautilus-themus.so
 lib/window-manager-settings/libmetacity.a
 lib/window-manager-settings/libmetacity.la
 lib/window-manager-settings/libmetacity.so
-libdata/bonobo/servers/GNOME_SettingsDaemon.server
+libdata/pkgconfig/gnome-settings-daemon.pc
 libdata/pkgconfig/gnome-window-settings-2.0.pc
 libexec/gnome-settings-daemon
+share/dbus-1/services/org.gnome.SettingsDaemon.service
 share/gnome/applications/accessibility-keyboard.desktop
 share/gnome/applications/at-properties.desktop
 share/gnome/applications/background.desktop
@@ -80,14 +82,12 @@ share/gnome/control-center-2.0/interfaces/gnome-ui-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade
 share/gnome/control-center-2.0/interfaces/modmap-dialog.glade
 share/gnome/control-center-2.0/interfaces/sound-properties.glade
-share/gnome/control-center-2.0/interfaces/theme-install.glade
 share/gnome/control-center-2.0/interfaces/theme-properties.glade
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-bouncekey.png
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-mousekey.png
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-slowkey.png
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-stickykey.png
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-togglekey.png
-share/gnome/control-center-2.0/pixmaps/acme-brightness.png
 share/gnome/control-center-2.0/pixmaps/acme-eject.png
 share/gnome/control-center-2.0/pixmaps/at-startup.png
 share/gnome/control-center-2.0/pixmaps/at-support.png
@@ -98,8 +98,8 @@ share/gnome/control-center-2.0/pixmaps/bar.png
 share/gnome/control-center-2.0/pixmaps/double-click-maybe.png
 share/gnome/control-center-2.0/pixmaps/double-click-off.png
 share/gnome/control-center-2.0/pixmaps/double-click-on.png
-%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-off.png
-%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-on.png
+%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-lock-open.png
+%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-lock.png
 share/gnome/control-center-2.0/pixmaps/gnome-speakernotes-muted.png
 share/gnome/control-center-2.0/pixmaps/gnome-speakernotes.png
 share/gnome/control-center-2.0/pixmaps/keyboard-bell.png
@@ -148,10 +148,18 @@ share/gnome/help/control-center/C/config-sound.xml
 share/gnome/help/control-center/C/config-themes.xml
 share/gnome/help/control-center/C/control-center.xml
 share/gnome/help/control-center/es/control-center.xml
+share/gnome/help/control-center/fr/control-center.xml
+share/gnome/help/control-center/ru/control-center.xml
+share/gnome/help/control-center/sv/control-center.xml
+share/gnome/help/control-center/zh_CN/control-center.xml
 share/gnome/idl/ConfigArchiver.idl
 share/gnome/idl/GNOME_SettingsDaemon.idl
 share/gnome/omf/control-center/control-center-C.omf
 share/gnome/omf/control-center/control-center-es.omf
+share/gnome/omf/control-center/control-center-fr.omf
+share/gnome/omf/control-center/control-center-ru.omf
+share/gnome/omf/control-center/control-center-sv.omf
+share/gnome/omf/control-center/control-center-zh_CN.omf
 share/gnome/pixmaps/display-capplet.png
 share/icons/hicolor/48x48/apps/gnome-control-center.png
 share/locale/af/LC_MESSAGES/control-center-2.0.mo
@@ -161,6 +169,7 @@ share/locale/az/LC_MESSAGES/control-center-2.0.mo
 share/locale/be/LC_MESSAGES/control-center-2.0.mo
 share/locale/bg/LC_MESSAGES/control-center-2.0.mo
 share/locale/bn/LC_MESSAGES/control-center-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/control-center-2.0.mo
 share/locale/br/LC_MESSAGES/control-center-2.0.mo
 share/locale/bs/LC_MESSAGES/control-center-2.0.mo
 share/locale/ca/LC_MESSAGES/control-center-2.0.mo
@@ -194,16 +203,18 @@ share/locale/ko/LC_MESSAGES/control-center-2.0.mo
 share/locale/ku/LC_MESSAGES/control-center-2.0.mo
 share/locale/lt/LC_MESSAGES/control-center-2.0.mo
 share/locale/lv/LC_MESSAGES/control-center-2.0.mo
+share/locale/mg/LC_MESSAGES/control-center-2.0.mo
 share/locale/mk/LC_MESSAGES/control-center-2.0.mo
 share/locale/ml/LC_MESSAGES/control-center-2.0.mo
 share/locale/mn/LC_MESSAGES/control-center-2.0.mo
+share/locale/mr/LC_MESSAGES/control-center-2.0.mo
 share/locale/ms/LC_MESSAGES/control-center-2.0.mo
 share/locale/nb/LC_MESSAGES/control-center-2.0.mo
 share/locale/ne/LC_MESSAGES/control-center-2.0.mo
 share/locale/nl/LC_MESSAGES/control-center-2.0.mo
 share/locale/nn/LC_MESSAGES/control-center-2.0.mo
-share/locale/no/LC_MESSAGES/control-center-2.0.mo
 share/locale/nso/LC_MESSAGES/control-center-2.0.mo
+share/locale/or/LC_MESSAGES/control-center-2.0.mo
 share/locale/pa/LC_MESSAGES/control-center-2.0.mo
 share/locale/pl/LC_MESSAGES/control-center-2.0.mo
 share/locale/pt/LC_MESSAGES/control-center-2.0.mo
@@ -229,21 +240,11 @@ share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 share/locale/zu/LC_MESSAGES/control-center-2.0.mo
-@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/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/nso/LC_MESSAGES
-@dirrmtry share/locale/nso
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
 @dirrm share/gnome/omf/control-center
+@dirrm share/gnome/help/control-center/zh_CN
+@dirrm share/gnome/help/control-center/ru/
+@dirrm share/gnome/help/control-center/sv
+@dirrm share/gnome/help/control-center/fr
 @dirrm share/gnome/help/control-center/es
 @dirrm share/gnome/help/control-center/C
 @dirrm share/gnome/help/control-center
@@ -257,5 +258,65 @@ share/locale/zu/LC_MESSAGES/control-center-2.0.mo
 @dirrmtry share/gnome/control-center-2.0/icons
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0
+@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
+@dirrm include/gnome-settings-daemon-2.0
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile
new file mode 100644
index 000000000000..f4232382adc8
--- /dev/null
+++ b/sysutils/gnome-mount/Makefile
@@ -0,0 +1,33 @@
+# New ports collection makefile for:	gnome-mount
+# Date created:			04 June 2006
+# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/sysutils/gnome-mount/Makefile,v 1.4 2006/10/05 07:37:38 mezz Exp $
+#
+
+PORTNAME=	gnome-mount
+PORTVERSION=	0.4
+PORTREVISION=	1
+CATEGORIES=	sysutils gnome
+MASTER_SITES=	http://people.freedesktop.org/~david/dist/
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A font-end to mount, umount, and eject using HAL
+
+LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal
+
+USE_XLIB=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack nautilus2
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-nautilus-extension
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+GCONF_SCHEMAS=	gnome-mount.schemas
+
+post-extract:
+	@${CP} -f ${FILESDIR}/mntent.h ${WRKSRC}/src
+
+.include <bsd.port.mk>
diff --git a/sysutils/gnome-mount/distinfo b/sysutils/gnome-mount/distinfo
new file mode 100644
index 000000000000..656c038250f9
--- /dev/null
+++ b/sysutils/gnome-mount/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome-mount-0.4.tar.gz) = 75f260ea6b0ec3c5e0af3c722fbd9568
+SHA256 (gnome-mount-0.4.tar.gz) = fa9456c0cd1adeda962721fed955914bdc23723a403bebf31bd95a1f54211dd8
+SIZE (gnome-mount-0.4.tar.gz) = 364546
diff --git a/sysutils/gnome-mount/files/mntent.h b/sysutils/gnome-mount/files/mntent.h
new file mode 100644
index 000000000000..078b246cd02e
--- /dev/null
+++ b/sysutils/gnome-mount/files/mntent.h
@@ -0,0 +1,56 @@
+/*
+ *  mntent
+ *  mntent.h - compatability header for FreeBSD
+ *
+ *  Copyright (c) 2001 David Rufino <daverufino@btinternet.com>
+ *  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(HAVE_MNTENT_H)
+#include <mntent.h>
+#else
+#ifndef _MNTENT_H
+#define _MNTENT_H
+#include <stdio.h>
+
+#define MOUNTED "dummy"
+
+#define MNTTYPE_NFS "nfs"
+
+struct mntent {
+	char *mnt_fsname;
+	char *mnt_dir;
+	char *mnt_type;
+	char *mnt_opts;
+	int mnt_freq;
+	int mnt_passno;
+};
+
+#define setmntent(x,y) ((FILE *)0x1)
+struct mntent *getmntent __P ((FILE *fp));
+char *hasmntopt __P ((const struct mntent *mnt, const char *option));
+#define endmntent(x) ((int)1)
+
+#endif /* _MNTENT_H */
+#endif /* HAVE_MNTENT_H */
diff --git a/sysutils/gnome-mount/files/patch-src_gnome-mount.c b/sysutils/gnome-mount/files/patch-src_gnome-mount.c
new file mode 100644
index 000000000000..eb78bab377f5
--- /dev/null
+++ b/sysutils/gnome-mount/files/patch-src_gnome-mount.c
@@ -0,0 +1,29 @@
+--- src/gnome-mount.c.orig	Mon Sep  4 21:41:09 2006
++++ src/gnome-mount.c	Mon Sep  4 21:45:53 2006
+@@ -42,7 +42,7 @@
+ #include <libhal.h>
+ #include <libhal-storage.h>
+ 
+-#include <mntent.h>
++#include "mntent.h"
+ 
+ static DBusConnection *dbus_connection;
+ static LibHalContext *hal_ctx;
+@@ -477,7 +477,7 @@
+ 
+ 		mount_point = NULL;
+ 		device_file = get_dev_file (volume, drive);
+-
++#ifdef __linux__
+ 		if (device_file != NULL) {
+ 			FILE *f;
+ 			struct mntent mnt;
+@@ -497,7 +497,7 @@
+ 				endmntent (f);
+ 			}
+ 		}
+-
++#endif
+ 		g_print (_("Mounted %s at \"%s\"\n"), device_file, mount_point);
+ 		g_free (mount_point);
+ 	}
diff --git a/sysutils/gnome-mount/pkg-descr b/sysutils/gnome-mount/pkg-descr
new file mode 100644
index 000000000000..a75d36294fe4
--- /dev/null
+++ b/sysutils/gnome-mount/pkg-descr
@@ -0,0 +1,2 @@
+gnome-mount is a HAL-based front-end to mount, umount, and eject which
+offers a centralized place where settings for these commands are maintained.
diff --git a/sysutils/gnome-mount/pkg-plist b/sysutils/gnome-mount/pkg-plist
new file mode 100644
index 000000000000..0ae3f4092a0a
--- /dev/null
+++ b/sysutils/gnome-mount/pkg-plist
@@ -0,0 +1,12 @@
+bin/gnome-eject
+bin/gnome-mount
+bin/gnome-umount
+lib/nautilus/extensions-1.0/libgnome-mount.a
+lib/nautilus/extensions-1.0/libgnome-mount.la
+lib/nautilus/extensions-1.0/libgnome-mount.so
+libdata/pkgconfig/gnome-mount.pc
+share/gnome/gnome-mount/gnome-mount-properties.glade
+share/locale/it/LC_MESSAGES/gnome-mount.mo
+share/locale/ja/LC_MESSAGES/gnome-mount.mo
+share/locale/nb/LC_MESSAGES/gnome-mount.mo
+@dirrm share/gnome/gnome-mount
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
new file mode 100644
index 000000000000..6f9106ffdfee
--- /dev/null
+++ b/sysutils/gnome-power-manager/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for:	gnome-power-manager
+# Date created:				03 May 2006
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.13 2006/09/29 23:25:32 marcus Exp $
+#
+
+PORTNAME=	gnome-power-manager
+PORTVERSION=	2.16.1
+CATEGORIES=	sysutils gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Power management system for the GNOME Desktop
+
+LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal \
+		notify.2:${PORTSDIR}/devel/libnotify
+
+USE_GETTEXT=	yes
+USE_BZIP2=	yes
+USE_XLIB=	yes
+USE_GMAKE=	yes
+INSTALLS_OMF=	yes
+INSTALLS_ICONS=	yes
+USE_AUTOTOOLS=	libtool:15
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui libwnck \
+		gnomedocutils
+CONFIGURE_ARGS=	--disable-icon-framing
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+GCONF_SCHEMAS=	gnome-power-manager.schemas
+
+.include <bsd.port.mk>
diff --git a/sysutils/gnome-power-manager/distinfo b/sysutils/gnome-power-manager/distinfo
new file mode 100644
index 000000000000..e01eb689ac13
--- /dev/null
+++ b/sysutils/gnome-power-manager/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/gnome-power-manager-2.16.1.tar.bz2) = 6798ee24e5e94befab5a7584c19771cb
+SHA256 (gnome2/gnome-power-manager-2.16.1.tar.bz2) = c2bddef973b8a72b8da03b2cffad5107bfaefb64bd42a0763d9d925e222a3490
+SIZE (gnome2/gnome-power-manager-2.16.1.tar.bz2) = 1862984
diff --git a/sysutils/gnome-power-manager/pkg-descr b/sysutils/gnome-power-manager/pkg-descr
new file mode 100644
index 000000000000..5b789d06c24b
--- /dev/null
+++ b/sysutils/gnome-power-manager/pkg-descr
@@ -0,0 +1,7 @@
+GNOME Power Manager is a GNOME session daemon that acts as a policy agent
+on top of HAL (the Hardware Abstraction Layer).  GNOME Power Manager listens
+for HAL events and responds with user-configurable reactions.
+Currently it supports laptop batteries and AC adapters. Its goal is to be
+architecture neutral and free of polling and other hacks.
+
+WWW: http://www.gnome.org/projects/gnome-power-manager/
diff --git a/sysutils/gnome-power-manager/pkg-plist b/sysutils/gnome-power-manager/pkg-plist
new file mode 100644
index 000000000000..74bbe12673e9
--- /dev/null
+++ b/sysutils/gnome-power-manager/pkg-plist
@@ -0,0 +1,319 @@
+bin/gnome-power-inhibit-test
+bin/gnome-power-manager
+bin/gnome-power-preferences
+etc/dbus-1/system.d/gnome-power-manager.conf
+share/dbus-1/services/gnome-power-manager.service
+share/gnome/applications/gnome-power-preferences.desktop
+share/gnome/autostart/gnome-power-manager.desktop
+share/gnome/gnome-power-manager/gpm-feedback-widget.glade
+share/gnome/gnome-power-manager/gpm-info.glade
+share/gnome/gnome-power-manager/gpm-inhibit-test.glade
+share/gnome/gnome-power-manager/gpm-prefs.glade
+share/gnome/help/gnome-power-manager/C/figures/gpm-charged.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-critical.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-info-devices.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-info-event-log.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-info-percentage.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-info-rate.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-info-time.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-low.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-prefs-ac.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-prefs-battery.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-prefs-options.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-suspend-problem.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-unplugged.png
+share/gnome/help/gnome-power-manager/C/figures/gs-prefs.png
+share/gnome/help/gnome-power-manager/C/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/C/legal.xml
+share/gnome/help/gnome-power-manager/ru/figures/gpm-charged.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-critical.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-info-devices.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-info-event-log.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-info-percentage.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-info-rate.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-info-time.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-low.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-prefs-ac.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-prefs-battery.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-prefs-options.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-suspend-problem.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-unplugged.png
+share/gnome/help/gnome-power-manager/ru/figures/gs-prefs.png
+share/gnome/help/gnome-power-manager/ru/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/sv/figures/gpm-charged.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-critical.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-info-devices.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-info-event-log.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-info-percentage.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-info-rate.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-info-time.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-low.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-prefs-ac.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-prefs-battery.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-prefs-options.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-suspend-problem.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-unplugged.png
+share/gnome/help/gnome-power-manager/sv/figures/gs-prefs.png
+share/gnome/help/gnome-power-manager/sv/gnome-power-manager.xml
+share/gnome/omf/gnome-power-manager/gnome-power-manager-C.omf
+share/gnome/omf/gnome-power-manager/gnome-power-manager-ru.omf
+share/gnome/omf/gnome-power-manager/gnome-power-manager-sv.omf
+share/icons/hicolor/16x16/apps/gpm-ac-adapter.png
+share/icons/hicolor/16x16/apps/gpm-brightness.png
+share/icons/hicolor/16x16/apps/gpm-hibernate.png
+share/icons/hicolor/16x16/apps/gpm-keyboard-000.png
+share/icons/hicolor/16x16/apps/gpm-keyboard-030.png
+share/icons/hicolor/16x16/apps/gpm-keyboard-060.png
+share/icons/hicolor/16x16/apps/gpm-keyboard-100.png
+share/icons/hicolor/16x16/apps/gpm-mouse-000.png
+share/icons/hicolor/16x16/apps/gpm-mouse-030.png
+share/icons/hicolor/16x16/apps/gpm-mouse-060.png
+share/icons/hicolor/16x16/apps/gpm-mouse-100.png
+share/icons/hicolor/16x16/apps/gpm-primary-000-charging.png
+share/icons/hicolor/16x16/apps/gpm-primary-000.png
+share/icons/hicolor/16x16/apps/gpm-primary-020-charging.png
+share/icons/hicolor/16x16/apps/gpm-primary-020.png
+share/icons/hicolor/16x16/apps/gpm-primary-040-charging.png
+share/icons/hicolor/16x16/apps/gpm-primary-040.png
+share/icons/hicolor/16x16/apps/gpm-primary-060-charging.png
+share/icons/hicolor/16x16/apps/gpm-primary-060.png
+share/icons/hicolor/16x16/apps/gpm-primary-080-charging.png
+share/icons/hicolor/16x16/apps/gpm-primary-080.png
+share/icons/hicolor/16x16/apps/gpm-primary-100-charging.png
+share/icons/hicolor/16x16/apps/gpm-primary-100.png
+share/icons/hicolor/16x16/apps/gpm-primary-charged.png
+share/icons/hicolor/16x16/apps/gpm-primary-missing.png
+share/icons/hicolor/16x16/apps/gpm-suspend.png
+share/icons/hicolor/16x16/apps/gpm-ups-000-charging.png
+share/icons/hicolor/16x16/apps/gpm-ups-000.png
+share/icons/hicolor/16x16/apps/gpm-ups-020-charging.png
+share/icons/hicolor/16x16/apps/gpm-ups-020.png
+share/icons/hicolor/16x16/apps/gpm-ups-040-charging.png
+share/icons/hicolor/16x16/apps/gpm-ups-040.png
+share/icons/hicolor/16x16/apps/gpm-ups-060-charging.png
+share/icons/hicolor/16x16/apps/gpm-ups-060.png
+share/icons/hicolor/16x16/apps/gpm-ups-080-charging.png
+share/icons/hicolor/16x16/apps/gpm-ups-080.png
+share/icons/hicolor/16x16/apps/gpm-ups-100-charging.png
+share/icons/hicolor/16x16/apps/gpm-ups-100.png
+share/icons/hicolor/16x16/apps/gpm-ups-charged.png
+share/icons/hicolor/16x16/apps/gpm-ups-missing.png
+share/icons/hicolor/22x22/apps/gpm-ac-adapter.png
+share/icons/hicolor/22x22/apps/gpm-brightness.png
+share/icons/hicolor/22x22/apps/gpm-hibernate.png
+share/icons/hicolor/22x22/apps/gpm-keyboard-000.png
+share/icons/hicolor/22x22/apps/gpm-keyboard-030.png
+share/icons/hicolor/22x22/apps/gpm-keyboard-060.png
+share/icons/hicolor/22x22/apps/gpm-keyboard-100.png
+share/icons/hicolor/22x22/apps/gpm-mouse-000.png
+share/icons/hicolor/22x22/apps/gpm-mouse-030.png
+share/icons/hicolor/22x22/apps/gpm-mouse-060.png
+share/icons/hicolor/22x22/apps/gpm-mouse-100.png
+share/icons/hicolor/22x22/apps/gpm-primary-000-charging.png
+share/icons/hicolor/22x22/apps/gpm-primary-000.png
+share/icons/hicolor/22x22/apps/gpm-primary-020-charging.png
+share/icons/hicolor/22x22/apps/gpm-primary-020.png
+share/icons/hicolor/22x22/apps/gpm-primary-040-charging.png
+share/icons/hicolor/22x22/apps/gpm-primary-040.png
+share/icons/hicolor/22x22/apps/gpm-primary-060-charging.png
+share/icons/hicolor/22x22/apps/gpm-primary-060.png
+share/icons/hicolor/22x22/apps/gpm-primary-080-charging.png
+share/icons/hicolor/22x22/apps/gpm-primary-080.png
+share/icons/hicolor/22x22/apps/gpm-primary-100-charging.png
+share/icons/hicolor/22x22/apps/gpm-primary-100.png
+share/icons/hicolor/22x22/apps/gpm-primary-charged.png
+share/icons/hicolor/22x22/apps/gpm-primary-missing.png
+share/icons/hicolor/22x22/apps/gpm-suspend.png
+share/icons/hicolor/22x22/apps/gpm-ups-000-charging.png
+share/icons/hicolor/22x22/apps/gpm-ups-000.png
+share/icons/hicolor/22x22/apps/gpm-ups-020-charging.png
+share/icons/hicolor/22x22/apps/gpm-ups-020.png
+share/icons/hicolor/22x22/apps/gpm-ups-040-charging.png
+share/icons/hicolor/22x22/apps/gpm-ups-040.png
+share/icons/hicolor/22x22/apps/gpm-ups-060-charging.png
+share/icons/hicolor/22x22/apps/gpm-ups-060.png
+share/icons/hicolor/22x22/apps/gpm-ups-080-charging.png
+share/icons/hicolor/22x22/apps/gpm-ups-080.png
+share/icons/hicolor/22x22/apps/gpm-ups-100-charging.png
+share/icons/hicolor/22x22/apps/gpm-ups-100.png
+share/icons/hicolor/22x22/apps/gpm-ups-charged.png
+share/icons/hicolor/22x22/apps/gpm-ups-missing.png
+share/icons/hicolor/24x24/apps/gpm-ac-adapter.png
+share/icons/hicolor/24x24/apps/gpm-brightness.png
+share/icons/hicolor/24x24/apps/gpm-hibernate.png
+share/icons/hicolor/24x24/apps/gpm-keyboard-000.png
+share/icons/hicolor/24x24/apps/gpm-keyboard-030.png
+share/icons/hicolor/24x24/apps/gpm-keyboard-060.png
+share/icons/hicolor/24x24/apps/gpm-keyboard-100.png
+share/icons/hicolor/24x24/apps/gpm-mouse-000.png
+share/icons/hicolor/24x24/apps/gpm-mouse-030.png
+share/icons/hicolor/24x24/apps/gpm-mouse-060.png
+share/icons/hicolor/24x24/apps/gpm-mouse-100.png
+share/icons/hicolor/24x24/apps/gpm-primary-000-charging.png
+share/icons/hicolor/24x24/apps/gpm-primary-000.png
+share/icons/hicolor/24x24/apps/gpm-primary-020-charging.png
+share/icons/hicolor/24x24/apps/gpm-primary-020.png
+share/icons/hicolor/24x24/apps/gpm-primary-040-charging.png
+share/icons/hicolor/24x24/apps/gpm-primary-040.png
+share/icons/hicolor/24x24/apps/gpm-primary-060-charging.png
+share/icons/hicolor/24x24/apps/gpm-primary-060.png
+share/icons/hicolor/24x24/apps/gpm-primary-080-charging.png
+share/icons/hicolor/24x24/apps/gpm-primary-080.png
+share/icons/hicolor/24x24/apps/gpm-primary-100-charging.png
+share/icons/hicolor/24x24/apps/gpm-primary-100.png
+share/icons/hicolor/24x24/apps/gpm-primary-charged.png
+share/icons/hicolor/24x24/apps/gpm-primary-missing.png
+share/icons/hicolor/24x24/apps/gpm-suspend.png
+share/icons/hicolor/24x24/apps/gpm-ups-000-charging.png
+share/icons/hicolor/24x24/apps/gpm-ups-000.png
+share/icons/hicolor/24x24/apps/gpm-ups-020-charging.png
+share/icons/hicolor/24x24/apps/gpm-ups-020.png
+share/icons/hicolor/24x24/apps/gpm-ups-040-charging.png
+share/icons/hicolor/24x24/apps/gpm-ups-040.png
+share/icons/hicolor/24x24/apps/gpm-ups-060-charging.png
+share/icons/hicolor/24x24/apps/gpm-ups-060.png
+share/icons/hicolor/24x24/apps/gpm-ups-080-charging.png
+share/icons/hicolor/24x24/apps/gpm-ups-080.png
+share/icons/hicolor/24x24/apps/gpm-ups-100-charging.png
+share/icons/hicolor/24x24/apps/gpm-ups-100.png
+share/icons/hicolor/24x24/apps/gpm-ups-charged.png
+share/icons/hicolor/24x24/apps/gpm-ups-missing.png
+share/icons/hicolor/scalable/apps/gpm-ac-adapter.svg
+share/icons/hicolor/scalable/apps/gpm-brightness.svg
+share/icons/hicolor/scalable/apps/gpm-hibernate.svg
+share/icons/hicolor/scalable/apps/gpm-keyboard-000.svg
+share/icons/hicolor/scalable/apps/gpm-keyboard-030.svg
+share/icons/hicolor/scalable/apps/gpm-keyboard-060.svg
+share/icons/hicolor/scalable/apps/gpm-keyboard-100.svg
+share/icons/hicolor/scalable/apps/gpm-mouse-000.svg
+share/icons/hicolor/scalable/apps/gpm-mouse-030.svg
+share/icons/hicolor/scalable/apps/gpm-mouse-060.svg
+share/icons/hicolor/scalable/apps/gpm-mouse-100.svg
+share/icons/hicolor/scalable/apps/gpm-primary-000-charging.svg
+share/icons/hicolor/scalable/apps/gpm-primary-000.svg
+share/icons/hicolor/scalable/apps/gpm-primary-020-charging.svg
+share/icons/hicolor/scalable/apps/gpm-primary-020.svg
+share/icons/hicolor/scalable/apps/gpm-primary-040-charging.svg
+share/icons/hicolor/scalable/apps/gpm-primary-040.svg
+share/icons/hicolor/scalable/apps/gpm-primary-060-charging.svg
+share/icons/hicolor/scalable/apps/gpm-primary-060.svg
+share/icons/hicolor/scalable/apps/gpm-primary-080-charging.svg
+share/icons/hicolor/scalable/apps/gpm-primary-080.svg
+share/icons/hicolor/scalable/apps/gpm-primary-100-charging.svg
+share/icons/hicolor/scalable/apps/gpm-primary-100.svg
+share/icons/hicolor/scalable/apps/gpm-primary-charged.svg
+share/icons/hicolor/scalable/apps/gpm-primary-missing.svg
+share/icons/hicolor/scalable/apps/gpm-suspend.svg
+share/icons/hicolor/scalable/apps/gpm-ups-000-charging.svg
+share/icons/hicolor/scalable/apps/gpm-ups-000.svg
+share/icons/hicolor/scalable/apps/gpm-ups-020-charging.svg
+share/icons/hicolor/scalable/apps/gpm-ups-020.svg
+share/icons/hicolor/scalable/apps/gpm-ups-040-charging.svg
+share/icons/hicolor/scalable/apps/gpm-ups-040.svg
+share/icons/hicolor/scalable/apps/gpm-ups-060-charging.svg
+share/icons/hicolor/scalable/apps/gpm-ups-060.svg
+share/icons/hicolor/scalable/apps/gpm-ups-080-charging.svg
+share/icons/hicolor/scalable/apps/gpm-ups-080.svg
+share/icons/hicolor/scalable/apps/gpm-ups-100-charging.svg
+share/icons/hicolor/scalable/apps/gpm-ups-100.svg
+share/icons/hicolor/scalable/apps/gpm-ups-charged.svg
+share/icons/hicolor/scalable/apps/gpm-ups-missing.svg
+share/locale/bg/LC_MESSAGES/gnome-power-manager.mo
+share/locale/bn/LC_MESSAGES/gnome-power-manager.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-power-manager.mo
+share/locale/ca/LC_MESSAGES/gnome-power-manager.mo
+share/locale/cs/LC_MESSAGES/gnome-power-manager.mo
+share/locale/cy/LC_MESSAGES/gnome-power-manager.mo
+share/locale/de/LC_MESSAGES/gnome-power-manager.mo
+share/locale/dz/LC_MESSAGES/gnome-power-manager.mo
+share/locale/el/LC_MESSAGES/gnome-power-manager.mo
+share/locale/en_CA/LC_MESSAGES/gnome-power-manager.mo
+share/locale/en_GB/LC_MESSAGES/gnome-power-manager.mo
+share/locale/es/LC_MESSAGES/gnome-power-manager.mo
+share/locale/et/LC_MESSAGES/gnome-power-manager.mo
+share/locale/eu/LC_MESSAGES/gnome-power-manager.mo
+share/locale/fa/LC_MESSAGES/gnome-power-manager.mo
+share/locale/fi/LC_MESSAGES/gnome-power-manager.mo
+share/locale/fr/LC_MESSAGES/gnome-power-manager.mo
+share/locale/gl/LC_MESSAGES/gnome-power-manager.mo
+share/locale/gu/LC_MESSAGES/gnome-power-manager.mo
+share/locale/hi/LC_MESSAGES/gnome-power-manager.mo
+share/locale/hu/LC_MESSAGES/gnome-power-manager.mo
+share/locale/it/LC_MESSAGES/gnome-power-manager.mo
+share/locale/ja/LC_MESSAGES/gnome-power-manager.mo
+share/locale/ka/LC_MESSAGES/gnome-power-manager.mo
+share/locale/ko/LC_MESSAGES/gnome-power-manager.mo
+share/locale/ku/LC_MESSAGES/gnome-power-manager.mo
+share/locale/lt/LC_MESSAGES/gnome-power-manager.mo
+share/locale/lv/LC_MESSAGES/gnome-power-manager.mo
+share/locale/mg/LC_MESSAGES/gnome-power-manager.mo
+share/locale/mk/LC_MESSAGES/gnome-power-manager.mo
+share/locale/ml/LC_MESSAGES/gnome-power-manager.mo
+share/locale/nb/LC_MESSAGES/gnome-power-manager.mo
+share/locale/nl/LC_MESSAGES/gnome-power-manager.mo
+share/locale/or/LC_MESSAGES/gnome-power-manager.mo
+share/locale/pa/LC_MESSAGES/gnome-power-manager.mo
+share/locale/pl/LC_MESSAGES/gnome-power-manager.mo
+share/locale/pt/LC_MESSAGES/gnome-power-manager.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-power-manager.mo
+share/locale/ru/LC_MESSAGES/gnome-power-manager.mo
+share/locale/sk/LC_MESSAGES/gnome-power-manager.mo
+share/locale/sl/LC_MESSAGES/gnome-power-manager.mo
+share/locale/sr/LC_MESSAGES/gnome-power-manager.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-power-manager.mo
+share/locale/sv/LC_MESSAGES/gnome-power-manager.mo
+share/locale/ta/LC_MESSAGES/gnome-power-manager.mo
+share/locale/th/LC_MESSAGES/gnome-power-manager.mo
+share/locale/uk/LC_MESSAGES/gnome-power-manager.mo
+share/locale/vi/LC_MESSAGES/gnome-power-manager.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-power-manager.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-power-manager.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-power-manager.mo
+@dirrm share/gnome/omf/gnome-power-manager
+@dirrm share/gnome/help/gnome-power-manager/sv/figures
+@dirrm share/gnome/help/gnome-power-manager/sv
+@dirrm share/gnome/help/gnome-power-manager/ru/figures
+@dirrm share/gnome/help/gnome-power-manager/ru
+@dirrm share/gnome/help/gnome-power-manager/C/figures
+@dirrm share/gnome/help/gnome-power-manager/C
+@dirrm share/gnome/help/gnome-power-manager
+@dirrm share/gnome/gnome-power-manager
+@dirrmtry share/gnome/autostart
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 6131ed93c725..af82e4f4b567 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -3,10 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.76 2006/10/02 23:31:11 ahze Exp $
 #
 
 PORTNAME=	gnome-system-monitor
-PORTVERSION=	2.14.5
+PORTVERSION=	2.16.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,7 +21,7 @@ LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui libwnck
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index aac38e4e1291..8a66b02dd773 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-monitor-2.14.5.tar.bz2) = 1220837542f9c1905ebf3af69a608b07
-SHA256 (gnome2/gnome-system-monitor-2.14.5.tar.bz2) = 1ec5537e05191ecae5835f17d2bf308797c1fcb2ed6ebcdb0b673f1d24838b05
-SIZE (gnome2/gnome-system-monitor-2.14.5.tar.bz2) = 1413201
+MD5 (gnome2/gnome-system-monitor-2.16.1.tar.bz2) = 37b44e0e84865fc0aba8bfd4bbdf2338
+SHA256 (gnome2/gnome-system-monitor-2.16.1.tar.bz2) = 1be70e1ae696e3607dfeda186298e7034cca4e0c8020bf92c7485b8c6450504c
+SIZE (gnome2/gnome-system-monitor-2.16.1.tar.bz2) = 1480061
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index ed8ccd03b81f..3adab4f7d10e 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -38,6 +38,7 @@ share/locale/az/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/be/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/bg/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/bn/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/bs/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ca/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/cs/LC_MESSAGES/gnome-system-monitor.mo
@@ -66,17 +67,21 @@ share/locale/it/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ja/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ka/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ko/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ku/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/li/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/lt/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/lv/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/mg/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/mk/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/mn/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/mr/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ms/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/nb/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ne/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/nl/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/nn/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/or/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/pa/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/pl/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/pt/LC_MESSAGES/gnome-system-monitor.mo
@@ -99,13 +104,63 @@ share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
 @dirrm share/gnome/omf/gnome-system-monitor
 @dirrm share/gnome/help/gnome-system-monitor/bg/figures
 @dirrm share/gnome/help/gnome-system-monitor/bg
 @dirrm share/gnome/help/gnome-system-monitor/C/figures
 @dirrm share/gnome/help/gnome-system-monitor/C
 @dirrm share/gnome/help/gnome-system-monitor
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/sysutils/gnome-volume-manager/Makefile b/sysutils/gnome-volume-manager/Makefile
new file mode 100644
index 000000000000..8eb999440ae5
--- /dev/null
+++ b/sysutils/gnome-volume-manager/Makefile
@@ -0,0 +1,30 @@
+# New ports collection makefile for:	gnome-volume-manager
+# Date created:			02 May 2006
+# Whom:				Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.7 2006/09/15 05:50:19 marcus Exp $
+#
+
+PORTNAME=	gnome-volume-manager
+PORTVERSION=	2.15.0
+CATEGORIES=	sysutils gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Automatically mount removable media, and more
+
+LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal \
+		notify.2:${PORTSDIR}/devel/libnotify
+
+USE_XLIB=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack nautilus2
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--disable-multiuser
+GCONF_SCHEMAS=	gnome-volume-manager.schemas
+
+.include <bsd.port.mk>
diff --git a/sysutils/gnome-volume-manager/distinfo b/sysutils/gnome-volume-manager/distinfo
new file mode 100644
index 000000000000..9b0f0ca3ddf3
--- /dev/null
+++ b/sysutils/gnome-volume-manager/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome-volume-manager-2.15.0.tar.bz2) = d723bc2069fd19cf1c31961fbc1cf3c8
+SHA256 (gnome-volume-manager-2.15.0.tar.bz2) = f3d2ce3e2f2a4b757d4688bae7f6b8418d11340618f15d34871a002516ab8e0e
+SIZE (gnome-volume-manager-2.15.0.tar.bz2) = 318479
diff --git a/sysutils/gnome-volume-manager/files/patch-gnome-volume-manager.schemas.in b/sysutils/gnome-volume-manager/files/patch-gnome-volume-manager.schemas.in
new file mode 100644
index 000000000000..94af083a163b
--- /dev/null
+++ b/sysutils/gnome-volume-manager/files/patch-gnome-volume-manager.schemas.in
@@ -0,0 +1,11 @@
+--- gnome-volume-manager.schemas.in.orig	Wed Jun  7 21:41:12 2006
++++ gnome-volume-manager.schemas.in	Wed Jun  7 21:41:40 2006
+@@ -227,7 +227,7 @@
+         <key>/schemas/desktop/gnome/volume_manager/autoprinter_command</key>
+ 	<applyto>/desktop/gnome/volume_manager/autoprinter_command</applyto>
+ 	<type>string</type>
+-	<default>gnome-printer-add hal://%h</default>
++	<default>gnome-cups-add hal://%h</default>
+ 	<locale name="C">
+ 	  <short>printer command</short>
+ 	  <long>Command to run when a printer is connected.</long>
diff --git a/sysutils/gnome-volume-manager/files/patch-src_manager.c b/sysutils/gnome-volume-manager/files/patch-src_manager.c
new file mode 100644
index 000000000000..ded14abd6f96
--- /dev/null
+++ b/sysutils/gnome-volume-manager/files/patch-src_manager.c
@@ -0,0 +1,63 @@
+--- src/manager.c.orig	Mon Jul 31 16:37:36 2006
++++ src/manager.c	Fri Sep 15 01:32:32 2006
+@@ -23,9 +23,12 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <dirent.h>
++#include <fcntl.h>
+ #include <signal.h>
+ #include <unistd.h>
+ #include <utmp.h>
++#include <sys/param.h>
++#include <sys/mount.h>
+ 
+ #include <locale.h>
+ 
+@@ -3088,10 +3091,17 @@ gvm_local_user (void)
+ 	struct utmp *utmp;
+ 	const char *user;
+ 	size_t ulen;
++#ifndef __linux__
++	int bytes, fd;
++	struct stat sb;
++	struct utmp buf[1024];
++	long len;
++#endif
+ 	
+ 	user = g_get_user_name ();
+ 	ulen = strlen (user);
+ 	
++#ifdef __linux__
+ 	setutent ();
+ 	
+ 	while (!local && (utmp = getutent ())) {
+@@ -3103,7 +3113,28 @@ gvm_local_user (void)
+ 	}
+ 	
+ 	endutent ();
+-	
++#else
++	if ((fd = open (_PATH_WTMP, O_RDONLY, 0)) < 0 || fstat(fd, &sb) == -1) {
++		close (fd);
++		return TRUE;
++	}
++	len = (sb.st_size + sizeof(buf) - 1) / sizeof(buf);
++
++	while (!local && --len >= 0) {
++		if (lseek(fd, (off_t) (len * sizeof(buf)), L_SET) == -1 ||
++			(bytes = read (fd, buf, sizeof(buf))) == -1) {
++			close (fd);
++			return TRUE;
++		}
++		for (utmp = &buf[bytes / sizeof(buf[0]) - 1]; !local && utmp >= buf; --utmp) {
++			if (!utmp->ut_name[0] || strncmp (utmp->ut_name, user, ulen) != 0)
++				continue;
++			local = utmp->ut_line[0] == ':' && utmp->ut_line[1] >= '0' && utmp->ut_line[1] <= '9';
++		}
++	}
++
++	close (fd);
++#endif
+ 	return local;
+ }
+ 
diff --git a/sysutils/gnome-volume-manager/files/patch-src_properties.c b/sysutils/gnome-volume-manager/files/patch-src_properties.c
new file mode 100644
index 000000000000..5e8d72a2d61b
--- /dev/null
+++ b/sysutils/gnome-volume-manager/files/patch-src_properties.c
@@ -0,0 +1,14 @@
+--- src/properties.c.orig	Sat Jul 15 13:54:29 2006
++++ src/properties.c	Sat Jul 15 13:55:03 2006
+@@ -499,7 +499,11 @@ main (int argc, char **argv)
+ 							  _("The \"hald\" service is required but not currently "
+ 							    "running. Enable the service and rerun this application, "
+ 							    "or contact your system administrator.\n\n"
++#ifndef __FreeBSD__
+ 							    "Note: You need Linux kernel 2.6 for volume "
++#else
++							    "Note: You need sysutils/hal installed for volume "
++#endif
+ 							    "management to work."));
+ 		
+ 		gtk_dialog_run (GTK_DIALOG (dialog));
diff --git a/sysutils/gnome-volume-manager/pkg-descr b/sysutils/gnome-volume-manager/pkg-descr
new file mode 100644
index 000000000000..b8ce9b76814d
--- /dev/null
+++ b/sysutils/gnome-volume-manager/pkg-descr
@@ -0,0 +1,3 @@
+gnome-volume-manager is a desktop-level daemon that enforces volume-related
+policy in response to events received from HAL. Its goal is to implement all
+functionality as a state-machine in response to asynchronous events from HAL.
diff --git a/sysutils/gnome-volume-manager/pkg-plist b/sysutils/gnome-volume-manager/pkg-plist
new file mode 100644
index 000000000000..c26bce96f36f
--- /dev/null
+++ b/sysutils/gnome-volume-manager/pkg-plist
@@ -0,0 +1,118 @@
+bin/gnome-volume-manager
+bin/gnome-volume-properties
+share/gnome/applications/gnome-volume-properties.desktop
+share/gnome/autostart/gnome-volume-manager.desktop
+share/gnome/gnome-volume-manager/gnome-volume-properties.glade
+share/gnome/gnome-volume-manager/icons/gvm-dev-tablet.png
+share/locale/ang/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ar/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/az/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/bg/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/bn/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/bs/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ca/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/cs/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/cy/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/da/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/de/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/dz/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/el/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/en_CA/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/en_GB/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/es/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/et/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/eu/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/fa/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/fi/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/fr/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/gl/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/gu/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/he/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/hi/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/hr/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/hu/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/id/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/is/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/it/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ja/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ka/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ko/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/lt/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/lv/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/mk/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/mn/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ms/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/nb/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ne/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/nl/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/nn/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/or/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/pa/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/pl/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/pt/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ro/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ru/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/rw/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/sk/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/sq/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/sr/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/sv/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ta/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/th/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/tr/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/uk/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/vi/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/xh/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-volume-manager.mo
+@dirrmtry share/gnome/autostart
+@dirrm share/gnome/gnome-volume-manager/icons
+@dirrm share/gnome/gnome-volume-manager
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/ang/LC_MESSAGES
+@dirrmtry share/locale/ang
diff --git a/sysutils/gstreamer-plugins-hal/Makefile b/sysutils/gstreamer-plugins-hal/Makefile
new file mode 100644
index 000000000000..6282c79a8c26
--- /dev/null
+++ b/sysutils/gstreamer-plugins-hal/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-hal
+# Date created:			16 May 2006
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom: ports/sysutils/gstreamer-plugins-hal/Makefile,v 1.1 2006/05/17 12:29:05 ahze Exp $
+#
+
+CATEGORIES=	sysutils
+PORTREVISION=	0
+
+COMMENT=	Gstreamer hal plugin
+
+GST_PLUGIN=	hal
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/hal-device-manager/Makefile b/sysutils/hal-device-manager/Makefile
new file mode 100644
index 000000000000..f51395471c67
--- /dev/null
+++ b/sysutils/hal-device-manager/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	hal-device-manager
+# Date created:		2006-05-18
+# Whom:			Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom: ports/sysutils/hal-device-manager/Makefile,v 1.3 2006/05/18 22:15:41 ahze Exp $
+
+PORTREVISION=	0
+CATEGORIES=	sysutils gnome
+PKGNAMESUFFIX=	-device-manager
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	HAL device manager
+
+HAL_SLAVE=	yes
+
+MASTERDIR=	${.CURDIR}/../../sysutils/hal
+PLIST=	${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/hal-device-manager/pkg-plist b/sysutils/hal-device-manager/pkg-plist
new file mode 100644
index 000000000000..b00763e2edd5
--- /dev/null
+++ b/sysutils/hal-device-manager/pkg-plist
@@ -0,0 +1,39 @@
+bin/hal-device-manager
+%%DATADIR%%/device-manager/Const.py
+%%DATADIR%%/device-manager/Const.pyc
+%%DATADIR%%/device-manager/Const.pyo
+%%DATADIR%%/device-manager/Device.py
+%%DATADIR%%/device-manager/Device.pyc
+%%DATADIR%%/device-manager/Device.pyo
+%%DATADIR%%/device-manager/DeviceManager.py
+%%DATADIR%%/device-manager/DeviceManager.pyc
+%%DATADIR%%/device-manager/DeviceManager.pyo
+%%DATADIR%%/device-manager/GtkAttributesFacade.py
+%%DATADIR%%/device-manager/GtkAttributesFacade.pyc
+%%DATADIR%%/device-manager/GtkAttributesFacade.pyo
+%%DATADIR%%/device-manager/LibGladeApplication.py
+%%DATADIR%%/device-manager/LibGladeApplication.pyc
+%%DATADIR%%/device-manager/LibGladeApplication.pyo
+%%DATADIR%%/device-manager/Representation.py
+%%DATADIR%%/device-manager/Representation.pyc
+%%DATADIR%%/device-manager/Representation.pyo
+%%DATADIR%%/device-manager/fdo-logo.png
+%%DATADIR%%/device-manager/hal-abstract.png
+%%DATADIR%%/device-manager/hal-audio.png
+%%DATADIR%%/device-manager/hal-bus-pci.png
+%%DATADIR%%/device-manager/hal-bus-usb.png
+%%DATADIR%%/device-manager/hal-camera.png
+%%DATADIR%%/device-manager/hal-cat-cardbus.png
+%%DATADIR%%/device-manager/hal-cat-keyboard.png
+%%DATADIR%%/device-manager/hal-cat-mouse.png
+%%DATADIR%%/device-manager/hal-cdrom.png
+%%DATADIR%%/device-manager/hal-computer.png
+%%DATADIR%%/device-manager/hal-device-manager.glade
+%%DATADIR%%/device-manager/hal-flash.png
+%%DATADIR%%/device-manager/hal-floppy.png
+%%DATADIR%%/device-manager/hal-harddisk.png
+%%DATADIR%%/device-manager/hal-network.png
+%%DATADIR%%/device-manager/hal-serial-port.png
+%%DATADIR%%/device-manager/hal-unknown.png
+%%DATADIR%%/device-manager/hal-video.png
+@dirrm %%DATADIR%%/device-manager
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
new file mode 100644
index 000000000000..49391209ed7a
--- /dev/null
+++ b/sysutils/hal/Makefile
@@ -0,0 +1,113 @@
+# New ports collection makefile for:   HAL
+# Date Created:			02 May 2006
+# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/sysutils/hal/Makefile,v 1.26 2006/10/13 10:00:57 ahze Exp $
+#
+
+PORTNAME=	hal
+PORTVERSION=	${HALVERSION}.${SNAPVERSION}
+PORTREVISION?=	1
+CATEGORIES?=	sysutils
+MASTER_SITES=	http://www.marcuscom.com/downloads/
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT?=	Hardware Abstraction Layer for simplifying device access
+
+.if !defined(HAL_SLAVE)
+LIB_DEPENDS=	polkit.0:${PORTSDIR}/sysutils/policykit
+RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids \
+		isoinfo:${PORTSDIR}/sysutils/cdrtools
+.endif
+
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack gnometarget intlhack ltverhack
+USE_AUTOTOOLS=	libtool:15
+USE_LDCONFIG=	yes
+USE_PYTHON=	yes
+CONFIGURE_ARGS=	--disable-gtk-doc \
+		--with-hwdata=${LOCALBASE}/share/pciids \
+		--with-backend=freebsd \
+		--with-socket-dir=/var/run/hald \
+		--with-pid-file=/var/run/hald/hald.pid
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		GTKDOC="false"
+
+HALVERSION=	0.5.8
+SNAPVERSION=	20060917
+
+.if !defined(HAL_SLAVE)
+USE_RC_SUBR=	hald
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${HALVERSION}
+PLIST_SUB=	VERSION=${HALVERSION}
+
+PRIV_FILES=	hal-power-hibernate \
+		hal-power-poweroff \
+		hal-power-reboot \
+		hal-power-suspend \
+		hal-storage-fixed-mount-change-uid \
+		hal-storage-fixed-mount \
+		hal-storage-removable-mount-change-uid \
+		hal-storage-removable-mount
+PRIV_FILES:=	${PRIV_FILES:S|$|.privilege|}
+
+RC_FILES=	hal.conf:${PREFIX}/etc/dbus-1/system.d \
+		${PRIV_FILES:S|$|:${PREFIX}/etc/PolicyKit/privilege.d|}
+PLIST_FILES=	${PRIV_FILES:S|^|%%DATADIR%%/dist/|}
+
+SUB_FILES=	pkg-install pkg-deinstall
+SUB_LIST=	RC_FILES="${RC_FILES}"
+.else # Slave port stuff
+LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
+
+USE_GNOME+=	pygnome2
+DESKTOP_ENTRIES="Device Manager" \
+		"Examine your devices" \
+		"${DATADIR}/device-manager/hal-bus-pci.png" \
+		"hal-device-manager" \
+		"Application;System;" \
+		true
+BUILD_WRKSRC=	${WRKSRC}/tools/device-manager
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if !defined(HAL_SLAVE) && (${ARCH}=="i386" || ${ARCH}=="amd64" || ${ARCH}=="ia64")
+RUN_DEPENDS+=	dmidecode:${PORTSDIR}/sysutils/dmidecode
+.endif
+
+post-patch:
+.if !defined(HAL_SLAVE)
+	@${REINPLACE_CMD} -e 's|device-manager||' \
+		${WRKSRC}/tools/Makefile.in
+.endif
+	@${REINPLACE_CMD} -e '/^scriptdir = /s|libdir|libexecdir|' \
+		${WRKSRC}/tools/Makefile.in \
+		${WRKSRC}/tools/freebsd/Makefile.in
+	@${REINPLACE_CMD} -e 's|[(]libdir[)]/hal/scripts|(libexecdir)/hal/scripts|' \
+		${WRKSRC}/hald/Makefile.in
+	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|txt||' \
+		${WRKSRC}/policy/Makefile.in
+	@${REINPLACE_CMD} -e 's|user="0"|group="operator"|g' \
+		${WRKSRC}/hal.conf.in
+
+post-install:
+.if !defined(HAL_SLAVE)
+	${MKDIR} ${DATADIR}/dist
+	${INSTALL_DATA} ${WRKSRC}/hal.conf ${WRKSRC}/policy/txt/*.privilege \
+		${DATADIR}/dist
+	@${SETENV} PKG_PREFIX=${PREFIX} PACKAGE_BUILDING=${PACKAGE_BUILDING} \
+		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.if !defined(NOPORTDOCS)
+	${INSTALL_DATA} ${WRKSRC}/hald/freebsd/README \
+		${DOCSDIR}/README.freebsd
+.endif
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo
new file mode 100644
index 000000000000..fbae75b4b988
--- /dev/null
+++ b/sysutils/hal/distinfo
@@ -0,0 +1,3 @@
+MD5 (hal-0.5.8.20060917.tar.bz2) = 786e8ccb7a2529c7df23ea4afdb3ff3a
+SHA256 (hal-0.5.8.20060917.tar.bz2) = d2d26318f1466a140a6fb9e8a2f425c8f81e90ddc12d292652ff52741def4264
+SIZE (hal-0.5.8.20060917.tar.bz2) = 1391794
diff --git a/sysutils/hal/files/hald.in b/sysutils/hal/files/hald.in
new file mode 100644
index 000000000000..aefba2194971
--- /dev/null
+++ b/sysutils/hal/files/hald.in
@@ -0,0 +1,62 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: hald
+# REQUIRE: DAEMON dbus polkitd
+#
+# Add the following line to /etc/rc.conf to enable the HAL daemon:
+#
+# hald_enable="YES"
+#
+
+hald_enable=${hald_enable-"NO"}
+hald_flags=${hald_flags-""}
+
+. %%RC_SUBR%%
+
+name=hald
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/sbin/hald"
+pidfile="/var/run/${name}/${name}.pid"
+
+stop_postcmd="hald_postcmd"
+start_precmd="hald_precmd"
+
+local_force_depend()
+{
+    _depend="$1"
+    if [ -f %%LOCALBASE%%/etc/rc.d/${_depend}.sh ]; then
+	_depend="${_depend}.sh"
+    fi
+
+    if ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestatus 1>/dev/null 2>&1 &&
+       ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestart; then
+       return 1
+   fi
+   return 0
+}
+
+hald_precmd()
+{
+    if ! checkyesno dbus_enable
+    then
+	local_force_depend dbus || return 1
+    fi
+
+    if ! checkyesno polkitd_enable
+    then
+	local_force_depend polkitd || return 1
+    fi
+
+    mkdir -p $(dirname $pidfile)
+}
+
+hald_postcmd()
+{
+    rm -f $pidfile
+}
+
+load_rc_config ${name}
+run_rc_command "$1"
diff --git a/sysutils/hal/files/patch-Makefile.in b/sysutils/hal/files/patch-Makefile.in
new file mode 100644
index 000000000000..27219f54c076
--- /dev/null
+++ b/sysutils/hal/files/patch-Makefile.in
@@ -0,0 +1,25 @@
+--- Makefile.in.orig	Thu May  4 15:35:41 2006
++++ Makefile.in	Thu May  4 15:36:40 2006
+@@ -377,14 +377,14 @@ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+ install-dist_dbusDATA: $(dist_dbus_DATA)
+-	@$(NORMAL_INSTALL)
+-	test -z "$(dbusdir)" || $(mkdir_p) "$(DESTDIR)$(dbusdir)"
+-	@list='$(dist_dbus_DATA)'; for p in $$list; do \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f=$(am__strip_dir) \
+-	  echo " $(dist_dbusDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dbusdir)/$$f'"; \
+-	  $(dist_dbusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dbusdir)/$$f"; \
+-	done
++#	@$(NORMAL_INSTALL)
++#	test -z "$(dbusdir)" || $(mkdir_p) "$(DESTDIR)$(dbusdir)"
++#	@list='$(dist_dbus_DATA)'; for p in $$list; do \
++#	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++#	  f=$(am__strip_dir) \
++#	  echo " $(dist_dbusDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dbusdir)/$$f'"; \
++#	  $(dist_dbusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dbusdir)/$$f"; \
++#	done
+ 
+ uninstall-dist_dbusDATA:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/sysutils/hal/files/patch-doc_Makefile.in b/sysutils/hal/files/patch-doc_Makefile.in
new file mode 100644
index 000000000000..d05f0136ccbf
--- /dev/null
+++ b/sysutils/hal/files/patch-doc_Makefile.in
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig	Tue May  2 01:04:31 2006
++++ doc/Makefile.in	Tue May  2 01:04:42 2006
+@@ -269,7 +269,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ EXTRA_DIST = TODO
+-SUBDIRS = api spec conf
++SUBDIRS = spec conf
+ all: all-recursive
+ 
+ .SUFFIXES:
diff --git a/sysutils/hal/files/patch-tools_Makefile.in b/sysutils/hal/files/patch-tools_Makefile.in
new file mode 100644
index 000000000000..c5ce9282732e
--- /dev/null
+++ b/sysutils/hal/files/patch-tools_Makefile.in
@@ -0,0 +1,11 @@
+--- tools/Makefile.in.orig	Tue May  2 20:23:05 2006
++++ tools/Makefile.in	Tue May  2 20:23:22 2006
+@@ -325,7 +325,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = freebsd linux device-manager
++SUBDIRS = freebsd device-manager
+ INCLUDES = \
+ 	-DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
+ 	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
diff --git a/sysutils/hal/files/patch-tools_hal-device.c b/sysutils/hal/files/patch-tools_hal-device.c
new file mode 100644
index 000000000000..3cda9aa14aa7
--- /dev/null
+++ b/sysutils/hal/files/patch-tools_hal-device.c
@@ -0,0 +1,11 @@
+--- tools/hal-device.c.orig	Sat Oct  7 18:15:26 2006
++++ tools/hal-device.c	Sat Oct  7 18:15:34 2006
+@@ -155,7 +155,7 @@ int main(int argc, char **argv)
+ 
+ 	libhal_ctx_shutdown(hal_ctx, &error);
+ 	libhal_ctx_free(hal_ctx);
+-	dbus_connection_disconnect(conn);
++	dbus_connection_close(conn);
+ 	dbus_connection_unref(conn);
+ 	dbus_error_free(&error);
+ 
diff --git a/sysutils/hal/files/patch-tools_lshal.c b/sysutils/hal/files/patch-tools_lshal.c
new file mode 100644
index 000000000000..4b7d289ef4d8
--- /dev/null
+++ b/sysutils/hal/files/patch-tools_lshal.c
@@ -0,0 +1,11 @@
+--- tools/lshal.c.orig	Sat Oct  7 18:14:43 2006
++++ tools/lshal.c	Sat Oct  7 18:14:59 2006
+@@ -705,7 +705,7 @@ main (int argc, char *argv[])
+ 	libhal_ctx_shutdown (hal_ctx, &error);
+ 	libhal_ctx_free (hal_ctx);
+ 
+-	dbus_connection_disconnect (conn);
++	dbus_connection_close (conn);
+ 	dbus_connection_unref (conn);
+ 
+ 	if (show_device)
diff --git a/sysutils/hal/files/pkg-deinstall.in b/sysutils/hal/files/pkg-deinstall.in
new file mode 100644
index 000000000000..96f8e9f91977
--- /dev/null
+++ b/sysutils/hal/files/pkg-deinstall.in
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+[ "$2" != DEINSTALL ] && exit 0
+
+for pair in %%RC_FILES%%; do
+	file=`echo $pair | cut -f 1 -d :`
+	destdir=`echo $pair | cut -f 2 -d :`
+
+	if cmp -s %%DATADIR%%/dist/$file $destdir/$file; then
+		rm -f $destdir/$file
+	fi
+done
diff --git a/sysutils/hal/files/pkg-install.in b/sysutils/hal/files/pkg-install.in
new file mode 100644
index 000000000000..2cfda5753d4c
--- /dev/null
+++ b/sysutils/hal/files/pkg-install.in
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+[ "$2" != POST-INSTALL ] && exit 0
+
+if [ -z "${PACKAGE_BUILDING}" ]; then
+	USER=haldaemon
+	GROUP=${USER}
+	UID=560
+	GID=${UID}
+	PW=/usr/sbin/pw
+
+	if ${PW} group show "${GROUP}" 2>/dev/null; then
+		echo "You already have a group \"${GROUP}\", so I will use it."
+	else
+		if ${PW} groupadd ${GROUP} -g ${GID}; then
+			echo "Added group \"${GROUP}\"."
+		else
+			echo "Adding group \"${GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if ${PW} user show "${USER}" 2>/dev/null; then
+		echo "You already have a user \"${USER}\", so I will use it."
+	else
+		if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+			-d "/nonexistent" -s /sbin/nologin -c "HAL Daemon User"
+		then
+			echo "Added user \"${USER}\"."
+		else
+			echo "Adding user \"${USER}\" failed..."
+			exit 1
+		fi
+	fi
+
+	/usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/hald
+fi
+
+for pair in %%RC_FILES%%; do
+	file=`echo $pair | cut -f 1 -d :`
+	destdir=`echo $pair | cut -f 2 -d :`
+
+	if [ ! -f $destdir/$file ]; then
+	    	mkdir -p $destdir
+		cp -p %%DATADIR%%/dist/$file $destdir/$file
+	fi
+done
diff --git a/sysutils/hal/pkg-descr b/sysutils/hal/pkg-descr
new file mode 100644
index 000000000000..c9435851381f
--- /dev/null
+++ b/sysutils/hal/pkg-descr
@@ -0,0 +1,6 @@
+HAL is a hardware abstraction layer whose goal is to merge information from
+various sources such that desktop applications can locate and use hardware
+devices. The point is that the exact set of information to merge varies by
+device and bus type.
+
+WWW: http://www.freedesktop.org/Software/hal
diff --git a/sysutils/hal/pkg-plist b/sysutils/hal/pkg-plist
new file mode 100644
index 000000000000..99baa12014d0
--- /dev/null
+++ b/sysutils/hal/pkg-plist
@@ -0,0 +1,152 @@
+bin/hal-device
+bin/hal-find-by-capability
+bin/hal-find-by-property
+bin/hal-get-property
+bin/hal-set-property
+bin/lshal
+include/hal/libhal-storage.h
+include/hal/libhal.h
+lib/libhal-storage.a
+lib/libhal-storage.la
+lib/libhal-storage.so
+lib/libhal-storage.so.1
+lib/libhal.a
+lib/libhal.la
+lib/libhal.so
+lib/libhal.so.1
+lib/libhald_freebsd_probe.a
+lib/libhald_freebsd_probe.la
+lib/libhald_freebsd_probe.so
+lib/libhald_freebsd_probe.so.0
+libdata/pkgconfig/hal-storage.pc
+libdata/pkgconfig/hal.pc
+libexec/hal-storage-mount
+libexec/hal-system-power-pmu
+libexec/hal/scripts/hal-luks-remove
+libexec/hal/scripts/hal-luks-setup
+libexec/hal/scripts/hal-luks-teardown
+libexec/hal/scripts/hal-system-lcd-get-brightness
+libexec/hal/scripts/hal-system-lcd-get-brightness-freebsd
+libexec/hal/scripts/hal-system-lcd-set-brightness
+libexec/hal/scripts/hal-system-lcd-set-brightness-freebsd
+libexec/hal/scripts/hal-system-power-hibernate
+libexec/hal/scripts/hal-system-power-reboot
+libexec/hal/scripts/hal-system-power-reboot-freebsd
+libexec/hal/scripts/hal-system-power-set-power-save
+libexec/hal/scripts/hal-system-power-set-power-save-freebsd
+libexec/hal/scripts/hal-system-power-shutdown
+libexec/hal/scripts/hal-system-power-shutdown-freebsd
+libexec/hal/scripts/hal-system-power-suspend
+libexec/hal/scripts/hal-system-power-suspend-freebsd
+libexec/hal/scripts/hal-system-storage-cleanup-mountpoint
+libexec/hal/scripts/hal-system-storage-cleanup-mountpoints
+libexec/hal/scripts/hal-system-storage-cleanup-mountpoints-freebsd
+libexec/hal/scripts/hal-system-storage-eject
+libexec/hal/scripts/hal-system-storage-eject-freebsd
+libexec/hal/scripts/hal-system-storage-unmount
+libexec/hal/scripts/hal-system-storage-unmount-freebsd
+libexec/hald-addon-storage
+libexec/hald-probe-hiddev
+libexec/hald-probe-scsi
+libexec/hald-probe-smbios
+libexec/hald-probe-storage
+libexec/hald-probe-volume
+libexec/hald-runner
+sbin/hald
+%%PORTDOCS%%%%DOCSDIR%%/README.freebsd
+%%DOCSDIR%%/conf/match-USB-camera.fdi
+%%DOCSDIR%%/conf/match-USB-mp3-player.fdi
+%%DOCSDIR%%/conf/match-cardreader.fdi
+%%DOCSDIR%%/conf/storage-non-fixed.fdi
+%%DOCSDIR%%/conf/storage-policy-examples.fdi
+%%DOCSDIR%%/conf/storage-skip-all.fdi
+%%DATADIR%%/dist/hal.conf
+%%DATADIR%%/fdi/fdi.dtd
+%%DATADIR%%/fdi/fdi.rng
+%%DATADIR%%/fdi/information/10freedesktop/10-camera-ptp.fdi
+%%DATADIR%%/fdi/information/10freedesktop/10-cd-dvd-burner.fdi
+%%DATADIR%%/fdi/information/10freedesktop/10-usb-card-readers.fdi
+%%DATADIR%%/fdi/information/10freedesktop/10-usb-music-players.fdi
+%%DATADIR%%/fdi/information/10freedesktop/10-usb-pda.fdi
+%%DATADIR%%/fdi/information/10freedesktop/10-usb-zip-drives.fdi
+%%DATADIR%%/fdi/information/10freedesktop/10-wireless-mice.fdi
+%%DATADIR%%/fdi/policy/10osvendor/10-keyboard-policy.fdi
+%%DATADIR%%/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
+%%DATADIR%%/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
+%%DATADIR%%/fdi/policy/10osvendor/10-toshiba-buttons.fdi
+%%DATADIR%%/fdi/policy/10osvendor/15-storage-luks.fdi
+%%DATADIR%%/fdi/policy/10osvendor/20-storage-methods.fdi
+%%DATADIR%%/fdi/preprobe/10osvendor/10-ide-drives.fdi
+share/locale/cs/LC_MESSAGES/hal.mo
+share/locale/da/LC_MESSAGES/hal.mo
+share/locale/de/LC_MESSAGES/hal.mo
+share/locale/el/LC_MESSAGES/hal.mo
+share/locale/es/LC_MESSAGES/hal.mo
+share/locale/eu/LC_MESSAGES/hal.mo
+share/locale/fi/LC_MESSAGES/hal.mo
+share/locale/fr/LC_MESSAGES/hal.mo
+share/locale/hu/LC_MESSAGES/hal.mo
+share/locale/it/LC_MESSAGES/hal.mo
+share/locale/ja/LC_MESSAGES/hal.mo
+share/locale/km/LC_MESSAGES/hal.mo
+share/locale/ko/LC_MESSAGES/hal.mo
+share/locale/lt/LC_MESSAGES/hal.mo
+share/locale/nb/LC_MESSAGES/hal.mo
+share/locale/nl/LC_MESSAGES/hal.mo
+share/locale/pa/LC_MESSAGES/hal.mo
+share/locale/pl/LC_MESSAGES/hal.mo
+share/locale/pt/LC_MESSAGES/hal.mo
+share/locale/pt_BR/LC_MESSAGES/hal.mo
+share/locale/ru/LC_MESSAGES/hal.mo
+share/locale/sl_SI/LC_MESSAGES/hal.mo
+share/locale/uk/LC_MESSAGES/hal.mo
+share/locale/zh_CN/LC_MESSAGES/hal.mo
+share/locale/zh_TW/LC_MESSAGES/hal.mo
+@dirrm %%DATADIR%%/fdi/preprobe/20thirdparty
+@dirrm %%DATADIR%%/fdi/preprobe/10osvendor
+@dirrm %%DATADIR%%/fdi/preprobe
+@dirrm %%DATADIR%%/fdi/policy/20thirdparty
+@dirrm %%DATADIR%%/fdi/policy/10osvendor
+@dirrm %%DATADIR%%/fdi/policy
+@dirrm %%DATADIR%%/fdi/information/20thirdparty
+@dirrm %%DATADIR%%/fdi/information/10freedesktop
+@dirrm %%DATADIR%%/fdi/information
+@dirrm %%DATADIR%%/fdi
+@dirrm %%DATADIR%%/dist
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%/conf
+@dirrm %%DOCSDIR%%
+@dirrm libexec/hal/scripts
+@dirrm libexec/hal
+@dirrm include/hal
+@dirrm etc/hal/fdi/preprobe
+@dirrm etc/hal/fdi/policy
+@dirrm etc/hal/fdi/information
+@dirrm etc/hal/fdi
+@dirrm etc/hal
+@unexec rm -f /var/run/hald/hald.pid 2>/dev/null || true
+@unexec rm -rf /var/run/hald/hald-local 2>/dev/null || true
+@unexec rm -rf /var/run/hald/hald-runner 2>/dev/null || true
+@unexec rmdir /var/run/hald 2>/dev/null || true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl_SI/LC_MESSAGES
+@dirrmtry share/locale/sl_SI
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 3e707accfe15..13d3a8f6f993 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.96 2006/04/13 07:52:38 bland Exp $
+#   $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.114 2006/10/03 13:26:18 ahze Exp $
 #
 
 PORTNAME=	nautilus-cd-burner
-PORTVERSION=	2.14.3
+PORTVERSION=	2.16.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,20 +18,22 @@ COMMENT=	CD burner view for Nautilus
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack intlhack nautilus2
-GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack nautilus2 ltverhack
+INSTALLS_ICONS=	yes
+USE_AUTOTOOLS=	libtool:15
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-hal
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-GCONF_SCHEMAS=	ncb.schemas
+GCONF_SCHEMAS=	nautilus-cd-burner.schemas
 
 OPTIONS=	DVD "Enable DVD support" on \
-		CJK "Use cdrtools-cjk instead of cdrtools" off
+		CJK "Use cdrtools-cjk instead of cdrtools" off \
+		GNOMEMOUNT "Enable sysutils/gnome-mount support" off
 
 .include <bsd.port.pre.mk>
 
@@ -46,6 +48,14 @@ RUN_DEPENDS+=	cdrecord:${PORTSDIR}/sysutils/cdrtools
 RUN_DEPENDS+=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
 .endif
 
+.if defined(WITH_GNOMEMOUNT)
+BUILD_DEPENDS+=	gnome-mount:${PORTSDIR}/sysutils/gnome-mount
+RUN_DEPENDS+=	gnome-mount:${PORTSDIR}/sysutils/gnome-mount
+CONFIGURE_ARGS+=	--enable-gnome-mount
+.else
+CONFIGURE_ARGS+=	--disable-gnome-mount
+.endif
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index 045c6176c42e..88bc7f99a7e0 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/nautilus-cd-burner-2.14.3.tar.bz2) = c85642630b3db5ee0a40e2fdbf4fdf94
-SHA256 (gnome2/nautilus-cd-burner-2.14.3.tar.bz2) = 45a8ac59ff4985807a54761b9f370c6d9cd73ff4a50f1c1e1cfe24e6c9c023a3
-SIZE (gnome2/nautilus-cd-burner-2.14.3.tar.bz2) = 682257
+MD5 (gnome2/nautilus-cd-burner-2.16.1.tar.bz2) = f64e98c9b3d3a21cb54dc4d4d3983de2
+SHA256 (gnome2/nautilus-cd-burner-2.16.1.tar.bz2) = 5cc224a8dfb3bbe005f06ac6b9466e4b97bde122c5db8064b25f663e3dac8e2e
+SIZE (gnome2/nautilus-cd-burner-2.16.1.tar.bz2) = 703744
diff --git a/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c b/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c
deleted file mode 100644
index aab64aa8abb9..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- mapping-protocol.c.orig	Tue May 17 17:14:35 2005
-+++ mapping-protocol.c	Tue May 17 17:15:24 2005
-@@ -24,6 +24,8 @@
-  *          William Jon McCann <mccann@jhu.edu>
-  */
- 
-+#include <sys/types.h>
-+#include <sys/time.h>
- #include <unistd.h>
- #include <string.h>
- #include <fcntl.h>
diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c
deleted file mode 100644
index 3a68ad074232..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c
+++ /dev/null
@@ -1,42 +0,0 @@
---- nautilus-burn-drive.c.orig	Wed Mar 22 11:08:38 2006
-+++ nautilus-burn-drive.c	Thu Jul 13 22:15:30 2006
-@@ -687,7 +687,6 @@
- 	struct cd_toc_entry              entry;
- 	int                              i;
- #endif
--	int                              type;
- #ifndef CDROM_DATA_TRACK
- #define CDROM_DATA_TRACK 4
- #endif
-@@ -699,6 +698,10 @@
- 
- 	if (ioctl (fd, CDIOREADTOCHEADER, &header) < 0) {
- 		close (fd);
-+		if (errno == EINVAL)
-+			/* If you try to read the TOC header of a blank disc
-+			 * on FreeBSD, you get EINVAL. */
-+			return CDS_NO_INFO;
- 	    	return -1;
- 	}
- 
-@@ -862,7 +865,7 @@
- 		*is_blank = mmc_profile & 0x10000;
- 
- 	disc_type = get_disc_type (device);
--	disc_type_get_info (disc_type, is_blank, has_data, has_audio);
-+	disc_type_get_info (disc_type, NULL, has_data, has_audio);
- 
- 	switch (mmc_profile & 0xFFFF) {
- 	case -1:
-@@ -1767,7 +1770,11 @@
- #ifdef USE_GNOME_MOUNT
- 	cmd = g_strdup_printf ("gnome-mount --eject --no-ui --device=%s", drive->device);
- #else
-+#ifdef __FreeBSD__
-+	cmd = g_strdup_printf ("cdcontrol -f %s eject", drive->device);
-+#else
- 	cmd = g_strdup_printf ("eject %s", drive->device);
-+#endif
- #endif
- 
- 	res = g_spawn_command_line_sync (cmd, NULL, NULL, NULL, NULL);
diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
deleted file mode 100644
index 9d286fda0065..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- nautilus-cd-burner.c.orig	Wed May 11 18:56:59 2005
-+++ nautilus-cd-burner.c	Tue May 17 17:11:49 2005
-@@ -25,6 +25,8 @@
-  *          William Jon McCann <mccann@jhu.edu>
-  */
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
- #include <time.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -1103,10 +1105,20 @@ burn_cd (const NautilusBurnDrive *drive,
- 		}
- 
- 		if (res == NAUTILUS_BURN_RECORDER_RESULT_RETRY) {
-+			gchar *path1;
-+
-+			path1 = g_strdup_printf ("%s/.ncb", g_get_home_dir());
-+
-+			if (!g_file_test (path1, G_FILE_TEST_EXISTS)) {
-+				mkdir (path1, 0700);
-+			}
-+
- 			g_free (toc_filename);
- 			g_free (filename);
- 
--			filename = g_build_filename (g_get_tmp_dir (), "image.iso.XXXXXX", NULL);
-+			filename = g_build_filename (path1, "image.iso.XXXXXX", NULL);
-+			g_free (path1);
-+
- 			fd = g_mkstemp (filename);
- 			close (fd);
- 
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c
new file mode 100644
index 000000000000..9d3ce89ec982
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c
@@ -0,0 +1,14 @@
+--- src/nautilus-burn-drive.c.orig	Thu Jul 13 22:51:49 2006
++++ src/nautilus-burn-drive.c	Thu Jul 13 22:52:25 2006
+@@ -806,7 +806,11 @@ nautilus_burn_drive_eject (NautilusBurnD
+ #ifdef USE_GNOME_MOUNT
+ 	cmd = g_strdup_printf ("gnome-mount --eject --no-ui --device=%s", drive->priv->device);
+ #else
++#ifdef __FreeBSD_
++	cmd = g_strdup_printf ("cdcontrol -f %s eject", drive->priv->device);
++#else
+ 	cmd = g_strdup_printf ("eject %s", drive->priv->device);
++#endif
+ #endif
+ 
+ 	res = g_spawn_command_line_sync (cmd, NULL, NULL, NULL, NULL);
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c
new file mode 100644
index 000000000000..3d5585ee2e1d
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c
@@ -0,0 +1,11 @@
+--- src/nautilus-cd-burner.c.orig	Tue May  9 13:31:13 2006
++++ src/nautilus-cd-burner.c	Mon May 15 21:11:00 2006
+@@ -27,6 +27,8 @@
+ 
+ #include "config.h"
+ 
++#include <sys/types.h>
++#include <sys/stat.h>
+ #include <time.h>
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
index 64b5322649f4..b01bd7a2615c 100644
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ b/sysutils/nautilus-cd-burner/pkg-plist
@@ -1,20 +1,26 @@
 bin/nautilus-cd-burner
 etc/gnome-vfs-2.0/modules/mapping-modules.conf
+include/libnautilus-burn/nautilus-burn-drive-monitor.h
 include/libnautilus-burn/nautilus-burn-drive-selection.h
 include/libnautilus-burn/nautilus-burn-drive.h
 include/libnautilus-burn/nautilus-burn-features.h
+include/libnautilus-burn/nautilus-burn-init.h
 include/libnautilus-burn/nautilus-burn-recorder.h
+include/libnautilus-burn/nautilus-burn.h
+lib/gnome-vfs-2.0/modules/libmapping.a
 lib/gnome-vfs-2.0/modules/libmapping.la
 lib/gnome-vfs-2.0/modules/libmapping.so
+lib/libnautilus-burn.a
 lib/libnautilus-burn.la
 lib/libnautilus-burn.so
-lib/libnautilus-burn.so.3
+lib/libnautilus-burn.so.4
+lib/nautilus/extensions-1.0/libnautilus-burn-extension.a
 lib/nautilus/extensions-1.0/libnautilus-burn-extension.la
 lib/nautilus/extensions-1.0/libnautilus-burn-extension.so
 libdata/pkgconfig/libnautilus-burn.pc
 libexec/mapping-daemon
 share/gnome/applications/nautilus-cd-burner.desktop
-share/gnome/nautilus-cd-burner/cdburn.glade
+share/gnome/applications/nautilus-cd-burner-open-iso.desktop
 share/gnome/nautilus-cd-burner/cdspin1.png
 share/gnome/nautilus-cd-burner/cdspin2.png
 share/gnome/nautilus-cd-burner/cdspin3.png
@@ -23,19 +29,25 @@ share/gnome/nautilus-cd-burner/cdspin5.png
 share/gnome/nautilus-cd-burner/cdspin6.png
 share/gnome/nautilus-cd-burner/cdspin7.png
 share/gnome/nautilus-cd-burner/cdspin8.png
+share/gnome/nautilus-cd-burner/nautilus-cd-burner.glade
+share/icons/hicolor/16x16/apps/nautilus-cd-burner.png
+share/icons/hicolor/22x22/apps/nautilus-cd-burner.png
+share/icons/hicolor/24x24/apps/nautilus-cd-burner.png
+share/icons/hicolor/scalable/apps/nautilus-cd-burner.svg
 share/locale/am/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ar/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/az/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/be/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/bg/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/bn/LC_MESSAGES/nautilus-cd-burner.mo
-share/locale/br/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/bn_IN/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/bs/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ca/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/cs/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/cy/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/da/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/de/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/dz/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/el/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/en_CA/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/en_GB/LC_MESSAGES/nautilus-cd-burner.mo
@@ -52,6 +64,7 @@ share/locale/he/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/hi/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/hr/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/hu/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/hy/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/id/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/is/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/it/LC_MESSAGES/nautilus-cd-burner.mo
@@ -62,13 +75,13 @@ share/locale/lt/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/lv/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/mg/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/mk/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ml/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/mn/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ms/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/nb/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ne/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/nl/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/nn/LC_MESSAGES/nautilus-cd-burner.mo
-share/locale/no/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/or/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/pa/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/pl/LC_MESSAGES/nautilus-cd-burner.mo
@@ -94,15 +107,59 @@ share/locale/xh/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/zh_CN/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/zh_HK/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo
+@dirrm share/gnome/nautilus-cd-burner
+@dirrm include/libnautilus-burn
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
-@dirrm share/gnome/nautilus-cd-burner
-@dirrm include/libnautilus-burn
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile
index b9ac477da5b4..ea3446cb9e18 100644
--- a/sysutils/pessulus/Makefile
+++ b/sysutils/pessulus/Makefile
@@ -3,14 +3,14 @@
 # Whom:					FreeBSD GNOME Team
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/pessulus/Makefile,v 1.3 2006/04/10 13:23:35 ahze Exp $
+#   $MCom: ports/sysutils/pessulus/Makefile,v 1.11 2006/10/03 01:27:41 ahze Exp $
 #
 
 PORTNAME=	pessulus
-PORTVERSION=	0.9.3
+PORTVERSION=	2.16.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
+MASTER_SITE_SUBDIR=	 sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -21,7 +21,7 @@ USE_GNOME=	gnomehack gnomeprefix intlhack pygnome2
 WANT_GNOME=	yes
 USE_PYTHON=	yes
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/pessulus/distinfo b/sysutils/pessulus/distinfo
index aa85d94f7f57..3baeb078bf16 100644
--- a/sysutils/pessulus/distinfo
+++ b/sysutils/pessulus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pessulus-0.9.3.tar.gz) = 4bc164accf6c9eac4985a0b4f873bc03
-SHA256 (gnome2/pessulus-0.9.3.tar.gz) = f2544b059feebda2235060df75099bc92314314a9ca695cd70185ed5f3208803
-SIZE (gnome2/pessulus-0.9.3.tar.gz) = 170446
+MD5 (gnome2/pessulus-2.16.1.tar.gz) = 06ac5855204f159016de9792b98c9292
+SHA256 (gnome2/pessulus-2.16.1.tar.gz) = c9d8fb51873328ee402f6d0a02f7689a2e14db599576b0d98ba08230ac3fcf4c
+SIZE (gnome2/pessulus-2.16.1.tar.gz) = 177363
diff --git a/sysutils/pessulus/pkg-plist b/sysutils/pessulus/pkg-plist
index 6ec466297d43..6d984807c4e8 100644
--- a/sysutils/pessulus/pkg-plist
+++ b/sysutils/pessulus/pkg-plist
@@ -50,6 +50,7 @@ share/gnome/applications/pessulus.desktop
 share/gnome/pessulus/glade/pessulus.glade
 share/locale/bg/LC_MESSAGES/pessulus.mo
 share/locale/bn/LC_MESSAGES/pessulus.mo
+share/locale/bn_IN/LC_MESSAGES/pessulus.mo
 share/locale/ca/LC_MESSAGES/pessulus.mo
 share/locale/cs/LC_MESSAGES/pessulus.mo
 share/locale/cy/LC_MESSAGES/pessulus.mo
@@ -58,6 +59,7 @@ share/locale/de/LC_MESSAGES/pessulus.mo
 share/locale/dz/LC_MESSAGES/pessulus.mo
 share/locale/el/LC_MESSAGES/pessulus.mo
 share/locale/en_CA/LC_MESSAGES/pessulus.mo
+share/locale/en_GB/LC_MESSAGES/pessulus.mo
 share/locale/es/LC_MESSAGES/pessulus.mo
 share/locale/et/LC_MESSAGES/pessulus.mo
 share/locale/eu/LC_MESSAGES/pessulus.mo
@@ -65,6 +67,7 @@ share/locale/fi/LC_MESSAGES/pessulus.mo
 share/locale/fr/LC_MESSAGES/pessulus.mo
 share/locale/gl/LC_MESSAGES/pessulus.mo
 share/locale/gu/LC_MESSAGES/pessulus.mo
+share/locale/he/LC_MESSAGES/pessulus.mo
 share/locale/hi/LC_MESSAGES/pessulus.mo
 share/locale/hu/LC_MESSAGES/pessulus.mo
 share/locale/id/LC_MESSAGES/pessulus.mo
@@ -75,31 +78,73 @@ share/locale/ko/LC_MESSAGES/pessulus.mo
 share/locale/lt/LC_MESSAGES/pessulus.mo
 share/locale/lv/LC_MESSAGES/pessulus.mo
 share/locale/mk/LC_MESSAGES/pessulus.mo
+share/locale/ml/LC_MESSAGES/pessulus.mo
+share/locale/mn/LC_MESSAGES/pessulus.mo
+share/locale/mr/LC_MESSAGES/pessulus.mo
 share/locale/nb/LC_MESSAGES/pessulus.mo
 share/locale/ne/LC_MESSAGES/pessulus.mo
 share/locale/nl/LC_MESSAGES/pessulus.mo
+share/locale/or/LC_MESSAGES/pessulus.mo
 share/locale/pa/LC_MESSAGES/pessulus.mo
 share/locale/pl/LC_MESSAGES/pessulus.mo
 share/locale/pt/LC_MESSAGES/pessulus.mo
 share/locale/pt_BR/LC_MESSAGES/pessulus.mo
+share/locale/ru/LC_MESSAGES/pessulus.mo
 share/locale/sk/LC_MESSAGES/pessulus.mo
+share/locale/sl/LC_MESSAGES/pessulus.mo
 share/locale/sq/LC_MESSAGES/pessulus.mo
 share/locale/sr/LC_MESSAGES/pessulus.mo
 share/locale/sr@Latn/LC_MESSAGES/pessulus.mo
 share/locale/sv/LC_MESSAGES/pessulus.mo
+share/locale/ta/LC_MESSAGES/pessulus.mo
 share/locale/th/LC_MESSAGES/pessulus.mo
+share/locale/tr/LC_MESSAGES/pessulus.mo
 share/locale/uk/LC_MESSAGES/pessulus.mo
 share/locale/vi/LC_MESSAGES/pessulus.mo
 share/locale/zh_CN/LC_MESSAGES/pessulus.mo
 share/locale/zh_HK/LC_MESSAGES/pessulus.mo
 share/locale/zh_TW/LC_MESSAGES/pessulus.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
 @dirrm share/gnome/pessulus/glade
 @dirrm share/gnome/pessulus
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/Pessulus
 @dirrmtry %%PYTHON_SITELIBDIR%%
 @dirrmtry %%PYTHON_LIBDIR%%
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/sysutils/policykit/Makefile b/sysutils/policykit/Makefile
new file mode 100644
index 000000000000..68a6b9c12107
--- /dev/null
+++ b/sysutils/policykit/Makefile
@@ -0,0 +1,40 @@
+# New ports collection makefile for:   PolicyKit
+# Date Created:			01 May 2006
+# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/sysutils/policykit/Makefile,v 1.12 2006/10/07 19:45:38 marcus Exp $
+#
+
+PORTNAME=	policykit
+PORTVERSION=	0.1.20060514
+PORTREVISION=	2
+CATEGORIES=	sysutils gnome
+MASTER_SITES=	http://www.marcuscom.com/downloads/
+DISTNAME=	PolicyKit-${PORTVERSION}
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Framework for controlling access to system-wide components
+
+LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack gnometarget
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+CONFIGURE_ARGS=	--disable-gtk-doc \
+		--with-pid-file=/var/run/polkitd/polkitd.pid \
+		--with-pam-include=system
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		GTKDOC="false"
+
+USE_RC_SUBR=	polkitd
+
+post-install:
+.if !defined(PACKAGE_BUILDING)
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
+
+.include <bsd.port.mk>
diff --git a/sysutils/policykit/distinfo b/sysutils/policykit/distinfo
new file mode 100644
index 000000000000..2bf4052122f3
--- /dev/null
+++ b/sysutils/policykit/distinfo
@@ -0,0 +1,3 @@
+MD5 (PolicyKit-0.1.20060514.tar.bz2) = f81ac5fb28603a4b419fca6c4efc027a
+SHA256 (PolicyKit-0.1.20060514.tar.bz2) = d9015a69d63902b091475ad2cad1b6fe012cf0e8fead6603cf822c2033c9d552
+SIZE (PolicyKit-0.1.20060514.tar.bz2) = 333800
diff --git a/sysutils/policykit/files/patch-Makefile.in b/sysutils/policykit/files/patch-Makefile.in
new file mode 100644
index 000000000000..0c9552c020d6
--- /dev/null
+++ b/sysutils/policykit/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Mon May  1 01:11:30 2006
++++ Makefile.in	Mon May  1 01:11:43 2006
+@@ -231,7 +231,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = libpolkit polkitd doc tools privileges
++SUBDIRS = libpolkit polkitd tools privileges
+ pamdir = $(sysconfdir)/pam.d
+ pam_DATA = policy-kit
+ pkgconfigdir = $(prefix)/libdata/pkgconfig
diff --git a/sysutils/policykit/files/patch-polkitd_policy.c b/sysutils/policykit/files/patch-polkitd_policy.c
new file mode 100644
index 000000000000..c633366a2b60
--- /dev/null
+++ b/sysutils/policykit/files/patch-polkitd_policy.c
@@ -0,0 +1,118 @@
+--- polkitd/policy.c.orig	Tue Mar 14 07:14:33 2006
++++ polkitd/policy.c	Tue May  2 01:53:06 2006
+@@ -537,13 +537,15 @@
+ 	int rc;
+ 	char *res;
+ 	char *buf = NULL;
+-	unsigned int bufsize;
++	long bufsize;
+ 	struct passwd pwd;
+ 	struct passwd *pwdp;
+ 
+ 	res = NULL;
+ 
+ 	bufsize = sysconf (_SC_GETPW_R_SIZE_MAX);
++	if (bufsize < 0)
++		bufsize = 1024;
+ 	buf = g_new0 (char, bufsize);
+ 
+ 	rc = getpwuid_r (uid, &pwd, buf, bufsize, &pwdp);
+@@ -567,13 +569,15 @@
+ 	int rc;
+ 	char *res;
+ 	char *buf = NULL;
+-	unsigned int bufsize;
++	long bufsize;
+ 	struct group gbuf;
+ 	struct group *gbufp;
+ 
+ 	res = NULL;
+ 
+ 	bufsize = sysconf (_SC_GETGR_R_SIZE_MAX);
++	if (bufsize < 0)
++		bufsize = 1024;
+ 	buf = g_new0 (char, bufsize);
+ 		
+ 	rc = getgrgid_r (gid, &gbuf, buf, bufsize, &gbufp);
+@@ -597,13 +601,15 @@
+ 	int rc;
+ 	uid_t res;
+ 	char *buf = NULL;
+-	unsigned int bufsize;
++	long bufsize;
+ 	struct passwd pwd;
+ 	struct passwd *pwdp;
+ 
+ 	res = (uid_t) -1;
+ 
+ 	bufsize = sysconf (_SC_GETPW_R_SIZE_MAX);
++	if (bufsize < 0)
++		bufsize = 1024;
+ 	buf = g_new0 (char, bufsize);
+ 		
+ 	rc = getpwnam_r (username, &pwd, buf, bufsize, &pwdp);
+@@ -627,13 +633,15 @@
+ 	int rc;
+ 	gid_t res;
+ 	char *buf = NULL;
+-	unsigned int bufsize;
++	long bufsize;
+ 	struct group gbuf;
+ 	struct group *gbufp;
+ 
+ 	res = (gid_t) -1;
+ 
+ 	bufsize = sysconf (_SC_GETGR_R_SIZE_MAX);
++	if (bufsize < 0)
++		bufsize = 1024;
+ 	buf = g_new0 (char, bufsize);
+ 		
+ 	rc = getgrnam_r (groupname, &gbuf, buf, bufsize, &gbufp);
+@@ -649,6 +657,23 @@
+ 	return res;
+ }
+ 
++static int
++getgrouplist_ala_linux (const char *name,
++			gid_t basegid,
++			gid_t *groups,
++			int *ngroups)
++{
++	if (groups)
++		return getgrouplist (name, basegid, groups, ngroups);
++	else {
++		for (*ngroups = 1;; (*ngroups)++) {
++			gid_t _groups[*ngroups];
++			if (getgrouplist (name, basegid, _groups, ngroups) != -1)
++				return 0;
++		}
++	}
++}
++
+ PolicyResult 
+ policy_get_allowed_resources_for_policy_for_uid (uid_t                  uid, 
+ 						 const char            *policy, 
+@@ -665,9 +690,9 @@
+ 	if ((username = policy_util_uid_to_name (uid, &default_gid)) == NULL)
+ 		goto out;
+ 
+-	if (getgrouplist(username, default_gid, NULL, &num_groups) < 0) {
++	if (getgrouplist_ala_linux(username, default_gid, NULL, &num_groups) < 0) {
+ 		groups = (gid_t *) g_new0 (gid_t, num_groups);
+-		if (getgrouplist(username, default_gid, groups, &num_groups) < 0) {
++		if (getgrouplist_ala_linux(username, default_gid, groups, &num_groups) < 0) {
+ 			g_warning ("getgrouplist() failed");
+ 			goto out;
+ 		}
+@@ -702,9 +727,9 @@
+ 	if ((username = policy_util_uid_to_name (uid, &default_gid)) == NULL)
+ 		goto out;
+ 
+-	if (getgrouplist(username, default_gid, NULL, &num_groups) < 0) {
++	if (getgrouplist_ala_linux(username, default_gid, NULL, &num_groups) < 0) {
+ 		groups = (gid_t *) g_new0 (gid_t, num_groups);
+-		if (getgrouplist(username, default_gid, groups, &num_groups) < 0) {
++		if (getgrouplist_ala_linux(username, default_gid, groups, &num_groups) < 0) {
+ 			g_warning ("getgrouplist() failed");
+ 			goto out;
+ 		}
diff --git a/sysutils/policykit/files/patch-tools_Makefile.in b/sysutils/policykit/files/patch-tools_Makefile.in
new file mode 100644
index 000000000000..9308ff774f36
--- /dev/null
+++ b/sysutils/policykit/files/patch-tools_Makefile.in
@@ -0,0 +1,14 @@
+--- tools/Makefile.in.orig	Sun Oct  8 03:37:21 2006
++++ tools/Makefile.in	Sun Oct  8 03:37:37 2006
+@@ -252,9 +252,9 @@ INCLUDES = \
+ 	@DBUS_CFLAGS@
+ 
+ polkit_is_privileged_SOURCES = polkit-is-privileged.c
+-polkit_is_privileged_LDADD = @DBUS_CFLAGS@ @GLIB_LIBS@ $(top_builddir)/libpolkit/libpolkit.la
++polkit_is_privileged_LDADD = @DBUS_LIBS@ @GLIB_LIBS@ $(top_builddir)/libpolkit/libpolkit.la
+ polkit_list_privileges_SOURCES = polkit-list-privileges.c
+-polkit_list_privileges_LDADD = @DBUS_CFLAGS@ @GLIB_LIBS@ $(top_builddir)/libpolkit/libpolkit.la
++polkit_list_privileges_LDADD = @DBUS_LIBS@ @GLIB_LIBS@ $(top_builddir)/libpolkit/libpolkit.la
+ polkit_grant_privilege_SOURCES = \
+ 	polkit-grant-privilege.c					\
+ 					polkit-interface-manager-glue.h \
diff --git a/sysutils/policykit/files/polkitd.in b/sysutils/policykit/files/polkitd.in
new file mode 100644
index 000000000000..3ded54522dff
--- /dev/null
+++ b/sysutils/policykit/files/polkitd.in
@@ -0,0 +1,56 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: polkitd
+# REQUIRE: DAEMON dbus
+#
+# Add the following line to /etc/rc.conf to enable the PolicyKit daemon:
+#
+# polkitd_enable="YES"
+#
+
+polkitd_enable=${polkitd_enable-"NO"}
+
+. %%RC_SUBR%%
+
+name=polkitd
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/sbin/polkitd"
+pidfile="/var/run/${name}/${name}.pid"
+
+start_precmd="polkitd_precmd"
+stop_postcmd="polkitd_postcmd"
+
+local_force_depend()
+{
+    _depend="$1"
+    if [ -f %%LOCALBASE%%/etc/rc.d/${_depend}.sh ]; then
+	_depend="${_depend}.sh"
+    fi
+
+    if ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestatus 1>/dev/null 2>&1 &&
+       ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestart; then
+       return 1
+   fi
+   return 0
+}
+
+polkitd_precmd()
+{
+    if ! checkyesno dbus_enable
+    then
+	local_force_depend dbus || return 1
+    fi
+
+    mkdir -p $(dirname $pidfile)
+}
+
+polkitd_postcmd()
+{
+    	rm -f $pidfile
+}
+
+load_rc_config ${name}
+run_rc_command "$1"
diff --git a/sysutils/policykit/pkg-descr b/sysutils/policykit/pkg-descr
new file mode 100644
index 000000000000..5c002310127b
--- /dev/null
+++ b/sysutils/policykit/pkg-descr
@@ -0,0 +1,4 @@
+PolicyKit is a framework for defining policy for system-wide components and
+for desktop pieces to configure it. It is used by HAL.
+
+WWW: http://www.freedesktop.org/Software/hal
diff --git a/sysutils/policykit/pkg-install b/sysutils/policykit/pkg-install
new file mode 100644
index 000000000000..7c7d4baca2c9
--- /dev/null
+++ b/sysutils/policykit/pkg-install
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+case $2 in
+POST-INSTALL)
+	USER=polkit
+	GROUP=${USER}
+	UID=559
+	GID=${UID}
+	PW=/usr/sbin/pw
+
+	if ${PW} group show "${GROUP}" 2>/dev/null; then
+		echo "You already have a group \"${GROUP}\", so I will use it."
+	else
+		if ${PW} groupadd ${GROUP} -g ${GID}; then
+			echo "Added group \"${GROUP}\"."
+		else
+			echo "Adding group \"${GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if ${PW} user show "${USER}" 2>/dev/null; then
+		echo "You already have a user \"${USER}\", so I will use it."
+	else
+		if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+			-d "/nonexistent" -s /sbin/nologin -c "PolicyKit Daemon User"
+		then
+			echo "Added user \"${USER}\"."
+		else
+			echo "Adding user \"${USER}\" failed..."
+			exit 1
+		fi
+	fi
+
+	/usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/polkitd
+	exit 0
+	;;
+esac
diff --git a/sysutils/policykit/pkg-plist b/sysutils/policykit/pkg-plist
new file mode 100644
index 000000000000..66c27dc14847
--- /dev/null
+++ b/sysutils/policykit/pkg-plist
@@ -0,0 +1,19 @@
+bin/polkit-grant-privilege
+bin/polkit-is-privileged
+bin/polkit-list-privileges
+bin/polkit-revoke-privilege
+etc/PolicyKit/privilege.d/desktop-console.privilege
+etc/dbus-1/system.d/PolicyKit.conf
+etc/pam.d/policy-kit
+include/libpolkit/libpolkit.h
+lib/libpolkit.a
+lib/libpolkit.la
+lib/libpolkit.so
+lib/libpolkit.so.0
+libdata/pkgconfig/polkit.pc
+sbin/polkitd
+@dirrm include/libpolkit
+@dirrm etc/PolicyKit/privilege.d
+@dirrm etc/PolicyKit
+@unexec rm -f /var/run/polkitd/polkitd.pid 2>/dev/null || true
+@unexec rmdir /var/run/polkitd 2>/dev/null || true
diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index c2eafe8a0ef1..31268961482d 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.12 2005/09/04 18:51:49 marcus Exp $
+#   $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.21 2006/07/27 03:59:24 marcus Exp $
 #
 
 PORTNAME=	system-tools-backends
 PORTVERSION=	1.4.2
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.4
@@ -20,7 +21,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_GETTEXT=	yes
-PREFIX?=	${X11BASE}
 USE_GNOME=	gnomehack gnometarget intlhack
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -32,12 +32,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 .endif
 
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-MTREE_FILE=	/etc/mtree/BSD.x11.dist
-.else
-MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
-.endif
-
 .if ${PERL_LEVEL} < 500600
 post-configure:
 	@${FIND} ${WRKSRC} \( -name "*.pl" -or -name "*-conf" \) | \
diff --git a/sysutils/system-tools-backends/pkg-plist b/sysutils/system-tools-backends/pkg-plist
index 92fa9e5ef655..e6bc30c63021 100644
--- a/sysutils/system-tools-backends/pkg-plist
+++ b/sysutils/system-tools-backends/pkg-plist
@@ -97,7 +97,37 @@ share/setup-tool-backends/scripts/xml.pl
 @dirrm share/setup-tool-backends/scripts
 @dirrm share/setup-tool-backends/files
 @dirrm share/setup-tool-backends
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
author	Joe Marcus Clarke <marcus@FreeBSD.org>	2006-10-14 08:35:50 +0000
committer	Joe Marcus Clarke <marcus@FreeBSD.org>	2006-10-14 08:35:50 +0000
commit	f1bb12de8e50bf76ae21f37debda60994ec7fd99 (patch)
tree	1671d4beef381f12d939e34b344eb385a3af4f19 /sysutils
parent	29adee7bb42244f34736c5c24ed18a9b269d0925 (diff)