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
This commit is contained in:
salo 2003-02-22 13:33:31 +00:00
parent 8aa38df3ed
commit 72d0786818
10 changed files with 134 additions and 81 deletions

30
x11/xfstt/MESSAGE Normal file
View file

@ -0,0 +1,30 @@
===========================================================================
$NetBSD: MESSAGE,v 1.1 2003/02/22 13:33:31 salo Exp $
To use xfstt, you will need to perform the following steps:
1. Install TrueType fonts (e.g. fonts/ms-ttf, or other packages providing
TrueType fonts from the fonts category), or copy your other TrueType
fonts into
@PREFIX@/lib/X11/fonts/TrueType/
2. In case you don't have PKG_RCD_SCRIPTS set in your /etc/mk.conf, copy
${PREFIX}/etc/rc.d/xfstt to /etc/rc.d/xfstt and add the following
line into your /etc/rc.conf
xfstt=YES
3. Start xfstt by issuing the command
/etc/rc.d/xfstt start
4. Tell your X11 server about the new font service
xset fp+ unix/:7101
or add the new fontpath directly to the X11 config file, e.g. Section
"Files", in XFree86 configuration file
FontPath "unix/:7101"
===========================================================================

View file

@ -1,45 +1,47 @@
# $NetBSD: Makefile,v 1.12 2003/01/28 22:04:36 jlam Exp $ # $NetBSD: Makefile,v 1.13 2003/02/22 13:33:31 salo Exp $
# #
DISTNAME= xfstt_1.3 DISTNAME= xfstt-1.4
PKGNAME= ${DISTNAME:S/_/-/} CATEGORIES= x11 net fonts
CATEGORIES= x11 net
PKGREVISION= 1
MASTER_SITES= http://download.berlios.de/xfstt/ MASTER_SITES= http://download.berlios.de/xfstt/
MAINTAINER= packages@netbsd.org MAINTAINER= packages@netbsd.org
HOMEPAGE= http://developer.berlios.de/projects/xfstt HOMEPAGE= http://developer.berlios.de/projects/xfstt
COMMENT= TrueType font server for X11 COMMENT= TrueType font server for X11
CXXFLAGS+= -fomit-frame-pointer -ffast-math
MAKE_ENV+= CXXFLAGS="${CXXFLAGS}"
USE_PKGINSTALL= YES USE_PKGINSTALL= YES
USE_X11BASE= YES USE_X11BASE= YES
USE_GMAKE= YES USE_GMAKE= YES
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} GNU_CONFIGURE= YES
# There isn't really any l10n yet, only some preliminary i18n support.
CONFIGURE_ARGS+= --disable-nls
CXXFLAGS+= -fomit-frame-pointer -ffast-math
RCD_SCRIPTS= xfstt RCD_SCRIPTS= xfstt
post-patch: post-patch:
@( \ @( \
cd ${WRKSRC} ; \ cd ${WRKSRC} ; \
for i in INSTALL perftest.cpp xfstt.cpp xfstt.1x; \ for f in src/perftest.cc src/xfstt.cc doc/xfstt.1x; \
do \ do \
${MV} $$i $$i.bak ; \ ${MV} $$f $$f.orig ; \
${SED} -e 's;@PREFIX@;${PREFIX};' < $$i.bak > $$i ; \ ${SED} ${FILES_SUBST_SED} $$f.orig > $$f ; \
done ; \ done ; \
) )
do-install: do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xfstt ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/src/xfstt ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/xfstt.1x ${PREFIX}/man/man1/xfstt.1 ${INSTALL_MAN} ${WRKSRC}/doc/xfstt.1x ${PREFIX}/man/man1/xfstt.1
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xfstt
${INSTALL_DATA} ${WRKSRC}/FAQ ${PREFIX}/share/doc/xfstt
${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/xfstt
${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/xfstt
${INSTALL_DATA} ${WRKSRC}/THANKS ${PREFIX}/share/doc/xfstt
${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fonts/TrueType ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fonts/TrueType
${ECHO} belongs to xfstt pkg >${PREFIX}/lib/X11/fonts/TrueType/.keepme ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xfstt
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xfstt
cd ${WRKSRC} && ( \
${INSTALL_DATA} doc/FAQ CHANGES TODO THANKS \
${PREFIX}/share/doc/xfstt/ ; \
${INSTALL_DATA} doc/examples/font.properties \
${PREFIX}/share/examples/xfstt/ \
)
.include "../../mk/bsd.pkg.mk" .include "../../mk/bsd.pkg.mk"

View file

@ -1,11 +1,12 @@
@comment $NetBSD: PLIST,v 1.2 2002/08/22 02:22:14 grant Exp $ @comment $NetBSD: PLIST,v 1.3 2003/02/22 13:33:31 salo Exp $
bin/xfstt bin/xfstt
etc/rc.d/xfstt etc/rc.d/xfstt
man/man1/xfstt.1 man/man1/xfstt.1
share/doc/xfstt/FAQ share/doc/xfstt/FAQ
share/doc/xfstt/CHANGES share/doc/xfstt/CHANGES
share/doc/xfstt/INSTALL
share/doc/xfstt/THANKS share/doc/xfstt/THANKS
lib/X11/fonts/TrueType/.keepme share/doc/xfstt/TODO
@dirrm lib/X11/fonts/TrueType share/examples/xfstt/font.properties
@dirrm share/examples/xfstt
@dirrm share/doc/xfstt @dirrm share/doc/xfstt
@unexec ${RMDIR} -p %D/lib/X11/fonts/TrueType 2> /dev/null || ${TRUE}

View file

@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.5 2002/09/27 17:03:21 grant Exp $ $NetBSD: distinfo,v 1.6 2003/02/22 13:33:31 salo Exp $
SHA1 (xfstt_1.3.tar.gz) = 3d830c69da193f97790aca2434948a053f3a838b SHA1 (xfstt-1.4.tar.gz) = 25431050958da607536222b68ed1860cca8d4a5d
Size (xfstt_1.3.tar.gz) = 91817 bytes Size (xfstt-1.4.tar.gz) = 323467 bytes
SHA1 (patch-aa) = feb475e11f63374e1ad8ba3fdd6d1b0dd5e23c81 SHA1 (patch-aa) = d4229fe26bee60d783f933b4ed9705ef39d0c785
SHA1 (patch-ab) = ee31dab3570436f823a55c2108ea615eb9ea323a SHA1 (patch-ab) = c0ff812bab52579c4254557bc3890b19d5f936d8
SHA1 (patch-ac) = 1fa14e6211a742936eae7c9282499ae66e6c5258 SHA1 (patch-ac) = 6247c7683f41e56f4017ae38e5c70e11ead22cec
SHA1 (patch-ad) = 7ad47d5a06570fa866b47e453cbcaea8af7f187d SHA1 (patch-ad) = c86c0d313be00057d0a485850d2e76d4958a036f
SHA1 (patch-ae) = 4296c1a666b60548d432217c7fe03c9eccf5ea87 SHA1 (patch-ae) = 18afec3897291c5cf135a466f173acb0341fd427

View file

@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@ #!@RCD_SCRIPTS_SHELL@
# #
# $NetBSD: xfstt.sh,v 1.4 2002/09/29 12:58:37 wiz Exp $ # $NetBSD: xfstt.sh,v 1.5 2003/02/22 13:33:31 salo Exp $
# #
# PROVIDE: xfstt # PROVIDE: xfstt
# REQUIRE: DAEMON # REQUIRE: DAEMON
@ -8,6 +8,7 @@
. /etc/rc.subr . /etc/rc.subr
name="xfstt" name="xfstt"
rcvar=$name
command="@PREFIX@/bin/${name}" command="@PREFIX@/bin/${name}"
command_args="--user nobody --notcp --daemon" command_args="--user nobody --notcp --daemon"
pidfile="/var/run/${name}.pid" pidfile="/var/run/${name}.pid"

View file

@ -1,24 +1,40 @@
$NetBSD: patch-aa,v 1.2 2002/09/27 17:03:21 grant Exp $ $NetBSD: patch-aa,v 1.3 2003/02/22 13:33:31 salo Exp $
--- INSTALL.orig Sat Apr 17 23:10:37 1999 --- doc/FAQ.orig 2002-11-14 13:08:07.000000000 +0100
+++ INSTALL +++ doc/FAQ 2003-02-22 12:34:43.000000000 +0100
@@ -2,8 +2,9 @@ @@ -67,7 +67,8 @@
make && make install
(use gmake instead of the standard make on FreeBSD)
-2) Create a writeable directory /usr/share/fonts/truetype, copy some truetype *.ttf 1.1 How do I test it?
- files or create soflinks to truetype directories in there, then run
+2) Create a writeable directory @PREFIX@/lib/X11/fonts/TrueType, - mkdir /usr/share/fonts/truetype and put some *ttf fonts there, now run
+ copy some truetype *.ttf files or create softlinks to truetype + mkdir @PREFIX@/lib/X11/fonts/TrueType and put some *ttf fonts
+ directories in there, then run + there, now run
make xfstt && make install
xfstt --sync xfstt --sync
@@ -171,9 +172,11 @@
3) Start xfstt in the background 2.4 How does one add fonts?
@@ -17,4 +18,7 @@
These install instructions should suffice for 98% of all users. For more - Copy *.ttf fonts into the /usr/share/fonts/truetype/ directory or put some
advanced requirements refer to the xfstt(1x) man page or the FAQ. - softlinks to font directories in there. A typical example is
- ln -s /DOS/windows/fonts /usr/share/fonts/truetype/winfonts
+ Copy *.ttf fonts into the @PREFIX@/lib/X11/fonts/TrueType/
+ directory or put some softlinks to font directories in there.
+ A typical example is
+ +
+Note: The pkgsrc rc.d script `xfstt' automatically runs + ln -s /DOS/windows/fonts @PREFIX@/lib/X11/fonts/TrueType/winfonts
+`xfstt --sync' before starting xfstt.
Now run "xfstt --sync" in order to have the new fonts recognized.
Adding fonts while xfstt is running doesn't work yet.
@@ -346,8 +349,8 @@
3.0 How do I put fonts in categories?
- Create some subdirectories in /usr/share/fonts/truetype, e.g.
- modern, script, brush, old, symbol, ...
+ Create some subdirectories in @PREFIX@/lib/X11/fonts/TrueType,
+ e.g. modern, script, brush, old, symbol, ...
and put the appropriate fonts in there. The corresponding font
names will be -modern-*, -script-*, -brush-* and so on

