diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2003-12-09 00:50:45 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2003-12-09 00:50:45 +0000 |
commit | 9188d5103458118751ccdb6f0f4d0f4ba44fa0f5 (patch) | |
tree | bfc723d0ef5f8a95d2b50b3175890d95998cce07 /x11-fonts/ttmkfdir | |
parent | Revert to previous revision: the white-space problem had already been (diff) |
- On many systems, ttmkfdir was the only reason to install freetype1.
Here is ttmkfdir that uses freetype2 as a backend.
PR: ports/60055
Submitted by: Thierry Thomas <thierry@pompo.net>
Notes
Notes:
svn path=/head/; revision=95437
Diffstat (limited to 'x11-fonts/ttmkfdir')
-rw-r--r-- | x11-fonts/ttmkfdir/Makefile | 19 | ||||
-rw-r--r-- | x11-fonts/ttmkfdir/distinfo | 2 | ||||
-rw-r--r-- | x11-fonts/ttmkfdir/files/patch-Makefile | 36 | ||||
-rw-r--r-- | x11-fonts/ttmkfdir/files/patch-ttf.h | 11 | ||||
-rw-r--r-- | x11-fonts/ttmkfdir/files/patch-ttmkfdir.c | 92 | ||||
-rw-r--r-- | x11-fonts/ttmkfdir/pkg-descr | 2 |
6 files changed, 59 insertions, 103 deletions
diff --git a/x11-fonts/ttmkfdir/Makefile b/x11-fonts/ttmkfdir/Makefile index e103c35bf7f9..bc23ff80e7e1 100644 --- a/x11-fonts/ttmkfdir/Makefile +++ b/x11-fonts/ttmkfdir/Makefile @@ -6,22 +6,23 @@ # PORTNAME= ttmkfdir -PORTVERSION= 0.0 -PORTREVISION= 1 +PORTVERSION= 20021109 CATEGORIES= x11-fonts x11 -MASTER_SITES= http://www.joerg-pommnitz.de/TrueType/ -DISTNAME= ${PORTNAME} +MASTER_SITES= http://people.redhat.com/yshao/ +DISTNAME= ${PORTNAME}2 MAINTAINER= ports@FreeBSD.org COMMENT= Create fonts.scale file for use with TrueType font server -NO_WRKSUBDIR= yes +BUILD_DEPENDS= libtool13:${PORTSDIR}/devel/libtool13 +LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 + +USE_BZIP2= yes +USE_GMAKE= yes +USE_GETOPT_LONG=yes USE_X_PREFIX= yes -USE_FREETYPE= yes -do-build: - cd ${WRKSRC}; ${CC} ${CFLAGS} -I${LOCALBASE}/include/freetype1/freetype \ - ttmkfdir.c -o ttmkfdir -L${LOCALBASE}/lib -lttf +MAKE_ENV= LDFLAGS="${LDFLAGS}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ttmkfdir ${PREFIX}/bin diff --git a/x11-fonts/ttmkfdir/distinfo b/x11-fonts/ttmkfdir/distinfo index a44739b03f31..c733409e8f2f 100644 --- a/x11-fonts/ttmkfdir/distinfo +++ b/x11-fonts/ttmkfdir/distinfo @@ -1 +1 @@ -MD5 (ttmkfdir.tar.gz) = dcf6aa4d28f5c52acf2bb57f49f53089 +MD5 (ttmkfdir2.tar.bz2) = 61efb004b19befdb5335ef058323002c diff --git a/x11-fonts/ttmkfdir/files/patch-Makefile b/x11-fonts/ttmkfdir/files/patch-Makefile new file mode 100644 index 000000000000..64b1cfaa7e72 --- /dev/null +++ b/x11-fonts/ttmkfdir/files/patch-Makefile @@ -0,0 +1,36 @@ +--- Makefile.orig Thu Mar 14 15:03:49 2002 ++++ Makefile Sat Dec 6 23:57:59 2003 +@@ -1,25 +1,22 @@ +-FREETYPE_BASE=/usr/include/freetype2 +-FREETYPE_INCL=-I$(FREETYPE_BASE)/. +-FREETYPE_LIB=/usr/lib/libfreetype.so +- +-DEBUG=-ggdb +-CXX=g++ +-CXXFLAGS=-Wall -pedantic $(FREETYPE_INCL) $(DEBUG) ++FREETYPE_INCL=`freetype-config --cflags` ++FREETYPE_LIB=`freetype-config --libs` + +-LDFLAGS=$(FREETYPE_LIB) $(DEBUG) ++CXXFLAGS+=$(FREETYPE_INCL) ++ ++LDFLAGS+=$(FREETYPE_LIB) + + .PHONY: clean + + all: ttmkfdir + + .cpp.o: +- libtool --mode=compile $(CXX) $(CXXFLAGS) -o $@ -c $^ ++ libtool13 --mode=compile $(CXX) $(CXXFLAGS) -o $@ -c $^ + + ttmkfdir: ttmkfdir.o directory.o commandline.o ttf.o encoding.o parser.o builtin.o +- libtool --mode=link $(CXX) -o $@ $^ $(LDFLAGS) ++ libtool13 --mode=link $(CXX) -o $@ $^ $(LDFLAGS) + + parser.cpp: encoding.l +- flex -i -8 -o$@ $< ++ lex -i -8 -o$@ $< + + clean: + -rm -f *.o *~ ttmkfdir core parser.cpp diff --git a/x11-fonts/ttmkfdir/files/patch-ttf.h b/x11-fonts/ttmkfdir/files/patch-ttf.h new file mode 100644 index 000000000000..5295d0ea7ada --- /dev/null +++ b/x11-fonts/ttmkfdir/files/patch-ttf.h @@ -0,0 +1,11 @@ +--- ttf.h.orig Wed Mar 13 19:16:38 2002 ++++ ttf.h Sat Dec 6 23:47:35 2003 +@@ -13,6 +13,8 @@ + #include "util.h" + #include "encoding.h" + ++using namespace std; ++ + namespace ttf { + + class Face { diff --git a/x11-fonts/ttmkfdir/files/patch-ttmkfdir.c b/x11-fonts/ttmkfdir/files/patch-ttmkfdir.c deleted file mode 100644 index 45eea44119d7..000000000000 --- a/x11-fonts/ttmkfdir/files/patch-ttmkfdir.c +++ /dev/null @@ -1,92 +0,0 @@ - -$FreeBSD$ - ---- ttmkfdir.c.orig Wed Sep 9 15:50:50 1998 -+++ ttmkfdir.c Sun Sep 1 21:05:35 2002 -@@ -488,6 +488,37 @@ - 0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a - }; - -+static int koi8u[224] = { -+ 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, -+ 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, -+ 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, -+ 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, -+ 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, -+ 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, -+ 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, -+ 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, -+ 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, -+ 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, -+ 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, -+ 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, -1, -+ 0x2500, 0x2502, 0x250c, 0x2510, 0x2514, 0x2518, 0x251c, 0x2524, -+ 0x252c, 0x2534, 0x253c, 0x2580, 0x2584, 0x2588, 0x258c, 0x2590, -+ 0x2591, 0x2592, 0x2593, 0x2320, 0x25a0, 0x2219, 0x221a, 0x2248, -+ 0x2264, 0x2265, 0x00a0, 0x2321, 0x00b0, 0x00b2, 0x00b7, 0x00f7, -+ 0x2550, 0x2551, 0x2552, 0x0451, 0x0454, 0x2554, 0x0456, 0x0457, -+ 0x2557, 0x2558, 0x2559, 0x255a, 0x255b, 0x0491, 0x255d, 0x255e, -+ 0x255f, 0x2560, 0x2561, 0x0401, 0x0404, 0x2563, 0x0406, 0x0407, -+ 0x2566, 0x2567, 0x2568, 0x2569, 0x256a, 0x0490, 0x256c, 0x00a9, -+ 0x044e, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, -+ 0x0445, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, -+ 0x043f, 0x044f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, -+ 0x044c, 0x044b, 0x0437, 0x0448, 0x044d, 0x0449, 0x0447, 0x044a, -+ 0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, -+ 0x0425, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, -+ 0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, -+ 0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a -+}; -+ - static int koi8r1[224] = { - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, -@@ -550,6 +581,37 @@ - 0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a, - }; - -+static int koi8u1[224] = { -+ 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, -+ 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, -+ 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, -+ 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, -+ 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, -+ 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, -+ 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, -+ 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, -+ 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, -+ 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, -+ 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, -+ 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, -1, -+ /**/-1, -1, -1, -1, -1, -1, -1, -1, -+ /**/-1, -1, -1, -1, -1, -1, -1, -1, -+ /**/-1, -1, -1, 0x2320, 0x25a0, 0x2219, 0x221a, 0x2248, -+ 0x2264, 0x2265, 0x00a0, 0x2321, 0x00b0, 0x00b2, 0x00b7, 0x00f7, -+ /**/-1, -1, -1, 0x0451, 0x0454, -1, 0x0456, 0x0457, -+ /**/-1, -1, -1, -1, -1, 0x0491, 0x255d, -1, -+ /**/-1, -1, -1, 0x0401, 0x0404, -1, 0x0406, 0x0407, -+ /**/-1, -1, -1, -1, -1, 0x0490, 0x256c, 0x00a9, -+ 0x044e, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, -+ 0x0445, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, -+ 0x043f, 0x044f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, -+ 0x044c, 0x044b, 0x0437, 0x0448, 0x044d, 0x0449, 0x0447, 0x044a, -+ 0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, -+ 0x0425, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, -+ 0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, -+ 0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a, -+}; -+ - static int A_Z_letters[224] = { - 0x0020, -1, -1, -1, -1, -1, -1, -1, - /**/-1, -1, -1, -1, -1, -1, -1, -1, -@@ -751,8 +813,10 @@ - {iso8859_15, "fcd8859-15", IGNORE}, /* X11R6.4p2 */ - {koi8r, "koi8-r", STRICT}, - {koi8ru, "koi8-ru", STRICT}, -+ {koi8u, "koi8-u", STRICT}, - {koi8r1, "koi8-r", LOOSE}, - {koi8ru1, "koi8-ru", LOOSE}, -+ {koi8u1, "koi8-u", LOOSE}, - {jisx0201, "jisx0201.1976-0", STRICT}, - {A_Z_letters,"iso8859-1", LOOSE}, - {A_Z_letters,"ascii-0", IGNORE}, diff --git a/x11-fonts/ttmkfdir/pkg-descr b/x11-fonts/ttmkfdir/pkg-descr index e283b5eac247..f35a3a1eba7b 100644 --- a/x11-fonts/ttmkfdir/pkg-descr +++ b/x11-fonts/ttmkfdir/pkg-descr @@ -1,4 +1,4 @@ This program reads TrueType fonts and creates a suitable fonts.scale file for use with an X font server. -WWW: http://www.joerg-pommnitz.de/TrueType/xfsft.html +WWW: http://people.redhat.com/yshao/ |