--- net/uriparser/Makefile	2019-01-26 13:52:44.000000000 +0300
+++ net/uriparser/Makefile	2020-06-21 18:04:07.497244000 +0300
@@ -2,24 +2,47 @@ 
 # $FreeBSD: head/net/uriparser/Makefile 491262 2019-01-26 10:52:44Z riggs $
 
 PORTNAME=	uriparser
-DISTVERSION=	0.9.1
+DISTVERSION=	0.9.4
 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 zip
 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
+DISTDOCSNAME=	${DISTNAME}-doc
+DISTDOCSFILE=	${DISTDOCSNAME}${EXTRACT_SUFX}
 
-MAKE_JOBS_UNSAFE=yes
+OPTIONS_DEFINE=		DOCS GTEST
+DOCS_DISTFILES=		${DISTDOCSFILE} ${DISTNAME}.qch
+DOCS_EXTRACT_ONLY=	${DISTDOCSFILE}
+GTEST_DESC=		Before install, build and run googletests
+GTEST_BUILD_DEPENDS=	googletest>=1.10.0:devel/googletest
+GTEST_CMAKE_BOOL=	URIPARSER_BUILD_TESTS
+
+PORTDOCS=	*
+
+post-build-GTEST-on:
+	@${ECHO} "### Running googletests, as requested... ###"
+	@(cd ${BUILD_WRKSRC} && ${MAKE} test)
+	@${ECHO} "### Googletests completed. ###"
+
+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>
--- net/uriparser/distinfo	2019-01-26 13:52:44.000000000 +0300
+++ net/uriparser/distinfo	2020-06-21 15:57:50.991836000 +0300
@@ -1,3 +1,7 @@ 
-TIMESTAMP = 1546801487
-SHA256 (uriparser-0.9.1.tar.bz2) = 75248f3de3b7b13c8c9735ff7b86ebe72cbb8ad043291517d7d53488e0893abe
-SIZE (uriparser-0.9.1.tar.bz2) = 372722
+TIMESTAMP = 1592744270
+SHA256 (uriparser-0.9.4.zip) = 410d8ef099e63ff8957e1cd68a30d7912f13b2ca0d1b9e88876ea5b1da287dca
+SIZE (uriparser-0.9.4.zip) = 264510
+SHA256 (uriparser-0.9.4-doc.zip) = 02e56c138041f960d027bbf7e29cfd10ef7e7e1b85b5a3d392ad40f6a58a1ca2
+SIZE (uriparser-0.9.4-doc.zip) = 252975
+SHA256 (uriparser-0.9.4.qch) = 2b820dfb7eb5b42fe9da674126e5e8b422a1f06675b98723e706cf9b3aefd1dc
+SIZE (uriparser-0.9.4.qch) = 303104
--- net/uriparser/pkg-descr	2014-01-22 19:44:51.000000000 +0400
+++ net/uriparser/pkg-descr	2020-05-23 15:46:09.423483000 +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
--- net/uriparser/pkg-plist	2019-01-26 13:52:44.000000000 +0300
+++ net/uriparser/pkg-plist	2020-06-21 17:33:23.745102000 +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.27
+lib/cmake/uriparser-0.9.4/uriparser-config-version.cmake
+lib/cmake/uriparser-0.9.4/uriparser-config.cmake
+lib/cmake/uriparser-0.9.4/uriparser-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/uriparser-0.9.4/uriparser.cmake
 libdata/pkgconfig/liburiparser.pc