Re-add the GNOME 2.14 version of g-s-t, and update for LOCALBASE.

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

3 files changed, 147 insertions, 0 deletions

diff --git a/sysutils/gnome-system-tools/files/patch-configure b/sysutils/gnome-system-tools/files/patch-configure
new file mode 100644
index 000000000..712bb1def
--- /dev/null
+++ b/sysutils/gnome-system-tools/files/patch-configure
@@ -0,0 +1,11 @@
+--- 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/gnome-system-tools/files/patch-src_common_gst-auth.c b/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c
new file mode 100644
index 000000000..f73b28ae4
--- /dev/null
+++ b/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c
@@ -0,0 +1,110 @@
+--- 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/gnome-system-tools/files/patch-src_common_gst-tool.c b/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c
new file mode 100644
index 000000000..9aaef1503
--- /dev/null
+++ b/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c
@@ -0,0 +1,26 @@
+--- 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 ())