From owner-svn-ports-head@freebsd.org  Tue Feb  2 20:45:05 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1FFDA98BF4;
 Tue,  2 Feb 2016 20:45:05 +0000 (UTC)
 (envelope-from gahr@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C2232BC2;
 Tue,  2 Feb 2016 20:45:05 +0000 (UTC)
 (envelope-from gahr@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u12Kj4xW047229;
 Tue, 2 Feb 2016 20:45:04 GMT (envelope-from gahr@FreeBSD.org)
Received: (from gahr@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u12Kj43e047228;
 Tue, 2 Feb 2016 20:45:04 GMT (envelope-from gahr@FreeBSD.org)
Message-Id: <201602022045.u12Kj43e047228@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gahr set sender to
 gahr@FreeBSD.org using -f
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Tue, 2 Feb 2016 20:45:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r407847 - head/mail/opensmtpd/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Feb 2016 20:45:06 -0000

Author: gahr
Date: Tue Feb  2 20:45:04 2016
New Revision: 407847
URL: https://svnweb.freebsd.org/changeset/ports/407847

Log:
  mail/opensmtpd: restore patch to install .sample config file
  
  Notified by:	adamw@
  MFH:			2016Q1

Added:
  head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in   (contents, props changed)

Added: head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in	Tue Feb  2 20:45:04 2016	(r407847)
@@ -0,0 +1,17 @@
+--- mk/smtpd/Makefile.in.orig	2016-02-02 20:40:51 UTC
++++ mk/smtpd/Makefile.in
+@@ -1365,13 +1365,7 @@ install-exec-hook: $(CONFIGFILES) $(MANP
+ 	$(MKDIR_P) $(DESTDIR)$(bindir)
+ 	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
+ 	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
+-
+-	@if [ ! -f $(DESTDIR)$(sysconfdir)/smtpd.conf ]; then			\
+-		$(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/smtpd.conf; \
+-	else									\
+-		echo "$(DESTDIR)$(sysconfdir)/smtpd.conf already exists, install will not overwrite"; \
+-	fi
+-
++	$(INSTALL) -m 644 smtpd.conf.out	$(DESTDIR)$(sysconfdir)/smtpd.conf.sample
+ 	$(INSTALL) -m 644 aliases.5.out		$(DESTDIR)$(mandir)/$(mansubdir)5/aliases.5
+ 	$(INSTALL) -m 644 forward.5.out		$(DESTDIR)$(mandir)/$(mansubdir)5/forward.5
+ 	$(INSTALL) -m 644 table.5.out		$(DESTDIR)$(mandir)/$(mansubdir)5/table.5