Collapse zenity3 into zenity. This should resolve a conflict between the two.

And since zenity is just a binary there shouldn't be any conflict with stuff
using it.

Discussed with:	marcus and mezz


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

12 files changed, 38 insertions, 771 deletions

diff --git a/RMPORTS b/RMPORTS
index ff99b2ac3..a245cb138 100644
--- a/RMPORTS
+++ b/RMPORTS
@@ -4,3 +4,4 @@ devel/gir-repository/||%DATE%|removed
 graphics/gir-repository-goocanvas||%DATE%|removed
 x11-toolkits/gir-repository-vte||%DATE%|removed
 x11/yelp-xsl|textproc/yelp-xsl|%DATE%|moved to beter location
+x11/zenity3|x11/zenity|%DATE%|collapsed into x11/zenity
diff --git a/repo-copy b/repo-copy
index 634568e3e..24f651aef 100644
--- a/repo-copy
+++ b/repo-copy
@@ -52,6 +52,6 @@ x11/gnome-panel -> x11/gnome-panel3
 x11/gnome-screensaver -> x11/gnome-screensaver3
 x11/gnome-terminal -> x11/gnome-terminal3
 x11/gnome2 -> x11/gnome3
+x11/gnome2-lite -> x11/gnome3-lite
 x11/libgnomekbd -> x11/libgnomekbd3
 x11/yelp -> x11/yelp3
-x11/zenity -> x11/zenity3
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
index 873bab666..7aa597163 100644
--- a/x11-wm/mutter/Makefile
+++ b/x11-wm/mutter/Makefile
@@ -3,11 +3,12 @@
 # Whom:                Pawel Worach <pawel.worach@gmail.com>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-wm/mutter/Makefile,v 1.20 2011/03/23 15:51:18 kwm Exp $
+#   $MCom: ports/x11-wm/mutter/Makefile,v 1.21 2011/03/29 15:15:40 kwm Exp $
 #
 
 PORTNAME=	mutter
 PORTVERSION=	2.91.93
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -15,13 +16,13 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Window and compositing manager based on Clutter
 
-BUILD_DEPENDS=	zenity:${PORTSDIR}/x11/zenity3 \
+BUILD_DEPENDS=	zenity:${PORTSDIR}/x11/zenity \
 		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
 		execinfo.1:${PORTSDIR}/devel/libexecinfo \
 		clutter-glx-1.0:${PORTSDIR}/graphics/clutter \
 		canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3
-RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity3
+RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity
 
 USE_BZIP2=	yes
 USE_XORG=	x11 xext xrandr xcomposite xcursor xinerama ice sm
diff --git a/x11/gdm3/Makefile b/x11/gdm3/Makefile
index 2cc12e9a9..32c2f74b9 100644
--- a/x11/gdm3/Makefile
+++ b/x11/gdm3/Makefile
@@ -3,12 +3,12 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gdm3/Makefile,v 1.3 2011/03/28 07:05:09 kwm Exp $
+#   $MCom: ports/x11/gdm3/Makefile,v 1.4 2011/03/31 15:32:02 kwm Exp $
 #
 
 PORTNAME=	gdm
 PORTVERSION=	2.91.94
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -16,7 +16,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 version of xdm display manager
 
-BUILD_DEPENDS=	zenity:${PORTSDIR}/x11/zenity3 \
+BUILD_DEPENDS=	zenity:${PORTSDIR}/x11/zenity \
     		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 LIB_DEPENDS=	ck-connector.0:${PORTSDIR}/sysutils/consolekit \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
@@ -27,7 +27,7 @@ LIB_DEPENDS=	ck-connector.0:${PORTSDIR}/sysutils/consolekit \
 		accountsservice.0:${PORTSDIR}/sysutils/accountsservice \
 		xklavier.12:${PORTSDIR}/x11/libxklavier \
 		canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3
-RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity3 \
+RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity \
 		gnome-settings-daemon>=2.91.0:${PORTSDIR}/sysutils/gnome-settings-daemon3 \
 		gnome-session>=2.91.0:${PORTSDIR}/x11/gnome-session3 \
 		${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core \
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 03ccc5ea6..446b847d6 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -3,30 +3,29 @@
 # Whom:					Franz Klammer <klammer@webonaut.com>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/zenity/Makefile,v 1.111 2010/11/16 10:25:21 kwm Exp $
+#   $MCom: ports/x11/zenity3/Makefile,v 1.5 2011/03/08 20:16:28 kwm Exp $
 #
 
 PORTNAME=	zenity
-PORTVERSION=	2.32.1
-PORTREVISION=	1
+PORTVERSION=	2.91.90
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
+DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Display GNOME dialogs from the command line
 
-BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
-RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
-
+LICENSE=	LGPL20
+LICENSE_FILE=	${WRKSRC}/COPYING
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gtk20 gnomedocutils intlhack
+USE_GNOME=	gnomeprefix gnomehack gtk30 gnomedocutils intlhack
+USE_XORG=	x11
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+		LDFLAGS="-L${LOCALBASE}/lib" LIBS="${PTHREAD_LIBS}"
 
 MAN1=		zenity.1
 
@@ -34,7 +33,7 @@ CONFLICTS=	gtkada-1.2.*
 
 OPTIONS=	NOTIFY "Enable libnotify support" on
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if !defined(WITHOUT_NOTIFY)
 LIB_DEPENDS+=		notify.4:${PORTSDIR}/devel/libnotify
@@ -43,4 +42,4 @@ CONFIGURE_ARGS+=	--enable-libnotify
 CONFIGURE_ARGS+=	--disable-libnotify
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index 5457446a9..254b500b1 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/zenity-2.32.1.tar.bz2) = 8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac
-SIZE (gnome2/zenity-2.32.1.tar.bz2) = 3128666
+SHA256 (gnome3/zenity-2.91.90.tar.bz2) = fb3b0d29ae7105170224c2400327f638fdf9789189c6167ecddc0c941fc9c996
+SIZE (gnome3/zenity-2.91.90.tar.bz2) = 3163193
diff --git a/x11/zenity/files/patch-src_notification.c b/x11/zenity/files/patch-src_notification.c
deleted file mode 100644
index 8adaef867..000000000
--- a/x11/zenity/files/patch-src_notification.c
+++ /dev/null
@@ -1,284 +0,0 @@
-From 620d5505c59b5b5dd092bfa35bdf3e7723f1e7c3 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <jmccann@redhat.com>
-Date: Sat, 09 Oct 2010 08:59:44 +0000
-Subject: Require libnotify 0.6.1
-
-https://bugzilla.gnome.org/show_bug.cgi?id=631737
----
-diff --git a/src/notification.c b/src/notification.c
-index 99a2e36..531aed2 100644
---- src/notification.c
-+++ src/notification.c
-@@ -24,75 +24,31 @@
- 
- #include <config.h>
- 
-+#include <unistd.h>
-+#include <stdlib.h>
- #include <gtk/gtk.h>
- #include <time.h>
- #include <string.h>
--
--#ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
--#endif
- 
- #include "zenity.h"
- #include "util.h"
- 
--static GtkStatusIcon *status_icon;
--static gchar *icon_file;
--static const gchar *icon_stock;
--static gint icon_size;
-+static char *icon_file;
- 
- static void
--zenity_notification_icon_update (void)
-+on_notification_default_action (NotifyNotification *n,
-+                                const char         *action,
-+                                void               *user_data)
- {
--  GdkPixbuf *pixbuf;
--  GError *error = NULL;
--
--  pixbuf = gdk_pixbuf_new_from_file_at_scale (icon_file, icon_size, icon_size, TRUE, &error);
--
--  if (error) {
--    g_warning ("Could not load notification icon '%s': %s",
--               icon_file, error->message);
--    g_clear_error (&error);
--  }
--  if (!pixbuf) {
--    pixbuf = gdk_pixbuf_new_from_file_at_scale (ZENITY_IMAGE_FULLPATH ("zenity-notification.png"),
--                                                icon_size, icon_size, TRUE, NULL);
--  }
--
--  gtk_status_icon_set_from_pixbuf (status_icon, pixbuf);
--
--  if (pixbuf) {
--    g_object_unref (pixbuf);
--  }
--}
--
--static gboolean
--zenity_notification_icon_size_changed_cb (GtkStatusIcon *icon,
--					  gint size,
--					  gpointer user_data)
--{
--  icon_size = size;
--
--  /* If we're displaying not a stock icon but a custom pixbuf,
--   * we need to update the icon for the new size.
--   */
--  if (!icon_stock) {
--    zenity_notification_icon_update ();
--
--    return TRUE;
--  }
-+  ZenityData *zen_data;
- 
--  return FALSE;
--}
-+  zen_data = (ZenityData *)user_data;
-+  notify_notification_close (n, NULL);
- 
--static gboolean
--zenity_notification_icon_activate_cb (GtkWidget *widget,
--				      ZenityData *data)
--{
--  data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
-+  zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
- 
-   gtk_main_quit ();
--
--  return TRUE;
- }
- 
- static gboolean
-@@ -145,26 +101,14 @@ zenity_notification_handle_stdin (GIOChannel *channel,
-       while (*value && g_ascii_isspace (*value)) value++;
- 
-       if (!g_ascii_strcasecmp (command, "icon")) {
--        icon_stock = zenity_util_stock_from_filename (value);
--
-         g_free (icon_file);
-         icon_file = g_strdup (value);
--
--        if (icon_stock) {
--          gtk_status_icon_set_from_stock (status_icon, icon_stock);
--        } else if (gtk_status_icon_get_visible (status_icon) &&
--                   gtk_status_icon_is_embedded (status_icon)) {
--          zenity_notification_icon_update ();
--        }
-       } else if (!g_ascii_strcasecmp (command, "message")) {
--#ifdef HAVE_LIBNOTIFY
-         /* display a notification bubble */
-         if (!g_utf8_validate (value, -1, NULL)) {
-           g_warning ("Invalid UTF-8 in input!");
--        } else if (notify_is_initted ()) {
-+        } else {
-           NotifyNotification *notif;
--          const gchar *icon = NULL;
--          gchar *freeme = NULL;
-           gchar **message;
-           error = NULL;
- 
-@@ -178,46 +122,37 @@ zenity_notification_handle_stdin (GIOChannel *channel,
-             continue;
-           }
- 
--          if (icon_stock) {
--            icon = icon_stock;
--          } else if (icon_file) {
--            icon = freeme = g_filename_to_uri (icon_file, NULL, NULL);
--          }
--
--          notif = notify_notification_new_with_status_icon (
--                              message[0] /* title */,
--                              message[1] /* summary */,
--                              icon, status_icon);
-+          notif = notify_notification_new (message[0] /* title */,
-+                                           message[1] /* summary */,
-+                                           icon_file);
- 
-           g_strfreev (message);
--          g_free (freeme);
- 
--	  notify_notification_show (notif, &error);
--
--	  if (error) {
--	    g_warning ("Error showing notification: %s", error->message);
--	    g_error_free (error);
--	  }
-+          notify_notification_show (notif, &error);
-+          if (error) {
-+            g_warning ("Error showing notification: %s", error->message);
-+            g_error_free (error);
-+          }
- 
- 	  g_object_unref (notif);
--	} else {
--#else
--	{ /* this brace is for balance */
--#endif
-- 	  g_warning ("Notification framework not available");
--	}
-+        }
-       } else if (!g_ascii_strcasecmp (command, "tooltip")) {
--        if (g_utf8_validate (value, -1, NULL)) {
--          gtk_status_icon_set_tooltip_text (status_icon, value);
--        } else {
-+        if (!g_utf8_validate (value, -1, NULL)) {
-           g_warning ("Invalid UTF-8 in input!");
-+        } else {
-+          NotifyNotification *notif;
-+
-+          notif = notify_notification_new (value,
-+                                           NULL,
-+                                           icon_file);
-+          notify_notification_show (notif, &error);
-+          if (error) {
-+            g_warning ("Error showing notification: %s", error->message);
-+            g_error_free (error);
-+          }
-         }
-       } else if (!g_ascii_strcasecmp (command, "visible")) {
--        if (!g_ascii_strcasecmp (value, "false")) {
--          gtk_status_icon_set_visible (status_icon, FALSE);
--        } else {
--          gtk_status_icon_set_visible (status_icon, TRUE);
--	}
-+
-       } else {
- 	g_warning ("Unknown command '%s'", command);
-       }
-@@ -249,55 +184,52 @@ zenity_notification_listen_on_stdin (ZenityData *data)
- 		  zenity_notification_handle_stdin, data);
- }
- 
--void 
-+void
- zenity_notification (ZenityData *data, ZenityNotificationData *notification_data)
- {
--  status_icon = gtk_status_icon_new ();
--  g_signal_connect (status_icon, "size-changed",
--		    G_CALLBACK (zenity_notification_icon_size_changed_cb), data);
-+  GError *error;
-+  NotifyNotification *notification;
- 
--  if (notification_data->notification_text) {
--    gtk_status_icon_set_tooltip_text (status_icon, notification_data->notification_text);
--  } else {
--    gtk_status_icon_set_tooltip_text (status_icon, _("Zenity notification"));
--  }
--
--  icon_file = g_strdup (data->window_icon);
--  icon_stock = zenity_util_stock_from_filename (data->window_icon);
--
--  /* Only set the stock icon here; if we're going to display a
--   * custom pixbuf we wait for the size-changed signal to load
--   * it at the right size.
--   */
--  if (icon_stock) {
--    gtk_status_icon_set_from_stock (status_icon, icon_stock);
--  }
--
--#ifdef HAVE_LIBNOTIFY
-   /* create the notification widget */
-   if (!notify_is_initted ()) {
-     notify_init (_("Zenity notification"));
-   }
--#endif
-- 
-+
-   if (notification_data->listen) {
-     zenity_notification_listen_on_stdin (data);
-   } else {
--    /* if we aren't listening for changes, then close on activate (left-click) */
--    g_signal_connect (status_icon, "activate",
--		      G_CALLBACK (zenity_notification_icon_activate_cb), data);
--  }
-+    if (notification_data->notification_text == NULL) {
-+      exit (1);
-+    }
-+
-+    notification = notify_notification_new (notification_data->notification_text, NULL, data->window_icon);
-+    if (notification == NULL) {
-+      exit (1);
-+    }
-+
-+    /* if we aren't listening for changes, then close on default action */
-+    notify_notification_add_action (notification,
-+                                    "default",
-+                                    "Do Default Action",
-+                                    (NotifyActionCallback) on_notification_default_action,
-+                                    data,
-+                                    NULL);
-+
-+    /* Show icon and wait */
-+    error = NULL;
-+    if (!notify_notification_show (notification, &error)) {
-+      if (error != NULL) {
-+        g_warning ("Error showing notification: %s", error->message);
-+        g_error_free (error);
-+      }
-+      exit (1);
-+    }
- 
--  /* Show icon and wait */
--  gtk_status_icon_set_visible (status_icon, TRUE);
-+  }
- 
--  if(data->timeout_delay > 0) {
-+  if (data->timeout_delay > 0) {
-     g_timeout_add_seconds (data->timeout_delay, (GSourceFunc) zenity_util_timeout_handle, NULL);
-   }
- 
-   gtk_main ();
--
--  /* Cleanup */
--  g_object_unref (status_icon);
--  g_free (icon_file);
- }
---
-cgit v0.8.3.4
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index 96e303ee5..ec0f6c052 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -169,6 +169,18 @@ share/gnome/help/zenity/ru/figures/zenity-question-screenshot.png
 share/gnome/help/zenity/ru/figures/zenity-text-screenshot.png
 share/gnome/help/zenity/ru/figures/zenity-warning-screenshot.png
 share/gnome/help/zenity/ru/zenity.xml
