3 files changed, 21 insertions, 2 deletions

diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile
index e43dced82416..24d5a12e722a 100644
--- a/databases/postgresql-devel/Makefile
+++ b/databases/postgresql-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.4.b4.2003.10.03
+PORTVERSION?=	7.4.b5.2003.10.23
 CATEGORIES?=	databases
 MASTER_SITES=	http://freebsd.sean.chittenden.org/ports/ \
 		http://people.freebsd.org/~seanc/ports/
@@ -17,6 +17,7 @@ DIST_SUBDIR=	postgresql
 MAINTAINER?=	seanc@FreeBSD.org
 COMMENT=	Development snapshots of PostgreSQL's latest features
 
+CONFLICTS=	postgresql7*
 CONFIGURE_ENV+=	DOCBOOKSTYLE=${LOCALBASE}/share/sgml/docbook/3.1/
 USE_BZIP2=	YES
 USE_GMAKE=	YES
diff --git a/databases/postgresql-devel/distinfo b/databases/postgresql-devel/distinfo
index ec53aafcde2b..912681e30233 100644
--- a/databases/postgresql-devel/distinfo
+++ b/databases/postgresql-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-7.4.b4.2003.10.03.tar.bz2) = 843ad643418c414878d85904881b92b4
+MD5 (postgresql/postgresql-7.4.b5.2003.10.23.tar.bz2) = 5e3244d905c2623ac8eaa7d1a5cb0f2b
 MD5 (postgresql/patch-pgblocksize-16K) = 2ac9dac033302e9ce15816db0e346d55
 MD5 (postgresql/patch-pgblocksize-32K) = 0910cbfbecbb25e2bd23ebe50eb29287
 MD5 (postgresql/patch-pgblocksize-65K) = 0e197b76e262bb5efe1ebf0f5c0a80ee
diff --git a/databases/postgresql-devel/pkg-plist b/databases/postgresql-devel/pkg-plist
index aee048084434..9f3617aec9e7 100644
--- a/databases/postgresql-devel/pkg-plist
+++ b/databases/postgresql-devel/pkg-plist
@@ -380,6 +380,7 @@ include/pg_config.h
 include/pg_config_os.h
 include/libpq/libpq-fs.h
 @dirrm include/libpq
+include/compatlib.h
 include/datetime.h
 include/decimal.h
 include/ecpg_informix.h
@@ -395,6 +396,7 @@ include/pgtypes_timestamp.h
 include/sql3types.h
 include/sqlca.h
 include/sqltypes.h
+include/sqlda.h
 lib/libpq.so
 lib/libpq.a
 lib/libpq.so.3
@@ -471,18 +473,27 @@ share/postgresql/post-install-notes
 %%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
 %%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
@@ -493,6 +504,8 @@ share/postgresql/post-install-notes
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
@@ -500,6 +513,11 @@ share/postgresql/post-install-notes
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo