1 files changed, 25 insertions, 28 deletions
diff --git a/development/xemacs/xemacs.SlackBuild b/development/xemacs/xemacs.SlackBuild
index faddaf4a66694..7cc954c509c89 100644
--- a/development/xemacs/xemacs.SlackBuild
+++ b/development/xemacs/xemacs.SlackBuild
@@ -7,7 +7,8 @@
 #   better consistency with existing SBo scripts...
 
 PRGNAM=xemacs
-VERSION=21.4.22
+VERSION=${VERSION:-21.5.34}
+SRCVER=21.5-b34
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -45,31 +46,33 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xf $CWD/$PRGNAM-$VERSION.tar.bz2
+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 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# These patches allow building xemacs with xemacs installed
-# dump-paths patch from Enrico Scholz
-patch -p1 < $CWD/patches/dump-paths.patch || exit 1
-patch -p1 < $CWD/patches/check-features.patch || exit 1
+patch -p0 < $CWD/c11.patch
 
 # XEmacs is hardcoded to look in lib
 if [ "$ARCH" = "x86_64" ]; then
-  patch -p1 < $CWD/patches/lib64.patch
+   patch -p1 < $CWD/patches/lib64.patch
 fi
 
-# Sighhhhhh.....
-patch -p1 < $CWD/patches/mod-shift.patch
-
 CFLAGS="$SLKCFLAGS" \
   ./configure \
   --prefix=/usr \
   --libdir=/usr/lib$LIBDIRSUFFIX \
   --datadir=/usr/lib${LIBDIRSUFFIX} \
   --with-sound=none \
-  --with-file-coding \
-  $ARCH-slackware-linux
+  --with-jpeg \
+  --with-png \
+  --with-tiff \
+  --with-x \
+  --build=$ARCH-slackware-linux
 
 make
 make install \
@@ -92,20 +95,20 @@ rm -rf $PKG/usr/lib$LIBDIRSUFFIX/xemacs-$VERSION/$ARCH-slackware-linux/include
 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
 
-gzip $PKG/usr/man/*/*
+mkdir -p $PKG/usr/man/man1
+mv $PKG/usr/share/man/* $PKG/usr/man/man1/
+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
+rm -rf $PKG/usr/share/man
 
-# gzip info stuff, but not the dir file
-gzip -9 $PKG/usr/lib${LIBDIRSUFFIX}/xemacs-$VERSION/info/*
-gzip -d $PKG/usr/lib${LIBDIRSUFFIX}/xemacs-$VERSION/info/dir.gz
+gzip -9 $PKG/usr/share/$PRGNAM-$SRCVER/info/*.info*
 
 # Fixup some conflicts with stock Slackware packages
-for file in b2m ctags etags rcs-checkin ; do mv $PKG/usr/bin/$file{,-xemacs} ; done
+for file in b2m ctags etags ; do mv $PKG/usr/bin/$file{,-xemacs} ; done
 for file in ctags etags ; do mv $PKG/usr/man/man1/$file{,-xemacs}.1.gz ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  BUGS CHANGES-* COPYING ChangeLog Installation PROBLEMS README* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES-* COPYING ChangeLog INSTALL Installation PROBLEMS README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -113,17 +116,11 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cat <<EOF >$PKG/install/doinst.sh
 # Make sure the elc files are newer than the el files
-touch usr/lib${LIBDIRSUFFIX}/xemacs-$VERSION/lisp/*.elc
-touch usr/lib${LIBDIRSUFFIX}/xemacs-$VERSION/lisp/*/*.elc
+touch usr/lib${LIBDIRSUFFIX}/xemacs-$SRCVER/lisp/*.elc
+touch usr/lib${LIBDIRSUFFIX}/xemacs-$SRCVER/lisp/*/*.elc
 touch usr/lib${LIBDIRSUFFIX}/xemacs/xemacs-packages/lisp/xemacs-base/*.elc
 touch usr/lib${LIBDIRSUFFIX}/xemacs/xemacs-packages/lisp/efs/*.elc
 EOF
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
-# Clean up the extra stuff:
-if [ "$1" = "--cleanup" ]; then
-    rm -rf $TMP/$PRGNAM-${VERSION}
-    rm -rf $PKG
-fi