Thanks. Please also consider to upstream the patches to ease the future updates.

sys/dev/ex/if_ex_pccard.c seems gone now. And I think you can just commit sys/dev/pccard/pccard.c

@arrowd: any update on this?
@james.wright_digital-chaos.com: do you want to also submit the patch to the upstream?

In D21650#472076, @tadeusz.struk_intel.com wrote:

In D21650#471996, @lwhsu wrote:

This port doesn't build. Please check the log available at https://reviews.freebsd.org/D21650#471935

Is it failing on 12.0-R? It is building fine for me on 13.0-CURRENT and poudriere v3.3.2_1

Will you do further testing for your comments in the patches?

This port doesn't build. Please check the log available at https://reviews.freebsd.org/D21650#471935

LGTM, is it possible for us to upstream these patches?

Test failed in 12.0-R amd64 jail in poudriere. The last lines of the log:

Discussion on bugzilla: https://bugs.freebsd.org/240473

Suppressed by D21442.

Wait for D21418.

@kib : I found that this one and D21418 do not conflict, do you mind if I commit this first to fix gcc build?

Suppressed by D21418

In D21417#466003, @kib wrote:

I disagree with making pmap/pcpu define live in counter.h.

@kevans I know it's gnugrep not bsdgrep, but could you provide some comments?

In D19888#461338, @arrowd wrote:

Does that mean I can commit this myself, despite having commit bit for ports only?

I think this is good, as we also have --color=auto default in ls(1)

Duplicated with D21135

Haven't tested my self, but by looking at include/Makefile, this looks the right fix.