Make sure libfontenc, libdrm, libXfont, libXprintUtil and liblbxutil are

handled in native X.Org.

11 files changed, 80 insertions, 1 deletions

diff --git a/fonts/libfontenc/builtin.mk b/fonts/libfontenc/builtin.mk
new file mode 100644
index 00000000000..f14230c083f
--- /dev/null
+++ b/fonts/libfontenc/builtin.mk
@@ -0,0 +1,6 @@
+# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $
+
+BUILTIN_PKG:=	libfontenc
+PKGCONFIG_FILE.libfontenc=	${X11BASE}/lib/pkgconfig/fontenc.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
diff --git a/pkgtools/x11-links/files/xorg.libXfont b/pkgtools/x11-links/files/xorg.libXfont
new file mode 100644
index 00000000000..941be939a46
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXfont
@@ -0,0 +1,20 @@
+# $NetBSD: xorg.libXfont,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $
+#
+include/X11/fonts/bdfint.h
+include/X11/fonts/bitmap.h
+include/X11/fonts/bufio.h
+include/X11/fonts/fntfil.h
+include/X11/fonts/fntfilio.h
+include/X11/fonts/fntfilst.h
+include/X11/fonts/fontconf.h
+include/X11/fonts/fontencc.h
+include/X11/fonts/fontmisc.h
+include/X11/fonts/fontmod.h
+include/X11/fonts/fontshow.h
+include/X11/fonts/fontutil.h
+include/X11/fonts/fontxlfd.h
+include/X11/fonts/ft.h
+include/X11/fonts/ftfuncs.h
+include/X11/fonts/pcf.h
+lib/libXfont.so.1.4.1
+lib/pkgconfig/xfont.pc
diff --git a/pkgtools/x11-links/files/xorg.libXprintUtil b/pkgtools/x11-links/files/xorg.libXprintUtil
new file mode 100644
index 00000000000..7dad3848a55
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXprintUtil
@@ -0,0 +1,6 @@
+# $NetBSD: xorg.libXprintUtil,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $
+#
+lib/libXprintUtil.so
+lib/libXprintUtil.so.1
+lib/libXprintUtil.so.1.0.0
+lib/pkgconfig/xprintutil.pc
diff --git a/pkgtools/x11-links/files/xorg.libdrm b/pkgtools/x11-links/files/xorg.libdrm
new file mode 100644
index 00000000000..a31ec018cef
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libdrm
@@ -0,0 +1,9 @@
+# $NetBSD: xorg.libdrm,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $
+#
+include/X11/xf86drm.h
+include/X11/xf86mm.h
+lib/libdrm.a
+lib/libdrm.so
+lib/libdrm.so.2
+lib/libdrm.so.2.3
+lib/pkgconfig/libdrm.pc
diff --git a/pkgtools/x11-links/files/xorg.libfontenc b/pkgtools/x11-links/files/xorg.libfontenc
new file mode 100644
index 00000000000..27faa3a7c7c
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libfontenc
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.libfontenc,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $
+#
+lib/pkgconfig/fontenc.pc
diff --git a/pkgtools/x11-links/files/xorg.liblbxutil b/pkgtools/x11-links/files/xorg.liblbxutil
new file mode 100644
index 00000000000..ead7352c51e
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.liblbxutil
@@ -0,0 +1,6 @@
+# $NetBSD: xorg.liblbxutil,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $
+#
+lib/liblbxutil.so
+lib/liblbxutil.so.1
+lib/liblbxutil.so.1.0
+lib/pkgconfig/lbxutil.pc
diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk
index 4ad4d508776..22e109dc1ff 100644
--- a/pkgtools/x11-links/xorg.mk
+++ b/pkgtools/x11-links/xorg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.mk,v 1.9.8.16 2008/09/18 03:09:51 cube Exp $
+# $NetBSD: xorg.mk,v 1.9.8.17 2008/09/18 17:33:27 cube Exp $
 #
 # This is for X.org, but use "xfree" files also.
 
@@ -8,6 +8,7 @@ FILES_LIST=	${FILESDIR}/xorg
 # XXX: what about xaw?
 
 .include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../fonts/libfontenc/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
@@ -34,13 +35,17 @@ FILES_LIST=	${FILESDIR}/xorg
 .include "../../x11/libXevie/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
+.include "../../x11/libXfont/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXprintUtil/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libdrm/buildlink3.mk"
+.include "../../x11/liblbxutil/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
 .include "../../x11/printproto/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
diff --git a/x11/libXfont/builtin.mk b/x11/libXfont/builtin.mk
new file mode 100644
index 00000000000..dd7e245b4a0
--- /dev/null
+++ b/x11/libXfont/builtin.mk
@@ -0,0 +1,6 @@
+# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $
+
+BUILTIN_PKG:=	libXfont
+PKGCONFIG_FILE.libXfont=	${X11BASE}/lib/pkgconfig/xfont.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
diff --git a/x11/libXprintUtil/builtin.mk b/x11/libXprintUtil/builtin.mk
new file mode 100644
index 00000000000..4e0ca209031
--- /dev/null
+++ b/x11/libXprintUtil/builtin.mk
@@ -0,0 +1,6 @@
+# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $
+
+BUILTIN_PKG:=	libXprintUtil
+PKGCONFIG_FILE.libXprintUtil=	${X11BASE}/lib/pkgconfig/xprintutil.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
diff --git a/x11/libdrm/builtin.mk b/x11/libdrm/builtin.mk
new file mode 100644
index 00000000000..2ffda43fa66
--- /dev/null
+++ b/x11/libdrm/builtin.mk
@@ -0,0 +1,6 @@
+# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $
+
+BUILTIN_PKG:=	libdrm
+PKGCONFIG_FILE.libdrm=	${X11BASE}/lib/pkgconfig/libdrm.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
diff --git a/x11/liblbxutil/builtin.mk b/x11/liblbxutil/builtin.mk
new file mode 100644
index 00000000000..3343a557347
--- /dev/null
+++ b/x11/liblbxutil/builtin.mk
@@ -0,0 +1,6 @@
+# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $
+
+BUILTIN_PKG:=	liblbxutil
+PKGCONFIG_FILE.liblbxutil=	${X11BASE}/lib/pkgconfig/lbxutil.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"