12 files changed, 12 insertions, 25 deletions

diff --git a/editors/beav/Makefile b/editors/beav/Makefile
index f9cfd4a37146..64dfe7cad74d 100644
--- a/editors/beav/Makefile
+++ b/editors/beav/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	beav
 PORTVERSION=	1.40.15
 CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=	pool/main/b/beav
+MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION:R}-${PORTVERSION:E}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/ftp/wget-devel/Makefile b/ftp/wget-devel/Makefile
index 3785f9a45f57..904cd6b33280 100644
--- a/ftp/wget-devel/Makefile
+++ b/ftp/wget-devel/Makefile
@@ -12,8 +12,7 @@ CATEGORIES=	ftp www ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	wget
 
-PATCH_SITES=	${MASTER_SITE_DEBIAN}
-PATCH_SITE_SUBDIR=	pool/main/w/wget
+PATCH_SITES=	${MASTER_SITE_DEBIAN_POOL}
 PATCHFILES=	wget_${PORTVERSION}-10.diff.gz
 PATCH_DIST_STRIP=	-p1
 
diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile
index 3785f9a45f57..904cd6b33280 100644
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@@ -12,8 +12,7 @@ CATEGORIES=	ftp www ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	wget
 
-PATCH_SITES=	${MASTER_SITE_DEBIAN}
-PATCH_SITE_SUBDIR=	pool/main/w/wget
+PATCH_SITES=	${MASTER_SITE_DEBIAN_POOL}
 PATCHFILES=	wget_${PORTVERSION}-10.diff.gz
 PATCH_DIST_STRIP=	-p1
 
diff --git a/games/an/Makefile b/games/an/Makefile
index 5c4686000c4f..380c07b4937f 100644
--- a/games/an/Makefile
+++ b/games/an/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	an
 PORTVERSION=	0.95
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=	pool/main/a/an
+MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/games/xjump/Makefile b/games/xjump/Makefile
index d03149679962..cd0966ff8e35 100644
--- a/games/xjump/Makefile
+++ b/games/xjump/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	xjump
 PORTVERSION=	2.7.5
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=	pool/main/x/xjump
+MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/graphics/panorama/Makefile b/graphics/panorama/Makefile
index df825a2dc663..db7f27e1a921 100644
--- a/graphics/panorama/Makefile
+++ b/graphics/panorama/Makefile
@@ -9,12 +9,10 @@ PORTNAME=	panorama
 PORTVERSION=	0.13.2
 PORTREVISION=	1
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=	pool/main/p/panorama
+MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 PATCH_SITES=	${MASTER_SITES}
-PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
 PATCHFILES=	${PORTNAME}_${PORTVERSION}-2.1.diff.gz
 PATCH_DIST_STRIP=	-p1
 
diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile
index 818bbc001d89..1b661a7f8f8a 100644
--- a/mail/ssmtp/Makefile
+++ b/mail/ssmtp/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	ssmtp
 PORTVERSION=	2.60.3
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=	pool/main/s/${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/misc/mime-support/Makefile b/misc/mime-support/Makefile
index 7aa4388ae2d5..16cb7dc128b4 100644
--- a/misc/mime-support/Makefile
+++ b/misc/mime-support/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	mime-support
 PORTVERSION=	3.21.1
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=	pool/main/${PORTNAME:C/^(.).*$/\1/}/${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION:C/(.*)\.([^.])/\1-\2/}
 
 MAINTAINER=	corecode@corecode.ath.cx
diff --git a/multimedia/vcdtools/Makefile b/multimedia/vcdtools/Makefile
index b7476fa4c1c0..19834e8cad21 100644
--- a/multimedia/vcdtools/Makefile
+++ b/multimedia/vcdtools/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	vcdtools
 PORTVERSION=	0.4
 PORTREVISION=	1
 CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=	pool/main/v/vcdtools
+MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile
index 632cc07f2868..23e3a0f7edf8 100644
--- a/net/sniffit/Makefile
+++ b/net/sniffit/Makefile
@@ -15,8 +15,7 @@ MASTER_SITES=	http://reptile.rug.ac.be/~coder/sniffit/files/  \
 MASTER_SITE_SUBDIR=	obrien
 DISTNAME=	sniffit.0.3.7.beta
 
-PATCH_SITES=	${MASTER_SITE_DEBIAN}
-PATCH_SITE_SUBDIR=	pool/main/s/sniffit
+PATCH_SITES=	${MASTER_SITE_DEBIAN_POOL}
 PATCHFILES=	sniffit_0.3.7.beta-6.1.diff.gz
 PATCH_DIST_STRIP=	-p1
 
diff --git a/x11/gvid/Makefile b/x11/gvid/Makefile
index eecfda02320f..b386f6672daa 100644
--- a/x11/gvid/Makefile
+++ b/x11/gvid/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	gvid
 PORTVERSION=	0.3
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=	pool/main/g/gvid
+MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index 2d58b41c8989..a949a9dabfdb 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -14,8 +14,7 @@ PORTVERSION=	${VERSION}.${REVISION}
 CATEGORIES=	x11 graphics
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	${PORTNAME}.${VERSION}
-PATCH_SITES=	${MASTER_SITE_DEBIAN}
-PATCH_SITE_SUBDIR=	pool/main/x/xloadimage
+PATCH_SITES=	${MASTER_SITE_DEBIAN_POOL}
 PATCHFILES=	xloadimage_${VERSION}-${REVISION}.diff.gz
 PATCH_DIST_STRIP= -p1