- Create an additional slaveport to offer CLI-only (master port) and Qt5 (slave port) packages. Changelog since 3.0: - Minor tweaks for the CLI version - Additional Qt5 GUI version PR: 238621 Submitted by: Thomas Merkel <tm@NetBSD.org> (initial patch) Approved by: ???
Details
Details
- Reviewers
- None
- Commits
- rP510779: security/spass{-qt5}: Update to 3.2
- poudriere (11.2-, 11.3-, 12.-RELEASE, 13.0-CURRENT@r349352 amd64 + i386) for both master/slave ports -> OK
- portlint -> OK (gives warning about URL of WWW field that exceeds 80 chars)
Diff Detail
Diff Detail
- Lint
No Lint Coverage - Unit
No Test Coverage - Build Status
Buildable 25873 Build 24442: arc lint + arc unit
Event Timeline
Comment Actions
This looks like this is trying to do subpackages with flavors, which we do not want.
| security/spass/Makefile | ||
|---|---|---|
| 30 | Remove :U... it is set before this line. | |
Comment Actions
Thank you for your info and looking at it.
Hrmkay, in that case if FLAVORS are not the desired approach, there might be two alternatives as far I know. If I'm not mistaken, the subpackage feature is still in WIP via D16457 ? It would be an ideal alternative once it lands.
The second alternative I can think of would be to create a slave port but that's a bit too far off for such a small port like security/spass is, imho.
Comment Actions
Well, we will not approve flavors that are there to emulate subpackages, so it should really be a slave port. Also, if both ports could be installed at the same time, it would be better.
| security/spass-qt5/Makefile | ||
|---|---|---|
| 7 ↗ | (On Diff #61009) | Do those two packages have to conflict ? Cannot this one only ship with bin/spass-qt? Also, you should not use options, because one could enable QT5 on the master port, and then this one is useless. |
| 11 ↗ | (On Diff #61009) | This is the default value, please remove. |
Comment Actions
Addressing @mat's pointers/questions:
- Remove the QT5 option completely and add nearly all Qt5 related stuff to the slaveport.
- Use a helper variable _WITH_QT5 to determine which version is built to append the CMAKE_ARGS.
- The CLI binary is bundled with the GUI version but each program works independently from each other. Thus remove the CLI version from the GUI-only slaveport and eliminate the CONFLICT_INSTALL entries that are now superfluous.
- Minor fix: Use devel/qt5-buildtools only during the build process. It's not required for runtime.
Comment Actions
- Change += from the slave port to =, it's indeed not set before.
- Remove the _WITH_QT5 helper variable from both ports and use a test against PKGNAMESUFFIX instead.