diff options
| author | micha <micha@pkgsrc.org> | 2019-10-17 10:16:28 +0000 |
|---|---|---|
| committer | micha <micha@pkgsrc.org> | 2019-10-17 10:16:28 +0000 |
| commit | b8c2fd6c36423590de7ed911a6152d94678a1f50 (patch) | |
| tree | 55ef431dd7e4818180355b6c697ff35a01c366cc /x11 | |
| parent | a612b8cc355b4ed7331d709269a7840bc250bf06 (diff) | |
| download | pkgsrc-b8c2fd6c36423590de7ed911a6152d94678a1f50.tar.gz | |
x11/fltk13: Backport handling for option "opengl" from wip/fltk14-devel
Only include MesaLib and glu if option is enabled.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/fltk13/Makefile | 16 | ||||
| -rw-r--r-- | x11/fltk13/buildlink3.mk | 21 |
2 files changed, 24 insertions, 13 deletions
diff --git a/x11/fltk13/Makefile b/x11/fltk13/Makefile index 31e63ec98c0..cd3ba221941 100644 --- a/x11/fltk13/Makefile +++ b/x11/fltk13/Makefile @@ -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" diff --git a/x11/fltk13/buildlink3.mk b/x11/fltk13/buildlink3.mk index 8ecb93eed91..2a3876c5600 100644 --- a/x11/fltk13/buildlink3.mk +++ b/x11/fltk13/buildlink3.mk @@ -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.3nb4 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" |