pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/fltk2 Fix build and PLIST for -opengl case



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9eb04a98f4a1
branches:  trunk
changeset: 556251:9eb04a98f4a1
user:      abs <abs%pkgsrc.org@localhost>
date:      Wed Mar 18 11:09:33 2009 +0000

description:
Fix build and PLIST for -opengl case

diffstat:

 x11/fltk2/PLIST      |   6 +++---
 x11/fltk2/options.mk |  10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diffs (46 lines):

diff -r 645ca1e4ab4a -r 9eb04a98f4a1 x11/fltk2/PLIST
--- a/x11/fltk2/PLIST   Wed Mar 18 09:15:08 2009 +0000
+++ b/x11/fltk2/PLIST   Wed Mar 18 11:09:33 2009 +0000
@@ -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/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 -r 645ca1e4ab4a -r 9eb04a98f4a1 x11/fltk2/options.mk
--- a/x11/fltk2/options.mk      Wed Mar 18 09:15:08 2009 +0000
+++ b/x11/fltk2/options.mk      Wed Mar 18 11:09:33 2009 +0000
@@ -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 @@
 
 .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



Home | Main Index | Thread Index | Old Index