5 files changed, 66 insertions, 68 deletions

diff --git a/deskutils/blogtk/Makefile b/deskutils/blogtk/Makefile
index 7de363832343..180a22ec7b67 100644
--- a/deskutils/blogtk/Makefile
+++ b/deskutils/blogtk/Makefile
@@ -6,35 +6,28 @@
 #
 
 PORTNAME=	blogtk
-PORTVERSION=	1.1
-PORTREVISION=	6
-CATEGORIES=	deskutils
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/BloGTK-${PORTVERSION}
-DISTNAME=	${PORTNAME}_${PORTVERSION}
+PORTVERSION=	2.0
+CATEGORIES=	deskutils python
+MASTER_SITES=	http://launchpad.net/${PORTNAME}/${PORTVERSION}/${PORTVERSION}/+download/
 
 MAINTAINER=	jbq@caraldi.com
 COMMENT=	A client for Blogger, Movable Type, and other blogging systems
 
-WRKSRC=		${WRKDIR}/BloGTK-${PORTVERSION}
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/feedparser.py:${PORTSDIR}/textproc/py-feedparser \
+		${PYTHON_SITELIBDIR}/atom/__init__.py:${PORTSDIR}/devel/py-gdata \
+		${PYTHON_SITELIBDIR}/webkit/__init__.py:${PORTSDIR}/www/py-webkitgtk
 
-USE_BZIP2=	yes
-USE_GNOME=	pygnomeextras
-USE_PYTHON=	2.4+
+USE_GNOME=	pygnomeextras pygtksourceview
+USE_PYTHON=	2.3-2.7	# No Python 3 support
+
+# Is there a better way to handle this? Launchpad depends on 302 directs it seems
+FETCH_ARGS=	-pRr
 NO_BUILD=	yes
+MAKE_ENV+=	PYTHON="${PYTHON_CMD}"
+
+DATADIR=	${PREFIX}/share/${PORTNAME}2
 
