From owner-svn-ports-all@freebsd.org  Sun Sep 27 22:33:22 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
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 8A736A0A80C;
 Sun, 27 Sep 2015 22:33:22 +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 7B4BEB69;
 Sun, 27 Sep 2015 22:33:22 +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 t8RMXM9r018981;
 Sun, 27 Sep 2015 22:33:22 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8RMXMJB018979;
 Sun, 27 Sep 2015 22:33:22 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201509272233.t8RMXMJB018979@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Sun, 27 Sep 2015 22:33:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r398065 - head/security/bruteblock
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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Sep 2015 22:33:22 -0000

Author: amdmi3
Date: Sun Sep 27 22:33:21 2015
New Revision: 398065
URL: https://svnweb.freebsd.org/changeset/ports/398065

Log:
  - Switch to @sample

Modified:
  head/security/bruteblock/Makefile
  head/security/bruteblock/pkg-plist

Modified: head/security/bruteblock/Makefile
==============================================================================
--- head/security/bruteblock/Makefile	Sun Sep 27 22:16:17 2015	(r398064)
+++ head/security/bruteblock/Makefile	Sun Sep 27 22:33:21 2015	(r398065)
@@ -29,7 +29,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bruteblockd ${STAGEDIR}${PREFIX}/sbin/
 	${MKDIR} ${STAGEDIR}${CONFDIR}
 .for file in ssh proftpd
-	${INSTALL_DATA} ${WRKSRC}/etc/${file}.conf ${STAGEDIR}${CONFDIR}/${file}.conf.dist
+	${INSTALL_DATA} ${WRKSRC}/etc/${file}.conf ${STAGEDIR}${CONFDIR}/${file}.conf.sample
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/doc/bruteblock.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}

Modified: head/security/bruteblock/pkg-plist
==============================================================================
--- head/security/bruteblock/pkg-plist	Sun Sep 27 22:16:17 2015	(r398064)
+++ head/security/bruteblock/pkg-plist	Sun Sep 27 22:33:21 2015	(r398065)
@@ -1,9 +1,5 @@
 sbin/bruteblock
 sbin/bruteblockd
-@unexec if cmp -s %D/etc/bruteblock/proftpd.conf.dist %D/etc/bruteblock/proftpd.conf; then rm -f %D/etc/bruteblock/proftpd.conf; fi
-etc/bruteblock/proftpd.conf.dist
-@exec if [ ! -f %B/proftpd.conf ]; then cp -p %D/%F %B/proftpd.conf; fi
-@unexec if cmp -s %D/etc/bruteblock/ssh.conf.dist %D/etc/bruteblock/ssh.conf; then rm -f %D/etc/bruteblock/ssh.conf; fi
-etc/bruteblock/ssh.conf.dist
-@exec if [ ! -f %B/ssh.conf ]; then cp -p %D/%F %B/ssh.conf; fi
+@sample etc/bruteblock/proftpd.conf.sample
+@sample etc/bruteblock/ssh.conf.sample
 man/man8/bruteblock.8.gz