16 files changed, 36 insertions, 43 deletions

diff --git a/net/activemq/Makefile b/net/activemq/Makefile
index bee42e2cf1c6..2e354f3dd0f0 100644
--- a/net/activemq/Makefile
+++ b/net/activemq/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	activemq
 PORTVERSION=	5.10.1
 CATEGORIES=	net java
-MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION}
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}-bin
 
 MAINTAINER=	tj@FreeBSD.org
diff --git a/net/belle-sip/Makefile b/net/belle-sip/Makefile
index 76d9f16d7bc2..1abcf725d0b3 100644
--- a/net/belle-sip/Makefile
+++ b/net/belle-sip/Makefile
@@ -3,11 +3,11 @@
 PORTNAME=	belle-sip
 PORTVERSION=	1.4.0
 CATEGORIES=	net java
-MASTER_SITES=	SAVANNAH/linphone/${PORTNAME}/:source1 \
+MASTER_SITES=	SAVANNAH/linphone/${PORTNAME}/ \
 		http://www.antlr3.org/download/:source2
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:source1 \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		antlr-3.4-complete.jar:source2
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Belle-sip is a SIP (RFC3261) implementation written in C
diff --git a/net/jakarta-commons-net/Makefile b/net/jakarta-commons-net/Makefile
index 2497fe227c34..ee6e8e29df08 100644
--- a/net/jakarta-commons-net/Makefile
+++ b/net/jakarta-commons-net/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	commons-net
 PORTVERSION=	1.4.1
 PORTREVISION=	3
 CATEGORIES=	net java
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_SOURCE
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/net/jrdesktop/Makefile b/net/jrdesktop/Makefile
index e8a121812458..c43137fb57cd 100644
--- a/net/jrdesktop/Makefile
+++ b/net/jrdesktop/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	jrdesktop
 PORTVERSION=	0.3.1.0
 CATEGORIES=	net java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R:R}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}.jar
-EXTRACT_SUFX=
+EXTRACT_SUFX=	.jar
 EXTRACT_ONLY=
 
 MAINTAINER=	ports@FreeBSD.org
@@ -23,14 +22,14 @@ SUB_LIST+=	JAVA=${JAVA} \
 		PORTNAME=${PORTNAME} \
 		PORTVERSION=${PORTVERSION}
 
-PLIST_FILES=	${JAVAJARDIR:S/${PREFIX}\///}/${DISTNAME} \
+PLIST_FILES=	${JAVAJARDIR:S/${PREFIX}\///}/${DISTNAME}.jar \
 		bin/${PORTNAME}
 
 post-extract:
-	${CP} ${DISTDIR}/${DISTNAME} ${WRKDIR}
+	${CP} ${DISTDIR}/${DISTNAME}.jar ${WRKDIR}
 
 do-install:
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME} ${STAGEDIR}${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}.jar ${STAGEDIR}${JAVAJARDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/jrdesktop ${STAGEDIR}${PREFIX}/bin/jrdesktop
 
 .include <bsd.port.mk>
diff --git a/net/mgen/Makefile b/net/mgen/Makefile
index 5aa0a164cd4a..9a2443be60fd 100644
--- a/net/mgen/Makefile
+++ b/net/mgen/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	mgen
 PORTVERSION=	4.2b6
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.pf.itd.nrl.navy.mil/mgen/archive/mgen4/ \
-	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	miwi
+		LOCAL/miwi
 DISTNAME=	src-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/netwib/Makefile b/net/netwib/Makefile
index 2d9c5c4185fd..50637e9263e0 100644
--- a/net/netwib/Makefile
+++ b/net/netwib/Makefile
@@ -8,14 +8,15 @@ CATEGORIES=	net devel ipv6
 MASTER_SITES=	http://www.laurentconstantin.com/common/netw/netwib/download/v5/ \
 		http://membres.lycos.fr/lauconstantin/common/netw/netwib/download/v5/ \
 		http://laurentconstantin.free.fr/common/netw/netwib/download/v5/
-DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tgz ${PORTNAME}-${PORTVERSION}-doc_html.tgz
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+DISTFILES=	${DISTNAME}.tgz ${DISTNAME:S/src/doc_html/}.tgz
 
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Netwib network programming library
 
 LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/src
+WRKSRC_SUBDIR=	src
 SHORTPORTVERSION=${PORTVERSION:C/([0-9]*)\.([0-9]*)\.[0-9]*/\1\2/}
 
 PLIST_SUB+=	SHORTPORTVERSION=${SHORTPORTVERSION}
diff --git a/net/openospfd/Makefile b/net/openospfd/Makefile
index 9b2ce8ad0e66..6da266037aa7 100644
--- a/net/openospfd/Makefile
+++ b/net/openospfd/Makefile
@@ -6,10 +6,10 @@ PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	OPENBSD/OpenBGPD:openbsd \
 		LOCAL/flz/openospfd/:freebsd
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz:openbsd \
+DISTFILES=	${DISTNAME}.tgz:openbsd \
 		if_media.h:freebsd
 DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tgz
+EXTRACT_ONLY=	${DISTNAME}.tgz
 
 MAINTAINER=	rea@FreeBSD.org
 COMMENT=	Free implementation of the Open Shortest Path First Protocol
diff --git a/net/p5-Net-SPDY/Makefile b/net/p5-Net-SPDY/Makefile
index 4a9e577ca706..89a47a059cb4 100644
--- a/net/p5-Net-SPDY/Makefile
+++ b/net/p5-Net-SPDY/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	Net-SPDY
-PORTVERSION=	0.1
+DISTVERSION=	0.1_5
 PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LKUNDRAK
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}_5
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	SPDY protocol client and server implementation
diff --git a/net/proxy-connect/Makefile b/net/proxy-connect/Makefile
index 2f4056145f82..a9e73492f8a5 100644
--- a/net/proxy-connect/Makefile
+++ b/net/proxy-connect/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	100
 CATEGORIES=	net
 MASTER_SITES=	http://www.exit2shell.com/~skreuzer/distfiles/ \
 				http://www.atarininja.org/distfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Command to make network connections via SOCKS and HTTPS proxies
diff --git a/net/py-libcloud/Makefile b/net/py-libcloud/Makefile
index eaf565cfe5c5..9b8a8cd4a919 100644
--- a/net/py-libcloud/Makefile
+++ b/net/py-libcloud/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	libcloud
 PORTVERSION=	0.17.0
 CATEGORIES=	net python
-MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	APACHE/${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
 
diff --git a/net/ss5/Makefile b/net/ss5/Makefile
index 844b7e48d781..fc066f6c111e 100644
--- a/net/ss5/Makefile
+++ b/net/ss5/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	ss5
 PORTVERSION=	3.8.5
+DISTVERSIONSUFFIX=	-1
 PORTREVISION=	2
 CATEGORIES=	net security
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-1
-DISTNAME=	${PORTNAME}-${PORTVERSION}-1
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	raffaele.delorenzo@libero.it
 COMMENT=	SOCKS v4/v5 application layer gateway with many features
diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
index 7f030197ecdf..b449d01acb0e 100644
--- a/net/unison-devel/Makefile
+++ b/net/unison-devel/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
 PKGNAMESUFFIX=	-devel
 DISTFILES=	${EXTRACT_ONLY} ${EXTRA_DOCS}
-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
+DIST_SUBDIR=	${DISTNAME}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	User-level file synchronization tool
@@ -27,8 +27,8 @@ MAKE_ARGS=	CFLAGS=""
 CONFLICTS=	unison-[0-9]* unison-nox11-[0-9]*
 
 DOCS=		BUGS.txt NEWS README
-EXTRA_DOCS=	unison-${PORTVERSION}-manual.html \
-		unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps
+EXTRA_DOCS=	${DISTNAME}-manual.html \
+		${DISTNAME}-manual.pdf ${DISTNAME}-manual.ps
 
 OPTIONS_DEFINE=	DOCS X11
 OPTIONS_DEFAULT=	DOCS X11
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 003df59c6ac8..1df7b538b1a3 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -7,8 +7,8 @@ PORTREVISION?=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
 DISTFILES=	${EXTRACT_ONLY} ${EXTRA_DOCS}
-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
+DIST_SUBDIR=	${DISTNAME}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	madpilot@FreeBSD.org
 COMMENT?=	User-level file synchronization tool
@@ -27,8 +27,8 @@ MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	unison all
 
 DOCS=		BUGS.txt NEWS README
-EXTRA_DOCS=	unison-${PORTVERSION}-manual.html \
-		unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps
+EXTRA_DOCS=	${DISTNAME}-manual.html \
+		${DISTNAME}-manual.pdf ${DISTNAME}-manual.ps
 
 OPTIONS_DEFINE= DOCS X11
 OPTIONS_DEFAULT?=        DOCS X11
diff --git a/net/unison232/Makefile b/net/unison232/Makefile
index 6f049d2a0296..73c82531008e 100644
--- a/net/unison232/Makefile
+++ b/net/unison232/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
 PKGNAMESUFFIX=	232
 DISTFILES=	${EXTRACT_ONLY} ${EXTRA_DOCS}
-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
+DIST_SUBDIR=	${DISTNAME}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	mandree@FreeBSD.org
 # Implicit approval for port changes granted to Guido Falsi <madpilot@FreeBSD.org>
@@ -28,8 +28,8 @@ MAKE_JOBS_UNSAFE=	yes
 
 DOCS=		BUGS.txt NEWS README
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
-EXTRA_DOCS=	${PORTNAME}-${PORTVERSION}-manual.html \
-		${PORTNAME}-${PORTVERSION}-manual.pdf ${PORTNAME}-${PORTVERSION}-manual.ps
+EXTRA_DOCS=	${DISTNAME}-manual.html \
+		${DISTNAME}-manual.pdf ${DISTNAME}-manual.ps
 
 OPTIONS_DEFINE=		DOCS X11
 OPTIONS_DEFAULT=	DOCS X11
diff --git a/net/unison240/Makefile b/net/unison240/Makefile
index 49053de89a3a..b5481b5ba044 100644
--- a/net/unison240/Makefile
+++ b/net/unison240/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
 PKGNAMESUFFIX=	240
 DISTFILES=	${EXTRACT_ONLY} ${EXTRA_DOCS}
-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
+DIST_SUBDIR=	${DISTNAME}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	madpilot@FreeBSD.org
 COMMENT?=	User-level file synchronization tool
@@ -28,8 +28,8 @@ ALL_TARGET=	unison all
 
 DOCS=		BUGS.txt NEWS README
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
-EXTRA_DOCS=	unison-${PORTVERSION}-manual.html \
-		unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps
+EXTRA_DOCS=	${DISTNAME}-manual.html \
+		${DISTNAME}-manual.pdf ${DISTNAME}-manual.ps
 
 OPTIONS_DEFINE= DOCS X11
 OPTIONS_DEFAULT?=        DOCS X11
diff --git a/net/wmwave/Makefile b/net/wmwave/Makefile
index 66809c63c22c..359e61ab59d8 100644
--- a/net/wmwave/Makefile
+++ b/net/wmwave/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	wmwave
-PORTVERSION=	0.4
+DISTVERSION=	0-4
 PORTREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	benjsc@FreeBSD.org