Massive cleanup of buildlink3.mk and builtin.mk files in pkgsrc.

Several changes are involved since they are all interrelated.  These
changes affect about 1000 files.

The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk.  bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files.  Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred.  This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.

The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages.  Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc.  This modification is a nod toward LOCALBASE=/usr.  The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.

The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc.  The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.

The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files.  Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories.  These files are used as input
to imake since imake can't use stdin for that purpose.

The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead.  This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed.  Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries.  Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.

15 files changed, 202 insertions, 171 deletions

diff --git a/fonts/XFree86-fontserver/Makefile b/fonts/XFree86-fontserver/Makefile
index 68990b0a9ff..f0f1693a30e 100644
--- a/fonts/XFree86-fontserver/Makefile
+++ b/fonts/XFree86-fontserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:47 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:48 jlam Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	XFree86-fontserver-${XF_VER}
@@ -12,7 +12,6 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.xfree86.org/
 COMMENT=	XFree86 font server
 
-USE_X11=		yes
 DISTINFO_FILE=		${.CURDIR}/../../x11/XFree86-libs/distinfo
 PATCHDIR=		${.CURDIR}/../../x11/XFree86-libs/patches
 
@@ -22,4 +21,5 @@ XINSTALL_MAN_DIRS=	programs/xfs
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../meta-pkgs/XFree86/Makefile.common"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile
index 652ab30c755..892ee8f3b7e 100644
--- a/fonts/Xft2/Makefile
+++ b/fonts/Xft2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/05/22 22:06:28 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2005/06/01 18:02:48 jlam Exp $
 
 DISTNAME=	libXft-2.1.6
 PKGNAME=	Xft2-2.1.6
@@ -15,7 +15,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-USE_X11=		YES
 USE_TOOLS+=		gmake
 
 PKGCONFIG_OVERRIDE=	xft.pc.in
diff --git a/fonts/Xft2/builtin-imake.mk b/fonts/Xft2/builtin-imake.mk
new file mode 100644
index 00000000000..173c5fbd0a4
--- /dev/null
+++ b/fonts/Xft2/builtin-imake.mk
@@ -0,0 +1,12 @@
+XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:02:48 jlam Exp $
+
+/*
+ * Check the value of BuildXftLibrary for the presence of
+ * Xft2 in the X11 distribution.
+ */
+builtin-test:
+#if BuildXftLibrary
+	@echo yes
+#else
+	@echo no
+#endif
diff --git a/fonts/Xft2/builtin.mk b/fonts/Xft2/builtin.mk
index a3054887996..d60ecbb5c12 100644
--- a/fonts/Xft2/builtin.mk
+++ b/fonts/Xft2/builtin.mk
@@ -1,130 +1,110 @@
-# $NetBSD: builtin.mk,v 1.6 2005/03/01 18:56:43 xtraeme Exp $
+# $NetBSD: builtin.mk,v 1.7 2005/06/01 18:02:48 jlam Exp $
 
-_X11_TMPL=	${X11BASE}/lib/X11/config/X11.tmpl
+BUILTIN_PKG:=	Xft2
 
+BUILTIN_FIND_FILES_VAR:=	H_XFT2
+BUILTIN_FIND_FILES.H_XFT2=	${X11BASE}/include/X11/Xft.h
+
+.include "../../mk/buildlink3/bsd.builtin.mk"
+
+###
+### Determine if there is a built-in implementation of the package and
+### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
+###
 .if !defined(IS_BUILTIN.Xft2)
 IS_BUILTIN.Xft2=	no
