Date: Sun, 24 Jan 2010 22:47:54 GMT From: Sevan Janiyan <venture37@geeklan.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Cc: peter.thoenen@yahoo.com Subject: ports/143190: [PATCH] net-p2p/frost: use $SUB_FILES & $SUB_LIST to update wrapper.sh Message-ID: <201001242247.o0OMlsvD085209@newbie.thingamajig-systems.co.uk> Resent-Message-ID: <201001242300.o0ON0BGA074032@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 143190
>Category: ports
>Synopsis: [PATCH] net-p2p/frost: use $SUB_FILES & $SUB_LIST to update 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:00:11 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:
no need to invoke sed manually
Added file(s):
- files/wrapper.sh.in
Removed file(s):
- files/wrapper.sh
Port maintainer (peter.thoenen@yahoo.com) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- frost-1.2.0.20080304_1,2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net-p2p/frost/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile 22 Aug 2009 00:32:11 -0000 1.22
+++ Makefile 24 Jan 2010 22:45:19 -0000
@@ -64,16 +64,13 @@
"frost" "Application;P2P;Network;" \
false
-pre-everything::
+SUB_FILES= wrapper.sh
+SUB_LIST= JAVA_VERSION=${JAVA_VERSION} \
+ JAVAVM=${JAVAVM} \
+ JAR_DIR=${JAR_DIR} \
+ JAR_FILE=${JAR_FILE}
-post-patch:
- @${SED} -e "s|%%PREFIX%%|${PREFIX}|; \
- s|%%JAVA_VERSION%%|${JAVA_VERSION}|; \
- s|%%JAVAVM%%|${JAVAVM}|; \
- s|%%JAR_DIR%%|${JAR_DIR}|; \
- s|%%JAR_FILE%%|${JAR_FILE}|; \
- s|%%DATADIR%%|${DATADIR:S,^${PREFIX}/,,}|" \
- ${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh
+pre-everything::
do-install:
# docs
Index: files/wrapper.sh
===================================================================
RCS file: files/wrapper.sh
diff -N files/wrapper.sh
--- files/wrapper.sh 5 Oct 2007 21:54:47 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-export JAVA_VERSION
-
-PREFIX="%%PREFIX%%"
-JAVA_VERSION="%%JAVA_VERSION%%"
-JAVAVM="%%JAVAVM%%"
-JAR_DIR="%%JAR_DIR%%"
-JAR_FILE="%%JAR_FILE%%"
-DATADIR="%%DATADIR%%"
-HOME_DIR=${HOME}/.frost
-CLASSPATH="${PREFIX}/${JAR_DIR}/BCastle.jar:${PREFIX}/${JAR_DIR}/datechooser.jar:${PREFIX}/${JAR_DIR}/fec-native.jar:${PREFIX}/${JAR_DIR}/fecImpl.jar:${PREFIX}/${JAR_DIR}/frost.jar:${PREFIX}/${JAR_DIR}/genChkImpl.jar:${PREFIX}/${JAR_DIR}/gnu-regexp-1.1.4.jar:${PREFIX}/${JAR_DIR}/joda-time.jar:${PREFIX}/${JAR_DIR}/perst15.jar:${PREFIX}/${JAR_DIR}/skinlf.jar:${PREFIX}/${JAR_DIR}/skinlfFix.jar:${PREFIX}/${JAR_DIR}/mckoidb.jar:${PREFIX}/${JAR_DIR}/xercesImpl.jar:${PREFIX}/${JAR_DIR}/xml-apis.jar"
-
-if [ ! -d ${HOME_DIR}/config ]
-then
- mkdir -p ${HOME_DIR}/config
-fi
-
-ln -sf ${PREFIX}/${DATADIR}/boards.xml.default \
- ${HOME_DIR}/config/boards.xml.default
-
-if [ ! -d ${HOME_DIR}/themes ]
-then
- mkdir -p ${HOME_DIR}/themes
- ln -sf ${PREFIX}/${DATADIR}/themepack.zip ${HOME_DIR}/themes/themepack.zip
-fi
-
-if [ ! -d ${HOME_DIR}/store ]
-then
- mkdir -p ${HOME_DIR}/store
- ln -sf ${PREFIX}/${DATADIR}/applayerdb.conf \
- ${HOME_DIR}/store/applayerdb.conf
-fi
-
-ln -sf ${PREFIX}/${DATADIR}/aquathemepack.zip \
- ${HOME_DIR}/themes/aquathemepack.zip
-
-cd ${HOME_DIR} &&
- exec ${JAVAVM} -cp $CLASSPATH frost.Frost "${@}"
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 22:45:19 -0000
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+export JAVA_VERSION
+
+PREFIX="%%PREFIX%%"
+JAVA_VERSION="%%JAVA_VERSION%%"
+JAVAVM="%%JAVAVM%%"
+JAR_DIR="%%JAR_DIR%%"
+JAR_FILE="%%JAR_FILE%%"
+DATADIR="%%DATADIR%%"
+HOME_DIR=${HOME}/.frost
+CLASSPATH="${PREFIX}/${JAR_DIR}/BCastle.jar:${PREFIX}/${JAR_DIR}/datechooser.jar:${PREFIX}/${JAR_DIR}/fec-native.jar:${PREFIX}/${JAR_DIR}/fecImpl.jar:${PREFIX}/${JAR_DIR}/frost.jar:${PREFIX}/${JAR_DIR}/genChkImpl.jar:${PREFIX}/${JAR_DIR}/gnu-regexp-1.1.4.jar:${PREFIX}/${JAR_DIR}/joda-time.jar:${PREFIX}/${JAR_DIR}/perst15.jar:${PREFIX}/${JAR_DIR}/skinlf.jar:${PREFIX}/${JAR_DIR}/skinlfFix.jar:${PREFIX}/${JAR_DIR}/mckoidb.jar:${PREFIX}/${JAR_DIR}/xercesImpl.jar:${PREFIX}/${JAR_DIR}/xml-apis.jar"
+
+if [ ! -d ${HOME_DIR}/config ]
+then
+ mkdir -p ${HOME_DIR}/config
+fi
+
+ln -sf ${PREFIX}/${DATADIR}/boards.xml.default \
+ ${HOME_DIR}/config/boards.xml.default
+
+if [ ! -d ${HOME_DIR}/themes ]
+then
+ mkdir -p ${HOME_DIR}/themes
+ ln -sf ${PREFIX}/${DATADIR}/themepack.zip ${HOME_DIR}/themes/themepack.zip
+fi
+
+if [ ! -d ${HOME_DIR}/store ]
+then
+ mkdir -p ${HOME_DIR}/store
+ ln -sf ${PREFIX}/${DATADIR}/applayerdb.conf \
+ ${HOME_DIR}/store/applayerdb.conf
+fi
+
+ln -sf ${PREFIX}/${DATADIR}/aquathemepack.zip \
+ ${HOME_DIR}/themes/aquathemepack.zip
+
+cd ${HOME_DIR} &&
+ exec ${JAVAVM} -cp $CLASSPATH frost.Frost "${@}"
--- frost-1.2.0.20080304_1,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?201001242247.o0OMlsvD085209>