4 files changed, 290 insertions, 272 deletions

diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 996534419d68..ead9c0b97909 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	postgresql
-PORTVERSION=	6.5.3
+PORTVERSION=	7.0beta5
 CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.postgresql.org/pub/ \
+MASTER_SITES=	ftp://ftp.de.postgresql.org/ \
+		ftp://ftp.postgresql.org/pub/ \
 		ftp://ftp.iodynamics.com/pub/mirror/postgresql/ \
-		ftp://ftp.de.postgresql.org/ \
 		ftp://ftp.digex.net/pub/packages/database/postgresql/ \
 		ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/
 
@@ -44,6 +44,7 @@ SCRIPTS_ENV+=	JAVA_HOME=${JAVA_HOME}
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
+DOCDIR=		${WRKDIR}/${DISTNAME}/doc
 
 USE_GMAKE=	YES
 MAKEFILE=	GNUmakefile
@@ -55,26 +56,22 @@ CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \
 		${CONFIGURE_TCL} \
 		--with-libraries=${PREFIX}/lib
 
-INSTALL_TARGET= install install-man
-
-MAN1=		cleardbdir.1 createdb.1 createuser.1 destroydb.1 \
-		destroyuser.1 ecpg.1 initdb.1 initlocation.1 \
-		ipcclean.1 pg_dump.1 pg_dumpall.1 pg_passwd.1 \
-		pg_upgrade.1 postgres.1 postmaster.1 psql.1
-MAN3=		catalogs.3 libpq.3
-MAN5=		pg_hba.conf.5
+MAN1=		createdb.1 createlang.1 createuser.1 destroydb.1 destroylang.1 \
+		destroyuser.1 initdb.1 initlocation.1 ipcclean.1 pg_dump.1 \
+		pg_dumpall.1 pg_upgrade.1 pgaccess.1 pgadmin.1 pgtclsh.1 \
+		pgtksh.1 postgres.1 postmaster.1 psql.1 vacuumdb.1
 MANL=		abort.l alter_table.l alter_user.l begin.l close.l cluster.l \
 		commit.l copy.l create_aggregate.l create_database.l \
 		create_function.l create_index.l create_language.l \
 		create_operator.l create_rule.l create_sequence.l \
-		create_table.l create_trigger.l create_type.l create_user.l \
-		create_version.l create_view.l declare.l delete.l drop.l \
+		create_table.l create_table_as.l create_trigger.l \
+		create_type.l create_user.l create_view.l declare.l delete.l \
 		drop_aggregate.l drop_database.l drop_function.l drop_index.l \
 		drop_language.l drop_operator.l drop_rule.l drop_sequence.l \
 		drop_table.l drop_trigger.l drop_type.l drop_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 reset.l revoke.l rollback.l \
-		select.l set.l show.l sql.l update.l vacuum.l
+		drop_view.l explain.l fetch.l grant.l insert.l listen.l load.l \
+		lock.l move.l notify.l reset.l revoke.l rollback.l select.l \
+		select_into.l set.l show.l unlisten.l update.l vacuum.l
 
 MANPREFIX=	${PREFIX}/pgsql
 
@@ -133,6 +130,11 @@ pre-install:
 	@ ${SETENV} ${MAKE_ENV} perl ${SCRIPTDIR}/createuser
 
 post-install:
+.if defined(NOPORTDOCS)
+	@ ( cd ${DOCDIR}; ${GMAKE} man )
+.else
+	@ ( cd ${DOCDIR}; ${GMAKE} install )
+.endif
 	@ if [ ! -f ${PREFIX}/pgsql/.profile ]; then \
 		${ECHO} "PATH=${PATH}:${PREFIX}/pgsql/bin" \
 			> ${PREFIX}/pgsql/.profile; \
@@ -194,7 +196,7 @@ post-install:
 	@ ${GMAKE} -C ${WRKDIR}/${DISTNAME}/doc 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/TODO ${PREFIX}/share/doc/pgsql
 	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
 .endif
 .if !defined(BATCH)
diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo
index d831c26206f7..8952dfb2e31b 100644
--- a/databases/postgresql92-server/distinfo
+++ b/databases/postgresql92-server/distinfo
@@ -1 +1 @@
-MD5 (postgresql-6.5.3.tar.gz) = 098d1ee4316500a2d033ced3ebd5b831
+MD5 (postgresql-7.0beta5.tar.gz) = 26518db34cf4dbe2e0eebb5717633a8a
diff --git a/databases/postgresql92-server/files/patch-ba b/databases/postgresql92-server/files/patch-ba
index 129a60c3d2f3..a3b679b882c5 100644
--- a/databases/postgresql92-server/files/patch-ba
+++ b/databases/postgresql92-server/files/patch-ba
@@ -1,12 +1,12 @@
---- interfaces/jdbc/Makefile.orig	Tue May 18 09:01:41 1999
-+++ interfaces/jdbc/Makefile	Mon Jun 28 19:16:12 1999
+--- interfaces/jdbc/Makefile.orig	Tue Mar 14 16:55:17 2000
++++ interfaces/jdbc/Makefile	Sun Apr 16 21:16:43 2000
 @@ -10,10 +10,10 @@
  
  FIND		= find
  IDL2JAVA	= idltojava -fno-cpp -fno-tie
 -JAR		= jar
 -JAVA		= java
--JAVAC		= javac
+-JAVAC		= javac -g
 -JAVADOC		= javadoc
 +JAR		= !!JAVA_HOME!!/bin/jar
 +JAVA		= !!JAVA_HOME!!/bin/java
@@ -15,18 +15,11 @@
  RM		= rm -f
  TOUCH		= touch
  
-@@ -27,11 +27,11 @@
- # In 6.5, the all rule builds the makeVersion class which then calls make using
- # the jdbc1 or jdbc2 rules
- all:	makeVersion.class
--	make $$($(JAVA) makeVersion)
-+	${MAKE} $$($(JAVA) makeVersion)
+@@ -40,6 +40,7 @@
+ 	@echo To compile, type:
+ 	@echo "  $(MAKE) jdbc2"
+ 	@echo ------------------------------------------------------------
++	$(MAKE) jdbc1
+ 
+ msg:	
  	@echo ------------------------------------------------------------
- 	@echo The JDBC driver has now been built. To make it available to
--	@echo other applications, copy the postgresql.jar file to a public
--	@echo "place (under unix this could be /usr/local/lib) and add it"
-+	@echo other applications, add the path
-+	@echo !!PREFIX!!/share/java/postgresql.jar
- 	@echo to the class path.
- 	@echo
- 	@echo Then either add -Djdbc.drivers=postgresql.Driver to the
diff --git a/databases/postgresql92-server/pkg-plist b/databases/postgresql92-server/pkg-plist
index e5b4226c1643..6998caa771a7 100644
--- a/databases/postgresql92-server/pkg-plist
+++ b/databases/postgresql92-server/pkg-plist
@@ -1,23 +1,23 @@
 etc/rc.d/pgsql.sh
 pgsql/.profile
-pgsql/bin/cleardbdir
 pgsql/bin/createdb
 pgsql/bin/createlang
 pgsql/bin/createuser
-pgsql/bin/destroydb
-pgsql/bin/destroylang
-pgsql/bin/destroyuser
+pgsql/bin/dropdb
+pgsql/bin/droplang
+pgsql/bin/dropuser
 pgsql/bin/ecpg
 pgsql/bin/initdb
 pgsql/bin/initlocation
 pgsql/bin/ipcclean
-pgsql/bin/pgaccess
+pgsql/bin/pg_ctl
 pgsql/bin/pg_dump
 pgsql/bin/pg_dumpall
 pgsql/bin/pg_id
 pgsql/bin/pg_passwd
 pgsql/bin/pg_upgrade
 pgsql/bin/pg_version
+pgsql/bin/pgaccess
 pgsql/bin/postgres
 pgsql/bin/postmaster
 pgsql/bin/psql
@@ -25,13 +25,16 @@ pgsql/bin/vacuumdb
 pgsql/data/PG_VERSION
 pgsql/data/base/template1/PG_VERSION
 pgsql/data/base/template1/pg_aggregate
+pgsql/data/base/template1/pg_aggregate_name_type_index
 pgsql/data/base/template1/pg_am
+pgsql/data/base/template1/pg_am_name_index
 pgsql/data/base/template1/pg_amop
+pgsql/data/base/template1/pg_amop_opid_index
+pgsql/data/base/template1/pg_amop_strategy_index
 pgsql/data/base/template1/pg_amproc
 pgsql/data/base/template1/pg_attrdef
 pgsql/data/base/template1/pg_attrdef_adrelid_index
 pgsql/data/base/template1/pg_attribute
-pgsql/data/base/template1/pg_attribute_attrelid_index
 pgsql/data/base/template1/pg_attribute_relid_attnam_index
 pgsql/data/base/template1/pg_attribute_relid_attnum_index
 pgsql/data/base/template1/pg_class
@@ -39,40 +42,56 @@ pgsql/data/base/template1/pg_class_oid_index
 pgsql/data/base/template1/pg_class_relname_index
 pgsql/data/base/template1/pg_description
 pgsql/data/base/template1/pg_description_objoid_index
+pgsql/data/base/template1/pg_group_name_index
+pgsql/data/base/template1/pg_group_sysid_index
 pgsql/data/base/template1/pg_index
+pgsql/data/base/template1/pg_index_indexrelid_index
 pgsql/data/base/template1/pg_indexes
 pgsql/data/base/template1/pg_inheritproc
 pgsql/data/base/template1/pg_inherits
+pgsql/data/base/template1/pg_inherits_relid_seqno_index
 pgsql/data/base/template1/pg_ipl
 pgsql/data/base/template1/pg_language
+pgsql/data/base/template1/pg_language_name_index
+pgsql/data/base/template1/pg_language_oid_index
 pgsql/data/base/template1/pg_listener
+pgsql/data/base/template1/pg_listener_relname_pid_index
 pgsql/data/base/template1/pg_opclass
+pgsql/data/base/template1/pg_opclass_deftype_index
+pgsql/data/base/template1/pg_opclass_name_index
 pgsql/data/base/template1/pg_operator
+pgsql/data/base/template1/pg_operator_oid_index
+pgsql/data/base/template1/pg_operator_oprname_l_r_k_index
 pgsql/data/base/template1/pg_proc
 pgsql/data/base/template1/pg_proc_oid_index
 pgsql/data/base/template1/pg_proc_proname_narg_type_index
-pgsql/data/base/template1/pg_proc_prosrc_index
 pgsql/data/base/template1/pg_relcheck
 pgsql/data/base/template1/pg_relcheck_rcrelid_index
 pgsql/data/base/template1/pg_rewrite
+pgsql/data/base/template1/pg_rewrite_oid_index
+pgsql/data/base/template1/pg_rewrite_rulename_index
 pgsql/data/base/template1/pg_rules
 pgsql/data/base/template1/pg_statistic
