4 files changed, 20 insertions, 17 deletions
diff --git a/development/netbeans/README b/development/netbeans/README
index 7b48d99f22..5b22f0b1aa 100644
--- a/development/netbeans/README
+++ b/development/netbeans/README
@@ -17,5 +17,3 @@ NOTES:
 	/opt/netbeans/etc/netbeans.conf
 
 GlassFish and Apache Tomcat are not available in this package.
-
-Also note that this is not available for x86_64.
diff --git a/development/netbeans/netbeans.SlackBuild b/development/netbeans/netbeans.SlackBuild
index 02cb71f9ff..14b40efdf3 100644
--- a/development/netbeans/netbeans.SlackBuild
+++ b/development/netbeans/netbeans.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Slackware build script for netbeans
+# Slackware build script for Netbeans IDE
 
 # Copyright (c) 2008-2009, Antonio Hernández Blas <hba.nihilismus@gmail.com>
 # All rights reserved.
@@ -23,16 +23,19 @@
 
 # This script is just a binary repackaging.
 
+# Updated by Andre Barboza <bmg.andre@gmail.com>
+
 PRGNAM=netbeans
 VERSION=6.9.1
 DATE="201007282301"
-ARCH=i586
+ARCH=noarch
+BUNDLE=
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-${PRGNAM}${BUNDLE}
 OUTPUT=${OUTPUT:-/tmp}
 
 set -e
@@ -40,7 +43,7 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG/opt $OUTPUT
 cd $PKG/opt
-unzip -o $CWD/$PRGNAM-$VERSION-$DATE-ml.zip
+unzip -o $CWD/$PRGNAM-$VERSION-$DATE-ml${BUNDLE}.zip
 chown -R root:root .
 
 find . \
@@ -49,6 +52,8 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+test $PRGNAM != ${PRGNAM}${BUNDLE} && mv $PRGNAM ${PRGNAM}${BUNDLE} && PRGNAM=${PRGNAM}${BUNDLE}
+
 # Add netbeans to KDE/GNOME/XFCE menu
 install -D -m 0644 $CWD/$PRGNAM.desktop \
   $PKG/usr/share/applications/$PRGNAM.desktop
@@ -58,12 +63,12 @@ install -D -m 0644 $CWD/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 # Add an script to call netbeans from /usr/bin.
 mkdir -p $PKG/usr/bin
-cat <<- EOF > $PKG/usr/bin/netbeans
+cat <<- EOF > $PKG/usr/bin/$PRGNAM
 #!/bin/sh
 cd \$HOME
-/opt/netbeans/bin/netbeans \$@
+/opt/$PRGNAM/bin/netbeans \$@
 EOF
-chmod 0755 $PKG/usr/bin/netbeans
+chmod 0755 $PKG/usr/bin/$PRGNAM
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/development/netbeans/netbeans.desktop b/development/netbeans/netbeans.desktop
index 5353a1e125..af544e7621 100644
--- a/development/netbeans/netbeans.desktop
+++ b/development/netbeans/netbeans.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Type=Application
 Exec=netbeans
-Name=Netbeans
-GenericName=NetBeans IDE
-Comment=IDE for Java
+Name=Netbeans IDE
+GenericName=NetBeans Multi-Language IDE 
+Comment=NetBeans Multi-Language IDE 
 Icon=netbeans
 StartupNotify=true
-Categories=Qt;KDE;GNOME;Development;
+Categories=Qt;KDE;GTK;GNOME;Development;
diff --git a/development/netbeans/netbeans.info b/development/netbeans/netbeans.info
index 0ef5f8b936..eb2ffd61f3 100644
--- a/development/netbeans/netbeans.info
+++ b/development/netbeans/netbeans.info
@@ -3,8 +3,8 @@ VERSION="6.9.1"
 HOMEPAGE="http://www.netbeans.org"
 DOWNLOAD="http://download.netbeans.org/netbeans/6.9.1/final/zip/netbeans-6.9.1-201007282301-ml.zip"
 MD5SUM="c31060abc6d33cf82b17e255c100fe40"
-DOWNLOAD_x86_64="UNSUPPORTED"
+DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Antonio Hernández Blas"
-EMAIL="hba.nihilismus@gmail.com"
-APPROVED="Erik Hanson"
+MAINTAINER="Andre Barboza"
+EMAIL="bmg.andre@gmail.com"
+APPROVED="rworkman"