svn commit: r415977 - in head/misc/kde4-xdg-env: . files
Kurt Jaeger
pi at FreeBSD.org
Sat May 28 07:53:27 UTC 2016
Author: pi
Date: Sat May 28 07:53:25 2016
New Revision: 415977
URL: https://svnweb.freebsd.org/changeset/ports/415977
Log:
misc/kde4-xdg-env: fix after kdeprefix removal
Fix SUB_LIST and script
This is related to bug #209799, same root cause: the removal of
kdehier and USE_KDE4=kdeprefix is a bit too thorough. Here, it
leaves us with a blank variable in SUB_LIST, which ends up in a
shell script. The substitution leaves the shell script with syntax
errors.
Since $KDE4_PREFIX must be equal to $LOCALBASE, remove the substitution
and simplify the script.
PR: 209802
Submitted by: groot at kde.org (kde)
Modified:
head/misc/kde4-xdg-env/Makefile
head/misc/kde4-xdg-env/files/xdg-env.sh.in
Modified: head/misc/kde4-xdg-env/Makefile
==============================================================================
--- head/misc/kde4-xdg-env/Makefile Sat May 28 07:49:52 2016 (r415976)
+++ head/misc/kde4-xdg-env/Makefile Sat May 28 07:53:25 2016 (r415977)
@@ -2,6 +2,7 @@
PORTNAME= xdg
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= misc kde
PKGNAMEPREFIX= kde4-
PKGNAMESUFFIX= -env
@@ -10,8 +11,6 @@ DISTFILES= # none
MAINTAINER= kde at FreeBSD.org
COMMENT= Script which hooks into startkde and helps KDE pick up XDG apps/menus
-SUB_LIST+= KDE4_PREFIX=${KDE4_PREFIX}
-
NO_BUILD= yes
SUB_FILES= xdg-env.sh
Modified: head/misc/kde4-xdg-env/files/xdg-env.sh.in
==============================================================================
--- head/misc/kde4-xdg-env/files/xdg-env.sh.in Sat May 28 07:49:52 2016 (r415976)
+++ head/misc/kde4-xdg-env/files/xdg-env.sh.in Sat May 28 07:53:25 2016 (r415977)
@@ -7,17 +7,9 @@
XDG_CONFIG_DIRS=\
${XDG_CONFIG_DIRS}:/etc/xdg:%%LOCALBASE%%/etc/xdg:%%LOCALBASE%%/etc/xdg/xfce4
-if [ %%KDE4_PREFIX%% != %%LOCALBASE%% ]; then
- XDG_CONFIG_DIRS=%%KDE4_PREFIX%%/etc/xdg:${XDG_CONFIG_DIRS}
-fi
-
export XDG_CONFIG_DIRS
XDG_DATA_DIRS=\
${XDG_DATA_DIRS}:/usr/share:%%LOCALBASE%%/share:%%LOCALBASE%%/share/gnome
-if [ %%KDE4_PREFIX%% != %%LOCALBASE%% ]; then
- XDG_DATA_DIRS=%%KDE4_PREFIX%%/share:${XDG_DATA_DIRS}
-fi
-
export XDG_DATA_DIRS
More information about the svn-ports-head
mailing list