diff -ur net/uriparser.orig/Makefile net/uriparser/Makefile
--- net/uriparser.orig/Makefile	2019-01-26 13:52:44.000000000 +0300
+++ net/uriparser/Makefile	2021-03-21 16:24:35.521041000 +0300
@@ -2,24 +2,45 @@
 # $FreeBSD: head/net/uriparser/Makefile 491262 2019-01-26 10:52:44Z riggs $
 
 PORTNAME=	uriparser
-DISTVERSION=	0.9.1
+DISTVERSION=	0.9.5
 CATEGORIES=	net
-MASTER_SITES=	SF/${PORTNAME}/Sources/${PORTVERSION}
+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTNAME}-${PORTVERSION}/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	ed@FreeBSD.org
+MAINTAINER=	svysh.fbsd@gmail.com
 COMMENT=	URI parsing library
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		libtool pathfix tar:bz2
+BUILD_DEPENDS=	bash:shells/bash
 
+USES=		pathfix cmake:noninja tar:xz
 USE_LDCONFIG=	yes
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-doc --disable-test
-INSTALL_TARGET=	install-strip
+CMAKE_OFF=	URIPARSER_BUILD_DOCS # will fetch prebuilds from the upstream, if DOCS is selected
 
-MAKE_JOBS_UNSAFE=yes
+TEST_TARGET=	test
+
+PLIST_SUB=	DISTVERSION=${DISTVERSION}
+PORTDOCS=	*
+
+OPTIONS_DEFINE=		DOCS TEST
+DOCS_DISTFILES=		${_DISTDOCSFILE} ${DISTNAME}.qch
+DOCS_EXTRACT_ONLY=	${_DISTDOCSFILE}
+TEST_BUILD_DEPENDS=	googletest>=1.10.0:devel/googletest
+TEST_CMAKE_BOOL=	URIPARSER_BUILD_TESTS
+
+_DISTDOCSFILE=	${_DISTDOCSNAME}.zip
+_DISTDOCSNAME=	${DISTNAME}-doc
+
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/qch
+	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/../${_DISTDOCSNAME} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${DISTDIR}/${DISTNAME}.qch ${STAGEDIR}${DOCSDIR}/qch
+	( ${ECHO} "QCH file is a QT Compressed Help file, generated by doxygen, cf:"; \
+	${ECHO} "https://doc.qt.io/qt-5/assistant-details.html"; ) > ${STAGEDIR}${DOCSDIR}/qch/readme-qch
 
 .include <bsd.port.mk>
diff -ur net/uriparser.orig/distinfo net/uriparser/distinfo
--- net/uriparser.orig/distinfo	2019-01-26 13:52:44.000000000 +0300
+++ net/uriparser/distinfo	2021-03-21 16:20:22.029989000 +0300
@@ -1,3 +1,7 @@
-TIMESTAMP = 1546801487
-SHA256 (uriparser-0.9.1.tar.bz2) = 75248f3de3b7b13c8c9735ff7b86ebe72cbb8ad043291517d7d53488e0893abe
-SIZE (uriparser-0.9.1.tar.bz2) = 372722
+TIMESTAMP = 1616332822
+SHA256 (uriparser-0.9.5.tar.xz) = 9af8f87ed762ebac333fd42b6c38b62d217be8ba290d050f40aef43b9267651e
+SIZE (uriparser-0.9.5.tar.xz) = 169220
+SHA256 (uriparser-0.9.5-doc.zip) = eae0766ef2548c7d041c00c6898f9e114f6cb88c9fb02d02a9825734f29a814f
+SIZE (uriparser-0.9.5-doc.zip) = 260868
+SHA256 (uriparser-0.9.5.qch) = 3b38380996a346301359a15ae75887d68234828cef8f717f688223c5c7016cad
+SIZE (uriparser-0.9.5.qch) = 303104
diff -ur net/uriparser.orig/pkg-descr net/uriparser/pkg-descr
--- net/uriparser.orig/pkg-descr	2014-01-22 19:44:51.000000000 +0400
+++ net/uriparser/pkg-descr	2021-03-20 17:18:47.740220000 +0300
@@ -1,3 +1,3 @@
 uriparser is an RFC 3986 URI parsing library written in C++.
 
-WWW: http://uriparser.sourceforge.net/
+WWW: https://github.com/uriparser/uriparser
diff -ur net/uriparser.orig/pkg-plist net/uriparser/pkg-plist
--- net/uriparser.orig/pkg-plist	2019-01-26 13:52:44.000000000 +0300
+++ net/uriparser/pkg-plist	2021-03-20 17:18:47.740531000 +0300
@@ -5,8 +5,11 @@
 include/uriparser/UriDefsConfig.h
 include/uriparser/UriDefsUnicode.h
 include/uriparser/UriIp4.h
-lib/liburiparser.a
 lib/liburiparser.so
 lib/liburiparser.so.1
-lib/liburiparser.so.1.0.24
+lib/liburiparser.so.1.0.28
+lib/cmake/uriparser-%%DISTVERSION%%/uriparser-config-version.cmake
+lib/cmake/uriparser-%%DISTVERSION%%/uriparser-config.cmake
+lib/cmake/uriparser-%%DISTVERSION%%/uriparser-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/uriparser-%%DISTVERSION%%/uriparser.cmake
 libdata/pkgconfig/liburiparser.pc