4 files changed, 125 insertions, 130 deletions

diff --git a/net-p2p/nicotine-plus/Makefile b/net-p2p/nicotine-plus/Makefile
index 6944e3d47985..56205e8f8d16 100644
--- a/net-p2p/nicotine-plus/Makefile
+++ b/net-p2p/nicotine-plus/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	plus
-PORTVERSION=	1.2.12
-PORTREVISION=	4
+PORTVERSION=	1.2.16
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/nicotine-${PORTNAME}/nicotine-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	nicotine-
@@ -34,7 +33,8 @@ MAN1=		nicotine-import-winconfig.1 nicotine.1
 OPTIONS=	GEOIP "Enable the GeoIP based country code blocker" on \
 		PSYCO "Enable Psyco, the optimizing Python compiler" on \
 		MUTAGEN "Enable Mutagen for audio metadata support" on \
-		LIBSEXY	"Enable libsexy support"	on
+		LIBSEXY	"Enable libsexy support"	on \
+		MINIUPNPC "Enable upnp support"	on
 
 .include <bsd.port.pre.mk>
 
@@ -50,6 +50,9 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-muta
 .if defined(WITH_LIBSEXY)
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/gtk-2.0/sexy.so:${PORTSDIR}/x11-toolkits/py-sexy
 .endif
