summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2002-08-22 02:21:07 +0000
committergrant <grant@pkgsrc.org>2002-08-22 02:21:07 +0000
commit69151d1ebf5e907c45aed681b47015ac30039b67 (patch)
tree2234a322807b9b10577eada92041a45c079e2a01 /x11
parentc8776bf506ef071b74dd52fa2526d4ac6f413cc9 (diff)
downloadpkgsrc-69151d1ebf5e907c45aed681b47015ac30039b67.tar.gz
Update to xfstt-1.3.
Significant changes since 1.2: * Fixed unix socket and its dir permissions * Added full path to unix socket address and use sockaddr_un instead * Added support for --notcp * Removed hard coded limits on path length (needed by the Hurd) Significant changes since 1.1: * Fixes bug that broke xfstt when using unix * domain sockets under linux 2.4 * Fixed bug in realloc() use. * Added Patch for Boxdrawing glyphs * New Encodings: iso8859_11 (latin/Thai) and koi8_u * Now compiles properly under newer versions of gcc
Diffstat (limited to 'x11')
-rw-r--r--x11/xfstt/patches/patch-ab50
-rw-r--r--x11/xfstt/patches/patch-ad86
-rw-r--r--x11/xfstt/patches/patch-ae29
3 files changed, 23 insertions, 142 deletions
diff --git a/x11/xfstt/patches/patch-ab b/x11/xfstt/patches/patch-ab
index c88075d461e..fc0cb451707 100644
--- a/x11/xfstt/patches/patch-ab
+++ b/x11/xfstt/patches/patch-ab
@@ -1,43 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/09/04 15:49:36 kim Exp $
+$NetBSD: patch-ab,v 1.2 2002/08/22 02:21:07 grant Exp $
---- Makefile.orig Mon May 31 02:28:44 1999
-+++ Makefile Sun Sep 3 09:30:58 2000
-@@ -2,16 +2,21 @@
- MISCOPT =
- OPT = $(MISCOPT) $(MAXOPT)
+--- Makefile.orig Fri Aug 2 10:01:32 2002
++++ Makefile
+@@ -8,7 +8,7 @@ OPTIMIZE_FLAGS = -O2 -fomit-frame-pointe
+ PROFILE_FLAGS = -fprofile-arcs -ftest-coverage
+ DEBUG_FLAGS = -g -DDEBUG
--CFLAGS = $(OPT) -DMAGNIFY=0 -DNDEBUG
-+#CFLAGS = $(OPT) -DMAGNIFY=0 -DNDEBUG
- #CFLAGS = -fprofile-arcs -ftest-coverage -DMAGNIFY=0
--CFLAGS = -g -Wall -pedantic $(MISCOPT) -DMAGNIFY=0
-+CFLAGS += -Wall -pedantic $(MISCOPT) -DMAGNIFY=0
- #CFLAGS = -O -Wall -pedantic -DDEBUG $(MISCOPT)
+-CXXFLAGS = -Wall $(OPTIMIZE_FLAGS)
++#CXXFLAGS = -Wall $(OPTIMIZE_FLAGS)
+ ALL_CXXFLAGS = -DMAGNIFY=0 $(CXXFLAGS)
--LFLAGS = -L/usr/X11R6/lib -L/usr/openwin/lib/X11
--LFLAGS = -g -L/usr/X11R6/lib
-+.if !defined(CXXFLAGS)
-+CXXFLAGS:=${CFLAGS}
-+.endif
-+CFLAGS := ${CXXFLAGS} -Wall -pedantic $(MISCOPT) -DMAGNIFY=0
-
--CC = c++
--LD = c++
-+#LFLAGS = -L/usr/X11R6/lib -L/usr/openwin/lib/X11
-+LFLAGS = -L$(X11BASE)/lib
-+
-+CC = ${CXX}
-+LD = ${CXX}
-
- OBJS = RAFile.o \
- TTFont.o \
-@@ -56,8 +61,8 @@
- $(LD) -o $@ $(OBJS) xfstt.o encoding.o $(LFLAGS) -lm
-
- xfstt.o : xfstt.cpp xfstt.h ttf.h arch.h Makefile
-- $(CC) $(CFLAGS) -c $< -I/usr/X11R6/include/X11/fonts \
-- -I/usr/X11R6/include/
-+ $(CC) $(CFLAGS) -c $< -I$(X11BASE)/include/X11/fonts \
-+ -I$(X11BASE)/include/
-
- encoding.o : encoding.cpp encoding.h Makefile
- $(CC) $(CFLAGS) -c $<
+ DIST_FILES = Makefile *.h *cpp *.sh *lsm *1x \
diff --git a/x11/xfstt/patches/patch-ad b/x11/xfstt/patches/patch-ad
index 3aea86af8d7..9b042edb27f 100644
--- a/x11/xfstt/patches/patch-ad
+++ b/x11/xfstt/patches/patch-ad
@@ -1,91 +1,15 @@
-$NetBSD: patch-ad,v 1.2 2001/02/18 04:34:17 hubertf Exp $
+$NetBSD: patch-ad,v 1.3 2002/08/22 02:21:07 grant Exp $
---- xfstt.cpp.orig Sat Dec 11 19:23:45 1999
+--- xfstt.cpp.orig Wed Jul 31 08:18:20 2002
+++ xfstt.cpp
-@@ -11,8 +11,8 @@
+@@ -12,8 +12,8 @@
#define UNSTRAPLIMIT 10500U
- // Change these if you don't lie being FHS complient
+ // Change these if you don't like being FHS complient
-#define TTFONTDIR "/usr/share/fonts/truetype"
-#define TTCACHEDIR "/var/cache/xfstt"
-+#define TTFONTDIR "@X11BASE@/lib/X11/fonts/TrueType"
++#define TTFONTDIR "@X11BASE@/lib/X11/fonts/TrueType"
+#define TTCACHEDIR "@X11BASE@/lib/X11/fonts/TrueType"
#define TTINFO_LEAF "ttinfo.dir"
#define TTNAME_LEAF "ttname.dir"
-@@ -73,6 +73,7 @@
- char* fontdir = TTFONTDIR;
- char* cachedir = TTCACHEDIR;
- int defaultres = 0;
-+int NoTCP = 0;
-
- uid_t newuid = (uid_t)(-2);
- gid_t newgid = (uid_t)(-2);
-@@ -89,12 +90,14 @@
- printf( "Usage: xfstt [[--gslist]--sync][--port portno][--unstrap]"
- "[--user username]\n"
- "\t\t[--dir ttfdir][--encoding list_of_encodings]"
-- "[--daemon][--inetd]\n\n");
-+ "[--daemon][--inetd]\n"
-+ "\t\t[--notcp]\n\n");
- if( !verbose)
- return;
- printf( "\t--sync put ttf-fonts in \"%s\" in database\n", fontdir);
- printf( "\t--gslist print ghostscript style ttf fontlist\n ");
- printf( "\t--port change port number from default 7101\n");
-+ printf( "\t--notcp don't open TCP socket, use unix domain only\n");
- printf( "\t--dir use other font directory than "TTFONTDIR"\n");
- printf( "\t--cache use other font cache directory than "TTCACHEDIR"\n");
- printf( "\t--res force default resolution to this value\n");
-@@ -470,10 +473,12 @@
- raster->getFontExtent( &xfs->fe);
-
- int used = (xfs->fe.bitmaps + xfs->fe.bmplen) - xfs->fe.buffer;
-+ int bmpoff = xfs->fe.bitmaps - xfs->fe.buffer;
- xfs->fe.buffer = (U8*)shrinkMem( xfs->fe.buffer, used);
-- if( xfs->fe.buffer)
-+ if( xfs->fe.buffer) {
- xfs->fe.buflen = used;
-- else {
-+ xfs->fe.bitmaps = xfs->fe.buffer + bmpoff;
-+ } else {
- xfs->fid = 0; //###
- xfs = 0;
- }
-@@ -652,7 +657,7 @@
- listen( sd_unix, 1); // only one connection
- }
-
-- if( !sd_inet) {
-+ if( !NoTCP && !sd_inet) {
- // prepare inet connection
- sd_inet = socket( PF_INET, SOCK_STREAM, IPPROTO_TCP);
-
-@@ -668,7 +673,8 @@
- fd_set sdlist;
- FD_ZERO( &sdlist);
- FD_SET( sd_unix, &sdlist);
-- FD_SET( sd_inet, &sdlist);
-+ if( !NoTCP )
-+ FD_SET( sd_inet, &sdlist);
- int maxsd = (sd_inet > sd_unix) ? sd_inet : sd_unix;
- select( maxsd+1, &sdlist, 0L, 0L, 0L);
-
-@@ -676,7 +682,7 @@
- unsigned int saLength = sizeof(struct sockaddr);
- if( FD_ISSET( sd_unix, &sdlist))
- sd = accept( sd_unix, (struct sockaddr*)&s_unix, &saLength);
-- else if( FD_ISSET( sd_inet, &sdlist))
-+ else if( !NoTCP && FD_ISSET( sd_inet, &sdlist))
- sd = accept( sd_inet, (struct sockaddr*)&s_inet, &saLength);
- dprintf2( "accept( saLength = %d) = %d\n", saLength, sd);
-
-@@ -1604,6 +1610,8 @@
- inetdConnection = 1;
- } else if( !strcmp( argv[i], "--multi")) {
- multiConnection = 1;
-+ } else if( !strcmp( argv[i], "--notcp")) {
-+ NoTCP = 1;
- } else if( !strcmp( argv[i], "--once")) {
- multiConnection = 0;
- } else if( !strcmp( argv[i], "--unstrap")) {
diff --git a/x11/xfstt/patches/patch-ae b/x11/xfstt/patches/patch-ae
index 57dd1ce359b..84e625d56c2 100644
--- a/x11/xfstt/patches/patch-ae
+++ b/x11/xfstt/patches/patch-ae
@@ -1,26 +1,13 @@
-$NetBSD: patch-ae,v 1.3 2002/07/18 05:24:49 grant Exp $
---- xfstt.1x.orig Tue Jul 13 05:07:15 1999
-+++ xfstt.1x Sat Nov 18 16:08:20 2000
-@@ -3,7 +3,7 @@
- xfstt \- X11 font server for *ttf fonts
- .SH SYNOPSIS
- .B xfstt
--[--port n] [--dir dirname] [--unstrap]
-+[--port n] [--notcp] [--dir dirname] [--unstrap]
- [--multi] [--once] [--user username]
- [[--gslist] --sync]
- [--res resolution] [--encoding list]
-@@ -43,9 +43,12 @@
- Change the port number for xfstt's font services.
- This version of Xfstt defaults to --port 7101.
- .TP
-+.I "\-\-notcp"
-+Don't open TCP socket, use unix domain only.
-+.TP
+$NetBSD: patch-ae,v 1.4 2002/08/22 02:21:07 grant Exp $
+
+--- xfstt.1x.orig Fri Aug 2 12:03:15 2002
++++ xfstt.1x
+@@ -55,7 +55,7 @@ Don't open TCP socket, use unix domain o
.I "\-\-dir name"
Change xfstt's font directory.
--The default is --dir /usr/share/fonts/truetype.
-+The default is --dir @X11BASE@/lib/X11/fonts/TrueType.
+ The default directory is
+-.IR /usr/share/fonts/truetype .
++.IR @X11BASE@/lib/X11/fonts/TrueType .
.TP
.I "\-\-res value"
Force the resolution for underspecified fonts to value (typically 96 or 120).