diff --git a/science/cdf/Makefile b/science/cdf/Makefile
index 161cf75db9c6..2bbfcf72ba32 100644
--- a/science/cdf/Makefile
+++ b/science/cdf/Makefile
@@ -1,59 +1,56 @@
 # Created by: Thierry Thomas <thierry@pompo.net>
 
 PORTNAME=	cdf3
 PORTVERSION=	3.8.0
 CATEGORIES=	science
 MASTER_SITES=	https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/
 DISTNAME=	cdf${VER}-dist-cdf
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Device independent view of the CDF data model
 
 LICENSE=	NASA-G
 LICENSE_NAME=	NASA/Goddard Space Flight Center
 LICENSE_FILE=	${WRKSRC}/CDF_copyright.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BROKEN_aarch64=		fails to compile: error: use of undeclared identifier FP1ZEROsingle; did you mean FP1zeroSingle?
-BROKEN_armv6=		fails to compile: error: use of undeclared identifier FP1ZEROsingle; did you mean FP1zeroSingle?
-BROKEN_armv7=		fails to compile: error: use of undeclared identifier FP1ZEROsingle; did you mean FP1zeroSingle?
-
 BUILD_DEPENDS=	bash:shells/bash
 
 USES=		fortran ncurses gmake
 
 USE_LDCONFIG=	yes
 MAKE_FLAGS=	INSTALLDIR=${STAGEDIR}${PREFIX} OS=freebsd ENV=gnu \
 		FORTRAN=yes FC_freebsd=${F77}
 MAKE_JOBS_UNSAFE=	yes
 TEST_TARGET=	test  # XXX: test segfaults
 FFLAGS+=	-std=legacy
 
 WRKSRC=		${WRKDIR}/cdf${VER}-dist
 SUB_FILES=	pkg-message
 
 VER=		${PORTVERSION:S/.//:S/./_/}
 DEFS=		B C K
 
 PORTDOCS=	CDF_copyright.txt CHANGES.txt Release.notes Welcome.txt
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 MAKE_ARGS+=	OS=freebsd ENV=gnu all
+TEST_TARGET=	test
 
 post-patch:
 .for def in ${DEFS}
 	@${REINPLACE_CMD} -e 's|<path>|${PREFIX}|' \
 		 ${WRKSRC}/src/definitions/definitions.${def}
 .endfor
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/samples/* ${STAGEDIR}${EXAMPLESDIR}
 	${SED} -i '' 's,${STAGEDIR},,g' ${STAGEDIR}${PREFIX}/bin/definitions.?
 	${RM} -f ${STAGEDIR}${PREFIX}/CDFLeapSeconds.txt
 
 .include <bsd.port.mk>
diff --git a/science/cdf/files/patch-src_include_cdfdist.h b/science/cdf/files/patch-src_include_cdfdist.h
index 6e3d27a36448..3e3b47c5d8b1 100644
--- a/science/cdf/files/patch-src_include_cdfdist.h
+++ b/science/cdf/files/patch-src_include_cdfdist.h
@@ -1,11 +1,20 @@
---- src/include/cdfdist.h.orig	2022-01-08 02:20:38 UTC
+--- src/include/cdfdist.h.orig	2019-10-16 16:22:18 UTC
 +++ src/include/cdfdist.h
+@@ -135,7 +135,7 @@
+ #  define unix
+ #endif
+ 
+-#if defined(__arm__)
++#if defined(__arm__) || defined (__aarch64__)
+ #  define ARM
+ #  if defined(__BYTE_ORDER__)
+ #     if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
 @@ -567,7 +567,7 @@ typedef sChar sByte;
  #      if defined(__DARWIN_64_BIT_INO_T)
  #         define STAT     stat
  #      else
 -#         define STAT     stat64
 +#         define STAT     stat
  #      endif
  #    endif
  #  endif