23 files changed, 187 insertions, 181 deletions

diff --git a/databases/postgresql-docs/Makefile b/databases/postgresql-docs/Makefile
index 3d62ba69f449..46b7189e9316 100644
--- a/databases/postgresql-docs/Makefile
+++ b/databases/postgresql-docs/Makefile
@@ -21,6 +21,8 @@ DEFAULT_PGSQL_VER?=74
 LOCALBASE?=	/usr/local
 SED?=		/usr/bin/sed
 
+CONFLICTS=	postgresql-docs
+
 # Setting/finding PostgreSQL version we want.
 .if exists(${LOCALBASE}/bin/pg_config)
 PGSQL_VER!=	${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p'
@@ -33,17 +35,19 @@ NO_BUILD=	YES
 SLAVE_ONLY=	YES
 PATCHDIR=	mustnotexist
 
+PGDOCSDIR?=	${DOCSDIR}/release-${PGSQL_VER}
+
 do-install:
-	@ $(MKDIR) ${DOCSDIR}/html; \
+	@ $(MKDIR) ${PGDOCSDIR}; \
 	${GZIP_CMD} -dc ${WRKSRC}/doc/postgres.tar.gz | \
-	( cd ${DOCSDIR}/html && $(TAR) xf - )
+	( cd ${PGDOCSDIR} && $(TAR) xf - )
 
 post-install:
 	@ ${TAR} ztf ${WRKSRC}/doc/postgres.tar.gz | ${GREP} -v /$$ | \
-	  ${SED} "s,^,${DOCSDIR:S,^${PREFIX}/,,}/html/," >> ${TMPPLIST} ;\
+	  ${SED} "s,^,${PGDOCSDIR:S,^${PREFIX}/,,}/," >> ${TMPPLIST} ;\
 	  ${TAR} ztf ${WRKSRC}/doc/postgres.tar.gz | ${GREP} /$$ | \
 	  ${SED} "s,^,@dirrm\ ," >> ${TMPPLIST} ;\
-	  ${ECHO} @dirrm ${DOCSDIR:S,^${PREFIX}/,,}/html >> ${TMPPLIST} ;\
-	  ${ECHO} "@unexec rmdir %D/${DOCSDIR:S,^${PREFIX}/,,} 2> /dev/null || true" >> ${TMPPLIST}
+	  ${ECHO} @dirrm ${PGDOCSDIR:S,^${PREFIX}/,,} >> ${TMPPLIST} ;\
+	  ${ECHO} "@unexec rmdir %%DOCSDIR%% 2> /dev/null || true" >> ${TMPPLIST}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 6d50ce6d4c94..dcf6825f8f3a 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.3.19
-PORTREVISION?=	1
+PORTVERSION?=	7.3.20
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql73-server/distinfo b/databases/postgresql73-server/distinfo
index d6bf8449ffef..d31b46541fb4 100644
--- a/databases/postgresql73-server/distinfo
+++ b/databases/postgresql73-server/distinfo
@@ -1,12 +1,12 @@
-MD5 (postgresql/postgresql-base-7.3.19.tar.bz2) = b9b2dca0468bafff72486bd54812c317
-SHA256 (postgresql/postgresql-base-7.3.19.tar.bz2) = 1804e0424e4444f67acfb98b4e4ad2ede26748d1ddb4a9201cbff7627e394e6a
-SIZE (postgresql/postgresql-base-7.3.19.tar.bz2) = 5691127
-MD5 (postgresql/postgresql-opt-7.3.19.tar.bz2) = 1fe88fa959492155518787c0eb197b14
-SHA256 (postgresql/postgresql-opt-7.3.19.tar.bz2) = 2735bceed9f0d27befb3ec26b5d76f9272da1cdf2434ceb9d68327494912017f
-SIZE (postgresql/postgresql-opt-7.3.19.tar.bz2) = 342076
-MD5 (postgresql/postgresql-test-7.3.19.tar.bz2) = a0958b2352586b7cd4083f46e1ba1ae8
-SHA256 (postgresql/postgresql-test-7.3.19.tar.bz2) = 8df80f3fb5f61d61fe6348e037c614b3c0f2114ae5c8a7f3050b5fadde517ba3
-SIZE (postgresql/postgresql-test-7.3.19.tar.bz2) = 891109
-MD5 (postgresql/postgresql-docs-7.3.19.tar.bz2) = de4888125bef49f9f53824d4f9ae7bf6
-SHA256 (postgresql/postgresql-docs-7.3.19.tar.bz2) = 0a4910cf776b6be8017eaf68a60c541be59288079fe5696d955bdace22ebde0a
-SIZE (postgresql/postgresql-docs-7.3.19.tar.bz2) = 2365906
+MD5 (postgresql/postgresql-base-7.3.20.tar.bz2) = fb5cc3b22d3fceb8cfb5b89061ceadb0
+SHA256 (postgresql/postgresql-base-7.3.20.tar.bz2) = 009695d3c04004c7ba6365b112dee0cad6738daa2550fdb37c2adab52994e636
+SIZE (postgresql/postgresql-base-7.3.20.tar.bz2) = 5711312
+MD5 (postgresql/postgresql-opt-7.3.20.tar.bz2) = e88b8f75c07a844a65eeb3a5194f3d80
+SHA256 (postgresql/postgresql-opt-7.3.20.tar.bz2) = 050c79c87d9dbf443fbda20b0f8fd40523231c2c6bcf1a24808214fe599f4d17
+SIZE (postgresql/postgresql-opt-7.3.20.tar.bz2) = 344312
+MD5 (postgresql/postgresql-test-7.3.20.tar.bz2) = 0195720da56dfb16140393ace788f907
+SHA256 (postgresql/postgresql-test-7.3.20.tar.bz2) = 05648eda34c9a4670e5afa3fb6dad7bdf0ce69ffa633b8a83cd424de942562d7
+SIZE (postgresql/postgresql-test-7.3.20.tar.bz2) = 869518
+MD5 (postgresql/postgresql-docs-7.3.20.tar.bz2) = 53472e7d7bf808b738d31a52bd7c6451
+SHA256 (postgresql/postgresql-docs-7.3.20.tar.bz2) = 4e337e64a2c2cd9f8f600e6f0514be9c9170b1fabf2b9534c6f8c7ed9ace5373
+SIZE (postgresql/postgresql-docs-7.3.20.tar.bz2) = 2365475
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 4491397fcd10..ec84e055c2e3 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.4.17
-PORTREVISION?=	1
+PORTVERSION?=	7.4.18
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql74-server/distinfo b/databases/postgresql74-server/distinfo
index 77e763408c89..57656abe84ee 100644
--- a/databases/postgresql74-server/distinfo
+++ b/databases/postgresql74-server/distinfo
@@ -1,15 +1,15 @@
-MD5 (postgresql/postgresql-base-7.4.17.tar.bz2) = c513ae755abd4fb011378351be9e1ba0
-SHA256 (postgresql/postgresql-base-7.4.17.tar.bz2) = f1b7ff754ccb43d4a3a62a9124b1c8ac215e48e5549e620bfcde59124c6f1bc5
-SIZE (postgresql/postgresql-base-7.4.17.tar.bz2) = 6609512
-MD5 (postgresql/postgresql-opt-7.4.17.tar.bz2) = 43a87be48f3e43c5fce957af000bff60
-SHA256 (postgresql/postgresql-opt-7.4.17.tar.bz2) = 8ff6ca8f726ce39d873d495273c31ceb3d647d75a85a7940b38d38ae7b2eff3e
-SIZE (postgresql/postgresql-opt-7.4.17.tar.bz2) = 333513
-MD5 (postgresql/postgresql-test-7.4.17.tar.bz2) = 493b0b142f0ca6fb52dbdfc5c32e0c5b
-SHA256 (postgresql/postgresql-test-7.4.17.tar.bz2) = 0486999f89b38996c15a91a66638f40718d5fb702ac592f4f2a22e9377b6b6bf
-SIZE (postgresql/postgresql-test-7.4.17.tar.bz2) = 902524
-MD5 (postgresql/postgresql-docs-7.4.17.tar.bz2) = e9a33e70add61f6a1018870c88dbf0ea
-SHA256 (postgresql/postgresql-docs-7.4.17.tar.bz2) = 855b08821fa06cce280d63c1c57a1a51cc02eee1af0a53ba9a550cc3e66c2696
-SIZE (postgresql/postgresql-docs-7.4.17.tar.bz2) = 2434028
+MD5 (postgresql/postgresql-base-7.4.18.tar.bz2) = ab87c1d2ee5caab6c41bd7ab235f3037
+SHA256 (postgresql/postgresql-base-7.4.18.tar.bz2) = 0eff5ab743db9d413b5fe95a2ee907e86b1d32ce3727011ee5c308c0dc7db0af
+SIZE (postgresql/postgresql-base-7.4.18.tar.bz2) = 6662169
+MD5 (postgresql/postgresql-opt-7.4.18.tar.bz2) = 41af694b71fac5f71ebbde227cd8e6ac
+SHA256 (postgresql/postgresql-opt-7.4.18.tar.bz2) = 63b9ce09e66a90267d70ab766cb6dc833cafa93f52253fe83699b8fce39a9a88
+SIZE (postgresql/postgresql-opt-7.4.18.tar.bz2) = 334631
+MD5 (postgresql/postgresql-test-7.4.18.tar.bz2) = 0223ab74e9610f2a0af27edbc9013fde
+SHA256 (postgresql/postgresql-test-7.4.18.tar.bz2) = 8c475490a5b8233efb936e11fcb2f02ab10324b35920d310561ba14b1c8268d3
+SIZE (postgresql/postgresql-test-7.4.18.tar.bz2) = 894754
+MD5 (postgresql/postgresql-docs-7.4.18.tar.bz2) = 6eb6d4c7a79067d21cb0c87b30392a06
+SHA256 (postgresql/postgresql-docs-7.4.18.tar.bz2) = 06b19865d8124a13b2553ad142405262b99fcb75e856137b0d4d8f5867e700e0
+SIZE (postgresql/postgresql-docs-7.4.18.tar.bz2) = 2434756
 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/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 45a0e5736969..964074a6932d 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.0.13
-PORTREVISION?=	1
+PORTVERSION?=	8.0.14
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql80-server/distinfo b/databases/postgresql80-server/distinfo
index a96a68aff048..df1a9d2b7faa 100644
--- a/databases/postgresql80-server/distinfo
+++ b/databases/postgresql80-server/distinfo
@@ -1,15 +1,15 @@
-MD5 (postgresql/postgresql-base-8.0.13.tar.bz2) = d3b5185dc6a12f2443f06f83cdee03d0
-SHA256 (postgresql/postgresql-base-8.0.13.tar.bz2) = 5627ad76e6a6c8eb85c1debe5fce2c12b42611434dabe0fd5763b8a72c7ac49d
-SIZE (postgresql/postgresql-base-8.0.13.tar.bz2) = 7848290
-MD5 (postgresql/postgresql-opt-8.0.13.tar.bz2) = 824caf8451dec685a0d5886eb4892807
-SHA256 (postgresql/postgresql-opt-8.0.13.tar.bz2) = 9f63fc12ede1a605934cdc462ff45c0e924288284f411ae38dec1c5b6e87ce25
-SIZE (postgresql/postgresql-opt-8.0.13.tar.bz2) = 134769
-MD5 (postgresql/postgresql-docs-8.0.13.tar.bz2) = 877fc8417555cff0a889d38013afefd6
-SHA256 (postgresql/postgresql-docs-8.0.13.tar.bz2) = a703a22b11288eb20b5c4f28e34cfeeed11c730cebf51671049ad37ace5e204d
-SIZE (postgresql/postgresql-docs-8.0.13.tar.bz2) = 2271196
-MD5 (postgresql/postgresql-test-8.0.13.tar.bz2) = e736c9887ca4c66051501ce2b95a88f8
-SHA256 (postgresql/postgresql-test-8.0.13.tar.bz2) = ea7e45aa8d9d8f127704e659575a0e860fd53abdaefa7c0f256f246c283ff1cf
-SIZE (postgresql/postgresql-test-8.0.13.tar.bz2) = 932945
+MD5 (postgresql/postgresql-base-8.0.14.tar.bz2) = ffaaa630db6613cedbe935edd85d2a98
+SHA256 (postgresql/postgresql-base-8.0.14.tar.bz2) = 8201ce5a99051c2b561f4b58ce07f17fe4959383ef38afcb25ab802119f9755e
+SIZE (postgresql/postgresql-base-8.0.14.tar.bz2) = 7907547
+MD5 (postgresql/postgresql-opt-8.0.14.tar.bz2) = 6a6feb48ca70bf1e36e99bab1671b66d
+SHA256 (postgresql/postgresql-opt-8.0.14.tar.bz2) = b097922bb346c039dc605b45927dca2916394d587000d5412b30c9ca5a1c117a
+SIZE (postgresql/postgresql-opt-8.0.14.tar.bz2) = 134706
+MD5 (postgresql/postgresql-docs-8.0.14.tar.bz2) = 2435d1036364eecf093bc783d4e92101
+SHA256 (postgresql/postgresql-docs-8.0.14.tar.bz2) = df1da39c1bbdb54f506a25332770ccf19296234ba0b9ac755e8b1c5bdf296f10
+SIZE (postgresql/postgresql-docs-8.0.14.tar.bz2) = 2274002
+MD5 (postgresql/postgresql-test-8.0.14.tar.bz2) = fd66be583db9d5b38d0822b9a9a027b0
+SHA256 (postgresql/postgresql-test-8.0.14.tar.bz2) = a228576902ea273aff6ee1f7bd7e4bd5d5b6d0b9bbb532aec1c83d5a6beb5a6e
+SIZE (postgresql/postgresql-test-8.0.14.tar.bz2) = 935168
 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/pkg-plist-server b/databases/postgresql80-server/pkg-plist-server
index 6d29d6e48d05..0a2b4d9707fd 100644
--- a/databases/postgresql80-server/pkg-plist-server
+++ b/databases/postgresql80-server/pkg-plist-server
@@ -255,6 +255,7 @@ 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/Tell_City
 share/postgresql/timezone/America/Indiana/Vevay
 share/postgresql/timezone/America/Indiana/Vincennes
 share/postgresql/timezone/America/Indiana/Winamac
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 99168a307663..ae2ad8dc8a7e 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.1.9
-PORTREVISION?=	1
+PORTVERSION?=	8.1.10
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql81-server/distinfo b/databases/postgresql81-server/distinfo
index 4fb565917ecd..c5220a8397c9 100644
--- a/databases/postgresql81-server/distinfo
+++ b/databases/postgresql81-server/distinfo
@@ -1,15 +1,15 @@
-MD5 (postgresql/postgresql-base-8.1.9.tar.bz2) = 44582cd7184badf63d9c558f91cdd128
-SHA256 (postgresql/postgresql-base-8.1.9.tar.bz2) = 4d11584d545d5f18566bc1bf65409794adceef1825dc4850514238f6b5d3f5fd
-SIZE (postgresql/postgresql-base-8.1.9.tar.bz2) = 8108212
-MD5 (postgresql/postgresql-opt-8.1.9.tar.bz2) = 26fed39417431ff56e213caf11dc7215
-SHA256 (postgresql/postgresql-opt-8.1.9.tar.bz2) = b8c5c3098c53e8c8b722ba8928787eb7478beeb3c6b42adbaad1d8ca24d2e49f
-SIZE (postgresql/postgresql-opt-8.1.9.tar.bz2) = 144737
-MD5 (postgresql/postgresql-docs-8.1.9.tar.bz2) = a13ad4fbe78aa2ab4f86381cfcec8eb7
-SHA256 (postgresql/postgresql-docs-8.1.9.tar.bz2) = 9b1f5d47345067baf9ecc71941707199d055d2f147a206b1b70245a9d5c45b30
-SIZE (postgresql/postgresql-docs-8.1.9.tar.bz2) = 2503673
-MD5 (postgresql/postgresql-test-8.1.9.tar.bz2) = abd4d19d536f846eb37f63d50bbfc02f
-SHA256 (postgresql/postgresql-test-8.1.9.tar.bz2) = 2dd60f661df70d43b261af0722e768f6ec4dc856c765c3dd9cd24042089323ba
-SIZE (postgresql/postgresql-test-8.1.9.tar.bz2) = 948085
+MD5 (postgresql/postgresql-base-8.1.10.tar.bz2) = dbb5c5e48a43037e979b621f0c03614b
+SHA256 (postgresql/postgresql-base-8.1.10.tar.bz2) = c49b8b094838024ef09d1e574181c409dbc3bb13c8470ae495e74a0185aed981
+SIZE (postgresql/postgresql-base-8.1.10.tar.bz2) = 8110015
+MD5 (postgresql/postgresql-opt-8.1.10.tar.bz2) = 23f7f08905a05a50a681ea2a83b049ab
+SHA256 (postgresql/postgresql-opt-8.1.10.tar.bz2) = 9c99a8c31515107e29201e2ba1c5362871851b54bcf6bb9a5d3f81848196834f
+SIZE (postgresql/postgresql-opt-8.1.10.tar.bz2) = 144584
+MD5 (postgresql/postgresql-docs-8.1.10.tar.bz2) = c6423b4745c1f677448af4f20dfda5f9
+SHA256 (postgresql/postgresql-docs-8.1.10.tar.bz2) = 870edb5e0d364d235f9f83820256db66eaf1aebfd47e05b7a4546bff53bfac88
+SIZE (postgresql/postgresql-docs-8.1.10.tar.bz2) = 2507870
+MD5 (postgresql/postgresql-test-8.1.10.tar.bz2) = 3dce92e7913ea70ca0c240a3adf93140
+SHA256 (postgresql/postgresql-test-8.1.10.tar.bz2) = d887a18cade52167c0390fa7270bf86e33d95cba34d2ac3f755e13a1360d9de8
+SIZE (postgresql/postgresql-test-8.1.10.tar.bz2) = 948352
 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/pkg-plist-server b/databases/postgresql81-server/pkg-plist-server
index 16ae86fe0d29..8ce72bda7181 100644
--- a/databases/postgresql81-server/pkg-plist-server
+++ b/databases/postgresql81-server/pkg-plist-server
@@ -256,6 +256,7 @@ 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/Tell_City
 share/postgresql/timezone/America/Indiana/Vevay
 share/postgresql/timezone/America/Indiana/Vincennes
 share/postgresql/timezone/America/Indiana/Winamac
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 6bbaefa68ff1..b31a698b074f 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.2.4
-PORTREVISION?=	1
+PORTVERSION?=	8.2.5
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -101,17 +101,17 @@ OPTIONS+=	DEBUG "Builds with debugging symbols" off
 #OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
 
 # See http://gppl.moonbone.ru/ for more info
-#OPTIONS+=	HIER  "Builds with query hierarchy (server)" off
+OPTIONS+=	HIER  "Builds with query hierarchy (server)" off
 
 # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
 # (requires dump/restore if modified.)
 OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 
-# .  if (defined(SERVER_ONLY) && defined(WITH_HIER)) || make(makesum)
-# PATCH_SITES+=	http://gppl.moonbone.ru/:hier812055
-# PATCHFILES+=	hier-Pg8.1.2-0.5.5.diff.gz:hier812055
-# USE_BISON=	yes
-# .  endif
+.  if (defined(SERVER_ONLY) && defined(WITH_HIER)) || make(makesum)
+PATCH_SITES+=	http://gppl.moonbone.ru/:hier820055
+PATCHFILES+=	hier-v0.5.5-Pg8.2.0.diff.gz:hier820055
+USE_BISON=	yes
+.  endif
 
 # .  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 # USE_AUTOTOOLS=	autoconf:259
diff --git a/databases/postgresql82-server/distinfo b/databases/postgresql82-server/distinfo
index 8a35f746d9be..2dbebd41916b 100644
--- a/databases/postgresql82-server/distinfo
+++ b/databases/postgresql82-server/distinfo
@@ -1,12 +1,12 @@
-MD5 (postgresql/postgresql-base-8.2.4.tar.bz2) = 5c0576627c9969a3cedb6b014fb6ae05
-SHA256 (postgresql/postgresql-base-8.2.4.tar.bz2) = 8ee5ad364ee21079ce3d726b4abcfa0f318015a331e37e9856a3500fcce74cca
-SIZE (postgresql/postgresql-base-8.2.4.tar.bz2) = 8549159
-MD5 (postgresql/postgresql-opt-8.2.4.tar.bz2) = b71b0526e7c8af22d82fbc7b6f81a750
-SHA256 (postgresql/postgresql-opt-8.2.4.tar.bz2) = 5977ca1f0913aa98bc889e49b38768621865959b14e2674e7716d44b7fe9eb35
-SIZE (postgresql/postgresql-opt-8.2.4.tar.bz2) = 167612
-MD5 (postgresql/postgresql-docs-8.2.4.tar.bz2) = 7d520a0fc88c8b59338c25cf18331f6a
-SHA256 (postgresql/postgresql-docs-8.2.4.tar.bz2) = 2bb5bea974a68f562e40104d756ea87dbd831cf8fbd4bb54faca38f23c87de4c
-SIZE (postgresql/postgresql-docs-8.2.4.tar.bz2) = 2769630
-MD5 (postgresql/postgresql-test-8.2.4.tar.bz2) = 0fefe28b8c9d16ebdf6f05c366477a9d
-SHA256 (postgresql/postgresql-test-8.2.4.tar.bz2) = fc4471ecece04251289cfe7feb0acbafa3a18cf8f35c2d61ce3f68bd4394e504
-SIZE (postgresql/postgresql-test-8.2.4.tar.bz2) = 985819
+MD5 (postgresql/postgresql-base-8.2.5.tar.bz2) = 5879b205b635f3fb905f6015c50f4edd
+SHA256 (postgresql/postgresql-base-8.2.5.tar.bz2) = b70a2cc0d0613944ce0eae99c1001894354b77e81c8ae45f6c8c890709861929
+SIZE (postgresql/postgresql-base-8.2.5.tar.bz2) = 8602348
+MD5 (postgresql/postgresql-opt-8.2.5.tar.bz2) = dea12379311886d825fe7090884521b7
+SHA256 (postgresql/postgresql-opt-8.2.5.tar.bz2) = 0d64c3fd4fb097126d9cb7d599fbd86435f23d887f7985c9fdb441db4e3c9ae5
+SIZE (postgresql/postgresql-opt-8.2.5.tar.bz2) = 167549
+MD5 (postgresql/postgresql-docs-8.2.5.tar.bz2) = d9edbcbebd620dbeaa42a04c0a2fd900
+SHA256 (postgresql/postgresql-docs-8.2.5.tar.bz2) = 8824f13eaca20328ffa1244ba036c51890a718f40683b9e3003e72b77a1f774d
+SIZE (postgresql/postgresql-docs-8.2.5.tar.bz2) = 2773777
+MD5 (postgresql/postgresql-test-8.2.5.tar.bz2) = a4d39451e13cef32df96df35e24643cb
+SHA256 (postgresql/postgresql-test-8.2.5.tar.bz2) = 89174ef45e2ce09221d31c57745ecc18ea8f28389b0ba541ec2f26ba656dc752
+SIZE (postgresql/postgresql-test-8.2.5.tar.bz2) = 987137
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 6bbaefa68ff1..b31a698b074f 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.2.4
-PORTREVISION?=	1
+PORTVERSION?=	8.2.5
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -101,17 +101,17 @@ OPTIONS+=	DEBUG "Builds with debugging symbols" off
 #OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
 
 # See http://gppl.moonbone.ru/ for more info
-#OPTIONS+=	HIER  "Builds with query hierarchy (server)" off
+OPTIONS+=	HIER  "Builds with query hierarchy (server)" off
 
 # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
 # (requires dump/restore if modified.)
 OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 
-# .  if (defined(SERVER_ONLY) && defined(WITH_HIER)) || make(makesum)
-# PATCH_SITES+=	http://gppl.moonbone.ru/:hier812055
-# PATCHFILES+=	hier-Pg8.1.2-0.5.5.diff.gz:hier812055
-# USE_BISON=	yes
-# .  endif
+.  if (defined(SERVER_ONLY) && defined(WITH_HIER)) || make(makesum)
+PATCH_SITES+=	http://gppl.moonbone.ru/:hier820055
+PATCHFILES+=	hier-v0.5.5-Pg8.2.0.diff.gz:hier820055
+USE_BISON=	yes
+.  endif
 
 # .  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 # USE_AUTOTOOLS=	autoconf:259
diff --git a/databases/postgresql83-server/distinfo b/databases/postgresql83-server/distinfo
index 8a35f746d9be..2dbebd41916b 100644
--- a/databases/postgresql83-server/distinfo
+++ b/databases/postgresql83-server/distinfo
@@ -1,12 +1,12 @@
-MD5 (postgresql/postgresql-base-8.2.4.tar.bz2) = 5c0576627c9969a3cedb6b014fb6ae05
-SHA256 (postgresql/postgresql-base-8.2.4.tar.bz2) = 8ee5ad364ee21079ce3d726b4abcfa0f318015a331e37e9856a3500fcce74cca
-SIZE (postgresql/postgresql-base-8.2.4.tar.bz2) = 8549159
-MD5 (postgresql/postgresql-opt-8.2.4.tar.bz2) = b71b0526e7c8af22d82fbc7b6f81a750
-SHA256 (postgresql/postgresql-opt-8.2.4.tar.bz2) = 5977ca1f0913aa98bc889e49b38768621865959b14e2674e7716d44b7fe9eb35
-SIZE (postgresql/postgresql-opt-8.2.4.tar.bz2) = 167612
-MD5 (postgresql/postgresql-docs-8.2.4.tar.bz2) = 7d520a0fc88c8b59338c25cf18331f6a
-SHA256 (postgresql/postgresql-docs-8.2.4.tar.bz2) = 2bb5bea974a68f562e40104d756ea87dbd831cf8fbd4bb54faca38f23c87de4c
-SIZE (postgresql/postgresql-docs-8.2.4.tar.bz2) = 2769630
-MD5 (postgresql/postgresql-test-8.2.4.tar.bz2) = 0fefe28b8c9d16ebdf6f05c366477a9d
-SHA256 (postgresql/postgresql-test-8.2.4.tar.bz2) = fc4471ecece04251289cfe7feb0acbafa3a18cf8f35c2d61ce3f68bd4394e504
-SIZE (postgresql/postgresql-test-8.2.4.tar.bz2) = 985819
+MD5 (postgresql/postgresql-base-8.2.5.tar.bz2) = 5879b205b635f3fb905f6015c50f4edd
+SHA256 (postgresql/postgresql-base-8.2.5.tar.bz2) = b70a2cc0d0613944ce0eae99c1001894354b77e81c8ae45f6c8c890709861929
+SIZE (postgresql/postgresql-base-8.2.5.tar.bz2) = 8602348
+MD5 (postgresql/postgresql-opt-8.2.5.tar.bz2) = dea12379311886d825fe7090884521b7
+SHA256 (postgresql/postgresql-opt-8.2.5.tar.bz2) = 0d64c3fd4fb097126d9cb7d599fbd86435f23d887f7985c9fdb441db4e3c9ae5
+SIZE (postgresql/postgresql-opt-8.2.5.tar.bz2) = 167549
+MD5 (postgresql/postgresql-docs-8.2.5.tar.bz2) = d9edbcbebd620dbeaa42a04c0a2fd900
+SHA256 (postgresql/postgresql-docs-8.2.5.tar.bz2) = 8824f13eaca20328ffa1244ba036c51890a718f40683b9e3003e72b77a1f774d
+SIZE (postgresql/postgresql-docs-8.2.5.tar.bz2) = 2773777
+MD5 (postgresql/postgresql-test-8.2.5.tar.bz2) = a4d39451e13cef32df96df35e24643cb
+SHA256 (postgresql/postgresql-test-8.2.5.tar.bz2) = 89174ef45e2ce09221d31c57745ecc18ea8f28389b0ba541ec2f26ba656dc752
+SIZE (postgresql/postgresql-test-8.2.5.tar.bz2) = 987137
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 6bbaefa68ff1..b31a698b074f 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.2.4
-PORTREVISION?=	1
+PORTVERSION?=	8.2.5
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -101,17 +101,17 @@ OPTIONS+=	DEBUG "Builds with debugging symbols" off
 #OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
 
 # See http://gppl.moonbone.ru/ for more info
-#OPTIONS+=	HIER  "Builds with query hierarchy (server)" off
+OPTIONS+=	HIER  "Builds with query hierarchy (server)" off
 
 # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
 # (requires dump/restore if modified.)
 OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 
-# .  if (defined(SERVER_ONLY) && defined(WITH_HIER)) || make(makesum)
-# PATCH_SITES+=	http://gppl.moonbone.ru/:hier812055
-# PATCHFILES+=	hier-Pg8.1.2-0.5.5.diff.gz:hier812055
-# USE_BISON=	yes
-# .  endif
+.  if (defined(SERVER_ONLY) && defined(WITH_HIER)) || make(makesum)
+PATCH_SITES+=	http://gppl.moonbone.ru/:hier820055
+PATCHFILES+=	hier-v0.5.5-Pg8.2.0.diff.gz:hier820055
+USE_BISON=	yes
+.  endif
 
 # .  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 # USE_AUTOTOOLS=	autoconf:259
diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo
index 8a35f746d9be..2dbebd41916b 100644
--- a/databases/postgresql84-server/distinfo
+++ b/databases/postgresql84-server/distinfo
@@ -1,12 +1,12 @@
-MD5 (postgresql/postgresql-base-8.2.4.tar.bz2) = 5c0576627c9969a3cedb6b014fb6ae05
-SHA256 (postgresql/postgresql-base-8.2.4.tar.bz2) = 8ee5ad364ee21079ce3d726b4abcfa0f318015a331e37e9856a3500fcce74cca
-SIZE (postgresql/postgresql-base-8.2.4.tar.bz2) = 8549159
-MD5 (postgresql/postgresql-opt-8.2.4.tar.bz2) = b71b0526e7c8af22d82fbc7b6f81a750
-SHA256 (postgresql/postgresql-opt-8.2.4.tar.bz2) = 5977ca1f0913aa98bc889e49b38768621865959b14e2674e7716d44b7fe9eb35
-SIZE (postgresql/postgresql-opt-8.2.4.tar.bz2) = 167612
-MD5 (postgresql/postgresql-docs-8.2.4.tar.bz2) = 7d520a0fc88c8b59338c25cf18331f6a
-SHA256 (postgresql/postgresql-docs-8.2.4.tar.bz2) = 2bb5bea974a68f562e40104d756ea87dbd831cf8fbd4bb54faca38f23c87de4c
-SIZE (postgresql/postgresql-docs-8.2.4.tar.bz2) = 2769630
-MD5 (postgresql/postgresql-test-8.2.4.tar.bz2) = 0fefe28b8c9d16ebdf6f05c366477a9d
-SHA256 (postgresql/postgresql-test-8.2.4.tar.bz2) = fc4471ecece04251289cfe7feb0acbafa3a18cf8f35c2d61ce3f68bd4394e504
-SIZE (postgresql/postgresql-test-8.2.4.tar.bz2) = 985819
+MD5 (postgresql/postgresql-base-8.2.5.tar.bz2) = 5879b205b635f3fb905f6015c50f4edd
+SHA256 (postgresql/postgresql-base-8.2.5.tar.bz2) = b70a2cc0d0613944ce0eae99c1001894354b77e81c8ae45f6c8c890709861929
+SIZE (postgresql/postgresql-base-8.2.5.tar.bz2) = 8602348
+MD5 (postgresql/postgresql-opt-8.2.5.tar.bz2) = dea12379311886d825fe7090884521b7
+SHA256 (postgresql/postgresql-opt-8.2.5.tar.bz2) = 0d64c3fd4fb097126d9cb7d599fbd86435f23d887f7985c9fdb441db4e3c9ae5
+SIZE (postgresql/postgresql-opt-8.2.5.tar.bz2) = 167549
+MD5 (postgresql/postgresql-docs-8.2.5.tar.bz2) = d9edbcbebd620dbeaa42a04c0a2fd900
+SHA256 (postgresql/postgresql-docs-8.2.5.tar.bz2) = 8824f13eaca20328ffa1244ba036c51890a718f40683b9e3003e72b77a1f774d
+SIZE (postgresql/postgresql-docs-8.2.5.tar.bz2) = 2773777
+MD5 (postgresql/postgresql-test-8.2.5.tar.bz2) = a4d39451e13cef32df96df35e24643cb
+SHA256 (postgresql/postgresql-test-8.2.5.tar.bz2) = 89174ef45e2ce09221d31c57745ecc18ea8f28389b0ba541ec2f26ba656dc752
+SIZE (postgresql/postgresql-test-8.2.5.tar.bz2) = 987137
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 6bbaefa68ff1..b31a698b074f 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.2.4
-PORTREVISION?=	1
+PORTVERSION?=	8.2.5
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -101,17 +101,17 @@ OPTIONS+=	DEBUG "Builds with debugging symbols" off
 #OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
 
 # See http://gppl.moonbone.ru/ for more info
-#OPTIONS+=	HIER  "Builds with query hierarchy (server)" off
+OPTIONS+=	HIER  "Builds with query hierarchy (server)" off
 
 # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
 # (requires dump/restore if modified.)
 OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 
-# .  if (defined(SERVER_ONLY) && defined(WITH_HIER)) || make(makesum)
-# PATCH_SITES+=	http://gppl.moonbone.ru/:hier812055
-# PATCHFILES+=	hier-Pg8.1.2-0.5.5.diff.gz:hier812055
-# USE_BISON=	yes
-# .  endif
+.  if (defined(SERVER_ONLY) && defined(WITH_HIER)) || make(makesum)
+PATCH_SITES+=	http://gppl.moonbone.ru/:hier820055
+PATCHFILES+=	hier-v0.5.5-Pg8.2.0.diff.gz:hier820055
+USE_BISON=	yes
+.  endif
 
 # .  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 # USE_AUTOTOOLS=	autoconf:259
diff --git a/databases/postgresql90-server/distinfo b/databases/postgresql90-server/distinfo
index 8a35f746d9be..2dbebd41916b 100644
--- a/databases/postgresql90-server/distinfo
+++ b/databases/postgresql90-server/distinfo
@@ -1,12 +1,12 @@
-MD5 (postgresql/postgresql-base-8.2.4.tar.bz2) = 5c0576627c9969a3cedb6b014fb6ae05
-SHA256 (postgresql/postgresql-base-8.2.4.tar.bz2) = 8ee5ad364ee21079ce3d726b4abcfa0f318015a331e37e9856a3500fcce74cca
-SIZE (postgresql/postgresql-base-8.2.4.tar.bz2) = 8549159
-MD5 (postgresql/postgresql-opt-8.2.4.tar.bz2) = b71b0526e7c8af22d82fbc7b6f81a750
-SHA256 (postgresql/postgresql-opt-8.2.4.tar.bz2) = 5977ca1f0913aa98bc889e49b38768621865959b14e2674e7716d44b7fe9eb35
-SIZE (postgresql/postgresql-opt-8.2.4.tar.bz2) = 167612
-MD5 (postgresql/postgresql-docs-8.2.4.tar.bz2) = 7d520a0fc88c8b59338c25cf18331f6a
-SHA256 (postgresql/postgresql-docs-8.2.4.tar.bz2) = 2bb5bea974a68f562e40104d756ea87dbd831cf8fbd4bb54faca38f23c87de4c
-SIZE (postgresql/postgresql-docs-8.2.4.tar.bz2) = 2769630
-MD5 (postgresql/postgresql-test-8.2.4.tar.bz2) = 0fefe28b8c9d16ebdf6f05c366477a9d
-SHA256 (postgresql/postgresql-test-8.2.4.tar.bz2) = fc4471ecece04251289cfe7feb0acbafa3a18cf8f35c2d61ce3f68bd4394e504
-SIZE (postgresql/postgresql-test-8.2.4.tar.bz2) = 985819
+MD5 (postgresql/postgresql-base-8.2.5.tar.bz2) = 5879b205b635f3fb905f6015c50f4edd
+SHA256 (postgresql/postgresql-base-8.2.5.tar.bz2) = b70a2cc0d0613944ce0eae99c1001894354b77e81c8ae45f6c8c890709861929
+SIZE (postgresql/postgresql-base-8.2.5.tar.bz2) = 8602348
+MD5 (postgresql/postgresql-opt-8.2.5.tar.bz2) = dea12379311886d825fe7090884521b7
+SHA256 (postgresql/postgresql-opt-8.2.5.tar.bz2) = 0d64c3fd4fb097126d9cb7d599fbd86435f23d887f7985c9fdb441db4e3c9ae5
+SIZE (postgresql/postgresql-opt-8.2.5.tar.bz2) = 167549
+MD5 (postgresql/postgresql-docs-8.2.5.tar.bz2) = d9edbcbebd620dbeaa42a04c0a2fd900
+SHA256 (postgresql/postgresql-docs-8.2.5.tar.bz2) = 8824f13eaca20328ffa1244ba036c51890a718f40683b9e3003e72b77a1f774d
+SIZE (postgresql/postgresql-docs-8.2.5.tar.bz2) = 2773777
+MD5 (postgresql/postgresql-test-8.2.5.tar.bz2) = a4d39451e13cef32df96df35e24643cb
+SHA256 (postgresql/postgresql-test-8.2.5.tar.bz2) = 89174ef45e2ce09221d31c57745ecc18ea8f28389b0ba541ec2f26ba656dc752
+SIZE (postgresql/postgresql-test-8.2.5.tar.bz2) = 987137
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 6bbaefa68ff1..b31a698b074f 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.2.4
-PORTREVISION?=	1
+PORTVERSION?=	8.2.5
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -101,17 +101,17 @@ OPTIONS+=	DEBUG "Builds with debugging symbols" off
 #OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
 
 # See http://gppl.moonbone.ru/ for more info
-#OPTIONS+=	HIER  "Builds with query hierarchy (server)" off
+OPTIONS+=	HIER  "Builds with query hierarchy (server)" off
 
 # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
 # (requires dump/restore if modified.)
 OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 
-# .  if (defined(SERVER_ONLY) && defined(WITH_HIER)) || make(makesum)
-# PATCH_SITES+=	http://gppl.moonbone.ru/:hier812055
-# PATCHFILES+=	hier-Pg8.1.2-0.5.5.diff.gz:hier812055
-# USE_BISON=	yes
-# .  endif
+.  if (defined(SERVER_ONLY) && defined(WITH_HIER)) || make(makesum)
+PATCH_SITES+=	http://gppl.moonbone.ru/:hier820055
+PATCHFILES+=	hier-v0.5.5-Pg8.2.0.diff.gz:hier820055
+USE_BISON=	yes
+.  endif
 
 # .  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 # USE_AUTOTOOLS=	autoconf:259
diff --git a/databases/postgresql91-server/distinfo b/databases/postgresql91-server/distinfo
index 8a35f746d9be..2dbebd41916b 100644
--- a/databases/postgresql91-server/distinfo
+++ b/databases/postgresql91-server/distinfo
@@ -1,12 +1,12 @@
-MD5 (postgresql/postgresql-base-8.2.4.tar.bz2) = 5c0576627c9969a3cedb6b014fb6ae05
-SHA256 (postgresql/postgresql-base-8.2.4.tar.bz2) = 8ee5ad364ee21079ce3d726b4abcfa0f318015a331e37e9856a3500fcce74cca
-SIZE (postgresql/postgresql-base-8.2.4.tar.bz2) = 8549159
-MD5 (postgresql/postgresql-opt-8.2.4.tar.bz2) = b71b0526e7c8af22d82fbc7b6f81a750
-SHA256 (postgresql/postgresql-opt-8.2.4.tar.bz2) = 5977ca1f0913aa98bc889e49b38768621865959b14e2674e7716d44b7fe9eb35
-SIZE (postgresql/postgresql-opt-8.2.4.tar.bz2) = 167612
-MD5 (postgresql/postgresql-docs-8.2.4.tar.bz2) = 7d520a0fc88c8b59338c25cf18331f6a
-SHA256 (postgresql/postgresql-docs-8.2.4.tar.bz2) = 2bb5bea974a68f562e40104d756ea87dbd831cf8fbd4bb54faca38f23c87de4c
-SIZE (postgresql/postgresql-docs-8.2.4.tar.bz2) = 2769630
-MD5 (postgresql/postgresql-test-8.2.4.tar.bz2) = 0fefe28b8c9d16ebdf6f05c366477a9d
-SHA256 (postgresql/postgresql-test-8.2.4.tar.bz2) = fc4471ecece04251289cfe7feb0acbafa3a18cf8f35c2d61ce3f68bd4394e504
-SIZE (postgresql/postgresql-test-8.2.4.tar.bz2) = 985819
+MD5 (postgresql/postgresql-base-8.2.5.tar.bz2) = 5879b205b635f3fb905f6015c50f4edd
+SHA256 (postgresql/postgresql-base-8.2.5.tar.bz2) = b70a2cc0d0613944ce0eae99c1001894354b77e81c8ae45f6c8c890709861929
+SIZE (postgresql/postgresql-base-8.2.5.tar.bz2) = 8602348
+MD5 (postgresql/postgresql-opt-8.2.5.tar.bz2) = dea12379311886d825fe7090884521b7
+SHA256 (postgresql/postgresql-opt-8.2.5.tar.bz2) = 0d64c3fd4fb097126d9cb7d599fbd86435f23d887f7985c9fdb441db4e3c9ae5
+SIZE (postgresql/postgresql-opt-8.2.5.tar.bz2) = 167549
+MD5 (postgresql/postgresql-docs-8.2.5.tar.bz2) = d9edbcbebd620dbeaa42a04c0a2fd900
+SHA256 (postgresql/postgresql-docs-8.2.5.tar.bz2) = 8824f13eaca20328ffa1244ba036c51890a718f40683b9e3003e72b77a1f774d
+SIZE (postgresql/postgresql-docs-8.2.5.tar.bz2) = 2773777
+MD5 (postgresql/postgresql-test-8.2.5.tar.bz2) = a4d39451e13cef32df96df35e24643cb
+SHA256 (postgresql/postgresql-test-8.2.5.tar.bz2) = 89174ef45e2ce09221d31c57745ecc18ea8f28389b0ba541ec2f26ba656dc752
+SIZE (postgresql/postgresql-test-8.2.5.tar.bz2) = 987137
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 6bbaefa68ff1..b31a698b074f 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.2.4
-PORTREVISION?=	1
+PORTVERSION?=	8.2.5
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -101,17 +101,17 @@ OPTIONS+=	DEBUG "Builds with debugging symbols" off
 #OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
 
 # See http://gppl.moonbone.ru/ for more info
-#OPTIONS+=	HIER  "Builds with query hierarchy (server)" off
+OPTIONS+=	HIER  "Builds with query hierarchy (server)" off
 
 # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
 # (requires dump/restore if modified.)
 OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 
-# .  if (defined(SERVER_ONLY) && defined(WITH_HIER)) || make(makesum)
-# PATCH_SITES+=	http://gppl.moonbone.ru/:hier812055
-# PATCHFILES+=	hier-Pg8.1.2-0.5.5.diff.gz:hier812055
-# USE_BISON=	yes
-# .  endif
+.  if (defined(SERVER_ONLY) && defined(WITH_HIER)) || make(makesum)
+PATCH_SITES+=	http://gppl.moonbone.ru/:hier820055
+PATCHFILES+=	hier-v0.5.5-Pg8.2.0.diff.gz:hier820055
+USE_BISON=	yes
+.  endif
 
 # .  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 # USE_AUTOTOOLS=	autoconf:259
diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo
index 8a35f746d9be..2dbebd41916b 100644
--- a/databases/postgresql92-server/distinfo
+++ b/databases/postgresql92-server/distinfo
@@ -1,12 +1,12 @@
-MD5 (postgresql/postgresql-base-8.2.4.tar.bz2) = 5c0576627c9969a3cedb6b014fb6ae05
-SHA256 (postgresql/postgresql-base-8.2.4.tar.bz2) = 8ee5ad364ee21079ce3d726b4abcfa0f318015a331e37e9856a3500fcce74cca
-SIZE (postgresql/postgresql-base-8.2.4.tar.bz2) = 8549159
-MD5 (postgresql/postgresql-opt-8.2.4.tar.bz2) = b71b0526e7c8af22d82fbc7b6f81a750
-SHA256 (postgresql/postgresql-opt-8.2.4.tar.bz2) = 5977ca1f0913aa98bc889e49b38768621865959b14e2674e7716d44b7fe9eb35
-SIZE (postgresql/postgresql-opt-8.2.4.tar.bz2) = 167612
-MD5 (postgresql/postgresql-docs-8.2.4.tar.bz2) = 7d520a0fc88c8b59338c25cf18331f6a
-SHA256 (postgresql/postgresql-docs-8.2.4.tar.bz2) = 2bb5bea974a68f562e40104d756ea87dbd831cf8fbd4bb54faca38f23c87de4c
-SIZE (postgresql/postgresql-docs-8.2.4.tar.bz2) = 2769630
-MD5 (postgresql/postgresql-test-8.2.4.tar.bz2) = 0fefe28b8c9d16ebdf6f05c366477a9d
-SHA256 (postgresql/postgresql-test-8.2.4.tar.bz2) = fc4471ecece04251289cfe7feb0acbafa3a18cf8f35c2d61ce3f68bd4394e504
-SIZE (postgresql/postgresql-test-8.2.4.tar.bz2) = 985819
+MD5 (postgresql/postgresql-base-8.2.5.tar.bz2) = 5879b205b635f3fb905f6015c50f4edd
+SHA256 (postgresql/postgresql-base-8.2.5.tar.bz2) = b70a2cc0d0613944ce0eae99c1001894354b77e81c8ae45f6c8c890709861929
+SIZE (postgresql/postgresql-base-8.2.5.tar.bz2) = 8602348
+MD5 (postgresql/postgresql-opt-8.2.5.tar.bz2) = dea12379311886d825fe7090884521b7
+SHA256 (postgresql/postgresql-opt-8.2.5.tar.bz2) = 0d64c3fd4fb097126d9cb7d599fbd86435f23d887f7985c9fdb441db4e3c9ae5
+SIZE (postgresql/postgresql-opt-8.2.5.tar.bz2) = 167549
+MD5 (postgresql/postgresql-docs-8.2.5.tar.bz2) = d9edbcbebd620dbeaa42a04c0a2fd900
+SHA256 (postgresql/postgresql-docs-8.2.5.tar.bz2) = 8824f13eaca20328ffa1244ba036c51890a718f40683b9e3003e72b77a1f774d
+SIZE (postgresql/postgresql-docs-8.2.5.tar.bz2) = 2773777
+MD5 (postgresql/postgresql-test-8.2.5.tar.bz2) = a4d39451e13cef32df96df35e24643cb
+SHA256 (postgresql/postgresql-test-8.2.5.tar.bz2) = 89174ef45e2ce09221d31c57745ecc18ea8f28389b0ba541ec2f26ba656dc752
+SIZE (postgresql/postgresql-test-8.2.5.tar.bz2) = 987137