aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorolgeni <olgeni@FreeBSD.org>2003-06-08 03:55:11 +0800
committerolgeni <olgeni@FreeBSD.org>2003-06-08 03:55:11 +0800
commitc492a0d9a77478860a7c1c2310b27a719851a9e8 (patch)
treeea908e16716f1d5ae2e0da355f2be94e7f127d5e /java
parent4c69c7db6c6f7cdb9ba15724f9c9d0a04414cdda (diff)
downloadfreebsd-ports-gnome-c492a0d9a77478860a7c1c2310b27a719851a9e8.tar.gz
freebsd-ports-gnome-c492a0d9a77478860a7c1c2310b27a719851a9e8.tar.zst
freebsd-ports-gnome-c492a0d9a77478860a7c1c2310b27a719851a9e8.zip
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).
Diffstat (limited to 'java')
-rw-r--r--java/netbeans/Makefile5
-rw-r--r--java/netbeans/files/bin_runide.sh.diff (renamed from java/netbeans/files/patch-bin_runide.sh)2
-rw-r--r--java/netbeans3/Makefile5
-rw-r--r--java/netbeans3/files/bin_runide.sh.diff (renamed from java/netbeans3/files/patch-bin_runide.sh)2
-rw-r--r--java/netbeans4/Makefile5
-rw-r--r--java/netbeans4/files/bin_runide.sh.diff (renamed from java/netbeans4/files/patch-bin_runide.sh)2
-rw-r--r--java/netbeans5/Makefile5
-rw-r--r--java/netbeans5/files/bin_runide.sh.diff (renamed from java/netbeans5/files/patch-bin_runide.sh)2
-rw-r--r--java/netbeans55/Makefile5
-rw-r--r--java/netbeans55/files/bin_runide.sh.diff14
-rw-r--r--java/netbeans55/files/patch-bin_runide.sh14
-rw-r--r--java/netbeans61/Makefile5
-rw-r--r--java/netbeans61/files/bin_runide.sh.diff14
-rw-r--r--java/netbeans61/files/patch-bin_runide.sh14
14 files changed, 62 insertions, 32 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
diff --git a/java/netbeans3/Makefile b/java/netbeans3/Makefile
index a9432727cf8c..0f163fbc8675 100644
--- a/java/netbeans3/Makefile
+++ b/java/netbeans3/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/netbeans3/files/patch-bin_runide.sh b/java/netbeans3/files/bin_runide.sh.diff
index aa73ffb31cbf..c31e2cb0a2b1 100644
--- a/java/netbeans3/files/patch-bin_runide.sh
+++ b/java/netbeans3/files/bin_runide.sh.diff
@@ -1,5 +1,5 @@
-$FreeBSD$
+$FreeBSD: /tmp/pcvs/ports/java/netbeans3/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
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/patch-bin_runide.sh b/java/netbeans4/files/bin_runide.sh.diff
index aa73ffb31cbf..f7d27f90cfc9 100644
--- a/java/netbeans4/files/patch-bin_runide.sh
+++ b/java/netbeans4/files/bin_runide.sh.diff
@@ -1,5 +1,5 @@
-$FreeBSD$
+$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
diff --git a/java/netbeans5/Makefile b/java/netbeans5/Makefile
index a9432727cf8c..0f163fbc8675 100644
--- a/java/netbeans5/Makefile
+++ b/java/netbeans5/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/netbeans5/files/patch-bin_runide.sh b/java/netbeans5/files/bin_runide.sh.diff
index aa73ffb31cbf..2ffe390cd62f 100644
--- a/java/netbeans5/files/patch-bin_runide.sh
+++ b/java/netbeans5/files/bin_runide.sh.diff
@@ -1,5 +1,5 @@
-$FreeBSD$
+$FreeBSD: /tmp/pcvs/ports/java/netbeans5/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
diff --git a/java/netbeans55/Makefile b/java/netbeans55/Makefile
index a9432727cf8c..0f163fbc8675 100644
--- a/java/netbeans55/Makefile
+++ b/java/netbeans55/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/netbeans55/files/bin_runide.sh.diff b/java/netbeans55/files/bin_runide.sh.diff
new file mode 100644
index 000000000000..8171d884c4f0
--- /dev/null
+++ b/java/netbeans55/files/bin_runide.sh.diff
@@ -0,0 +1,14 @@
+
+$FreeBSD: /tmp/pcvs/ports/java/netbeans55/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/netbeans55/files/patch-bin_runide.sh b/java/netbeans55/files/patch-bin_runide.sh
deleted file mode 100644
index aa73ffb31cbf..000000000000
--- a/java/netbeans55/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
diff --git a/java/netbeans61/Makefile b/java/netbeans61/Makefile
index a9432727cf8c..0f163fbc8675 100644
--- a/java/netbeans61/Makefile
+++ b/java/netbeans61/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/netbeans61/files/bin_runide.sh.diff b/java/netbeans61/files/bin_runide.sh.diff
new file mode 100644
index 000000000000..43c40d549eef
--- /dev/null
+++ b/java/netbeans61/files/bin_runide.sh.diff
@@ -0,0 +1,14 @@
+
+$FreeBSD: /tmp/pcvs/ports/java/netbeans61/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/netbeans61/files/patch-bin_runide.sh b/java/netbeans61/files/patch-bin_runide.sh
deleted file mode 100644
index aa73ffb31cbf..000000000000
--- a/java/netbeans61/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
generated by cgit (git 2.34.1) at 2025-01-20 05:43:53 +0800