sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

The NetBeans startup script should be patched on -CURRENT only.

Browse source 
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).
This commit is contained in:
Jimmy Olgeni 2003-06-07 19:55:11 +00:00
parent 5baf764cff
commit c0fded61b4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=82466
14 changed files with 62 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
java/netbeans/Makefile
View file

@ -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 IGNORE= You must manually fetch the source distribution (${DISTFILES}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
.endif .endif
.if ${OSVERSION} >= 500000
post-patch:
@${CAT} ${FILESDIR}/bin_runide.sh.diff | ${PATCH} ${WRKSRC}/bin/runide.sh
.endif
do-install: do-install:
@${MKDIR} ${PREFIX}/netbeans @${MKDIR} ${PREFIX}/netbeans
@${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans @${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans

2
java/netbeans/files/patch-bin_runide.sh → java/netbeans/files/bin_runide.sh.diff
View file

@ -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.orig Mon Jun 2 11:23:48 2003
+++ bin/runide.sh Mon Jun 2 11:26:50 2003 +++ bin/runide.sh Mon Jun 2 11:26:50 2003

5
java/netbeans3/Makefile
View file

@ -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 IGNORE= You must manually fetch the source distribution (${DISTFILES}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
.endif .endif
.if ${OSVERSION} >= 500000
post-patch:
@${CAT} ${FILESDIR}/bin_runide.sh.diff | ${PATCH} ${WRKSRC}/bin/runide.sh
.endif
do-install: do-install:
@${MKDIR} ${PREFIX}/netbeans @${MKDIR} ${PREFIX}/netbeans
@${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans @${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans

2
java/netbeans3/files/patch-bin_runide.sh → java/netbeans3/files/bin_runide.sh.diff
View file

@ -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.orig Mon Jun 2 11:23:48 2003
+++ bin/runide.sh Mon Jun 2 11:26:50 2003 +++ bin/runide.sh Mon Jun 2 11:26:50 2003

5
java/netbeans4/Makefile
View file

@ -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 IGNORE= You must manually fetch the source distribution (${DISTFILES}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
.endif .endif
.if ${OSVERSION} >= 500000
post-patch:
@${CAT} ${FILESDIR}/bin_runide.sh.diff | ${PATCH} ${WRKSRC}/bin/runide.sh
.endif
do-install: do-install:
@${MKDIR} ${PREFIX}/netbeans @${MKDIR} ${PREFIX}/netbeans
@${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans @${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans

2
java/netbeans4/files/patch-bin_runide.sh → java/netbeans4/files/bin_runide.sh.diff
View file

@ -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.orig Mon Jun 2 11:23:48 2003
+++ bin/runide.sh Mon Jun 2 11:26:50 2003 +++ bin/runide.sh Mon Jun 2 11:26:50 2003

5
java/netbeans5/Makefile
View file

@ -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 IGNORE= You must manually fetch the source distribution (${DISTFILES}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
.endif .endif
.if ${OSVERSION} >= 500000
post-patch:
@${CAT} ${FILESDIR}/bin_runide.sh.diff | ${PATCH} ${WRKSRC}/bin/runide.sh
.endif
do-install: do-install:
@${MKDIR} ${PREFIX}/netbeans @${MKDIR} ${PREFIX}/netbeans
@${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans @${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans

2
java/netbeans5/files/patch-bin_runide.sh → java/netbeans5/files/bin_runide.sh.diff
View file

@ -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.orig Mon Jun 2 11:23:48 2003
+++ bin/runide.sh Mon Jun 2 11:26:50 2003 +++ bin/runide.sh Mon Jun 2 11:26:50 2003

5
java/netbeans55/Makefile
View file

@ -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 IGNORE= You must manually fetch the source distribution (${DISTFILES}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
.endif .endif
.if ${OSVERSION} >= 500000
post-patch:
@${CAT} ${FILESDIR}/bin_runide.sh.diff | ${PATCH} ${WRKSRC}/bin/runide.sh
.endif
do-install: do-install:
@${MKDIR} ${PREFIX}/netbeans @${MKDIR} ${PREFIX}/netbeans
@${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans @${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans

14
java/netbeans55/files/bin_runide.sh.diff Normal file
View file

@ -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

14
java/netbeans55/files/patch-bin_runide.sh
View file

@ -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

5
java/netbeans61/Makefile
View file

@ -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 IGNORE= You must manually fetch the source distribution (${DISTFILES}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
.endif .endif
.if ${OSVERSION} >= 500000
post-patch:
@${CAT} ${FILESDIR}/bin_runide.sh.diff | ${PATCH} ${WRKSRC}/bin/runide.sh
.endif
do-install: do-install:
@${MKDIR} ${PREFIX}/netbeans @${MKDIR} ${PREFIX}/netbeans
@${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans @${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans

14
java/netbeans61/files/bin_runide.sh.diff Normal file
View file

@ -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

14
java/netbeans61/files/patch-bin_runide.sh
View file

@ -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