From owner-svn-ports-all@freebsd.org Sat May 28 07:53:26 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EF818B4D063; Sat, 28 May 2016 07:53:26 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A02491BA2; Sat, 28 May 2016 07:53:26 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4S7rP6f095137; Sat, 28 May 2016 07:53:25 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4S7rP17095135; Sat, 28 May 2016 07:53:25 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201605280753.u4S7rP17095135@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sat, 28 May 2016 07:53:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415977 - in head/misc/kde4-xdg-env: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 May 2016 07:53:27 -0000 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@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@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