5 files changed, 199 insertions, 158 deletions

diff --git a/net-p2p/nicotine-plus/Makefile b/net-p2p/nicotine-plus/Makefile
index f8f9e647fcce..69ae41af95c9 100644
--- a/net-p2p/nicotine-plus/Makefile
+++ b/net-p2p/nicotine-plus/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	plus
-PORTVERSION=	1.2.7.1
-PORTREVISION=	2
+PORTVERSION=	1.2.12
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
@@ -32,9 +31,10 @@ DOCSDIR=	share/doc/${PKGNAMEPREFIX:S/-//}
 DATADIR=	share/${PKGNAMEPREFIX:S/-//}
 MAN1=		nicotine-import-winconfig.1 nicotine.1
 
-OPTIONS=	GEOIP "Enable the GeoIP based country code blocker" off \
+OPTIONS=	GEOIP "Enable the GeoIP based country code blocker" on \
 		PSYCO "Enable Psyco, the optimizing Python compiler" on \
-		VORBIS "Enable OGG/Vorbis support" on
+		MUTAGEN "Enable Mutagen for audio metadata support" on \
+		LIBSEXY	"Enable libsexy support"	on
 
 .include <bsd.port.pre.mk>
 
@@ -44,14 +44,22 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/GeoIP.so:${PORTSDIR}/net/py-GeoIP
 .if defined(WITH_PSYCO) && ${ARCH} == "i386"
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
 .endif
-.if defined(WITH_VORBIS)
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
+.if defined(WITH_MUTAGEN)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
 .endif
+.if defined(WITH_LIBSEXY)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/gtk-2.0/sexy.so:${PORTSDIR}/x11-toolkits/py-sexy
+.endif
+
+post-extract:
+	@${MV} ${WRKSRC}/${PKGNAMEPREFIX:S/-//}.py ${WRKSRC}/${PKGNAMEPREFIX:S/-//}
 
 post-patch:
 .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
+	@${REINPLACE_CMD} -e \
+		"s|sys\.prefix|\"${PREFIX}\"|g" -e \
+			"s|nicotine.py|nicotine|g" ${WRKSRC}/setup.py
 
 .include <bsd.port.post.mk>
diff --git a/net-p2p/nicotine-plus/distinfo b/net-p2p/nicotine-plus/distinfo
index 553306760472..c66d75b6deab 100644
--- a/net-p2p/nicotine-plus/distinfo
+++ b/net-p2p/nicotine-plus/distinfo
@@ -1,3 +1,3 @@
-MD5 (nicotine+-1.2.7.1.tar.bz2) = 42c4f1d4cea8e738dad59505a1eaeb9e
-SHA256 (nicotine+-1.2.7.1.tar.bz2) = 2c128dc7b09d5b7b07146e18784120b64c14510b7abfb8d087fc78081cb9a4cf
-SIZE (nicotine+-1.2.7.1.tar.bz2) = 746571
+MD5 (nicotine+-1.2.12.tar.bz2) = b90f8dd30dcf26add5138d1904349b2a
+SHA256 (nicotine+-1.2.12.tar.bz2) = bca879bc720fbf86876efba67faeddea8b1819e9886ca854b2205838ce32bad0
+SIZE (nicotine+-1.2.12.tar.bz2) = 3834948
diff --git a/net-p2p/nicotine-plus/files/patch-pynicotine-gtkgui_frame.py b/net-p2p/nicotine-plus/files/patch-pynicotine-gtkgui_frame.py
index 460fed0f16d4..b441ad5afe6e 100644
--- a/net-p2p/nicotine-plus/files/patch-pynicotine-gtkgui_frame.py
+++ b/net-p2p/nicotine-plus/files/patch-pynicotine-gtkgui_frame.py
@@ -1,11 +1,25 @@
---- 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)
+--- pynicotine/gtkgui/frame.py	2009-05-25 06:09:14.000000000 -0500
++++ pynicotine/gtkgui/frame.py	2009-06-23 13:46:11.000000000 -0500
+@@ -2605,18 +2605,18 @@
+ 			paths.append(path1split[0])
  		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
+ 			paths.append(path1)
+-		path2 = "%s/share/nicotine/documentation" % sys.prefix
++		path2 = "%s/share/doc/nicotine" % sys.prefix
+ 		paths.append(path2)
+ 		winpath = "C:\Program Files\Nicotine+" 
+ 		paths.append(winpath)
+ 		for path in paths:
+-			if os.path.exists(os.sep.join([path, "doc", file])):
+-				url = "file:%s/%s/%s" % (urllib.pathname2url(path).replace("|", ":") ,"doc", file)
++			if os.path.exists(os.sep.join([path, "documentation", file])):
++				url = "file:%s/%s/%s" % (urllib.pathname2url(path).replace("|", ":") ,"documentation", file)
+ 
  				self.OpenUrl(url)
+ 				return
+ 		else:
+-			popupWarning(None, _("Cannot Find Guide"), _("The Nicotine Offline Guide ( NicotinePlusGuide.html ) was not found in either the following directories:\n\n<u>%(pwd)s\n</u><b>and</b>\n<u>%(prefix)s/share/nicotine/documentation/</u>\n\nEither install Nicotine-Plus, or start from inside the Nicotine-Plus source directory." % {'pwd':path1, 'prefix':sys.prefix } ) )
++			popupWarning(None, _("Cannot Find Guide"), _("The Nicotine Offline Guide ( NicotinePlusGuide.html ) was not found in either the following directories:\n\n<u>%(pwd)s\n</u><b>and</b>\n<u>%(prefix)s/share/doc/nicotine/documentation/</u>\n\nEither install Nicotine-Plus, or start from inside the Nicotine-Plus source directory." % {'pwd':path1, 'prefix':sys.prefix } ) )
+ 	
+ 	def OnOnlineNicotineGuide(self, widget):
+ 		url = "http://nicotine-plus.sourceforge.net/NicotinePlusGuide/"
diff --git a/net-p2p/nicotine-plus/files/patch-setup.py b/net-p2p/nicotine-plus/files/patch-setup.py
index cf0c64e235ab..5f1fc1fa0d4b 100644
--- a/net-p2p/nicotine-plus/files/patch-setup.py
+++ b/net-p2p/nicotine-plus/files/patch-setup.py
@@ -1,17 +1,20 @@
---- setup.py	Sat Mar 24 07:31:17 2007
-+++ setup.py	Sat Mar 24 07:33:11 2007
-@@ -27,12 +27,12 @@
- 		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"]))
- # Manuals
- manpages = glob.glob(os.path.join("manpages", "*.1"))
- for man in manpages:
--	files.append((os.path.join(sys.prefix, "share", "man", "man1"), [man]))
-+	files.append((os.path.join(sys.prefix, "man", "man1"), [man]))
- files.append((os.path.join(sys.prefix, "share", "pixmaps"), ["files/nicotine-plus-32px.png"]))
- if sys.platform.startswith("win"):
-   try:
+--- setup.py	2009-05-22 14:59:23.000000000 -0500
++++ setup.py	2009-06-23 13:14:20.000000000 -0500
+@@ -84,7 +84,7 @@
+ 	# Manuals
+ 	manpages = glob.glob(os.path.join("manpages", "*.1"))
+ 	for man in manpages:
+-		files.append((os.path.join(sys.prefix, "share", "man", "man1"), [man]))
++		files.append((os.path.join(sys.prefix, "man", "man1"), [man]))
+ 	files.append((os.path.join(sys.prefix, "share", "pixmaps"), ["files/nicotine-plus-32px.png"]))
+ 	files.append((os.path.join(sys.prefix, "share", "applications"), ["files/nicotine.desktop"]))
+ 
+@@ -115,7 +115,7 @@
+ 	if is_windows:
+ 		files.append((os.path.join("share", "nicotine", "documentation"), [file]))
+ 	else:
+-		files.append((os.path.join(sys.prefix, "share", "nicotine", "documentation"), [file]))
++		files.append((os.path.join(sys.prefix, "share", "doc", "nicotine", "documentation"), [file]))
+ 
+ # Glade files (GUI)
+ #glade_files = glob.glob(os.path.join("pynicotine", "gtkgui", "*.glade"))
diff --git a/net-p2p/nicotine-plus/pkg-plist b/net-p2p/nicotine-plus/pkg-plist
index 9b1b2dcbf268..28e0ef77a252 100644
--- a/net-p2p/nicotine-plus/pkg-plist
+++ b/net-p2p/nicotine-plus/pkg-plist
@@ -1,155 +1,171 @@
 bin/nicotine
 bin/nicotine-import-winconfig
-%%PYTHON_SITELIBDIR%%/pynicotine/__init__.py
-%%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/pynicotine.py
 %%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/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/logfacility.py
+%%PYTHON_SITELIBDIR%%/pynicotine/libi18n.py
+%%PYTHON_SITELIBDIR%%/pynicotine/config.py
+%%PYTHON_SITELIBDIR%%/pynicotine/slskmessages.py
+%%PYTHON_SITELIBDIR%%/pynicotine/pluginsystem.py
+%%PYTHON_SITELIBDIR%%/pynicotine/slskproto.py
+%%PYTHON_SITELIBDIR%%/pynicotine/utils.py
+%%PYTHON_SITELIBDIR%%/pynicotine/metadata_mutagen.py
+%%PYTHON_SITELIBDIR%%/pynicotine/__init__.py
+%%PYTHON_SITELIBDIR%%/pynicotine/mp3.py
+%%PYTHON_SITELIBDIR%%/pynicotine/_testmp3.py
+%%PYTHON_SITELIBDIR%%/pynicotine/multiselect.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/entrydialog.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/about.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/uploads.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/search.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/mozembed.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/utils.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/chatrooms.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/frame.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/settingswindow.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/nowplaying.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/ticker.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/nowplaying.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/settingswindow.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/frame.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/chatrooms.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/downloads.pyc
-%%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/userlist.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/privatechat.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/imagedata.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/imagedata.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userlist.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/privatechat.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/glade2py.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/dirchooser.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userbrowse.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/__init__.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userinfo.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/downloads.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/checklatest.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userbrowse.glade
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/chatrooms.glade
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userinfo.glade
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/mainwindow.glade
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/roomlist.glade
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/privatechat.glade
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/nicotine-settings.glade
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/search.glade
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/entrydialog.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/about.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/uploads.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/search.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/mozembed.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/utils.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/chatrooms.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/frame.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/settingswindow.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/nowplaying.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/ticker.pyc
 %%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/search.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/uploads.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/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/privatechat.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/imagedata.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/imagedata.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userlist.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/privatechat.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/glade2py.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/dirchooser.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userbrowse.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userinfo.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/downloads.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/checklatest.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/entrydialog.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/about.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/uploads.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/search.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/mozembed.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/utils.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/chatrooms.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/frame.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/settingswindow.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/nowplaying.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/ticker.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/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/gtkgui/imagedata.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userlist.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/privatechat.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/glade2py.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/dirchooser.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userbrowse.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userinfo.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/downloads.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/checklatest.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/ConfigParser.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/pynicotine.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/transfers.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/logfacility.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/libi18n.pyc
 %%PYTHON_SITELIBDIR%%/pynicotine/mp3.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/config.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/slskmessages.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/pluginsystem.pyc
 %%PYTHON_SITELIBDIR%%/pynicotine/slskproto.pyc
 %%PYTHON_SITELIBDIR%%/pynicotine/utils.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/pynicotine.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/ConfigParser.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/slskmessages.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/config.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/transfers.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/mp3.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/slskproto.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/utils.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/pynicotine.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/metadata_mutagen.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/_testmp3.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/multiselect.pyc
 %%PYTHON_SITELIBDIR%%/pynicotine/ConfigParser.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/slskmessages.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/config.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/pynicotine.pyo
 %%PYTHON_SITELIBDIR%%/pynicotine/transfers.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/logfacility.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/libi18n.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/config.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/slskmessages.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/pluginsystem.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/slskproto.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/utils.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/metadata_mutagen.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/mp3.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/_testmp3.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/multiselect.pyo
+%%PORTDOCS%%%%DOCSDIR%%/documentation/README
+%%PORTDOCS%%%%DOCSDIR%%/documentation/NicotinePlusGuide.html
+%%PORTDOCS%%%%DOCSDIR%%/documentation/TRANSLATORS
+%%PORTDOCS%%%%DOCSDIR%%/documentation/KNOWN_BUGS
+%%PORTDOCS%%%%DOCSDIR%%/documentation/py2app
+%%PORTDOCS%%%%DOCSDIR%%/documentation/MAINTAINERS
+%%PORTDOCS%%%%DOCSDIR%%/documentation/README.import-winconfig
+%%PORTDOCS%%%%DOCSDIR%%/documentation/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/documentation/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/documentation/TODO
+%%PORTDOCS%%%%DOCSDIR%%/documentation/README.trayicon
+%%PORTDOCS%%%%DOCSDIR%%/documentation/TRANSLATIONS
+%%PORTDOCS%%%%DOCSDIR%%/documentation/CHANGELOG_DOCS
+%%PORTDOCS%%%%DOCSDIR%%/documentation/BUILD_win32.txt
+share/locale/da/LC_MESSAGES/nicotine.mo
 share/locale/de/LC_MESSAGES/nicotine.mo
-share/locale/dk/LC_MESSAGES/nicotine.mo
 share/locale/es/LC_MESSAGES/nicotine.mo
 share/locale/eu/LC_MESSAGES/nicotine.mo
+share/locale/fi/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/pt_BR/LC_MESSAGES/nicotine.mo
-share/locale/sv/LC_MESSAGES/nicotine.mo
 share/locale/lt/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/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
+share/locale/sv/LC_MESSAGES/nicotine.mo
+share/pixmaps/nicotine-plus-32px.png
+share/applications/nicotine.desktop
 %%DATADIR%%/sounds/cough/private.ogg
 %%DATADIR%%/sounds/cough/room_nick.ogg
 %%DATADIR%%/sounds/cough/details.txt
 %%DATADIR%%/sounds/cough/license.txt
-%%PORTDOCS%%%%DOCSDIR%%/BUILD_win32.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%%
+%%DATADIR%%/sounds/default/private.ogg
+%%DATADIR%%/sounds/default/room_nick.ogg
+%%DATADIR%%/sounds/default/details.txt
+%%DATADIR%%/sounds/default/license.txt
 @dirrm %%DATADIR%%/sounds/default
 @dirrm %%DATADIR%%/sounds/cough
 @dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/documentation
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/pynicotine/gtkgui
+@dirrm %%PYTHON_SITELIBDIR%%/pynicotine
 @dirrmtry share/applications