-.  if exists(${_X11_TMPL})
+.  if exists(${H_XFT2})
+PKGSRC_USE_TOOLS+=	imake			# XXX
+IMAKE?=			${X11BASE}/bin/imake	# XXX
+.    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.Xft2!=							\
-	if ${GREP} -q BuildXftLibrary ${_X11_TMPL}; then		\
-		${ECHO} "yes";						\
-	else								\
-		${ECHO} "no";						\
-	fi
-.    if !empty(IS_BUILTIN.Xft2:M[yY][eE][sS])
-#
-# Create an appropriate package name for the built-in Xft2 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.
-#
-# Xft2 doesn't provide a method of discovering the version number of
-# the software.  Match up Xft2 versions with XFree86 versions for an
-# approximate determination of the Xft2 version.
-#
-_XFT2_VERSIONS=	2.1.2  2.1.1  2.1.0
-_XFT2_2.1.0=	4.2.99.* 4.3 4.3.[0-9] 4.3.[0-9].* 4.3.[1-8][0-9]* 4.3.9[0-8]*
-_XFT2_2.1.0+=	4.3.99.* 4.[4-9]* 4.[1-9][0-9]*
-.      if !defined(XF86_VERSION)
-XF86_VERSION=	3.3
-.        if exists(${X11BASE}/lib/X11/config/xorgversion.def)
-_X11_CONFIG_VERSION_DEF=	${X11BASE}/lib/X11/config/xorgversion.def
-.        elif exists(${X11BASE}/lib/X11/config/xorg.cf)
-_X11_CONFIG_VERSION_DEF=        ${X11BASE}/lib/X11/config/xorg.cf
-_XORG_MAJOR!=	\
-	${AWK} '/\#define[ 	]*XORG_VERSION_MAJOR/ { print $$3 }'	\
-		${_X11_CONFIG_VERSION_DEF}
-_XORG_MINOR!=	\
-	${AWK} '/\#define[ 	]*XORG_VERSION_MINOR/ { print $$3 }'	\
-		${_X11_CONFIG_VERSION_DEF}
-_XORG_PATCH!=	\
-	${AWK} '/\#define[ 	]*XORG_VERSION_PATCH/ { print $$3 }'	\
-		${_X11_CONFIG_VERSION_DEF}
-_XORG_SNAP!=	\
-	${AWK} '/\#define[ 	]*XORG_VERSION_SNAP/ { print $$3 }'	\
-		${_X11_CONFIG_VERSION_DEF}
-_XORG_TEENY=	${_XORG_PATCH}.${_XORG_SNAP}
-.          if !empty(_XORG_TEENY:M0.0)
-XF86_VERSION=	4.4
-.          else
-XF86_VERSION=	4.4.${_XORG_TEENY}
-.          endif
-.        elif exists(${X11BASE}/lib/X11/config/version.def)
-_X11_CONFIG_VERSION_DEF=	${X11BASE}/lib/X11/config/version.def
-_XF86_MAJOR!=	\
-	${AWK} '/\#define[ 	]*XF86_VERSION_MAJOR/ { print $$3 }'	\
-		${_X11_CONFIG_VERSION_DEF}
-_XF86_MINOR!=	\
-	${AWK} '/\#define[ 	]*XF86_VERSION_MINOR/ { print $$3 }'	\
-		${_X11_CONFIG_VERSION_DEF}
-_XF86_PATCH!=	\
-	${AWK} '/\#define[ 	]*XF86_VERSION_PATCH/ { print $$3 }'	\
-		${_X11_CONFIG_VERSION_DEF}
-_XF86_SNAP!=	\
-	${AWK} '/\#define[ 	]*XF86_VERSION_SNAP/ { print $$3 }'	\
-		${_X11_CONFIG_VERSION_DEF}
-_XF86_TEENY=	${_XF86_PATCH}.${_XF86_SNAP}
-.          if !empty(_XF86_TEENY:M0.0)
-XF86_VERSION=	${_XF86_MAJOR}.${_XF86_MINOR}
-.          else
-XF86_VERSION=	${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY}
-.          endif
-.        endif
-.      endif	# defined(XF86_VERSION)
-BUILDLINK_VARS+=	XF86_VERSION
-.      for _xrender_version_ in ${_XFT2_VERSIONS}
-.        for _pattern_ in ${_XFT2_${_xrender_version_}}
-.          if !empty(XF86_VERSION:M${_pattern_})
-_XFT2_VERSION?=	${_xrender_version_}
-.          endif
-.        endfor
-.      endfor
-_XFT2_VERSION?=		0.0
-BUILTIN_PKG.Xft2=	Xft2-${_XFT2_VERSION}
-BUILDLINK_VARS+=	BUILTIN_PKG.Xft2
+	${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config		\
+		-f ${BUILDLINK_PKGSRCDIR.Xft2}/builtin-imake.mk		\
+		-s - |							\
+	${MAKE} -f - builtin-test
 .    endif
 .  endif
-BUILDLINK_VARS+=	IS_BUILTIN.Xft2
-.endif	# IS_BUILTIN.Xft2
+.endif
+MAKEVARS+=	IS_BUILTIN.Xft2
 
-.if defined(USE_BUILTIN.fontconfig) && !empty(USE_BUILTIN.fontconfig:M[nN][oO])
-USE_BUILTIN.Xft2=	no
+###
+### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
+### a package name to represent the built-in package.
+###
+.if !defined(BUILTIN_PKG.Xft2) && \
+    !empty(IS_BUILTIN.Xft2:M[yY][eE][sS]) && \
+    exists(${H_XFT2})
+#
+# Extract the version number from the header file, but if it's not
+# there, then pretend it's from version 2.0.
+#
+BUILTIN_VERSION.Xft2!=							\
+	${AWK} 'BEGIN { M = 2; m = ".0"; r = "" }			\
+		/\#define[ 	]*XFT_MAJOR/ { M = $$3 }		\
+		/\#define[ 	]*XFT_MINOR/ { m = "."$$3 }		\
+		/\#define[ 	]*XFT_REVISION/ { r = "."$$3 }		\
+		END { printf "%s%s%s\n", M, m, r }'			\
+		${H_XFT2}
+BUILTIN_PKG.Xft2=	Xft2-${BUILTIN_VERSION.Xft2}
 .endif
+MAKEVARS+=	BUILTIN_PKG.Xft2
+
+###
+### Determine whether we should use the built-in implementation if it
+### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
+###
+#
+# These are dependencies of Xft2.  If we need to use the pkgsrc
+# versions of any of these, then also use the pkgsrc version of
+# Xft2.
+#
 .if defined(USE_BUILTIN.Xrender) && !empty(USE_BUILTIN.Xrender:M[nN][oO])
 USE_BUILTIN.Xft2=	no
 .endif
+.if defined(USE_BUILTIN.fontconfig) && !empty(USE_BUILTIN.fontconfig:M[nN][oO])
+USE_BUILTIN.Xft2=	no
+.endif
 
 .if !defined(USE_BUILTIN.Xft2)
-USE_BUILTIN.Xft2?=	${IS_BUILTIN.Xft2}
-
-.  if defined(BUILTIN_PKG.Xft2)
+.  if ${PREFER.Xft2} == "pkgsrc"
+USE_BUILTIN.Xft2=	no
+.  else
+USE_BUILTIN.Xft2=	${IS_BUILTIN.Xft2}
+.    if defined(BUILTIN_PKG.Xft2) && \
+        !empty(IS_BUILTIN.Xft2:M[yY][eE][sS])
 USE_BUILTIN.Xft2=	yes
-.    for _depend_ in ${BUILDLINK_DEPENDS.Xft2}
-.      if !empty(USE_BUILTIN.Xft2:M[yY][eE][sS])
-USE_BUILTIN.Xft2!=	\
-	if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.Xft2}; then	\
-		${ECHO} "yes";						\
+.      for _dep_ in ${BUILDLINK_DEPENDS.Xft2}
+.        if !empty(USE_BUILTIN.Xft2:M[yY][eE][sS])
+USE_BUILTIN.Xft2!=							\
+	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xft2:Q}; then	\
+		${ECHO} yes;						\
 	else								\
