Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/graphics/MesaLib/builtin.mk,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/graphics/MesaLib/builtin.mk,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.5
retrieving revision 1.14.22.1
diff -u -p -r1.5 -r1.14.22.1
--- pkgsrc/graphics/MesaLib/builtin.mk	2005/06/01 18:02:54	1.5
+++ pkgsrc/graphics/MesaLib/builtin.mk	2008/09/26 19:59:46	1.14.22.1
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2005/06/01 18:02:54 jlam Exp $
+# $NetBSD: builtin.mk,v 1.14.22.1 2008/09/26 19:59:46 cube Exp $
 
 BUILTIN_PKG:=	MesaLib
 
@@ -13,16 +13,10 @@ BUILTIN_FIND_FILES.H_MESALIB=	${X11BASE}
 ###
 .if !defined(IS_BUILTIN.MesaLib)
 IS_BUILTIN.MesaLib=	no
-.  if exists(${H_MESALIB})
-PKGSRC_USE_TOOLS+=	imake			# XXX
-IMAKE?=			${X11BASE}/bin/imake	# XXX
-.    if defined(IMAKE) && exists(${IMAKE})
-IS_BUILTIN.MesaLib!=							\
-	${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config		\
-		-f ${BUILDLINK_PKGSRCDIR.MesaLib}/builtin-imake.mk	\
-		-s - |							\
-	${MAKE} -f - builtin-test
-.    endif
+.  if empty(H_MESALIB:M__nonexistent__)
+BUILTIN_IMAKE_CHECK:=	MesaLib:BuildGLXLibrary
+.    include "../../mk/buildlink3/imake-check.mk"
+IS_BUILTIN.MesaLib=	${BUILTIN_IMAKE_CHECK.MesaLib}
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.MesaLib
@@ -33,7 +27,7 @@ MAKEVARS+=	IS_BUILTIN.MesaLib
 ###
 .if !defined(BUILTIN_PKG.MesaLib) && \
     !empty(IS_BUILTIN.MesaLib:M[yY][eE][sS]) && \
-    exists(${H_MESALIB})
+    empty(H_MESALIB:M__nonexistent__)
 .  include "../../graphics/Mesa/version.mk"
 BUILTIN_PKG.MesaLib=	MesaLib-${BUILTIN_VERSION.Mesa}
 .endif
@@ -51,10 +45,10 @@ USE_BUILTIN.MesaLib=	${IS_BUILTIN.MesaLi
 .    if defined(BUILTIN_PKG.MesaLib) && \
         !empty(IS_BUILTIN.MesaLib:M[yY][eE][sS])
 USE_BUILTIN.MesaLib=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.MesaLib}
+.      for dep in ${BUILDLINK_API_DEPENDS.MesaLib}
 .        if !empty(USE_BUILTIN.MesaLib:M[yY][eE][sS])
 USE_BUILTIN.MesaLib!=							\
-	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.MesaLib:Q}; then \
+	if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.MesaLib:Q}; then \
 		${ECHO} yes;						\
 	else								\
 		${ECHO} no;						\
@@ -74,15 +68,14 @@ CHECK_BUILTIN.MesaLib?=	no
 .if !empty(CHECK_BUILTIN.MesaLib:M[nN][oO])
 
 .  if !empty(USE_BUILTIN.MesaLib:M[nN][oO])
-BUILDLINK_DEPENDS.MesaLib+=	MesaLib>=6.0
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+.    include "../../mk/pthread.buildlink3.mk"
+.    include "../../mk/pthread.builtin.mk"
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
 .  endif
 
-.  if !empty(USE_BUILTIN.MesaLib:M[yY][eE][sS])
-BUILDLINK_PREFIX.MesaLib=	${X11BASE}
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-.    include "../../mk/x11.buildlink3.mk"
-.    include "../../mk/x11.builtin.mk"
+.  include "../../mk/x11.builtin.mk"
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
-.  endif
 
 .endif	# CHECK_BUILTIN.MesaLib