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

proj-data: Package proj-data and update proj

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Wed Nov 23 12:25:23 2022 -0500
Changeset:	72fa1197eb5c07b63b5aa884f366f1da9c10d7da

Modified Files:
	proj/Makefile
	proj/buildlink3.mk
	proj/distinfo
Added Files:
	proj-data/DESCR
	proj-data/Makefile
	proj-data/PLIST
	proj-data/distinfo
Removed Files:
	proj/PLIST-not.grids

Log Message:
proj-data: Package proj-data and update proj

In proj 6, the proj package included data files.  Now, data files can
be downloaded from the net on demand, or pre-installed.  Now there is
proj, the code, and proj-data, the optional data files.

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

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

diffstat:
 proj-data/DESCR      |   3 +
 proj-data/Makefile   |  37 ++++++
 proj-data/PLIST      | 347 +++++++++++++++++++++++++++++++++++++++++++++++++++
 proj-data/distinfo   |   5 +
 proj/Makefile        |  30 +----
 proj/PLIST-not.grids | 213 -------------------------------
 proj/buildlink3.mk   |   4 +-
 proj/distinfo        |   2 +-
 8 files changed, 398 insertions(+), 243 deletions(-)

diffs:
diff --git a/proj-data/DESCR b/proj-data/DESCR
new file mode 100644
index 0000000000..3911737b82
--- /dev/null
+++ b/proj-data/DESCR
@@ -0,0 +1,3 @@
+This package contains data files for proj.  They are used in
+transforms that cannot be described by formulas, but instead have
+values in a geographic grid that should be interpolated.
diff --git a/proj-data/Makefile b/proj-data/Makefile
new file mode 100644
index 0000000000..4c2d23d1c9
--- /dev/null
+++ b/proj-data/Makefile
@@ -0,0 +1,37 @@
+# $NetBSD$
+
+DISTNAME=	proj-data-1.4
+CATEGORIES=	geography
+MASTER_SITES=	${MASTER_SITE_GITHUB:=OSGeo/}
+GITHUB_PROJECT=	PROJ-data
+GITHUB_RELEASE=	1.4.0
+
+MAINTAINER=	gdt%NetBSD.org@localhost
+HOMEPAGE=	https://proj.org/
+COMMENT=	Cartographic projection software data files
+# There are a large number of licenses for individual data files, but
+# the project requires that they all be Open Source.  Updated from
+# https://github.com/OSGeo/PROJ-data/blob/master/copyright_and_licenses.csv
+# in 2022-11.
+LICENSE=	public-domain \
+		AND cc-by-v4.0 \
+		AND cc-by-sa-v4.0 \
+		AND cc0-1.0-universal \
+		AND 2-clause-bsd \
+#		AND "Open License France - https://www.etalab.gouv.fr/wp-content/uploads/2014/05/Open_Licence.pdf"; \
+#		AND OGL-Canada-2.0 \
+#		AND "Data licence Germany - attribution - version 2.0"
+
+# The distfile simply unpacks a large number of data files.  There is no concept of build.
+WRKSRC=		${WRKDIR}
+USE_LANGUAGES=	# none
+NO_BUILD=	yes
+
+PROJ_DATA=		${PREFIX}/share/proj
+
+INSTALLATION_DIRS+=	${PROJ_DATA}
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/* ${DESTDIR}/${PROJ_DATA}
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/proj-data/PLIST b/proj-data/PLIST
new file mode 100644
index 0000000000..dcfd0bfdf7
--- /dev/null
+++ b/proj-data/PLIST
@@ -0,0 +1,347 @@
+@comment $NetBSD$
+share/proj/DK
+share/proj/FO
+share/proj/ISL
+share/proj/NKG
+share/proj/README.DATA
+share/proj/at_bev_AT_GIS_GRID.tif
+share/proj/at_bev_GEOID_BESSEL_Oesterreich.tif
+share/proj/at_bev_GEOID_GRS80_Oesterreich.tif
+share/proj/at_bev_GV_Hoehengrid_V1.tif
+share/proj/at_bev_GV_Hoehengrid_plus_Geoid_V2.tif
+share/proj/at_bev_README.txt
+share/proj/au_ga_AGQG_20191107.tif
+share/proj/au_ga_AUSGeoid09_V1.01.tif
+share/proj/au_ga_AUSGeoid2020_20180201.tif
+share/proj/au_ga_AUSGeoid98.tif
+share/proj/au_ga_README.txt
+share/proj/au_icsm_A66_National_13_09_01.tif
+share/proj/au_icsm_GDA94_GDA2020_conformal.tif
+share/proj/au_icsm_GDA94_GDA2020_conformal_and_distortion.tif
+share/proj/au_icsm_GDA94_GDA2020_conformal_christmas_island.tif
+share/proj/au_icsm_GDA94_GDA2020_conformal_cocos_island.tif
+share/proj/au_icsm_National_84_02_07_01.tif
+share/proj/au_icsm_README.txt
+share/proj/be_ign_README.txt
+share/proj/be_ign_bd72lb72_etrs89lb08.tif
+share/proj/br_ibge_CA61_003.tif
+share/proj/br_ibge_CA7072_003.tif
+share/proj/br_ibge_README.txt
+share/proj/br_ibge_SAD69_003.tif
+share/proj/br_ibge_SAD96_003.tif
+share/proj/ca_nrc_ABCSRSV4.tif
+share/proj/ca_nrc_BC_27_05.tif
+share/proj/ca_nrc_BC_93_05.tif
+share/proj/ca_nrc_CGG2013ai08.tif
+share/proj/ca_nrc_CGG2013an83.tif
+share/proj/ca_nrc_CGG2013i08.tif
+share/proj/ca_nrc_CGG2013n83.tif
+share/proj/ca_nrc_CQ77SCRS.tif
+share/proj/ca_nrc_CRD27_00.tif
+share/proj/ca_nrc_CRD93_00.tif
+share/proj/ca_nrc_GS7783.tif
+share/proj/ca_nrc_HT2_2010v70.tif
+share/proj/ca_nrc_MAY76V20.tif
+share/proj/ca_nrc_NA27SCRS.tif
+share/proj/ca_nrc_NA83SCRS.tif
+share/proj/ca_nrc_NAD83v6VG.tif
+share/proj/ca_nrc_NAD83v70VG.tif
+share/proj/ca_nrc_NB2783v2.tif
+share/proj/ca_nrc_NB7783v2.tif
+share/proj/ca_nrc_NS778302.tif
+share/proj/ca_nrc_NVI93_05.tif
+share/proj/ca_nrc_ON27CSv1.tif
+share/proj/ca_nrc_ON76CSv1.tif
+share/proj/ca_nrc_ON83CSv1.tif
+share/proj/ca_nrc_PE7783V2.tif
+share/proj/ca_nrc_README.txt
+share/proj/ca_nrc_SK27-98.tif
+share/proj/ca_nrc_SK83-98.tif
+share/proj/ca_nrc_TO27CSv1.tif
+share/proj/ca_nrc_ntv1_can.tif
+share/proj/ca_nrc_ntv2_0.tif
+share/proj/ca_que_mern_README.txt
+share/proj/ca_que_mern_cq77na83.tif
+share/proj/ca_que_mern_na27na83.tif
+share/proj/ch_swisstopo_CHENyx06_ETRS.tif
+share/proj/ch_swisstopo_CHENyx06a.tif
+share/proj/ch_swisstopo_README.txt
+share/proj/copyright_and_licenses.csv
+share/proj/de_adv_BETA2007.tif
+share/proj/de_adv_README.txt
+share/proj/de_geosn_NTv2_SN.tif
+share/proj/de_geosn_README.txt
+share/proj/de_lgl_bw_BWTA2017.tif
+share/proj/de_lgl_bw_README.txt
+share/proj/de_lgvl_saarland_README.txt
+share/proj/de_lgvl_saarland_SeTa2016.tif
+share/proj/dk_sdfe_DK_bornholm.pol
+share/proj/dk_sdfe_DK_bridges.pol
+share/proj/dk_sdfe_DK_general.pol
+share/proj/dk_sdfe_DK_jutland.pol
+share/proj/dk_sdfe_DK_zealand.pol
+share/proj/dk_sdfe_FO_fk89.pol
+share/proj/dk_sdfe_README.txt
+share/proj/dk_sdfe_dnn.tif
+share/proj/dk_sdfe_dvr90.tif
+share/proj/dk_sdfe_fvr09.tif
+share/proj/dk_sdfe_gvr2000.tif
+share/proj/dk_sdfe_gvr2016.tif
+share/proj/es_cat_icgc_100800401.tif
+share/proj/es_cat_icgc_README.txt
+share/proj/es_ign_README.txt
+share/proj/es_ign_SPED2ETV2.tif
+share/proj/es_ign_egm08-rednap-canarias.tif
+share/proj/es_ign_egm08-rednap.tif
+share/proj/eur_nkg_README.txt
+share/proj/eur_nkg_nkgrf03vel_realigned.tif
+share/proj/eur_nkg_nkgrf17vel.tif
+share/proj/fi_nls_README.txt
+share/proj/fi_nls_n43_n60.json
+share/proj/fi_nls_n60_n2000.json
+share/proj/fi_nls_ykj_etrs35fin.json
+share/proj/fr_ign_CGVD2013RGSPM06.tif
+share/proj/fr_ign_RAC09.tif
+share/proj/fr_ign_RAF09.tif
+share/proj/fr_ign_RAF18.tif
+share/proj/fr_ign_RAGTBT2016.tif
+share/proj/fr_ign_RALD2016.tif
+share/proj/fr_ign_RALDW842016.tif
+share/proj/fr_ign_RALS2016.tif
+share/proj/fr_ign_RAMART2016.tif
+share/proj/fr_ign_RAMG2016.tif
+share/proj/fr_ign_RAR07_bl.tif
+share/proj/fr_ign_RASPM2018.tif
+share/proj/fr_ign_README.txt
+share/proj/fr_ign_gg10_sbv2.tif
+share/proj/fr_ign_gg10_smv2.tif
+share/proj/fr_ign_ggg00_lsv2.tif
+share/proj/fr_ign_ggg00_mgv2.tif
+share/proj/fr_ign_ggg00_sbv2.tif
+share/proj/fr_ign_ggg00_smv2.tif
+share/proj/fr_ign_ggg00v2.tif
+share/proj/fr_ign_ggguy15.tif
+share/proj/fr_ign_ggker08v2.tif
+share/proj/fr_ign_ggm00v2.tif
+share/proj/fr_ign_ggm04v1.tif
+share/proj/fr_ign_ggpf02-Bora.tif
+share/proj/fr_ign_ggpf02-Huahine.tif
+share/proj/fr_ign_ggpf02-Maiao.tif
+share/proj/fr_ign_ggpf02-Maupiti.tif
+share/proj/fr_ign_ggpf02-Raiatea.tif
+share/proj/fr_ign_ggpf02-Tahaa.tif
+share/proj/fr_ign_ggpf02-Tupai.tif
+share/proj/fr_ign_ggpf05-HivaOa.tif
+share/proj/fr_ign_ggpf05-Nuku.tif
+share/proj/fr_ign_ggpf08-Fakarava.tif
+share/proj/fr_ign_ggpf08-Gambier.tif
+share/proj/fr_ign_ggpf08-Hao.tif
+share/proj/fr_ign_ggpf08-Mataiva.tif
+share/proj/fr_ign_ggpf08-Raivavae.tif
+share/proj/fr_ign_ggpf08-Reao.tif
+share/proj/fr_ign_ggpf08-Rurutu.tif
+share/proj/fr_ign_ggpf08-Tikehau.tif
+share/proj/fr_ign_ggpf08-Tubuai.tif
+share/proj/fr_ign_ggpf10-Moorea.tif
+share/proj/fr_ign_ggpf10-Tahiti.tif
+share/proj/fr_ign_ggspm06v1.tif
+share/proj/fr_ign_gr3df97a.tif
+share/proj/fr_ign_ntf_r93.tif
+share/proj/is_lmi_ISN2004_ISN2016.tif
+share/proj/is_lmi_ISN93_ISN2016.tif
+share/proj/is_lmi_ISN_vel_beta.tif
+share/proj/is_lmi_Icegeoid_ISN2004.tif
+share/proj/is_lmi_Icegeoid_ISN2016.tif
+share/proj/is_lmi_Icegeoid_ISN93.tif
+share/proj/is_lmi_README.txt
+share/proj/jp_gsi_README.txt
+share/proj/jp_gsi_gsigeo2011.tif
+share/proj/nc_dittt_README.txt
+share/proj/nc_dittt_Ranc08_Circe.tif
+share/proj/nc_dittt_gr3dnc01b.tif
+share/proj/nc_dittt_gr3dnc02b.tif
+share/proj/nc_dittt_gr3dnc03a.tif
+share/proj/nl_nsgi_README.txt
+share/proj/nl_nsgi_naptrans2018.tif
+share/proj/nl_nsgi_nlgeo2018.tif
+share/proj/nl_nsgi_rdcorr2018.tif
+share/proj/nl_nsgi_rdtrans2018.tif
+share/proj/nz_linz_README.txt
+share/proj/nz_linz_auckht1946-nzvd2016.tif
+share/proj/nz_linz_blufht1955-nzvd2016.tif
+share/proj/nz_linz_dublht1960-nzvd2016.tif
+share/proj/nz_linz_duneht1958-nzvd2016.tif
+share/proj/nz_linz_gisbht1926-nzvd2016.tif
+share/proj/nz_linz_lyttht1937-nzvd2016.tif
+share/proj/nz_linz_motuht1953-nzvd2016.tif
+share/proj/nz_linz_napiht1962-nzvd2016.tif
+share/proj/nz_linz_nelsht1955-nzvd2016.tif
+share/proj/nz_linz_nzgd2000-20000101.json
+share/proj/nz_linz_nzgd2000-20130801.json
+share/proj/nz_linz_nzgd2000-20140201.json
+share/proj/nz_linz_nzgd2000-20150101.json
+share/proj/nz_linz_nzgd2000-20160701.json
+share/proj/nz_linz_nzgd2000-20171201.json
+share/proj/nz_linz_nzgd2000-20180701.json
+share/proj/nz_linz_nzgd2000-c120100904-grid01.tif
+share/proj/nz_linz_nzgd2000-c220110222-grid01.tif
+share/proj/nz_linz_nzgd2000-c320110613-grid01.tif
+share/proj/nz_linz_nzgd2000-c420111223-grid01.tif
+share/proj/nz_linz_nzgd2000-ch20160214-grid01.tif
+share/proj/nz_linz_nzgd2000-cs20130721-grid01.tif
+share/proj/nz_linz_nzgd2000-cs20130721-grid02.tif
+share/proj/nz_linz_nzgd2000-ds20090715-grid011.tif
+share/proj/nz_linz_nzgd2000-ds20090715-grid012.tif
+share/proj/nz_linz_nzgd2000-ds20090715-grid013.tif
+share/proj/nz_linz_nzgd2000-ds20090715-grid014.tif
+share/proj/nz_linz_nzgd2000-gs20071016-grid01.tif
+share/proj/nz_linz_nzgd2000-ka20161114-grid01.tif
+share/proj/nz_linz_nzgd2000-ka20161114-grid02.tif
+share/proj/nz_linz_nzgd2000-ka20161114-grid03.tif
+share/proj/nz_linz_nzgd2000-ka20161114-grid04.tif
+share/proj/nz_linz_nzgd2000-ka20161114-grid05.tif
+share/proj/nz_linz_nzgd2000-ka20161114-grid06.tif
+share/proj/nz_linz_nzgd2000-ka20161114-grid07.tif
+share/proj/nz_linz_nzgd2000-ka20161114-grid08.tif
+share/proj/nz_linz_nzgd2000-ka20161114-grid09.tif
+share/proj/nz_linz_nzgd2000-ka20161114-grid10.tif
+share/proj/nz_linz_nzgd2000-ka20161114-grid11.tif
+share/proj/nz_linz_nzgd2000-ka20161114-grid12.tif
+share/proj/nz_linz_nzgd2000-lg20130816-grid01.tif
+share/proj/nz_linz_nzgd2000-lg20130816-grid02.tif
+share/proj/nz_linz_nzgd2000-mq20041223-grid011.tif
+share/proj/nz_linz_nzgd2000-mq20041223-grid012.tif
+share/proj/nz_linz_nzgd2000-mq20041223-grid013.tif
+share/proj/nz_linz_nzgd2000-mq20041223-grid014.tif
+share/proj/nz_linz_nzgd2000-mq20041223-grid015.tif
+share/proj/nz_linz_nzgd2000-mq20041223-grid016.tif
+share/proj/nz_linz_nzgd2000-ndm-grid01.tif
+share/proj/nz_linz_nzgd2000-ndm-grid02.tif
+share/proj/nz_linz_nzgd2000-si20030821-grid01.tif
+share/proj/nz_linz_nzgd2kgrid0005.tif
+share/proj/nz_linz_nzgeoid2009.tif
+share/proj/nz_linz_nzgeoid2016.tif
+share/proj/nz_linz_ontpht1964-nzvd2016.tif
+share/proj/nz_linz_stisht1977-nzvd2016.tif
+share/proj/nz_linz_taraht1970-nzvd2016.tif
+share/proj/nz_linz_wellht1953-nzvd2016.tif
+share/proj/pt_dgt_D73_ETRS89_geo.tif
+share/proj/pt_dgt_DLx_ETRS89_geo.tif
+share/proj/pt_dgt_README.txt
+share/proj/se_lantmateriet_README.txt
+share/proj/se_lantmateriet_SWEN17_RH2000.tif
+share/proj/sk_gku_JTSK03_to_JTSK.tif
+share/proj/sk_gku_README.txt
+share/proj/sk_gku_Slovakia_ETRS89h_to_Baltic1957.tif
+share/proj/sk_gku_Slovakia_ETRS89h_to_EVRF2007.tif
+share/proj/uk_os_OSGM15_Belfast.tif
+share/proj/uk_os_OSGM15_GB.tif
+share/proj/uk_os_OSGM15_Malin.tif
+share/proj/uk_os_OSTN15_NTv2_OSGBtoETRS.tif
+share/proj/uk_os_README.txt
+share/proj/us_nga_README.txt
+share/proj/us_nga_egm08_25.tif
+share/proj/us_nga_egm96_15.tif
+share/proj/us_noaa_FL.tif
+share/proj/us_noaa_MD.tif
+share/proj/us_noaa_README.txt
+share/proj/us_noaa_TN.tif
+share/proj/us_noaa_WI.tif
+share/proj/us_noaa_WO.tif
+share/proj/us_noaa_alaska.tif
+share/proj/us_noaa_alhpgn.tif
+share/proj/us_noaa_arhpgn.tif
+share/proj/us_noaa_azhpgn.tif
+share/proj/us_noaa_c1hpgn.tif
+share/proj/us_noaa_c2hpgn.tif
+share/proj/us_noaa_cnhpgn.tif
+share/proj/us_noaa_cohpgn.tif
+share/proj/us_noaa_conus.tif
+share/proj/us_noaa_cshpgn.tif
+share/proj/us_noaa_emhpgn.tif
+share/proj/us_noaa_eshpgn.tif
+share/proj/us_noaa_ethpgn.tif
+share/proj/us_noaa_flhpgn.tif
+share/proj/us_noaa_g1999a01.tif
+share/proj/us_noaa_g1999a02.tif
+share/proj/us_noaa_g1999a03.tif
+share/proj/us_noaa_g1999a04.tif
+share/proj/us_noaa_g1999h01.tif
+share/proj/us_noaa_g1999p01.tif
+share/proj/us_noaa_g1999u01.tif
+share/proj/us_noaa_g1999u02.tif
+share/proj/us_noaa_g1999u03.tif
+share/proj/us_noaa_g1999u04.tif
+share/proj/us_noaa_g1999u05.tif
+share/proj/us_noaa_g1999u06.tif
+share/proj/us_noaa_g1999u07.tif
+share/proj/us_noaa_g1999u08.tif
+share/proj/us_noaa_g2003a01.tif
+share/proj/us_noaa_g2003a02.tif
+share/proj/us_noaa_g2003a03.tif
+share/proj/us_noaa_g2003a04.tif
+share/proj/us_noaa_g2003h01.tif
+share/proj/us_noaa_g2003p01.tif
+share/proj/us_noaa_g2009g01.tif
+share/proj/us_noaa_g2009h01.tif
+share/proj/us_noaa_g2009p01.tif
+share/proj/us_noaa_g2009s01.tif
+share/proj/us_noaa_g2012ba0.tif
+share/proj/us_noaa_g2012bg0.tif
+share/proj/us_noaa_g2012bh0.tif
+share/proj/us_noaa_g2012bp0.tif
+share/proj/us_noaa_g2012bs0.tif
+share/proj/us_noaa_g2012bu0.tif
+share/proj/us_noaa_g2018p0.tif
+share/proj/us_noaa_g2018u0.tif
+share/proj/us_noaa_gahpgn.tif
+share/proj/us_noaa_geoid03_conus.tif
+share/proj/us_noaa_geoid06_ak.tif
+share/proj/us_noaa_geoid09_ak.tif
+share/proj/us_noaa_geoid09_conus.tif
+share/proj/us_noaa_guhpgn.tif
+share/proj/us_noaa_hawaii.tif
+share/proj/us_noaa_hihpgn.tif
+share/proj/us_noaa_iahpgn.tif
+share/proj/us_noaa_ilhpgn.tif
+share/proj/us_noaa_inhpgn.tif
+share/proj/us_noaa_kshpgn.tif
+share/proj/us_noaa_kyhpgn.tif
+share/proj/us_noaa_lahpgn.tif
+share/proj/us_noaa_mdhpgn.tif
+share/proj/us_noaa_mehpgn.tif
+share/proj/us_noaa_mihpgn.tif
+share/proj/us_noaa_mnhpgn.tif
+share/proj/us_noaa_mohpgn.tif
+share/proj/us_noaa_mshpgn.tif
+share/proj/us_noaa_nbhpgn.tif
+share/proj/us_noaa_nchpgn.tif
+share/proj/us_noaa_ndhpgn.tif
+share/proj/us_noaa_nehpgn.tif
+share/proj/us_noaa_njhpgn.tif
+share/proj/us_noaa_nmhpgn.tif
+share/proj/us_noaa_nvhpgn.tif
+share/proj/us_noaa_nyhpgn.tif
+share/proj/us_noaa_ohhpgn.tif
+share/proj/us_noaa_okhpgn.tif
+share/proj/us_noaa_pahpgn.tif
+share/proj/us_noaa_prvi.tif
+share/proj/us_noaa_pvhpgn.tif
+share/proj/us_noaa_schpgn.tif
+share/proj/us_noaa_sdhpgn.tif
+share/proj/us_noaa_stgeorge.tif
+share/proj/us_noaa_stlrnc.tif
+share/proj/us_noaa_stpaul.tif
+share/proj/us_noaa_tnhpgn.tif
+share/proj/us_noaa_uthpgn.tif
+share/proj/us_noaa_vahpgn.tif
+share/proj/us_noaa_vertconc.tif
+share/proj/us_noaa_vertcone.tif
+share/proj/us_noaa_vertconw.tif
+share/proj/us_noaa_wihpgn.tif
+share/proj/us_noaa_wmhpgn.tif
+share/proj/us_noaa_wohpgn.tif
+share/proj/us_noaa_wshpgn.tif
+share/proj/us_noaa_wthpgn.tif
+share/proj/us_noaa_wvhpgn.tif
+share/proj/us_noaa_wyhpgn.tif
diff --git a/proj-data/distinfo b/proj-data/distinfo
new file mode 100644
index 0000000000..22981a3017
--- /dev/null
+++ b/proj-data/distinfo
@@ -0,0 +1,5 @@
+$NetBSD$
+
+BLAKE2s (proj-data-1.4.tar.gz) = 0531d9bd385d3a0beeb7ffd3c5aeb9f3f8d3f1a93de6210095623172d5a1edc0
+SHA512 (proj-data-1.4.tar.gz) = 9c3fdf2851ef003309ae62348be785abd31c15d15ceb28ea58804852e40e17cd0f5b45cf5ab788343111e12437c1bb446355a71cefc327ff175971b9a69f0e86
+Size (proj-data-1.4.tar.gz) = 581536964 bytes
diff --git a/proj/Makefile b/proj/Makefile
index ccf25641f8..53de8a17cb 100644
--- a/proj/Makefile
+++ b/proj/Makefile
@@ -5,7 +5,7 @@
 VERSION_BASE=	7.2.1
 VERSION_RC=
 VERSION=	${VERSION_BASE}${VERSION_RC}
-#PKGREVISION=	0
+PKGREVISION=	1
 # proj RCs have names like 5.1.0RC1 but unpack to 5.1.0
 WRKFINAL=	proj-${VERSION_BASE}
 WRKSRC=		${WRKDIR}/${WRKFINAL}
@@ -15,19 +15,14 @@ MASTER_SITES=	https://download.osgeo.org/proj/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	gdt%NetBSD.org@localhost
-HOMEPAGE=	https://proj4.org/
+HOMEPAGE=	https://proj.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.
-# Grid files also have the following "cc-by ish" licenses:
-# cc-by, 2-clause-bsd,  License Ouverte, cc0 (eu)
-# open-government, cc-by, public-domain (na)
-# cc-by (oceania)
-LICENSE=	mit
+LICENSE=		mit
 
 PREV_PKGPATH=		misc/proj
 
@@ -43,26 +38,7 @@ GNU_CONFIGURE=		yes
 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.
-do-test:
-	${ECHO} "Tests assume extra grids are not installed."
-	${FALSE}
-.else
 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
-# base Makefile.  Consider an alternate approach.
-post-extract:
-	cd ${WRKDIR} && for f in *; do if [ $$f != ${WRKFINAL} ]; then mv $$f ${WRKFINAL}/data; fi; done
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/proj/PLIST-not.grids b/proj/PLIST-not.grids
deleted file mode 100644
index 133c219513..0000000000
--- a/proj/PLIST-not.grids
+++ /dev/null
@@ -1,213 +0,0 @@
-${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/buildlink3.mk b/proj/buildlink3.mk
index bfbb12b823..fcf373c58a 100644
--- a/proj/buildlink3.mk
+++ b/proj/buildlink3.mk
@@ -6,8 +6,8 @@ BUILDLINK_TREE+=	proj
 PROJ_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.proj+=	proj>=5.0.0
-BUILDLINK_ABI_DEPENDS.proj+=	proj>=5.0.0
-BUILDLINK_PKGSRCDIR.proj?=	../../geography/proj
+BUILDLINK_ABI_DEPENDS.proj+=	proj>=7.0.0
+BUILDLINK_PKGSRCDIR.proj?=	../../wip/proj
 .endif # PROJ_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-proj
diff --git a/proj/distinfo b/proj/distinfo
index 3bed73495b..c29c58adc9 100644
--- a/proj/distinfo
+++ b/proj/distinfo
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.13 2019/02/21 00:55:04 gdt Exp $
 
-RMD160 (proj-7.2.1.tar.gz) = 33640fc210ad5e465c04047ac364a53c2415b441
+BLAKE2s (proj-7.2.1.tar.gz) = f0308aac5e54722103131481e372c314d57bf4f35208f605b9ad5e0d26a8bc52
 SHA512 (proj-7.2.1.tar.gz) = 59b9b31b0183e620a2f4a25a08620c170773fe4f99e8eca59e9ed6815f43bb379ea21ef71e8f759dbd747855b982657d7503bac3acc542218e0d862105f25324
 Size (proj-7.2.1.tar.gz) = 5714666 bytes
Home | Main Index | Thread Index | Old Index