7 files changed, 74 insertions, 49 deletions

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