5 files changed, 33 insertions, 15 deletions

diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 4f17a17f902b..57567212b81e 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.4
+PORTVERSION?=	7.4.1
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
@@ -73,12 +73,12 @@ CONFIGURE_ARGS+=	"--with-openssl=${OPENSSLBASE}"
 .if defined(WITHOUT_SERVER)
 PLIST_SUB+=	SERVER="@comment "
 PKGNAMESUFFIX=	-client
-PKGMSG=		""
+PKGMSG=		/dev/null
 CONFLICTS=	postgresql-7* postgresql-devel-*
 .else
 PKGMESSAGE=	${FILESDIR}/pkg-message.server
 PKGMSG=		${PKGMESSAGE}
-CONFLICTS=	postgresql-7*client postgreql-devel-*
+CONFLICTS=	postgresql-client-7* postgresql-devel-*
 PLIST_SUB+=	SERVER=""
 INSTALL_TARGET+=	install-all-headers
 MAKEFILE=	GNUmakefile
diff --git a/databases/postgresql74-server/distinfo b/databases/postgresql74-server/distinfo
index f36c65ae2d5e..56dcb82c77c6 100644
--- a/databases/postgresql74-server/distinfo
+++ b/databases/postgresql74-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.4.tar.bz2) = a1af58384f506ed63c1d960ab43a2b3b
-MD5 (postgresql/postgresql-opt-7.4.tar.bz2) = df425a08172b1e6ca41e7720b65a6b15
-MD5 (postgresql/postgresql-test-7.4.tar.bz2) = 3c104928f6dadb8fa6086b5ae8060835
-MD5 (postgresql/postgresql-docs-7.4.tar.bz2) = b8f1d43dc64b6813b3239f36425c8cb8
+MD5 (postgresql/postgresql-base-7.4.1.tar.bz2) = 6a608caae10fb1d90bf3c7bdcc56b876
+MD5 (postgresql/postgresql-opt-7.4.1.tar.bz2) = 5c2c63741d9c7a4168b29e4b4439b0c7
+MD5 (postgresql/postgresql-test-7.4.1.tar.bz2) = 23ddb087901fcf7bc3cf8dfa06ff45ed
+MD5 (postgresql/postgresql-docs-7.4.1.tar.bz2) = c1ed614b482df37fa0b174b3f3839752
diff --git a/databases/postgresql74-server/files/pkg-message.server b/databases/postgresql74-server/files/pkg-message.server
index a2e7293462ca..69826681eb42 100644
--- a/databases/postgresql74-server/files/pkg-message.server
+++ b/databases/postgresql74-server/files/pkg-message.server
@@ -19,3 +19,19 @@ NB. FreeBSD's PostgreSQL port now by default logs to syslog
 
 For more tips, read ~pgsql/post-install-notes
 ======================================================================
+Specific for the 7.4.1 update:
+
+   A dump/restore is *not* required for those running 7.4.
+
+   If you want to install the fixes in the information schema you need to
+   reload it into the database. This is either accomplished by
+   initializing a new cluster by running "initdb", or by running the
+   following sequence of SQL commands in each database (ideally including
+   template1) as a superuser in psql, after installing the new release:
+DROP SCHEMA information_schema CASCADE;
+\i /usr/local/pgsql/share/information_schema.sql
+
+   Fixes to the information schema (from HISTORY):
+     * Fix information schema for bit data types (Peter)
+     * Fix information schema view constraint_column_usage for foreign
+       keys (Peter)
diff --git a/databases/postgresql74-server/files/post-install-notes b/databases/postgresql74-server/files/post-install-notes
index 037eec446deb..0fb0604214b8 100644
--- a/databases/postgresql74-server/files/post-install-notes
+++ b/databases/postgresql74-server/files/post-install-notes
@@ -7,8 +7,7 @@ p5-Pg
   A perl5 API for client access to PostgreSQL databases.
 
 postgresql-tcltk 
-  If you want tcl/tk client support. You get a neat GUI, pgaccess, as
-  a bonus!
+  If you want tcl/tk client support.
 
 postgresql-jdbc
   For Java JDBC support.
diff --git a/databases/postgresql74-server/pkg-plist b/databases/postgresql74-server/pkg-plist
index 6c4ba1c3568b..2b172fd5e78c 100644
--- a/databases/postgresql74-server/pkg-plist
+++ b/databases/postgresql74-server/pkg-plist
@@ -28,20 +28,25 @@ include/postgresql/internal/libpq/pqcomm.h
 @dirrm include/postgresql/internal/libpq
 include/postgresql/internal/lib/dllist.h
 @dirrm include/postgresql/internal/lib
+include/postgresql/informix/esql/datetime.h
+include/postgresql/informix/esql/decimal.h
+include/postgresql/informix/esql/sqlda.h
+include/postgresql/informix/esql/sqltypes.h
+@dirrm include/postgresql/informix/esql
+@dirrm include/postgresql/informix
 include/postgresql/internal/c.h
 include/postgresql/internal/libpq-int.h
 include/postgresql/internal/postgres_fe.h
+include/postgresql/internal/port.h
 include/postgresql/internal/pqexpbuffer.h
 @dirrm include/postgresql/internal
-include/compatlib.h
-include/datetime.h
-include/decimal.h
 include/ecpg_informix.h
 include/ecpgerrno.h
 include/ecpglib.h
 include/ecpgtype.h
 include/libpq-fe.h
 include/pg_config.h
+include/pg_config_manual.h
 include/pg_config_os.h
 include/pgtypes_date.h
 include/pgtypes_error.h
@@ -51,8 +56,6 @@ include/pgtypes_timestamp.h
 include/postgres_ext.h
 include/sql3types.h
 include/sqlca.h
-include/sqlda.h
-include/sqltypes.h
 lib/libecpg.a
 lib/libecpg.so
 lib/libecpg.so.4
@@ -98,11 +101,11 @@ lib/libpgtypes.so.1
 %%SERVER%%share/postgresql/information_schema.sql
 %%SERVER%%share/postgresql/pg_hba.conf.sample
 %%SERVER%%share/postgresql/pg_ident.conf.sample
-%%SERVER%%share/postgresql/pg_service.conf.sample
 %%SERVER%%share/postgresql/postgres.bki
 %%SERVER%%share/postgresql/postgres.description
 %%SERVER%%share/postgresql/postgresql.conf.sample
 %%SERVER%%share/postgresql/sql_features.txt
+share/postgresql/pg_service.conf.sample
 share/postgresql/post-install-notes
 @unexec rmdir %D/share/postgresql 2>/dev/null || true
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo