From owner-svn-ports-all@freebsd.org Wed Feb 3 06:36:13 2016 Return-Path: Delivered-To: svn-ports-all@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 1218DA73B69; Wed, 3 Feb 2016 06:36:13 +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 D91E812AB; Wed, 3 Feb 2016 06:36:12 +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 u136aBJ1034293; Wed, 3 Feb 2016 06:36:11 GMT (envelope-from gahr@FreeBSD.org) Received: (from gahr@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u136aBS0034292; Wed, 3 Feb 2016 06:36:11 GMT (envelope-from gahr@FreeBSD.org) Message-Id: <201602030636.u136aBS0034292@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gahr set sender to gahr@FreeBSD.org using -f From: Pietro Cerutti Date: Wed, 3 Feb 2016 06:36:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r407945 - branches/2016Q1/mail/opensmtpd/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Feb 2016 06:36:13 -0000 Author: gahr Date: Wed Feb 3 06:36:11 2016 New Revision: 407945 URL: https://svnweb.freebsd.org/changeset/ports/407945 Log: MFH: r407847 mail/opensmtpd: restore patch to install .sample config file Notified by: adamw@ Approved by: portmgr (miwi) Added: branches/2016Q1/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in - copied unchanged from r407847, head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in Modified: Directory Properties: branches/2016Q1/ (props changed) Copied: branches/2016Q1/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in (from r407847, head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in Wed Feb 3 06:36:11 2016 (r407945, copy of r407847, head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in) @@ -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