From 150bc6c40ab4198da7efabf5072fefdc282cd801 Mon Sep 17 00:00:00 2001 From: abs Date: Wed, 18 Mar 2009 11:09:33 +0000 Subject: Fix build and PLIST for -opengl case --- x11/fltk2/PLIST | 6 +++--- x11/fltk2/options.mk | 10 ++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'x11') diff --git a/x11/fltk2/PLIST b/x11/fltk2/PLIST index 836ae3d8066..18fba234487 100644 --- a/x11/fltk2/PLIST +++ b/x11/fltk2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2008/05/25 15:29:19 joerg Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/03/18 11:09:33 abs Exp $ bin/fltk2-config bin/fluid2 include/fltk/Adjuster.h @@ -191,8 +191,8 @@ include/fltk/x11.h include/fltk/xbmImage.h include/fltk/xpmImage.h lib/libfltk2.a -lib/libfltk2_gl.a -lib/libfltk2_glut.a +${PLIST.opengl}lib/libfltk2_gl.a +${PLIST.opengl}lib/libfltk2_glut.a lib/libfltk2_images.a @dirrm include/fltk/compat/FL @dirrm include/fltk/compat diff --git a/x11/fltk2/options.mk b/x11/fltk2/options.mk index daf4715e1d6..d785cd2871e 100644 --- a/x11/fltk2/options.mk +++ b/x11/fltk2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2009/03/14 12:10:21 abs Exp $ +# $NetBSD: options.mk,v 1.3 2009/03/18 11:09:33 abs Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.fltk2 PKG_SUPPORTED_OPTIONS= opengl @@ -12,9 +12,15 @@ PKG_SUGGESTED_OPTIONS+= opengl .include "../../mk/bsd.options.mk" -.if !empty(PKG_OPTIONS:Mgl) +PLIST_VARS+= opengl +.if !empty(PKG_OPTIONS:Mopengl) +PLIST.opengl= yes .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-gl +SUBST_CLASSES+= opengl +SUBST_STAGE.opengl= post-configure +SUBST_FILES.opengl= Makefile +SUBST_SED.opengl= -e 's|OpenGL fluid glut test|fluid|g' .endif -- cgit v1.2.3