Index: head/databases/cassandra4/Makefile
===================================================================
--- head/databases/cassandra4/Makefile	(revision 543266)
+++ head/databases/cassandra4/Makefile	(revision 543267)
@@ -1,160 +1,160 @@
 # $FreeBSD$
 
 PORTNAME=	cassandra
 DISTVERSION=	4.0-alpha4
 CATEGORIES=	databases java
 MASTER_SITES=	APACHE/cassandra/${DISTVERSION}:apache \
 		https://repo1.maven.org/maven2/com/github/luben/zstd-jni/1.4.4-9/:maven \
 		LOCAL/pi:repo
 PKGNAMESUFFIX=	4
 DISTNAME=	apache-${PORTNAME}-${DISTVERSION}-src
 DISTFILES=	${DISTNAME}.tar.gz:apache \
 		zstd-jni-1.4.4-9-freebsd_amd64.jar:maven \
 		apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo
 EXTRACT_ONLY=	${DISTNAME}.tar.gz \
 		apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz
 
 MAINTAINER=	language.devel@gmail.com
 COMMENT=	Highly scalable distributed database
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	snappyjava>=0:archivers/snappy-java \
 		netty>0:java/netty
 
 USES=		python:3.7
 USE_JAVA=	yes
 USE_ANT=	yes
 USE_RC_SUBR=	cassandra
 TEST_TARGET=	test
 
 CONFLICTS=	cassandra3
 
 JAVA_VERSION=	8 11
 JAVA_VENDOR=	openjdk
 
 REINPLACE_ARGS=	-i ''
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 
 USERS=		cassandra
 GROUPS=		cassandra
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 BUILD_DIST_DIR=	${WRKSRC}/build/dist
 REPO_DIR=	${WRKDIR}/repository
 
 CONFIG_FILES=	cassandra-env.sh \
 		cassandra-jaas.config \
 		cassandra-rackdc.properties \
 		cassandra-topology.properties \
 		cassandra.yaml \
 		commitlog_archiving.properties \
 		hotspot_compiler \
 		logback-tools.xml \
 		logback.xml \
 		jvm8-clients.options \
 		jvm8-server.options \
 		jvm11-clients.options \
 		jvm11-server.options \
 		jvm-clients.options \
 		jvm-server.options
 
 SCRIPT_FILES=	cassandra \
 		nodetool \
 		sstableloader \
 		sstablescrub \
 		sstableupgrade \
 		sstableutil \
 		sstableverify
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 OPTIONS_DEFINE=		SIGAR DOCS
 OPTIONS_DEFAULT=	SIGAR
 OPTIONS_SUB=		yes
 
 SIGAR_DESC=		Use SIGAR to collect system information
 SIGAR_RUN_DEPENDS=	java-sigar>=1.6.4:java/sigar
 
 DOCS_BUILD_DEPENDS=	${PY_SPHINX} \
 			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
 
 PORTDOCS=		*
 
 do-build:
 	@${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target.
 
 do-build-DOCS-on:
 	cd ${WRKSRC} && ${SETENV} CASSANDRA_LOG_DIR=${WRKDIR}/gen-doc-log ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} ${USEJDK11} -Dpycmd=${PYTHON_CMD} -Dpyver=${PYTHON_VER} freebsd-stage-doc
 
 do-build-DOCS-off:
 	cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} ${USEJDK11} freebsd-stage
 
 post-build:
 .for f in ${SCRIPT_FILES}
 	@${REINPLACE_CMD} -e 's|/usr/share/cassandra|${DATADIR}/bin|' ${BUILD_DIST_DIR}/bin/${f}
 .endfor
-	@${REINPLACE_CMD} -e 's|\`dirname "\$$\0"\`/..|${DATADIR}|' ${BUILD_DIST_DIR}/bin/cassandra.in.sh
-	@${REINPLACE_CMD} -e 's|\$$\CASSANDRA_HOME/lib/sigar-bin|${JAVAJARDIR}|' ${BUILD_DIST_DIR}/bin/cassandra.in.sh
-	@${REINPLACE_CMD} -e 's|\$$\CASSANDRA_HOME/lib/sigar-bin|${JAVAJARDIR}|' ${BUILD_DIST_DIR}/conf/cassandra-env.sh
-	@${REINPLACE_CMD} -e 's|\$$\CASSANDRA_HOME/conf|${ETCDIR}|' ${BUILD_DIST_DIR}/bin/cassandra.in.sh
+	@${REINPLACE_CMD} -e 's|`dirname "$$0"`/..|${DATADIR}|' ${BUILD_DIST_DIR}/bin/cassandra.in.sh
+	@${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/lib/sigar-bin|${JAVAJARDIR}|' ${BUILD_DIST_DIR}/bin/cassandra.in.sh
+	@${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/lib/sigar-bin|${JAVAJARDIR}|' ${BUILD_DIST_DIR}/conf/cassandra-env.sh
+	@${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/conf|${ETCDIR}|' ${BUILD_DIST_DIR}/bin/cassandra.in.sh
 .for f in ${CONFIG_FILES}
 	@${MV} ${BUILD_DIST_DIR}/conf/${f} ${BUILD_DIST_DIR}/conf/${f}.sample
 .endfor
 	@${RM} ${BUILD_DIST_DIR}/lib/licenses/sigar*
 	@${RMDIR} ${BUILD_DIST_DIR}/lib/sigar-bin
 	@${RM} ${BUILD_DIST_DIR}/lib/zstd-jni*
 	@${RM} ${BUILD_DIST_DIR}/lib/licenses/zstd-jni*
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 .for f in CHANGES LICENSE NEWS NOTICE
 	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} ${f}.txt ${STAGEDIR}${DATADIR}/
 .endfor
 .for d in lib pylib tools
 	cd ${BUILD_DIST_DIR} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}/ "! -path '*/bin/*'"
 .endfor
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	cd ${BUILD_DIST_DIR}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/
 	cd ${BUILD_DIST_DIR} && ${COPYTREE_BIN} bin ${STAGEDIR}${DATADIR}
 	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/bin/
 	cd ${BUILD_DIST_DIR} && ${COPYTREE_BIN} tools/bin ${STAGEDIR}${DATADIR}/
 	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/tools/bin/
 .for f in ${SCRIPT_FILES}
 	${RLN} ${STAGEDIR}${DATADIR}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 	${RLN} ${STAGEDIR}${DATADIR}/bin/cqlsh ${STAGEDIR}${PREFIX}/bin/cqlsh
 	${LN} -s ${JAVAJARDIR}/snappy-java.jar ${STAGEDIR}${DATADIR}/lib/snappy-java.jar
 
 do-test:
 	@cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} ${USEJDK11} -Dstagedlib=${STAGEDIR}${DATADIR}/lib test
 
 .include <bsd.port.pre.mk>
 
 .if ${JAVA_PORT_VERSION} == 11
 USEJDK11=	-Duse.jdk11=true
 .endif
 
 .if ${ARCH} == amd64
 PLIST_SUB+=		AMD64ONLY=""
 .else
 PLIST_SUB+=		AMD64ONLY="@comment "
 .endif
 
 post-install:
 	${LN} -s ${JAVAJARDIR}/netty.jar ${STAGEDIR}${DATADIR}/lib/netty.jar
 .if ${ARCH} == amd64
 	${CP} ${DISTDIR}/zstd-jni-1.4.4-9-freebsd_amd64.jar ${STAGEDIR}${DATADIR}/lib/
 .endif
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for d in doc javadoc
 	cd ${BUILD_DIST_DIR} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DOCSDIR}/
 .endfor
 
 post-install-SIGAR-on:
 	${LN} -s ${JAVAJARDIR}/sigar.jar ${STAGEDIR}${DATADIR}/lib/sigar.jar
 
 .include <bsd.port.post.mk>
