Update to 2.11.0.

Stagify.

5 files changed, 21 insertions, 135 deletions

diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index 24c3497d381c..7c016dce7a92 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -3,7 +3,7 @@
 #   $MCom: ports/trunk/x11-fonts/fontconfig/Makefile 18637 2013-07-27 09:15:21Z kwm $
 
 PORTNAME=	fontconfig
-PORTVERSION=	2.10.95
+PORTVERSION=	2.11.0
 PORTREVISION?=	0
 PORTEPOCH?=	1
 CATEGORIES=	x11-fonts
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libexpat.so:${PORTSDIR}/textproc/expat2
 
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool
+GNU_CONFIGURE=	yes
 USES=		gmake pathfix pkgconfig
 USE_GNOME=	ltverhack
 CONFIGURE_ARGS=	--with-configdir=${PREFIX}/etc/fonts/conf.d \
@@ -36,11 +36,10 @@ CONFIGURE_ARGS=	--with-configdir=${PREFIX}/etc/fonts/conf.d \
 MAKE_ENV=	LC_ALL=C
 PKGINSTALL=	${WRKDIR}/pkg-install
 
-MAN1=		fc-cache.1 fc-cat.1 fc-list.1 fc-match.1 fc-query.1 fc-scan.1
-MAN5=		fonts-conf.5
+MAN1PAGES=	fc-cache.1 fc-cat.1 fc-list.1 fc-match.1 fc-query.1 fc-scan.1
+MAN5PAGES=	fonts-conf.5
 PORTDOCS=	fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 # work around fc-cache crash on arm platform
