From 186bffa0ba9ce15374a2f168e3b333dda93ec3f2 Mon Sep 17 00:00:00 2001 From: Benjamin Trigona-Harany Date: Sat, 3 Mar 2018 07:39:55 -0800 Subject: gis/proj: Updated for version 5.0.0. Signed-off-by: Benjamin Trigona-Harany --- gis/proj/README | 9 +++++--- gis/proj/jni.patch | 11 ---------- gis/proj/proj.SlackBuild | 53 ++++++++++++++++++++---------------------------- gis/proj/proj.info | 10 ++++----- gis/proj/slack-desc | 8 ++++---- 5 files changed, 37 insertions(+), 54 deletions(-) delete mode 100644 gis/proj/jni.patch (limited to 'gis/proj') diff --git a/gis/proj/README b/gis/proj/README index 373aeed2c4..7af2be3c54 100644 --- a/gis/proj/README +++ b/gis/proj/README @@ -1,3 +1,6 @@ -proj is a standard UNIX filter function which converts geographic -longitude and latitude coordinates into cartesian coordinates by means -of a wide variety of cartographic projection functions. +PROJ is a generic coordinate transformation software, that transforms +coordinates from one coordinate reference system (CRS) to another. This +includes cartographic projections as well as geodetic transformations. + +This SlackBuild also includes the datum grid files for PROJ (excluding the +regional resource packages). diff --git a/gis/proj/jni.patch b/gis/proj/jni.patch deleted file mode 100644 index 5b69aba8bf..0000000000 --- a/gis/proj/jni.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur proj-4.8.0.a/src/jniproj.c proj-4.8.0.b/src/jniproj.c ---- proj-4.8.0.a/src/jniproj.c 2012-02-20 17:11:24.000000000 -0800 -+++ proj-4.8.0.b/src/jniproj.c 2012-12-29 22:04:56.199425359 -0800 -@@ -49,7 +49,6 @@ - #include - #include - #include "projects.h" --#include "org_proj4_PJ.h" - #include - - #define PJ_FIELD_NAME "ptr" diff --git a/gis/proj/proj.SlackBuild b/gis/proj/proj.SlackBuild index cc163af416..53d7d4b425 100644 --- a/gis/proj/proj.SlackBuild +++ b/gis/proj/proj.SlackBuild @@ -22,14 +22,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=proj -VERSION=${VERSION:-4.9.3} -DGVERSION=${DGVERSION:-1.6} +VERSION=${VERSION:-5.0.0} +DGVERSION=${DGVERSION:-1.7} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -64,47 +64,38 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz 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 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \ - -o -perm 400 \) -exec chmod 644 {} \; - -# remove header that is no longer part of source -patch -p1 < $CWD/jni.patch + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --infodir=/usr/info \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-shared \ - --disable-static \ - --build=$ARCH-slackware-linux + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --infodir=/usr/info \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --enable-shared \ + --disable-static \ + --build=$ARCH-slackware-linux make make install-strip DESTDIR=$PKG -cat src/projects.h > $PKG/usr/include/projects.h unzip -d $PKG/usr/share/$PRGNAM $CWD/$PRGNAM-datumgrid-$DGVERSION.zip chmod o+rX $PKG/usr/share/$PRGNAM/* -( 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 -) +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ AUTHORS COPYING ChangeLog INSTALL NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/gis/proj/proj.info b/gis/proj/proj.info index b907db2b46..cbccdfacd0 100644 --- a/gis/proj/proj.info +++ b/gis/proj/proj.info @@ -1,10 +1,10 @@ PRGNAM="proj" -VERSION="4.9.3" +VERSION="5.0.0" HOMEPAGE="http://trac.osgeo.org/proj/" -DOWNLOAD="http://download.osgeo.org/proj/proj-4.9.3.tar.gz \ - http://download.osgeo.org/proj/proj-datumgrid-1.6.zip" -MD5SUM="d598336ca834742735137c5674b214a1 \ - 4dc75812515cfa744032bbf888c5caee" +DOWNLOAD="http://download.osgeo.org/proj/proj-5.0.0.tar.gz \ + http://download.osgeo.org/proj/proj-datumgrid-1.7.zip" +MD5SUM="51808f2ecceaf426de3b7bf53fc8aae7 + 156a20036ab6ce0e62fb1c3f1cb8d946" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/gis/proj/slack-desc b/gis/proj/slack-desc index 522f281201..4bea3390c2 100644 --- a/gis/proj/slack-desc +++ b/gis/proj/slack-desc @@ -8,10 +8,10 @@ |-----handy-ruler------------------------------------------------------| proj: proj (Cartograpic projection procedures) proj: -proj: proj is a standard UNIX filter function which converts geographic -proj: longitude and latitude coordinates into cartesian coordinates by -proj: means of a wide variety of cartographic projection functions. -proj: +proj: PROJ is a generic coordinate transformation software, that transforms +proj: coordinates from one coordinate reference system (CRS) to another. +proj: This includes cartographic projections as well as geodetic +proj: transformations. proj: proj: proj: -- cgit v1.2.3