[pkgsrc/trunk]: pkgsrc/net/djbdns Remove commented-out 'inet6' option. Add CO...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6f58364fbd26
branches:  trunk
changeset: 317381:6f58364fbd26
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Sat Jan 05 06:18:11 2019 +0000

description:
Remove commented-out 'inet6' option. Add CONFLICTS with djbdnscurve6.

diffstat:

 net/djbdns/Makefile   |   4 +++-
 net/djbdns/options.mk |  15 +--------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diffs (48 lines):

diff -r f63cb3b6df69 -r 6f58364fbd26 net/djbdns/Makefile
--- a/net/djbdns/Makefile       Sat Jan 05 06:16:18 2019 +0000
+++ b/net/djbdns/Makefile       Sat Jan 05 06:18:11 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2018/09/28 20:36:24 schmonz Exp $
+# $NetBSD: Makefile,v 1.68 2019/01/05 06:18:11 schmonz Exp $
 
 DISTNAME=              djbdns-1.05
 PKGREVISION=           14
@@ -14,6 +14,8 @@
 MANPAGES=              ${DISTNAME}-man-20031023.tar.gz
 SITES.${MANPAGES}=     http://smarden.org/pape/djb/manpages/
 
+CONFLICTS+=            djbdnscurve6-[0-9]*
+
 DJB_RESTRICTED=                no
 
 SUBST_CLASSES+=                etc
diff -r f63cb3b6df69 -r 6f58364fbd26 net/djbdns/options.mk
--- a/net/djbdns/options.mk     Sat Jan 05 06:16:18 2019 +0000
+++ b/net/djbdns/options.mk     Sat Jan 05 06:18:11 2019 +0000
@@ -1,25 +1,12 @@
-# $NetBSD: options.mk,v 1.21 2018/09/30 22:10:51 schmonz Exp $
+# $NetBSD: options.mk,v 1.22 2019/01/05 06:18:11 schmonz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.djbdns
-PKG_SUPPORTED_OPTIONS+=                # inet6
 PKG_SUPPORTED_OPTIONS+=                djbdns-cachestats djbdns-ignoreip2
 PKG_SUPPORTED_OPTIONS+=                djbdns-mergequeries djbdns-tinydns64
 PKG_SUGGESTED_OPTIONS+=                djbdns-mergequeries djbdns-tinydns64
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=                   inet6
-#.if !empty(PKG_OPTIONS:Minet6)
-#IPV6_PATCH=                   djbdns-1.05-test28.diff.xz
-#PATCHFILES+=                  ${IPV6_PATCH}
-#SITES.${IPV6_PATCH}=          http://www.fefe.de/dns/
-#USE_TOOLS+=                   xzcat
-#PATCH_DIST_CAT.${IPV6_PATCH}= xzcat < ${IPV6_PATCH}
-#PATCH_DIST_STRIP.${IPV6_PATCH}=       -p1
-#MAKE_JOBS_SAFE=                       no
-#PLIST.inet6=                  yes
-#.endif
-
 .if !empty(PKG_OPTIONS:Mdjbdns-cachestats)
 CACHESTATS_PATCH=              djbdns-cachestats.patch
 PATCHFILES+=                   ${CACHESTATS_PATCH}