MASTER_SITES cleanup.

- Replace ${MASTER_SITE_FOO} with FOO. - Merge MASTER_SITE_SUBDIR into MASTER_SITES when possible. (This means 99.9% of the time.) - Remove occurrences of MASTER_SITE_LOCAL when no subdirectory was present and no hint of what it should be was present. - Fix some logic. - And generally, make things more simple and easy to understand. While there, add magic values to the FESTIVAL, GENTOO, GIMP, GNUPG, QT and SAMBA macros. Also, replace some EXTRACT_SUFX occurences with USES=tar:*. Checked by: make fetch-urlall-list With hat: portmgr Sponsored by: Absolight
author: mat <mat@FreeBSD.org> 2015-05-14 18:15:04 +0800
committer: mat <mat@FreeBSD.org> 2015-05-14 18:15:04 +0800
commit: d72353c225a0cff8478c442d745a54e4630671fc (patch)
tree: 627649ff7699a289d5d78c11bf8d105881402ca8 /net
parent: 7790dd541328e5000ba710fc478bc5f22ab41cc6 (diff)
download: freebsd-ports-gnome-d72353c225a0cff8478c442d745a54e4630671fc.tar.gz
freebsd-ports-gnome-d72353c225a0cff8478c442d745a54e4630671fc.tar.zst
freebsd-ports-gnome-d72353c225a0cff8478c442d745a54e4630671fc.zip
78 files changed, 79 insertions, 151 deletions
diff --git a/net/44bsd-rdist/Makefile b/net/44bsd-rdist/Makefile
index 4274b59eba7e..4d39af242bc6 100644
--- a/net/44bsd-rdist/Makefile
+++ b/net/44bsd-rdist/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	44bsd-rdist
 PORTVERSION=	20001111
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	cy
+MASTER_SITES=	LOCAL/cy
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	The traditional 4.4BSD rdist
diff --git a/net/aprsc/Makefile b/net/aprsc/Makefile
index cdb5edf4ce30..506ebe84314d 100644
--- a/net/aprsc/Makefile
+++ b/net/aprsc/Makefile
@@ -6,8 +6,7 @@ PORTREVISION=	3
 DISTVERSIONSUFFIX=	.g28c5a6a
 CATEGORIES=	net hamradio
 MASTER_SITES=	http://he.fi/aprsc/down/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+		LOCAL/db
 
 MAINTAINER=	toyokun@gmail.com
 COMMENT=	Plain APRS-IS server
diff --git a/net/boinc_curses/Makefile b/net/boinc_curses/Makefile
index 4e760400844d..a213bf38ccf7 100644
--- a/net/boinc_curses/Makefile
+++ b/net/boinc_curses/Makefile
@@ -5,9 +5,7 @@ PORTNAME=	boinc_curses
 PORTVERSION=	0.2.2
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://www.oook.cz/bsd/boinc_curses/
-MASTER_SITE_SUBDIR=rene
+MASTER_SITES=	LOCAL/rene http://www.oook.cz/bsd/boinc_curses/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Console, ncurses based monitor and manager for BOINC
diff --git a/net/bounce/Makefile b/net/bounce/Makefile
index 47e51ce2386e..8a714dfcfb8c 100644
--- a/net/bounce/Makefile
+++ b/net/bounce/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	1.0
 PORTREVISION=	8
 CATEGORIES=	net security
 MASTER_SITES=	http://www.iagora.com/~espel/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	obrien
+		LOCAL/obrien
 DISTNAME=	bounce
 EXTRACT_SUFX=	.c
 
