5 files changed, 19 insertions, 44 deletions

diff --git a/www/py-flup/Makefile b/www/py-flup/Makefile
index 1506c11e8d61..4726b216bae2 100644
--- a/www/py-flup/Makefile
+++ b/www/py-flup/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	flup
-PORTVERSION=	0.5.r2307
+PORTVERSION=	0.5.r2311
 CATEGORIES=	www python
 MASTER_SITES=	http://www.saddi.com/software/flup/dist/ \
 		http://www.cs.nctu.edu.tw/~lwhsu/ports/distfiles/
@@ -16,18 +16,24 @@ DISTNAME=	flup-${PORTVERSION:E}
 MAINTAINER=	lwhsu@lwhsu.org
 COMMENT=	Random assortment of WSGI servers, middleware
 
-BUILD_DEPENDS=	easy_install:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
+RUN_DEPENDS=	${BUILD_DEPENDES}
 
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=	yes
 
-PYFLUP_EGG=	${PORTNAME}-${PORTVERSION:R}-py${PYTHON_VERSION:S/^python//}.egg
+EASY_INSTALL_CMD?=	easy_install-${PYTHON_VER}
 
-SUB_FILES+=	pkg-deinstall pkg-install
-SUB_LIST+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \
-		EGG="${PORTNAME}==${PORTVERSION:R}"
+WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
-PLIST_SUB=	PYFLUP_EGG=${PYFLUP_EGG}
+PYDISTUTILS_BUILD_TARGET=	bdist_egg
+PYDISTUTILS_INSTALL_TARGET=	easy_install
+PYDISTUTILS_INSTALLARGS=	-O 1 -N -S ${PYTHON_SITELIBDIR} ${WRKSRC}/dist/${PYFLUP_EGG}
+
+PYFLUP_EGG=	${PORTNAME}-${PORTVERSION:R}-py${PYTHON_VER}.egg
+
+PLIST_SUB+=	EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
+		PYFLUP_EGG=${PYFLUP_EGG} \
+		PYFLUP_EGG_VER="${PORTNAME}==${PORTVERSION:R}"
 
 .include <bsd.port.mk>
diff --git a/www/py-flup/distinfo b/www/py-flup/distinfo
index fa86b314b612..7bae5a29aa31 100644
--- a/www/py-flup/distinfo
+++ b/www/py-flup/distinfo
@@ -1,3 +1,3 @@
-MD5 (flup-r2307.tar.gz) = cb3d8eabb8ce0242315d4c3a0d3a8288
-SHA256 (flup-r2307.tar.gz) = 2130537f016f90a14afd031c4ac1b77a4826dd555d09232f8824ffae8fcf5a52
-SIZE (flup-r2307.tar.gz) = 69427
+MD5 (flup-r2311.tar.gz) = c54e0bc5877f1b612e8ac99a061598d4
+SHA256 (flup-r2311.tar.gz) = a3b7a930c33292ed305113552a188881834a5682b4761fd25341516e9ab19e97
+SIZE (flup-r2311.tar.gz) = 68742
diff --git a/www/py-flup/files/pkg-deinstall.in b/www/py-flup/files/pkg-deinstall.in
deleted file mode 100644
index 7283cb258fbb..000000000000
--- a/www/py-flup/files/pkg-deinstall.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-PKGNAME=$1
-#
-case $2 in
-    DEINSTALL)
-	easy_install -q -m -S %%PYTHON_SITELIBDIR%% %%EGG%%
-	;;
-    POST-DEINSTALL)
-	exit 0
-	;;
-    *)
-	echo "Unexpected Argument $2!!!"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/www/py-flup/files/pkg-install.in b/www/py-flup/files/pkg-install.in
deleted file mode 100644
index 9cddbe28f167..000000000000
--- a/www/py-flup/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%%
-	;;
-    PRE-INSTALL)
-	;;
-    *)
-	echo "Unexpected Argument $2!!!"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/www/py-flup/pkg-plist b/www/py-flup/pkg-plist
index 17531ea8096d..252069d7e7d2 100644
--- a/www/py-flup/pkg-plist
+++ b/www/py-flup/pkg-plist
@@ -1,4 +1,5 @@
 @comment $FreeBSD$
+@unexec %%EASY_INSTALL_CMD%% -q -m -S %D/%%PYTHON_SITELIBDIR%% %%PYFLUP_EGG_VER%%
 %%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/EGG-INFO/PKG-INFO
 %%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/EGG-INFO/SOURCES.txt
 %%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/EGG-INFO/dependency_links.txt
@@ -107,3 +108,4 @@
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%
 @dirrmtry %%PYTHON_SITELIBDIR%%
 @dirrmtry %%PYTHON_LIBDIR%%
+@exec %%EASY_INSTALL_CMD%% -q -N -S %D/%%PYTHON_SITELIBDIR%% %%PYFLUP_EGG_VER%%