aboutsummaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorPalle Girgensohn <girgen@FreeBSD.org>2010-05-20 15:43:39 +0000
committerPalle Girgensohn <girgen@FreeBSD.org>2010-05-20 15:43:39 +0000
commitdaea94a3e118c8b89d6818a084c495eaf998b797 (patch)
tree019a66fdda0a13c1c8f878e18ae84364d152bacf /databases
parentede0dbbfacbf99a04116680290ab78dcfbc32308 (diff)
downloadports-daea94a3e118c8b89d6818a084c495eaf998b797.tar.gz
ports-daea94a3e118c8b89d6818a084c495eaf998b797.zip
Update all PostgreSQL ports to latest version.
Remove postgresql-contrib in favour for postgresqlNN-contrib. This way we will get packages built, which is nice. Security: CVE-2010-1169 Security: CVE-2010-1170 The PostgreSQL Project today released minor versions updating all active branches of the PostgreSQL object-relational database system, including versions 8.4.4, 8.3.11, 8.2.17, 8.1.21, 8.0.25, and 7.4.29. This release fixes moderate-risk security issues with PL/perl and PL/tcl, as well as a data corruption issue with standby databases. Users of any of these three features should update their PostgreSQL installations immediately. The PL/perl security fix closes a security hole in PL/perl procedures which could allow privilege escalation on the host system, caused by a flaw in Safe.pm; see CVE-2010-1169 and CVE-2010-1447 for details. A second patch prevents PL/tcl's pltcl_modules table from being subverted in order to run arbitrary Tcl scripts; see CVE-2010-1170. These issues only affect users who have enabled either of these two stored procedure languages. Also corrected is use of the command ALTER TABLE SET TABLESPACE, which previously could cause data corruption on Warm Standby database slaves. This issue affects only version 8.4. There are also 21 other bug fixes in this release, some of which apply only to version 8.4, and a few of which are specifically for Windows. While these are generally fixes for minor issues, among the changes are: * Fix for a combinational crash condition * Prevent normal users from resetting some GUCs in their own role definitions * Correctly apply constraint exclusion in UPDATE and DELETE queries * Minor fixes for WAL archiving * Update timezone data for 12 zones See the release notes for a full list of changes with details. Releasenotes at http://www.postgresql.org/docs/current/static/release.html
Notes
Notes: svn path=/head/; revision=254659
Diffstat (limited to 'databases')
-rw-r--r--databases/postgresql74-contrib/Makefile (renamed from databases/postgresql-contrib/Makefile)30
-rw-r--r--databases/postgresql74-contrib/pkg-descr (renamed from databases/postgresql-contrib/pkg-descr)0
-rw-r--r--databases/postgresql74-server/Makefile3
-rw-r--r--databases/postgresql74-server/distinfo6
-rw-r--r--databases/postgresql74-server/files/502.pgsql39
-rw-r--r--databases/postgresql80-contrib/Makefile33
-rw-r--r--databases/postgresql80-contrib/pkg-descr23
-rw-r--r--databases/postgresql80-server/Makefile6
-rw-r--r--databases/postgresql80-server/distinfo12
-rw-r--r--databases/postgresql80-server/files/502.pgsql39
-rw-r--r--databases/postgresql80-server/pkg-plist-server8
-rw-r--r--databases/postgresql81-contrib/Makefile29
-rw-r--r--databases/postgresql81-contrib/pkg-descr23
-rw-r--r--databases/postgresql81-server/Makefile6
-rw-r--r--databases/postgresql81-server/distinfo12
-rw-r--r--databases/postgresql81-server/files/502.pgsql39
-rw-r--r--databases/postgresql81-server/pkg-plist-server8
-rw-r--r--databases/postgresql82-contrib/Makefile29
-rw-r--r--databases/postgresql82-contrib/pkg-descr23
-rw-r--r--databases/postgresql82-server/Makefile4
-rw-r--r--databases/postgresql82-server/distinfo6
-rw-r--r--databases/postgresql82-server/files/502.pgsql39
-rw-r--r--databases/postgresql82-server/pkg-plist-server5
-rw-r--r--databases/postgresql83-contrib/Makefile29
-rw-r--r--databases/postgresql83-contrib/pkg-descr23
-rw-r--r--databases/postgresql83-server/Makefile6
-rw-r--r--databases/postgresql83-server/distinfo12
-rw-r--r--databases/postgresql83-server/files/502.pgsql30
-rw-r--r--databases/postgresql83-server/files/pkg-message-client.in2
-rw-r--r--databases/postgresql83-server/pkg-plist-server7
-rw-r--r--databases/postgresql84-contrib/Makefile31
-rw-r--r--databases/postgresql84-contrib/pkg-descr23
-rw-r--r--databases/postgresql84-server/Makefile4
-rw-r--r--databases/postgresql84-server/distinfo8
-rw-r--r--databases/postgresql84-server/files/502.pgsql30
-rw-r--r--databases/postgresql84-server/pkg-plist-server2
36 files changed, 497 insertions, 132 deletions
diff --git a/databases/postgresql-contrib/Makefile b/databases/postgresql74-contrib/Makefile
index 1be105a2a5cd..85d86dd407ed 100644
--- a/databases/postgresql-contrib/Makefile
+++ b/databases/postgresql74-contrib/Makefile
@@ -7,28 +7,14 @@
PORTNAME= postgresql
PKGNAMESUFFIX= -contrib
-PORTREVISION= 2
CATEGORIES= databases
MAINTAINER= girgen@FreeBSD.org
COMMENT= The contrib utilities from the PostgreSQL distribution
USE_PGSQL= yes
-MASTERDIR= ${.CURDIR}/../postgresql${PGSQL_VER}-server
-
-DEFAULT_PGSQL_VER?=82
-
-# can't include <bsd.port.pre.mk> in a slave port
-# so set these instead:
-LOCALBASE?= /usr/local
-SED?= /usr/bin/sed
-
-# Setting/finding PostgreSQL version we want.
-.if exists(${LOCALBASE}/bin/pg_config)
-PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)[^0-9].*/\1\2/p'
-.else
-PGSQL_VER= ${DEFAULT_PGSQL_VER}
-.endif
+DEFAULT_PGSQL_VER=74
+MASTERDIR= ${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server
USE_BISON= build
@@ -36,20 +22,12 @@ BUILD_DIRS= src/port contrib
INSTALL_DIRS= contrib
SLAVE_ONLY= yes
-PKGMESSAGE= ${.CURDIR}/pkg-message
-
-.if ${PGSQL_VER} > 83
-CONFIGURE_ARGS+= --with-libxslt --with-libxml
-LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt xml2.5:${PORTSDIR}/textproc/libxml2
-.endif
post-install:
-.if ${PGSQL_VER} < 81
@- ${INSTALL_SCRIPT} ${WRKSRC}/contrib/ipc_check/ipc_check.pl ${PREFIX}/bin/ipc_check ;\
${INSTALL_DATA} ${WRKSRC}/contrib/ipc_check/README ${DOCSDIR}/contrib/README.ipc_check ;\
${INSTALL_SCRIPT} ${WRKSRC}/contrib/reindexdb/reindexdb ${PREFIX}/bin/reindexdb ;\
- ${INSTALL_DATA} ${WRKSRC}/contrib/reindexdb/README ${DOCSDIR}/contrib/README.reindexdb
-.endif
- @- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${DOCSDIR}/contrib/README
+ ${INSTALL_DATA} ${WRKSRC}/contrib/reindexdb/README ${DOCSDIR}/contrib/README.reindexdb ;\
+ ${INSTALL_DATA} ${WRKSRC}/contrib/README ${DOCSDIR}/contrib/README
.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql-contrib/pkg-descr b/databases/postgresql74-contrib/pkg-descr
index f7a01fd35e15..f7a01fd35e15 100644
--- a/databases/postgresql-contrib/pkg-descr
+++ b/databases/postgresql74-contrib/pkg-descr
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 2e87b52bd042..3e3ad07dc5fa 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME?= postgresql
-PORTVERSION?= 7.4.25
+PORTVERSION?= 7.4.29
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -38,6 +38,7 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
--docdir=${DOCSDIR}
+LDFLAGS+= -L${PREFIX}/lib
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
diff --git a/databases/postgresql74-server/distinfo b/databases/postgresql74-server/distinfo
index e1b220b60e4d..466e22852dbd 100644
--- a/databases/postgresql74-server/distinfo
+++ b/databases/postgresql74-server/distinfo
@@ -1,6 +1,6 @@
-MD5 (postgresql/postgresql-7.4.25.tar.bz2) = 2d9dda05f0d36a2177077bc754e2c68b
-SHA256 (postgresql/postgresql-7.4.25.tar.bz2) = 8c7d673db0f1cf51fa94053f76952a2ebc3f05f6794cc8045ecedcfda4d24f72
-SIZE (postgresql/postgresql-7.4.25.tar.bz2) = 10300771
+MD5 (postgresql/postgresql-7.4.29.tar.bz2) = 6cd6bdc647dfa3684825e272ae53c0f3
+SHA256 (postgresql/postgresql-7.4.29.tar.bz2) = a1da45f6f098f529b94fe60bd9fac073c0507004d33f1b8a472d5fa638fbcc9c
+SIZE (postgresql/postgresql-7.4.29.tar.bz2) = 10364970
MD5 (postgresql/hier-Pg7.4-0.5.3.tar.gz) = 16d037213b879963724da7809a0a1589
SHA256 (postgresql/hier-Pg7.4-0.5.3.tar.gz) = 1e56f76560c86227b08faabf78e3a53de4188c6a8f9d1f38b1481427e8fdf74c
SIZE (postgresql/hier-Pg7.4-0.5.3.tar.gz) = 34662
diff --git a/databases/postgresql74-server/files/502.pgsql b/databases/postgresql74-server/files/502.pgsql
index acc1afe431cf..281189a59c46 100644
--- a/databases/postgresql74-server/files/502.pgsql
+++ b/databases/postgresql74-server/files/502.pgsql
@@ -15,12 +15,10 @@
# Define these variables in either /etc/periodic.conf or
# /etc/periodic.conf.local to override the default values.
#
-# daily_pgsql_backup_enable="YES" # do backup
+# daily_pgsql_backup_enable="YES" # do backup of all databases
+# daily_pgsql_backup_enable="foo bar db1 db2" # only do backup of a limited selection of databases
# daily_pgsql_vacuum_enable="YES" # do vacuum
-daily_pgsql_vacuum_enable="YES"
-daily_pgsql_backup_enable="NO"
-
daily_pgsql_vacuum_args="-z"
daily_pgsql_pgdump_args="-b -F c"
# backupdir is relative to ~pgsql home directory unless it begins with a slash:
@@ -40,32 +38,32 @@ eval backupdir=${daily_pgsql_backupdir}
rc=0
-case "$daily_pgsql_backup_enable" in
- [Yy][Ee][Ss])
-
+pgsql_backup() {
# daily_pgsql_backupdir must be writeable by user pgsql
# ~pgsql is just that under normal circumstances,
# but this might not be where you want the backups...
if [ ! -d ${backupdir} ] ; then
echo Creating ${backupdir}
- mkdir ${backupdir}; chmod 700 ${backupdir}; chown pgsql ${backupdir}
+ mkdir -m 700 ${backupdir}; chown pgsql ${backupdir}
fi
echo
- echo "PostgreSQL maintenance"
+ echo "PostgreSQL backups"
# Protect the data
umask 077
- dbnames=`su -l pgsql -c "umask 077; psql -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
rc=$?
now=`date "+%Y-%m-%dT%H:%M:%S"`
file=${daily_pgsql_backupdir}/pgglobals_${now}
su -l pgsql -c "umask 077; pg_dumpall -g | gzip -9 > ${file}.gz"
- for db in ${dbnames}; do
+
+ db=$1
+ while shift; do
echo -n " $db"
file=${backupdir}/pgdump_${db}_${now}
su -l pgsql -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}"
[ $? -gt 0 ] && rc=3
+ db=$1
done
if [ $rc -gt 0 ]; then
@@ -76,6 +74,23 @@ case "$daily_pgsql_backup_enable" in
# cleaning up old data
find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' \) \
-a -mtime +${daily_pgsql_savedays} -delete
+ echo
+}
+
+case "$daily_pgsql_backup_enable" in
+ [Yy][Ee][Ss])
+ dbnames=`su -l pgsql -c "umask 077; psql -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
+ pgsql_backup $dbnames
+ ;;
+
+ [Nn][Oo])
+ ;;
+
+ "")
+ ;;
+
+ *)
+ pgsql_backup $daily_pgsql_backup_enable
;;
esac
@@ -83,7 +98,7 @@ case "$daily_pgsql_vacuum_enable" in
[Yy][Ee][Ss])
echo
- echo "vacuuming..."
+ echo "PostgreSQL vacuum"
su -l pgsql -c "vacuumdb -a -q ${daily_pgsql_vacuum_args}"
if [ $? -gt 0 ]
then
diff --git a/databases/postgresql80-contrib/Makefile b/databases/postgresql80-contrib/Makefile
new file mode 100644
index 000000000000..096e7d1efad7
--- /dev/null
+++ b/databases/postgresql80-contrib/Makefile
@@ -0,0 +1,33 @@
+# New ports collection makefile for: postgresql-contrib
+# Date created: June 10, 2003
+# Whom: Palle Girgensohn <girgen@pingpong.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= postgresql
+PKGNAMESUFFIX= -contrib
+CATEGORIES= databases
+
+MAINTAINER= girgen@FreeBSD.org
+COMMENT= The contrib utilities from the PostgreSQL distribution
+
+USE_PGSQL= yes
+DEFAULT_PGSQL_VER=80
+MASTERDIR= ${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server
+
+USE_BISON= build
+
+BUILD_DIRS= src/port contrib
+INSTALL_DIRS= contrib
+
+SLAVE_ONLY= yes
+
+post-install:
+ @- ${INSTALL_SCRIPT} ${WRKSRC}/contrib/ipc_check/ipc_check.pl ${PREFIX}/bin/ipc_check ;\
+ ${INSTALL_DATA} ${WRKSRC}/contrib/ipc_check/README ${DOCSDIR}/contrib/README.ipc_check ;\
+ ${INSTALL_SCRIPT} ${WRKSRC}/contrib/reindexdb/reindexdb ${PREFIX}/bin/reindexdb ;\
+ ${INSTALL_DATA} ${WRKSRC}/contrib/reindexdb/README ${DOCSDIR}/contrib/README.reindexdb ;\
+ ${INSTALL_DATA} ${WRKSRC}/contrib/README ${DOCSDIR}/contrib/README
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql80-contrib/pkg-descr b/databases/postgresql80-contrib/pkg-descr
new file mode 100644
index 000000000000..f7a01fd35e15
--- /dev/null
+++ b/databases/postgresql80-contrib/pkg-descr
@@ -0,0 +1,23 @@
+This is the port for all stuff that comes in the contrib subtree of
+the postgresql distribution. This subtree contains porting tools,
+analysis utilities, and plug-in features that are not part of the core
+PostgreSQL system, mainly because they address a limited audience or
+are too experimental to be part of the main source tree. This does
+not preclude their usefulness.
+
+Each subdirectory contains a README file with information about the
+module. Some directories supply new user-defined functions, operators,
+or types. After you have installed the files you need to register the
+new entities in the database system by running the commands in the
+supplied .sql file. For example,
+
+ $ psql -d dbname -f module.sql
+
+The .sql files are installed into /usr/local/share/postgresql/contrib
+
+For more information, please see
+/usr/local/share/doc/postgresql/contrib/README*
+
+This software is part of the standard PostgreSQL distribution.
+
+WWW: http://www.postgresql.org/
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 1701bf5ceb23..43eca524aad5 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME?= postgresql
-PORTVERSION?= 8.0.21
-PORTREVISION?= 1
+PORTVERSION?= 8.0.25
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -41,6 +40,7 @@ CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
--with-includes=${LOCALBASE}/include \
--enable-thread-safety \
--with-docdir=${DOCSDIR}
+LDFLAGS+= -L${PREFIX}/lib
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
@@ -106,7 +106,7 @@ USE_AUTOTOOLS= autoconf:262
CONFIGURE_ARGS+=--with-icu
LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu
PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu
-PATCHFILES+= pg-8019-icu-xx-2008-11-03.diff.gz:icu
+PATCHFILES+= pg-8025-icu-xx-2010-05-14.diff.gz:icu
. endif
PATCH_DIST_STRIP=-p1
diff --git a/databases/postgresql80-server/distinfo b/databases/postgresql80-server/distinfo
index 086027731600..c5354fefdb6b 100644
--- a/databases/postgresql80-server/distinfo
+++ b/databases/postgresql80-server/distinfo
@@ -1,9 +1,9 @@
-MD5 (postgresql/postgresql-8.0.21.tar.bz2) = 7c9b5aa67f79e19da7a663a66db22765
-SHA256 (postgresql/postgresql-8.0.21.tar.bz2) = 52ac543f5d8412755ce2c6efa1728015cdd37aa7cdcbc368e570270effbdf17f
-SIZE (postgresql/postgresql-8.0.21.tar.bz2) = 11239602
+MD5 (postgresql/postgresql-8.0.25.tar.bz2) = 91b6f5c27d881e2fef8e9dd7aae1bbe7
+SHA256 (postgresql/postgresql-8.0.25.tar.bz2) = e22b3328c76919045702887c70458a9fe7acb3ab10d735f7f272e93184a82308
+SIZE (postgresql/postgresql-8.0.25.tar.bz2) = 11333463
MD5 (postgresql/hier-Pg8.0.3-0.5.5.diff.gz) = 9fa75cd7b3f1cb913d2e6d310582a4bc
SHA256 (postgresql/hier-Pg8.0.3-0.5.5.diff.gz) = f3a1849f2d527759ef721502cb445a435e072cc9be820c2e489c9e4a71c7adbe
SIZE (postgresql/hier-Pg8.0.3-0.5.5.diff.gz) = 30555
-MD5 (postgresql/pg-8019-icu-xx-2008-11-03.diff.gz) = 76fa7d029bcdbb4705e48d394f87bd06
-SHA256 (postgresql/pg-8019-icu-xx-2008-11-03.diff.gz) = 089bd1f35c1ca6ac60565726d8d40914fe16a5ddb77c2a0ca9b80f64e064f936
-SIZE (postgresql/pg-8019-icu-xx-2008-11-03.diff.gz) = 4597
+MD5 (postgresql/pg-8025-icu-xx-2010-05-14.diff.gz) = 3327511072c2dfc12e1b0e95551b6784
+SHA256 (postgresql/pg-8025-icu-xx-2010-05-14.diff.gz) = 0c53c120eaa4063b39bcf4423e144c63b48a9f2dbe2c9c4efed238e6a5efaf55
+SIZE (postgresql/pg-8025-icu-xx-2010-05-14.diff.gz) = 4621
diff --git a/databases/postgresql80-server/files/502.pgsql b/databases/postgresql80-server/files/502.pgsql
index acc1afe431cf..281189a59c46 100644
--- a/databases/postgresql80-server/files/502.pgsql
+++ b/databases/postgresql80-server/files/502.pgsql
@@ -15,12 +15,10 @@
# Define these variables in either /etc/periodic.conf or
# /etc/periodic.conf.local to override the default values.
#
-# daily_pgsql_backup_enable="YES" # do backup
+# daily_pgsql_backup_enable="YES" # do backup of all databases
+# daily_pgsql_backup_enable="foo bar db1 db2" # only do backup of a limited selection of databases
# daily_pgsql_vacuum_enable="YES" # do vacuum
-daily_pgsql_vacuum_enable="YES"
-daily_pgsql_backup_enable="NO"
-
daily_pgsql_vacuum_args="-z"
daily_pgsql_pgdump_args="-b -F c"
# backupdir is relative to ~pgsql home directory unless it begins with a slash:
@@ -40,32 +38,32 @@ eval backupdir=${daily_pgsql_backupdir}
rc=0
-case "$daily_pgsql_backup_enable" in
- [Yy][Ee][Ss])
-
+pgsql_backup() {
# daily_pgsql_backupdir must be writeable by user pgsql
# ~pgsql is just that under normal circumstances,
# but this might not be where you want the backups...
if [ ! -d ${backupdir} ] ; then
echo Creating ${backupdir}
- mkdir ${backupdir}; chmod 700 ${backupdir}; chown pgsql ${backupdir}
+ mkdir -m 700 ${backupdir}; chown pgsql ${backupdir}
fi
echo
- echo "PostgreSQL maintenance"
+ echo "PostgreSQL backups"
# Protect the data
umask 077
- dbnames=`su -l pgsql -c "umask 077; psql -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
rc=$?
now=`date "+%Y-%m-%dT%H:%M:%S"`
file=${daily_pgsql_backupdir}/pgglobals_${now}
su -l pgsql -c "umask 077; pg_dumpall -g | gzip -9 > ${file}.gz"
- for db in ${dbnames}; do
+
+ db=$1
+ while shift; do
echo -n " $db"
file=${backupdir}/pgdump_${db}_${now}
su -l pgsql -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}"
[ $? -gt 0 ] && rc=3
+ db=$1
done
if [ $rc -gt 0 ]; then
@@ -76,6 +74,23 @@ case "$daily_pgsql_backup_enable" in
# cleaning up old data
find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' \) \
-a -mtime +${daily_pgsql_savedays} -delete
+ echo
+}
+
+case "$daily_pgsql_backup_enable" in
+ [Yy][Ee][Ss])
+ dbnames=`su -l pgsql -c "umask 077; psql -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
+ pgsql_backup $dbnames
+ ;;
+
+ [Nn][Oo])
+ ;;
+
+ "")
+ ;;
+
+ *)
+ pgsql_backup $daily_pgsql_backup_enable
;;
esac
@@ -83,7 +98,7 @@ case "$daily_pgsql_vacuum_enable" in
[Yy][Ee][Ss])
echo
- echo "vacuuming..."
+ echo "PostgreSQL vacuum"
su -l pgsql -c "vacuumdb -a -q ${daily_pgsql_vacuum_args}"
if [ $? -gt 0 ]
then
diff --git a/databases/postgresql80-server/pkg-plist-server b/databases/postgresql80-server/pkg-plist-server
index a1671d2e0ad4..e9ad7a60f371 100644
--- a/databases/postgresql80-server/pkg-plist-server
+++ b/databases/postgresql80-server/pkg-plist-server
@@ -207,6 +207,7 @@ share/postgresql/timezone/America/Asuncion
share/postgresql/timezone/America/Atikokan
share/postgresql/timezone/America/Atka
share/postgresql/timezone/America/Bahia
+share/postgresql/timezone/America/Bahia_Banderas
share/postgresql/timezone/America/Barbados
share/postgresql/timezone/America/Belem
share/postgresql/timezone/America/Belize
@@ -279,6 +280,7 @@ share/postgresql/timezone/America/Managua
share/postgresql/timezone/America/Manaus
share/postgresql/timezone/America/Marigot
share/postgresql/timezone/America/Martinique
+share/postgresql/timezone/America/Matamoros
share/postgresql/timezone/America/Mazatlan
share/postgresql/timezone/America/Mendoza
share/postgresql/timezone/America/Menominee
@@ -297,6 +299,7 @@ share/postgresql/timezone/America/Nome
share/postgresql/timezone/America/Noronha
share/postgresql/timezone/America/North_Dakota/Center
share/postgresql/timezone/America/North_Dakota/New_Salem
+share/postgresql/timezone/America/Ojinaga
share/postgresql/timezone/America/Panama
share/postgresql/timezone/America/Pangnirtung
share/postgresql/timezone/America/Paramaribo
@@ -309,10 +312,11 @@ share/postgresql/timezone/America/Puerto_Rico
share/postgresql/timezone/America/Rainy_River
share/postgresql/timezone/America/Rankin_Inlet
share/postgresql/timezone/America/Recife
-share/postgresql/timezone/America/Resolute
share/postgresql/timezone/America/Regina
+share/postgresql/timezone/America/Resolute
share/postgresql/timezone/America/Rio_Branco
share/postgresql/timezone/America/Rosario
+share/postgresql/timezone/America/Santa_Isabel
share/postgresql/timezone/America/Santarem
share/postgresql/timezone/America/Santiago
share/postgresql/timezone/America/Santo_Domingo
@@ -341,6 +345,7 @@ share/postgresql/timezone/America/Yellowknife
share/postgresql/timezone/Antarctica/Casey
share/postgresql/timezone/Antarctica/Davis
share/postgresql/timezone/Antarctica/DumontDUrville
+share/postgresql/timezone/Antarctica/Macquarie
share/postgresql/timezone/Antarctica/Mawson
share/postgresql/timezone/Antarctica/McMurdo
share/postgresql/timezone/Antarctica/Palmer
@@ -403,6 +408,7 @@ share/postgresql/timezone/Asia/Makassar
share/postgresql/timezone/Asia/Manila
share/postgresql/timezone/Asia/Muscat
share/postgresql/timezone/Asia/Nicosia
+share/postgresql/timezone/Asia/Novokuznetsk
share/postgresql/timezone/Asia/Novosibirsk
share/postgresql/timezone/Asia/Omsk
share/postgresql/timezone/Asia/Oral
diff --git a/databases/postgresql81-contrib/Makefile b/databases/postgresql81-contrib/Makefile
new file mode 100644
index 000000000000..14b02da5ca27
--- /dev/null
+++ b/databases/postgresql81-contrib/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for: postgresql-contrib
+# Date created: June 10, 2003
+# Whom: Palle Girgensohn <girgen@pingpong.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= postgresql
+PKGNAMESUFFIX= -contrib
+CATEGORIES= databases
+
+MAINTAINER= girgen@FreeBSD.org
+COMMENT= The contrib utilities from the PostgreSQL distribution
+
+USE_PGSQL= yes
+DEFAULT_PGSQL_VER?=81
+MASTERDIR= ${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server
+
+USE_BISON= build
+
+BUILD_DIRS= src/port contrib
+INSTALL_DIRS= contrib
+
+SLAVE_ONLY= yes
+
+post-install:
+ @- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${DOCSDIR}/contrib/README
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql81-contrib/pkg-descr b/databases/postgresql81-contrib/pkg-descr
new file mode 100644
index 000000000000..f7a01fd35e15
--- /dev/null
+++ b/databases/postgresql81-contrib/pkg-descr
@@ -0,0 +1,23 @@
+This is the port for all stuff that comes in the contrib subtree of
+the postgresql distribution. This subtree contains porting tools,
+analysis utilities, and plug-in features that are not part of the core
+PostgreSQL system, mainly because they address a limited audience or
+are too experimental to be part of the main source tree. This does
+not preclude their usefulness.
+
+Each subdirectory contains a README file with information about the
+module. Some directories supply new user-defined functions, operators,
+or types. After you have installed the files you need to register the
+new entities in the database system by running the commands in the
+supplied .sql file. For example,
+
+ $ psql -d dbname -f module.sql
+
+The .sql files are installed into /usr/local/share/postgresql/contrib
+
+For more information, please see
+/usr/local/share/doc/postgresql/contrib/README*
+
+This software is part of the standard PostgreSQL distribution.
+
+WWW: http://www.postgresql.org/
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 823aa17c18ee..c712a9b891ce 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME?= postgresql
-PORTVERSION?= 8.1.17
-PORTREVISION?= 1
+PORTVERSION?= 8.1.21
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -41,6 +40,7 @@ CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
--with-includes=${LOCALBASE}/include \
--enable-thread-safety \
--with-docdir=${DOCSDIR}
+LDFLAGS+= -L${PREFIX}/lib
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
@@ -107,7 +107,7 @@ USE_AUTOTOOLS= autoconf:262
CONFIGURE_ARGS+=--with-icu
LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu
PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu
-PATCHFILES+= pg-8113-icu-xx-2008-08-28.diff.gz:icu
+PATCHFILES+= pg-8121-icu-xx-2010-05-14.diff.gz:icu
. endif
PATCH_DIST_STRIP=-p1
diff --git a/databases/postgresql81-server/distinfo b/databases/postgresql81-server/distinfo
index 927ce73e4e07..eaade8fdc675 100644
--- a/databases/postgresql81-server/distinfo
+++ b/databases/postgresql81-server/distinfo
@@ -1,9 +1,9 @@
-MD5 (postgresql/postgresql-8.1.17.tar.bz2) = 082c37bbed468847e75762dc12bb6acf
-SHA256 (postgresql/postgresql-8.1.17.tar.bz2) = 82954addb4a5753ed24081d84b3b8bdffd16ac4353776dfa43bbfdcc49fc5621
-SIZE (postgresql/postgresql-8.1.17.tar.bz2) = 11780776
+MD5 (postgresql/postgresql-8.1.21.tar.bz2) = 0f0868eca8c39e22390e688effe2af5f
+SHA256 (postgresql/postgresql-8.1.21.tar.bz2) = 192fdbe7e703c3ad9bf767997c62717f0f00192b884ae7ced0d6741795c15679
+SIZE (postgresql/postgresql-8.1.21.tar.bz2) = 11907115
MD5 (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 15916bf13b99702599ce70b6475f7d86
SHA256 (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 14ecc3809ce69f47c3460efee3fc7fce78f68802936650fc4e1132adffd41d1e
SIZE (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 31203
-MD5 (postgresql/pg-8113-icu-xx-2008-08-28.diff.gz) = da1713b818b202dc927caba522c74932
-SHA256 (postgresql/pg-8113-icu-xx-2008-08-28.diff.gz) = ad6690acde3c89a7cb02537bc3858b8732343a3a0c2b122ad0873d9844c3611f
-SIZE (postgresql/pg-8113-icu-xx-2008-08-28.diff.gz) = 4244
+MD5 (postgresql/pg-8121-icu-xx-2010-05-14.diff.gz) = af4e5f16bfc60a9e98d18f1f7c8d76e7
+SHA256 (postgresql/pg-8121-icu-xx-2010-05-14.diff.gz) = 4a5f4751599bd56144e598bce75f7a970e12d82f9300d36859f544083cf90a56
+SIZE (postgresql/pg-8121-icu-xx-2010-05-14.diff.gz) = 4271
diff --git a/databases/postgresql81-server/files/502.pgsql b/databases/postgresql81-server/files/502.pgsql
index acc1afe431cf..281189a59c46 100644
--- a/databases/postgresql81-server/files/502.pgsql
+++ b/databases/postgresql81-server/files/502.pgsql
@@ -15,12 +15,10 @@
# Define these variables in either /etc/periodic.conf or
# /etc/periodic.conf.local to override the default values.
#
-# daily_pgsql_backup_enable="YES" # do backup
+# daily_pgsql_backup_enable="YES" # do backup of all databases
+# daily_pgsql_backup_enable="foo bar db1 db2" # only do backup of a limited selection of databases
# daily_pgsql_vacuum_enable="YES" # do vacuum
-daily_pgsql_vacuum_enable="YES"
-daily_pgsql_backup_enable="NO"
-
daily_pgsql_vacuum_args="-z"
daily_pgsql_pgdump_args="-b -F c"
# backupdir is relative to ~pgsql home directory unless it begins with a slash:
@@ -40,32 +38,32 @@ eval backupdir=${daily_pgsql_backupdir}
rc=0
-case "$daily_pgsql_backup_enable" in
- [Yy][Ee][Ss])
-
+pgsql_backup() {
# daily_pgsql_backupdir must be writeable by user pgsql
# ~pgsql is just that under normal circumstances,
# but this might not be where you want the backups...
if [ ! -d ${backupdir} ] ; then
echo Creating ${backupdir}
- mkdir ${backupdir}; chmod 700 ${backupdir}; chown pgsql ${backupdir}
+ mkdir -m 700 ${backupdir}; chown pgsql ${backupdir}
fi
echo
- echo "PostgreSQL maintenance"
+ echo "PostgreSQL backups"
# Protect the data
umask 077
- dbnames=`su -l pgsql -c "umask 077; psql -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
rc=$?
now=`date "+%Y-%m-%dT%H:%M:%S"`
file=${daily_pgsql_backupdir}/pgglobals_${now}
su -l pgsql -c "umask 077; pg_dumpall -g | gzip -9 > ${file}.gz"
- for db in ${dbnames}; do
+
+ db=$1
+ while shift; do
echo -n " $db"
file=${backupdir}/pgdump_${db}_${now}
su -l pgsql -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}"
[ $? -gt 0 ] && rc=3
+ db=$1
done
if [ $rc -gt 0 ]; then
@@ -76,6 +74,23 @@ case "$daily_pgsql_backup_enable" in
# cleaning up old data
find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' \) \
-a -mtime +${daily_pgsql_savedays} -delete
+ echo
+}
+
+case "$daily_pgsql_backup_enable" in
+ [Yy][Ee][Ss])
+ dbnames=`su -l pgsql -c "umask 077; psql -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
+ pgsql_backup $dbnames
+ ;;
+
+ [Nn][Oo])
+ ;;
+
+ "")
+ ;;
+
+ *)
+ pgsql_backup $daily_pgsql_backup_enable
;;
esac
@@ -83,7 +98,7 @@ case "$daily_pgsql_vacuum_enable" in
[Yy][Ee][Ss])
echo
- echo "vacuuming..."
+ echo "PostgreSQL vacuum"
su -l pgsql -c "vacuumdb -a -q ${daily_pgsql_vacuum_args}"
if [ $? -gt 0 ]
then
diff --git a/databases/postgresql81-server/pkg-plist-server b/databases/postgresql81-server/pkg-plist-server
index 397609794c28..b6ed47fdf568 100644
--- a/databases/postgresql81-server/pkg-plist-server
+++ b/databases/postgresql81-server/pkg-plist-server
@@ -208,6 +208,7 @@ share/postgresql/timezone/America/Asuncion
share/postgresql/timezone/America/Atikokan
share/postgresql/timezone/America/Atka
share/postgresql/timezone/America/Bahia
+share/postgresql/timezone/America/Bahia_Banderas
share/postgresql/timezone/America/Barbados
share/postgresql/timezone/America/Belem
share/postgresql/timezone/America/Belize
@@ -280,6 +281,7 @@ share/postgresql/timezone/America/Managua
share/postgresql/timezone/America/Manaus
share/postgresql/timezone/America/Marigot
share/postgresql/timezone/America/Martinique
+share/postgresql/timezone/America/Matamoros
share/postgresql/timezone/America/Mazatlan
share/postgresql/timezone/America/Mendoza
share/postgresql/timezone/America/Menominee
@@ -298,6 +300,7 @@ share/postgresql/timezone/America/Nome
share/postgresql/timezone/America/Noronha
share/postgresql/timezone/America/North_Dakota/Center
share/postgresql/timezone/America/North_Dakota/New_Salem
+share/postgresql/timezone/America/Ojinaga
share/postgresql/timezone/America/Panama
share/postgresql/timezone/America/Pangnirtung
share/postgresql/timezone/America/Paramaribo
@@ -310,10 +313,11 @@ share/postgresql/timezone/America/Puerto_Rico
share/postgresql/timezone/America/Rainy_River
share/postgresql/timezone/America/Rankin_Inlet
share/postgresql/timezone/America/Recife
-share/postgresql/timezone/America/Resolute
share/postgresql/timezone/America/Regina
+share/postgresql/timezone/America/Resolute
share/postgresql/timezone/America/Rio_Branco
share/postgresql/timezone/America/Rosario
+share/postgresql/timezone/America/Santa_Isabel
share/postgresql/timezone/America/Santarem
share/postgresql/timezone/America/Santiago
share/postgresql/timezone/America/Santo_Domingo
@@ -342,6 +346,7 @@ share/postgresql/timezone/America/Yellowknife
share/postgresql/timezone/Antarctica/Casey
share/postgresql/timezone/Antarctica/Davis
share/postgresql/timezone/Antarctica/DumontDUrville
+share/postgresql/timezone/Antarctica/Macquarie
share/postgresql/timezone/Antarctica/Mawson
share/postgresql/timezone/Antarctica/McMurdo
share/postgresql/timezone/Antarctica/Palmer
@@ -404,6 +409,7 @@ share/postgresql/timezone/Asia/Makassar
share/postgresql/timezone/Asia/Manila
share/postgresql/timezone/Asia/Muscat
share/postgresql/timezone/Asia/Nicosia
+share/postgresql/timezone/Asia/Novokuznetsk
share/postgresql/timezone/Asia/Novosibirsk
share/postgresql/timezone/Asia/Omsk
share/postgresql/timezone/Asia/Oral
diff --git a/databases/postgresql82-contrib/Makefile b/databases/postgresql82-contrib/Makefile
new file mode 100644
index 000000000000..7c250ffd46e7
--- /dev/null
+++ b/databases/postgresql82-contrib/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for: postgresql-contrib
+# Date created: June 10, 2003
+# Whom: Palle Girgensohn <girgen@pingpong.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= postgresql
+PKGNAMESUFFIX= -contrib
+CATEGORIES= databases
+
+MAINTAINER= girgen@FreeBSD.org
+COMMENT= The contrib utilities from the PostgreSQL distribution
+
+USE_PGSQL= yes
+DEFAULT_PGSQL_VER=82
+MASTERDIR= ${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server
+
+USE_BISON= build
+
+BUILD_DIRS= src/port contrib
+INSTALL_DIRS= contrib
+
+SLAVE_ONLY= yes
+
+post-install:
+ @- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${DOCSDIR}/contrib/README
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql82-contrib/pkg-descr b/databases/postgresql82-contrib/pkg-descr
new file mode 100644
index 000000000000..f7a01fd35e15
--- /dev/null
+++ b/databases/postgresql82-contrib/pkg-descr
@@ -0,0 +1,23 @@
+This is the port for all stuff that comes in the contrib subtree of
+the postgresql distribution. This subtree contains porting tools,
+analysis utilities, and plug-in features that are not part of the core
+PostgreSQL system, mainly because they address a limited audience or
+are too experimental to be part of the main source tree. This does
+not preclude their usefulness.
+
+Each subdirectory contains a README file with information about the
+module. Some directories supply new user-defined functions, operators,
+or types. After you have installed the files you need to register the
+new entities in the database system by running the commands in the
+supplied .sql file. For example,
+
+ $ psql -d dbname -f module.sql
+
+The .sql files are installed into /usr/local/share/postgresql/contrib
+
+For more information, please see
+/usr/local/share/doc/postgresql/contrib/README*
+
+This software is part of the standard PostgreSQL distribution.
+
+WWW: http://www.postgresql.org/
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 73ef4e392882..ee1a4e03087d 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME?= postgresql
-PORTVERSION?= 8.2.15
-PORTREVISION?= 1
+PORTVERSION?= 8.2.17
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -41,6 +40,7 @@ CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
--with-includes=${LOCALBASE}/include \
--enable-thread-safety \
--with-docdir=${DOCSDIR}
+LDFLAGS+= -L${PREFIX}/lib
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/databases/postgresql82-server/distinfo b/databases/postgresql82-server/distinfo
index 417a1b7b94c5..f7eb9464c379 100644
--- a/databases/postgresql82-server/distinfo
+++ b/databases/postgresql82-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (postgresql/postgresql-8.2.15.tar.bz2) = e6f2274613ad42fe82f4267183ff174a
-SHA256 (postgresql/postgresql-8.2.15.tar.bz2) = 6932dd3970bd6948f3d0fe7e22ef36021b6a5cf219952b7392ca38947ad09e65
-SIZE (postgresql/postgresql-8.2.15.tar.bz2) = 12653038
+MD5 (postgresql/postgresql-8.2.17.tar.bz2) = 583c21c036357480a85dd3710e40a261
+SHA256 (postgresql/postgresql-8.2.17.tar.bz2) = 3eaebfd2ba8256a168a32b0950b5129f999ae06115e482b1f5a2bdf66aa91985
+SIZE (postgresql/postgresql-8.2.17.tar.bz2) = 12714721
diff --git a/databases/postgresql82-server/files/502.pgsql b/databases/postgresql82-server/files/502.pgsql
index acc1afe431cf..281189a59c46 100644
--- a/databases/postgresql82-server/files/502.pgsql
+++ b/databases/postgresql82-server/files/502.pgsql
@@ -15,12 +15,10 @@
# Define these variables in either /etc/periodic.conf or
# /etc/periodic.conf.local to override the default values.
#
-# daily_pgsql_backup_enable="YES" # do backup
+# daily_pgsql_backup_enable="YES" # do backup of all databases
+# daily_pgsql_backup_enable="foo bar db1 db2" # only do backup of a limited selection of databases
# daily_pgsql_vacuum_enable="YES" # do vacuum
-daily_pgsql_vacuum_enable="YES"
-daily_pgsql_backup_enable="NO"
-
daily_pgsql_vacuum_args="-z"
daily_pgsql_pgdump_args="-b -F c"
# backupdir is relative to ~pgsql home directory unless it begins with a slash:
@@ -40,32 +38,32 @@ eval backupdir=${daily_pgsql_backupdir}
rc=0
-case "$daily_pgsql_backup_enable" in
- [Yy][Ee][Ss])
-
+pgsql_backup() {
# daily_pgsql_backupdir must be writeable by user pgsql
# ~pgsql is just that under normal circumstances,
# but this might not be where you want the backups...
if [ ! -d ${backupdir} ] ; then
echo Creating ${backupdir}
- mkdir ${backupdir}; chmod 700 ${backupdir}; chown pgsql ${backupdir}
+ mkdir -m 700 ${backupdir}; chown pgsql ${backupdir}
fi
echo
- echo "PostgreSQL maintenance"
+ echo "PostgreSQL backups"
# Protect the data
umask 077
- dbnames=`su -l pgsql -c "umask 077; psql -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
rc=$?
now=`date "+%Y-%m-%dT%H:%M:%S"`
file=${daily_pgsql_backupdir}/pgglobals_${now}
su -l pgsql -c "umask 077; pg_dumpall -g | gzip -9 > ${file}.gz"
- for db in ${dbnames}; do
+
+ db=$1
+ while shift; do
echo -n " $db"
file=${backupdir}/pgdump_${db}_${now}
su -l pgsql -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}"
[ $? -gt 0 ] && rc=3
+ db=$1
done
if [ $rc -gt 0 ]; then
@@ -76,6 +74,23 @@ case "$daily_pgsql_backup_enable" in
# cleaning up old data
find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' \) \
-a -mtime +${daily_pgsql_savedays} -delete
+ echo
+}
+
+case "$daily_pgsql_backup_enable" in
+ [Yy][Ee][Ss])
+ dbnames=`su -l pgsql -c "umask 077; psql -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
+ pgsql_backup $dbnames
+ ;;
+
+ [Nn][Oo])
+ ;;
+
+ "")
+ ;;
+
+ *)
+ pgsql_backup $daily_pgsql_backup_enable
;;
esac
@@ -83,7 +98,7 @@ case "$daily_pgsql_vacuum_enable" in
[Yy][Ee][Ss])
echo
- echo "vacuuming..."
+ echo "PostgreSQL vacuum"
su -l pgsql -c "vacuumdb -a -q ${daily_pgsql_vacuum_args}"
if [ $? -gt 0 ]
then
diff --git a/databases/postgresql82-server/pkg-plist-server b/databases/postgresql82-server/pkg-plist-server
index 5652e146f0e8..363e731bcb88 100644
--- a/databases/postgresql82-server/pkg-plist-server
+++ b/databases/postgresql82-server/pkg-plist-server
@@ -205,6 +205,7 @@ share/postgresql/timezone/America/Asuncion
share/postgresql/timezone/America/Atikokan
share/postgresql/timezone/America/Atka
share/postgresql/timezone/America/Bahia
+share/postgresql/timezone/America/Bahia_Banderas
share/postgresql/timezone/America/Barbados
share/postgresql/timezone/America/Belem
share/postgresql/timezone/America/Belize
@@ -277,6 +278,7 @@ share/postgresql/timezone/America/Managua
share/postgresql/timezone/America/Manaus
share/postgresql/timezone/America/Marigot
share/postgresql/timezone/America/Martinique
+share/postgresql/timezone/America/Matamoros
share/postgresql/timezone/America/Mazatlan
share/postgresql/timezone/America/Mendoza
share/postgresql/timezone/America/Menominee
@@ -295,6 +297,7 @@ share/postgresql/timezone/America/Nome
share/postgresql/timezone/America/Noronha
share/postgresql/timezone/America/North_Dakota/Center
share/postgresql/timezone/America/North_Dakota/New_Salem
+share/postgresql/timezone/America/Ojinaga
share/postgresql/timezone/America/Panama
share/postgresql/timezone/America/Pangnirtung
share/postgresql/timezone/America/Paramaribo
@@ -311,6 +314,7 @@ share/postgresql/timezone/America/Regina
share/postgresql/timezone/America/Resolute
share/postgresql/timezone/America/Rio_Branco
share/postgresql/timezone/America/Rosario
+share/postgresql/timezone/America/Santa_Isabel
share/postgresql/timezone/America/Santarem
share/postgresql/timezone/America/Santiago
share/postgresql/timezone/America/Santo_Domingo
@@ -339,6 +343,7 @@ share/postgresql/timezone/America/Yellowknife
share/postgresql/timezone/Antarctica/Casey
share/postgresql/timezone/Antarctica/Davis
share/postgresql/timezone/Antarctica/DumontDUrville
+share/postgresql/timezone/Antarctica/Macquarie
share/postgresql/timezone/Antarctica/Mawson
share/postgresql/timezone/Antarctica/McMurdo
share/postgresql/timezone/Antarctica/Palmer
diff --git a/databases/postgresql83-contrib/Makefile b/databases/postgresql83-contrib/Makefile
new file mode 100644
index 000000000000..3c384ed80f7c
--- /dev/null
+++ b/databases/postgresql83-contrib/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for: postgresql-contrib
+# Date created: June 10, 2003
+# Whom: Palle Girgensohn <girgen@pingpong.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= postgresql
+PKGNAMESUFFIX= -contrib
+CATEGORIES= databases
+
+MAINTAINER= girgen@FreeBSD.org
+COMMENT= The contrib utilities from the PostgreSQL distribution
+
+USE_PGSQL= yes
+DEFAULT_PGSQL_VER=83
+MASTERDIR= ${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server
+
+USE_BISON= build
+
+BUILD_DIRS= src/port contrib
+INSTALL_DIRS= contrib
+
+SLAVE_ONLY= yes
+
+post-install:
+ @- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${DOCSDIR}/contrib/README
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql83-contrib/pkg-descr b/databases/postgresql83-contrib/pkg-descr
new file mode 100644
index 000000000000..f7a01fd35e15
--- /dev/null
+++ b/databases/postgresql83-contrib/pkg-descr
@@ -0,0 +1,23 @@
+This is the port for all stuff that comes in the contrib subtree of
+the postgresql distribution. This subtree contains porting tools,
+analysis utilities, and plug-in features that are not part of the core
+PostgreSQL system, mainly because they address a limited audience or
+are too experimental to be part of the main source tree. This does
+not preclude their usefulness.
+
+Each subdirectory contains a README file with information about the
+module. Some directories supply new user-defined functions, operators,
+or types. After you have installed the files you need to register the
+new entities in the database system by running the commands in the
+supplied .sql file. For example,
+
+ $ psql -d dbname -f module.sql
+
+The .sql files are installed into /usr/local/share/postgresql/contrib
+
+For more information, please see
+/usr/local/share/doc/postgresql/contrib/README*
+
+This software is part of the standard PostgreSQL distribution.
+
+WWW: http://www.postgresql.org/
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 2510b350ce1e..505981e8184c 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME?= postgresql
-DISTVERSION?= 8.3.9
-PORTREVISION?= 1
+DISTVERSION?= 8.3.11
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${DISTVERSION}
@@ -43,6 +42,7 @@ CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
--with-includes=${LOCALBASE}/include \
--enable-thread-safety \
--with-docdir=${DOCSDIR}
+LDFLAGS+= -L${PREFIX}/lib
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
@@ -105,7 +105,7 @@ USE_AUTOTOOLS= autoconf:262
CONFIGURE_ARGS+=--with-icu
LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu
PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu
-PATCHFILES+= pg-833-icu-xx-2008-08-28.diff.gz:icu
+PATCHFILES+= pg-8311-icu-xx-2010-05-14.diff.gz:icu
. endif
PATCH_DIST_STRIP=-p1
diff --git a/databases/postgresql83-server/distinfo b/databases/postgresql83-server/distinfo
index 79b1ebcff274..101008efa3ed 100644
--- a/databases/postgresql83-server/distinfo
+++ b/databases/postgresql83-server/distinfo
@@ -1,6 +1,6 @@
-MD5 (postgresql/postgresql-8.3.9.tar.bz2) = e120b001354851b5df26cbee8c2786d5
-SHA256 (postgresql/postgresql-8.3.9.tar.bz2) = 5cb10e40247c3304d542b774ad658c797bfdc287b5fc3f0341650305e1b8e623
-SIZE (postgresql/postgresql-8.3.9.tar.bz2) = 14170569
-MD5 (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = 94fb6634636cd36cb5fde449d76ece65
-SHA256 (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = c7d77dafe78afcf2e92567c7cdfda45dcfe41ea71efb2e326ef4f7eb66ec416b
-SIZE (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = 5302
+MD5 (postgresql/postgresql-8.3.11.tar.bz2) = 9dfbc971bd9ea7e2c2a042deba8213f9
+SHA256 (postgresql/postgresql-8.3.11.tar.bz2) = 81abb1a90069c93acf0b6ece980d674f325454ec7584247222080501946672db
+SIZE (postgresql/postgresql-8.3.11.tar.bz2) = 14217781
+MD5 (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 43fd07e87e9ecff2aa09b134408bdcb5
+SHA256 (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 44146bdb29a5a7d51c70911096ed6d265bdf09f74f0084ee7ad1883bea2f852a
+SIZE (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 5064
diff --git a/databases/postgresql83-server/files/502.pgsql b/databases/postgresql83-server/files/502.pgsql
index d2235e414cd2..281189a59c46 100644
--- a/databases/postgresql83-server/files/502.pgsql
+++ b/databases/postgresql83-server/files/502.pgsql
@@ -15,7 +15,8 @@
# Define these variables in either /etc/periodic.conf or
# /etc/periodic.conf.local to override the default values.
#
-# daily_pgsql_backup_enable="YES" # do backup
+# daily_pgsql_backup_enable="YES" # do backup of all databases
+# daily_pgsql_backup_enable="foo bar db1 db2" # only do backup of a limited selection of databases
# daily_pgsql_vacuum_enable="YES" # do vacuum
daily_pgsql_vacuum_args="-z"
@@ -37,9 +38,7 @@ eval backupdir=${daily_pgsql_backupdir}
rc=0
-case "$daily_pgsql_backup_enable" in
- [Yy][Ee][Ss])
-
+pgsql_backup() {
# daily_pgsql_backupdir must be writeable by user pgsql
# ~pgsql is just that under normal circumstances,
# but this might not be where you want the backups...
@@ -53,16 +52,18 @@ case "$daily_pgsql_backup_enable" in
# Protect the data
umask 077
- dbnames=`su -l pgsql -c "umask 077; psql -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
rc=$?
now=`date "+%Y-%m-%dT%H:%M:%S"`
file=${daily_pgsql_backupdir}/pgglobals_${now}
su -l pgsql -c "umask 077; pg_dumpall -g | gzip -9 > ${file}.gz"
- for db in ${dbnames}; do
+
+ db=$1
+ while shift; do
echo -n " $db"
file=${backupdir}/pgdump_${db}_${now}
su -l pgsql -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}"
[ $? -gt 0 ] && rc=3
+ db=$1
done
if [ $rc -gt 0 ]; then
@@ -73,6 +74,23 @@ case "$daily_pgsql_backup_enable" in
# cleaning up old data
find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' \) \
-a -mtime +${daily_pgsql_savedays} -delete
+ echo
+}
+
+case "$daily_pgsql_backup_enable" in
+ [Yy][Ee][Ss])
+ dbnames=`su -l pgsql -c "umask 077; psql -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
+ pgsql_backup $dbnames
+ ;;
+
+ [Nn][Oo])
+ ;;
+
+ "")
+ ;;
+
+ *)
+ pgsql_backup $daily_pgsql_backup_enable
;;
esac
diff --git a/databases/postgresql83-server/files/pkg-message-client.in b/databases/postgresql83-server/files/pkg-message-client.in
index 722d50cb4244..3183bc136aa6 100644
--- a/databases/postgresql83-server/files/pkg-message-client.in
+++ b/databases/postgresql83-server/files/pkg-message-client.in
@@ -26,7 +26,7 @@ p5-postgresql-plperl, postgresql-pltcl & postgresql-plruby
postgresql-contrib
Lots of contributed utilities, postgresql functions and
- datatypes. There you find autovacuum, pgcrypto and many other cool
+ datatypes. There you find pg_standby, pgcrypto and many other cool
things.
etc...
diff --git a/databases/postgresql83-server/pkg-plist-server b/databases/postgresql83-server/pkg-plist-server
index 20ae7bd07acd..4d2587cc4093 100644
--- a/databases/postgresql83-server/pkg-plist-server
+++ b/databases/postgresql83-server/pkg-plist-server
@@ -216,6 +216,7 @@ share/postgresql/snowball_create.sql
%%TZDATA%%share/postgresql/timezone/America/Atikokan
%%TZDATA%%share/postgresql/timezone/America/Atka
%%TZDATA%%share/postgresql/timezone/America/Bahia
+%%TZDATA%%share/postgresql/timezone/America/Bahia_Banderas
%%TZDATA%%share/postgresql/timezone/America/Barbados
%%TZDATA%%share/postgresql/timezone/America/Belem
%%TZDATA%%share/postgresql/timezone/America/Belize
@@ -288,6 +289,7 @@ share/postgresql/snowball_create.sql
%%TZDATA%%share/postgresql/timezone/America/Manaus
%%TZDATA%%share/postgresql/timezone/America/Marigot
%%TZDATA%%share/postgresql/timezone/America/Martinique
+%%TZDATA%%share/postgresql/timezone/America/Matamoros
%%TZDATA%%share/postgresql/timezone/America/Mazatlan
%%TZDATA%%share/postgresql/timezone/America/Mendoza
%%TZDATA%%share/postgresql/timezone/America/Menominee
@@ -306,6 +308,7 @@ share/postgresql/snowball_create.sql
%%TZDATA%%share/postgresql/timezone/America/Noronha
%%TZDATA%%share/postgresql/timezone/America/North_Dakota/Center
%%TZDATA%%share/postgresql/timezone/America/North_Dakota/New_Salem
+%%TZDATA%%share/postgresql/timezone/America/Ojinaga
%%TZDATA%%share/postgresql/timezone/America/Panama
%%TZDATA%%share/postgresql/timezone/America/Pangnirtung
%%TZDATA%%share/postgresql/timezone/America/Paramaribo
@@ -322,6 +325,7 @@ share/postgresql/snowball_create.sql
%%TZDATA%%share/postgresql/timezone/America/Resolute
%%TZDATA%%share/postgresql/timezone/America/Rio_Branco
%%TZDATA%%share/postgresql/timezone/America/Rosario
+%%TZDATA%%share/postgresql/timezone/America/Santa_Isabel
%%TZDATA%%share/postgresql/timezone/America/Santarem
%%TZDATA%%share/postgresql/timezone/America/Santiago
%%TZDATA%%share/postgresql/timezone/America/Santo_Domingo
@@ -350,6 +354,7 @@ share/postgresql/snowball_create.sql
%%TZDATA%%share/postgresql/timezone/Antarctica/Casey
%%TZDATA%%share/postgresql/timezone/Antarctica/Davis
%%TZDATA%%share/postgresql/timezone/Antarctica/DumontDUrville
+%%TZDATA%%share/postgresql/timezone/Antarctica/Macquarie
%%TZDATA%%share/postgresql/timezone/Antarctica/Mawson
%%TZDATA%%share/postgresql/timezone/Antarctica/McMurdo
%%TZDATA%%share/postgresql/timezone/Antarctica/Palmer
@@ -412,8 +417,8 @@ share/postgresql/snowball_create.sql
%%TZDATA%%share/postgresql/timezone/Asia/Manila
%%TZDATA%%share/postgresql/timezone/Asia/Muscat
%%TZDATA%%share/postgresql/timezone/Asia/Nicosia
-%%TZDATA%%share/postgresql/timezone/Asia/Novosibirsk
%%TZDATA%%share/postgresql/timezone/Asia/Novokuznetsk
+%%TZDATA%%share/postgresql/timezone/Asia/Novosibirsk
%%TZDATA%%share/postgresql/timezone/Asia/Omsk
%%TZDATA%%share/postgresql/timezone/Asia/Oral
%%TZDATA%%share/postgresql/timezone/Asia/Phnom_Penh
diff --git a/databases/postgresql84-contrib/Makefile b/databases/postgresql84-contrib/Makefile
new file mode 100644
index 000000000000..07ae448bb66e
--- /dev/null
+++ b/databases/postgresql84-contrib/Makefile
@@ -0,0 +1,31 @@
+# New ports collection makefile for: postgresql-contrib
+# Date created: June 10, 2003
+# Whom: Palle Girgensohn <girgen@pingpong.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= postgresql
+PKGNAMESUFFIX= -contrib
+CATEGORIES= databases
+
+MAINTAINER= girgen@FreeBSD.org
+COMMENT= The contrib utilities from the PostgreSQL distribution
+
+USE_PGSQL= yes
+DEFAULT_PGSQL_VER=84
+MASTERDIR= ${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server
+
+USE_BISON= build
+
+BUILD_DIRS= src/port contrib
+INSTALL_DIRS= contrib
+
+SLAVE_ONLY= yes
+CONFIGURE_ARGS+=--with-libxslt --with-libxml
+LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt xml2.5:${PORTSDIR}/textproc/libxml2
+
+post-install:
+ @- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${DOCSDIR}/contrib/README
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql84-contrib/pkg-descr b/databases/postgresql84-contrib/pkg-descr
new file mode 100644
index 000000000000..f7a01fd35e15
--- /dev/null
+++ b/databases/postgresql84-contrib/pkg-descr
@@ -0,0 +1,23 @@
+This is the port for all stuff that comes in the contrib subtree of
+the postgresql distribution. This subtree contains porting tools,
+analysis utilities, and plug-in features that are not part of the core
+PostgreSQL system, mainly because they address a limited audience or
+are too experimental to be part of the main source tree. This does
+not preclude their usefulness.
+
+Each subdirectory contains a README file with information about the
+module. Some directories supply new user-defined functions, operators,
+or types. After you have installed the files you need to register the
+new entities in the database system by running the commands in the
+supplied .sql file. For example,
+
+ $ psql -d dbname -f module.sql
+
+The .sql files are installed into /usr/local/share/postgresql/contrib
+
+For more information, please see
+/usr/local/share/doc/postgresql/contrib/README*
+
+This software is part of the standard PostgreSQL distribution.
+
+WWW: http://www.postgresql.org/
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index dd57c0036363..c8f6d35598cb 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME?= postgresql
-DISTVERSION?= 8.4.3
-PORTREVISION?= 1
+DISTVERSION?= 8.4.4
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${DISTVERSION}
@@ -42,6 +41,7 @@ PGGROUP= pgsql
CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
--with-includes=${LOCALBASE}/include \
--enable-thread-safety
+LDFLAGS+= -L${PREFIX}/lib
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo
index 81d413a0628a..9b77cff98c9a 100644
--- a/databases/postgresql84-server/distinfo
+++ b/databases/postgresql84-server/distinfo
@@ -1,6 +1,6 @@
-MD5 (postgresql/postgresql-8.4.3.tar.bz2) = 7f70e7b140fb190f268837255582b07e
-SHA256 (postgresql/postgresql-8.4.3.tar.bz2) = 050c3e8324b453715e819456638fc1561351b33c8011b7cb63db98bbc2061564
-SIZE (postgresql/postgresql-8.4.3.tar.bz2) = 13645257
-SHA256 (postgresql/pg-840-icu-2009-09-15.diff.gz) = c09d3b59340a3bb6ea754e985739d4fbb47f730d1e48a357c5585825034fc72e
+MD5 (postgresql/postgresql-8.4.4.tar.bz2) = 4bf2448ad965bca3940df648c02194df
+SHA256 (postgresql/postgresql-8.4.4.tar.bz2) = e66b398d565f7fb16d8ae58ae72881dcd3dbb1b88f532bbe1c2d1284812be37e
+SIZE (postgresql/postgresql-8.4.4.tar.bz2) = 13853838
MD5 (postgresql/pg-840-icu-2009-09-15.diff.gz) = 2b81134b462e01623bc9387fe4de7136
+SHA256 (postgresql/pg-840-icu-2009-09-15.diff.gz) = c09d3b59340a3bb6ea754e985739d4fbb47f730d1e48a357c5585825034fc72e
SIZE (postgresql/pg-840-icu-2009-09-15.diff.gz) = 4321
diff --git a/databases/postgresql84-server/files/502.pgsql b/databases/postgresql84-server/files/502.pgsql
index d2235e414cd2..281189a59c46 100644
--- a/databases/postgresql84-server/files/502.pgsql
+++ b/databases/postgresql84-server/files/502.pgsql
@@ -15,7 +15,8 @@
# Define these variables in either /etc/periodic.conf or
# /etc/periodic.conf.local to override the default values.
#
-# daily_pgsql_backup_enable="YES" # do backup
+# daily_pgsql_backup_enable="YES" # do backup of all databases
+# daily_pgsql_backup_enable="foo bar db1 db2" # only do backup of a limited selection of databases
# daily_pgsql_vacuum_enable="YES" # do vacuum
daily_pgsql_vacuum_args="-z"
@@ -37,9 +38,7 @@ eval backupdir=${daily_pgsql_backupdir}
rc=0
-case "$daily_pgsql_backup_enable" in
- [Yy][Ee][Ss])
-
+pgsql_backup() {
# daily_pgsql_backupdir must be writeable by user pgsql
# ~pgsql is just that under normal circumstances,
# but this might not be where you want the backups...
@@ -53,16 +52,18 @@ case "$daily_pgsql_backup_enable" in
# Protect the data
umask 077
- dbnames=`su -l pgsql -c "umask 077; psql -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
rc=$?
now=`date "+%Y-%m-%dT%H:%M:%S"`
file=${daily_pgsql_backupdir}/pgglobals_${now}
su -l pgsql -c "umask 077; pg_dumpall -g | gzip -9 > ${file}.gz"
- for db in ${dbnames}; do
+
+ db=$1
+ while shift; do
echo -n " $db"
file=${backupdir}/pgdump_${db}_${now}
su -l pgsql -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}"
[ $? -gt 0 ] && rc=3
+ db=$1
done
if [ $rc -gt 0 ]; then
@@ -73,6 +74,23 @@ case "$daily_pgsql_backup_enable" in
# cleaning up old data
find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' \) \
-a -mtime +${daily_pgsql_savedays} -delete
+ echo
+}
+
+case "$daily_pgsql_backup_enable" in
+ [Yy][Ee][Ss])
+ dbnames=`su -l pgsql -c "umask 077; psql -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
+ pgsql_backup $dbnames
+ ;;
+
+ [Nn][Oo])
+ ;;
+
+ "")
+ ;;
+
+ *)
+ pgsql_backup $daily_pgsql_backup_enable
;;
esac
diff --git a/databases/postgresql84-server/pkg-plist-server b/databases/postgresql84-server/pkg-plist-server
index 7a5170bad6fd..cded41078237 100644
--- a/databases/postgresql84-server/pkg-plist-server
+++ b/databases/postgresql84-server/pkg-plist-server
@@ -180,6 +180,7 @@ share/postgresql/snowball_create.sql
%%TZDATA%%share/postgresql/timezone/America/Atikokan
%%TZDATA%%share/postgresql/timezone/America/Atka
%%TZDATA%%share/postgresql/timezone/America/Bahia
+%%TZDATA%%share/postgresql/timezone/America/Bahia_Banderas
%%TZDATA%%share/postgresql/timezone/America/Barbados
%%TZDATA%%share/postgresql/timezone/America/Belem
%%TZDATA%%share/postgresql/timezone/America/Belize
@@ -317,6 +318,7 @@ share/postgresql/snowball_create.sql
%%TZDATA%%share/postgresql/timezone/Antarctica/Casey
%%TZDATA%%share/postgresql/timezone/Antarctica/Davis
%%TZDATA%%share/postgresql/timezone/Antarctica/DumontDUrville
+%%TZDATA%%share/postgresql/timezone/Antarctica/Macquarie
%%TZDATA%%share/postgresql/timezone/Antarctica/Mawson
%%TZDATA%%share/postgresql/timezone/Antarctica/McMurdo
%%TZDATA%%share/postgresql/timezone/Antarctica/Palmer