1 files changed, 21 insertions, 34 deletions
diff --git a/misc/tegaki-zinnia-japanese/tegaki-zinnia-japanese.SlackBuild b/misc/tegaki-zinnia-japanese/tegaki-zinnia-japanese.SlackBuild
index 5207ceb627..ad911b181d 100644
--- a/misc/tegaki-zinnia-japanese/tegaki-zinnia-japanese.SlackBuild
+++ b/misc/tegaki-zinnia-japanese/tegaki-zinnia-japanese.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tegaki-zinnia-japanese
 # Issued under The MIT License (MIT)
@@ -23,38 +23,31 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+# 20220222 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix build when TMP is set to something other than /tmp (srsly?!)
+# - ARCH=noarch
+# - just copy the files where they go instead of screwing around with
+#   sedding a Makefile so 'make install' works.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tegaki-zinnia-japanese
 VERSION=${VERSION:-0.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -64,17 +57,11 @@ rm -rf $PRGNAM-$VERSION
 unzip $CWD/$PRGNAM-$VERSION.zip
 cd $PRGNAM-$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 {} \;
+chmod 644 *
 
-#prepare
-sed -i 's|installpath=/usr/local/|installpath=/tmp/SBo/package-tegaki-zinnia-japanese/usr/|g' \
-	./Makefile
-make
-make install DESTDIR=$PKG
+DIR=$PKG/usr/share/tegaki/models/zinnia/
+mkdir -p $DIR
+cp -a handwriting-ja.m* $DIR
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING VERSION README.txt $PKG/usr/doc/$PRGNAM-$VERSION
@@ -84,4 +71,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE