Attachment #34812 for bug #56439

View | Details | Raw Unified | Return to bug 56439
Collapse All | Expand All




#

PORTNAME=	xfstt
PORTVERSION=	1.6
CATEGORIES=	x11-servers
MASTER_SITES=	http://download.berlios.de/xfstt/


USE_REINPLACE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
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/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:
	${INSTALL_SCRIPT} ${WRKSRC}/xfstt.sh ${PREFIX}/etc/rc.d
		> ${PREFIX}/etc/rc.d/xfstt.sh
	@${CHMOD} 755 ${PREFIX}/etc/rc.d/xfstt.sh
	@${MKDIR} ${TTFONTDIR}
.if !defined{NOPORTDOCS}
	@${MKDIR} ${DOCSDIR}

Line 1 Link Here

(-)x11-servers/Xfstt/distinfo (-1 / +1 lines)
1	MD5 (xfstt-1.4.tar.gz) = e186b28d413056b4f95a02562e664bc6	1	MD5 (xfstt-1.6.tar.gz) = 8134fb9854208e187582a0313f921829




--- INSTALL.orig	Tue Jul 29 12:50:35 2003
+++ INSTALL	Tue Jul 29 18:52:26 2003
@@ -43,7 +43,7 @@
  $ make && make install
    (use gmake instead of the standard make on FreeBSD)
 
 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:
 




--- 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
 




--- 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

Lines 1-11 Link Here

(-)x11-servers/Xfstt/files/patch-src::perftest.cc (-11 lines)
1	--- src/perftest.cc.orig Thu Nov 14 21:08:09 2002
2	+++ src/perftest.cc Wed Nov 20 23:17:01 2002
3	@@ -21,7 +21,7 @@
4	*
5	*/
6
7	-#define TTFONTDIR "/usr/share/fonts/truetype"
8	+#define TTFONTDIR "%%TTFONTDIR%%"
9	#define MAXFONTBUFSIZE (2048*2048)
10
11	#include "ttf.h"




--- 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"

Lines 1-10 Link Here

(-)x11-servers/Xfstt/pkg-plist (-5 / +5 lines)
1	@comment $FreeBSD: ports/x11-servers/Xfstt/pkg-plist,v 1.4 2003/02/16 13:55:09 naddy Exp $	1	@comment $FreeBSD: ports/x11-servers/Xfstt/pkg-plist,v 1.4 2003/02/16 13:55:09 naddy Exp $
2	etc/rc.d/xfstt.sh
3	bin/xfstt	2	bin/xfstt
4	%%PORTDOCS%%share/doc/xfstt/CHANGES	3	etc/rc.d/xfstt.sh
5	%%PORTDOCS%%share/doc/xfstt/INSTALL	4	%%PORTDOCS%%%%DOCSDIR%%/CHANGES
6	%%PORTDOCS%%share/doc/xfstt/THANKS	5	%%PORTDOCS%%%%DOCSDIR%%/INSTALL
7	%%PORTDOCS%%@dirrm share/doc/xfstt	6	%%PORTDOCS%%%%DOCSDIR%%/THANKS
		7	%%PORTDOCS%%@dirrm %%DOCSDIR%%
8	@exec mkdir -p %D/lib/X11/fonts/TrueType	8	@exec mkdir -p %D/lib/X11/fonts/TrueType
9	@unexec rm -f %D/lib/X11/fonts/TrueType/ttname.dir	9	@unexec rm -f %D/lib/X11/fonts/TrueType/ttname.dir
10	@unexec rm -f %D/lib/X11/fonts/TrueType/ttinfo.dir	10	@unexec rm -f %D/lib/X11/fonts/TrueType/ttinfo.dir

Return to bug 56439

Lines 6-12 Link Here

