git: 02d606ffb4c2 - main - net/usockets: Improve port

The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=02d606ffb4c272e869ced9c3cf96e96df5b95ead

commit 02d606ffb4c272e869ced9c3cf96e96df5b95ead
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2025-04-20 22:58:46 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2025-04-20 23:01:09 +0000

    net/usockets: Improve port
    
    PR:             286126
---
 net/usockets/Makefile             | 28 +++++++++++++++++-----------
 net/usockets/files/patch-Makefile | 11 -----------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/net/usockets/Makefile b/net/usockets/Makefile
index aa58c180a918..d7b4ef6980be 100644
--- a/net/usockets/Makefile
+++ b/net/usockets/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	usockets
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net devel
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -13,34 +13,40 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_riscv64=		fails to build: Hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension
 
-USES=		compiler:c++17-lang gmake ssl # c++17 only for temp C_++ code, otherwise it is c11
+USES=		compiler:c++17-lang ssl
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	uNetworking
 GH_PROJECT=	uSockets
 
-MAKE_ARGS=	WITH_OPENSSL=1
-CFLAGS+=	-fPIC # -fPIC is required for the build to succeed, see https://github.com/uNetworking/uSockets/issues/217
-CXXFLAGS+=	-fPIC
+USE_CSTD=	c11
+USE_CXXSTD=	c++17
 
-ALL_TARGET=	default
+CFLAGS+=	-fPIC
 
 SUB_FILES=	libusockets.pc
-SUB_LISTS=	VERSION=${DISTVERSION}
+SUB_LIST+=	VERSION=${DISTVERSION}
 
 PLIST_FILES=	include/libusockets.h \
 		lib/libuSockets.so.0 \
-		lib/libuSockets.so
+		lib/libuSockets.so \
+		libdata/pkgconfig/libusockets.pc
+
+do-build:
+	@cd ${WRKSRC} && \
+		${SETENVI} ${MAKE_ENV} ${CC} ${CFLAGS} -DLIBUS_USE_OPENSSL -Isrc -c src/*.c src/eventing/*.c src/crypto/*.c src/io_uring/*.c && \
+		${SETENVI} ${MAKE_ENV} ${CXX} ${CXXFLAGS} -c src/crypto/*.cpp && \
+		${SETENVI} ${MAKE_ENV} ${CXX} ${CXXFLAGS} -shared -o libuSockets.so.0 -Wl,-soname=libuSockets.so.0 *.o -lssl
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/src/libusockets.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_LIB} ${WRKSRC}/libuSockets.so.0 ${STAGEDIR}${PREFIX}/lib
-	${RLN} ${WRKSRC}/libuSockets.so.0 ${STAGEDIR}${PREFIX}/lib/libuSockets.so
-	${INSTALL_DATA} ${WRKDIR}/libusockets.pc ${STAGEDIR}${LOCALBASE}/libdata/pkgconfig
+	${RLN} ${STAGEDIR}${PREFIX}/lib/libuSockets.so.0 ${STAGEDIR}${PREFIX}/lib/libuSockets.so
+	${INSTALL_DATA} ${WRKDIR}/libusockets.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 
 do-test: # tests fail to compile: https://github.com/uNetworking/uSockets/issues/213
-	cd ${WRKSRC} && \
+	@cd ${WRKSRC} && \
 		${CC} ${CFLAGS} -o test tests/sni_test.c ${STAGEDIR}${PREFIX}/lib/libuSockets.so && \
 		./test
 
diff --git a/net/usockets/files/patch-Makefile b/net/usockets/files/patch-Makefile
deleted file mode 100644
index f8bb9ea1bd80..000000000000
--- a/net/usockets/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2024-02-07 13:04:14 UTC
-+++ Makefile
-@@ -88,7 +88,7 @@ endif
- 	$(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
- endif
- # Create a static library (try windows, then unix)
--	lib.exe /out:uSockets.a *.o || $(AR) rvs uSockets.a *.o
-+	$(CXX) -shared -o libuSockets.so.0 -Wl,-soname=libuSockets.so.0 *.o -lssl
- 
- # BoringSSL needs cmake and golang
- .PHONY: boringssl