1 files changed, 27 insertions, 12 deletions
diff --git a/source/a/ncompress/ncompress.SlackBuild b/source/a/ncompress/ncompress.SlackBuild
index ba6f38d5c..871df2423 100755
--- a/source/a/ncompress/ncompress.SlackBuild
+++ b/source/a/ncompress/ncompress.SlackBuild
@@ -20,13 +20,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=4.2.4.3
+VERSION=4.2.4.4
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
@@ -37,9 +37,22 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-ncompress
 
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
-
 cd $TMP
 rm -rf ncompress-${VERSION}
 tar xzf $CWD/ncompress-${VERSION}.tar.gz
@@ -51,23 +64,26 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-make ENDIAN=4321 || exit 1
+make CFLAGS="$SLKCFLAGS" || exit 1
+
 mkdir -p $PKG/usr/bin
 cat compress > $PKG/usr/bin/compress
 chmod 755 $PKG/usr/bin/compress
-( cd $PKG/usr/bin ; ln -sf compress uncompress )
+ln -s compress $PKG/usr/bin/uncompress
+
 mkdir $PKG/bin
-( cd $PKG/bin ; ln -sf /usr/bin/compress compress )
-( cd $PKG/bin ; ln -sf compress uncompress )
+ln -s /usr/bin/compress $PKG/bin/compress
+ln -s compress $PKG/bin/uncompress
+
 mkdir -p $PKG/usr/man/man1
-cat compress.1 | gzip -9c > $PKG/usr/man/man1/compress.1.gz
+gzip -9c compress.1 > $PKG/usr/man/man1/compress.1.gz
 echo '.so man1/compress.1' | gzip -9c > $PKG/usr/man/man1/uncompress.1.gz
+
 mkdir -p $PKG/usr/doc/ncompress-${VERSION}
 cp -a \
-  Acknowleds LZW.INFO README \
+  Acknowleds Changes LZW.INFO README \
   $PKG/usr/doc/ncompress-${VERSION}
 
-# Strip everything for good measure:
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -76,7 +92,6 @@ cp -a \
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-# Build the package:
 cd $PKG
-makepkg -l y -c n $TMP/ncompress-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/ncompress-$VERSION-$ARCH-$BUILD.txz