-		${ECHO} "no";						\
+		${ECHO} no;						\
 	fi
-.      endif
-.    endfor
-.  endif
-.endif	# USE_BUILTIN.Xft2
+.        endif
+.      endfor
+.    endif
+.  endif  # PREFER.Xft2
+.endif
+MAKEVARS+=	USE_BUILTIN.Xft2
 
+###
+### The section below only applies if we are not including this file
+### solely to determine whether a built-in implementation exists.
+###
 CHECK_BUILTIN.Xft2?=	no
 .if !empty(CHECK_BUILTIN.Xft2:M[nN][oO])
 
-.if !empty(USE_BUILTIN.Xft2:M[nN][oO])
-BUILDLINK_DEPENDS.Xft2+=	Xft2>=2.1nb1
-.endif
+.  if !empty(USE_BUILTIN.Xft2:M[nN][oO])
+BUILDLINK_DEPENDS.Xft2+=	Xft2>=2.1nb2
+.  endif
 
-.if !empty(USE_BUILTIN.Xft2:M[yY][eE][sS])
+.  if !empty(USE_BUILTIN.Xft2:M[yY][eE][sS])
 BUILDLINK_PREFIX.Xft2=	${X11BASE}
-BUILDLINK_FILES.Xft2+=	lib/pkgconfig/xft.pc
+BUILDLINK_FILES.Xft2+=	lib/pkgconfig/Xft2.pc
 
 USE_BUILTIN.Xrender=	yes
 USE_BUILTIN.fontconfig=	yes
