Index: net/uriparser/Makefile
===================================================================
--- net/uriparser/Makefile
+++ net/uriparser/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	uriparser
-PORTVERSION=	0.8.4
+DISTVERSIONPREFIX=	${PORTNAME}-
+DISTVERSION=	0.8.5
 CATEGORIES=	net
-MASTER_SITES=	SF/${PORTNAME}/Sources/${PORTVERSION}
 
 MAINTAINER=	ed@FreeBSD.org
 COMMENT=	URI parsing library
@@ -15,8 +15,10 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-doc --disable-test
 INSTALL_TARGET=	install-strip
-USES=		libtool pathfix tar:bzip2
+USES=		autoreconf libtool pathfix
 USE_LDCONFIG=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	uriparser
 
 MAKE_JOBS_UNSAFE=yes
 
Index: net/uriparser/distinfo
===================================================================
--- net/uriparser/distinfo
+++ net/uriparser/distinfo
@@ -1,2 +1,3 @@
-SHA256 (uriparser-0.8.4.tar.bz2) = ce7ccda4136974889231e8426a785e7578e66a6283009cfd13f1b24a5e657b23
-SIZE (uriparser-0.8.4.tar.bz2) = 358408
+TIMESTAMP = 1518204398
+SHA256 (uriparser-uriparser-uriparser-0.8.5_GH0.tar.gz) = f9ba9e227ea789733a85d3360b62bc6f0c48b6dc0f4337f2de05b8060f2e43eb
+SIZE (uriparser-uriparser-uriparser-0.8.5_GH0.tar.gz) = 205907
Index: net/uriparser/files/patch-tool_uriparse.c
===================================================================
--- net/uriparser/files/patch-tool_uriparse.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- tool/uriparse.c
-+++ tool/uriparse.c
-@@ -36,6 +36,7 @@
-  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-  * OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
-+#include <sys/socket.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <uriparser/Uri.h>
Index: net/uriparser/pkg-descr
===================================================================
--- net/uriparser/pkg-descr
+++ net/uriparser/pkg-descr
@@ -1,3 +1,3 @@
 uriparser is an RFC 3986 URI parsing library written in C++.
 
-WWW: http://uriparser.sourceforge.net/
+WWW: https://uriparser.github.io/
Index: net/uriparser/pkg-plist
===================================================================
--- net/uriparser/pkg-plist
+++ net/uriparser/pkg-plist
@@ -8,5 +8,5 @@
 lib/liburiparser.a
 lib/liburiparser.so
 lib/liburiparser.so.1
-lib/liburiparser.so.1.0.20
+lib/liburiparser.so.1.0.21
 libdata/pkgconfig/liburiparser.pc