Mon Aug 1 15:09:28 2011 UTC ()
Update for recent freetype2 import in NetBSD-current.
Welcome to 0.66!


(wiz)
diff -r1.127 -r1.128 pkgsrc/pkgtools/x11-links/Makefile
diff -r1.39 -r1.40 pkgsrc/pkgtools/x11-links/buildlink3.mk
diff -r1.7 -r1.8 pkgsrc/pkgtools/x11-links/files/xorg.freetype2
cvs diff -r1.127 -r1.128 pkgsrc/pkgtools/x11-links/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/Makefile 2011/02/26 09:30:10 1.127
+++ pkgsrc/pkgtools/x11-links/Makefile 2011/08/01 15:09:28 1.128
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.127 2011/02/26 09:30:10 wiz Exp $ 1# $NetBSD: Makefile,v 1.128 2011/08/01 15:09:28 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.65 7DISTNAME= x11-links-0.66
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.39 -r1.40 pkgsrc/pkgtools/x11-links/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/buildlink3.mk 2011/02/26 10:00:54 1.39
+++ pkgsrc/pkgtools/x11-links/buildlink3.mk 2011/08/01 15:09:28 1.40
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: buildlink3.mk,v 1.39 2011/02/26 10:00:54 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.40 2011/08/01 15:09:28 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.65 15BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.66
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.7 -r1.8 pkgsrc/pkgtools/x11-links/files/xorg.freetype2 (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.freetype2 2010/11/23 13:24:26 1.7
+++ pkgsrc/pkgtools/x11-links/files/xorg.freetype2 2011/08/01 15:09:28 1.8
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: xorg.freetype2,v 1.7 2010/11/23 13:24:26 wiz Exp $ 1# $NetBSD: xorg.freetype2,v 1.8 2011/08/01 15:09:28 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/ftbzip2.h
14include/freetype2/freetype/ftcache.h 15include/freetype2/freetype/ftcache.h
15include/freetype2/freetype/ftchapters.h 16include/freetype2/freetype/ftchapters.h
16include/freetype2/freetype/ftcid.h 17include/freetype2/freetype/ftcid.h
17include/freetype2/freetype/fterrdef.h 18include/freetype2/freetype/fterrdef.h
18include/freetype2/freetype/fterrors.h 19include/freetype2/freetype/fterrors.h
19include/freetype2/freetype/ftgasp.h 20include/freetype2/freetype/ftgasp.h
20include/freetype2/freetype/ftglyph.h 21include/freetype2/freetype/ftglyph.h
21include/freetype2/freetype/ftgxval.h 22include/freetype2/freetype/ftgxval.h
22include/freetype2/freetype/ftgzip.h 23include/freetype2/freetype/ftgzip.h
23include/freetype2/freetype/ftimage.h 24include/freetype2/freetype/ftimage.h
24include/freetype2/freetype/ftincrem.h 25include/freetype2/freetype/ftincrem.h
25include/freetype2/freetype/ftlcdfil.h 26include/freetype2/freetype/ftlcdfil.h
26include/freetype2/freetype/ftlist.h 27include/freetype2/freetype/ftlist.h
@@ -49,16 +50,17 @@ include/freetype2/freetype/tttags.h @@ -49,16 +50,17 @@ include/freetype2/freetype/tttags.h
49include/freetype2/freetype/ttunpat.h 50include/freetype2/freetype/ttunpat.h
50include/ft2build.h 51include/ft2build.h
51lib/libfreetype.6.3.16.dylib 52lib/libfreetype.6.3.16.dylib
52lib/libfreetype.6.dylib 53lib/libfreetype.6.dylib
53lib/libfreetype.a 54lib/libfreetype.a
54lib/libfreetype.dylib 55lib/libfreetype.dylib
55lib/libfreetype.la 56lib/libfreetype.la
56lib/libfreetype.so 57lib/libfreetype.so
57lib/libfreetype.so.6 58lib/libfreetype.so.6
58lib/libfreetype.so.6.3.17 59lib/libfreetype.so.6.3.17
59lib/libfreetype.so.7 60lib/libfreetype.so.7
60lib/libfreetype.so.7.1 61lib/libfreetype.so.7.1
61lib/libfreetype.so.7.2 62lib/libfreetype.so.7.2
 63lib/libfreetype.so.7.3
62lib/libfreetype.so.17.0 64lib/libfreetype.so.17.0
63lib/pkgconfig/freetype2.pc 65lib/pkgconfig/freetype2.pc
64share/aclocal/freetype2.m4 66share/aclocal/freetype2.m4