development/arduino: Updated for version 1.0.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>

4 files changed, 18 insertions, 14 deletions

diff --git a/development/arduino/README b/development/arduino/README
index 2b260a71a7..87404edbb7 100644
--- a/development/arduino/README
+++ b/development/arduino/README
@@ -17,3 +17,7 @@ environment is written in Java and based on Processing, avr-gcc, and
 other open source software.
 
 This requires avr-libc, avr-gcc and avr-binutils.
+
+Note: Due to a bug in the Arduino IDE, you might need to downgrade to
+avr-binutils 2.20.1 to compile programs for some boards. You can use the
+SlackBuild from SBo to compile a working version of avr-binutils 2.20.1.
diff --git a/development/arduino/arduino.SlackBuild b/development/arduino/arduino.SlackBuild
index abf5409d76..dd52ecb035 100644
--- a/development/arduino/arduino.SlackBuild
+++ b/development/arduino/arduino.SlackBuild
@@ -14,7 +14,7 @@
 # incorrect use of this script.
 
 PRGNAM=arduino
-VERSION=${VERSION:-0022}
+VERSION=${VERSION:-1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -36,10 +36,10 @@ if [ "$ARCH" = "i486" ]; then
   SRCSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   LIBDIRSUFFIX=""
-  SRCSUFFIX=""
+  SRCSUFFIX="-linux"
 elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
-  SRCSUFFIX="-64-2"
+  SRCSUFFIX="-linux64"
 else
   echo "$ARCH architecture not supported"
   exit 1
@@ -52,11 +52,11 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT 
-rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$SOURCENAME
-cd $PKG
-chown -R root:root $PKG $TMP/$PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
  -exec chmod 755 {} \; -o \
@@ -79,17 +79,17 @@ EOF
 chmod 0755 $PKG/usr/bin/$PRGNAM
 
 mkdir -p $PKG/$SYSTEMFOLDER
-cp -a ../$PRGNAM-$VERSION/* $PKG/$SYSTEMFOLDER/
+cp -a * $PKG/$SYSTEMFOLDER/
 
 install -D -m 644 $CWD/arduino.desktop $PKG/usr/share/applications/arduino.desktop
-install -D -m 644 $CWD/arduino.png $PKG/usr/share/pixmaps/arduino.png
+install -D -m 644 reference/img/logo.png $PKG/usr/share/pixmaps/arduino.png
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  ../$PRGNAM-$VERSION/revisions.txt \
+  revisions.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/development/arduino/arduino.info b/development/arduino/arduino.info
index b2682f2fbb..32a0327397 100644
--- a/development/arduino/arduino.info
+++ b/development/arduino/arduino.info
@@ -1,10 +1,10 @@
 PRGNAM="arduino"
-VERSION="0022"
+VERSION="1.0"
 HOMEPAGE="http://www.arduino.cc"
-DOWNLOAD="http://arduino.googlecode.com/files/arduino-0022.tgz"
-MD5SUM="2429c118381a4a761d7f5717183ac387"
-DOWNLOAD_x86_64="http://arduino.googlecode.com/files/arduino-0022-64-2.tgz"
-MD5SUM_x86_64="b332c75e3e63959908751adcafd0248d"
+DOWNLOAD="http://files.arduino.cc/downloads/arduino-1.0-linux.tgz"
+MD5SUM="dc5085c25aab1dcb267e0f0fa4af468e"
+DOWNLOAD_x86_64="http://files.arduino.cc/downloads/arduino-1.0-linux64.tgz"
+MD5SUM_x86_64="14336316af4cc4aef5f879afed9dd7ea"
 MAINTAINER="Vliegendehuiskat"
 EMAIL="vliegendehuiskat [at] gmail [dot] com"
 APPROVED="Niels Horn"
diff --git a/development/arduino/arduino.png b/development/arduino/arduino.png
deleted file mode 100644
index 4d88f52023..0000000000
--- a/development/arduino/arduino.png
+++ /dev/null