Update databases/postgresql to version 7.2.3.

   This has a variety of fixes from 7.2.2, including fixes to prevent
   possible data loss.

   A dump/restore is *not* required for those running 7.2.X.

Changes from version 7.2.2 include:

 Prevent possible compressed transaction log loss (Tom)
 Prevent non-superuser from increasing most recent vacuum info (Tom)
 Handle pre-1970 date values in newer versions of glibc (Tom)
 Fix possible hang during server shutdown
 Prevent spinlock hangs on SMP PPC machines (Tomoyuki Niijima)
 Fix pg_dump to properly dump FULL JOIN USING (Tom)

11 files changed, 52 insertions, 134 deletions

diff --git a/databases/postgresql-client/Makefile b/databases/postgresql-client/Makefile
index cbf3ccf8c63..f88e3098c79 100644
--- a/databases/postgresql-client/Makefile
+++ b/databases/postgresql-client/Makefile
@@ -1,35 +1,23 @@
-# $NetBSD: Makefile,v 1.13 2002/08/25 21:49:36 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2002/10/19 03:03:50 jlam Exp $
 
 PKGNAME=		postgresql-client-${BASE_VERS}
 COMMENT=		PostgreSQL database client programs
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK2=		# defined
 
 .include "../../databases/postgresql/Makefile.common"
 
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 CONFIGURE_ARGS+=	--enable-readline
 MAKE_ENV+=		INSTALLED_LIBPQ=1
 
-DIRS_TO_BUILD=		src/bin
+BUILD_DIRS=		${WRKSRC}/src/bin
 
 pre-build:
 	cd ${WRKSRC}/src/bin/psql &&					\
 		${RM} -f pqsignal.h &&					\
 		${LN} -sf ../../interfaces/libpq/pqsignal.h pqsignal.h
 
-do-build:
-.for DIR in ${DIRS_TO_BUILD}
-	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
-		${MAKE_PROGRAM} ${ALL_TARGET}
-.endfor
-
-do-install:
-.for DIR in ${DIRS_TO_BUILD}
-	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
-		${MAKE_PROGRAM} ${INSTALL_TARGET}
-.endfor
-
 post-install:
 	${SED} -e "s|^#.*||" ${FILESDIR}/exclude			\
 		| ${GTAR} zxCXf ${PREFIX}/man - ${WRKSRC}/doc/man.tar.gz
@@ -37,4 +25,5 @@ post-install:
 .include "../../databases/postgresql-lib/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql-docs/Makefile b/databases/postgresql-docs/Makefile
index 116bc578fe3..b4e3254bf43 100644
--- a/databases/postgresql-docs/Makefile
+++ b/databases/postgresql-docs/Makefile
@@ -1,26 +1,19 @@
-# $NetBSD: Makefile,v 1.3 2002/04/04 07:41:01 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/19 03:03:50 jlam Exp $
 
 PKGNAME=		postgresql-docs-${BASE_VERS}
 COMMENT=		PostgreSQL database system documentation
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		# defined
 
 .include "../../databases/postgresql/Makefile.common"
 
+BUILD_DIRS=		${WRKSRC}/doc
 DOCDIR=			${PREFIX}/share/doc/postgresql
 
 # The manpage documentation is installed with the relevant packages.
 pre-build:
 	cd ${WRKSRC}/doc && ${RM} -f man.tar.gz
 
-do-build:
-	cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV}			\
-		${MAKE_PROGRAM} ${ALL_TARGET}
-
-do-install:
-	cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV}			\
-		${MAKE_PROGRAM} ${INSTALL_TARGET}
-
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	cd ${WRKSRC}/doc; for file in					\
diff --git a/databases/postgresql-lib/Makefile b/databases/postgresql-lib/Makefile
index 25b239c3ff2..481f613098a 100644
--- a/databases/postgresql-lib/Makefile
+++ b/databases/postgresql-lib/Makefile
@@ -1,18 +1,20 @@
-# $NetBSD: Makefile,v 1.6 2002/08/25 18:38:24 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/19 03:03:50 jlam Exp $
 
 PKGNAME=		postgresql-lib-${BASE_VERS}
 COMMENT=		PostgreSQL database headers and libraries
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK2=		# defined
 
 .include "../../databases/postgresql/Makefile.common"
 
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
-DIRS_TO_BUILD=		src/include src/interfaces src/pl
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
+BUILD_DIRS=		${WRKSRC}/src/include
+BUILD_DIRS+=		${WRKSRC}/src/interfaces
+BUILD_DIRS+=		${WRKSRC}/src/pl
 
 .include "../../mk/bsd.prefs.mk"
 
