6 files changed, 24 insertions, 26 deletions

diff --git a/java/netbeans/Makefile b/java/netbeans/Makefile
index f1f1bec7866e..f1b35aa66e7a 100644
--- a/java/netbeans/Makefile
+++ b/java/netbeans/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	netbeans
-PORTVERSION=	6.0.1
+PORTVERSION=	6.1
 CATEGORIES=	java devel
-MASTER_SITES=	http://download.netbeans.org/netbeans/6.0/final/zip/
-
-DISTNAME=	netbeans-${PORTVERSION}-200801291616-ml
+MASTER_SITES=	http://download.netbeans.org/netbeans/6.1/final/zip/
+DISTNAME=	netbeans-${PORTVERSION}-200804211638
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	A full-featured integrated environment for Java
@@ -30,7 +29,7 @@ post-patch:
 	@${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
diff --git a/java/netbeans/distinfo b/java/netbeans/distinfo
index 159adcf995d9..61cd264abbca 100644
--- a/java/netbeans/distinfo
+++ b/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
diff --git a/java/netbeans/files/patch-platform7_lib_nbexec b/java/netbeans/files/patch-platform8_lib_nbexec
index 2c73cee9eabc..1a60b4a90ae2 100644
--- a/java/netbeans/files/patch-platform7_lib_nbexec
+++ b/java/netbeans/files/patch-platform8_lib_nbexec
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- platform7/lib/nbexec.orig
-+++ platform7/lib/nbexec
-@@ -253,7 +253,7 @@
+--- platform8/lib/nbexec.orig
++++ platform8/lib/nbexec
+@@ -270,7 +270,7 @@
  # detect system http proxy setting
  
  detect_gnome_proxy () {
@@ -12,7 +12,7 @@ $FreeBSD$
      if [ -x  $gconftool ] ; then
          proxy_mode=`$gconftool --get /system/proxy/mode 2>/dev/null`
          if [ "$proxy_mode" = "manual" ] ; then
-@@ -282,18 +282,18 @@
+@@ -299,18 +299,18 @@
  detect_kde_proxy () {
      kioslaverc="${HOME}/.kde/share/config/kioslaverc"
      if [ -f $kioslaverc ] ; then
@@ -35,7 +35,7 @@ $FreeBSD$
                  http_proxy_tmp="DIRECT"
                  return 0
              fi
-@@ -314,14 +314,14 @@
+@@ -331,14 +331,14 @@
  close
  EOF
  
diff --git a/java/netbeans61/Makefile b/java/netbeans61/Makefile
index f1f1bec7866e..f1b35aa66e7a 100644
--- a/java/netbeans61/Makefile
+++ b/java/netbeans61/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	netbeans
-PORTVERSION=	6.0.1
+PORTVERSION=	6.1
 CATEGORIES=	java devel
-MASTER_SITES=	http://download.netbeans.org/netbeans/6.0/final/zip/
-
-DISTNAME=	netbeans-${PORTVERSION}-200801291616-ml
+MASTER_SITES=	http://download.netbeans.org/netbeans/6.1/final/zip/
+DISTNAME=	netbeans-${PORTVERSION}-200804211638
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	A full-featured integrated environment for Java
@@ -30,7 +29,7 @@ post-patch:
 	@${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
diff --git a/java/netbeans61/distinfo b/java/netbeans61/distinfo
index 159adcf995d9..61cd264abbca 100644
--- a/java/netbeans61/distinfo
+++ b/java/netbeans61/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
diff --git a/java/netbeans61/files/patch-platform7_lib_nbexec b/java/netbeans61/files/patch-platform8_lib_nbexec
index 2c73cee9eabc..1a60b4a90ae2 100644
--- a/java/netbeans61/files/patch-platform7_lib_nbexec
+++ b/java/netbeans61/files/patch-platform8_lib_nbexec
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- platform7/lib/nbexec.orig
-+++ platform7/lib/nbexec
-@@ -253,7 +253,7 @@
+--- platform8/lib/nbexec.orig
++++ platform8/lib/nbexec
+@@ -270,7 +270,7 @@
  # detect system http proxy setting
  
  detect_gnome_proxy () {
@@ -12,7 +12,7 @@ $FreeBSD$
      if [ -x  $gconftool ] ; then
          proxy_mode=`$gconftool --get /system/proxy/mode 2>/dev/null`
          if [ "$proxy_mode" = "manual" ] ; then
-@@ -282,18 +282,18 @@
+@@ -299,18 +299,18 @@
  detect_kde_proxy () {
      kioslaverc="${HOME}/.kde/share/config/kioslaverc"
      if [ -f $kioslaverc ] ; then
@@ -35,7 +35,7 @@ $FreeBSD$
                  http_proxy_tmp="DIRECT"
                  return 0
              fi
-@@ -314,14 +314,14 @@
+@@ -331,14 +331,14 @@
  close
  EOF