[pkgsrc/trunk]: pkgsrc/geography/proj geography/proj: Include north-america d...

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b8ceb1e60e69
branches:  trunk
changeset: 330004:b8ceb1e60e69
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Wed Feb 20 17:33:59 2019 +0000

description:
geography/proj: Include north-america datumgrids file

While this makes the package larger, proj will silently fail to
produce correct results without the datumgrids files.  proj does not
have a mechanism to error out when they are needed and missing, so
this is the only safe approach.

(Other regions to follow.)

diffstat:

 geography/proj/Makefile |  14 +++++++++++---
 geography/proj/PLIST    |   7 ++++++-
 geography/proj/distinfo |   6 +++++-
 3 files changed, 22 insertions(+), 5 deletions(-)

diffs (83 lines):

diff -r 546e30e8f053 -r b8ceb1e60e69 geography/proj/Makefile
--- a/geography/proj/Makefile   Wed Feb 20 17:21:39 2019 +0000
+++ b/geography/proj/Makefile   Wed Feb 20 17:33:59 2019 +0000
@@ -1,14 +1,17 @@
-# $NetBSD: Makefile,v 1.12 2019/02/20 17:21:07 gdt Exp $
+# $NetBSD: Makefile,v 1.13 2019/02/20 17:33:59 gdt Exp $
 
 VERSION_BASE=  5.2.0
 VERSION_RC=    
 VERSION=       ${VERSION_BASE}${VERSION_RC}
+PKGREVISION=   1
 # proj RCs have names like 5.1.0RC1 but unpack to 5.1.0
 WRKSRC=                ${WRKDIR}/proj-${VERSION_BASE}
 DISTNAME=      proj-${VERSION}
 CATEGORIES=    geography
 MASTER_SITES=  https://download.osgeo.org/proj/
-DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} proj-datumgrid-1.8${EXTRACT_SUFX}
+DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} \
+               proj-datumgrid-1.8${EXTRACT_SUFX} \
+               proj-datumgrid-north-america-1.1${EXTRACT_SUFX}
 
 MAINTAINER=    gdt%NetBSD.org@localhost
 HOMEPAGE=      http://proj4.org/
@@ -26,10 +29,15 @@
 TEST_TARGET=           check
 
 # \todo Ideally, the files would be unpacked directly in nad.
+# The file lists are grouped in the same way as the datumgrid files
+# appear in DISTFILES.
 DATUMGRID_FILES=                                                       \
        BETA2007.gsb FL MD README.DATUMGRID TN WI WO alaska conus \
        egm96_15.gtx hawaii ntf_r93.gsb ntv1_can.dat null \
-       nzgd2kgrid0005.gsb prvi stgeorge stlrnc stpaul
+       nzgd2kgrid0005.gsb prvi stgeorge stlrnc stpaul \
+       \
+       vertconc.gtx vertconw.gtx gvr2016.gtx vertcone.gtx gvr2000.gtx \
+       GL README.NORTHAMERICA
 
 post-extract:
        cd ${WRKDIR} && ${LN} ${DATUMGRID_FILES} ${WRKSRC}/nad
diff -r 546e30e8f053 -r b8ceb1e60e69 geography/proj/PLIST
--- a/geography/proj/PLIST      Wed Feb 20 17:21:39 2019 +0000
+++ b/geography/proj/PLIST      Wed Feb 20 17:33:59 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2018/06/01 23:41:31 gdt Exp $
+@comment $NetBSD: PLIST,v 1.7 2019/02/20 17:33:59 gdt Exp $
 bin/cct
 bin/cs2cs
 bin/geod
@@ -39,6 +39,8 @@
 share/proj/epsg
 share/proj/esri
 share/proj/esri.extra
+share/proj/gvr2000.gtx
+share/proj/gvr2016.gtx
 share/proj/hawaii
 share/proj/nad.lst
 share/proj/nad27
@@ -53,4 +55,7 @@
 share/proj/stgeorge
 share/proj/stlrnc
 share/proj/stpaul
+share/proj/vertconc.gtx
+share/proj/vertcone.gtx
+share/proj/vertconw.gtx
 share/proj/world
diff -r 546e30e8f053 -r b8ceb1e60e69 geography/proj/distinfo
--- a/geography/proj/distinfo   Wed Feb 20 17:21:39 2019 +0000
+++ b/geography/proj/distinfo   Wed Feb 20 17:33:59 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2019/02/20 17:21:07 gdt Exp $
+$NetBSD: distinfo,v 1.12 2019/02/20 17:33:59 gdt Exp $
 
 SHA1 (proj-5.2.0.tar.gz) = 09cb68377e9901c0e1b817b58e820118ccb741e6
 RMD160 (proj-5.2.0.tar.gz) = d99eccff181bb002dd0e398a69fb26cbf57fc4d6
@@ -8,3 +8,7 @@
 RMD160 (proj-datumgrid-1.8.tar.gz) = 074fcfba2e41cbe81e5be45eddc0e38683d891ef
 SHA512 (proj-datumgrid-1.8.tar.gz) = 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
 Size (proj-datumgrid-1.8.tar.gz) = 6604329 bytes
+SHA1 (proj-datumgrid-north-america-1.1.tar.gz) = 721bf278aa2b012dfdabcb05cb5c25433f5b1a66
+RMD160 (proj-datumgrid-north-america-1.1.tar.gz) = eb4c5fe0c10bd27864d8336eeea02ed4dc4ce6dd
+SHA512 (proj-datumgrid-north-america-1.1.tar.gz) = c532f3c54e2e8dc465ff0777d53a8bc39bdba10d2517b1621156727acf0adee5f726b0d245d757993169613d30b82d4efd59c0e4ed558e53cf99429b698bef89
+Size (proj-datumgrid-north-america-1.1.tar.gz) = 19143459 bytes