Date: Tue, 13 Sep 2016 16:40:45 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422033 - head/net-mgmt/nsca-ng Message-ID: <201609131640.u8DGejZg051617@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Tue Sep 13 16:40:44 2016 New Revision: 422033 URL: https://svnweb.freebsd.org/changeset/ports/422033 Log: net-mgmt/nsca-ng(-client): Configure any SSL base, IGNORE LibreSSL These ports currently utilize PSK which is not supported by LibreSSL, so detect that SSL_DEFAULT and set IGNORE accordingly. The obsolete USE_OPENSSL_PORT logic was also removed. Approved by: SSL blanket Modified: head/net-mgmt/nsca-ng/Makefile Modified: head/net-mgmt/nsca-ng/Makefile ============================================================================== --- head/net-mgmt/nsca-ng/Makefile Tue Sep 13 16:36:32 2016 (r422032) +++ head/net-mgmt/nsca-ng/Makefile Tue Sep 13 16:40:44 2016 (r422033) @@ -20,23 +20,23 @@ LIB_DEPENDS+= libconfuse.so:devel/libcon CONFLICTS?= nsca-2.* nsca27-2.* +USES= ssl GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var/spool/nagios -USE_OPENSSL= yes +CPPFLAGS+= -I${OPENSSLINC} +LDFLAGS+= -L${OPENSSLLIB} .if !defined(PKGNAMESUFFIX) USE_RC_SUBR= nsca-ng CONFIGURE_ARGS+= --enable-server .endif -PORTDOCS= NEWS COPYING README PROTOCOL TODO +PORTDOCS= NEWS COPYING README PROTOCOL TODO -.include <bsd.port.options.mk> +.include <bsd.port.pre.mk> -.if ${OSVERSION} < 1000000 -WITH_OPENSSL_PORT= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +.if ${SSL_DEFAULT:Mlibressl*} +IGNORE= Requires PSK which is unsupported by the selected LibreSSL .endif post-install: @@ -61,4 +61,4 @@ post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.include <bsd.port.mk> +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609131640.u8DGejZg051617>