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>

8 files changed, 18 insertions, 52 deletions

diff --git a/multimedia/linux-c7-libtheora/Makefile b/multimedia/linux-c7-libtheora/Makefile
index f97a482accf9..7f7006b4b9fc 100644
--- a/multimedia/linux-c7-libtheora/Makefile
+++ b/multimedia/linux-c7-libtheora/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libtheora
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	multimedia linux
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT=	Theora Video Compression Codec (Linux  CentOS ${LINUX_DIST_VER})
 
 LICENSE=	BSD3CLAUSE
 
-CONFLICTS=	linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
 RPMVERSION=	8.el7
 USES=		linux:c7
diff --git a/multimedia/linux-c7-libtheora/distinfo.i386 b/multimedia/linux-c7-libtheora/distinfo.i386
deleted file mode 100644
index d6d5cc00231a..000000000000
--- a/multimedia/linux-c7-libtheora/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1473356082
-SHA256 (rpm/centos/7.2.1511/i386/libtheora-1.1.1-8.el7.i686.rpm) = b9660698a70f50bdefa94f688e2ce419e68d1a86bfb5bf0d5d5fdffb34b81b80
-SIZE (rpm/centos/7.2.1511/i386/libtheora-1.1.1-8.el7.i686.rpm) = 142280
-SHA256 (rpm/centos/7.2.1511/i386/libtheora-1.1.1-8.el7.src.rpm) = 0ea38d10a7b7dc9393d878e7132b9a449d054bcaba06485bca0144c9cb2dec02
-SIZE (rpm/centos/7.2.1511/i386/libtheora-1.1.1-8.el7.src.rpm) = 1447869
diff --git a/multimedia/linux-c7-libtheora/distinfo.x86_64 b/multimedia/linux-c7-libtheora/distinfo.x86_64
index ecef379cfc6c..94b6f243ae07 100644
--- a/multimedia/linux-c7-libtheora/distinfo.x86_64
+++ b/multimedia/linux-c7-libtheora/distinfo.x86_64
@@ -1,7 +1,7 @@
-TIMESTAMP = 1473674963
-SHA256 (rpm/centos/7.2.1511/x86_64/libtheora-1.1.1-8.el7.i686.rpm) = b9660698a70f50bdefa94f688e2ce419e68d1a86bfb5bf0d5d5fdffb34b81b80
-SIZE (rpm/centos/7.2.1511/x86_64/libtheora-1.1.1-8.el7.i686.rpm) = 142280
-SHA256 (rpm/centos/7.2.1511/x86_64/libtheora-1.1.1-8.el7.x86_64.rpm) = aabbc64c3131165b96a92cbbf17709200c2f877ba529c2a1a3e1916ce30c817d
-SIZE (rpm/centos/7.2.1511/x86_64/libtheora-1.1.1-8.el7.x86_64.rpm) = 139612
-SHA256 (rpm/centos/7.2.1511/x86_64/libtheora-1.1.1-8.el7.src.rpm) = 0ea38d10a7b7dc9393d878e7132b9a449d054bcaba06485bca0144c9cb2dec02
-SIZE (rpm/centos/7.2.1511/x86_64/libtheora-1.1.1-8.el7.src.rpm) = 1447869
+TIMESTAMP = 1482094188
+SHA256 (centos/libtheora-1.1.1-8.el7.i686.rpm) = b9660698a70f50bdefa94f688e2ce419e68d1a86bfb5bf0d5d5fdffb34b81b80
+SIZE (centos/libtheora-1.1.1-8.el7.i686.rpm) = 142280
+SHA256 (centos/libtheora-1.1.1-8.el7.x86_64.rpm) = aabbc64c3131165b96a92cbbf17709200c2f877ba529c2a1a3e1916ce30c817d
+SIZE (centos/libtheora-1.1.1-8.el7.x86_64.rpm) = 139612
+SHA256 (centos/libtheora-1.1.1-8.el7.src.rpm) = 0ea38d10a7b7dc9393d878e7132b9a449d054bcaba06485bca0144c9cb2dec02
+SIZE (centos/libtheora-1.1.1-8.el7.src.rpm) = 1447869
diff --git a/multimedia/linux-c7-libtheora/pkg-plist.i386 b/multimedia/linux-c7-libtheora/pkg-plist.i386
deleted file mode 100644
index 86205634fb3f..000000000000
--- a/multimedia/linux-c7-libtheora/pkg-plist.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/lib/libtheora.so.0
-usr/lib/libtheora.so.0.3.10
-usr/lib/libtheoradec.so.1
-usr/lib/libtheoradec.so.1.1.4
-usr/lib/libtheoraenc.so.1
-usr/lib/libtheoraenc.so.1.1.2
diff --git a/multimedia/linux-c7-libv4l/Makefile b/multimedia/linux-c7-libv4l/Makefile
index c9dfde7c3ecf..5a6f70da50b9 100644
--- a/multimedia/linux-c7-libv4l/Makefile
+++ b/multimedia/linux-c7-libv4l/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libv4l
 PORTVERSION=	0.9.5
