Update to 0.5.1 and took a patch from rblibtorrent/files/patch-socket_ops.hpp.

12 files changed, 154 insertions, 82 deletions

diff --git a/net-p2p/deluge/Makefile b/net-p2p/deluge/Makefile
index 78a4f51ed761..bf2fe83df9c2 100644
--- a/net-p2p/deluge/Makefile
+++ b/net-p2p/deluge/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	deluge
-PORTVERSION=	0.5.0
-PORTREVISION=	2
+PORTVERSION=	0.5.1
 CATEGORIES=	net-p2p python
-MASTER_SITES=	http://deluge-torrent.org/downloads/
+MASTER_SITES=	http://download.deluge-torrent.org/stable/
 
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	A Bittorrent client, using Python, GTK+2 and Rasterbar libtorrent
@@ -20,6 +19,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \
 
 USE_GNOME=	pygtk2 desktopfileutils
 USE_GETTEXT=	yes
+USE_OPENSSL=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
@@ -27,7 +27,7 @@ DOCS=		LICENSE README
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "amd64" || ${ARCH} == "sparc64" || ${ARCH} == "ia64"
+.if ${ARCH} == "sparc64" || ${ARCH} == "ia64"
 CFLAGS+=	-DAMD64
 .endif
 
diff --git a/net-p2p/deluge/distinfo b/net-p2p/deluge/distinfo
index 8b5d92bc838c..0e0cba0a2366 100644
--- a/net-p2p/deluge/distinfo
+++ b/net-p2p/deluge/distinfo
@@ -1,3 +1,3 @@
-MD5 (deluge-0.5.0.tar.gz) = d83e6ee573ac9e2e8d11bc3f446da3f8
-SHA256 (deluge-0.5.0.tar.gz) = 7f2f8c575f481ee623b7116e6cf9ffb314ee9e065e886478b8795ae5a6e7dfcd
-SIZE (deluge-0.5.0.tar.gz) = 518982
+MD5 (deluge-0.5.1.tar.gz) = 2455b00497eceba8b58e7bab62c008da
+SHA256 (deluge-0.5.1.tar.gz) = c39c578049bbb620de1cbe0e5bf8d0782816951cc6a389d5a8d84f57c08213df
+SIZE (deluge-0.5.1.tar.gz) = 619214
diff --git a/net-p2p/deluge/files/patch-setup.py b/net-p2p/deluge/files/patch-setup.py
index 9fbfc5ca0639..6c14fb6018da 100644
--- a/net-p2p/deluge/files/patch-setup.py
+++ b/net-p2p/deluge/files/patch-setup.py
@@ -1,27 +1,35 @@
---- setup.py.orig	Tue Mar  6 21:43:47 2007
-+++ setup.py	Tue Mar  6 21:45:44 2007
-@@ -51,7 +51,7 @@
- #
+--- setup.py.orig	Sat Jun  9 12:16:40 2007
++++ setup.py	Sat Jun  9 12:19:31 2007
+@@ -100,7 +100,7 @@
+ 	else:
+ 		boosttype = 'mt'
+ 	removals = ['-g', '-DNDEBUG', '-O2', '-Wstrict-prototypes']
+-        additions = ['-DNDEBUG', '-O2']
++        additions = ['-DNDEBUG']
  
- removals = ['-g', '-DNDEBUG', '-O2', '-Wstrict-prototypes']
--additions = ['-DNDEBUG', '-O2']
-+additions = ['-DNDEBUG']
+ 	if python_version == '2.5':
+ 		cv_opt = sysconfig.get_config_vars()["CFLAGS"]
+@@ -131,19 +131,21 @@
+ # Ubuntu possible.
+ if boosttype == "nomt":
+ 	librariestype = ['boost_filesystem', 'boost_date_time',
+-			'boost_thread', 'z', 'pthread', 'ssl']
++			'boost_thread', 'z', 'ssl']
+ 	print 'Libraries nomt' 
+ elif boosttype == "mt":
+ 	librariestype = ['boost_filesystem-mt', 'boost_date_time-mt',
+-			'boost_thread-mt', 'z', 'pthread', 'ssl']
++			'boost_thread-mt', 'z', 'ssl']
+ 	print 'Libraries mt'
  
