freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to 6.7

Browse Source
This commit is contained in:
Pietro Cerutti
2009-07-02 19:23:07 +00:00
parent 3f0791092e
commit 817138d86f
5 changed files with 8876 additions and 9448 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/netbeans/Makefile
+12 -12
View File
@@ -6,12 +6,12 @@
#
PORTNAME= netbeans
PORTVERSION= 6.5
PORTREVISION= 2
PORTVERSION= 6.7
CATEGORIES= java devel
MASTER_SITES= http://download.netbeans.org/netbeans/6.5/final/zip/ \
http://dlc.sun.com.edgesuite.net/netbeans/6.5/final/zip/
DISTNAME= netbeans-${PORTVERSION}-200811100001-ml
MASTER_SITES= http://www.mirrorservice.org/sites/download.netbeans.org/6.7/zip/ \
http://download.netbeans.org/netbeans/6.7/final/zip/ \
http://dlc.sun.com.edgesuite.net/netbeans/6.7/final/zip/
DISTNAME= netbeans-${PORTVERSION}-200906241340-ml
MAINTAINER= gahr@FreeBSD.org
COMMENT= A full-featured integrated environment for Java
@@ -27,14 +27,14 @@ post-patch:
@${REINPLACE_CMD} -i "" -e '19s|#||;19s|/path/to/jdk|${JAVA_HOME}|' \
${WRKSRC}/etc/netbeans.conf
@${REINPLACE_CMD} -i "" -e 's|%%GCONFTOOL2%%|${LOCALBASE}/bin/gconftool-2|g; \
s|%%GREP%%|${GREP}|g;s|%%SED%%|${SED}|g;s|%%AWK%%|${AWK}|g' \
${WRKSRC}/platform9/lib/nbexec && \
${RM} ${WRKSRC}/platform9/lib/nbexec.orig
s|%%GREP%%|${GREP}|g;s|%%SED%%|${SED}|g;s|%%FGREP%%|`which fgrep`|g;s|%%AWK%%|${AWK}|g' \
${WRKSRC}/platform10/lib/nbexec && \
${RM} ${WRKSRC}/platform10/lib/nbexec.orig
do-install:
@${MKDIR} ${PREFIX}/netbeans65
@(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${PREFIX}/netbeans65)
@${CHMOD} ${BINMODE} ${PREFIX}/netbeans65/bin/netbeans
@${LN} -sf ${PREFIX}/netbeans65/bin/netbeans ${PREFIX}/bin/netbeans65
@${MKDIR} ${PREFIX}/netbeans67
@(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${PREFIX}/netbeans67)
@${CHMOD} ${BINMODE} ${PREFIX}/netbeans67/bin/netbeans
@${LN} -sf ${PREFIX}/netbeans67/bin/netbeans ${PREFIX}/bin/netbeans67
.include <bsd.port.mk>
java/netbeans/distinfo
+3 -3
View File
@@ -1,3 +1,3 @@
MD5 (netbeans-6.5-200811100001-ml.zip) = 9ae35f7e434f031bb52f41e50edd143d
SHA256 (netbeans-6.5-200811100001-ml.zip) = 24d1236c59d3c359729452afba0f749093ce856dd04e695156a1831fbd021bda
SIZE (netbeans-6.5-200811100001-ml.zip) = 220740750
MD5 (netbeans-6.7-200906241340-ml.zip) = 50c9fbd22048a43413aa01a9c08a2ac1
SHA256 (netbeans-6.7-200906241340-ml.zip) = c95ee3bb2ade942447fc3d5a509930234829f9d941f79797f08c4baf5cffd73b
SIZE (netbeans-6.7-200906241340-ml.zip) = 211164726
java/netbeans/files/patch-platform10-lib_nbexec
+90
View File
@@ -0,0 +1,90 @@
--- platform10/lib/nbexec.orig 2009-07-02 21:02:40.000000000 +0200
+++ platform10/lib/nbexec 2009-07-02 21:06:25.000000000 +0200
@@ -150,15 +150,15 @@
Darwin*)
jdkhome="/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home"
java_bin=`which java 2>&1`
- if [ $? -ne 0 ] || [ -n "`echo \"$java_bin\" | grep \"no java in\"`" ] ; then
+ if [ $? -ne 0 ] || [ -n "`echo \"$java_bin\" | %%GREP%% \"no java in\"`" ] ; then
# no java in path... strange
java_bin=/usr/bin/java
fi
if [ -f "$java_bin" ] ; then
java_version=`"$java_bin" -fullversion 2>&1`
- if [ $? -eq 0 ] && [ -n "`echo \"$java_version\" | grep 1.6.0`" ] ; then
+ if [ $? -eq 0 ] && [ -n "`echo \"$java_version\" | %%GREP%% 1.6.0`" ] ; then
# don`t use Developer Preview versions
- if [ -z "`echo \"$java_version\" | grep \"1.6.0_b\|1.6.0-b\|1.6.0_01\|1.6.0_04\|-dp\"`" ] ; then
+ if [ -z "`echo \"$java_version\" | %%GREP%% \"1.6.0_b\|1.6.0-b\|1.6.0_01\|1.6.0_04\|-dp\"`" ] ; then
if [ -f "/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home/bin/java" ] ; then
jdkhome="/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home"
elif [ -f "/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home/bin/java" ] ; then
@@ -191,7 +191,7 @@
# if heap dump on OOME is supported enable it
if "${jdkhome}/bin/java" -XX:+HeapDumpOnOutOfMemoryError > /dev/null ; then
jargs="$jargs -XX:+HeapDumpOnOutOfMemoryError"
- if ! echo $jargs | grep -- "-XX:HeapDumpPath=" > /dev/null ; then
+ if ! echo $jargs | %%GREP%% -- "-XX:HeapDumpPath=" > /dev/null ; then
jargs="$jargs -XX:HeapDumpPath=\"${userdir}/var/log/heapdump.hprof\""
fi
fi
@@ -210,7 +210,7 @@
if [ "`echo "${dir}"/*.$ex`" != "${dir}/*.$ex" ] ; then
for x in "${dir}"/*.$ex ; do
subx=`basename "$x"`
- if echo "$paths" | fgrep -v "$subpath$subx" > /dev/null ; then
+ if echo "$paths" | %%FGREP%% -v "$subpath$subx" > /dev/null ; then
if [ ! -z "$cp" ] ; then cp="$cp:" ; fi
cp="$cp$x"
if [ ! -z "$paths" ] ; then paths="$paths:" ; fi
@@ -352,7 +352,7 @@
}
detect_gnome_proxy () {
- gconftool=/usr/bin/gconftool-2
+ gconftool=%%GCONFTOOL2%%
if [ -x $gconftool ] ; then
proxy_mode=`$gconftool --get /system/proxy/mode 2>/dev/null`
if [ "$proxy_mode" = "manual" ] ; then
@@ -384,18 +384,18 @@
detect_kde_proxy () {
kioslaverc="${HOME}/.kde/share/config/kioslaverc"
if [ -f $kioslaverc ] ; then
- if /bin/grep -q 'ProxyType=1' "$kioslaverc" ; then
- http_proxy_tmp=`/bin/grep 'httpProxy=http://' "$kioslaverc"`
+ if %%GREP%% -q 'ProxyType=1' "$kioslaverc" ; then
+ http_proxy_tmp=`%%GREP%% 'httpProxy=http://' "$kioslaverc"`
if [ $? ] ; then
http_proxy_tmp=`echo $http_proxy_tmp | /bin/sed 's/httpProxy=http:\/\///'`
return 0
fi
- http_non_proxy_hosts=`/bin/grep 'NoProxyFor=' "$kioslaverc"`
+ http_non_proxy_hosts=`%%GREP%% 'NoProxyFor=' "$kioslaverc"`
if [ $? ] ; then
http_non_proxy_hosts=`echo $http_non_proxy_hosts | /bin/sed 's/NoProxyFor=//'`
fi
else
- if /bin/grep -q 'ProxyType=0' "$kioslaverc" ; then
+ if %%GREP%% -q 'ProxyType=0' "$kioslaverc" ; then
detect_system_proxy
if [ -z "$http_proxy_tmp" ]; then
http_proxy_tmp="DIRECT"
@@ -419,14 +419,14 @@
close
EOF
- if /usr/bin/grep -q "ProxyAuto.*: *1" ${scutil_out} >/dev/null ; then
+ if %%GREP%% -q "ProxyAuto.*: *1" ${scutil_out} >/dev/null ; then
rm ${scutil_out}
return 1
fi
- if /usr/bin/grep -q "HTTPEnable *: *1" ${scutil_out} ; then
- http_proxy_host=`/usr/bin/grep HTTPProxy ${scutil_out} | /usr/bin/awk '{print $3}'`
- http_proxy_port=`/usr/bin/grep HTTPPort ${scutil_out} | /usr/bin/awk '{print $3} '`
+ if %%GREP%% -q "HTTPEnable *: *1" ${scutil_out} ; then
+ http_proxy_host=`%%GREP%% HTTPProxy ${scutil_out} | %%AWK%% '{print $3}'`
+ http_proxy_port=`%%GREP%% HTTPPort ${scutil_out} | %%AWK%% '{print $4} '`
http_proxy_tmp=$http_proxy_host:$http_proxy_port
rm ${scutil_out}
return 0
java/netbeans/files/patch-platform9-lib_nbexec
-55
View File
@@ -1,55 +0,0 @@
--- platform9/lib/nbexec.orig 2008-12-15 14:20:13.000000000 +0100
+++ platform9/lib/nbexec 2008-12-15 14:29:44.000000000 +0100
@@ -330,7 +330,7 @@
}
detect_gnome_proxy () {
- gconftool=/usr/bin/gconftool-2
+ gconftool=%%GCONFTOOL2%%
if [ -x $gconftool ] ; then
proxy_mode=`$gconftool --get /system/proxy/mode 2>/dev/null`
if [ "$proxy_mode" = "manual" ] ; then
@@ -362,18 +362,18 @@
detect_kde_proxy () {
kioslaverc="${HOME}/.kde/share/config/kioslaverc"
if [ -f $kioslaverc ] ; then
- if /bin/grep -q 'ProxyType=1' "$kioslaverc" ; then
- http_proxy_tmp=`/bin/grep 'httpProxy=http://' "$kioslaverc"`
+ if %%GREP%% -q 'ProxyType=1' "$kioslaverc" ; then
+ http_proxy_tmp=`%%GREP%% 'httpProxy=http://' "$kioslaverc"`
if [ $? ] ; then
- http_proxy_tmp=`echo $http_proxy_tmp | /bin/sed 's/httpProxy=http:\/\///'`
+ http_proxy_tmp=`echo $http_proxy_tmp | %%SED%% 's/httpProxy=http:\/\///'`
return 0
fi
- http_non_proxy_hosts=`/bin/grep 'NoProxyFor=' "$kioslaverc"`
+ http_non_proxy_hosts=`%%GREP%% 'NoProxyFor=' "$kioslaverc"`
if [ $? ] ; then
- http_non_proxy_hosts=`echo $http_non_proxy_hosts | /bin/sed 's/NoProxyFor=//'`
+ http_non_proxy_hosts=`echo $http_non_proxy_hosts | %%SED%% 's/NoProxyFor=//'`
fi
else
- if /bin/grep -q 'ProxyType=0' "$kioslaverc" ; then
+ if %%GREP%% -q 'ProxyType=0' "$kioslaverc" ; then
detect_system_proxy
if [ -z "$http_proxy_tmp" ]; then
http_proxy_tmp="DIRECT"
@@ -397,14 +397,14 @@
close
EOF
- if /usr/bin/grep -q "ProxyAuto.*: *1" ${scutil_out} >/dev/null ; then
+ if %%GREP%% -q "ProxyAuto.*: *1" ${scutil_out} >/dev/null ; then
rm ${scutil_out}
return 1
fi
- if /usr/bin/grep -q "HTTPEnable *: *1" ${scutil_out} ; then
- http_proxy_host=`/usr/bin/grep HTTPProxy ${scutil_out} | /usr/bin/awk '{print $3}'`
- http_proxy_port=`/usr/bin/grep HTTPPort ${scutil_out} | /usr/bin/awk '{print $3} '`
+ if %%GREP%% -q "HTTPEnable *: *1" ${scutil_out} ; then
+ http_proxy_host=`%%GREP%% HTTPProxy ${scutil_out} | %%AWK%% '{print $3}'`
+ http_proxy_port=`%%GREP%% HTTPPort ${scutil_out} | %%AWK%% '{print $3} '`
http_proxy_tmp=$http_proxy_host:$http_proxy_port
rm ${scutil_out}
return 0
java/netbeans/pkg-plist
+8771 -9378
View File
File diff suppressed because it is too large Load Diff