diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile index 2af751a31d34..860d04229389 100644 --- a/sysutils/ups-nut-cgi/Makefile +++ b/sysutils/ups-nut-cgi/Makefile @@ -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 --git a/sysutils/ups-nut-snmp/Makefile b/sysutils/ups-nut-snmp/Makefile index 8594bc287cee..d9bc662a7705 100644 --- a/sysutils/ups-nut-snmp/Makefile +++ b/sysutils/ups-nut-snmp/Makefile @@ -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 --git a/sysutils/ups-nut-usb/Makefile b/sysutils/ups-nut-usb/Makefile index e6bbc8493fd0..773fe0f41d81 100644 --- a/sysutils/ups-nut-usb/Makefile +++ b/sysutils/ups-nut-usb/Makefile @@ -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 --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile index 1c5475e8cf1b..749ea0d85388 100644 --- a/sysutils/ups-nut/Makefile +++ b/sysutils/ups-nut/Makefile @@ -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 --git a/sysutils/ups-nut/Makefile.common b/sysutils/ups-nut/Makefile.common index 8023dfb8e80b..21c173079d24 100644 --- a/sysutils/ups-nut/Makefile.common +++ b/sysutils/ups-nut/Makefile.common @@ -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_GROUP} CHECK_PORTABILITY_SKIP= packaging/* .include "../../mk/bsd.prefs.mk" +.include "options.mk" BUILD_DEFS+= VARBASE diff --git a/sysutils/ups-nut/options.mk b/sysutils/ups-nut/options.mk new file mode 100644 index 000000000000..0c7cf09de8da --- /dev/null +++ b/sysutils/ups-nut/options.mk @@ -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