Upgrade to 7.1, change to new layout style.

PR: ports/26741 Submitted by: maintainer
author: vanilla <vanilla@FreeBSD.org> 2001-04-21 11:34:34 +0000
committer: vanilla <vanilla@FreeBSD.org> 2001-04-21 11:34:34 +0000
commit: 4f94b9c8c7df606bab11c747db7be3620e297d1c (patch)
tree: 700864a63bbc708a48896f72aeb04fb514a3cce9 /databases/postgresql84-server
parent: 1a399aa4c7a2c71c3b2d431b42e1b62812fc3faf (diff)
download: FreeBSD-ports-4f94b9c8c7df606bab11c747db7be3620e297d1c.zip
FreeBSD-ports-4f94b9c8c7df606bab11c747db7be3620e297d1c.tar.gz
34 files changed, 1163 insertions, 1641 deletions
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index e5d2376..3893f4f 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -6,47 +6,62 @@
 #
 
 PORTNAME=	postgresql
-PORTVERSION=	7.0.3
-PORTREVISION=	1
+PORTVERSION=	7.1
 CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
+MASTER_SITES=	ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \
+		ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
 		ftp://ftp.de.postgresql.org/%SUBDIR%/ \
-		ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \
 		ftp://ftp.digex.net/pub/packages/database/postgresql/%SUBDIR%/ \
 		ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/%SUBDIR%/
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
-DISTFILES=	${PORTNAME}-${PORTVERSION}.base${EXTRACT_SUFX} \
-		${PORTNAME}-${PORTVERSION}.support${EXTRACT_SUFX} \
-		${PORTNAME}-${PORTVERSION}.docs${EXTRACT_SUFX}
-#		${PORTNAME}-${PORTVERSION}.test${EXTRACT_SUFX}
-DIST_SUBDIR=	postgresql
+DISTFILES=	${PORTNAME}-base-${PORTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}-opt-${PORTVERSION}${EXTRACT_SUFX}
+.if !defined(NOPORTDOCS)
+DISTFILES+=	${PORTNAME}-docs-${PORTVERSION}${EXTRACT_SUFX}
+.endif
 
 MAINTAINER=	girgen@partitur.se
 
-BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf
+DIST_SUBDIR=	postgresql
 
 INSTALLS_SHLIB=	YES
-LDCONFIG_DIRS=	%%PREFIX%%/pgsql/lib
+LDCONFIG_DIRS=	%%PREFIX%%/lib
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 DOCDIR=		${WRKDIR}/${DISTNAME}/doc
+PLIST=		${WRKDIR}/.PLIST.generated
 
 USE_GMAKE=	YES
-MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
-CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
-		--enable-locale \
-		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
+CONFIGURE_ARGS=	--enable-locale \
+		--enable-syslog --with-CXX \
+		--sysconfdir=${PREFIX}/etc/postgresql \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		--with-libraries=${PREFIX}/lib
+.if defined(WITH_OLD_LAYOUT)
+CONFIGURE_ARGS+=--docdir=${PREFIX}/share/doc --includedir=${PREFIX}/pgsql/include \
+		--datadir=${PREFIX}/share \
+		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
+		--prefix=${PREFIX}/pgsql
+PG_PREFIX=	pgsql/
+PG_INCLUDE=	pgsql/include
+LDCONFIG_DIRS=	%%PREFIX%%/pgsql/lib
+MANPREFIX=	${PREFIX}/pgsql
+.else
+GNU_CONFIGURE=	YES
+CONFIGURE_ARGS+=--docdir=${PREFIX}/share/doc --includedir=${PREFIX}/include/pgsql
+PG_PREFIX=""
+PG_INCLUDE=	include/pgsql
+.endif
+
+PLIST_SUB=	PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}"
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
-		dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 pg_ctl.1 \
-		pg_dump.1 pg_dumpall.1 pg_passwd.1 pg_upgrade.1 pgaccess.1 \
-		pgadmin.1 pgtclsh.1 pgtksh.1 postgres.1 postmaster.1 psql.1 \
+		dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 pg_config.1 \
+		pg_ctl.1 pg_dump.1 pg_dumpall.1 pg_passwd.1 pg_restore.1 \
+		pgaccess.1 pgtclsh.1 pgtksh.1 postgres.1 postmaster.1 psql.1 \
 		vacuumdb.1
 MANL=		abort.l alter_group.l alter_table.l alter_user.l \
-		begin.l close.l cluster.l comment.l commit.l copy.l \
+		begin.l checkpoint.l close.l cluster.l comment.l commit.l copy.l \
 		create_aggregate.l create_constraint_trigger.l \
 		create_database.l create_function.l create_group.l \
 		create_index.l create_language.l create_operator.l \
@@ -60,9 +75,8 @@ MANL=		abort.l alter_group.l alter_table.l alter_user.l \
 		drop_view.l end.l explain.l fetch.l grant.l insert.l \
 		listen.l load.l lock.l move.l notify.l reindex.l \
 		reset.l revoke.l rollback.l select.l select_into.l \
-		set.l show.l truncate.l unlisten.l update.l vacuum.l
-
-MANPREFIX=	${PREFIX}/pgsql
+		set.l set_constraints.l set_transaction.l show.l \
+		truncate.l unlisten.l update.l vacuum.l
 
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		WRKDIR="${WRKDIR}" \
@@ -76,92 +90,66 @@ SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
-pre-extract:
+pre-fetch:
 	@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql
 
-post-patch:
-	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig
-	@ ${SED} -e 's#CFLAGS:-O2 -m486 -pipe#CFLAGS:${CFLAGS}#' \
-		-e 's#USE_LOCALE:no#USE_LOCALE:yes#' \
-	${WRKSRC}/template/freebsd.orig >> ${WRKSRC}/template/freebsd
-	@ ${MV} ${WRKSRC}/Makefile.global.in ${WRKSRC}/Makefile.global.in.old
-	@ ${SED} -e 's=!!PREFIX!!=${PREFIX}=g' \
-		${WRKSRC}/Makefile.global.in.old \
-		>> ${WRKSRC}/Makefile.global.in
-
-#
-# USE_AUTOCONF implies GNU_CONFIGURE, which we don't want, so we have
-# to do it by hand.
-#
-pre-configure:
-	@(cd ${WRKSRC} && ${AUTOCONF})
-
-post-build:
-.if defined(WITH_JDBC)
-	@ ${GMAKE} -C ${WRKSRC}/interfaces/jdbc jdbc${JAVAVERSION}
-.endif
-
 pre-install:
-.if defined(PACKAGE_BUILDING)
-	${RM} -rf ${PREFIX}/pgsql
+	@ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
+.if !defined(BATCH)	
+# remind folks twice for a while, so they really don't miss the layout shift
+	@ ${SED} "s|/usr/local|${PREFIX}|g" < ${PKGMESSAGE} | head -n 25 | more -e
 .endif
-	@ ${MKDIR} ${PREFIX}/pgsql
-	@ ${SETENV} ${MAKE_ENV} perl ${SCRIPTDIR}/createuser
-.if !defined(BATCH)
-	@ ${SED} -e "s#%%WRKDIR%%#${WRKDIR}#; s#%%DISTNAME%%#${DISTNAME}#" \
-	< ${FILESDIR}/pre-install-notes | more -e
+	@ ${CP} ${PKGDIR}/pkg-plist ${PLIST}
+.if defined(WITHOUT_MULTIBYTE)
+	@${CP} ${PLIST} ${PLIST}.nomulti ;\
+	 ${GREP} -v bin/pg_encoding ${PLIST}.nomulti > ${PLIST}
+.endif
+.if defined(WITH_TCL)
+	@ ${CP} ${PLIST} ${PLIST}.notcl ;\
+	  ${CAT} ${PKGDIR}/${TCL_PLIST} ${PLIST}.notcl > ${PLIST} ;\
+	  ${RM} ${PLIST}.notcl
+.endif
+.if defined(WITH_ODBC)
+	@ ${CP} ${PLIST} ${PLIST}.noodbc ;\
+	  ${CAT} ${PKGDIR}/pkg-plist.odbc ${PLIST}.noodbc > ${PLIST} ;\
+	  ${RM} ${PLIST}.noodbc
+.endif
+.if defined(WITH_JDBC)
+	@ ${CP} ${PLIST} ${PLIST}.nojdbc ;\
+	  ${CAT} ${PKGDIR}/pkg-plist.jdbc ${PLIST}.nojdbc > ${PLIST} ;\
+	  ${RM} ${PLIST}.nojdbc
+.endif
+.if !defined(NOPORTDOCS)
+	@ ${CAT} ${PKGDIR}/pkg-plist.doc >> ${PLIST}
 .endif
 
 post-install:
-.if defined(NOPORTDOCS)
-	@ ${GMAKE} -C ${DOCDIR} man
-.else
-	@ ${GMAKE} -C ${DOCDIR} install
-	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/FAQ* ${PREFIX}/share/doc/pgsql
-	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/README* ${PREFIX}/share/doc/pgsql
-	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/TODO ${PREFIX}/share/doc/pgsql
-#	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
-	@ ${CAT} ${PKGDIR}/pkg-plist.doc >> ${TMPPLIST}
-.endif
-	@ ${SED} 's|%%PREFIX%%|${PREFIX}|g' \
-		< ${FILESDIR}/dot.profile.in \
-		> ${PREFIX}/pgsql/dot.profile.dist;
-	@ if [ ! -f ${PREFIX}/pgsql/.profile ]; then \
-		${CP} ${PREFIX}/pgsql/dot.profile.dist \
-			${PREFIX}/pgsql/.profile; \
+# install shell defaults for pgsql user
+.for i in profile cshrc
+	@ ${SED} "s|%%PREFIX%%|${PREFIX}|g; s|%%PG_PREFIX%%|${PG_PREFIX}|g" \
+		< ${FILESDIR}/dot.$i.in \
+		> ${PREFIX}/share/postgresql/dot.$i.dist; \
+	${CP} ${PREFIX}/share/postgresql/dot.$i.dist ~pgsql/; \
+	if [ ! -f ~pgsql/.$i ]; then \
+		${CP} ${PREFIX}/share/postgresql/dot.$i.dist ~pgsql/.$i; \
 	fi
-	@ ${CHOWN} -R pgsql:pgsql ${PREFIX}/pgsql
-	@ ${CHOWN} root:pgsql ${PREFIX}/pgsql/lib
-	@ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib
-	@ ${SED} -e "s=!!PREFIX!!=${PREFIX}=g" < ${FILESDIR}/pgsql.sh.tmpl \
+.endfor
+	@ ${SED} -e "s|%%PREFIX%%|${PREFIX}|g; s|%%PG_PREFIX%%|${PG_PREFIX}|g" \
+		< ${FILESDIR}/pgsql.sh.tmpl \
 		> ${PREFIX}/etc/rc.d/010.pgsql.sh
 	@ ${CHMOD} 554 ${PREFIX}/etc/rc.d/010.pgsql.sh
 	@ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh
-	@ ${SED} -e 's#%%PREFIX%%#${PREFIX}#' < ${FILESDIR}/post-install-notes \
-		> ${PREFIX}/pgsql/post-install-notes
-.if defined(WITHOUT_MULTIBYTE)
-	@${CP} ${TMPPLIST} ${TMPPLIST}.nomulti
-	@${GREP} -v pgsql/bin/pg_encoding ${TMPPLIST}.nomulti > ${TMPPLIST}
-.endif
 .if defined(WITH_TCL)
-	@${CP} ${TMPPLIST} ${TMPPLIST}.notcl
-	@${CAT} ${PKGDIR}/${TCL_PLIST} ${TMPPLIST}.notcl > ${TMPPLIST}
-	@${RM} ${TMPPLIST}.notcl
 # Preparing a loadable TCL-package (pkgIndex.tcl)
 # XXX This directory and the single file are not registered in
 # XXX the PLIST, because of different PREFIX.
 	@${MKDIR} ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3
-	@${SED} 's|%%PREFIX%%|${PREFIX}|' < ${FILESDIR}/pkgIndex.tcl.in \
+	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pkgIndex.tcl.in \
 		> ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl
 .endif
-.if defined(WITH_ODBC)
-	@${CP} ${TMPPLIST} ${TMPPLIST}.noodbc
-	@${CAT} ${PKGDIR}/pkg-plist.odbc ${TMPPLIST}.noodbc > ${TMPPLIST}
-	@${RM} ${TMPPLIST}.noodbc
-.endif
 .if defined(WITH_JDBC)
 	@ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
-	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
+	@ ${LN} -sf ${PREFIX}/share/postgresql/postgresql.jar \
 			  ${PREFIX}/share/java/classes/postgresql.jar
 	@ ${ECHO_MSG} "---------------------------------------------------------"
 	@ ${ECHO_MSG} "Putting postgresql.jar in"
@@ -169,33 +157,38 @@ post-install:
 	@ ${ECHO_MSG} "Add this to your CLASSPATH!"
 	@ ${ECHO_MSG} "ALSO NOTE: path inside jar file modified from 6.5.x:"
 	@ ${ECHO_MSG} "  'postgresql.*' -> 'org.postgresql.*'!"
-	@ ${ECHO_MSG} "You will need to modify you applications' props files."
 	@ ${ECHO_MSG} "---------------------------------------------------------"
-	@ ${CAT} ${PKGDIR}/pkg-plist.jdbc >> ${TMPPLIST}
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} -m 0555 ${PREFIX}/share/examples/pgsql/jdbc
-	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/example/*java \
-			  ${PREFIX}/share/examples/pgsql/jdbc
-	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/README* \
-			  ${PREFIX}/share/examples/pgsql/jdbc
-	@ ${ECHO_MSG} "---------------------------------------------------------"
-	@ ${ECHO_MSG} "Putting jdbc examples into ${PREFIX}/share/examples/pgsql"
-	@ ${ECHO_MSG} "---------------------------------------------------------"
-.endif
+	@ ${MKDIR} -m 0555 ${PREFIX}/share/examples/postgresql ;\
+	  cd ${WRKSRC}/src/interfaces/jdbc/example ;\
+	  pax -rw . ${PREFIX}/share/examples/postgresql
+.for i in README Implementation
+	@ ${INSTALL_DATA} ${WRKSRC}/src/interfaces/jdbc/$i \
+			  ${PREFIX}/share/examples/postgresql
+.endfor
+	@ ${ECHO_MSG} "---------------------------------------------------------------"
+	@ ${ECHO_MSG} "Putting java examples into ${PREFIX}/share/examples/postgresql"
+	@ ${ECHO_MSG} "---------------------------------------------------------------"
 .endif
-.if !defined(BATCH)
-	@ more -e ${PREFIX}/pgsql/post-install-notes
 .endif
 .if !defined(DEBUG_FLAGS)
-.for file in ecpg pg_dump pg_id pg_passwd pg_version postgres psql
-	@ strip ${PREFIX}/pgsql/bin/${file}
+.for file in ecpg pg_dump pg_id pg_passwd pg_restore postgres psql
+	@ strip ${PREFIX}/${PG_PREFIX}bin/${file}
 .endfor
 .endif
-	@ ${RMDIR} ${PREFIX}/pgsql/include/port/freebsd
-	@ ${RMDIR} ${PREFIX}/pgsql/include/port
-	@ ${CAT} ${PKGMESSAGE}
+# information overload mode activated, sorry about this... ;-)
+	@ ${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\
+		${SED} "s|/usr/local|${PREFIX}|g" |\
+		tee ${PREFIX}/share/postgresql/post-install-notes ;\
+	${INSTALL_DATA} ${PREFIX}/share/postgresql/post-install-notes ~pgsql/. ;\
+	${CHOWN} -R pgsql:pgsql ~pgsql/.
+.if defined(WITH_OLD_LAYOUT)
+	@ ${CHOWN} root:pgsql ${PREFIX}/${PG_PREFIX}lib
+.endif
 
 post-clean:
 	@ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 
+post-extract: ${POSTEXTRACT}
+
 .include <bsd.port.mk>
diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo
index fc87b81..bdec3e13 100644
--- a/databases/postgresql84-server/distinfo
+++ b/databases/postgresql84-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (postgresql/postgresql-7.0.3.base.tar.gz) = 0eeda8217b5b11e5a9351fc424808426
-MD5 (postgresql/postgresql-7.0.3.support.tar.gz) = b930f71068d776ef45402fcbebfa58cf
-MD5 (postgresql/postgresql-7.0.3.docs.tar.gz) = 3d3fc76073f6d77febefc83f887fc87d
+MD5 (postgresql/postgresql-base-7.1.tar.gz) = fce51e036ea8aadafe42f35841e50cc6
+MD5 (postgresql/postgresql-opt-7.1.tar.gz) = dca8a70020caab1024afe4d0f203fef1
+MD5 (postgresql/postgresql-docs-7.1.tar.gz) = 8fd7a862909663a6034d4aeb70ea7b71
diff --git a/databases/postgresql84-server/files/dot.cshrc.in b/databases/postgresql84-server/files/dot.cshrc.in
new file mode 100644
index 0000000..a326041b
--- /dev/null
+++ b/databases/postgresql84-server/files/dot.cshrc.in
@@ -0,0 +1,13 @@
+set path = ( %%PREFIX%%/%%PG_PREFIX%%bin $path )
+
+setenv PGLIB %%PREFIX%%/%%PG_PREFIX%%lib
+
+# note: PGDATA can be overridden by the -D startup option
+setenv PGDATA $HOME/data
+
+#You might want to set some locale stuff here
+#setenv PGDATESTYLE ISO
+#setenv LC_ALL sv_SE.ISO_8859-1
+
+# if you want to make regression tests use this TZ
+#setenv TZ PST8PDT
diff --git a/databases/postgresql84-server/files/dot.profile.in b/databases/postgresql84-server/files/dot.profile.in
index 3d8ca9a..4aca6aa 100644
--- a/databases/postgresql84-server/files/dot.profile.in
+++ b/databases/postgresql84-server/files/dot.profile.in
@@ -1,10 +1,12 @@
-PATH=${PATH}:%%PREFIX%%/pgsql/bin
-PGLIB=%%PREFIX%%/pgsql/lib
+# both new and old layout's paths, but new path first...
+PATH=%%PREFIX%%/%%PG_PREFIX%%bin:${PATH}
+
+PGLIB=%%PREFIX%%/%%PG_PREFIX%%lib
 
 # note: PGDATA can be overridden by the -D startup option
-PGDATA=%%PREFIX%%/pgsql/data
+PGDATA=${HOME}/data
 
-export PATH MANPATH PGLIB PGDATA
+export PATH PGLIB PGDATA
 
 #You might want to set some locale stuff here
 #PGDATESTYLE=ISO
diff --git a/databases/postgresql84-server/files/patch-aj b/databases/postgresql84-server/files/patch-aj
index 4231fc9..94c0d6d 100644
--- a/databases/postgresql84-server/files/patch-aj
+++ b/databases/postgresql84-server/files/patch-aj
@@ -1,67 +1,118 @@
---- bin/pg_passwd/pg_passwd.c.orig	Mon Apr 17 05:45:18 2000
-+++ bin/pg_passwd/pg_passwd.c	Sat May 20 17:54:59 2000
-@@ -18,11 +18,15 @@
- 
- #endif
+--- src/bin/pg_passwd/pg_passwd.c.orig	Sat Mar 24 01:54:55 2001
++++ src/bin/pg_passwd/pg_passwd.c	Wed Apr 18 04:54:14 2001
+@@ -7,6 +7,12 @@
+ #include <errno.h>
+ #include <time.h>
+ #include <ctype.h>
++
++#if defined(__FreeBSD__)
++#include <pwd.h>  /* defines _PASSWORD_LEN, max # of characters in a password */
++#include <sys/time.h> /* gettimeofday for password salt */
++#endif
++
+ #define issaltchar(c)	(isalnum((unsigned char) (c)) || (c) == '.' || (c) == '/')
  
-+#ifndef _POSIX_SOURCE
-+# define	_PASSWORD_LEN	128	/* max length, not containing NULL */
+ #ifdef HAVE_TERMIOS_H
+@@ -23,18 +29,31 @@
+  * We assume that the output of crypt(3) is always 13 characters,
+  * and that at most 8 characters can usefully be sent to it.
+  *
++ * For FreeBSD, take these values from /usr/include/pwd.h
+  * Postgres usernames are assumed to be less than NAMEDATALEN chars long.
+  */
++#if defined(__FreeBSD__)
++#define CLEAR_PASSWD_LEN   _PASSWORD_LEN
++#define CRYPTED_PASSWD_LEN _PASSWORD_LEN /* max length, not containing NULL */
++#define SALT_LEN 10
++#else
+ #define CLEAR_PASSWD_LEN 8		/* not including null */
+ #define CRYPTED_PASSWD_LEN 13	/* not including null */
++#define SALT_LEN 3
 +#endif
 +
- char	   *comname;
- static void usage(FILE *stream);
++static unsigned char itoa64[] =		/* 0 ... 63 => ascii - 64 */
++	"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
++
+ 
+ const char *progname;
+ 
+ static void usage(void);
++static void to64(char *s, long v, int n);
  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 encrypt_pwd(char key[CLEAR_PASSWD_LEN + 1],
+-			char salt[3],
++			char salt[SALT_LEN],
+ 			char passwd[CRYPTED_PASSWD_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 @@
+@@ -47,6 +66,15 @@
+ 	printf("Report bugs to <pgsql-bugs@postgresql.org>.\n");
  }
  
- 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])
++static void
++to64(char *s, long v, int n)
++{
++	while (--n >= 0) {
++		*s++ = itoa64[v&0x3f];
++		v >>= 6;
++	}
++}
++
+ typedef struct
  {
- 	int			n;
+ 	char	   *uname;
+@@ -154,7 +182,7 @@
+ 			if (q != NULL)
+ 				*(q++) = '\0';
  
-@@ -246,9 +250,9 @@
+-			if (strlen(p) != CRYPTED_PASSWD_LEN && strcmp(p, "+") != 0)
++			if (strlen(p) > CRYPTED_PASSWD_LEN && strcmp(p, "+") != 0)
+ 			{
+ 				fprintf(stderr, "%s:%d: warning: invalid password length\n",
+ 						filename, npwds + 1);
+@@ -221,15 +249,25 @@
  
- #ifdef NOT_USED
- static int
--check_pwd(char key[9], char passwd[14])
-+check_pwd(char key[9], char passwd[_PASSWORD_LEN+1])
+ static void
+ encrypt_pwd(char key[CLEAR_PASSWD_LEN + 1],
+-			char salt[3],
++			char salt[SALT_LEN],
+ 			char passwd[CRYPTED_PASSWD_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;
++#if !defined(__FreeBSD__)
+ 	int			n;
+-
++#endif
+ 	/* select a salt, if not already given */
+ 	if (salt[0] == '\0')
+ 	{
++#if defined(__FreeBSD__)
++		struct timeval tv;
++		srandomdev();
++		gettimeofday(&tv,0);
++		to64(&salt[0], random(), 3);
++		to64(&salt[3], tv.tv_usec, 3);
++		to64(&salt[6], tv.tv_sec, 2);
++		salt[8] = '\0';
+ 		srand(time(NULL));
++#else
+ 		do
+ 		{
+ 			n = rand() % 256;
+@@ -241,6 +279,7 @@
+ 		} while (!issaltchar(n));
+ 		salt[1] = n;
+ 		salt[2] = '\0';
++#endif
+ 	}
  
- 	comname = argv[0];
+ 	/* get encrypted password */
+@@ -335,7 +374,7 @@
+ 	char	   *filename;
+ 	char		bkname[MAXPGPATH];
+ 	char		username[NAMEDATALEN];
+-	char		salt[3];
++	char		salt[SALT_LEN];
+ 	char		key[CLEAR_PASSWD_LEN + 1],
+ 				key2[CLEAR_PASSWD_LEN + 1];
+ 	char		e_passwd[CRYPTED_PASSWD_LEN + 1];
diff --git a/databases/postgresql84-server/files/patch-ar b/databases/postgresql84-server/files/patch-ar
deleted file mode 100644
index c5c8096..0000000
--- a/databases/postgresql84-server/files/patch-ar
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Sun Oct 10 14:37:07 1999
-+++ configure	Sun Oct 10 14:37:29 1999
-@@ -1429,7 +1429,7 @@
-   ELF_SYS=true
- else
-   rm -rf conftest*
--  if test "X$elf" = "Xyes"
-+  if test "X$PORTOBJFORMAT" = "Xelf"
- then
- 	ELF_SYS=true
- else
diff --git a/databases/postgresql84-server/files/patch-as b/databases/postgresql84-server/files/patch-as
deleted file mode 100644
index 3282168c..0000000
--- a/databases/postgresql84-server/files/patch-as
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.global.in.orig	Sun Dec  6 00:08:56 1998
-+++ Makefile.global.in	Sat Feb 27 04:23:12 1999
-@@ -79,7 +79,7 @@
- POSTMANDIR= $(POSTGRESDIR)/man
- 
- # Where the formatted documents (e.g., the reference manual) get installed.
--POSTDOCDIR= $(POSTGRESDIR)/doc
-+POSTDOCDIR= !!PREFIX!!/share/doc/pgsql
- 
- # Where the header files necessary to build frontend programs get installed.
- HEADERDIR= $(POSTGRESDIR)/include
diff --git a/databases/postgresql84-server/files/patch-at b/databases/postgresql84-server/files/patch-at
deleted file mode 100644
index 93e68a7..0000000
--- a/databases/postgresql84-server/files/patch-at
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../doc/Makefile.orig	Sun Nov 29 06:30:13 1998
-+++ ../doc/Makefile	Mon Jun 21 17:00:13 1999
-@@ -12,7 +12,7 @@
- #
- #----------------------------------------------------------------------------
- 
--PGDOCS= $(POSTGRESDIR)/doc
-+PGDOCS= $(POSTDOCDIR)
- SRCDIR= ../src
- 
- TAR= tar
diff --git a/databases/postgresql84-server/files/patch-au b/databases/postgresql84-server/files/patch-au
deleted file mode 100644
index 340521b..0000000
--- a/databases/postgresql84-server/files/patch-au
+++ /dev/null
@@ -1,58 +0,0 @@
---- configure.in.orig	Sun Nov  5 05:03:47 2000
-+++ configure.in	Mon Dec  4 02:36:15 2000
-@@ -299,13 +299,28 @@
-    [  --with-tcl              build Tcl interfaces and pgtclsh ],
-    [
- 	case "$withval" in
--	y | ye | yes)		USE_TCL=true; USE_TK=true; AC_MSG_RESULT(enabled) ;;
-+	y | ye | yes)		USE_TCL=true; AC_MSG_RESULT(enabled) ;;
- 	*)			USE_TCL=; USE_TK=; AC_MSG_RESULT(disabled) ;;
- 	esac
-    ],
-    [ USE_TCL=; USE_TK=; AC_MSG_RESULT(disabled) ]
- )
- 
-+dnl We include tk support with tcl unless user says --without-tk
-+if test USE_TCL = true
-+then
-+AC_MSG_CHECKING(setting USE_TK)
-+AC_ARG_WITH(
-+   tk,
-+   [  --without-tk              build Tcl *without* Tk ],
-+   [
-+	case "$withval" in
-+	y | ye | yes)		USE_TK=true; USE_TK=true; AC_MSG_RESULT(enabled) ;;
-+	*)			USE_TK=n; AC_MSG_RESULT(disabled) ;;
-+	esac
-+   ]
-+)
-+fi
- export USE_TCL
- export USE_TK
- 
-@@ -482,7 +497,7 @@
- #endif
- ],
- 	ELF_SYS=true,
--[if test "X$elf" = "Xyes"
-+[if test "X$PORTOBJFORMAT" = "Xyes"
- then
- 	ELF_SYS=true
- else
-@@ -1248,10 +1263,15 @@
- 	else
- 		AC_MSG_RESULT($TCL_CONFIG_SH)
- 		AC_SUBST(TCL_CONFIG_SH)
-+		. ${TCL_CONFIG_SH}
-+		AC_SUBST(TCL_LIB_SPEC)
- 	fi
- fi
- 
--USE_TK=$USE_TCL		# If TCL is disabled, disable TK
-+USE_TK=${USE_TK:=$USE_TCL}	# If TCL is disabled, disable TK
-+				# otherwise -- enable unless explicitly
-+				# disabled
-+
- 
- dnl Check for Tk configuration script tkConfig.sh
- if test "$USE_TK" = true
diff --git a/databases/postgresql84-server/files/patch-av b/databases/postgresql84-server/files/patch-av
deleted file mode 100644
index 49b35f9..0000000
--- a/databases/postgresql84-server/files/patch-av
+++ /dev/null
@@ -1,17 +0,0 @@
---- interfaces/libpq/fe-connect.c	Sun May 21 17:19:53 2000
-+++ interfaces/libpq/fe-connect.c	Fri Sep 15 13:53:52 2000
-@@ -801 +801 @@
--			sprintf(conn->errorMessage,
-+			printfPQExpBuffer(&conn->errorMessage,
-@@ -809 +809 @@
--			sprintf(conn->errorMessage, "PQconnectDB() -- couldn't read postmaster response: errno=%d\n%s\n",
-+			printfPQExpBuffer(&conn->errorMessage, "PQconnectDB() -- couldn't read postmaster response: errno=%d\n%s\n",
-@@ -822 +822 @@
--					sprintf(conn->errorMessage,
-+					printfPQExpBuffer(&conn->errorMessage,
-@@ -832 +832 @@
--				sprintf(conn->errorMessage,
-+				printfPQExpBuffer(&conn->errorMessage,
-@@ -850 +850 @@
--			strcpy(conn->errorMessage,
-+			printfPQExpBuffer(&conn->errorMessage,
diff --git a/databases/postgresql84-server/files/patch-ba b/databases/postgresql84-server/files/patch-ba
deleted file mode 100644
index 586d725..0000000
--- a/databases/postgresql84-server/files/patch-ba
+++ /dev/null
@@ -1,17 +0,0 @@
---- interfaces/jdbc/Makefile.orig	Sun Nov  5 05:03:53 2000
-+++ interfaces/jdbc/Makefile	Fri Dec  8 03:16:17 2000
-@@ -10,10 +10,10 @@
- 
- FIND		= find
- IDL2JAVA	= idltojava -fno-cpp -fno-tie
--JAR		= jar
--JAVA		= java
--JAVAC		= javac -g
--JAVADOC		= javadoc
-+JAR		= !!JAVA_HOME!!/bin/jar
-+JAVA		= !!JAVA_HOME!!/bin/java
-+JAVAC		= !!JAVA_HOME!!/bin/javac
-+JAVADOC		= !!JAVA_HOME!!/bin/javadoc
- RM		= rm -f
- TOUCH		= touch
- 
diff --git a/databases/postgresql84-server/files/patch-bb b/databases/postgresql84-server/files/patch-bb
deleted file mode 100644
index ea0f173..0000000
--- a/databases/postgresql84-server/files/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
---- pl/tcl/Makefile~	Sat Apr 29 19:45:42 2000
-+++ pl/tcl/Makefile	Sat May 20 22:42:22 2000
-@@ -71,7 +71,9 @@
- CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS)
- 
- CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend $(PGSQL_INCLUDES)
--        
-+
-+CFLAGS+= -I$(TCL_INCDIR)
-+
- #
- # Uncomment the following to enable the unknown command lookup
- # on the first of all calls to the call handler. See the doc
diff --git a/databases/postgresql84-server/files/patch-bc b/databases/postgresql84-server/files/patch-bc
deleted file mode 100644
index ff747fb..0000000
--- a/databases/postgresql84-server/files/patch-bc
+++ /dev/null
@@ -1,5 +0,0 @@
---- bin/pg_ctl/postmaster.opts.default.sample~	Mon Apr 17 05:45:17 2000
-+++ bin/pg_ctl/postmaster.opts.default.sample	Tue May 23 02:46:30 2000
-@@ -1 +1 @@
--
-+-i -o "-F"
diff --git a/databases/postgresql84-server/files/patch-bd b/databases/postgresql84-server/files/patch-bd
deleted file mode 100644
index 341696b..0000000
--- a/databases/postgresql84-server/files/patch-bd
+++ /dev/null
@@ -1,42 +0,0 @@
-Here are the two extra patch files that will allow PostgreSQL to
-compile and run on Alpha.  The DB is 64-bit capable so really only a few
-bits of configuration for FreeBSD were needed. 
-
---- backend/main/main.c.orig    Wed Aug 30 16:05:39 2000
-+++ backend/main/main.c Wed Aug 30 16:06:10 2000
-@@ -14,7 +14,7 @@
-  */
- #include <unistd.h>
- 
--#if defined(__alpha__) && !defined(linux)
-+#if defined(__alpha__) && !defined(linux) && !defined(__FreeBSD__)
- #include <sys/sysinfo.h>
- #include "machine/hal_sysinfo.h"
- #define ASSEMBLER
-
-
-
-
-
-
-
---- include/port/freebsd.h.orig Tue Jul 13 16:12:49 1999
-+++ include/port/freebsd.h      Wed Aug 30 21:12:51 2000
-@@ -3,6 +3,12 @@
- #if defined(__i386__)
- #define NEED_I386_TAS_ASM
- #define HAS_TEST_AND_SET
-+typedef unsigned char slock_t;
-+#endif
-+
-+#if defined (__alpha__)
-+#define HAS_TEST_AND_SET
-+typedef long int slock_t;
- #endif
- 
- #if defined(__sparc__)
-@@ -28,4 +34,3 @@
- /* #   undef HAS_TEST_AND_SET */
- #endif
- 
--typedef unsigned char slock_t;
diff --git a/databases/postgresql84-server/files/patch-be b/databases/postgresql84-server/files/patch-be
deleted file mode 100644
index 2f8c3c5..0000000
--- a/databases/postgresql84-server/files/patch-be
+++ /dev/null
@@ -1,9 +0,0 @@
-This patches let you disable Tk even if you have it installed and
-makes sure the TCL-library is added as a dependency for libpgtcl.
---- interfaces/libpgtcl/Makefile.in	Tue Mar  7 20:58:36 2000
-+++ interfaces/libpgtcl/Makefile.in	Wed Sep 20 08:57:28 2000
-@@ -29,3 +29,3 @@
- 
--SHLIB_LINK+= $(LIBPQ)
-+SHLIB_LINK+= $(LIBPQ) @TCL_LIB_SPEC@
- 
diff --git a/databases/postgresql84-server/files/patch-contrib-retep-build b/databases/postgresql84-server/files/patch-contrib-retep-build
new file mode 100644
index 0000000..30df3a0
--- /dev/null
+++ b/databases/postgresql84-server/files/patch-contrib-retep-build
@@ -0,0 +1,10 @@
+--- contrib/retep/build.xml~	Fri Mar 16 22:50:36 2001
++++ contrib/retep/build.xml	Wed Apr 18 09:24:20 2001
+@@ -38,6 +38,7 @@
+   <target name="compile" depends="checks,prepare">
+     <javac srcdir="${src}" destdir="${dest}">
+       <include name="${package}/**" />
++      <exclude name="${package}/**" unless="jdk1.2+" />
+     </javac>
+   </target>
+ 
diff --git a/databases/postgresql84-server/files/patch-doc-makefile b/databases/postgresql84-server/files/patch-doc-makefile
new file mode 100644
index 0000000..fa27bed
--- /dev/null
+++ b/databases/postgresql84-server/files/patch-doc-makefile
@@ -0,0 +1,19 @@
+--- doc/Makefile~	Sun Jan  7 03:03:22 2001
++++ doc/Makefile	Wed Apr 18 08:12:30 2001
+@@ -43,10 +43,13 @@
+ 	gzip -d -c man.tar.gz | ( cd $(DESTDIR)$(mandir) && $(TAR) xf - )
+ endif
+ 
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(mandir) $(DESTDIR)$(docdir)/html
+-
++ifdef found_html
++	$(mkinstalldirs) $(DESTDIR)$(docdir)/html
++endif
++ifdef found_man
++	$(mkinstalldirs) $(DESTDIR)$(mandir)
++endif
+ 
+ uninstall:
+ ifdef found_html
diff --git a/databases/postgresql84-server/files/patch-jdbc-build-xml b/databases/postgresql84-server/files/patch-jdbc-build-xml
new file mode 100644
index 0000000..b1c703a
--- /dev/null
+++ b/databases/postgresql84-server/files/patch-jdbc-build-xml
@@ -0,0 +1,10 @@
+--- src/interfaces/jdbc/build.xml~	Fri Mar 16 22:50:43 2001
++++ src/interfaces/jdbc/build.xml	Wed Apr 18 08:57:57 2001
+@@ -120,6 +120,7 @@
+     <javac srcdir="${src}" destdir="${dest}">
+       <include name="example/**" />
+       <exclude name="example/corba/**"/>
++      <exclude name="example/blobtest.java" unless="jdk1.2+"/>
+     </javac>
+   </target>
+ 
diff --git a/databases/postgresql84-server/files/patch-jdbc1-statement b/databases/postgresql84-server/files/patch-jdbc1-statement
new file mode 100644
index 0000000..41a9a29
--- /dev/null
+++ b/databases/postgresql84-server/files/patch-jdbc1-statement
@@ -0,0 +1,13 @@
+--- src/interfaces/jdbc/org/postgresql/jdbc1/Statement.java~	Fri Feb 23 19:12:23 2001
++++ src/interfaces/jdbc/org/postgresql/jdbc1/Statement.java	Wed Apr 18 08:51:03 2001
+@@ -288,8 +288,8 @@
+ 	 */
+ 	public java.sql.ResultSet getResultSet() throws SQLException
+ 	{
+-          if (result != null) && ((org.postgresql.ResultSet)result.reallyResultSet())
+-            return result;
++          if (result != null && ((org.postgresql.ResultSet)result).reallyResultSet())
++	    return result;
+           return null;
+ 	}
+ 
diff --git a/databases/postgresql84-server/files/pgsql.sh.tmpl b/databases/postgresql84-server/files/pgsql.sh.tmpl
index 753e0b8..e775aab 100644
--- a/databases/postgresql84-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql84-server/files/pgsql.sh.tmpl
@@ -2,28 +2,29 @@
 
 # $FreeBSD$
 #
-# For postmaster startup options, edit $PGDATA/postmaster.opts.default
-# Preinstalled options are -i -o "-F"
+# For postmaster startup options, edit $PGDATA/postgresql.conf
+
+PGBIN=%%PREFIX%%/%%PG_PREFIX%%bin
 
 case $1 in
 start)
-    [ -d !!PREFIX!!/pgsql/lib ] && /sbin/ldconfig -m !!PREFIX!!/pgsql/lib
-    [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && {
+    [ -d %%PREFIX%%/%%PG_PREFIX%%lib ] && /sbin/ldconfig -m %%PREFIX%%/%%PG_PREFIX%%lib
+    [ -x ${PGBIN}/pg_ctl ] && {
 	su -l pgsql -c \
-	    'exec !!PREFIX!!/pgsql/bin/pg_ctl -w start > !!PREFIX!!/pgsql/errlog 2>&1'
+	    'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -w -l ~pgsql/errlog'
 	echo -n ' pgsql'
     }
     ;;
 
 stop)
-    [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && {
-	exec su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w -m fast stop'
+    [ -x ${PGBIN}/pg_ctl ] && {
+	exec su -l pgsql -c 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl stop -m fast'
     }
     ;;
 
 status)
-    [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && {
-	exec su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl status'
+    [ -x ${PGBIN}/pg_ctl ] && {
+	exec su -l pgsql -c 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl status'
     }
     ;;
 
diff --git a/databases/postgresql84-server/files/post-install-notes b/databases/postgresql84-server/files/post-install-notes
index f77271d..6b7192b 100644
--- a/databases/postgresql84-server/files/post-install-notes
+++ b/databases/postgresql84-server/files/post-install-notes
@@ -15,5 +15,8 @@ operations. You do NOT need to install the pgaccess port separately.
 If you built in the TCL support, you can load the Pg package into your
 TCL scripts as easily as ``package require Pgtcl''.
 
-To start PostgreSQL, run the startup script:
-%%PREFIX%%/etc/rc.d/010.pgsql.sh start
+If you built with Java support, add
+/usr/local/share/java/classes/postgresql.jar to your classpath.
+
+If you have many tables and many clients running, consider raising
+kern.maxfiles using sysctl(8).
diff --git a/databases/postgresql84-server/files/pre-install-notes b/databases/postgresql84-server/files/pre-install-notes
index 7238893..697ce3c 100644
--- a/databases/postgresql84-server/files/pre-install-notes
+++ b/databases/postgresql84-server/files/pre-install-notes
@@ -1,9 +1,21 @@
-# ----------------------------------------------------------------
-# UPGRADE NOTE! Depending on which version you are upgrading from,
-# you may have to dump/restore existing databases
-# as part of the update.
-# This is *NOT* done by this port!
-# For detailed instructions, see
-# %%WRKDIR%%/%%DISTNAME%%/INSTALL
-# after extraction.
-# --------------------------------------------------------------
+ * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
+
+The PostgreSQL port now obeys hier(7) by default, which means that it
+installs into:
+
+%%PREFIX%%/bin
+%%PREFIX%%/lib
+%%PREFIX%%/include/pgsql
+
+You *must* move away your old installation to avoid problems with
+ldconfig(8) and user's PATH:s. If you rather install using the
+old-fashion layout, cancel at next screen and run make as:
+
+$ make -DWITH_OLD_LAYOUT
+
+As always, you *must* dump existing databases before stopping and
+removing your old postgresql, as part of the update.  This is *NOT*
+done by this port!
+
+If you want JAVA support, I will try to determine your JAVA_HOME using
+javavmwrapper. If you want a different JVM, please set JAVA_HOME.
diff --git a/databases/postgresql84-server/pkg-deinstall b/databases/postgresql84-server/pkg-deinstall
deleted file mode 100644
index 9e1fa31..0000000
--- a/databases/postgresql84-server/pkg-deinstall
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# remove postgresql users
-
-case $2 in 
-
-POST-DEINSTALL)
-	pw groupdel pgsql
-	pw userdel pgsql
-	;;
-
-esac
diff --git a/databases/postgresql84-server/pkg-install b/databases/postgresql84-server/pkg-install
index edd4f36..cfc983f 100644
--- a/databases/postgresql84-server/pkg-install
+++ b/databases/postgresql84-server/pkg-install
@@ -37,6 +37,10 @@ PRE-INSTALL)
 		fi
 	fi
 
+	if ! [ -x ~pgsql ] ; then 
+		mkdir -p ${DB_DIR}
+		chown pgsql:pgsql ${DB_DIR}
+	fi
 	;;
 
 esac
diff --git a/databases/postgresql84-server/pkg-message b/databases/postgresql84-server/pkg-message
index afda878..b686422 100644
--- a/databases/postgresql84-server/pkg-message
+++ b/databases/postgresql84-server/pkg-message
@@ -1,6 +1,30 @@
-==========================================
-To initialize the database, you should run
-initdb as the "pgsql" user.
+
+======================================================================
+
+      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
+
+The PostgreSQL port now obeys hier(7) by default, which means that it
+installs into:
+
+/usr/local/bin
+/usr/local/lib
+/usr/local/include/pgsql
+
+You *must* move away your old installation from users' and
+ldconfig(8)'s PATHs. If you rather install using the old-fashion
+layout, cancel now and build the port with "make -DWITH_OLD_LAYOUT".
+
+The pgsql user's home dir is /usr/local/pgsql by default, but can be
+changed with for example chpass(1). Datadir defaults to ~pgsql/data,
+but can be changed by modifying the ~pgsql/.profile script.
+
+As always, you *must* dump existing databases before stopping and
+removing your old postgresql, as part of the update.  This is *NOT*
+done by this port!
+
+======================================================================
+
+To initialize the database, you should run initdb as the "pgsql" user.
 
 Example:
 
@@ -9,4 +33,6 @@ Example:
 You can then start PostgreSQL by running:
 
   /usr/local/etc/rc.d/010.pgsql.sh start
-==========================================
+
+For postmaster settings, see ~pgsql/data/postmaster.conf
+======================================================================
diff --git a/databases/postgresql84-server/pkg-plist b/databases/postgresql84-server/pkg-plist
index ff1866c..24bd7d9 100644
--- a/databases/postgresql84-server/pkg-plist
+++ b/databases/postgresql84-server/pkg-plist
@@ -1,95 +1,90 @@
-@unexec if cmp -s %D/pgsql/.profile %D/pgsql/dot.profile.dist; then rm -f %D/pgsql/.profile; fi
+%%PG_PREFIX%%bin/postmaster
+%%PG_PREFIX%%bin/postgres
+%%PG_PREFIX%%bin/ecpg
+%%PG_PREFIX%%bin/initdb
+%%PG_PREFIX%%bin/initlocation
+%%PG_PREFIX%%bin/ipcclean
+%%PG_PREFIX%%bin/pg_ctl
+%%PG_PREFIX%%bin/pg_dump
+%%PG_PREFIX%%bin/pg_restore
+%%PG_PREFIX%%bin/pg_encoding
+%%PG_PREFIX%%bin/pg_dumpall
+%%PG_PREFIX%%bin/pg_id
+%%PG_PREFIX%%bin/pg_passwd
+%%PG_PREFIX%%bin/psql
+%%PG_PREFIX%%bin/createdb
+%%PG_PREFIX%%bin/dropdb
+%%PG_PREFIX%%bin/createuser
+%%PG_PREFIX%%bin/dropuser
+%%PG_PREFIX%%bin/droplang
+%%PG_PREFIX%%bin/vacuumdb
+%%PG_PREFIX%%bin/createlang
+%%PG_PREFIX%%bin/pg_config
 etc/rc.d/010.pgsql.sh
-pgsql/dot.profile.dist
-@exec [ -f %D/pgsql/.profile ] || (cp %D/pgsql/dot.profile.dist %D/pgsql/.profile && chown pgsql:pgsql %D/pgsql/.profile)
-pgsql/bin/createdb
-pgsql/bin/createlang
-pgsql/bin/createuser
-pgsql/bin/dropdb
-pgsql/bin/droplang
-pgsql/bin/dropuser
-pgsql/bin/ecpg
-pgsql/bin/initdb
-pgsql/bin/initlocation
-pgsql/bin/ipcclean
-pgsql/bin/pg_ctl
-pgsql/bin/pg_dump
-pgsql/bin/pg_dumpall
-pgsql/bin/pg_encoding
-pgsql/bin/pg_id
-pgsql/bin/pg_passwd
-pgsql/bin/pg_upgrade
-pgsql/bin/pg_version
-pgsql/bin/postgres
-pgsql/bin/postmaster
-pgsql/bin/psql
-pgsql/bin/vacuumdb
-pgsql/include/access/attnum.h
-pgsql/include/c.h
-pgsql/include/commands/trigger.h
-pgsql/include/config.h
-pgsql/include/ecpgerrno.h
-pgsql/include/ecpglib.h
-pgsql/include/ecpgtype.h
-pgsql/include/executor/spi.h
-pgsql/include/fmgr.h
-pgsql/include/lib/dllist.h
-pgsql/include/libpgeasy.h
-pgsql/include/libpq/libpq-fs.h
-pgsql/include/libpq/pqcomm.h
-pgsql/include/libpq++/pgconnection.h
-pgsql/include/libpq++/pgcursordb.h
-pgsql/include/libpq++/pgdatabase.h
-pgsql/include/libpq++/pglobject.h
-pgsql/include/libpq++/pgtransdb.h
-pgsql/include/libpq++.h
-pgsql/include/libpq-fe.h
-pgsql/include/libpq-int.h
-pgsql/include/os.h
-pgsql/include/postgres.h
-pgsql/include/postgres_ext.h
-pgsql/include/pqexpbuffer.h
-pgsql/include/sql3types.h
-pgsql/include/sqlca.h
-pgsql/include/utils/elog.h
-pgsql/include/utils/geo_decls.h
-pgsql/include/utils/mcxt.h
-pgsql/include/utils/palloc.h
-pgsql/lib/global1.bki.source
-pgsql/lib/global1.description
-pgsql/lib/libecpg.a
-pgsql/lib/libecpg.so
-pgsql/lib/libecpg.so.3
-pgsql/lib/libpgeasy.a
-pgsql/lib/libpgeasy.so
-pgsql/lib/libpgeasy.so.2
-pgsql/lib/libpq++.a
-pgsql/lib/libpq++.so
-pgsql/lib/libpq++.so.3
-pgsql/lib/libpq.a
-pgsql/lib/libpq.so
-pgsql/lib/libpq.so.2
-pgsql/lib/local1_template1.bki.source
-pgsql/lib/local1_template1.description
-pgsql/lib/pg_geqo.sample
-pgsql/lib/pg_hba.conf.sample
-pgsql/lib/pg_ident.conf.sample
-pgsql/lib/pg_options.sample
-pgsql/lib/plpgsql.so
-pgsql/lib/postmaster.opts.default.sample
-@exec chown -R root:wheel %D/pgsql/lib
-pgsql/post-install-notes
-@dirrm pgsql/bin
-@dirrm pgsql/include/access
-@dirrm pgsql/include/commands
-@dirrm pgsql/include/executor
-@dirrm pgsql/include/lib
-@dirrm pgsql/include/libpq
-@dirrm pgsql/include/libpq++
-@dirrm pgsql/include/utils
-@dirrm pgsql/include
-@dirrm pgsql/lib
-@dirrm pgsql/man/man1
-@dirrm pgsql/man/manl
-@dirrm pgsql/man
-@dirrm pgsql
+%%PG_INCLUDE%%/lib/dllist.h
+@dirrm %%PG_INCLUDE%%/lib
+%%PG_INCLUDE%%/libpq/pqcomm.h
+%%PG_INCLUDE%%/libpq/libpq-fs.h
+@dirrm %%PG_INCLUDE%%/libpq
+%%PG_INCLUDE%%/libpq++/pgconnection.h
+%%PG_INCLUDE%%/libpq++/pgdatabase.h
+%%PG_INCLUDE%%/libpq++/pgtransdb.h
+%%PG_INCLUDE%%/libpq++/pgcursordb.h
+%%PG_INCLUDE%%/libpq++/pglobject.h
+@dirrm %%PG_INCLUDE%%/libpq++
+%%PG_INCLUDE%%/c.h
+%%PG_INCLUDE%%/postgres_ext.h
+%%PG_INCLUDE%%/postgres_fe.h
+%%PG_INCLUDE%%/os.h
+%%PG_INCLUDE%%/config.h
+%%PG_INCLUDE%%/libpq-fe.h
+%%PG_INCLUDE%%/libpq-int.h
+%%PG_INCLUDE%%/pqexpbuffer.h
+%%PG_INCLUDE%%/ecpgerrno.h
+%%PG_INCLUDE%%/ecpglib.h
+%%PG_INCLUDE%%/ecpgtype.h
+%%PG_INCLUDE%%/sqlca.h
+%%PG_INCLUDE%%/sql3types.h
+%%PG_INCLUDE%%/libpgeasy.h
+%%PG_INCLUDE%%/libpq++.h
+@dirrm %%PG_INCLUDE%%
+%%PG_PREFIX%%lib/libpq.so
+%%PG_PREFIX%%lib/libpq.a
+%%PG_PREFIX%%lib/libpq.so.2
+%%PG_PREFIX%%lib/libecpg.so
+%%PG_PREFIX%%lib/libecpg.a
+%%PG_PREFIX%%lib/libecpg.so.3
+%%PG_PREFIX%%lib/libpgeasy.so
+%%PG_PREFIX%%lib/libpgeasy.a
+%%PG_PREFIX%%lib/libpgeasy.so.2
+%%PG_PREFIX%%lib/libpq++.so
+%%PG_PREFIX%%lib/libpq++.a
+%%PG_PREFIX%%lib/libpq++.so.3
+%%PG_PREFIX%%lib/plpgsql.so
+share/postgresql/global.bki
+share/postgresql/global.description
+share/postgresql/post-install-notes
+share/postgresql/template1.bki
+share/postgresql/template1.description
+share/postgresql/pg_hba.conf.sample
+share/postgresql/pg_ident.conf.sample
+share/postgresql/postgresql.conf.sample
+@unexec if cmp -s ~pgsql/.profile %D/share/postgresql/dot.profile.dist; then rm -f ~pgsql/.profile; fi
+@unexec if cmp -s ~pgsql/.cshrc %D/share/postgresql/dot.cshrc.dist; then rm -f ~pgsql/.cshrc; fi
+@unexec [ -f ~pgsql/dot.profile.dist ] && rm ~pgsql/dot.profile.dist
+@unexec [ -f ~pgsql/dot.cshrc.dist ] && rm ~pgsql/dot.cshrc.dist
+@exec [ -f %D/share/postgresql/post-install-notes ] && cp %D/share/postgresql/post-install-notes ~pgsql && chown pgsql:pgsql ~pgsql/post-install-notes
+@unexec [ -f ~pgsql/post-install-notes ] && rm ~pgsql/post-install-notes
+share/postgresql/dot.profile.dist
+share/postgresql/dot.cshrc.dist
+@dirrm share/postgresql
+@exec [ -f %D/share/postgresql/dot.profile.dist ] && cp %D/share/postgresql/dot.profile.dist ~pgsql/.
+@exec [ -f %D/share/postgresql/dot.cshrc.dist ] && cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.
+@exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile)
+@exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc)
+@unexec rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true
+@unexec rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true
+@unexec rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true
+@unexec rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true
+@unexec rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true
+@unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually."
diff --git a/databases/postgresql84-server/pkg-plist.doc b/databases/postgresql84-server/pkg-plist.doc
index 06b7bd9..34366ce 100644
--- a/databases/postgresql84-server/pkg-plist.doc
+++ b/databases/postgresql84-server/pkg-plist.doc
@@ -1,888 +1,491 @@
-share/doc/pgsql/FAQ
-share/doc/pgsql/FAQ_AIX
-share/doc/pgsql/FAQ_BSDI
-share/doc/pgsql/FAQ_DEV
-share/doc/pgsql/FAQ_DigitalUnix
-share/doc/pgsql/FAQ_FreeBSD
-share/doc/pgsql/FAQ_HPUX
-share/doc/pgsql/FAQ_Irix
-share/doc/pgsql/FAQ_Linux
-share/doc/pgsql/FAQ_QNX4
-share/doc/pgsql/FAQ_SCO
-share/doc/pgsql/FAQ_Solaris
-share/doc/pgsql/README.Charsets
-share/doc/pgsql/README.NT
-share/doc/pgsql/README.fsync
-share/doc/pgsql/README.inet
-share/doc/pgsql/README.locale
-share/doc/pgsql/README.mb
-share/doc/pgsql/README.mb.jp
-share/doc/pgsql/TODO
-share/doc/pgsql/admin/admin.htm
-share/doc/pgsql/admin/admin.html
-share/doc/pgsql/admin/biblio.htm
-share/doc/pgsql/admin/c573.htm
-share/doc/pgsql/admin/c573602.htm
-share/doc/pgsql/admin/c573680.htm
-share/doc/pgsql/admin/c573717.htm
-share/doc/pgsql/admin/copyright.htm
-share/doc/pgsql/admin/disk.htm
-share/doc/pgsql/admin/index.html
-share/doc/pgsql/admin/install-win32.htm
-share/doc/pgsql/admin/install-win321073.htm
-share/doc/pgsql/admin/install-win321082.htm
-share/doc/pgsql/admin/install.htm
-share/doc/pgsql/admin/install855.htm
-share/doc/pgsql/admin/intro-ag.htm
-share/doc/pgsql/admin/intro-ag162.htm
-share/doc/pgsql/admin/layout.gif
-share/doc/pgsql/admin/layout.htm
-share/doc/pgsql/admin/manage-ag.htm
-share/doc/pgsql/admin/manage-ag1604.htm
-share/doc/pgsql/admin/manage-ag1646.htm
-share/doc/pgsql/admin/manage-ag1655.htm
-share/doc/pgsql/admin/newuser.htm
-share/doc/pgsql/admin/notation.htm
-share/doc/pgsql/admin/pg-options.htm
-share/doc/pgsql/admin/ports.htm
-share/doc/pgsql/admin/ports481.htm
-share/doc/pgsql/admin/postmaster.htm
-share/doc/pgsql/admin/preface.htm
-share/doc/pgsql/admin/recovery.htm
-share/doc/pgsql/admin/regress.htm
-share/doc/pgsql/admin/regress1861.htm
-share/doc/pgsql/admin/regress1895.htm
-share/doc/pgsql/admin/regress1941.htm
-share/doc/pgsql/admin/release.htm
-share/doc/pgsql/admin/release2009.htm
-share/doc/pgsql/admin/release2020.htm
-share/doc/pgsql/admin/release2031.htm
-share/doc/pgsql/admin/release2042.htm
-share/doc/pgsql/admin/release2124.htm
-share/doc/pgsql/admin/release2135.htm
-share/doc/pgsql/admin/release2146.htm
-share/doc/pgsql/admin/release2187.htm
-share/doc/pgsql/admin/release2203.htm
-share/doc/pgsql/admin/release2222.htm
-share/doc/pgsql/admin/release2266.htm
-share/doc/pgsql/admin/release2288.htm
-share/doc/pgsql/admin/release2303.htm
-share/doc/pgsql/admin/release2312.htm
-share/doc/pgsql/admin/release2335.htm
-share/doc/pgsql/admin/release2349.htm
-share/doc/pgsql/admin/release2352.htm
-share/doc/pgsql/admin/release2377.htm
-share/doc/pgsql/admin/release2414.htm
-share/doc/pgsql/admin/release2421.htm
-share/doc/pgsql/admin/release2428.htm
-share/doc/pgsql/admin/release2435.htm
-share/doc/pgsql/admin/release2439.htm
-share/doc/pgsql/admin/runtime.htm
-share/doc/pgsql/admin/security.htm
-share/doc/pgsql/admin/security1450.htm
-share/doc/pgsql/admin/security1485.htm
-share/doc/pgsql/admin/security1509.htm
-share/doc/pgsql/admin/security1530.htm
-share/doc/pgsql/admin/terminology.htm
-share/doc/pgsql/admin/trouble.htm
-share/doc/pgsql/admin/trouble1721.htm
-share/doc/pgsql/admin/trouble1738.htm
-share/doc/pgsql/admin/y2k.htm
-share/doc/pgsql/postgres/about.htm
-share/doc/pgsql/postgres/advanced.htm
-share/doc/pgsql/postgres/advanced27923.htm
-share/doc/pgsql/postgres/advanced27945.htm
-share/doc/pgsql/postgres/app-createdb.htm
-share/doc/pgsql/postgres/app-createlang.htm
-share/doc/pgsql/postgres/app-createuser.htm
-share/doc/pgsql/postgres/app-dropdb.htm
-share/doc/pgsql/postgres/app-droplang.htm
-share/doc/pgsql/postgres/app-dropuser.htm
-share/doc/pgsql/postgres/app-ecpg.htm
-share/doc/pgsql/postgres/app-initdb.htm
-share/doc/pgsql/postgres/app-initlocation.htm
-share/doc/pgsql/postgres/app-ipcclean.htm
-share/doc/pgsql/postgres/app-pg-passwd.htm
-share/doc/pgsql/postgres/app-pg-upgrade.htm
-share/doc/pgsql/postgres/app-pgaccess.htm
-share/doc/pgsql/postgres/app-pgadmin.htm
-share/doc/pgsql/postgres/app-pgctl.htm
-share/doc/pgsql/postgres/app-pgdump.htm
-share/doc/pgsql/postgres/app-pgdumpall.htm
-share/doc/pgsql/postgres/app-pgtclsh.htm
-share/doc/pgsql/postgres/app-pgtksh.htm
-share/doc/pgsql/postgres/app-postgres.htm
-share/doc/pgsql/postgres/app-postmaster.htm
-share/doc/pgsql/postgres/app-psql.htm
-share/doc/pgsql/postgres/app-vacuumdb.htm
-share/doc/pgsql/postgres/applications.htm
-share/doc/pgsql/postgres/arch-pg.htm
-share/doc/pgsql/postgres/arch.htm
-share/doc/pgsql/postgres/arrays.htm
-share/doc/pgsql/postgres/biblio.htm
-share/doc/pgsql/postgres/bki.htm
-share/doc/pgsql/postgres/bki26573.htm
-share/doc/pgsql/postgres/bki26657.htm
-share/doc/pgsql/postgres/bki26681.htm
-share/doc/pgsql/postgres/bki26742.htm
-share/doc/pgsql/postgres/c16883.htm
-share/doc/pgsql/postgres/c1688316912.htm
-share/doc/pgsql/postgres/c1688316990.htm
-share/doc/pgsql/postgres/c1688317027.htm
-share/doc/pgsql/postgres/c19986.htm
-share/doc/pgsql/postgres/c21722.htm
-share/doc/pgsql/postgres/c2172221764.htm
-share/doc/pgsql/postgres/c2172221782.htm
-share/doc/pgsql/postgres/c2172221924.htm
-share/doc/pgsql/postgres/c2172221936.htm
-share/doc/pgsql/postgres/c2172221956.htm
-share/doc/pgsql/postgres/c2172221961.htm
-share/doc/pgsql/postgres/c25129.htm
-share/doc/pgsql/postgres/c4091.htm
-share/doc/pgsql/postgres/c40914117.htm
-share/doc/pgsql/postgres/c40914344.htm
-share/doc/pgsql/postgres/c4362.htm
-share/doc/pgsql/postgres/c43624375.htm
-share/doc/pgsql/postgres/c4888.htm
-share/doc/pgsql/postgres/c4933.htm
-share/doc/pgsql/postgres/c49334943.htm
-share/doc/pgsql/postgres/c49334947.htm
-share/doc/pgsql/postgres/catalogs.gif
-share/doc/pgsql/postgres/clientserver.gif
-share/doc/pgsql/postgres/compiler.htm
-share/doc/pgsql/postgres/connections.gif
-share/doc/pgsql/postgres/copyright.htm
-share/doc/pgsql/postgres/cvs.htm
-share/doc/pgsql/postgres/cvs28436.htm
-share/doc/pgsql/postgres/cvs28492.htm
-share/doc/pgsql/postgres/datatype.htm
-share/doc/pgsql/postgres/datatype1038.htm
-share/doc/pgsql/postgres/datatype1070.htm
-share/doc/pgsql/postgres/datatype1134.htm
-share/doc/pgsql/postgres/datatype1649.htm
-share/doc/pgsql/postgres/datatype1681.htm
-share/doc/pgsql/postgres/datatype1920.htm
-share/doc/pgsql/postgres/datetime-appendix.htm
-share/doc/pgsql/postgres/datetime-appendix28356.htm
-share/doc/pgsql/postgres/dfunc.htm
-share/doc/pgsql/postgres/dfunc20136.htm
-share/doc/pgsql/postgres/dfunc20146.htm
-share/doc/pgsql/postgres/disk.htm
-share/doc/pgsql/postgres/docguide.htm
-share/doc/pgsql/postgres/docguide28718.htm
-share/doc/pgsql/postgres/docguide28749.htm
-share/doc/pgsql/postgres/docguide28840.htm
-share/doc/pgsql/postgres/docguide28861.htm
-share/doc/pgsql/postgres/docguide28887.htm
-share/doc/pgsql/postgres/docguide29024.htm
-share/doc/pgsql/postgres/docguide29362.htm
-share/doc/pgsql/postgres/environ.htm
-share/doc/pgsql/postgres/extend.htm
-share/doc/pgsql/postgres/extend18852.htm
-share/doc/pgsql/postgres/extend18864.htm
-share/doc/pgsql/postgres/func-ref.htm
-share/doc/pgsql/postgres/functions.htm
-share/doc/pgsql/postgres/functions2593.htm
-share/doc/pgsql/postgres/functions2733.htm
-share/doc/pgsql/postgres/functions2876.htm
-share/doc/pgsql/postgres/functions2976.htm
-share/doc/pgsql/postgres/functions3443.htm
-share/doc/pgsql/postgres/functions3641.htm
-share/doc/pgsql/postgres/geqo-biblio.htm
-share/doc/pgsql/postgres/geqo.htm
-share/doc/pgsql/postgres/geqo25594.htm
-share/doc/pgsql/postgres/geqo25617.htm
-share/doc/pgsql/postgres/geqo25655.htm
-share/doc/pgsql/postgres/gist.htm
-share/doc/pgsql/postgres/index.html
-share/doc/pgsql/postgres/indices.htm
-share/doc/pgsql/postgres/inherit.htm
-share/doc/pgsql/postgres/install-win32.htm
-share/doc/pgsql/postgres/install-win3217383.htm
-share/doc/pgsql/postgres/install-win3217392.htm
-share/doc/pgsql/postgres/install.htm
-share/doc/pgsql/postgres/install17165.htm
-share/doc/pgsql/postgres/intro.htm
-share/doc/pgsql/postgres/intro176.htm
-share/doc/pgsql/postgres/intro304.htm
-share/doc/pgsql/postgres/intro60.htm
-share/doc/pgsql/postgres/jdbc.htm
-share/doc/pgsql/postgres/jdbc24909.htm
-share/doc/pgsql/postgres/jdbc24921.htm
-share/doc/pgsql/postgres/jdbc24927.htm
-share/doc/pgsql/postgres/jdbc24935.htm
-share/doc/pgsql/postgres/jdbc24953.htm
-share/doc/pgsql/postgres/jdbc24990.htm
-share/doc/pgsql/postgres/jdbc25021.htm
-share/doc/pgsql/postgres/jdbc25026.htm
-share/doc/pgsql/postgres/jdbc25030.htm
-share/doc/pgsql/postgres/jdbc25056.htm
-share/doc/pgsql/postgres/jdbc25086.htm
-share/doc/pgsql/postgres/largeobjects.htm
-share/doc/pgsql/postgres/largeobjects21625.htm
-share/doc/pgsql/postgres/largeobjects21628.htm
-share/doc/pgsql/postgres/largeobjects21707.htm
-share/doc/pgsql/postgres/largeobjects21714.htm
-share/doc/pgsql/postgres/largeobjects21718.htm
-share/doc/pgsql/postgres/layout.gif
-share/doc/pgsql/postgres/layout.htm
-share/doc/pgsql/postgres/libpq-chapter.htm
-share/doc/pgsql/postgres/libpq-chapter22422.htm
-share/doc/pgsql/postgres/libpq-chapter22577.htm
-share/doc/pgsql/postgres/libpq-chapter22724.htm
-share/doc/pgsql/postgres/libpq-chapter22736.htm
-share/doc/pgsql/postgres/libpq-chapter22774.htm
-share/doc/pgsql/postgres/libpq-chapter22844.htm
-share/doc/pgsql/postgres/libpq-chapter22857.htm
-share/doc/pgsql/postgres/libpq-chapter22942.htm
-share/doc/pgsql/postgres/libpq-envars.htm
-share/doc/pgsql/postgres/libpq-threading.htm
-share/doc/pgsql/postgres/libpqplusplus.htm
-share/doc/pgsql/postgres/libpqplusplus23034.htm
-share/doc/pgsql/postgres/libpqplusplus23044.htm
-share/doc/pgsql/postgres/libpqplusplus23074.htm
-share/doc/pgsql/postgres/libpqplusplus23179.htm
-share/doc/pgsql/postgres/libpqplusplus23202.htm
-share/doc/pgsql/postgres/lisp.htm
-share/doc/pgsql/postgres/manage-ag.htm
-share/doc/pgsql/postgres/manage-ag17914.htm
-share/doc/pgsql/postgres/manage-ag17956.htm
-share/doc/pgsql/postgres/manage-ag17965.htm
-share/doc/pgsql/postgres/manage.htm
-share/doc/pgsql/postgres/manage4814.htm
-share/doc/pgsql/postgres/manage4838.htm
-share/doc/pgsql/postgres/manage4880.htm
-share/doc/pgsql/postgres/mvcc.htm
-share/doc/pgsql/postgres/mvcc4568.htm
-share/doc/pgsql/postgres/mvcc4621.htm
-share/doc/pgsql/postgres/mvcc4633.htm
-share/doc/pgsql/postgres/mvcc4646.htm
-share/doc/pgsql/postgres/mvcc4723.htm
-share/doc/pgsql/postgres/mvcc4744.htm
-share/doc/pgsql/postgres/newuser.htm
-share/doc/pgsql/postgres/notation.htm
-share/doc/pgsql/postgres/odbc.htm
-share/doc/pgsql/postgres/odbc24433.htm
-share/doc/pgsql/postgres/odbc24471.htm
-share/doc/pgsql/postgres/odbc24644.htm
-share/doc/pgsql/postgres/odbc24666.htm
-share/doc/pgsql/postgres/operators.htm
-share/doc/pgsql/postgres/operators2127.htm
-share/doc/pgsql/postgres/operators2198.htm
-share/doc/pgsql/postgres/operators2267.htm
-share/doc/pgsql/postgres/operators2377.htm
-share/doc/pgsql/postgres/operators2436.htm
-share/doc/pgsql/postgres/operators2490.htm
-share/doc/pgsql/postgres/overview.htm
-share/doc/pgsql/postgres/overview25194.htm
-share/doc/pgsql/postgres/overview25219.htm
-share/doc/pgsql/postgres/overview25347.htm
-share/doc/pgsql/postgres/overview25403.htm
-share/doc/pgsql/postgres/overview25457.htm
-share/doc/pgsql/postgres/page.htm
-share/doc/pgsql/postgres/page26805.htm
-share/doc/pgsql/postgres/page26819.htm
-share/doc/pgsql/postgres/part-admin.htm
-share/doc/pgsql/postgres/part-appendix.htm
-share/doc/pgsql/postgres/part-developer.htm
-share/doc/pgsql/postgres/part-interfaces.htm
-share/doc/pgsql/postgres/part-programmer.htm
-share/doc/pgsql/postgres/part-tutorial.htm
-share/doc/pgsql/postgres/part-user.htm
-share/doc/pgsql/postgres/partial-index.htm
-share/doc/pgsql/postgres/pg-options-dev.htm
-share/doc/pgsql/postgres/pg-options.htm
-share/doc/pgsql/postgres/pgeasy-chapter.htm
-share/doc/pgsql/postgres/pgtcl-pgconndefaults.htm
-share/doc/pgsql/postgres/pgtcl-pgconnect.htm
-share/doc/pgsql/postgres/pgtcl-pgdisconnect.htm
-share/doc/pgsql/postgres/pgtcl-pgexec.htm
-share/doc/pgsql/postgres/pgtcl-pglisten.htm
-share/doc/pgsql/postgres/pgtcl-pgloclose.htm
-share/doc/pgsql/postgres/pgtcl-pglocreat.htm
-share/doc/pgsql/postgres/pgtcl-pgloexport.htm
-share/doc/pgsql/postgres/pgtcl-pgloimport.htm
-share/doc/pgsql/postgres/pgtcl-pglolseek.htm
-share/doc/pgsql/postgres/pgtcl-pgloopen.htm
-share/doc/pgsql/postgres/pgtcl-pgloread.htm
-share/doc/pgsql/postgres/pgtcl-pglotell.htm
-share/doc/pgsql/postgres/pgtcl-pglounlink.htm
-share/doc/pgsql/postgres/pgtcl-pglowrite.htm
-share/doc/pgsql/postgres/pgtcl-pgresult.htm
-share/doc/pgsql/postgres/pgtcl-pgselect.htm
-share/doc/pgsql/postgres/pgtcl.htm
-share/doc/pgsql/postgres/pgtcl23317.htm
-share/doc/pgsql/postgres/pgtcl23321.htm
-share/doc/pgsql/postgres/pl-perl.htm
-share/doc/pgsql/postgres/pl-perl4533.htm
-share/doc/pgsql/postgres/pl-perl4542.htm
-share/doc/pgsql/postgres/ports.htm
-share/doc/pgsql/postgres/ports16791.htm
-share/doc/pgsql/postgres/postgres.htm
-share/doc/pgsql/postgres/postgres.html
-share/doc/pgsql/postgres/postmaster.htm
-share/doc/pgsql/postgres/preface.htm
-share/doc/pgsql/postgres/protocol.htm
-share/doc/pgsql/postgres/protocol25770.htm
-share/doc/pgsql/postgres/protocol25925.htm
-share/doc/pgsql/postgres/protocol25962.htm
-share/doc/pgsql/postgres/query.htm
-share/doc/pgsql/postgres/query27752.htm
-share/doc/pgsql/postgres/query27768.htm
-share/doc/pgsql/postgres/query27790.htm
-share/doc/pgsql/postgres/query27799.htm
-share/doc/pgsql/postgres/query27817.htm
-share/doc/pgsql/postgres/query27825.htm
-share/doc/pgsql/postgres/query27844.htm
-share/doc/pgsql/postgres/query27849.htm
-share/doc/pgsql/postgres/query27856.htm
-share/doc/pgsql/postgres/recovery.htm
-share/doc/pgsql/postgres/regress.htm
-share/doc/pgsql/postgres/regress18171.htm
-share/doc/pgsql/postgres/regress18205.htm
-share/doc/pgsql/postgres/regress18251.htm
-share/doc/pgsql/postgres/release.htm
-share/doc/pgsql/postgres/release18319.htm
-share/doc/pgsql/postgres/release18330.htm
-share/doc/pgsql/postgres/release18341.htm
-share/doc/pgsql/postgres/release18352.htm
-share/doc/pgsql/postgres/release18434.htm
-share/doc/pgsql/postgres/release18445.htm
-share/doc/pgsql/postgres/release18456.htm
-share/doc/pgsql/postgres/release18497.htm
-share/doc/pgsql/postgres/release18513.htm
-share/doc/pgsql/postgres/release18532.htm
-share/doc/pgsql/postgres/release18576.htm
-share/doc/pgsql/postgres/release18598.htm
-share/doc/pgsql/postgres/release18613.htm
-share/doc/pgsql/postgres/release18622.htm
-share/doc/pgsql/postgres/release18645.htm
-share/doc/pgsql/postgres/release18659.htm
-share/doc/pgsql/postgres/release18662.htm
-share/doc/pgsql/postgres/release18687.htm
-share/doc/pgsql/postgres/release18724.htm
-share/doc/pgsql/postgres/release18731.htm
-share/doc/pgsql/postgres/release18738.htm
-share/doc/pgsql/postgres/release18745.htm
-share/doc/pgsql/postgres/release18749.htm
-share/doc/pgsql/postgres/rules.htm
-share/doc/pgsql/postgres/rules19478.htm
-share/doc/pgsql/postgres/rules19639.htm
-share/doc/pgsql/postgres/rules19770.htm
-share/doc/pgsql/postgres/rules19784.htm
-share/doc/pgsql/postgres/runtime.htm
-share/doc/pgsql/postgres/security.htm
-share/doc/pgsql/postgres/security17760.htm
-share/doc/pgsql/postgres/security17795.htm
-share/doc/pgsql/postgres/security17819.htm
-share/doc/pgsql/postgres/security17840.htm
-share/doc/pgsql/postgres/signals.htm
-share/doc/pgsql/postgres/spi-spiconnect.htm
-share/doc/pgsql/postgres/spi-spicopytuple.htm
-share/doc/pgsql/postgres/spi-spiexec.htm
-share/doc/pgsql/postgres/spi-spiexecp.htm
-share/doc/pgsql/postgres/spi-spifinish.htm
-share/doc/pgsql/postgres/spi-spifname.htm
-share/doc/pgsql/postgres/spi-spifnumber.htm
-share/doc/pgsql/postgres/spi-spigetbinval.htm
-share/doc/pgsql/postgres/spi-spigetrelname.htm
-share/doc/pgsql/postgres/spi-spigettype.htm
-share/doc/pgsql/postgres/spi-spigettypeid.htm
-share/doc/pgsql/postgres/spi-spigetvalue.htm
-share/doc/pgsql/postgres/spi-spimodifytuple.htm
-share/doc/pgsql/postgres/spi-spipalloc.htm
-share/doc/pgsql/postgres/spi-spipfree.htm
-share/doc/pgsql/postgres/spi-spiprepare.htm
-share/doc/pgsql/postgres/spi-spirepalloc.htm
-share/doc/pgsql/postgres/spi-spisaveplan.htm
-share/doc/pgsql/postgres/spi.htm
-share/doc/pgsql/postgres/spi20808.htm
-share/doc/pgsql/postgres/spi21521.htm
-share/doc/pgsql/postgres/spi21543.htm
-share/doc/pgsql/postgres/spi21548.htm
-share/doc/pgsql/postgres/sql-abort.htm
-share/doc/pgsql/postgres/sql-altergroup.htm
-share/doc/pgsql/postgres/sql-altertable.htm
-share/doc/pgsql/postgres/sql-alteruser.htm
-share/doc/pgsql/postgres/sql-begin.htm
-share/doc/pgsql/postgres/sql-close.htm
-share/doc/pgsql/postgres/sql-cluster.htm
-share/doc/pgsql/postgres/sql-commands.htm
-share/doc/pgsql/postgres/sql-comment.htm
-share/doc/pgsql/postgres/sql-commit.htm
-share/doc/pgsql/postgres/sql-copy.htm
-share/doc/pgsql/postgres/sql-createaggregate.htm
-share/doc/pgsql/postgres/sql-createconstraint.htm
-share/doc/pgsql/postgres/sql-createdatabase.htm
-share/doc/pgsql/postgres/sql-createfunction.htm
-share/doc/pgsql/postgres/sql-creategroup.htm
-share/doc/pgsql/postgres/sql-createindex.htm
-share/doc/pgsql/postgres/sql-createlanguage.htm
-share/doc/pgsql/postgres/sql-createoperator.htm
-share/doc/pgsql/postgres/sql-createrule.htm
-share/doc/pgsql/postgres/sql-createsequence.htm
-share/doc/pgsql/postgres/sql-createtable.htm
-share/doc/pgsql/postgres/sql-createtableas.htm
-share/doc/pgsql/postgres/sql-createtrigger.htm
-share/doc/pgsql/postgres/sql-createtype.htm
-share/doc/pgsql/postgres/sql-createuser.htm
-share/doc/pgsql/postgres/sql-createview.htm
-share/doc/pgsql/postgres/sql-declare.htm
-share/doc/pgsql/postgres/sql-delete.htm
-share/doc/pgsql/postgres/sql-dropaggregate.htm
-share/doc/pgsql/postgres/sql-dropdatabase.htm
-share/doc/pgsql/postgres/sql-dropfunction.htm
-share/doc/pgsql/postgres/sql-dropgroup.htm
-share/doc/pgsql/postgres/sql-dropindex.htm
-share/doc/pgsql/postgres/sql-droplanguage.htm
-share/doc/pgsql/postgres/sql-dropoperator.htm
-share/doc/pgsql/postgres/sql-droprule.htm
-share/doc/pgsql/postgres/sql-dropsequence.htm
-share/doc/pgsql/postgres/sql-droptable.htm
-share/doc/pgsql/postgres/sql-droptrigger.htm
-share/doc/pgsql/postgres/sql-droptype.htm
-share/doc/pgsql/postgres/sql-dropuser.htm
-share/doc/pgsql/postgres/sql-dropview.htm
-share/doc/pgsql/postgres/sql-end.htm
-share/doc/pgsql/postgres/sql-explain.htm
-share/doc/pgsql/postgres/sql-fetch.htm
-share/doc/pgsql/postgres/sql-grant.htm
-share/doc/pgsql/postgres/sql-insert.htm
-share/doc/pgsql/postgres/sql-language.htm
-share/doc/pgsql/postgres/sql-listen.htm
-share/doc/pgsql/postgres/sql-load.htm
-share/doc/pgsql/postgres/sql-lock.htm
-share/doc/pgsql/postgres/sql-move.htm
-share/doc/pgsql/postgres/sql-notify.htm
-share/doc/pgsql/postgres/sql-reindex.htm
-share/doc/pgsql/postgres/sql-reset.htm
-share/doc/pgsql/postgres/sql-revoke.htm
-share/doc/pgsql/postgres/sql-rollback.htm
-share/doc/pgsql/postgres/sql-select.htm
-share/doc/pgsql/postgres/sql-selectinto.htm
-share/doc/pgsql/postgres/sql-set.htm
-share/doc/pgsql/postgres/sql-show.htm
-share/doc/pgsql/postgres/sql-truncate.htm
-share/doc/pgsql/postgres/sql-unlisten.htm
-share/doc/pgsql/postgres/sql-update.htm
-share/doc/pgsql/postgres/sql-vacuum.htm
-share/doc/pgsql/postgres/sql.htm
-share/doc/pgsql/postgres/sql26902.htm
-share/doc/pgsql/postgres/sql27020.htm
-share/doc/pgsql/postgres/start.htm
-share/doc/pgsql/postgres/start27628.htm
-share/doc/pgsql/postgres/start27650.htm
-share/doc/pgsql/postgres/storage.htm
-share/doc/pgsql/postgres/syntax.htm
-share/doc/pgsql/postgres/syntax519.htm
-share/doc/pgsql/postgres/syntax525.htm
-share/doc/pgsql/postgres/syntax543.htm
-share/doc/pgsql/postgres/syntax608.htm
-share/doc/pgsql/postgres/syntax653.htm
-share/doc/pgsql/postgres/syntax658.htm
-share/doc/pgsql/postgres/terminology.htm
-share/doc/pgsql/postgres/triggers.htm
-share/doc/pgsql/postgres/triggers20224.htm
-share/doc/pgsql/postgres/triggers20281.htm
-share/doc/pgsql/postgres/triggers20290.htm
-share/doc/pgsql/postgres/trouble.htm
-share/doc/pgsql/postgres/trouble18031.htm
-share/doc/pgsql/postgres/trouble18048.htm
-share/doc/pgsql/postgres/typeconv.htm
-share/doc/pgsql/postgres/typeconv3759.htm
-share/doc/pgsql/postgres/typeconv3822.htm
-share/doc/pgsql/postgres/typeconv3875.htm
-share/doc/pgsql/postgres/typeconv3895.htm
-share/doc/pgsql/postgres/utilities.htm
-share/doc/pgsql/postgres/xaggr.htm
-share/doc/pgsql/postgres/xfunc.htm
-share/doc/pgsql/postgres/xfunc19011.htm
-share/doc/pgsql/postgres/xfunc19017.htm
-share/doc/pgsql/postgres/xfunc19022.htm
-share/doc/pgsql/postgres/xfunc19254.htm
-share/doc/pgsql/postgres/xindex.htm
-share/doc/pgsql/postgres/xoper.htm
-share/doc/pgsql/postgres/xplang.htm
-share/doc/pgsql/postgres/xtypes.htm
-share/doc/pgsql/postgres/y2k.htm
-share/doc/pgsql/programmer/arch-pg.htm
-share/doc/pgsql/programmer/biblio.htm
-share/doc/pgsql/programmer/bki.htm
-share/doc/pgsql/programmer/bki8058.htm
-share/doc/pgsql/programmer/bki8142.htm
-share/doc/pgsql/programmer/bki8166.htm
-share/doc/pgsql/programmer/bki8227.htm
-share/doc/pgsql/programmer/c1486.htm
-share/doc/pgsql/programmer/c5391.htm
-share/doc/pgsql/programmer/c53915433.htm
-share/doc/pgsql/programmer/c53915451.htm
-share/doc/pgsql/programmer/c53915593.htm
-share/doc/pgsql/programmer/c53915605.htm
-share/doc/pgsql/programmer/c53915625.htm
-share/doc/pgsql/programmer/c53915630.htm
-share/doc/pgsql/programmer/c6614.htm
-share/doc/pgsql/programmer/catalogs.gif
-share/doc/pgsql/programmer/compiler.htm
-share/doc/pgsql/programmer/connections.gif
-share/doc/pgsql/programmer/copyright.htm
-share/doc/pgsql/programmer/cvs.htm
-share/doc/pgsql/programmer/cvs8365.htm
-share/doc/pgsql/programmer/cvs8421.htm
-share/doc/pgsql/programmer/dfunc.htm
-share/doc/pgsql/programmer/dfunc1679.htm
-share/doc/pgsql/programmer/dfunc1689.htm
-share/doc/pgsql/programmer/docguide.htm
-share/doc/pgsql/programmer/docguide8647.htm
-share/doc/pgsql/programmer/docguide8678.htm
-share/doc/pgsql/programmer/docguide8769.htm
-share/doc/pgsql/programmer/docguide8790.htm
-share/doc/pgsql/programmer/docguide8816.htm
-share/doc/pgsql/programmer/docguide8953.htm
-share/doc/pgsql/programmer/docguide9291.htm
-share/doc/pgsql/programmer/extend.htm
-share/doc/pgsql/programmer/extend352.htm
-share/doc/pgsql/programmer/extend364.htm
-share/doc/pgsql/programmer/geqo-biblio.htm
-share/doc/pgsql/programmer/geqo.htm
-share/doc/pgsql/programmer/geqo7079.htm
-share/doc/pgsql/programmer/geqo7102.htm
-share/doc/pgsql/programmer/geqo7140.htm
-share/doc/pgsql/programmer/gist.htm
-share/doc/pgsql/programmer/index.html
-share/doc/pgsql/programmer/intro-pg.htm
-share/doc/pgsql/programmer/intro-pg167.htm
-share/doc/pgsql/programmer/jdbc.htm
-share/doc/pgsql/programmer/jdbc6398.htm
-share/doc/pgsql/programmer/jdbc6410.htm
-share/doc/pgsql/programmer/jdbc6416.htm
-share/doc/pgsql/programmer/jdbc6424.htm
-share/doc/pgsql/programmer/jdbc6442.htm
-share/doc/pgsql/programmer/jdbc6479.htm
-share/doc/pgsql/programmer/jdbc6510.htm
-share/doc/pgsql/programmer/jdbc6515.htm
-share/doc/pgsql/programmer/jdbc6519.htm
-share/doc/pgsql/programmer/jdbc6545.htm
-share/doc/pgsql/programmer/jdbc6575.htm
-share/doc/pgsql/programmer/largeobjects.htm
-share/doc/pgsql/programmer/largeobjects3114.htm
-share/doc/pgsql/programmer/largeobjects3117.htm
-share/doc/pgsql/programmer/largeobjects3196.htm
-share/doc/pgsql/programmer/largeobjects3203.htm
-share/doc/pgsql/programmer/largeobjects3207.htm
-share/doc/pgsql/programmer/libpq-chapter.htm
-share/doc/pgsql/programmer/libpq-chapter3419.htm
-share/doc/pgsql/programmer/libpq-chapter3574.htm
-share/doc/pgsql/programmer/libpq-chapter3721.htm
-share/doc/pgsql/programmer/libpq-chapter3733.htm
-share/doc/pgsql/programmer/libpq-chapter3771.htm
-share/doc/pgsql/programmer/libpq-chapter3841.htm
-share/doc/pgsql/programmer/libpq-chapter3854.htm
-share/doc/pgsql/programmer/libpq-chapter3939.htm
-share/doc/pgsql/programmer/libpq-envars.htm
-share/doc/pgsql/programmer/libpq-threading.htm
-share/doc/pgsql/programmer/libpqplusplus.htm
-share/doc/pgsql/programmer/libpqplusplus4031.htm
-share/doc/pgsql/programmer/libpqplusplus4041.htm
-share/doc/pgsql/programmer/libpqplusplus4071.htm
-share/doc/pgsql/programmer/libpqplusplus4176.htm
-share/doc/pgsql/programmer/libpqplusplus4199.htm
-share/doc/pgsql/programmer/lisp.htm
-share/doc/pgsql/programmer/notation.htm
-share/doc/pgsql/programmer/odbc.htm
-share/doc/pgsql/programmer/odbc5922.htm
-share/doc/pgsql/programmer/odbc5960.htm
-share/doc/pgsql/programmer/odbc6133.htm
-share/doc/pgsql/programmer/odbc6155.htm
-share/doc/pgsql/programmer/overview.htm
-share/doc/pgsql/programmer/overview6679.htm
-share/doc/pgsql/programmer/overview6704.htm
-share/doc/pgsql/programmer/overview6832.htm
-share/doc/pgsql/programmer/overview6888.htm
-share/doc/pgsql/programmer/overview6942.htm
-share/doc/pgsql/programmer/page.htm
-share/doc/pgsql/programmer/page8290.htm
-share/doc/pgsql/programmer/page8304.htm
-share/doc/pgsql/programmer/pg-options-dev.htm
-share/doc/pgsql/programmer/pgeasy-chapter.htm
-share/doc/pgsql/programmer/pgtcl-pgconndefaults.htm
-share/doc/pgsql/programmer/pgtcl-pgconnect.htm
-share/doc/pgsql/programmer/pgtcl-pgdisconnect.htm
-share/doc/pgsql/programmer/pgtcl-pgexec.htm
-share/doc/pgsql/programmer/pgtcl-pglisten.htm
-share/doc/pgsql/programmer/pgtcl-pgloclose.htm
-share/doc/pgsql/programmer/pgtcl-pglocreat.htm
-share/doc/pgsql/programmer/pgtcl-pgloexport.htm
-share/doc/pgsql/programmer/pgtcl-pgloimport.htm
-share/doc/pgsql/programmer/pgtcl-pglolseek.htm
-share/doc/pgsql/programmer/pgtcl-pgloopen.htm
-share/doc/pgsql/programmer/pgtcl-pgloread.htm
-share/doc/pgsql/programmer/pgtcl-pglotell.htm
-share/doc/pgsql/programmer/pgtcl-pglounlink.htm
-share/doc/pgsql/programmer/pgtcl-pglowrite.htm
-share/doc/pgsql/programmer/pgtcl-pgresult.htm
-share/doc/pgsql/programmer/pgtcl-pgselect.htm
-share/doc/pgsql/programmer/pgtcl.htm
-share/doc/pgsql/programmer/pgtcl4314.htm
-share/doc/pgsql/programmer/pgtcl4318.htm
-share/doc/pgsql/programmer/preface.htm
-share/doc/pgsql/programmer/programmer.htm
-share/doc/pgsql/programmer/programmer.html
-share/doc/pgsql/programmer/protocol.htm
-share/doc/pgsql/programmer/protocol7255.htm
-share/doc/pgsql/programmer/protocol7410.htm
-share/doc/pgsql/programmer/protocol7447.htm
-share/doc/pgsql/programmer/rules.htm
-share/doc/pgsql/programmer/rules1139.htm
-share/doc/pgsql/programmer/rules1270.htm
-share/doc/pgsql/programmer/rules1284.htm
-share/doc/pgsql/programmer/rules978.htm
-share/doc/pgsql/programmer/signals.htm
-share/doc/pgsql/programmer/spi-spiconnect.htm
-share/doc/pgsql/programmer/spi-spicopytuple.htm
-share/doc/pgsql/programmer/spi-spiexec.htm
-share/doc/pgsql/programmer/spi-spiexecp.htm
-share/doc/pgsql/programmer/spi-spifinish.htm
-share/doc/pgsql/programmer/spi-spifname.htm
-share/doc/pgsql/programmer/spi-spifnumber.htm
-share/doc/pgsql/programmer/spi-spigetbinval.htm
-share/doc/pgsql/programmer/spi-spigetrelname.htm
-share/doc/pgsql/programmer/spi-spigettype.htm
-share/doc/pgsql/programmer/spi-spigettypeid.htm
-share/doc/pgsql/programmer/spi-spigetvalue.htm
-share/doc/pgsql/programmer/spi-spimodifytuple.htm
-share/doc/pgsql/programmer/spi-spipalloc.htm
-share/doc/pgsql/programmer/spi-spipfree.htm
-share/doc/pgsql/programmer/spi-spiprepare.htm
-share/doc/pgsql/programmer/spi-spirepalloc.htm
-share/doc/pgsql/programmer/spi-spisaveplan.htm
-share/doc/pgsql/programmer/spi.htm
-share/doc/pgsql/programmer/spi2351.htm
-share/doc/pgsql/programmer/spi3064.htm
-share/doc/pgsql/programmer/spi3086.htm
-share/doc/pgsql/programmer/spi3091.htm
-share/doc/pgsql/programmer/terminology.htm
-share/doc/pgsql/programmer/triggers.htm
-share/doc/pgsql/programmer/triggers1767.htm
-share/doc/pgsql/programmer/triggers1824.htm
-share/doc/pgsql/programmer/triggers1833.htm
-share/doc/pgsql/programmer/xaggr.htm
-share/doc/pgsql/programmer/xfunc.htm
-share/doc/pgsql/programmer/xfunc511.htm
-share/doc/pgsql/programmer/xfunc517.htm
-share/doc/pgsql/programmer/xfunc522.htm
-share/doc/pgsql/programmer/xfunc754.htm
-share/doc/pgsql/programmer/xindex.htm
-share/doc/pgsql/programmer/xoper.htm
-share/doc/pgsql/programmer/xplang.htm
-share/doc/pgsql/programmer/xtypes.htm
-share/doc/pgsql/programmer/y2k.htm
-share/doc/pgsql/tutorial/about.htm
-share/doc/pgsql/tutorial/advanced.htm
-share/doc/pgsql/tutorial/advanced1511.htm
-share/doc/pgsql/tutorial/advanced1533.htm
-share/doc/pgsql/tutorial/arch.htm
-share/doc/pgsql/tutorial/biblio.htm
-share/doc/pgsql/tutorial/clientserver.gif
-share/doc/pgsql/tutorial/copyright.htm
-share/doc/pgsql/tutorial/f17.htm
-share/doc/pgsql/tutorial/index.html
-share/doc/pgsql/tutorial/intro.htm
-share/doc/pgsql/tutorial/intro172.htm
-share/doc/pgsql/tutorial/intro300.htm
-share/doc/pgsql/tutorial/intro56.htm
-share/doc/pgsql/tutorial/notation.htm
-share/doc/pgsql/tutorial/query.htm
-share/doc/pgsql/tutorial/query1340.htm
-share/doc/pgsql/tutorial/query1356.htm
-share/doc/pgsql/tutorial/query1378.htm
-share/doc/pgsql/tutorial/query1387.htm
-share/doc/pgsql/tutorial/query1405.htm
-share/doc/pgsql/tutorial/query1413.htm
-share/doc/pgsql/tutorial/query1432.htm
-share/doc/pgsql/tutorial/query1437.htm
-share/doc/pgsql/tutorial/query1444.htm
-share/doc/pgsql/tutorial/sql-language.htm
-share/doc/pgsql/tutorial/sql.htm
-share/doc/pgsql/tutorial/sql490.htm
-share/doc/pgsql/tutorial/sql608.htm
-share/doc/pgsql/tutorial/start.htm
-share/doc/pgsql/tutorial/start1216.htm
-share/doc/pgsql/tutorial/start1238.htm
-share/doc/pgsql/tutorial/terminology.htm
-share/doc/pgsql/tutorial/tutorial.htm
-share/doc/pgsql/tutorial/tutorial.html
-share/doc/pgsql/tutorial/y2k.htm
-share/doc/pgsql/user/about.htm
-share/doc/pgsql/user/app-createdb.htm
-share/doc/pgsql/user/app-createlang.htm
-share/doc/pgsql/user/app-createuser.htm
-share/doc/pgsql/user/app-dropdb.htm
-share/doc/pgsql/user/app-droplang.htm
-share/doc/pgsql/user/app-dropuser.htm
-share/doc/pgsql/user/app-ecpg.htm
-share/doc/pgsql/user/app-initdb.htm
-share/doc/pgsql/user/app-initlocation.htm
-share/doc/pgsql/user/app-ipcclean.htm
-share/doc/pgsql/user/app-pg-passwd.htm
-share/doc/pgsql/user/app-pg-upgrade.htm
-share/doc/pgsql/user/app-pgaccess.htm
-share/doc/pgsql/user/app-pgadmin.htm
-share/doc/pgsql/user/app-pgctl.htm
-share/doc/pgsql/user/app-pgdump.htm
-share/doc/pgsql/user/app-pgdumpall.htm
-share/doc/pgsql/user/app-pgtclsh.htm
-share/doc/pgsql/user/app-pgtksh.htm
-share/doc/pgsql/user/app-postgres.htm
-share/doc/pgsql/user/app-postmaster.htm
-share/doc/pgsql/user/app-psql.htm
-share/doc/pgsql/user/app-vacuumdb.htm
-share/doc/pgsql/user/applications.htm
-share/doc/pgsql/user/arrays.htm
-share/doc/pgsql/user/biblio.htm
-share/doc/pgsql/user/c4087.htm
-share/doc/pgsql/user/c40874113.htm
-share/doc/pgsql/user/c40874340.htm
-share/doc/pgsql/user/c4358.htm
-share/doc/pgsql/user/c43584371.htm
-share/doc/pgsql/user/c4884.htm
-share/doc/pgsql/user/c4929.htm
-share/doc/pgsql/user/c49294939.htm
-share/doc/pgsql/user/c49294943.htm
-share/doc/pgsql/user/copyright.htm
-share/doc/pgsql/user/datatype.htm
-share/doc/pgsql/user/datatype1034.htm
-share/doc/pgsql/user/datatype1066.htm
-share/doc/pgsql/user/datatype1130.htm
-share/doc/pgsql/user/datatype1645.htm
-share/doc/pgsql/user/datatype1677.htm
-share/doc/pgsql/user/datatype1916.htm
-share/doc/pgsql/user/datetime-appendix.htm
-share/doc/pgsql/user/datetime-appendix16981.htm
-share/doc/pgsql/user/environ.htm
-share/doc/pgsql/user/functions.htm
-share/doc/pgsql/user/functions2589.htm
-share/doc/pgsql/user/functions2729.htm
-share/doc/pgsql/user/functions2872.htm
-share/doc/pgsql/user/functions2972.htm
-share/doc/pgsql/user/functions3439.htm
-share/doc/pgsql/user/functions3637.htm
-share/doc/pgsql/user/index.html
-share/doc/pgsql/user/indices.htm
-share/doc/pgsql/user/inherit.htm
-share/doc/pgsql/user/intro.htm
-share/doc/pgsql/user/intro172.htm
-share/doc/pgsql/user/intro300.htm
-share/doc/pgsql/user/intro56.htm
-share/doc/pgsql/user/manage.htm
-share/doc/pgsql/user/manage4810.htm
-share/doc/pgsql/user/manage4834.htm
-share/doc/pgsql/user/manage4876.htm
-share/doc/pgsql/user/mvcc.htm
-share/doc/pgsql/user/mvcc4564.htm
-share/doc/pgsql/user/mvcc4617.htm
-share/doc/pgsql/user/mvcc4629.htm
-share/doc/pgsql/user/mvcc4642.htm
-share/doc/pgsql/user/mvcc4719.htm
-share/doc/pgsql/user/mvcc4740.htm
-share/doc/pgsql/user/notation.htm
-share/doc/pgsql/user/operators.htm
-share/doc/pgsql/user/operators2123.htm
-share/doc/pgsql/user/operators2194.htm
-share/doc/pgsql/user/operators2263.htm
-share/doc/pgsql/user/operators2373.htm
-share/doc/pgsql/user/operators2432.htm
-share/doc/pgsql/user/operators2486.htm
-share/doc/pgsql/user/partial-index.htm
-share/doc/pgsql/user/pl-perl.htm
-share/doc/pgsql/user/pl-perl4529.htm
-share/doc/pgsql/user/pl-perl4538.htm
-share/doc/pgsql/user/preface.htm
-share/doc/pgsql/user/sql-abort.htm
-share/doc/pgsql/user/sql-altergroup.htm
-share/doc/pgsql/user/sql-altertable.htm
-share/doc/pgsql/user/sql-alteruser.htm
-share/doc/pgsql/user/sql-begin.htm
-share/doc/pgsql/user/sql-close.htm
-share/doc/pgsql/user/sql-cluster.htm
-share/doc/pgsql/user/sql-commands.htm
-share/doc/pgsql/user/sql-comment.htm
-share/doc/pgsql/user/sql-commit.htm
-share/doc/pgsql/user/sql-copy.htm
-share/doc/pgsql/user/sql-createaggregate.htm
-share/doc/pgsql/user/sql-createconstraint.htm
-share/doc/pgsql/user/sql-createdatabase.htm
-share/doc/pgsql/user/sql-createfunction.htm
-share/doc/pgsql/user/sql-creategroup.htm
-share/doc/pgsql/user/sql-createindex.htm
-share/doc/pgsql/user/sql-createlanguage.htm
-share/doc/pgsql/user/sql-createoperator.htm
-share/doc/pgsql/user/sql-createrule.htm
-share/doc/pgsql/user/sql-createsequence.htm
-share/doc/pgsql/user/sql-createtable.htm
-share/doc/pgsql/user/sql-createtableas.htm
-share/doc/pgsql/user/sql-createtrigger.htm
-share/doc/pgsql/user/sql-createtype.htm
-share/doc/pgsql/user/sql-createuser.htm
-share/doc/pgsql/user/sql-createview.htm
-share/doc/pgsql/user/sql-declare.htm
-share/doc/pgsql/user/sql-delete.htm
-share/doc/pgsql/user/sql-dropaggregate.htm
-share/doc/pgsql/user/sql-dropdatabase.htm
-share/doc/pgsql/user/sql-dropfunction.htm
-share/doc/pgsql/user/sql-dropgroup.htm
-share/doc/pgsql/user/sql-dropindex.htm
-share/doc/pgsql/user/sql-droplanguage.htm
-share/doc/pgsql/user/sql-dropoperator.htm
-share/doc/pgsql/user/sql-droprule.htm
-share/doc/pgsql/user/sql-dropsequence.htm
-share/doc/pgsql/user/sql-droptable.htm
-share/doc/pgsql/user/sql-droptrigger.htm
-share/doc/pgsql/user/sql-droptype.htm
-share/doc/pgsql/user/sql-dropuser.htm
-share/doc/pgsql/user/sql-dropview.htm
-share/doc/pgsql/user/sql-end.htm
-share/doc/pgsql/user/sql-explain.htm
-share/doc/pgsql/user/sql-fetch.htm
-share/doc/pgsql/user/sql-grant.htm
-share/doc/pgsql/user/sql-insert.htm
-share/doc/pgsql/user/sql-listen.htm
-share/doc/pgsql/user/sql-load.htm
-share/doc/pgsql/user/sql-lock.htm
-share/doc/pgsql/user/sql-move.htm
-share/doc/pgsql/user/sql-notify.htm
-share/doc/pgsql/user/sql-reindex.htm
-share/doc/pgsql/user/sql-reset.htm
-share/doc/pgsql/user/sql-revoke.htm
-share/doc/pgsql/user/sql-rollback.htm
-share/doc/pgsql/user/sql-select.htm
-share/doc/pgsql/user/sql-selectinto.htm
-share/doc/pgsql/user/sql-set.htm
-share/doc/pgsql/user/sql-show.htm
-share/doc/pgsql/user/sql-truncate.htm
-share/doc/pgsql/user/sql-unlisten.htm
-share/doc/pgsql/user/sql-update.htm
-share/doc/pgsql/user/sql-vacuum.htm
-share/doc/pgsql/user/storage.htm
-share/doc/pgsql/user/syntax.htm
-share/doc/pgsql/user/syntax515.htm
-share/doc/pgsql/user/syntax521.htm
-share/doc/pgsql/user/syntax539.htm
-share/doc/pgsql/user/syntax604.htm
-share/doc/pgsql/user/syntax649.htm
-share/doc/pgsql/user/syntax654.htm
-share/doc/pgsql/user/terminology.htm
-share/doc/pgsql/user/typeconv.htm
-share/doc/pgsql/user/typeconv3755.htm
-share/doc/pgsql/user/typeconv3818.htm
-share/doc/pgsql/user/typeconv3871.htm
-share/doc/pgsql/user/typeconv3891.htm
-share/doc/pgsql/user/user.htm
-share/doc/pgsql/user/user.html
-share/doc/pgsql/user/utilities.htm
-share/doc/pgsql/user/y2k.htm
-@dirrm share/doc/pgsql/admin
-@dirrm share/doc/pgsql/postgres
-@dirrm share/doc/pgsql/programmer
-@dirrm share/doc/pgsql/tutorial
-@dirrm share/doc/pgsql/user
-@dirrm share/doc/pgsql
+share/doc/postgresql/html/admin.html
+share/doc/postgresql/html/advanced.html
+share/doc/postgresql/html/altern-locations.html
+share/doc/postgresql/html/app-createdb.html
+share/doc/postgresql/html/app-createlang.html
+share/doc/postgresql/html/app-createuser.html
+share/doc/postgresql/html/app-dropdb.html
+share/doc/postgresql/html/app-droplang.html
+share/doc/postgresql/html/app-dropuser.html
+share/doc/postgresql/html/app-ecpg.html
+share/doc/postgresql/html/app-initdb.html
+share/doc/postgresql/html/app-initlocation.html
+share/doc/postgresql/html/app-ipcclean.html
+share/doc/postgresql/html/app-pg-ctl.html
+share/doc/postgresql/html/app-pg-dumpall.html
+share/doc/postgresql/html/app-pg-passwd.html
+share/doc/postgresql/html/app-pgaccess.html
+share/doc/postgresql/html/app-pgadmin.html
+share/doc/postgresql/html/app-pgconfig.html
+share/doc/postgresql/html/app-pgdump.html
+share/doc/postgresql/html/app-pgrestore.html
+share/doc/postgresql/html/app-pgtclsh.html
+share/doc/postgresql/html/app-pgtksh.html
+share/doc/postgresql/html/app-postgres.html
+share/doc/postgresql/html/app-postmaster.html
+share/doc/postgresql/html/app-psql.html
+share/doc/postgresql/html/app-vacuumdb.html
+share/doc/postgresql/html/applevel-consistency.html
+share/doc/postgresql/html/arch-pg.html
+share/doc/postgresql/html/arch.html
+share/doc/postgresql/html/arrays.html
+share/doc/postgresql/html/auth-methods.html
+share/doc/postgresql/html/backup-file.html
+share/doc/postgresql/html/backup.html
+share/doc/postgresql/html/biblio.html
+share/doc/postgresql/html/bki-commands.html
+share/doc/postgresql/html/bki-example.html
+share/doc/postgresql/html/bki.html
+share/doc/postgresql/html/bug-reporting.html
+share/doc/postgresql/html/catalog-pg-aggregate.html
+share/doc/postgresql/html/catalog-pg-attrdef.html
+share/doc/postgresql/html/catalog-pg-attribute.html
+share/doc/postgresql/html/catalog-pg-class.html
+share/doc/postgresql/html/catalog-pg-database.html
+share/doc/postgresql/html/catalog-pg-description.html
+share/doc/postgresql/html/catalog-pg-group.html
+share/doc/postgresql/html/catalog-pg-index.html
+share/doc/postgresql/html/catalog-pg-inherits.html
+share/doc/postgresql/html/catalog-pg-language.html
+share/doc/postgresql/html/catalog-pg-operator.html
+share/doc/postgresql/html/catalog-pg-proc.html
+share/doc/postgresql/html/catalog-pg-relcheck.html
+share/doc/postgresql/html/catalog-pg-shadow.html
+share/doc/postgresql/html/catalog-pg-type.html
+share/doc/postgresql/html/catalogs.html
+share/doc/postgresql/html/charset.html
+share/doc/postgresql/html/client-authentication-problems.html
+share/doc/postgresql/html/client-authentication.html
+share/doc/postgresql/html/compiler.html
+share/doc/postgresql/html/connect-estab.html
+share/doc/postgresql/html/creating-cluster.html
+share/doc/postgresql/html/cvs-tree.html
+share/doc/postgresql/html/cvs.html
+share/doc/postgresql/html/cvsup.html
+share/doc/postgresql/html/datatype-bit.html
+share/doc/postgresql/html/datatype-boolean.html
+share/doc/postgresql/html/datatype-character.html
+share/doc/postgresql/html/datatype-datetime.html
+share/doc/postgresql/html/datatype-geometric.html
+share/doc/postgresql/html/datatype-money.html
+share/doc/postgresql/html/ecpg.html
+share/doc/postgresql/html/datatype-net-types.html
+share/doc/postgresql/html/datatype.html
+share/doc/postgresql/html/datetime-appendix.html
+share/doc/postgresql/html/db-accessing.html
+share/doc/postgresql/html/db-destroy.html
+share/doc/postgresql/html/developer.html
+share/doc/postgresql/html/doc-build.html
+share/doc/postgresql/html/doc-sources.html
+share/doc/postgresql/html/doc-toolsets.html
+share/doc/postgresql/html/docguide.html
+share/doc/postgresql/html/ecpg-concept.html
+share/doc/postgresql/html/ecpg-develop.html
+share/doc/postgresql/html/ecpg-limitations.html
+share/doc/postgresql/html/ecpg-porting.html
+share/doc/postgresql/html/ecpg-use.html
+share/doc/postgresql/html/executor.html
+share/doc/postgresql/html/explicit-joins.html
+share/doc/postgresql/html/extend.html
+share/doc/postgresql/html/functions-datetime.html
+share/doc/postgresql/html/functions-aggregate.html
+share/doc/postgresql/html/functions-comparison.html
+share/doc/postgresql/html/functions-conditional.html
+share/doc/postgresql/html/functions-formatting.html
+share/doc/postgresql/html/functions-geometry.html
+share/doc/postgresql/html/functions-matching.html
+share/doc/postgresql/html/functions-math.html
+share/doc/postgresql/html/functions-misc.html
+share/doc/postgresql/html/functions-net.html
+share/doc/postgresql/html/functions-string.html
+share/doc/postgresql/html/functions.html
+share/doc/postgresql/html/geqo-intro2.html
+share/doc/postgresql/html/geqo-pg-intro.html
+share/doc/postgresql/html/geqo.html
+share/doc/postgresql/html/gist.html
+share/doc/postgresql/html/groups.html
+share/doc/postgresql/html/history.html
+share/doc/postgresql/html/index.html
+share/doc/postgresql/html/indexcost.html
+share/doc/postgresql/html/indices-functional.html
+share/doc/postgresql/html/indices-multicolumn.html
+share/doc/postgresql/html/indices-opclass.html
+share/doc/postgresql/html/indices-types.html
+share/doc/postgresql/html/indices-unique.html
+share/doc/postgresql/html/indices.html
+share/doc/postgresql/html/inherit.html
+share/doc/postgresql/html/install-getsource.html
+share/doc/postgresql/html/install-post.html
+share/doc/postgresql/html/install-procedure.html
+share/doc/postgresql/html/install-requirements.html
+share/doc/postgresql/html/install-upgrading.html
+share/doc/postgresql/html/install-win32.html
+share/doc/postgresql/html/installation.html
+share/doc/postgresql/html/jdbc-ext.html
+share/doc/postgresql/html/jdbc-lo.html
+share/doc/postgresql/html/jdbc.html
+share/doc/postgresql/html/jdbc-query.html
+share/doc/postgresql/html/jdbc-reading.html
+share/doc/postgresql/html/jdbc-thread.html
+share/doc/postgresql/html/jdbc-update.html
+share/doc/postgresql/html/jdbc-use.html
+share/doc/postgresql/html/kernel-resources.html
+share/doc/postgresql/html/keys.html
+share/doc/postgresql/html/largeobjects.html
+share/doc/postgresql/html/libpgtcl-examples.html
+share/doc/postgresql/html/libpgtcl-ref.html
+share/doc/postgresql/html/libpq-async.html
+share/doc/postgresql/html/libpq-control.html
+share/doc/postgresql/html/libpq-copy.html
+share/doc/postgresql/html/libpq-envars.html
+share/doc/postgresql/html/libpq-example.html
+share/doc/postgresql/html/libpq-exec.html
+share/doc/postgresql/html/libpq-fastpath.html
+share/doc/postgresql/html/libpq-notify.html
+share/doc/postgresql/html/libpq.html
+share/doc/postgresql/html/libpq-threading.html
+share/doc/postgresql/html/libpq-trace.html
+share/doc/postgresql/html/libpqplusplus.html
+share/doc/postgresql/html/libpqpp-classes.html
+share/doc/postgresql/html/libpqpp-connect.html
+share/doc/postgresql/html/libpqpp-copy.html
+share/doc/postgresql/html/libpqpp-exec.html
+share/doc/postgresql/html/libpqpp-notify.html
+share/doc/postgresql/html/lisp.html
+share/doc/postgresql/html/ln11307.html
+share/doc/postgresql/html/ln1274.html
+share/doc/postgresql/html/ln15103.html
+share/doc/postgresql/html/ln24.html
+share/doc/postgresql/html/ln24896.html
+share/doc/postgresql/html/ln37046.html
+share/doc/postgresql/html/ln8.html
+share/doc/postgresql/html/lo-funcs.html
+share/doc/postgresql/html/lo-implementation.html
+share/doc/postgresql/html/lo-interfaces.html
+share/doc/postgresql/html/lo-libpq.html
+share/doc/postgresql/html/lo-sample.html
+share/doc/postgresql/html/locking-indices.html
+share/doc/postgresql/html/locking-tables.html
+share/doc/postgresql/html/manage-ag-accessdb.html
+share/doc/postgresql/html/manage-ag-dropdb.html
+share/doc/postgresql/html/manage.html
+share/doc/postgresql/html/managing-databases.html
+share/doc/postgresql/html/migration.html
+share/doc/postgresql/html/more-advanced.html
+share/doc/postgresql/html/multibyte.html
+share/doc/postgresql/html/mvcc.html
+share/doc/postgresql/html/non-atomic-values.html
+share/doc/postgresql/html/notation.html
+share/doc/postgresql/html/odbc-applixware.html
+share/doc/postgresql/html/odbc-config.html
+share/doc/postgresql/html/odbc-install.html
+share/doc/postgresql/html/odbc-windows.html
+share/doc/postgresql/html/odbc.html
+share/doc/postgresql/html/organization.html
+share/doc/postgresql/html/overview.html
+share/doc/postgresql/html/page.html
+share/doc/postgresql/html/parser-stage.html
+share/doc/postgresql/html/partial-index.html
+share/doc/postgresql/html/performance-tips.html
+share/doc/postgresql/html/perm-functions.html
+share/doc/postgresql/html/pg-system-catalogs.html
+share/doc/postgresql/html/pgeasy-chapter.html
+share/doc/postgresql/html/pgtcl-pgconndefaults.html
+share/doc/postgresql/html/pgtcl-pgconnect.html
+share/doc/postgresql/html/pgtcl-pgdisconnect.html
+share/doc/postgresql/html/pgtcl-pgexec.html
+share/doc/postgresql/html/pgtcl-pglisten.html
+share/doc/postgresql/html/pgtcl-pgloclose.html
+share/doc/postgresql/html/pgtcl-pglocreat.html
+share/doc/postgresql/html/pgtcl-pgloexport.html
+share/doc/postgresql/html/pgtcl-pgloimport.html
+share/doc/postgresql/html/pgtcl-pglolseek.html
+share/doc/postgresql/html/pgtcl-pgloopen.html
+share/doc/postgresql/html/pgtcl-pgloread.html
+share/doc/postgresql/html/pgtcl-pglotell.html
+share/doc/postgresql/html/pgtcl-pglounlink.html
+share/doc/postgresql/html/pgtcl-pglowrite.html
+share/doc/postgresql/html/pgtcl-pgresult.html
+share/doc/postgresql/html/pgtcl-pgselect.html
+share/doc/postgresql/html/pgtcl.html
+share/doc/postgresql/html/planner-optimizer.html
+share/doc/postgresql/html/plperl-use.html
+share/doc/postgresql/html/plperl.html
+share/doc/postgresql/html/plpgsql-description.html
+share/doc/postgresql/html/plpgsql-examples.html
+share/doc/postgresql/html/plpgsql-porting.html
+share/doc/postgresql/html/plpgsql-trigger.html
+share/doc/postgresql/html/plpgsql.html
+share/doc/postgresql/html/pltcl-description.html
+share/doc/postgresql/html/pltcl.html
+share/doc/postgresql/html/populate.html
+share/doc/postgresql/html/postgres.html
+share/doc/postgresql/html/postmaster-shutdown.html
+share/doc/postgresql/html/postmaster-start.html
+share/doc/postgresql/html/preface.html
+share/doc/postgresql/html/privileges.html
+share/doc/postgresql/html/programmer-client.html
+share/doc/postgresql/html/programmer-pl.html
+share/doc/postgresql/html/programmer-server.html
+share/doc/postgresql/html/programmer.html
+share/doc/postgresql/html/protocol-message-formats.html
+share/doc/postgresql/html/protocol-message-types.html
+share/doc/postgresql/html/protocol-protocol.html
+share/doc/postgresql/html/protocol.html
+share/doc/postgresql/html/pygresql.html
+share/doc/postgresql/html/pygresql-close.html
+share/doc/postgresql/html/pygresql-connect.html
+share/doc/postgresql/html/pygresql-db-api.html
+share/doc/postgresql/html/pygresql-db-clear.html
+share/doc/postgresql/html/pygresql-db-delete.html
+share/doc/postgresql/html/pygresql-db-get-attnames.html
+share/doc/postgresql/html/pygresql-db-get-databases.html
+share/doc/postgresql/html/pygresql-db-get-tables.html
+share/doc/postgresql/html/pygresql-db-get.html
+share/doc/postgresql/html/pygresql-db-insert.html
+share/doc/postgresql/html/pygresql-db-pkey.html
+share/doc/postgresql/html/pygresql-db-update.html
+share/doc/postgresql/html/pygresql-endcopy.html
+share/doc/postgresql/html/pygresql-fileno.html
+share/doc/postgresql/html/pygresql-get-defbase.html
+share/doc/postgresql/html/pygresql-get-defhost.html
+share/doc/postgresql/html/pygresql-get-defopt.html
+share/doc/postgresql/html/pygresql-get-defport.html
+share/doc/postgresql/html/pygresql-get-deftty.html
+share/doc/postgresql/html/pygresql-getline.html
+share/doc/postgresql/html/pygresql-getlo.html
+share/doc/postgresql/html/pygresql-getnotify.html
+share/doc/postgresql/html/pygresql-inserttable.html
+share/doc/postgresql/html/pygresql-locreate.html
+share/doc/postgresql/html/pygresql-loimport.html
+share/doc/postgresql/html/pygresql-pg-db.html
+share/doc/postgresql/html/pygresql-pg-functions.html
+share/doc/postgresql/html/pygresql-pg-pglarge.html
+share/doc/postgresql/html/pygresql-pg-pgobject.html
+share/doc/postgresql/html/pygresql-pg-pgqueryobject.html
+share/doc/postgresql/html/pygresql-pglargeobject-close.html
+share/doc/postgresql/html/pygresql-pglargeobject-export.html
+share/doc/postgresql/html/pygresql-pglargeobject-open.html
+share/doc/postgresql/html/pygresql-pglargeobject-read.html
+share/doc/postgresql/html/pygresql-pglargeobject-seek.html
+share/doc/postgresql/html/pygresql-pglargeobject-size.html
+share/doc/postgresql/html/pygresql-pglargeobject-tell.html
+share/doc/postgresql/html/pygresql-pglargeobject-unlink.html
+share/doc/postgresql/html/pygresql-pglargeobject-write.html
+share/doc/postgresql/html/pygresql-pgqueryobject-dictresult.html
+share/doc/postgresql/html/pygresql-pgqueryobject-fieldname.html
+share/doc/postgresql/html/query.html
+share/doc/postgresql/html/pygresql-pgqueryobject-fieldnum.html
+share/doc/postgresql/html/pygresql-pgqueryobject-getresult.html
+share/doc/postgresql/html/pygresql-pgqueryobject-listfields.html
+share/doc/postgresql/html/pygresql-pgqueryobject-ntuples.html
+share/doc/postgresql/html/pygresql-putline.html
+share/doc/postgresql/html/pygresql-query.html
+share/doc/postgresql/html/pygresql-reset.html
+share/doc/postgresql/html/pygresql-set-defbase.html
+share/doc/postgresql/html/pygresql-set-defhost.html
+share/doc/postgresql/html/pygresql-set-defopt.html
+share/doc/postgresql/html/pygresql-set-defport.html
+share/doc/postgresql/html/pygresql-set-deftty.html
+share/doc/postgresql/html/queries-limit.html
+share/doc/postgresql/html/queries-order.html
+share/doc/postgresql/html/queries-select-lists.html
+share/doc/postgresql/html/queries-union.html
+share/doc/postgresql/html/queries.html
+share/doc/postgresql/html/query-agg.html
+share/doc/postgresql/html/query-concepts.html
+share/doc/postgresql/html/query-delete.html
+share/doc/postgresql/html/query-join.html
+share/doc/postgresql/html/query-populate.html
+share/doc/postgresql/html/query-query.html
+share/doc/postgresql/html/query-selectinto.html
+share/doc/postgresql/html/query-table.html
+share/doc/postgresql/html/query-update.html
+share/doc/postgresql/html/recode.html
+share/doc/postgresql/html/recovery.html
+share/doc/postgresql/html/reference-client.html
+share/doc/postgresql/html/reference-server.html
+share/doc/postgresql/html/reference.html
+share/doc/postgresql/html/regress-platform.html
+share/doc/postgresql/html/regress.html
+share/doc/postgresql/html/release-0-01.html
+share/doc/postgresql/html/release-0-02.html
+share/doc/postgresql/html/release-0-03.html
+share/doc/postgresql/html/release-1-0.html
+share/doc/postgresql/html/release-1-01.html
+share/doc/postgresql/html/release-1-02.html
+share/doc/postgresql/html/release-1-09.html
+share/doc/postgresql/html/release-6-0.html
+share/doc/postgresql/html/release-6-1-1.html
+share/doc/postgresql/html/release-6-1.html
+share/doc/postgresql/html/release-6-2-1.html
+share/doc/postgresql/html/release-6-2.html
+share/doc/postgresql/html/release-6-3-1.html
+share/doc/postgresql/html/release-6-3-2.html
+share/doc/postgresql/html/release-6-3.html
+share/doc/postgresql/html/release-6-4-1.html
+share/doc/postgresql/html/release-6-4-2.html
+share/doc/postgresql/html/release-6-4.html
+share/doc/postgresql/html/release-6-5-1.html
+share/doc/postgresql/html/release-6-5-2.html
+share/doc/postgresql/html/release-6-5-3.html
+share/doc/postgresql/html/release-6-5.html
+share/doc/postgresql/html/release-7-0-1.html
+share/doc/postgresql/html/release-7-0-2.html
+share/doc/postgresql/html/release-7-0-3.html
+share/doc/postgresql/html/release-7-0.html
+share/doc/postgresql/html/release.html
+share/doc/postgresql/html/relmodel-formal.html
+share/doc/postgresql/html/relmodel-oper.html
+share/doc/postgresql/html/resources.html
+share/doc/postgresql/html/rule-system.html
+share/doc/postgresql/html/rules-insert.html
+share/doc/postgresql/html/rules-permissions.html
+share/doc/postgresql/html/rules-triggers.html
+share/doc/postgresql/html/rules-views.html
+share/doc/postgresql/html/rules.html
+share/doc/postgresql/html/runtime-config.html
+share/doc/postgresql/html/runtime.html
+share/doc/postgresql/html/source.html
+share/doc/postgresql/html/spi-examples.html
+share/doc/postgresql/html/spi-interface-support.html
+share/doc/postgresql/html/spi-memory.html
+share/doc/postgresql/html/spi-spiconnect.html
+share/doc/postgresql/html/spi-spicopytuple.html
+share/doc/postgresql/html/spi-spiexec.html
+share/doc/postgresql/html/spi-spiexecp.html
+share/doc/postgresql/html/spi-spifinish.html
+share/doc/postgresql/html/spi-spifname.html
+share/doc/postgresql/html/spi-spifnumber.html
+share/doc/postgresql/html/spi-spigetbinval.html
+share/doc/postgresql/html/spi-spigetrelname.html
+share/doc/postgresql/html/spi-spigettype.html
+share/doc/postgresql/html/spi-spigettypeid.html
+share/doc/postgresql/html/spi-spigetvalue.html
+share/doc/postgresql/html/spi-spimodifytuple.html
+share/doc/postgresql/html/spi-spipalloc.html
+share/doc/postgresql/html/spi-spipfree.html
+share/doc/postgresql/html/spi-spiprepare.html
+share/doc/postgresql/html/spi-spirepalloc.html
+share/doc/postgresql/html/spi-spisaveplan.html
+share/doc/postgresql/html/spi-visibility.html
+share/doc/postgresql/html/spi.html
+share/doc/postgresql/html/sql-abort.html
+share/doc/postgresql/html/sql-altergroup.html
+share/doc/postgresql/html/sql-altertable.html
+share/doc/postgresql/html/sql-alteruser.html
+share/doc/postgresql/html/sql-begin.html
+share/doc/postgresql/html/sql-checkpoint.html
+share/doc/postgresql/html/sql-close.html
+share/doc/postgresql/html/sql-cluster.html
+share/doc/postgresql/html/sql-commands.html
+share/doc/postgresql/html/sql-comment.html
+share/doc/postgresql/html/sql-commit.html
+share/doc/postgresql/html/sql-copy.html
+share/doc/postgresql/html/sql-createaggregate.html
+share/doc/postgresql/html/sql-createconstraint.html
+share/doc/postgresql/html/sql-createdatabase.html
+share/doc/postgresql/html/sql-createfunction.html
+share/doc/postgresql/html/sql-creategroup.html
+share/doc/postgresql/html/sql-createindex.html
+share/doc/postgresql/html/sql-createlanguage.html
+share/doc/postgresql/html/sql-createoperator.html
+share/doc/postgresql/html/sql-createrule.html
+share/doc/postgresql/html/sql-createsequence.html
+share/doc/postgresql/html/sql-createtable.html
+share/doc/postgresql/html/sql-createtableas.html
+share/doc/postgresql/html/sql-createtrigger.html
+share/doc/postgresql/html/sql-createtype.html
+share/doc/postgresql/html/sql-createuser.html
+share/doc/postgresql/html/sql-createview.html
+share/doc/postgresql/html/sql-declare.html
+share/doc/postgresql/html/sql-delete.html
+share/doc/postgresql/html/sql-dropaggregate.html
+share/doc/postgresql/html/sql-dropdatabase.html
+share/doc/postgresql/html/sql-dropfunction.html
+share/doc/postgresql/html/sql-dropgroup.html
+share/doc/postgresql/html/sql-dropindex.html
+share/doc/postgresql/html/sql-droplanguage.html
+share/doc/postgresql/html/sql-dropoperator.html
+share/doc/postgresql/html/sql-droprule.html
+share/doc/postgresql/html/sql-dropsequence.html
+share/doc/postgresql/html/sql-droptable.html
+share/doc/postgresql/html/sql-droptrigger.html
+share/doc/postgresql/html/sql-droptype.html
+share/doc/postgresql/html/sql-dropuser.html
+share/doc/postgresql/html/sql-dropview.html
+share/doc/postgresql/html/sql-end.html
+share/doc/postgresql/html/sql-explain.html
+share/doc/postgresql/html/sql-expressions.html
+share/doc/postgresql/html/sql-fetch.html
+share/doc/postgresql/html/sql-grant.html
+share/doc/postgresql/html/sql-insert.html
+share/doc/postgresql/html/sql-keywords-appendix.html
+share/doc/postgresql/html/sql-language.html
+share/doc/postgresql/html/sql-listen.html
+share/doc/postgresql/html/sql-load.html
+share/doc/postgresql/html/sql-lock.html
+share/doc/postgresql/html/sql-move.html
+share/doc/postgresql/html/sql-notify.html
+share/doc/postgresql/html/sql-precedence.html
+share/doc/postgresql/html/sql-reindex.html
+share/doc/postgresql/html/sql-reset.html
+share/doc/postgresql/html/sql-revoke.html
+share/doc/postgresql/html/sql-rollback.html
+share/doc/postgresql/html/sql-select.html
+share/doc/postgresql/html/sql-selectinto.html
+share/doc/postgresql/html/sql-set-constraints.html
+share/doc/postgresql/html/sql-set-transaction.html
+share/doc/postgresql/html/sql-set.html
+share/doc/postgresql/html/sql-show.html
+share/doc/postgresql/html/sql-syntax-columns.html
+share/doc/postgresql/html/sql-syntax.html
+share/doc/postgresql/html/sql-truncate.html
+share/doc/postgresql/html/sql-unlisten.html
+share/doc/postgresql/html/sql-update.html
+share/doc/postgresql/html/sql-vacuum.html
+share/doc/postgresql/html/sql.html
+share/doc/postgresql/html/ssh-tunnels.html
+share/doc/postgresql/html/ssl-tcp.html
+share/doc/postgresql/html/start-manage-db.html
+share/doc/postgresql/html/start-psql.html
+share/doc/postgresql/html/start.html
+share/doc/postgresql/html/storage.html
+share/doc/postgresql/html/supported-platforms.html
+share/doc/postgresql/html/timing-results.html
+share/doc/postgresql/html/transaction-iso.html
+share/doc/postgresql/html/trigger-datachanges.html
+share/doc/postgresql/html/trigger-examples.html
+share/doc/postgresql/html/trigger-manager.html
+share/doc/postgresql/html/triggers.html
+share/doc/postgresql/html/tutorial.html
+share/doc/postgresql/html/type-system.html
+share/doc/postgresql/html/typeconv-func.html
+share/doc/postgresql/html/typeconv-oper.html
+share/doc/postgresql/html/typeconv-query.html
+share/doc/postgresql/html/typeconv-union-case.html
+share/doc/postgresql/html/typeconv.html
+share/doc/postgresql/html/units-history.html
+share/doc/postgresql/html/user-manag.html
+share/doc/postgresql/html/user.html
+share/doc/postgresql/html/wal-configuration.html
+share/doc/postgresql/html/wal-implementation.html
+share/doc/postgresql/html/wal.html
+share/doc/postgresql/html/xact-read-committed.html
+share/doc/postgresql/html/xact-serializable.html
+share/doc/postgresql/html/xaggr.html
+share/doc/postgresql/html/xfunc-c.html
+share/doc/postgresql/html/xfunc-internal.html
+share/doc/postgresql/html/xfunc-overload.html
+share/doc/postgresql/html/xfunc-pl.html
+share/doc/postgresql/html/xfunc.html
+share/doc/postgresql/html/xindex.html
+share/doc/postgresql/html/xoper.html
+share/doc/postgresql/html/xplang.html
+share/doc/postgresql/html/xtypes.html
+share/doc/postgresql/html/y2k.html
+share/doc/postgresql/html/catalogs.gif
+share/doc/postgresql/html/clientserver.gif
+share/doc/postgresql/html/connections.gif
+@dirrm share/doc/postgresql/html
+@dirrm share/doc/postgresql
diff --git a/databases/postgresql84-server/pkg-plist.jdbc b/databases/postgresql84-server/pkg-plist.jdbc
index e751caa..8f7bd41 100644
--- a/databases/postgresql84-server/pkg-plist.jdbc
+++ b/databases/postgresql84-server/pkg-plist.jdbc
@@ -1,14 +1,27 @@
-share/examples/pgsql/jdbc/ImageViewer.java
-share/examples/pgsql/jdbc/basic.java
-share/examples/pgsql/jdbc/blobtest.java
-share/examples/pgsql/jdbc/datestyle.java
-share/examples/pgsql/jdbc/metadata.java
-share/examples/pgsql/jdbc/psql.java
-share/examples/pgsql/jdbc/threadsafe.java
-share/examples/pgsql/jdbc/README
-share/examples/pgsql/jdbc/README_6.3
-@dirrm share/examples/pgsql/jdbc
-@dirrm share/examples/pgsql
+share/examples/postgresql/corba/StockClient.java
+share/examples/postgresql/corba/StockDB.java
+share/examples/postgresql/corba/StockDispenserImpl.java
+share/examples/postgresql/corba/StockItemImpl.java
+share/examples/postgresql/corba/StockServer.java
+share/examples/postgresql/corba/readme
+share/examples/postgresql/corba/stock.idl
+share/examples/postgresql/corba/stock.sql
+@dirrm share/examples/postgresql/corba
+share/examples/postgresql/ImageViewer.java
+share/examples/postgresql/Unicode.java
+share/examples/postgresql/basic.java
+share/examples/postgresql/blobtest.java
+share/examples/postgresql/datestyle.java
+share/examples/postgresql/metadata.java
+share/examples/postgresql/psql.java
+share/examples/postgresql/threadsafe.java
+share/examples/postgresql/README
+share/examples/postgresql/Implementation
+@dirrm share/examples/postgresql
+share/postgresql/java/postgresql-examples.jar
+share/postgresql/java/postgresql.jar
+share/postgresql/java/retepTools.jar
+@dirrm share/postgresql/java
 share/java/classes/postgresql.jar
 @unexec rmdir %D/share/java/classes 2>/dev/null || true
 @unexec rmdir %D/share/java 2>/dev/null || true
diff --git a/databases/postgresql84-server/pkg-plist.notk b/databases/postgresql84-server/pkg-plist.notk
index 9f5d9e0..8dcbc5f 100644
--- a/databases/postgresql84-server/pkg-plist.notk
+++ b/databases/postgresql84-server/pkg-plist.notk
@@ -1,6 +1,6 @@
-pgsql/bin/pgtclsh
-pgsql/include/libpgtcl.h
-pgsql/lib/libpgtcl.a
-pgsql/lib/libpgtcl.so
-pgsql/lib/libpgtcl.so.2
-pgsql/lib/pltcl.so
+%%PG_PREFIX%%bin/pgtclsh
+%%PG_INCLUDE%%/libpgtcl.h
+%%PG_PREFIX%%lib/libpgtcl.a
+%%PG_PREFIX%%lib/libpgtcl.so
+%%PG_PREFIX%%lib/libpgtcl.so.2
+%%PG_PREFIX%%lib/pltcl.so
diff --git a/databases/postgresql84-server/pkg-plist.odbc b/databases/postgresql84-server/pkg-plist.odbc
index c849e26..f047b7c 100644
--- a/databases/postgresql84-server/pkg-plist.odbc
+++ b/databases/postgresql84-server/pkg-plist.odbc
@@ -1,8 +1,10 @@
-pgsql/include/iodbc/iodbc.h
-pgsql/include/iodbc/isql.h
-pgsql/include/iodbc/isqlext.h
-pgsql/lib/libpsqlodbc.a
-pgsql/lib/libpsqlodbc.so
-pgsql/lib/libpsqlodbc.so.0
-pgsql/odbcinst.ini
-@dirrm pgsql/include/iodbc
+%%PG_INCLUDE%%/iodbc/iodbc.h
+%%PG_INCLUDE%%/iodbc/isql.h
+%%PG_INCLUDE%%/iodbc/isqlext.h
+@dirrm %%PG_INCLUDE%%/iodbc
+%%PG_PREFIX%%lib/libpsqlodbc.a
+%%PG_PREFIX%%lib/libpsqlodbc.so
+%%PG_PREFIX%%lib/libpsqlodbc.so.0
+etc/postgresql/odbcinst.ini
+@dirrm etc/postgresql
+share/postgresql/odbc.sql
diff --git a/databases/postgresql84-server/pkg-plist.tcl b/databases/postgresql84-server/pkg-plist.tcl
index b01eaf1..bb3ecd3 100644
--- a/databases/postgresql84-server/pkg-plist.tcl
+++ b/databases/postgresql84-server/pkg-plist.tcl
@@ -1,141 +1,146 @@
-pgsql/bin/pgaccess
-pgsql/bin/pgtclsh
-pgsql/bin/pgtksh
-pgsql/include/libpgtcl.h
-pgsql/lib/libpgtcl.a
-pgsql/lib/libpgtcl.so
-pgsql/lib/libpgtcl.so.2
-pgsql/lib/pltcl.so
-pgsql/pgaccess/images/icon_button.gif
-pgsql/pgaccess/images/icon_checkbutton.gif
-pgsql/pgaccess/images/icon_entry.gif
-pgsql/pgaccess/images/icon_frame.gif
-pgsql/pgaccess/images/icon_label.gif
-pgsql/pgaccess/images/icon_listbox.gif
-pgsql/pgaccess/images/icon_query.gif
-pgsql/pgaccess/images/icon_radiobutton.gif
-pgsql/pgaccess/images/icon_text.gif
-pgsql/pgaccess/lib/database.tcl
-pgsql/pgaccess/lib/forms.tcl
-pgsql/pgaccess/lib/functions.tcl
-pgsql/pgaccess/lib/help/abort.hlp
-pgsql/pgaccess/lib/help/add_records.hlp
-pgsql/pgaccess/lib/help/alter_table.hlp
-pgsql/pgaccess/lib/help/alter_user.hlp
-pgsql/pgaccess/lib/help/author.hlp
-pgsql/pgaccess/lib/help/begin.hlp
-pgsql/pgaccess/lib/help/close.hlp
-pgsql/pgaccess/lib/help/cluster.hlp
-pgsql/pgaccess/lib/help/commit.hlp
-pgsql/pgaccess/lib/help/copy.hlp
-pgsql/pgaccess/lib/help/copyrights.hlp
-pgsql/pgaccess/lib/help/create_aggregate.hlp
-pgsql/pgaccess/lib/help/create_database.hlp
-pgsql/pgaccess/lib/help/create_function.hlp
-pgsql/pgaccess/lib/help/create_index.hlp
-pgsql/pgaccess/lib/help/create_language.hlp
-pgsql/pgaccess/lib/help/create_operator.hlp
-pgsql/pgaccess/lib/help/create_rule.hlp
-pgsql/pgaccess/lib/help/create_sequence.hlp
-pgsql/pgaccess/lib/help/create_table.hlp
-pgsql/pgaccess/lib/help/create_table_as.hlp
-pgsql/pgaccess/lib/help/create_trigger.hlp
-pgsql/pgaccess/lib/help/create_type.hlp
-pgsql/pgaccess/lib/help/create_user.hlp
-pgsql/pgaccess/lib/help/create_view.hlp
-pgsql/pgaccess/lib/help/data_types.hlp
-pgsql/pgaccess/lib/help/datefunc.hlp
-pgsql/pgaccess/lib/help/declare.hlp
-pgsql/pgaccess/lib/help/delete.hlp
-pgsql/pgaccess/lib/help/drop_aggregate.hlp
-pgsql/pgaccess/lib/help/drop_database.hlp
-pgsql/pgaccess/lib/help/drop_function.hlp
-pgsql/pgaccess/lib/help/drop_index.hlp
-pgsql/pgaccess/lib/help/drop_language.hlp
-pgsql/pgaccess/lib/help/drop_operator.hlp
-pgsql/pgaccess/lib/help/drop_rule.hlp
-pgsql/pgaccess/lib/help/drop_sequence.hlp
-pgsql/pgaccess/lib/help/drop_table.hlp
-pgsql/pgaccess/lib/help/drop_trigger.hlp
-pgsql/pgaccess/lib/help/drop_type.hlp
-pgsql/pgaccess/lib/help/drop_user.hlp
-pgsql/pgaccess/lib/help/drop_view.hlp
-pgsql/pgaccess/lib/help/explain.hlp
-pgsql/pgaccess/lib/help/fetch.hlp
-pgsql/pgaccess/lib/help/form_design.hlp
-pgsql/pgaccess/lib/help/forms.hlp
-pgsql/pgaccess/lib/help/functions.hlp
-pgsql/pgaccess/lib/help/geomfunc.hlp
-pgsql/pgaccess/lib/help/grant.hlp
-pgsql/pgaccess/lib/help/history.hlp
-pgsql/pgaccess/lib/help/index.hlp
-pgsql/pgaccess/lib/help/inheritance.hlp
-pgsql/pgaccess/lib/help/insert.hlp
-pgsql/pgaccess/lib/help/ipv4func.hlp
-pgsql/pgaccess/lib/help/isolation.hlp
-pgsql/pgaccess/lib/help/keywords.hlp
-pgsql/pgaccess/lib/help/listen.hlp
-pgsql/pgaccess/lib/help/load.hlp
-pgsql/pgaccess/lib/help/lock.hlp
-pgsql/pgaccess/lib/help/mathfunc.hlp
-pgsql/pgaccess/lib/help/move.hlp
-pgsql/pgaccess/lib/help/mvcc.hlp
-pgsql/pgaccess/lib/help/new_query.hlp
-pgsql/pgaccess/lib/help/new_table.hlp
-pgsql/pgaccess/lib/help/notify.hlp
-pgsql/pgaccess/lib/help/open_query.hlp
-pgsql/pgaccess/lib/help/open_table.hlp
-pgsql/pgaccess/lib/help/pgfunctions.hlp
-pgsql/pgaccess/lib/help/postgresql.hlp
-pgsql/pgaccess/lib/help/queries.hlp
-pgsql/pgaccess/lib/help/reports.hlp
-pgsql/pgaccess/lib/help/reset.hlp
-pgsql/pgaccess/lib/help/revoke.hlp
-pgsql/pgaccess/lib/help/rollback.hlp
-pgsql/pgaccess/lib/help/schema.hlp
-pgsql/pgaccess/lib/help/scripts.hlp
-pgsql/pgaccess/lib/help/select.hlp
-pgsql/pgaccess/lib/help/select_into.hlp
-pgsql/pgaccess/lib/help/sequences.hlp
-pgsql/pgaccess/lib/help/set.hlp
-pgsql/pgaccess/lib/help/show.hlp
-pgsql/pgaccess/lib/help/sql_guide.hlp
-pgsql/pgaccess/lib/help/sqlfunc.hlp
-pgsql/pgaccess/lib/help/stringfunc.hlp
-pgsql/pgaccess/lib/help/tables.hlp
-pgsql/pgaccess/lib/help/unlisten.hlp
-pgsql/pgaccess/lib/help/update.hlp
-pgsql/pgaccess/lib/help/users.hlp
-pgsql/pgaccess/lib/help/vacuum.hlp
-pgsql/pgaccess/lib/help/view_table_structure.hlp
-pgsql/pgaccess/lib/help/views.hlp
-pgsql/pgaccess/lib/help/visual_designer.hlp
-pgsql/pgaccess/lib/help/y2k.hlp
-pgsql/pgaccess/lib/help.tcl
-pgsql/pgaccess/lib/languages/czech
-pgsql/pgaccess/lib/languages/deutsch
-pgsql/pgaccess/lib/languages/francais
-pgsql/pgaccess/lib/languages/italiano
-pgsql/pgaccess/lib/languages/magyar
-pgsql/pgaccess/lib/languages/portugues
-pgsql/pgaccess/lib/languages/romana
-pgsql/pgaccess/lib/languages/russian.koi8r
-pgsql/pgaccess/lib/languages/russian_win
-pgsql/pgaccess/lib/languages/spanish
-pgsql/pgaccess/lib/mainlib.tcl
-pgsql/pgaccess/lib/preferences.tcl
-pgsql/pgaccess/lib/queries.tcl
-pgsql/pgaccess/lib/reports.tcl
-pgsql/pgaccess/lib/schema.tcl
-pgsql/pgaccess/lib/scripts.tcl
-pgsql/pgaccess/lib/sequences.tcl
-pgsql/pgaccess/lib/tables.tcl
-pgsql/pgaccess/lib/users.tcl
-pgsql/pgaccess/lib/views.tcl
-pgsql/pgaccess/lib/visualqb.tcl
-pgsql/pgaccess/main.tcl
-@dirrm pgsql/pgaccess/images
-@dirrm pgsql/pgaccess/lib/help
-@dirrm pgsql/pgaccess/lib/languages
-@dirrm pgsql/pgaccess/lib
-@dirrm pgsql/pgaccess
+%%PG_PREFIX%%bin/pgaccess
+%%PG_PREFIX%%bin/pgtclsh
+%%PG_PREFIX%%bin/pgtksh
+%%PG_INCLUDE%%/libpgtcl.h
+%%PG_PREFIX%%lib/libpgtcl.a
+%%PG_PREFIX%%lib/libpgtcl.so
+%%PG_PREFIX%%lib/libpgtcl.so.2
+%%PG_PREFIX%%lib/pltcl.so
+share/postgresql/pgaccess/images/icon_button.gif
+share/postgresql/pgaccess/images/icon_checkbutton.gif
+share/postgresql/pgaccess/images/icon_entry.gif
+share/postgresql/pgaccess/images/icon_frame.gif
+share/postgresql/pgaccess/images/icon_label.gif
+share/postgresql/pgaccess/images/icon_listbox.gif
+share/postgresql/pgaccess/images/icon_query.gif
+share/postgresql/pgaccess/images/icon_radiobutton.gif
+share/postgresql/pgaccess/images/icon_text.gif
+share/postgresql/pgaccess/lib/database.tcl
+share/postgresql/pgaccess/lib/forms.tcl
+share/postgresql/pgaccess/lib/functions.tcl
+share/postgresql/pgaccess/lib/help/abort.hlp
+share/postgresql/pgaccess/lib/help/add_records.hlp
+share/postgresql/pgaccess/lib/help/alter_table.hlp
+share/postgresql/pgaccess/lib/help/alter_user.hlp
+share/postgresql/pgaccess/lib/help/author.hlp
+share/postgresql/pgaccess/lib/help/begin.hlp
+share/postgresql/pgaccess/lib/help/close.hlp
+share/postgresql/pgaccess/lib/help/cluster.hlp
+share/postgresql/pgaccess/lib/help/commit.hlp
+share/postgresql/pgaccess/lib/help/copy.hlp
+share/postgresql/pgaccess/lib/help/copyrights.hlp
+share/postgresql/pgaccess/lib/help/create_aggregate.hlp
+share/postgresql/pgaccess/lib/help/create_database.hlp
+share/postgresql/pgaccess/lib/help/create_function.hlp
+share/postgresql/pgaccess/lib/help/create_index.hlp
+share/postgresql/pgaccess/lib/help/create_language.hlp
+share/postgresql/pgaccess/lib/help/create_operator.hlp
+share/postgresql/pgaccess/lib/help/create_rule.hlp
+share/postgresql/pgaccess/lib/help/create_sequence.hlp
+share/postgresql/pgaccess/lib/help/create_table.hlp
+share/postgresql/pgaccess/lib/help/create_table_as.hlp
+share/postgresql/pgaccess/lib/help/create_trigger.hlp
+share/postgresql/pgaccess/lib/help/create_type.hlp
+share/postgresql/pgaccess/lib/help/create_user.hlp
+share/postgresql/pgaccess/lib/help/create_view.hlp
+share/postgresql/pgaccess/lib/help/data_types.hlp
+share/postgresql/pgaccess/lib/help/datefunc.hlp
+share/postgresql/pgaccess/lib/help/declare.hlp
+share/postgresql/pgaccess/lib/help/delete.hlp
+share/postgresql/pgaccess/lib/help/drop_aggregate.hlp
+share/postgresql/pgaccess/lib/help/drop_database.hlp
+share/postgresql/pgaccess/lib/help/drop_function.hlp
+share/postgresql/pgaccess/lib/help/drop_index.hlp
+share/postgresql/pgaccess/lib/help/drop_language.hlp
+share/postgresql/pgaccess/lib/help/drop_operator.hlp
+share/postgresql/pgaccess/lib/help/drop_rule.hlp
+share/postgresql/pgaccess/lib/help/drop_sequence.hlp
+share/postgresql/pgaccess/lib/help/drop_table.hlp
+share/postgresql/pgaccess/lib/help/drop_trigger.hlp
+share/postgresql/pgaccess/lib/help/drop_type.hlp
+share/postgresql/pgaccess/lib/help/drop_user.hlp
+share/postgresql/pgaccess/lib/help/drop_view.hlp
+share/postgresql/pgaccess/lib/help/explain.hlp
+share/postgresql/pgaccess/lib/help/fetch.hlp
+share/postgresql/pgaccess/lib/help/form_design.hlp
+share/postgresql/pgaccess/lib/help/forms.hlp
+share/postgresql/pgaccess/lib/help/functions.hlp
+share/postgresql/pgaccess/lib/help/geomfunc.hlp
+share/postgresql/pgaccess/lib/help/grant.hlp
+share/postgresql/pgaccess/lib/help/history.hlp
+share/postgresql/pgaccess/lib/help/index.hlp
+share/postgresql/pgaccess/lib/help/inheritance.hlp
+share/postgresql/pgaccess/lib/help/insert.hlp
+share/postgresql/pgaccess/lib/help/ipv4func.hlp
+share/postgresql/pgaccess/lib/help/isolation.hlp
+share/postgresql/pgaccess/lib/help/keywords.hlp
+share/postgresql/pgaccess/lib/help/listen.hlp
+share/postgresql/pgaccess/lib/help/load.hlp
+share/postgresql/pgaccess/lib/help/lock.hlp
+share/postgresql/pgaccess/lib/help/mathfunc.hlp
+share/postgresql/pgaccess/lib/help/move.hlp
+share/postgresql/pgaccess/lib/help/mvcc.hlp
+share/postgresql/pgaccess/lib/help/new_query.hlp
+share/postgresql/pgaccess/lib/help/new_table.hlp
+share/postgresql/pgaccess/lib/help/notify.hlp
+share/postgresql/pgaccess/lib/help/open_query.hlp
+share/postgresql/pgaccess/lib/help/open_table.hlp
+share/postgresql/pgaccess/lib/help/pgfunctions.hlp
+share/postgresql/pgaccess/lib/help/postgresql.hlp
+share/postgresql/pgaccess/lib/help/queries.hlp
+share/postgresql/pgaccess/lib/help/reports.hlp
+share/postgresql/pgaccess/lib/help/reset.hlp
+share/postgresql/pgaccess/lib/help/revoke.hlp
+share/postgresql/pgaccess/lib/help/rollback.hlp
+share/postgresql/pgaccess/lib/help/schema.hlp
+share/postgresql/pgaccess/lib/help/scripts.hlp
+share/postgresql/pgaccess/lib/help/select.hlp
+share/postgresql/pgaccess/lib/help/select_into.hlp
+share/postgresql/pgaccess/lib/help/sequences.hlp
+share/postgresql/pgaccess/lib/help/set.hlp
+share/postgresql/pgaccess/lib/help/show.hlp
+share/postgresql/pgaccess/lib/help/sql_guide.hlp
+share/postgresql/pgaccess/lib/help/sqlfunc.hlp
+share/postgresql/pgaccess/lib/help/stringfunc.hlp
+share/postgresql/pgaccess/lib/help/tables.hlp
+share/postgresql/pgaccess/lib/help/unlisten.hlp
+share/postgresql/pgaccess/lib/help/update.hlp
+share/postgresql/pgaccess/lib/help/users.hlp
+share/postgresql/pgaccess/lib/help/vacuum.hlp
+share/postgresql/pgaccess/lib/help/view_table_structure.hlp
+share/postgresql/pgaccess/lib/help/views.hlp
+share/postgresql/pgaccess/lib/help/visual_designer.hlp
+share/postgresql/pgaccess/lib/help/y2k.hlp
+share/postgresql/pgaccess/lib/help.tcl
+share/postgresql/pgaccess/lib/languages/czech
+share/postgresql/pgaccess/lib/languages/chinese_big5
+share/postgresql/pgaccess/lib/languages/chinese_gb
+share/postgresql/pgaccess/lib/languages/deutsch
+share/postgresql/pgaccess/lib/languages/euskara
+share/postgresql/pgaccess/lib/languages/francais
+share/postgresql/pgaccess/lib/languages/italiano
+share/postgresql/pgaccess/lib/languages/japanese
+share/postgresql/pgaccess/lib/languages/magyar
+share/postgresql/pgaccess/lib/languages/nederlands
+share/postgresql/pgaccess/lib/languages/portugues
+share/postgresql/pgaccess/lib/languages/romana
+share/postgresql/pgaccess/lib/languages/russian.koi8r
+share/postgresql/pgaccess/lib/languages/russian_win
+share/postgresql/pgaccess/lib/languages/spanish
+share/postgresql/pgaccess/lib/mainlib.tcl
+share/postgresql/pgaccess/lib/preferences.tcl
+share/postgresql/pgaccess/lib/queries.tcl
+share/postgresql/pgaccess/lib/reports.tcl
+share/postgresql/pgaccess/lib/schema.tcl
+share/postgresql/pgaccess/lib/scripts.tcl
+share/postgresql/pgaccess/lib/sequences.tcl
+share/postgresql/pgaccess/lib/tables.tcl
+share/postgresql/pgaccess/lib/users.tcl
+share/postgresql/pgaccess/lib/views.tcl
+share/postgresql/pgaccess/lib/visualqb.tcl
+share/postgresql/pgaccess/main.tcl
+@dirrm share/postgresql/pgaccess/images
+@dirrm share/postgresql/pgaccess/lib/help
+@dirrm share/postgresql/pgaccess/lib/languages
+@dirrm share/postgresql/pgaccess/lib
+@dirrm share/postgresql/pgaccess
diff --git a/databases/postgresql84-server/scripts/configure b/databases/postgresql84-server/scripts/configure
deleted file mode 100644
index 4a92ee4..0000000
--- a/databases/postgresql84-server/scripts/configure
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /bin/sh
-
-# $FreeBSD$
-
-cd $WRKSRC || exit 1
-
-perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=; s=!!PREFIX!!=${PREFIX}=" ${WRKSRC}/interfaces/jdbc/Makefile
diff --git a/databases/postgresql84-server/scripts/configure.postgresql b/databases/postgresql84-server/scripts/configure.postgresql
index f729cb2..5dc646d 100644
--- a/databases/postgresql84-server/scripts/configure.postgresql
+++ b/databases/postgresql84-server/scripts/configure.postgresql
@@ -10,26 +10,22 @@ fi
 
 if [ ! "${BATCH}" ]; then
 	dialog --title "Backup your data NOW" \
-	--msgbox "`sed -e \"s#%%WRKDIR%%#${WRKDIR}#; s#%%DISTNAME%%#${DISTNAME}#\" < ${FILESDIR}/pre-install-notes`" \
+	--msgbox "`sed -e \"s#%%PREFIX%%#${PREFIX}#\" < ${FILESDIR}/pre-install-notes`" \
 	-1 -1
 fi
 
-#SSL=${NO_OPENSSL:+OFF}
-#SSL=${NOSSL:-ON}
-
 if [ "${BATCH}" ]; then
-	set \"MultiByte\"
+	set \"MultiByte\" \"ODBC\" \"SSL\"
 else
 	/usr/bin/dialog --title "configuration options" --clear \
 					--checklist "\n\
-Please select desired options:" -1 -1 8 \
+Please select desired options:" -1 -1 7 \
 JDBC       "Java DataBase Connectivity" OFF \
 MultiByte  "Multibyte for Multilingualism" ON \
 ODBC       "Open Database Connectivity" OFF \
-Perl       "Perl" OFF \
 TCL        "Tcl" ON \
 TCLTK      "Tcl/Tk" ON \
-SSL        "Secure Socket Layer (requires certificate)" OFF \
+SSL        "Secure Socket Layer" ON \
 KRB5       "Kerberos 5" OFF \
 2> /tmp/checklist.tmp.$$
 
@@ -57,26 +53,46 @@ exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 while [ "$1" ]; do
 	case $1 in
 		\"JDBC\")
-			# use JAVA_HOME if set correctly
+			# We use JAVA_HOME if set correctly. If the user has
+			# specified a JVM with JAVA_HOME or via the javavmwrapper,
+			# we validate that it really exists. It is unnecessarily
+			# complicated and error prone to try to figure out the
+			# correct java version just to be able to determine a
+			# BUILD_DEPEND in this case. Instead, assume that a set
+			# JAVA_HOME together with simple sanity check mean we have
+			# an installed JVM, and we don't bother setting
+			# BUILD_DEPENDS.
+
 			echo "# JDBC"
-			if [ "${JAVA_HOME}" -a -x ${JAVA_HOME}/bin/javac ]; then
+			# if JAVA_HOME is set and exists, use it
+			if [ "${JAVA_HOME}" -a -x "${JAVA_HOME}/bin/javac" ]; then
 				echo JAVA_HOME=${JAVA_HOME}
-				if [ "$(${JAVA_HOME}/bin/java -version 2>&1 | egrep \"1.1)" ]; then
-				    JAVAVERSION=1
-					echo BUILD_DEPENDS+=    ${JAVA_HOME}/bin/javac:\${PORTSDIR}/java/jdk
+			else
+				# No JAVA_HOME, check javavmwrapper's config file
+				if [ -r "${LOCALBASE}/etc/javavms" ]; then
+					VMS=`/usr/bin/sed 's|#.*||' < "${LOCALBASE}/etc/javavms" | uniq`
+					for JAVAVM in ${VMS}; do
+						if [ -x "${JAVAVM}" ]; then
+							JAVA_HOME=`echo ${JAVAVM} | /usr/bin/sed 's|/bin/java$||`
+							break
+						fi
+					done
+				fi
+				if [ "${JAVA_HOME}" -a -x "${JAVA_HOME}/bin/javac" ]; then
+					# yep, wrapper was good
+					echo JAVA_HOME=${JAVA_HOME}
 				else
-					JAVAVERSION=2
-					echo BUILD_DEPENDS+=    ${JAVA_HOME}/bin/javac:\${PORTSDIR}/java/jdk12-beta
+					# nothing, use our boring 1.1.8, the only native non-beta jdk :(
+					echo BUILD_DEPENDS+=    \${LOCALBASE}/jdk1.1.8/bin/javac:\${PORTSDIR}/java/jdk
+					echo JAVA_HOME=\${LOCALBASE}/jdk1.1.8
 				fi
-			else
-				JAVAVERSION=1
-				echo BUILD_DEPENDS+=    \${LOCALBASE}/jdk1.1.8/bin/javac:\${PORTSDIR}/java/jdk
-				echo JAVA_HOME=\${LOCALBASE}/jdk1.1.8
 			fi
 			cat <<-EOF
-				JAVAVERSION=${JAVAVERSION}
+				BUILD_DEPENDS+=	ant:\${PORTSDIR}/devel/jakarta-ant
 				WITH_JDBC=YES
-				SCRIPTS_ENV+=     JAVA_HOME=\${JAVA_HOME}
+				MAKE_ENV+=	JAVA_HOME=\${JAVA_HOME}
+				SCRIPTS_ENV+=	JAVA_HOME=\${JAVA_HOME}
+				CONFIGURE_ARGS+=	--with-java
 
 			EOF
 			;;
@@ -91,14 +107,6 @@ while [ "$1" ]; do
 
 			EOF
 			;;
-		\"Perl\")
-			cat <<-EOF
-				# PERL
-				WITH_PERL=YES
-				CONFIGURE_ARGS+=  --with-perl
-
-			EOF
-			;;
 		\"TCL\")
 			TCL=1
 			;;
@@ -115,6 +123,7 @@ while [ "$1" ]; do
 				CFLAGS+=	-DUSE_SSL
 				WITH_SSL=	yes
 				CONFIGURE_ENV+=	LDFLAGS="-L\${OPENSSLLIB} -lssl -lcrypto"
+				CONFIGURE_ARGS+=	--with-openssl
 
 			EOF
 			;;
@@ -215,15 +224,17 @@ if [ "${TCL}" ]; then
 	cat <<-EOF >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 		CONFIGURE_ARGS+= --with-tcl --with-tclconfig="\${TCLCONFIG}"
 		TCLV=\${WITH_TCL:S/.//}
-		TCL_INCDIR=    \${LOCALBASE}/include/tcl\${WITH_TCL}
-		MAKE_ENV=      TCL_INCDIR=\${TCL_INCDIR}
-		LIB_DEPENDS=   tcl\${TCLV}.1:\${PORTSDIR}/lang/tcl\${TCLV}
-		TCLCONFIG=     '\${LOCALBASE}/lib/tcl\${WITH_TCL}'
+		TCL_INCDIR=		\${LOCALBASE}/include/tcl\${WITH_TCL}
+		MAKE_ENV+=		TCL_INCDIR=\${TCL_INCDIR}
+		LIB_DEPENDS+=	tcl\${TCLV}:\${PORTSDIR}/lang/tcl\${TCLV}
+		TCLCONFIG=		"\${LOCALBASE}/lib/tcl\${WITH_TCL}"
 		.if defined(WITH_TK)
-		TK_INCDIR=     \${LOCALBASE}/include/tk\${WITH_TCL}
-		CONFIGURE_ENV+=        WISH=\${LOCALBASE}/bin/wish\${WITH_TCL}
-		LIB_DEPENDS+=  tk\${TCLV}.1:\${PORTSDIR}/x11-toolkits/tk\${TCLV}
-		TCLCONFIG+=    '\${LOCALBASE}/lib/tk\${WITH_TCL}'
+		CONFIGURE_ARGS+= --with-tkconfig="\${TKCONFIG}"
+		TK_INCDIR=		\${LOCALBASE}/include/tk\${WITH_TCL}
+		CONFIGURE_ENV+=	WISH=\${LOCALBASE}/bin/wish\${WITH_TCL}
+		LIB_DEPENDS+=	tk\${TCLV}:\${PORTSDIR}/x11-toolkits/tk\${TCLV}
+		TKCONFIG=		"\${LOCALBASE}/lib/tk\${WITH_TCL}"
+		TCLCONFIG+=		\${TKCONFIG}
 		TCL_PLIST=     pkg-plist.tcl
 		.else
 		TCL_PLIST=     pkg-plist.notk
@@ -259,8 +270,7 @@ if [ "${KRB5}" ]; then
 	fi
 	cat <<-EOF >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 		.if defined(KRB5_HOME) && exists(\${KRB5_HOME})
-		CONFIGURE_KRB=	--with-krb5=\${KRB5_HOME} \
-						--with-krb-keytab=FILE:\${PREFIX}/pgsql/etc/keytab
+		CONFIGURE_KRB=	--with-krb5=\${KRB5_HOME}
 		.endif
 
 	EOF
diff --git a/databases/postgresql84-server/scripts/createuser b/databases/postgresql84-server/scripts/createuser
deleted file mode 100644
index 2abe201..0000000
--- a/databases/postgresql84-server/scripts/createuser
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/perl
-#
-
-eval '(exit $?0)' && eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-& eval 'exec /usr/bin/perl -S $0 $argv:q'
-if 0;
-
-if( $> ) {
-	print "\nYou must be root to run this step!\n\n";
-	exit 1;
-} 
-
-if( getpwnam( "pgsql" ) ) {
-	( $null, $null, $pgUID ) = getpwnam( "pgsql" );
-} else {
-	$pgUID = 70;
-	while( getpwuid( $pgUID ) ) {
-		$pgUID++;
-	}
-}
-
-if( getgrnam( "pgsql" ) ) {
-	( $null, $null, $pgGID ) = getgrnam( "pgsql" );
-} else {
-	$pgGID = 70;
-	while( getgrgid( $pgGID ) ) {
-		$pgGID++;
-	}
-	&append_file( "/etc/group", "pgsql:*:$pgGID:" );
-}
-
-print "pgsql user using uid $pgUID\n";
-print "pgsql user using gid $pgGID\n";
-
-system( "/usr/bin/chpass -a \"pgsql:*:$pgUID:$pgGID\:\:0:0:PostgreSQL pseudo-user:$ENV{'PREFIX'}/pgsql:/bin/sh\"" );
-
-sub append_file {
-	local($file,@list) = @_;
-	local($LOCK_EX) = 2;
-	local($LOCK_NB) = 4;
-	local($LOCK_UN) = 8;
-
-	open(F, ">> $file") || die "$file: $!\n";
-	while( ! flock( F, $LOCK_EX | $LOCK_NB ) ) {
-		exit 1;
-	}
-	print F join( "\n", @list) . "\n";
-	close F;
-	flock( F, $LOCK_UN );
-}
author	vanilla <vanilla@FreeBSD.org>	2001-04-21 11:34:34 +0000
committer	vanilla <vanilla@FreeBSD.org>	2001-04-21 11:34:34 +0000
commit	4f94b9c8c7df606bab11c747db7be3620e297d1c (patch)
tree	700864a63bbc708a48896f72aeb04fb514a3cce9 /databases/postgresql84-server
parent	1a399aa4c7a2c71c3b2d431b42e1b62812fc3faf (diff)
download	FreeBSD-ports-4f94b9c8c7df606bab11c747db7be3620e297d1c.zip FreeBSD-ports-4f94b9c8c7df606bab11c747db7be3620e297d1c.tar.gz