diff options
| -rw-r--r-- | libraries/barry/barry.SlackBuild | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libraries/barry/barry.SlackBuild b/libraries/barry/barry.SlackBuild index 51705f7776fe..e50ef580a187 100644 --- a/libraries/barry/barry.SlackBuild +++ b/libraries/barry/barry.SlackBuild @@ -11,25 +11,26 @@ # Modified by Robby Workman <rworkman@slackbuilds.org> # Modified by Mario Preksavec <mario@slackware.hr> +# 20220422 bkw: Modified by SlackBuilds.org, BUILD=4: +# - add SlackBuild to doc dir. +# - i486 => i586. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=barry VERSION=${VERSION:-0.18.3} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -44,8 +45,8 @@ OUTPUT=${OUTPUT:-/tmp} # BARRY_GROUP=barry ./barry.SlackBuild BARRY_GROUP=${BARRY_GROUP:-plugdev} -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" @@ -72,9 +73,9 @@ 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 \ + -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 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ # Debian fixes patch -p1 -i $CWD/fix-sizeof-use.patch @@ -147,6 +148,7 @@ cat bash/btool > $PKG/usr/share/bash-completion/completions/btool mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a README TODO COPYING AUTHORS NEWS ChangeLog \ $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild rm -f $PKG/usr/lib*/*.la |