diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2019-06-08 13:13:29 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2019-06-08 13:13:29 +0000 |
| commit | 5b721b6172f0b02b0d3421aa9e919fb500e789dc (patch) | |
| tree | a63245c54661cd01fbdf5617c8baaf5d49aa12c6 | |
| parent | 993f024255eacf1896ff8dfc00fd3e333097b5f8 (diff) | |
| download | ports-5b721b6172f0b02b0d3421aa9e919fb500e789dc.tar.gz ports-5b721b6172f0b02b0d3421aa9e919fb500e789dc.zip | |
Eliminate RPMVERSION from Linux ports and set DISTVERSIONSUFFIX instead.
This puts all version information together in the port Makefiles.
Notes
Notes:
svn path=/head/; revision=503726
156 files changed, 159 insertions, 160 deletions
diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk index d1a35ba25e9f..b801f1cff9ee 100644 --- a/Mk/Uses/linux.mk +++ b/Mk/Uses/linux.mk @@ -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} diff --git a/accessibility/linux-c6-atk/Makefile b/accessibility/linux-c6-atk/Makefile index 08ac6940dddd..fa95cf2501a9 100644 --- a/accessibility/linux-c6-atk/Makefile +++ b/accessibility/linux-c6-atk/Makefile @@ -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_DIST_VER}) LICENSE= GPLv3 DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 1.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/accessibility/linux-c7-atk/Makefile b/accessibility/linux-c7-atk/Makefile index e24b16a7cf13..d7abdee1c715 100644 --- a/accessibility/linux-c7-atk/Makefile +++ b/accessibility/linux-c7-atk/Makefile @@ -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 diff --git a/audio/linux-c6-alsa-lib/Makefile b/audio/linux-c6-alsa-lib/Makefile index adcb016438e9..33c76acd9a6b 100644 --- a/audio/linux-c6-alsa-lib/Makefile +++ b/audio/linux-c6-alsa-lib/Makefile @@ -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 diff --git a/audio/linux-c6-alsa-plugins-oss/Makefile b/audio/linux-c6-alsa-plugins-oss/Makefile index 1ceddb3494fc..1ee47037ea86 100644 --- a/audio/linux-c6-alsa-plugins-oss/Makefile +++ b/audio/linux-c6-alsa-plugins-oss/Makefile @@ -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 diff --git a/audio/linux-c6-alsa-plugins-pulseaudio/Makefile b/audio/linux-c6-alsa-plugins-pulseaudio/Makefile index 4fa370f2984d..8bd0db6260f7 100644 --- a/audio/linux-c6-alsa-plugins-pulseaudio/Makefile +++ b/audio/linux-c6-alsa-plugins-pulseaudio/Makefile @@ -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 diff --git a/audio/linux-c6-alsa-utils/Makefile b/audio/linux-c6-alsa-utils/Makefile index 0affffdc5f3f..a7a8b1430c5b 100644 --- a/audio/linux-c6-alsa-utils/Makefile +++ b/audio/linux-c6-alsa-utils/Makefile @@ -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 (Linux CentOS ${LINUX_DIST_ LICENSE= GPLv3 DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 10.el6 USES= linux:c6 USE_LINUX= alsalib alsa-plugins-oss USE_LINUX_RPM= nolib diff --git a/audio/linux-c6-flac/Makefile b/audio/linux-c6-flac/Makefile index 4b67af88c942..2ddae476cd05 100644 --- a/audio/linux-c6-flac/Makefile +++ b/audio/linux-c6-flac/Makefile @@ -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 diff --git a/audio/linux-c6-libaudiofile/Makefile b/audio/linux-c6-libaudiofile/Makefile index 9957afef2d7b..68d5a2bac28a 100644 --- a/audio/linux-c6-libaudiofile/Makefile +++ b/audio/linux-c6-libaudiofile/Makefile @@ -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 diff --git a/audio/linux-c6-libogg/Makefile b/audio/linux-c6-libogg/Makefile index cecb54c3bbb7..3e64602dadd5 100644 --- a/audio/linux-c6-libogg/Makefile +++ b/audio/linux-c6-libogg/Makefile @@ -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 diff --git a/audio/linux-c6-libsndfile/Makefile b/audio/linux-c6-libsndfile/Makefile index 9de8f8c01e36..f40c1124deb5 100644 --- a/audio/linux-c6-libsndfile/Makefile +++ b/audio/linux-c6-libsndfile/Makefile @@ -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 diff --git a/audio/linux-c6-libvorbis/Makefile b/audio/linux-c6-libvorbis/Makefile index d0e9ab09d3ef..b121cad47578 100644 --- a/audio/linux-c6-libvorbis/Makefile +++ b/audio/linux-c6-libvorbis/Makefile @@ -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 diff --git a/audio/linux-c6-mikmod/Makefile b/audio/linux-c6-mikmod/Makefile index 2527d3eaec6a..22db21e70a72 100644 --- a/audio/linux-c6-mikmod/Makefile +++ b/audio/linux-c6-mikmod/Makefile @@ -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 diff --git a/audio/linux-c6-nas-libs/Makefile b/audio/linux-c6-nas-libs/Makefile index f0e5ed549b23..da63865b9a9d 100644 --- a/audio/linux-c6-nas-libs/Makefile +++ b/audio/linux-c6-nas-libs/Makefile @@ -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 diff --git a/audio/linux-c6-openal-soft/Makefile b/audio/linux-c6-openal-soft/Makefile index 44cc9bcb52cb..d597161ec950 100644 --- a/audio/linux-c6-openal-soft/Makefile +++ b/audio/linux-c6-openal-soft/Makefile @@ -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 diff --git a/audio/linux-c6-pulseaudio-libs/Makefile b/audio/linux-c6-pulseaudio-libs/Makefile index 90040ed8f77b..bf6bd8a3a0e2 100644 --- a/audio/linux-c6-pulseaudio-libs/Makefile +++ b/audio/linux-c6-pulseaudio-libs/Makefile @@ -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 CentOS ${LINUX_DIST_VER}) 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 diff --git a/audio/linux-c6-pulseaudio-utils/Makefile b/audio/linux-c6-pulseaudio-utils/Makefile index 66431e506651..8f3a4e849819 100644 --- a/audio/linux-c6-pulseaudio-utils/Makefile +++ b/audio/linux-c6-pulseaudio-utils/Makefile @@ -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 ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX} -RPMVERSION= 26.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= xorglibs pulseaudio-libs diff --git a/audio/linux-c6-sdl_mixer/Makefile b/audio/linux-c6-sdl_mixer/Makefile index 83ae1aace078..4905e9ebcb3e 100644 --- a/audio/linux-c6-sdl_mixer/Makefile +++ b/audio/linux-c6-sdl_mixer/Makefile @@ -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-[0-9]* 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 diff --git a/audio/linux-c7-alsa-lib/Makefile b/audio/linux-c7-alsa-lib/Makefile index a983c29feb5e..786ae19f8a9c 100644 --- a/audio/linux-c7-alsa-lib/Makefile +++ b/audio/linux-c7-alsa-lib/Makefile @@ -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 diff --git a/audio/linux-c7-alsa-plugins-oss/Makefile b/audio/linux-c7-alsa-plugins-oss/Makefile index 9bc8284630a6..455cf70707e2 100644 --- a/audio/linux-c7-alsa-plugins-oss/Makefile +++ b/audio/linux-c7-alsa-plugins-oss/Makefile @@ -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 diff --git a/audio/linux-c7-alsa-plugins-pulseaudio/Makefile b/audio/linux-c7-alsa-plugins-pulseaudio/Makefile index c625f8ba0c66..9c139b505252 100644 --- a/audio/linux-c7-alsa-plugins-pulseaudio/Makefile +++ b/audio/linux-c7-alsa-plugins-pulseaudio/Makefile @@ -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 diff --git a/audio/linux-c7-alsa-utils/Makefile b/audio/linux-c7-alsa-utils/Makefile index 9ab2cd46c478..1742dd4ac82d 100644 --- a/audio/linux-c7-alsa-utils/Makefile +++ b/audio/linux-c7-alsa-utils/Makefile @@ -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 diff --git a/audio/linux-c7-audiofile/Makefile b/audio/linux-c7-audiofile/Makefile index 63e9cf95bc31..f29fe9f9308e 100644 --- a/audio/linux-c7-audiofile/Makefile +++ b/audio/linux-c7-audiofile/Makefile @@ -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 (Linux CentOS ${LINUX_DIST_VER 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 diff --git a/audio/linux-c7-flac/Makefile b/audio/linux-c7-flac/Makefile index 8fdf81cc7b87..58cf7ca730e3 100644 --- a/audio/linux-c7-flac/Makefile +++ b/audio/linux-c7-flac/Makefile @@ -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 diff --git a/audio/linux-c7-libogg/Makefile b/audio/linux-c7-libogg/Makefile index b091aeab1046..9777c124c353 100644 --- a/audio/linux-c7-libogg/Makefile +++ b/audio/linux-c7-libogg/Makefile @@ -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_DIST_VER}) CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 7.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/audio/linux-c7-libsndfile/Makefile b/audio/linux-c7-libsndfile/Makefile index 9ed4d9a91bb5..340eb0ca1e4a 100644 --- a/audio/linux-c7-libsndfile/Makefile +++ b/audio/linux-c7-libsndfile/Makefile @@ -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 sound (like WAV or AIFF) ( 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 diff --git a/audio/linux-c7-libvorbis/Makefile b/audio/linux-c7-libvorbis/Makefile index 7411f652a5fe..af6e8b522573 100644 --- a/audio/linux-c7-libvorbis/Makefile +++ b/audio/linux-c7-libvorbis/Makefile @@ -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 ${LINUX_DIST_VER}) CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 8.el7.1 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= libogg diff --git a/audio/linux-c7-openal-soft/Makefile b/audio/linux-c7-openal-soft/Makefile index c5591e00c8ee..c48a07768292 100644 --- a/audio/linux-c7-openal-soft/Makefile +++ b/audio/linux-c7-openal-soft/Makefile @@ -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 diff --git a/audio/linux-c7-pulseaudio-libs/Makefile b/audio/linux-c7-pulseaudio-libs/Makefile index 248a1fa971d5..f63f7902a2b6 100644 --- a/audio/linux-c7-pulseaudio-libs/Makefile +++ b/audio/linux-c7-pulseaudio-libs/Makefile @@ -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 diff --git a/audio/linux-c7-pulseaudio-utils/Makefile b/audio/linux-c7-pulseaudio-utils/Makefile index d6aa2c06ab9b..88c682c8bbcc 100644 --- a/audio/linux-c7-pulseaudio-utils/Makefile +++ b/audio/linux-c7-pulseaudio-utils/Makefile @@ -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 diff --git a/audio/linux-c7-sdl_mixer/Makefile b/audio/linux-c7-sdl_mixer/Makefile index cc8b02eb5a1b..588910761a44 100644 --- a/audio/linux-c7-sdl_mixer/Makefile +++ b/audio/linux-c7-sdl_mixer/Makefile @@ -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 diff --git a/converters/linux-c7-fribidi/Makefile b/converters/linux-c7-fribidi/Makefile index 7fde960e1a81..65ad5a259de5 100644 --- a/converters/linux-c7-fribidi/Makefile +++ b/converters/linux-c7-fribidi/Makefile @@ -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 diff --git a/databases/linux-c6-sqlite3/Makefile b/databases/linux-c6-sqlite3/Makefile index 03fb7c4cc3eb..ba53d5395fd1 100644 --- a/databases/linux-c6-sqlite3/Makefile +++ b/databases/linux-c6-sqlite3/Makefile @@ -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 diff --git a/databases/linux-c7-sqlite3/Makefile b/databases/linux-c7-sqlite3/Makefile index 6193cb9328b3..68e2ae62afdd 100644 --- a/databases/linux-c7-sqlite3/Makefile +++ b/databases/linux-c7-sqlite3/Makefile @@ -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 diff --git a/devel/linux-c6-dbus-glib/Makefile b/devel/linux-c6-dbus-glib/Makefile index be7babfdbb2b..6ae0e4c56d65 100644 --- a/devel/linux-c6-dbus-glib/Makefile +++ b/devel/linux-c6-dbus-glib/Makefile @@ -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 diff --git a/devel/linux-c6-dbus-libs/Makefile b/devel/linux-c6-dbus-libs/Makefile index a4b844859e29..5fc83b03a1a7 100644 --- a/devel/linux-c6-dbus-libs/Makefile +++ b/devel/linux-c6-dbus-libs/Makefile @@ -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 ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX} -RPMVERSION= 9.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/devel/linux-c6-icu/Makefile b/devel/linux-c6-icu/Makefile index c8c4c2533309..62e5359ad860 100644 --- a/devel/linux-c6-icu/Makefile +++ b/devel/linux-c6-icu/Makefile @@ -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 diff --git a/devel/linux-c6-libelf/Makefile b/devel/linux-c6-libelf/Makefile index 155e812524c1..ac6acee661ab 100644 --- a/devel/linux-c6-libelf/Makefile +++ b/devel/linux-c6-libelf/Makefile @@ -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_DIST_VER}) DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION} LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX} -RPMVERSION= 2.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/devel/linux-c6-libgfortran/Makefile b/devel/linux-c6-libgfortran/Makefile index af54265aea0e..8c7348fdd4b8 100644 --- a/devel/linux-c6-libgfortran/Makefile +++ b/devel/linux-c6-libgfortran/Makefile @@ -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}:SOURCE 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 diff --git a/devel/linux-c6-libglade2/Makefile b/devel/linux-c6-libglade2/Makefile index 6101ef0466b1..e86c876df312 100644 --- a/devel/linux-c6-libglade2/Makefile +++ b/devel/linux-c6-libglade2/Makefile @@ -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 diff --git a/devel/linux-c6-libpciaccess/Makefile b/devel/linux-c6-libpciaccess/Makefile index 5c59b03e06cc..3cd4f1665165 100644 --- a/devel/linux-c6-libpciaccess/Makefile +++ b/devel/linux-c6-libpciaccess/Makefile @@ -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 diff --git a/devel/linux-c6-libsigc++20/Makefile b/devel/linux-c6-libsigc++20/Makefile index 90c880ea2def..5fa3e2a61480 100644 --- a/devel/linux-c6-libsigc++20/Makefile +++ b/devel/linux-c6-libsigc++20/Makefile @@ -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 diff --git a/devel/linux-c6-libsoup/Makefile b/devel/linux-c6-libsoup/Makefile index 8a1a0930c18d..a8d81639b32d 100644 --- a/devel/linux-c6-libsoup/Makefile +++ b/devel/linux-c6-libsoup/Makefile @@ -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 diff --git a/devel/linux-c6-libthai/Makefile b/devel/linux-c6-libthai/Makefile index 4c5f08bce6cd..2e4d410daac2 100644 --- a/devel/linux-c6-libthai/Makefile +++ b/devel/linux-c6-libthai/Makefile @@ -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 diff --git a/devel/linux-c6-libunwind/Makefile b/devel/linux-c6-libunwind/Makefile index e145c2bc20d6..c538347704b9 100644 --- a/devel/linux-c6-libunwind/Makefile +++ b/devel/linux-c6-libunwind/Makefile @@ -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 diff --git a/devel/linux-c6-nspr/Makefile b/devel/linux-c6-nspr/Makefile index ec8ec9c8138d..5fe2914927af 100644 --- a/devel/linux-c6-nspr/Makefile +++ b/devel/linux-c6-nspr/Makefile @@ -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 diff --git a/devel/linux-c6-qt47/Makefile b/devel/linux-c6-qt47/Makefile index 4df1dbbbf009..9e72bf0eebbb 100644 --- a/devel/linux-c6-qt47/Makefile +++ b/devel/linux-c6-qt47/Makefile @@ -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 diff --git a/devel/linux-c6-sdl12/Makefile b/devel/linux-c6-sdl12/Makefile index 03a955758faf..921bc7d91fd1 100644 --- a/devel/linux-c6-sdl12/Makefile +++ b/devel/linux-c6-sdl12/Makefile @@ -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 (Linux CentOS ${LINUX_DIST_V 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 diff --git a/devel/linux-c7-dbus-glib/Makefile b/devel/linux-c7-dbus-glib/Makefile index 49b700ecedc4..fe3b95004d7d 100644 --- a/devel/linux-c7-dbus-glib/Makefile +++ b/devel/linux-c7-dbus-glib/Makefile @@ -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_DIST_VER}) CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 7.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= dbuslibs expat diff --git a/devel/linux-c7-dbus-libs/Makefile b/devel/linux-c7-dbus-libs/Makefile index e031ff007ae7..eedd0e35d3e0 100644 --- a/devel/linux-c7-dbus-libs/Makefile +++ b/devel/linux-c7-dbus-libs/Makefile @@ -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 diff --git a/devel/linux-c7-icu/Makefile b/devel/linux-c7-icu/Makefile index 2ec06cb7ae66..d7b84b45ea59 100644 --- a/devel/linux-c7-icu/Makefile +++ b/devel/linux-c7-icu/Makefile @@ -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 CentOS ${LINUX_DIST_VER}) 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 diff --git a/devel/linux-c7-libelf/Makefile b/devel/linux-c7-libelf/Makefile index 597427e648dd..2a109fb060cd 100644 --- a/devel/linux-c7-libelf/Makefile +++ b/devel/linux-c7-libelf/Makefile @@ -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 diff --git a/devel/linux-c7-libgfortran/Makefile b/devel/linux-c7-libgfortran/Makefile index f7b2fd64f365..776552b57987 100644 --- a/devel/linux-c7-libgfortran/Makefile +++ b/devel/linux-c7-libgfortran/Makefile @@ -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 ${LINUX_DIST_VER}) CONFLICTS= linux-c6-${PORTNAME}-[0-9]* -RPMVERSION= 36.el7_6.2 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/devel/linux-c7-libglade2/Makefile b/devel/linux-c7-libglade2/Makefile index e7a058ac9f5a..d69aa5e98977 100644 --- a/devel/linux-c7-libglade2/Makefile +++ b/devel/linux-c7-libglade2/Makefile @@ -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}-${PORTVERSION}/COPYING CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 11.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/devel/linux-c7-libpciaccess/Makefile b/devel/linux-c7-libpciaccess/Makefile index f7f2cc8ea0bb..d82395921a67 100644 --- a/devel/linux-c7-libpciaccess/Makefile +++ b/devel/linux-c7-libpciaccess/Makefile @@ -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_DIST_VER}) CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 1.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/devel/linux-c7-libsigc++20/Makefile b/devel/linux-c7-libsigc++20/Makefile index 38ad4926b8c0..ef9f94495dac 100644 --- a/devel/linux-c7-libsigc++20/Makefile +++ b/devel/linux-c7-libsigc++20/Makefile @@ -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 ${LINUX_DIST_VER}) CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 1.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/devel/linux-c7-libthai/Makefile b/devel/linux-c7-libthai/Makefile index aa3cdc024df1..1030fcb73fed 100644 --- a/devel/linux-c7-libthai/Makefile +++ b/devel/linux-c7-libthai/Makefile @@ -3,6 +3,7 @@ PORTNAME= libthai PORTVERSION= 0.1.14 +DISTVERSIONSUFFIX= -9.el7 PORTREVISION= 1 CATEGORIES= devel linux @@ -12,7 +13,6 @@ COMMENT= Thai language support library (Linux CentOS ${LINUX_DIST_VER}) CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 9.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/devel/linux-c7-libunwind/Makefile b/devel/linux-c7-libunwind/Makefile index ffa6581b0bff..3276e1042786 100644 --- a/devel/linux-c7-libunwind/Makefile +++ b/devel/linux-c7-libunwind/Makefile @@ -3,13 +3,13 @@ PORTNAME= libunwind PORTVERSION= 1.2 +DISTVERSIONSUFFIX= -2.el7 CATEGORIES= devel linux MAINTAINER= emulation@FreeBSD.org COMMENT= Generic stack unwinding library (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 2.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/devel/linux-c7-nspr/Makefile b/devel/linux-c7-nspr/Makefile index d22118725ad4..95fb36064a6c 100644 --- a/devel/linux-c7-nspr/Makefile +++ b/devel/linux-c7-nspr/Makefile @@ -3,6 +3,7 @@ PORTNAME= nspr PORTVERSION= 4.19.0 +DISTVERSIONSUFFIX= -1.el7_5 CATEGORIES= devel linux MAINTAINER= emulation@FreeBSD.org @@ -11,7 +12,6 @@ COMMENT= Netscape Portable Runtime (Linux CentOS ${LINUX_DIST_VER}) CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 1.el7_5 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/devel/linux-c7-qt/Makefile b/devel/linux-c7-qt/Makefile index bbeafe1aa643..38867e681d1d 100644 --- a/devel/linux-c7-qt/Makefile +++ b/devel/linux-c7-qt/Makefile @@ -3,6 +3,7 @@ PORTNAME= qt PORTVERSION= 4.8.7 +DISTVERSIONSUFFIX= -2.el7 CATEGORIES= devel linux MAINTAINER= emulation@FreeBSD.org @@ -12,7 +13,6 @@ CONFLICTS= linux-c6-${PORTNAME}47-[0-9]* DATADIR= ${PREFIX}/usr/share/${PORTNAME}4 DESCR= ${.CURDIR}/../../devel/linux-c6-qt47/pkg-descr -RPMVERSION= 2.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= fontconfig png dbuslibs sqlite3 openssl diff --git a/devel/linux-c7-sdl12/Makefile b/devel/linux-c7-sdl12/Makefile index 7e1fce8bc450..ac4be294be98 100644 --- a/devel/linux-c7-sdl12/Makefile +++ b/devel/linux-c7-sdl12/Makefile @@ -3,6 +3,7 @@ PORTNAME= sdl PORTVERSION= 1.2.15 +DISTVERSIONSUFFIX= -14.el7 PORTREVISION= 1 CATEGORIES= devel linux DISTNAME= ${LINUXNAME}-${DISTVERSIONFULL} @@ -15,7 +16,6 @@ CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}12/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION} LINUXNAME= SDL -RPMVERSION= 14.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= xorglibs diff --git a/devel/linux-c7-sdl20/Makefile b/devel/linux-c7-sdl20/Makefile index a3df2fae737d..511fc8167b2b 100644 --- a/devel/linux-c7-sdl20/Makefile +++ b/devel/linux-c7-sdl20/Makefile @@ -3,6 +3,7 @@ PORTNAME= sdl20 PORTVERSION= 2.0.9 +DISTVERSIONSUFFIX= -1.el7 CATEGORIES= devel linux MASTER_SITES= EPEL7/s DISTNAME= ${LINUXNAME}-${DISTVERSIONFULL} @@ -14,7 +15,6 @@ DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION} LINUXNAME= SDL2 ONLY_FOR_ARCHS= amd64 -RPMVERSION= 1.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= xorglibs diff --git a/devel/linux-c7-strace/Makefile b/devel/linux-c7-strace/Makefile index 91d7d4013fe6..c56ff9a81c93 100644 --- a/devel/linux-c7-strace/Makefile +++ b/devel/linux-c7-strace/Makefile @@ -2,12 +2,12 @@ PORTNAME= strace PORTVERSION= 4.12 +DISTVERSIONSUFFIX= -4.el7 CATEGORIES= devel MAINTAINER= trasz@FreeBSD.org COMMENT= System call tracer (CentOS ${LINUX_DIST_VER}) -RPMVERSION= 4.el7 USES= linux:c7 USE_LINUX_RPM= yes diff --git a/devel/linux-ltp/Makefile b/devel/linux-ltp/Makefile index b9f192bcaf55..068ebb824659 100644 --- a/devel/linux-ltp/Makefile +++ b/devel/linux-ltp/Makefile @@ -6,6 +6,7 @@ PORTNAME= ltp PORTVERSION= 20190115 +DISTVERSIONSUFFIX= -1.5 CATEGORIES= devel MASTER_SITES= https://download.opensuse.org/repositories/benchmark/%SUBDIR%/:DEFAULT,amd64,SOURCE MASTER_SITE_SUBDIR= openSUSE_Leap_42.3/x86_64/:DEFAULT,amd64 \ @@ -18,7 +19,6 @@ LICENSE= GPLv2+ ONLY_FOR_ARCHS= amd64 -RPMVERSION= 1.5 USES= linux:c7 USE_LINUX_RPM= yes diff --git a/dns/linux-c6-libasyncns/Makefile b/dns/linux-c6-libasyncns/Makefile index 0300692aedc2..a0e3ea8074bf 100644 --- a/dns/linux-c6-libasyncns/Makefile +++ b/dns/linux-c6-libasyncns/Makefile @@ -3,13 +3,13 @@ PORTNAME= libasyncns PORTVERSION= 0.8 +DISTVERSIONSUFFIX= -1.1.el6 PORTREVISION= 3 CATEGORIES= dns devel linux MAINTAINER= emulation@FreeBSD.org COMMENT= C library for executing DNS queries asynchronously (Linux CentOS ${LINUX_DIST_VER}) -RPMVERSION= 1.1.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/dns/linux-c7-libasyncns/Makefile b/dns/linux-c7-libasyncns/Makefile index 59b6362e6d8a..4c5523fdfd21 100644 --- a/dns/linux-c7-libasyncns/Makefile +++ b/dns/linux-c7-libasyncns/Makefile @@ -3,6 +3,7 @@ PORTNAME= libasyncns PORTVERSION= 0.8 +DISTVERSIONSUFFIX= -7.el7 PORTREVISION= 1 CATEGORIES= dns devel linux @@ -13,7 +14,6 @@ LICENSE= LGPL21+ CONFLICTS= linux-c6-${PORTNAME}-[0-9]* -RPMVERSION= 7.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/emulators/linux-power9-functional-sim/Makefile b/emulators/linux-power9-functional-sim/Makefile index 2a199367850b..671a08954700 100644 --- a/emulators/linux-power9-functional-sim/Makefile +++ b/emulators/linux-power9-functional-sim/Makefile @@ -3,6 +3,7 @@ PORTNAME= power9-functional-sim PORTVERSION= 1.1 +DISTVERSIONSUFFIX= -0.el7 CATEGORIES= emulators linux MASTER_SITES= http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/ @@ -23,7 +24,5 @@ USE_LINUX_RPM= nolib BIN_DISTNAMES= systemsim-p9-${DISTVERSION}${DISTVERSIONSUFFIX} SRC_DISTFILES= -LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX} -RPMVERSION= 0.el7 .include <bsd.port.mk> diff --git a/ftp/linux-c6-curl/Makefile b/ftp/linux-c6-curl/Makefile index 1843a06adb00..bf911fd30102 100644 --- a/ftp/linux-c6-curl/Makefile +++ b/ftp/linux-c6-curl/Makefile @@ -3,6 +3,7 @@ PORTNAME= curl PORTVERSION= 7.19.7 +DISTVERSIONSUFFIX= -53.el6_9 PORTREVISION= 9 CATEGORIES= ftp linux LIB_DISTNAMES= lib${DISTNAME} @@ -11,7 +12,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= Command line tool for transferring files with URL syntax (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 53.el6_9 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= libssh2 nspr nss openldap diff --git a/ftp/linux-c7-curl/Makefile b/ftp/linux-c7-curl/Makefile index 0baf5d9ce1b4..d4d9a178aed2 100644 --- a/ftp/linux-c7-curl/Makefile +++ b/ftp/linux-c7-curl/Makefile @@ -3,6 +3,7 @@ PORTNAME= curl PORTVERSION= 7.29.0 +DISTVERSIONSUFFIX= -51.el7 PORTREVISION= 5 CATEGORIES= ftp linux LIB_DISTNAMES= lib${DISTNAME} @@ -15,7 +16,6 @@ LICENSE= MIT CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 51.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= libssh2 nspr nss openldap diff --git a/graphics/linux-c6-cairo/Makefile b/graphics/linux-c6-cairo/Makefile index 079461ff583e..d5a03114bc92 100644 --- a/graphics/linux-c6-cairo/Makefile +++ b/graphics/linux-c6-cairo/Makefile @@ -3,6 +3,7 @@ PORTNAME= cairo PORTVERSION= 1.8.8 +DISTVERSIONSUFFIX= -6.el6_6 PORTREVISION= 8 CATEGORIES= graphics linux @@ -10,7 +11,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= Vector graphics library Cairo (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 6.el6_6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= fontconfig pixman png xorglibs diff --git a/graphics/linux-c6-dri/Makefile b/graphics/linux-c6-dri/Makefile index b99774f77b25..a7d7809ef6c3 100644 --- a/graphics/linux-c6-dri/Makefile +++ b/graphics/linux-c6-dri/Makefile @@ -3,6 +3,7 @@ PORTNAME= dri PORTVERSION= 11.0.7 +DISTVERSIONSUFFIX= -4.el6 PORTREVISION= 5 CATEGORIES= graphics linux LIB_DISTNAMES= mesa-libGL-${DISTVERSIONFULL} \ @@ -19,7 +20,6 @@ SRC_DISTFILES= mesa-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE \ MAINTAINER= emulation@FreeBSD.org COMMENT= Mesa libGL runtime libraries (Linux CentOS ${LINUX_DIST_VER}) -RPMVERSION= 4.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= expat libelf libpciaccess xorglibs diff --git a/graphics/linux-c6-gdk-pixbuf2/Makefile b/graphics/linux-c6-gdk-pixbuf2/Makefile index a5e4c4526c7a..f4d892820e01 100644 --- a/graphics/linux-c6-gdk-pixbuf2/Makefile +++ b/graphics/linux-c6-gdk-pixbuf2/Makefile @@ -3,6 +3,7 @@ PORTNAME= gdk-pixbuf2 PORTVERSION= 2.24.1 +DISTVERSIONSUFFIX= -6.el6_7 PORTREVISION= 5 CATEGORIES= graphics linux @@ -10,7 +11,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= Graphic library for GTK+ (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 6.el6_7 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= jasper jpeg png tiff xorglibs diff --git a/graphics/linux-c6-glx-utils/Makefile b/graphics/linux-c6-glx-utils/Makefile index f27da5dbb05d..d96b8b52be02 100644 --- a/graphics/linux-c6-glx-utils/Makefile +++ b/graphics/linux-c6-glx-utils/Makefile @@ -3,6 +3,7 @@ PORTNAME= glx-utils PORTVERSION= 11.0.7 +DISTVERSIONSUFFIX= -4.el6 PORTREVISION= 3 CATEGORIES= graphics linux SRC_DISTFILES= mesa-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE @@ -10,7 +11,6 @@ SRC_DISTFILES= mesa-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE MAINTAINER= emulation@FreeBSD.org COMMENT= Mesa GLX utilities (Linux CentOS ${LINUX_DIST_VER}) -RPMVERSION= 4.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= dri xorglibs diff --git a/graphics/linux-c6-jasper/Makefile b/graphics/linux-c6-jasper/Makefile index 32e186b3bd1b..7752e990c764 100644 --- a/graphics/linux-c6-jasper/Makefile +++ b/graphics/linux-c6-jasper/Makefile @@ -2,6 +2,7 @@ PORTNAME= jasper PORTVERSION= 1.900.1 +DISTVERSIONSUFFIX= -22.el6 PORTREVISION= 5 CATEGORIES= graphics linux PKGNAMESUFFIX= -libs @@ -12,7 +13,6 @@ COMMENT= JPEG-2000 reference implementation (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX} -RPMVERSION= 22.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= jpeg diff --git a/graphics/linux-c6-jpeg/Makefile b/graphics/linux-c6-jpeg/Makefile index f5341edf84fe..5ce6fb7f50c3 100644 --- a/graphics/linux-c6-jpeg/Makefile +++ b/graphics/linux-c6-jpeg/Makefile @@ -3,6 +3,7 @@ PORTNAME= jpeg PORTVERSION= 1.2.1 +DISTVERSIONSUFFIX= -3.el6_5 PORTREVISION= 3 CATEGORIES= graphics linux DISTNAME= ${LINUXNAME}-${DISTVERSIONFULL} @@ -13,7 +14,6 @@ COMMENT= SIMD-accelerated JPEG codec (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}-turbo/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION} LINUXNAME= libjpeg-turbo -RPMVERSION= 3.el6_5 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/graphics/linux-c6-png/Makefile b/graphics/linux-c6-png/Makefile index 6c5813271a7b..737628dba119 100644 --- a/graphics/linux-c6-png/Makefile +++ b/graphics/linux-c6-png/Makefile @@ -3,6 +3,7 @@ PORTNAME= libpng PORTVERSION= 1.2.49 +DISTVERSIONSUFFIX= -2.el6_7 PORTREVISION= 5 CATEGORIES= graphics linux @@ -10,7 +11,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= Library for manipulating PNG images (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../png/pkg-descr -RPMVERSION= 2.el6_7 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/graphics/linux-c6-sdl_image/Makefile b/graphics/linux-c6-sdl_image/Makefile index 23754012835d..bce72abaa94a 100644 --- a/graphics/linux-c6-sdl_image/Makefile +++ b/graphics/linux-c6-sdl_image/Makefile @@ -3,6 +3,7 @@ PORTNAME= sdl_image PORTVERSION= 1.2.12 +DISTVERSIONSUFFIX= -9.el6 PORTREVISION= 5 CATEGORIES= graphics linux MASTER_SITES= EPEL/s @@ -14,7 +15,6 @@ COMMENT= Simple library to load images as SDL interfaces (Linux CentOS ${LINUX_D DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION} LINUXNAME= SDL_image -RPMVERSION= 9.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= jpeg png sdl12 tiff diff --git a/graphics/linux-c6-sdl_ttf/Makefile b/graphics/linux-c6-sdl_ttf/Makefile index 4a37af16398f..920257831ce0 100644 --- a/graphics/linux-c6-sdl_ttf/Makefile +++ b/graphics/linux-c6-sdl_ttf/Makefile @@ -3,6 +3,7 @@ PORTNAME= sdl_ttf PORTVERSION= 2.0.11 +DISTVERSIONSUFFIX= -6.el6 PORTREVISION= 4 CATEGORIES= graphics linux MASTER_SITES= EPEL/s @@ -14,7 +15,6 @@ COMMENT= Simple library to load True Type Fonts as SDL interfaces (Linux CentOS DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION} LINUXNAME= SDL_ttf -RPMVERSION= 6.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= jpeg png sdl12 tiff diff --git a/graphics/linux-c6-tiff/Makefile b/graphics/linux-c6-tiff/Makefile index dece7e06968d..9fc6520534c8 100644 --- a/graphics/linux-c6-tiff/Makefile +++ b/graphics/linux-c6-tiff/Makefile @@ -3,6 +3,7 @@ PORTNAME= libtiff PORTVERSION= 3.9.4 +DISTVERSIONSUFFIX= -21.el6_8 PORTREVISION= 5 CATEGORIES= graphics linux @@ -12,7 +13,6 @@ COMMENT= Tools and library routines for working with TIFF images (Linux CentOS $ LICENSE= BSD3CLAUSE DESCR= ${.CURDIR}/../tiff/pkg-descr -RPMVERSION= 21.el6_8 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= jpeg diff --git a/graphics/linux-c7-cairo/Makefile b/graphics/linux-c7-cairo/Makefile index 8bac839adb0c..d4ea07a7a115 100644 --- a/graphics/linux-c7-cairo/Makefile +++ b/graphics/linux-c7-cairo/Makefile @@ -3,6 +3,7 @@ PORTNAME= cairo PORTVERSION= 1.15.12 +DISTVERSIONSUFFIX= -3.el7 CATEGORIES= graphics linux MAINTAINER= emulation@FreeBSD.org @@ -11,7 +12,6 @@ COMMENT= Vector graphics library Cairo (Linux CentOS ${LINUX_DIST_VER}) CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 3.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= dri fontconfig pixman png xorglibs diff --git a/graphics/linux-c7-dri/Makefile b/graphics/linux-c7-dri/Makefile index 04786b3064c5..9949033fabae 100644 --- a/graphics/linux-c7-dri/Makefile +++ b/graphics/linux-c7-dri/Makefile @@ -3,6 +3,7 @@ PORTNAME= dri PORTVERSION= 18.0.5 +DISTVERSIONSUFFIX= -4.el7_6 CATEGORIES= graphics linux LIB_DISTNAMES= freeglut-3.0.0-8.el7 \ libdrm-2.4.91-3.el7 \ @@ -32,7 +33,6 @@ COMMENT= Mesa libGL runtime libraries (Linux CentOS ${LINUX_DIST_VER}) CONFLICTS= linux-c6-${PORTNAME}-[0-9]* -RPMVERSION= 4.el7_6 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= expat libelf libglvnd libpciaccess wayland xorglibs diff --git a/graphics/linux-c7-gdk-pixbuf2/Makefile b/graphics/linux-c7-gdk-pixbuf2/Makefile index 83eb7ffcf3a8..fba3dff5f08b 100644 --- a/graphics/linux-c7-gdk-pixbuf2/Makefile +++ b/graphics/linux-c7-gdk-pixbuf2/Makefile @@ -3,6 +3,7 @@ PORTNAME= gdk-pixbuf2 PORTVERSION= 2.36.12 +DISTVERSIONSUFFIX= -3.el7 CATEGORIES= graphics linux MAINTAINER= emulation@FreeBSD.org @@ -11,7 +12,6 @@ COMMENT= Graphic library for GTK+ (Linux CentOS ${LINUX_DIST_VER}) CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 3.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= jasper jpeg png tiff xorglibs diff --git a/graphics/linux-c7-glx-utils/Makefile b/graphics/linux-c7-glx-utils/Makefile index d77eb259a894..2d2cfd62c147 100644 --- a/graphics/linux-c7-glx-utils/Makefile +++ b/graphics/linux-c7-glx-utils/Makefile @@ -3,6 +3,7 @@ PORTNAME= glx-utils PORTVERSION= 8.3.0 +DISTVERSIONSUFFIX= -10.el7 CATEGORIES= graphics linux SRC_DISTFILES= mesa-demos-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE @@ -11,7 +12,6 @@ COMMENT= Mesa GLX utilities (Linux CentOS ${LINUX_DIST_VER}) CONFLICTS= linux-c6-${PORTNAME}-[0-9]* -RPMVERSION= 10.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= dri xorglibs diff --git a/graphics/linux-c7-graphite2/Makefile b/graphics/linux-c7-graphite2/Makefile index d08dec0502ba..c809f9b6f71c 100644 --- a/graphics/linux-c7-graphite2/Makefile +++ b/graphics/linux-c7-graphite2/Makefile @@ -3,13 +3,13 @@ PORTNAME= graphite2 PORTVERSION= 1.3.10 +DISTVERSIONSUFFIX= -1.el7_3 CATEGORIES= graphics linux MAINTAINER= emulation@FreeBSD.org COMMENT= Rendering capabilities for complex non-Roman writing systems (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 1.el7_3 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/graphics/linux-c7-jasper/Makefile b/graphics/linux-c7-jasper/Makefile index a250bbdea23d..a5e22ba8fa6e 100644 --- a/graphics/linux-c7-jasper/Makefile +++ b/graphics/linux-c7-jasper/Makefile @@ -3,6 +3,7 @@ PORTNAME= jasper PORTVERSION= 1.900.1 +DISTVERSIONSUFFIX= -33.el7 PORTREVISION= 5 CATEGORIES= graphics linux PKGNAMESUFFIX= -libs @@ -14,7 +15,6 @@ COMMENT= JPEG-2000 reference implementation (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION} LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX} -RPMVERSION= 33.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= jpeg diff --git a/graphics/linux-c7-jbigkit/Makefile b/graphics/linux-c7-jbigkit/Makefile index f29fd7b6b6bc..21bbd5766560 100644 --- a/graphics/linux-c7-jbigkit/Makefile +++ b/graphics/linux-c7-jbigkit/Makefile @@ -3,6 +3,7 @@ PORTNAME= jbigkit PORTVERSION= 2.0 +DISTVERSIONSUFFIX= -11.el7 PORTREVISION= 2 CATEGORIES= graphics linux PKGNAMESUFFIX= -libs @@ -14,7 +15,6 @@ COMMENT= Lossless compression for bi-level images (Linux CentOS ${LINUX_DIST_VER DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION} LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX} -RPMVERSION= 11.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/graphics/linux-c7-jpeg/Makefile b/graphics/linux-c7-jpeg/Makefile index 8c5b9fe757c5..9289129f47e2 100644 --- a/graphics/linux-c7-jpeg/Makefile +++ b/graphics/linux-c7-jpeg/Makefile @@ -3,6 +3,7 @@ PORTNAME= jpeg PORTVERSION= 1.2.90 +DISTVERSIONSUFFIX= -6.el7 PORTREVISION= 3 CATEGORIES= graphics linux DISTNAME= ${LINUXNAME}-${DISTVERSIONFULL} @@ -15,7 +16,6 @@ CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}-turbo/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION} LINUXNAME= libjpeg-turbo -RPMVERSION= 6.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/graphics/linux-c7-libglvnd/Makefile b/graphics/linux-c7-libglvnd/Makefile index 8e1a109ed94d..b79d8d8914d4 100644 --- a/graphics/linux-c7-libglvnd/Makefile +++ b/graphics/linux-c7-libglvnd/Makefile @@ -2,6 +2,7 @@ PORTNAME= libglvnd PORTVERSION= 1.0.1 +DISTVERSIONSUFFIX= -0.8.git5baa1e5.el7 CATEGORIES= graphics linux LIB_DISTNAMES= libglvnd-${DISTVERSIONFULL} \ libglvnd-egl-${DISTVERSIONFULL} \ @@ -12,7 +13,6 @@ LIB_DISTNAMES= libglvnd-${DISTVERSIONFULL} \ MAINTAINER= emulation@FreeBSD.org COMMENT= GL Vendor-Neutral Dispatch library (Linux CentOS ${LINUX_DIST_VER}) -RPMVERSION= 0.8.git5baa1e5.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= xorglibs diff --git a/graphics/linux-c7-png/Makefile b/graphics/linux-c7-png/Makefile index 9d954d63c264..b53321d2d3a0 100644 --- a/graphics/linux-c7-png/Makefile +++ b/graphics/linux-c7-png/Makefile @@ -3,6 +3,7 @@ PORTNAME= libpng PORTVERSION= 1.5.13 +DISTVERSIONSUFFIX= -7.el7_2 PORTREVISION= 2 CATEGORIES= graphics linux @@ -17,7 +18,6 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../png/pkg-descr -RPMVERSION= 7.el7_2 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/graphics/linux-c7-sdl_image/Makefile b/graphics/linux-c7-sdl_image/Makefile index 69353155e0f2..585b2c5d9ae1 100644 --- a/graphics/linux-c7-sdl_image/Makefile +++ b/graphics/linux-c7-sdl_image/Makefile @@ -3,6 +3,7 @@ PORTNAME= sdl_image PORTVERSION= 1.2.12 +DISTVERSIONSUFFIX= -11.el7 PORTREVISION= 2 CATEGORIES= graphics linux MASTER_SITES= EPEL7/s @@ -17,7 +18,6 @@ DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION} LINUXNAME= SDL_image ONLY_FOR_ARCHS= amd64 -RPMVERSION= 11.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= jpeg png sdl12 tiff diff --git a/graphics/linux-c7-sdl_ttf/Makefile b/graphics/linux-c7-sdl_ttf/Makefile index 63a2c932f75f..1692b747bfab 100644 --- a/graphics/linux-c7-sdl_ttf/Makefile +++ b/graphics/linux-c7-sdl_ttf/Makefile @@ -3,6 +3,7 @@ PORTNAME= sdl_ttf PORTVERSION= 2.0.11 +DISTVERSIONSUFFIX= -6.el7 PORTREVISION= 2 CATEGORIES= graphics linux MASTER_SITES= EPEL7/s @@ -17,7 +18,6 @@ DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION} LINUXNAME= SDL_ttf ONLY_FOR_ARCHS= amd64 -RPMVERSION= 6.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= jpeg png sdl12 tiff diff --git a/graphics/linux-c7-tiff/Makefile b/graphics/linux-c7-tiff/Makefile index 507a81e4466e..35418a40cf00 100644 --- a/graphics/linux-c7-tiff/Makefile +++ b/graphics/linux-c7-tiff/Makefile @@ -3,6 +3,7 @@ PORTNAME= libtiff PORTVERSION= 4.0.3 +DISTVERSIONSUFFIX= -27.el7_3 PORTREVISION= 3 CATEGORIES= graphics linux @@ -12,7 +13,6 @@ COMMENT= Library routines for working with TIFF images (Linux CentOS ${LINUX_DIS CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../tiff/pkg-descr -RPMVERSION= 27.el7_3 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= jbigkit jpeg diff --git a/graphics/linux-c7-wayland/Makefile b/graphics/linux-c7-wayland/Makefile index 90112ffea231..47f48f21519d 100644 --- a/graphics/linux-c7-wayland/Makefile +++ b/graphics/linux-c7-wayland/Makefile @@ -2,6 +2,7 @@ PORTNAME= wayland PORTVERSION= 1.15.0 +DISTVERSIONSUFFIX= -1.el7 CATEGORIES= graphics linux LIB_DISTNAMES= libwayland-client-${DISTVERSIONFULL} \ libwayland-cursor-${DISTVERSIONFULL} \ @@ -12,7 +13,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= Wayland compositor libraries (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../wayland/pkg-descr -RPMVERSION= 1.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/lang/linux-c6-tcl85/Makefile b/lang/linux-c6-tcl85/Makefile index a6ab50e330be..7cf8dac0baa2 100644 --- a/lang/linux-c6-tcl85/Makefile +++ b/lang/linux-c6-tcl85/Makefile @@ -3,6 +3,7 @@ PORTNAME= tcl PORTVERSION= 8.5.7 +DISTVERSIONSUFFIX= -6.el6 PORTREVISION= 2 CATEGORIES= lang linux PKGNAMESUFFIX= 85 @@ -12,7 +13,6 @@ COMMENT= Tool Command Language (Linux CentOS ${LINUX_DIST_VER}) DATADIR= ${PREFIX}/usr/share/tcl${PORTVERSION:R} DESCR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr -RPMVERSION= 6.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/lang/linux-c7-tcl85/Makefile b/lang/linux-c7-tcl85/Makefile index 1730542700da..4a4f0b7017b0 100644 --- a/lang/linux-c7-tcl85/Makefile +++ b/lang/linux-c7-tcl85/Makefile @@ -3,6 +3,7 @@ PORTNAME= tcl PORTVERSION= 8.5.13 +DISTVERSIONSUFFIX= -8.el7 PORTREVISION= 1 CATEGORIES= lang linux PKGNAMESUFFIX= 85 @@ -14,7 +15,6 @@ CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]* DATADIR= ${PREFIX}/usr/share/tcl${PORTVERSION:R} DESCR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr -RPMVERSION= 8.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/multimedia/linux-c6-libtheora/Makefile b/multimedia/linux-c6-libtheora/Makefile index d59a3a716d76..4161ce722956 100644 --- a/multimedia/linux-c6-libtheora/Makefile +++ b/multimedia/linux-c6-libtheora/Makefile @@ -3,6 +3,7 @@ PORTNAME= libtheora PORTVERSION= 1.1.0 +DISTVERSIONSUFFIX= -2.el6 PORTREVISION= 3 CATEGORIES= multimedia linux @@ -10,7 +11,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= Theora Video Compression Codec (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 2.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/multimedia/linux-c6-libv4l/Makefile b/multimedia/linux-c6-libv4l/Makefile index 0caabd0c7699..0ecfe4389e99 100644 --- a/multimedia/linux-c6-libv4l/Makefile +++ b/multimedia/linux-c6-libv4l/Makefile @@ -3,6 +3,7 @@ PORTNAME= libv4l PORTVERSION= 0.6.3 +DISTVERSIONSUFFIX= -2.el6 PORTREVISION= 3 CATEGORIES= multimedia linux @@ -10,7 +11,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= Video4Linux library (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 2.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/multimedia/linux-c7-libtheora/Makefile b/multimedia/linux-c7-libtheora/Makefile index 2085d50bf50e..fc00b96786fe 100644 --- a/multimedia/linux-c7-libtheora/Makefile +++ b/multimedia/linux-c7-libtheora/Makefile @@ -3,6 +3,7 @@ PORTNAME= libtheora PORTVERSION= 1.1.1 +DISTVERSIONSUFFIX= -8.el7 PORTREVISION= 1 CATEGORIES= multimedia linux @@ -14,7 +15,6 @@ LICENSE= BSD3CLAUSE CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 8.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/multimedia/linux-c7-libv4l/Makefile b/multimedia/linux-c7-libv4l/Makefile index 2432339b9035..898187c0f606 100644 --- a/multimedia/linux-c7-libv4l/Makefile +++ b/multimedia/linux-c7-libv4l/Makefile @@ -3,6 +3,7 @@ PORTNAME= libv4l PORTVERSION= 0.9.5 +DISTVERSIONSUFFIX= -4.el7 PORTREVISION= 2 CATEGORIES= multimedia linux SRC_DISTFILES= v4l-utils-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE @@ -15,7 +16,6 @@ LICENSE= LGPL20+ CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 4.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/net/linux-c6-avahi-libs/Makefile b/net/linux-c6-avahi-libs/Makefile index 08c60ac7e7ee..209f0cba5c8d 100644 --- a/net/linux-c6-avahi-libs/Makefile +++ b/net/linux-c6-avahi-libs/Makefile @@ -3,6 +3,7 @@ PORTNAME= avahi PORTVERSION= 0.6.25 +DISTVERSIONSUFFIX= -17.el6 PORTREVISION= 5 CATEGORIES= net linux PKGNAMESUFFIX= -libs @@ -13,7 +14,6 @@ COMMENT= Libraries for Avahi (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX} -RPMVERSION= 17.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/net/linux-c6-openldap/Makefile b/net/linux-c6-openldap/Makefile index 385cb139a78c..4ff93992b98c 100644 --- a/net/linux-c6-openldap/Makefile +++ b/net/linux-c6-openldap/Makefile @@ -3,6 +3,7 @@ PORTNAME= openldap PORTVERSION= 2.4.40 +DISTVERSIONSUFFIX= -16.el6 PORTREVISION= 5 CATEGORIES= net linux @@ -10,7 +11,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= Lightweight Directory Access Protocol libraries (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}24-server/pkg-descr -RPMVERSION= 16.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= cyrus-sasl2 nss nspr diff --git a/net/linux-c6-tcp_wrappers-libs/Makefile b/net/linux-c6-tcp_wrappers-libs/Makefile index 5a37cf71b414..8565248164f3 100644 --- a/net/linux-c6-tcp_wrappers-libs/Makefile +++ b/net/linux-c6-tcp_wrappers-libs/Makefile @@ -3,6 +3,7 @@ PORTNAME= tcp_wrappers PORTVERSION= 7.6 +DISTVERSIONSUFFIX= -58.el6 PORTREVISION= 4 CATEGORIES= net linux PKGNAMESUFFIX= -libs @@ -13,7 +14,6 @@ COMMENT= Libraries tcp wrappers (Linux CentOS ${LINUX_DIST_VER}) DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION} LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX} -RPMVERSION= 58.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= xorglibs diff --git a/net/linux-c7-avahi-libs/Makefile b/net/linux-c7-avahi-libs/Makefile index 98c6fe44ec1b..83a430fb8e38 100644 --- a/net/linux-c7-avahi-libs/Makefile +++ b/net/linux-c7-avahi-libs/Makefile @@ -3,6 +3,7 @@ PORTNAME= avahi PORTVERSION= 0.6.31 +DISTVERSIONSUFFIX= -19.el7 PORTREVISION= 2 CATEGORIES= net linux PKGNAMESUFFIX= -libs @@ -15,7 +16,6 @@ CONFLICTS= linux-c6-${LINUXNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX} -RPMVERSION= 19.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/net/linux-c7-openldap/Makefile b/net/linux-c7-openldap/Makefile index 0f8d416cad94..68b1ff566b38 100644 --- a/net/linux-c7-openldap/Makefile +++ b/net/linux-c7-openldap/Makefile @@ -3,6 +3,7 @@ PORTNAME= openldap PORTVERSION= 2.4.44 +DISTVERSIONSUFFIX= -21.el7_6 PORTREVISION= 1 CATEGORIES= net linux @@ -12,7 +13,6 @@ COMMENT= LDAP libraries (Linux CentOS ${LINUX_DIST_VER}) CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}24-server/pkg-descr -RPMVERSION= 21.el7_6 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= cyrus-sasl2 nspr nss diff --git a/net/linux-c7-tcp_wrappers-libs/Makefile b/net/linux-c7-tcp_wrappers-libs/Makefile index 517f953e801b..61622d73a25c 100644 --- a/net/linux-c7-tcp_wrappers-libs/Makefile +++ b/net/linux-c7-tcp_wrappers-libs/Makefile @@ -3,6 +3,7 @@ PORTNAME= tcp_wrappers PORTVERSION= 7.6 +DISTVERSIONSUFFIX= -77.el7 PORTREVISION= 2 CATEGORIES= net linux PKGNAMESUFFIX= -libs @@ -15,7 +16,6 @@ CONFLICTS= linux-c6-${LINUXNAME}-[0-9]* DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION} LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX} -RPMVERSION= 77.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= xorglibs diff --git a/print/linux-c6-cups-libs/Makefile b/print/linux-c6-cups-libs/Makefile index 75d573450b08..f4f65de6142d 100644 --- a/print/linux-c6-cups-libs/Makefile +++ b/print/linux-c6-cups-libs/Makefile @@ -3,6 +3,7 @@ PORTNAME= cups PORTVERSION= 1.4.2 +DISTVERSIONSUFFIX= -81.el6_10 PORTREVISION= 10 CATEGORIES= print linux PKGNAMESUFFIX= -libs @@ -13,7 +14,6 @@ COMMENT= Common UNIX Printing System libraries DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX} -RPMVERSION= 81.el6_10 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= avahi-libs gnutls jpeg png tiff diff --git a/print/linux-c7-cups-libs/Makefile b/print/linux-c7-cups-libs/Makefile index a56066d81ed7..203d1fc1bc2b 100644 --- a/print/linux-c7-cups-libs/Makefile +++ b/print/linux-c7-cups-libs/Makefile @@ -3,6 +3,7 @@ PORTNAME= cups PORTVERSION= 1.6.3 +DISTVERSIONSUFFIX= -35.el7 PORTREVISION= 5 CATEGORIES= print linux PKGNAMESUFFIX= -libs @@ -16,7 +17,6 @@ CONFLICTS= linux-c6-${LINUXNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION} LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX} -RPMVERSION= 35.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= avahi-libs openssl diff --git a/print/linux-c7-freetype/Makefile b/print/linux-c7-freetype/Makefile index a76422c3ad1a..570f45d90a5e 100644 --- a/print/linux-c7-freetype/Makefile +++ b/print/linux-c7-freetype/Makefile @@ -2,13 +2,13 @@ PORTNAME= freetype PORTVERSION= 2.8 +DISTVERSIONSUFFIX= -12.el7 CATEGORIES= print linux MAINTAINER= emulation@FreeBSD.org COMMENT= Font rendering engine (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr -RPMVERSION= 12.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= png diff --git a/print/linux-c7-harfbuzz/Makefile b/print/linux-c7-harfbuzz/Makefile index 73fc38de9e14..059a8cc9c3b7 100644 --- a/print/linux-c7-harfbuzz/Makefile +++ b/print/linux-c7-harfbuzz/Makefile @@ -2,13 +2,13 @@ PORTNAME= harfbuzz PORTVERSION= 1.7.5 +DISTVERSIONSUFFIX= -2.el7 CATEGORIES= print linux MAINTAINER= emulation@FreeBSD.org COMMENT= OpenType text shaping engine (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 2.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= graphite2 diff --git a/security/linux-c6-audit-libs/Makefile b/security/linux-c6-audit-libs/Makefile index c1dbc01aae72..be287811b873 100644 --- a/security/linux-c6-audit-libs/Makefile +++ b/security/linux-c6-audit-libs/Makefile @@ -1,8 +1,10 @@ # $FreeBSD$ -PORTNAME= audit-libs +PORTNAME= audit PORTVERSION= 2.4.5 +DISTVERSIONSUFFIX= -6.el6 CATEGORIES= security linux +PKGNAMESUFFIX= -libs MAINTAINER= emulation@FreeBSD.org COMMENT= Dynamic libraries needed for applications to use the Linux audit framework @@ -10,8 +12,8 @@ COMMENT= Dynamic libraries needed for applications to use the Linux audit framew USES= linux:c6 USE_LDCONFIG= yes USE_LINUX_RPM= yes -RPMVERSION= 6.el6 -SRC_DISTFILES= audit-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE + +LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL} OPTIONS_DEFINE= DOCS diff --git a/security/linux-c6-cyrus-sasl2/Makefile b/security/linux-c6-cyrus-sasl2/Makefile index 4ba6d1025d23..6ed43a475fb3 100644 --- a/security/linux-c6-cyrus-sasl2/Makefile +++ b/security/linux-c6-cyrus-sasl2/Makefile @@ -3,6 +3,7 @@ PORTNAME= cyrus-sasl PORTVERSION= 2.1.23 +DISTVERSIONSUFFIX= -15.el6_6.2 PORTREVISION= 5 CATEGORIES= security linux PKGNAMESUFFIX= -lib @@ -14,7 +15,6 @@ COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) (Linux CentOS DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION} LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX} -RPMVERSION= 15.el6_6.2 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/security/linux-c6-gnutls/Makefile b/security/linux-c6-gnutls/Makefile index 3e8453b5f991..1eed959ce8ef 100644 --- a/security/linux-c6-gnutls/Makefile +++ b/security/linux-c6-gnutls/Makefile @@ -3,6 +3,7 @@ PORTNAME= gnutls PORTVERSION= 2.12.23 +DISTVERSIONSUFFIX= -22.el6 PORTREVISION= 1 CATEGORIES= security linux @@ -10,7 +11,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= GNU Transport Layer Security library (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 22.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= libtasn1 libgcrypt libgpg-error diff --git a/security/linux-c6-libgcrypt/Makefile b/security/linux-c6-libgcrypt/Makefile index aee3f2140e38..aa1db0b03e1d 100644 --- a/security/linux-c6-libgcrypt/Makefile +++ b/security/linux-c6-libgcrypt/Makefile @@ -3,6 +3,7 @@ PORTNAME= libgcrypt PORTVERSION= 1.4.5 +DISTVERSIONSUFFIX= -12.el6_8 PORTREVISION= 7 CATEGORIES= security linux @@ -10,7 +11,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= General purpose crypto library based on code used in GnuPG (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 12.el6_8 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= libgpg-error diff --git a/security/linux-c6-libgpg-error/Makefile b/security/linux-c6-libgpg-error/Makefile index 5a2853f8cda3..036fcd593932 100644 --- a/security/linux-c6-libgpg-error/Makefile +++ b/security/linux-c6-libgpg-error/Makefile @@ -3,6 +3,7 @@ PORTNAME= libgpg-error PORTVERSION= 1.7 +DISTVERSIONSUFFIX= -4.el6 PORTREVISION= 3 CATEGORIES= security linux @@ -10,7 +11,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= Common error values for all GnuPG components (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 4.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/security/linux-c6-libssh2/Makefile b/security/linux-c6-libssh2/Makefile index 9d97ab328fe5..9f0dec760cb1 100644 --- a/security/linux-c6-libssh2/Makefile +++ b/security/linux-c6-libssh2/Makefile @@ -3,6 +3,7 @@ PORTNAME= libssh2 PORTVERSION= 1.4.2 +DISTVERSIONSUFFIX= -2.el6_7.1 PORTREVISION= 6 CATEGORIES= security linux @@ -10,7 +11,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= Library implementing the SSH2 protocol (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 2.el6_7.1 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= openssl diff --git a/security/linux-c6-libtasn1/Makefile b/security/linux-c6-libtasn1/Makefile index d8487f8e1b83..128844d3bd08 100644 --- a/security/linux-c6-libtasn1/Makefile +++ b/security/linux-c6-libtasn1/Makefile @@ -3,6 +3,7 @@ PORTNAME= libtasn1 PORTVERSION= 2.3 +DISTVERSIONSUFFIX= -6.el6_5 PORTREVISION= 3 CATEGORIES= security linux @@ -10,7 +11,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= ASN.1 structure parser library (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 6.el6_5 USES= cpe linux:c6 CPE_VENDOR= gnu USE_LDCONFIG= yes diff --git a/security/linux-c6-nss/Makefile b/security/linux-c6-nss/Makefile index 31b2bac40523..594c6cf62062 100644 --- a/security/linux-c6-nss/Makefile +++ b/security/linux-c6-nss/Makefile @@ -3,6 +3,7 @@ PORTNAME= nss PORTVERSION= 3.36.0 +DISTVERSIONSUFFIX= -9.el6_10 PORTREVISION= 2 CATEGORIES= security linux LIB_DISTNAMES= ${DISTNAME} \ @@ -18,7 +19,6 @@ COMMENT= Network Security Services (Linux CentOS ${LINUX_DIST_VER}) LICENSE= MPL20 DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 9.el6_10 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= nspr sqlite3 diff --git a/security/linux-c6-openssl/Makefile b/security/linux-c6-openssl/Makefile index dfebecd5351c..97f359b13a69 100644 --- a/security/linux-c6-openssl/Makefile +++ b/security/linux-c6-openssl/Makefile @@ -3,6 +3,7 @@ PORTNAME= openssl PORTVERSION= 1.0.1e +DISTVERSIONSUFFIX= -57.el6 PORTREVISION= 15 CATEGORIES= security linux @@ -10,7 +11,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= OpenSSL toolkit (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 57.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/security/linux-c6-pam/Makefile b/security/linux-c6-pam/Makefile index 10d15137a171..8f31137dfe49 100644 --- a/security/linux-c6-pam/Makefile +++ b/security/linux-c6-pam/Makefile @@ -2,6 +2,7 @@ PORTNAME= pam PORTVERSION= 1.1.1 +DISTVERSIONSUFFIX= -24.el6 CATEGORIES= security linux MAINTAINER= emulation@FreeBSD.org @@ -10,7 +11,6 @@ COMMENT= An extensible library which provides authentication for applications USES= linux:c6 USE_LDCONFIG= yes USE_LINUX_RPM= yes -RPMVERSION= 24.el6 OPTIONS_DEFINE= DOCS diff --git a/security/linux-c7-cyrus-sasl2/Makefile b/security/linux-c7-cyrus-sasl2/Makefile index d8b0e59183f8..7d2e3de930fb 100644 --- a/security/linux-c7-cyrus-sasl2/Makefile +++ b/security/linux-c7-cyrus-sasl2/Makefile @@ -3,6 +3,7 @@ PORTNAME= cyrus-sasl PORTVERSION= 2.1.26 +DISTVERSIONSUFFIX= -23.el7 PORTREVISION= 4 CATEGORIES= security linux PKGNAMESUFFIX= -lib @@ -16,7 +17,6 @@ CONFLICTS= linux-c6-${LINUXNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION} LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX} -RPMVERSION= 23.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/security/linux-c7-gnutls/Makefile b/security/linux-c7-gnutls/Makefile index 74b2fea7fe4d..02b3bb75641a 100644 --- a/security/linux-c7-gnutls/Makefile +++ b/security/linux-c7-gnutls/Makefile @@ -3,6 +3,7 @@ PORTNAME= gnutls PORTVERSION= 3.3.29 +DISTVERSIONSUFFIX= -9.el7_6 CATEGORIES= security linux MAINTAINER= emulation@FreeBSD.org @@ -11,7 +12,6 @@ COMMENT= GNU Transport Layer Security library (Linux CentOS ${LINUX_DIST_VER}) CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 9.el7_6 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= libtasn1 nettle p11-kit trousers diff --git a/security/linux-c7-libgcrypt/Makefile b/security/linux-c7-libgcrypt/Makefile index 9837ac751ac1..2550036bd993 100644 --- a/security/linux-c7-libgcrypt/Makefile +++ b/security/linux-c7-libgcrypt/Makefile @@ -3,6 +3,7 @@ PORTNAME= libgcrypt PORTVERSION= 1.5.3 +DISTVERSIONSUFFIX= -14.el7 PORTREVISION= 4 CATEGORIES= security linux @@ -14,7 +15,6 @@ CONFLICTS= linux-c6-${PORTNAME}-[0-9]* LICENSE= LGPL21+ DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 14.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= libgpg-error diff --git a/security/linux-c7-libgpg-error/Makefile b/security/linux-c7-libgpg-error/Makefile index bbf253ba402f..8cc6f7840054 100644 --- a/security/linux-c7-libgpg-error/Makefile +++ b/security/linux-c7-libgpg-error/Makefile @@ -3,6 +3,7 @@ PORTNAME= libgpg-error PORTVERSION= 1.12 +DISTVERSIONSUFFIX= -3.el7 PORTREVISION= 2 CATEGORIES= security linux @@ -14,7 +15,6 @@ CONFLICTS= linux-c6-${PORTNAME}-[0-9]* LICENSE= LGPL21+ DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 3.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/security/linux-c7-libssh2/Makefile b/security/linux-c7-libssh2/Makefile index 02243f88cf40..e919c82dab19 100644 --- a/security/linux-c7-libssh2/Makefile +++ b/security/linux-c7-libssh2/Makefile @@ -3,6 +3,7 @@ PORTNAME= libssh2 PORTVERSION= 1.4.3 +DISTVERSIONSUFFIX= -12.el7_6.2 PORTREVISION= 3 CATEGORIES= security linux @@ -12,7 +13,6 @@ COMMENT= Library implementing the SSH2 protocol (Linux CentOS ${LINUX_DIST_VER}) CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 12.el7_6.2 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= openssl diff --git a/security/linux-c7-libtasn1/Makefile b/security/linux-c7-libtasn1/Makefile index 198af538efdf..7b42d8006f51 100644 --- a/security/linux-c7-libtasn1/Makefile +++ b/security/linux-c7-libtasn1/Makefile @@ -3,6 +3,7 @@ PORTNAME= libtasn1 PORTVERSION= 4.10 +DISTVERSIONSUFFIX= -1.el7 CATEGORIES= security linux MAINTAINER= emulation@FreeBSD.org @@ -13,7 +14,6 @@ LICENSE= LGPL21+ CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 1.el7 USES= cpe linux:c7 CPE_VENDOR= gnu USE_LDCONFIG= yes diff --git a/security/linux-c7-nettle/Makefile b/security/linux-c7-nettle/Makefile index 8239e2c38c27..194352298908 100644 --- a/security/linux-c7-nettle/Makefile +++ b/security/linux-c7-nettle/Makefile @@ -2,13 +2,13 @@ PORTNAME= nettle PORTVERSION= 2.7.1 +DISTVERSIONSUFFIX= -8.el7 CATEGORIES= security linux MAINTAINER= emulation@FreeBSD.org COMMENT= Low-level cryptographic library (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 8.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/security/linux-c7-nss/Makefile b/security/linux-c7-nss/Makefile index 5e56eaef1f00..d2623fa54109 100644 --- a/security/linux-c7-nss/Makefile +++ b/security/linux-c7-nss/Makefile @@ -3,6 +3,7 @@ PORTNAME= nss PORTVERSION= 3.36.0 +DISTVERSIONSUFFIX= -7.1.el7_6 CATEGORIES= security linux LIB_DISTNAMES= ${DISTNAME} \ ${PORTNAME}-pem-1.0.3-5.el7_6.1 \ @@ -19,7 +20,6 @@ COMMENT= Network Security Services (Linux CentOS ${LINUX_DIST_VER}) CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 7.1.el7_6 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= nspr sqlite3 diff --git a/security/linux-c7-openssl/Makefile b/security/linux-c7-openssl/Makefile index 1bbdc28db0b8..474a5c0a8d00 100644 --- a/security/linux-c7-openssl/Makefile +++ b/security/linux-c7-openssl/Makefile @@ -3,6 +3,7 @@ PORTNAME= openssl PORTVERSION= 1.0.2k +DISTVERSIONSUFFIX= -16.el7_6.1 PORTREVISION= 1 CATEGORIES= security linux PKGNAMESUFFIX= -libs @@ -19,7 +20,6 @@ CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION} LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX} -RPMVERSION= 16.el7_6.1 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/security/linux-c7-p11-kit/Makefile b/security/linux-c7-p11-kit/Makefile index 9c1b7b74658c..66c6e6ed8903 100644 --- a/security/linux-c7-p11-kit/Makefile +++ b/security/linux-c7-p11-kit/Makefile @@ -2,13 +2,13 @@ PORTNAME= p11-kit PORTVERSION= 0.23.5 +DISTVERSIONSUFFIX= -3.el7 CATEGORIES= security linux MAINTAINER= emulation@FreeBSD.org COMMENT= Library for loading and enumerating of PKCS\#11 modules (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 3.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/security/linux-c7-trousers/Makefile b/security/linux-c7-trousers/Makefile index 6751d02a7676..7abd1a54e660 100644 --- a/security/linux-c7-trousers/Makefile +++ b/security/linux-c7-trousers/Makefile @@ -2,13 +2,13 @@ PORTNAME= trousers PORTVERSION= 0.3.14 +DISTVERSIONSUFFIX= -2.el7 CATEGORIES= security linux MAINTAINER= emulation@FreeBSD.org COMMENT= Open-source TCG Software Stack (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 2.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= openssl diff --git a/sysutils/linux-c6-lttng-ust/Makefile b/sysutils/linux-c6-lttng-ust/Makefile index 7f362e0ba8e1..ea6239849791 100644 --- a/sysutils/linux-c6-lttng-ust/Makefile +++ b/sysutils/linux-c6-lttng-ust/Makefile @@ -3,6 +3,7 @@ PORTNAME= lttng-ust PORTVERSION= 2.4.1 +DISTVERSIONSUFFIX= -1.el6 CATEGORIES= sysutils linux MASTER_SITES= EPEL/l @@ -11,7 +12,6 @@ COMMENT= Libraries to instrument and trace user applications (CentOS ${LINUX_DIS DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME} -RPMVERSION= 1.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= userspace-rcu diff --git a/sysutils/linux-c6-userspace-rcu/Makefile b/sysutils/linux-c6-userspace-rcu/Makefile index 628fa7f836a7..8d4b954a6474 100644 --- a/sysutils/linux-c6-userspace-rcu/Makefile +++ b/sysutils/linux-c6-userspace-rcu/Makefile @@ -3,6 +3,7 @@ PORTNAME= userspace-rcu PORTVERSION= 0.7.7 +DISTVERSIONSUFFIX= -1.el6 CATEGORIES= sysutils linux MASTER_SITES= EPEL/u @@ -10,7 +11,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= Userspace read-copy-update (RCU) data synchronization library (CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../liburcu/pkg-descr -RPMVERSION= 1.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/sysutils/linux-c7-lttng-ust/Makefile b/sysutils/linux-c7-lttng-ust/Makefile index 60a529417413..35191b35ad8f 100644 --- a/sysutils/linux-c7-lttng-ust/Makefile +++ b/sysutils/linux-c7-lttng-ust/Makefile @@ -3,6 +3,7 @@ PORTNAME= lttng-ust PORTVERSION= 2.4.1 +DISTVERSIONSUFFIX= -4.el7 CATEGORIES= sysutils linux MASTER_SITES= EPEL7/l @@ -12,7 +13,6 @@ COMMENT= Libraries to instrument and trace user applications (CentOS ${LINUX_DIS DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME} ONLY_FOR_ARCHS= amd64 -RPMVERSION= 4.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= userspace-rcu diff --git a/sysutils/linux-c7-userspace-rcu/Makefile b/sysutils/linux-c7-userspace-rcu/Makefile index 44d557f6f6f2..b8ad14c6d51c 100644 --- a/sysutils/linux-c7-userspace-rcu/Makefile +++ b/sysutils/linux-c7-userspace-rcu/Makefile @@ -3,6 +3,7 @@ PORTNAME= userspace-rcu PORTVERSION= 0.7.16 +DISTVERSIONSUFFIX= -1.el7 CATEGORIES= sysutils linux MASTER_SITES= EPEL7/u @@ -11,7 +12,6 @@ COMMENT= Userspace read-copy-update (RCU) data synchronization library (CentOS $ DESCR= ${.CURDIR}/../liburcu/pkg-descr ONLY_FOR_ARCHS= amd64 -RPMVERSION= 1.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/textproc/linux-c6-aspell/Makefile b/textproc/linux-c6-aspell/Makefile index 7b837b33a9ad..f0c54a4b0059 100644 --- a/textproc/linux-c6-aspell/Makefile +++ b/textproc/linux-c6-aspell/Makefile @@ -3,6 +3,7 @@ PORTNAME= aspell PORTVERSION= 0.60.6 +DISTVERSIONSUFFIX= -12.el6 PORTREVISION= 3 CATEGORIES= textproc linux @@ -12,7 +13,6 @@ COMMENT= Spelling checker with better logic than ispell (Linux CentOS ${LINUX_DI LICENSE= LGPL21+ DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 12.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/textproc/linux-c6-expat/Makefile b/textproc/linux-c6-expat/Makefile index ba96f1190c6b..6b6289945ad6 100644 --- a/textproc/linux-c6-expat/Makefile +++ b/textproc/linux-c6-expat/Makefile @@ -3,6 +3,7 @@ PORTNAME= expat PORTVERSION= 2.0.1 +DISTVERSIONSUFFIX= -13.el6_8 PORTREVISION= 5 CATEGORIES= textproc linux @@ -10,7 +11,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= XML 1.0 parser written in C (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr -RPMVERSION= 13.el6_8 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/textproc/linux-c6-libxml2/Makefile b/textproc/linux-c6-libxml2/Makefile index ba6641234886..dda1c89c16ef 100644 --- a/textproc/linux-c6-libxml2/Makefile +++ b/textproc/linux-c6-libxml2/Makefile @@ -3,6 +3,7 @@ PORTNAME= libxml2 PORTVERSION= 2.7.6 +DISTVERSIONSUFFIX= -21.el6_8.1 PORTREVISION= 9 CATEGORIES= textproc linux @@ -10,7 +11,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= Library providing XML and HTML support (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 21.el6_8.1 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/textproc/linux-c7-aspell/Makefile b/textproc/linux-c7-aspell/Makefile index 3827e2f35396..7fdf62d04297 100644 --- a/textproc/linux-c7-aspell/Makefile +++ b/textproc/linux-c7-aspell/Makefile @@ -3,6 +3,7 @@ PORTNAME= aspell PORTVERSION= 0.60.6.1 +DISTVERSIONSUFFIX= -9.el7 PORTREVISION= 1 CATEGORIES= textproc linux @@ -14,7 +15,6 @@ LICENSE= LGPL21+ CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 9.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/textproc/linux-c7-expat/Makefile b/textproc/linux-c7-expat/Makefile index 272d3914ec72..e801353951bf 100644 --- a/textproc/linux-c7-expat/Makefile +++ b/textproc/linux-c7-expat/Makefile @@ -3,6 +3,7 @@ PORTNAME= expat PORTVERSION= 2.1.0 +DISTVERSIONSUFFIX= -10.el7_3 PORTREVISION= 2 CATEGORIES= textproc linux @@ -14,7 +15,6 @@ LICENSE= MIT CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr -RPMVERSION= 10.el7_3 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/textproc/linux-c7-libxml2/Makefile b/textproc/linux-c7-libxml2/Makefile index c0baf1ac538f..172d09f35f6e 100644 --- a/textproc/linux-c7-libxml2/Makefile +++ b/textproc/linux-c7-libxml2/Makefile @@ -3,6 +3,7 @@ PORTNAME= libxml2 PORTVERSION= 2.9.1 +DISTVERSIONSUFFIX= -6.el7_2.3 PORTREVISION= 1 CATEGORIES= textproc linux @@ -14,7 +15,6 @@ LICENSE= MIT CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 6.el7_2.3 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/www/linux-c6-qt47-webkit/Makefile b/www/linux-c6-qt47-webkit/Makefile index e1e5ac7ff572..af20a7b160a3 100644 --- a/www/linux-c6-qt47-webkit/Makefile +++ b/www/linux-c6-qt47-webkit/Makefile @@ -3,6 +3,7 @@ PORTNAME= qt47-webkit PORTVERSION= 4.7.2 +DISTVERSIONSUFFIX= -1_18.el6 PORTREVISION= 4 CATEGORIES= www linux MASTER_SITES= LOCAL/tijl/atrpms:amd64,i386 @@ -13,7 +14,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= Qt WebKit implementation (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../../devel/linux-c6-qt47/pkg-descr -RPMVERSION= 1_18.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= fontconfig png xorglibs sqlite3 qt qt-x11 diff --git a/www/linux-c7-qtwebkit/Makefile b/www/linux-c7-qtwebkit/Makefile index 52ffaa275ceb..d4aa0f4c47c1 100644 --- a/www/linux-c7-qtwebkit/Makefile +++ b/www/linux-c7-qtwebkit/Makefile @@ -3,6 +3,7 @@ PORTNAME= qtwebkit PORTVERSION= 2.3.4 +DISTVERSIONSUFFIX= -6.el7 PORTREVISION= 2 CATEGORIES= www linux MASTER_SITES= EPEL7/q @@ -14,7 +15,6 @@ CONFLICTS= linux-c6-qt47-webkit-[0-9]* DESCR= ${.CURDIR}/../../devel/linux-c6-qt47/pkg-descr ONLY_FOR_ARCHS= amd64 -RPMVERSION= 6.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= fontconfig png xorglibs sqlite3 qt qt-x11 diff --git a/x11-fonts/linux-c6-fontconfig/Makefile b/x11-fonts/linux-c6-fontconfig/Makefile index a8aa23301b0b..5a1d69de5982 100644 --- a/x11-fonts/linux-c6-fontconfig/Makefile +++ b/x11-fonts/linux-c6-fontconfig/Makefile @@ -3,6 +3,7 @@ PORTNAME= fontconfig PORTVERSION= 2.8.0 +DISTVERSIONSUFFIX= -5.el6 PORTREVISION= 3 CATEGORIES= x11-fonts linux @@ -10,7 +11,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= XML-based font configuration API for X Windows (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 5.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= expat diff --git a/x11-fonts/linux-c7-fontconfig/Makefile b/x11-fonts/linux-c7-fontconfig/Makefile index 236675973dc8..c7cb0ea2d06e 100644 --- a/x11-fonts/linux-c7-fontconfig/Makefile +++ b/x11-fonts/linux-c7-fontconfig/Makefile @@ -3,6 +3,7 @@ PORTNAME= fontconfig PORTVERSION= 2.13.0 +DISTVERSIONSUFFIX= -4.3.el7 CATEGORIES= x11-fonts linux MAINTAINER= emulation@FreeBSD.org @@ -11,7 +12,6 @@ COMMENT= XML-based font configuration API for X Windows (Linux CentOS ${LINUX_DI CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 4.3.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= expat freetype diff --git a/x11-toolkits/linux-c6-gtk2/Makefile b/x11-toolkits/linux-c6-gtk2/Makefile index 0e1e6a238fc2..90130afd7fab 100644 --- a/x11-toolkits/linux-c6-gtk2/Makefile +++ b/x11-toolkits/linux-c6-gtk2/Makefile @@ -3,6 +3,7 @@ PORTNAME= gtk2 PORTVERSION= 2.24.23 +DISTVERSIONSUFFIX= -9.el6 PORTREVISION= 7 CATEGORIES= x11-toolkits linux LIB_DISTNAMES= ${DISTNAME} \ @@ -13,7 +14,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= GTK+ library, version 2.X (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}0/pkg-descr -RPMVERSION= 9.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= atk gdkpixbuf2 pango xorglibs diff --git a/x11-toolkits/linux-c6-openmotif/Makefile b/x11-toolkits/linux-c6-openmotif/Makefile index 125b2014e772..3ec588df4a5b 100644 --- a/x11-toolkits/linux-c6-openmotif/Makefile +++ b/x11-toolkits/linux-c6-openmotif/Makefile @@ -3,6 +3,7 @@ PORTNAME= openmotif PORTVERSION= 2.3.3 +DISTVERSIONSUFFIX= -9.el6 PORTREVISION= 4 CATEGORIES= x11-toolkits linux @@ -10,7 +11,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= Motif toolkit libraries (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../open-motif/pkg-descr -RPMVERSION= 9.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= xorglibs diff --git a/x11-toolkits/linux-c6-pango/Makefile b/x11-toolkits/linux-c6-pango/Makefile index f458782703eb..3303ced975ec 100644 --- a/x11-toolkits/linux-c6-pango/Makefile +++ b/x11-toolkits/linux-c6-pango/Makefile @@ -3,6 +3,7 @@ PORTNAME= pango PORTVERSION= 1.28.1 +DISTVERSIONSUFFIX= -11.el6 PORTREVISION= 7 CATEGORIES= x11-toolkits linux @@ -10,7 +11,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= Pango library (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 11.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= cairo fontconfig libthai xorglibs diff --git a/x11-toolkits/linux-c6-qt47-x11/Makefile b/x11-toolkits/linux-c6-qt47-x11/Makefile index 04fb914b81a7..d2ee2604ea6e 100644 --- a/x11-toolkits/linux-c6-qt47-x11/Makefile +++ b/x11-toolkits/linux-c6-qt47-x11/Makefile @@ -3,6 +3,7 @@ PORTNAME= qt47-x11 PORTVERSION= 4.7.2 +DISTVERSIONSUFFIX= -1_18.el6 PORTREVISION= 6 CATEGORIES= x11-toolkits linux MASTER_SITES= LOCAL/tijl/atrpms:amd64,i386 @@ -14,7 +15,6 @@ COMMENT= Cross-platform application and UI framework (Linux CentOS ${LINUX_DIST_ DATADIR= ${PREFIX}/usr/share/qt47 DESCR= ${.CURDIR}/../../devel/linux-c6-qt47/pkg-descr -RPMVERSION= 1_18.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= alsalib dri fontconfig jpeg openssl png qt tiff xorglibs diff --git a/x11-toolkits/linux-c6-tk85/Makefile b/x11-toolkits/linux-c6-tk85/Makefile index 1501d922a844..15680933fba9 100644 --- a/x11-toolkits/linux-c6-tk85/Makefile +++ b/x11-toolkits/linux-c6-tk85/Makefile @@ -3,6 +3,7 @@ PORTNAME= tk PORTVERSION= 8.5.7 +DISTVERSIONSUFFIX= -5.el6 PORTREVISION= 3 CATEGORIES= x11-toolkits linux PKGNAMESUFFIX= 85 @@ -12,7 +13,6 @@ COMMENT= Graphical toolkit for TCL (Linux CentOS ${LINUX_DIST_VER}) DATADIR= ${PREFIX}/usr/share/tk${PORTVERSION:R} DESCR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr -RPMVERSION= 5.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= xorglibs diff --git a/x11-toolkits/linux-c7-gtk2/Makefile b/x11-toolkits/linux-c7-gtk2/Makefile index 3cd0e34b915f..7b7f1ae92b97 100644 --- a/x11-toolkits/linux-c7-gtk2/Makefile +++ b/x11-toolkits/linux-c7-gtk2/Makefile @@ -3,6 +3,7 @@ PORTNAME= gtk2 PORTVERSION= 2.24.31 +DISTVERSIONSUFFIX= -1.el7 CATEGORIES= x11-toolkits linux LIB_DISTNAMES= ${DISTNAME} \ ${PORTNAME}-immodules-${DISTVERSIONFULL} @@ -13,7 +14,6 @@ COMMENT= GTK+ library, version 2.X (Linux CentOS ${LINUX_DIST_VER}) CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}0/pkg-descr -RPMVERSION= 1.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= atk gdkpixbuf2 pango xorglibs diff --git a/x11-toolkits/linux-c7-openmotif/Makefile b/x11-toolkits/linux-c7-openmotif/Makefile index 1c9ee568dc8d..bdd27c1f0d2b 100644 --- a/x11-toolkits/linux-c7-openmotif/Makefile +++ b/x11-toolkits/linux-c7-openmotif/Makefile @@ -3,6 +3,7 @@ PORTNAME= motif PORTVERSION= 2.3.4 +DISTVERSIONSUFFIX= -14.el7_5 PORTREVISION= 6 CATEGORIES= x11-toolkits linux @@ -12,7 +13,6 @@ COMMENT= Motif toolkit libraries (Linux CentOS ${LINUX_DIST_VER}) CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../open-${PORTNAME}/pkg-descr -RPMVERSION= 14.el7_5 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= xorglibs diff --git a/x11-toolkits/linux-c7-pango/Makefile b/x11-toolkits/linux-c7-pango/Makefile index 56a96ba926eb..439c247d1bfe 100644 --- a/x11-toolkits/linux-c7-pango/Makefile +++ b/x11-toolkits/linux-c7-pango/Makefile @@ -3,6 +3,7 @@ PORTNAME= pango PORTVERSION= 1.42.4 +DISTVERSIONSUFFIX= -2.el7_6 CATEGORIES= x11-toolkits linux MAINTAINER= emulation@FreeBSD.org @@ -11,7 +12,6 @@ COMMENT= Pango library (Linux CentOS ${LINUX_DIST_VER}) CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 2.el7_6 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= cairo fontconfig freetype fribidi harfbuzz libthai xorglibs diff --git a/x11-toolkits/linux-c7-qt-x11/Makefile b/x11-toolkits/linux-c7-qt-x11/Makefile index 2105e74ab41f..f9b4f380e9d6 100644 --- a/x11-toolkits/linux-c7-qt-x11/Makefile +++ b/x11-toolkits/linux-c7-qt-x11/Makefile @@ -3,6 +3,7 @@ PORTNAME= qt PORTVERSION= 4.8.7 +DISTVERSIONSUFFIX= -2.el7 CATEGORIES= x11-toolkits linux PKGNAMESUFFIX= -x11 LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL} @@ -15,7 +16,6 @@ CONFLICTS= linux-c6-qt47-x11-[0-9]* DATADIR= ${PREFIX}/usr/share/${PORTNAME}4 DESCR= ${.CURDIR}/../../devel/linux-c6-qt47/pkg-descr LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX} -RPMVERSION= 2.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= alsalib dri fontconfig jpeg openssl png qt tiff xorglibs diff --git a/x11-toolkits/linux-c7-tk85/Makefile b/x11-toolkits/linux-c7-tk85/Makefile index 972a5ecdfbe4..8d7784261bf2 100644 --- a/x11-toolkits/linux-c7-tk85/Makefile +++ b/x11-toolkits/linux-c7-tk85/Makefile @@ -3,6 +3,7 @@ PORTNAME= tk PORTVERSION= 8.5.13 +DISTVERSIONSUFFIX= -6.el7 PORTREVISION= 1 CATEGORIES= x11-toolkits linux PKGNAMESUFFIX= 85 @@ -14,7 +15,6 @@ CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]* DATADIR= ${PREFIX}/usr/share/tk${PORTVERSION:R} DESCR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr -RPMVERSION= 6.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= xorglibs diff --git a/x11/linux-c6-pixman/Makefile b/x11/linux-c6-pixman/Makefile index 8d130ddd079f..ea6888e0020a 100644 --- a/x11/linux-c6-pixman/Makefile +++ b/x11/linux-c6-pixman/Makefile @@ -2,6 +2,7 @@ PORTNAME= pixman PORTVERSION= 0.32.8 +DISTVERSIONSUFFIX= -1.el6 PORTREVISION= 1 CATEGORIES= x11 linux @@ -9,7 +10,6 @@ MAINTAINER= emulation@FreeBSD.org COMMENT= Low-level pixel manipulation library (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 1.el6 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX_RPM= yes diff --git a/x11/linux-c7-pixman/Makefile b/x11/linux-c7-pixman/Makefile index d5038e868ce5..bbafcaaa843c 100644 --- a/x11/linux-c7-pixman/Makefile +++ b/x11/linux-c7-pixman/Makefile @@ -3,13 +3,13 @@ PORTNAME= pixman PORTVERSION= 0.34.0 +DISTVERSIONSUFFIX= -1.el7 CATEGORIES= x11 linux MAINTAINER= emulation@FreeBSD.org COMMENT= Low-level pixel manipulation library (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 1.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes |