diff options
| -rw-r--r-- | net-p2p/frost/Makefile | 5 | ||||
| -rw-r--r-- | net-p2p/frost/files/wrapper.sh | 3 | ||||
| -rw-r--r-- | net/edonkey-gui-java/Makefile | 5 | ||||
| -rw-r--r-- | net/edonkey-gui-java/files/wrapper.sh | 3 | ||||
| -rw-r--r-- | net/frost/Makefile | 5 | ||||
| -rw-r--r-- | net/frost/files/wrapper.sh | 3 |
6 files changed, 18 insertions, 6 deletions
diff --git a/net-p2p/frost/Makefile b/net-p2p/frost/Makefile index a3257a331eb5..d2d1bd02642a 100644 --- a/net-p2p/frost/Makefile +++ b/net-p2p/frost/Makefile @@ -7,7 +7,7 @@ PORTNAME= frost PORTVERSION= 1.2.0.20040225 -PORTEPOCH= 1 +PORTEPOCH= 2 CATEGORIES= net java MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= jtcfrost @@ -27,7 +27,7 @@ PLIST_SUB= JAR_DIR=${JAR_DIR} VERSION_DATE= 090603 -JAVAVM= ${LOCALBASE}/bin/javavm +JAVAVM= ${LOCALBASE}/bin/java SHARE_DIR= share/${PORTNAME} JAR_DIR= share/java/jar/${PORTNAME} JAR_FILE= frost.jar @@ -48,6 +48,7 @@ SHARE_FILES= config/boards.xml.default \ post-patch: @${SED} -e "s|%%PREFIX%%|${PREFIX}|; \ + s|%%JAVA_VERSION%%|${USE_JAVA}|; \ s|%%JAVAVM%%|${JAVAVM}|; \ s|%%JAR_DIR%%|${JAR_DIR}|; \ s|%%JAR_FILE%%|${JAR_FILE}|; \ diff --git a/net-p2p/frost/files/wrapper.sh b/net-p2p/frost/files/wrapper.sh index d64b12941f6a..b65c91b447e6 100644 --- a/net-p2p/frost/files/wrapper.sh +++ b/net-p2p/frost/files/wrapper.sh @@ -1,6 +1,9 @@ #!/bin/sh +export JAVA_VERSION + PREFIX="%%PREFIX%%" +JAVA_VERSION="%%JAVA_VERSION%%" JAVAVM="%%JAVAVM%%" JAR_DIR="%%JAR_DIR%%" JAR_FILE="%%JAR_FILE%%" diff --git a/net/edonkey-gui-java/Makefile b/net/edonkey-gui-java/Makefile index d68d9738f4cb..93ee20791c9d 100644 --- a/net/edonkey-gui-java/Makefile +++ b/net/edonkey-gui-java/Makefile @@ -7,7 +7,7 @@ PORTNAME= edonkey PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net java MASTER_SITES= http://www.edonkey2000.com/files/ PKGNAMESUFFIX= -gui-java @@ -28,11 +28,12 @@ PLIST_SUB= JAR_DIR=${JAR_DIR} \ JAR_FILE=${JAR_FILE} \ WRAPPER=${PORTNAME}${PKGNAMESUFFIX} -JAVAVM= ${LOCALBASE}/bin/javavm +JAVAVM= ${LOCALBASE}/bin/java JAR_DIR= share/java/jar/${PORTNAME} post-patch: @${SED} -e "s|%%JAR_DIR%%|${JAR_DIR}|;s|%%JAR_FILE%%|${JAR_FILE}|; \ + s|%%JAVA_VERSION%%|${USE_JAVA}|; \ s|%%JAVAVM%%|${JAVAVM}|;s|%%PREFIX%%|${PREFIX}|" \ ${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh diff --git a/net/edonkey-gui-java/files/wrapper.sh b/net/edonkey-gui-java/files/wrapper.sh index 0f4e2ba5d1b1..9f50395b16ae 100644 --- a/net/edonkey-gui-java/files/wrapper.sh +++ b/net/edonkey-gui-java/files/wrapper.sh @@ -1,6 +1,9 @@ #!/bin/sh +export JAVA_VERSION + PREFIX="%%PREFIX%%" +JAVA_VERSION="%%JAVA_VERSION%%" JAVAVM="%%JAVAVM%%" JAR_DIR="%%JAR_DIR%%" JAR_FILE="%%JAR_FILE%%" diff --git a/net/frost/Makefile b/net/frost/Makefile index a3257a331eb5..d2d1bd02642a 100644 --- a/net/frost/Makefile +++ b/net/frost/Makefile @@ -7,7 +7,7 @@ PORTNAME= frost PORTVERSION= 1.2.0.20040225 -PORTEPOCH= 1 +PORTEPOCH= 2 CATEGORIES= net java MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= jtcfrost @@ -27,7 +27,7 @@ PLIST_SUB= JAR_DIR=${JAR_DIR} VERSION_DATE= 090603 -JAVAVM= ${LOCALBASE}/bin/javavm +JAVAVM= ${LOCALBASE}/bin/java SHARE_DIR= share/${PORTNAME} JAR_DIR= share/java/jar/${PORTNAME} JAR_FILE= frost.jar @@ -48,6 +48,7 @@ SHARE_FILES= config/boards.xml.default \ post-patch: @${SED} -e "s|%%PREFIX%%|${PREFIX}|; \ + s|%%JAVA_VERSION%%|${USE_JAVA}|; \ s|%%JAVAVM%%|${JAVAVM}|; \ s|%%JAR_DIR%%|${JAR_DIR}|; \ s|%%JAR_FILE%%|${JAR_FILE}|; \ diff --git a/net/frost/files/wrapper.sh b/net/frost/files/wrapper.sh index d64b12941f6a..b65c91b447e6 100644 --- a/net/frost/files/wrapper.sh +++ b/net/frost/files/wrapper.sh @@ -1,6 +1,9 @@ #!/bin/sh +export JAVA_VERSION + PREFIX="%%PREFIX%%" +JAVA_VERSION="%%JAVA_VERSION%%" JAVAVM="%%JAVAVM%%" JAR_DIR="%%JAR_DIR%%" JAR_FILE="%%JAR_FILE%%" |