Index: head/databases/couchdb3/Makefile
===================================================================
--- head/databases/couchdb3/Makefile	(revision 543266)
+++ head/databases/couchdb3/Makefile	(revision 543267)
@@ -1,116 +1,116 @@
 # $FreeBSD$
 
 PORTNAME=	couchdb3
 DISTVERSION=	3.1.0
 PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	APACHE/couchdb/source/${DISTVERSION}
 DISTNAME=	apache-couchdb-${DISTVERSION}
 
 MAINTAINER=	dch@FreeBSD.org
 COMMENT=	JSON document database with HTTP API and scalable multi-master sync
 
 LICENSE=	APACHE20 BSD3CLAUSE ISCL WTFPL OFL11
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	rebar:devel/rebar \
 		erlang-runtime22>=22.0:lang/erlang-runtime22
 LIB_DEPENDS=	libicudata.so:devel/icu \
 		libmozjs-60.so:lang/spidermonkey60
 RUN_DEPENDS=	erlang-runtime22>=22.0:lang/erlang-runtime22
 
 USES=		compiler:c++14-lang cpe gmake libtool ncurses
 USE_RC_SUBR=	${PORTNAME}
 
 CONFLICTS=	couchdb[24]*
 
 CPE_VENDOR=	apache
 
 USERS=		couchdb
 GROUPS=		couchdb
 
 SUB_FILES=	pkg-message
 SUB_LIST=	APPDIR=${APPDIR} \
 		ERL_PATH=${LOCALBASE}/lib/erlang22/bin/erl \
 		PORTNAME=${PORTNAME} \
 		RELDIR=${RELDIR} \
 		WWWDIR=${WWWDIR}
 PLIST_SUB=	VERSION=${DISTVERSION}
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--skip-deps --user ${USERS} --rebar ${LOCALBASE}/bin/rebar \
 		--spidermonkey-version 60
 
 ALL_TARGET=	release
 
 MAKE_ENV=	PATH=${LOCALBASE}/lib/erlang22/bin:${PATH}
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
 
 DBDIR?=		/var/db/${PORTNAME}
 LOGDIR?=	/var/log/${PORTNAME}
 LOGFILE?=	${LOGDIR}/couch.log
 APPDIR=		${LOCALBASE}/libexec/${PORTNAME}
 RELDIR=		${APPDIR}/releases/${DISTVERSION}
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${ARCH} == i386
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_jiffy_c__src_double-conversion_strtod.cc
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} \
 	    -e 's,%%APPDIR%%,${APPDIR},g' \
 	    -e 's,%%DATADIR%%,${DATADIR},g' \
 	    -e 's,%%DBDIR%%,${DBDIR},g' \
 	    -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
 	    -e 's,%%PORTNAME%%,${PORTNAME},g' \
 	    -e 's,%%WWWDIR%%,${WWWDIR},g' \
 	    -e 's,$$COUCHDB_USER,${USERS},g' \
 	    -e 's,$$LOG_FILE,${LOGFILE},g' \
 	    ${WRKSRC}/configure
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=238514
 .if ${OPSYS} == FreeBSD && (${OSVERSION} < 1200000 || ${ARCH} == i386)
 	@${REINPLACE_CMD} \
