From 9d34c5db7ab6e3d0d435b18807223715ff8360ec Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Fri, 16 Sep 2022 22:11:26 -0700 Subject: [PATCH] graphics/dataplot: Update 20200619 -> 20210713 --- graphics/dataplot/Makefile | 4 ++-- graphics/dataplot/distinfo | 6 +++--- graphics/dataplot/files/patch-Makefile | 11 ++++++----- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/graphics/dataplot/Makefile b/graphics/dataplot/Makefile index 524c4266bc32..ac79e4d8ed79 100644 --- a/graphics/dataplot/Makefile +++ b/graphics/dataplot/Makefile @@ -1,5 +1,5 @@ PORTNAME= dataplot -DISTVERSION= 20200619 +DISTVERSION= 20210713 CATEGORIES= graphics MAINTAINER= ports@FreeBSD.org @@ -17,7 +17,7 @@ USE_GNOME= cairo USE_GITHUB= yes GH_ACCOUNT= usnistgov -GH_TAGNAME= 2c1b27601a3b7523449de612613eadeead9a8f70 +GH_TAGNAME= d5eb15dd86dd80098c6535aa68898ab8392ab700 WRKSRC_SUBDIR= src diff --git a/graphics/dataplot/distinfo b/graphics/dataplot/distinfo index 3dcd318885af..0489f8aa74df 100644 --- a/graphics/dataplot/distinfo +++ b/graphics/dataplot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1593845821 -SHA256 (usnistgov-dataplot-20200619-2c1b27601a3b7523449de612613eadeead9a8f70_GH0.tar.gz) = 3a20625951407a51f3c36cf3c39f9bf86d0f5dd98bf3c5b6ef6f79a728bc559c -SIZE (usnistgov-dataplot-20200619-2c1b27601a3b7523449de612613eadeead9a8f70_GH0.tar.gz) = 21733952 +TIMESTAMP = 1663389742 +SHA256 (usnistgov-dataplot-20210713-d5eb15dd86dd80098c6535aa68898ab8392ab700_GH0.tar.gz) = f92bbb322ec80ea03e83163b9de741131bb064fbe59323475b27958cddeb197f +SIZE (usnistgov-dataplot-20210713-d5eb15dd86dd80098c6535aa68898ab8392ab700_GH0.tar.gz) = 22850998 diff --git a/graphics/dataplot/files/patch-Makefile b/graphics/dataplot/files/patch-Makefile index b73a4447d4c0..df26252ff7ed 100644 --- a/graphics/dataplot/files/patch-Makefile +++ b/graphics/dataplot/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2020-06-19 14:55:49 UTC +--- Makefile.orig 2021-07-13 20:35:55 UTC +++ Makefile @@ -1,5 +1,5 @@ -FC = gfortran @@ -7,15 +7,16 @@ +CC = %%CC%% # FEATURES to enable during compilation - # all: READLINE NCURSES GD TIFF VPX CAIRO X11 GKS OPENGL PLOT -@@ -12,10 +12,11 @@ PREFIX = $(DESTDIR)/usr/local + # all: READLINE NCURSES GD TIFF VPX CAIRO X11 GKS OPENGL PLOT XCLIP +@@ -12,11 +12,12 @@ PREFIX = $(DESTDIR)/usr/local BINDIR = $(PREFIX)/bin # where to find additional dataplot files (help, menus, etc). -DPLIBDIR=$(PREFIX)/lib/dataplot +DPLIBDIR=$(DESTDIR)%%DATADIR%% --FFLAGS += -O2 -DLINUX -fdefault-real-8 -fdefault-double-8 -fmax-stack-var-size=1000000 -Wall + #FFLAGS += -O2 -DLINUX -fdefault-real-8 -fdefault-double-8 -fmax-stack-var-size=1000000 -Wall +-FFLAGS += -O2 -DLINUX -fdefault-real-8 -fdefault-double-8 -Wall -CFLAGS += -O2 +FFLAGS += %%FFLAGS%% +CFLAGS += %%CFLAGS%% -I%%LOCALBASE%%/include @@ -23,7 +24,7 @@ # special flags for dp1 DP1FLAGS = -DDDOUBLE -DINTEGER32 -DHAVE_ISNAN -DHAVE_EXECUTE_COMMAND_LINE -DDPLIBDIR=\'$(DPLIBDIR)\' -@@ -124,7 +125,7 @@ clean: +@@ -129,7 +130,7 @@ clean: install: dataplot xdataplot @echo installing binary to $(BINDIR) -[ ! -d $(BINDIR) ] && mkdir -vp $(BINDIR) ||: