Wed Mar 18 11:09:33 2009 UTC ()
Fix build and PLIST for -opengl case


(abs)
diff -r1.1.1.1 -r1.2 pkgsrc/x11/fltk2/PLIST
diff -r1.2 -r1.3 pkgsrc/x11/fltk2/options.mk
cvs diff -r1.1.1.1 -r1.2 pkgsrc/x11/fltk2/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/fltk2/Attic/PLIST 2008/05/25 15:29:19 1.1.1.1
+++ pkgsrc/x11/fltk2/Attic/PLIST 2009/03/18 11:09:33 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2008/05/25 15:29:19 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.2 2009/03/18 11:09:33 abs Exp $
2bin/fltk2-config 2bin/fltk2-config
3bin/fluid2 3bin/fluid2
4include/fltk/Adjuster.h 4include/fltk/Adjuster.h
5include/fltk/AlignGroup.h 5include/fltk/AlignGroup.h
6include/fltk/AnsiWidget.h 6include/fltk/AnsiWidget.h
7include/fltk/BarGroup.h 7include/fltk/BarGroup.h
8include/fltk/Box.h 8include/fltk/Box.h
9include/fltk/Browser.h 9include/fltk/Browser.h
10include/fltk/Button.h 10include/fltk/Button.h
11include/fltk/CheckButton.h 11include/fltk/CheckButton.h
12include/fltk/Choice.h 12include/fltk/Choice.h
13include/fltk/Clock.h 13include/fltk/Clock.h
14include/fltk/Color.h 14include/fltk/Color.h
@@ -181,19 +181,19 @@ include/fltk/osx.h @@ -181,19 +181,19 @@ include/fltk/osx.h
181include/fltk/pnmImage.h 181include/fltk/pnmImage.h
182include/fltk/rgbImage.h 182include/fltk/rgbImage.h
183include/fltk/run.h 183include/fltk/run.h
184include/fltk/show_colormap.h 184include/fltk/show_colormap.h
185include/fltk/string.h 185include/fltk/string.h
186include/fltk/utf.h 186include/fltk/utf.h
187include/fltk/visual.h 187include/fltk/visual.h
188include/fltk/win32.h 188include/fltk/win32.h
189include/fltk/x.h 189include/fltk/x.h
190include/fltk/x11.h 190include/fltk/x11.h
191include/fltk/xbmImage.h 191include/fltk/xbmImage.h
192include/fltk/xpmImage.h 192include/fltk/xpmImage.h
193lib/libfltk2.a 193lib/libfltk2.a
194lib/libfltk2_gl.a 194${PLIST.opengl}lib/libfltk2_gl.a
195lib/libfltk2_glut.a 195${PLIST.opengl}lib/libfltk2_glut.a
196lib/libfltk2_images.a 196lib/libfltk2_images.a
197@dirrm include/fltk/compat/FL 197@dirrm include/fltk/compat/FL
198@dirrm include/fltk/compat 198@dirrm include/fltk/compat
199@dirrm include/fltk 199@dirrm include/fltk
cvs diff -r1.2 -r1.3 pkgsrc/x11/fltk2/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/x11/fltk2/Attic/options.mk 2009/03/14 12:10:21 1.2
+++ pkgsrc/x11/fltk2/Attic/options.mk 2009/03/18 11:09:33 1.3
@@ -1,20 +1,26 @@ @@ -1,20 +1,26 @@
1# $NetBSD: options.mk,v 1.2 2009/03/14 12:10:21 abs Exp $ 1# $NetBSD: options.mk,v 1.3 2009/03/18 11:09:33 abs Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.fltk2 3PKG_OPTIONS_VAR= PKG_OPTIONS.fltk2
4PKG_SUPPORTED_OPTIONS= opengl 4PKG_SUPPORTED_OPTIONS= opengl
5PKG_SUGGESTED_OPTIONS= 5PKG_SUGGESTED_OPTIONS=
6 6
7# Default 7# Default
8.if ${MACHINE_ARCH} != "m68k" && ${MACHINE_ARCH} != "m68000" && \ 8.if ${MACHINE_ARCH} != "m68k" && ${MACHINE_ARCH} != "m68000" && \
9 ${MACHINE_ARCH} != "vax" 9 ${MACHINE_ARCH} != "vax"
10PKG_SUGGESTED_OPTIONS+= opengl 10PKG_SUGGESTED_OPTIONS+= opengl
11.endif 11.endif
12 12
13.include "../../mk/bsd.options.mk" 13.include "../../mk/bsd.options.mk"
14 14
15.if !empty(PKG_OPTIONS:Mgl) 15PLIST_VARS+= opengl
 16.if !empty(PKG_OPTIONS:Mopengl)
 17PLIST.opengl= yes
16.include "../../graphics/MesaLib/buildlink3.mk" 18.include "../../graphics/MesaLib/buildlink3.mk"
17.include "../../graphics/glu/buildlink3.mk" 19.include "../../graphics/glu/buildlink3.mk"
18.else 20.else
19CONFIGURE_ARGS+= --disable-gl 21CONFIGURE_ARGS+= --disable-gl
 22SUBST_CLASSES+= opengl
 23SUBST_STAGE.opengl= post-configure
 24SUBST_FILES.opengl= Makefile
 25SUBST_SED.opengl= -e 's|OpenGL fluid glut test|fluid|g'
20.endif 26.endif