Index: devel/xdg-utils/Makefile =================================================================== --- devel/xdg-utils/Makefile (revision 446545) +++ devel/xdg-utils/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xdg-utils -PORTVERSION= 1.1.1 +PORTVERSION= 1.1.2 CATEGORIES= devel MASTER_SITES= http://portland.freedesktop.org/download/ Index: devel/xdg-utils/distinfo =================================================================== --- devel/xdg-utils/distinfo (revision 446545) +++ devel/xdg-utils/distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (xdg-utils-1.1.1.tar.gz) = b0dd63a2576e0bb16f1aa78d6ddf7d6784784a098d4df17161cd6a17c7bc4125 -SIZE (xdg-utils-1.1.1.tar.gz) = 295213 +TIMESTAMP = 1500985890 +SHA256 (xdg-utils-1.1.2.tar.gz) = 951952e2c6bb21214e0bb54e0dffa057d30f5563300225c24c16fba846258bcc +SIZE (xdg-utils-1.1.2.tar.gz) = 296735 Index: devel/xdg-utils/files/patch-scripts_xdg-desktop-menu.in =================================================================== --- devel/xdg-utils/files/patch-scripts_xdg-desktop-menu.in (revision 446545) +++ devel/xdg-utils/files/patch-scripts_xdg-desktop-menu.in (working copy) @@ -1,47 +1,20 @@ ---- 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 @@ +--- scripts/xdg-desktop-menu.in.orig 2017-07-25 12:45:27 UTC ++++ scripts/xdg-desktop-menu.in +@@ -110,7 +110,7 @@ update_submenu() 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 ++ [ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/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 @@ +@@ -556,7 +556,7 @@ kde_global_dir=`kde${KDE_SESSION_VERSION}-config --pat [ -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" ++gnome_global_dir="/usr/local/share/gnome/apps" [ -w $gnome_global_dir ] || gnome_global_dir= DEBUG 3 "Install locations for *.desktop files:" Index: devel/xdg-utils/files/patch-scripts_xdg-email.in =================================================================== --- devel/xdg-utils/files/patch-scripts_xdg-email.in (revision 446545) +++ devel/xdg-utils/files/patch-scripts_xdg-email.in (working copy) @@ -1,6 +1,6 @@ ---- 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 @@ +--- scripts/xdg-email.in.orig 2017-07-25 12:45:27 UTC ++++ scripts/xdg-email.in +@@ -34,7 +34,7 @@ run_thunderbird() { local THUNDERBIRD MAILTO NEWMAILTO TO CC BCC SUBJECT BODY ATTACH THUNDERBIRD="$1" @@ -9,7 +9,7 @@ echo "$MAILTO" | grep -qs "^?" if [ "$?" = "0" ] ; then MAILTO=$(echo "$MAILTO" | sed 's/^?//') -@@ -48,7 +48,7 @@ +@@ -48,7 +48,7 @@ run_thunderbird() 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) @@ -18,7 +18,7 @@ if [ -z "$TO" ] ; then NEWMAILTO= -@@ -293,7 +293,7 @@ +@@ -314,7 +314,7 @@ LC_ALL="$ORIG_LC_ALL" options= mailto= @@ -27,10 +27,10 @@ while [ $# -gt 0 ] ; do parm="$1" shift -@@ -434,7 +434,7 @@ +@@ -455,7 +455,7 @@ fi if [ x"$BROWSER" = x"" ]; then BROWSER=www-browser:links2:elinks:links:lynx:w3m - if [ -n "$DISPLAY" ]; then + if has_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 Index: devel/xdg-utils/files/patch-scripts_xdg-mime.in =================================================================== --- devel/xdg-utils/files/patch-scripts_xdg-mime.in (revision 446545) +++ devel/xdg-utils/files/patch-scripts_xdg-mime.in (working copy) @@ -1,24 +1,6 @@ ---- 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 @@ +--- scripts/xdg-mime.in.orig 2017-07-25 12:45:27 UTC ++++ scripts/xdg-mime.in +@@ -500,7 +500,7 @@ case $1 in ;; esac check_input_file "$filename" @@ -27,21 +9,12 @@ ;; 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 @@ +@@ -734,7 +734,7 @@ DEBUG 3 "kde_global_dir: $kde_global_dir" # 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 ++gnome_global_dir=/usr/local/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" Index: devel/xdg-utils/files/patch-scripts_xdg-open.in =================================================================== --- devel/xdg-utils/files/patch-scripts_xdg-open.in (revision 446545) +++ devel/xdg-utils/files/patch-scripts_xdg-open.in (working copy) @@ -1,5 +1,5 @@ ---- 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 +--- scripts/xdg-open.in.orig 2017-07-25 12:45:27 UTC ++++ scripts/xdg-open.in @@ -15,6 +15,12 @@ # #--------------------------------------------- @@ -13,7 +13,7 @@ manualpage() { cat << _MANUALPAGE -@@ -92,7 +98,7 @@ +@@ -92,7 +98,7 @@ file_url_to_path() if [ -x /usr/bin/printf ]; then printf=/usr/bin/printf fi @@ -22,7 +22,7 @@ fi echo "$file" } -@@ -211,6 +217,17 @@ +@@ -246,6 +252,17 @@ open_flatpak() fi } @@ -40,23 +40,23 @@ #----------------------------------------- # Recursively search .desktop file -@@ -380,7 +397,7 @@ +@@ -415,7 +432,7 @@ open_generic() 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 + if has_display; then +- BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chromium:chromium-browser:google-chrome:$BROWSER ++ BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chrome:chromium:chromium-browser:google-chrome:$BROWSER fi fi -@@ -472,6 +489,10 @@ +@@ -505,6 +522,10 @@ case "$DE" in + + mate) open_mate "$url" ++ ;; ++ ++ lumina) ++ open_lumina "$url" ;; -+ lumina) -+ open_lumina "$url" -+ ;; -+ xfce) - open_xfce "$url" - ;; Index: devel/xdg-utils/files/patch-scripts_xdg-screensaver.in =================================================================== --- devel/xdg-utils/files/patch-scripts_xdg-screensaver.in (revision 446545) +++ devel/xdg-utils/files/patch-scripts_xdg-screensaver.in (working copy) @@ -1,6 +1,6 @@ ---- 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 @@ +--- scripts/xdg-screensaver.in.orig 2017-07-25 12:45:27 UTC ++++ scripts/xdg-screensaver.in +@@ -27,7 +27,9 @@ _USAGE #@xdg-utils-common@ # Check if we can use "mv -T" Index: devel/xdg-utils/files/patch-scripts_xdg-utils-common.in =================================================================== --- devel/xdg-utils/files/patch-scripts_xdg-utils-common.in (revision 446545) +++ devel/xdg-utils/files/patch-scripts_xdg-utils-common.in (working copy) @@ -1,6 +1,6 @@ ---- 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 @@ +--- scripts/xdg-utils-common.in.orig 2017-07-25 12:45:27 UTC ++++ scripts/xdg-utils-common.in +@@ -300,12 +300,50 @@ detectDE() XFCE) DE=xfce ;; @@ -7,12 +7,12 @@ + Lumina) + DE=lumina + ;; -+ X-Generic) -+ DE=generic -+ ;; -+ esac -+ fi -+ + X-Generic) + DE=generic + ;; + esac + fi + +# xxx PCDM_SESSION check here? + if [ -n "${PCDM_SESSION}" ]; then + case "${PCDM_SESSION}" in @@ -42,13 +42,19 @@ + 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; ++ X-Generic) ++ DE=generic ++ ;; ++ esac ++ fi ++ + if [ x"$DE" = x"" ]; then + # classic fallbacks + if [ x"$KDE_FULL_SESSION" != x"" ]; then DE=kde; +@@ -316,6 +354,8 @@ detectDE() 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; + elif [ x"$LXQT_SESSION_CONFIG" != x"" ]; then DE=lxqt; + #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 Index: devel/xdg-utils/pkg-descr =================================================================== --- devel/xdg-utils/pkg-descr (revision 446545) +++ devel/xdg-utils/pkg-descr (working copy) @@ -1,3 +1,3 @@ Tools to allow all applications to easily integrate with the free desktop. -WWW: http://portland.freedesktop.org/ +WWW: https://www.freedesktop.org/wiki/Software/xdg-utils/