CVS commit: pkgsrc/x11/fltk13

["Michael Baeuerle" <micha%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   micha
Date:           Thu Oct 17 10:16:28 UTC 2019

Modified Files:
        pkgsrc/x11/fltk13: Makefile buildlink3.mk

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

Only include MesaLib and glu if option is enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/x11/fltk13/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/fltk13/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/fltk13/Makefile
diff -u pkgsrc/x11/fltk13/Makefile:1.30 pkgsrc/x11/fltk13/Makefile:1.31
--- pkgsrc/x11/fltk13/Makefile:1.30     Fri Aug 30 18:07:33 2019
+++ pkgsrc/x11/fltk13/Makefile  Thu Oct 17 10:16:28 2019
@@ -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 @@ PLIST.cs=            yes
 #.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+=    --enable-shared
 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"

Index: pkgsrc/x11/fltk13/buildlink3.mk
diff -u pkgsrc/x11/fltk13/buildlink3.mk:1.11 pkgsrc/x11/fltk13/buildlink3.mk:1.12
--- pkgsrc/x11/fltk13/buildlink3.mk:1.11        Mon Mar 12 11:15:49 2018
+++ pkgsrc/x11/fltk13/buildlink3.mk     Thu Oct 17 10:16:28 2019
@@ -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_ABI_DEPENDS.fltk?=        fltk>=1.3.3
 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"