- do not use easy_install, remove NO_STAGE

- move DIST_SUBDIR upper
- bump PORTREVISION, because of package change

2 files changed, 52 insertions, 65 deletions

diff --git a/devel/py-Products.PloneLanguageTool/Makefile b/devel/py-Products.PloneLanguageTool/Makefile
index f21b4dcc7e2d..aeb1d339f8e6 100644
--- a/devel/py-Products.PloneLanguageTool/Makefile
+++ b/devel/py-Products.PloneLanguageTool/Makefile
@@ -2,20 +2,19 @@
 
 PORTNAME=	Products.PloneLanguageTool
 PORTVERSION=	3.2.7
+PORTREVISION=	1
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR=	zope
 
 MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Allows to set the available languages in Plone site
 
 LICENSE=	GPLv2
 
-DIST_SUBDIR=	zope
-USE_PYTHON=	yes
-USE_PYDISTUTILS=easy_install
-USE_ZIP=	yes
-
-NO_STAGE=	yes
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.PloneLanguageTool/pkg-plist b/devel/py-Products.PloneLanguageTool/pkg-plist
index 8ebf35831ed0..3f96849ecd81 100644
--- a/devel/py-Products.PloneLanguageTool/pkg-plist
+++ b/devel/py-Products.PloneLanguageTool/pkg-plist
@@ -1,59 +1,47 @@
-%%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/namespace_packages.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/LanguageTool.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/LanguageTool.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/LanguageTool.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/exportimport.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/exportimport.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/exportimport.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/profiles.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/profiles/default/export_steps.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/profiles/default/import_steps.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/profiles/default/metadata.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/profiles/default/portal_languages.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/profiles/default/skins.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/profiles/default/toolset.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/skins/LanguageTool/isTranslatable.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/skins/LanguageTool/switchLanguage.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/skins/LanguageTool/switchLanguage.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/skins/LanguageTool/switchLanguage.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/tests/base.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/tests/base.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/tests/base.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/tests/test_languagetool.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/tests/test_languagetool.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/tests/test_languagetool.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/tests/test_negotiation.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/tests/test_negotiation.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/tests/test_negotiation.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/tool.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/version.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/www/config.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/__init__.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/www
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/skins/LanguageTool
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/skins
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/profiles/default
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool/profiles
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PloneLanguageTool
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/LanguageTool.py
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/LanguageTool.pyc
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/LanguageTool.pyo
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/__init__.py
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/configure.zcml
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/exportimport.py
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/exportimport.pyc
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/exportimport.pyo
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/interfaces.py
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/interfaces.pyc
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/interfaces.pyo
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/profiles.zcml
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/profiles/default/export_steps.xml
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/profiles/default/import_steps.xml
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/profiles/default/metadata.xml
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/profiles/default/portal_languages.xml
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/profiles/default/skins.xml
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/profiles/default/toolset.xml
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/skins/LanguageTool/isTranslatable.py
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/skins/LanguageTool/switchLanguage.py
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/skins/LanguageTool/switchLanguage.pyc
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/skins/LanguageTool/switchLanguage.pyo
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/tests/base.py
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/tests/base.pyc
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/tests/base.pyo
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/tests/test_languagetool.py
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/tests/test_languagetool.pyc
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/tests/test_languagetool.pyo
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/tests/test_negotiation.py
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/tests/test_negotiation.pyc
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/tests/test_negotiation.pyo
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/tool.gif
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/version.txt
+%%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/www/config.zpt
+@dirrm %%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/www
+@dirrm %%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/tests
+@dirrm %%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/skins/LanguageTool
+@dirrm %%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/skins
+@dirrm %%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/profiles/default
+@dirrm %%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool/profiles
+@dirrm %%PYTHON_SITELIBDIR%%/Products/PloneLanguageTool
+@dirrmtry %%PYTHON_SITELIBDIR%%/Products