From owner-svn-ports-head@freebsd.org  Thu Dec  8 13:46:16 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 C1049C6D1ED;
 Thu,  8 Dec 2016 13:46:16 +0000 (UTC)
 (envelope-from tijl@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 8FE721063;
 Thu,  8 Dec 2016 13:46:16 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB8DkFlk073151;
 Thu, 8 Dec 2016 13:46:15 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB8DkF8X073150;
 Thu, 8 Dec 2016 13:46:15 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201612081346.uB8DkF8X073150@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tijl set sender to
 tijl@FreeBSD.org using -f
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Thu, 8 Dec 2016 13:46:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r428117 - head/Mk/Uses
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Dec 2016 13:46:16 -0000

Author: tijl
Date: Thu Dec  8 13:46:15 2016
New Revision: 428117
URL: https://svnweb.freebsd.org/changeset/ports/428117

Log:
  Simplify USES=linux do-install and add support for architecture specific
  distfiles.

Modified:
  head/Mk/Uses/linux.mk

Modified: head/Mk/Uses/linux.mk
==============================================================================
--- head/Mk/Uses/linux.mk	Thu Dec  8 13:32:59 2016	(r428116)
+++ head/Mk/Uses/linux.mk	Thu Dec  8 13:46:15 2016	(r428117)
@@ -303,12 +303,28 @@ PLIST?=			${PKGDIR}/pkg-plist.${LINUX_AR
 
 .if !target(do-install)
 do-install:
-	(cd ${WRKSRC} && ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \;)
-	(cd ${WRKSRC} && ${FIND} * ! -type d | ${CPIO} -pm ${STAGEDIR}${PREFIX})
+	(cd ${WRKSRC} && ${FIND} * | ${CPIO} -dumpl ${STAGEDIR}${PREFIX})
 .endif
 
 .endif # USE_LINUX_RPM
 
+.ifdef DISTNAME_i386
+DISTFILES_i386?=	${DISTNAME_i386}${EXTRACT_SUFX}
+.endif
+.ifdef DISTNAME_x86_64
+DISTFILES_x86_64?=	${DISTNAME_x86_64}${EXTRACT_SUFX}
+.endif
+.ifdef DISTFILES_i386 || DISTFILES_x86_64
+.if make(makesum)
+.if !defined(DISTFILES)
+DISTFILES=		${DISTFILES_i386} ${DISTFILES_x86_64}
+EXTRACT_ONLY?=		${DISTFILES_${LINUX_ARCH}}
+.endif
+.else
+DISTFILES?=		${DISTFILES_${LINUX_ARCH}}
+.endif
+.endif
+
 # With fmake :M${var} only works when ${var} is a for loop variable.
 .for fmakehack in ${LINUX_ARCH:S/x86_64/amd64/}
 .if (defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:M${fmakehack})) \