pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/x11-links Update x11-links to 0.69.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/100518b9d1ff
branches:  trunk
changeset: 602229:100518b9d1ff
user:      obache <obache%pkgsrc.org@localhost>
date:      Sun Apr 08 05:55:48 2012 +0000

description:
Update x11-links to 0.69.

* Move some MesaLib files from files/xorg to files/xfree.MesaLib,
  or unwanted MesaLib may be buildlinked (and result in build failure).
* Add some files from OpenBSD-5.0.

diffstat:

 pkgtools/x11-links/Makefile                |   4 ++--
 pkgtools/x11-links/buildlink3.mk           |   4 ++--
 pkgtools/x11-links/files/xfree.MesaLib     |  14 +++++++++++++-
 pkgtools/x11-links/files/xorg              |  23 +++++++----------------
 pkgtools/x11-links/files/xorg.Xcomposite   |   3 ++-
 pkgtools/x11-links/files/xorg.Xfixes       |   3 ++-
 pkgtools/x11-links/files/xorg.fontconfig   |   3 ++-
 pkgtools/x11-links/files/xorg.freetype2    |   3 ++-
 pkgtools/x11-links/files/xorg.libX11       |   4 +++-
 pkgtools/x11-links/files/xorg.libXdamage   |   3 ++-
 pkgtools/x11-links/files/xorg.libXevie     |   3 ++-
 pkgtools/x11-links/files/xorg.libXext      |   3 ++-
 pkgtools/x11-links/files/xorg.libXfont     |   3 ++-
 pkgtools/x11-links/files/xorg.libXpm       |   3 ++-
 pkgtools/x11-links/files/xorg.libXres      |   3 ++-
 pkgtools/x11-links/files/xorg.libXtst      |   3 ++-
 pkgtools/x11-links/files/xorg.libXv        |   3 ++-
 pkgtools/x11-links/files/xorg.libdrm       |   5 ++++-
 pkgtools/x11-links/files/xorg.liblbxutil   |   3 ++-
 pkgtools/x11-links/files/xorg.libxcb       |   6 +++++-
 pkgtools/x11-links/files/xorg.pixman       |   3 ++-
 pkgtools/x11-links/files/xorg.xcb-util     |   3 ++-
 pkgtools/x11-links/files/xorg.xf86dgaproto |   4 +++-
 23 files changed, 69 insertions(+), 40 deletions(-)

diffs (truncated from 497 to 300 lines):

diff -r af10d7d823f7 -r 100518b9d1ff pkgtools/x11-links/Makefile
--- a/pkgtools/x11-links/Makefile       Sun Apr 08 05:47:30 2012 +0000
+++ b/pkgtools/x11-links/Makefile       Sun Apr 08 05:55:48 2012 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.130 2011/09/21 14:58:37 joerg Exp $
+# $NetBSD: Makefile,v 1.131 2012/04/08 05:55:48 obache 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.68
+DISTNAME=      x11-links-0.69
 CATEGORIES=    pkgtools x11
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r af10d7d823f7 -r 100518b9d1ff pkgtools/x11-links/buildlink3.mk
--- a/pkgtools/x11-links/buildlink3.mk  Sun Apr 08 05:47:30 2012 +0000
+++ b/pkgtools/x11-links/buildlink3.mk  Sun Apr 08 05:55:48 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.41 2012/01/01 14:41:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.42 2012/04/08 05:55:48 obache Exp $
 #
 # Don't include this file manually!  It will be included as necessary
 # by bsd.buildlink3.mk.
@@ -12,7 +12,7 @@
 .if !defined(X11_LINKS_BUILDLINK3_MK)
 X11_LINKS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.x11-links+=      x11-links>=0.66
+BUILDLINK_API_DEPENDS.x11-links+=      x11-links>=0.69
 BUILDLINK_PKGSRCDIR.x11-links?=        ../../pkgtools/x11-links
 BUILDLINK_DEPMETHOD.x11-links?=        build
 
diff -r af10d7d823f7 -r 100518b9d1ff pkgtools/x11-links/files/xfree.MesaLib
--- a/pkgtools/x11-links/files/xfree.MesaLib    Sun Apr 08 05:47:30 2012 +0000
+++ b/pkgtools/x11-links/files/xfree.MesaLib    Sun Apr 08 05:55:48 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xfree.MesaLib,v 1.6 2010/05/31 21:20:02 wiz Exp $
+# $NetBSD: xfree.MesaLib,v 1.7 2012/04/08 05:55:48 obache Exp $
 #
 include/GL/GLwDrawA.h
 include/GL/GLwDrawAP.h
