[Bug 198943] net/sixxs-aiccu make gnutls optional

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=198943

            Bug ID: 198943
           Summary: net/sixxs-aiccu make gnutls optional
           Product: Ports & Packages
           Version: Latest
          Hardware: Any
                OS: Any
            Status: New
          Severity: Affects Only Me
          Priority: ---
         Component: Individual Port(s)
          Assignee: freebsd-ports-bugs at FreeBSD.org
          Reporter: bz at FreeBSD.org

Add an option to make gnutls an optional dependency:

Index: Makefile
===================================================================
--- Makefile    (revision 382328)
+++ Makefile    (working copy)
@@ -12,8 +12,6 @@ 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

@@ -20,16 +18,27 @@ 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} \

-- 
You are receiving this mail because:
You are the assignee for the bug.