1 files changed, 16 insertions, 16 deletions
diff --git a/network/heimdal/heimdal.SlackBuild b/network/heimdal/heimdal.SlackBuild
index bffccb9397..77a4c325de 100644
--- a/network/heimdal/heimdal.SlackBuild
+++ b/network/heimdal/heimdal.SlackBuild
@@ -2,8 +2,8 @@
 
 # Slackware build script for KTH Heimdal Kerberos
 
-# Copyright 2010 Menno Duurma
-# Copyright 2011-2019 Thibaut Notteboom, Paris, FRANCE
+# Copyright 2010 Menno Duursma
+# Copyright 2011-2021 Thibaut Notteboom, Paris, FRANCE
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 
 PRGNAM=heimdal
 VERSION=${VERSION:-7.7.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -72,20 +72,18 @@ find -L . \
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="-L/usr/lib$LIBDIRSUFFIX -lpthread" \
 ./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --prefix=/usr/heimdal \
+  --libdir=/usr/heimdal/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --infodir=/usr/info \
-  --mandir=/usr/man \
+  --mandir=/usr/heimdal/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-openldap=/usr \
-  --with-readline=/usr \
+  --with-libedit=/usr \
   --with-sqlite3=/usr \
   --with-libintl=/usr \
-  --with-berkeley-db-include=/usr/include/db48 \
   --with-x \
   --with-ipv6 \
   --without-hesiod \
@@ -103,22 +101,23 @@ make install-strip DESTDIR=$PKG
 mkdir -p $PKG/etc/rc.d
 cat $CWD/config/krb5.conf > $PKG/etc/krb5.conf.new
 cat $CWD/config/rc.kdc > $PKG/etc/rc.d/rc.kdc.new
-cat $CWD/config/rc.kadmind > $PKG/etc/rc.d/rc.kadmind.new
+cat $CWD/config/rc.kadmind > $PKG/etc/rc.d/rc.kadmind-heimdal.new
 cat $CWD/config/rc.kpasswdd > $PKG/etc/rc.d/rc.kpasswdd.new
 cat $CWD/config/rc.ipropd-master > $PKG/etc/rc.d/rc.ipropd-master.new
 cat $CWD/config/rc.ipropd-slave > $PKG/etc/rc.d/rc.ipropd-slave.new
 
+mkdir -p $PKG/etc/profile.d
+cat $CWD/config/heimdal.sh > $PKG/etc/profile.d/heimdal.sh.new
+
 mkdir -p $PKG/var/heimdal
 cat $CWD/config/kdc.conf > $PKG/var/heimdal/kdc.conf.new
 cat $CWD/config/kadmind.acl > $PKG/var/heimdal/kadmind.acl.new
 
-mv $PKG/usr/bin/su $PKG/usr/bin/su-heimdal
-
 # Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+rm -f $PKG/{,usr/}heimdal/lib/*.la
 
-rm -rf $PKG/usr/man/cat?
-find $PKG/usr/man -type f -exec gzip -9 -f {} \;
+rm -rf $PKG/usr/heimdal/man/cat?
+find $PKG/usr/heimdal/man -type f -exec gzip -9 -f {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 rm -f $PKG/usr/info/dir
@@ -133,7 +132,8 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
+sed -e "s|@LIBDIRSUFFIX@|$LIBDIRSUFFIX|" \
+  $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}