2 files changed, 25 insertions, 150 deletions

diff --git a/net-im/pwytter/Makefile b/net-im/pwytter/Makefile
index 73f264984076..6f961b2b3818 100644
--- a/net-im/pwytter/Makefile
+++ b/net-im/pwytter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pwytter
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im www python
 MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -19,31 +19,33 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkin
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		gettext zip
-USE_PYTHON=	2
-USE_PYDISTUTILS=	easy_install
+USES=		gettext zip dos2unix
+USE_PYTHON=		2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-post-patch: .SILENT
-	${RM} -r ${WRKSRC}/twclient/simplejson
-# Prefer system-wide `simplejson' module; fix for broken `setup.py': include
-# `pwCache.py' in sources list, adjust locale data path
-	${REINPLACE_CMD} -e "s|'simplejson|}, #&|" \
-		-e "s|pwParam|pwCache','&|" ${WRKSRC}/setup.py
-	${REINPLACE_CMD} -e 's|locale_path =|& "${PYEASYINSTALL_SITELIBDIR}/${PYEASYINSTALL_EGG}/locale" #|' \
+DOS2UNIX_GLOB = *.py
+
+post-patch:
+	@${RM} -rf ${WRKSRC}/twclient/simplejson
+	@${REINPLACE_CMD} -e "s|'simplejson|}, #&|" \
+		-e "s|pwParam|pwCache','&|" \
+		-e "s|d\[p\]|d\['share/'+p\]|g" \
+		-e 's|text",|${DATADIR_REL}/text",|' \
+		-e 's|media",|${DATADIR_REL}/media",|' \
+		-e 's|theme",|${DATADIR_REL}/theme",|' \
+		-e 's|\\\\|/|' \
+		-e "/import ez_setup/d" \
+		-e "/ez_setup.use_setuptools()/d" ${WRKSRC}/setup.py
+	@${REINPLACE_CMD} \
+		-e 's|locale_path = .*|locale_path = "${PREFIX}/share/locale"|' \
+		-e '1,3d' \
+		-e 's|/usr/bin/python|${PYTHON_CMD}|' \
 		${WRKSRC}/pwytter.py
-# Adjust paths for themes and media (don't assume they are relative to .)
-	${REINPLACE_CMD} -e 's|media"|${DATADIR}/&|' ${WRKSRC}/pwytter.py \
+	@${REINPLACE_CMD} -e 's|media"|${DATADIR}/&|' ${WRKSRC}/pwytter.py \
 		${WRKSRC}/twclient/__init__.py
-	${REINPLACE_CMD} -e "s|theme'|${DATADIR}/&|" ${WRKSRC}/pwTheme.py
-# Remove gettext `.po' files: not needed when we have them precompiled
-	${FIND} ${WRKSRC}/locale -name pwytter.po -delete
-
-NO_STAGE=	yes
-post-install:
-# Install themes and media files where they belong
-	@${MKDIR} ${DATADIR}/media ${DATADIR}/theme
-	${INSTALL_DATA} ${WRKSRC}/media/* ${DATADIR}/media
-	${INSTALL_DATA} ${WRKSRC}/theme/* ${DATADIR}/theme
+	@${REINPLACE_CMD} -e "s|theme'|${DATADIR}/&|" ${WRKSRC}/pwTheme.py
+	@${FIND} ${WRKSRC}/locale -name pwytter.po -delete
 
 .include <bsd.port.mk>
diff --git a/net-im/pwytter/pkg-plist b/net-im/pwytter/pkg-plist
deleted file mode 100644
index 6e920cae54ca..000000000000
--- a/net-im/pwytter/pkg-plist
+++ /dev/null
@@ -1,127 +0,0 @@
-bin/pwytter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/pwytter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/de_DE/LC_MESSAGES/pwytter.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/en_US/LC_MESSAGES/pwytter.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/es_ES/LC_MESSAGES/pwytter.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/fr_FR/LC_MESSAGES/pwytter.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/it_IT/LC_MESSAGES/pwytter.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/ja_JP/LC_MESSAGES/pwytter.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/pl_PL/LC_MESSAGES/pwytter.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/pt_BR/LC_MESSAGES/pwytter.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/ro_RO/LC_MESSAGES/pwytter.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/ru_RU/LC_MESSAGES/pwytter.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/sr_RS/LC_MESSAGES/pwytter.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/sv_SE/LC_MESSAGES/pwytter.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/zh_CN/LC_MESSAGES/pwytter.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/zh_TW/LC_MESSAGES/pwytter.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pwCache.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pwCache.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pwCache.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pwParam.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pwParam.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pwParam.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pwSplashScreen.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pwSplashScreen.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pwSplashScreen.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pwTheme.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pwTheme.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pwTheme.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pwTools.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pwTools.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pwTools.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pwytter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pwytter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pwytter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/text/CHANGES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/text/COPYING.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/text/LICENSE.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tkBalloon.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tkBalloon.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tkBalloon.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twclient/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twclient/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twclient/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twclient/twitter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twclient/twitter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twclient/twitter.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twclient
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/text
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/zh_TW
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/zh_CN
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/sv_SE
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/sr_RS/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/sr_RS
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/ru_RU
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/ro_RO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/pt_BR
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/pl_PL
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/ja_JP/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/ja_JP
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/it_IT/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/it_IT
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/fr_FR
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/es_ES/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/es_ES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/en_US/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/en_US
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/de_DE/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale/de_DE
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/locale
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
-%%DATADIR%%/media/arrow_down.png
-%%DATADIR%%/media/arrow_nb.png
-%%DATADIR%%/media/arrow_refresh.png
-%%DATADIR%%/media/arrow_right.png
-%%DATADIR%%/media/arrow_undo.png
-%%DATADIR%%/media/asterisk_nb.png
-%%DATADIR%%/media/asterisk_yellow.png
-%%DATADIR%%/media/award_star_gold_2.png
-%%DATADIR%%/media/br.gif
-%%DATADIR%%/media/cn.gif
-%%DATADIR%%/media/cog.png
-%%DATADIR%%/media/comment.png
-%%DATADIR%%/media/cross.png
-%%DATADIR%%/media/de.gif
-%%DATADIR%%/media/es.gif
-%%DATADIR%%/media/fr.gif
-%%DATADIR%%/media/home.png
-%%DATADIR%%/media/it.gif
-%%DATADIR%%/media/jp.gif
-%%DATADIR%%/media/loading.png
-%%DATADIR%%/media/page_go.png
-%%DATADIR%%/media/pl.gif
-%%DATADIR%%/media/pwytter.icns
-%%DATADIR%%/media/pwytter.ico
-%%DATADIR%%/media/pwytter.png
-%%DATADIR%%/media/pwytter.svg
-%%DATADIR%%/media/ro.gif
-%%DATADIR%%/media/rs.gif
-%%DATADIR%%/media/ru.gif
-%%DATADIR%%/media/se.gif
-%%DATADIR%%/media/side_contract.png
-%%DATADIR%%/media/side_expand.png
-%%DATADIR%%/media/tw.gif
-%%DATADIR%%/media/us.gif
-%%DATADIR%%/media/world_go.png
-%%DATADIR%%/media/world_nb.png
-%%DATADIR%%/theme/black.pwt
-%%DATADIR%%/theme/blue.pwt
-%%DATADIR%%/theme/white.pwt
-@dirrm %%DATADIR%%/theme
-@dirrm %%DATADIR%%/media
-@dirrm %%DATADIR%%