cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to xdg-utils-1.1.0rc1.

Browse Source 
The 1.0 serie hasn't seen an update for 5 years and this release
contains lots of fixes for new version desktops.

While here, remove the hook stuff; that is what aliases or ~/bin are for.
This commit is contained in:
ajacoutot 2012-04-09 09:39:15 +00:00
parent cb5ee82ab4
commit 1c03866b13
13 changed files with 108 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
devel/xdg-utils/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2012/04/06 07:53:38 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.18 2012/04/09 09:39:15 ajacoutot Exp $
# Does _not_ depend on desktop-file-utils, hicolor-icon-theme,
# gtk-update-icon-cache, shared-mime-info... on purpose as it should
@ -6,9 +6,8 @@
COMMENT= utilities to assist desktop integration tasks
DISTNAME= xdg-utils-1.0.2
EXTRACT_SUFX= .tgz
REVISION= 13
DISTNAME= xdg-utils-1.1.0-rc1
PKGNAME= xdg-utils-1.1.0rc1
CATEGORIES= devel
@ -27,21 +26,21 @@ MASTER_SITES= http://portland.freedesktop.org/download/
NO_BUILD= Yes
NO_REGRESS= Yes
USE_GROFF = Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= XMLTO=${LOCALBASE}/bin/xmlto
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= ac_cv_path_XMLTO=""
pre-configure:
${SUBST_CMD} \
${WRKSRC}/scripts/{xdg-desktop-menu,xdg-icon-resource,xdg-mime}
${WRKSRC}/scripts/xdg-desktop-menu \
${WRKSRC}/scripts/xdg-icon-resource \
${WRKSRC}/scripts/xdg-mime \
${WRKSRC}/scripts/xdg-open \
${WRKSRC}/scripts/xdg-settings
post-install:
# Official NetBeans does not know about OpenBSD, thus at least
# some java apps use 'email' and 'open' as fallbacks.
ln -s xdg-email ${PREFIX}/bin/email
ln -s xdg-open ${PREFIX}/bin/open
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xdg-utils
${INSTALL_SCRIPT} ${FILESDIR}/x* ${PREFIX}/share/examples/xdg-utils
.include <bsd.port.mk>

10
devel/xdg-utils/distinfo
View File

@ -1,5 +1,5 @@
MD5 (xdg-utils-1.0.2.tgz) = NIpbkdxmQmUFAix0pkspQA==
RMD160 (xdg-utils-1.0.2.tgz) = NESCkX6MeAYT7CCxA/jlEyJUDAQ=
SHA1 (xdg-utils-1.0.2.tgz) = 5BoEy/n/jXQzl6K8I8bKgui1nSw=
SHA256 (xdg-utils-1.0.2.tgz) = Ia630WslKbjTl1EY9Z7sCZU+CfmmjXGBWemMkEdLAaw=
SIZE (xdg-utils-1.0.2.tgz) = 282262
MD5 (xdg-utils-1.1.0-rc1.tar.gz) = +t9eegjgUm/GDb4+W3741g==
RMD160 (xdg-utils-1.1.0-rc1.tar.gz) = o8v4tqcSJZMxiO+9OG9TSxLABOk=
SHA1 (xdg-utils-1.1.0-rc1.tar.gz) = W9Xi/hDjBVzOw0foYIR2+rLT6so=
SHA256 (xdg-utils-1.1.0-rc1.tar.gz) = ewVViuS7jt41aGPK6MQuPgEqpCG/nUUTClcP0gnXkQI=
SIZE (xdg-utils-1.1.0-rc1.tar.gz) = 300546

20
devel/xdg-utils/files/xdg-email-hook.pl
View File

@ -1,20 +0,0 @@
#!/usr/bin/perl
# $OpenBSD: xdg-email-hook.pl,v 1.1 2008/11/01 19:30:07 ajacoutot Exp $
use strict;
use warnings;
use URI;
$ARGV[0] =~ /^mailto:/ or die "Usage: $0 <mailtoURI>\n";
my $uri = URI->new($ARGV[0]);
my %headers = $uri->headers;
my $to = $uri->to;
my @cmd = ("xmutt");
push @cmd, '--body', $headers{body} if exists $headers{body};
push @cmd, '-b', $headers{bcc} if exists $headers{bcc};
push @cmd, '-c', $headers{cc} if exists $headers{cc};
push @cmd, '-s', $headers{subject} if exists $headers{subject};
exec @cmd, $to;

16
devel/xdg-utils/files/xdg-open-hook.sh
View File

@ -1,16 +0,0 @@
#!/bin/sh
# $OpenBSD: xdg-open-hook.sh,v 1.1 2008/11/01 19:30:07 ajacoutot Exp $
filename=`echo "$1" | sed s#file:##`
case $filename in
*.pdf)
if `which xpdf > /dev/null`; then
xpdf $filename &
elif `which acroread > /dev/null`; then
acroread $filename &
fi
;;
*)
opera "$1" &
;;
esac

15
devel/xdg-utils/files/xmutt.sh
View File

@ -1,15 +0,0 @@
#!/bin/sh
# $OpenBSD: xmutt.sh,v 1.1 2008/11/01 19:30:07 ajacoutot Exp $
export PATH=$PATH:/usr/X11R6/bin:/usr/local/bin
if [ "$1" = "--body" ]; then
mail=`mktemp /tmp/mutt.XXXXXXXXXX` || exit 1
trap 'rm $mail' 0 1 15
echo "$2" | tr "\r\f" "\n" > $mail
recode utf8..latin1 $mail
shift 2
xterm -e mutt -i $mail "$@"
else
xterm -e mutt "$@"
fi

