Update postgresql to 7.1.1 Pkgsrc changes include splitting into:

	postgresql-lib
	postgresql-client
	postgresql-server
	postgresql-doc

with postgresql as a meta-package.  Major changes from version 7.1.1
include:

	Write-ahead Log (WAL) - To maintain database consistency in
case of an operating system crash, previous releases of PostgreSQL
have forced all data modifications to disk before each transaction
commit.  With WAL, only one log file must be flushed to disk, greatly
improving performance.  If you have been using -F in previous releases
to disable disk flushes, you may want to consider discontinuing its
use.

	TOAST - Previous releases had a compiled-in row length limit,
typically 8 - 32 kB.  This limit made storage of long text fields
difficult.  With TOAST, long rows of any length can be stored with
good performance.

	Outer Joins - We now support outer joins.  The UNION/NOT IN
workaround for outer joins is no longer required.  We use the SQL92
outer join syntax.

	Function Manager - The previous C function manager did not
handle NULLs properly, nor did it support 64-bit CPU's (Alpha).  The
new function manager does.  You can continue using your old custom
functions, but you may want to rewrite them in the future to use the
new function manager call interface.

	Complex Queries - A large number of complex queries that were
unsupported in previous releases now work.  Many combinations of
views, aggregates, UNION, LIMIT, cursors, subqueries, and inherited
tables now work properly. Inherited tables are now accessed by
default.  Subqueries in FROM are now supported.

Migration to 7.1.1

   A dump/restore using pg_dump is required for those wishing to migrate
   data from any previous release.

1 files changed, 60 insertions, 38 deletions

diff --git a/databases/postgresql/Makefile.common b/databases/postgresql/Makefile.common
index 57c21776f08..ca3246b2bc7 100644
--- a/databases/postgresql/Makefile.common
+++ b/databases/postgresql/Makefile.common
@@ -1,45 +1,43 @@
-# $NetBSD: Makefile.common,v 1.11 2001/05/04 01:05:19 jlam Exp $
+# $NetBSD: Makefile.common,v 1.12 2001/05/14 14:52:36 jlam Exp $
 #
-# This file is included by the following packages:
-#
-#	postgresql
-#	odbc-postgresql
-#	tcl-postgresql
-#	tk-postgresql
-
-DISTNAME=		postgresql-${PG_VERS}
-PG_VERS=		7.0.3
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
-CATEGORIES=		databases
-MASTER_SITES=		ftp://ftp.PostgreSQL.org/pub/v${PG_VERS}/ \
-			ftp://ftp.de.postgresql.org/v${PG_VERS}/ \
-			ftp://ch.postgresql.org/mirror/postgresql/pub/v${PG_VERS}/ \
-			ftp://gd.tuwien.ac.at/db/www.postgresql.org/pub/v${PG_VERS}/ \
-			ftp://looking-glass.usask.ca/pub/postgresql/v${PG_VERS}/ \
-			ftp://ftp.sunsite.auc.dk/mirrors/www.postgresql.org/pub/v${PG_VERS}/ \
-			ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/v${PG_VERS}/
+# This Makefile fragment is included by all PostgreSQL packages built from
+# the main sources of the PostgreSQL distribution.
+
+DISTNAME=		postgresql-${PG_DIST_VERS}
+CATEGORIES+=		databases
+MASTER_SITES=		http://www.postgresql.org/ftpsite/v${PG_DIST_VERS}/ \
+			ftp://ftp.PostgreSQL.org/pub/v${PG_DIST_VERS}/ \
+			ftp://ftp.de.postgresql.org/v${PG_DIST_VERS}/ \
+			ftp://ch.postgresql.org/mirror/postgresql/pub/v${PG_DIST_VERS}/ \
+			ftp://gd.tuwien.ac.at/db/www.postgresql.org/pub/v${PG_DIST_VERS}/ \
+			ftp://looking-glass.usask.ca/pub/postgresql/v${PG_DIST_VERS}/ \
+			ftp://ftp.sunsite.auc.dk/mirrors/www.postgresql.org/pub/v${PG_DIST_VERS}/ \
+			ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/v${PG_DIST_VERS}/
 
 MAINTAINER=		jlam@netbsd.org
