diff --git a/Mk/Uses/pgsql.mk b/Mk/Uses/pgsql.mk
index 9cdc7ca0..39828ac0 100644
--- a/Mk/Uses/pgsql.mk
+++ b/Mk/Uses/pgsql.mk
@@ -41,7 +41,7 @@ _INCLUDE_USES_PGSQL_MK=	yes
 
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-VALID_PGSQL_VER=	9.4 9.5 9.6 10 11 12
+VALID_PGSQL_VER=	9.4 9.5 9.6 10 11 12 13 14
 
 # Override non-default LIBVERS like this:
 #PGSQL99_LIBVER=6
diff --git a/xapp/remmina/Makefile b/_unused/remmina/Makefile
similarity index 100%
rename from xapp/remmina/Makefile
rename to _unused/remmina/Makefile
diff --git a/xapp/remmina/distinfo b/_unused/remmina/distinfo
similarity index 100%
rename from xapp/remmina/distinfo
rename to _unused/remmina/distinfo
diff --git a/xapp/remmina/files/patch-x-cmake-FindGLIB2.cmake b/_unused/remmina/files/patch-x-cmake-FindGLIB2.cmake
similarity index 100%
rename from xapp/remmina/files/patch-x-cmake-FindGLIB2.cmake
rename to _unused/remmina/files/patch-x-cmake-FindGLIB2.cmake
diff --git a/xapp/remmina/files/patch-x-cmake-FindGTK3.cmake b/_unused/remmina/files/patch-x-cmake-FindGTK3.cmake
similarity index 100%
rename from xapp/remmina/files/patch-x-cmake-FindGTK3.cmake
rename to _unused/remmina/files/patch-x-cmake-FindGTK3.cmake
diff --git a/xapp/remmina/files/patch-x-cmake-FindJSONGLIB.cmake b/_unused/remmina/files/patch-x-cmake-FindJSONGLIB.cmake
similarity index 100%
rename from xapp/remmina/files/patch-x-cmake-FindJSONGLIB.cmake
rename to _unused/remmina/files/patch-x-cmake-FindJSONGLIB.cmake
diff --git a/xapp/remmina/files/patch-x-cmake-FindLIBSOUP24.cmake b/_unused/remmina/files/patch-x-cmake-FindLIBSOUP24.cmake
similarity index 100%
rename from xapp/remmina/files/patch-x-cmake-FindLIBSOUP24.cmake
rename to _unused/remmina/files/patch-x-cmake-FindLIBSOUP24.cmake
diff --git a/xapp/remmina/pkg-deinstall b/_unused/remmina/pkg-deinstall
similarity index 100%
rename from xapp/remmina/pkg-deinstall
rename to _unused/remmina/pkg-deinstall
diff --git a/xapp/remmina/pkg-descr b/_unused/remmina/pkg-descr
similarity index 100%
rename from xapp/remmina/pkg-descr
rename to _unused/remmina/pkg-descr
diff --git a/xapp/remmina/pkg-install b/_unused/remmina/pkg-install
similarity index 100%
rename from xapp/remmina/pkg-install
rename to _unused/remmina/pkg-install
diff --git a/xapp/remmina/pkg-message b/_unused/remmina/pkg-message
similarity index 100%
rename from xapp/remmina/pkg-message
rename to _unused/remmina/pkg-message
diff --git a/xapp/remmina/pkg-plist b/_unused/remmina/pkg-plist
similarity index 100%
rename from xapp/remmina/pkg-plist
rename to _unused/remmina/pkg-plist
diff --git a/devel/gcc/files/patch-libcpp_lex.c b/devel/gcc/files/patch-libcpp_lex.c
new file mode 100644
index 00000000..05ad2887
--- /dev/null
+++ b/devel/gcc/files/patch-libcpp_lex.c
@@ -0,0 +1,25 @@
+This is
+
+  commit cd547f0ddcd3a54e5b73bcda5ac0f0c46808db8b
+  Author: Jakub Jelinek <jakub@redhat.com>
+  Date:   Sat Sep 26 10:07:41 2020 +0200
+
+which is on the GCC 10 release branch and thus part of lang/gcc10-devel;
+we should automatically get it with GCC 10.3.
+
+--- libcpp/lex.c.orig	2020-11-02 10:24:50 UTC
++++ libcpp/lex.c
+@@ -531,11 +531,11 @@ init_vectorized_lexer (void)
+   search_line_fast = impl;
+ }
+ 
+-#elif defined(_ARCH_PWR8) && defined(__ALTIVEC__)
++#elif (GCC_VERSION >= 4005) && defined(_ARCH_PWR8) && defined(__ALTIVEC__)
+ 
+ /* A vection of the fast scanner using AltiVec vectorized byte compares
+    and VSX unaligned loads (when VSX is available).  This is otherwise
+-   the same as the pre-GCC 5 version.  */
++   the same as the AltiVec version.  */
+ 
+ ATTRIBUTE_NO_SANITIZE_UNDEFINED
+ static const uchar *
diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index 6ece813d..7ded6b05 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	fortran@FreeBSD.org
 COMMENT=	A library of Fortran 77 subroutines for linear algebra
 
 USES=	gmake cmake 
