From owner-svn-ports-head@FreeBSD.ORG Sun Apr 5 23:11:08 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 72C55B72; Sun, 5 Apr 2015 23:11:08 +0000 (UTC) Received: from svn.freebsd.org (svn.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 44D7DBC9; Sun, 5 Apr 2015 23:11:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t35NB8GS018910; Sun, 5 Apr 2015 23:11:08 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t35NB7Ji018908; Sun, 5 Apr 2015 23:11:07 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201504052311.t35NB7Ji018908@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Sun, 5 Apr 2015 23:11:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383388 - head/net/isc-dhcp43-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.18-1 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: Sun, 05 Apr 2015 23:11:08 -0000 Author: zi Date: Sun Apr 5 23:11:06 2015 New Revision: 383388 URL: https://svnweb.freebsd.org/changeset/ports/383388 Log: - Use @sample magic PR: 199188 Submitted by: yuri@rawbw.com Modified: head/net/isc-dhcp43-server/Makefile head/net/isc-dhcp43-server/pkg-plist Modified: head/net/isc-dhcp43-server/Makefile ============================================================================== --- head/net/isc-dhcp43-server/Makefile Sun Apr 5 22:23:27 2015 (r383387) +++ head/net/isc-dhcp43-server/Makefile Sun Apr 5 23:11:06 2015 (r383388) @@ -150,9 +150,10 @@ do-install: ${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/includes install ${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/common install ${INSTALL_DATA} ${WRKSRC}/dhcpctl/dhcpctl.h ${STAGEDIR}${PREFIX}/include + ${MV} ${STAGEDIR}${PREFIX}/etc/dhcpd.conf.example ${STAGEDIR}${PREFIX}/etc/dhcpd.conf.sample .if ${PORT_OPTIONS:MIPV6} ${INSTALL_DATA} ${WRKSRC}/doc/examples/dhcpd-dhcpv6.conf \ - ${STAGEDIR}${PREFIX}/etc/dhcpd6.conf.example + ${STAGEDIR}${PREFIX}/etc/dhcpd6.conf.sample .endif .if ${PORT_OPTIONS:MLDAP} @${MKDIR} ${STAGEDIR}${SCHEMA_DIR} Modified: head/net/isc-dhcp43-server/pkg-plist ============================================================================== --- head/net/isc-dhcp43-server/pkg-plist Sun Apr 5 22:23:27 2015 (r383387) +++ head/net/isc-dhcp43-server/pkg-plist Sun Apr 5 23:11:06 2015 (r383388) @@ -1,10 +1,6 @@ @unexec echo "You should stop the dhcpd and dhcpd6 daemons if you are permanently removing this port." -@unexec if cmp -s %D/etc/dhcpd.conf.example %D/etc/dhcpd.conf; then rm -f %D/etc/dhcpd.conf; fi -etc/dhcpd.conf.example -@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.example %D/etc/dhcpd6.conf; then rm -f %D/etc/dhcpd6.conf; fi -%%IPV6%%etc/dhcpd6.conf.example -%%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