Attachment #188715 for bug #220214

Lines 576-589 UNIQUE_DEFAULT_LINKS= no Link Here

(-)Mk/Uses/python.mk (+9 lines)
576	.endif	576	.endif
577	UNIQUE_PREFIX= ${PYTHON_PKGNAMEPREFIX}	577	UNIQUE_PREFIX= ${PYTHON_PKGNAMEPREFIX}
578	UNIQUE_SUFFIX= -${PYTHON_VER}	578	UNIQUE_SUFFIX= -${PYTHON_VER}
		579	UNIQUE_SUFFIX_TYPES+= SUFFIX_MAN
		580	UNIQUE_SUFFIX_MAN_WITH_EXT= .[1-9ln]
579		581
580	.if defined(_PYTHON_FEATURE_AUTOPLIST)	582	.if defined(_PYTHON_FEATURE_AUTOPLIST)
581	UNIQUE_FIND_SUFFIX_FILES= \	583	UNIQUE_FIND_SUFFIX_FILES= \
582	${SED} -e 's\|^${PREFIX}/\|\|' ${_PYTHONPKGLIST} ${TMPPLIST} \| \	584	${SED} -e 's\|^${PREFIX}/\|\|' ${_PYTHONPKGLIST} ${TMPPLIST} \| \
583	${EGREP} -e '^bin/.$$\|^sbin/.$$\|^libexec/.*$$'	585	${EGREP} -e '^bin/.$$\|^sbin/.$$\|^libexec/.*$$'
		586	UNIQUE_FIND_SUFFIX_MAN_FILES= \
		587	${SED} -e 's\|^${PREFIX}/\|\|' ${_PYTHONPKGLIST} ${TMPPLIST} \| \
		588	${EGREP} -e '^man/man[1-9ln]/.*$$' \| \
		589	${SED} -e 's/\.gz$$//'
584	.else	590	.else
585	UNIQUE_FIND_SUFFIX_FILES= \	591	UNIQUE_FIND_SUFFIX_FILES= \
586	${EGREP} -he '^bin/.$$\|^sbin/.$$\|^libexec/.*$$' ${TMPPLIST} 2>/dev/null	592	${EGREP} -he '^bin/.$$\|^sbin/.$$\|^libexec/.*$$' ${TMPPLIST} 2>/dev/null
		593	UNIQUE_FIND_SUFFIX_MAN_FILES= \
		594	${EGREP} -he '^man/man[1-9ln]/.*$$' ${TMPPLIST} 2>/dev/null \| \
		595	${SED} -e 's/\.gz$$//'
587	.endif	596	.endif
588	.endif # defined(_PYTHON_FEATURE_CONCURRENT)	597	.endif # defined(_PYTHON_FEATURE_CONCURRENT)
589		598

Lines 69-74 UNIQUE_SUFFIX?= ${PKGNAMESUFFIX} Link Here

(-)Mk/Uses/uniquefiles.mk (-9 / +22 lines)
69	UNIQUE_PREFIX_FILES?= # empty	69	UNIQUE_PREFIX_FILES?= # empty
70	UNIQUE_SUFFIX_FILES?= # empty	70	UNIQUE_SUFFIX_FILES?= # empty
71		71
		72	UNIQUE_SUFFIX_TYPES+= SUFFIX
		73
72	.if ${uniquefiles_ARGS:Mdirs}	74	.if ${uniquefiles_ARGS:Mdirs}
73	DOCSDIR= ${PREFIX}/share/doc/${UNIQUE_PREFIX}${PORTNAME}	75	DOCSDIR= ${PREFIX}/share/doc/${UNIQUE_PREFIX}${PORTNAME}
74	EXAMPLESDIR= ${PREFIX}/share/examples/${UNIQUE_PREFIX}${PORTNAME}	76	EXAMPLESDIR= ${PREFIX}/share/examples/${UNIQUE_PREFIX}${PORTNAME}
Lines 134-146 move-uniquefiles: Link Here
134	done;	136	done;
135	.endif	137	.endif
136		138
137	.if ${UNIQUE_SUFFIX_FILES} \|\| ${UNIQUE_FIND_SUFFIX_FILES}	139	.for sufxtype in ${UNIQUE_SUFFIX_TYPES}
		140	. if (defined(UNIQUE_${sufxtype}_FILES) && ${UNIQUE_${sufxtype}_FILES}) \|\| \
		141	(defined(UNIQUE_FIND_${sufxtype}_FILES) && ${UNIQUE_FIND_${sufxtype}_FILES})
		142	. if defined(UNIQUE_${sufxtype}_WITH_EXT) && ${UNIQUE_${sufxtype}_WITH_EXT}
		143	@${ECHO_MSG} "===> Creating unique files: Move ${sufxtype:S\|SUFFIX_\|\|} files needing SUFFIX";
		144	. else
138	@${ECHO_MSG} "===> Creating unique files: Move files needing SUFFIX";	145	@${ECHO_MSG} "===> Creating unique files: Move files needing SUFFIX";
139	.endif	146	. endif
140	.for entry in ${UNIQUE_SUFFIX_FILES}	147	. endif
		148	. for entry in ${UNIQUE_${sufxtype}_FILES}
141	@fname=${entry}; \	149	@fname=${entry}; \
142	if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \	150	if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \
143	newf=$${fname%/}/$${fname##/}${UNIQUE_SUFFIX}; \	151	ofname=$${fname##*/}; \
		152	newf=$${fname%/*}/$${ofname%${UNIQUE_${sufxtype}_WITH_EXT}}${UNIQUE_SUFFIX}$${ofname#$${ofname%${UNIQUE_${sufxtype}_WITH_EXT}}}; \
144	${ECHO_MSG} "Move: $${fname} --> $${newf}"; \	153	${ECHO_MSG} "Move: $${fname} --> $${newf}"; \
145	${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \	154	${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \
146	${ECHO_CMD} MOVED:$${fname}:$${newf} >> ${_UNIQUEPKGLIST}; \	155	${ECHO_CMD} MOVED:$${fname}:$${newf} >> ${_UNIQUEPKGLIST}; \
Lines 149-159 move-uniquefiles: Link Here
149	${ECHO_MSG} "Makefile error: UNIQUE (suffix): $${fname} not found"; \	158	${ECHO_MSG} "Makefile error: UNIQUE (suffix): $${fname} not found"; \
150	${FALSE}; \	159	${FALSE}; \
151	fi;	160	fi;
152	.endfor	161	. endfor
153	.if ${UNIQUE_FIND_SUFFIX_FILES}	162	. if defined(UNIQUE_FIND_${sufxtype}_FILES) && ${UNIQUE_FIND_${sufxtype}_FILES}
154	@for fname in `${UNIQUE_FIND_SUFFIX_FILES}`; do \	163	@for fname in `${UNIQUE_FIND_${sufxtype}_FILES}`; do \
155	if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \	164	if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \
156	newf=$${fname%/}/$${fname##/}${UNIQUE_SUFFIX}; \	165	ofname=$${fname##*/}; \
		166	newf=$${fname%/*}/$${ofname%${UNIQUE_${sufxtype}_WITH_EXT}}${UNIQUE_SUFFIX}$${ofname#$${ofname%${UNIQUE_${sufxtype}_WITH_EXT}}}; \
157	${ECHO_MSG} "Move: $${fname} --> $${newf}"; \	167	${ECHO_MSG} "Move: $${fname} --> $${newf}"; \
158	${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \	168	${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \
159	${ECHO_CMD} MOVED:$${fname}:$${newf} >> ${_UNIQUEPKGLIST}; \	169	${ECHO_CMD} MOVED:$${fname}:$${newf} >> ${_UNIQUEPKGLIST}; \
Lines 163-169 move-uniquefiles: Link Here
163	${FALSE}; \	173	${FALSE}; \
164	fi; \	174	fi; \
165	done;	175	done;
166	.endif	176	. endif
		177	.endfor
167		178
168	# Using .if exists(${_UNIQUEPKGPLIST} below instead of the sh test	179	# Using .if exists(${_UNIQUEPKGPLIST} below instead of the sh test
169	# does not work in poudriere. It works fine on the CLI, though...	180	# does not work in poudriere. It works fine on the CLI, though...
Lines 172-177 move-uniquefiles-plist: Link Here
172	@if [ -e ${_UNIQUEPKGLIST} ]; then \	183	@if [ -e ${_UNIQUEPKGLIST} ]; then \
173	orgIFS=$$IFS; IFS=":"; while read command entry newentry; do \	184	orgIFS=$$IFS; IFS=":"; while read command entry newentry; do \
174	IFS=$$orgIFS; \	185	IFS=$$orgIFS; \
		186	case $$entry in man/man[0-9ln]/*) entry="$$entry.gz" ;; esac; \
		187	case $$newentry in man/man[0-9ln]/*) newentry="$$newentry.gz" ;; esac; \
175	case $${command} in \	188	case $${command} in \
176	MOVED) \	189	MOVED) \
177	${REINPLACE_CMD} -e "s\|^$${entry}$$\|$${newentry}\|" ${TMPPLIST}; \	190	${REINPLACE_CMD} -e "s\|^$${entry}$$\|$${newentry}\|" ${TMPPLIST}; \

Return to bug 220214