1 files changed, 17 insertions, 13 deletions
diff --git a/misc/grc/grc.SlackBuild b/misc/grc/grc.SlackBuild
index 99177d6e7e406..9285f69709ea3 100644
--- a/misc/grc/grc.SlackBuild
+++ b/misc/grc/grc.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for grc.
 #
-# 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
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM="grc"
-VERSION=${VERSION:-1.9}
+VERSION=${VERSION:-1.10}
 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"
@@ -56,21 +56,25 @@ fi
 
 set -e
 
-SRCVER="v$VERSION"
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCVER.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 
-install -d $PKG/etc
-install -D -m644 {grc.conf,grc.bashrc,$CWD/grc.zsh} $PKG/etc
+install -d $PKG/etc/profile.d
+install -D -m644 grc.conf $PKG/etc/grc.conf.new
+install -D -m644 grc.bashrc $PKG/etc/profile.d/grc.bashrc.new
+install -D -m644 grc.zsh $PKG/etc/profile.d/grc.zsh.new
+install -D -m644 grc.fish $PKG/etc/profile.d/grc.fish.new
 
 install -d $PKG/usr/bin
-install -D -m755 {grc,grcat} $PKG/usr/bin/
+install -D -m755 {grc,grcat} $PKG/usr/bin
+
+install -d $PKG/usr/share/grc
+install -D -m644 conf.* $PKG/usr/share/grc
 
 install -d $PKG/usr/man/man1
 install -D -m644 {grc.1,grcat.1} $PKG/usr/man/man1
@@ -81,8 +85,8 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 install -d $PKG/usr/share/$PRGNAM
 install -D -m644 conf.* $PKG/usr/share/$PRGNAM
 
-DOCS="$CWD/grc.bashrc-expanded contrib debian/changelog debian/copyright \
-CREDITS INSTALL README Regexp.txt TODO"
+DOCS="contrib debian/changelog debian/copyright CREDITS INSTALL \
+README.markdown Regexp.txt TODO"
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION/