6 files changed, 64 insertions, 95 deletions
diff --git a/development/arduino/README b/development/arduino/README
index 251f169b2d67b..42e0e0921ae88 100644
--- a/development/arduino/README
+++ b/development/arduino/README
@@ -1,17 +1,6 @@
-Arduino is an open-source electronics prototyping platform based on
-flexible, easy-to-use hardware and software. It's intended for artists,
-designers, hobbyists, and anyone interested in creating interactive
-objects or environments.
+The open-source Arduino Software (IDE) makes it easy to write code and upload
+it to the board. It runs on Windows, Mac OS X, and Linux. The environment
+is written in Java and based on Processing and other open-source software.
+This software can be used with any Arduino board.
 
-Arduino can sense the environment by receiving input from a variety of
-sensors and can affect its surroundings by controlling lights, motors,
-and other actuators. The microcontroller on the board is programmed
-using the Arduino programming language (based on Wiring) and the Arduino
-development environment (based on Processing). Arduino projects can be
-stand-alone or they can communicate with software on running on a
-computer (e.g. Flash, Processing, MaxMSP).
-
-The open-source Arduino environment makes it easy to write code and
-upload it to the i/o board. It runs on Windows, Mac OS X, and Linux. The
-environment is written in Java and based on Processing, avr-gcc, and
-other open source software.
+NOTE: This script repackages binary release provided by the upstream.
diff --git a/development/arduino/arduino.SlackBuild b/development/arduino/arduino.SlackBuild
index 25ad329c0e854..3161ebf26fb6e 100644
--- a/development/arduino/arduino.SlackBuild
+++ b/development/arduino/arduino.SlackBuild
@@ -1,22 +1,29 @@
 #!/bin/sh
 
