6 files changed, 171 insertions, 101 deletions

diff --git a/net-p2p/nicotine-plus/Makefile b/net-p2p/nicotine-plus/Makefile
index b8ec61cda0b6..54a36d40723b 100644
--- a/net-p2p/nicotine-plus/Makefile
+++ b/net-p2p/nicotine-plus/Makefile
@@ -5,25 +5,32 @@
 # $FreeBSD$
 #
 
-PORTNAME=	nicotine
-PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTNAME=	plus
+PORTVERSION=	1.2.6
 CATEGORIES=	net-p2p
-MASTER_SITES=	http://nicotine.thegraveyard.org/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
+PKGNAMEPREFIX=	nicotine-
+DISTNAME=	${PKGNAMEPREFIX:S/-/+/}-${PORTVERSION}
 
-MAINTAINER=	stefan@FreeBSD.org
-COMMENT=	GTK2 SoulSeek filesharing client
+MAINTAINER=	acm@FreeBSD.org
+COMMENT=	A fork of nicotine soulseek client
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 \
 		${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb
 
+CONFLICTS=	nicotine-[0-9]*
+
 USE_BZIP2=		yes
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 USE_GETTEXT=		yes
 
+DOCSDIR=	share/doc/${PKGNAMEPREFIX:S/-//}
+DATADIR=	share/${PKGNAMEPREFIX:S/-//}
+
 OPTIONS=	GEOIP "Enable the GeoIP based country code blocker" off \
-		PSYCO "Enable Psyco, the optimizing Python compiler" off \
+		PSYCO "Enable Psyco, the optimizing Python compiler" on \
 		VORBIS "Enable OGG/Vorbis support" on
 
 .include <bsd.port.pre.mk>
@@ -31,7 +38,7 @@ OPTIONS=	GEOIP "Enable the GeoIP based country code blocker" off \
 .if defined(WITH_GEOIP)
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/GeoIP.so:${PORTSDIR}/net/py-GeoIP
 .endif
-.if defined(WITH_PSYCO)
+.if defined(WITH_PSYCO) && ${ARCH} == "i386"
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
 .endif
 .if defined(WITH_VORBIS)
@@ -39,13 +46,9 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|sys\.prefix|\"${PREFIX}\"|g" ${WRKSRC}/setup.py
-
-.if !defined(NOPORTDOCS)
-post-install:
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README.import-winconfig ${DOCSDIR}
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -i "" -e 's|^doc_files.*|doc_files = ""|g' ${WRKSRC}/setup.py
 .endif
+	@${REINPLACE_CMD} -e "s|sys\.prefix|\"${PREFIX}\"|g" ${WRKSRC}/setup.py
 
 .include <bsd.port.post.mk>
diff --git a/net-p2p/nicotine-plus/distinfo b/net-p2p/nicotine-plus/distinfo
index 969e961c7186..34c98faa955c 100644
--- a/net-p2p/nicotine-plus/distinfo
+++ b/net-p2p/nicotine-plus/distinfo
@@ -1,3 +1,3 @@
-MD5 (nicotine-1.0.8.tar.bz2) = 2392a74dc5be09a062ba77ec4a041e99
-SHA256 (nicotine-1.0.8.tar.bz2) = 8e9d8707991316603363a9198fa4a3510e66aecfcead6f6f721b0500916bf4d2
-SIZE (nicotine-1.0.8.tar.bz2) = 305645
+MD5 (nicotine+-1.2.6.tar.bz2) = 845b071c235a1ae7b19699275818ecc4
+SHA256 (nicotine+-1.2.6.tar.bz2) = de390a7ac759dbff766f9fb668610a1bdaf6b8fe46c7982790bee6e0fd766654
+SIZE (nicotine+-1.2.6.tar.bz2) = 611707
diff --git a/net-p2p/nicotine-plus/files/patch-pynicotine-gtkgui_frame.py b/net-p2p/nicotine-plus/files/patch-pynicotine-gtkgui_frame.py
new file mode 100644
index 000000000000..460fed0f16d4
--- /dev/null
+++ b/net-p2p/nicotine-plus/files/patch-pynicotine-gtkgui_frame.py
@@ -0,0 +1,11 @@
+--- pynicotine/gtkgui/frame.py	Tue Jan 16 11:22:06 2007
++++ pynicotine/gtkgui/frame.py	Tue Jan 16 11:23:53 2007
+@@ -1235,7 +1235,7 @@
+ 			url = "file://%s/%s" % (os.environ["PWD"], file)
+ 			self.OpenUrl(url)
+ 		else:
+-			file = "%s/share/nicotine/documentation/NicotinePlusGuide.html" % sys.prefix
++			file = "%s/share/doc/nicotine/NicotinePlusGuide.html" % sys.prefix
+ 			if os.path.exists(file):
+ 				url = "file://%s" % file
+ 				self.OpenUrl(url)
diff --git a/net-p2p/nicotine-plus/files/patch-setup.py b/net-p2p/nicotine-plus/files/patch-setup.py
new file mode 100644
index 000000000000..c065957a2182
--- /dev/null
+++ b/net-p2p/nicotine-plus/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	Tue Jan 16 10:27:25 2007
++++ setup.py	Tue Jan 16 10:28:04 2007
+@@ -27,7 +27,7 @@
+ 		files.append((os.path.join(sys.prefix, "share", "nicotine", "sounds", theme), [os.path.join(sounds, file)]))
+ doc_files = glob.glob(os.path.join("doc", "*"))
+ for file in doc_files:
+-	files.append((os.path.join(sys.prefix, "share", "nicotine", "documentation"), [file]))
++	files.append((os.path.join(sys.prefix, "share", "doc", "nicotine"), [file]))
+ files.append((os.path.join(sys.prefix, "share", "applications"), ["files/nicotine.desktop"]))
+ files.append((os.path.join(sys.prefix, "share", "pixmaps"), ["files/nicotine-plus-32px.png"]))
+ if sys.platform.startswith("win"):
diff --git a/net-p2p/nicotine-plus/pkg-descr b/net-p2p/nicotine-plus/pkg-descr
index ba82d0f159cb..cd95adaf9db4 100644
--- a/net-p2p/nicotine-plus/pkg-descr
+++ b/net-p2p/nicotine-plus/pkg-descr
@@ -1,4 +1,7 @@
-Nicotine is a GTK2 SoulSeek filesharing client, and is based upon the
-PySoulSeek (net-p2p/pyslsk) code.
+Nicotine-Plus is a fork of Hyriand's original Nicotine Soulseek client.
 
-WWW:	http://nicotine.thegraveyard.org/
+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/
diff --git a/net-p2p/nicotine-plus/pkg-plist b/net-p2p/nicotine-plus/pkg-plist
index 5da2fb22ffa6..64cacadd035c 100644
--- a/net-p2p/nicotine-plus/pkg-plist
+++ b/net-p2p/nicotine-plus/pkg-plist
@@ -1,111 +1,153 @@
 bin/nicotine
 bin/nicotine-import-winconfig
-%%PYTHON_SITELIBDIR%%/pynicotine/ConfigParser.py
-%%PYTHON_SITELIBDIR%%/pynicotine/ConfigParser.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/ConfigParser.pyo
 %%PYTHON_SITELIBDIR%%/pynicotine/__init__.py
-%%PYTHON_SITELIBDIR%%/pynicotine/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/mp3.py
+%%PYTHON_SITELIBDIR%%/pynicotine/slskproto.py
+%%PYTHON_SITELIBDIR%%/pynicotine/utils.py
+%%PYTHON_SITELIBDIR%%/pynicotine/pynicotine.py
+%%PYTHON_SITELIBDIR%%/pynicotine/ConfigParser.py
+%%PYTHON_SITELIBDIR%%/pynicotine/slskmessages.py
 %%PYTHON_SITELIBDIR%%/pynicotine/config.py
-%%PYTHON_SITELIBDIR%%/pynicotine/config.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/config.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/transfers.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userinfo.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/checklatest.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/downloads.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/settings_glade.py
 %%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/__init__.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/about.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/about.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/about.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userbrowse.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/systraywin32.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/dirchooser.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/glade2py.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userlist.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/privatechat.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/imagedata.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/translux.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/transferlist.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/ticker.py
 %%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/browsetreemodels.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/browsetreemodels.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/browsetreemodels.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/nowplaying.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/settingswindow.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/frame.py
 %%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/chatrooms.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/chatrooms.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/chatrooms.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/checklatest.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/utils.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/nicotine_glade.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/search.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/uploads.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/about.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/entrydialog.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/icondata.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userinfo.pyc
 %%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/checklatest.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/checklatest.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/dirchooser.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/dirchooser.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/dirchooser.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/downloads.py
 %%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/downloads.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/downloads.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/frame.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/frame.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/frame.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/glade2py.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/settings_glade.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userbrowse.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/systraywin32.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/dirchooser.pyc
 %%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/glade2py.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/glade2py.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/imagedata.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userlist.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/privatechat.pyc
 %%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/imagedata.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/imagedata.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/nicotine_glade.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/translux.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/transferlist.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/ticker.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/browsetreemodels.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/nowplaying.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/settingswindow.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/frame.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/chatrooms.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/utils.pyc
 %%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/nicotine_glade.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/nicotine_glade.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/privatechat.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/privatechat.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/privatechat.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/search.py
 %%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/search.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/search.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/settings_glade.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/settings_glade.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/settings_glade.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/settingswindow.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/settingswindow.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/settingswindow.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/ticker.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/ticker.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/ticker.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/transferlist.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/transferlist.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/transferlist.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/translux.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/translux.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/translux.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/uploads.py
 %%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/uploads.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/uploads.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userbrowse.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userbrowse.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userbrowse.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userinfo.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userinfo.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/about.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/entrydialog.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/icondata.pyc
 %%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userinfo.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userlist.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userlist.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/checklatest.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/downloads.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/settings_glade.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userbrowse.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/systraywin32.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/dirchooser.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/glade2py.pyo
 %%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userlist.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/utils.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/utils.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/privatechat.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/imagedata.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/translux.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/transferlist.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/ticker.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/browsetreemodels.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/nowplaying.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/settingswindow.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/frame.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/chatrooms.pyo
 %%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/utils.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/mp3.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/nicotine_glade.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/search.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/uploads.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/about.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/entrydialog.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/icondata.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/__init__.pyc
 %%PYTHON_SITELIBDIR%%/pynicotine/mp3.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/mp3.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/pynicotine.py
+%%PYTHON_SITELIBDIR%%/pynicotine/slskproto.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/utils.pyc
 %%PYTHON_SITELIBDIR%%/pynicotine/pynicotine.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/pynicotine.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/slskmessages.py
+%%PYTHON_SITELIBDIR%%/pynicotine/ConfigParser.pyc
 %%PYTHON_SITELIBDIR%%/pynicotine/slskmessages.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/slskmessages.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/slskproto.py
-%%PYTHON_SITELIBDIR%%/pynicotine/slskproto.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/slskproto.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/transfers.py
+%%PYTHON_SITELIBDIR%%/pynicotine/config.pyc
 %%PYTHON_SITELIBDIR%%/pynicotine/transfers.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/transfers.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/utils.py
-%%PYTHON_SITELIBDIR%%/pynicotine/utils.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/mp3.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/slskproto.pyo
 %%PYTHON_SITELIBDIR%%/pynicotine/utils.pyo
-%%PORTDOCS%%%%DOCSDIR%%/README.import-winconfig
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%PYTHON_SITELIBDIR%%/pynicotine/pynicotine.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/ConfigParser.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/slskmessages.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/config.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/transfers.pyo
 share/locale/de/LC_MESSAGES/nicotine.mo
 share/locale/dk/LC_MESSAGES/nicotine.mo
 share/locale/es/LC_MESSAGES/nicotine.mo
 share/locale/fr/LC_MESSAGES/nicotine.mo
+share/locale/hu/LC_MESSAGES/nicotine.mo
 share/locale/it/LC_MESSAGES/nicotine.mo
 share/locale/nl/LC_MESSAGES/nicotine.mo
-share/locale/pl/LC_MESSAGES/nicotine.mo
+share/locale/pt_BR/LC_MESSAGES/nicotine.mo
 share/locale/sv/LC_MESSAGES/nicotine.mo
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+share/locale/pl/LC_MESSAGES/nicotine.mo
+share/locale/sk/LC_MESSAGES/nicotine.mo
+share/locale/fi/LC_MESSAGES/nicotine.mo
+%%DATADIR%%/sounds/default/private.ogg
+%%DATADIR%%/sounds/default/room_nick.ogg
+%%DATADIR%%/sounds/default/details.txt
+%%DATADIR%%/sounds/default/license.txt
+%%DATADIR%%/sounds/cough/private.ogg
+%%DATADIR%%/sounds/cough/room_nick.ogg
+%%DATADIR%%/sounds/cough/details.txt
+%%DATADIR%%/sounds/cough/license.txt
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG_DOCS
+%%PORTDOCS%%%%DOCSDIR%%/TRANSLATIONS
+%%PORTDOCS%%%%DOCSDIR%%/README.trayicon
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/README.import-winconfig
+%%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS
+%%PORTDOCS%%%%DOCSDIR%%/KNOWN_BUGS
+%%PORTDOCS%%%%DOCSDIR%%/TRANSLATORS
+%%PORTDOCS%%%%DOCSDIR%%/NicotinePlusGuide.html
+%%PORTDOCS%%%%DOCSDIR%%/README
+share/applications/nicotine.desktop
+share/pixmaps/nicotine-plus-32px.png
 @dirrm %%PYTHON_SITELIBDIR%%/pynicotine/gtkgui
 @dirrm %%PYTHON_SITELIBDIR%%/pynicotine
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/sounds/default
+@dirrm %%DATADIR%%/sounds/cough
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%
+@dirrmtry share/applications
+@dirrmtry share/pixmaps