From owner-svn-ports-all@freebsd.org  Sun Dec 17 23:40:02 2017
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 5D770E99B4F;
 Sun, 17 Dec 2017 23:40:02 +0000 (UTC)
 (envelope-from tobik@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 2786D2ED0;
 Sun, 17 Dec 2017 23:40:02 +0000 (UTC)
 (envelope-from tobik@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBHNe1v2060266;
 Sun, 17 Dec 2017 23:40:01 GMT (envelope-from tobik@FreeBSD.org)
Received: (from tobik@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBHNe1eF060265;
 Sun, 17 Dec 2017 23:40:01 GMT (envelope-from tobik@FreeBSD.org)
Message-Id: <201712172340.vBHNe1eF060265@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tobik set sender to
 tobik@FreeBSD.org using -f
From: Tobias Kortkamp <tobik@FreeBSD.org>
Date: Sun, 17 Dec 2017 23:40:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r456571 - head/sysutils/showbeastie
X-SVN-Group: ports-head
X-SVN-Commit-Author: tobik
X-SVN-Commit-Paths: head/sysutils/showbeastie
X-SVN-Commit-Revision: 456571
X-SVN-Commit-Repository: ports
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.25
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: Sun, 17 Dec 2017 23:40:02 -0000

Author: tobik
Date: Sun Dec 17 23:40:01 2017
New Revision: 456571
URL: https://svnweb.freebsd.org/changeset/ports/456571

Log:
  Unbreak showbeastie after the sys/boot/->stand/ move in base r325834

Modified:
  head/sysutils/showbeastie/Makefile

Modified: head/sysutils/showbeastie/Makefile
==============================================================================
--- head/sysutils/showbeastie/Makefile	Sun Dec 17 23:17:33 2017	(r456570)
+++ head/sysutils/showbeastie/Makefile	Sun Dec 17 23:40:01 2017	(r456571)
@@ -23,22 +23,28 @@ ALL_TARGET=	testmain
 PLIST_FILES=	bin/${PORTNAME}
 
 # Make sure building succeeds on HEAD
+CFLAGS+=	-I/usr/include # uses -nostdinc
 MAKE_ARGS+=	-m ${SRC_BASE}/share/mk
 
 BROKEN_armv6=		fails to link: testmain uses VFP register arguments, dict.o does not
-BROKEN_armv7=		fails to install: tar: could not chdir to '/usr/src/sys/boot'
 BROKEN_mips64=		fails to link: relocation truncated to fit: R_MIPS_26 against `__assert@@FBSD_1.0'
 
 WRKSRC_SUBDIR=	ficl
 
+.if exists(${SRC_BASE}/sys/boot/ficl/testmain.c)
+SRC_STAND=	${SRC_BASE}/sys/boot
+.else
+SRC_STAND=	${SRC_BASE}/stand
+.endif
+
 pre-patch:
 	@${MKDIR} ${WRKSRC}
-	@${TAR} -C ${SRC_BASE}/sys/boot \
+	@${TAR} -C ${SRC_STAND} \
 		--exclude '*.o' --exclude '*.a' --exclude 'testmain' \
 		-cf - . | ${TAR} -C ${WRKSRC}/.. -xf -
 
 post-patch:
-	${REINPLACE_CMD} 's|-I.*/\.\./common|-I${SRC_BASE}/sys/boot/common|g' \
+	${REINPLACE_CMD} 's|-I.*/\.\./common|-I${SRC_STAND}/common|g' \
 		${WRKSRC}/Makefile
 
 # Make sure building on FreeBSD 11.0/i386 works. Calls to biospci_* are not