svn commit: r470842 - in head/net/dhcpd: . files

[Torsten Zuehlsdorff]

Author: tz
Date: Fri May 25 14:04:06 2018
New Revision: 470842
URL: https://svnweb.freebsd.org/changeset/ports/470842

Log:
  net/dhcpd: doesn't start without discouraged -c flag
  
  Remove discouraged -c flag from rc-file.
  Also use PREFIX in config file
  
  PR:		222151
  Submitted by:	Nikola Kolev <koue at chaosophia.net>
  Reported by:	mwlucas at michaelwlucas.com
  Approved by:	Nikola Kolev <koue at chaosophia.net>
  MFC after:	2018Q2

Modified:
  head/net/dhcpd/Makefile
  head/net/dhcpd/files/dhcpd.in

Modified: head/net/dhcpd/Makefile
==============================================================================
--- head/net/dhcpd/Makefile	Fri May 25 14:01:47 2018	(r470841)
+++ head/net/dhcpd/Makefile	Fri May 25 14:04:06 2018	(r470842)
@@ -2,6 +2,7 @@
 
 PORTNAME=	dhcpd
 PORTVERSION=	6.0.20170207
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	koue at chaosophia.net
@@ -25,6 +26,10 @@ MAKE_ARGS+=	BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man
 
 USERS=		dhcpd
 GROUPS=		dhcpd
+
+post-patch:
+	@${REINPLACE_CMD} -e "s|/etc/dhcpd.conf|${PREFIX}/etc/dhcpd.conf|" \
+		${WRKSRC}/dhcpd.[h8]
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/dhcpd.conf \

Modified: head/net/dhcpd/files/dhcpd.in
==============================================================================
--- head/net/dhcpd/files/dhcpd.in	Fri May 25 14:01:47 2018	(r470841)
+++ head/net/dhcpd/files/dhcpd.in	Fri May 25 14:04:06 2018	(r470842)
@@ -16,10 +16,11 @@
 name=dhcpd
 rcvar=dhcpd_enable
 
+load_rc_config $name
+
 command="%%PREFIX%%/sbin/dhcpd"
 
 dhcpd_enable=${dhcpd_enable:-"NO"}
-dhcpd_flags=${dhcpd_flags:-"-c %%PREFIX%%/etc/dhcpd.conf"}
+dhcpd_flags=${dhcpd_flags:-""}
 
-load_rc_config $name
 run_rc_command "$1"