3 files changed, 52 insertions, 50 deletions
diff --git a/academic/GeoGebra/GeoGebra.SlackBuild b/academic/GeoGebra/GeoGebra.SlackBuild
index aba4f0a49cd52..cf6bdd098f971 100644
--- a/academic/GeoGebra/GeoGebra.SlackBuild
+++ b/academic/GeoGebra/GeoGebra.SlackBuild
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=GeoGebra
-VERSION=${VERSION:-5.0.253.0}
+VERSION=${VERSION:-5.0.361.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -61,63 +61,35 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-Linux-Portable-$VERSION
 tar xvf $CWD/$PRGNAM-Linux-Portable-$VERSION.tar.bz2
-cd $PRGNAM-Linux-Portable-$VERSION/geogebra
+cd $PRGNAM-Linux-Portable-$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 \
+  -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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-install -dm755 $PKG/usr/bin \
-               $PKG/usr/share/applications \
-               $PKG/usr/share/geogebra
-install -dm755 $PKG/usr/share/icons/hicolor/16x16/apps
-install -m644 *.jar $PKG/usr/share/geogebra
-install -m755 geogebra $PKG/usr/bin
+cd geogebra
+  install -dm755 $PKG/usr/bin
+  install -m755 geogebra $PKG/usr/bin
+
+  install -dm755 $PKG/usr/share/geogebra
+  install -m644 *.jar $PKG/usr/share/geogebra
 cd ..
+
+install -dm755 $PKG/usr/share/icons/hicolor/16x16/apps
 install -m644 $CWD/geogebra.png $PKG/usr/share/icons/hicolor/16x16/apps
 
+install -dm755 $PKG/usr/share/applications
+install -m644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a readme.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cat <<EOF > $PKG/usr/share/applications/$PRGNAM.desktop
-[Desktop Entry]
-Name=GeoGebra
-GenericName=Dynamic mathematics software
-GenericName[cs]=Dynamický matematický software
-GenericName[de]=Dynamische Mathematiksoftware
-GenericName[el]=Λογισμικό δυναμικών μαθηματικών
-GenericName[es]=Programa de matemáticas dinámico
-GenericName[fr]=Logiciel de Mathématiques dynamiques
-GenericName[hi]=सक्रिय गणितीय सॉफ्टवेर
-GenericName[hu]=Dinamikus matematikai szoftver
-GenericName[it]=Software di matematica dinamica
-GenericName[pt_BR]=Programa de Matemática Dinâmica
-Comment=Create interactive mathematical constructions and applets.
-Comment[cs]=Vytvořte interaktivní konstrukce a aplety.
-Comment[de]=Erstellen Sie interaktive Konstruktionen und Applets.
-Comment[el]=Δημιουργήστε αλληπειδραστικές μαθηματικές κατασκευές και applet.
-Comment[fr]=Créer des constructions mathématiques et des appliquettes.
-Comment[hi]=संवादात्मक गणितीय निर्माण और एप्लेट बनाएँ
-Comment[hu]=Interaktív matematikai szerkesztések és appletek létrehozása.
-Comment[it]=Creazione di costruzioni matematiche e applet interattive.
-Comment[pt_BR]=Crie construções matemáticas interativas e applets.
-TryExec=geogebra
-Exec=geogebra %F
-Icon=geogebra
-Terminal=false
-Type=Application
-StartupNotify=true
-StartupWMClass=geogebra-GeoGebra
-Categories=Education;Science;Math;
-MimeType=application/vnd.geogebra.file;application/vnd.geogebra.tool;
-EOF
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/GeoGebra/GeoGebra.desktop b/academic/GeoGebra/GeoGebra.desktop
new file mode 100644
index 0000000000000..91e6752d19795
--- /dev/null
+++ b/academic/GeoGebra/GeoGebra.desktop
@@ -0,0 +1,30 @@
+[Desktop Entry]
+Name=GeoGebra
+GenericName=Dynamic mathematics software
+GenericName[cs]=Dynamický matematický software
+GenericName[de]=Dynamische Mathematiksoftware
+GenericName[el]=Λογισμικό δυναμικών μαθηματικών
+GenericName[es]=Programa de matemáticas dinámico
+GenericName[fr]=Logiciel de Mathématiques dynamiques
+GenericName[hi]=सक्रिय गणितीय सॉफ्टवेर
+GenericName[hu]=Dinamikus matematikai szoftver
+GenericName[it]=Software di matematica dinamica
+GenericName[pt_BR]=Programa de Matemática Dinâmica
+Comment=Create interactive mathematical constructions and applets.
+Comment[cs]=Vytvořte interaktivní konstrukce a aplety.
+Comment[de]=Erstellen Sie interaktive Konstruktionen und Applets.
+Comment[el]=Δημιουργήστε αλληπειδραστικές μαθηματικές κατασκευές και applet.
+Comment[fr]=Créer des constructions mathématiques et des appliquettes.
+Comment[hi]=संवादात्मक गणितीय निर्माण और एप्लेट बनाएँ
+Comment[hu]=Interaktív matematikai szerkesztések és appletek létrehozása.
+Comment[it]=Creazione di costruzioni matematiche e applet interattive.
+Comment[pt_BR]=Crie construções matemáticas interativas e applets.
+TryExec=geogebra
+Exec=geogebra %F
+Icon=geogebra
+Terminal=false
+Type=Application
+StartupNotify=true
+StartupWMClass=geogebra-GeoGebra
+Categories=Education;Math;
+MimeType=application/vnd.geogebra.file;application/vnd.geogebra.tool;
diff --git a/academic/GeoGebra/GeoGebra.info b/academic/GeoGebra/GeoGebra.info
index b2f9f2d0bee96..e2cc1acab1f5f 100644
--- a/academic/GeoGebra/GeoGebra.info
+++ b/academic/GeoGebra/GeoGebra.info
@@ -1,8 +1,8 @@
 PRGNAM="GeoGebra"
-VERSION="5.0.253.0"
+VERSION="5.0.361.0"
 HOMEPAGE="https://www.geogebra.org/cms/en/"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/GeoGebra/GeoGebra-Linux-Portable-5.0.253.0.tar.bz2"
-MD5SUM="5ebedc644ac651d8ae009cb54f795a99"
+DOWNLOAD="https://www.dropbox.com/s/cu6ca70z0xlsl2s/GeoGebra-Linux-Portable-5.0.361.0.tar.bz2?dl=0"
+MD5SUM="55e025c1671d074428a0adb66e1fa3d8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="openjdk"