rebase on current emacs.SlackBuild

Signed-off-by: Gwenhael Le Moine <gwenhael.le.moine@gmail.com>

e/emacs/SlackBuild

@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2015, 2017, 2018, 2019, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,36 +20,71 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Slackware build script for emacs-trunk
-
 # Written by Dušan Stefanović (stefanovic.dusan@gmail.com)
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 # Modified by Patrick Volkerding <volkerdi@slackware.com>
-# Modified by Gwenhael Le Moine <gwenhael.le.moine@gmail.com>
 
-CWD=$(pwd)
+cd $(dirname $0) ; CWD=$(pwd)
 
-PRGNAM=emacs
+PKGNAM=emacs
-VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")}
-ARCH=${ARCH:-$(uname -m)}
-NUMJOBS=${NUMJOBS:-" -j3 "}
 BUILD=${BUILD:-1}
-BRANCH=${BRANCH:-"master"}
-
 TAG=gwh
-OUTPUT=/tmp
+# Determine version number the tarball is labeled with:
-TMP=${TMP:-/tmp/$TAG}
+#TARBALLVER=${TARBALLVER:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-PKG=$TMP/pkg-$PRGNAM
+# OK, now what's being used as the source directory version number...  account
-REPOSITORY=/home/installs/SlackBuilds/repositories/$PRGNAM
+# for subversions a, b, c, and d in the $TARBALLVER:
+#SRCDIRVER=$(echo $TARBALLVER | tr -d a | tr -d b | tr -d c | tr -d d)
+# I guess this is the main "version"...  we don't use this variable anywhere below, but
+# defining it is traditional:
+#VERSION=$SRCDIRVER
 
-SLKCFLAGS="-O2 -fPIC"
+REPOSITORY=/home/installs/SlackBuilds/repositories/$PKGNAM
 
-X_TOOLKIT=${X_TOOLKIT:=lucid}
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *) ARCH=$(uname -m) ;;
+  esac
+  export ARCH
+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 "$PKGNAM-$TARBALLVER-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+else
+  SLKCFLAGS="-O2"
+fi
+
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf $PRGNAM
+rm -rf $PKGNAM
 
 [ ! -e $REPOSITORY ] && git clone git://git.savannah.gnu.org/emacs.git $REPOSITORY
 
@@ -60,27 +95,29 @@ rm -rf $PRGNAM
 )
 VERSION="$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )"
 
-cd $TMP
+mkdir -p $TMP/$PKGNAM
-mkdir -p $TMP/$PRGNAM
 SRCDIR=$REPOSITORY
 
-cd $PRGNAM || exit 1
+cd $PKGNAM || exit 1
+
+# tar xvf $CWD/$PKGNAM-$TARBALLVER.tar.xz || exit 1
+# cd $PKGNAM-$SRCDIRVER || exit 1
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-     -exec chmod 755 {} \; -o \
+  -exec chmod 755 {} \+ -o \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-     -exec chmod 644 {} \;
+  -exec chmod 644 {} \+
 
-( cd $SRCDIR
+#autoreconf -vif
-  ./autogen.sh
+$SRCDIR/autogen.sh
-)
 
 EMACS_VERSION=$(grep "AC_INIT(GNU Emacs," $SRCDIR/configure.ac | cut -d, -f 2 | tr -d \ )
 
 CFLAGS="$SLKCFLAGS" \
-      CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
-      $SRCDIR/configure \
+$SRCDIR/configure \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
@@ -88,19 +125,18 @@ CFLAGS="$SLKCFLAGS" \
   --program-suffix="" \
   --mandir=/usr/man \
   --infodir=/usr/info \
+  --without-gconf \
+  --without-gsettings \
+  --with-modules \
   --with-x \
-      --with-x-toolkit=$X_TOOLKIT \
+  --with-x-toolkit=${X_TOOLKIT:-gtk3} \
   --without-toolkit-scroll-bars \
   --enable-link-time-optimization \
   --with-compress-install \
   --without-gconf \
   --with-gameuser=":games" \
-      --with-modules \
   --disable-libsystemd \
-      --disable-build-details \
+  --build=${ARCH}-slackware-linux || exit 1
-      --build=${ARCH}-slackware-linux
-
-make bootstrap
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
@@ -108,13 +144,50 @@ make install DESTDIR=$PKG || exit 1
 ( cd $PKG/usr/bin
   rm emacs
   mv emacs-${EMACS_VERSION} emacs-${EMACS_VERSION}-with-x11
-  ln -s emacs-${EMACS_VERSION}-with-x11 emacs
+)
-#   cat <<EOF > $PKG/usr/bin/emacs
-# #!/bin/sh
 
