- Update to 1.3.0

- Add DESKTOP_ENTRIES
- Take over maintainership

net-p2p/deluge/Makefile

@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	deluge
-DISTVERSION=	1.3.0_rc2
+DISTVERSION=	1.3.0
 PORTEPOCH=	1
 CATEGORIES=	net-p2p python
 MASTER_SITES=	http://download.deluge-torrent.org/source/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Bittorrent client using Python, GTK+2 and libtorrent-rasterbar
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0.6:${PORTSDIR}/devel/py-setuptools
@@ -36,8 +36,8 @@ USE_GETTEXT=	yes
 USE_OPENSSL=	yes
 USE_PYTHON=	2.5+
 USE_TWISTED=	web
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_NOEGGINFO=	yes
+USE_PYDISTUTILS=	easy_install
+PYDISTUTILS_BUILD_TARGET=	build bdist_egg
 
 OPTIONS=	PYGTK "Enable GUI and gtk dep (GUI files always installed)" on \
 		PSYCO "Enable devel/py-psyco optimization (i386 only)" off
@@ -46,7 +46,12 @@ MAN1=		deluge.1 deluge-console.1 deluge-gtk.1 deluge-web.1 deluged.1
 
 PORTDOCS=	*
 
-PLIST_SUB=	VERSION="${DISTVERSION}" PYTHON_VER="${PYTHON_VER}"
+DESKTOP_ENTRIES=	"Deluge" \
+			"A peer-to-peer file sharing program utilizing the Bittorrent protocol" \
+			"${PYTHONPREFIX_SITELIBDIR}/${PYEASYINSTALL_EGG}/share/pixmaps/deluge.png" \
+			"deluge" \
+			"Network;FileTransfer;P2P;" \
+			"true"
 
 .include <bsd.port.pre.mk>
 
@@ -55,6 +60,12 @@ PLIST_SUB=	VERSION="${DISTVERSION}" PYTHON_VER="${PYTHON_VER}"
 WITHOUT_PSYCO=	yes
 .endif
 
+# only touch easy-install.pth if we installed it ourselves which
+# happens when PREFIX differs from LOCALBASE
+.if ${PREFIX} != ${LOCALBASE}
+PLIST_FILES+=	${PYTHON_SITELIBDIR:S;${LOCALBASE}/;;}/easy-install.pth
+.endif
+
 .if defined(WITH_PSYCO)
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
 
@@ -94,7 +105,11 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
+# install man pages
+.for man in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/docs/man/${man} ${MANPREFIX}/man/man1/
+.endfor
 # fix installation permissions
-	@${FIND} ${PYTHONPREFIX_SITELIBDIR}/deluge -type f -exec ${CHMOD} ${SHAREMODE} {} \;
+	@${FIND} ${PYTHONPREFIX_SITELIBDIR}/${PYEASYINSTALL_EGG} -type f -exec ${CHMOD} ${SHAREMODE} {} \;
 
 .include <bsd.port.post.mk>

net-p2p/deluge/distinfo

@@ -1,3 +1,3 @@
-MD5 (deluge-1.3.0_rc2.tar.bz2) = 248fb524c6b05157294125f6b16f27ca
-SHA256 (deluge-1.3.0_rc2.tar.bz2) = 068c3fa0032eec8749ac8a5fcbe28293eae451d162438ce9ca4ace031a4b577a
-SIZE (deluge-1.3.0_rc2.tar.bz2) = 2343332
+MD5 (deluge-1.3.0.tar.bz2) = 5fca34e2e31753a8ba0ccb942f0e993e
+SHA256 (deluge-1.3.0.tar.bz2) = f1d881c1ec83b1353f0a803f1301a0b87ef089935eeac031aeedbc098938c355
+SIZE (deluge-1.3.0.tar.bz2) = 2344582

net-p2p/deluge/files/patch-setup.py

