CVS commit: pkgsrc/chat/scrollz

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Nov 30 12:28:51 UTC 2020

Modified Files:
        pkgsrc/chat/scrollz: options.mk

Log Message:
scrollz: Non-default OpenSSL option is broken with 1.1, disable it

Upstream appears to be dead so I don't think this is getting fixed
any time soon. GnuTLS is the default anyway.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/chat/scrollz/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/chat/scrollz/options.mk
diff -u pkgsrc/chat/scrollz/options.mk:1.4 pkgsrc/chat/scrollz/options.mk:1.5
--- pkgsrc/chat/scrollz/options.mk:1.4  Sun May 31 17:22:16 2020
+++ pkgsrc/chat/scrollz/options.mk      Mon Nov 30 12:28:50 2020
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.4 2020/05/31 17:22:16 rillig Exp $
+# $NetBSD: options.mk,v 1.5 2020/11/30 12:28:50 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.scrollz
 PKG_SUPPORTED_OPTIONS=         regexp utf8
 PKG_SUGGESTED_OPTIONS+=                inet6
 PKG_OPTIONS_OPTIONAL_GROUPS=   conflict socks ssl
 PKG_OPTIONS_GROUP.socks=       socks4 dante
-PKG_OPTIONS_GROUP.ssl=         gnutls openssl
+PKG_OPTIONS_GROUP.ssl=         gnutls
 # PR 52883: these two options conflict
 PKG_OPTIONS_GROUP.conflict=    efence inet6
 
@@ -28,12 +28,13 @@ CONFIGURE_ARGS+=    --enable-ipv6
 CONFIGURE_ARGS+=       --disable-ipv6
 .endif
 
-.if !empty(PKG_OPTIONS:Mopenssl)
-.include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=       --disable-fish --with-openssl
-.else
-CONFIGURE_ARGS+=       --without-openssl
-.endif
+# XXX: Broken with OpenSSL 1.1.
+#.if !empty(PKG_OPTIONS:Mopenssl)
+#.include "../../security/openssl/buildlink3.mk"
+#CONFIGURE_ARGS+=      --disable-fish --with-openssl
+#.else
+#CONFIGURE_ARGS+=      --without-openssl
+#.endif
 
 .if !empty(PKG_OPTIONS:Mregexp)
 CONFIGURE_ARGS+=       --enable-regexp