From owner-svn-ports-head@FreeBSD.ORG  Mon Oct 20 20:36:40 2014
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.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6C8BA493;
 Mon, 20 Oct 2014 20:36:40 +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 58A7177C;
 Mon, 20 Oct 2014 20:36:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9KKaeCG088295;
 Mon, 20 Oct 2014 20:36:40 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9KKaeOs088294;
 Mon, 20 Oct 2014 20:36:40 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201410202036.s9KKaeOs088294@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: Mon, 20 Oct 2014 20:36:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r371301 - 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: Mon, 20 Oct 2014 20:36:40 -0000

Author: bapt
Date: Mon Oct 20 20:36:39 2014
New Revision: 371301
URL: https://svnweb.freebsd.org/changeset/ports/371301
QAT: https://qat.redports.org/buildarchive/r371301/

Log:
  Remove unused and broken new-plist target
  Modify the automatic plist to not generate the @dirrm

Modified:
  head/Mk/bsd.linux-rpm.mk

Modified: head/Mk/bsd.linux-rpm.mk
==============================================================================
--- head/Mk/bsd.linux-rpm.mk	Mon Oct 20 20:29:30 2014	(r371300)
+++ head/Mk/bsd.linux-rpm.mk	Mon Oct 20 20:36:39 2014	(r371301)
@@ -189,10 +189,7 @@ pre-install: linux-rpm-generate-plist
 .  if !target(linux-rpm-generate-plist)
 linux-rpm-generate-plist:
 	cd ${WRKSRC} && \
-	${FIND} * ! -path "stage/*" ! -type d | ${SORT} > ${PLIST} && \
-	${FIND} * ! -path "stage*" -type d | ${SORT} | ${SED} -e 's|^|@dirrm |' > ${PLIST}.dirs
-	@${GREP} '^@dirrm' ${PORTSDIR}/emulators/linux_base-${_LINUX_BASE_SUFFIX}/pkg-plist | ${SED} 's:^@dirrmtry:@dirrm:g' | ${SORT} > ${PLIST}.shared-dirs
-	@${COMM} -1 -3 ${PLIST}.shared-dirs ${PLIST}.dirs | ${SORT} -r >> ${PLIST}
+	${FIND} * ! -path "stage/*" ! -type d | ${SORT} > ${PLIST}
 .	endif
 .  endif
 
@@ -209,14 +206,4 @@ do-install:
 	cd ${WRKSRC} && ${FIND} * ! -path "stage*" -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \;
 	cd ${WRKSRC} && ${FIND} * ! -path "stage/*" ! -type d | ${CPIO} -pm -R root:wheel ${STAGEDIR}${PREFIX}
 .  endif
-
-.  if !target(new-plist)
-new-plist: build
-	@${RM} -f ${PLIST}.new
-	@cd ${WRKSRC} && \
-		${FIND} * ! -path "stage/*" ! -type d | ${SORT} > ${PLIST}.new; \
-		${FIND} -d * ! -path "stage*" -type d | ${SED} -e 's|^|@dirrm |' >> ${PLIST}.new; \
-	done
-.  endif
-
 .endif