Update all PostgreSQL ports to latest versions.

Also, try to break the previous 1:1 relation between FreeBSD system and
PostgreSQL versions installed. Use different PREFIX:es to install
different versions on the same system.

PR: ports/132402, ports/145002, ports/146657

4 files changed, 60 insertions, 34 deletions

diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 6a131e5db2c3..aefd3be713dd 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-DISTVERSION?=	8.4.4
-PORTREVISION=	2
+DISTVERSION?=	8.4.5
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -39,17 +38,19 @@ GNU_CONFIGURE=	YES
 PGUSER=		pgsql
 PGGROUP=	pgsql
 
-CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
-		--with-includes=${LOCALBASE}/include \
+LDFLAGS+=	-L${LOCALBASE}/lib
+INCLUDES+=	-I${LOCALBASE}/include
+CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
+		--with-includes=${PREFIX}/include \
 		--enable-thread-safety
-LDFLAGS+=	-L${PREFIX}/lib
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" \
+		INCLUDES="${INCLUDES}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 
-BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
+BUILD_DIRS?=	src/timezone src/backend src/backend/utils/mb/conversion_procs \
 		src/backend/snowball src/bin/initdb src/bin/pg_ctl \
 		src/bin/pg_controldata src/bin/pg_resetxlog src/pl
 
@@ -57,7 +58,6 @@ INSTALL_DIRS?=	${BUILD_DIRS}
 
 .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
 SERVER_ONLY=	yes
-PORTREVISION=	3
 USE_RC_SUBR=	postgresql
 USE_PGSQL=	yes
 WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
@@ -93,6 +93,7 @@ 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" on
 
 # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info
 OPTIONS+=	ICU	"Use ICU 3.x for unicode collation (server)" off
@@ -121,21 +122,21 @@ LIB_DEPENDS+=	icudata.38:${PORTSDIR}/devel/icu
 
 PATCH_DIST_STRIP=-p1
 
-.  if defined(SERVER_ONLY) && defined(WITH_PAM)
+.  if defined(WITH_PAM)
 CONFIGURE_ARGS+=--with-pam
 .  endif
 
-.  if defined(SERVER_ONLY) && defined(WITH_LDAP)
+.  if defined(WITH_LDAP)
 CONFIGURE_ARGS+=--with-ldap
 USE_OPENLDAP=	YES
 .  endif
 
-.  if defined(SERVER_ONLY) && defined(WITH_XML)
+.  if defined(WITH_XML)
 CONFIGURE_ARGS+=--with-libxml
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .  endif
 
-.  if defined(SERVER_ONLY) && defined(WITH_TZDATA)
+.  if defined(WITH_TZDATA)
 PLIST_SUB+=	TZDATA=""
 .  else
 CONFIGURE_ARGS+=--with-system-tzdata=/usr/share/zoneinfo
@@ -166,6 +167,10 @@ INSTALL_TARGET=	install
 INSTALL_TARGET=	install-strip
 .  endif
 
+.if (${OSVERSION} >= 700000) && !defined(WITHOUT_GSSAPI)
+CONFIGURE_ARGS+=--with-gssapi
+.endif
+
 .  if defined(WITH_MIT_KRB5)
 .    if exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config)
 BROKEN=		You must remove heimdal's /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/make.conf to build successfully with MIT-KRB
@@ -289,11 +294,11 @@ pre-su-install:
 .if !defined(NO_BUILD)
 post-patch:
 	@${REINPLACE_CMD} s/@PTHREAD_LIBS@// ${WRKSRC}/src/Makefile.global.in
-.if defined(WITH_ICU) || defined(WITH_ICU4)
+.  if defined(WITH_ICU) || defined(WITH_ICU4)
 	@${REINPLACE_CMD} -E -e \
 		"s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION:S/2/2./}\2${AUTOCONF_VERSION:S/2/2./}|g" \
 		${WRKSRC}/configure.in
-.endif
+.  endif
 
 do-install:
 	@for dir in ${INSTALL_DIRS}; do \
diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo
index 9b77cff98c9a..4d8f7a57df77 100644
--- a/databases/postgresql84-server/distinfo
+++ b/databases/postgresql84-server/distinfo
@@ -1,6 +1,6 @@
-MD5 (postgresql/postgresql-8.4.4.tar.bz2) = 4bf2448ad965bca3940df648c02194df
-SHA256 (postgresql/postgresql-8.4.4.tar.bz2) = e66b398d565f7fb16d8ae58ae72881dcd3dbb1b88f532bbe1c2d1284812be37e
-SIZE (postgresql/postgresql-8.4.4.tar.bz2) = 13853838
+MD5 (postgresql/postgresql-8.4.5.tar.bz2) = 391a3f2eddd6fa78bb6ceba9955ffa5f
+SHA256 (postgresql/postgresql-8.4.5.tar.bz2) = 300022ae2d998a0291a1e91978c48468fdc9c389afca05d6e5f18209ff5732bf
+SIZE (postgresql/postgresql-8.4.5.tar.bz2) = 14114152
 MD5 (postgresql/pg-840-icu-2009-09-15.diff.gz) = 2b81134b462e01623bc9387fe4de7136
 SHA256 (postgresql/pg-840-icu-2009-09-15.diff.gz) = c09d3b59340a3bb6ea754e985739d4fbb47f730d1e48a357c5585825034fc72e
 SIZE (postgresql/pg-840-icu-2009-09-15.diff.gz) = 4321