@@ -23,6 +23,11 @@
 lib/libGL.so.1
 lib/libGL.so.1.0.2
 lib/libGL.so.1.2
+lib/libGL.so.2
+lib/libGL.so.2.0
+lib/libGL.so.9.0
+lib/libGL.so.9.1
+lib/libGL.so.10.0
 lib/libGL.dylib
 lib/libGL.1.dylib
 lib/libGL.1.2.dylib
@@ -30,6 +35,9 @@
 lib/libGLw.so
 lib/libGLw.so.1
 lib/libGLw.so.1.0
+lib/libGLw.so.2
+lib/libGLw.so.2.0
+lib/libGLw.so.5.1
 lib/libGLw.dylib
 lib/libGLw.1.dylib
 lib/libGLw.1.0.dylib
@@ -39,8 +47,12 @@
 lib/libOSMesa.so.4.0
 lib/libOSMesa.so.6
 lib/libOSMesa.so.6.5.3
+lib/libOSMesa.so.7
+lib/libOSMesa.so.7.0
 lib/libOSMesa.dylib
 lib/libOSMesa.4.dylib
 lib/libOSMesa.4.0.dylib
+lib/libOSMesa.7.8.dylib
+lib/libOSMesa.7.dylib
 lib/pkgconfig/gl.pc
 lib/pkgconfig/glw.pc
diff -r af10d7d823f7 -r 100518b9d1ff pkgtools/x11-links/files/xorg
--- a/pkgtools/x11-links/files/xorg     Sun Apr 08 05:47:30 2012 +0000
+++ b/pkgtools/x11-links/files/xorg     Sun Apr 08 05:55:48 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xorg,v 1.19 2011/09/09 09:08:07 abs Exp $
+# $NetBSD: xorg,v 1.20 2012/04/08 05:55:48 obache 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
@@ -290,21 +290,6 @@
 lib/libFS.so.7.0
 lib/libFS.so.8.0
 lib/libFS.so.9.0
-lib/libGL.1.2.dylib
-lib/libGL.1.dylib
-lib/libGL.dylib
-lib/libGL.so.2
-lib/libGL.so.2.0
-lib/libGL.so.9.0
-lib/libGL.so.9.1
-lib/libGLw.so.2
-lib/libGLw.so.2.0
-lib/libGLw.so.5.1
-lib/libOSMesa.7.8.dylib
-lib/libOSMesa.7.dylib
-lib/libOSMesa.dylib
-lib/libOSMesa.so.7
-lib/libOSMesa.so.7.0
 lib/libPEX5.6.0.dylib
 lib/libPEX5.6.dylib
 lib/libPEX5.a
@@ -350,6 +335,7 @@
 lib/libXaw7.so.10
 lib/libXaw7.so.10.0
 lib/libXaw7.so.12.0
+lib/libXaw7.so.14.0
 lib/libXaw7.7.0.0.dylib
 lib/libXaw7.7.dylib
 lib/libXaw8.a
@@ -370,6 +356,7 @@
 lib/libXaw.so.8
 lib/libXaw.so.8.0
 lib/libXaw.so.13.0
+lib/libXaw.so.14.0
 lib/libXaw6.6.dylib
 lib/libXaw7.7.dylib
 lib/libXaw8.8.dylib
@@ -413,6 +400,7 @@
 lib/libXi.so.7
 lib/libXi.so.7.0
 lib/libXi.so.10.1
+lib/libXi.so.11.0
 lib/libXp.6.2.0.dylib
 lib/libXp.6.2.dylib
 lib/libXp.6.dylib
@@ -540,6 +528,8 @@
 lib/libpsres.so
 lib/libpsres.so.1
 lib/libpsres.so.1.0
+lib/libpthread-stubs.a
+lib/libpthread-stubs.so.1.0
 lib/libxf86config.a
 lib/libxkbfile.1.0.2.dylib
 lib/libxkbfile.1.dylib
@@ -553,6 +543,7 @@
 lib/libxkbfile.so.2
 lib/libxkbfile.so.2.0
 lib/libxkbfile.so.4.0
