Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 8 Jun 2019 15:59:47 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r503741 - in head: accessibility/linux-c6-atk accessibility/linux-c7-atk audio/linux-c6-alsa-lib audio/linux-c6-alsa-plugins-oss audio/linux-c6-alsa-plugins-pulseaudio audio/linux-c6-al...
Message-ID:  <201906081559.x58FxliW088961@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Sat Jun  8 15:59:46 2019
New Revision: 503741
URL: https://svnweb.freebsd.org/changeset/ports/503741

Log:
  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.

Modified:
  head/accessibility/linux-c6-atk/Makefile
  head/accessibility/linux-c7-atk/Makefile
  head/audio/linux-c6-alsa-lib/Makefile
  head/audio/linux-c6-alsa-plugins-oss/Makefile
  head/audio/linux-c6-alsa-plugins-pulseaudio/Makefile
  head/audio/linux-c6-alsa-utils/Makefile
  head/audio/linux-c6-flac/Makefile
  head/audio/linux-c6-libaudiofile/Makefile
  head/audio/linux-c6-libogg/Makefile
  head/audio/linux-c6-libsndfile/Makefile
  head/audio/linux-c6-libvorbis/Makefile
  head/audio/linux-c6-mikmod/Makefile
  head/audio/linux-c6-nas-libs/Makefile
  head/audio/linux-c6-openal-soft/Makefile
  head/audio/linux-c6-pulseaudio-libs/Makefile
  head/audio/linux-c6-pulseaudio-utils/Makefile
  head/audio/linux-c6-sdl_mixer/Makefile
  head/audio/linux-c7-alsa-lib/Makefile
  head/audio/linux-c7-alsa-plugins-oss/Makefile
  head/audio/linux-c7-alsa-plugins-pulseaudio/Makefile
  head/audio/linux-c7-alsa-utils/Makefile
  head/audio/linux-c7-audiofile/Makefile
  head/audio/linux-c7-flac/Makefile
  head/audio/linux-c7-libogg/Makefile
  head/audio/linux-c7-libsndfile/Makefile
  head/audio/linux-c7-libvorbis/Makefile
  head/audio/linux-c7-openal-soft/Makefile
  head/audio/linux-c7-pulseaudio-libs/Makefile
  head/audio/linux-c7-pulseaudio-utils/Makefile
  head/audio/linux-c7-sdl_mixer/Makefile
  head/converters/linux-c7-fribidi/Makefile
  head/databases/linux-c6-sqlite3/Makefile
  head/databases/linux-c7-sqlite3/Makefile
  head/devel/linux-c6-dbus-glib/Makefile
  head/devel/linux-c6-dbus-libs/Makefile
  head/devel/linux-c6-devtools/Makefile
  head/devel/linux-c6-icu/Makefile
  head/devel/linux-c6-libelf/Makefile
  head/devel/linux-c6-libgfortran/Makefile
  head/devel/linux-c6-libglade2/Makefile
  head/devel/linux-c6-libpciaccess/Makefile
  head/devel/linux-c6-libsigc++20/Makefile
  head/devel/linux-c6-libsoup/Makefile
  head/devel/linux-c6-libthai/Makefile
  head/devel/linux-c6-libunwind/Makefile
  head/devel/linux-c6-nspr/Makefile
  head/devel/linux-c6-qt47/Makefile
  head/devel/linux-c6-sdl12/Makefile
  head/devel/linux-c7-dbus-glib/Makefile
  head/devel/linux-c7-dbus-libs/Makefile
  head/devel/linux-c7-devtools/Makefile
  head/devel/linux-c7-icu/Makefile
  head/devel/linux-c7-libelf/Makefile
  head/devel/linux-c7-libgfortran/Makefile
  head/devel/linux-c7-libglade2/Makefile
  head/devel/linux-c7-libpciaccess/Makefile
  head/devel/linux-c7-libsigc++20/Makefile
  head/devel/linux-c7-libthai/Makefile
  head/devel/linux-c7-libunwind/Makefile
  head/devel/linux-c7-nspr/Makefile
  head/devel/linux-c7-qt/Makefile
  head/devel/linux-c7-sdl12/Makefile
  head/devel/linux-c7-sdl20/Makefile
  head/dns/linux-c7-libasyncns/Makefile
  head/emulators/linux_base-c6/Makefile
  head/emulators/linux_base-c7/Makefile
  head/ftp/linux-c6-curl/Makefile
  head/ftp/linux-c7-curl/Makefile
  head/graphics/linux-c6-cairo/Makefile
  head/graphics/linux-c6-dri/Makefile
  head/graphics/linux-c6-gdk-pixbuf2/Makefile
  head/graphics/linux-c6-glx-utils/Makefile
  head/graphics/linux-c6-jasper/Makefile
  head/graphics/linux-c6-jpeg/Makefile
  head/graphics/linux-c6-png/Makefile
  head/graphics/linux-c6-sdl_image/Makefile
  head/graphics/linux-c6-sdl_ttf/Makefile
  head/graphics/linux-c6-tiff/Makefile
  head/graphics/linux-c7-cairo/Makefile
  head/graphics/linux-c7-dri/Makefile
  head/graphics/linux-c7-gdk-pixbuf2/Makefile
  head/graphics/linux-c7-glx-utils/Makefile
  head/graphics/linux-c7-graphite2/Makefile
  head/graphics/linux-c7-jasper/Makefile
  head/graphics/linux-c7-jbigkit/Makefile
  head/graphics/linux-c7-jpeg/Makefile
  head/graphics/linux-c7-libglvnd/Makefile
  head/graphics/linux-c7-png/Makefile
  head/graphics/linux-c7-sdl_image/Makefile
  head/graphics/linux-c7-sdl_ttf/Makefile
  head/graphics/linux-c7-tiff/Makefile
  head/graphics/linux-c7-wayland/Makefile
  head/lang/linux-c6-tcl85/Makefile
  head/lang/linux-c7-tcl85/Makefile
  head/multimedia/linux-c6-libtheora/Makefile
  head/multimedia/linux-c6-libv4l/Makefile
  head/multimedia/linux-c7-libtheora/Makefile
  head/multimedia/linux-c7-libv4l/Makefile
  head/net/linux-c6-avahi-libs/Makefile
  head/net/linux-c6-openldap/Makefile
  head/net/linux-c6-tcp_wrappers-libs/Makefile
  head/net/linux-c7-avahi-libs/Makefile
  head/net/linux-c7-openldap/Makefile
  head/net/linux-c7-tcp_wrappers-libs/Makefile
  head/print/linux-c6-cups-libs/Makefile
  head/print/linux-c7-cups-libs/Makefile
  head/print/linux-c7-freetype/Makefile
  head/print/linux-c7-harfbuzz/Makefile
  head/security/linux-c6-cyrus-sasl2/Makefile
  head/security/linux-c6-gnutls/Makefile
  head/security/linux-c6-libgcrypt/Makefile
  head/security/linux-c6-libgpg-error/Makefile
  head/security/linux-c6-libssh2/Makefile
  head/security/linux-c6-libtasn1/Makefile
  head/security/linux-c6-nss/Makefile
  head/security/linux-c6-openssl/Makefile
  head/security/linux-c7-cyrus-sasl2/Makefile
  head/security/linux-c7-gnutls/Makefile
  head/security/linux-c7-libgcrypt/Makefile
  head/security/linux-c7-libgpg-error/Makefile
  head/security/linux-c7-libssh2/Makefile
  head/security/linux-c7-libtasn1/Makefile
  head/security/linux-c7-nettle/Makefile
  head/security/linux-c7-nss/Makefile
  head/security/linux-c7-openssl/Makefile
  head/security/linux-c7-p11-kit/Makefile
  head/security/linux-c7-trousers/Makefile
  head/sysutils/linux-c6-lttng-ust/Makefile
  head/sysutils/linux-c6-userspace-rcu/Makefile
  head/sysutils/linux-c7-lttng-ust/Makefile
  head/sysutils/linux-c7-userspace-rcu/Makefile
  head/textproc/linux-c6-aspell/Makefile
  head/textproc/linux-c6-expat/Makefile
  head/textproc/linux-c6-libxml2/Makefile
  head/textproc/linux-c7-aspell/Makefile
  head/textproc/linux-c7-expat/Makefile
  head/textproc/linux-c7-libxml2/Makefile
  head/www/linux-c6-qt47-webkit/Makefile
  head/www/linux-c7-qtwebkit/Makefile
  head/x11-fonts/linux-c6-fontconfig/Makefile
  head/x11-fonts/linux-c7-fontconfig/Makefile
  head/x11-toolkits/linux-c6-gtk2/Makefile
  head/x11-toolkits/linux-c6-openmotif/Makefile
  head/x11-toolkits/linux-c6-pango/Makefile
  head/x11-toolkits/linux-c6-qt47-x11/Makefile
  head/x11-toolkits/linux-c6-tk85/Makefile
  head/x11-toolkits/linux-c7-gtk2/Makefile
  head/x11-toolkits/linux-c7-openmotif/Makefile
  head/x11-toolkits/linux-c7-pango/Makefile
  head/x11-toolkits/linux-c7-qt-x11/Makefile
  head/x11-toolkits/linux-c7-tk85/Makefile
  head/x11/linux-c6-pixman/Makefile
  head/x11/linux-c6-xorg-libs/Makefile
  head/x11/linux-c7-pixman/Makefile
  head/x11/linux-c7-xorg-libs/Makefile

