Upgrade to postgresql 7.1. ok'd espie@

* The package is now called `postgresql' and not `pgsql'.

* The default user that is suggested for the admin account is also
  `postgresql'. This will work with OpenBSD-current with long username
  support. If anything breaks please report to the maintainers.

* pgwrap is no longer shipped or supported

* Please note, you will HAVE TO BACKUP your old data if you are
  upgrading from a previous release of postgresql. Do this before
  removing the old pgsql package.

From the announcement last weekend:

Key New Features and Capabilities of Version 7.1 Include:

* Write-ahead Log (WAL) increases data integrity and processing
speed. To maintain database consistency in case of an operating
system crash, previous releases of PostgreSQL have forced all all
data modifications to disk before each transaction commit. With
WAL, only one log file must be flushed to disk, greatly improving
performance. (Tech note: can eliminate use of -F in to disable disk
flushes)

* TOAST (The Oversized-Attribute Storage Technique) Past releases
had compiled-in row length limit typically between 8Kb & 32Kb. This
restriction made storage of long text fields difficult, cumbersome
and slow. TOAST enables rows of any length while maintaing the high
performance PostgreSQL users have come to expect.

* SQL92 Outer Joins are now supported. (Tech note: eliminates the
UNION/NOT IN workaround)

* 64-bit C Language Function Manager support The previous C function
manager did not handle support 64-bit CPU's (e.g. Alpha, Sun,
Itanium). (Tech note: This change should not impact existing custom
functions developed for past versions, but performance will be
improved through rewriting to use the new call interface.)

* Complex Queries that are better, stronger and faster Many complex
queries were unsupported in previous releases. With v7.1 combinations
of views, aggregates, UNION, LIMIT, cursors, subqueries, and inherited
tables are enabled. Inherited tables are now accessed by default,
and subqueries in FROM are now supported.

databases/postgresql/Makefile

@@ -1,162 +1,130 @@
-# $OpenBSD: Makefile,v 1.46 2001/04/13 07:00:44 brad Exp $
-# $FreeBSD: Makefile,v 1.25 1998/04/22 08:28:07 asami Exp $
+# $OpenBSD: Makefile,v 1.47 2001/04/21 18:25:42 peter Exp $
 
 COMMENT=	"PostgreSQL RDBMS"
-COMMENT-clients="PostgreSQL RDBMS clients"
-COMMENT-docs=	"PostgreSQL RDBMS documentation"
+COMMENT-clients="PostgreSQL RDBMS client libraries and utilities"
+COMMENT-docs=	"PostgreSQL RDBMS documentaion"
 
-VERSION=	7.0.3
+VERSION=	7.1
 DISTNAME=	postgresql-${VERSION}
-PKGNAME=	pgsql-${VERSION}
-PKGNAME-clients=pgsql-clients-${VERSION}
-PKGNAME-docs=	pgsql-docs-${VERSION}
 CATEGORIES=	databases
-NEED_VERSION=	1.384
+NEED_VERSION=	1.405
 
 HOMEPAGE=	http://www.postgresql.org/
 
-#MAINTAINER=	Pavel Korovin <pvk@openbsd.ru>
-MAINTAINER=	Brad Smith <brad@openbsd.org>
+MAINTAINER=	Brandon Palmer <bpalmer@crimelabs.net>, Peter Galbavy <peter.galbavy@knowledge.com>
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
-	ftp://gd.tuwien.ac.at/db/www.postgresql.org/pub/%SUBDIR%/ \
-	ftp://ftp.cwb.fnn.net/pub/Linux/postgresql/%SUBDIR%/ \
-	ftp://looking-glass.usask.ca/pub/postgresql/%SUBDIR%/ \
-	ftp://linux.netfirm.net/pub/Linux/PostgreSQL/%SUBDIR%/ \
-	ftp://sunsite.uniandes.edu.co/pub/postgresql/%SUBDIR%/ \
-	ftp://ftp.fi.muni.cz/pub/postgresql/%SUBDIR%/ \
-	ftp://ftp.sunsite.auc.dk/mirrors/www.postgresql.org/%SUBDIR%/ \
-	ftp://postgresql.matrix.fi/%SUBDIR%/ \
-	ftp://ftp.fr.postgresql.org/%SUBDIR%/ \
-	ftp://ftp.de.postgresql.org/%SUBDIR%/ \
-	ftp://ftp.ntua.gr/pub/databases/postgresql/%SUBDIR%/ \
-	ftp://ftp.postgreSQL.uli.it/%SUBDIR%/ \
-	ftp://mirror.nucba.ac.jp/mirror/postgresql/pub/%SUBDIR%/ \
-	ftp://ring.ip-kyoto.ad.jp/pub/misc/db/postgresql/%SUBDIR%/ \
-	ftp://ring.crl.go.jp/pub/misc/db/postgresql/%SUBDIR%/ \
-	ftp://ring.saitama-u.ac.jp/pub/misc/db/postgresql/%SUBDIR%/ \
-	ftp://ring.astem.or.jp/pub/misc/db/postgresql/%SUBDIR%/ \
-	ftp://ring.exp.fujixerox.co.jp/pub/misc/db/postgresql/%SUBDIR%/ \
-	ftp://ring.jah.ne.jp/pub/misc/db/postgresql/%SUBDIR%/ \
-	ftp://ring.etl.go.jp.jp/pub/misc/db/postgresql/%SUBDIR%/ \
-	ftp://ring.asahi-net.or.jp/pub/misc/db/postgresql/%SUBDIR%/ \
-	ftp://ring.so-net.ne.jp/pub/misc/db/postgresql/%SUBDIR%/ \
-	ftp://ring.aist.go.jp/pub/misc/db/postgresql/%SUBDIR%/ \
-	ftp://jordan.ce.yeungnam.ac.kr/pub/postgresql/%SUBDIR%/ \
-	ftp://ftp.kr.postgresql.org/pub/postgresql/%SUBDIR%/ \
-	ftp://postgresql.linux.com.mx/pub/postgresql/pub/%SUBDIR%/ \
-	ftp://postgresql.godzone.net.nz/postgresql/%SUBDIR%/ \
-	ftp://postgresql.iphil.net/%SUBDIR%/ \
-	ftp://ftp.sai.msu.su/unix/database/pgsql/%SUBDIR%/ \
-	ftp://www.sk.postgresql.org/pub/linux/postgresql/%SUBDIR%/ \
-	ftp://ftp.linux.co.za/pub/postgresql/%SUBDIR%/ \
-	ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/%SUBDIR%/ \
-	ftp://ftp.danyk.ch/postgres/%SUBDIR%/ \
-	ftp://ftp.ccit.edu.tw/packages/postgresql/%SUBDIR%/ \
-	ftp://ftp.siamu.ac.th/pub/pub2/ftp.postgresql.org/%SUBDIR%/ \
-	ftp://postgresql.rmplc.co.uk/pub/postgresql/%SUBDIR%/ \
-	ftp://ftp.scyph.org/pub/Mirrors/ftp.postgresql.org/%SUBDIR%/ \
-	ftp://mars.capital-data.com/pub/postgresql/%SUBDIR%/ \
-	ftp://ftp.digex.net/pub/packages/database/postgresql/%SUBDIR%/ \
-	ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \
-	ftp://postgresql.nextpath.com/pub/postgresql/%SUBDIR%/ \
-	ftp://www.ndesign.com.ua/pub/psql/%SUBDIR%/ \
-	ftp://postgresql.netafric.ci/%SUBDIR%/
-MASTER_SITE_SUBDIR= v${VERSION}
-DIST_SUBDIR=	postgresql
-DISTFILES= ${DISTNAME}.base.tar.gz \
-	${DISTNAME}.support.tar.gz \
-	${DISTNAME}.docs.tar.gz
+MASTER_SITES=	\
+                ftp://ftp.postgresql.org/pub/v${VERSION}/ \
+		ftp://ftp.crimelabs.net/pub/postgresql/v${VERSION}/ \
+		ftp://download.sourceforge.net/pub/mirrors/postgresql/v${VERSION}/ \
+		ftp://ftp.digex.net/pub/packages/database/postgresql/v${VERSION}/ \
+		ftp://postgresql.readysetnet.com/pub/postgresql/v${VERSION}/ \
+		ftp://www.ndesign.com.ua/pub/psql/v${VERSION}/ \
+		ftp://looking-glass.usask.ca/pub/postgresql/v${VERSION}/ \
+		ftp://ftp.iodynamics.com/pub/mirror/postgresql/v${VERSION}/ \
+		ftp://postgresql.rmplc.co.uk/pub/postgresqlv${VERSION}/ \
+		ftp://ftp.fhl.net/pub/postgresql/v${VERSION}/ \
+		ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/v${VERSION}/ \
+		ftp://postgresql.godzone.net.nz/postgresql/v${VERSION}/ \
+		ftp://linux.sarang.net/mirror/database/postgresql/v${VERSION}/ \
+		ftp://ring.asahi-net.or.jp/pub/misc/db/postgresql/v${VERSION}/ \
+		ftp://ftp.postgreSQL.uli.it/pub/v${VERSION}/ \
+		ftp://ftp.fr.postgresql.org/pub/v${VERSION}/ \
+		ftp://postgresql.matrix.fi/pub/v${VERSION}/
 
-FLAVORS=	tcl odbc
+
+FLAVORS=	tcl odbc no_locale no_ssl # perl
 FLAVOR?=
 
 MULTI_PACKAGES=	-clients -docs
 SUBPACKAGE?=
 
-## build dependencies
-USE_GMAKE= Yes
-.if ${FLAVOR:L:Mtcl}
-LIB_DEPENDS=	tk83::x11/tk/8.3
+.if ${SUBPACKAGE}	== "-clients"
+PKGNAME:=	postgresql-clients-${VERSION}
+.elif ${SUBPACKAGE}	== "-docs"
+PKGNAME:=	postgresql-docs-${VERSION}
 .endif
 
-## configuring
-CONFIGURE_STYLE= simple
-CONFIGURE_ENV=	POSTGRESDIR="${PREFIX}"
-CONFIGURE_ARGS= --prefix="${PREFIX}" \
-	--enable-locale --enable-multibyte --enable-recode \
-	--with-template="openbsd" --with-libraries="${LOCALBASE}/lib"
+USE_GMAKE=	Yes
+CONFIGURE_STYLE=gnu
+CONFIGURE_ENV=	POSTGRESDIR="${PREFIX}" LIBS=-lcurses
+CONFIGURE_ARGS=	--enable-syslog \
+		--disable-rpath \
+		--with-CXX \
+		--datadir="${PREFIX}/share/examples/postgresql" \
+		--docdir="${PREFIX}/share/doc/postgresql"
 
 .if ${FLAVOR:L:Mtcl}
+LIB_DEPENDS+=	tk83::x11/tk/8.3
 TCL_INCDIR=	${LOCALBASE}/include/tcl8.3
 TK_INCDIR=	${LOCALBASE}/include/tk8.3
-CONFIGURE_ENV+=	WISH="${LOCALBASE}/bin/wish8.3" \
-		PGACCESS_HOME="${PREFIX}/lib/pgsql"
+CONFIGURE_ENV+=	WISH="${LOCALBASE}/bin/wish8.3"
 CONFIGURE_ARGS+= --with-tcl \
 	--with-tclconfig="${LOCALBASE}/lib/tcl8.3 ${LOCALBASE}/lib/tk8.3" \
 	--with-includes="${LOCALBASE}/include ${TCL_INCDIR} ${TK_INCDIR}"
-.else
-CONFIGURE_ARGS+= --with-includes="${LOCALBASE}/include"
+MAKE_ENV=	USE_TCL=true TCL_INCDIR="${TCL_INCDIR}" \
+		TK_INCDIR="${TK_INCDIR}"
 .endif
 
-. if ${FLAVOR:L:Modbc}
-CONFIGURE_ARGS+= --with-odbc
+.if ${FLAVOR:L:Modbc}
+LIB_DEPENDS+=	iodbc::databases/iodbc
+CONFIGURE_ARGS+=--enable-odbc --with-odbcinst=/etc
+.endif
+
+# This does not work yet. The Pg module Makefile do not follow the fake
+# install scheme properly. The best bet if you need this is to go with
+# either a direct install of the Pg modules from CPAN, look out for a
+# p5-Pg package or use the DBI interface - Peter
+.if ${FLAVOR:L:Mperl}
+CONFIGURE_ARGS+= --with-perl
+.endif
+
+.if !${FLAVOR:L:Mno_ssl}
+CONFIGURE_ARGS+= --with-openssl=/etc
+.else
+CONFIGURE_ARGS+= --without-openssl
 .endif
 
 ## making
 MAKE_FILE=	GNUmakefile
 FAKE_FLAGS=	POSTGRESDIR="${WRKINST}${PREFIX}"
 
-.if ${FLAVOR:L:Mtcl}
-MAKE_ENV=	USE_TCL=true TCL_INCDIR="${TCL_INCDIR}" \
-		TK_INCDIR="${TK_INCDIR}" \
-		PGACCESS_HOME="${PREFIX}/lib/pgsql"
-FAKE_FLAGS+=	PGACCESS_HOME="${WRKINST}/${PREFIX}/lib/pgsql"
+DOCS=		${WRKSRC}/COPYRIGHT ${WRKSRC}/HISTORY \
+		${WRKSRC}/INSTALL ${WRKSRC}/README \
+		${WRKSRC}/register.txt \
+		${WRKSRC}/doc/FAQ ${WRKSRC}/doc/FAQ_DEV ${WRKSRC}/doc/TODO
+
+.if !${FLAVOR:L:Mno_locale}
+CONFIGURE_ARGS+= --enable-locale --enable-recode
+DOCS+=		${WRKSRC}/doc/README.mb.big5 ${WRKSRC}/doc/README.mb.jp
 .endif
 
-DOCDIR=		${WRKSRC}/../doc
-DOCS=		${WRKSRC}/../COPYRIGHT ${WRKSRC}/../HISTORY \
-		${WRKSRC}/../INSTALL ${WRKSRC}/../README \
-		${WRKSRC}/../register.txt \
-		${DOCDIR}/FAQ ${DOCDIR}/FAQ_DEV ${DOCDIR}/README.Charsets \
-		${DOCDIR}/README.fsync ${DOCDIR}/README.inet \
-		${DOCDIR}/README.locale ${DOCDIR}/README.mb \
-		${DOCDIR}/README.mb.jp ${DOCDIR}/TODO \
-
-WRKDIST=	${WRKDIR}/${DISTNAME}/src
-
 SUBST_VARS=	VERSION
 
 .if ${FLAVOR:L:Mtcl}
 post-patch:
-	@mv ${WRKSRC}/bin/pgaccess/main.tcl \
-		${WRKSRC}/bin/pgaccess/main.tcl.orig
+	@mv ${WRKSRC}/src/bin/pgaccess/main.tcl \
+		${WRKSRC}/src/bin/pgaccess/main.tcl.orig
 	@sed -e "s=wish=${LOCALBASE}/bin/wish8.3=" \
-		${WRKSRC}/bin/pgaccess/main.tcl.orig \
-		> ${WRKSRC}/bin/pgaccess/main.tcl
+		${WRKSRC}/src/bin/pgaccess/main.tcl.orig \
+		> ${WRKSRC}/src/bin/pgaccess/main.tcl
 .endif
 
-post-build:
-	@mkdir -p ${WRKBUILD}/pgwrap
-	@cp ${FILESDIR}/{Makefile,pgwrap.c,pgwrap.h} ${WRKBUILD}/pgwrap
-	@cd ${WRKBUILD}/pgwrap && ${MAKE} depend && ${MAKE}
-
 post-install:
-	${INSTALL_PROGRAM} ${WRKBUILD}/pgwrap/pgwrap ${PREFIX}/bin
-	@cd ${DOCDIR} && ${MAKE_PROGRAM} POSTGRESDIR="${PREFIX}" man
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pgsql
-	${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/pgsql
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/postgresql
+	${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/postgresql
 	@rm -f ${WRKBUILD}/README.OpenBSD
 	@sed -e s#!!PREFIX!!#${TRUEPREFIX}#g ${FILESDIR}/README.OpenBSD > \
 		${WRKBUILD}/README.OpenBSD
-	${INSTALL_DATA} ${WRKBUILD}/README.OpenBSD ${PREFIX}/share/doc/pgsql
-	@cd ${DOCDIR} && ${MAKE_PROGRAM} PGDOCS="${PREFIX}/share/doc/pgsql" all
-	${INSTALL_DATA} ${DOCDIR}/*.ps* ${PREFIX}/share/doc/pgsql
+	${INSTALL_DATA} ${WRKBUILD}/README.OpenBSD ${PREFIX}/share/doc/postgresql
+	@cd ${WRKSRC}/doc && \
+		${MAKE_PROGRAM} PGDOCS="${PREFIX}/share/doc/postgresql" all
+	${INSTALL_DATA} ${WRKSRC}/doc/*.ps* ${PREFIX}/share/doc/postgresql
 
 .include <bsd.port.mk>
 
@@ -166,6 +134,7 @@ SED_PLIST+=-e '/%%SHARED-tcl%%/r${PKGDIR}/PFRAG.tcl.shared' -e '//d'
 	${NO_SHARED_LIBS:U} == YES
 SED_PLIST+=-e '/%%SHARED-tcl%%/d'
 .endif
+
 .if ${FLAVOR:L:Modbc} && !defined(NO_SHARED_LIBS)
 SED_PLIST+=-e '/%%SHARED-odbc%%/r${PKGDIR}/PFRAG.odbc.shared' -e '//d'
 .else if ${FLAVOR:L:Modbc} && defined(NO_SHARED_LIBS) && \

databases/postgresql/files/Makefile

@@ -1,10 +0,0 @@
-#	$RuOBSD: Makefile,v 1.2 2001/01/05 09:06:56 form Exp $
-
-PROG=	pgwrap
-SRCS=	pgwrap.c
-
-NOMAN=	noman
-
-CFLAGS+=-Wall -Werror
-
-.include <bsd.prog.mk>

databases/postgresql/files/README.OpenBSD

@@ -1,80 +1,92 @@
 Using PostgreSQL package in OpenBSD environment:
 ------------------------------------------------
 
-If you are installing PostgreSQL for the first time, the following steps
-required:
+If you are installing PostgreSQL for the first time, the following
+steps required:
 
 1. Create PostgreSQL user and group:
 
-	# adduser -batch pgsql "" "PostgreSQL pseudo-user" "*" \
-		-home /var -noconfig -group pgsql -shell nologin
+	# useradd -c "PostgreSQL Admin User" -g =uid -m -d /var/postgresql \
+		-s /bin/sh postgresql
 
-2. Initialize PostgreSQL databases:
+2. su to the postgresql account and initialize the database:
 
-	# install -d -o pgsql -g pgsql -m 755 /var/pgsql
-	# install -d -o pgsql -g pgsql -m 700 /var/pgsql/data
-	# pgwrap initdb
+       # su - postgresql
+       $ mkdir /var/postgresql/data
+       $ initdb -D /var/postgresql/data
 
-If you are upgrading PostgreSQL you don't need these steps. Read
-!!PREFIX!!/share/doc/pgsql/INSTALL for more information on how to
-upgrade your existing databases. See also `Special notes for OpenBSD
-port' below.
+If you are upgrading PostgreSQL then you may have a `pgsql' user.
+It is suggested that you follow the steps in
+
+	!!PREFIX!!/share/doc/postgresql/INSTALL
+
+for more information on how to upgrade your existing databases. See
+also `Special notes for OpenBSD port' below. Replace references to
+the `postgresql' user below with `pgsql' or whatever other user you
+have selected to be the database administration account.
+
+Auto Start and Stop
+-------------------
 
 If you wish to start PostgreSQL automatically during system startup,
 add the following lines to /etc/rc.local:
 
-if [ -x !!PREFIX!!/bin/pgwrap -a -x !!PREFIX!!/bin/postmaster ]; \
-	then
-	!!PREFIX!!/bin/pgwrap -o /var/pgsql/log \
-		pg_ctl -w -o "-i -S -o -F" start
-	echo -n ' pgsql'
+if [ -x !!PREFIX!!/bin/pg_ctl ]; then
+	su -l postgresql -c "!!PREFIX!!/bin/pg_ctl start \
+		-D /var/postgresql/data -l /var/postgresql/logfile"
+	echo -n ' postgresql'
 fi
 
-Don't forget to add !!PREFIX!!/lib/pgsql directory to shared libraries path in
-/etc/rc.conf (if your architecture supports shared libraries):
+To automatically shutdown the database as part of the system shutdown, 
+add the following lines to /etc/rc.shutdown:
 
-shlib_dirs="!!PREFIX!!/lib/pgsql"
+if [ -f /var/postgresql/data/postmaster.pid ]; then
+	su -l postgresql -c "!!PREFIX!!/bin/pg_ctl stop \
+		-D /var/postgresql/data"
+	rm -f /var/portgresql/data/postmaster.pid
+fi
 
-Please note that OpenBSD port of PostgreSQL requires a kernel compiled
-with SYSVMSG, SYSVSEM and SYSVSHM options for proper operation.
-The GENERIC kernel contains these options.
+Network Connections and Tuning
+------------------------------
+
+To allow connections over TCP (and other options) edit the file:
+
+	/var/postgresql/data/postgresql.conf
+
+and also edit the pg_hba.conf (in the same directory) making the
+appropriate changes to allow connection from your network.
+
+Please note that OpenBSD port of PostgreSQL requires a kernel
+compiled with SYSVSEM and SYSVSHM options for proper operation.
+The GENERIC kernel has these settings but the default sizes are not
+really large enough for a database with more than a handful of
+connections and should have at least the following:
+
+option          SEMMNI=256
+option          SEMMNS=2048
+
+To serve a large number of connections (>250), you may also need
+to increase the maximum shared memory segment size, on the i386
+try:
+
+option		SHMMAXPGS=4096		# default on i386 is 2048 = 8Mb
+					# other archs may vary
+
+These numbers should be tweaked depending on system use.
+
+The ulimit settings can also be a problem.  The following can be
+added for the postgresql user in the /etc/login.conf file:
+
+	postgresql:\
+		:maxproc-max=256:\
+		:maxproc-cur=256:\
+		:openfiles-cur=768:\
+		:datasize-max=256M:\
+		:datasize-cur=64M:\
+		:stacksize-cur=4M:
+
+For more than about 250 connections, these numbers should be
+increased. Please report any changes and experiences to the package
+maintainers so that we can update this file for future versions.
 
 
-Special notes for OpenBSD port:
--------------------------------
-
-OpenBSD port of PostgreSQL does NOT use shell startup files to
-set up environment for postgres administrative programs (such as
-initdb). This mean that you should use a wrapper program `pgwrap'
-to run these programs instead of `su'. For example, you
-should execute
-	# pgwrap initdb
-instead of
-	# su -l pgsql -c 'exec initdb'
-
-The `pgwrap' automatically sets up proper environment and permissions
-for PostgreSQL programs. The syntax for `pgwrap' program is:
-
-pgwrap [-n] [-o file] cmd [arg ...]
-	-n	- Do not add PostgreSQL binary prefix to cmd.
-	-o file	- Redirect stdout & stderr to file (write permissions
-		  for PostgreSQL user required).
-
-`pgwrap' automatically sets up the following environment variables:
-
-System variables (these variables are always set to the following values):
-
-	PATH=!!PREFIX!!/bin:/bin:/usr/bin
-	USER=pgsql
-	LOGNAME=pgsql
-	SHELL=/bin/sh
-	HOME=/var/pgsql
-
-PostgreSQL variables (these variables are set to the following values,
-unless already set):
-
-	PGLIB=!!PREFIX!!/lib/pgsql
-	PGDATA=/var/pgsql/data
-
-You must have root privileges to run `pgwrap'.
-

