Revert javavm hack, which prevents execution of jpda related modules.
JDK_HOME will have to be set by hand (or use the -jdkhome switch). Submitted by: Khairil Yusof <kaeru@pd.jaring.my>
This commit is contained in:
parent
545337d9be
commit
cb4ff3ab03
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=82034
12 changed files with 6 additions and 318 deletions
|
@ -7,6 +7,7 @@
|
|||
|
||||
PORTNAME= netbeans
|
||||
PORTVERSION= 3.4.1
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= java devel
|
||||
MASTER_SITES= # http://www.netbeans.org/download/release341/night/build200301202341/
|
||||
DISTNAME= NetBeansIDE-release341
|
||||
|
|
|
@ -12,56 +12,3 @@ $FreeBSD$
|
|||
*) args="$args \"$1\"" ;;
|
||||
esac
|
||||
shift
|
||||
@@ -182,25 +182,6 @@
|
||||
parse_args "$@"
|
||||
|
||||
#
|
||||
-# check JDK
|
||||
-#
|
||||
-
|
||||
-if [ -z "$jdkhome" ] ; then
|
||||
- echo "Cannot find JDK. Please set the JDK_HOME environment variable to point"
|
||||
- echo "to your JDK installation directory, or use the -jdkhome switch"
|
||||
- echo ""
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-if [ ! -x "${jdkhome}/bin/java" ] ; then
|
||||
- echo "Cannot find JDK at ${jdkhome}. Please set the JDK_HOME"
|
||||
- echo "environment variable to point to your JDK installation directory,"
|
||||
- echo "or use the -jdkhome switch"
|
||||
- echo ""
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-#
|
||||
# open file?
|
||||
#
|
||||
|
||||
@@ -212,7 +193,7 @@
|
||||
if [ ! -z "$port" ] ; then
|
||||
args="$args -port $port"
|
||||
fi
|
||||
- eval "\"$jdkhome/bin/java\"" -classpath "\"${idehome}/modules/utilities.jar\"" $openfile_class $args "\"$openfile\""
|
||||
+ eval javavm -classpath "\"${idehome}/modules/utilities.jar\"" $openfile_class $args "\"$openfile\""
|
||||
rc=$?
|
||||
|
||||
if [ $rc -eq 0 -o $rc -eq 1 ] ; then
|
||||
@@ -267,7 +248,7 @@
|
||||
}
|
||||
|
||||
do_run_updater() {
|
||||
- eval "\"$jdkhome/bin/java\"" $thread_flag -classpath "\"${updatercp}\"" $jargs $updater_class
|
||||
+ eval javavm $thread_flag -classpath "\"${updatercp}\"" $jargs $updater_class
|
||||
}
|
||||
|
||||
look_for_pre_runs() {
|
||||
@@ -406,7 +387,7 @@
|
||||
openfile=""
|
||||
fi
|
||||
|
||||
- eval "\"${jdkhome}/bin/java\"" -Djdk.home="\"${jdkhome}\"" $thread_flag -classpath "\"$cp\"" \
|
||||
+ eval javavm -Djdk.home="\"${jdkhome}\"" $thread_flag -classpath "\"$cp\"" \
|
||||
-Dnetbeans.osenv="${nbenvfile}" \
|
||||
${openfile_prop} \
|
||||
$jargs $ide_class $args
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
PORTNAME= netbeans
|
||||
PORTVERSION= 3.4.1
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= java devel
|
||||
MASTER_SITES= # http://www.netbeans.org/download/release341/night/build200301202341/
|
||||
DISTNAME= NetBeansIDE-release341
|
||||
|
|
|
@ -12,56 +12,3 @@ $FreeBSD$
|
|||
*) args="$args \"$1\"" ;;
|
||||
esac
|
||||
shift
|
||||
@@ -182,25 +182,6 @@
|
||||
parse_args "$@"
|
||||
|
||||
#
|
||||
-# check JDK
|
||||
-#
|
||||
-
|
||||
-if [ -z "$jdkhome" ] ; then
|
||||
- echo "Cannot find JDK. Please set the JDK_HOME environment variable to point"
|
||||
- echo "to your JDK installation directory, or use the -jdkhome switch"
|
||||
- echo ""
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-if [ ! -x "${jdkhome}/bin/java" ] ; then
|
||||
- echo "Cannot find JDK at ${jdkhome}. Please set the JDK_HOME"
|
||||
- echo "environment variable to point to your JDK installation directory,"
|
||||
- echo "or use the -jdkhome switch"
|
||||
- echo ""
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-#
|
||||
# open file?
|
||||
#
|
||||
|
||||
@@ -212,7 +193,7 @@
|
||||
if [ ! -z "$port" ] ; then
|
||||
args="$args -port $port"
|
||||
fi
|
||||
- eval "\"$jdkhome/bin/java\"" -classpath "\"${idehome}/modules/utilities.jar\"" $openfile_class $args "\"$openfile\""
|
||||
+ eval javavm -classpath "\"${idehome}/modules/utilities.jar\"" $openfile_class $args "\"$openfile\""
|
||||
rc=$?
|
||||
|
||||
if [ $rc -eq 0 -o $rc -eq 1 ] ; then
|
||||
@@ -267,7 +248,7 @@
|
||||
}
|
||||
|
||||
do_run_updater() {
|
||||
- eval "\"$jdkhome/bin/java\"" $thread_flag -classpath "\"${updatercp}\"" $jargs $updater_class
|
||||
+ eval javavm $thread_flag -classpath "\"${updatercp}\"" $jargs $updater_class
|
||||
}
|
||||
|
||||
look_for_pre_runs() {
|
||||
@@ -406,7 +387,7 @@
|
||||
openfile=""
|
||||
fi
|
||||
|
||||
- eval "\"${jdkhome}/bin/java\"" -Djdk.home="\"${jdkhome}\"" $thread_flag -classpath "\"$cp\"" \
|
||||
+ eval javavm -Djdk.home="\"${jdkhome}\"" $thread_flag -classpath "\"$cp\"" \
|
||||
-Dnetbeans.osenv="${nbenvfile}" \
|
||||
${openfile_prop} \
|
||||
$jargs $ide_class $args
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
PORTNAME= netbeans
|
||||
PORTVERSION= 3.4.1
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= java devel
|
||||
MASTER_SITES= # http://www.netbeans.org/download/release341/night/build200301202341/
|
||||
DISTNAME= NetBeansIDE-release341
|
||||
|
|
|
@ -12,56 +12,3 @@ $FreeBSD$
|
|||
*) args="$args \"$1\"" ;;
|
||||
esac
|
||||
shift
|
||||
@@ -182,25 +182,6 @@
|
||||
parse_args "$@"
|
||||
|
||||
#
|
||||
-# check JDK
|
||||
-#
|
||||
-
|
||||
-if [ -z "$jdkhome" ] ; then
|
||||
- echo "Cannot find JDK. Please set the JDK_HOME environment variable to point"
|
||||
- echo "to your JDK installation directory, or use the -jdkhome switch"
|
||||
- echo ""
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-if [ ! -x "${jdkhome}/bin/java" ] ; then
|
||||
- echo "Cannot find JDK at ${jdkhome}. Please set the JDK_HOME"
|
||||
- echo "environment variable to point to your JDK installation directory,"
|
||||
- echo "or use the -jdkhome switch"
|
||||
- echo ""
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-#
|
||||
# open file?
|
||||
#
|
||||
|
||||
@@ -212,7 +193,7 @@
|
||||
if [ ! -z "$port" ] ; then
|
||||
args="$args -port $port"
|
||||
fi
|
||||
- eval "\"$jdkhome/bin/java\"" -classpath "\"${idehome}/modules/utilities.jar\"" $openfile_class $args "\"$openfile\""
|
||||
+ eval javavm -classpath "\"${idehome}/modules/utilities.jar\"" $openfile_class $args "\"$openfile\""
|
||||
rc=$?
|
||||
|
||||
if [ $rc -eq 0 -o $rc -eq 1 ] ; then
|
||||
@@ -267,7 +248,7 @@
|
||||
}
|
||||
|
||||
do_run_updater() {
|
||||
- eval "\"$jdkhome/bin/java\"" $thread_flag -classpath "\"${updatercp}\"" $jargs $updater_class
|
||||
+ eval javavm $thread_flag -classpath "\"${updatercp}\"" $jargs $updater_class
|
||||
}
|
||||
|
||||
look_for_pre_runs() {
|
||||
@@ -406,7 +387,7 @@
|
||||
openfile=""
|
||||
fi
|
||||
|
||||
- eval "\"${jdkhome}/bin/java\"" -Djdk.home="\"${jdkhome}\"" $thread_flag -classpath "\"$cp\"" \
|
||||
+ eval javavm -Djdk.home="\"${jdkhome}\"" $thread_flag -classpath "\"$cp\"" \
|
||||
-Dnetbeans.osenv="${nbenvfile}" \
|
||||
${openfile_prop} \
|
||||
$jargs $ide_class $args
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
PORTNAME= netbeans
|
||||
PORTVERSION= 3.4.1
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= java devel
|
||||
MASTER_SITES= # http://www.netbeans.org/download/release341/night/build200301202341/
|
||||
DISTNAME= NetBeansIDE-release341
|
||||
|
|
|
@ -12,56 +12,3 @@ $FreeBSD$
|
|||
*) args="$args \"$1\"" ;;
|
||||
esac
|
||||
shift
|
||||
@@ -182,25 +182,6 @@
|
||||
parse_args "$@"
|
||||
|
||||
#
|
||||
-# check JDK
|
||||
-#
|
||||
-
|
||||
-if [ -z "$jdkhome" ] ; then
|
||||
- echo "Cannot find JDK. Please set the JDK_HOME environment variable to point"
|
||||
- echo "to your JDK installation directory, or use the -jdkhome switch"
|
||||
- echo ""
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-if [ ! -x "${jdkhome}/bin/java" ] ; then
|
||||
- echo "Cannot find JDK at ${jdkhome}. Please set the JDK_HOME"
|
||||
- echo "environment variable to point to your JDK installation directory,"
|
||||
- echo "or use the -jdkhome switch"
|
||||
- echo ""
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-#
|
||||
# open file?
|
||||
#
|
||||
|
||||
@@ -212,7 +193,7 @@
|
||||
if [ ! -z "$port" ] ; then
|
||||
args="$args -port $port"
|
||||
fi
|
||||
- eval "\"$jdkhome/bin/java\"" -classpath "\"${idehome}/modules/utilities.jar\"" $openfile_class $args "\"$openfile\""
|
||||
+ eval javavm -classpath "\"${idehome}/modules/utilities.jar\"" $openfile_class $args "\"$openfile\""
|
||||
rc=$?
|
||||
|
||||
if [ $rc -eq 0 -o $rc -eq 1 ] ; then
|
||||
@@ -267,7 +248,7 @@
|
||||
}
|
||||
|
||||
do_run_updater() {
|
||||
- eval "\"$jdkhome/bin/java\"" $thread_flag -classpath "\"${updatercp}\"" $jargs $updater_class
|
||||
+ eval javavm $thread_flag -classpath "\"${updatercp}\"" $jargs $updater_class
|
||||
}
|
||||
|
||||
look_for_pre_runs() {
|
||||
@@ -406,7 +387,7 @@
|
||||
openfile=""
|
||||
fi
|
||||
|
||||
- eval "\"${jdkhome}/bin/java\"" -Djdk.home="\"${jdkhome}\"" $thread_flag -classpath "\"$cp\"" \
|
||||
+ eval javavm -Djdk.home="\"${jdkhome}\"" $thread_flag -classpath "\"$cp\"" \
|
||||
-Dnetbeans.osenv="${nbenvfile}" \
|
||||
${openfile_prop} \
|
||||
$jargs $ide_class $args
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
PORTNAME= netbeans
|
||||
PORTVERSION= 3.4.1
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= java devel
|
||||
MASTER_SITES= # http://www.netbeans.org/download/release341/night/build200301202341/
|
||||
DISTNAME= NetBeansIDE-release341
|
||||
|
|
|
@ -12,56 +12,3 @@ $FreeBSD$
|
|||
*) args="$args \"$1\"" ;;
|
||||
esac
|
||||
shift
|
||||
@@ -182,25 +182,6 @@
|
||||
parse_args "$@"
|
||||
|
||||
#
|
||||
-# check JDK
|
||||
-#
|
||||
-
|
||||
-if [ -z "$jdkhome" ] ; then
|
||||
- echo "Cannot find JDK. Please set the JDK_HOME environment variable to point"
|
||||
- echo "to your JDK installation directory, or use the -jdkhome switch"
|
||||
- echo ""
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-if [ ! -x "${jdkhome}/bin/java" ] ; then
|
||||
- echo "Cannot find JDK at ${jdkhome}. Please set the JDK_HOME"
|
||||
- echo "environment variable to point to your JDK installation directory,"
|
||||
- echo "or use the -jdkhome switch"
|
||||
- echo ""
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-#
|
||||
# open file?
|
||||
#
|
||||
|
||||
@@ -212,7 +193,7 @@
|
||||
if [ ! -z "$port" ] ; then
|
||||
args="$args -port $port"
|
||||
fi
|
||||
- eval "\"$jdkhome/bin/java\"" -classpath "\"${idehome}/modules/utilities.jar\"" $openfile_class $args "\"$openfile\""
|
||||
+ eval javavm -classpath "\"${idehome}/modules/utilities.jar\"" $openfile_class $args "\"$openfile\""
|
||||
rc=$?
|
||||
|
||||
if [ $rc -eq 0 -o $rc -eq 1 ] ; then
|
||||
@@ -267,7 +248,7 @@
|
||||
}
|
||||
|
||||
do_run_updater() {
|
||||
- eval "\"$jdkhome/bin/java\"" $thread_flag -classpath "\"${updatercp}\"" $jargs $updater_class
|
||||
+ eval javavm $thread_flag -classpath "\"${updatercp}\"" $jargs $updater_class
|
||||
}
|
||||
|
||||
look_for_pre_runs() {
|
||||
@@ -406,7 +387,7 @@
|
||||
openfile=""
|
||||
fi
|
||||
|
||||
- eval "\"${jdkhome}/bin/java\"" -Djdk.home="\"${jdkhome}\"" $thread_flag -classpath "\"$cp\"" \
|
||||
+ eval javavm -Djdk.home="\"${jdkhome}\"" $thread_flag -classpath "\"$cp\"" \
|
||||
-Dnetbeans.osenv="${nbenvfile}" \
|
||||
${openfile_prop} \
|
||||
$jargs $ide_class $args
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
PORTNAME= netbeans
|
||||
PORTVERSION= 3.4.1
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= java devel
|
||||
MASTER_SITES= # http://www.netbeans.org/download/release341/night/build200301202341/
|
||||
DISTNAME= NetBeansIDE-release341
|
||||
|
|
|
@ -12,56 +12,3 @@ $FreeBSD$
|
|||
*) args="$args \"$1\"" ;;
|
||||
esac
|
||||
shift
|
||||
@@ -182,25 +182,6 @@
|
||||
parse_args "$@"
|
||||
|
||||
#
|
||||
-# check JDK
|
||||
-#
|
||||
-
|
||||
-if [ -z "$jdkhome" ] ; then
|
||||
- echo "Cannot find JDK. Please set the JDK_HOME environment variable to point"
|
||||
- echo "to your JDK installation directory, or use the -jdkhome switch"
|
||||
- echo ""
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-if [ ! -x "${jdkhome}/bin/java" ] ; then
|
||||
- echo "Cannot find JDK at ${jdkhome}. Please set the JDK_HOME"
|
||||
- echo "environment variable to point to your JDK installation directory,"
|
||||
- echo "or use the -jdkhome switch"
|
||||
- echo ""
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-#
|
||||
# open file?
|
||||
#
|
||||
|
||||
@@ -212,7 +193,7 @@
|
||||
if [ ! -z "$port" ] ; then
|
||||
args="$args -port $port"
|
||||
fi
|
||||
- eval "\"$jdkhome/bin/java\"" -classpath "\"${idehome}/modules/utilities.jar\"" $openfile_class $args "\"$openfile\""
|
||||
+ eval javavm -classpath "\"${idehome}/modules/utilities.jar\"" $openfile_class $args "\"$openfile\""
|
||||
rc=$?
|
||||
|
||||
if [ $rc -eq 0 -o $rc -eq 1 ] ; then
|
||||
@@ -267,7 +248,7 @@
|
||||
}
|
||||
|
||||
do_run_updater() {
|
||||
- eval "\"$jdkhome/bin/java\"" $thread_flag -classpath "\"${updatercp}\"" $jargs $updater_class
|
||||
+ eval javavm $thread_flag -classpath "\"${updatercp}\"" $jargs $updater_class
|
||||
}
|
||||
|
||||
look_for_pre_runs() {
|
||||
@@ -406,7 +387,7 @@
|
||||
openfile=""
|
||||
fi
|
||||
|
||||
- eval "\"${jdkhome}/bin/java\"" -Djdk.home="\"${jdkhome}\"" $thread_flag -classpath "\"$cp\"" \
|
||||
+ eval javavm -Djdk.home="\"${jdkhome}\"" $thread_flag -classpath "\"$cp\"" \
|
||||
-Dnetbeans.osenv="${nbenvfile}" \
|
||||
${openfile_prop} \
|
||||
$jargs $ide_class $args
|
||||
|
|
Loading…
Reference in a new issue