Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 8 Jun 2019 13:13:29 +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: r503726 - in head: Mk/Uses 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/lin...
Message-ID:  <201906081313.x58DDTmZ001342@repo.freebsd.org>

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

Log:
  Eliminate RPMVERSION from Linux ports and set DISTVERSIONSUFFIX instead.
  This puts all version information together in the port Makefiles.

Modified:
  head/Mk/Uses/linux.mk
  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-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-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/devel/linux-c7-strace/Makefile
  head/devel/linux-ltp/Makefile
  head/dns/linux-c6-libasyncns/Makefile
  head/dns/linux-c7-libasyncns/Makefile
  head/emulators/linux-power9-functional-sim/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-audit-libs/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-c6-pam/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-c7-pixman/Makefile

Modified: head/Mk/Uses/linux.mk
==============================================================================
--- head/Mk/Uses/linux.mk	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/Mk/Uses/linux.mk	Sat Jun  8 13:13:29 2019	(r503726)
@@ -184,8 +184,6 @@ DEV_ERROR+=		"USE_LINUX=${i}: package does not exist"
 
 .ifdef USE_LINUX_RPM
 
-DISTVERSIONSUFFIX?=	-${RPMVERSION}
-
 .if ${linux_ARGS} == c6
 .ifndef MASTER_SITES
 MASTER_SITES=		${MASTER_SITE_CENTOS_LINUX}

Modified: head/accessibility/linux-c6-atk/Makefile
==============================================================================
--- head/accessibility/linux-c6-atk/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/accessibility/linux-c6-atk/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	atk
 PORTVERSION=	1.30.0
+DISTVERSIONSUFFIX=	-1.el6
 PORTREVISION=	2
 CATEGORIES=	accessibility linux
 
