Bug 280358 - x11-fonts/fontconfig: %%LOCALBASE%% isn't replaced in pkg-message
Summary: x11-fonts/fontconfig: %%LOCALBASE%% isn't replaced in pkg-message
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: freebsd-desktop (Team)
URL:
Keywords: easy
Depends on:
Blocks:
 
Reported: 2024-07-19 00:49 UTC by sjrbulk
Modified: 2024-07-20 08:32 UTC (History)
2 users (show)

See Also:
arrowd: maintainer-feedback+
eduardo: merge-quarterly+

Attachments
Fix pkg-message (974 bytes, patch)
2024-07-19 10:28 UTC, Nuno Teixeira 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description sjrbulk 2024-07-19 00:49:51 UTC 
When installing this port, the line in the pkg-message file:

    find %%LOCALBASE%%/share/fonts -type f -name .uuid

doesn't have %%LOCALBASE%% replaced with the correct location.
Comment 2 Gleb Popov freebsd_committer freebsd_triage 2024-07-19 10:41:17 UTC 
The file should be moved to files/pkg-message.in, I think.
Comment 3 Nuno Teixeira freebsd_committer freebsd_triage 2024-07-19 12:10:26 UTC 
(In reply to Gleb Popov from comment #2)

That change is included in patch:

<snip>
diff --git a/x11-fonts/fontconfig/pkg-message b/x11-fonts/fontconfig/files/pkg-message.in
similarity index 100%
rename from x11-fonts/fontconfig/pkg-message
rename to x11-fonts/fontconfig/files/pkg-message.in
Comment 4 Nuno Teixeira freebsd_committer freebsd_triage 2024-07-20 02:41:28 UTC 
Tested with pkg-message 'type: install' and localbase shows correctly.

I think we are fine to commit.
Comment 5 Gleb Popov freebsd_committer freebsd_triage 2024-07-20 07:50:22 UTC 
(In reply to Nuno Teixeira from comment #3)
Strange, the raw patch uploaded to Bugzilla does not have this hunk:

https://bz-attachments.freebsd.org/attachment.cgi?id=252166&action=diff&format=raw&headers=1
Comment 6 Nuno Teixeira freebsd_committer freebsd_triage 2024-07-20 07:55:14 UTC 
(In reply to Gleb Popov from comment #5)

It shows on patch details: https://bugs.freebsd.org/bugzilla/attachment.cgi?id=252166&action=edit
Comment 7 Gleb Popov freebsd_committer freebsd_triage 2024-07-20 07:59:45 UTC 
Hmm, indeed. Bugzilla behaves strange on that.

This is good to go then, thank you.
Comment 8 commit-hook freebsd_committer freebsd_triage 2024-07-20 08:12:58 UTC 
A commit in branch main references this bug:

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

commit 0fff9ad2c85297b26e2f181b051480075015bb86
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2024-07-20 08:07:28 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2024-07-20 08:07:28 +0000

    x11-fonts/fontconfig: Fix pkg-message %%LOCALBASE%% replacement

    PR:             280358
    Reported by:    sjrbulk@verizon.net
    Approved by:    arrowd
    MFH:            2024Q3

 x11-fonts/fontconfig/Makefile                              | 5 ++++-
 x11-fonts/fontconfig/{pkg-message => files/pkg-message.in} | 0
 2 files changed, 4 insertions(+), 1 deletion(-)
Comment 9 commit-hook freebsd_committer freebsd_triage 2024-07-20 08:31:04 UTC 
A commit in branch 2024Q3 references this bug:

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

commit a87b77d09215b5e38fe5ddcbe473f1656d7cf82b
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2024-07-20 08:07:28 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2024-07-20 08:13:55 +0000

    x11-fonts/fontconfig: Fix pkg-message %%LOCALBASE%% replacement

    PR:             280358
    Reported by:    sjrbulk@verizon.net
    Approved by:    arrowd
    MFH:            2024Q3

    (cherry picked from commit 0fff9ad2c85297b26e2f181b051480075015bb86)

 x11-fonts/fontconfig/Makefile                              | 5 ++++-
 x11-fonts/fontconfig/{pkg-message => files/pkg-message.in} | 0
 2 files changed, 4 insertions(+), 1 deletion(-)
Comment 10 Nuno Teixeira freebsd_committer freebsd_triage 2024-07-20 08:32:03 UTC 
Committed, thanks!