From owner-svn-ports-all@freebsd.org  Tue Sep 13 16:40:46 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 14AB0BD9D3D;
 Tue, 13 Sep 2016 16:40:46 +0000 (UTC)
 (envelope-from marino@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 D9DCDD51;
 Tue, 13 Sep 2016 16:40:45 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8DGejCq051618;
 Tue, 13 Sep 2016 16:40:45 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8DGejZg051617;
 Tue, 13 Sep 2016 16:40:45 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201609131640.u8DGejZg051617@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Tue, 13 Sep 2016 16:40:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r422033 - head/net-mgmt/nsca-ng
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Sep 2016 16:40:46 -0000

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>