o Both sanitize MASTER_SITES and add additional ones

o Full deployment of MASTER_SITES:n

6 files changed, 129 insertions, 43 deletions

diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile
index b1b09c43743..254b5883069 100644
--- a/mail/qmail-ldap/Makefile
+++ b/mail/qmail-ldap/Makefile
@@ -10,8 +10,8 @@ PORTVERSION=	${QMAIL_VERSION}.${LDAP_PATCH_DATE}
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-ldap
 
-PATCH_SITES=	http://www.nrg4u.com/qmail/
-PATCHFILES=	qmail-ldap-1.03-${LDAP_PATCH_DATE}.patch.gz
+PATCH_SITES=	http://www.nrg4u.com/qmail/:ldap
+PATCHFILES=	qmail-ldap-1.03-${LDAP_PATCH_DATE}.patch.gz:ldap,local
 PATCH_DIST_STRIP+=	-p1
 
 EXTRA_PATCHES+=	${QMAIL_PORT_PATCHDIR}/patch-ab ${QMAIL_PORT_PATCHDIR}/patch-ac
diff --git a/mail/qmail-mysql/Makefile b/mail/qmail-mysql/Makefile
index 8969fe47385..985ee0f9951 100644
--- a/mail/qmail-mysql/Makefile
+++ b/mail/qmail-mysql/Makefile
@@ -11,8 +11,8 @@ PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-mysql
 
-PATCH_SITES+=	http://iain.cx/unix/qmail/download/
-PATCHFILES+=	qmail-mysql-${MYSQL_PATCH_VERSION}.patch
+PATCH_SITES+=	http://iain.cx/unix/qmail/download/:mysql
+PATCHFILES+=	qmail-mysql-${MYSQL_PATCH_VERSION}.patch:mysql,local
 
 MAINTAINER=	lioux@FreeBSD.org
 
diff --git a/mail/qmail-smtp_auth+tls/Makefile b/mail/qmail-smtp_auth+tls/Makefile
index 84f0e180bc6..680558c16f8 100644
--- a/mail/qmail-smtp_auth+tls/Makefile
+++ b/mail/qmail-smtp_auth+tls/Makefile
@@ -10,8 +10,8 @@ PORTVERSION=	${QMAIL_VERSION}.${TLS_PATCH_DATE}
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-tls
 
-PATCH_SITES+=	http://www.esat.kuleuven.ac.be/~vermeule/qmail/
-PATCHFILES+=	tls.patch
+PATCH_SITES+=	http://www.esat.kuleuven.ac.be/~vermeule/qmail/:tls
+PATCHFILES+=	tls.patch:tls,local
 PATCH_DIST_STRIP+=	-p1
 
 MAINTAINER=	lioux@FreeBSD.org
diff --git a/mail/qmail-smtp_auth/Makefile b/mail/qmail-smtp_auth/Makefile
index 84f0e180bc6..680558c16f8 100644
--- a/mail/qmail-smtp_auth/Makefile
+++ b/mail/qmail-smtp_auth/Makefile
@@ -10,8 +10,8 @@ PORTVERSION=	${QMAIL_VERSION}.${TLS_PATCH_DATE}
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-tls
 
-PATCH_SITES+=	http://www.esat.kuleuven.ac.be/~vermeule/qmail/
-PATCHFILES+=	tls.patch
+PATCH_SITES+=	http://www.esat.kuleuven.ac.be/~vermeule/qmail/:tls
+PATCHFILES+=	tls.patch:tls,local
 PATCH_DIST_STRIP+=	-p1
 
 MAINTAINER=	lioux@FreeBSD.org
diff --git a/mail/qmail-tls/Makefile b/mail/qmail-tls/Makefile
index 84f0e180bc6..680558c16f8 100644
--- a/mail/qmail-tls/Makefile
+++ b/mail/qmail-tls/Makefile
@@ -10,8 +10,8 @@ PORTVERSION=	${QMAIL_VERSION}.${TLS_PATCH_DATE}
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-tls
 
