16 files changed, 4 insertions, 628 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index a8021cba1fe1..200759335c37 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -209,11 +209,11 @@
     SUBDIR += gnome-control-center1
     SUBDIR += gnome-pkgview
     SUBDIR += gnome-schedule
+    SUBDIR += gnome-system-monitor
+    SUBDIR += gnome-system-tools
     SUBDIR += gnomebaker
     SUBDIR += gnomefind
     SUBDIR += gnomesu
-    SUBDIR += gnomesystemmonitor
-    SUBDIR += gnomesystemtools
     SUBDIR += gpart
     SUBDIR += gpkgdep
     SUBDIR += gpte
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 934f2b220023..0c6efce03cf7 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -3,10 +3,9 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnomesystemmonitor/Makefile,v 1.67 2006/04/23 23:04:15 mezz Exp $
 #
 
-PORTNAME=	gnomesystemmonitor
+PORTNAME=	gnome-system-monitor
 PORTVERSION=	2.14.3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index b64ab1eff2a6..743e4ebf2f78 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -3,10 +3,9 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnomesystemtools/Makefile,v 1.40 2006/04/13 07:52:38 bland Exp $
 #
 
-PORTNAME=	gnomesystemtools
+PORTNAME=	gnome-system-tools
 PORTVERSION=	2.14.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