-.endif
+.  endif
 
 .endif	# CHECK_BUILTIN.Xft2
diff --git a/fonts/fontconfig/builtin-imake.mk b/fonts/fontconfig/builtin-imake.mk
new file mode 100644
index 00000000000..0698c062e62
--- /dev/null
+++ b/fonts/fontconfig/builtin-imake.mk
@@ -0,0 +1,12 @@
+XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:02:48 jlam Exp $
+
+/*
+ * Check the value of BuildFontconfigLibrary for the presence of
+ * fontconfig in the X11 distribution.
+ */
+builtin-test:
+#if BuildFontconfigLibrary
+	@echo yes
+#else
+	@echo no
+#endif
diff --git a/fonts/fontconfig/builtin.mk b/fonts/fontconfig/builtin.mk
index b8184f41ea8..150f0d5c698 100644
--- a/fonts/fontconfig/builtin.mk
+++ b/fonts/fontconfig/builtin.mk
@@ -1,42 +1,59 @@
-# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:30 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:02:48 jlam Exp $
 
-_FONTCONFIG_FONTCONFIG_H=	${X11BASE}/include/fontconfig/fontconfig.h
-_X11_TMPL=			${X11BASE}/lib/X11/config/X11.tmpl
+BUILTIN_PKG:=	fontconfig
 
+BUILTIN_FIND_FILES_VAR:=		H_FONTCONFIG
+BUILTIN_FIND_FILES.H_FONTCONFIG=	\
+	${X11BASE}/include/fontconfig/fontconfig.h
+
+.include "../../mk/buildlink3/bsd.builtin.mk"
+
+###
+### Determine if there is a built-in implementation of the package and
+### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
+###
 .if !defined(IS_BUILTIN.fontconfig)
 IS_BUILTIN.fontconfig=	no
