Update to x11-links-0.23: catch up with Xft2/buildlink3.mk changes.

4 files changed, 18 insertions, 14 deletions

diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index 8c3d11d0a4d..c4c077cc76f 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.55 2004/02/17 08:26:25 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2004/02/17 16:50:26 jlam 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.22
+DISTNAME=	x11-links-0.23
 CATEGORIES=	pkgtools x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/x11-links/files/xfree b/pkgtools/x11-links/files/xfree
index 0c6ac481c2a..41b77b0c09b 100644
--- a/pkgtools/x11-links/files/xfree
+++ b/pkgtools/x11-links/files/xfree
@@ -1,4 +1,4 @@
-# $NetBSD: xfree,v 1.8 2004/02/17 08:26:25 jlam Exp $
+# $NetBSD: xfree,v 1.9 2004/02/17 16:50:26 jlam 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
@@ -149,8 +149,6 @@ include/X11/Xaw/XawInit.h
 include/X11/Xcms.h
 include/X11/Xdefs.h
 include/X11/Xdmcp.h
-include/X11/Xft/Xft.h
-include/X11/Xft/XftCompat.h
 include/X11/Xft/XftFreetype.h
 include/X11/Xfuncproto.h
 include/X11/Xfuncs.h
@@ -494,20 +492,13 @@ lib/libXfontcache.a
 lib/libXfontcache.so
 lib/libXfontcache.so.1
 lib/libXfontcache.so.1.2
-lib/libXft.a
-lib/libXft.so
 lib/libXft.so.1
 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
 lib/libXft.1.1.dylib
-lib/libXft.2.dylib
-lib/libXft.2.0.dylib
 lib/libXi.a
 lib/libXi.so
 lib/libXi.so.6
diff --git a/pkgtools/x11-links/files/xfree.Xft2 b/pkgtools/x11-links/files/xfree.Xft2
new file mode 100644
index 00000000000..4c8bbfb22d5
--- /dev/null
+++ b/pkgtools/x11-links/files/xfree.Xft2
@@ -0,0 +1,12 @@
+# $NetBSD: xfree.Xft2,v 1.1 2004/02/17 16:50:26 jlam Exp $
+#
+include/X11/Xft/Xft.h
+include/X11/Xft/XftCompat.h
+lib/libXft.a
+lib/libXft.so
+lib/libXft.so.2
+lib/libXft.so.2.0
+lib/libXft.so.2.1
+lib/libXft.dylib
+lib/libXft.2.dylib
+lib/libXft.2.0.dylib
diff --git a/pkgtools/x11-links/xfree.mk b/pkgtools/x11-links/xfree.mk
index d0369045f7c..fd1396ffc10 100644
--- a/pkgtools/x11-links/xfree.mk
+++ b/pkgtools/x11-links/xfree.mk
@@ -1,11 +1,11 @@
-# $NetBSD: xfree.mk,v 1.6 2004/02/17 08:26:25 jlam Exp $
+# $NetBSD: xfree.mk,v 1.7 2004/02/17 16:50:26 jlam Exp $
 
 FILES_LIST=	${FILESDIR}/xfree
 
 X11_MODULES=	MesaLib glu
 X11_MODULES+=	freetype2
 X11_MODULES+=	xpm
-X11_MODULES+=	Xrender expat fontconfig render
+X11_MODULES+=	Xft2 Xrender expat fontconfig render
 X11_MODULES+=	Xrandr randrext
 X11_MODULES+=	xcursor
 
@@ -16,6 +16,7 @@ X11_MODULES+=	xcursor
 BUILDLINK_CHECK_BUILTIN.${_module_}=	YES
 .endfor
 
+.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"