Cleanup DIST* variables.

When appropriate:
- Try to use DISTVERSION{SUF,PRE}FIX
- Replace PORTNAME-PORTVERSION by DISTNAME
- Convert MASTER_SITES to use macros
- Other light cleanup

With hat:	portmgr
Sponsored by:	Absolight

12 files changed, 10 insertions, 19 deletions

diff --git a/mail/ecartis/Makefile b/mail/ecartis/Makefile
index 1e66be12914b..d41e2575b35a 100644
--- a/mail/ecartis/Makefile
+++ b/mail/ecartis/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	ecartis
-PORTVERSION=	1.0.0.s20060813
+DISTVERSION=	1.0.0-snap20060813
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ecartis.net/pub/ecartis/ \
 		http://rodrigo.osorio.free.fr/freebsd/distfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.s/-snap/}
 
 MAINTAINER=	jtrigg@spamcop.net
 COMMENT=	The Ecartis Listserver / Mailing List Manager
diff --git a/mail/junkfilter/Makefile b/mail/junkfilter/Makefile
index ade0d54495ab..eaf17417994b 100644
--- a/mail/junkfilter/Makefile
+++ b/mail/junkfilter/Makefile
@@ -7,7 +7,6 @@ CATEGORIES=	mail
 MASTER_SITES=	SF \
 		http://junkfilter.zer0.org/pkg/${PORTVERSION}/
 
-DISTNAME=	${PORTNAME}
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	gsutter@zer0.org
@@ -18,6 +17,7 @@ PORTSCOUT=	limit:^20
 RUN_DEPENDS=	procmail:${PORTSDIR}/mail/procmail
 
 NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}
 BINDIR=		${PREFIX}/etc/${PORTNAME}
 
 JFFILES=	LICENSE Makefile README TODO addresses bodychk dialups \
diff --git a/mail/mime4j/Makefile b/mail/mime4j/Makefile
index c285b033dcc2..fc3d4fa0b65f 100644
--- a/mail/mime4j/Makefile
+++ b/mail/mime4j/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	mime4j
 PORTVERSION=	0.7.2
 CATEGORIES=	mail java
-MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=	james/${PORTNAME}
+MASTER_SITES=	APACHE/james/${PORTNAME}
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}-bin
 
 MAINTAINER=	ale@FreeBSD.org
diff --git a/mail/mulberry/Makefile b/mail/mulberry/Makefile
index 2f3472be28c7..2722dd5c85ee 100644
--- a/mail/mulberry/Makefile
+++ b/mail/mulberry/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	mulberry
-PORTVERSION=	4.0.8
+DISTVERSION=	4_0_8
 PORTREVISION=	2
 CATEGORIES=	mail linux
-MASTER_SITES=	http://www.mulberrymail.com/downloads/Mulberry/%SUBDIR%/
-MASTER_SITE_SUBDIR=v${PORTVERSION:S/./_/g}
+MASTER_SITES=	http://www.mulberrymail.com/downloads/Mulberry/v${DISTVERSION:S/./_/g}/
 DISTNAME=	Mulberry
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
diff --git a/mail/p5-Email-Delete/Makefile b/mail/p5-Email-Delete/Makefile
index aa7db19825ef..885a627813fd 100644
--- a/mail/p5-Email-Delete/Makefile
+++ b/mail/p5-Email-Delete/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	2.00.1
 PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Email
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C|\.([0-9])$|\1|}
 
diff --git a/mail/p5-Email-MIME-ContentType/Makefile b/mail/p5-Email-MIME-ContentType/Makefile
index ddc25472af58..6af1c5e3e454 100644
--- a/mail/p5-Email-MIME-ContentType/Makefile
+++ b/mail/p5-Email-MIME-ContentType/Makefile
@@ -5,7 +5,6 @@ PORTVERSION=	1.01.7
 PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Email
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C|\.([0-9])$|\1|}
 
diff --git a/mail/postfinger/Makefile b/mail/postfinger/Makefile
index 6ab339ec4a77..764442ddb799 100644
--- a/mail/postfinger/Makefile
+++ b/mail/postfinger/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	postfinger
 PORTVERSION=	1.30
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.wl0.org/ftp.wl0.org/postfinger/
-DISTFILES=	${PORTNAME}-${PORTVERSION} README
+DISTFILES=	${DISTNAME} README
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	A.J.Caines@halplant.com
diff --git a/mail/qsheff/Makefile b/mail/qsheff/Makefile
index d56d1e88295f..ecb6356fa173 100644
--- a/mail/qsheff/Makefile
+++ b/mail/qsheff/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	qsheff-II
-PORTVERSION=	2.1.r3
+DISTVERSION=	2.1-r3
 PORTREVISION=	6
 CATEGORIES=	mail
 MASTER_SITES=	http://www.enderunix.org/qsheff/ \
 		SF/qsheff/qsheff/II-2.1-r3
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-r/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Qmail-queue replacement to filter mail traffic
diff --git a/mail/rainloop/Makefile b/mail/rainloop/Makefile
index 66f2333a4f85..192fba85bd75 100644
--- a/mail/rainloop/Makefile
+++ b/mail/rainloop/Makefile
@@ -2,10 +2,10 @@
 
 PORTNAME=	rainloop
 PORTVERSION=	1.8.2
+DISTVERSIONSUFFIX=	.${RBUILD}-${RHASH}
 PORTREVISION=	1
 CATEGORIES?=	mail www
 MASTER_SITES=	http://repository.rainloop.net/v2/webmail/${PORTVERSION}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}.${RBUILD}-${RHASH}
 
 MAINTAINER=	loic.blot@unix-experience.fr
 COMMENT=	Modern and interactive webmail
diff --git a/mail/sa-stats/Makefile b/mail/sa-stats/Makefile
index 268e606bb76c..cd27ca9c506c 100644
--- a/mail/sa-stats/Makefile
+++ b/mail/sa-stats/Makefile
@@ -7,8 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.rulesemporium.com/programs/ \
 		ftp://renatasystems.org/pub/FreeBSD/ports/distfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION}.txt
-EXTRACT_SUFX=
+EXTRACT_SUFX=	.txt
 EXTRACT_ONLY=
 
 MAINTAINER=	alexey@renatasystems.org
diff --git a/mail/simscan/Makefile b/mail/simscan/Makefile
index d8326463f7b8..e8a0147665e2 100644
--- a/mail/simscan/Makefile
+++ b/mail/simscan/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	1.4.0
 PORTREVISION=	6
 CATEGORIES=	mail security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 
 MAINTAINER=	lippe@FreeBSD.org
 COMMENT=	Fast Content/Anti-virus Scanner for qmail Written in C
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 7865c700bfc5..784d016f4932 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	squirrelmail
 PORTVERSION=	20150324
 CATEGORIES=	mail www
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	adamw/squirrelmail
+MASTER_SITES=	LOCAL/adamw/squirrelmail
 DISTNAME=	${PORTNAME}-${PORTVERSION}_0200-SVN.stable
 DIST_SUBDIR=	${PORTNAME}