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).

2 files changed, 6 insertions, 1 deletions

diff --git a/java/netbeans/Makefile b/java/netbeans/Makefile
index a9432727cf8c..0f163fbc8675 100644
--- a/java/netbeans/Makefile
+++ b/java/netbeans/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/netbeans/files/patch-bin_runide.sh b/java/netbeans/files/bin_runide.sh.diff
index aa73ffb31cbf..80024491e826 100644
--- a/java/netbeans/files/patch-bin_runide.sh
+++ b/java/netbeans/files/bin_runide.sh.diff
@@ -1,5 +1,5 @@
 
-$FreeBSD$
+$FreeBSD: /tmp/pcvs/ports/java/netbeans/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