10 files changed, 12 insertions, 128 deletions
diff --git a/misc/xdg-utils/Makefile b/misc/xdg-utils/Makefile
index c78c82e6f73..97775ddeb05 100644
--- a/misc/xdg-utils/Makefile
+++ b/misc/xdg-utils/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2014/04/21 15:35:27 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2015/10/15 10:53:35 wiz Exp $
 
-DISTNAME=	xdg-utils-1.1.0-rc1
+DISTNAME=	xdg-utils-1.1.1
 PKGNAME=	${DISTNAME:S/-rc/rc/}
-PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://portland.freedesktop.org/download/
 
@@ -11,9 +10,12 @@ HOMEPAGE=	http://portland.freedesktop.org/
 COMMENT=	Tools to assist applications with various desktop integration tasks
 LICENSE=	mit
 
+BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
+BUILD_DEPENDS+=	w3m-[0-9]*:../../www/w3m
+
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	# none
-USE_TOOLS+=	bash:run gsed:run
+USE_TOOLS+=	bash:run gmake gsed:run
 
 SUBST_CLASSES+=		gsed
 SUBST_FILES.gsed=	scripts/xdg-*
@@ -22,13 +24,6 @@ SUBST_MESSAGE.gsed=	Use GNU sed instead of sed.
 SUBST_SED.gsed+=	-e "s/sed /gsed /g"
 
 # "foo > /dev/null 2> /dev/null" gives "foo: not found" with NetBSD's sh
-REPLACE_BASH+=	scripts/xdg-desktop-icon
-REPLACE_BASH+=	scripts/xdg-desktop-menu
-REPLACE_BASH+=	scripts/xdg-email
-REPLACE_BASH+=	scripts/xdg-icon-resource
-REPLACE_BASH+=	scripts/xdg-mime
-REPLACE_BASH+=	scripts/xdg-open
-REPLACE_BASH+=	scripts/xdg-screensaver
-REPLACE_BASH+=	scripts/xdg-settings
+REPLACE_BASH+=	scripts/xdg-*
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/xdg-utils/distinfo b/misc/xdg-utils/distinfo
index 287f3512ef9..4e7c3fb1b35 100644
--- a/misc/xdg-utils/distinfo
+++ b/misc/xdg-utils/distinfo
@@ -1,13 +1,6 @@
-$NetBSD: distinfo,v 1.4 2013/03/17 19:56:43 markd Exp $
+$NetBSD: distinfo,v 1.5 2015/10/15 10:53:35 wiz Exp $
 
-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
+SHA1 (xdg-utils-1.1.1.tar.gz) = 0f046491a4f43475f6371f3fb345cb26cedb5114
+RMD160 (xdg-utils-1.1.1.tar.gz) = f00ee2112a86393420d1c233e0ad98d9bfd994bf
+SHA512 (xdg-utils-1.1.1.tar.gz) = 6641b17daea7eecfee0d395e621dc42481582e505bff90a6df5eb0299ed2dca7a76520f000d9545a8424f06d41590382156a2e50f3d68d5c1ab825c268e90edb
+Size (xdg-utils-1.1.1.tar.gz) = 295213 bytes
diff --git a/misc/xdg-utils/patches/patch-scripts_xdg-desktop-icon b/misc/xdg-utils/patches/patch-scripts_xdg-desktop-icon
deleted file mode 100644
index 18c1e1b4f3f..00000000000
--- a/misc/xdg-utils/patches/patch-scripts_xdg-desktop-icon
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 9854c375c50..00000000000
--- a/misc/xdg-utils/patches/patch-scripts_xdg-desktop-menu
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 8620aca7fde..00000000000
--- a/misc/xdg-utils/patches/patch-scripts_xdg-email
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index a8cfba567a6..00000000000
--- a/misc/xdg-utils/patches/patch-scripts_xdg-icon-resource
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index a3453521398..00000000000
--- a/misc/xdg-utils/patches/patch-scripts_xdg-mime
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 258b245c1fe..00000000000
--- a/misc/xdg-utils/patches/patch-scripts_xdg-open
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 51afb3cd9d7..00000000000
--- a/misc/xdg-utils/patches/patch-scripts_xdg-screensaver
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index b3b7f69e407..00000000000
--- a/misc/xdg-utils/patches/patch-scripts_xdg-settings
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
- }