[Midnightbsd-cvs] mports [20237] trunk/Mk/extensions/python.mk: cleanup plist handler

[laffer1 at midnightbsd.org]

Revision: 20237
          http://svnweb.midnightbsd.org/mports/?rev=20237
Author:   laffer1
Date:     2015-09-13 07:02:56 -0400 (Sun, 13 Sep 2015)
Log Message:
-----------
cleanup plist handler

Modified Paths:
--------------
    trunk/Mk/extensions/python.mk

Modified: trunk/Mk/extensions/python.mk
===================================================================
--- trunk/Mk/extensions/python.mk	2015-09-13 10:51:02 UTC (rev 20236)
+++ trunk/Mk/extensions/python.mk	2015-09-13 11:02:56 UTC (rev 20237)
@@ -267,12 +267,10 @@
 								-d ${PYEASYINSTALL_SITELIBDIR} \
 								-s ${PYEASYINSTALL_BINDIR} \
 								${WRKSRC}/dist/${PYEASYINSTALL_EGG}
-.if !defined(NO_STAGE)
 MAKE_ENV+=			PYTHONUSERBASE=${FAKE_DESTDIR}${PYTHONBASE}
 PYDISTUTILS_INSTALLARGS:=	-m -q --user ${PYDISTUTILS_INSTALLARGS}
-.endif
 
-.if ${TRUE_PREFIX} != ${LOCALBASE} || !defined(NO_STAGE)
+.if ${TRUE_PREFIX} != ${LOCALBASE}
 MAKE_ENV+=						PYTHONPATH=${PYEASYINSTALL_SITELIBDIR}
 .endif
 
@@ -289,11 +287,7 @@
 
 pre-install: pre-install-easyinstall
 pre-install-easyinstall:
-.if defined(NO_STAGE)
-	@${MKDIR} ${PYEASYINSTALL_SITELIBDIR}
-.else
 	@${MKDIR} ${FAKE_DESTDIR}${PYEASYINSTALL_SITELIBDIR}
-.endif
 
 add-plist-post: add-plist-easyinstall
 add-plist-easyinstall:
@@ -306,7 +300,6 @@
 			/bin/ed ${PYEASYINSTALL_SITELIBDIR}/easy-install.pth" \
 		>> ${TMPPLIST}
 
-.if !defined(NO_STAGE)
 .if !target(stage-python-compileall)
 stage-python-compileall:
 	(cd ${FAKE_DESTDIR}${TRUE_PREFIX} && \
@@ -317,7 +310,6 @@
 .endif
 
 post-install: stage-python-compileall
-.endif
 
 .endif		# defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} == "easy_install"
 
@@ -400,7 +392,8 @@
 add-plist-post:
 	@${AWK} '\
 		/\.py[co]$$/ && !($$0 ~ "/" pc "/") {id = match($$0, /\/[^\/]+\.py[co]$$/); if (id != 0) {d = substr($$0, 1, RSTART - 1); dirs[d] = 1}; sub(/\.py[co]$$/,  "." mt "&"); sub(/[^\/]+\.py[co]$$/, pc "/&"); print; next} \
-		/^@dir / {d = substr($$0, 8); if (d in dirs) {print $$0 "/" pc}; print $$0; next} \
+		/^@dirrm / {d = substr($$0, 8); if (d in dirs) {print $$0 "/" pc}; print $$0; next} \
+		/^@dirrmtry / {d = substr($$0, 11); if (d in dirs) {print $$0 "/" pc}; print $$0; next} \
 		{print} \
 		END {if (sp in dirs) {print "@dir " sp "/" pc}} \
 		' \
@@ -453,7 +446,7 @@
 		PYTHON_VER=${PYTHON_VER}
 
 _USES_POST+=	python
-.endif		# _INCLUDE_USES_PYTHON_MK
+.endif	# _INCLUDE_USES_PYTHON_MK
 
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_PYTHON_POST_MK)
 _INCLUDE_USES_PYTHON_POST_MK=	yes
@@ -483,6 +476,5 @@
 .endif
 
 add-plist-post: add-plist-egginfo
-
 .endif # defined(_PYTHON_FEATURE_DISTUTILS)
 .endif # defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_PYTHON_POST_MK)