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
author: Mathieu Arnold <mat@FreeBSD.org> 2015-05-11 18:34:57 +0000
committer: Mathieu Arnold <mat@FreeBSD.org> 2015-05-11 18:34:57 +0000
commit: 88bfe4bd43787219ab4de75bd68c490c98776dfc (patch)
tree: 634e1ef4990207301493f26b46d80abe56b9f2b3
parent: Introduce two new magic master sites macros, APACHE_COMMONS_BINARIES and (diff)
285 files changed, 410 insertions, 582 deletions
diff --git a/archivers/deco/Makefile b/archivers/deco/Makefile
index 635c8ceb6f59..b504fbf0b0d3 100644
--- a/archivers/deco/Makefile
+++ b/archivers/deco/Makefile
@@ -4,10 +4,10 @@ PORTNAME=	deco
 PORTVERSION=	1.6.3
 PORTREVISION=	1
 CATEGORIES=	archivers
-MASTER_SITES=	http://hartlich.com/deco/download/:site1 \
+MASTER_SITES=	http://hartlich.com/deco/download/ \
 		http://hartlich.com/deco/archive/download/:site2
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz:site1 \
-		${PORTNAME}-archive-1.6.tar.gz:site2
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${PORTNAME}-archive-1.6${EXTRACT_SUFX}:site2
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Program to extract various archive file formats
diff --git a/archivers/linux-f10-upx/Makefile b/archivers/linux-f10-upx/Makefile
index a5aa4b03eb40..9df5d31d7ba3 100644
--- a/archivers/linux-f10-upx/Makefile
+++ b/archivers/linux-f10-upx/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=		3.03
 CATEGORIES=		archivers linux
 MASTER_SITES=		LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 PKGNAMEPREFIX=		linux-f10-
-DISTNAME=		${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=		emulation@FreeBSD.org
 COMMENT=		UPX, a high-performance executable packer (Linux Fedora 10)
diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile
index 476f3e7be421..2e737e488f7b 100644
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	3.91
 CATEGORIES=	archivers
 MASTER_SITES=	http://upx.sourceforge.net/download/\
 		SF/sevenzip/7-Zip/${LZMA_VER}:lzma
-DISTFILES=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX}\
+DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX} \
 		7z${LZMA_VER:S/.//g}${EXTRACT_SUFX}:lzma
 
 MAINTAINER=	fjoe@FreeBSD.org
diff --git a/audio/guspat/Makefile b/audio/guspat/Makefile
index 9af2d2037621..30a6cc38b90e 100644
--- a/audio/guspat/Makefile
+++ b/audio/guspat/Makefile
@@ -7,8 +7,8 @@ PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://plamo.linet.gr.jp/pub/Plamo-src/contrib/Sound/timidity/ \
 		LOCAL/nork
-DISTFILES=	${PORTNAME}-${PORTVERSION}-required${EXTRACT_SUFX} \
-		${PORTNAME}-${PORTVERSION}-optional${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}-required${EXTRACT_SUFX} \
+		${DISTNAME}-optional${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Izumo collection of Gravis Ultrasound MIDI patches
diff --git a/audio/libaacplus/Makefile b/audio/libaacplus/Makefile
index dd2d7387f4eb..7247af00e4c6 100644
--- a/audio/libaacplus/Makefile
+++ b/audio/libaacplus/Makefile
@@ -5,10 +5,10 @@ PORTNAME=	libaacplus
 PORTVERSION=	2.0.2
 PORTREVISION=	7
 CATEGORIES=	audio
-MASTER_SITES=	http://tipok.org.ua/downloads/media/aacplus/libaacplus/:site1\
-		ftp://ftp.3gpp.org/Specs/archive/26_series/26.410/:site2\
+MASTER_SITES=	http://tipok.org.ua/downloads/media/aacplus/libaacplus/ \
+		ftp://ftp.3gpp.org/Specs/archive/26_series/26.410/:site2 \
 		http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/:site2
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:site1\
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${SRC26410}:site2
 
 MAINTAINER=	takefu@airport.fm
diff --git a/audio/mp3c/Makefile b/audio/mp3c/Makefile
index 5170c3514272..8795d066fbbc 100644
--- a/audio/mp3c/Makefile
+++ b/audio/mp3c/Makefile
@@ -6,9 +6,9 @@ PORTVERSION=	0.31
 PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.wspse.de/linux/wspse/:src
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:src \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src \
 		cdrip.sh
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	joris@vandalon.nl
 COMMENT=	CD to mp3c converter with a console frontend
diff --git a/biology/protomol/Makefile b/biology/protomol/Makefile
index 89f634f59c6e..e8c7d8af8846 100644
--- a/biology/protomol/Makefile
+++ b/biology/protomol/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	2.0.3
 PORTREVISION=	11
 CATEGORIES=	biology
 MASTER_SITES=	SF/${PORTNAME}/ProtoMol/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-tar.gz
-EXTRACT_SUFX=	# empty
+DISTFILES=	${DISTNAME}-tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OO, component based, framework for molecular dynamics (MD) simulations
diff --git a/cad/alliance/Makefile b/cad/alliance/Makefile
index e234d90983d1..30eaa7be1946 100644
--- a/cad/alliance/Makefile
+++ b/cad/alliance/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	alliance
-PORTVERSION=	5.0.20120515
+DISTVERSION=	5.0-20120515
 CATEGORIES=	cad
 MASTER_SITES=	http://ftp.lyx.org/lip6/softs/alliance/distribution/5.0/ \
 		http://ftp.jussieu.fr/lip6/softs/alliance/distribution/5.0/ \
 		http://www-asim.lip6.fr/pub/alliance/distribution/5.0/
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Complete set of CAD tools and libraries for VLSI design
diff --git a/cad/electric/Makefile b/cad/electric/Makefile
index 3076f46a683f..4e4ddf65c24a 100644
--- a/cad/electric/Makefile
+++ b/cad/electric/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	electric
 PORTVERSION=	7.0.0
 PORTREVISION=	4
 CATEGORIES=	cad
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/^(...)\./\1/}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile
index 0ce3d8a80223..d44af868604e 100644
--- a/cad/gnucap/Makefile
+++ b/cad/gnucap/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	gnucap
-PORTVERSION=	2009.12.07
+DISTVERSION=	2009-12-07
 CATEGORIES=	cad
 MASTER_SITES=	http://www.gnucap.org/devel/ \
 		http://www.gnucap.org/devel/archive/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/g}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The GNU Circuit Analysis Package
diff --git a/cad/tochnog/Makefile b/cad/tochnog/Makefile
index d231eeca5b6b..33c01880cb9e 100644
--- a/cad/tochnog/Makefile
+++ b/cad/tochnog/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/Tochnog%20Latest%20January%202014
 DISTFILES=	Sources${EXTRACT_SUFX} gid${EXTRACT_SUFX} \
 		tools${EXTRACT_SUFX} test${EXTRACT_SUFX}
-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
+DIST_SUBDIR=	${DISTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free explicit/implicit Finite Element Program
diff --git a/chinese/cce/Makefile b/chinese/cce/Makefile
index 7aa3c1dbe1b3..2aa2327f62eb 100644
--- a/chinese/cce/Makefile
+++ b/chinese/cce/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	cce
 PORTVERSION=	0.51
+DISTVERSIONSUFFIX=	-02132004-dist
 PORTREVISION=	2
 CATEGORIES=	chinese
 MASTER_SITES=	SF/${PORTNAME}2k/${PORTNAME}/Ver_${PORTVERSION}_02132004
-DISTNAME=	${PORTNAME}-${PORTVERSION}-02132004-dist
 
 PATCH_SITES=	http://www.chinatinco.com/freebsd/cce/ \
 		http://www.525183.com/freebsd/cce/ \
diff --git a/chinese/fqterm/Makefile b/chinese/fqterm/Makefile
index c490ad0c2d92..7f91a0bc35d0 100644
--- a/chinese/fqterm/Makefile
+++ b/chinese/fqterm/Makefile
@@ -3,11 +3,10 @@
 
 PORTNAME=	fqterm
 PORTVERSION=	0.9.3
+DISTVERSIONSUFFIX=	-src-r569
 PORTREVISION=	8
 CATEGORIES=	chinese
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src-r569${SUTRACT_SUFFIX}
+MASTER_SITES=	GOOGLE_CODE/${PORTNAME}
 
 MAINTAINER=	darcsis@gmail.com
 COMMENT=	BBS client for BSD/Linux
diff --git a/chinese/ibus-chewing/Makefile b/chinese/ibus-chewing/Makefile
index 2ec2b74c4010..c911c66c8cb9 100644
--- a/chinese/ibus-chewing/Makefile
+++ b/chinese/ibus-chewing/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	ibus-chewing
 PORTVERSION=	1.4.14
 CATEGORIES=	chinese
-DISTNAME=	${PORTNAME}-${PORTVERSION}-Source
 
 MAINTAINER=	eric@camachat.org
 COMMENT=	Chewing engine for IBus
diff --git a/chinese/ibus-chewing/distinfo b/chinese/ibus-chewing/distinfo
index fbd4c1f0a33b..37f88fd6d17e 100644
--- a/chinese/ibus-chewing/distinfo
+++ b/chinese/ibus-chewing/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ibus-chewing-1.4.14-Source_GH0.tar.gz) = a3f4ad50b3e3216a6074f66f52400d9b9527f799b3449dfdd3143c7e8e4a2691
-SIZE (ibus-chewing-1.4.14-Source_GH0.tar.gz) = 91669
+SHA256 (definite-ibus-chewing-1.4.14_GH0.tar.gz) = a3f4ad50b3e3216a6074f66f52400d9b9527f799b3449dfdd3143c7e8e4a2691
+SIZE (definite-ibus-chewing-1.4.14_GH0.tar.gz) = 91669
diff --git a/chinese/reciteword/Makefile b/chinese/reciteword/Makefile
index 23e6e66a5d92..ec636fff769c 100644
--- a/chinese/reciteword/Makefile
+++ b/chinese/reciteword/Makefile
@@ -4,10 +4,10 @@
 PORTNAME=	reciteword
 PORTVERSION=	0.8.5
 CATEGORIES=	chinese
-MASTER_SITES=	SF:src \
+MASTER_SITES=	SF \
 		SF/${PORTNAME}/${PORTNAME}-books/${PORTVERSION}:books \
 		SF/${PORTNAME}/${PORTNAME}-dicts/0.8.2:dicts
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.bz2:src \
+DISTFILES=	${DISTNAME}.tar.bz2 \
 		${PORTNAME}-books-${PORTVERSION}.tar.bz2:books \
 		${PORTNAME}-dicts-0.8.2.tar.bz2:dicts
 
diff --git a/comms/lirc/Makefile b/comms/lirc/Makefile
index 9078f7141065..94f32dc88646 100644
--- a/comms/lirc/Makefile
+++ b/comms/lirc/Makefile
@@ -7,7 +7,6 @@ PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	comms
 MASTER_SITES=	SF/${PORTNAME}/LIRC/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/p1/-pre1/}
 
 MAINTAINER=	nox@FreeBSD.org
 COMMENT=	Linux Infrared Remote Control
diff --git a/comms/ncid/Makefile b/comms/ncid/Makefile
index 32823bdcd984..0090419894c4 100644
--- a/comms/ncid/Makefile
+++ b/comms/ncid/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	ncid
 PORTVERSION=	1.0
 CATEGORIES=	comms
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/.1//g}
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	cpm@fbsd.es
diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile
index 6d4db6cdb879..b71be67c78e5 100644
--- a/converters/pdf2djvu/Makefile
+++ b/converters/pdf2djvu/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.7.17
 PORTREVISION=	4
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-DISTNAME=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFFIX}
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	darcsis@gmail.com
 COMMENT=	Pdf2djvu creates DjVu files from PDF files
diff --git a/databases/flamerobin/Makefile b/databases/flamerobin/Makefile
index 2ae3677794ab..60b9e497d69e 100644
--- a/databases/flamerobin/Makefile
+++ b/databases/flamerobin/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	flamerobin
 PORTVERSION=	0.9.2
 PORTREVISION=	4
 CATEGORIES=	databases
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/databases/hbase/Makefile b/databases/hbase/Makefile
index 4cfc15c0a67d..8ff36dfb0913 100644
--- a/databases/hbase/Makefile
+++ b/databases/hbase/Makefile
@@ -4,11 +4,10 @@
 PORTNAME=	hbase
 PORTVERSION=	0.98.9
 CATEGORIES=	databases java
-MASTER_SITES=	${MASTER_SITE_APACHE} \
+MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		LOCAL/demon/:maven \
 		http://people.freebsd.org/~demon/:maven
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}-${PORTVERSION}
-DISTFILES=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} FreeBSD-hbase-${PORTVERSION}-maven-repository.tar.gz:maven
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} FreeBSD-hbase-${PORTVERSION}-maven-repository.tar.gz:maven
 DIST_SUBDIR=	hadoop
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/databases/jakarta-commons-dbutils/Makefile b/databases/jakarta-commons-dbutils/Makefile
index a041cb61c0aa..12963e9415e4 100644
--- a/databases/jakarta-commons-dbutils/Makefile
+++ b/databases/jakarta-commons-dbutils/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	commons-dbutils
 PORTVERSION=	1.6
 CATEGORIES=	databases java
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_BINARIES}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_BINARIES
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
diff --git a/databases/java-mybatis/Makefile b/databases/java-mybatis/Makefile
index 20905affe267..b3fa95522eba 100644
--- a/databases/java-mybatis/Makefile
+++ b/databases/java-mybatis/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	mybatis
 PORTVERSION=	3.0.3
 PORTREVISION=	1
 CATEGORIES=	databases devel java
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	java-
 DISTFILES=	${PORTNAME}-${PORTVERSION}-bundle${EXTRACT_SUFX}
 
diff --git a/databases/mysql-connector-c/Makefile b/databases/mysql-connector-c/Makefile
index 9d78cc912411..83569ecf10d7 100644
--- a/databases/mysql-connector-c/Makefile
+++ b/databases/mysql-connector-c/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	mysql-connector-c
 PORTVERSION=	6.1.5
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR=	Connector-C
+MASTER_SITES=	MYSQL/Connector-C
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile
index 41830be2ac38..40e792e14314 100644
--- a/databases/mysql-connector-odbc/Makefile
+++ b/databases/mysql-connector-odbc/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	mysql-connector-odbc
 PORTVERSION=	5.3.4
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR=	Connector-ODBC/5.3
+MASTER_SITES=	MYSQL/Connector-ODBC/5.3
 PKGNAMESUFFIX=	-${DRIVER_MANAGER}-mysql${MYSQL_VER}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/databases/ocaml-dbm/Makefile b/databases/ocaml-dbm/Makefile
index 08988c2cc37b..ab4b9a37d26e 100644
--- a/databases/ocaml-dbm/Makefile
+++ b/databases/ocaml-dbm/Makefile
@@ -7,7 +7,6 @@ CATEGORIES=	databases
 MASTER_SITES=	https://forge.ocamlcore.org/frs/download.php/728/
 PKGNAMEPREFIX=	ocaml-
 DISTNAME=	caml${PORTNAME}-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jaapb@kerguelen.org
 COMMENT=	OCaml binding to the NDBM and GDBM database library
@@ -16,6 +15,7 @@ LICENSE=	LGPL20
 
 CONFLICTS=	ocaml-[0-3]* ocaml-nox11-[0-3]*
 
+USES=		tar:tgz
 HAS_CONFIGURE=	yes
 USE_OCAML=	yes
 DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
diff --git a/databases/pear-DB/Makefile b/databases/pear-DB/Makefile
index f1b4fc9b2c9a..aab741fa593f 100644
--- a/databases/pear-DB/Makefile
+++ b/databases/pear-DB/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	DB
 PORTVERSION=	1.7.14
 PORTEPOCH=	1
 CATEGORIES=	databases www pear
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/RC/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR Database Abstraction Layer
diff --git a/databases/pyspatialite/Makefile b/databases/pyspatialite/Makefile
index 18aaf72e99a7..51510a39f72b 100644
--- a/databases/pyspatialite/Makefile
+++ b/databases/pyspatialite/Makefile
@@ -5,9 +5,9 @@ PORTNAME=	pyspatialite
 PORTVERSION=	3.0.1
 PORTREVISION=	5
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP:pyspatialite
+MASTER_SITES=	CHEESESHOP/source/p/${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTFILES=	${PORTNAME}-${PORTVERSION}-alpha-0${EXTRACT_SUFX}:pyspatialite
+DISTNAME=	${PORTNAME}-${PORTVERSION}-alpha-0
 
 MAINTAINER=	coder@tuxfamily.org
 COMMENT=	DB-API 2.0 interface for SQLite 3.x with Spatialite
@@ -24,7 +24,6 @@ USES=		iconv python
 USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	pyspatialite
 
-
 .include <bsd.port.pre.mk>
 
 .if empty(ICONV_LIB)
diff --git a/deskutils/ganttproject/Makefile b/deskutils/ganttproject/Makefile
index bf94bd370aa5..662b9b19dba1 100644
--- a/deskutils/ganttproject/Makefile
+++ b/deskutils/ganttproject/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	ganttproject
 PORTVERSION=	2.6.2
 PORTREVISION=	1
 CATEGORIES=	deskutils java
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	${PORTNAME}-${PORTVERSION}-r1544
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/deskutils/treesheets/Makefile b/deskutils/treesheets/Makefile
index 6d41750ce78d..3bba00bf9c2f 100644
--- a/deskutils/treesheets/Makefile
+++ b/deskutils/treesheets/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	treesheets
 PORTVERSION=	0.0.20150405
 CATEGORIES=	deskutils
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	lightside@gmx.com
 COMMENT=	Free form data organizer
diff --git a/deskutils/treesheets/distinfo b/deskutils/treesheets/distinfo
index f1f8bad71c3a..9b6f291ddb64 100644
--- a/deskutils/treesheets/distinfo
+++ b/deskutils/treesheets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (treesheets-0.0.20150405_GH0.tar.gz) = d16f215a857054098b10f5402ef35efe37ada6f8d91161af12c5f1d2fc8b97fb
-SIZE (treesheets-0.0.20150405_GH0.tar.gz) = 1788802
+SHA256 (aardappel-treesheets-0.0.20150405-b994c63_GH0.tar.gz) = d16f215a857054098b10f5402ef35efe37ada6f8d91161af12c5f1d2fc8b97fb
+SIZE (aardappel-treesheets-0.0.20150405-b994c63_GH0.tar.gz) = 1788802
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index adb1963a8452..bddf50991a7c 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	apache-ant
 PORTVERSION=	1.9.4
 CATEGORIES=	devel java
-MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:bin,} \
+MASTER_SITES=	APACHE/ant/binaries/:bin \
 		LOCAL/hq:man
 DISTFILES=	${ANT_DISTFILE}:bin \
 		${MANPAGE_DISTFILE}:man
diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index 59914b4cb8d5..9afb2ad8036d 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	cdk
-PORTVERSION=	5.0.20120323
+DISTVERSION=	5.0-20120323
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://invisible-island.net/cdk/
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Curses Development Kit for speedy development of full screen programs
diff --git a/devel/cscout/Makefile b/devel/cscout/Makefile
index 129009eba8fd..a396a5703332 100644
--- a/devel/cscout/Makefile
+++ b/devel/cscout/Makefile
@@ -7,15 +7,14 @@ PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.spinellis.gr/cscout/ \
 		http://www.dmst.aueb.gr/dds/cscout/
-DISTFILES=	${PORTNAME}-${PORTVERSION}-neutral${EXTRACT_SUFX} \
-		${PORTNAME}-${PORTVERSION}-fbsd-${ARCH}${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}-neutral${EXTRACT_SUFX} \
+		${DISTNAME}-fbsd-${ARCH}${EXTRACT_SUFX}
 
 MAINTAINER=	dds@FreeBSD.org
 COMMENT=	Source code analyzer and refactoring browser for C program collections
 
 LIB_DEPENDS+=	libc.so.6:${PORTSDIR}/misc/compat6x
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386 amd64 sparc64
 ONLY_FOR_ARCHS_REASON=	The port fetches and installs precompiled binaries
diff --git a/devel/cvsmonitor/Makefile b/devel/cvsmonitor/Makefile
index 459fb6f07df5..e1d8e4900fdb 100644
--- a/devel/cvsmonitor/Makefile
+++ b/devel/cvsmonitor/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	cvsmonitor
-PORTVERSION=	0.6.3
+DISTVERSION=	0-6-3
 PORTREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Stable
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/g}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Monitor activity on a CVS Repository
diff --git a/devel/gdb66/Makefile b/devel/gdb66/Makefile
index 2325083d13ae..4a1c42cd9fff 100644
--- a/devel/gdb66/Makefile
+++ b/devel/gdb66/Makefile
@@ -5,10 +5,9 @@ PORTNAME=	gdb
 PORTVERSION=	6.6
 PORTREVISION?=	3
 CATEGORIES=	devel
