1 files changed, 7 insertions, 51 deletions
diff --git a/pkgtools/x11-links/builtin.mk b/pkgtools/x11-links/builtin.mk
index d46a19f35fc..10d8241067d 100644
--- a/pkgtools/x11-links/builtin.mk
+++ b/pkgtools/x11-links/builtin.mk
@@ -1,53 +1,9 @@
-# $NetBSD: builtin.mk,v 1.6 2005/03/05 18:16:21 wiz Exp $
+# $NetBSD: builtin.mk,v 1.7 2005/06/01 18:03:08 jlam Exp $
 
-.if !defined(XF86_VERSION)
-.  if 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
-.  else
-_X11_CONFIG_VERSION_DEF=	${X11BASE}/lib/X11/config/version.def
-XF86_VERSION=	3.3
-.    if !exists(${_X11_CONFIG_VERSION_DEF})
-XF86_VERSION=	0
-.    else
-_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	# xorg
-BUILDLINK_VARS+=	XF86_VERSION
-.endif
+BUILTIN_PKG:=	x11-links
+.include "../../mk/buildlink3/bsd.builtin.mk"
 
-USE_BUILTIN.x11-links?=	no
+.if !defined(USE_BUILTIN.x11-links)
+USE_BUILTIN.x11-links=	no
+.endif
+MAKEVARS+=	USE_BUILTIN.x11-links