development/tkcon: script updates.

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

1 files changed, 28 insertions, 45 deletions

diff --git a/development/tkcon/tkcon.SlackBuild b/development/tkcon/tkcon.SlackBuild
index f041e8352ac5..dcc5336c0260 100644
--- a/development/tkcon/tkcon.SlackBuild
+++ b/development/tkcon/tkcon.SlackBuild
@@ -26,17 +26,10 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=tkcon
 VERSION=${VERSION:-2.7.11}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
+ARCH=noarch
 
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
@@ -47,20 +40,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -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
 mkdir -p $TMP $PKG $OUTPUT
@@ -77,37 +56,41 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 chmod -R -x .
-# correct version number
-sed -i 's/VERSION "2\.7\.10"/VERSION "2\.7\.11"/' tkcon.tcl
-install tkcon.tcl               -Dm755 $PKG/usr/lib${LIBDIRSUFFIX}/tkcon/tkcon.tcl
+
+# correct version number and .desktop file
+sed -i 's/2\.7/2\.7\.11/'                            pkgIndex.tcl
+sed -i 's/VERSION "2\.7\.10"/VERSION "2\.7\.11"/'    tkcon.tcl
 sed -i 's/Utility\;//;/Encoding=UTF-8/d;/Comment=/d' tkcon-console.desktop
+
+install tkcon.tcl               -Dm755 $PKG/usr/lib/tkcon/tkcon.tcl
 install tkcon-console.desktop   -Dm644 $PKG/usr/share/applications/tkcon-console.desktop
 install icons/tkcon-small48.png -Dm644 $PKG/usr/share/pixmaps/tkcon-icon.png
-sed -i 's/2\.7/2\.7\.11/' pkgIndex.tcl
-install pkgIndex.tcl            -Dm644 $PKG/usr/lib${LIBDIRSUFFIX}/tkcon/pkgIndex.tcl
+install pkgIndex.tcl            -Dm644 $PKG/usr/lib/tkcon/pkgIndex.tcl
 install icons/tkcon-small48.png	-Dm644 $PKG/usr/share/icons/tkcon-icon.png
 mkdir -p $PKG/usr/bin
-( cd $PKG/usr/bin ; ln -s ../lib${LIBDIRSUFFIX}/tkcon/tkcon.tcl tkcon )
-
-# if dtplite tool is installed (tcllib package), generate man pages
-if [ -x /usr/bin/dtplite ]; then
-    mkdir -p $PKG/usr/man/mann $PKG/usr/man/man5 $PKG/usr/man/man1
-    dtplite -o $PKG/usr/man/mann/dump.n    nroff docs/dump.n.man
-    dtplite -o $PKG/usr/man/mann/idebug.n  nroff docs/idebug.n.man
-    dtplite -o $PKG/usr/man/mann/observe.n nroff docs/observe.n.man
-    dtplite -o $PKG/usr/man/man1/tkcon.1   nroff docs/tkcon.1.man
-    dtplite -o $PKG/usr/man/mann/tkcon.n   nroff docs/tkcon.n.man
-    dtplite -o $PKG/usr/man/man5/tkconrc.5 nroff docs/tkconrc.5.man
-    find $PKG/usr/man -type f -exec gzip -9 {} \;
-    for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-fi
+( cd $PKG/usr/bin ; ln -s ../lib/tkcon/tkcon.tcl tkcon )
+
+# install man pages
+install -Dm0644 $CWD/man/man1/tkcon.1   $PKG/usr/man/man1/tkcon.1
+install -Dm0644 $CWD/man/man5/tkconrc.5 $PKG/usr/man/man5/tkconrc.5
+install -Dm0644 $CWD/man/mann/dump.n    $PKG/usr/man/mann/dump.n
+install -Dm0644 $CWD/man/mann/observe.n $PKG/usr/man/mann/observe.n
+install -Dm0644 $CWD/man/mann/idebug.n  $PKG/usr/man/mann/idebug.n
+install -Dm0644 $CWD/man/mann/tkcon.n   $PKG/usr/man/mann/tkcon.n
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ); do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html/docs
 cp -a \
    README.txt docs/license.terms  \
-$PKG/usr/doc/$PRGNAM-$VERSION
-cp -a docs/*.html docs/demopic.png docs/style.css $PKG/usr/doc/$PRGNAM-$VERSION/html/docs
-cp -a index.html $PKG/usr/doc/$PRGNAM-$VERSION/html/
+   $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+   docs/*.html docs/demopic.png docs/style.css \
+   $PKG/usr/doc/$PRGNAM-$VERSION/html/docs
+cp -a \
+   index.html \
+   $PKG/usr/doc/$PRGNAM-$VERSION/html/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install