From a2081c7d589e1296fc996ff14b545ddd34039899 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Mon, 22 Jun 2020 19:59:52 -0400 Subject: misc/par: Updated for version 1.53.0, new maintainer. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- misc/par/default_env.diff | 11 +++++++++ misc/par/par.SlackBuild | 62 ++++++++++++++++++++++++++++------------------- misc/par/par.info | 10 ++++---- 3 files changed, 53 insertions(+), 30 deletions(-) create mode 100644 misc/par/default_env.diff diff --git a/misc/par/default_env.diff b/misc/par/default_env.diff new file mode 100644 index 0000000000..c34ab4d95c --- /dev/null +++ b/misc/par/default_env.diff @@ -0,0 +1,11 @@ +diff -Naur Par-1.53.0/par.c Par-1.53.0.patched/par.c +--- Par-1.53.0/par.c 2020-03-14 21:01:03.000000000 -0400 ++++ Par-1.53.0.patched/par.c 2020-06-22 19:46:25.353559989 -0400 +@@ -762,6 +762,7 @@ + if (*errmsg) goto parcleanup; + + env = getenv("PARINIT"); ++ if (!env) env = "rTbgqR B=.,?'_A_a_@ Q=_s>|"; + if (env) { + parinit = malloc((strlen(env) + 1) * sizeof (char)); + if (!parinit) { diff --git a/misc/par/par.SlackBuild b/misc/par/par.SlackBuild index 334254bb06..f7b1c7f736 100644 --- a/misc/par/par.SlackBuild +++ b/misc/par/par.SlackBuild @@ -3,16 +3,25 @@ # Slackware build script for par # Written by slakmagik # Released under the WTFPL +# Now maintained by B. Watson + +# 20200622 bkw: +# - Update for v1.53 (after *19 years*) +# - Correctly rm the source dir from previous runs +# - Fix mode 0700 top-level source dir (it's annoying) +# - i486 => i586 +# - various tweaks +# - add default_env patch (see below) PRGNAM=par -VERSION=${VERSION:-1.52} -SRCNAM=Par152 +SRCNAM=Par +VERSION=${VERSION:-1.53.0} 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 @@ -23,8 +32,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" @@ -42,33 +51,36 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$SRCNAM.tar.gz -cd $SRCNAM +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$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 {} \; +# please don't revert this to template: +chmod 755 . +chmod 644 * + +# 20200622 bkw: the man page says to: +# $ export PARINIT="rTbgqR B=.,?'_A_a_@ Q=_s>|" +# before running. This one-line patch just makes that the default, if +# the PARINIT variable isn't set. This sets a reasonable default so +# users don't have to diddle their startup files. +[ "${PRISTINE:-no}" = "no" ] && patch -p1 < $CWD/default_env.diff -make -f protoMakefile CC="cc -c" LINK1="cc" LINK2="-o" RM="rm" JUNK="" +make -f protoMakefile CFLAGS="$SLKCFLAGS" mkdir -p $PKG/usr/bin -install par $PKG/usr/bin +install -m0755 -s $PRGNAM $PKG/usr/bin -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | - cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +# rename ".doc" so nothing thinks it's a word document. +mv $PRGNAM.doc $PRGNAM.txt +sed -i "s/$PRGNAM\.doc/$PRGNAM.txt/g" $PRGNAM.txt $PRGNAM.1 mkdir -p $PKG/usr/man/man1 -# make the manual reflect a filename change which will be made below -sed 's/par\.doc/par.txt/g' par.1 | gzip -c > $PKG/usr/man/man1/par.1.gz +gzip -9c $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -# change the filename (and its references to itself) to avoid tripping up -# extension sniffers -sed 's/par\.doc/par.txt/g' par.doc > $PKG/usr/doc/$PRGNAM-$VERSION/par.txt -cat releasenotes > $PKG/usr/doc/$PRGNAM-$VERSION/releasenotes -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKGDOC +cp -a $PRGNAM.txt releasenotes $PKGDOC +cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/misc/par/par.info b/misc/par/par.info index 254334f841..575b3ed9bb 100644 --- a/misc/par/par.info +++ b/misc/par/par.info @@ -1,10 +1,10 @@ PRGNAM="par" -VERSION="1.52" +VERSION="1.53.0" HOMEPAGE="http://www.nicemice.net/par/" -DOWNLOAD="http://ftp.netbsd.org/pub/pkgsrc/distfiles/Par152.tar.gz" -MD5SUM="4ccacd824171ba2c2f14fb8aba78b9bf" +DOWNLOAD="http://www.nicemice.net/par/Par-1.53.0.tar.gz" +MD5SUM="5e0f8beb45fbd967df538125fb760ad0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="slakmagik" -EMAIL="slakmagik@gmail.com" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" -- cgit v1.2.3