From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jan 24 23:20: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 5804C1065676 for ; Sun, 24 Jan 2010 23:20: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 324218FC19 for ; Sun, 24 Jan 2010 23:20: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 o0ONK5Ls091719 for ; Sun, 24 Jan 2010 23:20:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o0ONK5qd091718; Sun, 24 Jan 2010 23:20:05 GMT (envelope-from gnats) Resent-Date: Sun, 24 Jan 2010 23:20:05 GMT Resent-Message-Id: <201001242320.o0ONK5qd091718@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 0B9151065672 for ; Sun, 24 Jan 2010 23:18:32 +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 504BA8FC0C for ; Sun, 24 Jan 2010 23:18:30 +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 o0ONEstQ089406 for ; Sun, 24 Jan 2010 23:14:55 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 o0ONEsEQ089405; Sun, 24 Jan 2010 23:14:54 GMT (envelope-from sevan) Message-Id: <201001242314.o0ONEsEQ089405@newbie.thingamajig-systems.co.uk> Date: Sun, 24 Jan 2010 23:14:54 GMT From: Sevan Janiyan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/143195: [PATCH] net-p2p/javadc: use $SUB_FILES to adjust wrapper.sh 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:20:05 -0000 >Number: 143195 >Category: ports >Synopsis: [PATCH] net-p2p/javadc: use $SUB_FILES to adjust wrapper.sh >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:20: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: use DOCSDIR in plist Added file(s): - files/wrapper.sh.in Removed file(s): - files/wrapper.sh Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- javadc-0.20_2.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net-p2p/javadc/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- Makefile 22 Aug 2009 00:32:13 -0000 1.11 +++ Makefile 24 Jan 2010 23:13:33 -0000 @@ -29,10 +29,10 @@ DOC_FILES= COPYING ChangeLog INSTALL README -post-patch: - @${SED} -e "s|%%JAR_DIR%%|${JAR_DIR}|;s|%%JAR_FILE%%|${JAR_FILE}|; \ - s|%%JAVAVM%%|${JAVAVM}|;s|%%PREFIX%%|${PREFIX}|" \ - ${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh +SUB_FILES= wrapper.sh +SUB_LIST= JAR_DIR=${JAR_DIR} \ + JAR_FILE=${JAR_FILE} \ + JAVAVM=${JAVAVM} # as far as build goes... ;) do-build: Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net-p2p/javadc/pkg-plist,v retrieving revision 1.3 diff -u -r1.3 pkg-plist --- pkg-plist 22 Jan 2006 02:45:50 -0000 1.3 +++ pkg-plist 24 Jan 2010 23:13:33 -0000 @@ -1,9 +1,9 @@ bin/javadc -%%PORTDOCS%%share/doc/javadc/COPYING -%%PORTDOCS%%share/doc/javadc/ChangeLog -%%PORTDOCS%%share/doc/javadc/INSTALL -%%PORTDOCS%%share/doc/javadc/README +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/README %%JAR_DIR%%/%%JAR_FILE%% @dirrm %%JAR_DIR%% -%%PORTDOCS%%@dirrm share/doc/javadc +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrmtry share/java/jar Index: files/wrapper.sh =================================================================== RCS file: files/wrapper.sh diff -N files/wrapper.sh --- files/wrapper.sh 16 Aug 2002 02:18:14 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,8 +0,0 @@ -#!/bin/sh - -PREFIX="%%PREFIX%%" -JAVAVM="%%JAVAVM%%" -JAR_DIR="%%JAR_DIR%%" -JAR_FILE="%%JAR_FILE%%" - -${JAVAVM} -jar ${PREFIX}/${JAR_DIR}/${JAR_FILE} "${@}" 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:13:33 -0000 @@ -0,0 +1,8 @@ +#!/bin/sh + +PREFIX="%%PREFIX%%" +JAVAVM="%%JAVAVM%%" +JAR_DIR="%%JAR_DIR%%" +JAR_FILE="%%JAR_FILE%%" + +${JAVAVM} -jar ${PREFIX}/${JAR_DIR}/${JAR_FILE} "${@}" --- javadc-0.20_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: