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.10
retrieving revision 1.14
diff -u -p -r1.10 -r1.14
--- pkgsrc/x11/xfstt/Makefile	2002/09/27 17:03:21	1.10
+++ pkgsrc/x11/xfstt/Makefile	2003/06/02 01:15:35	1.14
@@ -1,45 +1,47 @@
-# $NetBSD: Makefile,v 1.10 2002/09/27 17:03:21 grant Exp $
+# $NetBSD: Makefile,v 1.14 2003/06/02 01:15:35 jschauma Exp $
 #
 
-DISTNAME=		xfstt_1.3
-PKGNAME=		${DISTNAME:S/_/-/}
-CATEGORIES=		x11 net
-PKGREVISION=		1
+DISTNAME=		xfstt-1.4
+CATEGORIES=		x11 net fonts
 MASTER_SITES=		http://download.berlios.de/xfstt/
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://developer.berlios.de/projects/xfstt
 COMMENT=		TrueType font server for X11
 
-CXXFLAGS+=		-fomit-frame-pointer -ffast-math
-MAKE_ENV+=		CXXFLAGS="${CXXFLAGS}"
-
+USE_PKGINSTALL=		YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
-WRKSRC=			${WRKDIR}/${PKGNAME}
+GNU_CONFIGURE=		YES
+
+# There isn't really any l10n yet, only some preliminary i18n support.
+CONFIGURE_ARGS+=	--disable-nls
+
+CXXFLAGS+=		-fomit-frame-pointer -ffast-math
 
 RCD_SCRIPTS=		xfstt
 
 post-patch:
 	@( \
 	cd ${WRKSRC} ; \
-	for i in INSTALL perftest.cpp xfstt.cpp xfstt.1x; \
+	for f in src/perftest.cc src/xfstt.cc doc/xfstt.1x; \
 	do \
-	    ${MV} $$i $$i.bak ; \
-	    ${SED} -e 's;@PREFIX@;${PREFIX};' < $$i.bak > $$i ; \
+	    ${MV} $$f $$f.orig ; \
+	    ${SED} ${FILES_SUBST_SED} $$f.orig > $$f ; \
 	done ; \
 	)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xfstt ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xfstt.1x ${PREFIX}/man/man1/xfstt.1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xfstt
-	${INSTALL_DATA} ${WRKSRC}/FAQ ${PREFIX}/share/doc/xfstt
-	${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/xfstt
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/xfstt
-	${INSTALL_DATA} ${WRKSRC}/THANKS ${PREFIX}/share/doc/xfstt
+	${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
-	${ECHO} belongs to xfstt pkg >${PREFIX}/lib/X11/fonts/TrueType/.keepme
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xfstt
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xfstt
+	cd ${WRKSRC} && (				\
+	${INSTALL_DATA} doc/FAQ CHANGES TODO THANKS	\
+		${PREFIX}/share/doc/xfstt/ ;		\
+	${INSTALL_DATA} doc/examples/font.properties	\
+		 ${PREFIX}/share/examples/xfstt/	\
+	)
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"