Page MenuHomeFreeBSD

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

Authored by madpilot on Jan 6 2018, 9:43 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Feb 9, 10:08 AM
Unknown Object (File)
Thu, Feb 8, 8:06 AM
Unknown Object (File)
Jan 30 2024, 6:20 AM
Unknown Object (File)
Jan 30 2024, 6:20 AM
Unknown Object (File)
Jan 30 2024, 6:20 AM
Unknown Object (File)
Jan 30 2024, 6:20 AM
Unknown Object (File)
Jan 30 2024, 6:15 AM
Unknown Object (File)
Jan 30 2024, 6:06 AM
Subscribers

Details

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

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

madpilot added a reviewer: portmgr. madpilot added 1 blocking reviewer(s): bsam.Jan 6 2018, 9:45 AM

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

mat requested changes to this revision.Jan 8 2018, 2:36 PM
mat added inline comments.
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.

This revision now requires changes to proceed.Jan 8 2018, 2:36 PM
MOVED
9846 ↗(On Diff #37584)

add flavor to second field.

madpilot marked 3 inline comments as done.

Patch including requested changes.

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

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

Removed the :U constructs.

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

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.

This revision is now accepted and ready to land.Jan 15 2018, 3:05 PM
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.

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 :-)

This revision was automatically updated to reflect the committed changes.