4 files changed, 99 insertions, 62 deletions

diff --git a/www/gaeo/Makefile b/www/gaeo/Makefile
index 476317e3ebbc..219c62be1295 100644
--- a/www/gaeo/Makefile
+++ b/www/gaeo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gaeo
-PORTVERSION=	0.1
+PORTVERSION=	0.2
 PORTEPOCH=	1
 CATEGORIES=	www devel python
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
@@ -35,6 +35,5 @@ post-install:
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
 .endif
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/gaeo.py ${PREFIX}/bin/gaeo
 
 .include <bsd.port.mk>
diff --git a/www/gaeo/distinfo b/www/gaeo/distinfo
index e9a4a6ad2b3c..eff23c9dbfed 100644
--- a/www/gaeo/distinfo
+++ b/www/gaeo/distinfo
@@ -1,3 +1,3 @@
-MD5 (gaeo-0.1.zip) = c43b746570091caa0ab27952c3bc77e7
-SHA256 (gaeo-0.1.zip) = 71752455a6ce4a74398a7c98549ed0d45f75823761aaf1169aae316783fb0855
-SIZE (gaeo-0.1.zip) = 29548
+MD5 (gaeo-0.2.zip) = fc099f34473c32278dcee5ae0e13eacc
+SHA256 (gaeo-0.2.zip) = 1d7dfc7cff9cf5068526234bca24ef194cb3f9def933721cbce69e0af9bf7f9c
+SIZE (gaeo-0.2.zip) = 40964
diff --git a/www/gaeo/files/patch-bin_gaeo.py b/www/gaeo/files/patch-bin_gaeo.py
index 238f56c60ff8..56997b6ffc03 100644
--- a/www/gaeo/files/patch-bin_gaeo.py
+++ b/www/gaeo/files/patch-bin_gaeo.py
@@ -1,11 +1,24 @@
---- bin/gaeo.py.orig	2008-07-24 15:24:37.000000000 +0800
-+++ bin/gaeo.py	2008-07-24 15:25:07.000000000 +0800
-@@ -196,7 +196,7 @@
-     create_file(os.path.join(project_home, 'favicon.ico'), [])
+--- bin/gaeo.py.orig	2008-12-03 01:05:19.000000000 +0800
++++ bin/gaeo.py	2008-12-18 00:52:37.000000000 +0800
+@@ -212,7 +212,7 @@
  
      # copy GAEO directory
--    copytree(os.path.join(os.path.dirname(__file__), '..', 'gaeo'), os.path.join(project_home, 'gaeo'))
-+    copytree(os.path.join('%%GAEOHOME%%', 'gaeo'), os.path.join(project_home, 'gaeo'))
+     gaeo_folder = os.path.join(project_home, 'gaeo')
+-    copytree(os.path.join(os.path.dirname(os.path.dirname(__file__)), template_base, 'gaeo'), gaeo_folder)
++    copytree(os.path.join('%%GAEOHOME%%', template_base, 'gaeo'), gaeo_folder)
+     
+     # if zipped option is enabled
+     if zipped_core:
+@@ -231,10 +231,10 @@
+         os.chdir(os.path.join(project_home, '..'))
+     
+     # copy plugins directory
+-    copytree(os.path.join(os.path.dirname(os.path.dirname(__file__)), template_base, 'plugins'), os.path.join(project_home, 'plugins'))
++    copytree(os.path.join('%%GAEOHOME%%', template_base, 'plugins'), os.path.join(project_home, 'plugins'))
+ 
+     # copy sample main.py
+-    copyfile(os.path.join(os.path.dirname(os.path.dirname(__file__)), template_base, 'main-sample.py'), os.path.join(project_home, 'main.py'))
++    copyfile(os.path.join('%%GAEOHOME%%', template_base, 'main-sample.py'), os.path.join(project_home, 'main.py'))
  
      # create the eclipse project file
      if create_eclipse_proj:
diff --git a/www/gaeo/pkg-plist b/www/gaeo/pkg-plist
index c4b3711c7369..77aa2005d9df 100644
--- a/www/gaeo/pkg-plist
+++ b/www/gaeo/pkg-plist
@@ -1,61 +1,86 @@
-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
+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/controller/jsonencoder.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/controller/jsonencoder.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/controller/jsonencoder.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/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/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/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%%/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%%