diff options
| -rw-r--r-- | x11/xfstt/MESSAGE | 4 | ||||
| -rw-r--r-- | x11/xfstt/Makefile | 5 | ||||
| -rw-r--r-- | x11/xfstt/PLIST | 3 | ||||
| -rw-r--r-- | x11/xfstt/distinfo | 8 | ||||
| -rw-r--r-- | x11/xfstt/patches/patch-aa | 10 | ||||
| -rw-r--r-- | x11/xfstt/patches/patch-ac | 6 | ||||
| -rw-r--r-- | x11/xfstt/patches/patch-ae | 6 |
7 files changed, 21 insertions, 21 deletions
diff --git a/x11/xfstt/MESSAGE b/x11/xfstt/MESSAGE index 65c39a6055f..0a52197b916 100644 --- a/x11/xfstt/MESSAGE +++ b/x11/xfstt/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2004/01/01 20:06:11 salo Exp $ +$NetBSD: MESSAGE,v 1.4 2004/01/25 20:46:19 wiz Exp $ To use xfstt, you will need to perform the following steps: @@ -7,7 +7,7 @@ To use xfstt, you will need to perform the following steps: TrueType fonts from the fonts category), or copy your other TrueType fonts into - ${PREFIX}/lib/X11/fonts/TrueType/ + ${PREFIX}/lib/X11/fonts/TTF/ 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 diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile index 4f52e522566..c3143f70b26 100644 --- a/x11/xfstt/Makefile +++ b/x11/xfstt/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2004/01/24 15:30:34 grant Exp $ +# $NetBSD: Makefile,v 1.19 2004/01/25 20:46:19 wiz Exp $ # DISTNAME= xfstt-1.6 +PKGREVISION= 1 CATEGORIES= x11 net fonts MASTER_SITES= http://download.berlios.de/xfstt/ @@ -34,7 +35,7 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/xfstt ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/doc/xfstt.1x ${PREFIX}/man/man1/xfstt.1 - ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fonts/TrueType + ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fonts/TTF ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xfstt ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xfstt cd ${WRKSRC} && ( \ diff --git a/x11/xfstt/PLIST b/x11/xfstt/PLIST index a619b53fc5c..3c03ad48e6b 100644 --- a/x11/xfstt/PLIST +++ b/x11/xfstt/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2004/01/01 20:06:11 salo Exp $ +@comment $NetBSD: PLIST,v 1.5 2004/01/25 20:46:19 wiz Exp $ bin/xfstt etc/rc.d/xfstt man/man1/xfstt.1 @@ -9,4 +9,3 @@ share/doc/xfstt/TODO share/examples/xfstt/font.properties @dirrm share/examples/xfstt @dirrm share/doc/xfstt -@unexec ${RMDIR} -p %D/lib/X11/fonts/TrueType 2> /dev/null || ${TRUE} diff --git a/x11/xfstt/distinfo b/x11/xfstt/distinfo index cf6d2ee3ffd..8023d0c9c89 100644 --- a/x11/xfstt/distinfo +++ b/x11/xfstt/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.7 2004/01/01 20:06:11 salo Exp $ +$NetBSD: distinfo,v 1.8 2004/01/25 20:46:19 wiz Exp $ SHA1 (xfstt-1.6.tar.gz) = 7fe623b27d85c5611346376d2b84e549db038c17 Size (xfstt-1.6.tar.gz) = 346346 bytes -SHA1 (patch-aa) = 40e4966dd619fc87e4b4e2797c32be9d330eae06 +SHA1 (patch-aa) = 771f503ee245ac4dcbbd8adf5f7b1746cb39c6e0 SHA1 (patch-ab) = 18d41c9121c4b95b22a831fb987a97c90a8c0a86 -SHA1 (patch-ac) = 0832e115a04d19734cd6808ec1656082da1b118a -SHA1 (patch-ae) = 18afec3897291c5cf135a466f173acb0341fd427 +SHA1 (patch-ac) = 0733764a5eae4965120ae43c06e62f8f9e995fe8 +SHA1 (patch-ae) = 8765af1c37f1b0efd4107d27758428bccbea364e diff --git a/x11/xfstt/patches/patch-aa b/x11/xfstt/patches/patch-aa index 7f00e9dce47..655c7235a53 100644 --- a/x11/xfstt/patches/patch-aa +++ b/x11/xfstt/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2004/01/01 20:06:11 salo Exp $ +$NetBSD: patch-aa,v 1.5 2004/01/25 20:46:19 wiz Exp $ --- doc/FAQ.orig 2003-08-07 08:59:03.000000000 +0200 +++ doc/FAQ 2004-01-01 20:44:46.000000000 +0100 @@ -8,7 +8,7 @@ $NetBSD: patch-aa,v 1.4 2004/01/01 20:06:11 salo Exp $ - mkdir /usr/share/fonts/truetype and put some *ttf fonts there, now - run: -+ mkdir @PREFIX@/lib/X11/fonts/TrueType and put some *ttf fonts ++ mkdir @PREFIX@/lib/X11/fonts/TTF and put some *ttf fonts + there, now run: make xfstt && make install @@ -20,12 +20,12 @@ $NetBSD: patch-aa,v 1.4 2004/01/01 20:06:11 salo Exp $ - Copy *.ttf fonts into the /usr/share/fonts/truetype/ directory or - put some softlinks to font directories in there. A typical example - is: -+ Copy *.ttf fonts into the @PREFIX@/lib/X11/fonts/TrueType/ ++ Copy *.ttf fonts into the @PREFIX@/lib/X11/fonts/TTF/ + directory or put some softlinks to font directories in there. + A typical example is: - ln -s /DOS/windows/fonts /usr/share/fonts/truetype/winfonts -+ ln -s /DOS/windows/fonts @PREFIX@/lib/X11/fonts/TrueType/winfonts ++ ln -s /DOS/windows/fonts @PREFIX@/lib/X11/fonts/TTF/winfonts Now run "xfstt --sync" in order to have the new fonts recognized. Adding fonts while xfstt is running doesn't work yet. @@ -35,7 +35,7 @@ $NetBSD: patch-aa,v 1.4 2004/01/01 20:06:11 salo Exp $ - Create some subdirectories in /usr/share/fonts/truetype, e.g. - modern, script, brush, old, symbol, ... -+ Create some subdirectories in @PREFIX@/lib/X11/fonts/TrueType, ++ Create some subdirectories in @PREFIX@/lib/X11/fonts/TTF, + 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. diff --git a/x11/xfstt/patches/patch-ac b/x11/xfstt/patches/patch-ac index b694828804e..d2f876e1b8a 100644 --- a/x11/xfstt/patches/patch-ac +++ b/x11/xfstt/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.4 2004/01/01 20:06:11 salo Exp $ +$NetBSD: patch-ac,v 1.5 2004/01/25 20:46:20 wiz Exp $ --- src/Makefile.in.orig 2003-08-07 08:58:28.000000000 +0200 +++ src/Makefile.in 2004-01-01 20:51:39.000000000 +0100 @@ -8,8 +8,8 @@ $NetBSD: patch-ac,v 1.4 2004/01/01 20:06:11 salo Exp $ localedir = $(datadir)/locale -fontdir = $(datadir)/fonts/truetype -cachedir = $(localstatedir)/cache/xfstt -+fontdir = $(prefix)/lib/X11/fonts/TrueType -+cachedir = $(prefix)/lib/X11/fonts/TrueType ++fontdir = $(prefix)/lib/X11/fonts/TTF ++cachedir = $(prefix)/lib/X11/fonts/TTF pidfile = $(localstatedir)/run/xfstt.pid LDADD = @LIBINTL@ -L$(top_srcdir)/libfstt -lfstt diff --git a/x11/xfstt/patches/patch-ae b/x11/xfstt/patches/patch-ae index d095dae78b6..501394772c1 100644 --- a/x11/xfstt/patches/patch-ae +++ b/x11/xfstt/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.6 2003/02/22 13:33:32 salo Exp $ +$NetBSD: patch-ae,v 1.7 2004/01/25 20:46:20 wiz Exp $ --- doc/xfstt.1x.orig 2002-11-14 13:08:07.000000000 +0100 +++ doc/xfstt.1x 2003-02-22 10:43:49.000000000 +0100 @@ -7,13 +7,13 @@ $NetBSD: patch-ae,v 1.6 2003/02/22 13:33:32 salo Exp $ Change xfstt's font directory. The default directory is -.IR /usr/share/fonts/truetype . -+.IR @PREFIX@/lib/X11/fonts/TrueType . ++.IR @PREFIX@/lib/X11/fonts/TTF . .TP .I "\-\-cache name" Change xfstt's font cache directory. The default directory is -.IR /var/cache/xfstt . -+.IR @PREFIX@/lib/X11/fonts/TrueType . ++.IR @PREFIX@/lib/X11/fonts/TTF . .TP .I "\-\-pidfile name" Change xfstt's pidfile location. |