aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2000-06-29 15:03:02 +0800
committerobrien <obrien@FreeBSD.org>2000-06-29 15:03:02 +0800
commit239ed910e11d20a20ca9157737a47cab327ce029 (patch)
tree8d204dff8bf98573d294bf1783659100df685fc0
parentf17b068fb4d12e722996a8380faf25f24f4f5bf4 (diff)
downloadfreebsd-ports-gnome-239ed910e11d20a20ca9157737a47cab327ce029.tar.gz
freebsd-ports-gnome-239ed910e11d20a20ca9157737a47cab327ce029.tar.zst
freebsd-ports-gnome-239ed910e11d20a20ca9157737a47cab327ce029.zip
Move the stragler's www.freebsd.org/~user distfiles to the offical
MASTER_SITE_LOCAL site.
-rw-r--r--archivers/nulib/Makefile4
-rw-r--r--audio/kmikmod/Makefile3
-rw-r--r--audio/kmpg/Makefile3
-rw-r--r--audio/libworkman/Makefile3
-rw-r--r--audio/rat/Makefile3
-rw-r--r--benchmarks/nttcp/Makefile3
-rw-r--r--chinese/aterm/Makefile3
-rw-r--r--comms/bpl+/Makefile3
-rw-r--r--comms/plp/Makefile3
-rw-r--r--converters/fconv/Makefile3
-rw-r--r--devel/a2dev/Makefile3
-rw-r--r--devel/cc65/Makefile3
-rw-r--r--devel/ctags/Makefile4
-rw-r--r--devel/fortran-utils/Makefile3
-rw-r--r--devel/ilu/Makefile6
-rw-r--r--devel/linux_kdump/Makefile3
-rw-r--r--editors/wemi-emacs/Makefile3
-rw-r--r--ftp/cftp/Makefile3
-rw-r--r--games/crossfire-client/Makefile3
-rw-r--r--games/crossfire-server/Makefile3
-rw-r--r--games/crossfire/Makefile3
-rw-r--r--games/libshhcards/Makefile4
-rw-r--r--games/wmtictactoe/Makefile3
-rw-r--r--graphics/ImageMagick/Makefile3
-rw-r--r--graphics/glx/Makefile334
-rw-r--r--graphics/gridpix/Makefile4
-rw-r--r--graphics/linux_glx/Makefile4
-rw-r--r--graphics/opengl-man/Makefile4
-rw-r--r--graphics/xmovie/Makefile3
-rw-r--r--graphics/xv/Makefile3
-rw-r--r--japanese/gicq/Makefile6
-rw-r--r--japanese/jls/Makefile3
-rw-r--r--japanese/kterm/Makefile4
-rw-r--r--japanese/lambdamoo/Makefile3
-rw-r--r--japanese/libicq/Makefile3
-rw-r--r--japanese/linux_locale/Makefile3
-rw-r--r--japanese/lynx-current/Makefile3
-rw-r--r--japanese/mhonarc/Makefile3
-rw-r--r--japanese/micq/Makefile6
-rw-r--r--japanese/namazu/Makefile3
-rw-r--r--java/jikes/Makefile3
-rw-r--r--java/jre/Makefile3
-rw-r--r--korean/hanterm/Makefile3
-rw-r--r--lang/cmucl/Makefile3
-rw-r--r--lang/objc/Makefile4
-rw-r--r--lang/scsh/Makefile3
-rw-r--r--lang/sml-mode.el/Makefile3
-rw-r--r--mail/cyrus-imapd/Makefile3
-rw-r--r--mail/cyrus-imapd2/Makefile3
-rw-r--r--mail/cyrus-imapd22/Makefile3
-rw-r--r--mail/cyrus-imapd23/Makefile3
-rw-r--r--mail/cyrus-imapd24/Makefile3
-rw-r--r--mail/cyrus/Makefile3
-rw-r--r--mail/majorcool/Makefile3
-rw-r--r--mail/nmh/Makefile3
-rw-r--r--mail/serialmail/Makefile3
-rw-r--r--mail/wmbiff/Makefile3
-rw-r--r--mbone/rat/Makefile3
-rw-r--r--misc/44bsd-more/Makefile3
-rw-r--r--misc/cstream/Makefile3
-rw-r--r--misc/kp/Makefile3
-rw-r--r--misc/rtfm/Makefile3
-rw-r--r--misc/uk-phone/Makefile5
-rw-r--r--misc/uk-postcodes/Makefile5
-rw-r--r--misc/us-zipcodes/Makefile5
-rw-r--r--multimedia/linux-xmovie/Makefile3
-rw-r--r--multimedia/xmovie/Makefile3
-rw-r--r--net-im/gicq/Makefile3
-rw-r--r--net-mgmt/ciscoconf/Makefile3
-rw-r--r--net/ciscoconf/Makefile3
-rw-r--r--net/ggsd/Makefile3
-rw-r--r--net/gicq/Makefile3
-rw-r--r--net/macipgw/Makefile3
-rw-r--r--net/mpd-netgraph/Makefile3
-rw-r--r--net/mpd/Makefile3
-rw-r--r--net/netatalk-asun/Makefile3
-rw-r--r--net/netatalk-devel/Makefile6
-rw-r--r--net/netatalk/Makefile6
-rw-r--r--net/nttcp/Makefile3
-rw-r--r--net/ppp-nt/Makefile6
-rw-r--r--net/sharity-light/Makefile3
-rw-r--r--net/suckblow/Makefile3
-rw-r--r--news/inn-stable/Makefile3
-rw-r--r--palm/malsync/Makefile3
-rw-r--r--ports-mgmt/pib/Makefile3
-rw-r--r--print/a2ps-letter/Makefile3
-rw-r--r--print/apsfilter/Makefile3
-rw-r--r--print/apsfilter6/Makefile3
-rw-r--r--print/perlftlib/Makefile3
-rw-r--r--security/checkpassword/Makefile3
-rw-r--r--security/cyrus-sasl/Makefile3
-rw-r--r--security/cyrus-sasl2/Makefile3
-rw-r--r--security/openssh-askpass/Makefile3
-rw-r--r--security/portscanner/Makefile3
-rw-r--r--shells/44bsd-csh/Makefile3
-rw-r--r--shells/sash/Makefile3
-rw-r--r--shells/scsh/Makefile3
-rw-r--r--sysutils/44bsd-more/Makefile3
-rw-r--r--sysutils/ffsrecov/Makefile3
-rw-r--r--sysutils/glload/Makefile3
-rw-r--r--sysutils/mei/Makefile3
-rw-r--r--sysutils/mkisofs-devel/Makefile3
-rw-r--r--sysutils/mkisofs/Makefile3
-rw-r--r--sysutils/pib/Makefile3
-rw-r--r--sysutils/rdate/Makefile3
-rw-r--r--textproc/chpp/Makefile3
-rw-r--r--textproc/tkdiff/Makefile3
-rw-r--r--www/libxpg4-ns/Makefile3
-rw-r--r--www/squidtimes/Makefile3
-rw-r--r--x11-clocks/wmdate/Makefile3
-rw-r--r--x11-clocks/wmtz/Makefile3
-rw-r--r--x11-fonts/tkfont/Makefile3
-rw-r--r--x11-wm/fvwm95-i18n/Makefile6
-rw-r--r--x11-wm/libdockapp/Makefile3
-rw-r--r--x11-wm/xwmm/Makefile3
-rw-r--r--x11/wmbutton/Makefile3
116 files changed, 579 insertions, 135 deletions
diff --git a/archivers/nulib/Makefile b/archivers/nulib/Makefile
index 4b4a1d12096f..af2a83fda4c7 100644
--- a/archivers/nulib/Makefile
+++ b/archivers/nulib/Makefile
@@ -8,7 +8,9 @@
PORTNAME= nulib
PORTVERSION= 3.25
CATEGORIES= archivers
-MASTER_SITES= http://people.FreeBSD.org/~jseger/
+
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= jseger
DISTNAME= nulib325
EXTRACT_SUFX= .tar.Z
diff --git a/audio/kmikmod/Makefile b/audio/kmikmod/Makefile
index a9f45ef93653..7eda68f9d11e 100644
--- a/audio/kmikmod/Makefile
+++ b/audio/kmikmod/Makefile
@@ -8,7 +8,8 @@
PORTNAME= kmikmod
PORTVERSION= 2.04
CATEGORIES= audio kde
-MASTER_SITES= http://people.FreeBSD.org/~tom/distfiles/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= tom
MAINTAINER= tom@FreeBSD.org
diff --git a/audio/kmpg/Makefile b/audio/kmpg/Makefile
index b24236f61c74..82445a5de404 100644
--- a/audio/kmpg/Makefile
+++ b/audio/kmpg/Makefile
@@ -8,7 +8,8 @@
PORTNAME= kmpg
PORTVERSION= 0.4.3a
CATEGORIES= audio kde
-MASTER_SITES= http://people.FreeBSD.org/~tom/distfiles/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= tom
MAINTAINER= tom@FreeBSD.org
diff --git a/audio/libworkman/Makefile b/audio/libworkman/Makefile
index 85f866f9d128..c153f44de27b 100644
--- a/audio/libworkman/Makefile
+++ b/audio/libworkman/Makefile
@@ -9,7 +9,8 @@ PORTNAME= libworkman
PORTVERSION= 1.4
CATEGORIES= audio
MASTER_SITES= ftp://ftp.midwinter.com/WorkMan/SNAPSHOTS/ \
- http://people.FreeBSD.org/~jim/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= jim
DISTNAME= ${PORTNAME}-1999-06-20
MAINTAINER= jim@FreeBSD.org
diff --git a/audio/rat/Makefile b/audio/rat/Makefile
index 034e665cc84f..701628c69911 100644
--- a/audio/rat/Makefile
+++ b/audio/rat/Makefile
@@ -9,7 +9,8 @@ PORTNAME= rat
PORTVERSION= 4.0.4
CATEGORIES= mbone audio
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/4.0.4/ \
- http://people.FreeBSD.org/~cpiazza/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= cpiazza
MAINTAINER= O.Hodson@cs.ucl.ac.uk
diff --git a/benchmarks/nttcp/Makefile b/benchmarks/nttcp/Makefile
index 82552f3665f9..55eba90eabbd 100644
--- a/benchmarks/nttcp/Makefile
+++ b/benchmarks/nttcp/Makefile
@@ -9,7 +9,8 @@ PORTNAME= nttcp
PORTVERSION= 1.45
CATEGORIES= net benchmarks
MASTER_SITES= http://users.leo.org/~bartel/nttcp/ \
- http://people.FreeBSD.org/~billf/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= billf
MAINTAINER= billf@FreeBSD.org
diff --git a/chinese/aterm/Makefile b/chinese/aterm/Makefile
index 9950f9b8a398..af87dc695ce3 100644
--- a/chinese/aterm/Makefile
+++ b/chinese/aterm/Makefile
@@ -10,7 +10,8 @@ PORTVERSION= 0.3.6
CATEGORIES= chinese
MASTER_SITES= http://members.xoom.com/sashav/aterm/ \
http://www.tigr.net/afterstep/as-apps/download/aterm/ \
- http://people.FreeBSD.org/~foxfair/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= foxfair
MAINTAINER= davidyu@ken.csie.ntu.edu.tw
diff --git a/comms/bpl+/Makefile b/comms/bpl+/Makefile
index 61461eee33ef..2f17a5030cec 100644
--- a/comms/bpl+/Makefile
+++ b/comms/bpl+/Makefile
@@ -8,7 +8,8 @@
PORTNAME= bpl+
PORTVERSION= 1.0
CATEGORIES= comms
-MASTER_SITES= http://people.FreeBSD.org/~max/distfiles/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= max
DISTNAME= ${PORTNAME}
MAINTAINER= max@FreeBSD.org
diff --git a/comms/plp/Makefile b/comms/plp/Makefile
index 47b8a8f4e109..becc95b09842 100644
--- a/comms/plp/Makefile
+++ b/comms/plp/Makefile
@@ -9,7 +9,8 @@ PORTNAME= plp
PORTVERSION= 1.8
CATEGORIES= comms
MASTER_SITES= http://www.proudman51.freeserve.co.uk/psion/ \
- http://people.FreeBSD.org/~kris/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= kris
DISTNAME= ${PORTNAME}_1_8
MAINTAINER= maurice@serc.rmit.edu.au
diff --git a/converters/fconv/Makefile b/converters/fconv/Makefile
index e1f8fab04f2e..422f432bc677 100644
--- a/converters/fconv/Makefile
+++ b/converters/fconv/Makefile
@@ -8,7 +8,8 @@
PORTNAME= fconv
PORTVERSION= 0.1
CATEGORIES= converters
-MASTER_SITES= http://people.FreeBSD.org/~chris/distfiles/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= chris
MAINTAINER= chris@FreeBSD.org
diff --git a/devel/a2dev/Makefile b/devel/a2dev/Makefile
index add65852876d..7ad7bc6f4cc7 100644
--- a/devel/a2dev/Makefile
+++ b/devel/a2dev/Makefile
@@ -8,7 +8,8 @@
PORTNAME= a2dev
PORTVERSION= 1.2
CATEGORIES= devel
-MASTER_SITES= http://people.FreeBSD.org/~archie/distfiles/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= archie
EXTRACT_SUFX= .tgz
MAINTAINER= archie@whistle.com
diff --git a/devel/cc65/Makefile b/devel/cc65/Makefile
index cb4ee8ed1e76..5b54371e938b 100644
--- a/devel/cc65/Makefile
+++ b/devel/cc65/Makefile
@@ -8,10 +8,11 @@
PORTNAME= cc65
PORTVERSION= 2.4.1
CATEGORIES= devel
-MASTER_SITES= http://people.FreeBSD.org/~hoek/dists/ \
+MASTER_SITES= ${MASTER_SITE_LOCAL} \
ftp://ftp.musoftware.de/pub/uz/cc65/
# ftp://ftp.us.musoftware.de/pub/uz/cc65/
# US musoftware mirror down; main site doesn't like fetch(1)
+MASTER_SITE_SUBDIR= hoek
WRKSRC= ${WRKDIR}/cc65-2.4.1
DISTNAME= cc65-sources-2.4.1
diff --git a/devel/ctags/Makefile b/devel/ctags/Makefile
index b678417679d8..d0db5cf052f9 100644
--- a/devel/ctags/Makefile
+++ b/devel/ctags/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 3.5.2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SUNSITE}\
http://fly.hiwaay.net/~darren/archives/ \
- http://people.FreeBSD.org/~jkoshy/PORTS/
-MASTER_SITE_SUBDIR= devel/lang/c
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= devel/lang/c jkoshy
MAINTAINER= jkoshy@FreeBSD.org
diff --git a/devel/fortran-utils/Makefile b/devel/fortran-utils/Makefile
index ad66d6db26d8..f9008ef4fbf4 100644
--- a/devel/fortran-utils/Makefile
+++ b/devel/fortran-utils/Makefile
@@ -8,7 +8,8 @@
PORTNAME= fortran-utils
PORTVERSION= 1.1
CATEGORIES= devel
-MASTER_SITES= http://people.FreeBSD.org/~kris/distfiles/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= kris
MAINTAINER= kris@FreeBSD.org
diff --git a/devel/ilu/Makefile b/devel/ilu/Makefile
index cf85965f1c01..b1ca73a44ab8 100644
--- a/devel/ilu/Makefile
+++ b/devel/ilu/Makefile
@@ -10,11 +10,13 @@ PORTVERSION= 2.0a13
CATEGORIES= devel
MASTER_SITES= ftp://parcftp.xerox.com/pub/ilu/2.0a13/ \
http://www2.cons.org:8000/freebsd-distfiles/ \
- http://people.FreeBSD.org/~cracauer/freebsd-distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= cracauer
DISTNAME= ${PORTNAME}-2.0alpha13
PATCH_SITES= http://www2.cons.org:8000/freebsd-distfiles/ \
- http://people.FreeBSD.org/~cracauer/freebsd-distfiles/
+ ${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR= cracauer
PATCHFILES= ${DISTNAME}-patches.html.gz
MAINTAINER= cracauer@cons.org
diff --git a/devel/linux_kdump/Makefile b/devel/linux_kdump/Makefile
index f3b3a1c77131..a0ca4306e1ab 100644
--- a/devel/linux_kdump/Makefile
+++ b/devel/linux_kdump/Makefile
@@ -8,8 +8,9 @@
PORTNAME= linux_kdump
PORTVERSION= 1.4
CATEGORIES= devel linux
-MASTER_SITES= http://people.FreeBSD.org/~marcel/ \
+MASTER_SITES= ${MASTER_SITE_LOCAL} \
ftp://ftp.scc.nl/pub/FreeBSD/distfiles/
+MASTER_SITE_SUBDIR= marcel
MAINTAINER= marcel@FreeBSD.org
diff --git a/editors/wemi-emacs/Makefile b/editors/wemi-emacs/Makefile
index 5e93a88bc591..dac39e06031a 100644
--- a/editors/wemi-emacs/Makefile
+++ b/editors/wemi-emacs/Makefile
@@ -10,7 +10,8 @@ PORTVERSION= ${WEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jpl.org/pub/elisp/wemi/ \
${MASTER_SITE_PORTS_JP} \
- http://people.FreeBSD.org/~shige/ports/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= shige
DISTNAME= wemi-${WEMI_VER}
MAINTAINER?= shige@FreeBSD.org
diff --git a/ftp/cftp/Makefile b/ftp/cftp/Makefile
index 12eac5a274f1..3c21fe883b6d 100644
--- a/ftp/cftp/Makefile
+++ b/ftp/cftp/Makefile
@@ -9,7 +9,8 @@ PORTNAME= cftp
PORTVERSION= 0.9.3
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.giga.or.at/pub/nih/cftp/ \
- http://people.FreeBSD.org/~andy/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= andy
MAINTAINER= ports@FreeBSD.org
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index 35f2b5e140f0..c546fb9e0af6 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -8,12 +8,13 @@
PORTNAME= crossfire
PORTVERSION= ${MAJ}.${MIN}.${PL}
CATEGORIES= games
-MASTER_SITES= http://people.FreeBSD.org/~andreas/download/ \
+MASTER_SITES= ${MASTER_SITE_LOCAL} \
ftp://ftp.real-time.com/pub/games/crossfire/ \
ftp://ftp.ifi.uio.no/pub/crossfire/ \
ftp://ftp.pyramid.com/pub/crossfire/ \
ftp://ftp.sunet.se/pub/unix/games/crossfire/ \
ftp://ftp.cs.titech.ac.jp/pub/games/crossfire/
+MASTER_SITE_SUBDIR= andreas
DISTFILES= ${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
${CF_ARCH} ${CF_CLSERV}
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index 35f2b5e140f0..c546fb9e0af6 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -8,12 +8,13 @@
PORTNAME= crossfire
PORTVERSION= ${MAJ}.${MIN}.${PL}
CATEGORIES= games
-MASTER_SITES= http://people.FreeBSD.org/~andreas/download/ \
+MASTER_SITES= ${MASTER_SITE_LOCAL} \
ftp://ftp.real-time.com/pub/games/crossfire/ \
ftp://ftp.ifi.uio.no/pub/crossfire/ \
ftp://ftp.pyramid.com/pub/crossfire/ \
ftp://ftp.sunet.se/pub/unix/games/crossfire/ \
ftp://ftp.cs.titech.ac.jp/pub/games/crossfire/
+MASTER_SITE_SUBDIR= andreas
DISTFILES= ${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
${CF_ARCH} ${CF_CLSERV}
diff --git a/games/crossfire/Makefile b/games/crossfire/Makefile
index 35f2b5e140f0..c546fb9e0af6 100644
--- a/games/crossfire/Makefile
+++ b/games/crossfire/Makefile
@@ -8,12 +8,13 @@
PORTNAME= crossfire
PORTVERSION= ${MAJ}.${MIN}.${PL}
CATEGORIES= games
-MASTER_SITES= http://people.FreeBSD.org/~andreas/download/ \
+MASTER_SITES= ${MASTER_SITE_LOCAL} \
ftp://ftp.real-time.com/pub/games/crossfire/ \
ftp://ftp.ifi.uio.no/pub/crossfire/ \
ftp://ftp.pyramid.com/pub/crossfire/ \
ftp://ftp.sunet.se/pub/unix/games/crossfire/ \
ftp://ftp.cs.titech.ac.jp/pub/games/crossfire/
+MASTER_SITE_SUBDIR= andreas
DISTFILES= ${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
${CF_ARCH} ${CF_CLSERV}
diff --git a/games/libshhcards/Makefile b/games/libshhcards/Makefile
index 48417c6b5cdb..b43ccaf9f37e 100644
--- a/games/libshhcards/Makefile
+++ b/games/libshhcards/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 1.0.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://home.sol.no/~sverrehu/pub-unix/files/ \
- http://people.FreeBSD.org/~mph/distfiles/
-MASTER_SITE_SUBDIR= libs/ui
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= libs/ui mph
DISTNAME= shhcards-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/wmtictactoe/Makefile b/games/wmtictactoe/Makefile
index d68f034c617c..7d0af6ba6983 100644
--- a/games/wmtictactoe/Makefile
+++ b/games/wmtictactoe/Makefile
@@ -9,7 +9,8 @@ PORTNAME= wmtictactoe
PORTVERSION= 1.1
CATEGORIES= games windowmaker afterstep
MASTER_SITES= http://atlas.ucpel.tche.br/~acamargo/ \
- http://people.FreeBSD.org/~jim/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= jim
DISTNAME= wmtictactoe-1.1-1
MAINTAINER= jim@FreeBSD.org
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 92f7b1126dd3..3921b280adb9 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -8,13 +8,14 @@
PORTNAME= ImageMagick
PORTVERSION= 5.1.1
CATEGORIES= graphics perl5
-MASTER_SITES= http://people.FreeBSD.org/~asami/distfiles/ \
+MASTER_SITES= ${MASTER_SITE_LOCAL} \
ftp://ftp.wizards.dupont.com/pub/ImageMagick/ \
ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/ \
ftp://ftp.fifi.org/pub/ImageMagick/ \
ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/ \
ftp://ftp.ms.mff.cuni.cz/MIRRORS/ftp.wizards.dupont.com/pub/ImageMagick/ \
ftp://ftp.oce.nl/pub/Internet/audio+video/ImageMagick/
+MASTER_SITE_SUBDIR= jseger
MAINTAINER= jseger@FreeBSD.org
diff --git a/graphics/glx/Makefile b/graphics/glx/Makefile
new file mode 100644
index 000000000000..3e9aac3c54ad
--- /dev/null
+++ b/graphics/glx/Makefile
@@ -0,0 +1,334 @@
+# New ports collection makefile for: GLX
+# Date created: 13 September 1999
+# Whom: Marc E E van Woerkom <van.woerkom@netcologne.de>
+#
+# $FreeBSD$
+#
+#
+# Notes:
+#
+# . You need at least XFree86 3.3.4 (or the glx patched 3.3.3.1)!
+# This port is set up for 3.3.5
+#
+# . Mesa-3.0 has to be uninstalled before this port builds!
+# Why? Because we need to create a glx aware version.
+#
+# . This stuff has been tested with
+# - a Diamond Viper 330 (RIVA 128),
+# - a Diamond Viper 550 (RIVA TNT),
+# - and was reported to work with a Matrox G200 card
+#
+# . Glx on n-vidia's site is outdated (we have XFree86-3.3.5 now
+# so I rolled my own snapshot of the open project glx code.
+# It is slightly outdated but will be updated soon.
+#
+# . The current Mesa3 port for FreeBSD does not stop at the 'patch'
+# target, but will instead try to build X11 immediatley if XFree86
+# is not present.
+# For this version (XFree86 3.3.5 needs no patches for glx yet) we
+# ignore this wrong behaviour.
+#
+# . We need tclsh for building - the choice for tclsh 8.0 is due to
+# lack of time to include a proper selection scheme
+#
+# . You can set CHIPSET_3D appropriately in /etc/make.conf if the
+# question bugs you
+#
+
+PORTNAME= glx
+PORTVERSION= 990802
+CATEGORIES= graphics
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= 3d/XF3.3.5
+DISTFILES= ${DISTNAME}.tar.bz2 \
+ riva-x-glx.faq.bz2 \
+ Mesa-3_0.diff.bz2
+
+MAINTAINER= 3d@freebsd.org
+
+# search for tclsh, if not present build it
+BUILD_DEPENDS= tclsh8.0:${PORTSDIR}/lang/tcl80
+
+# These settings are here to make future updates to this port easier
+#PATCH_XFREE= yes
+PATCH_MESA= yes
+
+.if defined(PATCH_XFREE)
+BUILD_DEPENDS= /nonexistent:${PORTSDIR}/x11/XFree86:patch
+.endif
+.if defined(PATCH_MESA)
+BUILD_DEPENDS= /nonexistent:${PORTSDIR}/graphics/Mesa3:patch
+.endif
+
+USE_BZIP2= yes
+
+EXTRACT_ONLY= ${DISTNAME}.tar.bz2
+
+DIST_SUBDIR= glx
+
+WRKSRC= ${WRKDIR}/${DISTNAME}
+
+# I don't want to build XFree86 too soon, so don't use USE_X_PREFIX
+#USE_X_PREFIX= yes
+PREFIX= ${X11BASE}
+
+XFCONFIG= /etc/XF86Config
+
+XFREEVER= 3.3.5
+XFREEDIR= ${PORTSDIR}/x11/XFree86/work/xc
+
+MESAVER= 3.0
+MESADIR= ${PORTSDIR}/graphics/Mesa3/work/Mesa-3.0
+
+# As we ask for CHIPSET_3D if not set
+IS_INTERACTIVE= YES
+
+# comment out the following line,
+# if you want to build with Imake (Linux/alpha favours that)
+USE_AUTOCONF= yes
+GNU_CONFIGURE= yes
+
+# we support nvidia RIVA 128, TNT.. and Matrox G200/400 cards
+.if defined(CHIPSET_3D)
+.if ${CHIPSET_3D} == RIVA
+CONFIGURE_ARGS= --with-chipset=tnt
+.endif
+.if ${CHIPSET_3D} == MGA
+CONFIGURE_ARGS= --with-chipset=mga
+.endif
+.endif
+
+CONFIGURE_ARGS+= --with-mesa=${MESADIR} \
+ --with-mesa-version=mesa30 \
+ # --with-mmx-asm --with-3dnow-asm
+
+USE_GMAKE= yes
+
+.if !defined(GNU_CONFIGURE)
+USE_IMAKE= yes
+.endif
+
+.include <bsd.port.pre.mk>
+
+#
+# before 'patch'
+#
+# . apply some patches to the Mesa 3.0 distribution
+#
+pre-patch:
+.if defined(PATCH_XFREE)
+ @${ECHO} "=> Patching XFree86-${XFREEVER} for GLX .."
+ cd ${XFREEDIR}; \
+ ${PATCH} -s -f <${FILESDIR}/XFree86-3_3_5.diff
+.endif
+.if defined(PATCH_MESA)
+ @${ECHO} "=> Checking Mesa-${MESAVER} installation .."
+ @if \
+ pkg_info -e "Mesa-${MESAVER}"; \
+ then \
+ ${ECHO} "Found Mesa-${MESAVER} - please deinstall"; \
+ ${ECHO} "Aborting.."; \
+ ${FALSE} ; \
+ fi
+.if exists(${MESADIR}/../.glxpatch_done)
+ @${ECHO} "=> Mesa-${MESAVER} seems already patched for GLX .."
+.else
+ @${ECHO} "=> Patching Mesa-${MESAVER} for GLX acceleration .."
+ @${ECHO} "(ignore the rejections, as they should happen in comments only)"
+ -cd ${MESADIR}; \
+ bzcat ${DISTDIR}/${DIST_SUBDIR}/Mesa-3_0.diff.bz2 | ${PATCH} -s -f
+ ${TOUCH} ${MESADIR}/../.glxpatch_done
+.endif
+.endif
+
+#
+# before 'configure'
+#
+# . patch glx configure.in, libGL/Makefile.in,
+# serverglx/Makefile.in (yes, this is an ugly hack)
+#
+pre-configure:
+.if !defined(CHIPSET_3D) || ${CHIPSET_3D} != RIVA && ${CHIPSET_3D} != MGA
+ @${ECHO}
+ @${ECHO} You must set the variable CHIPSET_3D to 'RIVA' if you use
+ @${ECHO} a nvidia RIVA 128, 128ZX, TNT, TNT2 .. based graphics card,
+ @${ECHO} or to 'MGA' if you use a Matrox G200/G400 graphics adapter
+ @${FALSE}
+.endif
+.if defined(GNU_CONFIGURE)
+ @${ECHO} "=> Adjusting ${WRKSRC}/configure.in .."
+ @cd ${WRKSRC}; \
+ ${SED} -e 's;tclsh;tclsh8\.0;g' \
+ <configure.in >configure.in.new; \
+ ${MV} configure.in.new configure.in
+ @${ECHO} "=> Adjusting ${WRKSRC}/libGL/Makefile.in .."
+ @cd ${WRKSRC}/libGL; \
+ ${SED} -e 's;SOGLREV = 1\.0;SOGLREV = 1;' \
+ <Makefile.in >Makefile.in.new; \
+ ${MV} Makefile.in.new Makefile.in
+ @${ECHO} "=> Adjusting ${WRKSRC}/servGL/serverglx/Makefile.in .."
+ @cd ${WRKSRC}/servGL/serverglx; \
+ ${SED} -e 's;tclsh;tclsh8\.0;g' \
+ <Makefile.in >Makefile.in.new; \
+ ${MV} Makefile.in.new Makefile.in
+.endif
+
+#
+# after 'configure'
+#
+# . only for the old IMAKE style configuration
+#
+post-configure:
+.if !defined(GNU_CONFIGURE)
+ @${ECHO} "Using IMAKE"
+ @${ECHO} "=> Adjusting ${WRKSRC}/Config .."
+ @cd ${WRKSRC}; \
+ ${SED} -e 's;XSERVTOP = .*;XSERVTOP = ${XFREEDIR};' \
+ -e 's;MESATOP = .*;MESATOP = ${MESADIR};' \
+ <Config.in >Config;
+ @${ECHO} "=> Adjusting ${WRKSRC}/libGL/Imakefile .."
+ @cd ${WRKSRC}/libGL; \
+ ${SED} -e 's;tclsh;tclsh8\.0;' <Imakefile >Imakefile.new; \
+ ${MV} Imakefile.new Imakefile
+ @${ECHO} "=> Adjusting ${WRKSRC}/servGL/serverglx/Imakefile .."
+ @cd ${WRKSRC}/servGL/serverglx; \
+ ${SED} -e 's;tclsh;tclsh8\.0;' <Imakefile >Imakefile.new; \
+ ${MV} Imakefile.new Imakefile
+.endif
+
+#
+# before 'build':
+#
+# . build a glx aware Mesa lib
+# . create makefiles (old IMAKE style configuration)
+#
+pre-build:
+.if defined(PATCH_XFREE)
+ @${ECHO} "=> Building and installing XFree86-${XFREEVER} with GLX support .."
+ cd ${XFREEDIR}/../..; \
+ ${MAKE} all install
+.endif
+.if defined(PATCH_MESA)
+ @${ECHO} "=> Building and installing Mesa-${MESAVER} with GLX support .."
+ cd ${MESADIR}/../..; \
+ ${MAKE} all install
+.endif
+.if !defined(GNU_CONFIGURE)
+ @${ECHO} "=> Creating makefiles .."
+ cd ${WRKSRC}; \
+ ${XMKMF}; \
+ ${MAKE} Makefile; \
+ ${MAKE} Makefiles
+.endif
+
+#
+# before 'install':
+#
+# . check for proper installed XFree86 version (3.3.4 or higher)
+# . check for glx installation (please deinstall)
+# . check for Mesa 3.0 installtion (please deinstall)
+#
+pre-install:
+ @${ECHO} "=> Checking XFree86 installation .."
+ @if \
+ pkg_info -e "XFree86-3.3.4"; \
+ then \
+ ${ECHO} "Found XFree86 3.3.4 - this port should still work"; \
+ elif \
+ pkg_info -e "XFree86-3.3.5"; \
+ then \
+ ${ECHO} "OK, found XFree86 3.3.5 - this port should work"; \
+ elif \
+ pkg_info -e "XFree86-3.3.6"; \
+ then \
+ ${ECHO} "Found XFree86 3.3.6 - this port should work"; \
+ elif \
+ pkg_info -e "XFree86-3.3.3.1"; \
+ then \
+ ${ECHO} ""; \
+ ${ECHO} "This port will work only if your XFree86 3.3.3.1 version"; \
+ ${ECHO} "has been patched for use with glx!"; \
+ ${ECHO} ""; \
+ ${ECHO} "Visit 'http://people.FreeBSD.org/~3d' for more information"; \
+ ${ECHO} ""; \
+ ${ECHO} "(We continue with fingers crossed)"; \
+ ${ECHO} ""; \
+ else \
+ ${ECHO} ""; \
+ ${ECHO} "This port depends on having a proper version of XFree86"; \
+ ${ECHO} "installed - preferably ${XFREEVER}!"; \
+ ${ECHO} ""; \
+ ${ECHO} "Visit 'http://people.FreeBSD.org/~3d' for more information"; \
+ ${ECHO} ""; \
+ ${ECHO} "Aborting.."; \
+ ${FALSE} ; \
+ fi
+
+#
+# after 'install':
+#
+# . install some docs
+# . move old Mesa lib away (old IMAKE style configuration)
+# . check XFree86 configuration file for colordepth (RIVA only)
+# . check XFree86 configuration file for glx module
+# . give some hints
+#
+post-install:
+.if !defined(NOPORTDOCS)
+ @${ECHO} "=> Installing documentation .."
+ ${MKDIR} ${PREFIX}/share/doc/riva-glx
+ ${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/riva-x-glx.faq.bz2 ${PREFIX}/share/doc/riva-glx
+ ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/riva-glx
+ ${INSTALL_MAN} ${WRKSRC}/tested.html ${PREFIX}/share/doc/riva-glx
+
+.endif
+.if !defined(GNU_CONFIGURE)
+ @${ECHO} "=> Adjusting links .."
+ -${MV} ${X11BASE}/lib/libMesaGL.a ${X11BASE}/lib/libMesaGL.a.old
+ -${MV} ${X11BASE}/lib/libMesaGL.so.14 ${X11BASE}/lib/libMesaGL.so.14.old
+ -${LN} -s ${X11BASE}/lib/libGL.a ${X11BASE}/lib/libMesaGL.a
+ -${LN} -s ${X11BASE}/lib/libGL.so.1 ${X11BASE}/lib/libMesaGL.so.14
+.endif
+.if !defined(CHIPSET_3D) || ${CHIPSET_3D} == RIVA
+ @${ECHO} "=> Checking for \"DefaultColorDepth\" in ${XFCONFIG} .."
+ @${ECHO} ""
+ @if \
+ ${GREP} '^ *DefaultColorDepth *1[56] *$$' ${XFCONFIG}; \
+ then \
+ ${ECHO} ""; \
+ ${ECHO} "Found something."; \
+ else \
+ ${ECHO} "Nope, nothing found - please use"; \
+ ${ECHO} ""; \
+ ${ECHO} " DefaultColorDepth 16"; \
+ ${ECHO} ""; \
+ ${ECHO} "or"; \
+ ${ECHO} ""; \
+ ${ECHO} " DefaultColorDepth 15"; \
+ ${ECHO} ""; \
+ ${ECHO} "in your ${XFCONFIG} file with your RIVA card!"; \
+ fi
+.endif
+ @${ECHO} "=> Checking for Section \"Module\" in ${XFCONFIG} .."
+ @${ECHO} ""
+ @if \
+ ${GREP} -A2 '^ *Section *"Module" *$$' ${XFCONFIG} | \
+ ${GREP} -B1 -A1 '^ *Load *"glx\.so" *$$' | \
+ ${GREP} -B2 '^ *EndSection *$$' | \
+ ${GREP} -A2 '^ *Section *"Module" *$$'; \
+ then \
+ ${ECHO} ""; \
+ ${ECHO} "Looks OK to me."; \
+ else \
+ ${ECHO} "Nope, not found - please add"; \
+ ${ECHO} ""; \
+ ${ECHO} " Section \"Module\""; \
+ ${ECHO} " Load \"glx.so\""; \
+ ${ECHO} " EndSection"; \
+ ${ECHO} ""; \
+ ${ECHO} "to the end of your ${XFCONFIG} file!"; \
+ fi
+ @${ECHO} "=> Giving last advice .."
+ @${CAT} ${PKGDIR}/MESSAGE
+
+.include <bsd.port.post.mk>
diff --git a/graphics/gridpix/Makefile b/graphics/gridpix/Makefile
index 66376f00c471..9bba70bd40e5 100644
--- a/graphics/gridpix/Makefile
+++ b/graphics/gridpix/Makefile
@@ -8,8 +8,8 @@
PORTNAME= gridpix
PORTVERSION= 2.1
CATEGORIES= graphics
-MASTER_SITES= http://people.FreeBSD.org/~asami/distfiles/GridPix/
-DISTNAME= GridPix-${PORTVERSION}
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= asami/GridPix
MAINTAINER= asami@FreeBSD.org
diff --git a/graphics/linux_glx/Makefile b/graphics/linux_glx/Makefile
index 8a4c9f35ee05..a0e8b33912d6 100644
--- a/graphics/linux_glx/Makefile
+++ b/graphics/linux_glx/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: linux_glx
-# Version required: CVS
# Date created: 27 November 1999
# Whom: Marc E E van Woerkom <van.woerkom@netcologne.de>
#
@@ -9,7 +8,8 @@
PORTNAME= glx
PORTVERSION= 991127
CATEGORIES= graphics linux
-MASTER_SITES= http://people.FreeBSD.org/~3d/distfiles/glx/linux/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= 3d/glx/linux
PKGNAMEPREFIX= linux_
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
diff --git a/graphics/opengl-man/Makefile b/graphics/opengl-man/Makefile
index dd87273e1989..8da508ce8dc3 100644
--- a/graphics/opengl-man/Makefile
+++ b/graphics/opengl-man/Makefile
@@ -8,9 +8,9 @@
PORTNAME= opengl-man
PORTVERSION= 657
CATEGORIES= graphics
-MASTER_SITES= http://people.FreeBSD.org/~cracauer/freebsd-distfiles/ \
+MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://www2.cons.org:8000/freebsd-distfiles/
-
+MASTER_SITE_SUBDIR= cracauer
MAINTAINER= cracauer@cons.org
USE_BZIP2= yes
diff --git a/graphics/xmovie/Makefile b/graphics/xmovie/Makefile
index 8baa0e9db09a..1e1714552673 100644
--- a/graphics/xmovie/Makefile
+++ b/graphics/xmovie/Makefile
@@ -8,7 +8,8 @@
PORTNAME= xmovie
PORTVERSION= 1.3.1
CATEGORIES= graphics linux
-MASTER_SITES= http://people.FreeBSD.org/~imura/distfiles/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= imura
# Distfile has no version info. The original site is below.
# MASTER_SITES= http://heroine.linuxbox.com/
DISTNAME= ${PORTNAME}-i586-${PORTVERSION}
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index b953694795d1..f7610163e256 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -10,8 +10,9 @@ PORTVERSION= 3.10a
CATEGORIES+= graphics
MASTER_SITES= ftp://ftp.cis.upenn.edu/pub/xv/ \
ftp://ftp.airlab.cs.ritsumei.ac.jp/pub/X/xv-jp-extension/working/ \
- http://people.FreeBSD.org/~shige/ports/xv/ \
+ ${MASTER_SITE_LOCAL} \
http://www.yuasa.kuis.kyoto-u.ac.jp/~shige/FreeBSD/ports/xv/
+MASTER_SITE_SUBDIR= ports/xv
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${PORTNAME}${PORTVERSION:S/.//}-jp-extension-rev5.3.3.tar.gz \
croppad.patch grabpatch jp-ext-bzip2.patch longname.patch \
diff --git a/japanese/gicq/Makefile b/japanese/gicq/Makefile
index 80a93a71b89b..6c5fe586b02f 100644
--- a/japanese/gicq/Makefile
+++ b/japanese/gicq/Makefile
@@ -8,11 +8,13 @@
PORTNAME= gicq
PORTVERSION= 0.33
CATEGORIES= japanese net
-MASTER_SITES= http://people.FreeBSD.org/~flathill/distfiles/ \
+MASTER_SITES= ${MASTER_SITE_LOCAL} \
ftp://ftp.korsoft.com/pub/gicq/
+MASTER_SITE_SUBDIR= flathill
-PATCH_SITES= http://people.FreeBSD.org/~flathill/distfiles/ \
+PATCH_SITES= ${MASTER_SITE_LOCAL} \
http://www-nagao.kuee.kyoto-u.ac.jp/member/taku/soft/
+PATCH_SITE_SUBDIR= flathill
PATCHFILES= ${DISTNAME}ja.patch
PATCH_DIST_STRIP= -p1
diff --git a/japanese/jls/Makefile b/japanese/jls/Makefile
index 8d97edfc629c..bc4790bd336d 100644
--- a/japanese/jls/Makefile
+++ b/japanese/jls/Makefile
@@ -9,7 +9,8 @@ PORTNAME= ls
PORTVERSION= 0.1
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_PORTS_JP} \
- http://people.FreeBSD.org/~shige/ports/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= shige
DISTNAME= j${PORTNAME}-${PORTVERSION}
MAINTAINER= shige@FreeBSD.org
diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile
index 7e1c43594030..d8bfc5af7480 100644
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 6.2.0
CATEGORIES= japanese x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
${MASTER_SITE_PORTS_JP} \
- http://people.FreeBSD.org/~shige/ports/kterm/
-MASTER_SITE_SUBDIR= applications kterm
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= applications kterm shige/kterm
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
README.wallpaper.ja
diff --git a/japanese/lambdamoo/Makefile b/japanese/lambdamoo/Makefile
index 7c85876ecd8f..17c7ca40e056 100644
--- a/japanese/lambdamoo/Makefile
+++ b/japanese/lambdamoo/Makefile
@@ -14,7 +14,8 @@ DISTNAME= LambdaMOO-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
mnews122.tar.gz
-PATCH_SITES= http://people.FreeBSD.org/~flathill/distfiles/
+PATCH_SITES= ${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR= flathill
PATCHFILES= ja-lambdamoo-19990704.patch.gz
MAINTAINER= flathill@FreeBSD.ORG
diff --git a/japanese/libicq/Makefile b/japanese/libicq/Makefile
index 6efdedc4784f..bbf716dd2c58 100644
--- a/japanese/libicq/Makefile
+++ b/japanese/libicq/Makefile
@@ -10,8 +10,9 @@ PORTVERSION= 0.33
CATEGORIES= japanese net
MASTER_SITES= ftp://ftp.korsoft.com/pub/gicq/
-PATCH_SITES= http://people.FreeBSD.org/~flathill/distfiles/ \
+PATCH_SITES= ${MASTER_SITE_LOCAL} \
http://www-nagao.kuee.kyoto-u.ac.jp/member/taku/soft/
+PATCH_SITE_SUBDIR= flathill
PATCHFILES= ${DISTNAME}ja.patch
PATCH_DIST_STRIP= -p1
diff --git a/japanese/linux_locale/Makefile b/japanese/linux_locale/Makefile
index db5a4062d1d0..ebe47515976c 100644
--- a/japanese/linux_locale/Makefile
+++ b/japanese/linux_locale/Makefile
@@ -9,7 +9,8 @@ PORTNAME= linux_locale
PORTVERSION= ${VERSION}.0
CATEGORIES= japanese emulators linux
MASTER_SITES= ftp://ftp.debian.org/debian/dists/potato/main/source/admin/ \
- http://people.FreeBSD.org/~imura/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= imura
DISTNAME= locale-ja_${VERSION}
MAINTAINER= imura@FreeBSD.org
diff --git a/japanese/lynx-current/Makefile b/japanese/lynx-current/Makefile
index 335a65546d4d..07d38c228578 100644
--- a/japanese/lynx-current/Makefile
+++ b/japanese/lynx-current/Makefile
@@ -9,8 +9,9 @@ PORTNAME= lynx
PORTVERSION= ${VERSION}.${MINOR_VERSION:S/.//}
CATEGORIES= japanese www
MASTER_SITES= ${MASTER_SITE_PORTS_JP} \
- http://people.FreeBSD.org/~shige/ports/distfiles/ \
+ ${MASTER_SITE_LOCAL} \
http://sol.slcc.edu/lynx/current/
+MASTER_SITE_SUBDIR= shige
DISTNAME= ${PORTNAME}${VERSION}${MINOR_VERSION}
diff --git a/japanese/mhonarc/Makefile b/japanese/mhonarc/Makefile
index 1afe1f60437e..b0c367cc0d2c 100644
--- a/japanese/mhonarc/Makefile
+++ b/japanese/mhonarc/Makefile
@@ -14,7 +14,8 @@ MASTER_SITES= http://www.oac.uci.edu/indiv/ehood/tar/ \
ftp://ftp.plig.org/pub/CPAN/authors/id/EHOOD/ \
http://www.perl.com/CPAN/authors/id/EHOOD/ \
http://www.shiratori.riec.tohoku.ac.jp/~p-katoh/Hack/Docs/mhonarc-jp/ \
- http://people.FreeBSD.org/~flathill/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= flathill
DISTNAME= MHonArc${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
iso2022.pl
diff --git a/japanese/micq/Makefile b/japanese/micq/Makefile
index b6e9bae14e83..08e87eb82ec0 100644
--- a/japanese/micq/Makefile
+++ b/japanese/micq/Makefile
@@ -9,10 +9,12 @@ PORTNAME= micq
PORTVERSION= 0.4.3
CATEGORIES= japanese net
MASTER_SITES= ftp://micq.chatzone.org/pub/micq/V0.4.3/ \
- http://people.FreeBSD.org/~flathill/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= flathill
EXTRACT_SUFX= .tgz
-PATCH_SITES= http://people.FreeBSD.org/~flathill/distfiles/
+PATCH_SITES= ${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR= flathill
PATCHFILES= ${DISTNAME}-jp.patch
PATCH_DIST_STRIP= -p1
diff --git a/japanese/namazu/Makefile b/japanese/namazu/Makefile
index 23c18694c5c5..b84ce9909512 100644
--- a/japanese/namazu/Makefile
+++ b/japanese/namazu/Makefile
@@ -9,7 +9,8 @@ PORTNAME= namazu
PORTVERSION= 1.3.0.11
CATEGORIES= japanese textproc
MASTER_SITES= http://www.namazu.org/stable/ \
- http://people.FreeBSD.org/~flathill/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= flathill
MAINTAINER= flathill@FreeBSD.org
diff --git a/java/jikes/Makefile b/java/jikes/Makefile
index 438c7a3cb202..0e6a2ffb801b 100644
--- a/java/jikes/Makefile
+++ b/java/jikes/Makefile
@@ -8,7 +8,8 @@
PORTNAME= jikes
PORTVERSION= 1.11
CATEGORIES= java
-MASTER_SITES= http://people.FreeBSD.org/~archie/distfiles/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= archie
MAINTAINER= archie@whistle.com
diff --git a/java/jre/Makefile b/java/jre/Makefile
index 58b0d85a6c8e..bc274e42cfda 100644
--- a/java/jre/Makefile
+++ b/java/jre/Makefile
@@ -9,9 +9,10 @@ PORTNAME= jre
PORTVERSION= ${JRE_VERSION}
CATEGORIES= java devel
MASTER_SITES= ftp://ftp.se.freebsd.org/pub/FreeBSD/JDK/ \
- http://people.FreeBSD.org/~patrick/ \
+ ${MASTER_SITE_LOCAL}
ftp://ftp.sc.sri.com/pub/FreeBSD/JDK/ \
http://www.freebsd.org/java/
+MASTER_SITE_SUBDIR= patrick
MAINTAINER= sobomax@FreeBSD.org
diff --git a/korean/hanterm/Makefile b/korean/hanterm/Makefile
index afca83ce2d70..0478bd134451 100644
--- a/korean/hanterm/Makefile
+++ b/korean/hanterm/Makefile
@@ -9,7 +9,8 @@ PORTNAME= hanterm
PORTVERSION= 3.1.3
CATEGORIES= korean x11
MASTER_SITES= ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/ \
- http://people.FreeBSD.org/~sada/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= sada
MAINTAINER= cjh@kr.freebsd.org
diff --git a/lang/cmucl/Makefile b/lang/cmucl/Makefile
index 248cb1e887b5..8c9260496ea4 100644
--- a/lang/cmucl/Makefile
+++ b/lang/cmucl/Makefile
@@ -12,7 +12,8 @@ CATEGORIES= lang
MASTER_SITES= http://www2.cons.org:8000/freebsd-distfiles/ \
ftp://ftp2.cons.org/pub/languages/lisp/cmucl/release/ \
http://www2.cons.org:8000/ftp-area/cmucl/release/ \
- http://people.FreeBSD.org/~cracauer/freebsd-distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= cracauer
DISTNAME= cmucl-18b.x86.freebsd22
EXTRACT_SUFX= .tgz
diff --git a/lang/objc/Makefile b/lang/objc/Makefile
index ed1c24f9ad3d..f884ea028ce8 100644
--- a/lang/objc/Makefile
+++ b/lang/objc/Makefile
@@ -9,8 +9,8 @@ PORTNAME= objc
PORTVERSION= 3.1.5
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
- http://people.FreeBSD.org/~chuckr/
-MASTER_SITE_SUBDIR= devel/lang/objc
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= devel/lang/objc chuckr
DISTFILES= objc-3.1.5-bootstrap.tar.gz objc-3.1.5.tar.gz
MAINTAINER= chuckr@freebsd.org
diff --git a/lang/scsh/Makefile b/lang/scsh/Makefile
index a08ce25b27f4..dc29959dc04d 100644
--- a/lang/scsh/Makefile
+++ b/lang/scsh/Makefile
@@ -10,7 +10,8 @@ PORTVERSION= 0.5.1
CATEGORIES= shells lang
MASTER_SITES= ftp://ftp-swiss.ai.mit.edu/pub/su/scsh/ \
http://www2.cons.org:8000/freebsd-distfiles/ \
- http://people.FreeBSD.org/~cracauer/freebsd-distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= cracauer
MAINTAINER= cracauer@cons.org
diff --git a/lang/sml-mode.el/Makefile b/lang/sml-mode.el/Makefile
index f716eb7c75c0..c485dc4218ac 100644
--- a/lang/sml-mode.el/Makefile
+++ b/lang/sml-mode.el/Makefile
@@ -9,7 +9,8 @@ PORTNAME= sml-mode
PORTVERSION= 3.3
CATEGORIES= lang elisp
MASTER_SITES= ftp://ftp.research.bell-labs.com/dist/smlnj/contrib/emacs/ \
- http://people.FreeBSD.org/~jkoshy/PORTS/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= jkoshy
EXTRACT_SUFX= .tar.Z
MAINTAINER= jkoshy@FreeBSD.org
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 4f34e12618a1..6952c7485338 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -9,8 +9,9 @@ PORTNAME= cyrus
PORTVERSION= 1.6.22
CATEGORIES= mail tcl82
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
- http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+ ${MASTER_SITE_LOCAL} \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
+MASTER_SITE_SUBDIR= stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail
DISTNAME= ${PORTNAME}-imapd-${PORTVERSION}
MAINTAINER= stb@FreeBSD.org
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index 4f34e12618a1..6952c7485338 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -9,8 +9,9 @@ PORTNAME= cyrus
PORTVERSION= 1.6.22
CATEGORIES= mail tcl82
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
- http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+ ${MASTER_SITE_LOCAL} \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
+MASTER_SITE_SUBDIR= stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail
DISTNAME= ${PORTNAME}-imapd-${PORTVERSION}
MAINTAINER= stb@FreeBSD.org
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 4f34e12618a1..6952c7485338 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -9,8 +9,9 @@ PORTNAME= cyrus
PORTVERSION= 1.6.22
CATEGORIES= mail tcl82
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
- http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+ ${MASTER_SITE_LOCAL} \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
+MASTER_SITE_SUBDIR= stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail
DISTNAME= ${PORTNAME}-imapd-${PORTVERSION}
MAINTAINER= stb@FreeBSD.org
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 4f34e12618a1..6952c7485338 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -9,8 +9,9 @@ PORTNAME= cyrus
PORTVERSION= 1.6.22
CATEGORIES= mail tcl82
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
- http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+ ${MASTER_SITE_LOCAL} \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
+MASTER_SITE_SUBDIR= stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail
DISTNAME= ${PORTNAME}-imapd-${PORTVERSION}
MAINTAINER= stb@FreeBSD.org
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 4f34e12618a1..6952c7485338 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -9,8 +9,9 @@ PORTNAME= cyrus
PORTVERSION= 1.6.22
CATEGORIES= mail tcl82
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
- http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+ ${MASTER_SITE_LOCAL} \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
+MASTER_SITE_SUBDIR= stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail
DISTNAME= ${PORTNAME}-imapd-${PORTVERSION}
MAINTAINER= stb@FreeBSD.org
diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile
index 4f34e12618a1..6952c7485338 100644
--- a/mail/cyrus/Makefile
+++ b/mail/cyrus/Makefile
@@ -9,8 +9,9 @@ PORTNAME= cyrus
PORTVERSION= 1.6.22
CATEGORIES= mail tcl82
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
- http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+ ${MASTER_SITE_LOCAL} \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
+MASTER_SITE_SUBDIR= stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail
DISTNAME= ${PORTNAME}-imapd-${PORTVERSION}
MAINTAINER= stb@FreeBSD.org
diff --git a/mail/majorcool/Makefile b/mail/majorcool/Makefile
index e620b0514d08..0a5d463a00da 100644
--- a/mail/majorcool/Makefile
+++ b/mail/majorcool/Makefile
@@ -8,7 +8,8 @@
PORTNAME= majorcool
PORTVERSION= 1.3.2
CATEGORIES= mail
-MASTER_SITES= http://people.FreeBSD.org/~andreas/download/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= andreas
MAINTAINER= ports@FreeBSD.org
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 9bd242a82450..a4b606b33ca5 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -50,7 +50,8 @@ PORTNAME= nmh
PORTVERSION= 1.0.4
CATEGORIES= mail
MASTER_SITES= ftp://ftp.mhost.com/pub/nmh/ \
- http://people.FreeBSD.org/~jkoshy/PORTS/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= jkoshy
MAINTAINER= Scott.Blachowicz@seaslug.org
diff --git a/mail/serialmail/Makefile b/mail/serialmail/Makefile
index 06a77be99c0e..0a05100943d7 100644
--- a/mail/serialmail/Makefile
+++ b/mail/serialmail/Makefile
@@ -10,7 +10,8 @@ PORTVERSION= 0.75
CATEGORIES= mail
MASTER_SITES= http://cr.yp.to/software/ \
ftp://ftp.qmail.org/pub/koobera.math.uic.edu/pub/software/ \
- http://people.FreeBSD.org/~tom/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= tom
MAINTAINER= tom@FreeBSD.org
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index da6561154d22..da704e48321f 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -9,7 +9,8 @@ PORTNAME= wmbiff
PORTVERSION= 0.2
CATEGORIES= mail windowmaker afterstep
MASTER_SITES= http://ccat.elect.ru:8100/wmbiff/ \
- http://people.FreeBSD.org/~jim/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= jim
MAINTAINER= jim@FreeBSD.org
diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index 034e665cc84f..701628c69911 100644
--- a/mbone/rat/Makefile
+++ b/mbone/rat/Makefile
@@ -9,7 +9,8 @@ PORTNAME= rat
PORTVERSION= 4.0.4
CATEGORIES= mbone audio
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/4.0.4/ \
- http://people.FreeBSD.org/~cpiazza/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= cpiazza
MAINTAINER= O.Hodson@cs.ucl.ac.uk
diff --git a/misc/44bsd-more/Makefile b/misc/44bsd-more/Makefile
index 8c63fdddd1b1..79facd710462 100644
--- a/misc/44bsd-more/Makefile
+++ b/misc/44bsd-more/Makefile
@@ -8,7 +8,8 @@
PORTNAME= 44bsd-more
PORTVERSION= ${RELDATE}
CATEGORIES= misc
-MASTER_SITES= http://people.FreeBSD.org/~hoek/dists/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= hoek
MAINTAINER= hoek@FreeBSD.org
diff --git a/misc/cstream/Makefile b/misc/cstream/Makefile
index ecda0fce9d31..144a0974df41 100644
--- a/misc/cstream/Makefile
+++ b/misc/cstream/Makefile
@@ -12,7 +12,8 @@ MASTER_SITES= http://www.cons.org/cracauer/download/ \
http://www2.cons.org/cracauer/download/ \
http://www3.cons.org/cracauer/download/ \
http://www.hanse.de/~cracauer/homepage-mirror/download/ \
- http://people.FreeBSD.org/~cracauer/homepage-mirror/download/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= cracauer/homepage-mirror/download/
MAINTAINER= cracauer@cons.org
diff --git a/misc/kp/Makefile b/misc/kp/Makefile
index 115106e09783..1a45ba8131bb 100644
--- a/misc/kp/Makefile
+++ b/misc/kp/Makefile
@@ -8,7 +8,8 @@
PORTNAME= kp
PORTVERSION= 1.00
CATEGORIES= misc
-MASTER_SITES= http://people.FreeBSD.org/~asami/distfiles/kp/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= asami
MAINTAINER= asami@FreeBSD.org
diff --git a/misc/rtfm/Makefile b/misc/rtfm/Makefile
index 683d6eeeed6e..b67d714be112 100644
--- a/misc/rtfm/Makefile
+++ b/misc/rtfm/Makefile
@@ -8,7 +8,8 @@
PORTNAME= rtfm
PORTVERSION= 1.0
CATEGORIES= misc
-MASTER_SITES= http://people.FreeBSD.org/~chris/distfiles/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= chris
MAINTAINER= chris@FreeBSD.org
diff --git a/misc/uk-phone/Makefile b/misc/uk-phone/Makefile
index e119474d6e53..29ca208a34b2 100644
--- a/misc/uk-phone/Makefile
+++ b/misc/uk-phone/Makefile
@@ -8,9 +8,8 @@
PORTNAME= phone
PORTVERSION= 1.0
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
- http://people.FreeBSD.org/~wosch/src/
-MASTER_SITE_SUBDIR= asami/LOCAL_PORTS
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= wosch/src asami/LOCAL_PORTS
PKGNAMEPREFIX= uk-
DISTFILES= uk.phone.gz
diff --git a/misc/uk-postcodes/Makefile b/misc/uk-postcodes/Makefile
index b7fff8da99df..2628126b1b99 100644
--- a/misc/uk-postcodes/Makefile
+++ b/misc/uk-postcodes/Makefile
@@ -8,9 +8,8 @@
PORTNAME= postcodes
PORTVERSION= 1.0
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
- http://people.FreeBSD.org/~wosch/src/
-MASTER_SITE_SUBDIR= asami/LOCAL_PORTS
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= wosch/src asami/LOCAL_PORTS
PKGNAMEPREFIX= uk-
DISTFILES= uk.postcodes.gz
diff --git a/misc/us-zipcodes/Makefile b/misc/us-zipcodes/Makefile
index c046e6b0d4c5..866878f256f9 100644
--- a/misc/us-zipcodes/Makefile
+++ b/misc/us-zipcodes/Makefile
@@ -8,9 +8,8 @@
PORTNAME= zipcodes
PORTVERSION= 1.0
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
- http://people.FreeBSD.org/~wosch/src/
-MASTER_SITE_SUBDIR= asami/LOCAL_PORTS
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= wosch/src asami/LOCAL_PORTS
PKGNAMEPREFIX= us-
DISTFILES= ${PORTNAME}.gz
diff --git a/multimedia/linux-xmovie/Makefile b/multimedia/linux-xmovie/Makefile
index 8baa0e9db09a..1e1714552673 100644
--- a/multimedia/linux-xmovie/Makefile
+++ b/multimedia/linux-xmovie/Makefile
@@ -8,7 +8,8 @@
PORTNAME= xmovie
PORTVERSION= 1.3.1
CATEGORIES= graphics linux
-MASTER_SITES= http://people.FreeBSD.org/~imura/distfiles/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= imura
# Distfile has no version info. The original site is below.
# MASTER_SITES= http://heroine.linuxbox.com/
DISTNAME= ${PORTNAME}-i586-${PORTVERSION}
diff --git a/multimedia/xmovie/Makefile b/multimedia/xmovie/Makefile
index 8baa0e9db09a..1e1714552673 100644
--- a/multimedia/xmovie/Makefile
+++ b/multimedia/xmovie/Makefile
@@ -8,7 +8,8 @@
PORTNAME= xmovie
PORTVERSION= 1.3.1
CATEGORIES= graphics linux
-MASTER_SITES= http://people.FreeBSD.org/~imura/distfiles/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= imura
# Distfile has no version info. The original site is below.
# MASTER_SITES= http://heroine.linuxbox.com/
DISTNAME= ${PORTNAME}-i586-${PORTVERSION}
diff --git a/net-im/gicq/Makefile b/net-im/gicq/Makefile
index f273a0935cab..5e1ee2216e59 100644
--- a/net-im/gicq/Makefile
+++ b/net-im/gicq/Makefile
@@ -8,8 +8,9 @@
PORTNAME= gicq
PORTVERSION= 0.33
CATEGORIES= net
-MASTER_SITES= http://people.FreeBSD.org/~flathill/distfiles/ \
+MASTER_SITES= ${MASTER_SITE_LOCAL} \
ftp://ftp.korsoft.com/pub/gicq/
+MASTER_SITE_SUBDIR= flathill
MAINTAINER= flathill@FreeBSD.org
diff --git a/net-mgmt/ciscoconf/Makefile b/net-mgmt/ciscoconf/Makefile
index 3e1996bd3b6a..9502de0a3df1 100644
--- a/net-mgmt/ciscoconf/Makefile
+++ b/net-mgmt/ciscoconf/Makefile
@@ -9,7 +9,8 @@ PORTNAME= ciscoconf
PORTVERSION= 1.0.b1
CATEGORIES= net
MASTER_SITES= ftp://ftp.patho.gen.nz/pub/users/jabley/ \
- http://people.FreeBSD.org/~billf/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= billf
DISTNAME= ciscoconf-1.0beta1
MAINTAINER= jabley@clear.co.nz
diff --git a/net/ciscoconf/Makefile b/net/ciscoconf/Makefile
index 3e1996bd3b6a..9502de0a3df1 100644
--- a/net/ciscoconf/Makefile
+++ b/net/ciscoconf/Makefile
@@ -9,7 +9,8 @@ PORTNAME= ciscoconf
PORTVERSION= 1.0.b1
CATEGORIES= net
MASTER_SITES= ftp://ftp.patho.gen.nz/pub/users/jabley/ \
- http://people.FreeBSD.org/~billf/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= billf
DISTNAME= ciscoconf-1.0beta1
MAINTAINER= jabley@clear.co.nz
diff --git a/net/ggsd/Makefile b/net/ggsd/Makefile
index a2d8ebf8868b..efb1d1cb2928 100644
--- a/net/ggsd/Makefile
+++ b/net/ggsd/Makefile
@@ -8,8 +8,9 @@
PORTNAME= ggsd
PORTVERSION= 0.1
CATEGORIES= net
-MASTER_SITES= http://people.FreeBSD.org/~billf/distfiles/ \
+MASTER_SITES= ${MASTER_SITE_LOCAL} \
ftp://ftp.gpad.ac.ru/pub/FreeBSD/distfiles/
+MASTER_SITE_SUBDIR= billf
DISTNAME= ggsd
EXTRACT_SUFX= .tar
diff --git a/net/gicq/Makefile b/net/gicq/Makefile
index f273a0935cab..5e1ee2216e59 100644
--- a/net/gicq/Makefile
+++ b/net/gicq/Makefile
@@ -8,8 +8,9 @@
PORTNAME= gicq
PORTVERSION= 0.33
CATEGORIES= net
-MASTER_SITES= http://people.FreeBSD.org/~flathill/distfiles/ \
+MASTER_SITES= ${MASTER_SITE_LOCAL} \
ftp://ftp.korsoft.com/pub/gicq/
+MASTER_SITE_SUBDIR= flathill
MAINTAINER= flathill@FreeBSD.org
diff --git a/net/macipgw/Makefile b/net/macipgw/Makefile
index 0d0b08d9a636..4e59ebc3b3c3 100644
--- a/net/macipgw/Makefile
+++ b/net/macipgw/Makefile
@@ -9,7 +9,8 @@ PORTNAME= macipgw
PORTVERSION= 1.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.hanse.de/sites/transit/netatalk/ \
- http://people.FreeBSD.org/~stb/netatalk/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= stb/netatalk
MAINTAINER= stb@freebsd.org
diff --git a/net/mpd-netgraph/Makefile b/net/mpd-netgraph/Makefile
index e5f2359b18c1..b8063b67525e 100644
--- a/net/mpd-netgraph/Makefile
+++ b/net/mpd-netgraph/Makefile
@@ -8,7 +8,8 @@
PORTNAME= mpd
PORTVERSION= 3.0.b8
CATEGORIES= net
-MASTER_SITES= http://people.FreeBSD.org/~archie/distfiles/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= archie
DISTNAME= mpd-3.0b8
MAINTAINER= archie@freebsd.org
diff --git a/net/mpd/Makefile b/net/mpd/Makefile
index 4439eba53609..6d294bf18f1f 100644
--- a/net/mpd/Makefile
+++ b/net/mpd/Makefile
@@ -8,7 +8,8 @@
PORTNAME= mpd
PORTVERSION= 2.0.b2
CATEGORIES= net
-MASTER_SITES= http://people.FreeBSD.org/~archie/distfiles/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= archie
DISTNAME= mpd-2.0b2
MAINTAINER= archie@freebsd.org
diff --git a/net/netatalk-asun/Makefile b/net/netatalk-asun/Makefile
index d720db054881..8ee22f00059d 100644
--- a/net/netatalk-asun/Makefile
+++ b/net/netatalk-asun/Makefile
@@ -9,8 +9,9 @@ PORTNAME= netatalk
PORTVERSION= 1.4b2+asun2.1.3
CATEGORIES= net print
MASTER_SITES= ftp://ftp.u.washington.edu/public/asun/ \
- http://people.FreeBSD.org/~stb/mirror/ftp.u.washington.edu/public/asun/ \
+ ${MASTER_SITE_LOCAL} \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.u.washington.edu/public/asun/
+MASTER_SITE_SUBDIR= stb/mirror/ftp.u.washington.edu/public/asun
MAINTAINER= stb@freebsd.org
diff --git a/net/netatalk-devel/Makefile b/net/netatalk-devel/Makefile
index e75a50095f90..5a8f30a8ec8c 100644
--- a/net/netatalk-devel/Makefile
+++ b/net/netatalk-devel/Makefile
@@ -9,12 +9,14 @@ PORTNAME= netatalk
PORTVERSION= 1.4b2
CATEGORIES= net print
MASTER_SITES= ftp://terminator.rs.itd.umich.edu/unix/netatalk/ \
- http://people.FreeBSD.org/~stb/mirror/terminator.rs.itd.umich.edu/unix/netatalk/ \
+ ${MASTER_SITE_LOCAL} \
ftp://ftp.hanse.de/sites/transit/mirror/terminator.rs.itd.umich.edu/unix/netatalk/
+MASTER_SITE_SUBDIR= stb/mirror/terminator.rs.itd.umich.edu/unix/netatalk
PATCH_SITES= http://www.umich.edu/~rsug/netatalk/patches/1.4b2/ \
- http://people.FreeBSD.org/~stb/mirror/www.umich.edu/%7Ersug/netatalk/patches/1.4b2/ \
+ ${MASTER_SITE_LOCAL} \
ftp://ftp.hanse.de/sites/transit/mirror/www.umich.edu/%257Ersug/netatalk/patches/1.4b2/
+PATCH_SITE_SUBDIR= stb/mirror/www.umich.edu/%7Ersug/netatalk/patches/1.4b2/ \
PATCHFILES= afpd-macos8.diff afpd-bfree.diff
MAINTAINER= stb@freebsd.org
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index e75a50095f90..5a8f30a8ec8c 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -9,12 +9,14 @@ PORTNAME= netatalk
PORTVERSION= 1.4b2
CATEGORIES= net print
MASTER_SITES= ftp://terminator.rs.itd.umich.edu/unix/netatalk/ \
- http://people.FreeBSD.org/~stb/mirror/terminator.rs.itd.umich.edu/unix/netatalk/ \
+ ${MASTER_SITE_LOCAL} \
ftp://ftp.hanse.de/sites/transit/mirror/terminator.rs.itd.umich.edu/unix/netatalk/
+MASTER_SITE_SUBDIR= stb/mirror/terminator.rs.itd.umich.edu/unix/netatalk
PATCH_SITES= http://www.umich.edu/~rsug/netatalk/patches/1.4b2/ \
- http://people.FreeBSD.org/~stb/mirror/www.umich.edu/%7Ersug/netatalk/patches/1.4b2/ \
+ ${MASTER_SITE_LOCAL} \
ftp://ftp.hanse.de/sites/transit/mirror/www.umich.edu/%257Ersug/netatalk/patches/1.4b2/
+PATCH_SITE_SUBDIR= stb/mirror/www.umich.edu/%7Ersug/netatalk/patches/1.4b2/ \
PATCHFILES= afpd-macos8.diff afpd-bfree.diff
MAINTAINER= stb@freebsd.org
diff --git a/net/nttcp/Makefile b/net/nttcp/Makefile
index 82552f3665f9..55eba90eabbd 100644
--- a/net/nttcp/Makefile
+++ b/net/nttcp/Makefile
@@ -9,7 +9,8 @@ PORTNAME= nttcp
PORTVERSION= 1.45
CATEGORIES= net benchmarks
MASTER_SITES= http://users.leo.org/~bartel/nttcp/ \
- http://people.FreeBSD.org/~billf/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= billf
MAINTAINER= billf@FreeBSD.org
diff --git a/net/ppp-nt/Makefile b/net/ppp-nt/Makefile
index 04a33f65a621..3cdd6d603ac0 100644
--- a/net/ppp-nt/Makefile
+++ b/net/ppp-nt/Makefile
@@ -9,11 +9,13 @@ PORTNAME= ppp-nt
PORTVERSION= 2.2.7
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_PORTS_JP} \
- http://people.FreeBSD.org/~sada/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= sada
DISTNAME= ppp-2.2.7
PATCH_SITES= http://www.rr.iij4u.or.jp/~sada/patches/ \
- http://people.FreeBSD.org/~sada/distfiles/
+ ${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR= sada
PATCHFILES= nat-980920.patch.gz ppp-2.2.7-telehoudai.diff.gz
PATCH_DIST_STRIP= -p1
diff --git a/net/sharity-light/Makefile b/net/sharity-light/Makefile
index 9f76e513fc39..50806e4ee54e 100644
--- a/net/sharity-light/Makefile
+++ b/net/sharity-light/Makefile
@@ -10,7 +10,8 @@ PORTVERSION= 1.2
CATEGORIES= net
MASTER_SITES= ftp://ftp.obdev.at/pub/Products/Sharity-Light/ \
ftp://ftp.warpnet.ro/mirrors/ftp.obdev.at/pub/Products/Sharity-Light/ \
- http://people.FreeBSD.org/~dt/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= dt
DISTNAME= Sharity-Light.1.2
MAINTAINER= dt@FreeBSD.org
diff --git a/net/suckblow/Makefile b/net/suckblow/Makefile
index 1da215e6ad93..5e30e12a4228 100644
--- a/net/suckblow/Makefile
+++ b/net/suckblow/Makefile
@@ -8,7 +8,8 @@
PORTNAME= suckblow
PORTVERSION= 1.1
CATEGORIES= net misc
-MASTER_SITES= http://people.FreeBSD.org/~archie/distfiles/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= archie
MAINTAINER= archie@freebsd.org
diff --git a/news/inn-stable/Makefile b/news/inn-stable/Makefile
index 91746f9ede25..228755e04b4c 100644
--- a/news/inn-stable/Makefile
+++ b/news/inn-stable/Makefile
@@ -7,8 +7,9 @@
PORTNAME= inn-stable
PORTVERSION= v22
CATEGORIES= news
-MASTER_SITES= http://people.FreeBSD.org/~andreas/download/ \
+MASTER_SITES= ${MASTER_SITE_LOCAL} \
ftp://ftp.isc.org/isc/inn/snapshots/
+MASTER_SITE_SUBDIR= andreas
DISTNAME= inn-STABLE_2_2-2000-02-25_03-09
MAINTAINER= andreas@FreeBSD.org
diff --git a/palm/malsync/Makefile b/palm/malsync/Makefile
index 3160df6b27a2..476606fcae7a 100644
--- a/palm/malsync/Makefile
+++ b/palm/malsync/Makefile
@@ -9,7 +9,8 @@ PORTNAME= malsync
PORTVERSION= 1.8
CATEGORIES= palm
MASTER_SITES= http://www.tomw.org/ \
- http://people.FreeBSD.org/~dirk/ports/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= dirk
DISTNAME= malsync_src_1_8
MAINTAINER= dirk@FreeBSD.org
diff --git a/ports-mgmt/pib/Makefile b/ports-mgmt/pib/Makefile
index 56097d1ecbc2..3d25f38c9ee9 100644
--- a/ports-mgmt/pib/Makefile
+++ b/ports-mgmt/pib/Makefile
@@ -8,7 +8,8 @@
PORTNAME= pib
PORTVERSION= 1.1
CATEGORIES= sysutils tk82
-MASTER_SITES= http://people.FreeBSD.org/~msmith/pib/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= msmith
MAINTAINER= msmith@freebsd.org
diff --git a/print/a2ps-letter/Makefile b/print/a2ps-letter/Makefile
index aad1081db14b..e12768235a42 100644
--- a/print/a2ps-letter/Makefile
+++ b/print/a2ps-letter/Makefile
@@ -8,8 +8,9 @@
PORTNAME= a2ps
PORTVERSION= 4.12
CATEGORIES= print
-MASTER_SITES= http://people.FreeBSD.org/~chuckr/ \
+MASTER_SITES= ${MASTER_SITE_LOCAL} \
ftp://ftp.enst.fr/pub/unix/a2ps/
+MASTER_SITE_SUBDIR= chuckr
PKGNAMESUFFIX= -${PAPERSIZE}
DISTFILES= a2ps-${PORTVERSION}${EXTRACT_SUFX} sheets.map
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 364531bc47fe..ae9887c2aa25 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -8,7 +8,8 @@
PORTNAME= apsfilter
PORTVERSION= 5.4.2
CATEGORIES= print
-MASTER_SITES= http://people.FreeBSD.org/~andreas/apsfilter/download/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= andreas/apsfilter
MAINTAINER= andreas@FreeBSD.org
diff --git a/print/apsfilter6/Makefile b/print/apsfilter6/Makefile
index 364531bc47fe..ae9887c2aa25 100644
--- a/print/apsfilter6/Makefile
+++ b/print/apsfilter6/Makefile
@@ -8,7 +8,8 @@
PORTNAME= apsfilter
PORTVERSION= 5.4.2
CATEGORIES= print
-MASTER_SITES= http://people.FreeBSD.org/~andreas/apsfilter/download/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= andreas/apsfilter
MAINTAINER= andreas@FreeBSD.org
diff --git a/print/perlftlib/Makefile b/print/perlftlib/Makefile
index ba0947de9cb8..59f07251941b 100644
--- a/print/perlftlib/Makefile
+++ b/print/perlftlib/Makefile
@@ -10,7 +10,8 @@ PORTVERSION= 1.2
CATEGORIES= print perl5
MASTER_SITES= ftp://ftp.big.or.jp/pub/usr2/jam/ft/ \
${MASTER_SITE_PORTS_JP} \
- http://people.FreeBSD.org/~sada/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= sada
MAINTAINER= taoka@FreeBSD.org
diff --git a/security/checkpassword/Makefile b/security/checkpassword/Makefile
index 1c84c20e40b7..07bc4a4e2ac8 100644
--- a/security/checkpassword/Makefile
+++ b/security/checkpassword/Makefile
@@ -9,8 +9,9 @@ PORTNAME= checkpassword
PORTVERSION= 0.81
CATEGORIES= security
MASTER_SITES= http://cr.yp.to/software/ \
- http://people.FreeBSD.org/~sada/distfiles/ \
+ ${MASTER_SITE_LOCAL} \
${MASTER_SITE_PORTS_JP}
+MASTER_SITE_SUBDIR= sada
MAINTAINER= sada@FreeBSD.org
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 75b9e5164b0a..7a95c425704c 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -9,8 +9,9 @@ PORTNAME= cyrus-sasl
PORTVERSION= 1.5.21
CATEGORIES= security
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
- http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+ ${MASTER_SITE_LOCAL} \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
+MASTER_SITE_SUBDIR= stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail
MAINTAINER= hetzels@westbend.net
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 75b9e5164b0a..7a95c425704c 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -9,8 +9,9 @@ PORTNAME= cyrus-sasl
PORTVERSION= 1.5.21
CATEGORIES= security
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
- http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+ ${MASTER_SITE_LOCAL} \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
+MASTER_SITE_SUBDIR= stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail
MAINTAINER= hetzels@westbend.net
diff --git a/security/openssh-askpass/Makefile b/security/openssh-askpass/Makefile
index e21755defa3e..5e8f14c4c756 100644
--- a/security/openssh-askpass/Makefile
+++ b/security/openssh-askpass/Makefile
@@ -9,7 +9,8 @@ PORTNAME= OpenSSH-askpass
PORTVERSION= 1.2.2
CATEGORIES= security
# ${MASTER_SITES} is only for if CVS won't work, period.
-MASTER_SITES= http://people.FreeBSD.org/~kris/distfiles/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= kris
DISTNAME= X11/xc/programs/ssh-askpass
MAINTAINER= kris@FreeBSD.org
diff --git a/security/portscanner/Makefile b/security/portscanner/Makefile
index 9a992d98e91a..5ca80b28efca 100644
--- a/security/portscanner/Makefile
+++ b/security/portscanner/Makefile
@@ -9,7 +9,8 @@ PORTNAME= portscanner
PORTVERSION= 1.0
CATEGORIES= security
MASTER_SITES= http://www.ameth.org/~veilleux/ \
- http://people.FreeBSD.org/~billf/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= billf
DISTNAME= PortScanner-1.0
MAINTAINER= billf@FreeBSD.org
diff --git a/shells/44bsd-csh/Makefile b/shells/44bsd-csh/Makefile
index 38fbb3cf0adc..0073b5887c80 100644
--- a/shells/44bsd-csh/Makefile
+++ b/shells/44bsd-csh/Makefile
@@ -9,7 +9,8 @@
PORTNAME= 44bsd-csh
PORTVERSION= 20000409
CATEGORIES= shells
-MASTER_SITES= http://people.freebsd.org/~obrien/Distfiles/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= obrien
MAINTAINER= obrien@FreeBSD.org
diff --git a/shells/sash/Makefile b/shells/sash/Makefile
index e39c070e3628..60147853fa94 100644
--- a/shells/sash/Makefile
+++ b/shells/sash/Makefile
@@ -9,7 +9,8 @@ PORTNAME= sash
PORTVERSION= 3.4
CATEGORIES= shells
MASTER_SITES= http://www.pcug.org.au/~dbell/programs/ \
- http://people.FreeBSD.org/~patrick/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= patrick
MAINTAINER= patrick@freebsd.org
diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index a08ce25b27f4..dc29959dc04d 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -10,7 +10,8 @@ PORTVERSION= 0.5.1
CATEGORIES= shells lang
MASTER_SITES= ftp://ftp-swiss.ai.mit.edu/pub/su/scsh/ \
http://www2.cons.org:8000/freebsd-distfiles/ \
- http://people.FreeBSD.org/~cracauer/freebsd-distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= cracauer
MAINTAINER= cracauer@cons.org
diff --git a/sysutils/44bsd-more/Makefile b/sysutils/44bsd-more/Makefile
index 8c63fdddd1b1..79facd710462 100644
--- a/sysutils/44bsd-more/Makefile
+++ b/sysutils/44bsd-more/Makefile
@@ -8,7 +8,8 @@
PORTNAME= 44bsd-more
PORTVERSION= ${RELDATE}
CATEGORIES= misc
-MASTER_SITES= http://people.FreeBSD.org/~hoek/dists/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= hoek
MAINTAINER= hoek@FreeBSD.org
diff --git a/sysutils/ffsrecov/Makefile b/sysutils/ffsrecov/Makefile
index 26ce46774930..38753be5071d 100644
--- a/sysutils/ffsrecov/Makefile
+++ b/sysutils/ffsrecov/Makefile
@@ -8,7 +8,8 @@
PORTNAME= ffsrecov
PORTVERSION= 0.1
CATEGORIES= sysutils
-MASTER_SITES= http://people.FreeBSD.org/~jmg/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= jmg
DISTNAME= ffsrecov
MAINTAINER= jmg@freebsd.org
diff --git a/sysutils/glload/Makefile b/sysutils/glload/Makefile
index ad6d41cd3ce1..008e12e8cbe2 100644
--- a/sysutils/glload/Makefile
+++ b/sysutils/glload/Makefile
@@ -9,7 +9,8 @@ PORTNAME= glload
PORTVERSION= 0.4.0
CATEGORIES= sysutils
MASTER_SITES= http://glload.netpedia.net/source/ \
- http://people.FreeBSD.org/~vanilla/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= vanilla
MAINTAINER= vanilla@FreeBSD.org
diff --git a/sysutils/mei/Makefile b/sysutils/mei/Makefile
index 49c8bc994843..95f114e740f1 100644
--- a/sysutils/mei/Makefile
+++ b/sysutils/mei/Makefile
@@ -9,7 +9,8 @@ PORTNAME= mei
PORTVERSION= 1.53
CATEGORIES= sysutils
MASTER_SITES= http://www.vector.co.jp/authors/VA001240/archive/ \
- http://people.FreeBSD.org/~itojun/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= itojun
DISTFILES= mei153s.tgz mei153d.tgz
MAINTAINER= itojun@itojun.org
diff --git a/sysutils/mkisofs-devel/Makefile b/sysutils/mkisofs-devel/Makefile
index e4f30e69ea3a..b26d20e00940 100644
--- a/sysutils/mkisofs-devel/Makefile
+++ b/sysutils/mkisofs-devel/Makefile
@@ -13,7 +13,8 @@ MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/ \
ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/
DISTNAME= cdrecord-1.8.1
-PATCH_SITES= http://people.FreeBSD.org/~dirk/ports/distfiles/
+PATCH_SITES= ${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR= dirk
PATCHFILES= apple_driver.patch
MAINTAINER= dirk@FreeBSD.org
diff --git a/sysutils/mkisofs/Makefile b/sysutils/mkisofs/Makefile
index e4f30e69ea3a..b26d20e00940 100644
--- a/sysutils/mkisofs/Makefile
+++ b/sysutils/mkisofs/Makefile
@@ -13,7 +13,8 @@ MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/ \
ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/
DISTNAME= cdrecord-1.8.1
-PATCH_SITES= http://people.FreeBSD.org/~dirk/ports/distfiles/
+PATCH_SITES= ${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR= dirk
PATCHFILES= apple_driver.patch
MAINTAINER= dirk@FreeBSD.org
diff --git a/sysutils/pib/Makefile b/sysutils/pib/Makefile
index 56097d1ecbc2..3d25f38c9ee9 100644
--- a/sysutils/pib/Makefile
+++ b/sysutils/pib/Makefile
@@ -8,7 +8,8 @@
PORTNAME= pib
PORTVERSION= 1.1
CATEGORIES= sysutils tk82
-MASTER_SITES= http://people.FreeBSD.org/~msmith/pib/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= msmith
MAINTAINER= msmith@freebsd.org
diff --git a/sysutils/rdate/Makefile b/sysutils/rdate/Makefile
index 18e217b331be..4cfaaf5a5f39 100644
--- a/sysutils/rdate/Makefile
+++ b/sysutils/rdate/Makefile
@@ -9,7 +9,8 @@ PORTNAME= rdate
PORTVERSION= 1.0
CATEGORIES= sysutils
MASTER_SITES= http://www2.cons.org:8000/freebsd-distfiles/ \
- http://people.FreeBSD.org/~cracauer/freebsd-distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= cracauer
MAINTAINER= cracauer@cons.org
diff --git a/textproc/chpp/Makefile b/textproc/chpp/Makefile
index 53257513008d..d07d6e8d3513 100644
--- a/textproc/chpp/Makefile
+++ b/textproc/chpp/Makefile
@@ -8,7 +8,8 @@
PORTNAME= chpp
PORTVERSION= 0.3.5
CATEGORIES= textproc
-MASTER_SITES= http://people.FreeBSD.org/~andy/distfiles/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= andy
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/tkdiff/Makefile b/textproc/tkdiff/Makefile
index 1f1d9b3bf094..c0374a0f109d 100644
--- a/textproc/tkdiff/Makefile
+++ b/textproc/tkdiff/Makefile
@@ -8,7 +8,8 @@
PORTNAME= tkdiff
PORTVERSION= 3.04
CATEGORIES= textproc tk82
-MASTER_SITES= http://people.FreeBSD.org/~kevlo/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= kevlo
MAINTAINER= kevlo@FreeBSD.org
diff --git a/www/libxpg4-ns/Makefile b/www/libxpg4-ns/Makefile
index b85dc8582193..ab4b22493cd4 100644
--- a/www/libxpg4-ns/Makefile
+++ b/www/libxpg4-ns/Makefile
@@ -9,7 +9,8 @@ PORTNAME= libxpg4-ns
PORTVERSION= 3.3
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_PORTS_JP} \
- http://people.FreeBSD.org/~sada/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= sada
DISTNAME= libxpg4-3.3
MAINTAINER= sada@FreeBSD.ORG
diff --git a/www/squidtimes/Makefile b/www/squidtimes/Makefile
index 50ec52e13dd0..bc5e8a9cdbbf 100644
--- a/www/squidtimes/Makefile
+++ b/www/squidtimes/Makefile
@@ -9,7 +9,8 @@ PORTNAME= squidtimes
PORTVERSION= 1.12
CATEGORIES= www
MASTER_SITES= http://www.cineca.it/~nico/binaries/ \
- http://people.FreeBSD.org/~billf/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= billf
DISTNAME= squidtimes-1.12-freebsd.bin
EXTRACT_SUFX=
diff --git a/x11-clocks/wmdate/Makefile b/x11-clocks/wmdate/Makefile
index 7ec359a6ecb4..8841cb2aafaa 100644
--- a/x11-clocks/wmdate/Makefile
+++ b/x11-clocks/wmdate/Makefile
@@ -9,7 +9,8 @@ PORTNAME= wmdate
PORTVERSION= 0.7
CATEGORIES= x11-clocks windowmaker afterstep
MASTER_SITES= http://wit401310.student.utwente.nl/apps/apps/ \
- http://people.FreeBSD.org/~jim/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= jim
MAINTAINER= jim@FreeBSD.org
diff --git a/x11-clocks/wmtz/Makefile b/x11-clocks/wmtz/Makefile
index 7a517180ed3b..30d1cd97d5d5 100644
--- a/x11-clocks/wmtz/Makefile
+++ b/x11-clocks/wmtz/Makefile
@@ -9,7 +9,8 @@ PORTNAME= wmtz
PORTVERSION= 0.5
CATEGORIES= x11-clocks windowmaker afterstep
MASTER_SITES= http://www.algonet.se/~jlin/wmtz/ \
- http://people.FreeBSD.org/~jim/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= jim
MAINTAINER= jim@FreeBSD.org
diff --git a/x11-fonts/tkfont/Makefile b/x11-fonts/tkfont/Makefile
index b468ef9e9ec1..c56d05d3ec76 100644
--- a/x11-fonts/tkfont/Makefile
+++ b/x11-fonts/tkfont/Makefile
@@ -9,7 +9,8 @@ PORTNAME= tkfont
PORTVERSION= 1.1
CATEGORIES= x11-fonts tk82
MASTER_SITES= ftp://ftp.freesoftware.com/pub/linux/tsx-11/sources/usr.bin.X11/ \
- http://people.FreeBSD.org/~billf/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= billf
MAINTAINER= brett@peloton.runet.edu
diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile
index 2bcbdf4a0742..7447aa98df79 100644
--- a/x11-wm/fvwm95-i18n/Makefile
+++ b/x11-wm/fvwm95-i18n/Makefile
@@ -13,12 +13,14 @@ MASTER_SITES= ftp://mitac11.uia.ac.be/pub/fvwm95/ \
ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/ \
ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/misc/fvwm95/ \
${MASTER_SITE_PORTS_JP} \
- http://people.FreeBSD.org/~sada/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= sada
DISTNAME= fvwm95-2.0.43a-Autoconf
DISTFILES= ${EXTRACT_ONLY} fvwm95-2.0.43a-FreeBSD.apmpatch.tar.gz
PATCH_SITES= ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/misc/fvwm95/ \
- http://people.FreeBSD.org/~sada/distfiles/
+ ${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR= sada
PATCHFILES= fvwm95-2.0.43a-Autoconf.I18N.diff.gz
MAINTAINER= ryo2@on.rim.or.jp
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index 88b6cfe57126..020dbe5acd62 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -9,7 +9,8 @@ PORTNAME= libdockapp
PORTVERSION= 0.4.0
CATEGORIES= x11-wm
MASTER_SITES= ftp://shadowmere.student.utwente.nl/pub/WindowMaker/ \
- http://people.FreeBSD.org/~jim/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= jim
MAINTAINER= jim@FreeBSD.org
diff --git a/x11-wm/xwmm/Makefile b/x11-wm/xwmm/Makefile
index acdc50ce1dd1..73f6da74e705 100644
--- a/x11-wm/xwmm/Makefile
+++ b/x11-wm/xwmm/Makefile
@@ -8,7 +8,8 @@
PORTNAME= xwmm
PORTVERSION= 0.7
CATEGORIES= x11-wm
-MASTER_SITES= http://people.FreeBSD.org/~imura/distfiles/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= imura
MAINTAINER= imura@FreeBSD.org
diff --git a/x11/wmbutton/Makefile b/x11/wmbutton/Makefile
index eab8552a5d0d..79f63ebc1c62 100644
--- a/x11/wmbutton/Makefile
+++ b/x11/wmbutton/Makefile
@@ -9,7 +9,8 @@ PORTNAME= wmbutton
PORTVERSION= 0.4
CATEGORIES= x11 windowmaker
MASTER_SITES= http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/ \
- http://people.FreeBSD.org/~jim/distfiles/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= jim
MAINTAINER= jim@FreeBSD.org