+pgsql/data/base/template1/pg_statistic_relid_att_index
 pgsql/data/base/template1/pg_tables
 pgsql/data/base/template1/pg_trigger
+pgsql/data/base/template1/pg_trigger_tgconstrname_index
+pgsql/data/base/template1/pg_trigger_tgconstrrelid_index
 pgsql/data/base/template1/pg_trigger_tgrelid_index
 pgsql/data/base/template1/pg_type
 pgsql/data/base/template1/pg_type_oid_index
 pgsql/data/base/template1/pg_type_typname_index
 pgsql/data/base/template1/pg_user
 pgsql/data/base/template1/pg_views
+pgsql/data/pg_control
 pgsql/data/pg_database
 pgsql/data/pg_geqo.sample
 pgsql/data/pg_group
 pgsql/data/pg_hba.conf
 pgsql/data/pg_log
-pgsql/data/pg_pwd
 pgsql/data/pg_shadow
 pgsql/data/pg_variable
+pgsql/data/postmaster.opts.default
 pgsql/include/access/attnum.h
 pgsql/include/c.h
 pgsql/include/commands/trigger.h
@@ -83,7 +102,8 @@ pgsql/include/ecpgtype.h
 pgsql/include/executor/spi.h
 pgsql/include/fmgr.h
 pgsql/include/lib/dllist.h
-pgsql/include/libpq++.H
+pgsql/include/libpgeasy.h
+pgsql/include/libpq++.h
 pgsql/include/libpq++/pgconnection.h
 pgsql/include/libpq++/pgcursordb.h
 pgsql/include/libpq++/pgdatabase.h
@@ -96,6 +116,8 @@ pgsql/include/libpq/pqcomm.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
@@ -106,6 +128,9 @@ 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
@@ -116,7 +141,9 @@ 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_options.sample
 pgsql/lib/plpgsql.so
+pgsql/lib/postmaster.opts.default.sample
 pgsql/pgaccess/images/icon_button.gif
 pgsql/pgaccess/images/icon_checkbutton.gif
 pgsql/pgaccess/images/icon_entry.gif
@@ -223,10 +250,16 @@ 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/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
@@ -250,8 +283,9 @@ share/doc/pgsql/FAQ_FreeBSD
 share/doc/pgsql/FAQ_HPUX
 share/doc/pgsql/FAQ_Irix
 share/doc/pgsql/FAQ_Linux
-share/doc/pgsql/FAQ_Solaris
+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
@@ -265,75 +299,70 @@ share/doc/pgsql/admin/admin.htm
 share/doc/pgsql/admin/admin.html
 share/doc/pgsql/admin/biblio.htm
 share/doc/pgsql/admin/config.htm
-share/doc/pgsql/admin/config495.htm
-share/doc/pgsql/admin/config570.htm
-share/doc/pgsql/admin/config607.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-win321181.htm
-share/doc/pgsql/admin/install-win321190.htm
 share/doc/pgsql/admin/install.htm
-share/doc/pgsql/admin/install1119.htm
-share/doc/pgsql/admin/install1139.htm
-share/doc/pgsql/admin/install1148.htm
-share/doc/pgsql/admin/install761.htm
 share/doc/pgsql/admin/intro-ag.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-ag1578.htm
-share/doc/pgsql/admin/manage-ag1621.htm
-share/doc/pgsql/admin/manage-ag1630.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/ports428.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/regress1794.htm
-share/doc/pgsql/admin/regress1801.htm
-share/doc/pgsql/admin/regress1838.htm
 share/doc/pgsql/admin/release.htm
-share/doc/pgsql/admin/release1893.htm
-share/doc/pgsql/admin/release1975.htm
-share/doc/pgsql/admin/release1986.htm
-share/doc/pgsql/admin/release1997.htm
-share/doc/pgsql/admin/release2038.htm
-share/doc/pgsql/admin/release2054.htm
-share/doc/pgsql/admin/release2073.htm
-share/doc/pgsql/admin/release2117.htm
-share/doc/pgsql/admin/release2139.htm
-share/doc/pgsql/admin/release2154.htm
-share/doc/pgsql/admin/release2163.htm
-share/doc/pgsql/admin/release2186.htm
-share/doc/pgsql/admin/release2200.htm
-share/doc/pgsql/admin/release2203.htm
-share/doc/pgsql/admin/release2228.htm
-share/doc/pgsql/admin/release2265.htm
-share/doc/pgsql/admin/release2272.htm
-share/doc/pgsql/admin/release2279.htm
-share/doc/pgsql/admin/release2286.htm
-share/doc/pgsql/admin/release2290.htm
 share/doc/pgsql/admin/runtime.htm
 share/doc/pgsql/admin/security.htm
-share/doc/pgsql/admin/security1467.htm
-share/doc/pgsql/admin/security1486.htm
-share/doc/pgsql/admin/security1510.htm
 share/doc/pgsql/admin/terminology.htm
 share/doc/pgsql/admin/trouble.htm
