Attachment 144521 Details for Bug 191746 – patch to fix PORTDOCS/PORTEXAMPLES/PORTDATA @dirrm generation for globs in subdirs (PORTDOCS=dir/*)

[patch] patch to fix PORTDOCS/PORTEXAMPLES/PORTDATA @dirrm generation for globs in subdirs (PORTDOCS=dir/*)

patch-Mk_bsd.port.mk (text/plain), 2.12 KB, created by Matthias Andree on 2014-07-08 18:43:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Andree

Created: 2014-07-08 18:43:06 UTC

Size: 2.12 KB

patch

obsolete

>Index: /usr/ports.svn/Mk/bsd.port.mk
>===================================================================
>--- /usr/ports.svn/Mk/bsd.port.mk	(revision 361272)
>+++ /usr/ports.svn/Mk/bsd.port.mk	(working copy)
>@@ -655,6 +655,10 @@
> #				  Should not be set when no documentation files are
> #				  installed.
> #				  Useful for dynamically generated documentation.
>+#				  NOTE: this may fail to generate @dirrm entries for
>+#				  complex patterns. In such a case, please abstain from
>+#				  using DOCSDIR and add files and @dirrm-directories to
>+#				  pkg-plist instead (see make makeplist).
> #
> # Set the following to specify all documentation your port installs into
> # ${EXAMPLESDIR}
>@@ -5595,7 +5599,7 @@
> .endfor
> 	@${FIND} -P ${PORTDOCS:S/^/${STAGEDIR}${DOCSDIR}\//} ! -type d 2>/dev/null | \
> 		${SED} -ne 's,^${STAGEDIR}${PREFIX}/,,p' >> ${TMPPLIST}
>-	@${FIND} -P -d ${PORTDOCS:S/^/${STAGEDIR}${DOCSDIR}\//} -type d 2>/dev/null | \
>+	@${FIND} -P -d ${PORTDOCS:C,/[^/]*[*?\[][^/]*$,,:S/^/${STAGEDIR}${DOCSDIR}\//} -type d 2>/dev/null | \
> 		${SED} -ne 's,^${STAGEDIR}${PREFIX}/,@dirrm ,p' >> ${TMPPLIST}
> 	@${ECHO_CMD} "@dirrm ${DOCSDIR_REL}" >> ${TMPPLIST}
> .endif
>@@ -5617,7 +5621,7 @@
> .endfor
> 	@${FIND} -P ${PORTEXAMPLES:S/^/${STAGEDIR}${EXAMPLESDIR}\//} ! -type d 2>/dev/null | \
> 		${SED} -ne 's,^${STAGEDIR}${PREFIX}/,,p' >> ${TMPPLIST}
>-	@${FIND} -P -d ${PORTEXAMPLES:S/^/${STAGEDIR}${EXAMPLESDIR}\//} -type d 2>/dev/null | \
>+	@${FIND} -P -d ${PORTEXAMPLES:C,/[^/]*[*?\[][^/]*$,,:S/^/${STAGEDIR}${EXAMPLESDIR}\//} -type d 2>/dev/null | \
> 		${SED} -ne 's,^${STAGEDIR}${PREFIX}/,@dirrm ,p' >> ${TMPPLIST}
> 	@${ECHO_CMD} "@dirrm ${EXAMPLESDIR_REL}" >> ${TMPPLIST}
> .endif
>@@ -5639,7 +5643,7 @@
> .endfor
> 	@${FIND} -P ${PORTDATA:S/^/${STAGEDIR}${DATADIR}\//} ! -type d 2>/dev/null | \
> 		${SED} -ne 's,^${STAGEDIR}${PREFIX}/,,p' >> ${TMPPLIST}
>-	@${FIND} -P -d ${PORTDATA:S/^/${STAGEDIR}${DATADIR}\//} -type d 2>/dev/null | \
>+	@${FIND} -P -d ${PORTDATA:C,/[^/]*[*?\[][^/]*$,,:S/^/${STAGEDIR}${DATADIR}\//} -type d 2>/dev/null | \
> 		${SED} -ne 's,^${STAGEDIR}${PREFIX}/,@dirrm ,p' >> ${TMPPLIST}
> 	@${ECHO_CMD} "@dirrm ${DATADIR_REL}" >> ${TMPPLIST}
> .endif

Actions: View | Diff

Attachments on bug 191746: 144521 | 146394 | 146408