Bug 267775 - lang/ruby{27,30,31,32}: Fix plist error when both CAPIDOCS and DOCS options are on.
Summary: lang/ruby{27,30,31,32}: Fix plist error when both CAPIDOCS and DOCS options a...
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Yasuhiro Kimura
URL:
Keywords:
Depends on:
Blocks: 267776
  Show dependency treegraph
 
Reported: 2022-11-15 05:26 UTC by Yasuhiro Kimura
Modified: 2022-12-30 09:19 UTC (History)
2 users (show)

See Also:
yasu: maintainer-feedback+


Attachments
Patch file (1.52 KB, patch)
2022-11-15 05:26 UTC, Yasuhiro Kimura
no flags Details | Diff
Patch file for lang/ruby27 (1.56 KB, patch)
2022-11-25 02:16 UTC, Yasuhiro Kimura
no flags Details | Diff
Patch file for lang/ruby30 (1.56 KB, patch)
2022-11-25 02:17 UTC, Yasuhiro Kimura
no flags Details | Diff
Patch file for lang/ruby31 (1.56 KB, patch)
2022-11-25 02:21 UTC, Yasuhiro Kimura
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Yasuhiro Kimura freebsd_committer freebsd_triage 2022-11-15 05:26:09 UTC
Created attachment 238082 [details]
Patch file

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
Comment 1 Yasuhiro Kimura freebsd_committer freebsd_triage 2022-11-25 02:16:16 UTC
Created attachment 238330 [details]
Patch file for lang/ruby27

Fix same problem with lang/ruby27.
Comment 2 Yasuhiro Kimura freebsd_committer freebsd_triage 2022-11-25 02:17:12 UTC
Created attachment 238331 [details]
Patch file for lang/ruby30

Fix same problem with lang/ruby30.
Comment 3 Yasuhiro Kimura freebsd_committer freebsd_triage 2022-11-25 02:21:19 UTC
Created attachment 238332 [details]
Patch file for lang/ruby31

Fix same problem with lang/ruby31.
Comment 4 Koichiro Iwao freebsd_committer freebsd_triage 2022-11-25 15:06:58 UTC
+1 

CC to sunpoet because this fixes his commit.
Comment 5 Yasuhiro Kimura freebsd_committer freebsd_triage 2022-12-09 04:11:11 UTC
Take.
Comment 6 commit-hook freebsd_committer freebsd_triage 2022-12-09 04:38:50 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e8d4ab71ea07e6d3c3a5bcf7a3003bd9a9ce6c23

commit e8d4ab71ea07e6d3c3a5bcf7a3003bd9a9ce6c23
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2022-11-25 01:49:35 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2022-12-09 04:35:01 +0000

    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.

    PR:             267775
    Approved by:    meta (ruby@)
    Fixes:          b49bdb1fe468 lang/ruby32: Simplify CAPIDOCS handling

 lang/ruby32/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Comment 7 commit-hook freebsd_committer freebsd_triage 2022-12-09 04:38:52 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e09de8e0440d26dbe40e4200c647d7aebef02cc6

commit e09de8e0440d26dbe40e4200c647d7aebef02cc6
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2022-11-25 01:47:17 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2022-12-09 04:34:59 +0000

    lang/ruby31: 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.

    PR:             267775
    Approved by:    meta (ruby@)
    Fixes:          6021649ff0ce lang/ruby31: Simplify CAPIDOCS handling

 lang/ruby31/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Comment 8 commit-hook freebsd_committer freebsd_triage 2022-12-09 04:38:53 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2930b1926d9e48729689af98928ae1ed2dfa7c06

commit 2930b1926d9e48729689af98928ae1ed2dfa7c06
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2022-11-25 01:45:56 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2022-12-09 04:34:58 +0000

    lang/ruby30: 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.

    PR:             267775
    Approved by:    meta (ruby@)
    Fixes:          93e3548c57a4 lang/ruby30: Simplify CAPIDOCS handling

 lang/ruby30/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Comment 9 commit-hook freebsd_committer freebsd_triage 2022-12-09 04:38:54 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bca8d7334e2d24d2be79498c5e561af8919c17f9

commit bca8d7334e2d24d2be79498c5e561af8919c17f9
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2022-11-25 01:44:04 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2022-12-09 04:34:56 +0000

    lang/ruby27: 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.

    PR:             267775
    Approved by:    meta (ruby@)
    Fixes:          bdbe2a2f4098 lang/ruby27: Simplify CAPIDOCS handling

 lang/ruby27/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Comment 10 commit-hook freebsd_committer freebsd_triage 2022-12-30 09:19:39 UTC
A commit in branch main references this bug:

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(-)
Comment 11 commit-hook freebsd_committer freebsd_triage 2022-12-30 09:19:40 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=27f9bd4c225ec784b992974fd49cfb0987dbf88b

commit 27f9bd4c225ec784b992974fd49cfb0987dbf88b
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-12-30 08:55:16 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-12-30 09:06:32 +0000

    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

 lang/ruby30/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Comment 12 commit-hook freebsd_committer freebsd_triage 2022-12-30 09:19:43 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1626e9a9a59cf12d9757f49f9991e6bd531c768e

commit 1626e9a9a59cf12d9757f49f9991e6bd531c768e
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:33 +0000

    lang/ruby32: Fix orphaned .timestamp in b49bdb1fe4680488411546540e6f737770a6003b

    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/ruby32/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Comment 13 commit-hook freebsd_committer freebsd_triage 2022-12-30 09:19:46 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e1a7c49e51c3c0658dc044047d108e28acc8d27f

commit e1a7c49e51c3c0658dc044047d108e28acc8d27f
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-12-30 08:55:15 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-12-30 09:06:32 +0000

    lang/ruby27: Fix orphaned .timestamp in bdbe2a2f4098f4d21495f314cf4d571efdb4f08f

    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/ruby27/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)