- if pythonVersion == '2.5':
- 	cv_opt = sysconfig.get_config_vars()["CFLAGS"]
-@@ -85,12 +85,14 @@
  deluge_core = Extension('deluge_core',
                      include_dirs = ['./libtorrent', './libtorrent/include', 
                      			'./libtorrent/include/libtorrent', 
--                    			'/usr/include/python' + pythonVersion],
+-                    			'/usr/include/python' + python_version],
 +                    			'%%LOCALBASE%%/include'],
 +                    library_dirs = ['%%LOCALBASE%%/lib'],
-                     libraries = ['boost_filesystem', 'boost_date_time',
- 					'boost_program_options', 'boost_regex',
- 					'boost_serialization', 'boost_thread', 
--					'z', 'pthread'],
-+					'z'],
-                     extra_compile_args = ["-Wno-missing-braces"],
+ 		    libraries = librariestype,
+                     extra_compile_args = EXTRA_COMPILE_ARGS,
 +                    extra_link_args = ['%%PTHREAD_LIBS%%'],
                      sources = ['src/deluge_core.cpp',
  					'libtorrent/src/alert.cpp',
diff --git a/net-p2p/deluge/files/patch-socket_ops.hpp b/net-p2p/deluge/files/patch-socket_ops.hpp
new file mode 100644
index 000000000000..bffd0c853a3d
--- /dev/null
+++ b/net-p2p/deluge/files/patch-socket_ops.hpp
@@ -0,0 +1,20 @@
+--- libtorrent/include/libtorrent/asio/detail/socket_ops.hpp.orig	Sun May 27 17:11:11 2007
++++ libtorrent/include/libtorrent/asio/detail/socket_ops.hpp	Sun Jun 10 11:58:14 2007
+@@ -63,7 +63,7 @@
+     socket_addr_len_type* addrlen, asio::error_code& ec)
+ {
+   clear_error(ec);
+-#if defined(__MACH__) && defined(__APPLE__)
++#if defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
+   socket_type new_s = error_wrapper(::accept(s, addr, addrlen), ec);
+   if (new_s == invalid_socket)
+     return new_s;
+@@ -295,7 +295,7 @@
+   }
+ 
+   return s;
+-#elif defined(__MACH__) && defined(__APPLE__)
++#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__) 
+   socket_type s = error_wrapper(::socket(af, type, protocol), ec);
+   if (s == invalid_socket)
+     return s;
diff --git a/net-p2p/deluge/files/patch-src_delugegtk.py b/net-p2p/deluge/files/patch-src_interface.py
index 0a0bf5e99919..b878c7def432 100644
--- a/net-p2p/deluge/files/patch-src_delugegtk.py
+++ b/net-p2p/deluge/files/patch-src_interface.py
@@ -1,9 +1,9 @@
---- src/delugegtk.py.orig	Tue Mar  6 20:46:00 2007
-+++ src/delugegtk.py	Tue Mar  6 22:42:58 2007
-@@ -33,9 +33,9 @@
+--- src/interface.py.orig	Sat Jun  9 12:20:35 2007
++++ src/interface.py	Sat Jun  9 12:20:54 2007
+@@ -75,9 +75,9 @@
  	def __init__(self):
  		APP = 'deluge'
- 		DIR = os.path.join(dcommon.INSTALL_PREFIX, 'share', 'locale')
+ 		DIR = os.path.join(common.INSTALL_PREFIX, 'share', 'locale')
 -		locale.setlocale(locale.LC_ALL, '')
 -		locale.bindtextdomain(APP, DIR)
 -		locale.textdomain(APP)
diff --git a/net-p2p/deluge/pkg-plist b/net-p2p/deluge/pkg-plist
index f9908ec9ff1e..235d37810741 100644
--- a/net-p2p/deluge/pkg-plist
+++ b/net-p2p/deluge/pkg-plist
@@ -2,28 +2,31 @@ bin/deluge
 %%PYTHON_SITELIBDIR%%/deluge/__init__.py
 %%PYTHON_SITELIBDIR%%/deluge/__init__.pyc
 %%PYTHON_SITELIBDIR%%/deluge/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deluge/dcommon.py
