Pullup ticket 1165 - requested by Joerg Sonnenberger

mostly sync databases/postgresql80{,-client,-plperl,-plpython,-pltcl,-server} with HEAD, via patch, including security fix.

5 files changed, 39 insertions, 39 deletions

diff --git a/databases/postgresql80-client/Makefile b/databases/postgresql80-client/Makefile
index fa65a18dd71..2330a94583f 100644
--- a/databases/postgresql80-client/Makefile
+++ b/databases/postgresql80-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/10/27 07:22:16 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.12.2.1 2006/03/02 00:30:16 seb Exp $
 
 PKGNAME=	postgresql80-client-${BASE_VERS}
 COMMENT=	PostgreSQL database client programs
@@ -69,19 +69,6 @@ post-wrapper:
 	${TOUCH} ${BUILDLINK_DIR}/include/crypt.h
 .endif
 
-pre-configure:
-	${TOUCH} ${WRKSRC}/src/template/dragonfly
-	${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.c \
-		${WRKSRC}/src/backend/port/dynloader/dragonfly.c
-	${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \
-		${WRKSRC}/src/backend/port/dynloader/dragonfly.h
-	${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \
-		${WRKSRC}/src/backend/port/dynloader/dragonfly.h
-	${CP} ${WRKSRC}/src/include/port/freebsd.h \
-		${WRKSRC}/src/include/port/dragonfly.h
-	${CP} ${WRKSRC}/src/makefiles/Makefile.freebsd \
-		${WRKSRC}/src/makefiles/Makefile.dragonfly
-
 pre-build:
 	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
 	cd ${WRKSRC}/src/backend &&					\
diff --git a/databases/postgresql80-client/PLIST b/databases/postgresql80-client/PLIST
index f4089e29fb3..3f1fa01a5fd 100644
--- a/databases/postgresql80-client/PLIST
+++ b/databases/postgresql80-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2005/10/23 20:16:52 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8.2.1 2006/03/02 00:30:16 seb Exp $
 ${PG_SUBPREFIX}bin/clusterdb
 ${PG_SUBPREFIX}bin/createdb
 ${PG_SUBPREFIX}bin/createlang
@@ -941,6 +941,11 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-2-7.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-2-8.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-1.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-10.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-11.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-12.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-13.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-14.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-4.html
@@ -949,10 +954,11 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-6.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-7.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-8.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-9.html
-${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-10.html
-${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-11.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-1.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-10.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-11.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-12.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-4.html
@@ -965,6 +971,9 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-1.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-3.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-4.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-5.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-6.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/resources.html
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index b643cd8abc4..39332684198 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:00 rillig Exp $
+# $NetBSD: Makefile,v 1.15.2.1 2006/03/02 00:30:16 seb Exp $
 
 PKGNAME=	postgresql80-server-${BASE_VERS}
 COMMENT=	PostgreSQL database server programs
@@ -77,19 +77,6 @@ post-wrapper:
 	${TOUCH} ${BUILDLINK_DIR}/include/crypt.h
 .endif
 
-pre-configure:
-	${TOUCH} ${WRKSRC}/src/template/dragonfly
-	${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.c \
-		${WRKSRC}/src/backend/port/dynloader/dragonfly.c
-	${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \
-		${WRKSRC}/src/backend/port/dynloader/dragonfly.h
-	${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \
-		${WRKSRC}/src/backend/port/dynloader/dragonfly.h
-	${CP} ${WRKSRC}/src/include/port/freebsd.h \
-		${WRKSRC}/src/include/port/dragonfly.h
-	${CP} ${WRKSRC}/src/makefiles/Makefile.freebsd \
-		${WRKSRC}/src/makefiles/Makefile.dragonfly
-
 pre-build:
 	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
 	cd ${WRKSRC}/src/backend &&					\
diff --git a/databases/postgresql80/Makefile.common b/databases/postgresql80/Makefile.common
index 42429b9e269..727ab10ced7 100644
--- a/databases/postgresql80/Makefile.common
+++ b/databases/postgresql80/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2005/12/17 05:20:21 jlam Exp $
+# $NetBSD: Makefile.common,v 1.12.2.1 2006/03/02 00:30:16 seb Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -19,7 +19,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER?=	jlam@pkgsrc.org
 HOMEPAGE?=	http://www.postgresql.org/
 
-CONFLICTS+=	postgresql-[0-9]* postgresql73-* postgresql74-*
+CONFLICTS+=	postgresql-[0-9]* postgresql73-* postgresql74-* postgresql81-*
 
 DISTINFO_FILE?=		${.CURDIR}/../postgresql80/distinfo
 COMMON_FILESDIR?=	${.CURDIR}/../postgresql80/files
@@ -30,9 +30,9 @@ PATCHDIR?=		${.CURDIR}/../postgresql80/patches
 # DIST_VERS		version number on the postgresql distfile
 # BASE_VERS		pkgsrc-mangled version number (convert pl -> .)
 #
-# Note: Do not forget jdbc-postgresql when updating version
+# Note: Do not forget jdbc-postgresql80 when updating version
 #
-DIST_VERS?=		8.0.4
+DIST_VERS?=		8.0.7
 BASE_VERS?=		${DIST_VERS}
 
 BUILDLINK_DEPENDS.postgresql80-client+=	postgresql80-client>=${BASE_VERS}
@@ -135,6 +135,23 @@ post-extract:
 			 >${WRKSRC}/src/backend/port/dynloader/$$template.c
 	fi
 .endif
+	if ${TEST} -d ${WRKSRC}/src/template; then			\
+		${TOUCH} ${WRKSRC}/src/template/dragonfly;		\
+	fi
+	if ${TEST} -d ${WRKSRC}/src/backend/port/dynloader; then	\
+		${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.c	\
+			${WRKSRC}/src/backend/port/dynloader/dragonfly.c; \
+		${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h	\
+			${WRKSRC}/src/backend/port/dynloader/dragonfly.h; \
+	fi
+	if ${TEST} -d ${WRKSRC}/src/include/port; then			\
+		${CP} ${WRKSRC}/src/include/port/freebsd.h		\
+			${WRKSRC}/src/include/port/dragonfly.h;		\
+	fi
+	if ${TEST} -d ${WRKSRC}/src/makefiles; then			\
+		${CP} ${WRKSRC}/src/makefiles/Makefile.freebsd		\
+			${WRKSRC}/src/makefiles/Makefile.dragonfly;	\
+	fi
 
 # PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block.
 # This also limits the size of a tuple.  The valid values are powers
diff --git a/databases/postgresql80/distinfo b/databases/postgresql80/distinfo
index 494b0756319..892205cfd89 100644
--- a/databases/postgresql80/distinfo
+++ b/databases/postgresql80/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2005/10/23 20:16:52 jlam Exp $
+$NetBSD: distinfo,v 1.10.2.1 2006/03/02 00:30:16 seb Exp $
 
-SHA1 (postgresql-8.0.4.tar.bz2) = 19a83cc4bb61880c6078f1507cd876d582498220
-RMD160 (postgresql-8.0.4.tar.bz2) = 04d00f77a5139c654eb4d90cc4ee2a515ee1a15d
-Size (postgresql-8.0.4.tar.bz2) = 11102847 bytes
+SHA1 (postgresql-8.0.7.tar.bz2) = 4aaec1bb0ed34c597eb4f1596b48e8725611c406
+RMD160 (postgresql-8.0.7.tar.bz2) = 46f6c3090709942ce18ebcdc2296749f12eda399
+Size (postgresql-8.0.7.tar.bz2) = 11175215 bytes
 SHA1 (patch-aa) = d681a5b2bb4dfce4e3db1490b97fed1b99ff445f
 SHA1 (patch-ab) = 1a80710d13723f2c8130d8235bb40c43af9d9ccd
 SHA1 (patch-ac) = 092d96fe2baafe8eef731b45a85d33fc40584044