summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Baergen <joshuabaergen@gentoo.org>2005-12-14 18:30:53 +0000
committerJoshua Baergen <joshuabaergen@gentoo.org>2005-12-14 18:30:53 +0000
commit727fccf0c5d6b20601e3f5d0043bc5b0b8260d95 (patch)
tree435aeb90a76901b4488e38ba25bf13a0d2f101ab /x11-misc
parentttmkfdir was moved from x11-misc to x11-apps. (diff)
downloadgentoo-2-727fccf0c5d6b20601e3f5d0043bc5b0b8260d95.tar.gz
gentoo-2-727fccf0c5d6b20601e3f5d0043bc5b0b8260d95.tar.bz2
gentoo-2-727fccf0c5d6b20601e3f5d0043bc5b0b8260d95.zip
ttmkfdir was moved to x11-apps.
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/ttmkfdir/ChangeLog196
-rw-r--r--x11-misc/ttmkfdir/Manifest15
-rw-r--r--x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9-r21
-rw-r--r--x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9-r31
-rw-r--r--x11-misc/ttmkfdir/files/ttmkfdir-1.0-gentoo.diff46
-rw-r--r--x11-misc/ttmkfdir/files/ttmkfdir-2.0-gentoo.patch24
-rw-r--r--x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-cpp.patch11
-rw-r--r--x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-encoding.patch73
-rw-r--r--x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-freetype_new_includes.patch44
-rw-r--r--x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-gcc33.patch11
-rw-r--r--x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-gcc34.patch35
-rw-r--r--x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-zlib.patch80
-rw-r--r--x11-misc/ttmkfdir/files/ttmkfdir2-ignore-FIRSTINDEX.patch11
-rw-r--r--x11-misc/ttmkfdir/metadata.xml6
-rw-r--r--x11-misc/ttmkfdir/ttmkfdir-3.0.9-r2.ebuild51
-rw-r--r--x11-misc/ttmkfdir/ttmkfdir-3.0.9-r3.ebuild50
16 files changed, 0 insertions, 655 deletions
diff --git a/x11-misc/ttmkfdir/ChangeLog b/x11-misc/ttmkfdir/ChangeLog
deleted file mode 100644
index 9fa0d75e5323..000000000000
--- a/x11-misc/ttmkfdir/ChangeLog
+++ /dev/null
@@ -1,196 +0,0 @@
-# ChangeLog for x11-misc/ttmkfdir
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ChangeLog,v 1.53 2005/05/16 14:46:32 seemant Exp $
-
-*ttmkfdir-3.0.9-r3 (16 May 2005)
-
- 16 May 2005; Seemant Kulleen <seemant@gentoo.org> -ttmkfdir-3.0.9.ebuild,
- -ttmkfdir-3.0.9-r1.ebuild, +ttmkfdir-3.0.9-r3.ebuild:
- change installation to /usr from /usr/X11R6. Thanks to TGL
- <degrenier@easyconnect.fr> in bug #90803
-
- 07 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
- ttmkfdir-3.0.9-r2.ebuild:
- (#80967) Filter -fstack-protector.
-
- 28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
- Change encoding to UTF-8 for GLEP 31 compliance
-
- 21 Dec 2004; foser <foser@gentoo.org> ttmkfdir-3.0.9-r2.ebuild :
- Add patch to fix build issues with newer freetypes (#44119)
-
- 17 Nov 2004; Markus Rothe <corsair@gentoo.org> ttmkfdir-3.0.9-r2.ebuild:
- Stable on ppc64
-
- 11 Nov 2004; Mike Frysinger <vapier@gentoo.org> ttmkfdir-3.0.9-r2.ebuild:
- Filter -foptimize-sibling-calls also #70627 by Joerg Schaible.
-
- 06 Nov 2004; Lars Weiler <pylon@gentoo.org> ttmkfdir-3.0.9-r2.ebuild:
- Stable on ppc.
-
- 03 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
- ttmkfdir-3.0.9-r1.ebuild, ttmkfdir-3.0.9-r2.ebuild, ttmkfdir-3.0.9.ebuild:
- Move eclass from gcc to toolchain-funcs.
-
- 23 Oct 2004; Aron Griffis <agriffis@gentoo.org> ttmkfdir-3.0.9-r2.ebuild:
- stable on ia64
-
- 19 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
- ttmkfdir-3.0.9-r2.ebuild:
- Stable on alpha.
-
- 18 Oct 2004; Stephen P. Becker <geoman@gentoo.org>
- ttmkfdir-3.0.9-r2.ebuild:
- stable on mips wrt bug 67326
-
- 13 Oct 2004; Travis Tilley <lv@gentoo.org> ttmkfdir-3.0.9-r2.ebuild:
- stable on amd64
-
- 13 Oct 2004; Guy Martin <gmsoft@gentoo.org> ttmkfdir-3.0.9-r2.ebuild:
- Stable on hppa.
-
- 12 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
- ttmkfdir-3.0.9-r2.ebuild:
- x86. See bug #67326.
-
- 25 Sep 2004; Ferris McCormick <fmccor@gentoo.org> ttmkfdir-3.0.9-r2.ebuild:
- Stable for sparc. Required for xorg-x11-6.8.0-r1.
-
-*ttmkfdir-3.0.9-r2 (02 Sep 2004)
-
- 02 Sep 2004; Seemant Kulleen <seemant@gentoo.org> +metadata.xml,
- +files/ttmkfdir-3.0.9-encoding.patch, -ttmkfdir-3.0.4.ebuild,
- +ttmkfdir-3.0.9-r2.ebuild:
- added ttmkfdir-3.0.9-encodings.patch to stop ttmkfdir from segfaulting on the
- newer x.org encodings. Patch is a combination of the one in comment 19 by:
- Benoit Boissinot <b.boissinot@ifrance.com> in bug #60470 and Benjamin
- Schindler <config@gmx.ch> in bug #62427.
-
- 16 Jul 2004; Tom Gall <tgall@gentoo.org> ttmkfdir-3.0.9-r1.ebuild:
- stable on ppc64
-
- 28 Jun 2004; Aron Griffis <agriffis@gentoo.org> ttmkfdir-3.0.9-r1.ebuild:
- glibc -> libc
-
- 19 Jun 2004; <pyrania@gentoo.org> ttmkfdir-3.0.9.ebuild:
- Removed default ${S}.
-
- 14 Jun 2004; Tom Gall <tgall@gentoo.org> ttmkfdir-3.0.9-r1.ebuild:
- ~ppc64, initial x support bug #53763
-
- 12 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> ttmkfdir-3.0.9-r1.ebuild:
- Stable on alpha.
-
- 22 Apr 2004; Travis Tilley <lv@gentoo.org>
- +files/ttmkfdir-3.0.9-gcc34.patch, ttmkfdir-3.0.9-r1.ebuild:
- added fix for compiling with gcc 3.4
-
- 13 Apr 2004; Guy Martin <gmsoft@gentoo.org> ttmkfdir-3.0.9-r1.ebuild:
- Marked stable on hppa.
-
- 26 Mar 2004; Jason Wever <weeve@gentoo.org> ttmkfdir-3.0.9-r1.ebuild:
- Marked stable on sparc.
-
- 17 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
- ttmkfdir-3.0.9-r1.ebuild:
- don't assign default to S; tighten DEPEND (bug #44820); use emake; use
- filter-flags correctly; error check/messages
-
- 17 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> ttmkfdir-1.0.ebuild,
- ttmkfdir-2.0-r1.ebuild, ttmkfdir-2.0.ebuild:
- tidy older ebuilds
-
- 06 Feb 2004; Brandon Hale <tseng@gentoo.org> ttmkfdir-3.0.9-r1.ebuild,
- ttmkfdir-3.0.9.ebuild:
- Filter all -O levels, these cause the build to fail. (Bug #40411)
-
- 28 Jan 2004; Aron Griffis <agriffis@gentoo.org> ttmkfdir-3.0.9.ebuild:
- stable on alpha and ia64
-
- 28 Dec 2003; Joshua Kinard <kumba@gentoo.org> ttmkfdir-3.0.9.ebuild:
- Move to mips stable (~mips -> mips)
-
- 14 Nov 2003; Aron Griffis <agriffis@gentoo.org> ttmkfdir-3.0.9-r1.ebuild:
- Stable on ia64
-
- 13 Nov 2003; <tuxus@gentoo.org> ttmkfdir-3.0.4.ebuild:
- Added mips to KEYWORDS
-
-*ttmkfdir-3.0.9-r1 (02 Nov 2003)
-
- 04 Nov 2003; Joshua Kinard <kumba@gentoo.org> ttmkfdir-3.0.9-r1.ebuild:
- Added ~mips to KEYWORDS
-
- 02 Nov 2003; Martin Schlemmer <azarah@gentoo.org> ttmkfdir-3.0.9-r1.ebuild,
- files/ttmkfdir-3.0.9-cpp.patch, files/ttmkfdir-3.0.9-zlib.patch:
- Add patches from Redhat to fix my gcc3 patch, and add native gzip support.
-
- 21 Jul 2003; Martin Schlemmer <azarah@gentoo.org> ttmkfdir-3.0.4.ebuild,
- ttmkfdir-3.0.9.ebuild, files/ttmkfdir-3.0.9-gcc33.patch:
- Fix issues with gcc-3.3.
-
-*ttmkfdir-3.0.9 (16 Mar 2003)
-
- 05 Aug 2003; Guy Martin <gmsoft@gentoo.org> ttmkfdir-3.0.9.ebuild :
- Added hppa to KEYWORDS.
-
- 08 Apr 2003; Todd Sunderlin <todd@gentoo.org> ttmkfdir-3.0.9.ebuild:
- Marked stable for sparc
-
- 16 Mar 2003; Martin Schlemmer <azarah@gentoo.org> ttmkfdir-3.0.9.ebuild :
- New version.
-
- 08 Jan 2003; Martin Schlemmer <azarah@gentoo.org> ttmkfdir-3.0.4.ebuild :
-
- Mark stable for x86.
-
-*ttmkfdir-3.0.4 (23 Dec 2002)
-
- 16 Mar 2003; Guy Martin <gmsoft@gentoo.org> ttmkfdir-3.0.4.ebuild :
- Added hppa to keywords.
-
- 15 Mar 2003; Mark Guertin <gerk@gentoo.org> ttmkfdir-3.0.4.ebuild:
- set ppc in keywords
-
- 12 Mar 2003; Zach Welch <zwelch@gentoo.org> ttmkfdir-3.0.4.ebuild:
- add arm keyword
-
- 21 Feb 2003; Aron Griffis <agriffis@gentoo.org> ttmkfdir-3.0.4.ebuild :
- Mark stable on alpha
-
- 23 Dec 2002; Martin Schlemmer <azarah@gentoo.org> ttmkfdir-3.0.4.ebuild :
-
- Updated sources from Redhat.
-
-*ttmkfdir-2.0-r1 (23 Dec 2002)
-
- 23 Dec 2002; Martin Schlemmer <azarah@gentoo.org> ttmkfdir-2.0-r1.ebuild :
-
- Fix ttmkfdir to ignore FIRSTINDEX it usually borks on.
-
- 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
-
- 28 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
-
- Change all the ebuild to reflect the "true" versions (1.0 and 2.0).
- Also add "alpha" to KEYWORDS, as it build fine for alpha in xfree.
-
-*ttmkfdir-1.0 (20 Oct 2002)
-
- 20 Oct 2002; Martin Schlemmer <azarah@gentoo.org> ttmkfdir-1.0.ebuild :
-
- Add version of ttmkfdir that works with freetype2. Should close bug #9354.
-
-*ttmkfdir-0.0-r1 (1 Feb 2002)
-
- 20 Oct 2002; Calum Selkirk <cselkirk@gentoo.org> ttmkfdir-0.0-r1.ebuild :
-
- Added ppc to KEYWORDS.
-
- 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-
- Added initial ChangeLog which should be updated whenever the package is
- updated in any way. This changelog is targetted to users. This means that the
- comments should well explained and written in clean English. The details about
- writing correct changelogs are explained in the skel.ChangeLog file which you
- can find in the root directory of the portage repository.
diff --git a/x11-misc/ttmkfdir/Manifest b/x11-misc/ttmkfdir/Manifest
deleted file mode 100644
index eef20a6ff5cc..000000000000
--- a/x11-misc/ttmkfdir/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 cdf8a77d5fc7ba8a26a2bb79c4bd9246 ChangeLog 6901
-MD5 36a69eed0e585f3dcf096cc82ac54575 metadata.xml 230
-MD5 ce12e4f3d2776f7cf7bd6b5ee2e0115b ttmkfdir-3.0.9-r2.ebuild 1270
-MD5 2fc9638e5405e100c94b46091d41d775 ttmkfdir-3.0.9-r3.ebuild 1363
-MD5 8d09eeb49f560873b6b4b85755ce5502 files/digest-ttmkfdir-3.0.9-r2 66
-MD5 d1defff244ae210e4ba3da97b5443b4c files/ttmkfdir-1.0-gentoo.diff 1190
-MD5 e285b7a7c7369e7947c0997de817d3ce files/ttmkfdir-2.0-gentoo.patch 688
-MD5 255516ccdde8cad5c8f7b6659f4bdde2 files/ttmkfdir-3.0.9-cpp.patch 505
-MD5 11a05e48e2bba01444957f6049353fc7 files/ttmkfdir-3.0.9-encoding.patch 2334
-MD5 5364b626b96f3a393fad212b3d99aa29 files/ttmkfdir-3.0.9-freetype_new_includes.patch 1199
-MD5 2f9cb69179e04e61bd5666c2c4833a36 files/ttmkfdir-3.0.9-gcc33.patch 529
-MD5 4a98d364009103c5afb6552165049585 files/ttmkfdir-3.0.9-gcc34.patch 878
-MD5 537b2fa79d0feee2ffd2f994b227eb12 files/ttmkfdir-3.0.9-zlib.patch 1913
-MD5 9b84e6d68d388eb67760658ba28d05c8 files/ttmkfdir2-ignore-FIRSTINDEX.patch 440
-MD5 8d09eeb49f560873b6b4b85755ce5502 files/digest-ttmkfdir-3.0.9-r3 66
diff --git a/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9-r2 b/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9-r2
deleted file mode 100644
index 23c8357a597c..000000000000
--- a/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7fbf13e432aa519669899b13d00673f3 ttmkfdir-3.0.9.tar.bz2 20160
diff --git a/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9-r3 b/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9-r3
deleted file mode 100644
index 23c8357a597c..000000000000
--- a/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7fbf13e432aa519669899b13d00673f3 ttmkfdir-3.0.9.tar.bz2 20160
diff --git a/x11-misc/ttmkfdir/files/ttmkfdir-1.0-gentoo.diff b/x11-misc/ttmkfdir/files/ttmkfdir-1.0-gentoo.diff
deleted file mode 100644
index 37d8f7055b68..000000000000
--- a/x11-misc/ttmkfdir/files/ttmkfdir-1.0-gentoo.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ur ttmkfdir.orig/Makefile ttmkfdir/Makefile
---- ttmkfdir.orig/Makefile Thu Sep 10 12:54:26 1998
-+++ ttmkfdir/Makefile Thu Mar 1 15:29:38 2001
-@@ -1,10 +1,11 @@
--FREETYPE_BASE=../freetype-1.1
--FREETYPE_INCL=$(FREETYPE_BASE)/lib
--FREETYPE_LIB=-L$(FREETYPE_BASE)/lib/.libs -lttf
-+FREETYPE_BASE=/usr
-+FREETYPE_INCL=-I$(FREETYPE_BASE)/include
-+FREETYPE_LIB=-L$(FREETYPE_BASE)/lib -lttf
-
- CC=gcc
--CFLAGS=-Wall -pedantic -I$(FREETYPE_INCL)
--LDFALGS=$(FREETYPE_LIB) -s
-+OPT=-O2
-+CFLAGS=$(OPT) -Wall -pedantic $(FREETYPE_INCL)
-+LDFLAGS=$(FREETYPE_LIB)
-
- all: ttmkfdir
-
-@@ -18,7 +19,11 @@
- ln $< $@
-
- ttmkfdir: ttmkfdir.o
-- $(CC) -o $@ $< $(LDFALGS)
-+ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
-+
-+install: all
-+ mkdir -p $(DESTDIR)/usr/X11R6/bin
-+ install -c -m 755 ttmkfdir $(DESTDIR)/usr/X11R6/bin
-
- ttmkfdir.o: ttmkfdir.c panose.h ttos2val.h
-
-Only in ttmkfdir: Makefile~
-diff -ur ttmkfdir.orig/ttmkfdir.c ttmkfdir/ttmkfdir.c
---- ttmkfdir.orig/ttmkfdir.c Wed Sep 9 08:50:50 1998
-+++ ttmkfdir/ttmkfdir.c Thu Mar 1 15:09:51 2001
-@@ -61,7 +61,7 @@
- #include <ctype.h>
- #include <errno.h>
-
--#include <freetype.h>
-+#include <freetype/freetype.h>
-
- #include "panose.h"
- #include "ttos2val.h"
diff --git a/x11-misc/ttmkfdir/files/ttmkfdir-2.0-gentoo.patch b/x11-misc/ttmkfdir/files/ttmkfdir-2.0-gentoo.patch
deleted file mode 100644
index 181365d28dbf..000000000000
--- a/x11-misc/ttmkfdir/files/ttmkfdir-2.0-gentoo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN ttmkfdir2/Makefile ttmkfdir2.azarah/Makefile
---- ttmkfdir2/Makefile.orig 2002-03-14 16:03:49.000000000 +0200
-+++ ttmkfdir2/Makefile 2002-10-13 03:55:17.000000000 +0200
-@@ -2,7 +2,7 @@
- FREETYPE_INCL=-I$(FREETYPE_BASE)/.
- FREETYPE_LIB=/usr/lib/libfreetype.so
-
--DEBUG=-ggdb
-+DEBUG=
- CXX=g++
- CXXFLAGS=-Wall -pedantic $(FREETYPE_INCL) $(DEBUG)
-
-diff -urN ttmkfdir2/ttf.h ttmkfdir2.azarah/ttf.h
---- ttmkfdir2/ttf.h.orig 2002-03-13 20:16:38.000000000 +0200
-+++ ttmkfdir2/ttf.h 2002-10-13 03:46:34.000000000 +0200
-@@ -43,7 +43,7 @@
- FT_Face face;
- TT_OS2 *os2;
- TT_Postscript *post;
-- string FileName;
-+ std::string FileName;
- };
- };
-
diff --git a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-cpp.patch b/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-cpp.patch
deleted file mode 100644
index 58839eda9673..000000000000
--- a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-cpp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ttmkfdir-3.0.9/ttf.cpp.sopwith Thu Aug 7 12:49:08 2003
-+++ ttmkfdir-3.0.9/ttf.cpp Thu Aug 7 12:50:01 2003
-@@ -239,7 +239,7 @@
- for (i = 0; i < n; i++) {
- if ((fterror = FT_Get_Sfnt_Name (face, i, &NamePtr)) != FT_Err_Ok) {
- std::cout << "Warning: Can't SFNT name : " << FileName << "(" << fterror << ")" << std::endl;
-- return;
-+ return NULL;
- };
- platform = NamePtr.platform_id;
- encoding = NamePtr.encoding_id;
diff --git a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-encoding.patch b/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-encoding.patch
deleted file mode 100644
index 30f0170f4b3b..000000000000
--- a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-encoding.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -urN ttmkfdir-3.0.9.orig/directory.cpp ttmkfdir-3.0.9/directory.cpp
---- ttmkfdir-3.0.9.orig/directory.cpp 2002-12-09 00:29:11.000000000 -0800
-+++ ttmkfdir-3.0.9/directory.cpp 2004-09-02 23:42:16.000000000 -0700
-@@ -9,10 +9,12 @@
- {
- }
-
--void
-+int
- directory::scan (const std::string &dir)
- {
- DIR *ttfdir = opendir(dir.c_str ());
-+ if(!ttfdir)
-+ return -1;
-
- this->clear ();
- dirpath = dir;
-@@ -26,6 +28,7 @@
- }
-
- closedir (ttfdir);
-+ return 0;
- }
-
- bool
-diff -urN ttmkfdir-3.0.9.orig/directory.h ttmkfdir-3.0.9/directory.h
---- ttmkfdir-3.0.9.orig/directory.h 2002-12-09 00:29:11.000000000 -0800
-+++ ttmkfdir-3.0.9/directory.h 2004-09-02 23:42:16.000000000 -0700
-@@ -11,7 +11,7 @@
- if (path != "") scan (path);
- };
- virtual ~directory (void);
-- void scan (const std::string &path = ".");
-+ int scan (const std::string &path = ".");
- virtual bool select (const char *name) const;
- const std::string &path (void) const {
- return dirpath;
-diff -urN ttmkfdir-3.0.9.orig/encoding.l ttmkfdir-3.0.9/encoding.l
---- ttmkfdir-3.0.9.orig/encoding.l 2003-01-07 21:25:25.000000000 -0800
-+++ ttmkfdir-3.0.9/encoding.l 2004-09-02 23:42:51.000000000 -0700
-@@ -108,7 +108,7 @@
- }
-
- /* now mark all the unassigned codes */
-- for (long i = i1; i <= i2; i++) {
-+ for (long i = i1; i <= i2 && i < cur_enc->size; i++) {
- (*cur_map)[i] = -1;
- }
- }
-@@ -140,7 +140,7 @@
- break;
- }
-
-- for (i = start_range; i <= end_range; i++, target++) {
-+ for (i = start_range; i <= end_range && i < cur_enc->size; i++, target++) {
- (*cur_map)[i] = target;
- }
- cur_enc->enc_size = cur_enc->enc_size + end_range - start_range + 1;
-diff -urN ttmkfdir-3.0.9.orig/ttmkfdir.cpp ttmkfdir-3.0.9/ttmkfdir.cpp
---- ttmkfdir-3.0.9.orig/ttmkfdir.cpp 2003-01-19 15:33:11.000000000 -0800
-+++ ttmkfdir-3.0.9/ttmkfdir.cpp 2004-09-02 23:42:16.000000000 -0700
-@@ -60,7 +60,10 @@
- return 0;
- }
-
-- dir::instance()->scan (cmdline::instance()->option ("font-dir"));
-+ if(dir::instance()->scan (cmdline::instance()->option ("font-dir")) == -1) {
-+ printf("No such directory...\n");
-+ return -1;
-+ }
-
- for (directory::iterator i = dir::instance()->begin (); i != dir::instance()->end(); i++) {
- const ttf::Face face (dir::instance()->path() + '/' + *i);
diff --git a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-freetype_new_includes.patch b/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-freetype_new_includes.patch
deleted file mode 100644
index a5ded9fbe492..000000000000
--- a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-freetype_new_includes.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- ttmkfdir-3.0.9/encoding.cpp.orig 2002-12-09 17:52:48.000000000 +0900
-+++ ttmkfdir-3.0.9/encoding.cpp 2004-01-31 18:16:46.617118976 +0900
-@@ -4,7 +4,6 @@
- #include <cstring>
- #include <unistd.h>
- #include <zlib.h>
--#include "freetype/freetype.h"
-
- #include "ttmkfdir.h"
- #include "encoding.h"
---- ttmkfdir-3.0.9/encoding.h.orig 2002-12-09 17:52:48.000000000 +0900
-+++ ttmkfdir-3.0.9/encoding.h 2004-01-31 18:19:18.600014064 +0900
-@@ -6,7 +6,8 @@
- #include <map>
- #include <string>
-
--#include "freetype/freetype.h"
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-
- #include "util.h"
-
---- ttmkfdir-3.0.9/ttf.h.orig 2003-01-08 14:25:25.000000000 +0900
-+++ ttmkfdir-3.0.9/ttf.h 2004-01-31 18:32:53.333155800 +0900
-@@ -3,12 +3,13 @@
- #define TTF_H__
-
- #include <string>
--#include "freetype/freetype.h"
--#include "freetype/tttables.h"
--#include "freetype/ftsnames.h"
--#include "freetype/ttnameid.h"
--#include "freetype/fterrors.h"
--#include "freetype/ftmodule.h"
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-+#include FT_SFNT_NAMES_H
-+#include FT_TRUETYPE_TABLES_H
-+#include FT_TRUETYPE_IDS_H
-+#include FT_ERRORS_H
-+#include FT_MODULE_H
-
- #include "util.h"
- #include "encoding.h"
diff --git a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-gcc33.patch b/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-gcc33.patch
deleted file mode 100644
index c8f41458003d..000000000000
--- a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-gcc33.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ttmkfdir-3.0.9/ttf.cpp.orig 2003-07-21 23:14:21.000000000 +0200
-+++ ttmkfdir-3.0.9/ttf.cpp 2003-07-21 23:15:35.000000000 +0200
-@@ -239,7 +239,7 @@
- for (i = 0; i < n; i++) {
- if ((fterror = FT_Get_Sfnt_Name (face, i, &NamePtr)) != FT_Err_Ok) {
- std::cout << "Warning: Can't SFNT name : " << FileName << "(" << fterror << ")" << std::endl;
-- return;
-+ return "invalid";
- };
- platform = NamePtr.platform_id;
- encoding = NamePtr.encoding_id;
diff --git a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-gcc34.patch b/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-gcc34.patch
deleted file mode 100644
index 7df899ef2e59..000000000000
--- a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-gcc34.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Nurd builtin.cpp.old builtin.cpp
---- builtin.cpp.old 2004-04-22 16:26:16.175065656 -0400
-+++ builtin.cpp 2004-04-22 16:27:06.042484656 -0400
-@@ -600,7 +600,7 @@
- 0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff
- };
-
--};
-+}
-
- Encoding::BuiltinEncoding_t Encoding::builtin_encodings[] = {
- {256,191,32,{TT_PLATFORM_MICROSOFT,TT_MS_ID_UNICODE_CS,iso8859_1},{"iso8859-1",}},
-diff -Nurd ttf.h.old ttf.h
---- ttf.h.old 2004-04-22 16:26:16.176065504 -0400
-+++ ttf.h 2004-04-22 16:27:06.042484656 -0400
-@@ -49,7 +49,7 @@
- TT_Postscript *post;
- std::string FileName;
- };
--};
-+}
-
- #endif /* TTF_H__ */
-
-diff -Nurd util.h.old util.h
---- util.h.old 2004-04-22 16:26:16.176065504 -0400
-+++ util.h 2004-04-22 16:27:06.042484656 -0400
-@@ -17,6 +17,6 @@
- Singleton (void) {};
- ~Singleton (void) {};
- };
--};
-+}
-
- #endif // TTMKFDIRUTIL_H__
diff --git a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-zlib.patch b/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-zlib.patch
deleted file mode 100644
index 548a49e3c669..000000000000
--- a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-zlib.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- ttmkfdir-3.0.9/encoding.cpp 2002-12-09 03:52:48.000000000 -0500
-+++ ttmkfdir-3.0.9/encoding.cpp 2003-09-12 12:32:29.000000000 -0400
-@@ -2,6 +2,8 @@
- #include <cstdio>
- #include <cstdlib>
- #include <cstring>
-+#include <unistd.h>
-+#include <zlib.h>
- #include "freetype/freetype.h"
-
- #include "ttmkfdir.h"
-@@ -32,9 +34,16 @@
- NextFile (FILE *f, char *name)
- {
- char file_name [1024];
-- char command[1024];
-+ char line_buf [1024];
-+ char tmp_file_name[] = "/tmp/ttmkfdir_XXXXXX";
-+ char inbuf[300000];
-+ FILE *od;
-+ gzFile fd;
-+ int rvalue, tmpfd;
-
-- if (fscanf (f, "%*s %[^\n]\n", file_name) == 1) {
-+ if (fgets (line_buf, sizeof(line_buf), f) != NULL) {
-+
-+ sscanf (line_buf, "%*s %[^\n]\n", file_name);
-
- if (file_name[0] == '/') {
- name[0] = 0;
-@@ -44,9 +53,25 @@
-
- strcat (name, file_name);
-
-- sprintf (command, "exec %s < %s", (toupper(name[strlen (name) - 1]) == 'Z')
-- ? "gzip -d" : "cat", name);
-- return popen (command, "r");
-+ bzero(inbuf, sizeof(inbuf));
-+
-+ fd = gzopen (name,"rb");
-+ rvalue = gzread (fd, inbuf, sizeof(inbuf));
-+
-+ tmpfd = mkstemp (tmp_file_name);
-+ if (tmpfd == -1) {
-+ return 0;
-+ }
-+
-+ od = fdopen (tmpfd,"w");
-+ fputs (inbuf, od);
-+ fflush (od);
-+ fclose (od);
-+
-+ od = fopen (tmp_file_name,"r");
-+ unlink (tmp_file_name);
-+ return od;
-+
- }
-
- return 0;
-@@ -75,7 +100,7 @@
- yyrestart (input);
- yylex (name, *this);
-
-- pclose (input);
-+ fclose (input);
- }
-
- fclose (f);
-diff -uNr ttmkfdir-3.0.9.orig/Makefile ttmkfdir-3.0.9/Makefile
---- ttmkfdir-3.0.9.orig/Makefile 2003-08-21 17:43:13.000000000 +1000
-+++ ttmkfdir-3.0.9/Makefile 2003-08-21 17:40:16.000000000 +1000
-@@ -28,7 +28,7 @@
- DEBUG=-ggdb
- CXX=g++
- CXXFLAGS=-Wall -pedantic $(FREETYPE_INCL) $(DEBUG) $(OPTFLAGS)
--LDFLAGS=$(FREETYPE_LIB) $(DEBUG)
-+LDFLAGS=$(FREETYPE_LIB) $(DEBUG) -lz
-
- DESTDIR=
- PREFIX=/usr
diff --git a/x11-misc/ttmkfdir/files/ttmkfdir2-ignore-FIRSTINDEX.patch b/x11-misc/ttmkfdir/files/ttmkfdir2-ignore-FIRSTINDEX.patch
deleted file mode 100644
index c2652966e6a1..000000000000
--- a/x11-misc/ttmkfdir/files/ttmkfdir2-ignore-FIRSTINDEX.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ttmkfdir2/encoding.l.orig 2002-12-23 03:22:27.000000000 +0200
-+++ ttmkfdir2/encoding.l 2002-12-23 03:28:39.000000000 +0200
-@@ -167,7 +167,7 @@
- }
-
- [[:alnum:]]+ {
-- if (YY_START != INSIDE_UNKNOWN_MAP) {
-+ if ((YY_START != INSIDE_UNKNOWN_MAP) && (0 != strcmp(yytext,"FIRSTINDEX"))) {
- std::cerr << "unexpected token " << yytext << " in file " <<
- current_file << ", line " << line_number << std::endl;
- switch (YY_START) {
diff --git a/x11-misc/ttmkfdir/metadata.xml b/x11-misc/ttmkfdir/metadata.xml
deleted file mode 100644
index f3639d375dc6..000000000000
--- a/x11-misc/ttmkfdir/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>X11</herd>
-<longdescription>X11 implementation by X.Org Foundation</longdescription>
-</pkgmetadata>
diff --git a/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r2.ebuild b/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r2.ebuild
deleted file mode 100644
index 26e0afed480c..000000000000
--- a/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r2.ebuild,v 1.16 2005/02/08 02:46:34 spyderous Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A utility to create a fonts.scale file from a set of TrueType fonts"
-HOMEPAGE="http://www.joerg-pommnitz.de/TrueType/xfsft.html"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-RDEPEND="virtual/libc
- sys-libs/zlib
- >=media-libs/freetype-2.0.8"
-
-DEPEND="${RDEPEND}
- >=sys-devel/flex-2.5.4a-r5
- sys-devel/libtool"
-
-src_unpack() {
-
- unpack ${A}
-
- cd ${S}
- epatch ${FILESDIR}/${P}-cpp.patch
- epatch ${FILESDIR}/${P}-zlib.patch
- epatch ${FILESDIR}/${P}-gcc34.patch
- epatch ${FILESDIR}/${P}-encoding.patch
- # fix pack to work with new freetype include scheme (#44119)
- epatch ${FILESDIR}/${P}-freetype_new_includes.patch
-
-}
-
-src_compile() {
- filter-flags -O -O? -foptimize-sibling-calls -fstack-protector
- emake \
- CXX="$(tc-getCXX)" \
- OPTFLAGS="${CFLAGS}" \
- DEBUG="" \
- || die "emake failed"
-}
-
-src_install() {
- exeinto /usr/X11R6/bin
- doexe ttmkfdir || die "doexe failed"
- dodoc README
-}
diff --git a/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r3.ebuild b/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r3.ebuild
deleted file mode 100644
index c5283d7756ba..000000000000
--- a/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r3.ebuild,v 1.1 2005/05/16 14:46:32 seemant Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A utility to create a fonts.scale file from a set of TrueType fonts"
-HOMEPAGE="http://www.joerg-pommnitz.de/TrueType/xfsft.html"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-RDEPEND="virtual/libc
- sys-libs/zlib
- >=media-libs/freetype-2.0.8"
-
-DEPEND="${RDEPEND}
- >=sys-devel/flex-2.5.4a-r5
- sys-devel/libtool"
-
-src_unpack() {
- unpack ${A} ; cd ${S}
- epatch ${FILESDIR}/${P}-cpp.patch
- epatch ${FILESDIR}/${P}-zlib.patch
- epatch ${FILESDIR}/${P}-gcc34.patch
- epatch ${FILESDIR}/${P}-encoding.patch
- # fix pack to work with new freetype include scheme (#44119)
- epatch ${FILESDIR}/${P}-freetype_new_includes.patch
-
- # Install into regular filesystem, not /usr/X11R6 hierarchy
- sed -i "s:/usr/X11R6:/usr:" README ttmkfdir.cpp
-}
-
-src_compile() {
- filter-flags -O -O? -foptimize-sibling-calls -fstack-protector
- emake \
- CXX="$(tc-getCXX)" \
- OPTFLAGS="${CFLAGS}" \
- DEBUG="" \
- || die "emake failed"
-}
-
-src_install() {
- into /usr
- dobin ttmkfdir || die "doexe failed"
- dodoc README
-}