Modified: head/accessibility/linux-c6-atk/Makefile
==============================================================================
--- head/accessibility/linux-c6-atk/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/accessibility/linux-c6-atk/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -12,10 +12,11 @@ COMMENT=	Accessibility Toolkit (Linux CentOS ${LINUX_D
 
 LICENSE=	GPLv3
 
-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

Modified: head/accessibility/linux-c7-atk/Makefile
==============================================================================
--- head/accessibility/linux-c7-atk/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/accessibility/linux-c7-atk/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -11,12 +11,12 @@ COMMENT=	Accessibility Toolkit (Linux CentOS ${LINUX_D
 
 LICENSE=	GPLv3
 
-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
-
-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

Modified: head/audio/linux-c6-alsa-lib/Makefile
==============================================================================
--- head/audio/linux-c6-alsa-lib/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c6-alsa-lib/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -14,10 +14,11 @@ LICENSE=	GPLv3
 
 RUN_DEPENDS=	alsa-lib>0:audio/alsa-lib
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/audio/linux-c6-alsa-plugins-oss/Makefile
==============================================================================
--- head/audio/linux-c6-alsa-plugins-oss/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c6-alsa-plugins-oss/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -7,20 +7,21 @@ DISTVERSIONSUFFIX=	-1.el6
 PORTREVISION=	3
 CATEGORIES=	audio linux
 PKGNAMESUFFIX=	-oss
-LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	OSS plugin for ALSA (Linux CentOS ${LINUX_DIST_VER})
 
 LICENSE=	GPLv3
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	alsalib
 USE_LINUX_RPM=	yes
+
+LIB_DISTNAMES=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/audio/linux-c6-alsa-plugins-pulseaudio/Makefile
==============================================================================
--- head/audio/linux-c6-alsa-plugins-pulseaudio/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c6-alsa-plugins-pulseaudio/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -7,20 +7,21 @@ DISTVERSIONSUFFIX=	-1.el6
 PORTREVISION=	4
 CATEGORIES=	audio linux
 PKGNAMESUFFIX=	-pulseaudio
-LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	PulseAudio plugin for ALSA (Linux CentOS ${LINUX_DIST_VER})
 
 LICENSE=	GPLv3
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	alsalib pulseaudio-libs
 USE_LINUX_RPM=	yes
+
+LIB_DISTNAMES=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/audio/linux-c6-alsa-utils/Makefile
==============================================================================
--- head/audio/linux-c6-alsa-utils/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c6-alsa-utils/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -12,10 +12,11 @@ COMMENT=	Advanced Linux Sound Architecture utilities (
 
 LICENSE=	GPLv3
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c6
 USE_LINUX=	alsalib alsa-plugins-oss
 USE_LINUX_RPM=	nolib
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes

Modified: head/audio/linux-c6-flac/Makefile
==============================================================================
--- head/audio/linux-c6-flac/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c6-flac/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -10,11 +10,12 @@ CATEGORIES=	audio linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Free lossless audio codec (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	libogg
 USE_LINUX_RPM=	yes
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/audio/linux-c6-libaudiofile/Makefile
==============================================================================
--- head/audio/linux-c6-libaudiofile/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c6-libaudiofile/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -10,10 +10,11 @@ CATEGORIES=	audio linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Implementation of the Audio File Library from SGI (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../lib${PORTNAME}/pkg-descr
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
+
+DESCR=		${.CURDIR}/../lib${PORTNAME}/pkg-descr
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/audio/linux-c6-libogg/Makefile
==============================================================================
--- head/audio/linux-c6-libogg/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c6-libogg/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -10,10 +10,11 @@ CATEGORIES=	audio linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Ogg bitstream library (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
 

Modified: head/audio/linux-c6-libsndfile/Makefile
==============================================================================
--- head/audio/linux-c6-libsndfile/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c6-libsndfile/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -10,11 +10,12 @@ CATEGORIES=	audio linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Reading and writing files containing sampled sound (like WAV or AIFF) (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	flac libogg libvorbis
 USE_LINUX_RPM=	yes
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/audio/linux-c6-libvorbis/Makefile
==============================================================================
--- head/audio/linux-c6-libvorbis/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c6-libvorbis/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -10,11 +10,12 @@ CATEGORIES=	audio linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Audio compression codec library (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	libogg
 USE_LINUX_RPM=	yes
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/audio/linux-c6-mikmod/Makefile
==============================================================================
--- head/audio/linux-c6-mikmod/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c6-mikmod/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -11,10 +11,11 @@ MASTER_SITES=	EPEL/l
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	MikMod Sound Library (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
 

Modified: head/audio/linux-c6-nas-libs/Makefile
==============================================================================
--- head/audio/linux-c6-nas-libs/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c6-nas-libs/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -11,11 +11,12 @@ MASTER_SITES=	EPEL/n
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Network Audio System (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	xorglibs
 USE_LINUX_RPM=	yes
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/audio/linux-c6-openal-soft/Makefile
==============================================================================
--- head/audio/linux-c6-openal-soft/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c6-openal-soft/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -11,11 +11,12 @@ MASTER_SITES=	EPEL/o
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	3D positional spatialized sound library (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	alsalib
 USE_LINUX_RPM=	yes
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/audio/linux-c6-pulseaudio-libs/Makefile
==============================================================================
--- head/audio/linux-c6-pulseaudio-libs/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c6-pulseaudio-libs/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -7,19 +7,20 @@ DISTVERSIONSUFFIX=	-26.el6
 PORTREVISION=	7
 CATEGORIES=	audio linux
 PKGNAMESUFFIX=	-libs
-LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL} \
-		${LINUXNAME}-glib2-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Libraries for PulseAudio clients (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	dbuslibs libasyncns libsndfile tcp_wrappers-libs xorglibs
 USE_LINUX_RPM=	yes
+
+LIB_DISTNAMES=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL} \
+		${PORTNAME}${PKGNAMESUFFIX}-glib2-${DISTVERSIONFULL}
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes

Modified: head/audio/linux-c6-pulseaudio-utils/Makefile
==============================================================================
--- head/audio/linux-c6-pulseaudio-utils/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c6-pulseaudio-utils/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -7,16 +7,17 @@ DISTVERSIONSUFFIX=	-26.el6
 PORTREVISION=	6
 CATEGORIES=	audio linux
 PKGNAMESUFFIX=	-utils
-LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Utils for PulseAudio clients (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	xorglibs pulseaudio-libs
 USE_LINUX_RPM=	yes
+
+LIB_DISTNAMES=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 .include <bsd.port.mk>

Modified: head/audio/linux-c6-sdl_mixer/Makefile
==============================================================================
--- head/audio/linux-c6-sdl_mixer/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c6-sdl_mixer/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -7,20 +7,18 @@ DISTVERSIONSUFFIX=	-1.el6
 PORTREVISION=	5
 CATEGORIES=	audio linux
 MASTER_SITES=	EPEL/s
-DISTNAME=	${LINUXNAME}-${DISTVERSIONFULL}
+DISTNAME=	SDL_mixer-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Sample multi-channel audio mixer library (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-sdl_mixer-[0-9]* linux-f8-sdl_mixer-[0-9]*
-
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME=	SDL_mixer
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	sdl12
 USE_LINUX_RPM=	yes
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR=	${PREFIX}/usr/share/doc/SDL_mixer-${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/audio/linux-c7-alsa-lib/Makefile
==============================================================================
--- head/audio/linux-c7-alsa-lib/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c7-alsa-lib/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -13,11 +13,11 @@ LICENSE=	GPLv3
 
 RUN_DEPENDS=	alsa-lib>0:audio/alsa-lib
 
-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
-
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
+
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/audio/linux-c7-alsa-plugins-oss/Makefile
==============================================================================
--- head/audio/linux-c7-alsa-plugins-oss/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c7-alsa-plugins-oss/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -6,22 +6,22 @@ PORTVERSION=	1.1.6
 DISTVERSIONSUFFIX=	-1.el7
 CATEGORIES=	audio linux
 PKGNAMESUFFIX=	-oss
-LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	OSS plugin for ALSA (Linux CentOS ${LINUX_DIST_VER})
 
 LICENSE=	GPLv3
 
-CONFLICTS=	linux-c6-${LINUXNAME}-[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=	alsalib
 USE_LINUX_RPM=	yes
+
+LIB_DISTNAMES=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+CONFLICTS=	linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/audio/linux-c7-alsa-plugins-pulseaudio/Makefile
==============================================================================
--- head/audio/linux-c7-alsa-plugins-pulseaudio/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c7-alsa-plugins-pulseaudio/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -6,22 +6,22 @@ PORTVERSION=	1.1.6
 DISTVERSIONSUFFIX=	-1.el7
 CATEGORIES=	audio linux
 PKGNAMESUFFIX=	-pulseaudio
-LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	PulseAudio plugin for ALSA (Linux CentOS ${LINUX_DIST_VER})
 
 LICENSE=	GPLv3
 
-CONFLICTS=	linux-c6-${LINUXNAME}-[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=	alsalib pulseaudio-libs
 USE_LINUX_RPM=	yes
+
+LIB_DISTNAMES=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+CONFLICTS=	linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/audio/linux-c7-alsa-utils/Makefile
==============================================================================
--- head/audio/linux-c7-alsa-utils/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c7-alsa-utils/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -11,12 +11,12 @@ COMMENT=	Advanced Linux Sound Architecture utilities (
 
 LICENSE=	GPLv3
 
-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
-
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c7
 USE_LINUX=	alsalib alsa-plugins-oss
 USE_LINUX_RPM=	nolib
+
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes

Modified: head/audio/linux-c7-audiofile/Makefile
==============================================================================
--- head/audio/linux-c7-audiofile/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c7-audiofile/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -10,12 +10,12 @@ CATEGORIES=	audio linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Implementation of the Audio File Library (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
-
-DESCR=		${.CURDIR}/../lib${PORTNAME}/pkg-descr
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
+
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+DESCR=		${.CURDIR}/../lib${PORTNAME}/pkg-descr
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/audio/linux-c7-flac/Makefile
==============================================================================
--- head/audio/linux-c7-flac/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c7-flac/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -7,20 +7,20 @@ DISTVERSIONSUFFIX=	-5.el7_1
 PORTREVISION=	2
 CATEGORIES=	audio linux
 PKGNAMESUFFIX=	-libs
-LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Free lossless audio codec (Linux CentOS ${LINUX_DIST_VER})
 
-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=	libogg
 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
 

Modified: head/audio/linux-c7-libogg/Makefile
==============================================================================
--- head/audio/linux-c7-libogg/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c7-libogg/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -10,12 +10,12 @@ CATEGORIES=	audio linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Ogg bitstream 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_RPM=	yes
+
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/audio/linux-c7-libsndfile/Makefile
==============================================================================
--- head/audio/linux-c7-libsndfile/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c7-libsndfile/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -10,13 +10,13 @@ CATEGORIES=	audio linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Reading and writing files containing sampled sound (like WAV or AIFF) (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
-
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	flac libogg libvorbis
 USE_LINUX_RPM=	yes
+
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/audio/linux-c7-libvorbis/Makefile
==============================================================================
--- head/audio/linux-c7-libvorbis/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c7-libvorbis/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -10,13 +10,13 @@ CATEGORIES=	audio linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Audio compression codec 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=	libogg
 USE_LINUX_RPM=	yes
+
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/audio/linux-c7-openal-soft/Makefile
==============================================================================
--- head/audio/linux-c7-openal-soft/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c7-openal-soft/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -11,14 +11,15 @@ MASTER_SITES=	EPEL7/o
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	3D positional spatialized sound library (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
-
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 ONLY_FOR_ARCHS=	amd64
+
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	alsalib
 USE_LINUX_RPM=	yes
+
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/audio/linux-c7-pulseaudio-libs/Makefile
==============================================================================
--- head/audio/linux-c7-pulseaudio-libs/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c7-pulseaudio-libs/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -7,21 +7,21 @@ DISTVERSIONSUFFIX=	-5.el7
 PORTREVISION=	1
 CATEGORIES=	audio linux
 PKGNAMESUFFIX=	-libs
-LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL} \
-		${LINUXNAME}-glib2-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Libraries for PulseAudio clients (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-c6-${LINUXNAME}-[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=	dbuslibs libasyncns libsndfile tcp_wrappers-libs xorglibs
 USE_LINUX_RPM=	yes
+
+LIB_DISTNAMES=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL} \
+		${PORTNAME}${PKGNAMESUFFIX}-glib2-${DISTVERSIONFULL}
+
+CONFLICTS=	linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes

Modified: head/audio/linux-c7-pulseaudio-utils/Makefile
==============================================================================
--- head/audio/linux-c7-pulseaudio-utils/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c7-pulseaudio-utils/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -7,18 +7,18 @@ DISTVERSIONSUFFIX=	-5.el7
 PORTREVISION=	1
 CATEGORIES=	audio linux
 PKGNAMESUFFIX=	-utils
-BIN_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Utils for PulseAudio clients (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-c6-${LINUXNAME}-[0-9]*
-
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	xorglibs pulseaudio-libs
 USE_LINUX_RPM=	nolib
+
+BIN_DISTNAMES=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+CONFLICTS=	linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 .include <bsd.port.mk>

Modified: head/audio/linux-c7-sdl_mixer/Makefile
==============================================================================
--- head/audio/linux-c7-sdl_mixer/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/audio/linux-c7-sdl_mixer/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -7,21 +7,21 @@ DISTVERSIONSUFFIX=	-4.el7
 PORTREVISION=	1
 CATEGORIES=	audio linux
 MASTER_SITES=	EPEL7/s
-DISTNAME=	${LINUXNAME}-${DISTVERSIONFULL}
+DISTNAME=	SDL_mixer-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Sample multi-channel audio mixer library (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
-
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME=	SDL_mixer
 ONLY_FOR_ARCHS=	amd64
+
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	sdl12
 USE_LINUX_RPM=	yes
+
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR=	${PREFIX}/usr/share/doc/SDL_mixer-${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/converters/linux-c7-fribidi/Makefile
==============================================================================
--- head/converters/linux-c7-fribidi/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/converters/linux-c7-fribidi/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -8,10 +8,11 @@ CATEGORIES=	converters linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Unicode Bidirectional Algorithm (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
 

Modified: head/databases/linux-c6-sqlite3/Makefile
==============================================================================
--- head/databases/linux-c6-sqlite3/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/databases/linux-c6-sqlite3/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -10,10 +10,11 @@ CATEGORIES=	databases linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Library that implements an embeddable SQL database engine (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}3/pkg-descr
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
+
+DESCR=		${.CURDIR}/../${PORTNAME}3/pkg-descr
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/databases/linux-c7-sqlite3/Makefile
==============================================================================
--- head/databases/linux-c7-sqlite3/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/databases/linux-c7-sqlite3/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -12,12 +12,12 @@ COMMENT=	Library that implements an embeddable SQL dat
 
 LICENSE=	PD
 
-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
-
-DESCR=		${.CURDIR}/../${PORTNAME}3/pkg-descr
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
+
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+DESCR=		${.CURDIR}/../${PORTNAME}3/pkg-descr
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/devel/linux-c6-dbus-glib/Makefile
==============================================================================
--- head/devel/linux-c6-dbus-glib/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/devel/linux-c6-dbus-glib/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -10,11 +10,12 @@ CATEGORIES=	devel linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	GLib bindings for D-Bus (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	dbuslibs expat
 USE_LINUX_RPM=	yes
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/devel/linux-c6-dbus-libs/Makefile
==============================================================================
--- head/devel/linux-c6-dbus-libs/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/devel/linux-c6-dbus-libs/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -7,15 +7,16 @@ DISTVERSIONSUFFIX=	-9.el6
 PORTREVISION=	7
 CATEGORIES=	devel linux
 PKGNAMESUFFIX=	-libs
-LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Libraries for accessing D-BUS (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
+
+LIB_DISTNAMES=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 .include <bsd.port.mk>

Modified: head/devel/linux-c6-devtools/Makefile
==============================================================================
--- head/devel/linux-c6-devtools/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/devel/linux-c6-devtools/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -5,6 +5,17 @@ PORTNAME=	devtools
 PORTVERSION=	${LINUX_DIST_VER}
 PORTREVISION=	3
 CATEGORIES=	devel
+
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	Linux compilers and base libraries (CentOS ${LINUX_DIST_VER})
+
+# LICENSE=	Various GNU
+
+USES=		linux:c6
+USE_LDCONFIG=	yes
+USE_LINUX=	libgfortran
+USE_LINUX_RPM=	yes
+
 BIN_DISTNAMES=	binutils-2.20.51.0.2-5.48.el6_10.1 \
 		glibc-headers-2.12-1.212.el6_10.3 \
 		kernel-headers-2.6.32-754.14.2.el6 \
@@ -22,16 +33,6 @@ SRC_DISTFILES=	binutils-2.20.51.0.2-5.48.el6_10.1${SRC
 		kernel-2.6.32-754.14.2.el6${SRC_SUFX}:SOURCE \
 		mpfr-2.4.1-6.el6${SRC_SUFX}:SOURCE \
 		gcc-4.4.7-23.el6${SRC_SUFX}:SOURCE
-
-MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	Linux compilers and base libraries (CentOS ${LINUX_DIST_VER})
-
-# LICENSE=	Various GNU
-
-USES=		linux:c6
-USE_LDCONFIG=	yes
-USE_LINUX=	libgfortran
-USE_LINUX_RPM=	yes
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes

Modified: head/devel/linux-c6-icu/Makefile
==============================================================================
--- head/devel/linux-c6-icu/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/devel/linux-c6-icu/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -10,9 +10,10 @@ LIB_DISTNAMES=	lib${PORTNAME}-${DISTVERSIONFULL}
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	International Components for Unicode (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
 
 .include <bsd.port.mk>

Modified: head/devel/linux-c6-libelf/Makefile
==============================================================================
--- head/devel/linux-c6-libelf/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/devel/linux-c6-libelf/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -6,16 +6,17 @@ DISTVERSIONSUFFIX=	-2.el6
 PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-libelf
-LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	ELF file handling library (CentOS ${LINUX_DIST_VER})
 
-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}
+
+DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes

Modified: head/devel/linux-c6-libgfortran/Makefile
==============================================================================
--- head/devel/linux-c6-libgfortran/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/devel/linux-c6-libgfortran/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -5,7 +5,6 @@ PORTVERSION=	4.4.7
 DISTVERSIONSUFFIX=	-23.el6
 PORTREVISION=	7
 CATEGORIES=	devel linux
-SRC_DISTFILES=	gcc-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Runtime libraries for gfortran (Linux Centos ${LINUX_DIST_VER})
@@ -13,5 +12,7 @@ COMMENT=	Runtime libraries for gfortran (Linux Centos 
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
+
+SRC_DISTFILES=	gcc-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE
 
 .include <bsd.port.mk>

Modified: head/devel/linux-c6-libglade2/Makefile
==============================================================================
--- head/devel/linux-c6-libglade2/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/devel/linux-c6-libglade2/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -10,10 +10,11 @@ CATEGORIES=	devel linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	GNOME glade library (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
 

Modified: head/devel/linux-c6-libpciaccess/Makefile
==============================================================================
--- head/devel/linux-c6-libpciaccess/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/devel/linux-c6-libpciaccess/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -10,10 +10,11 @@ CATEGORIES=	devel
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Generic PCI access library (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
 

Modified: head/devel/linux-c6-libsigc++20/Makefile
==============================================================================
--- head/devel/linux-c6-libsigc++20/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/devel/linux-c6-libsigc++20/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -10,10 +10,11 @@ CATEGORIES=	devel linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Callback Framework for C++ (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
 

Modified: head/devel/linux-c6-libsoup/Makefile
==============================================================================
--- head/devel/linux-c6-libsoup/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/devel/linux-c6-libsoup/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -8,10 +8,11 @@ CATEGORIES=	devel linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Simple Object Access Protocol implementation in C (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
 

Modified: head/devel/linux-c6-libthai/Makefile
==============================================================================
--- head/devel/linux-c6-libthai/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/devel/linux-c6-libthai/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -9,10 +9,11 @@ CATEGORIES=	devel linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Thai language support library (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
 

Modified: head/devel/linux-c6-libunwind/Makefile
==============================================================================
--- head/devel/linux-c6-libunwind/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/devel/linux-c6-libunwind/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -10,10 +10,11 @@ MASTER_SITES=	EPEL/l
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Generic stack unwinding library (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
 

Modified: head/devel/linux-c6-nspr/Makefile
==============================================================================
--- head/devel/linux-c6-nspr/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/devel/linux-c6-nspr/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -9,9 +9,10 @@ CATEGORIES=	devel linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Netscape Portable Runtime (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
 
 .include <bsd.port.mk>

Modified: head/devel/linux-c6-qt47/Makefile
==============================================================================
--- head/devel/linux-c6-qt47/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/devel/linux-c6-qt47/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -7,7 +7,6 @@ DISTVERSIONSUFFIX=	-1_18.el6
 PORTREVISION=	4
 CATEGORIES=	devel linux
 MASTER_SITES=	LOCAL/tijl/atrpms:amd64,i386
-SRC_DISTFILES=	# unavailable
 DIST_SUBDIR=	atrpms
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -17,6 +16,8 @@ USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	fontconfig png dbuslibs sqlite3 openssl
 USE_LINUX_RPM=	yes
+
+SRC_DISTFILES=	# unavailable
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/devel/linux-c6-sdl12/Makefile
==============================================================================
--- head/devel/linux-c6-sdl12/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/devel/linux-c6-sdl12/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -6,18 +6,18 @@ PORTVERSION=	1.2.14
 DISTVERSIONSUFFIX=	-7.el6_7.1
 PORTREVISION=	4
 CATEGORIES=	devel linux
-DISTNAME=	${LINUXNAME}-${DISTVERSIONFULL}
+DISTNAME=	SDL-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Cross-platform multi-media development API (Linux CentOS ${LINUX_DIST_VER})
 
-DESCR=		${.CURDIR}/../${PORTNAME}12/pkg-descr
-DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME=	SDL
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	xorglibs
 USE_LINUX_RPM=	yes
+
+DESCR=		${.CURDIR}/../${PORTNAME}12/pkg-descr
+DOCSDIR=	${PREFIX}/usr/share/doc/SDL-${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/devel/linux-c7-dbus-glib/Makefile
==============================================================================
--- head/devel/linux-c7-dbus-glib/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/devel/linux-c7-dbus-glib/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -10,13 +10,13 @@ CATEGORIES=	devel linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	GLib bindings for D-Bus (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
-
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	dbuslibs expat
 USE_LINUX_RPM=	yes
+
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/devel/linux-c7-dbus-libs/Makefile
==============================================================================
--- head/devel/linux-c7-dbus-libs/Makefile	Sat Jun  8 15:23:24 2019	(r503740)
+++ head/devel/linux-c7-dbus-libs/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
@@ -6,20 +6,20 @@ PORTVERSION=	1.10.24
 DISTVERSIONSUFFIX=	-13.el7_6
 CATEGORIES=	devel linux
 PKGNAMESUFFIX=	-libs
-LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Libraries for accessing D-BUS (Linux CentOS ${LINUX_DIST_VER})
 
 LICENSE=	GPLv2+
 
-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

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906081559.x58FxliW088961>