mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-30 05:40:06 +00:00
Code Issues Releases Activity

misc/kde4-xdg-env: fix after kdeprefix removal

Browse Source 
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)
This commit is contained in:
Kurt Jaeger 2016-05-28 07:53:25 +00:00
parent 1720dbd11c
commit ded1bc269e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=415977
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
misc/kde4-xdg-env/Makefile
View File

@ -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

8
misc/kde4-xdg-env/files/xdg-env.sh.in
View File

@ -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