diff options
| author | abs <abs> | 2009-03-14 12:06:49 +0000 |
|---|---|---|
| committer | abs <abs> | 2009-03-14 12:06:49 +0000 |
| commit | 976e293a726bec8f28bbf54b6026997264ef79a4 (patch) | |
| tree | c2647a699fe3ed2c734f8df59802ce5f29e4cde3 /x11 | |
| parent | 1f38f716f7ea5fcd2afafa0c86b3843f2a79fc60 (diff) | |
| download | pkgsrc-976e293a726bec8f28bbf54b6026997264ef79a4.tar.gz | |
make opengl support optional, and default to off on very slow archs (m68k,m68000,vax). bump PKGREVISION
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/fltk2/Makefile | 7 | ||||
| -rw-r--r-- | x11/fltk2/buildlink3.mk | 5 | ||||
| -rw-r--r-- | x11/fltk2/options.mk | 20 |
3 files changed, 26 insertions, 6 deletions
diff --git a/x11/fltk2/Makefile b/x11/fltk2/Makefile index 969ab27e670..063f6429826 100644 --- a/x11/fltk2/Makefile +++ b/x11/fltk2/Makefile @@ -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 @@ GNU_CONFIGURE= yes 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 --git a/x11/fltk2/buildlink3.mk b/x11/fltk2/buildlink3.mk index 3f599264b83..cd5cecf0323 100644 --- a/x11/fltk2/buildlink3.mk +++ b/x11/fltk2/buildlink3.mk @@ -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_PACKAGES+= fltk2 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 --git a/x11/fltk2/options.mk b/x11/fltk2/options.mk new file mode 100644 index 00000000000..a4906dd532d --- /dev/null +++ b/x11/fltk2/options.mk @@ -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 |