Import of pkgsrc-2016Q3

lang/python/egg.mk

@@ -1,4 +1,4 @@
-# $NetBSD: egg.mk,v 1.20 2014/12/31 13:57:28 wiz Exp $
+# $NetBSD: egg.mk,v 1.24 2016/08/28 09:40:35 richard Exp $
 #
 # Common logic to handle Python Eggs
 #
@@ -32,14 +32,21 @@ PRINT_PLIST_AWK+=	{ gsub(/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info/, \
 			       "$${EGG_INFODIR}") }
 PRINT_PLIST_AWK+=	{ gsub(/${EGG_NAME}-py${PYVERSSUFFIX}-nspkg.pth/, \
 			       "$${EGG_NAME}-nspkg.pth") }
+PRINT_PLIST_AWK+=	{ gsub(/${PYVERSSUFFIX}/, \
+			       "$${PYVERSSUFFIX}") }
 
 _PYSETUPTOOLSINSTALLARGS=	--single-version-externally-managed
-.if ${_USE_DESTDIR} == "no"
-_PYSETUPTOOLSINSTALLARGS+=	--root=/
-.endif
 
 DEPENDS+=	${PYPKGPREFIX}-setuptools>=0.8:../../devel/py-setuptools
 
 INSTALLATION_DIRS+=	${PYSITELIB}
 
+privileged-install-hook:	fixup-egg-info
+.PHONY:				fixup-egg-info
+fixup-egg-info:	# ensure egg-info directory contents are always 644
+	if ${TEST} -d "${DESTDIR}${PREFIX}/${PYSITELIB}/${EGG_INFODIR}"; then \
+	    ${FIND} ${DESTDIR}${PREFIX}/${PYSITELIB}/${EGG_INFODIR} -type f \
+		-exec ${CHMOD} ${SHAREMODE} '{}' +; \
+	fi
+
 .include "../../lang/python/extension.mk"