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
author: mat <mat@FreeBSD.org> 2017-04-11 15:21:23 +0000
committer: mat <mat@FreeBSD.org> 2017-04-11 15:21:23 +0000
commit: af9c60625bda3e97370cc91b90ea306f292c209d (patch)
tree: 5a5d971bd61fde66fbaa1b8da9469708d182ffc8
parent: e0cd3420489573ca501c588fae760fa3739e168c (diff)
download: FreeBSD-ports-af9c60625bda3e97370cc91b90ea306f292c209d.zip
FreeBSD-ports-af9c60625bda3e97370cc91b90ea306f292c209d.tar.gz
31 files changed, 69 insertions, 85 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 1b808c4..2f6d1f8 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1296,9 +1296,9 @@ _PREMKINCLUDED=	yes
 IGNORE=			PORTVERSION ${PORTVERSION} may not contain '-' '_' or ','
 .endif
 .if defined(DISTVERSION)
-DEV_WARNING+=	"Defining both PORTVERSION and DISTVERSION is wrong, only set one and let the framework create the other one"
+DEV_ERROR+=	"Defining both PORTVERSION and DISTVERSION is wrong, only set one, if necessary, set DISTNAME"
 .endif
-DISTVERSION?=	${PORTVERSION:S/:/::/g}
+DISTVERSION=	${PORTVERSION:S/:/::/g}
 .elif defined(DISTVERSION)
 PORTVERSION=	${DISTVERSION:tl:C/([a-z])[a-z]+/\1/g:C/([0-9])([a-z])/\1.\2/g:C/:(.)/\1/g:C/[^a-z0-9+]+/./g}
 .endif
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index 3b404e6..3a1a8cd 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	20060211
 PORTREVISION=	15
 CATEGORIES=	audio
 MASTER_SITES=	GENTOO
-DISTVERSION=	0.0.8
+DISTNAME=	${PORTNAME}-0.0.8
 
 MAINTAINER=	erik@bz.bzflag.bz
 COMMENT=	3D positional spatialized sound library
diff --git a/audio/umodplayer/Makefile b/audio/umodplayer/Makefile
index e0ae27e..fff4a4a 100644
--- a/audio/umodplayer/Makefile
+++ b/audio/umodplayer/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	umodplayer
-PORTVERSION=	0.${DISTVERSION:tl}
-DISTVERSION=	B5.1
+PORTVERSION=	0.b5.1
 PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/UModPlayer%20B5
