diff options
| -rw-r--r-- | network/heimdal/heimdal.SlackBuild | 55 | ||||
| -rw-r--r-- | network/heimdal/heimdal.csh | 2 | ||||
| -rw-r--r-- | network/heimdal/heimdal.info | 12 | ||||
| -rw-r--r-- | network/heimdal/heimdal.sh | 3 |
4 files changed, 35 insertions, 37 deletions
diff --git a/network/heimdal/heimdal.SlackBuild b/network/heimdal/heimdal.SlackBuild index df146ea945..d808b8eeb3 100644 --- a/network/heimdal/heimdal.SlackBuild +++ b/network/heimdal/heimdal.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for KTH Heimdal Kerberos -# Written by Menno E. Duursma <druiloor@zonnet.nl> +# Written by Menno Duursma <druiloor@zonnet.nl> # Modified by the SlackBuilds.org project # This program is free software. It comes without any warranty. @@ -9,7 +9,7 @@ # http://sam.zoy.org/wtfpl/COPYING for more details. PRGNAM=heimdal -VERSION=1.2.1 +VERSION=1.3.1 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -21,10 +21,13 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e # Exit immediately if a command exits with a non-zero status. @@ -53,50 +56,38 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr/heimdal \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ --infodir=/usr/info \ - --mandir=/usr/man \ + --mandir=/usr/heimdal/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux \ --enable-shared=yes \ - --enable-kcm \ + --without-openldap \ --without-hesiod \ --without-ipv6 \ - --without-openldap \ - --with-x \ - --build=$ARCH-slackware-linux \ - --host=$ARCH-slackware-linux + --enable-kcm \ + --with-x make -make install DESTDIR=$PKG - -( cd $PKG || exit 1 - find . -type f \ - | xargs file \ - | grep -e "executable" -e "shared object" \ - | grep ELF \ - | cut -f 1 -d : \ - | xargs strip --strip-unneeded 2> /dev/null -) +make install-strip DESTDIR=$PKG -( cd $PKG/usr/man || exit 1 - rm -rf cat* +( cd $PKG/usr/heimdal/man + rm -rf cat? # We don't want these find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do - ln -s $(readlink $i).gz $i.gz ; rm $i - done + for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done ) -( cd $PKG/usr/info || exit 1 - rm -f dir - find . -type f -exec gzip -9 {} \; - # Link the main compressed info page to a name as if it was clear - # as otherwise the GNU info utility somehow fails to render it... - ln -s heimdal.info.gz heimdal -) +rm -f $PKG/usr/info/dir +gzip -9 $PKG/usr/info/* +( cd $PKG/usr/info ; ln -s heimdal.info.gz heimdal ) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a [A-Z][A-Z]* ChangeLog* etc/services.append $PKG/usr/doc/$PRGNAM-$VERSION cp -a doc/{init-creds,layman.asc,mdate-sh} $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo +cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README$TAG find $PKG/usr/doc -type f -exec chmod -x {} \; # Add sample krb5.conf file (may not be needed) @@ -124,4 +115,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/heimdal/heimdal.csh b/network/heimdal/heimdal.csh index fb394bff7b..be96ce7347 100644 --- a/network/heimdal/heimdal.csh +++ b/network/heimdal/heimdal.csh @@ -1,5 +1,7 @@ #!/bin/csh +setenv MANPATH ${MANPATH}:/usr/heimdal/man + setenv PATH "${PATH}:/usr/heimdal/bin" if ( x"$uid" == x"0" ) then setenv PATH "${PATH}:/usr/heimdal/sbin" diff --git a/network/heimdal/heimdal.info b/network/heimdal/heimdal.info index 20e2c18b1c..54379c05e7 100644 --- a/network/heimdal/heimdal.info +++ b/network/heimdal/heimdal.info @@ -1,8 +1,10 @@ PRGNAM="heimdal" -VERSION="1.2.1" +VERSION="1.3.1" HOMEPAGE="http://www.h5l.org" -DOWNLOAD="http://www.h5l.org/dist/src/heimdal-1.2.1.tar.gz" -MD5SUM="6e5028077e2a6b101a4a72801ba71b9e" -MAINTAINER="Menno E. Duursma" +DOWNLOAD="http://www.h5l.org/dist/src/heimdal-1.3.1.tar.gz" +MD5SUM="4ce17deae040a3519e542f48fd901f21" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="Menno Duursma" EMAIL="druiloor@zonnet.nl" -APPROVED="David Somero"
\ No newline at end of file +APPROVED="rworkman" diff --git a/network/heimdal/heimdal.sh b/network/heimdal/heimdal.sh index 21f1d9bc8b..561d30a296 100644 --- a/network/heimdal/heimdal.sh +++ b/network/heimdal/heimdal.sh @@ -1,5 +1,8 @@ #!/bin/sh +MANPATH="$MANPATH:/usr/heimdal/man" +export MANPATH + PATH="${PATH}:/usr/heimdal/bin" if [ x"${EUID}" == x"0" ]; then PATH="${PATH}:/usr/heimdal/sbin" |