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

1 files changed, 4 insertions, 3 deletions

diff --git a/www/caudium14/Makefile b/www/caudium14/Makefile
index a58f279..c297b89 100644
--- a/www/caudium14/Makefile
+++ b/www/caudium14/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	caudium14
-PORTVERSION=	${DISTVERSION}.${PIKEVERSION}
-DISTVERSION=	1.4.18
+PORTVERSION=	${CAUDIUMVERSION}.${PIKEVERSION}
 PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/caudium/ \
 		ftp://ftp.stack.nl/pub/users/johans/caudium/
-DISTNAME=	Caudium-${DISTVERSION}
+DISTNAME=	Caudium-${CAUDIUMVERSION}
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Free webserver based on the Roxen Challenger 1.3 code base
@@ -17,6 +16,8 @@ BUILD_DEPENDS=	pike78:lang/pike78
 LIB_DEPENDS=	libsablot.so:textproc/sablotron
 RUN_DEPENDS=	lsof:sysutils/lsof
 
+CAUDIUMVERSION=	1.4.18
+
 USES=		gmake tar:bzip2
 
 # Pike version included from lang/pike78