From owner-svn-ports-all@freebsd.org  Fri Jan  5 03:00:40 2018
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 B09B0EAA3A1;
 Fri,  5 Jan 2018 03:00:40 +0000 (UTC)
 (envelope-from jbeich@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 7A5EA7063E;
 Fri,  5 Jan 2018 03:00:40 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0530d4j025479;
 Fri, 5 Jan 2018 03:00:39 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0530dqE025478;
 Fri, 5 Jan 2018 03:00:39 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201801050300.w0530dqE025478@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Fri, 5 Jan 2018 03:00:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r458106 - branches/2018Q1/security/gnutls
X-SVN-Group: ports-branches
X-SVN-Commit-Author: jbeich
X-SVN-Commit-Paths: branches/2018Q1/security/gnutls
X-SVN-Commit-Revision: 458106
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: Fri, 05 Jan 2018 03:00:40 -0000

Author: jbeich
Date: Fri Jan  5 03:00:39 2018
New Revision: 458106
URL: https://svnweb.freebsd.org/changeset/ports/458106

Log:
  MFH: r458103
  
  security/gnutls: revert r431494 per FreeBSD 11.0 EOL
  
  PR:		216045
  Approved by:	portmgr blanket
  Approved by:	ports-secteam blanket

Modified:
  branches/2018Q1/security/gnutls/Makefile
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/security/gnutls/Makefile
==============================================================================
--- branches/2018Q1/security/gnutls/Makefile	Fri Jan  5 02:59:43 2018	(r458105)
+++ branches/2018Q1/security/gnutls/Makefile	Fri Jan  5 03:00:39 2018	(r458106)
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libgmp.so:math/gmp \
 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
@@ -60,15 +60,6 @@ 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*
 
@@ -76,4 +67,4 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/examples/*.[ch] ${STAGEDIR}${EXAMPLESDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>