-.  if exists(${_FONTCONFIG_FONTCONFIG_H}) && exists(${_X11_TMPL})
+.  if exists(${H_FONTCONFIG})
+PKGSRC_USE_TOOLS+=	imake			# XXX
+IMAKE?=			${X11BASE}/bin/imake	# XXX
+.    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.fontconfig!=							\
-	if ${GREP} -q BuildFontconfigLibrary ${_X11_TMPL}; then		\
-		${ECHO} "yes";						\
-	else								\
-		${ECHO} "no";						\
-	fi
-.    if !empty(IS_BUILTIN.fontconfig:M[yY][eE][sS])
-#
-# Create an appropriate package name for the built-in fontconfig 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.
-#
-_FONTCONFIG_MAJOR!=	\
-	${AWK} '/\#define[ 	]*FC_MAJOR/ { print $$3 }'		\
-		${_FONTCONFIG_FONTCONFIG_H}
-_FONTCONFIG_MINOR!=	\
-	${AWK} '/\#define[ 	]*FC_MINOR/ { print $$3 }'		\
-		${_FONTCONFIG_FONTCONFIG_H}
-_FONTCONFIG_REVISION!=	\
-	${AWK} '/\#define[ 	]*FC_REVISION/ { print $$3 }'		\
-		${_FONTCONFIG_FONTCONFIG_H}
-_FONTCONFIG_VERSION=	\
-	${_FONTCONFIG_MAJOR}.${_FONTCONFIG_MINOR}.${_FONTCONFIG_REVISION}
-BUILTIN_PKG.fontconfig=	fontconfig-${_FONTCONFIG_VERSION}
-BUILDLINK_VARS+=	BUILTIN_PKG.fontconfig
+	${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config		\
+		-f ${BUILDLINK_PKGSRCDIR.fontconfig}/builtin-imake.mk	\
+		-s - |							\
+	${MAKE} -f - builtin-test
 .    endif
 .  endif
-BUILDLINK_VARS+=	IS_BUILTIN.fontconfig
-.endif	# IS_BUILTIN.fontconfig
+.endif
+MAKEVARS+=	IS_BUILTIN.fontconfig
 
+###
+### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
+### a package name to represent the built-in package.
+###
+.if !defined(BUILTIN_PKG.fontconfig) && \
+    !empty(IS_BUILTIN.fontconfig:M[yY][eE][sS]) && \
+    exists(${H_FONTCONFIG})
+BUILTIN_VERSION.fontconfig!=						\
+	${AWK} '/\#define[ 	]*FC_MAJOR/ { M = $$3 }			\
+		/\#define[ 	]*FC_MINOR/ { m = "."$$3 }		\
+		/\#define[ 	]*FC_REVISION/ { r = "."$$3 }		\
+		END { printf "%s%s%s\n", M, m, r }'			\
+		${H_FONTCONFIG}
+BUILTIN_PKG.fontconfig=	fontconfig-${BUILTIN_VERSION.fontconfig}
+.endif
+MAKEVARS+=	BUILTIN_PKG.fontconfig
+
+###
+### Determine whether we should use the built-in implementation if it
+### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
+###
+#
+# These are dependencies of fontconfig.  If we need to use the pkgsrc
+# versions of any of these, then also use the pkgsrc version of
+# fontconfig.
+#
 .if defined(USE_BUILTIN.zlib) && !empty(USE_BUILTIN.zlib:M[nN][oO])
 USE_BUILTIN.fontconfig=	no
 .endif
@@ -48,38 +65,47 @@ USE_BUILTIN.fontconfig=	no
 .endif
 
 .if !defined(USE_BUILTIN.fontconfig)
-USE_BUILTIN.fontconfig?=	${IS_BUILTIN.fontconfig}
-
-.  if defined(BUILTIN_PKG.fontconfig)
-USE_BUILTIN.fontconfig=		yes
-.    for _depend_ in ${BUILDLINK_DEPENDS.fontconfig}
-.      if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS])
-USE_BUILTIN.fontconfig!=	\
-	if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.fontconfig}; then \
-		${ECHO} "yes";						\
+.  if ${PREFER.fontconfig} == "pkgsrc"
+USE_BUILTIN.fontconfig=	no
+.  else
+USE_BUILTIN.fontconfig=	${IS_BUILTIN.fontconfig}
+.    if defined(BUILTIN_PKG.fontconfig) && \
+        !empty(IS_BUILTIN.fontconfig:M[yY][eE][sS])
+USE_BUILTIN.fontconfig=	yes
+.      for _dep_ in ${BUILDLINK_DEPENDS.fontconfig}
+.        if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS])
+USE_BUILTIN.fontconfig!=						\
+	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.fontconfig:Q}; then \
+		${ECHO} yes;						\
 	else								\
