Tue Nov 23 13:24:27 2010 UTC ()
Add a new header file and a library with newer minor in shlib, to match
NetBSD-current after last weekends xorg imports.

Remove Xmu files from xorg file list, they are in xorg.libXmu list.

Bump version to 0.61 and depend on it in bl3.mk.


(wiz)
diff -r1.122 -r1.123 pkgsrc/pkgtools/x11-links/Makefile
diff -r1.34 -r1.35 pkgsrc/pkgtools/x11-links/buildlink3.mk
diff -r1.16 -r1.17 pkgsrc/pkgtools/x11-links/files/xorg
diff -r1.6 -r1.7 pkgsrc/pkgtools/x11-links/files/xorg.freetype2
diff -r1.3 -r1.4 pkgsrc/pkgtools/x11-links/files/xorg.libXmu
cvs diff -r1.122 -r1.123 pkgsrc/pkgtools/x11-links/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/Makefile 2010/09/14 19:40:15 1.122
+++ pkgsrc/pkgtools/x11-links/Makefile 2010/11/23 13:24:26 1.123
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.122 2010/09/14 19:40:15 tron Exp $ 1# $NetBSD: Makefile,v 1.123 2010/11/23 13:24:26 wiz Exp $
2# 2#
3# NOTE: If you update this package, then you'll likely need to also update 3# NOTE: If you update this package, then you'll likely need to also update
4# the x11-links dependency in buildlink3.mk to the correct version, 4# the x11-links dependency in buildlink3.mk to the correct version,
5# usually the most recent. 5# usually the most recent.
6 6
7DISTNAME= x11-links-0.60 7DISTNAME= x11-links-0.61
8CATEGORIES= pkgtools x11 8CATEGORIES= pkgtools x11
9MASTER_SITES= # empty 9MASTER_SITES= # empty
10DISTFILES= # empty 10DISTFILES= # empty
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html 13HOMEPAGE= http://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
14COMMENT= Shadow tree of links to native X11 headers and libraries 14COMMENT= Shadow tree of links to native X11 headers and libraries
15LICENSE= original-bsd 15LICENSE= original-bsd
16 16
17PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
18PKG_INSTALLATION_TYPES= overwrite pkgviews 18PKG_INSTALLATION_TYPES= overwrite pkgviews
19 19
20WRKSRC= ${WRKDIR} 20WRKSRC= ${WRKDIR}
cvs diff -r1.34 -r1.35 pkgsrc/pkgtools/x11-links/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/buildlink3.mk 2010/09/14 19:40:15 1.34
+++ pkgsrc/pkgtools/x11-links/buildlink3.mk 2010/11/23 13:24:26 1.35
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: buildlink3.mk,v 1.34 2010/09/14 19:40:15 tron Exp $ 1# $NetBSD: buildlink3.mk,v 1.35 2010/11/23 13:24:26 wiz Exp $
2# 2#
3# Don't include this file manually! It will be included as necessary 3# Don't include this file manually! It will be included as necessary
4# by bsd.buildlink3.mk. 4# by bsd.buildlink3.mk.
5 5
6# x11-links is sorted first in mk/buildlink3/bsd.buildlink3.mk, 6# x11-links is sorted first in mk/buildlink3/bsd.buildlink3.mk,
7# so that symlinks created from it can be overriden by other packages. 7# so that symlinks created from it can be overriden by other packages.
8# 8#
9 9
10BUILDLINK_TREE+= x11-links 10BUILDLINK_TREE+= x11-links
11 11
12.if !defined(X11_LINKS_BUILDLINK3_MK) 12.if !defined(X11_LINKS_BUILDLINK3_MK)
13X11_LINKS_BUILDLINK3_MK:= 13X11_LINKS_BUILDLINK3_MK:=
14 14
15BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.60 15BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.61
16BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links 16BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links
17BUILDLINK_DEPMETHOD.x11-links?= build 17BUILDLINK_DEPMETHOD.x11-links?= build
18 18
19# Force all of the headers and libraries to be symlinked into 19# Force all of the headers and libraries to be symlinked into
20# ${BUILDLINK_X11_DIR}, even in the "pkgviews" case. 20# ${BUILDLINK_X11_DIR}, even in the "pkgviews" case.
21# 21#
22BUILDLINK_CONTENTS_FILTER.x11-links= \ 22BUILDLINK_CONTENTS_FILTER.x11-links= \
23 ${EGREP} '(include.*/|\.h$$|\.pc$$|/lib[^/]*$$)' 23 ${EGREP} '(include.*/|\.h$$|\.pc$$|/lib[^/]*$$)'
24 24
25# Rename the symlinks so that they appear in ${BUILDLINK_X11_DIR}/include 25# Rename the symlinks so that they appear in ${BUILDLINK_X11_DIR}/include
26# and ${BUILDLINK_X11_DIR}/lib. 26# and ${BUILDLINK_X11_DIR}/lib.
27# 27#
28BUILDLINK_FNAME_TRANSFORM.x11-links+= -e "s|/share/x11-links/|/|" 28BUILDLINK_FNAME_TRANSFORM.x11-links+= -e "s|/share/x11-links/|/|"
cvs diff -r1.16 -r1.17 pkgsrc/pkgtools/x11-links/files/xorg (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg 2010/09/14 08:55:42 1.16
+++ pkgsrc/pkgtools/x11-links/files/xorg 2010/11/23 13:24:26 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: xorg,v 1.16 2010/09/14 08:55:42 tron Exp $ 1# $NetBSD: xorg,v 1.17 2010/11/23 13:24:26 wiz Exp $
2# 2#
3# The files listed below are the union of the sets of files installed by 3# The files listed below are the union of the sets of files installed by
4# the supported Xorg (and some XFree) distributions, minus the set of files 4# the supported Xorg (and some XFree) distributions, minus the set of files
5# representing bits that may be added via pkgsrc, e.g. Xfixes, MesaLib, Xpm, 5# representing bits that may be added via pkgsrc, e.g. Xfixes, MesaLib, Xpm,
6# freetype2, etc. 6# freetype2, etc.
7# 7#
8include/DPS/ColorSB.h 8include/DPS/ColorSB.h
9include/DPS/ColorSBP.h 9include/DPS/ColorSBP.h
10include/DPS/DPSScrollW.h 10include/DPS/DPSScrollW.h
11include/DPS/DPSScrollWP.h 11include/DPS/DPSScrollWP.h
12include/DPS/FontCreatP.h 12include/DPS/FontCreatP.h
13include/DPS/FontCreato.h 13include/DPS/FontCreato.h
14include/DPS/FontSB.h 14include/DPS/FontSB.h
@@ -103,48 +103,26 @@ include/X11/Xaw/TextSrc.h @@ -103,48 +103,26 @@ include/X11/Xaw/TextSrc.h
103include/X11/Xaw/TextSrcP.h 103include/X11/Xaw/TextSrcP.h
104include/X11/Xaw/Tip.h 104include/X11/Xaw/Tip.h
105include/X11/Xaw/TipP.h 105include/X11/Xaw/TipP.h
106include/X11/Xaw/Toggle.h 106include/X11/Xaw/Toggle.h
107include/X11/Xaw/ToggleP.h 107include/X11/Xaw/ToggleP.h
108include/X11/Xaw/Tree.h 108include/X11/Xaw/Tree.h
109include/X11/Xaw/TreeP.h 109include/X11/Xaw/TreeP.h
110include/X11/Xaw/VendorEP.h 110include/X11/Xaw/VendorEP.h
111include/X11/Xaw/Viewport.h 111include/X11/Xaw/Viewport.h
112include/X11/Xaw/ViewportP.h 112include/X11/Xaw/ViewportP.h
113include/X11/Xaw/XawImP.h 113include/X11/Xaw/XawImP.h
114include/X11/Xaw/XawInit.h 114include/X11/Xaw/XawInit.h
115include/X11/Xft/XftFreetype.h 115include/X11/Xft/XftFreetype.h
116include/X11/Xmu/Atoms.h 
117include/X11/Xmu/CharSet.h 
118include/X11/Xmu/CloseHook.h 
119include/X11/Xmu/Converters.h 
120include/X11/Xmu/CurUtil.h 
121include/X11/Xmu/CvtCache.h 
122include/X11/Xmu/DisplayQue.h 
123include/X11/Xmu/Drawing.h 
124include/X11/Xmu/Editres.h 
125include/X11/Xmu/EditresP.h 
126include/X11/Xmu/Error.h 
127include/X11/Xmu/ExtAgent.h 
128include/X11/Xmu/Initer.h 
129include/X11/Xmu/Lookup.h 
130include/X11/Xmu/Misc.h 
131include/X11/Xmu/StdCmap.h 
132include/X11/Xmu/StdSel.h 
133include/X11/Xmu/SysUtil.h 
134include/X11/Xmu/WidgetNode.h 
135include/X11/Xmu/WinUtil.h 
136include/X11/Xmu/Xct.h 
137include/X11/Xmu/Xmu.h 
138include/X11/XprintAppUtil/xpapputil.h 116include/X11/XprintAppUtil/xpapputil.h
139include/X11/XprintUtil/xprintutil.h 117include/X11/XprintUtil/xprintutil.h
140include/X11/bitmaps/1x1 118include/X11/bitmaps/1x1
141include/X11/bitmaps/2x2 119include/X11/bitmaps/2x2
142include/X11/bitmaps/Dashes 120include/X11/bitmaps/Dashes
143include/X11/bitmaps/Down 121include/X11/bitmaps/Down
144include/X11/bitmaps/Excl 122include/X11/bitmaps/Excl
145include/X11/bitmaps/FlipHoriz 123include/X11/bitmaps/FlipHoriz
146include/X11/bitmaps/FlipVert 124include/X11/bitmaps/FlipVert
147include/X11/bitmaps/Fold 125include/X11/bitmaps/Fold
148include/X11/bitmaps/Left 126include/X11/bitmaps/Left
149include/X11/bitmaps/Right 127include/X11/bitmaps/Right
150include/X11/bitmaps/RotateLeft 128include/X11/bitmaps/RotateLeft
cvs diff -r1.6 -r1.7 pkgsrc/pkgtools/x11-links/files/xorg.freetype2 (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.freetype2 2010/09/11 20:26:11 1.6
+++ pkgsrc/pkgtools/x11-links/files/xorg.freetype2 2010/11/23 13:24:26 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: xorg.freetype2,v 1.6 2010/09/11 20:26:11 wiz Exp $ 1# $NetBSD: xorg.freetype2,v 1.7 2010/11/23 13:24:26 wiz Exp $
2# 2#
3bin/freetype-config 3bin/freetype-config
4include/freetype2/freetype/config/ftconfig.h 4include/freetype2/freetype/config/ftconfig.h
5include/freetype2/freetype/config/ftheader.h 5include/freetype2/freetype/config/ftheader.h
6include/freetype2/freetype/config/ftmodule.h 6include/freetype2/freetype/config/ftmodule.h
7include/freetype2/freetype/config/ftoption.h 7include/freetype2/freetype/config/ftoption.h
8include/freetype2/freetype/config/ftstdlib.h 8include/freetype2/freetype/config/ftstdlib.h
9include/freetype2/freetype/freetype.h 9include/freetype2/freetype/freetype.h
10include/freetype2/freetype/ftadvanc.h 10include/freetype2/freetype/ftadvanc.h
11include/freetype2/freetype/ftbbox.h 11include/freetype2/freetype/ftbbox.h
12include/freetype2/freetype/ftbdf.h 12include/freetype2/freetype/ftbdf.h
13include/freetype2/freetype/ftbitmap.h 13include/freetype2/freetype/ftbitmap.h
14include/freetype2/freetype/ftcache.h 14include/freetype2/freetype/ftcache.h
@@ -48,16 +48,17 @@ include/freetype2/freetype/tttables.h @@ -48,16 +48,17 @@ include/freetype2/freetype/tttables.h
48include/freetype2/freetype/tttags.h 48include/freetype2/freetype/tttags.h
49include/freetype2/freetype/ttunpat.h 49include/freetype2/freetype/ttunpat.h
50include/ft2build.h 50include/ft2build.h
51lib/libfreetype.6.3.16.dylib 51lib/libfreetype.6.3.16.dylib
52lib/libfreetype.6.dylib 52lib/libfreetype.6.dylib
53lib/libfreetype.a 53lib/libfreetype.a
54lib/libfreetype.dylib 54lib/libfreetype.dylib
55lib/libfreetype.la 55lib/libfreetype.la
56lib/libfreetype.so 56lib/libfreetype.so
57lib/libfreetype.so.6 57lib/libfreetype.so.6
58lib/libfreetype.so.6.3.17 58lib/libfreetype.so.6.3.17
59lib/libfreetype.so.7 59lib/libfreetype.so.7
60lib/libfreetype.so.7.1 60lib/libfreetype.so.7.1
 61lib/libfreetype.so.7.2
61lib/libfreetype.so.17.0 62lib/libfreetype.so.17.0
62lib/pkgconfig/freetype2.pc 63lib/pkgconfig/freetype2.pc
63share/aclocal/freetype2.m4 64share/aclocal/freetype2.m4
cvs diff -r1.3 -r1.4 pkgsrc/pkgtools/x11-links/files/xorg.libXmu (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.libXmu 2010/02/18 12:32:19 1.3
+++ pkgsrc/pkgtools/x11-links/files/xorg.libXmu 2010/11/23 13:24:26 1.4
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1# $NetBSD: xorg.libXmu,v 1.3 2010/02/18 12:32:19 obache Exp $ 1# $NetBSD: xorg.libXmu,v 1.4 2010/11/23 13:24:26 wiz Exp $
2# 2#
3include/X11/Xmu/Atoms.h 3include/X11/Xmu/Atoms.h
4include/X11/Xmu/CharSet.h 4include/X11/Xmu/CharSet.h
5include/X11/Xmu/CloseHook.h 5include/X11/Xmu/CloseHook.h
6include/X11/Xmu/Converters.h 6include/X11/Xmu/Converters.h
7include/X11/Xmu/CurUtil.h 7include/X11/Xmu/CurUtil.h
8include/X11/Xmu/CvtCache.h 8include/X11/Xmu/CvtCache.h
9include/X11/Xmu/DisplayQue.h 9include/X11/Xmu/DisplayQue.h
10include/X11/Xmu/Drawing.h 10include/X11/Xmu/Drawing.h
11include/X11/Xmu/Editres.h 11include/X11/Xmu/Editres.h
12include/X11/Xmu/EditresP.h 12include/X11/Xmu/EditresP.h
13include/X11/Xmu/Error.h 13include/X11/Xmu/Error.h
14include/X11/Xmu/ExtAgent.h 14include/X11/Xmu/ExtAgent.h
15include/X11/Xmu/Initer.h 15include/X11/Xmu/Initer.h
16include/X11/Xmu/Lookup.h 16include/X11/Xmu/Lookup.h
17include/X11/Xmu/Misc.h 17include/X11/Xmu/Misc.h
18include/X11/Xmu/StdCmap.h 18include/X11/Xmu/StdCmap.h
19include/X11/Xmu/StdSel.h 19include/X11/Xmu/StdSel.h
20include/X11/Xmu/SysUtil.h 20include/X11/Xmu/SysUtil.h
 21include/X11/Xmu/WhitePoint.h
21include/X11/Xmu/WidgetNode.h 22include/X11/Xmu/WidgetNode.h
22include/X11/Xmu/WinUtil.h 23include/X11/Xmu/WinUtil.h
23include/X11/Xmu/Xct.h 24include/X11/Xmu/Xct.h
24include/X11/Xmu/Xmu.h 25include/X11/Xmu/Xmu.h
25lib/libXmu.6.0.dylib 26lib/libXmu.6.0.dylib
26lib/libXmu.6.2.0.dylib 27lib/libXmu.6.2.0.dylib
27lib/libXmu.6.2.dylib 28lib/libXmu.6.2.dylib
28lib/libXmu.6.dylib 29lib/libXmu.6.dylib
29lib/libXmu.a 30lib/libXmu.a
30lib/libXmu.dylib 31lib/libXmu.dylib
31lib/libXmu.la 32lib/libXmu.la
32lib/libXmu.so 33lib/libXmu.so
33lib/libXmu.so.6 34lib/libXmu.so.6