-	    -e 's,\$FLTO_FLAG ,,g' \
+	    -e 's,$$FLTO_FLAG ,,g' \
 	    ${WRKSRC}/src/jiffy/rebar.config
 .endif
 
 pre-install:
 	# relocate user-modifiable runtime configs to match hier(7)
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/rel/couchdb/etc/local.ini \
 		${STAGEDIR}${ETCDIR}/local.ini.sample
 	${INSTALL_DATA} ${WRKSRC}/rel/couchdb/etc/vm.args \
 		${STAGEDIR}${ETCDIR}/vm.args.sample
 	${INSTALL_MAN} ${WRKSRC}/share/docs/man/apachecouchdb.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1
 	# prune build artefacts and surplus headers
 	${FIND} -E ${WRKSRC} -type f \
 		-regex '.*\.(a|buildinfo|c|cc|cmd|d|o|orig|h|cpp)' -print -delete
 	# remove runtime dirs and files that were moved to match hier(7)
 	${RM} -rv ${WRKSRC}/rel/couchdb/var \
 		${WRKSRC}/rel/couchdb/etc/*.d \
 		${WRKSRC}/rel/couchdb/etc/local.ini \
 		${WRKSRC}/rel/couchdb/etc/vm.args \
 		${WRKSRC}/rel/couchdb/releases/*/vm.args \
 		${WRKSRC}/rel/couchdb/lib/couch-*/priv/couch*js
 	@${CP} ${WRKSRC}/src/docs/images/favicon.ico ${WRKSRC}/share/www/
 	(cd ${WRKSRC}/rel/couchdb && ${COPYTREE_SHARE} . ${STAGEDIR}${APPDIR})
 
 post-install:
 	@${FIND} -E ${STAGEDIR} -type f \
 		\( -name couchjs -o -name *.so \) \
 		-exec ${STRIP_CMD} {} +
 	@${MKDIR} \
 		${STAGEDIR}${DBDIR} \
 		${STAGEDIR}${LOGDIR}
 	# fauxton UI is a required component
 	(cd ${WRKSRC}/share/www && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 post-install-DOCS-on:
 	(cd ${WRKSRC}/share/docs/html && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/docs)
 
 .include <bsd.port.mk>
Index: head/french/aster/files/patch-as_setup.py
===================================================================
--- head/french/aster/files/patch-as_setup.py	(revision 543266)
+++ head/french/aster/files/patch-as_setup.py	(revision 543267)
@@ -1,110 +1,117 @@
 --- as_setup.py.orig	2019-10-01 12:45:34 UTC
 +++ as_setup.py
 @@ -45,6 +45,8 @@ import tarfile
  import compileall
  import imp
  import pprint
 +import fileinput
 +import string
  import distutils.sysconfig as SC
  from subprocess import Popen, PIPE
  
 @@ -410,6 +412,7 @@ class SETUP:
              archive filename !),
           extract_as : rename content.
        """
 +      from as_setup import (SYSTEM)
        self._print(self._fmt_title % _('Extraction'))
        if kargs.get('external')!=None:
           self._call_external(**kargs)
-@@ -518,6 +521,81 @@ class SETUP:
+@@ -518,6 +521,88 @@ class SETUP:
        if iextr_as:
           self.Clean(to_delete=path)
  
 +      # Insert FreeBSD patches here
 +      file2patch = os.path.join(self.workdir, self.content, 'bibc/wscript')
 +      self._print('FreeBSD patch: no libdl => modify ' + file2patch)
 +      for ligne in fileinput.input(file2patch, inplace=1):
 +         nl = 0
 +         nl = ligne.find("uselib_store='SYS', lib='dl'")
 +         if nl > 0:
 +            ligne =ligne.replace("self.check_cc", "# self.check_cc")
 +         sys.stdout.write(ligne)
 + #     file2patch = os.path.join(self.workdir, self.content, 'bibcxx/wscript')
 + #     self._print('FreeBSD patch: explicit link with libc++ required since Gcc 4.9 => modify ' + file2patch)
 + #     for ligne in fileinput.input(file2patch, inplace=1):
 + #        nl = 0
 + #        nl = ligne.find("uselib_store='CXX', lib='stdc++'")
 + #        if nl > 0:
 + #           ligne =ligne.replace("lib='stdc++'", "lib='c++ stdc++'")
 + #        sys.stdout.write(ligne)
 +      file2patch = os.path.join(self.workdir, self.content, 'waftools/scotch.py')
 +      self._print('FreeBSD patch: int64_t missing => modify ' + file2patch)
 +      for ligne in fileinput.input(file2patch, inplace=1):
 +         nl = 0
 +         nl = ligne.find('include "scotch.h"')
 +         if nl > 0:
 +            sys.stdout.write("#include <sys/types.h>\n")
 +         nl = 0
 +         nl = ligne.find("stdio.h stdlib.h scotch.h")
 +         if nl > 0:
 +            ligne =ligne.replace("stdlib.h", "stdlib.h sys/types.h")
 +         sys.stdout.write(ligne)
 +      file2patch = os.path.join(self.workdir, self.content, 'bibc/utilitai/hpalloc.c')
 +      self._print('FreeBSD patch: stdlib + no mallopt => modify ' + file2patch)
 +      for ligne in fileinput.input(file2patch, inplace=1):
 +         nl = 0
 +         nl = ligne.find('ir=mallopt')
 +         if nl > 0:
 +            ligne =ligne.replace('ir=mallopt', '/* ir=mallopt')
 +            ligne =ligne.replace(');', '); */')
 +         else:
 +            nl = ligne.find("malloc.h")
 +            if nl > 0:
 +               ligne =ligne.replace("malloc.h", "stdlib.h")
 +         sys.stdout.write(ligne)
 +      system=SYSTEM({ 'verbose' : True, 'debug' : False },
 +         **{'maxcmdlen' : 2**31, 'log' : self})
++      file2patch = os.path.join(self.workdir, self.content, 'waf.main')
++      self._print('FreeBSD patch: remove extraneous escape => modify waf.main')
++      for ligne in fileinput.input(file2patch, inplace=1):
++         nl = ligne.find("\main$")
++         if nl > 0:
++            ligne =ligne.replace("\main$", "main$")
++         sys.stdout.write(ligne)
 +      for f2p in ('waf', 'waf.main', 'waf_variant', 'waf_std', 'waf_mpi', 'bibpyt/Macro/macr_ecre_calc_ops.py'):
 +         file2patch = os.path.join(self.workdir, self.content, f2p)
 +         self._print('FreeBSD patch: /bin/bash => modify ' + file2patch)
 +         for ligne in fileinput.input(file2patch, inplace=1):
 +            nl = 0
 +            nl = ligne.find("/bin/bash")
 +            if nl > 0:
 +               ligne =ligne.replace("/bin/bash", " %%LOCALBASE%%/bin/bash")
 +            sys.stdout.write(ligne)
 +         for ligne in fileinput.input(file2patch, inplace=1):
 +            nl = 0
 +            nl = ligne.find("getopt ")
 +            if nl > 0:
 +               ligne =ligne.replace("getopt ", "getopts ")
 +            sys.stdout.write(ligne)
 +      self._print('FreeBSD patches: waf.engine and data/post_install in %s' % os.path.join(self.workdir, self.content))
 +      os.system('cd ' + os.path.join(self.workdir, self.content) + ' && patch -p0 < %%WRKDIR%%/post_patches/post-patch-waf.engine')
 +      os.system('cd ' + os.path.join(self.workdir, self.content) + ' && patch -p0 < %%WRKDIR%%/post_patches/post-patch-data__post_install')
 +      self._print('FreeBSD patches: memory detection in bibc/utilitai/mempid.c in %s' % os.path.join(self.workdir, self.content))
 +      os.system('cd ' + os.path.join(self.workdir, self.content) + ' && patch -p0 < %%WRKDIR%%/post_patches/post-patch-bibc__utilitai__mempid.c')
 +      os.system('cd ' + os.path.join(self.workdir, self.content) + ' && patch -p0 < %%WRKDIR%%/post_patches/post-patch-bibfor__jeveux__jedebu.F90')
 +      file2patch = os.path.join(self.workdir, self.content, 'waftools/mathematics.py')
 +      self._print('FreeBSD patch: nproc => gnproc ' + file2patch)
 +      for ligne in fileinput.input(file2patch, inplace=1):
 +         nl = 0
 +         nl = ligne.find("'nproc'")
 +         if nl > 0:
 +            ligne =ligne.replace("'nproc'", "'gnproc'")
 +         sys.stdout.write(ligne)
 +      # End of FreeBSD patches
 +
  #-------------------------------------------------------------------------------
     def Configure(self, **kargs):
        """Configuration of the product.
 @@ -1454,7 +1532,7 @@ class SYSTEM:
        if type(profile) is str:
           ftmp = osp.join(self._tmpdir, 'temp.opt_env')
           open(ftmp, 'w').write(profile)
 -         os.chmod(ftmp, 755)
 +         os.chmod(ftmp, 0o755)
           profile = ftmp
  
        if not osp.isfile(profile):
