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>

12 files changed, 6 insertions, 318 deletions

diff --git a/java/netbeans/Makefile b/java/netbeans/Makefile
index fa06c10ba01d..a9432727cf8c 100644
--- a/java/netbeans/Makefile
+++ b/java/netbeans/Makefile
@@ -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
diff --git a/java/netbeans/files/patch-bin_runide.sh b/java/netbeans/files/patch-bin_runide.sh
index 7845dbfa346b..aa73ffb31cbf 100644
--- a/java/netbeans/files/patch-bin_runide.sh
+++ b/java/netbeans/files/patch-bin_runide.sh
@@ -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
diff --git a/java/netbeans3/Makefile b/java/netbeans3/Makefile
index fa06c10ba01d..a9432727cf8c 100644
--- a/java/netbeans3/Makefile
+++ b/java/netbeans3/Makefile
@@ -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
diff --git a/java/netbeans3/files/patch-bin_runide.sh b/java/netbeans3/files/patch-bin_runide.sh
index 7845dbfa346b..aa73ffb31cbf 100644
--- a/java/netbeans3/files/patch-bin_runide.sh
+++ b/java/netbeans3/files/patch-bin_runide.sh
@@ -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
diff --git a/java/netbeans4/Makefile b/java/netbeans4/Makefile
index fa06c10ba01d..a9432727cf8c 100644
--- a/java/netbeans4/Makefile
+++ b/java/netbeans4/Makefile
@@ -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
diff --git a/java/netbeans4/files/patch-bin_runide.sh b/java/netbeans4/files/patch-bin_runide.sh
index 7845dbfa346b..aa73ffb31cbf 100644
--- a/java/netbeans4/files/patch-bin_runide.sh
+++ b/java/netbeans4/files/patch-bin_runide.sh
@@ -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
diff --git a/java/netbeans5/Makefile b/java/netbeans5/Makefile
index fa06c10ba01d..a9432727cf8c 100644
--- a/java/netbeans5/Makefile
+++ b/java/netbeans5/Makefile
@@ -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
diff --git a/java/netbeans5/files/patch-bin_runide.sh b/java/netbeans5/files/patch-bin_runide.sh
index 7845dbfa346b..aa73ffb31cbf 100644
--- a/java/netbeans5/files/patch-bin_runide.sh
+++ b/java/netbeans5/files/patch-bin_runide.sh
@@ -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
diff --git a/java/netbeans55/Makefile b/java/netbeans55/Makefile
index fa06c10ba01d..a9432727cf8c 100644
--- a/java/netbeans55/Makefile
+++ b/java/netbeans55/Makefile
@@ -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
diff --git a/java/netbeans55/files/patch-bin_runide.sh b/java/netbeans55/files/patch-bin_runide.sh
index 7845dbfa346b..aa73ffb31cbf 100644
--- a/java/netbeans55/files/patch-bin_runide.sh
+++ b/java/netbeans55/files/patch-bin_runide.sh
@@ -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
diff --git a/java/netbeans61/Makefile b/java/netbeans61/Makefile
index fa06c10ba01d..a9432727cf8c 100644
--- a/java/netbeans61/Makefile
+++ b/java/netbeans61/Makefile
@@ -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
diff --git a/java/netbeans61/files/patch-bin_runide.sh b/java/netbeans61/files/patch-bin_runide.sh
index 7845dbfa346b..aa73ffb31cbf 100644
--- a/java/netbeans61/files/patch-bin_runide.sh
+++ b/java/netbeans61/files/patch-bin_runide.sh
@@ -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