diff options
| -rw-r--r-- | libraries/yaz/yaz.SlackBuild | 23 | ||||
| -rw-r--r-- | libraries/yaz/yaz.info | 11 |
2 files changed, 20 insertions, 14 deletions
diff --git a/libraries/yaz/yaz.SlackBuild b/libraries/yaz/yaz.SlackBuild index 15b85723e7..c78e0086cb 100644 --- a/libraries/yaz/yaz.SlackBuild +++ b/libraries/yaz/yaz.SlackBuild @@ -24,7 +24,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=yaz -VERSION=${VERSION:-3.0.44} +VERSION=${VERSION:-3.0.52} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -35,9 +35,14 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi # Exit on most errors @@ -54,25 +59,25 @@ find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --localstatedir=/var \ --sysconfdir=/etc \ - --mandir=/usr/man \ - --disable-debug + --mandir=/usr/man make -make install-strip DESTDIR=$PKG +make install-strip DESTDIR=$PKG ( cd $PKG/usr/man find . -type f -exec gzip -9 {} \; for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done ) -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION mv $PKG/usr/share/doc/yaz $PKG/usr/doc/$PRGNAM-$VERSION/html rm -rf $PKG/usr/share/doc cp -a LICENSE NEWS README ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION @@ -82,4 +87,4 @@ mkdir $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/yaz/yaz.info b/libraries/yaz/yaz.info index 908a9d8769..bd93f18d5d 100644 --- a/libraries/yaz/yaz.info +++ b/libraries/yaz/yaz.info @@ -1,9 +1,10 @@ PRGNAM="yaz" -VERSION="3.0.44" +VERSION="3.0.52" HOMEPAGE="http://www.indexdata.dk/yaz/" -DOWNLOAD="http://ftp.indexdata.dk/pub/yaz/yaz-3.0.44.tar.gz" -MD5SUM="330730a4a7a097447ed3abe09d38e0ce" +DOWNLOAD="http://ftp.indexdata.dk/pub/yaz/yaz-3.0.52.tar.gz" +DOWNLOAD_x86_64="" +MD5SUM="d6fcac6b3a9917ab8e8efe8025f2cdbd" +MD5SUM_x86_64="" MAINTAINER="Michiel van Wessem" EMAIL="michiel@slackbuilds.org" -APPROVED="dsomero" - +APPROVED="Erik Hanson" |