Split out the code that deals with checking whether the software is

built-in or not into a separate builtin.mk file.  The code to deal
checking for built-in software is much simpler to deal with in pkgsrc.

The buildlink3.mk file for a package will be of the usual format
regardless of the package, which makes it simpler for packagers to
update a package.

The builtin.mk file for a package must define a single yes/no variable
USE_BUILTIN.<pkg> that is used by bsd.buildlink3.mk to decide whether
to use the built-in software or to use the pkgsrc software.

2 files changed, 79 insertions, 95 deletions

diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk
index 308b3a7c7ba..aa7d3027cfd 100644
--- a/x11/xcursor/buildlink3.mk
+++ b/x11/xcursor/buildlink3.mk
@@ -1,110 +1,26 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/02/19 19:12:26 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2004/03/10 17:57:15 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XCURSOR_BUILDLINK3_MK:=	${XCURSOR_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xcursor
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxcursor}
+BUILDLINK_PACKAGES+=	xcursor
 
 .if !empty(XCURSOR_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		xcursor
 BUILDLINK_DEPENDS.xcursor+=	xcursor>=1.0
 BUILDLINK_PKGSRCDIR.xcursor?=	../../x11/xcursor
-.endif	# XCURSOR_BUILDLINK3_MK
-
-BUILDLINK_CHECK_BUILTIN.xcursor?=	NO
 
-_X11_XCURSOR_XCURSOR_H=	${X11BASE}/include/X11/Xcursor/Xcursor.h
-
-.if !defined(BUILDLINK_IS_BUILTIN.xcursor)
-BUILDLINK_IS_BUILTIN.xcursor=	NO
-.  if exists(${_X11_XCURSOR_XCURSOR_H})
-BUILDLINK_IS_BUILTIN.xcursor=	YES
-.    if !empty(BUILDLINK_CHECK_BUILTIN.xcursor:M[nN][oO])
-#
-# Create an appropriate package name for the built-in Xcursor distributed
-# with the system.  This package name can be used to check against
-# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc version
-# or if the built-in one is sufficient.
-#
-_XCURSOR_MAJOR!=	\
-	${AWK} '/\#define[ 	]*XCURSOR_MAJOR/ { print $$3 }'		\
-		${_X11_XCURSOR_XCURSOR_H}
-_XCURSOR_MINOR!=	\
-	${AWK} '/\#define[ 	]*XCURSOR_MINOR/ { print "."$$3 }'	\
-		${_X11_XCURSOR_XCURSOR_H}
-_XCURSOR_REVISION!=	\
-	${AWK} '/\#define[ 	]*XCURSOR_MINOR/ { print "."$$3 }'	\
-		${_X11_XCURSOR_XCURSOR_H}
-_XCURSOR_VERSION=	${_XCURSOR_MAJOR}${_XCURSOR_MINOR}${_XCURSOR_REVISION}
-_XCURSOR_PKG=	xcursor-${_XCURSOR_VERSION}
-
-BUILDLINK_IS_BUILTIN.xcursor?=	YES
-.      for _depend_ in ${BUILDLINK_DEPENDS.xcursor}
-.        if !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS])
-BUILDLINK_IS_BUILTIN.xcursor!=		\
-	if ${PKG_ADMIN} pmatch '${_depend_}' ${_XCURSOR_PKG}; then	\
-		${ECHO} "YES";						\
-	else								\
-		${ECHO} "NO";						\
-	fi
-.        endif
-.      endfor
-.    endif
-.  endif
-MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.xcursor=${BUILDLINK_IS_BUILTIN.xcursor}
-.endif
-
-.if !empty(BUILDLINK_CHECK_BUILTIN.xcursor:M[yY][eE][sS])
-BUILDLINK_USE_BUILTIN.xcursor=	YES
-.endif
-
-.if !defined(BUILDLINK_USE_BUILTIN.xcursor)
-.  if !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS])
-BUILDLINK_USE_BUILTIN.xcursor=	YES
-.  else
-BUILDLINK_USE_BUILTIN.xcursor=	NO
-.  endif
+USE_X11=	yes
 
-.  if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
-      !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS])
-BUILDLINK_USE_BUILTIN.xcursor=	YES
-.  endif
-.  if !empty(PREFER_PKGSRC:M[yY][eE][sS])
-BUILDLINK_USE_BUILTIN.xcursor=	NO
-.  endif
-.  if !empty(PREFER_NATIVE:Mxcursor) && \
-      !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS])
-BUILDLINK_USE_BUILTIN.xcursor=	YES
-.  endif
-.  if !empty(PREFER_PKGSRC:Mxcursor)
-BUILDLINK_USE_BUILTIN.xcursor=	NO
-.  endif
-.endif
+# Xfixes/buildlink3.mk is included by xcursor/builtin.mk
+#.include "../../x11/Xfixes/buildlink3.mk"
 
