svn commit: r328148 - in head/devel/xdg-utils: . files
Koop Mast
kwm at FreeBSD.org
Tue Sep 24 15:27:11 UTC 2013
Author: kwm
Date: Tue Sep 24 15:27:08 2013
New Revision: 328148
URL: http://svnweb.freebsd.org/changeset/ports/328148
Log:
Update to git snapshot.
Major changes are:
- Add/import support for Enlightenment, MATE, KDE4 and GNOME3.
- Fix typo in the xdg-email patch that has survived detection in well forever [1]
- Enable stage support.
Submitted by: eadler@ [1]
Added:
head/devel/xdg-utils/pkg-plist (contents, props changed)
Modified:
head/devel/xdg-utils/Makefile
head/devel/xdg-utils/distinfo
head/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu
head/devel/xdg-utils/files/patch-scripts_xdg-email
head/devel/xdg-utils/files/patch-scripts_xdg-mime
head/devel/xdg-utils/files/patch-scripts_xdg-open
head/devel/xdg-utils/files/patch-scripts_xdg-screensaver
Modified: head/devel/xdg-utils/Makefile
==============================================================================
--- head/devel/xdg-utils/Makefile Tue Sep 24 15:20:42 2013 (r328147)
+++ head/devel/xdg-utils/Makefile Tue Sep 24 15:27:08 2013 (r328148)
@@ -1,13 +1,13 @@
# Created by: Michael Johnson <ahze at FreeBSD.org>
# $FreeBSD$
-# $MCom: ports-stable/devel/xdg-utils/Makefile,v 1.3 2010/06/29 17:32:55 kwm Exp $
+# $MCom: ports/trunk/devel/xdg-utils/Makefile 18656 2013-08-22 09:09:28Z kwm $
PORTNAME= xdg-utils
-PORTVERSION= 1.0.2
-PORTREVISION= 8
+PORTVERSION= 1.0.2.${SNAPDATE}
CATEGORIES= devel
-MASTER_SITES= http://portland.freedesktop.org/download/
-EXTRACT_SUFX= .tgz
+#MASTER_SITES= http://portland.freedesktop.org/download/
+MASTER_SITES= LOCAL/kwm
+DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= gnome at FreeBSD.org
COMMENT= Tools to allow all applications to integrate with the free desktop
@@ -16,21 +16,9 @@ RUN_DEPENDS= ${LOCALBASE}/share/icons/hi
xprop:${PORTSDIR}/x11/xprop \
xset:${PORTSDIR}/x11/xset
+SNAPDATE= 20130919
+USE_XZ= yes
GNU_CONFIGURE= yes
-XDG_FILES= xdg-desktop-icon \
- xdg-desktop-menu \
- xdg-email \
- xdg-icon-resource \
- xdg-mime \
- xdg-open \
- xdg-screensaver
-
-PLIST_FILES+= ${XDG_FILES:S|^|bin/|}
-MAN1+= ${XDG_FILES:S|$|.1|}
-
-NO_STAGE= yes
-pre-patch:
- @${RM} -f ${WRKSRC}/*/*.orig
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
Modified: head/devel/xdg-utils/distinfo
==============================================================================
--- head/devel/xdg-utils/distinfo Tue Sep 24 15:20:42 2013 (r328147)
+++ head/devel/xdg-utils/distinfo Tue Sep 24 15:27:08 2013 (r328148)
@@ -1,2 +1,2 @@
-SHA256 (xdg-utils-1.0.2.tgz) = 21aeb7d16b2529b8d3975118f59eec09953e09f9a68d718159e98c90474b01ac
-SIZE (xdg-utils-1.0.2.tgz) = 282262
+SHA256 (xdg-utils-1.0.2.20130919.tar.xz) = 0e442c717d1bbb503615e0dd84ab33d9bd9d0594127259be21478e3eef30e10e
+SIZE (xdg-utils-1.0.2.20130919.tar.xz) = 1227120
Modified: head/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu
==============================================================================
--- head/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu Tue Sep 24 15:20:42 2013 (r328147)
+++ head/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu Tue Sep 24 15:27:08 2013 (r328148)
@@ -1,7 +1,7 @@
---- 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 @@
-
+--- 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/
@@ -9,7 +9,7 @@
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 @@
+@@ -709,7 +709,7 @@
xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
xdg_system_dirs="$XDG_CONFIG_DIRS"
@@ -18,7 +18,7 @@
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 @@
+@@ -1072,7 +1072,7 @@
xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
xdg_system_dirs="$XDG_DATA_DIRS"
@@ -27,7 +27,7 @@
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 @@
+@@ -1139,7 +1139,7 @@
xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
xdg_system_dirs="$XDG_DATA_DIRS"
@@ -36,12 +36,7 @@
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"
+@@ -1153,7 +1153,7 @@
[ -w $kde_global_dir ] || kde_global_dir=
gnome_user_dir="$HOME/.gnome/apps"
@@ -49,4 +44,4 @@
+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:"
Modified: head/devel/xdg-utils/files/patch-scripts_xdg-email
==============================================================================
--- head/devel/xdg-utils/files/patch-scripts_xdg-email Tue Sep 24 15:20:42 2013 (r328147)
+++ head/devel/xdg-utils/files/patch-scripts_xdg-email Tue Sep 24 15:27:08 2013 (r328148)
@@ -1,6 +1,22 @@
---- 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 @@
+--- 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=
Modified: head/devel/xdg-utils/files/patch-scripts_xdg-mime
==============================================================================
--- head/devel/xdg-utils/files/patch-scripts_xdg-mime Tue Sep 24 15:20:42 2013 (r328147)
+++ head/devel/xdg-utils/files/patch-scripts_xdg-mime Tue Sep 24 15:27:08 2013 (r328148)
@@ -1,15 +1,15 @@
---- 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 @@
+--- 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
- DEBUG 1 "Running gnomevfs-info \"$file\""
- gnomevfs-info "$file" 2> /dev/null | grep MIME | cut -d ":" -f 2 | sed s/"^ "//
-@@ -557,7 +557,7 @@
+ 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"
@@ -18,7 +18,7 @@
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 @@
+@@ -953,7 +953,7 @@
xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
xdg_system_dirs="$XDG_DATA_DIRS"
@@ -27,7 +27,7 @@
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 @@
+@@ -985,7 +985,7 @@
# TODO: Gnome legacy support
# See http://forums.fedoraforum.org/showthread.php?t=26875
gnome_user_dir="$HOME/.gnome/apps"
Modified: head/devel/xdg-utils/files/patch-scripts_xdg-open
==============================================================================
--- head/devel/xdg-utils/files/patch-scripts_xdg-open Tue Sep 24 15:20:42 2013 (r328147)
+++ head/devel/xdg-utils/files/patch-scripts_xdg-open Tue Sep 24 15:27:08 2013 (r328148)
@@ -1,6 +1,6 @@
---- scripts/xdg-open.orig
-+++ scripts/xdg-open
-@@ -31,6 +31,12 @@
+--- scripts/xdg-open.orig 2012-09-19 21:04:46.000000000 +0000
++++ scripts/xdg-open 2012-09-19 21:25:05.000000000 +0000
+@@ -33,6 +33,12 @@
#
#---------------------------------------------
@@ -13,14 +13,3 @@
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;
Modified: head/devel/xdg-utils/files/patch-scripts_xdg-screensaver
==============================================================================
--- head/devel/xdg-utils/files/patch-scripts_xdg-screensaver Tue Sep 24 15:20:42 2013 (r328147)
+++ head/devel/xdg-utils/files/patch-scripts_xdg-screensaver Tue Sep 24 15:27:08 2013 (r328148)
@@ -1,16 +1,13 @@
-
---- ./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 @@
+--- 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"
+ # Check if we can use "mv -T"
-if mv -T ... ... 2>&1 | grep '\.\.\.' > /dev/null ; then
-+# FreeBSD cannot, so supress scary messages in the terminal
++# 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
++if false; then
# We can securely move files in /tmp with mv -T
DEBUG 1 "mv -T available"
MV="mv -T"
-
-
Added: head/devel/xdg-utils/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/xdg-utils/pkg-plist Tue Sep 24 15:27:08 2013 (r328148)
@@ -0,0 +1,16 @@
+bin/xdg-desktop-icon
+bin/xdg-desktop-menu
+bin/xdg-email
+bin/xdg-icon-resource
+bin/xdg-mime
+bin/xdg-open
+bin/xdg-screensaver
+bin/xdg-settings
+xdg-desktop-icon.1
+xdg-desktop-menu.1
+xdg-email.1
+xdg-icon-resource.1
+xdg-mime.1
+xdg-open.1
+xdg-screensaver.1
+xdg-settings.1
More information about the svn-ports-all
mailing list