diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index b13a3f95f859..d6f64bd97bb9 100644
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@@ -1,133 +1,133 @@
 PORTNAME=	redis
 DISTVERSION=	7.0.7.20230107
 CATEGORIES=	databases
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Persistent key-value database with built-in net interface
 WWW=		https://redis.io/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES+=		compiler:c11 cpe gmake
 CPE_VENDOR=	redislabs
 USE_GITHUB=	yes
 GH_TAGNAME=	d0cc3de73
 
 MAKE_ENV=	OPTIMIZATION= \
 		V=yo
 
 CONFLICTS_INSTALL=	redis redis6 # etc/rc.d/redis
 
 PORTSCOUT=	ignore:1
 
 OPTIONS_DEFINE=		JEMALLOC TESTS TLS TRIB
 OPTIONS_DEFAULT=	TLS
 OPTIONS_RADIO=		EXTLUA
 OPTIONS_RADIO_EXTLUA=	LUA LUAJIT
 OPTIONS_SUB=		yes
 
 JEMALLOC_DESC=	Use jemalloc
 LUAJIT_DESC=	Use luajit instead of builtin lua
 LUA_DESC=	Use lang/lua instead of builtin lua
 TESTS_DESC=	Install lang/tcl for redis unit tests
 TLS_DESC=	Use TLS (openssl req.)
 TRIB_DESC=	Install redis-trib.rb (lang/ruby req.)
 
 JEMALLOC_MAKE_ENV=	USE_JEMALLOC=yes
 LUAJIT_BROKEN=		Fails to link
 LUAJIT_USES=		luajit
 LUAJIT_VARS=		_ADDFLAGS=true
 LUA_BROKEN=		Fails to link
 LUA_USES=		lua:51
 LUA_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.lua
 LUA_VARS=		_ADDFLAGS=true
 TESTS_USES=		tcl:build
 TLS_USES=		ssl
 TLS_MAKE_ENV=		BUILD_TLS=yes
 TRIB_CATEGORIES=	ruby
 TRIB_RUN_DEPENDS=	rubygem-redis>=2.2:databases/rubygem-redis
