5 files changed, 46 insertions, 25 deletions

diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index 8448a513a1c6..535d8f3dd6e8 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -3,8 +3,8 @@
 #   $MCom: ports/trunk/x11-fonts/fontconfig/Makefile 18637 2013-07-27 09:15:21Z kwm $
 
 PORTNAME=	fontconfig
-PORTVERSION=	2.11.0
-PORTREVISION?=	3
+PORTVERSION=	2.11.1
+PORTREVISION?=	0
 PORTEPOCH?=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.freedesktop.org/software/fontconfig/release/
@@ -19,7 +19,7 @@ USES=		tar:bzip2
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libexpat.so:${PORTSDIR}/textproc/expat2
 
-USES+=		gmake libtool:keepla pathfix pkgconfig
+USES+=		gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-configdir=${PREFIX}/etc/fonts/conf.d \
@@ -34,6 +34,7 @@ CONFIGURE_ARGS=	--with-configdir=${PREFIX}/etc/fonts/conf.d \
 		--disable-docs
 MAKE_ENV=	LC_ALL=C
 PKGINSTALL=	${WRKDIR}/pkg-install
+INSTALL_TARGET=install-strip
 
 MAN1PAGES=	fc-cache.1 fc-cat.1 fc-list.1 fc-match.1 fc-query.1 fc-scan.1
 MAN5PAGES=	fonts-conf.5
@@ -48,16 +49,17 @@ post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 .endif
-	${INSTALL_MAN} ${MAN5PAGES:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${PREFIX}/man/man5
+	${INSTALL_MAN} ${MAN5PAGES:S|^|${WRKSRC}/doc/|} \
+		${STAGEDIR}${PREFIX}/man/man5
 .for manpage in ${MAN1PAGES}
-	${INSTALL_MAN} ${FILESDIR}/${manpage} ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${FILESDIR}/${manpage} \
+		${STAGEDIR}${PREFIX}/man/man1
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/fonts.conf \
-		${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf.default
+		${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf.sample
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|' < ${FILESDIR}/pkg-install.in \
 		> ${PKGINSTALL}
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfontconfig.so.1
 
 .include <bsd.port.mk>
 
diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo
index 71463ac32791..e81b4b4fc76f 100644
--- a/x11-fonts/fontconfig/distinfo
+++ b/x11-fonts/fontconfig/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fontconfig-2.11.0.tar.bz2) = cb0e0ef6f03bc8568e95653840bb07d5859dc89d7ce2cade9d94fcccf8c1a467
-SIZE (fontconfig-2.11.0.tar.bz2) = 1541382
+SHA256 (fontconfig-2.11.1.tar.bz2) = dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99
+SIZE (fontconfig-2.11.1.tar.bz2) = 1516095
diff --git a/x11-fonts/fontconfig/files/patch-fc-cache_fc-cache.c b/x11-fonts/fontconfig/files/patch-fc-cache_fc-cache.c
new file mode 100644
index 000000000000..4f1230fa370a
--- /dev/null
+++ b/x11-fonts/fontconfig/files/patch-fc-cache_fc-cache.c
@@ -0,0 +1,25 @@
+From f44157c809d280e2a0ce87fb078fc4b278d24a67 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Thu, 10 Apr 2014 10:27:55 +0000
+Subject: Fix fc-cache fail with -r
+
+Do not unlink the cache even if --really-force is given.
+because re-scanning process expects the cache exists.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=77252
+---
+diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
+index 99e0e9f..90ebad3 100644
+--- fc-cache/fc-cache.c
++++ fc-cache/fc-cache.c
+@@ -388,7 +388,7 @@ main (int argc, char **argv)
+     list = FcStrListCreate (updateDirs);
+     if (list)
+     {
+-	ret += scanDirs (list, config, FcTrue, really_force, verbose, FcFalse, &changed, NULL);
++	ret += scanDirs (list, config, FcTrue, FcFalse, verbose, FcFalse, &changed, NULL);
+ 	FcStrListDone (list);
+     }
+     FcStrSetDestroy (updateDirs);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-fonts/fontconfig/files/patch-src__fccompat.c b/x11-fonts/fontconfig/files/patch-src__fccompat.c
index eecdeffa6994..b597883e4c2a 100644
--- a/x11-fonts/fontconfig/files/patch-src__fccompat.c
+++ b/x11-fonts/fontconfig/files/patch-src__fccompat.c
@@ -2,12 +2,14 @@ There is an undiagnosed ARMv6 core dump in this code
 as discovered in FreeBSD Bug 183536 when using clang.
 Removing this code from ARM builds resolves it.
 
---- src/fccompat.c.orig	2013-10-11 03:10:18 UTC
-+++ src/fccompat.c
-@@ -178,7 +178,7 @@
-     }
- 
-     random_r(&fcrandbuf, &result);
+https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=183536
+
+--- src/fccompat.c.orig	2014-08-12 16:34:15.875384345 +0200
++++ src/fccompat.c	2014-08-12 16:35:04.752379905 +0200
+@@ -191,7 +191,7 @@
+ #else
+     random_r (&fcrandbuf, &result);
+ #endif
 -#elif HAVE_RANDOM
 +#elif HAVE_RANDOM && !defined(__arm__)
      static char statebuf[256];
diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist
index 9f6ea7e48425..40b89b2968cb 100644
--- a/x11-fonts/fontconfig/pkg-plist
+++ b/x11-fonts/fontconfig/pkg-plist
@@ -51,15 +51,11 @@ etc/fonts/conf.d/69-unifont.conf
 etc/fonts/conf.d/80-delicious.conf
 etc/fonts/conf.d/90-synthetic.conf
 etc/fonts/conf.d/README
-@unexec if cmp -s %D/etc/fonts/fonts.conf %D/etc/fonts/fonts.conf.default; then rm -f %D/etc/fonts/fonts.conf; fi
-etc/fonts/fonts.conf.default
-@exec [ -f %B/fonts.conf ] || cp %B/%f %B/fonts.conf
+@sample etc/fonts/fonts.conf.sample
 etc/fonts/fonts.dtd
 include/fontconfig/fcfreetype.h
 include/fontconfig/fcprivate.h
 include/fontconfig/fontconfig.h
-lib/libfontconfig.a
-lib/libfontconfig.la
 lib/libfontconfig.so
 lib/libfontconfig.so.1
 lib/libfontconfig.so.1.8.0
@@ -71,9 +67,5 @@ man/man1/fc-match.1.gz
 man/man1/fc-query.1.gz
 man/man1/fc-scan.1.gz
 man/man5/fonts-conf.5.gz
-@dirrm include/fontconfig
-@dirrmtry etc/fonts/conf.d
-@dirrmtry etc/fonts/conf.avail
-@dirrmtry etc/fonts
 @unexec rmdir /var/db/fontconfig/* 2>/dev/null || true
-@dirrmtry /var/db/fontconfig
+@dir /var/db/fontconfig