PR: 226710
- major rework
- update to version 2.94
- convert Qt[4,5] to FLAVORS
- take maintainership
Details
Details
- Reviewers
tcberner - Group Reviewers
portmgr - Commits
- rP474704: net-p2p/transmission* -- update and falvorize
Diff Detail
Diff Detail
- Repository
- rP FreeBSD ports repository
- Lint
No Lint Coverage - Unit
No Test Coverage - Build Status
Buildable 16991 Build 16859: arc lint + arc unit
Event Timeline
There are a very large number of changes, so older changes are hidden. Show Older Changes
| net-p2p/transmission-qt/Makefile | ||
|---|---|---|
| 36 | That is extremely fragile, and extremely obfuscated, please expand it in the two lines it ends up doing. | |
| net-p2p/transmission-qt/Makefile | ||
|---|---|---|
| 37–38 | Wrong place in the Makefile, they are flavors helpers, they should happen in the flavors block. See Chapter 15. Order of Variables in Port Makefiles. | |
| net-p2p/transmission-qt/Makefile | ||
|---|---|---|
| 29–30 | Still wrong. up, up, with the flavors. Could you please read Chapter 15. Order of Variables in Port Makefiles, and apply its content. It would go so much faster than me having to knit pick every lines. | |
Comment Actions
Could you add some MOVED entries too?
net-p2p/transmission-qt4|net-p2p/transmission-qt@qt4|...
Comment Actions
Could you update the diff making you the maintainer of the whole transmission-suite?
mfg Tobias
Comment Actions
I just did a quick update to version 2.94, and changed the maintainer as previously concerted.
I need some time to try to re-work the entire thing aiming to make it more simple to maintain. It is too complicated right now.
Thanks! :)
Comment Actions
Saving state.
Nothing build, WORKDIR is always empty, the distfile does not extract (and IDK why). :-)
Comment Actions
Saving state.
Current situation:
www/transmission-web does not need any LIB_DEPENDS, USES etc. and the only way to arrange it would be:
1- create a separated port
2- add a conditional to disable those for this slave port before LIB_DEPENDS, like was done on the old version and (similar) to the previous FLAVORized version.
net-p2p/transmission-qt:
For some unknown reason "PKGNAMESUFFIX= -${FLAVOR}" is broken (it is ignored). If I set -qt4 or -qt5 just for testing it works.
I need instructions!
Thanks.
Comment Actions
Use something like in the master-port Makefile
. if ${SLAVEPORT:M....}
LIB_DEPENDS=...
.endifif the libdpeends are used by everything but the web one, you can also use something like
.if ${SLAVEPORT:Nweb}
LIB_DEPENDS=...
.endifnet-p2p/transmission-qt:
For some unknown reason "PKGNAMESUFFIX= -${FLAVOR}" is broken (it is ignored). If I set -qt4 or -qt5 just for testing it works.
This seems to work here.
[00:00:30] [08] [00:00:00] Building net-p2p/transmission-qt@qt5 | transmission-qt5-2.94 [00:00:33] [05] [00:00:00] Building net-p2p/transmission-qt@qt4 | transmission-qt4-2.94
I need instructions!
Thanks.
| net-p2p/transmission-daemon/Makefile | ||
|---|---|---|
| 21 ↗ | (On Diff #44449) | ^ that should be daemon |
| net-p2p/transmission-qt/Makefile | ||
| 19 | ^ you should probably set the shared USES lines in the master port, with += and only add the qt-specific here. | |
| 26 | you need to add CMAKE_ON= #empty (to not use the default in the masterport) | |
| net-p2p/transmission-qt/Makefile | ||
|---|---|---|
| 26 | make that CMAKE_ON=ENABLE_QT othwerise you'll get -D:BOOL=TRUE added .... that needs to be fixed in cmake.mk :D | |
| net-p2p/transmission-qt/Makefile | ||
|---|---|---|
| 32 | ^typo | |
| net-p2p/transmission-cli/Makefile | ||
|---|---|---|
| 6 ↗ | (On Diff #44449) | I would define SLAVEPORT?= cli
PKGNAMESUFFIX?= -${SLAVEPORT}here too -- that way you can remove the PKGNAMESUFFIX definition in the slave ports. (the -qt-one will need some work then :) ) |
| 28 ↗ | (On Diff #44449) | ^ you can probably do something like the following -- if you define SLAVES= cli daemon gtk qt
CMAKE_ON= ENABLE_${SLAVEPORT:tu}
CMAKE_OFF= ${SLAVES:N${SLAVEPORT}:tu:S/^/ENABLE_/}and get rid of most of the CMAKE_* in the slave ports. |
Comment Actions
Saving state again.
Evrything build but net-p2p/transmission and net-p2p/transmission-qt@qt4.
PolarSSL OPTION gone, that is not in ports anymore.
Thanks!
Comment Actions
Updating to use the new Qt USES. Also
- need to fix LICENSE for most ports
- fix Qt:4 build. Seem related with NLS.
Comment Actions
transmission-qti@qt4:
Fail on 10.4 if NLS is ON, but build if NLS is OFF. On 11.2 fail on both situations.
Comment Actions
All builds fixed but can't get it right with the translation files of -gtk and -qt versions. Adding %%NLS%% did not help.
Thanks!
| net-p2p/transmission-cli/Makefile | ||
|---|---|---|
| 42 ↗ | (On Diff #44670) | ^is this still needed with cmake? -- if ${LOCALBASE}/lib is required you can add USES=localbase, but maybe try it without the whole line once |
| net-p2p/transmission-cli/files/patch-qt_Application.h | ||
| 7 ↗ | (On Diff #44670) | ^ shouldn't this rather be #include <time.h> |
| net-p2p/transmission-qt/Makefile | ||
| 19 | ^ you should add | |
| net-p2p/transmission-cli/Makefile | ||
|---|---|---|
| 76 ↗ | (On Diff #44880) | Apparently not needed anymore. I built it in here and tested. Seem to be working. |
| 42 ↗ | (On Diff #44670) | Unfortunately yes, otherwise fail. :/ |
| net-p2p/transmission-cli/files/patch-qt_Application.h | ||
| 7 ↗ | (On Diff #44880) | Should this be up-streamed or this is a FreeBSD specific? |
| net-p2p/transmission-cli/Makefile | ||
|---|---|---|
| 42 ↗ | (On Diff #44670) | Then that is a bug in FindDHT.cmake of transmission, respectively how it is used :) -- it should either return the full librarypath, or add the library-dir to the linkdirectories for the targets that use it. |
| net-p2p/transmission-cli/files/patch-qt_Application.h | ||
| 7 ↗ | (On Diff #44880) | Yeah, that sounds very upstreamable |
Comment Actions
Small advance on removing LDFLAGS.
New errors:
cli/CMakeFiles/transmission-cli.dir/cli.c.o: In function `tr_strlratio':
cli.c:(.text+0x8ed): undefined reference to `libintl_gettext'
cc: error: linker command failed with exit code 1 (use -v to see invocation)
Thanks!