4 files changed, 114 insertions, 7 deletions
diff --git a/system/afdko/afdko.SlackBuild b/system/afdko/afdko.SlackBuild
index 9413fca168..5c6cc38389 100644
--- a/system/afdko/afdko.SlackBuild
+++ b/system/afdko/afdko.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=afdko
 VERSION=${VERSION:-2.5.65322}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -81,12 +81,12 @@ cd FDK/Tools/Programs
 cd ../..
 
 # Replacement for make install
-mkdir -p $PKG/opt/$PRGNAM
-mv Tools/linux Tools/SharedData $PKG/opt/$PRGNAM
+mkdir -p $PKG/opt/$PRGNAM/Tools
+mv Tools/linux Tools/SharedData $PKG/opt/$PRGNAM/Tools
 
-mkdir -p $PKG/opt/$PRGNAM/linux/Python/Current/bin
+mkdir -p $PKG/opt/$PRGNAM/Tools/linux/Python/Current/bin
 ln -s $(readlink -f $(type -p python)) \
-  $PKG/opt/$PRGNAM/linux/Python/Current/bin/python2.7
+  $PKG/opt/$PRGNAM/Tools/linux/Python/Current/bin/python2.7
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/system/afdko/afdko.SlackBuild.orig b/system/afdko/afdko.SlackBuild.orig
new file mode 100644
index 0000000000..9413fca168
--- /dev/null
+++ b/system/afdko/afdko.SlackBuild.orig
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Slackware build script for afdko
+
+# Copyright 2017 Duncan Roe, Melbourne, Australia
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=afdko
+VERSION=${VERSION:-2.5.65322}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+# This symlink is not required (but another one is, later)
+rm -f $PRGNAM-$VERSION/FDK/Tools/linux/AFDKOPython
+
+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 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Non-standard build process - see README
+
+# Replacement for ./configure
+if [ "$LIBDIRSUFFIX" = 64 ]; then
+  for i in $(find . -name Makefile -o -name '*.mak' | \
+    xargs grep -E -- -m32 | cut -f1 -d:); do
+    cat $i | sed 's/ -m32//' >t5
+    mv t5 $i
+  done
+fi
+
+# Replacement for make
+cd FDK/Tools/Programs
+./BuildAllLinux.sh
+cd ../..
+
+# Replacement for make install
+mkdir -p $PKG/opt/$PRGNAM
+mv Tools/linux Tools/SharedData $PKG/opt/$PRGNAM
+
+mkdir -p $PKG/opt/$PRGNAM/linux/Python/Current/bin
+ln -s $(readlink -f $(type -p python)) \
+  $PKG/opt/$PRGNAM/linux/Python/Current/bin/python2.7
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/etc/profile.d
+cp -a $CWD/afdko.sh $CWD/afdko.csh $PKG/etc/profile.d/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AFDKO-Overview.html FDK\ Build\ Notes.txt FDKReleaseNotes.txt \
+  Read_Me_First.html Technical\ Documentation ../LICENSE.txt ../README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/afdko/afdko.csh b/system/afdko/afdko.csh
index 558ae98046..ed45f133d1 100644
--- a/system/afdko/afdko.csh
+++ b/system/afdko/afdko.csh
@@ -1,5 +1,5 @@
 #!/bin/csh
-setenv FDK_EXE /opt/afdko/linux
+setenv FDK_EXE /opt/afdko/Tools/linux
 if ( $?PATH ) then
   echo :${PATH}: | grep -q :${FDK_EXE}: || setenv PATH ${PATH}:${FDK_EXE}
 else
diff --git a/system/afdko/afdko.sh b/system/afdko/afdko.sh
index 90ded0ef4f..818eb40961 100644
--- a/system/afdko/afdko.sh
+++ b/system/afdko/afdko.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-FDK_EXE="/opt/afdko/linux"
+FDK_EXE="/opt/afdko/Tools/linux"
 if [ ! "$PATH" = "" ]; then
   echo :$PATH: | grep -q :$FDK_EXE: || PATH=$PATH:$FDK_EXE
 else