4 files changed, 36 insertions, 23 deletions
diff --git a/academic/engauge/README b/academic/engauge/README
index 492ddf9aa767c..8e946775e7491 100644
--- a/academic/engauge/README
+++ b/academic/engauge/README
@@ -2,5 +2,6 @@ Engauge digitizing software converts an image file showing a graph or map,
 into numbers. The image file can come from a scanner, digital camera or
 screenshot. The numbers can be read on the screen, and written or copied
 to a spreadsheet. Engauge Digitizer compensates for rotation, scaling
-and skew (also known as shearing) in graphs. Engauge recognizes BMP, GIF,
-JPG, PNG, PNM, and XPM bitmaps.
+and skew (also known as shearing) in graphs. Engauge recognizes BMP, CUR,
+DDS, GIF, ICNS, ICO, JP2, JPG, MNG, PBM, PDF, PGM, PNG, PPM, SVG, SVGZ,
+TGA, TIFF, WBMP, WEBP, XBM and XPM image files.
diff --git a/academic/engauge/engauge.SlackBuild b/academic/engauge/engauge.SlackBuild
index 3040c99f97fdd..b8e187fa09ccb 100644
--- a/academic/engauge/engauge.SlackBuild
+++ b/academic/engauge/engauge.SlackBuild
@@ -22,13 +22,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=engauge
-VERSION=${VERSION:-5.2}
+VERSION=${VERSION:-9.5}
 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
@@ -38,9 +38,10 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
+PRGNAMFILE=$PRGNAM\-digitizer
 
-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"
@@ -58,27 +59,38 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM\_$VERSION.tgz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAMFILE-$VERSION
+tar xvf $CWD/v$VERSION.tar.gz
+cd $PRGNAMFILE-$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 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 {} \;
 
-qmake \
+POPPLER_INCLUDE=/usr/include/poppler/qt5 \
+POPPLER_LIB=/usr/lib${LIBDIRSUFFIX} \
+OPENJPEG_INCLUDE=/usr/include/openjpeg-2.1 \
+OPENJPEG_LIB=/usr/lib${LIBDIRSUFFIX} \
+qmake-qt5 \
   QMAKE_CFLAGS+="$SLKCFLAGS" \
   QMAKE_CXXFLAGS+="$SLKCFLAGS" \
-  digitizer.pro
+  "CONFIG+=pdf jpeg2000" \
+  DEFINES+=HELPDIR=/usr/doc/engauge \
+  engauge.pro
 make
 
 # the package does not have a make install so we'll move things around
 strip --strip-unneeded bin/$PRGNAM 2>/dev/null || true
 
+# make the help file
+cd help
+./build
+cd ..
+
 mkdir -p $PKG/usr/bin
-cp -a bin/$PRGNAM $PKG/usr/bin
+cp -a bin/engauge $PKG/usr/bin
 
 mkdir -p $PKG/usr/share/$PRGNAM
 cp -ra samples $PKG/usr/share/$PRGNAM
@@ -91,10 +103,10 @@ cp -a engauge-0.png $PKG/usr/share/pixmaps/engauge.png
 mkdir -p $PKG/usr/share/applications
 cp -a $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -ar INSTALL LICENSE README RELEASE usermanual $PKG/usr/doc/$PRGNAM-$VERSION
-cp -ar doc/* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mkdir -p $PKG/usr/doc/$PRGNAM
+cp -ar INSTALL LICENSE README.md $PKG/usr/doc/$PRGNAM
+cp -ar bin/documentation/engauge.q* $PKG/usr/doc/$PRGNAM
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM/$PRGNAM.SlackBuild
 find $PKG/usr/doc -type f -exec chmod 0644 {} \;
 
 mkdir -p $PKG/install
diff --git a/academic/engauge/engauge.info b/academic/engauge/engauge.info
index 22d1d11f19cf7..266e7e164030a 100644
--- a/academic/engauge/engauge.info
+++ b/academic/engauge/engauge.info
@@ -1,10 +1,10 @@
 PRGNAM="engauge"
-VERSION="5.2"
-HOMEPAGE="http://digitizer.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/digitizer/files/Engauge%20Digitizer/digitizer-5.2/engauge_5.2.tgz"
-MD5SUM="2fbd9c81fa9e910f871560767bbb52bc"
+VERSION="9.5"
+HOMEPAGE="http://markummitchell.github.io/engauge-digitizer/"
+DOWNLOAD="https://github.com/markummitchell/engauge-digitizer/archive/v9.5.tar.gz"
+MD5SUM="c45ee9b56796ba515901f9d9c05ecbc2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="log4cpp poppler-qt5"
 MAINTAINER="Pedro Mendes"
 EMAIL="pedro@gepasi.org"
diff --git a/academic/engauge/slack-desc b/academic/engauge/slack-desc
index c882dccd2631a..d6a4dbc579e70 100644
--- a/academic/engauge/slack-desc
+++ b/academic/engauge/slack-desc
@@ -15,5 +15,5 @@ engauge: spreadsheet. Engauge Digitizer compensates for rotation, scaling and
 engauge: skew (also known as shearing) in graphs. Engauge recognizes BMP, GIF,
 engauge: JPG, PNG, PNM, and XPM bitmaps.
 engauge:
-engauge: Homepage: http://digitizer.sourceforge.net/
+engauge: Homepage: http://markummitchell.github.io/engauge-digitizer/
 engauge: