Rework libXdamage support in native X11:

  - provide a builtin.mk files instead of using x11.buildlink3.mk
  - split files into a package-specific file
  - update list of files for native X.Org.

5 files changed, 23 insertions, 17 deletions

diff --git a/pkgtools/x11-links/files/xorg b/pkgtools/x11-links/files/xorg
index 53f1726ff66..05f6c03f99e 100644
--- a/pkgtools/x11-links/files/xorg
+++ b/pkgtools/x11-links/files/xorg
@@ -1,4 +1,4 @@
-# $NetBSD: xorg,v 1.7 2008/08/22 13:34:39 tron Exp $
+# $NetBSD: xorg,v 1.7.2.1 2008/09/21 17:04:13 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
@@ -250,7 +250,6 @@ include/X11/extensions/XKM.h
 include/X11/extensions/XKMformat.h
 include/X11/extensions/XRes.h
 include/X11/extensions/XResproto.h
-include/X11/extensions/Xdamage.h
 include/X11/extensions/Xevie.h
 include/X11/extensions/Xeviestr.h
 include/X11/extensions/Xinerama.h
@@ -362,11 +361,6 @@ lib/libXaw.so.6.1
 lib/libXaw.so.7
 lib/libXaw.so.7.0
 lib/libXaw.so.8.0
-lib/libXdamage.1.0.0.dylib
-lib/libXdamage.1.dylib
-lib/libXdamage.dylib
-lib/libXdamage.a
-lib/libXdamage.so.1.0
 lib/libXevie.1.0.0.dylib
 lib/libXevie.1.dylib
 lib/libXevie.dylib
@@ -530,5 +524,4 @@ lib/libxkbui.a
 lib/libxkbui.so
 lib/libxkbui.so.1
 lib/libxkbui.so.1.0
-lib/pkgconfig/xdamage.pc
 lib/pkgconfig/xevie.pc
diff --git a/pkgtools/x11-links/files/xorg.libXdamage b/pkgtools/x11-links/files/xorg.libXdamage
new file mode 100644
index 00000000000..280b637ba39
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXdamage
@@ -0,0 +1,12 @@
+# $NetBSD: xorg.libXdamage,v 1.1.2.1 2008/09/21 17:04:13 cube Exp $
+#
+include/X11/extensions/Xdamage.h
+lib/libXdamage.1.0.0.dylib
+lib/libXdamage.1.dylib
+lib/libXdamage.a
+lib/libXdamage.dylib
+lib/libXdamage.so
+lib/libXdamage.so.1
+lib/libXdamage.so.1.0
+lib/libXdamage.so.1.1
+lib/pkgconfig/xdamage.pc
diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk
index 5a29df3e196..22c9e92c69b 100644
--- a/pkgtools/x11-links/xorg.mk
+++ b/pkgtools/x11-links/xorg.mk
@@ -1,10 +1,9 @@
-# $NetBSD: xorg.mk,v 1.9.8.18 2008/09/18 19:30:37 cube Exp $
+# $NetBSD: xorg.mk,v 1.9.8.19 2008/09/21 17:04:13 cube Exp $
 #
 # This is for X.org, but use "xfree" files also.
 
 FILES_LIST=	${FILESDIR}/xorg
 
-# libXdamage and damageext only in pkgsrc-wip so not used here
 # XXX: what about xaw?
 
 .include "../../fonts/fontconfig/buildlink3.mk"
@@ -31,6 +30,7 @@ FILES_LIST=	${FILESDIR}/xorg
 .include "../../x11/libXau/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXdamage/buildlink3.mk"
 .include "../../x11/libXdmcp/buildlink3.mk"
 .include "../../x11/libXevie/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/x11/libXdamage/buildlink3.mk b/x11/libXdamage/buildlink3.mk
index 655f48b8459..c059164079f 100644
--- a/x11/libXdamage/buildlink3.mk
+++ b/x11/libXdamage/buildlink3.mk
@@ -1,11 +1,7 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/12/17 23:02:25 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2.18.1 2008/09/21 17:04:13 cube Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${X11_TYPE} != "modular"
-.include "../../mk/x11.buildlink3.mk"
-.else
-
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXDAMAGE_BUILDLINK3_MK:=	${LIBXDAMAGE_BUILDLINK3_MK}+
 
@@ -28,5 +24,3 @@ BUILDLINK_PKGSRCDIR.libXdamage?=	../../x11/libXdamage
 .include "../../x11/xproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
-
-.endif
diff --git a/x11/libXdamage/builtin.mk b/x11/libXdamage/builtin.mk
new file mode 100644
index 00000000000..5835d6717b6
--- /dev/null
+++ b/x11/libXdamage/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/21 17:04:13 cube Exp $
+
+BUILTIN_PKG:=	libXdamage
+PKGCONFIG_FILE.libXdamage=	${X11BASE}/lib/pkgconfig/xdamage.pc \
+				${X11BASE}/lib/libXdamage.so
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"