[Midnightbsd-cvs] mports [22136] trunk/devel/xdg-utils: xdg-utils 1.1.1
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Dec 24 10:28:50 EST 2016
Revision: 22136
http://svnweb.midnightbsd.org/mports/?rev=22136
Author: laffer1
Date: 2016-12-24 10:28:50 -0500 (Sat, 24 Dec 2016)
Log Message:
-----------
xdg-utils 1.1.1
Modified Paths:
--------------
trunk/devel/xdg-utils/Makefile
trunk/devel/xdg-utils/distinfo
Added Paths:
-----------
trunk/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu.in
trunk/devel/xdg-utils/files/patch-scripts_xdg-email.in
trunk/devel/xdg-utils/files/patch-scripts_xdg-icon-resource.in
trunk/devel/xdg-utils/files/patch-scripts_xdg-mime.in
trunk/devel/xdg-utils/files/patch-scripts_xdg-open.in
trunk/devel/xdg-utils/files/patch-scripts_xdg-screensaver.in
trunk/devel/xdg-utils/files/patch-scripts_xdg-utils-common.in
Removed Paths:
-------------
trunk/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu
trunk/devel/xdg-utils/files/patch-scripts_xdg-email
trunk/devel/xdg-utils/files/patch-scripts_xdg-icon-resource
trunk/devel/xdg-utils/files/patch-scripts_xdg-mime
trunk/devel/xdg-utils/files/patch-scripts_xdg-open
trunk/devel/xdg-utils/files/patch-scripts_xdg-screensaver
Modified: trunk/devel/xdg-utils/Makefile
===================================================================
--- trunk/devel/xdg-utils/Makefile 2016-12-24 15:21:23 UTC (rev 22135)
+++ trunk/devel/xdg-utils/Makefile 2016-12-24 15:28:50 UTC (rev 22136)
@@ -1,35 +1,26 @@
-# $MidnightBSD$
+# Created by: Michael Johnson <ahze at FreeBSD.org>
+# $FreeBSD: head/devel/xdg-utils/Makefile 421690 2016-09-10 13:12:11Z amdmi3 $
PORTNAME= xdg-utils
-PORTVERSION= 1.0.2
-PORTREVISION= 3
+PORTVERSION= 1.1.1
CATEGORIES= devel
MASTER_SITES= http://portland.freedesktop.org/download/
-EXTRACT_SUFX= .tgz
MAINTAINER= ports at MidnightBSD.org
COMMENT= Tools to allow all applications to integrate with the free desktop
+
LICENSE= mit
+LICENSE_FILE= ${WRKSRC}/LICENSE
+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
+USES= gmake
GNU_CONFIGURE= yes
-XDG_FILES= xdg-desktop-icon \
- xdg-desktop-menu \
- xdg-email \
- xdg-icon-resource \
- xdg-mime \
- xdg-open \
- xdg-screensaver
+NO_ARCH= yes
-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-*
Modified: trunk/devel/xdg-utils/distinfo
===================================================================
--- trunk/devel/xdg-utils/distinfo 2016-12-24 15:21:23 UTC (rev 22135)
+++ trunk/devel/xdg-utils/distinfo 2016-12-24 15:28:50 UTC (rev 22136)
@@ -1,2 +1,2 @@
-SHA256 (xdg-utils-1.0.2.tgz) = 21aeb7d16b2529b8d3975118f59eec09953e09f9a68d718159e98c90474b01ac
-SIZE (xdg-utils-1.0.2.tgz) = 282262
+SHA256 (xdg-utils-1.1.1.tar.gz) = b0dd63a2576e0bb16f1aa78d6ddf7d6784784a098d4df17161cd6a17c7bc4125
+SIZE (xdg-utils-1.1.1.tar.gz) = 295213
Deleted: trunk/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu
===================================================================
--- trunk/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu 2016-12-24 15:21:23 UTC (rev 22135)
+++ trunk/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu 2016-12-24 15:28:50 UTC (rev 22136)
@@ -1,52 +0,0 @@
---- scripts/xdg-desktop-menu.orig Fri Oct 27 16:15:47 2006
-+++ scripts/xdg-desktop-menu Fri Oct 27 16:37:13 2006
-@@ -696,7 +696,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"
-@@ -739,7 +739,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
-@@ -1099,7 +1099,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
-@@ -1166,7 +1166,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
-@@ -1176,11 +1176,11 @@
- done
-
- kde_user_dir="$HOME/.kde/share/applnk"
--kde_global_dir="/usr/share/applnk"
-+kde_global_dir="%%LOCALBASE%%/share/applnk"
- [ -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=
-
- [ -f /etc/mandriva-release ] && need_mandriva_fix=true
Added: trunk/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu.in
===================================================================
--- trunk/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu.in (rev 0)
+++ trunk/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu.in 2016-12-24 15:28:50 UTC (rev 22136)
@@ -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: trunk/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu.in
___________________________________________________________________
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
Deleted: trunk/devel/xdg-utils/files/patch-scripts_xdg-email
===================================================================
--- trunk/devel/xdg-utils/files/patch-scripts_xdg-email 2016-12-24 15:21:23 UTC (rev 22135)
+++ trunk/devel/xdg-utils/files/patch-scripts_xdg-email 2016-12-24 15:28:50 UTC (rev 22136)
@@ -1,11 +0,0 @@
---- scripts/xdg-email.orig 2008-04-08 21:21:25.156668001 -0400
-+++ scripts/xdg-email 2008-04-08 21:22:20.347011466 -0400
-@@ -480,7 +480,7 @@
-
- options=
- mailto=
--utf8="iconv -t utf8"
-+utf8="iconv -t UTF-8"
- while [ $# -gt 0 ] ; do
- parm="$1"
- shift
Added: trunk/devel/xdg-utils/files/patch-scripts_xdg-email.in
===================================================================
--- trunk/devel/xdg-utils/files/patch-scripts_xdg-email.in (rev 0)
+++ trunk/devel/xdg-utils/files/patch-scripts_xdg-email.in 2016-12-24 15:28:50 UTC (rev 22136)
@@ -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: trunk/devel/xdg-utils/files/patch-scripts_xdg-email.in
___________________________________________________________________
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
Deleted: trunk/devel/xdg-utils/files/patch-scripts_xdg-icon-resource
===================================================================
--- trunk/devel/xdg-utils/files/patch-scripts_xdg-icon-resource 2016-12-24 15:21:23 UTC (rev 22135)
+++ trunk/devel/xdg-utils/files/patch-scripts_xdg-icon-resource 2016-12-24 15:28:50 UTC (rev 22136)
@@ -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"
Added: trunk/devel/xdg-utils/files/patch-scripts_xdg-icon-resource.in
===================================================================
--- trunk/devel/xdg-utils/files/patch-scripts_xdg-icon-resource.in (rev 0)
+++ trunk/devel/xdg-utils/files/patch-scripts_xdg-icon-resource.in 2016-12-24 15:28:50 UTC (rev 22136)
@@ -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: trunk/devel/xdg-utils/files/patch-scripts_xdg-icon-resource.in
___________________________________________________________________
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
Deleted: trunk/devel/xdg-utils/files/patch-scripts_xdg-mime
===================================================================
--- trunk/devel/xdg-utils/files/patch-scripts_xdg-mime 2016-12-24 15:21:23 UTC (rev 22135)
+++ trunk/devel/xdg-utils/files/patch-scripts_xdg-mime 2016-12-24 15:28:50 UTC (rev 22136)
@@ -1,38 +0,0 @@
---- scripts/xdg-mime.orig 2007-06-24 15:57:57.000000000 -0400
-+++ scripts/xdg-mime 2008-04-08 20:57:53.179475369 -0400
-@@ -474,7 +474,7 @@
-
- info_gnome()
- {
-- file=`readlink -f "$1"` # Normalize path
-+ file=`stat -f "$1"` # Normalize path
- DEBUG 1 "Running gnomevfs-info \"$file\""
- gnomevfs-info "$file" 2> /dev/null | grep MIME | cut -d ":" -f 2 | sed s/"^ "//
-
-@@ -557,7 +557,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"
-@@ -827,7 +827,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"
-@@ -859,7 +859,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"
Added: trunk/devel/xdg-utils/files/patch-scripts_xdg-mime.in
===================================================================
--- trunk/devel/xdg-utils/files/patch-scripts_xdg-mime.in (rev 0)
+++ trunk/devel/xdg-utils/files/patch-scripts_xdg-mime.in 2016-12-24 15:28:50 UTC (rev 22136)
@@ -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: trunk/devel/xdg-utils/files/patch-scripts_xdg-mime.in
___________________________________________________________________
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
Deleted: trunk/devel/xdg-utils/files/patch-scripts_xdg-open
===================================================================
--- trunk/devel/xdg-utils/files/patch-scripts_xdg-open 2016-12-24 15:21:23 UTC (rev 22135)
+++ trunk/devel/xdg-utils/files/patch-scripts_xdg-open 2016-12-24 15:28:50 UTC (rev 22136)
@@ -1,26 +0,0 @@
---- scripts/xdg-open.orig
-+++ scripts/xdg-open
-@@ -31,6 +31,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
-@@ -364,7 +370,9 @@ open_generic()
- for browser in $BROWSER; do
- if [ x"$browser" != x"" ]; then
-
-- browser_with_arg=`echo "$browser" | sed s#%s#"$1"#`
-+ browser_with_arg=`printf "$browser" "$1" 2>/dev/null`
-+ if [ $? -ne 0 ]; then browser_with_arg=$browser;
-+ fi
-
- if [ x"$browser_with_arg" = x"$browser" ]; then "$browser" "$1";
- else $browser_with_arg;
Added: trunk/devel/xdg-utils/files/patch-scripts_xdg-open.in
===================================================================
--- trunk/devel/xdg-utils/files/patch-scripts_xdg-open.in (rev 0)
+++ trunk/devel/xdg-utils/files/patch-scripts_xdg-open.in 2016-12-24 15:28:50 UTC (rev 22136)
@@ -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 at 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: trunk/devel/xdg-utils/files/patch-scripts_xdg-open.in
___________________________________________________________________
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
Deleted: trunk/devel/xdg-utils/files/patch-scripts_xdg-screensaver
===================================================================
--- trunk/devel/xdg-utils/files/patch-scripts_xdg-screensaver 2016-12-24 15:21:23 UTC (rev 22135)
+++ trunk/devel/xdg-utils/files/patch-scripts_xdg-screensaver 2016-12-24 15:28:50 UTC (rev 22136)
@@ -1,16 +0,0 @@
-
---- ./scripts/xdg-screensaver.orig 2010-06-29 12:36:04.000000000 -0400
-+++ ./scripts/xdg-screensaver 2010-06-29 12:37:22.000000000 -0400
-@@ -355,7 +355,9 @@
- }
-
- # Check if we can use "mv -T"
--if mv -T ... ... 2>&1 | grep '\.\.\.' > /dev/null ; then
-+# MidnightBSD cannot, 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"
-
-
Added: trunk/devel/xdg-utils/files/patch-scripts_xdg-screensaver.in
===================================================================
--- trunk/devel/xdg-utils/files/patch-scripts_xdg-screensaver.in (rev 0)
+++ trunk/devel/xdg-utils/files/patch-scripts_xdg-screensaver.in 2016-12-24 15:28:50 UTC (rev 22136)
@@ -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
++# BSD 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: trunk/devel/xdg-utils/files/patch-scripts_xdg-screensaver.in
___________________________________________________________________
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
Added: trunk/devel/xdg-utils/files/patch-scripts_xdg-utils-common.in
===================================================================
--- trunk/devel/xdg-utils/files/patch-scripts_xdg-utils-common.in (rev 0)
+++ trunk/devel/xdg-utils/files/patch-scripts_xdg-utils-common.in 2016-12-24 15:28:50 UTC (rev 22136)
@@ -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: trunk/devel/xdg-utils/files/patch-scripts_xdg-utils-common.in
___________________________________________________________________
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
More information about the Midnightbsd-cvs
mailing list