svn commit: r456946 - in head/net-mgmt/nrpe3: . files

[Mahdi Mokhtari]

Author: mmokhi
Date: Thu Dec 21 20:30:46 2017
New Revision: 456946
URL: https://svnweb.freebsd.org/changeset/ports/456946

Log:
  net-mgmt/nrpe3: Fix build with LibreSSL
  The patch enables the configure of the port to detect LibreSSL as a valid OpenSSL
  
  Reported by:	Philip Jocks <pj at netzkommune.de>
  Reviewed by:	brnrd, zeising (maintainer)
  Approved by:	zeising (maintainer)
  Sponsored by:	Netzkommune GmbH
  Differential Revision:	https://reviews.freebsd.org/D13421

Added:
  head/net-mgmt/nrpe3/files/patch-include_common.h.in   (contents, props changed)
Modified:
  head/net-mgmt/nrpe3/Makefile

Modified: head/net-mgmt/nrpe3/Makefile
==============================================================================
--- head/net-mgmt/nrpe3/Makefile	Thu Dec 21 20:30:35 2017	(r456945)
+++ head/net-mgmt/nrpe3/Makefile	Thu Dec 21 20:30:46 2017	(r456946)
@@ -35,9 +35,8 @@ MONPLUGINS_DESC=Use net-mgmt/monitoring-plugins
 
 SSL_USES=		ssl
 SSL_CONFIGURE_ENABLE=	ssl
-SSL_CONFIGURE_ON=	--with-ssl=${OPENSSLDIR} \
-			--with-ssl-inc=${OPENSSLINC} \
-			--with-ssl-lib=${OPENSSLLIB}
+SSL_CONFIGURE_WITH=	ssl=${OPENSSLBASE} ssl-inc=${OPENSSLINC} ssl-lib=${OPENSSLLIB}
+SSL_CFLAGS=		-I${OPENSSLINC}
 
 ARGS_CONFIGURE_ON=	--enable-command-args
 ARGS_CONFIGURE_OFF=	--disable-command-args

Added: head/net-mgmt/nrpe3/files/patch-include_common.h.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/nrpe3/files/patch-include_common.h.in	Thu Dec 21 20:30:46 2017	(r456946)
@@ -0,0 +1,19 @@
+--- include/common.h.in.orig	2017-12-08 11:11:28 UTC
++++ include/common.h.in
+@@ -30,11 +30,16 @@
+ 
+ #ifdef HAVE_SSL
+ #include <@SSL_INC_PREFIX@@SSL_HDR@>
++#include <@SSL_INC_PREFIX at crypto.h>
+ # ifdef SSL_TYPE_openssl
+ #  include <@SSL_INC_PREFIX at err.h>
+ #  include <@SSL_INC_PREFIX at rand.h>
+ #  include <@SSL_INC_PREFIX at engine.h>
++#  include <@SSL_INC_PREFIX at crypto.h>
++#  if defined (LIBRESSL_VERSION_NUMBER)
++#   include <@SSL_INC_PREFIX at opensslfeatures.h>
++#  endif
+ # endif
+ #endif
+ 
+ #define PROGRAM_VERSION "3.2.1"