diff --git a/libraries/cln/cln.SlackBuild b/libraries/cln/cln.SlackBuild index 2cf18d2fc0..700434f2c7 100644 --- a/libraries/cln/cln.SlackBuild +++ b/libraries/cln/cln.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cln -VERSION=1.2.2 +VERSION=1.3.1 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -36,10 +36,13 @@ set -e 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 rm -rf $PKG @@ -55,6 +58,7 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ @@ -69,7 +73,7 @@ make install DESTDIR=$PKG ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ - xargs strip --strip-unneeded 2> /dev/null + xargs strip --strip-unneeded 2> /dev/null || true find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null ) @@ -77,9 +81,6 @@ make install DESTDIR=$PKG rm -f $PKG/usr/info/dir gzip -9 $PKG/usr/info/* -# Remove empty man dir -rm -rf $PKG/usr/man - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples cp -a \ COPYING INSTALL* NEWS README TODO \ @@ -87,17 +88,11 @@ cp -a \ cp -a \ examples/*.cc examples/*.1 \ $PKG/usr/doc/$PRGNAM-$VERSION/examples -# Move docs that ignore --docdir to their proper place -mv $PKG/usr/share/html $PKG/usr/share/dvi/* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -# Everything that was in $PKG/usr/share has been moved to -# $PKG/usr/doc/cln-$VERSION (or is empty at time of compression) -rm -rf $PKG/usr/share/ - mkdir -p $PKG/install 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/libraries/cln/cln.info b/libraries/cln/cln.info index a6c488c414..fcaa39da56 100644 --- a/libraries/cln/cln.info +++ b/libraries/cln/cln.info @@ -1,8 +1,10 @@ PRGNAM="cln" -VERSION="1.2.2" +VERSION="1.3.1" HOMEPAGE="http://www.ginac.de/CLN" -DOWNLOAD="ftp://ftpthep.physik.uni-mainz.de/pub/gnu/cln-1.2.2.tar.bz2" -MD5SUM="6b479281fec86314b4c7a9357bd83ef8" +DOWNLOAD="http://www.ginac.de/CLN/cln-1.3.1.tar.bz2" +MD5SUM="ede584cb1cafa66d56f42a3cf420469d" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="Andrew Psaltis" EMAIL="ampsaltis@gmail.com" APPROVED="rworkman" diff --git a/libraries/cln/slack-desc b/libraries/cln/slack-desc index a605235e95..739d82179c 100644 --- a/libraries/cln/slack-desc +++ b/libraries/cln/slack-desc @@ -15,5 +15,5 @@ cln: rationals, complex numbers and polynomials. The kernel is written in cln: assembly language. It uses garbage collection (automatic, without cln: imposing any burden on the main application). Many efficient cln: algorithms (i.e. for all transcendental functions) are implemented. -cln: +cln: cln: Check out more at: http://www.ginac.de/CLN/