From 0353d416d52a013ae984d3fcd1cdb567922f3788 Mon Sep 17 00:00:00 2001 From: grant Date: Fri, 27 Sep 2002 17:03:21 +0000 Subject: Make this work with xpkgwedge by using PREFIX instead of X11BASE. Bump PKGREVISION. Fixes pkg/18197 from Urban Boquist . --- x11/xfstt/Makefile | 5 +++-- x11/xfstt/distinfo | 10 +++++----- x11/xfstt/patches/patch-aa | 18 +++++++++++++----- x11/xfstt/patches/patch-ac | 8 ++++---- x11/xfstt/patches/patch-ad | 6 +++--- x11/xfstt/patches/patch-ae | 4 ++-- 6 files changed, 30 insertions(+), 21 deletions(-) (limited to 'x11') diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile index bdd5b01123f..00ea3c90e7c 100644 --- a/x11/xfstt/Makefile +++ b/x11/xfstt/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.9 2002/09/27 14:47:06 grant Exp $ +# $NetBSD: Makefile,v 1.10 2002/09/27 17:03:21 grant Exp $ # DISTNAME= xfstt_1.3 PKGNAME= ${DISTNAME:S/_/-/} CATEGORIES= x11 net +PKGREVISION= 1 MASTER_SITES= http://download.berlios.de/xfstt/ MAINTAINER= packages@netbsd.org @@ -25,7 +26,7 @@ post-patch: for i in INSTALL perftest.cpp xfstt.cpp xfstt.1x; \ do \ ${MV} $$i $$i.bak ; \ - ${SED} -e 's;@X11BASE@;${X11BASE};' < $$i.bak > $$i ; \ + ${SED} -e 's;@PREFIX@;${PREFIX};' < $$i.bak > $$i ; \ done ; \ ) diff --git a/x11/xfstt/distinfo b/x11/xfstt/distinfo index d157cb893e5..ba3ed41d5b0 100644 --- a/x11/xfstt/distinfo +++ b/x11/xfstt/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2002/08/22 02:22:14 grant Exp $ +$NetBSD: distinfo,v 1.5 2002/09/27 17:03:21 grant Exp $ SHA1 (xfstt_1.3.tar.gz) = 3d830c69da193f97790aca2434948a053f3a838b Size (xfstt_1.3.tar.gz) = 91817 bytes -SHA1 (patch-aa) = 1d4deffc912664589501326ec1aef80d65d1f7b9 +SHA1 (patch-aa) = feb475e11f63374e1ad8ba3fdd6d1b0dd5e23c81 SHA1 (patch-ab) = ee31dab3570436f823a55c2108ea615eb9ea323a -SHA1 (patch-ac) = 41f637e882ad91eda30c926b2e54a0f8b4edfaf4 -SHA1 (patch-ad) = 5d581a1bc80454f49203d9e9eb7fe8f4fbb506f2 -SHA1 (patch-ae) = cf738cbf634ed3ac0cb09660dcd57d3ccc9d51f9 +SHA1 (patch-ac) = 1fa14e6211a742936eae7c9282499ae66e6c5258 +SHA1 (patch-ad) = 7ad47d5a06570fa866b47e453cbcaea8af7f187d +SHA1 (patch-ae) = 4296c1a666b60548d432217c7fe03c9eccf5ea87 diff --git a/x11/xfstt/patches/patch-aa b/x11/xfstt/patches/patch-aa index aa22834ae23..701799ff38c 100644 --- a/x11/xfstt/patches/patch-aa +++ b/x11/xfstt/patches/patch-aa @@ -1,16 +1,24 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/09/04 15:49:36 kim Exp $ +$NetBSD: patch-aa,v 1.2 2002/09/27 17:03:21 grant Exp $ ---- INSTALL.orig Sat Apr 17 09:10:37 1999 -+++ INSTALL Sun Sep 3 09:31:55 2000 +--- INSTALL.orig Sat Apr 17 23:10:37 1999 ++++ INSTALL @@ -2,8 +2,9 @@ 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 - files or create soflinks to truetype directories in there, then run -+2) Create a writeable directory @X11BASE@/lib/X11/fonts/TrueType, -+ copy some truetype *.ttf files or create soflinks to truetype ++2) Create a writeable directory @PREFIX@/lib/X11/fonts/TrueType, ++ copy some truetype *.ttf files or create softlinks to truetype + directories in there, then run xfstt --sync 3) Start xfstt in the background +@@ -17,4 +18,7 @@ + + These install instructions should suffice for 98% of all users. For more + advanced requirements refer to the xfstt(1x) man page or the FAQ. ++ ++Note: The pkgsrc rc.d script `xfstt' automatically runs ++`xfstt --sync' before starting xfstt. + diff --git a/x11/xfstt/patches/patch-ac b/x11/xfstt/patches/patch-ac index f1fd1ed98f7..8e14b19fa5d 100644 --- a/x11/xfstt/patches/patch-ac +++ b/x11/xfstt/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/09/04 15:49:36 kim Exp $ +$NetBSD: patch-ac,v 1.2 2002/09/27 17:03:21 grant Exp $ ---- perftest.cpp.orig Fri Jan 8 21:11:04 1999 -+++ perftest.cpp Sun Sep 3 09:32:37 2000 +--- perftest.cpp.orig Sat Jan 9 13:11:04 1999 ++++ perftest.cpp @@ -1,7 +1,7 @@ // test ttf engine performance // (C) Copyright 1997-1998 Herbert Duerr -#define TTFONTDIR "/usr/share/fonts/truetype" -+#define TTFONTDIR "@X11BASE@/lib/X11/fonts/TrueType" ++#define TTFONTDIR "@PREFIX@/lib/X11/fonts/TrueType" #define MAXFONTBUFSIZE (2048*2048) #include "ttf.h" diff --git a/x11/xfstt/patches/patch-ad b/x11/xfstt/patches/patch-ad index 9b042edb27f..53c154bd2fc 100644 --- a/x11/xfstt/patches/patch-ad +++ b/x11/xfstt/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.3 2002/08/22 02:21:07 grant Exp $ +$NetBSD: patch-ad,v 1.4 2002/09/27 17:03:21 grant Exp $ --- xfstt.cpp.orig Wed Jul 31 08:18:20 2002 +++ xfstt.cpp @@ -8,8 +8,8 @@ $NetBSD: patch-ad,v 1.3 2002/08/22 02:21:07 grant Exp $ // 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 TTCACHEDIR "@X11BASE@/lib/X11/fonts/TrueType" ++#define TTFONTDIR "@PREFIX@/lib/X11/fonts/TrueType" ++#define TTCACHEDIR "@PREFIX@/lib/X11/fonts/TrueType" #define TTINFO_LEAF "ttinfo.dir" #define TTNAME_LEAF "ttname.dir" diff --git a/x11/xfstt/patches/patch-ae b/x11/xfstt/patches/patch-ae index 84e625d56c2..ba69d00e503 100644 --- a/x11/xfstt/patches/patch-ae +++ b/x11/xfstt/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.4 2002/08/22 02:21:07 grant Exp $ +$NetBSD: patch-ae,v 1.5 2002/09/27 17:03:21 grant Exp $ --- xfstt.1x.orig Fri Aug 2 12:03:15 2002 +++ xfstt.1x @@ -7,7 +7,7 @@ $NetBSD: patch-ae,v 1.4 2002/08/22 02:21:07 grant Exp $ Change xfstt's font directory. The default directory is -.IR /usr/share/fonts/truetype . -+.IR @X11BASE@/lib/X11/fonts/TrueType . ++.IR @PREFIX@/lib/X11/fonts/TrueType . .TP .I "\-\-res value" Force the resolution for underspecified fonts to value (typically 96 or 120). -- cgit v1.2.3