From owner-svn-ports-all@freebsd.org Mon Jan 25 17:18:21 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 BBAAAA46BA2; Mon, 25 Jan 2016 17:18:21 +0000 (UTC) (envelope-from danfe@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 71C50BAA; Mon, 25 Jan 2016 17:18:21 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0PHIKsA070889; Mon, 25 Jan 2016 17:18:20 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0PHIKdN070886; Mon, 25 Jan 2016 17:18:20 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201601251718.u0PHIKdN070886@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Mon, 25 Jan 2016 17:18:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407231 - head/mail/qsheff 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: Mon, 25 Jan 2016 17:18:21 -0000 Author: danfe Date: Mon Jan 25 17:18:20 2016 New Revision: 407231 URL: https://svnweb.freebsd.org/changeset/ports/407231 Log: - Convert manual handling of *-default files in ${ETCDIR} to @sample since it supports custom suffixes as of r397963 - Bump port revision (due to the change above and the earlier r407194) Modified: head/mail/qsheff/Makefile head/mail/qsheff/pkg-plist Modified: head/mail/qsheff/Makefile ============================================================================== --- head/mail/qsheff/Makefile Mon Jan 25 16:47:10 2016 (r407230) +++ head/mail/qsheff/Makefile Mon Jan 25 17:18:20 2016 (r407231) @@ -3,7 +3,7 @@ PORTNAME= qsheff-II DISTVERSION= 2.1-r3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= mail MASTER_SITES= http://www.enderunix.org/qsheff/ \ SF/qsheff/qsheff/II-${DISTVERSION} Modified: head/mail/qsheff/pkg-plist ============================================================================== --- head/mail/qsheff/pkg-plist Mon Jan 25 16:47:10 2016 (r407230) +++ head/mail/qsheff/pkg-plist Mon Jan 25 17:18:20 2016 (r407231) @@ -1,15 +1,8 @@ bin/qsheff -@unexec if cmp -s %D/%%ETCDIR%%/qsheff.attach %D/%%ETCDIR%%/qsheff.attach-default; then rm -f %D/%%ETCDIR%%/qsheff.attach; fi -%%ETCDIR%%/qsheff.attach-default -@exec [ -f %B/qsheff.attach ] || cp %B/%f %B/qsheff.attach -@unexec if cmp -s %D/%%ETCDIR%%/qsheff.conf %D/%%ETCDIR%%/qsheff.conf-default; then rm -f %D/%%ETCDIR%%/qsheff.conf; fi -%%ETCDIR%%/qsheff.conf-default -@unexec if cmp -s %D/%%ETCDIR%%/qsheff.rules %D/%%ETCDIR%%/qsheff.rules-default; then rm -f %D/%%ETCDIR%%/qsheff.rules; fi -%%ETCDIR%%/qsheff.rules-default -@exec [ -f %B/qsheff.rules ] || cp %B/%f %B/qsheff.rules -@unexec if cmp -s %D/%%ETCDIR%%/qsheff.ignore %D/%%ETCDIR%%/qsheff.ignore-default; then rm -f %D/%%ETCDIR%%/qsheff.ignore; fi -%%ETCDIR%%/qsheff.ignore-default -@exec [ -f %B/qsheff.ignore ] || cp %B/%f %B/qsheff.ignore +@sample %%ETCDIR%%/qsheff.attach-default %%ETCDIR%%/qsheff.attach +@sample %%ETCDIR%%/qsheff.conf-default %%ETCDIR%%/qsheff.conf +@sample %%ETCDIR%%/qsheff.ignore-default %%ETCDIR%%/qsheff.ignore +@sample %%ETCDIR%%/qsheff.rules-default %%ETCDIR%%/qsheff.rules %%ETCDIR%%/install-wrapper.sh %%ETCDIR%%/uninstall-wrapper.sh %%PORTDOCS%%%%DOCSDIR%%/README