Attachment 183717 Details for Bug 220214 – install man unique files

install man unique files

man.txt (text/plain), 2.60 KB, created by Fukang Chen on 2017-06-22 17:19:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fukang Chen

Created: 2017-06-22 17:19:57 UTC

Size: 2.60 KB

patch

obsolete

>Index: Mk/Uses/python.mk
>===================================================================
>--- Mk/Uses/python.mk	(revision 444116)
>+++ Mk/Uses/python.mk	(working copy)
>@@ -473,10 +473,10 @@
> .if defined(_PYTHON_FEATURE_AUTOPLIST)
> UNIQUE_FIND_SUFFIX_FILES=	\
> 	${SED} -e 's|^${PREFIX}/||' ${_PYTHONPKGLIST} ${TMPPLIST} | \
>-	${EGREP} -e '^bin/.*$$|^sbin/.*$$|^libexec/.*$$'
>+	${EGREP} -e '^bin/.*$$|^sbin/.*$$|^libexec/.*$$|^man/man[0-9]/.*$$'
> .else
> UNIQUE_FIND_SUFFIX_FILES=	\
>-	${EGREP} -he '^bin/.*$$|^sbin/.*$$|^libexec/.*$$' ${TMPPLIST} 2>/dev/null
>+	${EGREP} -he '^bin/.*$$|^sbin/.*$$|^libexec/.*$$|^man/man[0-9]/.*$$' ${TMPPLIST} 2>/dev/null
> .endif
> .endif # defined(_PYTHON_FEATURE_CONCURRENT)
> 
>Index: Mk/Uses/uniquefiles.mk
>===================================================================
>--- Mk/Uses/uniquefiles.mk	(revision 444116)
>+++ Mk/Uses/uniquefiles.mk	(working copy)
>@@ -140,7 +140,13 @@
> .for entry in ${UNIQUE_SUFFIX_FILES}
> 	@fname=${entry}; \
> 	if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \
>-		newf=$${fname%/*}/$${fname##*/}${UNIQUE_SUFFIX}; \
>+		case $${fname} in \
>+		man/man[0-9]/*.[0-9]) \
>+			manfname=$${fname##*/}; \
>+			newf=$${fname%/*}/$${manfname%.[0-9]}${UNIQUE_SUFFIX}$${manfname#$${manfname%.[0-9]}} ;; \
>+		*) \
>+	 		newf=$${fname%/*}/$${fname##*/}${UNIQUE_SUFFIX} ;; \
>+		esac; \
> 		${ECHO_MSG} "Move: $${fname} --> $${newf}"; \
> 		${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \
> 		${ECHO_CMD} MOVED:$${fname}:$${newf} >> ${_UNIQUEPKGLIST}; \
>@@ -153,7 +159,13 @@
> .if ${UNIQUE_FIND_SUFFIX_FILES}
> 	@for fname in `${UNIQUE_FIND_SUFFIX_FILES}`; do \
> 		if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \
>-			newf=$${fname%/*}/$${fname##*/}${UNIQUE_SUFFIX}; \
>+			case $${fname} in \
>+			man/man[0-9]/*.[0-9]) \
>+				manfname=$${fname##*/}; \
>+				newf=$${fname%/*}/$${manfname%.[0-9]}${UNIQUE_SUFFIX}$${manfname#$${manfname%.[0-9]}} ;; \
>+			*) \
>+		 		newf=$${fname%/*}/$${fname##*/}${UNIQUE_SUFFIX} ;; \
>+			esac; \
> 			${ECHO_MSG} "Move: $${fname} --> $${newf}"; \
> 			${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \
> 			${ECHO_CMD} MOVED:$${fname}:$${newf} >> ${_UNIQUEPKGLIST}; \
>@@ -172,6 +184,8 @@
> 	@if [ -e ${_UNIQUEPKGLIST} ]; then \
> 		orgIFS=$$IFS; IFS=":"; while read command entry newentry; do \
> 			IFS=$$orgIFS; \
>+			case $$entry in man/man[0-9]/*.[0-9]) entry="$$entry.gz" ;; esac; \
>+			case $$newentry in man/man[0-9]/*.[0-9]) newentry="$$newentry.gz" ;; esac; \
> 			case $${command} in \
> 			MOVED) \
> 				${REINPLACE_CMD} -e "s|^$${entry}$$|$${newentry}|" ${TMPPLIST}; \

Actions: View

Attachments on bug 220214: 183717 | 184080 | 188715 | 188835