From db3a779c2dd868f2ee22183d0931287cb71a9f51 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Mon, 18 Nov 2002 07:49:24 +0000
Subject: Alter Mesa/GL packages so that they may always be installed if
 X11PREFIX != X11BASE (xpkgwedge is installed).  Introduce a new variable
 MESA_REQD that defaults to "3.4.2" and represents the version of Mesa/GL
 needed by a package.  MESA_REQD is intended to be used by package Makefiles
 or by buildlink2.mk files.

It should now be possible to update this package to the latest release
(5.0), and have it work on:

	* XF86-3.x with or without xpkgwedge
	* XF86-4.x with xpkgwedge
---
 graphics/glu/Makefile | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'graphics/glu/Makefile')

diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile
index b5744f710e3..771f5d926c4 100644
--- a/graphics/glu/Makefile
+++ b/graphics/glu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/10/27 17:58:12 bouyer Exp $
+# $NetBSD: Makefile,v 1.14 2002/11/18 07:49:25 jlam Exp $
 
 PKGNAME=		${DISTNAME:C/MesaLib/glu/}
 WRKSRC=			${WRKDIR}/${DISTNAME:C/Lib//}
@@ -12,28 +12,22 @@ CONFLICTS+=		Mesa<3.2.1
 
 USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
+BUILD_DIRS=		${WRKSRC}/src-glu
 
 .include "../../mk/bsd.prefs.mk"
 
 # Check if we got libGLU distributed with XFree86 4.x.
-.if exists(${X11BASE}/include/GL/glu.h)
+.if exists(${X11BASE}/include/GL/glu.h) && \
+    exists(${X11BASE}/lib/X11/config/X11.tmpl)
 _IS_BUILTIN_GLU!=	${EGREP} -c BuildGLULibrary ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE}
 .else
 _IS_BUILTIN_GLU=	0
 .endif
 
-.if ${_IS_BUILTIN_GLU} != "0"
+.if (${X11PREFIX} == ${X11BASE}) && (${_IS_BUILTIN_GLU} != "0")
 IGNORE=		"GLU has already been installed as part of XFree86-4.x"
 .endif
 
-do-build:
-	cd ${WRKSRC}/src-glu && ${SETENV} ${MAKE_ENV} \
-	${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET}
-
-do-install:
-	cd ${WRKSRC}/src-glu && ${SETENV} ${MAKE_ENV} \
-	${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET}
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/GL
 	cd ${WRKSRC}/include/GL; for hdr in				\
@@ -42,4 +36,5 @@ post-install:
 		${INSTALL_DATA} $${hdr} ${PREFIX}/include/GL;		\
 	done
 
+.include "../../graphics/MesaLib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3