5 files changed, 21 insertions, 40 deletions
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