CVS commit: pkgsrc/net/djbdns

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Jan  5 06:18:11 UTC 2019

Modified Files:
        pkgsrc/net/djbdns: Makefile options.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 pkgsrc/net/djbdns/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/djbdns/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/net/djbdns/Makefile
diff -u pkgsrc/net/djbdns/Makefile:1.67 pkgsrc/net/djbdns/Makefile:1.68
--- pkgsrc/net/djbdns/Makefile:1.67     Fri Sep 28 20:36:24 2018
+++ pkgsrc/net/djbdns/Makefile  Sat Jan  5 06:18:11 2019
@@ -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 @@ LICENSE=              public-domain
 MANPAGES=              ${DISTNAME}-man-20031023.tar.gz
 SITES.${MANPAGES}=     http://smarden.org/pape/djb/manpages/
 
+CONFLICTS+=            djbdnscurve6-[0-9]*
+
 DJB_RESTRICTED=                no
 
 SUBST_CLASSES+=                etc

Index: pkgsrc/net/djbdns/options.mk
diff -u pkgsrc/net/djbdns/options.mk:1.21 pkgsrc/net/djbdns/options.mk:1.22
--- pkgsrc/net/djbdns/options.mk:1.21   Sun Sep 30 22:10:51 2018
+++ pkgsrc/net/djbdns/options.mk        Sat Jan  5 06:18:11 2019
@@ -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}