diff --git a/devel/bacnet-stack/Makefile b/devel/bacnet-stack/Makefile
index fb391fdf5b1f..82582e2ec392 100644
--- a/devel/bacnet-stack/Makefile
+++ b/devel/bacnet-stack/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	bacnet-stack
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	open source protocol stack for embedded systems
 WWW=		https://github.com/bacnet-stack/bacnet-stack
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/license/readme.txt
 
 LIB_DEPENDS=	libdispatch.so:devel/libdispatch
 
 USES=		cmake compiler:c++11-lang localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	bacnet-stack
 GH_TAGNAME=	c111154
 
 LDFLAGS=	-lm
 
 .include <bsd.port.mk>
diff --git a/devel/bacnet-stack/files/patch-ports_bsd_bip6.c b/devel/bacnet-stack/files/patch-ports_bsd_bip6.c
new file mode 100644
index 000000000000..dc7e62205a6c
--- /dev/null
+++ b/devel/bacnet-stack/files/patch-ports_bsd_bip6.c
@@ -0,0 +1,13 @@
+--- ports/bsd/bip6.c.orig	2025-06-28 19:56:23 UTC
++++ ports/bsd/bip6.c
+@@ -22,8 +22,8 @@
+ #endif
+ #include "bacport.h"
+ 
+-#if defined(__APPLE__) || defined(__darwin__)
+-/* OSX seems not to define these. */
++#if defined(__APPLE__) || defined(__darwin__) || defined(__FreeBSD__)
++/* FreeBSD 13.x and OSX seems not to define these. */
+ #ifndef s6_addr16
+ #define s6_addr16 __u6_addr.__u6_addr16
+ #endif
diff --git a/sysutils/bacnet-stack-apps/Makefile b/sysutils/bacnet-stack-apps/Makefile
index dce98d691dc0..f6dc56ca23a9 100644
--- a/sysutils/bacnet-stack-apps/Makefile
+++ b/sysutils/bacnet-stack-apps/Makefile
@@ -1,54 +1,55 @@
 PORTNAME=	bacnet-stack
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-apps
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	open source protocol stack for embedded systems (apps)
 WWW=		https://github.com/bacnet-stack/bacnet-stack
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/license/readme.txt
 
 LIB_DEPENDS=	libdispatch.so:devel/libdispatch
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		gmake compiler:c++11-lang localbase:ldflags shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	bacnet-stack
 GH_TAGNAME=	c111154
 
 LDFLAGS=	-lm
 
 ALL_TARGET=	bsd
 
 SHEBANG_LANG=	bash
 SHEBANG_FILES=	bin/*.sh
 
 BACNET_APPS=	bacabort bacackalarm bacale bacarf bacawf bacco bacdcc bacdo \
 		bacepics bacerror bacevent bacge baciam baciamr bacinitr \
 		bacnni bacpoll bacrbdt bacrd bacrfdt bacrle bacrp bacrpm bacrr \
 		bacscov bacserv bacts bacucov bacuevent bacupt bacwbdt bacwh \
 		bacwi bacwinn bacwir bacwp bacwpm
 BACNET_SCRIPTS=	abort-reason.sh bacbbmd.sh bacroute.sh bacrpd.sh bvlc.sh \
 		door-status.sh error-code.sh event-state.sh event-type.sh \
 		lock-status.sh object-type.sh program-request.sh \
 		program-state.sh property_id.sh property-states.sh \
 		reliability.sh restart-reason.sh router-mstp.sh units.sh \
 		vendor-id.sh
 
 post-patch:
 	@${REINPLACE_CMD} -i "" 's|\./bin/||g' ${WRKSRC}/bin/*.sh
 	@${REINPLACE_CMD} -i "" 's|\./||g' ${WRKSRC}/bin/*.sh
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for FILE in ${BACNET_APPS}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${FILE} ${STAGEDIR}${PREFIX}/bin/
 .endfor
 
 .for FILE in ${BACNET_SCRIPTS}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${FILE} ${STAGEDIR}${DATADIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/bacnet-stack-apps/files/patch-CMakeLists.txt b/sysutils/bacnet-stack-apps/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..ea54510ad534
--- /dev/null
+++ b/sysutils/bacnet-stack-apps/files/patch-CMakeLists.txt
@@ -0,0 +1,44 @@
+--- CMakeLists.txt.orig	2025-06-23 23:19:03 UTC
++++ CMakeLists.txt
+@@ -834,10 +834,40 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+ 
+   target_sources(${PROJECT_NAME} PRIVATE
+     ports/bsd/bacport.h
+-    ports/bsd/bip-init.c
++    $<$<BOOL:${BACDL_BIP}>:ports/bsd/bip-init.c>
++    $<$<BOOL:${BACDL_BIP6}>:ports/bsd/bip6.c>
++    $<$<BOOL:${BACDL_MSTP}>:ports/bsd/rs485.c>
++    $<$<BOOL:${BACDL_MSTP}>:ports/bsd/rs485.h>
++    $<$<BOOL:${BACDL_MSTP}>:ports/bsd/dlmstp.c>
+     ports/bsd/datetime-init.c
+     ports/bsd/mstimer-init.c
++    $<$<BOOL:${BACDL_BSC}>:ports/bsd/bsc-event.c>
++    $<$<BOOL:${BACDL_BSC}>:ports/bsd/websocket-cli.c>
++    $<$<BOOL:${BACDL_BSC}>:ports/bsd/websocket-srv.c>
++    $<$<BOOL:${BACDL_BSC}>:ports/bsd/websocket-global.c>
+     ports/bsd/stdbool.h)
++
++  if(BACDL_ETHERNET)
++    FIND_PATH(PCAP_INCLUDE pcap.h)
++    if(NOT PCAP_INCLUDE)
++      message(WARNING "BACNET: pcap.h header file not found")
++    else()
++      message(STATUS "BACNET: pcap Include:...................\"${PCAP_INCLUDE}\"")
++    endif()
++    FIND_LIBRARY(PCAP_LIBRARIES NAMES pcap)
++    if(NOT PCAP_LIBRARIES)
++      message(WARNING "BACNET: libpcap not found")
++    else()
++      message(STATUS "BACNET: pcap Lib:.......................\"${PCAP_LIBRARIES}\"")
++    endif()
++    if(PCAP_INCLUDE AND PCAP_LIBRARIES)
++      include_directories(${PCAP_INCLUDE})
++      link_libraries(${PCAP_LIBRARIES})
++      target_sources(${PROJECT_NAME} PRIVATE
++        ports/bsd/ethernet.c
++      )
++    endif()
++  endif()
+ endif()
+ 
+ target_include_directories(${PROJECT_NAME} PUBLIC
diff --git a/sysutils/bacnet-stack-apps/files/patch-ports_bsd_bip6.c b/sysutils/bacnet-stack-apps/files/patch-ports_bsd_bip6.c
new file mode 100644
index 000000000000..dc7e62205a6c
--- /dev/null
+++ b/sysutils/bacnet-stack-apps/files/patch-ports_bsd_bip6.c
@@ -0,0 +1,13 @@
+--- ports/bsd/bip6.c.orig	2025-06-28 19:56:23 UTC
++++ ports/bsd/bip6.c
+@@ -22,8 +22,8 @@
+ #endif
+ #include "bacport.h"
+ 
+-#if defined(__APPLE__) || defined(__darwin__)
+-/* OSX seems not to define these. */
++#if defined(__APPLE__) || defined(__darwin__) || defined(__FreeBSD__)
++/* FreeBSD 13.x and OSX seems not to define these. */
+ #ifndef s6_addr16
+ #define s6_addr16 __u6_addr.__u6_addr16
+ #endif