4 files changed, 17 insertions, 9 deletions

diff --git a/databases/postgresql10-server/Makefile b/databases/postgresql10-server/Makefile
index e46aff0ead54..fa72652dfcc5 100644
--- a/databases/postgresql10-server/Makefile
+++ b/databases/postgresql10-server/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	postgresql
-DISTVERSION?=	10.4
-PORTREVISION?=	1
+DISTVERSION?=	10.5
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL/source/v${DISTVERSION}
 PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT}
@@ -14,9 +13,9 @@ COMMENT?=	PostgreSQL is the most advanced open-source database available anywher
 LICENSE=	PostgreSQL
 
 .if ${DISTVERSION:C/([0-9]*).*/\1/} == 10
-CONFLICTS+=	${PORTNAME}*-9.*
+CONFLICTS+=	${PORTNAME}9*
 .else
-CONFLICTS+=	${PORTNAME}*-9.[^${PORTVERSION:R:E}].* ${PORTNAME}10*
+CONFLICTS+=	${PORTNAME}9[^${PORTVERSION:R:E}]* ${PORTNAME}10*
 .endif
 
 WRKSRC=		${WRKDIR}/postgresql-${DISTVERSION}
@@ -29,7 +28,6 @@ USES+=		tar:bzip2 cpe
 .if !defined(NO_BUILD)
 USES+=	gmake
 GNU_CONFIGURE=	yes
-LLD_UNSAFE=	yes
 .endif
 
 PG_USER?=	postgres
@@ -102,7 +100,7 @@ USES+=		pkgconfig
 # (requires dump/restore if modified.)
 OPTIONS_DEFINE+=	INTDATE
 INTDATE_DESC=	Builds with 64-bit date/time type
-OPTIONS_DEFAULT+=	XML TZDATA INTDATE
+OPTIONS_DEFAULT+=	TZDATA INTDATE
 .endif
 
 .if !defined(SLAVE_ONLY)
diff --git a/databases/postgresql10-server/distinfo b/databases/postgresql10-server/distinfo
index a8361ed829aa..68978d2f045f 100644
--- a/databases/postgresql10-server/distinfo
+++ b/databases/postgresql10-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525980865
-SHA256 (postgresql/postgresql-10.4.tar.bz2) = 1b60812310bd5756c62d93a9f93de8c28ea63b0df254f428cd1cf1a4d9020048
-SIZE (postgresql/postgresql-10.4.tar.bz2) = 20201838
+TIMESTAMP = 1533847537
+SHA256 (postgresql/postgresql-10.5.tar.bz2) = 6c8e616c91a45142b85c0aeb1f29ebba4a361309e86469e0fb4617b6a73c4011
+SIZE (postgresql/postgresql-10.5.tar.bz2) = 20284578
diff --git a/databases/postgresql10-server/pkg-plist-client b/databases/postgresql10-server/pkg-plist-client
index e841064f5553..2b6321ab7f3b 100644
--- a/databases/postgresql10-server/pkg-plist-client
+++ b/databases/postgresql10-server/pkg-plist-client
@@ -25,6 +25,7 @@ include/pg_config.h
 include/pg_config_ext.h
 include/pg_config_manual.h
 include/pg_config_os.h
+include/pgtypes.h
 include/pgtypes_date.h
 include/pgtypes_error.h
 include/pgtypes_interval.h
@@ -1010,6 +1011,7 @@ man/man7/WITH.7.gz
 %%NLS%%share/locale/cs/LC_MESSAGES/pg_config-10.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/pg_dump-10.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/pgscripts-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/psql-10.mo
 %%NLS%%share/locale/de/LC_MESSAGES/ecpg-10.mo
 %%NLS%%share/locale/de/LC_MESSAGES/ecpglib6-10.mo
 %%NLS%%share/locale/de/LC_MESSAGES/libpq5-10.mo
diff --git a/databases/postgresql10-server/pkg-plist-server b/databases/postgresql10-server/pkg-plist-server
index bf471953e67a..b23be3697837 100644
--- a/databases/postgresql10-server/pkg-plist-server
+++ b/databases/postgresql10-server/pkg-plist-server
@@ -62,8 +62,16 @@ lib/libpgcommon.a
 %%DATADIR%%/extension/plpgsql.control
 %%DATADIR%%/postgres.shdescription
 %%NLS%%share/locale/cs/LC_MESSAGES/initdb-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_archivecleanup-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-10.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-10.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_resetwal-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_rewind-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_fsync-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_timing-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_upgrade-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_waldump-10.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/plpgsql-10.mo
 %%NLS%%share/locale/de/LC_MESSAGES/initdb-10.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pg_archivecleanup-10.mo