net-p2p/qbittorrent: Updated to 4.0.2; net-p2p/qbittorrent-nox: Deprecated, converted into a FLAVOR=nogui in net-p2p/qbittorrent
Needs ReviewPublic

Authored by yuri on Dec 7 2017, 9:38 PM.

Details

Reviewers
tcberner
adamw
Summary

Deprecated net-p2p/qbittorrent-nox in favor of the flavor in net-p2p/qbittorrent

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 13433
Build 13663: arc lint + arc unit
yuri created this revision.Dec 7 2017, 9:38 PM
yuri added a comment.Dec 7 2017, 9:40 PM

arc doesn't support deleted directories, otherwise, net-p2p/qbittorrent-nox is deleted.

mat added a comment.Dec 7 2017, 11:34 PM

The previous port was -nox11, not -nox, the flavor should probably be nox11, not nox

In D13416#280279, @yuri wrote:

arc doesn't support deleted directories, otherwise, net-p2p/qbittorrent-nox is deleted.

If you are using Subversion directly, you need to svn rm the directory for it to show as deleted.

net-p2p/qbittorrent/Makefile
50–51

why += ?

50–51

Why move the DOCS here ? Does the "nox" flavor not have DOCS ?

52
52

This was called -nox11 before, it should stay that way.

53

why := ?

net-p2p/qbittorrent/pkg-plist
31

empty line

yuri added a comment.Dec 8 2017, 12:19 AM
In D13416#280303, @mat wrote:

The previous port was -nox11, not -nox, the flavor should probably be nox11, not nox

In D13416#280279, @yuri wrote:

arc doesn't support deleted directories, otherwise, net-p2p/qbittorrent-nox is deleted.

If you are using Subversion directly, you need to svn rm the directory for it to show as deleted.

That's what I did, and I added the deleted directory to the command line, and it still doesn't show in phabricator.

yuri updated this revision to Diff 36375.Dec 8 2017, 4:55 AM
yuri marked 6 inline comments as done.

.

yuri added inline comments.Dec 8 2017, 4:55 AM
net-p2p/qbittorrent/Makefile
50–51

It has been this way for -nox11 port. Fixed.

53

It has been this way. Fixed.

net-p2p/qbittorrent/pkg-plist
31
yuri marked 3 inline comments as done.Dec 8 2017, 4:56 AM

Why did you rename the flavor to nogui?

yuri added a comment.EditedDec 8 2017, 6:35 AM

Why did you rename the flavor to nogui?

nogui reflects the meaning better. Their option is called --disable-gui. I also suggested to upstream to change suffix to -nogui.
They are developing something called Wayland which is an alternative to Xorg. nogui will cover all GUI cases.

yuri retitled this revision from net-p2p/qbittorrent: Updated to 4.0.2; net-p2p/qbittorrent-nox: Removed/deprecated, converted into a FLAVOR=nox in net-p2p/qbittorrent to net-p2p/qbittorrent: Updated to 4.0.2; net-p2p/qbittorrent-nox: Deprecated, converted into a FLAVOR=nogui in net-p2p/qbittorrent.Dec 8 2017, 7:53 AM
mat added inline comments.Dec 8 2017, 9:17 AM
net-p2p/qbittorrent/Makefile
20–35

I would use the flavor helpers for LIB_DEPENDS, PKGNAMESUFFIX and PLIST and keep them here, and move the rest after the USES block and before options. As Chapter 14. Order of Variables in Port Makefiles says.

yuri marked an inline comment as done.Dec 8 2017, 10:35 AM
yuri added inline comments.
net-p2p/qbittorrent/Makefile
20–35

If nogui_LIB_DEPENDS, nogui_PKGNAMESUFFIX and nogui_PLIST are kept here, but the rest with ifs is moved after the USES block, wouldn't this be a violation of Chapter 14. Order of Variables in Port Makefiles? It says that flavors should be before the USES block.

Besides, shouldn't CONFIGURE_ARGS and PLIST_FILES also have corresponding flavor helpers?

yuri marked 2 inline comments as done.Dec 8 2017, 10:35 AM
mat added inline comments.Dec 8 2017, 10:45 AM
net-p2p/qbittorrent/Makefile
20–35

I am quite sure this chapter does not say what you are saying. Mostly because I am the one who wrote it.

I know that there are two different paragraphs in 15.7 Flavors but the second paragraph is only one sentence long and is sort of answering exactly what you are asking.