[pkgsrc/trunk]: pkgsrc/chat/scrollz scrollz: efence and inet6 options conflict

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/28cb9c52af7d
branches:  trunk
changeset: 373988:28cb9c52af7d
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Jan 13 08:53:58 2018 +0000

description:
scrollz: efence and inet6 options conflict

According to PR 52883. Put them in one option group. Disable efence.

Bump PKGREVISION.

diffstat:

 chat/scrollz/Makefile   |   5 ++---
 chat/scrollz/options.mk |  10 ++++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diffs (36 lines):

diff -r 1767a403e97f -r 28cb9c52af7d chat/scrollz/Makefile
--- a/chat/scrollz/Makefile     Sat Jan 13 08:48:27 2018 +0000
+++ b/chat/scrollz/Makefile     Sat Jan 13 08:53:58 2018 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2017/05/10 10:09:21 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.24 2018/01/13 08:53:58 wiz Exp $
 
 DISTNAME=      ScrollZ-2.2.3
 PKGNAME=       ${DISTNAME:tl}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    chat
 MASTER_SITES=  http://www.scrollz.info/download/
 
diff -r 1767a403e97f -r 28cb9c52af7d chat/scrollz/options.mk
--- a/chat/scrollz/options.mk   Sat Jan 13 08:48:27 2018 +0000
+++ b/chat/scrollz/options.mk   Sat Jan 13 08:53:58 2018 +0000
@@ -1,11 +1,13 @@
-# $NetBSD: options.mk,v 1.2 2015/09/30 08:25:37 tnn Exp $
+# $NetBSD: options.mk,v 1.3 2018/01/13 08:53:58 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.scrollz
-PKG_SUPPORTED_OPTIONS=         efence inet6 regexp utf8
-PKG_SUGGESTED_OPTIONS+=                efence inet6
-PKG_OPTIONS_OPTIONAL_GROUPS=   socks ssl
+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
+# PR 52883: these two options conflict
+PKG_OPTIONS_GROUP.conflict=    efence inet6
 
 .include "../../mk/bsd.options.mk"