git: b59d2f879d21 - main - lang/ruby31: Fix orphaned .timestamp in 6021649ff0cee1ea88e34b5444c2fe31031ca29a
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 30 Dec 2022 09:18:49 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b59d2f879d2123a09d4563a006443659128213ae
commit b59d2f879d2123a09d4563a006443659128213ae
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-12-30 08:55:17 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-12-30 09:06:32 +0000
lang/ruby31: Fix orphaned .timestamp in 6021649ff0cee1ea88e34b5444c2fe31031ca29a
When both CAPIDOCS and DOCS options are enabled, the following commands are executed:
1. post-install-CAPIDOCS-on: removed the installed .timestamp (in STAGEDIR).
2. post-install-DOCS-on: copied the generated .timestamp (in capi directory) to the STAGEDIR again.
Therefore, the installed .timestamp is orphaned.
To fix this, we remove both the generated and installed .timestamp in post-install-CAPIDOCS-on:.
PR: 267775
Reported by: yasu
---
lang/ruby31/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lang/ruby31/Makefile b/lang/ruby31/Makefile
index fa350ff2e52a..0bf41f00efa0 100644
--- a/lang/ruby31/Makefile
+++ b/lang/ruby31/Makefile
@@ -180,7 +180,7 @@ post-install:
.endif
post-install-CAPIDOCS-on:
- ${RM} ${STAGEDIR}${PREFIX}/share/doc/ruby${RUBY_SUFFIX}/capi/.timestamp
+ ${RM} ${WRKSRC}/doc/capi/.timestamp ${STAGEDIR}${PREFIX}/share/doc/ruby${RUBY_SUFFIX}/capi/.timestamp
cd ${STAGEDIR}${PREFIX} && ${FIND} share/doc/ruby${RUBY_SUFFIX}/capi/ -type f >> ${TMPPLIST}
post-install-DEBUG-off:
@@ -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}/ "! -name .timestamp")
+ @(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/)
${INSTALL_DATA} ${WRKSRC}/COPYING* \
${WRKSRC}/ChangeLog \
${WRKSRC}/LEGAL \