diff -ruN --exclude=CVS /usr/ports/www/gaeo/Makefile /amd/account/gcs/96/9655630/dev/ports/www/gaeo/Makefile
--- /usr/ports/www/gaeo/Makefile	2008-08-24 03:06:26.447388187 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/www/gaeo/Makefile	2008-09-21 20:26:18.000000000 +0800
@@ -6,33 +6,35 @@
 #
 
 PORTNAME=	gaeo
-PORTVERSION=	68
+PORTVERSION=	0.1
+PORTEPOCH=	1
 CATEGORIES=	www devel python
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-DISTNAME=	${PORTNAME}-trunk-r${PORTVERSION}
 
 MAINTAINER=	yzlin@cs.nctu.edu.tw
 COMMENT=	An open-source web framework running on Google App Engine
 
-RUN_DEPENDS=	google-appengine>=1.1.0:${PORTSDIR}/www/google-appengine
+RUN_DEPENDS=	google-appengine>=1.1.0:${PORTSDIR}/www/google-appengine \
+		${PYTHON_PKGNAMEPREFIX}simplejson>1.9:${PORTSDIR}/devel/py-simplejson
 
 PROJECTHOST=	google-app-engine-oil
 
-NO_BUILD=	yes
-
-USE_PYTHON=	2.5+
 USE_ZIP=	yes
+USE_PYTHON=	2.5+
+USE_PYDISTUTILS=	easy_install
+
+GAEOHOME=	${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG}
+
+PORTDOCS=	LICENSE NOTICE README.TXT
 
 post-patch:
-	${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR},g" ${WRKSRC}/bin/gaeo.py
+	${REINPLACE_CMD} -e "s,%%GAEOHOME%%,${GAEOHOME},g" ${WRKSRC}/bin/gaeo.py
 
-do-install:
-	cd ${WRKSRC} && ${COPYTREE_SHARE} "gaeo" ${DATADIR}
+post-install:
 .if !defined(NOPORTDOCS)
-	${INSTALL} -d ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.TXT ${DOCSDIR}/README
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
 .endif
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/gaeo.py ${PREFIX}/bin/gaeo.py
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/gaeogen.py ${PREFIX}/bin/gaeogen.py
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/gaeo.py ${PREFIX}/bin/gaeo
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/www/gaeo/distinfo /amd/account/gcs/96/9655630/dev/ports/www/gaeo/distinfo
--- /usr/ports/www/gaeo/distinfo	2008-08-24 03:06:26.448389157 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/www/gaeo/distinfo	2008-09-21 20:21:19.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (gaeo-trunk-r68.zip) = 64bccf58a8169aef204d24d11d0a15f1
-SHA256 (gaeo-trunk-r68.zip) = 5a6938533433b531e2d425abc35f26a538d2919fb7bb10de12f289f7ac5e9777
-SIZE (gaeo-trunk-r68.zip) = 27025
+MD5 (gaeo-0.1.zip) = c43b746570091caa0ab27952c3bc77e7
+SHA256 (gaeo-0.1.zip) = 71752455a6ce4a74398a7c98549ed0d45f75823761aaf1169aae316783fb0855
+SIZE (gaeo-0.1.zip) = 29548
diff -ruN --exclude=CVS /usr/ports/www/gaeo/files/patch-bin_gaeo.py /amd/account/gcs/96/9655630/dev/ports/www/gaeo/files/patch-bin_gaeo.py
--- /usr/ports/www/gaeo/files/patch-bin_gaeo.py	2008-08-04 03:12:11.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/www/gaeo/files/patch-bin_gaeo.py	2008-09-14 17:23:56.000000000 +0800
@@ -5,7 +5,7 @@
  
      # copy GAEO directory
 -    copytree(os.path.join(os.path.dirname(__file__), '..', 'gaeo'), os.path.join(project_home, 'gaeo'))
-+    copytree(os.path.join('%%DATADIR%%', 'gaeo'), os.path.join(project_home, 'gaeo'))
++    copytree(os.path.join('%%GAEOHOME%%', 'gaeo'), os.path.join(project_home, 'gaeo'))
  
      # create the eclipse project file
      if create_eclipse_proj:
diff -ruN --exclude=CVS /usr/ports/www/gaeo/pkg-plist /amd/account/gcs/96/9655630/dev/ports/www/gaeo/pkg-plist
--- /usr/ports/www/gaeo/pkg-plist	2008-08-24 03:06:26.448389157 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/www/gaeo/pkg-plist	2008-09-14 19:35:55.000000000 +0800
@@ -1,21 +1,61 @@
-bin/gaeo.py
-bin/gaeogen.py
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%DATADIR%%/gaeo/__init__.py
-%%DATADIR%%/gaeo/controller/__init__.py
-%%DATADIR%%/gaeo/controller/errors.py
-%%DATADIR%%/gaeo/controller/helper.py
-%%DATADIR%%/gaeo/controller/jsonencoder.py
-%%DATADIR%%/gaeo/dispatch/__init__.py
-%%DATADIR%%/gaeo/dispatch/dispatcher.py
-%%DATADIR%%/gaeo/dispatch/router.py
-%%DATADIR%%/gaeo/model/__init__.py
-%%DATADIR%%/gaeo/session/__init__.py
-%%DATADIR%%/gaeo/session/memcache.py
-@dirrm %%DATADIR%%/gaeo/session
-@dirrm %%DATADIR%%/gaeo/model
-@dirrm %%DATADIR%%/gaeo/dispatch
-@dirrm %%DATADIR%%/gaeo/controller
-@dirrm %%DATADIR%%/gaeo
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+bin/gaeogen
+bin/gaeo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/gaeo.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/gaeogen.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/release.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/gaeo.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/gaeogen.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/release.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/gaeo.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/gaeogen.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/release.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/controller/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/controller/errors.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/controller/helper.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/controller/jsonencoder.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/controller/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/controller/errors.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/controller/helper.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/controller/jsonencoder.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/controller/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/controller/errors.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/controller/helper.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/controller/jsonencoder.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/dispatch/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/dispatch/dispatcher.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/dispatch/router.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/dispatch/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/dispatch/dispatcher.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/dispatch/router.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/dispatch/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/dispatch/dispatcher.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/dispatch/router.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/model/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/model/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/model/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/session/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/session/memcache.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/session/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/session/memcache.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/session/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/session/memcache.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/__init__.pyo
+%%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
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bin
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/controller
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/dispatch
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/model
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo/session
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gaeo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%