+PORTREVISION=	1
 CATEGORIES=	multimedia linux
 SRC_DISTFILES=	v4l-utils-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
 
@@ -11,7 +12,7 @@ COMMENT=	Collection of video4linux support libraries (CentOS ${LINUX_DIST_VER})
 
 LICENSE=	LGPL20+
 
-CONFLICTS=	linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
 RPMVERSION=	4.el7
 USES=		linux:c7
diff --git a/multimedia/linux-c7-libv4l/distinfo.i386 b/multimedia/linux-c7-libv4l/distinfo.i386
deleted file mode 100644
index cea96952acb1..000000000000
--- a/multimedia/linux-c7-libv4l/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1473356088
-SHA256 (rpm/centos/7.2.1511/i386/libv4l-0.9.5-4.el7.i686.rpm) = 7c9fb65097d72f0a796220f39613c89cf86f075b18510e11e296b75bfea71f7d
-SIZE (rpm/centos/7.2.1511/i386/libv4l-0.9.5-4.el7.i686.rpm) = 193748
-SHA256 (rpm/centos/7.2.1511/i386/v4l-utils-0.9.5-4.el7.src.rpm) = c7a72b926f05e1dc780105d4dc5356d4fbb02ba69b19bc59e543cf0c0cbdb317
-SIZE (rpm/centos/7.2.1511/i386/v4l-utils-0.9.5-4.el7.src.rpm) = 996684
diff --git a/multimedia/linux-c7-libv4l/distinfo.x86_64 b/multimedia/linux-c7-libv4l/distinfo.x86_64
index e43dff8c0546..9f1c9c66a07f 100644
--- a/multimedia/linux-c7-libv4l/distinfo.x86_64
+++ b/multimedia/linux-c7-libv4l/distinfo.x86_64
@@ -1,7 +1,7 @@
-TIMESTAMP = 1473674966
-SHA256 (rpm/centos/7.2.1511/x86_64/libv4l-0.9.5-4.el7.i686.rpm) = 7c9fb65097d72f0a796220f39613c89cf86f075b18510e11e296b75bfea71f7d
-SIZE (rpm/centos/7.2.1511/x86_64/libv4l-0.9.5-4.el7.i686.rpm) = 193748
-SHA256 (rpm/centos/7.2.1511/x86_64/libv4l-0.9.5-4.el7.x86_64.rpm) = b05704ce53c147cbf0f9c873cff2e676207298c2b2258ebda84b673682250355
-SIZE (rpm/centos/7.2.1511/x86_64/libv4l-0.9.5-4.el7.x86_64.rpm) = 199064
-SHA256 (rpm/centos/7.2.1511/x86_64/v4l-utils-0.9.5-4.el7.src.rpm) = c7a72b926f05e1dc780105d4dc5356d4fbb02ba69b19bc59e543cf0c0cbdb317
-SIZE (rpm/centos/7.2.1511/x86_64/v4l-utils-0.9.5-4.el7.src.rpm) = 996684
+TIMESTAMP = 1482094216
+SHA256 (centos/libv4l-0.9.5-4.el7.i686.rpm) = 7c9fb65097d72f0a796220f39613c89cf86f075b18510e11e296b75bfea71f7d
+SIZE (centos/libv4l-0.9.5-4.el7.i686.rpm) = 193748
+SHA256 (centos/libv4l-0.9.5-4.el7.x86_64.rpm) = b05704ce53c147cbf0f9c873cff2e676207298c2b2258ebda84b673682250355
+SIZE (centos/libv4l-0.9.5-4.el7.x86_64.rpm) = 199064
+SHA256 (centos/v4l-utils-0.9.5-4.el7.src.rpm) = c7a72b926f05e1dc780105d4dc5356d4fbb02ba69b19bc59e543cf0c0cbdb317
+SIZE (centos/v4l-utils-0.9.5-4.el7.src.rpm) = 996684
diff --git a/multimedia/linux-c7-libv4l/pkg-plist.i386 b/multimedia/linux-c7-libv4l/pkg-plist.i386
deleted file mode 100644
index 181b1eec705e..000000000000
--- a/multimedia/linux-c7-libv4l/pkg-plist.i386
+++ /dev/null
@@ -1,20 +0,0 @@
-usr/lib/libdvbv5.so.0
-usr/lib/libdvbv5.so.0.0.0
-usr/lib/libv4l/ov511-decomp
-usr/lib/libv4l/ov518-decomp
-usr/lib/libv4l/plugins/libv4l-mplane.so
-usr/lib/libv4l/v4l1compat.so
-usr/lib/libv4l/v4l2convert.so
-usr/lib/libv4l1.so.0
-usr/lib/libv4l1.so.0.0.0
-usr/lib/libv4l2.so.0
-usr/lib/libv4l2.so.0.0.0
-usr/lib/libv4l2rds.so.0
-usr/lib/libv4l2rds.so.0.0.0
-usr/lib/libv4lconvert.so.0
-usr/lib/libv4lconvert.so.0.0.0
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README.lib
-%%PORTDOCS%%%%DOCSDIR%%/TODO