diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 92705fda247b..7f0c26abe4c8 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -1,326 +1,326 @@
 # New ports collection makefile for:	PostgreSQL
 # Date created:		November 13, 1998
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.0.11
+PORTVERSION?=	8.0.12
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
 PKGNAMESUFFIX?=	-server
 DISTFILES?=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
 		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
 
 CONFLICTS?=	${PORTNAME}-client-7.* \
 		${PORTNAME}${PKGNAMESUFFIX}-7.* \
 		${PORTNAME}-client-8.[1-9]* \
 		${PORTNAME}${PKGNAMESUFFIX}-8.[1-9]*
 
 WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
 UNIQUENAME?=	${PORTNAME}80
 LATEST_LINK?=	${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
 
 PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
 USE_BZIP2=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 .if defined(NO_BUILD)
 .undef USE_GMAKE
 .undef GNU_CONFIGURE
 .endif
 
 CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include \
 		--with-docdir=${DOCSDIR}
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 
 BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
 		src/bin/initdb src/bin/ipcclean src/bin/pg_ctl src/bin/pg_controldata \
 		src/bin/pg_resetxlog src/pl
 INSTALL_DIRS?=	${BUILD_DIRS}
 
 .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
 SERVER_ONLY=	yes
 USE_RC_SUBR=	postgresql
 SUB_FILES+=	dot.cshrc dot.profile
 USE_PGSQL=	yes
 WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
 .endif
 
 .if !defined(SLAVE_ONLY)
 OPTIONS=	NLS "Use internationalized messages" on
 .endif
 
 # Cannot check this with standard OPTION due to a catch-22.
 # USE_OPENSSL must precede bsd.port.pre.mk, but then we don't know
 # what OPTIONS are set.
 #
 # If you *don't* want SSL, set WITHOUT_SSL=YES when making
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=--with-openssl
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "alpha" && ${OSVERSION} < 500000
 BROKEN=		Coredump during build on alpha 4.x
 .endif
 
 .if !defined(SLAVE_ONLY)
 # gnugetopt will always be used if already installed
 .  if ( ${OSVERSION} < 500041 ) && !exists(${LOCALBASE}/include/getopt.h)
 OPTIONS+=	GNUGETOPT "Use GNU getopt" on
 .  endif
 OPTIONS+=	PAM "Build with PAM support (server only)" 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
 
 # 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/:hier801055
 PATCHFILES+=	hier-Pg8.0.3-0.5.5.diff.gz:hier801055
 USE_BISON=	yes
 .  endif
 
 .  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 USE_AUTOTOOLS=	autoconf:253
 CONFIGURE_ARGS+=--with-icu
 LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
 PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
 PATCHFILES+=	pg-808-icu-xx-2006-09-25.diff.gz:icu
 .  endif
 
 .  ifmake makesum
 DISTFILES+=	postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
 .  endif
 
 PATCH_DIST_STRIP=-p1
 
 .  if defined(SERVER_ONLY) && defined(WITH_PAM)
 CONFIGURE_ARGS+=--with-pam
 .  endif
 
 .  if defined(WITH_INTDATE)
 CONFIGURE_ARGS+=--enable-integer-datetimes
 .  endif
 
 . if !defined(WITHOUT_GNUGETOPT) || exists(${LOCALBASE}/include/getopt.h)
 USE_GETOPT_LONG=yes
 .  endif
 
 .  if !(defined(WITHOUT_GETTEXT) || defined(WITHOUT_NLS))
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	GETTEXT=""
 USE_GETTEXT=	YES
 .  else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	GETTEXT="@comment "
 .  endif
 
 .  if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O3 -funroll-loops
 .  endif
 
 .  if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 INSTALL_TARGET=	install
 .  else
 INSTALL_TARGET=	install-strip
 .  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"
 .    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
 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.21:${PORTSDIR}/security/heimdal
 CONFIGURE_ARGS+=--with-krb5
 .    endif
 .  endif
 
 .  if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || make(makesum)
 DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
 EXTRA_PATCHES=	${FILESDIR}/regresspatch-src-test-regress-pgregress-sh
 .  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)
 MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1   \
 		dropdb.1 droplang.1 dropuser.1 ecpg.1 initdb.1	   \
 		ipcclean.1 pg_config.1 pg_controldata.1 pg_ctl.1   \
 		pg_dump.1 pg_dumpall.1 pg_resetxlog.1 pg_restore.1 \
 		postgres.1 postmaster.1 psql.1 vacuumdb.1
 
 MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
 		alter_domain.7 alter_function.7 alter_group.7		      \
 		alter_index.7 alter_language.7 alter_operator_class.7	      \
 		alter_schema.7 alter_sequence.7 alter_table.7		      \
 		alter_trigger.7 alter_user.7 analyze.7 begin.7		      \
 		checkpoint.7 close.7 cluster.7 comment.7 commit.7	      \
 		copy.7 create_aggregate.7 create_cast.7			      \
 		create_constraint_trigger.7 create_conversion.7		      \
 		create_database.7 create_domain.7 create_function.7	      \
 		create_group.7 create_index.7 create_language.7		      \
 		create_operator.7 create_operator_class.7		      \
 		create_rule.7 create_schema.7 create_sequence.7		      \
 		create_table.7 create_table_as.7 create_trigger.7	      \
 		create_type.7 create_user.7 create_view.7 deallocate.7	      \
 		declare.7 delete.7					      \
 		drop_aggregate.7 drop_cast.7 drop_conversion.7		      \
 		drop_database.7 drop_domain.7 drop_function.7		      \
 		drop_group.7 drop_index.7 drop_language.7		      \
 		drop_operator.7 drop_operator_class.7 drop_rule.7	      \
 		drop_schema.7 drop_sequence.7 drop_table.7 drop_trigger.7     \
 		drop_type.7 drop_user.7 drop_view.7 end.7 execute.7	      \
 		explain.7 fetch.7 grant.7 insert.7 listen.7 load.7	      \
 		lock.7 move.7 notify.7 prepare.7 reindex.7 reset.7	      \
 		revoke.7 rollback.7 select.7 select_into.7 set.7	      \
 		set_constraints.7 set_transaction.7 show.7		      \
 		set_session_authorization.7 start_transaction.7		      \
 		spi_connect.7 spi_copytuple.7 spi_cursor_close.7	      \
 		spi_cursor_fetch.7 spi_cursor_find.7 spi_cursor_move.7	      \
 		spi_cursor_open.7 spi_exec.7 spi_execp.7 spi_execute.7	      \
 		spi_execute_plan.7					      \
 		spi_finish.7 spi_fname.7 spi_fnumber.7 spi_freeplan.7	      \
 		spi_freetuple.7 spi_freetuptable.7 spi_getargcount.7	      \
 		spi_getargtypeid.7 spi_getbinval.7 spi_getrelname.7	      \
 		spi_gettype.7 spi_gettypeid.7 spi_getvalue.7		      \
 		spi_is_cursor_plan.7 spi_modifytuple.7 spi_palloc.7	      \
 		spi_pfree.7 spi_pop.7 spi_prepare.7 spi_push.7		      \
 		spi_repalloc.7 spi_returntuple.7 spi_saveplan.7		      \
 		truncate.7 unlisten.7 update.7 vacuum.7			      \
 		alter_operator.7 alter_tablespace.7 alter_type.7	      \
 		create_tablespace.7 drop_tablespace.7			      \
 		release_savepoint.7 rollback_to_savepoint.7		      \
 		savepoint.7
 .endif
 
 .if defined(SERVER_ONLY)
 pre-everything::
 	@${SH} ${PKGINSTALL} ${PORTNAME} BACKUPWARNING
 .endif
 
 .if !defined(NO_BUILD)
 
 pre-configure:
 .  if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
 	@${ECHO} "MIT's and Heimdal Kerberos are mutually exclusive."
 	@${ECHO} "Please choose one or the other."
 	@exit 1
 .  endif
 
 do-build:
 	@ cd ${WRKSRC}/src/backend ;\
 	${GMAKE} ../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
 	@ for dir in ${BUILD_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \
 	done
 
 .  if exists(${FILESDIR}/pkg-message${PKGNAMESUFFIX}.in)
 SUB_FILES+=	pkg-message${PKGNAMESUFFIX}
 PKGMESSAGE=	${WRKSRC}/pkg-message${PKGNAMESUFFIX}
 .  endif
 .endif
 
 .if defined(SERVER_ONLY)
 pre-su-install:
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
 
 .if !defined(NO_BUILD)
 do-install:
 	@for dir in ${INSTALL_DIRS}; do \
 	    cd ${WRKSRC}/$${dir} && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \
 	done
 .  if defined(SERVER_ONLY)
 	@ ${MKDIR} ${PREFIX}/share/postgresql
 .    for i in profile cshrc
 	${INSTALL_DATA} ${WRKDIR}/dot.$i ${PREFIX}/share/postgresql/dot.$i.dist; \
 	${INSTALL_DATA} -o pgsql -g pgsql ${WRKDIR}/dot.$i ~pgsql/dot.$i.dist ; \
 	if [ ! -f ~pgsql/.$i ]; then \
 		${CP} -p ~pgsql/dot.$i.dist ~pgsql/.$i; \
 	fi
 .    endfor
 	@ ${CHOWN} -R pgsql:pgsql ~pgsql/. ;\
 	${MKDIR} ${PREFIX}/etc/periodic/daily ;\
 	${INSTALL_SCRIPT} ${FILESDIR}/502.pgsql \
 			${PREFIX}/etc/periodic/daily
 .  endif # SERVER_ONLY
 .  if defined(CLIENT_ONLY)
 	@ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} install-local
 .  endif
 	@ if [ -r ${PKGMESSAGE} ]; then \
 		${MKDIR} ${DOCSDIR} ;\
 		${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${PKGNAMESUFFIX} ;\
 		${ECHO} "======================================================================" ;\
 		${CAT} ${PKGMESSAGE} ;\
 		${ECHO} "======================================================================" ;\
 	fi
 .endif # !NO_BUILD
 
 .if defined(SERVER_ONLY) && defined(WITH_TESTS)
 check:
 	@if [ `id -u` != 0 ] ; then \
 	  ${ECHO} "Running postgresql regressions tests" ;\
 	  cd ${WRKSRC}; ${GMAKE} check ;\
 	 else \
 	  ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \
 	  ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\
 	 fi
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/postgresql80-server/distinfo b/databases/postgresql80-server/distinfo
index 54d1b47fe0b6..2e9d5dd21ca5 100644
--- a/databases/postgresql80-server/distinfo
+++ b/databases/postgresql80-server/distinfo
@@ -1,18 +1,18 @@
-MD5 (postgresql/postgresql-base-8.0.11.tar.bz2) = 8ec24b4b039679df791a3f719e26ee01
-SHA256 (postgresql/postgresql-base-8.0.11.tar.bz2) = c2c629cdc88645eb0828cd3799b508a6d9954176abf9df97ed11ece097891f3f
-SIZE (postgresql/postgresql-base-8.0.11.tar.bz2) = 7842493
-MD5 (postgresql/postgresql-opt-8.0.11.tar.bz2) = 3b44f2f7afa5f2461a9e3c16b071bc14
-SHA256 (postgresql/postgresql-opt-8.0.11.tar.bz2) = 548c2adcb432e3bd826deff0fefae8ff11000883738562b5862784fcb1040933
-SIZE (postgresql/postgresql-opt-8.0.11.tar.bz2) = 134664
-MD5 (postgresql/postgresql-docs-8.0.11.tar.bz2) = 018180bc9701f12a05a85ac1a5c8952b
-SHA256 (postgresql/postgresql-docs-8.0.11.tar.bz2) = 9dba452c057fa2db975ae9368af46aa655743387ff5e81884c605da171e6c8e5
-SIZE (postgresql/postgresql-docs-8.0.11.tar.bz2) = 2267159
-MD5 (postgresql/postgresql-test-8.0.11.tar.bz2) = 1ea7f22de83fb601619a7a391d6367e6
-SHA256 (postgresql/postgresql-test-8.0.11.tar.bz2) = 8de6cabd400b0ef483dd90b36a3106dd854d9bab5944920385dcad4fd7862217
-SIZE (postgresql/postgresql-test-8.0.11.tar.bz2) = 932100
+MD5 (postgresql/postgresql-base-8.0.12.tar.bz2) = 4905afe1beb0e58b348be9558579a24a
+SHA256 (postgresql/postgresql-base-8.0.12.tar.bz2) = 2aec1d7129794fb29546e76bb0594f0c8ee6e37e8a155b201c15504af0740628
+SIZE (postgresql/postgresql-base-8.0.12.tar.bz2) = 7846737
+MD5 (postgresql/postgresql-opt-8.0.12.tar.bz2) = 31722557a313a3690c894d9a6e42244d
+SHA256 (postgresql/postgresql-opt-8.0.12.tar.bz2) = ceaf90195860694487918032c19e0a11f991d74c77838cac2ea827d6c85f54da
+SIZE (postgresql/postgresql-opt-8.0.12.tar.bz2) = 134790
+MD5 (postgresql/postgresql-docs-8.0.12.tar.bz2) = 01e8cd276e1c51fb45921b7926700527
+SHA256 (postgresql/postgresql-docs-8.0.12.tar.bz2) = 04d233b68be2f4549a8a470166e7f6f175c5165722763c515e7230de0efa63d3
+SIZE (postgresql/postgresql-docs-8.0.12.tar.bz2) = 2266536
+MD5 (postgresql/postgresql-test-8.0.12.tar.bz2) = b48ee828885011892d4ce66548459c08
+SHA256 (postgresql/postgresql-test-8.0.12.tar.bz2) = 54da2084d7ac970155836b5cf1d278b357df8a67d2a5af101f3390f866de18ac
+SIZE (postgresql/postgresql-test-8.0.12.tar.bz2) = 931028
 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
 MD5 (postgresql/pg-808-icu-xx-2006-09-25.diff.gz) = f4b4d2d0f7f7ac122d74ce9f983dd57a
 SHA256 (postgresql/pg-808-icu-xx-2006-09-25.diff.gz) = 5763a08d2a24ee1ab4ac11dc5cfd0d7f7e5806a1b1b1ace4b775a474868c5865
 SIZE (postgresql/pg-808-icu-xx-2006-09-25.diff.gz) = 4346
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index b2e5f4fe3ac6..c0197a8b3ec7 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -1,333 +1,333 @@
 # New ports collection makefile for:	PostgreSQL
 # Date created:		November 13, 1998
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.1.7
+PORTVERSION?=	8.1.8
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
 PKGNAMESUFFIX?=	-server
 DISTFILES?=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
 		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
 
 CONFLICTS?=	${PORTNAME}-client-7.* \
 		${PORTNAME}${PKGNAMESUFFIX}-7.* \
 		${PORTNAME}-client-8.[02-9]* \
 		${PORTNAME}${PKGNAMESUFFIX}-8.[02-9]*
 
 WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
 UNIQUENAME?=	${PORTNAME}81
 LATEST_LINK?=	${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
 
 PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
 USE_BZIP2=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 .if defined(NO_BUILD)
 .undef USE_GMAKE
 .undef GNU_CONFIGURE
 .endif
 
 CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include \
 		--with-docdir=${DOCSDIR}
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 
 BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
 		src/bin/initdb src/bin/ipcclean src/bin/pg_ctl src/bin/pg_controldata \
 		src/bin/pg_resetxlog src/pl
 
 INSTALL_DIRS?=	${BUILD_DIRS}
 
 .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
 SERVER_ONLY=	yes
 USE_RC_SUBR=	postgresql
 SUB_FILES+=	dot.cshrc dot.profile
 USE_PGSQL=	yes
 WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
 .endif
 
 .if !defined(SLAVE_ONLY)
 OPTIONS=	NLS "Use internationalized messages" on
 .endif
 
 # Cannot check this with standard OPTION due to a catch-22.
 # USE_OPENSSL must precede bsd.port.pre.mk, but then we don't know
 # what OPTIONS are set.
 #
 # If you *don't* want SSL, set WITHOUT_SSL=YES when making
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=--with-openssl
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "alpha" && ${OSVERSION} < 500000
 BROKEN=		Coredump during build on alpha 4.x
 .endif
 
 .if !defined(SLAVE_ONLY)
 # gnugetopt will always be used if already installed
 .  if ( ${OSVERSION} < 500041 ) && !exists(${LOCALBASE}/include/getopt.h)
 OPTIONS+=	GNUGETOPT "Use GNU getopt" on
 .  endif
 OPTIONS+=	PAM "Build with PAM support (server only)" 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
 
 # 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/:hier812055
 PATCHFILES+=	hier-Pg8.1.2-0.5.5.diff.gz:hier812055
 USE_BISON=	yes
 .  endif
 
 .  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 USE_AUTOTOOLS=	autoconf:259
 CONFIGURE_ARGS+=--with-icu
 LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
 PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
 PATCHFILES+=	pg-814-icu-xx-2006-09-25.diff.gz:icu
 .  endif
 
 PATCH_DIST_STRIP=-p1
 
 .  ifmake makesum
 DISTFILES+=	postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_PAM)
 CONFIGURE_ARGS+=--with-pam
 .  endif
 
 .  if defined(WITH_INTDATE)
 CONFIGURE_ARGS+=--enable-integer-datetimes
 .  endif
 
 . if !defined(WITHOUT_GNUGETOPT) || exists(${LOCALBASE}/include/getopt.h)
 USE_GETOPT_LONG=yes
 .  endif
 
 .  if !(defined(WITHOUT_GETTEXT) || defined(WITHOUT_NLS))
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	GETTEXT=""
 USE_GETTEXT=	YES
 .  else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	GETTEXT="@comment "
 .  endif
 
 .  if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O3 -funroll-loops
 .  endif
 
 .  if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 INSTALL_TARGET=	install
 .  else
 INSTALL_TARGET=	install-strip
 .  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"
 .    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
 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.21:${PORTSDIR}/security/heimdal
 CONFIGURE_ARGS+=--with-krb5
 .    endif
 .  endif
 
 .  if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || make(makesum)
 DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
 EXTRA_PATCHES=	${FILESDIR}/regresspatch-src-test-regress-pgregress-sh
 .  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)
 MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1   \
 		dropdb.1 droplang.1 dropuser.1 ecpg.1 initdb.1	   \
 		ipcclean.1 pg_config.1 pg_controldata.1 pg_ctl.1   \
 		pg_dump.1 pg_dumpall.1 pg_resetxlog.1 pg_restore.1 \
 		postgres.1 postmaster.1 psql.1 reindexdb.1 vacuumdb.1
 
 MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
 		alter_domain.7 alter_function.7 alter_group.7		      \
 		alter_index.7 alter_language.7 alter_operator_class.7	      \
 		alter_role.7						      \
 		alter_schema.7 alter_sequence.7 alter_table.7		      \
 		alter_trigger.7 alter_user.7 analyze.7 begin.7		      \
 		checkpoint.7 close.7 cluster.7 comment.7 commit.7	      \
 		commit_prepared.7					      \
 		copy.7 create_aggregate.7 create_cast.7			      \
 		create_constraint_trigger.7 create_conversion.7		      \
 		create_database.7 create_domain.7 create_function.7	      \
 		create_group.7 create_index.7 create_language.7		      \
 		create_operator.7 create_operator_class.7		      \
 		create_role.7						      \
 		create_rule.7 create_schema.7 create_sequence.7		      \
 		create_table.7 create_table_as.7 create_trigger.7	      \
 		create_type.7 create_user.7 create_view.7 deallocate.7	      \
 		declare.7 delete.7					      \
 		drop_aggregate.7 drop_cast.7 drop_conversion.7		      \
 		drop_database.7 drop_domain.7 drop_function.7		      \
 		drop_group.7 drop_index.7 drop_language.7		      \
 		drop_operator.7 drop_operator_class.7 drop_role.7	      \
 		drop_rule.7						      \
 		drop_schema.7 drop_sequence.7 drop_table.7 drop_trigger.7     \
 		drop_type.7 drop_user.7 drop_view.7 end.7 execute.7	      \
 		explain.7 fetch.7 grant.7 insert.7 listen.7 load.7	      \
 		lock.7 move.7 notify.7 prepare.7 prepare_transaction.7	      \
 		reindex.7 reset.7					      \
 		revoke.7 rollback.7 rollback_prepared.7 select.7	      \
 		select_into.7 set.7					      \
 		set_constraints.7 set_role.7 set_transaction.7 show.7	      \
 		set_session_authorization.7 start_transaction.7		      \
 		truncate.7 unlisten.7 update.7 vacuum.7			      \
 		alter_operator.7 alter_tablespace.7 alter_type.7	      \
 		create_tablespace.7 drop_tablespace.7			      \
 		release_savepoint.7 rollback_to_savepoint.7		      \
 		savepoint.7 \
 		spi_connect.7 spi_copytuple.7 spi_cursor_close.7 \
                 spi_cursor_fetch.7 spi_cursor_find.7 spi_cursor_move.7 \
                 spi_cursor_open.7 spi_exec.7 spi_execp.7 spi_execute.7 \
                 spi_execute_plan.7 spi_finish.7 spi_fname.7 spi_fnumber.7 \
                 spi_freeplan.7 spi_freetuple.7 spi_freetuptable.7 \
                 spi_getargcount.7 spi_getargtypeid.7 spi_getbinval.7 \
                 spi_getnspname.7 spi_getrelname.7 spi_gettype.7 \
 		spi_gettypeid.7 \
                 spi_getvalue.7 spi_is_cursor_plan.7 spi_modifytuple.7 \
                 spi_palloc.7 spi_pfree.7 spi_pop.7 spi_prepare.7 spi_push.7 \
                 spi_repalloc.7 spi_returntuple.7 spi_saveplan.7
 .endif
 
 .if defined(SERVER_ONLY)
 pre-everything::
 	@${SH} ${PKGINSTALL} ${PORTNAME} BACKUPWARNING
 .endif
 
 .if !defined(NO_BUILD)
 
 pre-configure:
 .  if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
 	@${ECHO} "MIT's and Heimdal Kerberos are mutually exclusive."
 	@${ECHO} "Please choose one or the other."
 	@exit 1
 .  endif
 
 do-build:
 	@ cd ${WRKSRC}/src/backend ;\
 	${GMAKE} ../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
 	@ for dir in ${BUILD_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \
 	done
 
 .  if exists(${FILESDIR}/pkg-message${PKGNAMESUFFIX}.in)
 SUB_FILES+=	pkg-message${PKGNAMESUFFIX}
 PKGMESSAGE=	${WRKSRC}/pkg-message${PKGNAMESUFFIX}
 .  endif
 .endif
 
 .if defined(SERVER_ONLY)
 pre-su-install:
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
 
 .if !defined(NO_BUILD)
 do-install:
 	@for dir in ${INSTALL_DIRS}; do \
 	    cd ${WRKSRC}/$${dir} && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \
 	done
 .  if defined(SERVER_ONLY)
 	@ ${MKDIR} ${PREFIX}/share/postgresql
 .    for i in profile cshrc
 	${INSTALL_DATA} ${WRKDIR}/dot.$i ${PREFIX}/share/postgresql/dot.$i.dist; \
 	${INSTALL_DATA} -o pgsql -g pgsql ${WRKDIR}/dot.$i ~pgsql/dot.$i.dist ; \
 	if [ ! -f ~pgsql/.$i ]; then \
 		${CP} -p ~pgsql/dot.$i.dist ~pgsql/.$i; \
 	fi
 .    endfor
 	@ ${CHOWN} -R pgsql:pgsql ~pgsql/. ;\
 	${MKDIR} ${PREFIX}/etc/periodic/daily ;\
 	${INSTALL_SCRIPT} ${FILESDIR}/502.pgsql \
 			${PREFIX}/etc/periodic/daily
 .  endif # SERVER_ONLY
 .  if defined(CLIENT_ONLY)
 	@ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} install-local
 .  endif
 	@ if [ -r ${PKGMESSAGE} ]; then \
 		${MKDIR} ${DOCSDIR} ;\
 		${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${PKGNAMESUFFIX} ;\
 		${ECHO} "======================================================================" ;\
 		${CAT} ${PKGMESSAGE} ;\
 		${ECHO} "======================================================================" ;\
 	fi
 .endif # !NO_BUILD
 
 .if defined(SERVER_ONLY) && defined(WITH_TESTS)
 check:
 	@if [ `id -u` != 0 ] ; then \
 	  ${ECHO} "Running postgresql regressions tests" ;\
 	  cd ${WRKSRC}; ${GMAKE} check ;\
 	 else \
 	  ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \
 	  ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\
 	 fi
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/postgresql81-server/distinfo b/databases/postgresql81-server/distinfo
index 2487f84d1cbb..469b0591235d 100644
--- a/databases/postgresql81-server/distinfo
+++ b/databases/postgresql81-server/distinfo
@@ -1,18 +1,18 @@
-MD5 (postgresql/postgresql-base-8.1.7.tar.bz2) = 123f8741c5d338ea85f017fb92bdc37b
-SHA256 (postgresql/postgresql-base-8.1.7.tar.bz2) = 12059dc00f5f6a8fe49487e356eb294d8b125f4e00456b93fadf15a4ac5d7c83
-SIZE (postgresql/postgresql-base-8.1.7.tar.bz2) = 8093381
-MD5 (postgresql/postgresql-opt-8.1.7.tar.bz2) = 4a35befec38ffc911f9e613da41ca504
-SHA256 (postgresql/postgresql-opt-8.1.7.tar.bz2) = dfc4bbe1929072fd4bb0e9599409a77991c253c17039b7119762b6acdadd48f1
-SIZE (postgresql/postgresql-opt-8.1.7.tar.bz2) = 144646
-MD5 (postgresql/postgresql-docs-8.1.7.tar.bz2) = 50dc63cc7a382db7fa300584867c2a83
-SHA256 (postgresql/postgresql-docs-8.1.7.tar.bz2) = fbb4a42f1bbebaed5e607858af94cb19adcd0540439d0c54812a0e90f6b34109
-SIZE (postgresql/postgresql-docs-8.1.7.tar.bz2) = 2499167
-MD5 (postgresql/postgresql-test-8.1.7.tar.bz2) = 9b169d1b50a4fb4d9280b78249f692cc
-SHA256 (postgresql/postgresql-test-8.1.7.tar.bz2) = f24cfc5e7e7a3180753a792c7a754fe01715862a321acde40c5ed684638ed477
-SIZE (postgresql/postgresql-test-8.1.7.tar.bz2) = 947139
+MD5 (postgresql/postgresql-base-8.1.8.tar.bz2) = 5da7d5bf67e01ddc1fbd92a072ccd3f3
+SHA256 (postgresql/postgresql-base-8.1.8.tar.bz2) = 7a7fdab1993af6de06aa3264cdb3df3618e4a6216b574833c352b50efd5454af
+SIZE (postgresql/postgresql-base-8.1.8.tar.bz2) = 8094972
+MD5 (postgresql/postgresql-opt-8.1.8.tar.bz2) = 58b437f38a1214cff80b7076cbbc967c
+SHA256 (postgresql/postgresql-opt-8.1.8.tar.bz2) = ffcc9519a7a697b370630ab1afb1280d3d9e62a25a7904291153d0de6fca6750
+SIZE (postgresql/postgresql-opt-8.1.8.tar.bz2) = 144643
+MD5 (postgresql/postgresql-docs-8.1.8.tar.bz2) = 7d552916141e2686682f2e01f0a88c9d
+SHA256 (postgresql/postgresql-docs-8.1.8.tar.bz2) = b5f0e095f8e1533ba69cdb1d599d7e2bfa07549a6a75bb6be899991339d30859
+SIZE (postgresql/postgresql-docs-8.1.8.tar.bz2) = 2499550
+MD5 (postgresql/postgresql-test-8.1.8.tar.bz2) = a953a4b1f5eddaea326242ce9571cb3f
+SHA256 (postgresql/postgresql-test-8.1.8.tar.bz2) = 3dd46fea627951cf85cd6b5f0318cc4f1f04ed19814fdaf0f919868699f656dc
+SIZE (postgresql/postgresql-test-8.1.8.tar.bz2) = 946918
 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
 MD5 (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 2eb31538f3ee367767aeacd95b11d623
 SHA256 (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 8dea05bdbc2b78426b159f628b693f69da17b930fe4882e166d5e8a3e698b7d9
 SIZE (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 3987
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 6a29d7079c62..92695b4a95fb 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -1,327 +1,327 @@
 # New ports collection makefile for:	PostgreSQL
 # Date created:		November 13, 1998
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.2.2
+PORTVERSION?=	8.2.3
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
 PKGNAMESUFFIX?=	-server
 DISTFILES?=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
 		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
 
 CONFLICTS?=	${PORTNAME}-client-7.* \
 		${PORTNAME}${PKGNAMESUFFIX}-7.* \
 		${PORTNAME}-client-8.[0-13-9]* \
 		${PORTNAME}${PKGNAMESUFFIX}-8.[0-13-9]*
 
 WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
 UNIQUENAME?=	${PORTNAME}82
 LATEST_LINK?=	${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
 
 PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
 USE_BZIP2=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 .if defined(NO_BUILD)
 .undef USE_GMAKE
 .undef GNU_CONFIGURE
 .endif
 
 CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include \
 		--with-docdir=${DOCSDIR}
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 
 BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
 		src/bin/initdb src/bin/ipcclean src/bin/pg_ctl src/bin/pg_controldata \
 		src/bin/pg_resetxlog src/pl
 
 INSTALL_DIRS?=	${BUILD_DIRS}
 
 .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
 SERVER_ONLY=	yes
 USE_RC_SUBR=	postgresql
 SUB_FILES+=	dot.cshrc dot.profile
 USE_PGSQL=	yes
 WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
 .endif
 
 .if !defined(SLAVE_ONLY)
 OPTIONS=	NLS "Use internationalized messages" on
 .endif
 
 # Cannot check this with standard OPTION due to a catch-22.
 # USE_OPENSSL must precede bsd.port.pre.mk, but then we don't know
 # what OPTIONS are set.
 #
 # If you *don't* want SSL, set WITHOUT_SSL=YES when making
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=--with-openssl
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "alpha" && ${OSVERSION} < 500000
 BROKEN=		Coredump during build on alpha 4.x
 .endif
 
 .if !defined(SLAVE_ONLY)
 # gnugetopt will always be used if already installed
 .  if ( ${OSVERSION} < 500041 ) && !exists(${LOCALBASE}/include/getopt.h)
 OPTIONS+=	GNUGETOPT "Use GNU getopt" on
 .  endif
 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+=	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
 
 # 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/:hier812055
 # PATCHFILES+=	hier-Pg8.1.2-0.5.5.diff.gz:hier812055
 # USE_BISON=	yes
 # .  endif
 
 # .  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 # USE_AUTOTOOLS=	autoconf:259
 # CONFIGURE_ARGS+=--with-icu
 # LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
 # PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
 # PATCHFILES+=	pg-814-icu-xx-2006-09-25.diff.gz:icu
 # .  endif
 
 PATCH_DIST_STRIP=-p1
 
 .  ifmake makesum
 DISTFILES+=	postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_PAM)
 CONFIGURE_ARGS+=--with-pam
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_LDAP)
 CONFIGURE_ARGS+=--with-ldap
 USE_OPENLDAP=	YES
 .  endif
 
 .  if defined(WITH_INTDATE)
 CONFIGURE_ARGS+=--enable-integer-datetimes
 .  endif
 
 . if !defined(WITHOUT_GNUGETOPT) || exists(${LOCALBASE}/include/getopt.h)
 USE_GETOPT_LONG=yes
 .  endif
 
 .  if !(defined(WITHOUT_GETTEXT) || defined(WITHOUT_NLS))
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	GETTEXT=""
 USE_GETTEXT=	YES
 .  else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	GETTEXT="@comment "
 .  endif
 
 .  if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O3 -funroll-loops
 .  endif
 
 .  if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 INSTALL_TARGET=	install
 .  else
 INSTALL_TARGET=	install-strip
 .  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"
 .    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
 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.21:${PORTSDIR}/security/heimdal
 CONFIGURE_ARGS+=--with-krb5
 .    endif
 .  endif
 
 .  if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || defined(WITH_THREADSAFE) || make(makesum)
 DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
 .  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)
 MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1   \
 		dropdb.1 droplang.1 dropuser.1 ecpg.1 initdb.1	   \
 		ipcclean.1 pg_config.1 pg_controldata.1 pg_ctl.1   \
 		pg_dump.1 pg_dumpall.1 pg_resetxlog.1 pg_restore.1 \
 		postgres.1 postmaster.1 psql.1 reindexdb.1 vacuumdb.1
 
 MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
 		alter_domain.7 alter_function.7 alter_group.7		      \
 		alter_index.7 alter_language.7 alter_operator_class.7	      \
 		alter_role.7						      \
 		alter_schema.7 alter_sequence.7 alter_table.7		      \
 		alter_trigger.7 alter_user.7 analyze.7 begin.7		      \
 		checkpoint.7 close.7 cluster.7 comment.7 commit.7	      \
 		commit_prepared.7					      \
 		copy.7 create_aggregate.7 create_cast.7			      \
 		create_constraint_trigger.7 create_conversion.7		      \
 		create_database.7 create_domain.7 create_function.7	      \
 		create_group.7 create_index.7 create_language.7		      \
 		create_operator.7 create_operator_class.7		      \
 		create_role.7						      \
 		create_rule.7 create_schema.7 create_sequence.7		      \
 		create_table.7 create_table_as.7 create_trigger.7	      \
 		create_type.7 create_user.7 create_view.7 deallocate.7	      \
 		declare.7 delete.7					      \
 		drop_aggregate.7 drop_cast.7 drop_conversion.7		      \
 		drop_database.7 drop_domain.7 drop_function.7		      \
 		drop_group.7 drop_index.7 drop_language.7		      \
 		drop_operator.7 drop_operator_class.7 drop_owned.7	      \
 		drop_role.7 drop_rule.7					      \
 		drop_schema.7 drop_sequence.7 drop_table.7 drop_trigger.7     \
 		drop_type.7 drop_user.7 drop_view.7 end.7 execute.7	      \
 		explain.7 fetch.7 grant.7 insert.7 listen.7 load.7	      \
 		lock.7 move.7 notify.7 prepare.7 prepare_transaction.7	      \
 		reassign_owned.7 reindex.7 reset.7			      \
 		revoke.7 rollback.7 rollback_prepared.7 select.7	      \
 		select_into.7 set.7					      \
 		set_constraints.7 set_role.7 set_transaction.7 show.7	      \
 		set_session_authorization.7 start_transaction.7		      \
 		truncate.7 unlisten.7 update.7 vacuum.7			      \
 		alter_operator.7 alter_tablespace.7 alter_type.7	      \
 		create_tablespace.7 drop_tablespace.7			      \
 		release_savepoint.7 rollback_to_savepoint.7		      \
 		savepoint.7 values.7
 .endif
 
 .if defined(SERVER_ONLY)
 pre-everything::
 	@${SH} ${PKGINSTALL} ${PORTNAME} BACKUPWARNING
 .endif
 
 .if !defined(NO_BUILD)
 
 pre-configure:
 .  if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
 	@${ECHO} "MIT's and Heimdal Kerberos are mutually exclusive."
 	@${ECHO} "Please choose one or the other."
 	@exit 1
 .  endif
 
 do-build:
 	@ cd ${WRKSRC}/src/backend ;\
 	${GMAKE} ../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
 	@ for dir in ${BUILD_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \
 	done
 
 .  if exists(${FILESDIR}/pkg-message${PKGNAMESUFFIX}.in)
 SUB_FILES+=	pkg-message${PKGNAMESUFFIX}
 PKGMESSAGE=	${WRKSRC}/pkg-message${PKGNAMESUFFIX}
 .  endif
 .endif
 
 .if defined(SERVER_ONLY)
 pre-su-install:
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
 
 .if !defined(NO_BUILD)
 do-install:
 	@for dir in ${INSTALL_DIRS}; do \
 	    cd ${WRKSRC}/$${dir} && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \
 	done
 .  if defined(SERVER_ONLY)
 	@ ${MKDIR} ${PREFIX}/share/postgresql
 .    for i in profile cshrc
 	${INSTALL_DATA} ${WRKDIR}/dot.$i ${PREFIX}/share/postgresql/dot.$i.dist; \
 	${INSTALL_DATA} -o pgsql -g pgsql ${WRKDIR}/dot.$i ~pgsql/dot.$i.dist ; \
 	if [ ! -f ~pgsql/.$i ]; then \
 		${CP} -p ~pgsql/dot.$i.dist ~pgsql/.$i; \
 	fi
 .    endfor
 	@ ${CHOWN} -R pgsql:pgsql ~pgsql/. ;\
 	${MKDIR} ${PREFIX}/etc/periodic/daily ;\
 	${INSTALL_SCRIPT} ${FILESDIR}/502.pgsql \
 			${PREFIX}/etc/periodic/daily
 .  endif # SERVER_ONLY
 .  if defined(CLIENT_ONLY)
 	@ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} install-local
 .  endif
 	@ if [ -r ${PKGMESSAGE} ]; then \
 		${MKDIR} ${DOCSDIR} ;\
 		${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${PKGNAMESUFFIX} ;\
 		${ECHO} "======================================================================" ;\
 		${CAT} ${PKGMESSAGE} ;\
 		${ECHO} "======================================================================" ;\
 	fi
 .endif # !NO_BUILD
 
 .if defined(SERVER_ONLY) && defined(WITH_TESTS)
 check:
 	@if [ `id -u` != 0 ] ; then \
 	  ${ECHO} "Running postgresql regressions tests" ;\
 	  cd ${WRKSRC}; ${GMAKE} check ;\
 	 else \
 	  ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \
 	  ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\
 	 fi
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/postgresql82-server/distinfo b/databases/postgresql82-server/distinfo
index 32534d40c0aa..ad300d6350df 100644
--- a/databases/postgresql82-server/distinfo
+++ b/databases/postgresql82-server/distinfo
@@ -1,12 +1,12 @@
-MD5 (postgresql/postgresql-base-8.2.2.tar.bz2) = 9621817df0b800eb56b11f0a92950c75
-SHA256 (postgresql/postgresql-base-8.2.2.tar.bz2) = f2c81f3efac8d3f38745dffe0524b4cde7ada3769e05dcf6445e3d8f6aa33ee1
-SIZE (postgresql/postgresql-base-8.2.2.tar.bz2) = 8504662
-MD5 (postgresql/postgresql-opt-8.2.2.tar.bz2) = 4c94cc8251576ad47c40725a87690a69
-SHA256 (postgresql/postgresql-opt-8.2.2.tar.bz2) = 66cc1563558d06125a47f5e965f6cfad3b4c65e73a59a490eb6de64c4527d450
-SIZE (postgresql/postgresql-opt-8.2.2.tar.bz2) = 167698
-MD5 (postgresql/postgresql-docs-8.2.2.tar.bz2) = 3d96f5cbcfae2027688776e8c3acde1b
-SHA256 (postgresql/postgresql-docs-8.2.2.tar.bz2) = b860fa87a6281e34c93e48847a1ca715bceba9c1fadf72f65bdaaefda02dfeb5
-SIZE (postgresql/postgresql-docs-8.2.2.tar.bz2) = 2754998
-MD5 (postgresql/postgresql-test-8.2.2.tar.bz2) = ea3c2805a1f619417a321e84e7b41651
-SHA256 (postgresql/postgresql-test-8.2.2.tar.bz2) = e217717d3cc190c71a8084e8d876949c79cf8867e743aedc5cf60d92377d37fb
-SIZE (postgresql/postgresql-test-8.2.2.tar.bz2) = 985316
+MD5 (postgresql/postgresql-base-8.2.3.tar.bz2) = c19b529c2a7b3c4850ae65b0a89f1883
+SHA256 (postgresql/postgresql-base-8.2.3.tar.bz2) = 6ad1274bd8e7f3df1c4295d73b93b2176278b4f9b0dc375737bfe75cecefc6e8
+SIZE (postgresql/postgresql-base-8.2.3.tar.bz2) = 8500472
+MD5 (postgresql/postgresql-opt-8.2.3.tar.bz2) = 2381dc8db8d90f78f4db940dc5544d9f
+SHA256 (postgresql/postgresql-opt-8.2.3.tar.bz2) = fc82d271c988b27515735db463e6f656f0417104f8f0cabfda5c515e15b1876e
+SIZE (postgresql/postgresql-opt-8.2.3.tar.bz2) = 167549
+MD5 (postgresql/postgresql-docs-8.2.3.tar.bz2) = 66a3ed6319e75b7aee2db0a1efedde59
+SHA256 (postgresql/postgresql-docs-8.2.3.tar.bz2) = 88cf0a17ee03dd4e9d0cef282a7a730837abea1bcc804678029778b0dd456094
+SIZE (postgresql/postgresql-docs-8.2.3.tar.bz2) = 2757963
+MD5 (postgresql/postgresql-test-8.2.3.tar.bz2) = 81e227d2e1393573c5dd5f762fb99b1e
+SHA256 (postgresql/postgresql-test-8.2.3.tar.bz2) = 4efdb72c8bf6f8784719147002ddd3458122b21f054a8f6a921365ddc753db32
+SIZE (postgresql/postgresql-test-8.2.3.tar.bz2) = 985623
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 6a29d7079c62..92695b4a95fb 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -1,327 +1,327 @@
 # New ports collection makefile for:	PostgreSQL
 # Date created:		November 13, 1998
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.2.2
+PORTVERSION?=	8.2.3
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
 PKGNAMESUFFIX?=	-server
 DISTFILES?=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
 		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
 
 CONFLICTS?=	${PORTNAME}-client-7.* \
 		${PORTNAME}${PKGNAMESUFFIX}-7.* \
 		${PORTNAME}-client-8.[0-13-9]* \
 		${PORTNAME}${PKGNAMESUFFIX}-8.[0-13-9]*
 
 WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
 UNIQUENAME?=	${PORTNAME}82
 LATEST_LINK?=	${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
 
 PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
 USE_BZIP2=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 .if defined(NO_BUILD)
 .undef USE_GMAKE
 .undef GNU_CONFIGURE
 .endif
 
 CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include \
 		--with-docdir=${DOCSDIR}
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 
 BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
 		src/bin/initdb src/bin/ipcclean src/bin/pg_ctl src/bin/pg_controldata \
 		src/bin/pg_resetxlog src/pl
 
 INSTALL_DIRS?=	${BUILD_DIRS}
 
 .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
 SERVER_ONLY=	yes
 USE_RC_SUBR=	postgresql
 SUB_FILES+=	dot.cshrc dot.profile
 USE_PGSQL=	yes
 WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
 .endif
 
 .if !defined(SLAVE_ONLY)
 OPTIONS=	NLS "Use internationalized messages" on
 .endif
 
 # Cannot check this with standard OPTION due to a catch-22.
 # USE_OPENSSL must precede bsd.port.pre.mk, but then we don't know
 # what OPTIONS are set.
 #
 # If you *don't* want SSL, set WITHOUT_SSL=YES when making
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=--with-openssl
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "alpha" && ${OSVERSION} < 500000
 BROKEN=		Coredump during build on alpha 4.x
 .endif
 
 .if !defined(SLAVE_ONLY)
 # gnugetopt will always be used if already installed
 .  if ( ${OSVERSION} < 500041 ) && !exists(${LOCALBASE}/include/getopt.h)
 OPTIONS+=	GNUGETOPT "Use GNU getopt" on
 .  endif
 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+=	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
 
 # 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/:hier812055
 # PATCHFILES+=	hier-Pg8.1.2-0.5.5.diff.gz:hier812055
 # USE_BISON=	yes
 # .  endif
 
 # .  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 # USE_AUTOTOOLS=	autoconf:259
 # CONFIGURE_ARGS+=--with-icu
 # LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
 # PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
 # PATCHFILES+=	pg-814-icu-xx-2006-09-25.diff.gz:icu
 # .  endif
 
 PATCH_DIST_STRIP=-p1
 
 .  ifmake makesum
 DISTFILES+=	postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_PAM)
 CONFIGURE_ARGS+=--with-pam
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_LDAP)
 CONFIGURE_ARGS+=--with-ldap
 USE_OPENLDAP=	YES
 .  endif
 
 .  if defined(WITH_INTDATE)
 CONFIGURE_ARGS+=--enable-integer-datetimes
 .  endif
 
 . if !defined(WITHOUT_GNUGETOPT) || exists(${LOCALBASE}/include/getopt.h)
 USE_GETOPT_LONG=yes
 .  endif
 
 .  if !(defined(WITHOUT_GETTEXT) || defined(WITHOUT_NLS))
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	GETTEXT=""
 USE_GETTEXT=	YES
 .  else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	GETTEXT="@comment "
 .  endif
 
 .  if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O3 -funroll-loops
 .  endif
 
 .  if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 INSTALL_TARGET=	install
 .  else
 INSTALL_TARGET=	install-strip
 .  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"
 .    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
 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.21:${PORTSDIR}/security/heimdal
 CONFIGURE_ARGS+=--with-krb5
 .    endif
 .  endif
 
 .  if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || defined(WITH_THREADSAFE) || make(makesum)
 DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
 .  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)
 MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1   \
 		dropdb.1 droplang.1 dropuser.1 ecpg.1 initdb.1	   \
 		ipcclean.1 pg_config.1 pg_controldata.1 pg_ctl.1   \
 		pg_dump.1 pg_dumpall.1 pg_resetxlog.1 pg_restore.1 \
 		postgres.1 postmaster.1 psql.1 reindexdb.1 vacuumdb.1
 
 MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
 		alter_domain.7 alter_function.7 alter_group.7		      \
 		alter_index.7 alter_language.7 alter_operator_class.7	      \
 		alter_role.7						      \
 		alter_schema.7 alter_sequence.7 alter_table.7		      \
 		alter_trigger.7 alter_user.7 analyze.7 begin.7		      \
 		checkpoint.7 close.7 cluster.7 comment.7 commit.7	      \
 		commit_prepared.7					      \
 		copy.7 create_aggregate.7 create_cast.7			      \
 		create_constraint_trigger.7 create_conversion.7		      \
 		create_database.7 create_domain.7 create_function.7	      \
 		create_group.7 create_index.7 create_language.7		      \
 		create_operator.7 create_operator_class.7		      \
 		create_role.7						      \
 		create_rule.7 create_schema.7 create_sequence.7		      \
 		create_table.7 create_table_as.7 create_trigger.7	      \
 		create_type.7 create_user.7 create_view.7 deallocate.7	      \
 		declare.7 delete.7					      \
 		drop_aggregate.7 drop_cast.7 drop_conversion.7		      \
 		drop_database.7 drop_domain.7 drop_function.7		      \
 		drop_group.7 drop_index.7 drop_language.7		      \
 		drop_operator.7 drop_operator_class.7 drop_owned.7	      \
 		drop_role.7 drop_rule.7					      \
 		drop_schema.7 drop_sequence.7 drop_table.7 drop_trigger.7     \
 		drop_type.7 drop_user.7 drop_view.7 end.7 execute.7	      \
 		explain.7 fetch.7 grant.7 insert.7 listen.7 load.7	      \
 		lock.7 move.7 notify.7 prepare.7 prepare_transaction.7	      \
 		reassign_owned.7 reindex.7 reset.7			      \
 		revoke.7 rollback.7 rollback_prepared.7 select.7	      \
 		select_into.7 set.7					      \
 		set_constraints.7 set_role.7 set_transaction.7 show.7	      \
 		set_session_authorization.7 start_transaction.7		      \
 		truncate.7 unlisten.7 update.7 vacuum.7			      \
 		alter_operator.7 alter_tablespace.7 alter_type.7	      \
 		create_tablespace.7 drop_tablespace.7			      \
 		release_savepoint.7 rollback_to_savepoint.7		      \
 		savepoint.7 values.7
 .endif
 
 .if defined(SERVER_ONLY)
 pre-everything::
 	@${SH} ${PKGINSTALL} ${PORTNAME} BACKUPWARNING
 .endif
 
 .if !defined(NO_BUILD)
 
 pre-configure:
 .  if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
 	@${ECHO} "MIT's and Heimdal Kerberos are mutually exclusive."
 	@${ECHO} "Please choose one or the other."
 	@exit 1
 .  endif
 
 do-build:
 	@ cd ${WRKSRC}/src/backend ;\
 	${GMAKE} ../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
 	@ for dir in ${BUILD_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \
 	done
 
 .  if exists(${FILESDIR}/pkg-message${PKGNAMESUFFIX}.in)
 SUB_FILES+=	pkg-message${PKGNAMESUFFIX}
 PKGMESSAGE=	${WRKSRC}/pkg-message${PKGNAMESUFFIX}
 .  endif
 .endif
 
 .if defined(SERVER_ONLY)
 pre-su-install:
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
 
 .if !defined(NO_BUILD)
 do-install:
 	@for dir in ${INSTALL_DIRS}; do \
 	    cd ${WRKSRC}/$${dir} && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \
 	done
 .  if defined(SERVER_ONLY)
 	@ ${MKDIR} ${PREFIX}/share/postgresql
 .    for i in profile cshrc
 	${INSTALL_DATA} ${WRKDIR}/dot.$i ${PREFIX}/share/postgresql/dot.$i.dist; \
 	${INSTALL_DATA} -o pgsql -g pgsql ${WRKDIR}/dot.$i ~pgsql/dot.$i.dist ; \
 	if [ ! -f ~pgsql/.$i ]; then \
 		${CP} -p ~pgsql/dot.$i.dist ~pgsql/.$i; \
 	fi
 .    endfor
 	@ ${CHOWN} -R pgsql:pgsql ~pgsql/. ;\
 	${MKDIR} ${PREFIX}/etc/periodic/daily ;\
 	${INSTALL_SCRIPT} ${FILESDIR}/502.pgsql \
 			${PREFIX}/etc/periodic/daily
 .  endif # SERVER_ONLY
 .  if defined(CLIENT_ONLY)
 	@ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} install-local
 .  endif
 	@ if [ -r ${PKGMESSAGE} ]; then \
 		${MKDIR} ${DOCSDIR} ;\
 		${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${PKGNAMESUFFIX} ;\
 		${ECHO} "======================================================================" ;\
 		${CAT} ${PKGMESSAGE} ;\
 		${ECHO} "======================================================================" ;\
 	fi
 .endif # !NO_BUILD
 
 .if defined(SERVER_ONLY) && defined(WITH_TESTS)
 check:
 	@if [ `id -u` != 0 ] ; then \
 	  ${ECHO} "Running postgresql regressions tests" ;\
 	  cd ${WRKSRC}; ${GMAKE} check ;\
 	 else \
 	  ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \
 	  ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\
 	 fi
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/postgresql83-server/distinfo b/databases/postgresql83-server/distinfo
index 32534d40c0aa..ad300d6350df 100644
--- a/databases/postgresql83-server/distinfo
+++ b/databases/postgresql83-server/distinfo
@@ -1,12 +1,12 @@
-MD5 (postgresql/postgresql-base-8.2.2.tar.bz2) = 9621817df0b800eb56b11f0a92950c75
-SHA256 (postgresql/postgresql-base-8.2.2.tar.bz2) = f2c81f3efac8d3f38745dffe0524b4cde7ada3769e05dcf6445e3d8f6aa33ee1
-SIZE (postgresql/postgresql-base-8.2.2.tar.bz2) = 8504662
-MD5 (postgresql/postgresql-opt-8.2.2.tar.bz2) = 4c94cc8251576ad47c40725a87690a69
-SHA256 (postgresql/postgresql-opt-8.2.2.tar.bz2) = 66cc1563558d06125a47f5e965f6cfad3b4c65e73a59a490eb6de64c4527d450
-SIZE (postgresql/postgresql-opt-8.2.2.tar.bz2) = 167698
-MD5 (postgresql/postgresql-docs-8.2.2.tar.bz2) = 3d96f5cbcfae2027688776e8c3acde1b
-SHA256 (postgresql/postgresql-docs-8.2.2.tar.bz2) = b860fa87a6281e34c93e48847a1ca715bceba9c1fadf72f65bdaaefda02dfeb5
-SIZE (postgresql/postgresql-docs-8.2.2.tar.bz2) = 2754998
-MD5 (postgresql/postgresql-test-8.2.2.tar.bz2) = ea3c2805a1f619417a321e84e7b41651
-SHA256 (postgresql/postgresql-test-8.2.2.tar.bz2) = e217717d3cc190c71a8084e8d876949c79cf8867e743aedc5cf60d92377d37fb
-SIZE (postgresql/postgresql-test-8.2.2.tar.bz2) = 985316
+MD5 (postgresql/postgresql-base-8.2.3.tar.bz2) = c19b529c2a7b3c4850ae65b0a89f1883
+SHA256 (postgresql/postgresql-base-8.2.3.tar.bz2) = 6ad1274bd8e7f3df1c4295d73b93b2176278b4f9b0dc375737bfe75cecefc6e8
+SIZE (postgresql/postgresql-base-8.2.3.tar.bz2) = 8500472
+MD5 (postgresql/postgresql-opt-8.2.3.tar.bz2) = 2381dc8db8d90f78f4db940dc5544d9f
+SHA256 (postgresql/postgresql-opt-8.2.3.tar.bz2) = fc82d271c988b27515735db463e6f656f0417104f8f0cabfda5c515e15b1876e
+SIZE (postgresql/postgresql-opt-8.2.3.tar.bz2) = 167549
+MD5 (postgresql/postgresql-docs-8.2.3.tar.bz2) = 66a3ed6319e75b7aee2db0a1efedde59
+SHA256 (postgresql/postgresql-docs-8.2.3.tar.bz2) = 88cf0a17ee03dd4e9d0cef282a7a730837abea1bcc804678029778b0dd456094
+SIZE (postgresql/postgresql-docs-8.2.3.tar.bz2) = 2757963
+MD5 (postgresql/postgresql-test-8.2.3.tar.bz2) = 81e227d2e1393573c5dd5f762fb99b1e
+SHA256 (postgresql/postgresql-test-8.2.3.tar.bz2) = 4efdb72c8bf6f8784719147002ddd3458122b21f054a8f6a921365ddc753db32
+SIZE (postgresql/postgresql-test-8.2.3.tar.bz2) = 985623
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 6a29d7079c62..92695b4a95fb 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -1,327 +1,327 @@
 # New ports collection makefile for:	PostgreSQL
 # Date created:		November 13, 1998
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.2.2
+PORTVERSION?=	8.2.3
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
 PKGNAMESUFFIX?=	-server
 DISTFILES?=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
 		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
 
 CONFLICTS?=	${PORTNAME}-client-7.* \
 		${PORTNAME}${PKGNAMESUFFIX}-7.* \
 		${PORTNAME}-client-8.[0-13-9]* \
 		${PORTNAME}${PKGNAMESUFFIX}-8.[0-13-9]*
 
 WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
 UNIQUENAME?=	${PORTNAME}82
 LATEST_LINK?=	${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
 
 PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
 USE_BZIP2=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 .if defined(NO_BUILD)
 .undef USE_GMAKE
 .undef GNU_CONFIGURE
 .endif
 
 CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include \
 		--with-docdir=${DOCSDIR}
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 
 BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
 		src/bin/initdb src/bin/ipcclean src/bin/pg_ctl src/bin/pg_controldata \
 		src/bin/pg_resetxlog src/pl
 
 INSTALL_DIRS?=	${BUILD_DIRS}
 
 .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
 SERVER_ONLY=	yes
 USE_RC_SUBR=	postgresql
 SUB_FILES+=	dot.cshrc dot.profile
 USE_PGSQL=	yes
 WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
 .endif
 
 .if !defined(SLAVE_ONLY)
 OPTIONS=	NLS "Use internationalized messages" on
 .endif
 
 # Cannot check this with standard OPTION due to a catch-22.
 # USE_OPENSSL must precede bsd.port.pre.mk, but then we don't know
 # what OPTIONS are set.
 #
 # If you *don't* want SSL, set WITHOUT_SSL=YES when making
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=--with-openssl
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "alpha" && ${OSVERSION} < 500000
 BROKEN=		Coredump during build on alpha 4.x
 .endif
 
 .if !defined(SLAVE_ONLY)
 # gnugetopt will always be used if already installed
 .  if ( ${OSVERSION} < 500041 ) && !exists(${LOCALBASE}/include/getopt.h)
 OPTIONS+=	GNUGETOPT "Use GNU getopt" on
 .  endif
 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+=	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
 
 # 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/:hier812055
 # PATCHFILES+=	hier-Pg8.1.2-0.5.5.diff.gz:hier812055
 # USE_BISON=	yes
 # .  endif
 
 # .  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 # USE_AUTOTOOLS=	autoconf:259
 # CONFIGURE_ARGS+=--with-icu
 # LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
 # PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
 # PATCHFILES+=	pg-814-icu-xx-2006-09-25.diff.gz:icu
 # .  endif
 
 PATCH_DIST_STRIP=-p1
 
 .  ifmake makesum
 DISTFILES+=	postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_PAM)
 CONFIGURE_ARGS+=--with-pam
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_LDAP)
 CONFIGURE_ARGS+=--with-ldap
 USE_OPENLDAP=	YES
 .  endif
 
 .  if defined(WITH_INTDATE)
 CONFIGURE_ARGS+=--enable-integer-datetimes
 .  endif
 
 . if !defined(WITHOUT_GNUGETOPT) || exists(${LOCALBASE}/include/getopt.h)
 USE_GETOPT_LONG=yes
 .  endif
 
 .  if !(defined(WITHOUT_GETTEXT) || defined(WITHOUT_NLS))
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	GETTEXT=""
 USE_GETTEXT=	YES
 .  else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	GETTEXT="@comment "
 .  endif
 
 .  if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O3 -funroll-loops
 .  endif
 
 .  if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 INSTALL_TARGET=	install
 .  else
 INSTALL_TARGET=	install-strip
 .  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"
 .    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
 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.21:${PORTSDIR}/security/heimdal
 CONFIGURE_ARGS+=--with-krb5
 .    endif
 .  endif
 
 .  if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || defined(WITH_THREADSAFE) || make(makesum)
 DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
 .  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)
 MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1   \
 		dropdb.1 droplang.1 dropuser.1 ecpg.1 initdb.1	   \
 		ipcclean.1 pg_config.1 pg_controldata.1 pg_ctl.1   \
 		pg_dump.1 pg_dumpall.1 pg_resetxlog.1 pg_restore.1 \
 		postgres.1 postmaster.1 psql.1 reindexdb.1 vacuumdb.1
 
 MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
 		alter_domain.7 alter_function.7 alter_group.7		      \
 		alter_index.7 alter_language.7 alter_operator_class.7	      \
 		alter_role.7						      \
 		alter_schema.7 alter_sequence.7 alter_table.7		      \
 		alter_trigger.7 alter_user.7 analyze.7 begin.7		      \
 		checkpoint.7 close.7 cluster.7 comment.7 commit.7	      \
 		commit_prepared.7					      \
 		copy.7 create_aggregate.7 create_cast.7			      \
 		create_constraint_trigger.7 create_conversion.7		      \
 		create_database.7 create_domain.7 create_function.7	      \
 		create_group.7 create_index.7 create_language.7		      \
 		create_operator.7 create_operator_class.7		      \
 		create_role.7						      \
 		create_rule.7 create_schema.7 create_sequence.7		      \
 		create_table.7 create_table_as.7 create_trigger.7	      \
 		create_type.7 create_user.7 create_view.7 deallocate.7	      \
 		declare.7 delete.7					      \
 		drop_aggregate.7 drop_cast.7 drop_conversion.7		      \
 		drop_database.7 drop_domain.7 drop_function.7		      \
 		drop_group.7 drop_index.7 drop_language.7		      \
 		drop_operator.7 drop_operator_class.7 drop_owned.7	      \
 		drop_role.7 drop_rule.7					      \
 		drop_schema.7 drop_sequence.7 drop_table.7 drop_trigger.7     \
 		drop_type.7 drop_user.7 drop_view.7 end.7 execute.7	      \
 		explain.7 fetch.7 grant.7 insert.7 listen.7 load.7	      \
 		lock.7 move.7 notify.7 prepare.7 prepare_transaction.7	      \
 		reassign_owned.7 reindex.7 reset.7			      \
 		revoke.7 rollback.7 rollback_prepared.7 select.7	      \
 		select_into.7 set.7					      \
 		set_constraints.7 set_role.7 set_transaction.7 show.7	      \
 		set_session_authorization.7 start_transaction.7		      \
 		truncate.7 unlisten.7 update.7 vacuum.7			      \
 		alter_operator.7 alter_tablespace.7 alter_type.7	      \
 		create_tablespace.7 drop_tablespace.7			      \
 		release_savepoint.7 rollback_to_savepoint.7		      \
 		savepoint.7 values.7
 .endif
 
 .if defined(SERVER_ONLY)
 pre-everything::
 	@${SH} ${PKGINSTALL} ${PORTNAME} BACKUPWARNING
 .endif
 
 .if !defined(NO_BUILD)
 
 pre-configure:
 .  if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
 	@${ECHO} "MIT's and Heimdal Kerberos are mutually exclusive."
 	@${ECHO} "Please choose one or the other."
 	@exit 1
 .  endif
 
 do-build:
 	@ cd ${WRKSRC}/src/backend ;\
 	${GMAKE} ../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
 	@ for dir in ${BUILD_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \
 	done
 
 .  if exists(${FILESDIR}/pkg-message${PKGNAMESUFFIX}.in)
 SUB_FILES+=	pkg-message${PKGNAMESUFFIX}
 PKGMESSAGE=	${WRKSRC}/pkg-message${PKGNAMESUFFIX}
 .  endif
 .endif
 
 .if defined(SERVER_ONLY)
 pre-su-install:
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
 
 .if !defined(NO_BUILD)
 do-install:
 	@for dir in ${INSTALL_DIRS}; do \
 	    cd ${WRKSRC}/$${dir} && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \
 	done
 .  if defined(SERVER_ONLY)
 	@ ${MKDIR} ${PREFIX}/share/postgresql
 .    for i in profile cshrc
 	${INSTALL_DATA} ${WRKDIR}/dot.$i ${PREFIX}/share/postgresql/dot.$i.dist; \
 	${INSTALL_DATA} -o pgsql -g pgsql ${WRKDIR}/dot.$i ~pgsql/dot.$i.dist ; \
 	if [ ! -f ~pgsql/.$i ]; then \
 		${CP} -p ~pgsql/dot.$i.dist ~pgsql/.$i; \
 	fi
 .    endfor
 	@ ${CHOWN} -R pgsql:pgsql ~pgsql/. ;\
 	${MKDIR} ${PREFIX}/etc/periodic/daily ;\
 	${INSTALL_SCRIPT} ${FILESDIR}/502.pgsql \
 			${PREFIX}/etc/periodic/daily
 .  endif # SERVER_ONLY
 .  if defined(CLIENT_ONLY)
 	@ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} install-local
 .  endif
 	@ if [ -r ${PKGMESSAGE} ]; then \
 		${MKDIR} ${DOCSDIR} ;\
 		${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${PKGNAMESUFFIX} ;\
 		${ECHO} "======================================================================" ;\
 		${CAT} ${PKGMESSAGE} ;\
 		${ECHO} "======================================================================" ;\
 	fi
 .endif # !NO_BUILD
 
 .if defined(SERVER_ONLY) && defined(WITH_TESTS)
 check:
 	@if [ `id -u` != 0 ] ; then \
 	  ${ECHO} "Running postgresql regressions tests" ;\
 	  cd ${WRKSRC}; ${GMAKE} check ;\
 	 else \
 	  ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \
 	  ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\
 	 fi
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo
index 32534d40c0aa..ad300d6350df 100644
--- a/databases/postgresql84-server/distinfo
+++ b/databases/postgresql84-server/distinfo
@@ -1,12 +1,12 @@
-MD5 (postgresql/postgresql-base-8.2.2.tar.bz2) = 9621817df0b800eb56b11f0a92950c75
-SHA256 (postgresql/postgresql-base-8.2.2.tar.bz2) = f2c81f3efac8d3f38745dffe0524b4cde7ada3769e05dcf6445e3d8f6aa33ee1
-SIZE (postgresql/postgresql-base-8.2.2.tar.bz2) = 8504662
-MD5 (postgresql/postgresql-opt-8.2.2.tar.bz2) = 4c94cc8251576ad47c40725a87690a69
-SHA256 (postgresql/postgresql-opt-8.2.2.tar.bz2) = 66cc1563558d06125a47f5e965f6cfad3b4c65e73a59a490eb6de64c4527d450
-SIZE (postgresql/postgresql-opt-8.2.2.tar.bz2) = 167698
-MD5 (postgresql/postgresql-docs-8.2.2.tar.bz2) = 3d96f5cbcfae2027688776e8c3acde1b
-SHA256 (postgresql/postgresql-docs-8.2.2.tar.bz2) = b860fa87a6281e34c93e48847a1ca715bceba9c1fadf72f65bdaaefda02dfeb5
-SIZE (postgresql/postgresql-docs-8.2.2.tar.bz2) = 2754998
-MD5 (postgresql/postgresql-test-8.2.2.tar.bz2) = ea3c2805a1f619417a321e84e7b41651
-SHA256 (postgresql/postgresql-test-8.2.2.tar.bz2) = e217717d3cc190c71a8084e8d876949c79cf8867e743aedc5cf60d92377d37fb
-SIZE (postgresql/postgresql-test-8.2.2.tar.bz2) = 985316
+MD5 (postgresql/postgresql-base-8.2.3.tar.bz2) = c19b529c2a7b3c4850ae65b0a89f1883
+SHA256 (postgresql/postgresql-base-8.2.3.tar.bz2) = 6ad1274bd8e7f3df1c4295d73b93b2176278b4f9b0dc375737bfe75cecefc6e8
+SIZE (postgresql/postgresql-base-8.2.3.tar.bz2) = 8500472
+MD5 (postgresql/postgresql-opt-8.2.3.tar.bz2) = 2381dc8db8d90f78f4db940dc5544d9f
+SHA256 (postgresql/postgresql-opt-8.2.3.tar.bz2) = fc82d271c988b27515735db463e6f656f0417104f8f0cabfda5c515e15b1876e
+SIZE (postgresql/postgresql-opt-8.2.3.tar.bz2) = 167549
+MD5 (postgresql/postgresql-docs-8.2.3.tar.bz2) = 66a3ed6319e75b7aee2db0a1efedde59
+SHA256 (postgresql/postgresql-docs-8.2.3.tar.bz2) = 88cf0a17ee03dd4e9d0cef282a7a730837abea1bcc804678029778b0dd456094
+SIZE (postgresql/postgresql-docs-8.2.3.tar.bz2) = 2757963
+MD5 (postgresql/postgresql-test-8.2.3.tar.bz2) = 81e227d2e1393573c5dd5f762fb99b1e
+SHA256 (postgresql/postgresql-test-8.2.3.tar.bz2) = 4efdb72c8bf6f8784719147002ddd3458122b21f054a8f6a921365ddc753db32
+SIZE (postgresql/postgresql-test-8.2.3.tar.bz2) = 985623
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 6a29d7079c62..92695b4a95fb 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -1,327 +1,327 @@
 # New ports collection makefile for:	PostgreSQL
 # Date created:		November 13, 1998
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.2.2
+PORTVERSION?=	8.2.3
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
 PKGNAMESUFFIX?=	-server
 DISTFILES?=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
 		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
 
 CONFLICTS?=	${PORTNAME}-client-7.* \
 		${PORTNAME}${PKGNAMESUFFIX}-7.* \
 		${PORTNAME}-client-8.[0-13-9]* \
 		${PORTNAME}${PKGNAMESUFFIX}-8.[0-13-9]*
 
 WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
 UNIQUENAME?=	${PORTNAME}82
 LATEST_LINK?=	${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
 
 PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
 USE_BZIP2=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 .if defined(NO_BUILD)
 .undef USE_GMAKE
 .undef GNU_CONFIGURE
 .endif
 
 CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include \
 		--with-docdir=${DOCSDIR}
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 
 BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
 		src/bin/initdb src/bin/ipcclean src/bin/pg_ctl src/bin/pg_controldata \
 		src/bin/pg_resetxlog src/pl
 
 INSTALL_DIRS?=	${BUILD_DIRS}
 
 .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
 SERVER_ONLY=	yes
 USE_RC_SUBR=	postgresql
 SUB_FILES+=	dot.cshrc dot.profile
 USE_PGSQL=	yes
 WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
 .endif
 
 .if !defined(SLAVE_ONLY)
 OPTIONS=	NLS "Use internationalized messages" on
 .endif
 
 # Cannot check this with standard OPTION due to a catch-22.
 # USE_OPENSSL must precede bsd.port.pre.mk, but then we don't know
 # what OPTIONS are set.
 #
 # If you *don't* want SSL, set WITHOUT_SSL=YES when making
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=--with-openssl
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "alpha" && ${OSVERSION} < 500000
 BROKEN=		Coredump during build on alpha 4.x
 .endif
 
 .if !defined(SLAVE_ONLY)
 # gnugetopt will always be used if already installed
 .  if ( ${OSVERSION} < 500041 ) && !exists(${LOCALBASE}/include/getopt.h)
 OPTIONS+=	GNUGETOPT "Use GNU getopt" on
 .  endif
 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+=	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
 
 # 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/:hier812055
 # PATCHFILES+=	hier-Pg8.1.2-0.5.5.diff.gz:hier812055
 # USE_BISON=	yes
 # .  endif
 
 # .  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 # USE_AUTOTOOLS=	autoconf:259
 # CONFIGURE_ARGS+=--with-icu
 # LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
 # PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
 # PATCHFILES+=	pg-814-icu-xx-2006-09-25.diff.gz:icu
 # .  endif
 
 PATCH_DIST_STRIP=-p1
 
 .  ifmake makesum
 DISTFILES+=	postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_PAM)
 CONFIGURE_ARGS+=--with-pam
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_LDAP)
 CONFIGURE_ARGS+=--with-ldap
 USE_OPENLDAP=	YES
 .  endif
 
 .  if defined(WITH_INTDATE)
 CONFIGURE_ARGS+=--enable-integer-datetimes
 .  endif
 
 . if !defined(WITHOUT_GNUGETOPT) || exists(${LOCALBASE}/include/getopt.h)
 USE_GETOPT_LONG=yes
 .  endif
 
 .  if !(defined(WITHOUT_GETTEXT) || defined(WITHOUT_NLS))
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	GETTEXT=""
 USE_GETTEXT=	YES
 .  else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	GETTEXT="@comment "
 .  endif
 
 .  if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O3 -funroll-loops
 .  endif
 
 .  if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 INSTALL_TARGET=	install
 .  else
 INSTALL_TARGET=	install-strip
 .  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"
 .    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
 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.21:${PORTSDIR}/security/heimdal
 CONFIGURE_ARGS+=--with-krb5
 .    endif
 .  endif
 
 .  if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || defined(WITH_THREADSAFE) || make(makesum)
 DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
 .  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)
 MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1   \
 		dropdb.1 droplang.1 dropuser.1 ecpg.1 initdb.1	   \
 		ipcclean.1 pg_config.1 pg_controldata.1 pg_ctl.1   \
 		pg_dump.1 pg_dumpall.1 pg_resetxlog.1 pg_restore.1 \
 		postgres.1 postmaster.1 psql.1 reindexdb.1 vacuumdb.1
 
 MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
 		alter_domain.7 alter_function.7 alter_group.7		      \
 		alter_index.7 alter_language.7 alter_operator_class.7	      \
 		alter_role.7						      \
 		alter_schema.7 alter_sequence.7 alter_table.7		      \
 		alter_trigger.7 alter_user.7 analyze.7 begin.7		      \
 		checkpoint.7 close.7 cluster.7 comment.7 commit.7	      \
 		commit_prepared.7					      \
 		copy.7 create_aggregate.7 create_cast.7			      \
 		create_constraint_trigger.7 create_conversion.7		      \
 		create_database.7 create_domain.7 create_function.7	      \
 		create_group.7 create_index.7 create_language.7		      \
 		create_operator.7 create_operator_class.7		      \
 		create_role.7						      \
 		create_rule.7 create_schema.7 create_sequence.7		      \
 		create_table.7 create_table_as.7 create_trigger.7	      \
 		create_type.7 create_user.7 create_view.7 deallocate.7	      \
 		declare.7 delete.7					      \
 		drop_aggregate.7 drop_cast.7 drop_conversion.7		      \
 		drop_database.7 drop_domain.7 drop_function.7		      \
 		drop_group.7 drop_index.7 drop_language.7		      \
 		drop_operator.7 drop_operator_class.7 drop_owned.7	      \
 		drop_role.7 drop_rule.7					      \
 		drop_schema.7 drop_sequence.7 drop_table.7 drop_trigger.7     \
 		drop_type.7 drop_user.7 drop_view.7 end.7 execute.7	      \
 		explain.7 fetch.7 grant.7 insert.7 listen.7 load.7	      \
 		lock.7 move.7 notify.7 prepare.7 prepare_transaction.7	      \
 		reassign_owned.7 reindex.7 reset.7			      \
 		revoke.7 rollback.7 rollback_prepared.7 select.7	      \
 		select_into.7 set.7					      \
 		set_constraints.7 set_role.7 set_transaction.7 show.7	      \
 		set_session_authorization.7 start_transaction.7		      \
 		truncate.7 unlisten.7 update.7 vacuum.7			      \
 		alter_operator.7 alter_tablespace.7 alter_type.7	      \
 		create_tablespace.7 drop_tablespace.7			      \
 		release_savepoint.7 rollback_to_savepoint.7		      \
 		savepoint.7 values.7
 .endif
 
 .if defined(SERVER_ONLY)
 pre-everything::
 	@${SH} ${PKGINSTALL} ${PORTNAME} BACKUPWARNING
 .endif
 
 .if !defined(NO_BUILD)
 
 pre-configure:
 .  if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
 	@${ECHO} "MIT's and Heimdal Kerberos are mutually exclusive."
 	@${ECHO} "Please choose one or the other."
 	@exit 1
 .  endif
 
 do-build:
 	@ cd ${WRKSRC}/src/backend ;\
 	${GMAKE} ../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
 	@ for dir in ${BUILD_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \
 	done
 
 .  if exists(${FILESDIR}/pkg-message${PKGNAMESUFFIX}.in)
 SUB_FILES+=	pkg-message${PKGNAMESUFFIX}
 PKGMESSAGE=	${WRKSRC}/pkg-message${PKGNAMESUFFIX}
 .  endif
 .endif
 
 .if defined(SERVER_ONLY)
 pre-su-install:
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
 
 .if !defined(NO_BUILD)
 do-install:
 	@for dir in ${INSTALL_DIRS}; do \
 	    cd ${WRKSRC}/$${dir} && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \
 	done
 .  if defined(SERVER_ONLY)
 	@ ${MKDIR} ${PREFIX}/share/postgresql
 .    for i in profile cshrc
 	${INSTALL_DATA} ${WRKDIR}/dot.$i ${PREFIX}/share/postgresql/dot.$i.dist; \
 	${INSTALL_DATA} -o pgsql -g pgsql ${WRKDIR}/dot.$i ~pgsql/dot.$i.dist ; \
 	if [ ! -f ~pgsql/.$i ]; then \
 		${CP} -p ~pgsql/dot.$i.dist ~pgsql/.$i; \
 	fi
 .    endfor
 	@ ${CHOWN} -R pgsql:pgsql ~pgsql/. ;\
 	${MKDIR} ${PREFIX}/etc/periodic/daily ;\
 	${INSTALL_SCRIPT} ${FILESDIR}/502.pgsql \
 			${PREFIX}/etc/periodic/daily
 .  endif # SERVER_ONLY
 .  if defined(CLIENT_ONLY)
 	@ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} install-local
 .  endif
 	@ if [ -r ${PKGMESSAGE} ]; then \
 		${MKDIR} ${DOCSDIR} ;\
 		${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${PKGNAMESUFFIX} ;\
 		${ECHO} "======================================================================" ;\
 		${CAT} ${PKGMESSAGE} ;\
 		${ECHO} "======================================================================" ;\
 	fi
 .endif # !NO_BUILD
 
 .if defined(SERVER_ONLY) && defined(WITH_TESTS)
 check:
 	@if [ `id -u` != 0 ] ; then \
 	  ${ECHO} "Running postgresql regressions tests" ;\
 	  cd ${WRKSRC}; ${GMAKE} check ;\
 	 else \
 	  ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \
 	  ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\
 	 fi
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/postgresql90-server/distinfo b/databases/postgresql90-server/distinfo
index 32534d40c0aa..ad300d6350df 100644
--- a/databases/postgresql90-server/distinfo
+++ b/databases/postgresql90-server/distinfo
@@ -1,12 +1,12 @@
-MD5 (postgresql/postgresql-base-8.2.2.tar.bz2) = 9621817df0b800eb56b11f0a92950c75
-SHA256 (postgresql/postgresql-base-8.2.2.tar.bz2) = f2c81f3efac8d3f38745dffe0524b4cde7ada3769e05dcf6445e3d8f6aa33ee1
-SIZE (postgresql/postgresql-base-8.2.2.tar.bz2) = 8504662
-MD5 (postgresql/postgresql-opt-8.2.2.tar.bz2) = 4c94cc8251576ad47c40725a87690a69
-SHA256 (postgresql/postgresql-opt-8.2.2.tar.bz2) = 66cc1563558d06125a47f5e965f6cfad3b4c65e73a59a490eb6de64c4527d450
-SIZE (postgresql/postgresql-opt-8.2.2.tar.bz2) = 167698
-MD5 (postgresql/postgresql-docs-8.2.2.tar.bz2) = 3d96f5cbcfae2027688776e8c3acde1b
-SHA256 (postgresql/postgresql-docs-8.2.2.tar.bz2) = b860fa87a6281e34c93e48847a1ca715bceba9c1fadf72f65bdaaefda02dfeb5
-SIZE (postgresql/postgresql-docs-8.2.2.tar.bz2) = 2754998
-MD5 (postgresql/postgresql-test-8.2.2.tar.bz2) = ea3c2805a1f619417a321e84e7b41651
-SHA256 (postgresql/postgresql-test-8.2.2.tar.bz2) = e217717d3cc190c71a8084e8d876949c79cf8867e743aedc5cf60d92377d37fb
-SIZE (postgresql/postgresql-test-8.2.2.tar.bz2) = 985316
+MD5 (postgresql/postgresql-base-8.2.3.tar.bz2) = c19b529c2a7b3c4850ae65b0a89f1883
+SHA256 (postgresql/postgresql-base-8.2.3.tar.bz2) = 6ad1274bd8e7f3df1c4295d73b93b2176278b4f9b0dc375737bfe75cecefc6e8
+SIZE (postgresql/postgresql-base-8.2.3.tar.bz2) = 8500472
+MD5 (postgresql/postgresql-opt-8.2.3.tar.bz2) = 2381dc8db8d90f78f4db940dc5544d9f
+SHA256 (postgresql/postgresql-opt-8.2.3.tar.bz2) = fc82d271c988b27515735db463e6f656f0417104f8f0cabfda5c515e15b1876e
+SIZE (postgresql/postgresql-opt-8.2.3.tar.bz2) = 167549
+MD5 (postgresql/postgresql-docs-8.2.3.tar.bz2) = 66a3ed6319e75b7aee2db0a1efedde59
+SHA256 (postgresql/postgresql-docs-8.2.3.tar.bz2) = 88cf0a17ee03dd4e9d0cef282a7a730837abea1bcc804678029778b0dd456094
+SIZE (postgresql/postgresql-docs-8.2.3.tar.bz2) = 2757963
+MD5 (postgresql/postgresql-test-8.2.3.tar.bz2) = 81e227d2e1393573c5dd5f762fb99b1e
+SHA256 (postgresql/postgresql-test-8.2.3.tar.bz2) = 4efdb72c8bf6f8784719147002ddd3458122b21f054a8f6a921365ddc753db32
+SIZE (postgresql/postgresql-test-8.2.3.tar.bz2) = 985623
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 6a29d7079c62..92695b4a95fb 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -1,327 +1,327 @@
 # New ports collection makefile for:	PostgreSQL
 # Date created:		November 13, 1998
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.2.2
+PORTVERSION?=	8.2.3
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
 PKGNAMESUFFIX?=	-server
 DISTFILES?=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
 		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
 
 CONFLICTS?=	${PORTNAME}-client-7.* \
 		${PORTNAME}${PKGNAMESUFFIX}-7.* \
 		${PORTNAME}-client-8.[0-13-9]* \
 		${PORTNAME}${PKGNAMESUFFIX}-8.[0-13-9]*
 
 WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
 UNIQUENAME?=	${PORTNAME}82
 LATEST_LINK?=	${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
 
 PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
 USE_BZIP2=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 .if defined(NO_BUILD)
 .undef USE_GMAKE
 .undef GNU_CONFIGURE
 .endif
 
 CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include \
 		--with-docdir=${DOCSDIR}
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 
 BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
 		src/bin/initdb src/bin/ipcclean src/bin/pg_ctl src/bin/pg_controldata \
 		src/bin/pg_resetxlog src/pl
 
 INSTALL_DIRS?=	${BUILD_DIRS}
 
 .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
 SERVER_ONLY=	yes
 USE_RC_SUBR=	postgresql
 SUB_FILES+=	dot.cshrc dot.profile
 USE_PGSQL=	yes
 WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
 .endif
 
 .if !defined(SLAVE_ONLY)
 OPTIONS=	NLS "Use internationalized messages" on
 .endif
 
 # Cannot check this with standard OPTION due to a catch-22.
 # USE_OPENSSL must precede bsd.port.pre.mk, but then we don't know
 # what OPTIONS are set.
 #
 # If you *don't* want SSL, set WITHOUT_SSL=YES when making
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=--with-openssl
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "alpha" && ${OSVERSION} < 500000
 BROKEN=		Coredump during build on alpha 4.x
 .endif
 
 .if !defined(SLAVE_ONLY)
 # gnugetopt will always be used if already installed
 .  if ( ${OSVERSION} < 500041 ) && !exists(${LOCALBASE}/include/getopt.h)
 OPTIONS+=	GNUGETOPT "Use GNU getopt" on
 .  endif
 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+=	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
 
 # 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/:hier812055
 # PATCHFILES+=	hier-Pg8.1.2-0.5.5.diff.gz:hier812055
 # USE_BISON=	yes
 # .  endif
 
 # .  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 # USE_AUTOTOOLS=	autoconf:259
 # CONFIGURE_ARGS+=--with-icu
 # LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
 # PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
 # PATCHFILES+=	pg-814-icu-xx-2006-09-25.diff.gz:icu
 # .  endif
 
 PATCH_DIST_STRIP=-p1
 
 .  ifmake makesum
 DISTFILES+=	postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_PAM)
 CONFIGURE_ARGS+=--with-pam
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_LDAP)
 CONFIGURE_ARGS+=--with-ldap
 USE_OPENLDAP=	YES
 .  endif
 
 .  if defined(WITH_INTDATE)
 CONFIGURE_ARGS+=--enable-integer-datetimes
 .  endif
 
 . if !defined(WITHOUT_GNUGETOPT) || exists(${LOCALBASE}/include/getopt.h)
 USE_GETOPT_LONG=yes
 .  endif
 
 .  if !(defined(WITHOUT_GETTEXT) || defined(WITHOUT_NLS))
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	GETTEXT=""
 USE_GETTEXT=	YES
 .  else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	GETTEXT="@comment "
 .  endif
 
 .  if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O3 -funroll-loops
 .  endif
 
 .  if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 INSTALL_TARGET=	install
 .  else
 INSTALL_TARGET=	install-strip
 .  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"
 .    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
 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.21:${PORTSDIR}/security/heimdal
 CONFIGURE_ARGS+=--with-krb5
 .    endif
 .  endif
 
 .  if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || defined(WITH_THREADSAFE) || make(makesum)
 DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
 .  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)
 MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1   \
 		dropdb.1 droplang.1 dropuser.1 ecpg.1 initdb.1	   \
 		ipcclean.1 pg_config.1 pg_controldata.1 pg_ctl.1   \
 		pg_dump.1 pg_dumpall.1 pg_resetxlog.1 pg_restore.1 \
 		postgres.1 postmaster.1 psql.1 reindexdb.1 vacuumdb.1
 
 MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
 		alter_domain.7 alter_function.7 alter_group.7		      \
 		alter_index.7 alter_language.7 alter_operator_class.7	      \
 		alter_role.7						      \
 		alter_schema.7 alter_sequence.7 alter_table.7		      \
 		alter_trigger.7 alter_user.7 analyze.7 begin.7		      \
 		checkpoint.7 close.7 cluster.7 comment.7 commit.7	      \
 		commit_prepared.7					      \
 		copy.7 create_aggregate.7 create_cast.7			      \
 		create_constraint_trigger.7 create_conversion.7		      \
 		create_database.7 create_domain.7 create_function.7	      \
 		create_group.7 create_index.7 create_language.7		      \
 		create_operator.7 create_operator_class.7		      \
 		create_role.7						      \
 		create_rule.7 create_schema.7 create_sequence.7		      \
 		create_table.7 create_table_as.7 create_trigger.7	      \
 		create_type.7 create_user.7 create_view.7 deallocate.7	      \
 		declare.7 delete.7					      \
 		drop_aggregate.7 drop_cast.7 drop_conversion.7		      \
 		drop_database.7 drop_domain.7 drop_function.7		      \
 		drop_group.7 drop_index.7 drop_language.7		      \
 		drop_operator.7 drop_operator_class.7 drop_owned.7	      \
 		drop_role.7 drop_rule.7					      \
 		drop_schema.7 drop_sequence.7 drop_table.7 drop_trigger.7     \
 		drop_type.7 drop_user.7 drop_view.7 end.7 execute.7	      \
 		explain.7 fetch.7 grant.7 insert.7 listen.7 load.7	      \
 		lock.7 move.7 notify.7 prepare.7 prepare_transaction.7	      \
 		reassign_owned.7 reindex.7 reset.7			      \
 		revoke.7 rollback.7 rollback_prepared.7 select.7	      \
 		select_into.7 set.7					      \
 		set_constraints.7 set_role.7 set_transaction.7 show.7	      \
 		set_session_authorization.7 start_transaction.7		      \
 		truncate.7 unlisten.7 update.7 vacuum.7			      \
 		alter_operator.7 alter_tablespace.7 alter_type.7	      \
 		create_tablespace.7 drop_tablespace.7			      \
 		release_savepoint.7 rollback_to_savepoint.7		      \
 		savepoint.7 values.7
 .endif
 
 .if defined(SERVER_ONLY)
 pre-everything::
 	@${SH} ${PKGINSTALL} ${PORTNAME} BACKUPWARNING
 .endif
 
 .if !defined(NO_BUILD)
 
 pre-configure:
 .  if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
 	@${ECHO} "MIT's and Heimdal Kerberos are mutually exclusive."
 	@${ECHO} "Please choose one or the other."
 	@exit 1
 .  endif
 
 do-build:
 	@ cd ${WRKSRC}/src/backend ;\
 	${GMAKE} ../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
 	@ for dir in ${BUILD_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \
 	done
 
 .  if exists(${FILESDIR}/pkg-message${PKGNAMESUFFIX}.in)
 SUB_FILES+=	pkg-message${PKGNAMESUFFIX}
 PKGMESSAGE=	${WRKSRC}/pkg-message${PKGNAMESUFFIX}
 .  endif
 .endif
 
 .if defined(SERVER_ONLY)
 pre-su-install:
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
 
 .if !defined(NO_BUILD)
 do-install:
 	@for dir in ${INSTALL_DIRS}; do \
 	    cd ${WRKSRC}/$${dir} && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \
 	done
 .  if defined(SERVER_ONLY)
 	@ ${MKDIR} ${PREFIX}/share/postgresql
 .    for i in profile cshrc
 	${INSTALL_DATA} ${WRKDIR}/dot.$i ${PREFIX}/share/postgresql/dot.$i.dist; \
 	${INSTALL_DATA} -o pgsql -g pgsql ${WRKDIR}/dot.$i ~pgsql/dot.$i.dist ; \
 	if [ ! -f ~pgsql/.$i ]; then \
 		${CP} -p ~pgsql/dot.$i.dist ~pgsql/.$i; \
 	fi
 .    endfor
 	@ ${CHOWN} -R pgsql:pgsql ~pgsql/. ;\
 	${MKDIR} ${PREFIX}/etc/periodic/daily ;\
 	${INSTALL_SCRIPT} ${FILESDIR}/502.pgsql \
 			${PREFIX}/etc/periodic/daily
 .  endif # SERVER_ONLY
 .  if defined(CLIENT_ONLY)
 	@ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} install-local
 .  endif
 	@ if [ -r ${PKGMESSAGE} ]; then \
 		${MKDIR} ${DOCSDIR} ;\
 		${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${PKGNAMESUFFIX} ;\
 		${ECHO} "======================================================================" ;\
 		${CAT} ${PKGMESSAGE} ;\
 		${ECHO} "======================================================================" ;\
 	fi
 .endif # !NO_BUILD
 
 .if defined(SERVER_ONLY) && defined(WITH_TESTS)
 check:
 	@if [ `id -u` != 0 ] ; then \
 	  ${ECHO} "Running postgresql regressions tests" ;\
 	  cd ${WRKSRC}; ${GMAKE} check ;\
 	 else \
 	  ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \
 	  ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\
 	 fi
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/postgresql91-server/distinfo b/databases/postgresql91-server/distinfo
index 32534d40c0aa..ad300d6350df 100644
--- a/databases/postgresql91-server/distinfo
+++ b/databases/postgresql91-server/distinfo
@@ -1,12 +1,12 @@
-MD5 (postgresql/postgresql-base-8.2.2.tar.bz2) = 9621817df0b800eb56b11f0a92950c75
-SHA256 (postgresql/postgresql-base-8.2.2.tar.bz2) = f2c81f3efac8d3f38745dffe0524b4cde7ada3769e05dcf6445e3d8f6aa33ee1
-SIZE (postgresql/postgresql-base-8.2.2.tar.bz2) = 8504662
-MD5 (postgresql/postgresql-opt-8.2.2.tar.bz2) = 4c94cc8251576ad47c40725a87690a69
-SHA256 (postgresql/postgresql-opt-8.2.2.tar.bz2) = 66cc1563558d06125a47f5e965f6cfad3b4c65e73a59a490eb6de64c4527d450
-SIZE (postgresql/postgresql-opt-8.2.2.tar.bz2) = 167698
-MD5 (postgresql/postgresql-docs-8.2.2.tar.bz2) = 3d96f5cbcfae2027688776e8c3acde1b
-SHA256 (postgresql/postgresql-docs-8.2.2.tar.bz2) = b860fa87a6281e34c93e48847a1ca715bceba9c1fadf72f65bdaaefda02dfeb5
-SIZE (postgresql/postgresql-docs-8.2.2.tar.bz2) = 2754998
-MD5 (postgresql/postgresql-test-8.2.2.tar.bz2) = ea3c2805a1f619417a321e84e7b41651
-SHA256 (postgresql/postgresql-test-8.2.2.tar.bz2) = e217717d3cc190c71a8084e8d876949c79cf8867e743aedc5cf60d92377d37fb
-SIZE (postgresql/postgresql-test-8.2.2.tar.bz2) = 985316
+MD5 (postgresql/postgresql-base-8.2.3.tar.bz2) = c19b529c2a7b3c4850ae65b0a89f1883
+SHA256 (postgresql/postgresql-base-8.2.3.tar.bz2) = 6ad1274bd8e7f3df1c4295d73b93b2176278b4f9b0dc375737bfe75cecefc6e8
+SIZE (postgresql/postgresql-base-8.2.3.tar.bz2) = 8500472
+MD5 (postgresql/postgresql-opt-8.2.3.tar.bz2) = 2381dc8db8d90f78f4db940dc5544d9f
+SHA256 (postgresql/postgresql-opt-8.2.3.tar.bz2) = fc82d271c988b27515735db463e6f656f0417104f8f0cabfda5c515e15b1876e
+SIZE (postgresql/postgresql-opt-8.2.3.tar.bz2) = 167549
+MD5 (postgresql/postgresql-docs-8.2.3.tar.bz2) = 66a3ed6319e75b7aee2db0a1efedde59
+SHA256 (postgresql/postgresql-docs-8.2.3.tar.bz2) = 88cf0a17ee03dd4e9d0cef282a7a730837abea1bcc804678029778b0dd456094
+SIZE (postgresql/postgresql-docs-8.2.3.tar.bz2) = 2757963
+MD5 (postgresql/postgresql-test-8.2.3.tar.bz2) = 81e227d2e1393573c5dd5f762fb99b1e
+SHA256 (postgresql/postgresql-test-8.2.3.tar.bz2) = 4efdb72c8bf6f8784719147002ddd3458122b21f054a8f6a921365ddc753db32
+SIZE (postgresql/postgresql-test-8.2.3.tar.bz2) = 985623
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 6a29d7079c62..92695b4a95fb 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -1,327 +1,327 @@
 # New ports collection makefile for:	PostgreSQL
 # Date created:		November 13, 1998
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.2.2
+PORTVERSION?=	8.2.3
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
 PKGNAMESUFFIX?=	-server
 DISTFILES?=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
 		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
 
 CONFLICTS?=	${PORTNAME}-client-7.* \
 		${PORTNAME}${PKGNAMESUFFIX}-7.* \
 		${PORTNAME}-client-8.[0-13-9]* \
 		${PORTNAME}${PKGNAMESUFFIX}-8.[0-13-9]*
 
 WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
 UNIQUENAME?=	${PORTNAME}82
 LATEST_LINK?=	${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
 
 PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
 USE_BZIP2=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 .if defined(NO_BUILD)
 .undef USE_GMAKE
 .undef GNU_CONFIGURE
 .endif
 
 CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include \
 		--with-docdir=${DOCSDIR}
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 
 BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
 		src/bin/initdb src/bin/ipcclean src/bin/pg_ctl src/bin/pg_controldata \
 		src/bin/pg_resetxlog src/pl
 
 INSTALL_DIRS?=	${BUILD_DIRS}
 
 .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
 SERVER_ONLY=	yes
 USE_RC_SUBR=	postgresql
 SUB_FILES+=	dot.cshrc dot.profile
 USE_PGSQL=	yes
 WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
 .endif
 
 .if !defined(SLAVE_ONLY)
 OPTIONS=	NLS "Use internationalized messages" on
 .endif
 
 # Cannot check this with standard OPTION due to a catch-22.
 # USE_OPENSSL must precede bsd.port.pre.mk, but then we don't know
 # what OPTIONS are set.
 #
 # If you *don't* want SSL, set WITHOUT_SSL=YES when making
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=--with-openssl
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "alpha" && ${OSVERSION} < 500000
 BROKEN=		Coredump during build on alpha 4.x
 .endif
 
 .if !defined(SLAVE_ONLY)
 # gnugetopt will always be used if already installed
 .  if ( ${OSVERSION} < 500041 ) && !exists(${LOCALBASE}/include/getopt.h)
 OPTIONS+=	GNUGETOPT "Use GNU getopt" on
 .  endif
 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+=	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
 
 # 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/:hier812055
 # PATCHFILES+=	hier-Pg8.1.2-0.5.5.diff.gz:hier812055
 # USE_BISON=	yes
 # .  endif
 
 # .  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 # USE_AUTOTOOLS=	autoconf:259
 # CONFIGURE_ARGS+=--with-icu
 # LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
 # PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
 # PATCHFILES+=	pg-814-icu-xx-2006-09-25.diff.gz:icu
 # .  endif
 
 PATCH_DIST_STRIP=-p1
 
 .  ifmake makesum
 DISTFILES+=	postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_PAM)
 CONFIGURE_ARGS+=--with-pam
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_LDAP)
 CONFIGURE_ARGS+=--with-ldap
 USE_OPENLDAP=	YES
 .  endif
 
 .  if defined(WITH_INTDATE)
 CONFIGURE_ARGS+=--enable-integer-datetimes
 .  endif
 
 . if !defined(WITHOUT_GNUGETOPT) || exists(${LOCALBASE}/include/getopt.h)
 USE_GETOPT_LONG=yes
 .  endif
 
 .  if !(defined(WITHOUT_GETTEXT) || defined(WITHOUT_NLS))
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	GETTEXT=""
 USE_GETTEXT=	YES
 .  else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	GETTEXT="@comment "
 .  endif
 
 .  if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O3 -funroll-loops
 .  endif
 
 .  if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 INSTALL_TARGET=	install
 .  else
 INSTALL_TARGET=	install-strip
 .  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"
 .    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
 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.21:${PORTSDIR}/security/heimdal
 CONFIGURE_ARGS+=--with-krb5
 .    endif
 .  endif
 
 .  if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || defined(WITH_THREADSAFE) || make(makesum)
 DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
 .  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)
 MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1   \
 		dropdb.1 droplang.1 dropuser.1 ecpg.1 initdb.1	   \
 		ipcclean.1 pg_config.1 pg_controldata.1 pg_ctl.1   \
 		pg_dump.1 pg_dumpall.1 pg_resetxlog.1 pg_restore.1 \
 		postgres.1 postmaster.1 psql.1 reindexdb.1 vacuumdb.1
 
 MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
 		alter_domain.7 alter_function.7 alter_group.7		      \
 		alter_index.7 alter_language.7 alter_operator_class.7	      \
 		alter_role.7						      \
 		alter_schema.7 alter_sequence.7 alter_table.7		      \
 		alter_trigger.7 alter_user.7 analyze.7 begin.7		      \
 		checkpoint.7 close.7 cluster.7 comment.7 commit.7	      \
 		commit_prepared.7					      \
 		copy.7 create_aggregate.7 create_cast.7			      \
 		create_constraint_trigger.7 create_conversion.7		      \
 		create_database.7 create_domain.7 create_function.7	      \
 		create_group.7 create_index.7 create_language.7		      \
 		create_operator.7 create_operator_class.7		      \
 		create_role.7						      \
 		create_rule.7 create_schema.7 create_sequence.7		      \
 		create_table.7 create_table_as.7 create_trigger.7	      \
 		create_type.7 create_user.7 create_view.7 deallocate.7	      \
 		declare.7 delete.7					      \
 		drop_aggregate.7 drop_cast.7 drop_conversion.7		      \
 		drop_database.7 drop_domain.7 drop_function.7		      \
 		drop_group.7 drop_index.7 drop_language.7		      \
 		drop_operator.7 drop_operator_class.7 drop_owned.7	      \
 		drop_role.7 drop_rule.7					      \
 		drop_schema.7 drop_sequence.7 drop_table.7 drop_trigger.7     \
 		drop_type.7 drop_user.7 drop_view.7 end.7 execute.7	      \
 		explain.7 fetch.7 grant.7 insert.7 listen.7 load.7	      \
 		lock.7 move.7 notify.7 prepare.7 prepare_transaction.7	      \
 		reassign_owned.7 reindex.7 reset.7			      \
 		revoke.7 rollback.7 rollback_prepared.7 select.7	      \
 		select_into.7 set.7					      \
 		set_constraints.7 set_role.7 set_transaction.7 show.7	      \
 		set_session_authorization.7 start_transaction.7		      \
 		truncate.7 unlisten.7 update.7 vacuum.7			      \
 		alter_operator.7 alter_tablespace.7 alter_type.7	      \
 		create_tablespace.7 drop_tablespace.7			      \
 		release_savepoint.7 rollback_to_savepoint.7		      \
 		savepoint.7 values.7
 .endif
 
 .if defined(SERVER_ONLY)
 pre-everything::
 	@${SH} ${PKGINSTALL} ${PORTNAME} BACKUPWARNING
 .endif
 
 .if !defined(NO_BUILD)
 
 pre-configure:
 .  if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
 	@${ECHO} "MIT's and Heimdal Kerberos are mutually exclusive."
 	@${ECHO} "Please choose one or the other."
 	@exit 1
 .  endif
 
 do-build:
 	@ cd ${WRKSRC}/src/backend ;\
 	${GMAKE} ../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
 	@ for dir in ${BUILD_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \
 	done
 
 .  if exists(${FILESDIR}/pkg-message${PKGNAMESUFFIX}.in)
 SUB_FILES+=	pkg-message${PKGNAMESUFFIX}
 PKGMESSAGE=	${WRKSRC}/pkg-message${PKGNAMESUFFIX}
 .  endif
 .endif
 
 .if defined(SERVER_ONLY)
 pre-su-install:
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
 
 .if !defined(NO_BUILD)
 do-install:
 	@for dir in ${INSTALL_DIRS}; do \
 	    cd ${WRKSRC}/$${dir} && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \
 	done
 .  if defined(SERVER_ONLY)
 	@ ${MKDIR} ${PREFIX}/share/postgresql
 .    for i in profile cshrc
 	${INSTALL_DATA} ${WRKDIR}/dot.$i ${PREFIX}/share/postgresql/dot.$i.dist; \
 	${INSTALL_DATA} -o pgsql -g pgsql ${WRKDIR}/dot.$i ~pgsql/dot.$i.dist ; \
 	if [ ! -f ~pgsql/.$i ]; then \
 		${CP} -p ~pgsql/dot.$i.dist ~pgsql/.$i; \
 	fi
 .    endfor
 	@ ${CHOWN} -R pgsql:pgsql ~pgsql/. ;\
 	${MKDIR} ${PREFIX}/etc/periodic/daily ;\
 	${INSTALL_SCRIPT} ${FILESDIR}/502.pgsql \
 			${PREFIX}/etc/periodic/daily
 .  endif # SERVER_ONLY
 .  if defined(CLIENT_ONLY)
 	@ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} install-local
 .  endif
 	@ if [ -r ${PKGMESSAGE} ]; then \
 		${MKDIR} ${DOCSDIR} ;\
 		${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${PKGNAMESUFFIX} ;\
 		${ECHO} "======================================================================" ;\
 		${CAT} ${PKGMESSAGE} ;\
 		${ECHO} "======================================================================" ;\
 	fi
 .endif # !NO_BUILD
 
 .if defined(SERVER_ONLY) && defined(WITH_TESTS)
 check:
 	@if [ `id -u` != 0 ] ; then \
 	  ${ECHO} "Running postgresql regressions tests" ;\
 	  cd ${WRKSRC}; ${GMAKE} check ;\
 	 else \
 	  ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \
 	  ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\
 	 fi
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo
index 32534d40c0aa..ad300d6350df 100644
--- a/databases/postgresql92-server/distinfo
+++ b/databases/postgresql92-server/distinfo
@@ -1,12 +1,12 @@
-MD5 (postgresql/postgresql-base-8.2.2.tar.bz2) = 9621817df0b800eb56b11f0a92950c75
-SHA256 (postgresql/postgresql-base-8.2.2.tar.bz2) = f2c81f3efac8d3f38745dffe0524b4cde7ada3769e05dcf6445e3d8f6aa33ee1
-SIZE (postgresql/postgresql-base-8.2.2.tar.bz2) = 8504662
-MD5 (postgresql/postgresql-opt-8.2.2.tar.bz2) = 4c94cc8251576ad47c40725a87690a69
-SHA256 (postgresql/postgresql-opt-8.2.2.tar.bz2) = 66cc1563558d06125a47f5e965f6cfad3b4c65e73a59a490eb6de64c4527d450
-SIZE (postgresql/postgresql-opt-8.2.2.tar.bz2) = 167698
-MD5 (postgresql/postgresql-docs-8.2.2.tar.bz2) = 3d96f5cbcfae2027688776e8c3acde1b
-SHA256 (postgresql/postgresql-docs-8.2.2.tar.bz2) = b860fa87a6281e34c93e48847a1ca715bceba9c1fadf72f65bdaaefda02dfeb5
-SIZE (postgresql/postgresql-docs-8.2.2.tar.bz2) = 2754998
-MD5 (postgresql/postgresql-test-8.2.2.tar.bz2) = ea3c2805a1f619417a321e84e7b41651
-SHA256 (postgresql/postgresql-test-8.2.2.tar.bz2) = e217717d3cc190c71a8084e8d876949c79cf8867e743aedc5cf60d92377d37fb
-SIZE (postgresql/postgresql-test-8.2.2.tar.bz2) = 985316
+MD5 (postgresql/postgresql-base-8.2.3.tar.bz2) = c19b529c2a7b3c4850ae65b0a89f1883
+SHA256 (postgresql/postgresql-base-8.2.3.tar.bz2) = 6ad1274bd8e7f3df1c4295d73b93b2176278b4f9b0dc375737bfe75cecefc6e8
+SIZE (postgresql/postgresql-base-8.2.3.tar.bz2) = 8500472
+MD5 (postgresql/postgresql-opt-8.2.3.tar.bz2) = 2381dc8db8d90f78f4db940dc5544d9f
+SHA256 (postgresql/postgresql-opt-8.2.3.tar.bz2) = fc82d271c988b27515735db463e6f656f0417104f8f0cabfda5c515e15b1876e
+SIZE (postgresql/postgresql-opt-8.2.3.tar.bz2) = 167549
+MD5 (postgresql/postgresql-docs-8.2.3.tar.bz2) = 66a3ed6319e75b7aee2db0a1efedde59
+SHA256 (postgresql/postgresql-docs-8.2.3.tar.bz2) = 88cf0a17ee03dd4e9d0cef282a7a730837abea1bcc804678029778b0dd456094
+SIZE (postgresql/postgresql-docs-8.2.3.tar.bz2) = 2757963
+MD5 (postgresql/postgresql-test-8.2.3.tar.bz2) = 81e227d2e1393573c5dd5f762fb99b1e
+SHA256 (postgresql/postgresql-test-8.2.3.tar.bz2) = 4efdb72c8bf6f8784719147002ddd3458122b21f054a8f6a921365ddc753db32
+SIZE (postgresql/postgresql-test-8.2.3.tar.bz2) = 985623