-		${ECHO} "no";						\
+		${ECHO} no;						\
 	fi
-.      endif
-.    endfor
-.  endif
-.endif	# USE_BUILTIN.fontconfig
+.        endif
+.      endfor
+.    endif
+.  endif  # PREFER.fontconfig
+.endif
+MAKEVARS+=	USE_BUILTIN.fontconfig
 
+###
+### The section below only applies if we are not including this file
+### solely to determine whether a built-in implementation exists.
+###
 CHECK_BUILTIN.fontconfig?=	no
 .if !empty(CHECK_BUILTIN.fontconfig:M[nN][oO])
 
-.if !empty(USE_BUILTIN.fontconfig:M[nN][oO])
+.  if !empty(USE_BUILTIN.fontconfig:M[nN][oO])
 BUILDLINK_DEPENDS.fontconfig+=	fontconfig>=2.1nb2
 BUILDLINK_DEPENDS.freetype2+=	freetype2>=2.1.3
-.endif
+.  endif
 
-.if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS])
+.  if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS])
 BUILDLINK_PREFIX.fontconfig=	${X11BASE}
 BUILDLINK_FILES.fontconfig+=	lib/pkgconfig/fontconfig.pc
 
 USE_BUILTIN.expat=	yes
 USE_BUILTIN.freetype2=	yes
 USE_BUILTIN.zlib=	yes
-.endif
+.  endif
 
 .endif	# CHECK_BUILTIN.fontconfig
diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index c1956cc4e4d..76d4c05914d 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/23 08:39:50 adam Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:48 jlam Exp $
 
 DISTNAME=	fontforge_full-${VERSION}
 PKGNAME=	fontforge-${VERSION}
@@ -14,7 +14,6 @@ VERSION=	20050502
 
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-freetype-src=no
 WRKSRC=			${WRKDIR}/fontforge-${VERSION}
@@ -26,5 +25,6 @@ WRKSRC=			${WRKDIR}/fontforge-${VERSION}
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile
index 955a5f5be11..46a34e1b78f 100644
--- a/fonts/gucharmap/Makefile
+++ b/fonts/gucharmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/05/22 20:07:59 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/06/01 18:02:48 jlam Exp $
 #
 
 DISTNAME=	gucharmap-1.4.3
@@ -16,7 +16,6 @@ USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE+=    gucharmap.pc.in
diff --git a/fonts/intlfonts/Makefile b/fonts/intlfonts/Makefile
index 49dd90b5105..c87ac07a13a 100644
--- a/fonts/intlfonts/Makefile
+++ b/fonts/intlfonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/07/28 15:07:37 tron Exp $
+# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:49 jlam Exp $
 
 DISTNAME=	intlfonts-1.2.1
 PKGREVISION=	2
@@ -50,6 +50,8 @@ CONFIGURE_ARGS+=--with-fontdir=${PREFIX}/lib/X11/fonts/intlfonts \
 FONT_SETS+=	${EXTRA_FONTS}
 PLIST_SRC=	${WRKDIR}/PLIST
 
+.include "../../mk/x11.buildlink3.mk"
+
 # the order may look strange, but we need to make "@dirrm" the last item.
 post-patch:
 	${CAT} ${PKGDIR}/PLIST.extrafonts ${PKGDIR}/PLIST > ${PLIST_SRC}
diff --git a/fonts/ja-shinonome/Makefile b/fonts/ja-shinonome/Makefile
index 4cf932756ce..dde21cdeab4 100644
--- a/fonts/ja-shinonome/Makefile
+++ b/fonts/ja-shinonome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:00 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:49 jlam Exp $
 #
 
 DISTNAME=		shinonome-0.9.10-src
@@ -31,6 +31,8 @@ CONFIGURE_ARGS+=	--with-fontdir=${FONTDIR}
 CONFIGURE_ARGS+=	--disable-progressbar
 CONFIGURE_ARGS+=	--with-foundry=${FOUNDRY}
 
