From nobody Wed Jan 19 07:52:14 2022 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 5620C196DAD8; Wed, 19 Jan 2022 07:52:15 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JdyXZ6gQXz4Z4d; Wed, 19 Jan 2022 07:52:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642578735; 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=BziLMUDlEKFBd/LA50D0U9Q0FRUh6TTHD+15YnpTgrA=; b=cGUraxJAZPgZ/Snpk9Fi5iYYGuxCLBAcIo/GLxipBXah/648FrWgPtGFSWFEBMqS+JM85p 3Ls73DmW/CnkA2z6QwaCIIvpgQtopFhGw/INk9WXdivGj/fW3pLGIaug90geN1FMM3dmWb hV/7fc5tdZoy6wSj3WdJGihQ2T92Z4YfwNY/ZPrcKSC5sbzLkMdQbt9aLH1A/Y/LcuZ7ZA txJyxF7fqra8xnHKFFd8QXXerM7gIlclOmw22Ay6uAw89TMWn7Wj16sIwTEMeZ6c9OcNaz 9r3uYtx5OtRRaQ00Amd1cIuYF0RTsqruxvX+7wPxDLc28ZQpRaB+JqLHQ8X/tw== 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 A25C1111E2; Wed, 19 Jan 2022 07:52:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20J7qEmq087953; Wed, 19 Jan 2022 07:52:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20J7qEo3087952; Wed, 19 Jan 2022 07:52:14 GMT (envelope-from git) Date: Wed, 19 Jan 2022 07:52:14 GMT Message-Id: <202201190752.20J7qEo3087952@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: c8a161f93f57 - main - graphics/gmt: Use upstream release archive and remove fftw3 dependency List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: c8a161f93f570e9fa86c393dae11051525e92069 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642578735; 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=BziLMUDlEKFBd/LA50D0U9Q0FRUh6TTHD+15YnpTgrA=; b=gQh6f1VR9R0ccdN3cMDNyXjQr2v1fuq5BOrjgugQT06qgfS/QgscaU5sZ7Vho+3Ctl805z kp/IHgWFh5y/c8gqh5ujxpKEoK7AQydU5Wn9HvrHgJc0d2z1nZGq6noS53xVAmQrHnlgTI 9bdPe672Bx8RwpNOgPu9kyu6FAUq25pLmbDqaqQGt1Nxh3ro9VG4wDLug2edCIjEO4+2gb Bbsx8fqKFESq5wtfmL6CQavEqAznq9hef4ZxzLruQNc2rqnHPn1WyuMWxQS9Of+OgIGsZw LkdWhbcly6/3BRf0plw2MCp8Ju+NQXOUY0MHS7p0dEFzInvTqrBskoyH9RRo1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642578735; a=rsa-sha256; cv=none; b=KNIqoSOzHv1s51h7V0W+ml0Gy4KVv0tpZAQdROU1xyYPtfMZYlk9C0TdLLzAIilN3WIO7g c3AdN3l8PNMevrNkTRVTkI8MFBIFHWkFYoWgMO1yobD7SN9wAoG0HJpy7WkdDzSQS8FfM9 56a+mdX1+D/LNlo+DgWfKSgoCKlKK7f7xoQ2mqw/ijaSrg5khoOw/BdiUnQOrXukWJ/Z8m m2PXm/1laFHgKEMk4ORGiUD+sPo4nDpgtOTnv5JoGzvkEgXHN9jDaEzIVL6+E8YYZy9KWg 9iYs4JM+yO3JHfIEx+XTRXtKCc07Kp6XOTERo3NipHD0xiihUzTywp8yIf+dHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c8a161f93f570e9fa86c393dae11051525e92069 commit c8a161f93f570e9fa86c393dae11051525e92069 Author: Daniel Engberg AuthorDate: 2022-01-19 07:31:45 +0000 Commit: Daniel Engberg CommitDate: 2022-01-19 07:52:05 +0000 graphics/gmt: Use upstream release archive and remove fftw3 dependency Using upstream release archive as suggested by Porters Handbook, this also reduces download size considerably Remove fftw3 dependency, gmt depends on a legacy version of fftw3 Remove unnecessary variables in CMAKE_ARGS PR: 261249 Reviewed by: lbartoletti@ (maintainer) --- graphics/gmt/Makefile | 12 +++++------- graphics/gmt/distinfo | 6 +++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/graphics/gmt/Makefile b/graphics/gmt/Makefile index 21f2185fb5cf..2eee00fe76d2 100644 --- a/graphics/gmt/Makefile +++ b/graphics/gmt/Makefile @@ -1,6 +1,8 @@ PORTNAME= gmt DISTVERSION= 6.3.0 CATEGORIES= graphics +MASTER_SITES= https://github.com/GenericMappingTools/${PORTNAME}/releases/download/${DISTVERSION}/ +DISTNAME= ${PORTNAME}-${DISTVERSION}-src MAINTAINER= lbartoletti@FreeBSD.org COMMENT= Generic Mapping Tools - data processing and display software package @@ -11,7 +13,6 @@ LICENSE_COMB= multi LIB_DEPENDS= libnetcdf.so:science/netcdf \ libcurl.so:ftp/curl \ libpcre2-8.so:devel/pcre2 \ - libfftw3f_threads.so:math/fftw3-float \ libgdal.so:graphics/gdal \ libgeos.so:graphics/geos RUN_DEPENDS= bash:shells/bash \ @@ -22,18 +23,15 @@ RUN_DEPENDS= bash:shells/bash \ BUILD_DEPENDS= ${LOCALBASE}/share/dcw-gmt/dcw-gmt.nc:graphics/gmt-dcw \ ${LOCALBASE}/share/gshhg-gmt/binned_GSHHS_c.nc:graphics/gmt-gshhg -USES= blaslapack cmake ghostscript:run shebangfix -USE_GITHUB= yes +USES= blaslapack cmake ghostscript:run shebangfix tar:xz USE_LDCONFIG= yes -GH_ACCOUNT= GenericMappingTools +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} #SHEBANG_GLOB= *.sh *.in #SHEBANG_FILES= share/tools/ncdeflate src/img/img2google src/gmtswitch -CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_INSTALL_PREFIX=${PREFIX} \ - -DDCW_ROOT=${LOCALBASE}/share/dcw-gmt \ +CMAKE_ARGS+= -DDCW_ROOT=${LOCALBASE}/share/dcw-gmt \ -DCOPY_DCW=off \ -DGSHHG_ROOT=${LOCALBASE}/share/gshhg-gmt \ -DCOPY_GSHHG=off \ diff --git a/graphics/gmt/distinfo b/graphics/gmt/distinfo index 76beb1d6f961..86f9e21dbded 100644 --- a/graphics/gmt/distinfo +++ b/graphics/gmt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1638713645 -SHA256 (GenericMappingTools-gmt-6.3.0_GH0.tar.gz) = 48712279da8228a7960f36fd4b7b04cc1a66489c37b2a5c03f8336a631aa3b24 -SIZE (GenericMappingTools-gmt-6.3.0_GH0.tar.gz) = 90110149 +TIMESTAMP = 1642348660 +SHA256 (gmt-6.3.0-src.tar.xz) = 69e29b62ee802a3a64260d6a1e023f1350e3bf4070221aa1307bf8a9e56c1ee5 +SIZE (gmt-6.3.0-src.tar.xz) = 55396792