-PATCH_SITES+=	http://www.esat.kuleuven.ac.be/~vermeule/qmail/
-PATCHFILES+=	tls.patch
+PATCH_SITES+=	http://www.esat.kuleuven.ac.be/~vermeule/qmail/:tls
+PATCHFILES+=	tls.patch:tls,local
 PATCH_DIST_STRIP+=	-p1
 
 MAINTAINER=	lioux@FreeBSD.org
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index a9c203910b8..1bde3bff8ca 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -12,57 +12,143 @@ CATEGORIES=	mail
 MASTER_SITES=	http://cr.yp.to/software/ \
 		ftp://ftp.ntnu.no/pub/unix/mail/qmail/ \
 		ftp://ftp.jp.qmail.org/qmail/ \
-		ftp://ftp.rifkin.technion.ac.il/pub/qmail/ \
 		ftp://ftp.net.ohio-state.edu/pub/networking/mail/qmail/ \
-		ftp://mirror.pipex.net/pub/qmail/ \
-		ftp://ftp.mira.net.au/unix/mail/qmail/
+		ftp://mirror.pipex.net/pub/unix/mail/qmail/ \
+		${MASTER_SITE_QMAIL}
 DISTNAME=	${PORTNAME}-${QMAIL_VERSION}
 
+PATCH_SITES+=	${MASTER_SITE_LOCAL:S/$/:local/}
+PATCH_SITE_SUBDIR+=	lioux/:local
+
 # qmail-* skeleton ports including this port may not want
 # its patches
 .if !defined(MAIN_QMAIL_PORT_DNS_PATCH_BARRIER)
 # Patch necessary to cope with non-RFC >512 dns entries
 # Since AOL has been using those, the problem has skyrocketed from minor to
 # groundzero. qmail being RFC compliant need to be "fixed" to work with those
-PATCH_SITES+=	http://www.ckdhr.com/ckd/
-PATCHFILES+=	qmail-103.patch
+PATCH_SITES+=	http://www.ckdhr.com/ckd/:dns
+PATCHFILES+=	qmail-103.patch:dns,local
 PATCH_DIST_STRIP+=	-p1
 .endif # MAIN_QMAIL_PORT_DNS_PATCH_BARRIER
 
 MASTER_SITE_QMAIL+= \