@@ -1,53 +1,6 @@
---- setup.py.orig	2010-08-20 18:20:27.000000000 -0300
-+++ setup.py	2010-08-21 16:49:05.000000000 -0300
-@@ -68,7 +68,6 @@
-     "-D_FILE_OFFSET_BITS=64",
-     "-DNDEBUG",
-     "-DTORRENT_USE_OPENSSL=1",
--    "-O2",
-     ]
- 
- if windows_check():
-@@ -115,12 +114,14 @@
- remove_from_cflags(removals)
- 
- _library_dirs = [
-+    '%%LOCALBASE%%/lib'
- ]
- 
- _include_dirs = [
-     './libtorrent',
-     './libtorrent/include',
--    './libtorrent/include/libtorrent'
-+    './libtorrent/include/libtorrent',
-+    '%%LOCALBASE%%/include'
- ]
- 
- if windows_check():
-@@ -142,14 +143,6 @@
-         'zlib'
-     ]
- else:
--    _include_dirs += [
--        '/usr/include/python' + python_version,
--        sysconfig.get_config_var("INCLUDEDIR")
--        ]
--    for include in os.environ.get("INCLUDEDIR", "").split(":"):
--        _include_dirs.append(include)
--
--    _library_dirs += [sysconfig.get_config_var("LIBDIR"), '/opt/local/lib']
-     if osx_check():
-         _include_dirs += [
-             '/opt/local/include/boost-1_35',
-@@ -163,7 +156,6 @@
-         'boost_iostreams',
-         'boost_python',
-         'boost_thread',
--        'pthread',
-         'ssl',
-         'z'
-         ]
-@@ -212,6 +204,7 @@
+--- setup.py.orig	2010-09-18 15:31:07.000000000 -0300
++++ setup.py	2010-09-19 23:33:09.000000000 -0300
+@@ -211,6 +203,7 @@
      build_libtorrent = True
  else:
      build_libtorrent = False
@@ -55,16 +8,7 @@
  
  if build_libtorrent:
      got_libtorrent = False
-@@ -392,8 +385,6 @@
-         for cmd_name in self.get_sub_commands():
-             self.run_command(cmd_name)
-         _install.run(self)
--        if not self.root:
--            self.do_egg_install()
- 
- cmdclass = {
-     'build': build,
-@@ -409,7 +400,7 @@
+@@ -399,7 +392,7 @@
  
  # Data files to be installed to the system
  _data_files = [
@@ -73,12 +17,18 @@
      ('share/icons/hicolor/128x128/apps', ['deluge/data/icons/hicolor/128x128/apps/deluge.png']),
      ('share/icons/hicolor/16x16/apps', ['deluge/data/icons/hicolor/16x16/apps/deluge.png']),
      ('share/icons/hicolor/192x192/apps', ['deluge/data/icons/hicolor/192x192/apps/deluge.png']),
-@@ -424,7 +415,7 @@
+@@ -413,13 +406,7 @@
+     ('share/icons/hicolor/72x72/apps', ['deluge/data/icons/hicolor/72x72/apps/deluge.png']),
      ('share/icons/hicolor/96x96/apps', ['deluge/data/icons/hicolor/96x96/apps/deluge.png']),
      ('share/applications', ['deluge/data/share/applications/deluge.desktop']),
-     ('share/pixmaps', ['deluge/data/pixmaps/deluge.png', 'deluge/data/pixmaps/deluge.xpm']),
+-    ('share/pixmaps', ['deluge/data/pixmaps/deluge.png', 'deluge/data/pixmaps/deluge.xpm']),
 -    ('share/man/man1', [
-+    ('man/man1', [
-         'docs/man/deluge.1',
-         'docs/man/deluged.1',
-         'docs/man/deluge-gtk.1',
+-        'docs/man/deluge.1',
+-        'docs/man/deluged.1',
+-        'docs/man/deluge-gtk.1',
+-        'docs/man/deluge-web.1',
+-        'docs/man/deluge-console.1'])
++    ('share/pixmaps', ['deluge/data/pixmaps/deluge.png', 'deluge/data/pixmaps/deluge.xpm'])
+ ]
+ 
+ # Main setup