The PostgreSQL Global Development Group today released updates for all

active branches of the PostgreSQL object-relational database system,
including versions 9.1.2, 9.0.6, 8.4.10, 8.3.17 and 8.2.23.

This release contains 52 fixes to version 9.1, and a smaller number of
fixes to older versions, including:

- Fix bugs in information_schema.referential_constraints view**
- Correct collations for citext columns and indexes**
- Prevent possible crash when joining to a scalar function
- Prevent transitory data corruption of GIN indexes after a crash
- Prevent data corruption on TOAST columns when copying data
- Fix failures during hot standby startup
- Correct another "variable not found in subplan target list" bug
- Fix bug with sorting on aggregate expressions in windowing functions
- Multiple bug fixes for pg_upgrade
- Change Foreign Key creation order to better support
 self-referential keys**
- Multiple bug fixes to CREATE EXTENSION
- Ensure that function return type and data returned from PL/perl agree
- Ensure that PL/perl strings are always UTF-8
- Assorted bug fixes for various Extensions
- Updates to the time zone database, particularly to CST6

Changes marked with ** above require additional, post-update steps in
order to fix all described issues.

URL:	http://www.postgresql.org/docs/current/static/release.html

Also, fix a pthread problem in the FreeBSD port. [1]
PR:	160580 [1]
Feature safe:	yes

3 files changed, 7 insertions, 22 deletions

diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 0bc8098de2af..ceab5d0308d6 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-DISTVERSION?=	9.1.1
-PORTREVISION?=	1
+DISTVERSION?=	9.1.2
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -88,11 +87,11 @@ OPTIONS+=	PAM "Build with PAM support (server only)" off
 OPTIONS+=	LDAP "Build with LDAP authentication support" off
 OPTIONS+=	MIT_KRB5 "Build with MIT's kerberos support" off
 OPTIONS+=	HEIMDAL_KRB5 "Builds with Heimdal kerberos support" off
+OPTIONS+=	GSSAPI "Build with GSSAPI support" off
 OPTIONS+=	OPTIMIZED_CFLAGS "Builds with compiler optimizations (-O3)" off
 OPTIONS+=	XML "Build with XML data type (server)" on
 OPTIONS+=	TZDATA "Use internal timezone database (server)" on
 OPTIONS+=	DEBUG "Builds with debugging symbols" off
-OPTIONS+=	GSSAPI "Build with GSSAPI support" off
 
 # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info
 OPTIONS+=	ICU	"Use ICU for unicode collation (server)" off
@@ -195,29 +194,15 @@ LDFLAGS_SL+=	-lgssapi
 .endif
 
 .  if defined(WITH_MIT_KRB5)
-.    if exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config)
-BROKEN=		You must remove /usr/bin/krb5-config and /usr/lib/libkrb5.so* (from system heimdal), and set NO_KERBEROS=true in /etc/make.conf to build successfully with MIT-KRB
-.    endif
-# Allow defining a home built MIT Kerberos by setting KRB5_HOME
-.    if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config)
 CONFIGURE_ARGS+=--with-krb5
-.    else
+# Allow defining a home built MIT Kerberos by setting KRB5_HOME
+.    if !(defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config))
 LIB_DEPENDS+=	krb5.3:${PORTSDIR}/security/krb5
-CONFIGURE_ARGS+=--with-krb5
 .    endif
 .  endif
 
 .  if defined(WITH_HEIMDAL_KRB5)
-# Allow defining a home built Heimdal Kerberos by setting HEIMDAL_HOME
-.    if defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a) && exists(${HEIMDAL_HOME}/bin/krb5-config)
 CONFIGURE_ARGS+=--with-krb5
-.    else
-# Postgresql apps will not link properly when libpq is linked with base heimdal in /usr,
-# so we always use the heimdal port. See
-# http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html
-LIB_DEPENDS+=	krb5.26:${PORTSDIR}/security/heimdal
-CONFIGURE_ARGS+=--with-krb5
-.    endif
 .  endif
 
 .endif # !SLAVE_ONLY
@@ -347,7 +332,6 @@ PLIST_SUB+=	PG_USER=$(PG_USER)
 
 .if !defined(NO_BUILD)
 post-patch:
-	@${REINPLACE_CMD} s/@PTHREAD_LIBS@// ${WRKSRC}/src/Makefile.global.in
 .  if defined(WITH_ICU)
 	@${REINPLACE_CMD} -E -e \
 		"s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}|g" \
diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo
index 8db08ba8410b..35f0cd935898 100644
--- a/databases/postgresql92-server/distinfo
+++ b/databases/postgresql92-server/distinfo
@@ -1,4 +1,4 @@
-SHA256 (postgresql/postgresql-9.1.1.tar.bz2) = c794016bcf3fc1f561bc86796c6c9d050e3d8d2d55356515126e048275ae56f2
-SIZE (postgresql/postgresql-9.1.1.tar.bz2) = 14884071
+SHA256 (postgresql/postgresql-9.1.2.tar.bz2) = 8d54ff514f5b2754e6e36b008c43d7bbf7daf541da608767cc5bdedb1de5db30
+SIZE (postgresql/postgresql-9.1.2.tar.bz2) = 15424814
 SHA256 (postgresql/pg-910-icu-2011-09-22.diff.gz) = a88094ec22a8caeffa06d7c3a6b53d19035b171dad2acb9084da0a617a93e149
 SIZE (postgresql/pg-910-icu-2011-09-22.diff.gz) = 4373
diff --git a/databases/postgresql92-server/pkg-plist-server b/databases/postgresql92-server/pkg-plist-server
index dec1833da2b3..2e2e06aac640 100644
--- a/databases/postgresql92-server/pkg-plist-server
+++ b/databases/postgresql92-server/pkg-plist-server
@@ -385,6 +385,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/Asia/Dushanbe
 %%TZDATA%%share/postgresql/timezone/Asia/Gaza
 %%TZDATA%%share/postgresql/timezone/Asia/Harbin
+%%TZDATA%%share/postgresql/timezone/Asia/Hebron
 %%TZDATA%%share/postgresql/timezone/Asia/Ho_Chi_Minh
 %%TZDATA%%share/postgresql/timezone/Asia/Hong_Kong
 %%TZDATA%%share/postgresql/timezone/Asia/Hovd