summaryrefslogtreecommitdiff
path: root/graphics/glitz
diff options
context:
space:
mode:
authorminskim <minskim@pkgsrc.org>2006-07-23 03:42:43 +0000
committerminskim <minskim@pkgsrc.org>2006-07-23 03:42:43 +0000
commitc0976c5d97d45a7b88703819c622572ea98bc509 (patch)
tree795ace90b4676f8a3a90d20f2c9ed307f104bf0c /graphics/glitz
parent936da13757971b2181212907e512f60e5b583b38 (diff)
downloadpkgsrc-c0976c5d97d45a7b88703819c622572ea98bc509.tar.gz
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 (limited to 'graphics/glitz')
-rw-r--r--graphics/glitz/Makefile8
-rw-r--r--graphics/glitz/PLIST8
-rw-r--r--graphics/glitz/options.mk20
3 files changed, 27 insertions, 9 deletions
diff --git a/graphics/glitz/Makefile b/graphics/glitz/Makefile
index 2c210e2f900..97a310dcf57 100644
--- a/graphics/glitz/Makefile
+++ b/graphics/glitz/Makefile
@@ -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 @@ GNU_CONFIGURE= yes
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 @@ PLIST_SUBST+= AGL="@comment "
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 --git a/graphics/glitz/PLIST b/graphics/glitz/PLIST
index 2b4694500da..2237cc0b24e 100644
--- a/graphics/glitz/PLIST
+++ b/graphics/glitz/PLIST
@@ -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 --git a/graphics/glitz/options.mk b/graphics/glitz/options.mk
new file mode 100644
index 00000000000..efa4ae09883
--- /dev/null
+++ b/graphics/glitz/options.mk
@@ -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