aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPalle Girgensohn <girgen@FreeBSD.org>2007-01-09 16:29:35 +0000
committerPalle Girgensohn <girgen@FreeBSD.org>2007-01-09 16:29:35 +0000
commit6b11e898761ec7ced9bf9b652a24b78697eac863 (patch)
treeb375d70b112b334c43c9daa281851082f36a60da
parentb17127f51b50b9d89242d52a5b23d5c580fe5f75 (diff)
downloadports-6b11e898761ec7ced9bf9b652a24b78697eac863.tar.gz
ports-6b11e898761ec7ced9bf9b652a24b78697eac863.zip
Notes
-rw-r--r--UPDATING13
-rw-r--r--databases/postgresql73-client/Makefile4
-rw-r--r--databases/postgresql73-server/Makefile9
-rw-r--r--databases/postgresql73-server/distinfo24
-rw-r--r--databases/postgresql73-server/files/patch-src-bin-initdb-Makefile11
-rw-r--r--databases/postgresql73-server/files/pkg-message-server.in26
-rw-r--r--databases/postgresql73-server/files/postgresql.in9
-rw-r--r--databases/postgresql73-server/pkg-plist-client21
-rw-r--r--databases/postgresql73-server/pkg-plist-server23
-rw-r--r--databases/postgresql74-client/Makefile4
-rw-r--r--databases/postgresql74-server/Makefile10
-rw-r--r--databases/postgresql74-server/distinfo24
-rw-r--r--databases/postgresql74-server/files/patch-src-bin-initdb-Makefile11
-rw-r--r--databases/postgresql74-server/files/pkg-message-server.in26
-rw-r--r--databases/postgresql74-server/files/postgresql.in9
-rw-r--r--databases/postgresql74-server/pkg-plist-client34
-rw-r--r--databases/postgresql74-server/pkg-plist-server35
-rw-r--r--databases/postgresql80-client/Makefile4
-rw-r--r--databases/postgresql80-server/Makefile5
-rw-r--r--databases/postgresql80-server/distinfo24
-rw-r--r--databases/postgresql80-server/files/pkg-message-server.in18
-rw-r--r--databases/postgresql80-server/files/postgresql.in9
-rw-r--r--databases/postgresql80-server/pkg-plist-client71
-rw-r--r--databases/postgresql80-server/pkg-plist-server114
-rw-r--r--databases/postgresql81-client/Makefile4
-rw-r--r--databases/postgresql81-server/Makefile6
-rw-r--r--databases/postgresql81-server/distinfo24
-rw-r--r--databases/postgresql81-server/files/pkg-message-server.in16
-rw-r--r--databases/postgresql81-server/files/postgresql.in7
-rw-r--r--databases/postgresql81-server/pkg-plist-client71
-rw-r--r--databases/postgresql81-server/pkg-plist-server990
-rw-r--r--databases/postgresql82-client/Makefile4
-rw-r--r--databases/postgresql82-server/Makefile5
-rw-r--r--databases/postgresql82-server/distinfo27
-rw-r--r--databases/postgresql82-server/files/postgresql.in6
-rw-r--r--databases/postgresql82-server/pkg-plist-client71
-rw-r--r--databases/postgresql82-server/pkg-plist-server71
-rw-r--r--databases/postgresql83-server/Makefile5
-rw-r--r--databases/postgresql83-server/distinfo27
-rw-r--r--databases/postgresql83-server/files/postgresql.in6
-rw-r--r--databases/postgresql83-server/pkg-plist-client71
-rw-r--r--databases/postgresql83-server/pkg-plist-server71
-rw-r--r--databases/postgresql84-server/Makefile5
-rw-r--r--databases/postgresql84-server/distinfo27
-rw-r--r--databases/postgresql84-server/files/postgresql.in6
-rw-r--r--databases/postgresql84-server/pkg-plist-client71
-rw-r--r--databases/postgresql84-server/pkg-plist-server71
-rw-r--r--databases/postgresql90-server/Makefile5
-rw-r--r--databases/postgresql90-server/distinfo27
-rw-r--r--databases/postgresql90-server/files/postgresql.in6
-rw-r--r--databases/postgresql90-server/pkg-plist-client71
-rw-r--r--databases/postgresql90-server/pkg-plist-server71
-rw-r--r--databases/postgresql91-server/Makefile5
-rw-r--r--databases/postgresql91-server/distinfo27
-rw-r--r--databases/postgresql91-server/files/postgresql.in6
-rw-r--r--databases/postgresql91-server/pkg-plist-client71
-rw-r--r--databases/postgresql91-server/pkg-plist-server71
-rw-r--r--databases/postgresql92-server/Makefile5
-rw-r--r--databases/postgresql92-server/distinfo27
-rw-r--r--databases/postgresql92-server/files/postgresql.in6
-rw-r--r--databases/postgresql92-server/pkg-plist-client71
-rw-r--r--databases/postgresql92-server/pkg-plist-server71
62 files changed, 1410 insertions, 1330 deletions
diff --git a/UPDATING b/UPDATING
index 849229536b3e..9144bad6ce01 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,19 @@ You should get into the habit of checking this file for changes each
time you update your ports collection, before attempting any port
upgrades.
+20070109:
+ AFFECTS: users of databases/postgresql*
+ AUTHOR: girgen@FreeBSD.org
+
+ The server-side utilities of postgresql (initdb, initlocation,
+ ipcclean, pg_controldata, pg_ctl, pg_id and pg_resetxlog) are now
+ installed by the respective postgresql*-server port (previously
+ they where installed with the client). If you update the client, you
+ should also update the server to make sure you are not left without
+ the server-side tools. Do something like:
+
+ portupgrade postgresql-client postgresql-server
+
20070105:
AFFECTS: users of mail/spamprobe
AUTHOR: stefan@FreeBSD.org
diff --git a/databases/postgresql73-client/Makefile b/databases/postgresql73-client/Makefile
index e7e56bb537cd..39b8faee3433 100644
--- a/databases/postgresql73-client/Makefile
+++ b/databases/postgresql73-client/Makefile
@@ -15,7 +15,9 @@ COMMENT= PostgreSQL database (client)
MASTERDIR= ${.CURDIR}/../postgresql73-server
-BUILD_DIRS= src/bin src/include src/interfaces doc
+BUILD_DIRS= src/bin/pg_config src/bin/pg_encoding src/bin/psql \
+ src/bin/pg_dump src/bin/scripts src/include \
+ src/interfaces doc
CLIENT_ONLY= yes
INSTALLS_SHLIB= yes
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 69698681c062..ee0b495efa94 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME?= postgresql
-PORTVERSION?= 7.3.16
+PORTVERSION?= 7.3.17
PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
@@ -44,7 +44,12 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
-BUILD_DIRS?= src/backend src/backend/utils/mb/conversion_procs src/pl
+BUILD_DIRS?= src/backend src/backend/utils/mb/conversion_procs \
+ src/bin/initdb src/bin/initlocation src/bin/ipcclean \
+ src/bin/pg_controldata src/bin/pg_ctl src/bin/pg_id \
+ src/bin/pg_resetxlog src/bin/postgres src/bin/postmaster \
+ src/pl
+
INSTALL_DIRS?= ${BUILD_DIRS}
.if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
diff --git a/databases/postgresql73-server/distinfo b/databases/postgresql73-server/distinfo
index cd2c22fb5a68..750eb305698f 100644
--- a/databases/postgresql73-server/distinfo
+++ b/databases/postgresql73-server/distinfo
@@ -1,12 +1,12 @@
-MD5 (postgresql/postgresql-base-7.3.16.tar.bz2) = ae269400f68118233e9e65b4c2c93a68
-SHA256 (postgresql/postgresql-base-7.3.16.tar.bz2) = 96046fc13596e4d9f7a4dcd5882fed51ec5905760cc828594443272a69c140e5
-SIZE (postgresql/postgresql-base-7.3.16.tar.bz2) = 5696231
-MD5 (postgresql/postgresql-opt-7.3.16.tar.bz2) = 8025d8314993b9e57d0f308e01c37b40
-SHA256 (postgresql/postgresql-opt-7.3.16.tar.bz2) = 0e1ab00b1439c5930b6c74ed5c4382c01fdb54434857ac3c1599d32fcce2c8d1
-SIZE (postgresql/postgresql-opt-7.3.16.tar.bz2) = 341908
-MD5 (postgresql/postgresql-test-7.3.16.tar.bz2) = 9da7ff0ef77b87053804838a1f40f15a
-SHA256 (postgresql/postgresql-test-7.3.16.tar.bz2) = 5844984770b326cfc62580d88f878196e304867fa339925fef20c017bb298d56
-SIZE (postgresql/postgresql-test-7.3.16.tar.bz2) = 891104
-MD5 (postgresql/postgresql-docs-7.3.16.tar.bz2) = 12123bfca15f077260a6fbcd952abbf2
-SHA256 (postgresql/postgresql-docs-7.3.16.tar.bz2) = 2d8cc0d745a3f8edd773a06c462f98c143388060feb1775e97ecf85bb5260b2f
-SIZE (postgresql/postgresql-docs-7.3.16.tar.bz2) = 2361886
+MD5 (postgresql/postgresql-base-7.3.17.tar.bz2) = 44df750b477b8e9c329f514f0264f915
+SHA256 (postgresql/postgresql-base-7.3.17.tar.bz2) = 9d844fc9ffda1d6b2d6f324c7198ce5ffa4ea1bd79516ffa85b45bd2e8e616b3
+SIZE (postgresql/postgresql-base-7.3.17.tar.bz2) = 5694969
+MD5 (postgresql/postgresql-opt-7.3.17.tar.bz2) = 9ed5d06f185877c0b609b7dbe96f73bd
+SHA256 (postgresql/postgresql-opt-7.3.17.tar.bz2) = 26837b6a96a0bc2f3c04213571862c85c8cd3a7e2aac2b49a192bb651630361c
+SIZE (postgresql/postgresql-opt-7.3.17.tar.bz2) = 342167
+MD5 (postgresql/postgresql-test-7.3.17.tar.bz2) = 3429377e40d1aa5e374927b874c7beda
+SHA256 (postgresql/postgresql-test-7.3.17.tar.bz2) = a464ff6dad6c6c91b11301f7fba7a6be24fbd5fe15ab94b2decdbd99159be4e1
+SIZE (postgresql/postgresql-test-7.3.17.tar.bz2) = 890738
+MD5 (postgresql/postgresql-docs-7.3.17.tar.bz2) = 4fec83cf93aab65882ca2a020e4284fc
+SHA256 (postgresql/postgresql-docs-7.3.17.tar.bz2) = 69909e13a8c384f24c93681a55cf4cfa824ba654b8e68523106bce08a030366f
+SIZE (postgresql/postgresql-docs-7.3.17.tar.bz2) = 2362063
diff --git a/databases/postgresql73-server/files/patch-src-bin-initdb-Makefile b/databases/postgresql73-server/files/patch-src-bin-initdb-Makefile
new file mode 100644
index 000000000000..406613b8114e
--- /dev/null
+++ b/databases/postgresql73-server/files/patch-src-bin-initdb-Makefile
@@ -0,0 +1,11 @@
+--- src/bin/initdb/Makefile.orig Tue Jan 9 11:31:36 2007
++++ src/bin/initdb/Makefile Tue Jan 9 11:32:07 2007
+@@ -13,7 +13,7 @@
+ top_builddir = ../../..
+ include $(top_builddir)/src/Makefile.global
+
+-all: initdb
++all: submake-libpq submake-libpgport initdb
+
+ initdb: initdb.sh $(top_builddir)/src/Makefile.global
+ sed -e 's/@VERSION@/$(VERSION)/g' \
diff --git a/databases/postgresql73-server/files/pkg-message-server.in b/databases/postgresql73-server/files/pkg-message-server.in
index 6e0beb0d5698..d168c2dd022d 100644
--- a/databases/postgresql73-server/files/pkg-message-server.in
+++ b/databases/postgresql73-server/files/pkg-message-server.in
@@ -1,8 +1,6 @@
For procedural languages and postgresql functions, please note that
-you might have to update them when updating the server. For example,
-the "elog" method disappeared in postgresql-7.4, so postgresql-contrib
-must be updated along with the server.
+you might have to update them when updating the server.
If you have many tables and many clients running, consider raising
kern.maxfiles using sysctl(8), or reconfigure your kernel
@@ -29,13 +27,19 @@ If you plan to access your PostgreSQL server using ODBC, please
consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql
to get the functions required for ODBC compliance.
-If you need to store any characters besides strict ASCII in your
-database, you will want to set a character set, and possibly a
-collation locale, before initializing the database. Add something
-similar to this to /etc/login.conf:
+Please note that if you use the rc script,
+%%PREFIX%%/etc/rc.conf/postgresql, to initialize the database, unicode
+(UTF-8) will be used to store character data by default. Set
+postgresql_initdb_flags or use login.conf settings described below to
+alter this behaviour. See the start rc script for more info.
+
+To set limits, environment stuff like locale and collation and other
+things, you can set up a class in /etc/login.conf before initializing
+the database. Add something similar to this to /etc/login.conf:
---
postgres:\
- :setenv=LC_ALL=en_US.UTF-8,LC_COLLATE=C:\
+ :lang=en_US.UTF-8:\
+ :setenv=LC_COLLATE=C:\
:tc=default:
---
and run `cap_mkdb /etc/login.conf'.
@@ -45,15 +49,15 @@ Then add 'postgresql_class="postgres"' to /etc/rc.conf.
To initialize the database, run
- %%PREFIX%%/etc/rc.d/010.pgsql.sh initdb
+ %%PREFIX%%/etc/rc.d/postgresql initdb
You can then start PostgreSQL by running:
- %%PREFIX%%/etc/rc.d/010.pgsql.sh start
+ %%PREFIX%%/etc/rc.d/postgresql start
For postmaster settings, see ~pgsql/data/postgresql.conf
-NB. FreeBSD's PostgreSQL port now by default logs to syslog
+NB. FreeBSD's PostgreSQL port logs to syslog by default
See ~pgsql/data/postgresql.conf for more info
======================================================================
diff --git a/databases/postgresql73-server/files/postgresql.in b/databases/postgresql73-server/files/postgresql.in
index d3014f580dc0..1b3b4226acdf 100644
--- a/databases/postgresql73-server/files/postgresql.in
+++ b/databases/postgresql73-server/files/postgresql.in
@@ -12,6 +12,10 @@
# # optional
# postgresql_data="%%PREFIX%%/pgsql/data"
# postgresql_flags="-w -s -m fast"
+# postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
+# postgresql_class="default"
+#
+# See %%PREFIX%%/share/doc/postgresql/README-server for more info
#
# This scripts takes one of the following commands:
#
@@ -20,9 +24,9 @@
# For postmaster startup options, edit ${postgresql_data}/postgresql.conf
prefix=%%PREFIX%%
+command=${prefix}/bin/pg_ctl
. %%RC_SUBR%%
-command=${prefix}/bin/pg_ctl
load_rc_config postgresql
@@ -32,6 +36,7 @@ postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
postgresql_user=pgsql
eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data"}
postgresql_class=${postgresql_class:-"default"}
+postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
name=postgresql
rcvar=`set_rcvar`
@@ -53,7 +58,7 @@ postgresql_command()
postgresql_initdb()
{
- su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb -D ${postgresql_data}"
+ su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
}
run_rc_command "$1"
diff --git a/databases/postgresql73-server/pkg-plist-client b/databases/postgresql73-server/pkg-plist-client
index 282e1cda6451..90e2968da13d 100644
--- a/databases/postgresql73-server/pkg-plist-client
+++ b/databases/postgresql73-server/pkg-plist-client
@@ -6,17 +6,10 @@ bin/dropdb
bin/droplang
bin/dropuser
bin/ecpg
-bin/initdb
-bin/initlocation
-bin/ipcclean
bin/pg_config
-bin/pg_controldata
-bin/pg_ctl
bin/pg_dump
bin/pg_dumpall
bin/pg_encoding
-bin/pg_id
-bin/pg_resetxlog
bin/pg_restore
bin/psql
bin/vacuumdb
@@ -387,36 +380,22 @@ lib/libpq.so.3
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
diff --git a/databases/postgresql73-server/pkg-plist-server b/databases/postgresql73-server/pkg-plist-server
index 504314f05398..5dd14cf54c20 100644
--- a/databases/postgresql73-server/pkg-plist-server
+++ b/databases/postgresql73-server/pkg-plist-server
@@ -1,5 +1,12 @@
-bin/postmaster
+bin/initdb
+bin/initlocation
+bin/ipcclean
+bin/pg_controldata
+bin/pg_ctl
+bin/pg_id
+bin/pg_resetxlog
bin/postgres
+bin/postmaster
etc/periodic/daily/502.pgsql
lib/postgresql/ascii_and_mic.so
lib/postgresql/cyrillic_and_mic.so
@@ -37,13 +44,27 @@ share/postgresql/pg_ident.conf.sample
share/postgresql/postgresql.conf.sample
share/postgresql/conversion_create.sql
%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
diff --git a/databases/postgresql74-client/Makefile b/databases/postgresql74-client/Makefile
index 55ed1558475f..58324b3b05cd 100644
--- a/databases/postgresql74-client/Makefile
+++ b/databases/postgresql74-client/Makefile
@@ -15,7 +15,9 @@ COMMENT= PostgreSQL database (client)
MASTERDIR= ${.CURDIR}/../postgresql74-server
-BUILD_DIRS= src/bin src/include src/interfaces doc
+BUILD_DIRS= src/bin/pg_config src/bin/pg_encoding src/bin/psql \
+ src/bin/pg_dump src/bin/scripts src/include \
+ src/interfaces doc
CLIENT_ONLY= yes
INSTALLS_SHLIB= yes
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 09f99f0a4974..edd7819dc47b 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME?= postgresql
-PORTVERSION?= 7.4.14
+PORTVERSION?= 7.4.15
PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
@@ -44,7 +44,11 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
-BUILD_DIRS?= src/backend src/backend/utils/mb/conversion_procs src/pl
+BUILD_DIRS?= src/backend src/backend/utils/mb/conversion_procs \
+ src/bin/initdb src/bin/initlocation src/bin/ipcclean \
+ src/bin/pg_controldata src/bin/pg_ctl src/bin/pg_resetxlog \
+ src/bin/postgres src/bin/postmaster src/pl
+
INSTALL_DIRS?= ${BUILD_DIRS}
.if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
@@ -158,6 +162,8 @@ EXTRA_PATCHES= ${FILESDIR}/regresspatch-src-test-regress-pgregress-sh
DISTFILES+= postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
. endif
+PATCH_DIST_STRIP=-p1
+
. if defined(SERVER_ONLY) && defined(WITH_LIBC_R)
CFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LIBS}
diff --git a/databases/postgresql74-server/distinfo b/databases/postgresql74-server/distinfo
index 44f032884865..a6976acc2146 100644
--- a/databases/postgresql74-server/distinfo
+++ b/databases/postgresql74-server/distinfo
@@ -1,15 +1,15 @@
-MD5 (postgresql/postgresql-base-7.4.14.tar.bz2) = 8fb231e5cdf7fe4d8954edaa63fd9410
-SHA256 (postgresql/postgresql-base-7.4.14.tar.bz2) = 5a34fcd56d2d8eebcd2728e5971c0d39d2971dc25e49d88bfeb84d69b5e8ebc9
-SIZE (postgresql/postgresql-base-7.4.14.tar.bz2) = 6575201
-MD5 (postgresql/postgresql-opt-7.4.14.tar.bz2) = 5ad27f2d9673dcabaaad7729a6838cc2
-SHA256 (postgresql/postgresql-opt-7.4.14.tar.bz2) = e670d22812c50512807edd692d867e2b62c6b79f9d7b84cad56ef038cc12475d
-SIZE (postgresql/postgresql-opt-7.4.14.tar.bz2) = 333417
-MD5 (postgresql/postgresql-test-7.4.14.tar.bz2) = 3e7fccb8c02e4b4c2822ea5e5d054f07
-SHA256 (postgresql/postgresql-test-7.4.14.tar.bz2) = 39c87c0227f8c757d29141bb8c24e2a95d3a06d9bc459667fdee4d0028d6d12d
-SIZE (postgresql/postgresql-test-7.4.14.tar.bz2) = 902074
-MD5 (postgresql/postgresql-docs-7.4.14.tar.bz2) = 213c668f072aa56c77f85a23d11ad0ab
-SHA256 (postgresql/postgresql-docs-7.4.14.tar.bz2) = 6739dcb6876e1f76933f88feae0b7d0a5e528e9677dac4175e3223ef379ed789
-SIZE (postgresql/postgresql-docs-7.4.14.tar.bz2) = 2427724
+MD5 (postgresql/postgresql-base-7.4.15.tar.bz2) = 971dd112cfbd9a54f48081345c934209
+SHA256 (postgresql/postgresql-base-7.4.15.tar.bz2) = 42674ff290c05ae0baea0b0e177c30d28a609cdc72ce5c142c9f091278deafc2
+SIZE (postgresql/postgresql-base-7.4.15.tar.bz2) = 6584329
+MD5 (postgresql/postgresql-opt-7.4.15.tar.bz2) = a19d989663d2a73a72a1031ace7ce58c
+SHA256 (postgresql/postgresql-opt-7.4.15.tar.bz2) = 1bea2be928bc72f4e2b8e2342f599cd68134784e43c2a2f4606888524d4d25c6
+SIZE (postgresql/postgresql-opt-7.4.15.tar.bz2) = 333512
+MD5 (postgresql/postgresql-test-7.4.15.tar.bz2) = bc03e17284cfea02c8bdc890da6951ae
+SHA256 (postgresql/postgresql-test-7.4.15.tar.bz2) = f71fa85e663cae9766f560be4afc1918ec8d903f343a934f17a8927d99663fd8
+SIZE (postgresql/postgresql-test-7.4.15.tar.bz2) = 902018
+MD5 (postgresql/postgresql-docs-7.4.15.tar.bz2) = db2d7caf152f80568f098b2774f00887
+SHA256 (postgresql/postgresql-docs-7.4.15.tar.bz2) = bf8ac32bf067800f39257241f6319ca1277460b82a2c00e1b08e2b6d245621ce
+SIZE (postgresql/postgresql-docs-7.4.15.tar.bz2) = 2428680
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/patch-src-bin-initdb-Makefile b/databases/postgresql74-server/files/patch-src-bin-initdb-Makefile
new file mode 100644
index 000000000000..406613b8114e
--- /dev/null
+++ b/databases/postgresql74-server/files/patch-src-bin-initdb-Makefile
@@ -0,0 +1,11 @@
+--- src/bin/initdb/Makefile.orig Tue Jan 9 11:31:36 2007
++++ src/bin/initdb/Makefile Tue Jan 9 11:32:07 2007
+@@ -13,7 +13,7 @@
+ top_builddir = ../../..
+ include $(top_builddir)/src/Makefile.global
+
+-all: initdb
++all: submake-libpq submake-libpgport initdb
+
+ initdb: initdb.sh $(top_builddir)/src/Makefile.global
+ sed -e 's/@VERSION@/$(VERSION)/g' \
diff --git a/databases/postgresql74-server/files/pkg-message-server.in b/databases/postgresql74-server/files/pkg-message-server.in
index 5378c0d7adfd..ac9e73b293f9 100644
--- a/databases/postgresql74-server/files/pkg-message-server.in
+++ b/databases/postgresql74-server/files/pkg-message-server.in
@@ -20,9 +20,7 @@ DROP SCHEMA information_schema CASCADE;
=====================================================================
For procedural languages and postgresql functions, please note that
-you might have to update them when updating the server. For example,
-the "elog" method disappeared in postgresql-7.4, so postgresql-contrib
-must be updated along with the server.
+you might have to update them when updating the server.
If you have many tables and many clients running, consider raising
kern.maxfiles using sysctl(8), or reconfigure your kernel
@@ -49,13 +47,19 @@ If you plan to access your PostgreSQL server using ODBC, please
consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql
to get the functions required for ODBC compliance.
-If you need to store any characters besides strict ASCII in your
-database, you will want to set a character set, and possibly a
-collation locale, before initializing the database. Add something
-similar to this to /etc/login.conf:
+Please note that if you use the rc script,
+%%PREFIX%%/etc/rc.conf/postgresql, to initialize the database, unicode
+(UTF-8) will be used to store character data by default. Set
+postgresql_initdb_flags or use login.conf settings described below to
+alter this behaviour. See the start rc script for more info.
+
+To set limits, environment stuff like locale and collation and other
+things, you can set up a class in /etc/login.conf before initializing
+the database. Add something similar to this to /etc/login.conf:
---
postgres:\
- :setenv=LC_ALL=en_US.UTF-8,LC_COLLATE=C:\
+ :lang=en_US.UTF-8:\
+ :setenv=LC_COLLATE=C:\
:tc=default:
---
and run `cap_mkdb /etc/login.conf'.
@@ -65,15 +69,15 @@ Then add 'postgresql_class="postgres"' to /etc/rc.conf.
To initialize the database, run
- %%PREFIX%%/etc/rc.d/010.pgsql.sh initdb
+ %%PREFIX%%/etc/rc.d/postgresql initdb
You can then start PostgreSQL by running:
- %%PREFIX%%/etc/rc.d/010.pgsql.sh start
+ %%PREFIX%%/etc/rc.d/postgresql start
For postmaster settings, see ~pgsql/data/postgresql.conf
-NB. FreeBSD's PostgreSQL port now by default logs to syslog
+NB. FreeBSD's PostgreSQL port logs to syslog by default
See ~pgsql/data/postgresql.conf for more info
======================================================================
diff --git a/databases/postgresql74-server/files/postgresql.in b/databases/postgresql74-server/files/postgresql.in
index d3014f580dc0..1b3b4226acdf 100644
--- a/databases/postgresql74-server/files/postgresql.in
+++ b/databases/postgresql74-server/files/postgresql.in
@@ -12,6 +12,10 @@
# # optional
# postgresql_data="%%PREFIX%%/pgsql/data"
# postgresql_flags="-w -s -m fast"
+# postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
+# postgresql_class="default"
+#
+# See %%PREFIX%%/share/doc/postgresql/README-server for more info
#
# This scripts takes one of the following commands:
#
@@ -20,9 +24,9 @@
# For postmaster startup options, edit ${postgresql_data}/postgresql.conf
prefix=%%PREFIX%%
+command=${prefix}/bin/pg_ctl
. %%RC_SUBR%%
-command=${prefix}/bin/pg_ctl
load_rc_config postgresql
@@ -32,6 +36,7 @@ postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
postgresql_user=pgsql
eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data"}
postgresql_class=${postgresql_class:-"default"}
+postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
name=postgresql
rcvar=`set_rcvar`
@@ -53,7 +58,7 @@ postgresql_command()
postgresql_initdb()
{
- su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb -D ${postgresql_data}"
+ su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
}
run_rc_command "$1"
diff --git a/databases/postgresql74-server/pkg-plist-client b/databases/postgresql74-server/pkg-plist-client
index 041d674b33a8..87f92f7721aa 100644
--- a/databases/postgresql74-server/pkg-plist-client
+++ b/databases/postgresql74-server/pkg-plist-client
@@ -6,17 +6,10 @@ bin/dropdb
bin/droplang
bin/dropuser
bin/ecpg
-bin/initdb
-bin/initlocation
-bin/ipcclean
bin/pg_config
-bin/pg_controldata
-bin/pg_ctl
bin/pg_dump
bin/pg_dumpall
bin/pg_encoding
-bin/pg_id
-bin/pg_resetxlog
bin/pg_restore
bin/psql
bin/vacuumdb
@@ -414,80 +407,53 @@ lib/libpgtypes.so.1
share/postgresql/pg_service.conf.sample
@dirrmtry share/postgresql
%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
diff --git a/databases/postgresql74-server/pkg-plist-server b/databases/postgresql74-server/pkg-plist-server
index 190ae7c376f2..12aa54f10286 100644
--- a/databases/postgresql74-server/pkg-plist-server
+++ b/databases/postgresql74-server/pkg-plist-server
@@ -1,5 +1,11 @@
-bin/postmaster
+bin/initdb
+bin/initlocation
+bin/ipcclean
+bin/pg_controldata
+bin/pg_ctl
+bin/pg_resetxlog
bin/postgres
+bin/postmaster
etc/periodic/daily/502.pgsql
lib/postgresql/ascii_and_mic.so
lib/postgresql/cyrillic_and_mic.so
@@ -38,19 +44,46 @@ share/postgresql/postgres.bki
share/postgresql/postgres.description
share/postgresql/postgresql.conf.sample
share/postgresql/sql_features.txt
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
%%GETTEXT%%@dirrmtry share/locale/cs
diff --git a/databases/postgresql80-client/Makefile b/databases/postgresql80-client/Makefile
index 9b3ce9abf9d7..29ff1120d54f 100644
--- a/databases/postgresql80-client/Makefile
+++ b/databases/postgresql80-client/Makefile
@@ -15,7 +15,9 @@ COMMENT= PostgreSQL database (client)
MASTERDIR= ${.CURDIR}/../postgresql80-server
-BUILD_DIRS= config src/include src/interfaces src/bin doc src/makefiles
+BUILD_DIRS= config src/include src/interfaces src/bin/pg_dump \
+ src/bin/psql src/bin/scripts src/bin/pg_config \
+ doc src/makefiles
CLIENT_ONLY= yes
INSTALLS_SHLIB= yes
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index a4dc54058ea0..9dc8f511704e 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME?= postgresql
-PORTVERSION?= 8.0.9
+PORTVERSION?= 8.0.10
PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
@@ -46,7 +46,8 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
BUILD_DIRS?= src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
- src/pl src/utils
+ src/bin/initdb src/bin/ipcclean src/bin/pg_ctl src/bin/pg_controldata \
+ src/bin/pg_resetxlog src/pl
INSTALL_DIRS?= ${BUILD_DIRS}
.if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
diff --git a/databases/postgresql80-server/distinfo b/databases/postgresql80-server/distinfo
index 792006ae1de0..3009e1a779b9 100644
--- a/databases/postgresql80-server/distinfo
+++ b/databases/postgresql80-server/distinfo
@@ -1,15 +1,15 @@
-MD5 (postgresql/postgresql-base-8.0.9.tar.bz2) = f9a044227ad6dc9c937d4853100733cb
-SHA256 (postgresql/postgresql-base-8.0.9.tar.bz2) = 8ed190ee5468f3685a1edbc5279490819ffa6fe64f1b6f0139bdbec365852417
-SIZE (postgresql/postgresql-base-8.0.9.tar.bz2) = 7824961
-MD5 (postgresql/postgresql-opt-8.0.9.tar.bz2) = 363e009214bfde8235d900da09c7c675
-SHA256 (postgresql/postgresql-opt-8.0.9.tar.bz2) = 007d5cded329dfbcc91b4f1d1ddb9473efb4316b1621294446ee611065393020
-SIZE (postgresql/postgresql-opt-8.0.9.tar.bz2) = 134706
-MD5 (postgresql/postgresql-docs-8.0.9.tar.bz2) = 0529eb29ac2c248a3b244b7bfc007456
-SHA256 (postgresql/postgresql-docs-8.0.9.tar.bz2) = b55d4a77c0c3b0f42c7233c08112b884e1463157160007efd70a63806ede632b
-SIZE (postgresql/postgresql-docs-8.0.9.tar.bz2) = 2262698
-MD5 (postgresql/postgresql-test-8.0.9.tar.bz2) = 8992a878fe5aa32e3da7fb84270614db
-SHA256 (postgresql/postgresql-test-8.0.9.tar.bz2) = f2b81b3cf7ade17a748fa84570c295817d82fd05b53d2e0fb9d9e922b0c613ea
-SIZE (postgresql/postgresql-test-8.0.9.tar.bz2) = 931363
+MD5 (postgresql/postgresql-base-8.0.10.tar.bz2) = beb7db3955dc92362a8efc513c60bf96
+SHA256 (postgresql/postgresql-base-8.0.10.tar.bz2) = ed9d809cf54171475b755ebe452f9d360c5d1c8fb5085f575ae96c233f6abb6d
+SIZE (postgresql/postgresql-base-8.0.10.tar.bz2) = 7840640
+MD5 (postgresql/postgresql-opt-8.0.10.tar.bz2) = 4487d7ceebf33e847c780fe66b363d6e
+SHA256 (postgresql/postgresql-opt-8.0.10.tar.bz2) = 1e85b9007a79a842ddc22eb79fc4842937a0135d16e34756991a59bded345f96
+SIZE (postgresql/postgresql-opt-8.0.10.tar.bz2) = 134801
+MD5 (postgresql/postgresql-docs-8.0.10.tar.bz2) = 2b6206d2b74a00539af788df8619cf12
+SHA256 (postgresql/postgresql-docs-8.0.10.tar.bz2) = e357e94c0df851ca5e540aeac2c75aa1ea216194628bfd13c00586a43e211ef5
+SIZE (postgresql/postgresql-docs-8.0.10.tar.bz2) = 2264685
+MD5 (postgresql/postgresql-test-8.0.10.tar.bz2) = e32adb56b61e462b8a6a9593f7a6b2af
+SHA256 (postgresql/postgresql-test-8.0.10.tar.bz2) = e49070823751063f5f83e56a56e8cc4ab6605f2742ba5880cf387d71e50929bc
+SIZE (postgresql/postgresql-test-8.0.10.tar.bz2) = 931351
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
diff --git a/databases/postgresql80-server/files/pkg-message-server.in b/databases/postgresql80-server/files/pkg-message-server.in
index 88c35ccff457..5b8a1afdfda0 100644
--- a/databases/postgresql80-server/files/pkg-message-server.in
+++ b/databases/postgresql80-server/files/pkg-message-server.in
@@ -27,13 +27,19 @@ If you plan to access your PostgreSQL server using ODBC, please
consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql
to get the functions required for ODBC compliance.
-If you need to store any characters besides strict ASCII in your
-database, you will want to set a character set, and possibly a
-collation locale, before initializing the database. Add something
-similar to this to /etc/login.conf:
+Please note that if you use the rc script,
+%%PREFIX%%/etc/rc.conf/postgresql, to initialize the database, unicode
+(UTF-8) will be used to store character data by default. Set
+postgresql_initdb_flags or use login.conf settings described below to
+alter this behaviour. See the start rc script for more info.
+
+To set limits, environment stuff like locale and collation and other
+things, you can set up a class in /etc/login.conf before initializing
+the database. Add something similar to this to /etc/login.conf:
---
postgres:\
- :setenv=LC_ALL=en_US.UTF-8,LC_COLLATE=C:\
+ :lang=en_US.UTF-8:\
+ :setenv=LC_COLLATE=C:\
:tc=default:
---
and run `cap_mkdb /etc/login.conf'.
@@ -51,7 +57,7 @@ You can then start PostgreSQL by running:
For postmaster settings, see ~pgsql/data/postgresql.conf
-NB. FreeBSD's PostgreSQL port now by default logs to syslog
+NB. FreeBSD's PostgreSQL port logs to syslog by default
See ~pgsql/data/postgresql.conf for more info
======================================================================
diff --git a/databases/postgresql80-server/files/postgresql.in b/databases/postgresql80-server/files/postgresql.in
index d3014f580dc0..1b3b4226acdf 100644
--- a/databases/postgresql80-server/files/postgresql.in
+++ b/databases/postgresql80-server/files/postgresql.in
@@ -12,6 +12,10 @@
# # optional
# postgresql_data="%%PREFIX%%/pgsql/data"
# postgresql_flags="-w -s -m fast"
+# postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
+# postgresql_class="default"
+#
+# See %%PREFIX%%/share/doc/postgresql/README-server for more info
#
# This scripts takes one of the following commands:
#
@@ -20,9 +24,9 @@
# For postmaster startup options, edit ${postgresql_data}/postgresql.conf
prefix=%%PREFIX%%
+command=${prefix}/bin/pg_ctl
. %%RC_SUBR%%
-command=${prefix}/bin/pg_ctl
load_rc_config postgresql
@@ -32,6 +36,7 @@ postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
postgresql_user=pgsql
eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data"}
postgresql_class=${postgresql_class:-"default"}
+postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
name=postgresql
rcvar=`set_rcvar`
@@ -53,7 +58,7 @@ postgresql_command()
postgresql_initdb()
{
- su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb -D ${postgresql_data}"
+ su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
}
run_rc_command "$1"
diff --git a/databases/postgresql80-server/pkg-plist-client b/databases/postgresql80-server/pkg-plist-client
index 50d2103784a3..2e9d60f8a6ad 100644
--- a/databases/postgresql80-server/pkg-plist-client
+++ b/databases/postgresql80-server/pkg-plist-client
@@ -6,14 +6,9 @@ bin/dropdb
bin/droplang
bin/dropuser
bin/ecpg
-bin/initdb
-bin/ipcclean
bin/pg_config
-bin/pg_controldata
-bin/pg_ctl
bin/pg_dump
bin/pg_dumpall
-bin/pg_resetxlog
bin/pg_restore
bin/psql
bin/vacuumdb
@@ -438,150 +433,84 @@ share/postgresql/pg_service.conf.sample
share/postgresql/psqlrc.sample
@dirrmtry share/postgresql
%%GETTEXT%%share/locale/af/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fa/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/fa/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/pl/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
diff --git a/databases/postgresql80-server/pkg-plist-server b/databases/postgresql80-server/pkg-plist-server
index b96587c84343..a37d96fbb7e2 100644
--- a/databases/postgresql80-server/pkg-plist-server
+++ b/databases/postgresql80-server/pkg-plist-server
@@ -1,5 +1,10 @@
-bin/postmaster
+bin/initdb
+bin/ipcclean
+bin/pg_controldata
+bin/pg_ctl
+bin/pg_resetxlog
bin/postgres
+bin/postmaster
etc/periodic/daily/502.pgsql
lib/libpgport.a
lib/postgresql/ascii_and_mic.so
@@ -42,38 +47,104 @@ share/postgresql/recovery.conf.sample
share/postgresql/sql_features.txt
share/postgresql/system_views.sql
%%GETTEXT%%share/locale/af/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/fa/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
%%GETTEXT%%@dirrmtry share/locale/cs
-%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
%%GETTEXT%%@dirrmtry share/locale/ko
-%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sk
-%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
%%GETTEXT%%@dirrmtry share/locale/ro
-%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sk
+%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
%%GETTEXT%%@dirrmtry share/locale/sl
-%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
%%GETTEXT%%@dirrmtry share/locale/zh_CN
-%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
%%GETTEXT%%@dirrmtry share/locale/zh_TW
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
share/postgresql/timezone/Africa/Algiers
share/postgresql/timezone/Africa/Luanda
share/postgresql/timezone/Africa/Porto-Novo
@@ -307,6 +378,11 @@ share/postgresql/timezone/Pacific/Honolulu
share/postgresql/timezone/Pacific/Easter
share/postgresql/timezone/Pacific/Galapagos
share/postgresql/timezone/Pacific/Samoa
+share/postgresql/timezone/Europe/Guernsey
+share/postgresql/timezone/Europe/Isle_of_Man
+share/postgresql/timezone/Europe/Podgorica
+share/postgresql/timezone/Europe/Jersey
+share/postgresql/timezone/Europe/Volgograd
share/postgresql/timezone/Europe/London
share/postgresql/timezone/Europe/Belfast
share/postgresql/timezone/Europe/Dublin
@@ -364,6 +440,9 @@ share/postgresql/timezone/WET
share/postgresql/timezone/CET
share/postgresql/timezone/MET
share/postgresql/timezone/EET
+share/postgresql/timezone/America/Atikokan
+share/postgresql/timezone/America/Blanc-Sablon
+share/postgresql/timezone/America/Moncton
share/postgresql/timezone/America/Coral_Harbour
share/postgresql/timezone/America/Danmarkshavn
share/postgresql/timezone/America/Scoresbysund
@@ -372,6 +451,7 @@ share/postgresql/timezone/America/Thule
share/postgresql/timezone/America/New_York
share/postgresql/timezone/America/Chicago
share/postgresql/timezone/America/North_Dakota/Center
+share/postgresql/timezone/America/North_Dakota/New_Salem
share/postgresql/timezone/America/Denver
share/postgresql/timezone/America/Los_Angeles
share/postgresql/timezone/America/Juneau
@@ -383,6 +463,8 @@ share/postgresql/timezone/America/Phoenix
share/postgresql/timezone/America/Boise
share/postgresql/timezone/America/Indianapolis
share/postgresql/timezone/America/Indiana/Marengo
+share/postgresql/timezone/America/Indiana/Petersburg
+share/postgresql/timezone/America/Indiana/Vincennes
share/postgresql/timezone/America/Indiana/Knox
share/postgresql/timezone/America/Indiana/Vevay
share/postgresql/timezone/America/Indiana/Indianapolis
@@ -612,19 +694,6 @@ share/postgresql/timezone/UTC
share/postgresql/timezone/Universal
share/postgresql/timezone/W-SU
share/postgresql/timezone/Zulu
-share/postgresql/timezone/SystemV/AST4ADT
-share/postgresql/timezone/SystemV/EST5EDT
-share/postgresql/timezone/SystemV/CST6CDT
-share/postgresql/timezone/SystemV/MST7MDT
-share/postgresql/timezone/SystemV/PST8PDT
-share/postgresql/timezone/SystemV/YST9YDT
-share/postgresql/timezone/SystemV/AST4
-share/postgresql/timezone/SystemV/EST5
-share/postgresql/timezone/SystemV/CST6
-share/postgresql/timezone/SystemV/MST7
-share/postgresql/timezone/SystemV/PST8
-share/postgresql/timezone/SystemV/YST9
-share/postgresql/timezone/SystemV/HST10
share/postgresql/timezone/Mideast/Riyadh87
share/postgresql/timezone/Mideast/Riyadh88
share/postgresql/timezone/Mideast/Riyadh89
@@ -648,7 +717,6 @@ share/postgresql/timezone/Mideast/Riyadh89
@dirrm share/postgresql/timezone/Mexico
@dirrm share/postgresql/timezone/Mideast
@dirrm share/postgresql/timezone/Pacific
-@dirrm share/postgresql/timezone/SystemV
@dirrm share/postgresql/timezone/US
@dirrm share/postgresql/timezone
@unexec if cmp -s ~pgsql/.profile %D/share/postgresql/dot.profile.dist; then rm -f ~pgsql/.profile; fi
diff --git a/databases/postgresql81-client/Makefile b/databases/postgresql81-client/Makefile
index 9299683e5a89..e81cc4b685c2 100644
--- a/databases/postgresql81-client/Makefile
+++ b/databases/postgresql81-client/Makefile
@@ -15,7 +15,9 @@ COMMENT= PostgreSQL database (client)
MASTERDIR= ${.CURDIR}/../postgresql81-server
-BUILD_DIRS= config src/include src/interfaces src/bin doc src/makefiles
+BUILD_DIRS= config src/include src/interfaces \
+ src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
+ doc src/makefiles
CLIENT_ONLY= yes
INSTALLS_SHLIB= yes
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 4d9a3589a421..742d14afde77 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME?= postgresql
-PORTVERSION?= 8.1.5
+PORTVERSION?= 8.1.6
PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
@@ -46,7 +46,9 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
BUILD_DIRS?= src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
- src/pl src/utils
+ src/bin/initdb src/bin/ipcclean src/bin/pg_ctl src/bin/pg_controldata \
+ src/bin/pg_resetxlog src/pl
+
INSTALL_DIRS?= ${BUILD_DIRS}
.if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
diff --git a/databases/postgresql81-server/distinfo b/databases/postgresql81-server/distinfo
index c71931c05124..47ec955947d2 100644
--- a/databases/postgresql81-server/distinfo
+++ b/databases/postgresql81-server/distinfo
@@ -1,15 +1,15 @@
-MD5 (postgresql/postgresql-base-8.1.5.tar.bz2) = 30a42fd5fc5326edc217e28651e5053b
-SHA256 (postgresql/postgresql-base-8.1.5.tar.bz2) = cb878499848aa8abb82f1ae79574923174851b0396a5befa31f49089a3abb4df
-SIZE (postgresql/postgresql-base-8.1.5.tar.bz2) = 8044522
-MD5 (postgresql/postgresql-opt-8.1.5.tar.bz2) = bcd3eec7cfc759dbfdde4f9e8fa07d27
-SHA256 (postgresql/postgresql-opt-8.1.5.tar.bz2) = 4fe0dc14e02d65516348ec0e90633be2a3ada002c151fca8f2e7eba6556c8b1c
-SIZE (postgresql/postgresql-opt-8.1.5.tar.bz2) = 144784
-MD5 (postgresql/postgresql-docs-8.1.5.tar.bz2) = d104e7e645ea36407831ca59470c7a12
-SHA256 (postgresql/postgresql-docs-8.1.5.tar.bz2) = 01c0a848b0016598adfcebea74960340edf80fc037051d106b62bea14e1cd0c9
-SIZE (postgresql/postgresql-docs-8.1.5.tar.bz2) = 2489400
-MD5 (postgresql/postgresql-test-8.1.5.tar.bz2) = b3e050a0af7998d78f928b96d95fa6d7
-SHA256 (postgresql/postgresql-test-8.1.5.tar.bz2) = 60ed8d466a66dfe72994f7c8e45324e81e8ce6b91343eee07df5939f10559166
-SIZE (postgresql/postgresql-test-8.1.5.tar.bz2) = 947271
+MD5 (postgresql/postgresql-base-8.1.6.tar.bz2) = ad616f482e119a39cc89ee6902e9205e
+SHA256 (postgresql/postgresql-base-8.1.6.tar.bz2) = d6c4e8cf28764aefe81e6de253933c33950e58ca8975c9d93b3e844137dfd732
+SIZE (postgresql/postgresql-base-8.1.6.tar.bz2) = 8064467
+MD5 (postgresql/postgresql-opt-8.1.6.tar.bz2) = ff928aa7e457fc8c418dd2875863942b
+SHA256 (postgresql/postgresql-opt-8.1.6.tar.bz2) = 321dcb79e042f1ddd202ecce5654d1ca0a6a72ec4fda86eac6e3990500bdbcfb
+SIZE (postgresql/postgresql-opt-8.1.6.tar.bz2) = 144641
+MD5 (postgresql/postgresql-docs-8.1.6.tar.bz2) = 3981cf168b4d39c2e0409d522c8a9c28
+SHA256 (postgresql/postgresql-docs-8.1.6.tar.bz2) = b674af62a954b0c71512cc332e873c8799fcd9cfefe55911c986ad51beac6f43
+SIZE (postgresql/postgresql-docs-8.1.6.tar.bz2) = 2495557
+MD5 (postgresql/postgresql-test-8.1.6.tar.bz2) = ab51f4033e170414d2f2949a662c2555
+SHA256 (postgresql/postgresql-test-8.1.6.tar.bz2) = 060af213dc188ef1c0690b66860e78152d5c047e62399d8d2399ec68a29656fb
+SIZE (postgresql/postgresql-test-8.1.6.tar.bz2) = 947637
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
diff --git a/databases/postgresql81-server/files/pkg-message-server.in b/databases/postgresql81-server/files/pkg-message-server.in
index d22a731f40d8..cd6c42ed2090 100644
--- a/databases/postgresql81-server/files/pkg-message-server.in
+++ b/databases/postgresql81-server/files/pkg-message-server.in
@@ -30,13 +30,19 @@ If you plan to access your PostgreSQL server using ODBC, please
consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql
to get the functions required for ODBC compliance.
-If you need to store any characters besides strict ASCII in your
-database, you will want to set a character set, and possibly a
-collation locale, before initializing the database. Add something
-similar to this to /etc/login.conf:
+Please note that if you use the rc script,
+%%PREFIX%%/etc/rc.conf/postgresql, to initialize the database, unicode
+(UTF-8) will be used to store character data by default. Set
+postgresql_initdb_flags or use login.conf settings described below to
+alter this behaviour. See the start rc script for more info.
+
+To set limits, environment stuff like locale and collation and other
+things, you can set up a class in /etc/login.conf before initializing
+the database. Add something similar to this to /etc/login.conf:
---
postgres:\
- :setenv=LC_ALL=en_US.UTF-8,LC_COLLATE=C:\
+ :lang=en_US.UTF-8:\
+ :setenv=LC_COLLATE=C:\
:tc=default:
---
and run `cap_mkdb /etc/login.conf'.
diff --git a/databases/postgresql81-server/files/postgresql.in b/databases/postgresql81-server/files/postgresql.in
index 3456ed3d7282..1b3b4226acdf 100644
--- a/databases/postgresql81-server/files/postgresql.in
+++ b/databases/postgresql81-server/files/postgresql.in
@@ -12,6 +12,10 @@
# # optional
# postgresql_data="%%PREFIX%%/pgsql/data"
# postgresql_flags="-w -s -m fast"
+# postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
+# postgresql_class="default"
+#
+# See %%PREFIX%%/share/doc/postgresql/README-server for more info
#
# This scripts takes one of the following commands:
#
@@ -32,6 +36,7 @@ postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
postgresql_user=pgsql
eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data"}
postgresql_class=${postgresql_class:-"default"}
+postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
name=postgresql
rcvar=`set_rcvar`
@@ -53,7 +58,7 @@ postgresql_command()
postgresql_initdb()
{
- su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb -D ${postgresql_data}"
+ su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
}
run_rc_command "$1"
diff --git a/databases/postgresql81-server/pkg-plist-client b/databases/postgresql81-server/pkg-plist-client
index c39bd07b8b0e..8ca10c20173c 100644
--- a/databases/postgresql81-server/pkg-plist-client
+++ b/databases/postgresql81-server/pkg-plist-client
@@ -6,14 +6,9 @@ bin/dropdb
bin/droplang
bin/dropuser
bin/ecpg
-bin/initdb
-bin/ipcclean
bin/pg_config
-bin/pg_controldata
-bin/pg_ctl
bin/pg_dump
bin/pg_dumpall
-bin/pg_resetxlog
bin/pg_restore
bin/psql
bin/reindexdb
@@ -452,150 +447,84 @@ share/postgresql/pg_service.conf.sample
share/postgresql/psqlrc.sample
@dirrmtry share/postgresql
%%GETTEXT%%share/locale/af/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fa/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/fa/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/pl/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
diff --git a/databases/postgresql81-server/pkg-plist-server b/databases/postgresql81-server/pkg-plist-server
index db7177d31302..bc8bdd79b9cd 100644
--- a/databases/postgresql81-server/pkg-plist-server
+++ b/databases/postgresql81-server/pkg-plist-server
@@ -1,5 +1,10 @@
-bin/postmaster
+bin/ipcclean
+bin/initdb
+bin/pg_controldata
+bin/pg_ctl
+bin/pg_resetxlog
bin/postgres
+bin/postmaster
etc/periodic/daily/502.pgsql
lib/libpgport.a
lib/postgresql/ascii_and_mic.so
@@ -43,23 +48,89 @@ share/postgresql/recovery.conf.sample
share/postgresql/sql_features.txt
share/postgresql/system_views.sql
%%GETTEXT%%share/locale/af/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/fa/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
%%GETTEXT%%@dirrmtry share/locale/cs
@@ -75,498 +146,341 @@ share/postgresql/system_views.sql
%%GETTEXT%%@dirrmtry share/locale/zh_CN
%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
%%GETTEXT%%@dirrmtry share/locale/zh_TW
-share/postgresql/timezone/Africa/Algiers
-share/postgresql/timezone/Africa/Luanda
-share/postgresql/timezone/Africa/Porto-Novo
-share/postgresql/timezone/Africa/Gaborone
-share/postgresql/timezone/Africa/Ouagadougou
-share/postgresql/timezone/Africa/Bujumbura
-share/postgresql/timezone/Africa/Douala
-share/postgresql/timezone/Africa/Bangui
-share/postgresql/timezone/Africa/Ndjamena
-share/postgresql/timezone/Africa/Kinshasa
-share/postgresql/timezone/Africa/Lubumbashi
-share/postgresql/timezone/Africa/Brazzaville
share/postgresql/timezone/Africa/Abidjan
-share/postgresql/timezone/Africa/Djibouti
-share/postgresql/timezone/Africa/Cairo
-share/postgresql/timezone/Africa/Malabo
-share/postgresql/timezone/Africa/Asmera
+share/postgresql/timezone/Africa/Accra
share/postgresql/timezone/Africa/Addis_Ababa
-share/postgresql/timezone/Africa/Libreville
+share/postgresql/timezone/Africa/Algiers
+share/postgresql/timezone/Africa/Asmera
+share/postgresql/timezone/Africa/Bamako
+share/postgresql/timezone/Africa/Bangui
share/postgresql/timezone/Africa/Banjul
-share/postgresql/timezone/Africa/Accra
-share/postgresql/timezone/Africa/Conakry
share/postgresql/timezone/Africa/Bissau
-share/postgresql/timezone/Africa/Nairobi
-share/postgresql/timezone/Africa/Maseru
-share/postgresql/timezone/Africa/Monrovia
-share/postgresql/timezone/Africa/Tripoli
share/postgresql/timezone/Africa/Blantyre
-share/postgresql/timezone/Africa/Bamako
-share/postgresql/timezone/Africa/Timbuktu
-share/postgresql/timezone/Africa/Nouakchott
+share/postgresql/timezone/Africa/Brazzaville
+share/postgresql/timezone/Africa/Bujumbura
+share/postgresql/timezone/Africa/Cairo
share/postgresql/timezone/Africa/Casablanca
-share/postgresql/timezone/Africa/El_Aaiun
-share/postgresql/timezone/Africa/Maputo
-share/postgresql/timezone/Africa/Windhoek
-share/postgresql/timezone/Africa/Niamey
-share/postgresql/timezone/Africa/Lagos
-share/postgresql/timezone/Africa/Kigali
-share/postgresql/timezone/Africa/Sao_Tome
+share/postgresql/timezone/Africa/Ceuta
+share/postgresql/timezone/Africa/Conakry
share/postgresql/timezone/Africa/Dakar
+share/postgresql/timezone/Africa/Dar_es_Salaam
+share/postgresql/timezone/Africa/Djibouti
+share/postgresql/timezone/Africa/Douala
+share/postgresql/timezone/Africa/El_Aaiun
share/postgresql/timezone/Africa/Freetown
-share/postgresql/timezone/Africa/Mogadishu
+share/postgresql/timezone/Africa/Gaborone
+share/postgresql/timezone/Africa/Harare
share/postgresql/timezone/Africa/Johannesburg
+share/postgresql/timezone/Africa/Kampala
share/postgresql/timezone/Africa/Khartoum
-share/postgresql/timezone/Africa/Mbabane
-share/postgresql/timezone/Africa/Dar_es_Salaam
+share/postgresql/timezone/Africa/Kigali
+share/postgresql/timezone/Africa/Kinshasa
+share/postgresql/timezone/Africa/Lagos
+share/postgresql/timezone/Africa/Libreville
share/postgresql/timezone/Africa/Lome
-share/postgresql/timezone/Africa/Tunis
-share/postgresql/timezone/Africa/Kampala
+share/postgresql/timezone/Africa/Luanda
+share/postgresql/timezone/Africa/Lubumbashi
share/postgresql/timezone/Africa/Lusaka
-share/postgresql/timezone/Africa/Harare
-share/postgresql/timezone/Africa/Ceuta
-share/postgresql/timezone/Atlantic/Cape_Verde
-share/postgresql/timezone/Atlantic/St_Helena
-share/postgresql/timezone/Atlantic/Faeroe
-share/postgresql/timezone/Atlantic/Reykjavik
-share/postgresql/timezone/Atlantic/Azores
-share/postgresql/timezone/Atlantic/Madeira
-share/postgresql/timezone/Atlantic/Canary
-share/postgresql/timezone/Atlantic/Bermuda
-share/postgresql/timezone/Atlantic/Stanley
-share/postgresql/timezone/Atlantic/South_Georgia
-share/postgresql/timezone/Atlantic/Jan_Mayen
-share/postgresql/timezone/Indian/Comoro
-share/postgresql/timezone/Indian/Antananarivo
-share/postgresql/timezone/Indian/Mauritius
-share/postgresql/timezone/Indian/Mayotte
-share/postgresql/timezone/Indian/Reunion
-share/postgresql/timezone/Indian/Mahe
-share/postgresql/timezone/Indian/Kerguelen
-share/postgresql/timezone/Indian/Chagos
-share/postgresql/timezone/Indian/Maldives
-share/postgresql/timezone/Indian/Christmas
-share/postgresql/timezone/Indian/Cocos
+share/postgresql/timezone/Africa/Malabo
+share/postgresql/timezone/Africa/Maputo
+share/postgresql/timezone/Africa/Maseru
+share/postgresql/timezone/Africa/Mbabane
+share/postgresql/timezone/Africa/Mogadishu
+share/postgresql/timezone/Africa/Monrovia
+share/postgresql/timezone/Africa/Nairobi
+share/postgresql/timezone/Africa/Ndjamena
+share/postgresql/timezone/Africa/Niamey
+share/postgresql/timezone/Africa/Nouakchott
+share/postgresql/timezone/Africa/Ouagadougou
+share/postgresql/timezone/Africa/Porto-Novo
+share/postgresql/timezone/Africa/Sao_Tome
+share/postgresql/timezone/Africa/Timbuktu
+share/postgresql/timezone/Africa/Tripoli
+share/postgresql/timezone/Africa/Tunis
+share/postgresql/timezone/Africa/Windhoek
+share/postgresql/timezone/America/Adak
+share/postgresql/timezone/America/Anchorage
+share/postgresql/timezone/America/Anguilla
+share/postgresql/timezone/America/Antigua
+share/postgresql/timezone/America/Araguaina
+share/postgresql/timezone/America/Argentina/Buenos_Aires
+share/postgresql/timezone/America/Argentina/Catamarca
+share/postgresql/timezone/America/Argentina/ComodRivadavia
+share/postgresql/timezone/America/Argentina/Cordoba
+share/postgresql/timezone/America/Argentina/Jujuy
+share/postgresql/timezone/America/Argentina/La_Rioja
+share/postgresql/timezone/America/Argentina/Mendoza
+share/postgresql/timezone/America/Argentina/Rio_Gallegos
+share/postgresql/timezone/America/Argentina/San_Juan
+share/postgresql/timezone/America/Argentina/Tucuman
+share/postgresql/timezone/America/Argentina/Ushuaia
+share/postgresql/timezone/America/Aruba
+share/postgresql/timezone/America/Asuncion
+share/postgresql/timezone/America/Atikokan
+share/postgresql/timezone/America/Atka
+share/postgresql/timezone/America/Bahia
+share/postgresql/timezone/America/Barbados
+share/postgresql/timezone/America/Belem
+share/postgresql/timezone/America/Belize
+share/postgresql/timezone/America/Blanc-Sablon
+share/postgresql/timezone/America/Boa_Vista
+share/postgresql/timezone/America/Bogota
+share/postgresql/timezone/America/Boise
+share/postgresql/timezone/America/Buenos_Aires
+share/postgresql/timezone/America/Cambridge_Bay
+share/postgresql/timezone/America/Campo_Grande
+share/postgresql/timezone/America/Cancun
+share/postgresql/timezone/America/Caracas
+share/postgresql/timezone/America/Catamarca
+share/postgresql/timezone/America/Cayenne
+share/postgresql/timezone/America/Cayman
+share/postgresql/timezone/America/Chicago
+share/postgresql/timezone/America/Chihuahua
+share/postgresql/timezone/America/Coral_Harbour
+share/postgresql/timezone/America/Cordoba
+share/postgresql/timezone/America/Costa_Rica
+share/postgresql/timezone/America/Cuiaba
+share/postgresql/timezone/America/Curacao
+share/postgresql/timezone/America/Danmarkshavn
+share/postgresql/timezone/America/Dawson
+share/postgresql/timezone/America/Dawson_Creek
+share/postgresql/timezone/America/Denver
+share/postgresql/timezone/America/Detroit
+share/postgresql/timezone/America/Dominica
+share/postgresql/timezone/America/Edmonton
+share/postgresql/timezone/America/Eirunepe
+share/postgresql/timezone/America/El_Salvador
+share/postgresql/timezone/America/Ensenada
+share/postgresql/timezone/America/Fort_Wayne
+share/postgresql/timezone/America/Fortaleza
+share/postgresql/timezone/America/Glace_Bay
+share/postgresql/timezone/America/Godthab
+share/postgresql/timezone/America/Goose_Bay
+share/postgresql/timezone/America/Grand_Turk
+share/postgresql/timezone/America/Grenada
+share/postgresql/timezone/America/Guadeloupe
+share/postgresql/timezone/America/Guatemala
+share/postgresql/timezone/America/Guayaquil
+share/postgresql/timezone/America/Guyana
+share/postgresql/timezone/America/Halifax
+share/postgresql/timezone/America/Havana
+share/postgresql/timezone/America/Hermosillo
+share/postgresql/timezone/America/Indiana/Indianapolis
+share/postgresql/timezone/America/Indiana/Knox
+share/postgresql/timezone/America/Indiana/Marengo
+share/postgresql/timezone/America/Indiana/Petersburg
+share/postgresql/timezone/America/Indiana/Vevay
+share/postgresql/timezone/America/Indiana/Vincennes
+share/postgresql/timezone/America/Indianapolis
+share/postgresql/timezone/America/Inuvik
+share/postgresql/timezone/America/Iqaluit
+share/postgresql/timezone/America/Jamaica
+share/postgresql/timezone/America/Jujuy
+share/postgresql/timezone/America/Juneau
+share/postgresql/timezone/America/Kentucky/Louisville
+share/postgresql/timezone/America/Kentucky/Monticello
+share/postgresql/timezone/America/Knox_IN
+share/postgresql/timezone/America/La_Paz
+share/postgresql/timezone/America/Lima
+share/postgresql/timezone/America/Los_Angeles
+share/postgresql/timezone/America/Louisville
+share/postgresql/timezone/America/Maceio
+share/postgresql/timezone/America/Managua
+share/postgresql/timezone/America/Manaus
+share/postgresql/timezone/America/Martinique
+share/postgresql/timezone/America/Mazatlan
+share/postgresql/timezone/America/Mendoza
+share/postgresql/timezone/America/Menominee
+share/postgresql/timezone/America/Merida
+share/postgresql/timezone/America/Mexico_City
+share/postgresql/timezone/America/Miquelon
+share/postgresql/timezone/America/Moncton
+share/postgresql/timezone/America/Monterrey
+share/postgresql/timezone/America/Montevideo
+share/postgresql/timezone/America/Montreal
+share/postgresql/timezone/America/Montserrat
+share/postgresql/timezone/America/Nassau
+share/postgresql/timezone/America/New_York
+share/postgresql/timezone/America/Nipigon
+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/Panama
+share/postgresql/timezone/America/Pangnirtung
+share/postgresql/timezone/America/Paramaribo
+share/postgresql/timezone/America/Phoenix
+share/postgresql/timezone/America/Port-au-Prince
+share/postgresql/timezone/America/Port_of_Spain
+share/postgresql/timezone/America/Porto_Acre
+share/postgresql/timezone/America/Porto_Velho
+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/Regina
+share/postgresql/timezone/America/Rio_Branco
+share/postgresql/timezone/America/Rosario
+share/postgresql/timezone/America/Santiago
+share/postgresql/timezone/America/Santo_Domingo
+share/postgresql/timezone/America/Sao_Paulo
+share/postgresql/timezone/America/Scoresbysund
+share/postgresql/timezone/America/Shiprock
+share/postgresql/timezone/America/St_Johns
+share/postgresql/timezone/America/St_Kitts
+share/postgresql/timezone/America/St_Lucia
+share/postgresql/timezone/America/St_Thomas
+share/postgresql/timezone/America/St_Vincent
+share/postgresql/timezone/America/Swift_Current
+share/postgresql/timezone/America/Tegucigalpa
+share/postgresql/timezone/America/Thule
+share/postgresql/timezone/America/Thunder_Bay
+share/postgresql/timezone/America/Tijuana
+share/postgresql/timezone/America/Toronto
+share/postgresql/timezone/America/Tortola
+share/postgresql/timezone/America/Vancouver
+share/postgresql/timezone/America/Virgin
+share/postgresql/timezone/America/Whitehorse
+share/postgresql/timezone/America/Winnipeg
+share/postgresql/timezone/America/Yakutat
+share/postgresql/timezone/America/Yellowknife
share/postgresql/timezone/Antarctica/Casey
share/postgresql/timezone/Antarctica/Davis
-share/postgresql/timezone/Antarctica/Mawson
share/postgresql/timezone/Antarctica/DumontDUrville
-share/postgresql/timezone/Antarctica/Syowa
-share/postgresql/timezone/Antarctica/Vostok
-share/postgresql/timezone/Antarctica/Rothera
-share/postgresql/timezone/Antarctica/Palmer
+share/postgresql/timezone/Antarctica/Mawson
share/postgresql/timezone/Antarctica/McMurdo
+share/postgresql/timezone/Antarctica/Palmer
+share/postgresql/timezone/Antarctica/Rothera
share/postgresql/timezone/Antarctica/South_Pole
-share/postgresql/timezone/Asia/Kabul
-share/postgresql/timezone/Asia/Yerevan
-share/postgresql/timezone/Asia/Baku
+share/postgresql/timezone/Antarctica/Syowa
+share/postgresql/timezone/Antarctica/Vostok
+share/postgresql/timezone/Arctic/Longyearbyen
+share/postgresql/timezone/Asia/Aden
+share/postgresql/timezone/Asia/Almaty
+share/postgresql/timezone/Asia/Amman
+share/postgresql/timezone/Asia/Anadyr
+share/postgresql/timezone/Asia/Aqtau
+share/postgresql/timezone/Asia/Aqtobe
+share/postgresql/timezone/Asia/Ashgabat
+share/postgresql/timezone/Asia/Ashkhabad
+share/postgresql/timezone/Asia/Baghdad
share/postgresql/timezone/Asia/Bahrain
-share/postgresql/timezone/Asia/Dhaka
-share/postgresql/timezone/Asia/Thimphu
+share/postgresql/timezone/Asia/Baku
+share/postgresql/timezone/Asia/Bangkok
+share/postgresql/timezone/Asia/Beirut
+share/postgresql/timezone/Asia/Bishkek
share/postgresql/timezone/Asia/Brunei
-share/postgresql/timezone/Asia/Rangoon
-share/postgresql/timezone/Asia/Phnom_Penh
-share/postgresql/timezone/Asia/Harbin
-share/postgresql/timezone/Asia/Shanghai
+share/postgresql/timezone/Asia/Calcutta
+share/postgresql/timezone/Asia/Choibalsan
share/postgresql/timezone/Asia/Chongqing
-share/postgresql/timezone/Asia/Urumqi
-share/postgresql/timezone/Asia/Kashgar
-share/postgresql/timezone/Asia/Hong_Kong
-share/postgresql/timezone/Asia/Taipei
-share/postgresql/timezone/Asia/Macau
-share/postgresql/timezone/Asia/Nicosia
-share/postgresql/timezone/Asia/Tbilisi
+share/postgresql/timezone/Asia/Chungking
+share/postgresql/timezone/Asia/Colombo
+share/postgresql/timezone/Asia/Dacca
+share/postgresql/timezone/Asia/Damascus
+share/postgresql/timezone/Asia/Dhaka
share/postgresql/timezone/Asia/Dili
-share/postgresql/timezone/Asia/Calcutta
+share/postgresql/timezone/Asia/Dubai
+share/postgresql/timezone/Asia/Dushanbe
+share/postgresql/timezone/Asia/Gaza
+share/postgresql/timezone/Asia/Harbin
+share/postgresql/timezone/Asia/Hong_Kong
+share/postgresql/timezone/Asia/Hovd
+share/postgresql/timezone/Asia/Irkutsk
+share/postgresql/timezone/Asia/Istanbul
share/postgresql/timezone/Asia/Jakarta
-share/postgresql/timezone/Asia/Pontianak
-share/postgresql/timezone/Asia/Makassar
share/postgresql/timezone/Asia/Jayapura
-share/postgresql/timezone/Asia/Tehran
-share/postgresql/timezone/Asia/Baghdad
share/postgresql/timezone/Asia/Jerusalem
-share/postgresql/timezone/Asia/Tokyo
-share/postgresql/timezone/Asia/Amman
-share/postgresql/timezone/Asia/Almaty
-share/postgresql/timezone/Asia/Qyzylorda
-share/postgresql/timezone/Asia/Aqtobe
-share/postgresql/timezone/Asia/Aqtau
-share/postgresql/timezone/Asia/Oral
-share/postgresql/timezone/Asia/Bishkek
-share/postgresql/timezone/Asia/Seoul
-share/postgresql/timezone/Asia/Pyongyang
-share/postgresql/timezone/Asia/Kuwait
-share/postgresql/timezone/Asia/Vientiane
-share/postgresql/timezone/Asia/Beirut
+share/postgresql/timezone/Asia/Kabul
+share/postgresql/timezone/Asia/Kamchatka
+share/postgresql/timezone/Asia/Karachi
+share/postgresql/timezone/Asia/Kashgar
+share/postgresql/timezone/Asia/Katmandu
+share/postgresql/timezone/Asia/Krasnoyarsk
share/postgresql/timezone/Asia/Kuala_Lumpur
share/postgresql/timezone/Asia/Kuching
-share/postgresql/timezone/Asia/Hovd
-share/postgresql/timezone/Asia/Ulaanbaatar
-share/postgresql/timezone/Asia/Choibalsan
-share/postgresql/timezone/Asia/Katmandu
-share/postgresql/timezone/Asia/Muscat
-share/postgresql/timezone/Asia/Karachi
-share/postgresql/timezone/Asia/Gaza
+share/postgresql/timezone/Asia/Kuwait
+share/postgresql/timezone/Asia/Macao
+share/postgresql/timezone/Asia/Macau
+share/postgresql/timezone/Asia/Magadan
+share/postgresql/timezone/Asia/Makassar
share/postgresql/timezone/Asia/Manila
+share/postgresql/timezone/Asia/Muscat
+share/postgresql/timezone/Asia/Nicosia
+share/postgresql/timezone/Asia/Novosibirsk
+share/postgresql/timezone/Asia/Omsk
+share/postgresql/timezone/Asia/Oral
+share/postgresql/timezone/Asia/Phnom_Penh
+share/postgresql/timezone/Asia/Pontianak
+share/postgresql/timezone/Asia/Pyongyang
share/postgresql/timezone/Asia/Qatar
+share/postgresql/timezone/Asia/Qyzylorda
+share/postgresql/timezone/Asia/Rangoon
share/postgresql/timezone/Asia/Riyadh
-share/postgresql/timezone/Asia/Singapore
-share/postgresql/timezone/Asia/Colombo
-share/postgresql/timezone/Asia/Damascus
-share/postgresql/timezone/Asia/Dushanbe
-share/postgresql/timezone/Asia/Bangkok
-share/postgresql/timezone/Asia/Ashgabat
-share/postgresql/timezone/Asia/Dubai
-share/postgresql/timezone/Asia/Samarkand
-share/postgresql/timezone/Asia/Tashkent
-share/postgresql/timezone/Asia/Saigon
-share/postgresql/timezone/Asia/Aden
-share/postgresql/timezone/Asia/Yekaterinburg
-share/postgresql/timezone/Asia/Omsk
-share/postgresql/timezone/Asia/Novosibirsk
-share/postgresql/timezone/Asia/Krasnoyarsk
-share/postgresql/timezone/Asia/Irkutsk
-share/postgresql/timezone/Asia/Yakutsk
-share/postgresql/timezone/Asia/Vladivostok
-share/postgresql/timezone/Asia/Sakhalin
-share/postgresql/timezone/Asia/Magadan
-share/postgresql/timezone/Asia/Kamchatka
-share/postgresql/timezone/Asia/Anadyr
share/postgresql/timezone/Asia/Riyadh87
share/postgresql/timezone/Asia/Riyadh88
share/postgresql/timezone/Asia/Riyadh89
-share/postgresql/timezone/Asia/Istanbul
-share/postgresql/timezone/Asia/Ashkhabad
-share/postgresql/timezone/Asia/Chungking
-share/postgresql/timezone/Asia/Dacca
-share/postgresql/timezone/Asia/Macao
-share/postgresql/timezone/Asia/Ujung_Pandang
+share/postgresql/timezone/Asia/Saigon
+share/postgresql/timezone/Asia/Sakhalin
+share/postgresql/timezone/Asia/Samarkand
+share/postgresql/timezone/Asia/Seoul
+share/postgresql/timezone/Asia/Shanghai
+share/postgresql/timezone/Asia/Singapore
+share/postgresql/timezone/Asia/Taipei
+share/postgresql/timezone/Asia/Tashkent
+share/postgresql/timezone/Asia/Tbilisi
+share/postgresql/timezone/Asia/Tehran
share/postgresql/timezone/Asia/Tel_Aviv
share/postgresql/timezone/Asia/Thimbu
+share/postgresql/timezone/Asia/Thimphu
+share/postgresql/timezone/Asia/Tokyo
+share/postgresql/timezone/Asia/Ujung_Pandang
+share/postgresql/timezone/Asia/Ulaanbaatar
share/postgresql/timezone/Asia/Ulan_Bator
-share/postgresql/timezone/Australia/Currie
-share/postgresql/timezone/Australia/Darwin
-share/postgresql/timezone/Australia/Perth
-share/postgresql/timezone/Australia/Brisbane
-share/postgresql/timezone/Australia/Lindeman
+share/postgresql/timezone/Asia/Urumqi
+share/postgresql/timezone/Asia/Vientiane
+share/postgresql/timezone/Asia/Vladivostok
+share/postgresql/timezone/Asia/Yakutsk
+share/postgresql/timezone/Asia/Yekaterinburg
+share/postgresql/timezone/Asia/Yerevan
+share/postgresql/timezone/Atlantic/Azores
+share/postgresql/timezone/Atlantic/Bermuda
+share/postgresql/timezone/Atlantic/Canary
+share/postgresql/timezone/Atlantic/Cape_Verde
+share/postgresql/timezone/Atlantic/Faeroe
+share/postgresql/timezone/Atlantic/Jan_Mayen
+share/postgresql/timezone/Atlantic/Madeira
+share/postgresql/timezone/Atlantic/Reykjavik
+share/postgresql/timezone/Atlantic/South_Georgia
+share/postgresql/timezone/Atlantic/St_Helena
+share/postgresql/timezone/Atlantic/Stanley
+share/postgresql/timezone/Australia/ACT
share/postgresql/timezone/Australia/Adelaide
-share/postgresql/timezone/Australia/Hobart
-share/postgresql/timezone/Australia/Melbourne
-share/postgresql/timezone/Australia/Sydney
+share/postgresql/timezone/Australia/Brisbane
share/postgresql/timezone/Australia/Broken_Hill
-share/postgresql/timezone/Australia/Lord_Howe
-share/postgresql/timezone/Australia/ACT
share/postgresql/timezone/Australia/Canberra
+share/postgresql/timezone/Australia/Currie
+share/postgresql/timezone/Australia/Darwin
+share/postgresql/timezone/Australia/Hobart
share/postgresql/timezone/Australia/LHI
+share/postgresql/timezone/Australia/Lindeman
+share/postgresql/timezone/Australia/Lord_Howe
+share/postgresql/timezone/Australia/Melbourne
share/postgresql/timezone/Australia/NSW
share/postgresql/timezone/Australia/North
+share/postgresql/timezone/Australia/Perth
share/postgresql/timezone/Australia/Queensland
share/postgresql/timezone/Australia/South
+share/postgresql/timezone/Australia/Sydney
share/postgresql/timezone/Australia/Tasmania
share/postgresql/timezone/Australia/Victoria
share/postgresql/timezone/Australia/West
share/postgresql/timezone/Australia/Yancowinna
-share/postgresql/timezone/Pacific/Rarotonga
-share/postgresql/timezone/Pacific/Fiji
-share/postgresql/timezone/Pacific/Gambier
-share/postgresql/timezone/Pacific/Marquesas
-share/postgresql/timezone/Pacific/Tahiti
-share/postgresql/timezone/Pacific/Guam
-share/postgresql/timezone/Pacific/Tarawa
-share/postgresql/timezone/Pacific/Enderbury
-share/postgresql/timezone/Pacific/Kiritimati
-share/postgresql/timezone/Pacific/Saipan
-share/postgresql/timezone/Pacific/Majuro
-share/postgresql/timezone/Pacific/Kwajalein
-share/postgresql/timezone/Pacific/Yap
-share/postgresql/timezone/Pacific/Truk
-share/postgresql/timezone/Pacific/Ponape
-share/postgresql/timezone/Pacific/Kosrae
-share/postgresql/timezone/Pacific/Nauru
-share/postgresql/timezone/Pacific/Noumea
-share/postgresql/timezone/Pacific/Auckland
-share/postgresql/timezone/Pacific/Chatham
-share/postgresql/timezone/Pacific/Niue
-share/postgresql/timezone/Pacific/Norfolk
-share/postgresql/timezone/Pacific/Palau
-share/postgresql/timezone/Pacific/Port_Moresby
-share/postgresql/timezone/Pacific/Pitcairn
-share/postgresql/timezone/Pacific/Pago_Pago
-share/postgresql/timezone/Pacific/Apia
-share/postgresql/timezone/Pacific/Guadalcanal
-share/postgresql/timezone/Pacific/Fakaofo
-share/postgresql/timezone/Pacific/Tongatapu
-share/postgresql/timezone/Pacific/Funafuti
-share/postgresql/timezone/Pacific/Johnston
-share/postgresql/timezone/Pacific/Midway
-share/postgresql/timezone/Pacific/Wake
-share/postgresql/timezone/Pacific/Efate
-share/postgresql/timezone/Pacific/Wallis
-share/postgresql/timezone/Pacific/Honolulu
-share/postgresql/timezone/Pacific/Easter
-share/postgresql/timezone/Pacific/Galapagos
-share/postgresql/timezone/Pacific/Samoa
-share/postgresql/timezone/Europe/London
-share/postgresql/timezone/Europe/Belfast
-share/postgresql/timezone/Europe/Dublin
-share/postgresql/timezone/Europe/Tirane
-share/postgresql/timezone/Europe/Andorra
-share/postgresql/timezone/Europe/Vienna
-share/postgresql/timezone/Europe/Minsk
-share/postgresql/timezone/Europe/Brussels
-share/postgresql/timezone/Europe/Sofia
-share/postgresql/timezone/Europe/Prague
-share/postgresql/timezone/Europe/Copenhagen
-share/postgresql/timezone/Europe/Tallinn
-share/postgresql/timezone/Europe/Helsinki
-share/postgresql/timezone/Europe/Paris
-share/postgresql/timezone/Europe/Berlin
-share/postgresql/timezone/Europe/Gibraltar
-share/postgresql/timezone/Europe/Athens
-share/postgresql/timezone/Europe/Budapest
-share/postgresql/timezone/Europe/Rome
-share/postgresql/timezone/Europe/Riga
-share/postgresql/timezone/Europe/Vaduz
-share/postgresql/timezone/Europe/Vilnius
-share/postgresql/timezone/Europe/Luxembourg
-share/postgresql/timezone/Europe/Malta
-share/postgresql/timezone/Europe/Chisinau
-share/postgresql/timezone/Europe/Monaco
-share/postgresql/timezone/Europe/Amsterdam
-share/postgresql/timezone/Europe/Oslo
-share/postgresql/timezone/Europe/Warsaw
-share/postgresql/timezone/Europe/Lisbon
-share/postgresql/timezone/Europe/Bucharest
-share/postgresql/timezone/Europe/Kaliningrad
-share/postgresql/timezone/Europe/Moscow
-share/postgresql/timezone/Europe/Samara
-share/postgresql/timezone/Europe/Belgrade
-share/postgresql/timezone/Europe/Madrid
-share/postgresql/timezone/Europe/Stockholm
-share/postgresql/timezone/Europe/Zurich
-share/postgresql/timezone/Europe/Istanbul
-share/postgresql/timezone/Europe/Kiev
-share/postgresql/timezone/Europe/Uzhgorod
-share/postgresql/timezone/Europe/Zaporozhye
-share/postgresql/timezone/Europe/Simferopol
-share/postgresql/timezone/Europe/Nicosia
-share/postgresql/timezone/Europe/Mariehamn
-share/postgresql/timezone/Europe/Vatican
-share/postgresql/timezone/Europe/San_Marino
-share/postgresql/timezone/Europe/Ljubljana
-share/postgresql/timezone/Europe/Sarajevo
-share/postgresql/timezone/Europe/Skopje
-share/postgresql/timezone/Europe/Zagreb
-share/postgresql/timezone/Europe/Bratislava
-share/postgresql/timezone/Europe/Tiraspol
-share/postgresql/timezone/WET
-share/postgresql/timezone/CET
-share/postgresql/timezone/MET
-share/postgresql/timezone/EET
-share/postgresql/timezone/America/Danmarkshavn
-share/postgresql/timezone/America/Coral_Harbour
-share/postgresql/timezone/America/Scoresbysund
-share/postgresql/timezone/America/Godthab
-share/postgresql/timezone/America/Thule
-share/postgresql/timezone/America/New_York
-share/postgresql/timezone/America/Chicago
-share/postgresql/timezone/America/North_Dakota/Center
-share/postgresql/timezone/America/Denver
-share/postgresql/timezone/America/Los_Angeles
-share/postgresql/timezone/America/Juneau
-share/postgresql/timezone/America/Yakutat
-share/postgresql/timezone/America/Anchorage
-share/postgresql/timezone/America/Nome
-share/postgresql/timezone/America/Adak
-share/postgresql/timezone/America/Phoenix
-share/postgresql/timezone/America/Boise
-share/postgresql/timezone/America/Indianapolis
-share/postgresql/timezone/America/Indiana/Marengo
-share/postgresql/timezone/America/Indiana/Knox
-share/postgresql/timezone/America/Indiana/Vevay
-share/postgresql/timezone/America/Indiana/Indianapolis
-share/postgresql/timezone/America/Louisville
-share/postgresql/timezone/America/Kentucky/Monticello
-share/postgresql/timezone/America/Kentucky/Louisville
-share/postgresql/timezone/America/Detroit
-share/postgresql/timezone/America/Menominee
-share/postgresql/timezone/America/St_Johns
-share/postgresql/timezone/America/Goose_Bay
-share/postgresql/timezone/America/Halifax
-share/postgresql/timezone/America/Glace_Bay
-share/postgresql/timezone/America/Montreal
-share/postgresql/timezone/America/Toronto
-share/postgresql/timezone/America/Thunder_Bay
-share/postgresql/timezone/America/Nipigon
-share/postgresql/timezone/America/Rainy_River
-share/postgresql/timezone/America/Winnipeg
-share/postgresql/timezone/America/Regina
-share/postgresql/timezone/America/Swift_Current
-share/postgresql/timezone/America/Edmonton
-share/postgresql/timezone/America/Vancouver
-share/postgresql/timezone/America/Dawson_Creek
-share/postgresql/timezone/America/Pangnirtung
-share/postgresql/timezone/America/Iqaluit
-share/postgresql/timezone/America/Rankin_Inlet
-share/postgresql/timezone/America/Cambridge_Bay
-share/postgresql/timezone/America/Yellowknife
-share/postgresql/timezone/America/Inuvik
-share/postgresql/timezone/America/Whitehorse
-share/postgresql/timezone/America/Dawson
-share/postgresql/timezone/America/Cancun
-share/postgresql/timezone/America/Merida
-share/postgresql/timezone/America/Monterrey
-share/postgresql/timezone/America/Mexico_City
-share/postgresql/timezone/America/Chihuahua
-share/postgresql/timezone/America/Hermosillo
-share/postgresql/timezone/America/Mazatlan
-share/postgresql/timezone/America/Tijuana
-share/postgresql/timezone/America/Anguilla
-share/postgresql/timezone/America/Antigua
-share/postgresql/timezone/America/Nassau
-share/postgresql/timezone/America/Barbados
-share/postgresql/timezone/America/Belize
-share/postgresql/timezone/America/Cayman
-share/postgresql/timezone/America/Costa_Rica
-share/postgresql/timezone/America/Havana
-share/postgresql/timezone/America/Dominica
-share/postgresql/timezone/America/Santo_Domingo
-share/postgresql/timezone/America/El_Salvador
-share/postgresql/timezone/America/Grenada
-share/postgresql/timezone/America/Guadeloupe
-share/postgresql/timezone/America/Guatemala
-share/postgresql/timezone/America/Port-au-Prince
-share/postgresql/timezone/America/Tegucigalpa
-share/postgresql/timezone/America/Jamaica
-share/postgresql/timezone/America/Martinique
-share/postgresql/timezone/America/Montserrat
-share/postgresql/timezone/America/Managua
-share/postgresql/timezone/America/Panama
-share/postgresql/timezone/America/Puerto_Rico
-share/postgresql/timezone/America/St_Kitts
-share/postgresql/timezone/America/St_Lucia
-share/postgresql/timezone/America/Miquelon
-share/postgresql/timezone/America/St_Vincent
-share/postgresql/timezone/America/Grand_Turk
-share/postgresql/timezone/America/Tortola
-share/postgresql/timezone/America/St_Thomas
-share/postgresql/timezone/America/Argentina/Buenos_Aires
-share/postgresql/timezone/America/Argentina/Cordoba
-share/postgresql/timezone/America/Argentina/Tucuman
-share/postgresql/timezone/America/Argentina/La_Rioja
-share/postgresql/timezone/America/Argentina/San_Juan
-share/postgresql/timezone/America/Argentina/Jujuy
-share/postgresql/timezone/America/Argentina/Catamarca
-share/postgresql/timezone/America/Argentina/Mendoza
-share/postgresql/timezone/America/Argentina/ComodRivadavia
-share/postgresql/timezone/America/Argentina/Rio_Gallegos
-share/postgresql/timezone/America/Argentina/Ushuaia
-share/postgresql/timezone/America/Aruba
-share/postgresql/timezone/America/La_Paz
-share/postgresql/timezone/America/Noronha
-share/postgresql/timezone/America/Belem
-share/postgresql/timezone/America/Fortaleza
-share/postgresql/timezone/America/Recife
-share/postgresql/timezone/America/Araguaina
-share/postgresql/timezone/America/Maceio
-share/postgresql/timezone/America/Bahia
-share/postgresql/timezone/America/Sao_Paulo
-share/postgresql/timezone/America/Campo_Grande
-share/postgresql/timezone/America/Cuiaba
-share/postgresql/timezone/America/Porto_Velho
-share/postgresql/timezone/America/Boa_Vista
-share/postgresql/timezone/America/Manaus
-share/postgresql/timezone/America/Eirunepe
-share/postgresql/timezone/America/Rio_Branco
-share/postgresql/timezone/America/Santiago
-share/postgresql/timezone/America/Bogota
-share/postgresql/timezone/America/Curacao
-share/postgresql/timezone/America/Guayaquil
-share/postgresql/timezone/America/Cayenne
-share/postgresql/timezone/America/Guyana
-share/postgresql/timezone/America/Asuncion
-share/postgresql/timezone/America/Lima
-share/postgresql/timezone/America/Paramaribo
-share/postgresql/timezone/America/Port_of_Spain
-share/postgresql/timezone/America/Montevideo
-share/postgresql/timezone/America/Caracas
-share/postgresql/timezone/America/Shiprock
-share/postgresql/timezone/America/Atka
-share/postgresql/timezone/America/Buenos_Aires
-share/postgresql/timezone/America/Catamarca
-share/postgresql/timezone/America/Cordoba
-share/postgresql/timezone/America/Ensenada
-share/postgresql/timezone/America/Fort_Wayne
-share/postgresql/timezone/America/Jujuy
-share/postgresql/timezone/America/Knox_IN
-share/postgresql/timezone/America/Mendoza
-share/postgresql/timezone/America/Porto_Acre
-share/postgresql/timezone/America/Rosario
-share/postgresql/timezone/America/Virgin
-share/postgresql/timezone/Etc/GMT
-share/postgresql/timezone/Etc/UTC
-share/postgresql/timezone/Etc/UCT
-share/postgresql/timezone/Etc/GMT-14
-share/postgresql/timezone/Etc/GMT-13
-share/postgresql/timezone/Etc/GMT-12
-share/postgresql/timezone/Etc/GMT-11
-share/postgresql/timezone/Etc/GMT-10
-share/postgresql/timezone/Etc/GMT-9
-share/postgresql/timezone/Etc/GMT-8
-share/postgresql/timezone/Etc/GMT-7
-share/postgresql/timezone/Etc/GMT-6
-share/postgresql/timezone/Etc/GMT-5
-share/postgresql/timezone/Etc/GMT-4
-share/postgresql/timezone/Etc/GMT-3
-share/postgresql/timezone/Etc/GMT-2
-share/postgresql/timezone/Etc/GMT-1
-share/postgresql/timezone/Etc/GMT+1
-share/postgresql/timezone/Etc/GMT+2
-share/postgresql/timezone/Etc/GMT+3
-share/postgresql/timezone/Etc/GMT+4
-share/postgresql/timezone/Etc/GMT+5
-share/postgresql/timezone/Etc/GMT+6
-share/postgresql/timezone/Etc/GMT+7
-share/postgresql/timezone/Etc/GMT+8
-share/postgresql/timezone/Etc/GMT+9
-share/postgresql/timezone/Etc/GMT+10
-share/postgresql/timezone/Etc/GMT+11
-share/postgresql/timezone/Etc/GMT+12
-share/postgresql/timezone/Etc/Universal
-share/postgresql/timezone/Etc/Zulu
-share/postgresql/timezone/Etc/Greenwich
-share/postgresql/timezone/Etc/GMT-0
-share/postgresql/timezone/Etc/GMT+0
-share/postgresql/timezone/Etc/GMT0
-share/postgresql/timezone/Factory
-share/postgresql/timezone/Arctic/Longyearbyen
-share/postgresql/timezone/EST5EDT
-share/postgresql/timezone/CST6CDT
-share/postgresql/timezone/MST7MDT
-share/postgresql/timezone/PST8PDT
-share/postgresql/timezone/EST
-share/postgresql/timezone/MST
-share/postgresql/timezone/HST
-share/postgresql/timezone/US/Pacific-New
-share/postgresql/timezone/US/Alaska
-share/postgresql/timezone/US/Aleutian
-share/postgresql/timezone/US/Arizona
-share/postgresql/timezone/US/Central
-share/postgresql/timezone/US/East-Indiana
-share/postgresql/timezone/US/Eastern
-share/postgresql/timezone/US/Hawaii
-share/postgresql/timezone/US/Indiana-Starke
-share/postgresql/timezone/US/Michigan
-share/postgresql/timezone/US/Mountain
-share/postgresql/timezone/US/Pacific
-share/postgresql/timezone/US/Samoa
-share/postgresql/timezone/GMT
share/postgresql/timezone/Brazil/Acre
share/postgresql/timezone/Brazil/DeNoronha
share/postgresql/timezone/Brazil/East
share/postgresql/timezone/Brazil/West
+share/postgresql/timezone/CET
+share/postgresql/timezone/CST6CDT
share/postgresql/timezone/Canada/Atlantic
share/postgresql/timezone/Canada/Central
share/postgresql/timezone/Canada/East-Saskatchewan
@@ -579,56 +493,211 @@ share/postgresql/timezone/Canada/Yukon
share/postgresql/timezone/Chile/Continental
share/postgresql/timezone/Chile/EasterIsland
share/postgresql/timezone/Cuba
+share/postgresql/timezone/EET
+share/postgresql/timezone/EST
+share/postgresql/timezone/EST5EDT
share/postgresql/timezone/Egypt
share/postgresql/timezone/Eire
+share/postgresql/timezone/Etc/GMT
+share/postgresql/timezone/Etc/GMT+0
+share/postgresql/timezone/Etc/GMT+1
+share/postgresql/timezone/Etc/GMT+10
+share/postgresql/timezone/Etc/GMT+11
+share/postgresql/timezone/Etc/GMT+12
+share/postgresql/timezone/Etc/GMT+2
+share/postgresql/timezone/Etc/GMT+3
+share/postgresql/timezone/Etc/GMT+4
+share/postgresql/timezone/Etc/GMT+5
+share/postgresql/timezone/Etc/GMT+6
+share/postgresql/timezone/Etc/GMT+7
+share/postgresql/timezone/Etc/GMT+8
+share/postgresql/timezone/Etc/GMT+9
+share/postgresql/timezone/Etc/GMT-0
+share/postgresql/timezone/Etc/GMT-1
+share/postgresql/timezone/Etc/GMT-10
+share/postgresql/timezone/Etc/GMT-11
+share/postgresql/timezone/Etc/GMT-12
+share/postgresql/timezone/Etc/GMT-13
+share/postgresql/timezone/Etc/GMT-14
+share/postgresql/timezone/Etc/GMT-2
+share/postgresql/timezone/Etc/GMT-3
+share/postgresql/timezone/Etc/GMT-4
+share/postgresql/timezone/Etc/GMT-5
+share/postgresql/timezone/Etc/GMT-6
+share/postgresql/timezone/Etc/GMT-7
+share/postgresql/timezone/Etc/GMT-8
+share/postgresql/timezone/Etc/GMT-9
+share/postgresql/timezone/Etc/GMT0
+share/postgresql/timezone/Etc/Greenwich
+share/postgresql/timezone/Etc/UCT
+share/postgresql/timezone/Etc/UTC
+share/postgresql/timezone/Etc/Universal
+share/postgresql/timezone/Etc/Zulu
+share/postgresql/timezone/Europe/Amsterdam
+share/postgresql/timezone/Europe/Andorra
+share/postgresql/timezone/Europe/Athens
+share/postgresql/timezone/Europe/Belfast
+share/postgresql/timezone/Europe/Belgrade
+share/postgresql/timezone/Europe/Berlin
+share/postgresql/timezone/Europe/Bratislava
+share/postgresql/timezone/Europe/Brussels
+share/postgresql/timezone/Europe/Bucharest
+share/postgresql/timezone/Europe/Budapest
+share/postgresql/timezone/Europe/Chisinau
+share/postgresql/timezone/Europe/Copenhagen
+share/postgresql/timezone/Europe/Dublin
+share/postgresql/timezone/Europe/Gibraltar
+share/postgresql/timezone/Europe/Guernsey
+share/postgresql/timezone/Europe/Helsinki
+share/postgresql/timezone/Europe/Isle_of_Man
+share/postgresql/timezone/Europe/Istanbul
+share/postgresql/timezone/Europe/Jersey
+share/postgresql/timezone/Europe/Kaliningrad
+share/postgresql/timezone/Europe/Kiev
+share/postgresql/timezone/Europe/Lisbon
+share/postgresql/timezone/Europe/Ljubljana
+share/postgresql/timezone/Europe/London
+share/postgresql/timezone/Europe/Luxembourg
+share/postgresql/timezone/Europe/Madrid
+share/postgresql/timezone/Europe/Malta
+share/postgresql/timezone/Europe/Mariehamn
+share/postgresql/timezone/Europe/Minsk
+share/postgresql/timezone/Europe/Monaco
+share/postgresql/timezone/Europe/Moscow
+share/postgresql/timezone/Europe/Nicosia
+share/postgresql/timezone/Europe/Oslo
+share/postgresql/timezone/Europe/Paris
+share/postgresql/timezone/Europe/Podgorica
+share/postgresql/timezone/Europe/Prague
+share/postgresql/timezone/Europe/Riga
+share/postgresql/timezone/Europe/Rome
+share/postgresql/timezone/Europe/Samara
+share/postgresql/timezone/Europe/San_Marino
+share/postgresql/timezone/Europe/Sarajevo
+share/postgresql/timezone/Europe/Simferopol
+share/postgresql/timezone/Europe/Skopje
+share/postgresql/timezone/Europe/Sofia
+share/postgresql/timezone/Europe/Stockholm
+share/postgresql/timezone/Europe/Tallinn
+share/postgresql/timezone/Europe/Tirane
+share/postgresql/timezone/Europe/Tiraspol
+share/postgresql/timezone/Europe/Uzhgorod
+share/postgresql/timezone/Europe/Vaduz
+share/postgresql/timezone/Europe/Vatican
+share/postgresql/timezone/Europe/Vienna
+share/postgresql/timezone/Europe/Vilnius
+share/postgresql/timezone/Europe/Volgograd
+share/postgresql/timezone/Europe/Warsaw
+share/postgresql/timezone/Europe/Zagreb
+share/postgresql/timezone/Europe/Zaporozhye
+share/postgresql/timezone/Europe/Zurich
+share/postgresql/timezone/Factory
share/postgresql/timezone/GB
share/postgresql/timezone/GB-Eire
+share/postgresql/timezone/GMT
share/postgresql/timezone/GMT+0
share/postgresql/timezone/GMT-0
share/postgresql/timezone/GMT0
share/postgresql/timezone/Greenwich
+share/postgresql/timezone/HST
share/postgresql/timezone/Hongkong
share/postgresql/timezone/Iceland
+share/postgresql/timezone/Indian/Antananarivo
+share/postgresql/timezone/Indian/Chagos
+share/postgresql/timezone/Indian/Christmas
+share/postgresql/timezone/Indian/Cocos
+share/postgresql/timezone/Indian/Comoro
+share/postgresql/timezone/Indian/Kerguelen
+share/postgresql/timezone/Indian/Mahe
+share/postgresql/timezone/Indian/Maldives
+share/postgresql/timezone/Indian/Mauritius
+share/postgresql/timezone/Indian/Mayotte
+share/postgresql/timezone/Indian/Reunion
share/postgresql/timezone/Iran
share/postgresql/timezone/Israel
share/postgresql/timezone/Jamaica
share/postgresql/timezone/Japan
share/postgresql/timezone/Kwajalein
share/postgresql/timezone/Libya
+share/postgresql/timezone/MET
+share/postgresql/timezone/MST
+share/postgresql/timezone/MST7MDT
share/postgresql/timezone/Mexico/BajaNorte
share/postgresql/timezone/Mexico/BajaSur
share/postgresql/timezone/Mexico/General
-share/postgresql/timezone/Navajo
+share/postgresql/timezone/Mideast/Riyadh87
+share/postgresql/timezone/Mideast/Riyadh88
+share/postgresql/timezone/Mideast/Riyadh89
share/postgresql/timezone/NZ
share/postgresql/timezone/NZ-CHAT
+share/postgresql/timezone/Navajo
+share/postgresql/timezone/PRC
+share/postgresql/timezone/PST8PDT
+share/postgresql/timezone/Pacific/Apia
+share/postgresql/timezone/Pacific/Auckland
+share/postgresql/timezone/Pacific/Chatham
+share/postgresql/timezone/Pacific/Easter
+share/postgresql/timezone/Pacific/Efate
+share/postgresql/timezone/Pacific/Enderbury
+share/postgresql/timezone/Pacific/Fakaofo
+share/postgresql/timezone/Pacific/Fiji
+share/postgresql/timezone/Pacific/Funafuti
+share/postgresql/timezone/Pacific/Galapagos
+share/postgresql/timezone/Pacific/Gambier
+share/postgresql/timezone/Pacific/Guadalcanal
+share/postgresql/timezone/Pacific/Guam
+share/postgresql/timezone/Pacific/Honolulu
+share/postgresql/timezone/Pacific/Johnston
+share/postgresql/timezone/Pacific/Kiritimati
+share/postgresql/timezone/Pacific/Kosrae
+share/postgresql/timezone/Pacific/Kwajalein
+share/postgresql/timezone/Pacific/Majuro
+share/postgresql/timezone/Pacific/Marquesas
+share/postgresql/timezone/Pacific/Midway
+share/postgresql/timezone/Pacific/Nauru
+share/postgresql/timezone/Pacific/Niue
+share/postgresql/timezone/Pacific/Norfolk
+share/postgresql/timezone/Pacific/Noumea
+share/postgresql/timezone/Pacific/Pago_Pago
+share/postgresql/timezone/Pacific/Palau
+share/postgresql/timezone/Pacific/Pitcairn
+share/postgresql/timezone/Pacific/Ponape
+share/postgresql/timezone/Pacific/Port_Moresby
+share/postgresql/timezone/Pacific/Rarotonga
+share/postgresql/timezone/Pacific/Saipan
+share/postgresql/timezone/Pacific/Samoa
+share/postgresql/timezone/Pacific/Tahiti
+share/postgresql/timezone/Pacific/Tarawa
+share/postgresql/timezone/Pacific/Tongatapu
+share/postgresql/timezone/Pacific/Truk
+share/postgresql/timezone/Pacific/Wake
+share/postgresql/timezone/Pacific/Wallis
+share/postgresql/timezone/Pacific/Yap
share/postgresql/timezone/Poland
share/postgresql/timezone/Portugal
-share/postgresql/timezone/PRC
share/postgresql/timezone/ROC
share/postgresql/timezone/ROK
share/postgresql/timezone/Singapore
share/postgresql/timezone/Turkey
share/postgresql/timezone/UCT
+share/postgresql/timezone/US/Alaska
+share/postgresql/timezone/US/Aleutian
+share/postgresql/timezone/US/Arizona
+share/postgresql/timezone/US/Central
+share/postgresql/timezone/US/East-Indiana
+share/postgresql/timezone/US/Eastern
+share/postgresql/timezone/US/Hawaii
+share/postgresql/timezone/US/Indiana-Starke
+share/postgresql/timezone/US/Michigan
+share/postgresql/timezone/US/Mountain
+share/postgresql/timezone/US/Pacific
+share/postgresql/timezone/US/Pacific-New
+share/postgresql/timezone/US/Samoa
share/postgresql/timezone/UTC
share/postgresql/timezone/Universal
share/postgresql/timezone/W-SU
+share/postgresql/timezone/WET
share/postgresql/timezone/Zulu
-share/postgresql/timezone/SystemV/AST4ADT
-share/postgresql/timezone/SystemV/EST5EDT
-share/postgresql/timezone/SystemV/CST6CDT
-share/postgresql/timezone/SystemV/MST7MDT
-share/postgresql/timezone/SystemV/PST8PDT
-share/postgresql/timezone/SystemV/YST9YDT
-share/postgresql/timezone/SystemV/AST4
-share/postgresql/timezone/SystemV/EST5
-share/postgresql/timezone/SystemV/CST6
-share/postgresql/timezone/SystemV/MST7
-share/postgresql/timezone/SystemV/PST8
-share/postgresql/timezone/SystemV/YST9
-share/postgresql/timezone/SystemV/HST10
-share/postgresql/timezone/Mideast/Riyadh87
-share/postgresql/timezone/Mideast/Riyadh88
-share/postgresql/timezone/Mideast/Riyadh89
@dirrm share/postgresql/timezone/Africa
@dirrm share/postgresql/timezone/America/Argentina
@dirrm share/postgresql/timezone/America/Indiana
@@ -649,7 +718,6 @@ share/postgresql/timezone/Mideast/Riyadh89
@dirrm share/postgresql/timezone/Mexico
@dirrm share/postgresql/timezone/Mideast
@dirrm share/postgresql/timezone/Pacific
-@dirrm share/postgresql/timezone/SystemV
@dirrm share/postgresql/timezone/US
@dirrm share/postgresql/timezone
@unexec if cmp -s ~pgsql/.profile %D/share/postgresql/dot.profile.dist; then rm -f ~pgsql/.profile; fi
diff --git a/databases/postgresql82-client/Makefile b/databases/postgresql82-client/Makefile
index 2e9a4c6cbf92..532b039772da 100644
--- a/databases/postgresql82-client/Makefile
+++ b/databases/postgresql82-client/Makefile
@@ -15,7 +15,9 @@ COMMENT= PostgreSQL database (client)
MASTERDIR= ${.CURDIR}/../postgresql82-server
-BUILD_DIRS= config src/include src/interfaces src/bin doc src/makefiles
+BUILD_DIRS= config src/include src/interfaces \
+ src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
+ doc src/makefiles
CLIENT_ONLY= yes
INSTALLS_SHLIB= yes
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index a53327a9c48c..783a1c4fc97e 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME?= postgresql
-PORTVERSION?= 8.2.0
+PORTVERSION?= 8.2.1
PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
@@ -46,7 +46,8 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
BUILD_DIRS?= src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
- src/pl config
+ src/bin/initdb src/bin/ipcclean src/bin/pg_ctl src/bin/pg_controldata \
+ src/bin/pg_resetxlog src/pl
INSTALL_DIRS?= ${BUILD_DIRS}
diff --git a/databases/postgresql82-server/distinfo b/databases/postgresql82-server/distinfo
index b74b1dd6b22d..7e8db647da52 100644
--- a/databases/postgresql82-server/distinfo
+++ b/databases/postgresql82-server/distinfo
@@ -1,15 +1,12 @@
-MD5 (postgresql/postgresql-base-8.2.0.tar.bz2) = c827602068e8d3ba20d575c87d102932
-SHA256 (postgresql/postgresql-base-8.2.0.tar.bz2) = 26544b843761b5acc4c3452ac3403e67cbe5d4a486583242bb6f4c77810b4284
-SIZE (postgresql/postgresql-base-8.2.0.tar.bz2) = 8483588
-MD5 (postgresql/postgresql-opt-8.2.0.tar.bz2) = d0bf0284ae3ae6ea56f6b08427f7ab9a
-SHA256 (postgresql/postgresql-opt-8.2.0.tar.bz2) = 06a016bf72a33061c4f297f15d32b8aadd742bfe54256573e59bb7916ec3df29
-SIZE (postgresql/postgresql-opt-8.2.0.tar.bz2) = 167666
-MD5 (postgresql/postgresql-docs-8.2.0.tar.bz2) = 4221311dc619659344b8e03ddbaa249b
-SHA256 (postgresql/postgresql-docs-8.2.0.tar.bz2) = 30096acf2d6c0bf5937571625de2d477586f0e5989ee8d56c58868bc738d4f2e
-SIZE (postgresql/postgresql-docs-8.2.0.tar.bz2) = 2744490
-MD5 (postgresql/postgresql-test-8.2.0.tar.bz2) = 0269ab5b70f9b677a97a856c3e46a5f5
-SHA256 (postgresql/postgresql-test-8.2.0.tar.bz2) = 695c82bb987fb0fcc09c059b7da914164fd1577d5ab8873d7371ec398e47dff5
-SIZE (postgresql/postgresql-test-8.2.0.tar.bz2) = 985281
-MD5 (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 2eb31538f3ee367767aeacd95b11d623
-SHA256 (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 8dea05bdbc2b78426b159f628b693f69da17b930fe4882e166d5e8a3e698b7d9
-SIZE (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 3987
+MD5 (postgresql/postgresql-base-8.2.1.tar.bz2) = 7f20da3764ea2ff7329a6570da89926a
+SHA256 (postgresql/postgresql-base-8.2.1.tar.bz2) = 99aa1b8d3f0f53f5fd138103052f5111310c061b25c0293dd9f93dc3fd6fda5c
+SIZE (postgresql/postgresql-base-8.2.1.tar.bz2) = 8483464
+MD5 (postgresql/postgresql-opt-8.2.1.tar.bz2) = 018aaf094027456d4708d97320c86eaa
+SHA256 (postgresql/postgresql-opt-8.2.1.tar.bz2) = 9a542c79c2983322c621b4086ae78e1d7c3bb841c95283e45e7bced73d975422
+SIZE (postgresql/postgresql-opt-8.2.1.tar.bz2) = 167629
+MD5 (postgresql/postgresql-docs-8.2.1.tar.bz2) = 62629d436573b97326e7bb56495a8609
+SHA256 (postgresql/postgresql-docs-8.2.1.tar.bz2) = 76544837b2241b1e5c00cce3118584499a902e948b0d5c0a7465535b21f22843
+SIZE (postgresql/postgresql-docs-8.2.1.tar.bz2) = 2750394
+MD5 (postgresql/postgresql-test-8.2.1.tar.bz2) = fefc23962bda107bc24d799996b11a92
+SHA256 (postgresql/postgresql-test-8.2.1.tar.bz2) = fa6835d4d68215dac9fc6242ea974aea671c3be1565fb84ce40b28c209a89fe3
+SIZE (postgresql/postgresql-test-8.2.1.tar.bz2) = 985153
diff --git a/databases/postgresql82-server/files/postgresql.in b/databases/postgresql82-server/files/postgresql.in
index a44c713d6b25..1b3b4226acdf 100644
--- a/databases/postgresql82-server/files/postgresql.in
+++ b/databases/postgresql82-server/files/postgresql.in
@@ -12,7 +12,7 @@
# # optional
# postgresql_data="%%PREFIX%%/pgsql/data"
# postgresql_flags="-w -s -m fast"
-# postgresql_initdb_flags="--encoding=utf-8 --lc_collate=C"
+# postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
# postgresql_class="default"
#
# See %%PREFIX%%/share/doc/postgresql/README-server for more info
@@ -36,7 +36,7 @@ postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
postgresql_user=pgsql
eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data"}
postgresql_class=${postgresql_class:-"default"}
-postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc_collate=C"}
+postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
name=postgresql
rcvar=`set_rcvar`
@@ -58,7 +58,7 @@ postgresql_command()
postgresql_initdb()
{
- su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb -D ${postgresql_data}"
+ su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
}
run_rc_command "$1"
diff --git a/databases/postgresql82-server/pkg-plist-client b/databases/postgresql82-server/pkg-plist-client
index a88eb5761102..38e92046904b 100644
--- a/databases/postgresql82-server/pkg-plist-client
+++ b/databases/postgresql82-server/pkg-plist-client
@@ -6,14 +6,9 @@ bin/dropdb
bin/droplang
bin/dropuser
bin/ecpg
-bin/initdb
-bin/ipcclean
bin/pg_config
-bin/pg_controldata
-bin/pg_ctl
bin/pg_dump
bin/pg_dumpall
-bin/pg_resetxlog
bin/pg_restore
bin/psql
bin/reindexdb
@@ -455,151 +450,85 @@ share/postgresql/pg_service.conf.sample
share/postgresql/psqlrc.sample
@dirrmtry share/postgresql
%%GETTEXT%%share/locale/af/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fa/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/fa/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/pl/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
diff --git a/databases/postgresql82-server/pkg-plist-server b/databases/postgresql82-server/pkg-plist-server
index bea3bfc7c0ec..696e19d28e70 100644
--- a/databases/postgresql82-server/pkg-plist-server
+++ b/databases/postgresql82-server/pkg-plist-server
@@ -1,3 +1,8 @@
+bin/initdb
+bin/ipcclean
+bin/pg_controldata
+bin/pg_ctl
+bin/pg_resetxlog
bin/postmaster
bin/postgres
etc/periodic/daily/502.pgsql
@@ -39,23 +44,89 @@ share/postgresql/recovery.conf.sample
share/postgresql/sql_features.txt
share/postgresql/system_views.sql
%%GETTEXT%%share/locale/af/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/fa/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
%%GETTEXT%%@dirrmtry share/locale/cs
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index a53327a9c48c..783a1c4fc97e 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME?= postgresql
-PORTVERSION?= 8.2.0
+PORTVERSION?= 8.2.1
PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
@@ -46,7 +46,8 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
BUILD_DIRS?= src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
- src/pl config
+ src/bin/initdb src/bin/ipcclean src/bin/pg_ctl src/bin/pg_controldata \
+ src/bin/pg_resetxlog src/pl
INSTALL_DIRS?= ${BUILD_DIRS}
diff --git a/databases/postgresql83-server/distinfo b/databases/postgresql83-server/distinfo
index b74b1dd6b22d..7e8db647da52 100644
--- a/databases/postgresql83-server/distinfo
+++ b/databases/postgresql83-server/distinfo
@@ -1,15 +1,12 @@
-MD5 (postgresql/postgresql-base-8.2.0.tar.bz2) = c827602068e8d3ba20d575c87d102932
-SHA256 (postgresql/postgresql-base-8.2.0.tar.bz2) = 26544b843761b5acc4c3452ac3403e67cbe5d4a486583242bb6f4c77810b4284
-SIZE (postgresql/postgresql-base-8.2.0.tar.bz2) = 8483588
-MD5 (postgresql/postgresql-opt-8.2.0.tar.bz2) = d0bf0284ae3ae6ea56f6b08427f7ab9a
-SHA256 (postgresql/postgresql-opt-8.2.0.tar.bz2) = 06a016bf72a33061c4f297f15d32b8aadd742bfe54256573e59bb7916ec3df29
-SIZE (postgresql/postgresql-opt-8.2.0.tar.bz2) = 167666
-MD5 (postgresql/postgresql-docs-8.2.0.tar.bz2) = 4221311dc619659344b8e03ddbaa249b
-SHA256 (postgresql/postgresql-docs-8.2.0.tar.bz2) = 30096acf2d6c0bf5937571625de2d477586f0e5989ee8d56c58868bc738d4f2e
-SIZE (postgresql/postgresql-docs-8.2.0.tar.bz2) = 2744490
-MD5 (postgresql/postgresql-test-8.2.0.tar.bz2) = 0269ab5b70f9b677a97a856c3e46a5f5
-SHA256 (postgresql/postgresql-test-8.2.0.tar.bz2) = 695c82bb987fb0fcc09c059b7da914164fd1577d5ab8873d7371ec398e47dff5
-SIZE (postgresql/postgresql-test-8.2.0.tar.bz2) = 985281
-MD5 (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 2eb31538f3ee367767aeacd95b11d623
-SHA256 (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 8dea05bdbc2b78426b159f628b693f69da17b930fe4882e166d5e8a3e698b7d9
-SIZE (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 3987
+MD5 (postgresql/postgresql-base-8.2.1.tar.bz2) = 7f20da3764ea2ff7329a6570da89926a
+SHA256 (postgresql/postgresql-base-8.2.1.tar.bz2) = 99aa1b8d3f0f53f5fd138103052f5111310c061b25c0293dd9f93dc3fd6fda5c
+SIZE (postgresql/postgresql-base-8.2.1.tar.bz2) = 8483464
+MD5 (postgresql/postgresql-opt-8.2.1.tar.bz2) = 018aaf094027456d4708d97320c86eaa
+SHA256 (postgresql/postgresql-opt-8.2.1.tar.bz2) = 9a542c79c2983322c621b4086ae78e1d7c3bb841c95283e45e7bced73d975422
+SIZE (postgresql/postgresql-opt-8.2.1.tar.bz2) = 167629
+MD5 (postgresql/postgresql-docs-8.2.1.tar.bz2) = 62629d436573b97326e7bb56495a8609
+SHA256 (postgresql/postgresql-docs-8.2.1.tar.bz2) = 76544837b2241b1e5c00cce3118584499a902e948b0d5c0a7465535b21f22843
+SIZE (postgresql/postgresql-docs-8.2.1.tar.bz2) = 2750394
+MD5 (postgresql/postgresql-test-8.2.1.tar.bz2) = fefc23962bda107bc24d799996b11a92
+SHA256 (postgresql/postgresql-test-8.2.1.tar.bz2) = fa6835d4d68215dac9fc6242ea974aea671c3be1565fb84ce40b28c209a89fe3
+SIZE (postgresql/postgresql-test-8.2.1.tar.bz2) = 985153
diff --git a/databases/postgresql83-server/files/postgresql.in b/databases/postgresql83-server/files/postgresql.in
index a44c713d6b25..1b3b4226acdf 100644
--- a/databases/postgresql83-server/files/postgresql.in
+++ b/databases/postgresql83-server/files/postgresql.in
@@ -12,7 +12,7 @@
# # optional
# postgresql_data="%%PREFIX%%/pgsql/data"
# postgresql_flags="-w -s -m fast"
-# postgresql_initdb_flags="--encoding=utf-8 --lc_collate=C"
+# postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
# postgresql_class="default"
#
# See %%PREFIX%%/share/doc/postgresql/README-server for more info
@@ -36,7 +36,7 @@ postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
postgresql_user=pgsql
eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data"}
postgresql_class=${postgresql_class:-"default"}
-postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc_collate=C"}
+postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
name=postgresql
rcvar=`set_rcvar`
@@ -58,7 +58,7 @@ postgresql_command()
postgresql_initdb()
{
- su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb -D ${postgresql_data}"
+ su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
}
run_rc_command "$1"
diff --git a/databases/postgresql83-server/pkg-plist-client b/databases/postgresql83-server/pkg-plist-client
index a88eb5761102..38e92046904b 100644
--- a/databases/postgresql83-server/pkg-plist-client
+++ b/databases/postgresql83-server/pkg-plist-client
@@ -6,14 +6,9 @@ bin/dropdb
bin/droplang
bin/dropuser
bin/ecpg
-bin/initdb
-bin/ipcclean
bin/pg_config
-bin/pg_controldata
-bin/pg_ctl
bin/pg_dump
bin/pg_dumpall
-bin/pg_resetxlog
bin/pg_restore
bin/psql
bin/reindexdb
@@ -455,151 +450,85 @@ share/postgresql/pg_service.conf.sample
share/postgresql/psqlrc.sample
@dirrmtry share/postgresql
%%GETTEXT%%share/locale/af/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fa/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/fa/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/pl/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
diff --git a/databases/postgresql83-server/pkg-plist-server b/databases/postgresql83-server/pkg-plist-server
index bea3bfc7c0ec..696e19d28e70 100644
--- a/databases/postgresql83-server/pkg-plist-server
+++ b/databases/postgresql83-server/pkg-plist-server
@@ -1,3 +1,8 @@
+bin/initdb
+bin/ipcclean
+bin/pg_controldata
+bin/pg_ctl
+bin/pg_resetxlog
bin/postmaster
bin/postgres
etc/periodic/daily/502.pgsql
@@ -39,23 +44,89 @@ share/postgresql/recovery.conf.sample
share/postgresql/sql_features.txt
share/postgresql/system_views.sql
%%GETTEXT%%share/locale/af/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/fa/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
%%GETTEXT%%@dirrmtry share/locale/cs
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index a53327a9c48c..783a1c4fc97e 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME?= postgresql
-PORTVERSION?= 8.2.0
+PORTVERSION?= 8.2.1
PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
@@ -46,7 +46,8 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
BUILD_DIRS?= src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
- src/pl config
+ src/bin/initdb src/bin/ipcclean src/bin/pg_ctl src/bin/pg_controldata \
+ src/bin/pg_resetxlog src/pl
INSTALL_DIRS?= ${BUILD_DIRS}
diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo
index b74b1dd6b22d..7e8db647da52 100644
--- a/databases/postgresql84-server/distinfo
+++ b/databases/postgresql84-server/distinfo
@@ -1,15 +1,12 @@
-MD5 (postgresql/postgresql-base-8.2.0.tar.bz2) = c827602068e8d3ba20d575c87d102932
-SHA256 (postgresql/postgresql-base-8.2.0.tar.bz2) = 26544b843761b5acc4c3452ac3403e67cbe5d4a486583242bb6f4c77810b4284
-SIZE (postgresql/postgresql-base-8.2.0.tar.bz2) = 8483588
-MD5 (postgresql/postgresql-opt-8.2.0.tar.bz2) = d0bf0284ae3ae6ea56f6b08427f7ab9a
-SHA256 (postgresql/postgresql-opt-8.2.0.tar.bz2) = 06a016bf72a33061c4f297f15d32b8aadd742bfe54256573e59bb7916ec3df29
-SIZE (postgresql/postgresql-opt-8.2.0.tar.bz2) = 167666
-MD5 (postgresql/postgresql-docs-8.2.0.tar.bz2) = 4221311dc619659344b8e03ddbaa249b
-SHA256 (postgresql/postgresql-docs-8.2.0.tar.bz2) = 30096acf2d6c0bf5937571625de2d477586f0e5989ee8d56c58868bc738d4f2e
-SIZE (postgresql/postgresql-docs-8.2.0.tar.bz2) = 2744490
-MD5 (postgresql/postgresql-test-8.2.0.tar.bz2) = 0269ab5b70f9b677a97a856c3e46a5f5
-SHA256 (postgresql/postgresql-test-8.2.0.tar.bz2) = 695c82bb987fb0fcc09c059b7da914164fd1577d5ab8873d7371ec398e47dff5
-SIZE (postgresql/postgresql-test-8.2.0.tar.bz2) = 985281
-MD5 (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 2eb31538f3ee367767aeacd95b11d623
-SHA256 (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 8dea05bdbc2b78426b159f628b693f69da17b930fe4882e166d5e8a3e698b7d9
-SIZE (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 3987
+MD5 (postgresql/postgresql-base-8.2.1.tar.bz2) = 7f20da3764ea2ff7329a6570da89926a
+SHA256 (postgresql/postgresql-base-8.2.1.tar.bz2) = 99aa1b8d3f0f53f5fd138103052f5111310c061b25c0293dd9f93dc3fd6fda5c
+SIZE (postgresql/postgresql-base-8.2.1.tar.bz2) = 8483464
+MD5 (postgresql/postgresql-opt-8.2.1.tar.bz2) = 018aaf094027456d4708d97320c86eaa
+SHA256 (postgresql/postgresql-opt-8.2.1.tar.bz2) = 9a542c79c2983322c621b4086ae78e1d7c3bb841c95283e45e7bced73d975422
+SIZE (postgresql/postgresql-opt-8.2.1.tar.bz2) = 167629
+MD5 (postgresql/postgresql-docs-8.2.1.tar.bz2) = 62629d436573b97326e7bb56495a8609
+SHA256 (postgresql/postgresql-docs-8.2.1.tar.bz2) = 76544837b2241b1e5c00cce3118584499a902e948b0d5c0a7465535b21f22843
+SIZE (postgresql/postgresql-docs-8.2.1.tar.bz2) = 2750394
+MD5 (postgresql/postgresql-test-8.2.1.tar.bz2) = fefc23962bda107bc24d799996b11a92
+SHA256 (postgresql/postgresql-test-8.2.1.tar.bz2) = fa6835d4d68215dac9fc6242ea974aea671c3be1565fb84ce40b28c209a89fe3
+SIZE (postgresql/postgresql-test-8.2.1.tar.bz2) = 985153
diff --git a/databases/postgresql84-server/files/postgresql.in b/databases/postgresql84-server/files/postgresql.in
index a44c713d6b25..1b3b4226acdf 100644
--- a/databases/postgresql84-server/files/postgresql.in
+++ b/databases/postgresql84-server/files/postgresql.in
@@ -12,7 +12,7 @@
# # optional
# postgresql_data="%%PREFIX%%/pgsql/data"
# postgresql_flags="-w -s -m fast"
-# postgresql_initdb_flags="--encoding=utf-8 --lc_collate=C"
+# postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
# postgresql_class="default"
#
# See %%PREFIX%%/share/doc/postgresql/README-server for more info
@@ -36,7 +36,7 @@ postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
postgresql_user=pgsql
eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data"}
postgresql_class=${postgresql_class:-"default"}
-postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc_collate=C"}
+postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
name=postgresql
rcvar=`set_rcvar`
@@ -58,7 +58,7 @@ postgresql_command()
postgresql_initdb()
{
- su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb -D ${postgresql_data}"
+ su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
}
run_rc_command "$1"
diff --git a/databases/postgresql84-server/pkg-plist-client b/databases/postgresql84-server/pkg-plist-client
index a88eb5761102..38e92046904b 100644
--- a/databases/postgresql84-server/pkg-plist-client
+++ b/databases/postgresql84-server/pkg-plist-client
@@ -6,14 +6,9 @@ bin/dropdb
bin/droplang
bin/dropuser
bin/ecpg
-bin/initdb
-bin/ipcclean
bin/pg_config
-bin/pg_controldata
-bin/pg_ctl
bin/pg_dump
bin/pg_dumpall
-bin/pg_resetxlog
bin/pg_restore
bin/psql
bin/reindexdb
@@ -455,151 +450,85 @@ share/postgresql/pg_service.conf.sample
share/postgresql/psqlrc.sample
@dirrmtry share/postgresql
%%GETTEXT%%share/locale/af/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fa/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/fa/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/pl/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
diff --git a/databases/postgresql84-server/pkg-plist-server b/databases/postgresql84-server/pkg-plist-server
index bea3bfc7c0ec..696e19d28e70 100644
--- a/databases/postgresql84-server/pkg-plist-server
+++ b/databases/postgresql84-server/pkg-plist-server
@@ -1,3 +1,8 @@
+bin/initdb
+bin/ipcclean
+bin/pg_controldata
+bin/pg_ctl
+bin/pg_resetxlog
bin/postmaster
bin/postgres
etc/periodic/daily/502.pgsql
@@ -39,23 +44,89 @@ share/postgresql/recovery.conf.sample
share/postgresql/sql_features.txt
share/postgresql/system_views.sql
%%GETTEXT%%share/locale/af/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/fa/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
%%GETTEXT%%@dirrmtry share/locale/cs
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index a53327a9c48c..783a1c4fc97e 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME?= postgresql
-PORTVERSION?= 8.2.0
+PORTVERSION?= 8.2.1
PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
@@ -46,7 +46,8 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
BUILD_DIRS?= src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
- src/pl config
+ src/bin/initdb src/bin/ipcclean src/bin/pg_ctl src/bin/pg_controldata \
+ src/bin/pg_resetxlog src/pl
INSTALL_DIRS?= ${BUILD_DIRS}
diff --git a/databases/postgresql90-server/distinfo b/databases/postgresql90-server/distinfo
index b74b1dd6b22d..7e8db647da52 100644
--- a/databases/postgresql90-server/distinfo
+++ b/databases/postgresql90-server/distinfo
@@ -1,15 +1,12 @@
-MD5 (postgresql/postgresql-base-8.2.0.tar.bz2) = c827602068e8d3ba20d575c87d102932
-SHA256 (postgresql/postgresql-base-8.2.0.tar.bz2) = 26544b843761b5acc4c3452ac3403e67cbe5d4a486583242bb6f4c77810b4284
-SIZE (postgresql/postgresql-base-8.2.0.tar.bz2) = 8483588
-MD5 (postgresql/postgresql-opt-8.2.0.tar.bz2) = d0bf0284ae3ae6ea56f6b08427f7ab9a
-SHA256 (postgresql/postgresql-opt-8.2.0.tar.bz2) = 06a016bf72a33061c4f297f15d32b8aadd742bfe54256573e59bb7916ec3df29
-SIZE (postgresql/postgresql-opt-8.2.0.tar.bz2) = 167666
-MD5 (postgresql/postgresql-docs-8.2.0.tar.bz2) = 4221311dc619659344b8e03ddbaa249b
-SHA256 (postgresql/postgresql-docs-8.2.0.tar.bz2) = 30096acf2d6c0bf5937571625de2d477586f0e5989ee8d56c58868bc738d4f2e
-SIZE (postgresql/postgresql-docs-8.2.0.tar.bz2) = 2744490
-MD5 (postgresql/postgresql-test-8.2.0.tar.bz2) = 0269ab5b70f9b677a97a856c3e46a5f5
-SHA256 (postgresql/postgresql-test-8.2.0.tar.bz2) = 695c82bb987fb0fcc09c059b7da914164fd1577d5ab8873d7371ec398e47dff5
-SIZE (postgresql/postgresql-test-8.2.0.tar.bz2) = 985281
-MD5 (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 2eb31538f3ee367767aeacd95b11d623
-SHA256 (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 8dea05bdbc2b78426b159f628b693f69da17b930fe4882e166d5e8a3e698b7d9
-SIZE (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 3987
+MD5 (postgresql/postgresql-base-8.2.1.tar.bz2) = 7f20da3764ea2ff7329a6570da89926a
+SHA256 (postgresql/postgresql-base-8.2.1.tar.bz2) = 99aa1b8d3f0f53f5fd138103052f5111310c061b25c0293dd9f93dc3fd6fda5c
+SIZE (postgresql/postgresql-base-8.2.1.tar.bz2) = 8483464
+MD5 (postgresql/postgresql-opt-8.2.1.tar.bz2) = 018aaf094027456d4708d97320c86eaa
+SHA256 (postgresql/postgresql-opt-8.2.1.tar.bz2) = 9a542c79c2983322c621b4086ae78e1d7c3bb841c95283e45e7bced73d975422
+SIZE (postgresql/postgresql-opt-8.2.1.tar.bz2) = 167629
+MD5 (postgresql/postgresql-docs-8.2.1.tar.bz2) = 62629d436573b97326e7bb56495a8609
+SHA256 (postgresql/postgresql-docs-8.2.1.tar.bz2) = 76544837b2241b1e5c00cce3118584499a902e948b0d5c0a7465535b21f22843
+SIZE (postgresql/postgresql-docs-8.2.1.tar.bz2) = 2750394
+MD5 (postgresql/postgresql-test-8.2.1.tar.bz2) = fefc23962bda107bc24d799996b11a92
+SHA256 (postgresql/postgresql-test-8.2.1.tar.bz2) = fa6835d4d68215dac9fc6242ea974aea671c3be1565fb84ce40b28c209a89fe3
+SIZE (postgresql/postgresql-test-8.2.1.tar.bz2) = 985153
diff --git a/databases/postgresql90-server/files/postgresql.in b/databases/postgresql90-server/files/postgresql.in
index a44c713d6b25..1b3b4226acdf 100644
--- a/databases/postgresql90-server/files/postgresql.in
+++ b/databases/postgresql90-server/files/postgresql.in
@@ -12,7 +12,7 @@
# # optional
# postgresql_data="%%PREFIX%%/pgsql/data"
# postgresql_flags="-w -s -m fast"
-# postgresql_initdb_flags="--encoding=utf-8 --lc_collate=C"
+# postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
# postgresql_class="default"
#
# See %%PREFIX%%/share/doc/postgresql/README-server for more info
@@ -36,7 +36,7 @@ postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
postgresql_user=pgsql
eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data"}
postgresql_class=${postgresql_class:-"default"}
-postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc_collate=C"}
+postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
name=postgresql
rcvar=`set_rcvar`
@@ -58,7 +58,7 @@ postgresql_command()
postgresql_initdb()
{
- su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb -D ${postgresql_data}"
+ su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
}
run_rc_command "$1"
diff --git a/databases/postgresql90-server/pkg-plist-client b/databases/postgresql90-server/pkg-plist-client
index a88eb5761102..38e92046904b 100644
--- a/databases/postgresql90-server/pkg-plist-client
+++ b/databases/postgresql90-server/pkg-plist-client
@@ -6,14 +6,9 @@ bin/dropdb
bin/droplang
bin/dropuser
bin/ecpg
-bin/initdb
-bin/ipcclean
bin/pg_config
-bin/pg_controldata
-bin/pg_ctl
bin/pg_dump
bin/pg_dumpall
-bin/pg_resetxlog
bin/pg_restore
bin/psql
bin/reindexdb
@@ -455,151 +450,85 @@ share/postgresql/pg_service.conf.sample
share/postgresql/psqlrc.sample
@dirrmtry share/postgresql
%%GETTEXT%%share/locale/af/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fa/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/fa/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/pl/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
diff --git a/databases/postgresql90-server/pkg-plist-server b/databases/postgresql90-server/pkg-plist-server
index bea3bfc7c0ec..696e19d28e70 100644
--- a/databases/postgresql90-server/pkg-plist-server
+++ b/databases/postgresql90-server/pkg-plist-server
@@ -1,3 +1,8 @@
+bin/initdb
+bin/ipcclean
+bin/pg_controldata
+bin/pg_ctl
+bin/pg_resetxlog
bin/postmaster
bin/postgres
etc/periodic/daily/502.pgsql
@@ -39,23 +44,89 @@ share/postgresql/recovery.conf.sample
share/postgresql/sql_features.txt
share/postgresql/system_views.sql
%%GETTEXT%%share/locale/af/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/fa/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
%%GETTEXT%%@dirrmtry share/locale/cs
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index a53327a9c48c..783a1c4fc97e 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME?= postgresql
-PORTVERSION?= 8.2.0
+PORTVERSION?= 8.2.1
PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
@@ -46,7 +46,8 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
BUILD_DIRS?= src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
- src/pl config
+ src/bin/initdb src/bin/ipcclean src/bin/pg_ctl src/bin/pg_controldata \
+ src/bin/pg_resetxlog src/pl
INSTALL_DIRS?= ${BUILD_DIRS}
diff --git a/databases/postgresql91-server/distinfo b/databases/postgresql91-server/distinfo
index b74b1dd6b22d..7e8db647da52 100644
--- a/databases/postgresql91-server/distinfo
+++ b/databases/postgresql91-server/distinfo
@@ -1,15 +1,12 @@
-MD5 (postgresql/postgresql-base-8.2.0.tar.bz2) = c827602068e8d3ba20d575c87d102932
-SHA256 (postgresql/postgresql-base-8.2.0.tar.bz2) = 26544b843761b5acc4c3452ac3403e67cbe5d4a486583242bb6f4c77810b4284
-SIZE (postgresql/postgresql-base-8.2.0.tar.bz2) = 8483588
-MD5 (postgresql/postgresql-opt-8.2.0.tar.bz2) = d0bf0284ae3ae6ea56f6b08427f7ab9a
-SHA256 (postgresql/postgresql-opt-8.2.0.tar.bz2) = 06a016bf72a33061c4f297f15d32b8aadd742bfe54256573e59bb7916ec3df29
-SIZE (postgresql/postgresql-opt-8.2.0.tar.bz2) = 167666
-MD5 (postgresql/postgresql-docs-8.2.0.tar.bz2) = 4221311dc619659344b8e03ddbaa249b
-SHA256 (postgresql/postgresql-docs-8.2.0.tar.bz2) = 30096acf2d6c0bf5937571625de2d477586f0e5989ee8d56c58868bc738d4f2e
-SIZE (postgresql/postgresql-docs-8.2.0.tar.bz2) = 2744490
-MD5 (postgresql/postgresql-test-8.2.0.tar.bz2) = 0269ab5b70f9b677a97a856c3e46a5f5
-SHA256 (postgresql/postgresql-test-8.2.0.tar.bz2) = 695c82bb987fb0fcc09c059b7da914164fd1577d5ab8873d7371ec398e47dff5
-SIZE (postgresql/postgresql-test-8.2.0.tar.bz2) = 985281
-MD5 (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 2eb31538f3ee367767aeacd95b11d623
-SHA256 (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 8dea05bdbc2b78426b159f628b693f69da17b930fe4882e166d5e8a3e698b7d9
-SIZE (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 3987
+MD5 (postgresql/postgresql-base-8.2.1.tar.bz2) = 7f20da3764ea2ff7329a6570da89926a
+SHA256 (postgresql/postgresql-base-8.2.1.tar.bz2) = 99aa1b8d3f0f53f5fd138103052f5111310c061b25c0293dd9f93dc3fd6fda5c
+SIZE (postgresql/postgresql-base-8.2.1.tar.bz2) = 8483464
+MD5 (postgresql/postgresql-opt-8.2.1.tar.bz2) = 018aaf094027456d4708d97320c86eaa
+SHA256 (postgresql/postgresql-opt-8.2.1.tar.bz2) = 9a542c79c2983322c621b4086ae78e1d7c3bb841c95283e45e7bced73d975422
+SIZE (postgresql/postgresql-opt-8.2.1.tar.bz2) = 167629
+MD5 (postgresql/postgresql-docs-8.2.1.tar.bz2) = 62629d436573b97326e7bb56495a8609
+SHA256 (postgresql/postgresql-docs-8.2.1.tar.bz2) = 76544837b2241b1e5c00cce3118584499a902e948b0d5c0a7465535b21f22843
+SIZE (postgresql/postgresql-docs-8.2.1.tar.bz2) = 2750394
+MD5 (postgresql/postgresql-test-8.2.1.tar.bz2) = fefc23962bda107bc24d799996b11a92
+SHA256 (postgresql/postgresql-test-8.2.1.tar.bz2) = fa6835d4d68215dac9fc6242ea974aea671c3be1565fb84ce40b28c209a89fe3
+SIZE (postgresql/postgresql-test-8.2.1.tar.bz2) = 985153
diff --git a/databases/postgresql91-server/files/postgresql.in b/databases/postgresql91-server/files/postgresql.in
index a44c713d6b25..1b3b4226acdf 100644
--- a/databases/postgresql91-server/files/postgresql.in
+++ b/databases/postgresql91-server/files/postgresql.in
@@ -12,7 +12,7 @@
# # optional
# postgresql_data="%%PREFIX%%/pgsql/data"
# postgresql_flags="-w -s -m fast"
-# postgresql_initdb_flags="--encoding=utf-8 --lc_collate=C"
+# postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
# postgresql_class="default"
#
# See %%PREFIX%%/share/doc/postgresql/README-server for more info
@@ -36,7 +36,7 @@ postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
postgresql_user=pgsql
eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data"}
postgresql_class=${postgresql_class:-"default"}
-postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc_collate=C"}
+postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
name=postgresql
rcvar=`set_rcvar`
@@ -58,7 +58,7 @@ postgresql_command()
postgresql_initdb()
{
- su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb -D ${postgresql_data}"
+ su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
}
run_rc_command "$1"
diff --git a/databases/postgresql91-server/pkg-plist-client b/databases/postgresql91-server/pkg-plist-client
index a88eb5761102..38e92046904b 100644
--- a/databases/postgresql91-server/pkg-plist-client
+++ b/databases/postgresql91-server/pkg-plist-client
@@ -6,14 +6,9 @@ bin/dropdb
bin/droplang
bin/dropuser
bin/ecpg
-bin/initdb
-bin/ipcclean
bin/pg_config
-bin/pg_controldata
-bin/pg_ctl
bin/pg_dump
bin/pg_dumpall
-bin/pg_resetxlog
bin/pg_restore
bin/psql
bin/reindexdb
@@ -455,151 +450,85 @@ share/postgresql/pg_service.conf.sample
share/postgresql/psqlrc.sample
@dirrmtry share/postgresql
%%GETTEXT%%share/locale/af/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fa/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/fa/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/pl/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
diff --git a/databases/postgresql91-server/pkg-plist-server b/databases/postgresql91-server/pkg-plist-server
index bea3bfc7c0ec..696e19d28e70 100644
--- a/databases/postgresql91-server/pkg-plist-server
+++ b/databases/postgresql91-server/pkg-plist-server
@@ -1,3 +1,8 @@
+bin/initdb
+bin/ipcclean
+bin/pg_controldata
+bin/pg_ctl
+bin/pg_resetxlog
bin/postmaster
bin/postgres
etc/periodic/daily/502.pgsql
@@ -39,23 +44,89 @@ share/postgresql/recovery.conf.sample
share/postgresql/sql_features.txt
share/postgresql/system_views.sql
%%GETTEXT%%share/locale/af/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/fa/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
%%GETTEXT%%@dirrmtry share/locale/cs
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index a53327a9c48c..783a1c4fc97e 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME?= postgresql
-PORTVERSION?= 8.2.0
+PORTVERSION?= 8.2.1
PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
@@ -46,7 +46,8 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
BUILD_DIRS?= src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
- src/pl config
+ src/bin/initdb src/bin/ipcclean src/bin/pg_ctl src/bin/pg_controldata \
+ src/bin/pg_resetxlog src/pl
INSTALL_DIRS?= ${BUILD_DIRS}
diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo
index b74b1dd6b22d..7e8db647da52 100644
--- a/databases/postgresql92-server/distinfo
+++ b/databases/postgresql92-server/distinfo
@@ -1,15 +1,12 @@
-MD5 (postgresql/postgresql-base-8.2.0.tar.bz2) = c827602068e8d3ba20d575c87d102932
-SHA256 (postgresql/postgresql-base-8.2.0.tar.bz2) = 26544b843761b5acc4c3452ac3403e67cbe5d4a486583242bb6f4c77810b4284
-SIZE (postgresql/postgresql-base-8.2.0.tar.bz2) = 8483588
-MD5 (postgresql/postgresql-opt-8.2.0.tar.bz2) = d0bf0284ae3ae6ea56f6b08427f7ab9a
-SHA256 (postgresql/postgresql-opt-8.2.0.tar.bz2) = 06a016bf72a33061c4f297f15d32b8aadd742bfe54256573e59bb7916ec3df29
-SIZE (postgresql/postgresql-opt-8.2.0.tar.bz2) = 167666
-MD5 (postgresql/postgresql-docs-8.2.0.tar.bz2) = 4221311dc619659344b8e03ddbaa249b
-SHA256 (postgresql/postgresql-docs-8.2.0.tar.bz2) = 30096acf2d6c0bf5937571625de2d477586f0e5989ee8d56c58868bc738d4f2e
-SIZE (postgresql/postgresql-docs-8.2.0.tar.bz2) = 2744490
-MD5 (postgresql/postgresql-test-8.2.0.tar.bz2) = 0269ab5b70f9b677a97a856c3e46a5f5
-SHA256 (postgresql/postgresql-test-8.2.0.tar.bz2) = 695c82bb987fb0fcc09c059b7da914164fd1577d5ab8873d7371ec398e47dff5
-SIZE (postgresql/postgresql-test-8.2.0.tar.bz2) = 985281
-MD5 (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 2eb31538f3ee367767aeacd95b11d623
-SHA256 (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 8dea05bdbc2b78426b159f628b693f69da17b930fe4882e166d5e8a3e698b7d9
-SIZE (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 3987
+MD5 (postgresql/postgresql-base-8.2.1.tar.bz2) = 7f20da3764ea2ff7329a6570da89926a
+SHA256 (postgresql/postgresql-base-8.2.1.tar.bz2) = 99aa1b8d3f0f53f5fd138103052f5111310c061b25c0293dd9f93dc3fd6fda5c
+SIZE (postgresql/postgresql-base-8.2.1.tar.bz2) = 8483464
+MD5 (postgresql/postgresql-opt-8.2.1.tar.bz2) = 018aaf094027456d4708d97320c86eaa
+SHA256 (postgresql/postgresql-opt-8.2.1.tar.bz2) = 9a542c79c2983322c621b4086ae78e1d7c3bb841c95283e45e7bced73d975422
+SIZE (postgresql/postgresql-opt-8.2.1.tar.bz2) = 167629
+MD5 (postgresql/postgresql-docs-8.2.1.tar.bz2) = 62629d436573b97326e7bb56495a8609
+SHA256 (postgresql/postgresql-docs-8.2.1.tar.bz2) = 76544837b2241b1e5c00cce3118584499a902e948b0d5c0a7465535b21f22843
+SIZE (postgresql/postgresql-docs-8.2.1.tar.bz2) = 2750394
+MD5 (postgresql/postgresql-test-8.2.1.tar.bz2) = fefc23962bda107bc24d799996b11a92
+SHA256 (postgresql/postgresql-test-8.2.1.tar.bz2) = fa6835d4d68215dac9fc6242ea974aea671c3be1565fb84ce40b28c209a89fe3
+SIZE (postgresql/postgresql-test-8.2.1.tar.bz2) = 985153
diff --git a/databases/postgresql92-server/files/postgresql.in b/databases/postgresql92-server/files/postgresql.in
index a44c713d6b25..1b3b4226acdf 100644
--- a/databases/postgresql92-server/files/postgresql.in
+++ b/databases/postgresql92-server/files/postgresql.in
@@ -12,7 +12,7 @@
# # optional
# postgresql_data="%%PREFIX%%/pgsql/data"
# postgresql_flags="-w -s -m fast"
-# postgresql_initdb_flags="--encoding=utf-8 --lc_collate=C"
+# postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
# postgresql_class="default"
#
# See %%PREFIX%%/share/doc/postgresql/README-server for more info
@@ -36,7 +36,7 @@ postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
postgresql_user=pgsql
eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data"}
postgresql_class=${postgresql_class:-"default"}
-postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc_collate=C"}
+postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
name=postgresql
rcvar=`set_rcvar`
@@ -58,7 +58,7 @@ postgresql_command()
postgresql_initdb()
{
- su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb -D ${postgresql_data}"
+ su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
}
run_rc_command "$1"
diff --git a/databases/postgresql92-server/pkg-plist-client b/databases/postgresql92-server/pkg-plist-client
index a88eb5761102..38e92046904b 100644
--- a/databases/postgresql92-server/pkg-plist-client
+++ b/databases/postgresql92-server/pkg-plist-client
@@ -6,14 +6,9 @@ bin/dropdb
bin/droplang
bin/dropuser
bin/ecpg
-bin/initdb
-bin/ipcclean
bin/pg_config
-bin/pg_controldata
-bin/pg_ctl
bin/pg_dump
bin/pg_dumpall
-bin/pg_resetxlog
bin/pg_restore
bin/psql
bin/reindexdb
@@ -455,151 +450,85 @@ share/postgresql/pg_service.conf.sample
share/postgresql/psqlrc.sample
@dirrmtry share/postgresql
%%GETTEXT%%share/locale/af/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fa/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/fa/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/pl/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
diff --git a/databases/postgresql92-server/pkg-plist-server b/databases/postgresql92-server/pkg-plist-server
index bea3bfc7c0ec..696e19d28e70 100644
--- a/databases/postgresql92-server/pkg-plist-server
+++ b/databases/postgresql92-server/pkg-plist-server
@@ -1,3 +1,8 @@
+bin/initdb
+bin/ipcclean
+bin/pg_controldata
+bin/pg_ctl
+bin/pg_resetxlog
bin/postmaster
bin/postgres
etc/periodic/daily/502.pgsql
@@ -39,23 +44,89 @@ share/postgresql/recovery.conf.sample
share/postgresql/sql_features.txt
share/postgresql/system_views.sql
%%GETTEXT%%share/locale/af/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/fa/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/fr/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ro/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sk/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sl/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
%%GETTEXT%%@dirrmtry share/locale/cs