Link in to native X.Org the following packages:

  libFS and libXScrnSaver

For libXScrnSaver, there is a catch.  Previously, the code assumed its
presence from the fact that X11_TYPE was native.  I'm changing that to
provide a builtin.mk file.  This essentially means that the "native X.Org"
functionality of pkgsrc requires said native X.Org to provide the
necessary pkg-config files.  Expect more change of that kind.

6 files changed, 22 insertions, 10 deletions

diff --git a/pkgtools/x11-links/files/xorg.libFS b/pkgtools/x11-links/files/xorg.libFS
new file mode 100644
index 00000000000..aa1db5b5811
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libFS
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.libFS,v 1.1.2.1 2008/09/17 20:46:48 cube Exp $
+#
+lib/pkgconfig/libfs.pc
diff --git a/pkgtools/x11-links/files/xorg.libXScrnSaver b/pkgtools/x11-links/files/xorg.libXScrnSaver
new file mode 100644
index 00000000000..d95d7e5ff88
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXScrnSaver
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.libXScrnSaver,v 1.1.2.1 2008/09/17 20:46:48 cube Exp $
+#
+lib/pkgconfig/xscrnsaver.pc
diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk
index 649cd714b65..96e55662319 100644
--- a/pkgtools/x11-links/xorg.mk
+++ b/pkgtools/x11-links/xorg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.mk,v 1.9.8.12 2008/09/17 18:31:02 cube Exp $
+# $NetBSD: xorg.mk,v 1.9.8.13 2008/09/17 20:46:48 cube Exp $
 #
 # This is for X.org, but use "xfree" files also.
 
@@ -21,9 +21,11 @@ FILES_LIST=	${FILESDIR}/xorg
 .include "../../x11/fontsproto/buildlink3.mk"
 .include "../../x11/glproto/buildlink3.mk"
 .include "../../x11/inputproto/buildlink3.mk"
+.include "../../x11/libFS/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/x11/libFS/builtin.mk b/x11/libFS/builtin.mk
new file mode 100644
index 00000000000..8dc0f005bc1
--- /dev/null
+++ b/x11/libFS/builtin.mk
@@ -0,0 +1,6 @@
+# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 20:46:48 cube Exp $
+
+BUILTIN_PKG:=	libFS
+PKGCONFIG_FILE.libFS=	${X11BASE}/lib/pkgconfig/libfs.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
diff --git a/x11/libXScrnSaver/buildlink3.mk b/x11/libXScrnSaver/buildlink3.mk
index 3dcc72ff227..c4a657ec588 100644
--- a/x11/libXScrnSaver/buildlink3.mk
+++ b/x11/libXScrnSaver/buildlink3.mk
@@ -1,10 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/12/27 12:23:15 joerg Exp $
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-.if ${X11_TYPE} != "modular"
-.include "../../mk/x11.buildlink3.mk"
-.else
+# $NetBSD: buildlink3.mk,v 1.1.1.1.18.1 2008/09/17 20:46:48 cube Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXSCRNSAVER_BUILDLINK3_MK:=	${LIBXSCRNSAVER_BUILDLINK3_MK}+
@@ -27,5 +21,3 @@ BUILDLINK_PKGSRCDIR.libXScrnSaver?=	../../x11/libXScrnSaver
 .include "../../x11/scrnsaverproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
-
-.endif
diff --git a/x11/libXScrnSaver/builtin.mk b/x11/libXScrnSaver/builtin.mk
new file mode 100644
index 00000000000..492918009e9
--- /dev/null
+++ b/x11/libXScrnSaver/builtin.mk
@@ -0,0 +1,6 @@
+# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 20:46:48 cube Exp $
+
+BUILTIN_PKG:=	libXScrnSaver
+PKGCONFIG_FILE.libXScrnSaver=	${X11BASE}/lib/pkgconfig/xscrnsaver.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"