-%%PYTHON_SITELIBDIR%%/deluge/dcommon.pyc
-%%PYTHON_SITELIBDIR%%/deluge/dcommon.pyo
-%%PYTHON_SITELIBDIR%%/deluge/deluge.py
-%%PYTHON_SITELIBDIR%%/deluge/deluge.pyc
-%%PYTHON_SITELIBDIR%%/deluge/deluge.pyo
+%%PYTHON_SITELIBDIR%%/deluge/common.py
+%%PYTHON_SITELIBDIR%%/deluge/common.pyc
+%%PYTHON_SITELIBDIR%%/deluge/common.pyo
+%%PYTHON_SITELIBDIR%%/deluge/core.py
+%%PYTHON_SITELIBDIR%%/deluge/core.pyc
+%%PYTHON_SITELIBDIR%%/deluge/core.pyo
 %%PYTHON_SITELIBDIR%%/deluge/deluge_core.so
 %%PYTHON_SITELIBDIR%%/deluge/deluge_stats.py
 %%PYTHON_SITELIBDIR%%/deluge/deluge_stats.pyc
 %%PYTHON_SITELIBDIR%%/deluge/deluge_stats.pyo
-%%PYTHON_SITELIBDIR%%/deluge/delugegtk.py
-%%PYTHON_SITELIBDIR%%/deluge/delugegtk.pyc
-%%PYTHON_SITELIBDIR%%/deluge/delugegtk.pyo
-%%PYTHON_SITELIBDIR%%/deluge/delugeplugins.py
-%%PYTHON_SITELIBDIR%%/deluge/delugeplugins.pyc
-%%PYTHON_SITELIBDIR%%/deluge/delugeplugins.pyo
 %%PYTHON_SITELIBDIR%%/deluge/dgtk.py
 %%PYTHON_SITELIBDIR%%/deluge/dgtk.pyc
 %%PYTHON_SITELIBDIR%%/deluge/dgtk.pyo
+%%PYTHON_SITELIBDIR%%/deluge/dialogs.py
+%%PYTHON_SITELIBDIR%%/deluge/dialogs.pyc
+%%PYTHON_SITELIBDIR%%/deluge/dialogs.pyo
+%%PYTHON_SITELIBDIR%%/deluge/interface.py
+%%PYTHON_SITELIBDIR%%/deluge/interface.pyc
+%%PYTHON_SITELIBDIR%%/deluge/interface.pyo
 %%PYTHON_SITELIBDIR%%/deluge/ipc_manager.py
 %%PYTHON_SITELIBDIR%%/deluge/ipc_manager.pyc
 %%PYTHON_SITELIBDIR%%/deluge/ipc_manager.pyo
+%%PYTHON_SITELIBDIR%%/deluge/plugins.py
+%%PYTHON_SITELIBDIR%%/deluge/plugins.pyc
+%%PYTHON_SITELIBDIR%%/deluge/plugins.pyo
 %%PYTHON_SITELIBDIR%%/deluge/pref.py
 %%PYTHON_SITELIBDIR%%/deluge/pref.pyc
 %%PYTHON_SITELIBDIR%%/deluge/pref.pyo
@@ -31,7 +34,9 @@ share/applications/deluge.desktop
 %%DATADIR%%/glade/aboutdialog.glade
 %%DATADIR%%/glade/delugegtk.glade
 %%DATADIR%%/glade/dgtkpopups.glade
-%%DATADIR%%/glade/dgtkpref.glade
+%%DATADIR%%/glade/file_tab_menu.glade
+%%DATADIR%%/glade/plugin_dialog.glade
+%%DATADIR%%/glade/preferences_dialog.glade
 %%DATADIR%%/glade/torrent_menu.glade
 %%DATADIR%%/pixmaps/deluge-about.png
 %%DATADIR%%/pixmaps/deluge128.png
@@ -45,6 +50,8 @@ share/applications/deluge.desktop
 %%DATADIR%%/plugins/HelloWorld/plugin.py
 %%DATADIR%%/plugins/NetworkGraph/plugin.py
 %%DATADIR%%/plugins/NetworkHealth/plugin.py
+%%DATADIR%%/plugins/TorrentCreator/plugin.py
+%%DATADIR%%/plugins/TorrentCreator/tcreator.glade
 %%DATADIR%%/plugins/TorrentSearch/plugin.py
 %%DATADIR%%/plugins/TorrentSearch/searchdlg.glade
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
@@ -90,6 +97,7 @@ share/pixmaps/deluge.xpm
 @dirrmtry share/locale/la
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/plugins/TorrentSearch
+@dirrm %%DATADIR%%/plugins/TorrentCreator
 @dirrm %%DATADIR%%/plugins/NetworkHealth
 @dirrm %%DATADIR%%/plugins/NetworkGraph
 @dirrm %%DATADIR%%/plugins/HelloWorld
diff --git a/net-p2p/deluge05/Makefile b/net-p2p/deluge05/Makefile
index 78a4f51ed761..bf2fe83df9c2 100644
--- a/net-p2p/deluge05/Makefile
+++ b/net-p2p/deluge05/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	deluge
-PORTVERSION=	0.5.0
-PORTREVISION=	2
+PORTVERSION=	0.5.1
 CATEGORIES=	net-p2p python
-MASTER_SITES=	http://deluge-torrent.org/downloads/
+MASTER_SITES=	http://download.deluge-torrent.org/stable/
 
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	A Bittorrent client, using Python, GTK+2 and Rasterbar libtorrent
@@ -20,6 +19,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \
 
 USE_GNOME=	pygtk2 desktopfileutils
 USE_GETTEXT=	yes
+USE_OPENSSL=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
@@ -27,7 +27,7 @@ DOCS=		LICENSE README
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "amd64" || ${ARCH} == "sparc64" || ${ARCH} == "ia64"
+.if ${ARCH} == "sparc64" || ${ARCH} == "ia64"
 CFLAGS+=	-DAMD64
 .endif
 
diff --git a/net-p2p/deluge05/distinfo b/net-p2p/deluge05/distinfo
index 8b5d92bc838c..0e0cba0a2366 100644
--- a/net-p2p/deluge05/distinfo
+++ b/net-p2p/deluge05/distinfo
@@ -1,3 +1,3 @@
-MD5 (deluge-0.5.0.tar.gz) = d83e6ee573ac9e2e8d11bc3f446da3f8
-SHA256 (deluge-0.5.0.tar.gz) = 7f2f8c575f481ee623b7116e6cf9ffb314ee9e065e886478b8795ae5a6e7dfcd
-SIZE (deluge-0.5.0.tar.gz) = 518982
+MD5 (deluge-0.5.1.tar.gz) = 2455b00497eceba8b58e7bab62c008da
+SHA256 (deluge-0.5.1.tar.gz) = c39c578049bbb620de1cbe0e5bf8d0782816951cc6a389d5a8d84f57c08213df
+SIZE (deluge-0.5.1.tar.gz) = 619214
diff --git a/net-p2p/deluge05/files/patch-setup.py b/net-p2p/deluge05/files/patch-setup.py
index 9fbfc5ca0639..6c14fb6018da 100644
--- a/net-p2p/deluge05/files/patch-setup.py
+++ b/net-p2p/deluge05/files/patch-setup.py
@@ -1,27 +1,35 @@
---- setup.py.orig	Tue Mar  6 21:43:47 2007
-+++ setup.py	Tue Mar  6 21:45:44 2007
-@@ -51,7 +51,7 @@
- #
+--- setup.py.orig	Sat Jun  9 12:16:40 2007
++++ setup.py	Sat Jun  9 12:19:31 2007
+@@ -100,7 +100,7 @@
+ 	else:
+ 		boosttype = 'mt'
+ 	removals = ['-g', '-DNDEBUG', '-O2', '-Wstrict-prototypes']
+-        additions = ['-DNDEBUG', '-O2']
++        additions = ['-DNDEBUG']
  
- removals = ['-g', '-DNDEBUG', '-O2', '-Wstrict-prototypes']
--additions = ['-DNDEBUG', '-O2']
-+additions = ['-DNDEBUG']
+ 	if python_version == '2.5':
+ 		cv_opt = sysconfig.get_config_vars()["CFLAGS"]
+@@ -131,19 +131,21 @@
+ # Ubuntu possible.
+ if boosttype == "nomt":
+ 	librariestype = ['boost_filesystem', 'boost_date_time',
+-			'boost_thread', 'z', 'pthread', 'ssl']
++			'boost_thread', 'z', 'ssl']
+ 	print 'Libraries nomt' 
+ elif boosttype == "mt":
+ 	librariestype = ['boost_filesystem-mt', 'boost_date_time-mt',
+-			'boost_thread-mt', 'z', 'pthread', 'ssl']
++			'boost_thread-mt', 'z', 'ssl']
+ 	print 'Libraries mt'
  
