[Midnightbsd-cvs] mports [24038] trunk/Mk/extensions: revert uniqefiles changes for now.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Aug 30 00:09:46 EDT 2018 

Revision: 24038
          http://svnweb.midnightbsd.org/mports/?rev=24038
Author:   laffer1
Date:     2018-08-30 00:09:46 -0400 (Thu, 30 Aug 2018)
Log Message:
-----------
revert uniqefiles changes for now.  fix a python circular loop with make config. fix a loading issue with meson

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

Modified: trunk/Mk/extensions/meson.mk
===================================================================
--- trunk/Mk/extensions/meson.mk	2018-08-30 04:01:48 UTC (rev 24037)
+++ trunk/Mk/extensions/meson.mk	2018-08-30 04:09:46 UTC (rev 24038)
@@ -29,7 +29,7 @@
 BUILD_DEPENDS+=		meson:devel/meson
 
 # meson uses ninja
-.include "${MPORTEXTENSIONS}/ninja.mk"
+.include "${PORTSDIR}/Mk/extensions/ninja.mk"
 
 # meson might have issues with non-unicode locales
 USE_LOCALE?=	en_US.UTF-8

Modified: trunk/Mk/extensions/python.mk
===================================================================
--- trunk/Mk/extensions/python.mk	2018-08-30 04:01:48 UTC (rev 24037)
+++ trunk/Mk/extensions/python.mk	2018-08-30 04:09:46 UTC (rev 24038)
@@ -512,11 +512,12 @@
 PYDISTUTILS_EGGINFO?=	${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}.egg-info
 PYDISTUTILS_EGGINFODIR?=${FAKE_DESTDIR}${PYTHONPREFIX_SITELIBDIR}
 
-add-plist-egginfo:
 .if !defined(_PYTHON_FEATURE_NOEGGINFO) && \
 	!defined(_PYTHON_FEATURE_AUTOPLIST) && \
 	defined(_PYTHON_FEATURE_DISTUTILS) && \
 	defined(PYTHON_REL)
+_USES_fake+=    933:add-plist-egginfo
+add-plist-egginfo:
 . for egginfo in ${PYDISTUTILS_EGGINFO}
 	if [ -d "${PYDISTUTILS_EGGINFODIR}/${egginfo}" ]; then \
 		${LS} ${PYDISTUTILS_EGGINFODIR}/${egginfo} | while read f; do \
@@ -530,7 +531,7 @@
 _RELSITELIBDIR=	${PYTHONPREFIX_SITELIBDIR:S;${TRUE_PREFIX}/;;}
 _RELLIBDIR=		${PYTHONPREFIX_LIBDIR:S;${TRUE_PREFIX}/;;}
 
-add-plist-post:	add-plist-pymod
+_USES_fake+=	934:add-plist-pymod
 add-plist-pymod:
 	@${SED} -e 's|^${FAKE_DESTDIR}${TRUE_PREFIX}/||' \
 		-e 's|^${TRUE_PREFIX}/||' \
@@ -544,7 +545,7 @@
 # of TMPPLIST that end with .py[co], so that they conform
 # to PEP 3147 (see http://www.python.org/dev/peps/pep-3147/)
 PYMAGICTAG=		${PYTHON_CMD} -c 'import imp; print(imp.get_tag())'
-add-plist-post:
+_USES_fake+=	935:add-plist-python
 	@${AWK} '\
 		/\.py[co]$$/ && !($$0 ~ "/" pc "/") {id = match($$0, /\/[^\/]+\.py[co]$$/); if (id != 0) {d = substr($$0, 1, RSTART - 1); dirs[d] = 1}; sub(/\.pyc$$/,  "." mt "&"); sub(/\.pyo$$/, "." mt "." pyo); sub(/[^\/]+\.py[co]$$/, pc "/&"); print; next} \
 		/^@dirrm / {d = substr($$0, 8); if (d in dirs) {print $$0 "/" pc}; print $$0; next} \
@@ -641,6 +642,5 @@
 	@(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS})
 .endif
 
-add-plist-post: add-plist-egginfo
 .endif # defined(_PYTHON_FEATURE_DISTUTILS)
 .endif # defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_PYTHON_POST_MK)

Modified: trunk/Mk/extensions/uniquefiles.mk
===================================================================
--- trunk/Mk/extensions/uniquefiles.mk	2018-08-30 04:01:48 UTC (rev 24037)
+++ trunk/Mk/extensions/uniquefiles.mk	2018-08-30 04:09:46 UTC (rev 24038)
@@ -56,19 +56,9 @@
 #				  list of files to be iterated over.
 #				  Default: empty
 #
-# UNIQUE_SUFFIX_TYPES		- A list of TAGS to defined more complex unique
-#				  suffix handling.  It can, for example, handle
-#				  man pages by doing:
+# NOTE:	multiple logical instances are not supported by pkg and the original
+# pkg_tools at the moment.
 #
-#		UNIQUE_SUFFIX_TYPES+=	SUFFIX_MAN
-#		UNIQUE_SUFFIX_MAN_WITH_EXT=	.[1-9ln]
-#		UNIQUE_SUFFIX_MAN_EXTRA_EXT=	.gz
-#		UNIQUE_FIND_SUFFIX_MAN_FILES=	${EGREP} -he '^man/man[1-9ln]/.*$$' ${TMPPLIST} 2>/dev/null
-#
-#				  The make(1) target that renames the files
-#				  runs before the man pages are compressed,
-#				  this is what the EXTRA_EXT bit is for.
-#
 
 .if !defined(_INCLUDE_USES_UNIQUEFILES_MK)
 _INCLUDE_USES_UNIQUEFILES_MK=	yes
@@ -78,8 +68,6 @@
 UNIQUE_PREFIX_FILES?=	# empty
 UNIQUE_SUFFIX_FILES?=	# empty
 
-UNIQUE_SUFFIX_TYPES+=	SUFFIX
-
 .if ${uniquefiles_ARGS:Mdirs}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUE_PREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${UNIQUE_PREFIX}${PORTNAME}
@@ -105,7 +93,7 @@
 	if [ ! -e ${STAGEDIR}${PREFIX}/$${fname} -a ! -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \
 		${ECHO_MSG} "Link: @$${fname} --> $${newf}"; \
 		${RLN} ${STAGEDIR}${PREFIX}/$${newf} ${STAGEDIR}${PREFIX}/$${fname}; \
-		${ECHO_CMD} LINKED:$${newf}%%EXTRA_EXT%%:$${fname}%%EXTRA_EXT%% >> ${_UNIQUEPKGLIST}; \
+		${ECHO_CMD} LINKED:$${newf}:$${fname} >> ${_UNIQUEPKGLIST}; \
 	fi
 .else
 # We are not symlinking the renamed binary.
@@ -112,7 +100,7 @@
 _DO_CONDITIONAL_SYMLINK=	${DO_NADA}
 .endif
 
-_USES_fake+=	775:move-uniquefiles
+_USES_stage+=	775:move-uniquefiles
 move-uniquefiles:
 .if ${UNIQUE_PREFIX_FILES} || ${UNIQUE_FIND_PREFIX_FILES}
 	@${ECHO_MSG} "===> Creating unique files: Move files needing PREFIX";
@@ -124,7 +112,7 @@
 		${ECHO_MSG} "Move: $${fname} --> $${newf}" ; \
 		${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \
 		${ECHO_CMD} MOVED:$${fname}:$${newf} >> ${_UNIQUEPKGLIST}; \
-		${_DO_CONDITIONAL_SYMLINK:S/%%EXTRA_EXT%%//g}; \
+		${_DO_CONDITIONAL_SYMLINK}; \
 	else \
 		${ECHO_MSG} "Makefile error: UNIQUE (prefix): $${fname} not found"; \
 		${FALSE}; \
@@ -137,7 +125,7 @@
 			${ECHO_MSG} "Move: $${fname} --> $${newf}" ; \
 			${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \
 			${ECHO_CMD} MOVED:$${fname}:$${newf} >> ${_UNIQUEPKGLIST}; \
-			${_DO_CONDITIONAL_SYMLINK:S/%%EXTRA_EXT%%//g}; \
+			${_DO_CONDITIONAL_SYMLINK}; \
 		else \
 			${ECHO_MSG} "Makefile error: UNIQUE (prefix): $${fname} not found"; \
 			${FALSE}; \
@@ -145,51 +133,36 @@
 	done;
 .endif
 
-.for sufxtype in ${UNIQUE_SUFFIX_TYPES}
-.  if (defined(UNIQUE_${sufxtype}_FILES) && ${UNIQUE_${sufxtype}_FILES}) || \
-     (defined(UNIQUE_FIND_${sufxtype}_FILES) && ${UNIQUE_FIND_${sufxtype}_FILES})
-.    if defined(UNIQUE_${sufxtype}_WITH_EXT) && ${UNIQUE_${sufxtype}_WITH_EXT}
-	@${ECHO_MSG} "===> Creating unique files: Move ${sufxtype:S|SUFFIX_||} files needing SUFFIX";
-.    else
+.if ${UNIQUE_SUFFIX_FILES} || ${UNIQUE_FIND_SUFFIX_FILES}
 	@${ECHO_MSG} "===> Creating unique files: Move files needing SUFFIX";
-.    endif
-.  endif
-.  for entry in ${UNIQUE_${sufxtype}_FILES}
+.endif
+.for entry in ${UNIQUE_SUFFIX_FILES}
 	@fname=${entry}; \
-	if [ -n "${UNIQUE_${sufxtype}_EXTRA_EXT}" ]; then \
-		fname=$${fname%${UNIQUE_${sufxtype}_EXTRA_EXT}}; \
-	fi; \
 	if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \
-		ofname=$${fname##*/}; \
-		newf=$${fname%/*}/$${ofname%${UNIQUE_${sufxtype}_WITH_EXT}}${UNIQUE_SUFFIX}$${ofname#$${ofname%${UNIQUE_${sufxtype}_WITH_EXT}}}; \
+		newf=$${fname%/*}/$${fname##*/}${UNIQUE_SUFFIX}; \
 		${ECHO_MSG} "Move: $${fname} --> $${newf}"; \
 		${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \
-		${ECHO_CMD} MOVED:$${fname}${UNIQUE_${sufxtype}_EXTRA_EXT}:$${newf}${UNIQUE_${sufxtype}_EXTRA_EXT} >> ${_UNIQUEPKGLIST}; \
-		${_DO_CONDITIONAL_SYMLINK:S/%%EXTRA_EXT%%/${UNIQUE_${sufxtype}_EXTRA_EXT}/g}; \
+		${ECHO_CMD} MOVED:$${fname}:$${newf} >> ${_UNIQUEPKGLIST}; \
+		${_DO_CONDITIONAL_SYMLINK}; \
 	else \
 		${ECHO_MSG} "Makefile error: UNIQUE (suffix): $${fname} not found"; \
 		${FALSE}; \
 	fi;
-.  endfor
-.  if defined(UNIQUE_FIND_${sufxtype}_FILES) && ${UNIQUE_FIND_${sufxtype}_FILES}
-	@for fname in `${UNIQUE_FIND_${sufxtype}_FILES}`; do \
-		if [ -n "${UNIQUE_${sufxtype}_EXTRA_EXT}" ]; then \
-			fname=$${fname%${UNIQUE_${sufxtype}_EXTRA_EXT}}; \
-		fi; \
+.endfor
+.if ${UNIQUE_FIND_SUFFIX_FILES}
+	@for fname in `${UNIQUE_FIND_SUFFIX_FILES}`; do \
 		if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \
-			ofname=$${fname##*/}; \
-			newf=$${fname%/*}/$${ofname%${UNIQUE_${sufxtype}_WITH_EXT}}${UNIQUE_SUFFIX}$${ofname#$${ofname%${UNIQUE_${sufxtype}_WITH_EXT}}}; \
+			newf=$${fname%/*}/$${fname##*/}${UNIQUE_SUFFIX}; \
 			${ECHO_MSG} "Move: $${fname} --> $${newf}"; \
 			${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \
-			${ECHO_CMD} MOVED:$${fname}${UNIQUE_${sufxtype}_EXTRA_EXT}:$${newf}${UNIQUE_${sufxtype}_EXTRA_EXT} >> ${_UNIQUEPKGLIST}; \
-			${_DO_CONDITIONAL_SYMLINK:S/%%EXTRA_EXT%%/${UNIQUE_${sufxtype}_EXTRA_EXT}/g}; \
+			${ECHO_CMD} MOVED:$${fname}:$${newf} >> ${_UNIQUEPKGLIST}; \
+			${_DO_CONDITIONAL_SYMLINK}; \
 		else \
 			${ECHO_MSG} "Makefile error: UNIQUE (suffix): $${fname} not found"; \
 			${FALSE}; \
 		fi; \
 	done;
-.  endif
-.endfor
+.endif
 
 # Using .if exists(${_UNIQUEPKGPLIST} below instead of the sh test
 # does not work in poudriere. It works fine on the CLI, though...

More information about the Midnightbsd-cvs mailing list