Index: graphics/proj/Makefile =================================================================== --- graphics/proj/Makefile (revision 501807) +++ graphics/proj/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= proj -PORTVERSION= 5.1.0 +PORTVERSION= 6.1.0 PORTEPOCH= 1 CATEGORIES= graphics geography MASTER_SITES= https://download.osgeo.org/proj/ @@ -9,25 +9,36 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DATUM_GRID_FILES} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER= fmysh@iijmio-mail.jp +MAINTAINER= wen@FreeBSD.org COMMENT= Cartographic Projections library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -DATUM_GRID_FILES= proj-datumgrid-1.7.zip +LIB_DEPENDS= libsqlite3.so:databases/sqlite3 -GNU_CONFIGURE= yes -USES= compiler gmake libtool pathfix +USES= compiler:c++11-lang gmake libtool pathfix pkgconfig USE_LDCONFIG= yes +GNU_CONFIGURE= yes + +DATUM_GRID_FILES= proj-datumgrid-1.8.zip \ + proj-datumgrid-europe-1.3.zip \ + proj-datumgrid-north-america-1.2.zip \ + proj-datumgrid-oceania-1.0.zip \ + proj-datumgrid-world-1.0.zip + FMAN1= cs2cs.1 geod.1 proj.1 FMAN3= geodesic.3 pj_init.3 INSTALL_TARGET= install-strip +TEST_TARGET= check post-extract: - @${TAR} -xf ${DISTDIR}/${DATUM_GRID_FILES} -C ${WRKSRC}/nad + ${MKDIR} ${WRKSRC}/datum +.for f in ${DATUM_GRID_FILES} + @${TAR} -xf ${DISTDIR}/${f} -C ${WRKSRC}/datum +.endfor post-install: .for m in 1 3 @@ -34,4 +45,6 @@ (cd ${STAGEDIR}${MANPREFIX}/man/man${m} && ${GZIP_CMD} ${FMAN${m}}) .endfor + cd ${WRKSRC}/datum && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR} + .include Index: graphics/proj/distinfo =================================================================== --- graphics/proj/distinfo (revision 501807) +++ graphics/proj/distinfo (working copy) @@ -1,5 +1,13 @@ -TIMESTAMP = 1527753974 -SHA256 (proj-5.1.0.tar.gz) = 6b1379a53317d9b5b8c723c1dc7bf2e3a8eb22ceb46b8807a1ce48ef65685bb3 -SIZE (proj-5.1.0.tar.gz) = 1006324 -SHA256 (proj-datumgrid-1.7.zip) = ffcad4453fac3b4a13ca678ef343e688496e18019f35709ef03c5f200e9fb85a -SIZE (proj-datumgrid-1.7.zip) = 6601627 +TIMESTAMP = 1558047039 +SHA256 (proj-6.1.0.tar.gz) = 676165c54319d2f03da4349cbd7344eb430b225fe867a90191d848dc64788008 +SIZE (proj-6.1.0.tar.gz) = 2453402 +SHA256 (proj-datumgrid-1.8.zip) = b9838ae7e5f27ee732fb0bfed618f85b36e8bb56d7afb287d506338e9f33861e +SIZE (proj-datumgrid-1.8.zip) = 6601640 +SHA256 (proj-datumgrid-europe-1.3.zip) = fec755e7e80f921b985cff76213e6e65949468f4482d329f09c8cf1d8dddfe52 +SIZE (proj-datumgrid-europe-1.3.zip) = 23249850 +SHA256 (proj-datumgrid-north-america-1.2.zip) = e827adbf62139095bc0029f35495dabb38351a77bd83583ecd3d2f15b362cfe5 +SIZE (proj-datumgrid-north-america-1.2.zip) = 73660220 +SHA256 (proj-datumgrid-oceania-1.0.zip) = 41c23f32712b2beaedcddb0e53542a4c15d2fda62f104d3e041760062bd70707 +SIZE (proj-datumgrid-oceania-1.0.zip) = 96907052 +SHA256 (proj-datumgrid-world-1.0.zip) = cbffb31faecb16f3f7acbfe7e85e81440aa8d6eae670de7ec2d19a13c02b4681 +SIZE (proj-datumgrid-world-1.0.zip) = 134375434 Index: graphics/proj/pkg-plist =================================================================== --- graphics/proj/pkg-plist (revision 501807) +++ graphics/proj/pkg-plist (working copy) @@ -4,17 +4,28 @@ bin/gie bin/invgeod bin/invproj -bin/nad2bin bin/proj +bin/projinfo include/geodesic.h include/org_proj4_PJ.h include/proj.h +include/proj/common.hpp +include/proj/coordinateoperation.hpp +include/proj/coordinatesystem.hpp +include/proj/crs.hpp +include/proj/datum.hpp +include/proj/io.hpp +include/proj/metadata.hpp +include/proj/nn.hpp +include/proj/util.hpp include/proj_api.h -include/projects.h +include/proj_constants.h +include/proj_experimental.h +include/proj_symbol_rename.h lib/libproj.a lib/libproj.so -lib/libproj.so.13 -lib/libproj.so.13.1.0 +lib/libproj.so.15 +lib/libproj.so.15.1.0 libdata/pkgconfig/proj.pc man/man1/cct.1.gz man/man1/cs2cs.1.gz @@ -21,38 +32,165 @@ man/man1/geod.1.gz man/man1/gie.1.gz man/man1/proj.1.gz +man/man1/projinfo.1.gz man/man3/geodesic.3.gz man/man3/pj_init.3.gz -%%DATADIR%%/BETA2007.gsb %%DATADIR%%/CH -%%DATADIR%%/FL %%DATADIR%%/GL27 -%%DATADIR%%/IGNF %%DATADIR%%/ITRF2000 %%DATADIR%%/ITRF2008 %%DATADIR%%/ITRF2014 +%%DATADIR%%/nad.lst +%%DATADIR%%/nad27 +%%DATADIR%%/nad83 +%%DATADIR%%/null +%%DATADIR%%/other.extra +%%DATADIR%%/proj.db +%%DATADIR%%/world +%%DATADIR%%/A66_National_13_09_01.gsb +%%DATADIR%%/BETA2007.gsb +%%DATADIR%%/DK +%%DATADIR%%/DK_bornholm.pol +%%DATADIR%%/DK_bridges.pol +%%DATADIR%%/DK_general.pol +%%DATADIR%%/DK_jutland.pol +%%DATADIR%%/DK_zealand.pol +%%DATADIR%%/FL +%%DATADIR%%/FO +%%DATADIR%%/FO_fk89.pol +%%DATADIR%%/GDA94_GDA2020_conformal.gsb +%%DATADIR%%/GDA94_GDA2020_conformal_and_distortion.gsb +%%DATADIR%%/GL %%DATADIR%%/MD +%%DATADIR%%/NKG +%%DATADIR%%/National_84_02_07_01.gsb +%%DATADIR%%/OSGM15_Belfast.gtx +%%DATADIR%%/OSGM15_Malin.gtx +%%DATADIR%%/OSTN15_NTv2_OSGBtoETRS.gsb +%%DATADIR%%/RAC09.gtx +%%DATADIR%%/RAF09.gtx +%%DATADIR%%/RAF18.gtx +%%DATADIR%%/RAGTBT2016.gtx +%%DATADIR%%/RALD2016.gtx +%%DATADIR%%/RALDW842016.gtx +%%DATADIR%%/RALS2016.gtx +%%DATADIR%%/RAMART2016.gtx +%%DATADIR%%/RAMG2016.gtx +%%DATADIR%%/RAR07_bl.gtx +%%DATADIR%%/README.DATUMGRID +%%DATADIR%%/README.EUROPE +%%DATADIR%%/README.NORTHAMERICA +%%DATADIR%%/README.OCEANIA +%%DATADIR%%/README.WORLD +%%DATADIR%%/SWEN17_RH2000.gtx %%DATADIR%%/TN %%DATADIR%%/WI %%DATADIR%%/WO %%DATADIR%%/alaska +%%DATADIR%%/alhpgn.gsb +%%DATADIR%%/arhpgn.gsb +%%DATADIR%%/azhpgn.gsb +%%DATADIR%%/bd72lb72_etrs89lb08.gsb +%%DATADIR%%/c1hpgn.gsb +%%DATADIR%%/c2hpgn.gsb +%%DATADIR%%/cnhpgn.gsb +%%DATADIR%%/cohpgn.gsb %%DATADIR%%/conus +%%DATADIR%%/dnn.gtx +%%DATADIR%%/dvr90.gtx +%%DATADIR%%/egm08_25.gtx %%DATADIR%%/egm96_15.gtx -%%DATADIR%%/epsg -%%DATADIR%%/esri -%%DATADIR%%/esri.extra +%%DATADIR%%/emhpgn.gsb +%%DATADIR%%/ethpgn.gsb +%%DATADIR%%/flhpgn.gsb +%%DATADIR%%/fvr09.gtx +%%DATADIR%%/g2012ba0.gtx +%%DATADIR%%/g2012bg0.gtx +%%DATADIR%%/g2012bh0.gtx +%%DATADIR%%/g2012bp0.gtx +%%DATADIR%%/g2012bs0.gtx +%%DATADIR%%/g2012bu0.gtx +%%DATADIR%%/gahpgn.gsb +%%DATADIR%%/gg10_sbv2.gtx +%%DATADIR%%/gg10_smv2.gtx +%%DATADIR%%/ggg00_lsv2.gtx +%%DATADIR%%/ggg00_mgv2.gtx +%%DATADIR%%/ggg00_sbv2.gtx +%%DATADIR%%/ggg00_smv2.gtx +%%DATADIR%%/ggg00v2.gtx +%%DATADIR%%/ggguy15.gtx +%%DATADIR%%/ggker08v2.gtx +%%DATADIR%%/ggm00v2.gtx +%%DATADIR%%/ggm04v1.gtx +%%DATADIR%%/ggpf02-Bora.gtx +%%DATADIR%%/ggpf02-Huahine.gtx +%%DATADIR%%/ggpf02-Maiao.gtx +%%DATADIR%%/ggpf02-Maupiti.gtx +%%DATADIR%%/ggpf02-Raiatea.gtx +%%DATADIR%%/ggpf02-Tahaa.gtx +%%DATADIR%%/ggpf02-Tupai.gtx +%%DATADIR%%/ggpf05-HivaOa.gtx +%%DATADIR%%/ggpf05-Nuku.gtx +%%DATADIR%%/ggpf08-Fakarava.gtx +%%DATADIR%%/ggpf08-Gambier.gtx +%%DATADIR%%/ggpf08-Hao.gtx +%%DATADIR%%/ggpf08-Mataiva.gtx +%%DATADIR%%/ggpf08-Raivavae.gtx +%%DATADIR%%/ggpf08-Reao.gtx +%%DATADIR%%/ggpf08-Rurutu.gtx +%%DATADIR%%/ggpf08-Tikehau.gtx +%%DATADIR%%/ggpf08-Tubuai.gtx +%%DATADIR%%/ggpf10-Moorea.gtx +%%DATADIR%%/ggpf10-Tahiti.gtx +%%DATADIR%%/ggspm06v1.gtx +%%DATADIR%%/guhpgn.gsb +%%DATADIR%%/gvr2000.gtx +%%DATADIR%%/gvr2016.gtx %%DATADIR%%/hawaii -%%DATADIR%%/nad.lst -%%DATADIR%%/nad27 -%%DATADIR%%/nad83 +%%DATADIR%%/hihpgn.gsb +%%DATADIR%%/iahpgn.gsb +%%DATADIR%%/ilhpgn.gsb +%%DATADIR%%/inhpgn.gsb +%%DATADIR%%/kyhpgn.gsb +%%DATADIR%%/lahpgn.gsb +%%DATADIR%%/mdhpgn.gsb +%%DATADIR%%/mehpgn.gsb +%%DATADIR%%/mihpgn.gsb +%%DATADIR%%/mnhpgn.gsb +%%DATADIR%%/mohpgn.gsb +%%DATADIR%%/nbhpgn.gsb +%%DATADIR%%/nchpgn.gsb +%%DATADIR%%/ndhpgn.gsb +%%DATADIR%%/nehpgn.gsb +%%DATADIR%%/njhpgn.gsb +%%DATADIR%%/nkgrf03vel_realigned_xy.ct2 +%%DATADIR%%/nkgrf03vel_realigned_z.gtx +%%DATADIR%%/nmhpgn.gsb %%DATADIR%%/ntf_r93.gsb %%DATADIR%%/ntv1_can.dat -%%DATADIR%%/null +%%DATADIR%%/ntv2_0.gsb +%%DATADIR%%/nvhpgn.gsb +%%DATADIR%%/nyhpgn.gsb %%DATADIR%%/nzgd2kgrid0005.gsb -%%DATADIR%%/other.extra -%%DATADIR%%/proj_def.dat +%%DATADIR%%/ohhpgn.gsb +%%DATADIR%%/okhpgn.gsb +%%DATADIR%%/pahpgn.gsb %%DATADIR%%/prvi +%%DATADIR%%/pvhpgn.gsb +%%DATADIR%%/schpgn.gsb +%%DATADIR%%/sdhpgn.gsb %%DATADIR%%/stgeorge %%DATADIR%%/stlrnc %%DATADIR%%/stpaul -%%DATADIR%%/world +%%DATADIR%%/tnhpgn.gsb +%%DATADIR%%/uthpgn.gsb +%%DATADIR%%/vahpgn.gsb +%%DATADIR%%/vertconc.gtx +%%DATADIR%%/vertcone.gtx +%%DATADIR%%/vertconw.gtx +%%DATADIR%%/wihpgn.gsb +%%DATADIR%%/wmhpgn.gsb +%%DATADIR%%/wohpgn.gsb +%%DATADIR%%/wthpgn.gsb +%%DATADIR%%/wvhpgn.gsb +%%DATADIR%%/wyhpgn.gsb Index: databases/spatialite/Makefile =================================================================== --- databases/spatialite/Makefile (revision 501807) +++ databases/spatialite/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= spatialite PORTVERSION= 4.3.0 +PORTREVISION= 1 CATEGORIES= databases geography MASTER_SITES= http://www.gaia-gis.it/gaia-sins/libspatialite-sources/ DISTNAME= lib${PORTNAME}-${PORTVERSION} @@ -23,7 +24,9 @@ CFLAGS+= -I${WRKSRC}/src/headers -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} -CONFIGURE_ARGS+= --enable-gcp=yes --enable-libxml2=yes CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +CONFIGURE_ARGS+= --enable-gcp=yes --enable-libxml2=yes \ + CFLAGS="${CFLAGS} -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" \ + LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes OPTIONS_DEFINE=LWGEOM Index: graphics/libgeotiff/Makefile =================================================================== --- graphics/libgeotiff/Makefile (revision 501807) +++ graphics/libgeotiff/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libgeotiff -PORTVERSION= 1.4.3 +PORTVERSION= 1.5.1 CATEGORIES= graphics MASTER_SITES= https://download.osgeo.org/geotiff/libgeotiff/ \ LOCAL/sunpoet Index: graphics/libgeotiff/distinfo =================================================================== --- graphics/libgeotiff/distinfo (revision 501807) +++ graphics/libgeotiff/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1546194150 -SHA256 (libgeotiff-1.4.3.tar.gz) = b8510d9b968b5ee899282cdd5bef13fd02d5a4c19f664553f81e31127bc47265 -SIZE (libgeotiff-1.4.3.tar.gz) = 1864829 +TIMESTAMP = 1555024362 +SHA256 (libgeotiff-1.5.1.tar.gz) = f9e99733c170d11052f562bcd2c7cb4de53ed405f7acdde4f16195cd3ead612c +SIZE (libgeotiff-1.5.1.tar.gz) = 528083 Index: graphics/libgeotiff/pkg-plist =================================================================== --- graphics/libgeotiff/pkg-plist (revision 501807) +++ graphics/libgeotiff/pkg-plist (working copy) @@ -12,7 +12,6 @@ include/epsg_vertcs.inc include/geo_config.h include/geo_ctrans.inc -include/geo_incode_defs.h include/geo_keyp.h include/geo_normalize.h include/geo_simpletags.h @@ -26,43 +25,8 @@ include/xtiffio.h lib/libgeotiff.a lib/libgeotiff.so -lib/libgeotiff.so.2 -lib/libgeotiff.so.2.2.0 +lib/libgeotiff.so.5 +lib/libgeotiff.so.5.0.0 man/man1/applygeo.1.gz man/man1/geotifcp.1.gz man/man1/listgeo.1.gz -%%DATADIR%%/epsg_csv/alias.csv -%%DATADIR%%/epsg_csv/area.csv -%%DATADIR%%/epsg_csv/change.csv -%%DATADIR%%/epsg_csv/compdcs.csv -%%DATADIR%%/epsg_csv/coordinate_axis.csv -%%DATADIR%%/epsg_csv/coordinate_axis_name.csv -%%DATADIR%%/epsg_csv/coordinate_operation.csv -%%DATADIR%%/epsg_csv/coordinate_operation_method.csv -%%DATADIR%%/epsg_csv/coordinate_operation_parameter.csv -%%DATADIR%%/epsg_csv/coordinate_operation_parameter_value.csv -%%DATADIR%%/epsg_csv/coordinate_operation_path.csv -%%DATADIR%%/epsg_csv/coordinate_reference_system.csv -%%DATADIR%%/epsg_csv/coordinate_system.csv -%%DATADIR%%/epsg_csv/csv2c.py -%%DATADIR%%/epsg_csv/csv_tools.py -%%DATADIR%%/epsg_csv/datum.csv -%%DATADIR%%/epsg_csv/datum_shift.csv -%%DATADIR%%/epsg_csv/datum_shift_pref.csv -%%DATADIR%%/epsg_csv/deprecation.csv -%%DATADIR%%/epsg_csv/ellipsoid.csv -%%DATADIR%%/epsg_csv/esri_datum_override.csv -%%DATADIR%%/epsg_csv/gcs.csv -%%DATADIR%%/epsg_csv/gcs.override.csv -%%DATADIR%%/epsg_csv/geoccs.csv -%%DATADIR%%/epsg_csv/naming_system.csv -%%DATADIR%%/epsg_csv/pcs.csv -%%DATADIR%%/epsg_csv/pcs.override.csv -%%DATADIR%%/epsg_csv/prime_meridian.csv -%%DATADIR%%/epsg_csv/projop_wparm.csv -%%DATADIR%%/epsg_csv/stateplane.csv -%%DATADIR%%/epsg_csv/supersession.csv -%%DATADIR%%/epsg_csv/unit_of_measure.csv -%%DATADIR%%/epsg_csv/version_history.csv -%%DATADIR%%/epsg_csv/vertcs.csv -%%DATADIR%%/epsg_csv/vertcs.override.csv Index: converters/osm2pgsql/Makefile =================================================================== --- converters/osm2pgsql/Makefile (revision 501807) +++ converters/osm2pgsql/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= osm2pgsql PORTVERSION= 0.96.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= converters geography MAINTAINER= amdmi3@FreeBSD.org @@ -23,6 +23,8 @@ USES= cmake lua:53 pgsql +CXXFLAGS+= "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" + PLIST_FILES= bin/osm2pgsql \ man/man1/osm2pgsql.1.gz