1 files changed, 24 insertions, 19 deletions
diff --git a/desktop/afterstep/afterstep.SlackBuild b/desktop/afterstep/afterstep.SlackBuild
index c45743f4d6..0eefdeeb3a 100644
--- a/desktop/afterstep/afterstep.SlackBuild
+++ b/desktop/afterstep/afterstep.SlackBuild
@@ -23,25 +23,26 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220407 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - remove broken symlink /usr/bin/x-window-manager (if dpkg is installed).
+# - remove useless INSTALL in doc dir.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=afterstep
-VERSION=${VERSION:-2.2.12}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-20201113_f6da4b7}
+BUILD=${BUILD:-2}
 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
@@ -51,11 +52,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SRCNAM=AfterStep
-TREENAM=afterstep-devel
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
@@ -72,16 +70,23 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$SRCNAM-$VERSION
 cd $TMP
-tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
-cd $TREENAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+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 {} \+
+
+# Thanks debian!
+patch -p1 < $CWD/binutils-2.36.patch
+
+# 20220407 bkw: if dpkg is installed, 'make install' writes to
+# /etc/alternatives (not inside $PKG). Stop it.
+sed -i '/^install:/s, *install\.alternative,,' src/afterstep/Makefile.in
 
 CFLAGS="$SLKCFLAGS -fgnu89-inline" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -103,16 +108,16 @@ make install DESTDIR=$PKG
 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
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+gzip -9 $PKG/usr/man/man*/*
 
 install -D -m 0755 $CWD/xinitrc.afterstep $PKG/etc/X11/xinit/xinitrc.afterstep
 
 mkdir -p $PKG/usr/doc
 mv $PKG/usr/share/afterstep/doc/ $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYRIGHT ChangeLog INSTALL NEW README TEAM \
+cp -a COPYRIGHT ChangeLog NEW README TEAM \
   doc/licences doc/languages doc/code  $PKG/usr/doc/$PRGNAM-$VERSION
 ( cd $PKG/usr/share/afterstep ; ln -s ../../doc/$PRGNAM-$VERSION doc )
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc