Attachment 191310 Details for Bug 222151 – Use PREFIX/etc/dhcpd.conf by default, dhcpd_flags=""

[patch] Use PREFIX/etc/dhcpd.conf by default, dhcpd_flags=""

dhcpd.patch (text/plain), 1.21 KB, created by Nikola Kolev on 2018-03-08 14:22:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikola Kolev

Created: 2018-03-08 14:22:30 UTC

Size: 1.21 KB

patch

obsolete

>diff -rupN dhcpd.orig/Makefile dhcpd/Makefile
>--- dhcpd.orig/Makefile	2018-03-08 14:05:33.941132000 +0000
>+++ dhcpd/Makefile	2018-03-08 14:03:47.248211000 +0000
>@@ -1,4 +1,4 @@
>-# $FreeBSD: head/net/dhcpd/Makefile 433752 2017-02-09 17:44:36Z krion $
>+# $FreeBSD$
> 
> PORTNAME=	dhcpd
> PORTVERSION=	6.0.20170207
>@@ -26,6 +26,10 @@ MAKE_ARGS+=	BINDIR=${PREFIX}/sbin MANDIR
> 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 \
> 		${STAGEDIR}${PREFIX}/etc/dhcpd.conf.sample
>diff -rupN dhcpd.orig/files/dhcpd.in dhcpd/files/dhcpd.in
>--- dhcpd.orig/files/dhcpd.in	2018-03-08 14:05:33.941342000 +0000
>+++ dhcpd/files/dhcpd.in	2018-03-08 13:57:50.013806000 +0000
>@@ -1,6 +1,6 @@
> #!/bin/sh
> #
>-# $FreeBSD: head/net/dhcpd/files/dhcpd.in 403095 2015-12-06 09:50:48Z pi $
>+# $FreeBSD$
> #
> # PROVIDE: dhcpd
> # REQUIRE: DAEMON
>@@ -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"

Flags:

koue: maintainer-approval+

Actions: View | Diff

Attachments on bug 222151: 191263 | 191310