summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorcube <cube@pkgsrc.org>2009-02-01 16:22:54 +0000
committercube <cube@pkgsrc.org>2009-02-01 16:22:54 +0000
commitcc0527400d75a9447c7c5f97048cf4a9df928d05 (patch)
tree342df68d32e011418985367529ecfc642498c8a6 /graphics
parentf324742d89d82dc6df8cd74386e1172fdd6b5801 (diff)
downloadpkgsrc-cc0527400d75a9447c7c5f97048cf4a9df928d05.tar.gz
Restore the value of BUILTIN_PKG after checking for the rest of Mesa, so
that the logic x11.builtin.mk doesn't set variables for the wrong package. Noted by Obata-san.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/glut/builtin.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/graphics/glut/builtin.mk b/graphics/glut/builtin.mk
index 10b64adff70..0a111da205a 100644
--- a/graphics/glut/builtin.mk
+++ b/graphics/glut/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2008/11/11 16:17:07 cube Exp $
+# $NetBSD: builtin.mk,v 1.2 2009/02/01 16:22:54 cube Exp $
BUILTIN_PKG:= glut
PKGCONFIG_FILE.glut= ${X11BASE}/lib/pkgconfig/glut.pc
@@ -13,6 +13,7 @@ CHECK_BUILTIN.glu:= yes
. include "../../graphics/glu/builtin.mk"
CHECK_BUILTIN.MesaLib:= no
CHECK_BUILTIN.glu:= no
+BUILTIN_PKG:= glut
. if !empty(USE_BUILTIN.MesaLib:M[Nn][Oo]) || \
!empty(USE_BUILTIN.glu:M[Nn][Oo])