7 files changed, 87 insertions, 62 deletions

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