diff --git a/net/libsockpp/Makefile b/net/libsockpp/Makefile
index eeea4aed799f..96440fe7e9e4 100644
--- a/net/libsockpp/Makefile
+++ b/net/libsockpp/Makefile
@@ -1,34 +1,57 @@
 PORTNAME=	libsockpp
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.8.1
+DISTVERSION=	0.8.2
 CATEGORIES=	net devel
 
 MAINTAINER=	peter@flytrace.com
 COMMENT=	Simple, modern, C++ socket library
 WWW=		https://github.com/fpagliughi/sockpp
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake compiler:c++14-lang
 
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	fpagliughi
 GH_PROJECT=	sockpp
 
-OPTIONS_DEFINE=		TEST
+OPTIONS_DEFINE=		DOCS EXAMPLES STATIC TEST
+OPTIONS_DEFAULT=	EXAMPLES
 
-TEST_DESC=	Build unit tests (requires Catch2)
+DOCS_DESC=	Create and install the HTML based API documentation (requires Doxygen)
+STATIC_DESC=	Build the static library
+EXAMPLES_DESC=	Build example programs
+TEST_DESC=	Build the unit tests (requires Catch2)
 
+STATIC_CMAKE_BOOL=	SOCKPP_BUILD_STATIC
+EXAMPLES_CMAKE_BOOL=	SOCKPP_BUILD_EXAMPLES
 TEST_BUILD_DEPENDS=	catch2>0:devel/catch2
 TEST_CMAKE_BOOL=	SOCKPP_BUILD_TESTS
 
-CMAKE_ARGS=	-DSOCKPP_BUILD_STATIC=FALSE -DSOCKPP_BUILD_DOCUMENTATION=FALSE
+OPTIONS_SUB=		yes
+EXAMPLES_TO_REMOVE=	tcp6echo \
+			tcp6echosvr \
+			tcpecho \
+			tcpechomt \
+			tcpechosvr \
+			tcpechotest \
+			udp6echo \
+			udpecho \
+			udpechosvr \
+			undgramecho \
+			undgramechosvr \
+			unecho \
+			unechosvr \
+			unechotest
 
 post-patch:
 	${REINPLACE_CMD} -e 's|#include "catch2/catch.hpp"|#include "catch2/catch_all.hpp"|' \
 		${WRKSRC}/tests/unit/*.cpp
 
+post-install:
+	cd ${STAGEDIR}${PREFIX}/bin && ${RM} ${EXAMPLES_TO_REMOVE}
+
 .include <bsd.port.mk>
diff --git a/net/libsockpp/distinfo b/net/libsockpp/distinfo
index 63feab82b420..f90a05f6dea2 100644
--- a/net/libsockpp/distinfo
+++ b/net/libsockpp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1701641346
-SHA256 (fpagliughi-sockpp-v0.8.1_GH0.tar.gz) = a8aedff8bd8c1da530b91be650352008fddabc9f1df0d19701d76cbc359c8651
-SIZE (fpagliughi-sockpp-v0.8.1_GH0.tar.gz) = 114112
+TIMESTAMP = 1701899962
+SHA256 (fpagliughi-sockpp-v0.8.2_GH0.tar.gz) = cf012d6553d165976ad3f3108c332300b1f69b690a444a043883879c68e1966b
+SIZE (fpagliughi-sockpp-v0.8.2_GH0.tar.gz) = 114258
diff --git a/net/libsockpp/pkg-plist b/net/libsockpp/pkg-plist
index 0952ff1f13d1..287471dc8026 100644
--- a/net/libsockpp/pkg-plist
+++ b/net/libsockpp/pkg-plist
@@ -1,35 +1,36 @@
 include/sockpp/acceptor.h
 include/sockpp/can_address.h
 include/sockpp/can_frame.h
 include/sockpp/can_socket.h
 include/sockpp/connector.h
 include/sockpp/datagram_socket.h
 include/sockpp/exception.h
 include/sockpp/inet6_address.h
 include/sockpp/inet_address.h
 include/sockpp/platform.h
 include/sockpp/result.h
 include/sockpp/sock_address.h
 include/sockpp/socket.h
 include/sockpp/stream_socket.h
 include/sockpp/tcp6_acceptor.h
 include/sockpp/tcp6_connector.h
 include/sockpp/tcp6_socket.h
 include/sockpp/tcp_acceptor.h
 include/sockpp/tcp_connector.h
 include/sockpp/tcp_socket.h
 include/sockpp/udp6_socket.h
 include/sockpp/udp_socket.h
 include/sockpp/unix_acceptor.h
 include/sockpp/unix_address.h
 include/sockpp/unix_connector.h
 include/sockpp/unix_dgram_socket.h
 include/sockpp/unix_stream_socket.h
 include/sockpp/version.h
 lib/cmake/sockpp/sockppConfig.cmake
 lib/cmake/sockpp/sockppConfigVersion.cmake
 lib/cmake/sockpp/sockppTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/sockpp/sockppTargets.cmake
+%%STATIC%%lib/libsockpp.a
 lib/libsockpp.so
 lib/libsockpp.so.0
-lib/libsockpp.so.0.8.1
+lib/libsockpp.so.0.8.2