diff options
author | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2022-12-30 08:55:16 +0000 |
---|---|---|
committer | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2022-12-30 09:06:32 +0000 |
commit | 27f9bd4c225ec784b992974fd49cfb0987dbf88b (patch) | |
tree | 23657b0f200069a59aa3e87dddbe2776f067759c | |
parent | e1a7c49e51c3c0658dc044047d108e28acc8d27f (diff) | |
download | ports-27f9bd4c225ec784b992974fd49cfb0987dbf88b.tar.gz ports-27f9bd4c225ec784b992974fd49cfb0987dbf88b.zip |
lang/ruby30: Fix orphaned .timestamp in 93e3548c57a4a1dbd5fd335e2be23c02d9dcf066
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
-rw-r--r-- | lang/ruby30/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lang/ruby30/Makefile b/lang/ruby30/Makefile index 1580225a778a..b4e564ce8bd8 100644 --- a/lang/ruby30/Makefile +++ b/lang/ruby30/Makefile @@ -175,7 +175,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: @@ -196,7 +196,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 \ |