To fix: https://www.vuxml.org/freebsd/38f213b6-8f3d-4067-91ef-bf14de7ba518.html
Created attachment 241145 [details] Update x11/libXpm to 3.5.15 This also converts the port to USE_GITLAB, since gitlab.com is upstream now.
Disclaimer: I'm not part of x11@, don't use libXpm and don't maintain any port that depends on libXpm. Feel free to ignore my review. pkg-plist changes are missing: $ poudriere testport -j 131amd64 x11/libXpm [...] =========================================================================== ====> Running Q/A tests (stage-qa) ====> Checking for pkg-plist issues (check-plist) ===> Parsing plist ===> Checking for items in STAGEDIR missing from pkg-plist Error: Orphaned: man/man3/XpmAttributesSize.3.gz Error: Orphaned: man/man3/XpmCreateBuffer.3.gz Error: Orphaned: man/man3/XpmCreateBufferFromImage.3.gz Error: Orphaned: man/man3/XpmCreateBufferFromPixmap.3.gz Error: Orphaned: man/man3/XpmCreateBufferFromXpmImage.3.gz Error: Orphaned: man/man3/XpmCreateData.3.gz Error: Orphaned: man/man3/XpmCreateDataFromImage.3.gz Error: Orphaned: man/man3/XpmCreateDataFromPixmap.3.gz Error: Orphaned: man/man3/XpmCreateDataFromXpmImage.3.gz Error: Orphaned: man/man3/XpmCreateImage.3.gz Error: Orphaned: man/man3/XpmCreateImageFromBuffer.3.gz Error: Orphaned: man/man3/XpmCreateImageFromData.3.gz Error: Orphaned: man/man3/XpmCreateImageFromXpmImage.3.gz Error: Orphaned: man/man3/XpmCreatePixmap.3.gz Error: Orphaned: man/man3/XpmCreatePixmapFromBuffer.3.gz Error: Orphaned: man/man3/XpmCreatePixmapFromData.3.gz Error: Orphaned: man/man3/XpmCreatePixmapFromXpmImage.3.gz Error: Orphaned: man/man3/XpmCreateXpmImage.3.gz Error: Orphaned: man/man3/XpmCreateXpmImageFromBuffer.3.gz Error: Orphaned: man/man3/XpmCreateXpmImageFromData.3.gz Error: Orphaned: man/man3/XpmCreateXpmImageFromImage.3.gz Error: Orphaned: man/man3/XpmCreateXpmImageFromPixmap.3.gz Error: Orphaned: man/man3/XpmFree.3.gz Error: Orphaned: man/man3/XpmFreeAttributes.3.gz Error: Orphaned: man/man3/XpmFreeExtensions.3.gz Error: Orphaned: man/man3/XpmFreeXpmImage.3.gz Error: Orphaned: man/man3/XpmFreeXpmInfo.3.gz Error: Orphaned: man/man3/XpmGetErrorString.3.gz Error: Orphaned: man/man3/XpmLibraryVersion.3.gz Error: Orphaned: man/man3/XpmMisc.3.gz Error: Orphaned: man/man3/XpmRead.3.gz Error: Orphaned: man/man3/XpmReadFileToBuffer.3.gz Error: Orphaned: man/man3/XpmReadFileToData.3.gz Error: Orphaned: man/man3/XpmReadFileToImage.3.gz Error: Orphaned: man/man3/XpmReadFileToPixmap.3.gz Error: Orphaned: man/man3/XpmReadFileToXpmImage.3.gz Error: Orphaned: man/man3/XpmWrite.3.gz Error: Orphaned: man/man3/XpmWriteFileFromBuffer.3.gz Error: Orphaned: man/man3/XpmWriteFileFromImage.3.gz Error: Orphaned: man/man3/XpmWriteFileFromPixmap.3.gz Error: Orphaned: man/man3/XpmWriteFileFromXpmImage.3.gz ===> Checking for items in pkg-plist which are not in STAGEDIR ===> Error: Plist issues found. *** Error code 1 (In reply to Dimitry Andric from comment #1) > This also converts the port to USE_GITLAB, since gitlab.com is upstream now. According to README.md within the distfile, the upstream is https://gitlab.freedesktop.org/xorg/lib/libXpm , not https://gitlab.com/libXpm/libXpm which doen't exist, anyway. USE_GITLAB + GL_COMMIT works fine because USES=xorg-cat:lib adjusts GL_* defaults. > commit 364b68cacdcf0a95daea5bec9b3d20793c8bea66 > Author: Dimitry Andric <dim@FreeBSD.org> > Date: 2023-03-26 14:34:10 +0200 > > x11/libXpm: update to 3.5.15 Since ports/ migrated to Git, please, use "git format-patch -1" instead of "git log -1 -p" when attaching patches on the bugzilla. Otherwise, if anyone else lands it's hard to preserve correct attribution other than going the old "Submitted by" style. > +USE_GITLAB= yes > +GL_COMMIT= ddd8339e262cbb7b25993599299ad40e0c95ccf6 Maybe instead add tar:xz to USES, sorted alphabetically. Besides, it builds faster without implicit USES=autoreconf. See also https://gitlab.freedesktop.org/xorg/lib/libXpm/-/commit/fa16fbda9c90
(In reply to Dimitry Andric from comment #1) > This also converts the port to USE_GITLAB This looks wrong: according to the linked URL, release tarballs are still sanely named (without ugly embedded hash) and fetched from expected location https://xorg.freedesktop.org/archive/individual/lib/libXpm-3.5.15.tar.xz. Please fix. > since gitlab.com is upstream now. Where their *development* happens is irrelevant as long as fetch process remains the same.
Created attachment 241160 [details] Update x11/libXpm to 3.5.15, round 2 Adjust according to comments.
(In reply to Dimitry Andric from comment #4) As jbeich@ noted earlier you don't need to add EXTRACT_SUFFX, just need to add tar:xz to USES.
Created attachment 241161 [details] Update x11/libXpm to 3.5.15, round 3 That's the kind of magic I didn't know about. :)
Looks good now :)
Comment on attachment 241161 [details] Update x11/libXpm to 3.5.15, round 3 > +OPTIONS_DEFINE= MANPAGES NLS > +OPTIONS_DEFAULT= MANPAGES > +OPTIONS_SUB= yes The manpages should probably be installed unconditionally if there're no extra dependencies. Otherwise, it'd be inconsistent with other x11@ ports like x11/libX11.
(In reply to Jan Beich from comment #8) > The manpages should probably be installed unconditionally if there're no extra > dependencies. That's right. Unlike DOCS, we typically do not guard manpage installation behind the option. The only exception is when manpages 1) must be generated, and 2) that pulls some heavy stack, e.g. TeX-based. Now, to be fair, that's a relatively minor issue since the distfile abomination had been fixed.
(In reply to Alexey Dokuchaev from comment #9) Since manpages where not installed previously I honestly don't care if they aren't enabled by default.
(In reply to Emmanuel Vadot from comment #10) So it was a bug before and it's good to have it fixed along with update. Ports should install manpages, I often type "man some-X-related-function" and it's annoying having to google it because the manpage is not installed; this also saves some Internet traffic (on metered connection).
> Since manpages where not installed previously Some were: man/man1/cxpm.1.gz and man/man1/sxpm.1.gz exist in 3.5.13.
(In reply to Alexey Dokuchaev from comment #9) Ah, I wasn't aware of that. I thought maybe it would also save some space on small systems.
Created attachment 241190 [details] Update x11/libXpm to 3.5.15, round 4 I think this will be good to commit now.
lgtm
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=74a91198ce81ffca9c461cb0100ea0660738695a commit 74a91198ce81ffca9c461cb0100ea0660738695a Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2023-03-26 12:34:10 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2023-03-30 10:32:13 +0000 x11/libXpm: update to 3.5.15 Changelogs: 3.5.14: https://gitlab.freedesktop.org/xorg/lib/libxpm/-/merge_requests/5 3.5.15: https://gitlab.freedesktop.org/xorg/lib/libxpm/-/merge_requests/10 PR: 270485 Reviewed by: danfe, jbeich, manu MFH: 2023Q1 Security: 38f213b6-8f3d-4067-91ef-bf14de7ba518 x11/libXpm/Makefile | 5 +++-- x11/libXpm/distinfo | 6 +++--- x11/libXpm/pkg-plist | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 5 deletions(-)