From owner-svn-ports-head@freebsd.org Wed Oct 24 13:16:08 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3E0C9107B960; Wed, 24 Oct 2018 13:16:08 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E080689F0F; Wed, 24 Oct 2018 13:16:07 +0000 (UTC) (envelope-from cy@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 35C511D11E; Wed, 24 Oct 2018 07:17:09 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9O7H9Q7079606; Wed, 24 Oct 2018 07:17:09 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9O7H9VF079605; Wed, 24 Oct 2018 07:17:09 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201810240717.w9O7H9VF079605@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Wed, 24 Oct 2018 07:17:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482886 - head/sysutils/nut X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: head/sysutils/nut X-SVN-Commit-Revision: 482886 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Oct 2018 13:16:08 -0000 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