Bug 204711
| Summary: | textproc/jq: Update to 1.5 | ||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Yuri Victorovich <yuri> | ||||||||||||
| Component: | Individual Port(s) | Assignee: | Dmitry Marakasov <amdmi3> | ||||||||||||
| Status: | Closed FIXED | ||||||||||||||
| Severity: | Affects Only Me | CC: | jnlin, koobs | ||||||||||||
| Priority: | --- | Keywords: | needs-patch, needs-qa, patch | ||||||||||||
| Version: | Latest | Flags: | bugzilla:
maintainer-feedback?
(jnlin) |
||||||||||||
| Hardware: | Any | ||||||||||||||
| OS: | Any | ||||||||||||||
| Attachments: |
|
||||||||||||||
Created attachment 163368 [details]
poudriere log
*** Bug 204710 has been marked as a duplicate of this bug. *** Created attachment 163369 [details]
patch
Clarified what ONIGURUMA option is
@Yuri
1) OPTIONS_* helpers should be placed before bsd.port.options.mk include
2) .if ${PORT_OPTIONS:MONIGURUMA} can be converted into an options helper
3) bsd.port.options.mk is probably not necessary after (2)
@Kubilay, > 2) .if ${PORT_OPTIONS:MONIGURUMA} can be converted into an options helper This case is special, because --without-oniguruma happens to be broken in the upstream release. https://github.com/stedolan/jq/issues/1021 We need to wait until the next release to do what you suggested. (In reply to yuri from comment #5) You can use <OPTION>_CONFIGURE_ON instead of <OPTION>_CONFIGURE_WITH so that the --without-* case isn't set/run Created attachment 163644 [details]
patch
- Please do not add extra tab to each line - Please group options-dependent knobs together, these should follow OPTIONS_DEFINE > - Please do not add extra tab to each line Why? This makes it aligned and look cleaner. Is number of tabs standardized anywhere? > - Please group options-dependent knobs together, these should follow OPTIONS_DEFINE Please suggest such check to ports-mgmt/portlint, because it is used to sign off on the order of lines. (In reply to yuri from comment #9) > > - Please do not add extra tab to each line > Why? > This makes it aligned and look cleaner. Is number of tabs standardized > anywhere? Two tabs is de-facto standard all over the tree, except for long options blocks where more tabs is really quite useful. The change also adds unneeded diff noise. > > - Please group options-dependent knobs together, these should follow OPTIONS_DEFINE > Please suggest such check to ports-mgmt/portlint, because it is used to sign > off on the order of lines. You can suggest a check for portlint yourself. Created attachment 163806 [details]
Improved version of the patch
Suggested version of the patch with the following improvements:
- Don't introduce unneeded whitespace changes
- Group options together
- Add LICENSE
- Switch to pkg-plist
> Two tabs is de-facto standard all over the tree Readability is better when all columns are aligned. Your version is less readable. > You can suggest a check for portlint yourself. I didn't suggest the change, you did. (In reply to yuri from comment #12) > Readability is better when all columns are aligned. Your version is less > readable. This is arguable. To make all columns aligned you'll need 4 tabs, and wasted horizontal space do not improve readbility at all. Which is more important, we have uniform formatting for all ports, and we're gonna stick to it. > > You can suggest a check for portlint yourself. > I didn't suggest the change, you did. I didn't, I don't care of portlint and I don't understand how it even is related. A commit references this bug: Author: amdmi3 Date: Mon Dec 14 20:29:47 UTC 2015 New revision: 403735 URL: https://svnweb.freebsd.org/changeset/ports/403735 Log: - Update to 1.5 - Add LICENSE - Optionize ONIGURAMA PR: 204711 Submitted by: yuri@rawbw.com, amdmi3 Approved by: maintainer timeout (jnlin@csie.nctu.edu.tw, 3 weeks) Changes: head/textproc/jq/Makefile head/textproc/jq/distinfo head/textproc/jq/pkg-plist |
Created attachment 163367 [details] patch