-MASTER_SITES=   ${MASTER_SITE_GNU:S,$,:gdb,}	\
+MASTER_SITES=   GNU/gdb/ \
 		http://aldan.algebra.com/~mi/:gdbtk
-MASTER_SITE_SUBDIR=gdb/:gdb
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:gdb
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT?=	GNU GDB of newer version than comes with the system
diff --git a/devel/git/Makefile b/devel/git/Makefile
index 8e594f02d11a..664b531972e3 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -4,12 +4,11 @@
 PORTNAME=	git
 PORTVERSION=	2.4.0
 CATEGORIES=	devel
-MASTER_SITES=	KERNEL_ORG
-MASTER_SITE_SUBDIR=	software/scm/git
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+MASTER_SITES=	KERNEL_ORG/software/scm/git
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}-manpages-${PORTVERSION}${EXTRACT_SUFX}
 # We manually extract the htmldocs.
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}-manpages-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	garga@FreeBSD.org
diff --git a/devel/hadoop/Makefile b/devel/hadoop/Makefile
index b3851e92f8d3..80c9d69f8836 100644
--- a/devel/hadoop/Makefile
+++ b/devel/hadoop/Makefile
@@ -5,10 +5,9 @@ PORTNAME=	hadoop
 PORTVERSION=	1.2.1
 PORTREVISION=	3
 CATEGORIES=	devel java
-MASTER_SITES=	${MASTER_SITE_APACHE} \
+MASTER_SITES=	APACHE/${PORTNAME}/core/${PORTNAME}-${PORTVERSION} \
 		http://dist.codehaus.org/jetty/jetty-6.1.14/:jetty
-MASTER_SITE_SUBDIR=	${PORTNAME}/core/${PORTNAME}-${PORTVERSION}
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} jetty-6.1.14.zip:jetty
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} jetty-6.1.14.zip:jetty
 DIST_SUBDIR=	hadoop
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/devel/hive/Makefile b/devel/hive/Makefile
index 1878c1061713..e8300bba5cc2 100644
--- a/devel/hive/Makefile
+++ b/devel/hive/Makefile
@@ -4,10 +4,9 @@
 PORTNAME=	hive
 PORTVERSION=	1.1.0
 CATEGORIES=	devel java
-MASTER_SITES=	${MASTER_SITE_APACHE} \
+MASTER_SITES=	APACHE/${PORTNAME}/stable \
 		LOCAL/demon/:maven \
 		http://people.freebsd.org/~demon/:maven
-MASTER_SITE_SUBDIR=${PORTNAME}/stable
 DISTFILES=	apache-${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven
 DIST_SUBDIR=	hadoop
 
diff --git a/devel/jakarta-commons-configuration/Makefile b/devel/jakarta-commons-configuration/Makefile
index bcbe147a2f54..028270d17bd3 100644
--- a/devel/jakarta-commons-configuration/Makefile
+++ b/devel/jakarta-commons-configuration/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	commons-configuration
 PORTVERSION=	1.10
 CATEGORIES=	devel java
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_BINARIES}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_BINARIES
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
diff --git a/devel/jakarta-commons-daemon/Makefile b/devel/jakarta-commons-daemon/Makefile
index cfdf1ff7b26a..075b95baab1d 100644
--- a/devel/jakarta-commons-daemon/Makefile
+++ b/devel/jakarta-commons-daemon/Makefile
@@ -4,9 +4,8 @@
 PORTNAME=	commons-daemon
 PORTVERSION=	1.0.15
 CATEGORIES=	devel java
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE:S,$,:src,} \
-		${MASTER_SITE_APACHE_COMMONS_BINARIES:S,$,:bin,}
-MASTER_SITE_SUBDIR=	daemon/:src daemon/:bin
+MASTER_SITES=	APACHE_COMMONS_SOURCE:src \
+		APACHE_COMMONS_BINARIES:bin
 PKGNAMEPREFIX=	jakarta-
 DISTFILES=	${PORTNAME}-${PORTVERSION}-native-src${EXTRACT_SUFX}:src \
 		${PORTNAME}-${PORTVERSION}-bin${EXTRACT_SUFX}:bin
diff --git a/devel/jakarta-commons-io/Makefile b/devel/jakarta-commons-io/Makefile
index 72d1181d6458..3e1bbdddc26f 100644
--- a/devel/jakarta-commons-io/Makefile
+++ b/devel/jakarta-commons-io/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	commons-io
 PORTVERSION=	2.4
 CATEGORIES=	devel java
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_SOURCE
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/devel/jakarta-commons-jxpath/Makefile b/devel/jakarta-commons-jxpath/Makefile
index 1602d22b3c2b..35f0330695e0 100644
--- a/devel/jakarta-commons-jxpath/Makefile
+++ b/devel/jakarta-commons-jxpath/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	commons-jxpath
 PORTVERSION=	1.3
 CATEGORIES=	devel www java
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_BINARIES}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_BINARIES
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
diff --git a/devel/jakarta-commons-modeler/Makefile b/devel/jakarta-commons-modeler/Makefile
index 24834ac51ec3..418ea0f8b82f 100644
--- a/devel/jakarta-commons-modeler/Makefile
+++ b/devel/jakarta-commons-modeler/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	commons-modeler
 PORTVERSION=	2.0.1
 PORTREVISION=	1
 CATEGORIES=	devel java
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_BINARIES}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_BINARIES
 PKGNAMEPREFIX=	jakarta-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/devel/jgoodies-common/Makefile b/devel/jgoodies-common/Makefile
index f126f2464543..c41dc6d6809b 100644
--- a/devel/jgoodies-common/Makefile
+++ b/devel/jgoodies-common/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	jgoodies-common
-PORTVERSION=	1.2.1
+DISTVERSION=	1_2_1
 CATEGORIES=	devel java
 MASTER_SITES=	http://www.jgoodies.com/download/libraries/common/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S|.|_|g}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Abstract and helper classes used by all other JGoodies libs
diff --git a/devel/libassa/Makefile b/devel/libassa/Makefile
index 8bd060632f74..be2f96c83f49 100644
--- a/devel/libassa/Makefile
+++ b/devel/libassa/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	libassa
-PORTVERSION=	3.4.2.2
+DISTVERSION=	3.4.2-2
 PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/3.4.2
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.([[:digit:]])$/-\1/}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION:C/-.*$//}
 
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	C++ networking library and application framework
@@ -16,7 +15,7 @@ USES=		libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 PLIST_SUB=	ASSA_VERSION=${PORTVERSION:R:R}
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/(\.[[:digit:]])$//}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C/-.*$//}
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s: doc : :g' ${WRKSRC}/Makefile.in
diff --git a/devel/looks/Makefile b/devel/looks/Makefile
index eeb8b6838026..f4eba6db7e48 100644
--- a/devel/looks/Makefile
+++ b/devel/looks/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	looks
-PORTVERSION=	2.5.2
+DISTVERSION=	2_5_2
 PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://www.jgoodies.com/download/libraries/${PORTNAME}/
-DISTNAME=	jgoodies-${PORTNAME}-${PORTVERSION:S|.|_|g}
+DISTNAME=	jgoodies-${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	JGoodies Looks improve the appearance of your Java applications
diff --git a/devel/oozie/Makefile b/devel/oozie/Makefile
index 75d56beea842..a9c3070e463a 100644
--- a/devel/oozie/Makefile
+++ b/devel/oozie/Makefile
@@ -4,15 +4,14 @@
 PORTNAME=	oozie
 PORTVERSION=	4.1.0
 CATEGORIES=	devel java
-MASTER_SITES=	${MASTER_SITE_APACHE} \
+MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION} \
 		LOCAL/demon/:maven \
 		http://archive.apache.org/dist/tomcat/tomcat-6/v${TOMCAT_VERSION}/bin/:tomcat \
 		http://extjs.com/deploy/:libext \
 		http://central.maven.org/maven2/org/apache/hadoop/hadoop-client/${HADOOP_VERSION}/:hadoopclient
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTVERSION}
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven apache-tomcat-${TOMCAT_VERSION}.tar.gz:tomcat ext-2.2.zip:libext hadoop-client-${HADOOP_VERSION}.jar:hadoopclient
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven apache-tomcat-${TOMCAT_VERSION}.tar.gz:tomcat ext-2.2.zip:libext hadoop-client-${HADOOP_VERSION}.jar:hadoopclient
 DIST_SUBDIR=	hadoop
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Workflow scheduler for Hadoop
diff --git a/devel/openzz/Makefile b/devel/openzz/Makefile
index b816440a689e..e2c71d940129 100644
--- a/devel/openzz/Makefile
+++ b/devel/openzz/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	openzz
-PORTVERSION=	1.0.4.4
+DISTVERSION=	1.0.4-4
 PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.0.4-4
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interpreted dynamic parser
diff --git a/devel/p5-App-GitGot/Makefile b/devel/p5-App-GitGot/Makefile
index eda0c7904acd..001f18ddf238 100644
--- a/devel/p5-App-GitGot/Makefile
+++ b/devel/p5-App-GitGot/Makefile
@@ -3,11 +3,11 @@
 
 PORTNAME=	App-GitGot
 PORTVERSION=	1.33
+DISTVERSIONSUFFIX=	0
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GENEHACK
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}0
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Tool to make it easier to manage multiple git repositories
diff --git a/devel/p5-Class-C3-Componentised/Makefile b/devel/p5-Class-C3-Componentised/Makefile
index 74b64eb71f39..4e58a9b00ca5 100644
--- a/devel/p5-Class-C3-Componentised/Makefile
+++ b/devel/p5-Class-C3-Componentised/Makefile
@@ -3,11 +3,11 @@
 
 PORTNAME=	Class-C3-Componentised
 PORTVERSION=	1.0010
+DISTVERSIONSUFFIX=	00
 PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}00
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Load mix-ins or components to your C3-based class
diff --git a/devel/p5-DateTime-Set/Makefile b/devel/p5-DateTime-Set/Makefile
index cc88c65f8965..d67534b98770 100644
--- a/devel/p5-DateTime-Set/Makefile
+++ b/devel/p5-DateTime-Set/Makefile
@@ -3,11 +3,11 @@
 
 PORTNAME=	DateTime-Set
 PORTVERSION=	0.34
+DISTVERSIONSUFFIX=	00
 PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}00
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Datetime sets and set math
diff --git a/devel/pig/Makefile b/devel/pig/Makefile
index 3225ed2c7351..a8fc3d4dbc21 100644
--- a/devel/pig/Makefile
+++ b/devel/pig/Makefile
@@ -4,14 +4,13 @@
 PORTNAME=	pig
 PORTVERSION=	0.14.0
 CATEGORIES=	devel java
-MASTER_SITES=	${MASTER_SITE_APACHE} \
+MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		LOCAL/demon/:ant \
 		http://people.freebsd.org/~demon/:ant \
 		http://central.maven.org/maven2/org/apache/ivy/ivy/2.2.0/:ivy
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}-${PORTVERSION}
-DISTFILES=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-ant-repository.tar.gz:ant ivy-2.2.0.jar:ivy
+DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-ant-repository.tar.gz:ant ivy-2.2.0.jar:ivy
 DIST_SUBDIR=	hadoop
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-ant-repository.tar.gz
+EXTRACT_ONLY=	${DISTNAME}-src${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-ant-repository.tar.gz
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Engine for executing data flows in parallel on Hadoop
diff --git a/devel/py-json-py/Makefile b/devel/py-json-py/Makefile
index 5ea58db43d4e..03bb1af7e7a7 100644
--- a/devel/py-json-py/Makefile
+++ b/devel/py-json-py/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	json-py
-PORTVERSION=	3.4
+DISTVERSION=	3_4
 PORTREVISION=	1
 CATEGORIES=	devel lang www python
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/3_4
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Python implementation of a JSON (http//:json.org) reader/writer
diff --git a/devel/ruby-aspectr/Makefile b/devel/ruby-aspectr/Makefile
index d20a5e3db388..0221247b0a1a 100644
--- a/devel/ruby-aspectr/Makefile
+++ b/devel/ruby-aspectr/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	aspectr
-PORTVERSION=	0.3.5
+DISTVERSION=	0-3-5
 CATEGORIES=	devel ruby
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/g}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	ruby@FreeBSD.org
diff --git a/devel/ruby-rbbr/Makefile b/devel/ruby-rbbr/Makefile
index d6908259088a..eb57234c7a62 100644
--- a/devel/ruby-rbbr/Makefile
+++ b/devel/ruby-rbbr/Makefile
@@ -7,7 +7,6 @@ PORTREVISION=	11
 CATEGORIES=	devel ruby
 MASTER_SITES=	SF/ruby-gnome2/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/r/rev/}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	ruby@FreeBSD.org
diff --git a/devel/ruby-tzfile/Makefile b/devel/ruby-tzfile/Makefile
index 36e0312cb852..5433c3915ac7 100644
--- a/devel/ruby-tzfile/Makefile
+++ b/devel/ruby-tzfile/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	tzfile
 PORTVERSION=	0.1
 CATEGORIES=	devel ruby
 MASTER_SITES=	http://www.a-k-r.org/ruby-tzfile/
-DISTFILES=	ruby-${PORTNAME}-${PORTVERSION}.tar.gz
+DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	TZFile handling library for Ruby
diff --git a/devel/sigslot/Makefile b/devel/sigslot/Makefile
index 4a91e04591ea..f7a59cf334ea 100644
--- a/devel/sigslot/Makefile
+++ b/devel/sigslot/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	sigslot
-PORTVERSION=	1.0.0
+DISTVERSION=	1-0-0
 CATEGORIES=	devel
 MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/g}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ Signal/Slot Library
diff --git a/devel/spark/Makefile b/devel/spark/Makefile
index fdeffab379d7..c1e31ecddaf4 100644
--- a/devel/spark/Makefile
+++ b/devel/spark/Makefile
@@ -4,10 +4,9 @@
 PORTNAME=	spark
 PORTVERSION=	1.2.1
 CATEGORIES=	devel java
-MASTER_SITES=	${MASTER_SITE_APACHE} \
+MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		LOCAL/demon/:maven \
 		http://people.freebsd.org/~demon/:maven
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	apache-
 DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven
 DIST_SUBDIR=	hadoop
diff --git a/devel/swank-clojure/Makefile b/devel/swank-clojure/Makefile
index d8e3b3e7d231..1e7a6a0fd7f6 100644
--- a/devel/swank-clojure/Makefile
+++ b/devel/swank-clojure/Makefile
@@ -3,14 +3,13 @@
 PORTNAME=	swank-clojure
 PORTVERSION=	1.2.1
 CATEGORIES=	devel lisp java
-MASTER_SITES=	http://download.github.com/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=olgeni
-DISTNAME=	technomancy-${PORTNAME}-${PORTVERSION}-0-g0af258a
+MASTER_SITES=	LOCAL/olgeni
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Swank/SLIME support for Clojure
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	technomancy
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 
diff --git a/devel/swank-clojure/distinfo b/devel/swank-clojure/distinfo
index 88082d7a67a6..2ca9d1e7acbe 100644
--- a/devel/swank-clojure/distinfo
+++ b/devel/swank-clojure/distinfo
@@ -1,2 +1,2 @@
-SHA256 (technomancy-swank-clojure-1.2.1-0-g0af258a.tar.gz) = efceeaa9f6b2ab4d04ac6e351826975b0ea63b08781b65bd5488a0af82cece75
-SIZE (technomancy-swank-clojure-1.2.1-0-g0af258a.tar.gz) = 45111
+SHA256 (technomancy-swank-clojure-1.2.1_GH0.tar.gz) = 1bc84eea7ad2587cdb3dff241f3e2646dff53c22c24f39b7902779d86c26725f
+SIZE (technomancy-swank-clojure-1.2.1_GH0.tar.gz) = 45107
diff --git a/devel/tinylaf/Makefile b/devel/tinylaf/Makefile
index 161de7ed8505..f36c350f8d6d 100644
--- a/devel/tinylaf/Makefile
+++ b/devel/tinylaf/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	tinylaf
-PORTVERSION=	1.4.0
+DISTVERSION=	1_4_0
 CATEGORIES=	devel java
 MASTER_SITES=	http://www.muntjak.de/hans/java/tinylaf/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}
 
 MAINTAINER=	ayu@commun.jp
 COMMENT=	Pluggable Look and Feel for Java
diff --git a/devel/vera++/Makefile b/devel/vera++/Makefile
index a0bdb4676f53..4ff3b2e4d635 100644
--- a/devel/vera++/Makefile
+++ b/devel/vera++/Makefile
@@ -5,8 +5,8 @@ PORTNAME=	vera++
 PORTVERSION=	1.3.0
 CATEGORIES=	devel
 MASTER_SITES=	https://bitbucket.org/verateam/vera/downloads/
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
-		${PORTNAME}-${PORTVERSION}-doc.tar.gz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${DISTNAME}-doc${EXTRACT_SUFX}
 
 MAINTAINER=	cristianorolim@outlook.com
 COMMENT=	Tool for verification of C++ source code
diff --git a/devel/xdg-utils/Makefile b/devel/xdg-utils/Makefile
index 788b5347098b..7306f2a50ce1 100644
--- a/devel/xdg-utils/Makefile
+++ b/devel/xdg-utils/Makefile
@@ -8,7 +8,6 @@ PORTREVISION=	1
 CATEGORIES=	devel
 #MASTER_SITES=	http://portland.freedesktop.org/download/
 MASTER_SITES=	LOCAL/kwm
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Tools to allow all applications to integrate with the free desktop
diff --git a/dns/nslint/Makefile b/dns/nslint/Makefile
index 760f822367de..ddd2b3d0a96c 100644
--- a/dns/nslint/Makefile
+++ b/dns/nslint/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	3.1
 CATEGORIES=	dns
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/ \
 		LOCAL/ehaupt
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a/a/}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Perform consistency checks on DNS zone files
diff --git a/dns/radns/Makefile b/dns/radns/Makefile
index d628034a993a..9a1aec7ddc0c 100644
--- a/dns/radns/Makefile
+++ b/dns/radns/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	radns
-PORTVERSION=	20110809.2
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/}
+DISTVERSION=	20110809-2
 CATEGORIES=	dns
 MASTER_SITES=	http://hack.org/mc/hacks/radns/
 
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
diff --git a/emulators/kqemu-kmod-devel/Makefile b/emulators/kqemu-kmod-devel/Makefile
index de46de82952f..b51c529290e9 100644
--- a/emulators/kqemu-kmod-devel/Makefile
+++ b/emulators/kqemu-kmod-devel/Makefile
@@ -2,15 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	kqemu
-PORTVERSION=	1.4.0.p1
+DISTVERSION=	1.4.0pre1
 PORTREVISION=	5
 CATEGORIES=	emulators
 MASTER_SITES=	http://bellard.org/qemu/ \
 		http://qemu.org/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	nox
+		LOCAL/nox
 PKGNAMESUFFIX=	-kmod-devel
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/.p/pre/}
 DIST_SUBDIR=	kqemu
 
 MAINTAINER=	nox@FreeBSD.org
diff --git a/emulators/kqemu-kmod/Makefile b/emulators/kqemu-kmod/Makefile
index 71c019a1e4da..0f64f04539ef 100644
--- a/emulators/kqemu-kmod/Makefile
+++ b/emulators/kqemu-kmod/Makefile
@@ -2,15 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	kqemu
-PORTVERSION=	1.3.0.p11
+DISTVERSION=	1.3.0pre11
 PORTREVISION=	12
 CATEGORIES=	emulators
 MASTER_SITES=	http://bellard.org/qemu/ \
 		http://qemu.org/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	nox
+		LOCAL/nox
 PKGNAMESUFFIX=	-kmod
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/.p/pre/}
 DIST_SUBDIR=	kqemu
 
 MAINTAINER=	nox@FreeBSD.org
diff --git a/emulators/minivmac/Makefile b/emulators/minivmac/Makefile
index bcf7c2091721..f092e51c92c7 100644
--- a/emulators/minivmac/Makefile
+++ b/emulators/minivmac/Makefile
@@ -5,8 +5,8 @@ PORTNAME=	minivmac
 PORTVERSION=	3.0.0
 CATEGORIES=	emulators
 MASTER_SITES=	SF
-DISTFILES=	${PORTNAME}-${PORTVERSION}.src.tgz \
-		${PORTNAME}-${PORTVERSION}.prj.tgz
+DISTFILES=	${DISTNAME}.src${EXTRACT_SUFX} \
+		${DISTNAME}.prj${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Miniature Macintosh emulator
@@ -16,7 +16,7 @@ LICENSE=	GPLv2
 WRKSRC=		${WRKDIR}/projects/bgclx86d
 
 USE_XORG=	x11 xext
-USES=		gmake
+USES=		gmake tar:tgz
 CFLAGS+=	-I${LOCALBASE}/include
 ALL_TARGET=	# nothing
 
diff --git a/emulators/q4wine/Makefile b/emulators/q4wine/Makefile
index db9b22be22e8..9479eed527d0 100644
--- a/emulators/q4wine/Makefile
+++ b/emulators/q4wine/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	q4wine
-PORTVERSION=	1.1.r2
+DISTVERSION=	1.1-r2
 PORTREVISION=	2
 CATEGORIES=	emulators deskutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION:S/.r/-r/}/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-r/}
 
 MAINTAINER=	koalative@gmail.com
 COMMENT=	QT4 front-end for WINE
