3 files changed, 24 insertions, 32 deletions

diff --git a/ftp/py-pyftpdlib/Makefile b/ftp/py-pyftpdlib/Makefile
index 991ab2bc61e5..01cf33ce4199 100644
--- a/ftp/py-pyftpdlib/Makefile
+++ b/ftp/py-pyftpdlib/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python FTP server library
 LICENSE=	MIT
 
 USE_PYTHON=		2
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
 
 OPTIONS_DEFINE=		SENDFILE OPENSSL
 OPTIONS_DEFAULT=	SENDFILE OPENSSL
@@ -24,7 +24,6 @@ OPENSSL_DESC=		Enable FTP over SSL/TLS (RFC4217)
 # Workaround ports infrastructure bug
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSENDFILE}
@@ -39,8 +38,8 @@ EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
 post-install:
 .if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/demo/ ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${CP} -R ${WRKSRC}/demo/ ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 test: build
diff --git a/ftp/py-pyftpdlib/pkg-descr b/ftp/py-pyftpdlib/pkg-descr
index d0aaa11a3bdb..6172a7e26df6 100644
--- a/ftp/py-pyftpdlib/pkg-descr
+++ b/ftp/py-pyftpdlib/pkg-descr
@@ -3,4 +3,4 @@ write asynchronous FTP servers with Python. Based on asyncore / asynchat
 frameworks pyftpdlib is actually the most complete RFC959 FTP server
 implementation available for Python language.
 
-WWW:	http://code.google.com/p/pyftpdlib/
+WWW: http://code.google.com/p/pyftpdlib/
diff --git a/ftp/py-pyftpdlib/pkg-plist b/ftp/py-pyftpdlib/pkg-plist
index cbf160d81eb6..1c3e5728f102 100644
--- a/ftp/py-pyftpdlib/pkg-plist
+++ b/ftp/py-pyftpdlib/pkg-plist
@@ -1,26 +1,21 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyftpdlib/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyftpdlib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyftpdlib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyftpdlib/contrib/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyftpdlib/contrib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyftpdlib/contrib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyftpdlib/contrib/authorizers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyftpdlib/contrib/authorizers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyftpdlib/contrib/authorizers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyftpdlib/contrib/filesystems.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyftpdlib/contrib/filesystems.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyftpdlib/contrib/filesystems.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyftpdlib/contrib/handlers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyftpdlib/contrib/handlers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyftpdlib/contrib/handlers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyftpdlib/ftpserver.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyftpdlib/ftpserver.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyftpdlib/ftpserver.pyo
+%%PYTHON_SITELIBDIR%%/pyftpdlib/__init__.py
+%%PYTHON_SITELIBDIR%%/pyftpdlib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyftpdlib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyftpdlib/contrib/__init__.py
+%%PYTHON_SITELIBDIR%%/pyftpdlib/contrib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyftpdlib/contrib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyftpdlib/contrib/authorizers.py
+%%PYTHON_SITELIBDIR%%/pyftpdlib/contrib/authorizers.pyc
+%%PYTHON_SITELIBDIR%%/pyftpdlib/contrib/authorizers.pyo
+%%PYTHON_SITELIBDIR%%/pyftpdlib/contrib/filesystems.py
+%%PYTHON_SITELIBDIR%%/pyftpdlib/contrib/filesystems.pyc
+%%PYTHON_SITELIBDIR%%/pyftpdlib/contrib/filesystems.pyo
+%%PYTHON_SITELIBDIR%%/pyftpdlib/contrib/handlers.py
+%%PYTHON_SITELIBDIR%%/pyftpdlib/contrib/handlers.pyc
+%%PYTHON_SITELIBDIR%%/pyftpdlib/contrib/handlers.pyo
+%%PYTHON_SITELIBDIR%%/pyftpdlib/ftpserver.py
+%%PYTHON_SITELIBDIR%%/pyftpdlib/ftpserver.pyc
+%%PYTHON_SITELIBDIR%%/pyftpdlib/ftpserver.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/anti_flood_ftpd.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic_ftpd.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/keycert.pem
@@ -31,7 +26,5 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/unix_ftpd.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/winnt_ftpd.py
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyftpdlib/contrib
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyftpdlib
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+@dirrm %%PYTHON_SITELIBDIR%%/pyftpdlib/contrib
+@dirrm %%PYTHON_SITELIBDIR%%/pyftpdlib