aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSatoshi Asami <asami@FreeBSD.org>2000-06-29 02:31:42 +0000
committerSatoshi Asami <asami@FreeBSD.org>2000-06-29 02:31:42 +0000
commitbe6c01ee85b2fa61f2030ef2065df69712693a50 (patch)
tree0877333f8365a55defdb5b17b76269bfa53693f7
parentc62bea27fe2d419668f48e9bda44f94f29806f7c (diff)
downloadports-be6c01ee85b2fa61f2030ef2065df69712693a50.tar.gz
ports-be6c01ee85b2fa61f2030ef2065df69712693a50.zip
Notes
-rw-r--r--astro/pyweather/Makefile3
-rw-r--r--audio/gmixer/Makefile3
-rw-r--r--audio/xcd/Makefile3
-rw-r--r--devel/cvs2cl/Makefile3
-rw-r--r--devel/cvsutils/Makefile3
-rw-r--r--devel/cvsweb/Makefile3
-rw-r--r--devel/cvsweb3/Makefile3
-rw-r--r--devel/libg++/Makefile3
-rw-r--r--devel/libgnugetopt/Makefile3
-rw-r--r--emulators/hfs/Makefile3
-rw-r--r--emulators/ksnes9x/Makefile3
-rw-r--r--emulators/tkhfs/Makefile3
-rw-r--r--emulators/vmware2/Makefile3
-rw-r--r--emulators/vmware3/Makefile3
-rw-r--r--games/qix/Makefile3
-rw-r--r--japanese/esecanna-module-vje25/Makefile3
-rw-r--r--japanese/esecanna-module-vje30/Makefile3
-rw-r--r--japanese/esecanna-module-wnn6/Makefile3
-rw-r--r--japanese/esecanna/Makefile3
-rw-r--r--japanese/jed/Makefile3
-rw-r--r--mail/hbiff/Makefile3
-rw-r--r--math/linalg/Makefile3
-rw-r--r--misc/figlet/Makefile3
-rw-r--r--misc/jive/Makefile3
-rw-r--r--misc/mshell/Makefile3
-rw-r--r--net/bounce/Makefile3
-rw-r--r--net/pathchar/Makefile3
-rw-r--r--net/relay/Makefile3
-rw-r--r--net/sniffit/Makefile3
-rw-r--r--net/tcpshow/Makefile3
-rw-r--r--net/telserv/Makefile3
-rw-r--r--palm/jconv/Makefile3
-rw-r--r--palm/jfconv/Makefile3
-rw-r--r--security/gtkportscan/Makefile3
-rw-r--r--security/kssh/Makefile3
-rw-r--r--shells/zsh-devel/Makefile5
-rw-r--r--sysutils/cd-write/Makefile3
-rw-r--r--x11-wm/afterstep-i18n/Makefile5
-rw-r--r--x11/xcolors/Makefile3
39 files changed, 80 insertions, 41 deletions
diff --git a/astro/pyweather/Makefile b/astro/pyweather/Makefile
index 0b6978c21417..f99cc4759126 100644
--- a/astro/pyweather/Makefile
+++ b/astro/pyweather/Makefile
@@ -8,7 +8,8 @@
PORTNAME= pyWeather
PORTVERSION= 0.1b
CATEGORIES= astro python
-MASTER_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/will/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= will
DISTNAME= pyWeather
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/gmixer/Makefile b/audio/gmixer/Makefile
index 1d7baef721ab..88626fbb6cf9 100644
--- a/audio/gmixer/Makefile
+++ b/audio/gmixer/Makefile
@@ -8,7 +8,8 @@
PORTNAME= gmixer
PORTVERSION= 0.98c
CATEGORIES= audio
-MASTER_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/cpiazza/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= cpiazza
MAINTAINER= cpiazza@FreeBSD.org
diff --git a/audio/xcd/Makefile b/audio/xcd/Makefile
index 7116ec95b534..62130c45e80b 100644
--- a/audio/xcd/Makefile
+++ b/audio/xcd/Makefile
@@ -8,7 +8,8 @@
PORTNAME= xcd
PORTVERSION= 1.7
CATEGORIES= audio tk82
-MASTER_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/jmz/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= jmz
MAINTAINER= jmz@FreeBSD.org
diff --git a/devel/cvs2cl/Makefile b/devel/cvs2cl/Makefile
index 3d9f25a50955..375c55393bf1 100644
--- a/devel/cvs2cl/Makefile
+++ b/devel/cvs2cl/Makefile
@@ -8,7 +8,8 @@
PORTNAME= cvs2cl
PORTVERSION= 2.4
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/knu/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= knu
MAINTAINER= knu@FreeBSD.org
diff --git a/devel/cvsutils/Makefile b/devel/cvsutils/Makefile
index 578a5a566b31..52964b5cdb58 100644
--- a/devel/cvsutils/Makefile
+++ b/devel/cvsutils/Makefile
@@ -8,7 +8,8 @@
PORTNAME= cvsutils
PORTVERSION= 0.1.5
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/knu/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= knu
MAINTAINER= knu@FreeBSD.org
diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile
index 7cca2d61b672..7d06902248af 100644
--- a/devel/cvsweb/Makefile
+++ b/devel/cvsweb/Makefile
@@ -8,7 +8,8 @@
PORTNAME= cvsweb
PORTVERSION= 1.85
CATEGORIES= devel www
-MASTER_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/knu/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= knu
MAINTAINER= knu@FreeBSD.org
diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile
index 7cca2d61b672..7d06902248af 100644
--- a/devel/cvsweb3/Makefile
+++ b/devel/cvsweb3/Makefile
@@ -8,7 +8,8 @@
PORTNAME= cvsweb
PORTVERSION= 1.85
CATEGORIES= devel www
-MASTER_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/knu/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= knu
MAINTAINER= knu@FreeBSD.org
diff --git a/devel/libg++/Makefile b/devel/libg++/Makefile
index 01d952da2459..d1c08bf65861 100644
--- a/devel/libg++/Makefile
+++ b/devel/libg++/Makefile
@@ -17,7 +17,8 @@ MASTER_SITES= http://www.m-hollstein.de/libgxx/ \
${MASTER_SITE_GNU}
PATCH_SITES= http://www.m-hollstein.de/libgxx/ \
- ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/obrien/
+ ${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR= obrien
PATCHFILES= ${DISTNAME}-20000312.diff.gz
PATCH_DIST_STRIP= -p1
diff --git a/devel/libgnugetopt/Makefile b/devel/libgnugetopt/Makefile
index 8b60e38e8376..0e33301c39a5 100644
--- a/devel/libgnugetopt/Makefile
+++ b/devel/libgnugetopt/Makefile
@@ -8,7 +8,8 @@
PORTNAME= libgnugetopt
PORTVERSION= 1.1
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/obrien/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= obrien
MAINTAINER= obrien@FreeBSD.org
diff --git a/emulators/hfs/Makefile b/emulators/hfs/Makefile
index 170577fbe144..626138de7b71 100644
--- a/emulators/hfs/Makefile
+++ b/emulators/hfs/Makefile
@@ -8,7 +8,8 @@
PORTNAME= hfs
PORTVERSION= 0.37
CATEGORIES= emulators
-MASTER_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/jmz/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= jmz
DISTNAME= ${PORTNAME}${PORTVERSION:S/./_/}
MAINTAINER= jmz@FreeBSD.org
diff --git a/emulators/ksnes9x/Makefile b/emulators/ksnes9x/Makefile
index 4b039f38ccd8..9168705bd112 100644
--- a/emulators/ksnes9x/Makefile
+++ b/emulators/ksnes9x/Makefile
@@ -8,7 +8,8 @@
PORTNAME= ksnes9x
PORTVERSION= 1.2
CATEGORIES= emulators
-MASTER_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/will/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= will
MAINTAINER= will@FreeBSD.org
diff --git a/emulators/tkhfs/Makefile b/emulators/tkhfs/Makefile
index 165fb4138dfe..6f9d4eb9ccfa 100644
--- a/emulators/tkhfs/Makefile
+++ b/emulators/tkhfs/Makefile
@@ -8,7 +8,8 @@
PORTNAME= tkhfs
PORTVERSION= 1.27
CATEGORIES= emulators tk82
-MASTER_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/jmz/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= jmz
DISTNAME= ${PORTNAME}
MAINTAINER= jmz@FreeBSD.org
diff --git a/emulators/vmware2/Makefile b/emulators/vmware2/Makefile
index d945222bf4fe..bf6e909829b8 100644
--- a/emulators/vmware2/Makefile
+++ b/emulators/vmware2/Makefile
@@ -18,10 +18,11 @@ MASTER_SITES= http://www4.vmware.com/software/ \
ftp://mirror.aarnet.edu.au/pub/vmware/software/
DISTNAME= VMware-${PORTVERSION:R}-${PORTVERSION:E}
-PATCH_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/knu/ \
+PATCH_SITES= ${MASTER_SITE_LOCAL} \
http://www.mindspring.com/~vsilyaev/vmware/files/ \
ftp://mirror.aarnet.edu.au/pub/vmware/freebsd/ \
http://mirror.aarnet.edu.au/pub/vmware/freebsd/
+PATCH_SITE_SUBDIR= knu
PATCHFILES= vmmon-freebsd-0.95.1.tar.gz \
vmnet-freebsd-0.11.tar.gz
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
index d945222bf4fe..bf6e909829b8 100644
--- a/emulators/vmware3/Makefile
+++ b/emulators/vmware3/Makefile
@@ -18,10 +18,11 @@ MASTER_SITES= http://www4.vmware.com/software/ \
ftp://mirror.aarnet.edu.au/pub/vmware/software/
DISTNAME= VMware-${PORTVERSION:R}-${PORTVERSION:E}
-PATCH_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/knu/ \
+PATCH_SITES= ${MASTER_SITE_LOCAL} \
http://www.mindspring.com/~vsilyaev/vmware/files/ \
ftp://mirror.aarnet.edu.au/pub/vmware/freebsd/ \
http://mirror.aarnet.edu.au/pub/vmware/freebsd/
+PATCH_SITE_SUBDIR= knu
PATCHFILES= vmmon-freebsd-0.95.1.tar.gz \
vmnet-freebsd-0.11.tar.gz
diff --git a/games/qix/Makefile b/games/qix/Makefile
index af336773a6e4..70f87c566684 100644
--- a/games/qix/Makefile
+++ b/games/qix/Makefile
@@ -8,7 +8,8 @@
PORTNAME= qix
PORTVERSION= 1.1
CATEGORIES= games
-MASTER_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/jmz/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= jmz
MAINTAINER= jmz@FreeBSD.org
diff --git a/japanese/esecanna-module-vje25/Makefile b/japanese/esecanna-module-vje25/Makefile
index 6f3b609c563c..4a01f0d8af89 100644
--- a/japanese/esecanna-module-vje25/Makefile
+++ b/japanese/esecanna-module-vje25/Makefile
@@ -9,7 +9,8 @@ PORTNAME= esecanna-module-vje25
PORTVERSION= 0.14.5
CATEGORIES= japanese
MASTER_SITES= http://esecanna.netfort.gr.jp/ \
- ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/knu/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= knu
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= knu@FreeBSD.org
diff --git a/japanese/esecanna-module-vje30/Makefile b/japanese/esecanna-module-vje30/Makefile
index adc7efa4454b..1d0d24c7a30c 100644
--- a/japanese/esecanna-module-vje30/Makefile
+++ b/japanese/esecanna-module-vje30/Makefile
@@ -9,7 +9,8 @@ PORTNAME= esecanna-module-vje30
PORTVERSION= 0.14.6
CATEGORIES= japanese
MASTER_SITES= http://esecanna.netfort.gr.jp/ \
- ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/knu/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= knu
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= knu@FreeBSD.org
diff --git a/japanese/esecanna-module-wnn6/Makefile b/japanese/esecanna-module-wnn6/Makefile
index 3f5012a2349a..861a003fc361 100644
--- a/japanese/esecanna-module-wnn6/Makefile
+++ b/japanese/esecanna-module-wnn6/Makefile
@@ -9,7 +9,8 @@ PORTNAME= esecanna-module-wnn6
PORTVERSION= 0.14.2
CATEGORIES= japanese
MASTER_SITES= http://esecanna.netfort.gr.jp/ \
- ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/knu/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= knu
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= knu@FreeBSD.org
diff --git a/japanese/esecanna/Makefile b/japanese/esecanna/Makefile
index 3814d907365a..1f2762141b4e 100644
--- a/japanese/esecanna/Makefile
+++ b/japanese/esecanna/Makefile
@@ -9,7 +9,8 @@ PORTNAME= esecanna
PORTVERSION= 0.99.1
CATEGORIES= japanese
MASTER_SITES= http://esecanna.netfort.gr.jp/ \
- ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/knu/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= knu
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= knu@FreeBSD.org
diff --git a/japanese/jed/Makefile b/japanese/jed/Makefile
index efa3b1228d63..8ac9e58805e7 100644
--- a/japanese/jed/Makefile
+++ b/japanese/jed/Makefile
@@ -8,8 +8,9 @@
PORTNAME= jed
PORTVERSION= ${VERSION}.j${JP_VERSION}
CATEGORIES= japanese editors
-MASTER_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/knu/ \
+MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://kondara.sdri.co.jp/~kikutani/slang/
+MASTER_SITE_SUBDIR= knu
DISTNAME= ${PORTNAME}-B${VERSION:R}-${VERSION:E}__J${JP_VERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${PORTNAME}-extralibs-${VERSION}.tar.gz
diff --git a/mail/hbiff/Makefile b/mail/hbiff/Makefile
index 821d72e964ab..eb9668edf071 100644
--- a/mail/hbiff/Makefile
+++ b/mail/hbiff/Makefile
@@ -10,7 +10,8 @@ PORTNAME= hbiff
PORTVERSION= 1.2
CATEGORIES= mail
MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/misc/ \
- ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/obrien/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= obrien
MAINTAINER= obrien@FreeBSD.org
diff --git a/math/linalg/Makefile b/math/linalg/Makefile
index 09eac6383b4d..41275671ab9e 100644
--- a/math/linalg/Makefile
+++ b/math/linalg/Makefile
@@ -8,7 +8,8 @@
PORTNAME= linalg
PORTVERSION= 4.3
CATEGORIES= math
-MASTER_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/will/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= will
MAINTAINER= oleg@pobox.com
diff --git a/misc/figlet/Makefile b/misc/figlet/Makefile
index 9f740709cc48..f35c386e50f9 100644
--- a/misc/figlet/Makefile
+++ b/misc/figlet/Makefile
@@ -12,8 +12,9 @@ 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/ \
- ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/obrien/ \
+ ${MASTER_SITE_LOCAL} \
ftp://nuxi.ucdavis.edu/pub/misc/
+MASTER_SITE_SUBDIR= obrien
DISTNAME= figlet22
MAINTAINER= obrien@FreeBSD.org
diff --git a/misc/jive/Makefile b/misc/jive/Makefile
index 0c41d6bf00d9..5f04a151d937 100644
--- a/misc/jive/Makefile
+++ b/misc/jive/Makefile
@@ -10,7 +10,8 @@ PORTNAME= jive
PORTVERSION= 1.1
CATEGORIES= misc
MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/misc/ \
- ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/obrien/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= obrien
MAINTAINER= obrien@FreeBSD.org
diff --git a/misc/mshell/Makefile b/misc/mshell/Makefile
index b94be5e79260..7279da31456b 100644
--- a/misc/mshell/Makefile
+++ b/misc/mshell/Makefile
@@ -9,7 +9,8 @@
PORTNAME= mshell
PORTVERSION= 1.0
CATEGORIES= misc
-MASTER_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/jmz/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= jmz
DISTFILES= 7432.Z
MAINTAINER= jmz@FreeBSD.org
diff --git a/net/bounce/Makefile b/net/bounce/Makefile
index 82a530a5dda8..aab7c30bb68c 100644
--- a/net/bounce/Makefile
+++ b/net/bounce/Makefile
@@ -10,7 +10,8 @@ PORTNAME= bounce
PORTVERSION= 1.0
CATEGORIES= net security
MASTER_SITES= http://www.eleves.ens.fr:8080/home/espel/ \
- ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/obrien/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= obrien
DISTNAME= bounce
EXTRACT_SUFX= .c
diff --git a/net/pathchar/Makefile b/net/pathchar/Makefile
index e6287ae859ec..7fa66390884e 100644
--- a/net/pathchar/Makefile
+++ b/net/pathchar/Makefile
@@ -12,7 +12,8 @@ CATEGORIES= net
MASTER_SITES= ftp://ftp.ee.lbl.gov/pathchar/ \
http://www.caida.org/Tools/Pathchar/ \
http://sitka.triumf.ca/net/ \
- ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/obrien/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= obrien
DISTNAME= pathchar-a1-freebsd-3.0
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} pathcharnotes.html pathchar.8 \
pathchar.mantxt
diff --git a/net/relay/Makefile b/net/relay/Makefile
index 3dbbcc511dc4..c8d2946b53ef 100644
--- a/net/relay/Makefile
+++ b/net/relay/Makefile
@@ -10,7 +10,8 @@ PORTNAME= relay
PORTVERSION= 1.10
CATEGORIES= net security
MASTER_SITES= http://www.iagora.com/~espel/ \
- ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/obrien/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= obrien
DISTNAME= relay
MAINTAINER= obrien@FreeBSD.org
diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile
index 55c460f33024..fed08b002e1d 100644
--- a/net/sniffit/Makefile
+++ b/net/sniffit/Makefile
@@ -10,7 +10,8 @@ PORTNAME= sniffit
PORTVERSION= 0.3.7b
CATEGORIES= net security
MASTER_SITES= http://reptile.rug.ac.be/~coder/sniffit/files/ \
- ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/obrien/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= obrien
DISTNAME= sniffit.0.3.7.beta
MAINTAINER= obrien@FreeBSD.org
diff --git a/net/tcpshow/Makefile b/net/tcpshow/Makefile
index 1540602205e8..04594eab6f4a 100644
--- a/net/tcpshow/Makefile
+++ b/net/tcpshow/Makefile
@@ -9,7 +9,8 @@
PORTNAME= tcpshow
PORTVERSION= 1.74
CATEGORIES= net security
-MASTER_SITES= ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/obrien/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= obrien
# http://www.cs.berkeley.edu/~daw/mike/
DISTFILES= tcpshow.c tcpshow.1
diff --git a/net/telserv/Makefile b/net/telserv/Makefile
index 2ab40b8e3fd6..562927c517f3 100644
--- a/net/telserv/Makefile
+++ b/net/telserv/Makefile
@@ -10,7 +10,8 @@ PORTNAME= telserv
PORTVERSION= 1.0
CATEGORIES= net security
MASTER_SITES= http://www.eleves.ens.fr:8080/home/espel/ \
- ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/obrien/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= obrien
DISTNAME= telserv
EXTRACT_SUFX= .c
diff --git a/palm/jconv/Makefile b/palm/jconv/Makefile
index bdc0c437d6fa..b5a98f02261a 100644
--- a/palm/jconv/Makefile
+++ b/palm/jconv/Makefile
@@ -9,7 +9,8 @@ PORTNAME= jconv
PORTVERSION= 2000.05.17
CATEGORIES= palm databases
MASTER_SITES= http://www.land-j.com/files/ \
- ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/knu/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= knu
DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tgz
diff --git a/palm/jfconv/Makefile b/palm/jfconv/Makefile
index bdc0c437d6fa..b5a98f02261a 100644
--- a/palm/jfconv/Makefile
+++ b/palm/jfconv/Makefile
@@ -9,7 +9,8 @@ PORTNAME= jconv
PORTVERSION= 2000.05.17
CATEGORIES= palm databases
MASTER_SITES= http://www.land-j.com/files/ \
- ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/knu/
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= knu
DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tgz
diff --git a/security/gtkportscan/Makefile b/security/gtkportscan/Makefile
index fda714c44e52..e7dc4479f50a 100644
--- a/security/gtkportscan/Makefile
+++ b/security/gtkportscan/Makefile
@@ -8,7 +8,8 @@
PORTNAME= gtkportscan
PORTVERSION= 1.2
CATEGORIES= security
-MASTER_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/cpiazza/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= cpiazza
MAINTAINER= ports@FreeBSD.org
diff --git a/security/kssh/Makefile b/security/kssh/Makefile
index 68a9396996d4..c453991e11b0 100644
--- a/security/kssh/Makefile
+++ b/security/kssh/Makefile
@@ -8,7 +8,8 @@
PORTNAME= kssh
PORTVERSION= 0.2
CATEGORIES= security
-MASTER_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/will/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= will
MAINTAINER= ports@FreeBSD.org
diff --git a/shells/zsh-devel/Makefile b/shells/zsh-devel/Makefile
index 28b8cdf6d057..49770c42e945 100644
--- a/shells/zsh-devel/Makefile
+++ b/shells/zsh-devel/Makefile
@@ -9,14 +9,15 @@ PORTNAME= zsh
PORTVERSION= 3.1.9
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
- ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/knu/ \
+ ${MASTER_SITE_LOCAL} \
ftp://ftp.zsh.org/%SUBDIR%/ \
ftp://ftp.sterling.com/%SUBDIR%/ \
ftp://ftp.rge.com/pub/%SUBDIR%/ \
ftp://ftp.fu-berlin.de/pub/unix/shells/%SUBDIR%/ \
ftp://ftp.ips.oz.au/pub/packages/%SUBDIR%/ \
ftp://ftp.uit.no/pub/unix/shells/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+# last one for ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= ${PORTNAME} knu
DISTNAME= ${PORTNAME}-${ZSH_VER}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${ZSHFUNC_FILES}
diff --git a/sysutils/cd-write/Makefile b/sysutils/cd-write/Makefile
index c9eaf8131318..9067598122fc 100644
--- a/sysutils/cd-write/Makefile
+++ b/sysutils/cd-write/Makefile
@@ -8,7 +8,8 @@
PORTNAME= cd-write
PORTVERSION= 1.4.1
CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/jmz/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= jmz
MAINTAINER= jmz@FreeBSD.org
diff --git a/x11-wm/afterstep-i18n/Makefile b/x11-wm/afterstep-i18n/Makefile
index bc154255de52..80f99f162172 100644
--- a/x11-wm/afterstep-i18n/Makefile
+++ b/x11-wm/afterstep-i18n/Makefile
@@ -9,10 +9,11 @@ PORTNAME= afterstep-i18n
PORTVERSION= 1.0
CATEGORIES= x11-wm afterstep
MASTER_SITES= ${MASTER_SITE_AFTERSTEP} \
- ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/kuriyama/ \
+ ${MASTER_SITE_LOCAL} \
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
+# former for ${MASTER_SITE_AFTERSTEP}, latter for ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= stable/archives kuriyama
DISTNAME= AfterStep-1.0
DISTFILES= ${DISTNAME}.tar.gz \
unofficial-I18N.98Feb27.tar.gz \
diff --git a/x11/xcolors/Makefile b/x11/xcolors/Makefile
index 7042eb58d8fd..0c72dc01d1a4 100644
--- a/x11/xcolors/Makefile
+++ b/x11/xcolors/Makefile
@@ -8,7 +8,8 @@
PORTNAME= xcolors
PORTVERSION= 1.3
CATEGORIES= x11
-MASTER_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/ade/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= ade
DISTNAME= ${PORTNAME}
MAINTAINER= ade@FreeBSD.org