From owner-svn-ports-head@freebsd.org  Sat Oct 22 21:07:01 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 C16A8C1D001;
 Sat, 22 Oct 2016 21:07:01 +0000 (UTC) (envelope-from zi@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 76CCABF6;
 Sat, 22 Oct 2016 21:07:01 +0000 (UTC) (envelope-from zi@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9ML70Ho018362;
 Sat, 22 Oct 2016 21:07:00 GMT (envelope-from zi@FreeBSD.org)
Received: (from zi@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9ML70kc018360;
 Sat, 22 Oct 2016 21:07:00 GMT (envelope-from zi@FreeBSD.org)
Message-Id: <201610222107.u9ML70kc018360@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: zi set sender to zi@FreeBSD.org
 using -f
From: Ryan Steinmetz <zi@FreeBSD.org>
Date: Sat, 22 Oct 2016 21:07:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r424487 - head/net/freeradius3
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Oct 2016 21:07:01 -0000

Author: zi
Date: Sat Oct 22 21:07:00 2016
New Revision: 424487
URL: https://svnweb.freebsd.org/changeset/ports/424487

Log:
  - Resolve build failure under 9.3

Modified:
  head/net/freeradius3/Makefile
  head/net/freeradius3/pkg-plist

Modified: head/net/freeradius3/Makefile
==============================================================================
--- head/net/freeradius3/Makefile	Sat Oct 22 20:41:16 2016	(r424486)
+++ head/net/freeradius3/Makefile	Sat Oct 22 21:07:00 2016	(r424487)
@@ -286,6 +286,14 @@ CONFIGURE_ARGS+=--with-udpfromto
 WITH_OPENSSL_PORT=yes
 .endif
 
+# rlm_eap_fast is currently broken under 9.x:
+# https://github.com/FreeRADIUS/freeradius-server/issues/1803
+.if ${OSVERSION} < 1000015
+PLIST_SUB+=     EAPFAST="@comment "
+.else
+PLIST_SUB+=     EAPFAST=""
+.endif
+
 .include <bsd.port.pre.mk>
 
 # if we're installing, place sample configs into ${EXAMPLESDIR}
@@ -342,6 +350,9 @@ SUB_LIST+=	RADIUS_USER="${RADIUS_USER}" 
 SUB_LIST+=	REQUIRE="${_REQUIRE}"
 
 post-patch:
+.if ${OSVERSION} < 1000015
+	${RM} -r ${WRKSRC}/src/modules/rlm_eap/types/rlm_eap_fast
+.endif
 # never try to find execinfo.h (needed until we can enable/disable backtrace
 	@${REINPLACE_CMD} -e '/#include <execinfo.h>/d' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -Ee "s:tests/all.mk ::" ${WRKSRC}/src/all.mk

Modified: head/net/freeradius3/pkg-plist
==============================================================================
--- head/net/freeradius3/pkg-plist	Sat Oct 22 20:41:16 2016	(r424486)
+++ head/net/freeradius3/pkg-plist	Sat Oct 22 21:07:00 2016	(r424487)
@@ -141,9 +141,9 @@ include/freeradius/vqp.h
 %%LIBDIR%%/rlm_eap_gtc.a
 %%LIBDIR%%/rlm_eap_gtc.la
 %%LIBDIR%%/rlm_eap_gtc.so
-%%LIBDIR%%/rlm_eap_fast.a
-%%LIBDIR%%/rlm_eap_fast.la
-%%LIBDIR%%/rlm_eap_fast.so
+%%EAPFAST%%%%LIBDIR%%/rlm_eap_fast.a
+%%EAPFAST%%%%LIBDIR%%/rlm_eap_fast.la
+%%EAPFAST%%%%LIBDIR%%/rlm_eap_fast.so
 %%LIBDIR%%/rlm_eap_leap.a
 %%LIBDIR%%/rlm_eap_leap.la
 %%LIBDIR%%/rlm_eap_leap.so