diff --git a/network/cgterm/cgterm.SlackBuild b/network/cgterm/cgterm.SlackBuild index 8ae605c601..e21ffc22b1 100644 --- a/network/cgterm/cgterm.SlackBuild +++ b/network/cgterm/cgterm.SlackBuild @@ -1,7 +1,8 @@ #!/bin/sh -# SlackBuild script for "CGTerm". -# Copyright 2010-2014 Marcel Saegebarth +# Slackware build script for "cgterm". + +# Copyright 2010-2015 Marcel Saegebarth # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -42,11 +43,17 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e @@ -59,10 +66,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -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 {} \; # Makefile doesn't create parents and installdirs aren't useable also mkdir -p $PKG/usr/bin $PKG/usr/share/cgterm @@ -72,7 +79,7 @@ sed -i 's/^install: all installdirs/install: all/' Makefile CFLAGS="$SLKCFLAGS" make PREFIX=/usr make install PREFIX=$PKG/usr -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +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 # Link "us.kbd" to "keyboard.kbd", else the application will create a config file @@ -84,7 +91,7 @@ cp -a cgchat.txt cgterm.txt history.txt \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -mkdir $PKG/install +mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG diff --git a/network/cgterm/slack-desc b/network/cgterm/slack-desc index 52c99af8a3..fa92c38a1a 100644 --- a/network/cgterm/slack-desc +++ b/network/cgterm/slack-desc @@ -12,7 +12,7 @@ cgterm: CGTerm is a C/G telnet client that lets you connect to C64 telnet cgterm: BBS:s with the correct colours and the correct font. cgterm: Also included is a client for 64CHAT called CGChat. cgterm: -cgterm: +cgterm: Homepage: http://www.paradroid.net/cgterm/ cgterm: cgterm: cgterm: