6 files changed, 14 insertions, 56 deletions
diff --git a/devel/pecl-swoole/Makefile b/devel/pecl-swoole/Makefile
index cbea49956bdd..6134ede22883 100644
--- a/devel/pecl-swoole/Makefile
+++ b/devel/pecl-swoole/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	swoole
-PORTVERSION=	6.0.2
+DISTVERSION=	6.1.3
+PORTREVISION=	0
 CATEGORIES=	devel net
 
 MAINTAINER=	vanilla@FreeBSD.org
@@ -11,13 +12,13 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NOT_FOR_ARCHS=	i386 powerpc
 NOT_FOR_ARCHS_REASON=	upstream drop 32 bits support
+IGNORE_WITH_PHP=	85
 
 USES=		compiler:c11 localbase:ldflags php:build,pecl pkgconfig ssl
-IGNORE_WITH_PHP=	85
 
-CONFIGURE_ARGS+=	--enable-mysqlnd
+CONFIGURE_ARGS+=	--enable-mysqlnd --enable-openssl
 
-OPTIONS_DEFINE=		BROTLI CARES CURL PGSQL SOCKETS ZSTD
+OPTIONS_DEFINE=		BROTLI CARES CURL ODBC PGSQL SOCKETS SQLITE ZSTD
 CARES_LIB_DEPENDS=	libcares.so:dns/c-ares
 CARES_CONFIGURE_ON=	--enable-cares
 SOCKETS_USE=		PHP=sockets:build
@@ -35,5 +36,11 @@ BROTLI_LIB_DEPENDS=	libbrotlicommon.so:archivers/brotli
 ZSTD_CONFIGURE_ON=	--enable-zstd
 ZSTD_CONFIGURE_OFF=	--disable-zstd
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
+ODBC_CONFIGURE_ON=	--with-swoole-odbc=unixODBC
+ODBC_CONFIGURE_OFF=	--without-swoole-odbc
+ODBC_USE=		PHP=odbc:build
+SQLITE_CONFIGURE_ON=	--enable-swoole-sqlite
+SQLITE_CONFIGURE_OFF=	--disable-swoole-sqlite
+SQLITE_USE=		PHP=sqlite3
 
 .include <bsd.port.mk>
diff --git a/devel/pecl-swoole/distinfo b/devel/pecl-swoole/distinfo
index 38f9acc912f2..1c5aa268e386 100644
--- a/devel/pecl-swoole/distinfo
+++ b/devel/pecl-swoole/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742736592
-SHA256 (PECL/swoole-6.0.2.tgz) = ca9df27a4188f6670720ffaed9c4ecd6e832ea5aed55e554b63230f3147166ca
-SIZE (PECL/swoole-6.0.2.tgz) = 2330514
+TIMESTAMP = 1764140643
+SHA256 (PECL/swoole-6.1.3.tgz) = 636b63b359e15ca8ff8b9fd7a72cf447d8fbdc5903f335a45cc94907c7355d27
+SIZE (PECL/swoole-6.1.3.tgz) = 2455981
diff --git a/devel/pecl-swoole/files/patch-ext-src_php__swoole__cxx.h b/devel/pecl-swoole/files/patch-ext-src_php__swoole__cxx.h
deleted file mode 100644
index b61ec975fc34..000000000000
--- a/devel/pecl-swoole/files/patch-ext-src_php__swoole__cxx.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- ext-src/php_swoole_cxx.h.orig	2024-12-16 08:02:21 UTC
-+++ ext-src/php_swoole_cxx.h
-@@ -200,6 +200,10 @@ using tcp_info = tcp_connection_info;
- using tcp_info = tcp_connection_info;
- #endif
- 
-+#ifdef __FreeBSD__
-+#define SOL_TCP IPPROTO_TCP
-+#endif
-+
- #ifdef TCP_INFO
- std::unordered_map<std::string, uint64_t> sw_socket_parse_tcp_info(tcp_info *info);
- #endif
diff --git a/devel/pecl-swoole/files/patch-include_swoole__async.h b/devel/pecl-swoole/files/patch-include_swoole__async.h
deleted file mode 100644
index e84e2731f615..000000000000
--- a/devel/pecl-swoole/files/patch-include_swoole__async.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/swoole_async.h.orig	2024-11-28 03:39:05 UTC
-+++ include/swoole_async.h
-@@ -23,6 +23,11 @@
- #include <mutex>
- #include <atomic>
- 
-+#ifdef __FreeBSD__
-+#include <arpa/inet.h>
-+#include <netinet/in.h>
-+#endif
-+
- #ifndef O_DIRECT
- #define O_DIRECT 040000
- #endif
diff --git a/devel/pecl-swoole/files/patch-include_swoole__socket.h b/devel/pecl-swoole/files/patch-include_swoole__socket.h
deleted file mode 100644
index 302c92fb3b28..000000000000
--- a/devel/pecl-swoole/files/patch-include_swoole__socket.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/swoole_socket.h.orig	2021-07-16 07:18:11 UTC
-+++ include/swoole_socket.h
-@@ -17,6 +17,7 @@
- 
- #pragma once
- 
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <sys/uio.h>
diff --git a/devel/pecl-swoole/files/patch-src_coroutine_system.cc b/devel/pecl-swoole/files/patch-src_coroutine_system.cc
deleted file mode 100644
index ad235fcfbf97..000000000000
--- a/devel/pecl-swoole/files/patch-src_coroutine_system.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/coroutine/system.cc.orig	2024-11-28 03:39:05 UTC
-+++ src/coroutine/system.cc
-@@ -701,7 +701,8 @@ std::shared_ptr<AsyncLock> async_lock(void *resource) 
-                            "resource(%p) has already been bound to another coroutine#%ld, "
-                            "%s of the same resource in coroutine#%ld at the same time is not allowed",
-                            resource,
--                           *iter,
-+			   iter->second,
-+			   iter->first,
-                            Coroutine::get_current_cid());
-         return nullptr;
-     }