-post-patch:
-	@${FIND} ${WRKSRC}/src -name "*.py" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|/usr/share|${PREFIX}/share|g ; \
-		 s|gtk\.FALSE|False|g ; \
-		 s|gtk\.TRUE|True|g'
-
-do-install:
-	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/blogtk
-	${INSTALL_SCRIPT} ${WRKSRC}/src/*.py ${PYTHONPREFIX_SITELIBDIR}/blogtk
-	@${LN} -fs ${PYTHONPREFIX_SITELIBDIR}/blogtk/BloGTK.py ${PREFIX}/bin/blogtk
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/pixmaps/*.glade ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/pixmaps/*.gladep ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/pixmaps/*.png ${DATADIR}
+post-install:
+	@${RM} -f ${DATADIR}/lib/blogtk2/*.py~
 
 .include <bsd.port.mk>
diff --git a/deskutils/blogtk/distinfo b/deskutils/blogtk/distinfo
index bc00f7ac1d20..325b51af6b82 100644
--- a/deskutils/blogtk/distinfo
+++ b/deskutils/blogtk/distinfo
@@ -1,3 +1,3 @@
-MD5 (blogtk_1.1.tar.bz2) = cd2d2521a261867cd9c830a81d3d4408
-SHA256 (blogtk_1.1.tar.bz2) = de12ee193f14e10f4d9a81804adb242316f42a27bc4c2bd11470b4b6c830eeab
-SIZE (blogtk_1.1.tar.bz2) = 64325
+MD5 (blogtk-2.0.tar.gz) = f7fd77db6a8ba92898c03ef35f658e6f
+SHA256 (blogtk-2.0.tar.gz) = 0557bd151a0c1837f91f1d9984d8afa308a462727a9701dfeeb4f17aa332828a
+SIZE (blogtk-2.0.tar.gz) = 530263
diff --git a/deskutils/blogtk/files/patch-blogtk-no-category b/deskutils/blogtk/files/patch-blogtk-no-category
deleted file mode 100644
index 8d6cf3663d91..000000000000
--- a/deskutils/blogtk/files/patch-blogtk-no-category
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/BloGTK.py.orig	Mon Jan 10 04:51:05 2005
-+++ src/BloGTK.py	Mon Jul 17 17:04:32 2006
-@@ -609,6 +609,7 @@
- 	       blogID = item['blogid']
- 
-       # Are we using MT? If so, we need to pull the category ID as well.
-+      catID = "0"
-       if self.system == "mt":
-       
-          catName = self.catCombo.entry.get_text()
-@@ -619,8 +620,6 @@
-             for k,v in item.items():
- 					if item['categoryName'] == catName:
- 						catID = item['categoryId']
--      else:
--         catID = "0"
- 
-       # 0.95 - We also need to pull our extended entry as well as our other
- 		# fields
diff --git a/deskutils/blogtk/pkg-descr b/deskutils/blogtk/pkg-descr
index 29eb1d2ead4e..fea61b7cd673 100644
--- a/deskutils/blogtk/pkg-descr
+++ b/deskutils/blogtk/pkg-descr
@@ -1,5 +1,13 @@
-BloGTK is a weblog client that allows you to post to your weblog without the
-need for a separate browser window. BloGTK allows you to connect with many
-weblog systems such as Blogger, Movable Type, pMachine, and more.
+BloGTK is a weblog posting client written in Python for any platform that 
+supports Python and the GTK widget set. BloGTK allows you to connect to your 
+weblog with XML-RPC and create new posts.
 
-WWW: http://blogtk.sourceforge.net/
+Supported weblogs:
+MovableType versions 2.5 or later.
+Blogger
+WordPress 1.5 or later or WordPress.com
+Windows Live Spaces
+Expression Engine (but autoconfiguration does not work)
+Any blog that uses the MetaWeblog API.
+
+WWW: http://blogtk.jayreding.com/
diff --git a/deskutils/blogtk/pkg-plist b/deskutils/blogtk/pkg-plist
index 9e04e624b649..0781e91e3018 100644
--- a/deskutils/blogtk/pkg-plist
+++ b/deskutils/blogtk/pkg-plist
@@ -1,20 +1,36 @@
-bin/blogtk
-%%PYTHON_SITELIBDIR%%/blogtk/BloGTK.py
-%%PYTHON_SITELIBDIR%%/blogtk/config.py
-%%PYTHON_SITELIBDIR%%/blogtk/customtags.py
-%%PYTHON_SITELIBDIR%%/blogtk/post.py
-%%PYTHON_SITELIBDIR%%/blogtk/preview.py
-%%PYTHON_SITELIBDIR%%/blogtk/proxy.py
-%%PYTHON_SITELIBDIR%%/blogtk/spellcheck.py
-%%DATADIR%%/b-32.png
-%%DATADIR%%/blogtk-icon.png
-%%DATADIR%%/blogtk-logo.png
-%%DATADIR%%/blogtk.glade
-%%DATADIR%%/blogtk.gladep
-%%DATADIR%%/stock_insert-image.png
-%%DATADIR%%/stock_insert-table.png
-%%DATADIR%%/stock_link.png
-%%DATADIR%%/stock_para.png
-%%DATADIR%%/stock_text_indent.png
+bin/blogtk2
+share/pixmaps/blogtk-icon.png
+%%DATADIR%%/lib/blogtk2/BeautifulSoup.py
+%%DATADIR%%/lib/blogtk2/BeautifulSoup.pyc
+%%DATADIR%%/lib/blogtk2/__init__.py
+%%DATADIR%%/lib/blogtk2/__init__.pyc
+%%DATADIR%%/lib/blogtk2/atomapi.py
+%%DATADIR%%/lib/blogtk2/atomapi.pyc
+%%DATADIR%%/lib/blogtk2/blogger.py
+%%DATADIR%%/lib/blogtk2/blogger.pyc
+%%DATADIR%%/lib/blogtk2/bloggeratom.py
+%%DATADIR%%/lib/blogtk2/bloggeratom.pyc
+%%DATADIR%%/lib/blogtk2/config.py
+%%DATADIR%%/lib/blogtk2/config.pyc
+%%DATADIR%%/lib/blogtk2/editor.py
+%%DATADIR%%/lib/blogtk2/editor.pyc
+%%DATADIR%%/lib/blogtk2/filehandler.py
+%%DATADIR%%/lib/blogtk2/filehandler.pyc
+%%DATADIR%%/lib/blogtk2/firstrun.py
+%%DATADIR%%/lib/blogtk2/firstrun.pyc
+%%DATADIR%%/lib/blogtk2/main.py
+%%DATADIR%%/lib/blogtk2/main.pyc
+%%DATADIR%%/lib/blogtk2/metaweblog.py
+%%DATADIR%%/lib/blogtk2/metaweblog.pyc
+%%DATADIR%%/lib/blogtk2/mtapi.py
+%%DATADIR%%/lib/blogtk2/mtapi.pyc
+%%DATADIR%%/glade/blogtk2.glade
+%%DATADIR%%/res/b-32.png
+%%DATADIR%%/res/blogtk-logo.png
+share/applications/blogtk.desktop
+@dirrm %%DATADIR%%/i18n
+@dirrm %%DATADIR%%/res
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%/lib/blogtk2
+@dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/blogtk