From owner-svn-ports-head@FreeBSD.ORG  Tue Oct 22 21:42:39 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 51B2BBE4;
 Tue, 22 Oct 2013 21:42:39 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3E20F2AA9;
 Tue, 22 Oct 2013 21:42:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9MLgdaT062752;
 Tue, 22 Oct 2013 21:42:39 GMT (envelope-from tijl@svn.freebsd.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9MLgdmd062751;
 Tue, 22 Oct 2013 21:42:39 GMT (envelope-from tijl@svn.freebsd.org)
Message-Id: <201310222142.r9MLgdmd062751@svn.freebsd.org>
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Tue, 22 Oct 2013 21:42:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r331327 - 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.14
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: Tue, 22 Oct 2013 21:42:39 -0000

Author: tijl
Date: Tue Oct 22 21:42:38 2013
New Revision: 331327
URL: http://svnweb.freebsd.org/changeset/ports/331327

Log:
  Don't add "@unexec rmdir ${DESKTOPDIR} ..." to pkg-plist for ports that
  use DESKTOP_ENTRIES now that ${DESKTOPDIR} has been added to mtree.
  
  Approved by:	portmgr (bdrewery)

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Tue Oct 22 21:30:14 2013	(r331326)
+++ head/Mk/bsd.port.mk	Tue Oct 22 21:42:38 2013	(r331327)
@@ -6664,7 +6664,6 @@ install-desktop-entries:
 		fi; \
 		shift 6; \
 	done; \
-	${ECHO_CMD} "@unexec rmdir ${DESKTOPDIR} 2>/dev/null || true" >> ${TMPPLIST}; \
 	if [ -z "${_DESKTOPDIR_REL}" ]; then \
 		${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
 	fi