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>

5 files changed, 15 insertions, 85 deletions

diff --git a/audio/linux-c7-alsa-utils/Makefile b/audio/linux-c7-alsa-utils/Makefile
index be54edac9f10..b5a2d69179a1 100644
--- a/audio/linux-c7-alsa-utils/Makefile
+++ b/audio/linux-c7-alsa-utils/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	alsa-utils
-PORTVERSION=	1.0.28
+PORTVERSION=	1.1.1
 CATEGORIES=	audio linux
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -10,12 +10,11 @@ COMMENT=	Advanced Linux Sound Architecture libraries (Linux CentOS ${LINUX_DIST_
 
 LICENSE=	GPLv3
 
-CONFLICTS=	linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
-
-USE_LINUX=	alsalib alsa-plugins-oss
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
+RPMVERSION=	1.el7
 USES=		linux:c7
+USE_LINUX=	alsalib alsa-plugins-oss
 USE_LINUX_RPM=	nolib
-RPMVERSION=	4.el7
 
 .include <bsd.port.mk>
diff --git a/audio/linux-c7-alsa-utils/distinfo.i386 b/audio/linux-c7-alsa-utils/distinfo.i386
deleted file mode 100644
index 2140e734992c..000000000000
--- a/audio/linux-c7-alsa-utils/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1473356022
-SHA256 (rpm/centos/7.2.1511/i386/alsa-utils-1.0.28-4.el7.i686.rpm) = 9d6f0b9c73a6e979b67507e6bedda296a0b7e54fe178f6aaf401075eef65641e
-SIZE (rpm/centos/7.2.1511/i386/alsa-utils-1.0.28-4.el7.i686.rpm) = 1058224
-SHA256 (rpm/centos/7.2.1511/i386/alsa-utils-1.0.28-4.el7.src.rpm) = 560f8ccbb0933ec9f4fb0e9b5449ea3a1ee6f5ed7b3eb65e11850815d9689b9e
-SIZE (rpm/centos/7.2.1511/i386/alsa-utils-1.0.28-4.el7.src.rpm) = 1190041
diff --git a/audio/linux-c7-alsa-utils/distinfo.x86_64 b/audio/linux-c7-alsa-utils/distinfo.x86_64
index c2fa200472cd..694d65ff0434 100644
--- a/audio/linux-c7-alsa-utils/distinfo.x86_64
+++ b/audio/linux-c7-alsa-utils/distinfo.x86_64
@@ -1,5 +1,5 @@
-TIMESTAMP = 1473674930
-SHA256 (rpm/centos/7.2.1511/x86_64/alsa-utils-1.0.28-4.el7.x86_64.rpm) = acc8822e2fc4b041d2209e470c5140a77b581210cf4eb996a5c259f4a7632f21
-SIZE (rpm/centos/7.2.1511/x86_64/alsa-utils-1.0.28-4.el7.x86_64.rpm) = 1065580
-SHA256 (rpm/centos/7.2.1511/x86_64/alsa-utils-1.0.28-4.el7.src.rpm) = 560f8ccbb0933ec9f4fb0e9b5449ea3a1ee6f5ed7b3eb65e11850815d9689b9e
-SIZE (rpm/centos/7.2.1511/x86_64/alsa-utils-1.0.28-4.el7.src.rpm) = 1190041
+TIMESTAMP = 1482092784
+SHA256 (centos/alsa-utils-1.1.1-1.el7.x86_64.rpm) = 0bf0c29a81d87cacafcc75a45cedb142d19380986d7f237d7700eb62f626b8dd
+SIZE (centos/alsa-utils-1.1.1-1.el7.x86_64.rpm) = 1085140
+SHA256 (centos/alsa-utils-1.1.1-1.el7.src.rpm) = 863821010341c00606fdc5141b3367b805c320ccf058496a8c2bf93353c4c81b
+SIZE (centos/alsa-utils-1.1.1-1.el7.src.rpm) = 1222992
diff --git a/audio/linux-c7-alsa-utils/pkg-plist.i386 b/audio/linux-c7-alsa-utils/pkg-plist.i386
deleted file mode 100644
index b3c4eeef26ae..000000000000
--- a/audio/linux-c7-alsa-utils/pkg-plist.i386
+++ /dev/null
@@ -1,69 +0,0 @@
-etc/alsa/alsactl.conf
-usr/bin/aconnect
-usr/bin/alsa-delay
-usr/bin/alsaloop
-usr/bin/alsamixer
-usr/bin/alsaucm
-usr/bin/alsaunmute
-usr/bin/amidi
-usr/bin/amixer
-usr/bin/aplay
-usr/bin/aplaymidi
-usr/bin/arecord
-usr/bin/arecordmidi
-usr/bin/aseqdump
-usr/bin/aseqnet
-usr/bin/iecset
-usr/bin/speaker-test
-usr/lib/alsa/init/00main
-usr/lib/alsa/init/ca0106
-usr/lib/alsa/init/default
-usr/lib/alsa/init/hda
-usr/lib/alsa/init/help
-usr/lib/alsa/init/info
-usr/lib/alsa/init/test
-usr/lib/systemd/system/alsa-restore.service
-usr/lib/systemd/system/alsa-state.service
-usr/lib/systemd/system/alsa-store.service
-usr/lib/systemd/system/basic.target.wants/alsa-restore.service
-usr/lib/systemd/system/basic.target.wants/alsa-state.service
-usr/lib/systemd/system/shutdown.target.wants/alsa-store.service
-usr/lib/udev/rules.d/90-alsa-restore.rules
-usr/sbin/alsa-info
-usr/sbin/alsa-info.sh
-usr/sbin/alsactl
-usr/share/alsa/init
-usr/share/alsa/speaker-test/sample_map.csv
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-usr/share/locale/de/LC_MESSAGES/alsa-utils.mo
-usr/share/locale/fr/LC_MESSAGES/alsa-utils.mo
-usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo
-usr/share/man/man1/aconnect.1.gz
-usr/share/man/man1/alsactl.1.gz
-usr/share/man/man1/alsaloop.1.gz
-usr/share/man/man1/alsamixer.1.gz
-usr/share/man/man1/alsaunmute.1.gz
-usr/share/man/man1/amidi.1.gz
-usr/share/man/man1/amixer.1.gz
-usr/share/man/man1/aplay.1.gz
-usr/share/man/man1/aplaymidi.1.gz
-usr/share/man/man1/arecord.1.gz
-usr/share/man/man1/arecordmidi.1.gz
-usr/share/man/man1/aseqdump.1.gz
-usr/share/man/man1/aseqnet.1.gz
-usr/share/man/man1/iecset.1.gz
-usr/share/man/man1/speaker-test.1.gz
-usr/share/man/man7/alsactl_init.7.gz
-usr/share/sounds/alsa/Front_Center.wav
-usr/share/sounds/alsa/Front_Left.wav
-usr/share/sounds/alsa/Front_Right.wav
-usr/share/sounds/alsa/Noise.wav
-usr/share/sounds/alsa/Rear_Center.wav
-usr/share/sounds/alsa/Rear_Left.wav
-usr/share/sounds/alsa/Rear_Right.wav
-usr/share/sounds/alsa/Side_Left.wav
-usr/share/sounds/alsa/Side_Right.wav
-@dir var/lib/alsa
diff --git a/audio/linux-c7-alsa-utils/pkg-plist.x86_64 b/audio/linux-c7-alsa-utils/pkg-plist.x86_64
index b3c4eeef26ae..9670c5095e45 100644
--- a/audio/linux-c7-alsa-utils/pkg-plist.x86_64
+++ b/audio/linux-c7-alsa-utils/pkg-plist.x86_64
@@ -1,8 +1,10 @@
 etc/alsa/alsactl.conf
 usr/bin/aconnect
 usr/bin/alsa-delay
+usr/bin/alsabat
 usr/bin/alsaloop
 usr/bin/alsamixer
+usr/bin/alsatplg
 usr/bin/alsaucm
 usr/bin/alsaunmute
 usr/bin/amidi
@@ -27,10 +29,10 @@ usr/lib/systemd/system/alsa-state.service
 usr/lib/systemd/system/alsa-store.service
 usr/lib/systemd/system/basic.target.wants/alsa-restore.service
 usr/lib/systemd/system/basic.target.wants/alsa-state.service
-usr/lib/systemd/system/shutdown.target.wants/alsa-store.service
 usr/lib/udev/rules.d/90-alsa-restore.rules
 usr/sbin/alsa-info
 usr/sbin/alsa-info.sh
+usr/sbin/alsabat-test.sh
 usr/sbin/alsactl
 usr/share/alsa/init
 usr/share/alsa/speaker-test/sample_map.csv
@@ -42,6 +44,9 @@ usr/share/locale/de/LC_MESSAGES/alsa-utils.mo
 usr/share/locale/fr/LC_MESSAGES/alsa-utils.mo
 usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo
 usr/share/man/man1/aconnect.1.gz
+usr/share/man/man1/alsa-delay.1.gz
+usr/share/man/man1/alsa-info.sh.1.gz
+usr/share/man/man1/alsabat.1.gz
 usr/share/man/man1/alsactl.1.gz
 usr/share/man/man1/alsaloop.1.gz
 usr/share/man/man1/alsamixer.1.gz