Update pkgtools/x11-links to 0.16.

Changes include supporting XFree86-4.3.99.14 aka XFree86-current.
Added some new library versions and some freetype2 include files.
And bump the required version number in the bsd.buildlink mk's.

6 files changed, 20 insertions, 9 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index c44b39a777d..3cf4272a7ca 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3687 2003/10/13 15:52:40 wiz Exp $
+$NetBSD: CHANGES,v 1.3688 2003/10/13 15:55:11 veego Exp $
 
 Changes to the packages collection and infrastructure in 2003:
 
@@ -4193,3 +4193,4 @@ Changes to the packages collection and infrastructure in 2003:
 	Updated xpmroot to 2.4.17 [martti 2003-10-13]
 	Updated fvwm2 to 2.4.17 [martti 2003-10-13]
 	Updated gone to 1.3.5 [wiz 2003-10-13]
+	Updated x11-links to 0.16 [veego 2003-10-13]
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk
index 0ec65f60a44..411fe5a38a8 100644
--- a/mk/buildlink2/bsd.buildlink2.mk
+++ b/mk/buildlink2/bsd.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink2.mk,v 1.98 2003/09/10 12:58:38 jlam Exp $
+# $NetBSD: bsd.buildlink2.mk,v 1.99 2003/10/13 15:55:11 veego Exp $
 #
 # An example package buildlink2.mk file:
 #
@@ -89,7 +89,7 @@ MAKE_ENV+=		BUILDLINK_CACHE_ALL=yes
 .if defined(USE_X11)
 USE_X11_LINKS?=		YES
 .  if empty(USE_X11_LINKS:M[nN][oO])
-BUILD_DEPENDS+=		x11-links>=0.12:../../pkgtools/x11-links
+BUILD_DEPENDS+=		x11-links>=0.16:../../pkgtools/x11-links
 _BLNK_X11_DIR=		${LOCALBASE}/share/x11-links
 .  endif
 _BLNK_CPPFLAGS+=	-I${X11BASE}/include
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index fe38b39dc29..cd1fcb310e8 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.27 2003/10/09 12:15:15 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.28 2003/10/13 15:55:11 veego Exp $
 #
 # An example package buildlink3.mk file:
 #
@@ -76,7 +76,7 @@ _BLNK_X11_LINKS_PACKAGE=	x11-links
 .  else
 _BLNK_X11_LINKS_PACKAGE=	# empty
 .  endif
-BUILDLINK_DEPENDS.x11-links=	x11-links>=0.12
+BUILDLINK_DEPENDS.x11-links=	x11-links>=0.16
 BUILDLINK_DEPMETHOD.x11-links=	build
 BUILDLINK_PKGSRCDIR.x11-links=	../../pkgtools/x11-links
 _BLNK_X11_LINKS_DIR=	${BUILDLINK_PREFIX.x11-links}/${X11_LINKS_SUBDIR}
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index c9352aa0043..391cb3bde94 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.41 2003/10/06 03:00:32 mycroft Exp $
+# $NetBSD: Makefile,v 1.42 2003/10/13 15:55:11 veego Exp $
 #
 # NOTE:	If you update this package, then you'll likely need to also update
 #	the x11-links dependency in mk/buildlink[23]/bsd.buildlink[23].mk
 #	to the correct version, usually the most recent.
 
-DISTNAME=	x11-links-0.15
+DISTNAME=	x11-links-0.16
 WRKSRC=		${WRKDIR}
 CATEGORIES=	pkgtools x11
 MASTER_SITES=	# empty
diff --git a/pkgtools/x11-links/files/xfree b/pkgtools/x11-links/files/xfree
index 91be37f8efa..67eba12c4cb 100644
--- a/pkgtools/x11-links/files/xfree
+++ b/pkgtools/x11-links/files/xfree
@@ -1,4 +1,4 @@
-# $NetBSD: xfree,v 1.3 2003/10/06 03:00:32 mycroft Exp $
+# $NetBSD: xfree,v 1.4 2003/10/13 15:55:11 veego Exp $
 #
 # The files listed below are the union of the sets of files installed by
 # the supported XFree distributions, minus the set of files representing
@@ -498,6 +498,7 @@ lib/libXfont.so
 lib/libXfont.so.1
 lib/libXfont.so.1.3
 lib/libXfont.so.1.4
+lib/libXfont.so.1.5
 lib/libXfont.dylib
 lib/libXfont.1.dylib
 lib/libXfont.1.3.dylib
@@ -513,6 +514,7 @@ lib/libXft.so.1.0
 lib/libXft.so.1.1
 lib/libXft.so.2
 lib/libXft.so.2.0
+lib/libXft.so.2.1
 lib/libXft.dylib
 lib/libXft.1.dylib
 lib/libXft.1.0.dylib
@@ -626,6 +628,8 @@ lib/libexpat.a
 lib/libexpat.so
 lib/libexpat.so.1
 lib/libexpat.so.1.0
+lib/libexpat.so.4
+lib/libexpat.so.4.0
 lib/libexpat.dylib
 lib/libexpat.1.dylib
 lib/libexpat.1.0.dylib
diff --git a/pkgtools/x11-links/files/xfree.freetype2 b/pkgtools/x11-links/files/xfree.freetype2
index 9bf3faa0343..4b7bccde8d1 100644
--- a/pkgtools/x11-links/files/xfree.freetype2
+++ b/pkgtools/x11-links/files/xfree.freetype2
@@ -1,4 +1,4 @@
-# $NetBSD: xfree.freetype2,v 1.3 2003/09/07 21:53:03 jlam Exp $
+# $NetBSD: xfree.freetype2,v 1.4 2003/10/13 15:55:11 veego Exp $
 #
 include/freetype2/freetype/cache/ftccache.h
 include/freetype2/freetype/cache/ftccmap.h
@@ -20,22 +20,27 @@ include/freetype2/freetype/ftchapters.h
 include/freetype2/freetype/fterrdef.h
 include/freetype2/freetype/fterrors.h
 include/freetype2/freetype/ftglyph.h
+include/freetype2/freetype/ftgzip.h
 include/freetype2/freetype/ftimage.h
+include/freetype2/freetype/ftincrem.h
 include/freetype2/freetype/ftlist.h
 include/freetype2/freetype/ftmac.h
 include/freetype2/freetype/ftmm.h
 include/freetype2/freetype/ftmoderr.h
 include/freetype2/freetype/ftmodule.h
 include/freetype2/freetype/ftoutln.h
+include/freetype2/freetype/ftpfr.h
 include/freetype2/freetype/ftrender.h
 include/freetype2/freetype/ftsizes.h
 include/freetype2/freetype/ftsnames.h
+include/freetype2/freetype/ftstroker.h
 include/freetype2/freetype/ftsynth.h
 include/freetype2/freetype/ftsysio.h
 include/freetype2/freetype/ftsysmem.h
 include/freetype2/freetype/ftsystem.h
 include/freetype2/freetype/fttrigon.h
 include/freetype2/freetype/fttypes.h
+include/freetype2/freetype/ftwinfnt.h
 include/freetype2/freetype/ftxf86.h
 include/freetype2/freetype/internal/autohint.h
 include/freetype2/freetype/internal/bdftypes.h
@@ -55,6 +60,7 @@ include/freetype2/freetype/internal/ftobjs.h
 include/freetype2/freetype/internal/ftstream.h
 include/freetype2/freetype/internal/internal.h
 include/freetype2/freetype/internal/pcftypes.h
+include/freetype2/freetype/internal/pfr.h
 include/freetype2/freetype/internal/psaux.h
 include/freetype2/freetype/internal/psglobal.h
 include/freetype2/freetype/internal/pshints.h