-share/doc/pgsql/admin/trouble1696.htm
-share/doc/pgsql/admin/trouble1711.htm
+share/doc/pgsql/admin/x1118.htm
+share/doc/pgsql/admin/x1138.htm
+share/doc/pgsql/admin/x1147.htm
+share/doc/pgsql/admin/x1180.htm
+share/doc/pgsql/admin/x1189.htm
+share/doc/pgsql/admin/x1466.htm
+share/doc/pgsql/admin/x1485.htm
+share/doc/pgsql/admin/x1509.htm
+share/doc/pgsql/admin/x1574.htm
+share/doc/pgsql/admin/x1608.htm
+share/doc/pgsql/admin/x1625.htm
+share/doc/pgsql/admin/x1640.htm
+share/doc/pgsql/admin/x1723.htm
+share/doc/pgsql/admin/x1730.htm
+share/doc/pgsql/admin/x1767.htm
+share/doc/pgsql/admin/x1893.htm
+share/doc/pgsql/admin/x1904.htm
+share/doc/pgsql/admin/x1915.htm
+share/doc/pgsql/admin/x1956.htm
+share/doc/pgsql/admin/x1972.htm
+share/doc/pgsql/admin/x1991.htm
+share/doc/pgsql/admin/x2035.htm
+share/doc/pgsql/admin/x2057.htm
+share/doc/pgsql/admin/x2072.htm
+share/doc/pgsql/admin/x2081.htm
+share/doc/pgsql/admin/x2104.htm
+share/doc/pgsql/admin/x2118.htm
+share/doc/pgsql/admin/x2121.htm
+share/doc/pgsql/admin/x2146.htm
+share/doc/pgsql/admin/x2183.htm
+share/doc/pgsql/admin/x2190.htm
+share/doc/pgsql/admin/x2197.htm
+share/doc/pgsql/admin/x2204.htm
+share/doc/pgsql/admin/x2208.htm
+share/doc/pgsql/admin/x427.htm
+share/doc/pgsql/admin/x494.htm
+share/doc/pgsql/admin/x569.htm
+share/doc/pgsql/admin/x606.htm
+share/doc/pgsql/admin/x760.htm
 share/doc/pgsql/admin/y2k.htm
 share/doc/pgsql/postgres/about.htm
 share/doc/pgsql/postgres/advanced.htm
-share/doc/pgsql/postgres/advanced23214.htm
-share/doc/pgsql/postgres/advanced23236.htm
-share/doc/pgsql/postgres/advanced23256.htm
 share/doc/pgsql/postgres/app-createdb.htm
 share/doc/pgsql/postgres/app-createuser.htm
 share/doc/pgsql/postgres/app-destroydb.htm
@@ -351,161 +380,47 @@ share/doc/pgsql/postgres/app-vacuumdb.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/bki21904.htm
-share/doc/pgsql/postgres/bki21989.htm
-share/doc/pgsql/postgres/bki22013.htm
-share/doc/pgsql/postgres/bki22074.htm
 share/doc/pgsql/postgres/catalogs.gif
-share/doc/pgsql/postgres/clientserver.gif
 share/doc/pgsql/postgres/compiler.htm
 share/doc/pgsql/postgres/config.htm
-share/doc/pgsql/postgres/config12627.htm
-share/doc/pgsql/postgres/config12702.htm
-share/doc/pgsql/postgres/config12739.htm
 share/doc/pgsql/postgres/connections.gif
 share/doc/pgsql/postgres/copyright.htm
-share/doc/pgsql/postgres/createtableas.htm
 share/doc/pgsql/postgres/cvs.htm
-share/doc/pgsql/postgres/cvs23724.htm
-share/doc/pgsql/postgres/cvs23780.htm
 share/doc/pgsql/postgres/datatype.htm
-share/doc/pgsql/postgres/datatype1380.htm
-share/doc/pgsql/postgres/datatype1412.htm
-share/doc/pgsql/postgres/datatype1511.htm
-share/doc/pgsql/postgres/datatype703.htm
-share/doc/pgsql/postgres/datatype729.htm
-share/doc/pgsql/postgres/datatype793.htm
 share/doc/pgsql/postgres/datetime-appendix.htm
-share/doc/pgsql/postgres/datetime-appendix23641.htm
 share/doc/pgsql/postgres/dfunc.htm
-share/doc/pgsql/postgres/dfunc15567.htm
-share/doc/pgsql/postgres/dfunc15577.htm
 share/doc/pgsql/postgres/disk.htm
 share/doc/pgsql/postgres/docguide.htm
-share/doc/pgsql/postgres/docguide24006.htm
-share/doc/pgsql/postgres/docguide24037.htm
-share/doc/pgsql/postgres/docguide25253.htm
-share/doc/pgsql/postgres/docguide25274.htm
-share/doc/pgsql/postgres/docguide25300.htm
-share/doc/pgsql/postgres/docguide25388.htm
-share/doc/pgsql/postgres/docguide25668.htm
 share/doc/pgsql/postgres/ecpg.htm
-share/doc/pgsql/postgres/ecpg17490.htm
-share/doc/pgsql/postgres/ecpg17508.htm
-share/doc/pgsql/postgres/ecpg17650.htm
-share/doc/pgsql/postgres/ecpg17660.htm
-share/doc/pgsql/postgres/ecpg17680.htm
-share/doc/pgsql/postgres/ecpg17685.htm
 share/doc/pgsql/postgres/environ.htm
 share/doc/pgsql/postgres/extend.htm
-share/doc/pgsql/postgres/extend14525.htm
-share/doc/pgsql/postgres/extend14537.htm
 share/doc/pgsql/postgres/func-ref.htm
 share/doc/pgsql/postgres/functions.htm
-share/doc/pgsql/postgres/functions2183.htm
-share/doc/pgsql/postgres/functions2221.htm
-share/doc/pgsql/postgres/functions2364.htm
-share/doc/pgsql/postgres/functions2449.htm
-share/doc/pgsql/postgres/functions2667.htm
-share/doc/pgsql/postgres/geqo-biblio.htm
 share/doc/pgsql/postgres/geqo.htm
