CVS commit: pkgsrc/net/djbdns

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Sep 30 22:10:51 UTC 2018

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

Log Message:
2018Q3 is branched; remove compatibility options for djbdns-qmerge{1,2}.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 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/options.mk
diff -u pkgsrc/net/djbdns/options.mk:1.20 pkgsrc/net/djbdns/options.mk:1.21
--- pkgsrc/net/djbdns/options.mk:1.20   Fri Sep 28 20:36:24 2018
+++ pkgsrc/net/djbdns/options.mk        Sun Sep 30 22:10:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2018/09/28 20:36:24 schmonz Exp $
+# $NetBSD: options.mk,v 1.21 2018/09/30 22:10:51 schmonz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.djbdns
 PKG_SUPPORTED_OPTIONS+=                # inet6
@@ -6,10 +6,6 @@ PKG_SUPPORTED_OPTIONS+=                djbdns-cachesta
 PKG_SUPPORTED_OPTIONS+=                djbdns-mergequeries djbdns-tinydns64
 PKG_SUGGESTED_OPTIONS+=                djbdns-mergequeries djbdns-tinydns64
 
-# For users migrating from 2018Q2; remove compatibility after 2018Q3 is branched
-PKG_OPTIONS_LEGACY_OPTS+=      djbdns-qmerge1:djbdns-mergequeries
-PKG_OPTIONS_LEGACY_OPTS+=      djbdns-qmerge2:djbdns-mergequeries
-
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=                   inet6