aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoïc Bartoletti <lbartoletti@FreeBSD.org>2021-12-06 07:18:54 +0000
committerLoïc Bartoletti <lbartoletti@FreeBSD.org>2021-12-06 07:22:57 +0000
commit5f5999ec9e1a65e7e1765d1c7f0710fb2704d46c (patch)
treec2949f020a240e0c983d4bed03e917edca2efc86
parent11fdd7f62f87e1682eb5a659ef3424a8eaa9ff73 (diff)
downloadports-5f5999ec9e1a65e7e1765d1c7f0710fb2704d46c.tar.gz
ports-5f5999ec9e1a65e7e1765d1c7f0710fb2704d46c.zip
graphics/gmt: Update to 6.3.0
- Update to 6.3.0 - Use PCRE2 instead of PCRE(1) - Fix WWW - remove files/patch-src_gmt__common__sighandler.c fixed upstream Changes: - https://docs.generic-mapping-tools.org/6.3/changes.html Reported by: dizzy
-rw-r--r--graphics/gmt/Makefile8
-rw-r--r--graphics/gmt/distinfo6
-rw-r--r--graphics/gmt/files/patch-src_gmt__common__sighandler.c11
-rw-r--r--graphics/gmt/pkg-descr2
-rw-r--r--graphics/gmt/pkg-plist37
5 files changed, 43 insertions, 21 deletions
diff --git a/graphics/gmt/Makefile b/graphics/gmt/Makefile
index 6ce26054afa8..21f2185fb5cf 100644
--- a/graphics/gmt/Makefile
+++ b/graphics/gmt/Makefile
@@ -1,6 +1,5 @@
PORTNAME= gmt
-DISTVERSION= 6.1.1
-PORTREVISION= 2
+DISTVERSION= 6.3.0
CATEGORIES= graphics
MAINTAINER= lbartoletti@FreeBSD.org
@@ -11,7 +10,7 @@ LICENSE_COMB= multi
LIB_DEPENDS= libnetcdf.so:science/netcdf \
libcurl.so:ftp/curl \
- libpcre.so:devel/pcre \
+ libpcre2-8.so:devel/pcre2 \
libfftw3f_threads.so:math/fftw3-float \
libgdal.so:graphics/gdal \
libgeos.so:graphics/geos
@@ -40,6 +39,7 @@ CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCOPY_GSHHG=off \
-DGMT_DATADIR=share/${PORTNAME} \
-DGMT_DOCDIR=share/doc/${PORTNAME} \
- -DGMT_MANDIR=share/doc/${PORTNAME}/man
+ -DGMT_MANDIR=share/doc/${PORTNAME}/man \
+ -DGMT_EXCLUDE_PCRE=True
.include <bsd.port.mk>
diff --git a/graphics/gmt/distinfo b/graphics/gmt/distinfo
index 90c44123e9e0..76beb1d6f961 100644
--- a/graphics/gmt/distinfo
+++ b/graphics/gmt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1599818603
-SHA256 (GenericMappingTools-gmt-6.1.1_GH0.tar.gz) = 4cb17f42ff10b8f5fe372956c23f1fa3ca21a8e94933a6c614894f0be33427c1
-SIZE (GenericMappingTools-gmt-6.1.1_GH0.tar.gz) = 84140314
+TIMESTAMP = 1638713645
+SHA256 (GenericMappingTools-gmt-6.3.0_GH0.tar.gz) = 48712279da8228a7960f36fd4b7b04cc1a66489c37b2a5c03f8336a631aa3b24
+SIZE (GenericMappingTools-gmt-6.3.0_GH0.tar.gz) = 90110149
diff --git a/graphics/gmt/files/patch-src_gmt__common__sighandler.c b/graphics/gmt/files/patch-src_gmt__common__sighandler.c
deleted file mode 100644
index e4d10e76d8bd..000000000000
--- a/graphics/gmt/files/patch-src_gmt__common__sighandler.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gmt_common_sighandler.c.orig 2020-11-28 18:05:26 UTC
-+++ src/gmt_common_sighandler.c
-@@ -69,6 +69,8 @@ void backtrace_symbols_fd(void *const *buffer, int siz
- # define UC_IP(uc) ((void *) (uc)->uc_mcontext.mc_rip)
- # elif defined( __arm__)
- # define UC_IP(uc) ((void *) (uc)->uc_mcontext.arm_pc)
-+# elif defined( __aarch64__)
-+# define UC_IP(uc) ((void *) (uc)->uc_mcontext.mc_gpregs.gp_elr)
- # elif defined(__ppc__)
- # define UC_IP(uc) ((void *) (uc)->uc_mcontext.mc_srr0)
- # else
diff --git a/graphics/gmt/pkg-descr b/graphics/gmt/pkg-descr
index 2b8f12b32a3d..da0129c2a620 100644
--- a/graphics/gmt/pkg-descr
+++ b/graphics/gmt/pkg-descr
@@ -15,4 +15,4 @@ In case you look for data to plot, there is topological data at
ftp://topex.ucsd.edu/pub/global_topo_2min/topo_8.2.img
(140MB, covers nearly the whole earth)
-WWW: http://gmt.soest.hawaii.edu/
+WWW: https://www.generic-mapping-tools.org/
diff --git a/graphics/gmt/pkg-plist b/graphics/gmt/pkg-plist
index fc9c8dd0b113..f3d3b849adfb 100644
--- a/graphics/gmt/pkg-plist
+++ b/graphics/gmt/pkg-plist
@@ -9,6 +9,7 @@ include/gmt/declspec.h
include/gmt/gmt.h
include/gmt/gmt_common.h
include/gmt/gmt_common_math.h
+include/gmt/gmt_common_sighandler.h
include/gmt/gmt_common_string.h
include/gmt/gmt_config.h
include/gmt/gmt_constants.h
@@ -71,6 +72,7 @@ include/gmt/segy/segy.h
include/gmt/segy/segy_io.h
include/gmt/segy/segyreel.h
include/gmt/seis/meca.h
+include/gmt/seis/meca_symbol.h
include/gmt/seis/sacio.h
include/gmt/seis/utilmeca.h
include/gmt/spotter/spotter.h
@@ -78,58 +80,80 @@ include/gmt/x2sys/x2sys.h
lib/gmt/plugins/supplements.so
lib/libgmt.so
lib/libgmt.so.6
-lib/libgmt.so.6.1.1
+lib/libgmt.so.6.3.0
lib/libpostscriptlight.so
lib/libpostscriptlight.so.6
-lib/libpostscriptlight.so.6.1.1
+lib/libpostscriptlight.so.6.3.0
%%DATADIR%%/cpt/abyss.cpt
%%DATADIR%%/cpt/acton.cpt
+%%DATADIR%%/cpt/actonS.cpt
+%%DATADIR%%/cpt/bam.cpt
+%%DATADIR%%/cpt/bamO.cpt
%%DATADIR%%/cpt/bamako.cpt
+%%DATADIR%%/cpt/bamakoS.cpt
%%DATADIR%%/cpt/bathy.cpt
%%DATADIR%%/cpt/batlow.cpt
+%%DATADIR%%/cpt/batlowK.cpt
+%%DATADIR%%/cpt/batlowS.cpt
+%%DATADIR%%/cpt/batlowW.cpt
%%DATADIR%%/cpt/berlin.cpt
%%DATADIR%%/cpt/bilbao.cpt
+%%DATADIR%%/cpt/bilbaoS.cpt
%%DATADIR%%/cpt/broc.cpt
+%%DATADIR%%/cpt/brocO.cpt
%%DATADIR%%/cpt/buda.cpt
+%%DATADIR%%/cpt/budaS.cpt
+%%DATADIR%%/cpt/bukavu.cpt
%%DATADIR%%/cpt/categorical.cpt
%%DATADIR%%/cpt/cool.cpt
%%DATADIR%%/cpt/copper.cpt
%%DATADIR%%/cpt/cork.cpt
+%%DATADIR%%/cpt/corkO.cpt
%%DATADIR%%/cpt/cubhelix.cpt
%%DATADIR%%/cpt/cyclic.cpt
%%DATADIR%%/cpt/davos.cpt
+%%DATADIR%%/cpt/davosS.cpt
%%DATADIR%%/cpt/dem1.cpt
%%DATADIR%%/cpt/dem2.cpt
%%DATADIR%%/cpt/dem3.cpt
%%DATADIR%%/cpt/dem4.cpt
%%DATADIR%%/cpt/devon.cpt
+%%DATADIR%%/cpt/devonS.cpt
%%DATADIR%%/cpt/drywet.cpt
%%DATADIR%%/cpt/earth.cpt
%%DATADIR%%/cpt/elevation.cpt
%%DATADIR%%/cpt/etopo1.cpt
+%%DATADIR%%/cpt/fes.cpt
%%DATADIR%%/cpt/gebco.cpt
%%DATADIR%%/cpt/geo.cpt
%%DATADIR%%/cpt/globe.cpt
%%DATADIR%%/cpt/gray.cpt
%%DATADIR%%/cpt/grayC.cpt
+%%DATADIR%%/cpt/grayCS.cpt
%%DATADIR%%/cpt/hawaii.cpt
+%%DATADIR%%/cpt/hawaiiS.cpt
%%DATADIR%%/cpt/haxby.cpt
%%DATADIR%%/cpt/hot.cpt
%%DATADIR%%/cpt/ibcso.cpt
%%DATADIR%%/cpt/imola.cpt
+%%DATADIR%%/cpt/imolaS.cpt
%%DATADIR%%/cpt/inferno.cpt
%%DATADIR%%/cpt/jet.cpt
%%DATADIR%%/cpt/lajolla.cpt
+%%DATADIR%%/cpt/lajollaS.cpt
%%DATADIR%%/cpt/lapaz.cpt
+%%DATADIR%%/cpt/lapazS.cpt
%%DATADIR%%/cpt/lisbon.cpt
%%DATADIR%%/cpt/mag.cpt
%%DATADIR%%/cpt/magma.cpt
%%DATADIR%%/cpt/nighttime.cpt
%%DATADIR%%/cpt/no_green.cpt
%%DATADIR%%/cpt/nuuk.cpt
+%%DATADIR%%/cpt/nuukS.cpt
%%DATADIR%%/cpt/ocean.cpt
%%DATADIR%%/cpt/oleron.cpt
%%DATADIR%%/cpt/oslo.cpt
+%%DATADIR%%/cpt/osloS.cpt
%%DATADIR%%/cpt/paired.cpt
%%DATADIR%%/cpt/panoply.cpt
%%DATADIR%%/cpt/plasma.cpt
@@ -138,6 +162,7 @@ lib/libpostscriptlight.so.6.1.1
%%DATADIR%%/cpt/red2green.cpt
%%DATADIR%%/cpt/relief.cpt
%%DATADIR%%/cpt/roma.cpt
+%%DATADIR%%/cpt/romaO.cpt
%%DATADIR%%/cpt/seafloor.cpt
%%DATADIR%%/cpt/sealand.cpt
%%DATADIR%%/cpt/seis.cpt
@@ -146,10 +171,14 @@ lib/libpostscriptlight.so.6.1.1
%%DATADIR%%/cpt/terra.cpt
%%DATADIR%%/cpt/tofino.cpt
%%DATADIR%%/cpt/tokyo.cpt
+%%DATADIR%%/cpt/tokyoS.cpt
%%DATADIR%%/cpt/topo.cpt
%%DATADIR%%/cpt/turbo.cpt
%%DATADIR%%/cpt/turku.cpt
+%%DATADIR%%/cpt/turkuS.cpt
+%%DATADIR%%/cpt/vanimo.cpt
%%DATADIR%%/cpt/vik.cpt
+%%DATADIR%%/cpt/vikO.cpt
%%DATADIR%%/cpt/viridis.cpt
%%DATADIR%%/cpt/world.cpt
%%DATADIR%%/cpt/wysiwyg.cpt
@@ -157,6 +186,7 @@ lib/libpostscriptlight.so.6.1.1
%%DATADIR%%/custom/QR_transparent.eps
%%DATADIR%%/custom/astroid.def
%%DATADIR%%/custom/circle.def
+%%DATADIR%%/custom/city.def
%%DATADIR%%/custom/cross.def
%%DATADIR%%/custom/crosshair.def
%%DATADIR%%/custom/deltoid.def
@@ -232,6 +262,9 @@ lib/libpostscriptlight.so.6.1.1
%%DATADIR%%/mgg/gmtfile_paths
%%DATADIR%%/spotter/Global_250-0Ma_Rotations_2019_v2.rot
%%DATADIR%%/spotter/Global_EarthByte_Plate_ID_Table.txt
+%%DATADIR%%/themes/cookbook.conf
+%%DATADIR%%/themes/minimal.conf
+%%DATADIR%%/themes/modern.conf
%%DATADIR%%/tools/gmt5syntax
%%DATADIR%%/tools/gmt_aliases.csh
%%DATADIR%%/tools/gmt_completion.bash