diff options
| -rw-r--r-- | geography/proj/Makefile | 39 | ||||
| -rw-r--r-- | geography/proj/PLIST | 224 | ||||
| -rw-r--r-- | geography/proj/buildlink3.mk | 6 | ||||
| -rw-r--r-- | geography/proj/distinfo | 23 | ||||
| -rw-r--r-- | geography/proj/options.mk | 21 |
5 files changed, 23 insertions, 290 deletions
diff --git a/geography/proj/Makefile b/geography/proj/Makefile index f52b8f38699..695405c33da 100644 --- a/geography/proj/Makefile +++ b/geography/proj/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.28 2022/11/23 16:18:46 adam Exp $ +# $NetBSD: Makefile,v 1.29 2022/11/27 13:30:45 gdt Exp $ -# An update to 7 is on hold because I have not yet assessed how much -# trouble it will cause. -gdt -VERSION_BASE= 6.3.2 +# An update to 8 or 9 is on hold because I have not yet assessed how +# much trouble it will cause. -gdt +# evaluated how much this will break. +VERSION_BASE= 7.2.1 VERSION_RC= VERSION= ${VERSION_BASE}${VERSION_RC} #PKGREVISION= 0 @@ -10,24 +11,16 @@ VERSION= ${VERSION_BASE}${VERSION_RC} WRKFINAL= proj-${VERSION_BASE} WRKSRC= ${WRKDIR}/${WRKFINAL} DISTNAME= proj-${VERSION} -PKGREVISION= 6 CATEGORIES= geography MASTER_SITES= https://download.osgeo.org/proj/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= gdt@NetBSD.org -HOMEPAGE= https://proj4.org/ +HOMEPAGE= https://proj.org/ COMMENT= Cartographic projection software - -# \todo: Add pdf manual. - -# 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 -.include "options.mk" +.include "../../mk/bsd.prefs.mk" PREV_PKGPATH= misc/proj @@ -43,24 +36,10 @@ GNU_CONFIGURE= yes CFLAGS+= -DHAVE_C99_MATH=0 .endif -.if !empty(PKG_OPTIONS:Mproj-grids) -# 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 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" +.include "../../www/curl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/geography/proj/PLIST b/geography/proj/PLIST index 32acd0ac55d..10a10cd6455 100644 --- a/geography/proj/PLIST +++ b/geography/proj/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2020/03/10 16:17:38 gdt Exp $ +@comment $NetBSD: PLIST,v 1.10 2022/11/27 13:30:45 gdt Exp $ bin/cct bin/cs2cs bin/geod @@ -7,8 +7,8 @@ bin/invgeod bin/invproj bin/proj bin/projinfo +bin/projsync include/geodesic.h -include/org_proj4_PJ.h include/proj.h include/proj/common.hpp include/proj/coordinateoperation.hpp @@ -31,231 +31,19 @@ man/man1/geod.1 man/man1/gie.1 man/man1/proj.1 man/man1/projinfo.1 -man/man3/geodesic.3 -man/man3/pj_init.3 -${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 +man/man1/projsync.1 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 -${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/deformation_model.schema.json 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 -share/proj/null -${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/geography/proj/buildlink3.mk b/geography/proj/buildlink3.mk index fd9730ab5a9..0e4c9a049ec 100644 --- a/geography/proj/buildlink3.mk +++ b/geography/proj/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2022/11/23 16:18:46 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2022/11/27 13:30:45 gdt Exp $ BUILDLINK_TREE+= proj @@ -6,9 +6,11 @@ BUILDLINK_TREE+= proj PROJ_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.proj+= proj>=5.0.0 -BUILDLINK_ABI_DEPENDS.proj+= proj>=6.3.2nb6 +BUILDLINK_ABI_DEPENDS.proj+= proj>=7.0.0 BUILDLINK_PKGSRCDIR.proj?= ../../geography/proj .include "../../databases/sqlite3/buildlink3.mk" +.include "../../graphics/tiff/buildlink3.mk" +.include "../../www/curl/buildlink3.mk" .endif # PROJ_BUILDLINK3_MK BUILDLINK_TREE+= -proj diff --git a/geography/proj/distinfo b/geography/proj/distinfo index 9f45cef4635..f0badac3aa1 100644 --- a/geography/proj/distinfo +++ b/geography/proj/distinfo @@ -1,20 +1,5 @@ -$NetBSD: distinfo,v 1.17 2021/10/26 10:45:14 nia Exp $ +$NetBSD: distinfo,v 1.18 2022/11/27 13:30:45 gdt Exp $ -BLAKE2s (proj-6.3.2.tar.gz) = 7ab49bdf9f94abe976c158d167ba04c92dbe79e2a9fa7b7f654a0aea96ddfd35 -SHA512 (proj-6.3.2.tar.gz) = 6fcaf037fe2895686184b2bf668e48d882afe8245cd6cd625d3fb66ebc34c066738fbe683889a3085bd8fe91f2c3b829064aa2318fa592ff7374cee153617b22 -Size (proj-6.3.2.tar.gz) = 2827685 bytes -BLAKE2s (proj-datumgrid-1.8.tar.gz) = 8372fdaf89e5640fb69edad17b6b62cadc9e61c2cb7a3f1f587020cb4c63a3d8 -SHA512 (proj-datumgrid-1.8.tar.gz) = 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5 -Size (proj-datumgrid-1.8.tar.gz) = 6604329 bytes -BLAKE2s (proj-datumgrid-europe-1.5.tar.gz) = f988796f271c88a0abd606895c756df921f48150418d111184fd2e4c00be9083 -SHA512 (proj-datumgrid-europe-1.5.tar.gz) = 456a8c27dad7ef8fc1790ef822e7e8dcbc69b79e0a28df8c6b58d24b0ef4a3221cebd8e911a0d84b7f00694247b0fb8f4361a38d7369f921da000c838812f389 -Size (proj-datumgrid-europe-1.5.tar.gz) = 187195036 bytes -BLAKE2s (proj-datumgrid-north-america-1.3.tar.gz) = c39874fcf8ba68b475ee865d18c8514c2c8c402a3472f296e32b684c69e6d35e -SHA512 (proj-datumgrid-north-america-1.3.tar.gz) = d79b44b2a20aef4ef41ba4d2f91146b54fa94978ef9b7512931ee78bdd373bbbe2c89a6748cef77c3b0e912a5b937ddecb31fd7a9e9fe04e36b9907184830a19 -Size (proj-datumgrid-north-america-1.3.tar.gz) = 452401850 bytes -BLAKE2s (proj-datumgrid-oceania-1.1.tar.gz) = d8db1a3a2e8905fd68a0bedf0b99a8bd65b5a5caffb799fc1b76fb4c196bae0e -SHA512 (proj-datumgrid-oceania-1.1.tar.gz) = 8ecd31470305c1433b3ce5e26f44e0a1e2131c6d8a76b2318c1a1cf9241a4f70ca6e8638ff64315d1061e2aa3046a4ca8c4f4336ad682ce18362ee2c956aed6b -Size (proj-datumgrid-oceania-1.1.tar.gz) = 144248108 bytes -BLAKE2s (proj-datumgrid-world-1.0.tar.gz) = 94daa68c7b7f4edcd035b95d601453af79eb5af695af9496d3e80d44e20c2539 -SHA512 (proj-datumgrid-world-1.0.tar.gz) = 9f79f4c24f1a4a472f2747e4bb147c7140a92f3043b283f2a0326775393ebb39f634f2715a4d085dc33eabbbed4c3fb1871753ecf6c238c179ac0bbe83b9ca3e -Size (proj-datumgrid-world-1.0.tar.gz) = 134373680 bytes +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 diff --git a/geography/proj/options.mk b/geography/proj/options.mk deleted file mode 100644 index 99f809f963d..00000000000 --- a/geography/proj/options.mk +++ /dev/null @@ -1,21 +0,0 @@ -# $NetBSD: options.mk,v 1.1 2020/03/10 16:17:38 gdt Exp $ - -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.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 |