3 files changed, 18 insertions, 22 deletions

diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 5b6236133af5..43a6fdb71ebd 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.4.18
-PORTREVISION?=	1
+PORTVERSION?=	7.4.19
+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}
+DISTFILES?=	postgresql-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
@@ -149,20 +148,15 @@ CONFIGURE_ARGS+=--with-krb5=${HEIMDAL_HOME}
 # 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
+LIB_DEPENDS+=	krb5.23:${PORTSDIR}/security/heimdal
 CONFIGURE_ARGS+=--with-krb5=${LOCALBASE}
 .    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
 
-.  ifmake makesum
-DISTFILES+=	postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
-.  endif
-
 PATCH_DIST_STRIP=-p1
 
 .  if defined(SERVER_ONLY) && defined(WITH_LIBC_R)
diff --git a/databases/postgresql74-server/distinfo b/databases/postgresql74-server/distinfo
index 57656abe84ee..d0840cb1df2b 100644
--- a/databases/postgresql74-server/distinfo
+++ b/databases/postgresql74-server/distinfo
@@ -1,15 +1,6 @@
-MD5 (postgresql/postgresql-base-7.4.18.tar.bz2) = ab87c1d2ee5caab6c41bd7ab235f3037
-SHA256 (postgresql/postgresql-base-7.4.18.tar.bz2) = 0eff5ab743db9d413b5fe95a2ee907e86b1d32ce3727011ee5c308c0dc7db0af
-SIZE (postgresql/postgresql-base-7.4.18.tar.bz2) = 6662169
-MD5 (postgresql/postgresql-opt-7.4.18.tar.bz2) = 41af694b71fac5f71ebbde227cd8e6ac
-SHA256 (postgresql/postgresql-opt-7.4.18.tar.bz2) = 63b9ce09e66a90267d70ab766cb6dc833cafa93f52253fe83699b8fce39a9a88
-SIZE (postgresql/postgresql-opt-7.4.18.tar.bz2) = 334631
-MD5 (postgresql/postgresql-test-7.4.18.tar.bz2) = 0223ab74e9610f2a0af27edbc9013fde
-SHA256 (postgresql/postgresql-test-7.4.18.tar.bz2) = 8c475490a5b8233efb936e11fcb2f02ab10324b35920d310561ba14b1c8268d3
-SIZE (postgresql/postgresql-test-7.4.18.tar.bz2) = 894754
-MD5 (postgresql/postgresql-docs-7.4.18.tar.bz2) = 6eb6d4c7a79067d21cb0c87b30392a06
-SHA256 (postgresql/postgresql-docs-7.4.18.tar.bz2) = 06b19865d8124a13b2553ad142405262b99fcb75e856137b0d4d8f5867e700e0
-SIZE (postgresql/postgresql-docs-7.4.18.tar.bz2) = 2434756
+MD5 (postgresql/postgresql-7.4.19.tar.bz2) = 0be8c193fb73113930d043c60200598b
+SHA256 (postgresql/postgresql-7.4.19.tar.bz2) = 447ac7070aa0a547f17a307e842734fc27e2716cb4a251fa9a810b178d44c389
+SIZE (postgresql/postgresql-7.4.19.tar.bz2) = 9284558
 MD5 (postgresql/hier-Pg7.4-0.5.3.tar.gz) = 16d037213b879963724da7809a0a1589
 SHA256 (postgresql/hier-Pg7.4-0.5.3.tar.gz) = 1e56f76560c86227b08faabf78e3a53de4188c6a8f9d1f38b1481427e8fdf74c
 SIZE (postgresql/hier-Pg7.4-0.5.3.tar.gz) = 34662
diff --git a/databases/postgresql74-server/files/patch-doc-Makefile b/databases/postgresql74-server/files/patch-doc-Makefile
new file mode 100644
index 000000000000..b297cc51c80c
--- /dev/null
+++ b/databases/postgresql74-server/files/patch-doc-Makefile
@@ -0,0 +1,11 @@
+--- doc/Makefile~	2003-08-04 22:52:48.000000000 +0200
++++ doc/Makefile	2008-01-07 11:53:53.000000000 +0100
+@@ -26,7 +26,7 @@
+ .NOTPARALLEL:
+ 
+ ifneq ($(wildcard $(srcdir)/postgres.tar.gz),)
+-found_html := yes
++#found_html := yes
+ endif
+ 
+ ifneq ($(wildcard $(srcdir)/man.tar.gz),)