diff --git a/net/cagibi/Makefile b/net/cagibi/Makefile
index aacb73a481dd..91eee010c017 100644
--- a/net/cagibi/Makefile
+++ b/net/cagibi/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	cagibi
 PORTVERSION=	0.2.0
 CATEGORIES=	net devel
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/cagibi
+MASTER_SITES=	KDE/stable/${PORTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE SSDP/uPNP proxy
diff --git a/net/clamz/Makefile b/net/clamz/Makefile
index 9321d0db07c6..6449c7acbb60 100644
--- a/net/clamz/Makefile
+++ b/net/clamz/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	clamz
 PORTVERSION=	0.5
 PORTREVISION=	4
 CATEGORIES=	net audio
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	glathe.helko@googlemail.com
 COMMENT=	Command-line program to download MP3 files from Amazon's music store
diff --git a/net/cvsup-static/Makefile b/net/cvsup-static/Makefile
index e34d21fda4f0..b79c8bc36eb0 100644
--- a/net/cvsup-static/Makefile
+++ b/net/cvsup-static/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	cvsup-static
 PORTVERSION=	16.1h
 CATEGORIES=	net devel
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	delphij
+MASTER_SITES=	LOCAL/delphij
 PKGNAMEPREFIX=	binary-
 DISTNAME=	cvsup-without-gui-static-${ARCH}-${PORTVERSION}
 
diff --git a/net/dgd-lpmud/Makefile b/net/dgd-lpmud/Makefile
index 31a93b1865c4..51ed47da3998 100644
--- a/net/dgd-lpmud/Makefile
+++ b/net/dgd-lpmud/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	dgd-lpmud
 PORTVERSION=	2.4.5
 PORTREVISION=	5
 CATEGORIES=	net games
-MASTER_SITES=	${MASTER_SITE_LOCAL:S|%SUBDIR%|glewis/dgd|} \
+MASTER_SITES=	LOCAL/glewis/dgd \
 		http://ftp.dworkin.nl/dgd/lib/
 DISTNAME=	2.4.5-for-1.4
 
diff --git a/net/gnu-dico/Makefile b/net/gnu-dico/Makefile
index aa8aabe776e3..d5187d22684f 100644
--- a/net/gnu-dico/Makefile
+++ b/net/gnu-dico/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	dico
 PORTVERSION=	2.2
 PORTREVISION=	6
 CATEGORIES=	net textproc
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 PKGNAMEPREFIX=	gnu-
 
 MAINTAINER=	goran.tal@gmail.com
diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index a5119b5018ae..3743045d1ccd 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	gnu-radius
 PORTVERSION=	1.6.1
 PORTREVISION=	6
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	radius
+MASTER_SITES=	GNU/radius
 DISTNAME=	radius-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/googlecl/Makefile b/net/googlecl/Makefile
index 387971f7fc4b..34cfdab62c86 100644
--- a/net/googlecl/Makefile
+++ b/net/googlecl/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	googlecl
 PORTVERSION=	0.9.14
 CATEGORIES=	net www python
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Command line tools for the Google Data APIs
diff --git a/net/grdesktop/Makefile b/net/grdesktop/Makefile
index cd439db899ad..6838249fc5bd 100644
--- a/net/grdesktop/Makefile
+++ b/net/grdesktop/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	grdesktop
 PORTVERSION=	0.23
 PORTREVISION=	12
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	flz@FreeBSD.org
 COMMENT=	GNOME frontend for the remote desktop client (rdesktop)
diff --git a/net/hexinject/Makefile b/net/hexinject/Makefile
index 6e64cef00b8e..27f4a95b5f46 100644
--- a/net/hexinject/Makefile
+++ b/net/hexinject/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	hexinject
 PORTVERSION=	1.5
 CATEGORIES=	net security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	HexInject is a very versatile packet injector and sniffer
diff --git a/net/icmpinfo/Makefile b/net/icmpinfo/Makefile
index a7022e61a7fd..98de7a794a10 100644
--- a/net/icmpinfo/Makefile
+++ b/net/icmpinfo/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	icmpinfo
 PORTVERSION=	1.11
 CATEGORIES=	net sysutils
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	system/network/admin
+MASTER_SITES=	SUNSITE/system/network/admin
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Looks at the icmp messages received by the host
diff --git a/net/iet/Makefile b/net/iet/Makefile
index c285cb7364b8..13b2c8b2cee3 100644
--- a/net/iet/Makefile
+++ b/net/iet/Makefile
@@ -8,8 +8,7 @@ CATEGORIES=	net kld
 MASTER_SITES=	SF/iscsitarget/iscsitarget/${PORTVERSION}/
 DISTNAME=	iscsitarget-${PORTVERSION}
 
-PATCH_SITES=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	delphij
+PATCH_SITES=	LOCAL/delphij
 PATCHFILES=	${PORTNAME}-${PORTVERSION}.diff.bz2
 PATCH_DIST_STRIP=	-p1
 
diff --git a/net/ifstat/Makefile b/net/ifstat/Makefile
index 662b1c76e7d8..7d9f6120b403 100644
--- a/net/ifstat/Makefile
+++ b/net/ifstat/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	ifstat
 PORTVERSION=	1.1
 PORTREVISION=	5
 CATEGORIES=	net
-MASTER_SITES=	http://gael.roualland.free.fr/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://gael.roualland.free.fr/${PORTNAME}/
 
 MAINTAINER=	alexey@renatasystems.org
 COMMENT=	Network interface statistics monitoring tool
diff --git a/net/igmpproxy/Makefile b/net/igmpproxy/Makefile
index 9c18cf29b1c2..0c938595c83c 100644
--- a/net/igmpproxy/Makefile
+++ b/net/igmpproxy/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	0.1
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF
 
 MAINTAINER=	melifaro@ipfw.ru
 COMMENT=	Multicast forwarding IGMP proxy
diff --git a/net/isc-dhcp41-server/Makefile b/net/isc-dhcp41-server/Makefile
index a2e36c230e25..0211674451dd 100644
--- a/net/isc-dhcp41-server/Makefile
+++ b/net/isc-dhcp41-server/Makefile
@@ -5,8 +5,7 @@ DISTVERSION=	4.1-ESV
 PORTREVISION=	${DHCP_PORTREVISION}
 PORTEPOCH=	2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR=	${PORTNAME}/${DISTVERSION}-${PATCHLEVEL}
+MASTER_SITES=	ISC/${PORTNAME}/${DISTVERSION}-${PATCHLEVEL}
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	41-${SUBSYS}
 DISTFILES=	${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}${EXTRACT_SUFX}
diff --git a/net/isc-dhcp42-server/Makefile b/net/isc-dhcp42-server/Makefile
index 1527e097ddd1..ccdf5556811f 100644
--- a/net/isc-dhcp42-server/Makefile
+++ b/net/isc-dhcp42-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	dhcp
 DISTVERSION=	4.2.8
 PORTREVISION=	${DHCP_PORTREVISION}
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR=	${PORTNAME}/${DISTVERSION}
+MASTER_SITES=	ISC/${PORTNAME}/${DISTVERSION}
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	42-${SUBSYS}
 #DISTNAME=	${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}
diff --git a/net/isc-dhcp43-server/Makefile b/net/isc-dhcp43-server/Makefile
index f9b83e705761..e2084cbe568a 100644
--- a/net/isc-dhcp43-server/Makefile
+++ b/net/isc-dhcp43-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	dhcp
 DISTVERSION=	4.3.2
 PORTREVISION=	${DHCP_PORTREVISION}
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR=	${PORTNAME}/${DISTVERSION}
+MASTER_SITES=	ISC/${PORTNAME}/${DISTVERSION}
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	43-${SUBSYS}
 #DISTNAME=	${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}
diff --git a/net/jgroups/Makefile b/net/jgroups/Makefile
index d17789e1d001..ae8ef03c132a 100644
--- a/net/jgroups/Makefile
+++ b/net/jgroups/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	jgroups
 PORTVERSION=	2.12.0
 CATEGORIES=	net java
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	ale
+MASTER_SITES=	LOCAL/ale
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Java toolkit for reliable multicast communication
diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index 346d95755d88..127595a0e0f8 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	jwhois
 PORTVERSION=	4.0
 PORTREVISION=	3
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	jwhois
+MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Improved WHOIS client capable of selecting server to query
diff --git a/net/kio-upnp-ms/Makefile b/net/kio-upnp-ms/Makefile
index 85ba0843f3eb..faa24c34db1d 100644
--- a/net/kio-upnp-ms/Makefile
+++ b/net/kio-upnp-ms/Makefile
@@ -5,10 +5,8 @@ PORTNAME=	kio-upnp-ms
 DISTVERSION=	1.0.0.git20110808
 PORTREVISION=	5
 CATEGORIES=	net devel
-#MASTER_SITES=	${MASTER_SITE_KDE}
-#MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	fluffy
+#MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
+MASTER_SITES=	LOCAL/fluffy
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KIO slave to access UPnP MediaServers
diff --git a/net/kippo/Makefile b/net/kippo/Makefile
index 23ef5977b0d0..df73422c5768 100644
--- a/net/kippo/Makefile
+++ b/net/kippo/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	kippo
 PORTVERSION=	0.8
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Medium interaction ssh honeypot
diff --git a/net/libkfbapi/Makefile b/net/libkfbapi/Makefile
index c850a657ef57..6b44aed18447 100644
--- a/net/libkfbapi/Makefile
+++ b/net/libkfbapi/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	libkfbapi
 PORTVERSION=	1.0
 PORTREVISION=	3
 CATEGORIES=	net kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/libkfbapi/${PORTVERSION}/src
+MASTER_SITES=	KDE/stable/libkfbapi/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/net/libproxy/Makefile b/net/libproxy/Makefile
index 381eb171560c..dba367086f7f 100644
--- a/net/libproxy/Makefile
+++ b/net/libproxy/Makefile
@@ -6,7 +6,7 @@ PORTNAME=	libproxy
 PORTVERSION=	0.4.6
 PORTREVISION?=	0
 CATEGORIES?=	net devel
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT?=	Library that provides automatic proxy configuration management
diff --git a/net/lvwimax/Makefile b/net/lvwimax/Makefile
index 52092778c8e6..af3ea382c53e 100644
--- a/net/lvwimax/Makefile
+++ b/net/lvwimax/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	lvwimax
 PORTVERSION=	0.1
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.wart.ru/pub/download/ \
-		${MASTER_SITE_LOCAL}
+MASTER_SITES=	ftp://ftp.wart.ru/pub/download/
 
 MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	Userland driver for Samsung WiMAX modems
diff --git a/net/mopd/Makefile b/net/mopd/Makefile
index b87d0d9897c4..4005bc30edcf 100644
--- a/net/mopd/Makefile
+++ b/net/mopd/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	mopd
 PORTVERSION=	2.5.3
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	obrien
+MASTER_SITES=	LOCAL/obrien
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
diff --git a/net/msend/Makefile b/net/msend/Makefile
index 359cc828e2b9..880e2643237b 100644
--- a/net/msend/Makefile
+++ b/net/msend/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	msend
 PORTVERSION=	3.0
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	markp
+MASTER_SITES=	LOCAL/markp
 
 MAINTAINER=	gd.workbox@gmail.com
 COMMENT=	Client and server for the RFC1312 message protocol
diff --git a/net/nc/Makefile b/net/nc/Makefile
index 610cdb226d8f..9c195223dbb8 100644
--- a/net/nc/Makefile
+++ b/net/nc/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	nc
 PORTVERSION=	1.0.1
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	utils/file
+MASTER_SITES=	SUNSITE/utils/file
 DISTNAME=	ncat-${PORTVERSION}
 
 MAINTAINER=	lx@redundancy.redundancy.org
diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile
index 651aaef59a5b..7c559931c224 100644
--- a/net/netatalk3/Makefile
+++ b/net/netatalk3/Makefile
@@ -7,7 +7,6 @@ PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	SF
-#MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}/3.1
 PKGNAMESUFFIX=	3
 
 MAINTAINER=	marcus@FreeBSD.org
diff --git a/net/netcat/Makefile b/net/netcat/Makefile
index 643dcf904297..0d554e51f90e 100644
--- a/net/netcat/Makefile
+++ b/net/netcat/Makefile
@@ -10,8 +10,7 @@ DISTNAME=	nc${PORTVERSION:S/.//}
 EXTRACT_SUFX=	.tgz
 
 #PATCH_SITES=	ftp://sith.mimuw.edu.pl/pub/users/baggins/IPv6/
-PATCH_SITES=	${MASTER_SITE_GENTOO}
-PATCH_SITE_SUBDIR=	distfiles
+PATCH_SITES=	GENTOO
 PATCHFILES=	nc-v6-20000918.patch.gz
 PATCH_DIST_STRIP=	-p1
 
diff --git a/net/netembryo/Makefile b/net/netembryo/Makefile
index 683bd1a41e41..b2474f4963ca 100644
--- a/net/netembryo/Makefile
+++ b/net/netembryo/Makefile
@@ -5,10 +5,9 @@ PORTNAME=	netembryo
 PORTVERSION=	0.1.1
 PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=		${MASTER_SITE_LOCAL} \
+MASTER_SITES=		LOCAL/rakuco \
 			http://pkgs.fedoraproject.org/repo/pkgs/netembryo/netembryo-0.1.1.tar.bz2/d5a3c96b37fe3e4fb1c49df1f7a4a16f/ \
 			http://lscube.org/files/downloads/netembryo/
-MASTER_SITE_SUBDIR=	rakuco
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Network abstraction library
diff --git a/net/netpipes/Makefile b/net/netpipes/Makefile
index 4c24f2890eff..92a250050953 100644
--- a/net/netpipes/Makefile
+++ b/net/netpipes/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	netpipes
 PORTVERSION=	4.2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=kris
+MASTER_SITES=	LOCAL/kris
 DISTNAME=	netpipes-4.2-export
 
 MAINTAINER=	doconnor@gsoft.com.au
diff --git a/net/netselect/Makefile b/net/netselect/Makefile
index dd047898198a..3813ecd0fed7 100644
--- a/net/netselect/Makefile
+++ b/net/netselect/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	netselect
 PORTVERSION=	0.3
 CATEGORIES=	net
 MASTER_SITES=	http://apenwarr.ca/netselect/ \
-		GENTOO/distfiles
+		GENTOO
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ultrafast implementation of ping
diff --git a/net/ntraceroute/Makefile b/net/ntraceroute/Makefile
index a07df8afc15a..c17a8bcf761f 100644
--- a/net/ntraceroute/Makefile
+++ b/net/ntraceroute/Makefile
@@ -5,9 +5,8 @@ PORTNAME=	ntraceroute
 PORTVERSION=	6.4.2
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_NETBSD} \
+MASTER_SITES=	NETBSD/traceroute-nanog \
 		http://mirrors.rit.edu/zi/
-MASTER_SITE_SUBDIR=	traceroute-nanog
 DISTNAME=	traceroute.c
 EXTRACT_SUFX=
 DIST_SUBDIR=	${PORTNAME}
diff --git a/net/openbgpd/Makefile b/net/openbgpd/Makefile
index 73b5e853dfdb..c94b12bd3676 100644
--- a/net/openbgpd/Makefile
+++ b/net/openbgpd/Makefile
@@ -4,10 +4,8 @@ PORTNAME=	openbgpd
 PORTVERSION=	5.2.20121209
 PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_OPENBSD}
-MASTER_SITE_SUBDIR=	OpenBGPD
+MASTER_SITES=	OPENBSD/OpenBGPD
 DISTNAME=	${PORTNAME}-4.6
-EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	hrs@FreeBSD.org
@@ -19,7 +17,7 @@ LICENSE_FILE=	${FILESDIR}/COPYING
 CONFLICTS=	zebra-[0-9]* quagga-[0-9]*
 
 WRKSRC=		${WRKDIR}
-USES=		uidfix
+USES=		uidfix tar:tgz
 USE_RC_SUBR=	${PORTNAME}
 PLIST_FILES=	sbin/bgpctl sbin/bgpd man/man5/bgpd.conf.5.gz \
 		man/man8/bgpctl.8.gz man/man8/bgpd.8.gz
diff --git a/net/opendpi/Makefile b/net/opendpi/Makefile
index 09e7965e3237..d6178f432fb0 100644
--- a/net/opendpi/Makefile
+++ b/net/opendpi/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	opendpi
 PORTVERSION=	1.2.0
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	fernando@netfilter.com.br
 COMMENT=	Open source deep packet inspection engine
diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
index 21b25af11eea..48d71604a156 100644
--- a/net/openntpd/Makefile
+++ b/net/openntpd/Makefile
@@ -5,8 +5,7 @@ PORTVERSION=	5.7p4
 PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_OPENBSD}
