pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

proj: Update to 7.2.1



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sat Jan 2 10:58:34 2021 -0500
Changeset:	08bb4e264b0820a04bd5f79bbc0b8e89d30d4271

Modified Files:
	proj/Makefile
	proj/PLIST
	proj/distinfo
Added Files:
	proj/PLIST-not.grids
	proj/TODO
Removed Files:
	proj/options.mk

Log Message:
proj: Update to 7.2.1

Declare intent to package proj-grids separately.

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

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

diffstat:
 proj/Makefile        |   9 ++-
 proj/PLIST           | 214 +--------------------------------------------------
 proj/PLIST-not.grids | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++
 proj/TODO            |   4 +
 proj/distinfo        |   8 +-
 proj/options.mk      |  22 ------
 6 files changed, 228 insertions(+), 242 deletions(-)

diffs:
diff --git a/proj/Makefile b/proj/Makefile
index 9df1ba9405..ccf25641f8 100644
--- a/proj/Makefile
+++ b/proj/Makefile
@@ -2,7 +2,7 @@
 
 # Do not merge to pkgsrc without gdt approval; I have not yet
 # evaluated how much this will break.
-VERSION_BASE=	7.1.0
+VERSION_BASE=	7.2.1
 VERSION_RC=
 VERSION=	${VERSION_BASE}${VERSION_RC}
 #PKGREVISION=	0
@@ -18,6 +18,8 @@ MAINTAINER=	gdt%NetBSD.org@localhost
 HOMEPAGE=	https://proj4.org/
 COMMENT=	Cartographic projection software
 
+.include "../../mk/bsd.prefs.mk"
+
 # \todo: Add pdf manual.
 
 # \todo Think about how this works with the new grid CDN.
@@ -27,8 +29,6 @@ COMMENT=	Cartographic projection software
 # cc-by (oceania)
 LICENSE=	mit
 
-.include "options.mk"
-
 PREV_PKGPATH=		misc/proj
 
 USE_LANGUAGES=		c99 c++11
@@ -44,6 +44,8 @@ CFLAGS+=		-DHAVE_C99_MATH=0
 .endif
 
 .if !empty(PKG_OPTIONS:Mproj-grids)
+# \todo Resolve how testing works with the optional grid package, vs
+# the previous plan of the grids option.
 # Ideally, upstream would have an approach which enables testing with
 # the grids that users ought to have.  Until then, fail if test
 # preconditions are not met.
@@ -54,6 +56,7 @@ do-test:
 TEST_TARGET=		check
 .endif
 
+# todo Remove
 # \todo Ideally, the files would be unpacked directly in data.
 # Assume that all of the stray files in ${WRKDIR} came from datumgrids.
 # \todo Some files in the grid tarballs do not get installed by the
diff --git a/proj/PLIST b/proj/PLIST
index f7fed67bea..fc8a15284c 100644
--- a/proj/PLIST
+++ b/proj/PLIST
@@ -32,230 +32,18 @@ man/man1/gie.1
 man/man1/proj.1
 man/man1/projinfo.1
 man/man1/projsync.1
-${PLIST.grids}share/proj/100800401.gsb
-${PLIST.grids}share/proj/A66_National_13_09_01.gsb
-${PLIST.grids}share/proj/AT_GIS_GRID.gsb
-${PLIST.grids}share/proj/AUSGeoid09_V1.01.gtx
-${PLIST.grids}share/proj/AUSGeoid2020_20180201.gtx
-${PLIST.grids}share/proj/AUSGeoid98.gtx
-${PLIST.grids}share/proj/BETA2007.gsb
-${PLIST.grids}share/proj/BWTA2017.gsb
-${PLIST.grids}share/proj/CGG2013ai08.gtx
-${PLIST.grids}share/proj/CGG2013an83.gtx
-${PLIST.grids}share/proj/CGG2013i08.gtx
-${PLIST.grids}share/proj/CGG2013n83.gtx
-${PLIST.grids}share/proj/CGVD2013RGSPM06.gtx
 share/proj/CH
-${PLIST.grids}share/proj/CHENyx06_ETRS.gsb
-${PLIST.grids}share/proj/CHENyx06a.gsb
-${PLIST.grids}share/proj/D73_ETRS89_geo.gsb
-${PLIST.grids}share/proj/DLx_ETRS89_geo.gsb
-${PLIST.grids}share/proj/FL
-${PLIST.grids}share/proj/GDA94_GDA2020_conformal.gsb
-${PLIST.grids}share/proj/GDA94_GDA2020_conformal_and_distortion.gsb
-${PLIST.grids}share/proj/GDA94_GDA2020_conformal_christmas_island.gsb
-${PLIST.grids}share/proj/GDA94_GDA2020_conformal_cocos_island.gsb
 share/proj/GL27
-${PLIST.grids}share/proj/HT2_2010v70.gtx
-${PLIST.grids}share/proj/ISN2004_ISN2016.gsb
-${PLIST.grids}share/proj/ISN2004_ISN2016.gtx
-${PLIST.grids}share/proj/ISN93_ISN2016.gsb
-${PLIST.grids}share/proj/ISN93_ISN2016.gtx
-${PLIST.grids}share/proj/ISN_vel_beta.gtx
 share/proj/ITRF2000
 share/proj/ITRF2008
 share/proj/ITRF2014
