- Update to version 1.6

PR:		56439
Submitted by:	Ports Fury
This commit is contained in:
Kirill Ponomarev
2003-09-04 17:21:40 +00:00
parent 14fcd4f889
commit f28b74e40f
8 changed files with 48 additions and 44 deletions

View File

@@ -6,7 +6,7 @@
#
PORTNAME= xfstt
PORTVERSION= 1.4
PORTVERSION= 1.6
CATEGORIES= x11-servers
MASTER_SITES= http://download.berlios.de/xfstt/
@@ -17,21 +17,21 @@ USE_X_PREFIX= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --disable-nls
CONFIGURE_ARGS= --localstatedir=/var --disable-nls
MAN1= xfstt.1x
TTFONTDIR= ${PREFIX}/lib/X11/fonts/TrueType
post-patch:
.for file in INSTALL doc/xfstt.1x src/perftest.cc src/xfstt.cc
.for file in INSTALL doc/xfstt.1x src/Makefile.in
@${REINPLACE_CMD} -e 's|%%TTFONTDIR%%|${TTFONTDIR}|g' ${WRKSRC}/${file}
.endfor
@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${FILESDIR}/xfstt.sh \
> ${WRKSRC}/xfstt.sh
post-install:
${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${FILESDIR}/xfstt.sh \
> ${PREFIX}/etc/rc.d/xfstt.sh
@${CHMOD} 755 ${PREFIX}/etc/rc.d/xfstt.sh
${INSTALL_SCRIPT} ${WRKSRC}/xfstt.sh ${PREFIX}/etc/rc.d
@${MKDIR} ${TTFONTDIR}
.if !defined{NOPORTDOCS}
@${MKDIR} ${DOCSDIR}

View File

@@ -1 +1 @@
MD5 (xfstt-1.4.tar.gz) = e186b28d413056b4f95a02562e664bc6
MD5 (xfstt-1.6.tar.gz) = 8134fb9854208e187582a0313f921829

View File

@@ -1,11 +1,11 @@
--- INSTALL.orig Tue Nov 19 13:47:49 2002
+++ INSTALL Wed Nov 20 22:34:03 2002
@@ -32,7 +32,7 @@
$ make && make install
--- INSTALL.orig Tue Jul 29 12:50:35 2003
+++ INSTALL Tue Jul 29 18:52:26 2003
@@ -43,7 +43,7 @@
(use gmake instead of the standard make on FreeBSD)
-2) Create a writeable directory /usr/share/fonts/truetype, copy some
+2) Create a writeable directory %%TTFONTDIR%%, copy some
truetype *.ttf files or create soflinks to truetype directories
in there, then run
3) Copy some truetype (.ttf) files or create symlinks to truetype directories
- in the default installation directory /usr/local/share/fonts/truetype
+ in the default installation directory %%TTFONTDIR%%
(note that this directory may be changed in the configure step). Then to
generate the font databases:

View File

@@ -0,0 +1,15 @@
--- libfstt/ttf.h.orig Thu Aug 7 15:20:44 2003
+++ libfstt/ttf.h Wed Sep 3 08:03:38 2003
@@ -49,10 +49,10 @@
#endif
#ifndef DEBUG
-# define debug(format, ...)
+# define debug(format, ARGS...)
# define STATIC static
#else
-# define debug(format, ...) fprintf(outfile, format, ##__VA_ARGS__)
+# define debug(format, ARGS...) fprintf(outfile, format, ##ARGS)
# define STATIC
#endif

View File

@@ -0,0 +1,13 @@
--- src/Makefile.in.orig Thu Aug 7 15:58:28 2003
+++ src/Makefile.in Thu Sep 4 09:44:20 2003
@@ -163,8 +163,8 @@
target_alias = @target_alias@
localedir = $(datadir)/locale
-fontdir = $(datadir)/fonts/truetype
-cachedir = $(localstatedir)/cache/xfstt
+fontdir = %%TTFONTDIR%%
+cachedir = %%TTFONTDIR%%
pidfile = $(localstatedir)/run/xfstt.pid
LDADD = @LIBINTL@ -L$(top_srcdir)/libfstt -lfstt

View File

@@ -1,11 +0,0 @@
--- src/perftest.cc.orig Thu Nov 14 21:08:09 2002
+++ src/perftest.cc Wed Nov 20 23:17:01 2002
@@ -21,7 +21,7 @@
*
*/
-#define TTFONTDIR "/usr/share/fonts/truetype"
+#define TTFONTDIR "%%TTFONTDIR%%"
#define MAXFONTBUFSIZE (2048*2048)
#include "ttf.h"

View File

@@ -1,13 +0,0 @@
--- src/xfstt.cc.orig Thu Nov 14 21:08:08 2002
+++ src/xfstt.cc Wed Nov 20 23:22:03 2002
@@ -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 "%%TTFONTDIR%%"
+#define TTCACHEDIR "%%TTFONTDIR%%"
#define TTINFO_LEAF "ttinfo.dir"
#define TTNAME_LEAF "ttname.dir"

View File

@@ -1,10 +1,10 @@
@comment $FreeBSD$
etc/rc.d/xfstt.sh
bin/xfstt
%%PORTDOCS%%share/doc/xfstt/CHANGES
%%PORTDOCS%%share/doc/xfstt/INSTALL
%%PORTDOCS%%share/doc/xfstt/THANKS
%%PORTDOCS%%@dirrm share/doc/xfstt
etc/rc.d/xfstt.sh
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/THANKS
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@exec mkdir -p %D/lib/X11/fonts/TrueType
@unexec rm -f %D/lib/X11/fonts/TrueType/ttname.dir
@unexec rm -f %D/lib/X11/fonts/TrueType/ttinfo.dir