@@ -50,26 +49,19 @@ USE_GCC=	any
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 .endif
-	${INSTALL_MAN} ${MAN5:S|^|${WRKSRC}/doc/|} ${PREFIX}/man/man5
-.for manpage in ${MAN1}
-	${INSTALL_MAN} ${FILESDIR}/${manpage} ${PREFIX}/man/man1
+	${INSTALL_MAN} ${MAN5PAGES:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${PREFIX}/man/man5
+.for manpage in ${MAN1PAGES}
+	${INSTALL_MAN} ${FILESDIR}/${manpage} ${STAGEDIR}${PREFIX}/man/man1
 .endfor
-	if [ ! -f ${PREFIX}/etc/fonts/fonts.conf ]; then \
-		${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf; \
-		${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \
-	else \
-		${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \
-	fi
+	${INSTALL_DATA} ${WRKSRC}/fonts.conf \
+		${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf.default
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|' < ${FILESDIR}/pkg-install.in \
 		> ${PKGINSTALL}
-.if !defined(PACKAGE_BUILDING)
-	-@${LDCONFIG} -m ${PREFIX}/lib
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
+	@${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 b98b2960a645..71463ac32791 100644
--- a/x11-fonts/fontconfig/distinfo
+++ b/x11-fonts/fontconfig/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fontconfig-2.10.95.tar.bz2) = abc0ecb9fb083d8705c140c8c0d13cc294c56faa1fee0e31e3f3eb98062a5e7b
-SIZE (fontconfig-2.10.95.tar.bz2) = 1529849
+SHA256 (fontconfig-2.11.0.tar.bz2) = cb0e0ef6f03bc8568e95653840bb07d5859dc89d7ce2cade9d94fcccf8c1a467
+SIZE (fontconfig-2.11.0.tar.bz2) = 1541382
diff --git a/x11-fonts/fontconfig/files/patch-src_fcfreetype.c b/x11-fonts/fontconfig/files/patch-src_fcfreetype.c
deleted file mode 100644
index bf22c090fab7..000000000000
--- a/x11-fonts/fontconfig/files/patch-src_fcfreetype.c
+++ /dev/null
@@ -1,65 +0,0 @@
-From a61e145304da86c8c35b137493bbd8fd5dd1e7f5 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Mon, 09 Sep 2013 10:59:31 +0000
-Subject: Fix memory leaks in FcFreeTypeQueryFace
-
----
-diff --git a/src/fcfreetype.c b/src/fcfreetype.c
-index 02e85cb..e394307 100644
---- src/fcfreetype.c
-+++ src/fcfreetype.c
-@@ -1105,7 +1105,6 @@ FcFreeTypeQueryFace (const FT_Face  face,
-     const char	    *tmp;
- 
-     FcChar8	    *hashstr = NULL;
--    char	    *fontdata = NULL;
-     FT_Error	    err;
-     FT_ULong	    len = 0, alen;
- 
-@@ -1668,15 +1667,21 @@ FcFreeTypeQueryFace (const FT_Face  face,
-     err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len);
-     if (err == FT_Err_Ok)
-     {
-+	char *fontdata;
-+
- 	alen = (len + 63) & ~63;
- 	fontdata = malloc (alen);
- 	if (!fontdata)
- 	    goto bail3;
- 	err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len);
- 	if (err != FT_Err_Ok)
-+	{
-+	    free (fontdata);
- 	    goto bail3;
-+	}
- 	memset (&fontdata[len], 0, alen - len);
- 	hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len);
-+	free (fontdata);
-     }
-     else if (err == FT_Err_Invalid_Face_Handle)
-     {
-@@ -1692,7 +1697,11 @@ FcFreeTypeQueryFace (const FT_Face  face,
-     if (hashstr)
-     {
- 	if (!FcPatternAddString (pat, FC_HASH, hashstr))
-+	{
-+	    free (hashstr);
- 	    goto bail1;
-+	}
-+	free (hashstr);
-     }
- bail3:
- 
-@@ -1783,10 +1792,6 @@ bail3:
- bail2:
-     FcCharSetDestroy (cs);
- bail1:
--    if (hashstr)
--	free (hashstr);
--    if (fontdata)
--	free (fontdata);
-     FcPatternDestroy (pat);
- bail0:
-     return NULL;
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-fonts/fontconfig/files/patch-src_fcxml.c b/x11-fonts/fontconfig/files/patch-src_fcxml.c
deleted file mode 100644
index f67fe3ac32b0..000000000000
--- a/x11-fonts/fontconfig/files/patch-src_fcxml.c
+++ /dev/null
@@ -1,48 +0,0 @@
-From 3e5f70a16ac6d54f1e01c92ddaa5985deec1b7f9 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Mon, 02 Sep 2013 11:51:46 +0000
-Subject: Do not create a config dir for migration when no config files nor dirs
-
----
-diff --git a/src/fcxml.c b/src/fcxml.c
-index b464b4e..8ff10b6 100644
---- src/fcxml.c
-+++ src/fcxml.c
-@@ -2233,11 +2233,6 @@ FcParseInclude (FcConfigParse *parse)
- 	    /* No config dir nor file on the XDG directory spec compliant place
- 	     * so need to guess what it is supposed to be.
- 	     */
--	    FcChar8 *parent = FcStrDirname (s);
--
--	    if (!FcFileIsDir (parent))
--		FcMakeDirectory (parent);
--	    FcStrFree (parent);
- 	    if (FcStrStr (s, (const FcChar8 *)"conf.d") != NULL)
- 		goto userdir;
- 	    else
-@@ -2259,6 +2254,11 @@ FcParseInclude (FcConfigParse *parse)
- 	{
- 	    if (FcFileIsDir (filename))
- 	    {
-+		FcChar8 *parent = FcStrDirname (userdir);
-+
-+		if (!FcFileIsDir (parent))
-+		    FcMakeDirectory (parent);
-+		FcStrFree (parent);
- 		if (FcFileIsDir (userdir) ||
- 		    rename ((const char *)filename, (const char *)userdir) != 0 ||
- 		    symlink ((const char *)userdir, (const char *)filename) != 0)
-@@ -2272,6 +2272,11 @@ FcParseInclude (FcConfigParse *parse)
- 	    }
- 	    else
- 	    {
-+		FcChar8 *parent = FcStrDirname (userconf);
-+
-+		if (!FcFileIsDir (parent))
-+		    FcMakeDirectory (parent);
-+		FcStrFree (parent);
- 		if (FcFileIsFile (userconf) ||
- 		    rename ((const char *)filename, (const char *)userconf) != 0 ||
- 		    symlink ((const char *)userconf, (const char *)filename) != 0)
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist
index 91ad7018da80..8d366a9ae685 100644
--- a/x11-fonts/fontconfig/pkg-plist
+++ b/x11-fonts/fontconfig/pkg-plist
@@ -63,6 +63,13 @@ lib/libfontconfig.la
 lib/libfontconfig.so
 lib/libfontconfig.so.1
 libdata/pkgconfig/fontconfig.pc
+man/man1/fc-cache.1.gz
+man/man1/fc-cat.1.gz
+man/man1/fc-list.1.gz
+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