diff options
| author | tron <tron@pkgsrc.org> | 2009-12-30 17:10:32 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2009-12-30 17:10:32 +0000 |
| commit | 5dc4376660e84da3721cea98bb2dd9b2a6aab57a (patch) | |
| tree | 23db5746fa146a3bc111ee7e30b916c662daa32c | |
| parent | 3c30ae1315562d3a3083411b523d8e6d7d0f8535 (diff) | |
| download | pkgsrc-5dc4376660e84da3721cea98bb2dd9b2a6aab57a.tar.gz | |
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.
32 files changed, 193 insertions, 64 deletions
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index 40e4a58c679..bda50651914 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -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 +MAINTAINER= pkgsrc-users@NetBSD.org 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 @@ USE_TOOLS+= pax 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 --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk index 482df82851a..ff30538ecff 100644 --- a/pkgtools/x11-links/buildlink3.mk +++ b/pkgtools/x11-links/buildlink3.mk @@ -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 @@ BUILDLINK_TREE+= x11-links .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 --git a/pkgtools/x11-links/files/xorg b/pkgtools/x11-links/files/xorg index d5c30e752fa..72b09055c88 100644 --- a/pkgtools/x11-links/files/xorg +++ b/pkgtools/x11-links/files/xorg @@ -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.a 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.dylib 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/libXaw.so.8.0 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.a 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.dylib 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.dylib 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.0.0.dylib 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.a 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.a 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 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.a 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 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 --git a/pkgtools/x11-links/files/xorg.Xcomposite b/pkgtools/x11-links/files/xorg.Xcomposite index da815923a55..1c328b19540 100644 --- a/pkgtools/x11-links/files/xorg.Xcomposite +++ b/pkgtools/x11-links/files/xorg.Xcomposite @@ -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.dylib 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 --git a/pkgtools/x11-links/files/xorg.Xfixes b/pkgtools/x11-links/files/xorg.Xfixes index 8961554ad85..d9b862d72f0 100644 --- a/pkgtools/x11-links/files/xorg.Xfixes +++ b/pkgtools/x11-links/files/xorg.Xfixes @@ -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 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 --git a/pkgtools/x11-links/files/xorg.expat b/pkgtools/x11-links/files/xorg.expat index fa01626e940..922ec160895 100644 --- a/pkgtools/x11-links/files/xorg.expat +++ b/pkgtools/x11-links/files/xorg.expat @@ -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.1.dylib lib/libexpat.a lib/libexpat.dylib lib/libexpat.la -lib/libexpat.so.1.5.2 lib/libexpat.so.1 +lib/libexpat.so.1.5.2 +lib/libexpat.so.2 +lib/libexpat.so.2.0 lib/libexpat.so diff --git a/pkgtools/x11-links/files/xorg.fontconfig b/pkgtools/x11-links/files/xorg.fontconfig index a835a239c23..92957e9fb7a 100644 --- a/pkgtools/x11-links/files/xorg.fontconfig +++ b/pkgtools/x11-links/files/xorg.fontconfig @@ -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.la lib/libfontconfig.so lib/libfontconfig.so.1 lib/libfontconfig.so.1.3 +lib/libfontconfig.so.2 +lib/libfontconfig.so.2.0 lib/pkgconfig/fontconfig.pc diff --git a/pkgtools/x11-links/files/xorg.freetype2 b/pkgtools/x11-links/files/xorg.freetype2 index 3951ab7bf08..52934c6f435 100644 --- a/pkgtools/x11-links/files/xorg.freetype2 +++ b/pkgtools/x11-links/files/xorg.freetype2 @@ -1,4 +1,4 @@ -# $NetBSD: xorg.freetype2,v 1.2 2008/10/05 21:36:35 cube Exp $ +# $NetBSD: xorg.freetype2,v 1.3 2009/12/30 17:10:32 tron Exp $ # bin/freetype-config include/freetype2/freetype/config/ftconfig.h @@ -46,6 +46,7 @@ include/freetype2/freetype/tttables.h include/freetype2/freetype/tttags.h include/freetype2/freetype/ttunpat.h include/ft2build.h +lib/libfreetype.a lib/libfreetype.la lib/libfreetype.6.3.16.dylib lib/libfreetype.6.dylib @@ -53,5 +54,7 @@ lib/libfreetype.dylib lib/libfreetype.so lib/libfreetype.so.6 lib/libfreetype.so.6.3.17 +lib/libfreetype.so.7 +lib/libfreetype.so.7.1 lib/pkgconfig/freetype2.pc share/aclocal/freetype2.m4 diff --git a/pkgtools/x11-links/files/xorg.glu b/pkgtools/x11-links/files/xorg.glu index a04cbe85b71..9e51581713c 100644 --- a/pkgtools/x11-links/files/xorg.glu +++ b/pkgtools/x11-links/files/xorg.glu @@ -1,4 +1,4 @@ -# $NetBSD: xorg.glu,v 1.1 2008/11/11 16:18:18 cube Exp $ +# $NetBSD: xorg.glu,v 1.2 2009/12/30 17:10:32 tron Exp $ # include/GL/glu.h lib/libGLU.a @@ -6,6 +6,8 @@ lib/libGLU.so lib/libGLU.so.1 lib/libGLU.so.1.0.3 lib/libGLU.so.1.3 +lib/libGLU.so.2 +lib/libGLU.so.2.0 lib/libGLU.dylib lib/libGLU.1.dylib lib/libGLU.1.3.dylib diff --git a/pkgtools/x11-links/files/xorg.glut b/pkgtools/x11-links/files/xorg.glut index 86ee7d2ea56..47d87acd0b9 100644 --- a/pkgtools/x11-links/files/xorg.glut +++ b/pkgtools/x11-links/files/xorg.glut @@ -1,4 +1,4 @@ -# $NetBSD: xorg.glut,v 1.1 2008/11/11 16:19:23 cube Exp $ +# $NetBSD: xorg.glut,v 1.2 2009/12/30 17:10:33 tron Exp $ # include/GL/glut.h include/GL/glutf90.h @@ -6,4 +6,6 @@ lib/libglut.a lib/libglut.so lib/libglut.so.3 lib/libglut.so.3.7.1 +lib/libglut.so.4 +lib/libglut.so.4.0 lib/pkgconfig/glut.pc diff --git a/pkgtools/x11-links/files/xorg.libICE b/pkgtools/x11-links/files/xorg.libICE index 5c9457292c1..0652ccf555f 100644 --- a/pkgtools/x11-links/files/xorg.libICE +++ b/pkgtools/x11-links/files/xorg.libICE @@ -1,4 +1,4 @@ -# $NetBSD: xorg.libICE,v 1.1 2007/12/17 18:20:19 tron Exp $ +# $NetBSD: xorg.libICE,v 1.2 2009/12/30 17:10:33 tron Exp $ # include/X11/ICE/ICE.h include/X11/ICE/ICEconn.h @@ -15,4 +15,6 @@ lib/libICE.la lib/libICE.so lib/libICE.so.6 lib/libICE.so.6.3 +lib/libICE.so.7 +lib/libICE.so.7.0 lib/pkgconfig/ice.pc diff --git a/pkgtools/x11-links/files/xorg.libSM b/pkgtools/x11-links/files/xorg.libSM index 3594972d6f6..ba405110467 100644 --- a/pkgtools/x11-links/files/xorg.libSM +++ b/pkgtools/x11-links/files/xorg.libSM @@ -1,4 +1,4 @@ -# $NetBSD: xorg.libSM,v 1.1 2007/12/17 18:20:20 tron Exp $ +# $NetBSD: xorg.libSM,v 1.2 2009/12/30 17:10:33 tron Exp $ # include/X11/SM/SM.h include/X11/SM/SMlib.h @@ -12,4 +12,6 @@ lib/libSM.la lib/libSM.so lib/libSM.so.6 lib/libSM.so.6.0 +lib/libSM.so.7 +lib/libSM.so.7.0 lib/pkgconfig/sm.pc diff --git a/pkgtools/x11-links/files/xorg.libX11 b/pkgtools/x11-links/files/xorg.libX11 index 145e46af992..a3405d9e6ef 100644 --- a/pkgtools/x11-links/files/xorg.libX11 +++ b/pkgtools/x11-links/files/xorg.libX11 @@ -1,4 +1,4 @@ -# $NetBSD: xorg.libX11,v 1.1 2007/12/15 17:53:41 tron Exp $ +# $NetBSD: xorg.libX11,v 1.2 2009/12/30 17:10:33 tron Exp $ # include/X11/ImUtil.h include/X11/XKBlib.h @@ -22,4 +22,6 @@ lib/libX11.so lib/libX11.so.6 lib/libX11.so.6.1 lib/libX11.so.6.2 +lib/libX11.so.7 +lib/libX11.so.7.0 lib/pkgconfig/x11.pc diff --git a/pkgtools/x11-links/files/xorg.libXau b/pkgtools/x11-links/files/xorg.libXau index e10b0b03523..593f76122c9 100644 --- a/pkgtools/x11-links/files/xorg.libXau +++ b/pkgtools/x11-links/files/xorg.libXau @@ -1,4 +1,4 @@ -# $NetBSD: xorg.libXau,v 1.1 2007/12/15 17:53:41 tron Exp $ +# $NetBSD: xorg.libXau,v 1.2 2009/12/30 17:10:33 tron Exp $ # include/X11/Xauth.h lib/libXau.6.0.0.dylib @@ -9,4 +9,6 @@ lib/libXau.la lib/libXau.so lib/libXau.so.6 lib/libXau.so.6.0 +lib/libXau.so.7 +lib/libXau.so.7.0 lib/pkgconfig/xau.pc diff --git a/pkgtools/x11-links/files/xorg.libXdamage b/pkgtools/x11-links/files/xorg.libXdamage index 711bbf1d13e..8d8454a81fc 100644 --- a/pkgtools/x11-links/files/xorg.libXdamage +++ b/pkgtools/x11-links/files/xorg.libXdamage @@ -1,4 +1,4 @@ -# $NetBSD: xorg.libXdamage,v 1.2 2008/10/05 21:36:35 cube Exp $ +# $NetBSD: xorg.libXdamage,v 1.3 2009/12/30 17:10:33 tron Exp $ # include/X11/extensions/Xdamage.h lib/libXdamage.1.0.0.dylib @@ -9,4 +9,6 @@ lib/libXdamage.so lib/libXdamage.so.1 lib/libXdamage.so.1.0 lib/libXdamage.so.1.1 +lib/libXdamage.so.2 +lib/libXdamage.so.2.0 lib/pkgconfig/xdamage.pc diff --git a/pkgtools/x11-links/files/xorg.libXdmcp b/pkgtools/x11-links/files/xorg.libXdmcp index 8e3e720fd39..157b73c8924 100644 --- a/pkgtools/x11-links/files/xorg.libXdmcp +++ b/pkgtools/x11-links/files/xorg.libXdmcp @@ -1,4 +1,4 @@ -# $NetBSD: xorg.libXdmcp,v 1.1 2007/12/15 17:53:41 tron Exp $ +# $NetBSD: xorg.libXdmcp,v 1.2 2009/12/30 17:10:33 tron Exp $ # include/X11/Xdmcp.h lib/libXdmcp.a @@ -9,4 +9,7 @@ lib/libXdmcp.dylib lib/libXdmcp.la lib/libXdmcp.so lib/libXdmcp.so.6 +lib/libXdmcp.so.6.0 +lib/libXdmcp.so.7 +lib/libXdmcp.so.7.0 lib/pkgconfig/xdmcp.pc diff --git a/pkgtools/x11-links/files/xorg.libXevie b/pkgtools/x11-links/files/xorg.libXevie index cdfbdfac3d0..f1656e22cbc 100644 --- a/pkgtools/x11-links/files/xorg.libXevie +++ b/pkgtools/x11-links/files/xorg.libXevie @@ -1,3 +1,12 @@ -# $NetBSD: xorg.libXevie,v 1.2 2008/10/05 21:36:35 cube Exp $ +# $NetBSD: xorg.libXevie,v 1.3 2009/12/30 17:10:33 tron Exp $ # +lib/libXevie.1.0.0.dylib +lib/libXevie.1.dylib +lib/libXevie.dylib +lib/libXevie.a +lib/libXevie.so +lib/libXevie.so.1 +lib/libXevie.so.1.0 +lib/libXevie.so.2 +lib/libXevie.so.2.0 lib/pkgconfig/xevie.pc diff --git a/pkgtools/x11-links/files/xorg.libXext b/pkgtools/x11-links/files/xorg.libXext index 773b76efed4..669e505f8ec 100644 --- a/pkgtools/x11-links/files/xorg.libXext +++ b/pkgtools/x11-links/files/xorg.libXext @@ -1,4 +1,4 @@ -# $NetBSD: xorg.libXext,v 1.1 2007/12/17 18:20:20 tron Exp $ +# $NetBSD: xorg.libXext,v 1.2 2009/12/30 17:10:33 tron Exp $ # lib/libXext.6.3.dylib lib/libXext.6.4.0.dylib @@ -11,4 +11,6 @@ lib/libXext.so lib/libXext.so.6 lib/libXext.so.6.3 lib/libXext.so.6.4 +lib/libXext.so.7 +lib/libXext.so.7.0 lib/pkgconfig/xext.pc diff --git a/pkgtools/x11-links/files/xorg.libXfont b/pkgtools/x11-links/files/xorg.libXfont index cf58e9af5dc..65e99f42a40 100644 --- a/pkgtools/x11-links/files/xorg.libXfont +++ b/pkgtools/x11-links/files/xorg.libXfont @@ -1,4 +1,4 @@ -# $NetBSD: xorg.libXfont,v 1.2 2008/10/05 21:36:35 cube Exp $ +# $NetBSD: xorg.libXfont,v 1.3 2009/12/30 17:10:33 tron Exp $ # include/X11/fonts/bdfint.h include/X11/fonts/bitmap.h @@ -16,5 +16,20 @@ include/X11/fonts/fontxlfd.h include/X11/fonts/ft.h include/X11/fonts/ftfuncs.h include/X11/fonts/pcf.h +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.4.1 +lib/libXfont.so.1.5 +lib/libXfont.so.2 +lib/libXfont.so.2.0 +lib/libXfont.so.3 +lib/libXfont.so.3.0 lib/pkgconfig/xfont.pc diff --git a/pkgtools/x11-links/files/xorg.libXinerama b/pkgtools/x11-links/files/xorg.libXinerama index 1b87d6735e4..89209301a3c 100644 --- a/pkgtools/x11-links/files/xorg.libXinerama +++ b/pkgtools/x11-links/files/xorg.libXinerama @@ -1,4 +1,4 @@ -# $NetBSD: xorg.libXinerama,v 1.1 2007/12/17 18:20:20 tron Exp $ +# $NetBSD: xorg.libXinerama,v 1.2 2009/12/30 17:10:33 tron Exp $ # lib/libXinerama.1.0.0.dylib lib/libXinerama.1.0.dylib @@ -9,4 +9,6 @@ lib/libXinerama.la lib/libXinerama.so lib/libXinerama.so.1 lib/libXinerama.so.1.0 +lib/libXinerama.so.2 +lib/libXinerama.so.2.0 lib/pkgconfig/xinerama.pc diff --git a/pkgtools/x11-links/files/xorg.libXmu b/pkgtools/x11-links/files/xorg.libXmu index b0916ca7ff1..c20e2a9fedc 100644 --- a/pkgtools/x11-links/files/xorg.libXmu +++ b/pkgtools/x11-links/files/xorg.libXmu @@ -1,4 +1,4 @@ -# $NetBSD: xorg.libXmu,v 1.1 2007/12/16 19:05:53 tron Exp $ +# $NetBSD: xorg.libXmu,v 1.2 2009/12/30 17:10:33 tron Exp $ # include/X11/Xmu/Atoms.h include/X11/Xmu/CharSet.h @@ -33,6 +33,8 @@ lib/libXmu.so lib/libXmu.so.6 lib/libXmu.so.6.0 lib/libXmu.so.6.2 +lib/libXmu.so.7 +lib/libXmu.so.7.0 lib/libXmuu.1.0.0.dylib lib/libXmuu.1.0.dylib lib/libXmuu.1.dylib @@ -42,5 +44,7 @@ lib/libXmuu.la lib/libXmuu.so lib/libXmuu.so.1 lib/libXmuu.so.1.0 +lib/libXmuu.so.2 +lib/libXmuu.so.2.0 lib/pkgconfig/xmu.pc lib/pkgconfig/xmuu.pc diff --git a/pkgtools/x11-links/files/xorg.libXpm b/pkgtools/x11-links/files/xorg.libXpm new file mode 100644 index 00000000000..cc445a18d24 --- /dev/null +++ b/pkgtools/x11-links/files/xorg.libXpm @@ -0,0 +1,13 @@ +# $NetBSD: xorg.libXpm,v 1.1 2009/12/30 17:10:33 tron Exp $ +# +include/X11/xpm.h +lib/libXpm.a +lib/libXpm.so +lib/libXpm.so.4 +lib/libXpm.so.4.11 +lib/libXpm.so.5 +lib/libXpm.so.5.0 +lib/libXpm.dylib +lib/libXpm.4.dylib +lib/libXpm.4.11.dylib +lib/pkgconfig/xpm.pc diff --git a/pkgtools/x11-links/files/xorg.libXrandr b/pkgtools/x11-links/files/xorg.libXrandr index 5b2e3609480..83ef277b193 100644 --- a/pkgtools/x11-links/files/xorg.libXrandr +++ b/pkgtools/x11-links/files/xorg.libXrandr @@ -1,4 +1,4 @@ -# $NetBSD: xorg.libXrandr,v 1.4 2008/10/05 21:36:35 cube Exp $ +# $NetBSD: xorg.libXrandr,v 1.5 2009/12/30 17:10:33 tron Exp $ # include/X11/extensions/Xrandr.h lib/libXrandr.2.1.0.dylib @@ -11,4 +11,6 @@ lib/libXrandr.la lib/libXrandr.so lib/libXrandr.so.2 lib/libXrandr.so.2.1 +lib/libXrandr.so.3 +lib/libXrandr.so.3.0 lib/pkgconfig/xrandr.pc diff --git a/pkgtools/x11-links/files/xorg.libXrender b/pkgtools/x11-links/files/xorg.libXrender index 8925b37b354..26378e7698b 100644 --- a/pkgtools/x11-links/files/xorg.libXrender +++ b/pkgtools/x11-links/files/xorg.libXrender @@ -1,4 +1,4 @@ -# $NetBSD: xorg.libXrender,v 1.2 2008/10/05 21:36:35 cube Exp $ +# $NetBSD: xorg.libXrender,v 1.3 2009/12/30 17:10:33 tron Exp $ # include/X11/extensions/Xrender.h lib/libXrender.1.3.0.dylib @@ -9,4 +9,6 @@ lib/libXrender.la lib/libXrender.so lib/libXrender.so.1 lib/libXrender.so.1.3 +lib/libXrender.so.2 +lib/libXrender.so.2.0 lib/pkgconfig/xrender.pc diff --git a/pkgtools/x11-links/files/xorg.libXres b/pkgtools/x11-links/files/xorg.libXres index c50d2d69263..d2a4a6d265b 100644 --- a/pkgtools/x11-links/files/xorg.libXres +++ b/pkgtools/x11-links/files/xorg.libXres @@ -1,4 +1,4 @@ -# $NetBSD: xorg.libXres,v 1.2 2008/10/05 21:36:35 cube Exp $ +# $NetBSD: xorg.libXres,v 1.3 2009/12/30 17:10:33 tron Exp $ # include/X11/extensions/XRes.h lib/libXRes.a @@ -8,4 +8,6 @@ lib/libXRes.dylib lib/libXRes.so lib/libXRes.so.1 lib/libXRes.so.1.0 +lib/libXRes.so.2 +lib/libXRes.so.2.0 lib/pkgconfig/xres.pc diff --git a/pkgtools/x11-links/files/xorg.libXt b/pkgtools/x11-links/files/xorg.libXt index a5e97c4abc4..03c9ba93ef9 100644 --- a/pkgtools/x11-links/files/xorg.libXt +++ b/pkgtools/x11-links/files/xorg.libXt @@ -1,4 +1,4 @@ -# $NetBSD: xorg.libXt,v 1.1 2007/12/17 18:20:21 tron Exp $ +# $NetBSD: xorg.libXt,v 1.2 2009/12/30 17:10:33 tron Exp $ # bin/makestrs include/X11/CallbackI.h @@ -43,4 +43,6 @@ lib/libXt.la lib/libXt.so lib/libXt.so.6 lib/libXt.so.6.0 +lib/libXt.so.7 +lib/libXt.so.7.0 lib/pkgconfig/xt.pc diff --git a/pkgtools/x11-links/files/xorg.libXtst b/pkgtools/x11-links/files/xorg.libXtst index 0c65f4c3815..84ba28b738b 100644 --- a/pkgtools/x11-links/files/xorg.libXtst +++ b/pkgtools/x11-links/files/xorg.libXtst @@ -1,4 +1,4 @@ -# $NetBSD: xorg.libXtst,v 1.1 2008/12/04 04:16:41 cube Exp $ +# $NetBSD: xorg.libXtst,v 1.2 2009/12/30 17:10:33 tron Exp $ lib/libXtst.6.1.0.dylib lib/libXtst.6.1.dylib lib/libXtst.6.dylib @@ -7,4 +7,6 @@ lib/libXtst.dylib lib/libXtst.so lib/libXtst.so.6 lib/libXtst.so.6.1 +lib/libXtst.so.7 +lib/libXtst.so.7.0 lib/pkgconfig/xtst.pc diff --git a/pkgtools/x11-links/files/xorg.libXv b/pkgtools/x11-links/files/xorg.libXv index f10730c3c9c..b5cd1af30d8 100644 --- a/pkgtools/x11-links/files/xorg.libXv +++ b/pkgtools/x11-links/files/xorg.libXv @@ -1,4 +1,4 @@ -# $NetBSD: xorg.libXv,v 1.1 2008/10/29 21:14:01 cube Exp $ +# $NetBSD: xorg.libXv,v 1.2 2009/12/30 17:10:33 tron Exp $ # include/X11/extensions/Xvlib.h lib/libXv.1.0.0.dylib @@ -9,4 +9,6 @@ lib/libXv.dylib lib/libXv.so lib/libXv.so.1 lib/libXv.so.1.0 +lib/libXv.so.2 +lib/libXv.so.2.0 lib/pkgconfig/xv.pc diff --git a/pkgtools/x11-links/files/xorg.libdrm b/pkgtools/x11-links/files/xorg.libdrm index 25d0f9ea6a8..e6d32ceadb5 100644 --- a/pkgtools/x11-links/files/xorg.libdrm +++ b/pkgtools/x11-links/files/xorg.libdrm @@ -1,4 +1,4 @@ -# $NetBSD: xorg.libdrm,v 1.2 2008/10/05 21:36:35 cube Exp $ +# $NetBSD: xorg.libdrm,v 1.3 2009/12/30 17:10:33 tron Exp $ # include/X11/xf86drm.h include/X11/xf86mm.h @@ -6,4 +6,7 @@ lib/libdrm.a lib/libdrm.so lib/libdrm.so.2 lib/libdrm.so.2.3 +lib/libdrm.so.2.4 +lib/libdrm.so.3 +lib/libdrm.so.3.1 lib/pkgconfig/libdrm.pc diff --git a/pkgtools/x11-links/files/xorg.liblbxutil b/pkgtools/x11-links/files/xorg.liblbxutil index 7f9b2670ddc..1b51171078c 100644 --- a/pkgtools/x11-links/files/xorg.liblbxutil +++ b/pkgtools/x11-links/files/xorg.liblbxutil @@ -1,6 +1,9 @@ -# $NetBSD: xorg.liblbxutil,v 1.2 2008/10/05 21:36:35 cube Exp $ +# $NetBSD: xorg.liblbxutil,v 1.3 2009/12/30 17:10:33 tron Exp $ # +lib/liblbxutil.a lib/liblbxutil.so lib/liblbxutil.so.1 lib/liblbxutil.so.1.0 +lib/liblbxutil.so.2 +lib/liblbxutil.so.2.0 lib/pkgconfig/lbxutil.pc diff --git a/pkgtools/x11-links/files/xorg.pixman b/pkgtools/x11-links/files/xorg.pixman index ca517770088..445c03b842d 100644 --- a/pkgtools/x11-links/files/xorg.pixman +++ b/pkgtools/x11-links/files/xorg.pixman @@ -1,24 +1,17 @@ -# $NetBSD: xorg.pixman,v 1.3 2008/10/05 21:36:35 cube Exp $ +# $NetBSD: xorg.pixman,v 1.4 2009/12/30 17:10:33 tron Exp $ # -# NB: The .la file is not listed here because it is bogus in some -# versions of MacOS X, so we don't want it buildlinked. Everything -# is happy with just the pkgconfig file. include/pixman-1/pixman.h include/pixman-1/pixman-version.h lib/libpixman-1.a lib/libpixman-1.0.11.8.dylib lib/libpixman-1.0.dylib lib/libpixman-1.dylib +lib/libpixman-1.la lib/libpixman-1.so lib/libpixman-1.so.0 lib/libpixman-1.so.0.11.2 -lib/pkgconfig/pixman-1.pc -# $NetBSD: xorg.pixman,v 1.3 2008/10/05 21:36:35 cube Exp $ -# -include/pixman-1/pixman.h -include/pixman-1/pixman-version.h -lib/libpixman-1.0.11.8.dylib -lib/libpixman-1.0.dylib -lib/libpixman-1.dylib -lib/libpixman-1.la +lib/libpixman-1.so.1 +lib/libpixman-1.so.1.0 +lib/libpixman-1.so.2 +lib/libpixman-1.so.2.0 lib/pkgconfig/pixman-1.pc diff --git a/pkgtools/x11-links/files/xorg.xcursor b/pkgtools/x11-links/files/xorg.xcursor index efc2cb49471..221529261d5 100644 --- a/pkgtools/x11-links/files/xorg.xcursor +++ b/pkgtools/x11-links/files/xorg.xcursor @@ -1,4 +1,4 @@ -# $NetBSD: xorg.xcursor,v 1.2 2008/10/05 21:36:35 cube Exp $ +# $NetBSD: xorg.xcursor,v 1.3 2009/12/30 17:10:33 tron Exp $ # include/X11/Xcursor/Xcursor.h lib/libXcursor.1.0.2.dylib @@ -9,4 +9,6 @@ lib/libXcursor.la lib/libXcursor.so lib/libXcursor.so.1 lib/libXcursor.so.1.0.2 +lib/libXcursor.so.2 +lib/libXcursor.so.2.0 lib/pkgconfig/xcursor.pc |