Update to version 1.0.

PR:		15315
Submitted by:	R.I.Pienaar <rip@pinetec.co.za>

5 files changed, 28 insertions, 24 deletions

diff --git a/x11-servers/Xfstt/Makefile b/x11-servers/Xfstt/Makefile
index 810d6d831f4d..bdf7eb2ffc1c 100644
--- a/x11-servers/Xfstt/Makefile
+++ b/x11-servers/Xfstt/Makefile
@@ -1,20 +1,19 @@
 # New ports collection makefile for:	Xfstt
-# Version required:	0.9.10
+# Version required:	1.0
 # Date created:		11 September 1998
 # Whom:			jabley@clear.co.nz
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Xfstt-0.9.10
+DISTNAME=	xfstt-1.0
 CATEGORIES=	x11-servers
 MASTER_SITES=	$(MASTER_SITE_SUNSITE)
 MASTER_SITE_SUBDIR=	X11/fonts
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jabley@clear.co.nz
 
-WRKSRC=		$(WRKDIR)/xfstt0910
+WRKSRC=		$(WRKDIR)/xfstt-1.0
 
 USE_X_PREFIX=	yes
 MAN1=		xfstt.1
diff --git a/x11-servers/Xfstt/distinfo b/x11-servers/Xfstt/distinfo
index 87369d9eba89..1719025646d3 100644
--- a/x11-servers/Xfstt/distinfo
+++ b/x11-servers/Xfstt/distinfo
@@ -1 +1 @@
-MD5 (Xfstt-0.9.10.tgz) = 9189cbcfb972fcc05e093aeccfd4d3b2
+MD5 (xfstt-1.0.tar.gz) = 1c5809f3f64c5000d86bed1baa25b616
diff --git a/x11-servers/Xfstt/files/patch-ab b/x11-servers/Xfstt/files/patch-ab
index 59088553138a..fc6fe3b284b0 100644
--- a/x11-servers/Xfstt/files/patch-ab
+++ b/x11-servers/Xfstt/files/patch-ab
@@ -1,19 +1,13 @@
---- xfstt.cpp.orig	Sun Oct 25 11:21:12 1998
-+++ xfstt.cpp	Wed Dec 23 19:29:11 1998
-@@ -8,7 +8,7 @@
- // if you are sure your X11 server doesn't request more
- // than it can handle, increase the limit up to 65535
+--- xfstt.cpp.orig	Fri Nov  5 00:49:57 1999
++++ xfstt.cpp	Mon Dec  6 17:01:54 1999
+@@ -11,8 +11,8 @@
  #define UNSTRAPLIMIT	10500U
--#define TTFONTDIR	"/usr/ttfonts"
-+#define TTFONTDIR	"/usr/X11R6/lib/X11/fonts/TrueType"
  
- #define MAXOPENFONTS 256
- #define MAXREPLYSIZE (1<<22)
-@@ -22,6 +22,7 @@
- #include "ttfn.h"
- #include "encoding.h"
+ // Change these if you don't lie being FHS complient
+-#define TTFONTDIR	"/usr/share/fonts/truetype"
+-#define TTCACHEDIR      "/var/cache/xfstt"
++#define TTFONTDIR	"/usr/X11R6/lib/X11/fonts/TrueType"
++#define TTCACHEDIR      "/usr/X11R6/lib/X11/fonts/TrueType"
  
-+#include <sys/types.h>
- #include <dirent.h>
- #include <string.h>
- #include <ctype.h>
+ #define TTINFO_LEAF     "ttinfo.dir"
+ #define TTNAME_LEAF     "ttname.dir"
diff --git a/x11-servers/Xfstt/files/patch-ac b/x11-servers/Xfstt/files/patch-ac
index 7bedac07abf6..955408c6b632 100644
--- a/x11-servers/Xfstt/files/patch-ac
+++ b/x11-servers/Xfstt/files/patch-ac
@@ -1,10 +1,10 @@
---- perftest.cpp.orig	Wed Dec 23 21:21:45 1998
-+++ perftest.cpp	Wed Dec 23 21:22:15 1998
+--- perftest.cpp.orig	Sat Jan  9 04:11:04 1999
++++ perftest.cpp	Mon Dec  6 16:53:06 1999
 @@ -1,7 +1,7 @@
  // test ttf engine performance
  // (C) Copyright 1997-1998 Herbert Duerr
  
--#define TTFONTDIR	"/usr/ttfonts"
+-#define TTFONTDIR	"/usr/share/fonts/truetype"
 +#define TTFONTDIR	"/usr/X11R6/lib/X11/fonts/TrueType"
  #define MAXFONTBUFSIZE (2048*2048)
  
diff --git a/x11-servers/Xfstt/files/patch-ad b/x11-servers/Xfstt/files/patch-ad
new file mode 100644
index 000000000000..645b2542ba1d
--- /dev/null
+++ b/x11-servers/Xfstt/files/patch-ad
@@ -0,0 +1,11 @@
+--- INSTALL.orig	Mon Dec  6 16:56:27 1999
++++ INSTALL	Mon Dec  6 16:56:48 1999
+@@ -2,7 +2,7 @@
+ 	make && make install
+    (use gmake instead of the standard make on FreeBSD)
+ 
+-2) Create a writeable directory /usr/share/fonts/truetype, copy some truetype *.ttf
++2) Create a writeable directory /usr/X11R6/lib/X11/fonts/TrueType, copy some truetype *.ttf
+    files or create soflinks to truetype directories in there, then run
+ 	xfstt --sync
+