From owner-svn-ports-all@freebsd.org  Thu Oct 22 15:45:01 2020
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8B6EC44B8C2;
 Thu, 22 Oct 2020 15:45:01 +0000 (UTC)
 (envelope-from pkubaj@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CHBWd3Btrz436M;
 Thu, 22 Oct 2020 15:45:01 +0000 (UTC)
 (envelope-from pkubaj@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5214518EC7;
 Thu, 22 Oct 2020 15:45:01 +0000 (UTC)
 (envelope-from pkubaj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09MFj11e074735;
 Thu, 22 Oct 2020 15:45:01 GMT (envelope-from pkubaj@FreeBSD.org)
Received: (from pkubaj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09MFj12C074734;
 Thu, 22 Oct 2020 15:45:01 GMT (envelope-from pkubaj@FreeBSD.org)
Message-Id: <202010221545.09MFj12C074734@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to
 pkubaj@FreeBSD.org using -f
From: Piotr Kubaj <pkubaj@FreeBSD.org>
Date: Thu, 22 Oct 2020 15:45:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r552989 - branches/2020Q4/devel/plan9port
X-SVN-Group: ports-branches
X-SVN-Commit-Author: pkubaj
X-SVN-Commit-Paths: branches/2020Q4/devel/plan9port
X-SVN-Commit-Revision: 552989
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.33
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: Thu, 22 Oct 2020 15:45:01 -0000

Author: pkubaj
Date: Thu Oct 22 15:45:00 2020
New Revision: 552989
URL: https://svnweb.freebsd.org/changeset/ports/552989

Log:
  MFH: r552988
  
  devel/plan9port: fix build on GCC architectures
  
  Actually respect CC.
  
  Approved by:	portmgr (fix build blanket)

Modified:
  branches/2020Q4/devel/plan9port/Makefile
Directory Properties:
  branches/2020Q4/   (props changed)

Modified: branches/2020Q4/devel/plan9port/Makefile
==============================================================================
--- branches/2020Q4/devel/plan9port/Makefile	Thu Oct 22 15:44:13 2020	(r552988)
+++ branches/2020Q4/devel/plan9port/Makefile	Thu Oct 22 15:45:00 2020	(r552989)
@@ -48,6 +48,8 @@ DATA_DISTFILES=		pgw.tar.bz2 \
 			roget.tar.bz2 \
 			scat.tgz
 
+.include <bsd.port.pre.mk>
+
 post-extract-DATA-on:
 	@cd ${WRKSRC}/dict && ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/pgw.tar.bz2
 	@cd ${WRKSRC}/dict && ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/roget.tar.bz2
@@ -62,7 +64,10 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|ulong|u64int|' ${WRKSRC}/src/libmach/FreeBSD.c
 
 do-configure:
-	@${ECHO_CMD} 'CFLAGS="${CFLAGS}"' > ${WRKSRC}/LOCAL.config
+.if ${CHOSEN_COMPILER_TYPE} == gcc
+	@${ECHO_CMD} 'CC9="${CC}"' > ${WRKSRC}/LOCAL.config
+.endif
+	@${ECHO_CMD} 'CFLAGS="${CFLAGS}"' >> ${WRKSRC}/LOCAL.config
 	@${ECHO_CMD} 'LDFLAGS="${LDFLAGS}"' >> ${WRKSRC}/LOCAL.config
 	@${ECHO_CMD} 'FONTSRV=fontsrv' >> ${WRKSRC}/LOCAL.config
 
@@ -85,4 +90,4 @@ post-install:
 			${STRIP_CMD} $$f > /dev/null 2>&1 || ${TRUE}; \
 		done
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>