CVS commit: pkgsrc/mail/qmail

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Oct 29 00:46:14 UTC 2017

Modified Files:
        pkgsrc/mail/qmail: options.mk

Log Message:
Remove compatibility mappings for options retired in 2017Q2.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/mail/qmail/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/mail/qmail/options.mk
diff -u pkgsrc/mail/qmail/options.mk:1.46 pkgsrc/mail/qmail/options.mk:1.47
--- pkgsrc/mail/qmail/options.mk:1.46   Sat Aug 19 22:11:43 2017
+++ pkgsrc/mail/qmail/options.mk        Sun Oct 29 00:46:14 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.46 2017/08/19 22:11:43 schmonz Exp $
+# $NetBSD: options.mk,v 1.47 2017/10/29 00:46:14 schmonz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.qmail
 PKG_SUPPORTED_OPTIONS+=                eai sasl syncdir tls
@@ -6,13 +6,6 @@ PKG_SUPPORTED_OPTIONS+=                qmail-customerr
 PKG_SUGGESTED_OPTIONS+=                eai sasl syncdir tls
 PKG_SUGGESTED_OPTIONS+=                qmail-customerror qmail-rejectutils qmail-srs
 
-# For users migrating from 2017Q2; remove compatibility after 2017Q3 is branched
-QMAIL_PATCHES_ALWAYS_ON=       netqmail bigdns maildiruniq outgoingip rcptcheck remote
-QMAIL_PATCHES_REMOVED=         badrcptto qregex realrcptto viruscan
-PKG_OPTIONS_ALWAYS_ON=         ${QMAIL_PATCHES_ALWAYS_ON:S/^/qmail-/}
-PKG_OPTIONS_REMOVED=           ${QMAIL_PATCHES_REMOVED:S/^/qmail-/}
-PKG_SUPPORTED_OPTIONS+=                ${PKG_OPTIONS_ALWAYS_ON} ${PKG_OPTIONS_REMOVED}
-
 # Formerly optional patches, now unconditionally applied:
 QMAILPATCHES=                  netqmail:${DEFAULT_DISTFILES}
 
@@ -61,22 +54,6 @@ SITES.${REMOTE_PATCH}=               https://schmonz.
 
 .include "../../mk/bsd.options.mk"
 
-# For users migrating from 2017Q2; remove compatibility after 2017Q3 is branched
-.for i in ${PKG_OPTIONS_ALWAYS_ON}
-.  if !empty(PKG_OPTIONS:M${i})
-PKG_LEGACY_OPTIONS+=           ${i}
-PKG_OPTIONS_DEPRECATED_WARNINGS+="WARN: Please unset \"${i}\" option (it's now always enabled)."
-.  endif
-.endfor
-
-# For users migrating from 2017Q2; remove compatibility after 2017Q3 is branched
-.for i in ${PKG_OPTIONS_REMOVED}
-.  if !empty(PKG_OPTIONS:M${i})
-PKG_LEGACY_OPTIONS+=           ${i}
-PKG_OPTIONS_DEPRECATED_WARNINGS+="WARN: Please unset \"${i}\" option (it's now always included, as a program)."
-.  endif
-.endfor
-
 .if !empty(PKG_OPTIONS:Meai)
 .  include "../../devel/libidn2/buildlink3.mk"
 QMAILPATCHES+=                 eai:${EAI_PATCH}