3 files changed, 9 insertions, 24 deletions

diff --git a/databases/postgresql82-client/Makefile b/databases/postgresql82-client/Makefile
index 96dd30b45897..532b039772da 100644
--- a/databases/postgresql82-client/Makefile
+++ b/databases/postgresql82-client/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	postgresql
 PKGNAMESUFFIX=	-client
-PORTREVISION=	1
+PORTREVISION=	0
 
 COMMENT=	PostgreSQL database (client)
 
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index cd6a0824428d..5b4fc72a06f3 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.2.6
+PORTVERSION?=	8.2.7
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
@@ -39,11 +39,15 @@ GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include \
+		--enable-thread-safety \
 		--with-docdir=${DOCSDIR}
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
+CFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
+
 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 
 BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
@@ -86,8 +90,6 @@ 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+=	OPTIMIZED_CFLAGS "Builds with compiler optimizations (-O3)" off
-OPTIONS+=	LIBC_R "Link w/ libc_r, used by plpython (server)" off
-OPTIONS+=	THREADSAFE "make libpq thread safe" off
 #  to run regression tests:
 OPTIONS+=	TESTS "Allows the use of a \"check\" target (server)" off
 OPTIONS+=	DEBUG "Builds with debugging symbols" off
@@ -95,19 +97,10 @@ OPTIONS+=	DEBUG "Builds with debugging symbols" off
 # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info
 #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
-
 # 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/:hier820055
-PATCHFILES+=	hier-v0.5.5-Pg8.2.0.diff.gz:hier820055
-USE_BISON=	build
-.  endif
-
 # .  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 # USE_AUTOTOOLS=	autoconf:261
 # CONFIGURE_ARGS+=--with-icu
@@ -181,14 +174,6 @@ CONFIGURE_ARGS+=--with-krb5
 .    endif
 .  endif
 
-.  if defined(WITH_THREADSAFE)
-CONFIGURE_ARGS+=--enable-thread-safety
-.  endif
-
-.  if defined(SERVER_ONLY) && defined(WITH_LIBC_R)
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
-.  endif
 .endif # !SLAVE_ONLY
 
 .if defined(CLIENT_ONLY)
diff --git a/databases/postgresql82-server/distinfo b/databases/postgresql82-server/distinfo
index af5d21f83da7..b6793c98896c 100644
--- a/databases/postgresql82-server/distinfo
+++ b/databases/postgresql82-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (postgresql/postgresql-8.2.6.tar.bz2) = 17b9049b4fcad42ee95410833c1db228
-SHA256 (postgresql/postgresql-8.2.6.tar.bz2) = ee41327e821f933de2894d6e0c319edc4b63e80cb902e673b490b7eaf4ead114
-SIZE (postgresql/postgresql-8.2.6.tar.bz2) = 12559117
+MD5 (postgresql/postgresql-8.2.7.tar.bz2) = e8b21cbc20ec23a1d9490fdfbaa7c09e
+SHA256 (postgresql/postgresql-8.2.7.tar.bz2) = 39528d1ba50f5abc51569e8b9bdeb47d0d4650d289a2c2e465621864b1ff3584
+SIZE (postgresql/postgresql-8.2.7.tar.bz2) = 12576126