ports/75910: net/quagga: Installs rc.d script into wrong dir

[Olafur Osvaldsson]

>Number:         75910
>Category:       ports
>Synopsis:       net/quagga: Installs rc.d script into wrong dir
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 07 11:30:23 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Olafur Osvaldsson
>Release:        FreeBSD 5.3-RELEASE-p2 i386
>Organization:
ISNIC
>Environment:
System: FreeBSD aker.isnic.is 5.3-RELEASE-p2 FreeBSD 5.3-RELEASE-p2 #1: Mon Dec 20 16:41:38 UTC 2004 oli at aker.isnic.is:/usr/obj/usr/src/sys/ISNIC i386


	
>Description:
The quagga.sh script is installed as /etc/rc.d/quagga wich is wrong if I
understand hier(7) correctly.

This also results in mergemaster sometimes requesting to remove the script.
	
>How-To-Repeat:
	
>Fix:
The attached patch removes unneeded RC_* handling as RC_SUBR is set in bsd.port.mk
and RC_DIR and RC_SUFX are not used in quagga.sh so the SED replacement is not
needed.
	

--- quagga.diff begins here ---
--- quagga/Makefile.orig	Fri Jan  7 10:44:37 2005
+++ quagga/Makefile	Fri Jan  7 11:05:04 2005
@@ -7,7 +7,7 @@
 
 PORTNAME=	quagga
 PORTVERSION=	0.96.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://quagga.net/download/
 
@@ -78,27 +78,17 @@
 
 CONFIGURE_ARGS+=--enable-vtysh
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500038
-RC_SUBR?=	${DESTDIR}/etc/rc.subr
-RC_DIR=		${DESTDIR}/etc/rc.d
-RC_SUFX=
-.else
 USE_RC_SUBR=	yes
 RC_DIR=		${PREFIX}/etc/rc.d
-RC_SUFX=	.sh
-.endif
+
+.include <bsd.port.pre.mk>
 
 SED_SCRIPT=	-e 's,%%PREFIX%%,${PREFIX},g' \
 		-e 's,%%SYSCONF_DIR%%,${SYSCONF_DIR},g' \
 		-e 's,%%LOCALSTATE_DIR%%,${LOCALSTATE_DIR},g' \
-		-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
-		-e 's,%%RC_DIR%%,${RC_DIR},g' \
-		-e 's,%%RC_SUFX%%,${RC_SUFX},g'
+		-e 's,%%RC_SUBR%%,${RC_SUBR},g'
 
 PLIST_SUB+=	RC_DIR=${RC_DIR} \
-		RC_SUFX=${RC_SUFX} \
 		LOCALSTATE_DIR=${LOCALSTATE_DIR} \
 		ENABLE_USER=${ENABLE_USER} \
 		ENABLE_GROUP=${ENABLE_GROUP}
@@ -158,7 +148,7 @@
 	@${ECHO} "        if You had never do this before. Or run"
 	@${ECHO} "        make changeuser"
 	@${ECHO} ""
-	@${INSTALL_SCRIPT} ${WRKDIR}/quagga.sh ${RC_DIR}/quagga${RC_SUFX}
+	@${INSTALL_SCRIPT} ${WRKDIR}/quagga.sh ${RC_DIR}/quagga.sh
 
 .if !defined(BATCH)
 post-clean:
--- quagga.diff ends here ---


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