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

6 files changed, 9 insertions, 11 deletions

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index a94686420654..4d4f3a9d92ed 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -3,13 +3,12 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}.${EMACS_REV}
+DISTVERSIONSUFFIX=	.${GIT_REV}
 PORTEPOCH=	2
 CATEGORIES=	editors ipv6
-MASTER_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	ashish
+MASTER_SITES=	http://distfiles.pirateparty.in/ashish/ \
+		LOCAL/ashish
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-${PORTVERSION}.${GIT_REV}
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	GNU editing macros
diff --git a/editors/fte/Makefile b/editors/fte/Makefile
index 0d31fe73e63c..25c6a4bbdb9e 100644
--- a/editors/fte/Makefile
+++ b/editors/fte/Makefile
@@ -5,8 +5,8 @@ PORTNAME=	fte
 PORTVERSION=	20110708
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-DISTFILES=	${PORTNAME}-${PORTVERSION:S/./b/}-src.zip \
-		${PORTNAME}-${PORTVERSION:S/./b/}-common.zip
+DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX} \
+		${DISTNAME}-common${EXTRACT_SUFX}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile
index 7ade913a232a..861b6f547aa5 100644
--- a/editors/gnotepad+/Makefile
+++ b/editors/gnotepad+/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	9
 CATEGORIES=	editors www gnome
 MASTER_SITES=	SF/gnotepad/gnotepad-stable/${PORTVERSION} \
 		SF/gnotepad/gnotepad%20User_s%20Manual/${DOCVERSION}:doc
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:DEFAULT
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple GTK-based text/HTML editor
diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index 0ce9bb36af67..a765992cb61d 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	jed
-PORTVERSION=	0.99.19
+DISTVERSION=	0.99-19
 PORTREVISION=	4
 CATEGORIES=	editors
 MASTER_SITES=	ftp://space.mit.edu/pub/davis/jed/v${PORTVERSION:R}/ \
 		ftp://ftp.fu-berlin.de/pub/unix/editors/jed/v${PORTVERSION:R}/ \
 		ftp://ftp.ntua.gr/pub/lang/slang/jed/v${PORTVERSION:R}/
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	SLang-based text editor
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index fbd46cddd32e..8a57428341e5 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -3,11 +3,11 @@
 
 PORTNAME=	lazarus
 PORTVERSION=	1.2.6
+DISTVERSIONSUFFIX=	-0
 PORTREVISION?=	0
 CATEGORIES=	editors devel
 MASTER_SITES=	SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \
 		${MASTER_SITE_LOCAL:S|$|acm/freepascal/|}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/$/-0/}
 DIST_SUBDIR=	freepascal
 
 MAINTAINER?=	freebsd-fpc@FreeBSD.org
diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile
index c2935765cf22..1424f8b88131 100644
--- a/editors/texworks/Makefile
+++ b/editors/texworks/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	texworks
 PORTVERSION=	0.4.5
+DISTVERSIONSUFFIX=	-r${VCS_REVISION}
 PORTREVISION=	4
 CATEGORIES=	editors
 MASTER_SITES=	GOOGLE_CODE
-DISTNAME=	${PORTNAME}-${PORTVERSION}-r${VCS_REVISION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple TeX front-end program