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, 10 insertions, 44 deletions

diff --git a/security/linux-c7-cyrus-sasl2/Makefile b/security/linux-c7-cyrus-sasl2/Makefile
index f136f858b01f..a0803a32c602 100644
--- a/security/linux-c7-cyrus-sasl2/Makefile
+++ b/security/linux-c7-cyrus-sasl2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cyrus-sasl2
 PORTVERSION=	2.1.26
+PORTREVISION=	1
 CATEGORIES=	security linux
 DISTNAME=	cyrus-sasl-lib-${PORTVERSION}-${RPMVERSION}
 SRC_DISTFILES=	cyrus-sasl-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
@@ -10,9 +11,9 @@ SRC_DISTFILES=	cyrus-sasl-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer) (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICT=	linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
+CONFLICT=	linux-c6-${PORTNAME}-[0-9]*
 
-RPMVERSION=	19.2.el7
+RPMVERSION=	20.el7_2
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
diff --git a/security/linux-c7-cyrus-sasl2/distinfo.i386 b/security/linux-c7-cyrus-sasl2/distinfo.i386
deleted file mode 100644
index 32b5401b6065..000000000000
--- a/security/linux-c7-cyrus-sasl2/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1473355662
-SHA256 (rpm/centos/7.2.1511/i386/cyrus-sasl-lib-2.1.26-19.2.el7.i686.rpm) = 55e30cace94a37f8f87b6c61ad5cefa79d3b1c259c49172088f9513fa78181d4
-SIZE (rpm/centos/7.2.1511/i386/cyrus-sasl-lib-2.1.26-19.2.el7.i686.rpm) = 157268
-SHA256 (rpm/centos/7.2.1511/i386/cyrus-sasl-2.1.26-19.2.el7.src.rpm) = 9f0fa06fdc9196df06312b773561aa29dbba76b9575e90fd8c44c1c83c147e0a
-SIZE (rpm/centos/7.2.1511/i386/cyrus-sasl-2.1.26-19.2.el7.src.rpm) = 1771611
diff --git a/security/linux-c7-cyrus-sasl2/distinfo.x86_64 b/security/linux-c7-cyrus-sasl2/distinfo.x86_64
index d237408e7fcb..816db3441ad8 100644
--- a/security/linux-c7-cyrus-sasl2/distinfo.x86_64
+++ b/security/linux-c7-cyrus-sasl2/distinfo.x86_64
@@ -1,7 +1,7 @@
-TIMESTAMP = 1473674608
-SHA256 (rpm/centos/7.2.1511/x86_64/cyrus-sasl-lib-2.1.26-19.2.el7.i686.rpm) = 55e30cace94a37f8f87b6c61ad5cefa79d3b1c259c49172088f9513fa78181d4
-SIZE (rpm/centos/7.2.1511/x86_64/cyrus-sasl-lib-2.1.26-19.2.el7.i686.rpm) = 157268
-SHA256 (rpm/centos/7.2.1511/x86_64/cyrus-sasl-lib-2.1.26-19.2.el7.x86_64.rpm) = 036f0a898fe188763a79e1633253bf7bb0b99632fe05d638e8954f37cf7b438b
-SIZE (rpm/centos/7.2.1511/x86_64/cyrus-sasl-lib-2.1.26-19.2.el7.x86_64.rpm) = 158260
-SHA256 (rpm/centos/7.2.1511/x86_64/cyrus-sasl-2.1.26-19.2.el7.src.rpm) = 9f0fa06fdc9196df06312b773561aa29dbba76b9575e90fd8c44c1c83c147e0a
-SIZE (rpm/centos/7.2.1511/x86_64/cyrus-sasl-2.1.26-19.2.el7.src.rpm) = 1771611
+TIMESTAMP = 1482091501
+SHA256 (centos/cyrus-sasl-lib-2.1.26-20.el7_2.i686.rpm) = e328871faf9ec6f073a0667acc03815b2267e4e07aa6ec3c701718168cbb780f
+SIZE (centos/cyrus-sasl-lib-2.1.26-20.el7_2.i686.rpm) = 157376
+SHA256 (centos/cyrus-sasl-lib-2.1.26-20.el7_2.x86_64.rpm) = 61f7eedd1a8eb447bb790c085f71b586d2583934a30ec9c4bed66b56b0fbf632
+SIZE (centos/cyrus-sasl-lib-2.1.26-20.el7_2.x86_64.rpm) = 158372
+SHA256 (centos/cyrus-sasl-2.1.26-20.el7_2.src.rpm) = f8dc7cff9cbd04d416fac1f63eaf51d96b6f99439975dfdb3ecaec1dd2a71452
+SIZE (centos/cyrus-sasl-2.1.26-20.el7_2.src.rpm) = 1775427
diff --git a/security/linux-c7-cyrus-sasl2/pkg-plist.i386 b/security/linux-c7-cyrus-sasl2/pkg-plist.i386
deleted file mode 100644
index 9d7941816c38..000000000000
--- a/security/linux-c7-cyrus-sasl2/pkg-plist.i386
+++ /dev/null
@@ -1,30 +0,0 @@
-usr/lib/libsasl2.so.3
-usr/lib/libsasl2.so.3.0.0
-usr/lib/sasl2/libanonymous.so
-usr/lib/sasl2/libanonymous.so.3
-usr/lib/sasl2/libanonymous.so.3.0.0
-usr/lib/sasl2/libsasldb.so
-usr/lib/sasl2/libsasldb.so.3
-usr/lib/sasl2/libsasldb.so.3.0.0
-usr/sbin/sasldblistusers2
-usr/sbin/saslpasswd2
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/advanced.html
-%%PORTDOCS%%%%DOCSDIR%%/appconvert.html
-%%PORTDOCS%%%%DOCSDIR%%/components.html
-%%PORTDOCS%%%%DOCSDIR%%/gssapi.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/install.html
-%%PORTDOCS%%%%DOCSDIR%%/macosx.html
-%%PORTDOCS%%%%DOCSDIR%%/mechanisms.html
-%%PORTDOCS%%%%DOCSDIR%%/options.html
-%%PORTDOCS%%%%DOCSDIR%%/plugprog.html
-%%PORTDOCS%%%%DOCSDIR%%/programming.html
-%%PORTDOCS%%%%DOCSDIR%%/readme.html
-%%PORTDOCS%%%%DOCSDIR%%/sysadmin.html
-%%PORTDOCS%%%%DOCSDIR%%/upgrading.html
-%%PORTDOCS%%%%DOCSDIR%%/windows.html
-@dir etc/sasl2