[pkgsrc/trunk]: pkgsrc/x11/fltk2 make opengl support optional, and default to...

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4b8ec58fef1e
branches:  trunk
changeset: 555944:4b8ec58fef1e
user:      abs <abs%pkgsrc.org@localhost>
date:      Sat Mar 14 12:06:49 2009 +0000

description:
make opengl support optional, and default to off on very slow archs (m68k,m68000,vax). bump PKGREVISION

diffstat:

 x11/fltk2/Makefile      |   7 ++++---
 x11/fltk2/buildlink3.mk |   5 ++---
 x11/fltk2/options.mk    |  20 ++++++++++++++++++++
 3 files changed, 26 insertions(+), 6 deletions(-)

diffs (66 lines):

diff -r ce5f00d7856b -r 4b8ec58fef1e x11/fltk2/Makefile
--- a/x11/fltk2/Makefile        Sat Mar 14 11:12:32 2009 +0000
+++ b/x11/fltk2/Makefile        Sat Mar 14 12:06:49 2009 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/05/25 15:29:19 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2009/03/14 12:06:49 abs Exp $
 
 VERS=          6129
+PKGREVISION=   1
 DISTNAME=      fltk-2.0.x-r${VERS}
 PKGNAME=       fltk2-2.0pre${VERS}
 CATEGORIES=    x11
@@ -25,8 +26,8 @@
 CONFIGURE_ARGS+=       --enable-threads
 CONFIGURE_ARGS+=       ac_cv_have_overlay=yes
 
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
+.include "options.mk"
+
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff -r ce5f00d7856b -r 4b8ec58fef1e x11/fltk2/buildlink3.mk
--- a/x11/fltk2/buildlink3.mk   Sat Mar 14 11:12:32 2009 +0000
+++ b/x11/fltk2/buildlink3.mk   Sat Mar 14 12:06:49 2009 +0000
@@ -1,6 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/05/25 15:29:19 joerg Exp $
-
-BUILDLINK_DEPMETHOD.fltk2?=    build
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/14 12:06:49 abs Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 FLTK2_BUILDLINK3_MK:=  ${FLTK2_BUILDLINK3_MK}+
@@ -14,6 +12,7 @@
 BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fltk2
 
 .if ${FLTK2_BUILDLINK3_MK} == "+"
+BUILDLINK_DEPMETHOD.fltk2?=    build
 BUILDLINK_API_DEPENDS.fltk2+=  fltk2>=2.0pre6129
 BUILDLINK_PKGSRCDIR.fltk2?=    ../../x11/fltk2
 .endif # FLTK2_BUILDLINK3_MK
diff -r ce5f00d7856b -r 4b8ec58fef1e x11/fltk2/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/fltk2/options.mk      Sat Mar 14 12:06:49 2009 +0000
@@ -0,0 +1,20 @@
+# $NetBSD: options.mk,v 1.1 2009/03/14 12:06:49 abs Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.fltk2
+PKG_SUPPORTED_OPTIONS= opengl
+PKG_SUGGESTED_OPTIONS=
+
+# Default
+.if ${MACHINE_ARCH} != "m68k" && && ${MACHINE_ARCH} != "m68000" && \
+       ${MACHINE_ARCH} != "vax"
+PKG_SUGGESTED_OPTIONS+=        opengl
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgl)
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-gl
+.endif