From owner-svn-ports-head@FreeBSD.ORG  Mon Mar 30 14:23:47 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A97AEFA0;
 Mon, 30 Mar 2015 14:23:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 946969A9;
 Mon, 30 Mar 2015 14:23:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2UENlWF023552;
 Mon, 30 Mar 2015 14:23:47 GMT (envelope-from arved@FreeBSD.org)
Received: (from arved@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2UENlkX023551;
 Mon, 30 Mar 2015 14:23:47 GMT (envelope-from arved@FreeBSD.org)
Message-Id: <201503301423.t2UENlkX023551@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: arved set sender to
 arved@FreeBSD.org using -f
From: Tilman Keskinoz <arved@FreeBSD.org>
Date: Mon, 30 Mar 2015 14:23:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r382671 - head/net/sixxs-aiccu
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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Mar 2015 14:23:47 -0000

Author: arved
Date: Mon Mar 30 14:23:46 2015
New Revision: 382671
URL: https://svnweb.freebsd.org/changeset/ports/382671
QAT: https://qat.redports.org/buildarchive/r382671/

Log:
  Add option to disable GNUTLS
  
  PR:		198943
  Submitted by:	bz

Modified:
  head/net/sixxs-aiccu/Makefile

Modified: head/net/sixxs-aiccu/Makefile
==============================================================================
--- head/net/sixxs-aiccu/Makefile	Mon Mar 30 13:51:56 2015	(r382670)
+++ head/net/sixxs-aiccu/Makefile	Mon Mar 30 14:23:46 2015	(r382671)
@@ -12,24 +12,33 @@ DISTNAME=	aiccu_20070115
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SixXS IPv6 TIC+ tunnel broker heartbeat client
 
-LIB_DEPENDS=	libgnutls-openssl.so:${PORTSDIR}/security/gnutls
-
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 USE_RC_SUBR=	sixxs-aiccu
 USES=		gmake
 
-CFLAGS+=	-D_REENTRANT -DAICCU_GNUTLS -I${LOCALBASE}/include
-LDFLAGS+=	-lpthread -L${LOCALBASE}/lib -lgnutls
+CFLAGS+=	-D_REENTRANT -I${LOCALBASE}/include
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 MAKE_ARGS+=	CC="${CC}" LDFLAGS="${LDFLAGS}"
 WRKSRC=		${WRKDIR}/aiccu
 BUILD_WRKSRC=	${WRKDIR}/aiccu/unix-console
 PORTDOCS=	README
 
-OPTIONS_DEFINE=	LOG_DAEMON DOCS
+OPTIONS_DEFINE=	GNUTLS LOG_DAEMON DOCS
+GNUTLS_DESC=	Use gnutls to secure TIC supporting starttls
 LOG_DAEMON_DESC=Log to LOG_DAEMON instead to LOG_LOCAL7
 
+OPTIONS_DEFAULT+=	GNUTLS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGNUTLS}
+LIB_DEPENDS+=	libgnutls-openssl.so:${PORTSDIR}/security/gnutls
+CFLAGS+=	-DAICCU_GNUTLS
+LDFLAGS+=	-lgnutls
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's:verbose true:verbose false:' \
@@ -40,8 +49,6 @@ post-patch:
 		-e 's:ipv6_interface sixxs:ipv6_interface gif0:' \
 		${WRKSRC}/doc/aiccu.conf
 
-.include <bsd.port.options.mk>
-
 .if ${PORT_OPTIONS:MLOG_DAEMON}
 do-configure:
 	@${REINPLACE_CMD} \