From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jan 24 23:40:05 2010 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 4D0B0106566B for ; Sun, 24 Jan 2010 23:40:05 +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 0D2768FC1C for ; Sun, 24 Jan 2010 23:40:05 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o0ONe4n3009447 for ; Sun, 24 Jan 2010 23:40:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o0ONe4bn009446; Sun, 24 Jan 2010 23:40:04 GMT (envelope-from gnats) Resent-Date: Sun, 24 Jan 2010 23:40:04 GMT Resent-Message-Id: <201001242340.o0ONe4bn009446@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, Sevan Janiyan Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2F91E106566B for ; Sun, 24 Jan 2010 23:31:42 +0000 (UTC) (envelope-from sevan@newbie.thingamajig-systems.co.uk) Received: from newbie.thingamajig-systems.co.uk (newbie.thingamajig-systems.co.uk [93.97.185.103]) by mx1.freebsd.org (Postfix) with ESMTP id 4958B8FC1E for ; Sun, 24 Jan 2010 23:31:41 +0000 (UTC) Received: from newbie.thingamajig-systems.co.uk (localhost [127.0.0.1]) by newbie.thingamajig-systems.co.uk (8.14.3/8.14.3) with ESMTP id o0ONS4jQ090416 for ; Sun, 24 Jan 2010 23:28:05 GMT (envelope-from sevan@newbie.thingamajig-systems.co.uk) Received: (from root@localhost) by newbie.thingamajig-systems.co.uk (8.14.3/8.14.3/Submit) id o0ONS4Xq090415; Sun, 24 Jan 2010 23:28:04 GMT (envelope-from sevan) Message-Id: <201001242328.o0ONS4Xq090415@newbie.thingamajig-systems.co.uk> Date: Sun, 24 Jan 2010 23:28:04 GMT From: Sevan Janiyan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/143197: [PATCH] net-p2p/linux-agsatellite: use SUB_FILES to update wrapper.sh, use DOCSDIR in plist 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: Sun, 24 Jan 2010 23:40:05 -0000 >Number: 143197 >Category: ports >Synopsis: [PATCH] net-p2p/linux-agsatellite: use SUB_FILES to update wrapper.sh, use DOCSDIR in plist >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: Sun Jan 24 23:40:04 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Sevan Janiyan >Release: FreeBSD 8.0-RELEASE-p2 amd64 >Organization: >Environment: System: FreeBSD newbie.thingamajig-systems.co.uk 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan 5 21:11:58 UTC >Description: Added file(s): - files/wrapper.sh.in Removed file(s): - files/wrapper.sh Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- linux-agsatellite-0.520_4.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net-p2p/linux-agsatellite/Makefile,v retrieving revision 1.19 diff -u -r1.19 Makefile --- Makefile 19 Mar 2009 17:28:47 -0000 1.19 +++ Makefile 24 Jan 2010 23:26:41 -0000 @@ -24,11 +24,10 @@ RESTRICTED= no response from developer on licensing issues DOCS= german_readme.txt license.txt readme.txt +SUB_FILES= wrapper.sh post-patch: @${REINPLACE_CMD} -e "s| ||;s|email|username|" ${WRKSRC}/*.txt - @${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \ - ${WRKDIR}/wrapper.sh pre-install: @${BRANDELF} -t Linux ${WRKSRC}/AGSatellite Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net-p2p/linux-agsatellite/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- pkg-plist 7 Sep 2001 14:34:21 -0000 1.1 +++ pkg-plist 24 Jan 2010 23:26:41 -0000 @@ -1,6 +1,6 @@ bin/AGSatellite bin/AGSatellite-real -%%PORTDOCS%%share/doc/agsatellite/german_readme.txt -%%PORTDOCS%%share/doc/agsatellite/license.txt -%%PORTDOCS%%share/doc/agsatellite/readme.txt -%%PORTDOCS%%@dirrm share/doc/agsatellite +%%PORTDOCS%%%%DOCSDIR%%/german_readme.txt +%%PORTDOCS%%%%DOCSDIR%%/license.txt +%%PORTDOCS%%%%DOCSDIR%%/readme.txt +%%PORTDOCS%%@dirrm %%DOCSDIR%% Index: files/wrapper.sh =================================================================== RCS file: files/wrapper.sh diff -N files/wrapper.sh --- files/wrapper.sh 16 Aug 2002 02:18:13 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -#!/bin/sh - -PREFIX="%%PREFIX%%" -PROGRAM="${0}" - -if [ ! -d ${HOME}/.agsatellite ] -then - mkdir -p ${HOME}/.agsatellite -fi - -if [ ! -h ${HOME}/.agsatellite/${PROGRAM##*/} ] -then - ln -sf ${PREFIX}/bin/${PROGRAM##*/}-real ${HOME}/.agsatellite/${PROGRAM##*/} -fi - -echo " ${*} " | grep " \-createdironly " || -{ - cd ${HOME}/.agsatellite && - echo Running Audio Galaxy Satellite under ${HOME}/.agsatellite && - echo Create both account.txt and shares.txt files under ${HOME}/.agsatellite && - exec ./${PROGRAM##*/} "${@}" || - echo PROBLEM. Cannot create directory ${HOME}/.agsatellite, make sure you have the proper permissions to create itnd try again -} Index: files/wrapper.sh.in =================================================================== RCS file: files/wrapper.sh.in diff -N files/wrapper.sh.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/wrapper.sh.in 24 Jan 2010 23:26:41 -0000 @@ -0,0 +1,23 @@ +#!/bin/sh + +PREFIX="%%PREFIX%%" +PROGRAM="${0}" + +if [ ! -d ${HOME}/.agsatellite ] +then + mkdir -p ${HOME}/.agsatellite +fi + +if [ ! -h ${HOME}/.agsatellite/${PROGRAM##*/} ] +then + ln -sf ${PREFIX}/bin/${PROGRAM##*/}-real ${HOME}/.agsatellite/${PROGRAM##*/} +fi + +echo " ${*} " | grep " \-createdironly " || +{ + cd ${HOME}/.agsatellite && + echo Running Audio Galaxy Satellite under ${HOME}/.agsatellite && + echo Create both account.txt and shares.txt files under ${HOME}/.agsatellite && + exec ./${PROGRAM##*/} "${@}" || + echo PROBLEM. Cannot create directory ${HOME}/.agsatellite, make sure you have the proper permissions to create itnd try again +} --- linux-agsatellite-0.520_4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: