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, 11 insertions, 23 deletions

diff --git a/audio/linux-c7-alsa-plugins-oss/Makefile b/audio/linux-c7-alsa-plugins-oss/Makefile
index fde0f1bbd202..00fb84c0f20e 100644
--- a/audio/linux-c7-alsa-plugins-oss/Makefile
+++ b/audio/linux-c7-alsa-plugins-oss/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	alsa-plugins-oss
-PORTVERSION=	1.0.27
+PORTVERSION=	1.1.1
 CATEGORIES=	audio linux
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -10,16 +10,15 @@ COMMENT=	OSS plugin for ALSA (Linux CentOS ${LINUX_DIST_VER})
 
 LICENSE=	GPLv3
 
-CONFLICTS=	linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
 SRC_DISTFILES=	alsa-plugins-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
 
+RPMVERSION=	1.el7
 USES=		linux:c7
+USE_LDCONFIG=	yes
 USE_LINUX=	alsalib
 USE_LINUX_RPM=	yes
-RPMVERSION=	3.el7
-
-USE_LDCONFIG=	yes
 
 # We will use native configuration file, so delete a linux one
 post-extract:
diff --git a/audio/linux-c7-alsa-plugins-oss/distinfo.i386 b/audio/linux-c7-alsa-plugins-oss/distinfo.i386
deleted file mode 100644
index b7b1ff9ba39f..000000000000
--- a/audio/linux-c7-alsa-plugins-oss/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1473356030
-SHA256 (rpm/centos/7.2.1511/i386/alsa-plugins-oss-1.0.27-3.el7.i686.rpm) = 2d9159315d81e7ec27a33b3fa2acaa1cd773afc7a2753b450f59ba4b21b32d55
-SIZE (rpm/centos/7.2.1511/i386/alsa-plugins-oss-1.0.27-3.el7.i686.rpm) = 32156
-SHA256 (rpm/centos/7.2.1511/i386/alsa-plugins-1.0.27-3.el7.src.rpm) = beb2c6be273b3c85fe960634c77ea0dc9b8dba3d0cacddfbb0eaf2a463b58e25
-SIZE (rpm/centos/7.2.1511/i386/alsa-plugins-1.0.27-3.el7.src.rpm) = 378782
diff --git a/audio/linux-c7-alsa-plugins-oss/distinfo.x86_64 b/audio/linux-c7-alsa-plugins-oss/distinfo.x86_64
index 400791df7e49..b9d9bf05b578 100644
--- a/audio/linux-c7-alsa-plugins-oss/distinfo.x86_64
+++ b/audio/linux-c7-alsa-plugins-oss/distinfo.x86_64
@@ -1,7 +1,7 @@
-TIMESTAMP = 1473674934
-SHA256 (rpm/centos/7.2.1511/x86_64/alsa-plugins-oss-1.0.27-3.el7.i686.rpm) = 2d9159315d81e7ec27a33b3fa2acaa1cd773afc7a2753b450f59ba4b21b32d55
-SIZE (rpm/centos/7.2.1511/x86_64/alsa-plugins-oss-1.0.27-3.el7.i686.rpm) = 32156
-SHA256 (rpm/centos/7.2.1511/x86_64/alsa-plugins-oss-1.0.27-3.el7.x86_64.rpm) = 5fb8730d79ba211a9b4ed7e80ba2fd7131d9af4f00696f65922313bf7b9e73e4
-SIZE (rpm/centos/7.2.1511/x86_64/alsa-plugins-oss-1.0.27-3.el7.x86_64.rpm) = 32564
-SHA256 (rpm/centos/7.2.1511/x86_64/alsa-plugins-1.0.27-3.el7.src.rpm) = beb2c6be273b3c85fe960634c77ea0dc9b8dba3d0cacddfbb0eaf2a463b58e25
-SIZE (rpm/centos/7.2.1511/x86_64/alsa-plugins-1.0.27-3.el7.src.rpm) = 378782
+TIMESTAMP = 1482091989
+SHA256 (centos/alsa-plugins-oss-1.1.1-1.el7.i686.rpm) = b49683387ff11eff6f9697dae02f14539b53a67a4f09a1eae52ae7fffdb0b22f
+SIZE (centos/alsa-plugins-oss-1.1.1-1.el7.i686.rpm) = 32212
+SHA256 (centos/alsa-plugins-oss-1.1.1-1.el7.x86_64.rpm) = 9e75d7c1445c76b012ee8144237ef054fe6a25b30f6cbe88826f6b9795ae9ee0
+SIZE (centos/alsa-plugins-oss-1.1.1-1.el7.x86_64.rpm) = 32660
+SHA256 (centos/alsa-plugins-1.1.1-1.el7.src.rpm) = db290b29cf2c95463a78de59bdabe4bf78391b03967c121f935bcd3274f2dff1
+SIZE (centos/alsa-plugins-1.1.1-1.el7.src.rpm) = 381619
diff --git a/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386 b/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386
deleted file mode 100644
index 56a4d5404059..000000000000
--- a/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/lib/alsa-lib/libasound_module_ctl_oss.so
-usr/lib/alsa-lib/libasound_module_pcm_oss.so
-usr/share/alsa/alsa.conf.d/50-pcm-oss.conf
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL
-%%PORTDOCS%%%%DOCSDIR%%/README-pcm-oss