Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/x11/xfstt/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/x11/xfstt/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.14
retrieving revision 1.20
diff -u -p -r1.14 -r1.20
--- pkgsrc/x11/xfstt/Makefile	2003/06/02 01:15:35	1.14
+++ pkgsrc/x11/xfstt/Makefile	2004/12/28 02:47:52	1.20
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.14 2003/06/02 01:15:35 jschauma Exp $
+# $NetBSD: Makefile,v 1.20 2004/12/28 02:47:52 reed Exp $
 #
 
-DISTNAME=		xfstt-1.4
+DISTNAME=		xfstt-1.6
+PKGREVISION=		2
 CATEGORIES=		x11 net fonts
 MASTER_SITES=		http://download.berlios.de/xfstt/
 
-MAINTAINER=		tech-pkg@netbsd.org
-HOMEPAGE=		http://developer.berlios.de/projects/xfstt
+MAINTAINER=		tech-pkg@NetBSD.org
+HOMEPAGE=		http://developer.berlios.de/projects/xfstt/
 COMMENT=		TrueType font server for X11
 
 USE_PKGINSTALL=		YES
 USE_X11BASE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 
 # There isn't really any l10n yet, only some preliminary i18n support.
@@ -34,7 +35,7 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/xfstt ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/xfstt.1x ${PREFIX}/man/man1/xfstt.1
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fonts/TrueType
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fonts/TTF
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xfstt
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xfstt
 	cd ${WRKSRC} && (				\