diff --git a/libraries/cbase/cbase.SlackBuild b/libraries/cbase/cbase.SlackBuild index 76e201e71f..4525f66d8a 100644 --- a/libraries/cbase/cbase.SlackBuild +++ b/libraries/cbase/cbase.SlackBuild @@ -9,7 +9,7 @@ # For details see http://sam.zoy.org/wtfpl/COPYING PRGNAM=cbase -VERSION=${VERSION:-1.3.4} +VERSION=${VERSION:-1.3.5} 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 on most errors @@ -46,6 +49,7 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --infodir=/usr/info \ @@ -60,10 +64,10 @@ gzip -9 $PKG/usr/info/*.info* mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a [A-Z][A-Z]* ChangeLog $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.$TAG +cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README$TAG mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc 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/cbase/cbase.info b/libraries/cbase/cbase.info index 5cecb85f35..ce7352d6d0 100644 --- a/libraries/cbase/cbase.info +++ b/libraries/cbase/cbase.info @@ -1,8 +1,10 @@ PRGNAM="cbase" -VERSION="1.3.4" +VERSION="1.3.5" HOMEPAGE="http://www.hyperrealm.com/main.php?s=cbase" -DOWNLOAD="http://www.hyperrealm.com/cbase/cbase-1.3.4.tar.gz" -MD5SUM="71deb31c9e76368d4c3a204fe3b4fedf" +DOWNLOAD="http://www.hyperrealm.com/cbase/cbase-1.3.5.tar.gz" +DOWNLOAD_x86_64="" +MD5SUM="931eac69238f607effcc2ce71c6cc0f5" +MD5SUM_x86_64="" MAINTAINER="Menno Duursma" EMAIL="druiloor@zonnet.nl" APPROVED="dsomero" diff --git a/libraries/cbase/slack-desc b/libraries/cbase/slack-desc index 5c09ac6f28..888678cf9a 100644 --- a/libraries/cbase/slack-desc +++ b/libraries/cbase/slack-desc @@ -4,6 +4,7 @@ # on the right side marks the last column you can put a character in. You must # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. + |-----handy-ruler------------------------------------------------------| cbase: cbase (C routines library) cbase: