6 files changed, 120 insertions, 67 deletions

diff --git a/net/rsplib/Makefile b/net/rsplib/Makefile
index 15000b3779d0..e56c0a963632 100644
--- a/net/rsplib/Makefile
+++ b/net/rsplib/Makefile
@@ -2,29 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	rsplib
-PORTVERSION=	3.0.2
-PORTREVISION=	2
+PORTVERSION=	3.2.0
 CATEGORIES=	net
-MASTER_SITES=	http://www.exp-math.uni-essen.de/~dreibh/rserpool/download/
+MASTER_SITES=	https://www.uni-due.de/~be0001/rserpool/download/
 
 MAINTAINER=	dreibh@iem.uni-due.de
 COMMENT=	RSerPool Framework and Example Applications
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN=		fails to compile: fractalgeneratorservice.cc:353:12: expected unqualified-id
+USES=		cmake compiler:c++14-lang qt:5 shebangfix
+USE_LDCONFIG=	yes
+USE_QT=		core gui widgets xml buildtools_build qmake_build
 
-DEPRECATED=		Qt4 has been EOL since december 2015
-EXPIRATION_DATE=	2019-03-15
+CMAKE_ARGS=	-DCMAKE_INSTALL_MANDIR=${PREFIX}/man \
+		-DDOCSDIR=${DOCSDIR}
+CMAKE_ON=	ENABLE_CSP ENABLE_QT USE_KERNEL_SCTP
+SHEBANG_FILES=	src/scriptingserviceexample
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-maintainer-mode \
-		--enable-qt --with-qt-lib=${QT_LIBDIR} \
-		--with-qt-include=${QT_INCDIR}
-INSTALL_TARGET=	install-strip
-USES=		gmake libtool qt:4 shebangfix
-SHEBANG_FILES=	rsplib/scriptingserviceexample
-USE_LDCONFIG=	yes
-USE_QT=		gui xml moc_build
+OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/net/rsplib/distinfo b/net/rsplib/distinfo
index 0229f8f090ea..9011af50f290 100644
--- a/net/rsplib/distinfo
+++ b/net/rsplib/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rsplib-3.0.2.tar.gz) = aa9c9035739d7096b6ccabf92c15e67ddd327460e919d52fbb7c578e498a46ef
-SIZE (rsplib-3.0.2.tar.gz) = 1061690
+TIMESTAMP = 1539792890
+SHA256 (rsplib-3.2.0.tar.gz) = 1ae9570d850ca7215af9524f31b173589b3517d7cf0c1faca0183c6a556521e4
+SIZE (rsplib-3.2.0.tar.gz) = 1297814
diff --git a/net/rsplib/files/patch-configure b/net/rsplib/files/patch-configure
deleted file mode 100644
index 60d83dac188c..000000000000
--- a/net/rsplib/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	2017-01-18 19:43:22 UTC
-+++ configure
-@@ -16692,7 +16692,6 @@ QT_REQUIRED_COMPONENTS="QtCore QtGui QtX
- QT_DEFAULT_INCLUDE_PATHS="/usr/share/qt4/include /usr/local/include/qt4 /usr/include/qt4 /usr/include"
- QT_DEFAULT_LIBRARY_PATHS="/usr/lib /usr/local/lib /usr/local/qt4/lib /usr/local/lib/qt4 /usr/share/qt4/lib `cat 2>/dev/null /etc/ld.so.conf.d/*.conf | sed -e "/# /d"` /usr/lib64"
- QT_DEFAULT_BINARY_PATHS="/usr/bin /usr/local/bin /usr/local/qt4/bin /usr/share/qt4/bin"
--QTPOSTFIX="-qt4"
- 
- QTEXTRAINC=""
- QTEXTRALIB=""
diff --git a/net/rsplib/files/patch-docs_CMakeLists.txt b/net/rsplib/files/patch-docs_CMakeLists.txt
new file mode 100644
index 000000000000..ffc0540e20ef
--- /dev/null
+++ b/net/rsplib/files/patch-docs_CMakeLists.txt
@@ -0,0 +1,6 @@
+--- docs/CMakeLists.txt.orig	2019-01-25 12:34:39 UTC
++++ docs/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ # ###### Documentation ######################################################
+-INSTALL(FILES Handbook.pdf DESTINATION ${CMAKE_INSTALL_DATADIR}/rsplib)
++INSTALL(FILES Handbook.pdf DESTINATION ${DOCSDIR})
diff --git a/net/rsplib/pkg-descr b/net/rsplib/pkg-descr
index 0b50316069a4..c841f2e8e411 100644
--- a/net/rsplib/pkg-descr
+++ b/net/rsplib/pkg-descr
@@ -5,4 +5,4 @@ It provides highly available pool management (that is registration
 handling and load distribution/balancing) by components called Registrar
 and a client-side/server-side API for accessing the service of a pool.
 
-WWW: http://www.iem.uni-due.de/~dreibh/rserpool/
+WWW: https://www.uni-due.de/~be0001/rserpool/
diff --git a/net/rsplib/pkg-plist b/net/rsplib/pkg-plist
index 3b79324240ae..d5dbd9a546b1 100644
--- a/net/rsplib/pkg-plist
+++ b/net/rsplib/pkg-plist
@@ -3,103 +3,163 @@ bin/cspmonitor
 bin/fractalpooluser
 bin/hsdump
 bin/pingpongclient
-bin/registrar
 bin/rspregistrar
 bin/rspserver
 bin/rspterminal
 bin/scriptingclient
 bin/scriptingcontrol
 bin/scriptingserviceexample
-bin/server
-bin/terminal
+include/rserpool/asapinstance.h
+include/rserpool/asapinterthreadmessage.h
+include/rserpool/breakdetector.h
+include/rserpool/componentstatuspackets.h
+include/rserpool/componentstatusreporter.h
 include/rserpool/cpprspserver.h
+include/rserpool/debug.h
+include/rserpool/dispatcher.h
+include/rserpool/doublelinkedringlist.h
+include/rserpool/ext_socket.h
+include/rserpool/fdcallback.h
+include/rserpool/identifierbitmap.h
+include/rserpool/interthreadmessageport.h
+include/rserpool/leaflinkedredblacktree.h
+include/rserpool/loglevel.h
+include/rserpool/messagebuffer.h
 include/rserpool/mutex.h
+include/rserpool/netdouble.h
+include/rserpool/netutilities.h
+include/rserpool/notificationqueue.h
+include/rserpool/peerlist-template.h
+include/rserpool/peerlist-template_impl.h
+include/rserpool/peerlistmanagement-template.h
+include/rserpool/peerlistmanagement-template_impl.h
+include/rserpool/peerlistnode-template.h
+include/rserpool/peerlistnode-template_impl.h
+include/rserpool/poolelementnode-template.h
+include/rserpool/poolelementnode-template_impl.h
+include/rserpool/poolhandle.h
+include/rserpool/poolhandlespacechecksum.h
+include/rserpool/poolhandlespacemanagement-basics.h
+include/rserpool/poolhandlespacemanagement-template.h
+include/rserpool/poolhandlespacemanagement-template_impl.h
+include/rserpool/poolhandlespacemanagement.h
+include/rserpool/poolhandlespacenode-template.h
+include/rserpool/poolhandlespacenode-template_impl.h
+include/rserpool/poolnode-template.h
+include/rserpool/poolnode-template_impl.h
+include/rserpool/poolpolicy-template.h
+include/rserpool/poolpolicy-template_impl.h
+include/rserpool/poolpolicysettings.h
+include/rserpool/pooluserlist-template.h
+include/rserpool/pooluserlist-template_impl.h
+include/rserpool/poolusernode-template.h
+include/rserpool/poolusernode-template_impl.h
+include/rserpool/randomizer.h
+include/rserpool/redblacktree.h
+include/rserpool/redblacktree_impl.h
+include/rserpool/registrartable.h
 include/rserpool/rserpool-csp.h
 include/rserpool/rserpool-internals.h
 include/rserpool/rserpool-policytypes.h
 include/rserpool/rserpool.h
+include/rserpool/rserpoolerror.h
+include/rserpool/rserpoolmessage.h
+include/rserpool/rserpoolmessagecreator.h
+include/rserpool/rserpoolmessageparser.h
+include/rserpool/rserpoolsocket.h
+include/rserpool/session.h
+include/rserpool/sessioncontrol.h
+include/rserpool/sessionstorage.h
+include/rserpool/simpleredblacktree.h
+include/rserpool/sockaddrunion.h
+include/rserpool/stringutilities.h
 include/rserpool/tagitem.h
 include/rserpool/tcplikeserver.h
+include/rserpool/tdtypes.h
 include/rserpool/thread.h
+include/rserpool/threadsafety.h
+include/rserpool/threadsignal.h
+include/rserpool/timer.h
+include/rserpool/timestamphashtable.h
+include/rserpool/timeutilities.h
+include/rserpool/transportaddressblock.h
 include/rserpool/udplikeserver.h
 lib/libcpprspserver.a
 lib/libcpprspserver.so
-lib/libcpprspserver.so.2
-lib/libcpprspserver.so.2.0.8
+lib/libcpprspserver.so.3
+lib/libcpprspserver.so.3.2.0
 lib/librspcsp.a
 lib/librspcsp.so
-lib/librspcsp.so.2
-lib/librspcsp.so.2.0.8
+lib/librspcsp.so.3
+lib/librspcsp.so.3.2.0
 lib/librspdispatcher.a
 lib/librspdispatcher.so
-lib/librspdispatcher.so.2
-lib/librspdispatcher.so.2.0.8
+lib/librspdispatcher.so.3
+lib/librspdispatcher.so.3.2.0
 lib/librsphsmgt.a
 lib/librsphsmgt.so
-lib/librsphsmgt.so.2
-lib/librsphsmgt.so.2.0.8
+lib/librsphsmgt.so.3
+lib/librsphsmgt.so.3.2.0
 lib/librsplib.a
 lib/librsplib.so
-lib/librsplib.so.2
-lib/librsplib.so.2.0.8
+lib/librsplib.so.3
+lib/librsplib.so.3.2.0
 lib/librspmessaging.a
 lib/librspmessaging.so
-lib/librspmessaging.so.2
-lib/librspmessaging.so.2.0.8
+lib/librspmessaging.so.3
+lib/librspmessaging.so.3.2.0
 lib/libtdbreakdetector.a
 lib/libtdbreakdetector.so
-lib/libtdbreakdetector.so.2
-lib/libtdbreakdetector.so.2.0.8
+lib/libtdbreakdetector.so.3
+lib/libtdbreakdetector.so.3.2.0
 lib/libtdcppthread.a
 lib/libtdcppthread.so
-lib/libtdcppthread.so.2
-lib/libtdcppthread.so.2.0.8
+lib/libtdcppthread.so.3
+lib/libtdcppthread.so.3.2.0
 lib/libtdloglevel.a
 lib/libtdloglevel.so
-lib/libtdloglevel.so.2
-lib/libtdloglevel.so.2.0.8
+lib/libtdloglevel.so.3
+lib/libtdloglevel.so.3.2.0
 lib/libtdnetutilities.a
 lib/libtdnetutilities.so
-lib/libtdnetutilities.so.2
-lib/libtdnetutilities.so.2.0.8
+lib/libtdnetutilities.so.3
+lib/libtdnetutilities.so.3.2.0
 lib/libtdrandomizer.a
 lib/libtdrandomizer.so
-lib/libtdrandomizer.so.2
-lib/libtdrandomizer.so.2.0.8
+lib/libtdrandomizer.so.3
+lib/libtdrandomizer.so.3.2.0
 lib/libtdstorage.a
 lib/libtdstorage.so
-lib/libtdstorage.so.2
-lib/libtdstorage.so.2.0.8
+lib/libtdstorage.so.3
+lib/libtdstorage.so.3.2.0
 lib/libtdstringutilities.a
 lib/libtdstringutilities.so
-lib/libtdstringutilities.so.2
-lib/libtdstringutilities.so.2.0.8
+lib/libtdstringutilities.so.3
+lib/libtdstringutilities.so.3.2.0
 lib/libtdtagitem.a
 lib/libtdtagitem.so
-lib/libtdtagitem.so.2
-lib/libtdtagitem.so.2.0.8
+lib/libtdtagitem.so.3
+lib/libtdtagitem.so.3.2.0
 lib/libtdthreadsafety.a
 lib/libtdthreadsafety.so
-lib/libtdthreadsafety.so.2
-lib/libtdthreadsafety.so.2.0.8
+lib/libtdthreadsafety.so.3
+lib/libtdthreadsafety.so.3.2.0
 lib/libtdtimeutilities.a
 lib/libtdtimeutilities.so
-lib/libtdtimeutilities.so.2
-lib/libtdtimeutilities.so.2.0.8
+lib/libtdtimeutilities.so.3
+lib/libtdtimeutilities.so.3.2.0
 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/registrar.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
-man/man1/server.1.gz
-man/man1/terminal.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/Handbook.pdf
 share/fgpconfig/input-001.fsf
 share/fgpconfig/input-002.fsf
 share/fgpconfig/input-003.fsf