-${PLIST.grids}share/proj/Icegeoid_ISN2004.gtx
-${PLIST.grids}share/proj/Icegeoid_ISN2016.gtx
-${PLIST.grids}share/proj/Icegeoid_ISN93.gtx
-${PLIST.grids}share/proj/MAY76V20.gsb
-${PLIST.grids}share/proj/MD
-${PLIST.grids}share/proj/NTv2_SN.gsb
-${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/RASPM2018.gtx
-${PLIST.grids}share/proj/SWEN17_RH2000.gtx
-${PLIST.grids}share/proj/SeTa2016.gsb
-${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/auckht1946-nzvd2016.gtx
-${PLIST.grids}share/proj/azhpgn.gsb
-${PLIST.grids}share/proj/bd72lb72_etrs89lb08.gsb
-${PLIST.grids}share/proj/blufht1955-nzvd2016.gtx
-${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/cq77na83.gsb
-${PLIST.grids}share/proj/cshpgn.gsb
-${PLIST.grids}share/proj/dnn.gtx
 share/proj/deformation_model.schema.json
-${PLIST.grids}share/proj/dublht1960-nzvd2016.gtx
-${PLIST.grids}share/proj/duneht1958-nzvd2016.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/eshpgn.gsb
-${PLIST.grids}share/proj/ethpgn.gsb
-${PLIST.grids}share/proj/flhpgn.gsb
-${PLIST.grids}share/proj/fvr09.gtx
-${PLIST.grids}share/proj/g1999a01.gtx
-${PLIST.grids}share/proj/g1999a02.gtx
-${PLIST.grids}share/proj/g1999a03.gtx
-${PLIST.grids}share/proj/g1999a04.gtx
-${PLIST.grids}share/proj/g1999h01.gtx
-${PLIST.grids}share/proj/g1999p01.gtx
-${PLIST.grids}share/proj/g1999u01.gtx
-${PLIST.grids}share/proj/g1999u02.gtx
-${PLIST.grids}share/proj/g1999u03.gtx
-${PLIST.grids}share/proj/g1999u04.gtx
-${PLIST.grids}share/proj/g1999u05.gtx
-${PLIST.grids}share/proj/g1999u06.gtx
-${PLIST.grids}share/proj/g1999u07.gtx
-${PLIST.grids}share/proj/g1999u08.gtx
-${PLIST.grids}share/proj/g2003a01.gtx
-${PLIST.grids}share/proj/g2003a02.gtx
-${PLIST.grids}share/proj/g2003a03.gtx
-${PLIST.grids}share/proj/g2003a04.gtx
-${PLIST.grids}share/proj/g2003h01.gtx
-${PLIST.grids}share/proj/g2003p01.gtx
-${PLIST.grids}share/proj/g2009g01.gtx
-${PLIST.grids}share/proj/g2009h01.gtx
-${PLIST.grids}share/proj/g2009p01.gtx
-${PLIST.grids}share/proj/g2009s01.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/g2018p0.gtx
-${PLIST.grids}share/proj/g2018u0.gtx
-${PLIST.grids}share/proj/gahpgn.gsb
-${PLIST.grids}share/proj/geoid03_conus.gtx
-${PLIST.grids}share/proj/geoid06_ak.gtx
-${PLIST.grids}share/proj/geoid09_ak.gtx
-${PLIST.grids}share/proj/geoid09_conus.gtx
-${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/gisbht1926-nzvd2016.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/kshpgn.gsb
-${PLIST.grids}share/proj/kyhpgn.gsb
-${PLIST.grids}share/proj/lahpgn.gsb
-${PLIST.grids}share/proj/lyttht1937-nzvd2016.gtx
-${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
-${PLIST.grids}share/proj/motuht1953-nzvd2016.gtx
-${PLIST.grids}share/proj/mshpgn.gsb
-${PLIST.grids}share/proj/na27na83.gsb
 share/proj/nad.lst
 share/proj/nad27
 share/proj/nad83
-${PLIST.grids}share/proj/napiht1962-nzvd2016.gtx
-${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/nelsht1955-nzvd2016.gtx
-${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
-${PLIST.grids}share/proj/nvhpgn.gsb
-${PLIST.grids}share/proj/nyhpgn.gsb
-${PLIST.grids}share/proj/nzgd2kgrid0005.gsb
-${PLIST.grids}share/proj/nzgeoid2009.gtx
-${PLIST.grids}share/proj/nzgeoid2016.gtx
-${PLIST.grids}share/proj/ohhpgn.gsb
-${PLIST.grids}share/proj/okhpgn.gsb
-${PLIST.grids}share/proj/ontpht1964-nzvd2016.gtx
 share/proj/other.extra
-${PLIST.grids}share/proj/pahpgn.gsb
 share/proj/proj.db
 share/proj/proj.ini
 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/stisht1977-nzvd2016.gtx
-${PLIST.grids}share/proj/stlrnc
-${PLIST.grids}share/proj/stpaul
-${PLIST.grids}share/proj/taraht1970-nzvd2016.gtx
-${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/wellht1953-nzvd2016.gtx
-${PLIST.grids}share/proj/wihpgn.gsb
-${PLIST.grids}share/proj/wmhpgn.gsb
-${PLIST.grids}share/proj/wohpgn.gsb
+share/proj/triangulation.schema.json
 share/proj/world
-${PLIST.grids}share/proj/wshpgn.gsb
-${PLIST.grids}share/proj/wthpgn.gsb
-${PLIST.grids}share/proj/wvhpgn.gsb
-${PLIST.grids}share/proj/wyhpgn.gsb
diff --git a/proj/PLIST-not.grids b/proj/PLIST-not.grids
new file mode 100644
index 0000000000..133c219513
--- /dev/null
+++ b/proj/PLIST-not.grids
@@ -0,0 +1,213 @@
+${PLIST.grids}share/proj/100800401.gsb
+${PLIST.grids}share/proj/A66_National_13_09_01.gsb
+${PLIST.grids}share/proj/AT_GIS_GRID.gsb
+${PLIST.grids}share/proj/AUSGeoid09_V1.01.gtx
+${PLIST.grids}share/proj/AUSGeoid2020_20180201.gtx
+${PLIST.grids}share/proj/AUSGeoid98.gtx
+${PLIST.grids}share/proj/BETA2007.gsb
+${PLIST.grids}share/proj/BWTA2017.gsb
+${PLIST.grids}share/proj/CGG2013ai08.gtx
+${PLIST.grids}share/proj/CGG2013an83.gtx
+${PLIST.grids}share/proj/CGG2013i08.gtx
+${PLIST.grids}share/proj/CGG2013n83.gtx
+${PLIST.grids}share/proj/CGVD2013RGSPM06.gtx
+${PLIST.grids}share/proj/CHENyx06_ETRS.gsb
+${PLIST.grids}share/proj/CHENyx06a.gsb
+${PLIST.grids}share/proj/D73_ETRS89_geo.gsb
+${PLIST.grids}share/proj/DLx_ETRS89_geo.gsb
+${PLIST.grids}share/proj/FL
+${PLIST.grids}share/proj/GDA94_GDA2020_conformal.gsb
+${PLIST.grids}share/proj/GDA94_GDA2020_conformal_and_distortion.gsb
+${PLIST.grids}share/proj/GDA94_GDA2020_conformal_christmas_island.gsb
+${PLIST.grids}share/proj/GDA94_GDA2020_conformal_cocos_island.gsb
+${PLIST.grids}share/proj/HT2_2010v70.gtx
+${PLIST.grids}share/proj/ISN2004_ISN2016.gsb
+${PLIST.grids}share/proj/ISN2004_ISN2016.gtx
+${PLIST.grids}share/proj/ISN93_ISN2016.gsb
+${PLIST.grids}share/proj/ISN93_ISN2016.gtx
+${PLIST.grids}share/proj/ISN_vel_beta.gtx
+${PLIST.grids}share/proj/Icegeoid_ISN2004.gtx
+${PLIST.grids}share/proj/Icegeoid_ISN2016.gtx
+${PLIST.grids}share/proj/Icegeoid_ISN93.gtx
+${PLIST.grids}share/proj/MAY76V20.gsb
+${PLIST.grids}share/proj/MD
+${PLIST.grids}share/proj/NTv2_SN.gsb
+${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/RASPM2018.gtx
+${PLIST.grids}share/proj/SWEN17_RH2000.gtx
+${PLIST.grids}share/proj/SeTa2016.gsb
+${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/auckht1946-nzvd2016.gtx
+${PLIST.grids}share/proj/azhpgn.gsb
+${PLIST.grids}share/proj/bd72lb72_etrs89lb08.gsb
+${PLIST.grids}share/proj/blufht1955-nzvd2016.gtx
+${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/cq77na83.gsb
+${PLIST.grids}share/proj/cshpgn.gsb
+${PLIST.grids}share/proj/dnn.gtx
+${PLIST.grids}share/proj/dublht1960-nzvd2016.gtx
+${PLIST.grids}share/proj/duneht1958-nzvd2016.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/eshpgn.gsb
+${PLIST.grids}share/proj/ethpgn.gsb
+${PLIST.grids}share/proj/flhpgn.gsb
+${PLIST.grids}share/proj/fvr09.gtx
+${PLIST.grids}share/proj/g1999a01.gtx
+${PLIST.grids}share/proj/g1999a02.gtx
+${PLIST.grids}share/proj/g1999a03.gtx
+${PLIST.grids}share/proj/g1999a04.gtx
+${PLIST.grids}share/proj/g1999h01.gtx
+${PLIST.grids}share/proj/g1999p01.gtx
+${PLIST.grids}share/proj/g1999u01.gtx
+${PLIST.grids}share/proj/g1999u02.gtx
+${PLIST.grids}share/proj/g1999u03.gtx
+${PLIST.grids}share/proj/g1999u04.gtx
+${PLIST.grids}share/proj/g1999u05.gtx
+${PLIST.grids}share/proj/g1999u06.gtx
+${PLIST.grids}share/proj/g1999u07.gtx
+${PLIST.grids}share/proj/g1999u08.gtx
+${PLIST.grids}share/proj/g2003a01.gtx
+${PLIST.grids}share/proj/g2003a02.gtx
+${PLIST.grids}share/proj/g2003a03.gtx
+${PLIST.grids}share/proj/g2003a04.gtx
+${PLIST.grids}share/proj/g2003h01.gtx
+${PLIST.grids}share/proj/g2003p01.gtx
+${PLIST.grids}share/proj/g2009g01.gtx
+${PLIST.grids}share/proj/g2009h01.gtx
+${PLIST.grids}share/proj/g2009p01.gtx
+${PLIST.grids}share/proj/g2009s01.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/g2018p0.gtx
+${PLIST.grids}share/proj/g2018u0.gtx
+${PLIST.grids}share/proj/gahpgn.gsb
+${PLIST.grids}share/proj/geoid03_conus.gtx
+${PLIST.grids}share/proj/geoid06_ak.gtx
+${PLIST.grids}share/proj/geoid09_ak.gtx
+${PLIST.grids}share/proj/geoid09_conus.gtx
+${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/gisbht1926-nzvd2016.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/kshpgn.gsb
+${PLIST.grids}share/proj/kyhpgn.gsb
+${PLIST.grids}share/proj/lahpgn.gsb
+${PLIST.grids}share/proj/lyttht1937-nzvd2016.gtx
+${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
+${PLIST.grids}share/proj/motuht1953-nzvd2016.gtx
+${PLIST.grids}share/proj/mshpgn.gsb
+${PLIST.grids}share/proj/na27na83.gsb
+${PLIST.grids}share/proj/napiht1962-nzvd2016.gtx
+${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/nelsht1955-nzvd2016.gtx
+${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
+${PLIST.grids}share/proj/nvhpgn.gsb
+${PLIST.grids}share/proj/nyhpgn.gsb
+${PLIST.grids}share/proj/nzgd2kgrid0005.gsb
+${PLIST.grids}share/proj/nzgeoid2009.gtx
+${PLIST.grids}share/proj/nzgeoid2016.gtx
+${PLIST.grids}share/proj/ohhpgn.gsb
+${PLIST.grids}share/proj/okhpgn.gsb
+${PLIST.grids}share/proj/ontpht1964-nzvd2016.gtx
+${PLIST.grids}share/proj/pahpgn.gsb
+${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/stisht1977-nzvd2016.gtx
+${PLIST.grids}share/proj/stlrnc
+${PLIST.grids}share/proj/stpaul
+${PLIST.grids}share/proj/taraht1970-nzvd2016.gtx
+${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/wellht1953-nzvd2016.gtx
+${PLIST.grids}share/proj/wihpgn.gsb
+${PLIST.grids}share/proj/wmhpgn.gsb
+${PLIST.grids}share/proj/wohpgn.gsb
+${PLIST.grids}share/proj/wshpgn.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
new file mode 100644
index 0000000000..c9f0887926
--- /dev/null
+++ b/proj/TODO
@@ -0,0 +1,4 @@
+Add COMMIT_MSG.
+Add proj-data package.
+Figure out CDN download location/permission issues.
+
diff --git a/proj/distinfo b/proj/distinfo
index 1296245fc7..ccedc16a78 100644
--- a/proj/distinfo
+++ b/proj/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.13 2019/02/21 00:55:04 gdt Exp $
 
-SHA1 (proj-7.1.0.tar.gz) = 160d1b72fefee9e40a38b29c1e2f949089fe0de2
-RMD160 (proj-7.1.0.tar.gz) = 140de5e1cd46302f941737987a012566c436aa39
-SHA512 (proj-7.1.0.tar.gz) = 74c83c001442a2336479ab4cd627fdbf20182711f7d62acf325aaff66c32d10fdb33e1d81cff31cff1c56cb641a9d16f7701bf3e88b98401022acd059d4da28f
-Size (proj-7.1.0.tar.gz) = 5502506 bytes
+SHA1 (proj-7.2.1.tar.gz) = 593005f2e4e76575ebee5cf228c968be730f9fd3
+RMD160 (proj-7.2.1.tar.gz) = 33640fc210ad5e465c04047ac364a53c2415b441
+SHA512 (proj-7.2.1.tar.gz) = 59b9b31b0183e620a2f4a25a08620c170773fe4f99e8eca59e9ed6815f43bb379ea21ef71e8f759dbd747855b982657d7503bac3acc542218e0d862105f25324
+Size (proj-7.2.1.tar.gz) = 5714666 bytes
diff --git a/proj/options.mk b/proj/options.mk
deleted file mode 100644
index e23ffe95a5..0000000000
--- a/proj/options.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD$
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.proj
-
-PKG_SUPPORTED_OPTIONS=	proj-grids
-# \todo Convert to the proj7 new world order.
-#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.5${EXTRACT_SUFX}
-DISTFILES+=	proj-datumgrid-north-america-1.3${EXTRACT_SUFX}
-DISTFILES+=	proj-datumgrid-oceania-1.1${EXTRACT_SUFX}
-DISTFILES+=	proj-datumgrid-world-1.0${EXTRACT_SUFX}
-
-PLIST.grids=		yes
-.else
-.endif


Home | Main Index | Thread Index | Old Index