diff --git a/math/gecode/Makefile b/math/gecode/Makefile
index 7ebbcd10dabd..419c2c92831b 100644
--- a/math/gecode/Makefile
+++ b/math/gecode/Makefile
@@ -1,86 +1,87 @@
 # Created by: Peter Pentchev <roam@FreeBSD.org>
 
 PORTNAME=	gecode
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	6.3.0
 PORTREVISION=	5
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Generic Constraint Development Environment
 
 LICENSE=	BSL MIT
 LICENSE_COMB=	multi
 
 NOT_FOR_ARCHS=		aarch64 armv6 armv7 mips mips64
 NOT_FOR_ARCHS_REASON=	needs code written to specify rounding control mechanism in Boost.Numeric.Interval
 
 USES=		bison:build compiler:c++11-lang gmake perl5
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-examples
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Gecode
 GH_TAGNAME=	0916a1a # 6.3.0 branch is ready for a long time, but hasn't been tagged yet
 
 DATADIR=	${PREFIX}/share/minizinc/gecode # it only installs the MiniZinc library into DATADIR
 
 OPTIONS_DEFINE=		AUDIT CBS FLATZINC GIST PEAKHEAP PROFILE SEARCH
 OPTIONS_RADIO=		LIBTYPE
 OPTIONS_RADIO_LIBTYPE=	SHARED STATIC
 OPTIONS_DEFAULT=	CBS FLATZINC SEARCH SHARED
 OPTIONS_SUB=		yes
 LIBTYPE_DESC=		Library type
 
 AUDIT_DESC=			Build with auditing code
 AUDIT_CONFIGURE_ENABLE=		audit
 
 CBS_DESC=			Support for counting-based search
 CBS_CONFIGURE_ENABLE=		cbs
 
 FLATZINC_DESC=			Build FlatZinc interpreter
 FLATZINC_CONFIGURE_ENABLE=	flatzinc
 
 GIST_DESC=			Enable gist, graphical and interactive search tool
 GIST_CONFIGURE_ENABLE=		gist qt
 GIST_USES=			gl qt:5
 GIST_USE=			gl=gl qt=core,gui,printsupport,widgets,qmake_build,buildtools_build
 GIST_IMPLIES=			SHARED # because Qt must be built in a special way: error: "You must build your code with position independent code if Qt was built with -reduce-relocations"
+GIST_MAKE_ARGS=			FREEBSD_LDFLAGS=-L${LOCALBASE}/lib
 
 PEAKHEAP_DESC=			Peak heap size tracking
 PEAKHEAP_CONFIGURE_ENABLE=	peakheap
 
 PROFILE_DESC=			Build with profiling information
 PROFILE_CONFIGURE_ENABLE=	profile
 
 SEARCH_DESC=			Build search engines
 SEARCH_CONFIGURE_ENABLE=	search
 
 SHARED_DESC=			Build shared executables and/or libraries
 SHARED_CONFIGURE_ENABLE=	shared
 
 STATIC_CONFIGURE_ENABLE=	static
 
 TEST_TARGET=	check
 
 post-patch-STATIC-on: # workaround for https://github.com/Gecode/gecode/issues/117
 	@${REINPLACE_CMD} -e 's| -fPIC | |; s|"-fPIC|"|' ${WRKSRC}/configure
 
 post-install-SHARED-on:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.*.*
 
 post-install-FLATZINC-on:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fzn-gecode
 
 post-install-FLATZINC-off: # https://github.com/Gecode/gecode/issues/108
 	@cd ${STAGEDIR}${PREFIX} && ${RMDIR} share/minizinc/gecode share/minizinc/solvers share/minizinc
 
 test-extended: stage # breaks, see https://github.com/Gecode/gecode/issues/109
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test && \
 		LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib ./test/test -test -Float
 
 .include <bsd.port.mk>
diff --git a/math/gecode/files/patch-Makefile.in b/math/gecode/files/patch-Makefile.in
new file mode 100644
index 000000000000..683ca3df1eaa
--- /dev/null
+++ b/math/gecode/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2021-12-18 04:22:38 UTC
++++ Makefile.in
+@@ -77,7 +77,7 @@ export QT_CPPFLAGS = @QTDEFINES@ @QTINCLUDES@
+ export LINKQT = @QTLIBS@
+ export MPFR_CPPFLAGS = @GMP_CPPFLAGS@ @MPFR_CPPFLAGS@
+ ifeq "@enable_mpfr@" "yes"
+-export LINKMPFR = @MPFR_LIB_PATH@ @GMP_LIB_PATH@ @MPFR_LINK@ @GMP_LINK@
++export LINKMPFR = $(FREEBSD_LDFLAGS) @MPFR_LIB_PATH@ @GMP_LIB_PATH@ @MPFR_LINK@ @GMP_LINK@
+ else
+ export LINKMPFR =
+ endif
diff --git a/math/gecode/files/patch-configure b/math/gecode/files/patch-configure
new file mode 100644
index 000000000000..c494bdabbf39
--- /dev/null
+++ b/math/gecode/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig	2021-05-20 06:12:58 UTC
++++ configure
+@@ -12552,7 +12552,7 @@ if test "${enable_qt+set}" = set; then :
+   enableval=$enable_qt;
+ fi
+ 
+-  for ac_prog in qmake-qt4 qmake
++  for ac_prog in qmake-qt5 qmake
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -12594,7 +12594,7 @@ fi
+   test -n "$QMAKE" && break
+ done
+ 
+-  for ac_prog in moc-qt4 moc
++  for ac_prog in moc-qt5 moc
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2