+share/gnome/help/zenity/sl/figures/zenity-calendar-screenshot.png
+share/gnome/help/zenity/sl/figures/zenity-entry-screenshot.png
+share/gnome/help/zenity/sl/figures/zenity-error-screenshot.png
+share/gnome/help/zenity/sl/figures/zenity-fileselection-screenshot.png
+share/gnome/help/zenity/sl/figures/zenity-information-screenshot.png
+share/gnome/help/zenity/sl/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/sl/figures/zenity-notification-screenshot.png
+share/gnome/help/zenity/sl/figures/zenity-progress-screenshot.png
+share/gnome/help/zenity/sl/figures/zenity-question-screenshot.png
+share/gnome/help/zenity/sl/figures/zenity-text-screenshot.png
+share/gnome/help/zenity/sl/figures/zenity-warning-screenshot.png
+share/gnome/help/zenity/sl/zenity.xml
 share/gnome/help/zenity/sv/figures/zenity-calendar-screenshot.png
 share/gnome/help/zenity/sv/figures/zenity-entry-screenshot.png
 share/gnome/help/zenity/sv/figures/zenity-error-screenshot.png
@@ -227,6 +239,7 @@ share/locale/el/LC_MESSAGES/zenity.mo
 share/locale/en@shaw/LC_MESSAGES/zenity.mo
 share/locale/en_CA/LC_MESSAGES/zenity.mo
 share/locale/en_GB/LC_MESSAGES/zenity.mo
+share/locale/eo/LC_MESSAGES/zenity.mo
 share/locale/es/LC_MESSAGES/zenity.mo
 share/locale/et/LC_MESSAGES/zenity.mo
 share/locale/eu/LC_MESSAGES/zenity.mo
@@ -304,6 +317,7 @@ share/omf/zenity/zenity-fr.omf
 share/omf/zenity/zenity-oc.omf
 share/omf/zenity/zenity-pt_BR.omf
 share/omf/zenity/zenity-ru.omf
+share/omf/zenity/zenity-sl.omf
 share/omf/zenity/zenity-sv.omf
 share/omf/zenity/zenity-uk.omf
 share/omf/zenity/zenity-zh_CN.omf
