Update to version 1.1.0rc1 (from 2010)

adds support for kde4 and lxde.

11 files changed, 122 insertions, 9 deletions

diff --git a/misc/xdg-utils/Makefile b/misc/xdg-utils/Makefile
index 1fcb30a3f66..6518d090f91 100644
--- a/misc/xdg-utils/Makefile
+++ b/misc/xdg-utils/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2012/10/08 09:57:41 asau Exp $
+# $NetBSD: Makefile,v 1.6 2013/03/17 19:56:43 markd Exp $
 #
 
-DISTNAME=	xdg-utils-1.0.2
-PKGREVISION=	2
+DISTNAME=	xdg-utils-1.1.0-rc1
+PKGNAME=	xdg-utils-1.1.0rc1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://portland.freedesktop.org/download/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://portland.freedesktop.org/
diff --git a/misc/xdg-utils/PLIST b/misc/xdg-utils/PLIST
index ac2f9ef5dcd..671479a841a 100644
--- a/misc/xdg-utils/PLIST
+++ b/misc/xdg-utils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/12/09 15:04:56 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/03/17 19:56:43 markd Exp $
 bin/xdg-desktop-icon
 bin/xdg-desktop-menu
 bin/xdg-email
@@ -6,6 +6,7 @@ bin/xdg-icon-resource
 bin/xdg-mime
 bin/xdg-open
 bin/xdg-screensaver
+bin/xdg-settings
 man/man1/xdg-desktop-icon.1
 man/man1/xdg-desktop-menu.1
 man/man1/xdg-email.1
@@ -13,3 +14,4 @@ man/man1/xdg-icon-resource.1
 man/man1/xdg-mime.1
 man/man1/xdg-open.1
 man/man1/xdg-screensaver.1
+man/man1/xdg-settings.1
diff --git a/misc/xdg-utils/distinfo b/misc/xdg-utils/distinfo
index 6e60cdf7dd2..287f3512ef9 100644
--- a/misc/xdg-utils/distinfo
+++ b/misc/xdg-utils/distinfo
@@ -1,5 +1,13 @@
-$NetBSD: distinfo,v 1.3 2011/04/05 12:05:01 wiz Exp $
+$NetBSD: distinfo,v 1.4 2013/03/17 19:56:43 markd Exp $
 
