Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Nov 2014 19:40:38 +0000 (UTC)
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r373364 - in head/x11-servers/Xfstt: . files
Message-ID:  <201411241940.sAOJec5S043875@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pi
Date: Mon Nov 24 19:40:37 2014
New Revision: 373364
URL: https://svnweb.freebsd.org/changeset/ports/373364
QAT: https://qat.redports.org/buildarchive/r373364/

Log:
  x11-servers/Xfstt: 1.6 -> 1.9.1
  
  new master site and:
  
  1.9.1 (2014-09-27)
  
          Bump gettext dependency to 0.18.2.
          Bump automake version to 1.11.
          Switch from gzip to xz for distribution tarballs.
          Update upstream project URLs to the new site.
  
  1.9 (2012-05-02)
  
          Fix file descriptor leaks.
          Fix directory resource leaks and segfaults on opening errors.
          Reset the umask before creating the temporary directory.
          Rewrite showttf to use XCB instead of X11.
  
  1.8 (2010-11-09)
  
          Remove the obsolete --multi option.
          Bump gettext dependency to 0.18.
            Use --previous in msgmerge to help translators.
          Blank unused fields of the fsError struct when sending an error.
          Fix segfaults on font open errors (thanks to Edward Welbourne).
          Handle mmap failures which might end up as segfaults otherwise.
          Fix crashes with fortify support when:
  	  Listing fonts (thanks to Erik Devriendt).
  	  Setting info file magic and type fields (thanks to Niall Creech).
  	Fix segfault on fonts with unknown cmap format.
  	Add SIGHUP handler to re-sync fonts cache.
  	Do not hardcode any path component in the man page.
  	Code cleanup:
  	  Fixed several compiler warnings.
  	  Constify types.
  	  Refactor client state into a new struct.
  	  Refactor font protocol error reply handling.
  	  Remove unused or duped includes.
  	  Switch more C 'char *' strings to C++ strings.
  	  Use C++ algorithm instead of custom code.
  	  Always include "config.h" first.
  	  Use <stdint.h> instead of our own types.
  	Build system cleanup:
  	  Detect system endianness at build time.
  	  Enable silent rules by default if support is available.
  	  Do not use AM_MAINTAINER_MODE.
  	  Make X11 usage selectable at configure time (new '--with-x11').
  	  Always build (but not install) extra tools.
  	  Use pkg-config to get fontsproto and x11 module flags.
  	  Fix 'make distcheck'.
  
  1.7 (2005-11-30)
  
  	Made gettext external.
  	Use autoreconf instead of 'autogen.sh'.
  	Changed mail address.
  	Generate the manpage at build time, to use variable paths and version.
  	Remove win32 obsolete code.
  	Use new error, warning and info functions.
  	Changed some data types names.
  	Fix hyphen used as minus sign in manpage.
  	Fix build failure on Irix with gcc 3.2 (thanks to Dirk Tilger).
  	Add IPv6 support.
  	Update FSF's address.
  
  PR:		194968
  Submitted by:	C.Hutchinson <portmaster@bsdforge.com>

Added:
  head/x11-servers/Xfstt/files/patch-doc__Makefile.in   (contents, props changed)
  head/x11-servers/Xfstt/files/xfstt.in
     - copied unchanged from r373349, head/x11-servers/Xfstt/files/xfstt.sh
Deleted:
  head/x11-servers/Xfstt/files/patch-doc__xfstt.1x
  head/x11-servers/Xfstt/files/patch-libfstt__ttf.h
  head/x11-servers/Xfstt/files/xfstt.sh
Modified:
  head/x11-servers/Xfstt/Makefile
  head/x11-servers/Xfstt/distinfo
  head/x11-servers/Xfstt/files/patch-src__Makefile.in
  head/x11-servers/Xfstt/pkg-descr
  head/x11-servers/Xfstt/pkg-plist

Modified: head/x11-servers/Xfstt/Makefile
==============================================================================
--- head/x11-servers/Xfstt/Makefile	Mon Nov 24 19:35:10 2014	(r373363)
+++ head/x11-servers/Xfstt/Makefile	Mon Nov 24 19:40:37 2014	(r373364)
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	xfstt
-PORTVERSION=	1.6
-PORTREVISION=	3
+PORTVERSION=	1.9.1
 CATEGORIES=	x11-servers
-MASTER_SITES=	${MASTER_SITE_BERLIOS}
+MASTER_SITES=	http://archive.hadrons.org/software/xfstt/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -13,7 +12,9 @@ COMMENT=	TrueType font server for X11
 
 OPTIONS_DEFINE=	DOCS
 
+USES=		tar:xz pkgconfig
 USE_XORG=	fontsproto xproto
+USE_RC_SUBR=	xfstt
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-nls
 
@@ -22,17 +23,17 @@ TTFONTDIR=	${PREFIX}/lib/X11/fonts/TrueT
 SUB_FILES=	pkg-message
 
 post-patch:
-.for file in INSTALL doc/xfstt.1x src/Makefile.in
-	@${REINPLACE_CMD} -e 's|%%TTFONTDIR%%|${TTFONTDIR}|g' ${WRKSRC}/${file}
+.for file in INSTALL doc/Makefile.in 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 ${STAGEDIR}${PREFIX}/etc/rc.d
-	@${MKDIR} ${STAGEDIR}${TTFONTDIR}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for _file in CHANGES INSTALL THANKS
+	${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${FILESDIR}/xfstt.in \
+		> ${WRKSRC}/xfstt
+	${INSTALL_SCRIPT} ${WRKSRC}/xfstt ${STAGEDIR}${PREFIX}/etc/rc.d/
+	${MKDIR} ${STAGEDIR}${TTFONTDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for _file in INSTALL THANKS
 	${INSTALL_DATA} ${WRKSRC}/${_file} ${STAGEDIR}${DOCSDIR}
 .endfor
 

Modified: head/x11-servers/Xfstt/distinfo
==============================================================================
--- head/x11-servers/Xfstt/distinfo	Mon Nov 24 19:35:10 2014	(r373363)
+++ head/x11-servers/Xfstt/distinfo	Mon Nov 24 19:40:37 2014	(r373364)
@@ -1,2 +1,2 @@
-SHA256 (xfstt-1.6.tar.gz) = a69f7b5651ecb50876950b7222d0f33b34413150cddc16fa44a923181aae9752
-SIZE (xfstt-1.6.tar.gz) = 346346
+SHA256 (xfstt-1.9.1.tar.xz) = aa62cfcb7b3b0698d66a9d6f335538512bcc68b6f233a99864e67022ad76bbde
+SIZE (xfstt-1.9.1.tar.xz) = 210704

Added: head/x11-servers/Xfstt/files/patch-doc__Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-servers/Xfstt/files/patch-doc__Makefile.in	Mon Nov 24 19:40:37 2014	(r373364)
@@ -0,0 +1,13 @@
+--- doc/Makefile.in.orig	2014-11-24 20:13:07.000000000 +0100
++++ doc/Makefile.in	2014-11-24 20:13:33.000000000 +0100
+@@ -275,8 +275,8 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-fontdir = $(datadir)/fonts/truetype
+-cachedir = $(localstatedir)/cache/xfstt
++fontdir = %%TTFONTDIR%%
++cachedir = %%TTFONTDIR%%
+ pidfile = $(localstatedir)/run/xfstt.pid
+ man_MANS = xfstt.1x
+ EXTRA_DIST = xfstt.1x.in xfstt.lsm FAQ examples

Modified: head/x11-servers/Xfstt/files/patch-src__Makefile.in
==============================================================================
--- head/x11-servers/Xfstt/files/patch-src__Makefile.in	Mon Nov 24 19:35:10 2014	(r373363)
+++ head/x11-servers/Xfstt/files/patch-src__Makefile.in	Mon Nov 24 19:40:37 2014	(r373364)
@@ -1,13 +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
+--- src/Makefile.in.orig	2014-11-24 20:10:25.000000000 +0100
++++ src/Makefile.in	2014-11-24 20:10:57.000000000 +0100
+@@ -327,8 +327,8 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -fontdir = $(datadir)/fonts/truetype
 -cachedir = $(localstatedir)/cache/xfstt
 +fontdir = %%TTFONTDIR%%
 +cachedir = %%TTFONTDIR%%
  pidfile = $(localstatedir)/run/xfstt.pid
- 
- LDADD = @LIBINTL@ -L$(top_srcdir)/libfstt -lfstt
+ LDADD = @LIBINTL@ -L$(top_builddir)/libfstt -lfstt
+ AM_CPPFLAGS = -DLOCALEDIR=\""$(localedir)\"" -DFONTDIR=\""$(fontdir)\"" \

Copied: head/x11-servers/Xfstt/files/xfstt.in (from r373349, head/x11-servers/Xfstt/files/xfstt.sh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-servers/Xfstt/files/xfstt.in	Mon Nov 24 19:40:37 2014	(r373364, copy of r373349, head/x11-servers/Xfstt/files/xfstt.sh)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+PREFIX=%%PREFIX%%
+
+case "$1" in
+
+start)
+	${PREFIX}/bin/xfstt --sync >/dev/null
+	${PREFIX}/bin/xfstt --user nobody --notcp --daemon && echo -n ' xfstt'
+	;;
+stop)
+	/usr/bin/killall xfstt 2>/dev/null && echo -n ' xfstt'
+	;;
+*)
+	echo "$0 start | stop"
+	;;
+
+esac

Modified: head/x11-servers/Xfstt/pkg-descr
==============================================================================
--- head/x11-servers/Xfstt/pkg-descr	Mon Nov 24 19:35:10 2014	(r373363)
+++ head/x11-servers/Xfstt/pkg-descr	Mon Nov 24 19:40:37 2014	(r373364)
@@ -1,3 +1,3 @@
 This is Xfstt, a free TrueType font server for X11.
 
-WWW: http://developer.berlios.de/projects/xfstt/
+WWW: http://www.hadrons.org/software/xfstt/

Modified: head/x11-servers/Xfstt/pkg-plist
==============================================================================
--- head/x11-servers/Xfstt/pkg-plist	Mon Nov 24 19:35:10 2014	(r373363)
+++ head/x11-servers/Xfstt/pkg-plist	Mon Nov 24 19:40:37 2014	(r373364)
@@ -1,10 +1,8 @@
 bin/xfstt
-etc/rc.d/xfstt.sh
 man/man1/xfstt.1x.gz
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @rmtry lib/X11/fonts/TrueType/ttname.dir
 @rmtry lib/X11/fonts/TrueType/ttinfo.dir
-@dirrmtry lib/X11/fonts/TrueType
+@dir lib/X11/fonts/TrueType



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411241940.sAOJec5S043875>