[pkgsrc/pkgsrc-2008Q4]: pkgsrc/graphics/glut Pullup ticket #2678 - requested ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/762f7e1cd3e4
branches:  pkgsrc-2008Q4
changeset: 552292:762f7e1cd3e4
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun Feb 01 22:19:09 2009 +0000

description:
Pullup ticket #2678 - requested by cube
glut: build fix for systems with native X.org

Revisions pulled up:
- graphics/glut/builtin.mk              1.2
---
Module Name:    pkgsrc
Committed By:   cube
Date:           Sun Feb  1 16:22:54 UTC 2009

Modified Files:
        pkgsrc/graphics/glut: builtin.mk

Log Message:
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:

 graphics/glut/builtin.mk |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r bcb84ef88480 -r 762f7e1cd3e4 graphics/glut/builtin.mk
--- a/graphics/glut/builtin.mk  Sun Feb 01 03:51:27 2009 +0000
+++ b/graphics/glut/builtin.mk  Sun Feb 01 22:19:09 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2008/11/11 16:17:07 cube Exp $
+# $NetBSD: builtin.mk,v 1.1.2.1 2009/02/01 22:19:09 tron Exp $
 
 BUILTIN_PKG:=  glut
 PKGCONFIG_FILE.glut=   ${X11BASE}/lib/pkgconfig/glut.pc
@@ -13,6 +13,7 @@
 .  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])