Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Jul 2009 07:12:46 GMT
From:      "Philip M. Gollucci" <pgollucci@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        edwin@mavetju.org
Subject:   ports/136844: [PATCH] net/dhcprelay: USE_RC_SUBR != yes
Message-ID:  <200907170712.n6H7CkOU040652@freefall.freebsd.org>
Resent-Message-ID: <200907170720.n6H7K21c045878@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         136844
>Category:       ports
>Synopsis:       [PATCH] net/dhcprelay: USE_RC_SUBR != yes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 17 07:20:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Philip M. Gollucci
>Release:        FreeBSD 7.2-STABLE i386
>Organization:
RideCharge Inc.
>Environment:
System: FreeBSD freefall.freebsd.org 7.2-STABLE FreeBSD 7.2-STABLE #38 r194101: Sat Jun 13 11:12:24 UTC
>Description:

Added file(s):
- files/dhcprelay.in

Removed file(s):
- files/dhcprelay.sh.in

Port maintainer (edwin@mavetju.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- dhcprelay-1.2_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/dhcprelay/Makefile,v
retrieving revision 1.3
diff -u -u -r1.3 Makefile
--- Makefile	21 Mar 2006 02:48:21 -0000	1.3
+++ Makefile	17 Jul 2009 07:12:34 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	dhcprelay
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.mavetju.org/download/
 
@@ -15,12 +16,10 @@
 
 LIB_DEPENDS=	dnet.1:${PORTSDIR}/net/libdnet
 
-PLIST_FILES=	bin/dhcprelay etc/rc.d/dhcprelay.sh
-USE_RC_SUBR=	yes
-SUB_FILES=	dhcprelay.sh
+PLIST_FILES=	bin/dhcprelay 
+USE_RC_SUBR=	${PORTNAME}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dhcprelay ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKDIR}/dhcprelay.sh ${PREFIX}/etc/rc.d
 
 .include <bsd.port.mk>
Index: files/dhcprelay.in
===================================================================
RCS file: files/dhcprelay.in
diff -N files/dhcprelay.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/dhcprelay.in	17 Jul 2009 07:12:34 -0000
@@ -0,0 +1,35 @@
+#! /bin/sh
+#
+# $FreeBSD: ports/net/dhcprelay/files/dhcprelay.sh.in,v 1.3 2006/03/21 02:48:21 edwin Exp $
+#
+# PROVIDE: dhcprelay
+# REQUIRE: DAEMON
+#
+# Add the following line to /etc/rc.conf to enable dhcrelay:
+#
+# dhcprelay_enable="YES"
+#
+
+# override these variables in /etc/rc.conf
+dhcprelay_enable=${dhcprelay_enable:-"NO"}
+dhcprelay_server=${dhcprelay_server:-}		# dhcprelay server(s)
+dhcprelay_ifaces=${dhcprelay_ifaces:-}		# ethernet interface(s)
+
+dhcprelay_precmd ()
+{
+    rc_flags="${rc_flags} ${dhcprelay_ifaces} ${dhcprelay_server}"
+}
+
+. %%RC_SUBR%%
+
+name=dhcprelay
+rcvar=$(set_rcvar)
+pidfile=/var/run/${name}.pid
+command=/usr/local/bin/${name}
+
+start_precmd=${name}_precmd
+
+echo $rc_flags
+
+load_rc_config ${name}
+run_rc_command "$1"
Index: files/dhcprelay.sh.in
===================================================================
RCS file: files/dhcprelay.sh.in
diff -N files/dhcprelay.sh.in
--- files/dhcprelay.sh.in	21 Mar 2006 02:48:21 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-#! /bin/sh
-#
-# $FreeBSD: ports/net/dhcprelay/files/dhcprelay.sh.in,v 1.3 2006/03/21 02:48:21 edwin Exp $
-#
-# PROVIDE: dhcprelay
-# REQUIRE: DAEMON
-#
-# Add the following line to /etc/rc.conf to enable dhcrelay:
-#
-# dhcprelay_enable="YES"
-#
-
-# override these variables in /etc/rc.conf
-dhcprelay_enable=${dhcprelay_enable:-"NO"}
-dhcprelay_server=${dhcprelay_server:-}		# dhcprelay server(s)
-dhcprelay_ifaces=${dhcprelay_ifaces:-}		# ethernet interface(s)
-
-dhcprelay_precmd ()
-{
-    rc_flags="${rc_flags} ${dhcprelay_ifaces} ${dhcprelay_server}"
-}
-
-. %%RC_SUBR%%
-
-name=dhcprelay
-rcvar=$(set_rcvar)
-pidfile=/var/run/${name}.pid
-command=/usr/local/bin/${name}
-
-start_precmd=${name}_precmd
-
-echo $rc_flags
-
-load_rc_config ${name}
-run_rc_command "$1"
--- dhcprelay-1.2_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907170712.n6H7CkOU040652>