-MASTER_SITE_SUBDIR=	OpenNTPD
+MASTER_SITES=	OPENBSD/OpenNTPD
 
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Network Time Protocol (NTP) daemon
diff --git a/net/ostinato/Makefile b/net/ostinato/Makefile
index d9847073425c..7c628807bb05 100644
--- a/net/ostinato/Makefile
+++ b/net/ostinato/Makefile
@@ -5,8 +5,8 @@ PORTNAME=	ostinato
 PORTVERSION=	0.5.1
 PORTREVISION=	2
 CATEGORIES=	net security
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-DISTNAME=	${PORTNAME}-src-${PORTVERSION}${EXTRACTSUFFIX}
+MASTER_SITES=	GOOGLE_CODE
+DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	zeising@FreeBSD.org
 COMMENT=	Packet crafter/generator and analyzer with friendly GUI
diff --git a/net/p5-Net-CascadeCopy/Makefile b/net/p5-Net-CascadeCopy/Makefile
index 9596a3816c81..ace270592e93 100644
--- a/net/p5-Net-CascadeCopy/Makefile
+++ b/net/p5-Net-CascadeCopy/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.2.6
 PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Net
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net/p5-Net-GrowlClient/Makefile b/net/p5-Net-GrowlClient/Makefile
index f69a58c48e83..b40a01b0cea3 100644
--- a/net/p5-Net-GrowlClient/Makefile
+++ b/net/p5-Net-GrowlClient/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.02
 PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Net
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	markun@onohara.to
diff --git a/net/p5-Net-IRR/Makefile b/net/p5-Net-IRR/Makefile
index ce563c38025a..1e87e1da502a 100644
--- a/net/p5-Net-IRR/Makefile
+++ b/net/p5-Net-IRR/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.08
 PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Net
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net/p5-Net-Proxy/Makefile b/net/p5-Net-Proxy/Makefile
index 6026869bd572..0b67968f1169 100644
--- a/net/p5-Net-Proxy/Makefile
+++ b/net/p5-Net-Proxy/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.13
 PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Net
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jadawin@FreeBSD.org
diff --git a/net/p5-Net-Trackback/Makefile b/net/p5-Net-Trackback/Makefile
index 2ca11c00a401..4a39d162ef04 100644
--- a/net/p5-Net-Trackback/Makefile
+++ b/net/p5-Net-Trackback/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	1.01
 PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Net
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	coryking@mozimedia.com
diff --git a/net/p5-POE-Component-PubSub/Makefile b/net/p5-POE-Component-PubSub/Makefile
index cb5451c6ad37..c91515044078 100644
--- a/net/p5-POE-Component-PubSub/Makefile
+++ b/net/p5-POE-Component-PubSub/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.05
 PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
