svn commit: r382671 - head/net/sixxs-aiccu

[Tilman Keskinoz]

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 at 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} \