Page MenuHomeFreeBSD

Make devel/kore-notls a flavor of devel/kore and remove it
ClosedPublic

Authored by tobik on Dec 6 2017, 8:11 AM.

Details

Summary

Since I'm blocked on committing ports with FLAVORS would it be ok to
commit this? Or should I wait?

svn: E165001: Commit blocked by pre-commit hook (exit code 1) with output:
Do not commit a port with FLAVORS without first
getting approval from portmgr.
Test Plan

poudriere bulk -t -j fbsd103-i386 -C devel/kore@all ok
poudriere bulk -t -j fbsd11-amd64 -C devel/kore@all ok

No conflicts when installing both kore and kore-notls on the same
system.

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

tobik created this revision.Dec 6 2017, 8:11 AM
mat added inline comments.Dec 6 2017, 12:11 PM
devel/kore/Makefile
30 ↗(On Diff #36291)

I think this should be using USES=uniquename:dirs, possibly using UNIQUE_SUFFIX and UNIQUE_SUFFIX_FILES to rename file appropriately.

tobik updated this revision to Diff 36294.Dec 6 2017, 1:06 PM

uniquefiles looks useful, thanks! But unless I'm missing something
uniquename:dirs doesn't really work with UNIQUE_SUFFIX.

I've updated the port to use it, but I don't think it wins us much. I
still have to manually add the PKGNAMESUFFIX to files in pkg-plist
(except for bin/kore). uniquefiles.mk doesn't seem to be able to
cope with directories (include/kore -> include/kore-notls) and
doesn't update the TMPPLIST accordingly.

mat added a comment.Dec 6 2017, 1:21 PM

Mmmm, forget about what I said, for some reason, I thought USES=uniquefiles:dirs was using both UNIQUE_PREFIX and UNIQUE_SUFFIX, it seems not :-/

tobik updated this revision to Diff 36296.Dec 6 2017, 1:36 PM

Alright :)

Reverting to previous revision

mat accepted this revision.Dec 6 2017, 3:42 PM

Please go ahead.

This revision is now accepted and ready to land.Dec 6 2017, 3:42 PM
This revision was automatically updated to reflect the committed changes.