-CONFIGURE_ENV+= FFLAGS="-fPIC"
+CONFIGURE_ENV+= FFLAGS="-fPIC -fallow-argument-mismatch"
 
 WRKSRC=	 ${WRKDIR}/lapack-${PORTVERSION}
 
diff --git a/math/octave/Makefile b/math/octave/Makefile
index ce55bf78..373f6917 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -42,52 +42,10 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/gnuplot:math/gnuplot
 RUN_DEPENDS+= ${LOCALBASE}/bin/gsed:textproc/gsed
 RUN_DEPENDS+= ${LOCALBASE}/bin/makeinfo:print/texinfo
 
-#RUN_DEPENDS=	gnuplot:math/gnuplot \
-#		gsed:textproc/gsed \
-#		${LOCALBASE}/bin/makeinfo:print/texinfo
-#LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick \
-#		libarpack.so:math/arpack-ng \
-#		libcurl.so:ftp/curl \
-#		libfftw3.so:math/fftw3 \
-#		libfftw3f.so:math/fftw3-float \
-#		libfltk.so:x11-toolkits/fltk \
-#		libftgl.so:graphics/ftgl \
-#		libhdf5.so:science/hdf5 \
-#		libpcre.so:devel/pcre \
-#		libqhull.so.7:math/qhull \
-#		libqrupdate.so:math/qrupdate \
-#		libamd.so:math/suitesparse-amd \
-#		libcamd.so:math/suitesparse-camd \
-#		libccolamd.so:math/suitesparse-ccolamd \
-#		libcholmod.so:math/suitesparse-cholmod \
-#		libcolamd.so:math/suitesparse-colamd \
-#		libsuitesparseconfig.so:math/suitesparse-config \
-#		libcxsparse.so:math/suitesparse-cxsparse \
-#		libklu.so:math/suitesparse-klu \
-#		libumfpack.so:math/suitesparse-umfpack \
-#		libglpk.so:math/glpk \
-#		libgl2ps.so:print/gl2ps \
-#		libfontconfig.so:x11-fonts/fontconfig \
-#		libfreetype.so:print/freetype2 \
-#		libdrm.so:graphics/libdrm \
-#		libOSMesa.so:graphics/libosmesa \
-#		libsundials_arkode.so:math/sundials \
-#		libportaudio.so:audio/portaudio
-##		libsndfile.so:audio/libsndfile # Commented out until this port no longer has vulnerabilities.
-
-
-
-USES=		charsetfix gmake perl5 pkgconfig tar:xz compiler:c++14-lang iconv
+USES=		charsetfix gmake perl5 pkgconfig tar:xz compiler:c++14-lang 
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}/${PORTVERSION}
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
-#USE_QT=		core gui help network opengl \
-#		qmake_build buildtools_build linguist_build \
-#		printsupport sql widgets \
-#		xml
-#USE_XORG=	x11 xext xfixes xft \
-#		xcursor xinerama xrender
-#USE_GL=		gl glu
 
 MOC_QTVER=moc-qt4
 UIC_QTVER=uic-qt4
@@ -98,7 +56,7 @@ OCTAVE_VERSION=	${PORTVERSION}
 GNU_HOST=	${ARCH}-portbld-freebsd${OSREL}
 PLIST_SUB=	OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST}
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib 
+LDFLAGS+=	-L${LOCALBASE}/lib -static-libgcc
 CONFIGURE_ENV+=	GPERF="${LOCALBASE}/bin/gperf"
 #CONFIGURE_ENV+=	JAVA_HOME=${JAVA_HOME}
 CONFIGURE_ENV+=	MAKEINFO=${LOCALBASE}/bin/makeinfo
@@ -122,30 +80,12 @@ CONFIGURE_ARGS+= --disable-jit
 CONFIGURE_ARGS+= --disable-openmp
 #CONFIGURE_ARGS+= --with-osmesa
 
+CONFIGURE_ARGS+= --without-qt
+
 #INFO=		octave liboctave
 
 INSTALL_TARGET=	install-strip
 
-#OPTIONS_DEFINE=	DOCS JAVA QT5
-
-#OPTIONS_RADIO=		BLAS
-#OPTIONS_RADIO_BLAS=	OPENBLAS NETLIB ATLAS
-#OPTIONS_DEFAULT=	JAVA OPENBLAS QT5
-#OPTIONS_SUB=		yes
-
-#DOCS_CONFIGURE_ENABLE=	docs
-#JAVA_CONFIGURE_ENABLE=	java
-#QT5_CONFIGURE_WITH=	qt=5 qscintilla
-
-#QT5_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
-
-#DOCS_USE=	TEX=dvipsk:build,formats:build
-#JAVA_USE=	JAVA=yes
-#QT5_USES=	qt:5
-#OPENBLAS_USES=	blaslapack:openblas
-#NETLIB_USES=	blaslapack:netlib
-#ATLAS_USES=		blaslapack:atlas
-
 post-patch:
 	${REINPLACE_CMD} 's|"makeinfo"|"${LOCALBASE}/bin/makeinfo"|' ${WRKSRC}/libinterp/corefcn/help.cc
 	${REINPLACE_CMD} 's|"-qt=$$qt_version"|"-qt=qt$$qt_version"|' ${WRKSRC}/configure
