4 files changed, 28 insertions, 15 deletions

diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 782803659342..4e1d17dd2e2d 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.4.2
+PORTVERSION?=	7.4.3
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
@@ -91,8 +91,18 @@ WITH_KRB5=	yes
 .endif
 
 .if defined(WITH_HEIMDAL_KRB5)
-KRB5CONF=	/usr/bin/krb5-config
 WITH_KRB5=	yes
+.if defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
+CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME}
+KRB5CONF=	${HEIMDAL_HOME}/bin/krb5-config
+.elif ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(${DESTDIR}/usr/lib/libkrb5.a)
+CONFIGURE_ARGS+=	--with-krb5=${DESTDIR}/usr
+KRB5CONF=	${DESTDIR}/usr/bin/krb5-config
+.else
+LIB_DEPENDS+=	krb5:${PORTSDIR}/security/heimdal
+CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
+KRB5CONF=	${LOCALBASE}/bin/krb5-config
+.endif
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/databases/postgresql82-server/distinfo b/databases/postgresql82-server/distinfo
index 9599ee773e23..ebee11d64296 100644
--- a/databases/postgresql82-server/distinfo
+++ b/databases/postgresql82-server/distinfo
@@ -1,8 +1,8 @@
-MD5 (postgresql/postgresql-base-7.4.2.tar.bz2) = 1e397e48237aae3948266fe97807e885
-SIZE (postgresql/postgresql-base-7.4.2.tar.bz2) = 6480665
-MD5 (postgresql/postgresql-docs-7.4.2.tar.bz2) = a2ba1247b26f7cd638d280d5552e75a0
-SIZE (postgresql/postgresql-docs-7.4.2.tar.bz2) = 2388008
-MD5 (postgresql/postgresql-test-7.4.2.tar.bz2) = 80a7f216019a7086da0d86a85347a419
-SIZE (postgresql/postgresql-test-7.4.2.tar.bz2) = 942684
-MD5 (postgresql/postgresql-opt-7.4.2.tar.bz2) = 9eb004120328def9d938c63d4a8afa64
-SIZE (postgresql/postgresql-opt-7.4.2.tar.bz2) = 330741
+MD5 (postgresql/postgresql-base-7.4.3.tar.bz2) = 647b7d76f93acf12c0a7c11d302a1663
+SIZE (postgresql/postgresql-base-7.4.2.tar.bz2) = 6486437
+MD5 (postgresql/postgresql-docs-7.4.3.tar.bz2) = 5f7d235553ae47946439d4b24f8d1ab2
+SIZE (postgresql/postgresql-docs-7.4.3.tar.bz2) = 2407307
+MD5 (postgresql/postgresql-test-7.4.3.tar.bz2) = 2d54a1aef2086691a26789193c21d47d
+SIZE (postgresql/postgresql-test-7.4.3.tar.bz2) = 942690
+MD5 (postgresql/postgresql-opt-7.4.3.tar.bz2) = f3446bdfc33f6d26d637aa15f6fd1084
+SIZE (postgresql/postgresql-opt-7.4.3.tar.bz2) = 331745
diff --git a/databases/postgresql82-server/pkg-install b/databases/postgresql82-server/pkg-install
index 769cba5ef455..888b9e1b4d82 100644
--- a/databases/postgresql82-server/pkg-install
+++ b/databases/postgresql82-server/pkg-install
@@ -6,11 +6,11 @@ PATH=/bin:/usr/sbin
 
 DB_DIR=${PKG_PREFIX}/pgsql
 
-backupwarning() {
-	echo "
-NOTICE: unlike most minor versions, this version does require
-some updates to the pg_* system tables.  Full instructions for
-how to do this are included in the full HISTORY file.
+backupwarning() { echo "
+NOTICE: unlike most minor versions, this upgrade from 7.4.1 to 7.4.2
+*does require* some updates to the pg_* system tables.  Full
+instructions for how to do this are included in the full HISTORY file.
+
 DO NOT UPGRADE WITHOUT READING THESE INSTRUCTIONS.
 
   =========== BACKUP YOUR DATA! =============
diff --git a/databases/postgresql82-server/pkg-plist b/databases/postgresql82-server/pkg-plist
index 61111d6f83bc..0396b6150164 100644
--- a/databases/postgresql82-server/pkg-plist
+++ b/databases/postgresql82-server/pkg-plist
@@ -128,6 +128,9 @@ share/postgresql/post-install-notes
 %%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo