1 files changed, 9 insertions, 8 deletions
diff --git a/libraries/stfl/stfl.SlackBuild b/libraries/stfl/stfl.SlackBuild
index 01d5ce1e9c77b..721a58fa16f56 100644
--- a/libraries/stfl/stfl.SlackBuild
+++ b/libraries/stfl/stfl.SlackBuild
@@ -47,15 +47,16 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 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 \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
-  -o -perm 400 \) -exec chmod 644 {} \;
+ \( -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 {} \;
 
 # Allow custom options in Makefile
 patch -p1 < $CWD/allow-custom-opts-in-Makefile.patch
-# Fix the install directory for Python
-patch -p1 < $CWD/fix-python-install-in-Makefile.patch
+# Add proper Python 2/3 support
+cp -r python python3
+patch -p1 < $CWD/python-support.patch
 
 make install \
   OPTS="$SLKCFLAGS" \
@@ -67,7 +68,7 @@ make install \
 find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
 find $PKG -depth -type d -empty -delete || true
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
 # make installs an example for perl in the lib path
@@ -80,7 +81,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 # install all examples into the doc directory
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
 cp -a \
-  example.{c,stfl} perl5/example*.pl python/example.* ruby/example.rb spl/*.spl \
+  example.{c,stfl} perl5/example*.pl python/example*.* ruby/example*.rb \
   $PKG/usr/doc/$PRGNAM-$VERSION/examples
 
 mkdir -p $PKG/install