pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils ups-nut*: add options.mk for SSL support
details: https://anonhg.NetBSD.org/pkgsrc/rev/f786a3183833
branches: trunk
changeset: 446592:f786a3183833
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Feb 11 10:05:13 2021 +0000
description:
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ß.
diffstat:
sysutils/ups-nut-cgi/Makefile | 4 ++--
sysutils/ups-nut-snmp/Makefile | 4 ++--
sysutils/ups-nut-usb/Makefile | 3 ++-
sysutils/ups-nut/Makefile | 4 ++--
sysutils/ups-nut/Makefile.common | 3 ++-
sysutils/ups-nut/options.mk | 18 ++++++++++++++++++
6 files changed, 28 insertions(+), 8 deletions(-)
diffs (89 lines):
diff -r b1bcec1946bc -r f786a3183833 sysutils/ups-nut-cgi/Makefile
--- a/sysutils/ups-nut-cgi/Makefile Thu Feb 11 09:56:15 2021 +0000
+++ b/sysutils/ups-nut-cgi/Makefile Thu Feb 11 10:05:13 2021 +0000
@@ -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/}
diff -r b1bcec1946bc -r f786a3183833 sysutils/ups-nut-snmp/Makefile
--- a/sysutils/ups-nut-snmp/Makefile Thu Feb 11 09:56:15 2021 +0000
+++ b/sysutils/ups-nut-snmp/Makefile Thu Feb 11 10:05:13 2021 +0000
@@ -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/}
diff -r b1bcec1946bc -r f786a3183833 sysutils/ups-nut-usb/Makefile
--- a/sysutils/ups-nut-usb/Makefile Thu Feb 11 09:56:15 2021 +0000
+++ b/sysutils/ups-nut-usb/Makefile Thu Feb 11 10:05:13 2021 +0000
@@ -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/}
diff -r b1bcec1946bc -r f786a3183833 sysutils/ups-nut/Makefile
--- a/sysutils/ups-nut/Makefile Thu Feb 11 09:56:15 2021 +0000
+++ b/sysutils/ups-nut/Makefile Thu Feb 11 10:05:13 2021 +0000
@@ -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/.
diff -r b1bcec1946bc -r f786a3183833 sysutils/ups-nut/Makefile.common
--- a/sysutils/ups-nut/Makefile.common Thu Feb 11 09:56:15 2021 +0000
+++ b/sysutils/ups-nut/Makefile.common Thu Feb 11 10:05:13 2021 +0000
@@ -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 @@
CHECK_PORTABILITY_SKIP= packaging/*
.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
BUILD_DEFS+= VARBASE
diff -r b1bcec1946bc -r f786a3183833 sysutils/ups-nut/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/ups-nut/options.mk Thu Feb 11 10:05:13 2021 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index