aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/geos/README2
-rw-r--r--libraries/geos/geos.SlackBuild16
-rw-r--r--libraries/geos/geos.info10
3 files changed, 16 insertions, 12 deletions
diff --git a/libraries/geos/README b/libraries/geos/README
index f74c050789a0e..b6cf0b40faed0 100644
--- a/libraries/geos/README
+++ b/libraries/geos/README
@@ -3,5 +3,3 @@ Suite (JTS). As such, it aims to contain the complete functionality
of JTS in C++. This includes all the OpenGIS "Simple Features for SQL"
spatial predicate functions and spatial operators, as well as specific
JTS enhanced topology functions.
-
-Dependencies: swig available at SlackBuilds.org
diff --git a/libraries/geos/geos.SlackBuild b/libraries/geos/geos.SlackBuild
index dd07ee6d8629e..1fbe50f79f5b2 100644
--- a/libraries/geos/geos.SlackBuild
+++ b/libraries/geos/geos.SlackBuild
@@ -4,7 +4,7 @@
# Written by Kyle Guinn <elyk03@gmail.com>
PRGNAM=geos
-VERSION=${VERSION:-3.0.0}
+VERSION=${VERSION:-3.0.4}
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -14,14 +14,15 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM-$VERSION
OUTPUT=${OUTPUT:-/tmp}
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
-
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 -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
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 \
@@ -58,11 +60,13 @@ make
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 TODO \
+ $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/libraries/geos/geos.info b/libraries/geos/geos.info
index 43ba17d9ebd37..ac5ee3bfee4cb 100644
--- a/libraries/geos/geos.info
+++ b/libraries/geos/geos.info
@@ -1,8 +1,10 @@
PRGNAM="geos"
-VERSION="3.0.0"
+VERSION="3.0.4"
HOMEPAGE="http://trac.osgeo.org/geos/"
-DOWNLOAD="http://geos.refractions.net/downloads/geos-3.0.0.tar.bz2"
-MD5SUM="3f7940abee9fec69a9787878cd3ae771"
+DOWNLOAD="http://download.osgeo.org/geos/geos-3.0.4.tar.bz2"
+MD5SUM="bd105fc583de019755ccd6950127c33a"
+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"