aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/nulib/Makefile2
-rw-r--r--astro/setiathome/Makefile2
-rw-r--r--audio/dagrab/Makefile2
-rw-r--r--audio/gmixer/Makefile2
-rw-r--r--audio/kmpg/Makefile2
-rw-r--r--audio/rat/Makefile2
-rw-r--r--audio/xcd/Makefile2
-rw-r--r--benchmarks/netpipe/Makefile2
-rw-r--r--benchmarks/nttcp/Makefile2
-rw-r--r--chinese/aterm/Makefile2
-rw-r--r--comms/qpage/Makefile2
-rw-r--r--converters/fconv/Makefile2
-rw-r--r--converters/recode/pkg-descr2
-rw-r--r--deskutils/abacus/Makefile2
-rw-r--r--devel/ctags/Makefile2
-rw-r--r--devel/cvsweb/Makefile2
-rw-r--r--devel/cvsweb/pkg-descr2
-rw-r--r--devel/cvsweb3/Makefile2
-rw-r--r--devel/cvsweb3/pkg-descr2
-rw-r--r--devel/fortran-utils/Makefile2
-rw-r--r--devel/ilu/Makefile4
-rw-r--r--devel/libgnugetopt/Makefile2
-rw-r--r--devel/linux_kdump/Makefile2
-rw-r--r--editors/textedit/Makefile2
-rw-r--r--editors/wemi-emacs/Makefile2
-rw-r--r--emulators/sim/Makefile2
-rw-r--r--emulators/simh/Makefile2
-rw-r--r--emulators/wine-devel/files/README.patch2
-rw-r--r--emulators/wine/files/README.patch2
-rw-r--r--ftp/cftp/Makefile2
-rw-r--r--games/angband/Makefile2
-rw-r--r--games/crossfire-client/Makefile2
-rw-r--r--games/crossfire-server/Makefile2
-rw-r--r--games/crossfire/Makefile2
-rw-r--r--games/jzip/Makefile2
-rw-r--r--games/libshhcards/Makefile2
-rw-r--r--games/wmtictactoe/Makefile2
-rw-r--r--games/xcogitate/Makefile2
-rw-r--r--games/xinfocom/Makefile2
-rw-r--r--games/xscrabble/Makefile2
-rw-r--r--graphics/fxtv/pkg-descr4
-rw-r--r--graphics/gifsicle/Makefile2
-rw-r--r--graphics/glx/Makefile6
-rw-r--r--graphics/linux_glx/Makefile2
-rw-r--r--graphics/linux_glx/pkg-descr2
-rw-r--r--graphics/opengl-man/Makefile2
-rw-r--r--graphics/spigot/Makefile2
-rw-r--r--graphics/utah-glx/Makefile6
-rw-r--r--graphics/utah-glx/pkg-descr2
-rw-r--r--graphics/utah-glx/pkg-message2
-rw-r--r--graphics/xv/Makefile2
-rw-r--r--irc/nethirc/Makefile2
-rw-r--r--japanese/gicq/Makefile4
-rw-r--r--japanese/jls/Makefile2
-rw-r--r--japanese/kterm/Makefile2
-rw-r--r--japanese/lambdamoo/Makefile2
-rw-r--r--japanese/libicq/Makefile2
-rw-r--r--japanese/lynx-current/Makefile2
-rw-r--r--japanese/mhonarc/Makefile2
-rw-r--r--japanese/micq/Makefile4
-rw-r--r--korean/hanterm/Makefile2
-rw-r--r--lang/cmucl/Makefile2
-rw-r--r--lang/m3gdb/Makefile2
-rw-r--r--lang/objc/Makefile2
-rw-r--r--lang/scsh/Makefile2
-rw-r--r--lang/sml-mode.el/Makefile2
-rw-r--r--mail/cyrus-imapd/Makefile2
-rw-r--r--mail/cyrus-imapd2/Makefile2
-rw-r--r--mail/cyrus-imapd22/Makefile2
-rw-r--r--mail/cyrus-imapd23/Makefile2
-rw-r--r--mail/cyrus-imapd24/Makefile2
-rw-r--r--mail/cyrus/Makefile2
-rw-r--r--mail/hbiff/Makefile2
-rw-r--r--mail/majorcool/Makefile2
-rw-r--r--mail/nmh/Makefile2
-rw-r--r--mail/serialmail/Makefile2
-rw-r--r--mail/wmbiff/Makefile2
-rw-r--r--math/xgfe/Makefile2
-rw-r--r--mbone/rat/Makefile2
-rw-r--r--misc/buffer/Makefile2
-rw-r--r--misc/cstream/Makefile2
-rw-r--r--misc/fd/Makefile2
-rw-r--r--misc/figlet/Makefile2
-rw-r--r--misc/rtfm/Makefile2
-rw-r--r--misc/tet/Makefile2
-rw-r--r--misc/uk-phone/Makefile2
-rw-r--r--misc/uk-postcodes/Makefile2
-rw-r--r--misc/us-zipcodes/Makefile2
-rw-r--r--multimedia/fxtv/pkg-descr4
-rw-r--r--multimedia/spigot/Makefile2
-rw-r--r--net-im/gicq/Makefile2
-rw-r--r--net-mgmt/ciscoconf/Makefile2
-rw-r--r--net/bounce/Makefile2
-rw-r--r--net/ciscoconf/Makefile2
-rw-r--r--net/ggsd/Makefile2
-rw-r--r--net/gicq/Makefile2
-rw-r--r--net/macipgw/Makefile2
-rw-r--r--net/netatalk-asun/Makefile2
-rw-r--r--net/netatalk-devel/Makefile4
-rw-r--r--net/netatalk/Makefile4
-rw-r--r--net/nttcp/Makefile2
-rw-r--r--net/pathchar/Makefile2
-rw-r--r--net/ppp-nt/Makefile4
-rw-r--r--net/relay/Makefile2
-rw-r--r--net/sharity-light/Makefile2
-rw-r--r--net/sniffit/Makefile2
-rw-r--r--net/tcpshow/Makefile2
-rw-r--r--net/telserv/Makefile2
-rw-r--r--news/dejasearch/Makefile2
-rw-r--r--news/inn-stable/Makefile2
-rw-r--r--news/unpost/Makefile2
-rw-r--r--ports-mgmt/pib/Makefile2
-rw-r--r--print/a2ps-letter/Makefile2
-rw-r--r--print/apsfilter/Makefile2
-rw-r--r--print/apsfilter/pkg-descr2
-rw-r--r--print/apsfilter6/Makefile2
-rw-r--r--print/apsfilter6/pkg-descr2
-rw-r--r--print/jadetex/Makefile2
-rw-r--r--print/perlftlib/Makefile2
-rw-r--r--security/checkpassword/Makefile2
-rw-r--r--security/cyrus-sasl/Makefile2
-rw-r--r--security/cyrus-sasl2/Makefile2
-rw-r--r--security/gtkportscan/Makefile2
-rw-r--r--security/keyprint/Makefile2
-rw-r--r--security/opieprint/Makefile2
-rw-r--r--security/portscanner/Makefile2
-rw-r--r--security/vscan/Makefile2
-rw-r--r--shells/fd/Makefile2
-rw-r--r--shells/sash/Makefile2
-rw-r--r--shells/scsh/Makefile2
-rw-r--r--sysutils/cd-write/Makefile2
-rw-r--r--sysutils/ffsrecov/Makefile2
-rw-r--r--sysutils/glload/Makefile2
-rw-r--r--sysutils/mei/Makefile2
-rw-r--r--sysutils/pib/Makefile2
-rw-r--r--sysutils/rdate/Makefile2
-rw-r--r--textproc/chpp/Makefile2
-rw-r--r--textproc/docbook-241/pkg-descr2
-rw-r--r--textproc/docbook-300/pkg-descr2
-rw-r--r--textproc/docbook-310/pkg-descr2
-rw-r--r--textproc/tkdiff/Makefile2
-rw-r--r--textproc/tth/Makefile2
-rw-r--r--textproc/word2x/Makefile2
-rw-r--r--www/demoroniser/Makefile2
-rw-r--r--www/libxpg4-ns/Makefile2
-rw-r--r--www/squidtimes/Makefile2
-rw-r--r--x11-clocks/glclock/files/patch-aa2
-rw-r--r--x11-clocks/glclock/pkg-descr2
-rw-r--r--x11-clocks/wmdate/Makefile2
-rw-r--r--x11-clocks/wmtz/Makefile2
-rw-r--r--x11-fonts/tkfont/Makefile2
-rw-r--r--x11-toolkits/neXtaw/Makefile2
-rw-r--r--x11-toolkits/xforms/Makefile2
-rw-r--r--x11-wm/afterstep-i18n/Makefile2
-rw-r--r--x11-wm/fvwm95-i18n/Makefile4
-rw-r--r--x11-wm/libdockapp/Makefile2
-rw-r--r--x11/props/Makefile2
-rw-r--r--x11/xprompt/Makefile2
-rw-r--r--x11/xwit/Makefile2
159 files changed, 172 insertions, 172 deletions
diff --git a/archivers/nulib/Makefile b/archivers/nulib/Makefile
index c7f97409b55b..ad5fa943e9cd 100644
--- a/archivers/nulib/Makefile
+++ b/archivers/nulib/Makefile
@@ -9,7 +9,7 @@
DISTNAME= nulib325
PKGNAME= nulib-3.25
CATEGORIES= archivers
-MASTER_SITES= http://www.freebsd.org/~jseger/
+MASTER_SITES= http://people.FreeBSD.org/~jseger/
EXTRACT_SUFX= .tar.Z
MAINTAINER= jseger@FreeBSD.org
diff --git a/astro/setiathome/Makefile b/astro/setiathome/Makefile
index e3af28e75688..206ce72fd113 100644
--- a/astro/setiathome/Makefile
+++ b/astro/setiathome/Makefile
@@ -10,7 +10,7 @@ PKGNAME= setiathome-1.2
CATEGORIES= astro
MASTER_SITES= http://setiathome.ssl.berkeley.edu/software/ \
ftp://ftp.cdrom.com/pub/setiathome/ \
- http://www.freebsd.org/~stb/mirror/setiathome.ssl.berkeley.edu/software/
+ http://people.FreeBSD.org/~stb/mirror/setiathome.ssl.berkeley.edu/software/
MAINTAINER= stb@freebsd.org
diff --git a/audio/dagrab/Makefile b/audio/dagrab/Makefile
index 203119c63513..d68f69525fac 100644
--- a/audio/dagrab/Makefile
+++ b/audio/dagrab/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/sound/cdrom
-PATCH_SITES= http://www.freebsd.org/~cpiazza/distfiles/
+PATCH_SITES= http://people.FreeBSD.org/~cpiazza/distfiles/
PATCHFILES= dagrab-0.3.4-freebsd.patch.gz
MAINTAINER= clkao@CirX.ORG
diff --git a/audio/gmixer/Makefile b/audio/gmixer/Makefile
index 0f5a56452862..949dfd0c224b 100644
--- a/audio/gmixer/Makefile
+++ b/audio/gmixer/Makefile
@@ -8,7 +8,7 @@
DISTNAME= gmixer-0.98c
CATEGORIES= audio
-MASTER_SITES= http://www.freebsd.org/~cpiazza/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~cpiazza/distfiles/
MAINTAINER= cpiazza@FreeBSD.org
diff --git a/audio/kmpg/Makefile b/audio/kmpg/Makefile
index 473702742c46..a9d338ffa48f 100644
--- a/audio/kmpg/Makefile
+++ b/audio/kmpg/Makefile
@@ -8,7 +8,7 @@
DISTNAME= kmpg-0.4.3a
CATEGORIES= audio kde
-MASTER_SITES= http://www.freebsd.org/~tom/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~tom/distfiles/
MAINTAINER= tom@FreeBSD.org
diff --git a/audio/rat/Makefile b/audio/rat/Makefile
index 046307711d9b..0268f5baa1b2 100644
--- a/audio/rat/Makefile
+++ b/audio/rat/Makefile
@@ -9,7 +9,7 @@
DISTNAME= rat-4.0.4
CATEGORIES= mbone audio
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/4.0.4/ \
- http://www.freebsd.org/~cpiazza/distfiles/
+ http://people.FreeBSD.org/~cpiazza/distfiles/
MAINTAINER= O.Hodson@cs.ucl.ac.uk
diff --git a/audio/xcd/Makefile b/audio/xcd/Makefile
index 7a2d9f5f88b7..95874e29c525 100644
--- a/audio/xcd/Makefile
+++ b/audio/xcd/Makefile
@@ -8,7 +8,7 @@
DISTNAME= xcd-1.7
CATEGORIES= audio tk82
-MASTER_SITES= http://www.FreeBSD.org/~jmz/
+MASTER_SITES= http://people.FreeBSD.org/~jmz/
MAINTAINER= jmz@FreeBSD.org
diff --git a/benchmarks/netpipe/Makefile b/benchmarks/netpipe/Makefile
index 80f4460a26f9..e251ce17efc5 100644
--- a/benchmarks/netpipe/Makefile
+++ b/benchmarks/netpipe/Makefile
@@ -8,7 +8,7 @@
DISTNAME= netpipe-2.3
CATEGORIES= benchmarks net
MASTER_SITES= ftp://ftp.scl.ameslab.gov/pub/netpipe/ \
- http://www.freebsd.org/~jkoshy/PORTS/
+ http://people.FreeBSD.org/~jkoshy/PORTS/
MAINTAINER= jkoshy@freebsd.org
diff --git a/benchmarks/nttcp/Makefile b/benchmarks/nttcp/Makefile
index 2e7ec17593cd..ddb37b804cdd 100644
--- a/benchmarks/nttcp/Makefile
+++ b/benchmarks/nttcp/Makefile
@@ -9,7 +9,7 @@
DISTNAME= nttcp-1.45
CATEGORIES= net benchmarks
MASTER_SITES= http://users.leo.org/~bartel/nttcp/ \
- http://www.FreeBSD.org/~billf/
+ http://people.FreeBSD.org/~billf/
MAINTAINER= billf@FreeBSD.org
diff --git a/chinese/aterm/Makefile b/chinese/aterm/Makefile
index 9de987478f18..348ef2aff92a 100644
--- a/chinese/aterm/Makefile
+++ b/chinese/aterm/Makefile
@@ -11,7 +11,7 @@ PKGNAME= zh-aterm-0.3.6
CATEGORIES= chinese
MASTER_SITES= http://members.xoom.com/sashav/aterm/ \
http://www.tigr.net/afterstep/as-apps/download/aterm/ \
- http://www.freebsd.org/~foxfair/
+ http://people.FreeBSD.org/~foxfair/
MAINTAINER= davidyu@ken.csie.ntu.edu.tw
diff --git a/comms/qpage/Makefile b/comms/qpage/Makefile
index 0159318cd514..518c0e727abb 100644
--- a/comms/qpage/Makefile
+++ b/comms/qpage/Makefile
@@ -9,7 +9,7 @@
DISTNAME= qpage-3.2
CATEGORIES= comms
#MASTER_SITES= http://www.qpage.org/download/
-MASTER_SITES= http://www.freebsd.org/~fenner/
+MASTER_SITES= http://people.FreeBSD.org/~fenner/
EXTRACT_SUFX= .tar.Z
MAINTAINER= joes@seaport.net
diff --git a/converters/fconv/Makefile b/converters/fconv/Makefile
index 4f972777d733..bc8bbc2d1c26 100644
--- a/converters/fconv/Makefile
+++ b/converters/fconv/Makefile
@@ -8,7 +8,7 @@
DISTNAME= fconv-0.1
CATEGORIES= converters
-MASTER_SITES= http://www.FreeBSD.org/~chris/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~chris/distfiles/
MAINTAINER= chris@FreeBSD.org
diff --git a/converters/recode/pkg-descr b/converters/recode/pkg-descr
index 1453686878ab..0a59bf8a1dde 100644
--- a/converters/recode/pkg-descr
+++ b/converters/recode/pkg-descr
@@ -19,5 +19,5 @@ character sets:
[also known as 8-Bit ANSEL, used by USMARC]
http://www.niso.org/pccodes.htm
-See http://www.freebsd.org/~wosch/src/recode-3.4-bib.tar.gz
+See http://people.FreeBSD.org/~wosch/src/recode-3.4-bib.tar.gz
Extract the archive and follow the instructions in README.bib.
diff --git a/deskutils/abacus/Makefile b/deskutils/abacus/Makefile
index 0684e102ed4e..0d22eaf0fe34 100644
--- a/deskutils/abacus/Makefile
+++ b/deskutils/abacus/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www-cad.eecs.berkeley.edu/HomePages/aml/abacus/ \
http://tahoe.inesc.pt/~aml/abacus/
EXTRACT_SUFX= .tgz
-PATCH_SITES= http://www.freebsd.org/~steve/distfiles/
+PATCH_SITES= http://people.FreeBSD.org/~steve/distfiles/
PATCHFILES= ${PKGNAME}.patch.gz
MAINTAINER= andy@icc.surw.chel.su
diff --git a/devel/ctags/Makefile b/devel/ctags/Makefile
index 77e85a2d53dd..c51f7995c740 100644
--- a/devel/ctags/Makefile
+++ b/devel/ctags/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ctags-3.3.2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SUNSITE}\
http://fly.hiwaay.net/~darren/archives/ \
- http://www.freebsd.org/~jkoshy/PORTS/
+ http://people.FreeBSD.org/~jkoshy/PORTS/
MAINTAINER= jkoshy@FreeBSD.org
diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile
index bacd15be23db..e23ebd873ac4 100644
--- a/devel/cvsweb/Makefile
+++ b/devel/cvsweb/Makefile
@@ -8,7 +8,7 @@
DISTNAME= cvsweb-1.0
CATEGORIES= devel www
-MASTER_SITES= http://www.freebsd.org/~fenner/cvsweb/
+MASTER_SITES= http://people.FreeBSD.org/~fenner/cvsweb/
MAINTAINER= sada@FreeBSD.org
diff --git a/devel/cvsweb/pkg-descr b/devel/cvsweb/pkg-descr
index d76e270f2e9d..7db7a6ccbbad 100644
--- a/devel/cvsweb/pkg-descr
+++ b/devel/cvsweb/pkg-descr
@@ -12,6 +12,6 @@ needs. I would ask that if you make a useful modification, that you send
it back to me for inclusion in the next release.
AUTHOR: Bill Fenner <fenner@freebsd.org>
-WWW: http://www.freebsd.org/~fenner/cvsweb/
+WWW: http://people.FreeBSD.org/~fenner/cvsweb/
- from README
diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile
index bacd15be23db..e23ebd873ac4 100644
--- a/devel/cvsweb3/Makefile
+++ b/devel/cvsweb3/Makefile
@@ -8,7 +8,7 @@
DISTNAME= cvsweb-1.0
CATEGORIES= devel www
-MASTER_SITES= http://www.freebsd.org/~fenner/cvsweb/
+MASTER_SITES= http://people.FreeBSD.org/~fenner/cvsweb/
MAINTAINER= sada@FreeBSD.org
diff --git a/devel/cvsweb3/pkg-descr b/devel/cvsweb3/pkg-descr
index d76e270f2e9d..7db7a6ccbbad 100644
--- a/devel/cvsweb3/pkg-descr
+++ b/devel/cvsweb3/pkg-descr
@@ -12,6 +12,6 @@ needs. I would ask that if you make a useful modification, that you send
it back to me for inclusion in the next release.
AUTHOR: Bill Fenner <fenner@freebsd.org>
-WWW: http://www.freebsd.org/~fenner/cvsweb/
+WWW: http://people.FreeBSD.org/~fenner/cvsweb/
- from README
diff --git a/devel/fortran-utils/Makefile b/devel/fortran-utils/Makefile
index 1f2c61994ee7..5118876f4125 100644
--- a/devel/fortran-utils/Makefile
+++ b/devel/fortran-utils/Makefile
@@ -8,7 +8,7 @@
DISTNAME= fortran-utils-1.1
CATEGORIES= devel
-MASTER_SITES= http://www.freebsd.org/~kris/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~kris/distfiles/
MAINTAINER= kris@FreeBSD.org
diff --git a/devel/ilu/Makefile b/devel/ilu/Makefile
index 4cb4534ff2e9..25f02841542f 100644
--- a/devel/ilu/Makefile
+++ b/devel/ilu/Makefile
@@ -11,10 +11,10 @@ PKGNAME= ilu-2.0a13
CATEGORIES= devel
MASTER_SITES= ftp://parcftp.xerox.com/pub/ilu/2.0a13/ \
http://www2.cons.org:8000/freebsd-distfiles/ \
- http://www.freebsd.org/~cracauer/freebsd-distfiles/
+ http://people.FreeBSD.org/~cracauer/freebsd-distfiles/
PATCH_SITES= http://www2.cons.org:8000/freebsd-distfiles/ \
- http://www.freebsd.org/~cracauer/freebsd-distfiles/
+ http://people.FreeBSD.org/~cracauer/freebsd-distfiles/
PATCHFILES= ${DISTNAME}-patches.html.gz
MAINTAINER= cracauer@cons.org
diff --git a/devel/libgnugetopt/Makefile b/devel/libgnugetopt/Makefile
index 9d894760353b..e9c693a53c2f 100644
--- a/devel/libgnugetopt/Makefile
+++ b/devel/libgnugetopt/Makefile
@@ -8,7 +8,7 @@
DISTNAME= libgnugetopt-1.1
CATEGORIES= devel
-MASTER_SITES= http://www.freebsd.org/~andy/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~andy/distfiles/
MAINTAINER= andy@icc.surw.chel.su
diff --git a/devel/linux_kdump/Makefile b/devel/linux_kdump/Makefile
index 16d70fafd34a..09469bdeb0c5 100644
--- a/devel/linux_kdump/Makefile
+++ b/devel/linux_kdump/Makefile
@@ -8,7 +8,7 @@
DISTNAME= linux_kdump-1.4
CATEGORIES= devel
-MASTER_SITES= http://www.FreeBSD.org/~marcel/ \
+MASTER_SITES= http://people.FreeBSD.org/~marcel/ \
ftp://ftp.scc.nl/pub/FreeBSD/distfiles/
MAINTAINER= marcel@FreeBSD.org
diff --git a/editors/textedit/Makefile b/editors/textedit/Makefile
index c625ada07262..43f3f8d7714c 100644
--- a/editors/textedit/Makefile
+++ b/editors/textedit/Makefile
@@ -8,7 +8,7 @@
DISTNAME= textedit-1.0
CATEGORIES= editors
-MASTER_SITES= http://www.FreeBSD.org/~fenner/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~fenner/distfiles/
MAINTAINER= alex@big.endian.de
diff --git a/editors/wemi-emacs/Makefile b/editors/wemi-emacs/Makefile
index 020aeceb3d9a..9cf2e1214908 100644
--- a/editors/wemi-emacs/Makefile
+++ b/editors/wemi-emacs/Makefile
@@ -10,7 +10,7 @@ DISTNAME= wemi-${WEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jpl.org/pub/elisp/wemi/ \
${MASTER_SITE_PORTS_JP} \
- http://www.freebsd.org/~shige/ports/distfiles/
+ http://people.FreeBSD.org/~shige/ports/distfiles/
MAINTAINER?= shige@FreeBSD.org
diff --git a/emulators/sim/Makefile b/emulators/sim/Makefile
index 58b0884090d1..37d1358e0fc9 100644
--- a/emulators/sim/Makefile
+++ b/emulators/sim/Makefile
@@ -10,7 +10,7 @@ DISTNAME= sim_2.3d
PKGNAME= sim-2.3d
CATEGORIES= emulators
MASTER_SITES= ftp://minnie.cs.adfa.oz.au/pub/PDP-11/Sims/Supnik_2.3/sources/ \
- http://www.freebsd.org/~jedgar/distfiles/
+ http://people.FreeBSD.org/~jedgar/distfiles/
MAINTAINER= jedgar@FreeBSD.org
diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index 58b0884090d1..37d1358e0fc9 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -10,7 +10,7 @@ DISTNAME= sim_2.3d
PKGNAME= sim-2.3d
CATEGORIES= emulators
MASTER_SITES= ftp://minnie.cs.adfa.oz.au/pub/PDP-11/Sims/Supnik_2.3/sources/ \
- http://www.freebsd.org/~jedgar/distfiles/
+ http://people.FreeBSD.org/~jedgar/distfiles/
MAINTAINER= jedgar@FreeBSD.org
diff --git a/emulators/wine-devel/files/README.patch b/emulators/wine-devel/files/README.patch
index c3f757c902cb..f404b7486cca 100644
--- a/emulators/wine-devel/files/README.patch
+++ b/emulators/wine-devel/files/README.patch
@@ -54,7 +54,7 @@ can also look in my current wine port tree at
http://www.jelal.kn-bremen.de/freebsd/ports/emulators/wine/files/
-current users:
-A LDT patch for -current is at http://www.freebsd.org/~luoqi/
+A LDT patch for -current is at http://people.FreeBSD.org/~luoqi/
(well in a recent posting on the -current list,
http://www.freebsd.org/cgi/mid.cgi?db=&id=199911150745.CAA27884@lor.watermarkgroup.com
he said that version is outdated, seems you have to mail him to
diff --git a/emulators/wine/files/README.patch b/emulators/wine/files/README.patch
index c3f757c902cb..f404b7486cca 100644
--- a/emulators/wine/files/README.patch
+++ b/emulators/wine/files/README.patch
@@ -54,7 +54,7 @@ can also look in my current wine port tree at
http://www.jelal.kn-bremen.de/freebsd/ports/emulators/wine/files/
-current users:
-A LDT patch for -current is at http://www.freebsd.org/~luoqi/
+A LDT patch for -current is at http://people.FreeBSD.org/~luoqi/
(well in a recent posting on the -current list,
http://www.freebsd.org/cgi/mid.cgi?db=&id=199911150745.CAA27884@lor.watermarkgroup.com
he said that version is outdated, seems you have to mail him to
diff --git a/ftp/cftp/Makefile b/ftp/cftp/Makefile
index e9545b5afa9b..8c8935024a55 100644
--- a/ftp/cftp/Makefile
+++ b/ftp/cftp/Makefile
@@ -9,7 +9,7 @@
DISTNAME= cftp-0.9.3
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.giga.or.at/pub/nih/cftp/ \
- http://www.FreeBSD.org/~andy/distfiles/
+ http://people.FreeBSD.org/~andy/distfiles/
MAINTAINER= andy@icc.surw.chel.su
diff --git a/games/angband/Makefile b/games/angband/Makefile
index 97880e00f5c9..f4313e2e79ad 100644
--- a/games/angband/Makefile
+++ b/games/angband/Makefile
@@ -10,7 +10,7 @@ DISTNAME= angband-283
PKGNAME= angband-2.8.3
CATEGORIES= games
MASTER_SITES= ftp://export.andrew.cmu.edu/angband/Source/ \
- http://www.freebsd.org/~mph/distfiles/
+ http://people.FreeBSD.org/~mph/distfiles/
DISTFILES= angband-283.tar.gz ext-x11-283.tar.gz angband-data.tar.gz
MAINTAINER= mph@freebsd.org
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index 3a2940bd3410..39f46c943dc2 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -8,7 +8,7 @@
DISTNAME= crossfire-${MAJ}.${MIN}.${PL}
CATEGORIES= games
-MASTER_SITES= http://www.FreeBSD.org/~andreas/download/ \
+MASTER_SITES= http://people.FreeBSD.org/~andreas/download/ \
ftp://ftp.real-time.com/pub/games/crossfire/ \
ftp://ftp.ifi.uio.no/pub/crossfire/ \
ftp://ftp.pyramid.com/pub/crossfire/ \
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index 3a2940bd3410..39f46c943dc2 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -8,7 +8,7 @@
DISTNAME= crossfire-${MAJ}.${MIN}.${PL}
CATEGORIES= games
-MASTER_SITES= http://www.FreeBSD.org/~andreas/download/ \
+MASTER_SITES= http://people.FreeBSD.org/~andreas/download/ \
ftp://ftp.real-time.com/pub/games/crossfire/ \
ftp://ftp.ifi.uio.no/pub/crossfire/ \
ftp://ftp.pyramid.com/pub/crossfire/ \
diff --git a/games/crossfire/Makefile b/games/crossfire/Makefile
index 3a2940bd3410..39f46c943dc2 100644
--- a/games/crossfire/Makefile
+++ b/games/crossfire/Makefile
@@ -8,7 +8,7 @@
DISTNAME= crossfire-${MAJ}.${MIN}.${PL}
CATEGORIES= games
-MASTER_SITES= http://www.FreeBSD.org/~andreas/download/ \
+MASTER_SITES= http://people.FreeBSD.org/~andreas/download/ \
ftp://ftp.real-time.com/pub/games/crossfire/ \
ftp://ftp.ifi.uio.no/pub/crossfire/ \
ftp://ftp.pyramid.com/pub/crossfire/ \
diff --git a/games/jzip/Makefile b/games/jzip/Makefile
index 430bfcc209dd..f06426b68dbb 100644
--- a/games/jzip/Makefile
+++ b/games/jzip/Makefile
@@ -9,7 +9,7 @@
DISTNAME= jzip201g
PKGNAME= jzip-2.0.1g
CATEGORIES= games
-MASTER_SITES= http://www.freebsd.org/~mph/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~mph/distfiles/
MAINTAINER= mph@freebsd.org
diff --git a/games/libshhcards/Makefile b/games/libshhcards/Makefile
index 6651680ccf22..704e1354d925 100644
--- a/games/libshhcards/Makefile
+++ b/games/libshhcards/Makefile
@@ -11,7 +11,7 @@ PKGNAME= libshhcards-1.0.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://home.sol.no/~sverrehu/pub-unix/files/ \
- http://www.freebsd.org/~mph/distfiles/
+ http://people.FreeBSD.org/~mph/distfiles/
MASTER_SITE_SUBDIR= libs/ui
MAINTAINER= andy@icc.surw.chel.su
diff --git a/games/wmtictactoe/Makefile b/games/wmtictactoe/Makefile
index 0fcc2a32ee38..6ac051cb0a3c 100644
--- a/games/wmtictactoe/Makefile
+++ b/games/wmtictactoe/Makefile
@@ -10,7 +10,7 @@ DISTNAME= wmtictactoe-1.1-1
PKGNAME= wmtictactoe-1.1
CATEGORIES= games windowmaker afterstep
MASTER_SITES= http://atlas.ucpel.tche.br/~acamargo/ \
- http://www.freebsd.org/~jim/distfiles/
+ http://people.FreeBSD.org/~jim/distfiles/
MAINTAINER= jim@FreeBSD.org
diff --git a/games/xcogitate/Makefile b/games/xcogitate/Makefile
index 996b3441df85..2e790362e275 100644
--- a/games/xcogitate/Makefile
+++ b/games/xcogitate/Makefile
@@ -8,7 +8,7 @@
DISTNAME= xcogitate-1.02
CATEGORIES= games
-MASTER_SITES= http://www.freebsd.org/~mph/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~mph/distfiles/
MAINTAINER= andy@icc.surw.chel.su
diff --git a/games/xinfocom/Makefile b/games/xinfocom/Makefile
index c141f3e953b6..650d856e4344 100644
--- a/games/xinfocom/Makefile
+++ b/games/xinfocom/Makefile
@@ -9,7 +9,7 @@
DISTNAME= unix8m
PKGNAME= xinfocom-1.8m
CATEGORIES= games
-MASTER_SITES= http://www.freebsd.org/~mph/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~mph/distfiles/
EXTRACT_SUFX= .tgz
MAINTAINER= mph@freebsd.org
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index e91bca1a5413..c59055c0236f 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -10,7 +10,7 @@ DISTNAME= xscrabble
PKGNAME= xscrabble-1.0
CATEGORIES= games
MASTER_SITES= http://www.belgarath.demon.co.uk/programs/ \
- http://www.freebsd.org/~mph/distfiles/
+ http://people.FreeBSD.org/~mph/distfiles/
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/fxtv/pkg-descr b/graphics/fxtv/pkg-descr
index 750a8edbbefa..cc0c06c59621 100644
--- a/graphics/fxtv/pkg-descr
+++ b/graphics/fxtv/pkg-descr
@@ -9,7 +9,7 @@ III.
Refer to the README for details on usage
-WWW: http://www.freebsd.org/~rhh/fxtv
+WWW: http://people.FreeBSD.org/~rhh/fxtv
Note on Bt848/Bt878 bktr driver:
FXTV 1.00 requires release 1.66 (or later) of the Bt848/Bt878 driver.
@@ -17,5 +17,5 @@ FXTV 1.00 requires release 1.66 (or later) of the Bt848/Bt878 driver.
Newer versions of the Bt848/Bt878 driver for FreeBSD 2.2.x, 3.x and 4.x
can be found
-at http://www.freebsd.org/~roger
+at http://people.FreeBSD.org/~roger
or http://telepresence.dmem.strath.ac.uk/bt848
diff --git a/graphics/gifsicle/Makefile b/graphics/gifsicle/Makefile
index 06e4d062d7cc..e4fcf4d3763c 100644
--- a/graphics/gifsicle/Makefile
+++ b/graphics/gifsicle/Makefile
@@ -9,7 +9,7 @@
DISTNAME= gifsicle-1.11.1
CATEGORIES= graphics
MASTER_SITES= http://www.lcdf.org/gifsicle/ \
- http://www.freebsd.org/~flathill/distfiles/
+ http://people.FreeBSD.org/~flathill/distfiles/
MAINTAINER= bradh@iafrica.com
diff --git a/graphics/glx/Makefile b/graphics/glx/Makefile
index 3e264031638c..fd34b15fc387 100644
--- a/graphics/glx/Makefile
+++ b/graphics/glx/Makefile
@@ -38,7 +38,7 @@
DISTNAME= glx-990802
CATEGORIES= graphics
-MASTER_SITES= http://www.freebsd.org/~3d/distfiles/glx/XF3.3.5/
+MASTER_SITES= http://people.FreeBSD.org/~3d/distfiles/glx/XF3.3.5/
DISTFILES= ${DISTNAME}.tar.bz2 \
riva-x-glx.faq.bz2 \
Mesa-3_0.diff.bz2
@@ -248,7 +248,7 @@ pre-install:
${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://www.freebsd.org/~3d' for more information"; \
+ ${ECHO} "Visit 'http://people.FreeBSD.org/~3d' for more information"; \
${ECHO} ""; \
${ECHO} "(We continue with fingers crossed)"; \
${ECHO} ""; \
@@ -257,7 +257,7 @@ pre-install:
${ECHO} "This port depends on having a proper version of XFree86"; \
${ECHO} "installed - preferably ${XFREEVER}!"; \
${ECHO} ""; \
- ${ECHO} "Visit 'http://www.freebsd.org/~3d' for more information"; \
+ ${ECHO} "Visit 'http://people.FreeBSD.org/~3d' for more information"; \
${ECHO} ""; \
${ECHO} "Aborting.."; \
${FALSE} ; \
diff --git a/graphics/linux_glx/Makefile b/graphics/linux_glx/Makefile
index e95b4a8dd2ff..2eecb8cb0de1 100644
--- a/graphics/linux_glx/Makefile
+++ b/graphics/linux_glx/Makefile
@@ -8,7 +8,7 @@
DISTNAME= linux_glx-991127
CATEGORIES= graphics
-MASTER_SITES= http://www.freebsd.org/~3d/distfiles/glx/linux/
+MASTER_SITES= http://people.FreeBSD.org/~3d/distfiles/glx/linux/
MAINTAINER= 3d@freebsd.org
diff --git a/graphics/linux_glx/pkg-descr b/graphics/linux_glx/pkg-descr
index 9b60bc4ff6d1..dcc5e0c58f23 100644
--- a/graphics/linux_glx/pkg-descr
+++ b/graphics/linux_glx/pkg-descr
@@ -3,6 +3,6 @@ libraries to make use of glx aware Linux apps
created by Ralph Giles and Steve Reid
-WWW: http://www.freebsd.org/~3d/distfiles/glx/linux
+WWW: http://people.FreeBSD.org/~3d/distfiles/glx/linux
Marc E E van Woerkom <3d@freebsd.org>
diff --git a/graphics/opengl-man/Makefile b/graphics/opengl-man/Makefile
index fbb0fb7edf7f..3d7f8b3af9e0 100644
--- a/graphics/opengl-man/Makefile
+++ b/graphics/opengl-man/Makefile
@@ -8,7 +8,7 @@
DISTNAME= opengl-man-657
CATEGORIES= graphics
-MASTER_SITES= http://www.freebsd.org/~cracauer/freebsd-distfiles/ \
+MASTER_SITES= http://people.FreeBSD.org/~cracauer/freebsd-distfiles/ \
http://www2.cons.org:8000/freebsd-distfiles/
MAINTAINER= cracauer@cons.org
diff --git a/graphics/spigot/Makefile b/graphics/spigot/Makefile
index 1a6accd048ad..9e249672afc2 100644
--- a/graphics/spigot/Makefile
+++ b/graphics/spigot/Makefile
@@ -8,7 +8,7 @@
DISTNAME= spigot-1.7
CATEGORIES= graphics
-MASTER_SITES= http://www.freebsd.org/~fenner/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~fenner/distfiles/
DISTFILES= spigot.1.7.tar.gz
MAINTAINER= james@cs.uwm.edu
diff --git a/graphics/utah-glx/Makefile b/graphics/utah-glx/Makefile
index 3e264031638c..fd34b15fc387 100644
--- a/graphics/utah-glx/Makefile
+++ b/graphics/utah-glx/Makefile
@@ -38,7 +38,7 @@
DISTNAME= glx-990802
CATEGORIES= graphics
-MASTER_SITES= http://www.freebsd.org/~3d/distfiles/glx/XF3.3.5/
+MASTER_SITES= http://people.FreeBSD.org/~3d/distfiles/glx/XF3.3.5/
DISTFILES= ${DISTNAME}.tar.bz2 \
riva-x-glx.faq.bz2 \
Mesa-3_0.diff.bz2
@@ -248,7 +248,7 @@ pre-install:
${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://www.freebsd.org/~3d' for more information"; \
+ ${ECHO} "Visit 'http://people.FreeBSD.org/~3d' for more information"; \
${ECHO} ""; \
${ECHO} "(We continue with fingers crossed)"; \
${ECHO} ""; \
@@ -257,7 +257,7 @@ pre-install:
${ECHO} "This port depends on having a proper version of XFree86"; \
${ECHO} "installed - preferably ${XFREEVER}!"; \
${ECHO} ""; \
- ${ECHO} "Visit 'http://www.freebsd.org/~3d' for more information"; \
+ ${ECHO} "Visit 'http://people.FreeBSD.org/~3d' for more information"; \
${ECHO} ""; \
${ECHO} "Aborting.."; \
${FALSE} ; \
diff --git a/graphics/utah-glx/pkg-descr b/graphics/utah-glx/pkg-descr
index a03f74f97bad..503b87841c9d 100644
--- a/graphics/utah-glx/pkg-descr
+++ b/graphics/utah-glx/pkg-descr
@@ -16,6 +16,6 @@ See Jordan K Hubbard's article in the July '99 issue of
for more information or visit
-WWW: http://www.freebsd.org/~3d
+WWW: http://people.FreeBSD.org/~3d
Marc E E van Woerkom <3d@freebsd.org>
diff --git a/graphics/utah-glx/pkg-message b/graphics/utah-glx/pkg-message
index 2054bcf326f7..261d44c9e218 100644
--- a/graphics/utah-glx/pkg-message
+++ b/graphics/utah-glx/pkg-message
@@ -26,4 +26,4 @@ Things you might want to do:
application,
. read the article or
. have a look at the docs in X11/share/doc/riva-glx, esp the FAQ or
-. visit http://www.freebsd.org/~3d
+. visit http://people.FreeBSD.org/~3d
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index e85824ce75f8..5d2d73d88b61 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -10,7 +10,7 @@ DISTNAME= xv-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://www.freebsd.org/~shige/ports/xv/ \
+ http://people.FreeBSD.org/~shige/ports/xv/ \
http://www.yuasa.kuis.kyoto-u.ac.jp/~shige/FreeBSD/ports/xv/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
xv310a-jp-extension-rev5.3.3.tar.gz \
diff --git a/irc/nethirc/Makefile b/irc/nethirc/Makefile
index a8d6c65523d3..ada0b10c7575 100644
--- a/irc/nethirc/Makefile
+++ b/irc/nethirc/Makefile
@@ -9,7 +9,7 @@
DISTNAME= nethirc-0.04
CATEGORIES= irc
# broken - MASTER_SITES= ftp://ftp.nog.net/pub/tony/nethirc/
-MASTER_SITES= http://www.freebsd.org/~cpiazza/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~cpiazza/distfiles/
EXTRACT_SUFX= .tar.Z
MAINTAINER= andrews@technologist.com
diff --git a/japanese/gicq/Makefile b/japanese/gicq/Makefile
index 09a22caaadac..ce92b5f9bc07 100644
--- a/japanese/gicq/Makefile
+++ b/japanese/gicq/Makefile
@@ -9,10 +9,10 @@
DISTNAME= gicq-0.33
PKGNAME= ja-gicq-0.33
CATEGORIES= japanese net
-MASTER_SITES= http://www.freebsd.org/~flathill/distfiles/ \
+MASTER_SITES= http://people.FreeBSD.org/~flathill/distfiles/ \
ftp://ftp.korsoft.com/pub/gicq/
-PATCH_SITES= http://www.freebsd.org/~flathill/distfiles/ \
+PATCH_SITES= http://people.FreeBSD.org/~flathill/distfiles/ \
http://www-nagao.kuee.kyoto-u.ac.jp/member/taku/soft/
PATCHFILES= gicq-0.33ja.patch
PATCH_DIST_STRIP= -p1
diff --git a/japanese/jls/Makefile b/japanese/jls/Makefile
index 5b7423bd6cff..5280acb5acc2 100644
--- a/japanese/jls/Makefile
+++ b/japanese/jls/Makefile
@@ -10,7 +10,7 @@ DISTNAME= jls-0.1
PKGNAME= ja-ls-0.1
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_PORTS_JP} \
- http://www.freebsd.org/~shige/ports/
+ http://people.FreeBSD.org/~shige/ports/
MAINTAINER= shige@FreeBSD.org
diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile
index c38eb74f15c9..d83abf5f6294 100644
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@@ -11,7 +11,7 @@ PKGNAME= ja-kterm-6.2.0
CATEGORIES= japanese x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
${MASTER_SITE_PORTS_JP} \
- http://www.freebsd.org/~shige/ports/kterm/
+ http://people.FreeBSD.org/~shige/ports/kterm/
MASTER_SITE_SUBDIR= applications kterm
MAINTAINER= shige@FreeBSD.org
diff --git a/japanese/lambdamoo/Makefile b/japanese/lambdamoo/Makefile
index 0b5b7bfd88ae..cfb6a931e3ac 100644
--- a/japanese/lambdamoo/Makefile
+++ b/japanese/lambdamoo/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.place.org/pub/moo/unofficial/ \
ftp://ftp.leo.chubu.ac.jp/pub/network/mnews/
DISTFILES= LambdaMOO-1.8.0r8.tar.gz mnews122.tar.gz
-PATCH_SITES= http://www.freebsd.org/~flathill/distfiles/
+PATCH_SITES= http://people.FreeBSD.org/~flathill/distfiles/
PATCHFILES= ja-lambdamoo-19990704.patch.gz
MAINTAINER= flathill@FreeBSD.ORG
diff --git a/japanese/libicq/Makefile b/japanese/libicq/Makefile
index dc612b8fdf08..1fc2a12179e9 100644
--- a/japanese/libicq/Makefile
+++ b/japanese/libicq/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= japanese net
MASTER_SITES= ftp://ftp.korsoft.com/pub/gicq/ \
http://www.nectar.com/distfiles/
-PATCH_SITES= http://www.freebsd.org/~flathill/distfiles/ \
+PATCH_SITES= http://people.FreeBSD.org/~flathill/distfiles/ \
http://www-nagao.kuee.kyoto-u.ac.jp/member/taku/soft/
PATCHFILES= libicq-0.33ja.patch
PATCH_DIST_STRIP= -p1
diff --git a/japanese/lynx-current/Makefile b/japanese/lynx-current/Makefile
index 97a3e31c081e..314735c9215a 100644
--- a/japanese/lynx-current/Makefile
+++ b/japanese/lynx-current/Makefile
@@ -10,7 +10,7 @@ DISTNAME= lynx2.8.3dev.16
PKGNAME= ja-lynx-2.8.3dev.16
CATEGORIES= japanese www
MASTER_SITES= ${MASTER_SITE_PORTS_JP} \
- http://www.freebsd.org/~shige/ports/distfiles/ \
+ http://people.FreeBSD.org/~shige/ports/distfiles/ \
http://sol.slcc.edu/lynx/current/
MAINTAINER= shige@FreeBSD.org
diff --git a/japanese/mhonarc/Makefile b/japanese/mhonarc/Makefile
index f1edb85bae48..9f997122e07c 100644
--- a/japanese/mhonarc/Makefile
+++ b/japanese/mhonarc/Makefile
@@ -15,7 +15,7 @@ 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://www.freebsd.org/~flathill/distfiles/
+ http://people.FreeBSD.org/~flathill/distfiles/
DISTFILES= MHonArc2.3.3.tar.gz iso2022.pl
MAINTAINER= flathill@FreeBSD.org
diff --git a/japanese/micq/Makefile b/japanese/micq/Makefile
index 5ed94b408ac4..182e2ed62746 100644
--- a/japanese/micq/Makefile
+++ b/japanese/micq/Makefile
@@ -10,10 +10,10 @@ DISTNAME= micq-0.4.3
PKGNAME= ja-micq-0.4.3
CATEGORIES= japanese net
MASTER_SITES= ftp://micq.chatzone.org/pub/micq/V0.4.3/ \
- http://www.freebsd.org/~flathill/distfiles/
+ http://people.FreeBSD.org/~flathill/distfiles/
EXTRACT_SUFX= .tgz
-PATCH_SITES= http://www.freebsd.org/~flathill/distfiles/
+PATCH_SITES= http://people.FreeBSD.org/~flathill/distfiles/
PATCHFILES= micq-0.4.3-jp.patch
PATCH_DIST_STRIP= -p1
diff --git a/korean/hanterm/Makefile b/korean/hanterm/Makefile
index db93fab4951b..935223b13cc5 100644
--- a/korean/hanterm/Makefile
+++ b/korean/hanterm/Makefile
@@ -10,7 +10,7 @@ DISTNAME= hanterm-3.1.3
PKGNAME= ko-hanterm-3.1.3
CATEGORIES= korean x11
MASTER_SITES= ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/ \
- http://www.freebsd.org/~sada/distfiles/
+ http://people.FreeBSD.org/~sada/distfiles/
MAINTAINER= cjh@kr.freebsd.org
diff --git a/lang/cmucl/Makefile b/lang/cmucl/Makefile
index c25a8b6a7c98..dfd8e5969573 100644
--- a/lang/cmucl/Makefile
+++ b/lang/cmucl/Makefile
@@ -13,7 +13,7 @@ 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://www.freebsd.org/~cracauer/freebsd-distfiles/
+ http://people.FreeBSD.org/~cracauer/freebsd-distfiles/
EXTRACT_SUFX= .tgz
MAINTAINER= cracauer@cons.org
diff --git a/lang/m3gdb/Makefile b/lang/m3gdb/Makefile
index bc8231c89a16..6a96c2de2d18 100644
--- a/lang/m3gdb/Makefile
+++ b/lang/m3gdb/Makefile
@@ -8,7 +8,7 @@
DISTNAME= m3gdb-4.17
CATEGORIES= lang devel
-MASTER_SITES= http://www.freebsd.org/~jdp/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~jdp/distfiles/
DISTFILES= m3gdb-4.17.tar.gz \
m3gdb-fbsd-4.17.tar.gz
diff --git a/lang/objc/Makefile b/lang/objc/Makefile
index 821f08f9b9b8..fa0375ac1b25 100644
--- a/lang/objc/Makefile
+++ b/lang/objc/Makefile
@@ -9,7 +9,7 @@
DISTNAME= objc-3.1.5
CATEGORIES= lang
MASTER_SITES= http://metalab.unc.edu/pub/Linux/devel/lang/objc/ \
- http://www.freebsd.org/~chuckr/
+ http://people.FreeBSD.org/~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 fa433510b0f4..e5ded7965443 100644
--- a/lang/scsh/Makefile
+++ b/lang/scsh/Makefile
@@ -10,7 +10,7 @@ DISTNAME= scsh-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://www.freebsd.org/~cracauer/freebsd-distfiles/
+ http://people.FreeBSD.org/~cracauer/freebsd-distfiles/
MAINTAINER= cracauer@cons.org
diff --git a/lang/sml-mode.el/Makefile b/lang/sml-mode.el/Makefile
index 73ea00f24278..3dc32a2af51f 100644
--- a/lang/sml-mode.el/Makefile
+++ b/lang/sml-mode.el/Makefile
@@ -9,7 +9,7 @@
DISTNAME= sml-mode-3.3
CATEGORIES= lang elisp
MASTER_SITES= ftp://ftp.research.bell-labs.com/dist/smlnj/contrib/emacs/ \
- http://www.freebsd.org/~jkoshy/PORTS/
+ http://people.FreeBSD.org/~jkoshy/PORTS/
EXTRACT_SUFX= .tar.Z
MAINTAINER= jkoshy@FreeBSD.org
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 737de0f6ed31..9efe060f6008 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -10,7 +10,7 @@ DISTNAME= cyrus-imapd-v1.5.19
PKGNAME= cyrus-1.5.19
CATEGORIES= mail tcl82
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
- http://www.freebsd.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+ http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
MAINTAINER= stb@FreeBSD.org
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index 737de0f6ed31..9efe060f6008 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -10,7 +10,7 @@ DISTNAME= cyrus-imapd-v1.5.19
PKGNAME= cyrus-1.5.19
CATEGORIES= mail tcl82
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
- http://www.freebsd.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+ http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
MAINTAINER= stb@FreeBSD.org
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 737de0f6ed31..9efe060f6008 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -10,7 +10,7 @@ DISTNAME= cyrus-imapd-v1.5.19
PKGNAME= cyrus-1.5.19
CATEGORIES= mail tcl82
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
- http://www.freebsd.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+ http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
MAINTAINER= stb@FreeBSD.org
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 737de0f6ed31..9efe060f6008 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -10,7 +10,7 @@ DISTNAME= cyrus-imapd-v1.5.19
PKGNAME= cyrus-1.5.19
CATEGORIES= mail tcl82
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
- http://www.freebsd.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+ http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
MAINTAINER= stb@FreeBSD.org
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 737de0f6ed31..9efe060f6008 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -10,7 +10,7 @@ DISTNAME= cyrus-imapd-v1.5.19
PKGNAME= cyrus-1.5.19
CATEGORIES= mail tcl82
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
- http://www.freebsd.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+ http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
MAINTAINER= stb@FreeBSD.org
diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile
index 737de0f6ed31..9efe060f6008 100644
--- a/mail/cyrus/Makefile
+++ b/mail/cyrus/Makefile
@@ -10,7 +10,7 @@ DISTNAME= cyrus-imapd-v1.5.19
PKGNAME= cyrus-1.5.19
CATEGORIES= mail tcl82
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
- http://www.freebsd.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+ http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
MAINTAINER= stb@FreeBSD.org
diff --git a/mail/hbiff/Makefile b/mail/hbiff/Makefile
index 73159302b8c4..e84ed7c42371 100644
--- a/mail/hbiff/Makefile
+++ b/mail/hbiff/Makefile
@@ -10,7 +10,7 @@
DISTNAME= hbiff-1.2
CATEGORIES= mail
MASTER_SITES= ftp://ftp.nuxi.com/pub/misc/ \
- http://www.freebsd.org/~obrien/Distfiles/
+ http://people.FreeBSD.org/~obrien/Distfiles/
MAINTAINER= obrien@FreeBSD.org
diff --git a/mail/majorcool/Makefile b/mail/majorcool/Makefile
index ec6da90e22f5..3129d992eed1 100644
--- a/mail/majorcool/Makefile
+++ b/mail/majorcool/Makefile
@@ -8,7 +8,7 @@
DISTNAME= majorcool-1.3.2
CATEGORIES= mail
-MASTER_SITES= http://www.FreeBSD.org/~andreas/download/
+MASTER_SITES= http://people.FreeBSD.org/~andreas/download/
MAINTAINER= andreas@FreeBSD.org
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 8c1ade7fe124..22937dfe8527 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -32,7 +32,7 @@
DISTNAME= nmh-1.0.2
CATEGORIES= mail
MASTER_SITES= ftp://ftp.mhost.com/pub/nmh/ \
- http://www.freebsd.org/~jkoshy/PORTS/
+ http://people.FreeBSD.org/~jkoshy/PORTS/
MAINTAINER= Scott.Blachowicz@seaslug.org
diff --git a/mail/serialmail/Makefile b/mail/serialmail/Makefile
index cbc3c1c0130b..8469c388b98a 100644
--- a/mail/serialmail/Makefile
+++ b/mail/serialmail/Makefile
@@ -10,7 +10,7 @@ DISTNAME= serialmail-0.75
CATEGORIES= mail
MASTER_SITES= ftp://koobera.math.uic.edu/www/software/ \
ftp://ftp.qmail.org/pub/koobera.math.uic.edu/pub/software/ \
- http://www.freebsd.org/~tom/distfiles/
+ http://people.FreeBSD.org/~tom/distfiles/
MAINTAINER= tom@FreeBSD.org
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index 04b9cb714a1d..01c120f3fd23 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -9,7 +9,7 @@
DISTNAME= wmbiff-0.2
CATEGORIES= mail windowmaker afterstep
MASTER_SITES= http://ccat.elect.ru:8100/wmbiff/ \
- http://www.freebsd.org/~jim/distfiles/
+ http://people.FreeBSD.org/~jim/distfiles/
MAINTAINER= jim@FreeBSD.org
diff --git a/math/xgfe/Makefile b/math/xgfe/Makefile
index d237d96168ba..091c9150620e 100644
--- a/math/xgfe/Makefile
+++ b/math/xgfe/Makefile
@@ -8,7 +8,7 @@
DISTNAME= xgfe-2.0
CATEGORIES= math
-MASTER_SITES= http://www.freebsd.org/~mph/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~mph/distfiles/
MAINTAINER= mph@freebsd.org
diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index 046307711d9b..0268f5baa1b2 100644
--- a/mbone/rat/Makefile
+++ b/mbone/rat/Makefile
@@ -9,7 +9,7 @@
DISTNAME= rat-4.0.4
CATEGORIES= mbone audio
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/4.0.4/ \
- http://www.freebsd.org/~cpiazza/distfiles/
+ http://people.FreeBSD.org/~cpiazza/distfiles/
MAINTAINER= O.Hodson@cs.ucl.ac.uk
diff --git a/misc/buffer/Makefile b/misc/buffer/Makefile
index 5845890f0435..16629517fe8b 100644
--- a/misc/buffer/Makefile
+++ b/misc/buffer/Makefile
@@ -8,7 +8,7 @@
DISTNAME= buffer-1.17.1
CATEGORIES= misc
-MASTER_SITES= http://www.freebsd.org/~steve/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~steve/distfiles/
MAINTAINER= jonny@jonny.eng.br
diff --git a/misc/cstream/Makefile b/misc/cstream/Makefile
index 0d8429272c93..4e7925a4949f 100644
--- a/misc/cstream/Makefile
+++ b/misc/cstream/Makefile
@@ -12,7 +12,7 @@ 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://www.freebsd.org/~cracauer/homepage-mirror/download/
+ http://people.FreeBSD.org/~cracauer/homepage-mirror/download/
MAINTAINER= cracauer@cons.org
diff --git a/misc/fd/Makefile b/misc/fd/Makefile
index 1432160cd47b..bbb5aace37c2 100644
--- a/misc/fd/Makefile
+++ b/misc/fd/Makefile
@@ -10,7 +10,7 @@ DISTNAME= FD-1.03l
PKGNAME= fd-1.03l
CATEGORIES= misc
MASTER_SITES= ftp://ftp.ics.es.osaka-u.ac.jp/pub/FDclone/ \
- http://www.freebsd.org/~steve/distfiles/
+ http://people.FreeBSD.org/~steve/distfiles/
MAINTAINER= nobu@psrc.isac.co.jp
diff --git a/misc/figlet/Makefile b/misc/figlet/Makefile
index 977fb3b3445d..212de4986daf 100644
--- a/misc/figlet/Makefile
+++ b/misc/figlet/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= misc
MASTER_SITES= ftp://wuarchive.wustl.edu/graphics/graphics/misc/figlet/program/unix/ \
ftp://ftp.funet.fi/pub/unix/tools/figlet/program/unix/ \
ftp://ftp.internexus.net/pub/figlet/program/unix/ \
- http://www.freebsd.org/~obrien/Distfiles/ \
+ http://people.FreeBSD.org/~obrien/Distfiles/ \
ftp://ftp.nuxi.com/pub/misc/
MAINTAINER= obrien@FreeBSD.org
diff --git a/misc/rtfm/Makefile b/misc/rtfm/Makefile
index 14e8a2dc2c63..e791fafe1372 100644
--- a/misc/rtfm/Makefile
+++ b/misc/rtfm/Makefile
@@ -8,7 +8,7 @@
DISTNAME= rtfm-1.0
CATEGORIES= misc
-MASTER_SITES= http://www.freebsd.org/~chris/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~chris/distfiles/
MAINTAINER= chris@FreeBSD.org
diff --git a/misc/tet/Makefile b/misc/tet/Makefile
index 08bc828df41b..f8e18427a327 100644
--- a/misc/tet/Makefile
+++ b/misc/tet/Makefile
@@ -10,7 +10,7 @@ DISTNAME= tet3.3d-unsup
PKGNAME= tet-3.3d
CATEGORIES= misc
MASTER_SITES= ftp://ftp.rdg.opengroup.org/pub/TET/TET3/ \
- http://www.FreeBSD.org/~jkoshy/PORTS/
+ http://people.FreeBSD.org/~jkoshy/PORTS/
EXTRACT_SUFX= .src.tar.gz
MAINTAINER= jkoshy@freebsd.org
diff --git a/misc/uk-phone/Makefile b/misc/uk-phone/Makefile
index 6535c3adea50..7ce8c621ccd3 100644
--- a/misc/uk-phone/Makefile
+++ b/misc/uk-phone/Makefile
@@ -10,7 +10,7 @@ DISTNAME= uk.phone
PKGNAME= uk-phone-1.0
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_LOCAL} \
- http://www.freebsd.org/~wosch/src/
+ http://people.FreeBSD.org/~wosch/src/
EXTRACT_SUFX= .gz
MAINTAINER= brian@FreeBSD.org
diff --git a/misc/uk-postcodes/Makefile b/misc/uk-postcodes/Makefile
index deb92e4cc173..fcba7d0d1cdf 100644
--- a/misc/uk-postcodes/Makefile
+++ b/misc/uk-postcodes/Makefile
@@ -10,7 +10,7 @@ DISTNAME= uk.postcodes
PKGNAME= uk-postcodes-1.0
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_LOCAL} \
- http://www.freebsd.org/~wosch/src/
+ http://people.FreeBSD.org/~wosch/src/
EXTRACT_SUFX= .gz
MAINTAINER= brian@FreeBSD.org
diff --git a/misc/us-zipcodes/Makefile b/misc/us-zipcodes/Makefile
index 7b546d849b73..32cf48cb7896 100644
--- a/misc/us-zipcodes/Makefile
+++ b/misc/us-zipcodes/Makefile
@@ -10,7 +10,7 @@ DISTNAME= zipcodes
PKGNAME= us-zipcodes-1.0
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_LOCAL} \
- http://www.freebsd.org/~wosch/src/
+ http://people.FreeBSD.org/~wosch/src/
EXTRACT_SUFX= .gz
MAINTAINER= ports@FreeBSD.org
diff --git a/multimedia/fxtv/pkg-descr b/multimedia/fxtv/pkg-descr
index 750a8edbbefa..cc0c06c59621 100644
--- a/multimedia/fxtv/pkg-descr
+++ b/multimedia/fxtv/pkg-descr
@@ -9,7 +9,7 @@ III.
Refer to the README for details on usage
-WWW: http://www.freebsd.org/~rhh/fxtv
+WWW: http://people.FreeBSD.org/~rhh/fxtv
Note on Bt848/Bt878 bktr driver:
FXTV 1.00 requires release 1.66 (or later) of the Bt848/Bt878 driver.
@@ -17,5 +17,5 @@ FXTV 1.00 requires release 1.66 (or later) of the Bt848/Bt878 driver.
Newer versions of the Bt848/Bt878 driver for FreeBSD 2.2.x, 3.x and 4.x
can be found
-at http://www.freebsd.org/~roger
+at http://people.FreeBSD.org/~roger
or http://telepresence.dmem.strath.ac.uk/bt848
diff --git a/multimedia/spigot/Makefile b/multimedia/spigot/Makefile
index 1a6accd048ad..9e249672afc2 100644
--- a/multimedia/spigot/Makefile
+++ b/multimedia/spigot/Makefile
@@ -8,7 +8,7 @@
DISTNAME= spigot-1.7
CATEGORIES= graphics
-MASTER_SITES= http://www.freebsd.org/~fenner/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~fenner/distfiles/
DISTFILES= spigot.1.7.tar.gz
MAINTAINER= james@cs.uwm.edu
diff --git a/net-im/gicq/Makefile b/net-im/gicq/Makefile
index 7c1a325e1a81..2fe0b9425991 100644
--- a/net-im/gicq/Makefile
+++ b/net-im/gicq/Makefile
@@ -8,7 +8,7 @@
DISTNAME= gicq-0.33
CATEGORIES= net
-MASTER_SITES= http://www.freebsd.org/~flathill/distfiles/ \
+MASTER_SITES= http://people.FreeBSD.org/~flathill/distfiles/ \
ftp://ftp.korsoft.com/pub/gicq/
MAINTAINER= flathill@FreeBSD.org
diff --git a/net-mgmt/ciscoconf/Makefile b/net-mgmt/ciscoconf/Makefile
index ca99beb43bb3..0bf451653b92 100644
--- a/net-mgmt/ciscoconf/Makefile
+++ b/net-mgmt/ciscoconf/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ciscoconf-1.0beta1
PKGNAME= ciscoconf-1.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.patho.gen.nz/pub/users/jabley/ \
- http://www.FreeBSD.org/~billf/
+ http://people.FreeBSD.org/~billf/
MAINTAINER= jabley@clear.co.nz
diff --git a/net/bounce/Makefile b/net/bounce/Makefile
index 8cc8a026739e..7c47989e5bcc 100644
--- a/net/bounce/Makefile
+++ b/net/bounce/Makefile
@@ -11,7 +11,7 @@ DISTNAME= bounce
PKGNAME= bounce-1.0
CATEGORIES= net security
MASTER_SITES= http://www.eleves.ens.fr:8080/home/espel/ \
- http://www.freebsd.org/~obrien/Distfiles/
+ http://people.FreeBSD.org/~obrien/Distfiles/
EXTRACT_SUFX= .c
MAINTAINER= obrien@FreeBSD.org
diff --git a/net/ciscoconf/Makefile b/net/ciscoconf/Makefile
index ca99beb43bb3..0bf451653b92 100644
--- a/net/ciscoconf/Makefile
+++ b/net/ciscoconf/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ciscoconf-1.0beta1
PKGNAME= ciscoconf-1.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.patho.gen.nz/pub/users/jabley/ \
- http://www.FreeBSD.org/~billf/
+ http://people.FreeBSD.org/~billf/
MAINTAINER= jabley@clear.co.nz
diff --git a/net/ggsd/Makefile b/net/ggsd/Makefile
index 8c075623f8cb..dd68d281803f 100644
--- a/net/ggsd/Makefile
+++ b/net/ggsd/Makefile
@@ -9,7 +9,7 @@
DISTNAME= ggsd
PKGNAME= ggsd-0.1
CATEGORIES= net
-MASTER_SITES= http://www.FreeBSD.org/~billf/distfiles/ \
+MASTER_SITES= http://people.FreeBSD.org/~billf/distfiles/ \
ftp://ftp.gpad.ac.ru/pub/FreeBSD/distfiles/
EXTRACT_SUFX= .tar
diff --git a/net/gicq/Makefile b/net/gicq/Makefile
index 7c1a325e1a81..2fe0b9425991 100644
--- a/net/gicq/Makefile
+++ b/net/gicq/Makefile
@@ -8,7 +8,7 @@
DISTNAME= gicq-0.33
CATEGORIES= net
-MASTER_SITES= http://www.freebsd.org/~flathill/distfiles/ \
+MASTER_SITES= http://people.FreeBSD.org/~flathill/distfiles/ \
ftp://ftp.korsoft.com/pub/gicq/
MAINTAINER= flathill@FreeBSD.org
diff --git a/net/macipgw/Makefile b/net/macipgw/Makefile
index 0e884012ea03..64918aea5fcb 100644
--- a/net/macipgw/Makefile
+++ b/net/macipgw/Makefile
@@ -9,7 +9,7 @@
DISTNAME= macipgw-1.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.hanse.de/sites/transit/netatalk/ \
- http://www.freebsd.org/~stb/netatalk/
+ http://people.FreeBSD.org/~stb/netatalk/
MAINTAINER= stb@freebsd.org
diff --git a/net/netatalk-asun/Makefile b/net/netatalk-asun/Makefile
index ccdfa2ad29de..640b6804dc26 100644
--- a/net/netatalk-asun/Makefile
+++ b/net/netatalk-asun/Makefile
@@ -10,7 +10,7 @@ DISTNAME= netatalk-1.4b2+asun2.1.3
PKGNAME= netatalk-1.4b2+asun-2.1.3
CATEGORIES= net print
MASTER_SITES= ftp://ftp.u.washington.edu/public/asun/ \
- http://www.freebsd.org/~stb/mirror/ftp.u.washington.edu/public/asun/ \
+ http://people.FreeBSD.org/~stb/mirror/ftp.u.washington.edu/public/asun/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.u.washington.edu/public/asun/
MAINTAINER= stb@freebsd.org
diff --git a/net/netatalk-devel/Makefile b/net/netatalk-devel/Makefile
index 0e90862d24e3..7da873333cca 100644
--- a/net/netatalk-devel/Makefile
+++ b/net/netatalk-devel/Makefile
@@ -9,11 +9,11 @@
DISTNAME= netatalk-1.4b2
CATEGORIES= net print
MASTER_SITES= ftp://terminator.rs.itd.umich.edu/unix/netatalk/ \
- http://www.freebsd.org/~stb/mirror/terminator.rs.itd.umich.edu/unix/netatalk/ \
+ http://people.FreeBSD.org/~stb/mirror/terminator.rs.itd.umich.edu/unix/netatalk/ \
ftp://ftp.hanse.de/sites/transit/mirror/terminator.rs.itd.umich.edu/unix/netatalk/
PATCH_SITES= http://www.umich.edu/~rsug/netatalk/patches/1.4b2/ \
- http://www.freebsd.org/~stb/mirror/www.umich.edu/%7Ersug/netatalk/patches/1.4b2/ \
+ http://people.FreeBSD.org/~stb/mirror/www.umich.edu/%7Ersug/netatalk/patches/1.4b2/ \
ftp://ftp.hanse.de/sites/transit/mirror/www.umich.edu/%257Ersug/netatalk/patches/1.4b2/
PATCHFILES= afpd-macos8.diff afpd-bfree.diff
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 0e90862d24e3..7da873333cca 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -9,11 +9,11 @@
DISTNAME= netatalk-1.4b2
CATEGORIES= net print
MASTER_SITES= ftp://terminator.rs.itd.umich.edu/unix/netatalk/ \
- http://www.freebsd.org/~stb/mirror/terminator.rs.itd.umich.edu/unix/netatalk/ \
+ http://people.FreeBSD.org/~stb/mirror/terminator.rs.itd.umich.edu/unix/netatalk/ \
ftp://ftp.hanse.de/sites/transit/mirror/terminator.rs.itd.umich.edu/unix/netatalk/
PATCH_SITES= http://www.umich.edu/~rsug/netatalk/patches/1.4b2/ \
- http://www.freebsd.org/~stb/mirror/www.umich.edu/%7Ersug/netatalk/patches/1.4b2/ \
+ http://people.FreeBSD.org/~stb/mirror/www.umich.edu/%7Ersug/netatalk/patches/1.4b2/ \
ftp://ftp.hanse.de/sites/transit/mirror/www.umich.edu/%257Ersug/netatalk/patches/1.4b2/
PATCHFILES= afpd-macos8.diff afpd-bfree.diff
diff --git a/net/nttcp/Makefile b/net/nttcp/Makefile
index 2e7ec17593cd..ddb37b804cdd 100644
--- a/net/nttcp/Makefile
+++ b/net/nttcp/Makefile
@@ -9,7 +9,7 @@
DISTNAME= nttcp-1.45
CATEGORIES= net benchmarks
MASTER_SITES= http://users.leo.org/~bartel/nttcp/ \
- http://www.FreeBSD.org/~billf/
+ http://people.FreeBSD.org/~billf/
MAINTAINER= billf@FreeBSD.org
diff --git a/net/pathchar/Makefile b/net/pathchar/Makefile
index 5dba22a3f3bd..7b8fbdc7bd58 100644
--- a/net/pathchar/Makefile
+++ b/net/pathchar/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.ee.lbl.gov/pathchar/ \
http://www.caida.org/Tools/Pathchar/ \
http://www.fips.de/Computer/woman/ \
http://sitka.triumf.ca/net/ \
- http://www.freebsd.org/~obrien/Distfiles/
+ http://people.FreeBSD.org/~obrien/Distfiles/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} pathcharnotes.html pathchar.8 \
pathchar.mantxt
diff --git a/net/ppp-nt/Makefile b/net/ppp-nt/Makefile
index e03f79c37885..5a236fbbe285 100644
--- a/net/ppp-nt/Makefile
+++ b/net/ppp-nt/Makefile
@@ -10,10 +10,10 @@ DISTNAME= ppp-2.2.7
PKGNAME= ppp-nt-2.2.7
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_PORTS_JP} \
- http://www.freebsd.org/~sada/distfiles/
+ http://people.FreeBSD.org/~sada/distfiles/
PATCH_SITES= http://www.rr.iij4u.or.jp/~sada/patches/ \
- http://www.freebsd.org/~sada/distfiles/
+ http://people.FreeBSD.org/~sada/distfiles/
PATCHFILES= nat-980920.patch.gz ppp-2.2.7-telehoudai.diff.gz
PATCH_DIST_STRIP= -p1
diff --git a/net/relay/Makefile b/net/relay/Makefile
index 5b31c7152a02..08a351655f38 100644
--- a/net/relay/Makefile
+++ b/net/relay/Makefile
@@ -11,7 +11,7 @@ DISTNAME= relay
PKGNAME= relay-1.10
CATEGORIES= net security
MASTER_SITES= http://www.iagora.com/~espel/ \
- http://www.freebsd.org/~obrien/Distfiles/
+ http://people.FreeBSD.org/~obrien/Distfiles/
MAINTAINER= obrien@FreeBSD.org
diff --git a/net/sharity-light/Makefile b/net/sharity-light/Makefile
index 3e752387a66e..ae988ca0b795 100644
--- a/net/sharity-light/Makefile
+++ b/net/sharity-light/Makefile
@@ -11,7 +11,7 @@ PKGNAME= sharity-light-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://www.freebsd.org/~dt/distfiles/
+ http://people.FreeBSD.org/~dt/distfiles/
MAINTAINER= dt@FreeBSD.org
diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile
index 83299b89775b..2fd28c52358e 100644
--- a/net/sniffit/Makefile
+++ b/net/sniffit/Makefile
@@ -11,7 +11,7 @@ DISTNAME= sniffit.0.3.7.beta
PKGNAME= sniffit-0.3.7b
CATEGORIES= net security
MASTER_SITES= http://reptile.rug.ac.be/~coder/sniffit/files/ \
- http://www.freebsd.org/~obrien/Distfiles/
+ http://people.FreeBSD.org/~obrien/Distfiles/
MAINTAINER= obrien@FreeBSD.org
diff --git a/net/tcpshow/Makefile b/net/tcpshow/Makefile
index acab7e5ef88b..aafaaceb2439 100644
--- a/net/tcpshow/Makefile
+++ b/net/tcpshow/Makefile
@@ -9,7 +9,7 @@
DISTNAME= tcpshow-1.74
CATEGORIES= net security
-MASTER_SITES= http://www.freebsd.org/~obrien/Distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~obrien/Distfiles/
# http://www.cs.berkeley.edu/~daw/mike/
DISTFILES= tcpshow.c tcpshow.1
diff --git a/net/telserv/Makefile b/net/telserv/Makefile
index bb8f80592103..634fb4742f64 100644
--- a/net/telserv/Makefile
+++ b/net/telserv/Makefile
@@ -11,7 +11,7 @@ DISTNAME= telserv
PKGNAME= telserv-1.0
CATEGORIES= net security
MASTER_SITES= http://www.eleves.ens.fr:8080/home/espel/ \
- http://www.freebsd.org/~obrien/Distfiles/
+ http://people.FreeBSD.org/~obrien/Distfiles/
EXTRACT_SUFX= .c
MAINTAINER= obrien@FreeBSD.org
diff --git a/news/dejasearch/Makefile b/news/dejasearch/Makefile
index 876f2798d243..19a33f35d3da 100644
--- a/news/dejasearch/Makefile
+++ b/news/dejasearch/Makefile
@@ -10,7 +10,7 @@ DISTNAME= dejasearch-1.7.2
CATEGORIES= news
MASTER_SITES= http://homemade.hypermart.net/dejasearch/ \
http://homemade.virtualave.net/dejasearch/ \
- http://www.freebsd.org/~kris/distfiles/
+ http://people.FreeBSD.org/~kris/distfiles/
MAINTAINER= kris@FreeBSD.org
diff --git a/news/inn-stable/Makefile b/news/inn-stable/Makefile
index 40bb70847f89..bf1677432173 100644
--- a/news/inn-stable/Makefile
+++ b/news/inn-stable/Makefile
@@ -8,7 +8,7 @@
DISTNAME= inn-STABLE_2_2-1999-12-26_03-02
PKGNAME= inn-stable-v22
CATEGORIES= news
-MASTER_SITES= http://www.FreeBSD.org/~andreas/download/ \
+MASTER_SITES= http://people.FreeBSD.org/~andreas/download/ \
ftp://ftp.isc.org/isc/inn/snapshots/
MAINTAINER= andreas@FreeBSD.org
diff --git a/news/unpost/Makefile b/news/unpost/Makefile
index 48a0687153a8..1a5c00bbc071 100644
--- a/news/unpost/Makefile
+++ b/news/unpost/Makefile
@@ -8,7 +8,7 @@
DISTNAME= unpost-2.3.4
CATEGORIES= news
-MASTER_SITES= http://www.freebsd.org/~steve/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~steve/distfiles/
MAINTAINER= volf@oasis.IAEhv.nl
diff --git a/ports-mgmt/pib/Makefile b/ports-mgmt/pib/Makefile
index 028d0c77b540..646aa3c33cb9 100644
--- a/ports-mgmt/pib/Makefile
+++ b/ports-mgmt/pib/Makefile
@@ -8,7 +8,7 @@
DISTNAME= pib-1.1
CATEGORIES= sysutils tk82
-MASTER_SITES= http://www.freebsd.org/~msmith/pib/
+MASTER_SITES= http://people.FreeBSD.org/~msmith/pib/
MAINTAINER= msmith@freebsd.org
diff --git a/print/a2ps-letter/Makefile b/print/a2ps-letter/Makefile
index 63802546d6bd..ba5a072e259f 100644
--- a/print/a2ps-letter/Makefile
+++ b/print/a2ps-letter/Makefile
@@ -9,7 +9,7 @@
DISTNAME= a2ps-4.12
PKGNAME= a2ps-${PAPERSIZE}-4.12
CATEGORIES= print
-MASTER_SITES= http://www.freebsd.org/~chuckr/ \
+MASTER_SITES= http://people.FreeBSD.org/~chuckr/ \
ftp://ftp.enst.fr/pub/unix/a2ps/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} sheets.map
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index a9b70fba9d35..cb7b723a4ddf 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -8,7 +8,7 @@
DISTNAME= apsfilter-5.1.4
CATEGORIES= print
-MASTER_SITES= http://www.FreeBSD.org/~andreas/apsfilter/download/
+MASTER_SITES= http://people.FreeBSD.org/~andreas/apsfilter/download/
MAINTAINER= andreas@FreeBSD.org
diff --git a/print/apsfilter/pkg-descr b/print/apsfilter/pkg-descr
index d007df16d888..eb19961c56f6 100644
--- a/print/apsfilter/pkg-descr
+++ b/print/apsfilter/pkg-descr
@@ -20,4 +20,4 @@ License Information: GNU GPL and so called "Postcard License". You have to
write me a postcard if you use apsfilter. Request my snail mail address
by writing mail to mailto:request-snailmail@klemm.gtn.com
-WWW: http://www.freebsd.org/~andreas/apsfilter/index.html
+WWW: http://people.FreeBSD.org/~andreas/apsfilter/index.html
diff --git a/print/apsfilter6/Makefile b/print/apsfilter6/Makefile
index a9b70fba9d35..cb7b723a4ddf 100644
--- a/print/apsfilter6/Makefile
+++ b/print/apsfilter6/Makefile
@@ -8,7 +8,7 @@
DISTNAME= apsfilter-5.1.4
CATEGORIES= print
-MASTER_SITES= http://www.FreeBSD.org/~andreas/apsfilter/download/
+MASTER_SITES= http://people.FreeBSD.org/~andreas/apsfilter/download/
MAINTAINER= andreas@FreeBSD.org
diff --git a/print/apsfilter6/pkg-descr b/print/apsfilter6/pkg-descr
index d007df16d888..eb19961c56f6 100644
--- a/print/apsfilter6/pkg-descr
+++ b/print/apsfilter6/pkg-descr
@@ -20,4 +20,4 @@ License Information: GNU GPL and so called "Postcard License". You have to
write me a postcard if you use apsfilter. Request my snail mail address
by writing mail to mailto:request-snailmail@klemm.gtn.com
-WWW: http://www.freebsd.org/~andreas/apsfilter/index.html
+WWW: http://people.FreeBSD.org/~andreas/apsfilter/index.html
diff --git a/print/jadetex/Makefile b/print/jadetex/Makefile
index 7f416d584cbf..cd99ee4d8bbb 100644
--- a/print/jadetex/Makefile
+++ b/print/jadetex/Makefile
@@ -17,7 +17,7 @@ CATEGORIES= print
VERSION= 2.3
PKGNAME= ${DISTNAME}-${VERSION}
MAINTAINER= kelly@plutotech.com
-MASTER_SITES= http://www.freebsd.org/~nik/distfiles/jadetex/
+MASTER_SITES= http://people.FreeBSD.org/~nik/distfiles/jadetex/
DISTFILES= Makefile.jadetex jadetex.dtx jadetex.ini jadetex.ins \
pdfjadetex.ini
DIST_SUBDIR= jadetex
diff --git a/print/perlftlib/Makefile b/print/perlftlib/Makefile
index 14d50503679b..dcfeea98e942 100644
--- a/print/perlftlib/Makefile
+++ b/print/perlftlib/Makefile
@@ -10,7 +10,7 @@ DISTNAME= perlftlib-1.2
CATEGORIES= print perl5
MASTER_SITES= ftp://ftp.big.or.jp/pub/usr2/jam/ft/ \
${MASTER_SITE_PORTS_JP} \
- http://WWW.FreeBSD.org/~sada/distfiles/
+ http://people.FreeBSD.org/~sada/distfiles/
MAINTAINER= taoka@FreeBSD.org
diff --git a/security/checkpassword/Makefile b/security/checkpassword/Makefile
index c31d11cbd497..6bc11dff896c 100644
--- a/security/checkpassword/Makefile
+++ b/security/checkpassword/Makefile
@@ -9,7 +9,7 @@
DISTNAME= checkpassword-0.81
CATEGORIES= security
MASTER_SITES= http://cr.yp.to/software/ \
- http://WWW.FreeBSD.org/~sada/distfiles/ \
+ http://people.FreeBSD.org/~sada/distfiles/ \
${MASTER_SITE_PORTS_JP}
MAINTAINER= sada@FreeBSD.org
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index a97f3cbe1ecd..e819d4113457 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -9,7 +9,7 @@
DISTNAME= cyrus-sasl-${SASL_VER}
CATEGORIES= security
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
- http://www.freebsd.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+ http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/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 a97f3cbe1ecd..e819d4113457 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -9,7 +9,7 @@
DISTNAME= cyrus-sasl-${SASL_VER}
CATEGORIES= security
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
- http://www.freebsd.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+ http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
MAINTAINER= hetzels@westbend.net
diff --git a/security/gtkportscan/Makefile b/security/gtkportscan/Makefile
index eb1932a0472f..afdd074a4661 100644
--- a/security/gtkportscan/Makefile
+++ b/security/gtkportscan/Makefile
@@ -9,7 +9,7 @@
DISTNAME= gtkportscan-1.2
CATEGORIES= security net
#MASTER_SITES= http://armageddon.splorg.org/gtkportscan/
-MASTER_SITES= http://www.FreeBSD.org/~cpiazza/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~cpiazza/distfiles/
MAINTAINER= cpiazza@FreeBSD.org
diff --git a/security/keyprint/Makefile b/security/keyprint/Makefile
index 491f8860ce6c..5b9e7b33a1d4 100644
--- a/security/keyprint/Makefile
+++ b/security/keyprint/Makefile
@@ -8,7 +8,7 @@
DISTNAME= keyprint-1.0
CATEGORIES= security
-MASTER_SITES= http://www.freebsd.org/~mharo/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~mharo/distfiles/
MAINTAINER= mharo@FreeBSD.org
diff --git a/security/opieprint/Makefile b/security/opieprint/Makefile
index 491f8860ce6c..5b9e7b33a1d4 100644
--- a/security/opieprint/Makefile
+++ b/security/opieprint/Makefile
@@ -8,7 +8,7 @@
DISTNAME= keyprint-1.0
CATEGORIES= security
-MASTER_SITES= http://www.freebsd.org/~mharo/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~mharo/distfiles/
MAINTAINER= mharo@FreeBSD.org
diff --git a/security/portscanner/Makefile b/security/portscanner/Makefile
index 767ebdb14d73..9fe331b8762c 100644
--- a/security/portscanner/Makefile
+++ b/security/portscanner/Makefile
@@ -10,7 +10,7 @@ DISTNAME= PortScanner-1.0
PKGNAME= portscanner-1.0
CATEGORIES= security net
MASTER_SITES= http://www.ameth.org/~veilleux/ \
- http://www.FreeBSD.org/~billf/
+ http://people.FreeBSD.org/~billf/
MAINTAINER= billf@FreeBSD.org
diff --git a/security/vscan/Makefile b/security/vscan/Makefile
index 9dcce8a61bfa..e606aae06851 100644
--- a/security/vscan/Makefile
+++ b/security/vscan/Makefile
@@ -10,7 +10,7 @@ DISTNAME= nlxb318e
PKGNAME= vscan-3.1.8
CATEGORIES= security
MASTER_SITES= ftp://ftp.mcafee.com/pub/antivirus/unix/linux/ \
- http://www.freebsd.org/~steve/distfiles/
+ http://people.FreeBSD.org/~steve/distfiles/
EXTRACT_SUFX= .tar
MAINTAINER= obrien@FreeBSD.org
diff --git a/shells/fd/Makefile b/shells/fd/Makefile
index 1432160cd47b..bbb5aace37c2 100644
--- a/shells/fd/Makefile
+++ b/shells/fd/Makefile
@@ -10,7 +10,7 @@ DISTNAME= FD-1.03l
PKGNAME= fd-1.03l
CATEGORIES= misc
MASTER_SITES= ftp://ftp.ics.es.osaka-u.ac.jp/pub/FDclone/ \
- http://www.freebsd.org/~steve/distfiles/
+ http://people.FreeBSD.org/~steve/distfiles/
MAINTAINER= nobu@psrc.isac.co.jp
diff --git a/shells/sash/Makefile b/shells/sash/Makefile
index 1945c773ede6..a02beff5ad81 100644
--- a/shells/sash/Makefile
+++ b/shells/sash/Makefile
@@ -9,7 +9,7 @@
DISTNAME= sash-3.4
CATEGORIES= shells
MASTER_SITES= http://www.pcug.org.au/~dbell/programs/ \
- http://www.freebsd.org/~patrick/
+ http://people.FreeBSD.org/~patrick/
MAINTAINER= patrick@freebsd.org
diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index fa433510b0f4..e5ded7965443 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -10,7 +10,7 @@ DISTNAME= scsh-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://www.freebsd.org/~cracauer/freebsd-distfiles/
+ http://people.FreeBSD.org/~cracauer/freebsd-distfiles/
MAINTAINER= cracauer@cons.org
diff --git a/sysutils/cd-write/Makefile b/sysutils/cd-write/Makefile
index ffcd2d57bca1..8cf02abd3ba2 100644
--- a/sysutils/cd-write/Makefile
+++ b/sysutils/cd-write/Makefile
@@ -8,7 +8,7 @@
DISTNAME= cd-write-1.4.1
CATEGORIES= sysutils
-MASTER_SITES= http://www.FreeBSD.org/~jmz/
+MASTER_SITES= http://people.FreeBSD.org/~jmz/
MAINTAINER= jmz@FreeBSD.org
diff --git a/sysutils/ffsrecov/Makefile b/sysutils/ffsrecov/Makefile
index 5eb60440587f..4bb1cf60acd2 100644
--- a/sysutils/ffsrecov/Makefile
+++ b/sysutils/ffsrecov/Makefile
@@ -9,7 +9,7 @@
DISTNAME= ffsrecov
PKGNAME= ffsrecov-0.1
CATEGORIES= sysutils
-MASTER_SITES= http://www.freebsd.org/~jmg/
+MASTER_SITES= http://people.FreeBSD.org/~jmg/
MAINTAINER= jmg@freebsd.org
diff --git a/sysutils/glload/Makefile b/sysutils/glload/Makefile
index 495d1ea83e57..936861c37574 100644
--- a/sysutils/glload/Makefile
+++ b/sysutils/glload/Makefile
@@ -9,7 +9,7 @@
DISTNAME= glload-0.4.0
CATEGORIES= sysutils
MASTER_SITES= http://glload.netpedia.net/source/ \
- http://www.freebsd.org/~vanilla/
+ http://people.FreeBSD.org/~vanilla/
MAINTAINER= vanilla@FreeBSD.org
diff --git a/sysutils/mei/Makefile b/sysutils/mei/Makefile
index f82d80638869..8b050bc64ce7 100644
--- a/sysutils/mei/Makefile
+++ b/sysutils/mei/Makefile
@@ -9,7 +9,7 @@
DISTNAME= mei-1.53
CATEGORIES= sysutils
MASTER_SITES= http://www.vector.co.jp/authors/VA001240/archive/ \
- http://www.freebsd.org/~itojun/distfiles/
+ http://people.FreeBSD.org/~itojun/distfiles/
DISTFILES= mei153s.tgz mei153d.tgz
MAINTAINER= itojun@itojun.org
diff --git a/sysutils/pib/Makefile b/sysutils/pib/Makefile
index 028d0c77b540..646aa3c33cb9 100644
--- a/sysutils/pib/Makefile
+++ b/sysutils/pib/Makefile
@@ -8,7 +8,7 @@
DISTNAME= pib-1.1
CATEGORIES= sysutils tk82
-MASTER_SITES= http://www.freebsd.org/~msmith/pib/
+MASTER_SITES= http://people.FreeBSD.org/~msmith/pib/
MAINTAINER= msmith@freebsd.org
diff --git a/sysutils/rdate/Makefile b/sysutils/rdate/Makefile
index 9b062b2f32ca..649f7db7b3a5 100644
--- a/sysutils/rdate/Makefile
+++ b/sysutils/rdate/Makefile
@@ -9,7 +9,7 @@
DISTNAME= rdate-1.0
CATEGORIES= sysutils
MASTER_SITES= http://www2.cons.org:8000/freebsd-distfiles/ \
- http://www.freebsd.org/~cracauer/freebsd-distfiles/
+ http://people.FreeBSD.org/~cracauer/freebsd-distfiles/
MAINTAINER= cracauer@cons.org
diff --git a/textproc/chpp/Makefile b/textproc/chpp/Makefile
index 669216e6254c..9059552bed8c 100644
--- a/textproc/chpp/Makefile
+++ b/textproc/chpp/Makefile
@@ -8,7 +8,7 @@
DISTNAME= chpp-0.3.5
CATEGORIES= textproc
-MASTER_SITES= http://www.FreeBSD.org/~andy/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~andy/distfiles/
MAINTAINER= andy@icc.surw.chel.su
diff --git a/textproc/docbook-241/pkg-descr b/textproc/docbook-241/pkg-descr
index b60d9dc4de62..cae00db876d9 100644
--- a/textproc/docbook-241/pkg-descr
+++ b/textproc/docbook-241/pkg-descr
@@ -10,7 +10,7 @@ ftp://ftp.ora.com/pub/davenport/).
This port contains DocBook 2.4.1
The DocBook documentation is available in ASCII and PDF
-at http://www.freebsd.org/~wosch/docbook/
+at http://people.FreeBSD.org/~wosch/docbook/
Nik Clayton
nik@freebsd.org
diff --git a/textproc/docbook-300/pkg-descr b/textproc/docbook-300/pkg-descr
index 7a54da1a70f6..41c3887c7dd1 100644
--- a/textproc/docbook-300/pkg-descr
+++ b/textproc/docbook-300/pkg-descr
@@ -10,7 +10,7 @@ ftp://ftp.ora.com/pub/davenport/).
This port contains DocBook 3.0
The DocBook documentation is available in ASCII and PDF
-at http://www.freebsd.org/~wosch/docbook/
+at http://people.FreeBSD.org/~wosch/docbook/
Nik Clayton
nik@freebsd.org
diff --git a/textproc/docbook-310/pkg-descr b/textproc/docbook-310/pkg-descr
index fb8d9126bfba..95ec16f95775 100644
--- a/textproc/docbook-310/pkg-descr
+++ b/textproc/docbook-310/pkg-descr
@@ -10,7 +10,7 @@ ftp://ftp.ora.com/pub/davenport/).
This port contains DocBook 3.1
The DocBook documentation is available in ASCII and PDF
-at http://www.freebsd.org/~wosch/docbook/
+at http://people.FreeBSD.org/~wosch/docbook/
Nik Clayton
nik@freebsd.org
diff --git a/textproc/tkdiff/Makefile b/textproc/tkdiff/Makefile
index a7d0a61087c2..90814e64a3a3 100644
--- a/textproc/tkdiff/Makefile
+++ b/textproc/tkdiff/Makefile
@@ -8,7 +8,7 @@
DISTNAME= tkdiff-3.04
CATEGORIES= textproc tk82
-MASTER_SITES= http://www.freebsd.org/~kevlo/
+MASTER_SITES= http://people.FreeBSD.org/~kevlo/
MAINTAINER= kevlo@FreeBSD.org
diff --git a/textproc/tth/Makefile b/textproc/tth/Makefile
index 243b3f96e9f0..87704fd57132 100644
--- a/textproc/tth/Makefile
+++ b/textproc/tth/Makefile
@@ -9,7 +9,7 @@
DISTNAME= tth_C
PKGNAME= tth-2.22
CATEGORIES= textproc
-MASTER_SITES= http://www.freebsd.org/~tg/ \
+MASTER_SITES= http://people.FreeBSD.org/~tg/ \
http://hutchinson.belmont.ma.us/tth/tth-noncom/
EXTRACT_SUFX= .tgz
diff --git a/textproc/word2x/Makefile b/textproc/word2x/Makefile
index 4296faee0d3b..1195650bc080 100644
--- a/textproc/word2x/Makefile
+++ b/textproc/word2x/Makefile
@@ -10,7 +10,7 @@ PKGNAME= word2x-0.003
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.gu.net/pub/unix/viewers/ \
ftp://ftp.afti.nsu.ru/pub/source/utils/word2x/ \
- http://www.FreeBSD.org/~billf/
+ http://people.FreeBSD.org/~billf/
MAINTAINER= billf@FreeBSD.org
diff --git a/www/demoroniser/Makefile b/www/demoroniser/Makefile
index 56b6a2cf1a92..f864198c926d 100644
--- a/www/demoroniser/Makefile
+++ b/www/demoroniser/Makefile
@@ -10,7 +10,7 @@ DISTNAME= demoroniser
PKGNAME= demoroniser-1.0
CATEGORIES= www
MASTER_SITES= http://www.fourmilab.ch/webtools/demoroniser/ \
- http://www.freebsd.org/~jedgar/distfiles/
+ http://people.FreeBSD.org/~jedgar/distfiles/
MAINTAINER= jedgar@FreeBSD.org
diff --git a/www/libxpg4-ns/Makefile b/www/libxpg4-ns/Makefile
index 10635c136b9c..cf798d93b6bb 100644
--- a/www/libxpg4-ns/Makefile
+++ b/www/libxpg4-ns/Makefile
@@ -10,7 +10,7 @@ DISTNAME= libxpg4-3.3
PKGNAME= libxpg4-ns-3.3
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_PORTS_JP} \
- http://WWW.FreeBSD.ORG/~sada/distfiles/
+ http://people.FreeBSD.org/~sada/distfiles/
MAINTAINER= sada@FreeBSD.ORG
diff --git a/www/squidtimes/Makefile b/www/squidtimes/Makefile
index f957b9e856ff..8f6691928ccc 100644
--- a/www/squidtimes/Makefile
+++ b/www/squidtimes/Makefile
@@ -10,7 +10,7 @@ DISTNAME= squidtimes-1.12-freebsd.bin
PKGNAME= squidtimes-1.12
CATEGORIES= www
MASTER_SITES= http://www.cineca.it/~nico/binaries/ \
- http://www.FreeBSD.org/~billf/
+ http://people.FreeBSD.org/~billf/
EXTRACT_SUFX=
MAINTAINER= dima@chg.ru
diff --git a/x11-clocks/glclock/files/patch-aa b/x11-clocks/glclock/files/patch-aa
index 62a534d6ab10..7ad697b8e23f 100644
--- a/x11-clocks/glclock/files/patch-aa
+++ b/x11-clocks/glclock/files/patch-aa
@@ -21,7 +21,7 @@
+ LIB_PATH = -L${X11BASE}/lib -Wl,-rpath,/usr/X11R6/lib
+
+# Link with -lGL on FreeBSD so we use hardware-accelerated GL, when installed.
-+# (see http://www.freebsd.org/~3d)
++# (see http://people.FreeBSD.org/~3d)
+ LIBS = -lglut -lGLU -lGL -lXext -lXmu -lX11 -lm -lXi
# for Mesa
diff --git a/x11-clocks/glclock/pkg-descr b/x11-clocks/glclock/pkg-descr
index 3c8e5e50bfaf..5a51843b8779 100644
--- a/x11-clocks/glclock/pkg-descr
+++ b/x11-clocks/glclock/pkg-descr
@@ -1,3 +1,3 @@
glclock is a OpenGL demo with benchmarking capability. For fun and
performance testing, glclock will be of some use for those who have
-hardware-accelerated 3D cards (see www.freebsd.org/~3d) or very fast CPUs.
+hardware-accelerated 3D cards (see people.FreeBSD.org/~3d) or very fast CPUs.
diff --git a/x11-clocks/wmdate/Makefile b/x11-clocks/wmdate/Makefile
index 0f1e3ccd9913..2aeeac6d3c05 100644
--- a/x11-clocks/wmdate/Makefile
+++ b/x11-clocks/wmdate/Makefile
@@ -9,7 +9,7 @@
DISTNAME= wmdate-0.7
CATEGORIES= x11-clocks windowmaker afterstep
MASTER_SITES= http://wit401310.student.utwente.nl/apps/apps/ \
- http://www.freebsd.org/~jim/distfiles/
+ http://people.FreeBSD.org/~jim/distfiles/
MAINTAINER= jim@FreeBSD.org
diff --git a/x11-clocks/wmtz/Makefile b/x11-clocks/wmtz/Makefile
index 725ba66ab802..4c1e4227d77b 100644
--- a/x11-clocks/wmtz/Makefile
+++ b/x11-clocks/wmtz/Makefile
@@ -9,7 +9,7 @@
DISTNAME= wmtz-0.5
CATEGORIES= x11-clocks windowmaker afterstep
MASTER_SITES= http://www.algonet.se/~jlin/wmtz/ \
- http://www.freebsd.org/~jim/distfiles/
+ http://people.FreeBSD.org/~jim/distfiles/
MAINTAINER= jim@FreeBSD.org
diff --git a/x11-fonts/tkfont/Makefile b/x11-fonts/tkfont/Makefile
index 304443f4289e..0a8ee0408444 100644
--- a/x11-fonts/tkfont/Makefile
+++ b/x11-fonts/tkfont/Makefile
@@ -9,7 +9,7 @@
DISTNAME= tkfont-1.1
CATEGORIES= x11-fonts tk82
MASTER_SITES= ftp://ftp.cdrom.com/pub/linux/tsx-11/sources/usr.bin.X11/ \
- http://www.FreeBSD.org/~billf/
+ http://people.FreeBSD.org/~billf/
MAINTAINER= brett@peloton.runet.edu
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index 680b723ea435..a4b5be6a0038 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -8,7 +8,7 @@
DISTNAME= neXtaw-0.5.1
CATEGORIES= x11-toolkits
-MASTER_SITES= http://www.freebsd.org/~tg/
+MASTER_SITES= http://people.FreeBSD.org/~tg/
EXTRACT_SUFX= .tar.gz.bin
MAINTAINER= tg@FreeBSD.org
diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile
index d247060913f0..4ee31e536f99 100644
--- a/x11-toolkits/xforms/Makefile
+++ b/x11-toolkits/xforms/Makefile
@@ -15,7 +15,7 @@ DISTNAME= bxform-freebsd-alpha
.else
DISTNAME= bxform-freebsd-elf
.endif
-MASTER_SITES= http://www.freebsd.org/~steve/distfiles/ \
+MASTER_SITES= http://people.FreeBSD.org/~steve/distfiles/ \
http://bragg.phys.uwm.edu/~zhao/ftp/
PATCHDIR= ${.CURDIR}/patches.elf
.else
diff --git a/x11-wm/afterstep-i18n/Makefile b/x11-wm/afterstep-i18n/Makefile
index 91b9e1722fbd..969e31ab22cf 100644
--- a/x11-wm/afterstep-i18n/Makefile
+++ b/x11-wm/afterstep-i18n/Makefile
@@ -10,7 +10,7 @@ DISTNAME= AfterStep-1.0
PKGNAME= afterstep-i18n-1.0
CATEGORIES= x11-wm afterstep
MASTER_SITES= ${MASTER_SITE_AFTERSTEP} \
- http://www.freebsd.org/~kuriyama/distfiles/ \
+ http://people.FreeBSD.org/~kuriyama/distfiles/ \
http://www.itlb.te.noda.sut.ac.jp/~manome/afterstep/archive/ \
http://www.itlb.te.noda.sut.ac.jp/~manome/afterstep/archive/icons/
MASTER_SITE_SUBDIR= stable/archives
diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile
index 6191143b2ac3..e09d333306a5 100644
--- a/x11-wm/fvwm95-i18n/Makefile
+++ b/x11-wm/fvwm95-i18n/Makefile
@@ -14,11 +14,11 @@ 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://www.freebsd.org/~sada/distfiles/
+ http://people.FreeBSD.org/~sada/distfiles/
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://www.freebsd.org/~sada/distfiles/
+ http://people.FreeBSD.org/~sada/distfiles/
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 7639c0239c51..ca46d27bb037 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -10,7 +10,7 @@ DISTNAME= docklib-0.2
PKGNAME= libdockapp-0.2
CATEGORIES= x11-wm
MASTER_SITES= http://wit401310.student.utwente.nl/apps/apps/ \
- http://www.freebsd.org/~jim/distfiles/ \
+ http://people.FreeBSD.org/~jim/distfiles/ \
ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
MAINTAINER= jim@FreeBSD.org
diff --git a/x11/props/Makefile b/x11/props/Makefile
index dad65e8925d3..2709de3e44e1 100644
--- a/x11/props/Makefile
+++ b/x11/props/Makefile
@@ -8,7 +8,7 @@
DISTNAME= props-1.0
CATEGORIES= x11
-MASTER_SITES= http://www.freebsd.org/~fenner/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~fenner/distfiles/
MAINTAINER= ports@FreeBSD.org
diff --git a/x11/xprompt/Makefile b/x11/xprompt/Makefile
index bd4af69e7a21..8818cb9c1229 100644
--- a/x11/xprompt/Makefile
+++ b/x11/xprompt/Makefile
@@ -8,7 +8,7 @@
DISTNAME= xprompt-1.4
CATEGORIES= x11
-MASTER_SITES= http://www.freebsd.org/~mph/distfiles/
+MASTER_SITES= http://people.FreeBSD.org/~mph/distfiles/
MAINTAINER= mph@freebsd.org
diff --git a/x11/xwit/Makefile b/x11/xwit/Makefile
index d6a094209721..eb88c2a15fee 100644
--- a/x11/xwit/Makefile
+++ b/x11/xwit/Makefile
@@ -8,7 +8,7 @@
DISTNAME= xwit-1.0
CATEGORIES= x11
-MASTER_SITES= http://www.freebsd.org/~tg/
+MASTER_SITES= http://people.FreeBSD.org/~tg/
MAINTAINER= tg@FreeBSD.org