@@ -369,6 +383,8 @@ share/omf/zenity/zenity-zh_CN.omf
 @dirrm share/gnome/help/zenity/uk
 @dirrm share/gnome/help/zenity/sv/figures
 @dirrm share/gnome/help/zenity/sv
+@dirrm share/gnome/help/zenity/sl/figures
+@dirrm share/gnome/help/zenity/sl
 @dirrm share/gnome/help/zenity/ru/figures
 @dirrm share/gnome/help/zenity/ru
 @dirrm share/gnome/help/zenity/pt_BR/figures
diff --git a/x11/zenity3/Makefile b/x11/zenity3/Makefile
deleted file mode 100644
index 309e8f260..000000000
--- a/x11/zenity3/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# New ports collection makefile for:	zenity
-# Date created:				01 Mar 2003
-# Whom:					Franz Klammer <klammer@webonaut.com>
-#
-# $FreeBSD$
-#   $MCom: ports/x11/zenity3/Makefile,v 1.4 2011/02/23 14:04:46 kwm Exp $
-#
-
-PORTNAME=	zenity
-PORTVERSION=	2.91.90
-CATEGORIES=	x11 gnome
-MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome3
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Display GNOME dialogs from the command line
-
-LICENSE=	LGPL20
-LICENSE_FILE=	${WRKSRC}/COPYING
-USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gtk30 gnomedocutils intlhack
-USE_XORG=	x11
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-GNU_CONFIGURE=	yes
-INSTALLS_OMF=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib" LIBS="${PTHREAD_LIBS}"
-
-MAN1=		zenity.1
-
-CONFLICTS=	gtkada-1.2.*
-
-OPTIONS=	NOTIFY "Enable libnotify support" on
-
-.include <bsd.port.options.mk>
-
-.if !defined(WITHOUT_NOTIFY)
-LIB_DEPENDS+=		notify.4:${PORTSDIR}/devel/libnotify
-CONFIGURE_ARGS+=	--enable-libnotify
-.else
-CONFIGURE_ARGS+=	--disable-libnotify
-.endif
-
-.include <bsd.port.mk>
diff --git a/x11/zenity3/distinfo b/x11/zenity3/distinfo
deleted file mode 100644
index 254b500b1..000000000
--- a/x11/zenity3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gnome3/zenity-2.91.90.tar.bz2) = fb3b0d29ae7105170224c2400327f638fdf9789189c6167ecddc0c941fc9c996
-SIZE (gnome3/zenity-2.91.90.tar.bz2) = 3163193
diff --git a/x11/zenity3/pkg-descr b/x11/zenity3/pkg-descr
deleted file mode 100644
index 384c19680..000000000
--- a/x11/zenity3/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Zenity allows dialog boxes to be created and displayed from the
-commandline.  This provides a simple way to create a GUI for
-a shell script.
diff --git a/x11/zenity3/pkg-plist b/x11/zenity3/pkg-plist
deleted file mode 100644
index ec0f6c052..000000000
--- a/x11/zenity3/pkg-plist
+++ /dev/null
@@ -1,416 +0,0 @@
-bin/gdialog
-bin/zenity
-share/gnome/help/zenity/C/figures/zenity-calendar-screenshot.png
-share/gnome/help/zenity/C/figures/zenity-entry-screenshot.png
-share/gnome/help/zenity/C/figures/zenity-error-screenshot.png
-share/gnome/help/zenity/C/figures/zenity-fileselection-screenshot.png
-share/gnome/help/zenity/C/figures/zenity-information-screenshot.png
-share/gnome/help/zenity/C/figures/zenity-list-screenshot.png
-share/gnome/help/zenity/C/figures/zenity-notification-screenshot.png
-share/gnome/help/zenity/C/figures/zenity-progress-screenshot.png
-share/gnome/help/zenity/C/figures/zenity-question-screenshot.png
-share/gnome/help/zenity/C/figures/zenity-text-screenshot.png
-share/gnome/help/zenity/C/figures/zenity-warning-screenshot.png
-share/gnome/help/zenity/C/legal.xml
-share/gnome/help/zenity/C/zenity.xml
-share/gnome/help/zenity/bg/figures/zenity-calendar-screenshot.png
-share/gnome/help/zenity/bg/figures/zenity-entry-screenshot.png
-share/gnome/help/zenity/bg/figures/zenity-error-screenshot.png
-share/gnome/help/zenity/bg/figures/zenity-fileselection-screenshot.png
-share/gnome/help/zenity/bg/figures/zenity-information-screenshot.png
-share/gnome/help/zenity/bg/figures/zenity-list-screenshot.png
-share/gnome/help/zenity/bg/figures/zenity-notification-screenshot.png
-share/gnome/help/zenity/bg/figures/zenity-progress-screenshot.png
-share/gnome/help/zenity/bg/figures/zenity-question-screenshot.png
-share/gnome/help/zenity/bg/figures/zenity-text-screenshot.png
-share/gnome/help/zenity/bg/figures/zenity-warning-screenshot.png
-share/gnome/help/zenity/bg/zenity.xml
-share/gnome/help/zenity/cs/figures/zenity-calendar-screenshot.png
-share/gnome/help/zenity/cs/figures/zenity-entry-screenshot.png
-share/gnome/help/zenity/cs/figures/zenity-error-screenshot.png
-share/gnome/help/zenity/cs/figures/zenity-fileselection-screenshot.png
-share/gnome/help/zenity/cs/figures/zenity-information-screenshot.png
-share/gnome/help/zenity/cs/figures/zenity-list-screenshot.png
-share/gnome/help/zenity/cs/figures/zenity-notification-screenshot.png
-share/gnome/help/zenity/cs/figures/zenity-progress-screenshot.png
-share/gnome/help/zenity/cs/figures/zenity-question-screenshot.png
-share/gnome/help/zenity/cs/figures/zenity-text-screenshot.png
-share/gnome/help/zenity/cs/figures/zenity-warning-screenshot.png
-share/gnome/help/zenity/cs/zenity.xml
-share/gnome/help/zenity/da/figures/zenity-calendar-screenshot.png
-share/gnome/help/zenity/da/figures/zenity-entry-screenshot.png
-share/gnome/help/zenity/da/figures/zenity-error-screenshot.png
-share/gnome/help/zenity/da/figures/zenity-fileselection-screenshot.png
-share/gnome/help/zenity/da/figures/zenity-information-screenshot.png
-share/gnome/help/zenity/da/figures/zenity-list-screenshot.png
-share/gnome/help/zenity/da/figures/zenity-notification-screenshot.png
-share/gnome/help/zenity/da/figures/zenity-progress-screenshot.png
-share/gnome/help/zenity/da/figures/zenity-question-screenshot.png
-share/gnome/help/zenity/da/figures/zenity-text-screenshot.png
-share/gnome/help/zenity/da/figures/zenity-warning-screenshot.png
-share/gnome/help/zenity/da/zenity.xml
-share/gnome/help/zenity/de/figures/zenity-calendar-screenshot.png
-share/gnome/help/zenity/de/figures/zenity-entry-screenshot.png
-share/gnome/help/zenity/de/figures/zenity-error-screenshot.png
-share/gnome/help/zenity/de/figures/zenity-fileselection-screenshot.png
-share/gnome/help/zenity/de/figures/zenity-information-screenshot.png
-share/gnome/help/zenity/de/figures/zenity-list-screenshot.png
-share/gnome/help/zenity/de/figures/zenity-notification-screenshot.png
-share/gnome/help/zenity/de/figures/zenity-progress-screenshot.png
-share/gnome/help/zenity/de/figures/zenity-question-screenshot.png
-share/gnome/help/zenity/de/figures/zenity-text-screenshot.png
-share/gnome/help/zenity/de/figures/zenity-warning-screenshot.png
-share/gnome/help/zenity/de/zenity.xml
-share/gnome/help/zenity/el/figures/zenity-calendar-screenshot.png
-share/gnome/help/zenity/el/figures/zenity-entry-screenshot.png
-share/gnome/help/zenity/el/figures/zenity-error-screenshot.png
-share/gnome/help/zenity/el/figures/zenity-fileselection-screenshot.png
-share/gnome/help/zenity/el/figures/zenity-information-screenshot.png
-share/gnome/help/zenity/el/figures/zenity-list-screenshot.png
-share/gnome/help/zenity/el/figures/zenity-notification-screenshot.png
-share/gnome/help/zenity/el/figures/zenity-progress-screenshot.png
-share/gnome/help/zenity/el/figures/zenity-question-screenshot.png
-share/gnome/help/zenity/el/figures/zenity-text-screenshot.png
-share/gnome/help/zenity/el/figures/zenity-warning-screenshot.png
-share/gnome/help/zenity/el/zenity.xml
-share/gnome/help/zenity/en_GB/figures/zenity-calendar-screenshot.png
-share/gnome/help/zenity/en_GB/figures/zenity-entry-screenshot.png
-share/gnome/help/zenity/en_GB/figures/zenity-error-screenshot.png
-share/gnome/help/zenity/en_GB/figures/zenity-fileselection-screenshot.png
-share/gnome/help/zenity/en_GB/figures/zenity-information-screenshot.png
-share/gnome/help/zenity/en_GB/figures/zenity-list-screenshot.png
-share/gnome/help/zenity/en_GB/figures/zenity-notification-screenshot.png
-share/gnome/help/zenity/en_GB/figures/zenity-progress-screenshot.png
-share/gnome/help/zenity/en_GB/figures/zenity-question-screenshot.png
-share/gnome/help/zenity/en_GB/figures/zenity-text-screenshot.png
-share/gnome/help/zenity/en_GB/figures/zenity-warning-screenshot.png
-share/gnome/help/zenity/en_GB/zenity.xml
-share/gnome/help/zenity/es/figures/zenity-calendar-screenshot.png
-share/gnome/help/zenity/es/figures/zenity-entry-screenshot.png
-share/gnome/help/zenity/es/figures/zenity-error-screenshot.png
-share/gnome/help/zenity/es/figures/zenity-fileselection-screenshot.png
-share/gnome/help/zenity/es/figures/zenity-information-screenshot.png
-share/gnome/help/zenity/es/figures/zenity-list-screenshot.png
-share/gnome/help/zenity/es/figures/zenity-notification-screenshot.png
-share/gnome/help/zenity/es/figures/zenity-progress-screenshot.png
-share/gnome/help/zenity/es/figures/zenity-question-screenshot.png
-share/gnome/help/zenity/es/figures/zenity-text-screenshot.png
-share/gnome/help/zenity/es/figures/zenity-warning-screenshot.png
-share/gnome/help/zenity/es/zenity.xml
-share/gnome/help/zenity/eu/figures/zenity-calendar-screenshot.png
-share/gnome/help/zenity/eu/figures/zenity-entry-screenshot.png
-share/gnome/help/zenity/eu/figures/zenity-error-screenshot.png
-share/gnome/help/zenity/eu/figures/zenity-fileselection-screenshot.png
-share/gnome/help/zenity/eu/figures/zenity-information-screenshot.png
-share/gnome/help/zenity/eu/figures/zenity-list-screenshot.png
-share/gnome/help/zenity/eu/figures/zenity-notification-screenshot.png
-share/gnome/help/zenity/eu/figures/zenity-progress-screenshot.png
-share/gnome/help/zenity/eu/figures/zenity-question-screenshot.png
-share/gnome/help/zenity/eu/figures/zenity-text-screenshot.png
-share/gnome/help/zenity/eu/figures/zenity-warning-screenshot.png
-share/gnome/help/zenity/eu/zenity.xml
-share/gnome/help/zenity/fi/figures/zenity-calendar-screenshot.png
-share/gnome/help/zenity/fi/figures/zenity-entry-screenshot.png
-share/gnome/help/zenity/fi/figures/zenity-error-screenshot.png
-share/gnome/help/zenity/fi/figures/zenity-fileselection-screenshot.png
-share/gnome/help/zenity/fi/figures/zenity-information-screenshot.png
-share/gnome/help/zenity/fi/figures/zenity-list-screenshot.png
-share/gnome/help/zenity/fi/figures/zenity-notification-screenshot.png
-share/gnome/help/zenity/fi/figures/zenity-progress-screenshot.png
-share/gnome/help/zenity/fi/figures/zenity-question-screenshot.png
-share/gnome/help/zenity/fi/figures/zenity-text-screenshot.png
-share/gnome/help/zenity/fi/figures/zenity-warning-screenshot.png
-share/gnome/help/zenity/fi/zenity.xml
-share/gnome/help/zenity/fr/figures/zenity-calendar-screenshot.png
-share/gnome/help/zenity/fr/figures/zenity-entry-screenshot.png
-share/gnome/help/zenity/fr/figures/zenity-error-screenshot.png
-share/gnome/help/zenity/fr/figures/zenity-fileselection-screenshot.png
-share/gnome/help/zenity/fr/figures/zenity-information-screenshot.png
-share/gnome/help/zenity/fr/figures/zenity-list-screenshot.png
-share/gnome/help/zenity/fr/figures/zenity-notification-screenshot.png
-share/gnome/help/zenity/fr/figures/zenity-progress-screenshot.png
-share/gnome/help/zenity/fr/figures/zenity-question-screenshot.png
-share/gnome/help/zenity/fr/figures/zenity-text-screenshot.png
-share/gnome/help/zenity/fr/figures/zenity-warning-screenshot.png
-share/gnome/help/zenity/fr/zenity.xml
-share/gnome/help/zenity/oc/figures/zenity-calendar-screenshot.png
-share/gnome/help/zenity/oc/figures/zenity-entry-screenshot.png
-share/gnome/help/zenity/oc/figures/zenity-error-screenshot.png
-share/gnome/help/zenity/oc/figures/zenity-fileselection-screenshot.png
-share/gnome/help/zenity/oc/figures/zenity-information-screenshot.png
-share/gnome/help/zenity/oc/figures/zenity-list-screenshot.png
-share/gnome/help/zenity/oc/figures/zenity-notification-screenshot.png
-share/gnome/help/zenity/oc/figures/zenity-progress-screenshot.png
-share/gnome/help/zenity/oc/figures/zenity-question-screenshot.png
-share/gnome/help/zenity/oc/figures/zenity-text-screenshot.png
-share/gnome/help/zenity/oc/figures/zenity-warning-screenshot.png
-share/gnome/help/zenity/oc/zenity.xml
-share/gnome/help/zenity/pt_BR/figures/zenity-calendar-screenshot.png
-share/gnome/help/zenity/pt_BR/figures/zenity-entry-screenshot.png
-share/gnome/help/zenity/pt_BR/figures/zenity-error-screenshot.png
-share/gnome/help/zenity/pt_BR/figures/zenity-fileselection-screenshot.png
-share/gnome/help/zenity/pt_BR/figures/zenity-information-screenshot.png
-share/gnome/help/zenity/pt_BR/figures/zenity-list-screenshot.png
-share/gnome/help/zenity/pt_BR/figures/zenity-notification-screenshot.png
-share/gnome/help/zenity/pt_BR/figures/zenity-progress-screenshot.png
-share/gnome/help/zenity/pt_BR/figures/zenity-question-screenshot.png
-share/gnome/help/zenity/pt_BR/figures/zenity-text-screenshot.png
-share/gnome/help/zenity/pt_BR/figures/zenity-warning-screenshot.png
-share/gnome/help/zenity/pt_BR/zenity.xml
-share/gnome/help/zenity/ru/figures/zenity-calendar-screenshot.png
-share/gnome/help/zenity/ru/figures/zenity-entry-screenshot.png
-share/gnome/help/zenity/ru/figures/zenity-error-screenshot.png
-share/gnome/help/zenity/ru/figures/zenity-fileselection-screenshot.png
-share/gnome/help/zenity/ru/figures/zenity-information-screenshot.png
-share/gnome/help/zenity/ru/figures/zenity-list-screenshot.png
-share/gnome/help/zenity/ru/figures/zenity-notification-screenshot.png
-share/gnome/help/zenity/ru/figures/zenity-progress-screenshot.png
-share/gnome/help/zenity/ru/figures/zenity-question-screenshot.png
-share/gnome/help/zenity/ru/figures/zenity-text-screenshot.png
-share/gnome/help/zenity/ru/figures/zenity-warning-screenshot.png
-share/gnome/help/zenity/ru/zenity.xml
-share/gnome/help/zenity/sl/figures/zenity-calendar-screenshot.png
-share/gnome/help/zenity/sl/figures/zenity-entry-screenshot.png
-share/gnome/help/zenity/sl/figures/zenity-error-screenshot.png
-share/gnome/help/zenity/sl/figures/zenity-fileselection-screenshot.png
-share/gnome/help/zenity/sl/figures/zenity-information-screenshot.png
-share/gnome/help/zenity/sl/figures/zenity-list-screenshot.png
-share/gnome/help/zenity/sl/figures/zenity-notification-screenshot.png
-share/gnome/help/zenity/sl/figures/zenity-progress-screenshot.png
-share/gnome/help/zenity/sl/figures/zenity-question-screenshot.png
-share/gnome/help/zenity/sl/figures/zenity-text-screenshot.png
-share/gnome/help/zenity/sl/figures/zenity-warning-screenshot.png
-share/gnome/help/zenity/sl/zenity.xml
-share/gnome/help/zenity/sv/figures/zenity-calendar-screenshot.png
-share/gnome/help/zenity/sv/figures/zenity-entry-screenshot.png
-share/gnome/help/zenity/sv/figures/zenity-error-screenshot.png
-share/gnome/help/zenity/sv/figures/zenity-fileselection-screenshot.png
-share/gnome/help/zenity/sv/figures/zenity-information-screenshot.png
-share/gnome/help/zenity/sv/figures/zenity-list-screenshot.png
-share/gnome/help/zenity/sv/figures/zenity-notification-screenshot.png
-share/gnome/help/zenity/sv/figures/zenity-progress-screenshot.png
-share/gnome/help/zenity/sv/figures/zenity-question-screenshot.png
-share/gnome/help/zenity/sv/figures/zenity-text-screenshot.png
-share/gnome/help/zenity/sv/figures/zenity-warning-screenshot.png
-share/gnome/help/zenity/sv/zenity.xml
-share/gnome/help/zenity/uk/figures/zenity-calendar-screenshot.png
-share/gnome/help/zenity/uk/figures/zenity-entry-screenshot.png
-share/gnome/help/zenity/uk/figures/zenity-error-screenshot.png
-share/gnome/help/zenity/uk/figures/zenity-fileselection-screenshot.png
-share/gnome/help/zenity/uk/figures/zenity-information-screenshot.png
-share/gnome/help/zenity/uk/figures/zenity-list-screenshot.png
-share/gnome/help/zenity/uk/figures/zenity-notification-screenshot.png
-share/gnome/help/zenity/uk/figures/zenity-progress-screenshot.png
-share/gnome/help/zenity/uk/figures/zenity-question-screenshot.png
-share/gnome/help/zenity/uk/figures/zenity-text-screenshot.png
-share/gnome/help/zenity/uk/figures/zenity-warning-screenshot.png
-share/gnome/help/zenity/uk/zenity.xml
-share/gnome/help/zenity/zh_CN/figures/zenity-calendar-screenshot.png
-share/gnome/help/zenity/zh_CN/figures/zenity-entry-screenshot.png
-share/gnome/help/zenity/zh_CN/figures/zenity-error-screenshot.png
-share/gnome/help/zenity/zh_CN/figures/zenity-fileselection-screenshot.png
-share/gnome/help/zenity/zh_CN/figures/zenity-information-screenshot.png
-share/gnome/help/zenity/zh_CN/figures/zenity-list-screenshot.png
-share/gnome/help/zenity/zh_CN/figures/zenity-notification-screenshot.png
-share/gnome/help/zenity/zh_CN/figures/zenity-progress-screenshot.png
-share/gnome/help/zenity/zh_CN/figures/zenity-question-screenshot.png
-share/gnome/help/zenity/zh_CN/figures/zenity-text-screenshot.png
-share/gnome/help/zenity/zh_CN/figures/zenity-warning-screenshot.png
-share/gnome/help/zenity/zh_CN/zenity.xml
-share/locale/am/LC_MESSAGES/zenity.mo
-share/locale/ar/LC_MESSAGES/zenity.mo
-share/locale/as/LC_MESSAGES/zenity.mo
-share/locale/ast/LC_MESSAGES/zenity.mo
-share/locale/az/LC_MESSAGES/zenity.mo
-share/locale/be/LC_MESSAGES/zenity.mo
-share/locale/be@latin/LC_MESSAGES/zenity.mo
-share/locale/bg/LC_MESSAGES/zenity.mo
-share/locale/bn/LC_MESSAGES/zenity.mo
-share/locale/bn_IN/LC_MESSAGES/zenity.mo
-share/locale/bs/LC_MESSAGES/zenity.mo
-share/locale/ca/LC_MESSAGES/zenity.mo
-share/locale/ca@valencia/LC_MESSAGES/zenity.mo
-share/locale/cs/LC_MESSAGES/zenity.mo
-share/locale/cy/LC_MESSAGES/zenity.mo
-share/locale/da/LC_MESSAGES/zenity.mo
-share/locale/de/LC_MESSAGES/zenity.mo
-share/locale/dz/LC_MESSAGES/zenity.mo
-share/locale/el/LC_MESSAGES/zenity.mo
-share/locale/en@shaw/LC_MESSAGES/zenity.mo
-share/locale/en_CA/LC_MESSAGES/zenity.mo
-share/locale/en_GB/LC_MESSAGES/zenity.mo
-share/locale/eo/LC_MESSAGES/zenity.mo
-share/locale/es/LC_MESSAGES/zenity.mo
-share/locale/et/LC_MESSAGES/zenity.mo
-share/locale/eu/LC_MESSAGES/zenity.mo
-share/locale/fa/LC_MESSAGES/zenity.mo
-share/locale/fi/LC_MESSAGES/zenity.mo
-share/locale/fr/LC_MESSAGES/zenity.mo
-share/locale/ga/LC_MESSAGES/zenity.mo
-share/locale/gl/LC_MESSAGES/zenity.mo
-share/locale/gu/LC_MESSAGES/zenity.mo
-share/locale/he/LC_MESSAGES/zenity.mo
-share/locale/hi/LC_MESSAGES/zenity.mo
-share/locale/hr/LC_MESSAGES/zenity.mo
-share/locale/hu/LC_MESSAGES/zenity.mo
-share/locale/id/LC_MESSAGES/zenity.mo
-share/locale/is/LC_MESSAGES/zenity.mo
-share/locale/it/LC_MESSAGES/zenity.mo
-share/locale/ja/LC_MESSAGES/zenity.mo
-share/locale/ka/LC_MESSAGES/zenity.mo
-share/locale/kn/LC_MESSAGES/zenity.mo
-share/locale/ko/LC_MESSAGES/zenity.mo
-share/locale/ku/LC_MESSAGES/zenity.mo
-share/locale/lt/LC_MESSAGES/zenity.mo
-share/locale/lv/LC_MESSAGES/zenity.mo
-share/locale/mai/LC_MESSAGES/zenity.mo
-share/locale/mg/LC_MESSAGES/zenity.mo
-share/locale/mi/LC_MESSAGES/zenity.mo
-share/locale/mk/LC_MESSAGES/zenity.mo
-share/locale/ml/LC_MESSAGES/zenity.mo
-share/locale/mn/LC_MESSAGES/zenity.mo
-share/locale/mr/LC_MESSAGES/zenity.mo
-share/locale/ms/LC_MESSAGES/zenity.mo
-share/locale/nb/LC_MESSAGES/zenity.mo
-share/locale/ne/LC_MESSAGES/zenity.mo
-share/locale/nl/LC_MESSAGES/zenity.mo
-share/locale/nn/LC_MESSAGES/zenity.mo
-share/locale/oc/LC_MESSAGES/zenity.mo
-share/locale/or/LC_MESSAGES/zenity.mo
-share/locale/pa/LC_MESSAGES/zenity.mo
-share/locale/pl/LC_MESSAGES/zenity.mo
-share/locale/ps/LC_MESSAGES/zenity.mo
-share/locale/pt/LC_MESSAGES/zenity.mo
-share/locale/pt_BR/LC_MESSAGES/zenity.mo
-share/locale/ro/LC_MESSAGES/zenity.mo
-share/locale/ru/LC_MESSAGES/zenity.mo
-share/locale/rw/LC_MESSAGES/zenity.mo
-share/locale/si/LC_MESSAGES/zenity.mo
-share/locale/sk/LC_MESSAGES/zenity.mo
-share/locale/sl/LC_MESSAGES/zenity.mo
-share/locale/sq/LC_MESSAGES/zenity.mo
-share/locale/sr/LC_MESSAGES/zenity.mo
-share/locale/sr@latin/LC_MESSAGES/zenity.mo
-share/locale/sv/LC_MESSAGES/zenity.mo
-share/locale/ta/LC_MESSAGES/zenity.mo
-share/locale/te/LC_MESSAGES/zenity.mo
-share/locale/th/LC_MESSAGES/zenity.mo
-share/locale/tr/LC_MESSAGES/zenity.mo
-share/locale/ug/LC_MESSAGES/zenity.mo
-share/locale/uk/LC_MESSAGES/zenity.mo
-share/locale/vi/LC_MESSAGES/zenity.mo
-share/locale/xh/LC_MESSAGES/zenity.mo
-share/locale/zh_CN/LC_MESSAGES/zenity.mo
-share/locale/zh_HK/LC_MESSAGES/zenity.mo
-share/locale/zh_TW/LC_MESSAGES/zenity.mo
-share/omf/zenity/zenity-C.omf
-share/omf/zenity/zenity-bg.omf
-share/omf/zenity/zenity-cs.omf
-share/omf/zenity/zenity-da.omf
-share/omf/zenity/zenity-de.omf
-share/omf/zenity/zenity-el.omf
-share/omf/zenity/zenity-en_GB.omf
-share/omf/zenity/zenity-es.omf
-share/omf/zenity/zenity-eu.omf
-share/omf/zenity/zenity-fi.omf
-share/omf/zenity/zenity-fr.omf
-share/omf/zenity/zenity-oc.omf
-share/omf/zenity/zenity-pt_BR.omf
-share/omf/zenity/zenity-ru.omf
-share/omf/zenity/zenity-sl.omf
-share/omf/zenity/zenity-sv.omf
-share/omf/zenity/zenity-uk.omf
-share/omf/zenity/zenity-zh_CN.omf
-%%DATADIR%%/clothes/gnome-tshirt.png
-%%DATADIR%%/clothes/hawaii-shirt.png
-%%DATADIR%%/clothes/monk.png
-%%DATADIR%%/clothes/sunglasses.png
-%%DATADIR%%/clothes/surfboard.png
-%%DATADIR%%/zenity-calendar.png
-%%DATADIR%%/zenity-entry.png
-%%DATADIR%%/zenity-file.png
-%%DATADIR%%/zenity-list.png
-%%DATADIR%%/zenity-notification.png
-%%DATADIR%%/zenity-progress.png
-%%DATADIR%%/zenity-scale.png
-%%DATADIR%%/zenity-text.png
-%%DATADIR%%/zenity.png
-%%DATADIR%%/zenity.ui
-@dirrm %%DATADIR%%/clothes
-@dirrm %%DATADIR%%
-@dirrm share/omf/zenity
-@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/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mi/LC_MESSAGES
-@dirrmtry share/locale/mi
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrm share/gnome/help/zenity/zh_CN/figures
-@dirrm share/gnome/help/zenity/zh_CN
-@dirrm share/gnome/help/zenity/uk/figures
-@dirrm share/gnome/help/zenity/uk
-@dirrm share/gnome/help/zenity/sv/figures
-@dirrm share/gnome/help/zenity/sv
-@dirrm share/gnome/help/zenity/sl/figures
-@dirrm share/gnome/help/zenity/sl
-@dirrm share/gnome/help/zenity/ru/figures
-@dirrm share/gnome/help/zenity/ru
-@dirrm share/gnome/help/zenity/pt_BR/figures
-@dirrm share/gnome/help/zenity/pt_BR
-@dirrm share/gnome/help/zenity/oc/figures
-@dirrm share/gnome/help/zenity/oc
-@dirrm share/gnome/help/zenity/fr/figures
-@dirrm share/gnome/help/zenity/fr
-@dirrm share/gnome/help/zenity/fi/figures
-@dirrm share/gnome/help/zenity/fi
-@dirrm share/gnome/help/zenity/eu/figures
-@dirrm share/gnome/help/zenity/eu
-@dirrm share/gnome/help/zenity/es/figures
-@dirrm share/gnome/help/zenity/es
-@dirrm share/gnome/help/zenity/en_GB/figures
-@dirrm share/gnome/help/zenity/en_GB
-@dirrm share/gnome/help/zenity/el/figures
-@dirrm share/gnome/help/zenity/el
-@dirrm share/gnome/help/zenity/de/figures
-@dirrm share/gnome/help/zenity/de
-@dirrm share/gnome/help/zenity/da/figures
-@dirrm share/gnome/help/zenity/da
-@dirrm share/gnome/help/zenity/cs/figures
-@dirrm share/gnome/help/zenity/cs
-@dirrm share/gnome/help/zenity/bg/figures
-@dirrm share/gnome/help/zenity/bg
-@dirrm share/gnome/help/zenity/C/figures
-@dirrm share/gnome/help/zenity/C
-@dirrm share/gnome/help/zenity