Update Xft2 to version 2.1.2.

Not sure of precise changes but does again build correctly against the
current fontconfig package.

5 files changed, 23 insertions, 44 deletions

diff --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile
index 5397f92194f..6cd35e96060 100644
--- a/fonts/Xft2/Makefile
+++ b/fonts/Xft2/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2003/09/19 01:56:45 grant Exp $
+# $NetBSD: Makefile,v 1.16 2003/09/19 15:46:51 markd Exp $
 #
 
-DISTNAME=	fcpackage.2_1
-PKGNAME=	Xft2-2.1
-PKGREVISION=	4
-WRKSRC=		${WRKDIR}/${DISTNAME}/Xft
+DISTNAME=	xft-2.1.2
+PKGNAME=	Xft2-2.1.2
 CATEGORIES=	fonts x11
-MASTER_SITES=	http://fontconfig.org/release/
+MASTER_SITES=	http://x2.freedesktop.org/Software/fontconfig/releases/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://fontconfig.org/
@@ -16,12 +14,18 @@ COMMENT=	Library for configuring and customizing font access
 # sure to keep in step
 BUILDLINK_DEPENDS.freetype2=  freetype2>=2.0.9
 
-GNU_CONFIGURE=	YES
-USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
-USE_X11=	YES
-USE_GNU_TOOLS+=	awk
+GNU_CONFIGURE=		YES
+USE_BUILDLINK2=		YES
+# Uses libtool 1.5 features
+#USE_LIBTOOL=		YES
+USE_GMAKE=		YES
+USE_X11=		YES
+USE_GNU_TOOLS+=		awk
 
+#LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+MAKE_ENV+=		EGREP=${EGREP}
+
+.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../fonts/fontconfig/buildlink2.mk"
 .include "../../graphics/freetype2/buildlink2.mk"
 .include "../../x11/Xrender/buildlink2.mk"
diff --git a/fonts/Xft2/PLIST b/fonts/Xft2/PLIST
index ba5e46cc2a2..d7a73bc0444 100644
--- a/fonts/Xft2/PLIST
+++ b/fonts/Xft2/PLIST
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2003/02/03 17:41:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/09/19 15:46:52 markd Exp $
 bin/xft-config
 include/X11/Xft/Xft.h
 include/X11/Xft/XftCompat.h
+lib/libXft.a
+lib/libXft.la
 lib/libXft.so
 lib/libXft.so.2
-lib/libXft.so.2.0
+lib/libXft.so.2.1
 lib/pkgconfig/xft.pc
+man/man3/Xft.3
 @dirrm include/X11/Xft
diff --git a/fonts/Xft2/distinfo b/fonts/Xft2/distinfo
index 303cde7171b..e5f6c6d65fb 100644
--- a/fonts/Xft2/distinfo
+++ b/fonts/Xft2/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/12/24 00:43:43 wiz Exp $
+$NetBSD: distinfo,v 1.3 2003/09/19 15:46:52 markd Exp $
 
-SHA1 (fcpackage.2_1.tar.gz) = b4d960ea1e2384f48aa9fed05e90ad4755da12be
-Size (fcpackage.2_1.tar.gz) = 544661 bytes
-SHA1 (patch-aa) = d5de3f8a56cb1484e41f1e21dfeb72777ab10f02
-SHA1 (patch-ab) = 5374dac13a131edfb3e46f0336641d64036ee832
+SHA1 (xft-2.1.2.tar.gz) = 892d57cac909ef51c3c49b9a6aaf54e6b6ab6b92
+Size (xft-2.1.2.tar.gz) = 243680 bytes
diff --git a/fonts/Xft2/patches/patch-aa b/fonts/Xft2/patches/patch-aa
deleted file mode 100644
index deb62b15e28..00000000000
--- a/fonts/Xft2/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/12/16 12:08:42 jmmv Exp $
-
---- Makefile.in.orig	Fri May 31 09:01:49 2002
-+++ Makefile.in
-@@ -66,7 +66,7 @@ LIBBASE=libXft.so
- LIBFILE=$(LIBBASE).@PACKAGE_MAJOR@.@PACKAGE_MINOR@
- LIBMAJOR=$(LIBBASE).@PACKAGE_MAJOR@
- 
--LIBS=@LIBS@
-+LIBS=@LIBS@ @LDFLAGS@
- 
- SRCS=xftcolor.c \
-      xftcore.c \
diff --git a/fonts/Xft2/patches/patch-ab b/fonts/Xft2/patches/patch-ab
deleted file mode 100644
index 04239487621..00000000000
--- a/fonts/Xft2/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2002/12/24 00:43:43 wiz Exp $
-
---- configure.orig	Fri Nov 22 03:30:00 2002
-+++ configure
-@@ -1316,7 +1316,7 @@ fi
- case "$have_x" in
- yes)
- 	XRENDER_CFLAGS="-I$x_includes"
--	XRENDER_LIBS="-L$x_libraries -lXrender"
-+	XRENDER_LIBS="-L$x_libraries -lXrender -lXext"
- 
- 	saved_LIBS="$LIBS"
- 	LIBS="$LIBS $XRENDER_LIBS"