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

Update to xdg-utils-1.1.1.

Browse Source
This commit is contained in:
ajacoutot 2015-11-01 22:23:03 +00:00
parent 3174a4f1cb
commit dd7692f700
6 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
devel/xdg-utils/Makefile
View File

@ -1,36 +1,33 @@
# $OpenBSD: Makefile,v 1.27 2015/01/04 15:36:22 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.28 2015/11/01 22:23:03 ajacoutot Exp $
# Does _not_ depend on desktop-file-utils, hicolor-icon-theme,
# gtk-update-icon-cache, shared-mime-info... on purpose as it should
# only use whatever is available on the system at runtime.
COMMENT= utilities to assist desktop integration tasks
COMMENT= utilities to assist desktop integration tasks
DISTNAME= xdg-utils-1.1.0-rc3
PKGNAME= xdg-utils-1.1.0rc3
REVISION= 0
DISTNAME= xdg-utils-1.1.1
CATEGORIES= devel
CATEGORIES= devel
HOMEPAGE= http://portland.freedesktop.org/
HOMEPAGE= https://wiki.freedesktop.org/www/Software/xdg-utils/
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# MIT
PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= http://people.freedesktop.org/~rdieter/xdg-utils/
MASTER_SITES= http://portland.freedesktop.org/download/
PKG_ARCH= *
USE_GMAKE= Yes
NO_TEST= Yes
PKG_ARCH= *
USE_GMAKE= Yes
BUILD_DEPENDS= textproc/xmlto
BUILD_DEPENDS= textproc/xmlto
CONFIGURE_STYLE=gnu
CONFIGURE_STYLE= gnu
pre-configure:
perl -pi -e 's,/usr/local/share,${LOCALBASE}/share,g;' \
sed -i -e 's,/usr/local/share,${LOCALBASE}/share,g;' \
-e 's,/etc/xdg,${SYSCONFDIR}/xdg,g' \
${WRKSRC}/scripts/xdg-*.in
@ -40,4 +37,7 @@ post-install:
ln -s xdg-email ${PREFIX}/bin/email
ln -s xdg-open ${PREFIX}/bin/open
do-test:
cd ${WRKSRC}/autotests && ${MAKE_PROGRAM}
.include <bsd.port.mk>

4
devel/xdg-utils/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (xdg-utils-1.1.0-rc3.tar.gz) = H++MoUjjJL9ELcYdLCCFvohCjrYw4tWlGRb6PfJF9fc=
SIZE (xdg-utils-1.1.0-rc3.tar.gz) = 288072
SHA256 (xdg-utils-1.1.1.tar.gz) = sN1jolduC7FvGqeNbd99Z4R4SgmNTfFxYc1qF8e8QSU=
SIZE (xdg-utils-1.1.1.tar.gz) = 295213

