3 files changed, 58 insertions, 20 deletions

diff --git a/www/py-amf/Makefile b/www/py-amf/Makefile
index 0fd106cf892b..ce66c95a09c7 100644
--- a/www/py-amf/Makefile
+++ b/www/py-amf/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	amf
-PORTVERSION=	0.3.1
+PORTVERSION=	0.4
 CATEGORIES=	www devel python
 MASTER_SITES=	http://download.pyamf.org/releases/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,6 +17,7 @@ COMMENT=	AMF support for Python
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	PyAMF
+PYEASYINSTALL_ARCHDEP=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
diff --git a/www/py-amf/distinfo b/www/py-amf/distinfo
index efab80aa897b..06e98bb7a6e7 100644
--- a/www/py-amf/distinfo
+++ b/www/py-amf/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyAMF-0.3.1.tar.gz) = 88597930a95dc112ce39359521d43f3d
-SHA256 (PyAMF-0.3.1.tar.gz) = dc3b0c653750f603c2d0e034b76404943b89d57a5ed80af462eb115743d66e79
-SIZE (PyAMF-0.3.1.tar.gz) = 1014888
+MD5 (PyAMF-0.4.tar.gz) = 634781f61a1cd3b354e9a7e252e1faf8
+SHA256 (PyAMF-0.4.tar.gz) = f6809614196f3392330f38613b093822e1d42784689ac73de8ee8be4abe64109
+SIZE (PyAMF-0.4.tar.gz) = 1732964
diff --git a/www/py-amf/pkg-plist b/www/py-amf/pkg-plist
index 6cd6300c469a..5d515e8b8037 100644
--- a/www/py-amf/pkg-plist
+++ b/www/py-amf/pkg-plist
@@ -2,6 +2,11 @@
 %%PORTDOCS%%%%DOCSDIR%%/api/api-objects.txt
 %%PORTDOCS%%%%DOCSDIR%%/api/bug-index.html
 %%PORTDOCS%%%%DOCSDIR%%/api/class-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/api/cpyamf-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/cpyamf-pysrc.html
+%%PORTDOCS%%%%DOCSDIR%%/api/cpyamf.amf3-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/cpyamf.util-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/cpyamf.util.BufferedByteStream-class.html
 %%PORTDOCS%%%%DOCSDIR%%/api/crarr.png
 %%PORTDOCS%%%%DOCSDIR%%/api/epydoc.css
 %%PORTDOCS%%%%DOCSDIR%%/api/epydoc.js
@@ -26,14 +31,30 @@
 %%PORTDOCS%%%%DOCSDIR%%/api/pyamf.EncodeError-class.html
 %%PORTDOCS%%%%DOCSDIR%%/api/pyamf.MixedArray-class.html
 %%PORTDOCS%%%%DOCSDIR%%/api/pyamf.ReferenceError-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/pyamf.TypedObject-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/pyamf.TypedObjectClassAlias-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/pyamf.UndefinedType-class.html
 %%PORTDOCS%%%%DOCSDIR%%/api/pyamf.UnknownClassAlias-class.html
 %%PORTDOCS%%%%DOCSDIR%%/api/pyamf.adapters-module.html
 %%PORTDOCS%%%%DOCSDIR%%/api/pyamf.adapters-pysrc.html
 %%PORTDOCS%%%%DOCSDIR%%/api/pyamf.adapters.PackageImporter-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/pyamf.adapters._decimal-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/pyamf.adapters._decimal-pysrc.html
+%%PORTDOCS%%%%DOCSDIR%%/api/pyamf.adapters._django_db_models_fields-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/pyamf.adapters._django_db_models_fields-pysrc.html
 %%PORTDOCS%%%%DOCSDIR%%/api/pyamf.adapters._django_db_models_query-module.html
 %%PORTDOCS%%%%DOCSDIR%%/api/pyamf.adapters._django_db_models_query-pysrc.html
 %%PORTDOCS%%%%DOCSDIR%%/api/pyamf.adapters._google_appengine_ext_db-module.html
 %%PORTDOCS%%%%DOCSDIR%%/api/pyamf.adapters._google_appengine_ext_db-pysrc.html
+%%PORTDOCS%%%%DOCSDIR%%/api/pyamf.adapters._google_appengine_ext_db.DataStoreClassAlias-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/pyamf.adapters._google_appengine_ext_db.ModelStub-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/pyamf.adapters._sets-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/pyamf.adapters._sets-pysrc.html
+%%PORTDOCS%%%%DOCSDIR%%/api/pyamf.adapters._sqlalchemy-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/pyamf.adapters._sqlalchemy-pysrc.html
+%%PORTDOCS%%%%DOCSDIR%%/api/pyamf.adapters._sqlalchemy.SaMappedClassAlias-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/pyamf.adapters.util-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/pyamf.adapters.util-pysrc.html
 %%PORTDOCS%%%%DOCSDIR%%/api/pyamf.amf0-module.html
 %%PORTDOCS%%%%DOCSDIR%%/api/pyamf.amf0-pysrc.html
 %%PORTDOCS%%%%DOCSDIR%%/api/pyamf.amf0.ASTypes-class.html
@@ -126,9 +147,9 @@
 %%PORTDOCS%%%%DOCSDIR%%/api/pyamf.sol.SOL-class.html
 %%PORTDOCS%%%%DOCSDIR%%/api/pyamf.util-module.html
 %%PORTDOCS%%%%DOCSDIR%%/api/pyamf.util-pysrc.html
-%%PORTDOCS%%%%DOCSDIR%%/api/pyamf.util.BufferedByteStream-class.html
 %%PORTDOCS%%%%DOCSDIR%%/api/pyamf.util.DataTypeMixIn-class.html
-%%PORTDOCS%%%%DOCSDIR%%/api/pyamf.util.NetworkIOMixIn-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/pyamf.util.IndexedCollection-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/pyamf.util.IndexedMap-class.html
 %%PORTDOCS%%%%DOCSDIR%%/api/pyamf.util.StringIOProxy-class.html
 %%PORTDOCS%%%%DOCSDIR%%/api/pyamf.util.imports-module.html
 %%PORTDOCS%%%%DOCSDIR%%/api/pyamf.util.imports-pysrc.html
@@ -137,11 +158,19 @@
 %%PORTDOCS%%%%DOCSDIR%%/api/pyamf.util.imports.SubModuleLoadHook-class.html
 %%PORTDOCS%%%%DOCSDIR%%/api/redirect.html
 %%PORTDOCS%%%%DOCSDIR%%/api/since-index.html
+%%PORTDOCS%%%%DOCSDIR%%/api/toc-cpyamf-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/toc-cpyamf.amf3-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/toc-cpyamf.util-module.html
 %%PORTDOCS%%%%DOCSDIR%%/api/toc-everything.html
 %%PORTDOCS%%%%DOCSDIR%%/api/toc-pyamf-module.html
 %%PORTDOCS%%%%DOCSDIR%%/api/toc-pyamf.adapters-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/toc-pyamf.adapters._decimal-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/toc-pyamf.adapters._django_db_models_fields-module.html
 %%PORTDOCS%%%%DOCSDIR%%/api/toc-pyamf.adapters._django_db_models_query-module.html
 %%PORTDOCS%%%%DOCSDIR%%/api/toc-pyamf.adapters._google_appengine_ext_db-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/toc-pyamf.adapters._sets-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/toc-pyamf.adapters._sqlalchemy-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/toc-pyamf.adapters.util-module.html
 %%PORTDOCS%%%%DOCSDIR%%/api/toc-pyamf.amf0-module.html
 %%PORTDOCS%%%%DOCSDIR%%/api/toc-pyamf.amf3-module.html
 %%PORTDOCS%%%%DOCSDIR%%/api/toc-pyamf.flex-module.html
@@ -162,8 +191,14 @@
 %%PORTDOCS%%%%DOCSDIR%%/api/toc-pyamf.util.imports-module.html
 %%PORTDOCS%%%%DOCSDIR%%/api/toc.html
 %%PORTDOCS%%%%DOCSDIR%%/api/twisted.web.resource.IResource-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_cpyamf_u.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_ad.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_ad_2.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_ad_3.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_ad_4.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_am.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_am_10.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_am_11.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_am_2.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_am_3.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_am_4.gif
@@ -172,8 +207,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_am_7.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_am_8.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_am_9.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_am_10.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_am_11.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_as.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_ba.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_ba_2.gif
@@ -182,11 +215,16 @@
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_ba_5.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_cl.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_cl_2.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_cl_3.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_cu.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_de.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_en.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_eo.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_fl.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_fl_10.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_fl_11.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_fl_12.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_fl_13.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_fl_2.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_fl_3.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_fl_4.gif
@@ -195,20 +233,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_fl_7.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_fl_8.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_fl_9.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_fl_10.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_fl_11.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_fl_12.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_fl_13.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_mi.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_2.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_3.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_4.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_5.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_6.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_7.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_8.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_9.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_10.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_11.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_12.gif
@@ -219,6 +245,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_17.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_18.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_19.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_2.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_20.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_21.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_22.gif
@@ -229,6 +256,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_27.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_28.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_29.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_3.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_30.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_31.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_32.gif
@@ -236,8 +264,17 @@
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_34.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_35.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_36.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_4.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_5.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_6.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_7.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_8.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_re_9.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_so.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_ty.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_ty_2.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_un.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_un_2.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_ut.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_ut_2.gif
 %%PORTDOCS%%%%DOCSDIR%%/api/uml_class_diagram_for_pyamf_ut_3.gif