From c0fded61b439cc0a5df3785ef6d01fb087f30b11 Mon Sep 17 00:00:00 2001
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Sat, 7 Jun 2003 19:55:11 +0000
Subject: The NetBeans startup script should be patched on -CURRENT only.

The -CURRENT /bin/expr command may get confused when matching regexps
against strings that begin with "-", because they are interpreted as
command flags.

Using "--" as the first flag solves this, but it will in turn confuse
-STABLE expr (syntax error), so it looks like there's no common way to do
it (that I can think of).
---
 java/netbeans4/Makefile                  |  5 +++++
 java/netbeans4/files/bin_runide.sh.diff  | 14 ++++++++++++++
 java/netbeans4/files/patch-bin_runide.sh | 14 --------------
 3 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 java/netbeans4/files/bin_runide.sh.diff
 delete mode 100644 java/netbeans4/files/patch-bin_runide.sh

(limited to 'java/netbeans4')

diff --git a/java/netbeans4/Makefile b/java/netbeans4/Makefile
index a9432727cf8c..0f163fbc8675 100644
--- a/java/netbeans4/Makefile
+++ b/java/netbeans4/Makefile
@@ -30,6 +30,11 @@ DOWNLOAD_URL?=	http://www.netbeans.org/download/dev/daily/build200306020100/plat
 IGNORE=	You must manually fetch the source distribution (${DISTFILES}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
 
+.if ${OSVERSION} >= 500000
+post-patch:
+		@${CAT} ${FILESDIR}/bin_runide.sh.diff | ${PATCH} ${WRKSRC}/bin/runide.sh
+.endif
+
 do-install:
 		@${MKDIR} ${PREFIX}/netbeans
 		@${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans
diff --git a/java/netbeans4/files/bin_runide.sh.diff b/java/netbeans4/files/bin_runide.sh.diff
new file mode 100644
index 000000000000..f7d27f90cfc9
--- /dev/null
+++ b/java/netbeans4/files/bin_runide.sh.diff
@@ -0,0 +1,14 @@
+
+$FreeBSD: /tmp/pcvs/ports/java/netbeans4/files/Attic/bin_runide.sh.diff,v 1.1 2003-06-07 19:55:11 olgeni Exp $
+
+--- bin/runide.sh.orig	Mon Jun  2 11:23:48 2003
++++ bin/runide.sh	Mon Jun  2 11:26:50 2003
+@@ -157,7 +157,7 @@
+         
+         -hotspot|-client|-server|-classic|-native|-green) thread_flag=$1;;
+         -J-hotspot|-J-client|-J-server|-J-classic|-J-native|-J-green) thread_flag=`expr $1 : '-J\(.*\)'`;;
+-        -J*) jopt=`expr "$1" : '-J\(.*\)'`; jargs="$jargs \"$jopt\"";;
++        -J*) jopt=`expr -- "$1" : '-J\(.*\)'`; jargs="$jargs \"$jopt\"";;
+         *) args="$args \"$1\"" ;;
+     esac
+     shift
diff --git a/java/netbeans4/files/patch-bin_runide.sh b/java/netbeans4/files/patch-bin_runide.sh
deleted file mode 100644
index aa73ffb31cbf..000000000000
--- a/java/netbeans4/files/patch-bin_runide.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- bin/runide.sh.orig	Mon Jun  2 11:23:48 2003
-+++ bin/runide.sh	Mon Jun  2 11:26:50 2003
-@@ -157,7 +157,7 @@
-         
-         -hotspot|-client|-server|-classic|-native|-green) thread_flag=$1;;
-         -J-hotspot|-J-client|-J-server|-J-classic|-J-native|-J-green) thread_flag=`expr $1 : '-J\(.*\)'`;;
--        -J*) jopt=`expr "$1" : '-J\(.*\)'`; jargs="$jargs \"$jopt\"";;
-+        -J*) jopt=`expr -- "$1" : '-J\(.*\)'`; jargs="$jargs \"$jopt\"";;
-         *) args="$args \"$1\"" ;;
-     esac
-     shift
-- 
cgit v1.2.3