16
devel/xdg-utils/patches/patch-scripts_xdg-email_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-scripts_xdg-email_in,v 1.2 2015/01/04 15:36:22 ajacoutot Exp $
--- scripts/xdg-email.in.orig Thu Oct 9 16:44:34 2014
+++ scripts/xdg-email.in Sun Jan 4 16:32:44 2015
@@ -251,7 +251,7 @@ LC_ALL="$ORIG_LC_ALL"
$OpenBSD: patch-scripts_xdg-email_in,v 1.3 2015/11/01 22:23:03 ajacoutot Exp $
--- scripts/xdg-email.in.orig Mon Oct 5 20:59:19 2015
+++ scripts/xdg-email.in Sun Nov 1 23:15:59 2015
@@ -293,7 +293,7 @@ LC_ALL="$ORIG_LC_ALL"
options=
mailto=
@ -10,12 +10,12 @@ $OpenBSD: patch-scripts_xdg-email_in,v 1.2 2015/01/04 15:36:22 ajacoutot Exp $
while [ $# -gt 0 ] ; do
parm="$1"
shift
@@ -388,7 +388,7 @@ fi
@@ -434,7 +434,7 @@ fi
if [ x"$BROWSER" = x"" ]; then
BROWSER=links2:elinks:links:lynx:w3m
BROWSER=www-browser:links2:elinks:links:lynx:w3m
if [ -n "$DISPLAY" ]; then
- BROWSER=x-www-browser:firefox:seamonkey:mozilla:epiphany:konqueror:chromium-browser:google-chrome:$BROWSER
+ BROWSER=x-www-browser:firefox:chrome:seamonkey:mozilla:epiphany:midori:konqueror:opera:chromium-browser:google-chrome:$BROWSER
- BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chromium-browser:google-chrome:$BROWSER
+ BROWSER=x-www-browser:firefox:chrome:iceweasel:seamonkey:mozilla:epiphany:midori:konqueror:chromium-browser:google-chrome:$BROWSER
fi
fi

16
devel/xdg-utils/patches/patch-scripts_xdg-mime_in
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-scripts_xdg-mime_in,v 1.2 2015/01/04 15:36:22 ajacoutot Exp $
--- scripts/xdg-mime.in.orig Thu Oct 9 16:44:34 2014
+++ scripts/xdg-mime.in Sun Jan 4 16:32:44 2015
@@ -384,6 +384,9 @@ defapp_generic()
$OpenBSD: patch-scripts_xdg-mime_in,v 1.3 2015/11/01 22:23:03 ajacoutot Exp $
--- scripts/xdg-mime.in.orig Mon Oct 5 20:59:19 2015
+++ scripts/xdg-mime.in Sun Nov 1 23:17:38 2015
@@ -409,6 +409,9 @@ defapp_generic()
for prefix in "$XDG_MENU_PREFIX" ""; do
DEBUG 2 "Checking $x/applications/${prefix}defaults.list and $x/applications/${prefix}mimeinfo.cache"
trader_result=`grep "$MIME=" $x/applications/${prefix}defaults.list $x/applications/${prefix}mimeinfo.cache 2> /dev/null | cut -d '=' -f 2 | cut -d ';' -f 1`
+ if [ -z "$trader_result" ] ; then
+ trader_result=`grep "$MIME=" $x/applications/mimeinfo.cache 2> /dev/null | cut -d '=' -f 2 | cut -d ';' -f 1`
+ fi
trader_result=`grep "$MIME=" $x/applications/${prefix}defaults.list $x/applications/${prefix}mimeinfo.cache 2> /dev/null | head -n 1 | cut -d '=' -f 2 | cut -d ';' -f 1`
+ if [ -z "$trader_result" ] ; then
+ trader_result=`grep "$MIME=" $x/applications/mimeinfo.cache 2>/dev/null | cut -d '=' -f 2 | cut -d ';' -f 1`
+ fi
if [ -n "$trader_result" ] ; then
echo $trader_result
exit_success

22
devel/xdg-utils/patches/patch-scripts_xdg-open_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-scripts_xdg-open_in,v 1.2 2015/01/04 15:36:22 ajacoutot Exp $
$OpenBSD: patch-scripts_xdg-open_in,v 1.3 2015/11/01 22:23:03 ajacoutot Exp $
Fix sed(1) usage (i.e. !GNU sed).
--- scripts/xdg-open.in.orig Thu Oct 9 16:44:34 2014
+++ scripts/xdg-open.in Sun Jan 4 16:32:44 2015
@@ -231,7 +231,7 @@ DEBUG 3 "$xdg_user_dir:$xdg_system_dirs"
--- scripts/xdg-open.in.orig Mon Oct 5 20:59:19 2015
+++ scripts/xdg-open.in Sun Nov 1 23:18:06 2015
@@ -303,7 +303,7 @@ DEBUG 3 "$xdg_user_dir:$xdg_system_dirs"
open_generic_xdg_file_mime()
{
@ -13,12 +13,12 @@ Fix sed(1) usage (i.e. !GNU sed).
open_generic_xdg_mime "$1" "$filetype"
}
@@ -376,7 +376,7 @@ esac
if [ x"$BROWSER" = x"" ]; then
BROWSER=links2:elinks:links:lynx:w3m
if [ -n "$DISPLAY" ]; then
- BROWSER=x-www-browser:firefox:seamonkey:mozilla:epiphany:konqueror:chromium-browser:google-chrome:$BROWSER
+ BROWSER=x-www-browser:firefox:chrome:seamonkey:mozilla:epiphany:midori:konqueror:opera:chromium-browser:google-chrome:$BROWSER
@@ -380,7 +380,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:chrome:iceweasel:seamonkey:mozilla:epiphany:midori:konqueror:chromium-browser:google-chrome:$BROWSER
fi
fi
fi

8
devel/xdg-utils/patches/patch-scripts_xdg-utils-common_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-scripts_xdg-utils-common_in,v 1.2 2014/10/30 12:56:06 ajacoutot Exp $
$OpenBSD: patch-scripts_xdg-utils-common_in,v 1.3 2015/11/01 22:23:03 ajacoutot Exp $
Make xdg-open work with toad(8) under KDE4.
--- scripts/xdg-utils-common.in.orig Thu Aug 28 12:18:06 2014
+++ scripts/xdg-utils-common.in Thu Aug 28 12:18:29 2014
@@ -280,6 +280,7 @@ detectDE()
--- scripts/xdg-utils-common.in.orig Mon Oct 5 20:59:19 2015
+++ scripts/xdg-utils-common.in Sun Nov 1 23:14:17 2015
@@ -288,6 +288,7 @@ detectDE()
if [ x"$DE" = x"" ]; then
# classic fallbacks
if [ x"$KDE_FULL_SESSION" != x"" ]; then DE=kde;