aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2022-07-27 11:43:17 +0000
committerRene Ladan <rene@FreeBSD.org>2022-07-27 11:43:49 +0000
commit5434cdc4a41b6445579ef025f7e895d94c7c865c (patch)
treed8627916afb30747807edc0a10903c500c02f2fe
parentcd9ad4e75b5090cb7a8049576108ad6e7e8e4058 (diff)
downloadports-5434cdc4a41b6445579ef025f7e895d94c7c865c.tar.gz
ports-5434cdc4a41b6445579ef025f7e895d94c7c865c.zip
cleanup: Remove expired ports:
x11-wm/lxmed: Removed, depends on expired sysutils/gksu 2022-07-24 sysutils/gksu: Abandonware, depending on gconf2 2022-07-24 sysutils/libgksu: Abandonware, depending on gconf2
-rw-r--r--MOVED3
-rw-r--r--sysutils/Makefile2
-rw-r--r--sysutils/gksu/Makefile42
-rw-r--r--sysutils/gksu/distinfo2
-rw-r--r--sysutils/gksu/pkg-descr6
-rw-r--r--sysutils/gksu/pkg-plist10
-rw-r--r--sysutils/libgksu/Makefile51
-rw-r--r--sysutils/libgksu/distinfo2
-rw-r--r--sysutils/libgksu/files/patch-Makefile.in19
-rw-r--r--sysutils/libgksu/files/patch-libgksu_gksu-run-helper.c10
-rw-r--r--sysutils/libgksu/files/patch-libgksu_libgksu.c28
-rw-r--r--sysutils/libgksu/files/patch-revert-forkpty365
-rw-r--r--sysutils/libgksu/pkg-descr5
-rw-r--r--sysutils/libgksu/pkg-plist13
-rw-r--r--x11-wm/Makefile1
-rw-r--r--x11-wm/lxmed/Makefile49
-rw-r--r--x11-wm/lxmed/distinfo2
-rw-r--r--x11-wm/lxmed/files/lxmed-root.in3
-rw-r--r--x11-wm/lxmed/files/lxmed.sh.in4
-rw-r--r--x11-wm/lxmed/files/pc-su34
-rw-r--r--x11-wm/lxmed/pkg-descr10
-rw-r--r--x11-wm/lxmed/pkg-plist7
22 files changed, 3 insertions, 665 deletions
diff --git a/MOVED b/MOVED
index d60c653f5dd4..68978738a6e1 100644
--- a/MOVED
+++ b/MOVED
@@ -17517,3 +17517,6 @@ math/intervaltree||2022-07-27|Has expired: Dependent ports now use GH_TUPLE
security/gnomint||2022-07-27|Has expired: Abandonware, depending on gconf2
japanese/im-ja||2022-07-27|Has expired: Abandonware, depending on gconf2
sysutils/mgeupsd||2022-07-27|Has expired: Last release is 23 years old. It is not clear what devices are supported.
+x11-wm/lxmed||2022-07-27|Removed, depends on expired sysutils/gksu
+sysutils/gksu||2022-07-27|Has expired: Abandonware, depending on gconf2
+sysutils/libgksu||2022-07-27|Has expired: Abandonware, depending on gconf2
diff --git a/sysutils/Makefile b/sysutils/Makefile
index e47b6a5e3580..427654225bef 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -473,7 +473,6 @@
SUBDIR += gkrellm-trayicons
SUBDIR += gkrellm2
SUBDIR += gkrelltop
- SUBDIR += gksu
SUBDIR += glogg
SUBDIR += glow
SUBDIR += gnome-control-center
@@ -631,7 +630,6 @@
SUBDIR += libfvde
SUBDIR += libg15
SUBDIR += libg15render
- SUBDIR += libgksu
SUBDIR += libieee1284
SUBDIR += libptytty
SUBDIR += libretto-config
diff --git a/sysutils/gksu/Makefile b/sysutils/gksu/Makefile
deleted file mode 100644
index f4c678cfe40b..000000000000
--- a/sysutils/gksu/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-PORTNAME= gksu
-PORTVERSION= 2.0.2
-PORTREVISION= 9
-CATEGORIES= sysutils
-MASTER_SITES= http://people.debian.org/~kov/gksu/
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Graphical frontend to su
-
-DEPRECATED= Abandonware, depending on gconf2
-EXPIRATION_DATE= 2022-07-24
-
-LICENSE= GPLv2+
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2 \
- libgksu2.so:sysutils/libgksu \
- libgnome-keyring.so:security/libgnome-keyring \
- libstartup-notification-1.so:x11/startup-notification
-
-USES= gettext-tools gmake gnome libtool pathfix pkgconfig
-USE_GNOME= cairo gconf2 gdkpixbuf2 gnomeprefix gtk20 intlhack
-GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-INSTALL_TARGET= install-strip
-
-OPTIONS_DEFINE= NAUTILUS
-OPTIONS_DEFAULT=NAUTILUS
-OPTIONS_SUB= yes
-
-NAUTILUS_DESC= Build extension for GNOME file manager
-NAUTILUS_CONFIGURE_ENABLE= nautilus-extension
-NAUTILUS_LIB_DEPENDS= libnautilus-extension.so:x11-fm/nautilus
-
-post-patch:
- @${REINPLACE_CMD} -e 's|glib/gkeyfile.h|glib.h|g' \
- ${WRKSRC}/nautilus-gksu/libnautilus-gksu.c
-
-.include <bsd.port.mk>
diff --git a/sysutils/gksu/distinfo b/sysutils/gksu/distinfo
deleted file mode 100644
index 7fe87d046e9e..000000000000
--- a/sysutils/gksu/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gksu-2.0.2.tar.gz) = a1de3dca039d88c195fcdc9516379439a1d699750417f1e655aa2101a955ee5a
-SIZE (gksu-2.0.2.tar.gz) = 468121
diff --git a/sysutils/gksu/pkg-descr b/sysutils/gksu/pkg-descr
deleted file mode 100644
index 38a4c1e45c1a..000000000000
--- a/sysutils/gksu/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-gksu is a Gtk+ frontend to /bin/su. It supports login shells and preserving
-environment when acting as a su frontend. It is useful to menu items or other
-graphical programs that need to ask a user's password to run another program
-as another user.
-
-WWW: http://www.gnu.org/non-gnu/gksu/
diff --git a/sysutils/gksu/pkg-plist b/sysutils/gksu/pkg-plist
deleted file mode 100644
index b222792b0f12..000000000000
--- a/sysutils/gksu/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-bin/gksu
-bin/gksudo
-%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-gksu.so
-%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-gksu.a
-man/man1/gksu.1.gz
-man/man1/gksudo.1.gz
-share/applications/gksu.desktop
-share/pixmaps/gksu-icon.png
-share/pixmaps/gksu-root-terminal.png
-share/gksu/gksu-migrate-conf.sh
diff --git a/sysutils/libgksu/Makefile b/sysutils/libgksu/Makefile
deleted file mode 100644
index 5a0dfee1105f..000000000000
--- a/sysutils/libgksu/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-PORTNAME= libgksu
-PORTVERSION= 2.0.12
-PORTREVISION= 8
-CATEGORIES= sysutils
-MASTER_SITES= http://people.debian.org/~kov/gksu/
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Library providing su and sudo functionality
-
-DEPRECATED= Abandonware, depending on gconf2
-EXPIRATION_DATE= 2022-07-24
-
-LICENSE= LGPL20+
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-LIB_DEPENDS= libgtop-2.0.so:devel/libgtop \
- libgnome-keyring.so:security/libgnome-keyring \
- libstartup-notification-1.so:x11/startup-notification
-RUN_DEPENDS= xauth:x11/xauth \
- sudo:security/sudo
-
-USES= gettext gmake gnome libtool pathfix pkgconfig xorg
-USE_GNOME= cairo gconf2 gdkpixbuf2 glib20 intltool gtk20
-USE_LDCONFIG= yes
-USE_XORG= x11
-CONFIGURE_ARGS= --enable-gtk-doc=no
-GNU_CONFIGURE= yes
-GCONF_SCHEMAS= gksu.schemas
-INSTALL_TARGET= install-strip
-
-post-patch:
- @${REINPLACE_CMD} '/AM_CFLAGS/s/-g -O2//' \
- ${WRKSRC}/gksu-properties/Makefile.in \
- ${WRKSRC}/libgksu/Makefile.in \
- ${WRKSRC}/libgksuui/Makefile.in
- @${REINPLACE_CMD} '/^test_gksu_LDFLAGS =/s/glib-2.0/gtk+-2.0/' \
- ${WRKSRC}/libgksu/Makefile.in
- @${REINPLACE_CMD} '/^libgksuui1_0_la_LIBADD =/s/$$/ -lX11/' \
- ${WRKSRC}/libgksuui/Makefile.in
- @${REINPLACE_CMD} -E \
- -e 's|([" ])/bin/su|\1/usr/bin/su|g' \
- -e 's|/usr/bin/sudo|${LOCALBASE}/bin/sudo|g' \
- -e 's|/usr/bin/xauth|${LOCALBASE}/bin/xauth|g' \
- -e 's|/usr/bin/xgettext|${LOCALBASE}/bin/xgettext|g' \
- -e 's|/usr/bin/xterm|${LOCALBASE}/bin/xterm|g' \
- ${WRKSRC}/libgksu/gksu-run-helper.c \
- ${WRKSRC}/libgksu/libgksu.c \
- ${WRKSRC}/libgksu/test-gksu.c \
- ${WRKSRC}/po/*.po
-
-.include <bsd.port.mk>
diff --git a/sysutils/libgksu/distinfo b/sysutils/libgksu/distinfo
deleted file mode 100644
index fe19b5244cc3..000000000000
--- a/sysutils/libgksu/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (libgksu-2.0.12.tar.gz) = 22f9cfc3627dcb6774b9aff66c6ea6554f3b34b82bbfa2467b821e67874c3faf
-SIZE (libgksu-2.0.12.tar.gz) = 477903
diff --git a/sysutils/libgksu/files/patch-Makefile.in b/sysutils/libgksu/files/patch-Makefile.in
deleted file mode 100644
index ad61e4648945..000000000000
--- a/sysutils/libgksu/files/patch-Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.in.o 2011-04-13 15:10:53.221097086 +0000
-+++ Makefile.in 2011-04-13 15:11:33.181096740 +0000
-@@ -731,11 +731,11 @@
- @INTLTOOL_SCHEMAS_RULE@
-
- @GCONF_SCHEMAS_INSTALL_TRUE@install-data-local:
--@GCONF_SCHEMAS_INSTALL_TRUE@ if test -z "$(DESTDIR)" ; then \
--@GCONF_SCHEMAS_INSTALL_TRUE@ for p in $(schemas_DATA) ; do \
--@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
--@GCONF_SCHEMAS_INSTALL_TRUE@ done \
--@GCONF_SCHEMAS_INSTALL_TRUE@ fi
-+@GCONF_SCHEMAS_INSTALL_TRUE@ if test -z "$(DESTDIR)" ; then \
-+@GCONF_SCHEMAS_INSTALL_TRUE@ for p in $(schemas_DATA) ; do \
-+@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
-+@GCONF_SCHEMAS_INSTALL_TRUE@ done \
-+@GCONF_SCHEMAS_INSTALL_TRUE@ fi
- @GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/sysutils/libgksu/files/patch-libgksu_gksu-run-helper.c b/sysutils/libgksu/files/patch-libgksu_gksu-run-helper.c
deleted file mode 100644
index 1cfb48d65f2e..000000000000
--- a/sysutils/libgksu/files/patch-libgksu_gksu-run-helper.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgksu/gksu-run-helper.c.o 2011-04-12 16:47:38.000000000 +0000
-+++ libgksu/gksu-run-helper.c 2011-04-12 16:49:14.000000000 +0000
-@@ -110,6 +110,7 @@
- return 1;
- }
-
-+ sleep(2);
- fprintf (stderr, "gksu: waiting\n");
-
- xauth_file = g_strdup_printf ("%s/.Xauthority",
diff --git a/sysutils/libgksu/files/patch-libgksu_libgksu.c b/sysutils/libgksu/files/patch-libgksu_libgksu.c
deleted file mode 100644
index ba6a8aca0a9a..000000000000
--- a/sysutils/libgksu/files/patch-libgksu_libgksu.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- libgksu/libgksu.c.orig 2009-03-04 18:53:02.000000000 +0000
-+++ libgksu/libgksu.c 2011-04-12 16:45:53.000000000 +0000
-@@ -23,13 +23,15 @@
- #include <unistd.h>
- #include <string.h>
- #include <fcntl.h>
--#include <pty.h>
- #include <pwd.h>
-+#include <sys/ioctl.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
- #include <sys/select.h>
- #include <errno.h>
-+#include <termios.h>
-+#include <libutil.h>
-
- #include <glibtop.h>
- #include <glibtop/procstate.h>
-@@ -2190,8 +2192,6 @@
- write (fdpty, line, strlen(line));
- g_free (line);
-
-- tcdrain (fdpty);
--
- bzero (buf, 256);
- read (fdpty, buf, 255);
-
diff --git a/sysutils/libgksu/files/patch-revert-forkpty b/sysutils/libgksu/files/patch-revert-forkpty
deleted file mode 100644
index 969a0e251b02..000000000000
--- a/sysutils/libgksu/files/patch-revert-forkpty
+++ /dev/null
@@ -1,365 +0,0 @@
-This patch fixes an issue where gksudo would successfully authenticate
-the user, but fail to run the requested command. This was caused by
-gksudo forking a new PTY, meaning that different TTY was used for the
-"sudo -v" command and subsequent "sudo -n ..." command. Whilst this used
-to work, newer versions of sudo used per TTY authentication caching.
-Patch taken from Arch Linux: https://aur.archlinux.org/packages/libgksu/
-
---- libgksu/libgksu.c.orig 2009-06-29 13:48:24.000000000 -0400
-+++ libgksu/libgksu.c 2010-01-12 07:32:10.450657456 -0500
-@@ -1,7 +1,6 @@
- /*
- * Gksu -- a library providing access to su functionality
- * Copyright (C) 2004-2009 Gustavo Noronha Silva
-- * Portions Copyright (C) 2009 VMware, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
-@@ -56,9 +55,6 @@
- static void
- gksu_context_launch_complete (GksuContext *context);
-
--static void
--read_line (int fd, gchar *buffer, int n);
--
- GType
- gksu_error_get_type (void)
- {
-@@ -2009,8 +2005,6 @@ gksu_su_fuller (GksuContext *context,
- for (i = 0 ; cmd[i] != NULL ; i++)
- g_free (cmd[i]);
- g_free(cmd);
--
-- _exit(1);
- }
- else if (pid == -1)
- {
-@@ -2125,10 +2119,10 @@ gksu_su_fuller (GksuContext *context,
- /* drop the \n echoed on password entry if su did request
- a password */
- if (password_needed)
-- read_line (fdpty, buf, 255);
-+ read (fdpty, buf, 255);
- if (context->debug)
- fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf);
-- read_line (fdpty, buf, 255);
-+ read (fdpty, buf, 255);
- if (context->debug)
- fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf);
- }
-@@ -2142,9 +2136,7 @@ gksu_su_fuller (GksuContext *context,
- {
- int retval = 0;
-
-- /* Red Hat's su shows the full path to su in its error messages. */
-- if (!strncmp (buf, "su:", 3) ||
-- !strncmp (buf, "/bin/su:", 7))
-+ if (!strncmp (buf, "su", 2))
- {
- gchar **strings;
-
-@@ -2155,11 +2147,7 @@ gksu_su_fuller (GksuContext *context,
- }
-
- strings = g_strsplit (buf, ":", 2);
--
-- /* Red Hat and Fedora use 'incorrect password'. */
-- if (strings[1] &&
-- (g_str_has_prefix(strings[1], " Authentication failure") ||
-- g_str_has_prefix(strings[1], " incorrect password")))
-+ if (strings[1] && !strncmp (strings[1], " Authentication failure", 23))
- {
- if (used_gnome_keyring)
- g_set_error (error, gksu_quark,
-@@ -2473,12 +2461,6 @@ gksu_sudo_fuller (GksuContext *context,
- {
- char **cmd;
- char buffer[256] = {0};
-- char *child_stderr = NULL;
-- /* This command is used to gain a token */
-- char *const verifycmd[] =
-- {
-- "/usr/bin/sudo", "-p", "GNOME_SUDO_PASS", "-v", NULL
-- };
- int argcount = 8;
- int i, j;
-
-@@ -2489,8 +2471,9 @@ gksu_sudo_fuller (GksuContext *context,
-
- pid_t pid;
- int status;
-- FILE *fdfile = NULL;
-- int fdpty = -1;
-+ FILE *infile, *outfile;
-+ int parent_pipe[2]; /* For talking to the parent */
-+ int child_pipe[2]; /* For talking to the child */
-
- context->sudo_mode = TRUE;
-
-@@ -2565,10 +2548,6 @@ gksu_sudo_fuller (GksuContext *context,
- cmd[argcount] = g_strdup("-S");
- argcount++;
-
-- /* Make sudo noninteractive (we should already have a token) */
-- cmd[argcount] = g_strdup("-n");
-- argcount++;
--
- /* Make sudo use next arg as prompt */
- cmd[argcount] = g_strdup("-p");
- argcount++;
-@@ -2647,21 +2626,26 @@ gksu_sudo_fuller (GksuContext *context,
- fprintf (stderr, "cmd[%d]: %s\n", i, cmd[i]);
- }
-
-- pid = forkpty(&fdpty, NULL, NULL, NULL);
-- if (pid == 0)
-+ if ((pipe(parent_pipe)) == -1)
- {
-- // Child
-- setsid(); // make us session leader
--
-- execv(verifycmd[0], verifycmd);
-+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
-+ _("Error creating pipe: %s"),
-+ strerror(errno));
-+ sudo_reset_xauth (context, xauth, xauth_env);
-+ return FALSE;
-+ }
-
-- g_set_error (error, gksu_quark, GKSU_ERROR_EXEC,
-- _("Failed to exec new process: %s"),
-+ if ((pipe(child_pipe)) == -1)
-+ {
-+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
-+ _("Error creating pipe: %s"),
- strerror(errno));
- sudo_reset_xauth (context, xauth, xauth_env);
- return FALSE;
- }
-- else if (pid == -1)
-+
-+ pid = fork();
-+ if (pid == -1)
- {
- g_set_error (error, gksu_quark, GKSU_ERROR_FORK,
- _("Failed to fork new process: %s"),
-@@ -2669,26 +2653,56 @@ gksu_sudo_fuller (GksuContext *context,
- sudo_reset_xauth (context, xauth, xauth_env);
- return FALSE;
- }
-+ else if (pid == 0)
-+ {
-+ // Child
-+ setsid(); // make us session leader
-+ close(child_pipe[1]);
-+ dup2(child_pipe[0], STDIN_FILENO);
-+ dup2(parent_pipe[1], STDERR_FILENO);
-
-+ execv(cmd[0], cmd);
-+
-+ g_set_error (error, gksu_quark, GKSU_ERROR_EXEC,
-+ _("Failed to exec new process: %s"),
-+ strerror(errno));
-+ sudo_reset_xauth (context, xauth, xauth_env);
-+ return FALSE;
-+ }
- else
- {
- gint counter = 0;
- gchar *cmdline = NULL;
-- struct termios tio;
-
- // Parent
-- fdfile = fdopen(fdpty, "w+");
-+ close(parent_pipe[1]);
-
-- /* make sure we notice that ECHO is turned off, if it gets
-- turned off */
-- tcgetattr (fdpty, &tio);
-- for (counter = 0; (tio.c_lflag & ECHO) && counter < 15; counter++)
-- {
-- usleep (1000);
-- tcgetattr (fdpty, &tio);
-- }
-+ infile = fdopen(parent_pipe[0], "r");
-+ if (!infile)
-+ {
-+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
-+ _("Error opening pipe: %s"),
-+ strerror(errno));
-+ sudo_reset_xauth (context, xauth, xauth_env);
-+ return FALSE;
-+ }
-
-- fcntl (fdpty, F_SETFL, O_NONBLOCK);
-+ outfile = fdopen(child_pipe[1], "w");
-+ if (!outfile)
-+ {
-+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
-+ _("Error opening pipe: %s"),
-+ strerror(errno));
-+ sudo_reset_xauth (context, xauth, xauth_env);
-+ return FALSE;
-+ }
-+
-+ /*
-+ we are expecting to receive a GNOME_SUDO_PASS
-+ if we don't there are two possibilities: an error
-+ or a password is not needed
-+ */
-+ fcntl (parent_pipe[0], F_SETFL, O_NONBLOCK);
-
- { /* no matter if we can read, since we're using
- O_NONBLOCK; this is just to avoid the prompt
-@@ -2697,11 +2711,11 @@ gksu_sudo_fuller (GksuContext *context,
- struct timeval tv;
-
- FD_ZERO(&rfds);
-- FD_SET(fdpty, &rfds);
-+ FD_SET(parent_pipe[0], &rfds);
- tv.tv_sec = 1;
- tv.tv_usec = 0;
-
-- select (fdpty + 1, &rfds, NULL, NULL, &tv);
-+ select (parent_pipe[0] + 1, &rfds, NULL, NULL, &tv);
- }
-
- /* Try hard to find the prompt; it may happen that we're
-@@ -2713,7 +2727,7 @@ gksu_sudo_fuller (GksuContext *context,
- if (strncmp (buffer, "GNOME_SUDO_PASS", 15) == 0)
- break;
-
-- read_line (fdpty, buffer, 256);
-+ read_line (parent_pipe[0], buffer, 256);
-
- if (context->debug)
- fprintf (stderr, "buffer: -%s-\n", buffer);
-@@ -2747,17 +2761,18 @@ gksu_sudo_fuller (GksuContext *context,
-
- usleep (1000);
-
-- write (fdpty, password, strlen(password) + 1);
-- write (fdpty, "\n", 1);
-+ fprintf (outfile, "%s\n", password);
-+ fclose (outfile);
-
- nullify_password (password);
-
-- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK);
-+ /* turn NONBLOCK off */
-+ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK);
- /* ignore the first newline that comes right after sudo receives
- the password */
-- fgets (buffer, 255, fdfile);
-- /* this is the status we are interested in */
-- fgets (buffer, 255, fdfile);
-+ fgets (buffer, 255, infile);
-+ /* this is the status we are interessted in */
-+ fgets (buffer, 255, infile);
- }
- else
- {
-@@ -2766,7 +2781,7 @@ gksu_sudo_fuller (GksuContext *context,
- fprintf (stderr, "No password prompt found; we'll assume we don't need a password.\n");
-
- /* turn NONBLOCK off, also if have no prompt */
-- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK);
-+ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK);
-
- should_display = gconf_client_get_bool (context->gconf_client,
- BASE_PATH "display-no-pass-info", NULL);
-@@ -2785,9 +2800,14 @@ gksu_sudo_fuller (GksuContext *context,
- fprintf (stderr, "%s", buffer);
- }
-
-- if (g_str_has_prefix (buffer, "Sorry, try again."))
-+ if (!strcmp (buffer, "Sorry, try again.\n"))
- g_set_error (error, gksu_quark, GKSU_ERROR_WRONGPASS,
- _("Wrong password."));
-+ else if (!strncmp (buffer, "Sorry, user ", 12))
-+ g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED,
-+ _("The underlying authorization mechanism (sudo) "
-+ "does not allow you to run this program. Contact "
-+ "the system administrator."));
- else
- {
- gchar *haystack = buffer;
-@@ -2805,10 +2825,6 @@ gksu_sudo_fuller (GksuContext *context,
- }
- }
-
-- /* If we have an error, let's just stop sudo right there. */
-- if (error)
-- close(fdpty);
--
- cmdline = g_strdup("sudo");
- /* wait for the child process to end or become something other
- than sudo */
-@@ -2825,23 +2841,17 @@ gksu_sudo_fuller (GksuContext *context,
- if (context->sn_context)
- gksu_context_launch_complete (context);
-
-+ while (read (parent_pipe[0], buffer, 255) > 0)
-+ {
-+ fprintf (stderr, "%s", buffer);
-+ bzero(buffer, 256);
-+ }
-+
- /* if the process is still active waitpid() on it */
- if (pid_exited != pid)
- waitpid(pid, &status, 0);
- sudo_reset_xauth (context, xauth, xauth_env);
-
-- /*
-- * Did token acquisition succeed? If so, spawn sudo in
-- * non-interactive mode. It should either succeed or die
-- * immediately if you're not allowed to run the command.
-- */
-- if (WEXITSTATUS(status) == 0)
-- {
-- g_spawn_sync(NULL, cmd, NULL, 0, NULL, NULL,
-- NULL, &child_stderr, &status,
-- error);
-- }
--
- if (exit_status)
- {
- if (WIFEXITED(status)) {
-@@ -2853,13 +2863,6 @@ gksu_sudo_fuller (GksuContext *context,
-
- if (WEXITSTATUS(status))
- {
-- if (g_str_has_prefix(child_stderr, "Sorry, user "))
-- {
-- g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED,
-- _("The underlying authorization mechanism (sudo) "
-- "does not allow you to run this program. Contact "
-- "the system administrator."));
-- }
- if(cmdline)
- {
- /* sudo already exec()ed something else, don't report
-@@ -2868,7 +2871,6 @@ gksu_sudo_fuller (GksuContext *context,
- if (!g_str_has_suffix (cmdline, "sudo"))
- {
- g_free (cmdline);
-- g_free (child_stderr);
- return FALSE;
- }
- g_free (cmdline);
-@@ -2881,11 +2883,11 @@ gksu_sudo_fuller (GksuContext *context,
- }
- }
-
-- fprintf(stderr, child_stderr);
-- g_free(child_stderr);
--
- /* if error is set we have found an error condition */
-- return (error == NULL);
-+ if (error)
-+ return FALSE;
-+
-+ return TRUE;
- }
-
- /**
diff --git a/sysutils/libgksu/pkg-descr b/sysutils/libgksu/pkg-descr
deleted file mode 100644
index 6671feb25c6d..000000000000
--- a/sysutils/libgksu/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-This library comes from the gksu program. It provides a simple API to use su
-and sudo in programs that need to execute tasks as other user. It provides X
-authentication facilities for running programs in a X session.
-
-WWW: http://www.gnu.org/non-gnu/gksu/
diff --git a/sysutils/libgksu/pkg-plist b/sysutils/libgksu/pkg-plist
deleted file mode 100644
index dbf97c21e4e1..000000000000
--- a/sysutils/libgksu/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-bin/gksu-properties
-include/libgksu/gksu.h
-include/libgksu/libgksu.h
-lib/libgksu2.a
-lib/libgksu2.so
-lib/libgksu2.so.0
-lib/libgksu2.so.0.0.2
-lib/libgksu/gksu-run-helper
-libdata/pkgconfig/libgksu2.pc
-man/man1/gksu-properties.1.gz
-share/applications/gksu-properties.desktop
-share/libgksu/gksu-properties.ui
-share/pixmaps/gksu.png
diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index 8acbb5c0fcef..732613f5e3c7 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -60,7 +60,6 @@
SUBDIR += libwraster
SUBDIR += lwm
SUBDIR += lxappearance-obconf
- SUBDIR += lxmed
SUBDIR += lxqt
SUBDIR += lxqt-panel
SUBDIR += lxqt-session
diff --git a/x11-wm/lxmed/Makefile b/x11-wm/lxmed/Makefile
deleted file mode 100644
index b92f13be7224..000000000000
--- a/x11-wm/lxmed/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-PORTNAME= lxmed
-PORTVERSION= 20120515
-PORTREVISION= 3
-CATEGORIES= x11-wm java
-MASTER_SITES= SF/${PORTNAME}/
-DIST_SUBDIR= java
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= LXDE Main Menu Editor
-
-LICENSE= GPLv3
-
-RUN_DEPENDS= gksu:sysutils/gksu
-
-WRKSRC= ${WRKDIR}/${PORTNAME}
-
-USE_JAVA= yes
-NO_BUILD= yes
-
-DATADIR= ${JAVASHAREDIR}/${PORTNAME}
-
-SUB_FILES= ${PORTNAME}.sh ${PORTNAME}-root
-
-post-extract:
- @(cd ${WRKSRC}/content/ && ${CP} -a ${PORTNAME}.desktop \
- ${PORTNAME}-root.desktop)
-
-post-patch:
- @${REINPLACE_CMD} -e 's|/opt/lxmed/${PORTNAME}.png|${PORTNAME}|; \
- s|Main Menu Editor|${COMMENT}|' \
- ${WRKSRC}/content/${PORTNAME}.desktop
- @${REINPLACE_CMD} -e 's|/opt/lxmed/${PORTNAME}.png|${PORTNAME}|; \
- s|Exec=lxmed|Exec=${PORTNAME}-root ${PORTNAME}|; \
- s|Main Menu Editor|${COMMENT} (as root)|' \
- ${WRKSRC}/content/${PORTNAME}-root.desktop
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh \
- ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
- ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-root \
- ${STAGEDIR}${PREFIX}/bin/
- @${MKDIR} ${STAGEDIR}${DATADIR}
- ${CP} -a ${FILESDIR}/pc-su ${STAGEDIR}${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/content/LXMenuEditor.jar ${STAGEDIR}${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/content/${PORTNAME}.png \
- ${STAGEDIR}${PREFIX}/share/pixmaps/
- ${INSTALL_DATA} ${WRKSRC}/content/*.desktop ${STAGEDIR}${DESKTOPDIR}
-
-.include <bsd.port.mk>
diff --git a/x11-wm/lxmed/distinfo b/x11-wm/lxmed/distinfo
deleted file mode 100644
index de2e6bc39f72..000000000000
--- a/x11-wm/lxmed/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (java/lxmed-20120515.tar.gz) = 156318768dc4440fdf851cb7eeedfa96678382eca05ce52a8766936ab5d10cca
-SIZE (java/lxmed-20120515.tar.gz) = 80181
diff --git a/x11-wm/lxmed/files/lxmed-root.in b/x11-wm/lxmed/files/lxmed-root.in
deleted file mode 100644
index 2c4950a3609b..000000000000
--- a/x11-wm/lxmed/files/lxmed-root.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-cd "%%DATADIR%%" && exec pc-su "${@}"
diff --git a/x11-wm/lxmed/files/lxmed.sh.in b/x11-wm/lxmed/files/lxmed.sh.in
deleted file mode 100644
index 2e6d9f3650b5..000000000000
--- a/x11-wm/lxmed/files/lxmed.sh.in
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
--jar "%%DATADIR%%/LXMenuEditor.jar" "${@}"
diff --git a/x11-wm/lxmed/files/pc-su b/x11-wm/lxmed/files/pc-su
deleted file mode 100644
index 87c6ea74a21b..000000000000
--- a/x11-wm/lxmed/files/pc-su
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# Wrapper script which finds the right "su" program
-# to use for graphical root execution
-
-if [ `id -r -u` != "0" ] ; then
- VARS="`echo $@`"
-
- # Try qsudo first, should always be the default
- which qsudo >/dev/null 2>/dev/null
- if [ $? -eq 0 ] ; then
- qsudo $VARS
- exit $?
- fi
-
- # Now try gksu
- which gksu >/dev/null 2>/dev/null
- if [ $? -eq 0 ] ; then
- gksu -a "$VARS"
- exit $?
- fi
-
- # Lastly we have kdesu
- which kdesu >/dev/null 2>/dev/null
- if [ $? -eq 0 ] ; then
- kdesu -t -c "$VARS"
- exit $?
- fi
-
- # If no utility could be found...
- echo "No graphical switch-user utility found!"
- exit 1
-else
- ${@}
-fi
diff --git a/x11-wm/lxmed/pkg-descr b/x11-wm/lxmed/pkg-descr
deleted file mode 100644
index 32e309464969..000000000000
--- a/x11-wm/lxmed/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-LXMenuEditor is a small, simple, free, open source, easy to use application
-that allows you to customize the LXDE menu.
-
-LXMenuEditor is very useful for people that want to create their own,
-customized menus for LXDE.
-
-This editor can also be used to customize GNOME's main menu and menus
-of other enviroments, although it's specially designed for the LXDE environment.
-
-WWW: http://lxmed.sourceforge.net/
diff --git a/x11-wm/lxmed/pkg-plist b/x11-wm/lxmed/pkg-plist
deleted file mode 100644
index 1752a6564e8c..000000000000
--- a/x11-wm/lxmed/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/lxmed
-bin/lxmed-root
-share/applications/lxmed-root.desktop
-share/applications/lxmed.desktop
-%%DATADIR%%/LXMenuEditor.jar
-%%DATADIR%%/pc-su
-share/pixmaps/lxmed.png