Merge net/unison-nox11 as a flavor of net/unison

[madpilot]

Summary

I'd like to merge the nox11 port as a flavor of the main port.

Later I'd do the same for the older versions of unison in net/unison232 and net/unison240

[bsam]

I'm all for the change.
Thank you for taking care of those ports!

[mat]

net/unison/Makefile

18 ↗

(On Diff #37584)

Please add:

FLAVOR?=  ${FLAVORS[1]}

here. It makes all the flavors testing alter easier.

54 ↗

(On Diff #37584)

.else would be enough.

[mat]

MOVED

9846 ↗

(On Diff #37584)

add flavor to second field.

[madpilot]

Patch including requested changes.

First patch also missed PLIST_SUB variables, due to a mistake.

[mat]

You don't need all of the :U constructs any more.

[madpilot]

Removed the :U constructs.

While here I also noticed stage-qa reported some missing dependencies which I added.

[mat]

Looks ok for me.

net/unison/Makefile

22–24 ↗

(On Diff #37953)

You can simply use unison and unison-nox11 here, without globs to match versions.

[madpilot]

net/unison/Makefile

22–24 ↗

(On Diff #37953)

I was sticking to this since that was the recommended way, but a test shows pkg is smart enough not to trip itself so I'll use the simpler syntax.

Thanks for pointing this out.

[mat]

net/unison/Makefile

22–24 ↗

(On Diff #37953)

Right, I have to rewrite the "conflicts handling" section of the handbook, thanks for pointing that out :-)