- Update to 6.0.0

- Add missing DEPENDS
- Add TEST_TARGET
- Take maintainership
- Add USES=compiler:c++11-lang to make build on powerpc(Thanks sunpoet@)

PR:		236483
Submitted by:	wenheping2000@hotmail.com(myself)
Approved by:	maintainer(timeout, >= 30 days)

3 files changed, 182 insertions, 27 deletions

diff --git a/graphics/proj/Makefile b/graphics/proj/Makefile
index 77993a231374..6a82b45b8e65 100644
--- a/graphics/proj/Makefile
+++ b/graphics/proj/Makefile
@@ -2,35 +2,46 @@
 # $FreeBSD$
 
 PORTNAME=	proj
-PORTVERSION=	5.1.0
+PORTVERSION=	6.0.0
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://download.osgeo.org/proj/
 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
+
+DATUM_GRID_FILES=	proj-datumgrid-1.8.zip \
+			proj-datumgrid-europe-1.2.zip \
+			proj-datumgrid-north-america-1.2.zip \
+			proj-datumgrid-oceania-1.0.zip \
+			proj-datumgrid-world-1.0.zip
 
 GNU_CONFIGURE=	yes
-USES=		compiler gmake libtool pathfix
+USES=		compiler:c++11-lang gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 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
 	(cd ${STAGEDIR}${MANPREFIX}/man/man${m} && ${GZIP_CMD} ${FMAN${m}})
 .endfor
+	cd ${WRKSRC}/datum && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/proj/distinfo b/graphics/proj/distinfo
index c1f91b2c2861..482273d1c5a6 100644
--- a/graphics/proj/distinfo
+++ b/graphics/proj/distinfo
@@ -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 = 1554941569
+SHA256 (proj-6.0.0.tar.gz) = 4510a2c1c8f9056374708a867c51b1192e8d6f9a5198dd320bf6a168e44a3657
+SIZE (proj-6.0.0.tar.gz) = 2405217
+SHA256 (proj-datumgrid-1.8.zip) = b9838ae7e5f27ee732fb0bfed618f85b36e8bb56d7afb287d506338e9f33861e
+SIZE (proj-datumgrid-1.8.zip) = 6601640
+SHA256 (proj-datumgrid-europe-1.2.zip) = 50b263574ea34bbb1a79aa5773c06d02ee76086d6b3bc75f94dbae875d0f275a
+SIZE (proj-datumgrid-europe-1.2.zip) = 20602877
+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
diff --git a/graphics/proj/pkg-plist b/graphics/proj/pkg-plist
index da0525421a0e..ee60b5a7fe1f 100644
--- a/graphics/proj/pkg-plist
+++ b/graphics/proj/pkg-plist
@@ -4,55 +4,191 @@ bin/geod
 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.0.0
 libdata/pkgconfig/proj.pc
 man/man1/cct.1.gz
 man/man1/cs2cs.1.gz
 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%%/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%%/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