-share/doc/pgsql/postgres/geqo20921.htm
-share/doc/pgsql/postgres/geqo20944.htm
-share/doc/pgsql/postgres/geqo20982.htm
 share/doc/pgsql/postgres/gist.htm
 share/doc/pgsql/postgres/index.html
 share/doc/pgsql/postgres/inherit.htm
 share/doc/pgsql/postgres/install-win32.htm
-share/doc/pgsql/postgres/install-win3213313.htm
-share/doc/pgsql/postgres/install-win3213322.htm
 share/doc/pgsql/postgres/install.htm
-share/doc/pgsql/postgres/install12893.htm
-share/doc/pgsql/postgres/install13251.htm
-share/doc/pgsql/postgres/install13271.htm
-share/doc/pgsql/postgres/install13280.htm
 share/doc/pgsql/postgres/intro.htm
-share/doc/pgsql/postgres/intro177.htm
-share/doc/pgsql/postgres/intro60.htm
 share/doc/pgsql/postgres/jdbc.htm
-share/doc/pgsql/postgres/jdbc20288.htm
-share/doc/pgsql/postgres/jdbc20301.htm
-share/doc/pgsql/postgres/jdbc20308.htm
-share/doc/pgsql/postgres/jdbc20316.htm
-share/doc/pgsql/postgres/jdbc20334.htm
-share/doc/pgsql/postgres/jdbc20371.htm
-share/doc/pgsql/postgres/jdbc20402.htm
-share/doc/pgsql/postgres/jdbc20406.htm
-share/doc/pgsql/postgres/jdbc20410.htm
-share/doc/pgsql/postgres/jdbc20429.htm
-share/doc/pgsql/postgres/jdbc20459.htm
 share/doc/pgsql/postgres/keys.htm
 share/doc/pgsql/postgres/largeobjects.htm
-share/doc/pgsql/postgres/largeobjects17378.htm
-share/doc/pgsql/postgres/largeobjects17381.htm
-share/doc/pgsql/postgres/largeobjects17433.htm
-share/doc/pgsql/postgres/largeobjects17440.htm
-share/doc/pgsql/postgres/largeobjects17444.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-chapter18058.htm
-share/doc/pgsql/postgres/libpq-chapter18164.htm
-share/doc/pgsql/postgres/libpq-chapter18210.htm
-share/doc/pgsql/postgres/libpq-chapter18220.htm
-share/doc/pgsql/postgres/libpq-chapter18236.htm
-share/doc/pgsql/postgres/libpq-chapter18268.htm
-share/doc/pgsql/postgres/libpq-chapter18281.htm
-share/doc/pgsql/postgres/libpq-chapter18296.htm
-share/doc/pgsql/postgres/libpq-chapter18372.htm
-share/doc/pgsql/postgres/libpq-chapter18375.htm
 share/doc/pgsql/postgres/libpq-envars.htm
 share/doc/pgsql/postgres/libpqplusplus.htm
-share/doc/pgsql/postgres/libpqplusplus18476.htm
-share/doc/pgsql/postgres/libpqplusplus18486.htm
-share/doc/pgsql/postgres/libpqplusplus18516.htm
-share/doc/pgsql/postgres/libpqplusplus18617.htm
-share/doc/pgsql/postgres/libpqplusplus18640.htm
-share/doc/pgsql/postgres/libpqplusplus18683.htm
 share/doc/pgsql/postgres/manage-ag.htm
-share/doc/pgsql/postgres/manage-ag13710.htm
-share/doc/pgsql/postgres/manage-ag13753.htm
-share/doc/pgsql/postgres/manage-ag13762.htm
 share/doc/pgsql/postgres/manage.htm
-share/doc/pgsql/postgres/manage3306.htm
-share/doc/pgsql/postgres/manage3330.htm
-share/doc/pgsql/postgres/manage3371.htm
 share/doc/pgsql/postgres/mvcc.htm
-share/doc/pgsql/postgres/mvcc3058.htm
-share/doc/pgsql/postgres/mvcc3111.htm
-share/doc/pgsql/postgres/mvcc3123.htm
-share/doc/pgsql/postgres/mvcc3136.htm
-share/doc/pgsql/postgres/mvcc3213.htm
-share/doc/pgsql/postgres/mvcc3234.htm
 share/doc/pgsql/postgres/newuser.htm
 share/doc/pgsql/postgres/notation.htm
 share/doc/pgsql/postgres/odbc.htm
-share/doc/pgsql/postgres/odbc19825.htm
-share/doc/pgsql/postgres/odbc19863.htm
-share/doc/pgsql/postgres/odbc20031.htm
-share/doc/pgsql/postgres/odbc20053.htm
 share/doc/pgsql/postgres/operators.htm
-share/doc/pgsql/postgres/operators1716.htm
-share/doc/pgsql/postgres/operators1787.htm
-share/doc/pgsql/postgres/operators1857.htm
-share/doc/pgsql/postgres/operators1967.htm
-share/doc/pgsql/postgres/operators2026.htm
-share/doc/pgsql/postgres/operators2080.htm
 share/doc/pgsql/postgres/overview.htm
-share/doc/pgsql/postgres/overview20521.htm
-share/doc/pgsql/postgres/overview20546.htm
-share/doc/pgsql/postgres/overview20674.htm
-share/doc/pgsql/postgres/overview20730.htm
-share/doc/pgsql/postgres/overview20784.htm
 share/doc/pgsql/postgres/page.htm