View file

@ -1,13 +1,10 @@
$NetBSD: patch-ab,v 1.2 2002/08/22 02:21:07 grant Exp $ $NetBSD: patch-ab,v 1.3 2003/02/22 13:33:32 salo Exp $
--- Makefile.orig Fri Aug 2 10:01:32 2002 --- doc/examples/font.properties.orig 2002-11-14 13:08:07.000000000 +0100
+++ Makefile +++ doc/examples/font.properties 2003-02-22 12:35:41.000000000 +0100
@@ -8,7 +8,7 @@ OPTIMIZE_FLAGS = -O2 -fomit-frame-pointe @@ -1,5 +1,4 @@
PROFILE_FLAGS = -fprofile-arcs -ftest-coverage # awt font properties for X11 with xfstt
DEBUG_FLAGS = -g -DDEBUG -# copy to /usr/local/java/lib/font.properties
-CXXFLAGS = -Wall $(OPTIMIZE_FLAGS) dialog.plain.0 = -*-arial-medium-r-normal--*-%d-*-*-p-*-iso8859-1
+#CXXFLAGS = -Wall $(OPTIMIZE_FLAGS) dialog.italic.0 = -*-arial-medium-i-normal--*-%d-*-*-p-*-iso8859-1
ALL_CXXFLAGS = -DMAGNIFY=0 $(CXXFLAGS)
DIST_FILES = Makefile *.h *cpp *.sh *lsm *1x \

View file

@ -1,10 +1,10 @@
$NetBSD: patch-ac,v 1.2 2002/09/27 17:03:21 grant Exp $ $NetBSD: patch-ac,v 1.3 2003/02/22 13:33:32 salo Exp $
--- perftest.cpp.orig Sat Jan 9 13:11:04 1999 --- src/perftest.cc.orig 2002-11-14 13:08:09.000000000 +0100
+++ perftest.cpp +++ src/perftest.cc 2003-02-22 10:39:47.000000000 +0100
@@ -1,7 +1,7 @@ @@ -21,7 +21,7 @@
// test ttf engine performance *
// (C) Copyright 1997-1998 Herbert Duerr */
-#define TTFONTDIR "/usr/share/fonts/truetype" -#define TTFONTDIR "/usr/share/fonts/truetype"
+#define TTFONTDIR "@PREFIX@/lib/X11/fonts/TrueType" +#define TTFONTDIR "@PREFIX@/lib/X11/fonts/TrueType"

View file

@ -1,8 +1,8 @@
$NetBSD: patch-ad,v 1.4 2002/09/27 17:03:21 grant Exp $ $NetBSD: patch-ad,v 1.5 2003/02/22 13:33:32 salo Exp $
--- xfstt.cpp.orig Wed Jul 31 08:18:20 2002 --- src/xfstt.cc.orig 2002-11-14 13:08:08.000000000 +0100
+++ xfstt.cpp +++ src/xfstt.cc 2003-02-22 10:41:41.000000000 +0100
@@ -12,8 +12,8 @@ @@ -31,8 +31,8 @@
#define UNSTRAPLIMIT 10500U #define UNSTRAPLIMIT 10500U
// Change these if you don't like being FHS complient // Change these if you don't like being FHS complient

View file

@ -1,13 +1,19 @@
$NetBSD: patch-ae,v 1.5 2002/09/27 17:03:21 grant Exp $ $NetBSD: patch-ae,v 1.6 2003/02/22 13:33:32 salo Exp $
--- xfstt.1x.orig Fri Aug 2 12:03:15 2002 --- doc/xfstt.1x.orig 2002-11-14 13:08:07.000000000 +0100
+++ xfstt.1x +++ doc/xfstt.1x 2003-02-22 10:43:49.000000000 +0100
@@ -55,7 +55,7 @@ Don't open TCP socket, use unix domain o @@ -58,12 +58,12 @@
.I "\-\-dir name" .I "\-\-dir name"
Change xfstt's font directory. Change xfstt's font directory.
The default directory is The default directory is
-.IR /usr/share/fonts/truetype . -.IR /usr/share/fonts/truetype .
+.IR @PREFIX@/lib/X11/fonts/TrueType . +.IR @PREFIX@/lib/X11/fonts/TrueType .
.TP .TP
.I "\-\-res value" .I "\-\-cache name"
Force the resolution for underspecified fonts to value (typically 96 or 120). Change xfstt's font cache directory.
The default directory is
-.IR /var/cache/xfstt .
+.IR @PREFIX@/lib/X11/fonts/TrueType .
.TP
.I "\-\-pidfile name"
Change xfstt's pidfile location.