-#MASTER_SITE_SUBDIR=	CPAN:nperez
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net/p5-PlRPC/Makefile b/net/p5-PlRPC/Makefile
index 9e2b2fe35efa..9ee1ab2448ea 100644
--- a/net/p5-PlRPC/Makefile
+++ b/net/p5-PlRPC/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	PlRPC
 PORTVERSION=	0.2020
 PORTREVISION=	2
 CATEGORIES=	net perl5
-MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	RPC
+MASTER_SITES=	CPAN/RPC
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net/p5-Samba-LDAP/Makefile b/net/p5-Samba-LDAP/Makefile
index 9d6b26320fc6..6bbb25acb376 100644
--- a/net/p5-Samba-LDAP/Makefile
+++ b/net/p5-Samba-LDAP/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.05
 PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Samba
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net/p5-Socks/Makefile b/net/p5-Socks/Makefile
index 7229236b12ad..2e0e3d5afe6d 100644
--- a/net/p5-Socks/Makefile
+++ b/net/p5-Socks/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	SOCKS
 PORTVERSION=	0.03
 PORTREVISION=	1
 CATEGORIES=	net perl5
-MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN/Net
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/net/pload/Makefile b/net/pload/Makefile
index afc252a43542..fe990c064581 100644
--- a/net/pload/Makefile
+++ b/net/pload/Makefile
@@ -5,9 +5,8 @@ PORTNAME=	pload
 PORTVERSION=	0.9.5
 PORTREVISION=	4
 CATEGORIES=	net sysutils
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
+MASTER_SITES=	LOCAL/pav \
 		http://opal.com/jr/freebsd/ports/net/pload/
-MASTER_SITE_SUBDIR=	pav
 
 MAINTAINER=	fbsd@opal.com
 COMMENT=	X11 program to display network traffic graphs
diff --git a/net/py-amqplib/Makefile b/net/py-amqplib/Makefile
index 4b19fed0af5a..9c37bb984631 100644
--- a/net/py-amqplib/Makefile
+++ b/net/py-amqplib/Makefile
@@ -5,17 +5,16 @@ PORTNAME=	amqplib
 PORTVERSION=	1.0.2
 PORTREVISION=	1
 CATEGORIES=	net python
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
+MASTER_SITES=	GOOGLE_CODE \
 		CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	AMQP Client Library
 
 PROJECTHOST=	py-amqplib
 
-USES=		python
+USES=		python tar:tgz
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/net/py-ndg_httpsclient/Makefile b/net/py-ndg_httpsclient/Makefile
index dd61ff337a94..9c327baf943f 100644
--- a/net/py-ndg_httpsclient/Makefile
+++ b/net/py-ndg_httpsclient/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	ndg_httpsclient
 PORTVERSION=	0.3.3
 CATEGORIES=	net python
-MASTER_SITES=	CHEESESHOP
-MASTER_SITE_SUBDIR=	source/${DISTNAME:C/(.).*/\1/}/${PORTNAME:S/_/-/}
+MASTER_SITES=	CHEESESHOP/source/${DISTNAME:C/(.).*/\1/}/${PORTNAME:S/_/-/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	olivierd@FreeBSD.org
diff --git a/net/py-pypcap/Makefile b/net/py-pypcap/Makefile
index e00f43a451b5..f2edbd65f899 100644
--- a/net/py-pypcap/Makefile
+++ b/net/py-pypcap/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	pypcap
 PORTVERSION=	1.1
 PORTREVISION=	5
 CATEGORIES=	net python
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wxs@FreeBSD.org
diff --git a/net/py-pyvmomi/Makefile b/net/py-pyvmomi/Makefile
index 38c94f58de9c..5237008e8273 100644
--- a/net/py-pyvmomi/Makefile
+++ b/net/py-pyvmomi/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	pyvmomi
 DISTVERSION=	5.5.0-2014.1.1
 CATEGORIES=	net python
-MASTER_SITES=	CHEESESHOP
-MASTER_SITE_SUBDIR=	source/p/${PORTNAME}
+MASTER_SITES=	CHEESESHOP/source/p/${PORTNAME}
 
 MAINTAINER=	robak@FreeBSD.org
 COMMENT=	Python SDK for the VMware vSphere API of ESX, ESXi, and vCenter
diff --git a/net/rinetd/Makefile b/net/rinetd/Makefile
index e46f8d107a67..a3569fc8d134 100644
--- a/net/rinetd/Makefile
+++ b/net/rinetd/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	0.62
 PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://www.boutell.com/rinetd/http/ \
-		${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR=	distfiles
+		GENTOO
 DISTNAME=	rinetd
 
 MAINTAINER=	garga@FreeBSD.org
diff --git a/net/rsync-bpc/Makefile b/net/rsync-bpc/Makefile
index 359f334996d8..9674e0be496e 100644
--- a/net/rsync-bpc/Makefile
+++ b/net/rsync-bpc/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	rsync-bpc
 PORTVERSION=	3.0.9.3
 CATEGORIES=	net
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	backuppc/backuppc-beta/4.0.0alpha3
+MASTER_SITES=	SF/backuppc/backuppc-beta/4.0.0alpha3
 
 MAINTAINER=	moiseev@mezonplus.ru
 COMMENT=	Modified rsync that used as part of BackupPC
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index d242a1e23616..73df13a77e88 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -5,13 +5,12 @@ PORTNAME=	rsync
 PORTVERSION=	3.1.1
 PORTREVISION=	3
 CATEGORIES=	net ipv6
-MASTER_SITES=	http://rsync.samba.org/ftp/%SUBDIR%/ \
-		ftp://ftp.samba.org/pub/%SUBDIR%/ \
-		ftp://ftp.sunet.se/pub/unix/admin/%SUBDIR%/  \
-		ftp://ftp.fu-berlin.de/pub/unix/network/%SUBDIR%/ \
+MASTER_SITES=	http://rsync.samba.org/ftp/rsync/ \
+		ftp://ftp.samba.org/pub/rsync/ \
+		ftp://ftp.sunet.se/pub/unix/admin/rsync/  \
+		ftp://ftp.fu-berlin.de/pub/unix/network/rsync/ \
 		http://www.mirrorservice.org/sites/rsync.samba.org/ \
 		LOCAL/ehaupt/rsync
-MASTER_SITE_SUBDIR=	rsync
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/net/samba36/Makefile b/net/samba36/Makefile
index 09b88eb3c71a..feb64d8dd3b3 100644
--- a/net/samba36/Makefile
+++ b/net/samba36/Makefile
@@ -4,8 +4,7 @@ PORTNAME=		${SAMBA_BASENAME}36
 PORTVERSION=		3.6.25
 PORTREVISION?=		0
 CATEGORIES?=		net
-MASTER_SITES=		${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR=	samba samba/stable samba/pre
+MASTER_SITES=		SAMBA/samba SAMBA/samba/stable SAMBA/samba/pre
 DISTNAME=		${SAMBA_BASENAME}-${PORTVERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 MAINTAINER?=		timur@FreeBSD.org
diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 519520315b58..994d30840ef3 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -5,8 +5,7 @@ PORTNAME?=		${SAMBA4_BASENAME}4
 PORTVERSION?=		${SAMBA4_VERSION}
 PORTREVISION?=		0
 CATEGORIES?=		net
-MASTER_SITES=		${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR=	samba/stable samba/rc
+MASTER_SITES=		SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=		${SAMBA4_DISTNAME}
 
 MAINTAINER?=		timur@FreeBSD.org
diff --git a/net/samba41/Makefile b/net/samba41/Makefile
index b6ab84cbf242..37dd8e20eec3 100644
--- a/net/samba41/Makefile
+++ b/net/samba41/Makefile
@@ -5,8 +5,7 @@ PORTNAME?=		${SAMBA4_BASENAME}41
 PORTVERSION?=		${SAMBA4_VERSION}
 PORTREVISION?=		0
 CATEGORIES?=		net
-MASTER_SITES=		${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR=	samba/stable samba/rc
+MASTER_SITES=		SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=		${SAMBA4_DISTNAME}
 
 MAINTAINER?=		timur@FreeBSD.org
diff --git a/net/samplicator/Makefile b/net/samplicator/Makefile
index 7dd46743a61c..facbba891517 100644
--- a/net/samplicator/Makefile
+++ b/net/samplicator/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	samplicator
 PORTVERSION=	1.3.7.b6
 PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-MASTER_SITE_SUBDIR=	samplicator
+MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	samplicator-1.3.7-beta6
 
 MAINTAINER=	me@falz.net
diff --git a/net/smb4k-kde4/Makefile b/net/smb4k-kde4/Makefile
index 9d2d7a502536..18cc69ef2134 100644
--- a/net/smb4k-kde4/Makefile
+++ b/net/smb4k-kde4/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	smb4k-kde4
 PORTVERSION=	0.10.9
 PORTREVISION=	11
 CATEGORIES=	net kde
-MASTER_SITES=	${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR=	smb4k
+MASTER_SITES=	SF/smb4k
 DISTNAME=	smb4k-${PORTVERSION}
 
 MAINTAINER=	jpaetzel@FreeBSD.org
diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile
index 84c9ea624461..ff57a0f63e13 100644
--- a/net/sniffit/Makefile
+++ b/net/sniffit/Makefile
@@ -8,9 +8,8 @@ CATEGORIES=	net security
 MASTER_SITES=	http://www.mavetju.org/download/adopted/
 DISTNAME=	sniffit.0.3.7.beta
 
-PATCH_SITES=	${MASTER_SITE_DEBIAN_POOL} \
-		http://www.mavetju.org/download/adopted/:patches
-PATCHFILES=	sniffit_0.3.7.beta-10.diff.gz:patches
+PATCH_SITES=	http://www.mavetju.org/download/adopted/
+PATCHFILES=	sniffit_0.3.7.beta-10.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	edwin@mavetju.org
diff --git a/net/stf-6rd-kmod/Makefile b/net/stf-6rd-kmod/Makefile
index 88af8a749ef5..e70649ddc953 100644
--- a/net/stf-6rd-kmod/Makefile
+++ b/net/stf-6rd-kmod/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	stf
 PORTVERSION=	0.${SVN_REV}
 CATEGORIES=	net ipv6
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	kuriyama
+MASTER_SITES=	LOCAL/kuriyama
 PKGNAMESUFFIX=	-6rd-kmod
 DISTNAME=	freebsd-stf-${OSREL}-${PORTVERSION}
 
diff --git a/net/suckblow/Makefile b/net/suckblow/Makefile
index fbc12bb914c9..a698ba79a7a7 100644
--- a/net/suckblow/Makefile
+++ b/net/suckblow/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	suckblow
 PORTVERSION=	1.1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	archie
+MASTER_SITES=	LOCAL/archie
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Two companion utilities for transferring data over a TCP socket
diff --git a/net/tcpcat/Makefile b/net/tcpcat/Makefile
index 10f35b4453dc..83837e5f1b17 100644
--- a/net/tcpcat/Makefile
+++ b/net/tcpcat/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	tcpcat
 PORTVERSION=	1.2.0
 CATEGORIES=	net
 MASTER_SITES=	http://ess4.engr.uvic.ca/proj/tcpcat/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	roam/net
+		LOCAL/roam/net
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple utility for sending/receiving data over a TCP or a Unix-domain socket
diff --git a/net/tcpshow/Makefile b/net/tcpshow/Makefile
index 47e30b966740..463bfa91b48c 100644
--- a/net/tcpshow/Makefile
+++ b/net/tcpshow/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	tcpshow
 PORTVERSION=	1.74
 PORTREVISION=	1
 CATEGORIES=	net security
-MASTER_SITES=	LOCAL
-MASTER_SITE_SUBDIR=	obrien
+MASTER_SITES=	LOCAL/obrien
 DISTFILES=	tcpshow.c tcpshow.1
 
 MAINTAINER=	obrien@FreeBSD.org
diff --git a/net/trafshow3/Makefile b/net/trafshow3/Makefile
index 7b4dd3465ed6..0279458994c2 100644
--- a/net/trafshow3/Makefile
+++ b/net/trafshow3/Makefile
@@ -6,10 +6,8 @@ PORTVERSION=	3.1
 PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	sem
+MASTER_SITES=	LOCAL/sem
 PKGNAMESUFFIX=	3
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	Full screen visualization of network traffic (an ancient version)
@@ -21,6 +19,7 @@ CONFLICTS=	trafshow-[45].*
 LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
 .endif
 
+USES=		tar:tgz
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
diff --git a/net/tramp/Makefile b/net/tramp/Makefile
index e9d7898a5dde..763385df534b 100644
--- a/net/tramp/Makefile
+++ b/net/tramp/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	tramp
 PORTVERSION=	2.2.7
 PORTREVISION=	2
 CATEGORIES=	net elisp
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/net/tridiavnc/Makefile b/net/tridiavnc/Makefile
index 23d5dfecce6b..c86ac2e63015 100644
--- a/net/tridiavnc/Makefile
+++ b/net/tridiavnc/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	tridiavnc
 PORTVERSION=	1.4
 PORTREVISION=	5
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=dwcjr
+MASTER_SITES=	LOCAL/dwcjr
 DISTNAME=	DevVNC_unix
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/uget/Makefile b/net/uget/Makefile
index 947ae6d61393..042a2eed349b 100644
--- a/net/uget/Makefile
+++ b/net/uget/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	uget
 PORTVERSION=	2.0
 CATEGORIES=	net
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	urlget/${PORTNAME}%20%28stable%29/${PORTVERSION}
+MASTER_SITES=	SF/urlget/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
 MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Download manager application
diff --git a/net/vblade/Makefile b/net/vblade/Makefile
index aea4d9c0bf7d..214ca0110d83 100644
--- a/net/vblade/Makefile
+++ b/net/vblade/Makefile
@@ -5,9 +5,7 @@ PORTNAME=	vblade
 PORTVERSION=	21
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	aoetools/${PORTNAME}/${PORTVERSION}
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	SF/aoetools/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	Virtual EtherDrive(R) blade AoE target
@@ -18,6 +16,7 @@ MAKE_ARGS=	PLATFORM=freebsd\
 		INSTALL_MAN="${INSTALL_MAN}"
 MAKEFILE=	makefile
 ALL_TARGET=
+USES=		tar:tgz
 
 PLIST_FILES=	sbin/vblade sbin/vbladed man/man8/vblade.8.gz
 
diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 817f81ce37af..60a21681d4ef 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -42,8 +42,7 @@ BROKEN=		Does not compile on arm
 .endif
 
 .if ${PORT_OPTIONS:MSERVER}
-MASTER_SITES+=	${MASTER_SITE_XORG:S/$/:x/}
-MASTER_SITE_SUBDIR+=	4.3.0/:x
+MASTER_SITES+=	XORG/4.3.0/:x
 DISTFILES+=	X430src-1.tgz:x \
 		X430src-2.tgz:x \
 		X430src-3.tgz:x
diff --git a/net/wmnd/Makefile b/net/wmnd/Makefile
index 8862edd6cfa0..060b581f6434 100644
--- a/net/wmnd/Makefile
+++ b/net/wmnd/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	wmnd
 PORTVERSION=	0.4.17
 CATEGORIES=	net
 MASTER_SITES=	http://www.thregr.org/~wavexx/software/wmnd/releases/
-MASTER_SITE_SUBDIR=	distfiles
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Improved network monitoring dock app (with tons of features)
diff --git a/net/wmnet/Makefile b/net/wmnet/Makefile
index 7a855397df31..8da67bd6b3ad 100644
--- a/net/wmnet/Makefile
+++ b/net/wmnet/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	1.2
 PORTREVISION=	3
 CATEGORIES=	net windowmaker
 MASTER_SITES=	ftp://ftp.enteract.com/users/rneswold/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	novel
+		LOCAL/novel
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Network bandwidth monitor intended for the WindowMaker dock
diff --git a/net/wmwifi/Makefile b/net/wmwifi/Makefile
index 16a4330dc549..654eece11668 100644
--- a/net/wmwifi/Makefile
+++ b/net/wmwifi/Makefile
@@ -7,8 +7,7 @@ DISTVERSIONSUFFIX=-bsd
 PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://digitalssg.net/debian/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	uqs
+		LOCAL/uqs
 
 MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	Dockapp displaying the signal strength of WiFi connection
diff --git a/net/xpvm/Makefile b/net/xpvm/Makefile
index 099f4c0aaed1..78fc2caedac7 100644
--- a/net/xpvm/Makefile
+++ b/net/xpvm/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	xpvm
 PORTVERSION=	1.2.5
 PORTREVISION=	4
 CATEGORIES=	net parallel
-MASTER_SITES=	NL
-MASTER_SITE_SUBDIR=	pvm3/xpvm
+MASTER_SITES=	NL/pvm3/xpvm
 DISTNAME=	XPVM.src.${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/yconalyzer/Makefile b/net/yconalyzer/Makefile
index 06e3595886aa..d6593b35dae6 100644
--- a/net/yconalyzer/Makefile
+++ b/net/yconalyzer/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	yconalyzer
 PORTVERSION=	1.0.4
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	TCP Traffic Analyzer
author	mat <mat@FreeBSD.org>	2015-05-14 18:15:04 +0800
committer	mat <mat@FreeBSD.org>	2015-05-14 18:15:04 +0800
commit	d72353c225a0cff8478c442d745a54e4630671fc (patch)
tree	627649ff7699a289d5d78c11bf8d105881402ca8 /net
parent	7790dd541328e5000ba710fc478bc5f22ab41cc6 (diff)
download	freebsd-ports-gnome-d72353c225a0cff8478c442d745a54e4630671fc.tar.gz freebsd-ports-gnome-d72353c225a0cff8478c442d745a54e4630671fc.tar.zst freebsd-ports-gnome-d72353c225a0cff8478c442d745a54e4630671fc.zip