2 files changed, 19 insertions, 14 deletions
diff --git a/academic/free42/free42.SlackBuild b/academic/free42/free42.SlackBuild
index c0aa5d317a95d..86af1ffdb04c5 100644
--- a/academic/free42/free42.SlackBuild
+++ b/academic/free42/free42.SlackBuild
@@ -23,13 +23,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=free42
-VERSION=${VERSION:-1.4.77}
+VERSION=${VERSION:-2.0.4}
 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"
@@ -64,22 +64,27 @@ tar xvf $CWD/$PRGNAM.tgz
 cd $PRGNAM
 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 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 {} \;
+
 cd gtk
 
 # Add X11 library to Makefile
 echo 'LIBS := ${LIBS} -lX11' >> Makefile
 
+# Respect our C{,XX}FLAGS and disable some warnings-as-errors
+sed -i "s|-g\ |$SLKCFLAGS -Wno-error=narrowing|" Makefile
+
 make
 make -e BCD_MATH=1
 
-cd $PKG
-mkdir -p $PKG/usr/bin
-cp $TMP/$PRGNAM/gtk/free42bin $PKG/usr/bin
-cp $TMP/$PRGNAM/gtk/free42dec $PKG/usr/bin
+install -D -m0755 $TMP/$PRGNAM/gtk/free42bin $PKG/usr/bin/free42bin
+install -D -m0755 $TMP/$PRGNAM/gtk/free42dec $PKG/usr/bin/free42dec
+
+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 $TMP/$PRGNAM
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/academic/free42/free42.info b/academic/free42/free42.info
index 30a64b31f2f2e..383ee6f1c31b0 100644
--- a/academic/free42/free42.info
+++ b/academic/free42/free42.info
@@ -1,8 +1,8 @@
 PRGNAM="free42"
-VERSION="1.4.77"
+VERSION="2.0.4"
 HOMEPAGE="http://thomasokken.com/free42/index.html"
-DOWNLOAD="http://thomasokken.com/free42/download/free42.tgz"
-MD5SUM="34d6ab6f5455ff7ad657163194241e47"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/free42.tgz"
+MD5SUM="13c23ad81ca7781ba31765d42858f056"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""