diff --git a/lang/ratfor/Makefile b/lang/ratfor/Makefile
index 3c13978b5f1f..0b4dee9b243f 100644
--- a/lang/ratfor/Makefile
+++ b/lang/ratfor/Makefile
@@ -1,40 +1,35 @@
 PORTNAME=	ratfor
 PORTVERSION=	1985.06
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	lang
 MASTER_SITES=	LOCAL/obrien \
 		http://sepwww.stanford.edu/sep/prof/
 DISTFILES=	ratfor.shar.2 local.ratfor77.shar
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Rational FORTRAN compiler
 
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/README
 
-BROKEN_aarch64=		./ratfor -o test.f test.r keeps creating huge output file
-BROKEN_armv6=		./ratfor -o test.f test.r keeps creating huge output file
-BROKEN_armv7=		./ratfor -o test.f test.r keeps creating huge output file
-BROKEN_powerpc=		./ratfor -o test.f test.r keeps creating huge output file
-BROKEN_powerpc64=	./ratfor -o test.f test.r keeps creating huge output file
-BROKEN_powerpc64le=	./ratfor -o test.f test.r keeps creating huge output file
-BROKEN_powerpcspe=	./ratfor -o test.f test.r keeps creating huge output file
+USES=		fortran
+
+ALL_TARGET=	all tests
 
-NO_WRKSUBDIR=	yes
 EXTRACT_CMD=	${CAT}
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	| ${SH}
-ALL_TARGET=	all tests
-USES=		fortran
+
+NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	bin/ratfor bin/ratfor77 share/man/man1/ratfor.1.gz
 
 post-patch:
 	@${PATCH} -d ${WRKSRC} --quiet < ${WRKSRC}/testw.patch
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ratfor77 ${STAGEDIR}${PREFIX}/bin
 	${RLN} ${STAGEDIR}${PREFIX}/bin/ratfor77 ${STAGEDIR}${PREFIX}/bin/ratfor
 	${INSTALL_MAN} ${WRKSRC}/ratfor.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/lang/ratfor/files/patch-Makefile b/lang/ratfor/files/patch-Makefile
index 4ce15b7de3a4..b686e9ab66b8 100644
--- a/lang/ratfor/files/patch-Makefile
+++ b/lang/ratfor/files/patch-Makefile
@@ -1,34 +1,34 @@
 --- Makefile.orig	2020-09-23 11:00:09 UTC
 +++ Makefile
 @@ -11,7 +11,7 @@
  #	On GNU,		        use S_CHAR="char"
  #
  
 -CFLAGS+=	-DF77 -DS_CHAR="char"
-+CFLAGS+=	-DF77 -DS_CHAR="char" -Wno-error=return-type
++CFLAGS+=	-DF77 -DS_CHAR="signed char" -Wno-error=return-type
  #CFLAGS+=	-DS_CHAR="char"
  OBJS=		rat4.o lookup.o getopt.o
  
 @@ -26,13 +26,18 @@ ratfor: ratfor77
  clean:
  	rm -f *.o *~ ratfor ratfor77 a.out test testw test.f testw.f
  
 -test: ratfor
 +.f:
 +	${FC} -o $@ $<
 +
 +test: test.f
 +
 +test.f: ratfor
  	./ratfor -o test.f test.r
 -	f77 -o test test.f
  
 -testw: ratfor
 +testw: testw.f
 +
 +testw.f: ratfor
  	./ratfor -o testw.f testw.r
 -	f77 -o testw testw.f
  
  tests: test testw
  	./test