[Midnightbsd-cvs] mports: java/netbeans: Netbeans 6.1
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Jun 9 20:47:40 EDT 2008
Log Message:
-----------
Netbeans 6.1
Modified Files:
--------------
mports/java/netbeans:
Makefile (r1.2 -> r1.3)
distinfo (r1.2 -> r1.3)
Added Files:
-----------
mports/java/netbeans/files:
patch-platform8_lib_nbexec (r1.1)
Removed Files:
-------------
mports/java/netbeans/files:
patch-platform7_lib_nbexec
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/java/netbeans/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L java/netbeans/Makefile -L java/netbeans/Makefile -u -r1.2 -r1.3
--- java/netbeans/Makefile
+++ java/netbeans/Makefile
@@ -7,13 +7,12 @@
#
PORTNAME= netbeans
-PORTVERSION= 6.0.1
+PORTVERSION= 6.1
CATEGORIES= java devel
-MASTER_SITES= http://download.netbeans.org/netbeans/6.0/final/zip/
+MASTER_SITES= http://download.netbeans.org/netbeans/6.1/final/zip/
+DISTNAME= netbeans-${PORTVERSION}-200804211638
-DISTNAME= netbeans-${PORTVERSION}-200801291616-ml
-
-MAINTAINER= olgeni at FreeBSD.org
+MAINTAINER= ports at MidnightBSD.org
COMMENT= A full-featured integrated environment for Java
LICENSE= agg
@@ -32,7 +31,7 @@
@${RM} ${WRKSRC}/etc/netbeans.conf.orig
@${REINPLACE_CMD} -e "s@%%GREP%%@${GREP}@" \
-e "s@%%GCONFTOOL%%@${LOCALBASE}/bin/gconftool-2@" \
- ${WRKSRC}/platform7/lib/nbexec
+ ${WRKSRC}/platform8/lib/nbexec
do-configure:
@${REINPLACE_CMD} 's|%%JAVA_HOME%%|${JAVA_HOME}|' ${WRKSRC}/etc/netbeans.conf
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/java/netbeans/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L java/netbeans/distinfo -L java/netbeans/distinfo -u -r1.2 -r1.3
--- java/netbeans/distinfo
+++ java/netbeans/distinfo
@@ -1,3 +1,3 @@
-MD5 (netbeans-6.0.1-200801291616-ml.zip) = 24771d9cbe631b3d191a03be0fde03dd
-SHA256 (netbeans-6.0.1-200801291616-ml.zip) = 40ed194dd4fafa4a3c2b5129eaaa4b9d45d0fcfe16316af725df032a88c5c06c
-SIZE (netbeans-6.0.1-200801291616-ml.zip) = 168164605
+MD5 (netbeans-6.1-200804211638.zip) = 614d18b34f20ced8d69f4dc1e046e6e3
+SHA256 (netbeans-6.1-200804211638.zip) = 740ebaf809cb95ddd409ae83bc8a247595e8852fcfd780efc6c17f9cb08570e1
+SIZE (netbeans-6.1-200804211638.zip) = 164020872
--- /dev/null
+++ java/netbeans/files/patch-platform8_lib_nbexec
@@ -0,0 +1,56 @@
+
+$FreeBSD: ports/java/netbeans/files/patch-platform8_lib_nbexec,v 1.1 2008/05/14 21:16:57 olgeni Exp $
+
+--- platform8/lib/nbexec.orig
++++ platform8/lib/nbexec
+@@ -270,7 +270,7 @@
+ # detect system http proxy setting
+
+ detect_gnome_proxy () {
+- gconftool=/usr/bin/gconftool-2
++ gconftool=%%GCONFTOOL%%
+ if [ -x $gconftool ] ; then
+ proxy_mode=`$gconftool --get /system/proxy/mode 2>/dev/null`
+ if [ "$proxy_mode" = "manual" ] ; then
+@@ -299,18 +299,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
+ http_proxy_tmp="DIRECT"
+ return 0
+ fi
+@@ -331,14 +331,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} | /usr/bin/awk '{print $3}'`
++ http_proxy_port=`%%GREP%% HTTPPort ${scutil_out} | /usr/bin/awk '{print $3} '`
+ http_proxy_tmp=$http_proxy_host:$http_proxy_port
+ rm ${scutil_out}
+ return 0
--- java/netbeans/files/patch-platform7_lib_nbexec
+++ /dev/null
@@ -1,56 +0,0 @@
-$MidnightBSD: mports/java/netbeans/files/patch-platform7_lib_nbexec,v 1.1 2008/05/01 06:33:27 laffer1 Exp $
-$FreeBSD: ports/java/netbeans/files/patch-platform7_lib_nbexec,v 1.1 2007/12/19 20:33:23 olgeni Exp $
-
---- platform7/lib/nbexec.orig
-+++ platform7/lib/nbexec
-@@ -253,7 +253,7 @@
- # detect system http proxy setting
-
- detect_gnome_proxy () {
-- gconftool=/usr/bin/gconftool-2
-+ gconftool=%%GCONFTOOL%%
- if [ -x $gconftool ] ; then
- proxy_mode=`$gconftool --get /system/proxy/mode 2>/dev/null`
- if [ "$proxy_mode" = "manual" ] ; then
-@@ -282,18 +282,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
- http_proxy_tmp="DIRECT"
- return 0
- fi
-@@ -314,14 +314,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} | /usr/bin/awk '{print $3}'`
-+ http_proxy_port=`%%GREP%% HTTPPort ${scutil_out} | /usr/bin/awk '{print $3} '`
- http_proxy_tmp=$http_proxy_host:$http_proxy_port
- rm ${scutil_out}
- return 0
More information about the Midnightbsd-cvs
mailing list