-	http://www.qmail.org/ \
-	http://qmail.powerenterprises.net/ \
-	http://qmail.area.com/ \
-	http://qmail.valueclick.com/qmail/ \
-	http://itcentrx.com/mirrors/qmail/ \
-	http://qmail.geto.net/ \
-	http://qmail.advansys.net/ \
-	http://qmail.nac.net/ \
-	http://qmail.presys.com/ \
-	http://qmail.sgi.net/qmail/ \
-	http://qmail.goof.com/ \
-	http://www.cgiscripts.net/mirrors/qmail/ \
-	http://qmail.maximumbsd.com/ \
-	http://www.glasswings.com.au/qmail/ \
-	http://www.sczg.com/qmail/ \
-	http://infobase.ibase.com.hk/qmail/ \
-	http://www9.jp.qmail.org/ \
-	http://qmail.manic.co.kr/ \
-	http://qmail.sga.net.th/ \
-	http://gd.tuwien.ac.at/infosys/mail/qmail/www.qmail.org/ \
-	http://qmail.lightwerk.com/ \
-	http://qmail.imd.it/ \
-	http://qmail.sst.com.br/ \
-	http://madhaus.utcs.utoronto.ca/qmail/ \
-	http://qmail.ElectroCity.com/
+	http://qmail.deliver3.com/%SUBDIR%/ \
+	http://qmail.valueclick.com/%SUBDIR%/ \
+	http://qmail.geto.net/%SUBDIR%/ \
+	http://qmail.silverservices.com/%SUBDIR%/ \
+	http://qmail.palomine.net/%SUBDIR%/ \
+	http://qmail.mirrors.summersault.com/%SUBDIR%/ \
+	http://qmail.mirrors.netnumina.com/%SUBDIR%/ \
+	http://qmail.prodigysolutions.com/%SUBDIR%/ \
+	http://qmail.cdsinet.net/%SUBDIR%/ \
+	http://qmail.fidnet.com/%SUBDIR%/ \
+	http://qmail.mscnetworks.com/%SUBDIR%/ \
+	http://www.qmail.org/%SUBDIR%/ \
+	http://qmail.teleglobe.net/%SUBDIR%/ \
+	http://www.pingpackets.com/mirrors/qmail/%SUBDIR%/ \
+	http://qmail.sgi.net/qmail/%SUBDIR%/ \
+	http://qmail.homegrownhost.net/%SUBDIR%/ \
+	http://qmail.webmast.com/%SUBDIR%/ \
+	http://qmail.xanthor.net/%SUBDIR%/ \
+	http://qmail.goof.com/%SUBDIR%/ \
+	http://qmail.phihost.com/%SUBDIR%/ \
+	http://qmail.glasswings.com.au/%SUBDIR%/ \
+	http://qmail.planetmirror.com/%SUBDIR%/ \
+	http://www2.linuxforum.net/mirror/qmail/%SUBDIR%/ \
+	http://qmail.mirror.os.org.cn/%SUBDIR%/ \
+	http://infobase.ibase.com.hk/qmail/%SUBDIR%/ \
+	http://www.zentek-international.com/mirrors/qmail/%SUBDIR%/ \
+	http://qmail.404-not-found.net/%SUBDIR%/ \
+	http://qmail.gremlins.com.hk/%SUBDIR%/ \
+	http://qmail.hostlink.com.hk/%SUBDIR%/ \
+	http://qmail.linuxphreakers.net/%SUBDIR%/ \
+	http://qmail.indosite.co.id/%SUBDIR%/ \
+	http://qmail.cbn.net.id/%SUBDIR%/ \
+	http://qmail.servercyber.com/%SUBDIR%/ \
+	http://qmail.morva.net/%SUBDIR%/ \
+	http://www9.jp.qmail.org/%SUBDIR%/ \
+	http://mirror.nucba.ac.jp/mirror/qmail/%SUBDIR%/ \
+	http://qmail.kita-q.com/www.qmail.org/%SUBDIR%/ \
+	http://qmailorg.data-hotel.net/%SUBDIR%/ \
+	http://qmail.manic.co.kr/%SUBDIR%/ \
+	http://qmail.psshee.com/%SUBDIR%/ \
+	http://mirror.bofh.info/qmail/%SUBDIR%/ \
+	http://qmail-mirror.bugpond.net/%SUBDIR%/ \
+	http://qmail.soa.co.nz/%SUBDIR%/ \
+	http://qmail.imchost.com/%SUBDIR%/ \
+	http://d2.nctu.edu.tw/qmail/%SUBDIR%/ \
+	http://qmail.sga.net.th/%SUBDIR%/ \
+	http://mirrors.kangaroot.net/qmail/%SUBDIR%/ \
+	http://qmail.ssi.bg/%SUBDIR%/ \
+	http://qmail.interbgc.com/%SUBDIR%/ \
+	http://qmail.ruk.cuni.cz/%SUBDIR%/ \
+	http://mirrors.sunsite.dk/qmailwww/%SUBDIR%/ \
+	http://qmail.agarik.com/%SUBDIR%/ \
+	http://qmail.mirrors.fastnetxp.com/%SUBDIR%/ \
+	http://qmail.xinus.net/%SUBDIR%/ \
+	http://qmail.lightwerk.com/%SUBDIR%/ \
+	http://qmail.mirrors.Space.Net/%SUBDIR%/ \
+	http://qmail-mirror.hoermann-rawema.de/%SUBDIR%/ \
+	http://qmail.ebusiness4all.de/%SUBDIR%/ \
+	http://qmail.cti.gr/%SUBDIR%/ \
+	http://www.ntua.gr/qmail/%SUBDIR%/ \
+	http://www.agria.hu/qmail/%SUBDIR%/ \
+	http://qmail-mirror.naplopok.hu/%SUBDIR%/ \
+	http://qmail.hu/%SUBDIR%/ \
+	http://qmail.rhnet.is/%SUBDIR%/ \
+	http://www.ie.qmail.org/%SUBDIR%/ \
+	http://qmail.netsoc.ucd.ie/%SUBDIR%/ \
+	http://www.programmers.net/mirrors/qmail/%SUBDIR%/ \
+	http://complanet.ath.cx/qmail/%SUBDIR%/ \
+	http://ice.dammit.lt/qmail/%SUBDIR%/ \
+	http://qmail.mirrors.emu.lt/%SUBDIR%/ \
+	http://ds9a.nl/qmail/%SUBDIR%/ \
+	http://mirrors.dataloss.nl/www.qmail.org/%SUBDIR%/ \
+	http://qmail.basefreak.nl/%SUBDIR%/ \
+	http://www.math.ntnu.no/mirror/www.qmail.org/%SUBDIR%/ \
+	http://qmail.easyisp.org/%SUBDIR%/ \
+	http://qmail.obeer.com/%SUBDIR%/ \
+	http://qmail.segfault.pl/%SUBDIR%/ \
+	http://qmail.telenet.pt/%SUBDIR%/ \
+	http://qmail.konnekt.org/%SUBDIR%/ \
+	http://qmail.smux.net/%SUBDIR%/ \
+	http://qmail.netvisao.pt/%SUBDIR%/ \
+	http://qmail.totalnet.ro/%SUBDIR%/ \
+	http://qmail.ssc.nsu.ru/%SUBDIR%/ \
+	http://qmail.tps.sk/%SUBDIR%/ \
+	http://qmail.ipg.sk/%SUBDIR%/ \
+	http://qmail.blrf.net/%SUBDIR%/ \
+	http://qmail-mirror.neptuno2000.com/%SUBDIR%/ \
+	http://qmail.imasd.elmundo.es/%SUBDIR%/ \
+	http://qmail.x42.com/%SUBDIR%/ \
+	http://qmail.netrogenic.com/%SUBDIR%/ \
+	http://qmail.omnis.ch/%SUBDIR%/ \
+	http://qmail.asylog.net/%SUBDIR%/ \
+	http://qmail.enderunix.org/%SUBDIR%/ \
+	http://qmail.mrjesus.org/%SUBDIR%/ \
+	http://qmail.plig.org/%SUBDIR%/ \
+	http://qmail.humourengine.com/%SUBDIR%/ \
+	http://qmail.softflare.com/%SUBDIR%/ \
+	http://qmail.blueyonder.co.uk/%SUBDIR%/ \
+	http://qmail.daemonbsd.com.ar/%SUBDIR%/ \
+	http://qmail.sst.com.br/%SUBDIR%/ \
+	http://qmail.usp.br/%SUBDIR%/ \
+	http://qmail.matrix.com.br/%SUBDIR%/ \
+	http://madhaus.utcs.utoronto.ca/qmail/%SUBDIR%/ \
+	http://qmail.freezer-burn.org/%SUBDIR%/ \
+	http://www.qmail.ca/%SUBDIR%/ \
+	http://qmail.fulltime.cl/%SUBDIR%/ \
+	http://qmail.unam.mx/%SUBDIR%/ \
+	http://qmail.ru.ac.za/%SUBDIR%/ \
+	http://qmail.ElectroCity.com/%SUBDIR%/ \
+	http://qmail.area.com/%SUBDIR%/ \
+	http://www.qmail.org/%SUBDIR%/
 
 .if !defined(MAIN_QMAIL_PORT_DNS_PATCH_BARRIER) \
  	||(defined(WITH_QMAILQUEUE_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER)) \
 	||(defined(WITH_BIG_TODO_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_BIG_TODO_PATCH_BARRIER)) \
 	||(defined(WITH_BIG_CONCURRENCY_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER))
-PATCH_SITES+=	${MASTER_SITE_QMAIL} \
-		${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR+=	lioux
+PATCH_SITES+=	${MASTER_SITE_QMAIL}
 .endif
 
 # qmail-* skeleton ports including this port may not want