diff --git a/math/octave/pkg-plist b/math/octave/pkg-plist
index 552621d7..38bba3b2 100644
--- a/math/octave/pkg-plist
+++ b/math/octave/pkg-plist
@@ -757,19 +757,19 @@ lib/octave/6.3.0/liboctave.so.8
 lib/octave/6.3.0/liboctinterp.la
 lib/octave/6.3.0/liboctinterp.so
 lib/octave/6.3.0/liboctinterp.so.9
-lib/octave/6.3.0/oct/amd64-portbld-freebsd12.2/__delaunayn__.oct
-lib/octave/6.3.0/oct/amd64-portbld-freebsd12.2/__fltk_uigetfile__.oct
-lib/octave/6.3.0/oct/amd64-portbld-freebsd12.2/__glpk__.oct
-lib/octave/6.3.0/oct/amd64-portbld-freebsd12.2/__init_fltk__.oct
-lib/octave/6.3.0/oct/amd64-portbld-freebsd12.2/__init_gnuplot__.oct
-lib/octave/6.3.0/oct/amd64-portbld-freebsd12.2/__ode15__.oct
-lib/octave/6.3.0/oct/amd64-portbld-freebsd12.2/__voronoi__.oct
-lib/octave/6.3.0/oct/amd64-portbld-freebsd12.2/audiodevinfo.oct
-lib/octave/6.3.0/oct/amd64-portbld-freebsd12.2/audioread.oct
-lib/octave/6.3.0/oct/amd64-portbld-freebsd12.2/convhulln.oct
-lib/octave/6.3.0/oct/amd64-portbld-freebsd12.2/fftw.oct
-lib/octave/6.3.0/oct/amd64-portbld-freebsd12.2/gzip.oct
-lib/octave/6.3.0/oct/amd64-portbld-freebsd12.2/PKG_ADD
+lib/octave/6.3.0/oct/amd64-portbld-freebsd12.3/__delaunayn__.oct
+lib/octave/6.3.0/oct/amd64-portbld-freebsd12.3/__fltk_uigetfile__.oct
+lib/octave/6.3.0/oct/amd64-portbld-freebsd12.3/__glpk__.oct
+lib/octave/6.3.0/oct/amd64-portbld-freebsd12.3/__init_fltk__.oct
+lib/octave/6.3.0/oct/amd64-portbld-freebsd12.3/__init_gnuplot__.oct
+lib/octave/6.3.0/oct/amd64-portbld-freebsd12.3/__ode15__.oct
+lib/octave/6.3.0/oct/amd64-portbld-freebsd12.3/__voronoi__.oct
+lib/octave/6.3.0/oct/amd64-portbld-freebsd12.3/audiodevinfo.oct
+lib/octave/6.3.0/oct/amd64-portbld-freebsd12.3/audioread.oct
+lib/octave/6.3.0/oct/amd64-portbld-freebsd12.3/convhulln.oct
+lib/octave/6.3.0/oct/amd64-portbld-freebsd12.3/fftw.oct
+lib/octave/6.3.0/oct/amd64-portbld-freebsd12.3/gzip.oct
+lib/octave/6.3.0/oct/amd64-portbld-freebsd12.3/PKG_ADD
 lib/pkgconfig/octave.pc
 lib/pkgconfig/octinterp.pc
 libdata/ldconfig/octave
@@ -789,7 +789,6 @@ share/icons/hicolor/48x48/apps/octave.png
 share/icons/hicolor/512x512/apps/octave.png
 share/icons/hicolor/64x64/apps/octave.png
 share/icons/hicolor/scalable/apps/octave.svg
-share/info/dir
 share/info/liboctave.info
 share/info/octave.info
 share/info/octave.info-1
@@ -2358,12 +2357,9 @@ share/octave/m/web/webread.m
 share/octave/m/web/webwrite.m
 share/octave/site/m/startup/octaverc
 @dir include/octave
-@dir lib/octave/6.3.0/oct/amd64-portbld-freebsd12.2
+@dir lib/octave/6.3.0/oct/amd64-portbld-freebsd12.3
 @dir lib/octave/6.3.0/oct
 @dir lib/octave/6.3.0
-@dir lib/octave
-@dir share/octave/data
-@dir share/octave/doc
 @dir share/octave/etc/profiler
 @dir share/octave/etc/tests/fixed/@cell
 @dir share/octave/etc/tests/fixed/@char