databases/postgresql/files/md5

@@ -1,9 +1,3 @@
-MD5 (postgresql/postgresql-7.0.3.base.tar.gz) = 0eeda8217b5b11e5a9351fc424808426
-MD5 (postgresql/postgresql-7.0.3.docs.tar.gz) = 3d3fc76073f6d77febefc83f887fc87d
-MD5 (postgresql/postgresql-7.0.3.support.tar.gz) = b930f71068d776ef45402fcbebfa58cf
-RMD160 (postgresql/postgresql-7.0.3.base.tar.gz) = 0b8b96e78298b00a0325e3fbec10493b002c7aff
-RMD160 (postgresql/postgresql-7.0.3.docs.tar.gz) = 68a75fc94d3fa577b07f4d2957a99f9194521ba2
-RMD160 (postgresql/postgresql-7.0.3.support.tar.gz) = f0c4110d6ab88b0c655f461fedd6c27f04c56bb9
-SHA1 (postgresql/postgresql-7.0.3.base.tar.gz) = 47a67db0426934353c47bc7b9a85a1d6e9e3460f
-SHA1 (postgresql/postgresql-7.0.3.docs.tar.gz) = 98de9db1652e1fff115b671e53a6826e09734bc6
-SHA1 (postgresql/postgresql-7.0.3.support.tar.gz) = 9fc9bac967d7ff4a6a73ead6b49ef54ad356b39e
+MD5 (postgresql-7.1.tar.gz) = 5499444696d919f9fbf2efcaf8e54022
+RMD160 (postgresql-7.1.tar.gz) = 183365e21999d6a289115f67eacab318bd0a94d5
+SHA1 (postgresql-7.1.tar.gz) = 89e7f01b04b10db270aac59e3699d10a86edb871

databases/postgresql/files/pgwrap.c

@@ -1,149 +0,0 @@
-/*	$OpenBSD: pgwrap.c,v 1.3 2001/02/22 19:28:12 danh Exp $	*/
-/*	$RuOBSD: pgwrap.c,v 1.2 2001/01/05 09:06:56 form Exp $	*/
-
-/*
- * Copyright (c) 1999 Oleg Safiullin
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice unmodified, this list of conditions, and the following
- *    disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-/*
- * Usage: pgwrap [-n] [-o file] cmd [arg ...]
- *
- * Execute PostgreSQL program with proper environment and uid/gid.
- * You must have root privilegies to execute this program.
- *
- * OPTIONS:
- * 	-n	- Do not add PostgreSQL binary prefix to cmd.
- *	-o file	- Redirect stdout & stderr to file (write permissions for
- *		  PostgreSQL user required).
- */
-
-#include <sys/types.h>
-#include <err.h>
-#include <libgen.h>
-#include <limits.h>
-#include <paths.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "pgwrap.h"
-
-extern char **environ;
-
-int main __P((int, char **));
-void usage __P((void));
-int setupenv __P((struct passwd *));
-
-int
-main(argc, argv)
-	int argc;
-	char **argv;
-{
-	struct passwd *pw;
-	char prog[PATH_MAX], *file = NULL;
-	int ch, nflag = 0;
-
-	if (getuid())
-		errx(1, "must be root to run this program");
-
-	while ((ch = getopt(argc, argv, "no:")) != -1) {
-		switch (ch) {
-		case 'n':
-			nflag = 1;
-			break;
-		case 'o':
-			file = optarg;
-			break;
-		default:
-			usage();
-			break;
-		}
-	}
-	if (!(argc -= optind))
-		usage();
-	argv += optind;
-
-	if ((pw = getpwnam(PGUSER)) == NULL)
-		errx(1, "%s: no such user", PGUSER);
-
-	if (initgroups(pw->pw_name, pw->pw_gid) < 0)
-		err(1, "initgroups");
-	if (setgid(pw->pw_gid) < 0)
-		err(1, "setgid");
-	if (setuid(pw->pw_uid) < 0)
-		err(1, "setuid");
-
-	if (setupenv(pw))
-		errx(1, "can't initizlize environment");
-
-	if (file != NULL) {
-		if (freopen(file, "w", stdout) == NULL)
-			err(1, "can't open `%s'", file);
-		(void) freopen(file, "w", stderr);
-	}
-
-	if (!nflag) {
-		(void) snprintf(prog, sizeof(prog), "%s/%s", PGBIN, *argv);
-		*argv = prog;
-		(void) execve(*argv, argv, environ);
-		err(1, "execve");
-	} else {
-		(void) execvp(*argv, argv);
-		err(1, "execvp");
-	}
-
-	/* not reached */
-	return (0);
-}
-
-void
-usage(void)
-{
-	fprintf(stderr,
-	    "usage: pgwrap [-n] [-o file] cmd [arg ...]\n");
-	exit(1);
-}
-
-int
-setupenv(pw)
-	struct passwd *pw;
-{
-	int rval = 0;
-
-	rval += setenv("PGLIB", PGLIB, 0);
-	rval += setenv("PGDATA", PGDATA, 0);
-
-	rval += setenv("PATH", PGPATH, 1);
-	rval += setenv("SHELL", PGSHELL, 1);
-	rval += setenv("USER", pw->pw_name, 1);
-	rval += setenv("LOGNAME", pw->pw_name, 1);
-	rval += setenv("HOME", pw->pw_dir, 1);
-
-	return (rval);
-}

databases/postgresql/files/pgwrap.h

@@ -1,59 +0,0 @@
-/*	$OpenBSD: pgwrap.h,v 1.2 2001/02/22 19:28:13 danh Exp $	*/
-/*	$RuOBSD: pgwrap.h,v 1.2 2001/01/05 09:06:57 form Exp $	*/
-
-/*
- * Copyright (c) 1999 Oleg Safiullin
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice unmodified, this list of conditions, and the following
- *    disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef __PGWRAP_H__
-#define __PGWRAP_H__
-
-#ifndef PGUSER
-# define PGUSER "pgsql"
-#endif
-
-#ifndef PGBIN
-# define PGBIN "/usr/local/bin"
-#endif
-
-#ifndef PGLIB
-# define PGLIB "/usr/local/lib/pgsql"
-#endif
-
-#ifndef PGDATA
-# define PGDATA "/var/pgsql/data"
-#endif
-
-#ifndef PGPATH
-# define PGPATH (PGBIN ":" _PATH_DEFPATH)
-#endif
-
-#ifndef PGSHELL
-# define PGSHELL _PATH_BSHELL
-#endif
-
-#endif	/* __PGWRAP_H__ */

databases/postgresql/patches/patch-Makefile.global.in

@@ -1,31 +0,0 @@
---- Makefile.global.in.orig	Sun Jan 28 14:37:57 2001
-+++ Makefile.global.in	Sun Jan 28 14:40:59 2001
-@@ -72,11 +72,11 @@
- # look for it if you wish to use the -lpq convention.  Otherwise you
- # can just put the absolute pathname to the library at the end of your
- # command line.
--LIBDIR= $(POSTGRESDIR)/lib
-+LIBDIR= $(POSTGRESDIR)/lib/pgsql
- 
- # Where the database templates are stored
- #
--TEMPLATEDIR= $(POSTGRESDIR)/lib
-+TEMPLATEDIR= $(POSTGRESDIR)/lib/pgsql
- 
- # This is the directory where IPC utilities ipcs and ipcrm are located
- #
-@@ -90,12 +90,12 @@
- POSTDOCDIR= $(POSTGRESDIR)/doc
- 
- # Where the header files necessary to build frontend programs get installed.
--HEADERDIR= $(POSTGRESDIR)/include
-+HEADERDIR= $(POSTGRESDIR)/include/pgsql
- 
- # Where the ODBC installation-wide configuration file gets installed.
- # This needs to be a client-side readable area, so can't go in $PGDATA.
- # - thomas 1998-10-05
--ODBCINST= $(POSTGRESDIR)
-+ODBCINST= $(POSTGRESDIR)/lib/pgsql
- 
- ##############################################################################
- #

databases/postgresql/patches/patch-Makefile.shlib

@@ -1,22 +0,0 @@
---- Makefile.shlib.orig	Tue May 16 16:48:48 2000
-+++ Makefile.shlib	Mon Mar  5 16:17:33 2001
-@@ -127,6 +127,19 @@
-   endif
- endif
- 
-+ifeq ($(PORTNAME), openbsd)
-+  ifdef BSD_SHLIB
-+    install-shlib-dep	:= install-shlib
-+    shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
-+    LD		:= $(CC)
-+    LDFLAGS_SL	:= -shared -fpic
-+    ifneq ($(SHLIB_LINK),)
-+      LDFLAGS_SL	+= -Wl,-rpath,$(LIBDIR)
-+    endif
-+    CFLAGS	+= $(CFLAGS_SL)
-+  endif
-+endif
-+
- ifeq ($(PORTNAME), hpux)
-   install-shlib-dep	:= install-shlib
- # HPUX doesn't believe in version numbers for shlibs

databases/postgresql/patches/patch-backend_port_dynloader_openbsd.c