-share/doc/pgsql/postgres/page22137.htm
-share/doc/pgsql/postgres/page22151.htm
 share/doc/pgsql/postgres/part-admin.htm
 share/doc/pgsql/postgres/part-appendix.htm
 share/doc/pgsql/postgres/part-developer.htm
@@ -533,64 +448,19 @@ 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/pgtcl18759.htm
-share/doc/pgsql/postgres/pgtcl18763.htm
 share/doc/pgsql/postgres/ports.htm
-share/doc/pgsql/postgres/ports12560.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/protocol21097.htm
-share/doc/pgsql/postgres/protocol21252.htm
-share/doc/pgsql/postgres/protocol21288.htm
 share/doc/pgsql/postgres/query.htm
-share/doc/pgsql/postgres/query23068.htm
-share/doc/pgsql/postgres/query23084.htm
-share/doc/pgsql/postgres/query23105.htm
-share/doc/pgsql/postgres/query23114.htm
-share/doc/pgsql/postgres/query23132.htm
-share/doc/pgsql/postgres/query23139.htm
-share/doc/pgsql/postgres/query23154.htm
-share/doc/pgsql/postgres/query23158.htm
-share/doc/pgsql/postgres/query23165.htm
 share/doc/pgsql/postgres/recovery.htm
 share/doc/pgsql/postgres/regress.htm
-share/doc/pgsql/postgres/regress13926.htm
-share/doc/pgsql/postgres/regress13933.htm
-share/doc/pgsql/postgres/regress13970.htm
 share/doc/pgsql/postgres/release.htm
-share/doc/pgsql/postgres/release14025.htm
-share/doc/pgsql/postgres/release14107.htm
-share/doc/pgsql/postgres/release14118.htm
-share/doc/pgsql/postgres/release14129.htm
-share/doc/pgsql/postgres/release14170.htm
-share/doc/pgsql/postgres/release14186.htm
-share/doc/pgsql/postgres/release14205.htm
-share/doc/pgsql/postgres/release14249.htm
-share/doc/pgsql/postgres/release14271.htm
-share/doc/pgsql/postgres/release14286.htm
-share/doc/pgsql/postgres/release14295.htm
-share/doc/pgsql/postgres/release14318.htm
-share/doc/pgsql/postgres/release14332.htm
-share/doc/pgsql/postgres/release14335.htm
-share/doc/pgsql/postgres/release14360.htm
-share/doc/pgsql/postgres/release14397.htm
-share/doc/pgsql/postgres/release14404.htm
-share/doc/pgsql/postgres/release14411.htm
-share/doc/pgsql/postgres/release14418.htm
-share/doc/pgsql/postgres/release14422.htm
 share/doc/pgsql/postgres/rules.htm
-share/doc/pgsql/postgres/rules14948.htm
-share/doc/pgsql/postgres/rules15109.htm
-share/doc/pgsql/postgres/rules15240.htm
-share/doc/pgsql/postgres/rules15254.htm
 share/doc/pgsql/postgres/runtime.htm
 share/doc/pgsql/postgres/security.htm
-share/doc/pgsql/postgres/security13599.htm
-share/doc/pgsql/postgres/security13618.htm
-share/doc/pgsql/postgres/security13642.htm
 share/doc/pgsql/postgres/signals.htm
 share/doc/pgsql/postgres/spi-spiconnect.htm
 share/doc/pgsql/postgres/spi-spicopytuple.htm
@@ -611,10 +481,6 @@ 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/spi16142.htm
-share/doc/pgsql/postgres/spi16855.htm
-share/doc/pgsql/postgres/spi16877.htm
-share/doc/pgsql/postgres/spi16882.htm
 share/doc/pgsql/postgres/sql-abort.htm
 share/doc/pgsql/postgres/sql-altertable.htm
 share/doc/pgsql/postgres/sql-alteruser.htm
@@ -666,43 +532,201 @@ 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-unlisten.htm
 share/doc/pgsql/postgres/sql-update.htm
 share/doc/pgsql/postgres/sql-vacuum-1.htm
 share/doc/pgsql/postgres/sql.htm
-share/doc/pgsql/postgres/sql22234.htm
-share/doc/pgsql/postgres/sql22352.htm
 share/doc/pgsql/postgres/start.htm
-share/doc/pgsql/postgres/start22962.htm
-share/doc/pgsql/postgres/start22979.htm
 share/doc/pgsql/postgres/storage.htm
 share/doc/pgsql/postgres/syntax.htm
-share/doc/pgsql/postgres/syntax439.htm
 share/doc/pgsql/postgres/terminology.htm
 share/doc/pgsql/postgres/triggers.htm
-share/doc/pgsql/postgres/triggers15613.htm
-share/doc/pgsql/postgres/triggers15619.htm
-share/doc/pgsql/postgres/triggers15627.htm
 share/doc/pgsql/postgres/trouble.htm
-share/doc/pgsql/postgres/trouble13828.htm
-share/doc/pgsql/postgres/trouble13843.htm
 share/doc/pgsql/postgres/typeconv.htm
-share/doc/pgsql/postgres/typeconv2785.htm
-share/doc/pgsql/postgres/typeconv2848.htm
-share/doc/pgsql/postgres/typeconv2901.htm
-share/doc/pgsql/postgres/typeconv2921.htm
 share/doc/pgsql/postgres/utilities.htm
