Index: devel/xdg-utils/Makefile =================================================================== --- devel/xdg-utils/Makefile (revision 407388) +++ devel/xdg-utils/Makefile (working copy) @@ -2,21 +2,19 @@ # $FreeBSD$ PORTNAME= xdg-utils -PORTVERSION= 1.0.2.${SNAPDATE} -PORTREVISION= 3 +PORTVERSION= 1.1.1 CATEGORIES= devel -#MASTER_SITES= http://portland.freedesktop.org/download/ -MASTER_SITES= LOCAL/kwm +MASTER_SITES= http://portland.freedesktop.org/download/ MAINTAINER= gnome@FreeBSD.org COMMENT= Tools to allow all applications to integrate with the free desktop +BUILD_DEPENDS= xmlto:${PORTSDIR}/textproc/xmlto RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ xprop:${PORTSDIR}/x11/xprop \ xset:${PORTSDIR}/x11/xset -SNAPDATE= 20130919 -USES= tar:xz +USES= gmake GNU_CONFIGURE= yes post-patch: Index: devel/xdg-utils/distinfo =================================================================== --- devel/xdg-utils/distinfo (revision 407378) +++ devel/xdg-utils/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xdg-utils-1.0.2.20130919.tar.xz) = 0e442c717d1bbb503615e0dd84ab33d9bd9d0594127259be21478e3eef30e10e -SIZE (xdg-utils-1.0.2.20130919.tar.xz) = 1227120 +SHA256 (xdg-utils-1.1.1.tar.gz) = b0dd63a2576e0bb16f1aa78d6ddf7d6784784a098d4df17161cd6a17c7bc4125 +SIZE (xdg-utils-1.1.1.tar.gz) = 295213 Index: devel/xdg-utils/files/patch-scripts_xdg-desktop-menu =================================================================== --- devel/xdg-utils/files/patch-scripts_xdg-desktop-menu (revision 407378) +++ devel/xdg-utils/files/patch-scripts_xdg-desktop-menu (nonexistent) @@ -1,47 +0,0 @@ ---- 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:" Property changes on: devel/xdg-utils/files/patch-scripts_xdg-desktop-menu ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: devel/xdg-utils/files/patch-scripts_xdg-desktop-menu.in =================================================================== --- devel/xdg-utils/files/patch-scripts_xdg-desktop-menu.in (nonexistent) +++ devel/xdg-utils/files/patch-scripts_xdg-desktop-menu.in (working copy) @@ -0,0 +1,47 @@ +--- scripts/xdg-desktop-menu.in.orig 2016-01-27 22:06:06.661844000 +0100 ++++ scripts/xdg-desktop-menu.in 2016-01-27 22:08:30.057702000 +0100 +@@ -67,7 +67,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/share/ + if [ x"$mode" = x"user" ] ; then + xdg_user_dir="$XDG_DATA_HOME" + [ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share" +@@ -110,7 +110,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 +@@ -475,7 +475,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/share/ + xdg_global_dir= + for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do + if [ -w $x/$xdg_dir_name ] ; then +@@ -542,7 +542,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/share/ + xdg_global_dir= + for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do + if [ -w $x/$xdg_dir_name ] ; then +@@ -556,7 +556,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:" Property changes on: devel/xdg-utils/files/patch-scripts_xdg-desktop-menu.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/xdg-utils/files/patch-scripts_xdg-email =================================================================== --- devel/xdg-utils/files/patch-scripts_xdg-email (revision 407378) +++ devel/xdg-utils/files/patch-scripts_xdg-email (nonexistent) @@ -1,27 +0,0 @@ ---- scripts/xdg-email.orig 2013-08-24 17:56:29.000000000 +0200 -+++ scripts/xdg-email 2013-08-24 18:03:28.000000000 +0200 -@@ -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 Property changes on: devel/xdg-utils/files/patch-scripts_xdg-email ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: devel/xdg-utils/files/patch-scripts_xdg-email.in =================================================================== --- devel/xdg-utils/files/patch-scripts_xdg-email.in (nonexistent) +++ devel/xdg-utils/files/patch-scripts_xdg-email.in (working copy) @@ -0,0 +1,38 @@ +--- scripts/xdg-email.in.orig 2016-01-27 22:09:31.736910000 +0100 ++++ scripts/xdg-email.in 2016-01-27 22:46:01.701427000 +0100 +@@ -34,7 +34,7 @@ + { + local THUNDERBIRD MAILTO NEWMAILTO TO CC BCC SUBJECT BODY ATTACH + THUNDERBIRD="$1" +- MAILTO=$(echo "$2" | sed 's/^mailto://') ++ MAILTO=$(echo "$2" | tr '&' '\n') + echo "$MAILTO" | grep -qs "^?" + if [ "$?" = "0" ] ; then + MAILTO=$(echo "$MAILTO" | sed 's/^?//') +@@ -48,7 +48,7 @@ + BCC=$(/bin/echo -e $(echo "$MAILTO" | grep '^bcc=' | sed 's/^bcc=//;s/%\(..\)/\\x\1/g' | awk '{ printf "%s,",$0 }')) + SUBJECT=$(echo "$MAILTO" | grep '^subject=' | tail -n 1) + BODY=$(echo "$MAILTO" | grep '^body=' | tail -n 1) +- ATTACH=$(/bin/echo -e $(echo "$MAILTO" | grep '^attach=' | sed 's/^attach=//;s/%\(..\)/\\x\1/g' | awk '{ 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= +@@ -293,7 +293,7 @@ + + options= + mailto= +-utf8="iconv -t utf8" ++utf8="iconv -t UTF-8" + while [ $# -gt 0 ] ; do + parm="$1" + shift +@@ -434,7 +434,7 @@ + if [ x"$BROWSER" = x"" ]; then + BROWSER=www-browser:links2:elinks:links:lynx:w3m + if [ -n "$DISPLAY" ]; then +- BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chromium-browser:google-chrome:$BROWSER ++ BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chrome:chromium-browser:google-chrome:$BROWSER + fi + fi + Property changes on: devel/xdg-utils/files/patch-scripts_xdg-email.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/xdg-utils/files/patch-scripts_xdg-icon-resource =================================================================== --- devel/xdg-utils/files/patch-scripts_xdg-icon-resource (revision 407378) +++ devel/xdg-utils/files/patch-scripts_xdg-icon-resource (nonexistent) @@ -1,11 +0,0 @@ ---- 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" Property changes on: devel/xdg-utils/files/patch-scripts_xdg-icon-resource ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: devel/xdg-utils/files/patch-scripts_xdg-icon-resource.in =================================================================== --- devel/xdg-utils/files/patch-scripts_xdg-icon-resource.in (nonexistent) +++ devel/xdg-utils/files/patch-scripts_xdg-icon-resource.in (working copy) @@ -0,0 +1,11 @@ +--- scripts/xdg-icon-resource.in.orig 2016-01-27 22:13:25.171381000 +0100 ++++ scripts/xdg-icon-resource.in 2016-01-27 22:13:51.264266000 +0100 +@@ -222,7 +222,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/share/" + for x in `echo "$xdg_system_dirs" | sed 's/:/ /g'`; do + if [ -w "$x/$xdg_dir_name" ] ; then + xdg_global_prefix="$x/icons" Property changes on: devel/xdg-utils/files/patch-scripts_xdg-icon-resource.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/xdg-utils/files/patch-scripts_xdg-mime =================================================================== --- devel/xdg-utils/files/patch-scripts_xdg-mime (revision 407378) +++ devel/xdg-utils/files/patch-scripts_xdg-mime (nonexistent) @@ -1,38 +0,0 @@ ---- 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" Property changes on: devel/xdg-utils/files/patch-scripts_xdg-mime ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: devel/xdg-utils/files/patch-scripts_xdg-mime.in =================================================================== --- devel/xdg-utils/files/patch-scripts_xdg-mime.in (nonexistent) +++ devel/xdg-utils/files/patch-scripts_xdg-mime.in (working copy) @@ -0,0 +1,47 @@ +--- scripts/xdg-mime.in.orig 2016-01-27 22:14:36.041781000 +0100 ++++ scripts/xdg-mime.in 2016-01-27 22:17:25.276625000 +0100 +@@ -315,7 +315,7 @@ + [ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share" + + 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/share/ + + preference=-1 + desktop_file="" +@@ -389,7 +389,7 @@ + xdg_user_dir="$XDG_DATA_HOME" + [ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share" + 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/share/ + + local oldifs="$IFS" dir + +@@ -492,7 +492,7 @@ + ;; + esac + check_input_file "$filename" +- filename=`readlink -f -- "$filename"` ++ filename=`stat -f "$filename"` + ;; + + default) +@@ -694,7 +694,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/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" +@@ -726,7 +726,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" Property changes on: devel/xdg-utils/files/patch-scripts_xdg-mime.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/xdg-utils/files/patch-scripts_xdg-open =================================================================== --- devel/xdg-utils/files/patch-scripts_xdg-open (revision 407388) +++ devel/xdg-utils/files/patch-scripts_xdg-open (nonexistent) @@ -1,153 +0,0 @@ ---- scripts/xdg-open.orig 2016-01-27 21:08:36.394542000 +0100 -+++ scripts/xdg-open 2016-01-27 21:43:57.950007000 +0100 -@@ -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 -@@ -303,13 +309,34 @@ - - detectDE() - { -- if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; -- 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; -- else DE="" -- fi -+ #First check the XDG_CURRENT_DESKTOP environment variable (latest standards - case sensitive) -+ if [ "${XDG_CURRENT_DESKTOP}" == "KDE" ]; then DE=kde; -+ elif [ "${XDG_CURRENT_DESKTOP}" == "LXDE" ]; then DE=lxde; -+ elif [ "${XDG_CURRENT_DESKTOPN}" == "MATE" ]; then DE=mate; -+ elif [ "${XDG_CURRENT_DESKTOP}" == "GNOME" ]; then DE=gnome; -+ elif [ "${XDG_CURRENT_DESKTOP}" == "CINNAMON" ]; then DE=gnome; -+ elif [ "${XDG_CURRENT_DESKTOP}" == "XFCE" ]; then DE=xfce; -+ elif [ "${XDG_CURRENT_DESKTOP}" == "Lumina" ]; then DE=lumina; -+ #Check for the PCDM_SESSION environment variable (always uppercase) -+ elif [ "${PCDM_SESSION}" == "KDE" ]; then DE=kde; -+ elif [ "${PCDM_SESSION}" == "LXDE" ]; then DE=lxde; -+ elif [ "${PCDM_SESSION}" == "MATE" ]; then DE=mate; -+ elif [ "${PCDM_SESSION}" == "GNOME" ]; then DE=gnome; -+ elif [ "${PCDM_SESSION}" == "CINNAMON" ]; then DE=gnome; -+ elif [ "${PCDM_SESSION}" == "XFCE" ]; then DE=xfce; -+ elif [ "${PCDM_SESSION}" == "LUMINA" ]; then DE=lumina; -+ #Otherwise use the old/classic methods for detection -+ elif [ x"$KDE_FULL_SESSION" == x"true" ]; then DE=kde; -+ 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; -+ #Simple fallback for non-XDG window managers if Lumina is installed in the normal place (no heavy runtime dependencies) -+ elif [ -x "/usr/local/bin/lumina-open" ]; then DE=lumina; -+ #No DE found -+ else DE="" -+ fi -+ unset UR_PROCS - } - - #---------------------------------------------------------------------------- -@@ -339,15 +366,18 @@ - - open_kde() - { -- if kde-open -v 2>/dev/null 1>&2; then -- kde-open "$1" -+ if [ -n "$KDE_SESSION_VERSION" ]; then -+ case "${KDE_SESSION_VERSION}" in -+ 4) -+ kde-open "$1" -+ ;; -+ 5) -+ kde-open${KDE_SESSION_VERSION} "$1" -+ ;; -+ esac - else -- if [ x"$KDE_SESSION_VERSION" = x"4" ]; then -- kfmclient openURL "$1" -- else -- kfmclient exec "$1" -- kfmclient_fix_exit_code $? -- fi -+ kfmclient exec "$1" -+ kfmclient_fix_exit_code $? - fi - - if [ $? -eq 0 ]; then -@@ -383,6 +413,28 @@ - fi - } - -+open_mate() -+{ -+ gvfs-open "$1" -+ -+ if [ $? -eq 0 ]; then -+ exit_success -+ else -+ exit_failure_operation_failed -+ fi -+} -+ -+open_lumina() -+{ -+ lumina-open "$1" -+ -+ if [ $? -eq 0 ]; then -+ exit_success -+ else -+ exit_failure_operation_failed -+ fi -+} -+ - open_generic_xdg_mime() - { - filetype=`xdg-mime query filetype "$1" | sed "s/;.*//"` -@@ -421,7 +473,7 @@ - # Decode URLs - if echo "$file" | grep -q '^file:///'; then - file=${file#file://} -- file="$(printf "$(echo "$file" | sed -e 's@%\([a-f0-9A-F]\{2\}\)@\\x\1@g')")" -+ file="$(echo "$file" | unvis -h)" - fi - check_input_file "$file" - -@@ -527,7 +579,7 @@ - if [ x"$BROWSER" = x"" ]; then - BROWSER=links2:links:lynx:w3m - if [ -n "$DISPLAY" ]; then -- BROWSER=firefox:mozilla:epiphany:konqueror:chromium-browser:google-chrome:$BROWSER -+ BROWSER=firefox:mozilla:epiphany:konqueror:chrome:chromium-browser:google-chrome:$BROWSER - fi - fi - -@@ -540,6 +592,10 @@ - open_gnome "$url" - ;; - -+ mate) -+ open_mate "$url" -+ ;; -+ - xfce) - open_xfce "$url" - ;; -@@ -548,6 +604,10 @@ - open_lxde "$url" - ;; - -+ lumina) -+ open_lumina "$url" -+ ;; -+ - generic) - open_generic "$url" - ;; Property changes on: devel/xdg-utils/files/patch-scripts_xdg-open ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: devel/xdg-utils/files/patch-scripts_xdg-open.in =================================================================== --- devel/xdg-utils/files/patch-scripts_xdg-open.in (nonexistent) +++ devel/xdg-utils/files/patch-scripts_xdg-open.in (working copy) @@ -0,0 +1,62 @@ +--- scripts/xdg-open.in.orig 2016-01-27 22:52:37.829535000 +0100 ++++ scripts/xdg-open.in 2016-01-28 11:10:29.639949000 +0100 +@@ -15,6 +15,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 +@@ -92,7 +98,7 @@ + if [ -x /usr/bin/printf ]; then + printf=/usr/bin/printf + fi +- file=$($printf "$(echo "$file" | sed -e 's@%\([a-f0-9A-F]\{2\}\)@\\x\1@g')") ++ file=$(echo "$file" | unvis -h) + fi + echo "$file" + } +@@ -211,6 +217,17 @@ + fi + } + ++open_lumina() ++{ ++ lumina-open "$1" ++ ++ if [ $? -eq 0 ]; then ++ exit_success ++ else ++ exit_failure_operation_failed ++ fi ++} ++ + #----------------------------------------- + # Recursively search .desktop file + +@@ -380,7 +397,7 @@ + if [ x"$BROWSER" = x"" ]; then + BROWSER=www-browser:links2:elinks:links:lynx:w3m + if [ -n "$DISPLAY" ]; then +- BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chromium-browser:google-chrome:$BROWSER ++ BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chrome:chromium-browser:google-chrome:$BROWSER + fi + fi + +@@ -472,6 +489,10 @@ + open_mate "$url" + ;; + ++ lumina) ++ open_lumina "$url" ++ ;; ++ + xfce) + open_xfce "$url" + ;; Property changes on: devel/xdg-utils/files/patch-scripts_xdg-open.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/xdg-utils/files/patch-scripts_xdg-screensaver =================================================================== --- devel/xdg-utils/files/patch-scripts_xdg-screensaver (revision 407378) +++ devel/xdg-utils/files/patch-scripts_xdg-screensaver (nonexistent) @@ -1,13 +0,0 @@ ---- 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" Property changes on: devel/xdg-utils/files/patch-scripts_xdg-screensaver ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: devel/xdg-utils/files/patch-scripts_xdg-screensaver.in =================================================================== --- devel/xdg-utils/files/patch-scripts_xdg-screensaver.in (nonexistent) +++ devel/xdg-utils/files/patch-scripts_xdg-screensaver.in (working copy) @@ -0,0 +1,13 @@ +--- scripts/xdg-screensaver.in.orig 2016-01-27 22:18:04.068869000 +0100 ++++ scripts/xdg-screensaver.in 2016-01-27 22:18:32.024901000 +0100 +@@ -27,7 +27,9 @@ + #@xdg-utils-common@ + + # 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" Property changes on: devel/xdg-utils/files/patch-scripts_xdg-screensaver.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/xdg-utils/files/patch-scripts_xdg-utils-common.in =================================================================== --- devel/xdg-utils/files/patch-scripts_xdg-utils-common.in (nonexistent) +++ devel/xdg-utils/files/patch-scripts_xdg-utils-common.in (working copy) @@ -0,0 +1,56 @@ +--- scripts/xdg-utils-common.in.orig 2016-01-27 22:52:37.833381000 +0100 ++++ scripts/xdg-utils-common.in 2016-01-28 09:44:29.953139000 +0100 +@@ -279,6 +279,44 @@ + XFCE) + DE=xfce + ;; ++ Lumina) ++ DE=lumina ++ ;; ++ X-Generic) ++ DE=generic ++ ;; ++ esac ++ fi ++ ++# xxx PCDM_SESSION check here? ++ if [ -n "${PCDM_SESSION}" ]; then ++ case "${PCDM_SESSION}" in ++ # only recently added to menu-spec, pre-spec X- still in use ++ CINNAMON) ++ DE=cinnamon; ++ ;; ++ ENLIGHTENMENT) ++ DE=enlightenment; ++ ;; ++ # GNOME, GNOME-Classic:GNOME, or GNOME-Flashback:GNOME ++ GNOME*) ++ DE=gnome; ++ ;; ++ KDE) ++ DE=kde; ++ ;; ++ LXDE) ++ DE=lxde; ++ ;; ++ MATE) ++ DE=mate; ++ ;; ++ XFCE) ++ DE=xfce ++ ;; ++ LUMINA) ++ DE=lumina ++ ;; + X-Generic) + DE=generic + ;; +@@ -294,6 +332,8 @@ + elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; + elif xprop -root 2> /dev/null | grep -i '^xfce_desktop_window' >/dev/null 2>&1; then DE=xfce + elif echo $DESKTOP | grep -q '^Enlightenment'; then DE=enlightenment; ++ #Simple fallback for non-XDG window managers if Lumina is installed in the normal place (no heavy runtime dependencies) ++ elif [ -x "/usr/local/bin/lumina-open" ]; then DE=lumina; + fi + fi + Property changes on: devel/xdg-utils/files/patch-scripts_xdg-utils-common.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property