1 files changed, 8 insertions, 20 deletions
diff --git a/network/exim/exim.SlackBuild b/network/exim/exim.SlackBuild
index 63aac71480..30e22eb56b 100644
--- a/network/exim/exim.SlackBuild
+++ b/network/exim/exim.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# vim: ts=2 sts=2 sw=2 expandtab
+# vim: ts=2 sts=2 sw=2 et
 
 # Slackware build script for Exim
 
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=exim
-VERSION=${VERSION:-4.80.1}
+VERSION=${VERSION:-4.82}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -105,19 +105,14 @@ FULLECHO="" LIBDIRSUFFIX=$LIBDIRSUFFIX DESTDIR=$PKG make -e install
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# Ditch the symlink and move the binary to its final destination.
-rm -f $PKG/usr/sbin/exim
-mv $PKG/usr/sbin/exim-$VERSION-? $PKG/usr/sbin/exim
+# Rename the version specific binary to simply 'exim'.
+mv $PKG/usr/sbin/exim-$VERSION-* $PKG/usr/sbin/exim
 
 # Additional symlinks provide compatibility with sendmail
 mkdir -p $PKG/usr/lib     # no LIBDIRSUFFIX here!
 ( cd $PKG/usr/lib;  ln -s /usr/sbin/exim sendmail )
 ( cd $PKG/usr/sbin; ln -s /usr/sbin/exim sendmail )
 
-# Nobody should use an unedited default config.
-mv $PKG/etc/exim/exim.conf $PKG/etc/exim/exim.conf.example
-mv $PKG/etc/exim/aliases $PKG/etc/exim/aliases.example
-
 # Install accompanying scripts and configs.
 mkdir -p $PKG/etc/{cron.daily,logrotate.d,rc.d}
 install -m 0755 $CWD/contrib/rc.exim.new    $PKG/etc/rc.d/rc.exim.new
@@ -130,23 +125,16 @@ mkdir -p -m 0750 $PKG/var/spool/exim/
 mkdir -p -m 0750 $PKG/var/spool/exim/{db,input,msglog}
 chown -R exim.exim $PKG/var/{log,spool}/exim
 
-# Install the various manpages
-mkdir -p $PKG/usr/man/man8
-mv doc/exim.8 $PKG/usr/man/man8/
-install -m 0644 $CWD/manpages/*.8 $PKG/usr/man/man8/
-find $PKG/usr/man/man8 -type f -exec gzip -9 {} \;
-( cd $PKG/usr/man/man8
-  ln -s exim_db.8.gz exim_dumpdb.8.gz
-  ln -s exim_db.8.gz exim_fixdb.8.gz
-  ln -s exim_db.8.gz exim_tidydb.8.gz
-)
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   ABOUT ACKNOWLEDGMENTS CHANGES LICENCE NOTICE README* doc \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# Don't use the default config - make it part of the documentation
+mv $PKG/etc/exim/exim.conf $PKG/usr/doc/$PRGNAM-$VERSION/example-exim.conf
+mv $PKG/etc/exim/aliases $PKG/usr/doc/$PRGNAM-$VERSION/example-aliases
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh