Address some portlint warnings in the Linux infrastructure ports.

Eliminate LINUXNAME from port Makefiles.  This was just a helper variable
without special meaning outside port Makefiles but several developers have
copied it to new ports where it was then unused, apparently thinking that
it did have some special meaning.

10 files changed, 40 insertions, 32 deletions

diff --git a/x11-toolkits/linux-c6-gtk2/Makefile b/x11-toolkits/linux-c6-gtk2/Makefile
index 90130afd7fab..e07d61349d85 100644
--- a/x11-toolkits/linux-c6-gtk2/Makefile
+++ b/x11-toolkits/linux-c6-gtk2/Makefile
@@ -6,19 +6,21 @@ PORTVERSION=	2.24.23
 DISTVERSIONSUFFIX=	-9.el6
 PORTREVISION=	7
 CATEGORIES=	x11-toolkits linux
-LIB_DISTNAMES=	${DISTNAME} \
-		${PORTNAME}-engines-2.18.4-5.el6.centos \
-		${PORTNAME}-immodules-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	GTK+ library, version 2.X (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}0/pkg-descr
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	atk gdkpixbuf2 pango xorglibs
 USE_LINUX_RPM=	yes
 
+LIB_DISTNAMES=	${DISTNAME} \
+		${PORTNAME}-engines-2.18.4-5.el6.centos \
+		${PORTNAME}-immodules-${DISTVERSIONFULL}
+
+DESCR=		${.CURDIR}/../${PORTNAME}0/pkg-descr
+
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
diff --git a/x11-toolkits/linux-c6-openmotif/Makefile b/x11-toolkits/linux-c6-openmotif/Makefile
index 3ec588df4a5b..a33ce9a50808 100644
--- a/x11-toolkits/linux-c6-openmotif/Makefile
+++ b/x11-toolkits/linux-c6-openmotif/Makefile
@@ -10,12 +10,13 @@ CATEGORIES=	x11-toolkits linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Motif toolkit libraries (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../open-motif/pkg-descr
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	xorglibs
 USE_LINUX_RPM=	yes
 
+DESCR=		${.CURDIR}/../open-motif/pkg-descr
+
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
diff --git a/x11-toolkits/linux-c6-pango/Makefile b/x11-toolkits/linux-c6-pango/Makefile
index 3303ced975ec..4156020ee737 100644
--- a/x11-toolkits/linux-c6-pango/Makefile
+++ b/x11-toolkits/linux-c6-pango/Makefile
@@ -10,12 +10,13 @@ CATEGORIES=	x11-toolkits linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Pango library (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	cairo fontconfig libthai xorglibs
 USE_LINUX_RPM=	yes
 
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/linux-c6-qt47-x11/Makefile b/x11-toolkits/linux-c6-qt47-x11/Makefile
index d2ee2604ea6e..0f6ccd86cbe0 100644
--- a/x11-toolkits/linux-c6-qt47-x11/Makefile
+++ b/x11-toolkits/linux-c6-qt47-x11/Makefile
@@ -7,19 +7,21 @@ DISTVERSIONSUFFIX=	-1_18.el6
 PORTREVISION=	6
 CATEGORIES=	x11-toolkits linux
 MASTER_SITES=	LOCAL/tijl/atrpms:amd64,i386
-SRC_DISTFILES=	# unavailable
 DIST_SUBDIR=	atrpms
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Cross-platform application and UI framework (Linux CentOS ${LINUX_DIST_VER})
 
-DATADIR=	${PREFIX}/usr/share/qt47
-DESCR=		${.CURDIR}/../../devel/linux-c6-qt47/pkg-descr
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	alsalib dri fontconfig jpeg openssl png qt tiff xorglibs
 USE_LINUX_RPM=	yes
 
+SRC_DISTFILES=	# unavailable
+
+DATADIR=	${PREFIX}/usr/share/qt47
+DESCR=		${.CURDIR}/../../devel/linux-c6-qt47/pkg-descr
+
 post-patch:
 	@${RM} -r ${WRKSRC}/usr/share/icons
 
diff --git a/x11-toolkits/linux-c6-tk85/Makefile b/x11-toolkits/linux-c6-tk85/Makefile
index 15680933fba9..6c15a720e199 100644
--- a/x11-toolkits/linux-c6-tk85/Makefile
+++ b/x11-toolkits/linux-c6-tk85/Makefile
@@ -11,14 +11,15 @@ PKGNAMESUFFIX=	85
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Graphical toolkit for TCL (Linux CentOS ${LINUX_DIST_VER})
 
-DATADIR=	${PREFIX}/usr/share/tk${PORTVERSION:R}
-DESCR=		${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	xorglibs
 USE_LINUX_RPM=	yes
 USE_LINUX_RPM_BAD_PERMS=	yes
 
+DATADIR=	${PREFIX}/usr/share/tk${PORTVERSION:R}
+DESCR=		${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/linux-c7-gtk2/Makefile b/x11-toolkits/linux-c7-gtk2/Makefile
index 7b7f1ae92b97..c60a51c5bbd3 100644
--- a/x11-toolkits/linux-c7-gtk2/Makefile
+++ b/x11-toolkits/linux-c7-gtk2/Makefile
@@ -5,20 +5,21 @@ PORTNAME=	gtk2
 PORTVERSION=	2.24.31
 DISTVERSIONSUFFIX=	-1.el7
 CATEGORIES=	x11-toolkits linux
-LIB_DISTNAMES=	${DISTNAME} \
-		${PORTNAME}-immodules-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	GTK+ library, version 2.X (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
-
-DESCR=		${.CURDIR}/../${PORTNAME}0/pkg-descr
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	atk gdkpixbuf2 pango xorglibs
 USE_LINUX_RPM=	yes
 
+LIB_DISTNAMES=	${DISTNAME} \
+		${PORTNAME}-immodules-${DISTVERSIONFULL}
+
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+DESCR=		${.CURDIR}/../${PORTNAME}0/pkg-descr
+
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
diff --git a/x11-toolkits/linux-c7-openmotif/Makefile b/x11-toolkits/linux-c7-openmotif/Makefile
index bdd27c1f0d2b..7280fcee9f79 100644
--- a/x11-toolkits/linux-c7-openmotif/Makefile
+++ b/x11-toolkits/linux-c7-openmotif/Makefile
@@ -10,14 +10,14 @@ CATEGORIES=	x11-toolkits linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Motif toolkit libraries (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
-
-DESCR=		${.CURDIR}/../open-${PORTNAME}/pkg-descr
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	xorglibs
 USE_LINUX_RPM=	yes
 
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+DESCR=		${.CURDIR}/../open-${PORTNAME}/pkg-descr
+
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
diff --git a/x11-toolkits/linux-c7-pango/Makefile b/x11-toolkits/linux-c7-pango/Makefile
index 439c247d1bfe..f2c92acdec8e 100644
--- a/x11-toolkits/linux-c7-pango/Makefile
+++ b/x11-toolkits/linux-c7-pango/Makefile
@@ -9,14 +9,14 @@ CATEGORIES=	x11-toolkits linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Pango 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=	cairo fontconfig freetype fribidi harfbuzz libthai xorglibs
 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/x11-toolkits/linux-c7-qt-x11/Makefile b/x11-toolkits/linux-c7-qt-x11/Makefile
index f9b4f380e9d6..4a507e4d51a9 100644
--- a/x11-toolkits/linux-c7-qt-x11/Makefile
+++ b/x11-toolkits/linux-c7-qt-x11/Makefile
@@ -6,21 +6,21 @@ PORTVERSION=	4.8.7
 DISTVERSIONSUFFIX=	-2.el7
 CATEGORIES=	x11-toolkits linux
 PKGNAMESUFFIX=	-x11
-LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Cross-platform application and UI framework (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-c6-qt47-x11-[0-9]*
-
-DATADIR=	${PREFIX}/usr/share/${PORTNAME}4
-DESCR=		${.CURDIR}/../../devel/linux-c6-qt47/pkg-descr
-LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	alsalib dri fontconfig jpeg openssl png qt tiff xorglibs
 USE_LINUX_RPM=	yes
 
+LIB_DISTNAMES=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+CONFLICTS=	linux-c6-qt47-x11-[0-9]*
+DATADIR=	${PREFIX}/usr/share/${PORTNAME}4
+DESCR=		${.CURDIR}/../../devel/linux-c6-qt47/pkg-descr
+
 post-patch:
 	@${RM} -r ${WRKSRC}/usr/share/icons
 
diff --git a/x11-toolkits/linux-c7-tk85/Makefile b/x11-toolkits/linux-c7-tk85/Makefile
index 8d7784261bf2..f3a751a0c765 100644
--- a/x11-toolkits/linux-c7-tk85/Makefile
+++ b/x11-toolkits/linux-c7-tk85/Makefile
@@ -11,16 +11,16 @@ PKGNAMESUFFIX=	85
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Graphical toolkit for TCL (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
-
-DATADIR=	${PREFIX}/usr/share/tk${PORTVERSION:R}
-DESCR=		${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	xorglibs
 USE_LINUX_RPM=	yes
 USE_LINUX_RPM_BAD_PERMS=	yes
 
+CONFLICTS=	linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+DATADIR=	${PREFIX}/usr/share/tk${PORTVERSION:R}
+DESCR=		${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>