1 files changed, 20 insertions, 12 deletions
diff --git a/academic/g3data/g3data.SlackBuild b/academic/g3data/g3data.SlackBuild
index 0be826f916..e36de78050 100644
--- a/academic/g3data/g3data.SlackBuild
+++ b/academic/g3data/g3data.SlackBuild
@@ -6,16 +6,14 @@
 
 
 PRGNAM=g3data
-VERSION=${VERSION:-1.5.3}
+VERSION=${VERSION:-1.5.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -39,7 +37,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -54,20 +52,30 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-patch -p1 < $CWD/patch-makefile.diff
 
-CPPFLAGS="$SLKCFLAGS" make
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
 
-mkdir -p $PKG/usr/bin $PKG/usr/man/man1
-make install bindir=$PKG/usr/bin mandir=$PKG/usr/man
+make
+make install DESTDIR=$PKG
 
-mkdir -p $PKG/usr/share/{applications,pixmaps}
-cat $CWD/g3data.desktop > $PKG/usr/share/applications/g3data.desktop
-cat $CWD/g3data.xpm > $PKG/usr/share/pixmaps/g3data.xpm
+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
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  README.TEST test1.png test2.png \
+  README COPYING ChangeLog NEWS AUTHORS \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild