Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Aug 2008 02:52:09 GMT
From:      "Joseph S. Atkinson" <jsa@dmz.wickedmachine.net>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/126726: Removes the .sh extension from the rc file for net/openslp
Message-ID:  <200808220252.m7M2q9us094307@www.freebsd.org>
Resent-Message-ID: <200808220300.m7M30Bh8016301@freefall.freebsd.org>

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

>Number:         126726
>Category:       ports
>Synopsis:       Removes the .sh extension from the rc file for net/openslp
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 22 03:00:10 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Joseph S. Atkinson
>Release:        8.0-CURRENT
>Organization:
>Environment:
FreeBSD mephisto.wickedmachine.net 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Sat Aug 16 18:20:52 EDT 2008     root@legion.mephisto.wickedmachine.net:/usr/obj/usr/src/sys/MEPHISTO  i386

>Description:
net/openslp has some oddness from before ports handled USE_RC_SUBR the way it does now. This patch removes the method used to "manually" install the script which also resuled in it being installed as 001slpd.sh in etc/rc.d. It will now use the built in functions within the ports/Mk structure instead and install as etc/rc.d/slpd.

To work properly, it will require that ports/net/openslp/files/slpd.sh.example be moved to ports/net/openslp/files/slpd.in in cvs.
>How-To-Repeat:
cd /usr/ports/net/openslp/ && make install
>Fix:
mv/cp files/slpd.sh.example to files/slpd.in

Apply included patch.

OpenSLP should now install following current ports logic.

Patch attached with submission follows:

Credit "Joseph S. Atkinson <jsa@wickedmachine.net>" if commited please

[repocopy] files/slpd.sh.sample -> files/slpd.in

--- Makefile.orig	2008-08-20 17:51:32.000000000 -0400
+++ Makefile	2008-08-20 20:52:56.000000000 -0400
@@ -7,7 +7,7 @@
 
 PORTNAME=	openslp
 PORTVERSION=	1.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	openslp
@@ -23,8 +23,7 @@
 		--localstatedir=/var
 CONFIGURE_TARGET=--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-USE_RC_SUBR=	yes
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+USE_RC_SUBR=	slpd
 
 OPTIONS=	SLP_SECURITY "Turn on SLPv2 security support" off \
 		ASYNC_API "Enable asynchronous communication API" off
@@ -43,14 +42,11 @@
 	@(cd ${WRKSRC}; \
 		${FIND} doc -type f -path '*/CVS/*' -delete; \
 		${FIND} doc -type d -name CVS -delete)
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/slpd.sh.sample > ${WRKSRC}/slpd.sh
 
 post-install:
 .for FILE in slp.conf slp.reg slp.spi
 	${INSTALL_DATA} ${WRKSRC}/etc/${FILE} ${PREFIX}/etc/openslp/${FILE}.default
 .endfor
-	${INSTALL_SCRIPT} ${WRKSRC}/slpd.sh ${PREFIX}/etc/rc.d/001slpd.sh
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	(cd ${INSTALL_WRKSRC}/doc; \
--- pkg-plist.orig	2008-08-20 21:19:44.000000000 -0400
+++ pkg-plist	2008-08-20 20:56:22.000000000 -0400
@@ -9,7 +9,6 @@
 etc/openslp/slp.spi.default
 @exec [ -f %B/slp.spi ] || cp %B/%f %B/slp.spi
 @dirrm etc/openslp
-etc/rc.d/001slpd.sh
 include/slp.h
 lib/libslp.a
 lib/libslp.la


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



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