Update to 20170720. pkgsrc changes:

- Remove qmail-qfilter-*-queue shell scripts, which would conflict with
  the C programs of the same name included in mail/qmail 1.03nb29 with
  the "qmail-rejectutils" option (enabled by default).

- Bump mail/qmail dependency to 1.03nb29.

- Shorten and improve MESSAGE.

2 files changed, 2 insertions, 67 deletions

diff --git a/mail/qmail-run/files/qmail-qfilter-queue.sh b/mail/qmail-run/files/qmail-qfilter-queue.sh
deleted file mode 100644
index d21c06ef60a..00000000000
--- a/mail/qmail-run/files/qmail-qfilter-queue.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!@SH@
-#
-# Wrapper for qmail-queue that filters messages before injecting
-#   into the queue.
-#
-# Using this wrapper, executable filters:
-# * Must be placed in @PKG_SYSCONFDIR@/filters
-# * Must have filenames matching "ofmipd-*" or "smtpd-*"
-# * Will be executed with no arguments
-# * Will be executed in sort(1) order
-
-CAT=@CAT@
-ECHO=@ECHO@
-PKG_SYSCONFDIR=@PKG_SYSCONFDIR@
-PREFIX=@PREFIX@
-SED=@SED@
-SORT=@SORT@
-
-warn() {
-	${ECHO} >&2 "$@"
-}
-
-choose_glob() {
-	local _progname _glob
-	_progname="$1"
-	case "${_progname}" in
-	qmail-qfilter-ofmipd-queue)	_glob='ofmipd-*'	;;
-	qmail-qfilter-smtpd-queue)	_glob='smtpd-*'		;;
-	qmail-qfilter-queue)		_glob='qfilter-*'	;;
-	esac
-	${ECHO} "${_glob}"
-}
-
-choose_filters() {
-	local _glob _filters _possible_filters _filter
-	_glob="$1"
-	_possible_filters=$(${ECHO} ${PKG_SYSCONFDIR}/filters/${_glob} | ${SORT})
-	if [ "${_possible_filters}" = "${PKG_SYSCONFDIR}/filters/${_glob}" ]; then
-		_filters="${CAT}"
-	else
-		for _filter in ${_possible_filters}; do
-			[ -x "${_filter}" ] && _filters="${_filters} ${_filter}"
-		done
-		[ -z "${_filters}" ] && _filters="${CAT}"
-	fi
-	${ECHO} "${_filters}"
-}
-
-qfilter_args() {
-	local _filters
-	_filters="$1"
-	${ECHO} ${_filters} | ${SED} -e 's| | -- |g'
-}
-
-main() {
-	local _progname _glob _filters _args _cmd
-	_progname=$(basename "$0")
-	_glob=$(choose_glob "${_progname}")
-	_filters=$(choose_filters "${_glob}")
-	_args=$(qfilter_args "${_filters}")
-	_cmd="${PREFIX}/bin/qmail-qfilter ${_args}"
-	exec ${_cmd}
-}
-
-main "$@"
diff --git a/mail/qmail-run/files/qmailofmipd.sh b/mail/qmail-run/files/qmailofmipd.sh
index 3d028dca5d2..4182ae5857b 100644
--- a/mail/qmail-run/files/qmailofmipd.sh
+++ b/mail/qmail-run/files/qmailofmipd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailofmipd.sh,v 1.6 2017/06/23 15:49:03 schmonz Exp $
+# $NetBSD: qmailofmipd.sh,v 1.7 2017/07/21 04:08:15 schmonz Exp $
 #
 # @PKGNAME@ script to control ofmipd (SMTP submission service).
 #
@@ -11,7 +11,7 @@
 name="qmailofmipd"
 
 # User-settable rc.conf variables and their default values:
-: ${qmailofmipd_postenv:=""}
+: ${qmailofmipd_postenv:="QMAILQUEUE=@PREFIX@/bin/qmail-queue"}
 : ${qmailofmipd_tcpflags:="-vRl0"}
 : ${qmailofmipd_tcphost:="127.0.0.1"}
 : ${qmailofmipd_tcpport:="26"}