development/pforth: Updated for version 20220221_6aa1010.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 20 insertions, 31 deletions

diff --git a/development/pforth/pforth.SlackBuild b/development/pforth/pforth.SlackBuild
index fbb40c73b5..66d6e97869 100644
--- a/development/pforth/pforth.SlackBuild
+++ b/development/pforth/pforth.SlackBuild
@@ -8,16 +8,14 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=pforth
-VERSION=${VERSION:-v27}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20220221_6aa1010}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-SRCVERSION=${VERSION}_20101121
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -35,8 +33,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"
@@ -54,9 +52,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${PRGNAM}_$VERSION __MACOSX
-unzip "$CWD/${PRGNAM}_${SRCVERSION}.zip"
-cd ${PRGNAM}_${VERSION}/build/unix
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -64,30 +62,21 @@ 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 {} \;
 
-# pforth.dic into "share"
-sed -i "s/pforth.dic/\/usr\/share\/pforth\/${VERSION}\/pforth.dic/g" ../../csrc/pf_main.c
-
-patch -p0 < $CWD/pforth-build.patch
-
-make all \
-  -j1 \
-  DESTDIR=$PKG \
-  CC="cc -fgnu89-inline" \
-  CFLAGS="$SLKCFLAGS" \
-  CXXFLAGS="$SLKCFLAGS"
+# https://github.com/philburk/pforth
 
-find $PKG/usr/bin | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" cmake .
+make
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ../../*.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/usr/bin $PKG/usr/share/pforth/${VERSION}
-strip pforth pforth_standalone
-cp -a pforth $PKG/usr/bin/pforth
-cp -a pforth.dic $PKG/usr/share/pforth/${VERSION}/pforth.dic
-cp -a pforth_standalone  $PKG/usr/bin/pforth_standalone
+( cd fth
+  strip pforth pforth_standalone
+  install -m 0755 pforth $PKG/usr/bin/pforth
+  install -m 0644 pforth.dic $PKG/usr/share/pforth/${VERSION}/pforth.dic
+  install -m 0755 pforth_standalone $PKG/usr/bin/pforth_standalone )
 ( cd $PKG/usr/bin ; ln -s pforth_standalone pfs )
 
 mkdir -p $PKG/install
diff --git a/development/pforth/pforth.info b/development/pforth/pforth.info
index 5b6f286726..021fdd4d2b 100644
--- a/development/pforth/pforth.info
+++ b/development/pforth/pforth.info
@@ -1,8 +1,8 @@
 PRGNAM="pforth"
-VERSION="v27"
+VERSION="20220221_6aa1010"
 HOMEPAGE="http://www.softsynth.com/pforth/"
-DOWNLOAD="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/pforth/pforth_v27_20101121.zip"
-MD5SUM="0e46570254f301f68102932a2ec8753f"
+DOWNLOAD="https://ponce.cc/slackware/sources/repo/pforth-20220221_6aa1010.tar.xz"
+MD5SUM="bce83a9611eecd9bebafccf114db4afa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""