-.if !empty(BUILDLINK_USE_BUILTIN.xcursor:M[nN][oO])
-BUILDLINK_DEPENDS.xcursor+=	xcursor>=1.1.1
-BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
-.  if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	xcursor
-.  endif
-.endif
+.include "../../x11/Xrender/buildlink3.mk"
 
-.if !empty(BUILDLINK_USE_BUILTIN.xcursor:M[yY][eE][sS])
-BUILDLINK_USE_BUILTIN.Xrender=	yes
-.endif
-
-.if !empty(XCURSOR_BUILDLINK3_MK:M+)
-.  if !empty(BUILDLINK_USE_BUILTIN.xcursor:M[yY][eE][sS])
-BUILDLINK_PREFIX.xcursor=	${X11BASE}
-BUILDLINK_FILES.xcursor+=	lib/pkgconfig/xcursor.pc
-.  endif
-USE_X11=	yes
-.  if !empty(BUILDLINK_CHECK_BUILTIN.xcursor:M[nN][oO])
-.    if !empty(BUILDLINK_USE_BUILTIN.xcursor:M[nN][oO])
-.      include "../../x11/Xfixes/buildlink3.mk"
-.    endif
-.    include "../../x11/Xrender/buildlink3.mk"
-.  endif
 .endif	# XCURSOR_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xcursor/builtin.mk b/x11/xcursor/builtin.mk
new file mode 100644
index 00000000000..817c2d7c25b
--- /dev/null
+++ b/x11/xcursor/builtin.mk
@@ -0,0 +1,68 @@
+# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:15 jlam Exp $
+
+_X11_XCURSOR_XCURSOR_H=	${X11BASE}/include/X11/Xcursor/Xcursor.h
+
+.if !defined(IS_BUILTIN.xcursor)
+IS_BUILTIN.xcursor=	no
+.  if exists(${_X11_XCURSOR_XCURSOR_H})
+IS_BUILTIN.xcursor=	yes
+#
+# Create an appropriate package name for the built-in Xcursor distributed
+# with the system.  This package name can be used to check against
+# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc version
+# or if the built-in one is sufficient.
+#
+_XCURSOR_MAJOR!=	\
+	${AWK} '/\#define[ 	]*XCURSOR_MAJOR/ { print $$3 }'		\
+		${_X11_XCURSOR_XCURSOR_H}
+_XCURSOR_MINOR!=	\
+	${AWK} '/\#define[ 	]*XCURSOR_MINOR/ { print "."$$3 }'	\
+		${_X11_XCURSOR_XCURSOR_H}
+_XCURSOR_REVISION!=	\
+	${AWK} '/\#define[ 	]*XCURSOR_MINOR/ { print "."$$3 }'	\
+		${_X11_XCURSOR_XCURSOR_H}
+_XCURSOR_VERSION=	${_XCURSOR_MAJOR}${_XCURSOR_MINOR}${_XCURSOR_REVISION}
+BUILTIN_PKG.xcursor=	xcursor-${_XCURSOR_VERSION}
+MAKEFLAGS+=		BUILTIN_PKG.xcursor=${BUILTIN_PKG.xcursor}
+.  endif
+MAKEFLAGS+=	IS_BUILTIN.xcursor=${IS_BUILTIN.xcursor}
+.endif
+
+CHECK_BUILTIN.xcursor?=	no
+.if !empty(CHECK_BUILTIN.xcursor:M[yY][eE][sS])
+USE_BUILTIN.xcursor=	yes
+.endif
+
+.if !defined(USE_BUILTIN.xcursor)
+USE_BUILTIN.xcursor?=	${IS_BUILTIN.xcursor}
+
+.  if defined(BUILTIN_PKG.xcursor)
+USE_BUILTIN.xcursor=	yes
+.    for _depend_ in ${BUILDLINK_DEPENDS.xcursor}
+.      if !empty(USE_BUILTIN.xcursor:M[yY][eE][sS])
+USE_BUILTIN.xcursor!=	\
+	if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.xcursor}; then \
+		${ECHO} "yes";						\
+	else								\
+		${ECHO} "no";						\
+	fi
+.      endif
+.    endfor
+.  endif
+.endif	# USE_BUILTIN.xcursor
+
+.if !empty(USE_BUILTIN.xcursor:M[nN][oO])
+BUILDLINK_DEPENDS.xcursor+=	xcursor>=1.1.1
+BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
+.  for _mkfile_ in buildlink3.mk builtin.mk
+.    if exists(../../x11/Xfixes/${_mkfile_})
+.      include "../../x11/Xfixes/${_mkfile_}"
+.    endif
+.  endfor
+.endif
+
+.if !empty(USE_BUILTIN.xcursor:M[yY][eE][sS])
+BUILDLINK_PREFIX.xcursor=	${X11BASE}
+BUILDLINK_FILES.xcursor+=	lib/pkgconfig/xcursor.pc
+USE_BUILTIN.Xrender=		yes
+.endif