From owner-freebsd-bugs@FreeBSD.ORG Wed Oct 10 18:40:01 2007 Return-Path: Delivered-To: freebsd-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 A891016A417 for ; Wed, 10 Oct 2007 18:40:01 +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 7908513C455 for ; Wed, 10 Oct 2007 18:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l9AIe1bH011844 for ; Wed, 10 Oct 2007 18:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l9AIe1g5011843; Wed, 10 Oct 2007 18:40:01 GMT (envelope-from gnats) Resent-Date: Wed, 10 Oct 2007 18:40:01 GMT Resent-Message-Id: <200710101840.l9AIe1g5011843@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Philip M. Gollucci" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9AA8816A46B for ; Wed, 10 Oct 2007 18:33:14 +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 6491813C461 for ; Wed, 10 Oct 2007 18:33:14 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.1/8.14.1) with ESMTP id l9AIXEok059842 for ; Wed, 10 Oct 2007 18:33:14 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.1/8.14.1/Submit) id l9AIXEuv059840; Wed, 10 Oct 2007 18:33:14 GMT (envelope-from nobody) Message-Id: <200710101833.l9AIXEuv059840@www.freebsd.org> Date: Wed, 10 Oct 2007 18:33:14 GMT From: "Philip M. Gollucci" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/117082: [PATCH]: www/amphetadesk now uses USE_RC_SUBR and is portlint clean X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Oct 2007 18:40:01 -0000 >Number: 117082 >Category: misc >Synopsis: [PATCH]: www/amphetadesk now uses USE_RC_SUBR and is portlint clean >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Oct 10 18:40:01 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Philip M. Gollucci >Release: FreeBSD 7.0-current >Organization: Riderway Inc. >Environment: FreeBSD philip.hq.rws 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Thu Jul 26 16:44:37 EDT 2007 root@philip.office.rws:/usr/obj/usr/src/sys/GENERIC i386 >Description: Update port to use USE_RC_SUBR and cleanup other portlint warnings. NOTE THIS DEPENEDS ON ports/117080 Also note, that an UPDATING entry is included for the rc.d script being renamed. >How-To-Repeat: >Fix: Patch attached with submission follows: Renamed without modifications: cvs diff: files/amphetadesk.in is a new entry, no comparison available cvs diff: files/amphetadesk.sh was removed, no comparison available retrieving revision 1.4 diff -u -r1.4 Makefile --- Makefile 3 Dec 2006 12:45:54 -0000 1.4 +++ Makefile 10 Oct 2007 17:59:53 -0000 @@ -30,7 +30,7 @@ ${SITE_PERL}/URI/URL.pm:${PORTSDIR}/net/p5-URI USE_PERL5= yes -USE_RC_SUBR= yes +USE_RC_SUBR= amphetadesk NO_BUILD= yes .ifndef(NOPORTDOCS) @@ -51,11 +51,6 @@ -e 's|%%DATADIR%%|${DATADIR}|' \ -e 's|%%DOCSDIR%%|${DOCSDIR}|' \ ${WRKSRC}/lib/AmphetaDesk/Settings.pm -# rc.d - @${SED} \ - -e 's|%%PREFIX%%|${PREFIX}|' \ - -e "s|%%PERL%%|${PERL}|" \ - ${FILESDIR}/${PORTNAME}.sh > ${WRKDIR}/${PORTNAME}.sh post-configure: @${REINPLACE_CMD} -E \ @@ -109,13 +104,11 @@ ${XARGS} -0 -x -n 10 -I {} \ ${MKDIR} ${DATADIR}/{} # files -.for ext in gif html ico png pict +.for ext in gif html ico png pict @cd ${WRKSRC} && \ ${FIND} templates -type f -name "*.${ext}" -print0 | \ ${XARGS} -0 -x -n 10 -I {} \ ${INSTALL_DATA} {} ${DATADIR}/{} .endfor -# rc.d - @${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/etc/rc.d .include Index: UPDATING =================================================================== RCS file: /home/ncvs/ports/UPDATING,v retrieving revision 1.556 diff -u -r1.556 UPDATING --- UPDATING 8 Oct 2007 09:21:42 -0000 1.556 +++ UPDATING 10 Oct 2007 18:24:35 -0000 @@ -6,7 +6,15 @@ time you update your ports collection, before attempting any port upgrades. -20070614: +20071010: + AFFECTS: users of www/amphetadesk + AUTHOR: pgollucci@p6m7g8.com + + www/amphetadesk has been updated to use the USE_RC_SUBR framework + for rc.d scripts. The rc.d script has been renamed from ampetadesk.sh + to amphetadesk for consistency with other ports. + +20071008: AFFECTS: users of www/mediawiki AUTHOR: miwi@FreeBSD.org >Release-Note: >Audit-Trail: >Unformatted: