From nobody Mon Dec 16 22:42:38 2024
X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
	by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YBw1p4xXpz5gdPS;
	Mon, 16 Dec 2024 22:42:38 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
	 client-signature RSA-PSS (4096 bits) client-digest SHA256)
	(Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4YBw1p48nTz49jF;
	Mon, 16 Dec 2024 22:42:38 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1734388958;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=9gS0/nS+uf0nD9usspzvMLezjXcbwwK+utZFqvrBh/0=;
	b=h2UbL+hCJw3SOmfiX1kktjp8JMMVt5ebL/rfaCExp+CSoIpfVT7okuD3WuoIpp79DVhf7X
	FW4msi4HirWFU2Ag12G8n/x0JfX8epPs5uTsPKziUP18rxaOvNKQELIlVIug5kkv5Sa760
	4tiP/p0C/iIjJlX4xnEjLHcX/mRQCDa4LO/Xh5Ma2pQJtvU63rKrfp2eGHDNzT4ikM0Ds5
	mX3GhxMowYFTny3lL1takL6t7mTg+MwT/hrvSjGe6vIVWr/DAjqIKrHjWMXmiqSamHxyQU
	7no/32Ine5ETVR2pFqbgrXyQ/IYh7vjKWodWowQueWD14sYz2VyvKONYmqr/rQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1734388958;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=9gS0/nS+uf0nD9usspzvMLezjXcbwwK+utZFqvrBh/0=;
	b=la14ugdnVebc4sdG0veamXZsHCQx/FEuY6B6y+OenlLUH0udd/0vvofwc4ttZQnKkQxvtA
	qTsgROybTviH19Us9muXjcQHIT4CWqJf6XYUPfNCzlzcDNv25smx8VR8SiR8ZNR+92CUcH
	tvfvPOsdTMYWi8Z/fZlEPX6TpZ0hlgGpvvug5WYMKDpXFaBKy0ewjphYmRKD4VUQsr4FRA
	1zJIEUBAeiKBKN3OQ9BFa9m2aeG7OWd5aAqWKQbUO6NCv3LJlbO3h46GT65eStSqgTxwTz
	gvdRlcNe6s9qcOBaG9KEZI+ROW+yPU2gzgylPUHxlBzIRTBuie4baUFtI4Rp1g==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734388958; a=rsa-sha256; cv=none;
	b=DE9mwfaNx2tNmYi0FUu7/YfDD0hc4b5hDCG/c8r76OY5hRJVG4bwc4XtFd8X9bemUgdbEB
	LPNG442Wqj7clZ4XTFs0UkH27DqIxxCQg3WhWYLKGynB05rsjGQgnP0z3mwTft+g4SxbiK
	V+yf7pJDEZHvuMah2N/sB0PGXwHeDdy5ir6hOHKSMtBlrjTrhJh6PpI/pz8RGLOI/DmzEM
	d7fnGx64nllYMoqxem0PRcT6EfJYbPE7y543M9PMrrUU6Y0wb3GJ989VM9mR1Of6lgCTwV
	kfJaDxpwjN6HvZvltTuqz3L6OB7ly0NRBwYE0z4YXNU8R3YoElypoSCw+S+atA==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(Client did not present a certificate)
	by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YBw1p3l6nz1Bpc;
	Mon, 16 Dec 2024 22:42:38 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
	by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BGMgc2Y049879;
	Mon, 16 Dec 2024 22:42:38 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BGMgcAL049875;
	Mon, 16 Dec 2024 22:42:38 GMT
	(envelope-from git)
Date: Mon, 16 Dec 2024 22:42:38 GMT
Message-Id: <202412162242.4BGMgcAL049875@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
        dev-commits-ports-main@FreeBSD.org
From: Daniel Engberg <diizzy@FreeBSD.org>
Subject: git: 973a290e4ae9 - main - graphics/proj: Update to 9.5.1
List-Id: Commits to the main branch of the FreeBSD ports repository <dev-commits-ports-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main
List-Help: <mailto:dev-commits-ports-main+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-ports-main@freebsd.org
Sender: owner-dev-commits-ports-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: diizzy
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 973a290e4ae9e64c7f9da92036a801fc949fd850
Auto-Submitted: auto-generated

The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=973a290e4ae9e64c7f9da92036a801fc949fd850

commit 973a290e4ae9e64c7f9da92036a801fc949fd850
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2024-12-16 22:31:12 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2024-12-16 22:42:17 +0000

    graphics/proj: Update to 9.5.1
    
    * Switch from PORTVERSION to DISTVERSION
    * Use GitHub as primary site and osgeo.org as fallback
    * Add devel/nlohmann-json to build dependencies
    * Enable "make test"
    * Minor changes to Makefile layout
    
    Changelog: https://github.com/OSGeo/PROJ/releases/tag/9.5.1
    
    PR:             283095
    Reviewed by:    lbartoletti (maintainer)
---
 graphics/proj/Makefile  | 16 +++++++++++-----
 graphics/proj/distinfo  |  6 +++---
 graphics/proj/pkg-plist |  3 ++-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/graphics/proj/Makefile b/graphics/proj/Makefile
index 4b2ea2507692..d7b08ef8577f 100644
--- a/graphics/proj/Makefile
+++ b/graphics/proj/Makefile
@@ -1,8 +1,9 @@
 PORTNAME=	proj
-PORTVERSION=	9.4.1
+DISTVERSION=	9.5.1
 PORTEPOCH=	1
 CATEGORIES=	graphics geography
-MASTER_SITES=	https://download.osgeo.org/proj/
+MASTER_SITES=	https://github.com/OSGeo/PROJ/releases/download/${DISTVERSION}/ \
+		https://download.osgeo.org/proj/
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Cartographic Projections library
@@ -11,15 +12,20 @@ WWW=		https://github.com/OSGeo/PROJ
 LICENSE=	MIT
 #LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	nlohmann-json>=3:devel/nlohmann-json
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libtiff.so:graphics/tiff
+TEST_DEPENDS=	googletest>0:devel/googletest
 #RUN_DEPENDS=	proj-data>=0:graphics/proj-data
 
-USES=		compiler:c++11-lang cmake cpe pathfix pkgconfig sqlite
+USES=		compiler:c++11-lang cmake:testing cpe pathfix pkgconfig sqlite
+CPE_VENDOR=	proj_project
 USE_LDCONFIG=	yes
 
-CMAKE_OFF=	BUILD_TESTING
+CMAKE_TESTING_ON=	BUILD_TESTING \
+			USE_EXTERNAL_GTEST
+CMAKE_TESTING_OFF=	TESTING_USE_NETWORK
 
-CPE_VENDOR=	proj_project
+CMAKE_OFF=	BUILD_TESTING
 
 .include <bsd.port.mk>
diff --git a/graphics/proj/distinfo b/graphics/proj/distinfo
index 81b02ce1fa55..bac7cbdd1978 100644
--- a/graphics/proj/distinfo
+++ b/graphics/proj/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1724733261
-SHA256 (proj-9.4.1.tar.gz) = ffe20170ee2b952207adf8a195e2141eab12cda181e49fdeb54425d98c7171d7
-SIZE (proj-9.4.1.tar.gz) = 5665272
+TIMESTAMP = 1734228387
+SHA256 (proj-9.5.1.tar.gz) = a8395f9696338ffd46b0feb603edbb730fad6746fba77753c77f7f997345e3d3
+SIZE (proj-9.5.1.tar.gz) = 5702286
diff --git a/graphics/proj/pkg-plist b/graphics/proj/pkg-plist
index dc599d1efce9..b453f10d6fec 100644
--- a/graphics/proj/pkg-plist
+++ b/graphics/proj/pkg-plist
@@ -36,7 +36,7 @@ lib/cmake/proj4/proj4-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/proj4/proj4-targets.cmake
 lib/libproj.so
 lib/libproj.so.25
-lib/libproj.so.25.9.4.1
+lib/libproj.so.25.9.5.1
 libdata/pkgconfig/proj.pc
 share/man/man1/cct.1.gz
 share/man/man1/cs2cs.1.gz
@@ -50,6 +50,7 @@ share/man/man1/projsync.1.gz
 %%DATADIR%%/ITRF2000
 %%DATADIR%%/ITRF2008
 %%DATADIR%%/ITRF2014
+%%DATADIR%%/ITRF2020
 %%DATADIR%%/deformation_model.schema.json
 %%DATADIR%%/nad.lst
 %%DATADIR%%/nad27