Date: Sun, 24 Jan 2010 23:14:54 GMT From: Sevan Janiyan <venture37@geeklan.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/143195: [PATCH] net-p2p/javadc: use $SUB_FILES to adjust wrapper.sh Message-ID: <201001242314.o0ONEsEQ089405@newbie.thingamajig-systems.co.uk> Resent-Message-ID: <201001242320.o0ONK5qd091718@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001242314.o0ONEsEQ089405>