diff --git a/devel/compiz-bcop/Makefile b/devel/compiz-bcop/Makefile
index 35119b2e8d61..38fb057dfbcb 100644
--- a/devel/compiz-bcop/Makefile
+++ b/devel/compiz-bcop/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	compiz-bcop
 PORTVERSION=	0.8.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel x11-wm
 MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/ \
 		https://BSDforge.com/projects/source/devel/compiz-bcop/
 
 MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	Code generator for Compiz Fusion Plugins
 WWW=		https://forum.compiz-fusion.org/
 
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash \
-		${LOCALBASE}/bin/getopt:misc/getopt
+		${LOCALBASE}/bin/getopt:devel/util-linux
 
 GNU_CONFIGURE=	yes
 
 USES=		gnome pathfix pkgconfig tar:bzip2
 USE_GNOME=	libxslt
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|/bin/bash|${LOCALBASE}/bin/bash|' \
 		-e 's|getopt|${LOCALBASE}/bin/getopt|' \
 		${WRKSRC}/src/bcop.in
 
 .include <bsd.port.mk>
diff --git a/devel/gitflow/Makefile b/devel/gitflow/Makefile
index 8cb28da11fdd..8ee786beb94a 100644
--- a/devel/gitflow/Makefile
+++ b/devel/gitflow/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	gitflow
 PORTVERSION=	1.12.3
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	nbari@tequila.io
 COMMENT=	Git extensions to provide high-level repository operations
 WWW=		https://github.com/petervanderdoes/gitflow-avh
 
 LICENSE=	BSD2CLAUSE LGPL21
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	${LOCALBASE}/bin/getopt:misc/getopt
+RUN_DEPENDS=	${LOCALBASE}/bin/getopt:devel/util-linux
 
 USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	petervanderdoes
 GH_PROJECT=	${PORTNAME}-avh
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 MAKE_ARGS=	prefix=${STAGEDIR}${PREFIX}
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-install:
 	${MV} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/french/aster/Makefile b/french/aster/Makefile
index 7e7938e04fb2..2ed680e509b0 100644
--- a/french/aster/Makefile
+++ b/french/aster/Makefile
@@ -1,432 +1,432 @@
 PORTNAME=	aster
 DISTVERSION=	${ASTER_DISTVERSION}
 PORTREVISION=	11
 CATEGORIES=	french cad
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Code_Aster finite element method solver
 WWW=		http://www.code-aster.org/
 
 LICENSE=	GPLv2
 
 NOT_FOR_ARCHS=		armv6 armv7 i386 mips powerpc
 NOT_FOR_ARCHS_REASON=	ARG_MAX is too small for Code_Aster on 32 bits systems
 
 BROKEN=	fails to build the catalog of elements
 
 #-----------------------------------------------------------------------
 # You may define these options:
 #
 # - WITH_ZSH or WITH_BASH or WITH_KSH: select a shell among
 #			zsh (default), bash or ksh;
 # - WITH_ED: select an editor accepting '-display' (e.g. gvim, nedit);
 # - WITHOUT_ASTK_CLI: won't use the GUI from this machine;
 # - WITHOUT_GMSH: don't install GMSH (a mesh generator);
 # - WITHOUT_GRACE: don't install Grace (used to create 2D graph);
 # - WITH_MUMPS: install the interface between Code_Aster and MUMPS (experimental)
 #
 #-----------------------------------------------------------------------
 
 BUILD_DEPENDS+=	astk-serveur>0:cad/astk-serveur	\
 		${SHELL_INSTALL_ASTER}:shells/${SHIADEP}	\
 		gnproc:sysutils/coreutils			\
 		bash:shells/bash				\