@@ -12,7 +13,6 @@ COMMENT=	Accessibility Toolkit (Linux CentOS ${LINUX_D
 LICENSE=	GPLv3
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	1.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/accessibility/linux-c7-atk/Makefile
==============================================================================
--- head/accessibility/linux-c7-atk/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/accessibility/linux-c7-atk/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	atk
 PORTVERSION=	2.28.1
+DISTVERSIONSUFFIX=	-1.el7
 CATEGORIES=	accessibility linux
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -13,7 +14,6 @@ LICENSE=	GPLv3
 CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	1.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/audio/linux-c6-alsa-lib/Makefile
==============================================================================
--- head/audio/linux-c6-alsa-lib/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c6-alsa-lib/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	alsa-lib
 PORTVERSION=	1.1.0
+DISTVERSIONSUFFIX=	-4.el6
 PORTREVISION=	3
 CATEGORIES=	audio linux
 
@@ -14,7 +15,6 @@ LICENSE=	GPLv3
 RUN_DEPENDS=	alsa-lib>0:audio/alsa-lib
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	4.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/audio/linux-c6-alsa-plugins-oss/Makefile
==============================================================================
--- head/audio/linux-c6-alsa-plugins-oss/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c6-alsa-plugins-oss/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	alsa-plugins
 PORTVERSION=	1.1.0
+DISTVERSIONSUFFIX=	-1.el6
 PORTREVISION=	3
 CATEGORIES=	audio linux
 PKGNAMESUFFIX=	-oss
@@ -16,7 +17,6 @@ LICENSE=	GPLv3
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
 LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
-RPMVERSION=	1.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	alsalib

Modified: head/audio/linux-c6-alsa-plugins-pulseaudio/Makefile
==============================================================================
--- head/audio/linux-c6-alsa-plugins-pulseaudio/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c6-alsa-plugins-pulseaudio/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	alsa-plugins
 PORTVERSION=	1.1.0
+DISTVERSIONSUFFIX=	-1.el6
 PORTREVISION=	4
 CATEGORIES=	audio linux
 PKGNAMESUFFIX=	-pulseaudio
@@ -16,7 +17,6 @@ LICENSE=	GPLv3
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
 LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
-RPMVERSION=	1.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	alsalib pulseaudio-libs

Modified: head/audio/linux-c6-alsa-utils/Makefile
==============================================================================
--- head/audio/linux-c6-alsa-utils/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c6-alsa-utils/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	alsa-utils
 PORTVERSION=	1.1.0
+DISTVERSIONSUFFIX=	-10.el6
 PORTREVISION=	4
 CATEGORIES=	audio linux
 
@@ -12,7 +13,6 @@ COMMENT=	Advanced Linux Sound Architecture utilities (
 LICENSE=	GPLv3
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	10.el6
 USES=		linux:c6
 USE_LINUX=	alsalib alsa-plugins-oss
 USE_LINUX_RPM=	nolib

Modified: head/audio/linux-c6-flac/Makefile
==============================================================================
--- head/audio/linux-c6-flac/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c6-flac/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	flac
 PORTVERSION=	1.2.1
+DISTVERSIONSUFFIX=	-7.el6_6
 PORTREVISION=	4
 CATEGORIES=	audio linux
 
@@ -10,7 +11,6 @@ MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Free lossless audio codec (Linux CentOS ${LINUX_DIST_VER})
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	7.el6_6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	libogg

Modified: head/audio/linux-c6-libaudiofile/Makefile
==============================================================================
--- head/audio/linux-c6-libaudiofile/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c6-libaudiofile/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	audiofile
 PORTVERSION=	0.2.6
+DISTVERSIONSUFFIX=	-11.1.el6
 PORTREVISION=	3
 CATEGORIES=	audio linux
 
@@ -10,7 +11,6 @@ MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Implementation of the Audio File Library from SGI (Linux CentOS ${LINUX_DIST_VER})
 
 DESCR=		${.CURDIR}/../lib${PORTNAME}/pkg-descr
-RPMVERSION=	11.1.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/audio/linux-c6-libogg/Makefile
==============================================================================
--- head/audio/linux-c6-libogg/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c6-libogg/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libogg
 PORTVERSION=	1.1.4
+DISTVERSIONSUFFIX=	-2.1.el6
 PORTREVISION=	3
 CATEGORIES=	audio linux
 
@@ -10,7 +11,6 @@ MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Ogg bitstream library (Linux CentOS ${LINUX_DIST_VER})
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	2.1.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/audio/linux-c6-libsndfile/Makefile
==============================================================================
--- head/audio/linux-c6-libsndfile/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c6-libsndfile/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libsndfile
 PORTVERSION=	1.0.20
+DISTVERSIONSUFFIX=	-5.el6
 PORTREVISION=	4
 CATEGORIES=	audio linux
 
@@ -10,7 +11,6 @@ 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
-RPMVERSION=	5.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	flac libogg libvorbis

Modified: head/audio/linux-c6-libvorbis/Makefile
==============================================================================
--- head/audio/linux-c6-libvorbis/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c6-libvorbis/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libvorbis
 PORTVERSION=	1.2.3
+DISTVERSIONSUFFIX=	-5.el6_9.1
 PORTREVISION=	4
 CATEGORIES=	audio linux
 
@@ -10,7 +11,6 @@ MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Audio compression codec library (Linux CentOS ${LINUX_DIST_VER})
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	5.el6_9.1
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	libogg

Modified: head/audio/linux-c6-mikmod/Makefile
==============================================================================
--- head/audio/linux-c6-mikmod/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c6-mikmod/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libmikmod
 PORTVERSION=	3.2.0
+DISTVERSIONSUFFIX=	-10.beta2.el6
 PORTREVISION=	4
 CATEGORIES=	audio linux
 MASTER_SITES=	EPEL/l
@@ -11,7 +12,6 @@ MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	MikMod Sound Library (Linux CentOS ${LINUX_DIST_VER})
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	10.beta2.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/audio/linux-c6-nas-libs/Makefile
==============================================================================
--- head/audio/linux-c6-nas-libs/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c6-nas-libs/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	nas
 PORTVERSION=	1.9.1
+DISTVERSIONSUFFIX=	-7.el6
 PORTREVISION=	3
 CATEGORIES=	audio linux
 MASTER_SITES=	EPEL/n
@@ -11,7 +12,6 @@ MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Network Audio System (Linux CentOS ${LINUX_DIST_VER})
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	7.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	xorglibs

Modified: head/audio/linux-c6-openal-soft/Makefile
==============================================================================
--- head/audio/linux-c6-openal-soft/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c6-openal-soft/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	openal-soft
 PORTVERSION=	1.12.854
+DISTVERSIONSUFFIX=	-1.el6
 PORTREVISION=	5
 CATEGORIES=	audio linux
 MASTER_SITES=	EPEL/o
@@ -11,7 +12,6 @@ MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	3D positional spatialized sound library (Linux CentOS ${LINUX_DIST_VER})
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	1.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	alsalib

Modified: head/audio/linux-c6-pulseaudio-libs/Makefile
==============================================================================
--- head/audio/linux-c6-pulseaudio-libs/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c6-pulseaudio-libs/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	pulseaudio
 PORTVERSION=	0.9.21
+DISTVERSIONSUFFIX=	-26.el6
 PORTREVISION=	7
 CATEGORIES=	audio linux
 PKGNAMESUFFIX=	-libs
@@ -15,7 +16,6 @@ COMMENT=	Libraries for PulseAudio clients (Linux CentO
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
 LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
-RPMVERSION=	26.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	dbuslibs libasyncns libsndfile tcp_wrappers-libs xorglibs

Modified: head/audio/linux-c6-pulseaudio-utils/Makefile
==============================================================================
--- head/audio/linux-c6-pulseaudio-utils/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c6-pulseaudio-utils/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	pulseaudio
 PORTVERSION=	0.9.21
+DISTVERSIONSUFFIX=	-26.el6
 PORTREVISION=	6
 CATEGORIES=	audio linux
 PKGNAMESUFFIX=	-utils
@@ -13,7 +14,6 @@ COMMENT=	Utils for PulseAudio clients (Linux CentOS ${
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
-RPMVERSION=	26.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	xorglibs pulseaudio-libs

Modified: head/audio/linux-c6-sdl_mixer/Makefile
==============================================================================
--- head/audio/linux-c6-sdl_mixer/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c6-sdl_mixer/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	sdl_mixer
 PORTVERSION=	1.2.12
+DISTVERSIONSUFFIX=	-1.el6
 PORTREVISION=	5
 CATEGORIES=	audio linux
 MASTER_SITES=	EPEL/s
@@ -16,7 +17,6 @@ CONFLICTS=	linux-sdl_mixer-[0-9]* linux-f8-sdl_mixer-[
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
 LINUXNAME=	SDL_mixer
-RPMVERSION=	1.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	sdl12

Modified: head/audio/linux-c7-alsa-lib/Makefile
==============================================================================
--- head/audio/linux-c7-alsa-lib/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c7-alsa-lib/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	alsa-lib
 PORTVERSION=	1.1.6
+DISTVERSIONSUFFIX=	-2.el7
 CATEGORIES=	audio linux
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -14,7 +15,6 @@ RUN_DEPENDS=	alsa-lib>0:audio/alsa-lib
 
 CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
-RPMVERSION=	2.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/audio/linux-c7-alsa-plugins-oss/Makefile
==============================================================================
--- head/audio/linux-c7-alsa-plugins-oss/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c7-alsa-plugins-oss/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	alsa-plugins
 PORTVERSION=	1.1.6
+DISTVERSIONSUFFIX=	-1.el7
 CATEGORIES=	audio linux
 PKGNAMESUFFIX=	-oss
 LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
@@ -17,7 +18,6 @@ CONFLICTS=	linux-c6-${LINUXNAME}-[0-9]*
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
 LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
-RPMVERSION=	1.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	alsalib

Modified: head/audio/linux-c7-alsa-plugins-pulseaudio/Makefile
==============================================================================
--- head/audio/linux-c7-alsa-plugins-pulseaudio/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c7-alsa-plugins-pulseaudio/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	alsa-plugins
 PORTVERSION=	1.1.6
+DISTVERSIONSUFFIX=	-1.el7
 CATEGORIES=	audio linux
 PKGNAMESUFFIX=	-pulseaudio
 LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
@@ -17,7 +18,6 @@ CONFLICTS=	linux-c6-${LINUXNAME}-[0-9]*
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
 LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
-RPMVERSION=	1.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	alsalib pulseaudio-libs

Modified: head/audio/linux-c7-alsa-utils/Makefile
==============================================================================
--- head/audio/linux-c7-alsa-utils/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c7-alsa-utils/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	alsa-utils
 PORTVERSION=	1.1.6
+DISTVERSIONSUFFIX=	-1.el7
 CATEGORIES=	audio linux
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -13,7 +14,6 @@ LICENSE=	GPLv3
 CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	1.el7
 USES=		linux:c7
 USE_LINUX=	alsalib alsa-plugins-oss
 USE_LINUX_RPM=	nolib

Modified: head/audio/linux-c7-audiofile/Makefile
==============================================================================
--- head/audio/linux-c7-audiofile/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c7-audiofile/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	audiofile
 PORTVERSION=	0.3.6
+DISTVERSIONSUFFIX=	-4.el7
 PORTREVISION=	1
 CATEGORIES=	audio linux
 
@@ -12,7 +13,6 @@ COMMENT=	Implementation of the Audio File Library (Lin
 CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
 DESCR=		${.CURDIR}/../lib${PORTNAME}/pkg-descr
-RPMVERSION=	4.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/audio/linux-c7-flac/Makefile
==============================================================================
--- head/audio/linux-c7-flac/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c7-flac/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	flac
 PORTVERSION=	1.3.0
+DISTVERSIONSUFFIX=	-5.el7_1
 PORTREVISION=	2
 CATEGORIES=	audio linux
 PKGNAMESUFFIX=	-libs
@@ -16,7 +17,6 @@ CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
 LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
-RPMVERSION=	5.el7_1
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	libogg

Modified: head/audio/linux-c7-libogg/Makefile
==============================================================================
--- head/audio/linux-c7-libogg/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c7-libogg/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libogg
 PORTVERSION=	1.3.0
+DISTVERSIONSUFFIX=	-7.el7
 PORTREVISION=	1
 CATEGORIES=	audio linux
 
@@ -12,7 +13,6 @@ COMMENT=	Ogg bitstream library (Linux CentOS ${LINUX_D
 CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	7.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/audio/linux-c7-libsndfile/Makefile
==============================================================================
--- head/audio/linux-c7-libsndfile/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c7-libsndfile/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libsndfile
 PORTVERSION=	1.0.25
+DISTVERSIONSUFFIX=	-10.el7
 PORTREVISION=	3
 CATEGORIES=	audio linux
 
@@ -12,7 +13,6 @@ COMMENT=	Reading and writing files containing sampled 
 CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	10.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	flac libogg libvorbis

Modified: head/audio/linux-c7-libvorbis/Makefile
==============================================================================
--- head/audio/linux-c7-libvorbis/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c7-libvorbis/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libvorbis
 PORTVERSION=	1.3.3
+DISTVERSIONSUFFIX=	-8.el7.1
 PORTREVISION=	2
 CATEGORIES=	audio linux
 
@@ -12,7 +13,6 @@ COMMENT=	Audio compression codec library (Linux CentOS
 CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	8.el7.1
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	libogg

Modified: head/audio/linux-c7-openal-soft/Makefile
==============================================================================
--- head/audio/linux-c7-openal-soft/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c7-openal-soft/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	openal-soft
 PORTVERSION=	1.16.0
+DISTVERSIONSUFFIX=	-3.el7
 PORTREVISION=	2
 CATEGORIES=	audio linux
 MASTER_SITES=	EPEL7/o
@@ -14,7 +15,6 @@ CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 ONLY_FOR_ARCHS=	amd64
-RPMVERSION=	3.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	alsalib

Modified: head/audio/linux-c7-pulseaudio-libs/Makefile
==============================================================================
--- head/audio/linux-c7-pulseaudio-libs/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c7-pulseaudio-libs/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	pulseaudio
 PORTVERSION=	10.0
+DISTVERSIONSUFFIX=	-5.el7
 PORTREVISION=	1
 CATEGORIES=	audio linux
 PKGNAMESUFFIX=	-libs
@@ -17,7 +18,6 @@ CONFLICTS=	linux-c6-${LINUXNAME}-[0-9]*
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
 LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
-RPMVERSION=	5.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	dbuslibs libasyncns libsndfile tcp_wrappers-libs xorglibs

Modified: head/audio/linux-c7-pulseaudio-utils/Makefile
==============================================================================
--- head/audio/linux-c7-pulseaudio-utils/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c7-pulseaudio-utils/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	pulseaudio
 PORTVERSION=	10.0
+DISTVERSIONSUFFIX=	-5.el7
 PORTREVISION=	1
 CATEGORIES=	audio linux
 PKGNAMESUFFIX=	-utils
@@ -15,7 +16,6 @@ CONFLICTS=	linux-c6-${LINUXNAME}-[0-9]*
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
-RPMVERSION=	5.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	xorglibs pulseaudio-libs

Modified: head/audio/linux-c7-sdl_mixer/Makefile
==============================================================================
--- head/audio/linux-c7-sdl_mixer/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/audio/linux-c7-sdl_mixer/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	sdl_mixer
 PORTVERSION=	1.2.12
+DISTVERSIONSUFFIX=	-4.el7
 PORTREVISION=	1
 CATEGORIES=	audio linux
 MASTER_SITES=	EPEL7/s
@@ -17,7 +18,6 @@ DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
 LINUXNAME=	SDL_mixer
 ONLY_FOR_ARCHS=	amd64
-RPMVERSION=	4.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	sdl12

Modified: head/converters/linux-c7-fribidi/Makefile
==============================================================================
--- head/converters/linux-c7-fribidi/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/converters/linux-c7-fribidi/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -2,13 +2,13 @@
 
 PORTNAME=	fribidi
 PORTVERSION=	1.0.2
+DISTVERSIONSUFFIX=	-1.el7
 CATEGORIES=	converters linux
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Unicode Bidirectional Algorithm (Linux CentOS ${LINUX_DIST_VER})
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	1.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/databases/linux-c6-sqlite3/Makefile
==============================================================================
--- head/databases/linux-c6-sqlite3/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/databases/linux-c6-sqlite3/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	sqlite
 PORTVERSION=	3.6.20
+DISTVERSIONSUFFIX=	-1.el6_7.2
 PORTREVISION=	4
 CATEGORIES=	databases linux
 
@@ -10,7 +11,6 @@ MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Library that implements an embeddable SQL database engine (Linux CentOS ${LINUX_DIST_VER})
 
 DESCR=		${.CURDIR}/../${PORTNAME}3/pkg-descr
-RPMVERSION=	1.el6_7.2
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/databases/linux-c7-sqlite3/Makefile
==============================================================================
--- head/databases/linux-c7-sqlite3/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/databases/linux-c7-sqlite3/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	sqlite
 PORTVERSION=	3.7.17
+DISTVERSIONSUFFIX=	-8.el7
 PORTREVISION=	1
 CATEGORIES=	databases linux
 
@@ -14,7 +15,6 @@ LICENSE=	PD
 CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
 DESCR=		${.CURDIR}/../${PORTNAME}3/pkg-descr
-RPMVERSION=	8.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/devel/linux-c6-dbus-glib/Makefile
==============================================================================
--- head/devel/linux-c6-dbus-glib/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c6-dbus-glib/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	dbus-glib
 PORTVERSION=	0.86
+DISTVERSIONSUFFIX=	-6.el6
 PORTREVISION=	4
 CATEGORIES=	devel linux
 
@@ -10,7 +11,6 @@ MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	GLib bindings for D-Bus (Linux CentOS ${LINUX_DIST_VER})
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	6.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	dbuslibs expat

Modified: head/devel/linux-c6-dbus-libs/Makefile
==============================================================================
--- head/devel/linux-c6-dbus-libs/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c6-dbus-libs/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	dbus
 PORTVERSION=	1.2.24
+DISTVERSIONSUFFIX=	-9.el6
 PORTREVISION=	7
 CATEGORIES=	devel linux
 PKGNAMESUFFIX=	-libs
@@ -13,7 +14,6 @@ COMMENT=	Libraries for accessing D-BUS (Linux CentOS $
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
-RPMVERSION=	9.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/devel/linux-c6-icu/Makefile
==============================================================================
--- head/devel/linux-c6-icu/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c6-icu/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	icu
 PORTVERSION=	4.2.1
+DISTVERSIONSUFFIX=	-14.el6
 CATEGORIES=	devel linux
 LIB_DISTNAMES=	lib${PORTNAME}-${DISTVERSIONFULL}
 
@@ -10,7 +11,6 @@ MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	International Components for Unicode (Linux CentOS ${LINUX_DIST_VER})
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	14.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/devel/linux-c6-libelf/Makefile
==============================================================================
--- head/devel/linux-c6-libelf/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c6-libelf/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -2,6 +2,7 @@
 
 PORTNAME=	elfutils
 PORTVERSION=	0.164
+DISTVERSIONSUFFIX=	-2.el6
 PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-libelf
@@ -12,7 +13,6 @@ COMMENT=	ELF file handling library (CentOS ${LINUX_DIS
 
 DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
 LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
-RPMVERSION=	2.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/devel/linux-c6-libgfortran/Makefile
==============================================================================
--- head/devel/linux-c6-libgfortran/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c6-libgfortran/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libgfortran
 PORTVERSION=	4.4.7
+DISTVERSIONSUFFIX=	-23.el6
 PORTREVISION=	7
 CATEGORIES=	devel linux
 SRC_DISTFILES=	gcc-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE
@@ -9,7 +10,6 @@ SRC_DISTFILES=	gcc-${DISTVERSIONFULL}${SRC_SUFX}:SOURC
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Runtime libraries for gfortran (Linux Centos ${LINUX_DIST_VER})
 
-RPMVERSION=	23.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/devel/linux-c6-libglade2/Makefile
==============================================================================
--- head/devel/linux-c6-libglade2/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c6-libglade2/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libglade2
 PORTVERSION=	2.6.4
+DISTVERSIONSUFFIX=	-3.1.el6
 PORTREVISION=	4
 CATEGORIES=	devel linux
 
@@ -10,7 +11,6 @@ MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	GNOME glade library (Linux CentOS ${LINUX_DIST_VER})
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	3.1.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/devel/linux-c6-libpciaccess/Makefile
==============================================================================
--- head/devel/linux-c6-libpciaccess/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c6-libpciaccess/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libpciaccess
 PORTVERSION=	0.13.4
+DISTVERSIONSUFFIX=	-1.el6
 PORTREVISION=	2
 CATEGORIES=	devel
 
@@ -10,7 +11,6 @@ MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Generic PCI access library (CentOS ${LINUX_DIST_VER})
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	1.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/devel/linux-c6-libsigc++20/Makefile
==============================================================================
--- head/devel/linux-c6-libsigc++20/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c6-libsigc++20/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libsigc++20
 PORTVERSION=	2.2.4.2
+DISTVERSIONSUFFIX=	-1.el6
 PORTREVISION=	2
 CATEGORIES=	devel linux
 
@@ -10,7 +11,6 @@ MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Callback Framework for C++ (Linux CentOS ${LINUX_DIST_VER})
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	1.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/devel/linux-c6-libsoup/Makefile
==============================================================================
--- head/devel/linux-c6-libsoup/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c6-libsoup/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -2,13 +2,13 @@
 
 PORTNAME=	libsoup
 PORTVERSION=	2.34.3
+DISTVERSIONSUFFIX=	-5.el6
 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
-RPMVERSION=	5.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/devel/linux-c6-libthai/Makefile
==============================================================================
--- head/devel/linux-c6-libthai/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c6-libthai/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libthai
 PORTVERSION=	0.1.12
+DISTVERSIONSUFFIX=	-3.el6
 PORTREVISION=	1
 CATEGORIES=	devel linux
 
@@ -9,7 +10,6 @@ MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Thai language support library (Linux CentOS ${LINUX_DIST_VER})
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	3.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/devel/linux-c6-libunwind/Makefile
==============================================================================
--- head/devel/linux-c6-libunwind/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c6-libunwind/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libunwind
 PORTVERSION=	1.1
+DISTVERSIONSUFFIX=	-3.el6
 CATEGORIES=	devel linux
 MASTER_SITES=	EPEL/l
 
@@ -10,7 +11,6 @@ MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Generic stack unwinding library (Linux CentOS ${LINUX_DIST_VER})
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	3.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/devel/linux-c6-nspr/Makefile
==============================================================================
--- head/devel/linux-c6-nspr/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c6-nspr/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,13 +3,13 @@
 
 PORTNAME=	nspr
 PORTVERSION=	4.19.0
+DISTVERSIONSUFFIX=	-1.el6
 CATEGORIES=	devel linux
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Netscape Portable Runtime (Linux CentOS ${LINUX_DIST_VER})
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	1.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/devel/linux-c6-qt47/Makefile
==============================================================================
--- head/devel/linux-c6-qt47/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c6-qt47/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	qt47
 PORTVERSION=	4.7.2
+DISTVERSIONSUFFIX=	-1_18.el6
 PORTREVISION=	4
 CATEGORIES=	devel linux
 MASTER_SITES=	LOCAL/tijl/atrpms:amd64,i386
@@ -12,7 +13,6 @@ DIST_SUBDIR=	atrpms
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Cross-platform application and UI framework (Linux CentOS ${LINUX_DIST_VER})
 
-RPMVERSION=	1_18.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	fontconfig png dbuslibs sqlite3 openssl

Modified: head/devel/linux-c6-sdl12/Makefile
==============================================================================
--- head/devel/linux-c6-sdl12/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c6-sdl12/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	sdl
 PORTVERSION=	1.2.14
+DISTVERSIONSUFFIX=	-7.el6_7.1
 PORTREVISION=	4
 CATEGORIES=	devel linux
 DISTNAME=	${LINUXNAME}-${DISTVERSIONFULL}
@@ -13,7 +14,6 @@ COMMENT=	Cross-platform multi-media development API (L
 DESCR=		${.CURDIR}/../${PORTNAME}12/pkg-descr
 DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
 LINUXNAME=	SDL
-RPMVERSION=	7.el6_7.1
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	xorglibs

Modified: head/devel/linux-c7-dbus-glib/Makefile
==============================================================================
--- head/devel/linux-c7-dbus-glib/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c7-dbus-glib/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	dbus-glib
 PORTVERSION=	0.100
+DISTVERSIONSUFFIX=	-7.el7
 PORTREVISION=	1
 CATEGORIES=	devel linux
 
@@ -12,7 +13,6 @@ COMMENT=	GLib bindings for D-Bus (Linux CentOS ${LINUX
 CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	7.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	dbuslibs expat

Modified: head/devel/linux-c7-dbus-libs/Makefile
==============================================================================
--- head/devel/linux-c7-dbus-libs/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c7-dbus-libs/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	dbus
 PORTVERSION=	1.10.24
+DISTVERSIONSUFFIX=	-13.el7_6
 CATEGORIES=	devel linux
 PKGNAMESUFFIX=	-libs
 LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
@@ -17,7 +18,6 @@ CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
 LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
-RPMVERSION=	13.el7_6
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/devel/linux-c7-icu/Makefile
==============================================================================
--- head/devel/linux-c7-icu/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c7-icu/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	icu
 PORTVERSION=	50.1.2
+DISTVERSIONSUFFIX=	-17.el7
 PORTREVISION=	1
 CATEGORIES=	devel linux
 LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
@@ -13,7 +14,6 @@ COMMENT=	International Components for Unicode (Linux C
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
 LINUXNAME=	lib${PORTNAME}
-RPMVERSION=	17.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/devel/linux-c7-libelf/Makefile
==============================================================================
--- head/devel/linux-c7-libelf/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c7-libelf/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -2,6 +2,7 @@
 
 PORTNAME=	elfutils
 PORTVERSION=	0.172
+DISTVERSIONSUFFIX=	-2.el7
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-libelf
 LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
@@ -10,7 +11,6 @@ MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	ELF file handling library (CentOS ${LINUX_DIST_VER})
 
 LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
-RPMVERSION=	2.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/devel/linux-c7-libgfortran/Makefile
==============================================================================
--- head/devel/linux-c7-libgfortran/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c7-libgfortran/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libgfortran
 PORTVERSION=	4.8.5
+DISTVERSIONSUFFIX=	-36.el7_6.2
 PORTREVISION=	4
 CATEGORIES=	devel linux
 SRC_DISTFILES=	gcc-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE
@@ -12,7 +13,6 @@ COMMENT=	Runtime libraries for gfortran (Linux Centos 
 
 CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
-RPMVERSION=	36.el7_6.2
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/devel/linux-c7-libglade2/Makefile
==============================================================================
--- head/devel/linux-c7-libglade2/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c7-libglade2/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libglade2
 PORTVERSION=	2.6.4
+DISTVERSIONSUFFIX=	-11.el7
 PORTREVISION=	1
 CATEGORIES=	devel linux
 
@@ -15,7 +16,6 @@ LICENSE_FILE=	${WRKSRC}/usr/share/doc/${PORTNAME}-${PO
 CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	11.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/devel/linux-c7-libpciaccess/Makefile
==============================================================================
--- head/devel/linux-c7-libpciaccess/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c7-libpciaccess/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libpciaccess
 PORTVERSION=	0.14
+DISTVERSIONSUFFIX=	-1.el7
 CATEGORIES=	devel
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -11,7 +12,6 @@ COMMENT=	Generic PCI access library (CentOS ${LINUX_DI
 CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	1.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/devel/linux-c7-libsigc++20/Makefile
==============================================================================
--- head/devel/linux-c7-libsigc++20/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c7-libsigc++20/Makefile	Sat Jun  8 13:13:29 2019	(r503726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libsigc++20
 PORTVERSION=	2.10.0
+DISTVERSIONSUFFIX=	-1.el7
 CATEGORIES=	devel linux
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -11,7 +12,6 @@ COMMENT=	Callback Framework for C++ (Linux CentOS ${LI
 CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	1.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes

Modified: head/devel/linux-c7-libthai/Makefile
==============================================================================
--- head/devel/linux-c7-libthai/Makefile	Sat Jun  8 13:11:08 2019	(r503725)
+++ head/devel/linux-c7-libthai/Makefile	Sat Jun  8 13:13:29 2019	(r503726)

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



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