[pkgsrc/trunk]: pkgsrc/x11/fltk13 x11/fltk13: Backport handling for option "o...

[micha <micha%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/39a9a6ffe289
branches:  trunk
changeset: 341262:39a9a6ffe289
user:      micha <micha%pkgsrc.org@localhost>
date:      Thu Oct 17 10:16:28 2019 +0000

description:
x11/fltk13: Backport handling for option "opengl" from wip/fltk14-devel

Only include MesaLib and glu if option is enabled.

diffstat:

 x11/fltk13/Makefile      |  16 +++++++++-------
 x11/fltk13/buildlink3.mk |  21 +++++++++++++++------
 2 files changed, 24 insertions(+), 13 deletions(-)

diffs (75 lines):

diff -r 262b278931d0 -r 39a9a6ffe289 x11/fltk13/Makefile
--- a/x11/fltk13/Makefile       Thu Oct 17 08:20:55 2019 +0000
+++ b/x11/fltk13/Makefile       Thu Oct 17 10:16:28 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2019/08/30 18:07:33 nia Exp $
+# $NetBSD: Makefile,v 1.31 2019/10/17 10:16:28 micha Exp $
 
 DISTNAME=      fltk-1.3.5-source
 PKGNAME=       ${DISTNAME:S/-source//}
@@ -48,6 +48,10 @@
 #.endif
 
 .if !empty(PKG_OPTIONS:Mopengl)
+.  if ${OPSYS} != "Darwin"
+.     include "../../graphics/MesaLib/buildlink3.mk"
+.     include "../../graphics/glu/buildlink3.mk"
+.  endif
 CONFIGURE_ARGS+=       --enable-gl
 PLIST.opengl=  yes
 .else
@@ -59,13 +63,11 @@
 CONFIGURE_ARGS+=       --disable-localjpeg --disable-localzlib --disable-localpng
 
 .if ${OPSYS} != "Darwin"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
+.  include "../../x11/libXext/buildlink3.mk"
+.  include "../../x11/libXft/buildlink3.mk"
+.  include "../../x11/libXinerama/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXt?=    build
-.include "../../x11/libXt/buildlink3.mk"
+.  include "../../x11/libXt/buildlink3.mk"
 .endif
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff -r 262b278931d0 -r 39a9a6ffe289 x11/fltk13/buildlink3.mk
--- a/x11/fltk13/buildlink3.mk  Thu Oct 17 08:20:55 2019 +0000
+++ b/x11/fltk13/buildlink3.mk  Thu Oct 17 10:16:28 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2018/03/12 11:15:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2019/10/17 10:16:28 micha Exp $
 
 BUILDLINK_TREE+=       fltk
 
@@ -10,13 +10,22 @@
 BUILDLINK_PKGSRCDIR.fltk?=     ../../x11/fltk13
 BUILDLINK_FILES.fltk+=         include/Fl/*
 
+pkgbase := fltk
 .include "../../mk/bsd.fast.prefs.mk"
+.include "../../mk/pkg-build-options.mk"
+
+# For "opengl" option
+.if !empty(PKG_BUILD_OPTIONS.fltk:Mopengl)
+.  if ${OPSYS} != "Darwin"
+.     include "../../graphics/MesaLib/buildlink3.mk"
+.     include "../../graphics/glu/buildlink3.mk"
+.  endif
+.endif
+
 .if ${OPSYS} != "Darwin"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
+.  include "../../x11/libXext/buildlink3.mk"
+.  include "../../x11/libXft/buildlink3.mk"
+.  include "../../x11/libXinerama/buildlink3.mk"
 .endif
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"