- Update to 2.38

- Use PYTHON_PY3K_PLIST_HACK
- Support STAGEDIR

Changes:	https://launchpad.net/python-distutils-extra/trunk/2.38

3 files changed, 14 insertions, 18 deletions

diff --git a/devel/py-distutils-extra/Makefile b/devel/py-distutils-extra/Makefile
index dcfcc6a15b1d..79b96ebd0851 100644
--- a/devel/py-distutils-extra/Makefile
+++ b/devel/py-distutils-extra/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	distutils-extra
-PORTVERSION=	2.37
+PORTVERSION=	2.38
 CATEGORIES=	devel python
-MASTER_SITES=	https://launchpadlibrarian.net/116392602/ \
+MASTER_SITES=	https://launchpadlibrarian.net/145592954/ \
 		LOCAL/sunpoet
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	python-${PORTNAME}-${PORTVERSION}
@@ -14,27 +14,28 @@ COMMENT=	Add support for i18n, documentation, and icons to distutils
 
 LICENSE=	GPLv2
 
+NO_STAGE=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 PYDISTUTILS_PKGNAME=	python_distutils_extra
 PYDISTUTILS_NOEGGINFO=	yes
+PYTHON_PY3K_PLIST_HACK=	yes
 
 PLIST_SUB=	PYTHON_SUFFIX=${PYTHON_SUFFIX}
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
-.if ${PYTHON_REL} >= 320
-PLIST_SUB+=	PYTHON32=""
-.else
-PLIST_SUB+=	PYTHON32="@comment "
-.endif
+#.if ${PYTHON_REL} >= 320
+#PLIST_SUB+=	PYTHON32=""
+#.else
+#PLIST_SUB+=	PYTHON32="@comment "
+#.endif
 
 post-install:
 .if ${PYTHON_REL} >= 320
-.for py in __init__.py command/__init__.py command/build_extra.py
-	${PYTHON_CMD} -m compileall ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG}/DistUtilsExtra/${py}
-.endfor
+#.for py in __init__.py command/__init__.py command/build_extra.py
+#	${PYTHON_CMD} -m compileall ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG}/DistUtilsExtra/${py}
+#.endfor
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-distutils-extra/distinfo b/devel/py-distutils-extra/distinfo
index 66c96dc79b86..3513216f2cdc 100644
--- a/devel/py-distutils-extra/distinfo
+++ b/devel/py-distutils-extra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (python-distutils-extra-2.37.tar.gz) = 5c9539badfdc7e0ebb463ee66b9c09d48a08ca121c84ec7316b1fbb799a72878
-SIZE (python-distutils-extra-2.37.tar.gz) = 27518
+SHA256 (python-distutils-extra-2.38.tar.gz) = 3d100d5d3492f40b3e7a6a4500f71290bfa91e2c50dc31ba8e3ff9b5d82ca153
+SIZE (python-distutils-extra-2.38.tar.gz) = 27748
diff --git a/devel/py-distutils-extra/pkg-plist b/devel/py-distutils-extra/pkg-plist
index adf7536a18f8..5412f650d9e5 100644
--- a/devel/py-distutils-extra/pkg-plist
+++ b/devel/py-distutils-extra/pkg-plist
@@ -1,15 +1,12 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/__init__.pyo
-%%PYTHON32%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%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/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/__init__.pyo
-%%PYTHON32%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON32%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/__pycache__/build_extra.cpython-%%PYTHON_SUFFIX%%.pyc
 %%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
@@ -35,8 +32,6 @@
 %%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
-%%PYTHON32%%@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command/__pycache__
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/command
-%%PYTHON32%%@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra/__pycache__
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DistUtilsExtra
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%