-HOMEPAGE=		http://www.PostgreSQL.ORG/
+HOMEPAGE=		http://www.postgresql.org/
 
-BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
+DISTINFO_FILE=		${.CURDIR}/../../databases/postgresql/distinfo
+COMMON_FILESDIR=	${.CURDIR}/../../databases/postgresql/files
+PATCHDIR=		${.CURDIR}/../../databases/postgresql/patches
 
-USE_GMAKE=		# defined
-GNU_CONFIGURE=		# defined
+# Version numbering scheme:
 #
-# We don't USE_LIBTOOL for the shared libs since libtool doesn't seem to
-# support inter-library dependencies across all platforms yet.
+# PG_DIST_VERS		version number on the postgresql distfile
+# PG_BASE_VERS		pkgsrc-mangled version number (convert pl -> .)
+# PG_PKG_VERS		pkgsrc revisions of postgresql (nbX, etc.)
+# PG_VERS		pkgsrc version number of package
+#
+PG_DIST_VERS=		7.1.1
+PG_BASE_VERS=		${PG_DIST_VERS}
+PG_PKG_VERS?=		# empty
+PG_VERS=		${PG_BASE_VERS}${PG_PKG_VERS}
 
-DISTINFO_FILE=		${.CURDIR}/../../databases/postgresql/distinfo
-FILESDIR=		${.CURDIR}/../../databases/postgresql/files
-PATCHDIR=		${.CURDIR}/../../databases/postgresql/patches
+USE_GMAKE=		# defined
+GNU_CONFIGURE=		# defined
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS+=	--with-template="${LOWER_OPSYS}"
-CONFIGURE_ARGS+=	--with-setproctitle
-CONFIGURE_ARGS+=	--enable-locale
-
 # PG_MB_ENCODING may be set to any of:
 #
 # SQL_ASCII, EUC_JP, EUC_CN, EUC_KR, EUC_TW, UNICODE, MULE_INTERNAL,
@@ -53,11 +51,35 @@ CONFIGURE_ARGS+=	--enable-multibyte=${PG_MB_ENCODING}
 CONFIGURE_ARGS+=	--enable-multibyte	# accept default
 .endif
 
-# Pass CFLAGS from environment into the PostgreSQL build.
-MAKE_ENV+=		COPT="${CFLAGS}"
+CONFIGURE_ARGS+=	--disable-odbc
+CONFIGURE_ARGS+=	--without-java
+CONFIGURE_ARGS+=	--without-perl
+CONFIGURE_ARGS+=	--without-python
+CONFIGURE_ARGS+=	--without-tcl
+CONFIGURE_ARGS+=	--without-tk
 
-post-extract:
-	${CP} ${FILESDIR}/Makefile.custom ${WRKSRC}
+CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/pgsql
+CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/html/postgresql
+
+CONFIGURE_ARGS+=	--disable-readline
+CONFIGURE_ARGS+=	--enable-locale
+CONFIGURE_ARGS+=	--enable-syslog
+CONFIGURE_ARGS+=	--with-CXX
+CONFIGURE_ARGS+=	--with-template="${LOWER_OPSYS}"
+
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+CONFIGURE_ENV+=		LIBS="${LIBS}"
+MAKE_ENV+=		CUSTOM_COPT="${CFLAGS}"
 
-pre-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf
+WRKINCDIR=		${WRKDIR}/include
+CPPFLAGS+=		-I${WRKINCDIR}
+CFLAGS+=		-I${WRKINCDIR}
+
+post-extract:
+	${MKDIR} -p ${WRKINCDIR}
+	${RM} -f ${WRKSRC}/src/Makefile.custom
+	${CP} -f ${COMMON_FILESDIR}/Makefile.custom			\
+		${WRKSRC}/src/Makefile.custom
+	${RM} -f ${WRKSRC}/src/interfaces/libpq/GNUmakefile
+	${CP} -f ${COMMON_FILESDIR}/GNUmakefile.libpq			\
+		${WRKSRC}/src/interfaces/libpq/GNUmakefile