Builtinify libXv, and make sure x11-links knows about xv.pc. Bump version

of x11-links.

7 files changed, 28 insertions, 22 deletions

diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index 2458ec0f2fc..fb0c89b0eb2 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.95 2008/10/05 21:37:39 cube Exp $
+# $NetBSD: Makefile,v 1.96 2008/10/29 21:14:01 cube Exp $
 #
 # NOTE:	If you update this package, then you'll likely need to also update
 #	the x11-links dependency in buildlink3.mk to the correct version,
 #	usually the most recent.
 
-DISTNAME=	x11-links-0.39
+DISTNAME=	x11-links-0.40
 CATEGORIES=	pkgtools x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk
index f2509b15825..65c0937e482 100644
--- a/pkgtools/x11-links/buildlink3.mk
+++ b/pkgtools/x11-links/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2008/10/05 21:37:39 cube Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2008/10/29 21:14:01 cube Exp $
 #
 # Don't include this file manually!  It will be included as necessary
 # by bsd.buildlink3.mk.
@@ -18,7 +18,7 @@ BUILDLINK_PACKAGES:=	x11-links ${BUILDLINK_PACKAGES}
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}x11-links
 
 .if !empty(X11_LINKS_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=0.39
+BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=0.40
 BUILDLINK_PKGSRCDIR.x11-links?=	../../pkgtools/x11-links
 BUILDLINK_DEPMETHOD.x11-links?=	build
 
diff --git a/pkgtools/x11-links/files/xorg b/pkgtools/x11-links/files/xorg
index 3cfa3b2ee42..7deb55a694d 100644
--- a/pkgtools/x11-links/files/xorg
+++ b/pkgtools/x11-links/files/xorg
@@ -1,4 +1,4 @@
-# $NetBSD: xorg,v 1.9 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg,v 1.10 2008/10/29 21:14:01 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
@@ -253,7 +253,6 @@ include/X11/extensions/Xevie.h
 include/X11/extensions/Xeviestr.h
 include/X11/extensions/Xinerama.h
 include/X11/extensions/XvMClib.h
-include/X11/extensions/Xvlib.h
 include/X11/extensions/damageproto.h
 include/X11/extensions/damagewire.h
 include/X11/extensions/dmxext.h
@@ -432,14 +431,6 @@ lib/libXtst.dylib
 lib/libXtst.so
 lib/libXtst.so.6
 lib/libXtst.so.6.1
-lib/libXv.1.0.0.dylib
-lib/libXv.1.0.dylib
-lib/libXv.1.dylib
-lib/libXv.a
-lib/libXv.dylib
-lib/libXv.so
-lib/libXv.so.1
-lib/libXv.so.1.0
 lib/libXvMC.1.0.0.dylib
 lib/libXvMC.1.dylib
 lib/libXvMC.dylib
diff --git a/pkgtools/x11-links/files/xorg.libXv b/pkgtools/x11-links/files/xorg.libXv
new file mode 100644
index 00000000000..f10730c3c9c
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXv
@@ -0,0 +1,12 @@
+# $NetBSD: xorg.libXv,v 1.1 2008/10/29 21:14:01 cube Exp $
+#
+include/X11/extensions/Xvlib.h
+lib/libXv.1.0.0.dylib
+lib/libXv.1.0.dylib
+lib/libXv.1.dylib
+lib/libXv.a
+lib/libXv.dylib
+lib/libXv.so
+lib/libXv.so.1
+lib/libXv.so.1.0
+lib/pkgconfig/xv.pc
diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk
index 0afdce272ac..7010655ef23 100644
--- a/pkgtools/x11-links/xorg.mk
+++ b/pkgtools/x11-links/xorg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.mk,v 1.11 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.mk,v 1.12 2008/10/29 21:14:01 cube Exp $
 #
 # This is for X.org, but use "xfree" files also.
 
@@ -45,6 +45,7 @@ FILES_LIST=	${FILESDIR}/xorg
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libXres/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libXv/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
 .include "../../x11/liblbxutil/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
diff --git a/x11/libXv/buildlink3.mk b/x11/libXv/buildlink3.mk
index 12560c28704..50a0ddf5c4e 100644
--- a/x11/libXv/buildlink3.mk
+++ b/x11/libXv/buildlink3.mk
@@ -1,11 +1,7 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/11/06 14:04:51 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2008/10/29 21:14:01 cube Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${X11_TYPE} != "modular"
-.include "../../mk/x11.buildlink3.mk"
-.else
-
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBXV_BUILDLINK3_MK:=	${LIBXV_BUILDLINK3_MK}+
 
@@ -29,5 +25,3 @@ BUILDLINK_PKGSRCDIR.libXv?=	../../x11/libXv
 .include "../../x11/xproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
-
-.endif
diff --git a/x11/libXv/builtin.mk b/x11/libXv/builtin.mk
new file mode 100644
index 00000000000..e250d6ca2be
--- /dev/null
+++ b/x11/libXv/builtin.mk
@@ -0,0 +1,8 @@
+# $NetBSD: builtin.mk,v 1.1 2008/10/29 21:14:01 cube Exp $
+
+BUILTIN_PKG:=	libXv
+PKGCONFIG_FILE.libXv=	${X11BASE}/lib/pkgconfig/xv.pc \
+				${X11BASE}/lib/libXv.so
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"