pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

proj: Update to 6.2.1

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sun Jan 5 12:24:27 2020 -0500
Changeset:	49e93fc781f220986c827e724a4c9c7513bc5bf9

Modified Files:
	proj/Makefile
	proj/PLIST
	proj/TODO
	proj/distinfo
Added Files:
	proj/options.mk
Removed Files:
	proj/patches/patch-configure

Log Message:
proj: Update to 6.2.1

Packaging change: Make extra grids optional, mostly because tests must
be done without them.

Upstream changes (many bugfixes omitted):

6.2.1 Release Notes
-------------------

 Updates
 -------

 o Update the EPSG database to version 9.8.2

6.2.0 Release Notes
-------------------

 Updates
 -------

 o Introduced PROJJSON, a JSON encoding of WKT2 (#1547)

 o Support CRS instantiation of OGC URN's (#1505)

 o Expose scope and remarks of database objects (#1537)

 o EPSG Database updated to version 9.7.0 (#1558)

 o Added C API function proj_grid_get_info_from_database() (#1494)

 o Added C API function
   proj_operation_factory_context_set_discard_superseded() (#1534)

 o Added C API function proj_context_set_autoclose_database() (#1566)

 o Added C API function proj_create_crs_to_crs_from_pj() (#1567)

 o Added C API function proj_cleanup() (#1569)

6.1.1 Release Notes
-------------------

 Updates
 -------

 o Update EPSG registry to version 9.6.3 (1485)

6.1.0 Release Notes
-------------------

 Updates
 -------

 o Include custom ellipsoid definitions from QGIS (#1337)

 o Add "-k ellipsoid" option to projinfo (#1338)

 o Make cs2cs support 4D coordinates (#1355)

 o WKT2 parser: update to OGC 18-010r6 (#1360 #1366)

 o Update internal version of googletest to v1.8.1 (#1361)

 o Database update: EPSG v9.6.2 (#1462), IGNF v3.0.3, ESRI 10.7.0
   and add operation_version column (#1368)

 o Add proj_normalize_for_visualization() that attempts to apply axis
   ordering as used by most GIS applications and PROJ <6 (#1387)

 o Added noop operation (#1391)

 o Paths set by user take priority over PROJ_LIB for search paths (#1398)

 o Reduced database size (#1438)

 o add support for compoundCRS and concatenatedOperation named from
   their components (#1441)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=49e93fc781f220986c827e724a4c9c7513bc5bf9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 proj/Makefile                |  16 ++-
 proj/PLIST                   | 263 ++++++++++++++++++++++---------------------
 proj/TODO                    |   5 +
 proj/distinfo                |  20 ++--
 proj/options.mk              |  21 ++++
 proj/patches/patch-configure |  24 ----
 6 files changed, 183 insertions(+), 166 deletions(-)

diffs:
diff --git a/proj/Makefile b/proj/Makefile
index e6ded77035..36950ce8aa 100644
--- a/proj/Makefile
+++ b/proj/Makefile
@@ -2,7 +2,7 @@
 
 # I have an update to 6 ready, but it is on hold pending an assessment
 # of projects.h removal fallout - gdt.
-VERSION_BASE=	6.0.0
+VERSION_BASE=	6.2.1
 VERSION_RC=
 VERSION=	${VERSION_BASE}${VERSION_RC}
 #PKGREVISION=	0
@@ -12,11 +12,7 @@ WRKSRC=		${WRKDIR}/${WRKFINAL}
 DISTNAME=	proj-${VERSION}
 CATEGORIES=	geography
 MASTER_SITES=	https://download.osgeo.org/proj/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		proj-datumgrid-1.8${EXTRACT_SUFX} \
-		proj-datumgrid-europe-1.2${EXTRACT_SUFX} \
-		proj-datumgrid-north-america-1.2${EXTRACT_SUFX} \
-		proj-datumgrid-oceania-1.0${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	gdt%NetBSD.org@localhost
 HOMEPAGE=	http://proj4.org/
@@ -28,6 +24,8 @@ COMMENT=	Cartographic projection software
 # cc-by (oceania)
 LICENSE=	mit
 
+.include "options.mk"
+
 PREV_PKGPATH=		misc/proj
 
 USE_LANGUAGES=		c99 c++11
@@ -35,7 +33,13 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
 
+.if !empty(PKG_OPTIONS:Mproj-grids)
+do-test:
+	${ECHO} "Tests assume extra grids are not installed."
+	${FALSE}
+.else
 TEST_TARGET=		check
+.endif
 
 # \todo Ideally, the files would be unpacked directly in data.
 # Assume that all of the stray files in ${WRKDIR} came from datumgrids.
diff --git a/proj/PLIST b/proj/PLIST
index dcc0fc25a6..2ce56228f1 100644
--- a/proj/PLIST
+++ b/proj/PLIST
@@ -22,6 +22,7 @@ include/proj/util.hpp
 include/proj_api.h
 include/proj_constants.h
 include/proj_experimental.h
+include/proj_json_streaming_writer.hpp
 include/proj_symbol_rename.h
 lib/libproj.la
 lib/pkgconfig/proj.pc
@@ -33,143 +34,149 @@ man/man1/proj.1
 man/man1/projinfo.1
 man/man3/geodesic.3
 man/man3/pj_init.3
-share/proj/A66_National_13_09_01.gsb
-share/proj/BETA2007.gsb
+${PLIST.grids}share/proj/A66_National_13_09_01.gsb
+${PLIST.grids}share/proj/BETA2007.gsb
 share/proj/CH
-share/proj/FL
-share/proj/GDA94_GDA2020_conformal.gsb
-share/proj/GDA94_GDA2020_conformal_and_distortion.gsb
+${PLIST.grids}share/proj/CHENyx06_ETRS.gsb
+${PLIST.grids}share/proj/CHENyx06a.gsb
+${PLIST.grids}share/proj/FL
+${PLIST.grids}share/proj/GDA94_GDA2020_conformal.gsb
+${PLIST.grids}share/proj/GDA94_GDA2020_conformal_and_distortion.gsb
 share/proj/GL27
 share/proj/ITRF2000
 share/proj/ITRF2008
 share/proj/ITRF2014
-share/proj/MD
-share/proj/National_84_02_07_01.gsb
-share/proj/OSGM15_Belfast.gtx
-share/proj/OSGM15_Malin.gtx
-share/proj/OSTN15_NTv2_OSGBtoETRS.gsb
-share/proj/RAC09.gtx
-share/proj/RAF09.gtx
-share/proj/RAGTBT2016.gtx
-share/proj/RALD2016.gtx
-share/proj/RALDW842016.gtx
-share/proj/RALS2016.gtx
-share/proj/RAMART2016.gtx
-share/proj/RAMG2016.gtx
-share/proj/RAR07_bl.gtx
-share/proj/SWEN17_RH2000.gtx
-share/proj/TN
-share/proj/WI
-share/proj/WO
-share/proj/alaska
-share/proj/alhpgn.gsb
-share/proj/arhpgn.gsb
-share/proj/azhpgn.gsb
-share/proj/c1hpgn.gsb
-share/proj/c2hpgn.gsb
-share/proj/cnhpgn.gsb
-share/proj/cohpgn.gsb
-share/proj/conus
-share/proj/dnn.gtx
-share/proj/dvr90.gtx
-share/proj/egm96_15.gtx
-share/proj/emhpgn.gsb
-share/proj/ethpgn.gsb
-share/proj/flhpgn.gsb
-share/proj/fvr09.gtx
-share/proj/g2012ba0.gtx
-share/proj/g2012bg0.gtx
-share/proj/g2012bh0.gtx
-share/proj/g2012bp0.gtx
-share/proj/g2012bs0.gtx
-share/proj/g2012bu0.gtx
-share/proj/gahpgn.gsb
-share/proj/gg10_sbv2.gtx
-share/proj/gg10_smv2.gtx
-share/proj/ggg00_lsv2.gtx
-share/proj/ggg00_mgv2.gtx
-share/proj/ggg00_sbv2.gtx
-share/proj/ggg00_smv2.gtx
-share/proj/ggg00v2.gtx
-share/proj/ggguy15.gtx
-share/proj/ggker08v2.gtx
-share/proj/ggm00v2.gtx
-share/proj/ggm04v1.gtx
-share/proj/ggpf02-Bora.gtx
-share/proj/ggpf02-Huahine.gtx
-share/proj/ggpf02-Maiao.gtx
-share/proj/ggpf02-Maupiti.gtx
-share/proj/ggpf02-Raiatea.gtx
-share/proj/ggpf02-Tahaa.gtx
-share/proj/ggpf02-Tupai.gtx
-share/proj/ggpf05-HivaOa.gtx
-share/proj/ggpf05-Nuku.gtx
-share/proj/ggpf08-Fakarava.gtx
-share/proj/ggpf08-Gambier.gtx
-share/proj/ggpf08-Hao.gtx
-share/proj/ggpf08-Mataiva.gtx
-share/proj/ggpf08-Raivavae.gtx
-share/proj/ggpf08-Reao.gtx
-share/proj/ggpf08-Rurutu.gtx
-share/proj/ggpf08-Tikehau.gtx
-share/proj/ggpf08-Tubuai.gtx
-share/proj/ggpf10-Moorea.gtx
-share/proj/ggpf10-Tahiti.gtx
-share/proj/ggspm06v1.gtx
-share/proj/guhpgn.gsb
-share/proj/gvr2000.gtx
-share/proj/gvr2016.gtx
-share/proj/hawaii
-share/proj/hihpgn.gsb
-share/proj/iahpgn.gsb
-share/proj/ilhpgn.gsb
-share/proj/inhpgn.gsb
-share/proj/kyhpgn.gsb
-share/proj/lahpgn.gsb
-share/proj/mdhpgn.gsb
-share/proj/mehpgn.gsb
-share/proj/mihpgn.gsb
-share/proj/mnhpgn.gsb
-share/proj/mohpgn.gsb
+${PLIST.grids}share/proj/MD
+${PLIST.grids}share/proj/National_84_02_07_01.gsb
+${PLIST.grids}share/proj/OSGM15_Belfast.gtx
+${PLIST.grids}share/proj/OSGM15_Malin.gtx
+${PLIST.grids}share/proj/OSTN15_NTv2_OSGBtoETRS.gsb
+${PLIST.grids}share/proj/RAC09.gtx
+${PLIST.grids}share/proj/RAF09.gtx
+${PLIST.grids}share/proj/RAF18.gtx
+${PLIST.grids}share/proj/RAGTBT2016.gtx
+${PLIST.grids}share/proj/RALD2016.gtx
+${PLIST.grids}share/proj/RALDW842016.gtx
+${PLIST.grids}share/proj/RALS2016.gtx
+${PLIST.grids}share/proj/RAMART2016.gtx
+${PLIST.grids}share/proj/RAMG2016.gtx
+${PLIST.grids}share/proj/RAR07_bl.gtx
+${PLIST.grids}share/proj/SWEN17_RH2000.gtx
+${PLIST.grids}share/proj/TN
+${PLIST.grids}share/proj/WI
+${PLIST.grids}share/proj/WO
+${PLIST.grids}share/proj/alaska
+${PLIST.grids}share/proj/alhpgn.gsb
+${PLIST.grids}share/proj/arhpgn.gsb
+${PLIST.grids}share/proj/azhpgn.gsb
+${PLIST.grids}share/proj/bd72lb72_etrs89lb08.gsb
+${PLIST.grids}share/proj/c1hpgn.gsb
+${PLIST.grids}share/proj/c2hpgn.gsb
+${PLIST.grids}share/proj/cnhpgn.gsb
+${PLIST.grids}share/proj/cohpgn.gsb
+${PLIST.grids}share/proj/conus
+${PLIST.grids}share/proj/dnn.gtx
+${PLIST.grids}share/proj/dvr90.gtx
+${PLIST.grids}share/proj/egm08_25.gtx
+${PLIST.grids}share/proj/egm96_15.gtx
+${PLIST.grids}share/proj/emhpgn.gsb
+${PLIST.grids}share/proj/ethpgn.gsb
+${PLIST.grids}share/proj/flhpgn.gsb
+${PLIST.grids}share/proj/fvr09.gtx
+${PLIST.grids}share/proj/g2012ba0.gtx
+${PLIST.grids}share/proj/g2012bg0.gtx
+${PLIST.grids}share/proj/g2012bh0.gtx
+${PLIST.grids}share/proj/g2012bp0.gtx
+${PLIST.grids}share/proj/g2012bs0.gtx
+${PLIST.grids}share/proj/g2012bu0.gtx
+${PLIST.grids}share/proj/gahpgn.gsb
+${PLIST.grids}share/proj/gg10_sbv2.gtx
+${PLIST.grids}share/proj/gg10_smv2.gtx
+${PLIST.grids}share/proj/ggg00_lsv2.gtx
+${PLIST.grids}share/proj/ggg00_mgv2.gtx
+${PLIST.grids}share/proj/ggg00_sbv2.gtx
+${PLIST.grids}share/proj/ggg00_smv2.gtx
+${PLIST.grids}share/proj/ggg00v2.gtx
+${PLIST.grids}share/proj/ggguy15.gtx
+${PLIST.grids}share/proj/ggker08v2.gtx
+${PLIST.grids}share/proj/ggm00v2.gtx
+${PLIST.grids}share/proj/ggm04v1.gtx
+${PLIST.grids}share/proj/ggpf02-Bora.gtx
+${PLIST.grids}share/proj/ggpf02-Huahine.gtx
+${PLIST.grids}share/proj/ggpf02-Maiao.gtx
+${PLIST.grids}share/proj/ggpf02-Maupiti.gtx
+${PLIST.grids}share/proj/ggpf02-Raiatea.gtx
+${PLIST.grids}share/proj/ggpf02-Tahaa.gtx
+${PLIST.grids}share/proj/ggpf02-Tupai.gtx
+${PLIST.grids}share/proj/ggpf05-HivaOa.gtx
+${PLIST.grids}share/proj/ggpf05-Nuku.gtx
+${PLIST.grids}share/proj/ggpf08-Fakarava.gtx
+${PLIST.grids}share/proj/ggpf08-Gambier.gtx
+${PLIST.grids}share/proj/ggpf08-Hao.gtx
+${PLIST.grids}share/proj/ggpf08-Mataiva.gtx
+${PLIST.grids}share/proj/ggpf08-Raivavae.gtx
+${PLIST.grids}share/proj/ggpf08-Reao.gtx
+${PLIST.grids}share/proj/ggpf08-Rurutu.gtx
+${PLIST.grids}share/proj/ggpf08-Tikehau.gtx
+${PLIST.grids}share/proj/ggpf08-Tubuai.gtx
+${PLIST.grids}share/proj/ggpf10-Moorea.gtx
+${PLIST.grids}share/proj/ggpf10-Tahiti.gtx
+${PLIST.grids}share/proj/ggspm06v1.gtx
+${PLIST.grids}share/proj/guhpgn.gsb
+${PLIST.grids}share/proj/gvr2000.gtx
+${PLIST.grids}share/proj/gvr2016.gtx
+${PLIST.grids}share/proj/hawaii
+${PLIST.grids}share/proj/hihpgn.gsb
+${PLIST.grids}share/proj/iahpgn.gsb
+${PLIST.grids}share/proj/ilhpgn.gsb
+${PLIST.grids}share/proj/inhpgn.gsb
+${PLIST.grids}share/proj/kyhpgn.gsb
+${PLIST.grids}share/proj/lahpgn.gsb
+${PLIST.grids}share/proj/mdhpgn.gsb
+${PLIST.grids}share/proj/mehpgn.gsb
+${PLIST.grids}share/proj/mihpgn.gsb
+${PLIST.grids}share/proj/mnhpgn.gsb
+${PLIST.grids}share/proj/mohpgn.gsb
 share/proj/nad.lst
 share/proj/nad27
 share/proj/nad83
-share/proj/nbhpgn.gsb
-share/proj/nchpgn.gsb
-share/proj/ndhpgn.gsb
-share/proj/nehpgn.gsb
-share/proj/njhpgn.gsb
-share/proj/nkgrf03vel_realigned_z.gtx
-share/proj/nmhpgn.gsb
-share/proj/ntf_r93.gsb
-share/proj/ntv1_can.dat
-share/proj/ntv2_0.gsb
+${PLIST.grids}share/proj/nbhpgn.gsb
+${PLIST.grids}share/proj/nchpgn.gsb
+${PLIST.grids}share/proj/ndhpgn.gsb
+${PLIST.grids}share/proj/nehpgn.gsb
+${PLIST.grids}share/proj/njhpgn.gsb
+${PLIST.grids}share/proj/nkgrf03vel_realigned_z.gtx
+${PLIST.grids}share/proj/nmhpgn.gsb
+${PLIST.grids}share/proj/ntf_r93.gsb
+${PLIST.grids}share/proj/ntv1_can.dat
+${PLIST.grids}share/proj/ntv2_0.gsb
 share/proj/null
-share/proj/nvhpgn.gsb
-share/proj/nyhpgn.gsb
-share/proj/nzgd2kgrid0005.gsb
-share/proj/ohhpgn.gsb
-share/proj/okhpgn.gsb
+${PLIST.grids}share/proj/nvhpgn.gsb
+${PLIST.grids}share/proj/nyhpgn.gsb
+${PLIST.grids}share/proj/nzgd2kgrid0005.gsb
+${PLIST.grids}share/proj/ohhpgn.gsb
+${PLIST.grids}share/proj/okhpgn.gsb
 share/proj/other.extra
-share/proj/pahpgn.gsb
+${PLIST.grids}share/proj/pahpgn.gsb
 share/proj/proj.db
-share/proj/prvi
-share/proj/pvhpgn.gsb
-share/proj/schpgn.gsb
-share/proj/sdhpgn.gsb
-share/proj/stgeorge
-share/proj/stlrnc
-share/proj/stpaul
-share/proj/tnhpgn.gsb
-share/proj/uthpgn.gsb
-share/proj/vahpgn.gsb
-share/proj/vertconc.gtx
-share/proj/vertcone.gtx
-share/proj/vertconw.gtx
-share/proj/wihpgn.gsb
-share/proj/wmhpgn.gsb
-share/proj/wohpgn.gsb
+share/proj/projjson.schema.json
+${PLIST.grids}share/proj/prvi
+${PLIST.grids}share/proj/pvhpgn.gsb
+${PLIST.grids}share/proj/schpgn.gsb
+${PLIST.grids}share/proj/sdhpgn.gsb
+${PLIST.grids}share/proj/stgeorge
+${PLIST.grids}share/proj/stlrnc
+${PLIST.grids}share/proj/stpaul
+${PLIST.grids}share/proj/tnhpgn.gsb
+${PLIST.grids}share/proj/uthpgn.gsb
+${PLIST.grids}share/proj/vahpgn.gsb
+${PLIST.grids}share/proj/vertconc.gtx
+${PLIST.grids}share/proj/vertcone.gtx
+${PLIST.grids}share/proj/vertconw.gtx
+${PLIST.grids}share/proj/wihpgn.gsb
+${PLIST.grids}share/proj/wmhpgn.gsb
+${PLIST.grids}share/proj/wohpgn.gsb
 share/proj/world
-share/proj/wthpgn.gsb
-share/proj/wvhpgn.gsb
-share/proj/wyhpgn.gsb
+${PLIST.grids}share/proj/wthpgn.gsb
+${PLIST.grids}share/proj/wvhpgn.gsb
+${PLIST.grids}share/proj/wyhpgn.gsb
diff --git a/proj/TODO b/proj/TODO
index e20e86a654..eb9093b1bc 100644
--- a/proj/TODO
+++ b/proj/TODO
@@ -1,2 +1,7 @@
 Do not bring into pkgsrc proper yet, because too many depending
 packages will break. -gdt
+
+Add manual.  Howver, it is not at the same MASTER_SITE.
+
+Decide how to deal with tests, which break if the grids are installed
+-- but without the grids, users get worse results.
diff --git a/proj/distinfo b/proj/distinfo
index 1fd0ae7e2e..bd86b78503 100644
--- a/proj/distinfo
+++ b/proj/distinfo
@@ -1,17 +1,17 @@
 $NetBSD: distinfo,v 1.13 2019/02/21 00:55:04 gdt Exp $
 
-SHA1 (proj-6.0.0.tar.gz) = 679310f50a2fe5d3c7f9bd6ab0bba0f9a11233d1
-RMD160 (proj-6.0.0.tar.gz) = 8580caaeba1a15d47d6a2dab29d78a73bbbfd10f
-SHA512 (proj-6.0.0.tar.gz) = bc4d2f02d697aa01099f5e973a7ca70072f51210754e4d9331ae5bfdef886a41984ce27c1ff926da14fd199005bf9cad7162ab3ea8f3f421ac8b60bc8defd8f7
-Size (proj-6.0.0.tar.gz) = 2405217 bytes
+SHA1 (proj-6.2.1.tar.gz) = 8aa3aebe620f472020c9b515267e95d2e89b9906
+RMD160 (proj-6.2.1.tar.gz) = d0f5586419eb3642d762be4c4d796a15884e9229
+SHA512 (proj-6.2.1.tar.gz) = 1e8632a9c6fa00c0354473f60d81e4644f173b42f6613856ba03e2404f429864fd5052aacba945ccd265173397bed2abdbe325320b54bc7b1c4a75ad95395a89
+Size (proj-6.2.1.tar.gz) = 2698759 bytes
 SHA1 (proj-datumgrid-1.8.tar.gz) = ede1c255adebb903f9ec33c5760ecb0df7b3b03c
 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-europe-1.2.tar.gz) = 06924c6a2d9c54d9fa3edc94fefa7da4831ae27a
-RMD160 (proj-datumgrid-europe-1.2.tar.gz) = d7bb4021becad04ce4c0aecc0eb672bf43c3511f
-SHA512 (proj-datumgrid-europe-1.2.tar.gz) = ba8fc7ed7cc3296014c525d64ef670ea19d339987bd2e4379cdb30bd51876de9cfeb702a6a95a0cef5b2449016eda2c328c8a6f2f088305b71d2808eb16efb1b
-Size (proj-datumgrid-europe-1.2.tar.gz) = 20610512 bytes
+SHA1 (proj-datumgrid-europe-1.4.tar.gz) = b191d6ad053c40c48c4bf990a151c7a321bd28be
+RMD160 (proj-datumgrid-europe-1.4.tar.gz) = 96b3ccf6a8a44b45615b44aa7536d2ac0a308390
+SHA512 (proj-datumgrid-europe-1.4.tar.gz) = 4043c0791af086541a3e08f7ad667b25968ed25e6595c1f047e1272f52838d28ab4010a076f9524882f97d7aa9104769c0b9cdf17394915c5b70b0dc13e019ee
+Size (proj-datumgrid-europe-1.4.tar.gz) = 26115747 bytes
 SHA1 (proj-datumgrid-north-america-1.2.tar.gz) = c4d858cd584b33c846536ef75fb007168fb0b3a7
 RMD160 (proj-datumgrid-north-america-1.2.tar.gz) = a95ab90d3fb1379770f28bd31c7f70a73895721f
 SHA512 (proj-datumgrid-north-america-1.2.tar.gz) = cd6f934faa0172713880c35184cf8ad75127d19f0e7656d9bef6c97dee049eede27d9e3c6f0d7a1592a6a60088d219bd5c0e1209f35143b17debb0125f030596
@@ -20,4 +20,8 @@ SHA1 (proj-datumgrid-oceania-1.0.tar.gz) = 42970835b4932e5e96a630759c28b75502f4b
 RMD160 (proj-datumgrid-oceania-1.0.tar.gz) = fcafe24982a1cd40c97137d42f2438fc48938c27
 SHA512 (proj-datumgrid-oceania-1.0.tar.gz) = a079fdb0ab22e591e55efa003ecd0ca1d65ce84ac0eb1b74456c1d3d62e601e3639b551aab1a0c2e77ca580d0c96cf69284e6591b80cffd18efdaada47d13e64
 Size (proj-datumgrid-oceania-1.0.tar.gz) = 96908713 bytes
+SHA1 (proj-datumgrid-world-1.0.tar.gz) = b66863826b2387f28c860abf2c6ee2366b967088
+RMD160 (proj-datumgrid-world-1.0.tar.gz) = a21a6320eb7da3bbf72b7ad685a08255b8f9663d
+SHA512 (proj-datumgrid-world-1.0.tar.gz) = 9f79f4c24f1a4a472f2747e4bb147c7140a92f3043b283f2a0326775393ebb39f634f2715a4d085dc33eabbbed4c3fb1871753ecf6c238c179ac0bbe83b9ca3e
+Size (proj-datumgrid-world-1.0.tar.gz) = 134373680 bytes
 SHA1 (patch-configure) = 07a7f8fcef069cc2f4680f72c296da91371bd71e
diff --git a/proj/options.mk b/proj/options.mk
new file mode 100644
index 0000000000..268d3b6fb1
--- /dev/null
+++ b/proj/options.mk
@@ -0,0 +1,21 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.proj
+
+PKG_SUPPORTED_OPTIONS=	proj-grids
+PKG_SUGGESTED_OPTIONS=	proj-grids
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		grids
+
+.if !empty(PKG_OPTIONS:Mproj-grids)
+DISTFILES+=	proj-datumgrid-1.8${EXTRACT_SUFX}
+DISTFILES+=	proj-datumgrid-europe-1.4${EXTRACT_SUFX}
+DISTFILES+=	proj-datumgrid-north-america-1.2${EXTRACT_SUFX}
+DISTFILES+=	proj-datumgrid-oceania-1.0${EXTRACT_SUFX}
+DISTFILES+=	proj-datumgrid-world-1.0${EXTRACT_SUFX}
+
+PLIST.grids=		yes
+.else
+.endif
diff --git a/proj/patches/patch-configure b/proj/patches/patch-configure
deleted file mode 100644
index 493d59cb28..0000000000
--- a/proj/patches/patch-configure
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Remediate bashism.  Reported on mailinglist 20190126.
-
---- configure.orig	2019-02-16 07:27:13.000000000 +0000
-+++ configure
-@@ -18983,7 +18983,7 @@ if test "${with_external_gtest+set}" = s
- fi
- 
- 
--if test "x$with_external_gtest" == "xyes" ; then
-+if test "x$with_external_gtest" = "xyes" ; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: using external GTest." >&5
- $as_echo "using external GTest." >&6; }
- 
-@@ -19082,7 +19082,7 @@ $as_echo "using internal GTest." >&6; }
-     GTEST_CFLAGS="-I\$(top_srcdir)/test/googletest/include"
-     GTEST_LIBS="\$(top_builddir)/test/googletest/libgtest.la"
- fi
-- if test "x$with_external_gtest" == "xyes"; then
-+ if test "x$with_external_gtest" = "xyes"; then
-   USE_EXTERNAL_GTEST_TRUE=
-   USE_EXTERNAL_GTEST_FALSE='#'
- else
Home | Main Index | Thread Index | Old Index