-# Slackware build script for Arduino IDE
-
-# Written by Diogo Leal(estranho) untill 0019.
-# Rewritten from scratch by Vliegendehuiskat since 0022.
-# E-mail: vliegendehuiskat [at] gmail [dot] com.
-
-# The Java part of the Arduino IDE licensed under GPL.
-# The C/C++ microcontroller library files are licensed under LGPL.
-
-# This script is released in the public domain.
-# I am not responsible for any consequences that follow from the
-# incorrect use of this script.
-
-# Modified by Mario Preksavec <mario@slackware.hr>
+# Slackware build script for arduino
+
+# Copyright 2015  Mario Preksavec, Zagreb, Croatia
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=arduino
-VERSION=${VERSION:-1.6.3}
+VERSION=${VERSION:-1.6.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -35,67 +42,49 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   LIBDIRSUFFIX=""
-  SRCSUFFIX="-linux32"
+  SRCSUFFIX="32"
 elif [ "$ARCH" = "i686" ]; then
   LIBDIRSUFFIX=""
-  SRCSUFFIX="-linux32"
+  SRCSUFFIX="32"
 elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
-  SRCSUFFIX="-linux64"
+  SRCSUFFIX="64"
 else
-  echo "$ARCH architecture not supported"
+  echo "$ARCH is not supported."
   exit 1
 fi
 
-SYSTEMFOLDER=${SYSTEMFOLDER:-/opt/$PRGNAM}
-SOURCENAME=$PRGNAM-$VERSION$SRCSUFFIX.tar.xz
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
-tar xvf $CWD/$SOURCENAME
-cd $PKG
-chown -R root:root $PKG $TMP/$PRGNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION-linux$SRCSUFFIX.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Add a wrapper to run the arduino ide from /usr/bin
-# Its going to change the working directory to $HOME, so when you import/export
-# into/from the ide $HOME is going to be the default directory, rather than
-# /usr/lib*/arduino/
-mkdir -p $PKG/usr/bin
-cat << EOF > $PKG/usr/bin/$PRGNAM
-#!/bin/sh
-if [ -n \${CPLUS_INCLUDE_PATH} ]; then
-	unset CPLUS_INCLUDE_PATH
-fi
-cd \$HOME
-if [ \$(echo \$PATH | grep java | wc -l) -lt 1 ]; then
-	export PATH=\$PATH:/usr/lib$LIBDIRSUFFIX/java/bin:/usr/lib$LIBDIRSUFFIX/java/jre/bin:/usr/lib$LIBDIRSUFFIX/java/bin;
-fi;
-$SYSTEMFOLDER/arduino
-EOF
-chmod 0755 $PKG/usr/bin/$PRGNAM
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-mkdir -p $PKG/$SYSTEMFOLDER
-cp -a ../$PRGNAM-$VERSION/* $PKG/$SYSTEMFOLDER/
+# Manual install ensues
+mkdir -p $PKG/opt/$PRGNAM
+mv arduino dist examples hardware lib libraries reference tools $PKG/opt/$PRGNAM
 
-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
+# Make it a bit more user friendly
+mkdir -p $PKG/usr/{bin,share/applications}
+sed "s/FULL_PATH/\/opt\/$PRGNAM/" arduino.desktop \
+  > $PKG/usr/share/applications/$PRGNAM.desktop
+ln -s /opt/$PRGNAM/arduino $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
+# Hack for missing libtinfo.so.5
+ln -s /lib$LIBDIRSUFFIX/libncurses.so.5 \
+  $PKG/opt/$PRGNAM/hardware/tools/avr/lib/libtinfo.so.5
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  ../$PRGNAM-$VERSION/revisions.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a revisions.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/arduino/arduino.desktop b/development/arduino/arduino.desktop
deleted file mode 100644
index 90a01e87696b8..0000000000000
--- a/development/arduino/arduino.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Arduino IDE
-GenericName=Arduino IDE
-Comment=Arduino IDE development
-Exec=/usr/bin/arduino
-Icon=arduino
-Terminal=false
-Type=Application
-Categories=KDE;Qt;GNOME;GTK;Development;
diff --git a/development/arduino/arduino.info b/development/arduino/arduino.info
index 02867e377cc75..3d20a37e4d21f 100644
--- a/development/arduino/arduino.info
+++ b/development/arduino/arduino.info
@@ -1,10 +1,10 @@
 PRGNAM="arduino"
-VERSION="1.6.3"
-HOMEPAGE="http://www.arduino.cc"
-DOWNLOAD="http://mirror.slackware.hr/sources/arduino/arduino-1.6.3-linux32.tar.xz"
-MD5SUM="fd1b592ce28851b063bf3fcb87bfea54"
-DOWNLOAD_x86_64="http://mirror.slackware.hr/sources/arduino/arduino-1.6.3-linux64.tar.xz"
-MD5SUM_x86_64="f1d9851ed792736498da1f50ce92126e"
+VERSION="1.6.5"
+HOMEPAGE="http://www.arduino.cc/"
+DOWNLOAD="http://mirror.slackware.hr/sources/arduino/arduino-1.6.5-linux32.tar.xz"
+MD5SUM="44c48ba7775d6e4f3b9b9513312319b9"
+DOWNLOAD_x86_64="http://mirror.slackware.hr/sources/arduino/arduino-1.6.5-linux64.tar.xz"
+MD5SUM_x86_64="9bf83a56b31b66c20918c20f5d60f508"
 REQUIRES="jdk"
 MAINTAINER="Mario Preksavec"
 EMAIL="mario at slackware dot hr"
diff --git a/development/arduino/arduino.png b/development/arduino/arduino.png
deleted file mode 100644
index 4217c513f3f2d..0000000000000
--- a/development/arduino/arduino.png
+++ /dev/null
diff --git a/development/arduino/slack-desc b/development/arduino/slack-desc
index 0e826481e0462..474712a32d827 100644
--- a/development/arduino/slack-desc
+++ b/development/arduino/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
-arduino: Arduino (IDE)
+arduino: arduino (IDE)
 arduino:
-arduino: The open-source Arduino environment makes it easy to write code and
-arduino: upload it to the i/o board.
+arduino: The open-source Arduino Software (IDE) makes it easy to write code
+arduino: and upload it to the board. It runs on Windows, Mac OS X, and Linux.
+arduino: The environment is written in Java and based on Processing and other
+arduino: open-source software.
+arduino: This software can be used with any Arduino board.
 arduino:
-arduino: It runs on Windows, Mac OS X, and Linux.
-arduino:
-arduino: The environment is written in Java and based on Processing,
-arduino: avr-gcc, and other open source software.
+arduino: Homepage: http://www.arduino.cc/
 arduino:
 arduino: