Bug 209802

Summary:

misc/kde4-xdg-env: kdeprefix removal too thorough

Product:

Ports & Packages

Reporter:

groot

Component:

Individual Port(s)

Assignee:

Kurt Jaeger <pi>

Status:

Closed FIXED

Severity:

Affects Only Me

CC:

groot, pi, rene

Priority:

---

Keywords:

patch

Version:

Latest

Flags:

pi: maintainer-feedback+

Hardware:

Any

OS:

Any

See Also:

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=209799

Attachments:

Description	Flags
Fix SUB_LIST and script	none

Description groot 2016-05-27 21:07:24 UTC

Created attachment 170735 [details]
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.

Comment 1 groot 2016-05-27 21:08:22 UTC

Adding rene@ because of help committing the kdeprefix-removal, pi@ for kde@-support.

Comment 2 groot 2016-05-27 21:11:55 UTC

Thanks also to tcberner for looking at this port and suggesting to simplify the script. Tested w/ poudriere amd64 10-STABLE, but the problem should be obvious:

if [ %%KDE4_PREFIX%% != %%LOCALBASE%% ]; then
    XDG_DATA_DIRS=%%KDE4_PREFIX%%/share:${XDG_DATA_DIRS}
fi

this ends up substituted (now that KDE4_PREFIX isn't used here) as:

if [ != /usr/local ]; then
    XDG_DATA_DIRS=/share:${XDG_DATA_DIRS}
fi

Comment 3 Kurt Jaeger freebsd_committer

2016-05-28 07:53:33 UTC

Committed, thanks!

Comment 4 commit-hook freebsd_committer

2016-05-28 07:54:02 UTC

A commit references this bug:

Author: pi
Date: Sat May 28 07:53:25 UTC 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@kde.org (kde)

Changes:
  head/misc/kde4-xdg-env/Makefile
  head/misc/kde4-xdg-env/files/xdg-env.sh.in