diff --git a/x11/xfce4/exo/Makefile b/x11/xfce4/exo/Makefile index 9a73605aed6..58473f084c4 100644 --- a/x11/xfce4/exo/Makefile +++ b/x11/xfce4/exo/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.18 2009/08/11 08:38:41 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.19 2009/08/20 20:21:12 landry Exp $ COMMENT= Xfce4 extension library -XFCE_VERSION= 0.3.101 +XFCE_VERSION= 0.3.102 XFCE_PROJECT= exo -PKGNAME= ${DISTNAME}p3 SHARED_LIBS= exo-0.3 5.0 \ exo-hal-0.3 5.0 @@ -21,6 +20,8 @@ MODULES= x11/xfce4 DESKTOP_FILES= Yes CONFIGURE_ARGS= --disable-python +CONFIGURE_ENV= ac_cv_header_sys_ucred_h=yes \ + ac_cv_header_sys_mount_h=yes BUILD_DEPENDS= :p5-URI-*:www/p5-URI LIB_DEPENDS= notify.>=2::devel/libnotify \ diff --git a/x11/xfce4/exo/distinfo b/x11/xfce4/exo/distinfo index c04ebd31dc6..719f12e3efd 100644 --- a/x11/xfce4/exo/distinfo +++ b/x11/xfce4/exo/distinfo @@ -1,5 +1,5 @@ -MD5 (xfce4/exo-0.3.101.tar.bz2) = HA7rs2D1PqtwRUtw4b3jbg== -RMD160 (xfce4/exo-0.3.101.tar.bz2) = kt/B6PC/qMp08VGiKD9piM5wNkk= -SHA1 (xfce4/exo-0.3.101.tar.bz2) = dBlPWCeKK52WMmSAbxQuXW0FM2w= -SHA256 (xfce4/exo-0.3.101.tar.bz2) = ABb2/w0dIu1C+1ybzsxVWaYlcngURv39FER4a10z4yQ= -SIZE (xfce4/exo-0.3.101.tar.bz2) = 1793815 +MD5 (xfce4/exo-0.3.102.tar.bz2) = /cVU+qhv0dODRhwlftSNpg== +RMD160 (xfce4/exo-0.3.102.tar.bz2) = qTIXPLkW6hjmL9yPAlRFKrCawyA= +SHA1 (xfce4/exo-0.3.102.tar.bz2) = 74VIinE5EdGv7qXd2NcJQ/LFoyM= +SHA256 (xfce4/exo-0.3.102.tar.bz2) = 3quHMmpFX8R+6kShJCaPpksVR1ClWuUVihEZzdxJeAA= +SIZE (xfce4/exo-0.3.102.tar.bz2) = 1801655 diff --git a/x11/xfce4/exo/patches/patch-exo-mount_exo-mount-fstab_c b/x11/xfce4/exo/patches/patch-exo-mount_exo-mount-fstab_c deleted file mode 100644 index 1ae24c75605..00000000000 --- a/x11/xfce4/exo/patches/patch-exo-mount_exo-mount-fstab_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-exo-mount_exo-mount-fstab_c,v 1.1 2007/12/18 20:21:15 landry Exp $ ---- exo-mount/exo-mount-fstab.c.orig Wed Dec 5 19:04:10 2007 -+++ exo-mount/exo-mount-fstab.c Wed Dec 5 19:04:36 2007 -@@ -38,7 +38,7 @@ - - /* define _PATH_MOUNT if undefined */ - #ifndef _PATH_MOUNT --#define _PATH_MOUNT "/bin/mount" -+#define _PATH_MOUNT "/sbin/mount" - #endif - - diff --git a/x11/xfce4/exo/patches/patch-exo-open_main_c b/x11/xfce4/exo/patches/patch-exo-open_main_c deleted file mode 100644 index 38f0c7416ee..00000000000 --- a/x11/xfce4/exo/patches/patch-exo-open_main_c +++ /dev/null @@ -1,77 +0,0 @@ -$OpenBSD: patch-exo-open_main_c,v 1.3 2009/08/06 09:32:50 landry Exp $ ---- exo-open/main.c.orig Sat Apr 11 12:09:56 2009 -+++ exo-open/main.c Thu Aug 6 11:22:09 2009 -@@ -36,7 +36,19 @@ - #include - - -+/** -+ * For testing this code the following commands should work: -+ * -+ * exo-open --launch WebBrowser http://xfce.org (bug #5461). -+ * exo-open http://xfce.org -+ * exo-open --launch TerminalEmulator ./script.sh 'something with a space' 'nospace' (bug #5132). -+ * exo-open --launch TerminalEmulator ssh -l username some.host.com -+ * xfterm4 -e ssh -l ssh -l username some.host.com (bug #5301, this generates line below) -+ * exo-open --launch TerminalEmulator 'ssh -l username some.host.com' -+ **/ - -+ -+ - static gboolean opt_help = FALSE; - static gboolean opt_version = FALSE; - static gchar *opt_launch = NULL; -@@ -110,6 +122,7 @@ main (int argc, char **argv) - g_option_context_set_help_enabled (context, FALSE); - g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); - g_option_context_add_group (context, gtk_get_option_group (TRUE)); -+ g_option_context_set_ignore_unknown_options (context, TRUE); - if (!g_option_context_parse (context, &argc, &argv, &err)) - { - g_fprintf (stderr, "exo-open: %s.\n", err->message); -@@ -142,6 +155,8 @@ main (int argc, char **argv) - { - if (argc > 1) - { -+ /* NOTE: see the comment at the top of this document! */ -+ - /* combine all specified parameters to one parameter string */ - join = g_string_new (NULL); - for (i = 1; argv[i] != NULL; i++) -@@ -149,11 +164,20 @@ main (int argc, char **argv) - /* separate the arguments */ - if (i > 1) - join = g_string_append_c (join, ' '); -- -- /* append the quoted argument */ -- quoted = g_shell_quote (argv[i]); -- join = g_string_append (join, quoted); -- g_free (quoted); -+ -+ /* only quote arguments with spaces if there are multiple -+ * arguments to be merged, this is a bit of magic to make -+ * common cares work property, see sample above with xfrun4 */ -+ if (argc > 2 && strchr (argv[i], ' ') != NULL) -+ { -+ quoted = g_shell_quote (argv[i]); -+ join = g_string_append (join, quoted); -+ g_free (quoted); -+ } -+ else -+ { -+ join = g_string_append (join, argv[i]); -+ } - } - parameter = g_string_free (join, FALSE); - } -@@ -161,6 +185,10 @@ main (int argc, char **argv) - { - parameter = NULL; - } -+ -+#ifndef NDEBUG -+ g_message ("launch=%s, wd=%s, parameters (%d)=%s", opt_launch, opt_working_directory, argc, parameter); -+#endif - - /* run the preferred application */ - if (!exo_execute_preferred_application (opt_launch, parameter, opt_working_directory, NULL, &err)) diff --git a/x11/xfce4/exo/pkg/PLIST b/x11/xfce4/exo/pkg/PLIST index 1c3f1c02e89..b0f9351f1fc 100644 --- a/x11/xfce4/exo/pkg/PLIST +++ b/x11/xfce4/exo/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.7 2009/04/28 19:38:40 landry Exp $ +@comment $OpenBSD: PLIST,v 1.8 2009/08/20 20:21:12 landry Exp $ %%SHARED%% @bin bin/exo-csource @bin bin/exo-desktop-item-edit @@ -124,6 +124,9 @@ share/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png share/locale/ar/ share/locale/ar/LC_MESSAGES/ share/locale/ar/LC_MESSAGES/libexo-0.3.mo +share/locale/ast/ +share/locale/ast/LC_MESSAGES/ +share/locale/ast/LC_MESSAGES/libexo-0.3.mo share/locale/be/LC_MESSAGES/libexo-0.3.mo share/locale/ca/LC_MESSAGES/libexo-0.3.mo share/locale/cs/LC_MESSAGES/libexo-0.3.mo @@ -182,6 +185,9 @@ share/locale/uk/LC_MESSAGES/libexo-0.3.mo share/locale/ur/ share/locale/ur/LC_MESSAGES/ share/locale/ur/LC_MESSAGES/libexo-0.3.mo +share/locale/ur_PK/ +share/locale/ur_PK/LC_MESSAGES/ +share/locale/ur_PK/LC_MESSAGES/libexo-0.3.mo share/locale/zh_CN/LC_MESSAGES/libexo-0.3.mo share/locale/zh_TW/LC_MESSAGES/libexo-0.3.mo share/pixmaps/ @@ -198,6 +204,11 @@ share/xfce4/doc/C/images/exo-preferred-applications-webbrowser-custom.png share/xfce4/doc/C/images/exo-preferred-applications-webbrowser-menu.png share/xfce4/doc/da/ share/xfce4/doc/da/exo-preferred-applications.html +share/xfce4/doc/da/images/ +share/xfce4/doc/da/images/exo-preferred-applications-internet.png +share/xfce4/doc/da/images/exo-preferred-applications-utilities.png +share/xfce4/doc/da/images/exo-preferred-applications-webbrowser-custom.png +share/xfce4/doc/da/images/exo-preferred-applications-webbrowser-menu.png share/xfce4/doc/es/ share/xfce4/doc/es/exo-preferred-applications.html share/xfce4/doc/es/images/ @@ -214,6 +225,11 @@ share/xfce4/doc/fr/images/exo-preferred-applications-webbrowser-custom.png share/xfce4/doc/fr/images/exo-preferred-applications-webbrowser-menu.png share/xfce4/doc/gl/ share/xfce4/doc/gl/exo-preferred-applications.html +share/xfce4/doc/gl/images/ +share/xfce4/doc/gl/images/exo-preferred-applications-internet.png +share/xfce4/doc/gl/images/exo-preferred-applications-utilities.png +share/xfce4/doc/gl/images/exo-preferred-applications-webbrowser-custom.png +share/xfce4/doc/gl/images/exo-preferred-applications-webbrowser-menu.png share/xfce4/doc/id/ share/xfce4/doc/id/exo-preferred-applications.html share/xfce4/doc/id/images/