diff options
| author | wiz <wiz@pkgsrc.org> | 2018-01-13 08:53:58 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2018-01-13 08:53:58 +0000 |
| commit | 2cb542e8c41cc4589efcf745af21e41932616ab3 (patch) | |
| tree | 14ff6068ffc4948d78b41a2677d7719cb8add7ae /chat/scrollz | |
| parent | 21570b34c1fcbe9c8467423ea0b17e6188ce2cb4 (diff) | |
| download | pkgsrc-2cb542e8c41cc4589efcf745af21e41932616ab3.tar.gz | |
scrollz: efence and inet6 options conflict
According to PR 52883. Put them in one option group. Disable efence.
Bump PKGREVISION.
Diffstat (limited to 'chat/scrollz')
| -rw-r--r-- | chat/scrollz/Makefile | 5 | ||||
| -rw-r--r-- | chat/scrollz/options.mk | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/chat/scrollz/Makefile b/chat/scrollz/Makefile index 657c28c8828..9f9976ece58 100644 --- a/chat/scrollz/Makefile +++ b/chat/scrollz/Makefile @@ -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 --git a/chat/scrollz/options.mk b/chat/scrollz/options.mk index 4304226653f..b55cd28812e 100644 --- a/chat/scrollz/options.mk +++ b/chat/scrollz/options.mk @@ -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" |