Builtinify libXtst.

5 files changed, 22 insertions, 18 deletions

diff --git a/pkgtools/x11-links/files/xorg b/pkgtools/x11-links/files/xorg
index 7deb55a694d..9c04a996092 100644
--- a/pkgtools/x11-links/files/xorg
+++ b/pkgtools/x11-links/files/xorg
@@ -1,4 +1,4 @@
-# $NetBSD: xorg,v 1.10 2008/10/29 21:14:01 cube Exp $
+# $NetBSD: xorg,v 1.11 2008/12/04 04:16:41 cube Exp $
 #
 # The files listed below are the union of the sets of files installed by
 # the supported Xorg (and some XFree) distributions, minus the set of files
@@ -423,14 +423,6 @@ lib/libXss.a
 lib/libXss.so
 lib/libXss.so.1
 lib/libXss.so.1.0
-lib/libXtst.6.1.0.dylib
-lib/libXtst.6.1.dylib
-lib/libXtst.6.dylib
-lib/libXtst.a
-lib/libXtst.dylib
-lib/libXtst.so
-lib/libXtst.so.6
-lib/libXtst.so.6.1
 lib/libXvMC.1.0.0.dylib
 lib/libXvMC.1.dylib
 lib/libXvMC.dylib
diff --git a/pkgtools/x11-links/files/xorg.libXtst b/pkgtools/x11-links/files/xorg.libXtst
new file mode 100644
index 00000000000..0c65f4c3815
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXtst
@@ -0,0 +1,10 @@
+# $NetBSD: xorg.libXtst,v 1.1 2008/12/04 04:16:41 cube Exp $
+lib/libXtst.6.1.0.dylib
+lib/libXtst.6.1.dylib
+lib/libXtst.6.dylib
+lib/libXtst.a
+lib/libXtst.dylib
+lib/libXtst.so
+lib/libXtst.so.6
+lib/libXtst.so.6.1
+lib/pkgconfig/xtst.pc
diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk
index c391e1d4cd6..9600b1917a0 100644
--- a/pkgtools/x11-links/xorg.mk
+++ b/pkgtools/x11-links/xorg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.mk,v 1.13 2008/11/11 16:19:23 cube Exp $
+# $NetBSD: xorg.mk,v 1.14 2008/12/04 04:16:41 cube Exp $
 #
 # This is for X.org, but use "xfree" files also.
 
@@ -46,6 +46,7 @@ FILES_LIST=	${FILESDIR}/xorg
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libXres/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
 .include "../../x11/liblbxutil/buildlink3.mk"
diff --git a/x11/libXtst/buildlink3.mk b/x11/libXtst/buildlink3.mk
index 906d740dc3a..9ce27c56382 100644
--- a/x11/libXtst/buildlink3.mk
+++ b/x11/libXtst/buildlink3.mk
@@ -1,12 +1,7 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/12/17 18:05:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2008/12/04 04:16:41 cube Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${X11_TYPE} != "modular"
-.include "../../mk/x11.buildlink3.mk"
-.else
-
-
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBXTST_BUILDLINK3_MK:=	${LIBXTST_BUILDLINK3_MK}+
 
@@ -28,5 +23,3 @@ BUILDLINK_PKGSRCDIR.libXtst?=	../../x11/libXtst
 .include "../../x11/libXext/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
-
-.endif
diff --git a/x11/libXtst/builtin.mk b/x11/libXtst/builtin.mk
new file mode 100644
index 00000000000..cd8751dff82
--- /dev/null
+++ b/x11/libXtst/builtin.mk
@@ -0,0 +1,8 @@
+# $NetBSD: builtin.mk,v 1.1 2008/12/04 04:16:41 cube Exp $
+
+BUILTIN_PKG:=	libXtst
+PKGCONFIG_FILE.libXtst=	${X11BASE}/lib/pkgconfig/xtst.pc \
+				${X11BASE}/lib/libXtst.so
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"