diff --git a/sysutils/facter/Makefile b/sysutils/facter/Makefile
index b834570b48df..5eec488bb1c5 100644
--- a/sysutils/facter/Makefile
+++ b/sysutils/facter/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	facter
 PORTVERSION=	3.14.24
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES?=	sysutils
 MASTER_SITES=	https://downloads.puppetlabs.com/facter/
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	Cross-platform library for retrieving facts from OS
 WWW=		https://puppetlabs.com/facter
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_DragonFly=	DragonFly is not supported upstream
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libleatherman_locale.so:devel/leatherman \
 		liblibcpp-hocon.so:devel/cpp-hocon \
 		libyaml-cpp.so:devel/yaml-cpp
 
 CONFLICTS_INSTALL=	rubygem-facter
 
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 
 USES=		cmake:noninja compiler:c++11-lib cpe ruby ssl
 CPE_VENDOR=	puppet
 USE_LDCONFIG=	yes
 CMAKE_OFF=	ENABLE_CXX_WERROR
 
 OPTIONS_DEFINE=	FACTER_JAVA
 FACTER_JAVA_DESC=	Build with Java bindings for puppetserver
 FACTER_JAVA_USE=	java=yes
 FACTER_JAVA_VARS=	JAVA_BUILD=yes
 FACTER_JAVA_CMAKE_ON=	-DJAVA_HOME=${JAVA_HOME}
 
 OPTIONS_DEFAULT=	FACTER_JAVA
 
 OPTIONS_SUB=	yes
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/lib/src/facts/posix/collection.cc \
 		${WRKSRC}/lib/src/util/config/posix/config.cc
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/specifications
 	${INSTALL_DATA} ${WRKSRC}/.gemspec ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/specifications/${DISTNAME}.gemspec
 
 test: build
 	cd ${WRKSRC}/lib && bundle install --path vendor
 	cd ${CONFIGURE_WRKSRC} && ${MAKE_CMD} test
 
 .include <bsd.port.mk>
diff --git a/sysutils/facter/files/patch-CMakeLists.txt b/sysutils/facter/files/patch-CMakeLists.txt
index 246444a7eb8c..05e68a065e7d 100644
--- a/sysutils/facter/files/patch-CMakeLists.txt
+++ b/sysutils/facter/files/patch-CMakeLists.txt
@@ -1,11 +1,20 @@
---- CMakeLists.txt.orig	2024-02-25 16:48:32 UTC
+--- CMakeLists.txt.orig	2022-07-18 15:00:22 UTC
 +++ CMakeLists.txt
-@@ -233,7 +233,7 @@ add_test(NAME "facter\\ smoke" COMMAND facter)
+@@ -121,7 +121,7 @@ if (NOT WITHOUT_JRUBY AND NOT WIN32)
+ 
+         if (Java_JAVAC_EXECUTABLE)
+             set(JRUBY_SUPPORT TRUE)
+-            set(CMAKE_JAVA_COMPILE_FLAGS -source 1.6 -target 1.6)
++            set(CMAKE_JAVA_COMPILE_FLAGS -source 8 -target 8)
+             add_definitions(-DUSE_JRUBY_SUPPORT)
+         endif()
+     endif()
+@@ -233,7 +233,7 @@ endif()
  add_test(NAME "facter\\ smoke" COMMAND facter)
  
  # Install the man page
 -if ("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD|FreeBSD")
 +if ("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD")
      set(MANDIR man/man8/)
  else()
      set(MANDIR share/man/man8/)