CVS commit: pkgsrc/sysutils/ups-nut

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Nov  9 21:02:48 UTC 2023

Modified Files:
        pkgsrc/sysutils/ups-nut: Makefile options.mk

Log Message:
sysutils/ups-nut: Re-enable openssl option and default to it

The option was disabled because old nut could only used ancient
openssl, but 2.8.1 works with 3.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/sysutils/ups-nut/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/ups-nut/options.mk

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.73 pkgsrc/sysutils/ups-nut/Makefile:1.74
--- pkgsrc/sysutils/ups-nut/Makefile:1.73       Thu Nov  9 18:58:44 2023
+++ pkgsrc/sysutils/ups-nut/Makefile    Thu Nov  9 21:02:48 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.73 2023/11/09 18:58:44 gdt Exp $
+# $NetBSD: Makefile,v 1.74 2023/11/09 21:02:48 gdt Exp $
 
 .include "Makefile.common"
 
 PKGNAME=               ups-${DISTNAME}
-PKGREVISION=           1
+PKGREVISION=           2
 COMMENT=               Network UPS Tools
 
 SUBST_CLASSES+=                man-so

Index: pkgsrc/sysutils/ups-nut/options.mk
diff -u pkgsrc/sysutils/ups-nut/options.mk:1.2 pkgsrc/sysutils/ups-nut/options.mk:1.3
--- pkgsrc/sysutils/ups-nut/options.mk:1.2      Wed Mar 24 11:01:55 2021
+++ pkgsrc/sysutils/ups-nut/options.mk  Thu Nov  9 21:02:48 2023
@@ -1,18 +1,18 @@
-# $NetBSD: options.mk,v 1.2 2021/03/24 11:01:55 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2023/11/09 21:02:48 gdt 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
+PKG_OPTIONS_GROUP.ssl=         nss openssl
+PKG_SUGGESTED_OPTIONS=         openssl
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mnss)
 CONFIGURE_ARGS+=       --with-ssl=nss --with-nss --without-openssl
 .  include "../../devel/nss/buildlink3.mk"
-#.elif !empty(PKG_OPTIONS:Mopenssl)
-#CONFIGURE_ARGS+=      --with-ssl=openssl --with-openssl --without-nss
-#.  include "../../security/openssl/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Mopenssl)
+CONFIGURE_ARGS+=       --with-ssl=openssl --without-nss --with-openssl
+.  include "../../security/openssl/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --without-ssl
 .endif