+share/doc/pgsql/postgres/x1061.htm
+share/doc/pgsql/postgres/x1093.htm
+share/doc/pgsql/postgres/x1192.htm
+share/doc/pgsql/postgres/x120.htm
+share/doc/pgsql/postgres/x12039.htm
+share/doc/pgsql/postgres/x12106.htm
+share/doc/pgsql/postgres/x12181.htm
+share/doc/pgsql/postgres/x12218.htm
+share/doc/pgsql/postgres/x12372.htm
+share/doc/pgsql/postgres/x12730.htm
+share/doc/pgsql/postgres/x12750.htm
+share/doc/pgsql/postgres/x12759.htm
+share/doc/pgsql/postgres/x12792.htm
+share/doc/pgsql/postgres/x12801.htm
+share/doc/pgsql/postgres/x13078.htm
+share/doc/pgsql/postgres/x13097.htm
+share/doc/pgsql/postgres/x13121.htm
+share/doc/pgsql/postgres/x13186.htm
+share/doc/pgsql/postgres/x13220.htm
+share/doc/pgsql/postgres/x13237.htm
+share/doc/pgsql/postgres/x13252.htm
+share/doc/pgsql/postgres/x13335.htm
+share/doc/pgsql/postgres/x13342.htm
+share/doc/pgsql/postgres/x13379.htm
+share/doc/pgsql/postgres/x13505.htm
+share/doc/pgsql/postgres/x13516.htm
+share/doc/pgsql/postgres/x13527.htm
+share/doc/pgsql/postgres/x13568.htm
+share/doc/pgsql/postgres/x13584.htm
+share/doc/pgsql/postgres/x13603.htm
+share/doc/pgsql/postgres/x13647.htm
+share/doc/pgsql/postgres/x13669.htm
+share/doc/pgsql/postgres/x13684.htm
+share/doc/pgsql/postgres/x13693.htm
+share/doc/pgsql/postgres/x13716.htm
+share/doc/pgsql/postgres/x13730.htm
+share/doc/pgsql/postgres/x13733.htm
+share/doc/pgsql/postgres/x13758.htm
+share/doc/pgsql/postgres/x13795.htm
+share/doc/pgsql/postgres/x13802.htm
+share/doc/pgsql/postgres/x13809.htm
+share/doc/pgsql/postgres/x13816.htm
+share/doc/pgsql/postgres/x13820.htm
+share/doc/pgsql/postgres/x13923.htm
+share/doc/pgsql/postgres/x13935.htm
+share/doc/pgsql/postgres/x1397.htm
+share/doc/pgsql/postgres/x14061.htm
+share/doc/pgsql/postgres/x14346.htm
+share/doc/pgsql/postgres/x14507.htm
+share/doc/pgsql/postgres/x14638.htm
+share/doc/pgsql/postgres/x14652.htm
+share/doc/pgsql/postgres/x1468.htm
+share/doc/pgsql/postgres/x14965.htm
+share/doc/pgsql/postgres/x14975.htm
+share/doc/pgsql/postgres/x15011.htm
+share/doc/pgsql/postgres/x15017.htm
+share/doc/pgsql/postgres/x15025.htm
+share/doc/pgsql/postgres/x1538.htm
+share/doc/pgsql/postgres/x15540.htm
+share/doc/pgsql/postgres/x16253.htm
+share/doc/pgsql/postgres/x16275.htm
+share/doc/pgsql/postgres/x16280.htm
+share/doc/pgsql/postgres/x16328.htm
+share/doc/pgsql/postgres/x1648.htm
+share/doc/pgsql/postgres/x16598.htm
+share/doc/pgsql/postgres/x16776.htm
+share/doc/pgsql/postgres/x16779.htm
+share/doc/pgsql/postgres/x16831.htm
+share/doc/pgsql/postgres/x16838.htm
+share/doc/pgsql/postgres/x16842.htm
+share/doc/pgsql/postgres/x16888.htm
+share/doc/pgsql/postgres/x16906.htm
+share/doc/pgsql/postgres/x17048.htm
+share/doc/pgsql/postgres/x17058.htm
+share/doc/pgsql/postgres/x1707.htm
+share/doc/pgsql/postgres/x17078.htm
+share/doc/pgsql/postgres/x17083.htm
+share/doc/pgsql/postgres/x17456.htm
+share/doc/pgsql/postgres/x17562.htm
+share/doc/pgsql/postgres/x17608.htm
+share/doc/pgsql/postgres/x1761.htm
+share/doc/pgsql/postgres/x17618.htm
+share/doc/pgsql/postgres/x17634.htm
+share/doc/pgsql/postgres/x17666.htm
+share/doc/pgsql/postgres/x17679.htm
+share/doc/pgsql/postgres/x17694.htm
+share/doc/pgsql/postgres/x17773.htm
+share/doc/pgsql/postgres/x17776.htm
+share/doc/pgsql/postgres/x17880.htm
+share/doc/pgsql/postgres/x17890.htm
+share/doc/pgsql/postgres/x17920.htm
+share/doc/pgsql/postgres/x18021.htm
+share/doc/pgsql/postgres/x18044.htm
+share/doc/pgsql/postgres/x18087.htm
+share/doc/pgsql/postgres/x18163.htm
+share/doc/pgsql/postgres/x18167.htm
+share/doc/pgsql/postgres/x1864.htm
+share/doc/pgsql/postgres/x1902.htm
+share/doc/pgsql/postgres/x19229.htm
+share/doc/pgsql/postgres/x19267.htm
+share/doc/pgsql/postgres/x19435.htm
+share/doc/pgsql/postgres/x19457.htm
+share/doc/pgsql/postgres/x19692.htm
+share/doc/pgsql/postgres/x19705.htm
+share/doc/pgsql/postgres/x19712.htm
+share/doc/pgsql/postgres/x19720.htm
+share/doc/pgsql/postgres/x19738.htm
+share/doc/pgsql/postgres/x19775.htm
+share/doc/pgsql/postgres/x19806.htm
+share/doc/pgsql/postgres/x19810.htm
+share/doc/pgsql/postgres/x19814.htm
+share/doc/pgsql/postgres/x19833.htm
+share/doc/pgsql/postgres/x19863.htm
+share/doc/pgsql/postgres/x19925.htm
+share/doc/pgsql/postgres/x19950.htm
+share/doc/pgsql/postgres/x20078.htm
+share/doc/pgsql/postgres/x20134.htm
+share/doc/pgsql/postgres/x20188.htm
+share/doc/pgsql/postgres/x20325.htm
+share/doc/pgsql/postgres/x20348.htm
+share/doc/pgsql/postgres/x20386.htm
+share/doc/pgsql/postgres/x2045.htm
+share/doc/pgsql/postgres/x20501.htm
+share/doc/pgsql/postgres/x20656.htm
+share/doc/pgsql/postgres/x20692.htm
+share/doc/pgsql/postgres/x2130.htm
+share/doc/pgsql/postgres/x21308.htm
+share/doc/pgsql/postgres/x21393.htm
+share/doc/pgsql/postgres/x21417.htm
+share/doc/pgsql/postgres/x21478.htm
+share/doc/pgsql/postgres/x21541.htm
+share/doc/pgsql/postgres/x21555.htm
+share/doc/pgsql/postgres/x21597.htm
+share/doc/pgsql/postgres/x21700.htm
+share/doc/pgsql/postgres/x21942.htm
+share/doc/pgsql/postgres/x22060.htm
+share/doc/pgsql/postgres/x22670.htm
+share/doc/pgsql/postgres/x22687.htm
+share/doc/pgsql/postgres/x22776.htm
+share/doc/pgsql/postgres/x22792.htm
+share/doc/pgsql/postgres/x22813.htm
+share/doc/pgsql/postgres/x22822.htm
+share/doc/pgsql/postgres/x22840.htm
+share/doc/pgsql/postgres/x22847.htm
+share/doc/pgsql/postgres/x22862.htm
+share/doc/pgsql/postgres/x22866.htm
+share/doc/pgsql/postgres/x22873.htm
+share/doc/pgsql/postgres/x22922.htm
+share/doc/pgsql/postgres/x22944.htm
+share/doc/pgsql/postgres/x22964.htm
+share/doc/pgsql/postgres/x23345.htm
+share/doc/pgsql/postgres/x23426.htm
+share/doc/pgsql/postgres/x2348.htm
+share/doc/pgsql/postgres/x23482.htm
+share/doc/pgsql/postgres/x23708.htm
+share/doc/pgsql/postgres/x23739.htm
+share/doc/pgsql/postgres/x2466.htm
+share/doc/pgsql/postgres/x24955.htm
+share/doc/pgsql/postgres/x24975.htm
+share/doc/pgsql/postgres/x25022.htm
+share/doc/pgsql/postgres/x2529.htm
+share/doc/pgsql/postgres/x25302.htm
+share/doc/pgsql/postgres/x2582.htm
+share/doc/pgsql/postgres/x2602.htm
+share/doc/pgsql/postgres/x2739.htm
+share/doc/pgsql/postgres/x2791.htm
+share/doc/pgsql/postgres/x2803.htm
+share/doc/pgsql/postgres/x2816.htm
+share/doc/pgsql/postgres/x2893.htm
+share/doc/pgsql/postgres/x2914.htm
+share/doc/pgsql/postgres/x2986.htm
+share/doc/pgsql/postgres/x3010.htm
+share/doc/pgsql/postgres/x3051.htm
+share/doc/pgsql/postgres/x384.htm
+share/doc/pgsql/postgres/x410.htm
+share/doc/pgsql/postgres/x474.htm
 share/doc/pgsql/postgres/xaggr.htm
 share/doc/pgsql/postgres/xfunc.htm