33
devel/xdg-utils/patches/patch-scripts_xdg-desktop-menu
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-scripts_xdg-desktop-menu,v 1.1.1.1 2008/10/30 14:28:36 ajacoutot Exp $
--- scripts/xdg-desktop-menu.orig Thu Oct 30 14:45:02 2008
+++ scripts/xdg-desktop-menu Thu Oct 30 14:51:18 2008
@@ -696,7 +696,7 @@ make_lazy_default()
$OpenBSD: patch-scripts_xdg-desktop-menu,v 1.2 2012/04/09 09:39:15 ajacoutot Exp $
--- scripts/xdg-desktop-menu.orig Sat Jan 1 11:03:14 2011
+++ scripts/xdg-desktop-menu Mon Apr 9 10:46:52 2012
@@ -665,7 +665,7 @@ make_lazy_default()
for MIME in $mimetypes ; do
xdg_default_dirs="$XDG_DATA_DIRS"
- [ -n "$xdg_default_dirs" ] || xdg_default_dirs=/usr/local/share/:/usr/share/
@ -10,7 +10,7 @@ $OpenBSD: patch-scripts_xdg-desktop-menu,v 1.1.1.1 2008/10/30 14:28:36 ajacoutot
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 @@ update_submenu()
@@ -708,7 +708,7 @@ update_submenu()
xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
xdg_system_dirs="$XDG_CONFIG_DIRS"
@ -19,7 +19,7 @@ $OpenBSD: patch-scripts_xdg-desktop-menu,v 1.1.1.1 2008/10/30 14:28:36 ajacoutot
xdg_global_dir=
for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do
if [ -w $x/$xdg_dir_name ] ; then
@@ -787,7 +787,7 @@ update_submenu()
@@ -756,7 +756,7 @@ update_submenu()
return
fi
@ -28,7 +28,7 @@ $OpenBSD: patch-scripts_xdg-desktop-menu,v 1.1.1.1 2008/10/30 14:28:36 ajacoutot
# Work around for Debian Gnome
gnome_xdg_dir=`echo "$xdg_dir" | sed -e 's^/applications-merged^/gnome-applications-merged^'`
if [ ! -e "$gnome_xdg_dir" ] ; then
@@ -805,7 +805,7 @@ update_submenu()
@@ -774,7 +774,7 @@ update_submenu()
eval 'ln -s "applications-merged" "$mandrake_xdg_dir"'$xdg_redirect_output
fi
fi
@ -37,16 +37,16 @@ $OpenBSD: patch-scripts_xdg-desktop-menu,v 1.1.1.1 2008/10/30 14:28:36 ajacoutot
# Work around for Fedora Core 5 + patched KDE
kde_xdg_dir=`echo "$xdg_dir" | sed -e 's^/applications-merged^/kde-applications-merged^'`
if [ ! -e "$kde_xdg_dir" ] ; then
@@ -814,7 +814,7 @@ update_submenu()
@@ -783,7 +783,7 @@ update_submenu()
eval 'ln -s "applications-merged" "$kde_xdg_dir"'$xdg_redirect_output
fi
fi
fi
- if [ $action = "install" -a x"$mode" = x"system" -a -d "/etc/xdg/menus/kde-applications-merged" -a ! -d "/etc/xdg/menus/applications-merged" ] ; then
+ if [ $action = "install" -a x"$mode" = x"system" -a -d "${SYSCONFDIR}/xdg/menus/kde-applications-merged" -a ! -d "${SYSCONFDIR}/xdg/menus/applications-merged" ] ; then
# Work around for Kubuntu 6.06
kde_xdg_dir=`echo "$xdg_dir" | sed -e 's^/applications-merged^/kde-applications-merged^'`
DEBUG 1 "Kubuntu Workaround: Link '$xdg_dir' to 'kde-applications-merged'"
@@ -1102,7 +1102,7 @@ xdg_user_dir="$XDG_DATA_HOME"
@@ -1071,7 +1071,7 @@ xdg_user_dir="$XDG_DATA_HOME"
xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
xdg_system_dirs="$XDG_DATA_DIRS"
@ -55,7 +55,7 @@ $OpenBSD: patch-scripts_xdg-desktop-menu,v 1.1.1.1 2008/10/30 14:28:36 ajacoutot
xdg_global_dir=
for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do
if [ -w $x/$xdg_dir_name ] ; then
@@ -1169,7 +1169,7 @@ xdg_user_dir="$XDG_DATA_HOME"
@@ -1138,7 +1138,7 @@ xdg_user_dir="$XDG_DATA_HOME"
xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
xdg_system_dirs="$XDG_DATA_DIRS"
@ -64,12 +64,7 @@ $OpenBSD: patch-scripts_xdg-desktop-menu,v 1.1.1.1 2008/10/30 14:28:36 ajacoutot
xdg_global_dir=
for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do
if [ -w $x/$xdg_dir_name ] ; then
@@ -1179,11 +1179,11 @@ for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do
done
kde_user_dir="$HOME/.kde/share/applnk"
-kde_global_dir="/usr/share/applnk"
+kde_global_dir="${LOCALBASE}/share/applnk"
@@ -1152,7 +1152,7 @@ kde_global_dir=`kde${KDE_SESSION_VERSION}-config --pat
[ -w $kde_global_dir ] || kde_global_dir=
gnome_user_dir="$HOME/.gnome/apps"
@ -77,4 +72,4 @@ $OpenBSD: patch-scripts_xdg-desktop-menu,v 1.1.1.1 2008/10/30 14:28:36 ajacoutot
+gnome_global_dir="${LOCALBASE}/share/gnome/apps"
[ -w $gnome_global_dir ] || gnome_global_dir=
[ -f /etc/mandriva-release ] && need_mandriva_fix=true
DEBUG 3 "Install locations for *.desktop files:"

57
devel/xdg-utils/patches/patch-scripts_xdg-email
View File

@ -1,30 +1,7 @@
$OpenBSD: patch-scripts_xdg-email,v 1.4 2011/05/19 18:35:43 ajacoutot Exp $
Merge part of:
From 79fe2261b0025b36515d17d3c22c162bf1c7efb3 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Fri, 16 Oct 2009 17:10:55 +0000
Subject: * prefer gvfs-open over gnome-open
--- scripts/xdg-email.orig Sun Jun 24 21:58:04 2007
+++ scripts/xdg-email Thu May 19 20:23:55 2011
@@ -406,8 +406,13 @@ open_kde()
open_gnome()
{
- DEBUG 1 "Running gnome-open \"$1\""
- gnome-open "$1"
+ if gvfs-open --help 2>/dev/null 1>&2; then
+ DEBUG 1 "Running gvfs-open \"$1\""
+ gvfs-open "$1"
+ else
+ DEBUG 1 "Running gnome-open \"$1\""
+ gnome-open "$1"
+ fi
if [ $? -eq 0 ]; then
exit_success
@@ -480,7 +485,7 @@ result=$(echo "$1" | $utf8 | awk '
$OpenBSD: patch-scripts_xdg-email,v 1.5 2012/04/09 09:39:15 ajacoutot Exp $
--- scripts/xdg-email.orig Sat Jan 1 11:03:14 2011
+++ scripts/xdg-email Mon Apr 9 10:57:05 2012
@@ -562,7 +562,7 @@ result=$(echo "$1" | $utf8 | awk '
options=
mailto=
@ -33,26 +10,12 @@ Subject: * prefer gvfs-open over gnome-open
while [ $# -gt 0 ] ; do
parm="$1"
shift
@@ -607,12 +612,21 @@ if which xdg-email-hook.sh > /dev/null 2> /dev/null; t
@@ -699,7 +699,7 @@ fi
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:chrome:seamonkey:mozilla:epiphany:midori:konqueror:opera:firefox35:firefox36:$BROWSER
fi
fi
+if which xdg-email-hook > /dev/null 2> /dev/null; then
+ xdg-email-hook "${mailto}"
+ if [ $? -eq 0 ]; then
+ exit_success
+ else
+ exit_failure_operation_failed
+ fi
+fi
+
detectDE
if [ x"$DE" = x"" ]; then
# if BROWSER variable is not set, check some well known browsers instead
if [ x"$BROWSER" = x"" ]; then
- BROWSER=firefox:mozilla:netscape
+ BROWSER=firefox:seamonkey:epiphany:opera:mozilla:netscape
fi
DE=generic
fi

8
devel/xdg-utils/patches/patch-scripts_xdg-icon-resource
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-scripts_xdg-icon-resource,v 1.1.1.1 2008/10/30 14:28:36 ajacoutot Exp $
--- scripts/xdg-icon-resource.orig Thu Oct 30 14:48:27 2008
+++ scripts/xdg-icon-resource Thu Oct 30 14:48:47 2008
@@ -610,7 +610,7 @@ xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
$OpenBSD: patch-scripts_xdg-icon-resource,v 1.2 2012/04/09 09:39:15 ajacoutot Exp $
--- scripts/xdg-icon-resource.orig Sat Jan 1 11:03:14 2011
+++ scripts/xdg-icon-resource Mon Apr 9 10:42:20 2012
@@ -615,7 +615,7 @@ xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
xdg_global_dir=
xdg_global_prefix=
xdg_system_dirs="$XDG_DATA_DIRS"

21
devel/xdg-utils/patches/patch-scripts_xdg-mime
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-scripts_xdg-mime,v 1.6 2010/05/28 12:41:26 ajacoutot Exp $
--- scripts/xdg-mime.orig Sun Jun 24 21:57:57 2007
+++ scripts/xdg-mime Fri May 28 14:17:21 2010
@@ -557,11 +557,14 @@ defapp_generic()
$OpenBSD: patch-scripts_xdg-mime,v 1.7 2012/04/09 09:39:15 ajacoutot Exp $
--- scripts/xdg-mime.orig Sat Jan 1 11:03:14 2011
+++ scripts/xdg-mime Mon Apr 9 10:42:20 2012
@@ -676,11 +676,14 @@ defapp_generic()
[ -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"
@ -17,7 +17,7 @@ $OpenBSD: patch-scripts_xdg-mime,v 1.6 2010/05/28 12:41:26 ajacoutot Exp $
if [ -n "$trader_result" ] ; then
echo $trader_result
exit_success
@@ -827,7 +830,7 @@ xdg_user_dir="$XDG_DATA_HOME"
@@ -952,7 +955,7 @@ xdg_user_dir="$XDG_DATA_HOME"
xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
xdg_system_dirs="$XDG_DATA_DIRS"
@ -26,7 +26,7 @@ $OpenBSD: patch-scripts_xdg-mime,v 1.6 2010/05/28 12:41:26 ajacoutot Exp $
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 +862,7 @@ DEBUG 3 "kde_global_dir: $kde_global_dir"
@@ -984,7 +987,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"
@ -35,12 +35,3 @@ $OpenBSD: patch-scripts_xdg-mime,v 1.6 2010/05/28 12:41:26 ajacoutot Exp $
[ -w $gnome_global_dir ] || gnome_global_dir=
DEBUG 3 "gnome_user_dir: $gnome_user_dir"
DEBUG 3 "gnome_global_dir: $gnome_global_dir"
@@ -1076,7 +1079,7 @@ END {
# No quotes around $mimetypes
for x in $mimetypes ; do
- if grep '^# Installed by xdg-mime' $kde_dir/$x.desktop &>/dev/null ; then
+ if grep '^# Installed by xdg-mime' $kde_dir/$x.desktop >/dev/null 2>&1; then
DEBUG 1 "Removing $kde_dir/$x.desktop (KDE 3.x support)"
rm -f $kde_dir/$x.desktop
fi

70
devel/xdg-utils/patches/patch-scripts_xdg-open
View File

@ -1,57 +1,21 @@
$OpenBSD: patch-scripts_xdg-open,v 1.6 2011/05/19 18:35:43 ajacoutot Exp $
Merge part of:
From 79fe2261b0025b36515d17d3c22c162bf1c7efb3 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Fri, 16 Oct 2009 17:10:55 +0000
Subject: * prefer gvfs-open over gnome-open
--- scripts/xdg-open.orig Sun Jun 24 21:58:01 2007
+++ scripts/xdg-open Thu May 19 20:24:15 2011
@@ -338,7 +338,11 @@ open_kde()
$OpenBSD: patch-scripts_xdg-open,v 1.7 2012/04/09 09:39:15 ajacoutot Exp $
--- scripts/xdg-open.orig Sat Jan 1 11:03:14 2011
+++ scripts/xdg-open Mon Apr 9 11:13:15 2012
@@ -391,7 +391,7 @@ open_generic_xdg_mime()
[ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share"
open_gnome()
{
- gnome-open "$1"
+ if gvfs-open --help 2>/dev/null 1>&2; then
+ gvfs-open "$1"
+ else
+ gnome-open "$1"
+ fi
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/
if [ $? -eq 0 ]; then
exit_success
@@ -364,7 +368,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;
@@ -403,12 +409,21 @@ if [ -z "${url}" ] ; then
exit_failure_syntax "file or URL argument missing"
fi
+if which xdg-open-hook > /dev/null 2> /dev/null; then
+ xdg-open-hook "$url"
+ if [ $? -eq 0 ]; then
+ exit_success
+ else
+ exit_failure_operation_failed
+ fi
+fi
+
detectDE
if [ x"$DE" = x"" ]; then
# if BROWSER variable is not set, check some well known browsers instead
if [ x"$BROWSER" = x"" ]; then
- BROWSER=firefox:mozilla:netscape
+ BROWSER=firefox:chrome:midori:xxxterm:seamonkey:epiphany:opera:dillo:conkeror:kazehakase:konqueror:firefox36:firefox35
for x in `echo "$xdg_user_dir:$xdg_system_dirs" | sed 's/:/ /g'`; do
local file="$x/applications/$default"
@@ -526,7 +526,7 @@ fi
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:chrome:seamonkey:mozilla:epiphany:midori:konqueror:opera:firefox35:firefox36:${BROWSER}
fi
DE=generic
fi

39
devel/xdg-utils/patches/patch-scripts_xdg-settings Normal file
View File

@ -0,0 +1,39 @@
$OpenBSD: patch-scripts_xdg-settings,v 1.1 2012/04/09 09:39:15 ajacoutot Exp $
--- scripts/xdg-settings.orig Mon Apr 9 11:13:21 2012
+++ scripts/xdg-settings Mon Apr 9 11:14:22 2012
@@ -364,7 +364,7 @@ first_word()
binary_to_desktop_file()
{
- search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
+ search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-${LOCALBASE}/share:/usr/share}"
binary="`which "$1"`"
binary="`readlink -f "$binary"`"
base="`basename "$binary"`"
@@ -392,7 +392,7 @@ binary_to_desktop_file()
desktop_file_to_binary()
{
- search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
+ search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-${LOCALBASE}/share:/usr/share}"
desktop="`basename "$1"`"
IFS=:
for dir in $search; do
@@ -655,7 +655,7 @@ set_browser_gnome()
get_browser_xfce()
{
- search="${XDG_CONFIG_HOME:-$HOME/.config}:${XDG_CONFIG_DIRS:-/etc/xdg}"
+ search="${XDG_CONFIG_HOME:-$HOME/.config}:${XDG_CONFIG_DIRS:-${SYSCONFDIR}/xdg}"
IFS=:
for dir in $search; do
unset IFS
@@ -688,7 +688,7 @@ check_xfce_desktop_file()
# "Type" must be "X-XFCE-Helper"
# "X-XFCE-Category" must be "WebBrowser" (for web browsers, anyway)
# "X-XFCE-Commands" and "X-XFCE-CommandsWithParameter" must be set
- search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
+ search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-${LOCALBASE}/share:/usr/share}"
IFS=:
for dir in $search; do
unset IFS

9
devel/xdg-utils/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2010/11/06 08:03:05 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.5 2012/04/09 09:39:15 ajacoutot Exp $
@conflict thinkingrock-<=2.0.1p1
bin/email
bin/open
@ -9,6 +9,7 @@ bin/xdg-icon-resource
bin/xdg-mime
bin/xdg-open
bin/xdg-screensaver
bin/xdg-settings
@man man/man1/xdg-desktop-icon.1
@man man/man1/xdg-desktop-menu.1
@man man/man1/xdg-email.1
@ -16,8 +17,4 @@ bin/xdg-screensaver
@man man/man1/xdg-mime.1
@man man/man1/xdg-open.1
@man man/man1/xdg-screensaver.1
share/doc/pkg-readmes/${FULLPKGNAME}
share/examples/xdg-utils/
share/examples/xdg-utils/xdg-email-hook.pl
share/examples/xdg-utils/xdg-open-hook.sh
share/examples/xdg-utils/xmutt.sh
@man man/man1/xdg-settings.1

11
devel/xdg-utils/pkg/README
View File

@ -1,11 +0,0 @@
$OpenBSD: README,v 1.3 2012/04/06 07:53:38 ajacoutot Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
+-----------------------------------------------------------------------
Overriding xdg system scripts with specific ones can be done by creating
a script called xdg-XXX-hook into the PATH, where XXX is the
corresponding overriden action (e.g. xdg-open-hook or xdg-email-hook).
Some examples scripts are provided under:
${TRUEPREFIX}/share/examples/xdg-utils