git: fe7c4186b6d2 - main - net/rsplib: Update to 3.4.7

From: Daniel Engberg <diizzy_at_FreeBSD.org>
Date: Sun, 18 Feb 2024 16:22:39 UTC
The branch main has been updated by diizzy:

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

commit fe7c4186b6d2bec94404c0a6b0adc35f3fa2725c
Author:     Thomas Dreibholz <thomas.dreibholz@gmail.com>
AuthorDate: 2024-02-18 15:32:56 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2024-02-18 16:20:20 +0000

    net/rsplib: Update to 3.4.7
    
    Update maintainer email
    
    Changelog:
    https://github.com/dreibh/rsplib/blob/rsplib-3.4.7/ChangeLog
    
    PR:             275599
---
 net/rsplib/Makefile                        | 17 +++++-----
 net/rsplib/distinfo                        |  6 ++--
 net/rsplib/files/patch-docs_CMakeLists.txt |  6 ----
 net/rsplib/files/patch-src_CMakeLists.txt  | 11 ++++++
 net/rsplib/files/patch-src_randomizer.c    | 47 --------------------------
 net/rsplib/pkg-plist                       | 54 +++++++++++++++---------------
 6 files changed, 49 insertions(+), 92 deletions(-)

diff --git a/net/rsplib/Makefile b/net/rsplib/Makefile
index 8b2fe1ddd2c9..eb8228a6bacf 100644
--- a/net/rsplib/Makefile
+++ b/net/rsplib/Makefile
@@ -1,24 +1,23 @@
 PORTNAME=	rsplib
-PORTVERSION=	3.3.1
+DISTVERSION=	3.4.7
 CATEGORIES=	net
-MASTER_SITES=	https://www.uni-due.de/~be0001/rserpool/download/
+MASTER_SITES=	https://www.nntb.no/~dreibh/rserpool/download/
 
-MAINTAINER=	dreibh@iem.uni-due.de
+MAINTAINER=	thomas.dreibholz@gmail.com
 COMMENT=	RSerPool Framework and Example Applications
-WWW=		https://www.uni-due.de/~be0001/rserpool/
+WWW=		https://www.nntb.no/~dreibh/rserpool/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cmake compiler:c++11-lang qt:5 shebangfix tar:xz
+SHEBANG_FILES=	src/scriptingserviceexample
 USE_LDCONFIG=	yes
 USE_QT=		buildtools:build core gui qmake widgets xml
 
-CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR=${PREFIX}/man \
-		-DDOCSDIR="${DOCSDIR}" \
-		-DUSE_KERNEL_SCTP=1 -DENABLE_CSP=1 -DENABLE_QT=1
-SHEBANG_FILES=	src/scriptingserviceexample
+PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
-PLIST_SUB=	VERSION=${PORTVERSION}
+CMAKE_ARGS=	-DCMAKE_INSTALL_DOCDIR=${DOCSDIR} \
+		-DUSE_KERNEL_SCTP=1 -DENABLE_CSP=1 -DENABLE_QT=1
 
 .include <bsd.port.mk>
diff --git a/net/rsplib/distinfo b/net/rsplib/distinfo
index fd5250587b1f..787695599a64 100644
--- a/net/rsplib/distinfo
+++ b/net/rsplib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620065782
-SHA256 (rsplib-3.3.1.tar.xz) = 71238048a7b2f827b8aade3d404fb31ed5b285521fa38d68fa36507c58f1417e
-SIZE (rsplib-3.3.1.tar.xz) = 1031180
+TIMESTAMP = 1702901197
+SHA256 (rsplib-3.4.7.tar.xz) = 3dfb0c79abfcee72e783b3d28b38e23ece32f25ee576743a5c0b0a5be583fe72
+SIZE (rsplib-3.4.7.tar.xz) = 1047772
diff --git a/net/rsplib/files/patch-docs_CMakeLists.txt b/net/rsplib/files/patch-docs_CMakeLists.txt
deleted file mode 100644
index c35e17564c96..000000000000
--- a/net/rsplib/files/patch-docs_CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
---- docs/CMakeLists.txt.orig	2019-08-05 14:28:40 UTC
-+++ docs/CMakeLists.txt
-@@ -1,2 +1,2 @@
- # ###### Documentation ######################################################
--INSTALL(FILES Handbook.pdf DESTINATION ${CMAKE_INSTALL_DOCDIR})
-+INSTALL(FILES Handbook.pdf DESTINATION ${DOCSDIR})
diff --git a/net/rsplib/files/patch-src_CMakeLists.txt b/net/rsplib/files/patch-src_CMakeLists.txt
new file mode 100644
index 000000000000..f41d391c6f94
--- /dev/null
+++ b/net/rsplib/files/patch-src_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- src/CMakeLists.txt.orig	2024-02-18 08:39:10 UTC
++++ src/CMakeLists.txt
+@@ -477,7 +477,7 @@ INSTALL(TARGETS             rspregistrar
+ INSTALL(TARGETS             rspregistrar
+         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+         BUNDLE DESTINATION  ${CMAKE_INSTALL_BINDIR})
+-INSTALL(FILES rspregistrar.service DESTINATION /lib/systemd/system)
++# INSTALL(FILES rspregistrar.service DESTINATION /lib/systemd/system)
+ INSTALL(FILES rspregistrar.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ 
+ ADD_EXECUTABLE(rspserver rspserver.cc standardservices.cc fractalgeneratorservice.cc calcappservice.cc scriptingservice.cc environmentcache.cc memfile.cc sha1.c)
diff --git a/net/rsplib/files/patch-src_randomizer.c b/net/rsplib/files/patch-src_randomizer.c
deleted file mode 100644
index 667c7c707bdd..000000000000
--- a/net/rsplib/files/patch-src_randomizer.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/randomizer.c.orig	2021-02-17 14:14:20 UTC
-+++ src/randomizer.c
-@@ -32,13 +32,12 @@
- #include <math.h>
- #include <stdlib.h>
- 
--
-+/*
- #ifdef NDEBUG
- #undef min
- #undef max
- #include <omnetpp.h>
- #else
--/*
-    It is tried to use /dev/urandom as random source first, since
-    it provides high-quality random numbers. If /dev/urandom is not
-    available, use the clib's random() function with a seed given
-@@ -56,7 +55,6 @@
- 
- static int   RandomSource = RS_TRY_DEVICE;
- static FILE* RandomDevice = NULL;
--#endif
- 
- 
- 
-@@ -84,11 +82,13 @@ uint64_t random64()
- /* ###### Get 32-bit random value ######################################## */
- uint32_t random32()
- {
-+/*
- #ifdef NDEBUG
- #warning Using OMNeT++ random generator instead of time-seeded one!
-    const double value = uniform(0.0, (double)0xffffffff);
-    return((uint32_t)rint(value));
- #else
-+*/
-    uint32_t number;
- 
-    switch(RandomSource) {
-@@ -116,7 +116,6 @@ uint32_t random32()
-       break;
-    }
-    return(random());
--#endif
- }
- 
- 
diff --git a/net/rsplib/pkg-plist b/net/rsplib/pkg-plist
index 1f3f3286e949..ea843e42e378 100644
--- a/net/rsplib/pkg-plist
+++ b/net/rsplib/pkg-plist
@@ -87,78 +87,78 @@ include/rserpool/udplikeserver.h
 lib/libcpprspserver.a
 lib/libcpprspserver.so
 lib/libcpprspserver.so.3
-lib/libcpprspserver.so.%%VERSION%%
+lib/libcpprspserver.so.%%DISTVERSION%%
 lib/librspcsp.a
 lib/librspcsp.so
 lib/librspcsp.so.3
-lib/librspcsp.so.%%VERSION%%
+lib/librspcsp.so.%%DISTVERSION%%
 lib/librspdispatcher.a
 lib/librspdispatcher.so
 lib/librspdispatcher.so.3
-lib/librspdispatcher.so.%%VERSION%%
+lib/librspdispatcher.so.%%DISTVERSION%%
 lib/librsphsmgt.a
 lib/librsphsmgt.so
 lib/librsphsmgt.so.3
-lib/librsphsmgt.so.%%VERSION%%
+lib/librsphsmgt.so.%%DISTVERSION%%
 lib/librsplib.a
 lib/librsplib.so
 lib/librsplib.so.3
-lib/librsplib.so.%%VERSION%%
+lib/librsplib.so.%%DISTVERSION%%
 lib/librspmessaging.a
 lib/librspmessaging.so
 lib/librspmessaging.so.3
-lib/librspmessaging.so.%%VERSION%%
+lib/librspmessaging.so.%%DISTVERSION%%
 lib/libtdbreakdetector.a
 lib/libtdbreakdetector.so
 lib/libtdbreakdetector.so.3
-lib/libtdbreakdetector.so.%%VERSION%%
+lib/libtdbreakdetector.so.%%DISTVERSION%%
 lib/libtdcppthread.a
 lib/libtdcppthread.so
 lib/libtdcppthread.so.3
-lib/libtdcppthread.so.%%VERSION%%
+lib/libtdcppthread.so.%%DISTVERSION%%
 lib/libtdloglevel.a
 lib/libtdloglevel.so
 lib/libtdloglevel.so.3
-lib/libtdloglevel.so.%%VERSION%%
+lib/libtdloglevel.so.%%DISTVERSION%%
 lib/libtdnetutilities.a
 lib/libtdnetutilities.so
 lib/libtdnetutilities.so.3
-lib/libtdnetutilities.so.%%VERSION%%
+lib/libtdnetutilities.so.%%DISTVERSION%%
 lib/libtdrandomizer.a
 lib/libtdrandomizer.so
 lib/libtdrandomizer.so.3
-lib/libtdrandomizer.so.%%VERSION%%
+lib/libtdrandomizer.so.%%DISTVERSION%%
 lib/libtdstorage.a
 lib/libtdstorage.so
 lib/libtdstorage.so.3
-lib/libtdstorage.so.%%VERSION%%
+lib/libtdstorage.so.%%DISTVERSION%%
 lib/libtdstringutilities.a
 lib/libtdstringutilities.so
 lib/libtdstringutilities.so.3
-lib/libtdstringutilities.so.%%VERSION%%
+lib/libtdstringutilities.so.%%DISTVERSION%%
 lib/libtdtagitem.a
 lib/libtdtagitem.so
 lib/libtdtagitem.so.3
-lib/libtdtagitem.so.%%VERSION%%
+lib/libtdtagitem.so.%%DISTVERSION%%
 lib/libtdthreadsafety.a
 lib/libtdthreadsafety.so
 lib/libtdthreadsafety.so.3
-lib/libtdthreadsafety.so.%%VERSION%%
+lib/libtdthreadsafety.so.%%DISTVERSION%%
 lib/libtdtimeutilities.a
 lib/libtdtimeutilities.so
 lib/libtdtimeutilities.so.3
-lib/libtdtimeutilities.so.%%VERSION%%
-man/man1/calcappclient.1.gz
-man/man1/cspmonitor.1.gz
-man/man1/fractalpooluser.1.gz
-man/man1/hsdump.1.gz
-man/man1/pingpongclient.1.gz
-man/man1/rspregistrar.1.gz
-man/man1/rspserver.1.gz
-man/man1/rspterminal.1.gz
-man/man1/scriptingclient.1.gz
-man/man1/scriptingcontrol.1.gz
-man/man1/scriptingserviceexample.1.gz
+lib/libtdtimeutilities.so.%%DISTVERSION%%
+share/man/man1/calcappclient.1.gz
+share/man/man1/cspmonitor.1.gz
+share/man/man1/fractalpooluser.1.gz
+share/man/man1/hsdump.1.gz
+share/man/man1/pingpongclient.1.gz
+share/man/man1/rspregistrar.1.gz
+share/man/man1/rspserver.1.gz
+share/man/man1/rspterminal.1.gz
+share/man/man1/scriptingclient.1.gz
+share/man/man1/scriptingcontrol.1.gz
+share/man/man1/scriptingserviceexample.1.gz
 share/doc/rsplib/Handbook.pdf
 share/fgpconfig/input-001.fsf
 share/fgpconfig/input-002.fsf