19 files changed, 71 insertions, 57 deletions

diff --git a/security/linux-c6-cyrus-sasl2/Makefile b/security/linux-c6-cyrus-sasl2/Makefile
index 6ed43a475fb3..a735fbd4b76c 100644
--- a/security/linux-c6-cyrus-sasl2/Makefile
+++ b/security/linux-c6-cyrus-sasl2/Makefile
@@ -7,18 +7,19 @@ DISTVERSIONSUFFIX=	-15.el6_6.2
 PORTREVISION=	5
 CATEGORIES=	security linux
 PKGNAMESUFFIX=	-lib
-LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer) (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}2/pkg-descr
-DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
 
+LIB_DISTNAMES=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+DESCR=		${.CURDIR}/../${PORTNAME}2/pkg-descr
+DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/security/linux-c6-gnutls/Makefile b/security/linux-c6-gnutls/Makefile
index 1eed959ce8ef..7fa7743a3831 100644
--- a/security/linux-c6-gnutls/Makefile
+++ b/security/linux-c6-gnutls/Makefile
@@ -10,12 +10,13 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	GNU Transport Layer Security library (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	libtasn1 libgcrypt libgpg-error
 USE_LINUX_RPM=	yes
 
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
diff --git a/security/linux-c6-libgcrypt/Makefile b/security/linux-c6-libgcrypt/Makefile
index aa1db0b03e1d..8138033a7d34 100644
--- a/security/linux-c6-libgcrypt/Makefile
+++ b/security/linux-c6-libgcrypt/Makefile
@@ -10,12 +10,13 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	General purpose crypto library based on code used in GnuPG (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	libgpg-error
 USE_LINUX_RPM=	yes
 
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/security/linux-c6-libgpg-error/Makefile b/security/linux-c6-libgpg-error/Makefile
index 036fcd593932..45d7eddb23e3 100644
--- a/security/linux-c6-libgpg-error/Makefile
+++ b/security/linux-c6-libgpg-error/Makefile
@@ -10,11 +10,12 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Common error values for all GnuPG components (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
 
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
diff --git a/security/linux-c6-libssh2/Makefile b/security/linux-c6-libssh2/Makefile
index 9f0dec760cb1..d3c9e2baf90a 100644
--- a/security/linux-c6-libssh2/Makefile
+++ b/security/linux-c6-libssh2/Makefile
@@ -10,12 +10,13 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Library implementing the SSH2 protocol (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	openssl
 USE_LINUX_RPM=	yes
 
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/security/linux-c6-libtasn1/Makefile b/security/linux-c6-libtasn1/Makefile
index 128844d3bd08..ebdb18f8977e 100644
--- a/security/linux-c6-libtasn1/Makefile
+++ b/security/linux-c6-libtasn1/Makefile
@@ -10,12 +10,13 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	ASN.1 structure parser library (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		cpe linux:c6
 CPE_VENDOR=	gnu
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
 
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/security/linux-c6-nss/Makefile b/security/linux-c6-nss/Makefile
index 594c6cf62062..b0ad79ee6f24 100644
--- a/security/linux-c6-nss/Makefile
+++ b/security/linux-c6-nss/Makefile
@@ -6,22 +6,24 @@ PORTVERSION=	3.36.0
 DISTVERSIONSUFFIX=	-9.el6_10
 PORTREVISION=	2
 CATEGORIES=	security linux
-LIB_DISTNAMES=	${DISTNAME} \
-		${PORTNAME}-util-${PORTVERSION}-1.el6 \
-		${PORTNAME}-softokn-3.14.3-23.3.el6_8
-SRC_DISTFILES=	${DISTNAME}${SRC_SUFX}:SOURCE \
-		${PORTNAME}-util-${PORTVERSION}-1.el6${SRC_SUFX}:SOURCE \
-		${PORTNAME}-softokn-3.14.3-23.3.el6_8${SRC_SUFX}:SOURCE
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Network Security Services (Linux CentOS ${LINUX_DIST_VER})
 
 LICENSE=	MPL20
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	nspr sqlite3
 USE_LINUX_RPM=	yes
 
+LIB_DISTNAMES=	${DISTNAME} \
+		${PORTNAME}-util-${PORTVERSION}-1.el6 \
+		${PORTNAME}-softokn-3.14.3-23.3.el6_8
+SRC_DISTFILES=	${DISTNAME}${SRC_SUFX}:SOURCE \
+		${PORTNAME}-util-${PORTVERSION}-1.el6${SRC_SUFX}:SOURCE \
+		${PORTNAME}-softokn-3.14.3-23.3.el6_8${SRC_SUFX}:SOURCE
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
 .include <bsd.port.mk>
diff --git a/security/linux-c6-openssl/Makefile b/security/linux-c6-openssl/Makefile
index 97f359b13a69..4045329c8e38 100644
--- a/security/linux-c6-openssl/Makefile
+++ b/security/linux-c6-openssl/Makefile
@@ -10,11 +10,12 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	OpenSSL toolkit (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
 
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/security/linux-c7-cyrus-sasl2/Makefile b/security/linux-c7-cyrus-sasl2/Makefile
index 7d2e3de930fb..60e9c3f66c3d 100644
--- a/security/linux-c7-cyrus-sasl2/Makefile
+++ b/security/linux-c7-cyrus-sasl2/Makefile
@@ -7,20 +7,20 @@ DISTVERSIONSUFFIX=	-23.el7
 PORTREVISION=	4
 CATEGORIES=	security linux
 PKGNAMESUFFIX=	-lib
-LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer) (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-c6-${LINUXNAME}-[0-9]*
-
-DESCR=		${.CURDIR}/../${PORTNAME}2/pkg-descr
-DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
 
+LIB_DISTNAMES=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+CONFLICTS=	linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+DESCR=		${.CURDIR}/../${PORTNAME}2/pkg-descr
+DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/security/linux-c7-gnutls/Makefile b/security/linux-c7-gnutls/Makefile
index 02b3bb75641a..f1b1912c100f 100644
--- a/security/linux-c7-gnutls/Makefile
+++ b/security/linux-c7-gnutls/Makefile
@@ -9,14 +9,14 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	GNU Transport Layer Security library (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
-
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	libtasn1 nettle p11-kit trousers
 USE_LINUX_RPM=	yes
 
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
diff --git a/security/linux-c7-libgcrypt/Makefile b/security/linux-c7-libgcrypt/Makefile
index 2550036bd993..d188a14c243b 100644
--- a/security/linux-c7-libgcrypt/Makefile
+++ b/security/linux-c7-libgcrypt/Makefile
@@ -10,16 +10,16 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Crypto library based on code used in GnuPG (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
-
 LICENSE=	LGPL21+
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	libgpg-error
 USE_LINUX_RPM=	yes
 
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/security/linux-c7-libgpg-error/Makefile b/security/linux-c7-libgpg-error/Makefile
index 8cc6f7840054..c6bf52becb4b 100644
--- a/security/linux-c7-libgpg-error/Makefile
+++ b/security/linux-c7-libgpg-error/Makefile
@@ -10,15 +10,15 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Common error values for all GnuPG components (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
-
 LICENSE=	LGPL21+
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
 
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
diff --git a/security/linux-c7-libssh2/Makefile b/security/linux-c7-libssh2/Makefile
index e919c82dab19..c7ec02ec4123 100644
--- a/security/linux-c7-libssh2/Makefile
+++ b/security/linux-c7-libssh2/Makefile
@@ -10,14 +10,14 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Library implementing the SSH2 protocol (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
-
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	openssl
 USE_LINUX_RPM=	yes
 
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/security/linux-c7-libtasn1/Makefile b/security/linux-c7-libtasn1/Makefile
index 7b42d8006f51..666798a25a8d 100644
--- a/security/linux-c7-libtasn1/Makefile
+++ b/security/linux-c7-libtasn1/Makefile
@@ -11,14 +11,15 @@ COMMENT=	ASN.1 structure parser library (Linux CentOS ${LINUX_DIST_VER})
 
 LICENSE=	LGPL21+
 
-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
-
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		cpe linux:c7
-CPE_VENDOR=	gnu
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
 
+CPE_VENDOR=	gnu
+
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/security/linux-c7-nettle/Makefile b/security/linux-c7-nettle/Makefile
index 194352298908..f352955db1aa 100644
--- a/security/linux-c7-nettle/Makefile
+++ b/security/linux-c7-nettle/Makefile
@@ -8,11 +8,12 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Low-level cryptographic library (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
 
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/security/linux-c7-nss/Makefile b/security/linux-c7-nss/Makefile
index d2623fa54109..55e8b15075a3 100644
--- a/security/linux-c7-nss/Makefile
+++ b/security/linux-c7-nss/Makefile
@@ -5,6 +5,15 @@ PORTNAME=	nss
 PORTVERSION=	3.36.0
 DISTVERSIONSUFFIX=	-7.1.el7_6
 CATEGORIES=	security linux
+
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	Network Security Services (Linux CentOS ${LINUX_DIST_VER})
+
+USES=		linux:c7
+USE_LDCONFIG=	yes
+USE_LINUX=	nspr sqlite3
+USE_LINUX_RPM=	yes
+
 LIB_DISTNAMES=	${DISTNAME} \
 		${PORTNAME}-pem-1.0.3-5.el7_6.1 \
 		${PORTNAME}-util-${PORTVERSION}-1.1.el7_6 \
@@ -14,15 +23,7 @@ SRC_DISTFILES=	${DISTNAME}${SRC_SUFX}:SOURCE \
 		${PORTNAME}-util-${PORTVERSION}-1.1.el7_6${SRC_SUFX}:SOURCE \
 		${PORTNAME}-softokn-3.36.0-5.el7_5${SRC_SUFX}:SOURCE
 
-MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	Network Security Services (Linux CentOS ${LINUX_DIST_VER})
-
 CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
-
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-USES=		linux:c7
-USE_LDCONFIG=	yes
-USE_LINUX=	nspr sqlite3
-USE_LINUX_RPM=	yes
 
 .include <bsd.port.mk>
diff --git a/security/linux-c7-openssl/Makefile b/security/linux-c7-openssl/Makefile
index 474a5c0a8d00..c07bd0cf6b35 100644
--- a/security/linux-c7-openssl/Makefile
+++ b/security/linux-c7-openssl/Makefile
@@ -7,23 +7,23 @@ DISTVERSIONSUFFIX=	-16.el7_6.1
 PORTREVISION=	1
 CATEGORIES=	security linux
 PKGNAMESUFFIX=	-libs
-LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	OpenSSL libraries (Linux CentOS ${LINUX_DIST_VER})
 
 LICENSE=	OpenSSL
-LICENSE_FILE=	${WRKSRC}/usr/share/licenses/${LINUXNAME}-${PORTVERSION}/LICENSE
+LICENSE_FILE=	${WRKSRC}/usr/share/licenses/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}/LICENSE
 
-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
-
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
 
+LIB_DISTNAMES=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/security/linux-c7-p11-kit/Makefile b/security/linux-c7-p11-kit/Makefile
index 66c6e6ed8903..3911a46806d7 100644
--- a/security/linux-c7-p11-kit/Makefile
+++ b/security/linux-c7-p11-kit/Makefile
@@ -8,11 +8,12 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Library for loading and enumerating of PKCS\#11 modules (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
 
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/security/linux-c7-trousers/Makefile b/security/linux-c7-trousers/Makefile
index 7abd1a54e660..3ec518523e20 100644
--- a/security/linux-c7-trousers/Makefile
+++ b/security/linux-c7-trousers/Makefile
@@ -8,12 +8,13 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Open-source TCG Software Stack (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	openssl
 USE_LINUX_RPM=	yes
 
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>