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>

4 files changed, 9 insertions, 117 deletions

diff --git a/accessibility/linux-c7-atk/Makefile b/accessibility/linux-c7-atk/Makefile
index aa0418fc732c..f58e34e1ae60 100644
--- a/accessibility/linux-c7-atk/Makefile
+++ b/accessibility/linux-c7-atk/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	atk
 PORTVERSION=	2.14.0
+PORTREVISION=	1
 CATEGORIES=	accessibility linux
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT=	Accessibility Toolkit, Linux binary (Linux CentOS ${LINUX_DIST_VER})
 
 LICENSE=	GPLv3
 
-CONFLICTS=	linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
 USES=		linux:c7
 RPMVERSION=	1.el7
diff --git a/accessibility/linux-c7-atk/distinfo.i386 b/accessibility/linux-c7-atk/distinfo.i386
deleted file mode 100644
index fc7e46fb387c..000000000000
--- a/accessibility/linux-c7-atk/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1473356007
-SHA256 (rpm/centos/7.2.1511/i386/atk-2.14.0-1.el7.i686.rpm) = fc169a185c6eff9ee057c9020b8fef1f4055c2b14471b1b71f98c9c6c570fadc
-SIZE (rpm/centos/7.2.1511/i386/atk-2.14.0-1.el7.i686.rpm) = 256204
-SHA256 (rpm/centos/7.2.1511/i386/atk-2.14.0-1.el7.src.rpm) = d1aac0f30e3a19dc7557ac2f92e18623cda894b1e9241a48b6d06b8628e742c8
-SIZE (rpm/centos/7.2.1511/i386/atk-2.14.0-1.el7.src.rpm) = 714590
diff --git a/accessibility/linux-c7-atk/distinfo.x86_64 b/accessibility/linux-c7-atk/distinfo.x86_64
index 35e16e829ee9..ce5fe981c96c 100644
--- a/accessibility/linux-c7-atk/distinfo.x86_64
+++ b/accessibility/linux-c7-atk/distinfo.x86_64
@@ -1,7 +1,7 @@
-TIMESTAMP = 1473674923
-SHA256 (rpm/centos/7.2.1511/x86_64/atk-2.14.0-1.el7.i686.rpm) = fc169a185c6eff9ee057c9020b8fef1f4055c2b14471b1b71f98c9c6c570fadc
-SIZE (rpm/centos/7.2.1511/x86_64/atk-2.14.0-1.el7.i686.rpm) = 256204
-SHA256 (rpm/centos/7.2.1511/x86_64/atk-2.14.0-1.el7.x86_64.rpm) = 298e5c773f2b0dfe46219dc50ef63a9054c29f9e79e406f1589410f5e99c6a74
-SIZE (rpm/centos/7.2.1511/x86_64/atk-2.14.0-1.el7.x86_64.rpm) = 257180
-SHA256 (rpm/centos/7.2.1511/x86_64/atk-2.14.0-1.el7.src.rpm) = d1aac0f30e3a19dc7557ac2f92e18623cda894b1e9241a48b6d06b8628e742c8
-SIZE (rpm/centos/7.2.1511/x86_64/atk-2.14.0-1.el7.src.rpm) = 714590
+TIMESTAMP = 1482092100
+SHA256 (centos/atk-2.14.0-1.el7.i686.rpm) = fc169a185c6eff9ee057c9020b8fef1f4055c2b14471b1b71f98c9c6c570fadc
+SIZE (centos/atk-2.14.0-1.el7.i686.rpm) = 256204
+SHA256 (centos/atk-2.14.0-1.el7.x86_64.rpm) = 298e5c773f2b0dfe46219dc50ef63a9054c29f9e79e406f1589410f5e99c6a74
+SIZE (centos/atk-2.14.0-1.el7.x86_64.rpm) = 257180
+SHA256 (centos/atk-2.14.0-1.el7.src.rpm) = d1aac0f30e3a19dc7557ac2f92e18623cda894b1e9241a48b6d06b8628e742c8
+SIZE (centos/atk-2.14.0-1.el7.src.rpm) = 714590
diff --git a/accessibility/linux-c7-atk/pkg-plist.i386 b/accessibility/linux-c7-atk/pkg-plist.i386
deleted file mode 100644
index bdf9f668f488..000000000000
--- a/accessibility/linux-c7-atk/pkg-plist.i386
+++ /dev/null
@@ -1,104 +0,0 @@
-usr/lib/girepository-1.0/Atk-1.0.typelib
-usr/lib/libatk-1.0.so.0
-usr/lib/libatk-1.0.so.0.21409.1
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-usr/share/locale/af/LC_MESSAGES/atk10.mo
-usr/share/locale/am/LC_MESSAGES/atk10.mo
-usr/share/locale/an/LC_MESSAGES/atk10.mo
-usr/share/locale/ar/LC_MESSAGES/atk10.mo
-usr/share/locale/as/LC_MESSAGES/atk10.mo
-usr/share/locale/ast/LC_MESSAGES/atk10.mo
-usr/share/locale/az/LC_MESSAGES/atk10.mo
-usr/share/locale/be/LC_MESSAGES/atk10.mo
-usr/share/locale/be@latin/LC_MESSAGES/atk10.mo
-usr/share/locale/bg/LC_MESSAGES/atk10.mo
-usr/share/locale/bn/LC_MESSAGES/atk10.mo
-usr/share/locale/bn_IN/LC_MESSAGES/atk10.mo
-usr/share/locale/bs/LC_MESSAGES/atk10.mo
-usr/share/locale/ca/LC_MESSAGES/atk10.mo
-usr/share/locale/ca@valencia/LC_MESSAGES/atk10.mo
-usr/share/locale/cs/LC_MESSAGES/atk10.mo
-usr/share/locale/cy/LC_MESSAGES/atk10.mo
-usr/share/locale/da/LC_MESSAGES/atk10.mo
-usr/share/locale/de/LC_MESSAGES/atk10.mo
-usr/share/locale/dz/LC_MESSAGES/atk10.mo
-usr/share/locale/el/LC_MESSAGES/atk10.mo
-usr/share/locale/en@shaw/LC_MESSAGES/atk10.mo
-usr/share/locale/en_CA/LC_MESSAGES/atk10.mo
-usr/share/locale/en_GB/LC_MESSAGES/atk10.mo
-usr/share/locale/eo/LC_MESSAGES/atk10.mo
-usr/share/locale/es/LC_MESSAGES/atk10.mo
-usr/share/locale/et/LC_MESSAGES/atk10.mo
-usr/share/locale/eu/LC_MESSAGES/atk10.mo
-usr/share/locale/fa/LC_MESSAGES/atk10.mo
-usr/share/locale/fi/LC_MESSAGES/atk10.mo
-usr/share/locale/fr/LC_MESSAGES/atk10.mo
-usr/share/locale/ga/LC_MESSAGES/atk10.mo
-usr/share/locale/gl/LC_MESSAGES/atk10.mo
-usr/share/locale/gu/LC_MESSAGES/atk10.mo
-usr/share/locale/he/LC_MESSAGES/atk10.mo
-usr/share/locale/hi/LC_MESSAGES/atk10.mo
-usr/share/locale/hr/LC_MESSAGES/atk10.mo
-usr/share/locale/hu/LC_MESSAGES/atk10.mo
-usr/share/locale/hy/LC_MESSAGES/atk10.mo
-usr/share/locale/id/LC_MESSAGES/atk10.mo
-usr/share/locale/is/LC_MESSAGES/atk10.mo
-usr/share/locale/it/LC_MESSAGES/atk10.mo
-usr/share/locale/ja/LC_MESSAGES/atk10.mo
-usr/share/locale/ka/LC_MESSAGES/atk10.mo
-usr/share/locale/kk/LC_MESSAGES/atk10.mo
-usr/share/locale/km/LC_MESSAGES/atk10.mo
-usr/share/locale/kn/LC_MESSAGES/atk10.mo
-usr/share/locale/ko/LC_MESSAGES/atk10.mo
-usr/share/locale/ku/LC_MESSAGES/atk10.mo
-usr/share/locale/li/LC_MESSAGES/atk10.mo
-usr/share/locale/lt/LC_MESSAGES/atk10.mo
-usr/share/locale/lv/LC_MESSAGES/atk10.mo
-usr/share/locale/mai/LC_MESSAGES/atk10.mo
-usr/share/locale/mk/LC_MESSAGES/atk10.mo
-usr/share/locale/ml/LC_MESSAGES/atk10.mo
-usr/share/locale/mn/LC_MESSAGES/atk10.mo
-usr/share/locale/mr/LC_MESSAGES/atk10.mo
-usr/share/locale/ms/LC_MESSAGES/atk10.mo
-usr/share/locale/nb/LC_MESSAGES/atk10.mo
-usr/share/locale/ne/LC_MESSAGES/atk10.mo
-usr/share/locale/nl/LC_MESSAGES/atk10.mo
-usr/share/locale/nn/LC_MESSAGES/atk10.mo
-usr/share/locale/oc/LC_MESSAGES/atk10.mo
-usr/share/locale/or/LC_MESSAGES/atk10.mo
-usr/share/locale/pa/LC_MESSAGES/atk10.mo
-usr/share/locale/pl/LC_MESSAGES/atk10.mo
-usr/share/locale/ps/LC_MESSAGES/atk10.mo
-usr/share/locale/pt/LC_MESSAGES/atk10.mo
-usr/share/locale/pt_BR/LC_MESSAGES/atk10.mo
-usr/share/locale/ro/LC_MESSAGES/atk10.mo
-usr/share/locale/ru/LC_MESSAGES/atk10.mo
-usr/share/locale/rw/LC_MESSAGES/atk10.mo
-usr/share/locale/si/LC_MESSAGES/atk10.mo
-usr/share/locale/sk/LC_MESSAGES/atk10.mo
-usr/share/locale/sl/LC_MESSAGES/atk10.mo
-usr/share/locale/sq/LC_MESSAGES/atk10.mo
-usr/share/locale/sr/LC_MESSAGES/atk10.mo
-usr/share/locale/sr@ije/LC_MESSAGES/atk10.mo
-usr/share/locale/sr@latin/LC_MESSAGES/atk10.mo
-usr/share/locale/sv/LC_MESSAGES/atk10.mo
-usr/share/locale/ta/LC_MESSAGES/atk10.mo
-usr/share/locale/te/LC_MESSAGES/atk10.mo
-usr/share/locale/tg/LC_MESSAGES/atk10.mo
-usr/share/locale/th/LC_MESSAGES/atk10.mo
-usr/share/locale/tk/LC_MESSAGES/atk10.mo
-usr/share/locale/tr/LC_MESSAGES/atk10.mo
-usr/share/locale/tt/LC_MESSAGES/atk10.mo
-usr/share/locale/ug/LC_MESSAGES/atk10.mo
-usr/share/locale/uk/LC_MESSAGES/atk10.mo
-usr/share/locale/vi/LC_MESSAGES/atk10.mo
-usr/share/locale/wa/LC_MESSAGES/atk10.mo
-usr/share/locale/xh/LC_MESSAGES/atk10.mo
-usr/share/locale/yi/LC_MESSAGES/atk10.mo
-usr/share/locale/zh_CN/LC_MESSAGES/atk10.mo
-usr/share/locale/zh_HK/LC_MESSAGES/atk10.mo
-usr/share/locale/zh_TW/LC_MESSAGES/atk10.mo
-usr/share/locale/zu/LC_MESSAGES/atk10.mo