diff --git a/libraries/enca/enca.SlackBuild b/libraries/enca/enca.SlackBuild index c52e5c3276..1c3a9d4ee8 100644 --- a/libraries/enca/enca.SlackBuild +++ b/libraries/enca/enca.SlackBuild @@ -3,7 +3,7 @@ # Written by Larry Hajali PRGNAM=enca -VERSION=${VERSION:-1.9} +VERSION=${VERSION:-1.13} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -15,13 +15,16 @@ 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 -eu +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -40,11 +43,9 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --enable-static=no \ - --enable-shared=yes \ --enable-gtk-doc \ --enable-external \ --build=$ARCH-slackware-linux @@ -65,12 +66,14 @@ make install DESTDIR=$PKG ) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS ChangeLog* COPYING FAQ INSTALL NEWS \ - README* THANKS TODO $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS ChangeLog* COPYING FAQ INSTALL README* THANKS TODO \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +(cd $PKG/usr/doc/$PRGNAM-$VERSION; ln -s ../../share/gtk-doc/html/libenca html) 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/enca/enca.info b/libraries/enca/enca.info index 2388549d5e..f2ef7313d8 100644 --- a/libraries/enca/enca.info +++ b/libraries/enca/enca.info @@ -1,8 +1,10 @@ PRGNAM="enca" -VERSION="1.9" -HOMEPAGE="http://directory.fsf.org/project/enca/" -DOWNLOAD="http://archlinux-stuff.googlecode.com/files/enca-1.9.tar.bz2" -MD5SUM="b3581e28d68d452286fb0bfe58bed3b3" +VERSION="1.13" +HOMEPAGE="http://gitorious.org/enca" +DOWNLOAD="http://dl.cihar.com/enca/enca-1.13.tar.bz2" +MD5SUM="762bead5d9a0a5e55024e1102baaa89d" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="Larry Hajali" EMAIL="larryhaja[at]gmail[dot]com" -APPROVED=dsomero +APPROVED="Erik Hanson" diff --git a/libraries/enca/slack-desc b/libraries/enca/slack-desc index b6a8139b89..4ebbc134f8 100644 --- a/libraries/enca/slack-desc +++ b/libraries/enca/slack-desc @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| enca: enca (Extremely Naive Charset Analyser) enca: -enca: Enca is an Extremely Naive Charset Analyser. It detects character -enca: set and encoding of text files and can also convert them to other +enca: Enca is an Extremely Native Charset Analyser. It detects character +enca: set and encoding of text files and can also convert them to other enca: encodings. enca: enca: Homepage: http://freshmeat.net/projects/enca/ enca: -enca: +enca: enca: enca: