Use MASTER_SITE_PGSQL from mk/fetch/sites.mk instead of having another

outdated list of mirrors.

10 files changed, 12 insertions, 396 deletions

diff --git a/databases/odbc-postgresql/Makefile b/databases/odbc-postgresql/Makefile
index 27beab41e4d..65544983f85 100644
--- a/databases/odbc-postgresql/Makefile
+++ b/databases/odbc-postgresql/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2010/12/25 08:37:31 adam Exp $
+# $NetBSD: Makefile,v 1.17 2012/03/11 10:32:35 wiz Exp $
 
 DISTNAME=	psqlodbc-09.00.0200
 PKGNAME=	odbc-postgresql-9.0.200
 CATEGORIES=	databases
-MASTER_SITES=	${PGSQL_MIRRORS:=odbc/versions/src/}
+MASTER_SITES=	${MASTER_SITE_PGSQL:=odbc/versions/src/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://pgfoundry.org/projects/psqlodbc/
@@ -16,8 +16,6 @@ CONFLICTS+=	postgresql-[0-7]*
 CONFLICTS+=	iodbc-postgresql-[0-9]*
 CONFLICTS+=	unixodbc-postgresql-[0-9]*
 
-.include "../../databases/postgresql90/Makefile.mirrors"
-
 USE_LANGUAGES=		c
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile
index b661568d8ae..d00c0aed690 100644
--- a/databases/pgadmin3/Makefile
+++ b/databases/pgadmin3/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2012/03/03 00:12:53 wiz Exp $
-
-.include "../../databases/postgresql84/Makefile.mirrors"
+# $NetBSD: Makefile,v 1.25 2012/03/11 10:32:35 wiz Exp $
 
 DISTNAME=	pgadmin3-1.12.1
 PKGREVISION=	6
 CATEGORIES=	databases
-MASTER_SITES=	${PGSQL_MIRRORS:=pgadmin3/release/v${PKGVERSION_NOREV}/src/}
+MASTER_SITES=	${MASTER_SITE_PGSQL:=pgadmin3/release/v${PKGVERSION_NOREV}/src/}
 
 MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://www.pgadmin.org/
diff --git a/databases/postgresql83/Makefile.common b/databases/postgresql83/Makefile.common
index 015178d097f..45dfb04ae3e 100644
--- a/databases/postgresql83/Makefile.common
+++ b/databases/postgresql83/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2012/03/05 14:12:20 adam Exp $
+# $NetBSD: Makefile.common,v 1.23 2012/03/11 10:32:35 wiz Exp $
 #
 # used by databases/postgresql83-adminpack/Makefile
 # used by databases/postgresql83-client/Makefile
@@ -15,11 +15,9 @@
 #	<lang>-postgresql	client-side interface to PostgreSQL
 #	postgresql-<lang>	server-side module for PostgreSQL backend
 
-.include "../../databases/postgresql83/Makefile.mirrors"
-
 DISTNAME=	postgresql-8.3.18
 CATEGORIES=	databases
-MASTER_SITES=	${PGSQL_MIRRORS:=source/v${PKGVERSION_NOREV}/}
+MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER?=	adam@NetBSD.org
diff --git a/databases/postgresql83/Makefile.mirrors b/databases/postgresql83/Makefile.mirrors
deleted file mode 100644
index 89e18456c01..00000000000
--- a/databases/postgresql83/Makefile.mirrors
+++ /dev/null
@@ -1,101 +0,0 @@
-# $NetBSD: Makefile.mirrors,v 1.1.1.1 2008/03/04 12:41:36 adam Exp $
-#
-# This Makefile fragment contains the mirror sites for fetching PostgreSQL.
-#
-# To fetch from the nearest mirror, you may need to set
-# PGSQL_MIRRORS_SORT appropriately, e.g.:
-#
-#   PGSQL_MIRRORS_SORT=	.at .de
-#
-
-###
-### This list was last updated on 20050801.
-###
-PGSQL_MIRRORS=	\
-	ftp://ftp.au.postgresql.org/pub/postgresql/ \
-	ftp://ftp2.au.postgresql.org/pub/postgresql/ \
-	ftp://ftp.at.postgresql.org/db/www.postgresql.org/pub/ \
-	ftp://ftp.be.postgresql.org/postgresql/ \
-	ftp://ftp.ba.postgresql.org/pub/postgresql/ \
-	ftp://ftp.br.postgresql.org/pub/PostgreSQL/ \
-	ftp://ftp3.bg.postgresql.org/postgresql/ \
-	ftp://ftp3.ca.postgresql.org/pub/ \
-	ftp://ftp4.ca.postgresql.org/pub/postgresql/ \
-	ftp://ftp.cl.postgresql.org/ftp/pub/postgresql/ \
-	ftp://ftp.cn.postgresql.org/ftp.postgresql.org/ \
-	ftp://ftp.co.postgresql.org/pub/mirrors/postgresql/ \
-	ftp://ftp2.cr.postgresql.org/pub/Unix/postgres/ \
-	ftp://ftp.hr.postgresql.org/postgresql/ \
-	ftp://ftp.cz.postgresql.org/pub/ftp.postgresql.org/ \
-	ftp://ftp2.cz.postgresql.org/pub/postgresql/ \
-	ftp://ftp.dk.postgresql.org/postgresql/ \
-	ftp://ftp.ee.postgresql.org/mirrors/postgresql/ \
-	ftp://ftp.fr.postgresql.org/ \
-	ftp://ftp2.fr.postgresql.org/postgresql/ \
-	ftp://ftp3.fr.postgresql.org/pub/postgresql/ \
-	ftp://ftp.de.postgresql.org/mirror/postgresql/ \
-	ftp://ftp2.de.postgresql.org/pub/postgresql/ \
-	ftp://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org/ \
-	ftp://ftp7.de.postgresql.org/pub/ftp.postgresql.org/ \
-	ftp://ftp8.de.postgresql.org/pub/misc/pgsql/ \
-	ftp://ftp.gr.postgresql.org/pub/databases/postgresql/ \
-	ftp://ftp2.gr.postgresql.org/pub/databases/postgresql/ \
-	ftp://ftp.hk.postgresql.org/postgresql/ \
-	ftp://ftp3.hu.postgresql.org/pub/postgresql/ \
-	ftp://ftp7.id.postgresql.org/pub/postgresql/ \
-	ftp://ftp8.id.postgresql.org/pub/PostgreSQL/ \
-	ftp://ftp.ie.postgresql.org/mirrors/ftp.postgresql.org/pub/ \
-	ftp://ftp2.ie.postgresql.org/mirrors/ftp.postgresql.org/ \
-	ftp://ftp.il.postgresql.org/ftp.postgresql.org/ \
-	ftp://ftp2.it.postgresql.org/mirrors/postgres/ \
-	ftp://ftp6.it.postgresql.org/pub/PostgreSQL/ \
-	ftp://ftp7.it.postgresql.org/pub/unix/postgres/ \
-	ftp://ftp.jp.postgresql.org/ \
-	ftp://ftp2.jp.postgresql.org/pub/postgresql/ \
-	ftp://ftp.kr.postgresql.org/postgresql/ \
-	ftp://ftp.lv.postgresql.org/pub/software/postgresql/ \
-	ftp://ftp.eu.postgresql.org/pub/unix/db/postgresql/ \
-	ftp://ftp.nl.postgresql.org:21/pub/mirror/postgresql/ \
-	ftp://ftp2.nl.postgresql.org/mirror/postgresql/ \
-	ftp://ftp4.nl.postgresql.org/postgresql.zeelandnet.nl/ \
-	ftp://ftp.nz.postgresql.org/postgresql/ \
-	ftp://ftp.no.postgresql.org/pub/databases/postgresql/ \
-	ftp://ftp6.pl.postgresql.org/pub/postgresql/ \
-	ftp://ftp7.pl.postgresql.org/pub/mirror/ftp.postgresql.org/ \
-	ftp://ftp8.pl.postgresql.org/pub/postgresql/ \
-	ftp://ftp.pt.postgresql.org/postgresql/ \
-	ftp://ftp.pr.postgresql.org/pub/Mirrors/postgresql/ \
-	ftp://ftp6.ro.postgresql.org/pub/mirrors/ftp.postgresql.org/ \
-	ftp://ftp.ru.postgresql.org/pub/mirrors/pgsql/ \
-	ftp://ftp2.ru.postgresql.org/pub/databases/postgresql/ \
-	ftp://ftp3.ru.postgresql.org/pub/mirror/postgresql/pub/ \
-	ftp://ftp7.ru.postgresql.org/pub/mirror/postgresql/ \
-	ftp://ftp2.sk.postgresql.org/pub/postgresql/ \
-	ftp://ftp5.es.postgresql.org/mirror/postgresql/ \
-	ftp://ftp.se.postgresql.org/pub/databases/relational/postgresql/ \
-	ftp://ftp2.ch.postgresql.org/pub/postgresql/ \
-	ftp://ftp.tw.postgresql.org/pub/postgresql/ \
-	ftp://ftp3.tw.postgresql.org/pub/Unix/Database/postgresql/ \
-	ftp://ftp5.tw.postgresql.org/pub/Unix/Database/PostgreSQL/ \
-	ftp://ftp6.tr.postgresql.org/postgresql/ \
-	ftp://ftp2.uk.postgresql.org/sites/ftp.postgresql.org/ \
-	ftp://ftp4.uk.postgresql.org/sites/ftp.postgresql.org/ \
-	ftp://ftp8.uk.postgresql.org/sites/ftp.postgresql.org/ \
-	ftp://ftp.us.postgresql.org/pub/mirrors/postgresql/ \
-	ftp://ftp3.us.postgresql.org/pub/postgresql/ \
-	ftp://ftp5.us.postgresql.org/pub/PostgreSQL/ \
-	ftp://ftp8.us.postgresql.org/postgresql/ \
-	ftp://ftp9.us.postgresql.org/pub/mirrors/postgresql/ \
-	ftp://ftp10.us.postgresql.org/pub/postgresql/ \
-	ftp://ftp22.us.postgresql.org/mirrors/ftp.postgresql.org/ \
-	ftp://ftp24.us.postgresql.org/postgresql/
-
-# Default to fetching from a .us mirror for the sake of the main NetBSD
-# ftp server.
-#
-PGSQL_MIRRORS_SORT?=	.us
-
-# Craft a MASTER_SORT_REGEX that understands the location of the country
-# code in the FTP server name for the PostgreSQL mirror sites.
-#
-MASTER_SORT_REGEX+=	${PGSQL_MIRRORS_SORT:S/./\\./g:C/.*/:\/\/[^[\/]*&\/ :\/\/[^\/]*&\\./}
diff --git a/databases/postgresql84/Makefile.common b/databases/postgresql84/Makefile.common
index ef218fca558..6f3f963b706 100644
--- a/databases/postgresql84/Makefile.common
+++ b/databases/postgresql84/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2012/03/05 14:13:19 adam Exp $
+# $NetBSD: Makefile.common,v 1.19 2012/03/11 10:32:35 wiz Exp $
 #
 # used by databases/postgresql84-adminpack/Makefile
 # used by databases/postgresql84-client/Makefile
@@ -17,11 +17,9 @@
 #	<lang>-postgresql	client-side interface to PostgreSQL
 #	postgresql-<lang>	server-side module for PostgreSQL backend
 
-.include "../../databases/postgresql84/Makefile.mirrors"
-
 DISTNAME=	postgresql-8.4.11
 CATEGORIES=	databases
-MASTER_SITES=	${PGSQL_MIRRORS:=source/v${PKGVERSION_NOREV}/}
+MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER?=	adam@NetBSD.org
diff --git a/databases/postgresql84/Makefile.mirrors b/databases/postgresql84/Makefile.mirrors
deleted file mode 100644
index 4601722ab1c..00000000000
--- a/databases/postgresql84/Makefile.mirrors
+++ /dev/null
@@ -1,101 +0,0 @@
-# $NetBSD: Makefile.mirrors,v 1.1.1.1 2009/07/29 06:26:17 adam Exp $
-#
-# This Makefile fragment contains the mirror sites for fetching PostgreSQL.
-#
-# To fetch from the nearest mirror, you may need to set
-# PGSQL_MIRRORS_SORT appropriately, e.g.:
-#
-#   PGSQL_MIRRORS_SORT=	.at .de
-#
-
-###
-### This list was last updated on 20050801.
-###
-PGSQL_MIRRORS=	\
-	ftp://ftp.au.postgresql.org/pub/postgresql/ \
-	ftp://ftp2.au.postgresql.org/pub/postgresql/ \
-	ftp://ftp.at.postgresql.org/db/www.postgresql.org/pub/ \
-	ftp://ftp.be.postgresql.org/postgresql/ \
-	ftp://ftp.ba.postgresql.org/pub/postgresql/ \
-	ftp://ftp.br.postgresql.org/pub/PostgreSQL/ \
-	ftp://ftp3.bg.postgresql.org/postgresql/ \
-	ftp://ftp3.ca.postgresql.org/pub/ \
-	ftp://ftp4.ca.postgresql.org/pub/postgresql/ \
-	ftp://ftp.cl.postgresql.org/ftp/pub/postgresql/ \
-	ftp://ftp.cn.postgresql.org/ftp.postgresql.org/ \
-	ftp://ftp.co.postgresql.org/pub/mirrors/postgresql/ \
-	ftp://ftp2.cr.postgresql.org/pub/Unix/postgres/ \
-	ftp://ftp.hr.postgresql.org/postgresql/ \
-	ftp://ftp.cz.postgresql.org/pub/ftp.postgresql.org/ \
-	ftp://ftp2.cz.postgresql.org/pub/postgresql/ \
-	ftp://ftp.dk.postgresql.org/postgresql/ \
-	ftp://ftp.ee.postgresql.org/mirrors/postgresql/ \
-	ftp://ftp.fr.postgresql.org/ \
-	ftp://ftp2.fr.postgresql.org/postgresql/ \
-	ftp://ftp3.fr.postgresql.org/pub/postgresql/ \
-	ftp://ftp.de.postgresql.org/mirror/postgresql/ \
-	ftp://ftp2.de.postgresql.org/pub/postgresql/ \
-	ftp://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org/ \
-	ftp://ftp7.de.postgresql.org/pub/ftp.postgresql.org/ \
-	ftp://ftp8.de.postgresql.org/pub/misc/pgsql/ \
-	ftp://ftp.gr.postgresql.org/pub/databases/postgresql/ \
-	ftp://ftp2.gr.postgresql.org/pub/databases/postgresql/ \
-	ftp://ftp.hk.postgresql.org/postgresql/ \
-	ftp://ftp3.hu.postgresql.org/pub/postgresql/ \
-	ftp://ftp7.id.postgresql.org/pub/postgresql/ \
-	ftp://ftp8.id.postgresql.org/pub/PostgreSQL/ \
-	ftp://ftp.ie.postgresql.org/mirrors/ftp.postgresql.org/pub/ \
-	ftp://ftp2.ie.postgresql.org/mirrors/ftp.postgresql.org/ \
-	ftp://ftp.il.postgresql.org/ftp.postgresql.org/ \
-	ftp://ftp2.it.postgresql.org/mirrors/postgres/ \
-	ftp://ftp6.it.postgresql.org/pub/PostgreSQL/ \
-	ftp://ftp7.it.postgresql.org/pub/unix/postgres/ \
-	ftp://ftp.jp.postgresql.org/ \
-	ftp://ftp2.jp.postgresql.org/pub/postgresql/ \
-	ftp://ftp.kr.postgresql.org/postgresql/ \
-	ftp://ftp.lv.postgresql.org/pub/software/postgresql/ \
-	ftp://ftp.eu.postgresql.org/pub/unix/db/postgresql/ \
-	ftp://ftp.nl.postgresql.org:21/pub/mirror/postgresql/ \
-	ftp://ftp2.nl.postgresql.org/mirror/postgresql/ \
-	ftp://ftp4.nl.postgresql.org/postgresql.zeelandnet.nl/ \
-	ftp://ftp.nz.postgresql.org/postgresql/ \
-	ftp://ftp.no.postgresql.org/pub/databases/postgresql/ \
-	ftp://ftp6.pl.postgresql.org/pub/postgresql/ \
-	ftp://ftp7.pl.postgresql.org/pub/mirror/ftp.postgresql.org/ \
-	ftp://ftp8.pl.postgresql.org/pub/postgresql/ \
-	ftp://ftp.pt.postgresql.org/postgresql/ \
-	ftp://ftp.pr.postgresql.org/pub/Mirrors/postgresql/ \
-	ftp://ftp6.ro.postgresql.org/pub/mirrors/ftp.postgresql.org/ \
-	ftp://ftp.ru.postgresql.org/pub/mirrors/pgsql/ \
-	ftp://ftp2.ru.postgresql.org/pub/databases/postgresql/ \
-	ftp://ftp3.ru.postgresql.org/pub/mirror/postgresql/pub/ \
-	ftp://ftp7.ru.postgresql.org/pub/mirror/postgresql/ \
-	ftp://ftp2.sk.postgresql.org/pub/postgresql/ \
-	ftp://ftp5.es.postgresql.org/mirror/postgresql/ \
-	ftp://ftp.se.postgresql.org/pub/databases/relational/postgresql/ \
-	ftp://ftp2.ch.postgresql.org/pub/postgresql/ \
-	ftp://ftp.tw.postgresql.org/pub/postgresql/ \
-	ftp://ftp3.tw.postgresql.org/pub/Unix/Database/postgresql/ \
-	ftp://ftp5.tw.postgresql.org/pub/Unix/Database/PostgreSQL/ \
-	ftp://ftp6.tr.postgresql.org/postgresql/ \
-	ftp://ftp2.uk.postgresql.org/sites/ftp.postgresql.org/ \
-	ftp://ftp4.uk.postgresql.org/sites/ftp.postgresql.org/ \
-	ftp://ftp8.uk.postgresql.org/sites/ftp.postgresql.org/ \
-	ftp://ftp.us.postgresql.org/pub/mirrors/postgresql/ \
-	ftp://ftp3.us.postgresql.org/pub/postgresql/ \
-	ftp://ftp5.us.postgresql.org/pub/PostgreSQL/ \
-	ftp://ftp8.us.postgresql.org/postgresql/ \
-	ftp://ftp9.us.postgresql.org/pub/mirrors/postgresql/ \
-	ftp://ftp10.us.postgresql.org/pub/postgresql/ \
-	ftp://ftp22.us.postgresql.org/mirrors/ftp.postgresql.org/ \
-	ftp://ftp24.us.postgresql.org/postgresql/
-
-# Default to fetching from a .us mirror for the sake of the main NetBSD
-# ftp server.
-#
-PGSQL_MIRRORS_SORT?=	.us
-
-# Craft a MASTER_SORT_REGEX that understands the location of the country
-# code in the FTP server name for the PostgreSQL mirror sites.
-#
-MASTER_SORT_REGEX+=	${PGSQL_MIRRORS_SORT:S/./\\./g:C/.*/:\/\/[^[\/]*&\/ :\/\/[^\/]*&\\./}
diff --git a/databases/postgresql90/Makefile.common b/databases/postgresql90/Makefile.common
index 151e41225e7..1068456becd 100644
--- a/databases/postgresql90/Makefile.common
+++ b/databases/postgresql90/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2012/03/03 14:01:11 adam Exp $
+# $NetBSD: Makefile.common,v 1.17 2012/03/11 10:32:35 wiz Exp $
 #
 # used by databases/postgresql90-adminpack/Makefile
 # used by databases/postgresql90-client/Makefile
@@ -21,11 +21,9 @@
 #	<lang>-postgresql	client-side interface to PostgreSQL
 #	postgresql-<lang>	server-side module for PostgreSQL backend
 
-.include "../../databases/postgresql90/Makefile.mirrors"
-
 DISTNAME=	postgresql-9.0.7
 CATEGORIES=	databases
-MASTER_SITES=	${PGSQL_MIRRORS:=source/v${PKGVERSION_NOREV}/}
+MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER?=	adam@NetBSD.org
diff --git a/databases/postgresql90/Makefile.mirrors b/databases/postgresql90/Makefile.mirrors
deleted file mode 100644
index 1784bf46aae..00000000000
--- a/databases/postgresql90/Makefile.mirrors
+++ /dev/null
@@ -1,85 +0,0 @@
-# $NetBSD: Makefile.mirrors,v 1.2 2011/03/28 20:29:00 zafer Exp $
-#
-# This Makefile fragment contains the mirror sites for fetching PostgreSQL.
-#
-# To fetch from the nearest mirror, you may need to set
-# PGSQL_MIRRORS_SORT appropriately, e.g.:
-#
-#   PGSQL_MIRRORS_SORT=	.at .de
-#
-
-###
-### This list was last updated on 20100328.
-###
-PGSQL_MIRRORS=	\
-	ftp://ftp5.ca.postgresql.org/mirrors/postgresql/ \
-	http://ftp2.cz.postgresql.org/pub/postgresql/ \
-	ftp://ftp2.cz.postgresql.org/pub/postgresql/ \
-	http://ftp.dk.postgresql.org/postgresql/ \
-	ftp://ftp.dk.postgresql.org/postgresql/ \
-	http://ftp.ee.postgresql.org/pub/postgresql/ \
-	ftp://ftp.fi.postgresql.org/pub/postgresql/ \
-	http://ftp4.fr.postgresql.org/pub/mirrors/postgresql/ \
-	ftp://ftp4.fr.postgresql.org/pub/mirrors/postgresql/ \
-	http://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org/ \
-	ftp://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org/ \
-	http://ftp8.de.postgresql.org/pub/misc/pgsql/ \
-	ftp://ftp8.de.postgresql.org/pub/misc/pgsql/ \
-	ftp://ftp7.de.postgresql.org/pub/ftp.postgresql.org/ \
-	ftp://ftp9.de.postgresql.org/unix/databases/postgresql/ \
-	ftp://ftp10.de.postgresql.org/pub/mirror/postgresql/ \
-	http://ftp.gr.postgresql.org/pub/databases/postgresql/ \
-	ftp://ftp.gr.postgresql.org/pub/databases/postgresql/ \
-	http://ftp3.gr.postgresql.org/ \
-	ftp://ftp3.gr.postgresql.org/mirrors/postgresql/ \
-	http://ftp.ie.postgresql.org/mirrors/ftp.postgresql.org/pub/ \
-	ftp://ftp.ie.postgresql.org/mirrors/ftp.postgresql.org/pub/ \
-	http://ftp2.ie.postgresql.org/mirrors/ftp.postgresql.org/ \
-	ftp://ftp2.ie.postgresql.org/mirrors/ftp.postgresql.org/ \
-	http://ftp2.it.postgresql.org/mirrors/postgres/ \
-	ftp://ftp2.it.postgresql.org/mirrors/postgres/ \
-	ftp://ftp3.jp.postgresql.org/pub/db/postgresql/ \
-	ftp://ftp2.kr.postgresql.org/pub/postgresql/ \
-	ftp://ftp.lv.postgresql.org/mirrors/ftp.postgresql.org/ \
-	http://ftp2.nl.postgresql.org/ \
-	ftp://ftp2.nl.postgresql.org/mirror/postgresql/ \
-	ftp://ftp.nl.postgresql.org:21/pub/mirror/postgresql/ \
-	ftp://ftp.nz.postgresql.org/postgresql/ \
-	http://ftp6.pl.postgresql.org/pub/postgresql/ \
-	ftp://ftp6.pl.postgresql.org/pub/postgresql/ \
-	http://ftp8.pl.postgresql.org/pub/postgresql/ \
-	ftp://ftp8.pl.postgresql.org/pub/postgresql/ \
-	http://ftp9.pl.postgresql.org/pub/mirrors/ftp.postgresql.org/ \
-	ftp://ftp9.pl.postgresql.org/pub/mirrors/ftp.postgresql.org/ \
-	ftp://ftp7.pl.postgresql.org/pub/mirror/ftp.postgresql.org/ \
-	http://ftp.pt.postgresql.org/pub/postgresql/ \
-	ftp://ftp.pt.postgresql.org/pub/postgresql/ \
-	ftp://ftp6.ro.postgresql.org/pub/mirrors/ftp.postgresql.org/ \
-	ftp://ftp2.ru.postgresql.org/pub/databases/postgresql/ \
-	ftp://ftp3.ru.postgresql.org/pub/mirror/postgresql/pub/ \
-	ftp://ftp.si.postgresql.org/pub/mirrors/postgresql/ \
-	ftp://ftp.za.postgresql.org/mirror/ftp.postgresql.org/ \
-	http://ftp.se.postgresql.org/pub/databases/relational/postgresql/ \
-	ftp://ftp.se.postgresql.org/pub/databases/relational/postgresql/ \
-	http://ftp2.ch.postgresql.org/pub/mirrors/postgresql/ \
-	ftp://ftp2.ch.postgresql.org/pub/mirrors/postgresql/ \
-	ftp://ftp.ch.postgresql.org/mirror/postgresql/ \
-	http://ftp3.tw.postgresql.org/postgresql/ \
-	ftp://ftp3.tw.postgresql.org/postgresql/ \
-	http://ftp9.us.postgresql.org/pub/mirrors/postgresql/ \
-	ftp://ftp9.us.postgresql.org/pub/mirrors/postgresql/ \
-	ftp://ftp5.us.postgresql.org/pub/PostgreSQL/ \
-	ftp://ftp10.us.postgresql.org/pub/postgresql/ \
-	ftp://ftp3.ua.postgresql.org/pub/mirrors/postgresql/ \
-	http://ftp2.uk.postgresql.org/sites/ftp.postgresql.org/ \
-	ftp://ftp2.uk.postgresql.org/sites/ftp.postgresql.org/
-
-# Default to fetching from a .us mirror for the sake of the main NetBSD
-# ftp server.
-#
-PGSQL_MIRRORS_SORT?=	.de
-
-# Craft a MASTER_SORT_REGEX that understands the location of the country
-# code in the FTP server name for the PostgreSQL mirror sites.
-#
-MASTER_SORT_REGEX+=	${PGSQL_MIRRORS_SORT:S/./\\./g:C/.*/:\/\/[^[\/]*&\/ :\/\/[^\/]*&\\./}
diff --git a/databases/postgresql91/Makefile.common b/databases/postgresql91/Makefile.common
index 4dfc53b7193..43c8039c0f4 100644
--- a/databases/postgresql91/Makefile.common
+++ b/databases/postgresql91/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2012/03/03 14:01:12 adam Exp $
+# $NetBSD: Makefile.common,v 1.6 2012/03/11 10:32:35 wiz Exp $
 #
 # used by databases/postgresql91-adminpack/Makefile
 # used by databases/postgresql91-client/Makefile
@@ -21,11 +21,9 @@
 #	<lang>-postgresql	client-side interface to PostgreSQL
 #	postgresql-<lang>	server-side module for PostgreSQL backend
 
-.include "../../databases/postgresql91/Makefile.mirrors"
-
 DISTNAME=	postgresql-9.1.3
 CATEGORIES=	databases
-MASTER_SITES=	${PGSQL_MIRRORS:=source/v${PKGVERSION_NOREV}/}
+MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER?=	adam@NetBSD.org
diff --git a/databases/postgresql91/Makefile.mirrors b/databases/postgresql91/Makefile.mirrors
deleted file mode 100644
index 19e0e7972fc..00000000000
--- a/databases/postgresql91/Makefile.mirrors
+++ /dev/null
@@ -1,85 +0,0 @@
-# $NetBSD: Makefile.mirrors,v 1.1.1.1 2011/09/15 08:27:38 adam Exp $
-#
-# This Makefile fragment contains the mirror sites for fetching PostgreSQL.
-#
-# To fetch from the nearest mirror, you may need to set
-# PGSQL_MIRRORS_SORT appropriately, e.g.:
-#
-#   PGSQL_MIRRORS_SORT=	.at .de
-#
-
-###
-### This list was last updated on 20100328.
-###
-PGSQL_MIRRORS=	\
-	ftp://ftp5.ca.postgresql.org/mirrors/postgresql/ \
-	http://ftp2.cz.postgresql.org/pub/postgresql/ \
-	ftp://ftp2.cz.postgresql.org/pub/postgresql/ \
-	http://ftp.dk.postgresql.org/postgresql/ \
-	ftp://ftp.dk.postgresql.org/postgresql/ \
-	http://ftp.ee.postgresql.org/pub/postgresql/ \
-	ftp://ftp.fi.postgresql.org/pub/postgresql/ \
-	http://ftp4.fr.postgresql.org/pub/mirrors/postgresql/ \
-	ftp://ftp4.fr.postgresql.org/pub/mirrors/postgresql/ \
-	http://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org/ \
-	ftp://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org/ \
-	http://ftp8.de.postgresql.org/pub/misc/pgsql/ \
-	ftp://ftp8.de.postgresql.org/pub/misc/pgsql/ \
-	ftp://ftp7.de.postgresql.org/pub/ftp.postgresql.org/ \
-	ftp://ftp9.de.postgresql.org/unix/databases/postgresql/ \
-	ftp://ftp10.de.postgresql.org/pub/mirror/postgresql/ \
-	http://ftp.gr.postgresql.org/pub/databases/postgresql/ \
-	ftp://ftp.gr.postgresql.org/pub/databases/postgresql/ \
-	http://ftp3.gr.postgresql.org/ \
-	ftp://ftp3.gr.postgresql.org/mirrors/postgresql/ \
-	http://ftp.ie.postgresql.org/mirrors/ftp.postgresql.org/pub/ \
-	ftp://ftp.ie.postgresql.org/mirrors/ftp.postgresql.org/pub/ \
-	http://ftp2.ie.postgresql.org/mirrors/ftp.postgresql.org/ \
-	ftp://ftp2.ie.postgresql.org/mirrors/ftp.postgresql.org/ \
-	http://ftp2.it.postgresql.org/mirrors/postgres/ \
-	ftp://ftp2.it.postgresql.org/mirrors/postgres/ \
-	ftp://ftp3.jp.postgresql.org/pub/db/postgresql/ \
-	ftp://ftp2.kr.postgresql.org/pub/postgresql/ \
-	ftp://ftp.lv.postgresql.org/mirrors/ftp.postgresql.org/ \
-	http://ftp2.nl.postgresql.org/ \
-	ftp://ftp2.nl.postgresql.org/mirror/postgresql/ \
-	ftp://ftp.nl.postgresql.org:21/pub/mirror/postgresql/ \
-	ftp://ftp.nz.postgresql.org/postgresql/ \
-	http://ftp6.pl.postgresql.org/pub/postgresql/ \
-	ftp://ftp6.pl.postgresql.org/pub/postgresql/ \
-	http://ftp8.pl.postgresql.org/pub/postgresql/ \
-	ftp://ftp8.pl.postgresql.org/pub/postgresql/ \
-	http://ftp9.pl.postgresql.org/pub/mirrors/ftp.postgresql.org/ \
-	ftp://ftp9.pl.postgresql.org/pub/mirrors/ftp.postgresql.org/ \
-	ftp://ftp7.pl.postgresql.org/pub/mirror/ftp.postgresql.org/ \
-	http://ftp.pt.postgresql.org/pub/postgresql/ \
-	ftp://ftp.pt.postgresql.org/pub/postgresql/ \
-	ftp://ftp6.ro.postgresql.org/pub/mirrors/ftp.postgresql.org/ \
-	ftp://ftp2.ru.postgresql.org/pub/databases/postgresql/ \
-	ftp://ftp3.ru.postgresql.org/pub/mirror/postgresql/pub/ \
-	ftp://ftp.si.postgresql.org/pub/mirrors/postgresql/ \
-	ftp://ftp.za.postgresql.org/mirror/ftp.postgresql.org/ \
-	http://ftp.se.postgresql.org/pub/databases/relational/postgresql/ \
-	ftp://ftp.se.postgresql.org/pub/databases/relational/postgresql/ \
-	http://ftp2.ch.postgresql.org/pub/mirrors/postgresql/ \
-	ftp://ftp2.ch.postgresql.org/pub/mirrors/postgresql/ \
-	ftp://ftp.ch.postgresql.org/mirror/postgresql/ \
-	http://ftp3.tw.postgresql.org/postgresql/ \
-	ftp://ftp3.tw.postgresql.org/postgresql/ \
-	http://ftp9.us.postgresql.org/pub/mirrors/postgresql/ \
-	ftp://ftp9.us.postgresql.org/pub/mirrors/postgresql/ \
-	ftp://ftp5.us.postgresql.org/pub/PostgreSQL/ \
-	ftp://ftp10.us.postgresql.org/pub/postgresql/ \
-	ftp://ftp3.ua.postgresql.org/pub/mirrors/postgresql/ \
-	http://ftp2.uk.postgresql.org/sites/ftp.postgresql.org/ \
-	ftp://ftp2.uk.postgresql.org/sites/ftp.postgresql.org/
-
-# Default to fetching from a .us mirror for the sake of the main NetBSD
-# ftp server.
-#
-PGSQL_MIRRORS_SORT?=	.de
-
-# Craft a MASTER_SORT_REGEX that understands the location of the country
-# code in the FTP server name for the PostgreSQL mirror sites.
-#
-MASTER_SORT_REGEX+=	${PGSQL_MIRRORS_SORT:S/./\\./g:C/.*/:\/\/[^[\/]*&\/ :\/\/[^\/]*&\\./}