+lib/libxkbfile.so.5.0
 lib/libxkbui.1.0.0.dylib
 lib/libxkbui.1.dylib
 lib/libxkbui.dylib
diff -r af10d7d823f7 -r 100518b9d1ff pkgtools/x11-links/files/xorg.Xcomposite
--- a/pkgtools/x11-links/files/xorg.Xcomposite  Sun Apr 08 05:47:30 2012 +0000
+++ b/pkgtools/x11-links/files/xorg.Xcomposite  Sun Apr 08 05:55:48 2012 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: xorg.Xcomposite,v 1.5 2010/02/18 12:32:19 obache Exp $
+# $NetBSD: xorg.Xcomposite,v 1.6 2012/04/08 05:55:48 obache Exp $
 include/X11/extensions/Xcomposite.h
 lib/libXcomposite.1.0.0.dylib
 lib/libXcomposite.1.dylib
 lib/libXcomposite.dylib
+lib/libXcomposite.la
 lib/libXcomposite.so
 lib/libXcomposite.so.1
 lib/libXcomposite.so.1.0
diff -r af10d7d823f7 -r 100518b9d1ff pkgtools/x11-links/files/xorg.Xfixes
--- a/pkgtools/x11-links/files/xorg.Xfixes      Sun Apr 08 05:47:30 2012 +0000
+++ b/pkgtools/x11-links/files/xorg.Xfixes      Sun Apr 08 05:55:48 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.Xfixes,v 1.5 2010/02/18 12:32:19 obache Exp $
+# $NetBSD: xorg.Xfixes,v 1.6 2012/04/08 05:55:48 obache Exp $
 #
 include/X11/extensions/Xfixes.h
 lib/libXfixes.3.1.0.dylib
@@ -13,4 +13,5 @@
 lib/libXfixes.so.4
 lib/libXfixes.so.4.0
 lib/libXfixes.so.5.0
+lib/libXfixes.so.5.1
 lib/pkgconfig/xfixes.pc
diff -r af10d7d823f7 -r 100518b9d1ff pkgtools/x11-links/files/xorg.fontconfig
--- a/pkgtools/x11-links/files/xorg.fontconfig  Sun Apr 08 05:47:30 2012 +0000
+++ b/pkgtools/x11-links/files/xorg.fontconfig  Sun Apr 08 05:55:48 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.fontconfig,v 1.6 2011/09/09 09:08:07 abs Exp $
+# $NetBSD: xorg.fontconfig,v 1.7 2012/04/08 05:55:48 obache Exp $
 #
 include/fontconfig/fcfreetype.h
 include/fontconfig/fcprivate.h
@@ -16,4 +16,5 @@
 lib/libfontconfig.so.2
 lib/libfontconfig.so.2.0
 lib/libfontconfig.so.6.0
+lib/libfontconfig.so.7.0
 lib/pkgconfig/fontconfig.pc
diff -r af10d7d823f7 -r 100518b9d1ff pkgtools/x11-links/files/xorg.freetype2
--- a/pkgtools/x11-links/files/xorg.freetype2   Sun Apr 08 05:47:30 2012 +0000
+++ b/pkgtools/x11-links/files/xorg.freetype2   Sun Apr 08 05:55:48 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.freetype2,v 1.8 2011/08/01 15:09:28 wiz Exp $
+# $NetBSD: xorg.freetype2,v 1.9 2012/04/08 05:55:48 obache Exp $
 #
 bin/freetype-config
 include/freetype2/freetype/config/ftconfig.h
@@ -62,5 +62,6 @@
 lib/libfreetype.so.7.2
 lib/libfreetype.so.7.3
 lib/libfreetype.so.17.0
+lib/libfreetype.so.18.0
 lib/pkgconfig/freetype2.pc
 share/aclocal/freetype2.m4
diff -r af10d7d823f7 -r 100518b9d1ff pkgtools/x11-links/files/xorg.libX11
--- a/pkgtools/x11-links/files/xorg.libX11      Sun Apr 08 05:47:30 2012 +0000
+++ b/pkgtools/x11-links/files/xorg.libX11      Sun Apr 08 05:55:48 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.libX11,v 1.10 2011/09/09 09:08:07 abs Exp $
+# $NetBSD: xorg.libX11,v 1.11 2012/04/08 05:55:48 obache Exp $
 #
 include/X11/ImUtil.h
 include/X11/XKBlib.h
