Update to newer snapshot. Supports GNOME3 and MATE and beter support for KDE4

Requested by:	eadler@


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

9 files changed, 198 insertions, 0 deletions

diff --git a/devel/xdg-utils/Makefile b/devel/xdg-utils/Makefile
new file mode 100644
index 000000000..6433b545e
--- /dev/null
+++ b/devel/xdg-utils/Makefile
@@ -0,0 +1,42 @@
+# Created by: Michael Johnson <ahze@FreeBSD.org>
+# $FreeBSD: head/devel/xdg-utils/Makefile 309605 2012-12-29 05:24:51Z mezz $
+#    $MCom$
+
+PORTNAME=	xdg-utils
+PORTVERSION=	1.0.2.${SNAPDATE}
+CATEGORIES=	devel
+#MASTER_SITES=	http://portland.freedesktop.org/download/
+MASTER_SITES=	LOCAL/kwm
+DISTNAME=	${PORTNAME}-${SNAPDATE}
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Tools to allow all applications to integrate with the free desktop
+
+RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
+		xprop:${PORTSDIR}/x11/xprop \
+		xset:${PORTSDIR}/x11/xset
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
+SNAPDATE=	20130811
+USE_XZ=		yes
+GNU_CONFIGURE=	yes
+XDG_FILES=	xdg-desktop-icon \
+		xdg-desktop-menu \
+		xdg-email \
+		xdg-icon-resource \
+		xdg-mime \
+		xdg-open \
+		xdg-screensaver \
+		xdg-settings
+
+PLIST_FILES+=	${XDG_FILES:S|^|bin/|}
+MAN1+=		${XDG_FILES:S|$|.1|}
+
+#pre-patch:
+#	@${RM} -f ${WRKSRC}/*/*.orig
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+		${WRKSRC}/scripts/xdg-*
+
+.include <bsd.port.mk>
diff --git a/devel/xdg-utils/distinfo b/devel/xdg-utils/distinfo
new file mode 100644
index 000000000..ba0472901
--- /dev/null
+++ b/devel/xdg-utils/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xdg-utils-20130811.tar.xz) = d6db7229370ffcaea3c0a6cd92e69750c5321e458c5949c9eedea99fc73c2199
+SIZE (xdg-utils-20130811.tar.xz) = 1194104
diff --git a/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu b/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu
new file mode 100644
index 000000000..c5ccd21d9
--- /dev/null
+++ b/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu
@@ -0,0 +1,47 @@
+--- scripts/xdg-desktop-menu.orig	2012-09-19 21:04:46.000000000 +0000
++++ scripts/xdg-desktop-menu	2012-09-19 21:22:54.000000000 +0000
+@@ -666,7 +666,7 @@
+ 
+     for MIME in $mimetypes ; do
+         xdg_default_dirs="$XDG_DATA_DIRS"
+-        [ -n "$xdg_default_dirs" ] || xdg_default_dirs=/usr/local/share/:/usr/share/
++        [ -n "$xdg_default_dirs" ] || xdg_default_dirs=%%LOCALBASE%%/share:/usr/local/share/:/usr/share/
+         if [ x"$mode" = x"user" ] ; then
+             xdg_user_dir="$XDG_DATA_HOME"
+             [ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share"
+@@ -709,7 +709,7 @@
+     xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
+ 
+     xdg_system_dirs="$XDG_CONFIG_DIRS"
+-    [ -n "$xdg_system_dirs" ] || xdg_system_dirs=/etc/xdg
++    [ -n "$xdg_system_dirs" ] || xdg_system_dirs=%%LOCALBASE%%/etc/xdg
+     xdg_global_dir=
+     for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do
+         if [ -w $x/$xdg_dir_name ] ; then
+@@ -1072,7 +1072,7 @@
+ xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
+ 
+ xdg_system_dirs="$XDG_DATA_DIRS"
+-[ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
++[ -n "$xdg_system_dirs" ] || xdg_system_dirs=%%LOCALBASE%%/share:/usr/local/share/:/usr/share/
+ xdg_global_dir=
+ for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do
+     if [ -w $x/$xdg_dir_name ] ; then
+@@ -1139,7 +1139,7 @@
+ xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
+ 
+ xdg_system_dirs="$XDG_DATA_DIRS"
+-[ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
++[ -n "$xdg_system_dirs" ] || xdg_system_dirs=%%LOCALBASE%%/share:/usr/local/share/:/usr/share/
+ xdg_global_dir=
+ for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do
+     if [ -w $x/$xdg_dir_name ] ; then
+@@ -1153,7 +1153,7 @@
+ [ -w $kde_global_dir ] || kde_global_dir=
+ 
+ gnome_user_dir="$HOME/.gnome/apps"
+-gnome_global_dir="/usr/share/gnome/apps"
++gnome_global_dir="%%LOCALBASE%%/share/gnome/apps"
+ [ -w $gnome_global_dir ] || gnome_global_dir=
+ 
+ DEBUG 3 "Install locations for *.desktop files:"
diff --git a/devel/xdg-utils/files/patch-scripts_xdg-email b/devel/xdg-utils/files/patch-scripts_xdg-email
new file mode 100644
index 000000000..b4d7df563
--- /dev/null
+++ b/devel/xdg-utils/files/patch-scripts_xdg-email
@@ -0,0 +1,27 @@
+--- scripts/xdg-email.orig	2012-09-25 19:18:27.000000000 +0000
++++ scripts/xdg-email	2012-09-25 19:18:41.000000000 +0000
+@@ -395,13 +395,13 @@
+         MAILTO=$(echo "$MAILTO" | sed 's/^/to=/' | sed 's/?/\&/')
+     fi
+ 
+-    MAILTO=$(echo "$MAILTO" | sed 's/&/\n/g')
++    MAILTO=$(echo "$MAILTO" | tr '&' '\n')
+     TO=$(echo "$MAILTO" | grep '^to=' | sed 's/^to=//' | awk '{ printf "%s,",$0 }')
+     CC=$(echo "$MAILTO" | grep '^cc=' | sed 's/^cc=//' | awk '{ printf "%s,",$0 }')
+     BCC=$(echo "$MAILTO" | grep '^bcc=' | sed 's/^bcc=//' | awk '{ printf "%s,",$0 }')
+     SUBJECT=$(echo "$MAILTO" | grep '^subject=' | tail -n 1)
+     BODY=$(echo "$MAILTO" | grep '^body=' | tail -n 1)
+-    ATTACH=$(echo "$MAILTO" | sed 's/^attach=/\n\nfile:\/\//g' | awk '/^file:/ { printf "%s,",$0 }' | sed 's/,$//')
++    ATTACH=$(for attachment in $(echo "$MAILTO" | sed -ne 's,^attach=,file://,gp') ; do printf "%s," "$attachment" ; done; ATTACH=${ATTACH%,}
+ 
+     if [ -z "$TO" ] ; then
+         NEWMAILTO=
+@@ -563,7 +563,7 @@
+ 
+ options=
+ mailto=
+-utf8="iconv -t utf8"
++utf8="iconv -t UTF-8"
+ while [ $# -gt 0 ] ; do
+     parm="$1"
+     shift
diff --git a/devel/xdg-utils/files/patch-scripts_xdg-icon-resource b/devel/xdg-utils/files/patch-scripts_xdg-icon-resource
new file mode 100644
index 000000000..5dc521875
--- /dev/null
+++ b/devel/xdg-utils/files/patch-scripts_xdg-icon-resource
@@ -0,0 +1,11 @@
+--- scripts/xdg-icon-resource.orig	Fri Oct 27 16:38:23 2006
++++ scripts/xdg-icon-resource	Fri Oct 27 16:38:57 2006
+@@ -612,7 +612,7 @@
+ xdg_global_dir=
+ xdg_global_prefix=
+ xdg_system_dirs="$XDG_DATA_DIRS"
+-[ -n "$xdg_system_dirs" ] || xdg_system_dirs="/usr/local/share/:/usr/share/"
++[ -n "$xdg_system_dirs" ] || xdg_system_dirs="%%LOCALBASE%%/share:/usr/local/share/:/usr/share/"
+ for x in `echo "$xdg_system_dirs" | sed 's/:/ /g'`; do
+    if [ -w $x/$xdg_dir_name ] ; then
+       xdg_global_prefix="$x/icons"
diff --git a/devel/xdg-utils/files/patch-scripts_xdg-mime b/devel/xdg-utils/files/patch-scripts_xdg-mime
new file mode 100644
index 000000000..cb8a4c22a
--- /dev/null
+++ b/devel/xdg-utils/files/patch-scripts_xdg-mime
@@ -0,0 +1,38 @@
+--- scripts/xdg-mime.orig	2012-09-19 21:04:46.000000000 +0000
++++ scripts/xdg-mime	2012-09-19 21:24:43.000000000 +0000
+@@ -496,7 +496,7 @@
+ 
+ info_gnome()
+ {
+-    file=`readlink -f "$1"` # Normalize path
++    file=`stat -f "$1"` # Normalize path
+ 
+     if gvfs-info --help 2>/dev/null 1>&2; then
+         DEBUG 1 "Running gvfs-info \"$file\""
+@@ -677,7 +677,7 @@
+     [ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share"
+     xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
+     xdg_system_dirs="$XDG_DATA_DIRS"
+-    [ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
++    [ -n "$xdg_system_dirs" ] || xdg_system_dirs=%%LOCALBASE%%/share:/usr/local/share/:/usr/share/
+ 
+     for x in `echo "$xdg_user_dir:$xdg_system_dirs" | sed 's/:/ /g'`; do
+        DEBUG 2 "Checking $x/applications/defaults.list"
+@@ -953,7 +953,7 @@
+ xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
+ 
+ xdg_system_dirs="$XDG_DATA_DIRS"
+-[ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
++[ -n "$xdg_system_dirs" ] || xdg_system_dirs=%%LOCALBASE%%/share:/usr/local/share/:/usr/share/
+ for x in `echo $xdg_system_dirs | sed 's/:/ /g'`; do
+     if [ -w $x/$xdg_dir_name ] ; then
+         [ x"$mode" = x"system" ] && xdg_base_dir="$x/mime"
+@@ -985,7 +985,7 @@
+ # TODO: Gnome legacy support
+ # See http://forums.fedoraforum.org/showthread.php?t=26875
+ gnome_user_dir="$HOME/.gnome/apps"
+-gnome_global_dir=/usr/share/gnome/apps
++gnome_global_dir=%%LOCALBASE%%/share/gnome/apps
+ [ -w $gnome_global_dir ] || gnome_global_dir=
+ DEBUG 3 "gnome_user_dir: $gnome_user_dir"
+ DEBUG 3 "gnome_global_dir: $gnome_global_dir"
diff --git a/devel/xdg-utils/files/patch-scripts_xdg-open b/devel/xdg-utils/files/patch-scripts_xdg-open
new file mode 100644
index 000000000..aee6e5faf
--- /dev/null
+++ b/devel/xdg-utils/files/patch-scripts_xdg-open
@@ -0,0 +1,15 @@
+--- scripts/xdg-open.orig	2012-09-19 21:04:46.000000000 +0000
++++ scripts/xdg-open	2012-09-19 21:25:05.000000000 +0000
+@@ -33,6 +33,12 @@
+ #
+ #---------------------------------------------
+ 
++# If we are started from a Linux app with LD_PRELOAD set unset that
++# so native apps (like browers) won't fail to start.
++if [ "x$(uname)" = "xLinux" ]; then
++	unset LD_PRELOAD
++fi
++
+ manualpage()
+ {
+ cat << _MANUALPAGE
diff --git a/devel/xdg-utils/files/patch-scripts_xdg-screensaver b/devel/xdg-utils/files/patch-scripts_xdg-screensaver
new file mode 100644
index 000000000..e8be94169
--- /dev/null
+++ b/devel/xdg-utils/files/patch-scripts_xdg-screensaver
@@ -0,0 +1,13 @@
+--- scripts/xdg-screensaver.orig	2012-09-19 21:04:46.000000000 +0000
++++ scripts/xdg-screensaver	2012-09-19 21:27:48.000000000 +0000
+@@ -359,7 +359,9 @@
+ }
+ 
+ # Check if we can use "mv -T"
+-if mv -T ... ... 2>&1 | grep '\.\.\.' > /dev/null ; then
++# FreeBSD mv doesn't support this, so supress scary messages in the terminal
++#if mv -T ... ... 2>&1 | grep '\.\.\.' > /dev/null ; then
++if false; then
+    # We can securely move files in /tmp with mv -T
+    DEBUG 1 "mv -T available"
+    MV="mv -T"
diff --git a/devel/xdg-utils/pkg-descr b/devel/xdg-utils/pkg-descr
new file mode 100644
index 000000000..63c30baba
--- /dev/null
+++ b/devel/xdg-utils/pkg-descr
@@ -0,0 +1,3 @@
+Tools to allow all applications to easily integrate with the free desktop.
+
+WWW: http://portland.freedesktop.org/