head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.52 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.50 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.48 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.46 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.44 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.42 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.40 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.38 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.36 pkgsrc-2008Q2-base:1.6 pkgsrc-2008Q1:1.6.0.34 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.32 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.30 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.28 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.26 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.24 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.22 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.20 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.18 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.16 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.14 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.12 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.10 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.8 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.6 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.4 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.2 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.5.0.2 pkgsrc-2003Q4-base:1.5 netbsd-1-6-1:1.4.0.2 netbsd-1-6-1-base:1.4 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.2 netbsd-1-5-RELEASE:1.1.1.1 netbsd-1-4-PATCH003:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.6 date 2004.01.02.13.06.39; author salo; state dead; branches; next 1.5; 1.5 date 2003.02.22.13.33.32; author salo; state Exp; branches 1.5.2.1; next 1.4; 1.4 date 2002.09.27.17.03.21; author grant; state Exp; branches; next 1.3; 1.3 date 2002.08.22.02.21.07; author grant; state Exp; branches; next 1.2; 1.2 date 2001.02.18.04.34.17; author hubertf; state Exp; branches; next 1.1; 1.1 date 2000.09.04.15.49.36; author kim; state Exp; branches 1.1.1.1; next ; 1.5.2.1 date 2004.01.02.14.49.15; author agc; state dead; branches; next ; 1.1.1.1 date 2000.09.04.15.49.36; author kim; state Exp; branches; next ; desc @@ 1.6 log @Oops. Forgot in previous commit. @ text @$NetBSD: patch-ad,v 1.5 2003/02/22 13:33:32 salo Exp $ --- src/xfstt.cc.orig 2002-11-14 13:08:08.000000000 +0100 +++ src/xfstt.cc 2003-02-22 10:41:41.000000000 +0100 @@@@ -31,8 +31,8 @@@@ #define UNSTRAPLIMIT 10500U // Change these if you don't like being FHS complient -#define TTFONTDIR "/usr/share/fonts/truetype" -#define TTCACHEDIR "/var/cache/xfstt" +#define TTFONTDIR "@@PREFIX@@/lib/X11/fonts/TrueType" +#define TTCACHEDIR "@@PREFIX@@/lib/X11/fonts/TrueType" #define TTINFO_LEAF "ttinfo.dir" #define TTNAME_LEAF "ttname.dir" @ 1.5 log @Updated to version 1.4. Changes: - added MESSAGE file with post-install instructions - minor cleanups 1.4: ==== - Auto* tools - Initial i18n support (not used yet) - Fixed slow down with some programs using FS_ListFontsWithXInfo - Fixed childs unlinking unix socket when father uid == childs uid - Added an option to specify pidfile location - Added endpwent() to prevent leaking one fd - Changed usage output 1.3.1: ====== - Added --cache description to man page @ text @d1 1 a1 1 $NetBSD$ @ 1.5.2.1 log @Finish previous pull-up - remove patch-ad which isn't necessary any more. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.5 2003/02/22 13:33:32 salo Exp $ @ 1.4 log @Make this work with xpkgwedge by using PREFIX instead of X11BASE. Bump PKGREVISION. Fixes pkg/18197 from Urban Boquist . @ text @d3 3 a5 3 --- xfstt.cpp.orig Wed Jul 31 08:18:20 2002 +++ xfstt.cpp @@@@ -12,8 +12,8 @@@@ d10 1 a10 1 -#define TTCACHEDIR "/var/cache/xfstt" d12 1 a12 1 +#define TTCACHEDIR "@@PREFIX@@/lib/X11/fonts/TrueType" d14 2 a15 2 #define TTINFO_LEAF "ttinfo.dir" #define TTNAME_LEAF "ttname.dir" @ 1.3 log @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 @ text @d11 2 a12 2 +#define TTFONTDIR "@@X11BASE@@/lib/X11/fonts/TrueType" +#define TTCACHEDIR "@@X11BASE@@/lib/X11/fonts/TrueType" @ 1.2 log @ * Add --notcp option, to only listen on unix domain socket, not TCP socket. * Add rc.d startup script * Update pkg name to xfstt-1.1nb1 Code based on FreeBSD port, submitted by Martti Kuparinen in PR 12201 @ text @d3 1 a3 1 --- xfstt.cpp.orig Sat Dec 11 19:23:45 1999 d5 1 a5 1 @@@@ -11,8 +11,8 @@@@ d8 1 a8 1 // Change these if you don't lie being FHS complient d11 1 a11 1 +#define TTFONTDIR "@@X11BASE@@/lib/X11/fonts/TrueType" a15 76 @@@@ -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")) { @ 1.1 log @Initial revision @ text @d3 2 a4 2 --- xfstt.cpp.orig Sat Dec 11 13:23:45 1999 +++ xfstt.cpp Sun Sep 3 09:32:56 2000 d16 25 a40 1 @@@@ -470,10 +470,12 @@@@ d55 37 @ 1.1.1.1 log @TrueType font server for X11 @ text @@