From owner-svn-ports-head@FreeBSD.ORG  Wed Oct  8 06:13:43 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EE5BDD4C;
 Wed,  8 Oct 2014 06:13:43 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 C07C0C4B;
 Wed,  8 Oct 2014 06:13:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s986DhBj077679;
 Wed, 8 Oct 2014 06:13:43 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s986Dhs5077678;
 Wed, 8 Oct 2014 06:13:43 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201410080613.s986Dhs5077678@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 8 Oct 2014 06:13:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r370415 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Oct 2014 06:13:44 -0000

Author: bapt
Date: Wed Oct  8 06:13:43 2014
New Revision: 370415
URL: https://svnweb.freebsd.org/changeset/ports/370415
QAT: https://qat.redports.org/buildarchive/r370415/

Log:
  Get rid of _DESKTOPDIR_REL and use DESKTOPDIR everywhere
  That avoids playing with @cwd

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Wed Oct  8 06:06:34 2014	(r370414)
+++ head/Mk/bsd.port.mk	Wed Oct  8 06:13:43 2014	(r370415)
@@ -2821,12 +2821,6 @@ PLIST_SUB+=	DOCSDIR="${DOCSDIR_REL}" \
 		ETCDIR="${ETCDIR_REL}"
 
 DESKTOPDIR?=		${PREFIX}/share/applications
-_DESKTOPDIR_REL=	${DESKTOPDIR:S,^${PREFIX}/,,}/
-
-.if ${_DESKTOPDIR_REL} == ${DESKTOPDIR}/
-# DESKTOPDIR is not beneath PREFIX
-_DESKTOPDIR_REL=
-.endif
 
 .MAIN: all
 
@@ -5857,9 +5851,6 @@ check-desktop-entries:
 .if defined(DESKTOP_ENTRIES)
 install-desktop-entries:
 	@set -- ${DESKTOP_ENTRIES} XXX; \
-	if [ -z "${_DESKTOPDIR_REL}" ]; then \
-		${ECHO_CMD} "@cwd ${DESKTOPDIR}" >> ${TMPPLIST}; \
-	fi; \
 	while [ $$# -gt 6 ]; do \
 		filename="`${ECHO_CMD} "$$4" | ${SED} -e 's,^/,,g;s,[/ ],_,g;s,[^_[:alnum:]],,g'`.desktop"; \
 		pathname="${STAGEDIR}${DESKTOPDIR}/$$filename"; \
@@ -5867,7 +5858,7 @@ install-desktop-entries:
 		if [ -z "$$categories" ]; then \
 			categories="`cd ${.CURDIR} && ${MAKE} desktop-categories`"; \
 		fi; \
-		${ECHO_CMD} "${_DESKTOPDIR_REL}$$filename" >> ${TMPPLIST}; \
+		${ECHO_CMD} "${DESKTOPDIR}/$$filename" >> ${TMPPLIST}; \
 		${ECHO_CMD} "[Desktop Entry]" > $$pathname; \
 		${ECHO_CMD} "Type=Application" >> $$pathname; \
 		${ECHO_CMD} "Version=1.0" >> $$pathname; \
@@ -5887,10 +5878,7 @@ install-desktop-entries:
 			${ECHO_CMD} "StartupNotify=$$6" >> $$pathname; \
 		fi; \
 		shift 6; \
-	done; \
-	if [ -z "${_DESKTOPDIR_REL}" ]; then \
-		${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
-	fi
+	done
 .endif
 .endif