Update Linux CentOS 7 ports to 7.3.1611. While 7.2 had semi-official i386

packages there are no such packages for 7.3 yet so i386 support has been
marked IGNORE for now.

Change DIST_SUBDIR to just "centos" so distfiles that remain the same
between major versions don't have to be redownloaded.

Remove fmake hacks from linux.mk.

Submitted by:	Piotr Kubaj <pkubaj@anongoth.pl>

12 files changed, 28 insertions, 182 deletions

diff --git a/textproc/linux-c7-aspell/Makefile b/textproc/linux-c7-aspell/Makefile
index fc74cf8abfaa..259eea6c2d65 100644
--- a/textproc/linux-c7-aspell/Makefile
+++ b/textproc/linux-c7-aspell/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	aspell
 PORTVERSION=	0.60.6.1
+PORTREVISION=	1
 CATEGORIES=	textproc linux
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT=	Spelling checker with better logic than ispell (Linux CentOS ${LINUX_DI
 
 LICENSE=	LGPL21+
 
-CONFLICTS=	linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
 RPMVERSION=	9.el7
 USES=		linux:c7
diff --git a/textproc/linux-c7-aspell/distinfo.i386 b/textproc/linux-c7-aspell/distinfo.i386
deleted file mode 100644
index 78a23eed6744..000000000000
--- a/textproc/linux-c7-aspell/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1473355734
-SHA256 (rpm/centos/7.2.1511/i386/aspell-0.60.6.1-9.el7.i686.rpm) = a14ec40910e3b300b32ca92c425ef82ba52ae6deec5462c9a453592e4aa55a77
-SIZE (rpm/centos/7.2.1511/i386/aspell-0.60.6.1-9.el7.i686.rpm) = 684648
-SHA256 (rpm/centos/7.2.1511/i386/aspell-0.60.6.1-9.el7.src.rpm) = 57962d3924beca2013037f7f455f994bb7f4542f32fd9a7f94ce42f5a415eeff
-SIZE (rpm/centos/7.2.1511/i386/aspell-0.60.6.1-9.el7.src.rpm) = 1886324
diff --git a/textproc/linux-c7-aspell/distinfo.x86_64 b/textproc/linux-c7-aspell/distinfo.x86_64
index 403c5ccf70ac..a0de078c6484 100644
--- a/textproc/linux-c7-aspell/distinfo.x86_64
+++ b/textproc/linux-c7-aspell/distinfo.x86_64
@@ -1,7 +1,7 @@
-TIMESTAMP = 1473674625
-SHA256 (rpm/centos/7.2.1511/x86_64/aspell-0.60.6.1-9.el7.i686.rpm) = a14ec40910e3b300b32ca92c425ef82ba52ae6deec5462c9a453592e4aa55a77
-SIZE (rpm/centos/7.2.1511/x86_64/aspell-0.60.6.1-9.el7.i686.rpm) = 684648
-SHA256 (rpm/centos/7.2.1511/x86_64/aspell-0.60.6.1-9.el7.x86_64.rpm) = 881b41c9c1509b03b2dc1ad97c71ba0f830d75751297320728c5e05307f32fd3
-SIZE (rpm/centos/7.2.1511/x86_64/aspell-0.60.6.1-9.el7.x86_64.rpm) = 701952
-SHA256 (rpm/centos/7.2.1511/x86_64/aspell-0.60.6.1-9.el7.src.rpm) = 57962d3924beca2013037f7f455f994bb7f4542f32fd9a7f94ce42f5a415eeff
-SIZE (rpm/centos/7.2.1511/x86_64/aspell-0.60.6.1-9.el7.src.rpm) = 1886324
+TIMESTAMP = 1482093222
+SHA256 (centos/aspell-0.60.6.1-9.el7.i686.rpm) = a14ec40910e3b300b32ca92c425ef82ba52ae6deec5462c9a453592e4aa55a77
+SIZE (centos/aspell-0.60.6.1-9.el7.i686.rpm) = 684648
+SHA256 (centos/aspell-0.60.6.1-9.el7.x86_64.rpm) = 881b41c9c1509b03b2dc1ad97c71ba0f830d75751297320728c5e05307f32fd3
+SIZE (centos/aspell-0.60.6.1-9.el7.x86_64.rpm) = 701952
+SHA256 (centos/aspell-0.60.6.1-9.el7.src.rpm) = 57962d3924beca2013037f7f455f994bb7f4542f32fd9a7f94ce42f5a415eeff
+SIZE (centos/aspell-0.60.6.1-9.el7.src.rpm) = 1886324
diff --git a/textproc/linux-c7-aspell/pkg-plist.i386 b/textproc/linux-c7-aspell/pkg-plist.i386
deleted file mode 100644
index 0235771be478..000000000000
--- a/textproc/linux-c7-aspell/pkg-plist.i386
+++ /dev/null
@@ -1,132 +0,0 @@
-usr/bin/aspell
-usr/bin/ispell
-usr/bin/precat
-usr/bin/preunzip
-usr/bin/prezip
-usr/bin/prezip-bin
-usr/bin/run-with-aspell
-usr/bin/spell
-usr/bin/word-list-compress
-usr/lib/aspell-0.60/ccpp.amf
-usr/lib/aspell-0.60/comment.amf
-usr/lib/aspell-0.60/context-filter.info
-usr/lib/aspell-0.60/context-filter.so
-usr/lib/aspell-0.60/cp1250.cmap
-usr/lib/aspell-0.60/cp1250.cset
-usr/lib/aspell-0.60/cp1251.cmap
-usr/lib/aspell-0.60/cp1251.cset
-usr/lib/aspell-0.60/cp1252.cmap
-usr/lib/aspell-0.60/cp1252.cset
-usr/lib/aspell-0.60/cp1253.cmap
-usr/lib/aspell-0.60/cp1253.cset
-usr/lib/aspell-0.60/cp1254.cmap
-usr/lib/aspell-0.60/cp1254.cset
-usr/lib/aspell-0.60/cp1255.cmap
-usr/lib/aspell-0.60/cp1255.cset
-usr/lib/aspell-0.60/cp1256.cmap
-usr/lib/aspell-0.60/cp1256.cset
-usr/lib/aspell-0.60/cp1257.cmap
-usr/lib/aspell-0.60/cp1257.cset
-usr/lib/aspell-0.60/cp1258.cmap
-usr/lib/aspell-0.60/cp1258.cset
-usr/lib/aspell-0.60/dvorak.kbd
-usr/lib/aspell-0.60/email-filter.info
-usr/lib/aspell-0.60/email-filter.so
-usr/lib/aspell-0.60/email.amf
-usr/lib/aspell-0.60/html-filter.info
-usr/lib/aspell-0.60/html.amf
-usr/lib/aspell-0.60/iso-8859-1.cmap
-usr/lib/aspell-0.60/iso-8859-1.cset
-usr/lib/aspell-0.60/iso-8859-10.cmap
-usr/lib/aspell-0.60/iso-8859-10.cset
-usr/lib/aspell-0.60/iso-8859-11.cmap
-usr/lib/aspell-0.60/iso-8859-11.cset
-usr/lib/aspell-0.60/iso-8859-13.cmap
-usr/lib/aspell-0.60/iso-8859-13.cset
-usr/lib/aspell-0.60/iso-8859-14.cmap
-usr/lib/aspell-0.60/iso-8859-14.cset
-usr/lib/aspell-0.60/iso-8859-15.cmap
-usr/lib/aspell-0.60/iso-8859-15.cset
-usr/lib/aspell-0.60/iso-8859-16.cmap
-usr/lib/aspell-0.60/iso-8859-16.cset
-usr/lib/aspell-0.60/iso-8859-2.cmap
-usr/lib/aspell-0.60/iso-8859-2.cset
-usr/lib/aspell-0.60/iso-8859-3.cmap
-usr/lib/aspell-0.60/iso-8859-3.cset
-usr/lib/aspell-0.60/iso-8859-4.cmap
-usr/lib/aspell-0.60/iso-8859-4.cset
-usr/lib/aspell-0.60/iso-8859-5.cmap
-usr/lib/aspell-0.60/iso-8859-5.cset
-usr/lib/aspell-0.60/iso-8859-6.cmap
-usr/lib/aspell-0.60/iso-8859-6.cset
-usr/lib/aspell-0.60/iso-8859-7.cmap
-usr/lib/aspell-0.60/iso-8859-7.cset
-usr/lib/aspell-0.60/iso-8859-8.cmap
-usr/lib/aspell-0.60/iso-8859-8.cset
-usr/lib/aspell-0.60/iso-8859-9.cmap
-usr/lib/aspell-0.60/iso-8859-9.cset
-usr/lib/aspell-0.60/koi8-r.cmap
-usr/lib/aspell-0.60/koi8-r.cset
-usr/lib/aspell-0.60/koi8-u.cmap
-usr/lib/aspell-0.60/koi8-u.cset
-usr/lib/aspell-0.60/none.amf
-usr/lib/aspell-0.60/nroff-filter.info
-usr/lib/aspell-0.60/nroff-filter.so
-usr/lib/aspell-0.60/nroff.amf
-usr/lib/aspell-0.60/perl.amf
-usr/lib/aspell-0.60/sgml-filter.info
-usr/lib/aspell-0.60/sgml-filter.so
-usr/lib/aspell-0.60/sgml.amf
-usr/lib/aspell-0.60/split.kbd
-usr/lib/aspell-0.60/standard.kbd
-usr/lib/aspell-0.60/tex-filter.info
-usr/lib/aspell-0.60/tex-filter.so
-usr/lib/aspell-0.60/tex.amf
-usr/lib/aspell-0.60/texinfo-filter.info
-usr/lib/aspell-0.60/texinfo-filter.so
-usr/lib/aspell-0.60/texinfo.amf
-usr/lib/aspell-0.60/url.amf
-usr/lib/libaspell.so.15
-usr/lib/libaspell.so.15.1.5
-usr/lib/libpspell.so.15
-usr/lib/libpspell.so.15.1.5
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/aspell-import
-%%PORTDOCS%%%%DOCSDIR%%/aspell-import.1
-usr/share/info/aspell.info.gz
-usr/share/locale/ast/LC_MESSAGES/aspell.mo
-usr/share/locale/be/LC_MESSAGES/aspell.mo
-usr/share/locale/ca/LC_MESSAGES/aspell.mo
-usr/share/locale/cs/LC_MESSAGES/aspell.mo
-usr/share/locale/da/LC_MESSAGES/aspell.mo
-usr/share/locale/de/LC_MESSAGES/aspell.mo
-usr/share/locale/en_GB/LC_MESSAGES/aspell.mo
-usr/share/locale/es/LC_MESSAGES/aspell.mo
-usr/share/locale/fi/LC_MESSAGES/aspell.mo
-usr/share/locale/fr/LC_MESSAGES/aspell.mo
-usr/share/locale/ga/LC_MESSAGES/aspell.mo
-usr/share/locale/id/LC_MESSAGES/aspell.mo
-usr/share/locale/it/LC_MESSAGES/aspell.mo
-usr/share/locale/ja/LC_MESSAGES/aspell.mo
-usr/share/locale/mn/LC_MESSAGES/aspell.mo
-usr/share/locale/ms/LC_MESSAGES/aspell.mo
-usr/share/locale/nl/LC_MESSAGES/aspell.mo
-usr/share/locale/pt_BR/LC_MESSAGES/aspell.mo
-usr/share/locale/ro/LC_MESSAGES/aspell.mo
-usr/share/locale/ru/LC_MESSAGES/aspell.mo
-usr/share/locale/rw/LC_MESSAGES/aspell.mo
-usr/share/locale/sk/LC_MESSAGES/aspell.mo
-usr/share/locale/sl/LC_MESSAGES/aspell.mo
-usr/share/locale/sr/LC_MESSAGES/aspell.mo
-usr/share/locale/sv/LC_MESSAGES/aspell.mo
-usr/share/locale/tg/LC_MESSAGES/aspell.mo
-usr/share/locale/uk/LC_MESSAGES/aspell.mo
-usr/share/locale/vi/LC_MESSAGES/aspell.mo
-usr/share/locale/wa/LC_MESSAGES/aspell.mo
-usr/share/locale/zh_CN/LC_MESSAGES/aspell.mo
-usr/share/man/man1/aspell.1.gz
-usr/share/man/man1/prezip-bin.1.gz
-usr/share/man/man1/run-with-aspell.1.gz
-usr/share/man/man1/word-list-compress.1.gz
diff --git a/textproc/linux-c7-expat/Makefile b/textproc/linux-c7-expat/Makefile
index ec223fdc8cb1..4d60e58f5223 100644
--- a/textproc/linux-c7-expat/Makefile
+++ b/textproc/linux-c7-expat/Makefile
@@ -3,17 +3,15 @@
 
 PORTNAME=	expat
 PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc linux
-MASTER_SITES=	CENTOS_LINUX/centos/${LINUX_DIST_VER}/cr/x86_64/Packages
-SRC_DISTFILES=	# not available
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Binary port of Expat XML-parsing library (Linux CentOS ${LINUX_DIST_VER})
 
 LICENSE=	MIT
 
-CONFLICTS=	linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
 RPMVERSION=	10.el7_3
 USES=		linux:c7
diff --git a/textproc/linux-c7-expat/distinfo.i386 b/textproc/linux-c7-expat/distinfo.i386
deleted file mode 100644
index 38a714def58d..000000000000
--- a/textproc/linux-c7-expat/distinfo.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1480523756
-SHA256 (rpm/centos/7.2.1511/i386/expat-2.1.0-10.el7_3.i686.rpm) = 4bd345282c20a2fce39d356dfb9f6d6affb4229867d30202028d06b17ab22c90
-SIZE (rpm/centos/7.2.1511/i386/expat-2.1.0-10.el7_3.i686.rpm) = 82272
diff --git a/textproc/linux-c7-expat/distinfo.x86_64 b/textproc/linux-c7-expat/distinfo.x86_64
index 550fb397502d..5463c3285282 100644
--- a/textproc/linux-c7-expat/distinfo.x86_64
+++ b/textproc/linux-c7-expat/distinfo.x86_64
@@ -1,5 +1,7 @@
-TIMESTAMP = 1480523779
-SHA256 (rpm/centos/7.2.1511/x86_64/expat-2.1.0-10.el7_3.i686.rpm) = 4bd345282c20a2fce39d356dfb9f6d6affb4229867d30202028d06b17ab22c90
-SIZE (rpm/centos/7.2.1511/x86_64/expat-2.1.0-10.el7_3.i686.rpm) = 82272
-SHA256 (rpm/centos/7.2.1511/x86_64/expat-2.1.0-10.el7_3.x86_64.rpm) = 508d9ea80022d7a2fcc7718884b94bd3898d26092efa6f12214af55c6583c68d
-SIZE (rpm/centos/7.2.1511/x86_64/expat-2.1.0-10.el7_3.x86_64.rpm) = 82500
+TIMESTAMP = 1482083814
+SHA256 (centos/expat-2.1.0-10.el7_3.i686.rpm) = 4bd345282c20a2fce39d356dfb9f6d6affb4229867d30202028d06b17ab22c90
+SIZE (centos/expat-2.1.0-10.el7_3.i686.rpm) = 82272
+SHA256 (centos/expat-2.1.0-10.el7_3.x86_64.rpm) = 508d9ea80022d7a2fcc7718884b94bd3898d26092efa6f12214af55c6583c68d
+SIZE (centos/expat-2.1.0-10.el7_3.x86_64.rpm) = 82500
+SHA256 (centos/expat-2.1.0-10.el7_3.src.rpm) = b96dbad8d6f69b73d99f0479857fc22da3d928367606500d673e34ba6f53a3a7
+SIZE (centos/expat-2.1.0-10.el7_3.src.rpm) = 579992
diff --git a/textproc/linux-c7-expat/pkg-plist.i386 b/textproc/linux-c7-expat/pkg-plist.i386
deleted file mode 100644
index 3e4cdb5452bb..000000000000
--- a/textproc/linux-c7-expat/pkg-plist.i386
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin/xmlwf
-usr/lib/libexpat.so.1
-usr/lib/libexpat.so.1.6.0
-usr/share/man/man1/xmlwf.1.gz
diff --git a/textproc/linux-c7-libxml2/Makefile b/textproc/linux-c7-libxml2/Makefile
index 84e22d76a743..0fd888d561ec 100644
--- a/textproc/linux-c7-libxml2/Makefile
+++ b/textproc/linux-c7-libxml2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libxml2
 PORTVERSION=	2.9.1
+PORTREVISION=	1
 CATEGORIES=	textproc linux
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -10,9 +11,9 @@ COMMENT=	Library providing XML and HTML support (Linux CentOS ${LINUX_DIST_VER})
 
 LICENSE=	MIT
 
-CONFLICTS=	linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
-RPMVERSION=	5.el7_1.2
+RPMVERSION=	6.el7_2.3
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
diff --git a/textproc/linux-c7-libxml2/distinfo.i386 b/textproc/linux-c7-libxml2/distinfo.i386
deleted file mode 100644
index e081c97ba325..000000000000
--- a/textproc/linux-c7-libxml2/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1473355761
-SHA256 (rpm/centos/7.2.1511/i386/libxml2-2.9.1-5.el7_1.2.i686.rpm) = f5841ae5e2d69915dc0d36e4995ad90d774e3d039e9fa62d62a6b6a81d34985b
-SIZE (rpm/centos/7.2.1511/i386/libxml2-2.9.1-5.el7_1.2.i686.rpm) = 665636
-SHA256 (rpm/centos/7.2.1511/i386/libxml2-2.9.1-5.el7_1.2.src.rpm) = eb51332b570294aed98d55a4094a3518fb8d11328d586ec1271e20b04357383f
-SIZE (rpm/centos/7.2.1511/i386/libxml2-2.9.1-5.el7_1.2.src.rpm) = 5172567
diff --git a/textproc/linux-c7-libxml2/distinfo.x86_64 b/textproc/linux-c7-libxml2/distinfo.x86_64
index c9c154554d2f..bc00b9631e57 100644
--- a/textproc/linux-c7-libxml2/distinfo.x86_64
+++ b/textproc/linux-c7-libxml2/distinfo.x86_64
@@ -1,7 +1,7 @@
-TIMESTAMP = 1473674629
-SHA256 (rpm/centos/7.2.1511/x86_64/libxml2-2.9.1-5.el7_1.2.i686.rpm) = f5841ae5e2d69915dc0d36e4995ad90d774e3d039e9fa62d62a6b6a81d34985b
-SIZE (rpm/centos/7.2.1511/x86_64/libxml2-2.9.1-5.el7_1.2.i686.rpm) = 665636
-SHA256 (rpm/centos/7.2.1511/x86_64/libxml2-2.9.1-5.el7_1.2.x86_64.rpm) = 24267687b1f8cc1158db479a6e858c35b353de1c08c3a5bac143700e198b832c
-SIZE (rpm/centos/7.2.1511/x86_64/libxml2-2.9.1-5.el7_1.2.x86_64.rpm) = 680004
-SHA256 (rpm/centos/7.2.1511/x86_64/libxml2-2.9.1-5.el7_1.2.src.rpm) = eb51332b570294aed98d55a4094a3518fb8d11328d586ec1271e20b04357383f
-SIZE (rpm/centos/7.2.1511/x86_64/libxml2-2.9.1-5.el7_1.2.src.rpm) = 5172567
+TIMESTAMP = 1482094261
+SHA256 (centos/libxml2-2.9.1-6.el7_2.3.i686.rpm) = 1ac92fe486fd71d4cc09beff30d5fb2170bedf62601379478ec445ac860bc632
+SIZE (centos/libxml2-2.9.1-6.el7_2.3.i686.rpm) = 669900
+SHA256 (centos/libxml2-2.9.1-6.el7_2.3.x86_64.rpm) = acece4f83c12cdc48b42063fee9bca8519dc312ec2f25d105de82005caeed6e5
+SIZE (centos/libxml2-2.9.1-6.el7_2.3.x86_64.rpm) = 684032
+SHA256 (centos/libxml2-2.9.1-6.el7_2.3.src.rpm) = 61fec50176f7992461600e8a0275e495acb53377b83acb0fe15d5d7b1beb6201
+SIZE (centos/libxml2-2.9.1-6.el7_2.3.src.rpm) = 5223350
diff --git a/textproc/linux-c7-libxml2/pkg-plist.i386 b/textproc/linux-c7-libxml2/pkg-plist.i386
deleted file mode 100644
index 86dedeaae3f7..000000000000
--- a/textproc/linux-c7-libxml2/pkg-plist.i386
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/bin/xmlcatalog
-usr/bin/xmllint
-usr/lib/libxml2.so.2
-usr/lib/libxml2.so.2.9.1
-usr/share/man/man1/xmlcatalog.1.gz
-usr/share/man/man1/xmllint.1.gz
-usr/share/man/man3/libxml.3.gz