Pullup ticket 1164 - requested by Joerg Sonnenberger

mostly sync databases/postgresql73{,-client,-docs,-lib,-plperl,-pltcl,-server}, databases/{tcl,tk}-postgresql73 with HEAD, via patch, including security fix.

7 files changed, 20 insertions, 18 deletions

diff --git a/databases/postgresql73-docs/PLIST b/databases/postgresql73-docs/PLIST
index 01990d6b47a..75e480a468c 100644
--- a/databases/postgresql73-docs/PLIST
+++ b/databases/postgresql73-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/08/07 18:19:16 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.5.4.1 2006/03/08 22:41:43 seb Exp $
 share/doc/html/postgresql/admin-preface.html
 share/doc/html/postgresql/admin.html
 share/doc/html/postgresql/app-clusterdb.html
@@ -192,10 +192,10 @@ share/doc/html/postgresql/libpq-threading.html
 share/doc/html/postgresql/libpq-trace.html
 share/doc/html/postgresql/libpq.html
 share/doc/html/postgresql/ln17992.html
-share/doc/html/postgresql/ln26577.html
-share/doc/html/postgresql/ln39021.html
-share/doc/html/postgresql/ln53737.html
 share/doc/html/postgresql/ln25.html
+share/doc/html/postgresql/ln26703.html
+share/doc/html/postgresql/ln39147.html
+share/doc/html/postgresql/ln53863.html
 share/doc/html/postgresql/ln659.html
 share/doc/html/postgresql/lo-funcs.html
 share/doc/html/postgresql/lo-implementation.html
@@ -391,6 +391,10 @@ share/doc/html/postgresql/release-7-2-7.html
 share/doc/html/postgresql/release-7-2-8.html
 share/doc/html/postgresql/release-7-2.html
 share/doc/html/postgresql/release-7-3-1.html
+share/doc/html/postgresql/release-7-3-10.html
+share/doc/html/postgresql/release-7-3-11.html
+share/doc/html/postgresql/release-7-3-12.html
+share/doc/html/postgresql/release-7-3-13.html
 share/doc/html/postgresql/release-7-3-2.html
 share/doc/html/postgresql/release-7-3-3.html
 share/doc/html/postgresql/release-7-3-4.html
diff --git a/databases/postgresql73-lib/Makefile b/databases/postgresql73-lib/Makefile
index 15350f52543..753ad0d1225 100644
--- a/databases/postgresql73-lib/Makefile
+++ b/databases/postgresql73-lib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:04 rillig Exp $
+# $NetBSD: Makefile,v 1.14.2.1 2006/03/08 22:41:43 seb Exp $
 
 PKGNAME=		postgresql73-lib-${BASE_VERS}
-PKGREVISION=		1
 SVR4_PKGNAME=		pstgl
 COMMENT=		PostgreSQL database headers and libraries
 
diff --git a/databases/postgresql73-server/PLIST b/databases/postgresql73-server/PLIST
index 3707c21b523..068fb3a6716 100644
--- a/databases/postgresql73-server/PLIST
+++ b/databases/postgresql73-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/24 22:20:32 recht Exp $
+@comment $NetBSD: PLIST,v 1.1.1.1.12.1 2006/03/08 22:41:43 seb Exp $
 bin/postgres
 bin/postmaster
 lib/postgresql/ascii_and_mic.so
@@ -29,6 +29,7 @@ lib/postgresql/utf8_and_win1256.so
 lib/postgresql/utf8_and_win874.so
 man/man1/postgres.1
 man/man1/postmaster.1
+share/examples/rc.d/pgsql
 share/postgresql/conversion_create.sql
 share/postgresql/postgres.bki
 share/postgresql/postgres.description
