Sun Mar 11 10:32:35 2012 UTC ()
Use MASTER_SITE_PGSQL from mk/fetch/sites.mk instead of having another
outdated list of mirrors.


(wiz)
diff -r1.16 -r1.17 pkgsrc/databases/odbc-postgresql/Makefile
diff -r1.24 -r1.25 pkgsrc/databases/pgadmin3/Makefile
diff -r1.22 -r1.23 pkgsrc/databases/postgresql83/Makefile.common
diff -r1.1.1.1 -r0 pkgsrc/databases/postgresql83/Makefile.mirrors
diff -r1.18 -r1.19 pkgsrc/databases/postgresql84/Makefile.common
diff -r1.1.1.1 -r0 pkgsrc/databases/postgresql84/Makefile.mirrors
diff -r1.16 -r1.17 pkgsrc/databases/postgresql90/Makefile.common
diff -r1.2 -r0 pkgsrc/databases/postgresql90/Makefile.mirrors
diff -r1.5 -r1.6 pkgsrc/databases/postgresql91/Makefile.common
diff -r1.1.1.1 -r0 pkgsrc/databases/postgresql91/Makefile.mirrors
cvs diff -r1.16 -r1.17 pkgsrc/databases/odbc-postgresql/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/odbc-postgresql/Makefile 2010/12/25 08:37:31 1.16
+++ pkgsrc/databases/odbc-postgresql/Makefile 2012/03/11 10:32:35 1.17
@@ -1,33 +1,31 @@ @@ -1,33 +1,31 @@
1# $NetBSD: Makefile,v 1.16 2010/12/25 08:37:31 adam Exp $ 1# $NetBSD: Makefile,v 1.17 2012/03/11 10:32:35 wiz Exp $
2 2
3DISTNAME= psqlodbc-09.00.0200 3DISTNAME= psqlodbc-09.00.0200
4PKGNAME= odbc-postgresql-9.0.200 4PKGNAME= odbc-postgresql-9.0.200
5CATEGORIES= databases 5CATEGORIES= databases
6MASTER_SITES= ${PGSQL_MIRRORS:=odbc/versions/src/} 6MASTER_SITES= ${MASTER_SITE_PGSQL:=odbc/versions/src/}
7 7
8MAINTAINER= adam@NetBSD.org 8MAINTAINER= adam@NetBSD.org
9HOMEPAGE= http://pgfoundry.org/projects/psqlodbc/ 9HOMEPAGE= http://pgfoundry.org/projects/psqlodbc/
10COMMENT= ODBC interface to PostgreSQL 10COMMENT= ODBC interface to PostgreSQL
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15CONFLICTS+= postgresql-[0-7]* 15CONFLICTS+= postgresql-[0-7]*
16CONFLICTS+= iodbc-postgresql-[0-9]* 16CONFLICTS+= iodbc-postgresql-[0-9]*
17CONFLICTS+= unixodbc-postgresql-[0-9]* 17CONFLICTS+= unixodbc-postgresql-[0-9]*
18 18
19.include "../../databases/postgresql90/Makefile.mirrors" 
20 
21USE_LANGUAGES= c 19USE_LANGUAGES= c
22USE_LIBTOOL= yes 20USE_LIBTOOL= yes
23USE_TOOLS+= gmake 21USE_TOOLS+= gmake
24GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
25CONFIGURE_ARGS+= --with-iodbc 23CONFIGURE_ARGS+= --with-iodbc
26CONFIGURE_ARGS+= --without-unixodbc 24CONFIGURE_ARGS+= --without-unixodbc
27 25
28INSTALLATION_DIRS= share/doc/postgresql/odbc 26INSTALLATION_DIRS= share/doc/postgresql/odbc
29INSTALLATION_DIRS+= share/postgresql 27INSTALLATION_DIRS+= share/postgresql
30 28
31post-install: 29post-install:
32 ${INSTALL_DATA} ${WRKSRC}/odbc.sql \ 30 ${INSTALL_DATA} ${WRKSRC}/odbc.sql \
33 ${DESTDIR}${PREFIX}/share/postgresql/odbc.sql 31 ${DESTDIR}${PREFIX}/share/postgresql/odbc.sql
cvs diff -r1.24 -r1.25 pkgsrc/databases/pgadmin3/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/pgadmin3/Makefile 2012/03/03 00:12:53 1.24
+++ pkgsrc/databases/pgadmin3/Makefile 2012/03/11 10:32:35 1.25
@@ -1,21 +1,19 @@ @@ -1,21 +1,19 @@
1# $NetBSD: Makefile,v 1.24 2012/03/03 00:12:53 wiz Exp $ 1# $NetBSD: Makefile,v 1.25 2012/03/11 10:32:35 wiz Exp $
2 
3.include "../../databases/postgresql84/Makefile.mirrors" 
4 2
5DISTNAME= pgadmin3-1.12.1 3DISTNAME= pgadmin3-1.12.1
6PKGREVISION= 6 4PKGREVISION= 6
7CATEGORIES= databases 5CATEGORIES= databases
8MASTER_SITES= ${PGSQL_MIRRORS:=pgadmin3/release/v${PKGVERSION_NOREV}/src/} 6MASTER_SITES= ${MASTER_SITE_PGSQL:=pgadmin3/release/v${PKGVERSION_NOREV}/src/}
9 7
10MAINTAINER= joerg@NetBSD.org 8MAINTAINER= joerg@NetBSD.org
11HOMEPAGE= http://www.pgadmin.org/ 9HOMEPAGE= http://www.pgadmin.org/
12COMMENT= Graphical PostgreSQL client and administration tool 10COMMENT= Graphical PostgreSQL client and administration tool
13 11
14PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
15 13
16PGSQL_VERSIONS_ACCEPTED=90 84 83 14PGSQL_VERSIONS_ACCEPTED=90 84 83
17 15
18USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
19USE_TOOLS+= gmake msgfmt 17USE_TOOLS+= gmake msgfmt
20GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
21CONFIGURE_ARGS+= --with-wx=${BUILDLINK_PREFIX.wxGTK28} 19CONFIGURE_ARGS+= --with-wx=${BUILDLINK_PREFIX.wxGTK28}
cvs diff -r1.22 -r1.23 pkgsrc/databases/postgresql83/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/postgresql83/Attic/Makefile.common 2012/03/05 14:12:20 1.22
+++ pkgsrc/databases/postgresql83/Attic/Makefile.common 2012/03/11 10:32:35 1.23
@@ -1,35 +1,33 @@ @@ -1,35 +1,33 @@
1# $NetBSD: Makefile.common,v 1.22 2012/03/05 14:12:20 adam Exp $ 1# $NetBSD: Makefile.common,v 1.23 2012/03/11 10:32:35 wiz Exp $
2# 2#
3# used by databases/postgresql83-adminpack/Makefile 3# used by databases/postgresql83-adminpack/Makefile
4# used by databases/postgresql83-client/Makefile 4# used by databases/postgresql83-client/Makefile
5# used by databases/postgresql83-plperl/Makefile 5# used by databases/postgresql83-plperl/Makefile
6# used by databases/postgresql83-plpython/Makefile 6# used by databases/postgresql83-plpython/Makefile
7# used by databases/postgresql83-pltcl/Makefile 7# used by databases/postgresql83-pltcl/Makefile
8# used by databases/postgresql83-server/Makefile 8# used by databases/postgresql83-server/Makefile
9# 9#
10# This Makefile fragment is included by all PostgreSQL packages built from 10# This Makefile fragment is included by all PostgreSQL packages built from
11# the main sources of the PostgreSQL distribution except jdbc-postgresql. 11# the main sources of the PostgreSQL distribution except jdbc-postgresql.
12# 12#
13# The PostgreSQL package naming scheme, aside from the obvious piecewise 13# The PostgreSQL package naming scheme, aside from the obvious piecewise
14# packages, is as follows: 14# packages, is as follows:
15# <lang>-postgresql client-side interface to PostgreSQL 15# <lang>-postgresql client-side interface to PostgreSQL
16# postgresql-<lang> server-side module for PostgreSQL backend 16# postgresql-<lang> server-side module for PostgreSQL backend
17 17
18.include "../../databases/postgresql83/Makefile.mirrors" 
19 
20DISTNAME= postgresql-8.3.18 18DISTNAME= postgresql-8.3.18
21CATEGORIES= databases 19CATEGORIES= databases
22MASTER_SITES= ${PGSQL_MIRRORS:=source/v${PKGVERSION_NOREV}/} 20MASTER_SITES= ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
23EXTRACT_SUFX= .tar.bz2 21EXTRACT_SUFX= .tar.bz2
24 22
25MAINTAINER?= adam@NetBSD.org 23MAINTAINER?= adam@NetBSD.org
26HOMEPAGE= http://www.postgresql.org/ 24HOMEPAGE= http://www.postgresql.org/
27LICENSE= postgresql-license 25LICENSE= postgresql-license
28 26
29CONFLICTS+= postgresql-[0-9]* 27CONFLICTS+= postgresql-[0-9]*
30CONFLICTS+= postgresql7[0-9]-* 28CONFLICTS+= postgresql7[0-9]-*
31CONFLICTS+= postgresql8[0-24-9]-* 29CONFLICTS+= postgresql8[0-24-9]-*
32CONFLICTS+= postgresql9[0-9]-* 30CONFLICTS+= postgresql9[0-9]-*
33 31
34DISTINFO_FILE?= ${.CURDIR}/../postgresql83/distinfo 32DISTINFO_FILE?= ${.CURDIR}/../postgresql83/distinfo
35COMMON_FILESDIR?= ${.CURDIR}/../postgresql83/files 33COMMON_FILESDIR?= ${.CURDIR}/../postgresql83/files
File Deleted: pkgsrc/databases/postgresql83/Attic/Makefile.mirrors
cvs diff -r1.18 -r1.19 pkgsrc/databases/postgresql84/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/postgresql84/Attic/Makefile.common 2012/03/05 14:13:19 1.18
+++ pkgsrc/databases/postgresql84/Attic/Makefile.common 2012/03/11 10:32:35 1.19
@@ -1,37 +1,35 @@ @@ -1,37 +1,35 @@
1# $NetBSD: Makefile.common,v 1.18 2012/03/05 14:13:19 adam Exp $ 1# $NetBSD: Makefile.common,v 1.19 2012/03/11 10:32:35 wiz Exp $
2# 2#
3# used by databases/postgresql84-adminpack/Makefile 3# used by databases/postgresql84-adminpack/Makefile
4# used by databases/postgresql84-client/Makefile 4# used by databases/postgresql84-client/Makefile
5# used by databases/postgresql84-dblink/Makefile 5# used by databases/postgresql84-dblink/Makefile
6# used by databases/postgresql84-pgcrypto/Makefile 6# used by databases/postgresql84-pgcrypto/Makefile
7# used by databases/postgresql84-plperl/Makefile 7# used by databases/postgresql84-plperl/Makefile
8# used by databases/postgresql84-plpython/Makefile 8# used by databases/postgresql84-plpython/Makefile
9# used by databases/postgresql84-pltcl/Makefile 9# used by databases/postgresql84-pltcl/Makefile
10# used by databases/postgresql84-server/Makefile 10# used by databases/postgresql84-server/Makefile
11# 11#
12# This Makefile fragment is included by all PostgreSQL packages built from 12# This Makefile fragment is included by all PostgreSQL packages built from
13# the main sources of the PostgreSQL distribution except jdbc-postgresql. 13# the main sources of the PostgreSQL distribution except jdbc-postgresql.
14# 14#
15# The PostgreSQL package naming scheme, aside from the obvious piecewise 15# The PostgreSQL package naming scheme, aside from the obvious piecewise
16# packages, is as follows: 16# packages, is as follows:
17# <lang>-postgresql client-side interface to PostgreSQL 17# <lang>-postgresql client-side interface to PostgreSQL
18# postgresql-<lang> server-side module for PostgreSQL backend 18# postgresql-<lang> server-side module for PostgreSQL backend
19 19
20.include "../../databases/postgresql84/Makefile.mirrors" 
21 
22DISTNAME= postgresql-8.4.11 20DISTNAME= postgresql-8.4.11
23CATEGORIES= databases 21CATEGORIES= databases
24MASTER_SITES= ${PGSQL_MIRRORS:=source/v${PKGVERSION_NOREV}/} 22MASTER_SITES= ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
25EXTRACT_SUFX= .tar.bz2 23EXTRACT_SUFX= .tar.bz2
26 24
27MAINTAINER?= adam@NetBSD.org 25MAINTAINER?= adam@NetBSD.org
28HOMEPAGE= http://www.postgresql.org/ 26HOMEPAGE= http://www.postgresql.org/
29LICENSE= postgresql-license 27LICENSE= postgresql-license
30 28
31CONFLICTS+= postgresql-[0-9]* 29CONFLICTS+= postgresql-[0-9]*
32CONFLICTS+= postgresql7[0-9]-* 30CONFLICTS+= postgresql7[0-9]-*
33CONFLICTS+= postgresql8[0-3]-* 31CONFLICTS+= postgresql8[0-3]-*
34CONFLICTS+= postgresql9[0-9]-* 32CONFLICTS+= postgresql9[0-9]-*
35 33
36DISTINFO_FILE?= ${.CURDIR}/../postgresql84/distinfo 34DISTINFO_FILE?= ${.CURDIR}/../postgresql84/distinfo
37COMMON_FILESDIR?= ${.CURDIR}/../postgresql84/files 35COMMON_FILESDIR?= ${.CURDIR}/../postgresql84/files
File Deleted: pkgsrc/databases/postgresql84/Attic/Makefile.mirrors
cvs diff -r1.16 -r1.17 pkgsrc/databases/postgresql90/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/postgresql90/Attic/Makefile.common 2012/03/03 14:01:11 1.16
+++ pkgsrc/databases/postgresql90/Attic/Makefile.common 2012/03/11 10:32:35 1.17
@@ -1,41 +1,39 @@ @@ -1,41 +1,39 @@
1# $NetBSD: Makefile.common,v 1.16 2012/03/03 14:01:11 adam Exp $ 1# $NetBSD: Makefile.common,v 1.17 2012/03/11 10:32:35 wiz Exp $
2# 2#
3# used by databases/postgresql90-adminpack/Makefile 3# used by databases/postgresql90-adminpack/Makefile
4# used by databases/postgresql90-client/Makefile 4# used by databases/postgresql90-client/Makefile
5# used by databases/postgresql90-datatypes/Makefile 5# used by databases/postgresql90-datatypes/Makefile
6# used by databases/postgresql90-dblink/Makefile 6# used by databases/postgresql90-dblink/Makefile
7# used by databases/postgresql90-docs/Makefile 7# used by databases/postgresql90-docs/Makefile
8# used by databases/postgresql90-fuzzystrmatch/Makefile 8# used by databases/postgresql90-fuzzystrmatch/Makefile
9# used by databases/postgresql90-pgcrypto/Makefile 9# used by databases/postgresql90-pgcrypto/Makefile
10# used by databases/postgresql90-plperl/Makefile 10# used by databases/postgresql90-plperl/Makefile
11# used by databases/postgresql90-plpython/Makefile 11# used by databases/postgresql90-plpython/Makefile
12# used by databases/postgresql90-pltcl/Makefile 12# used by databases/postgresql90-pltcl/Makefile
13# used by databases/postgresql90-server/Makefile 13# used by databases/postgresql90-server/Makefile
14# used by databases/postgresql90-upgrade/Makefile 14# used by databases/postgresql90-upgrade/Makefile
15# 15#
16# This Makefile fragment is included by all PostgreSQL packages built from 16# This Makefile fragment is included by all PostgreSQL packages built from
17# the main sources of the PostgreSQL distribution except jdbc-postgresql. 17# the main sources of the PostgreSQL distribution except jdbc-postgresql.
18# 18#
19# The PostgreSQL package naming scheme, aside from the obvious piecewise 19# The PostgreSQL package naming scheme, aside from the obvious piecewise
20# packages, is as follows: 20# packages, is as follows:
21# <lang>-postgresql client-side interface to PostgreSQL 21# <lang>-postgresql client-side interface to PostgreSQL
22# postgresql-<lang> server-side module for PostgreSQL backend 22# postgresql-<lang> server-side module for PostgreSQL backend
23 23
24.include "../../databases/postgresql90/Makefile.mirrors" 
25 
26DISTNAME= postgresql-9.0.7 24DISTNAME= postgresql-9.0.7
27CATEGORIES= databases 25CATEGORIES= databases
28MASTER_SITES= ${PGSQL_MIRRORS:=source/v${PKGVERSION_NOREV}/} 26MASTER_SITES= ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
29EXTRACT_SUFX= .tar.bz2 27EXTRACT_SUFX= .tar.bz2
30 28
31MAINTAINER?= adam@NetBSD.org 29MAINTAINER?= adam@NetBSD.org
32HOMEPAGE= http://www.postgresql.org/ 30HOMEPAGE= http://www.postgresql.org/
33LICENSE= postgresql-license 31LICENSE= postgresql-license
34 32
35CONFLICTS+= postgresql-[0-9]* 33CONFLICTS+= postgresql-[0-9]*
36CONFLICTS+= postgresql[0-8][0-9]-* 34CONFLICTS+= postgresql[0-8][0-9]-*
37CONFLICTS+= postgresql9[1-9]-* 35CONFLICTS+= postgresql9[1-9]-*
38 36
39DISTINFO_FILE?= ${.CURDIR}/../../databases/postgresql90/distinfo 37DISTINFO_FILE?= ${.CURDIR}/../../databases/postgresql90/distinfo
40COMMON_FILESDIR?= ${.CURDIR}/../../databases/postgresql90/files 38COMMON_FILESDIR?= ${.CURDIR}/../../databases/postgresql90/files
41PATCHDIR?= ${.CURDIR}/../../databases/postgresql90/patches 39PATCHDIR?= ${.CURDIR}/../../databases/postgresql90/patches
File Deleted: pkgsrc/databases/postgresql90/Attic/Makefile.mirrors
cvs diff -r1.5 -r1.6 pkgsrc/databases/postgresql91/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/postgresql91/Attic/Makefile.common 2012/03/03 14:01:12 1.5
+++ pkgsrc/databases/postgresql91/Attic/Makefile.common 2012/03/11 10:32:35 1.6
@@ -1,41 +1,39 @@ @@ -1,41 +1,39 @@
1# $NetBSD: Makefile.common,v 1.5 2012/03/03 14:01:12 adam Exp $ 1# $NetBSD: Makefile.common,v 1.6 2012/03/11 10:32:35 wiz Exp $
2# 2#
3# used by databases/postgresql91-adminpack/Makefile 3# used by databases/postgresql91-adminpack/Makefile
4# used by databases/postgresql91-client/Makefile 4# used by databases/postgresql91-client/Makefile
5# used by databases/postgresql91-datatypes/Makefile 5# used by databases/postgresql91-datatypes/Makefile
6# used by databases/postgresql91-dblink/Makefile 6# used by databases/postgresql91-dblink/Makefile
7# used by databases/postgresql91-docs/Makefile 7# used by databases/postgresql91-docs/Makefile
8# used by databases/postgresql91-fuzzystrmatch/Makefile 8# used by databases/postgresql91-fuzzystrmatch/Makefile
9# used by databases/postgresql91-pgcrypto/Makefile 9# used by databases/postgresql91-pgcrypto/Makefile
10# used by databases/postgresql91-plperl/Makefile 10# used by databases/postgresql91-plperl/Makefile
11# used by databases/postgresql91-plpython/Makefile 11# used by databases/postgresql91-plpython/Makefile
12# used by databases/postgresql91-pltcl/Makefile 12# used by databases/postgresql91-pltcl/Makefile
13# used by databases/postgresql91-server/Makefile 13# used by databases/postgresql91-server/Makefile
14# used by databases/postgresql91-upgrade/Makefile 14# used by databases/postgresql91-upgrade/Makefile
15# 15#
16# This Makefile fragment is included by all PostgreSQL packages built from 16# This Makefile fragment is included by all PostgreSQL packages built from
17# the main sources of the PostgreSQL distribution except jdbc-postgresql. 17# the main sources of the PostgreSQL distribution except jdbc-postgresql.
18# 18#
19# The PostgreSQL package naming scheme, aside from the obvious piecewise 19# The PostgreSQL package naming scheme, aside from the obvious piecewise
20# packages, is as follows: 20# packages, is as follows:
21# <lang>-postgresql client-side interface to PostgreSQL 21# <lang>-postgresql client-side interface to PostgreSQL
22# postgresql-<lang> server-side module for PostgreSQL backend 22# postgresql-<lang> server-side module for PostgreSQL backend
23 23
24.include "../../databases/postgresql91/Makefile.mirrors" 
25 
26DISTNAME= postgresql-9.1.3 24DISTNAME= postgresql-9.1.3
27CATEGORIES= databases 25CATEGORIES= databases
28MASTER_SITES= ${PGSQL_MIRRORS:=source/v${PKGVERSION_NOREV}/} 26MASTER_SITES= ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
29EXTRACT_SUFX= .tar.bz2 27EXTRACT_SUFX= .tar.bz2
30 28
31MAINTAINER?= adam@NetBSD.org 29MAINTAINER?= adam@NetBSD.org
32HOMEPAGE= http://www.postgresql.org/ 30HOMEPAGE= http://www.postgresql.org/
33LICENSE= postgresql-license 31LICENSE= postgresql-license
34 32
35CONFLICTS+= postgresql-[0-9]* 33CONFLICTS+= postgresql-[0-9]*
36CONFLICTS+= postgresql[0-8][0-9]-* 34CONFLICTS+= postgresql[0-8][0-9]-*
37CONFLICTS+= postgresql9[02-9]-* 35CONFLICTS+= postgresql9[02-9]-*
38 36
39DISTINFO_FILE?= ${.CURDIR}/../../databases/postgresql91/distinfo 37DISTINFO_FILE?= ${.CURDIR}/../../databases/postgresql91/distinfo
40COMMON_FILESDIR?= ${.CURDIR}/../../databases/postgresql91/files 38COMMON_FILESDIR?= ${.CURDIR}/../../databases/postgresql91/files
41PATCHDIR?= ${.CURDIR}/../../databases/postgresql91/patches 39PATCHDIR?= ${.CURDIR}/../../databases/postgresql91/patches
File Deleted: pkgsrc/databases/postgresql91/Attic/Makefile.mirrors