3 files changed, 43 insertions, 47 deletions
diff --git a/academic/labplot2/labplot2.SlackBuild b/academic/labplot2/labplot2.SlackBuild
index ca807e8da1..ca405b232e 100644
--- a/academic/labplot2/labplot2.SlackBuild
+++ b/academic/labplot2/labplot2.SlackBuild
@@ -2,17 +2,16 @@
 # Slackware build script for LabPlot
 # Based on the Slackware 14.1 SlackBuild and AUR PKGBUILD for labplot
 # Written by Fellype do Nascimento <fellype(at)gmail.com>
-#last modification of this build script: 2014/12/12
 
 NAME=labplot
 PRGNAM=labplot2
-VERSION=${VERSION:-2.0.1}
+VERSION=${VERSION:-2.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i686 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -23,18 +22,12 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"; SLKLDFLAGS=""; LIBDIRSUFFIX=""; CHOST=i486
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"; SLKLDFLAGS=""; LIBDIRSUFFIX=""; CHOST=i486
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+ SLKCFLAGS="-O2 -fPIC"; SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -43,7 +36,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $NAME-$VERSION
-tar xvf $CWD/$NAME-$VERSION.tar.bz2
+tar -xJf $CWD/$NAME-$VERSION.tar.xz
 cd $NAME-$VERSION
 chown -R root:root .
 find -L . \
@@ -52,29 +45,32 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Use -fpermissive to fix build failure with gcc-5.2.0
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -fpermissive" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install DESTDIR=$PKG
-cd ..
+./compile
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+( cd build/
+cmake ./ -DCMAKE_INSTALL_PREFIX=/usr
+cmake ./ -DCMAKE_BUILD_TYPE=Release
+make install DESTDIR=$PKG
+)
+
+( cd $PKG
+find -L . | xargs -O file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+find -L . | xargs -O file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+find -L . | xargs -O file | grep "current ar archive" | cut -f 1 -d : | xargs strip -g 2> /dev/null || true
+)
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING INSTALL README \
+$PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+if [ -e /usr/bin/requiredbuilder ]; then
+  requiredbuilder -v -y -s $CWD $PKG
+fi
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+
diff --git a/academic/labplot2/labplot2.info b/academic/labplot2/labplot2.info
index 24701ca20c..bc6843ed4e 100644
--- a/academic/labplot2/labplot2.info
+++ b/academic/labplot2/labplot2.info
@@ -1,10 +1,10 @@
 PRGNAM="labplot2"
-VERSION="2.0.1"
+VERSION="2.3.0"
 HOMEPAGE="http://labplot.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/labplot/files/labplot/2.0.0/labplot-2.0.1.tar.bz2"
-MD5SUM="f01a5a6a796429e8a45805cb611e25f2"
+DOWNLOAD="http://kde.c3sl.ufpr.br/stable/labplot/2.3.0/labplot-2.3.0.tar.xz"
+MD5SUM="c1d61b5398cb4eb1ce9f4ba285400ecd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="extra-cmake-modules"
 MAINTAINER="Fellype do Nascimento"
 EMAIL="fellype(at)gmail.com"
diff --git a/academic/labplot2/slack-desc b/academic/labplot2/slack-desc
index 50672662f5..6ecfbfeb72 100644
--- a/academic/labplot2/slack-desc
+++ b/academic/labplot2/slack-desc
@@ -1,19 +1,19 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-labplot2: labplot2 - (interactive graphing and analysis of scientific data)
-labplot2:
+labplot2: LabPlot - (interactive graphing and analysis of scientific data)
+labplot2: 
 labplot2: LabPlot is a KDE-application for interactive graphing and analysis of
-labplot2: scientific data. LabPlot provides an easy way to create, manage and
+labplot2: scientific data. LabPlot provides an easy way to create, manage and 
 labplot2: edit plots.
-labplot2: LabPlot2 is a complete rewrite of LabPlot1 and lacks in the first
-labplot2: release a lot of features available in the predecessor. On the other
-labplot2: hand, the GUI and the usability is more superior as compared to
-labplot2: LabPlot1 and there are several new features that were not available
+labplot2: LabPlot2 is a complete rewrite of LabPlot1 and lacks in the first 
+labplot2: release a lot of features available in the predecessor. On the other 
+labplot2: hand, the GUI and the usability is more superior as compared to 
+labplot2: LabPlot1 and there are several new features that were not available 
 labplot2: in LabPlot1.
-labplot2:
+labplot2: