9 files changed, 37 insertions, 57 deletions

diff --git a/x11-servers/Xfstt/Makefile b/x11-servers/Xfstt/Makefile
index 2023c5c22eb8..35572612e5d5 100644
--- a/x11-servers/Xfstt/Makefile
+++ b/x11-servers/Xfstt/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	xfstt
-PORTVERSION=	1.6
-PORTREVISION=	3
+PORTVERSION=	1.9.1
 CATEGORIES=	x11-servers
-MASTER_SITES=	${MASTER_SITE_BERLIOS}
+MASTER_SITES=	http://archive.hadrons.org/software/xfstt/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -13,7 +12,9 @@ COMMENT=	TrueType font server for X11
 
 OPTIONS_DEFINE=	DOCS
 
+USES=		tar:xz pkgconfig
 USE_XORG=	fontsproto xproto
+USE_RC_SUBR=	xfstt
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-nls
 
@@ -22,17 +23,17 @@ TTFONTDIR=	${PREFIX}/lib/X11/fonts/TrueType
 SUB_FILES=	pkg-message
 
 post-patch:
-.for file in INSTALL doc/xfstt.1x src/Makefile.in
-	@${REINPLACE_CMD} -e 's|%%TTFONTDIR%%|${TTFONTDIR}|g' ${WRKSRC}/${file}
+.for file in INSTALL doc/Makefile.in src/Makefile.in
+	${REINPLACE_CMD} -e 's|%%TTFONTDIR%%|${TTFONTDIR}|g' ${WRKSRC}/${file}
 .endfor
-	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${FILESDIR}/xfstt.sh \
-		> ${WRKSRC}/xfstt.sh
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/xfstt.sh ${STAGEDIR}${PREFIX}/etc/rc.d
-	@${MKDIR} ${STAGEDIR}${TTFONTDIR}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for _file in CHANGES INSTALL THANKS
+	${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${FILESDIR}/xfstt.in \
+		> ${WRKSRC}/xfstt
+	${INSTALL_SCRIPT} ${WRKSRC}/xfstt ${STAGEDIR}${PREFIX}/etc/rc.d/
+	${MKDIR} ${STAGEDIR}${TTFONTDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for _file in INSTALL THANKS
 	${INSTALL_DATA} ${WRKSRC}/${_file} ${STAGEDIR}${DOCSDIR}
 .endfor
 
diff --git a/x11-servers/Xfstt/distinfo b/x11-servers/Xfstt/distinfo
index a6206c63d81d..eb556427b595 100644
--- a/x11-servers/Xfstt/distinfo
+++ b/x11-servers/Xfstt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfstt-1.6.tar.gz) = a69f7b5651ecb50876950b7222d0f33b34413150cddc16fa44a923181aae9752
-SIZE (xfstt-1.6.tar.gz) = 346346
+SHA256 (xfstt-1.9.1.tar.xz) = aa62cfcb7b3b0698d66a9d6f335538512bcc68b6f233a99864e67022ad76bbde
+SIZE (xfstt-1.9.1.tar.xz) = 210704
diff --git a/x11-servers/Xfstt/files/patch-doc__Makefile.in b/x11-servers/Xfstt/files/patch-doc__Makefile.in
new file mode 100644
index 000000000000..af90725f4609
--- /dev/null
+++ b/x11-servers/Xfstt/files/patch-doc__Makefile.in
@@ -0,0 +1,13 @@
+--- doc/Makefile.in.orig	2014-11-24 20:13:07.000000000 +0100
++++ doc/Makefile.in	2014-11-24 20:13:33.000000000 +0100
+@@ -275,8 +275,8 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-fontdir = $(datadir)/fonts/truetype
+-cachedir = $(localstatedir)/cache/xfstt
++fontdir = %%TTFONTDIR%%
++cachedir = %%TTFONTDIR%%
+ pidfile = $(localstatedir)/run/xfstt.pid
+ man_MANS = xfstt.1x
+ EXTRA_DIST = xfstt.1x.in xfstt.lsm FAQ examples
diff --git a/x11-servers/Xfstt/files/patch-doc__xfstt.1x b/x11-servers/Xfstt/files/patch-doc__xfstt.1x
deleted file mode 100644
index 68fb563154c9..000000000000
--- a/x11-servers/Xfstt/files/patch-doc__xfstt.1x
+++ /dev/null
@@ -1,17 +0,0 @@
---- doc/xfstt.1x.orig	Thu Nov 14 21:08:07 2002
-+++ doc/xfstt.1x	Wed Nov 20 22:35:57 2002
-@@ -58,12 +58,12 @@
- .I "\-\-dir name"
- Change xfstt's font directory.
- The default directory is
--.IR /usr/share/fonts/truetype .
-+.IR %%TTFONTDIR%% .
- .TP
- .I "\-\-cache name"
- Change xfstt's font cache directory.
- The default directory is
--.IR /var/cache/xfstt .
-+.IR %%TTFONTDIR%% .
- .TP
- .I "\-\-pidfile name"
- Change xfstt's pidfile location.
diff --git a/x11-servers/Xfstt/files/patch-libfstt__ttf.h b/x11-servers/Xfstt/files/patch-libfstt__ttf.h
deleted file mode 100644
index 8abc5c2fb420..000000000000
--- a/x11-servers/Xfstt/files/patch-libfstt__ttf.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- libfstt/ttf.h.orig	Thu Aug  7 15:20:44 2003
-+++ libfstt/ttf.h	Wed Sep  3 08:03:38 2003
-@@ -49,10 +49,10 @@
- #endif
- 
- #ifndef DEBUG
--#  define debug(format, ...)
-+#  define debug(format, ARGS...)
- #  define STATIC static
- #else
--#  define debug(format, ...)	fprintf(outfile, format, ##__VA_ARGS__)
-+#  define debug(format, ARGS...)	fprintf(outfile, format, ##ARGS)
- #  define STATIC
- #endif
- 
diff --git a/x11-servers/Xfstt/files/patch-src__Makefile.in b/x11-servers/Xfstt/files/patch-src__Makefile.in
index d86fc6de4bc9..c0062ce4ff1e 100644
--- a/x11-servers/Xfstt/files/patch-src__Makefile.in
+++ b/x11-servers/Xfstt/files/patch-src__Makefile.in
@@ -1,13 +1,13 @@
---- src/Makefile.in.orig	Thu Aug  7 15:58:28 2003
-+++ src/Makefile.in	Thu Sep  4 09:44:20 2003
-@@ -163,8 +163,8 @@
- target_alias = @target_alias@
- 
- localedir = $(datadir)/locale
+--- src/Makefile.in.orig	2014-11-24 20:10:25.000000000 +0100
++++ src/Makefile.in	2014-11-24 20:10:57.000000000 +0100
+@@ -327,8 +327,8 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -fontdir = $(datadir)/fonts/truetype
 -cachedir = $(localstatedir)/cache/xfstt
 +fontdir = %%TTFONTDIR%%
 +cachedir = %%TTFONTDIR%%
  pidfile = $(localstatedir)/run/xfstt.pid
- 
- LDADD = @LIBINTL@ -L$(top_srcdir)/libfstt -lfstt
+ LDADD = @LIBINTL@ -L$(top_builddir)/libfstt -lfstt
+ AM_CPPFLAGS = -DLOCALEDIR=\""$(localedir)\"" -DFONTDIR=\""$(fontdir)\"" \
diff --git a/x11-servers/Xfstt/files/xfstt.sh b/x11-servers/Xfstt/files/xfstt.in
index 60c0691185b1..60c0691185b1 100644
--- a/x11-servers/Xfstt/files/xfstt.sh
+++ b/x11-servers/Xfstt/files/xfstt.in
diff --git a/x11-servers/Xfstt/pkg-descr b/x11-servers/Xfstt/pkg-descr
index 483ed697816a..578d637d437d 100644
--- a/x11-servers/Xfstt/pkg-descr
+++ b/x11-servers/Xfstt/pkg-descr
@@ -1,3 +1,3 @@
 This is Xfstt, a free TrueType font server for X11.
 
-WWW: http://developer.berlios.de/projects/xfstt/
+WWW: http://www.hadrons.org/software/xfstt/
diff --git a/x11-servers/Xfstt/pkg-plist b/x11-servers/Xfstt/pkg-plist
index 662a3dc49347..e3ffdf468a1b 100644
--- a/x11-servers/Xfstt/pkg-plist
+++ b/x11-servers/Xfstt/pkg-plist
@@ -1,10 +1,8 @@
 bin/xfstt
-etc/rc.d/xfstt.sh
 man/man1/xfstt.1x.gz
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @rmtry lib/X11/fonts/TrueType/ttname.dir
 @rmtry lib/X11/fonts/TrueType/ttinfo.dir
-@dirrmtry lib/X11/fonts/TrueType
+@dir lib/X11/fonts/TrueType