diff --git a/graphics/gmt/Makefile b/graphics/gmt/Makefile index 6ce26054afa8..21f2185fb5cf 100644 --- a/graphics/gmt/Makefile +++ b/graphics/gmt/Makefile @@ -1,45 +1,45 @@ PORTNAME= gmt -DISTVERSION= 6.1.1 -PORTREVISION= 2 +DISTVERSION= 6.3.0 CATEGORIES= graphics MAINTAINER= lbartoletti@FreeBSD.org COMMENT= Generic Mapping Tools - data processing and display software package LICENSE= GPLv3 LGPL3 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 RUN_DEPENDS= bash:shells/bash \ GraphicsMagick>0:graphics/GraphicsMagick \ ffmpeg>0:multimedia/ffmpeg \ xdg-open:devel/xdg-utils \ 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 USE_LDCONFIG= yes GH_ACCOUNT= GenericMappingTools #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 \ -DCOPY_DCW=off \ -DGSHHG_ROOT=${LOCALBASE}/share/gshhg-gmt \ -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 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 @@ -1,18 +1,18 @@ GMT is a collection of public-domain Unix tools that allows you to manipulate x,y and x,y,z data sets (filtering, trend fitting, gridding, projecting, etc.) and produce PostScript illustrations ranging from simple x-y plots, via contour maps, to artificially illuminated surfaces and 3-d perspective views in black/white or 24bit color. Linear, log10, and power scaling is supported in addition to 25 common map projections. The processing and display routines within GMT are completely general and will handle any (x,y) or (x,y,z) data as input. This port installs only the GMT manpages, there is a tutorial and documentation in .ps, .pdf and .html format on the ftp site, too. 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 @@ -1,251 +1,284 @@ bin/gmt bin/gmt-config bin/gmt_shell_functions.sh bin/gmtswitch bin/isogmt include/gmt/compat/qsort.h include/gmt/config.h 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 include/gmt/gmt_contour.h include/gmt/gmt_customio.h include/gmt/gmt_dcw.h include/gmt/gmt_decorate.h include/gmt/gmt_defaults.h include/gmt/gmt_dev.h include/gmt/gmt_dimensions.h include/gmt/gmt_error.h include/gmt/gmt_error_codes.h include/gmt/gmt_fft.h include/gmt/gmt_gdalread.h include/gmt/gmt_grd.h include/gmt/gmt_grdio.h include/gmt/gmt_hash.h include/gmt/gmt_hidden.h include/gmt/gmt_io.h include/gmt/gmt_macros.h include/gmt/gmt_mb.h include/gmt/gmt_memory.h include/gmt/gmt_modern.h include/gmt/gmt_nan.h include/gmt/gmt_notposix.h include/gmt/gmt_plot.h include/gmt/gmt_private.h include/gmt/gmt_project.h include/gmt/gmt_prototypes.h include/gmt/gmt_psl.h include/gmt/gmt_remote.h include/gmt/gmt_resources.h include/gmt/gmt_shore.h include/gmt/gmt_symbol.h include/gmt/gmt_synopsis.h include/gmt/gmt_texture.h include/gmt/gmt_time.h include/gmt/gmt_types.h include/gmt/gmt_version.h include/gmt/gshhg/gmt_gshhg.h include/gmt/gshhg/gshhg.h include/gmt/mgd77/cm4_functions.h include/gmt/mgd77/mgd77.h include/gmt/mgd77/mgd77_IGF_coeffs.h include/gmt/mgd77/mgd77_codes.h include/gmt/mgd77/mgd77_e77.h include/gmt/mgd77/mgd77_functions.h include/gmt/mgd77/mgd77_init.h include/gmt/mgd77/mgd77_recalc.h include/gmt/mgd77/mgd77_rls_coeffs.h include/gmt/mgd77/mgd77defaults.h include/gmt/mgd77/mgd77magref.h include/gmt/mgd77/mgd77sniffer.h include/gmt/mgd77/mgd77snifferdefaults.h include/gmt/postscriptlight.h include/gmt/potential/okbfuns.h include/gmt/potential/talwani.h include/gmt/psl_config.h 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 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 %%DATADIR%%/cpt/polar.cpt %%DATADIR%%/cpt/rainbow.cpt %%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 %%DATADIR%%/cpt/split.cpt %%DATADIR%%/cpt/srtm.cpt %%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 %%DATADIR%%/custom/QR.eps %%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 %%DATADIR%%/custom/diamond.def %%DATADIR%%/custom/flash.def %%DATADIR%%/custom/gmt_custom_symbols.conf %%DATADIR%%/custom/hexagon.def %%DATADIR%%/custom/hlens.def %%DATADIR%%/custom/hlozenge.def %%DATADIR%%/custom/hneedle.def %%DATADIR%%/custom/hurricane.def %%DATADIR%%/custom/invtriangle.def %%DATADIR%%/custom/lcrescent.def %%DATADIR%%/custom/lflag.def %%DATADIR%%/custom/ltriangle.def %%DATADIR%%/custom/meca.def %%DATADIR%%/custom/octagon.def %%DATADIR%%/custom/pacman.def %%DATADIR%%/custom/pentagon.def %%DATADIR%%/custom/rcrescent.def %%DATADIR%%/custom/rflag.def %%DATADIR%%/custom/rtriangle.def %%DATADIR%%/custom/sectoid.def %%DATADIR%%/custom/square.def %%DATADIR%%/custom/squaroid.def %%DATADIR%%/custom/star.def %%DATADIR%%/custom/star3.def %%DATADIR%%/custom/star4.def %%DATADIR%%/custom/starp.def %%DATADIR%%/custom/sun.def %%DATADIR%%/custom/triangle.def %%DATADIR%%/custom/trirot1.def %%DATADIR%%/custom/trirot2.def %%DATADIR%%/custom/trirot3.def %%DATADIR%%/custom/trirot4.def %%DATADIR%%/custom/vlens.def %%DATADIR%%/custom/vlozenge.def %%DATADIR%%/custom/vneedle.def %%DATADIR%%/custom/volcano.def %%DATADIR%%/localization/gmt_cn1.locale %%DATADIR%%/localization/gmt_cn2.locale %%DATADIR%%/localization/gmt_de.locale %%DATADIR%%/localization/gmt_dk.locale %%DATADIR%%/localization/gmt_eh.locale %%DATADIR%%/localization/gmt_es.locale %%DATADIR%%/localization/gmt_fi.locale %%DATADIR%%/localization/gmt_fr.locale %%DATADIR%%/localization/gmt_gr.locale %%DATADIR%%/localization/gmt_hi.locale %%DATADIR%%/localization/gmt_hu.locale %%DATADIR%%/localization/gmt_ie.locale %%DATADIR%%/localization/gmt_il.locale %%DATADIR%%/localization/gmt_is.locale %%DATADIR%%/localization/gmt_it.locale %%DATADIR%%/localization/gmt_jp.locale %%DATADIR%%/localization/gmt_kr.locale %%DATADIR%%/localization/gmt_nl.locale %%DATADIR%%/localization/gmt_no.locale %%DATADIR%%/localization/gmt_pl.locale %%DATADIR%%/localization/gmt_pt.locale %%DATADIR%%/localization/gmt_ru.locale %%DATADIR%%/localization/gmt_se.locale %%DATADIR%%/localization/gmt_sg.locale %%DATADIR%%/localization/gmt_to.locale %%DATADIR%%/localization/gmt_tr.locale %%DATADIR%%/localization/gmt_uk.locale %%DATADIR%%/localization/gmt_us.locale %%DATADIR%%/mgd77/Dst_all.wdc %%DATADIR%%/mgd77/F107_mon.plt %%DATADIR%%/mgd77/mgd77_paths.txt %%DATADIR%%/mgd77/umdl.CM4 %%DATADIR%%/mgg/carter.d %%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 %%DATADIR%%/tools/gmt_functions.sh %%DATADIR%%/tools/gmt_links.sh %%DATADIR%%/tools/gmt_prepmex.sh %%DATADIR%%/tools/gmt_uninstall.sh %%DATADIR%%/tools/img2google %%DATADIR%%/tools/ncdeflate %%DATADIR%%/x2sys/dat.fmt %%DATADIR%%/x2sys/geo.fmt %%DATADIR%%/x2sys/geoz.fmt %%DATADIR%%/x2sys/gmt.fmt %%DATADIR%%/x2sys/mgd77+.fmt %%DATADIR%%/x2sys/mgd77.fmt %%DATADIR%%/x2sys/xy.fmt %%DATADIR%%/x2sys/xyz.fmt