svn commit: r482886 - head/sysutils/nut

[Cy Schubert]

Author: cy
Date: Wed Oct 24 07:17:08 2018
New Revision: 482886
URL: https://svnweb.freebsd.org/changeset/ports/482886

Log:
  Add NSS support with a new NSS option. The new NSS option is mutually
  exclusive with the OPENSSL option, previously called the SSL option.
  Also add a no SSL option which was previously implied by deselecting
  the previous SSL option. Only one of the three options may be selected.

Modified:
  head/sysutils/nut/Makefile   (contents, props changed)

Modified: head/sysutils/nut/Makefile
==============================================================================
--- head/sysutils/nut/Makefile	Wed Oct 24 07:16:55 2018	(r482885)
+++ head/sysutils/nut/Makefile	Wed Oct 24 07:17:08 2018	(r482886)
@@ -22,10 +22,11 @@ STATEDIR?=	/var/db/nut
 PLIST_SUB+=	NUT_USER=${NUT_USER}
 PLIST_SUB+=	NUT_GROUP=${NUT_GROUP}
 
-OPTIONS_DEFAULT=SERIAL USB SNMP NEON IPMI_OFF
-OPTIONS_DEFINE=	SERIAL USB SNMP NEON PDU CGI BASH AVAHI OPENSSL DOCS
-OPTIONS_SINGLE=	IPMI
+OPTIONS_DEFAULT=SERIAL USB SNMP NEON IPMI_OFF SSL_OFF
+OPTIONS_DEFINE=	SERIAL USB SNMP NEON PDU CGI BASH AVAHI DOCS
+OPTIONS_SINGLE=	IPMI SSL
 OPTIONS_SINGLE_IPMI=	IPMI_OFF IPMIPSU FREEIPMI
+OPTIONS_SINGLE_SSL=	SSL_OFF OPENSSL NSS
 
 SERIAL_DESC=	SERIAL support
 USB_DESC=	USB support
@@ -38,6 +39,7 @@ AVAHI_DESC=	Avahi support
 IPMI_OFF_DESC=	No IPMI support
 FREEIPMI_DESC=	freeipmi support
 IPMIPSU_DESC=	Use nut-ipmipsu support (experimental)
+SSL_OFF_DESC=	No SSL support
 
 USE_RC_SUBR=	nut nut_upsmon nut_upslog
 SUB_LIST+=	STATEDIR=${STATEDIR}
@@ -160,6 +162,9 @@ PLIST_SUB+=	NUT_IPMIPSU="@comment "
 .if ${PORT_OPTIONS:MOPENSSL}
 USES+=	ssl
 CONFIGURE_ARGS+=	--with-openssl
+.elif ${PORT_OPTIONS:MNSS}
+LIB_DEPENDS=		libnss3.so:security/nss
+CONFIGURE_ARGS+=	--with-nss
 .else
 CONFIGURE_ARGS+=	--without-openssl --without-ssl
 .endif