Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Jan 2022 07:52:14 GMT
From:      Daniel Engberg <diizzy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: c8a161f93f57 - main - graphics/gmt: Use upstream release archive and remove fftw3 dependency
Message-ID:  <202201190752.20J7qEo3087952@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy:

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

commit c8a161f93f570e9fa86c393dae11051525e92069
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2022-01-19 07:31:45 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201190752.20J7qEo3087952>