Page MenuHomeFreeBSD
Differential D15023

Update editors/texstudio to 2.12.8
ClosedPublic
Actions

Authored by fernape on Apr 9 2018, 9:23 PM.
Tags
None
Referenced Files
F102381718: D15023.id42601.diff
Mon, Nov 11, 12:11 PM
Unknown Object (File)
Sat, Nov 2, 4:52 PM
Unknown Object (File)
Sat, Nov 2, 4:10 PM
Unknown Object (File)
Sun, Oct 27, 10:24 PM
Unknown Object (File)
Oct 3 2024, 7:44 AM
Unknown Object (File)
Oct 1 2024, 5:21 AM
Unknown Object (File)
Oct 1 2024, 4:37 AM
Unknown Object (File)
Sep 30 2024, 5:40 PM
View All 59 Files
Subscribers
mat
rigoletto

Details

Reviewers
tz
tcberner
mat
Group Reviewers
portmgr
Commits
rP472195: editors/texstudio: update to 2.12.8
Summary

This comes from PR 227097

Maintainer sent update to 2.12.6 but while processing this PR, 2.12.8 came out
so I went directly for that one.

Maintainer will be notified in the PR.

Changes:

  • Update to 2.12.8
  • USE_GITHUB since this release is only in GH and not in SF
  • Add LICENSE according to project's site (no license file is provided)
  • Use DISTVERSION instead of PORTVERSION
  • Flavorize port and make qt5 default (as in the old version)
Test Plan
  • portlint -AC OK
  • run test in 11.1 amd64 OK
  • poudriere build logs for {10.3,10.4,11.1}{i386, amd64}, 12i386 availables at:

https://www.dropbox.com/sh/wcrnvdlqc2x6sop/AACj0aClm5_m_60q7cLAUIExa?dl=0

  • test in CURRENT is on its way (it will take a bit longer to finish...)

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

fernape created this revision.Apr 9 2018, 9:23 PM
Herald added a subscriber: mat. · View Herald TranscriptApr 9 2018, 9:23 PM
Harbormaster completed remote builds in B16083: Diff 41305.Apr 9 2018, 9:23 PM
fernape edited the test plan for this revision. (Show Details)Apr 9 2018, 9:23 PM
rigoletto added a subscriber: rigoletto.EditedApr 9 2018, 9:40 PM

Hi.

I was not aware about the change to Github.

EDIT: btw, I am not the maintainer. ^^

Thanks!

tcberner added inline comments.Apr 10 2018, 8:42 PM
editors/texstudio/Makefile
20 ↗(On Diff #41305)

^ I think the first flavor should be the default. So if

FLAVORS= qt4 qt5
FLAVOR?=	${FLAVORS:[1]}
40 ↗(On Diff #41305)

you should set this as
qt5_LIB_DEPENDS=... and qt4_LIB_DEPENDS=..., see 7.2.1 Falvor Helpers

See also 15.7. Flavors -- so you can move those two up a bit :)

mat added inline comments.Apr 11 2018, 9:06 AM
editors/texstudio/Makefile
20 ↗(On Diff #41305)

YES, the default flavor must be the first.

47–51 ↗(On Diff #41305)

This should happen earlier. See Chapter 15. Order of Variables in Port Makefiles.

fernape updated this revision to Diff 41372.Apr 11 2018, 4:18 PM

Addressing issues:

  • Move USE block up (mat)
  • Make first FLAVOR the default (mat, tcberner): qt5 as in the current port
Harbormaster completed remote builds in B16103: Diff 41372.Apr 11 2018, 4:18 PM
fernape edited the summary of this revision. (Show Details)Apr 11 2018, 9:14 PM
fernape edited the test plan for this revision. (Show Details)
mat added inline comments.Apr 12 2018, 11:00 AM
editors/texstudio/Makefile
34 ↗(On Diff #41372)

This should be in the FLAVORS block up there. See Chapter 15. Order of Variables in Port Makefiles.

Also, why +=?

41 ↗(On Diff #41372)

This should be in the FLAVORS block up there. See Chapter 15. Order of Variables in Port Makefiles.

Also, why +=?

fernape marked 4 inline comments as done.Apr 13 2018, 9:29 PM
fernape added inline comments.
editors/texstudio/Makefile
34 ↗(On Diff #41372)

This is a (bad?) habit that I have. Does it harm? because I see the benefit in case someone does a copy-paste. With '=' we would overwrite the previous value. Anyway this was pointed out to me before by tcberner so I'll change it if it is not considered quality code :)

About the other thing, if I move the .if ${FLAVOR} up just below FLAVORS= then portlint complains about "USE_* seen before USES."

fernape updated this revision to Diff 41453.Apr 13 2018, 10:11 PM

Addressing issues:

  • Use FLAVOR helpers for LIB_DEPENDS (tcberner)
  • Move .if ${FLAVOR}... block up (mat)
Harbormaster completed remote builds in B16133: Diff 41453.Apr 13 2018, 10:11 PM
fernape marked 3 inline comments as done.Apr 14 2018, 5:00 PM
fernape added a comment.Apr 18 2018, 5:40 PM

Hi,

Are there any more required changes for this port?

tcberner accepted this revision.Apr 18 2018, 6:25 PM

From my side it looks good -- mostly; you can move the qt4_LIB_DEPENDS and qt5_LIB_DEPENDS outside of the if.

As you're adding flavors, you're also required the OK of a portmgr before you can commit it.

This revision is now accepted and ready to land.Apr 18 2018, 6:25 PM
mat added inline comments.May 14 2018, 10:23 PM
editors/texstudio/Makefile
39–40 ↗(On Diff #41453)

This must happen earlier.

34 ↗(On Diff #41372)

When you use += it means you are adding to the variable, it means it was already defined. If you use += on an undefined variable, nobody understands why you are doing the +=. Most of the time, it is because the variable was defined with some value before, and you needed to append, but the definition is no longer there, and maybe the appending is no longer needed.

So, only, ever, use += for the variables that are set earlier in the Makefile, or for the variables that are allowed to be set in make.conf like CFLAGS/CXXFLAGS/LDFLAGS. In all other case, never use +=.

fernape updated this revision to Diff 42601.May 15 2018, 8:58 PM
fernape marked an inline comment as done.

Move USES earlier.

Pointed out by mat@

portlint -AC OK

This revision now requires review to proceed.May 15 2018, 8:58 PM
Harbormaster completed remote builds in B16611: Diff 42601.May 15 2018, 8:58 PM
fernape marked an inline comment as done.May 15 2018, 8:59 PM
fernape added inline comments.
editors/texstudio/Makefile
34 ↗(On Diff #41372)

Understood. Thanks!

fernape added a comment.Jun 8 2018, 7:01 PM

Hi there :)

Does this revision need more changes/testing?

tcberner added a comment.Jun 9 2018, 5:34 AM
In D15023#332095, @fernape wrote:

Hi there :)

Does this revision need more changes/testing?

@mat: is the falvorization ok?

tcberner added a reviewer: mat.Jun 9 2018, 5:35 AM
mat added a comment.Jun 9 2018, 7:55 AM

The <flavor>_LIB_DEPENDS should happen in the flavors section, see Chapter 15. Order of Variables in Port Makefiles.

fernape updated this revision to Diff 43498.Jun 9 2018, 5:22 PM

Move <flavor>_LIB_DEPENDS to FLAVOR block

Harbormaster completed remote builds in B17117: Diff 43498.Jun 9 2018, 5:22 PM
fernape added a comment.Jun 9 2018, 5:22 PM
In D15023#332199, @mat wrote:

The <flavor>_LIB_DEPENDS should happen in the flavors section, see Chapter 15. Order of Variables in Port Makefiles.

Thanks Mat!

mat accepted this revision.Jun 11 2018, 7:02 AM

looks good.

This revision is now accepted and ready to land.Jun 11 2018, 7:02 AM
fernape added a comment.Jun 11 2018, 4:59 PM
In D15023#332850, @mat wrote:

looks good.

I got blocked by the pre-commit hook:

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.

mat added a comment.Jun 11 2018, 5:17 PM

well, yes, because you did not add portmgr to the reviewers, so when I approved it, it did not tell you that portmgr approved it :-)

mat added a reviewer: portmgr.Jun 11 2018, 5:17 PM
This revision now requires review to proceed.Jun 11 2018, 5:17 PM
mat accepted this revision.Jun 11 2018, 5:17 PM
This revision is now accepted and ready to land.Jun 11 2018, 5:17 PM
Closed by commit rP472195: editors/texstudio: update to 2.12.8 (authored by fernape). · Explain WhyJun 11 2018, 5:25 PM
This revision was automatically updated to reflect the committed changes.
fernape added a comment.Jun 11 2018, 5:27 PM
In D15023#333033, @mat wrote:

well, yes, because you did not add portmgr to the reviewers, so when I approved it, it did not tell you that portmgr approved it :-)

OK, I thought it was automatic being you a member of portmgr :-)

Thanks!

Revision Contents
Changeset List

PathSize
head/
editors/
texstudio/
54 lines
6 lines
3 lines

Diff 43611

View Options

head/editors/texstudio/Makefile

Loading...
View Options

head/editors/texstudio/distinfo

Loading...
View Options

head/editors/texstudio/pkg-plist

Loading...