aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/muse/Makefile3
-rw-r--r--audio/streamtuner-local/Makefile3
-rw-r--r--audio/streamtuner-python/Makefile3
-rw-r--r--audio/streamtuner/Makefile3
-rw-r--r--databases/py-rrdtool_lgpl/Makefile3
-rw-r--r--devel/avr-libc/Makefile3
-rw-r--r--devel/avrdude/Makefile3
-rw-r--r--devel/bnf/Makefile3
-rw-r--r--devel/ruby-cache/Makefile3
-rw-r--r--devel/simulavr/Makefile3
-rw-r--r--devel/tinyq/Makefile3
-rw-r--r--devel/uisp/Makefile3
-rw-r--r--dns/zonecheck/Makefile3
-rw-r--r--editors/beaver/Makefile3
-rw-r--r--ftp/muddleftpd/Makefile3
-rw-r--r--games/adgali/Makefile2
-rw-r--r--games/adonthell/Makefile3
-rw-r--r--games/enigma/Makefile3
-rw-r--r--games/spacehulk/Makefile3
-rw-r--r--games/xbubble/Makefile3
-rw-r--r--graphics/OpenEXR/Makefile3
-rw-r--r--graphics/kimagemapeditor/Makefile3
-rw-r--r--irc/bobot++/Makefile3
-rw-r--r--mail/gotmail/Makefile3
-rw-r--r--mail/ifile/Makefile3
-rw-r--r--mail/smtpmail/Makefile3
-rw-r--r--mail/spamass-milter/Makefile3
-rw-r--r--misc/gtktalog/Makefile3
-rw-r--r--multimedia/slideshow/Makefile3
-rw-r--r--net-p2p/kmldonkey/Makefile4
-rw-r--r--net-p2p/mldonkey-devel/Makefile3
-rw-r--r--net-p2p/mldonkey/Makefile3
-rw-r--r--net/kmldonkey/Makefile4
-rw-r--r--net/mldonkey-devel/Makefile3
-rw-r--r--net/mldonkey/Makefile3
-rw-r--r--net/py-rrdtool_lgpl/Makefile3
-rw-r--r--net/tramp/Makefile3
-rw-r--r--print/auctex/Makefile3
-rw-r--r--science/gchempaint/Makefile3
-rw-r--r--science/gchemutils/Makefile3
-rw-r--r--security/ruby-openssl/Makefile3
-rw-r--r--sysutils/duplicity-devel/Makefile3
-rw-r--r--sysutils/duplicity/Makefile3
-rw-r--r--sysutils/duplicity05/Makefile3
-rw-r--r--www/gurlchecker/Makefile3
-rw-r--r--x11-toolkits/guile-gobject/Makefile3
-rw-r--r--x11-toolkits/guile-gtk/Makefile3
-rw-r--r--x11-toolkits/paragui-devel/Makefile3
-rw-r--r--x11-toolkits/paragui/Makefile3
-rw-r--r--x11-toolkits/xforms/Makefile5
50 files changed, 100 insertions, 53 deletions
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index 95f106574ca6..0706c413826a 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -10,8 +10,9 @@ PORTNAME= MuSE
PORTVERSION= 0.8.1
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= http://savannah.nongnu.org/download/muse/ \
+MASTER_SITES= ${MASTER_SITE_SAVANNAH} \
http://muse.dyne.org/releases/
+MASTER_SITE_SUBDIR= muse
DISTNAME= MuSE-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/streamtuner-local/Makefile b/audio/streamtuner-local/Makefile
index 8ae921ff5ad3..376a0ee26244 100644
--- a/audio/streamtuner-local/Makefile
+++ b/audio/streamtuner-local/Makefile
@@ -8,7 +8,8 @@
PORTNAME= local
PORTVERSION= 0.2.1
CATEGORIES= audio www
-MASTER_SITES= http://savannah.nongnu.org/download/streamtuner/streamtuner-local.pkg/${PORTVERSION}/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= streamtuner/${PKGNAMEPREFIX}${PORTNAME}.pkg/${PORTVERSION}
PKGNAMEPREFIX= streamtuner-
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
diff --git a/audio/streamtuner-python/Makefile b/audio/streamtuner-python/Makefile
index 4408124d0b01..640022b730d7 100644
--- a/audio/streamtuner-python/Makefile
+++ b/audio/streamtuner-python/Makefile
@@ -8,7 +8,8 @@
PORTNAME= python
PORTVERSION= 0.0.2
CATEGORIES= audio www
-MASTER_SITES= http://savannah.nongnu.org/download/streamtuner/streamtuner-python.pkg/${PORTVERSION}/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= streamtuner/${PKGNAMEPREFIX}${PORTNAME}.pkg/${PORTVERSION}
PKGNAMEPREFIX= streamtuner-
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 9632dba28135..8775505702a9 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -8,7 +8,8 @@
PORTNAME= streamtuner
PORTVERSION= 0.10.1
CATEGORIES= audio www
-MASTER_SITES= http://savannah.nongnu.org/download/streamtuner/streamtuner.pkg/${PORTVERSION}/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}.pkg/${PORTVERSION}
MAINTAINER= jylefort@brutele.be
COMMENT= A GTK+ stream directory browser
diff --git a/databases/py-rrdtool_lgpl/Makefile b/databases/py-rrdtool_lgpl/Makefile
index 0c52677461e1..73798f09a87f 100644
--- a/databases/py-rrdtool_lgpl/Makefile
+++ b/databases/py-rrdtool_lgpl/Makefile
@@ -7,7 +7,8 @@
PORTNAME= rrdtool_lgpl
PORTVERSION= 0.2.1
CATEGORIES= net python
-MASTER_SITES= http://savannah.nongnu.org/download/py-rrdtool/py-rrdtool.pkg/${PORTVERSION}/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= py-rrdtool/py-rrdtool.pkg/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= py-rrdtool-${PORTVERSION}
diff --git a/devel/avr-libc/Makefile b/devel/avr-libc/Makefile
index 02a447fe9331..5edaa904d3e3 100644
--- a/devel/avr-libc/Makefile
+++ b/devel/avr-libc/Makefile
@@ -9,7 +9,8 @@ PORTNAME= avr-libc
PORTVERSION= 2003.09.09
CATEGORIES= devel
# Currently still snapshots, not yet officially released again.
-#MASTER_SITES= http://savannah.nongnu.org/download/avr-libc/
+#MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+#MASTER_SITE_SUBDIR= ${PORTNAME}
MASTER_SITES= http://people.freebsd.org/~joerg/
MAINTAINER= joerg@freebsd.org
diff --git a/devel/avrdude/Makefile b/devel/avrdude/Makefile
index 8f9d8f188593..d57c7a04cf1f 100644
--- a/devel/avrdude/Makefile
+++ b/devel/avrdude/Makefile
@@ -8,7 +8,8 @@
PORTNAME= avrdude
PORTVERSION= 4.2.0
CATEGORIES= devel
-MASTER_SITES= http://savannah.nongnu.org/download/avrdude/stable.pkg/4.2.0/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}/stable.pkg/${PORTVERSION}
MAINTAINER= bsd@FreeBSD.org
COMMENT= Program for programming the on-chip memory of Atmel AVR CPUs
diff --git a/devel/bnf/Makefile b/devel/bnf/Makefile
index 48230301a3cb..504d3049546f 100644
--- a/devel/bnf/Makefile
+++ b/devel/bnf/Makefile
@@ -8,7 +8,8 @@
PORTNAME= bnf
PORTVERSION= 1.6.9
CATEGORIES= devel
-MASTER_SITES= http://savannah.nongnu.org/download/bnf/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Generate C parser given a grammar in BNF notation
diff --git a/devel/ruby-cache/Makefile b/devel/ruby-cache/Makefile
index 48a413810b15..708d3750e355 100644
--- a/devel/ruby-cache/Makefile
+++ b/devel/ruby-cache/Makefile
@@ -8,7 +8,8 @@
PORTNAME= cache
PORTVERSION= 0.3
CATEGORIES= devel ruby
-MASTER_SITES= http://savannah.nongnu.org/download/pupa/ruby-cache.pkg/${PORTVERSION}/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= pupa/ruby-cache.pkg/${PORTVERSION}
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= ruby-${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= ruby
diff --git a/devel/simulavr/Makefile b/devel/simulavr/Makefile
index 851cf2a2d579..b5124aad7a4a 100644
--- a/devel/simulavr/Makefile
+++ b/devel/simulavr/Makefile
@@ -8,7 +8,8 @@
PORTNAME= simulavr
PORTVERSION= 0.1.1
CATEGORIES= devel
-MASTER_SITES= http://savannah.nongnu.org/download/simulavr/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= joerg@FreeBSD.org
COMMENT= A simulator for AVR microcontrollers
diff --git a/devel/tinyq/Makefile b/devel/tinyq/Makefile
index 6cb99b14cca0..717248f5bab3 100644
--- a/devel/tinyq/Makefile
+++ b/devel/tinyq/Makefile
@@ -12,7 +12,8 @@ PORTVERSION= 3.0.6
PORTREVISION= 0
PORTEPOCH= 0
CATEGORIES= devel kde
-MASTER_SITES= http://savannah.nongnu.org/download/tinyq/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= kde@freebsd.org
COMMENT= A stripped down version of Qt 3 for use as a utility library
diff --git a/devel/uisp/Makefile b/devel/uisp/Makefile
index fb01f9a64125..403518cac599 100644
--- a/devel/uisp/Makefile
+++ b/devel/uisp/Makefile
@@ -8,7 +8,8 @@
PORTNAME= uisp
PORTVERSION= 20020626
CATEGORIES= devel
-MASTER_SITES= http://savannah.nongnu.org/download/uisp/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= bruno@tinkerbox.org
COMMENT= A versatile programmer for atmel AVR microcontrollers
diff --git a/dns/zonecheck/Makefile b/dns/zonecheck/Makefile
index 7502c4cce895..5637c5dd6655 100644
--- a/dns/zonecheck/Makefile
+++ b/dns/zonecheck/Makefile
@@ -8,7 +8,8 @@
PORTNAME= zonecheck
PORTVERSION= 2.0.0b7
CATEGORIES= dns ipv6 ruby
-MASTER_SITES= http://savannah.nongnu.org/download/zonecheck/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= janos.mohacsi@bsd.hu
diff --git a/editors/beaver/Makefile b/editors/beaver/Makefile
index 2fe5fb51f03d..cb84e2abbcb1 100644
--- a/editors/beaver/Makefile
+++ b/editors/beaver/Makefile
@@ -9,7 +9,8 @@ PORTNAME= beaver
PORTVERSION= 0.3.1
PORTREVISION= 1
CATEGORIES= editors
-MASTER_SITES= http://savannah.nongnu.org/download/beaver/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= jylefort@brutele.be
COMMENT= A programmer's text editor for GTK+ 2.0
diff --git a/ftp/muddleftpd/Makefile b/ftp/muddleftpd/Makefile
index d1d52dd05622..4295c92c0ef8 100644
--- a/ftp/muddleftpd/Makefile
+++ b/ftp/muddleftpd/Makefile
@@ -9,7 +9,8 @@
PORTNAME= muddleftpd
PORTVERSION= 1.3.12.1
CATEGORIES= ftp
-MASTER_SITES= http://savannah.nongnu.org/download/muddleftpd/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= A new ftp server that can perform a variety of ftp tasks
diff --git a/games/adgali/Makefile b/games/adgali/Makefile
index 3ddf2e254443..bd54cf50a7a5 100644
--- a/games/adgali/Makefile
+++ b/games/adgali/Makefile
@@ -9,7 +9,7 @@
PORTNAME= adgali
PORTVERSION= 0.2.3
CATEGORIES= games devel
-MASTER_SITES= http://savannah.nongnu.org/download/adgali/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/adonthell/Makefile b/games/adonthell/Makefile
index 02919b71a55d..205b4a6e0dd0 100644
--- a/games/adonthell/Makefile
+++ b/games/adonthell/Makefile
@@ -8,7 +8,8 @@
PORTNAME= adonthell
PORTVERSION= 0.3.3
CATEGORIES= games
-MASTER_SITES= http://savannah.nongnu.org/download/${PORTNAME}/src/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}/src
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
wastesedge-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/games/enigma/Makefile b/games/enigma/Makefile
index 0c7e2bad80b6..e6227ceb7a8a 100644
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -8,7 +8,8 @@
PORTNAME= enigma
PORTVERSION= 0.70
CATEGORIES= games
-MASTER_SITES= http://savannah.nongnu.org/download/enigma/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= edwin@mavetju.org
COMMENT= Enigma is a reimplementation of Oxyd, a puzzle game
diff --git a/games/spacehulk/Makefile b/games/spacehulk/Makefile
index 14d42bfdd610..a69f4f104328 100644
--- a/games/spacehulk/Makefile
+++ b/games/spacehulk/Makefile
@@ -8,7 +8,8 @@ PORTNAME= spacehulk
PORTVERSION= 1.4.5
PORTREVISION= 1
CATEGORIES= games kde
-MASTER_SITES= http://savannah.nongnu.org/download/${PORTNAME}/main.pkg/${PORTVERSION}/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}/main.pkg/${PORTVERSION}
MAINTAINER= krion@FreeBSD.org
COMMENT= Science-fiction board game in the world of Warhammer 40000
diff --git a/games/xbubble/Makefile b/games/xbubble/Makefile
index 8305f7bbde3f..f0a8b52f6289 100644
--- a/games/xbubble/Makefile
+++ b/games/xbubble/Makefile
@@ -7,7 +7,8 @@
PORTNAME= xbubble
PORTVERSION= 0.2
CATEGORIES= games
-MASTER_SITES= http://savannah.nongnu.org/download/xbubble/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= klaus.goger@reflex.at
COMMENT= Bust-A-Move/Puzzle Bubble clone
diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile
index b5a08f24985e..eb8ca05d83b6 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/OpenEXR/Makefile
@@ -9,7 +9,8 @@ PORTNAME= OpenEXR
PORTVERSION= 1.0.5
PORTREVISION= 3
CATEGORIES= graphics devel
-MASTER_SITES= http://savannah.nongnu.org/download/openexr/${PORTNAME}.pkg/${PORTVERSION}/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= openexr/${PORTNAME}.pkg/${PORTVERSION}
MAINTAINER= nork@FreeBSD.org
COMMENT= OpenEXR, a high dynamic-range (HDR) image file format developed by ILM
diff --git a/graphics/kimagemapeditor/Makefile b/graphics/kimagemapeditor/Makefile
index 1eff2b4338a0..bde3380bdb44 100644
--- a/graphics/kimagemapeditor/Makefile
+++ b/graphics/kimagemapeditor/Makefile
@@ -7,7 +7,8 @@
PORTNAME= kimagemapeditor
PORTVERSION= 1.0
CATEGORIES= graphics kde
-MASTER_SITES= http://savannah.nongnu.org/download/kimagemap/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= kimagemap
MAINTAINER= krion@FreeBSD.org
COMMENT= KDE-based editor for HTML image maps
diff --git a/irc/bobot++/Makefile b/irc/bobot++/Makefile
index d75bc59925c8..c44535211f5c 100644
--- a/irc/bobot++/Makefile
+++ b/irc/bobot++/Makefile
@@ -9,7 +9,8 @@
PORTNAME= bobot++
PORTVERSION= 1.99.2
CATEGORIES= irc
-MASTER_SITES= http://savannah.nongnu.org/download/bobotpp/stable.pkg/${PORTVERSION}/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= bobotpp/stable.pkg/${PORTVERSION}
DISTNAME= Bobot++-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/mail/gotmail/Makefile b/mail/gotmail/Makefile
index ef1a40958c6a..4784783b68f4 100644
--- a/mail/gotmail/Makefile
+++ b/mail/gotmail/Makefile
@@ -8,7 +8,8 @@
PORTNAME= gotmail
PORTVERSION= 0.7.10
CATEGORIES= mail perl5
-MASTER_SITES= http://savannah.nongnu.org/download/gotmail/stable.pkg/${PORTVERSION}/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}/stable.pkg/${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= erwin@FreeBSD.org
diff --git a/mail/ifile/Makefile b/mail/ifile/Makefile
index cbba689e1a6c..da33c8229c2a 100644
--- a/mail/ifile/Makefile
+++ b/mail/ifile/Makefile
@@ -9,7 +9,8 @@ PORTNAME= ifile
PORTVERSION= 1.3.2
PORTREVISION= 1
CATEGORIES= mail textproc
-MASTER_SITES= http://savannah.nongnu.org/download/ifile/default.pkg/${PORTVERSION}/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}/default.pkg/${PORTVERSION}
MAINTAINER= david+ports@bushong.net
COMMENT= An application of machine learning to e-mail filtering
diff --git a/mail/smtpmail/Makefile b/mail/smtpmail/Makefile
index 7a42dcf2fa00..e8e0c8bd84d2 100644
--- a/mail/smtpmail/Makefile
+++ b/mail/smtpmail/Makefile
@@ -8,8 +8,9 @@
PORTNAME= smtpmail
PORTVERSION= 0.4.2
CATEGORIES= mail
-MASTER_SITES= http://savannah.nongnu.org/download/${PORTNAME}/smtpmail.pkg/0.4.2/ \
+MASTER_SITES= ${MASTER_SITE_SAVANNAH} \
http://voodoo.oberon.net/
+MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}.pkg/${PORTVERSION}
MAINTAINER= krion@FreeBSD.org
COMMENT= Tool to send the mails over remote smtp server
diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile
index 095d165c3a5e..b556b799a31f 100644
--- a/mail/spamass-milter/Makefile
+++ b/mail/spamass-milter/Makefile
@@ -8,7 +8,8 @@
PORTNAME= spamass-milter
PORTVERSION= 0.2.0
CATEGORIES= mail
-MASTER_SITES= http://savannah.nongnu.org/download/spamass-milt/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= spamass-milt
MAINTAINER= ab@astralblue.net
COMMENT= Sendmail Milter (mail filter) for SpamAssassin
diff --git a/misc/gtktalog/Makefile b/misc/gtktalog/Makefile
index c97a88bde33b..8ee54ad72d86 100644
--- a/misc/gtktalog/Makefile
+++ b/misc/gtktalog/Makefile
@@ -8,7 +8,8 @@
PORTNAME= gtktalog
PORTVERSION= 1.0.0
CATEGORIES= misc
-MASTER_SITES= http://savannah.nongnu.org/download/gtktalog/gtktalog.pkg/1.0.0/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}.pkg/${PORTVERSION}
MAINTAINER= rael@vectorstar.net
COMMENT= GTKtalog is a tool to make disk catalogs
diff --git a/multimedia/slideshow/Makefile b/multimedia/slideshow/Makefile
index d40380cc2f14..9e362ef82557 100644
--- a/multimedia/slideshow/Makefile
+++ b/multimedia/slideshow/Makefile
@@ -8,7 +8,8 @@
PORTNAME= slideshow
PORTVERSION= 0.8.0.p5
CATEGORIES= multimedia
-MASTER_SITES= http://savannah.nongnu.org/download/${PORTNAME}/${PORTNAME}.pkg/${PORTVERSION:S/.p/-pre/}/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}.pkg/${PORTVERSION:S/.p/-pre/}
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/-pre/}
MAINTAINER= stefan@fafoe.narf.at
diff --git a/net-p2p/kmldonkey/Makefile b/net-p2p/kmldonkey/Makefile
index 15dc59e8760d..66b9c2788704 100644
--- a/net-p2p/kmldonkey/Makefile
+++ b/net-p2p/kmldonkey/Makefile
@@ -8,8 +8,8 @@
PORTNAME= kmldonkey
PORTVERSION= 0.9.1
CATEGORIES= net kde
-MASTER_SITES= http://savannah.nongnu.org/download/kmldonkey/unstable.pkg/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}/unstable.pkg/${PORTVERSION}
MAINTAINER= lioux@FreeBSD.org
COMMENT= KDE integration for MLDonkey eDonkey P2P client
diff --git a/net-p2p/mldonkey-devel/Makefile b/net-p2p/mldonkey-devel/Makefile
index eb14cc1794c7..9187df732fa5 100644
--- a/net-p2p/mldonkey-devel/Makefile
+++ b/net-p2p/mldonkey-devel/Makefile
@@ -8,7 +8,8 @@
PORTNAME= mldonkey
PORTVERSION= 2.5.3
CATEGORIES= net
-MASTER_SITES= http://savannah.nongnu.org/download/mldonkey/release-${PORTVERSION:C/\.(.)$/-\1/}/official/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}/release-${PORTVERSION:C/\.(.)$/-\1/}/official
DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(.)$/-\1/}.sources
MAINTAINER= holger@e-gitt.net
diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index eb14cc1794c7..9187df732fa5 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -8,7 +8,8 @@
PORTNAME= mldonkey
PORTVERSION= 2.5.3
CATEGORIES= net
-MASTER_SITES= http://savannah.nongnu.org/download/mldonkey/release-${PORTVERSION:C/\.(.)$/-\1/}/official/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}/release-${PORTVERSION:C/\.(.)$/-\1/}/official
DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(.)$/-\1/}.sources
MAINTAINER= holger@e-gitt.net
diff --git a/net/kmldonkey/Makefile b/net/kmldonkey/Makefile
index 15dc59e8760d..66b9c2788704 100644
--- a/net/kmldonkey/Makefile
+++ b/net/kmldonkey/Makefile
@@ -8,8 +8,8 @@
PORTNAME= kmldonkey
PORTVERSION= 0.9.1
CATEGORIES= net kde
-MASTER_SITES= http://savannah.nongnu.org/download/kmldonkey/unstable.pkg/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}/unstable.pkg/${PORTVERSION}
MAINTAINER= lioux@FreeBSD.org
COMMENT= KDE integration for MLDonkey eDonkey P2P client
diff --git a/net/mldonkey-devel/Makefile b/net/mldonkey-devel/Makefile
index eb14cc1794c7..9187df732fa5 100644
--- a/net/mldonkey-devel/Makefile
+++ b/net/mldonkey-devel/Makefile
@@ -8,7 +8,8 @@
PORTNAME= mldonkey
PORTVERSION= 2.5.3
CATEGORIES= net
-MASTER_SITES= http://savannah.nongnu.org/download/mldonkey/release-${PORTVERSION:C/\.(.)$/-\1/}/official/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}/release-${PORTVERSION:C/\.(.)$/-\1/}/official
DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(.)$/-\1/}.sources
MAINTAINER= holger@e-gitt.net
diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index eb14cc1794c7..9187df732fa5 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -8,7 +8,8 @@
PORTNAME= mldonkey
PORTVERSION= 2.5.3
CATEGORIES= net
-MASTER_SITES= http://savannah.nongnu.org/download/mldonkey/release-${PORTVERSION:C/\.(.)$/-\1/}/official/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}/release-${PORTVERSION:C/\.(.)$/-\1/}/official
DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(.)$/-\1/}.sources
MAINTAINER= holger@e-gitt.net
diff --git a/net/py-rrdtool_lgpl/Makefile b/net/py-rrdtool_lgpl/Makefile
index 0c52677461e1..73798f09a87f 100644
--- a/net/py-rrdtool_lgpl/Makefile
+++ b/net/py-rrdtool_lgpl/Makefile
@@ -7,7 +7,8 @@
PORTNAME= rrdtool_lgpl
PORTVERSION= 0.2.1
CATEGORIES= net python
-MASTER_SITES= http://savannah.nongnu.org/download/py-rrdtool/py-rrdtool.pkg/${PORTVERSION}/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= py-rrdtool/py-rrdtool.pkg/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= py-rrdtool-${PORTVERSION}
diff --git a/net/tramp/Makefile b/net/tramp/Makefile
index b77945b07ef1..8a897ffc71ae 100644
--- a/net/tramp/Makefile
+++ b/net/tramp/Makefile
@@ -8,7 +8,8 @@
PORTNAME= tramp
PORTVERSION= 2.0.36
CATEGORIES= net elisp
-MASTER_SITES= http://savannah.nongnu.org/download/tramp/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@FreeBSD.org
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index 5d37404a4b28..ea897e6f14ad 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -8,9 +8,10 @@
PORTNAME= auctex
PORTVERSION= 11.13
CATEGORIES= print elisp
-MASTER_SITES= http://savannah.nongnu.org/download/auctex/stable.pkg/${PORTVERSION}/ \
+MASTER_SITES= ${MASTER_SITE_SAVANNAH} \
http://wuarchive.wustl.edu/mirrors/gnu/auctex/ \
http://mirror.telentente.com/pub/gnu/auctex/
+MASTER_SITE_SUBDIR= ${PORTNAME}/stable.pkg/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Integrated environment for writing LaTeX using GNU Emacs
diff --git a/science/gchempaint/Makefile b/science/gchempaint/Makefile
index 892d96de2dcc..bc301317ad3c 100644
--- a/science/gchempaint/Makefile
+++ b/science/gchempaint/Makefile
@@ -7,7 +7,8 @@
PORTNAME= gchempaint
PORTVERSION= 0.3.5
CATEGORIES= science
-MASTER_SITES= http://savannah.nongnu.org/download/gchempaint/unstable.pkg/${PORTVERSION}/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}/unstable.pkg/${PORTVERSION}
MAINTAINER= pav@oook.cz
COMMENT= 2D chemical structures editor for GNOME 2
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index 20b8a2ecdea2..4b46bd290d9d 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -7,7 +7,8 @@
PORTNAME= gchemutils
PORTVERSION= 0.1.7
CATEGORIES= science
-MASTER_SITES= http://savannah.nongnu.org/download/gchemutils/unstable.pkg/${PORTVERSION}/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}/unstable.pkg/${PORTVERSION}
DISTNAME= gnome-chemistry-utils-${PORTVERSION}
MAINTAINER= pav@oook.cz
diff --git a/security/ruby-openssl/Makefile b/security/ruby-openssl/Makefile
index 7d9c807cf988..19af61ca13f0 100644
--- a/security/ruby-openssl/Makefile
+++ b/security/ruby-openssl/Makefile
@@ -8,7 +8,8 @@
PORTNAME= openssl
PORTVERSION= 0.2.0.p2
CATEGORIES= security ruby
-MASTER_SITES= http://savannah.nongnu.org/download/rubypki/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= rubypki
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= ossl-${PORTVERSION:S/.p/-pre/}
EXTRACT_SUFX= .tgz
diff --git a/sysutils/duplicity-devel/Makefile b/sysutils/duplicity-devel/Makefile
index 134d0aee0e5f..aeb51e6d93b3 100644
--- a/sysutils/duplicity-devel/Makefile
+++ b/sysutils/duplicity-devel/Makefile
@@ -8,7 +8,8 @@
PORTNAME= duplicity
PORTVERSION= 0.4.0
CATEGORIES= sysutils
-MASTER_SITES= http://savannah.nongnu.org/download/duplicity/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= gh@ghaering.de
diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index 134d0aee0e5f..aeb51e6d93b3 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -8,7 +8,8 @@
PORTNAME= duplicity
PORTVERSION= 0.4.0
CATEGORIES= sysutils
-MASTER_SITES= http://savannah.nongnu.org/download/duplicity/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= gh@ghaering.de
diff --git a/sysutils/duplicity05/Makefile b/sysutils/duplicity05/Makefile
index 134d0aee0e5f..aeb51e6d93b3 100644
--- a/sysutils/duplicity05/Makefile
+++ b/sysutils/duplicity05/Makefile
@@ -8,7 +8,8 @@
PORTNAME= duplicity
PORTVERSION= 0.4.0
CATEGORIES= sysutils
-MASTER_SITES= http://savannah.nongnu.org/download/duplicity/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= gh@ghaering.de
diff --git a/www/gurlchecker/Makefile b/www/gurlchecker/Makefile
index c2753dd766de..9cbb95ffed30 100644
--- a/www/gurlchecker/Makefile
+++ b/www/gurlchecker/Makefile
@@ -8,7 +8,8 @@
PORTNAME= gurlchecker
PORTVERSION= 0.6.2
CATEGORIES= www gnome
-MASTER_SITES= http://savannah.nongnu.org/download/gurlchecker/stable/0.6/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}/stable/0.6
MAINTAINER= einekoai@chello.nl
COMMENT= A Gnome program to check a page/website for broken links
diff --git a/x11-toolkits/guile-gobject/Makefile b/x11-toolkits/guile-gobject/Makefile
index fae7d65e7f4e..2324398fd285 100644
--- a/x11-toolkits/guile-gobject/Makefile
+++ b/x11-toolkits/guile-gobject/Makefile
@@ -9,7 +9,8 @@ PORTNAME= guile-gobject
PORTVERSION= 0.4.0
PORTREVISION= 1
CATEGORIES= x11-toolkits scheme
-MASTER_SITES= http://savannah.nongnu.org/download/guile-gtk/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= guile-gtk
MAINTAINER= gnome@FreeBSD.org
COMMENT= Guile bindings for core GNOME 2 libraries
diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile
index 2e26a4cd4181..107c543d23e3 100644
--- a/x11-toolkits/guile-gtk/Makefile
+++ b/x11-toolkits/guile-gtk/Makefile
@@ -8,7 +8,8 @@
PORTNAME= guile-gtk
PORTVERSION= 0.31
CATEGORIES= x11-toolkits scheme
-MASTER_SITES= http://savannah.nongnu.org/download/guile-gtk/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-1.2-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile
index 71a6ac5c5ab5..cd2644da79d4 100644
--- a/x11-toolkits/paragui-devel/Makefile
+++ b/x11-toolkits/paragui-devel/Makefile
@@ -10,7 +10,8 @@ PORTNAME= paragui
PORTVERSION= 1.0.4
PORTREVISION= 0
CATEGORIES= x11-toolkits
-MASTER_SITES= http://savannah.nongnu.org/download/paragui/stable.pkg/${PORTVERSION}/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}/stable.pkg/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Cross-platform high-level application framework and GUI library
diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile
index 71a6ac5c5ab5..cd2644da79d4 100644
--- a/x11-toolkits/paragui/Makefile
+++ b/x11-toolkits/paragui/Makefile
@@ -10,7 +10,8 @@ PORTNAME= paragui
PORTVERSION= 1.0.4
PORTREVISION= 0
CATEGORIES= x11-toolkits
-MASTER_SITES= http://savannah.nongnu.org/download/paragui/stable.pkg/${PORTVERSION}/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR= ${PORTNAME}/stable.pkg/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Cross-platform high-level application framework and GUI library
diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile
index f1a21c1138aa..6a58100d8632 100644
--- a/x11-toolkits/xforms/Makefile
+++ b/x11-toolkits/xforms/Makefile
@@ -10,9 +10,10 @@ PORTVERSION= 1.0
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= x11-toolkits graphics
-MASTER_SITES= http://savannah.nongnu.org/download/xforms/stable.pkg/1.0/ \
+MASTER_SITES= ${MASTER_SITE_SAVANNAH} \
${MASTER_SITE_LOCAL}
-MASTER_SIDE_SUBDIR= mikeh
+MASTER_SITE_SUBDIR= ${PORTNAME}/stable.pkg/${PORTVERSION} \
+ mikeh
USE_REINPLACE= yes
REINPLACE_ARGS= -i ""