From owner-svn-ports-all@freebsd.org Fri Sep 11 19:20:08 2015 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 AB05D9CDEBB; Fri, 11 Sep 2015 19:20:08 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 9C3DC1450; Fri, 11 Sep 2015 19:20:08 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8BJK8io099645; Fri, 11 Sep 2015 19:20:08 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8BJK87l099643; Fri, 11 Sep 2015 19:20:08 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201509111920.t8BJK87l099643@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 11 Sep 2015 19:20:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396711 - head/mail/mailmgr X-SVN-Group: ports-head 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: Fri, 11 Sep 2015 19:20:08 -0000 Author: amdmi3 Date: Fri Sep 11 19:20:07 2015 New Revision: 396711 URL: https://svnweb.freebsd.org/changeset/ports/396711 Log: - Switch to @sample Approved by: portmgr blanket Modified: head/mail/mailmgr/Makefile head/mail/mailmgr/pkg-plist Modified: head/mail/mailmgr/Makefile ============================================================================== --- head/mail/mailmgr/Makefile Fri Sep 11 19:19:30 2015 (r396710) +++ head/mail/mailmgr/Makefile Fri Sep 11 19:20:07 2015 (r396711) @@ -14,12 +14,8 @@ GNU_CONFIGURE= yes SUB_FILES= pkg-message do-install: - ${INSTALL_DATA} ${WRKSRC}/mailmgr.conf \ - ${STAGEDIR}${PREFIX}/etc/mailmgr.conf.default -.if !exists(${STAGEDIR}${PREFIX}/etc/mailmgr.conf) - ${INSTALL_DATA} ${WRKSRC}/mailmgr.conf \ - ${STAGEDIR}${PREFIX}/etc/mailmgr.conf -.endif ${INSTALL_PROGRAM} ${WRKSRC}/mailmgr ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/mailmgr.conf \ + ${STAGEDIR}${PREFIX}/etc/mailmgr.conf.sample .include Modified: head/mail/mailmgr/pkg-plist ============================================================================== --- head/mail/mailmgr/pkg-plist Fri Sep 11 19:19:30 2015 (r396710) +++ head/mail/mailmgr/pkg-plist Fri Sep 11 19:20:07 2015 (r396711) @@ -1,4 +1,2 @@ -@unexec if cmp -s %D/etc/mailmgr.conf %D/etc/mailmgr.conf.default; then rm -f %D/etc/mailmgr.conf; fi -etc/mailmgr.conf.default -@exec if [ ! -f %D/etc/mailmgr.conf ] ; then cp -p %D/%F %B/mailmgr.conf; fi bin/mailmgr +@sample etc/mailmgr.conf.sample