Index: head/java/openjdk14/Makefile
===================================================================
--- head/java/openjdk14/Makefile	(revision 543266)
+++ head/java/openjdk14/Makefile	(revision 543267)
@@ -1,181 +1,183 @@
 # $FreeBSD$
 
 PORTNAME=	openjdk
 DISTVERSIONPREFIX=	jdk-
 DISTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
 CATEGORIES=	java devel
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Java Development Kit ${JDK_MAJOR_VERSION}
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc64
 
 BUILD_DEPENDS=	zip:archivers/zip \
 		autoconf>0:devel/autoconf \
 		${LOCALBASE}/include/cups/cups.h:print/cups \
-		bash:shells/bash
+		bash:shells/bash \
+		gsed:textproc/gsed
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgif.so:graphics/giflib \
 		liblcms2.so:graphics/lcms2 \
 		libpng.so:graphics/png
 RUN_DEPENDS=	javavm:java/javavmwrapper \
 		xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype
 
 USES=		compiler:features gmake iconv jpeg pkgconfig xorg
 USE_XORG=	x11 xext xi xrandr xrender xt xtst
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	battleblow
 GH_PROJECT=	jdk14u
 
 NO_CCACHE=	yes
 
 _MAKE_JOBS=	#
 MAKE_ENV=	LANG="C" \
 		LC_ALL="C" \
 		CLASSPATH="" \
 		JAVA_HOME="" \
 		LD_LIBRARY_PATH="" \
 		CC=${CC} \
 		CXX=${CXX} \
 		CPP=${CPP} \
 		MAKEFLAGS=""
 
 JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
 JDK_BUILDDIR=	${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
 JDK_IMAGEDIR=	${JDK_BUILDDIR}/images/jdk
 INSTALLDIR=	${PREFIX}/${PKGBASE}
 
 NOPRECIOUSMAKEVARS=	yes
 
 JDK_MAJOR_VERSION=	14
 JDK_MINOR_VERSION=	0
 JDK_PATCH_VERSION=	2
 JDK_BUILD_NUMBER=	12
 BSD_JDK_VERSION=	1
 
 JDK_BUG_URL=	https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CC=${CC} \
 		CXX=${CXX} \
-		CPP=${CPP}
+		CPP=${CPP} \
+		ac_cv_path_SED=${LOCALBASE}/bin/gsed
 CONFIGURE_ARGS=	--with-boot-jdk=${BOOTSTRAPJDKDIR} \
 		--disable-ccache \
 		--disable-javac-server \
 		--disable-hotspot-gtest \
 		--with-alsa=${LOCALBASE} \
 		--with-cups=${LOCALBASE} \
 		--with-fontconfig=${LOCALBASE} \
 		--with-freetype=system \
 		--with-freetype-include=${LOCALBASE}/include/freetype2 \
 		--with-freetype-lib=${LOCALBASE}/lib \
 		--with-libjpeg=system \
 		--with-giflib=system \
 		--with-giflib-include=${LOCALBASE}/include \
 		--with-giflib-lib=${LOCALBASE}/lib \
 		--with-libpng=system \
 		--with-zlib=system \
 		--with-lcms=system \
 		--x-includes=${LOCALBASE}/include \
 		--x-libraries=${LOCALBASE}/lib \
 		--with-cacerts-file=${FILESDIR}/cacerts \
 		--with-version-string=${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} \
 		--with-native-debug-symbols=none \
 		--with-debug-level=release \
 		--with-vendor-name="OpenJDK BSD Porting Team" \
 		--with-vendor-url="https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/" \
 		--with-vendor-bug-url="${JDK_BUG_URL}" \
 		--with-vendor-vm-bug-url="${JDK_BUG_URL}"
 
 JAVAVMS_COMMENT=	OpenJDK${JDK_MAJOR_VERSION}
 
 ALL_TARGET=		images
 JDK_BUILD_TYPE=		release
 
 .include <bsd.port.pre.mk>
 
 # Support aarch64 on FreeBSD 12 and up
 .if ${OSVERSION} >= 1200500
 ONLY_FOR_ARCHS+=aarch64
 .endif
 
 BOOTSTRAP_JDKS=	${LOCALBASE}/openjdk14 \
 		${LOCALBASE}/openjdk13
 
 # do we have valid native jdk installed?
 .for BJDK in ${BOOTSTRAP_JDKS}
 .  if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac)
 BOOTSTRAPJDKDIR=	${BJDK}
 .  endif
 .endfor
 
 # if no valid jdk found, set dependency
 .if !defined(BOOTSTRAPJDKDIR)
 BOOTSTRAPJDKDIR?=	${LOCALBASE}/openjdk13
 BUILD_DEPENDS+=		${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk13
 .endif
 
 JDK_BUILD_JVM=	server
 
 MAKE_ENV+=		--with-toolchain-type=${COMPILER_TYPE}
 CONFIGURE_ARGS+=	--with-toolchain-type=${COMPILER_TYPE}
 
 .if ${COMPILER_TYPE} == gcc
 USE_GCC=	yes
 CONFIGURE_ARGS+=	--with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L/usr/local/lib/gcc${GCC_DEFAULT}" \
 			--with-extra-cflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \
 			--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
 .else
 MAKE_ENV+=	USE_CLANG=true
 .endif
 
 .if ${ARCH} == aarch64 || ${ARCH} == powerpc64
 CONFIGURE_ARGS+=	--disable-warnings-as-errors \
 			--disable-dtrace
 .endif
 .if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
 CONFIGURE_ARGS+=	--disable-precompiled-headers
 .endif
 .if ${ARCH} != amd64
 CONFIGURE_ARGS+=	--enable-aot=no
 .endif
 .if ${ARCH} == powerpc64 && ${OSREL:C/\.[0-9]//} == 12
 EXTRA_PATCHES=		${PATCHDIR}/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp
 .endif
 
 .if empty(ICONV_LIB)
 ICONV_CFLAGS=	-DLIBICONV_PLUG
 .else
 ICONV_CFLAGS=	-I${LOCALBASE}/include
 ICONV_LDFLAGS=	-L${LOCALBASE}/lib
 ICONV_LIBS=	${ICONV_LIB}
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	@${CHMOD} 755 ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/configure \
 		${WRKSRC}/src/hotspot/os/bsd/os_bsd.cpp
 	@${REINPLACE_CMD} -e 's|%%ICONV_CFLAGS%%|${ICONV_CFLAGS}|' \
 		-e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \
 		-e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \
 		${WRKSRC}/make/autoconf/libraries.m4
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${INSTALLDIR}
 	@cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR}
 	@cd ${STAGEDIR}${INSTALLDIR} && \
 		${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \;
 	@${CHMOD} ${BINMODE} ${STAGEDIR}${INSTALLDIR}/lib/jspawnhelper
 	@${ECHO} "@javavm ${INSTALLDIR}/bin/java" >> ${TMPPLIST}
 	@${FIND} ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \
 		${SED} -e 's|^${STAGEDIR}${PREFIX}/||' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
Index: head/security/openfortivpn/Makefile
===================================================================
--- head/security/openfortivpn/Makefile	(revision 543266)
+++ head/security/openfortivpn/Makefile	(revision 543267)
@@ -1,22 +1,25 @@
 # $FreeBSD$
 
 PORTNAME=	openfortivpn
 PORTVERSION=	1.14.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security net-vpn
 
 MAINTAINER=	lifanov@FreeBSD.org
 COMMENT=	Client for PPP+SSL VPN tunnel services
 
+BUILD_DEPENDS=	gsed:textproc/gsed
+
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		autoreconf pkgconfig ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	adrienverge
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	OPENSSL_CFLAGS=${OPENSSLINC} \
+CONFIGURE_ENV=	ac_cv_path_SED=${LOCALBASE}/bin/gsed \
+		OPENSSL_CFLAGS=${OPENSSLINC} \
 		OPENSSL_LIBS="-lssl -lcrypto"
 
 .include <bsd.port.mk>
Index: head/security/xca/Makefile
===================================================================
--- head/security/xca/Makefile	(revision 543266)
+++ head/security/xca/Makefile	(revision 543267)
@@ -1,42 +1,44 @@
 # Created by: Valentin Zahariev <curly@e-card.bg>
 # $FreeBSD$
 
 PORTNAME=	xca
 PORTVERSION=	2.3.0
 CATEGORIES=	security
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/xca/releases/download/RELEASE.${PORTVERSION}/
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Graphical certification authority
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
+BUILD_DEPENDS=	gsed:textproc/gsed
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 USES=		compiler:c++11-lang desktop-file-utils gmake localbase \
 		pkgconfig qt:5 shared-mime-info shebangfix ssl
 USE_QT=		buildtools_build core gui linguist_build sql widgets
 USE_CXXSTD=	c++11
 
 GNU_CONFIGURE=	yes
+BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
 CONFIGURE_ARGS=	--with-openssl=${OPENSSLDIR} \
 		--with-qt=${PREFIX} \
 		--with-qt-version=5
 MAKE_ARGS=	DOCTOOL="${TRUE}"
 SHEBANG_FILES=	doc/code2html
 
 GH_ACCOUNT=	chris2511
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^CFLAGS/s|-O2||' ${WRKSRC}/Local.mak.in
 	@${REINPLACE_CMD} -e \
 		'/install/s|-D|-c|' ${WRKSRC}/img/Makefile
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xca*
 
 .include <bsd.port.mk>