summaryrefslogtreecommitdiffstats
path: root/libraries/barry/barry.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/barry/barry.SlackBuild')
-rw-r--r--libraries/barry/barry.SlackBuild28
1 files changed, 16 insertions, 12 deletions
diff --git a/libraries/barry/barry.SlackBuild b/libraries/barry/barry.SlackBuild
index 27924d824d..e50ef580a1 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:-2}
+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
@@ -140,13 +141,16 @@ cat hal/fdi/policy/10osvendor/19-blackberry-acl.fdi > \
cp -a hal/hal-blackberry $PKG/usr/bin
# Install bash completion scripts
-mkdir -p $PKG/etc/bash_completion.d
-cat bash/bjavaloader > $PKG/etc/bash_completion.d/bjavaloader
-cat bash/btool > $PKG/etc/bash_completion.d/btool
+mkdir -p $PKG/usr/share/bash-completion/completions
+cat bash/bjavaloader > $PKG/usr/share/bash-completion/completions/bjavaloader
+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
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc