Sun Jun 1 18:49:41 2014 UTC ()
Use default font path. Bump PKGREVISION.


(wiz)
diff -r1.35 -r1.36 pkgsrc/x11/xfstt/Makefile
diff -r1.11 -r1.12 pkgsrc/x11/xfstt/distinfo
diff -r1.6 -r1.7 pkgsrc/x11/xfstt/patches/patch-aa
diff -r1.6 -r1.7 pkgsrc/x11/xfstt/patches/patch-ac
cvs diff -r1.35 -r1.36 pkgsrc/x11/xfstt/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xfstt/Makefile 2014/02/08 02:53:05 1.35
+++ pkgsrc/x11/xfstt/Makefile 2014/06/01 18:49:41 1.36
@@ -1,41 +1,40 @@ @@ -1,41 +1,40 @@
1# $NetBSD: Makefile,v 1.35 2014/02/08 02:53:05 wiedi Exp $ 1# $NetBSD: Makefile,v 1.36 2014/06/01 18:49:41 wiz Exp $
2# 
3 2
4DISTNAME= xfstt-1.9 3DISTNAME= xfstt-1.9
5CATEGORIES= x11 net fonts 4CATEGORIES= x11 net fonts
6MASTER_SITES= http://download.berlios.de/xfstt/ 5MASTER_SITES= http://download.berlios.de/xfstt/
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://developer.berlios.de/projects/xfstt/ 8HOMEPAGE= http://developer.berlios.de/projects/xfstt/
10COMMENT= TrueType font server for X11 9COMMENT= TrueType font server for X11
11LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
12 11
13USE_LANGUAGES= c c++ 12USE_LANGUAGES= c c++
14USE_X11BASE= YES 13USE_X11BASE= YES
15USE_TOOLS+= gmake pkg-config 14USE_TOOLS+= gmake pkg-config
16GNU_CONFIGURE= YES 15GNU_CONFIGURE= YES
17 16
18# There isn't really any l10n yet, only some preliminary i18n support. 17# There isn't really any l10n yet, only some preliminary i18n support.
19CONFIGURE_ARGS+= --disable-nls 18CONFIGURE_ARGS+= --disable-nls
20 19
21CXXFLAGS+= -fomit-frame-pointer -ffast-math 20CXXFLAGS+= -fomit-frame-pointer -ffast-math
22 21
23LDFLAGS.SunOS+= -lsocket -lnsl 22LDFLAGS.SunOS+= -lsocket -lnsl
24 23
25RCD_SCRIPTS= xfstt 24RCD_SCRIPTS= xfstt
26INSTALLATION_DIRS= bin \ 25INSTALLATION_DIRS= bin \
27 ${PKGMANDIR}/man1 \ 26 ${PKGMANDIR}/man1 \
28 lib/X11/fonts/TTF \ 27 share/fonts/X11/TTF \
29 share/doc/xfstt \ 28 share/doc/xfstt \
30 share/examples/xfstt 29 share/examples/xfstt
31 30
32SUBST_CLASSES+= paths 31SUBST_CLASSES+= paths
33SUBST_FILES.paths= doc/FAQ doc/xfstt.1x 32SUBST_FILES.paths= doc/FAQ doc/xfstt.1x
34SUBST_SED.paths= -e 's,@PREFIX@,${PREFIX},g' 33SUBST_SED.paths= -e 's,@PREFIX@,${PREFIX},g'
35SUBST_STAGE.paths= post-patch 34SUBST_STAGE.paths= post-patch
36 35
37do-install: 36do-install:
38 ${INSTALL_PROGRAM} ${WRKSRC}/src/xfstt ${DESTDIR}${PREFIX}/bin 37 ${INSTALL_PROGRAM} ${WRKSRC}/src/xfstt ${DESTDIR}${PREFIX}/bin
39 ${INSTALL_MAN} ${WRKSRC}/doc/xfstt.1x \ 38 ${INSTALL_MAN} ${WRKSRC}/doc/xfstt.1x \
40 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xfstt.1 39 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xfstt.1
41 cd ${WRKSRC} && ( \ 40 cd ${WRKSRC} && ( \
cvs diff -r1.11 -r1.12 pkgsrc/x11/xfstt/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xfstt/distinfo 2012/06/13 08:15:13 1.11
+++ pkgsrc/x11/xfstt/distinfo 2014/06/01 18:49:41 1.12
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.11 2012/06/13 08:15:13 mef Exp $ 1$NetBSD: distinfo,v 1.12 2014/06/01 18:49:41 wiz Exp $
2 2
3SHA1 (xfstt-1.9.tar.gz) = 0bc390a4908ca530b7cb4b67faad3f3abeba7a65 3SHA1 (xfstt-1.9.tar.gz) = 0bc390a4908ca530b7cb4b67faad3f3abeba7a65
4RMD160 (xfstt-1.9.tar.gz) = 6463f2b81846708d9f101fc384419be8cf37fbbe 4RMD160 (xfstt-1.9.tar.gz) = 6463f2b81846708d9f101fc384419be8cf37fbbe
5Size (xfstt-1.9.tar.gz) = 286939 bytes 5Size (xfstt-1.9.tar.gz) = 286939 bytes
6SHA1 (patch-aa) = bd4f364d42acd1d0a734b12f140c5a07004c09cb 6SHA1 (patch-aa) = 8210f3929c4adbe5d2a0bdae8bfd4a1b704d1013
7SHA1 (patch-ab) = 78dc21537e86e5533e747e7bab3e5280087fa43b 7SHA1 (patch-ab) = 78dc21537e86e5533e747e7bab3e5280087fa43b
8SHA1 (patch-ac) = 18b4593735ce1e80c55c54a89293e672d22fceac 8SHA1 (patch-ac) = c9bfc230c6be8872da329da8ab54363b7f87cdea
9SHA1 (patch-af) = e742a5461925c72e5647b8cfa8e83d1de77ac231 9SHA1 (patch-af) = e742a5461925c72e5647b8cfa8e83d1de77ac231
10SHA1 (patch-ag) = 270ba4fcaecc289c8b170792481f8353d54498e2 10SHA1 (patch-ag) = 270ba4fcaecc289c8b170792481f8353d54498e2
11SHA1 (patch-ah) = f563d157e5f23c3badb4e10de77e4db633b072ca 11SHA1 (patch-ah) = f563d157e5f23c3badb4e10de77e4db633b072ca
12SHA1 (patch-ai) = 04f35f960614df376960d1ff1e1d410120c0598e 12SHA1 (patch-ai) = 04f35f960614df376960d1ff1e1d410120c0598e
13SHA1 (patch-aj) = 5afb7cacfdfa542701ca29ee2d78fa98050c6df8 13SHA1 (patch-aj) = 5afb7cacfdfa542701ca29ee2d78fa98050c6df8
14SHA1 (patch-ak) = 72cf7c168e9684aabb0ff95b9bff752c888151fb 14SHA1 (patch-ak) = 72cf7c168e9684aabb0ff95b9bff752c888151fb
15SHA1 (patch-al) = 7e766d1a52b7c5c2183d67db1da759b170007c66 15SHA1 (patch-al) = 7e766d1a52b7c5c2183d67db1da759b170007c66
16SHA1 (patch-am) = 4424107b9c2b8c9167560733ef1ce89d2e86fa09 16SHA1 (patch-am) = 4424107b9c2b8c9167560733ef1ce89d2e86fa09
17SHA1 (patch-an) = 1936547506bb83e50d9cbf7579df2f18e695ac29 17SHA1 (patch-an) = 1936547506bb83e50d9cbf7579df2f18e695ac29
18SHA1 (patch-ao) = 8be98e207b5e709dea51d33b26595dafc508c1df 18SHA1 (patch-ao) = 8be98e207b5e709dea51d33b26595dafc508c1df
19SHA1 (patch-ap) = 83d5c81bfe6fb7e78794792cf37b7a63575cef22 19SHA1 (patch-ap) = 83d5c81bfe6fb7e78794792cf37b7a63575cef22
20SHA1 (patch-aq) = 71b49c068ce83706f5cbcda8adfa8df6b3d24e06 20SHA1 (patch-aq) = 71b49c068ce83706f5cbcda8adfa8df6b3d24e06
21SHA1 (patch-ar) = b909ab488f71045eb1b60fba33297c8245441d60 21SHA1 (patch-ar) = b909ab488f71045eb1b60fba33297c8245441d60
cvs diff -r1.6 -r1.7 pkgsrc/x11/xfstt/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/xfstt/patches/Attic/patch-aa 2012/06/13 08:15:14 1.6
+++ pkgsrc/x11/xfstt/patches/Attic/patch-aa 2014/06/01 18:49:41 1.7
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1$NetBSD: patch-aa,v 1.6 2012/06/13 08:15:14 mef Exp $ 1$NetBSD: patch-aa,v 1.7 2014/06/01 18:49:41 wiz Exp $
2 2
3Convert hardcoded PATH to @PREFIX@ 3Convert hardcoded PATH to @PREFIX@
4 4
5--- doc/FAQ.orig 2003-08-07 08:59:03.000000000 +0200 5--- doc/FAQ.orig 2003-08-07 08:59:03.000000000 +0200
6+++ doc/FAQ 2004-01-01 20:44:46.000000000 +0100 6+++ doc/FAQ 2004-01-01 20:44:46.000000000 +0100
7@@ -68,8 +68,8 @@ 7@@ -68,8 +68,8 @@
8  8
9 1.1 How do I test it? 9 1.1 How do I test it?
10  10
11- mkdir /usr/share/fonts/truetype and put some *ttf fonts there, now 11- mkdir /usr/share/fonts/truetype and put some *ttf fonts there, now
12- run: 12- run:
13+ mkdir @PREFIX@/lib/X11/fonts/TTF and put some *ttf fonts 13+ mkdir @PREFIX@/share/fonts/X11/TTF and put some *ttf fonts
14+ there, now run: 14+ there, now run:
15  15
16 make xfstt && make install 16 make xfstt && make install
17 xfstt --sync 17 xfstt --sync
18@@ -175,11 +175,11 @@ 18@@ -175,11 +175,11 @@
19  19
20 2.4 How does one add fonts? 20 2.4 How does one add fonts?
21  21
22- Copy *.ttf fonts into the /usr/share/fonts/truetype/ directory or 22- Copy *.ttf fonts into the /usr/share/fonts/truetype/ directory or
23- put some softlinks to font directories in there. A typical example 23- put some softlinks to font directories in there. A typical example
24- is: 24- is:
25+ Copy *.ttf fonts into the @PREFIX@/lib/X11/fonts/TTF/ 25+ Copy *.ttf fonts into the @PREFIX@/share/fonts/X11/TTF/
26+ directory or put some softlinks to font directories in there. 26+ directory or put some softlinks to font directories in there.
27+ A typical example is: 27+ A typical example is:
28  28
29- ln -s /DOS/windows/fonts /usr/share/fonts/truetype/winfonts 29- ln -s /DOS/windows/fonts /usr/share/fonts/truetype/winfonts
30+ ln -s /DOS/windows/fonts @PREFIX@/lib/X11/fonts/TTF/winfonts 30+ ln -s /DOS/windows/fonts @PREFIX@/share/fonts/X11/TTF/winfonts
31  31
32 Now run "xfstt --sync" in order to have the new fonts recognized. 32 Now run "xfstt --sync" in order to have the new fonts recognized.
33 Adding fonts while xfstt is running doesn't work yet. 33 Adding fonts while xfstt is running doesn't work yet.
34@@ -358,8 +358,8 @@ 34@@ -358,8 +358,8 @@
35  35
36 3.0 How do I put fonts in categories? 36 3.0 How do I put fonts in categories?
37  37
38- Create some subdirectories in /usr/share/fonts/truetype, e.g. 38- Create some subdirectories in /usr/share/fonts/truetype, e.g.
39- modern, script, brush, old, symbol, ... 39- modern, script, brush, old, symbol, ...
40+ Create some subdirectories in @PREFIX@/lib/X11/fonts/TTF, 40+ Create some subdirectories in @PREFIX@/share/fonts/X11/TTF,
41+ e.g. modern, script, brush, old, symbol, ... 41+ e.g. modern, script, brush, old, symbol, ...
42 and put the appropriate fonts in there. The corresponding font 42 and put the appropriate fonts in there. The corresponding font
43 names will be -modern-*, -script-*, -brush-* and so on. 43 names will be -modern-*, -script-*, -brush-* and so on.
44  44
cvs diff -r1.6 -r1.7 pkgsrc/x11/xfstt/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/x11/xfstt/patches/patch-ac 2012/06/13 08:15:14 1.6
+++ pkgsrc/x11/xfstt/patches/patch-ac 2014/06/01 18:49:41 1.7
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-ac,v 1.6 2012/06/13 08:15:14 mef Exp $ 1$NetBSD: patch-ac,v 1.7 2014/06/01 18:49:41 wiz Exp $
2 2
3Adjust fontdir and cachedir to pkgsrc style. 3Adjust fontdir and cachedir to pkgsrc style.
4 4
5--- src/Makefile.in.orig 2010-11-09 13:29:50.000000000 +0900 5--- src/Makefile.in.orig 2010-11-09 13:29:50.000000000 +0900
6+++ src/Makefile.in 2011-10-17 11:57:56.000000000 +0900 6+++ src/Makefile.in 2011-10-17 11:57:56.000000000 +0900
7@@ -244,8 +244,8 @@ 7@@ -244,8 +244,8 @@
8 top_build_prefix = @top_build_prefix@ 8 top_build_prefix = @top_build_prefix@
9 top_builddir = @top_builddir@ 9 top_builddir = @top_builddir@
10 top_srcdir = @top_srcdir@ 10 top_srcdir = @top_srcdir@
11-fontdir = $(datadir)/fonts/truetype 11-fontdir = $(datadir)/fonts/truetype
12-cachedir = $(localstatedir)/cache/xfstt 12-cachedir = $(localstatedir)/cache/xfstt
13+fontdir = $(prefix)/lib/X11/fonts/TTF 13+fontdir = $(prefix)/share/fonts/X11/TTF
14+cachedir = $(prefix)/lib/X11/fonts/TTF 14+cachedir = $(prefix)/share/fonts/X11/TTF
15 pidfile = $(localstatedir)/run/xfstt.pid 15 pidfile = $(localstatedir)/run/xfstt.pid
16 LDADD = @LIBINTL@ -L$(top_builddir)/libfstt -lfstt 16 LDADD = @LIBINTL@ -L$(top_builddir)/libfstt -lfstt
17 AM_CPPFLAGS = -DLOCALEDIR=\""$(localedir)\"" -DFONTDIR=\""$(fontdir)\"" \ 17 AM_CPPFLAGS = -DLOCALEDIR=\""$(localedir)\"" -DFONTDIR=\""$(fontdir)\"" \