====> Running Q/A tests (stage-qa)
Error: Bad symlink 'share/man/man1/samterm.1.gz' pointing inside the stage directory
Error: Bad symlink 'share/man/man1/sam.save.1.gz' pointing inside the stage directory
Error: Bad symlink 'share/man/man1/B.1.gz' pointing inside the stage directory
Error: Bad symlink 'share/man/man1/rsam.1.gz' pointing inside the stage directory
*** Error code 1

arrowd added inline comments.Feb 26 2023, 3:39 PM

editors/sam/files/patch-doc_Makefile
11 ↗	(On Diff #117930)	Since all these man pages are in the same directory, just make the link relative: `ln -sf "sam.1" "$(MANDIR)/man1/B.1"`

diizzy added a subscriber: diizzy.Feb 26 2023, 5:02 PM

diizzy added inline comments.

editors/sam/Makefile
24	You probabaly want USES= localbase:ldflags instead?
editors/sam/files/patch-doc_Makefile
11 ↗	(On Diff #117930)	Since we seem to patch quite a lot perhaps its worth considering not executing "make install" at all and use ${RLN) etc in do-install section?

flo_purplekraken.com updated this revision to Diff 117978.Feb 26 2023, 8:47 PM

flo_purplekraken.com edited the test plan for this revision. (Show Details)

flo_purplekraken.com marked 3 inline comments as done.

flo_purplekraken.com added inline comments.

editors/sam/Makefile
24	I did not know about it, a big improvement. Thanks.
editors/sam/files/patch-doc_Makefile
11 ↗	(On Diff #117930)	I updated the diff, but I'm not sure about the `${RLN}` usage.

flo_purplekraken.com marked 2 inline comments as done.Feb 26 2023, 8:49 PM

diizzy added inline comments.Feb 26 2023, 10:03 PM

editors/sam/Makefile

Having a quick look it seems like you can reduce do-install to:

${INSTALL_PROGRAM} ${WRKSRC}/sam/sam ${STAGEDIR}${PREFIX}/bin
${RLN} ${STAGEDIR}${PREFIX}/bin/sam ${STAGEDIR}${PREFIX}/bin/B
${INSTALL_PROGRAM} ${WRKSRC}/samterm/samterm ${STAGEDIR}${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/ssam/ssam.sh ${STAGEDIR}${PREFIX}/bin/ssam
${INSTALL_MAN} ${WRKSRC}/doc/sam.1 ${STAGEDIR}${PREFIX}/share/man/man1
${RLN} ${STAGEDIR}${PREFIX}/share/man/man1/sam.1 ${STAGEDIR}${PREFIX}/share/man/man1/B.1
${RLN} ${STAGEDIR}${PREFIX}/share/man/man1/sam.1 ${STAGEDIR}${PREFIX}/share/man/man1/samterm.1
${RLN} ${STAGEDIR}${PREFIX}/share/man/man1/sam.1 ${STAGEDIR}${PREFIX}/share/man/man1/rsam.1
${RLN} ${STAGEDIR}${PREFIX}/share/man/man1/sam.1 ${STAGEDIR}${PREFIX}/share/man/man1/sam.save.1
${INSTALL_MAN} ${WRKSRC}/doc/samrc.5 ${STAGEDIR}${PREFIX}/share/man/man5

diizzy added inline comments.Feb 26 2023, 11:33 PM

editors/sam/Makefile
24	-I${LOCALBASE}/include/freetype2 seems to work fine? :-)

flo_purplekraken.com added inline comments.Feb 27 2023, 6:25 AM

editors/sam/Makefile
24	Well, this habit is a result of working with too many bad libraries professionally ;) I'll change it to `-I`.
31	I missed that the libraries are static only, thanks for the hint!