@@ -1,110 +0,0 @@
---- backend/port/dynloader/openbsd.c.orig	Fri Nov 24 17:20:20 2000
-+++ backend/port/dynloader/openbsd.c	Fri Nov 24 17:23:58 2000
-@@ -0,0 +1,107 @@
-+/*-
-+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
-+ * Portions Copyright (c) 1990 The Regents of the University of California.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *	  notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *	  notice, this list of conditions and the following disclaimer in the
-+ *	  documentation and/or other materials provided with the distribution.
-+ * 3. All advertising materials mentioning features or use of this software
-+ *	  must display the following acknowledgement:
-+ *		This product includes software developed by the University of
-+ *		California, Berkeley and its contributors.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ *	  may be used to endorse or promote products derived from this software
-+ *	  without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.	IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+#if defined(LIBC_SCCS) && !defined(lint)
-+static char sccsid[] = "@(#)dl.c	5.4 (Berkeley) 2/23/91";
-+
-+#endif	 /* LIBC_SCCS and not lint */
-+
-+#include <sys/types.h>
-+#include <nlist.h>
-+#include "link.h"
-+#include <dlfcn.h>
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+#include "dynloader.h"
-+
-+static char error_message[BUFSIZ];
-+
-+char *
-+BSD44_derived_dlerror(void)
-+{
-+	static char ret[BUFSIZ];
-+
-+	strcpy(ret, error_message);
-+	error_message[0] = 0;
-+	return (ret[0] == 0) ? (char *) NULL : ret;
-+}
-+
-+void *
-+BSD44_derived_dlopen(const char *file, int num)
-+{
-+#if defined(__mips__) || (defined(__NetBSD__) && defined(__vax__))
-+	sprintf(error_message, "dlopen (%s) not supported", file);
-+	return NULL;
-+#else
-+	void	   *vp;
-+
-+	if ((vp = dlopen((char *) file, num)) == (void *) NULL)
-+		sprintf(error_message, "dlopen (%s) failed", file);
-+	return vp;
-+#endif
-+}
-+
-+void *
-+BSD44_derived_dlsym(void *handle, const char *name)
-+{
-+#if defined(__mips__) || (defined(__OpenBSD__) && defined(__vax__))
-+	sprintf(error_message, "dlsym (%s) failed", name);
-+	return NULL;
-+#elif defined(__ELF__)
-+	return dlsym(handle, name);
-+#else
-+	void	   *vp;
-+	char		buf[BUFSIZ];
-+
-+	if (*name != '_')
-+	{
-+		sprintf(buf, "_%s", name);
-+		name = buf;
-+	}
-+	if ((vp = dlsym(handle, (char *) name)) == (void *) NULL)
-+		sprintf(error_message, "dlsym (%s) failed", name);
-+	return vp;
-+#endif
-+}
-+
-+void
-+BSD44_derived_dlclose(void *handle)
-+{
-+#if defined(__mips__) || (defined(__OpenBSD__) && defined(__vax__))
-+#else
-+	dlclose(handle);
-+#endif
-+}

databases/postgresql/patches/patch-backend_port_dynloader_openbsd.h

@@ -1,52 +0,0 @@
---- backend/port/dynloader/openbsd.h.orig	Fri Nov 24 17:26:10 2000
-+++ backend/port/dynloader/openbsd.h	Fri Nov 24 17:26:01 2000
-@@ -0,0 +1,49 @@
-+/*-------------------------------------------------------------------------
-+ *
-+ * port_protos.h
-+ *	  port-specific prototypes for NetBSD 1.0
-+ *
-+ *
-+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
-+ * Portions Copyright (c) 1994, Regents of the University of California
-+ *
-+ * $Id: patch-backend_port_dynloader_openbsd.h,v 1.1 2001/02/22 19:28:13 danh Exp $
-+ *
-+ *-------------------------------------------------------------------------
-+ */
-+#ifndef PORT_PROTOS_H
-+#define PORT_PROTOS_H
-+
-+#include <sys/types.h>
-+#include <nlist.h>
-+#include "link.h"
-+
-+#include "postgres.h"
-+
-+#include "fmgr.h"
-+#include "utils/dynamic_loader.h"
-+
-+/* dynloader.c */
-+/*
-+ * Dynamic Loader on NetBSD 1.0.
-+ *
-+ * this dynamic loader uses the system dynamic loading interface for shared
-+ * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared
-+ * library as the file to be dynamically loaded.
-+ *
-+ * agc - I know this is all a bit crufty, but it does work, is fairly
-+ * portable, and works (the stipulation that the d.l. function must
-+ * begin with an underscore is fairly tricky, and some versions of
-+ * NetBSD (like 1.0, and 1.0A pre June 1995) have no dlerror.)
-+ */
-+#define		   pg_dlopen(f)    BSD44_derived_dlopen(f, 1)
-+#define		   pg_dlsym		   BSD44_derived_dlsym
-+#define		   pg_dlclose	   BSD44_derived_dlclose
-+#define		   pg_dlerror	   BSD44_derived_dlerror
-+
-+char	   *BSD44_derived_dlerror(void);
-+void	   *BSD44_derived_dlopen(const char *filename, int num);
-+void	   *BSD44_derived_dlsym(void *handle, const char *name);
-+void		BSD44_derived_dlclose(void *handle);
-+
-+#endif	 /* PORT_PROTOS_H */

databases/postgresql/patches/patch-bin_pg_passwd_pg_passwd.c