-SHA1 (xdg-utils-1.0.2.tgz) = e41a04cbf9ff8d743397a2bc23c6ca82e8b59d2c
-RMD160 (xdg-utils-1.0.2.tgz) = 344482917e8c780613ec20b103f8e51322540c04
-Size (xdg-utils-1.0.2.tgz) = 282262 bytes
+SHA1 (xdg-utils-1.1.0-rc1.tar.gz) = 5bd5e2fe10e3055ccec347e8608476fab2d3eaca
+RMD160 (xdg-utils-1.1.0-rc1.tar.gz) = a3cbf8b6a71225933188efbd386f534b12c004e9
+Size (xdg-utils-1.1.0-rc1.tar.gz) = 300546 bytes
+SHA1 (patch-scripts_xdg-desktop-icon) = 306fadef265e310c8ce105bd92fe75ffbc69a74a
+SHA1 (patch-scripts_xdg-desktop-menu) = 28f4d6d872d9667cc891776b53d7409a0ab40ccb
+SHA1 (patch-scripts_xdg-email) = 3f233616c1dd81749bbab19d62c87c58db91a2fb
+SHA1 (patch-scripts_xdg-icon-resource) = 7ed65c902aa00823162f71c468b3c6bf499ac86c
+SHA1 (patch-scripts_xdg-mime) = 09b6040ca1fc448bdba3678c7d8c4b269073e115
+SHA1 (patch-scripts_xdg-open) = a6c1db8eff7b64b8b43676f2801bc93081abe7ff
+SHA1 (patch-scripts_xdg-screensaver) = e6efae6e52ea300d68d0486a651bed7a904c9694
+SHA1 (patch-scripts_xdg-settings) = fe8a89b2e5cb7b37f0b139305fda0eaebeede02f
diff --git a/misc/xdg-utils/patches/patch-scripts_xdg-desktop-icon b/misc/xdg-utils/patches/patch-scripts_xdg-desktop-icon
new file mode 100644
index 00000000000..18c1e1b4f3f
--- /dev/null
+++ b/misc/xdg-utils/patches/patch-scripts_xdg-desktop-icon
@@ -0,0 +1,13 @@
+$NetBSD: patch-scripts_xdg-desktop-icon,v 1.1 2013/03/17 19:56:43 markd Exp $
+
+--- scripts/xdg-desktop-icon.orig	2011-01-01 10:03:14.000000000 +0000
++++ scripts/xdg-desktop-icon
+@@ -408,7 +408,7 @@ detectDE()
+     elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome;
+     elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome;
+     elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce;
+-    elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde;
++    elif [ x"$DESKTOP_SESSION" = x"LXDE" ]; then DE=lxde;
+     else DE=""
+     fi
+ }
diff --git a/misc/xdg-utils/patches/patch-scripts_xdg-desktop-menu b/misc/xdg-utils/patches/patch-scripts_xdg-desktop-menu
new file mode 100644
index 00000000000..9854c375c50
--- /dev/null
+++ b/misc/xdg-utils/patches/patch-scripts_xdg-desktop-menu
@@ -0,0 +1,13 @@
+$NetBSD: patch-scripts_xdg-desktop-menu,v 1.1 2013/03/17 19:56:43 markd Exp $
+
+--- scripts/xdg-desktop-menu.orig	2011-01-01 10:03:14.000000000 +0000
++++ scripts/xdg-desktop-menu
+@@ -604,7 +604,7 @@ detectDE()
+     elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome;
+     elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome;
+     elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce;
+-    elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde;
++    elif [ x"$DESKTOP_SESSION" = x"LXDE" ]; then DE=lxde;
+     else DE=""
+     fi
+ }
diff --git a/misc/xdg-utils/patches/patch-scripts_xdg-email b/misc/xdg-utils/patches/patch-scripts_xdg-email
new file mode 100644
index 00000000000..8620aca7fde
--- /dev/null
+++ b/misc/xdg-utils/patches/patch-scripts_xdg-email
@@ -0,0 +1,13 @@
+$NetBSD: patch-scripts_xdg-email,v 1.1 2013/03/17 19:56:43 markd Exp $
+
+--- scripts/xdg-email.orig	2011-01-01 10:03:14.000000000 +0000
++++ scripts/xdg-email
+@@ -360,7 +360,7 @@ detectDE()
+     elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome;
+     elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome;
+     elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce;
+-    elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde;
++    elif [ x"$DESKTOP_SESSION" = x"LXDE" ]; then DE=lxde;
+     else DE=""
+     fi
+ }
diff --git a/misc/xdg-utils/patches/patch-scripts_xdg-icon-resource b/misc/xdg-utils/patches/patch-scripts_xdg-icon-resource
new file mode 100644
index 00000000000..a8cfba567a6
--- /dev/null
+++ b/misc/xdg-utils/patches/patch-scripts_xdg-icon-resource
@@ -0,0 +1,13 @@
+$NetBSD: patch-scripts_xdg-icon-resource,v 1.1 2013/03/17 19:56:43 markd Exp $
+
+--- scripts/xdg-icon-resource.orig	2011-01-01 10:03:14.000000000 +0000
++++ scripts/xdg-icon-resource
+@@ -400,7 +400,7 @@ detectDE()
+     elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome;
+     elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome;
+     elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce;
+-    elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde;
++    elif [ x"$DESKTOP_SESSION" = x"LXDE" ]; then DE=lxde;
+     else DE=""
+     fi
+ }
diff --git a/misc/xdg-utils/patches/patch-scripts_xdg-mime b/misc/xdg-utils/patches/patch-scripts_xdg-mime
new file mode 100644
index 00000000000..a3453521398
--- /dev/null
+++ b/misc/xdg-utils/patches/patch-scripts_xdg-mime
@@ -0,0 +1,13 @@
+$NetBSD: patch-scripts_xdg-mime,v 1.1 2013/03/17 19:56:43 markd Exp $
+
+--- scripts/xdg-mime.orig	2011-01-01 10:03:14.000000000 +0000
++++ scripts/xdg-mime
+@@ -430,7 +430,7 @@ detectDE()
+     elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome;
+     elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome;
+     elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce;
+-    elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde;
++    elif [ x"$DESKTOP_SESSION" = x"LXDE" ]; then DE=lxde;
+     else DE=""
+     fi
+ }
diff --git a/misc/xdg-utils/patches/patch-scripts_xdg-open b/misc/xdg-utils/patches/patch-scripts_xdg-open
new file mode 100644
index 00000000000..258b245c1fe
--- /dev/null
+++ b/misc/xdg-utils/patches/patch-scripts_xdg-open
@@ -0,0 +1,13 @@
+$NetBSD: patch-scripts_xdg-open,v 1.1 2013/03/17 19:56:43 markd Exp $
+
+--- scripts/xdg-open.orig	2011-01-01 10:03:14.000000000 +0000
++++ scripts/xdg-open
+@@ -307,7 +307,7 @@ detectDE()
+     elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome;
+     elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome;
+     elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce;
+-    elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde;
++    elif [ x"$DESKTOP_SESSION" = x"LXDE" ]; then DE=lxde;
+     else DE=""
+     fi
+ }
diff --git a/misc/xdg-utils/patches/patch-scripts_xdg-screensaver b/misc/xdg-utils/patches/patch-scripts_xdg-screensaver
new file mode 100644
index 00000000000..51afb3cd9d7
--- /dev/null
+++ b/misc/xdg-utils/patches/patch-scripts_xdg-screensaver
@@ -0,0 +1,13 @@
+$NetBSD: patch-scripts_xdg-screensaver,v 1.1 2013/03/17 19:56:43 markd Exp $
+
+--- scripts/xdg-screensaver.orig	2011-01-01 10:03:14.000000000 +0000
++++ scripts/xdg-screensaver
+@@ -335,7 +335,7 @@ detectDE()
+     elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome;
+     elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome;
+     elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce;
+-    elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde;
++    elif [ x"$DESKTOP_SESSION" = x"LXDE" ]; then DE=lxde;
+     else DE=""
+     fi
+ }
diff --git a/misc/xdg-utils/patches/patch-scripts_xdg-settings b/misc/xdg-utils/patches/patch-scripts_xdg-settings
new file mode 100644
index 00000000000..b3b7f69e407
--- /dev/null
+++ b/misc/xdg-utils/patches/patch-scripts_xdg-settings
@@ -0,0 +1,13 @@
+$NetBSD: patch-scripts_xdg-settings,v 1.1 2013/03/17 19:56:43 markd Exp $
+
+--- scripts/xdg-settings.orig	2011-01-01 10:03:14.000000000 +0000
++++ scripts/xdg-settings
+@@ -315,7 +315,7 @@ detectDE()
+     elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome;
+     elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome;
+     elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce;
+-    elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde;
++    elif [ x"$DESKTOP_SESSION" = x"LXDE" ]; then DE=lxde;
+     else DE=""
+     fi
+ }