CVS commit: pkgsrc/sysutils

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Feb 11 10:05:14 UTC 2021

Modified Files:
        pkgsrc/sysutils/ups-nut: Makefile Makefile.common
        pkgsrc/sysutils/ups-nut-cgi: Makefile
        pkgsrc/sysutils/ups-nut-snmp: Makefile
        pkgsrc/sysutils/ups-nut-usb: Makefile
Added Files:
        pkgsrc/sysutils/ups-nut: options.mk

Log Message:
ups-nut*: add options.mk for SSL support

Enable nss backend by default.
openssl backend only supports OpenSSL 1.0, so disabled for now.

Bump PKGREVISION.

>From Edgar Fuß.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/sysutils/ups-nut/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/ups-nut/Makefile.common
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/ups-nut/options.mk
cvs rdiff -u -r1.68 -r1.69 pkgsrc/sysutils/ups-nut-cgi/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/ups-nut-snmp/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/ups-nut-usb/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/ups-nut/Makefile
diff -u pkgsrc/sysutils/ups-nut/Makefile:1.58 pkgsrc/sysutils/ups-nut/Makefile:1.59
--- pkgsrc/sysutils/ups-nut/Makefile:1.58       Mon Aug 31 18:11:36 2020
+++ pkgsrc/sysutils/ups-nut/Makefile    Thu Feb 11 10:05:13 2021
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.58 2020/08/31 18:11:36 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2021/02/11 10:05:13 wiz Exp $
 
 .include "Makefile.common"
 
 PKGNAME=               ups-${DISTNAME}
-PKGREVISION=           2
+PKGREVISION=           3
 COMMENT=               Network UPS Tools
 
 # Don't regenerate any files in tools/.

Index: pkgsrc/sysutils/ups-nut/Makefile.common
diff -u pkgsrc/sysutils/ups-nut/Makefile.common:1.8 pkgsrc/sysutils/ups-nut/Makefile.common:1.9
--- pkgsrc/sysutils/ups-nut/Makefile.common:1.8 Mon Jul 13 18:50:05 2020
+++ pkgsrc/sysutils/ups-nut/Makefile.common     Thu Feb 11 10:05:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2020/07/13 18:50:05 wiz Exp $
+# $NetBSD: Makefile.common,v 1.9 2021/02/11 10:05:13 wiz Exp $
 # used by sysutils/ups-nut/Makefile
 # used by sysutils/ups-nut-cgi/Makefile
 # used by sysutils/ups-nut-snmp/Makefile
@@ -34,6 +34,7 @@ CONFIGURE_ARGS+=      --with-group=${NUT_GROU
 CHECK_PORTABILITY_SKIP=        packaging/*
 
 .include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 BUILD_DEFS+=           VARBASE
 

Index: pkgsrc/sysutils/ups-nut-cgi/Makefile
diff -u pkgsrc/sysutils/ups-nut-cgi/Makefile:1.68 pkgsrc/sysutils/ups-nut-cgi/Makefile:1.69
--- pkgsrc/sysutils/ups-nut-cgi/Makefile:1.68   Wed Sep 30 10:28:08 2020
+++ pkgsrc/sysutils/ups-nut-cgi/Makefile        Thu Feb 11 10:05:13 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.68 2020/09/30 10:28:08 jperkin Exp $
+# $NetBSD: Makefile,v 1.69 2021/02/11 10:05:13 wiz Exp $
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../sysutils/ups-nut/Makefile.common"
 
 PKGNAME=               ${DISTNAME:S/nut/ups-nut-cgi/}

Index: pkgsrc/sysutils/ups-nut-snmp/Makefile
diff -u pkgsrc/sysutils/ups-nut-snmp/Makefile:1.8 pkgsrc/sysutils/ups-nut-snmp/Makefile:1.9
--- pkgsrc/sysutils/ups-nut-snmp/Makefile:1.8   Sun May 10 14:12:33 2020
+++ pkgsrc/sysutils/ups-nut-snmp/Makefile       Thu Feb 11 10:05:13 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2020/05/10 14:12:33 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2021/02/11 10:05:13 wiz Exp $
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../sysutils/ups-nut/Makefile.common"
 
 PKGNAME=               ${DISTNAME:S/nut/ups-nut-snmp/}

Index: pkgsrc/sysutils/ups-nut-usb/Makefile
diff -u pkgsrc/sysutils/ups-nut-usb/Makefile:1.10 pkgsrc/sysutils/ups-nut-usb/Makefile:1.11
--- pkgsrc/sysutils/ups-nut-usb/Makefile:1.10   Sun May 10 14:12:33 2020
+++ pkgsrc/sysutils/ups-nut-usb/Makefile        Thu Feb 11 10:05:13 2021
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2020/05/10 14:12:33 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2021/02/11 10:05:13 wiz Exp $
 
+PKGREVISION=           1
 .include "../../sysutils/ups-nut/Makefile.common"
 
 PKGNAME=               ${DISTNAME:S/nut/ups-nut-usb/}

Added files:

Index: pkgsrc/sysutils/ups-nut/options.mk
diff -u /dev/null pkgsrc/sysutils/ups-nut/options.mk:1.1
--- /dev/null   Thu Feb 11 10:05:14 2021
+++ pkgsrc/sysutils/ups-nut/options.mk  Thu Feb 11 10:05:13 2021
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.1 2021/02/11 10:05:13 wiz Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.ups-nut
+PKG_OPTIONS_OPTIONAL_GROUPS=   ssl
+PKG_OPTIONS_GROUP.ssl=         nss # openssl # only has openssl 1.0 support
+PKG_SUGGESTED_OPTIONS=         nss
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mopenssl)
+CONFIGURE_ARGS+=       --with-ssl=openssl --with-openssl --without-nss
+.  include "../../security/openssl/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Mnss)
+CONFIGURE_ARGS+=       --with-ssl=nss --with-nss --without-openssl
+.  include "../../devel/nss/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-ssl
+.endif