Index: branches/2020Q3/net/bsdec2-image-upload/Makefile
===================================================================
--- branches/2020Q3/net/bsdec2-image-upload/Makefile	(revision 542847)
+++ branches/2020Q3/net/bsdec2-image-upload/Makefile	(revision 542848)
@@ -1,26 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	bsdec2-image-upload
 PORTVERSION=	1.3.1
 CATEGORIES=	net
 MASTER_SITES=	http://freebsd-ec2-dist.s3.amazonaws.com/
 
 MAINTAINER=	cperciva@FreeBSD.org
 COMMENT=	Tool for creating Amazon EC2 AMIs
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
-USES=		ssl tar:tgz uidfix
+USES=		compiler ssl tar:tgz uidfix
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 
 # Install into ${STAGEDIR}${PREFIX}; but the build respects ${DESTDIR} so
 # all we need to give is the ${PREFIX}/bin part.
 MAKE_ARGS+=	BINDIR=${PREFIX}/bin
 
 PLIST_FILES=	bin/bsdec2-image-upload
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == gcc
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-Makefile
+.endif
+
+.include <bsd.port.post.mk>
Index: branches/2020Q3/net/bsdec2-image-upload/files/extra-patch-Makefile
===================================================================
--- branches/2020Q3/net/bsdec2-image-upload/files/extra-patch-Makefile	(nonexistent)
+++ branches/2020Q3/net/bsdec2-image-upload/files/extra-patch-Makefile	(revision 542848)
@@ -0,0 +1,10 @@
+--- Makefile.orig	2020-07-22 09:29:11 UTC
++++ Makefile
+@@ -2,7 +2,6 @@ PROG=	bsdec2-image-upload
+ SRCS=	main.c
+ MAN	=
+ WARNS	?=	3
+-CFLAGS	+=	-Wno-error=\#warnings
+ BINDIR	?=	/usr/local/bin
+ LDADD	+=	-lcrypto -lssl
+ 

Property changes on: branches/2020Q3/net/bsdec2-image-upload/files/extra-patch-Makefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q3
===================================================================
--- branches/2020Q3	(revision 542847)
+++ branches/2020Q3	(revision 542848)

Property changes on: branches/2020Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r542847