@@ -1,69 +0,0 @@
-# $OpenBSD: patch-bin_pg_passwd_pg_passwd.c,v 1.1 2001/02/22 19:28:13 danh Exp $
-
---- bin/pg_passwd/pg_passwd.c.orig	Mon Apr 17 07:45:18 2000
-+++ bin/pg_passwd/pg_passwd.c	Sun May 14 00:09:40 2000
-@@ -18,11 +18,15 @@
- 
- #endif
- 
-+#ifndef _POSIX_SOURCE
-+#define       _PASSWORD_LEN   128     /* max length, not containing NULL */
-+#endif
-+
- char	   *comname;
- static void usage(FILE *stream);
- static void read_pwd_file(char *filename);
- static void write_pwd_file(char *filename, char *bkname);
--static void encrypt_pwd(char key[9], char salt[3], char passwd[14]);
-+static void encrypt_pwd(char key[9], char salt[3], char passwd[_PASSWORD_LEN+1]);
- static void prompt_for_username(char *username);
- static void prompt_for_password(char *prompt, char *password);
- 
-@@ -150,7 +154,7 @@
- 
- 		if (q != NULL)
- 			*(q++) = '\0';
--		if (strlen(p) != 13)
-+		if (strlen(p) > _PASSWORD_LEN)
- 		{
- 			fprintf(stderr, "WARNING: %s: line %d: illegal password length.\n",
- 					filename, npwds + 1);
-@@ -214,7 +218,7 @@
- }
- 
- static void
--encrypt_pwd(char key[9], char salt[3], char passwd[14])
-+encrypt_pwd(char key[9], char salt[3], char passwd[_PASSWORD_LEN+1])
- {
- 	int			n;
- 
-@@ -246,9 +250,9 @@
- 
- #ifdef NOT_USED
- static int
--check_pwd(char key[9], char passwd[14])
-+check_pwd(char key[9], char passwd[_PASSWORD_LEN+1])
- {
--	char		shouldbe[14];
-+	char            shouldbe[_PASSWORD_LEN+1];
- 	char		salt[3];
- 
- 	salt[0] = passwd[0];
-@@ -256,7 +260,7 @@
- 	salt[2] = '\0';
- 	encrypt_pwd(key, salt, shouldbe);
- 
--	return strncmp(shouldbe, passwd, 13) == 0 ? 1 : 0;
-+	return strncmp(shouldbe, passwd, _PASSWORD_LEN) == 0 ? 1 : 0;
- }
- 
- #endif
-@@ -332,7 +336,7 @@
- 	char		salt[3];
- 	char		key[9],
- 				key2[9];
--	char		e_passwd[14];
-+	char            e_passwd[_PASSWORD_LEN+1];
- 	int			i;
- 
- 	comname = argv[0];

databases/postgresql/patches/patch-bin_pgaccess_Makefile

@@ -1,35 +0,0 @@
---- bin/pgaccess/Makefile.orig	Thu Dec 16 04:25:10 1999
-+++ bin/pgaccess/Makefile	Fri Jan 12 22:17:29 2001
-@@ -17,21 +17,21 @@
- 
- pgaccess: pgaccess.sh
- 	sed -e 's;__wish__;$(WISH);' pgaccess.sh |	\
--	sed -e 's;__POSTGRESDIR__;$(POSTGRESDIR);' 	\
-+	sed -e 's;__POSTGRESDIR__;$(PGACCESS_HOME);' 	\
- 			> pgaccess
- 
- install:
- 	$(INSTALL) $(INSTL_EXE_OPTS) pgaccess $(BINDIR)/pgaccess
--	-@if [ ! -d $(POSTGRESDIR)/pgaccess ]; then mkdir $(POSTGRESDIR)/pgaccess; fi
--	$(INSTALL) $(INSTL_EXE_OPTS) main.tcl $(POSTGRESDIR)/pgaccess
--	-@if [ ! -d $(POSTGRESDIR)/pgaccess/lib ]; then mkdir $(POSTGRESDIR)/pgaccess/lib; fi
--	$(INSTALL) $(INSTLOPTS) lib/*.tcl $(POSTGRESDIR)/pgaccess/lib
--	-@if [ ! -d $(POSTGRESDIR)/pgaccess/lib/help ]; then mkdir $(POSTGRESDIR)/pgaccess/lib/help; fi
--	$(INSTALL) $(INSTLOPTS) lib/help/*.hlp $(POSTGRESDIR)/pgaccess/lib/help
--	-@if [ ! -d $(POSTGRESDIR)/pgaccess/lib/languages ]; then mkdir $(POSTGRESDIR)/pgaccess/lib/languages; fi
--	$(INSTALL) $(INSTLOPTS) lib/languages/[a-z]* $(POSTGRESDIR)/pgaccess/lib/languages
--	-@if [ ! -d $(POSTGRESDIR)/pgaccess/images ]; then mkdir $(POSTGRESDIR)/pgaccess/images; fi
--	$(INSTALL) $(INSTLOPTS) images/*.gif $(POSTGRESDIR)/pgaccess/images
-+	-@if [ ! -d $(PGACCESS_HOME)/pgaccess ]; then mkdir $(PGACCESS_HOME)/pgaccess; fi
-+	$(INSTALL) $(INSTL_EXE_OPTS) main.tcl $(PGACCESS_HOME)/pgaccess
-+	-@if [ ! -d $(PGACCESS_HOME)/pgaccess/lib ]; then mkdir $(PGACCESS_HOME)/pgaccess/lib; fi
-+	$(INSTALL) $(INSTLOPTS) lib/*.tcl $(PGACCESS_HOME)/pgaccess/lib
-+	-@if [ ! -d $(PGACCESS_HOME)/pgaccess/lib/help ]; then mkdir $(PGACCESS_HOME)/pgaccess/lib/help; fi
-+	$(INSTALL) $(INSTLOPTS) lib/help/*.hlp $(PGACCESS_HOME)/pgaccess/lib/help
-+	-@if [ ! -d $(PGACCESS_HOME)/pgaccess/lib/languages ]; then mkdir $(PGACCESS_HOME)/pgaccess/lib/languages; fi
-+	$(INSTALL) $(INSTLOPTS) lib/languages/[a-z]* $(PGACCESS_HOME)/pgaccess/lib/languages
-+	-@if [ ! -d $(PGACCESS_HOME)/pgaccess/images ]; then mkdir $(PGACCESS_HOME)/pgaccess/images; fi
-+	$(INSTALL) $(INSTLOPTS) images/*.gif $(PGACCESS_HOME)/pgaccess/images
- 
- clean:
- 	rm -f pgaccess

databases/postgresql/patches/patch-configure

@@ -1,11 +0,0 @@
---- configure.orig	Fri Nov 24 16:34:50 2000
-+++ configure	Fri Nov 24 16:35:43 2000
-@@ -635,7 +635,7 @@
-  freebsd1*|freebsd2*) os=freebsd need_tas=no ;;
-  freebsd*) os=freebsd need_tas=no elf=yes ;;
-   netbsd*) os=netbsd need_tas=no ;;
--  openbsd*) os=bsd need_tas=no ;;
-+ openbsd*) os=openbsd need_tas=no ;;
-     dgux*) os=dgux need_tas=no ;;
-      aix*) os=aix need_tas=no ;;
- nextstep*) os=nextstep need_tas=no ;;

databases/postgresql/patches/patch-include_port_openbsd.h

@@ -1,48 +0,0 @@
---- include/port/openbsd.h.orig	Fri Nov 24 17:29:15 2000
-+++ include/port/openbsd.h	Fri Nov 24 17:40:44 2000
-@@ -0,0 +1,45 @@
-+#define USE_POSIX_TIME
-+
-+#if defined(__i386__)
-+#define NEED_I386_TAS_ASM
-+#define HAS_TEST_AND_SET
-+#endif
-+
-+#if defined(__sparc__)
-+#define NEED_SPARC_TAS_ASM
-+#define HAS_TEST_AND_SET
-+#endif
-+
-+#if defined(__vax__)
-+#define NEED_VAX_TAS_ASM
-+#define HAS_TEST_AND_SET
-+#endif
-+
-+#if defined(__ns32k__)
-+#define NEED_NS32K_TAS_ASM
-+#define HAS_TEST_AND_SET
-+#endif
-+
-+#if defined(__m68k__)
-+#define HAS_TEST_AND_SET
-+#endif
-+
-+#if defined(__arm__)
-+#define HAS_TEST_AND_SET
-+#endif
-+
-+#if defined(__mips__)
-+/* #	undef HAS_TEST_AND_SET */
-+#endif
-+
-+#if defined(__powerpc__)
-+#define HAS_TEST_AND_SET
-+#endif
-+
-+#if defined(__powerpc__)
-+typedef unsigned int slock_t;
-+
-+#else
-+typedef unsigned char slock_t;
-+
-+#endif

databases/postgresql/patches/patch-interfaces_ecpg_lib_Makefile.in

@@ -1,11 +0,0 @@
---- interfaces/ecpg/lib/Makefile.in.orig	Sat Mar  3 01:29:21 2001
-+++ interfaces/ecpg/lib/Makefile.in	Sat Mar  3 01:29:35 2001
-@@ -12,7 +12,7 @@
- 
- NAME= ecpg
- SO_MAJOR_VERSION= 3
--SO_MINOR_VERSION= 1.1
-+SO_MINOR_VERSION= 1
- 
- SRCDIR= @top_srcdir@
- include $(SRCDIR)/Makefile.global

databases/postgresql/patches/patch-makefiles_Makefile.openbsd

@@ -1,8 +0,0 @@
---- makefiles/Makefile.openbsd.orig	Sat Mar 10 11:51:25 2001
-+++ makefiles/Makefile.openbsd	Sat Mar 10 11:52:28 2001
-@@ -0,0 +1,5 @@
-+ifdef ELF_SYSTEM
-+LDFLAGS += -Wl,-E
-+endif
-+%.so: %.o
-+	$(LD) -shared -fpic -o $@ $<

databases/postgresql/patches/patch-template_openbsd

@@ -1,8 +0,0 @@
---- template/openbsd.orig	Fri Nov 24 17:12:21 2000
-+++ template/openbsd	Fri Nov 24 17:11:34 2000
-@@ -6,4 +6,4 @@
- USE_LOCALE:no
- DLSUFFIX:.so
- YFLAGS:-d
--YACC:bison -y
-+YACC:yacc

databases/postgresql/pkg/DEINSTALL

@@ -1,24 +1,28 @@
 #!/bin/sh
 #
-# $OpenBSD: DEINSTALL,v 1.2 2001/04/13 07:00:46 brad Exp $
+# $OpenBSD: DEINSTALL,v 1.3 2001/04/21 18:25:51 peter Exp $
 #
 # postgresql de-installation
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-PGPREFIX=/var/pgsql
+PGPREFIX=/var/postgresql
 
 echo
 echo "+---------------"
 echo "| To completely deinstall the $1 package you need to perform"
 echo "| these steps as root:"
 echo "|"
-echo "|           rm -rf $PGPREFIX"
-echo "|           rmuser pgsql"
+echo "|           userdel -r postgresql"
+echo "|           groupdel postgresql"
 echo "|"
-echo "| Do not do this if you plan on re-installing postgresql package"
-echo "| at some future time."
+echo "| If you selected a different username to postgresql, then replace"
+echo "| it above as appropriate"
+echo "|"
+echo "| DO NOT do this if you want to keep your data and/or plan on"
+echo "| re-installing or upgrading the $1 package at some"
+echo "| future time."
 echo "+---------------"
 echo
 

databases/postgresql/pkg/DESCR

@@ -1,36 +1,45 @@
-PostgreSQL is Object-Relational Database Management System.
-It supports almost all SQL constructs, including transactions,
-subselects, and user-defined types and functions.
-It is not ANSI SQL compliant, but it gets closer with every release.
+PostgreSQL is Object-Relational Database Management System.  It
+supports almost all SQL constructs, including transactions, subselects,
+and user-defined types and functions. Write-ahead logging (new with
+7.1) means increased performance while retaining data integrity.
 
-OpenBSD PostgreSQL port build produces several packages:
+The OpenBSD PostgreSQL port build produces several packages:
 
- postgresql: complete package
-   contains all files needed for creating, administering and maintaining
-   databases, quering and manipulating data in them, libraries and header
-   files for database applications development and man pages
+* postgresql-${VERSION} - complete package
+  Contains all files needed for creating, administering and maintaining
+  databases, quering and manipulating data in them, libraries and
+  header files for database applications development and man pages
 
- postgresql-clients: client-side applications and headers
-   reduced variant of complete package without backend-related files
+* postgresql-clients-${VERSION} - client-side applications and headers
+  Reduced variant of complete package without backend-related files
 
- postgresql-docs: documentation
-   additinal documentation: FAQs, READMEs; PostgreSQL manuals in HTML format:
-   Administrator's Guide, Programmer's Manual, PostgreSQL Tutorial and
-   User's Guide and Integrated Documentation package contains all the above
-   documantation
+* postgresql-docs-${VERSION} - documentation
+  Additinal documentation: FAQs, READMEs; PostgreSQL manuals in
+  HTML format: Administrator's Guide, Programmer's Manual, PostgreSQL
+  Tutorial and User's Guide and Integrated Documentation package
+  contains all the above documantation
 
 
 Packages can be built with additional FLAVORs:
 
- tcl:  PostgreSQL built with TCL/TK interfaces.
-       Provides TCL/TK language interfaces to Postgres backends; includes
-       pgaccess - Postgres graphical interactive client.
-       This FLAVOR requires lang/tcl/8.3 and x11/tk/8.3 packages.
-       
- odbc: PostgreSQL built with ODBC (Open Data Base Connectivity) driver package
-       You need to install some driver manager to use it. You can use iODBC
-       (intrinsic Open Database Connectivity) driver manager can be found in
-       databases/iodbc directory in your OpenBSD ports tree.
+* tcl
+  PostgreSQL built with TCL/TK interfaces.  Provides TCL/TK language
+  interfaces to Postgres backends; includes pgaccess - Postgres
+  graphical interactive client.  This FLAVOR requires lang/tcl/8.3
+  and x11/tk/8.3 packages.
        
+* odbc
+  PostgreSQL built with ODBC (Open Data Base Connectivity) driver
+  package You need to install some driver manager to use it. You
+  can use iODBC (intrinsic Open Database Connectivity) driver manager
+  can be found in databases/iodbc directory in your OpenBSD ports
+  tree.
+
+* no_locale
+  Remove LOCALE support. It is included by default.
+
+* no_ssl
+  Remove SSL/TLS support. It is included by default.
+
 
 WWW: ${HOMEPAGE}

databases/postgresql/pkg/DESCR-clients

@@ -1,3 +1,5 @@
-PostgreSQL RDBMS frontend applications for database administration
-and maintenance.
+PostgreSQL RDBMS frontend applications, libraries and include files
+for database administration, maintenance and integration with other
+applications.
+
 Package includes psql - interactive SQL database query tool.

databases/postgresql/pkg/DESCR-docs

@@ -1 +1,7 @@
 PostgreSQL RDBMS documentation
+
+Additinal documentation: FAQs, READMEs; PostgreSQL manuals in HTML
+format: Administrator's Guide, Programmer's Manual, PostgreSQL
+Tutorial and User's Guide and Integrated Documentation package
+contains all the above documantation
+

databases/postgresql/pkg/INSTALL

@@ -1,14 +1,7 @@
 #!/bin/sh
 #
-# $OpenBSD: INSTALL,v 1.2 2001/04/13 07:00:46 brad Exp $
+# $OpenBSD: INSTALL,v 1.3 2001/04/21 18:25:53 peter Exp $
 #
-
-# exit on errors, use a sane path and install prefix
-#
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-
 # Pre/post-installation setup of postgresql
 
 # Function: tell the user what s/he needs to do to use the port just installed
@@ -18,12 +11,18 @@ do_notice()
 	echo
 	echo "+---------------"
 	echo "| The $1 package installation completed."
-	echo "| See $PREFIX/share/doc/pgsql/README.OpenBSD for"
+	echo "| See ${PREFIX}/share/doc/postgresql/README.OpenBSD for"
 	echo "| information on using PostgreSQL package in OpenBSD environment."
 	echo "+---------------"
 	echo
 }
 
