5 files changed, 132 insertions, 93 deletions

diff --git a/www/py-formencode/Makefile b/www/py-formencode/Makefile
index 403e1f2519a5..eb8309e2411e 100644
--- a/www/py-formencode/Makefile
+++ b/www/py-formencode/Makefile
@@ -7,22 +7,36 @@
 
 PORTNAME=	formencode
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	www python
-MASTER_SITES=	http://cheeseshop.python.org/packages/source/F/FormEncode/
+MASTER_SITES=	http://cheeseshop.python.org/packages/source/F/FormEncode/ \
+		http://dryice.name/computer/FreeBSD/distfiles/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	FormEncode-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	dryice@FreeBSD.org
 COMMENT=	HTML form validation, generation, and conversion package
 
+BUILD_DEPENDS=	easy_install:${PORTSDIR}/devel/py-setuptools
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 EXAMPLESSDIR=	${PREFIX}/share/examples/py-${PORTNAME}
+FORMENCODEVER?=	${PORTVERSION}
+PYTHONVER?=	${PYTHON_VERSION:S/^python//}
+PLIST_SUB=	PYFORMENCODE_EGG=${PYFORMENCODE_EGG}
+
+SUB_FILES+=	pkg-deinstall pkg-install
+SUB_LIST+=	EGG="FormEncode==${FORMENCODEVER}" \
+		PYTHON_SITELIBDIR="${PYTHON_SITELIBDIR}"
 
 PORTDOCS=	*
 
+PYFORMENCODE_EGG=	FormEncode-${FORMENCODEVER}-py${PYTHONVER}.egg
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/www/py-formencode/files/patch-setup.py b/www/py-formencode/files/patch-setup.py
deleted file mode 100644
index 015f09e69f62..000000000000
--- a/www/py-formencode/files/patch-setup.py
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- setup.py.orig
-+++ setup.py
-@@ -1,6 +1,7 @@
--from ez_setup import use_setuptools
--use_setuptools()
--from setuptools import setup
-+#from ez_setup import use_setuptools
-+#use_setuptools()
-+#from setuptools import setup
-+from distutils.core import setup
- 
- setup(name="FormEncode",
-       version="0.3",
diff --git a/www/py-formencode/files/pkg-deinstall.in b/www/py-formencode/files/pkg-deinstall.in
new file mode 100644
index 000000000000..8ee207b16f16
--- /dev/null
+++ b/www/py-formencode/files/pkg-deinstall.in
@@ -0,0 +1,17 @@
+#!/bin/sh
+# $FreeBSD$
+PKGNAME=$1
+#
+case $2 in
+    DEINSTALL)
+	easy_install -q -m -x -S %%PYTHON_SITELIBDIR%% %%EGG%%
+	;;
+    POST-DEINSTALL)
+	exit 0
+	;;
+    *)
+	echo "Unexpected Argument $2!!!"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/www/py-formencode/files/pkg-install.in b/www/py-formencode/files/pkg-install.in
new file mode 100644
index 000000000000..9cddbe28f167
--- /dev/null
+++ b/www/py-formencode/files/pkg-install.in
@@ -0,0 +1,16 @@
+#!/bin/sh
+# $FreeBSD$
+PKGNAME=$1
+#
+case $2 in
+    POST-INSTALL)
+	easy_install -q -N -S %%PYTHON_SITELIBDIR%% %%EGG%%
+	;;
+    PRE-INSTALL)
+	;;
+    *)
+	echo "Unexpected Argument $2!!!"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/www/py-formencode/pkg-plist b/www/py-formencode/pkg-plist
index 443436abbf2b..ed093705d1f5 100644
--- a/www/py-formencode/pkg-plist
+++ b/www/py-formencode/pkg-plist
@@ -1,79 +1,87 @@
 @comment $FreeBSD$
-%%PYTHON_SITELIBDIR%%/formencode/__init__.py
-%%PYTHON_SITELIBDIR%%/formencode/api.py
-%%PYTHON_SITELIBDIR%%/formencode/compound.py
-%%PYTHON_SITELIBDIR%%/formencode/context.py
-%%PYTHON_SITELIBDIR%%/formencode/declarative.py
-%%PYTHON_SITELIBDIR%%/formencode/doctest_xml_compare.py
-%%PYTHON_SITELIBDIR%%/formencode/fields.py
-%%PYTHON_SITELIBDIR%%/formencode/fieldstorage.py
-%%PYTHON_SITELIBDIR%%/formencode/foreach.py
-%%PYTHON_SITELIBDIR%%/formencode/formgen.py
-%%PYTHON_SITELIBDIR%%/formencode/htmlfill.py
-%%PYTHON_SITELIBDIR%%/formencode/htmlfill_schemabuilder.py
-%%PYTHON_SITELIBDIR%%/formencode/htmlform.py
-%%PYTHON_SITELIBDIR%%/formencode/htmlgen.py
-%%PYTHON_SITELIBDIR%%/formencode/interfaces.py
-%%PYTHON_SITELIBDIR%%/formencode/schema.py
-%%PYTHON_SITELIBDIR%%/formencode/sqlformgen.py
-%%PYTHON_SITELIBDIR%%/formencode/sqlschema.py
-%%PYTHON_SITELIBDIR%%/formencode/validators.py
-%%PYTHON_SITELIBDIR%%/formencode/variabledecode.py
-%%PYTHON_SITELIBDIR%%/formencode/util/__init__.py
-%%PYTHON_SITELIBDIR%%/formencode/util/doctest24.py
-%%PYTHON_SITELIBDIR%%/formencode/util/threadinglocal.py
-%%PYTHON_SITELIBDIR%%/formencode/util/__init__.pyc
-%%PYTHON_SITELIBDIR%%/formencode/util/doctest24.pyc
-%%PYTHON_SITELIBDIR%%/formencode/util/threadinglocal.pyc
-%%PYTHON_SITELIBDIR%%/formencode/util/__init__.pyo
-%%PYTHON_SITELIBDIR%%/formencode/util/doctest24.pyo
-%%PYTHON_SITELIBDIR%%/formencode/util/threadinglocal.pyo
-%%PYTHON_SITELIBDIR%%/formencode/javascript/ordering.js
-%%PYTHON_SITELIBDIR%%/formencode/__init__.pyc
-%%PYTHON_SITELIBDIR%%/formencode/api.pyc
-%%PYTHON_SITELIBDIR%%/formencode/compound.pyc
-%%PYTHON_SITELIBDIR%%/formencode/context.pyc
-%%PYTHON_SITELIBDIR%%/formencode/declarative.pyc
-%%PYTHON_SITELIBDIR%%/formencode/doctest_xml_compare.pyc
-%%PYTHON_SITELIBDIR%%/formencode/fields.pyc
-%%PYTHON_SITELIBDIR%%/formencode/fieldstorage.pyc
-%%PYTHON_SITELIBDIR%%/formencode/foreach.pyc
-%%PYTHON_SITELIBDIR%%/formencode/formgen.pyc
-%%PYTHON_SITELIBDIR%%/formencode/htmlfill.pyc
-%%PYTHON_SITELIBDIR%%/formencode/htmlfill_schemabuilder.pyc
-%%PYTHON_SITELIBDIR%%/formencode/htmlform.pyc
-%%PYTHON_SITELIBDIR%%/formencode/htmlgen.pyc
-%%PYTHON_SITELIBDIR%%/formencode/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/formencode/schema.pyc
-%%PYTHON_SITELIBDIR%%/formencode/sqlformgen.pyc
-%%PYTHON_SITELIBDIR%%/formencode/sqlschema.pyc
-%%PYTHON_SITELIBDIR%%/formencode/validators.pyc
-%%PYTHON_SITELIBDIR%%/formencode/variabledecode.pyc
-%%PYTHON_SITELIBDIR%%/formencode/__init__.pyo
-%%PYTHON_SITELIBDIR%%/formencode/api.pyo
-%%PYTHON_SITELIBDIR%%/formencode/compound.pyo
-%%PYTHON_SITELIBDIR%%/formencode/context.pyo
-%%PYTHON_SITELIBDIR%%/formencode/declarative.pyo
-%%PYTHON_SITELIBDIR%%/formencode/doctest_xml_compare.pyo
-%%PYTHON_SITELIBDIR%%/formencode/fields.pyo
-%%PYTHON_SITELIBDIR%%/formencode/fieldstorage.pyo
-%%PYTHON_SITELIBDIR%%/formencode/foreach.pyo
-%%PYTHON_SITELIBDIR%%/formencode/formgen.pyo
-%%PYTHON_SITELIBDIR%%/formencode/htmlfill.pyo
-%%PYTHON_SITELIBDIR%%/formencode/htmlfill_schemabuilder.pyo
-%%PYTHON_SITELIBDIR%%/formencode/htmlform.pyo
-%%PYTHON_SITELIBDIR%%/formencode/htmlgen.pyo
-%%PYTHON_SITELIBDIR%%/formencode/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/formencode/schema.pyo
-%%PYTHON_SITELIBDIR%%/formencode/sqlformgen.pyo
-%%PYTHON_SITELIBDIR%%/formencode/sqlschema.pyo
-%%PYTHON_SITELIBDIR%%/formencode/validators.pyo
-%%PYTHON_SITELIBDIR%%/formencode/variabledecode.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/EGG-INFO/requires.txt
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/api.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/compound.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/context.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/declarative.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/doctest_xml_compare.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/fields.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/fieldstorage.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/foreach.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/formgen.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/htmlfill.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/htmlfill_schemabuilder.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/htmlform.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/htmlgen.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/interfaces.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/schema.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/sqlformgen.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/sqlschema.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/validators.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/variabledecode.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/util/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/util/doctest24.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/util/threadinglocal.py
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/util/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/util/doctest24.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/util/threadinglocal.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/util/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/util/doctest24.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/util/threadinglocal.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/javascript/ordering.js
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/api.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/compound.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/context.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/declarative.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/doctest_xml_compare.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/fields.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/fieldstorage.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/foreach.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/formgen.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/htmlfill.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/htmlfill_schemabuilder.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/htmlform.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/htmlgen.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/interfaces.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/schema.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/sqlformgen.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/sqlschema.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/validators.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/variabledecode.pyc
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/api.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/compound.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/context.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/declarative.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/doctest_xml_compare.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/fields.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/fieldstorage.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/foreach.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/formgen.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/htmlfill.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/htmlfill_schemabuilder.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/htmlform.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/htmlgen.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/interfaces.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/schema.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/sqlformgen.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/sqlschema.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/validators.pyo
+%%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/variabledecode.pyo
 %%PORTDOCS%%%%EXAMPLESDIR%%/WebwareExamples/__init__.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/WebwareExamples/index.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/webware_example.ini
-@dirrmtry %%PORTDOCS%%%%EXAMPLESDIR%%/WebwareExamples
-@dirrmtry %%PORTDOCS%%%%EXAMPLESDIR%%
-@dirrmtry %%PYTHON_SITELIBDIR%%/formencode/util
-@dirrmtry %%PYTHON_SITELIBDIR%%/formencode/javascript
-@dirrmtry %%PYTHON_SITELIBDIR%%/formencode
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/WebwareExamples
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/util
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode/javascript
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%/formencode
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYFORMENCODE_EGG%%