From 124cf9d674feb51abb83b066bbfc340c7f079c7a Mon Sep 17 00:00:00 2001
From: Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
Date: Mon, 23 Dec 2013 18:25:11 +0100
Subject: academic/osm2pgsql: Updated for version 0.84.0.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 academic/osm2pgsql/osm2pgsql.SlackBuild | 13 +++++++------
 academic/osm2pgsql/osm2pgsql.info       |  6 +++---
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'academic')

diff --git a/academic/osm2pgsql/osm2pgsql.SlackBuild b/academic/osm2pgsql/osm2pgsql.SlackBuild
index 7159a25f70..2842d03d46 100644
--- a/academic/osm2pgsql/osm2pgsql.SlackBuild
+++ b/academic/osm2pgsql/osm2pgsql.SlackBuild
@@ -22,7 +22,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=osm2pgsql
-VERSION=${VERSION:-0.81.0}
+VERSION=${VERSION:-0.84.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -39,9 +39,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# downloading tarballs from GitHub gives you an extensionless file with this name
-GITREV=af61cae
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -62,8 +59,12 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$GITREV
-cd openstreetmap-$PRGNAM-$GITREV
+if [ -e $CWD/$VERSION.tar.gz ]; then
+ tar xvf $CWD/$VERSION.tar.gz
+else
+ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+fi
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/academic/osm2pgsql/osm2pgsql.info b/academic/osm2pgsql/osm2pgsql.info
index 0aad5d2390..17528ec3f1 100644
--- a/academic/osm2pgsql/osm2pgsql.info
+++ b/academic/osm2pgsql/osm2pgsql.info
@@ -1,8 +1,8 @@
 PRGNAM="osm2pgsql"
-VERSION="0.81.0"
+VERSION="0.84.0"
 HOMEPAGE="https://wiki.openstreetmap.org/wiki/Osm2pgsql"
-DOWNLOAD="https://github.com/openstreetmap/osm2pgsql/tarball/af61cae"
-MD5SUM="14bd700f3b045214e64a3cc271bed518"
+DOWNLOAD="https://github.com/openstreetmap/osm2pgsql/archive/0.84.0.tar.gz"
+MD5SUM="e3941d1ae323668fa0470f756ec3e01a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="postgis"
-- 
cgit v1.2.3