+.include "../../mk/x11.buildlink3.mk"
+
 do-install:
 	cd ${WRKSRC}; \
 	${MAKE_PROGRAM} install; \
diff --git a/fonts/t1lib/Makefile b/fonts/t1lib/Makefile
index 568e4a07386..00753d9adbe 100644
--- a/fonts/t1lib/Makefile
+++ b/fonts/t1lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:00 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/06/01 18:02:49 jlam Exp $
 #
 
 DISTNAME=	t1lib-5.0.2
@@ -16,7 +16,6 @@ USE_PKGINSTALL=		YES
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-USE_X11=		YES
 
 BUILD_TARGET=	without_doc
 
@@ -26,6 +25,8 @@ DATADIR=	${PREFIX}/share/${PKGBASE}
 CONF_FILES=	${EGDIR}/t1lib.config.sample ${DATADIR}/t1lib.config
 CONF_FILES+=	${EGDIR}/FontDataBase ${DATADIR}/FontDataBase
 
+.include "../../mk/x11.buildlink3.mk"
+
 pre-build:
 	${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM}
 
diff --git a/fonts/ttmkfdir2/Makefile b/fonts/ttmkfdir2/Makefile
index 0d14a69bf7c..4cd4e59f3ee 100644
--- a/fonts/ttmkfdir2/Makefile
+++ b/fonts/ttmkfdir2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:00 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:49 jlam Exp $
 #
 
 DISTNAME=	ttmkfdir2.20021109
@@ -20,7 +20,7 @@ USE_TOOLS+=	gmake lex
 USE_LANGUAGES=	c c++
 
 MAKE_ENV+=	FREETYPE_CONFIG=${FREETYPE_CONFIG}
-LDFLAGS+=	${LIBGETOPT}
+LDFLAGS+=	${BUILDLINK_LDADD.getopt}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ttmkfdir ${PREFIX}/bin
diff --git a/fonts/vfontcap-kochi/Makefile b/fonts/vfontcap-kochi/Makefile
index 54a87f08537..c1931a7ba02 100644
--- a/fonts/vfontcap-kochi/Makefile
+++ b/fonts/vfontcap-kochi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/25 20:37:03 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:49 jlam Exp $
 
 DISTNAME=		vfontcap-kochi-0.0
 PKGREVISION=		1
@@ -16,7 +16,6 @@ WRKSRC=			${WRKDIR}
 EXTRACT_ONLY=		# empty
 NO_CHECKSUM=		YES
 NO_BUILD=		YES
-USE_X11=		YES # kochi font defines this as well.
 
 USE_PKGINSTALL=		YES
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
diff --git a/fonts/xmbdfed/Makefile b/fonts/xmbdfed/Makefile
index a9a28b213cc..66ff15c5c4c 100644
--- a/fonts/xmbdfed/Makefile
+++ b/fonts/xmbdfed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:48 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:49 jlam Exp $
 
 DISTNAME=	xmbdfed-4.5
 PKGREVISION=	#
@@ -17,5 +17,4 @@ do-install:
 
 .include "../../graphics/freetype-lib/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/xorg-fontserver/Makefile b/fonts/xorg-fontserver/Makefile
index 3e87d5600f8..efc8b2a2ca4 100644
--- a/fonts/xorg-fontserver/Makefile
+++ b/fonts/xorg-fontserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:48 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:49 jlam Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	xorg-fontserver-${XORG_VER}
@@ -11,7 +11,6 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.x.org/
 COMMENT=	X.org font server
 
-USE_X11=		yes
 DISTINFO_FILE=		${.CURDIR}/../../x11/xorg-libs/distinfo
 PATCHDIR=		${.CURDIR}/../../x11/xorg-libs/patches
 
@@ -21,4 +20,5 @@ XINSTALL_MAN_DIRS=	programs/xfs
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../meta-pkgs/xorg/Makefile.common"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"