CVS commit: pkgsrc/chat/scrollz

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jan 13 08:53:58 UTC 2018

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

Log Message:
scrollz: efence and inet6 options conflict

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

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/chat/scrollz/Makefile
cvs rdiff -u -r1.2 -r1.3 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/Makefile
diff -u pkgsrc/chat/scrollz/Makefile:1.23 pkgsrc/chat/scrollz/Makefile:1.24
--- pkgsrc/chat/scrollz/Makefile:1.23   Wed May 10 10:09:21 2017
+++ pkgsrc/chat/scrollz/Makefile        Sat Jan 13 08:53:58 2018
@@ -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/
 

Index: pkgsrc/chat/scrollz/options.mk
diff -u pkgsrc/chat/scrollz/options.mk:1.2 pkgsrc/chat/scrollz/options.mk:1.3
--- pkgsrc/chat/scrollz/options.mk:1.2  Wed Sep 30 08:25:37 2015
+++ pkgsrc/chat/scrollz/options.mk      Sat Jan 13 08:53:58 2018
@@ -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"