Index: net-p2p/nicotine-plus/Makefile
===================================================================
--- net-p2p/nicotine-plus/Makefile	(revision 317828)
+++ net-p2p/nicotine-plus/Makefile	(working copy)
@@ -1,68 +1,24 @@
-# Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	plus
-PORTVERSION=	1.2.16
+PORTNAME=	nicotine-plus
+PORTVERSION=	2.0.1
 CATEGORIES=	net-p2p
-MASTER_SITES=	SF/nicotine-${PORTNAME}/nicotine-${PORTNAME}/${PORTVERSION}
-PKGNAMEPREFIX=	nicotine-
-DISTNAME=	${PKGNAMEPREFIX:S/-/+/}-${PORTVERSION}
+MASTER_SITES=	https://github.com/Nicotine-Plus/nicotine-plus/releases/download/${PORTVERSION}/
+DISTNAME=	nicotine-${PORTVERSION}
 
-MAINTAINER=	acm@FreeBSD.org
-COMMENT=	A fork of nicotine soulseek client
+MAINTAINER=	menelkir@itroll.org
+COMMENT=	Soulseek client
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bsddb>0:${PORTSDIR}/databases/py-bsddb
+LICENSE=	GPLv3
+LICENSE_FILE=   ${WRKSRC}/COPYING
 
-CONFLICTS=	nicotine-[0-9]*
-BROKEN=		does not build
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}gobject3>0:devel/py-gobject3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}miniupnpc>0:net/py-miniupnpc@${PY_FLAVOR} \
 
-USE_BZIP2=		yes
-USE_GNOME=		pygtk2
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-USES=		gettext
-PYDISTUTILS_PKGNAME=	nicotine
+USES=           python:3.7+ gnome
 
-DOCSDIR=	share/doc/${PKGNAMEPREFIX:S/-//}
-DATADIR=	share/${PKGNAMEPREFIX:S/-//}
-MAN1=		nicotine-import-winconfig.1 nicotine.1
+USE_GNOME=	gtk30
+USE_PYTHON=	distutils
 
-OPTIONS_DEFINE=	GEOIP PSYCO MUTAGEN LIBSEXY MINIUPNPC DOCS
-OPTIONS_DEFINE_i386=	PSYCO
-OPTIONS_DEFAULT=	GEOIP PSYCO MUTAGEN LIBSEXY MINIUPNPC
-GEOIP_DESC=	Enable the GeoIP based country code blocker
-PSYCO_DESC=	Enable Psyco, the optimizing Python compiler
-MUTAGEN_DESC=	Enable Mutagen for audio metadata support
-LIBSEXY_DESC=	Enable libsexy support
-MINIUPNPC_DESC=	Enable upnp support
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGEOIP}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/GeoIP.so:${PORTSDIR}/net/py-GeoIP
-.endif
-.if ${PORT_OPTIONS:MPSYCO}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
-.endif
-.if ${PORT_OPTIONS:MMUTAGEN}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
-.endif
-.if ${PORT_OPTIONS:MLIBSEXY}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/gtk-2.0/sexy.so:${PORTSDIR}/x11-toolkits/py-sexy
-.endif
-.if ${PORT_OPTIONS:MMINIUPNPC}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/miniupnpc.so:${PORTSDIR}/net/py-miniupnpc
-.endif
-
-post-extract:
-	@${MV} ${WRKSRC}/${PKGNAMEPREFIX:S/-//}.py ${WRKSRC}/${PKGNAMEPREFIX:S/-//}
-
-post-patch:
-.if ! ${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -i "" -e 's|^doc_files.*|doc_files = ""|g' ${WRKSRC}/setup.py
-.endif
-	@${REINPLACE_CMD} -e \
-		"s|sys\.prefix|\"${PREFIX}\"|g" -e \
-			"s|nicotine.py|nicotine|g" ${WRKSRC}/setup.py
-
 .include <bsd.port.mk>
Index: net-p2p/nicotine-plus/distinfo
===================================================================
--- net-p2p/nicotine-plus/distinfo	(revision 317828)
+++ net-p2p/nicotine-plus/distinfo	(working copy)
@@ -1,2 +1,3 @@
-SHA256 (nicotine+-1.2.16.tar.bz2) = 71e5b33e273daaf072dbf63839536c14d7ead9d149323d50eee09f7429e34c1d
-SIZE (nicotine+-1.2.16.tar.bz2) = 3892006
+TIMESTAMP = 1596223153
+SHA256 (nicotine-2.0.1.tar.gz) = 73cd135d0022ef65140427eb5d4741798733f45443e6a3d76178b0f2f33d8107
+SIZE (nicotine-2.0.1.tar.gz) = 2017913
Index: net-p2p/nicotine-plus/pkg-descr
===================================================================
--- net-p2p/nicotine-plus/pkg-descr	(revision 317828)
+++ net-p2p/nicotine-plus/pkg-descr	(working copy)
@@ -1,7 +1,7 @@
 Nicotine-Plus is a fork of Hyriand's original Nicotine Soulseek client.
 
-Nicotine+ is an attempt to keep Nicotine working with the latest libraries, 
-kill bugs, keep current with the Soulseek protocol and add some new features 
+Nicotine+ is an attempt to keep Nicotine working with the latest libraries,
+kill bugs, keep current with the Soulseek protocol and add some new features
 that users want and/or need. The main developer now is daelstorm.
 
-WWW:	http://nicotine-plus.sourceforge.net/
+WWW: https://github.com/Nicotine-Plus/nicotine-plus
Index: net-p2p/nicotine-plus/pkg-plist
===================================================================