diff options
| author | Kyle Guinn <elyk03@gmail.com> | 2010-05-13 00:41:30 +0200 |
|---|---|---|
| committer | David Somero <xgizzmo@slackbuilds.org> | 2010-05-13 00:41:30 +0200 |
| commit | 887fa6cd8e37c9f3e58aac8a7fe05892236785b9 (patch) | |
| tree | 4287215f29118fc7e30b2b8e49a292332af1d4d6 | |
| parent | 940b60af53b81cddb88e3031bf40d16a6fa33a4b (diff) | |
system/proj: Updated for version 4.6.0
| -rw-r--r-- | system/proj/proj.SlackBuild | 14 | ||||
| -rw-r--r-- | system/proj/proj.info | 4 |
2 files changed, 12 insertions, 6 deletions
diff --git a/system/proj/proj.SlackBuild b/system/proj/proj.SlackBuild index f040fa7e399be..676e7d3586bc8 100644 --- a/system/proj/proj.SlackBuild +++ b/system/proj/proj.SlackBuild @@ -14,14 +14,15 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM-$VERSION OUTPUT=${OUTPUT:-/tmp} -DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README" - 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 @@ -30,7 +31,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -43,6 +44,7 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --infodir=/usr/info \ @@ -64,11 +66,13 @@ make install-strip DESTDIR=$PKG ) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS COPYING ChangeLog INSTALL NEWS README \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild 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/system/proj/proj.info b/system/proj/proj.info index 5b1b716ab3a13..696cd73194de2 100644 --- a/system/proj/proj.info +++ b/system/proj/proj.info @@ -3,6 +3,8 @@ VERSION="4.6.0" HOMEPAGE="http://trac.osgeo.org/proj/" DOWNLOAD="http://download.osgeo.org/proj/proj-4.6.0.tar.gz" MD5SUM="975d9b5954869e53523726a9c0e0e070" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="Kyle Guinn" EMAIL="elyk03@gmail.com" -APPROVED="David Somero"
\ No newline at end of file +APPROVED="dsomero,rworkman" |