From 4d735b3f71ec3bbd01223c020aa750a7bdd6cb3a Mon Sep 17 00:00:00 2001
From: Edinaldo P. Silva
Date: Sat, 8 Jul 2017 06:43:08 +0700
Subject: misc/Colormake: Update script

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 misc/Colormake/Colormake.SlackBuild | 21 +++++++++++++--------
 misc/Colormake/Colormake.info       |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'misc')

diff --git a/misc/Colormake/Colormake.SlackBuild b/misc/Colormake/Colormake.SlackBuild
index b863bb4e2e..711be3e022 100644
--- a/misc/Colormake/Colormake.SlackBuild
+++ b/misc/Colormake/Colormake.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for Colormake.
 #
-# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2015-2017  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,12 +24,12 @@
 
 PRGNAM=Colormake
 VERSION=${VERSION:-0.9.20140503}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 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"
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -72,8 +72,13 @@ find -L . \
 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
 
-install -d $PKG/usr/bin
-install -D -m755 {colormake,colormake.pl} $PKG/usr/bin/
+sed -i 's#colormake.pl#/usr/share/Colormake/colormake.pl#g' \
+	colormake{,-short} clmake*
+
+install -dm755 $PKG/usr/bin
+install -m755 colormake $PKG/usr/bin/
+
+install -Dm755 colormake.pl $PKG/usr/share/$PRGNAM/colormake.pl
 
 mkdir -p $PKG/usr/man/man1
 cp -a colormake.1 $PKG/usr/man/man1
diff --git a/misc/Colormake/Colormake.info b/misc/Colormake/Colormake.info
index a7add6a891..a1709ab3b1 100644
--- a/misc/Colormake/Colormake.info
+++ b/misc/Colormake/Colormake.info
@@ -1,7 +1,7 @@
 PRGNAM="Colormake"
 VERSION="0.9.20140503"
 HOMEPAGE="https://github.com/pagekite/Colormake/"
-DOWNLOAD="https://github.com/pagekite/Colormake/archive/0.9.20140503.tar.gz"
+DOWNLOAD="https://github.com/pagekite/Colormake/archive/0.9.20140503/Colormake-0.9.20140503.tar.gz"
 MD5SUM="5413fcc6d1e33a57b488be29e50f204d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-- 
cgit v1.2.3