6 files changed, 29 insertions, 72 deletions

diff --git a/devel/py-kid/Makefile b/devel/py-kid/Makefile
index 3247c0417c2f..5cf50e37f1b0 100644
--- a/devel/py-kid/Makefile
+++ b/devel/py-kid/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	kid
-PORTVERSION=	0.9.4
-PORTREVISION=	1
+PORTVERSION=	0.9.5
+#PORTREVISION=	0
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.kid-templating.org/dist/${PORTVERSION}/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
@@ -17,31 +17,28 @@ MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A simple template language for XML based written in Python
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/elementtree/__init__.py:${PORTSDIR}/devel/py-elementtree \
-		easy_install:${PORTSDIR}/devel/py-setuptools
+		${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PLIST_SUB+=	PYKID_EGG=${PYKID_EGG} \
-		PYTHON_OLD=${PYTHON_OLD}
-
-SUB_FILES+=	pkg-deinstall pkg-install
-SUB_LIST+=	EGG="kid==${PYKID_VER}" \
-		PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
+		EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
+		EGG="kid==${PYKID_VER}"
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
+PYDISTUTILS_BUILD_TARGET=	bdist_egg
+PYDISTUTILS_INSTALL_TARGET=	easy_install
+PYDISTUTILS_INSTALLARGS=	-N -O1 -s ${PREFIX}/bin -S ${PYTHON_SITELIBDIR} dist/${PYKID_EGG}
+
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 PORTDOCS=	*
 
+EASY_INSTALL_CMD=	easy_install-${PYTHON_VER}
 PYKID_EGG=	${PORTNAME}-${PYKID_VER}-py${PYTHON_VER}.egg
 PYKID_VER=	${PORTVERSION}
 
-SETUP_CFG=	setup.cfg
-
-post-extract:
-	${CP} ${FILESDIR}/${SETUP_CFG} ${WRKSRC}
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
@@ -52,12 +49,4 @@ post-install:
 	${CP} -r ${WRKSRC}/examples/* ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} >= 250
-PYTHON_OLD=	"@comment "
-.else
-PYTHON_OLD=	""
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-kid/distinfo b/devel/py-kid/distinfo
index e4f1228685ce..c1b0f9f869b1 100644
--- a/devel/py-kid/distinfo
+++ b/devel/py-kid/distinfo
@@ -1,3 +1,3 @@
-MD5 (kid-0.9.4.tar.gz) = 2122ee32062079418db34cfd5fc15c37
-SHA256 (kid-0.9.4.tar.gz) = 5099b81f6023d3666f17781758c9417ef27b000befeef5b358f839ccdd6938ee
-SIZE (kid-0.9.4.tar.gz) = 122800
+MD5 (kid-0.9.5.tar.gz) = 61545377ea95704852bf5a894f7cae26
+SHA256 (kid-0.9.5.tar.gz) = 4e5634dbda4ed3fc3d083a1d02910ddc106e511dfe66922615db975f5076595f
+SIZE (kid-0.9.5.tar.gz) = 129708
diff --git a/devel/py-kid/files/pkg-deinstall.in b/devel/py-kid/files/pkg-deinstall.in
deleted file mode 100644
index c2a4012d7b2e..000000000000
--- a/devel/py-kid/files/pkg-deinstall.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-PKGNAME=$1
-#
-case $2 in
-    DEINSTALL)
-	easy_install -q -N -m -x -S %%PYTHON_SITELIBDIR%% %%EGG%%
-	;;
-    POST-DEINSTALL)
-	exit 0
-	;;
-    *)
-	echo "Unexpected Argument $2!!!"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/devel/py-kid/files/pkg-install.in b/devel/py-kid/files/pkg-install.in
deleted file mode 100644
index f0a2e7a6e3f7..000000000000
--- a/devel/py-kid/files/pkg-install.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-PKGNAME=$1
-#
-case $2 in
-    POST-INSTALL)
-	easy_install -q -x -N -S %%PYTHON_SITELIBDIR%% %%EGG%%
-	;;
-    PRE-INSTALL)
-	;;
-    *)
-	echo "Unexpected Argument $2!!!"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/devel/py-kid/files/setup.cfg b/devel/py-kid/files/setup.cfg
deleted file mode 100644
index 6923d2df5d82..000000000000
--- a/devel/py-kid/files/setup.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-[easy_install]
-no-deps=1
-allow-hosts=None
diff --git a/devel/py-kid/pkg-plist b/devel/py-kid/pkg-plist
index 26b6f92dce0d..231429e68590 100644
--- a/devel/py-kid/pkg-plist
+++ b/devel/py-kid/pkg-plist
@@ -1,3 +1,5 @@
+@comment $FreeBSD$
+@unexec %%EASY_INSTALL_CMD%% -q -N -m -x -S %D/%%PYTHON_SITELIBDIR%% %%EGG%%
 bin/kid
 bin/kidc
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/EGG-INFO/PKG-INFO
@@ -5,7 +7,6 @@ bin/kidc
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/EGG-INFO/dependency_links.txt
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/EGG-INFO/entry_points.txt
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_OLD%%%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/EGG-INFO/requires.txt
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/EGG-INFO/top_level.txt
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/__init__.pyc
@@ -19,9 +20,9 @@ bin/kidc
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/compiler.py
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/compiler.pyc
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/compiler.pyo
-%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/et.py
-%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/et.pyc
-%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/et.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/element.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/element.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/element.pyo
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/filter.py
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/filter.pyc
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/filter.pyo
@@ -34,12 +35,12 @@ bin/kidc
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/namespace.py
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/namespace.pyc
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/namespace.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/options.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/options.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/options.pyo
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/parser.py
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/parser.pyc
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/parser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/properties.py
-%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/properties.pyc
-%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/properties.pyo
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/pull.py
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/pull.pyc
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/pull.pyo
@@ -73,6 +74,9 @@ bin/kidc
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_compiler.py
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_compiler.pyc
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_compiler.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_element.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_element.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_element.pyo
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_error.py
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_error.pyc
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_error.pyo
@@ -100,12 +104,12 @@ bin/kidc
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_namespace.py
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_namespace.pyc
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_namespace.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_options.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_options.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_options.pyo
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_parser.py
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_parser.pyc
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_parser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_properties.py
-%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_properties.pyc
-%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_properties.pyo
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_scope.py
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_scope.pyc
 %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_scope.pyo
@@ -145,3 +149,4 @@ bin/kidc
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/EGG-INFO
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%
+@exec %%EASY_INSTALL_CMD%% -q -x -N -S %D/%%PYTHON_SITELIBDIR%% %%EGG%%