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.18
retrieving revision 1.29
diff -u -p -r1.18 -r1.29
--- pkgsrc/x11/xfstt/Makefile	2004/01/24 15:30:34	1.18
+++ pkgsrc/x11/xfstt/Makefile	2006/05/10 23:31:30	1.29
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.18 2004/01/24 15:30:34 grant Exp $
+# $NetBSD: Makefile,v 1.29 2006/05/10 23:31:30 joerg Exp $
 #
 
 DISTNAME=		xfstt-1.6
+PKGREVISION=		4
 CATEGORIES=		x11 net fonts
 MASTER_SITES=		http://download.berlios.de/xfstt/
 
-MAINTAINER=		tech-pkg@NetBSD.org
+MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://developer.berlios.de/projects/xfstt/
 COMMENT=		TrueType font server for X11
 
-USE_PKGINSTALL=		YES
+USE_LANGUAGES=		c c++
 USE_X11BASE=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		YES
 
 # There isn't really any l10n yet, only some preliminary i18n support.
@@ -20,21 +21,19 @@ CONFIGURE_ARGS+=	--disable-nls
 CXXFLAGS+=		-fomit-frame-pointer -ffast-math
 
 RCD_SCRIPTS=		xfstt
+INSTALLATION_DIRS=	bin man/man1
 
-post-patch:
-	@( \
-	cd ${WRKSRC} ; \
-	for f in src/perftest.cc src/xfstt.cc doc/xfstt.1x; \
-	do \
-	    ${MV} $$f $$f.orig ; \
-	    ${SED} ${FILES_SUBST_SED} $$f.orig > $$f ; \
-	done ; \
-	)
+.include "../../mk/x11.buildlink3.mk"
+
+SUBST_CLASSES+=		paths
+SUBST_FILES.paths=	doc/FAQ doc/xfstt.1x
+SUBST_SED.paths=	-e 's,@PREFIX@,${PREFIX},g'
+SUBST_STAGE.paths=	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} && (				\