5 files changed, 9 insertions, 9 deletions

diff --git a/net-mgmt/arpwatch/Makefile b/net-mgmt/arpwatch/Makefile
index 9bf0f6ffb1ee..a288dc973279 100644
--- a/net-mgmt/arpwatch/Makefile
+++ b/net-mgmt/arpwatch/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	arpwatch
-PORTVERSION=	2.1.a15
+DISTVERSION=	2.1a15
 PORTREVISION=	8
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/ \
 		GENTOO/distfiles
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.([^\.]*)$/\1/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Monitor arp & rarp requests
diff --git a/net-mgmt/ezradius/Makefile b/net-mgmt/ezradius/Makefile
index 02e24c88fdda..561cc878ce9f 100644
--- a/net-mgmt/ezradius/Makefile
+++ b/net-mgmt/ezradius/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.2.1.2
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.2.1stable
-DISTNAME=	${PORTNAME}-${PORTVERSION}stable${EXTRACT_SUFFIX}
+DISTNAME=	${PORTNAME}-${PORTVERSION}stable
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	EzRADIUS is FreeRADIUS and Chillispot web-based management software
diff --git a/net-mgmt/netwag/Makefile b/net-mgmt/netwag/Makefile
index c916ae7774fa..868a0dfd01b2 100644
--- a/net-mgmt/netwag/Makefile
+++ b/net-mgmt/netwag/Makefile
@@ -7,7 +7,8 @@ CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	http://www.laurentconstantin.com/common/netw/${PORTNAME}/download/v5/ \
 		http://membres.lycos.fr/lauconstantin/common/netw/${PORTNAME}/download/v5/ \
 		http://laurentconstantin.free.fr/common/netw/${PORTNAME}/download/v5/
-DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tgz ${PORTNAME}-${PORTVERSION}-doc_html.tgz
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+DISTFILES=	${DISTNAME}.tgz ${DISTNAME:S/src/doc_html/}.tgz
 
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Graphical front end for netwox
@@ -20,7 +21,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/src
+WRKSRC_SUBDIR=	src
 SHORTPORTVERSION=${PORTVERSION:C/([0-9]*)\.([0-9]*)\.[0-9]*/\1\2/}
 
 PLIST_SUB+=	SHORTPORTVERSION=${SHORTPORTVERSION}
diff --git a/net-mgmt/netwox/Makefile b/net-mgmt/netwox/Makefile
index 23ee01a70c24..3d392d8fa990 100644
--- a/net-mgmt/netwox/Makefile
+++ b/net-mgmt/netwox/Makefile
@@ -7,7 +7,8 @@ CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	http://www.laurentconstantin.com/common/netw/netwox/download/v5/ \
 		http://membres.lycos.fr/lauconstantin/common/netw/netwox/download/v5/ \
 		http://laurentconstantin.free.fr/common/netw/netwox/download/v5/
-DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tgz ${PORTNAME}-${PORTVERSION}-doc_html.tgz
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+DISTFILES=	${DISTNAME}.tgz ${DISTNAME:S/src/doc_html/}.tgz
 
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Netwox a network testing toolbox
@@ -16,7 +17,7 @@ BUILD_DEPENDS=	netwib-config:${PORTSDIR}/net/netwib
 
 OPTIONS_DEFINE=	DOCS
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/src
+WRKSRC_SUBDIR=	src
 SHORTPORTVERSION=${PORTVERSION:C/([0-9]*)\.([0-9]*)\.[0-9]*/\1\2/}
 
 PLIST_SUB+=	SHORTPORTVERSION=${SHORTPORTVERSION}
diff --git a/net-mgmt/rackmonkey/Makefile b/net-mgmt/rackmonkey/Makefile
index 950d89a9ca76..5d6f5d43f301 100644
--- a/net-mgmt/rackmonkey/Makefile
+++ b/net-mgmt/rackmonkey/Makefile
@@ -3,12 +3,12 @@
 
 PORTNAME=	rackmonkey
 PORTVERSION=	1.2.5
+DISTVERSIONSUFFIX=	-1
 PORTREVISION=	3
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF \
 		ftp://ftp.secure-computing.net/pub/FreeBSD/ports/${PORTNAME}/ \
 		ftp://ftp2.secure-computing.net/pub/FreeBSD/ports/${PORTNAME}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 
 MAINTAINER=	ecrist@secure-computing.net
 COMMENT=	Web-based tool for managing racks of equipment
@@ -24,7 +24,6 @@ OPTIONS_DEFAULT=	SQLITE INIT_DB SAMPLE
 INIT_DB_DESC=	Initialize DB at installation (SQLite Only)
 SAMPLE_DESC=	Install sample data (SQLite Only)
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}-1
 NO_BUILD=	YES
 
 USES=		perl5