Date: Mon, 8 Dec 2003 23:30:12 +0100 (CET) From: Thierry Thomas <thierry@pompo.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/60055: Repocopy x11-fonts/ttmkfdir to x11-fonts/ttmkfdir2 to avoid installation of freetype1. Message-ID: <20031208223012.318AF751E@graf.pompo.net> Resent-Message-ID: <200312082240.hB8MeCYf092003@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 60055 >Category: ports >Synopsis: Repocopy x11-fonts/ttmkfdir to x11-fonts/ttmkfdir2 to avoid installation of freetype1. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Dec 08 14:40:11 PST 2003 >Closed-Date: >Last-Modified: >Originator: Thierry Thomas >Release: FreeBSD 4.9-STABLE i386 >Organization: Kabbale Eros >Environment: System: FreeBSD graf.pompo.net 4.9-STABLE FreeBSD 4.9-STABLE #0: Thu Nov 20 23:06:13 CET 2003 thierry@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF020727 i386 >Description: Nowadays many ports use freetype2. This version of ttmkfdir avoids the installation of freetype1. >How-To-Repeat: N/A. >Fix: - Repocopy x11-fonts/ttmkfdir to x11-fonts/ttmkfdir2; - apply the first patch; - apply the second patch (adds CONFLICTS to x11-fonts/ttmkfdir). Remark about the first patch: . added files: patch-Makefile patch-ttf.h . removed files: patch-ttmkfdir.c --- ttmkfdir2.diff begins here --- diff -urN x11-fonts/ttmkfdir2.orig/Makefile x11-fonts/ttmkfdir2/Makefile --- x11-fonts/ttmkfdir2.orig/Makefile Sat Feb 22 22:20:31 2003 +++ x11-fonts/ttmkfdir2/Makefile Mon Dec 8 22:44:48 2003 @@ -5,23 +5,26 @@ # $FreeBSD: ports/x11-fonts/ttmkfdir/Makefile,v 1.17 2003/02/20 19:18:02 knu Exp $ # -PORTNAME= ttmkfdir -PORTVERSION= 0.0 -PORTREVISION= 1 -CATEGORIES= x11-fonts x11 -MASTER_SITES= http://www.joerg-pommnitz.de/TrueType/ +PORTNAME= ttmkfdir2 +PORTVERSION= 20021109 +CATEGORIES= x11-fonts +MASTER_SITES= http://people.redhat.com/yshao/ DISTNAME= ${PORTNAME} 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 + +CONFLICTS= ttmkfdir-* + +USE_BZIP2= yes USE_X_PREFIX= yes -USE_FREETYPE= yes +USE_GMAKE= yes +USE_GETOPT_LONG=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 -urN x11-fonts/ttmkfdir2.orig/distinfo x11-fonts/ttmkfdir2/distinfo --- x11-fonts/ttmkfdir2.orig/distinfo Tue Sep 15 11:36:23 1998 +++ x11-fonts/ttmkfdir2/distinfo Sun Dec 7 23:24:53 2003 @@ -1 +1 @@ -MD5 (ttmkfdir.tar.gz) = dcf6aa4d28f5c52acf2bb57f49f53089 +MD5 (ttmkfdir2.tar.bz2) = 61efb004b19befdb5335ef058323002c diff -urN x11-fonts/ttmkfdir2.orig/files/patch-Makefile x11-fonts/ttmkfdir2/files/patch-Makefile --- x11-fonts/ttmkfdir2.orig/files/patch-Makefile Thu Jan 1 01:00:00 1970 +++ x11-fonts/ttmkfdir2/files/patch-Makefile Sun Dec 7 23:24:53 2003 @@ -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 -urN x11-fonts/ttmkfdir2.orig/files/patch-ttf.h x11-fonts/ttmkfdir2/files/patch-ttf.h --- x11-fonts/ttmkfdir2.orig/files/patch-ttf.h Thu Jan 1 01:00:00 1970 +++ x11-fonts/ttmkfdir2/files/patch-ttf.h Sun Dec 7 23:24:53 2003 @@ -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 -urN x11-fonts/ttmkfdir2.orig/files/patch-ttmkfdir.c x11-fonts/ttmkfdir2/files/patch-ttmkfdir.c --- x11-fonts/ttmkfdir2.orig/files/patch-ttmkfdir.c Mon Sep 2 10:45:19 2002 +++ x11-fonts/ttmkfdir2/files/patch-ttmkfdir.c Thu Jan 1 01:00:00 1970 @@ -1,92 +0,0 @@ - -$FreeBSD: ports/x11-fonts/ttmkfdir/files/patch-ttmkfdir.c,v 1.1 2002/09/02 08:45:19 sobomax Exp $ - ---- 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 -urN x11-fonts/ttmkfdir2.orig/pkg-descr x11-fonts/ttmkfdir2/pkg-descr --- x11-fonts/ttmkfdir2.orig/pkg-descr Tue Jan 9 20:13:17 2001 +++ x11-fonts/ttmkfdir2/pkg-descr Sun Dec 7 23:24:53 2003 @@ -1,4 +1,5 @@ This program reads TrueType fonts and creates a suitable fonts.scale file for use with an X font server. +Remark: this one links with freetype2. -WWW: http://www.joerg-pommnitz.de/TrueType/xfsft.html +WWW: http://people.redhat.com/yshao/ --- ttmkfdir2.diff ends here --- --- ttmkfdir.diff begins here --- diff -urN x11-fonts/ttmkfdir.orig/Makefile x11-fonts/ttmkfdir/Makefile --- x11-fonts/ttmkfdir.orig/Makefile Sat Feb 22 22:20:31 2003 +++ x11-fonts/ttmkfdir/Makefile Mon Dec 8 22:49:30 2003 @@ -15,6 +15,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Create fonts.scale file for use with TrueType font server +CONFLICTS= ttmkfdir2-* + NO_WRKSUBDIR= yes USE_X_PREFIX= yes USE_FREETYPE= yes --- ttmkfdir.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031208223012.318AF751E>