x11/polybar: fix build on 13-CURRENT

[rigoletto]

Summary

Polybar is broken on CURRENT. I don't have a CURRENT box but I managed to reproduce the breakage on 12R forcing llvm70 on it.

I set the port to use llvm60, but is there a way to just a apply those changes on 13, to avoid the need of build llvm60 when there is no actual necessity? I mean, like a helper or something. I think I already saw something for that in the handbook but I am not finding it now.

Test Plan

Needs test on a CURRENT box.

[tcberner]

Could you try to fix the build with clang7? What is the error you get?

x11/polybar/Makefile

19 ↗

(On Diff #52038)

^ there should be a connection between the 60 here and below

39 ↗

(On Diff #52038)

^ I would not misues LLVM_DEFAULT for this :)

[rigoletto]

• fix BUILD_DEPENDS
• remove LLVM_DEFAULT
• apply the changes just to CURRENT

[rigoletto]

Minor, just remove an extra "+".

Btw, the OSVERSION is ate the end because was portlint compling about bsd.port.pre.mk before OPTIONS.

Thanks!

[tcberner]

Could you check whether https://github.com/jaagr/polybar/commit/3b32f5899a4d9a0bcb49099ee4bfee750366a3e6.patch would work?

[rigoletto]

Revert the port and add upstream patch fxing the build. :-D

Thanks!

[tcberner]

I would simply use the raw content from the commit as patch :)

x11/polybar/Makefile

18 ↗

(On Diff #52061)

^ revert

[rigoletto]

Done. Thanks! ^^

[tcberner]

I would prefer the upstream patch directly :) - but if it does not apply after de-gitifying, go ahead.

[rigoletto]

Keep the headers in the patch. Thanks!