(-)x11-servers/Xfstt/Makefile (-6 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= xfstt	8	PORTNAME= xfstt
9	PORTVERSION= 1.4	9	PORTVERSION= 1.6
10	CATEGORIES= x11-servers	10	CATEGORIES= x11-servers
11	MASTER_SITES= http://download.berlios.de/xfstt/	11	MASTER_SITES= http://download.berlios.de/xfstt/
12		12
Lines 17-37 Link Here
17	USE_REINPLACE= yes	17	USE_REINPLACE= yes
18	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
19	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	19	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
20	CONFIGURE_ARGS= --disable-nls	20	CONFIGURE_ARGS= --localstatedir=/var --disable-nls
21		21
22	MAN1= xfstt.1x	22	MAN1= xfstt.1x
23		23
24	TTFONTDIR= ${PREFIX}/lib/X11/fonts/TrueType	24	TTFONTDIR= ${PREFIX}/lib/X11/fonts/TrueType
25		25
26	post-patch:	26	post-patch:
27	.for file in INSTALL doc/xfstt.1x src/perftest.cc src/xfstt.cc	27	.for file in INSTALL doc/xfstt.1x src/Makefile.in
28	@${REINPLACE_CMD} -e 's\|%%TTFONTDIR%%\|${TTFONTDIR}\|g' ${WRKSRC}/${file}	28	@${REINPLACE_CMD} -e 's\|%%TTFONTDIR%%\|${TTFONTDIR}\|g' ${WRKSRC}/${file}
29	.endfor	29	.endfor
		30	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${FILESDIR}/xfstt.sh \
		31	> ${WRKSRC}/xfstt.sh
30		32
31	post-install:	33	post-install:
32	${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${FILESDIR}/xfstt.sh \	34	${INSTALL_SCRIPT} ${WRKSRC}/xfstt.sh ${PREFIX}/etc/rc.d
33	> ${PREFIX}/etc/rc.d/xfstt.sh
34	@${CHMOD} 755 ${PREFIX}/etc/rc.d/xfstt.sh
35	@${MKDIR} ${TTFONTDIR}	35	@${MKDIR} ${TTFONTDIR}
36	.if !defined{NOPORTDOCS}	36	.if !defined{NOPORTDOCS}
37	@${MKDIR} ${DOCSDIR}	37	@${MKDIR} ${DOCSDIR}

Lines 1-11 Link Here

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

Line 0 Link Here

(-)x11-servers/Xfstt/files/patch-libfstt::ttf.h (+15 lines)
	1	--- libfstt/ttf.h.orig Thu Aug 7 15:20:44 2003
	2	+++ libfstt/ttf.h Wed Sep 3 08:03:38 2003
	3	@@ -49,10 +49,10 @@
	4	#endif
	5
	6	#ifndef DEBUG
	7	-# define debug(format, ...)
	8	+# define debug(format, ARGS...)
	9	# define STATIC static
	10	#else
	11	-# define debug(format, ...) fprintf(outfile, format, ##__VA_ARGS__)
	12	+# define debug(format, ARGS...) fprintf(outfile, format, ##ARGS)
	13	# define STATIC
	14	#endif
	15

Line 0 Link Here

(-)x11-servers/Xfstt/files/patch-src::Makefile.in (+13 lines)
	1	--- src/Makefile.in.orig Thu Aug 7 15:58:28 2003
	2	+++ src/Makefile.in Thu Sep 4 09:44:20 2003
	3	@@ -163,8 +163,8 @@
	4	target_alias = @target_alias@
	5
	6	localedir = $(datadir)/locale
	7	-fontdir = $(datadir)/fonts/truetype
	8	-cachedir = $(localstatedir)/cache/xfstt
	9	+fontdir = %%TTFONTDIR%%
	10	+cachedir = %%TTFONTDIR%%
	11	pidfile = $(localstatedir)/run/xfstt.pid
	12
	13	LDADD = @LIBINTL@ -L$(top_srcdir)/libfstt -lfstt

Lines 1-13 Link Here

(-)x11-servers/Xfstt/files/patch-src::xfstt.cc (-13 lines)
1	--- src/xfstt.cc.orig Thu Nov 14 21:08:08 2002
2	+++ src/xfstt.cc Wed Nov 20 23:22:03 2002
3	@@ -31,8 +31,8 @@
4	#define UNSTRAPLIMIT 10500U
5
6	// Change these if you don't like being FHS complient
7	-#define TTFONTDIR "/usr/share/fonts/truetype"
8	-#define TTCACHEDIR "/var/cache/xfstt"
9	+#define TTFONTDIR "%%TTFONTDIR%%"
10	+#define TTCACHEDIR "%%TTFONTDIR%%"
11
12	#define TTINFO_LEAF "ttinfo.dir"
13	#define TTNAME_LEAF "ttname.dir"