diff --git a/databases/postgresql84-server/pkg-plist-client b/databases/postgresql84-server/pkg-plist-client
index 39d479e40b10..702575d6b8fa 100644
--- a/databases/postgresql84-server/pkg-plist-client
+++ b/databases/postgresql84-server/pkg-plist-client
@@ -528,12 +528,13 @@ lib/libecpg.so.6
 lib/libecpg_compat.a
 lib/libecpg_compat.so
 lib/libecpg_compat.so.3
+lib/libpgport.a
+lib/libpgtypes.a
+lib/libpgtypes.so
 lib/libpgtypes.so.3
 lib/libpq.a
 lib/libpq.so
 lib/libpq.so.5
-lib/libpgtypes.a
-lib/libpgtypes.so
 lib/postgresql/pgxs/config/install-sh
 lib/postgresql/pgxs/config/mkinstalldirs
 lib/postgresql/pgxs/src/makefiles/pgxs.mk
@@ -589,9 +590,12 @@ share/postgresql/psqlrc.sample
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_dump-8.4.mo
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/pgscripts-8.4.mo
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/psql-8.4.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/ecpg-8.4.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq5-8.4.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config-8.4.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_dump-8.4.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts-8.4.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/psql-8.4.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_config-8.4.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpg-8.4.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-8.4.mo
@@ -626,3 +630,9 @@ share/postgresql/psqlrc.sample
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump-8.4.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts-8.4.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/ecpg-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq5-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql-8.4.mo
diff --git a/databases/postgresql84-server/pkg-plist-server b/databases/postgresql84-server/pkg-plist-server
index 7e837abced31..6b3fdd75f97a 100644
--- a/databases/postgresql84-server/pkg-plist-server
+++ b/databases/postgresql84-server/pkg-plist-server
@@ -5,7 +5,6 @@ bin/pg_resetxlog
 bin/postmaster
 bin/postgres
 etc/periodic/daily/502.pgsql
-lib/libpgport.a
 lib/postgresql/ascii_and_mic.so
 lib/postgresql/cyrillic_and_mic.so
 lib/postgresql/dict_snowball.so
@@ -47,67 +46,77 @@ share/postgresql/recovery.conf.sample
 share/postgresql/sql_features.txt
 share/postgresql/system_views.sql
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres-8.4.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl-8.4.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata-8.4.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl-8.4.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog-8.4.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/plpgsql-8.4.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres-8.4.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres-8.4.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl-8.4.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata-8.4.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl-8.4.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog-8.4.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/plpgsql-8.4.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/postgres-8.4.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres-8.4.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl-8.4.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata-8.4.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl-8.4.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog-8.4.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/plpgsql-8.4.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/postgres-8.4.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/initdb-8.4.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata-8.4.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_ctl-8.4.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog-8.4.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/plpgsql-8.4.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/postgres-8.4.mo
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_ctl-8.4.mo
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_controldata-8.4.mo
+%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_ctl-8.4.mo
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_resetxlog-8.4.mo
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/plpgsql-8.4.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl-8.4.mo
+%%GETTEXT%%share/locale/ja/LC_MESSAGES/postgres-8.4.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb-8.4.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata-8.4.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl-8.4.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres-8.4.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/plpgsql-8.4.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/postgres-8.4.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-8.4.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-8.4.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-8.4.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog-8.4.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/plpgsql-8.4.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres-8.4.mo
 %%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog-8.4.mo
 %%GETTEXT%%share/locale/ro/LC_MESSAGES/plpgsql-8.4.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb-8.4.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl-8.4.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog-8.4.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl-8.4.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata-8.4.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl-8.4.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog-8.4.mo
 %%GETTEXT%%share/locale/ta/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_ctl-8.4.mo
 %%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_controldata-8.4.mo
+%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_ctl-8.4.mo
 %%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres-8.4.mo
 %%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl-8.4.mo
 %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata-8.4.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl-8.4.mo
 %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog-8.4.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres-8.4.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb-8.4.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-8.4.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-8.4.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog-8.4.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/plpgsql-8.4.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/plpgsql-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres-8.4.mo
 share/postgresql/postgres.shdescription
 share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/Africa/Abidjan
@@ -620,6 +629,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/Pacific/Apia
 %%TZDATA%%share/postgresql/timezone/Pacific/Auckland
 %%TZDATA%%share/postgresql/timezone/Pacific/Chatham
+%%TZDATA%%share/postgresql/timezone/Pacific/Chuuk
 %%TZDATA%%share/postgresql/timezone/Pacific/Easter
 %%TZDATA%%share/postgresql/timezone/Pacific/Efate
 %%TZDATA%%share/postgresql/timezone/Pacific/Enderbury
@@ -645,6 +655,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/Pacific/Pago_Pago
 %%TZDATA%%share/postgresql/timezone/Pacific/Palau
 %%TZDATA%%share/postgresql/timezone/Pacific/Pitcairn
+%%TZDATA%%share/postgresql/timezone/Pacific/Pohnpei
 %%TZDATA%%share/postgresql/timezone/Pacific/Ponape
 %%TZDATA%%share/postgresql/timezone/Pacific/Port_Moresby
 %%TZDATA%%share/postgresql/timezone/Pacific/Rarotonga