+# exit on errors, use a sane path and install prefix
+#
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+
 # verify proper execution
 #
 if [ $# -ne 2 ]; then

databases/postgresql/pkg/PFRAG.no-no_locale

@@ -0,0 +1,4 @@
+@comment $OpenBSD: PFRAG.no-no_locale,v 1.1 2001/04/21 18:25:53 peter Exp $
+share/doc/postgresql/README.mb.big5
+share/doc/postgresql/README.mb.jp
+

databases/postgresql/pkg/PFRAG.odbc

@@ -1,6 +1,5 @@
-@comment $OpenBSD: PFRAG.odbc,v 1.2 2001/02/22 19:28:14 danh Exp $
-lib/pgsql/libpsqlodbc.a
-lib/pgsql/odbcinst.ini
-include/pgsql/iodbc/iodbc.h
+@comment $OpenBSD: PFRAG.odbc,v 1.3 2001/04/21 18:25:53 peter Exp $
+lib/libpsqlodbc.a
+include/postgresql/iodbc/iodbc.h
 %%SHARED-odbc%%
-@dirrm include/pgsql/iodbc
+@dirrm include/postgresql/iodbc

databases/postgresql/pkg/PFRAG.odbc.shared

@@ -1,4 +1,2 @@
-@comment $OpenBSD: PFRAG.odbc.shared,v 1.1 2001/02/22 19:28:14 danh Exp $
-lib/pgsql/libpsqlodbc.so.0.26
-lib/pgsql/libpsqlodbc.so.0
-lib/pgsql/libpsqlodbc.so
+@comment $OpenBSD: PFRAG.odbc.shared,v 1.2 2001/04/21 18:25:55 peter Exp $
+lib/libpsqlodbc.so.0.26

databases/postgresql/pkg/PFRAG.shared

@@ -1,7 +1,6 @@
-@comment $OpenBSD: PFRAG.shared,v 1.6 2001/03/13 22:05:47 brad Exp $
-lib/pgsql/libecpg.so.3.1
-lib/pgsql/libpgeasy.so.2.1
-lib/pgsql/libpq++.so.3.1
-lib/pgsql/libpq.so.2.1
-lib/pgsql/plpgsql.so
-NEWDYNLIBDIR(%B)
+@comment $OpenBSD: PFRAG.shared,v 1.7 2001/04/21 18:25:55 peter Exp $
+lib/libecpg.so.3.2.0
+lib/libpgeasy.so.2.1
+lib/libpq++.so.3.1
+lib/libpq.so.2.1
+lib/plpgsql.so

databases/postgresql/pkg/PFRAG.shared-auto

@@ -0,0 +1,5 @@
+@comment $OpenBSD: PFRAG.shared-auto,v 1.1 2001/04/21 18:25:55 peter Exp $
+lib/libpgeasy.so.2.1
+lib/libpq++.so.3.1
+lib/libpq.so.2.1
+DYNLIBDIR(%D/lib)

databases/postgresql/pkg/PFRAG.shared-clients

@@ -1,7 +1,5 @@
-@comment $OpenBSD: PFRAG.shared-clients,v 1.2 2001/03/13 22:05:47 brad Exp $
-lib/pgsql/libecpg.so.3.1
-lib/pgsql/libpgeasy.so.2.1
-lib/pgsql/libpq++.so.3.1
-lib/pgsql/libpq.so.2.1
-lib/pgsql/plpgsql.so
-NEWDYNLIBDIR(%B)
+@comment $OpenBSD: PFRAG.shared-clients,v 1.3 2001/04/21 18:25:56 peter Exp $
+lib/libecpg.so.3.2.0
+lib/libpgeasy.so.2.1
+lib/libpq++.so.3.1
+lib/libpq.so.2.1

databases/postgresql/pkg/PFRAG.tcl

@@ -1,143 +1,143 @@
-@comment $OpenBSD: PFRAG.tcl,v 1.3 2001/02/22 19:28:14 danh Exp $
+@comment $OpenBSD: PFRAG.tcl,v 1.4 2001/04/21 18:25:56 peter Exp $
 bin/pgaccess
 bin/pgtclsh
 bin/pgtksh
-include/pgsql/libpgtcl.h
+include/postgresql/libpgtcl.h
 man/man1/pgaccess.1
 man/man1/pgtclsh.1
 man/man1/pgtksh.1
-lib/pgsql/libpgtcl.a
-lib/pgsql/pgaccess/images/icon_button.gif
-lib/pgsql/pgaccess/images/icon_checkbutton.gif
-lib/pgsql/pgaccess/images/icon_entry.gif
-lib/pgsql/pgaccess/images/icon_frame.gif
-lib/pgsql/pgaccess/images/icon_label.gif
-lib/pgsql/pgaccess/images/icon_listbox.gif
-lib/pgsql/pgaccess/images/icon_query.gif
-lib/pgsql/pgaccess/images/icon_radiobutton.gif
-lib/pgsql/pgaccess/images/icon_text.gif
-lib/pgsql/pgaccess/lib/database.tcl
-lib/pgsql/pgaccess/lib/forms.tcl
-lib/pgsql/pgaccess/lib/functions.tcl
-lib/pgsql/pgaccess/lib/help.tcl
-lib/pgsql/pgaccess/lib/help/abort.hlp
-lib/pgsql/pgaccess/lib/help/add_records.hlp
-lib/pgsql/pgaccess/lib/help/alter_table.hlp
-lib/pgsql/pgaccess/lib/help/alter_user.hlp
-lib/pgsql/pgaccess/lib/help/author.hlp
-lib/pgsql/pgaccess/lib/help/begin.hlp
-lib/pgsql/pgaccess/lib/help/close.hlp
-lib/pgsql/pgaccess/lib/help/cluster.hlp
-lib/pgsql/pgaccess/lib/help/commit.hlp
-lib/pgsql/pgaccess/lib/help/copy.hlp
-lib/pgsql/pgaccess/lib/help/copyrights.hlp
-lib/pgsql/pgaccess/lib/help/create_aggregate.hlp
-lib/pgsql/pgaccess/lib/help/create_database.hlp
-lib/pgsql/pgaccess/lib/help/create_function.hlp
-lib/pgsql/pgaccess/lib/help/create_index.hlp
-lib/pgsql/pgaccess/lib/help/create_language.hlp
-lib/pgsql/pgaccess/lib/help/create_operator.hlp
-lib/pgsql/pgaccess/lib/help/create_rule.hlp
-lib/pgsql/pgaccess/lib/help/create_sequence.hlp
-lib/pgsql/pgaccess/lib/help/create_table.hlp
-lib/pgsql/pgaccess/lib/help/create_table_as.hlp
-lib/pgsql/pgaccess/lib/help/create_trigger.hlp
-lib/pgsql/pgaccess/lib/help/create_type.hlp
-lib/pgsql/pgaccess/lib/help/create_user.hlp
-lib/pgsql/pgaccess/lib/help/create_view.hlp
-lib/pgsql/pgaccess/lib/help/data_types.hlp
-lib/pgsql/pgaccess/lib/help/datefunc.hlp
-lib/pgsql/pgaccess/lib/help/declare.hlp
-lib/pgsql/pgaccess/lib/help/delete.hlp
-lib/pgsql/pgaccess/lib/help/drop_aggregate.hlp
-lib/pgsql/pgaccess/lib/help/drop_database.hlp
-lib/pgsql/pgaccess/lib/help/drop_function.hlp
-lib/pgsql/pgaccess/lib/help/drop_index.hlp
-lib/pgsql/pgaccess/lib/help/drop_language.hlp
-lib/pgsql/pgaccess/lib/help/drop_operator.hlp
-lib/pgsql/pgaccess/lib/help/drop_rule.hlp
-lib/pgsql/pgaccess/lib/help/drop_sequence.hlp
-lib/pgsql/pgaccess/lib/help/drop_table.hlp
-lib/pgsql/pgaccess/lib/help/drop_trigger.hlp
-lib/pgsql/pgaccess/lib/help/drop_type.hlp
-lib/pgsql/pgaccess/lib/help/drop_user.hlp
-lib/pgsql/pgaccess/lib/help/drop_view.hlp
-lib/pgsql/pgaccess/lib/help/explain.hlp
-lib/pgsql/pgaccess/lib/help/fetch.hlp
-lib/pgsql/pgaccess/lib/help/form_design.hlp
-lib/pgsql/pgaccess/lib/help/forms.hlp
-lib/pgsql/pgaccess/lib/help/functions.hlp
-lib/pgsql/pgaccess/lib/help/geomfunc.hlp
-lib/pgsql/pgaccess/lib/help/grant.hlp
-lib/pgsql/pgaccess/lib/help/history.hlp
-lib/pgsql/pgaccess/lib/help/index.hlp
-lib/pgsql/pgaccess/lib/help/inheritance.hlp
-lib/pgsql/pgaccess/lib/help/insert.hlp
-lib/pgsql/pgaccess/lib/help/ipv4func.hlp
-lib/pgsql/pgaccess/lib/help/isolation.hlp
-lib/pgsql/pgaccess/lib/help/keywords.hlp
-lib/pgsql/pgaccess/lib/help/listen.hlp
-lib/pgsql/pgaccess/lib/help/load.hlp
-lib/pgsql/pgaccess/lib/help/lock.hlp
-lib/pgsql/pgaccess/lib/help/mathfunc.hlp
-lib/pgsql/pgaccess/lib/help/move.hlp
-lib/pgsql/pgaccess/lib/help/mvcc.hlp
-lib/pgsql/pgaccess/lib/help/new_query.hlp
-lib/pgsql/pgaccess/lib/help/new_table.hlp
-lib/pgsql/pgaccess/lib/help/notify.hlp
-lib/pgsql/pgaccess/lib/help/open_query.hlp
-lib/pgsql/pgaccess/lib/help/open_table.hlp
-lib/pgsql/pgaccess/lib/help/pgfunctions.hlp
-lib/pgsql/pgaccess/lib/help/postgresql.hlp
-lib/pgsql/pgaccess/lib/help/queries.hlp
-lib/pgsql/pgaccess/lib/help/reports.hlp
-lib/pgsql/pgaccess/lib/help/reset.hlp
-lib/pgsql/pgaccess/lib/help/revoke.hlp
-lib/pgsql/pgaccess/lib/help/rollback.hlp
-lib/pgsql/pgaccess/lib/help/schema.hlp
-lib/pgsql/pgaccess/lib/help/scripts.hlp
-lib/pgsql/pgaccess/lib/help/select.hlp
-lib/pgsql/pgaccess/lib/help/select_into.hlp
-lib/pgsql/pgaccess/lib/help/sequences.hlp
-lib/pgsql/pgaccess/lib/help/set.hlp
-lib/pgsql/pgaccess/lib/help/show.hlp
-lib/pgsql/pgaccess/lib/help/sql_guide.hlp
-lib/pgsql/pgaccess/lib/help/sqlfunc.hlp
-lib/pgsql/pgaccess/lib/help/stringfunc.hlp
-lib/pgsql/pgaccess/lib/help/tables.hlp
-lib/pgsql/pgaccess/lib/help/unlisten.hlp
-lib/pgsql/pgaccess/lib/help/update.hlp
-lib/pgsql/pgaccess/lib/help/users.hlp
-lib/pgsql/pgaccess/lib/help/vacuum.hlp
-lib/pgsql/pgaccess/lib/help/view_table_structure.hlp
-lib/pgsql/pgaccess/lib/help/views.hlp
-lib/pgsql/pgaccess/lib/help/visual_designer.hlp
-lib/pgsql/pgaccess/lib/help/y2k.hlp
-lib/pgsql/pgaccess/lib/languages/czech
-lib/pgsql/pgaccess/lib/languages/deutsch
-lib/pgsql/pgaccess/lib/languages/francais
-lib/pgsql/pgaccess/lib/languages/italiano
-lib/pgsql/pgaccess/lib/languages/magyar
-lib/pgsql/pgaccess/lib/languages/portugues
-lib/pgsql/pgaccess/lib/languages/romana
-lib/pgsql/pgaccess/lib/languages/russian.koi8r
-lib/pgsql/pgaccess/lib/languages/russian_win
-lib/pgsql/pgaccess/lib/languages/spanish
-lib/pgsql/pgaccess/lib/mainlib.tcl
-lib/pgsql/pgaccess/lib/preferences.tcl
-lib/pgsql/pgaccess/lib/queries.tcl
-lib/pgsql/pgaccess/lib/reports.tcl
-lib/pgsql/pgaccess/lib/schema.tcl
-lib/pgsql/pgaccess/lib/scripts.tcl
-lib/pgsql/pgaccess/lib/sequences.tcl
-lib/pgsql/pgaccess/lib/tables.tcl
-lib/pgsql/pgaccess/lib/users.tcl
-lib/pgsql/pgaccess/lib/views.tcl
-lib/pgsql/pgaccess/lib/visualqb.tcl
-lib/pgsql/pgaccess/main.tcl
+lib/libpgtcl.a
+share/examples/postgresql/pgaccess/images/icon_button.gif
+share/examples/postgresql/pgaccess/images/icon_checkbutton.gif
+share/examples/postgresql/pgaccess/images/icon_entry.gif
+share/examples/postgresql/pgaccess/images/icon_frame.gif
+share/examples/postgresql/pgaccess/images/icon_label.gif
+share/examples/postgresql/pgaccess/images/icon_listbox.gif
+share/examples/postgresql/pgaccess/images/icon_query.gif
+share/examples/postgresql/pgaccess/images/icon_radiobutton.gif
+share/examples/postgresql/pgaccess/images/icon_text.gif
+share/examples/postgresql/pgaccess/lib/database.tcl
+share/examples/postgresql/pgaccess/lib/forms.tcl
+share/examples/postgresql/pgaccess/lib/functions.tcl
+share/examples/postgresql/pgaccess/lib/help.tcl
+share/examples/postgresql/pgaccess/lib/help/abort.hlp
+share/examples/postgresql/pgaccess/lib/help/add_records.hlp
+share/examples/postgresql/pgaccess/lib/help/alter_table.hlp
+share/examples/postgresql/pgaccess/lib/help/alter_user.hlp
+share/examples/postgresql/pgaccess/lib/help/author.hlp
+share/examples/postgresql/pgaccess/lib/help/begin.hlp
+share/examples/postgresql/pgaccess/lib/help/close.hlp
+share/examples/postgresql/pgaccess/lib/help/cluster.hlp
+share/examples/postgresql/pgaccess/lib/help/commit.hlp
+share/examples/postgresql/pgaccess/lib/help/copy.hlp
+share/examples/postgresql/pgaccess/lib/help/copyrights.hlp
+share/examples/postgresql/pgaccess/lib/help/create_aggregate.hlp
+share/examples/postgresql/pgaccess/lib/help/create_database.hlp
+share/examples/postgresql/pgaccess/lib/help/create_function.hlp
+share/examples/postgresql/pgaccess/lib/help/create_index.hlp
+share/examples/postgresql/pgaccess/lib/help/create_language.hlp
+share/examples/postgresql/pgaccess/lib/help/create_operator.hlp
+share/examples/postgresql/pgaccess/lib/help/create_rule.hlp
+share/examples/postgresql/pgaccess/lib/help/create_sequence.hlp
+share/examples/postgresql/pgaccess/lib/help/create_table.hlp
+share/examples/postgresql/pgaccess/lib/help/create_table_as.hlp
+share/examples/postgresql/pgaccess/lib/help/create_trigger.hlp
+share/examples/postgresql/pgaccess/lib/help/create_type.hlp
+share/examples/postgresql/pgaccess/lib/help/create_user.hlp
+share/examples/postgresql/pgaccess/lib/help/create_view.hlp
+share/examples/postgresql/pgaccess/lib/help/data_types.hlp
+share/examples/postgresql/pgaccess/lib/help/datefunc.hlp
+share/examples/postgresql/pgaccess/lib/help/declare.hlp
+share/examples/postgresql/pgaccess/lib/help/delete.hlp
+share/examples/postgresql/pgaccess/lib/help/drop_aggregate.hlp
+share/examples/postgresql/pgaccess/lib/help/drop_database.hlp
+share/examples/postgresql/pgaccess/lib/help/drop_function.hlp
+share/examples/postgresql/pgaccess/lib/help/drop_index.hlp
+share/examples/postgresql/pgaccess/lib/help/drop_language.hlp
+share/examples/postgresql/pgaccess/lib/help/drop_operator.hlp
+share/examples/postgresql/pgaccess/lib/help/drop_rule.hlp
+share/examples/postgresql/pgaccess/lib/help/drop_sequence.hlp
+share/examples/postgresql/pgaccess/lib/help/drop_table.hlp
+share/examples/postgresql/pgaccess/lib/help/drop_trigger.hlp
+share/examples/postgresql/pgaccess/lib/help/drop_type.hlp
+share/examples/postgresql/pgaccess/lib/help/drop_user.hlp
+share/examples/postgresql/pgaccess/lib/help/drop_view.hlp
+share/examples/postgresql/pgaccess/lib/help/explain.hlp
+share/examples/postgresql/pgaccess/lib/help/fetch.hlp
+share/examples/postgresql/pgaccess/lib/help/form_design.hlp
+share/examples/postgresql/pgaccess/lib/help/forms.hlp
+share/examples/postgresql/pgaccess/lib/help/functions.hlp
+share/examples/postgresql/pgaccess/lib/help/geomfunc.hlp
+share/examples/postgresql/pgaccess/lib/help/grant.hlp
+share/examples/postgresql/pgaccess/lib/help/history.hlp
+share/examples/postgresql/pgaccess/lib/help/index.hlp
+share/examples/postgresql/pgaccess/lib/help/inheritance.hlp
+share/examples/postgresql/pgaccess/lib/help/insert.hlp
+share/examples/postgresql/pgaccess/lib/help/ipv4func.hlp
+share/examples/postgresql/pgaccess/lib/help/isolation.hlp
+share/examples/postgresql/pgaccess/lib/help/keywords.hlp
+share/examples/postgresql/pgaccess/lib/help/listen.hlp
+share/examples/postgresql/pgaccess/lib/help/load.hlp
+share/examples/postgresql/pgaccess/lib/help/lock.hlp
+share/examples/postgresql/pgaccess/lib/help/mathfunc.hlp
+share/examples/postgresql/pgaccess/lib/help/move.hlp
+share/examples/postgresql/pgaccess/lib/help/mvcc.hlp
+share/examples/postgresql/pgaccess/lib/help/new_query.hlp
+share/examples/postgresql/pgaccess/lib/help/new_table.hlp
+share/examples/postgresql/pgaccess/lib/help/notify.hlp
+share/examples/postgresql/pgaccess/lib/help/open_query.hlp
+share/examples/postgresql/pgaccess/lib/help/open_table.hlp
+share/examples/postgresql/pgaccess/lib/help/pgfunctions.hlp
+share/examples/postgresql/pgaccess/lib/help/postgresql.hlp
+share/examples/postgresql/pgaccess/lib/help/queries.hlp
+share/examples/postgresql/pgaccess/lib/help/reports.hlp
+share/examples/postgresql/pgaccess/lib/help/reset.hlp
+share/examples/postgresql/pgaccess/lib/help/revoke.hlp
+share/examples/postgresql/pgaccess/lib/help/rollback.hlp
+share/examples/postgresql/pgaccess/lib/help/schema.hlp
+share/examples/postgresql/pgaccess/lib/help/scripts.hlp
+share/examples/postgresql/pgaccess/lib/help/select.hlp
+share/examples/postgresql/pgaccess/lib/help/select_into.hlp
+share/examples/postgresql/pgaccess/lib/help/sequences.hlp
+share/examples/postgresql/pgaccess/lib/help/set.hlp
+share/examples/postgresql/pgaccess/lib/help/show.hlp
+share/examples/postgresql/pgaccess/lib/help/sql_guide.hlp
+share/examples/postgresql/pgaccess/lib/help/sqlfunc.hlp
+share/examples/postgresql/pgaccess/lib/help/stringfunc.hlp
+share/examples/postgresql/pgaccess/lib/help/tables.hlp
+share/examples/postgresql/pgaccess/lib/help/unlisten.hlp
+share/examples/postgresql/pgaccess/lib/help/update.hlp
+share/examples/postgresql/pgaccess/lib/help/users.hlp
+share/examples/postgresql/pgaccess/lib/help/vacuum.hlp
+share/examples/postgresql/pgaccess/lib/help/view_table_structure.hlp
+share/examples/postgresql/pgaccess/lib/help/views.hlp
+share/examples/postgresql/pgaccess/lib/help/visual_designer.hlp
+share/examples/postgresql/pgaccess/lib/help/y2k.hlp
+share/examples/postgresql/pgaccess/lib/languages/czech
+share/examples/postgresql/pgaccess/lib/languages/deutsch
+share/examples/postgresql/pgaccess/lib/languages/francais
+share/examples/postgresql/pgaccess/lib/languages/italiano
+share/examples/postgresql/pgaccess/lib/languages/magyar
+share/examples/postgresql/pgaccess/lib/languages/portugues
+share/examples/postgresql/pgaccess/lib/languages/romana
+share/examples/postgresql/pgaccess/lib/languages/russian.koi8r
+share/examples/postgresql/pgaccess/lib/languages/russian_win
+share/examples/postgresql/pgaccess/lib/languages/spanish
+share/examples/postgresql/pgaccess/lib/mainlib.tcl
+share/examples/postgresql/pgaccess/lib/preferences.tcl
+share/examples/postgresql/pgaccess/lib/queries.tcl
+share/examples/postgresql/pgaccess/lib/reports.tcl
+share/examples/postgresql/pgaccess/lib/schema.tcl
+share/examples/postgresql/pgaccess/lib/scripts.tcl
+share/examples/postgresql/pgaccess/lib/sequences.tcl
+share/examples/postgresql/pgaccess/lib/tables.tcl
+share/examples/postgresql/pgaccess/lib/users.tcl
+share/examples/postgresql/pgaccess/lib/views.tcl
+share/examples/postgresql/pgaccess/lib/visualqb.tcl
+share/examples/postgresql/pgaccess/main.tcl
 %%SHARED-tcl%%
-@dirrm lib/pgsql/pgaccess/lib/languages
-@dirrm lib/pgsql/pgaccess/lib/help
-@dirrm lib/pgsql/pgaccess/lib
-@dirrm lib/pgsql/pgaccess/images
-@dirrm lib/pgsql/pgaccess
+@dirrm share/examples/postgresql/pgaccess/lib/languages
+@dirrm share/examples/postgresql/pgaccess/lib/help
+@dirrm share/examples/postgresql/pgaccess/lib
+@dirrm share/examples/postgresql/pgaccess/images
+@dirrm share/examples/postgresql/pgaccess

databases/postgresql/pkg/PFRAG.tcl.shared

@@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.tcl.shared,v 1.3 2001/02/22 19:28:14 danh Exp $
-lib/pgsql/libpgtcl.so.2.1
-lib/pgsql/pltcl.so
+@comment $OpenBSD: PFRAG.tcl.shared,v 1.4 2001/04/21 18:25:56 peter Exp $
+lib/libpgtcl.so.2.1
+lib/pltcl.so

databases/postgresql/pkg/PLIST

@@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.15 2001/04/15 16:48:44 espie Exp $
-@pkgcfl pgsql-clients-*
+@comment $OpenBSD: PLIST,v 1.16 2001/04/21 18:25:57 peter Exp $
+@pkgcfl postgresql-clients-[0-9]*
+@pkgcfl pgsql-[0-9]*
+@pkgcfl pgsql-clients-[0-9]*
 bin/createdb
 bin/createlang
 bin/createuser
@@ -10,63 +12,44 @@ bin/ecpg
 bin/initdb
 bin/initlocation
 bin/ipcclean
+bin/pg_config
 bin/pg_ctl
 bin/pg_dump
 bin/pg_dumpall
-bin/pg_encoding
 bin/pg_id
 bin/pg_passwd
-bin/pg_upgrade
-bin/pg_version
-bin/pgwrap
+bin/pg_restore
 bin/postgres
 bin/postmaster
 bin/psql
 bin/vacuumdb
-include/pgsql/access/attnum.h
-include/pgsql/c.h
-include/pgsql/commands/trigger.h
-include/pgsql/config.h
-include/pgsql/ecpgerrno.h
-include/pgsql/ecpglib.h
-include/pgsql/ecpgtype.h
-include/pgsql/executor/spi.h
-include/pgsql/fmgr.h
-include/pgsql/lib/dllist.h
-include/pgsql/libpgeasy.h
-include/pgsql/libpq++.h
-include/pgsql/libpq++/pgconnection.h
-include/pgsql/libpq++/pgcursordb.h
-include/pgsql/libpq++/pgdatabase.h
-include/pgsql/libpq++/pglobject.h
-include/pgsql/libpq++/pgtransdb.h
-include/pgsql/libpq-fe.h
-include/pgsql/libpq-int.h
-include/pgsql/libpq/libpq-fs.h
-include/pgsql/libpq/pqcomm.h
-include/pgsql/os.h
-include/pgsql/postgres.h
-include/pgsql/postgres_ext.h
-include/pgsql/pqexpbuffer.h
-include/pgsql/sql3types.h
-include/pgsql/sqlca.h
-include/pgsql/utils/elog.h
-include/pgsql/utils/geo_decls.h
-include/pgsql/utils/mcxt.h
-include/pgsql/utils/palloc.h
-lib/pgsql/global1.bki.source
-lib/pgsql/global1.description
-lib/pgsql/libecpg.a
-lib/pgsql/libpgeasy.a
-lib/pgsql/libpq++.a
-lib/pgsql/libpq.a
-lib/pgsql/local1_template1.bki.source
-lib/pgsql/local1_template1.description
-lib/pgsql/pg_geqo.sample
-lib/pgsql/pg_hba.conf.sample
-lib/pgsql/pg_ident.conf.sample
-lib/pgsql/pg_options.sample
-lib/pgsql/postmaster.opts.default.sample
+include/postgresql/c.h
+include/postgresql/config.h
+include/postgresql/ecpgerrno.h
+include/postgresql/ecpglib.h
+include/postgresql/ecpgtype.h
+include/postgresql/lib/dllist.h
+include/postgresql/libpgeasy.h
+include/postgresql/libpq++.h
+include/postgresql/libpq++/pgconnection.h
+include/postgresql/libpq++/pgcursordb.h
+include/postgresql/libpq++/pgdatabase.h
+include/postgresql/libpq++/pglobject.h
+include/postgresql/libpq++/pgtransdb.h
+include/postgresql/libpq-fe.h
+include/postgresql/libpq-int.h
+include/postgresql/libpq/libpq-fs.h
+include/postgresql/libpq/pqcomm.h
+include/postgresql/os.h
+include/postgresql/postgres_ext.h
+include/postgresql/postgres_fe.h
+include/postgresql/pqexpbuffer.h
+include/postgresql/sql3types.h
+include/postgresql/sqlca.h
+lib/libecpg.a
+lib/libpgeasy.a
+lib/libpq++.a
+lib/libpq.a
 man/man1/createdb.1
 man/man1/createlang.1
 man/man1/createuser.1
@@ -77,11 +60,12 @@ man/man1/ecpg.1
 man/man1/initdb.1
 man/man1/initlocation.1
 man/man1/ipcclean.1
+man/man1/pg_config.1
 man/man1/pg_ctl.1
 man/man1/pg_dump.1
 man/man1/pg_dumpall.1
 man/man1/pg_passwd.1
-man/man1/pg_upgrade.1
+man/man1/pg_restore.1
 man/man1/postgres.1
 man/man1/postmaster.1
 man/man1/psql.1
@@ -91,6 +75,7 @@ man/manl/alter_group.l
 man/manl/alter_table.l
 man/manl/alter_user.l
 man/manl/begin.l
+man/manl/checkpoint.l
 man/manl/close.l
 man/manl/cluster.l
 man/manl/comment.l
@@ -145,27 +130,34 @@ man/manl/rollback.l
 man/manl/select.l
 man/manl/select_into.l
 man/manl/set.l
+man/manl/set_constraints.l
+man/manl/set_transaction.l
 man/manl/show.l
 man/manl/truncate.l
 man/manl/unlisten.l
 man/manl/update.l
 man/manl/vacuum.l
-share/doc/pgsql/COPYRIGHT
-share/doc/pgsql/HISTORY
-share/doc/pgsql/INSTALL
-share/doc/pgsql/README
-share/doc/pgsql/README.OpenBSD
-share/doc/pgsql/register.txt
+share/doc/postgresql/COPYRIGHT
+share/doc/postgresql/FAQ
+share/doc/postgresql/FAQ_DEV
+share/doc/postgresql/HISTORY
+share/doc/postgresql/INSTALL
+share/doc/postgresql/README
+share/doc/postgresql/README.OpenBSD
+share/doc/postgresql/TODO
+share/doc/postgresql/register.txt
+share/examples/postgresql/global.bki
+share/examples/postgresql/global.description
+share/examples/postgresql/pg_hba.conf.sample
+share/examples/postgresql/pg_ident.conf.sample
+share/examples/postgresql/postgresql.conf.sample
+share/examples/postgresql/template1.bki
+share/examples/postgresql/template1.description
 %%tcl%%
 %%odbc%%
 %%SHARED%%
-@dirrm share/doc/pgsql
-@dirrm lib/pgsql
-@dirrm include/pgsql/utils
-@dirrm include/pgsql/libpq++
-@dirrm include/pgsql/libpq
-@dirrm include/pgsql/lib
-@dirrm include/pgsql/executor
-@dirrm include/pgsql/commands
-@dirrm include/pgsql/access
-@dirrm include/pgsql
+@dirrm share/examples/postgresql
+@dirrm include/postgresql/libpq++
+@dirrm include/postgresql/libpq
+@dirrm include/postgresql/lib
+@dirrm include/postgresql

databases/postgresql/pkg/PLIST-clients

@@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST-clients,v 1.2 2001/04/15 16:48:44 espie Exp $
+@comment $OpenBSD: PLIST-clients,v 1.3 2001/04/21 18:25:57 peter Exp $
+@pkgcfl postgresql-[0-9]*
 @pkgcfl pgsql-[0-9]*
+@pkgcfl pgsql-clients-[0-9]*
 bin/createdb
 bin/createlang
 bin/createuser
@@ -7,47 +9,40 @@ bin/dropdb
 bin/droplang
 bin/dropuser
 bin/ecpg
+bin/pg_config
 bin/pg_dump
 bin/pg_dumpall
-bin/pg_encoding
 bin/pg_id
+bin/pg_restore
 bin/psql
 bin/vacuumdb
-include/pgsql/access/attnum.h
-include/pgsql/c.h
-include/pgsql/commands/trigger.h
-include/pgsql/config.h
-include/pgsql/ecpgerrno.h
-include/pgsql/ecpglib.h
-include/pgsql/ecpgtype.h
-include/pgsql/executor/spi.h
-include/pgsql/fmgr.h
-include/pgsql/lib/dllist.h
-include/pgsql/libpgeasy.h
-include/pgsql/libpq++.h
-include/pgsql/libpq++/pgconnection.h
-include/pgsql/libpq++/pgcursordb.h
-include/pgsql/libpq++/pgdatabase.h
-include/pgsql/libpq++/pglobject.h
-include/pgsql/libpq++/pgtransdb.h
-include/pgsql/libpq-fe.h
-include/pgsql/libpq-int.h
-include/pgsql/libpq/libpq-fs.h
-include/pgsql/libpq/pqcomm.h
-include/pgsql/os.h
-include/pgsql/postgres.h
-include/pgsql/postgres_ext.h
-include/pgsql/pqexpbuffer.h
-include/pgsql/sql3types.h
-include/pgsql/sqlca.h
-include/pgsql/utils/elog.h
-include/pgsql/utils/geo_decls.h
-include/pgsql/utils/mcxt.h
-include/pgsql/utils/palloc.h
-lib/pgsql/libecpg.a
-lib/pgsql/libpgeasy.a
-lib/pgsql/libpq++.a
-lib/pgsql/libpq.a
+include/postgresql/c.h
+include/postgresql/config.h
+include/postgresql/ecpgerrno.h
+include/postgresql/ecpglib.h
+include/postgresql/ecpgtype.h
+include/postgresql/lib/dllist.h
+include/postgresql/libpgeasy.h
+include/postgresql/libpq++.h
+include/postgresql/libpq++/pgconnection.h
+include/postgresql/libpq++/pgcursordb.h
+include/postgresql/libpq++/pgdatabase.h
+include/postgresql/libpq++/pglobject.h
+include/postgresql/libpq++/pgtransdb.h
+include/postgresql/libpq-fe.h
+include/postgresql/libpq-int.h
+include/postgresql/libpq/libpq-fs.h
+include/postgresql/libpq/pqcomm.h
+include/postgresql/os.h
+include/postgresql/postgres_ext.h
+include/postgresql/postgres_fe.h
+include/postgresql/pqexpbuffer.h
+include/postgresql/sql3types.h
+include/postgresql/sqlca.h
+lib/libecpg.a
+lib/libpgeasy.a
+lib/libpq++.a
+lib/libpq.a
 man/man1/createdb.1
 man/man1/createlang.1
 man/man1/createuser.1
@@ -55,8 +50,10 @@ man/man1/dropdb.1
 man/man1/droplang.1
 man/man1/dropuser.1
 man/man1/ecpg.1
+man/man1/pg_config.1
 man/man1/pg_dump.1
 man/man1/pg_dumpall.1
+man/man1/pg_restore.1
 man/man1/psql.1
 man/man1/vacuumdb.1
 man/manl/abort.l
@@ -64,6 +61,7 @@ man/manl/alter_group.l
 man/manl/alter_table.l
 man/manl/alter_user.l
 man/manl/begin.l
+man/manl/checkpoint.l
 man/manl/close.l
 man/manl/cluster.l
 man/manl/comment.l
@@ -118,27 +116,31 @@ man/manl/rollback.l
 man/manl/select.l
 man/manl/select_into.l
 man/manl/set.l
+man/manl/set_constraints.l
+man/manl/set_transaction.l
 man/manl/show.l
 man/manl/truncate.l
 man/manl/unlisten.l
 man/manl/update.l
 man/manl/vacuum.l
-share/doc/pgsql/COPYRIGHT
-share/doc/pgsql/HISTORY
-share/doc/pgsql/INSTALL
-share/doc/pgsql/README
-share/doc/pgsql/README.OpenBSD
-share/doc/pgsql/register.txt
+share/doc/postgresql/COPYRIGHT
+share/doc/postgresql/FAQ
+share/doc/postgresql/FAQ_DEV
+share/doc/postgresql/HISTORY
+share/doc/postgresql/INSTALL
+share/doc/postgresql/README
+share/doc/postgresql/README.OpenBSD
+share/doc/postgresql/TODO
+share/doc/postgresql/register.txt
 %%tcl%%
 %%odbc%%
 %%SHARED%%
-@dirrm share/doc/pgsql
-@dirrm lib/pgsql
-@dirrm include/pgsql/utils
-@dirrm include/pgsql/libpq++
-@dirrm include/pgsql/libpq
-@dirrm include/pgsql/lib
-@dirrm include/pgsql/executor
-@dirrm include/pgsql/commands 
-@dirrm include/pgsql/access 
-@dirrm include/pgsql
+@dirrm share/doc/postgresql
+@dirrm include/postgresql/utils
+@dirrm include/postgresql/libpq++
+@dirrm include/postgresql/libpq
+@dirrm include/postgresql/lib
+@dirrm include/postgresql/executor
+@dirrm include/postgresql/commands 
+@dirrm include/postgresql/access 
+@dirrm include/postgresql