From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Aug 22 03:00:11 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AC86A1065689 for ; Fri, 22 Aug 2008 03:00:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 81C658FC1C for ; Fri, 22 Aug 2008 03:00:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m7M30BKn016302 for ; Fri, 22 Aug 2008 03:00:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m7M30Bh8016301; Fri, 22 Aug 2008 03:00:11 GMT (envelope-from gnats) Resent-Date: Fri, 22 Aug 2008 03:00:11 GMT Resent-Message-Id: <200808220300.m7M30Bh8016301@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Joseph S. Atkinson" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E6E4106567D for ; Fri, 22 Aug 2008 02:52:10 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 6AD298FC27 for ; Fri, 22 Aug 2008 02:52:10 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m7M2qAUb094308 for ; Fri, 22 Aug 2008 02:52:10 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m7M2q9us094307; Fri, 22 Aug 2008 02:52:09 GMT (envelope-from nobody) Message-Id: <200808220252.m7M2q9us094307@www.freebsd.org> Date: Fri, 22 Aug 2008 02:52:09 GMT From: "Joseph S. Atkinson" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/126726: Removes the .sh extension from the rc file for net/openslp X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Aug 2008 03:00:11 -0000 >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 " 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: