Page MenuHomeFreeBSD
Differential D19585

net/tigervnc: Switch to options helpers
ClosedPublic
Actions

Authored by meta on Mar 14 2019, 5:54 PM.
Tags
None
Referenced Files
F86226309: D19585.id55091.diff
Mon, Jun 17, 7:06 AM
Unknown Object (File)
Tue, Jun 11, 11:23 AM
Unknown Object (File)
Mon, Jun 10, 2:38 PM
Unknown Object (File)
Sat, May 25, 11:40 PM
Unknown Object (File)
Sat, May 25, 9:04 AM
Unknown Object (File)
Sat, May 25, 6:41 AM
Unknown Object (File)
Sat, May 18, 10:57 PM
Unknown Object (File)
May 5 2024, 9:01 AM
View All 41 Files
Subscribers
adamw

Details

Reviewers
None
Commits
rP495759: net/tigervnc: Switch to options helpers
Summary
  • Cleanup unnecessary CFLAGS
  • Switch shell substitution to $()
  • Switch to ImageMagick 7
  • s/XORG_WRKDIR/XORG_WRKSRC/ as the variable actually refers WRKSRC
  • Use relative path to refer other ports as many other ports do that

Diff Detail

Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 23090
Build 22148: arc lint + arc unit

Event Timeline

meta created this revision.Mar 14 2019, 5:54 PM
Harbormaster completed remote builds in B23090: Diff 55070.Mar 14 2019, 5:54 PM
adamw added a subscriber: adamw.Mar 14 2019, 6:14 PM

If you wanted OPTIONS_SINGLE, it would look like this:

OPTIONS_DEFAULT= IM7

OPTIONS_SINGLE=  IMAGEMAGICK
OPTIONS_SINGLE_IMAGEMAGICK=  IM6 IM7

IMAGEMAGICK_DESC=  Imagemagick version for generating [whatever it is it generates here]
IM6_DESC=  Imagemagick 6
IM7_DESC=  Imagemagick 7
IM7_BUILD_DEPENDS= convert:graphics/imagemagick7
IM6_BUILD_DEPENDS= convert:graphics/imagemagick6
net/tigervnc/Makefile
45

This should just be:
GNUTLS_CMAKE_BOOL= ENABLE_GNUTLS

Similarly,

PAM_CMAKE_BOOL=   ENABLE_PAM
VIEWER_CMAKE_BOOL =  BUILD_VIEWER

etc.

66

bsd.port.options.mk shouldn't be necessary anymore

meta added a comment.Mar 14 2019, 6:21 PM

This seems the port always depends on IM. IM is required only VIEWER option is ON. How can I define nested options?

adamw added a comment.Mar 14 2019, 6:26 PM

Ah, I missed that.

You could use OPTIONS_RADIO instead and do OPTIONS_RADIO= VIEWER, VIEWER_IM7 / VIEWER_IM6. Otherwise I agree here that it's not worth it.

meta updated this revision to Diff 55082.Mar 15 2019, 12:07 AM

Switch to OPT_CMAKE_BOOL

Harbormaster completed remote builds in B23097: Diff 55082.Mar 15 2019, 12:07 AM
adamw added inline comments.Mar 15 2019, 12:30 AM
net/tigervnc/Makefile
50

You're missing an E here.

meta updated this revision to Diff 55085.Mar 15 2019, 1:34 AM

fix typo and remove unnecessary bsd.port.options.mk

Harbormaster completed remote builds in B23099: Diff 55085.Mar 15 2019, 1:34 AM
adamw added a comment.Mar 15 2019, 2:27 AM

Those changes look good to me! Good work here. I think you're making a good choice to just leave the IM dependency fixed at 7. Do give it some build testing to make sure that CMAKE_BOOL is behaving the way you want it to.

meta added a comment.Mar 15 2019, 3:43 AM

I've already confirmed CMAKE_BOOLs behaves fine, thanks!

This revision was not accepted when it landed; it landed in state Needs Review.Mar 15 2019, 3:44 AM
Closed by commit rP495759: net/tigervnc: Switch to options helpers (authored by meta). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
net/
tigervnc/
81 lines

Diff 55070

View Options

net/tigervnc/Makefile

Loading...