deleted file mode 100644
index 934f2b220023..000000000000
--- a/sysutils/gnomesystemmonitor/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# New ports collection makefile for:	gnomesystemmonitor
-# Date created:				09 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/sysutils/gnomesystemmonitor/Makefile,v 1.67 2006/04/23 23:04:15 mezz Exp $
-#
-
-PORTNAME=	gnomesystemmonitor
-PORTVERSION=	2.14.3
-CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	gnome-system-monitor-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME 2 system monitor program
-
-LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop
-
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
-INSTALLS_OMF=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui libwnck
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lutil"
-
-GCONF_SCHEMAS=	gnome-system-monitor.schemas
-
-.include <bsd.port.mk>
diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo
deleted file mode 100644
index 5c06b34139c7..000000000000
--- a/sysutils/gnomesystemmonitor/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-system-monitor-2.14.3.tar.bz2) = 8d690176629b8b2b3e4d4f93d98d57f0
-SHA256 (gnome2/gnome-system-monitor-2.14.3.tar.bz2) = 8c6bf0b35d8adee5d75152f355fa92fbf290f02c4ddd2ed51beb1fa4c116f529
-SIZE (gnome2/gnome-system-monitor-2.14.3.tar.bz2) = 1418079
diff --git a/sysutils/gnomesystemmonitor/files/patch-src::proctable.c b/sysutils/gnomesystemmonitor/files/patch-src::proctable.c
deleted file mode 100644
index 70b2f9e30c64..000000000000
--- a/sysutils/gnomesystemmonitor/files/patch-src::proctable.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/proctable.c.orig	Fri Jul 22 18:58:42 2005
-+++ src/proctable.c	Mon Jul 25 22:25:58 2005
-@@ -853,6 +853,12 @@ static void cb_exclude(ProcInfo* info, G
- }
- 
- 
-+static int
-+pid_compare(const void* first, const void* second)
-+{
-+	return *(unsigned*)first - *(unsigned*)second;
-+}
-+
- static void
- refresh_list (ProcData *procdata, const unsigned *pid_list, const guint n)
- {
-@@ -945,10 +951,15 @@ proctable_update_list (ProcData * const 
- 
- 	pid_list = glibtop_get_proclist (&proclist, which, arg);
- 
-+	qsort(pid_list, proclist.number, sizeof (*pid_list), pid_compare);
-+
- 	/* FIXME: total cpu time elapsed should be calculated on an individual basis here
- 	** should probably have a total_time_last gint in the ProcInfo structure */
- 	glibtop_get_cpu (&cpu);
- 	total_time = MAX(cpu.total - total_time_last, 1);
-+	if (cpu.frequency) {
-+		total_time /= (cpu.frequency/100);
-+	}
- 	total_time_last = cpu.total;
- 
- 	refresh_list (procdata, pid_list, proclist.number);
diff --git a/sysutils/gnomesystemmonitor/files/patch-src_openfiles.c b/sysutils/gnomesystemmonitor/files/patch-src_openfiles.c
deleted file mode 100644
index 971e718b2101..000000000000
--- a/sysutils/gnomesystemmonitor/files/patch-src_openfiles.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/openfiles.c.orig	Mon Apr 11 03:50:49 2005
-+++ src/openfiles.c	Mon Apr 11 03:52:13 2005
-@@ -8,6 +8,7 @@
- #include <netdb.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
- #include "procman.h"
- #include "openfiles.h"
diff --git a/sysutils/gnomesystemmonitor/pkg-descr b/sysutils/gnomesystemmonitor/pkg-descr
deleted file mode 100644
index 40caee6476d9..000000000000
--- a/sysutils/gnomesystemmonitor/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-GNOME 2.0 system monitor program.
diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist
deleted file mode 100644
index ed8ccd03b81f..000000000000
--- a/sysutils/gnomesystemmonitor/pkg-plist
+++ /dev/null
@@ -1,111 +0,0 @@
-bin/gnome-system-monitor
-share/gnome/applications/gnome-system-monitor.desktop
-share/gnome/help/gnome-system-monitor/C/figures/addColumn.png
-share/gnome/help/gnome-system-monitor/C/figures/changePriority.png
-share/gnome/help/gnome-system-monitor/C/figures/colorPanel.png
-share/gnome/help/gnome-system-monitor/C/figures/columnContextMenu.png
-share/gnome/help/gnome-system-monitor/C/figures/gnome-system-monitor_window.png
-share/gnome/help/gnome-system-monitor/C/figures/memoryMaps.png
-share/gnome/help/gnome-system-monitor/C/figures/moreInfo.png
-share/gnome/help/gnome-system-monitor/C/figures/processListing.png
-share/gnome/help/gnome-system-monitor/C/figures/sortButton.png
-share/gnome/help/gnome-system-monitor/C/figures/sortMenu.png
-share/gnome/help/gnome-system-monitor/C/figures/sortMenu2.png
-share/gnome/help/gnome-system-monitor/C/figures/systemMonitor.png
-share/gnome/help/gnome-system-monitor/C/figures/viewMenu.png
-share/gnome/help/gnome-system-monitor/C/gnome-system-monitor.xml
-share/gnome/help/gnome-system-monitor/C/legal.xml
-share/gnome/help/gnome-system-monitor/bg/figures/addColumn.png
-share/gnome/help/gnome-system-monitor/bg/figures/changePriority.png
-share/gnome/help/gnome-system-monitor/bg/figures/colorPanel.png
-share/gnome/help/gnome-system-monitor/bg/figures/columnContextMenu.png
-share/gnome/help/gnome-system-monitor/bg/figures/gnome-system-monitor_window.png
-share/gnome/help/gnome-system-monitor/bg/figures/memoryMaps.png
-share/gnome/help/gnome-system-monitor/bg/figures/moreInfo.png
-share/gnome/help/gnome-system-monitor/bg/figures/processListing.png
-share/gnome/help/gnome-system-monitor/bg/figures/sortButton.png
-share/gnome/help/gnome-system-monitor/bg/figures/sortMenu.png
-share/gnome/help/gnome-system-monitor/bg/figures/sortMenu2.png
-share/gnome/help/gnome-system-monitor/bg/figures/systemMonitor.png
-share/gnome/help/gnome-system-monitor/bg/figures/viewMenu.png
-share/gnome/help/gnome-system-monitor/bg/gnome-system-monitor.xml
-share/gnome/help/gnome-system-monitor/bg/legal.xml
-share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf
-share/gnome/omf/gnome-system-monitor/gnome-system-monitor-bg.omf
-share/locale/am/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/ar/LC_MESSAGES/gnome-system-monitor.mo
-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/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
-share/locale/cy/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/da/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/de/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/dz/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/el/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/en_CA/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/en_GB/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/es/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/et/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/eu/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/fa/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/fi/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/fr/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/ga/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/gl/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/gu/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/he/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/hi/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/hr/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/hu/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/id/LC_MESSAGES/gnome-system-monitor.mo
-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/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/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/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/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
-share/locale/pt_BR/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/ro/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/ru/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/rw/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/sk/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/sl/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/sr/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/ta/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/th/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/ug/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo
-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
diff --git a/sysutils/gnomesystemtools/Makefile b/sysutils/gnomesystemtools/Makefile
deleted file mode 100644
index b64ab1eff2a6..000000000000
--- a/sysutils/gnomesystemtools/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# New ports collection makefile for:	gnomesystemtools
-# Date created:				17 May 2004
-# Whom:					Adam Weinberger <adamw@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/sysutils/gnomesystemtools/Makefile,v 1.40 2006/04/13 07:52:38 bland Exp $
-#
-
-PORTNAME=	gnomesystemtools
-PORTVERSION=	2.14.0
-CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-system-tools/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	gnome-system-tools-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Tools to configure workstations
-
-BUILD_DEPENDS=	${X11BASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sysutils/system-tools-backends
-RUN_DEPENDS=	${X11BASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sysutils/system-tools-backends
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
-GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack nautilus2
-USE_AUTOTOOLS=	libtool:15
-INSTALLS_OMF=	yes
-CONFIGURE_ARGS=	--enable-services
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-GCONF_SCHEMAS=	gnome-system-tools.schemas
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-IGNORE=	uses symbols not present in 4.X
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/sysutils/gnomesystemtools/distinfo b/sysutils/gnomesystemtools/distinfo
deleted file mode 100644
index dea2f0713697..000000000000
--- a/sysutils/gnomesystemtools/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 3aded3a37f4f5b4962bf253d25cebea1
-SHA256 (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 39f37363001b1cc2f5d2f5d2d7024a7a36e7dd227862b1dd9ce8c3325157ea7c
-SIZE (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 2120911
diff --git a/sysutils/gnomesystemtools/files/patch-configure b/sysutils/gnomesystemtools/files/patch-configure
deleted file mode 100644
index 712bb1defc9f..000000000000
--- a/sysutils/gnomesystemtools/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Thu Jan 13 17:15:39 2005
-+++ configure	Thu Jan 13 17:17:13 2005
-@@ -22990,7 +22990,7 @@
- GST_CFLAGS="$GST_DEPENDS_CFLAGS $GST_CRACK_LIB_CFLAGS $GST_DEPRECATED_FLAGS"
- 
- GST_TOOL_LIBS="$GST_LIBS -lutil \$(top_builddir)/src/common/libsetuptool.a"
--GST_TOOL_CFLAGS="$GST_CFLAGS -I\$(top_srcdir)/src/common"
-+GST_TOOL_CFLAGS="-I\$(top_srcdir)/src/common $GST_CFLAGS"
- 
- GST_TOOL_CLEANFILES="\$(desktop) \$(desktop).in"
- GST_TOOL_EXTRA_DIST="\$(toolpixmaps) \$(desktop).in.in"
diff --git a/sysutils/gnomesystemtools/files/patch-src_common_gst-auth.c b/sysutils/gnomesystemtools/files/patch-src_common_gst-auth.c
deleted file mode 100644
index f73b28ae4d10..000000000000
--- a/sysutils/gnomesystemtools/files/patch-src_common_gst-auth.c
+++ /dev/null
@@ -1,110 +0,0 @@
---- src/common/gst-auth.c.orig	Mon Aug  8 15:00:01 2005
-+++ src/common/gst-auth.c	Sat Sep 10 01:47:35 2005
-@@ -55,6 +55,82 @@
- static int root;			/* if we are root, no password is
- 					   required */
- 
-+#ifdef __FreeBSD__
-+static int
-+_forkpty (int *amaster, char *name,
-+	  struct termios *termp, struct winsize *winp)
-+{
-+	int master, slave;
-+	char *line;
-+	pid_t pid;
-+
-+	master = posix_openpt (O_RDWR);
-+	if (master == -1)
-+		return (-1);
-+
-+	if (grantpt (master) == -1)
-+	{
-+		(void) close (master);
-+		return (-1);
-+	}
-+
-+	if (unlockpt (master) == -1)
-+	{
-+		(void) close (master);
-+		return (-1);
-+	}
-+
-+	line = ptsname (master);
-+	if (line == NULL)
-+	{
-+		(void) close (master);
-+		return (-1);
-+	}
-+
-+	slave = open (line, O_RDWR);
-+	if (slave < 0)
-+	{
-+		(void) close (master);
-+		return (-1);
-+	}
-+
-+	if (amaster)
-+		*amaster = master;
-+
-+	if (name)
-+		strcpy (name, line);
-+
-+	if (termp)
-+		(void) tcsetattr(slave, TCSAFLUSH, termp);
-+
-+	if (winp)
-+		(void) ioctl(slave, TIOCSWINSZ, (char *) winp);
-+
-+	pid = fork ();
-+	switch (pid)
-+	{
-+		case -1:
-+			(void) close (slave);
-+			(void) close (master);
-+			return (-1);
-+		case 0:
-+			(void) close (master);
-+			dup2 (slave, STDIN_FILENO);
-+			dup2 (slave, STDOUT_FILENO);
-+			dup2 (slave, STDERR_FILENO);
-+			return (0);
-+		default:
-+			(void) close (slave);
-+			return (pid);
-+	}
-+
-+	(void) close (master);
-+	return (-1);
-+}
-+#else
-+#define _forkpty forkpty
-+#endif
-+
- static void
- gst_auth_display_error_message (GstTool *tool, gchar *primary_text, gchar *secondary_text)
- {
-@@ -125,7 +201,7 @@ gst_auth_run_term (GstTool *tool, gchar 
- 	int p[2];
- 
- 	pipe (p);
--	tool->backend_pid = forkpty (&tool->write_fd, NULL, NULL, NULL);
-+	tool->backend_pid = _forkpty (&tool->write_fd, NULL, NULL, NULL);
- 
- 	if (tool->backend_pid < 0) {
- 		gst_auth_display_error_message (tool,
-@@ -142,12 +218,12 @@ gst_auth_run_term (GstTool *tool, gchar 
- 		unsetenv("LANG");
- 		unsetenv("LANGUAGE");
- 
--		dup2 (p[1], 1);
--		dup2 (p[1], 2);
-+		dup2 (p[1], STDOUT_FILENO);
-+		dup2 (p[1], STDERR_FILENO);
- 		close (p[0]);
- 
- 		execv (args[0], args);
--		exit (255);
-+		_exit (255);
- 	} else {
- #ifndef __FreeBSD__
- 		/* Linux's su works ok with echo disabling */
diff --git a/sysutils/gnomesystemtools/files/patch-src_common_gst-tool.c b/sysutils/gnomesystemtools/files/patch-src_common_gst-tool.c
deleted file mode 100644
index 9aaef15031fd..000000000000
--- a/sysutils/gnomesystemtools/files/patch-src_common_gst-tool.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/common/gst-tool.c.orig	Tue Jun 21 15:07:05 2005
-+++ src/common/gst-tool.c	Wed Jul  6 01:28:22 2005
-@@ -598,7 +598,14 @@ gst_tool_kill_backend_cb (GstDirectiveEn
- 		if (tool->root_access == ROOT_ACCESS_SIMULATED_DISABLED)
- 			tool->root_access = ROOT_ACCESS_SIMULATED;
- 
-+#if 0
-+		/*
-+		 * We do not need to wait for the tool,
-+		 * as it will get SIGPIPE anyway.
-+		 * This waitpid causes problems on FreeBSD.
-+		 */
- 		waitpid (tool->backend_pid, NULL, 0);
-+#endif
- 	}
- }
- 
-@@ -1655,7 +1662,7 @@ poll_backend (GstTool *tool)
- 	struct pollfd fd;
- 
- 	fd.fd = tool->read_fd;
--	fd.events = POLLIN || POLLPRI;
-+	fd.events = POLLIN | POLLPRI;
- 
- 	while (poll (&fd, 1, 100) <= 0) {
- 		while (gtk_events_pending ())
diff --git a/sysutils/gnomesystemtools/pkg-descr b/sysutils/gnomesystemtools/pkg-descr
deleted file mode 100644
index b0b69e539b80..000000000000
--- a/sysutils/gnomesystemtools/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Various tools to assist in administration and configuration of a workstation.
-Included are tools to:
-
-	* Administer user and group accounts
-	* Change the date, time, and time zone
-	* Set up and configure network interfaces
-	* Modify bootloader settings
-	* Start, stop, and modify system services
-
-WWW: http://www.gnome.org/projects/gst/
diff --git a/sysutils/gnomesystemtools/pkg-plist b/sysutils/gnomesystemtools/pkg-plist
deleted file mode 100644
index acbf5571d27a..000000000000
--- a/sysutils/gnomesystemtools/pkg-plist
+++ /dev/null
@@ -1,229 +0,0 @@
-bin/network-admin
-bin/services-admin
-bin/shares-admin
-bin/time-admin
-bin/users-admin
-lib/nautilus/extensions-1.0/libnautilus-gst-shares.a
-lib/nautilus/extensions-1.0/libnautilus-gst-shares.la
-lib/nautilus/extensions-1.0/libnautilus-gst-shares.so
-libdata/pkgconfig/gnome-system-tools.pc
-share/gnome-system-tools/interfaces/boot.glade
-share/gnome-system-tools/interfaces/common.glade
-share/gnome-system-tools/interfaces/disks.glade
-share/gnome-system-tools/interfaces/network.glade
-share/gnome-system-tools/interfaces/services.glade
-share/gnome-system-tools/interfaces/shares.glade
-share/gnome-system-tools/interfaces/time.glade
-share/gnome-system-tools/interfaces/users.glade
-share/gnome-system-tools/pixmaps/16_ethernet.xpm
-share/gnome-system-tools/pixmaps/16_loopback.xpm
-share/gnome-system-tools/pixmaps/16_plip.xpm
-share/gnome-system-tools/pixmaps/16_ppp.xpm
-share/gnome-system-tools/pixmaps/archlinux.png
-share/gnome-system-tools/pixmaps/black_panther.png
-share/gnome-system-tools/pixmaps/boot.png
-share/gnome-system-tools/pixmaps/computer.png
-share/gnome-system-tools/pixmaps/conectiva.png
-share/gnome-system-tools/pixmaps/connection-ethernet.png
-share/gnome-system-tools/pixmaps/connection-modem.png
-share/gnome-system-tools/pixmaps/debian.png
-share/gnome-system-tools/pixmaps/disks.png
-share/gnome-system-tools/pixmaps/fedora.png
-share/gnome-system-tools/pixmaps/freebsd.png
-share/gnome-system-tools/pixmaps/gentoo.png
-share/gnome-system-tools/pixmaps/gnome-dev-cdrom-data.png
-share/gnome-system-tools/pixmaps/gnome-dev-cdrom-mixed.png
-share/gnome-system-tools/pixmaps/irda-16.png
-share/gnome-system-tools/pixmaps/irda-48.png
-share/gnome-system-tools/pixmaps/mandrake.png
-share/gnome-system-tools/pixmaps/nameresolution.png
-share/gnome-system-tools/pixmaps/nameresolution_alias.png
-share/gnome-system-tools/pixmaps/nameresolution_id.png
-share/gnome-system-tools/pixmaps/network.png
-share/gnome-system-tools/pixmaps/openna.png
-share/gnome-system-tools/pixmaps/pld.png
-share/gnome-system-tools/pixmaps/plip-48.png
-share/gnome-system-tools/pixmaps/ppp.png
-share/gnome-system-tools/pixmaps/reading.png
-share/gnome-system-tools/pixmaps/redhat.png
-share/gnome-system-tools/pixmaps/server.png
-share/gnome-system-tools/pixmaps/services.png
-share/gnome-system-tools/pixmaps/settings.png
-share/gnome-system-tools/pixmaps/shares.png
-share/gnome-system-tools/pixmaps/slackware.png
-share/gnome-system-tools/pixmaps/specifix.png
-share/gnome-system-tools/pixmaps/suse.png
-share/gnome-system-tools/pixmaps/talk-userlist.png
-share/gnome-system-tools/pixmaps/time.png
-share/gnome-system-tools/pixmaps/timezone.png
-share/gnome-system-tools/pixmaps/turbolinux.png
-share/gnome-system-tools/pixmaps/unsupported-distro.png
-share/gnome-system-tools/pixmaps/users-groups.png
-share/gnome-system-tools/pixmaps/users.png
-share/gnome-system-tools/pixmaps/vidalinux.png
-share/gnome-system-tools/pixmaps/vine.png
-share/gnome-system-tools/pixmaps/wavelan-16.png
-share/gnome-system-tools/pixmaps/wavelan-48.png
-share/gnome-system-tools/pixmaps/world_map-960.png
-share/gnome/applications/network.desktop
-share/gnome/applications/services.desktop
-share/gnome/applications/shares.desktop
-share/gnome/applications/time.desktop
-share/gnome/applications/users.desktop
-share/gnome/help/boot-admin/C/boot-admin.xml
-share/gnome/help/boot-admin/C/figures/boot-tool.png
-share/gnome/help/boot-admin/C/legal.xml
-share/gnome/help/boot-admin/es/boot-admin.xml
-share/gnome/help/boot-admin/es/figures/boot-tool.png
-share/gnome/help/network-admin/C/figures/network-tool.png
-share/gnome/help/network-admin/C/legal.xml
-share/gnome/help/network-admin/C/network-admin.xml
-share/gnome/help/network-admin/es/figures/network-tool.png
-share/gnome/help/network-admin/es/network-admin.xml
-share/gnome/help/services-admin/C/figures/service-properties.png
-share/gnome/help/services-admin/C/figures/services-tool.png
-share/gnome/help/services-admin/C/legal.xml
-share/gnome/help/services-admin/C/services-admin.xml
-share/gnome/help/services-admin/es/figures/service-properties.png
-share/gnome/help/services-admin/es/figures/services-tool.png
-share/gnome/help/services-admin/es/services-admin.xml
-share/gnome/help/services-admin/nl/figures/service-properties.png
-share/gnome/help/services-admin/nl/figures/services-tool.png
-share/gnome/help/services-admin/nl/legal.xml
-share/gnome/help/services-admin/nl/services-admin.xml
-share/gnome/help/time-admin/C/figures/time-map.png
-share/gnome/help/time-admin/C/figures/time-servers.png
-share/gnome/help/time-admin/C/figures/time-tool.png
-share/gnome/help/time-admin/C/legal.xml
-share/gnome/help/time-admin/C/time-admin.xml
-share/gnome/help/time-admin/es/figures/time-map.png
-share/gnome/help/time-admin/es/figures/time-servers.png
-share/gnome/help/time-admin/es/figures/time-tool.png
-share/gnome/help/time-admin/es/time-admin.xml
-share/gnome/help/time-admin/nl/figures/time-map.png
-share/gnome/help/time-admin/nl/figures/time-servers.png
-share/gnome/help/time-admin/nl/figures/time-tool.png
-share/gnome/help/time-admin/nl/legal.xml
-share/gnome/help/time-admin/nl/time-admin.xml
-share/gnome/help/users-admin/C/figures/users-tool.png
-share/gnome/help/users-admin/C/legal.xml
-share/gnome/help/users-admin/C/users-admin.xml
-share/gnome/help/users-admin/es/figures/users-tool.png
-share/gnome/help/users-admin/es/users-admin.xml
-share/gnome/omf/boot-admin/boot-admin-C.omf
-share/gnome/omf/boot-admin/boot-admin-es.omf
-share/gnome/omf/gnome-system-tools/services-admin-nl.omf
-share/gnome/omf/gnome-system-tools/time-admin-nl.omf
-share/gnome/omf/network-admin/network-admin-C.omf
-share/gnome/omf/network-admin/network-admin-es.omf
-share/gnome/omf/services-admin/services-admin-C.omf
-share/gnome/omf/services-admin/services-admin-es.omf
-share/gnome/omf/time-admin/time-admin-C.omf
-share/gnome/omf/time-admin/time-admin-es.omf
-share/gnome/omf/users-admin/users-admin-C.omf
-share/gnome/omf/users-admin/users-admin-es.omf
-share/locale/am/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ar/LC_MESSAGES/gnome-system-tools.mo
-share/locale/az/LC_MESSAGES/gnome-system-tools.mo
-share/locale/bg/LC_MESSAGES/gnome-system-tools.mo
-share/locale/bn/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ca/LC_MESSAGES/gnome-system-tools.mo
-share/locale/cs/LC_MESSAGES/gnome-system-tools.mo
-share/locale/cy/LC_MESSAGES/gnome-system-tools.mo
-share/locale/da/LC_MESSAGES/gnome-system-tools.mo
-share/locale/de/LC_MESSAGES/gnome-system-tools.mo
-share/locale/el/LC_MESSAGES/gnome-system-tools.mo
-share/locale/en_CA/LC_MESSAGES/gnome-system-tools.mo
-share/locale/en_GB/LC_MESSAGES/gnome-system-tools.mo
-share/locale/es/LC_MESSAGES/gnome-system-tools.mo
-share/locale/et/LC_MESSAGES/gnome-system-tools.mo
-share/locale/eu/LC_MESSAGES/gnome-system-tools.mo
-share/locale/fi/LC_MESSAGES/gnome-system-tools.mo
-share/locale/fr/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ga/LC_MESSAGES/gnome-system-tools.mo
-share/locale/gl/LC_MESSAGES/gnome-system-tools.mo
-share/locale/gu/LC_MESSAGES/gnome-system-tools.mo
-share/locale/he/LC_MESSAGES/gnome-system-tools.mo
-share/locale/hi/LC_MESSAGES/gnome-system-tools.mo
-share/locale/hr/LC_MESSAGES/gnome-system-tools.mo
-share/locale/hu/LC_MESSAGES/gnome-system-tools.mo
-share/locale/id/LC_MESSAGES/gnome-system-tools.mo
-share/locale/it/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ja/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ko/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ku/LC_MESSAGES/gnome-system-tools.mo
-share/locale/lt/LC_MESSAGES/gnome-system-tools.mo
-share/locale/lv/LC_MESSAGES/gnome-system-tools.mo
-share/locale/mk/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ml/LC_MESSAGES/gnome-system-tools.mo
-share/locale/mn/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ms/LC_MESSAGES/gnome-system-tools.mo
-share/locale/nb/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ne/LC_MESSAGES/gnome-system-tools.mo
-share/locale/nl/LC_MESSAGES/gnome-system-tools.mo
-share/locale/nn/LC_MESSAGES/gnome-system-tools.mo
-share/locale/no/LC_MESSAGES/gnome-system-tools.mo
-share/locale/pa/LC_MESSAGES/gnome-system-tools.mo
-share/locale/pl/LC_MESSAGES/gnome-system-tools.mo
-share/locale/pt/LC_MESSAGES/gnome-system-tools.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ro/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ru/LC_MESSAGES/gnome-system-tools.mo
-share/locale/rw/LC_MESSAGES/gnome-system-tools.mo
-share/locale/sk/LC_MESSAGES/gnome-system-tools.mo
-share/locale/sq/LC_MESSAGES/gnome-system-tools.mo
-share/locale/sr/LC_MESSAGES/gnome-system-tools.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-system-tools.mo
-share/locale/sv/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ta/LC_MESSAGES/gnome-system-tools.mo
-share/locale/th/LC_MESSAGES/gnome-system-tools.mo
-share/locale/tr/LC_MESSAGES/gnome-system-tools.mo
-share/locale/uk/LC_MESSAGES/gnome-system-tools.mo
-share/locale/vi/LC_MESSAGES/gnome-system-tools.mo
-share/locale/wa/LC_MESSAGES/gnome-system-tools.mo
-share/locale/xh/LC_MESSAGES/gnome-system-tools.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-system-tools.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrm share/gnome/omf/users-admin
-@dirrm share/gnome/omf/time-admin
-@dirrm share/gnome/omf/services-admin
-@dirrm share/gnome/omf/network-admin
-@dirrm share/gnome/omf/gnome-system-tools
-@dirrm share/gnome/omf/boot-admin
-@dirrm share/gnome/help/users-admin/C/figures
-@dirrm share/gnome/help/users-admin/C
-@dirrm share/gnome/help/users-admin/es/figures
-@dirrm share/gnome/help/users-admin/es
-@dirrm share/gnome/help/users-admin
-@dirrm share/gnome/help/time-admin/nl/figures
-@dirrm share/gnome/help/time-admin/nl
-@dirrm share/gnome/help/time-admin/es/figures
-@dirrm share/gnome/help/time-admin/es
-@dirrm share/gnome/help/time-admin/C/figures
-@dirrm share/gnome/help/time-admin/C
-@dirrm share/gnome/help/time-admin
-@dirrm share/gnome/help/services-admin/nl/figures
-@dirrm share/gnome/help/services-admin/nl
-@dirrm share/gnome/help/services-admin/es/figures
-@dirrm share/gnome/help/services-admin/es
-@dirrm share/gnome/help/services-admin/C/figures
-@dirrm share/gnome/help/services-admin/C
-@dirrm share/gnome/help/services-admin
-@dirrm share/gnome/help/network-admin/es/figures
-@dirrm share/gnome/help/network-admin/es
-@dirrm share/gnome/help/network-admin/C/figures
-@dirrm share/gnome/help/network-admin/C
-@dirrm share/gnome/help/network-admin
-@dirrm share/gnome/help/boot-admin/es/figures
-@dirrm share/gnome/help/boot-admin/es
-@dirrm share/gnome/help/boot-admin/C/figures
-@dirrm share/gnome/help/boot-admin/C
-@dirrm share/gnome/help/boot-admin
-@dirrm share/gnome-system-tools/pixmaps
-@dirrm share/gnome-system-tools/interfaces
-@dirrm share/gnome-system-tools