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

6 files changed, 10 insertions, 13 deletions

diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index 855ddebb1fc3..afbcf61b995c 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -3,9 +3,9 @@
 PORTNAME=	gcc
 PORTVERSION=	5.4.0
 CATEGORIES=	devel
-MASTER_SITES=	GCC/releases/gcc-${DISTVERSION}
+MASTER_SITES=	GCC/releases/gcc-${DIST_VERSION}
 PKGNAMEPREFIX=	avr-
-# DISTNAME=	gcc-${DISTVERSION}
+DISTNAME=	gcc-${DIST_VERSION}
 
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	FSF GCC for Atmel AVR 8-bit RISC cross-development
@@ -21,11 +21,11 @@ LIB_DEPENDS=	libmpfr.so:math/mpfr \
 RUN_DEPENDS=	avr-as:devel/avr-binutils \
 		avr-ld:devel/avr-binutils
 
-# 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
 # 4.Y.2.s20130808 results in values of 4.Y-20130808, 4.Y.2, and 4Y
 # for these three.
-DISTVERSION=	${PORTVERSION:C/([0-9]+\.[0-9]+).*\.s([0-9]+)/\1-\2/}
+DIST_VERSION=	${PORTVERSION:C/([0-9]+\.[0-9]+).*\.s([0-9]+)/\1-\2/}
 GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 
diff --git a/devel/libedit/Makefile b/devel/libedit/Makefile
index cdac55a4c12a..5a5147eb649d 100644
--- a/devel/libedit/Makefile
+++ b/devel/libedit/Makefile
@@ -3,11 +3,11 @@
 
 PORTNAME=	libedit
 PORTVERSION=	${EDITVERSION}.${EDITDATE}
-DISTVERSION=	${EDITDATE}-${EDITVERSION}
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://thrysoee.dk/editline/
+DISTNAME=	${PORTNAME}-${EDITDATE}-${EDITVERSION}
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Command line editor library
@@ -17,7 +17,6 @@ LICENSE=	BSD2CLAUSE
 USES=		libtool ncurses pathfix
 EDITVERSION=	3.1
 EDITDATE=	20170329
-WRKSRC=		${WRKDIR}/${PORTNAME}-${EDITDATE}-${EDITVERSION}
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
diff --git a/devel/p5-DateTime-Format-Excel/Makefile b/devel/p5-DateTime-Format-Excel/Makefile
index 27cd6f7da481..2f0ef835017d 100644
--- a/devel/p5-DateTime-Format-Excel/Makefile
+++ b/devel/p5-DateTime-Format-Excel/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	DateTime-Format-Excel
-PORTVERSION=	0.31.00
+PORTVERSION=	0.31
 PORTREVISION=	1
-DISTVERSION=	${PORTVERSION:C/\.(..)$//}
 PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
diff --git a/devel/p5-MouseX-Getopt/Makefile b/devel/p5-MouseX-Getopt/Makefile
index 9e4a9fdb945c..b9d6ea570322 100644
--- a/devel/p5-MouseX-Getopt/Makefile
+++ b/devel/p5-MouseX-Getopt/Makefile
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	MouseX-Getopt
-PORTVERSION=	${DISTVERSION}00
-DISTVERSION=	0.36
+PORTVERSION=	0.3600
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/00$//}
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for a Mouse role to process command line options
diff --git a/devel/p5-POE-Stage/Makefile b/devel/p5-POE-Stage/Makefile
index affbdaeb7235..cf9b4d1a0edd 100644
--- a/devel/p5-POE-Stage/Makefile
+++ b/devel/p5-POE-Stage/Makefile
@@ -6,9 +6,8 @@ PORTVERSION=	0.0600
 PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/0$//}
 PKGNAMEPREFIX=	p5-
-DISTVERSION=	0.060
-PORTREVISION=	1
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Base class for formalized POE components
diff --git a/devel/py-clonedigger/Makefile b/devel/py-clonedigger/Makefile
index 1e8ce5e6d74b..c53d0c4c951c 100644
--- a/devel/py-clonedigger/Makefile
+++ b/devel/py-clonedigger/Makefile
@@ -3,11 +3,11 @@
 
 PORTNAME=	clonedigger
 PORTVERSION=	1.0.11
+DISTVERSIONSUFFIX=	-beta
 PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTVERSION=	${PORTVERSION}-beta
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Detect similar code in Python and Java programs