From owner-svn-ports-head@FreeBSD.ORG  Fri Oct  4 15:47: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 2C4FFE7D;
 Fri,  4 Oct 2013 15:47:39 +0000 (UTC)
 (envelope-from bapt@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 19BC6252C;
 Fri,  4 Oct 2013 15:47: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 r94Flc7S058769;
 Fri, 4 Oct 2013 15:47:38 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r94Flcsa058768;
 Fri, 4 Oct 2013 15:47:38 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201310041547.r94Flcsa058768@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 4 Oct 2013 15:47:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r329330 - 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: Fri, 04 Oct 2013 15:47:39 -0000

Author: bapt
Date: Fri Oct  4 15:47:38 2013
New Revision: 329330
URL: http://svnweb.freebsd.org/changeset/ports/329330

Log:
  Fix linux rpm plist generation

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

Modified: head/Mk/bsd.linux-rpm.mk
==============================================================================
--- head/Mk/bsd.linux-rpm.mk	Fri Oct  4 15:45:04 2013	(r329329)
+++ head/Mk/bsd.linux-rpm.mk	Fri Oct  4 15:47:38 2013	(r329330)
@@ -152,9 +152,9 @@ pre-install: linux-rpm-generate-plist
 
 .    if !target(linux-rpm-generate-plist)
 linux-rpm-generate-plist:
-	@cd ${WRKSRC} && \
+	cd ${WRKSRC} && \
 	${FIND} * -path ./stage -prune ! -type d | ${SORT} > ${PLIST} && \
-	${FIND} * -path ./stage -prune -type d | ${SORT} | ${SED} -e 's|^|@dirrm |' > ${PLIST}.dirs
+	${FIND} * | ${GREP} -v "^stage" | ${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}
 .    endif