Attachment 168650 Details for Bug 208307 – v0

[patch] v0

port_empty.diff (text/plain), 1.67 KB, created by Jan Beich on 2016-03-26 14:47:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2016-03-26 14:47:24 UTC

Size: 1.67 KB

patch

obsolete

>Index: Mk/bsd.port.mk
>===================================================================
>--- Mk/bsd.port.mk	(revision 411917)
>+++ Mk/bsd.port.mk	(working copy)
>@@ -4871,37 +4885,37 @@
> .for _type in EXAMPLES DOCS
> .if !target(add-plist-${_type:tl})
> .if defined(PORT${_type}) && !defined(NOPORT${_type})
> add-plist-${_type:tl}:
> .for x in ${PORT${_type}}
> 	@if ${ECHO_CMD} "${x}"| ${AWK} '$$1 ~ /(\*|\||\[|\]|\?|\{|\}|\$$)/ { exit 1};'; then \
> 		if [ ! -e ${STAGEDIR}${${_type}DIR}/${x} ]; then \
> 		${ECHO_CMD} ${${_type}DIR}/${x} >> ${TMPPLIST}; \
> 	fi;fi
> .endfor
>-	@${FIND} -P ${PORT${_type}:S/^/${STAGEDIR}${${_type}DIR}\//} ! -type d 2>/dev/null | \
>-		${SED} -ne 's,^${STAGEDIR},,p' >> ${TMPPLIST}
>+	@${FIND} -P ${PORT${_type}:S/^/${STAGEDIR}${${_type}DIR}\//} -type d -empty -delete \
>+		-or ! -type d 2>/dev/null |	${SED} -ne 's,^${STAGEDIR},,p' >> ${TMPPLIST}
> .endif
> .endif
> .endfor
> 
> .if !target(add-plist-data)
> .if defined(PORTDATA)
> add-plist-data:
> .for x in ${PORTDATA}
> 	@if ${ECHO_CMD} "${x}"| ${AWK} '$$1 ~ /(\*|\||\[|\]|\?|\{|\}|\$$)/ { exit 1};'; then \
> 		if [ ! -e ${STAGEDIR}${DATADIR}/${x} ]; then \
> 		${ECHO_CMD} ${DATADIR}/${x} >> ${TMPPLIST}; \
> 	fi;fi
> .endfor
>-	@${FIND} -P ${PORTDATA:S/^/${STAGEDIR}${DATADIR}\//} ! -type d 2>/dev/null | \
>-		${SED} -ne 's,^${STAGEDIR},,p' >> ${TMPPLIST}
>+	@${FIND} -P ${PORTDATA:S/^/${STAGEDIR}${DATADIR}\//} -type d -empty -delete -or \
>+		! -type d 2>/dev/null | ${SED} -ne 's,^${STAGEDIR},,p' >> ${TMPPLIST}
> .endif
> .endif
> 
> .if !target(add-plist-info)
> .if defined(INFO)
> add-plist-info:
> .for i in ${INFO}
> 	@${LS} ${STAGEDIR}${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${STAGEDIR}:@info\ :g >> ${TMPPLIST}
> .endfor
> .endif

Actions: View | Diff

Attachments on bug 208307: 168650