3 files changed, 29 insertions, 31 deletions

diff --git a/devel/py-distutils-extra/Makefile b/devel/py-distutils-extra/Makefile
index 12470237c0ae..5fb85e0ceb2f 100644
--- a/devel/py-distutils-extra/Makefile
+++ b/devel/py-distutils-extra/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=		distutils-extra
-PORTVERSION=		2.19
+PORTVERSION=		2.23
 CATEGORIES=		devel python
-MASTER_SITES=		http://launchpadlibrarian.net/48109785/
+MASTER_SITES=		http://launchpadlibrarian.net/59271044/
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
-DISTNAME=		dist-python-${PORTNAME}-${PORTVERSION}
+DISTNAME=		python-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=		jupengfei@gmail.com
 COMMENT=		Add support for i18n, documentation and icons to distutils
 
-WRKSRC=			${WRKDIR}/python-${PORTNAME}-${PORTVERSION}
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	python_distutils_extra
diff --git a/devel/py-distutils-extra/distinfo b/devel/py-distutils-extra/distinfo
index 1d0975f397b4..5a7c7d1d2597 100644
--- a/devel/py-distutils-extra/distinfo
+++ b/devel/py-distutils-extra/distinfo
@@ -1,3 +1,2 @@
-MD5 (dist-python-distutils-extra-2.19.tar.gz) = 81e0f7856a51340e3818160aa135911a
-SHA256 (dist-python-distutils-extra-2.19.tar.gz) = 18d72b327adad6097a687a533d9e514d31a76d1fab9c1ed657fed54e9ed6c171
-SIZE (dist-python-distutils-extra-2.19.tar.gz) = 26859
+SHA256 (python-distutils-extra-2.23.tar.gz) = bb862f24e5b5c3a297b7b57221088dd8ca6e42fb3e92bc1a2b742aae06a84883
+SIZE (python-distutils-extra-2.23.tar.gz) = 26349
diff --git a/devel/py-distutils-extra/pkg-plist b/devel/py-distutils-extra/pkg-plist
index d2d6020fb821..5059dc87ec0f 100644
--- a/devel/py-distutils-extra/pkg-plist
+++ b/devel/py-distutils-extra/pkg-plist
@@ -1,40 +1,40 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/auto.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/auto.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/auto.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_i18n.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/check.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_help.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_extra.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/auto.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/auto.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/auto.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_kdeui.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/clean_i18n.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_icons.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_i18n.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/check.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_help.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_extra.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_kdeui.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/clean_i18n.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_icons.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_i18n.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/check.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_help.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_extra.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_extra.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_extra.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_extra.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_help.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_help.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_help.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_i18n.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_i18n.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_i18n.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_icons.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_icons.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_icons.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_kdeui.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_kdeui.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_kdeui.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/check.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/check.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/check.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/clean_i18n.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/clean_i18n.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/clean_i18n.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/build_icons.pyo
 %%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/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%