svn commit: r383388 - head/net/isc-dhcp43-server

Ryan Steinmetz zi at FreeBSD.org
Sun Apr 5 23:11:08 UTC 2015


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 at 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."
- at 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
- at 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
+ at sample etc/dhcpd.conf.sample
+%%IPV6%%@sample etc/dhcpd6.conf.sample
 %%IPV6%%etc/rc.d/isc-dhcpd6
 sbin/dhcpd
 bin/omshell


More information about the svn-ports-head mailing list