@@ -17,6 +17,7 @@
 lib/libX11-xcb.1.0.0.dylib
 lib/libX11-xcb.1.dylib
 lib/libX11-xcb.dylib
+lib/libX11-xcb.la
 lib/libX11-xcb.so
 lib/libX11-xcb.so.1
 lib/libX11-xcb.so.1.0
@@ -31,6 +32,7 @@
 lib/libX11.so
 lib/libX11.so.11.2
 lib/libX11.so.12.0
+lib/libX11.so.15.0
 lib/libX11.so.6
 lib/libX11.so.6.1
 lib/libX11.so.6.2
diff -r af10d7d823f7 -r 100518b9d1ff pkgtools/x11-links/files/xorg.libXdamage
--- a/pkgtools/x11-links/files/xorg.libXdamage  Sun Apr 08 05:47:30 2012 +0000
+++ b/pkgtools/x11-links/files/xorg.libXdamage  Sun Apr 08 05:55:48 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.libXdamage,v 1.5 2011/09/09 09:08:07 abs Exp $
+# $NetBSD: xorg.libXdamage,v 1.6 2012/04/08 05:55:48 obache Exp $
 #
 include/X11/extensions/Xdamage.h
 lib/libXdamage.1.1.0.dylib
@@ -6,6 +6,7 @@
 lib/libXdamage.1.dylib
 lib/libXdamage.a
 lib/libXdamage.dylib
+lib/libXdamage.la
 lib/libXdamage.so
 lib/libXdamage.so.1
 lib/libXdamage.so.1.0
diff -r af10d7d823f7 -r 100518b9d1ff pkgtools/x11-links/files/xorg.libXevie
--- a/pkgtools/x11-links/files/xorg.libXevie    Sun Apr 08 05:47:30 2012 +0000
+++ b/pkgtools/x11-links/files/xorg.libXevie    Sun Apr 08 05:55:48 2012 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: xorg.libXevie,v 1.4 2010/05/31 21:20:02 wiz Exp $
+# $NetBSD: xorg.libXevie,v 1.5 2012/04/08 05:55:48 obache Exp $
 #
 include/X11/extensions/Xevie.h
 lib/libXevie.1.0.0.dylib
 lib/libXevie.1.dylib
 lib/libXevie.dylib
 lib/libXevie.a
+lib/libXevie.la
 lib/libXevie.so
 lib/libXevie.so.1
 lib/libXevie.so.1.0
diff -r af10d7d823f7 -r 100518b9d1ff pkgtools/x11-links/files/xorg.libXext
--- a/pkgtools/x11-links/files/xorg.libXext     Sun Apr 08 05:47:30 2012 +0000
+++ b/pkgtools/x11-links/files/xorg.libXext     Sun Apr 08 05:55:48 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.libXext,v 1.5 2011/02/26 08:14:58 mrg Exp $
+# $NetBSD: xorg.libXext,v 1.6 2012/04/08 05:55:48 obache Exp $
 #
 include/X11/extensions/MITMisc.h
 include/X11/extensions/XEVI.h
@@ -34,4 +34,5 @@
 lib/libXext.so.7.0
 lib/libXext.so.7.1
 lib/libXext.so.10.0
+lib/libXext.so.12.0
 lib/pkgconfig/xext.pc
diff -r af10d7d823f7 -r 100518b9d1ff pkgtools/x11-links/files/xorg.libXfont
--- a/pkgtools/x11-links/files/xorg.libXfont    Sun Apr 08 05:47:30 2012 +0000
+++ b/pkgtools/x11-links/files/xorg.libXfont    Sun Apr 08 05:55:48 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.libXfont,v 1.5 2010/06/09 09:33:42 obache Exp $
+# $NetBSD: xorg.libXfont,v 1.6 2012/04/08 05:55:48 obache Exp $
 #
 include/X11/fonts/bdfint.h
 include/X11/fonts/bitmap.h
@@ -22,6 +22,7 @@
 lib/libXfont.1.dylib
 lib/libXfont.a
 lib/libXfont.dylib
+lib/libXfont.la
 lib/libXfont.so
 lib/libXfont.so.1
 lib/libXfont.so.1.3



Home | Main Index | Thread Index | Old Index