diff --git a/databases/postgresql73/Makefile.common b/databases/postgresql73/Makefile.common
index 5a1e811d2b7..5abd34fae0a 100644
--- a/databases/postgresql73/Makefile.common
+++ b/databases/postgresql73/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2005/12/05 23:55:04 rillig Exp $
+# $NetBSD: Makefile.common,v 1.13.2.1 2006/03/08 22:41:43 seb Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -21,7 +21,7 @@ MASTER_SITES?=		http://www.postgresql.org/ftpsite/source/v${DIST_VERS}/ \
 MAINTAINER?=		tech-pkg@NetBSD.org
 HOMEPAGE?=		http://www.postgresql.org/
 
-CONFLICTS+=		postgresql-[0-9]* postgresql74-* postgresql80-*
+CONFLICTS+=	postgresql-[0-9]* postgresql74-* postgresql80-* postgresql81-*
 
 DISTINFO_FILE?=		${.CURDIR}/../postgresql73/distinfo
 COMMON_FILESDIR?=	${.CURDIR}/../postgresql73/files
@@ -33,7 +33,7 @@ PATCHDIR?=		${.CURDIR}/../postgresql73/patches
 # BASE_VERS		pkgsrc-mangled version number (convert pl -> .)
 #
 # Note: Do not forget jdbc-postgresql when updating version
-DIST_VERS?=		7.3.10
+DIST_VERS?=		7.3.14
 BASE_VERS?=		${DIST_VERS}
 
 BUILDLINK_DEPENDS.postgresql73-lib?=	postgresql73-lib>=${BASE_VERS}
diff --git a/databases/postgresql73/distinfo b/databases/postgresql73/distinfo
index 574b7f35bda..10e298205e0 100644
--- a/databases/postgresql73/distinfo
+++ b/databases/postgresql73/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2005/12/02 19:41:18 joerg Exp $
+$NetBSD: distinfo,v 1.11.2.1 2006/03/08 22:41:43 seb Exp $
 
-SHA1 (postgresql-7.3.10.tar.gz) = 173bfb9c4ae7d4bd84a90babdbf34d420fcb90c2
-RMD160 (postgresql-7.3.10.tar.gz) = 544602d752a8e2f0d2b90e1e2e4c50431b98c44b
-Size (postgresql-7.3.10.tar.gz) = 11296380 bytes
+SHA1 (postgresql-7.3.14.tar.gz) = 2fb6e776e96af9bde99db8ba61768ec120bdefaa
+RMD160 (postgresql-7.3.14.tar.gz) = e8777fdca3f79a71af616368e8b1d3f20b04a2b7
+Size (postgresql-7.3.14.tar.gz) = 11308049 bytes
 SHA1 (patch-aa) = 61fbeb664b0d89c83a36c79cca3fbdc78d6f5059
 SHA1 (patch-ab) = 5e7a555ed0a2fd1c6678600f98f809072663d10e
 SHA1 (patch-ac) = 5a647cc31873ae81a5bd5a6cf4ec6f44a43448e7
diff --git a/databases/tcl-postgresql73/Makefile b/databases/tcl-postgresql73/Makefile
index 4fe776af153..d633e526ff3 100644
--- a/databases/tcl-postgresql73/Makefile
+++ b/databases/tcl-postgresql73/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2005/12/05 23:55:05 rillig Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2006/03/08 22:41:43 seb Exp $
 
 PKGNAME=		tcl-postgresql73-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=		Tcl interface to PostgreSQL
 
 
diff --git a/databases/tk-postgresql73/Makefile b/databases/tk-postgresql73/Makefile
index 6f6832f0336..d91afdecb52 100644
--- a/databases/tk-postgresql73/Makefile
+++ b/databases/tk-postgresql73/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:05 rillig Exp $
+# $NetBSD: Makefile,v 1.12.2.1 2006/03/08 22:41:43 seb Exp $
 
 PKGNAME=		tk-postgresql73-${BASE_VERS}
-PKGREVISION=		1
 COMMENT=		Tk interface to PostgreSQL
 
 .include "../../databases/postgresql73/Makefile.common"