From f03dff2d36bf565e35480449d0352143c5b084ba Mon Sep 17 00:00:00 2001 From: nia Date: Fri, 30 Aug 2019 18:51:16 +0000 Subject: [PATCH] oce: Only needs MesaLib and glu --- cad/oce/buildlink3.mk | 5 +++-- cad/oce/options.mk | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cad/oce/buildlink3.mk b/cad/oce/buildlink3.mk index d2e09fb592a6..7481c878a339 100644 --- a/cad/oce/buildlink3.mk +++ b/cad/oce/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2018/03/12 11:15:25 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2019/08/30 18:51:16 nia Exp $ BUILDLINK_TREE+= oce @@ -12,7 +12,8 @@ BUILDLINK_PKGSRCDIR.oce?= ../../cad/oce BUILDLINK_INCDIRS.oce+= include/oce .if !empty(PKG_OPTIONS:Mx11) -.include "../../graphics/Mesa/buildlink3.mk" +.include "../../graphics/MesaLib/buildlink3.mk" +.include "../../graphics/glu/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../lang/tcl/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" diff --git a/cad/oce/options.mk b/cad/oce/options.mk index f19003ce9c19..1f3530086541 100644 --- a/cad/oce/options.mk +++ b/cad/oce/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2017/01/20 11:00:50 fhajny Exp $ +# $NetBSD: options.mk,v 1.2 2019/08/30 18:51:16 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.oce PKG_SUPPORTED_OPTIONS= oce-draw x11 @@ -11,7 +11,8 @@ PLIST_SRC= ${PLIST_SRC_DFLT} .if !empty(PKG_OPTIONS:Mx11) CMAKE_ARGS+= -DFREETYPE_INCLUDE_DIRS:PATH=${BUILDLINK_PREFIX.freetype2}/include PLIST_SRC+= ${PKGDIR}/PLIST.x11 -. include "../../graphics/Mesa/buildlink3.mk" +. include "../../graphics/MesaLib/buildlink3.mk" +. include "../../graphics/glu/buildlink3.mk" . include "../../graphics/freetype2/buildlink3.mk" .else CMAKE_ARGS+= -DOCE_DISABLE_X11=ON