From 87749d8aae86cbee3353ec4a6c273691b67c1204 Mon Sep 17 00:00:00 2001 From: John Marino Date: Sat, 13 Jun 2015 10:48:40 +0200 Subject: [PATCH] Restore ability for master to build release 4.2 It turns out that setting values on /etc/defaults/make.conf is a bad idea. In this case, the two SENDMAIL values that were set prevent a master branch from building previous releases. The fix is to comment out those two definitions and move the default values to the makefile that uses them, using the "?=" operator. --- etc/defaults/make.conf | 4 ++-- etc/sendmail/Makefile.4install | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index 1577e7511f..58565b49c3 100644 --- a/etc/defaults/make.conf +++ b/etc/defaults/make.conf @@ -204,10 +204,10 @@ STATIC_LOCALES=UTF8 # The permissions to use on alias and map databases generated using # /etc/mail/Makefile. # -SENDMAIL_MAP_PERMS= 640 +#SENDMAIL_MAP_PERMS= 640 # # The sendmail.cf and sendmail.submit.cf files are generated from many # m4 files that come from the installed sendmail. Sendmail is now # installed from DPorts together with these m4 files. # -SENDMAIL_CF_DIR= /usr/local/share/sendmail/cf +#SENDMAIL_CF_DIR= /usr/local/share/sendmail/cf diff --git a/etc/sendmail/Makefile.4install b/etc/sendmail/Makefile.4install index c087e7b780..bbee651898 100644 --- a/etc/sendmail/Makefile.4install +++ b/etc/sendmail/Makefile.4install @@ -90,6 +90,16 @@ SENDMAIL_ALIASES?= /etc/mail/aliases # SENDMAIL_START_SCRIPT?= /etc/rc.sendmail +# +# Permissions set on various generated databases such as alias and map +# +SENDMAIL_MAP_PERMS?= 640 + +# +# Template location of m4 files used for cf file regeneration +# +SENDMAIL_CF_DIR?= /usr/local/share/sendmail/cf + # # Some useful programs we need. # -- 2.41.0