aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/pbzip2/pbzip2.SlackBuild20
-rw-r--r--system/pbzip2/pbzip2.info6
2 files changed, 12 insertions, 14 deletions
diff --git a/system/pbzip2/pbzip2.SlackBuild b/system/pbzip2/pbzip2.SlackBuild
index b998560fb313d..a4ac70c3a9327 100644
--- a/system/pbzip2/pbzip2.SlackBuild
+++ b/system/pbzip2/pbzip2.SlackBuild
@@ -1,13 +1,14 @@
-#!/bin/sh -eu
+#!/bin/sh
# Slackware build script for PBZIP2
# Written by Erik Hanson erik@slackbuilds.org
PRGNAM=pbzip2
-VERSION=1.0.3
+VERSION=1.0.5
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -19,6 +20,8 @@ elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
fi
+set -eu
+
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
@@ -28,11 +31,7 @@ cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
-# Hack to add march/mtune
-sed -i "s/-O2/${SLKCFLAGS}/" Makefile
-
-# Build
-make
+make CFLAGS+="$SLKCFLAGS"
# DESTDIR isn't supported, install manually
mkdir -p $PKG/usr/{bin,man/man1,doc/$PRGNAM-$VERSION} $PKG/install
@@ -40,12 +39,11 @@ mkdir -p $PKG/usr/{bin,man/man1,doc/$PRGNAM-$VERSION} $PKG/install
# Binary
cp pbzip2 $PKG/usr/bin/pbzip2
strip --strip-unneeded $PKG/usr/bin/pbzip2 2> /dev/null
-chmod a+x $PKG/usr/bin/pbzip2
+chmod 0755 $PKG/usr/bin/pbzip2
# Man page
-cp pbzip2.1 $PKG/usr/man/man1
-gzip -9 $PKG/usr/man/man1/pbzip2.1
-chmod a+r $PKG/usr/man/man1/pbzip2.1.gz
+gzip -9c pbzip2.1 > $PKG/usr/man/man1/pbzip2.1.gz
+chmod 0644 $PKG/usr/man/man1/pbzip2.1.gz
cp -a AUTHORS COPYING ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/pbzip2/pbzip2.info b/system/pbzip2/pbzip2.info
index 187a9b8341eae..0877feb15f7fe 100644
--- a/system/pbzip2/pbzip2.info
+++ b/system/pbzip2/pbzip2.info
@@ -1,8 +1,8 @@
PRGNAM="pbzip2"
-VERSION="1.0.3"
+VERSION="1.0.5"
HOMEPAGE="http://compression.ca/pbzip2/"
-DOWNLOAD="http://compression.ca/pbzip2/pbzip2-1.0.3.tar.gz"
-MD5SUM="38cb9106c45add5e0fb80864477df7e7"
+DOWNLOAD="http://compression.ca/pbzip2/pbzip2-1.0.5.tar.gz"
+MD5SUM="e2448d22ee29d1e6549ac58b98df11ab"
MAINTAINER="Erik Hanson"
EMAIL="erik@slackbuilds.org"
APPROVED="dsomero"