Sat Oct 28 15:56:48 2017 UTC ()
Remove QMAIL_QFILTER_TMPDIR knob, no longer needed.


(schmonz)
diff -r1.284 -r1.285 pkgsrc/mk/defaults/mk.conf
cvs diff -r1.284 -r1.285 pkgsrc/mk/defaults/mk.conf (expand / switch to unified diff)

--- pkgsrc/mk/defaults/mk.conf 2017/10/28 04:46:35 1.284
+++ pkgsrc/mk/defaults/mk.conf 2017/10/28 15:56:48 1.285
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mk.conf,v 1.284 2017/10/28 04:46:35 schmonz Exp $ 1# $NetBSD: mk.conf,v 1.285 2017/10/28 15:56:48 schmonz Exp $
2# 2#
3 3
4# This file provides default values for variables that may be overridden 4# This file provides default values for variables that may be overridden
5# in the MAKECONF file, which is /etc/mk.conf by default. 5# in the MAKECONF file, which is /etc/mk.conf by default.
6# 6#
7# Note: This file is included after the MAKECONF file, so you cannot query 7# Note: This file is included after the MAKECONF file, so you cannot query
8# these default values in the MAKECONF using the ".if" and ".for" 8# these default values in the MAKECONF using the ".if" and ".for"
9# preprocessing directives. 9# preprocessing directives.
10 10
11# ************************************************************************ 11# ************************************************************************
12# NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS. 12# NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS.
13# ************************************************************************ 13# ************************************************************************
14 14
@@ -1561,31 +1561,26 @@ QMAIL_PASSWD_USER?= qmailp @@ -1561,31 +1561,26 @@ QMAIL_PASSWD_USER?= qmailp
1561QMAIL_QUEUE_USER?= qmailq 1561QMAIL_QUEUE_USER?= qmailq
1562QMAIL_REMOTE_USER?= qmailr 1562QMAIL_REMOTE_USER?= qmailr
1563QMAIL_SEND_USER?= qmails 1563QMAIL_SEND_USER?= qmails
1564# System users for qmail-related programs. 1564# System users for qmail-related programs.
1565# Possible: any user names 1565# Possible: any user names
1566# Default: alias, qmaild, qmaill, root, qmailp, qmailq, qmailr, qmails 1566# Default: alias, qmaild, qmaill, root, qmailp, qmailq, qmailr, qmails
1567 1567
1568QMAIL_QMAIL_GROUP?= qmail 1568QMAIL_QMAIL_GROUP?= qmail
1569QMAIL_NOFILES_GROUP?= nofiles 1569QMAIL_NOFILES_GROUP?= nofiles
1570# System groups for qmail-related programs. 1570# System groups for qmail-related programs.
1571# Possible: any group names 1571# Possible: any group names
1572# Default: qmail, nofiles 1572# Default: qmail, nofiles
1573 1573
1574QMAIL_QFILTER_TMPDIR?= ${VARBASE}/tmp/qmail-qfilter 
1575# The temporary directory for qmail-qfilter. 
1576# Possible: a directory writable only by qmail-qfilter's UID 
1577# Default: ${VARBASE}/tmp/qmail-qfilter 
1578 
1579QMAIL_QUEUE_DIR?= ${VARBASE}/spool/qmail 1574QMAIL_QUEUE_DIR?= ${VARBASE}/spool/qmail
1580# The directory for qmail's queue. 1575# The directory for qmail's queue.
1581# Possible: any location on an appropriate filesystem, except that it 1576# Possible: any location on an appropriate filesystem, except that it
1582# must be outside ${QMAILDIR}. 1577# must be outside ${QMAILDIR}.
1583# Default: ${VARBASE}/spool/qmail 1578# Default: ${VARBASE}/spool/qmail
1584 1579
1585QMAIL_QUEUE_EXTRA?= 1580QMAIL_QUEUE_EXTRA?=
1586# An additional recipient that will be added to every qmail delivery. 1581# An additional recipient that will be added to every qmail delivery.
1587# This is used primarily for logging. 1582# This is used primarily for logging.
1588# Possible: empty, any valid local address 1583# Possible: empty, any valid local address
1589# Default: empty 1584# Default: empty
1590 1585
1591QPOPPER_FAC?= LOCAL1 1586QPOPPER_FAC?= LOCAL1