Date: Thu, 4 Sep 2003 23:00:43 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/56439: Update port: x11-servers/Xfstt to 1.6 Message-ID: <20030904230043.69f47735.tkato@prontomail.com> Resent-Message-ID: <200309041410.h84EALgp088202@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 56439 >Category: ports >Synopsis: Update port: x11-servers/Xfstt to 1.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Sep 04 07:10:20 PDT 2003 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.8-RELEASE-p3 i386 >Organization: >Environment: >Description: - Update to version 1.6 New file: files/patch-libfstt::ttf.h files/patch-src::Makefie.in Remove file: files/patch-src::perftest.cc files/patch-src::xfstt.cc >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-servers/Xfstt/Makefile x11-servers/Xfstt/Makefile --- /usr/ports/x11-servers/Xfstt/Makefile Sat Apr 12 23:33:15 2003 +++ x11-servers/Xfstt/Makefile Thu Sep 4 09:45:12 2003 @@ -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_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} diff -urN /usr/ports/x11-servers/Xfstt/distinfo x11-servers/Xfstt/distinfo --- /usr/ports/x11-servers/Xfstt/distinfo Sat Apr 12 23:33:15 2003 +++ x11-servers/Xfstt/distinfo Wed Sep 3 03:31:19 2003 @@ -1 +1 @@ -MD5 (xfstt-1.4.tar.gz) = e186b28d413056b4f95a02562e664bc6 +MD5 (xfstt-1.6.tar.gz) = 8134fb9854208e187582a0313f921829 diff -urN /usr/ports/x11-servers/Xfstt/files/patch-INSTALL x11-servers/Xfstt/files/patch-INSTALL --- /usr/ports/x11-servers/Xfstt/files/patch-INSTALL Sun Feb 16 22:55:09 2003 +++ x11-servers/Xfstt/files/patch-INSTALL Tue Jul 29 18:52:45 2003 @@ -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: diff -urN /usr/ports/x11-servers/Xfstt/files/patch-libfstt::ttf.h x11-servers/Xfstt/files/patch-libfstt::ttf.h --- /usr/ports/x11-servers/Xfstt/files/patch-libfstt::ttf.h Thu Jan 1 09:00:00 1970 +++ x11-servers/Xfstt/files/patch-libfstt::ttf.h Wed Sep 3 08:26:43 2003 @@ -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 + diff -urN /usr/ports/x11-servers/Xfstt/files/patch-src::Makefile.in x11-servers/Xfstt/files/patch-src::Makefile.in --- /usr/ports/x11-servers/Xfstt/files/patch-src::Makefile.in Thu Jan 1 09:00:00 1970 +++ x11-servers/Xfstt/files/patch-src::Makefile.in Thu Sep 4 09:44:31 2003 @@ -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 diff -urN /usr/ports/x11-servers/Xfstt/files/patch-src::perftest.cc x11-servers/Xfstt/files/patch-src::perftest.cc --- /usr/ports/x11-servers/Xfstt/files/patch-src::perftest.cc Sun Feb 16 22:55:09 2003 +++ x11-servers/Xfstt/files/patch-src::perftest.cc Thu Jan 1 09:00:00 1970 @@ -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" diff -urN /usr/ports/x11-servers/Xfstt/files/patch-src::xfstt.cc x11-servers/Xfstt/files/patch-src::xfstt.cc --- /usr/ports/x11-servers/Xfstt/files/patch-src::xfstt.cc Sun Feb 16 22:55:09 2003 +++ x11-servers/Xfstt/files/patch-src::xfstt.cc Thu Jan 1 09:00:00 1970 @@ -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" diff -urN /usr/ports/x11-servers/Xfstt/pkg-plist x11-servers/Xfstt/pkg-plist --- /usr/ports/x11-servers/Xfstt/pkg-plist Sat Apr 12 23:33:17 2003 +++ x11-servers/Xfstt/pkg-plist Thu Sep 4 09:42:31 2003 @@ -1,10 +1,10 @@ @comment $FreeBSD: ports/x11-servers/Xfstt/pkg-plist,v 1.4 2003/02/16 13:55:09 naddy Exp $ -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 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030904230043.69f47735.tkato>