Index: misc/xdg-utils/Makefile
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/misc/xdg-utils/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- misc/xdg-utils/Makefile	4 Feb 2010 16:47:54 -0000	1.2
+++ misc/xdg-utils/Makefile	4 Apr 2011 16:53:27 -0000
@@ -1,10 +1,11 @@
 # $NetBSD: Makefile,v 1.2 2010/02/04 16:47:54 joerg Exp $
 #
 
-DISTNAME=	xdg-utils-1.0.2
+DISTNAME=	xdg-utils-1.1.0-rc1
+PKGNAME=	xdg-utils-1.1.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://portland.freedesktop.org/download/
-EXTRACT_SUFX=	.tgz
+LICENSE=	mit
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://portland.freedesktop.org/
Index: misc/xdg-utils/PLIST
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/misc/xdg-utils/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- misc/xdg-utils/PLIST	9 Dec 2008 15:04:56 -0000	1.1.1.1
+++ misc/xdg-utils/PLIST	4 Apr 2011 16:48:02 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/12/09 15:04:56 wiz Exp $
+@comment $NetBSD$
 bin/xdg-desktop-icon
 bin/xdg-desktop-menu
 bin/xdg-email
@@ -6,6 +6,7 @@
 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-mime.1
 man/man1/xdg-open.1
 man/man1/xdg-screensaver.1
+man/man1/xdg-settings.1
Index: misc/xdg-utils/distinfo
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/misc/xdg-utils/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- misc/xdg-utils/distinfo	9 Dec 2008 15:04:56 -0000	1.1.1.1
+++ misc/xdg-utils/distinfo	4 Apr 2011 23:36:46 -0000
@@ -1,5 +1,13 @@
 $NetBSD: distinfo,v 1.1.1.1 2008/12/09 15:04:56 wiz 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) = 92073d1f01ec95cbce7bac33d13f509540c6bf11
+SHA1 (patch-scripts_xdg-desktop-menu) = d4a92eeac281ea73388eee30619d633d613d5ebb
+SHA1 (patch-scripts_xdg-email) = 1affd08ae16b466398a719f5f44d9f071d218992
+SHA1 (patch-scripts_xdg-icon-resource) = b37058ec0542255f0f04a4a2251b74caf47be986
+SHA1 (patch-scripts_xdg-mime) = c0c8da85970f42eda136857378c07c52183cc398
+SHA1 (patch-scripts_xdg-open) = 4cef779b5d2b35e16ba99afefbf594a0eea86b5d
+SHA1 (patch-scripts_xdg-screensaver) = 84af157213ee8cae928663071de79f9e9a1ace96
+SHA1 (patch-scripts_xdg-settings) = e238a0516bef9477cec68d2e88f98e2f2913bbae
Index: misc/xdg-utils/patches/patch-scripts_xdg-desktop-icon
===================================================================
RCS file: misc/xdg-utils/patches/patch-scripts_xdg-desktop-icon
diff -N misc/xdg-utils/patches/patch-scripts_xdg-desktop-icon
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ misc/xdg-utils/patches/patch-scripts_xdg-desktop-icon	4 Apr 2011 23:35:47 -0000
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Fix to ERROR: [check-portability.awk] => Found test ... == ...:
+--- 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
+ }
Index: misc/xdg-utils/patches/patch-scripts_xdg-desktop-menu
===================================================================
RCS file: misc/xdg-utils/patches/patch-scripts_xdg-desktop-menu
diff -N misc/xdg-utils/patches/patch-scripts_xdg-desktop-menu
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ misc/xdg-utils/patches/patch-scripts_xdg-desktop-menu	4 Apr 2011 23:36:09 -0000
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Fix to ERROR: [check-portability.awk] => Found test ... == ...:
+--- 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
+ }
Index: misc/xdg-utils/patches/patch-scripts_xdg-email
===================================================================
RCS file: misc/xdg-utils/patches/patch-scripts_xdg-email
diff -N misc/xdg-utils/patches/patch-scripts_xdg-email
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ misc/xdg-utils/patches/patch-scripts_xdg-email	4 Apr 2011 23:36:14 -0000
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Fix to ERROR: [check-portability.awk] => Found test ... == ...:
+--- 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
+ }
Index: misc/xdg-utils/patches/patch-scripts_xdg-icon-resource
===================================================================
RCS file: misc/xdg-utils/patches/patch-scripts_xdg-icon-resource
diff -N misc/xdg-utils/patches/patch-scripts_xdg-icon-resource
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ misc/xdg-utils/patches/patch-scripts_xdg-icon-resource	4 Apr 2011 23:36:19 -0000
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Fix to ERROR: [check-portability.awk] => Found test ... == ...:
+--- 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
+ }
Index: misc/xdg-utils/patches/patch-scripts_xdg-mime
===================================================================
RCS file: misc/xdg-utils/patches/patch-scripts_xdg-mime
diff -N misc/xdg-utils/patches/patch-scripts_xdg-mime
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ misc/xdg-utils/patches/patch-scripts_xdg-mime	4 Apr 2011 23:36:23 -0000
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Fix to ERROR: [check-portability.awk] => Found test ... == ...:
+--- 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
+ }
Index: misc/xdg-utils/patches/patch-scripts_xdg-open
===================================================================
RCS file: misc/xdg-utils/patches/patch-scripts_xdg-open
diff -N misc/xdg-utils/patches/patch-scripts_xdg-open
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ misc/xdg-utils/patches/patch-scripts_xdg-open	4 Apr 2011 23:36:28 -0000
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Fix to ERROR: [check-portability.awk] => Found test ... == ...:
+--- 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
+ }
Index: misc/xdg-utils/patches/patch-scripts_xdg-screensaver
===================================================================
RCS file: misc/xdg-utils/patches/patch-scripts_xdg-screensaver
diff -N misc/xdg-utils/patches/patch-scripts_xdg-screensaver
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ misc/xdg-utils/patches/patch-scripts_xdg-screensaver	4 Apr 2011 23:36:34 -0000
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Fix to ERROR: [check-portability.awk] => Found test ... == ...:
+--- 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
+ }
Index: misc/xdg-utils/patches/patch-scripts_xdg-settings
===================================================================
RCS file: misc/xdg-utils/patches/patch-scripts_xdg-settings
diff -N misc/xdg-utils/patches/patch-scripts_xdg-settings
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ misc/xdg-utils/patches/patch-scripts_xdg-settings	4 Apr 2011 23:36:38 -0000
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Fix to ERROR: [check-portability.awk] => Found test ... == ...:
+--- scripts/xdg-settings.orig	2011-04-04 16:45:01.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
+ }