-do-build:
+post-buildlink:
 #
 # Avoid conflict between "${LOCALBASE}/include/openssl/des.h" and
 # "/usr/include/crypt.h" -- we want the definitions in the former.
@@ -20,20 +22,10 @@ do-build:
 .if (${OPSYS} == "SunOS")
 	${TOUCH} ${BUILDLINK_DIR}/include/crypt.h
 .endif
-.for DIR in ${DIRS_TO_BUILD}
-	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
-		${MAKE_PROGRAM} ${ALL_TARGET}
-.endfor
-
-do-install:
-.for DIR in ${DIRS_TO_BUILD}
-	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
-		${MAKE_PROGRAM} ${INSTALL_TARGET}
-.endfor
-	cd ${WRKSRC}/src/include && ${SETENV} ${MAKE_ENV}		\
-		${MAKE_PROGRAM} install-all-headers
 
 post-install:
+	cd ${WRKSRC}/src/include && ${SETENV} ${MAKE_ENV}		\
+		${MAKE_PROGRAM} install-all-headers
 	${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz             \
 		`${SED} -e "s|^#.*||" ${FILESDIR}/man.lib`
 
diff --git a/databases/postgresql-plperl/Makefile b/databases/postgresql-plperl/Makefile
index 371da858d17..5d9ba41e275 100644
--- a/databases/postgresql-plperl/Makefile
+++ b/databases/postgresql-plperl/Makefile
@@ -1,34 +1,22 @@
-# $NetBSD: Makefile,v 1.7 2002/07/22 22:00:51 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/10/19 03:03:50 jlam Exp $
 
 PKGNAME=		postgresql-plperl-${BASE_VERS}
 COMMENT=		PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=		postgresql-server>=${BASE_VERS}:../../databases/postgresql-server
-DEPENDS+=		{libperl>=${LIBPERL5_REQD},perl>=5.8.0}:../../lang/libperl
 
-LIBPERL5_REQD=		${PERL5_REQD}
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		# defined
 
 .include "../../databases/postgresql/Makefile.common"
 
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 CONFIGURE_ARGS+=	--with-perl
 CONFIGURE_ENV+=		PERL="${PERL5}"
 
-DIRS_TO_BUILD=		src/pl/plperl
+BUILD_DIRS=		${WRKSRC}/src/pl/plperl
+MAKEFILE=		GNUmakefile
 
-do-build:
-.for DIR in ${DIRS_TO_BUILD}
-	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
-		${MAKE_PROGRAM} ${MAKE_FLAGS} ${ALL_TARGET}
-.endfor
+.include "../../databases/postgresql-lib/buildlink2.mk"
+.include "../../lang/libperl/buildlink2.mk"
 
-do-install:
-.for DIR in ${DIRS_TO_BUILD}
-	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
-		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
-.endfor
-
-.include "../../databases/postgresql-lib/buildlink.mk"
-.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql-pltcl/Makefile b/databases/postgresql-pltcl/Makefile
index 4a73f504910..c0f82cf36b4 100644
--- a/databases/postgresql-pltcl/Makefile
+++ b/databases/postgresql-pltcl/Makefile
@@ -1,34 +1,23 @@
-# $NetBSD: Makefile,v 1.5 2002/04/04 07:41:04 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/19 03:03:51 jlam Exp $
 
 PKGNAME=		postgresql-pltcl-${BASE_VERS}
 COMMENT=		PL/Tcl procedural language for the PostgreSQL backend
 
 DEPENDS+=		postgresql-server>=${BASE_VERS}:../../databases/postgresql-server
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		# defined
 
 .include "../../databases/postgresql/Makefile.common"
 
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 CONFIGURE_ARGS+=	--with-tcl
-CONFIGURE_ARGS+=	--with-tclconfig="${BUILDLINK_DIR}/lib"
+CONFIGURE_ARGS+=	--with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib"
 CONFIGURE_ENV+=		TCLSH="${TCLSH}"
 TCLSH=			${LOCALBASE}/bin/tclsh
 
-DIRS_TO_BUILD=		src/pl/tcl
+BUILD_DIRS=		${WRKSRC}/src/pl/tcl
 
-do-build:
-.for DIR in ${DIRS_TO_BUILD}
-	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
-		${MAKE_PROGRAM} ${MAKE_FLAGS} ${ALL_TARGET}
-.endfor
+.include "../../databases/postgresql-lib/buildlink2.mk"
+.include "../../lang/tcl/buildlink2.mk"
 
-do-install:
-.for DIR in ${DIRS_TO_BUILD}
-	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
-		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
-.endfor
-
-.include "../../databases/postgresql-lib/buildlink.mk"
-.include "../../lang/tcl/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql-server/MESSAGE b/databases/postgresql-server/MESSAGE
index f038f8574fc..e2396598ab5 100644
--- a/databases/postgresql-server/MESSAGE
+++ b/databases/postgresql-server/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2002/08/30 16:58:44 wiz Exp $
+$NetBSD: MESSAGE,v 1.6 2002/10/19 03:03:51 jlam Exp $
 
 To enable this package, put the following into your /etc/rc.conf:
 
@@ -10,8 +10,8 @@ To enable this package, put the following into your /etc/rc.conf:
 
 and make sure
 
-	/usr/pkg/etc/rc.d/pgsql start
+	${RCD_SCRIPTS_DIR}/pgsql start
 
-is started at boot time.
+is run at boot time.
 
 ===========================================================================
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index 27d987e0849..549d7e804a1 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2002/09/19 09:04:08 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2002/10/19 03:03:51 jlam Exp $
 
 PKGNAME=		postgresql-server-${BASE_VERS}
 COMMENT=		PostgreSQL database server programs
@@ -8,12 +8,12 @@ DEPENDS+=		postgresql-client>=${BASE_VERS}:../../databases/postgresql-client
 # mips has no TAS implementation
 NOT_FOR_PLATFORM=	*-*-mips
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK2=		# defined
 
 .include "../../databases/postgresql/Makefile.common"
 
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
-DIRS_TO_BUILD=		src/backend
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
+BUILD_DIRS=		${WRKSRC}/src/backend
 
 .if defined(USE_PAM)
 .  include "../../security/PAM/buildlink2.mk"
@@ -38,7 +38,7 @@ PKG_GROUPS=		${PGGROUP}
 RCD_SCRIPTS=		pgsql
 OWN_DIRS_PERMS=		${PGHOME} ${PGUSER} ${PGGROUP} 0755
 
-do-build:
+post-buildlink:
 #
 # Avoid conflict between "${LOCALBASE}/include/openssl/des.h" and
 # "/usr/include/crypt.h" -- we want the definitions in the former.
@@ -46,10 +46,6 @@ do-build:
 .if (${OPSYS} == "SunOS")
 	${TOUCH} ${BUILDLINK_DIR}/include/crypt.h
 .endif
-.for DIR in ${DIRS_TO_BUILD}
-	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
-		${MAKE_PROGRAM} ${ALL_TARGET}
-.endfor
 
 pre-install:
 	@case "X${PGUSER}" in						\
@@ -64,12 +60,6 @@ pre-install:
 		;;							\
 	esac
 
-do-install:
-.for DIR in ${DIRS_TO_BUILD}
-	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
-		${MAKE_PROGRAM} ${INSTALL_TARGET}
-.endfor
-
 post-install:
 	${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz		\
 		`${SED} -e "s|^#.*||" ${FILESDIR}/man.server`
diff --git a/databases/postgresql/Makefile.common b/databases/postgresql/Makefile.common
index cc04d410c78..e8a00e6807b 100644
--- a/databases/postgresql/Makefile.common
+++ b/databases/postgresql/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2002/09/26 09:56:07 abs Exp $
+# $NetBSD: Makefile.common,v 1.31 2002/10/19 03:03:49 jlam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -34,7 +34,7 @@ PATCHDIR?=		${.CURDIR}/../../databases/postgresql/patches
 # DIST_VERS		version number on the postgresql distfile
 # BASE_VERS		pkgsrc-mangled version number (convert pl -> .)
 #
-DIST_VERS?=		7.2.2
+DIST_VERS?=		7.2.3
 BASE_VERS?=		${DIST_VERS}
 
 BUILDLINK_DEPENDS.postgresql-lib?=	postgresql-lib>=${BASE_VERS}
diff --git a/databases/postgresql/distinfo b/databases/postgresql/distinfo
index be7f233e380..6e729a0d0d8 100644
--- a/databases/postgresql/distinfo
+++ b/databases/postgresql/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2002/09/01 01:14:29 jonb Exp $
+$NetBSD: distinfo,v 1.13 2002/10/19 03:03:50 jlam Exp $
 
-SHA1 (postgresql-7.2.2.tar.gz) = 69ef43ef5d22d4ae675ff12e05d98e2be557e3f5
-Size (postgresql-7.2.2.tar.gz) = 9239158 bytes
+SHA1 (postgresql-7.2.3.tar.gz) = f98acadb3b06ea0f09f82857ca880ec198e3c791
+Size (postgresql-7.2.3.tar.gz) = 9244039 bytes
 SHA1 (patch-aa) = 598f14b74b0dc54680ed85f4c26b6396898f5a7e
 SHA1 (patch-ab) = 0d1dee0d7c8b3bbff8507e18b9561c0b198f409f
 SHA1 (patch-ac) = eaed6eaeb65e3bb394252c5cb97a306bffb3e503
diff --git a/databases/tcl-postgresql/Makefile b/databases/tcl-postgresql/Makefile
index ecc498ce898..27eb03d749d 100644
--- a/databases/tcl-postgresql/Makefile
+++ b/databases/tcl-postgresql/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2002/09/21 08:05:06 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/10/19 03:03:51 jlam Exp $
 
 PKGNAME=		tcl-postgresql-${BASE_VERS}
 COMMENT=		Tcl interface to PostgreSQL
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK2=		# defined
 
 .include "../../databases/postgresql/Makefile.common"
 
@@ -14,19 +14,8 @@ CONFIGURE_ENV+=		TCLSH="${TCLSH}"
 TCLSH=			${BUILDLINK_PREFIX.tcl}/bin/tclsh
 MAKE_ENV+=		INSTALLED_LIBPQ=1
 
-DIRS_TO_BUILD=		src/interfaces/libpgtcl src/bin/pgtclsh
-
-do-build:
-.for DIR in ${DIRS_TO_BUILD}
-	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
-		${MAKE_PROGRAM} ${MAKE_FLAGS} ${ALL_TARGET}
-.endfor
-
-do-install:
-.for DIR in ${DIRS_TO_BUILD}
-	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
-		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
-.endfor
+BUILD_DIRS=		${WRKSRC}/src/interfaces/libpgtcl
+BUILD_DIRS+=		${WRKSRC}/src/bin/pgtclsh
 
 post-install:
 	${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz		\
diff --git a/databases/tk-postgresql/Makefile b/databases/tk-postgresql/Makefile
index e4db0bbc0fc..fc084c90394 100644
--- a/databases/tk-postgresql/Makefile
+++ b/databases/tk-postgresql/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2002/09/21 08:08:18 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2002/10/19 03:03:51 jlam Exp $
 
 PKGNAME=		tk-postgresql-${BASE_VERS}
 COMMENT=		Tk interface to PostgreSQL
 
-USE_BUILDLINK2=		YES
-USE_X11=		YES
+USE_BUILDLINK2=		# defined
+USE_X11=		# defined
 
 .include "../../databases/postgresql/Makefile.common"
 
@@ -17,22 +17,10 @@ CONFIGURE_ENV+=		TCLSH="${TCLSH}"
 TCLSH=			${BUILDLINK_PREFIX.tcl}/bin/tclsh
 MAKE_ENV+=		INSTALLED_LIBPQ=1 INSTALLED_LIBPGTCL=1
 
-DIRS_TO_BUILD=		src/bin/pgtclsh
+BUILD_DIRS=		${WRKSRC}/src/bin/pgtclsh
 ALL_TARGET=		pgtksh
 INSTALL_TARGET=		install-tk
 
-do-build:
-.for DIR in ${DIRS_TO_BUILD}
-	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
-		${MAKE_PROGRAM} ${MAKE_FLAGS} ${ALL_TARGET}
-.endfor
-
-do-install:
-.for DIR in ${DIRS_TO_BUILD}
-	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
-		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
-.endfor
-
 post-install:
 	${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz		\
 		`${SED} -e "s|#.*||" ${FILESDIR}/man.tk`