+.if defined(WITH_MINIUPNPC)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/miniupnpc.so:${PORTSDIR}/net/py-miniupnpc
+.endif
 
 post-extract:
 	@${MV} ${WRKSRC}/${PKGNAMEPREFIX:S/-//}.py ${WRKSRC}/${PKGNAMEPREFIX:S/-//}
diff --git a/net-p2p/nicotine-plus/distinfo b/net-p2p/nicotine-plus/distinfo
index c66d75b6deab..4914e4c60b07 100644
--- a/net-p2p/nicotine-plus/distinfo
+++ b/net-p2p/nicotine-plus/distinfo
@@ -1,3 +1,2 @@
-MD5 (nicotine+-1.2.12.tar.bz2) = b90f8dd30dcf26add5138d1904349b2a
-SHA256 (nicotine+-1.2.12.tar.bz2) = bca879bc720fbf86876efba67faeddea8b1819e9886ca854b2205838ce32bad0
-SIZE (nicotine+-1.2.12.tar.bz2) = 3834948
+SHA256 (nicotine+-1.2.16.tar.bz2) = 71e5b33e273daaf072dbf63839536c14d7ead9d149323d50eee09f7429e34c1d
+SIZE (nicotine+-1.2.16.tar.bz2) = 3892006
diff --git a/net-p2p/nicotine-plus/files/patch-pynicotine-gtkgui_frame.py b/net-p2p/nicotine-plus/files/patch-pynicotine-gtkgui_frame.py
deleted file mode 100644
index b441ad5afe6e..000000000000
--- a/net-p2p/nicotine-plus/files/patch-pynicotine-gtkgui_frame.py
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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:
- 			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/pkg-plist b/net-p2p/nicotine-plus/pkg-plist
index 28e0ef77a252..b21ddbfde2b8 100644
--- a/net-p2p/nicotine-plus/pkg-plist
+++ b/net-p2p/nicotine-plus/pkg-plist
@@ -1,132 +1,150 @@
 bin/nicotine
 bin/nicotine-import-winconfig
 %%PYTHON_SITELIBDIR%%/pynicotine/ConfigParser.py
-%%PYTHON_SITELIBDIR%%/pynicotine/pynicotine.py
-%%PYTHON_SITELIBDIR%%/pynicotine/transfers.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/ConfigParser.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/ConfigParser.pyo
 %%PYTHON_SITELIBDIR%%/pynicotine/__init__.py
-%%PYTHON_SITELIBDIR%%/pynicotine/mp3.py
+%%PYTHON_SITELIBDIR%%/pynicotine/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/__init__.pyo
 %%PYTHON_SITELIBDIR%%/pynicotine/_testmp3.py
-%%PYTHON_SITELIBDIR%%/pynicotine/multiselect.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/entrydialog.py
+%%PYTHON_SITELIBDIR%%/pynicotine/_testmp3.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/_testmp3.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/config.py
+%%PYTHON_SITELIBDIR%%/pynicotine/config.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/config.pyo
+%%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/uploads.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/search.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/mozembed.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/utils.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/about.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/about.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/buddylist.glade
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/countrycodes.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/countrycodes.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/countrycodes.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/chatrooms.glade
 %%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/imagedata.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userlist.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/privatechat.py
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/glade2py.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/chatrooms.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/chatrooms.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/checklatest.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/checklatest.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/checklatest.pyo
 %%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/dirchooser.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/dirchooser.pyo
 %%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/downloads.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/downloads.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/entrydialog.py
 %%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/entrydialog.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/fastconfigure.glade
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/fastconfigure.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/fastconfigure.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/fastconfigure.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/frame.py
 %%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/frame.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/glade2py.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/glade2py.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/glade2py.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/imagedata.py
 %%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/imagedata.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userlist.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/imagedata.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/mainwindow.glade
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/mozembed.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/mozembed.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/mozembed.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/nicotine-settings.glade
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/nowplaying.glade
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/nowplaying.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/nowplaying.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/nowplaying.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/privatechat.glade
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/privatechat.py
 %%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/privatechat.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/roomlist.glade
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/search.glade
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/search.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/search.pyc
 %%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.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/settingswindow.pyc
 %%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/settingswindow.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/nowplaying.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/ticker.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/ticker.pyc
 %%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/ticker.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/translux.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/transferlist.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/transferlist.pyc
 %%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/transferlist.pyo
-%%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/translux.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/translux.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/translux.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/uglytree.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/uglytree.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/uglytree.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/uploads.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/uploads.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/uploads.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userbrowse.glade
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userbrowse.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userbrowse.pyc
 %%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userbrowse.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userinfo.glade
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userinfo.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userinfo.pyc
 %%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/gtkgui/userlist.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userlist.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/userlist.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/utils.py
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/utils.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/gtkgui/utils.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/libi18n.py
 %%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/libi18n.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/logfacility.py
+%%PYTHON_SITELIBDIR%%/pynicotine/logfacility.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/logfacility.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/metadata_mutagen.py
 %%PYTHON_SITELIBDIR%%/pynicotine/metadata_mutagen.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/_testmp3.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/metadata_mutagen.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/mp3.py
+%%PYTHON_SITELIBDIR%%/pynicotine/mp3.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/mp3.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/multiselect.py
 %%PYTHON_SITELIBDIR%%/pynicotine/multiselect.pyc
-%%PYTHON_SITELIBDIR%%/pynicotine/ConfigParser.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/multiselect.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/pluginsystem.py
+%%PYTHON_SITELIBDIR%%/pynicotine/pluginsystem.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/pluginsystem.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/pynicotine.py
+%%PYTHON_SITELIBDIR%%/pynicotine/pynicotine.pyc
 %%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/shares.py
+%%PYTHON_SITELIBDIR%%/pynicotine/shares.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/shares.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/slskmessages.py
+%%PYTHON_SITELIBDIR%%/pynicotine/slskmessages.pyc
 %%PYTHON_SITELIBDIR%%/pynicotine/slskmessages.pyo
-%%PYTHON_SITELIBDIR%%/pynicotine/pluginsystem.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/slskproto.py
+%%PYTHON_SITELIBDIR%%/pynicotine/slskproto.pyc
 %%PYTHON_SITELIBDIR%%/pynicotine/slskproto.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/transfers.py
+%%PYTHON_SITELIBDIR%%/pynicotine/transfers.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/transfers.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/upnp.py
+%%PYTHON_SITELIBDIR%%/pynicotine/upnp.pyc
+%%PYTHON_SITELIBDIR%%/pynicotine/upnp.pyo
+%%PYTHON_SITELIBDIR%%/pynicotine/utils.py
+%%PYTHON_SITELIBDIR%%/pynicotine/utils.pyc
 %%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/build_mac.txt
 %%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