[pkgsrc/trunk]: pkgsrc/graphics/glitz Support the x11 option to enable/disabl...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dffc9d8296e2
branches:  trunk
changeset: 516553:dffc9d8296e2
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sun Jul 23 03:42:43 2006 +0000

description:
Support the x11 option to enable/disable the glx backend.  Platforms
without X11 may turn off this option while using another backend
such as AGL on Mac OS X.

diffstat:

 graphics/glitz/Makefile   |   8 +++-----
 graphics/glitz/PLIST      |   8 ++++----
 graphics/glitz/options.mk |  20 ++++++++++++++++++++
 3 files changed, 27 insertions(+), 9 deletions(-)

diffs (70 lines):

diff -r 0130fc114c90 -r dffc9d8296e2 graphics/glitz/Makefile
--- a/graphics/glitz/Makefile   Sun Jul 23 02:55:59 2006 +0000
+++ b/graphics/glitz/Makefile   Sun Jul 23 03:42:43 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/07/04 15:12:58 drochner Exp $
+# $NetBSD: Makefile,v 1.19 2006/07/23 03:42:43 minskim Exp $
 
 DISTNAME=      glitz-0.5.6
 CATEGORIES=    graphics
@@ -13,8 +13,6 @@
 PKGCONFIG_OVERRIDE=    src/agl/glitz-agl.pc.in src/glx/glitz-glx.pc.in \
                        src/glitz.pc.in
 
-LIBS.Darwin+=          -lXext
-
 .if exists(/System/Library/Frameworks/AGL.framework)
 PLIST_SUBST+=  AGL=""
 .else
@@ -27,7 +25,7 @@
 CFLAGS+=               -c99
 .endif
 
-.include "../../graphics/MesaLib/buildlink3.mk"
+.include "options.mk"
+
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 0130fc114c90 -r dffc9d8296e2 graphics/glitz/PLIST
--- a/graphics/glitz/PLIST      Sun Jul 23 02:55:59 2006 +0000
+++ b/graphics/glitz/PLIST      Sun Jul 23 03:42:43 2006 +0000
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2006/06/18 13:17:12 minskim Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/07/23 03:42:43 minskim Exp $
 ${AGL}include/glitz-agl.h
-include/glitz-glx.h
+${X11}include/glitz-glx.h
 include/glitz.h
 ${AGL}lib/libglitz-agl.la
-lib/libglitz-glx.la
+${X11}lib/libglitz-glx.la
 lib/libglitz.la
 ${AGL}lib/pkgconfig/glitz-agl.pc
-lib/pkgconfig/glitz-glx.pc
+${X11}lib/pkgconfig/glitz-glx.pc
 lib/pkgconfig/glitz.pc
diff -r 0130fc114c90 -r dffc9d8296e2 graphics/glitz/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/glitz/options.mk Sun Jul 23 03:42:43 2006 +0000
@@ -0,0 +1,20 @@
+# $NetBSD: options.mk,v 1.1 2006/07/23 03:42:43 minskim Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.glitz
+PKG_SUPPORTED_OPTIONS= x11
+PKG_SUGGESTED_OPTIONS= x11
+
+.include "../../mk/bsd.options.mk"
+
+###
+### X11 support
+###
+.if !empty(PKG_OPTIONS:Mx11)
+LIBS.Darwin+=  -lXext
+PLIST_SUBST+=  X11=""
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-glx
+PLIST_SUBST+=  X11="@comment "
+.endif