diff options
| author | pi <pi@FreeBSD.org> | 2016-05-28 15:53:25 +0800 |
|---|---|---|
| committer | pi <pi@FreeBSD.org> | 2016-05-28 15:53:25 +0800 |
| commit | ba6ace25ef4bd64c09a198949af314c1f810a506 (patch) | |
| tree | c996e497205f335c77aac720f61a1656c089530e /misc/kde4-xdg-env | |
| parent | 824751f2a430961e65e5a6de39df7f4d1918dfd6 (diff) | |
| download | freebsd-ports-gnome-ba6ace25ef4bd64c09a198949af314c1f810a506.tar.gz freebsd-ports-gnome-ba6ace25ef4bd64c09a198949af314c1f810a506.tar.zst freebsd-ports-gnome-ba6ace25ef4bd64c09a198949af314c1f810a506.zip | |
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@kde.org (kde)
Diffstat (limited to 'misc/kde4-xdg-env')
| -rw-r--r-- | misc/kde4-xdg-env/Makefile | 3 | ||||
| -rw-r--r-- | misc/kde4-xdg-env/files/xdg-env.sh.in | 8 |
2 files changed, 1 insertions, 10 deletions
diff --git a/misc/kde4-xdg-env/Makefile b/misc/kde4-xdg-env/Makefile index 4f1b1776ca24..f24d66e7172c 100644 --- a/misc/kde4-xdg-env/Makefile +++ b/misc/kde4-xdg-env/Makefile @@ -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@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 diff --git a/misc/kde4-xdg-env/files/xdg-env.sh.in b/misc/kde4-xdg-env/files/xdg-env.sh.in index b634522b4e32..16d86325ab4e 100644 --- a/misc/kde4-xdg-env/files/xdg-env.sh.in +++ b/misc/kde4-xdg-env/files/xdg-env.sh.in @@ -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 |