-		getopt>0:misc/getopt				\
+		${LOCALBASE}/bin/getopt:devel/util-linux	\
 		xterm:x11/xterm					\
 		${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}
 #		pylupdate5:textproc/py-qt5-xml
 LIB_DEPENDS+=	libhdf5-110.so:science/hdf5-110			\
 		libscotch.so:cad/scotch				\
 		libmetis.so:math/metis				\
 		libmed.so:french/med				\
 		libAsterInterface.so:science/tfel-edf
 RUN_DEPENDS+=	${SHELL_INSTALL_ASTER}:shells/${SHIADEP}	\
 		astk-serveur>0:cad/astk-serveur			\
 		xterm:x11/xterm					\
 		${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}
 
 USES=		bison blaslapack:openblas fortran gettext python qt:5 tk
 USE_BINUTILS=	yes
 USE_QT=		linguisttools:build
 
 #CONFLICTS_BUILD=${PYTHON_PKGNAMEPREFIX}cysignals-1.*
 
 HAS_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include/hdf5-110
 MAKE_ENV=	INCLUDES="${LOCALBASE}/include"	\
 		INCLUDEDIR="${LOCALBASE}/include"	\
 		LD_PRELOAD="${LOCALBASE}/lib/gcc${_GCC_VER}/libgcc_s.so.1"	\
 		PYTHONPATH="${PYTHON_SITELIBDIR}:${LOCALBASE}/aster/ASTK/ASTK_SERV"	\
 		PYTHONIOENCODING="utf-8" LANG=C LC_ALL="en_US.UTF-8"	\
 		LINKFLAGS="${LDFLAGS}" LD_LIBRARY_PATH="${LOCALBASE}/lib/gcc${_GCC_VER}"
 REINPLACE_ARGS=	-i ""
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 VER=		${PORTVERSION:R}
 VE=		${VER:R}
 WRKSRC=		${WRKDIR}/${PORTNAME}-full-src-${VER}
 
 PLIST_SUB=	VE=${VE}
 .if defined(WITHOUT_ASTK_CLI)
 SUB_FILES=	pkg-message.sans-astk
 .else
 SUB_FILES=	pkg-message
 .endif
 SUB_LIST=	tools_dir=${tools_dir}
 
 INTERACTIVE_SCRIPTS=	check_compilers.py setup.py
 
 .include "${.CURDIR}/../../french/aster/bsd.aster.mk"
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
 FLAGARCH=	-DP_LINUX -DLINUX
 .else
 FLAGARCH=	-DLINUX64
 .endif
 
 .if defined(WITH_DEBUG)
 DEBUG_FLAGS=	--debug
 CFLAGS+=	-D__DEBUG_ALLOCATE__
 FFLAGS+=	-D__DEBUG_ALLOCATE__
 MAKE_ENV+=	FCFLAGS="-g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH}"
 .else
 MAKE_ENV+=	FCFLAGS="${FFLAGS} -fno-tree-dse ${FLAGARCH}"
 .endif
 
 .if !defined(WITHOUT_ASTK_CLI)
 RUN_DEPENDS+=	astk-client>0:cad/astk-client
 PLIST_SUB+=	ASTK_CLIENT=""  ASTKDIR=${ASTKDIR}
 .else
 PLIST_SUB+=	ASTK_CLIENT="@comment " ASTKDIR=""
 .endif
 .if !defined(WITHOUT_GMSH)
 RUN_DEPENDS+=	${LOCALBASE}/bin/gmsh:cad/gmsh
 PLIST_SUB+=	GMSH=""
 .else
 PLIST_SUB+=	GMSH="@comment "
 .endif
 .if !defined(WITHOUT_GRACE)
 RUN_DEPENDS+=	xmgrace:math/grace
 PLIST_SUB+=	GRACE=""
 .else
 PLIST_SUB+=	GRACE="@comment "
 .endif
 .if defined(WITH_BOOST)
 LIB_DEPENDS+=	${PY_BOOST}
 .endif
 
 .if !defined(WITH_MPI)
 MPISEQ=		-lmpiseq
 MUMPSLIB=	-L${LOCALBASE}/lib -ldmumps -lzmumps -lsmumps -lcmumps -lmumps_common -lpord ${MPISEQ}
 LIB_DEPENDS+=	libmpiseq.so.5:math/mumps
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libscalapack.a:math/scalapack
 MUMPSLIB=	-L${LOCALBASE}/lib -ldmumps -lzmumps -lsmumps -lcmumps -lmumps_common -lpord -lscalapack -lexecinfo -L${LOCALBASE}/lib -lmpi
 LIB_DEPENDS+=	libcmumps.so.5:math/mumps
 .endif
 
 .if defined(WITH_MPI)
 LIB_DEPENDS+=	libmpi.so:net/mpich
 HOME_MPI=	${LOCALBASE}
 .endif
 
 .if defined(WITH_ZSH)
 SHIA=		zsh
 .elif defined(WITH_BASH)
 SHIA=		bash
 .elif defined(WITH_KSH)
 SHIA=		ksh93
 .elif exists(${LOCALBASE}/bin/zsh)
 SHIA=		zsh
 .elif exists(${LOCALBASE}/bin/bash)
 SHIA=		bash
 .elif exists(${LOCALBASE}/bin/ksh93)
 SHIA=		ksh93
 .else
 SHIA=		zsh
 .endif
 SHIADEP=	${SHIA}
 
 .if !defined(WITH_ED)
 . if exists(${LOCALBASE}/bin/nedit)
 WITH_ED=	nedit
 RUN_DEPENDS+=	${LOCALBASE}/bin/nedit:editors/nedit
 . elif exists(${LOCALBASE}/bin/gvim)
 WITH_ED=	gvim
 RUN_DEPENDS+=	${LOCALBASE}/bin/gvim:editors/vim
 . elif exists(${LOCALBASE}/bin/emacs)
 WITH_ED=	emacs
 RUN_DEPENDS+=	${LOCALBASE}/bin/emacs:editors/emacs
 . elif exists(${LOCALBASE}/bin/gedit)
 WITH_ED=	gedit
 RUN_DEPENDS+=	${LOCALBASE}/bin/gedit:editors/gedit
 . elif exists(${LOCALBASE}/bin/xedit)
 WITH_ED=	xedit
 RUN_DEPENDS+=	${LOCALBASE}/bin/xedit:x11/xedit
 . else
 WITH_ED=	vi
 . endif
 .endif
 
 INST_DAT=	elements
 INST_SH=	as_run parallel_cp
 PFX2FIX=	bin/as_run etc/codeaster/aster etc/codeaster/profile.sh	\
 		${VE}/aster.conf ${VE}/lib/aster/aster_pkginfo.py	\
 		${VE}/share/aster/CTestTestfile.cmake			\
 		${VE}/include/aster/asterf_config.h			\
 		${VE}/include/aster/asterc_config.h			\
 		${VE}/share/aster/execute_codeaster			\
 		${VE}/share/aster/config.txt ${VE}/share/aster/profile.sh
 POSTPY2FIX=	post-patch-waf.engine post-patch-data__post_install
 POSTBASH2FIX=	execute_codeaster create_install_script
 inst_dir=	${PREFIX}/${PORTNAME}
 tools_dir=	${PREFIX}/${PORTNAME}/outils
 tools=		cmpfillin gpmetis graphchk m2gmetis mpmetis ndmetis gnuplot
 .if !defined(WITHOUT_GMSH)
 tools+=		gmsh
 .endif
 .if !defined(WITHOUT_GRACE)
 tools+=		gracebat xmgrace
 .endif
 v_ifdef=	${OPSYS:tu}
 SHELL_INSTALL_ASTER=	${LOCALBASE}/bin/${SHIA}
 tcl_dir=	${LOCALBASE}
 hdf_dir=	${LOCALBASE}
 lib_math=	"-L${LOCALBASE}/lib ${BLASLIB} ${LAPACKLIB} -lscotch -lscotcherr"
 
 LASTKDIR?=	${PORTNAME}/ASTK/ASTK_CLIENT
 ASTKDIR=	${LOCALBASE}/${LASTKDIR}
 
 BASH2RC=	products_data.py
 
 ExportPATH?=	/tmp/maillages
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|PREFER_SHARED_LIBS=False|PREFER_SHARED_LIBS=True|'	\
 		-e 's|/opt/aster|${STAGEDIR}${inst_dir}|' ${WRKSRC}/setup.cfg
 	${REINPLACE_CMD} -e 's|?ASTER_ROOT?|${STAGEDIR}${inst_dir}|'	\
 		${WRKSRC}/products.py
 	${REINPLACE_CMD} -e "s|'gfortran'|'${FC}'|g;s|'gcc'|'${CC}'|g"	\
 		-e "s|'g++'|'${CXX}'|g" ${WRKSRC}/check_compilers.py
 	${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|"		\
 		-e "s|%%PYTHON_CMD%%|${PYTHON_CMD}|"			\
 		-e "s|%%WRKDIR%%|${WRKDIR}|" ${WRKSRC}/as_setup.py
 .for sh in ${BASH2RC}
 	${REINPLACE_CMD} -e 's|/bin/bash|${SHELL_INSTALL_ASTER}|' ${WRKSRC}/${sh}
 .endfor
 	${REINPLACE_CMD} -e 's|%%PYTHON_ABIVER%%|${PYTHON_ABIVER}|' ${WRKSRC}/setup.py
 	${ECHO_CMD} "_install_hdf5 = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_med = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_tcl = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_tk  = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_Pmw = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_Numeric = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_gmsh = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_gmsh2 = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_gibi = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_grace = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "XMGRACE = 'xmgrace'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_homard = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_eficas = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_astk = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_astk_serv = False"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_metis = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_mfront = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_mumps = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_omniORB = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_omniORBpy = False"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_pylotage = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_crpcrs = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_aster_Linux = False"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_scotch  = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "OPT_ENV = 'verbose=True'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "PYTHONPATH = '${PYTHON_SITELIBDIR}:${LOCALBASE}/aster/ASTK/ASTK_SERV'"\
 			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "PYTHON_INCLUDE = '${PYTHON_INCLUDEDIR}'"	>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_PYTHON = '${PYTHONBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "PYTHON_EXE = '${PYTHON_CMD}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_SCOTCH = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_METIS = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_GMSH = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_GIBI = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_HOMARD = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "INCLUDEDIR = ['${LOCALBASE}/include/hdf5-110', '${LOCALBASE}/include', '${LOCALBASE}/include/metis', ]"\
 			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_MUMPS = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_MFRONT = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "MUMPSLIB = '${MUMPSLIB}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CC='${CC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "gcc='${CC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CXX='${CXX}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "LD='${FC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "F90='${FC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "MATHLIB='${lib_math} ${LDFLAGS} -lgfortran -lm -lkvm'"		\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "OTHERLIB='-Xlinker -export-dynamic ${MPISEQ} -lc++ -lexecinfo -lutil -lpthread -lz'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "SYSLIB='-lpthread -lz'"			>> ${WRKSRC}/setup.cfg
 .if defined(WITH_MPI)
 	${ECHO_CMD} "HOME_MPI = '${HOME_MPI}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "MPIRUN = 'mpirun'"				>> ${WRKSRC}/setup.cfg
 .else
 	${ECHO_CMD} "HOME_MPI = ''"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "MPIRUN = ''"				>> ${WRKSRC}/setup.cfg
 .endif
 	${ECHO_CMD} "HOME_ZMAT = ''"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_HDF='${hdf_dir}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_MED='${LOCALBASE}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_TCL_TK='${tcl_dir}'"			>> ${WRKSRC}/setup.cfg
 .if defined(WITH_BOOST)
 	${ECHO_CMD} "HOME_BOOST='${LOCALBASE}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "LIBPATH_BOOST='${LOCALBASE}/lib'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "LIBNAME_BOOST='${PY_BOOST_LIB}'"		>> ${WRKSRC}/setup.cfg
 .endif
 	${ECHO_CMD} "BLASLIB='${_BLASLIB}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "LAPACKLIB='lapack'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "GZIP='/usr/bin/gzip'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "SHELL_EXECUTION='${SHELL_INSTALL_ASTER}'"	>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "TERMINAL='xterm'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "EDITOR='${WITH_ED}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CXXFLAGS='${CXXFLAGS}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CXXFLAGS_DBG='${CXXFLAGS:C|-O2|--debug|}'"	>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "LDFLAGS='${LDFLAGS}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "FFLAGS='-c ${FFLAGS} -fno-tree-dse ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "FFLAGS_DBG='-c -g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 .if defined(WITH_MPI)
 	${ECHO_CMD} "F90FLAGS='-c ${FFLAGS} -fno-tree-dse ${FLAGARCH} -I${HOME_MPI}/include'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "F90FLAGS_DBG='-c -g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH} -I${HOME_MPI}/include'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CFLAGS='-c ${CFLAGS} ${FLAGARCH} -I${HOME_MPI}/include'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe ${FLAGARCH} -I${HOME_MPI}/include'"	\
 		>> ${WRKSRC}/setup.cfg
 .else
 	${ECHO_CMD} "F90FLAGS='-c ${FFLAGS} -fno-tree-dse ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "F90FLAGS_DBG='-c -g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CFLAGS='-c ${CFLAGS} ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 .endif
 .for is in ${INTERACTIVE_SCRIPTS}
 	${REINPLACE_CMD} -e '/should_continue()/d'		\
 		${WRKSRC}/${is}
 .endfor
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 
 do-configure:
 	(cd ${CONFIGURE_WRKSRC}	\
 	&& TMPDIR=${WRKDIR} ${MAKE_ENV} ${PYTHON_CMD} setup.py ${DEBUG_FLAGS}	\
 		--prefix=${STAGEDIR}${inst_dir} test | tee ${CONFIGURE_LOG})
 	@${ECHO_MSG} "---------------- Debug ------------------"
 	${CAT} ${CONFIGURE_WRKSRC}/setup.log
 	@${ECHO_MSG} "------------ Fin debug ------------------"
 
 post-configure:
 	${MKDIR} ${STAGEDIR}${inst_dir}/etc
 	${CP} -R ${LOCALBASE}/aster/etc/codeaster ${STAGEDIR}${inst_dir}/etc/
 	${ECHO_CMD} "#?vers : VVV?" >> ${STAGEDIR}${inst_dir}/etc/codeaster/aster
 	${CP} -R ${LOCALBASE}/aster/ASTK/ASTK_SERV/bin		\
 		${LOCALBASE}/aster/ASTK/ASTK_SERV/asrun		\
 		${LOCALBASE}/aster/ASTK/ASTK_SERV/share		\
 		${STAGEDIR}${inst_dir}
 	${REINPLACE_CMD} -e 's|${LOCALBASE}/aster|${STAGEDIR}${inst_dir}|'	\
 		${STAGEDIR}${inst_dir}/bin/as_run
 	${MV} ${STAGEDIR}${inst_dir}/etc/codeaster/profile_astk.sh	\
 		${STAGEDIR}${inst_dir}/etc/codeaster/profile.sh
 .for sf in etc/codeaster/profile.sh asrun/installation.py
 	${REINPLACE_CMD} -e 's|${LOCALBASE}/aster/ASTK/ASTK_SERV|${STAGEDIR}${inst_dir}|g'	\
 		-e 's|${LOCALBASE}/aster|${STAGEDIR}${inst_dir}|g'	\
 		${STAGEDIR}${inst_dir}/${sf}
 .endfor
 
 pre-build:
 	${MKDIR} ${WRKDIR}/post_patches
 	${CP} ${FILESDIR}/post-patch-* ${WRKDIR}/post_patches/
 .for pp in ${POSTPY2FIX}
 	${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' ${WRKDIR}/post_patches/${pp}
 .endfor
 
 do-build:
 	(cd ${BUILD_WRKSRC} &&	\
 	TMPDIR=${WRKDIR} ${MAKE_ENV} ${PYTHON_CMD} setup.py ${DEBUG_FLAGS} install aster	\
 		--prefix=${STAGEDIR}${inst_dir} | tee ${BUILD_WRKSRC}/build.log)
 
 do-install:
 	# build: already did the installation
 	@${DO_NADA}
 
 post-install:
 .for f in ${PFX2FIX}
 	${REINPLACE_CMD} -e 's|${STAGEDIR}||g' ${STAGEDIR}${inst_dir}/${f}
 .endfor
 .for f in ${POSTBASH2FIX}
 	${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|'	\
 		${STAGEDIR}${inst_dir}/${VE}/share/aster/${f}
 .endfor
 	${REINPLACE_CMD} -e 's|LINUX64|LINUX64, FREEBSD|'	\
 		${STAGEDIR}${inst_dir}/asrun/core/default_configuration.py
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py	\
 		-d ${PREFIX} -f ${inst_dir:S|${PREFIX}/||})
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py	\
 		-d ${PREFIX} -f ${inst_dir:S|${PREFIX}/||})
 	${CP} -p ${STAGEDIR}${inst_dir}/${VE}/bin/aster					\
 		${STAGEDIR}${inst_dir}/${VE}/bin/asterd
 	${STRIP_CMD} ${STAGEDIR}${inst_dir}/${VE}/bin/aster
 	${SED} -e 's|%%VER%%|${VE}|' < ${FILESDIR}/astout.export	\
 		> ${STAGEDIR}${inst_dir}/${VE}/astout.export
 	(cd ${STAGEDIR}${inst_dir} &&	\
 		${LN} -fs ${VE} ${STAGEDIR}${inst_dir}/STA${VE})
 .for conf in config.txt profile.sh
 	(cd ${STAGEDIR} && ${LN} -fs ${inst_dir}/${VE}/share/aster/${conf}	\
 		${STAGEDIR}${inst_dir}/STA${VE}/${conf})
 .endfor
 	${MKDIR} ${STAGEDIR}${tools_dir}
 .for outil in ${tools}
 	${LN} -fs ${LOCALBASE}/bin/${outil} ${STAGEDIR}${tools_dir}/${outil}
 .endfor
 .if !defined(WITHOUT_ASTK_CLI)
 	${MKDIR} ${STAGEDIR}${PREFIX}/aster/ASTK/ASTK_SERV/etc/codeaster/astkrc
 	${LN} -fs ${ASTKDIR}/etc/astkrc/*	\
 		${STAGEDIR}${PREFIX}/aster/ASTK/ASTK_SERV/etc/codeaster/astkrc
 . for outil in astk bsf
 	${LN} -fs ${ASTKDIR}/bin/${outil} ${STAGEDIR}${tools_dir}/${outil}
 . endfor
 .endif
 	${MKDIR} ${WRKDIR}/AvoidConflictWithASTK
 .for f in aster.install_${VE} profile.sh
 	${MV} ${STAGEDIR}${inst_dir}/etc/codeaster/${f} ${WRKDIR}/AvoidConflictWithASTK/
 .endfor
 	${RM} -r ${STAGEDIR}${inst_dir}/etc/codeaster/*
 .for f in aster.install_${VE} profile.sh
 	${MV} ${WRKDIR}/AvoidConflictWithASTK/${f} ${STAGEDIR}${inst_dir}/etc/codeaster/
 .endfor
 .for f in aster_pkginfo.cpython-${PYTHON_SUFFIX}.pyc aster_pkginfo.cpython-${PYTHON_SUFFIX}.opt-1.pyc
 	${RM} ${STAGEDIR}${inst_dir}/${VE}/lib/aster/__pycache__/${f}
 .endfor
 	${FIND} ${STAGEDIR}${PREFIX} -name "*.bak" -delete
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
 	@${ECHO_MSG} "Note: homard must be installed to run some steps succesfully."
 	${MKDIR} ${ExportPATH}
 	${CP} ${inst_dir}/${VE}/astout.export /tmp/
 	(cd ${inst_dir}/${VE} &&	\
 	${LOCALBASE}/aster/bin/as_run --list --all --vers=${VE}	\
 		--filter='"I" not in testlist' -o /tmp/list_seq )
 	(cd /tmp &&	\
 	${LOCALBASE}/aster/bin/as_run astout.export) || ${TRUE}
 	@${ECHO_MSG} "Check /tmp/resu_test/NOOK"
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile
index 61eb94737fd4..5bad4688bab7 100644
--- a/math/eukleides/Makefile
+++ b/math/eukleides/Makefile
@@ -1,60 +1,60 @@
 PORTNAME=	eukleides
 PORTVERSION=	1.5.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 MASTER_SITES=	http://www.eukleides.org/files/
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Euclidean geometry drawing language
 WWW=		http://www.eukleides.org/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	pstoedit:graphics/pstoedit \
-		getopt>=0:misc/getopt
+		${LOCALBASE}/bin/getopt:devel/util-linux
 
 USES=		bison gettext iconv gmake readline tar:bzip2 tex
 USE_TEX=	latex
 INSTALL_TARGET=	install PREFIX=${STAGEDIR}${PREFIX}
 
 # Fix build with clang11
 CFLAGS+=	-fcommon
 
 PORTDOCS=	de.pdf fr.pdf
 PORTEXAMPLES=	greenwich.euk sundial.euk vonkoch.euk
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 DOCS_USES=	makeinfo
 DOCS_USE=	TEX=pdftex:build
 DOCS_INFO=	eukleides
 
 post-patch:
 	@${GREP} -lR "#!/bin/bash" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
 		's|#!/bin/bash|#!/bin/sh|g'
 	@${GREP} -lR "ginstall-info" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
 		's|ginstall-info|install-info|g'
 	@${EGREP} -lR "%%[[:alpha:]]+%%" ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \
 		 -e "s|%%PREFIX%%|${PREFIX}|g" \
 		 -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		 -e "s|%%EXAMPLESDIR%%|\$${PREFIX}/${EXAMPLESDIR_REL}|g" \
 		 -e "s|%%DOCSDIR%%|\$${PREFIX}/${DOCSDIR_REL}|g" \
 		 -e "s|%%CFLAGS%%|${CFLAGS}|g"
 	@${GREP} -lFR "gcc" ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \
 		-e "s|gcc|${CC}|g"
 
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e '/^install:/ s/install_doc//g' \
 		 -e '/^all:/ s/doc//g' ${WRKSRC}/Makefile
 
 post-patch-EXAMPLES-off:
 	@${REINPLACE_CMD} -e 's/install_exm$$//g' ${WRKSRC}/Makefile
 
 pre-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/bin/*.bak*
 
 .include <bsd.port.mk>
diff --git a/net/pacemaker2/Makefile b/net/pacemaker2/Makefile
index f06b987a6024..249cadf0c946 100644
--- a/net/pacemaker2/Makefile
+++ b/net/pacemaker2/Makefile
@@ -1,30 +1,30 @@
 PORTVERSION=		2.1.7
-PORTREVISION=		1
+PORTREVISION=		2
 PKGNAMESUFFIX=		2
 
 WWW=		https://www.clusterlabs.org/pacemaker/
 
 .include "${.CURDIR}/Makefile.common"
 
 CONFIGURE_ARGS+=	--with-noarch-pkgconfigdir=${PREFIX}/libdata/pkgconfig
 
 LIB_DEPENDS+=		libffi.so:devel/libffi \
 	libgmp.so:math/gmp \
 	libhogweed.so:security/nettle \
 	libidn2.so:dns/libidn2 \
 	libnettle.so:security/nettle \
 	libp11-kit.so:security/p11-kit \
 	libpcre.so:devel/pcre \
 	libtasn1.so:security/libtasn1 \
 	libunistring.so:devel/libunistring
 
 USES+=	gettext
 
 SHEBANG_FILES+=	agents/ocf/*
 
 post-patch: post-patch-common
 
 post-install:
 	${RM} ${STAGEDIR}/${PREFIX}/etc/rc.d/pacemaker_remote
 
 .include <bsd.port.mk>
diff --git a/net/pacemaker2/Makefile.common b/net/pacemaker2/Makefile.common
index 434f980a4bf8..e304d4372a14 100644
--- a/net/pacemaker2/Makefile.common
+++ b/net/pacemaker2/Makefile.common
@@ -1,92 +1,92 @@
 PORTNAME=		pacemaker
 DISTVERSIONPREFIX=	Pacemaker-
 CATEGORIES=		net
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Scalable High-Availability cluster resource manager
 
 LICENSE=		GPLv2
 LICENSE_FILE=		${WRKSRC}/COPYING
 
 BUILD_DEPENDS=		bash:shells/bash \
-			getopt>=0:misc/getopt
-LIB_DEPENDS=		libgnutls.so:security/gnutls \
+			${LOCALBASE}/bin/getopt:devel/util-linux \
+LIB_DEPENDS=		libgnutls.so:security/gnutls
 			libltdl.so:devel/libltdl \
 			libqb.so:devel/libqb \
 			libuuid.so:misc/e2fsprogs-libuuid \
 			libxml2.so:textproc/libxml2 \
 			libxslt.so:textproc/libxslt
 RUN_DEPENDS=		bash:shells/bash \
-			getopt>=0:misc/getopt \
+			${LOCALBASE}/bin/getopt:devel/util-linux \
 			ocf-tester:net-mgmt/resource-agents
 
 CONFLICTS=		heartbeat
 
 USERS=			hacluster
 GROUPS=			haclient
 
 USE_GITHUB=		yes
 GH_ACCOUNT=		ClusterLabs
 GH_PROJECT=		pacemaker
 
 USES=			autoreconf:2.69 corosync cpe gmake gnome libtool \
 			ncurses pathfix pkgconfig python shebangfix
 CPE_VENDOR=		clusterlabs
 USE_BINUTILS=		yes
 USE_GNOME=		glib20
 USE_LDCONFIG=		yes
 USE_PYTHON=		py3kplist
 USE_RC_SUBR=		${PORTNAME}
 GNU_CONFIGURE=		yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=		--disable-dependency-tracking \
 			--disable-fatal-warnings \
 			--disable-hardening \
 			--with-corosync \
 			--without-heartbeat
 CONFIGURE_ENV=		BASH_PATH=${LOCALBASE}/bin/bash
 LDFLAGS+=		-B${LOCALBASE}/bin
 
 INSTALL_TARGET=		install-strip
 TEST_TARGET=		check
 
 PATHFIX_MAKEFILEIN=	Makefile.am
 
 SHEBANG_LANG=		sh
 sh_OLD_CMD=		${SH}
 sh_CMD=			${LOCALBASE}/bin/bash
 
 OPTIONS_DEFINE=		DBUS DOCS MANPAGES SNMP
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=		yes
 
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_VARS_OFF=		REPLACE_ARGS_DBUS="-e 's/HAVE_dbus=1/HAVE_dbus=0/'"
 
 DOCS_BUILD_DEPENDS=	asciidoc:textproc/asciidoc
 
 MANPAGES_BUILD_DEPENDS=	docbook-xsl>0:textproc/docbook-xsl \
 			help2man:misc/help2man \
 			xsltproc:textproc/libxslt
 
 SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_WITH=	snmp
 SNMP_USES=		ssl
 
 REPLACE_CMD_ARGS=	-e 's,/usr/lib/ocf,${PREFIX}/lib/ocf,' \
 			${REPLACE_ARGS_DBUS}
 
 # python default version must be set to 2.7 to generate a
 # correct pkg-plist
 maintainer-plist: stage
 	@${MAKE} makeplist \
 	| ${SED} -e '/^\/you/d' \
 		-e '/^etc\/rc.d\/pacemaker/d' \
 		-e 's,^man,%%MANPAGES%%man,g' \
 		-e 's,%%PYTHON_VER%%,2.7,g' \
 		-e 's,^@dir \/var\/lib\/pacemaker\/\(.*\),@dir(\,haclient\,770) \/var\/lib\/pacemaker\/\1,g' \
 		-e 's,^@dir \/var\/log\/pacemaker\(.*\),@dir(\,haclient\,770) \/var\/log\/pacemaker\1,g' \
 	> pkg-plist
 
 post-patch-common:
 	@${REINPLACE_CMD} ${REPLACE_CMD_ARGS} ${WRKSRC}/configure.ac
diff --git a/sysutils/password-store/Makefile b/sysutils/password-store/Makefile
index 35cde8172da5..bc2635a9c0a9 100644
--- a/sysutils/password-store/Makefile
+++ b/sysutils/password-store/Makefile
@@ -1,73 +1,73 @@
 PORTNAME=	password-store
 PORTVERSION=	1.7.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils
 MASTER_SITES=	https://git.zx2c4.com/${PORTNAME}/snapshot/
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Stores, retrieves, generates, and synchronizes passwords securely
 WWW=		https://www.passwordstore.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	bash:shells/bash \
-		getopt>=0:misc/getopt \
+		${LOCALBASE}/bin/getopt:devel/util-linux \
 		gnupg>=2:security/gnupg \
 		tree>=1.7:sysutils/tree
 
 USES=		tar:xz
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=		CONTRIB EXAMPLES GIT XCLIP WAYLAND QRENCODE
 OPTIONS_DEFAULT=	CONTRIB XCLIP
 OPTIONS_SUB=		yes
 
 GIT_DESC=		Enable git storage
 XCLIP_DESC=		Enable xclip feature
 WAYLAND_DESC=		Enable wl-clipboard support
 CONTRIB_DESC=		Include shell completions, import scripts, related projects
 QRENCODE_DESC=		Enable QR code support
 
 GIT_RUN_DEPENDS=	git>=0:devel/git
 XCLIP_RUN_DEPENDS=	xclip>=0:x11/xclip
 CONTRIB_RUN_DEPENDS=	pwgen>=0:sysutils/pwgen
 QRENCODE_RUN_DEPENDS=	libqrencode>=0:graphics/libqrencode
 WAYLAND_RUN_DEPENDS=	wl-clipboard>=0:x11/wl-clipboard
 
 SUB_FILES=		pass
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -Ee 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/src/platform/freebsd.sh
 	@${REINPLACE_CMD} -Ee 's|^SYSTEM_EXTENSION_DIR=""|SYSTEM_EXTENSION_DIR="${PREFIX}/libexec/${PORTNAME}/extensions"|g' \
 		${WRKSRC}/src/${PORTNAME}.sh
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/pass ${STAGEDIR}${PREFIX}/bin/
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/extensions
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/platform
 	${INSTALL_SCRIPT} ${WRKSRC}/src/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/pass
 	${INSTALL_SCRIPT} ${WRKSRC}/src/platform/freebsd.sh ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/platform/
 	${INSTALL_MAN} ${WRKSRC}/man/pass.1 ${STAGEDIR}${PREFIX}/share/man/man1/pass.1
 
 do-install-CONTRIB-on:
 	@${RM} ${WRKSRC}/contrib/emacs/.gitignore
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	(cd ${WRKSRC}/src/completion && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${STAGEDIR}${DATADIR}/pass.zsh-completion ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_pass
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${STAGEDIR}${DATADIR}/pass.bash-completion ${STAGEDIR}${PREFIX}/etc/bash_completion.d/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions
 	${INSTALL_DATA} ${STAGEDIR}${DATADIR}/pass.fish-completion ${STAGEDIR}${PREFIX}/share/fish/completions/${PORTNAME}.fish
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/man/example-filter.sh ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/tartarus/Makefile b/sysutils/tartarus/Makefile
index a97119e44466..f69bfc909eca 100644
--- a/sysutils/tartarus/Makefile
+++ b/sysutils/tartarus/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	tartarus
 PORTVERSION=	0.9.8
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	sysutils
 MASTER_SITES=	http://wertarbyte.de/tartarus/ \
 		https://ftp.sk.FreeBSD.org/pub/FreeBSD/local/distfiles/
 
 MAINTAINER=	otis@FreeBSD.org
 COMMENT=	Wrappers around common Unix tools for simplified backup solution
 WWW=		https://wertarbyte.de/tartarus.shtml
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash \
 		${LOCALBASE}/bin/gtar:archivers/gtar \
 		${LOCALBASE}/bin/curl:ftp/curl \
-		${LOCALBASE}/bin/getopt:misc/getopt
+		${LOCALBASE}/bin/getopt:devel/util-linux
 
 USES=		gmake perl5 shebangfix tar:bzip2
 SHEBANG_FILES=	${WRKSRC}/bin/*
 
 do-install:
 	cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} charon charon.ftp charon.local \
 		charon.pipe orpheus tartarus ${STAGEDIR}${PREFIX}/bin
 	cd ${WRKSRC}/lib && ${COPYTREE_SHARE} Tartarus ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 	cd ${WRKSRC}/man && ${INSTALL_MAN} charon.ftp.1 charon.local.1 \
 		charon.pipe.1 tartarus.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL} -lrs ${STAGEDIR}${PREFIX}/share/man/man1/charon.ftp.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1/charon.1
 
 .include <bsd.port.mk>
diff --git a/textproc/rarian/Makefile b/textproc/rarian/Makefile
index e6335abe3abf..412019de0593 100644
--- a/textproc/rarian/Makefile
+++ b/textproc/rarian/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	rarian
 DISTVERSION=	0.8.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	textproc gnome
 MASTER_SITES=	https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/-/releases/${DISTVERSION}/downloads/assets/
 
 MAINTAINER=	truckman@FreeBSD.org
 COMMENT=	OMF help system based on the Freedesktop specification
 WWW=		https://rarian.freedesktop.org/
 
 LICENSE=	GPLv2+ LGPL21+ ZLIB
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING.UTILS
 LICENSE_FILE_LGPL21+ =	${WRKSRC}/COPYING.LIB
 LICENSE_FILE_ZLIB=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/getopt:misc/getopt \
+BUILD_DEPENDS=	${LOCALBASE}/bin/getopt:devel/util-linux \
 		bash:shells/bash \
 		xsltproc:textproc/libxslt \
 		docbook-xml>0:textproc/docbook-xml \
 		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl
 LIB_DEPENDS=	libtinyxml.so:textproc/tinyxml
-RUN_DEPENDS=	${LOCALBASE}/bin/getopt:misc/getopt \
+RUN_DEPENDS=	${LOCALBASE}/bin/getopt:devel/util-linux \
 		bash:shells/bash \
 		xsltproc:textproc/libxslt \
 		docbook-xml>0:textproc/docbook-xml \
 		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl
 
 USES=		gmake libtool localbase pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--with-convert-dir=${LOCALBASE}/share/omf \
 		--with-default-data-dirs="${LOCALBASE}/share:/usr/share" \
 		--with-default-infopath="${LOCALBASE}/info:${LOCALBASE}/share/info" \
 		--with-default-manpath="/usr/share/man:${LOCALBASE}/share/man:${LOCALBASE}/man" \
 		--with-gnu-getopt=${LOCALBASE}/bin/getopt \
 		--with-localstate-subdir=db/rarian \
 		--with-metadata-dir=${DOCSDIR}
 
 INSTALL_TARGET=	install-strip
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|`getopt|`${LOCALBASE}/bin/getopt|' ${WRKSRC}/util/rarian-sk-update.in
 
 .include <bsd.port.mk>
diff --git a/textproc/xmlto/Makefile b/textproc/xmlto/Makefile
index 27ea964afc01..81e6b0a3c7c3 100644
--- a/textproc/xmlto/Makefile
+++ b/textproc/xmlto/Makefile
@@ -1,92 +1,92 @@
 PORTNAME=	xmlto
 PORTVERSION=	0.0.28
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	https://releases.pagure.org/xmlto/:xmlto \
 		LOCAL/mandree/:xmlto \
 		http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/:xsl \
 		LOCAL/mandree/:xsl
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:xmlto \
 		xhtml2fo.xsl:xsl
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Front-end to an XSL toolchain
 WWW=		https://pagure.io/xmlto/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${BASH_CMD}:shells/bash \
-		${GETOPT_CMD}:misc/getopt \
+		${GETOPT_CMD}:devel/util-linux \
 		xmllint:textproc/libxml2 \
 		xsltproc:textproc/libxslt \
 		docbook-xsl>0:textproc/docbook-xsl \
 		paperconf:print/libpaper \
 		w3m:www/w3m \
 		docbook-xml>0:textproc/docbook-xml
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_GROUP=		BACKEND
 OPTIONS_GROUP_BACKEND=		DBLATEX FOP PASSIVETEX
 BACKEND_DESC=		Postprocessor backends to enable
 DBLATEX_DESC=		Add dependency on DBlatex (DB for DocBook)
 FOP_DESC=		Add dependency on FOP (requires Java)
 PASSIVETEX_DESC=	Add dependency on XMLTeX/PassiveTeX
 
 USES=		tar:bzip2
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	BASH=${BASH_CMD} GETOPT=${GETOPT_CMD} PDFXMLTEX=${PDFXMLTEX_CMD}
 MAKE_ENV+=	HOME=/dev/null
 
 BASH_CMD=	${LOCALBASE}/bin/bash
 GETOPT_CMD=	${LOCALBASE}/bin/getopt
 XSL_DIR=	${LOCALBASE}/share/xsl/docbook
 PDFXMLTEX_CMD=	${LOCALBASE}/bin/pdftex
 
 PORTDOCS=	AUTHORS ChangeLog NEWS THANKS
 # these documentation files do not convey information useful for
 # the FreeBSD port at this time, or are provided by the ports framework:
 # PORTDOCS+=	COPYING FAQ README
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MPASSIVETEX}
 USES+=		tex
 USE_TEX+=	xmltex
 .endif
 
 .if ${PORT_OPTIONS:MFOP}
 RUN_DEPENDS+=	fop>=0.90:textproc/fop
 CONFIGURE_ARGS+=	--with-backend=fop
 .endif
 
 .if ${PORT_OPTIONS:MDBLATEX}
 RUN_DEPENDS+=	${LOCALBASE}/bin/dblatex:textproc/dblatex
 .if ! ${PORT_OPTIONS:MFOP}
 CONFIGURE_ARGS+=	--with-backend=dblatex
 .endif
 .endif
 
 post-patch:
 	${SED} -i '' -e 's/type -t/which/;' \
 		${WRKSRC}/format/docbook/epub \
 		${WRKSRC}/format/docbook/txt \
 		${WRKSRC}/format/fo/dvi \
 		${WRKSRC}/format/fo/pdf \
 		${WRKSRC}/format/xhtml1/txt
 	${REINPLACE_CMD} -e '/^GEN_MANPAGE/{s/\$$</$$>/;}' ${WRKSRC}/Makefile.in
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/xhtml2fo.xsl ${STAGEDIR}${DATADIR}/
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/yodl/Makefile b/textproc/yodl/Makefile
index 253b9bac329c..d3060026ce88 100644
--- a/textproc/yodl/Makefile
+++ b/textproc/yodl/Makefile
@@ -1,94 +1,94 @@
 PORTNAME=	yodl
 PORTVERSION=	3.10.00
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Easy to use but powerful document formatting/preparation language
 WWW=		https://fbb-git.gitlab.io/yodl/
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	bash:shells/bash \
-		${LOCALBASE}/bin/getopt:misc/getopt
+		${LOCALBASE}/bin/getopt:devel/util-linux
 BUILD_DEPENDS=	icmake:devel/icmake \
 		bash:shells/bash \
 		gsed:textproc/gsed
 
 USES=		cpe perl5 shebangfix compiler:c++14-lang
 CPE_VENDOR=	${PORTNAME}_project
 USE_PERL5=	build
 USE_GITLAB=	yes
 GL_ACCOUNT=	fbb-git
 GL_TAGNAME=	5fa97b175c85581d01329013cfdb4239f019b023
 
 SHEBANG_LANG=	icmake
 icmake_OLD_CMD=	/usr/bin/icmake
 icmake_CMD=	${LOCALBASE}/bin/icmake
 
 SHEBANG_FILES=	${WRKSRC}/macros/rawmacros/create \
 		${WRKSRC}/macros/rawmacros/keepdiff \
 		${WRKSRC}/macros/rawmacros/makeyoin \
 		${WRKSRC}/macros/rawmacros/repairs \
 		${WRKSRC}/macros/rawmacros/separator \
 		${WRKSRC}/macros/rawmacros/separator.pl \
 		${WRKSRC}/macros/rawmacros/startdoc \
 		${WRKSRC}/macros/rawmacros/startdoc.pl \
 		${WRKSRC}/contrib/build.pl \
 		${WRKSRC}/src/yodl/replace \
 		${WRKSRC}/scripts/configreplacements \
 		${WRKSRC}/scripts/macroseparator.pl \
 		${WRKSRC}/scripts/stdmacros \
 		${WRKSRC}/scripts/yodl2whatever.in \
 		${WRKSRC}/build
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	*
 
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 WRKSRC_SUBDIR=	${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 DOCS_USES=	tex
 DOCS_USE=	TEX=latex:build,dvipsk:build
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|"/usr"|"${PREFIX}"| ; \
 		s|"/share/yodl"|"/share/${PORTNAME}-${PORTVERSION}"| ; \
 		s|"/share/doc/yodl"|"/share/doc/${PORTNAME}-${PORTVERSION}"| ; \
 		s|"/share/doc/yodl-doc"|"/share/doc/${PORTNAME}-${PORTVERSION}/doc"| ; \
 		s|"gcc"|"${CC}"| ; \
 		s|"g++"|"${CXX}"|' \
 		${WRKSRC}/INSTALL.im
 	@${REINPLACE_CMD} -e 's|yodlconverters.1|yodlconverters.1.gz| ; \
 		s|".1"|".1.gz"|' \
 		${WRKSRC}/icmake/install
 	@${REINPLACE_CMD} -e 's|#!/usr/bin/icmake|#!${LOCALBASE}/bin/icmake| ; \
 		s|"-O2 -Wall"|"-Wall ${CFLAGS}"|' \
 		${WRKSRC}/build
 	@${REINPLACE_CMD} -e 's|sed |${LOCALBASE}/bin/gsed | ; \
 		s|getopt |${LOCALBASE}/bin/getopt |' \
 		${WRKSRC}/scripts/configreplacements \
 		${WRKSRC}/scripts/yodl2whatever.in \
 		${WRKSRC}/scripts/yodlstriproff \
 		${WRKSRC}/macros/rawmacros/repairs
 
 do-build:
 	@cd ${WRKSRC} && ./build programs strip
 	@cd ${WRKSRC} && ./build macros
 	@cd ${WRKSRC} && ./build man
 
 do-build-DOCS-on:
 	@cd ${WRKSRC} && ./build manual
 
 do-install:
 	@cd ${WRKSRC} && ./build install programs ${STAGEDIR}
 	@cd ${WRKSRC} && ./build install macros ${STAGEDIR}
 	@cd ${WRKSRC} && ./build install man ${STAGEDIR}
 
 do-install-DOCS-on:
 	@cd ${WRKSRC} && ./build install manual ${STAGEDIR}
 	@cd ${WRKSRC} && ./build install docs ${STAGEDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/fontpreview/Makefile b/x11-fonts/fontpreview/Makefile
index c07f5681670d..f38bba80b735 100644
--- a/x11-fonts/fontpreview/Makefile
+++ b/x11-fonts/fontpreview/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	fontpreview
 DISTVERSION=	1.0.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts graphics
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Very customizable and minimal font previewer written in Bash
 WWW=		https://github.com/sdushantha/fontpreview
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	bash:shells/bash \
 		fzf:textproc/fzf \
-		getopt>0:misc/getopt \
+		${LOCALBASE}/bin/getopt:devel/util-linux \
 		nsxiv:graphics/nsxiv \
 		xdotool:x11/xdotool
 
 USES=		magick:7,run shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	sdushantha
 SHEBANG_FILES=	${PORTNAME}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	README.md extra/
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} 's|%%GETOPT%%|${LOCALBASE}/bin/getopt|' \
 		${WRKSRC}/${PORTNAME}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/extra
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/extra/* ${STAGEDIR}${DOCSDIR}/extra
 
 .include <bsd.port.mk>