Tue Mar 21 13:04:14 2017 UTC ()
QMAILDIR used to default to "/var/qmail" out of concern for distributors'
obligations. Default to ${VARBASE}/qmail instead: effectively the same
default, and helps for e.g. UNPRIVILEGED.


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

--- pkgsrc/mk/defaults/mk.conf 2017/01/15 23:55:30 1.270
+++ pkgsrc/mk/defaults/mk.conf 2017/03/21 13:04:14 1.271
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mk.conf,v 1.270 2017/01/15 23:55:30 rillig Exp $ 1# $NetBSD: mk.conf,v 1.271 2017/03/21 13:04:14 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
@@ -1487,31 +1487,31 @@ PROCMAIL_TRUSTED_IDS?=0 @@ -1487,31 +1487,31 @@ PROCMAIL_TRUSTED_IDS?=0
1487# Possible: A list of users, terminated by a zero. 1487# Possible: A list of users, terminated by a zero.
1488# Default: see Makefile 1488# Default: see Makefile
1489 1489
1490.if exists(/usr/bin/ssh) 1490.if exists(/usr/bin/ssh)
1491PVM_SSH?= /usr/bin/ssh 1491PVM_SSH?= /usr/bin/ssh
1492.else 1492.else
1493PVM_SSH?= ${LOCALBASE}/bin/ssh 1493PVM_SSH?= ${LOCALBASE}/bin/ssh
1494.endif 1494.endif
1495# Specify the rsh/ssh program used by pvm to communicate between 1495# Specify the rsh/ssh program used by pvm to communicate between
1496# systems. 1496# systems.
1497# Possible: Any rsh/ssh program. 1497# Possible: Any rsh/ssh program.
1498# Default: /usr/bin/ssh if it exists, otherwise ${LOCALBASE}/bin/ssh 1498# Default: /usr/bin/ssh if it exists, otherwise ${LOCALBASE}/bin/ssh
1499 1499
1500QMAILDIR?= /var/qmail 1500QMAILDIR?= ${VARBASE}/qmail
1501# The directory for qmail installation. You probably don't need to 1501# The directory for qmail installation. You probably don't need to
1502# change this. 1502# change this.
1503# Possible: any valid location 1503# Possible: any valid location
1504# Default: /var/qmail (intentionally not ${VARBASE}/qmail) 1504# Default: ${VARBASE}/qmail
1505 1505
1506QMAIL_QFILTER_TMPDIR?= ${VARBASE}/tmp/qmail-qfilter 1506QMAIL_QFILTER_TMPDIR?= ${VARBASE}/tmp/qmail-qfilter
1507# The temporary directory for qmail-qfilter. 1507# The temporary directory for qmail-qfilter.
1508# Possible: a directory writable only by qmail-qfilter's UID 1508# Possible: a directory writable only by qmail-qfilter's UID
1509# Default: ${VARBASE}/tmp/qmail-qfilter 1509# Default: ${VARBASE}/tmp/qmail-qfilter
1510 1510
1511QMAIL_QUEUE_DIR?= ${VARBASE}/spool/qmail 1511QMAIL_QUEUE_DIR?= ${VARBASE}/spool/qmail
1512# The directory for qmail's queue. 1512# The directory for qmail's queue.
1513# Possible: any location on an appropriate filesystem, except that it 1513# Possible: any location on an appropriate filesystem, except that it
1514# must be outside ${QMAILDIR}. 1514# must be outside ${QMAILDIR}.
1515# Default: ${VARBASE}/spool/qmail 1515# Default: ${VARBASE}/spool/qmail
1516 1516
1517QMAIL_QUEUE_EXTRA?= 1517QMAIL_QUEUE_EXTRA?=