4 files changed, 34 insertions, 21 deletions

diff --git a/x11-fonts/linux-c7-fontconfig/Makefile b/x11-fonts/linux-c7-fontconfig/Makefile
index 73fbd5fcf28d..236675973dc8 100644
--- a/x11-fonts/linux-c7-fontconfig/Makefile
+++ b/x11-fonts/linux-c7-fontconfig/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fontconfig
-PORTVERSION=	2.10.95
-PORTREVISION=	3
+PORTVERSION=	2.13.0
 CATEGORIES=	x11-fonts linux
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -12,17 +11,18 @@ COMMENT=	XML-based font configuration API for X Windows (Linux CentOS ${LINUX_DI
 CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	11.el7
+RPMVERSION=	4.3.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
-USE_LINUX=	expat
+USE_LINUX=	expat freetype
 USE_LINUX_RPM=	yes
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
 
 post-patch:
-	@${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/share/fonts \
-		${WRKSRC}/usr/share/fontconfig ${WRKSRC}/var
+	@${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/lib/fontconfig \
+		${WRKSRC}/usr/share/fontconfig
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc
diff --git a/x11-fonts/linux-c7-fontconfig/distinfo b/x11-fonts/linux-c7-fontconfig/distinfo
index 927b19ad5799..cc419efa4084 100644
--- a/x11-fonts/linux-c7-fontconfig/distinfo
+++ b/x11-fonts/linux-c7-fontconfig/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1507317997
-SHA256 (centos/fontconfig-2.10.95-11.el7.i686.rpm) = 81073a3d0e3a3be990615e6db546f55651bdf04f24dd44248c7875d73d63b246
-SIZE (centos/fontconfig-2.10.95-11.el7.i686.rpm) = 235900
-SHA256 (centos/fontconfig-2.10.95-11.el7.x86_64.rpm) = ba7d28d5326f02ce46d6c26b6ae902858124768420b3600494ccdd805e99c8fd
-SIZE (centos/fontconfig-2.10.95-11.el7.x86_64.rpm) = 234724
-SHA256 (centos/fontconfig-2.10.95-11.el7.src.rpm) = 644b249ea56a5ee6967f1b3ab5cafc107b43db535a9c5f3af5d6483ce6167ac9
-SIZE (centos/fontconfig-2.10.95-11.el7.src.rpm) = 1569980
+TIMESTAMP = 1556530645
+SHA256 (centos/fontconfig-2.13.0-4.3.el7.i686.rpm) = 3a9ad39e24733b7d4053ed51800ff55d5a71dae19889c1c9624d9c1fa0e3270d
+SIZE (centos/fontconfig-2.13.0-4.3.el7.i686.rpm) = 261088
+SHA256 (centos/fontconfig-2.13.0-4.3.el7.x86_64.rpm) = adf21042079dd4754a2d77f5ddf83b8537407081e95edeb553b1b0e8130aa558
+SIZE (centos/fontconfig-2.13.0-4.3.el7.x86_64.rpm) = 260512
+SHA256 (centos/fontconfig-2.13.0-4.3.el7.src.rpm) = a9aab224f56ccb32f6c2ce57670d792dfeae8cd7b5ee18046cade1ae0ca3f0b2
+SIZE (centos/fontconfig-2.13.0-4.3.el7.src.rpm) = 1750590
diff --git a/x11-fonts/linux-c7-fontconfig/pkg-plist.amd64 b/x11-fonts/linux-c7-fontconfig/pkg-plist.amd64
index 42afbf387c7b..695011c6187d 100644
--- a/x11-fonts/linux-c7-fontconfig/pkg-plist.amd64
+++ b/x11-fonts/linux-c7-fontconfig/pkg-plist.amd64
@@ -1,6 +1,9 @@
 etc/fonts
 usr/bin/fc-cache
+usr/bin/fc-cache-32
+usr/bin/fc-cache-64
 usr/bin/fc-cat
+usr/bin/fc-conflist
 usr/bin/fc-list
 usr/bin/fc-match
 usr/bin/fc-pattern
@@ -8,16 +11,19 @@ usr/bin/fc-query
 usr/bin/fc-scan
 usr/bin/fc-validate
 usr/lib/libfontconfig.so.1
-usr/lib/libfontconfig.so.1.7.0
+usr/lib/libfontconfig.so.1.11.1
 usr/lib64/libfontconfig.so.1
-usr/lib64/libfontconfig.so.1.7.0
+usr/lib64/libfontconfig.so.1.11.1
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.txt
+%%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/fontconfig-conf.mo
+%%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/fontconfig.mo
 usr/share/man/man1/fc-cache.1.gz
 usr/share/man/man1/fc-cat.1.gz
+usr/share/man/man1/fc-conflist.1.gz
 usr/share/man/man1/fc-list.1.gz
 usr/share/man/man1/fc-match.1.gz
 usr/share/man/man1/fc-pattern.1.gz
@@ -26,7 +32,9 @@ usr/share/man/man1/fc-scan.1.gz
 usr/share/man/man1/fc-validate.1.gz
 usr/share/man/man5/fonts-conf.5.gz
 usr/share/xml/fontconfig/fonts.dtd
-@rmtry var/db/fontconfig/*-le64.cache-4
+@rmtry var/db/fontconfig/*-le32d4.cache-7
+@rmtry var/db/fontconfig/*-le64.cache-7
 @rmtry var/db/fontconfig/CACHEDIR.TAG
 @dir var/db/fontconfig
-@postexec %D/usr/bin/fc-cache -f -s
+@postexec %D/usr/bin/fc-cache-32 -f -s
+@postexec %D/usr/bin/fc-cache-64 -f -s
diff --git a/x11-fonts/linux-c7-fontconfig/pkg-plist.i386 b/x11-fonts/linux-c7-fontconfig/pkg-plist.i386
index f4d8416b016d..4591568ba62d 100644
--- a/x11-fonts/linux-c7-fontconfig/pkg-plist.i386
+++ b/x11-fonts/linux-c7-fontconfig/pkg-plist.i386
@@ -1,6 +1,8 @@
 etc/fonts
 usr/bin/fc-cache
+usr/bin/fc-cache-32
 usr/bin/fc-cat
+usr/bin/fc-conflist
 usr/bin/fc-list
 usr/bin/fc-match
 usr/bin/fc-pattern
@@ -8,14 +10,17 @@ usr/bin/fc-query
 usr/bin/fc-scan
 usr/bin/fc-validate
 usr/lib/libfontconfig.so.1
-usr/lib/libfontconfig.so.1.7.0
+usr/lib/libfontconfig.so.1.11.1
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.txt
+%%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/fontconfig-conf.mo
+%%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/fontconfig.mo
 usr/share/man/man1/fc-cache.1.gz
 usr/share/man/man1/fc-cat.1.gz
+usr/share/man/man1/fc-conflist.1.gz
 usr/share/man/man1/fc-list.1.gz
 usr/share/man/man1/fc-match.1.gz
 usr/share/man/man1/fc-pattern.1.gz
@@ -24,7 +29,7 @@ usr/share/man/man1/fc-scan.1.gz
 usr/share/man/man1/fc-validate.1.gz
 usr/share/man/man5/fonts-conf.5.gz
 usr/share/xml/fontconfig/fonts.dtd
-@rmtry var/db/fontconfig/*-le32d4.cache-4
+@rmtry var/db/fontconfig/*-le32d4.cache-7
 @rmtry var/db/fontconfig/CACHEDIR.TAG
 @dir var/db/fontconfig
-@postexec %D/usr/bin/fc-cache -f -s
+@postexec %D/usr/bin/fc-cache-32 -f -s