Index: branches/2018Q1/security/gnutls/Makefile
===================================================================
--- branches/2018Q1/security/gnutls/Makefile	(revision 458105)
+++ branches/2018Q1/security/gnutls/Makefile	(revision 458106)
@@ -1,79 +1,70 @@
 # $FreeBSD$
 
 PORTNAME=	gnutls
 PORTVERSION=	3.5.16
 CATEGORIES=	security net
 MASTER_SITES=	GNUPG/gnutls/v${PORTVERSION:R}
 
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	GNU Transport Layer Security library
 
 LICENSE=	GPLv3 LGPL21
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3=	${WRKSRC}/doc/COPYING
 LICENSE_FILE_LGPL21=	${WRKSRC}/doc/COPYING.LESSER
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libnettle.so:security/nettle \
 		libtasn1.so:security/libtasn1 \
 		libunistring.so:devel/libunistring
 BUILD_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
-USES=		compiler cpe gmake iconv libtool localbase makeinfo \
+USES=		cpe gmake iconv libtool localbase makeinfo \
 		pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-guile \
 		--enable-local-libopts \
 		--with-trousers-lib=${LOCALBASE}/lib/libtspi.so.1 \
 		ac_cv_type_max_align_t=yes
 MAKE_ENV=	MAKEINFOFLAGS=--no-split
 INSTALL_TARGET=	install-strip
 
 CPE_VENDOR=	gnu
 
 OPTIONS_DEFINE=		DANE DOCS EXAMPLES IDN NLS P11KIT TPM ZLIB
 OPTIONS_DEFAULT=	IDN P11KIT TPM ZLIB
 OPTIONS_SUB=		yes
 
 DANE_DESC=		Certificate verification via DNSSEC
 DANE_LIB_DEPENDS=	libunbound.so:dns/unbound
 DANE_CONFIGURE_ENABLE=	libdane
 
 IDN_CONFIGURE_WITH=	idn
 IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_CONFIGURE_OFF=	ac_cv_lib_intl_gettext=no
 NLS_USES=		gettext
 
 P11KIT_DESC=		PKCS\#11 and p11-kit support
 P11KIT_CONFIGURE_WITH=	p11-kit
 P11KIT_LIB_DEPENDS=	libp11-kit.so:security/p11-kit
 
 TPM_DESC=		Trusted Platform Module support
 TPM_CONFIGURE_WITH=	tpm
 TPM_LIB_DEPENDS=	libtspi.so:security/trousers
 
 ZLIB_CONFIGURE_WITH=	zlib
 
 INFO=		gnutls gnutls-guile
 
-.include <bsd.port.pre.mk>
-
-# XXX CHOSEN_COMPILER_VERSION isn't supported, so check CC hasn't changed
-.if ${ARCH} == aarch64 && ${CC} == cc && \
-    ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 40
-BUILD_DEPENDS+=	as:devel/binutils
-CFLAGS+=	-no-integrated-as
-.endif
-
 post-patch:
 	@${RM} ${WRKSRC}/doc/*.info*
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/examples/*.[ch] ${STAGEDIR}${EXAMPLESDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: branches/2018Q1
===================================================================
--- branches/2018Q1	(revision 458105)
+++ branches/2018Q1	(revision 458106)

Property changes on: branches/2018Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r458103