-DISTNAME=	${PORTNAME}_${DISTVERSION}
+DISTNAME=	${PORTNAME}_${PORTVERSION:S/^0.//:tu}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Console module player
diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index e30a797..f1a3063 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -3,12 +3,9 @@
 
 PORTNAME=	kermit
 PORTVERSION=	9.0.304
-DISTVERSIONPREFIX=	cku
-DISTVERSION=	304
-DISTVERSIONSUFFIX=	dev20
 CATEGORIES=	comms ftp net
 MASTER_SITES=	ftp://ftp.kermitproject.org/kermit/test/tar/
-DISTNAME=	${DISTVERSIONPREFIX}${DISTVERSION}-${DISTVERSIONSUFFIX}
+DISTNAME=	cku${PORTVERSION:E}-dev20
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Portable scriptable network and serial communication program
diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index 855ddeb..afbcf61 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 cdac55a..5a5147e 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 27cd6f7..2f0ef83 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 9e4a9fd..b9d6ea5 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 affbdae..cf9b4d1 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 1e8ce5e..c53d0c4 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
diff --git a/games/polyglot/Makefile b/games/polyglot/Makefile
index 7e2ed7b..b54750f 100644
--- a/games/polyglot/Makefile
+++ b/games/polyglot/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	polyglot
 DISTVERSION=	1.4.70b
-#PORTVERSION=
 #PORTREVISION=	0
 CATEGORIES=	games
 MASTER_SITES=	http://hardy.uhasselt.be/Toga/polyglot-release/ \
diff --git a/games/ultimatestunts/Makefile b/games/ultimatestunts/Makefile
index 27e9981..3bdb0e1 100644
--- a/games/ultimatestunts/Makefile
+++ b/games/ultimatestunts/Makefile
@@ -3,13 +3,12 @@
 
 PORTNAME=	ultimatestunts
 PORTVERSION=	0.7.7.1
-DISTVERSIONPREFIX=	srcdata-
-DISTVERSION=	${PORTVERSION:S/.//g}
 PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/sourcecode \
 		SF/nemysisfreebsdp/${CATEGORIES}/:icons
-DISTFILES=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${EXTRACT_SUFX} \
+DISTNAME=	${PORTNAME}-srcdata-${PORTVERSION:S/.//g}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}_icons${EXTRACT_SUFX}:icons
 
 MAINTAINER=	nemysis@FreeBSD.org
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index a614b12e..e3873bc 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -3,8 +3,6 @@
 
 PORTNAME=	hugin
 PORTVERSION=	2016.2.0
-DISTVERSION=	2016.2.0
-WRKSRC=		${WRKDIR}/hugin-2016.2.0
 PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
diff --git a/graphics/nvidia-texture-tools/Makefile b/graphics/nvidia-texture-tools/Makefile
index ee79bdb..0caa677 100644
--- a/graphics/nvidia-texture-tools/Makefile
+++ b/graphics/nvidia-texture-tools/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	nvidia-texture-tools
 PORTVERSION=	2.0.8.1 # needed to not bump PORTEPOCH; remove on next update
-DISTVERSION=	2.0.8
 PORTREVISION=	7
 CATEGORIES=	graphics
 
@@ -23,6 +22,7 @@ BROKEN_sparc64=	does not build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	castano
+GH_TAGNAME=	${PORTVERSION:R}
 
 USES=		alias cmake jpeg
 CMAKE_ARGS=	-DNVTT_SHARED=TRUE
diff --git a/graphics/nvidia-texture-tools/distinfo b/graphics/nvidia-texture-tools/distinfo
index 31c543e..54624da 100644
--- a/graphics/nvidia-texture-tools/distinfo
+++ b/graphics/nvidia-texture-tools/distinfo
@@ -1,2 +1,3 @@
-SHA256 (castano-nvidia-texture-tools-2.0.8_GH0.tar.gz) = d188d0b28d61985c06dbc151278f8daa3edd680e910977d1261ba9fa4a151629
-SIZE (castano-nvidia-texture-tools-2.0.8_GH0.tar.gz) = 939218
+TIMESTAMP = 1491085339
+SHA256 (castano-nvidia-texture-tools-2.0.8.1-2.0.8_GH0.tar.gz) = d188d0b28d61985c06dbc151278f8daa3edd680e910977d1261ba9fa4a151629
+SIZE (castano-nvidia-texture-tools-2.0.8.1-2.0.8_GH0.tar.gz) = 939218
diff --git a/java/bouncycastle/Makefile b/java/bouncycastle/Makefile
index b995549..f01e4ba 100644
--- a/java/bouncycastle/Makefile
+++ b/java/bouncycastle/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	java security
 MASTER_SITES=	http://downloads.bouncycastle.org/java/ \
 		http://polydistortion.net/bc/download/ \
 		http://bouncycastle.gva.es/download/
-DISTNAME=	crypto-${DISTVERSION}
+DISTNAME=	crypto-${JARVERSION}
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Cleanroom build of Java Cryptography Extensions
@@ -32,7 +32,7 @@ USE_ANT=	yes
 MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
 MAKE_ARGS=	-f jdk${JDKNVERSION}.xml
 ALL_TARGET=	build-provider build zip-src
-DISTVERSION=	${PORTVERSION:S/.//}
+JARVERSION=	${PORTVERSION:S/.//}
 
 JARS=		bcprov bcmail bctsp bcpg
 
@@ -49,18 +49,18 @@ post-patch:
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for jar in ${JARS}
-	${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/jars/${jar}-jdk${JDKNVERSION}-${DISTVERSION}.jar \
+	${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/jars/${jar}-jdk${JDKNVERSION}-${JARVERSION}.jar \
 	      ${STAGEDIR}${JAVAJARDIR}/${jar}.jar
-	${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/${jar}-jdk${JDKNVERSION}-${DISTVERSION}/src.zip \
+	${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/${jar}-jdk${JDKNVERSION}-${JARVERSION}/src.zip \
 	      ${STAGEDIR}${DATADIR}/${jar}-src.zip
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/jars/bcprov-jdk${JDKNVERSION}-${DISTVERSION}.jar \
+	${INSTALL_DATA} ${WRKSRC}/jars/bcprov-jdk${JDKNVERSION}-${JARVERSION}.jar \
 		${STAGEDIR}${JAVAJARDIR}/bcprov.jar
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.html ${STAGEDIR}${DOCSDIR}
 .for jar in ${JARS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/${jar}
-	@cd ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/${jar}-jdk${JDKNVERSION}-${DISTVERSION}/docs/ && \
+	@cd ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/${jar}-jdk${JDKNVERSION}-${JARVERSION}/docs/ && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${jar}
 .endfor
 
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/}
diff --git a/mail/dovecot-sieve/Makefile b/mail/dovecot-sieve/Makefile
index 49699f3..74b8d90 100644
--- a/mail/dovecot-sieve/Makefile
+++ b/mail/dovecot-sieve/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	dovecot-sieve
-PORTVERSION=	${DOVECOTVERSION}+${DISTVERSION}
-DISTVERSION=	0.1.19
+PORTVERSION=	${DOVECOTVERSION}+${SIEVEVERSION}
 PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
-DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
+DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${DISTVERSIONPREFIX}${SIEVEVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	yds@CoolRat.org
 COMMENT=	Sieve plugin for the Dovecot 'deliver' LDA
@@ -18,6 +17,7 @@ BUILD_DEPENDS=	${NONEXISTENT}:mail/dovecot:build
 RUN_DEPENDS=	dovecot>=${DOVECOTVERSION}.*:mail/dovecot
 
 DOVECOTVERSION=	1.2
+SIEVEVERSION=	0.1.19
 
 USES=		libtool:keepla
 GNU_CONFIGURE=	yes
diff --git a/mail/meta1/Makefile b/mail/meta1/Makefile
index bace734..406e46d 100644
--- a/mail/meta1/Makefile
+++ b/mail/meta1/Makefile
@@ -2,10 +2,10 @@
 
 PORTNAME=	meta1
 PORTVERSION=	1.1.0a.7.0
-DISTVERSION=	1.1.Alpha7.0
 PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.MeTA1.org/download/.alpha/ween/
+DISTNAME=	${PORTNAME}-1.1.Alpha7.0
 PKGNAMESUFFIX?=	${TLS_SUFFIX}${SASL_SUFFIX}${BERKELEYDB_SUFFIX}${PMILTER_SUFFIX}${PKGNAMESUFFIX2}
 
 MAINTAINER=	dinoex@FreeBSD.org
@@ -27,7 +27,6 @@ IGNORE=		your system does not support sysvipc
 .endif
 
 USES=	libtool
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-dependency-tracking
 MAKE_ENV+=	META1CONFDIR="${META1CONFDIR}"
diff --git a/mail/websieve/Makefile b/mail/websieve/Makefile
index 8607141..33eeab5 100644
--- a/mail/websieve/Makefile
+++ b/mail/websieve/Makefile
@@ -5,8 +5,8 @@ PORTNAME=	websieve
 PORTVERSION=	0.63.a
 PORTREVISION=	3
 CATEGORIES=	mail
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
-DISTNAME?=	${PORTNAME}-${DISTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${SIEVEVERSION}
+DISTNAME?=	${PORTNAME}-${SIEVEVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Web based Cyrus IMAP user admin client
@@ -14,7 +14,7 @@ COMMENT=	Web based Cyrus IMAP user admin client
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/GPL
 
-DISTVERSION=	063a
+SIEVEVERSION=	${PORTVERSION:S/.//g}
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
diff --git a/net/cvsync/Makefile b/net/cvsync/Makefile
index fc07d0b..23e56a1 100644
--- a/net/cvsync/Makefile
+++ b/net/cvsync/Makefile
@@ -2,10 +2,10 @@
 
 PORTNAME=	cvsync
 PORTVERSION=	0.25.0
-DISTVERSION=	0.24.19
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.cvsync.org/pub/cvsync/ \
 		ftp://ftp.allbsd.org/pub/cvsync/
+DISTNAME=	${PORTNAME}-0.24.19
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Portable CVS repository synchronization utility
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 5b5010b..525fd32 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -2,26 +2,19 @@
 # $FreeBSD$
 
 PORTNAME=	fwbuilder
-DISTVERSION=	5.1.0
-PORTVERSION=	${DISTVERSION}
+PORTVERSION=	5.1.0
+DISTVERSIONSUFFIX=	.${BUILD}
 PORTREVISION=	3
 CATEGORIES=	security
-BUILD=		3599
-# XXX in developement version of this port: PKGNAMESUFFIX=	-devel
-.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == -devel
-MASTER_SITES=   http://www.fwbuilder.org/nightly_builds/fwbuilder-5.0/current_build/
-PORTVERSION=	${DISTVERSION}.b${BUILD}
-PORTREVISION=	1
-.else
 MASTER_SITES=	SF/${PORTNAME}/Current_Packages/${PORTVERSION}
-.endif
-DISTVERSIONSUFFIX=	.${BUILD}
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Firewall Builder GUI and policy compilers
 
 #OPTIONS_DEFINE=	DOCS
 
+BUILD=		3599
+
 .if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == -devel
 CONFLICTS=	fwbuilder-[234].* fwbuilder-devel-[234].* \
 		libfwbuilder-[234].* libfwbuilder-devel-[234].*
@@ -32,7 +25,7 @@ CONFLICTS=	fwbuilder-[234].* fwbuilder-devel-* \
 LIB_DEPENDS=	libxslt.so:textproc/libxslt \
 		libnetsnmp.so:net-mgmt/net-snmp
 
-PLIST_SUB=	BUILD_VERSION=${DISTVERSION}.${BUILD}
+PLIST_SUB=	BUILD_VERSION=${PORTVERSION}.${BUILD}
 USE_QT4=	corelib \
 		gui \
 		iconengines \
diff --git a/sysutils/syslog-ng36/Makefile b/sysutils/syslog-ng36/Makefile
index 25cb40b..8c0472e 100644
--- a/sysutils/syslog-ng36/Makefile
+++ b/sysutils/syslog-ng36/Makefile
@@ -2,14 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	syslog-ng
-PORTVERSION=	3.6.4
+DISTVERSION=	3.6.4
 PORTREVISION=	1
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	36
 .endif
 CATEGORIES=	sysutils
-DISTVERSION=	${PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/}
-DISTFILES=	syslog-ng-${DISTVERSION}.tar.gz
 MASTER_SITES=	https://github.com/balabit/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/ \
 		http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/${DISTVERSION}/source/ \
 
diff --git a/sysutils/syslog-ng37/Makefile b/sysutils/syslog-ng37/Makefile
index b343b82..02490bc 100644
--- a/sysutils/syslog-ng37/Makefile
+++ b/sysutils/syslog-ng37/Makefile
@@ -8,10 +8,8 @@ PORTREVISION=	7
 PKGNAMESUFFIX=	37
 .endif
 CATEGORIES=	sysutils
-DISTVERSION=	${PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/}
-#DISTFILES=	syslog-ng-${DISTVERSION}.tar.gz
 #MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
-DISTFILES=      syslog-ng-${DISTVERSION}_with_man.tar.gz
+DISTNAME=      syslog-ng-${DISTVERSION}_with_man
 MASTER_SITES=   http://peter.czanik.hu/freebsd/
 
 MAINTAINER=	cy@FreeBSD.org
diff --git a/textproc/p5-PerlPoint-Package/Makefile b/textproc/p5-PerlPoint-Package/Makefile
index 3e1ca73..337ebb0 100644
--- a/textproc/p5-PerlPoint-Package/Makefile
+++ b/textproc/p5-PerlPoint-Package/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	PerlPoint-Package
 PORTVERSION=	0.45.2
-DISTVERSION=	${PORTVERSION:C/\.(.)$/\1/}
 PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(.)$/\1/}
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile
index 2c3a792..4be373b 100644
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	WebMagick
 PORTVERSION=	2.03p29
-DISTVERSION=	2.03pre29
 PORTEPOCH=	1
 CATEGORIES=	www graphics
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}-beta/${DISTVERSION}
+DISTNAME=	${PORTNAME}-2.03pre29
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Image Web Generator - recursively build HTMLs, imagemaps, thumbnails
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
author	mat <mat@FreeBSD.org>	2017-04-11 15:21:23 +0000
committer	mat <mat@FreeBSD.org>	2017-04-11 15:21:23 +0000
commit	af9c60625bda3e97370cc91b90ea306f292c209d (patch)
tree	5a5d971bd61fde66fbaa1b8da9469708d182ffc8
parent	e0cd3420489573ca501c588fae760fa3739e168c (diff)
download	FreeBSD-ports-af9c60625bda3e97370cc91b90ea306f292c209d.zip FreeBSD-ports-af9c60625bda3e97370cc91b90ea306f292c209d.tar.gz