diff --git a/emulators/ucon64/Makefile b/emulators/ucon64/Makefile
index 4205c35da2ba..fbf22119ca60 100644
--- a/emulators/ucon64/Makefile
+++ b/emulators/ucon64/Makefile
@@ -13,7 +13,7 @@ USES=		gmake
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/src
+WRKSRC_SUBDIR=		src
 
 PLIST_FILES=	bin/ucon64 lib/libdiscmage.so
 
diff --git a/ftp/wmget/Makefile b/ftp/wmget/Makefile
index b63df39b6dff..f651de8c0fc8 100644
--- a/ftp/wmget/Makefile
+++ b/ftp/wmget/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	0.6.0
 PORTREVISION=	6
 CATEGORIES=	ftp
 MASTER_SITES=	http://amtrickey.net/download/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	uqs
+		LOCAL/uqs
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	uqs@FreeBSD.org
diff --git a/games/blockade/Makefile b/games/blockade/Makefile
index ed26400324e3..55d9fa92bdb1 100644
--- a/games/blockade/Makefile
+++ b/games/blockade/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	blockade
-PORTVERSION=	1.00
+DISTVERSION=	1_00
 PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.sourcefiles.org/Games/Arcade/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/}-linux
+DISTNAME=	${PORTNAME}-${DISTVERSION}-linux
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X version of the `blockade' Macintosh game
diff --git a/games/fillets-ng/Makefile b/games/fillets-ng/Makefile
index 5b6654cb2a9d..ce19af874d65 100644
--- a/games/fillets-ng/Makefile
+++ b/games/fillets-ng/Makefile
@@ -5,9 +5,9 @@ PORTNAME=	fillets-ng
 PORTVERSION=	1.0.1
 PORTREVISION=	6
 CATEGORIES=	games
-MASTER_SITES=	SF/fillets/Fish%20Fillets%20-%20Next%20Generation/${PORTVERSION}:source \
+MASTER_SITES=	SF/fillets/Fish%20Fillets%20-%20Next%20Generation/${PORTVERSION} \
 		SF/fillets/Fish%20Fillets%20-%20Next%20Generation/${DATAVERSION}:data
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:source \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}-data-${DATAVERSION}${EXTRACT_SUFX}:data
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/games/gnuchess/Makefile b/games/gnuchess/Makefile
index ce13ab313cbf..60ed9ea7f9d7 100644
--- a/games/gnuchess/Makefile
+++ b/games/gnuchess/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	gnuchess
 PORTVERSION=	6.2.1
 CATEGORIES=	games
-MASTER_SITES=	GNU
-MASTER_SITE_SUBDIR=	chess
+MASTER_SITES=	GNU/chess
 # The DISTFILES here is explicitly needed because it can be extended later.
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
diff --git a/games/heroes/Makefile b/games/heroes/Makefile
index 47d4a8731fa3..1e2fc613e6d7 100644
--- a/games/heroes/Makefile
+++ b/games/heroes/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF \
 		SF/${PORTNAME}/${PORTNAME}-data/${DATAVERSION}:data \
 		SF/${PORTNAME}/${PORTNAME}-sound-effects/${SOUNDVERSION}:sound \
 		SF/${PORTNAME}/${PORTNAME}-sound-tracks/${MUSICVERSION}:music
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DATADISTNAME}${EXTRACT_SUFX}:data \
 		${SOUNDISTNAME}${EXTRACT_SUFX}:sound \
 		${MUSICDISTNAME}${EXTRACT_SUFX}:music
diff --git a/games/linux-enemyterritory-etpro/Makefile b/games/linux-enemyterritory-etpro/Makefile
index 8380ecc337b6..e49243af09b1 100644
--- a/games/linux-enemyterritory-etpro/Makefile
+++ b/games/linux-enemyterritory-etpro/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	etpro
-PORTVERSION=	3.2.6
+DISTVERSION=	3_2_6
 CATEGORIES=	games linux
 MASTER_SITES=	http://bani.anime.net/etpro/ \
 		http://dl.vpclan.de/etpro/ \
@@ -12,7 +12,6 @@ MASTER_SITES=	http://bani.anime.net/etpro/ \
 		http://www.dakteam.org/ \
 		http://www.enemyterritory.cl/files/
 PKGNAMEPREFIX=	linux-enemyterritory-
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ET Pro - Enemy Territory Competition Mod
@@ -25,7 +24,7 @@ NO_WRKSUBDIR=	yes
 
 DATADIR=	${PREFIX}/lib/enemyterritory/${PORTNAME}
 
-PLIST_SUB=	VERSION="${PORTVERSION:S/./_/g}"
+PLIST_SUB=	VERSION="${DISTVERSION}"
 
 do-build:
 .for f in et etded
diff --git a/games/nimuh/Makefile b/games/nimuh/Makefile
index 8af0bf19aaa0..d72435b29e70 100644
--- a/games/nimuh/Makefile
+++ b/games/nimuh/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.02
 PORTREVISION=	10
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20${PORTVERSION}/Nimuh%20SRC%20%28Source%20Code%29
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} ${PORTNAME}-data-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}-data-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Puzzle game destined to improve the knowledge of Andalusia
diff --git a/games/pydance/Makefile b/games/pydance/Makefile
index 75f5c697af88..cbf7ffce7a19 100644
--- a/games/pydance/Makefile
+++ b/games/pydance/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	http://people.freebsd.org/~sylvio/pydance/ \
 		http://icculus.org/pyddr/ \
 		http://offload1.icculus.org/pyddr/ \
 		http://www.informatik.uni-frankfurt.de/~polzer/distfiles/
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz ${SONGS}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${SONGS}
 DIST_SUBDIR=	pydance
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dancing simulation game similar to the kind in arcades
diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index 69102885c42b..9722c13d68b7 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	13
 CATEGORIES=	games
 MASTER_SITES=	SF \
 		SF/${PORTNAME}/${PORTNAME}-data/${PORTVERSION}:data
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}-data-${PORTVERSION}${EXTRACT_SUFX}:data
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/games/unnethack/Makefile b/games/unnethack/Makefile
index 52f8931708f2..5caab514274f 100644
--- a/games/unnethack/Makefile
+++ b/games/unnethack/Makefile
@@ -2,13 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	unnethack
-PORTVERSION=	4.0.0.20120401
+DISTVERSION=	4.0.0-20120401
 PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
 
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
-
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	New variant of NetHack
 
diff --git a/games/uqm/Makefile b/games/uqm/Makefile
index a21c8f8a463a..66331ca7ce0b 100644
--- a/games/uqm/Makefile
+++ b/games/uqm/Makefile
@@ -6,8 +6,8 @@ PORTVERSION=	0.7.0
 PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	SF/sc2/UQM/${PORTVERSION:R}
-DISTFILES=	${PORTNAME}-${PORTVERSION}-source.tgz ${PORTNAME}-${DATAVERSION}-content.uqm
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}-source.tgz
+DISTFILES=	${DISTNAME}-source.tgz ${PORTNAME}-${DATAVERSION}-content.uqm
+EXTRACT_ONLY=	${DISTNAME}-source.tgz
 
 MAINTAINER=	mail@maxlor.com
 COMMENT=	Port of the original Star Control 2 for 3DO consoles
diff --git a/games/viruskiller/Makefile b/games/viruskiller/Makefile
index c43b3990f8bf..2f9e9d3e182c 100644
--- a/games/viruskiller/Makefile
+++ b/games/viruskiller/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	viruskiller
 PORTVERSION=	1.03
+DISTVERSIONSUFFIX=	-1
 PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	FRUGALWARE/games-extra/${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Arcade game that relies on quick reflexes
diff --git a/games/wmtictactoe/Makefile b/games/wmtictactoe/Makefile
index 976b63f17a29..883f57c5c77d 100644
--- a/games/wmtictactoe/Makefile
+++ b/games/wmtictactoe/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	wmtictactoe
 PORTVERSION=	1.1
+DISTVERSIONSUFFIX=	-1
 PORTREVISION=	3
 CATEGORIES=	games windowmaker afterstep
 MASTER_SITES=	LOCAL/jim
-DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dockable TicTacToe game for WindowMaker and AfterStep
diff --git a/games/xmine/Makefile b/games/xmine/Makefile
index 85bec0f5a896..af4b0b6bf6ee 100644
--- a/games/xmine/Makefile
+++ b/games/xmine/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	1.0.3
 PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.sw.ru/pub/x11/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	joerg
+		LOCAL/joerg
 DISTNAME=	${PORTNAME}-${PORTVERSION}-Xaw
 
 MAINTAINER=	joerg@FreeBSD.org
diff --git a/games/zangband/Makefile b/games/zangband/Makefile
index cbd1583279a7..685a9d819e76 100644
--- a/games/zangband/Makefile
+++ b/games/zangband/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	zangband
-PORTVERSION=	2.7.5.p1
+DISTVERSION=	2.7.5pre1
 CATEGORIES+=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION:R}%20preview%20I
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}pre1
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index ff938496f935..faa0a7f52abc 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	aalib
-PORTVERSION=	1.4.r5
+DISTVERSION=	1.4rc5
 PORTREVISION=	11
 CATEGORIES=	graphics
 MASTER_SITES=	SF/aa-project/aa-lib/1.4rc5
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ASCII art library
diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile
index 560946cf3fc6..59bc82e113b3 100644
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	aview
-PORTVERSION=	1.3.0.r1
+DISTVERSION=	1.3.0rc1
 PORTREVISION=	5
 CATEGORIES=	graphics
-MASTER_SITES=	SF/aa-project/${PORTNAME}/1.3.0rc1
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
+MASTER_SITES=	SF/aa-project/${PORTNAME}/${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphics viewer for viewing netpbm format on console or X using aalib
diff --git a/graphics/cbrpager/Makefile b/graphics/cbrpager/Makefile
index 5e1b1926d9a6..0b828c86abce 100644
--- a/graphics/cbrpager/Makefile
+++ b/graphics/cbrpager/Makefile
@@ -7,9 +7,9 @@ PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		SF/nemysisfreebsdp/${CATEGORIES}/:icons
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}.png:icons
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Viewer for cbr (comic book archive) files
diff --git a/graphics/cbviewer/Makefile b/graphics/cbviewer/Makefile
index 2757a7d1519b..5341d6b962e2 100644
--- a/graphics/cbviewer/Makefile
+++ b/graphics/cbviewer/Makefile
@@ -7,10 +7,10 @@ PORTREVISION=	2
 CATEGORIES=	graphics java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/CBViewer%200.8/ \
 		SF/nemysisfreebsdp/graphics/:icons
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}.png:icons
 DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Comic book viewer for comic book archives in cbz, cbr, zip, rar
diff --git a/graphics/pencil/Makefile b/graphics/pencil/Makefile
index 0cb6742a4dac..0665018b07f9 100644
--- a/graphics/pencil/Makefile
+++ b/graphics/pencil/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.4.4b
 PORTREVISION=	13
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}-planner/Pencil/${PORTVERSION}eta
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFFIX}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Pencil - a traditional 2D animation software
diff --git a/graphics/phplot/Makefile b/graphics/phplot/Makefile
index f7471a1a670c..46d951efbfaa 100644
--- a/graphics/phplot/Makefile
+++ b/graphics/phplot/Makefile
@@ -5,9 +5,9 @@ PORTNAME=	phplot
 PORTVERSION=	6.1.0
 PORTREVISION=	2
 CATEGORIES=	graphics www
-MASTER_SITES=	SF:source1 \
+MASTER_SITES=	SF \
 		SF/${PORTNAME}/Manual/20130511:source2
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:source1 \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}docs-20130511.zip:source2
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/graphics/ppsei/Makefile b/graphics/ppsei/Makefile
index 70b7abf686e5..dcacaf887457 100644
--- a/graphics/ppsei/Makefile
+++ b/graphics/ppsei/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	ppsei
 PORTVERSION=	0.3
 CATEGORIES=	graphics
 MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}-${PORTVERSION}.src
-EXTRACT_SUFX=	.tgz
+EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	PowerPoint images extractor
diff --git a/graphics/py-goocanvas/Makefile b/graphics/py-goocanvas/Makefile
index b68648f99a08..0e369ad104f6 100644
--- a/graphics/py-goocanvas/Makefile
+++ b/graphics/py-goocanvas/Makefile
@@ -6,8 +6,7 @@ PORTNAME=	goocanvas
 PORTVERSION=	0.14.1
 PORTREVISION=	5
 CATEGORIES=	graphics python
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/py${PORTNAME}/${PORTVERSION:C/..$//}
+MASTER_SITES=	GNOME/sources/py${PORTNAME}/${PORTVERSION:C/..$//}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	py${PORTNAME}-${PORTVERSION}
 
diff --git a/graphics/ruby-svg/Makefile b/graphics/ruby-svg/Makefile
index e0686271d16e..4215a9957f2c 100644
--- a/graphics/ruby-svg/Makefile
+++ b/graphics/ruby-svg/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	svg
 PORTVERSION=	1.0.3
 CATEGORIES=	graphics ruby
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	ruby-svg/2288
+MASTER_SITES=	SFJP/ruby-svg/2288
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
diff --git a/graphics/truevision/Makefile b/graphics/truevision/Makefile
index 66b3ca11aa02..a8de6444c07c 100644
--- a/graphics/truevision/Makefile
+++ b/graphics/truevision/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	truevision
-PORTVERSION=	0.5.5.2
+DISTVERSION=	0.5.5-2
 PORTREVISION=	10
 CATEGORIES=	graphics
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20sources/0.5.5
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20sources/${PORTVERSION:R}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNOME 3D modeler
diff --git a/japanese/ajaxzip2-core/Makefile b/japanese/ajaxzip2-core/Makefile
index 1af1eabb2219..6661aaa0e7d6 100644
--- a/japanese/ajaxzip2-core/Makefile
+++ b/japanese/ajaxzip2-core/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	ajaxzip2
 PORTVERSION=	20081102
 PORTREVISION=	1
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	kuriyama
+MASTER_SITES=	LOCAL/kuriyama
 PKGNAMESUFFIX=	-core
 DISTNAME=	${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}
 
diff --git a/japanese/gskk/Makefile b/japanese/gskk/Makefile
index 1981edd64554..3b21f1bd2a5e 100644
--- a/japanese/gskk/Makefile
+++ b/japanese/gskk/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	gskk
 PORTVERSION=	20041208
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.ohnolab.org/~kimoto/
-DISTNAME=	${PORTNAME}-${PORTVERSION}.t
-EXTRACT_SUFX=	.gz
+EXTRACT_SUFX=	.t.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SKK's dictionary for Canna
diff --git a/japanese/jd/Makefile b/japanese/jd/Makefile
index eba692ac68cc..1b572e331cec 100644
--- a/japanese/jd/Makefile
+++ b/japanese/jd/Makefile
@@ -3,11 +3,10 @@
 
 PORTNAME=	jd
 PORTVERSION=	2.8.8
+DISTVERSIONSUFFIX=	-140601
 PORTREVISION=	5
 CATEGORIES=	japanese www
-MASTER_SITES=	SFJP
-MASTER_SITE_SUBDIR=	jd4linux/61281
-DISTNAME=	${PORTNAME}-${PORTVERSION}-140601
+MASTER_SITES=	SFJP/jd4linux/61281
 
 MAINTAINER=	townwear@gmail.com
 COMMENT=	2ch browser
diff --git a/japanese/kcode/Makefile b/japanese/kcode/Makefile
index 1b204265b9ef..a9c13ee318af 100644
--- a/japanese/kcode/Makefile
+++ b/japanese/kcode/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	kcode
 PORTVERSION=	1.0
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.irori.org/dl/tool/
-DISTFILES=	${PORTNAME}-${PORTVERSION}.gz
-EXTRACT_ONLY=	${DISTFILES}
+EXTRACT_SUFX=	.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Handy utility to show codepoint information of given characters
diff --git a/japanese/mailman/Makefile b/japanese/mailman/Makefile
index e4279ad02bb7..06d2feee51b7 100644
--- a/japanese/mailman/Makefile
+++ b/japanese/mailman/Makefile
@@ -7,8 +7,7 @@ PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese mail
 MASTER_SITES=	http://www.python.jp/doc/contrib/mailman/_static/ \
-		LOCAL
-MASTER_SITE_SUBDIR=	tota/${PORTNAME}
+		LOCAL/tota/${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.j/+j/}
 DIST_SUBDIR=	mailman
 
diff --git a/japanese/man/Makefile b/japanese/man/Makefile
index 7084d7e171dc..6506d1b71760 100644
--- a/japanese/man/Makefile
+++ b/japanese/man/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.1j
 PORTREVISION=	9
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://daemon.jp.freebsd.org/pub/FreeBSD-jp/man-jp/ \
-		${MASTER_SITE_PORTS_JP}
+		PORTS_JP
 DISTNAME=	jp-${PORTNAME}-${PORTVERSION}
 
 PATCH_SITES=	ftp://daemon.jp.freebsd.org/pub/FreeBSD-jp/man-jp/
diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile
index 40eafa18f637..b43ddcf3d6b1 100644
--- a/japanese/nethack34/Makefile
+++ b/japanese/nethack34/Makefile
@@ -8,8 +8,7 @@ CATEGORIES=	japanese games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}-src
 
-PATCH_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-PATCH_SITE_SUBDIR=	jnethack/58545
+PATCH_SITES=	SOURCEFORGE_JP/jnethack/58545
 PATCHFILES=	jnethack-${PORTVERSION}-0.11.diff.gz
 PATCH_DIST_STRIP=	-p1
 
diff --git a/java/jaf/Makefile b/java/jaf/Makefile
index ae88f32ba0d0..2dda06213716 100644
--- a/java/jaf/Makefile
+++ b/java/jaf/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	jaf
-PORTVERSION=	1.1.1
+DISTVERSION=	1_1_1
 CATEGORIES=	java devel
 MASTER_SITES=	#
-DISTNAME=	${PORTNAME}-${PORTVERSION:S,.,_,g}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	JavaBeansTM Activation Framework
diff --git a/java/jai/Makefile b/java/jai/Makefile
index de3e25544bdd..94d4ab90a8b2 100644
--- a/java/jai/Makefile
+++ b/java/jai/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	jai
-PORTVERSION=	1.1.3
+DISTVERSION=	1_1_3
 PORTREVISION=	1
 CATEGORIES=	java graphics
 MASTER_SITES=	http://download.java.net/media/${PORTNAME}/builds/release/${PORTVERSION:S/./_/g}/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}-lib
+DISTNAME=	${PORTNAME}-${DISTVERSION}-lib
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	High performance image processing libraries for Java
@@ -15,7 +15,7 @@ USES=		cpe zip
 CPE_VENDOR=	oracle
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/./_/g}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
diff --git a/java/jakarta-commons-beanutils/Makefile b/java/jakarta-commons-beanutils/Makefile
index 8f9e00448763..0b2ad9ac5dc0 100644
--- a/java/jakarta-commons-beanutils/Makefile
+++ b/java/jakarta-commons-beanutils/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	commons-beanutils
 PORTVERSION=	1.9.2
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_SOURCE
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/java/jakarta-commons-cli/Makefile b/java/jakarta-commons-cli/Makefile
index f2b8ef5da209..ac7e378d596c 100644
--- a/java/jakarta-commons-cli/Makefile
+++ b/java/jakarta-commons-cli/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	commons-cli
 PORTVERSION=	1.2
 PORTEPOCH=	1
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_BINARIES}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_BINARIES
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
diff --git a/java/jakarta-commons-codec/Makefile b/java/jakarta-commons-codec/Makefile
index 9380d448a577..e4f9eb640802 100644
--- a/java/jakarta-commons-codec/Makefile
+++ b/java/jakarta-commons-codec/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	commons-codec
 PORTVERSION=	1.10
 CATEGORIES=	java converters
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_SOURCE
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/java/jakarta-commons-collections/Makefile b/java/jakarta-commons-collections/Makefile
index c3f8e6b713ee..7b30a7b67b6b 100644
--- a/java/jakarta-commons-collections/Makefile
+++ b/java/jakarta-commons-collections/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	commons-collections
 PORTVERSION=	3.2.1
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_SOURCE
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/java/jakarta-commons-dbcp/Makefile b/java/jakarta-commons-dbcp/Makefile
index 2ab2131a11cb..b30529daa2c1 100644
--- a/java/jakarta-commons-dbcp/Makefile
+++ b/java/jakarta-commons-dbcp/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	commons-dbcp
 PORTVERSION=	1.4
 CATEGORIES=	java databases
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_SOURCE
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/java/jakarta-commons-discovery/Makefile b/java/jakarta-commons-discovery/Makefile
index e3b33dda7f1d..3720edc4c3a3 100644
--- a/java/jakarta-commons-discovery/Makefile
+++ b/java/jakarta-commons-discovery/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	commons-discovery
 PORTVERSION=	0.5
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_BINARIES}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_BINARIES
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
diff --git a/java/jakarta-commons-lang/Makefile b/java/jakarta-commons-lang/Makefile
index 92a68a299471..c9099b278dde 100644
--- a/java/jakarta-commons-lang/Makefile
+++ b/java/jakarta-commons-lang/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	commons-lang
 PORTVERSION=	2.6
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_SOURCE
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/java/jakarta-commons-logging/Makefile b/java/jakarta-commons-logging/Makefile
index 86bae8541e39..6dd6ea6a0dd6 100644
--- a/java/jakarta-commons-logging/Makefile
+++ b/java/jakarta-commons-logging/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	commons-logging
 PORTVERSION=	1.1.3
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_BINARIES}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_BINARIES
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
diff --git a/java/jakarta-commons-pool/Makefile b/java/jakarta-commons-pool/Makefile
index e42c516fd00e..1dabad7964da 100644
--- a/java/jakarta-commons-pool/Makefile
+++ b/java/jakarta-commons-pool/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	commons-pool
 PORTVERSION=	1.6
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_SOURCE
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/java/jakarta-commons-primitives/Makefile b/java/jakarta-commons-primitives/Makefile
index 2e4628fe7f1a..d2b42ac33f1a 100644
--- a/java/jakarta-commons-primitives/Makefile
+++ b/java/jakarta-commons-primitives/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	commons-primitives
 PORTVERSION=	1.0
 PORTREVISION=	3
 CATEGORIES=	java
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_SOURCE
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/java/jakarta-struts/Makefile b/java/jakarta-struts/Makefile
index 7419df60ff57..30cadebdd462 100644
--- a/java/jakarta-struts/Makefile
+++ b/java/jakarta-struts/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	struts
 PORTVERSION=	1.2.9
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=struts/binaries
+MASTER_SITES=	APACHE/${PORTNAME}/binaries
 PKGNAMEPREFIX=	apache-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
diff --git a/java/jflex/Makefile b/java/jflex/Makefile
index 9a547fe4c12a..8668287c4df3 100644
--- a/java/jflex/Makefile
+++ b/java/jflex/Makefile
@@ -6,10 +6,10 @@ PORTVERSION=	1.4.2
 CATEGORIES=	java devel
 MASTER_SITES=	http://www.jflex.de/:jflexde \
 		http://jflex.sourceforge.net/jar/devel/:jflexsf
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz:jflexde \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:jflexde \
 		JFlex.jar:jflexsf \
 		java_cup.jar:jflexsf
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	eg@fbsd.lt
 COMMENT=	The Fast Lexical Analyser Generator for Java[tm]
diff --git a/java/jrosetta/Makefile b/java/jrosetta/Makefile
index dad58709ccbc..423d3c08b817 100644
--- a/java/jrosetta/Makefile
+++ b/java/jrosetta/Makefile
@@ -25,7 +25,7 @@ COMPILE_DESC=	Download and compile source instead of binaries
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCOMPILE}
-DISTFILES=	${PORTNAME}-${PORTVERSION}-sources.jar:source
+DISTFILES=	${DISTNAME}-sources.jar:source
 
 BUILD_DEPENDS=	mvn:${PORTSDIR}/devel/maven3
 JAVA_BUILD=	yes
diff --git a/java/junit/Makefile b/java/junit/Makefile
index 9b5c5da4f201..c611eb9183e1 100644
--- a/java/junit/Makefile
+++ b/java/junit/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	junit
 PORTVERSION=	4.12
 CATEGORIES=	java devel
 MASTER_SITES=	http://repo1.maven.org/maven2/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
-DISTFILES=	${PORTNAME}-${PORTVERSION}.jar ${PORTNAME}-${PORTVERSION}-sources.jar
+DISTFILES=	${DISTNAME}.jar ${DISTNAME}-sources.jar
 EXTRACT_ONLY=
 
 MAINTAINER=	danilo@FreeBSD.org
diff --git a/lang/bsh/Makefile b/lang/bsh/Makefile
index 14c56ed07615..bc48f86b175d 100644
--- a/lang/bsh/Makefile
+++ b/lang/bsh/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	bsh
-PORTVERSION=	2.0.b5
+DISTVERSION=	2.0b5
 CATEGORIES=	lang java
 MASTER_SITES=	http://svn.codespot.com/a/apache-extras.org/beanshell/src_releases/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/b/}-src
+DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java scripting language
@@ -28,7 +28,7 @@ PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar \
 		bin/${PORTNAME}
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/dist/${PORTNAME}-${PORTVERSION:S/.b/b/}.jar \
+	${INSTALL_DATA} ${WRKSRC}/dist/${PORTNAME}-${DISTVERSION}.jar \
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index 3c8f9b394a9a..35ffc07ff747 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	f2c
 PORTVERSION=	20060810
 PORTREVISION=	4
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	maho/f2c
+MASTER_SITES=	LOCAL/maho/f2c
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tar
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
diff --git a/lang/jakarta-commons-jelly/Makefile b/lang/jakarta-commons-jelly/Makefile
index f2d4610ccf5f..1e344bbf1f8d 100644
--- a/lang/jakarta-commons-jelly/Makefile
+++ b/lang/jakarta-commons-jelly/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	commons-jelly
 PORTVERSION=	1.0
 PORTREVISION=	3
 CATEGORIES=	lang devel java
-MASTER_SITES=	APACHE_COMMONS_BINARIES/jelly
+MASTER_SITES=	APACHE_COMMONS_BINARIES
 PKGNAMEPREFIX=	jakarta-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/lang/mit-scheme/Makefile b/lang/mit-scheme/Makefile
index 1a3c13bfa886..db3de994fc52 100644
--- a/lang/mit-scheme/Makefile
+++ b/lang/mit-scheme/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	mit-scheme
 PORTVERSION=	9.2
 PORTREVISION=	1
 CATEGORIES=	lang scheme
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	mit-scheme/stable.pkg/${PORTVERSION}
+MASTER_SITES=	GNU/mit-scheme/stable.pkg/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${MIT_SCHEME_ARCH}
 
 MAINTAINER=	olgeni@FreeBSD.org
diff --git a/lang/nbc/Makefile b/lang/nbc/Makefile
index 6e6bc1ca2113..6e9a55dfc939 100644
--- a/lang/nbc/Makefile
+++ b/lang/nbc/Makefile
@@ -7,8 +7,7 @@ PORTNAME=		nbc
 PORTVERSION=		1.2.1.r4
 PORTREVISION=		6
 CATEGORIES=		lang
-MASTER_SITES=		SF
-MASTER_SITE_SUBDIR=	bricxcc/NBC_NXC/NBC%20release%20${PORTVERSION:S/.r/%20r/}
+MASTER_SITES=		SF/bricxcc/NBC_NXC/NBC%20release%20${PORTVERSION:S/.r/%20r/}
 DISTNAME=		${PORTNAME}-${PORTVERSION}.src
 
 MAINTAINER=		rene@FreeBSD.org
diff --git a/lang/p5-Marpa-PP/Makefile b/lang/p5-Marpa-PP/Makefile
index 84370b54e397..b3e006049801 100644
--- a/lang/p5-Marpa-PP/Makefile
+++ b/lang/p5-Marpa-PP/Makefile
@@ -3,12 +3,12 @@
 
 PORTNAME=	Marpa-PP
 PORTVERSION=	0.014
+DISTVERSIONSUFFIX=	000
 PORTREVISION=	2
 CATEGORIES=	lang textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JKEGL
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}000
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Pure Perl version of Marpa
diff --git a/lang/p5-Marpa/Makefile b/lang/p5-Marpa/Makefile
index 7602f90cb00d..a3355142152c 100644
--- a/lang/p5-Marpa/Makefile
+++ b/lang/p5-Marpa/Makefile
@@ -3,12 +3,12 @@
 
 PORTNAME=	Marpa
 PORTVERSION=	0.208
+DISTVERSIONSUFFIX=	000
 PORTREVISION=	1
 CATEGORIES=	lang textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JKEGL
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}000
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Parse any Language You Can Describe in BNF
diff --git a/lang/phantomjs/Makefile b/lang/phantomjs/Makefile
index 46c3e68c5a89..4658922c0dbb 100644
--- a/lang/phantomjs/Makefile
+++ b/lang/phantomjs/Makefile
@@ -4,9 +4,7 @@ PORTNAME=	phantomjs
 PORTVERSION=	1.9.8
 #PORTREVISION=	0
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		https://bitbucket.org/ariya/phantomjs/downloads/
-MASTER_SITE_SUBDIR=	kuriyama
+MASTER_SITES=	https://bitbucket.org/ariya/phantomjs/downloads/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/lang/sather-specification/Makefile b/lang/sather-specification/Makefile
index 653f73785ff7..85b7f21a21ee 100644
--- a/lang/sather-specification/Makefile
+++ b/lang/sather-specification/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	specification
 PORTVERSION=	000328
 PORTREVISION=	1
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=sather/Doc
+MASTER_SITES=	GNU/sather/Doc
 PKGNAMEPREFIX=	sather-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}.html
 
diff --git a/lang/sather-tutorial/Makefile b/lang/sather-tutorial/Makefile
index d81bc6be387f..0ac4a1671c0c 100644
--- a/lang/sather-tutorial/Makefile
+++ b/lang/sather-tutorial/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	tutorial
 PORTVERSION=	000328
 PORTREVISION=	1
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=sather/Doc
+MASTER_SITES=	GNU/sather/Doc
 PKGNAMEPREFIX=	sather-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}.html
 
diff --git a/lang/x10/Makefile b/lang/x10/Makefile
index 3479d24b7e11..ea02f20a0023 100644
--- a/lang/x10/Makefile
+++ b/lang/x10/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	lang devel java
 MASTER_SITES=	http://dist.codehaus.org/x10/dependencies/ \
 		SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
-DISTFILES=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		lpg.runtime.java_2.0.22.jar \
 		ecj-3.5.1.jar \
 		com.ibm.wala.cast.java_1.0.0.201101071300.jar \
@@ -18,7 +18,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} \
 		org.eclipse.equinox.common_3.6.0.v20100503.jar \
 		commons-math-2.2.jar \
 		bdwgc-7.1.tar.gz
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	jwbacon@tds.net
 COMMENT=	Object-oriented parallel programming language
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}
 
diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile
index ae9b577b7846..6b00c9c855bf 100644
--- a/math/asymptote/Makefile
+++ b/math/asymptote/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	asymptote
 PORTVERSION=	2.32
 PORTREVISION=	4
 CATEGORIES=	math
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
 MAINTAINER=	nivit@FreeBSD.org
diff --git a/math/ipopt/Makefile b/math/ipopt/Makefile
index cd7eb1640ef6..8c3a666dc7ce 100644
--- a/math/ipopt/Makefile
+++ b/math/ipopt/Makefile
@@ -4,12 +4,12 @@
 PORTNAME=	Ipopt
 PORTVERSION=	3.11.10
 CATEGORIES=	math
-MASTER_SITES=	http://www.coin-or.org/download/source/Ipopt/:srcs	\
+MASTER_SITES=	http://www.coin-or.org/download/source/Ipopt/ \
 		http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/OLD/:metis \
 		http://mumps.enseeiht.fr/:mumps
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz:srcs	\
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		metis-4.0.3.tar.gz:metis MUMPS_4.10.0.tar.gz:mumps
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	pfg@FreeBSD.org
 COMMENT=	Software package for large-scale nonlinear optimization
diff --git a/math/jakarta-commons-math/Makefile b/math/jakarta-commons-math/Makefile
index 0b4d75496d6a..c867b8b730eb 100644
--- a/math/jakarta-commons-math/Makefile
+++ b/math/jakarta-commons-math/Makefile
@@ -5,21 +5,19 @@ PORTNAME=	commons-math
 PORTVERSION=	2.2
 PORTREVISION=	1
 CATEGORIES=	math java
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}/:source1 \
+MASTER_SITES=	APACHE_COMMONS_SOURCE \
 		http://repo1.maven.org/maven2/junit/junit/4.8.2/:source2
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-math,math,}/:source1
 PKGNAMEPREFIX=	jakarta-
-DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tar.gz:source1 \
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		junit-4.8.2.jar:source2
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}-src.tar.gz
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Java library of self-contained mathematics and statistics components
 
 LICENSE=	APACHE20
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
-
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USE_ANT=	yes
diff --git a/math/jakarta-commons-math3/Makefile b/math/jakarta-commons-math3/Makefile
index 119d84a5b066..4fbd46f06cb4 100644
--- a/math/jakarta-commons-math3/Makefile
+++ b/math/jakarta-commons-math3/Makefile
@@ -4,21 +4,19 @@
 PORTNAME=	commons-math3
 PORTVERSION=	3.3
 CATEGORIES=	math java
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}/:source1 \
+MASTER_SITES=	APACHE_COMMONS_SOURCE \
 		http://repo1.maven.org/maven2/junit/junit/4.8.2/:source2
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-math3,math,}/:source1
 PKGNAMEPREFIX=	jakarta-
-DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tar.gz:source1 \
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		junit-4.8.2.jar:source2
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}-src.tar.gz
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Java library of self-contained mathematics and statistics components
 
 LICENSE=	APACHE20
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
-
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USE_ANT=	yes
diff --git a/math/p5-Math-BaseCnv/Makefile b/math/p5-Math-BaseCnv/Makefile
index 1938460551dd..12ba72ab69db 100644
--- a/math/p5-Math-BaseCnv/Makefile
+++ b/math/p5-Math-BaseCnv/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	Math-BaseCnv
 PORTVERSION=	1.8
+DISTVERSIONSUFFIX=	.B59BrZX
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}.B59BrZX
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Fast functions to convert between number Bases
diff --git a/math/topaz/Makefile b/math/topaz/Makefile
index 65dbe552b642..9a76f37e1887 100644
--- a/math/topaz/Makefile
+++ b/math/topaz/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	topaz
-PORTVERSION=	3.41
+DISTVERSION=	3_41
 CATEGORIES=	math
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA007663/topaz/bin/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/}-src
+DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command driven graph plotting system for scientists and engineers
diff --git a/math/triangle/Makefile b/math/triangle/Makefile
index 34f2d1e68091..39df959202c5 100644
--- a/math/triangle/Makefile
+++ b/math/triangle/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	triangle
 PORTVERSION=	1.6
 PORTREVISION=	2
 CATEGORIES=	math
-MASTER_SITES=	NL
-MASTER_SITE_SUBDIR=	voronoi
+MASTER_SITES=	NL/voronoi
 DISTNAME=	${PORTNAME}
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
diff --git a/math/wingz3/Makefile b/math/wingz3/Makefile
index 7e86ccd765e8..c1a9c0ab2b22 100644
--- a/math/wingz3/Makefile
+++ b/math/wingz3/Makefile
@@ -5,11 +5,10 @@ PORTNAME=	wingzpro
 PORTVERSION=	311
 PORTREVISION=	3
 CATEGORIES=	math linux
-MASTER_SITES=	${MASTER_SITE_SUNSITE}:wingz	\
+MASTER_SITES=	SUNSITE/apps/financial/spreadsheet:wingz	\
 		${MASTER_SITE_FEDORA_LINUX:M*rpmfind.net/*:S|/fedora/core||}:l
-MASTER_SITE_SUBDIR=apps/financial/spreadsheet:wingz	\
-		redhat-archive/6.2/en/os/i386/RedHat/RPMS/:l
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:wingz \
+MASTER_SITE_SUBDIR= redhat-archive/6.2/en/os/i386/RedHat/RPMS/:l
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:wingz \
 		ld.so-1.9.5-13.i386.rpm:l	\
 		libc-5.3.12-31.i386.rpm:l
 EXTRACT_ONLY=
diff --git a/misc/bb/Makefile b/misc/bb/Makefile
index 0964021b9fa8..e80c5a47aa76 100644
--- a/misc/bb/Makefile
+++ b/misc/bb/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	bb
-PORTVERSION=	1.3.r1
+DISTVERSION=	1.3rc1
 PORTREVISION=	2
 CATEGORIES=	misc
-MASTER_SITES=	SF/aa-project/${PORTNAME}/1.3rc1
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
+MASTER_SITES=	SF/aa-project/${PORTNAME}/${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High quality audio-visual demonstration for text terminal
diff --git a/misc/exercism/Makefile b/misc/exercism/Makefile
index 0da4d5dced7d..77abc62f4f36 100644
--- a/misc/exercism/Makefile
+++ b/misc/exercism/Makefile
@@ -3,10 +3,11 @@
 
 PORTNAME=	exercism
 PORTVERSION=	1.7.1
+DISTVERSIONPREFIX=	v
 CATEGORIES=	misc
-MASTER_SITES=	https://github.com/${PORTNAME}/cli/archive/v${PORTVERSION}.tar.gz?dummy=/:group1 \
+MASTER_SITES=	\
 		https://codeload.github.com/codegangsta/cli/legacy.tar.gz/f7ebb76?dummy=/:group2
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:group1 \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		codegansta-cli-f7ebb76${EXTRACT_SUFX}:group2
 
 MAINTAINER=	swills@FreeBSD.org
@@ -15,6 +16,8 @@ COMMENT=	CLI client for exercism.io
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
 
 WRKSRC=		${WRKDIR}/cli-${PORTVERSION}
+USE_GITHUB=	yes
+GH_PROJECT=	cli
 
 PLIST_FILES=	bin/exercism
 
diff --git a/misc/exercism/distinfo b/misc/exercism/distinfo
index 61fc728fc92e..ae86d45d3bf7 100644
--- a/misc/exercism/distinfo
+++ b/misc/exercism/distinfo
@@ -1,4 +1,4 @@
-SHA256 (exercism-1.7.1.tar.gz) = 47357e762f80797071311c6057724ad7b315cd5b11b9dd751fe68012e5db38b4
-SIZE (exercism-1.7.1.tar.gz) = 11877
+SHA256 (exercism-cli-v1.7.1_GH0.tar.gz) = 47357e762f80797071311c6057724ad7b315cd5b11b9dd751fe68012e5db38b4
+SIZE (exercism-cli-v1.7.1_GH0.tar.gz) = 11877
 SHA256 (codegansta-cli-f7ebb76.tar.gz) = 216232029c7f391a9312493f4a2b66b2fffa8f4fcee5104bfff7847d5683ee6e
 SIZE (codegansta-cli-f7ebb76.tar.gz) = 15185
diff --git a/misc/explosions/Makefile b/misc/explosions/Makefile
index d6217ea7224c..d6972438f869 100644
--- a/misc/explosions/Makefile
+++ b/misc/explosions/Makefile
@@ -7,17 +7,16 @@ PORTREVISION=	16
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.tuxpaint.org/unix/x/${PORTNAME}/ \
 		SF/nemysisfreebsdp/${CATEGORIES}/:icons
-DISTFILES=	${PORTNAME}-${PORTVERSION:S/^0.//}${EXTRACT_SUFX} \
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/^0.//}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}.png:icons
-EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION:S/^0.//}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	3D objects flying around resembling explosions with various effects
 
 LICENSE=	GPLv2
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/^0.//}
-
 USES=		gmake perl5
 USE_PERL5=	build
 USE_SDL=	sdl image
diff --git a/misc/p5-Geo-Coder-Many/Makefile b/misc/p5-Geo-Coder-Many/Makefile
index 104727868807..6f23141270a0 100644
--- a/misc/p5-Geo-Coder-Many/Makefile
+++ b/misc/p5-Geo-Coder-Many/Makefile
@@ -3,11 +3,11 @@
 
 PORTNAME=	Geo-Coder-Many
 PORTVERSION=	0.46
+DISTVERSIONSUFFIX=	-5
 PORTREVISION=	1
 CATEGORIES=	misc geography perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-5
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Module to tie together multiple Geo::Coder::* modules
diff --git a/multimedia/dvd-slideshow/Makefile b/multimedia/dvd-slideshow/Makefile
index 82bb0bbe406b..a078f99ac0be 100644
--- a/multimedia/dvd-slideshow/Makefile
+++ b/multimedia/dvd-slideshow/Makefile
@@ -3,11 +3,12 @@
 
 PORTNAME=	dvd-slideshow
 PORTVERSION=	0.8.4
+DISTVERSIONSUFFIX=	-2
 PORTREVISION=	3
 CATEGORIES=	multimedia
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-2 \
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}${DISTVERSIONSUFFIX} \
 		SF/${PORTNAME}/${PORTNAME}-themes/${THEMEVERSION}-1:themes
-DISTFILES=	${PORTNAME}-${PORTVERSION}-2${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 THEMEVERSION=	0.8.4
 
 MAINTAINER=	oz@nixil.net
@@ -24,8 +25,6 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		${LOCALBASE}/share/fonts/urwfonts-ttf/README:${PORTSDIR}/x11-fonts/urwfonts-ttf \
 		cdrecord:${PORTSDIR}/sysutils/cdrtools
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-2
-
 NO_BUILD=	yes
 DATADIR=	${PREFIX}/share/apps/${PORTNAME}
 
diff --git a/multimedia/linux-xmovie/Makefile b/multimedia/linux-xmovie/Makefile
index 6f7ae2ecaffe..a09d38eecb1a 100644
--- a/multimedia/linux-xmovie/Makefile
+++ b/multimedia/linux-xmovie/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	xmovie
-PORTVERSION=	1.9.8.1
+DISTVERSION=	1.9.8-1
 PORTREVISION=	3
 CATEGORIES=	multimedia linux
 MASTER_SITES=	SF/heroines/releases/021003
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}.i386.rpm
-EXTRACT_SUFX=
+EXTRACT_SUFX=	.i386.rpm
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Movie player for AVI, MPEG-2/4, and MOV movies
diff --git a/multimedia/ptx-kmod/Makefile b/multimedia/ptx-kmod/Makefile
index e8145909ce7f..89a4e4cf3232 100644
--- a/multimedia/ptx-kmod/Makefile
+++ b/multimedia/ptx-kmod/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	ptx
 PORTVERSION=	0.0.20111212
 PORTREVISION=	1
 CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	hrs
+MASTER_SITES=	LOCAL/hrs
 PKGNAMESUFFIX=	-kmod
 DISTNAME=	${PORTNAME}-${PORTVERSION:S,0.0.,,}
 
diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
index 6b1c75ab16ea..88cd921547a9 100644
--- a/net-im/ejabberd/Makefile
+++ b/net-im/ejabberd/Makefile
@@ -6,9 +6,8 @@ PORTVERSION=	15.02
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.process-one.net/downloads/${PORTNAME}/${PORTVERSION}/:p1 \
 		http://distfiles.pirateparty.in/%SUBDIR%/:deps \
-		${MASTER_SITE_LOCAL:S/$/:deps/}
-MASTER_SITE_SUBDIR=	ashish/:deps
-DISTFILES+=	${PORTNAME}-${PORTVERSION}.tgz:p1 ejabberd-deps-2.tar.xz:deps
+		LOCAL/ashish:deps
+DISTFILES+=	${DISTNAME}.tgz:p1 ejabberd-deps-2.tar.xz:deps
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Free and Open Source distributed fault-tolerant Jabber server
diff --git a/net-im/p5-Net-XMPP/Makefile b/net-im/p5-Net-XMPP/Makefile
index f7616b578c36..e0eb0f784c1e 100644
--- a/net-im/p5-Net-XMPP/Makefile
+++ b/net-im/p5-Net-XMPP/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	Net-XMPP
-PORTVERSION=	1.02.04
+DISTVERSION=	1.02_04
 PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAPATRICK
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}_${PORTVERSION:E}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Net::XMPP provides Perl Developer access to the XMPP protocol
diff --git a/net-im/tkabbur/Makefile b/net-im/tkabbur/Makefile
index 9ee42b49e392..fb416a14a48b 100644
--- a/net-im/tkabbur/Makefile
+++ b/net-im/tkabbur/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	tkabbur
 PORTVERSION=	0.8
 CATEGORIES=	net-im
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
 MAINTAINER=	dhn@FreeBSD.org
diff --git a/net-im/xmpp-client/Makefile b/net-im/xmpp-client/Makefile
index 2a73c55bbee0..2814c92e6120 100644
--- a/net-im/xmpp-client/Makefile
+++ b/net-im/xmpp-client/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	xmpp-client
 PORTVERSION=	20150208
 CATEGORIES=	net-im
 MASTER_SITES=	http://c-s.li/ports/
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		xmpp-20150105.tar.gz
 
 MAINTAINER=	cs@FreeBSD.org
diff --git a/net-mgmt/arpwatch/Makefile b/net-mgmt/arpwatch/Makefile
index 9bf0f6ffb1ee..a288dc973279 100644
--- a/net-mgmt/arpwatch/Makefile
+++ b/net-mgmt/arpwatch/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	arpwatch
-PORTVERSION=	2.1.a15
+DISTVERSION=	2.1a15
 PORTREVISION=	8
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/ \
 		GENTOO/distfiles
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.([^\.]*)$/\1/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Monitor arp & rarp requests
diff --git a/net-mgmt/ezradius/Makefile b/net-mgmt/ezradius/Makefile
index 02e24c88fdda..561cc878ce9f 100644
--- a/net-mgmt/ezradius/Makefile
+++ b/net-mgmt/ezradius/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.2.1.2
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.2.1stable
-DISTNAME=	${PORTNAME}-${PORTVERSION}stable${EXTRACT_SUFFIX}
+DISTNAME=	${PORTNAME}-${PORTVERSION}stable
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	EzRADIUS is FreeRADIUS and Chillispot web-based management software
diff --git a/net-mgmt/netwag/Makefile b/net-mgmt/netwag/Makefile
index c916ae7774fa..868a0dfd01b2 100644
--- a/net-mgmt/netwag/Makefile
+++ b/net-mgmt/netwag/Makefile
@@ -7,7 +7,8 @@ CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	http://www.laurentconstantin.com/common/netw/${PORTNAME}/download/v5/ \
 		http://membres.lycos.fr/lauconstantin/common/netw/${PORTNAME}/download/v5/ \
 		http://laurentconstantin.free.fr/common/netw/${PORTNAME}/download/v5/
-DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tgz ${PORTNAME}-${PORTVERSION}-doc_html.tgz
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+DISTFILES=	${DISTNAME}.tgz ${DISTNAME:S/src/doc_html/}.tgz
 
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Graphical front end for netwox
@@ -20,7 +21,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/src
+WRKSRC_SUBDIR=	src
 SHORTPORTVERSION=${PORTVERSION:C/([0-9]*)\.([0-9]*)\.[0-9]*/\1\2/}
 
 PLIST_SUB+=	SHORTPORTVERSION=${SHORTPORTVERSION}
diff --git a/net-mgmt/netwox/Makefile b/net-mgmt/netwox/Makefile
index 23ee01a70c24..3d392d8fa990 100644
--- a/net-mgmt/netwox/Makefile
+++ b/net-mgmt/netwox/Makefile
@@ -7,7 +7,8 @@ CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	http://www.laurentconstantin.com/common/netw/netwox/download/v5/ \
 		http://membres.lycos.fr/lauconstantin/common/netw/netwox/download/v5/ \
 		http://laurentconstantin.free.fr/common/netw/netwox/download/v5/
-DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tgz ${PORTNAME}-${PORTVERSION}-doc_html.tgz
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+DISTFILES=	${DISTNAME}.tgz ${DISTNAME:S/src/doc_html/}.tgz
 
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Netwox a network testing toolbox
@@ -16,7 +17,7 @@ BUILD_DEPENDS=	netwib-config:${PORTSDIR}/net/netwib
 
 OPTIONS_DEFINE=	DOCS
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/src
+WRKSRC_SUBDIR=	src
 SHORTPORTVERSION=${PORTVERSION:C/([0-9]*)\.([0-9]*)\.[0-9]*/\1\2/}
 
 PLIST_SUB+=	SHORTPORTVERSION=${SHORTPORTVERSION}
diff --git a/net-mgmt/rackmonkey/Makefile b/net-mgmt/rackmonkey/Makefile
index 950d89a9ca76..5d6f5d43f301 100644
--- a/net-mgmt/rackmonkey/Makefile
+++ b/net-mgmt/rackmonkey/Makefile
@@ -3,12 +3,12 @@
 
 PORTNAME=	rackmonkey
 PORTVERSION=	1.2.5
+DISTVERSIONSUFFIX=	-1
 PORTREVISION=	3
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF \
 		ftp://ftp.secure-computing.net/pub/FreeBSD/ports/${PORTNAME}/ \
 		ftp://ftp2.secure-computing.net/pub/FreeBSD/ports/${PORTNAME}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 
 MAINTAINER=	ecrist@secure-computing.net
 COMMENT=	Web-based tool for managing racks of equipment
@@ -24,7 +24,6 @@ OPTIONS_DEFAULT=	SQLITE INIT_DB SAMPLE
 INIT_DB_DESC=	Initialize DB at installation (SQLite Only)
 SAMPLE_DESC=	Install sample data (SQLite Only)
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}-1
 NO_BUILD=	YES
 
 USES=		perl5
diff --git a/net-p2p/cpuminer/Makefile b/net-p2p/cpuminer/Makefile
index ebaf72747e17..0d71e17d5417 100644
--- a/net-p2p/cpuminer/Makefile
+++ b/net-p2p/cpuminer/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	cpuminer
 PORTVERSION=	2.4
 PORTREVISION=	2
 CATEGORIES=	net-p2p math
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	cpuminer
+MASTER_SITES=	SF/cpuminer
 DISTNAME=	pooler-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	mm@FreeBSD.org
diff --git a/net/activemq/Makefile b/net/activemq/Makefile
index bee42e2cf1c6..2e354f3dd0f0 100644
--- a/net/activemq/Makefile
+++ b/net/activemq/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	activemq
 PORTVERSION=	5.10.1
 CATEGORIES=	net java
-MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION}
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}-bin
 
 MAINTAINER=	tj@FreeBSD.org
diff --git a/net/belle-sip/Makefile b/net/belle-sip/Makefile
index 76d9f16d7bc2..1abcf725d0b3 100644
--- a/net/belle-sip/Makefile
+++ b/net/belle-sip/Makefile
@@ -3,11 +3,11 @@
 PORTNAME=	belle-sip
 PORTVERSION=	1.4.0
 CATEGORIES=	net java
-MASTER_SITES=	SAVANNAH/linphone/${PORTNAME}/:source1 \
+MASTER_SITES=	SAVANNAH/linphone/${PORTNAME}/ \
 		http://www.antlr3.org/download/:source2
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:source1 \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		antlr-3.4-complete.jar:source2
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Belle-sip is a SIP (RFC3261) implementation written in C
diff --git a/net/jakarta-commons-net/Makefile b/net/jakarta-commons-net/Makefile
index 2497fe227c34..ee6e8e29df08 100644
--- a/net/jakarta-commons-net/Makefile
+++ b/net/jakarta-commons-net/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	commons-net
 PORTVERSION=	1.4.1
 PORTREVISION=	3
 CATEGORIES=	net java
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_SOURCE
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/net/jrdesktop/Makefile b/net/jrdesktop/Makefile
index e8a121812458..c43137fb57cd 100644
--- a/net/jrdesktop/Makefile
+++ b/net/jrdesktop/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	jrdesktop
 PORTVERSION=	0.3.1.0
 CATEGORIES=	net java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R:R}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}.jar
-EXTRACT_SUFX=
+EXTRACT_SUFX=	.jar
 EXTRACT_ONLY=
 
 MAINTAINER=	ports@FreeBSD.org
@@ -23,14 +22,14 @@ SUB_LIST+=	JAVA=${JAVA} \
 		PORTNAME=${PORTNAME} \
 		PORTVERSION=${PORTVERSION}
 
-PLIST_FILES=	${JAVAJARDIR:S/${PREFIX}\///}/${DISTNAME} \
+PLIST_FILES=	${JAVAJARDIR:S/${PREFIX}\///}/${DISTNAME}.jar \
 		bin/${PORTNAME}
 
 post-extract:
-	${CP} ${DISTDIR}/${DISTNAME} ${WRKDIR}
+	${CP} ${DISTDIR}/${DISTNAME}.jar ${WRKDIR}
 
 do-install:
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME} ${STAGEDIR}${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}.jar ${STAGEDIR}${JAVAJARDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/jrdesktop ${STAGEDIR}${PREFIX}/bin/jrdesktop
 
 .include <bsd.port.mk>
diff --git a/net/mgen/Makefile b/net/mgen/Makefile
index 5aa0a164cd4a..9a2443be60fd 100644
--- a/net/mgen/Makefile
+++ b/net/mgen/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	mgen
 PORTVERSION=	4.2b6
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.pf.itd.nrl.navy.mil/mgen/archive/mgen4/ \
-	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	miwi
+		LOCAL/miwi
 DISTNAME=	src-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/netwib/Makefile b/net/netwib/Makefile
index 2d9c5c4185fd..50637e9263e0 100644
--- a/net/netwib/Makefile
+++ b/net/netwib/Makefile
@@ -8,14 +8,15 @@ CATEGORIES=	net devel ipv6
 MASTER_SITES=	http://www.laurentconstantin.com/common/netw/netwib/download/v5/ \
 		http://membres.lycos.fr/lauconstantin/common/netw/netwib/download/v5/ \
 		http://laurentconstantin.free.fr/common/netw/netwib/download/v5/
-DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tgz ${PORTNAME}-${PORTVERSION}-doc_html.tgz
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+DISTFILES=	${DISTNAME}.tgz ${DISTNAME:S/src/doc_html/}.tgz
 
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Netwib network programming library
 
 LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/src
+WRKSRC_SUBDIR=	src
 SHORTPORTVERSION=${PORTVERSION:C/([0-9]*)\.([0-9]*)\.[0-9]*/\1\2/}
 
 PLIST_SUB+=	SHORTPORTVERSION=${SHORTPORTVERSION}
diff --git a/net/openospfd/Makefile b/net/openospfd/Makefile
index 9b2ce8ad0e66..6da266037aa7 100644
--- a/net/openospfd/Makefile
+++ b/net/openospfd/Makefile
@@ -6,10 +6,10 @@ PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	OPENBSD/OpenBGPD:openbsd \
 		LOCAL/flz/openospfd/:freebsd
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz:openbsd \
+DISTFILES=	${DISTNAME}.tgz:openbsd \
 		if_media.h:freebsd
 DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tgz
+EXTRACT_ONLY=	${DISTNAME}.tgz
 
 MAINTAINER=	rea@FreeBSD.org
 COMMENT=	Free implementation of the Open Shortest Path First Protocol
diff --git a/net/p5-Net-SPDY/Makefile b/net/p5-Net-SPDY/Makefile
index 4a9e577ca706..89a47a059cb4 100644
--- a/net/p5-Net-SPDY/Makefile
+++ b/net/p5-Net-SPDY/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	Net-SPDY
-PORTVERSION=	0.1
+DISTVERSION=	0.1_5
 PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LKUNDRAK
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}_5
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	SPDY protocol client and server implementation
diff --git a/net/proxy-connect/Makefile b/net/proxy-connect/Makefile
index 2f4056145f82..a9e73492f8a5 100644
--- a/net/proxy-connect/Makefile
+++ b/net/proxy-connect/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	100
 CATEGORIES=	net
 MASTER_SITES=	http://www.exit2shell.com/~skreuzer/distfiles/ \
 				http://www.atarininja.org/distfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Command to make network connections via SOCKS and HTTPS proxies
diff --git a/net/py-libcloud/Makefile b/net/py-libcloud/Makefile
index eaf565cfe5c5..9b8a8cd4a919 100644
--- a/net/py-libcloud/Makefile
+++ b/net/py-libcloud/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	libcloud
 PORTVERSION=	0.17.0
 CATEGORIES=	net python
-MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	APACHE/${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
 
diff --git a/net/ss5/Makefile b/net/ss5/Makefile
index 844b7e48d781..fc066f6c111e 100644
--- a/net/ss5/Makefile
+++ b/net/ss5/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	ss5
 PORTVERSION=	3.8.5
+DISTVERSIONSUFFIX=	-1
 PORTREVISION=	2
 CATEGORIES=	net security
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-1
-DISTNAME=	${PORTNAME}-${PORTVERSION}-1
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	raffaele.delorenzo@libero.it
 COMMENT=	SOCKS v4/v5 application layer gateway with many features
diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
index 7f030197ecdf..b449d01acb0e 100644
--- a/net/unison-devel/Makefile
+++ b/net/unison-devel/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
 PKGNAMESUFFIX=	-devel
 DISTFILES=	${EXTRACT_ONLY} ${EXTRA_DOCS}
-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
+DIST_SUBDIR=	${DISTNAME}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	User-level file synchronization tool
@@ -27,8 +27,8 @@ MAKE_ARGS=	CFLAGS=""
 CONFLICTS=	unison-[0-9]* unison-nox11-[0-9]*
 
 DOCS=		BUGS.txt NEWS README
-EXTRA_DOCS=	unison-${PORTVERSION}-manual.html \
-		unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps
+EXTRA_DOCS=	${DISTNAME}-manual.html \
+		${DISTNAME}-manual.pdf ${DISTNAME}-manual.ps
 
 OPTIONS_DEFINE=	DOCS X11
 OPTIONS_DEFAULT=	DOCS X11
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 003df59c6ac8..1df7b538b1a3 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -7,8 +7,8 @@ PORTREVISION?=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
 DISTFILES=	${EXTRACT_ONLY} ${EXTRA_DOCS}
-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
+DIST_SUBDIR=	${DISTNAME}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	madpilot@FreeBSD.org
 COMMENT?=	User-level file synchronization tool
@@ -27,8 +27,8 @@ MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	unison all
 
 DOCS=		BUGS.txt NEWS README
-EXTRA_DOCS=	unison-${PORTVERSION}-manual.html \
-		unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps
+EXTRA_DOCS=	${DISTNAME}-manual.html \
+		${DISTNAME}-manual.pdf ${DISTNAME}-manual.ps
 
 OPTIONS_DEFINE= DOCS X11
 OPTIONS_DEFAULT?=        DOCS X11
diff --git a/net/unison232/Makefile b/net/unison232/Makefile
index 6f049d2a0296..73c82531008e 100644
--- a/net/unison232/Makefile
+++ b/net/unison232/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
 PKGNAMESUFFIX=	232
 DISTFILES=	${EXTRACT_ONLY} ${EXTRA_DOCS}
-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
+DIST_SUBDIR=	${DISTNAME}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	mandree@FreeBSD.org
 # Implicit approval for port changes granted to Guido Falsi <madpilot@FreeBSD.org>
@@ -28,8 +28,8 @@ MAKE_JOBS_UNSAFE=	yes
 
 DOCS=		BUGS.txt NEWS README
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
-EXTRA_DOCS=	${PORTNAME}-${PORTVERSION}-manual.html \
-		${PORTNAME}-${PORTVERSION}-manual.pdf ${PORTNAME}-${PORTVERSION}-manual.ps
+EXTRA_DOCS=	${DISTNAME}-manual.html \
+		${DISTNAME}-manual.pdf ${DISTNAME}-manual.ps
 
 OPTIONS_DEFINE=		DOCS X11
 OPTIONS_DEFAULT=	DOCS X11
diff --git a/net/unison240/Makefile b/net/unison240/Makefile
index 49053de89a3a..b5481b5ba044 100644
--- a/net/unison240/Makefile
+++ b/net/unison240/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
 PKGNAMESUFFIX=	240
 DISTFILES=	${EXTRACT_ONLY} ${EXTRA_DOCS}
-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
+DIST_SUBDIR=	${DISTNAME}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	madpilot@FreeBSD.org
 COMMENT?=	User-level file synchronization tool
@@ -28,8 +28,8 @@ ALL_TARGET=	unison all
 
 DOCS=		BUGS.txt NEWS README
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
-EXTRA_DOCS=	unison-${PORTVERSION}-manual.html \
-		unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps
+EXTRA_DOCS=	${DISTNAME}-manual.html \
+		${DISTNAME}-manual.pdf ${DISTNAME}-manual.ps
 
 OPTIONS_DEFINE= DOCS X11
 OPTIONS_DEFAULT?=        DOCS X11
diff --git a/net/wmwave/Makefile b/net/wmwave/Makefile
index 66809c63c22c..359e61ab59d8 100644
--- a/net/wmwave/Makefile
+++ b/net/wmwave/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	wmwave
-PORTVERSION=	0.4
+DISTVERSION=	0-4
 PORTREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	benjsc@FreeBSD.org
diff --git a/palm/palm-db-tools/Makefile b/palm/palm-db-tools/Makefile
index e03306499521..7902de1488d8 100644
--- a/palm/palm-db-tools/Makefile
+++ b/palm/palm-db-tools/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	palm-db-tools
-PORTVERSION=	0.3.6
+DISTVERSION=	0_3_6
 CATEGORIES=	palm
 MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities for the PalmOS flat-file database programs
diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile
index 210c0b660ada..4f0f4a979489 100644
--- a/polish/kadu/Makefile
+++ b/polish/kadu/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/:kadu \
 		GOOGLE_CODE:kadu \
 		http://download.kadu.im/stable/:kadu \
 		http://download.kadu.im/additions/:additions
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:kadu
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:kadu
 DIST_SUBDIR=	kadu
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Internet communicator supporting Gadu-Gadu and Jabber/XMPP
diff --git a/polish/qnapi/Makefile b/polish/qnapi/Makefile
index 85c964d93555..9c02654e52c4 100644
--- a/polish/qnapi/Makefile
+++ b/polish/qnapi/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	qnapi
-PORTVERSION=	0.1.6.r2
+DISTVERSION=	0.1.6-rc2
 PORTREVISION=	1
 CATEGORIES=	polish multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTNAME}/
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}-rc2
 
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Qt4 based subtitle downloader
diff --git a/ports-mgmt/dialog4ports/Makefile b/ports-mgmt/dialog4ports/Makefile
index 57273cf748ba..3735021ae95a 100644
--- a/ports-mgmt/dialog4ports/Makefile
+++ b/ports-mgmt/dialog4ports/Makefile
@@ -42,7 +42,7 @@ DIALOG4PORTS=	${WRKSRC}/dialog4ports
 .endif
 
 .if ${OSVERSION} < 900030 || defined(D4P_SLAVE)
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DIALOGNAME}.tgz:dialog
 DIALOGNAME=	dialog-1.1-20120706
 
diff --git a/ports-mgmt/fastest_sites/Makefile b/ports-mgmt/fastest_sites/Makefile
index 42a6b0a4994b..86c3c492a898 100644
--- a/ports-mgmt/fastest_sites/Makefile
+++ b/ports-mgmt/fastest_sites/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	fastest_sites
 PORTVERSION=	20110317
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://www.semicomplete.com/files/fastest_sites/
-DISTNAME=	${PORTNAME}-${PORTVERSION}.py
-EXTRACT_SUFX=	# nada
+EXTRACT_SUFX=	.py
 
 MAINTAINER=	wxs@FreeBSD.org
 COMMENT=	Sort MASTER_SITE_* based upon TCP handshake times
@@ -18,7 +17,7 @@ SHEBANG_FILES=	fastest_sites-${PORTVERSION}.py
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
-	@${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}
+	@${CP} ${DISTDIR}/${DISTNAME}.py ${WRKSRC}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/fastest_sites-${PORTVERSION}.py \
diff --git a/print/foomatic-db-engine/Makefile b/print/foomatic-db-engine/Makefile
index 17fee8b497d0..3e721e73294e 100644
--- a/print/foomatic-db-engine/Makefile
+++ b/print/foomatic-db-engine/Makefile
@@ -6,8 +6,8 @@ PORTVERSION=	4.0.12
 PORTEPOCH=	2
 CATEGORIES=	print
 MASTER_SITES=	http://www.openprinting.org/download/foomatic/ \
-		${MASTER_SITE_GOOGLE_CODE} \
-		${MASTER_SITE_LOCAL:S,$,acm/foomatic/,}
+		GOOGLE_CODE \
+		LOCAL/acm/foomatic
 PKGNAMEPREFIX=	foomatic-db-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	foomatic
diff --git a/print/foomatic-db-hpijs/Makefile b/print/foomatic-db-hpijs/Makefile
index 4322f6b08d45..d1e722ba3b68 100644
--- a/print/foomatic-db-hpijs/Makefile
+++ b/print/foomatic-db-hpijs/Makefile
@@ -3,9 +3,9 @@
 
 PORTNAME=	foomatic-db-hpijs
 PORTVERSION=	1.4
+DISTVERSIONSUFFIX=	-1
 CATEGORIES=	print
 MASTER_SITES=	LOCAL/lofi
-DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Foomatic data for the HPIJS printer drivers
diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index 0bf597489360..e59983017256 100644
--- a/print/py-reportlab/Makefile
+++ b/print/py-reportlab/Makefile
@@ -8,9 +8,9 @@ CATEGORIES=	print python
 MASTER_SITES=	CHEESESHOP \
 		http://www.reportlab.com/ftp/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PFBFER}
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Library to create PDF documents using the Python language
diff --git a/print/rtf2latex2e/Makefile b/print/rtf2latex2e/Makefile
index 6ce4f0a08751..cae38443422d 100644
--- a/print/rtf2latex2e/Makefile
+++ b/print/rtf2latex2e/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	rtf2latex2e
-PORTVERSION=	2.2.2
+DISTVERSION=	2-2-2
 CATEGORIES=	print
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-unix/2-2
-DISTNAME=	${PORTNAME}-${PORTVERSION:C|\.|-|g}
 
 MAINTAINER=	martin.dieringer@gmx.de
 COMMENT=	Newer filter that converts RTF (MS Rich Text Format) into LaTeX
diff --git a/print/xtexsh/Makefile b/print/xtexsh/Makefile
index e8b19f9cfb1a..880f31d0e9d9 100644
--- a/print/xtexsh/Makefile
+++ b/print/xtexsh/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	xtexsh
-PORTVERSION=	1.4.2
+DISTVERSION=	1.4-2
 PORTREVISION=	6
 CATEGORIES=	print
 MASTER_SITES=	http://www.mat.univie.ac.at/~gerald/ftp/xtexsh/
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tcl/Tk-based simple TeX interface
diff --git a/science/cdf/Makefile b/science/cdf/Makefile
index 4adafaa8fdac..08cab2a679b7 100644
--- a/science/cdf/Makefile
+++ b/science/cdf/Makefile
@@ -5,9 +5,8 @@ PORTNAME=	cdf3
 PORTVERSION=	3.3.0
 PORTREVISION=	4
 CATEGORIES=	science
-MASTER_SITES=	${MASTER_SITE_LOCAL}	\
+MASTER_SITES=	LOCAL/thierry/${PORTNAME} \
 		ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/cdf${VER}/unix/
-MASTER_SITE_SUBDIR=	thierry/${PORTNAME}
 DISTNAME=	cdf${VER}-dist-cdf
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
diff --git a/science/liblinear/Makefile b/science/liblinear/Makefile
index 91305e3c30bb..f53ff7ce92c7 100644
--- a/science/liblinear/Makefile
+++ b/science/liblinear/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	1.94
 CATEGORIES=	science math
 MASTER_SITES=	http://www.csie.ntu.edu.tw/~cjlin/liblinear/ \
 		http://www.csie.ntu.edu.tw/~cjlin/liblinear/oldfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/0$//}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for Large Linear Classification
diff --git a/science/libsvm/Makefile b/science/libsvm/Makefile
index e4a297b199b7..c4fe4f9f1459 100644
--- a/science/libsvm/Makefile
+++ b/science/libsvm/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	3.18
 CATEGORIES=	science math
 MASTER_SITES=	http://www.csie.ntu.edu.tw/~cjlin/libsvm/ \
 		http://www.csie.ntu.edu.tw/~cjlin/libsvm/oldfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/0$//}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for Support Vector Machines
diff --git a/security/pear-Crypt_Blowfish/Makefile b/security/pear-Crypt_Blowfish/Makefile
index d53b81ae3081..b7f4642716f3 100644
--- a/security/pear-Crypt_Blowfish/Makefile
+++ b/security/pear-Crypt_Blowfish/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	Crypt_Blowfish
-PORTVERSION=	1.1.0.r2
+DISTVERSION=	1.1.0RC2
 CATEGORIES=	security www pear
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/RC/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR class for blowfish encryption
diff --git a/security/retranslator/Makefile b/security/retranslator/Makefile
index 58ca786bdcc4..2d66833cce56 100644
--- a/security/retranslator/Makefile
+++ b/security/retranslator/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	retranslator
 PORTVERSION=	5.0.0
+DISTVERSIONSUFFIX=	-7
 CATEGORIES=	security
 MASTER_SITES=	http://utils.kaspersky.com/updater/retranslator_5.0.0.7/FreeBSD_6.3/ \
 		LOCAL/vg
-DISTNAME=	${PORTNAME}-${PORTVERSION}-7
 
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	The update utility for Kaspersky applications
diff --git a/security/secpanel/Makefile b/security/secpanel/Makefile
index 628a391b661e..4a46c93006a8 100644
--- a/security/secpanel/Makefile
+++ b/security/secpanel/Makefile
@@ -8,10 +8,10 @@ PORTEPOCH=	1
 CATEGORIES=	security tcl tk
 MASTER_SITES=	SF/${PORTNAME} \
 		SF/nemysisfreebsdp/security/:icons
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz \
+DISTFILES=	${DISTNAME}.tgz \
 		${PORTNAME}.png:icons
 DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tgz
+EXTRACT_ONLY=	${DISTNAME}.tgz
 
 MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	GUI for managing and running ssh and related utilities
diff --git a/security/steghide/Makefile b/security/steghide/Makefile
index cc994bdc077d..3c735fcd7b5c 100644
--- a/security/steghide/Makefile
+++ b/security/steghide/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.5.1
 PORTREVISION=	6
 CATEGORIES=	security
 MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/b/}
 
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	Steganography tool to hide data in binary files
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 4830ad82c7bc..6a2360ad00db 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -6,15 +6,13 @@ PATCHLEVEL=		33
 PORTVERSION=		4.3.${PATCHLEVEL:S/^0//g}
 PORTREVISION?=		0
 CATEGORIES=		shells
-MASTER_SITES=		GNU
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=		GNU/${PORTNAME}
 DISTNAME=		${PORTNAME}-${PORTVERSION:R}
 DIST_SUBDIR=		${PORTNAME}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 
-PATCH_SITES=		${MASTER_SITE_GNU} \
-			ftp://ftp.cwru.edu/pub/%SUBDIR%/
-PATCH_SITE_SUBDIR=	${PORTNAME}/${DISTNAME}-patches/
+PATCH_SITES=		GNU/${PORTNAME}/${DISTNAME}-patches/ \
+			ftp://ftp.cwru.edu/pub/${PORTNAME}/${DISTNAME}-patches/
 PATCHFILES!=		/usr/bin/jot -s " " -w \
 			${PORTNAME}${PORTVERSION:R:S/.//g}-%03d \
 			${PATCHLEVEL} 1 ${PATCHLEVEL}
diff --git a/sysutils/deltup/Makefile b/sysutils/deltup/Makefile
index b2657478bb88..c35684987ccc 100644
--- a/sysutils/deltup/Makefile
+++ b/sysutils/deltup/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://deltup.org/e107_files/downloads/ \
 		LOCAL/rafan \
 		http://www.bzip.org/${BZIP2_102}/:bzip2102src \
 		http://www.bzip.org/${BZIP2_103}/:bzip2103src
-DISTFILES+=	${PORTNAME}-${PORTVERSION}.tar.gz ${BZIP2_102_SOURCE}:bzip2102src ${BZIP2_103_SOURCE}:bzip2103src
+DISTFILES+=	${DISTNAME}.tar.gz ${BZIP2_102_SOURCE}:bzip2102src ${BZIP2_103_SOURCE}:bzip2103src
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Source delta update program
diff --git a/sysutils/fcron/Makefile b/sysutils/fcron/Makefile
index a9dc47791dda..c6b6733c277d 100644
--- a/sysutils/fcron/Makefile
+++ b/sysutils/fcron/Makefile
@@ -5,10 +5,9 @@ PORTNAME=	fcron
 PORTVERSION=	3.0.6
 PORTREVISION=	2
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_SUNSITE} \
+MASTER_SITES=	SUNSITE/system/daemons/cron \
 		http://fcron.free.fr/archives/ \
 		ftp://ftp.seul.org/pub/fcron/
-MASTER_SITE_SUBDIR=	system/daemons/cron
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
 MAINTAINER=	rde@tavi.co.uk
diff --git a/sysutils/fpkg/Makefile b/sysutils/fpkg/Makefile
index dd6ee3243fe1..15fd92419157 100644
--- a/sysutils/fpkg/Makefile
+++ b/sysutils/fpkg/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://voodoo.bawue.com/download/ \
 		http://www.shimazu.org/fpkg/
-DISTFILES=	${PORTNAME}-${PORTVERSION}
+EXTRACT_SUFX=
 EXTRACT_ONLY=
 
 MAINTAINER=	y.shimazu@nifty.com
diff --git a/sysutils/freesbie/Makefile b/sysutils/freesbie/Makefile
index df5a8860fdb3..ae74014cfbdb 100644
--- a/sysutils/freesbie/Makefile
+++ b/sysutils/freesbie/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	freesbie
 PORTVERSION=	2.0.20070710
 PORTREVISION=	2
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	riggs/freesbie
+MASTER_SITES=	LOCAL/riggs/freesbie
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/2.0.//}
 
 MAINTAINER=	riggs@FreeBSD.org
diff --git a/sysutils/fusefs-sqlfs/Makefile b/sysutils/fusefs-sqlfs/Makefile
index 10e936bb215b..ff7bd1bd911f 100644
--- a/sysutils/fusefs-sqlfs/Makefile
+++ b/sysutils/fusefs-sqlfs/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.1
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
+MASTER_SITES=	SAVANNAH
 MASTER_SITE_SUBDIR=	libsqlfs
 PKGNAMEPREFIX=	fusefs-
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}
diff --git a/sysutils/graveman/Makefile b/sysutils/graveman/Makefile
index fc6360a63245..0784166be01e 100644
--- a/sysutils/graveman/Makefile
+++ b/sysutils/graveman/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	graveman
-PORTVERSION=	0.3.12.5
+DISTVERSION=	0.3.12-5
 PORTREVISION=	11
 CATEGORIES=	sysutils
 MASTER_SITES=	http://graveman.tuxfamily.org/sources/
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(.)$/-\1/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Another GTK2 frontend for cdrecord, mkisofs, readcd, and sox
diff --git a/sysutils/hourglass/Makefile b/sysutils/hourglass/Makefile
index ed17fd3cef3c..89ccf75a18ce 100644
--- a/sysutils/hourglass/Makefile
+++ b/sysutils/hourglass/Makefile
@@ -2,9 +2,9 @@
 
 PORTNAME=	hourglass
 PORTVERSION=	1.0.1
+DISTVERSIONSUFFIX=	b
 CATEGORIES=	sysutils parallel
 MASTER_SITES=	http://www.cs.utah.edu/~regehr/hourglass/
-DISTNAME=	${PORTNAME}-${PORTVERSION}b
 
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	Real-time application to learn how CPU scheduling works
diff --git a/sysutils/jdiskreport/Makefile b/sysutils/jdiskreport/Makefile
index bfbf6cbe66c1..c69c756301fe 100644
--- a/sysutils/jdiskreport/Makefile
+++ b/sysutils/jdiskreport/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	jdiskreport
-PORTVERSION=	1.4.1
+DISTVERSION=	1_4_1
 CATEGORIES=	sysutils java
 MASTER_SITES=	http://www.jGoodies.com/download/${PORTNAME}/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S,.,_,g}
 
 MAINTAINER=	jon@witchspace.com
 COMMENT=	Java program to graphically display disk usage statistics
diff --git a/sysutils/osquery/Makefile b/sysutils/osquery/Makefile
index 7fc188bab50b..162f86909a74 100644
--- a/sysutils/osquery/Makefile
+++ b/sysutils/osquery/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	GH:ghc \
 		https://codeload.github.com/${PORTNAME}/third-party/tar.gz/${PORTVERSION}?dummy=/:gh
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz:ghc \
+DISTFILES=	${DISTNAME}.tar.gz:ghc \
 		third-party-${PORTVERSION}.tar.gz:gh
 
 MAINTAINER=	zi@FreeBSD.org
diff --git a/sysutils/osquery/distinfo b/sysutils/osquery/distinfo
index b5977a2bc919..1ad8e7198433 100644
--- a/sysutils/osquery/distinfo
+++ b/sysutils/osquery/distinfo
@@ -1,4 +1,4 @@
-SHA256 (osquery-1.4.5.tar.gz) = b0812eec4ca53eb6ada4692330caaed00ed1e50ead43b99486b3d15139369738
-SIZE (osquery-1.4.5.tar.gz) = 412622
+SHA256 (facebook-osquery-1.4.5_GH0.tar.gz) = b0812eec4ca53eb6ada4692330caaed00ed1e50ead43b99486b3d15139369738
+SIZE (facebook-osquery-1.4.5_GH0.tar.gz) = 412622
 SHA256 (third-party-1.4.5.tar.gz) = 06897b9ddf637c61f5c9e90f640b9f8c50c124d6276058a71f7d952439c8e58f
 SIZE (third-party-1.4.5.tar.gz) = 6073986
diff --git a/sysutils/progsreiserfs/Makefile b/sysutils/progsreiserfs/Makefile
index 3ecd6c2d53ff..3503ea95077f 100644
--- a/sysutils/progsreiserfs/Makefile
+++ b/sysutils/progsreiserfs/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	progsreiserfs
-PORTVERSION=	0.3.1.r8
+DISTVERSION=	0.3.1-rc8
 PORTREVISION=	6
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.cgsecurity.org/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-rc/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities and library to manipulate ReiserFS partitions
diff --git a/sysutils/qzeitgeist/Makefile b/sysutils/qzeitgeist/Makefile
index 4217f9acda46..7ee6bf6f3d0c 100644
--- a/sysutils/qzeitgeist/Makefile
+++ b/sysutils/qzeitgeist/Makefile
@@ -4,9 +4,8 @@ PORTNAME=	qzeitgeist
 PORTVERSION=	0.8.0
 PORTREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_KDE:C@$@:kde@} \
+MASTER_SITES=	KDE/stable/lib${PORTNAME}/${PORTVERSION}/src/:kde \
 		http://launchpad.net/zeitgeist/${ZEITGEIST_VERSION:R}/${ZEITGEIST_VERSION}/+download/
-MASTER_SITE_SUBDIR=	stable/lib${PORTNAME}/${PORTVERSION}/src/:kde
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:kde \
 		zeitgeist-${ZEITGEIST_VERSION}.tar.gz
diff --git a/sysutils/serf/Makefile b/sysutils/serf/Makefile
index 07b7f1036231..4e85d7bf4242 100644
--- a/sysutils/serf/Makefile
+++ b/sysutils/serf/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	serf
 PORTVERSION=	0.6.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
-MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/${GH_TAGNAME}.tar.gz?dummy=/:group1 \
+MASTER_SITES=	GH \
 		https://github.com/armon/circbuf/archive/f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz?dummy=/:group2 \
 		https://github.com/armon/go-metrics/archive/eb0af217e5e9747e41dd5303755356b62d28e3ec.tar.gz?dummy=/:group3 \
 		https://github.com/hashicorp/go-msgpack/archive/71c2886f5a673a35f909803f38ece5810165097b.tar.gz?dummy=/:group4 \
@@ -18,7 +18,7 @@ MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/${GH_TAGNAM
 		https://github.com/miekg/dns/archive/b65f52f3f0dd1afa25cbbf63f8e7eb15fb5c0641.tar.gz?dummy=/:group12 \
 		https://github.com/hashicorp/go.net/archive/cbad13bf000d0cbdbc71506b26e94bcc72bbe74d.tar.gz?dummy=/:group13
 PKGNAMEPREFIX=	hashicorp-
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz:group1 \
+DISTFILES=	${DISTNAME}.tar.gz \
 		armon_circbuf_f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz:group2 \
 		armon_go-metrics_eb0af217e5e9747e41dd5303755356b62d28e3ec.tar.gz:group3 \
 		hashicorp_go-msgpack_71c2886f5a673a35f909803f38ece5810165097b.tar.gz:group4 \
diff --git a/sysutils/serf/distinfo b/sysutils/serf/distinfo
index 72bbe9e0f33e..31dcaa37e451 100644
--- a/sysutils/serf/distinfo
+++ b/sysutils/serf/distinfo
@@ -1,5 +1,5 @@
-SHA256 (serf-0.6.4.tar.gz) = 452540c9a475b45cacb4a883108f41aab3198b8e9b41ba0ba957325c1d1fded8
-SIZE (serf-0.6.4.tar.gz) = 571489
+SHA256 (hashicorp-serf-v0.6.4_GH0.tar.gz) = 452540c9a475b45cacb4a883108f41aab3198b8e9b41ba0ba957325c1d1fded8
+SIZE (hashicorp-serf-v0.6.4_GH0.tar.gz) = 571489
 SHA256 (armon_circbuf_f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz) = b67d2ffc0a725b6844895680d52ba4a63757987637c8dabbb2c3e4d836512d52
 SIZE (armon_circbuf_f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz) = 2748
 SHA256 (armon_go-metrics_eb0af217e5e9747e41dd5303755356b62d28e3ec.tar.gz) = fd94820df854d11839891e6d7e8b63e816061d33f8bf45349486ef73482190db
diff --git a/sysutils/testdisk/Makefile b/sysutils/testdisk/Makefile
index 6661dc3b7fe5..3e0190ef1f3c 100644
--- a/sysutils/testdisk/Makefile
+++ b/sysutils/testdisk/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	testdisk
 PORTVERSION=	6.14
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.cgsecurity.org/
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	flz@FreeBSD.org
 COMMENT=	Tool to check and undelete partitions
diff --git a/sysutils/userneu-devel/Makefile b/sysutils/userneu-devel/Makefile
index 10a0216ccd5e..09737509f8ee 100644
--- a/sysutils/userneu-devel/Makefile
+++ b/sysutils/userneu-devel/Makefile
@@ -3,13 +3,13 @@
 
 PORTNAME=	userneu
 PORTVERSION=	1.43
+DISTVERSIONSUFFIX=	b
 PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://btw23.de/johannes/files/userneu/\
 		http://home.arcor.de/fehlner/fbsd_ports/\
 		http://home.arcor.de/teambushido/fbsd_ports/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-${PORTVERSION}b
 
 MAINTAINER=	fehlner@gmx.de
 COMMENT=	Account management and creation tool
diff --git a/sysutils/userneu/Makefile b/sysutils/userneu/Makefile
index 26a70f7148a7..4fee0d6dddfc 100644
--- a/sysutils/userneu/Makefile
+++ b/sysutils/userneu/Makefile
@@ -3,12 +3,12 @@
 
 PORTNAME=	userneu
 PORTVERSION=	1.38
+DISTVERSIONSUFFIX=	_1
 PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://btw23.de/johannes/userneu/ \
 		http://home.arcor.de/fehlner/fbsd_ports/ \
 		http://home.arcor.de/teambushido/fbsd_ports/
-DISTNAME=	${PORTNAME}-${PORTVERSION}_1
 
 MAINTAINER=	fehlner@gmx.de
 COMMENT=	Account management and creation tool
diff --git a/sysutils/xen-tools/Makefile b/sysutils/xen-tools/Makefile
index fee17aa35e79..98b8fc6f8270 100644
--- a/sysutils/xen-tools/Makefile
+++ b/sysutils/xen-tools/Makefile
@@ -25,7 +25,7 @@ ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	"not yet ported to anything other than amd64"
 
 SEABIOSVERSION=	1.8.1
-DISTFILES+=	${PORTNAME}-${PORTVERSION}.tar.gz \
+DISTFILES+=	${DISTNAME}.tar.gz \
 		seabios-${SEABIOSVERSION}.tar.gz:seabios
 
 WRKSRC=		${WRKDIR}/xen-${PORTVERSION}
diff --git a/textproc/dixit/Makefile b/textproc/dixit/Makefile
index d36b52884e4d..07e18869b68d 100644
--- a/textproc/dixit/Makefile
+++ b/textproc/dixit/Makefile
@@ -3,23 +3,22 @@
 
 PORTNAME=	dixit
 PORTVERSION=	11.11
+DISTVERSIONSUFFIX=	.${QT_VER}
 PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
 		SF/${PORTNAME}/${PORTNAME}_qdb:db \
 		LOCAL/bdrewery/${PORTNAME}/ \
 		LOCAL/bdrewery/${PORTNAME}:db
-DISTFILES=	${PORTNAME}-${PORTVERSION}.${QT_VER}.tgz \
+DISTFILES=	${DISTNAME}.tgz \
 		${_DB_D}:db
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.${QT_VER}.tgz
+EXTRACT_ONLY=	${DISTNAME}.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Romanian dictionaries databases and query application
 
 LICENSE=	GPLv3 # (or later)
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.${QT_VER}
-
 USES=		qmake
 USE_QT4=	corelib gui network moc_build rcc_build
 LDFLAGS+=	-lz
diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile
index a32dc5dcde8f..edef6dadb027 100644
--- a/textproc/fop/Makefile
+++ b/textproc/fop/Makefile
@@ -4,9 +4,8 @@
 PORTNAME=	fop
 PORTVERSION=	1.1
 CATEGORIES=	textproc java
-MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:fop/} \
+MASTER_SITES=	APACHE/xmlgraphics/fop/source/:fop \
 		SF/offo/offo-hyphenation/2.0:hyph
-MASTER_SITE_SUBDIR=	xmlgraphics/fop/source/:fop
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 DISTFILES=	${DISTNAME}.tar.gz:fop offo-hyphenation_v2.0.zip:hyph
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
diff --git a/textproc/htmldoc/Makefile b/textproc/htmldoc/Makefile
index 51e1986485c9..286dcd191e41 100644
--- a/textproc/htmldoc/Makefile
+++ b/textproc/htmldoc/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	1.8.28
 PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.msweet.org/files/project1/ \
-		${MASTER_SITE_EASYSW}
-MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
+		EASYSW/${PORTNAME}/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	jose@diasfernandes.pt
diff --git a/textproc/jakarta-commons-digester/Makefile b/textproc/jakarta-commons-digester/Makefile
index 3852f1f1e51c..0e4f888e69b3 100644
--- a/textproc/jakarta-commons-digester/Makefile
+++ b/textproc/jakarta-commons-digester/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	commons-digester
 PORTVERSION=	2.1
 CATEGORIES=	textproc java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_BINARIES}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_BINARIES
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
diff --git a/textproc/jdictionary/Makefile b/textproc/jdictionary/Makefile
index 3d1f4e60650b..cb6f1291743c 100644
--- a/textproc/jdictionary/Makefile
+++ b/textproc/jdictionary/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	jdictionary
-PORTVERSION=	1.8
+DISTVERSION=	1_8
 PORTREVISION=	4
 CATEGORIES=	textproc java
 MASTER_SITES=	SF/jdictionary/jDictionary/jDictionary%20version%20${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S,.,_,}
 
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Platform independent, plugin based dictionary
diff --git a/textproc/kmfl-khmer/Makefile b/textproc/kmfl-khmer/Makefile
index 8a87b30ba543..8e5124701c21 100644
--- a/textproc/kmfl-khmer/Makefile
+++ b/textproc/kmfl-khmer/Makefile
@@ -4,17 +4,16 @@
 PORTNAME=	khmer
 PORTVERSION=	1.0
 CATEGORIES=	textproc
-MASTER_SITES=	https://github.com/buganini/kmfl-${PORTNAME}/tarball/${PORTVERSION}/
 PKGNAMEPREFIX=	kmfl-
-DISTNAME=	buganini-${PORTNAME}-${PORTVERSION}-0-g${GITVERSION}
 
 MAINTAINER=	buganini@gmail.com
 COMMENT=	KMFL SCIM IMEngine keyboard for Khmer language
 
 RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
 
-GITVERSION=	a20cc89
-WRKSRC=		${WRKDIR}/buganini-kmfl-${PORTNAME}-${GITVERSION}/kmfl
+USE_GITHUB=	yes
+GH_ACCOUNT=	buganini
+GH_PROJECT=	kmfl-${PORTNAME}
 NO_BUILD=	yes
 
 KMFL_DIR=	share/kmfl
diff --git a/textproc/kmfl-khmer/distinfo b/textproc/kmfl-khmer/distinfo
index 3c9e6f51cc8a..b6b8cdd00b90 100644
--- a/textproc/kmfl-khmer/distinfo
+++ b/textproc/kmfl-khmer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (buganini-khmer-1.0-0-ga20cc89.tar.gz) = 90d59cbf8969fa768946d830870e8d06643c968bf98f9353d8fde579733a4020
-SIZE (buganini-khmer-1.0-0-ga20cc89.tar.gz) = 2895
+SHA256 (buganini-kmfl-khmer-1.0_GH0.tar.gz) = d5cb54c55c4db66ba593040575b8f9c8b61251d208083f627522af503b11a7a1
+SIZE (buganini-kmfl-khmer-1.0_GH0.tar.gz) = 2893
diff --git a/textproc/kmflcomp/Makefile b/textproc/kmflcomp/Makefile
index d44e30d682d0..4d1245a23e2e 100644
--- a/textproc/kmflcomp/Makefile
+++ b/textproc/kmflcomp/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	textproc
 MASTER_SITES=	SF/kmfl/kmfl/${PORTVERSION}:1 \
 		SF/kmfl/kmfl/Documentation:2 \
 		http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/:1,2
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz:1 \
+DISTFILES=	${DISTNAME}.tar.gz:1 \
 		KMFL-Compiler.sxw:2
 DIST_SUBDIR=	kmfl
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
+EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	Compiler of Keyman KMFL keyboard sources to use with SCIM/IBus
diff --git a/textproc/libtranslate/Makefile b/textproc/libtranslate/Makefile
index 45ed2a74825f..e571ae48776c 100644
--- a/textproc/libtranslate/Makefile
+++ b/textproc/libtranslate/Makefile
@@ -5,13 +5,11 @@ PORTNAME=		libtranslate
 PORTVERSION=		0.99
 PORTREVISION=		8
 CATEGORIES=		textproc
-MASTER_SITES=		${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} # May append to this
+MASTER_SITES=		SAVANNAH
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX} # May append to this
 
 PATCHFILES=		libtranslate-0.99-services.diff libtranslate-0.99-postmarker.diff
 PATCH_SITES=		${MASTER_SITES}
-PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		ports@FreeBSD.org
diff --git a/textproc/multimarkdown/Makefile b/textproc/multimarkdown/Makefile
index f83d78c52a51..e5a03b7d8604 100644
--- a/textproc/multimarkdown/Makefile
+++ b/textproc/multimarkdown/Makefile
@@ -4,11 +4,11 @@
 PORTNAME=	multimarkdown
 PORTVERSION=	4.7
 CATEGORIES=	textproc
-MASTER_SITES=	https://codeload.github.com/fletcher/MultiMarkdown-4/legacy.tar.gz/${MM4_COMMIT}?dummy=/:MM4 \
+MASTER_SITES=	GH:MM4 \
 		https://codeload.github.com/fletcher/MMD-Support/legacy.tar.gz/${SUPPORT_COMMIT}?dummy=/:support \
 		https://codeload.github.com/fletcher/human-markdown-reference/legacy.tar.gz/${CHEAT_COMMIT}?dummy=/:cheat \
 		https://codeload.github.com/nddrylliog/greg/legacy.tar.gz/${GREG_COMMIT}?dummy=/:greg
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:MM4 \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:MM4 \
 		greg-${GREG_COMMIT}${EXTRACT_SUFX}:greg
 DIST_SUBDIR=	${PORTNAME}
 
@@ -17,13 +17,14 @@ COMMENT=	Extended Markdown processor with more features, written in C
 
 LICENSE=	MIT
 
-MM4_COMMIT=	90c7ddf
+USE_GITHUB=	yes
+GH_ACCOUNT=	fletcher
+GH_PROJECT=	MultiMarkdown-4
+
 SUPPORT_COMMIT=	685c95c
 CHEAT_COMMIT=	199dae8
 GREG_COMMIT=	98ecf13
 
-WRKSRC=		${WRKDIR}/fletcher-MultiMarkdown-4-${MM4_COMMIT}
-
 ALL_TARGET=	${PORTNAME}
 USES=		gmake
 
diff --git a/textproc/multimarkdown/distinfo b/textproc/multimarkdown/distinfo
index 7eee06b6e17f..8d9ba6b4c2c3 100644
--- a/textproc/multimarkdown/distinfo
+++ b/textproc/multimarkdown/distinfo
@@ -1,5 +1,5 @@
-SHA256 (multimarkdown/multimarkdown-4.7.tar.gz) = fedd5dec9ff596cc48d26f5e3df1a1f89b024177f313aaaaf6dee95c5e403e12
-SIZE (multimarkdown/multimarkdown-4.7.tar.gz) = 120602
+SHA256 (multimarkdown/fletcher-MultiMarkdown-4-4.7_GH0.tar.gz) = 6ee0ac92c5e9eff924e3f9713f145cabd561ce62ef55fb9dacd69fa145d0fbfc
+SIZE (multimarkdown/fletcher-MultiMarkdown-4-4.7_GH0.tar.gz) = 120573
 SHA256 (multimarkdown/greg-98ecf13.tar.gz) = a3d13c16bdc0fce1f6fc1f8ec4fa9c32956876440c91a25a8183846334ba66c0
 SIZE (multimarkdown/greg-98ecf13.tar.gz) = 34304
 SHA256 (multimarkdown/human-markdown-reference-199dae8.tar.gz) = 6b7c0e1acfa5f3c40ce09dfdb456161e2fc6cd60159e4b06d9dc7f8772a50c59
diff --git a/textproc/p5-Algorithm-RabinKarp/Makefile b/textproc/p5-Algorithm-RabinKarp/Makefile
index e8cc7b4c7c71..09596c936896 100644
--- a/textproc/p5-Algorithm-RabinKarp/Makefile
+++ b/textproc/p5-Algorithm-RabinKarp/Makefile
@@ -3,12 +3,12 @@
 
 PORTNAME=	Algorithm-RabinKarp
 PORTVERSION=	0.41
+DISTVERSIONSUFFIX=	_1
 PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NNUNLEY
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}_1
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Rabin-Karp streaming hash
diff --git a/textproc/p5-Hash-Merge/Makefile b/textproc/p5-Hash-Merge/Makefile
index 56f29eebd59f..5dbb461d8dfc 100644
--- a/textproc/p5-Hash-Merge/Makefile
+++ b/textproc/p5-Hash-Merge/Makefile
@@ -3,11 +3,11 @@
 
 PORTNAME=	Hash-Merge
 PORTVERSION=	0.20
+DISTVERSIONSUFFIX=	0
 PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}0
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Merges hashes
diff --git a/textproc/p5-Marpa-HTML/Makefile b/textproc/p5-Marpa-HTML/Makefile
index 11d5bab8dbd1..ec77a1c35bd8 100644
--- a/textproc/p5-Marpa-HTML/Makefile
+++ b/textproc/p5-Marpa-HTML/Makefile
@@ -3,12 +3,12 @@
 
 PORTNAME=	Marpa-HTML
 PORTVERSION=	0.112
+DISTVERSIONSUFFIX=	000
 PORTREVISION=	1
 CATEGORIES=	textproc lang perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JKEGL
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}000
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	High-level HTML Parser
diff --git a/textproc/refdb/Makefile b/textproc/refdb/Makefile
index ecdbf714c81d..42330d2c9468 100644
--- a/textproc/refdb/Makefile
+++ b/textproc/refdb/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	refdb
 PORTVERSION=	0.9.9
+DISTVERSIONSUFFIX=	-1
 PORTREVISION=	7
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-src-${PORTVERSION}-1
-DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 
 MAINTAINER=	ohartman@zedat.fu-berlin.de
 COMMENT=	Bibliographic reference database
diff --git a/textproc/resume/Makefile b/textproc/resume/Makefile
index 971ce2638ae5..d08461f136cb 100644
--- a/textproc/resume/Makefile
+++ b/textproc/resume/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	resume
-PORTVERSION=	1.5.1
+DISTVERSION=	1_5_1
 PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	SF/xml${PORTNAME}/xml${PORTNAME}/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/textproc/vbindiff/Makefile b/textproc/vbindiff/Makefile
index 67b18c5317aa..0baf4003a427 100644
--- a/textproc/vbindiff/Makefile
+++ b/textproc/vbindiff/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	vbindiff
-PORTVERSION=	3.0.b4
+DISTVERSION=	3.0_beta4
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.cjmweb.net/vbindiff/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/_beta/}
 
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Visual binary diff, visually compare binary files
diff --git a/textproc/wordnet/Makefile b/textproc/wordnet/Makefile
index 40047921f1e5..02831ebe5e6f 100644
--- a/textproc/wordnet/Makefile
+++ b/textproc/wordnet/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://wordnetcode.princeton.edu/${PORTVERSION}/:code \
 		http://wordnetcode.princeton.edu/:dict
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:code wn3.1.dict.tar.gz:dict
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:code wn3.1.dict.tar.gz:dict
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Dictionaries and thesauri with devel. libraries (C, TCL) and browsers
diff --git a/textproc/xmlto/Makefile b/textproc/xmlto/Makefile
index d8894bb7dd04..8cb3e3a6cdac 100644
--- a/textproc/xmlto/Makefile
+++ b/textproc/xmlto/Makefile
@@ -9,10 +9,10 @@ MASTER_SITES=	https://fedorahosted.org/releases/x/m/xmlto/:xmlto \
 		LOCAL/mandree/:xmlto \
 		http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/:xsl \
 		LOCAL/mandree/:xsl
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:xmlto \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:xmlto \
 		xhtml2fo.xsl:xsl
 DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Front-end to an XSL toolchain
diff --git a/www/apache-forrest/Makefile b/www/apache-forrest/Makefile
index 6ee1fc6b6bb8..06c1c2042acb 100644
--- a/www/apache-forrest/Makefile
+++ b/www/apache-forrest/Makefile
@@ -5,10 +5,9 @@ PORTNAME=		apache-forrest
 PORTVERSION=		0.9
 PORTREVISION=		0
 CATEGORIES=		www java
-MASTER_SITES=		${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=	forrest
-DISTFILES=		${PORTNAME}-${PORTVERSION}-sources.tar.gz \
-			${PORTNAME}-${PORTVERSION}-dependencies.tar.gz
+MASTER_SITES=		SITE_APACHE/forrest
+DISTFILES=		${DISTNAME}-sources.tar.gz \
+			${DISTNAME}-dependencies.tar.gz
 
 MAINTAINER=		nivit@FreeBSD.org
 COMMENT=		Tool for rapid development of small sites
diff --git a/www/axis2/Makefile b/www/axis2/Makefile
index 1713f096f729..889782815133 100644
--- a/www/axis2/Makefile
+++ b/www/axis2/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	axis2
 PORTVERSION=	1.6.2
 PORTREVISION=	1
 CATEGORIES=	www java
-MASTER_SITES=	APACHE
-MASTER_SITE_SUBDIR=	axis/${PORTNAME}/java/core/${PORTVERSION}/
+MASTER_SITES=	APACHE/axis/${PORTNAME}/java/core/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/b2evolution/Makefile b/www/b2evolution/Makefile
index 63e600bf05d1..daa40031549c 100644
--- a/www/b2evolution/Makefile
+++ b/www/b2evolution/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	b2evolution
 PORTVERSION=	4.0.5
+DISTVERSIONSUFFIX=	-${B2EVO_DATE}
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF/evocms/${PORTNAME}/b2evo%20${PORTVERSION}-stable
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${B2EVO_DATE}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multilingual, multiuser, multi-blog engine
diff --git a/www/boa/Makefile b/www/boa/Makefile
index 0430f4c7a6a4..dcef55b18ead 100644
--- a/www/boa/Makefile
+++ b/www/boa/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	boa
-PORTVERSION=	0.94.14.r21
+DISTVERSION=	0.94.14rc21
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.boa.org/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High performance single-tasking web server
diff --git a/www/htmlcompressor/Makefile b/www/htmlcompressor/Makefile
index 73c15734382f..3f63badb9034 100644
--- a/www/htmlcompressor/Makefile
+++ b/www/htmlcompressor/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	1.5.3
 PORTREVISION=	2
 CATEGORIES=	www java
 MASTER_SITES=	GOOGLE_CODE
-DISTNAME=	${PORTNAME}-${PORTVERSION}.jar
-EXTRACT_SUFX=	# empty
+EXTRACT_SUFX=	.jar
 EXTRACT_ONLY=	# empty
 
 MAINTAINER=	ports@FreeBSD.org
@@ -25,7 +24,7 @@ SUB_LIST+=	JAVA_VERSION=${JAVA_PORT_VERSION:R}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${STAGEDIR}${JAVAJARDIR}/htmlcompressor.jar
+	${INSTALL_DATA} ${DISTDIR}/${DISTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/htmlcompressor.jar
 	${INSTALL_SCRIPT} ${WRKDIR}/htmlcompressor ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/www/linux-c6-qt47-webkit/Makefile b/www/linux-c6-qt47-webkit/Makefile
index 56c997fa9d36..5b46f71dcb77 100644
--- a/www/linux-c6-qt47-webkit/Makefile
+++ b/www/linux-c6-qt47-webkit/Makefile
@@ -5,10 +5,8 @@ PORTNAME=	qt47-webkit
 PORTVERSION=	4.7.2
 PORTREVISION=	1
 CATEGORIES=	www linux
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	xmj
+MASTER_SITES=	LOCAL/xmj
 PKGNAMEPREFIX=	linux-${USE_LINUX}-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 DIST_SUBDIR=	rpm/${LINUX_RPM_ARCH}/centos/c5
 
 MAINTAINER=	emulation@FreeBSD.org
diff --git a/www/madsonic/Makefile b/www/madsonic/Makefile
index 05ee6dc5b0f9..60214faec1ed 100644
--- a/www/madsonic/Makefile
+++ b/www/madsonic/Makefile
@@ -5,8 +5,8 @@ PORTNAME=	madsonic
 PORTVERSION=	5.1.5200
 CATEGORIES=	www java
 MASTER_SITES=	http://www.madsonic.org/download/5.1/
-DISTFILES=	${DISTDATE}_${PORTNAME}-${PORTVERSION}-war-tomcat.zip \
-	${DISTDATE}_${PORTNAME}-${PORTVERSION}-war-jspc.zip
+DISTFILES=	${DISTDATE}_${DISTNAME}-war-tomcat.zip \
+	${DISTDATE}_${DISTNAME}-war-jspc.zip
 
 MAINTAINER=	root@cooltrainer.org
 COMMENT=	Madsonic streaming media server
diff --git a/www/mohawk/Makefile b/www/mohawk/Makefile
index 4b4a979cab7d..100a08266919 100644
--- a/www/mohawk/Makefile
+++ b/www/mohawk/Makefile
@@ -5,7 +5,7 @@ PORTVERSION=	2.0.17
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://fossil.bsdsx.fr/mohawk/tarball/ \
 		http://fossil.etoilebsd.net/mohawk/tarball/
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz?uuid=${PORTVERSION}
+DISTFILES=	${DISTNAME}.tar.gz?uuid=${PORTVERSION}
 
 MAINTAINER=	mohawk@bsdsx.fr
 COMMENT=	Simple and lightweight HTTP daemon
diff --git a/www/p5-Apache-Clean2/Makefile b/www/p5-Apache-Clean2/Makefile
index 157c19039d52..57adac6d411d 100644
--- a/www/p5-Apache-Clean2/Makefile
+++ b/www/p5-Apache-Clean2/Makefile
@@ -3,12 +3,12 @@
 
 PORTNAME=	Apache-Clean
 PORTVERSION=	2.00
+DISTVERSIONSUFFIX=	_7
 PORTREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Apache/GEOFF
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}_7
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Mod_perl interface into HTML::Clean
diff --git a/www/p5-CGI-Ajax/Makefile b/www/p5-CGI-Ajax/Makefile
index db7959af786f..e066e5a558af 100644
--- a/www/p5-CGI-Ajax/Makefile
+++ b/www/p5-CGI-Ajax/Makefile
@@ -7,7 +7,6 @@ PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/0$//}
 
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Module for writing AJAX/DHTML-based web apps
diff --git a/www/p5-Catalyst-Model-Tarantool/Makefile b/www/p5-Catalyst-Model-Tarantool/Makefile
index cd724d9fe636..c6991cc47c6e 100644
--- a/www/p5-Catalyst-Model-Tarantool/Makefile
+++ b/www/p5-Catalyst-Model-Tarantool/Makefile
@@ -3,11 +3,11 @@
 
 PORTNAME=	Catalyst-Model-Tarantool
 PORTVERSION=	0.0.1
+DISTVERSIONSUFFIX=	-1
 PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Tarantool interface for Catalyst based application
diff --git a/www/p5-URI-ParseSearchString/Makefile b/www/p5-URI-ParseSearchString/Makefile
index 5883bcff9019..000693778b59 100644
--- a/www/p5-URI-ParseSearchString/Makefile
+++ b/www/p5-URI-ParseSearchString/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	URI-ParseSearchString
-PORTVERSION=	3.51.0
+PORTVERSION=	3.51
 PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/.0$//}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse Apache referer logs and extract search engine query strings
diff --git a/www/py-albatross/Makefile b/www/py-albatross/Makefile
index 3f1c93145497..16783e2e60c6 100644
--- a/www/py-albatross/Makefile
+++ b/www/py-albatross/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.36
 CATEGORIES=	www python
 MASTER_SITES=	http://object-craft.com.au/projects/albatross/download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}-html-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	gnb@itga.com.au
diff --git a/www/py-django-crispy-forms/Makefile b/www/py-django-crispy-forms/Makefile
index 1323aa0bf6b9..0b36144c297b 100644
--- a/www/py-django-crispy-forms/Makefile
+++ b/www/py-django-crispy-forms/Makefile
@@ -7,7 +7,6 @@ PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	xmj@chaot.net
 COMMENT=	The best way to have Django DRY forms
diff --git a/www/py-django-signals-ahoy/Makefile b/www/py-django-signals-ahoy/Makefile
index b6594315fe59..e3837230172f 100644
--- a/www/py-django-signals-ahoy/Makefile
+++ b/www/py-django-signals-ahoy/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	django-signals-ahoy
-PORTVERSION=	0.1.0
+DISTVERSION=	0.1-0
 PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	http://cdn.bitbucket.org/bkroeze/django-signals-ahoy/downloads/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/([[:digit:]]\.[[:digit:]])\./\1-/g}
 
 MAINTAINER=	ports@caomhin.org
 COMMENT=	Extended set of signals for use by Django apps
diff --git a/www/py-html5lib/Makefile b/www/py-html5lib/Makefile
index ccf7f9d86b9c..e0e9998fb2e4 100644
--- a/www/py-html5lib/Makefile
+++ b/www/py-html5lib/Makefile
@@ -25,8 +25,8 @@ USE_PYTHON=	distutils autoplist
 .include <bsd.port.options.mk>
 
 .if !empty(PORT_OPTIONS:MTEST)
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:master \
-		${PORTNAME}-${PORTVERSION}-testdata${EXTRACT_SUFX}:test
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:master \
+		${DISTNAME}-testdata${EXTRACT_SUFX}:test
 BUILD_DEPENDS+=	${TEST_DEPENDS}
 .endif
 
diff --git a/www/tomcat-native/Makefile b/www/tomcat-native/Makefile
index 55ff1f7ff1a6..54bdff4dfada 100644
--- a/www/tomcat-native/Makefile
+++ b/www/tomcat-native/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	tomcat-native
 PORTVERSION=	1.1.32
 CATEGORIES=	www java
-MASTER_SITES=	APACHE
-MASTER_SITE_SUBDIR=	tomcat/tomcat-connectors/native/${PORTVERSION}/source
+MASTER_SITES=	APACHE/tomcat/tomcat-connectors/native/${PORTVERSION}/source
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	ale@FreeBSD.org
diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile
index 4512c2e7afd1..13dc2bd047be 100644
--- a/www/tomcat6/Makefile
+++ b/www/tomcat6/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	tomcat
 PORTVERSION=	6.0.43
 CATEGORIES=	www java
-MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=	tomcat/tomcat-6/v${PORTVERSION}/bin
+MASTER_SITES=	APACHE/tomcat/tomcat-6/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	6
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
 
diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index af22c9f3b371..95ef65e25834 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	tomcat
 PORTVERSION=	7.0.59
 CATEGORIES=	www java
-MASTER_SITES=	APACHE
-MASTER_SITE_SUBDIR=	tomcat/tomcat-7/v${PORTVERSION}/bin
+MASTER_SITES=	APACHE/tomcat/tomcat-7/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	7
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
 
diff --git a/www/tomcat8/Makefile b/www/tomcat8/Makefile
index 2592b05e8395..724b4d0335c3 100644
--- a/www/tomcat8/Makefile
+++ b/www/tomcat8/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	tomcat
 PORTVERSION=	8.0.18
 CATEGORIES=	www java
-MASTER_SITES=	APACHE
-MASTER_SITE_SUBDIR=	tomcat/tomcat-8/v${PORTVERSION}/bin
+MASTER_SITES=	APACHE/tomcat/tomcat-8/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	8
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
 
diff --git a/www/trac-wikinotification/Makefile b/www/trac-wikinotification/Makefile
index 6565ce9a7bb0..2ad5fa01725b 100644
--- a/www/trac-wikinotification/Makefile
+++ b/www/trac-wikinotification/Makefile
@@ -5,10 +5,8 @@ PORTNAME=	wikinotificationplugin
 PORTVERSION=	0.2.1
 PORTREVISION=	5
 CATEGORIES=	www devel python
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	brooks
+MASTER_SITES=	LOCAL/brooks
 PKGNAMEPREFIX=	trac-
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/p/rc/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Allow email notifications on wiki page changes
diff --git a/www/wikicalc/Makefile b/www/wikicalc/Makefile
index 124505a8389c..077ce3c787fe 100644
--- a/www/wikicalc/Makefile
+++ b/www/wikicalc/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	wikicalc
-PORTVERSION=	1.0
+DISTVERSION=	1-0
 CATEGORIES=	www math
 MASTER_SITES=	http://www.peapodcast.com/sgi/downloads/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S,.,-,}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Open Source Wiki-Spreadsheet
diff --git a/www/woof/Makefile b/www/woof/Makefile
index 169bdec7f9f7..59a3556ff4a2 100644
--- a/www/woof/Makefile
+++ b/www/woof/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	woof
-PORTVERSION=	2012.05.31
+DISTVERSION=	2012-05-31
 CATEGORIES=	www
 MASTER_SITES=	http://www.home.unix-ag.org/simon/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/g}
 EXTRACT_SUFX=	.py
 EXTRACT_ONLY=	# empty
 
diff --git a/www/yuicompressor/Makefile b/www/yuicompressor/Makefile
index 780d0351f3f6..6cc7e2aab3e1 100644
--- a/www/yuicompressor/Makefile
+++ b/www/yuicompressor/Makefile
@@ -6,10 +6,9 @@ PORTVERSION=	2.4.8
 PORTREVISION=	1
 CATEGORIES=	www java
 #MASTER_SITES=	http://tml.github.io/yui/
-MASTER_SITES+=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	az
-DISTNAME=	${PORTNAME}-${PORTVERSION}.jar
-EXTRACT_SUFX=	# empty
+MASTER_SITES+=	LOCAL/az
+DISTNAME=	${PORTNAME}-${PORTVERSION}
+EXTRACT_SUFX=	.jar
 EXTRACT_ONLY=	# empty
 
 MAINTAINER=	citrin@citrin.ru
@@ -25,7 +24,7 @@ PLIST_FILES=	bin/yuicompressor %%JAVAJARDIR%%/yuicompressor.jar
 SUB_FILES=	yuicompressor
 
 do-install:
-	${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${STAGEDIR}${JAVAJARDIR}/yuicompressor.jar
+	${INSTALL_DATA} ${DISTDIR}/${DISTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/yuicompressor.jar
 	${INSTALL_SCRIPT} ${WRKDIR}/yuicompressor ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/www/zend-framework1/Makefile b/www/zend-framework1/Makefile
index 2e97a808640a..27b6c2348a52 100644
--- a/www/zend-framework1/Makefile
+++ b/www/zend-framework1/Makefile
@@ -38,8 +38,8 @@ OPTPHP_DESC=	Install optional PHP dependencies
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
-		${PORTNAME}-${PORTVERSION}-manual-en${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${DISTNAME}-manual-en${EXTRACT_SUFX}
 .endif
 
 INSTALL_DIRS=	library extras/library externals/dojo/dijit \
diff --git a/x11-clocks/asclock-gtk/Makefile b/x11-clocks/asclock-gtk/Makefile
index 5b7d852ac001..7c80541fbf6b 100644
--- a/x11-clocks/asclock-gtk/Makefile
+++ b/x11-clocks/asclock-gtk/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	asclock-gtk
 PORTVERSION=	2.1.10
 PORTREVISION=	9
 CATEGORIES=	x11-clocks afterstep windowmaker
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	kuriyama
+MASTER_SITES=	LOCAL/kuriyama
 DISTNAME=	${PORTNAME}-${PORTVERSION}beta
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile
index 219e158f4c19..5668956d25fd 100644
--- a/x11-fm/doublecmd/Makefile
+++ b/x11-fm/doublecmd/Makefile
@@ -4,10 +4,9 @@
 PORTNAME=	doublecmd
 PORTVERSION=	0.6.1
 CATEGORIES=	x11-fm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}/Double%20Commander%20Source
+MASTER_SITES=	SOURCEFORGE/${PORTNAME}/Double%20Commander%20Source
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
-DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tar.gz ${PORTNAME}-help-${HELPVERSION}-src.tar.gz
+DISTFILES=	${DISTNAME}.tar.gz ${PORTNAME}-help-${HELPVERSION}-src.tar.gz
 
 MAINTAINER=	bbtruk@users.sourceforge.net
 COMMENT=	Total Commander like file manager for the X Window System
diff --git a/x11-fm/mucommander/Makefile b/x11-fm/mucommander/Makefile
index 11ed86be80b6..45e05d03c3c9 100644
--- a/x11-fm/mucommander/Makefile
+++ b/x11-fm/mucommander/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	mucommander
-PORTVERSION=	0.9.0
+DISTVERSION=	0_9_0
 CATEGORIES=	x11-fm java
 MASTER_SITES=	http://www.mucommander.com/download/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}
 
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Lightweight file manager featuring a Norton Commander style interface
diff --git a/x11-fonts/bitstream-vera/Makefile b/x11-fonts/bitstream-vera/Makefile
index f7d1bdc3a187..d1d716d5b3e2 100644
--- a/x11-fonts/bitstream-vera/Makefile
+++ b/x11-fonts/bitstream-vera/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	bitstream-vera
 PORTVERSION=	1.10
 PORTREVISION=	7
 CATEGORIES=	x11-fonts
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/ttf-${PORTNAME}/1.10
+MASTER_SITES=	GNOME/sources/ttf-${PORTNAME}/${PORTVERSION}
 DISTNAME=	ttf-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11-fonts/code2000/Makefile b/x11-fonts/code2000/Makefile
index 1fe5a8359572..438ea2591bd1 100644
--- a/x11-fonts/code2000/Makefile
+++ b/x11-fonts/code2000/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	code2000
 PORTVERSION=	1.171
 PORTREVISION=	2
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	thierry/${DIST_SUBDIR}
+MASTER_SITES=	LOCAL/thierry/${DIST_SUBDIR}
 DISTFILES=	${PORTNAME:tu}${EXTRACT_SUFX:tu}
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
diff --git a/x11-fonts/junicode/Makefile b/x11-fonts/junicode/Makefile
index 71481dd9ea6e..1fc5b8b86e9a 100644
--- a/x11-fonts/junicode/Makefile
+++ b/x11-fonts/junicode/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	junicode
-PORTVERSION=	0.7.6
+DISTVERSION=	0-7-6
 PORTREVISION=	3
 CATEGORIES=	x11-fonts
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:S|.|-|g} \
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${DISTVERSION} \
 		http://anthesphoria.net/FreeBSD/ports/distfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S|.|-|g}
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	Unicode/MUFI OpenType font for medievalists (Latin, IPA, Runic, Greek)
diff --git a/x11-fonts/padauk/Makefile b/x11-fonts/padauk/Makefile
index c3f4b9d4b565..b0c471b39dd5 100644
--- a/x11-fonts/padauk/Makefile
+++ b/x11-fonts/padauk/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	padauk
 PORTVERSION=	2.8
+DISTVERSIONSUFFIX=	0
 PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=Mh_Padauk_zip&filename=/
-DISTNAME=	${PORTNAME}-${PORTVERSION}0
 
 MAINTAINER=	buganini@gmail.com
 COMMENT=	Unicode font supporting all the Myanmar characters
diff --git a/x11-themes/gtk-equinox-engine/Makefile b/x11-themes/gtk-equinox-engine/Makefile
index a911764f697c..a3bd7011bd82 100644
--- a/x11-themes/gtk-equinox-engine/Makefile
+++ b/x11-themes/gtk-equinox-engine/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	x11-themes
 MASTER_SITES=	http://gnome-look.org/CONTENT/content-files/
 PKGNAMEPREFIX=	gtk-
 PKGNAMESUFFIX=	-engine
-DISTFILES=	121881-${PORTNAME}-${PORTVERSION}.tar.gz \
+DISTFILES=	121881-${DISTNAME}.tar.gz \
 		140449-${PORTNAME}-themes-${PORTVERSION}.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-themes/kde-icons-lush/Makefile b/x11-themes/kde-icons-lush/Makefile
index f145173ce37a..ad1a877bc0fc 100644
--- a/x11-themes/kde-icons-lush/Makefile
+++ b/x11-themes/kde-icons-lush/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	lush
 PORTVERSION=	0.1.0
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	lioux
+MASTER_SITES=	LOCAL/lioux
 DISTNAME=	${PORTNAME}-${PORTVERSION}dave
 
 COMMENT=	KDE Lush complete iconset
diff --git a/x11-toolkits/linux-c6-gtk2/Makefile b/x11-toolkits/linux-c6-gtk2/Makefile
index b0638d87d8f8..da6916274f11 100644
--- a/x11-toolkits/linux-c6-gtk2/Makefile
+++ b/x11-toolkits/linux-c6-gtk2/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	gtk2
 PORTVERSION=	2.24.23
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits linux
-DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}.${LINUX_RPM_ARCH}.rpm \
+DISTFILES=	${DISTNAME}.${LINUX_RPM_ARCH}.rpm \
 		${PORTNAME}-engines-2.18.4-5.el6.${LINUX_DIST}.${LINUX_RPM_ARCH}.rpm \
 		pixman-0.32.4-4.el6.${LINUX_RPM_ARCH}.rpm \
 		jasper-libs-1.900.1-15.el6_1.1.${LINUX_RPM_ARCH}.rpm
diff --git a/x11-toolkits/linux-f10-gtk2/Makefile b/x11-toolkits/linux-f10-gtk2/Makefile
index 61001e109ab5..4e3074859dd9 100644
--- a/x11-toolkits/linux-f10-gtk2/Makefile
+++ b/x11-toolkits/linux-f10-gtk2/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	5
 CATEGORIES=	x11-toolkits linux
 MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
-DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}.${LINUX_RPM_ARCH}.rpm \
+DISTFILES=	${DISTNAME}.${LINUX_RPM_ARCH}.rpm \
 		${PORTNAME}-engines-2.16.1-1.fc10.${LINUX_RPM_ARCH}.rpm \
 		gtk-murrine-engine-0.53.1-3.fc10.${LINUX_RPM_ARCH}.rpm \
 		gtk-nodoka-engine-0.7.2-1.fc10.${LINUX_RPM_ARCH}.rpm \
@@ -34,7 +34,7 @@ BRANDELF_DIRS=	usr/bin
 USE_LDCONFIG=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}0/pkg-descr
-SRC_DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}.src.rpm \
+SRC_DISTFILES=	${DISTNAME}.src.rpm \
 		${PORTNAME}-engines-2.16.1-1.fc10.src.rpm \
 		gtk-murrine-engine-0.53.1-3.fc10.src.rpm \
 		gtk-nodoka-engine-0.7.2-1.fc10.src.rpm \
diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile
index 9a7940d3a0d9..f798002b50aa 100644
--- a/x11-toolkits/v/Makefile
+++ b/x11-toolkits/v/Makefile
@@ -6,8 +6,8 @@ PORTVERSION=	1.90
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits devel graphics
 MASTER_SITES=	SF/${PORTNAME}gui/V%20GUI/${PORTVERSION}
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
-		${PORTNAME}-${PORTVERSION}a-patch${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${DISTNAME}a-patch${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ GUI development framework for X11 and Microsoft Windows
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index 6a1cf379a9cf..d02eb217d6f1 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -5,8 +5,8 @@ PORTNAME=	fluxbox
 PORTVERSION=	1.3.7
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	Small and fast window manager based on BlackBox
diff --git a/x11/imwheel/Makefile b/x11/imwheel/Makefile
index e0aee428b295..8911de69bea4 100644
--- a/x11/imwheel/Makefile
+++ b/x11/imwheel/Makefile
@@ -2,13 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	imwheel
-PORTVERSION=	1.0.0.p12
+DISTVERSION=	1.0.0pre12
 PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://jcatki.no-ip.org/pub/imwheel/ \
-		SF/${PORTNAME}/${PORTNAME}-source/1.0.0pre12
-
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p12/pre12/}
+		SF/${PORTNAME}/${PORTNAME}-source/${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utility to translate mouse wheel actions into X keyboard events
diff --git a/x11/leechcraft/Makefile b/x11/leechcraft/Makefile
index 23a326562b8e..a21d3e050174 100644
--- a/x11/leechcraft/Makefile
+++ b/x11/leechcraft/Makefile
@@ -6,8 +6,6 @@ PORTVERSION=	0.6.70
 PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://dist.leechcraft.org/LeechCraft/0.6.70/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
-#DISTNAME=	${PORTNAME}-${PORTVERSION}-${LC_REV}
 
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Cross-platform modular live environment
@@ -26,7 +24,7 @@ CMAKE_ARGS+=	-DENABLE_LADS=OFF \
 		-DENABLE_SYNCER=OFF \
 		-DLEECHCRAFT_VERSION=${PORTVERSION}
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
+WRKSRC_SUBDIR=	src
 
 OPTIONS_DEFINE=	AGGREGATOR ANHERO ANOTIFI AUSCRIE AZOTH BITTORRENT BLASQ BLOGIQUE \
 		CERTMGR CPULOAD CSTP DBUSMANAGER DEADLYRICS DEVMON DOLOZHEE \
author	Mathieu Arnold <mat@FreeBSD.org>	2015-05-11 18:34:57 +0000
committer	Mathieu Arnold <mat@FreeBSD.org>	2015-05-11 18:34:57 +0000
commit	88bfe4bd43787219ab4de75bd68c490c98776dfc (patch)
tree	634e1ef4990207301493f26b46d80abe56b9f2b3
parent	Introduce two new magic master sites macros, APACHE_COMMONS_BINARIES and (diff)