-# XMODIFIERS= GTK_IM_MODULE= QT_IM_MODULE= /usr/bin/emacs-${EMACS_VERSION}-with-x11 "\$@"
+# Also add a version of the binary that is not linked to X11:
-# EOF
+cd $TMP
-#   chmod +x $PKG/usr/bin/emacs
+rm -fr $TMP/$PKGNAM
+mkdir -p $TMP/$PKGNAM
+cd $PKGNAM || exit 1
+
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -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 {} \+
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+$SRCDIR/configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --program-prefix="" \
+  --program-suffix="" \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --without-gconf \
+  --without-gsettings \
+  --with-modules \
+  --with-x=no \
+  --build=${ARCH}-slackware-linux || exit 1
+
+make $NUMJOBS || make || exit 1
+
+# Install the non-x version:
+cat src/emacs > $PKG/usr/bin/emacs-${EMACS_VERSION}-no-x11
+chown root:root $PKG/usr/bin/emacs-${EMACS_VERSION}-no-x11
+chmod 1755 $PKG/usr/bin/emacs-${EMACS_VERSION}-no-x11
+
+# Create unversioned symlinks for both versions of emacs:
+( cd $PKG/usr/bin
+  ln -sf emacs-${EMACS_VERSION}-with-x11 emacs-with-x11
+  ln -sf emacs-${EMACS_VERSION}-no-x11 emacs-no-x11
+  # Create a plain "emacs" symlink pointing to emacs-with-x11:
+  ln -sf emacs-with-x11 emacs
 )
 
 # Seems like this nonsense is finally obsolete:
@@ -127,66 +200,46 @@ fi
 
 # This avoids a collision with Exuberant Ctags...
 mv $PKG/usr/bin/ctags $PKG/usr/bin/ctags-emacs
-mv $PKG/usr/man/man1/ctags.1 $PKG/usr/man/man1/ctags-emacs.1
+if [ -r $PKG/usr/man/man1/ctags.1 ]; then
+  mv $PKG/usr/man/man1/ctags.1 $PKG/usr/man/man1/ctags-emacs.1
+elif [ -r $PKG/usr/man/man1/ctags.1.gz ]; then
+  mv $PKG/usr/man/man1/ctags.1.gz $PKG/usr/man/man1/ctags-emacs.1.gz
+fi
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-rm $PKG/usr/info/dir*
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \+
+  for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+)
 
-mkdir -p $PKG/usr/doc/$PRGNAM
+( cd $PKG/usr/info
-cp -a  BUGS \
+  rm -f dir
-   CONTRIBUTE \
+  gzip -9 *
-   COPYING \
+)
-   ChangeLog \
+
-   INSTALL \
+mkdir -p $PKG/usr/doc/$PKGNAM-$EMACS_VERSION
-   INSTALL.REPO \
+cp -a \
-   README \
+  AUTHORS COPYING* INSTALL README* \
-   $PKG/usr/doc/$PRGNAM
+  $PKG/usr/doc/$PKGNAM-$EMACS_VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$EMACS_VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mkdir -p $PKG/install
-cat <<EOF > $PKG/install/slack-desc
+cat $CWD/slack-desc > $PKG/install/slack-desc
-     |-----handy-ruler------------------------------------------------------|
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
-emacs: emacs (GNU Emacs)
-emacs:
-emacs: Emacs is the extensible, customizable, self-documenting real-time
-emacs: display editor. If this seems to be a bit of a mouthful, an
-emacs: easier explanation is that Emacs is a text editor and more. At
-emacs: its core is an interpreter for Emacs Lisp, a dialect of the Lisp
-emacs: programming language with extensions to support text editing.
-emacs: This version supports X.
-emacs:
-emacs: http://www.gnu.org/software/emacs/
-emacs:
-EOF
 
-cat <<EOF > $PKG/install/doinst.sh
+# Tag packages that use a toolkit other than default (currently gtk3):
-# Vim ships a better (IMHO) version of ctags, and we don't want
+if [ -z "$TAG" ] && [ ! -z "$X_TOOLKIT" ]; then
-# to overwrite it with this one.  If you really want emacs' ctags
+  TAG="_$X_TOOLKIT"
-# either copy or link it into place yourself, or remove the vim
-# packages and reinstall emacs.  Besides, does anyone know/use
-# *both* emacs and vi?  I'd think that would bring the universe
-# to an end.  ;-)
-if [ ! -e usr/bin/ctags ]; then
-  cp -a usr/bin/ctags-emacs usr/bin/ctags
-  cp -a usr/man/man1/ctags-emacs.1.gz usr/man/man1/ctags.1.gz
 fi
-EOF
-
-# Make the .desktop file
-mkdir -p $PKG/usr/share/applications
-cat << "EOF" > $PKG/usr/share/applications/$PRGNAM.desktop
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Exec=emacs
-Icon=emacs.png
-Terminal=0
-Name=Emacs
-Comment=Text Editor
-Categories=Application;Development;
-EOF
 
 cd $PKG
-rm -f $PKG/{,usr/}lib$(uname -m | grep -o 64)/*.la
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-${EMACS_VERSION}_$VERSION-$ARCH-$BUILD$TAG.txz
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${EMACS_VERSION}_$VERSION-$ARCH-$BUILD$TAG.txz