- Enable stagedir support

- Remove easy_install dependency
- Convert to PYDISTUTILS_AUTOPLIST
- Bump PORTREVISION to enforce a cleanup for the easy_install references

With hat:	python@
Approved by:	portmgr (implicit)

2 files changed, 6 insertions, 99 deletions

diff --git a/www/gaeo/Makefile b/www/gaeo/Makefile
index 9efe125e0c42..c19123cb948d 100644
--- a/www/gaeo/Makefile
+++ b/www/gaeo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gaeo
 PORTVERSION=	0.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www devel python
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
@@ -16,18 +17,14 @@ RUN_DEPENDS=	google-appengine>=1.1.0:${PORTSDIR}/www/google-appengine \
 PROJECTHOST=	google-app-engine-oil
 
 USES=		zip
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
-
-GAEOHOME=	${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG}
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 PORTDOCS=	LICENSE NOTICE README.TXT CHANGELOG
 
-NO_STAGE=	yes
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/www/gaeo/pkg-plist b/www/gaeo/pkg-plist
deleted file mode 100644
index 5fa63a514001..000000000000
--- a/www/gaeo/pkg-plist
+++ /dev/null
@@ -1,90 +0,0 @@
-bin/gaeo
-bin/gaeogen
-%%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/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/gaeo.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/gaeo.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/gaeo.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/gaeogen.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/gaeogen.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/gaeogen.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/release.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/release.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/release.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/controller/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/controller/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/controller/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/controller/errors.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/controller/errors.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/controller/errors.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/controller/helper.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/controller/helper.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/controller/helper.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/dispatch/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/dispatch/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/dispatch/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/dispatch/dispatcher.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/dispatch/dispatcher.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/dispatch/dispatcher.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/dispatch/router.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/dispatch/router.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/dispatch/router.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/model/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/model/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/model/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/session/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/session/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/session/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/session/datastore.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/session/datastore.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/session/datastore.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/session/memcache.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/session/memcache.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/session/memcache.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/view/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/view/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/view/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/view/helper/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/view/helper/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/view/helper/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/view/helper/ajax.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/view/helper/ajax.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/view/helper/ajax.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/view/helper/form.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/view/helper/form.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/view/helper/form.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/libs/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/libs/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/libs/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/main-sample.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/main-sample.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/main-sample.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/plugins/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/plugins/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/plugins/__init__.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/libs
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/view/helper
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/view
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/session
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/model
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/dispatch
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/controller
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%