- if pythonVersion == '2.5':
- 	cv_opt = sysconfig.get_config_vars()["CFLAGS"]
-@@ -85,12 +85,14 @@
  deluge_core = Extension('deluge_core',
                      include_dirs = ['./libtorrent', './libtorrent/include', 
                      			'./libtorrent/include/libtorrent', 
--                    			'/usr/include/python' + pythonVersion],
+-                    			'/usr/include/python' + python_version],
 +                    			'%%LOCALBASE%%/include'],
 +                    library_dirs = ['%%LOCALBASE%%/lib'],
-                     libraries = ['boost_filesystem', 'boost_date_time',
- 					'boost_program_options', 'boost_regex',
- 					'boost_serialization', 'boost_thread', 
--					'z', 'pthread'],
-+					'z'],
-                     extra_compile_args = ["-Wno-missing-braces"],
+ 		    libraries = librariestype,
+                     extra_compile_args = EXTRA_COMPILE_ARGS,
 +                    extra_link_args = ['%%PTHREAD_LIBS%%'],
                      sources = ['src/deluge_core.cpp',
  					'libtorrent/src/alert.cpp',
diff --git a/net-p2p/deluge05/files/patch-socket_ops.hpp b/net-p2p/deluge05/files/patch-socket_ops.hpp
new file mode 100644
index 000000000000..bffd0c853a3d
--- /dev/null
+++ b/net-p2p/deluge05/files/patch-socket_ops.hpp
@@ -0,0 +1,20 @@
+--- libtorrent/include/libtorrent/asio/detail/socket_ops.hpp.orig	Sun May 27 17:11:11 2007
++++ libtorrent/include/libtorrent/asio/detail/socket_ops.hpp	Sun Jun 10 11:58:14 2007
+@@ -63,7 +63,7 @@
+     socket_addr_len_type* addrlen, asio::error_code& ec)
+ {
+   clear_error(ec);
+-#if defined(__MACH__) && defined(__APPLE__)
++#if defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
+   socket_type new_s = error_wrapper(::accept(s, addr, addrlen), ec);
+   if (new_s == invalid_socket)
+     return new_s;
+@@ -295,7 +295,7 @@
+   }
+ 
+   return s;
+-#elif defined(__MACH__) && defined(__APPLE__)
++#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__) 
+   socket_type s = error_wrapper(::socket(af, type, protocol), ec);
+   if (s == invalid_socket)
+     return s;
diff --git a/net-p2p/deluge05/files/patch-src_delugegtk.py b/net-p2p/deluge05/files/patch-src_interface.py
index 0a0bf5e99919..b878c7def432 100644
--- a/net-p2p/deluge05/files/patch-src_delugegtk.py
+++ b/net-p2p/deluge05/files/patch-src_interface.py
@@ -1,9 +1,9 @@
---- src/delugegtk.py.orig	Tue Mar  6 20:46:00 2007
-+++ src/delugegtk.py	Tue Mar  6 22:42:58 2007
-@@ -33,9 +33,9 @@
+--- src/interface.py.orig	Sat Jun  9 12:20:35 2007
++++ src/interface.py	Sat Jun  9 12:20:54 2007
+@@ -75,9 +75,9 @@
  	def __init__(self):
  		APP = 'deluge'
- 		DIR = os.path.join(dcommon.INSTALL_PREFIX, 'share', 'locale')
+ 		DIR = os.path.join(common.INSTALL_PREFIX, 'share', 'locale')
 -		locale.setlocale(locale.LC_ALL, '')
 -		locale.bindtextdomain(APP, DIR)
 -		locale.textdomain(APP)
diff --git a/net-p2p/deluge05/pkg-plist b/net-p2p/deluge05/pkg-plist
index f9908ec9ff1e..235d37810741 100644
--- a/net-p2p/deluge05/pkg-plist
+++ b/net-p2p/deluge05/pkg-plist
@@ -2,28 +2,31 @@ bin/deluge
 %%PYTHON_SITELIBDIR%%/deluge/__init__.py
 %%PYTHON_SITELIBDIR%%/deluge/__init__.pyc
 %%PYTHON_SITELIBDIR%%/deluge/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deluge/dcommon.py
-%%PYTHON_SITELIBDIR%%/deluge/dcommon.pyc
-%%PYTHON_SITELIBDIR%%/deluge/dcommon.pyo
-%%PYTHON_SITELIBDIR%%/deluge/deluge.py
-%%PYTHON_SITELIBDIR%%/deluge/deluge.pyc
-%%PYTHON_SITELIBDIR%%/deluge/deluge.pyo
+%%PYTHON_SITELIBDIR%%/deluge/common.py
+%%PYTHON_SITELIBDIR%%/deluge/common.pyc
+%%PYTHON_SITELIBDIR%%/deluge/common.pyo
+%%PYTHON_SITELIBDIR%%/deluge/core.py
+%%PYTHON_SITELIBDIR%%/deluge/core.pyc
+%%PYTHON_SITELIBDIR%%/deluge/core.pyo
 %%PYTHON_SITELIBDIR%%/deluge/deluge_core.so
 %%PYTHON_SITELIBDIR%%/deluge/deluge_stats.py
 %%PYTHON_SITELIBDIR%%/deluge/deluge_stats.pyc
 %%PYTHON_SITELIBDIR%%/deluge/deluge_stats.pyo
-%%PYTHON_SITELIBDIR%%/deluge/delugegtk.py
-%%PYTHON_SITELIBDIR%%/deluge/delugegtk.pyc
-%%PYTHON_SITELIBDIR%%/deluge/delugegtk.pyo
-%%PYTHON_SITELIBDIR%%/deluge/delugeplugins.py
-%%PYTHON_SITELIBDIR%%/deluge/delugeplugins.pyc
-%%PYTHON_SITELIBDIR%%/deluge/delugeplugins.pyo
 %%PYTHON_SITELIBDIR%%/deluge/dgtk.py
 %%PYTHON_SITELIBDIR%%/deluge/dgtk.pyc
 %%PYTHON_SITELIBDIR%%/deluge/dgtk.pyo
+%%PYTHON_SITELIBDIR%%/deluge/dialogs.py
+%%PYTHON_SITELIBDIR%%/deluge/dialogs.pyc
+%%PYTHON_SITELIBDIR%%/deluge/dialogs.pyo
+%%PYTHON_SITELIBDIR%%/deluge/interface.py
+%%PYTHON_SITELIBDIR%%/deluge/interface.pyc
+%%PYTHON_SITELIBDIR%%/deluge/interface.pyo
 %%PYTHON_SITELIBDIR%%/deluge/ipc_manager.py
 %%PYTHON_SITELIBDIR%%/deluge/ipc_manager.pyc
 %%PYTHON_SITELIBDIR%%/deluge/ipc_manager.pyo
+%%PYTHON_SITELIBDIR%%/deluge/plugins.py
+%%PYTHON_SITELIBDIR%%/deluge/plugins.pyc
+%%PYTHON_SITELIBDIR%%/deluge/plugins.pyo
 %%PYTHON_SITELIBDIR%%/deluge/pref.py
 %%PYTHON_SITELIBDIR%%/deluge/pref.pyc
 %%PYTHON_SITELIBDIR%%/deluge/pref.pyo
@@ -31,7 +34,9 @@ share/applications/deluge.desktop
 %%DATADIR%%/glade/aboutdialog.glade
 %%DATADIR%%/glade/delugegtk.glade
 %%DATADIR%%/glade/dgtkpopups.glade
-%%DATADIR%%/glade/dgtkpref.glade
+%%DATADIR%%/glade/file_tab_menu.glade
+%%DATADIR%%/glade/plugin_dialog.glade
+%%DATADIR%%/glade/preferences_dialog.glade
 %%DATADIR%%/glade/torrent_menu.glade
 %%DATADIR%%/pixmaps/deluge-about.png
 %%DATADIR%%/pixmaps/deluge128.png
@@ -45,6 +50,8 @@ share/applications/deluge.desktop
 %%DATADIR%%/plugins/HelloWorld/plugin.py
 %%DATADIR%%/plugins/NetworkGraph/plugin.py
 %%DATADIR%%/plugins/NetworkHealth/plugin.py
+%%DATADIR%%/plugins/TorrentCreator/plugin.py
+%%DATADIR%%/plugins/TorrentCreator/tcreator.glade
 %%DATADIR%%/plugins/TorrentSearch/plugin.py
 %%DATADIR%%/plugins/TorrentSearch/searchdlg.glade
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
@@ -90,6 +97,7 @@ share/pixmaps/deluge.xpm
 @dirrmtry share/locale/la
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/plugins/TorrentSearch
+@dirrm %%DATADIR%%/plugins/TorrentCreator
 @dirrm %%DATADIR%%/plugins/NetworkHealth
 @dirrm %%DATADIR%%/plugins/NetworkGraph
 @dirrm %%DATADIR%%/plugins/HelloWorld