From owner-svn-ports-head@freebsd.org Tue Sep 1 14:15:02 2015 Return-Path: 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 C78909C757B; Tue, 1 Sep 2015 14:15:02 +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 9E97714E0; Tue, 1 Sep 2015 14:15:02 +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 t81EF2Q9030572; Tue, 1 Sep 2015 14:15:02 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t81EF2D4030571; Tue, 1 Sep 2015 14:15:02 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201509011415.t81EF2D4030571@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 1 Sep 2015 14:15:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395761 - head/net/isc-dhcp41-server 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2015 14:15:02 -0000 Author: amdmi3 Date: Tue Sep 1 14:15:01 2015 New Revision: 395761 URL: https://svnweb.freebsd.org/changeset/ports/395761 Log: - Switch to @sample Approved by: portmgr blanket Modified: head/net/isc-dhcp41-server/pkg-plist Modified: head/net/isc-dhcp41-server/pkg-plist ============================================================================== --- head/net/isc-dhcp41-server/pkg-plist Tue Sep 1 14:14:53 2015 (r395760) +++ head/net/isc-dhcp41-server/pkg-plist Tue Sep 1 14:15:01 2015 (r395761) @@ -1,11 +1,7 @@ @unexec %D/etc/rc.d/isc-dhcpd forcestop 2>/dev/null || true %%IPV6%%@unexec %D/etc/rc.d/isc-dhcpd6 forcestop 2>/dev/null || true -@unexec if cmp -s %D/etc/dhcpd.conf.sample %D/etc/dhcpd.conf; then rm -f %D/etc/dhcpd.conf; fi -etc/dhcpd.conf.sample -@exec if [ ! -f %D/etc/dhcpd.conf ] ; then cp -p %D/%F %B/dhcpd.conf; fi -%%IPV6%%@unexec if cmp -s %D/etc/dhcpd6.conf.sample %D/etc/dhcpd6.conf; then rm -f %D/etc/dhcpd6.conf; fi -%%IPV6%%etc/dhcpd6.conf.sample -%%IPV6%%@exec if [ ! -f %D/etc/dhcpd6.conf ] ; then cp -p %D/%F %B/dhcpd6.conf; fi +@sample etc/dhcpd.conf.sample +%%IPV6%%@sample etc/dhcpd6.conf.sample %%IPV6%%etc/rc.d/isc-dhcpd6 sbin/dhcpd bin/omshell