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" package to versi...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/95b360cbbab7
branches:  trunk
changeset: 568967:95b360cbbab7
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed Dec 30 17:10:32 2009 +0000

description:
Update "x11-links" package to version 0.45:
1.) Update list to remove duplicates and add missing entries for recent
    versions of NetBSD-current. The necessary changes were supplied
    by Bernd Ernesti.
2.) Include the operating system version number in the package version
    to force a re-build of the package if the operating system is
    updated (which might change the X11 distribution as well.
This should fix PR pkg/42492.

Change approved by Thomas Klausner.

diffstat:

 pkgtools/x11-links/Makefile               |   8 ++-
 pkgtools/x11-links/buildlink3.mk          |   4 +-
 pkgtools/x11-links/files/xorg             |  77 +++++++++++++++++++++++-------
 pkgtools/x11-links/files/xorg.Xcomposite  |   4 +-
 pkgtools/x11-links/files/xorg.Xfixes      |   4 +-
 pkgtools/x11-links/files/xorg.expat       |   6 +-
 pkgtools/x11-links/files/xorg.fontconfig  |   4 +-
 pkgtools/x11-links/files/xorg.freetype2   |   5 +-
 pkgtools/x11-links/files/xorg.glu         |   4 +-
 pkgtools/x11-links/files/xorg.glut        |   4 +-
 pkgtools/x11-links/files/xorg.libICE      |   4 +-
 pkgtools/x11-links/files/xorg.libSM       |   4 +-
 pkgtools/x11-links/files/xorg.libX11      |   4 +-
 pkgtools/x11-links/files/xorg.libXau      |   4 +-
 pkgtools/x11-links/files/xorg.libXdamage  |   4 +-
 pkgtools/x11-links/files/xorg.libXdmcp    |   5 +-
 pkgtools/x11-links/files/xorg.libXevie    |  11 ++++-
 pkgtools/x11-links/files/xorg.libXext     |   4 +-
 pkgtools/x11-links/files/xorg.libXfont    |  17 ++++++-
 pkgtools/x11-links/files/xorg.libXinerama |   4 +-
 pkgtools/x11-links/files/xorg.libXmu      |   6 ++-
 pkgtools/x11-links/files/xorg.libXpm      |  13 +++++
 pkgtools/x11-links/files/xorg.libXrandr   |   4 +-
 pkgtools/x11-links/files/xorg.libXrender  |   4 +-
 pkgtools/x11-links/files/xorg.libXres     |   4 +-
 pkgtools/x11-links/files/xorg.libXt       |   4 +-
 pkgtools/x11-links/files/xorg.libXtst     |   4 +-
 pkgtools/x11-links/files/xorg.libXv       |   4 +-
 pkgtools/x11-links/files/xorg.libdrm      |   5 +-
 pkgtools/x11-links/files/xorg.liblbxutil  |   5 +-
 pkgtools/x11-links/files/xorg.pixman      |  19 ++-----
 pkgtools/x11-links/files/xorg.xcursor     |   4 +-
 32 files changed, 193 insertions(+), 64 deletions(-)

diffs (truncated from 758 to 300 lines):

diff -r 484fec9b87f3 -r 95b360cbbab7 pkgtools/x11-links/Makefile
--- a/pkgtools/x11-links/Makefile       Wed Dec 30 15:44:39 2009 +0000
+++ b/pkgtools/x11-links/Makefile       Wed Dec 30 17:10:32 2009 +0000
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.106 2009/09/27 18:44:27 tnn Exp $
+# $NetBSD: Makefile,v 1.107 2009/12/30 17:10:32 tron 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.44
+DISTNAME=      x11-links-0.45.${OS_VERSION}
 CATEGORIES=    pkgtools x11
 MASTER_SITES=  # empty
 DISTFILES=     # empty
 
-MAINTAINER=    jlam%pkgsrc.org@localhost
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
 COMMENT=       Shadow tree of links to native X11 headers and libraries
 LICENSE=       original-bsd
@@ -24,6 +24,8 @@
 PLIST_SRC.files=       ${WRKDIR}/.PLIST_SRC.files
 PLIST_SRC=             ${.CURDIR}/PLIST ${PLIST_SRC.files}
 
+OSVERSION_SPECIFIC=    yes
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${X11_TYPE} == "modular"
diff -r 484fec9b87f3 -r 95b360cbbab7 pkgtools/x11-links/buildlink3.mk
--- a/pkgtools/x11-links/buildlink3.mk  Wed Dec 30 15:44:39 2009 +0000
+++ b/pkgtools/x11-links/buildlink3.mk  Wed Dec 30 17:10:32 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2009/09/13 13:31:41 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2009/12/30 17:10:32 tron 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.44
+BUILDLINK_API_DEPENDS.x11-links+=      x11-links>=0.45.${OS_VERSION}
 BUILDLINK_PKGSRCDIR.x11-links?=        ../../pkgtools/x11-links
 BUILDLINK_DEPMETHOD.x11-links?=        build
 
diff -r 484fec9b87f3 -r 95b360cbbab7 pkgtools/x11-links/files/xorg
--- a/pkgtools/x11-links/files/xorg     Wed Dec 30 15:44:39 2009 +0000
+++ b/pkgtools/x11-links/files/xorg     Wed Dec 30 17:10:32 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xorg,v 1.12 2009/03/08 00:03:37 snj Exp $
+# $NetBSD: xorg,v 1.13 2009/12/30 17:10:32 tron 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
@@ -317,6 +317,14 @@
 lib/libFS.so
 lib/libFS.so.6
 lib/libFS.so.6.0
+lib/libFS.so.7
+lib/libFS.so.7.0
+lib/libGL.so.2
+lib/libGL.so.2.0
+lib/libGLw.so.2
+lib/libGLw.so.2.0
+lib/libOSMesa.so.7
+lib/libOSMesa.so.7.0
 lib/libPEX5.6.0.dylib
 lib/libPEX5.6.dylib
 lib/libPEX5.a
@@ -339,13 +347,29 @@
 lib/libXTrap.so
 lib/libXTrap.so.6
 lib/libXTrap.so.6.4
+lib/libXTrap.so.7
+lib/libXTrap.so.7.0
 lib/libXaw.6.1.dylib
 lib/libXaw.6.dylib
 lib/libXaw.7.0.dylib
 lib/libXaw.7.dylib
 lib/libXaw.8.dylib
 lib/libXaw6.6.dylib
+lib/libXaw6.so.6
+lib/libXaw6.so.6.1
+lib/libXaw6.so.7
+lib/libXaw6.so.7.0
+lib/libXaw7.a
+lib/libXaw7.so
+lib/libXaw7.so.7
+lib/libXaw7.so.7.0
+lib/libXaw7.so.10
+lib/libXaw7.so.10.0
 lib/libXaw7.7.dylib
+lib/libXaw8.a
+lib/libXaw8.so
+lib/libXaw8.so.8
+lib/libXaw8.so.8.0
 lib/libXaw8.8.dylib
 lib/libXaw.a
 lib/libXaw.dylib
@@ -359,22 +383,6 @@
 lib/libXaw6.6.dylib
 lib/libXaw7.7.dylib
 lib/libXaw8.8.dylib
-lib/libXevie.1.0.0.dylib
-lib/libXevie.1.dylib
-lib/libXevie.dylib
-lib/libXevie.a
-lib/libXevie.so.1.0
-lib/libXfont.1.3.dylib
-lib/libXfont.1.4.dylib
-lib/libXfont.1.4.1.dylib
-lib/libXfont.1.dylib
-lib/libXfont.a
-lib/libXfont.dylib
-lib/libXfont.so
-lib/libXfont.so.1
-lib/libXfont.so.1.3
-lib/libXfont.so.1.4
-lib/libXfont.so.1.5
 lib/libXfontcache.1.0.0.dylib
 lib/libXfontcache.1.dylib
 lib/libXfontcache.dylib
@@ -382,6 +390,8 @@
 lib/libXfontcache.so
 lib/libXfontcache.so.1
 lib/libXfontcache.so.1.2
+lib/libXfontcache.so.2
+lib/libXfontcache.so.2.0
 lib/libXft.1.0.dylib
 lib/libXft.1.1.dylib
 lib/libXft.1.dylib
@@ -391,6 +401,8 @@
 lib/libXft.so.1
 lib/libXft.so.1.0
 lib/libXft.so.1.1
+lib/libXft.so.3
+lib/libXft.so.3.0
 lib/libXi.6.0.0.dylib
 lib/libXi.6.0.dylib
 lib/libXi.6.0.0.dylib
@@ -400,6 +412,8 @@
 lib/libXi.so
 lib/libXi.so.6
 lib/libXi.so.6.0
+lib/libXi.so.7
+lib/libXi.so.7.0
 lib/libXp.6.2.0.dylib
 lib/libXp.6.2.dylib
 lib/libXp.6.dylib
@@ -412,6 +426,9 @@
 lib/libXprintAppUtil.1.dylib
 lib/libXprintAppUtil.dylib
 lib/libXprintAppUtil.a
+lib/libXprintAppUtil.so
+lib/libXprintAppUtil.so.1
+lib/libXprintAppUtil.so.1.0.0
 lib/libXprintUtil.1.0.0.dylib
 lib/libXprintUtil.1.dylib
 lib/libXprintUtil.dylib
@@ -423,6 +440,8 @@
 lib/libXss.so
 lib/libXss.so.1
 lib/libXss.so.1.0
+lib/libXss.so.2
+lib/libXss.so.2.0
 lib/libXvMC.1.0.0.dylib
 lib/libXvMC.1.dylib
 lib/libXvMC.dylib
@@ -430,6 +449,8 @@
 lib/libXvMC.so
 lib/libXvMC.so.1
 lib/libXvMC.so.1.0
+lib/libXvMC.so.2
+lib/libXvMC.so.2.0
 lib/libXvMCW.1.0.0.dylib
 lib/libXvMCW.1.dylib
 lib/libXvMCW.dylib
@@ -444,15 +465,21 @@
 lib/libXxf86dga.so.1
 lib/libXxf86dga.so.1.0
 lib/libXxf86dga.so.1.1
+lib/libXxf86dga.so.2
+lib/libXxf86dga.so.2.0
 lib/libXxf86misc.a
 lib/libXxf86misc.so
 lib/libXxf86misc.so.1
 lib/libXxf86misc.so.1.0
 lib/libXxf86misc.so.1.1
+lib/libXxf86misc.so.2
+lib/libXxf86misc.so.2.0
 lib/libXxf86vm.a
 lib/libXxf86vm.so
 lib/libXxf86vm.so.1
 lib/libXxf86vm.so.1.0
+lib/libXxf86vm.so.2
+lib/libXxf86vm.so.2.0
 lib/libdmx.1.0.0.dylib
 lib/libdmx.1.dylib
 lib/libdmx.dylib
@@ -482,6 +509,8 @@
 lib/libfontenc.so
 lib/libfontenc.so.1
 lib/libfontenc.so.1.0
+lib/libfontenc.so.2
+lib/libfontenc.so.2.0
 lib/liboldX.6.0.0.dylib
 lib/liboldX.6.0.dylib
 lib/liboldX.6.dylib
@@ -503,9 +532,21 @@
 lib/libxkbfile.so.1
 lib/libxkbfile.so.1.0
 lib/libxkbfile.so.1.0.2
+lib/libxkbfile.so.2
+lib/libxkbfile.so.2.0
 lib/libxkbui.a
 lib/libxkbui.so
 lib/libxkbui.so.1
 lib/libxkbui.so.1.0
+lib/libxkbui.so.2
+lib/libxkbui.so.2.0
+lib/pkgconfig/xfontcache.pc
 lib/pkgconfig/xi.pc
-lib/pkgconfig/xevie.pc
+lib/pkgconfig/xkbfile.pc
+lib/pkgconfig/xkbui.pc
+lib/pkgconfig/xp.pc
+lib/pkgconfig/xprintapputil.pc
+lib/pkgconfig/xvmc.pc
+lib/pkgconfig/xxf86dga.pc
+lib/pkgconfig/xxf86misc.pc
+lib/pkgconfig/xxf86vm.pc
diff -r 484fec9b87f3 -r 95b360cbbab7 pkgtools/x11-links/files/xorg.Xcomposite
--- a/pkgtools/x11-links/files/xorg.Xcomposite  Wed Dec 30 15:44:39 2009 +0000
+++ b/pkgtools/x11-links/files/xorg.Xcomposite  Wed Dec 30 17:10:32 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.Xcomposite,v 1.3 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.Xcomposite,v 1.4 2009/12/30 17:10:32 tron Exp $
 include/X11/extensions/Xcomposite.h
 lib/libXcomposite.1.0.0.dylib
 lib/libXcomposite.1.dylib
@@ -6,5 +6,7 @@
 lib/libXcomposite.so
 lib/libXcomposite.so.1
 lib/libXcomposite.so.1.0
+lib/libXcomposite.so.2
+lib/libXcomposite.so.2.0
 lib/libXcomposite.a
 lib/pkgconfig/xcomposite.pc
diff -r 484fec9b87f3 -r 95b360cbbab7 pkgtools/x11-links/files/xorg.Xfixes
--- a/pkgtools/x11-links/files/xorg.Xfixes      Wed Dec 30 15:44:39 2009 +0000
+++ b/pkgtools/x11-links/files/xorg.Xfixes      Wed Dec 30 17:10:32 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.Xfixes,v 1.3 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.Xfixes,v 1.4 2009/12/30 17:10:32 tron Exp $
 #
 include/X11/extensions/Xfixes.h
 lib/libXfixes.3.1.0.dylib
@@ -10,4 +10,6 @@
 lib/libXfixes.so.3
 lib/libXfixes.so.3.0
 lib/libXfixes.so.3.1
+lib/libXfixes.so.4
+lib/libXfixes.so.4.0
 lib/pkgconfig/xfixes.pc
diff -r 484fec9b87f3 -r 95b360cbbab7 pkgtools/x11-links/files/xorg.expat
--- a/pkgtools/x11-links/files/xorg.expat       Wed Dec 30 15:44:39 2009 +0000
+++ b/pkgtools/x11-links/files/xorg.expat       Wed Dec 30 17:10:32 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.expat,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.expat,v 1.3 2009/12/30 17:10:32 tron Exp $
 #
 include/expat.h
 include/expat_external.h
@@ -7,6 +7,8 @@
 lib/libexpat.a
 lib/libexpat.dylib
 lib/libexpat.la
+lib/libexpat.so.1
 lib/libexpat.so.1.5.2
-lib/libexpat.so.1
+lib/libexpat.so.2
+lib/libexpat.so.2.0
 lib/libexpat.so
diff -r 484fec9b87f3 -r 95b360cbbab7 pkgtools/x11-links/files/xorg.fontconfig
--- a/pkgtools/x11-links/files/xorg.fontconfig  Wed Dec 30 15:44:39 2009 +0000
+++ b/pkgtools/x11-links/files/xorg.fontconfig  Wed Dec 30 17:10:32 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.fontconfig,v 1.3 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.fontconfig,v 1.4 2009/12/30 17:10:32 tron Exp $
 #
 include/fontconfig/fcfreetype.h
 include/fontconfig/fcprivate.h
@@ -12,4 +12,6 @@
 lib/libfontconfig.so
 lib/libfontconfig.so.1
 lib/libfontconfig.so.1.3



Home | Main Index | Thread Index | Old Index