From 0329e75bbd87dcd8d33655ebec423b2af9a3a149 Mon Sep 17 00:00:00 2001 From: Greg Troxel Date: Wed, 6 Mar 2019 14:46:16 -0500 Subject: [PATCH] proj: Add proj 6.0.0 package This is not updated in pkgsrc because it will break too much. Please use this locally instead to help evaluate and fix up depending packages. --- Makefile | 1 + proj/DESCR | 4 + proj/Makefile | 49 ++++++++++ proj/PLIST | 175 +++++++++++++++++++++++++++++++++++ proj/TODO | 2 + proj/buildlink3.mk | 13 +++ proj/distinfo | 23 +++++ proj/patches/patch-configure | 24 +++++ 8 files changed, 291 insertions(+) create mode 100644 proj/DESCR create mode 100644 proj/Makefile create mode 100644 proj/PLIST create mode 100644 proj/TODO create mode 100644 proj/buildlink3.mk create mode 100644 proj/distinfo create mode 100644 proj/patches/patch-configure diff --git a/Makefile b/Makefile index e8315c453b..a92457435f 100644 --- a/Makefile +++ b/Makefile @@ -2969,6 +2969,7 @@ SUBDIR+= procps SUBDIR+= prodigal SUBDIR+= profanity SUBDIR+= progreiserfs +SUBDIR+= proj SUBDIR+= proplib SUBDIR+= proselint SUBDIR+= prover9 diff --git a/proj/DESCR b/proj/DESCR new file mode 100644 index 0000000000..4bfdfa1a18 --- /dev/null +++ b/proj/DESCR @@ -0,0 +1,4 @@ +PROJ is a collection of programs and a library for performing +cartographic projections. The programs are designed as a standard UNIX +filters to be used with other programs in the generation of maps and +charts, and as map digitizing applications. diff --git a/proj/Makefile b/proj/Makefile new file mode 100644 index 0000000000..7f4a5715e1 --- /dev/null +++ b/proj/Makefile @@ -0,0 +1,49 @@ +# $NetBSD: Makefile,v 1.17 2019/02/27 14:29:58 gdt Exp $ + +# I have an update to 6 ready, but it is on hold pending an assessment +# of projects.h removal fallout - gdt. +VERSION_BASE= 6.0.0 +VERSION_RC= +VERSION= ${VERSION_BASE}${VERSION_RC} +#PKGREVISION= 0 +# proj RCs have names like 5.1.0RC1 but unpack to 5.1.0 +WRKFINAL= proj-${VERSION_BASE} +WRKSRC= ${WRKDIR}/${WRKFINAL} +DISTNAME= proj-${VERSION} +CATEGORIES= geography +MASTER_SITES= https://download.osgeo.org/proj/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + proj-datumgrid-1.8${EXTRACT_SUFX} \ + proj-datumgrid-europe-1.2${EXTRACT_SUFX} \ + proj-datumgrid-north-america-1.2${EXTRACT_SUFX} \ + proj-datumgrid-oceania-1.0${EXTRACT_SUFX} + +MAINTAINER= gdt@NetBSD.org +HOMEPAGE= http://proj4.org/ +COMMENT= Cartographic projection software + +# 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 + +PREV_PKGPATH= misc/proj + +USE_LANGUAGES= c99 c++11 +USE_LIBTOOL= yes +USE_TOOLS+= gmake pkg-config +GNU_CONFIGURE= yes + +TEST_TARGET= check + +# \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 "../../mk/pthread.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/proj/PLIST b/proj/PLIST new file mode 100644 index 0000000000..dcc0fc25a6 --- /dev/null +++ b/proj/PLIST @@ -0,0 +1,175 @@ +@comment $NetBSD: PLIST,v 1.8 2019/02/21 00:55:04 gdt Exp $ +bin/cct +bin/cs2cs +bin/geod +bin/gie +bin/invgeod +bin/invproj +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/proj_constants.h +include/proj_experimental.h +include/proj_symbol_rename.h +lib/libproj.la +lib/pkgconfig/proj.pc +man/man1/cct.1 +man/man1/cs2cs.1 +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 +share/proj/A66_National_13_09_01.gsb +share/proj/BETA2007.gsb +share/proj/CH +share/proj/FL +share/proj/GDA94_GDA2020_conformal.gsb +share/proj/GDA94_GDA2020_conformal_and_distortion.gsb +share/proj/GL27 +share/proj/ITRF2000 +share/proj/ITRF2008 +share/proj/ITRF2014 +share/proj/MD +share/proj/National_84_02_07_01.gsb +share/proj/OSGM15_Belfast.gtx +share/proj/OSGM15_Malin.gtx +share/proj/OSTN15_NTv2_OSGBtoETRS.gsb +share/proj/RAC09.gtx +share/proj/RAF09.gtx +share/proj/RAGTBT2016.gtx +share/proj/RALD2016.gtx +share/proj/RALDW842016.gtx +share/proj/RALS2016.gtx +share/proj/RAMART2016.gtx +share/proj/RAMG2016.gtx +share/proj/RAR07_bl.gtx +share/proj/SWEN17_RH2000.gtx +share/proj/TN +share/proj/WI +share/proj/WO +share/proj/alaska +share/proj/alhpgn.gsb +share/proj/arhpgn.gsb +share/proj/azhpgn.gsb +share/proj/c1hpgn.gsb +share/proj/c2hpgn.gsb +share/proj/cnhpgn.gsb +share/proj/cohpgn.gsb +share/proj/conus +share/proj/dnn.gtx +share/proj/dvr90.gtx +share/proj/egm96_15.gtx +share/proj/emhpgn.gsb +share/proj/ethpgn.gsb +share/proj/flhpgn.gsb +share/proj/fvr09.gtx +share/proj/g2012ba0.gtx +share/proj/g2012bg0.gtx +share/proj/g2012bh0.gtx +share/proj/g2012bp0.gtx +share/proj/g2012bs0.gtx +share/proj/g2012bu0.gtx +share/proj/gahpgn.gsb +share/proj/gg10_sbv2.gtx +share/proj/gg10_smv2.gtx +share/proj/ggg00_lsv2.gtx +share/proj/ggg00_mgv2.gtx +share/proj/ggg00_sbv2.gtx +share/proj/ggg00_smv2.gtx +share/proj/ggg00v2.gtx +share/proj/ggguy15.gtx +share/proj/ggker08v2.gtx +share/proj/ggm00v2.gtx +share/proj/ggm04v1.gtx +share/proj/ggpf02-Bora.gtx +share/proj/ggpf02-Huahine.gtx +share/proj/ggpf02-Maiao.gtx +share/proj/ggpf02-Maupiti.gtx +share/proj/ggpf02-Raiatea.gtx +share/proj/ggpf02-Tahaa.gtx +share/proj/ggpf02-Tupai.gtx +share/proj/ggpf05-HivaOa.gtx +share/proj/ggpf05-Nuku.gtx +share/proj/ggpf08-Fakarava.gtx +share/proj/ggpf08-Gambier.gtx +share/proj/ggpf08-Hao.gtx +share/proj/ggpf08-Mataiva.gtx +share/proj/ggpf08-Raivavae.gtx +share/proj/ggpf08-Reao.gtx +share/proj/ggpf08-Rurutu.gtx +share/proj/ggpf08-Tikehau.gtx +share/proj/ggpf08-Tubuai.gtx +share/proj/ggpf10-Moorea.gtx +share/proj/ggpf10-Tahiti.gtx +share/proj/ggspm06v1.gtx +share/proj/guhpgn.gsb +share/proj/gvr2000.gtx +share/proj/gvr2016.gtx +share/proj/hawaii +share/proj/hihpgn.gsb +share/proj/iahpgn.gsb +share/proj/ilhpgn.gsb +share/proj/inhpgn.gsb +share/proj/kyhpgn.gsb +share/proj/lahpgn.gsb +share/proj/mdhpgn.gsb +share/proj/mehpgn.gsb +share/proj/mihpgn.gsb +share/proj/mnhpgn.gsb +share/proj/mohpgn.gsb +share/proj/nad.lst +share/proj/nad27 +share/proj/nad83 +share/proj/nbhpgn.gsb +share/proj/nchpgn.gsb +share/proj/ndhpgn.gsb +share/proj/nehpgn.gsb +share/proj/njhpgn.gsb +share/proj/nkgrf03vel_realigned_z.gtx +share/proj/nmhpgn.gsb +share/proj/ntf_r93.gsb +share/proj/ntv1_can.dat +share/proj/ntv2_0.gsb +share/proj/null +share/proj/nvhpgn.gsb +share/proj/nyhpgn.gsb +share/proj/nzgd2kgrid0005.gsb +share/proj/ohhpgn.gsb +share/proj/okhpgn.gsb +share/proj/other.extra +share/proj/pahpgn.gsb +share/proj/proj.db +share/proj/prvi +share/proj/pvhpgn.gsb +share/proj/schpgn.gsb +share/proj/sdhpgn.gsb +share/proj/stgeorge +share/proj/stlrnc +share/proj/stpaul +share/proj/tnhpgn.gsb +share/proj/uthpgn.gsb +share/proj/vahpgn.gsb +share/proj/vertconc.gtx +share/proj/vertcone.gtx +share/proj/vertconw.gtx +share/proj/wihpgn.gsb +share/proj/wmhpgn.gsb +share/proj/wohpgn.gsb +share/proj/world +share/proj/wthpgn.gsb +share/proj/wvhpgn.gsb +share/proj/wyhpgn.gsb diff --git a/proj/TODO b/proj/TODO new file mode 100644 index 0000000000..e20e86a654 --- /dev/null +++ b/proj/TODO @@ -0,0 +1,2 @@ +Do not bring into pkgsrc proper yet, because too many depending +packages will break. -gdt diff --git a/proj/buildlink3.mk b/proj/buildlink3.mk new file mode 100644 index 0000000000..bfbb12b823 --- /dev/null +++ b/proj/buildlink3.mk @@ -0,0 +1,13 @@ +# $NetBSD: buildlink3.mk,v 1.4 2018/03/02 01:13:10 gdt Exp $ + +BUILDLINK_TREE+= proj + +.if !defined(PROJ_BUILDLINK3_MK) +PROJ_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.proj+= proj>=5.0.0 +BUILDLINK_ABI_DEPENDS.proj+= proj>=5.0.0 +BUILDLINK_PKGSRCDIR.proj?= ../../geography/proj +.endif # PROJ_BUILDLINK3_MK + +BUILDLINK_TREE+= -proj diff --git a/proj/distinfo b/proj/distinfo new file mode 100644 index 0000000000..1fd0ae7e2e --- /dev/null +++ b/proj/distinfo @@ -0,0 +1,23 @@ +$NetBSD: distinfo,v 1.13 2019/02/21 00:55:04 gdt Exp $ + +SHA1 (proj-6.0.0.tar.gz) = 679310f50a2fe5d3c7f9bd6ab0bba0f9a11233d1 +RMD160 (proj-6.0.0.tar.gz) = 8580caaeba1a15d47d6a2dab29d78a73bbbfd10f +SHA512 (proj-6.0.0.tar.gz) = bc4d2f02d697aa01099f5e973a7ca70072f51210754e4d9331ae5bfdef886a41984ce27c1ff926da14fd199005bf9cad7162ab3ea8f3f421ac8b60bc8defd8f7 +Size (proj-6.0.0.tar.gz) = 2405217 bytes +SHA1 (proj-datumgrid-1.8.tar.gz) = ede1c255adebb903f9ec33c5760ecb0df7b3b03c +RMD160 (proj-datumgrid-1.8.tar.gz) = 074fcfba2e41cbe81e5be45eddc0e38683d891ef +SHA512 (proj-datumgrid-1.8.tar.gz) = 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5 +Size (proj-datumgrid-1.8.tar.gz) = 6604329 bytes +SHA1 (proj-datumgrid-europe-1.2.tar.gz) = 06924c6a2d9c54d9fa3edc94fefa7da4831ae27a +RMD160 (proj-datumgrid-europe-1.2.tar.gz) = d7bb4021becad04ce4c0aecc0eb672bf43c3511f +SHA512 (proj-datumgrid-europe-1.2.tar.gz) = ba8fc7ed7cc3296014c525d64ef670ea19d339987bd2e4379cdb30bd51876de9cfeb702a6a95a0cef5b2449016eda2c328c8a6f2f088305b71d2808eb16efb1b +Size (proj-datumgrid-europe-1.2.tar.gz) = 20610512 bytes +SHA1 (proj-datumgrid-north-america-1.2.tar.gz) = c4d858cd584b33c846536ef75fb007168fb0b3a7 +RMD160 (proj-datumgrid-north-america-1.2.tar.gz) = a95ab90d3fb1379770f28bd31c7f70a73895721f +SHA512 (proj-datumgrid-north-america-1.2.tar.gz) = cd6f934faa0172713880c35184cf8ad75127d19f0e7656d9bef6c97dee049eede27d9e3c6f0d7a1592a6a60088d219bd5c0e1209f35143b17debb0125f030596 +Size (proj-datumgrid-north-america-1.2.tar.gz) = 73655751 bytes +SHA1 (proj-datumgrid-oceania-1.0.tar.gz) = 42970835b4932e5e96a630759c28b75502f4b382 +RMD160 (proj-datumgrid-oceania-1.0.tar.gz) = fcafe24982a1cd40c97137d42f2438fc48938c27 +SHA512 (proj-datumgrid-oceania-1.0.tar.gz) = a079fdb0ab22e591e55efa003ecd0ca1d65ce84ac0eb1b74456c1d3d62e601e3639b551aab1a0c2e77ca580d0c96cf69284e6591b80cffd18efdaada47d13e64 +Size (proj-datumgrid-oceania-1.0.tar.gz) = 96908713 bytes +SHA1 (patch-configure) = 07a7f8fcef069cc2f4680f72c296da91371bd71e diff --git a/proj/patches/patch-configure b/proj/patches/patch-configure new file mode 100644 index 0000000000..493d59cb28 --- /dev/null +++ b/proj/patches/patch-configure @@ -0,0 +1,24 @@ +$NetBSD$ + +Remediate bashism. Reported on mailinglist 20190126. + +--- configure.orig 2019-02-16 07:27:13.000000000 +0000 ++++ configure +@@ -18983,7 +18983,7 @@ if test "${with_external_gtest+set}" = s + fi + + +-if test "x$with_external_gtest" == "xyes" ; then ++if test "x$with_external_gtest" = "xyes" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using external GTest." >&5 + $as_echo "using external GTest." >&6; } + +@@ -19082,7 +19082,7 @@ $as_echo "using internal GTest." >&6; } + GTEST_CFLAGS="-I\$(top_srcdir)/test/googletest/include" + GTEST_LIBS="\$(top_builddir)/test/googletest/libgtest.la" + fi +- if test "x$with_external_gtest" == "xyes"; then ++ if test "x$with_external_gtest" = "xyes"; then + USE_EXTERNAL_GTEST_TRUE= + USE_EXTERNAL_GTEST_FALSE='#' + else