From af9c60625bda3e97370cc91b90ea306f292c209d Mon Sep 17 00:00:00 2001 From: mat Date: Tue, 11 Apr 2017 15:21:23 +0000 Subject: Make defining both PORTVERSION and DISTVERSION a DEV_ERROR. There are two cases: - The upstream versionning is compatible with our versionning, or using DISTVERSION's magic leads to a compatible PORTVERSION, use DISTVERSION. If it is possible to use DISTVERSIONPREFIX and DISTVERSIONSUFFIX to make it compatible, use them. - The upstream versionning is not compatible with our versionning, and DISTVERSION's magic does not lead to a correct PORTVERSION, then set PORTVERSION to the equivalent of our versionning, and set DISTNAME. It is possible to use a third variable where you store upstream's version and use it to compute PORTVERSION and/or DISTNAME, like the dns/bind9* ports do. Sponsored by: Absolight --- lang/gcc46/Makefile | 7 ++++--- lang/gcc47/Makefile | 7 ++++--- lang/gcc5-devel/Makefile | 7 ++++--- lang/gcc6-devel/Makefile | 7 ++++--- lang/gcc7-devel/Makefile | 7 ++++--- 5 files changed, 20 insertions(+), 15 deletions(-) (limited to 'lang') diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile index b474cb5..b440d57 100644 --- a/lang/gcc46/Makefile +++ b/lang/gcc46/Makefile @@ -6,7 +6,8 @@ PORTVERSION= 4.6.4 PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= lang java -MASTER_SITES= GCC/releases/gcc-${DISTVERSION} +MASTER_SITES= GCC/releases/gcc-${DIST_VERSION} +DISTNAME= gcc-${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX} MAINTAINER= gerald@FreeBSD.org @@ -27,9 +28,9 @@ BUILD_DEPENDS+= runtest:misc/dejagnu CPE_VENDOR= gnu -# DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names +# DIST_VERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. -DISTVERSION= ${PORTVERSION} +DIST_VERSION= ${PORTVERSION} GCC_VERSION= ${PORTVERSION:C/(.+)\.[0-9]{8}/\1/} SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/} ONLY_FOR_ARCHS= amd64 i386 ia64 powerpc sparc64 diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile index 02dcf26..3199e73 100644 --- a/lang/gcc47/Makefile +++ b/lang/gcc47/Makefile @@ -6,7 +6,8 @@ PORTVERSION= 4.7.4 PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= lang java -MASTER_SITES= GCC/releases/gcc-${DISTVERSION} +MASTER_SITES= GCC/releases/gcc-${DIST_VERSION} +DISTNAME= gcc-${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX} MAINTAINER= gerald@FreeBSD.org @@ -27,9 +28,9 @@ BUILD_DEPENDS+= runtest:misc/dejagnu CPE_VENDOR= gnu -# DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names +# DIST_VERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. -DISTVERSION= ${PORTVERSION} +DIST_VERSION= ${PORTVERSION} GCC_VERSION= ${PORTVERSION:C/(.+)\.[0-9]{8}/\1/} SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/} ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 sparc64 diff --git a/lang/gcc5-devel/Makefile b/lang/gcc5-devel/Makefile index 9bdd43d..45d1666 100644 --- a/lang/gcc5-devel/Makefile +++ b/lang/gcc5-devel/Makefile @@ -4,7 +4,8 @@ PORTNAME= gcc PORTVERSION= 5.4.1.s20170404 CATEGORIES= lang java -MASTER_SITES= GCC/snapshots/${DISTVERSION} +MASTER_SITES= GCC/snapshots/${DIST_VERSION} +DISTNAME= gcc-${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel MAINTAINER= gerald@FreeBSD.org @@ -27,11 +28,11 @@ CONFLICTS= gcc-5.* CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} -# DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names +# DIST_VERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. A PORTVERSION of # Y.2.1.s20140817 results in values of Y-20140817, Y.2.1, and Y # for these three. -DISTVERSION= ${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/} +DIST_VERSION= ${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/} GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/} SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/} ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64 diff --git a/lang/gcc6-devel/Makefile b/lang/gcc6-devel/Makefile index 6ca6c02..1411657 100644 --- a/lang/gcc6-devel/Makefile +++ b/lang/gcc6-devel/Makefile @@ -4,7 +4,8 @@ PORTNAME= gcc PORTVERSION= 6.3.1.s20170406 CATEGORIES= lang java -MASTER_SITES= GCC/snapshots/${DISTVERSION} +MASTER_SITES= GCC/snapshots/${DIST_VERSION} +DISTNAME= gcc-${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel MAINTAINER= gerald@FreeBSD.org @@ -26,11 +27,11 @@ BUILD_DEPENDS+= runtest:misc/dejagnu CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} -# DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names +# DIST_VERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. A PORTVERSION of # Y.2.1.s20140817 results in values of Y-20140817, Y.2.1, and Y # for these three. -DISTVERSION= ${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/} +DIST_VERSION= ${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/} PORTREVISION= 1 GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/} SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/} diff --git a/lang/gcc7-devel/Makefile b/lang/gcc7-devel/Makefile index ba9d34f..ff4c6a7 100644 --- a/lang/gcc7-devel/Makefile +++ b/lang/gcc7-devel/Makefile @@ -4,7 +4,8 @@ PORTNAME= gcc PORTVERSION= 7.0.1.s20170409 CATEGORIES= lang -MASTER_SITES= GCC/snapshots/${DISTVERSION} +MASTER_SITES= GCC/snapshots/${DIST_VERSION} +DISTNAME= gcc-${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel MAINTAINER= gerald@FreeBSD.org @@ -26,11 +27,11 @@ BUILD_DEPENDS+= runtest:misc/dejagnu CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} -# DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names +# DIST_VERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. A PORTVERSION of # Y.2.1.s20140817 results in values of Y-20140817, Y.2.1, and Y # for these three. -DISTVERSION= ${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/} +DIST_VERSION= ${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/} PORTREVISION= 1 GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/} SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/} -- cgit v1.1