-TRIB_USE=		RUBY=yes
+TRIB_USES=		ruby
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386 && !${CFLAGS:M-march=*}
 # Needed for __atomic_fetch_add_8
 USE_GCC=	yes
 CFLAGS+=	-march=i586
 .endif
 
 .if defined(_ADDFLAGS)
 CFLAGS+=	-fPIC
 LDFLAGS+=	-Wl,-E
 .endif
 
 .if ${PORT_OPTIONS:MLUAJIT}
 .  if ${LUAJIT_VER} == luajit
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.luajit
 .  else
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.luajit-or \
 		${PATCHDIR}/extra-patch-src-function_lua.c \
 		${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c
 .  endif
 . endif
 
 LDFLAGS+=	-lpthread -lm -lexecinfo
 
 CONFLICTS?=	redis-[1-9].* redis6-* redis62-*
 
 USE_RC_SUBR=	redis sentinel
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb redis-cli \
 		redis-sentinel redis-server
 
 USERS=		redis
 GROUPS=		redis
 
 REDIS_DBDIR?=	/var/db/redis
 REDIS_RUNDIR?=	/var/run/redis
 REDIS_LOGDIR?=	/var/log/redis
 
 SUB_FILES=	pkg-message
 SUB_LIST+=	PORTNAME=${PORTNAME} \
 		REDIS_DBDIR=${REDIS_DBDIR} \
 		REDIS_LOGDIR=${REDIS_LOGDIR} \
 		REDIS_RUNDIR=${REDIS_RUNDIR} \
 		REDIS_USER=${USERS}
 
 PLIST_SUB+=	REDIS_DBDIR=${REDIS_DBDIR} \
 		REDIS_GROUP=${GROUPS} \
 		REDIS_LOGDIR=${REDIS_LOGDIR} \
 		REDIS_RUNDIR=${REDIS_RUNDIR} \
 		REDIS_USER=${USERS}
 
 post-patch:
 	${REINPLACE_CMD} '77s!malloc.h!stdlib.h!' ${WRKSRC}/src/zmalloc.h
 
 post-patch-JEMALLOC-on:
 	@${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
 
 post-patch-LUA-on:
 	@cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/
 post-patch-LUAJIT-on: post-patch-LUA-on
 post-patch-LUAJITOR-on: post-patch-LUA-on
 
 post-build:
 	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf
 
 do-install:
 	${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKDIR}/redis.conf ${STAGEDIR}${PREFIX}/etc/redis.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}${PREFIX}/etc/sentinel.conf.sample
 	${MKDIR} ${STAGEDIR}${REDIS_LOGDIR} \
 		${STAGEDIR}${REDIS_DBDIR} \
 		${STAGEDIR}${REDIS_RUNDIR}
 
 do-install-TRIB-on:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/redis-trib.rb ${STAGEDIR}${PREFIX}/bin/
 
 do-test:
 	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
 
 .include <bsd.port.post.mk>
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 82ca0bfe76b8..50a72f9e4b2b 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,101 +1,101 @@
 PORTNAME=	rrdtool
 DISTVERSION=	1.8.0
 PORTREVISION=	2
 CATEGORIES=	databases graphics
 MASTER_SITES=	https://github.com/oetiker/rrdtool-1.x/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Round Robin Database Tools
 WWW=		https://oss.oetiker.ch/rrdtool/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe gmake gnome libtool pathfix pkgconfig shebangfix
 CPE_VENDOR=	rrdtool_project
 USE_GNOME=	glib20 libxml2
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	rrdcached
 SHEBANG_FILES=	examples/rrdcached/rrdcached-size.pl examples/stripes.py
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-tcl
 CONFIGURE_ENV=	RRDDOCDIR=${DOCSDIR:Q}
 INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
 CONFLICTS=	rrdtool12
 PORTDOCS=	*
 PORTEXAMPLES=	cgi-demo.cgi
 
 OPTIONS_DEFINE=		DEJAVU DOCS EXAMPLES GRAPH LOCKTIMEOUT MMAP NLS PERL \
 			PYTHON RUBY
 OPTIONS_DEFAULT=	DEJAVU GRAPH MMAP PERL
 OPTIONS_SUB=		yes
 DEJAVU_DESC=		Use DejaVu fonts (requires X11)
 GRAPH_DESC=		Enable the rrdtool graph command (needs cairo)
 LOCKTIMEOUT_DESC=	Enable the patch for lock timeout
 MMAP_DESC=		Use mmap in rrd_update
 PERL_DESC=		Build PERL module
 PYTHON_DESC=		Build PYTHON bindings
 RUBY_DESC=		Build RUBY bindings
 
 DEJAVU_RUN_DEPENDS=		dejavu>0:x11-fonts/dejavu
 DOCS_USES=			groff
 DOCS_CONFIGURE_ENABLE=		docs
 EXAMPLES_CONFIGURE_ENABLE=	examples
 GRAPH_LIB_DEPENDS=		libfreetype.so:print/freetype2 \
 				libharfbuzz.so:print/harfbuzz \
 				libpng.so:graphics/png
 GRAPH_USE=			GNOME=cairo,pango
 GRAPH_CONFIGURE_OFF=		--disable-rrd_graph \
 				--disable-rrdcgi
 LOCKTIMEOUT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-locktimeout
 MMAP_CONFIGURE_ENABLE=		mmap
 NLS_USES=			gettext localbase
 NLS_USE=			GNOME=intltool
 NLS_CONFIGURE_ENABLE=		nls
 PERL_USES=			perl5
 PERL_CONFIGURE_ON=		--enable-perl \
 				--enable-perl-site-install
 PERL_CONFIGURE_OFF=		--disable-perl
 PERL_MAKE_ARGS=			PERL_MAKE_OPTIONS='PREFIX="${PREFIX}" INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib"'
 PERL_PORTEXAMPLES=		4charts.pl bigtops.pl minmax.pl perftest.pl \
 				piped-demo.pl rrdcached/rrdcached-size.pl \
 				rrdcached/RRDCached.pm shared-demo.pl \
 				stripes.pl
 PYTHON_BUILD_DEPENDS=		${PYTHON_PKGNAMEPREFIX}setuptools>=63.1.0:devel/py-setuptools@${PY_FLAVOR}
 PYTHON_USES=			python
 PYTHON_USE=			PYTHON=flavors,optsuffix
 PYTHON_CONFIGURE_ENABLE=	python
 PYTHON_PORTEXAMPLES=		stripes.py
-RUBY_USE=			RUBY=yes
+RUBY_USES=			ruby
 RUBY_CONFIGURE_ENABLE=		ruby
 
 post-extract:
 	@${REINPLACE_CMD} -E 's|(^rrdtool_LDADD = librrd.la)|\1 $$\(ALL_LIBS\)|' \
 		${WRKSRC}/src/Makefile.in
 
 post-install-EXAMPLES-on:
 .if !defined(BATCH)
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "############################################################################"
 	@${ECHO_MSG} "# See ${EXAMPLESDIR} for some demonstration code        #"
 	@${ECHO_MSG} "############################################################################"
 .endif
 
 post-install-PERL-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/RRDs/RRDs.so
 
 post-install-PERL-off:
 	${RM} ${STAGEDIR}${EXAMPLESDIR}/*.pl
 	${RM} -r ${STAGEDIR}${EXAMPLESDIR}/rrdcached
 
 post-install-PYTHON-on:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/rrdtool*.so
 
 post-install-PYTHON-off:
 	${RM} ${STAGEDIR}${EXAMPLESDIR}/stripes.py
 
 post-install-RUBY-on:
 	${STRIP_CMD} ${STAGEDIR}${RUBY_SITEARCHLIBDIR}/RRD.so
 
 .include <bsd.port.mk>
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 785fa58cbfbe..9694788ec3f1 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,216 +1,216 @@
 PORTNAME=	vim
 PORTVERSION=	9.0.1136
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Improved version of the vi editor (${FLAVOR:U} flavor)
 WWW=		https://www.vim.org/
 
 LICENSE=	VIM
 LICENSE_NAME=	VIM License
 LICENSE_FILE=	${WRKSRC}/runtime/doc/uganda.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		cpe iconv ncurses pkgconfig shebangfix
 USE_GITHUB=	yes
 
 # Vim will try to link against libcanberra if it's installed
 CONFIGURE_ARGS=	--disable-canberra \
 		--enable-cscope \
 		--enable-gui=${GUI} \
 		--enable-multibyte \
 		--with-tlib=ncursesw
 MAKE_ARGS=	STRIP="${STRIP_CMD}" \
 		VIMRCLOC=${ETCDIR} \
 		VIMRUNTIMEDIR=${PREFIX}/share/vim/${VIM_VER}
 
 CPE_VERSION=	${PORTVERSION:R}
 GNU_CONFIGURE=	yes
 PLIST_SUB=	VIM_VER=${VIM_VER}
 PORTDATA=	${VIM_VER}
 PORTSCOUT=	ignore:1
 SHEBANG_FILES=	runtime/tools/demoserver.py runtime/tools/efm_perl.pl
 VIM_VER=	${PORTNAME}${PORTVERSION:R:S|.||g}
 
 # Flavors {{{1
 # FLAVORS are used to build various Vim GUIs. The default flavor (`vim') is
 # console-only.
 FLAVORS=	console gtk2 gtk3 motif x11 tiny
 FLAVOR?=	${FLAVORS:[1]}
 # Register conflicts with all other flavors
 CONFLICTS_INSTALL=	${FLAVORS:N${FLAVOR}:S/^/vim-/}
 
 .for f in ${FLAVORS:Nconsole}
 ${f}_PKGNAMESUFFIX=	-${f}
 .endfor
 
 # GUI flavors
 .if ${FLAVOR:U} == console
 GUI=		no
 CONFIGURE_ARGS+=--without-x
 PLIST_SUB+=	GUI="@comment " DESKTOP="@comment "
 
 .elif ${FLAVOR:U} == tiny
 GUI=		no
 CONFIGURE_ARGS+=--without-x
 PLIST=		${.CURDIR}/pkg-plist-tiny
 
 .elif ${FLAVOR:U} == gtk2
 GUI=		gtk2
 CONFIGURE_ARGS+=--enable-xim --enable-fontset
 PLIST_SUB+=	GUI="" DESKTOP=""
 USES+=		desktop-file-utils gnome xorg
 USE_GNOME=	gdkpixbuf2 gtk20
 USE_XORG=	ice sm x11 xpm xt
 
 .elif ${FLAVOR:U} == gtk3
 GUI=		gtk3
 CONFIGURE_ARGS+=--enable-xim --enable-fontset
 PLIST_SUB+=	GUI="" DESKTOP=""
 USES+=		desktop-file-utils gnome xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 USE_XORG=	ice sm x11 xpm xt
 
 .elif ${FLAVOR:U} == motif
 GUI=		motif
 CONFIGURE_ARGS+=--enable-xim --enable-fontset --with-motif=lib="${MOTIFLIB}"
 CONFIGURE_ENV+=	MOTIFHOME=${LOCALBASE}
 PLIST_SUB+=	GUI="" DESKTOP="@comment "
 USES+=		motif xorg
 USE_XORG=	ice sm x11 xmu xt
 
 .elif ${FLAVOR:U} == x11
 GUI=		x11
 CONFIGURE_ARGS+=--with-x
 PLIST_SUB+=	GUI="@comment " DESKTOP="@comment "
 USES+=		xorg
 USE_XORG=	ice sm x11 xmu xpm xt
 .endif
 
 # Options {{{1
 # The bulk of the OPTIONS are for normal (non-tiny) vim
 ### Make sure any new options are excluded below in CONSOLE/TINY
 OPTIONS_DEFAULT=	CTAGS_BASE PYTHON
 OPTIONS_DEFINE=		MAKE_JOBS NLS XTERM_SAVE
 OPTIONS_SINGLE=		CTAGS
 OPTIONS_SINGLE_CTAGS=	CTAGS_BASE CTAGS_EXUBERANT CTAGS_UNIVERSAL
 OPTIONS_GROUP=		LANGBIND
 OPTIONS_GROUP_LANGBIND=	LUA PERL PYTHON RUBY SCHEME TCL
 OPTIONS_SUB=		yes
 
 # vim-tiny excludes everything except CONSOLE, MAKE_JOBS
 .if ${FLAVOR:U} == tiny
 OPTIONS_EXCLUDE:=	${OPTIONS_DEFINE:NMAKE_JOBS} \
 			${OPTIONS_SINGLE_UI:NCONSOLE} \
 			${OPTIONS_GROUP_LANGBIND} \
 			${OPTIONS_SINGLE_CTAGS}
 .endif
 
 MAKE_JOBS_DESC=		Enable parallel build
 XTERM_SAVE_DESC=	Restore xterm screen after exit
 
 CTAGS_BASE_DESC=	Use system ctags
 CTAGS_EXUBERANT_DESC=	Use exctags instead of ctags
 CTAGS_UNIVERSAL_DESC=	Use uctags instead of ctags
 
 # GENERAL OPTIONS
 CTAGS_EXUBERANT_RUN_DEPENDS=	exctags:devel/ctags
 CTAGS_UNIVERSAL_RUN_DEPENDS=	uctags:devel/universal-ctags
 
 MAKE_JOBS_VARS_OFF=	MAKE_JOBS_UNSAFE=yes
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 # LANGUAGE BINDINGS
 LANGBIND_DESC=		Optional language bindings
 
 LUA_CONFIGURE_ENABLE=	luainterp
 LUA_CONFIGURE_WITH=	lua-prefix=${LOCALBASE}
 LUA_USES=		lua
 
 PERL_CONFIGURE_ENABLE=	perlinterp
 PERL_USES=		perl5
 
 PYTHON_USES=		python:3.6+
 PYTHON_USES_OFF=	python:env
 PYTHON_CONFIGURE_ENABLE=	python3interp
 PYTHON_CONFIGURE_WITH=	python3-command=${PYTHON_CMD}
 
 RUBY_CONFIGURE_ENABLE=	rubyinterp
-RUBY_USE=		RUBY=yes
+RUBY_USES=		ruby
 
 SCHEME_DESC=		MzScheme (Racket) bindings
 SCHEME_CONFIGURE_ENABLE=mzschemeinterp
 SCHEME_BUILD_DEPENDS=	mzscheme:lang/racket
 SCHEME_RUN_DEPENDS=	${SCHEME_BUILD_DEPENDS}
 
 TCL_CONFIGURE_ENABLE=	tclinterp
 TCL_CONFIGURE_WITH=	tclsh=tclsh${TCL_VER}
 TCL_USES=		tcl
 
 # Targets {{{1
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MPYTHON} && !empty(WITH_DEBUG)
 CFLAGS+=		-DPy_DEBUG -DPy_DEBUG_NO_PYMALLOC
 .endif
 
 post-extract:
 	${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${WRKSRC}/runtime/keymap
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%ETCDIR%%|${ETCDIR}|' ${WRKSRC}/src/feature.h
 	${REINPLACE_CMD} -e 's|-liconv|${ICONV_LIB}|g; s|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/src/auto/configure
 
 post-configure:
 # Needed when devel/libsysinfo is installed:
 	${REINPLACE_CMD} -e '/^#define HAVE_SYSINFO/ d' ${WRKSRC}/src/auto/config.h
 
 .if ${FLAVOR:U} == tiny
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/vim ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/runtime/defaults.vim ${STAGEDIR}${DATADIR}/${VIM_VER}
 	${INSTALL_DATA} ${FILESDIR}/defaults_freebsd.vim ${STAGEDIR}${DATADIR}/${VIM_VER}
 	${INSTALL_MAN} ${WRKSRC}/runtime/doc/vim.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .else  # flavor != tiny
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/defaults_freebsd.vim ${STAGEDIR}${DATADIR}/${VIM_VER}
 	${RM} ${STAGEDIR}${PREFIX}/bin/ex
 	${RM} ${STAGEDIR}${PREFIX}/bin/view
 .  for F in eview evim gview gvim gvimdiff rgview rgvim rview rvim vimdiff
 	${LN} -sf vim ${STAGEDIR}${PREFIX}/bin/$F
 .  endfor
 
 # OPTIONS
 post-patch-CTAGS_BASE-on:
 	${FIND} ${WRKSRC}/runtime -name 'menu*.vim' | ${XARGS} ${GREP} -l 'ctags -R' | \
 		${XARGS} ${REINPLACE_CMD} -Ee 's!ctags -R ?\.!${FIND} . -type f \\| ${XARGS} ctags!g'
 
 post-patch-CTAGS_EXUBERANT-on:
 	${FIND} ${WRKSRC}/runtime -name 'menu*.vim' | ${XARGS} ${GREP} -l 'ctags -R' | \
 		${XARGS} ${REINPLACE_CMD} -e 's|ctags -R|exctags -R|g'
 
 post-patch-CTAGS_UNIVERSAL-on:
 	${FIND} ${WRKSRC}/runtime -name 'menu*.vim' | ${XARGS} ${GREP} -l 'ctags -R' | \
 		${XARGS} ${REINPLACE_CMD} -e 's|ctags -R|uctags -R|g'
 
 post-patch-LUA-on:
 	${REINPLACE_CMD} -e 's|set dummy lua;|set dummy ${LUA_CMD};|g' ${WRKSRC}/src/auto/configure
 	${REINPLACE_CMD} -e '/$$LUA_LIBS/ s|^|LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}";|' ${WRKSRC}/src/auto/configure
 	${REINPLACE_CMD} -e '/LUA_CFLAGS=/s|".*"|"-I${LUA_INCDIR}"|' ${WRKSRC}/src/auto/configure
 
 post-patch-XTERM_SAVE-on:
 	${REINPLACE_CMD} -e '/FEAT_XTERM_SAVE/ s|.*|#define FEAT_XTERM_SAVE|' ${WRKSRC}/src/feature.h
 
 post-install-NLS-off:
 	${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/lang
 	${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap
 	${INSTALL_DATA} ${WRKSRC}/runtime/keymap/* ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap
 .endif	#!defined(TINY)
 
 .include <bsd.port.post.mk>
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 64888ef10304..8482acaa59a1 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,250 +1,250 @@
 PORTNAME=	graphviz
 PORTVERSION=	2.50.0
 PORTREVISION=	18
 CATEGORIES=	graphics tk
 MASTER_SITES=	https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PORTVERSION}/
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Graph Visualization Software from AT&T and Bell Labs
 WWW=		https://www.graphviz.org/
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	tclsh${TCL_VER}:lang/tcl${_TCLTK_WANTED_VERSION}
 LIB_DEPENDS=	libltdl.so:devel/libltdl \
 		libpng.so:graphics/png \
 		libwebp.so:graphics/webp \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libexpat.so:textproc/expat2 \
 		libharfbuzz.so:print/harfbuzz \
 		libgd.so:${GD_PORT}
 
 USES=		compiler:c++11-lang cpe pathfix shebangfix gmake bison \
 		pkgconfig libtool:keepla autoreconf localbase:ldflags jpeg \
 		tcl:build
 
 GNU_CONFIGURE=	yes
 # sincos is broken on armv6, see ports/220591
 CFLAGS_armv6=	-fno-builtin-sincos -fno-builtin-sin -fno-builtin-cos \
 		-fno-builtin-sincosf -fno-builtin-sinf -fno-builtin-cosf \
 		-fno-builtin-sincosl -fno-builtin-sinl -fno-builtin-cosl
 CFLAGS_armv7=	-fno-builtin-sincos -fno-builtin-sin -fno-builtin-cos \
 		-fno-builtin-sincosf -fno-builtin-sinf -fno-builtin-cosf \
 		-fno-builtin-sincosl -fno-builtin-sinl -fno-builtin-cosl
 MAKE_ENV=	EXPR_COMPAT=yes
 
 CONFLICTS_INSTALL=	ghmm
 
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 
 FIX_INCLUDE=	lib/cdt/dthdr.h lib/pathplan/tri.h \
 		lib/pathplan/pathutil.h lib/pathplan/solvers.h \
 		lib/pathplan/vis.h lib/pathplan/vispath.h \
 		lib/common/logic.h lib/common/globals.h \
 		lib/gvc/gvcint.h
 FIX_TCL_SCRIPT=	tclpkg/gdtclft/demo/entities.tcl \
 		tclpkg/tcldot/demo/gcat.tcl
 FIX_TK_SCRIPT=	tclpkg/tcldot/demo/doted.tcl \
 		tclpkg/tclpathplan/demo/pathplan.tcl
 
 OPTIONS_DEFINE=	XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO POPPLER \
 		ANN GTS GTK2 GDK GDK_PIXBUF SMYRNA DEVIL \
 		GHOSTSCRIPT PERL PHP PYTHON RUBY LUA TCL TK GUILE GO \
 		NVTHREADS DOCS EXAMPLES
 OPTIONS_DEFAULT=XPM DIGCOLA IPSEPCOLA ICONV PANGOCAIRO NVTHREADS
 NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
 DIGCOLA_DESC=	neato layout engine with DIGCOLA features
 IPSEPCOLA_DESC=	neato layout engine with IPSEPCOLA features
 PANGOCAIRO_DESC=pangocairo support
 POPPLER_DESC=	PDF and PS file support via poppler (requires PANGOCAIRO)
 ANN_DESC=	ANN edge bundling support
 GTS_DESC=	GNU Triangulated Surface Library support
 GTK2_DESC=	gtk2 plugin (requires PANGOCAIRO)
 GDK_DESC=	gdk library support (requires GTK2)
 GDK_PIXBUF_DESC=gdk pixbuf support (requires GDK)
 SMYRNA_DESC=	SMYRNA graph viewer (requires GTK2)
 DEVIL_DESC=	devil plugin
 GHOSTSCRIPT_DESC=ghostscript plugin (requires PANGOCAIRO)
 PERL_DESC=	Perl bindings (swig)
 PHP_DESC=	PHP bindings (swig)
 PYTHON_DESC=	Python bindings (swig)
 RUBY_DESC=	Ruby bindings (swig)
 LUA_DESC=	Lua bindings (swig)
 TCL_DESC=	TCL bindings (swig)
 GUILE_DESC=	Guile bindings (swig)
 GO_DESC=	Go bindings (swig)
 TK_DESC=	TK toolkit support
 NVTHREADS_DESC=	Link with threads (needed for nvidia)
 
 XPM_USES=	xorg
 XPM_USE=	XORG=xaw,xpm,xmu,xt,sm,ice,xext,x11,xau,xdmcp
 ICONV_USES=	iconv
 NLS_USES=	gettext
 PANGOCAIRO_USES=gnome xorg
 PANGOCAIRO_USE=	GNOME=pango,cairo XORG=xrender,x11,xau,xdmcp
 GTK2_USES=	gnome xorg
 GTK2_USE=	XORG=sm,ice,xext,xinerama,xi,xrandr,xcursor,xfixes GNOME=gtk20
 SMYRNA_USES=	gnome gl
 SMYRNA_USE=	GNOME=libglade2,pangox-compat,gdkpixbuf2 GL=glut,glu,gl
 GHOSTSCRIPT_USES=ghostscript
 PERL_USES=	perl5
 PHP_USES=	php:build gnome
 PHP_USE=	GNOME=libxml2
 PYTHON_USES=	python:build
-RUBY_USE=	RUBY=yes
+RUBY_USES=	ruby
 LUA_USES=	lua
 TK_USES=	tk:build
 GO_USES=	go:no_targets
 DOCS_USES=	ghostscript:build groff
 
 POPPLER_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 ANN_LIB_DEPENDS=	libann.so:math/ann
 GTS_LIB_DEPENDS=	libgts.so:graphics/gts
 SMYRNA_LIB_DEPENDS=	libgtkgl-2.0.so:x11-toolkits/gtkglarea2 \
 			libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
 DEVIL_LIB_DEPENDS=	libIL.so:graphics/devil
 GUILE_LIB_DEPENDS=	libguile-2.2.so:lang/guile2 \
 			libgc-threaded.so:devel/boehm-gc-threaded
 PHP_LIB_DEPENDS=	libpcre.so:devel/pcre \
 			libargon2.so:security/libargon2
 GHOSTSCRIPT_LIB_DEPENDS=	libgs.so:print/${_GS_PORT}
 
 XPM_CONFIGURE_WITH=		x
 XPM_CONFIGURE_ENV=		ac_cv_header_sys_inotify_h=no
 XPM_CONFIGURE_ON=		--enable-lefty
 DIGCOLA_CONFIGURE_WITH=		digcola
 IPSEPCOLA_CONFIGURE_WITH=	ipsepcola
 IPSEPCOLA_IMPLIES=		DIGCOLA
 NLS_CONFIGURE_ENABLE=		nls
 PANGOCAIRO_CONFIGURE_WITH=	pangocairo
 POPPLER_CONFIGURE_WITH=		poppler
 POPPLER_IMPLIES=		PANGOCAIRO
 ANN_CONFIGURE_WITH=		ann
 ANN_CONFIGURE_ENV=	ANN_CFLAGS=-I${LOCALBASE}/include ANN_LIBS=-lann
 GTS_CONFIGURE_WITH=		gts
 GTK2_CONFIGURE_WITH=		gtk
 GTK2_IMPLIES=			PANGOCAIRO
 GDK_CONFIGURE_WITH=		gdk
 GDK_PIXBUF_CONFIGURE_WITH=	gdk-pixbuf
 GDK_PIXBUF_IMPLIES=		GTK2 GDK
 SMYRNA_CONFIGURE_OFF=		--with-glut=no
 SMYRNA_CONFIGURE_WITH=		smyrna glade gtkgl gtkglext
 SMYRNA_IMPLIES=			GTK2 GTS
 DEVIL_CONFIGURE_WITH=		devil
 GHOSTSCRIPT_CONFIGURE_OFF=	--with-ghostscript=no
 GHOSTSCRIPT_IMPLIES=		PANGOCAIRO
 PERL_CONFIGURE_ENABLE=		perl
 PERL_VARS=		SHEBANG_FILES+=tclpkg/gv/demo/modgraph.pl
 PHP_CONFIGURE_ENABLE=		php
 PHP_CPPFLAGS=		-I${LOCALBASE}/include/php/Zend
 PHP_VARS=		SHEBANG_FILES+=tclpkg/gv/demo/modgraph.php
 PYTHON_CONFIGURE_ENABLE=	python
 PYTHON_LDFLAGS=		"-L${PYTHONBASE}/lib"
 PYTHON_VARS=		SHEBANG_FILES+=tclpkg/gv/demo/modgraph.py
 PYTHON_CONFIGURE_ENV=	PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}"
 RUBY_CONFIGURE_ENABLE=		ruby
 RUBY_CONFIGURE_ENV=	RUBY="${RUBY}"
 RUBY_VARS=		SHEBANG_FILES+=tclpkg/gv/demo/modgraph.rb
 LUA_CONFIGURE_ENABLE=		lua
 LUA_CFLAGS=		-I${LUA_INCDIR}
 LUA_LDFLAGS=		-L${LUA_LIBDIR} -lm
 LUA_CONFIGURE_ENV=	LUA="${LUA_BINDIR}/lua" \
 			LUA_INSTALL_DIR=${PREFIX}/lib/lua/${LUA_VER}
 LUA_VARS=		SHEBANG_FILES+=tclpkg/gv/demo/modgraph.lua
 TCL_CONFIGURE_ENABLE=		tcl
 TCL_CPPFLAGS=		-I${TCL_INCLUDEDIR}
 TCL_CONFIGURE_ENV=	TCLCONFIG="${TCL_LIBDIR}/tclConfig.sh"
 TCL_VARS=		SHEBANG_FILES+=tclpkg/gv/demo/modgraph.tcl \
 			PLIST_SUB+=TCL_VER="${TCL_VER}"
 TK_CPPFLAGS=		-I${TK_INCLUDEDIR}
 TK_CONFIGURE_ON=	--with-wish=${WISH}
 TK_CONFIGURE_ENV=	TKCONFIG="${TK_LIBDIR}/tkConfig.sh"
 TK_IMPLIES=	TCL
 GUILE_CONFIGURE_ENABLE=		guile
 GO_CONFIGURE_ENABLE=		go
 NVTHREADS_LDFLAGS=	-lpthread
 
 .include <bsd.port.options.mk>
 
 # allow the use localized gd ports in Makefile.local or slave ports.
 GD_PORT?=	graphics/gd
 
 CONFIGURE_ARGS+=	--program-transform-name="s/x/x/" \
 		--enable-dependency-tracking \
 		--enable-r=no \
 		--with-freetype2=yes \
 		--with-libgd \
 		--with-webp \
 		--with-fontconfigincludedir=${LOCALBASE}/include \
 		--with-fontconfiglibdir=${LOCALBASE}/lib \
 		--with-tclsh=${TCLSH} \
 		--without-rsvg \
 		--with-qt=no \
 		--disable-io --disable-ocaml --disable-java \
 		--disable-python2 --disable-python3 \
 		--disable-sharp
 
 .if ${PORT_OPTIONS:MICONV}
 CONFIGURE_ARGS+=	--with-iconvlibdir=${ICONV_PREFIX}/lib
 CONFIGURE_ARGS+=	--with-iconvincludedir=${ICONV_PREFIX}/include
 .else
 CONFIGURE_ARGS+=	--without-libiconv-prefix
 .endif
 
 .if ${PORT_OPTIONS:MPERL} || ${PORT_OPTIONS:MPHP} || ${PORT_OPTIONS:MPYTHON} || \
     ${PORT_OPTIONS:MRUBY} || ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MTCL} || \
     ${PORT_OPTIONS:MGUILE} || ${PORT_OPTIONS:MGO}
 BUILD_DEPENDS+=		swig:devel/swig
 RUN_DEPENDS+=		swig:devel/swig
 CONFIGURE_ARGS+=	--enable-swig
 CONFIGURE_ENV+=		SWIG="${LOCALBASE}/bin/swig"
 .else
 CONFIGURE_ARGS+=	--disable-swig
 CONFIGURE_ENV+=		SWIG="/nonexistent"
 .endif
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's|PHP_INSTALL_DATADIR=.*|PHP_INSTALL_DATADIR="${PREFIX}/share/php"|' \
 		-e 's|LUA_INSTALL_DIR=.*|LUA_INSTALL_DIR="${LUA_MODLIBDIR}"|' \
 		${WRKSRC}/configure.ac
 	${REINPLACE_CMD} -e 's|#include "gui.h"|#include "gui/gui.h"|' \
 		${WRKSRC}/cmd/smyrna/tvnodes.h
 	${REINPLACE_CMD} -e 's|SF_FLAGS|SFIO_FLAGS|g' \
 		${WRKSRC}/lib/sfio/*.[ch]
 	${FIND} ${WRKSRC} -name Makefile.am | \
 		${XARGS} ${REINPLACE_CMD} \
 		-e 's| $$(pkgdatadir)/doc/pdf| ${DOCSDIR}/pdf|' \
 		-e 's| $$(pkgdatadir)/doc/html/schema| ${DOCSDIR}/html/schema|' \
 		-e 's| $$(pkgdatadir)/doc/html/info| ${DOCSDIR}/html/info|' \
 		-e 's| $$(pkgdatadir)/doc/html| ${DOCSDIR}/html|' \
 		-e 's| $$(pkgdatadir)/doc| ${DOCSDIR}|' \
 		-e 's| $$(pkgdatadir)/demo| ${EXAMPLESDIR}|' \
 		-e 's| $$(datadir)/@PACKAGE@/demo| ${EXAMPLESDIR}|';
 	${CP} ${FILESDIR}/version.m4 ${WRKSRC}/version.m4
 	cd ${WRKSRC} && ${REINPLACE_CMD} \
 		-e 's|exec tclsh |exec tclsh${TCL_VER} |' ${FIX_TCL_SCRIPT}
 	cd ${WRKSRC} && ${REINPLACE_CMD} \
 		-e 's|exec wish |exec wish${TCL_VER} |' ${FIX_TK_SCRIPT}
 
 pre-configure-DOCS-off:
 	${REINPLACE_CMD} -e 's| doc | |' ${WRKSRC}/Makefile.am
 	${FIND} ${WRKSRC} -name Makefile.am | \
 		${XARGS} ${REINPLACE_CMD} \
 		-e 's|^pdf_DATA|#pdf_DATA|';
 
 pre-install-PHP-on:
 	${MKDIR} "${STAGEDIR}/${PREFIX}/share/php"
 
 post-install: install-ldconfig-file
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} ${FIX_INCLUDE} ${STAGEDIR}${PREFIX}/include/graphviz/
 
 .include <bsd.port.post.mk>
diff --git a/irc/iroffer-dinoex/Makefile b/irc/iroffer-dinoex/Makefile
index e90b7a79b973..24013ccc758c 100644
--- a/irc/iroffer-dinoex/Makefile
+++ b/irc/iroffer-dinoex/Makefile
@@ -1,90 +1,90 @@
 PORTNAME=	iroffer
 PORTVERSION=	3.32
 PORTREVISION=	4
 CATEGORIES=	irc
 MASTER_SITES=	https://iroffer.net/
 PKGNAMESUFFIX=	-dinoex${PKGNAMESUFFIX2}
 DISTNAME=	iroffer-dinoex-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	IRC "bot" that makes sharing files via DCC extremely easy
 WWW=		https://iroffer.net/
 
 LICENSE=	GPLv2
 
 CONFLICTS=	iroffer-1* iroffer-lamm-1.*
 
 USES=		ssl
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	CC="${CC}" LDFLAGS="${LDFLAGS}" LOCALBASE="${LOCALBASE}"
 CONFIGURE_ENV=	LANG=en_EN.UTF-8
 MAKE_ENV=	LANG=en_EN.UTF-8
 ALL_TARGET=	all-lang doc
 USE_RC_SUBR=	iroffer
 
 IROFFER_DOCS=	README README.modDinoex LIESMICH.modDinoex \
 		LICENSE THANKS TODO \
 		help-admin-de.txt help-admin-en.txt \
 		help-admin-fr.txt help-admin-it.txt \
 		doc/iroffer.1.txt doc/iroffer.1.html doc/iroffer.1.ps \
 		doc/INSTALL-linux-de.html doc/INSTALL-linux-de.txt \
 		doc/INSTALL-linux-en.html doc/INSTALL-linux-en.txt \
 		doc/INSTALL-linux-fr.html doc/INSTALL-linux-fr.txt \
 		doc/INSTALL-linux-it.html doc/INSTALL-linux-it.txt \
 		doc/INSTALL-vhost-de.html doc/INSTALL-vhost-de.txt \
 		doc/INSTALL-vhost-en.html doc/INSTALL-vhost-en.txt \
 		doc/INSTALL-vhost-fr.html doc/INSTALL-vhost-fr.txt
 IROFFER_EXAMPLES=	iroffer.cron \
 		sample.config beispiel.config exemple.config \
 		header.html footer.html ruby-sample.rb
 IROFFER_HTDOCS=	iroffer-state.css robots.txt \
 		info.txt.rb json.txt.rb md5.txt.rb sfv.txt.rb
 
 OPTIONS_DEFINE=	CURL RUBY UPNP GEOIP DOCS EXAMPLES
 OPTIONS_DEFAULT=CURL RUBY UPNP GEOIP
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_ON=	-curl
-RUBY_USE=		RUBY=yes
+RUBY_USES=		ruby
 RUBY_LIB_DEPENDS=	libruby${RUBY_SHLIBVER}.so:${RUBY_PORT}
 RUBY_CONFIGURE_ON=	-ruby
 UPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
 UPNP_CONFIGURE_ON=	-upnp
 GEOIP_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 GEOIP_CONFIGURE_ON=	-geoip
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MRUBY}
 # make stage-qa happy
 # keep in sync with all platforms where libunwind is available
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .endif
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/iroffer ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/iroffer-de ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/iroffer-it ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/iroffer-fr ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/iroffer.1 ${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/xdcc.7 ${STAGEDIR}${PREFIX}/man/man7/
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${IROFFER_DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/htdocs
 .for i in ${IROFFER_HTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/htdocs/${i} ${STAGEDIR}${EXAMPLESDIR}/htdocs/
 .endfor
 .for i in ${IROFFER_EXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${EXAMPLESDIR}/
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/japanese/tomoe/Makefile b/japanese/tomoe/Makefile
index 9d4008788649..aca0d1c212fd 100644
--- a/japanese/tomoe/Makefile
+++ b/japanese/tomoe/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	tomoe
 PORTVERSION=	0.6.0
 PORTREVISION=	7
 CATEGORIES=	japanese
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Tegaki Online MOji-ninshiki Engine
 WWW=		http://tomoe.sourceforge.jp/
 
 BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake gnome libtool pathfix perl5 pkgconfig
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 
 CONFIGURE_ARGS=	--with-python=no
 CONFIGURE_ENV=	GMSGFMT="${LOCALBASE}/bin/msgfmt"
 CFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS_DEFINE=		DICT_RUBY EST MYSQL RUBY UNIHAN
 OPTIONS_SUB=		yes
 DICT_RUBY_DESC=		Enable Ruby based dictionary module
 DICT_RUBY_CONFIGURE_ENABLE=	dict-ruby
 EST_DESC=		Enable Hyper Estraier dictionary module
 EST_CONFIGURE_WITH=	est
 MYSQL_DESC=		Enable MySQL dictionary module
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_WITH=	mysql
 RUBY_DESC=		Enable Ruby module
 RUBY_BROKEN=		Does not build
-RUBY_USE=		RUBY=yes
+RUBY_USES=		ruby
 RUBY_CONFIGURE_OFF=	--with-ruby=no
 RUBY_BUILD_DEPENDS=	rubygem-glib2>0:devel/rubygem-glib2
 RUBY_RUN_DEPENDS=	rubygem-glib2>0:devel/rubygem-glib2
 RUBY_CFLAGS=		-I${LOCALBASE}/include/ruby-${RUBY_VER} \
 			-I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH}
 UNIHAN_DESC=		Enable Unihan database dictionary module
 UNIHAN_BROKEN=		Does not build
 UNIHAN_MASTER_SITES=	ftp://ftp.unicode.org/Public/UNIDATA/:unihan
 UNIHAN_DISTFILES=	Unihan.zip:unihan
 UNIHAN_EXTRACT_DEPENDS=	${UNZIP_CMD}:archivers/unzip
 UNIHAN_BUILD_DEPENDS=	\
 	${RUBY_SITEARCHLIBDIR}/uconv.so:japanese/ruby-uconv \
 	${RUBY_SITELIBDIR}/suikyo/suikyo.rb:japanese/suikyo
-UNIHAN_USE=		RUBY=yes
+UNIHAN_USES=		ruby
 UNIHAN_CONFIGURE_ENABLE=unihan
 
 post-extract-UNIHAN-on:
 	cd ${WRKSRC}/module/dict && \
 		${UNZIP_CMD} -qo ${DISTDIR}/Unihan.zip -d ${WRKSRC}/module/dict
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|glib/ge.*\.h>|glib.h>|g' \
 		-e 's|glib/ga.*\.h>|glib.h>|g' \
 		${WRKSRC}/lib/glib-compat-key-file.h \
 		${WRKSRC}/lib/tomoe.c \
 		${WRKSRC}/lib/glib-utils.h
 
 .include <bsd.port.mk>
diff --git a/java/openjfx14/Makefile b/java/openjfx14/Makefile
index 924d00c769b7..b5a9ff49a289 100644
--- a/java/openjfx14/Makefile
+++ b/java/openjfx14/Makefile
@@ -1,165 +1,164 @@
 PORTNAME=	openjfx
 DISTVERSION=	14.0.2.1+1
 PORTREVISION=	8
 CATEGORIES=	java x11-toolkits devel
 MASTER_SITES=	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.7.1/:core \
 		https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.7.1/:grouping \
 		https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.7.1/:queries \
 		https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.7.1/:queryparser \
 		https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.7.1/:sandbox \
 		https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/:antlr
 PKGNAMESUFFIX=	14
 DISTFILES=	lucene-core-7.7.1.jar:core \
 		lucene-grouping-7.7.1.jar:grouping \
 		lucene-queries-7.7.1.jar:queries \
 		lucene-queryparser-7.7.1.jar:queryparser \
 		lucene-sandbox-7.7.1.jar:sandbox \
 		antlr4-4.7.2-complete.jar:antlr
 
 MAINTAINER=	mikael@FreeBSD.org
 COMMENT=	JavaFX SDK overlay for OpenJDK 11
 WWW=		https://openjdk.java.net/projects/openjfx/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	zip:archivers/zip \
 		apache-ant>0:devel/apache-ant \
 		gradle62>=6.2:devel/gradle62 \
 		${JAVALIBDIR}/junit.jar:java/junit
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 USES=		gettext-runtime gl gnome jpeg localbase:ldflags ninja pkgconfig \
 		sqlite xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openjdk
 GH_PROJECT=	jfx
 USE_GL=		gl
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 gtk30 pango
 USE_JAVA=	yes
 JAVA_VERSION=	11
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xtst xxf86vm
 
 CFLAGS+=	-Wno-unused-command-line-argument
 
 PLIST_SUB=	INSTALLDIR=${_INSTALLDIR}
 
 OPTIONS_DEFINE=	MEDIA SWT TEST WEBKIT
 OPTIONS_DEFAULT=	MEDIA WEBKIT
 OPTIONS_SUB=	yes
 
 MEDIA_DESC=	Media module
 SWT_DESC=	SWT support
 
 MEDIA_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 			libsndio.so:audio/sndio
 MEDIA_USES=	gmake
 MEDIA_VARS=	COMPILE_MEDIA=true
 
 SWT_BUILD_DEPENDS=	swt>0:x11-toolkits/swt
 SWT_RUN_DEPENDS=	swt>0:x11-toolkits/swt
 SWT_VARS=	COMPILE_SWT=true
 
 TEST_USES=	display:test
 TEST_VARS=	AWT_TEST=true FULL_TEST=true
 
 # Gradle calls CMake during the build
 WEBKIT_IMPLIES=	MEDIA
 WEBKIT_BUILD_DEPENDS=	cmake:devel/cmake-core
 WEBKIT_LIB_DEPENDS=	libicui18n.so:devel/icu
 WEBKIT_USES=	bison gmake gperf perl5 python:3.5+,build ruby:build
 WEBKIT_USE=	GNOME=libxslt,libxml2 \
 		PERL5=build \
-		RUBY=yes \
 		XORG=xcomposite,xdamage,xfixes,xrender,xt
 WEBKIT_VARS=	COMPILE_WEBKIT=true
 
 # Move Gradle's home below ${WRKDIR} instead of using ${HOME}/.gradle
 _GRADLE_ENV=	CC=${WRKDIR}/bin/ccwrapper \
 		CXX=${WRKDIR}/bin/cxxwrapper \
 		GRADLE_USER_HOME=${WRKDIR}/gradle-home \
 		JAVA_VERSION=${JAVA_VERSION}
 _GRADLE_RUN=	${SETENV} ${_GRADLE_ENV} gradle62 --no-daemon
 
 _INSTALLDIR=	${PREFIX}/${PKGBASE}
 
 post-extract:
 	${MKDIR} ${WRKDIR}/jars
 .for f in core grouping queries queryparser sandbox
 	${CP} ${DISTDIR}/lucene-${f}-7.7.1.jar ${WRKDIR}/jars
 .endfor
 	${CP} ${DISTDIR}/antlr4-4.7.2-complete.jar ${WRKDIR}/jars
 
 # The BSD Makefiles for GStreamer-lite and Jfxmedia are based on the
 # Linux versions.  Prepare the tree, so that we only see the changes
 # from Linux's Makefile in our own patches.
 pre-patch:
 	@${CP} -r ${WRKSRC}/modules/javafx.media/src/main/native/jfxmedia/projects/linux \
 		${WRKSRC}/modules/javafx.media/src/main/native/jfxmedia/projects/bsd
 	@${CP} -r ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/projects/linux \
 		${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/projects/bsd
 
 post-patch:
 	@${MKDIR} ${WRKDIR}/bin
 	@${PRINTF} '#!/bin/sh\nexport CCACHE_DIR=${CCACHE_DIR}\nexec ${CCACHE_BIN} ${CC} ${CFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/ccwrapper
 	@${PRINTF} '#!/bin/sh\nexport CCACHE_DIR=${CCACHE_DIR}\nexec ${CCACHE_BIN} ${CXX} ${CXXFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/cxxwrapper
 	@${CHMOD} +x ${WRKDIR}/bin/ccwrapper ${WRKDIR}/bin/cxxwrapper
 	@${REINPLACE_CMD} -e 's|gcc|${WRKDIR}/bin/ccwrapper|g' \
 			  -e 's|g\+\+|${WRKDIR}/bin/cxxwrapper|g' \
 		${WRKSRC}/buildSrc/bsd.gradle
 # Add a *BSD native audio sink to GStreamer-lite instead of using the
 # bundled ALSA sink.  Currently we add an sndio sink, but this is an extension
 # point for eventually adding an OSS backend (or others) as an option as well.
 # If you add a new one make sure it registers itself as "bsdaudiosink" as defined
 # in modules/media/src/main/native/jfxmedia/platform/gstreamer/GstPipelineFactory.cpp
 	@${MKDIR} ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio
 	@${CP} ${FILESDIR}/gstsndio.* ${FILESDIR}/sndiosink.* \
 		${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio
 	@cd ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio && \
 		${LN} -s gstsndio.c gstbsdaudio.c && \
 		${LN} -s sndiosink.c bsdaudiosink.c
 # Pull Java dependencies from LOCALBASE
 	@${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/build.gradle ${WRKSRC}/buildSrc/build.gradle
 # Remove bundled libraries. We use the system's versions instead.
 	@cd ${WRKSRC}/modules/javafx.web/src/main/native/Source/ThirdParty && \
 		${RM} -r icu libxml libxslt sqlite
 	@${RM} -r ${WRKSRC}/modules/javafx.web/src/main/native/Source/WTF/icu
 	@cd ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/3rd_party && \
 		${RM} -r glib libffi
 
 do-configure:
 	@${MKDIR} ${WRKDIR}/gradle-home
 	@${ECHO_CMD} "NUM_COMPILE_THREADS = ${MAKE_JOBS_NUMBER}" > ${WRKSRC}/gradle.properties
 	@${ECHO_CMD} "JFX_DEPS_URL = ${WRKDIR}/jars" > ${WRKSRC}/gradle.properties
 .for prop in COMPILE_MEDIA COMPILE_WEBKIT AWT_TEST FULL_TEST
 	@${ECHO_CMD} "${prop} = ${${prop}:Ufalse}" >> ${WRKSRC}/gradle.properties
 .endfor
 	@${ECHO_CMD} "BSD.compileSWT = ${COMPILE_SWT:Ufalse};" >> ${WRKSRC}/buildSrc/bsd.gradle
 
 # the java doc are not installed on FreeBSD so exclude the javadoc task
 # as it'll fail otherwise
 do-build:
 	@cd ${WRKSRC} && ${_GRADLE_RUN} zips --exclude-task javadoc
 
 # it's not recommended to install openjfx inside openjdk directory
 do-install:
 	@${MKDIR} ${STAGEDIR}${_INSTALLDIR} \
 		${STAGEDIR}${_INSTALLDIR}/lib \
 		${STAGEDIR}${_INSTALLDIR}/jmods
 	${INSTALL_DATA} ${WRKSRC}/build/javafx-exports.zip ${STAGEDIR}${_INSTALLDIR}
 	(cd ${WRKSRC}/build/artifacts/javafx-sdk-14.0.2.1/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${_INSTALLDIR}/lib)
 	@${MV} ${STAGEDIR}${_INSTALLDIR}/lib/src.zip ${STAGEDIR}${_INSTALLDIR}/lib/javafx-src.zip
 	(cd ${WRKSRC}/build/artifacts/javafx-jmods-14.0.2.1 && ${COPYTREE_SHARE} . ${STAGEDIR}${_INSTALLDIR}/jmods)
 	@${FIND} ${STAGEDIR}${_INSTALLDIR}/lib -name '*.so' -exec ${STRIP_CMD} \{\} \;
 
 do-test-TEST-on:
 	@cd ${WRKSRC} && ${_GRADLE_RUN} check test
 
 .include <bsd.port.mk>
diff --git a/multimedia/arcan/Makefile b/multimedia/arcan/Makefile
index fb9de6eccd36..1579c2240068 100644
--- a/multimedia/arcan/Makefile
+++ b/multimedia/arcan/Makefile
@@ -1,115 +1,115 @@
 PORTNAME=	arcan
 DISTVERSION=	0.6.2.1
 CATEGORIES=	multimedia
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	9b807ac75c6f.patch:-p2 # https://github.com/letoram/arcan/issues/258
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Display Server, Multimedia Framework, Game Engine
 WWW=		https://arcan-fe.com/
 
 LICENSE=	BSD3CLAUSE GPLv2+ LGPL21+
 LICENSE_COMB=	multi
 LICENSE_FILE_BSD3CLAUSE=${WRKSRC:H}/data/distr/LICENSE.BSD
 LICENSE_FILE_GPLv2+ =	${WRKSRC:H}/data/distr/LICENSE.GPL
 LICENSE_FILE_LGPL21+ =	${WRKSRC:H}/data/distr/LICENSE.LGPL
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 		libfreetype.so:print/freetype2
 RUN_DEPENDS=	mesa-dri>0:graphics/mesa-dri
 
 USES=		cmake compiler:c11 gl iconv openal pkgconfig sqlite
 USE_GITHUB=	yes
 USE_GL=		egl gbm gl
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	letoram
 WRKSRC_SUBDIR=	src
 CMAKE_ON=	HYBRID_HEADLESS
 CMAKE_OFF=	STATIC_LIBUVC
 CMAKE_ARGS=	-DDISTR_TAG:STRING="portbld" \
 		-DENGINE_BUILDTAG:STRING="${DISTVERSIONFULL}"
 LDFLAGS+=	-Wl,--as-needed # bzip2, ffmpeg, librt, libutil, lzma, zlib
 LDFLAGS_i386=	-Wl,-z,notext
 
 OPTIONS_DEFINE=	ESPEAK FFMPEG LUAJIT MANPAGES SDL SUID TESSERACT UVC VLC VNC WAYLAND
 OPTIONS_DEFAULT=ESPEAK FFMPEG LUAJIT MANPAGES SDL SUID TESSERACT UVC VLC VNC WAYLAND
 OPTIONS_SUB=	yes
 
 ESPEAK_LIB_DEPENDS=	libespeak-ng.so:audio/espeak-ng
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 
-MANPAGES_USE=		RUBY=yes
+MANPAGES_USES=		ruby
 MANPAGES_VARS=		RUBY_NO_RUN_DEPENDS=yes
 
 LUAJIT_DESC=		Use LuaJIT instead of standard Lua
 LUAJIT_USES=		luajit
 LUAJIT_USES_OFF=	lua:51
 LUAJIT_CMAKE_BOOL_OFF=	DISABLE_JIT
 
 SDL_USES=		sdl
 SDL_USE=		SDL=sdl2
 SDL_CMAKE_BOOL=		HYBRID_SDL
 
 SUID_DESC=		setuid bit on "${PORTNAME}" binary
 SUID_PLIST_SUB=		MAYBE_SUID="@(,,4755) "
 SUID_PLIST_SUB_OFF=	MAYBE_SUID="@(,,0755) "
 
 TESSERACT_DESC=		Optical Character Recognition via Tesseract
 TESSERACT_LIB_DEPENDS=	libtesseract.so:graphics/tesseract
 
 VLC_DESC=		Video decode via libvlc
 VLC_LIB_DEPENDS=	libvlc.so:multimedia/vlc
 
 UVC_DESC=		USB video cameras via libuvc
 UVC_LIB_DEPENDS=	libuvc.so:multimedia/libuvc
 UVC_CMAKE_BOOL=		FSRV_DECODE_UVC
 
 VNC_DESC=		VNC client/server support
 VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
 
 WAYLAND_CATEGORIES=	wayland
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-server.so:graphics/wayland \
 			libxcb-icccm.so:x11/xcb-util-wm \
 			libxkbcommon.so:x11/libxkbcommon
 WAYLAND_RUN_DEPENDS=	xwayland-devel>0:x11-servers/xwayland-devel
 WAYLAND_USES=		xorg
 WAYLAND_USE=		XORG=xcb
 WAYLAND_CMAKE_BOOL_OFF=	DISABLE_WAYLAND
 
 post-patch:
 	@${REINPLACE_CMD} -i.prefix 's,/usr/local,${PREFIX},g' \
 		${WRKSRC:H}/doc/${PORTNAME}.1 \
 		${WRKSRC}/engine/arcan_vr.c \
 		${WRKSRC}/frameserver/decode/default/decode_av.c \
 		${WRKSRC}/frameserver/terminal/default/arcterm.c \
 		${WRKSRC}/frameserver/terminal/default/cli.c \
 		${WRKSRC}/frameserver/terminal/default/cli_builtin.c \
 		${WRKSRC}/platform/posix/paths.c \
 		${WRKSRC}/shmif/arcan_shmif_debugif.c
 
 pre-configure-MANPAGES-on:
 	@${RUBY} -C ${WRKSRC:H}/doc -Ku docgen.rb mangen 2>/dev/null
 
 post-patch-ESPEAK-off:
 	@${REINPLACE_CMD} -i.noespeak '/find.*Espeak/d' \
 		${WRKSRC}/frameserver/decode/default/CMakeLists.txt
 
 post-patch-FFMPEG-off:
 	@${REINPLACE_CMD} -i.noffmpeg '/pkg.*FFMPEG/d' \
 		${WRKSRC}/a12/CMakeLists.txt \
 		${WRKSRC}/frameserver/decode/default/CMakeLists.txt \
 		${WRKSRC}/frameserver/encode/default/CMakeLists.txt
 
 post-patch-TESSERACT-off:
 	@${REINPLACE_CMD} -i.notesseract '/pkg.*tesseract/d' \
 		${WRKSRC}/frameserver/encode/default/CMakeLists.txt
 
 post-patch-VNC-off:
 	@${REINPLACE_CMD} -i.novnc '/pkg.*libvnc/d' \
 		${WRKSRC}/frameserver/encode/default/CMakeLists.txt \
 		${WRKSRC}/frameserver/remoting/default/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/textproc/redland-bindings/Makefile b/textproc/redland-bindings/Makefile
index 87df73b49449..79dfdbd169e4 100644
--- a/textproc/redland-bindings/Makefile
+++ b/textproc/redland-bindings/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	redland-bindings
 PORTVERSION=	1.0.17.1
 PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://download.librdf.org/source/
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Language bindings for the Redland package
 WWW=		https://librdf.org/bindings/
 
 # Even though GPLv3 is not explicitly mentioned in the port's LICENSE.html, one
 # of its licenses is "GPLv2 or newer", which includes GPLv3.
 LICENSE=	APACHE20 GPLv2 GPLv3 LGPL21
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	librdf.so:textproc/redland \
 		libraptor2.so:textproc/raptor2 \
 		librasqal.so:textproc/rasqal
 
 GNU_CONFIGURE=	yes
 USES=		pkgconfig
 
 OPTIONS_DEFINE=	PHP PYTHON RUBY
 OPTIONS_DEFAULT=PYTHON
 OPTIONS_SUB=	yes
 
 PHP_CONFIGURE_WITH=	php
 PHP_USES=		php:build
 PYTHON_CONFIGURE_WITH=	python python-libext=${PYTHON_EXT_SUFFIX}.so
 PYTHON_USES=		python
 RUBY_CONFIGURE_WITH=	ruby
-RUBY_USE=		RUBY=yes
+RUBY_USES=		ruby
 
 .include <bsd.port.mk>