Page MenuHomeFreeBSD

net/tigervnc: Switch to options helpers
ClosedPublic

Authored by meta on Mar 14 2019, 5:54 PM.
Tags
None
Referenced Files
F88979315: D19585.diff
Sun, Jul 21, 7:47 PM
Unknown Object (File)
Mon, Jul 1, 2:11 AM
Unknown Object (File)
Thu, Jun 27, 12:33 AM
Unknown Object (File)
Wed, Jun 26, 12:34 AM
Unknown Object (File)
Tue, Jun 25, 3:28 PM
Unknown Object (File)
Tue, Jun 25, 10:25 AM
Unknown Object (File)
Mon, Jun 24, 10:08 PM
Unknown Object (File)
Sun, Jun 23, 3:07 AM
Subscribers

Details

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 23097
Build 22154: arc lint + arc unit

Event Timeline

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.

62

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

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

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.

net/tigervnc/Makefile
50

You're missing an E here.

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

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.

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
This revision was automatically updated to reflect the committed changes.