[pkgsrc/trunk]: pkgsrc Builtinify libXv, and make sure x11-links knows about ...

[cube <cube%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/25d92a2b7e8c
branches:  trunk
changeset: 549216:25d92a2b7e8c
user:      cube <cube%pkgsrc.org@localhost>
date:      Wed Oct 29 21:14:01 2008 +0000

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

diffstat:

 pkgtools/x11-links/Makefile         |   4 ++--
 pkgtools/x11-links/buildlink3.mk    |   4 ++--
 pkgtools/x11-links/files/xorg       |  11 +----------
 pkgtools/x11-links/files/xorg.libXv |  12 ++++++++++++
 pkgtools/x11-links/xorg.mk          |   3 ++-
 x11/libXv/buildlink3.mk             |   8 +-------
 x11/libXv/builtin.mk                |   8 ++++++++
 7 files changed, 28 insertions(+), 22 deletions(-)

diffs (133 lines):

diff -r fb3be1c6591e -r 25d92a2b7e8c pkgtools/x11-links/Makefile
--- a/pkgtools/x11-links/Makefile       Wed Oct 29 21:03:11 2008 +0000
+++ b/pkgtools/x11-links/Makefile       Wed Oct 29 21:14:01 2008 +0000
@@ -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 -r fb3be1c6591e -r 25d92a2b7e8c pkgtools/x11-links/buildlink3.mk
--- a/pkgtools/x11-links/buildlink3.mk  Wed Oct 29 21:03:11 2008 +0000
+++ b/pkgtools/x11-links/buildlink3.mk  Wed Oct 29 21:14:01 2008 +0000
@@ -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_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 -r fb3be1c6591e -r 25d92a2b7e8c pkgtools/x11-links/files/xorg
--- a/pkgtools/x11-links/files/xorg     Wed Oct 29 21:03:11 2008 +0000
+++ b/pkgtools/x11-links/files/xorg     Wed Oct 29 21:14:01 2008 +0000
@@ -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/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.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 -r fb3be1c6591e -r 25d92a2b7e8c pkgtools/x11-links/files/xorg.libXv
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/x11-links/files/xorg.libXv       Wed Oct 29 21:14:01 2008 +0000
@@ -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 -r fb3be1c6591e -r 25d92a2b7e8c pkgtools/x11-links/xorg.mk
--- a/pkgtools/x11-links/xorg.mk        Wed Oct 29 21:03:11 2008 +0000
+++ b/pkgtools/x11-links/xorg.mk        Wed Oct 29 21:14:01 2008 +0000
@@ -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 @@
 .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 -r fb3be1c6591e -r 25d92a2b7e8c x11/libXv/buildlink3.mk
--- a/x11/libXv/buildlink3.mk   Wed Oct 29 21:03:11 2008 +0000
+++ b/x11/libXv/buildlink3.mk   Wed Oct 29 21:14:01 2008 +0000
@@ -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 @@
 .include "../../x11/xproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
-
-.endif
diff -r fb3be1c6591e -r 25d92a2b7e8c x11/libXv/builtin.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/libXv/builtin.mk      Wed Oct 29 21:14:01 2008 +0000
@@ -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"