-share/doc/pgsql/postgres/xfunc14663.htm
 share/doc/pgsql/postgres/xindex.htm
 share/doc/pgsql/postgres/xoper.htm
 share/doc/pgsql/postgres/xplang.htm
-share/doc/pgsql/postgres/xplang16930.htm
-share/doc/pgsql/postgres/xplang17200.htm
 share/doc/pgsql/postgres/xtypes.htm
 share/doc/pgsql/postgres/y2k.htm
 share/doc/pgsql/programmer.ps.gz
@@ -1047,8 +1071,6 @@ share/doc/pgsql/user/y2k.htm
 @dirrm share/doc/pgsql
 @dirrm pgsql/bin
 @dirrm pgsql/man/manl
-@dirrm pgsql/man/man5
-@dirrm pgsql/man/man3
 @dirrm pgsql/man/man1
 @dirrm pgsql/man
 @dirrm pgsql/lib
@@ -1064,6 +1086,7 @@ share/doc/pgsql/user/y2k.htm
 @dirrm pgsql/include
 @dirrm pgsql/data/base/template1
 @dirrm pgsql/data/base
+@dirrm pgsql/data/pg_xlog
 @dirrm pgsql/data
 @dirrm pgsql/pgaccess/lib/help
 @dirrm pgsql/pgaccess/lib/languages