- DISTNAME= ${PORTNAME}-${PORTVERSION} is the default and not needed.

PR: ports/153292 Submitted by: myself (pgollucci) Tested by: -exp run by pav Approved by: portmgr (pav)
author: Philip M. Gollucci <pgollucci@FreeBSD.org> 2010-12-29 20:04:42 +0000
committer: Philip M. Gollucci <pgollucci@FreeBSD.org> 2010-12-29 20:04:42 +0000
commit: 116ec22ac1e21a8ce6fe1cf302abb42bbcbbd6d3 (patch)
tree: 182c3e8b2fec5d158af1b14d92f30efeee781107
parent: ce797dd6db08415f0769d368481029338e73d118 (diff)
download: ports-116ec22ac1e21a8ce6fe1cf302abb42bbcbbd6d3.tar.gz
ports-116ec22ac1e21a8ce6fe1cf302abb42bbcbbd6d3.zip
210 files changed, 0 insertions, 210 deletions
diff --git a/archivers/libpar2/Makefile b/archivers/libpar2/Makefile
index c347c01c344a..319dd15af618 100644
--- a/archivers/libpar2/Makefile
+++ b/archivers/libpar2/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	0.2
 PORTREVISION=	3
 CATEGORIES=	archivers
 MASTER_SITES=	SF/parchive/${PORTNAME}/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	toxic@doobie.com
 COMMENT=	A library for manipulating par2 files, extracted from par2cmdline
diff --git a/archivers/par2cmdline/Makefile b/archivers/par2cmdline/Makefile
index 0a60e3b92733..bac3ff357743 100644
--- a/archivers/par2cmdline/Makefile
+++ b/archivers/par2cmdline/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	0.4
 PORTREVISION=	3
 CATEGORIES=	archivers
 MASTER_SITES=	SF/parchive/${PORTNAME}/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Tools for using Parity v2 Archive files
diff --git a/audio/mehdiaplayer/Makefile b/audio/mehdiaplayer/Makefile
index b2f72c518c69..da8630efe061 100644
--- a/audio/mehdiaplayer/Makefile
+++ b/audio/mehdiaplayer/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	0.2
 PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	g.veniamin@googlemail.com
 COMMENT=	A simple media player using Qt/Phonon
diff --git a/audio/mpg123.el/Makefile b/audio/mpg123.el/Makefile
index b6c312dadbab..8310e0a3e27e 100644
--- a/audio/mpg123.el/Makefile
+++ b/audio/mpg123.el/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	mpg123.el
 PORTVERSION=	1.52
 CATEGORIES=	audio elisp
 MASTER_SITES=	http://www.gentei.org/~yuuji/software/mpg123el/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	# empty
 EXTRACT_ONLY=	# empty
 
diff --git a/audio/pm3umpdl/Makefile b/audio/pm3umpdl/Makefile
index 5b42c6205c8b..2c154d40b7cc 100644
--- a/audio/pm3umpdl/Makefile
+++ b/audio/pm3umpdl/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	pm3umpdl
 PORTVERSION=	1.0.0
 CATEGORIES=	audio deskutils
 MASTER_SITES=	http://cpan.org/authors/id/V/VV/VVELOX/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=
 EXTRACT_ONLY=
 
diff --git a/audio/qmpdclient/Makefile b/audio/qmpdclient/Makefile
index a3ad8bad976d..f8a2c3c71b15 100644
--- a/audio/qmpdclient/Makefile
+++ b/audio/qmpdclient/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.1.2
 PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://dump.bitcheese.net/files/dedycec/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	uyamba@gmail.com
 COMMENT=	Easy to use musicpd client written in QT4
diff --git a/benchmarks/netperfmeter/Makefile b/benchmarks/netperfmeter/Makefile
index 5a614ca23035..3a625914d5de 100644
--- a/benchmarks/netperfmeter/Makefile
+++ b/benchmarks/netperfmeter/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	netperfmeter
 PORTVERSION=	1.0.4
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.iem.uni-due.de/~dreibh/netperfmeter/download/ http://www.exp-math.uni-essen.de/~dreibh/netperfmeter/download/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	dreibh@iem.uni-due.de
 COMMENT=	Network Performance Meter
diff --git a/biology/primer3/Makefile b/biology/primer3/Makefile
index 28edbcbe379b..7a39294ec987 100644
--- a/biology/primer3/Makefile
+++ b/biology/primer3/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	primer3
 PORTVERSION=	1.1.4
 CATEGORIES=	biology
 MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	fernan@iib.unsam.edu.ar
 COMMENT=	Primer3 helps to choose primers for PCR reactions
diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index e26899a5fed8..0fb66a7c974d 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.2.11
 PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Shared libraries for Amateur Radio Equipment Control Applications
diff --git a/comms/uticom/Makefile b/comms/uticom/Makefile
index 81190b40f8b7..492c37fca0c5 100644
--- a/comms/uticom/Makefile
+++ b/comms/uticom/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	uticom
 PORTVERSION=	0.3
 CATEGORIES=	comms kld
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-DISTNAME=	 ${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	dxi@mail.ru
 COMMENT=	A FreeBSD Driver for TUSB3410 uart-to-usb converter
diff --git a/converters/mpack/Makefile b/converters/mpack/Makefile
index cefb634783f6..22832e2b4e47 100644
--- a/converters/mpack/Makefile
+++ b/converters/mpack/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.6
 PORTREVISION=	1
 CATEGORIES=	converters mail news
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/mpack/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	External MIME packer/unpacker
diff --git a/databases/jrobin/Makefile b/databases/jrobin/Makefile
index d47b1f9500ec..93fbdcf3b5e2 100644
--- a/databases/jrobin/Makefile
+++ b/databases/jrobin/Makefile
@@ -10,7 +10,6 @@ PORTNAME=	jrobin
 PORTVERSION=	1.5.9
 CATEGORIES=	databases java
 MASTER_SITES=	http://repo.opennms.org/maven2/org/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.jar
 EXTRACT_ONLY=
 
diff --git a/databases/opendbx/Makefile b/databases/opendbx/Makefile
index a57eba9e1935..731687ead6e3 100644
--- a/databases/opendbx/Makefile
+++ b/databases/opendbx/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.4.5
 PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.linuxnetworks.de/opendbx/download/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	tremere@cainites.net
 COMMENT=	A C library for accessing databases with a single API
diff --git a/databases/p5-DBI/Makefile b/databases/p5-DBI/Makefile
index 6dbf4a0b0575..6204c6c4cbb5 100644
--- a/databases/p5-DBI/Makefile
+++ b/databases/p5-DBI/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.615
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	The perl5 Database Interface.  Required for DBD::* modules
diff --git a/databases/pear-DB_Pager/Makefile b/databases/pear-DB_Pager/Makefile
index 731515181751..482100d676d5 100644
--- a/databases/pear-DB_Pager/Makefile
+++ b/databases/pear-DB_Pager/Makefile
@@ -8,7 +8,6 @@
 PORTNAME=	DB_Pager
 PORTVERSION=	0.7
 CATEGORIES=	databases www pear
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	toshiya@saitoh.nu
 COMMENT=	PEAR Database Abstraction Layer
diff --git a/databases/pg_filedump/Makefile b/databases/pg_filedump/Makefile
index 2e216f4d2a85..53c8c52c4113 100644
--- a/databases/pg_filedump/Makefile
+++ b/databases/pg_filedump/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	pg_filedump
 PORTVERSION=	8.4
 CATEGORIES=	databases
 MASTER_SITES=	http://sources.redhat.com/rhdb/tools/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tar
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/databases/py-cmemcache/Makefile b/databases/py-cmemcache/Makefile
index 109e7276d705..73e1fbc98df3 100644
--- a/databases/py-cmemcache/Makefile
+++ b/databases/py-cmemcache/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	0.95
 CATEGORIES=	databases python
 MASTER_SITES=	http://gijsbert.org/downloads/cmemcache/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	qingfeng@me.com
 COMMENT=	Python API for memcached, a distributed memory cache daemon
diff --git a/deskutils/charmap/Makefile b/deskutils/charmap/Makefile
index 1daae6ebd7e8..499b3c09adfa 100644
--- a/deskutils/charmap/Makefile
+++ b/deskutils/charmap/Makefile
@@ -11,7 +11,6 @@ PORTREVISION=	2
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://www.nongnu.org/charmap/ \
 		${MASTER_SITE_GNUSTEP_CH}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Character map for GNUstep
diff --git a/deskutils/fusenshi/Makefile b/deskutils/fusenshi/Makefile
index d1dcd8a425ac..99b21719ea7a 100644
--- a/deskutils/fusenshi/Makefile
+++ b/deskutils/fusenshi/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	0.9.0
 PORTREVISION=	8
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.ongs.co.jp/projects/fusenshi/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ozawa@ongs.co.jp
diff --git a/deskutils/kchm/Makefile b/deskutils/kchm/Makefile
index 79304d994b07..53298a1ded0a 100644
--- a/deskutils/kchm/Makefile
+++ b/deskutils/kchm/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	0.6.5
 PORTREVISION=	10
 CATEGORIES=	deskutils kde
 MASTER_SITES=	SF/${PORTNAME}new/${PORTNAME}new/${PORTNAME}-${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	shirshegsm@gmail.com
 COMMENT=	A KDE viewer for CHM files
diff --git a/deskutils/phpgroupware/Makefile b/deskutils/phpgroupware/Makefile
index 5df4f3c05fd2..d6dc79348034 100644
--- a/deskutils/phpgroupware/Makefile
+++ b/deskutils/phpgroupware/Makefile
@@ -9,7 +9,6 @@ PORTVERSION=	0.9.16.017
 CATEGORIES=	deskutils
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	phpgroupware/phpgroupware/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	A web based GroupWare system
diff --git a/deskutils/znotes/Makefile b/deskutils/znotes/Makefile
index 1f473940cacb..db2430d88604 100644
--- a/deskutils/znotes/Makefile
+++ b/deskutils/znotes/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	znotes
 PORTVERSION=	0.4.3
 CATEGORIES=	deskutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	g.veniamin@googlemail.com
 COMMENT=	Simple notes based on QT4
diff --git a/devel/avce00/Makefile b/devel/avce00/Makefile
index 2442accb0044..c4df7c991831 100644
--- a/devel/avce00/Makefile
+++ b/devel/avce00/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	avce00
 PORTVERSION=	2.0.0
 CATEGORIES=	devel
 MASTER_SITES=	http://avce00.maptools.org/dl/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	An OpenSource C library convert Arc/Info Vector Coverages to E00
diff --git a/devel/bufferpool/Makefile b/devel/bufferpool/Makefile
index b4d7da4ba6bf..3186d0a0a64e 100644
--- a/devel/bufferpool/Makefile
+++ b/devel/bufferpool/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	bufferpool
 PORTVERSION=	0.0.1
 CATEGORIES=	devel
 MASTER_SITES=	http://live.polito.it/files/downloads/bufferpool/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	err@tollari.org
 COMMENT=	Bufferpool - the memory management library Feng and Felix depend upon
diff --git a/devel/c4/Makefile b/devel/c4/Makefile
index da1aaf61fd57..c3bbe756d387 100644
--- a/devel/c4/Makefile
+++ b/devel/c4/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.10
 PORTREVISION=	1
 CATEGORIES+=	devel
 MASTER_SITES=	http://public.perforce.com/public/perforce/utils/c4/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A CVS-like Frontend to Perforce
diff --git a/devel/cproto/Makefile b/devel/cproto/Makefile
index 1c413f0395c1..879242a6eb1e 100644
--- a/devel/cproto/Makefile
+++ b/devel/cproto/Makefile
@@ -10,7 +10,6 @@ PORTNAME=	cproto
 PORTVERSION=	4.7i
 CATEGORIES=	devel
 MASTER_SITES=	ftp://invisible-island.net/cproto/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	thomas@bsdunix.ch
diff --git a/devel/dotconf++/Makefile b/devel/dotconf++/Makefile
index ac0503ebf7b3..dc2c73de44ef 100644
--- a/devel/dotconf++/Makefile
+++ b/devel/dotconf++/Makefile
@@ -11,7 +11,6 @@ CATEGORIES=	devel
 MASTER_SITES=	SF \
 		http://voodoo.com.ua/dotconfpp/
 
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	mark_sf@kikg.ifmo.ru
 COMMENT=	Configuration file parser written in C++
diff --git a/devel/e00compr/Makefile b/devel/e00compr/Makefile
index dd674c474fe7..af6e2313e76c 100644
--- a/devel/e00compr/Makefile
+++ b/devel/e00compr/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	e00compr
 PORTVERSION=	1.0.1
 CATEGORIES=	devel
 MASTER_SITES=	http://avce00.maptools.org/dl/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	A Library to Read/Write Compressed E00 Files
diff --git a/devel/libx86/Makefile b/devel/libx86/Makefile
index e57928d3b10d..e88650cdbeee 100644
--- a/devel/libx86/Makefile
+++ b/devel/libx86/Makefile
@@ -11,7 +11,6 @@ CATEGORIES=	devel
 MASTER_SITES=	http://www.codon.org.uk/~mjg59/libx86/downloads/	\
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jkim
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jkim@FreeBSD.org
 COMMENT=	A hardware-independent library for executing real-mode x86 code
diff --git a/devel/ocaml-equeue/Makefile b/devel/ocaml-equeue/Makefile
index 397470081082..4d4988403fac 100644
--- a/devel/ocaml-equeue/Makefile
+++ b/devel/ocaml-equeue/Makefile
@@ -11,7 +11,6 @@ PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ocaml-programming.de/packages/
 PKGNAMEPREFIX=	ocaml-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	The Equeue library for OCaml
diff --git a/devel/ode/Makefile b/devel/ode/Makefile
index 8a85a12ec438..c8eec7c7f666 100644
--- a/devel/ode/Makefile
+++ b/devel/ode/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	0.11
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/opende/ODE/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Articulated rigid body dynamics library
diff --git a/devel/p5-Class-OOorNO/Makefile b/devel/p5-Class-OOorNO/Makefile
index e26802b69248..b22393719b68 100644
--- a/devel/p5-Class-OOorNO/Makefile
+++ b/devel/p5-Class-OOorNO/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	0.011
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jeffhung@mail2000.com.tw
 COMMENT=	Perl5 module that give your module classic AND OO interfaces.
diff --git a/devel/p5-Exception-Handler/Makefile b/devel/p5-Exception-Handler/Makefile
index 0f69f8383cc2..472854a2c6f1 100644
--- a/devel/p5-Exception-Handler/Makefile
+++ b/devel/p5-Exception-Handler/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.004
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jeffhung@mail2000.com.tw
 COMMENT=	Perl5 module that report exceptions with formatted text call-stack.
diff --git a/devel/pcl/Makefile b/devel/pcl/Makefile
index beb5d1e6c57a..095ca5e3a489 100644
--- a/devel/pcl/Makefile
+++ b/devel/pcl/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	pcl
 PORTVERSION=	1.6
 CATEGORIES=	devel
 MASTER_SITES=	http://www.xmailserver.org/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	manuel.giraud@gmail.com
 COMMENT=	Portable Coroutine Library
diff --git a/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile b/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile
index 0855b82f69e5..d2901be41751 100644
--- a/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile
+++ b/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile
@@ -8,7 +8,6 @@
 PORTNAME=	HTML_QuickForm_Renderer_Tableless
 PORTVERSION=	0.6.1
 CATEGORIES=	devel www pear
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	chris@smartt.com
 COMMENT=	Implementation of Tableless Renderer for HTML_QuickForm
diff --git a/devel/pear-HTML_QuickForm_advmultiselect/Makefile b/devel/pear-HTML_QuickForm_advmultiselect/Makefile
index 499a1c13f599..a180748c8036 100644
--- a/devel/pear-HTML_QuickForm_advmultiselect/Makefile
+++ b/devel/pear-HTML_QuickForm_advmultiselect/Makefile
@@ -8,7 +8,6 @@
 PORTNAME=	HTML_QuickForm_advmultiselect
 PORTVERSION=	1.5.0
 CATEGORIES=	devel www pear
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	chris@ctgameinfo.com
 COMMENT=	Element for PEAR::HTML_QuickForm that defines a 2 box multi-select
diff --git a/devel/pecl-mcve/Makefile b/devel/pecl-mcve/Makefile
index 1ba3987b1bad..6bcbff702208 100644
--- a/devel/pecl-mcve/Makefile
+++ b/devel/pecl-mcve/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	7.0.3
 CATEGORIES=	devel pear
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	PECL
 
diff --git a/devel/py-akismet/Makefile b/devel/py-akismet/Makefile
index 3156b5d3a6ba..d2fecf2124cf 100644
--- a/devel/py-akismet/Makefile
+++ b/devel/py-akismet/Makefile
@@ -11,7 +11,6 @@ CATEGORIES=	devel python
 MASTER_SITES=	http://www.voidspace.org.uk/downloads/ \
 		http://whotookspaz.org/misc/freebsd/py-akismet/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jacob@whotookspaz.org
 COMMENT=	A Python interface to the Akismet API
diff --git a/devel/py-gyp-devel/Makefile b/devel/py-gyp-devel/Makefile
index 3a21ff7e916f..c7bc9f901879 100644
--- a/devel/py-gyp-devel/Makefile
+++ b/devel/py-gyp-devel/Makefile
@@ -11,7 +11,6 @@ PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://people.freebsd.org/~daichi/distfiles/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	daichi@FreeBSD.org
 COMMENT=	Generate Your Projects
diff --git a/devel/py-pyutil/Makefile b/devel/py-pyutil/Makefile
index 3981faa46c97..50bc74c9e3db 100644
--- a/devel/py-pyutil/Makefile
+++ b/devel/py-pyutil/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.8.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	A collection of mature utilities for Python programmers
diff --git a/devel/py-testgears/Makefile b/devel/py-testgears/Makefile
index 82f0f4bbd87f..e9cc3b92542f 100644
--- a/devel/py-testgears/Makefile
+++ b/devel/py-testgears/Makefile
@@ -11,7 +11,6 @@ CATEGORIES=	devel python
 MASTER_SITES=	http://nivi.interfree.it/distfiles/${PORTNAME}/ \
 		http://www.turbogears.org/download/eggs/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Python module to run tests written as simple functions
diff --git a/devel/ruby-wirble/Makefile b/devel/ruby-wirble/Makefile
index 170c8f4efe94..84d926396505 100644
--- a/devel/ruby-wirble/Makefile
+++ b/devel/ruby-wirble/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	0.1.3
 CATEGORIES=	devel ruby
 MASTER_SITES=http://pablotron.org/files/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	A set of enhancements of irb
diff --git a/dns/ldnsm/Makefile b/dns/ldnsm/Makefile
index ec3d3c712a74..5cbe5957aed9 100644
--- a/dns/ldnsm/Makefile
+++ b/dns/ldnsm/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	ldnsm
 PORTVERSION=	0.2.1
 CATEGORIES=	dns
 MASTER_SITES=	http://vvelox.net/src/ldap/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	vvelox@vvelox.net
diff --git a/editors/gwrite/Makefile b/editors/gwrite/Makefile
index 4525a3da53f3..d952183e66b8 100644
--- a/editors/gwrite/Makefile
+++ b/editors/gwrite/Makefile
@@ -9,7 +9,6 @@ PORTNAME=		gwrite
 PORTVERSION=		0.3.0
 CATEGORIES=		editors python
 MASTER_SITES=		GOOGLE_CODE
-DISTNAME=		${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=		jupengfei@gmail.com
 COMMENT=		A simple HTML format editor
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 993411544a08..438c58684b44 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	3.7
 PORTEPOCH=	1
 CATEGORIES=	editors
 MASTER_SITES=	SF/joe-editor/JOE%20sources/joe-${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	Joe's Own Editor
diff --git a/editors/zoinks/Makefile b/editors/zoinks/Makefile
index 2ed8423db53d..6c832f6622e4 100644
--- a/editors/zoinks/Makefile
+++ b/editors/zoinks/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	0.3.7
 PORTREVISION=	4
 CATEGORIES=	editors
 MASTER_SITES=	http://zoinks.mikelockwood.com/download/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	mike@mikelockwood.com
 COMMENT=	An X11 programmer's editor and development environment
diff --git a/emulators/klh10/Makefile b/emulators/klh10/Makefile
index 2d858236cb4a..aaab68b2bd3c 100644
--- a/emulators/klh10/Makefile
+++ b/emulators/klh10/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	klh10
 PORTVERSION=	2.0a
 CATEGORIES=	emulators
 MASTER_SITES=	http://klh10.trailing-edge.com/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 DISTFILES=	${DISTNAME}.tgz klh10-2.0a-aux.tgz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/emulators/snespp/Makefile b/emulators/snespp/Makefile
index 5f9cf62acbd0..228b0406f0ef 100644
--- a/emulators/snespp/Makefile
+++ b/emulators/snespp/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.0
 PORTREVISION=	1
 CATEGORIES=	emulators kld
 MASTER_SITES=	http://www.tbrk.org/software/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	timbob@bigpond.com
 COMMENT=	Kernel module for SNES controllers on a parallel port
diff --git a/finance/tinyerp-server/Makefile b/finance/tinyerp-server/Makefile
index 3d5070fa000f..c997741576a7 100644
--- a/finance/tinyerp-server/Makefile
+++ b/finance/tinyerp-server/Makefile
@@ -12,7 +12,6 @@ CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_LOCAL}			\
 		http://tinyerp.org/download/sources/
 MASTER_SITE_SUBDIR=	thierry
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jhaarman-keyword-tinyerpPort.fd583c@projects.synantics.net
diff --git a/games/barrage/Makefile b/games/barrage/Makefile
index c219a70a5b35..e72fceb3d265 100644
--- a/games/barrage/Makefile
+++ b/games/barrage/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.0.2
 PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	SF/lgames/${PORTNAME}/1.0
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Destroy as many targets as possible
diff --git a/games/battleball/Makefile b/games/battleball/Makefile
index c8e942fa64f6..7470c7f74cef 100644
--- a/games/battleball/Makefile
+++ b/games/battleball/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	2.1
 PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://freebsd.aeternal.net/ports/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	3D single/multiplayer military soccer game for X Window System
diff --git a/games/digger-vgl/Makefile b/games/digger-vgl/Makefile
index e900f8034d2b..9ef7787ff23e 100644
--- a/games/digger-vgl/Makefile
+++ b/games/digger-vgl/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20020314
 PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.digger.org/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FreeBSD graphics console (VGL) version of the famous Digger game
diff --git a/games/gnmm/Makefile b/games/gnmm/Makefile
index d56e3a9d1d29..3d9d869910b4 100644
--- a/games/gnmm/Makefile
+++ b/games/gnmm/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	0.1.2
 PORTREVISION=	11
 CATEGORIES=	games gnome
 MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/games/robotfindskitten/Makefile b/games/robotfindskitten/Makefile
index 9d14aa4661de..1bcd54a99393 100644
--- a/games/robotfindskitten/Makefile
+++ b/games/robotfindskitten/Makefile
@@ -11,7 +11,6 @@ PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	games
 MASTER_SITES=	http://robotfindskitten.org/download/POSIX/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Yet another zen simulation
diff --git a/games/sopwith/Makefile b/games/sopwith/Makefile
index 42e93b65266a..558adbf413f0 100644
--- a/games/sopwith/Makefile
+++ b/games/sopwith/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.7.4
 PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/sdl-${PORTNAME}/sdl_${PORTNAME}/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	A classic WW1 biplane game
diff --git a/games/wanderer/Makefile b/games/wanderer/Makefile
index 2118a936e10d..71f758ea6311 100644
--- a/games/wanderer/Makefile
+++ b/games/wanderer/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	3.2
 CATEGORIES=	games
 MASTER_SITES=	http://www.e271.net/~marina/ \
 		http://www.surferz.net/~marina/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	marina@surferz.net
 COMMENT=	Rogue like adventure game
diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile
index f3a567cb1c61..62d403d12269 100644
--- a/games/xarchon/Makefile
+++ b/games/xarchon/Makefile
@@ -11,7 +11,6 @@ PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.seul.org/pub/xarchon/ \
 		http://xarchon.seul.org/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A chess-like strategy game with battle options
diff --git a/graphics/grads/Makefile b/graphics/grads/Makefile
index ff281bc637ac..b8b88a886cff 100644
--- a/graphics/grads/Makefile
+++ b/graphics/grads/Makefile
@@ -11,7 +11,6 @@ PORTREVISION=	3
 CATEGORIES=	graphics science math
 MASTER_SITES=	ftp://grads.iges.org/grads/1.9/:src \
 		ftp://grads.iges.org/grads/:other
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 DISTFILES=	${PORTNAME}-src-${PORTVERSION}${EXTRACT_SUFX}:src \
 		example.tar.gz:other
 EXTRACT_ONLY=	${PORTNAME}-src-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/graphics/megapov/Makefile b/graphics/megapov/Makefile
index b265ccc5df5a..d8409426005f 100644
--- a/graphics/megapov/Makefile
+++ b/graphics/megapov/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.2.1
 PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://megapov.inetart.net/packages/unix/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Unofficial extensions of POV-Ray
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index 2c0c7af2c02d..2fef3e6504c6 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -18,7 +18,6 @@ OPTIONS+=	LIBOIL	"Use liboil for CPU-optimized primitives" on
 # Making Python a proper option awaits portmgr's resolving the current
 # chicken-and-egg problem of OPTIONS vs. USE_* knobs
 #OPTIONS+=	PYTHON	"Create Python bindings" ${PYPRESENT}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3 \
diff --git a/irc/ezbounce-devel/Makefile b/irc/ezbounce-devel/Makefile
index ce570b351bed..3657b483973c 100644
--- a/irc/ezbounce-devel/Makefile
+++ b/irc/ezbounce-devel/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.99.15
 CATEGORIES=	irc
 MASTER_SITES=	http://www.linuxftw.com/ezbounce/files/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	flo@FreeBSD.org
 COMMENT=	A highly configurable IRC Proxy
diff --git a/irc/ezbounce/Makefile b/irc/ezbounce/Makefile
index 7cbd3617d551..a408505fa974 100644
--- a/irc/ezbounce/Makefile
+++ b/irc/ezbounce/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	ezbounce
 PORTVERSION=	1.04c
 CATEGORIES=	irc
 MASTER_SITES=	http://www.linuxftw.com/ezbounce/files/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A highly configurable IRC Proxy
diff --git a/japanese/jstrings/Makefile b/japanese/jstrings/Makefile
index 580d9ab4fd12..2ffea8fa7212 100644
--- a/japanese/jstrings/Makefile
+++ b/japanese/jstrings/Makefile
@@ -11,7 +11,6 @@ CATEGORIES=	japanese
 MASTER_SITES=	http://openmya.hacker.jp/hasegawa/jstrings/ \
 		http://devel.aquahill.net/ports/jstrings/ \
 		http://www.kokone.to/~ryo/lib/ports/jstrings/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.lzh
 
 MAINTAINER=	ryo@aquahill.net
diff --git a/japanese/jyuroku/Makefile b/japanese/jyuroku/Makefile
index 6369bbcfa70f..53a6993c40f4 100644
--- a/japanese/jyuroku/Makefile
+++ b/japanese/jyuroku/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.32
 PORTREVISION=	6
 CATEGORIES=	japanese
 MASTER_SITES=	http://homepage3.nifty.com/seto-yoneji/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/japanese/kpcal/Makefile b/japanese/kpcal/Makefile
index 9325937c3003..f848dc32a6d6 100644
--- a/japanese/kpcal/Makefile
+++ b/japanese/kpcal/Makefile
@@ -11,7 +11,6 @@ PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	yoichi
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 PATCH_SITES=	http://www.tamaru.kuee.kyoto-u.ac.jp/~tsuchiya/misc/kpcal/
 PATCHFILES=	${PORTNAME}-${PORTVERSION}-20040518.patch
diff --git a/japanese/mg/Makefile b/japanese/mg/Makefile
index 0b2145bd0566..7a5065f524a8 100644
--- a/japanese/mg/Makefile
+++ b/japanese/mg/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	5.0.1.3
 CATEGORIES=	japanese perl5
 MASTER_SITES=	http://dist.bsdlab.org/ \
 		http://www.srekcah.org/~utashiro/perl/scripts/mg/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	# None
 EXTRACT_ONLY=	# None
 
diff --git a/japanese/ng/Makefile b/japanese/ng/Makefile
index feb9aaca8450..00b2ab659a52 100644
--- a/japanese/ng/Makefile
+++ b/japanese/ng/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.4.4
 PORTREVISION=	2
 CATEGORIES=	japanese editors
 MASTER_SITES=	http://tomato.sakura.ne.jp/~amura/archives/ng/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	ng-1.4.4-replace_bug.patch
diff --git a/java/eclipseme/Makefile b/java/eclipseme/Makefile
index a58ced82d053..9e0017bdc503 100644
--- a/java/eclipseme/Makefile
+++ b/java/eclipseme/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	0.4.6
 PORTREVISION=	4
 CATEGORIES=	java devel
 MASTER_SITES=	SF/${PORTNAME}/OldFiles
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	eclipse
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/java/javamail/Makefile b/java/javamail/Makefile
index c661f00ea885..9c3b55979b0c 100644
--- a/java/javamail/Makefile
+++ b/java/javamail/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	javamail
 PORTVERSION=	1.4.3
 CATEGORIES=	java mail
 MASTER_SITES=	#
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Reference Implementation of JSR 919
diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index 585ad5e3d045..25fb70733457 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -20,7 +20,6 @@ MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:sourc
 		${MASTER_SITE_LOCAL:S|$|acm/freepascal/:bootstrap|} \
 		${MASTER_SITE_GOOGLE_CODE}:man \
 		${MASTER_SITE_LOCAL:S|$|acm/freepascal/:man|}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 DISTFILES=	${DISTNAME:S/$/.source/}${EXTRACT_SUFX}:source
 DIST_SUBDIR=	freepascal
 
diff --git a/lang/gambas2-examples/Makefile b/lang/gambas2-examples/Makefile
index 6f9b9810f6c9..4a41e785ad8a 100644
--- a/lang/gambas2-examples/Makefile
+++ b/lang/gambas2-examples/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	2.15.2
 CATEGORIES=	lang
 MASTER_SITES=	SF/gambas/${PORTNAME}/${PORTVERSION}
 PKGNAMESUFFIX=	-examples
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME:S/2//g}
 
 MAINTAINER=	acm@FreeBSD.org
diff --git a/lang/ruby-extensions/Makefile b/lang/ruby-extensions/Makefile
index 71e98b3a45d2..5d9b3eb04f5e 100644
--- a/lang/ruby-extensions/Makefile
+++ b/lang/ruby-extensions/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	0.6.0
 CATEGORIES=	lang ruby
 MASTER_SITES=	RF
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	ruby
 
diff --git a/mail/akpop3d/Makefile b/mail/akpop3d/Makefile
index 0bff1d488c94..f3f70e47540f 100644
--- a/mail/akpop3d/Makefile
+++ b/mail/akpop3d/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	akpop3d
 PORTVERSION=	0.7.7
 CATEGORIES=	mail
 MASTER_SITES=	http://www.synflood.at/akpop3d/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	POP3 daemon aimed to be small and secure
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index 9d839edb85a4..a7bdd9b4b2fc 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -12,7 +12,6 @@ CATEGORIES=	mail
 MASTER_SITES=	http://www.stafford.uklinux.net/libesmtp/ \
 		http://ftp.osuosl.org/pub/blfs/svn/l/ \
 		ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A library for posting electronic mail
diff --git a/mail/mailscanner-mrtg/Makefile b/mail/mailscanner-mrtg/Makefile
index 233f916183d9..ff9157b3a2a5 100644
--- a/mail/mailscanner-mrtg/Makefile
+++ b/mail/mailscanner-mrtg/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	0.11.00
 PORTREVISION=	6
 CATEGORIES=	mail
 MASTER_SITES=	SF/mailscannermrtg/${PORTNAME}-UNSTABLE/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Allows mrtg to monitor many aspects of your MailScanner machine
diff --git a/mail/mdpop3d/Makefile b/mail/mdpop3d/Makefile
index 034d0dc9e448..809d5335b063 100644
--- a/mail/mdpop3d/Makefile
+++ b/mail/mdpop3d/Makefile
@@ -8,7 +8,6 @@ PORTNAME=	mdpop3d
 PORTVERSION=	0.97
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.corpit.ru/home/mjt/mdpop3d/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	A simple and small POP3 daemon implementation with Maildir support
diff --git a/mail/meta1/Makefile b/mail/meta1/Makefile
index ad76ea71094e..043d5ed38088 100644
--- a/mail/meta1/Makefile
+++ b/mail/meta1/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.0.PreAlpha36.0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.MeTA1.org/download/.prealpha/cond/
 PKGNAMESUFFIX?=	${TLS_SUFFIX}${SASL_SUFFIX}${LDAP_SUFFIX}${BERKELEYDB_SUFFIX}${PMILTER_SUFFIX}${PKGNAMESUFFIX2}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Secure and efficient mail gateway
diff --git a/mail/pop3proxy/Makefile b/mail/pop3proxy/Makefile
index da691cd4a42a..dd204c4fde3e 100644
--- a/mail/pop3proxy/Makefile
+++ b/mail/pop3proxy/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.2
 PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://people.freebsd.org/~mbr/distfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	mbr@FreeBSD.org
diff --git a/mail/postfinger/Makefile b/mail/postfinger/Makefile
index bd2663e11fde..2387577708c5 100644
--- a/mail/postfinger/Makefile
+++ b/mail/postfinger/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	postfinger
 PORTVERSION=	1.30
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.wl0.org/ftp.wl0.org/postfinger/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 DISTFILES=	${PORTNAME}-${PORTVERSION} README
 DIST_SUBDIR=	${PORTNAME}
 
diff --git a/mail/qar-bufo/Makefile b/mail/qar-bufo/Makefile
index 8cd113798c0c..7e59f25f2c8d 100644
--- a/mail/qar-bufo/Makefile
+++ b/mail/qar-bufo/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	qar-bufo
 PORTVERSION=	1.3.1
 CATEGORIES=	mail
 MASTER_SITES=	http://cpan.org/authors/id/M/MW/MWCZANECB/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=
 EXTRACT_ONLY=
 
diff --git a/mail/spamd/Makefile b/mail/spamd/Makefile
index d48b2716c67b..ef99e197add5 100644
--- a/mail/spamd/Makefile
+++ b/mail/spamd/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	4.8.0
 CATEGORIES=	mail
 MASTER_SITES=	BERLIOS
 MASTER_SITE_SUBDIR=freebsdspamd
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ohauer@FreeBSD.org
 COMMENT=	Traps spammers with a very slow smtp-login and return 4xx error
diff --git a/mail/vbsfilter/Makefile b/mail/vbsfilter/Makefile
index cf9e5161b7bd..f1855953ea93 100644
--- a/mail/vbsfilter/Makefile
+++ b/mail/vbsfilter/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.15
 PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://aeschi.ch.eu.org/milter/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.c
 EXTRACT_ONLY=	# empty
 
diff --git a/math/abakus/Makefile b/math/abakus/Makefile
index cc954c3711ae..9bbb07860571 100644
--- a/math/abakus/Makefile
+++ b/math/abakus/Makefile
@@ -10,7 +10,6 @@ PORTREVISION=	9
 CATEGORIES=	math kde
 MASTER_SITES=	http://purinchu.net/abakus/ \
 		http://www.athame.co.uk/mirror/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Michael Pyne's Abakus Calculator
diff --git a/math/ruby-narray_miss/Makefile b/math/ruby-narray_miss/Makefile
index 84dfa7988a3e..e5bdf376d8aa 100644
--- a/math/ruby-narray_miss/Makefile
+++ b/math/ruby-narray_miss/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.1.2
 CATEGORIES=	math ruby
 MASTER_SITES=	http://ruby.gfd-dennou.org/products/narray_miss/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	murashin@gfd-dennou.org
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index b2cf3119d38e..d3196720841a 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -11,7 +11,6 @@ PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	SF/amanda/amanda%20-%20stable/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 PKGNAMESUFFIX?=	-server
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index b2cf3119d38e..d3196720841a 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -11,7 +11,6 @@ PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	SF/amanda/amanda%20-%20stable/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 PKGNAMESUFFIX?=	-server
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 0154304649dd..6ca15ce36e1c 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -12,7 +12,6 @@ CATEGORIES=	misc shells
 MASTER_SITES=	http://www.midnight-commander.org/downloads/ \
 		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	utils/file/managers/mc
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tar.lzma
 
 PATCH_SITES=	${MASTER_SITES}
diff --git a/misc/wanpipe/Makefile b/misc/wanpipe/Makefile
index 79a95b98c9c7..cc050318abc3 100644
--- a/misc/wanpipe/Makefile
+++ b/misc/wanpipe/Makefile
@@ -11,7 +11,6 @@ PORTVERSION=	3.3.1
 PORTREVISION=	1
 CATEGORIES=	misc net kld
 MASTER_SITES=	ftp://ftp.sangoma.com/FreeBSD/wanpipe/ports/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jpaetzel@FreeBSD.org
 COMMENT=	A FreeBSD Driver for Sangoma AFT/S51x Series Cards
diff --git a/misc/xtail/Makefile b/misc/xtail/Makefile
index ab9aca4d0017..fbb8ec449ef5 100644
--- a/misc/xtail/Makefile
+++ b/misc/xtail/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	2.1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.unicom.com/sw/xtail/ \
 		http://utenti.gufi.org/~gmarco/files/distfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	gmarco@gufi.org
 COMMENT=	Watches the growth of files or directories
diff --git a/multimedia/clipgrab/Makefile b/multimedia/clipgrab/Makefile
index e6dd346b7f71..e792614816d7 100644
--- a/multimedia/clipgrab/Makefile
+++ b/multimedia/clipgrab/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	3.0.5
 PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://clipgrab.de/download/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	g.veniamin@googlemail.com
 COMMENT=	Program to download videos from YouTube and etc
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index 309cb0c07c7c..70d10e12b131 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -12,7 +12,6 @@ PORTEPOCH=	2
 CATEGORIES=	multimedia audio kde
 MASTER_SITES=	http://freebsd.ricin.com/ports/distfiles/ \
 		http://kmplayer.kde.org/pkgs/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/multimedia/mp4split/Makefile b/multimedia/mp4split/Makefile
index 9d15a6e4a23d..e1eb273a54fa 100644
--- a/multimedia/mp4split/Makefile
+++ b/multimedia/mp4split/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	mp4split
 PORTVERSION=	1.0.8
 CATEGORIES=	multimedia
 MASTER_SITES=	http://smoothstreaming.code-shop.com/download/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	bmhermansson@gmail.com
 COMMENT=	Converts MP4 files to Fragmented MP4 and creates manifest files
diff --git a/multimedia/spook/Makefile b/multimedia/spook/Makefile
index 7df83afea2b2..d5260805ee7a 100644
--- a/multimedia/spook/Makefile
+++ b/multimedia/spook/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20050207
 PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.litech.org/spook/dist/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Embedded RTP/RTSP/HTTP video streamer
diff --git a/net-im/kmerlin/Makefile b/net-im/kmerlin/Makefile
index 1fb942821e2e..11b11b8dc2a3 100644
--- a/net-im/kmerlin/Makefile
+++ b/net-im/kmerlin/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.4.2
 PORTREVISION=	8
 CATEGORIES=	net-im
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An IM (Instant Messenger) KDE client for the Microsoft MSN Network
diff --git a/net-mgmt/bandwidthd/Makefile b/net-mgmt/bandwidthd/Makefile
index a8913eecb614..bfddf3443a74 100644
--- a/net-mgmt/bandwidthd/Makefile
+++ b/net-mgmt/bandwidthd/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	2.0.1
 PORTREVISION=	4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
-DISTNAME=		${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net-mgmt/check_snmp_pkgvuln/Makefile b/net-mgmt/check_snmp_pkgvuln/Makefile
index ed2e631c5c31..a692a59c4036 100644
--- a/net-mgmt/check_snmp_pkgvuln/Makefile
+++ b/net-mgmt/check_snmp_pkgvuln/Makefile
@@ -12,7 +12,6 @@ CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.cultdeadsheep.org/~clement/FreeBSD/nagios/
 PKGNAMEPREFIX=	nagios-
 PKGNAMESUFFIX=	-plugin
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jarrod@netleader.com.au
 COMMENT=	Security vulnerability plugin for Nagios
diff --git a/net-mgmt/cricket/Makefile b/net-mgmt/cricket/Makefile
index b005269a1a53..d1ca7d7f6ee7 100644
--- a/net-mgmt/cricket/Makefile
+++ b/net-mgmt/cricket/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.0.5
 PORTREVISION=	7
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A high performance, extremely flexible monitoring system
diff --git a/net-mgmt/jnettop/Makefile b/net-mgmt/jnettop/Makefile
index e67ef1810d2b..eb0f422d6584 100644
--- a/net-mgmt/jnettop/Makefile
+++ b/net-mgmt/jnettop/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	jnettop
 PORTVERSION=	0.13.0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.13
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	rpsfa@rit.edu
 COMMENT=	Traffic visualizer, similiar to nettop
diff --git a/net-mgmt/macroscope/Makefile b/net-mgmt/macroscope/Makefile
index 30cae0df951e..1acda21cc6f1 100644
--- a/net-mgmt/macroscope/Makefile
+++ b/net-mgmt/macroscope/Makefile
@@ -11,7 +11,6 @@ PORTREVISION=	4
 CATEGORIES=		net-mgmt
 MASTER_SITES=		ftp://ftp.berlios.de/pub/macroscope/ \
 			http://white-raven.pisem.net/
-DISTNAME=		${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=		white_raven@users.berlios.de
 COMMENT=		User and IP traffic management with Web interface
diff --git a/net-mgmt/qkismet/Makefile b/net-mgmt/qkismet/Makefile
index 433b00cbfa69..96c78885c899 100644
--- a/net-mgmt/qkismet/Makefile
+++ b/net-mgmt/qkismet/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	0.3.1
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/qKismet/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	g.veniamin@googlemail.com
 COMMENT=	This is graphical Kismet client writtent in Qt
diff --git a/net-mgmt/snmp4nagios/Makefile b/net-mgmt/snmp4nagios/Makefile
index 7a449486be0c..581097c9ad14 100644
--- a/net-mgmt/snmp4nagios/Makefile
+++ b/net-mgmt/snmp4nagios/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	SNMP4Nagios
 PORTVERSION=	0.4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	rpsfa@rit.edu
 COMMENT=	Vendor specific SNMP plugins for Nagios
diff --git a/net-p2p/dctc/Makefile b/net-p2p/dctc/Makefile
index 114343b07744..f60793abbc58 100644
--- a/net-p2p/dctc/Makefile
+++ b/net-p2p/dctc/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	0.84.1
 PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://unixpages.org/distfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A DirectConnect (www.neo-modus.com) text client for file sharing
diff --git a/net-p2p/valknut/Makefile b/net-p2p/valknut/Makefile
index 18a38b1c0a8f..f9e32dce4dd3 100644
--- a/net-p2p/valknut/Makefile
+++ b/net-p2p/valknut/Makefile
@@ -12,7 +12,6 @@ PORTVERSION=	0.4.9
 PORTREVISION=	4
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/wxdcgui/${PORTNAME}-qt4/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A Direct Connect client QT GUI
diff --git a/net/callweaver/Makefile b/net/callweaver/Makefile
index 79950829acc8..29a82044b8a9 100644
--- a/net/callweaver/Makefile
+++ b/net/callweaver/Makefile
@@ -9,7 +9,6 @@ PORTVERSION=	1.2.1
 PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://devs.callweaver.org/release/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	melifaro@ipfw.ru
diff --git a/net/libconnect/Makefile b/net/libconnect/Makefile
index 776212df0bc9..1b4f38de4b4c 100644
--- a/net/libconnect/Makefile
+++ b/net/libconnect/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.0
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.lexa.ru/pub/domestic/snar/	\
 		ftp://ftp.lucky.net/pub/unix/local/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tell programs to which IP-address they should bind
diff --git a/net/mediaproxy/Makefile b/net/mediaproxy/Makefile
index a7f0203378a5..24cc25233a61 100644
--- a/net/mediaproxy/Makefile
+++ b/net/mediaproxy/Makefile
@@ -10,7 +10,6 @@ PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://mediaproxy.ag-projects.com/ \
 		http://mediaproxy.ag-projects.com/old/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	steve@energistic.com
 COMMENT=	A far-end NAT traversal solution for SER/OpenSER
diff --git a/net/nast/Makefile b/net/nast/Makefile
index 0a326873312f..62755b4fed5e 100644
--- a/net/nast/Makefile
+++ b/net/nast/Makefile
@@ -11,7 +11,6 @@ PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://download.berlios.de/${PORTNAME}/ \
 		http://voodoo.bawue.com/download/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Nast is a packet sniffer
diff --git a/net/netembryo/Makefile b/net/netembryo/Makefile
index 287e78078f9d..2ed74c4d1591 100644
--- a/net/netembryo/Makefile
+++ b/net/netembryo/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	netembryo
 PORTVERSION=	0.0.4
 CATEGORIES=	net
 MASTER_SITES=	http://live.polito.it/files/downloads/netembryo/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	err@tollari.org
 COMMENT=	A network abstraction library used by for feng, libnemesi, felix
diff --git a/net/ngrep/Makefile b/net/ngrep/Makefile
index f08b61f31971..6c89b541f89d 100644
--- a/net/ngrep/Makefile
+++ b/net/ngrep/Makefile
@@ -10,7 +10,6 @@ PORTNAME=	ngrep
 PORTVERSION=	1.45
 CATEGORIES=	net security
 MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Network grep
diff --git a/net/phpldapadmin/Makefile b/net/phpldapadmin/Makefile
index de697289a1a0..55628b2ebaad 100644
--- a/net/phpldapadmin/Makefile
+++ b/net/phpldapadmin/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.2.0.5
 PORTEPOCH=	1
 CATEGORIES=	net www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-php5/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	m.seaman@infracaninophile.co.uk
diff --git a/net/roadrunner/Makefile b/net/roadrunner/Makefile
index c4f831da055a..808845b8665e 100644
--- a/net/roadrunner/Makefile
+++ b/net/roadrunner/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	0.9.1
 PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.codefactory.se/pub/RoadRunner/source/roadrunner/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A portable BEEP protocol implementation
diff --git a/net/samba-pdbsql/Makefile b/net/samba-pdbsql/Makefile
index bc99cdf5785a..27feed1d3995 100644
--- a/net/samba-pdbsql/Makefile
+++ b/net/samba-pdbsql/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=		34
 CATEGORIES=		net
 MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}_${PORTVERSION}/
 PKGNAMEPREFIX=		samba-
-DISTNAME=		${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=		timur@FreeBSD.org
 COMMENT=		Multiplexor, MySQL and PostgeSQL passdb backends for Samba3
diff --git a/net/traff/Makefile b/net/traff/Makefile
index 6fc5b243ff20..09ba4ac24f16 100644
--- a/net/traff/Makefile
+++ b/net/traff/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	traff
 PORTVERSION=	0.6.1
 CATEGORIES=	net net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	daniel@freebsd.ro
 COMMENT=	Libpcab based fast traffic accounting program
diff --git a/net/wowzamediaserverpro/Makefile b/net/wowzamediaserverpro/Makefile
index ad8b5f1a3624..0dbd3696798e 100644
--- a/net/wowzamediaserverpro/Makefile
+++ b/net/wowzamediaserverpro/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	WowzaMediaServerPro
 PORTVERSION=	1.7.2
 CATEGORIES=	net
 MASTER_SITES=	http://www.wowzamedia.com/downloads/WowzaMediaServer-1-7-2/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tar.bin
 
 MAINTAINER=	meritus@innervision.pl
diff --git a/net/xorp/Makefile b/net/xorp/Makefile
index 32a5b619723f..6425978ba175 100644
--- a/net/xorp/Makefile
+++ b/net/xorp/Makefile
@@ -12,7 +12,6 @@ MASTER_SITES=	http://www.xorp.org/releases/${PORTVERSION}/	\
 		http://www2.xorp.org/releases/${PORTVERSION}/	\
 		http://www5.xorp.org/releases/${PORTVERSION}/	\
 		http://www3.xorp.org/releases/${PORTVERSION}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The eXtensible Open Router Platform
diff --git a/net/yaph/Makefile b/net/yaph/Makefile
index 2c1e6598469a..a24ed61e988d 100644
--- a/net/yaph/Makefile
+++ b/net/yaph/Makefile
@@ -7,7 +7,6 @@ PORTNAME=	yaph
 PORTVERSION=	0.91
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	mycroft@virgaria.org
 COMMENT=	Yaph is a proxy scanner
diff --git a/news/hellanzb/Makefile b/news/hellanzb/Makefile
index 702657b3208f..0a62ac8d34fa 100644
--- a/news/hellanzb/Makefile
+++ b/news/hellanzb/Makefile
@@ -10,7 +10,6 @@ PORTNAME=	hellanzb
 PORTVERSION=	0.13
 CATEGORIES=	news
 MASTER_SITES=	http://www.hellanzb.com/distfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	pjenvey@groovie.org
 COMMENT=	Nzb downloader and post processor
diff --git a/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/Makefile b/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/Makefile
index 9e3b94c0d486..4060bc843211 100644
--- a/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/Makefile
+++ b/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/Makefile
@@ -12,7 +12,6 @@ CATEGORIES=	ports-mgmt sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/V/VV/VVELOX
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Finds updates for FreeBSD pkgs by checking the ports index
diff --git a/ports-mgmt/p5-FreeBSD-Pkgs/Makefile b/ports-mgmt/p5-FreeBSD-Pkgs/Makefile
index 80b4c76e6eb3..cff520026aab 100644
--- a/ports-mgmt/p5-FreeBSD-Pkgs/Makefile
+++ b/ports-mgmt/p5-FreeBSD-Pkgs/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	0.1.1
 CATEGORIES=	ports-mgmt sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Parses the contents of FreeBSD package DB under /var/db/pkg
diff --git a/print/ansiprint/Makefile b/print/ansiprint/Makefile
index 2928d57402d6..c9a8baefe8ab 100644
--- a/print/ansiprint/Makefile
+++ b/print/ansiprint/Makefile
@@ -9,7 +9,6 @@ PORTNAME=		ansiprint
 PORTVERSION=		1.0
 CATEGORIES=		print
 MASTER_SITES=		SF
-DISTNAME=		${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		steve@stephen-fisher.com
diff --git a/print/epsmerge/Makefile b/print/epsmerge/Makefile
index a45b141f0bb7..03cecf30bcc0 100644
--- a/print/epsmerge/Makefile
+++ b/print/epsmerge/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	epsmerge
 PORTVERSION=	2.2.2
 CATEGORIES=	print
 MASTER_SITES=	http://home.clara.net/nox/software/epsmerge/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Merge multiple EPS files into one EPS or PS file
diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile
index 68d75e9e07b9..87d6a8707f00 100644
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@@ -11,7 +11,6 @@ PORTREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Driver for printers that use the ZjStream wire protocol
diff --git a/print/py-fonttools/Makefile b/print/py-fonttools/Makefile
index 0eb1c9e8037d..1bbc841cf931 100644
--- a/print/py-fonttools/Makefile
+++ b/print/py-fonttools/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	2.3
 CATEGORIES=	print python
 MASTER_SITES=	SF/${PORTNAME}/Source%20code/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An open source library for manipulating fonts, written in Python
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index 423c1b34f0c4..bf63c52b2984 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.5
 PORTREVISION=	6
 CATEGORIES=	print
 MASTER_SITES=	SF/cups/${PORTNAME}/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11-based printer manager for CUPS
diff --git a/science/ghemical/Makefile b/science/ghemical/Makefile
index e1546fd6af30..056da207b21b 100644
--- a/science/ghemical/Makefile
+++ b/science/ghemical/Makefile
@@ -10,7 +10,6 @@ PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	http://www.uku.fi/~thassine/projects/download/release20090911/ \
 		http://bioinformatics.org/ghemical/download/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Ghemical is a computational chemistry software package
diff --git a/science/libghemical/Makefile b/science/libghemical/Makefile
index c9ba561791ea..cc092b44aa56 100644
--- a/science/libghemical/Makefile
+++ b/science/libghemical/Makefile
@@ -10,7 +10,6 @@ PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	http://www.uku.fi/~thassine/projects/download/release20090911/ \
 		http://bioinformatics.org/ghemical/download/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Support libraries of science/ghemical port
diff --git a/science/liboglappth/Makefile b/science/liboglappth/Makefile
index fb0c489d0855..f3237ecca999 100644
--- a/science/liboglappth/Makefile
+++ b/science/liboglappth/Makefile
@@ -10,7 +10,6 @@ PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	http://www.uku.fi/~thassine/projects/download/current/ \
 		http://bioinformatics.org/ghemical/download/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Support libraries of science/ghemical port
diff --git a/security/aimsniff/Makefile b/security/aimsniff/Makefile
index 0ce77ee6f496..ec65a1a7ef03 100644
--- a/security/aimsniff/Makefile
+++ b/security/aimsniff/Makefile
@@ -8,7 +8,6 @@ PORTNAME=	aimsniff
 PORTVERSION=	0.9d
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/AIM%20Sniff/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	andrew@amrx.net
 COMMENT=	AOL Instant Messanger Sniffing and Reading Tool
diff --git a/security/distcache-devel/Makefile b/security/distcache-devel/Makefile
index 74dc9b450d52..dce9b9019018 100644
--- a/security/distcache-devel/Makefile
+++ b/security/distcache-devel/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES=	SF/${PORTNAME}/1.%20${PORTNAME}-devel/${PORTVERSION} \
 		http://osdn.dl.sourceforge.net/sourceforge/${PORTNAME}/
 
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	marcel.prisi@virtua.ch
 COMMENT=	Distributed OpenSSL session caching tools - development version
diff --git a/security/sudosh/Makefile b/security/sudosh/Makefile
index 4044fdf65b8b..ee89ef3210c6 100644
--- a/security/sudosh/Makefile
+++ b/security/sudosh/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=		1.8.2
 PORTREVISION=		5
 CATEGORIES=		security
 MASTER_SITES=		SF/${PORTNAME}/OldFiles
-DISTNAME=		${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=		cy@FreeBSD.org
 COMMENT=		A sudo shell
diff --git a/security/sudosh2/Makefile b/security/sudosh2/Makefile
index a705afbfcd48..08c39833ef27 100644
--- a/security/sudosh2/Makefile
+++ b/security/sudosh2/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=		1.0.2
 PORTREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
-DISTNAME=		${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=		.tbz2
 
 MAINTAINER=		cy@FreeBSD.org
diff --git a/security/sudosh3/Makefile b/security/sudosh3/Makefile
index f460867c85d9..68015dbc371e 100644
--- a/security/sudosh3/Makefile
+++ b/security/sudosh3/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=		3.2.0
 PORTREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		SF/${PORTNAME}
-DISTNAME=		${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=		cy@FreeBSD.org
 COMMENT=		Third version of the sudo shell
diff --git a/security/webscarab/Makefile b/security/webscarab/Makefile
index 79cad15cc777..a66fc41b7bdb 100644
--- a/security/webscarab/Makefile
+++ b/security/webscarab/Makefile
@@ -11,7 +11,6 @@ CATEGORIES=	security www java
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://people.freebsd.org/~niels/distfiles/
 MASTER_SITE_SUBDIR=	niels
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	niels@FreeBSD.org
 COMMENT=	Framework for analysing HTTP and HTTPS web application traffic
diff --git a/shells/shell-include/Makefile b/shells/shell-include/Makefile
index e77f2539f4a0..c470584c3acc 100644
--- a/shells/shell-include/Makefile
+++ b/shells/shell-include/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	shell-include
 PORTVERSION=	0.1.2
 CATEGORIES=	shells devel
 MASTER_SITES=	http://vvelox.net/src/shell-include/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	vvelox@vvelox.net
diff --git a/sysutils/amrstat/Makefile b/sysutils/amrstat/Makefile
index 68937a69c929..c1792bef1c71 100644
--- a/sysutils/amrstat/Makefile
+++ b/sysutils/amrstat/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20070216
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jkim
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jkim@FreeBSD.org
 COMMENT=	Utility for LSI Logic's MegaRAID RAID controllers
diff --git a/sysutils/asusoled/Makefile b/sysutils/asusoled/Makefile
index b49debd3aea8..153aaa58b519 100644
--- a/sysutils/asusoled/Makefile
+++ b/sysutils/asusoled/Makefile
@@ -11,7 +11,6 @@ PORTREVISION=	5
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jkim
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jkim@FreeBSD.org
 COMMENT=	Utility for ASUS USB OLED Display
diff --git a/sysutils/dmg2img/Makefile b/sysutils/dmg2img/Makefile
index f3396129161b..7666955f4f55 100644
--- a/sysutils/dmg2img/Makefile
+++ b/sysutils/dmg2img/Makefile
@@ -11,7 +11,6 @@ CATEGORIES=	sysutils
 MASTER_SITES=	http://fbsd.zlonet.ru/distfiles/ \
 		http://tourservice.kz/zloidemon/distfiles/ \
 		http://z-up.ru/zloidemon/distfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	g.veniamin@googlemail.com
 COMMENT=	DMG2IMG convert tool
diff --git a/sysutils/fusefs-smbnetfs/Makefile b/sysutils/fusefs-smbnetfs/Makefile
index 65384337c488..56306f89ada8 100644
--- a/sysutils/fusefs-smbnetfs/Makefile
+++ b/sysutils/fusefs-smbnetfs/Makefile
@@ -9,7 +9,6 @@ PORTVERSION=	0.3.7
 CATEGORIES=	sysutils net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/SMBNetFS-${PORTVERSION}
 PKGNAMEPREFIX=	fusefs-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	dindin@freebsd.org.ua
 COMMENT=	Mount smb shares (Fuse filesystem)
diff --git a/sysutils/istatd/Makefile b/sysutils/istatd/Makefile
index 381437196031..7ec868066abe 100644
--- a/sysutils/istatd/Makefile
+++ b/sysutils/istatd/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	istatd
 PORTVERSION=	0.5.7
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cloud.github.com/downloads/tiwilliam/${PORTNAME}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Daemon for iStat iPhone application
diff --git a/sysutils/jkill/Makefile b/sysutils/jkill/Makefile
index e68106c2c898..91a85eea9288 100644
--- a/sysutils/jkill/Makefile
+++ b/sysutils/jkill/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://ext.by/jkill/
 PKGNAMEPREFIX=
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	pavel@ext.by
 COMMENT=	Shutdowns a running jail and all its processes
diff --git a/sysutils/logrotate/Makefile b/sysutils/logrotate/Makefile
index bc8ffdef59d9..baeefbdf9852 100644
--- a/sysutils/logrotate/Makefile
+++ b/sysutils/logrotate/Makefile
@@ -9,7 +9,6 @@ PORTNAME=		logrotate
 PORTVERSION=		3.7.9
 CATEGORIES=		sysutils
 MASTER_SITES=		https://fedorahosted.org/releases/l/o/logrotate/
-DISTNAME=		${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=		js@iksz.hu
 COMMENT=		Daemon to rotate, compress, remove and mail system log files
diff --git a/sysutils/pfstat/Makefile b/sysutils/pfstat/Makefile
index 34f5fc25d803..d8965b9431db 100644
--- a/sysutils/pfstat/Makefile
+++ b/sysutils/pfstat/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	2.4
 PORTREVISION=	4
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://www.benzedrine.cx/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	mlaier@FreeBSD.org
 COMMENT=	Utility to render graphical statistics for pf
diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile
index 72369c4e8644..e37f14d33853 100644
--- a/sysutils/pftop/Makefile
+++ b/sysutils/pftop/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	0.7
 PORTREVISION=	1
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://www.eee.metu.edu.tr/~canacar/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	mlaier@FreeBSD.org
 COMMENT=	Utility for real-time display of statistics for pf
diff --git a/sysutils/pwgen2/Makefile b/sysutils/pwgen2/Makefile
index 399a52494501..56caba2a9439 100644
--- a/sysutils/pwgen2/Makefile
+++ b/sysutils/pwgen2/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	pwgen
 PORTVERSION=	2.06
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	andrey@hm.perm.ru
 COMMENT=	A small, powerful, GPL'ed password generator
diff --git a/sysutils/rdiff-backup-devel/Makefile b/sysutils/rdiff-backup-devel/Makefile
index 1333a8ae28f9..800c69c39f16 100644
--- a/sysutils/rdiff-backup-devel/Makefile
+++ b/sysutils/rdiff-backup-devel/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES=	${MASTER_SITE_SAVANNAH:S/$/:savannah/} \
 MASTER_SITE_SUBDIR=	${PORTNAME}/:savannah \
 		vd/${PORTNAME}${PKGNAMESUFFIX}/:local
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:savannah,local
 
 MAINTAINER=	peter.schuller@infidyne.com
diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile
index 808c27c97219..6d070d2f905c 100644
--- a/sysutils/rdiff-backup/Makefile
+++ b/sysutils/rdiff-backup/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES=	${MASTER_SITE_SAVANNAH:S/$/:savannah/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
 MASTER_SITE_SUBDIR=	${PORTNAME}/:savannah \
 		vd/${PORTNAME}${PKGNAMESUFFIX}/:local
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:savannah,local
 
 MAINTAINER=	peter.schuller@infidyne.com
diff --git a/sysutils/rdiff-backup10/Makefile b/sysutils/rdiff-backup10/Makefile
index 8f4e28401ea8..c9377571fdef 100644
--- a/sysutils/rdiff-backup10/Makefile
+++ b/sysutils/rdiff-backup10/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES=	${MASTER_SITE_SAVANNAH:S/$/:savannah/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
 MASTER_SITE_SUBDIR=	${PORTNAME}/:savannah \
 		vd/${PORTNAME}${PKGNAMESUFFIX}/:local
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:savannah,local
 
 MAINTAINER=	peter.schuller@infidyne.com
diff --git a/sysutils/ruby-log4r/Makefile b/sysutils/ruby-log4r/Makefile
index 8ef87b1b988d..33c9040b53d6 100644
--- a/sysutils/ruby-log4r/Makefile
+++ b/sysutils/ruby-log4r/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.0.5
 CATEGORIES=	sysutils ruby
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Log4r%20${PORTVERSION}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	ruby
 
diff --git a/sysutils/syscp/Makefile b/sysutils/syscp/Makefile
index 1fc4b3fa68df..a835639d4557 100644
--- a/sysutils/syscp/Makefile
+++ b/sysutils/syscp/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.4.2.1
 PORTREVISION=	2
 CATEGORIES=	sysutils www
 MASTER_SITES=	http://files.syscp.org/releases/tgz/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 PATCH_DIST_STRIP=	-p0
 
diff --git a/sysutils/vbetool/Makefile b/sysutils/vbetool/Makefile
index b3facde882b7..c2bb73b65543 100644
--- a/sysutils/vbetool/Makefile
+++ b/sysutils/vbetool/Makefile
@@ -12,7 +12,6 @@ CATEGORIES=	sysutils
 MASTER_SITES=	http://www.codon.org.uk/~mjg59/vbetool/download/	\
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jkim
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jkim@FreeBSD.org
 COMMENT=	An application for executing video card BIOS code
diff --git a/textproc/clucene-contrib/Makefile b/textproc/clucene-contrib/Makefile
index 3bddc2f7a778..2cbd7b181a3f 100644
--- a/textproc/clucene-contrib/Makefile
+++ b/textproc/clucene-contrib/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	clucene-contrib
 PORTVERSION=	0.9.16a
 CATEGORIES=	textproc
 MASTER_SITES=	SF/clucene/clucene-contribs-unstable/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	tom@tomjudge.com
 COMMENT=	CLucene Contrib Code and Tools
diff --git a/www/apache-forrest/Makefile b/www/apache-forrest/Makefile
index fb8a36ab72b9..b4c25f487305 100644
--- a/www/apache-forrest/Makefile
+++ b/www/apache-forrest/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES=		${MASTER_SITE_APACHE} \
 			http://mirror.nohup.it/apache/forrest/ \
 			ftp://mirror.nohup.it/apache/forrest/
 MASTER_SITE_SUBDIR=	forrest
-DISTNAME=		${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=		nivit@FreeBSD.org
 COMMENT=		A tool for rapid development of small sites
diff --git a/www/ismail/Makefile b/www/ismail/Makefile
index 1d70967c0ad4..569ba7e60fa9 100644
--- a/www/ismail/Makefile
+++ b/www/ismail/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	2.1
 PORTREVISION=	2
 CATEGORIES=	www mail
 MASTER_SITES=	http://sunner.semmy.ru/~az/ISMail/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PHP-based webmail client
diff --git a/www/mini_httpd/Makefile b/www/mini_httpd/Makefile
index 086eb077713b..3e254886a3e9 100644
--- a/www/mini_httpd/Makefile
+++ b/www/mini_httpd/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	mini_httpd
 PORTVERSION=	1.19
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.acme.com/software/mini_httpd/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small HTTP server with support for GET, HEAD, POST, CGI, SSL, IPv6
diff --git a/www/mod_fcgid/Makefile b/www/mod_fcgid/Makefile
index f067d2c4a1d7..081fca9ad62a 100644
--- a/www/mod_fcgid/Makefile
+++ b/www/mod_fcgid/Makefile
@@ -11,7 +11,6 @@ CATEGORIES=	www
 MASTER_SITES=		${MASTER_SITE_APACHE_HTTPD}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	hemi@puresimplicity.net
 COMMENT=	An alternative FastCGI module for Apache2
diff --git a/www/mod_proxy_add_forward/Makefile b/www/mod_proxy_add_forward/Makefile
index 5ce6d9f1dd04..f548a1455477 100644
--- a/www/mod_proxy_add_forward/Makefile
+++ b/www/mod_proxy_add_forward/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	mod_proxy_add_forward
 PORTVERSION=	20020710
 CATEGORIES=	www
 MASTER_SITES=	http://develooper.com/code/mpaf/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.c
 
 MAINTAINER=	apache@FreeBSD.org
diff --git a/www/p5-Catalyst-Controller-BindLex/Makefile b/www/p5-Catalyst-Controller-BindLex/Makefile
index 00329a00d54d..5aaa78153acb 100644
--- a/www/p5-Catalyst-Controller-BindLex/Makefile
+++ b/www/p5-Catalyst-Controller-BindLex/Makefile
@@ -11,7 +11,6 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/N/NU/NUFFIN
 PKGNAMEPREFIX=	p5-
-DISTNAME=       ${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	fernan@iib.unsam.edu.ar
 COMMENT=	Stash your lexical goodness
diff --git a/www/sams/Makefile b/www/sams/Makefile
index bc3fda071b99..e0f5d10713c3 100644
--- a/www/sams/Makefile
+++ b/www/sams/Makefile
@@ -12,7 +12,6 @@ PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://sams.perm.ru/download/ \
 		http://gateway11.ath.cx/sams/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	uzgrishin@mail.ru
 COMMENT=	Squid 2.x Accounting Management System
diff --git a/www/webcalendar/Makefile b/www/webcalendar/Makefile
index 6364951d9d2e..41360c54c7e7 100644
--- a/www/webcalendar/Makefile
+++ b/www/webcalendar/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.0.5
 PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}%201.0/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 PORTSCOUT=	limit:^1\.0\.
 
 MAINTAINER=	glarkin@FreeBSD.org
diff --git a/www/zope-FileSystemSite/Makefile b/www/zope-FileSystemSite/Makefile
index b4fb9c044982..8a28ebe43a87 100644
--- a/www/zope-FileSystemSite/Makefile
+++ b/www/zope-FileSystemSite/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.4.2
 CATEGORIES=	www zope
 MASTER_SITES=	http://www.infrae.com/download/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	zope-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	x@vex.net
diff --git a/x11-servers/x2x/Makefile b/x11-servers/x2x/Makefile
index 5f75614f7b01..b08bc4bc68b2 100644
--- a/x11-servers/x2x/Makefile
+++ b/x11-servers/x2x/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.27
 PORTREVISION=	3
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://gatekeeper.dec.com/pub/DEC/SRC/x2x/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A program to link multiple X servers together
diff --git a/x11-wm/e17-module-alarm/Makefile b/x11-wm/e17-module-alarm/Makefile
index 9b8a93d4bddc..6716f3e67908 100644
--- a/x11-wm/e17-module-alarm/Makefile
+++ b/x11-wm/e17-module-alarm/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	A module to set Alarms in Enlightenment 17
diff --git a/x11-wm/e17-module-bling/Makefile b/x11-wm/e17-module-bling/Makefile
index feef9cf1a7ec..c0b728fc4ccd 100644
--- a/x11-wm/e17-module-bling/Makefile
+++ b/x11-wm/e17-module-bling/Makefile
@@ -11,7 +11,6 @@ PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	E17 composite manager module
diff --git a/x11-wm/e17-module-calendar/Makefile b/x11-wm/e17-module-calendar/Makefile
index ca8645b3c319..bd29c5653d56 100644
--- a/x11-wm/e17-module-calendar/Makefile
+++ b/x11-wm/e17-module-calendar/Makefile
@@ -11,7 +11,6 @@ PORTEPOCH=	1
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Nice calendar module for e17
diff --git a/x11-wm/e17-module-cpu/Makefile b/x11-wm/e17-module-cpu/Makefile
index 3284bc4a7561..2cfeb61f047c 100644
--- a/x11-wm/e17-module-cpu/Makefile
+++ b/x11-wm/e17-module-cpu/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module which allows users to monitor cpu load
diff --git a/x11-wm/e17-module-deskshow/Makefile b/x11-wm/e17-module-deskshow/Makefile
index 262486184ca8..1b8e92e3dd3a 100644
--- a/x11-wm/e17-module-deskshow/Makefile
+++ b/x11-wm/e17-module-deskshow/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	E17 module that minimizes all windows to show the desktop
diff --git a/x11-wm/e17-module-diskio/Makefile b/x11-wm/e17-module-diskio/Makefile
index d0f591f6477f..3d5ad2cd3528 100644
--- a/x11-wm/e17-module-diskio/Makefile
+++ b/x11-wm/e17-module-diskio/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	Disk I/O visualization module for E17
diff --git a/x11-wm/e17-module-drawer/Makefile b/x11-wm/e17-module-drawer/Makefile
index 73fb4dcf36d9..a60241e6b29b 100644
--- a/x11-wm/e17-module-drawer/Makefile
+++ b/x11-wm/e17-module-drawer/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	An e17 module to display/organize different types of information
diff --git a/x11-wm/e17-module-efm_nav/Makefile b/x11-wm/e17-module-efm_nav/Makefile
index d6a8399b7ef1..cbbda425e8d4 100644
--- a/x11-wm/e17-module-efm_nav/Makefile
+++ b/x11-wm/e17-module-efm_nav/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	An e17 module that allows a user to navigate through the filesystem
diff --git a/x11-wm/e17-module-efm_path/Makefile b/x11-wm/e17-module-efm_path/Makefile
index c629e32483ed..2dea9906e86e 100644
--- a/x11-wm/e17-module-efm_path/Makefile
+++ b/x11-wm/e17-module-efm_path/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	An e17 module that allows a user to type a location into the filemanager
diff --git a/x11-wm/e17-module-efm_pathbar/Makefile b/x11-wm/e17-module-efm_pathbar/Makefile
index 06e257595a87..31a2ef53dcc5 100644
--- a/x11-wm/e17-module-efm_pathbar/Makefile
+++ b/x11-wm/e17-module-efm_pathbar/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	An e17 module that provides a pathbar gadget
diff --git a/x11-wm/e17-module-engage/Makefile b/x11-wm/e17-module-engage/Makefile
index 56352536d82b..a2a3f7a1822c 100644
--- a/x11-wm/e17-module-engage/Makefile
+++ b/x11-wm/e17-module-engage/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	A fast applications switching module for e17
diff --git a/x11-wm/e17-module-everything-mpris/Makefile b/x11-wm/e17-module-everything-mpris/Makefile
index 34425c2a0408..f5f39ac74266 100644
--- a/x11-wm/e17-module-everything-mpris/Makefile
+++ b/x11-wm/e17-module-everything-mpris/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	An e17 frontend module for mediaplayers that support mpris
diff --git a/x11-wm/e17-module-everything-pidgin/Makefile b/x11-wm/e17-module-everything-pidgin/Makefile
index 97bb0830aaa0..ed33dbd0e636 100644
--- a/x11-wm/e17-module-everything-pidgin/Makefile
+++ b/x11-wm/e17-module-everything-pidgin/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	An e17 pidgin plugin for the "everything" module
diff --git a/x11-wm/e17-module-everything-places/Makefile b/x11-wm/e17-module-everything-places/Makefile
index 271ba971e52e..c6cbaaacd1db 100644
--- a/x11-wm/e17-module-everything-places/Makefile
+++ b/x11-wm/e17-module-everything-places/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	An e17 places plugin for the "everything" module
diff --git a/x11-wm/e17-module-everything-wallpaper/Makefile b/x11-wm/e17-module-everything-wallpaper/Makefile
index 053939a569e1..f8207d4997d5 100644
--- a/x11-wm/e17-module-everything-wallpaper/Makefile
+++ b/x11-wm/e17-module-everything-wallpaper/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	An e17 wallpaper plugin for the "everything" module
diff --git a/x11-wm/e17-module-everything-websearch/Makefile b/x11-wm/e17-module-everything-websearch/Makefile
index 8c3711a9ee82..024a52021d83 100644
--- a/x11-wm/e17-module-everything-websearch/Makefile
+++ b/x11-wm/e17-module-everything-websearch/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	An e17 websearch plugin for the "everything" module
diff --git a/x11-wm/e17-module-exebuf/Makefile b/x11-wm/e17-module-exebuf/Makefile
index ca0af2a1e707..cda4281ec80f 100644
--- a/x11-wm/e17-module-exebuf/Makefile
+++ b/x11-wm/e17-module-exebuf/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	Exebuf program launcher module for e17
diff --git a/x11-wm/e17-module-execwatch/Makefile b/x11-wm/e17-module-execwatch/Makefile
index 21f6fc2085fb..e404b940687d 100644
--- a/x11-wm/e17-module-execwatch/Makefile
+++ b/x11-wm/e17-module-execwatch/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	An e17 module to show the last state of a periodically executed command
diff --git a/x11-wm/e17-module-flame/Makefile b/x11-wm/e17-module-flame/Makefile
index 6d3c12e1a858..d6dae53d76ed 100644
--- a/x11-wm/e17-module-flame/Makefile
+++ b/x11-wm/e17-module-flame/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module which draws flames on your desktop
diff --git a/x11-wm/e17-module-forecasts/Makefile b/x11-wm/e17-module-forecasts/Makefile
index 590fbd89208b..ebd1db329a85 100644
--- a/x11-wm/e17-module-forecasts/Makefile
+++ b/x11-wm/e17-module-forecasts/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	An e17 weather forecast display module
diff --git a/x11-wm/e17-module-iiirk/Makefile b/x11-wm/e17-module-iiirk/Makefile
index d942e1d7e80f..7bed0acbcb72 100644
--- a/x11-wm/e17-module-iiirk/Makefile
+++ b/x11-wm/e17-module-iiirk/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	A taskbar-like module for e17
diff --git a/x11-wm/e17-module-itask-ng/Makefile b/x11-wm/e17-module-itask-ng/Makefile
index 56352536d82b..a2a3f7a1822c 100644
--- a/x11-wm/e17-module-itask-ng/Makefile
+++ b/x11-wm/e17-module-itask-ng/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	A fast applications switching module for e17
diff --git a/x11-wm/e17-module-language/Makefile b/x11-wm/e17-module-language/Makefile
index 1e0779d0c955..5d8f85d928cb 100644
--- a/x11-wm/e17-module-language/Makefile
+++ b/x11-wm/e17-module-language/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	An e17 XKB language/layout control module
diff --git a/x11-wm/e17-module-mail/Makefile b/x11-wm/e17-module-mail/Makefile
index dd84ea697959..a63486b0aa6b 100644
--- a/x11-wm/e17-module-mail/Makefile
+++ b/x11-wm/e17-module-mail/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module to check your mailboxes (like xbiff does)
diff --git a/x11-wm/e17-module-mem/Makefile b/x11-wm/e17-module-mem/Makefile
index 93ee5e2df1b4..6dc4c807ee56 100644
--- a/x11-wm/e17-module-mem/Makefile
+++ b/x11-wm/e17-module-mem/Makefile
@@ -11,7 +11,6 @@ PORTEPOCH=	1
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 memory monitoring module
diff --git a/x11-wm/e17-module-mixer/Makefile b/x11-wm/e17-module-mixer/Makefile
index a67912a280f2..99386e4fc9d3 100644
--- a/x11-wm/e17-module-mixer/Makefile
+++ b/x11-wm/e17-module-mixer/Makefile
@@ -11,7 +11,6 @@ PORTREVISION=	5
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module to adjust audio mixer settings
diff --git a/x11-wm/e17-module-moon/Makefile b/x11-wm/e17-module-moon/Makefile
index d97a50140342..ce7c843e5209 100644
--- a/x11-wm/e17-module-moon/Makefile
+++ b/x11-wm/e17-module-moon/Makefile
@@ -11,7 +11,6 @@ PORTEPOCH=	1
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 Moon Clock module
diff --git a/x11-wm/e17-module-mpdule/Makefile b/x11-wm/e17-module-mpdule/Makefile
index 8c6b9bf24839..47d78e66a60a 100644
--- a/x11-wm/e17-module-mpdule/Makefile
+++ b/x11-wm/e17-module-mpdule/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	An MPD module for e17
diff --git a/x11-wm/e17-module-net/Makefile b/x11-wm/e17-module-net/Makefile
index 0715cfebf748..d36d6ffd9156 100644
--- a/x11-wm/e17-module-net/Makefile
+++ b/x11-wm/e17-module-net/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	An e17 NIC monitoring module
diff --git a/x11-wm/e17-module-notification/Makefile b/x11-wm/e17-module-notification/Makefile
index 613eba76fc42..830b30275f30 100644
--- a/x11-wm/e17-module-notification/Makefile
+++ b/x11-wm/e17-module-notification/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	An e17 notification daemon module
diff --git a/x11-wm/e17-module-penguins/Makefile b/x11-wm/e17-module-penguins/Makefile
index 7b934aa0b7db..f821a60196f9 100644
--- a/x11-wm/e17-module-penguins/Makefile
+++ b/x11-wm/e17-module-penguins/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	An e17 module that displays fancy penguins walking around your desktop
diff --git a/x11-wm/e17-module-photo/Makefile b/x11-wm/e17-module-photo/Makefile
index d51d43709225..db1370fede15 100644
--- a/x11-wm/e17-module-photo/Makefile
+++ b/x11-wm/e17-module-photo/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	An e17 photo slideshow module
diff --git a/x11-wm/e17-module-places/Makefile b/x11-wm/e17-module-places/Makefile
index 98c2249c4b30..225b41406544 100644
--- a/x11-wm/e17-module-places/Makefile
+++ b/x11-wm/e17-module-places/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	An e17 module to manage disk volumes
diff --git a/x11-wm/e17-module-quickaccess/Makefile b/x11-wm/e17-module-quickaccess/Makefile
index 70ec0068cd21..92781edd5444 100644
--- a/x11-wm/e17-module-quickaccess/Makefile
+++ b/x11-wm/e17-module-quickaccess/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	An e17 module to provide quick access to applications
diff --git a/x11-wm/e17-module-rain/Makefile b/x11-wm/e17-module-rain/Makefile
index 5999a1afecc2..9750c0b48fee 100644
--- a/x11-wm/e17-module-rain/Makefile
+++ b/x11-wm/e17-module-rain/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module which draws raindrops on your screen
diff --git a/x11-wm/e17-module-screenshot/Makefile b/x11-wm/e17-module-screenshot/Makefile
index 66c264967690..aef2968e6013 100644
--- a/x11-wm/e17-module-screenshot/Makefile
+++ b/x11-wm/e17-module-screenshot/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module which allows users to take screenshots
diff --git a/x11-wm/e17-module-slideshow/Makefile b/x11-wm/e17-module-slideshow/Makefile
index f56e50afe684..a6082753b6b1 100644
--- a/x11-wm/e17-module-slideshow/Makefile
+++ b/x11-wm/e17-module-slideshow/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module which cycles desktop backgrounds
diff --git a/x11-wm/e17-module-snow/Makefile b/x11-wm/e17-module-snow/Makefile
index 0ef21a844995..67de2e2cd0bf 100644
--- a/x11-wm/e17-module-snow/Makefile
+++ b/x11-wm/e17-module-snow/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module which draws snowflakes on your screen
diff --git a/x11-wm/e17-module-taskbar/Makefile b/x11-wm/e17-module-taskbar/Makefile
index b31ee1950fc2..f55f7a62741d 100644
--- a/x11-wm/e17-module-taskbar/Makefile
+++ b/x11-wm/e17-module-taskbar/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	A classic taskbar module for e17
diff --git a/x11-wm/e17-module-tclock/Makefile b/x11-wm/e17-module-tclock/Makefile
index 13e3a23c06e3..c0eb53ee36f7 100644
--- a/x11-wm/e17-module-tclock/Makefile
+++ b/x11-wm/e17-module-tclock/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	A digital clock gadget module for e17
diff --git a/x11-wm/e17-module-tiling/Makefile b/x11-wm/e17-module-tiling/Makefile
index b197d1a50cfb..780ab8e29c34 100644
--- a/x11-wm/e17-module-tiling/Makefile
+++ b/x11-wm/e17-module-tiling/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	A tiling-like windows control module for e17
diff --git a/x11-wm/e17-module-uptime/Makefile b/x11-wm/e17-module-uptime/Makefile
index 2fb960fdedc1..4903a4b6a2b2 100644
--- a/x11-wm/e17-module-uptime/Makefile
+++ b/x11-wm/e17-module-uptime/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 uptime and load average indicator module
diff --git a/x11-wm/e17-module-weather/Makefile b/x11-wm/e17-module-weather/Makefile
index e7bcd9d8f525..8cb30c62a337 100644
--- a/x11-wm/e17-module-weather/Makefile
+++ b/x11-wm/e17-module-weather/Makefile
@@ -11,7 +11,6 @@ PORTEPOCH=	1
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 weather module
diff --git a/x11-wm/e17-module-winselector/Makefile b/x11-wm/e17-module-winselector/Makefile
index af6edd592fc5..43a3d971d28e 100644
--- a/x11-wm/e17-module-winselector/Makefile
+++ b/x11-wm/e17-module-winselector/Makefile
@@ -11,7 +11,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module to switch between windows
diff --git a/x11-wm/e17-module-wlan/Makefile b/x11-wm/e17-module-wlan/Makefile
index 1ba2a8db7a1e..6a083447c57a 100644
--- a/x11-wm/e17-module-wlan/Makefile
+++ b/x11-wm/e17-module-wlan/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	20101003
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	An e17 wlan devices monitoring module
diff --git a/x11/ggiterm/Makefile b/x11/ggiterm/Makefile
index 315b2ebb3318..6953e0a58de1 100644
--- a/x11/ggiterm/Makefile
+++ b/x11/ggiterm/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	0.7.1
 PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	antoine.brodin@laposte.net
 COMMENT=	A terminal emulator for GGI
diff --git a/x11/roxbg/Makefile b/x11/roxbg/Makefile
index d12a3ea96d2e..40bec7fde214 100644
--- a/x11/roxbg/Makefile
+++ b/x11/roxbg/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.0.0
 PORTREVISION=	4
 CATEGORIES=	x11 deskutils
 MASTER_SITES=	http://vvelox.net/programs/unix/x11/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=
 EXTRACT_ONLY=
 
diff --git a/x11/wmdrawer/Makefile b/x11/wmdrawer/Makefile
index 9011a1b57894..7f996fac43d2 100644
--- a/x11/wmdrawer/Makefile
+++ b/x11/wmdrawer/Makefile
@@ -12,7 +12,6 @@ PORTREVISION=	8
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://people.easter-eggs.org/~valos/wmdrawer/:tarball \
 		http://wikitest.freebsd.org/wiki/common/:pixmap
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 DISTFILES=	${EXTRACT_ONLY}:tarball \
 		logo-beastie.png:pixmap
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/x11/xwinwrap/Makefile b/x11/xwinwrap/Makefile
index dd8e6466539d..2167c47ca02e 100644
--- a/x11/xwinwrap/Makefile
+++ b/x11/xwinwrap/Makefile
@@ -11,7 +11,6 @@ CATEGORIES=	x11
 MASTER_SITES=	http://fbsd.zlonet.ru/distfiles/ \
 		http://tourservice.kz/zloidemon/distfiles/ \
 		http://z-up.ru/zloidemon/distfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	g.veniamin@googlemail.com
 COMMENT=	XWinWrap replace a desktop background with a movie or screensaver
author	Philip M. Gollucci <pgollucci@FreeBSD.org>	2010-12-29 20:04:42 +0000
committer	Philip M. Gollucci <pgollucci@FreeBSD.org>	2010-12-29 20:04:42 +0000
commit	116ec22ac1e21a8ce6fe1cf302abb42bbcbbd6d3 (patch)
tree	182c3e8b2fec5d158af1b14d92f30efeee781107
parent	ce797dd6db08415f0769d368481029338e73d118 (diff)
download	ports-116ec22ac1e21a8ce6fe1cf302abb42bbcbbd6d3.tar.gz ports-116ec22ac1e21a8ce6fe1cf302abb42bbcbbd6d3.zip