From owner-svn-ports-all@FreeBSD.ORG  Wed Jan 21 13:48:37 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 8F2B7415;
 Wed, 21 Jan 2015 13:48:37 +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 60AEA27F;
 Wed, 21 Jan 2015 13:48:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0LDmbuH013949;
 Wed, 21 Jan 2015 13:48:37 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0LDmajv013945;
 Wed, 21 Jan 2015 13:48:36 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201501211348.t0LDmajv013945@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Wed, 21 Jan 2015 13:48:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r377608 - in head/sysutils/shim: . files
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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2015 13:48:37 -0000

Author: trasz
Date: Wed Jan 21 13:48:36 2015
New Revision: 377608
URL: https://svnweb.freebsd.org/changeset/ports/377608
QAT: https://qat.redports.org/buildarchive/r377608/

Log:
  Don't hardcode "gcc48"; it would break after GCC upgrade.  Don't install
  *.efi files as executables; from the strip(1) point of view they are data
  files (actually, they are executables, but PE, not ELF).
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sysutils/shim/Makefile
  head/sysutils/shim/files/patch-Makefile

Modified: head/sysutils/shim/Makefile
==============================================================================
--- head/sysutils/shim/Makefile	Wed Jan 21 13:41:46 2015	(r377607)
+++ head/sysutils/shim/Makefile	Wed Jan 21 13:48:36 2015	(r377608)
@@ -27,11 +27,12 @@ PLIST_FILES=	lib/shim/MokManager.efi lib
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/bin/bash|${LOCALBASE}/bin/bash|" ${WRKSRC}/make-certs
+	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' ${WRKSRC}/Makefile
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/shim
-	${INSTALL_PROGRAM} ${WRKSRC}/shim.efi ${STAGEDIR}/${PREFIX}/lib/shim
-	${INSTALL_PROGRAM} ${WRKSRC}/MokManager.efi ${STAGEDIR}/${PREFIX}/lib/shim
-	${INSTALL_PROGRAM} ${WRKSRC}/fallback.efi ${STAGEDIR}/${PREFIX}/lib/shim
+	${INSTALL_DATA} ${WRKSRC}/shim.efi ${STAGEDIR}/${PREFIX}/lib/shim
+	${INSTALL_DATA} ${WRKSRC}/MokManager.efi ${STAGEDIR}/${PREFIX}/lib/shim
+	${INSTALL_DATA} ${WRKSRC}/fallback.efi ${STAGEDIR}/${PREFIX}/lib/shim
 
 .include <bsd.port.mk>

Modified: head/sysutils/shim/files/patch-Makefile
==============================================================================
--- head/sysutils/shim/files/patch-Makefile	Wed Jan 21 13:41:46 2015	(r377607)
+++ head/sysutils/shim/files/patch-Makefile	Wed Jan 21 13:48:36 2015	(r377608)
@@ -4,7 +4,7 @@
 -CC		= $(CROSS_COMPILE)gcc
 +CROSS_COMPILE	= $(LOCALBASE)/bin/
 +
-+CC		= $(CROSS_COMPILE)gcc48
++CC		= $(CROSS_COMPILE)%%CC%%
  LD		= $(CROSS_COMPILE)ld
  OBJCOPY		= $(CROSS_COMPILE)objcopy