Attachment 238082 Details for Bug 267775 – Patch file

[patch] Patch file

lang_ruby32.fix-plist.patch (text/plain), 1.52 KB, created by Yasuhiro Kimura on 2022-11-15 05:26:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2022-11-15 05:26:09 UTC

Size: 1.52 KB

patch

obsolete

>From 8b5638a6d09f7547e1f43107bc87cae530cbae80 Mon Sep 17 00:00:00 2001
>From: Yasuhiro Kimura <yasu@FreeBSD.org>
>Date: Tue, 15 Nov 2022 13:10:59 +0900
>Subject: [PATCH] lang/ruby32: Fix plist error when both CAPIDOCS and DOCS
> options are on.
>
>When the both options are on, post-install-DOCS-on target is called
>after post-install-CAPIDOCS-on has completed. And in the former files
>under ${WRKSRC}/doc/ are copied to ${STAGEDIR}${RUBY_DOCDIR}. This
>means files under ${WRKSRC}/doc/capi are copied to
>${STAGEDIR}${RUBY_DOCDIR}/capi again. And of course
>${WRKSRC}/doc/capi/.timestamp is included in them. As a result, even
>though ${STAGEDIR}${RUBY_DOCDIR}/capi/.timestamp is removed in
>post-install-CAPIDOCS-on target, it is detected as orphaned file at
>check-plist phase. So fix it by adding 3rd argument to
>${COPYTREE_SHARE} command so .timestamp is excluded from files to be
>copied.
>
>Fixes:	b49bdb1fe468
>---
> lang/ruby32/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/lang/ruby32/Makefile b/lang/ruby32/Makefile
>index 83e67d185456..0ac382a86ee1 100644
>--- a/lang/ruby32/Makefile
>+++ b/lang/ruby32/Makefile
>@@ -201,7 +201,7 @@ post-install-DOCS-on:
> 	${INSTALL_DATA} ${WRKSRC}/ext/${FILE} \
> 		${STAGEDIR}${RUBY_DOCDIR}/${FILE:C|^([^/]+)/.*|\1|}/
> .endfor
>-	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/)
>+	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/ "! -name .timestamp")
> 	${INSTALL_DATA} ${WRKSRC}/COPYING*	\
> 			${WRKSRC}/ChangeLog	\
> 			${WRKSRC}/LEGAL		\
>-- 
>2.38.1
>

Actions: View | Diff

Attachments on bug 267775: 238082 | 238330 | 238331 | 238332