diff --git a/math/octave-forge-optim/Makefile b/math/octave-forge-optim/Makefile
index 7d94d4ce2a32..4a269411d58c 100644
--- a/math/octave-forge-optim/Makefile
+++ b/math/octave-forge-optim/Makefile
@@ -1,33 +1,36 @@
 # Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 
 PORTNAME=	octave-forge-optim
 PORTVERSION=	1.6.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 
 LICENSE=	Parts
 LICENSE_NAME=	See individual files for licenses
 LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 # OCTSRC is the name of the directory of the package.
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
 OCTSRC=		${DISTNAME}
 
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
 
 RUN_DEPENDS+=	${TARBALLS_DIR}/statistics.tar.gz:math/octave-forge-statistics
 RUN_DEPENDS+=	${TARBALLS_DIR}/struct.tar.gz:math/octave-forge-struct
 
 GNU_CONFIGURE=	yes
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
+USES+=		shebangfix
+SHEBANG_FILES=	*.pl
+
 post-build:
 	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-optim/files/patch-lsqlin.m b/math/octave-forge-optim/files/patch-lsqlin.m
new file mode 100644
index 000000000000..55e191b75906
--- /dev/null
+++ b/math/octave-forge-optim/files/patch-lsqlin.m
@@ -0,0 +1,11 @@
+--- ../inst/lsqlin.m.orig	2022-04-08 22:29:29.290901000 -0500
++++ ../inst/lsqlin.m	2022-04-08 22:29:41.495111000 -0500
+@@ -115,7 +115,7 @@
+ 
+   if (n_out > 2)
+     ## We don't need to know if original n_out was 3 or 2.
+-    n_out --;
++    n_out--;
+   endif
+ 
+   quadprog_out = cell (1, max (n_out, 1));
diff --git a/math/octave-forge-optim/files/patch-vfzero.m b/math/octave-forge-optim/files/patch-vfzero.m
new file mode 100644
index 000000000000..c08712576fc1
--- /dev/null
+++ b/math/octave-forge-optim/files/patch-vfzero.m
@@ -0,0 +1,11 @@
+--- ../inst/vfzero.m.orig	2022-04-08 22:30:39.255870000 -0500
++++ ../inst/vfzero.m	2022-04-08 22:30:55.406374000 -0500
+@@ -282,7 +282,7 @@
+ 				# fun() might expect full-length
+ 				# argument
+       fval(idx, 1) = fc(idx, 1) = fun (c)(:)(idx, 1);
+-      niter ++; nfev ++;
++      niter++; nfev++;
+     endif
+ 
+     ## Modification 2: skip inverse cubic interpolation if