Page MenuHomeFreeBSD
Files F147325215

D43265.1782919342.diff
No OneTemporary
Actions

Size
15 KB
Referenced Files
None
Subscribers
None

D43265.1782919342.diff
View Options

diff --git a/Mk/Uses/gnuplot.mk b/Mk/Uses/gnuplot.mk
new file mode 100644
--- /dev/null
+++ b/Mk/Uses/gnuplot.mk
@@ -0,0 +1,46 @@
+# Handle dependency on math/gnuplot[-lite]
+#
+# Feature: gnuplot
+# Usage: USES=gnuplot
+# Valid ARGS: <none>, build, run, test
+# <none>: default same as run
+# build: add BUILD_DEPENDS
+# run: add RUN_DEPENDS
+# test: add TEST_DEPENDS
+#
+# MAINTAINER: ports@FreeBSD.org
+#
+
+.if ! defined(_INCLUDE_USES_GNUPLOT_MK)
+_INCLUDE_USES_GNUPLOT_MK= YES
+
+# valid arguments:
+_GNUPLOT_MK_VALID_MODES= build run test
+
+# Suffixes
+_GNUPLOT_MK_SUFFIX_full= #
+_GNUPLOT_MK_SUFFIX_lite= -lite
+
+# Dependency
+_GNUPLOT_MK_SUFFIX= ${_GNUPLOT_MK_SUFFIX_${GNUPLOT_DEFAULT}}
+_GNUPLOT_MK_PKG= gnuplot${_GNUPLOT_MK_SUFFIX}
+_GNUPLOT_MK_PORT= math/gnuplot${_GNUPLOT_MK_SUFFIX}
+_GNUPLOT_MK_DEPENDENCY= ${_GNUPLOT_MK_PKG}>0:${_GNUPLOT_MK_PORT}
+
+# === parse version arguments ===
+_GNUPLOT_MK_MODES= # empty
+. for _mode in ${_GNUPLOT_MK_VALID_MODES}
+. if ${gnuplot_ARGS:M${_mode}}
+_GNUPLOT_MK_MODES+= ${_mode}
+. endif
+. endfor
+. if empty(_GNUPLOT_MK_MODES)
+_GNUPLOT_MK_MODES= run
+. endif
+
+# == add actual dependencies ===
+. for _mode in ${_GNUPLOT_MK_MODES}
+${_mode:tu}_DEPENDS+= ${_GNUPLOT_MK_DEPENDENCY}
+. endfor
+
+.endif
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -18,7 +18,7 @@
LOCALBASE?= /usr/local
. for lang in APACHE BDB COROSYNC EBUR128 EMACS FIREBIRD FORTRAN FPC GCC \
- GHOSTSCRIPT GL GO GUILE IMAGEMAGICK JAVA LAZARUS LIBRSVG2 LINUX LLVM \
+ GHOSTSCRIPT GL GNUPLOT GO GUILE IMAGEMAGICK JAVA LAZARUS LIBRSVG2 LINUX LLVM \
LUA LUAJIT MONO MYSQL NINJA NODEJS OPENLDAP PERL5 PGSQL PHP \
PYCRYPTOGRAPHY PYTHON PYTHON2 RUBY RUST SAMBA SSL TCLTK VARNISH
. if defined(${lang}_DEFAULT)
@@ -65,6 +65,8 @@
GL_DEFAULT?= mesa-libs
# Possible values: 1.19, 1.20, 1.21, 1.22-devel
GO_DEFAULT?= 1.20
+# Possible values: full, lite
+GNUPLOT_DEFAULT?= full
# Possible values: 1.8, 2.2, 3.0
GUILE_DEFAULT?= 2.2
# Possible versions: 6, 7
diff --git a/astro/nightfall/Makefile b/astro/nightfall/Makefile
--- a/astro/nightfall/Makefile
+++ b/astro/nightfall/Makefile
@@ -34,7 +34,7 @@
--with-pgplot-lib=${LOCALBASE}/lib
PGPLOT_CONFIGURE_OFF= --with-gnuplot
PGPLOT_LIB_DEPENDS= libpgplot.so:graphics/pgplot
-PGPLOT_RUN_DEPENDS_OFF= gnuplot:math/gnuplot
+PGPLOT_USES_OFF= gnuplot
PGPLOT_USES= fortran
.include <bsd.port.pre.mk>
diff --git a/benchmarks/autobench/Makefile b/benchmarks/autobench/Makefile
--- a/benchmarks/autobench/Makefile
+++ b/benchmarks/autobench/Makefile
@@ -12,10 +12,9 @@
LICENSE_FILE= ${WRKSRC}/LICENCE
RUN_DEPENDS= httperf:benchmarks/httperf \
- gawk:lang/gawk \
- gnuplot:math/gnuplot
+ gawk:lang/gawk
-USES= gmake perl5 shebangfix
+USES= gmake gnuplot perl5 shebangfix
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" DEBUG_FLAGS= \
PREFIX=${PREFIX}
SHEBANG_FILES= autobench_admin autobenchd autobench
diff --git a/benchmarks/fio/Makefile b/benchmarks/fio/Makefile
--- a/benchmarks/fio/Makefile
+++ b/benchmarks/fio/Makefile
@@ -26,7 +26,7 @@
GNUPLOT_DESC= Support for plotting graphs
LIBNFS_DESC= Enable NFS support using libnfs
-GNUPLOT_BUILD_DEPENDS= ${LOCALBASE}/bin/gnuplot:math/gnuplot
+GNUPLOT_USES= gnuplot:build
LIBNFS_LIB_DEPENDS= libnfs.so:net/libnfs
LIBNFS_CONFIGURE_ENABLE= libnfs
diff --git a/benchmarks/polygraph/Makefile b/benchmarks/polygraph/Makefile
--- a/benchmarks/polygraph/Makefile
+++ b/benchmarks/polygraph/Makefile
@@ -30,7 +30,7 @@
OPTIONS_EXCLUDE_i386= SSL
GNUPLOT_DESC= GNUPlot for full reporting functionality
-GNUPLOT_RUN_DEPENDS= gnuplot:math/gnuplot
+GNUPLOT_USES= gnuplot
GSSAPI_USES= gssapi:mit
GSSAPI_CONFIGURE_ON= --with-kerberos=${KRB5CONFIG} ${GSSAPI_CONFIGURE_ARGS}
GSSAPI_CONFIGURE_OFF= --without-kerberos
diff --git a/biology/canu/Makefile b/biology/canu/Makefile
--- a/biology/canu/Makefile
+++ b/biology/canu/Makefile
@@ -16,9 +16,8 @@
NOT_FOR_ARCHS_REASON= Requires 64-bit processor
LIB_DEPENDS= libboost_regex.so:devel/boost-libs
-RUN_DEPENDS= gnuplot:math/gnuplot
-USES= compiler:c++11-lang gmake localbase perl5 tar:xz
+USES= compiler:c++11-lang gmake gnuplot localbase perl5 tar:xz
USE_CXXSTD= c++14
USE_JAVA= 8+
JAVA_RUN= yes
diff --git a/biology/ddocent/Makefile b/biology/ddocent/Makefile
--- a/biology/ddocent/Makefile
+++ b/biology/ddocent/Makefile
@@ -13,7 +13,6 @@
RUN_DEPENDS= mawk>=0:lang/mawk \
gawk>=0:lang/gawk \
coreutils>=0:sysutils/coreutils \
- gnuplot>=0:math/gnuplot \
parallel>=0:sysutils/parallel \
bash:shells/bash \
bwa>=0.7.13:biology/bwa \
@@ -32,7 +31,7 @@
freebayes:biology/freebayes \
fastp:biology/fastp
-USES= perl5 python shebangfix
+USES= gnuplot perl5 python shebangfix
USE_JAVA= yes
USE_GITHUB= yes
diff --git a/comms/limesuite/Makefile b/comms/limesuite/Makefile
--- a/comms/limesuite/Makefile
+++ b/comms/limesuite/Makefile
@@ -10,10 +10,9 @@
LICENSE= APACHE20
-BUILD_DEPENDS= gnuplot:math/gnuplot
RUN_DEPENDS= sqlite3:databases/sqlite3
-USES= cmake compiler:c11
+USES= cmake compiler:c11 gnuplot:build
USE_LDCONFIG= yes
USE_GITHUB= yes
diff --git a/deskutils/zim/Makefile b/deskutils/zim/Makefile
--- a/deskutils/zim/Makefile
+++ b/deskutils/zim/Makefile
@@ -33,7 +33,7 @@
DITAA_RUN_DEPENDS= ditaa:graphics/ditaa
GIT_DESC= Version control for notebooks using git
GIT_RUN_DEPENDS= git:devel/git
-GNUPLOT_RUN_DEPENDS= gnuplot:math/gnuplot
+GNUPLOT_USES= gnuplot
GNUR_DESC= Support of plot editor based on GNU R
GNUR_RUN_DEPENDS= R:math/R
GRAPHVIZ_RUN_DEPENDS= fdp:graphics/graphviz
diff --git a/devel/cvsplot/Makefile b/devel/cvsplot/Makefile
--- a/devel/cvsplot/Makefile
+++ b/devel/cvsplot/Makefile
@@ -9,12 +9,11 @@
WWW= https://cvsplot.sourceforge.net/
RUN_DEPENDS= p5-Date-Manip>=0:devel/p5-Date-Manip \
- p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote \
- gnuplot:math/gnuplot
+ p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote
NO_BUILD= yes
PLIST_FILES= bin/cvsplot
-USES= shebangfix perl5
+USES= gnuplot shebangfix perl5
SHEBANG_FILES= cvsplot.pl
do-install:
diff --git a/graphics/matplotplusplus/Makefile b/graphics/matplotplusplus/Makefile
--- a/graphics/matplotplusplus/Makefile
+++ b/graphics/matplotplusplus/Makefile
@@ -16,9 +16,8 @@
libopenblas.so:math/openblas \
libpng16.so:graphics/png \
libtiff.so:graphics/tiff
-RUN_DEPENDS= gnuplot:math/gnuplot
-USES= cmake compiler:c++17-lang jpeg
+USES= cmake compiler:c++17-lang gnuplot jpeg
USE_WX= 3.2+
USE_GITHUB= yes
diff --git a/graphics/p5-Chart-Gnuplot/Makefile b/graphics/p5-Chart-Gnuplot/Makefile
--- a/graphics/p5-Chart-Gnuplot/Makefile
+++ b/graphics/p5-Chart-Gnuplot/Makefile
@@ -11,9 +11,7 @@
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-RUN_DEPENDS= gnuplot:math/gnuplot
-
-USES= perl5
+USES= gnuplot perl5
USE_PERL5= configure
PLIST_FILES= %%SITE_PERL%%/Chart/Gnuplot.pm \
diff --git a/graphics/p5-Chart-Graph/Makefile b/graphics/p5-Chart-Graph/Makefile
--- a/graphics/p5-Chart-Graph/Makefile
+++ b/graphics/p5-Chart-Graph/Makefile
@@ -11,11 +11,10 @@
LICENSE= GPLv2
-RUN_DEPENDS= gnuplot:math/gnuplot \
- xmgrace:math/grace \
+RUN_DEPENDS= xmgrace:math/grace \
ppmtogif:graphics/netpbm
-USES= perl5
+USES= gnuplot perl5
USE_PERL5= configure
post-patch:
diff --git a/graphics/p5-feedgnuplot/Makefile b/graphics/p5-feedgnuplot/Makefile
--- a/graphics/p5-feedgnuplot/Makefile
+++ b/graphics/p5-feedgnuplot/Makefile
@@ -15,11 +15,10 @@
BUILD_DEPENDS= p5-String-ShellQuote>=0.50:textproc/p5-String-ShellQuote \
p5-IPC-Run>=0:devel/p5-IPC-Run
RUN_DEPENDS:= ${BUILD_DEPENDS} \
- p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
- gnuplot:math/gnuplot
+ p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
NO_ARCH= yes
-USES= perl5
+USES= gnuplot perl5
USE_PERL5= configure
PLIST_FILES= bin/feedgnuplot ${SITE_MAN1}/feedgnuplot.1.gz
diff --git a/math/gnuplot-tex-extras/Makefile b/math/gnuplot-tex-extras/Makefile
--- a/math/gnuplot-tex-extras/Makefile
+++ b/math/gnuplot-tex-extras/Makefile
@@ -9,9 +9,7 @@
COMMENT= Extra files for Gnuplot TeX support
WWW= http://www.gnuplot.info/
-RUN_DEPENDS= gnuplot:math/gnuplot
-
-USES= cpe tex
+USES= cpe gnuplot tex
NO_BUILD= yes
PLIST_FILES= ${TEX_FILES:S,^,${TEX_DIR}/,}
diff --git a/math/gretl/Makefile b/math/gretl/Makefile
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -56,10 +56,8 @@
GUI_USE_OFF= GNOME=glib20,libxml2
GUI_VARS= GTK_VER=3
GUI_VARS_OFF= GTK_VER=2
-GUI_USES= desktop-file-utils shared-mime-info
-GUI_BUILD_DEPENDS= gnuplot:math/gnuplot
+GUI_USES= desktop-file-utils gnuplot:build,run shared-mime-info
GUI_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig
-GUI_RUN_DEPENDS= gnuplot:math/gnuplot
MPI_CONFIGURE_WITH= mpi
MPI_CONFIGURE_ENV= MPICC=${LOCALBASE}/bin/mpicc
diff --git a/math/kalc/Makefile b/math/kalc/Makefile
--- a/math/kalc/Makefile
+++ b/math/kalc/Makefile
@@ -14,9 +14,7 @@
BROKEN_i386= compilation fails: error: Oops, mp_limb_t is 32 bits, but the assembler code in this configuration expects 64 bits
-RUN_DEPENDS= gnuplot:math/gnuplot
-
-USES= cargo
+USES= cargo gnuplot
USE_GITHUB= yes
GH_ACCOUNT= bgkillas
diff --git a/math/linbox/Makefile b/math/linbox/Makefile
--- a/math/linbox/Makefile
+++ b/math/linbox/Makefile
@@ -42,7 +42,6 @@
MIN_CONFIGURE_ON= --without-saclib --without-ocl
FULL_DESC= Complete package with all its dependencies
-FULL_BUILD_DEPENDS= gnuplot:math/gnuplot
FULL_LIB_DEPENDS= libflint.so:math/flint2 \
libfplll.so:math/fplll \
libiml.so:math/iml \
@@ -50,8 +49,7 @@
libntl.so:math/ntl \
libOpenCL.so:devel/ocl-icd \
libtinyxml2.so:textproc/tinyxml2
-FULL_RUN_DEPENDS= gnuplot:math/gnuplot
-FULL_USES= ghostscript
+FULL_USES= ghostscript gnuplot:build,run
FULL_CONFIGURE_WITH= flint fplll ghostscript gnuplot iml mpfr ntl ocl
DOXYGEN_VARS= BINARY_ALIAS=sed=${LOCALBASE}/bin/gsed
diff --git a/math/maxima/Makefile b/math/maxima/Makefile
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -17,10 +17,9 @@
LICENSE_PERMS_MAXIMAEXTRACLAUSE= dist-mirror dist-sell pkg-mirror \
pkg-sell auto-accept
-RUN_DEPENDS= gnuplot:math/gnuplot \
- rlwrap:devel/rlwrap
+RUN_DEPENDS= rlwrap:devel/rlwrap
-USES= autoreconf gmake makeinfo shared-mime-info
+USES= autoreconf gmake gnuplot makeinfo shared-mime-info
GNU_CONFIGURE= yes
diff --git a/math/octave/Makefile b/math/octave/Makefile
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -12,11 +12,9 @@
BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:devel/gperf \
${LOCALBASE}/bin/makeinfo:print/texinfo \
- gnuplot:math/gnuplot \
gsed:textproc/gsed \
${LOCALBASE}/include/rapidjson/rapidjson.h:devel/rapidjson
RUN_DEPENDS= ${LOCALBASE}/bin/makeinfo:print/texinfo \
- gnuplot:math/gnuplot \
gsed:textproc/gsed
LIB_DEPENDS= libamd.so:math/suitesparse-amd \
libarpack.so:math/arpack-ng \
@@ -49,7 +47,7 @@
libumfpack.so:math/suitesparse-umfpack
USES= charsetfix compiler:c++14-lang desktop-file-utils fortran gl \
- gmake iconv libtool localbase:ldflags ncurses octave:env perl5 \
+ gmake gnuplot:build,run iconv libtool localbase:ldflags ncurses octave:env perl5 \
pkgconfig readline tar:xz xorg
USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}/${PORTVERSION}
USE_PERL5= build
diff --git a/math/qalculate-gtk/Makefile b/math/qalculate-gtk/Makefile
--- a/math/qalculate-gtk/Makefile
+++ b/math/qalculate-gtk/Makefile
@@ -13,9 +13,8 @@
LIB_DEPENDS= libqalculate.so:math/libqalculate \
libharfbuzz.so:print/harfbuzz
-RUN_DEPENDS= gnuplot:math/gnuplot
-USES= compiler:c++11-lang gettext gmake gnome \
+USES= compiler:c++11-lang gettext gmake gnome gnuplot \
libtool:build localbase pkgconfig
USE_GNOME= cairo gdkpixbuf2 gtk30 intltool libxml2
diff --git a/math/qalculate-qt/Makefile b/math/qalculate-qt/Makefile
--- a/math/qalculate-qt/Makefile
+++ b/math/qalculate-qt/Makefile
@@ -12,14 +12,13 @@
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libqalculate.so:math/libqalculate
-RUN_DEPENDS= gnuplot:math/gnuplot
FLAVORS= qt6 qt5
FLAVOR?= ${FLAVORS:[1]}
qt5_CONFLICTS_INSTALL= qalculate-qt qalculate-qt6
qt6_CONFLICTS_INSTALL= qalculate-qt qalculate-qt5
-USES= compiler:c++11-lib gl pkgconfig qmake qt:${FLAVOR:S/qt//}
+USES= compiler:c++11-lib gl gnuplot pkgconfig qmake qt:${FLAVOR:S/qt//}
_USE_GL_qt5= gl
_USE_GL_qt6= opengl
USE_GL= ${_USE_GL_${FLAVOR}}
diff --git a/math/reduce/Makefile b/math/reduce/Makefile
--- a/math/reduce/Makefile
+++ b/math/reduce/Makefile
@@ -14,13 +14,12 @@
BROKEN_armv7= fails to compile: error: no viable overloaded '=': return *this = int128_t(rhs);
BROKEN_i386= fails to compile: sysv.S:832:1: changed section flags for .eh_frame, expected: 0x2
-BUILD_DEPENDS= gnuplot:math/gnuplot
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libpng.so:graphics/png \
libtiff.so:graphics/tiff
-USES= autoreconf:build libtool gmake ncurses jpeg xorg
+USES= autoreconf:build gnuplot:build libtool gmake ncurses jpeg xorg
USE_XORG= x11 xcursor xext xorgproto xft xrandr xrender
SFSUBDIR= snapshot_2022-06-17
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -112,8 +112,7 @@
CONFIGURE_ARGS+=--without-client
.if ${PORT_OPTIONS:MPLOT}
-BUILD_DEPENDS+= gnuplot:math/gnuplot
-RUN_DEPENDS+= gnuplot:math/gnuplot
+USES+= gnuplot:build,run
PLIST_SUB+= PLOT=''
CONFIGURE_ARGS+= --with-gnuplot=${LOCALBASE}/bin/gnuplot
.else
diff --git a/science/dynare/Makefile b/science/dynare/Makefile
--- a/science/dynare/Makefile
+++ b/science/dynare/Makefile
@@ -19,11 +19,10 @@
libopenblas.so:math/openblas \
libsz.so:science/libaec
RUN_DEPENDS= epstool:graphics/epstool \
- gnuplot:math/gnuplot \
pstoedit:graphics/pstoedit \
xfig:graphics/xfig # README says that these executables are required for the test suite
-USES= bison compiler:c++17-lang fortran gmake localbase:ldflags tar:xz tex
+USES= bison compiler:c++17-lang fortran gmake gnuplot localbase:ldflags tar:xz tex
USE_TEX= pdftex
GNU_CONFIGURE= yes
diff --git a/science/sciplot/Makefile b/science/sciplot/Makefile
--- a/science/sciplot/Makefile
+++ b/science/sciplot/Makefile
@@ -11,9 +11,7 @@
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= gnuplot:math/gnuplot
-
-USES= cmake:testing compiler:c++17-lang
+USES= cmake:testing compiler:c++17-lang gnuplot
USE_GITHUB= yes
CMAKE_OFF= SCIPLOT_BUILD_TESTS SCIPLOT_BUILD_EXAMPLES SCIPLOT_BUILD_DOCS
diff --git a/science/tfel-edf/Makefile b/science/tfel-edf/Makefile
--- a/science/tfel-edf/Makefile
+++ b/science/tfel-edf/Makefile
@@ -10,14 +10,12 @@
LICENSE= GPLv3
-BUILD_DEPENDS= gnuplot:math/gnuplot \
- ${PYNUMPY}
+BUILD_DEPENDS= ${PYNUMPY}
LIB_DEPENDS= ${PY_BOOST} \
libboost_thread.so:devel/boost-libs
-RUN_DEPENDS= gnuplot:math/gnuplot \
- ${PYNUMPY}
+RUN_DEPENDS= ${PYNUMPY}
-USES= cmake compiler:c++0x fortran localbase python
+USES= cmake compiler:c++0x fortran gnuplot:build,run localbase python
CONFLICTS= tfel-mfront-3.*
diff --git a/science/tfel/Makefile b/science/tfel/Makefile
--- a/science/tfel/Makefile
+++ b/science/tfel/Makefile
@@ -11,10 +11,7 @@
LICENSE= GPLv3
-BUILD_DEPENDS= gnuplot:math/gnuplot
-RUN_DEPENDS= gnuplot:math/gnuplot
-
-USES= cmake compiler:c++0x fortran
+USES= cmake compiler:c++0x fortran gnuplot:build,run
CONFLICTS_INSTALL= tfel-mfront-edf-3.*
diff --git a/textproc/docproj/Makefile b/textproc/docproj/Makefile
--- a/textproc/docproj/Makefile
+++ b/textproc/docproj/Makefile
@@ -7,12 +7,11 @@
WWW= https://www.freebsd.org/docproj
RUN_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor \
- gnuplot-lite>0:math/gnuplot-lite \
gohugo>=0.115.4,1:www/gohugo \
rougify:textproc/rubygem-rouge \
rubygem-asciidoctor-diagram>0:textproc/rubygem-asciidoctor-diagram
-USES= metaport
+USES= gnpulot metaport
OPTIONS_DEFINE= EPUB FONTS-CJK GIT IGOR PDF TRANSLATOR VALE
OPTIONS_DEFAULT= GIT IGOR PDF TRANSLATOR VALE

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 1, 3:22 PM (12 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28999110
Default Alt Text
D43265.1782919342.diff (15 KB)

Event Timeline