8 files changed, 18 insertions, 84 deletions

diff --git a/textproc/py-genshi-devel/Makefile b/textproc/py-genshi-devel/Makefile
index 6191899ba8e5..95528eaaff14 100644
--- a/textproc/py-genshi-devel/Makefile
+++ b/textproc/py-genshi-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Genshi
-PORTVERSION=	0.3.6
+PORTVERSION=	0.4
 #PORTREVISION=	0
 #PORTEPOCH=	0
 CATEGORIES=	textproc www python
@@ -17,17 +17,17 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Python toolkit for stream-based generation of output for the web
 
-BUILD_DEPENDS=	easy_install:${PORTSDIR}/devel/py-setuptools
+BUILD_DEPENDS=	${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
-PLIST_FILES=	${PYTHON_SITELIBDIR:S|${PREFIX}/||}/${PYGENSHI_EGG}
 PYGENSHI_EGG=	${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
 
-SUB_FILES=	pkg-deinstall pkg-install
-SUB_LIST=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \
-		EGG_VER="${PORTNAME}==${PORTVERSION}"
+PLIST_SUB=	EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
+		PYGENSHI_EGG=${PYGENSHI_EGG}
+
+EASY_INSTALL_CMD?=	easy_install-${PYTHON_VER}
 
 .include <bsd.port.mk>
diff --git a/textproc/py-genshi-devel/distinfo b/textproc/py-genshi-devel/distinfo
index 889f2e852c99..e7c9402b3b94 100644
--- a/textproc/py-genshi-devel/distinfo
+++ b/textproc/py-genshi-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (Genshi-0.3.6.tar.gz) = ea7b7d30d5086b3ce47e41023188ad31
-SHA256 (Genshi-0.3.6.tar.gz) = 7458da5fe248d2c2d08f0a62b5f8bba49fac5f7f78c304a87643b9de9ad64311
-SIZE (Genshi-0.3.6.tar.gz) = 143349
+MD5 (Genshi-0.4.tar.gz) = de173a730938dac1ad9d4dce955b9343
+SHA256 (Genshi-0.4.tar.gz) = acd65a99c9db110a1a690bf80011c445f3cad0bda4097cf119e26bc46568908d
+SIZE (Genshi-0.4.tar.gz) = 261785
diff --git a/textproc/py-genshi-devel/files/pkg-deinstall.in b/textproc/py-genshi-devel/files/pkg-deinstall.in
deleted file mode 100644
index 766972b4a95e..000000000000
--- a/textproc/py-genshi-devel/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_VER%%
-	;;
-    POST-DEINSTALL)
-	exit 0
-	;;
-    *)
-	echo "Unexpected Argument $2!!!"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/textproc/py-genshi-devel/files/pkg-install.in b/textproc/py-genshi-devel/files/pkg-install.in
deleted file mode 100644
index 44fdc30f9229..000000000000
--- a/textproc/py-genshi-devel/files/pkg-install.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-PKGNAME=$1
-#
-case $2 in
-    POST-INSTALL)
-	easy_install -q -N -S %%PYTHON_SITELIBDIR%% %%EGG_VER%%
-	;;
-    PRE-INSTALL)
-	;;
-    *)
-	echo "Unexpected Argument $2!!!"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/textproc/py-genshi/Makefile b/textproc/py-genshi/Makefile
index 6191899ba8e5..95528eaaff14 100644
--- a/textproc/py-genshi/Makefile
+++ b/textproc/py-genshi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Genshi
-PORTVERSION=	0.3.6
+PORTVERSION=	0.4
 #PORTREVISION=	0
 #PORTEPOCH=	0
 CATEGORIES=	textproc www python
@@ -17,17 +17,17 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Python toolkit for stream-based generation of output for the web
 
-BUILD_DEPENDS=	easy_install:${PORTSDIR}/devel/py-setuptools
+BUILD_DEPENDS=	${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
-PLIST_FILES=	${PYTHON_SITELIBDIR:S|${PREFIX}/||}/${PYGENSHI_EGG}
 PYGENSHI_EGG=	${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
 
-SUB_FILES=	pkg-deinstall pkg-install
-SUB_LIST=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \
-		EGG_VER="${PORTNAME}==${PORTVERSION}"
+PLIST_SUB=	EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
+		PYGENSHI_EGG=${PYGENSHI_EGG}
+
+EASY_INSTALL_CMD?=	easy_install-${PYTHON_VER}
 
 .include <bsd.port.mk>
diff --git a/textproc/py-genshi/distinfo b/textproc/py-genshi/distinfo
index 889f2e852c99..e7c9402b3b94 100644
--- a/textproc/py-genshi/distinfo
+++ b/textproc/py-genshi/distinfo
@@ -1,3 +1,3 @@
-MD5 (Genshi-0.3.6.tar.gz) = ea7b7d30d5086b3ce47e41023188ad31
-SHA256 (Genshi-0.3.6.tar.gz) = 7458da5fe248d2c2d08f0a62b5f8bba49fac5f7f78c304a87643b9de9ad64311
-SIZE (Genshi-0.3.6.tar.gz) = 143349
+MD5 (Genshi-0.4.tar.gz) = de173a730938dac1ad9d4dce955b9343
+SHA256 (Genshi-0.4.tar.gz) = acd65a99c9db110a1a690bf80011c445f3cad0bda4097cf119e26bc46568908d
+SIZE (Genshi-0.4.tar.gz) = 261785
diff --git a/textproc/py-genshi/files/pkg-deinstall.in b/textproc/py-genshi/files/pkg-deinstall.in
deleted file mode 100644
index 766972b4a95e..000000000000
--- a/textproc/py-genshi/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_VER%%
-	;;
-    POST-DEINSTALL)
-	exit 0
-	;;
-    *)
-	echo "Unexpected Argument $2!!!"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/textproc/py-genshi/files/pkg-install.in b/textproc/py-genshi/files/pkg-install.in
deleted file mode 100644
index 44fdc30f9229..000000000000
--- a/textproc/py-genshi/files/pkg-install.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-PKGNAME=$1
-#
-case $2 in
-    POST-INSTALL)
-	easy_install -q -N -S %%PYTHON_SITELIBDIR%% %%EGG_VER%%
-	;;
-    PRE-INSTALL)
-	;;
-    *)
-	echo "Unexpected Argument $2!!!"
-	exit 1
-	;;
-esac
-exit 0