1 files changed, 27 insertions, 19 deletions
diff --git a/source/n/bridge-utils/bridge-utils.SlackBuild b/source/n/bridge-utils/bridge-utils.SlackBuild
index eb31d6ef7..4431da200 100755
--- a/source/n/bridge-utils/bridge-utils.SlackBuild
+++ b/source/n/bridge-utils/bridge-utils.SlackBuild
@@ -24,23 +24,25 @@ PKGNAM=bridge-utils
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
   esac
 fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
@@ -50,20 +52,16 @@ else
   LIBDIRSUFFIX=""
 fi
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-bridge-utils
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf bridge-utils-$VERSION
-tar xzf $CWD/bridge-utils-$VERSION.tar.gz || exit 1
+tar xf $CWD/bridge-utils-$VERSION.tar.xz || exit 1
 cd bridge-utils-$VERSION || exit 1
 
-zcat $CWD/bridge-utils.isbridge.diff.gz | patch -p1 --verbose || exit 1
-
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -71,17 +69,27 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# This is bad form, but what can you do...
-autoconf
+# Apply patches:
+zcat $CWD/bridge-utils-1.5-linux_3.8.x.patch.gz | patch -p1 --verbose || exit 1
 
-CFLAGS="$SLKCFLAGS" \
+# Configure:
+autoconf
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man
+  --includedir=/usr/include \
+  --with-linux-headers=/usr/include \
+  --mandir=/usr/man || exit 1
 
+# Build:
 make $NUMJOBS || make || exit 1
+
+# Install into package:
 make install DESTDIR=$PKG || exit 1
+mkdir -p $PKG/usr/include
+install -m 644 libbridge/libbridge.h $PKG/usr/include
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
+install -m 644 libbridge/libbridge.a $PKG/usr/lib${LIBDIRSUFFIX}
 
 mkdir -p $PKG/sbin
 mv $PKG/usr/sbin/brctl $PKG/sbin/brctl