From owner-svn-ports-all@freebsd.org  Sat Dec 10 20:03:26 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 C7EABC70D55;
 Sat, 10 Dec 2016 20:03:26 +0000 (UTC)
 (envelope-from bsam@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 96FB5128B;
 Sat, 10 Dec 2016 20:03:26 +0000 (UTC)
 (envelope-from bsam@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBAK3PoL027004;
 Sat, 10 Dec 2016 20:03:25 GMT (envelope-from bsam@FreeBSD.org)
Received: (from bsam@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBAK3PCS027002;
 Sat, 10 Dec 2016 20:03:25 GMT (envelope-from bsam@FreeBSD.org)
Message-Id: <201612102003.uBAK3PCS027002@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bsam set sender to
 bsam@FreeBSD.org using -f
From: Boris Samorodov <bsam@FreeBSD.org>
Date: Sat, 10 Dec 2016 20:03:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r428319 - in head/devel: arduino-core arduino16
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Dec 2016 20:03:26 -0000

Author: bsam
Date: Sat Dec 10 20:03:25 2016
New Revision: 428319
URL: https://svnweb.freebsd.org/changeset/ports/428319

Log:
  devel/arduino16,  devel/arduino-core: Do not rewrite system variable ARCH:
  rename ARCH -> ARDUINO_ARCH.
  
  PR:		214776
  Submitted by:	Melvyn Sopacua <m.r.sopacua@gmail.com>
  Patched by:	 Kyle Evans <bsdports@kyle-evans.net> (maintainer)

Modified:
  head/devel/arduino-core/Makefile
  head/devel/arduino16/Makefile

Modified: head/devel/arduino-core/Makefile
==============================================================================
--- head/devel/arduino-core/Makefile	Sat Dec 10 19:32:36 2016	(r428318)
+++ head/devel/arduino-core/Makefile	Sat Dec 10 20:03:25 2016	(r428319)
@@ -28,11 +28,13 @@ SAMD_EXTRA_PATCHES=	${PATCHDIR}/extrapat
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-ARCH=		x86_64
+ARDUINO_ARCH=	x86_64
+.else
+ARDUINO_ARCH=	${ARCH}
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%ARCH%%|${ARCH}|g' -e 's|%%OSREL%%|${OSREL:R}|g' ${WRKSRC}/hardware/package_index_bundled.json
+	@${REINPLACE_CMD} -e 's|%%ARCH%%|${ARDUINO_ARCH}|g' -e 's|%%OSREL%%|${OSREL:R}|g' ${WRKSRC}/hardware/package_index_bundled.json
 
 do-install:
 	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "hardware" ${STAGEDIR}${PREFIX}/arduino ${FIND_EXPR})

Modified: head/devel/arduino16/Makefile
==============================================================================
--- head/devel/arduino16/Makefile	Sat Dec 10 19:32:36 2016	(r428318)
+++ head/devel/arduino16/Makefile	Sat Dec 10 20:03:25 2016	(r428319)
@@ -68,10 +68,6 @@ DOCS_DISTFILES=		reference-1.6.6-3.zip:r
 
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == "amd64"
-ARCH=			x86_64
-.endif
-
 .if ${PORT_OPTIONS:MDOCS}
 INSLIST+=		reference
 .endif