From 05dedace84ef8c93fea5309c3ac55f889011429b Mon Sep 17 00:00:00 2001
From: CVS to git conversion script <webmaster@postgresql.org>
Date: Thu, 20 Jun 2002 20:29:55 +0000
Subject: [PATCH] This commit was manufactured by cvs2git to create branch
 'ecpg_big_bison'.

Sprout from master 2002-06-20 20:29:54 UTC Bruce Momjian <bruce@momjian.us> 'Update copyright to 2002.'
Delete:
    COPYRIGHT
    GNUmakefile.in
    HISTORY
    INSTALL
    Makefile
    README
    aclocal.m4
    config/ac_func_accept_argtypes.m4
    config/c-compiler.m4
    config/c-library.m4
    config/config.guess
    config/config.sub
    config/cxx.m4
    config/docbook.m4
    config/general.m4
    config/install-sh
    config/java.m4
    config/libtool.m4
    config/missing
    config/mkinstalldirs
    config/perl.m4
    config/prep_buildtree
    config/programs.m4
    config/python.m4
    config/tcl.m4
    configure
    configure.in
    contrib/Makefile
    contrib/README
    contrib/array/Makefile
    contrib/array/README.array_iterator
    contrib/array/array_iterator.c
    contrib/array/array_iterator.h
    contrib/array/array_iterator.sql.in
    contrib/btree_gist/Makefile
    contrib/btree_gist/README.btree_gist
    contrib/btree_gist/btree_gist.c
    contrib/btree_gist/btree_gist.sql.in
    contrib/btree_gist/data/test_btree.data
    contrib/btree_gist/data/test_btree_ts.data
    contrib/btree_gist/expected/btree_gist.out
    contrib/btree_gist/sql/btree_gist.sql
    contrib/chkpass/Makefile
    contrib/chkpass/README.chkpass
    contrib/chkpass/chkpass.c
    contrib/chkpass/chkpass.sql.in
    contrib/contrib-global.mk
    contrib/cube/Makefile
    contrib/cube/README.cube
    contrib/cube/buffer.c
    contrib/cube/buffer.h
    contrib/cube/cube.c
    contrib/cube/cube.sql.in
    contrib/cube/cubedata.h
    contrib/cube/cubeparse.y
    contrib/cube/cubescan.l
    contrib/cube/data/test_cube.data
    contrib/cube/expected/cube.out
    contrib/cube/sql/cube.sql
    contrib/dbase/Makefile
    contrib/dbase/README.dbf2pg
    contrib/dbase/dbf.c
    contrib/dbase/dbf.h
    contrib/dbase/dbf2pg.1
    contrib/dbase/dbf2pg.c
    contrib/dbase/endian.c
    contrib/dblink/Makefile
    contrib/dblink/README.dblink
    contrib/dblink/dblink.c
    contrib/dblink/dblink.h
    contrib/dblink/dblink.sql.in
    contrib/dbsize/Makefile
    contrib/dbsize/README.dbsize
    contrib/dbsize/dbsize.c
    contrib/dbsize/dbsize.sql.in
    contrib/earthdistance/Makefile
    contrib/earthdistance/README.earthdistance
    contrib/earthdistance/earthdistance.c
    contrib/earthdistance/earthdistance.sql.in
    contrib/findoidjoins/Makefile
    contrib/findoidjoins/README.findoidjoins
    contrib/findoidjoins/findoidjoins.c
    contrib/findoidjoins/make_oidjoins_check
    contrib/fulltextindex/Makefile
    contrib/fulltextindex/README.fti
    contrib/fulltextindex/TODO
    contrib/fulltextindex/fti.c
    contrib/fulltextindex/fti.pl
    contrib/fulltextindex/fti.sql.in
    contrib/fulltextindex/timings.sh
    contrib/fuzzystrmatch/Makefile
    contrib/fuzzystrmatch/README.fuzzystrmatch
    contrib/fuzzystrmatch/README.soundex
    contrib/fuzzystrmatch/fuzzystrmatch.c
    contrib/fuzzystrmatch/fuzzystrmatch.h
    contrib/fuzzystrmatch/fuzzystrmatch.sql.in
    contrib/intagg/Makefile
    contrib/intagg/README.int_aggregate
    contrib/intagg/int_aggregate.c
    contrib/intagg/int_aggregate.sql.in
    contrib/intarray/Makefile
    contrib/intarray/README.intarray
    contrib/intarray/_int.c
    contrib/intarray/_int.sql.in
    contrib/intarray/bench/bench.pl
    contrib/intarray/bench/create_test.pl
    contrib/intarray/data/test__int.data
    contrib/intarray/expected/_int.out
    contrib/intarray/sql/_int.sql
    contrib/ipc_check/README
    contrib/ipc_check/ipc_check.pl
    contrib/isbn_issn/Makefile
    contrib/isbn_issn/README.isbn_issn
    contrib/isbn_issn/isbn_issn.c
    contrib/isbn_issn/isbn_issn.sql.in
    contrib/lo/Makefile
    contrib/lo/README.lo
    contrib/lo/lo.c
    contrib/lo/lo.sql.in
    contrib/lo/lo_drop.sql
    contrib/lo/lo_test.sql
    contrib/mSQL-interface/Makefile
    contrib/mSQL-interface/README.mpgsql
    contrib/mSQL-interface/mpgsql.c
    contrib/mac/README.mac
    contrib/mac/createoui
    contrib/mac/dropoui
    contrib/mac/ouiparse.awk
    contrib/mac/updateoui
    contrib/miscutil/Makefile
    contrib/miscutil/README.misc_utils
    contrib/miscutil/misc_utils.c
    contrib/miscutil/misc_utils.h
    contrib/miscutil/misc_utils.sql.in
    contrib/mysql/README
    contrib/mysql/my2pg.pl
    contrib/mysql/mysql2pgsql
    contrib/noupdate/Makefile
    contrib/noupdate/README.noup
    contrib/noupdate/noup.c
    contrib/noupdate/noup.sql.in
    contrib/oid2name/Makefile
    contrib/oid2name/README.oid2name
    contrib/oid2name/oid2name.c
    contrib/oracle/CHANGES
    contrib/oracle/Ora2Pg.pm
    contrib/oracle/README.ora2pg
    contrib/oracle/TODO
    contrib/oracle/ora2pg.html
    contrib/oracle/ora2pg.pl
    contrib/pg_controldata/Makefile
    contrib/pg_controldata/README.pg_controldata
    contrib/pg_controldata/pg_controldata.c
    contrib/pg_dumplo/Makefile
    contrib/pg_dumplo/README.pg_dumplo
    contrib/pg_dumplo/lo_export.c
    contrib/pg_dumplo/lo_import.c
    contrib/pg_dumplo/main.c
    contrib/pg_dumplo/pg_dumplo.h
    contrib/pg_dumplo/utils.c
    contrib/pg_logger/Makefile
    contrib/pg_logger/README.pg_logger
    contrib/pg_logger/pg_logger.c
    contrib/pg_resetxlog/Makefile
    contrib/pg_resetxlog/README.pg_resetxlog
    contrib/pg_resetxlog/pg_resetxlog.c
    contrib/pg_upgrade/README
    contrib/pg_upgrade/pg_upgrade
    contrib/pg_upgrade/pg_upgrade.1
    contrib/pgbench/Makefile
    contrib/pgbench/README.pgbench
    contrib/pgbench/README.pgbench_jis
    contrib/pgbench/pgbench.c
    contrib/pgcrypto/API
    contrib/pgcrypto/Makefile
    contrib/pgcrypto/README.pgcrypto
    contrib/pgcrypto/blf.c
    contrib/pgcrypto/blf.h
    contrib/pgcrypto/crypt-blowfish.c
    contrib/pgcrypto/crypt-des.c
    contrib/pgcrypto/crypt-gensalt.c
    contrib/pgcrypto/crypt-md5.c
    contrib/pgcrypto/expected/blowfish.out
    contrib/pgcrypto/expected/crypt-blowfish.out
    contrib/pgcrypto/expected/crypt-des.out
    contrib/pgcrypto/expected/crypt-md5.out
    contrib/pgcrypto/expected/crypt-xdes.out
    contrib/pgcrypto/expected/hmac-md5.out
    contrib/pgcrypto/expected/hmac-sha1.out
    contrib/pgcrypto/expected/init.out
    contrib/pgcrypto/expected/md5.out
    contrib/pgcrypto/expected/rijndael.out
    contrib/pgcrypto/expected/sha1.out
    contrib/pgcrypto/internal.c
    contrib/pgcrypto/md5.c
    contrib/pgcrypto/md5.h
    contrib/pgcrypto/mhash.c
    contrib/pgcrypto/misc.c
    contrib/pgcrypto/openssl.c
    contrib/pgcrypto/pgcrypto.c
    contrib/pgcrypto/pgcrypto.h
    contrib/pgcrypto/pgcrypto.sql.in
    contrib/pgcrypto/px-crypt.c
    contrib/pgcrypto/px-crypt.h
    contrib/pgcrypto/px-hmac.c
    contrib/pgcrypto/px.c
    contrib/pgcrypto/px.h
    contrib/pgcrypto/random.c
    contrib/pgcrypto/rijndael.c
    contrib/pgcrypto/rijndael.h
    contrib/pgcrypto/rijndael.tbl
    contrib/pgcrypto/sha1.c
    contrib/pgcrypto/sha1.h
    contrib/pgcrypto/sql/blowfish.sql
    contrib/pgcrypto/sql/crypt-blowfish.sql
    contrib/pgcrypto/sql/crypt-des.sql
    contrib/pgcrypto/sql/crypt-md5.sql
    contrib/pgcrypto/sql/crypt-xdes.sql
    contrib/pgcrypto/sql/hmac-md5.sql
    contrib/pgcrypto/sql/hmac-sha1.sql
    contrib/pgcrypto/sql/init.sql
    contrib/pgcrypto/sql/md5.sql
    contrib/pgcrypto/sql/rijndael.sql
    contrib/pgcrypto/sql/sha1.sql
    contrib/pgstattuple/Makefile
    contrib/pgstattuple/README.pgstattuple
    contrib/pgstattuple/README.pgstattuple.euc_jp
    contrib/pgstattuple/pgstattuple.c
    contrib/pgstattuple/pgstattuple.sql.in
    contrib/retep/CHANGELOG
    contrib/retep/Implementation
    contrib/retep/Makefile
    contrib/retep/README
    contrib/retep/build.xml
    contrib/retep/data/cds.dtd
    contrib/retep/data/cds.xml
    contrib/retep/retep.jpx
    contrib/retep/uk/org/retep/dtu/DCollection.java
    contrib/retep/uk/org/retep/dtu/DConstants.java
    contrib/retep/uk/org/retep/dtu/DElement.java
    contrib/retep/uk/org/retep/dtu/DEnvironment.java
    contrib/retep/uk/org/retep/dtu/DModule.java
    contrib/retep/uk/org/retep/dtu/DModuleXML.java
    contrib/retep/uk/org/retep/dtu/DNode.java
    contrib/retep/uk/org/retep/dtu/DProcessor.java
    contrib/retep/uk/org/retep/dtu/DTransform.java
    contrib/retep/uk/org/retep/tools/Tool.java
    contrib/retep/uk/org/retep/tools.properties
    contrib/retep/uk/org/retep/util/ExceptionDialog.java
    contrib/retep/uk/org/retep/util/Globals.java
    contrib/retep/uk/org/retep/util/Logger.java
    contrib/retep/uk/org/retep/util/Main.java
    contrib/retep/uk/org/retep/util/StandaloneApp.java
    contrib/retep/uk/org/retep/util/hba/Editor.java
    contrib/retep/uk/org/retep/util/hba/Main.java
    contrib/retep/uk/org/retep/util/hba/Record.java
    contrib/retep/uk/org/retep/util/misc/IPAddress.java
    contrib/retep/uk/org/retep/util/misc/PropertiesIO.java
    contrib/retep/uk/org/retep/util/misc/WStringTokenizer.java
    contrib/retep/uk/org/retep/util/models/HBATableModel.java
    contrib/retep/uk/org/retep/util/models/PropertiesTableModel.java
    contrib/retep/uk/org/retep/util/proped/Main.java
    contrib/retep/uk/org/retep/util/proped/PropertyEditor.java
    contrib/retep/uk/org/retep/xml/core/XMLFactory.java
    contrib/retep/uk/org/retep/xml/core/XMLFactoryException.java
    contrib/retep/uk/org/retep/xml/jdbc/XMLDatabase.java
    contrib/retep/uk/org/retep/xml/jdbc/XMLResultSet.java
    contrib/retep/uk/org/retep/xml/parser/TagHandler.java
    contrib/retep/uk/org/retep/xml/parser/TagListener.java
    contrib/retep/uk/org/retep/xml/test/XMLExport.java
    contrib/rserv/ApplySnapshot.in
    contrib/rserv/CleanLog.in
    contrib/rserv/GetSyncID.in
    contrib/rserv/InitRservTest.in
    contrib/rserv/Makefile
    contrib/rserv/MasterAddTable.in
    contrib/rserv/MasterInit.in
    contrib/rserv/MasterSync.in
    contrib/rserv/PrepareSnapshot.in
    contrib/rserv/README.rserv
    contrib/rserv/RServ.pm
    contrib/rserv/Replicate.in
    contrib/rserv/RservTest.in
    contrib/rserv/SlaveAddTable.in
    contrib/rserv/SlaveInit.in
    contrib/rserv/master.sql.in
    contrib/rserv/regress.sh
    contrib/rserv/rserv.c
    contrib/rserv/slave.sql.in
    contrib/rtree_gist/Makefile
    contrib/rtree_gist/README.rtree_gist
    contrib/rtree_gist/bench/bench.pl
    contrib/rtree_gist/bench/create_test.pl
    contrib/rtree_gist/data/test_box.data
    contrib/rtree_gist/expected/rtree_gist.out
    contrib/rtree_gist/rtree_gist.c
    contrib/rtree_gist/rtree_gist.sql.in
    contrib/rtree_gist/sql/rtree_gist.sql
    contrib/seg/Makefile
    contrib/seg/README.seg
    contrib/seg/buffer.c
    contrib/seg/buffer.h
    contrib/seg/data/test_seg.data
    contrib/seg/expected/seg.out
    contrib/seg/seg-validate.pl
    contrib/seg/seg.c
    contrib/seg/seg.sql.in
    contrib/seg/segdata.h
    contrib/seg/segparse.y
    contrib/seg/segscan.l
    contrib/seg/sort-segments.pl
    contrib/seg/sql/seg.sql
    contrib/spi/Makefile
    contrib/spi/README.spi
    contrib/spi/autoinc.c
    contrib/spi/autoinc.example
    contrib/spi/autoinc.sql.in
    contrib/spi/insert_username.c
    contrib/spi/insert_username.example
    contrib/spi/insert_username.sql.in
    contrib/spi/moddatetime.c
    contrib/spi/moddatetime.example
    contrib/spi/moddatetime.sql.in
    contrib/spi/preprocessor/README.MAX
    contrib/spi/preprocessor/example.sql
    contrib/spi/preprocessor/step1.c
    contrib/spi/preprocessor/step1.e
    contrib/spi/preprocessor/step2.pl
    contrib/spi/refint.c
    contrib/spi/refint.example
    contrib/spi/refint.sql.in
    contrib/spi/timetravel.c
    contrib/spi/timetravel.example
    contrib/spi/timetravel.sql.in
    contrib/start-scripts/freebsd
    contrib/start-scripts/linux
    contrib/string/Makefile
    contrib/string/README.string_io
    contrib/string/string_io.c
    contrib/string/string_io.h
    contrib/string/string_io.sql.in
    contrib/tips/Makefile
    contrib/tips/README.apachelog
    contrib/tools/add-emacs-variables
    contrib/tools/find-sources
    contrib/tools/make-tags
    contrib/tsearch/Makefile
    contrib/tsearch/README.tsearch
    contrib/tsearch/crc32.c
    contrib/tsearch/crc32.h
    contrib/tsearch/data/test_tsearch.data
    contrib/tsearch/deflex.h
    contrib/tsearch/dict/porter_english.dct
    contrib/tsearch/dict/russian_stemming.dct
    contrib/tsearch/dict.h
    contrib/tsearch/expected/tsearch.out
    contrib/tsearch/gistidx.c
    contrib/tsearch/gistidx.h
    contrib/tsearch/makedict/makedict.pl
    contrib/tsearch/morph.c
    contrib/tsearch/morph.h
    contrib/tsearch/parser.h
    contrib/tsearch/parser.l
    contrib/tsearch/query.c
    contrib/tsearch/query.h
    contrib/tsearch/rewrite.c
    contrib/tsearch/rewrite.h
    contrib/tsearch/sql/tsearch.sql
    contrib/tsearch/tsearch.sql.in
    contrib/tsearch/txtidx.c
    contrib/tsearch/txtidx.h
    contrib/userlock/Makefile
    contrib/userlock/README.user_locks
    contrib/userlock/user_locks.c
    contrib/userlock/user_locks.h
    contrib/userlock/user_locks.sql.in
    contrib/vacuumlo/Makefile
    contrib/vacuumlo/README.vacuumlo
    contrib/vacuumlo/vacuumlo.c
    contrib/xml/Makefile
    contrib/xml/README
    contrib/xml/TODO
    contrib/xml/pgxml.c
    contrib/xml/pgxml.h
    contrib/xml/pgxml.source
    contrib/xml/pgxml_dom.c
    contrib/xml/pgxml_dom.source
    doc/FAQ
    doc/FAQ_AIX
    doc/FAQ_DEV
    doc/FAQ_HPUX
    doc/FAQ_IRIX
    doc/FAQ_MSWIN
    doc/FAQ_QNX4
    doc/FAQ_SCO
    doc/FAQ_Solaris
    doc/FAQ_german
    doc/FAQ_japanese
    doc/FAQ_polish
    doc/FAQ_russian
    doc/KNOWN_BUGS
    doc/MISSING_FEATURES
    doc/Makefile
    doc/README.mb.big5
    doc/README.mb.jp
    doc/TODO
    doc/TODO.detail/README
    doc/TODO.detail/atttypmod
    doc/TODO.detail/crossdb
    doc/TODO.detail/cursor
    doc/TODO.detail/drop
    doc/TODO.detail/exists
    doc/TODO.detail/foreign
    doc/TODO.detail/fsync
    doc/TODO.detail/inheritance
    doc/TODO.detail/java
    doc/TODO.detail/mmap
    doc/TODO.detail/namedatalen
    doc/TODO.detail/optimizer
    doc/TODO.detail/performance
    doc/TODO.detail/persistent
    doc/TODO.detail/pool
    doc/TODO.detail/prepare
    doc/TODO.detail/privileges
    doc/TODO.detail/replication
    doc/TODO.detail/schema
    doc/TODO.detail/tablespaces
    doc/TODO.detail/thread
    doc/TODO.detail/transactions
    doc/TODO.detail/typeconv
    doc/TODO.detail/update
    doc/TODO.detail/vacuum
    doc/TODO.detail/view
    doc/TODO.detail/win32
    doc/TODO.detail/yacc
    doc/bug.template
    doc/src/FAQ/FAQ.html
    doc/src/FAQ/FAQ_DEV.html
    doc/src/FAQ/FAQ_german.html
    doc/src/FAQ/FAQ_japanese.html
    doc/src/FAQ/FAQ_polish.html
    doc/src/FAQ/FAQ_russian.html
    doc/src/Makefile
    doc/src/graphics/catalogs.ag
    doc/src/graphics/catalogs.cgm
    doc/src/graphics/catalogs.gif
    doc/src/graphics/catalogs.ps
    doc/src/graphics/clientserver.ag
    doc/src/graphics/clientserver.gif
    doc/src/graphics/connections.ag
    doc/src/graphics/connections.gif
    doc/src/sgml/Makefile
    doc/src/sgml/admin.sgml
    doc/src/sgml/advanced.sgml
    doc/src/sgml/arch-dev.sgml
    doc/src/sgml/arch-pg.sgml
    doc/src/sgml/array.sgml
    doc/src/sgml/backup.sgml
    doc/src/sgml/biblio.sgml
    doc/src/sgml/bki.sgml
    doc/src/sgml/book-decl.sgml
    doc/src/sgml/catalogs.sgml
    doc/src/sgml/charset.sgml
    doc/src/sgml/client-auth.sgml
    doc/src/sgml/compiler.sgml
    doc/src/sgml/contacts.sgml
    doc/src/sgml/cvs.sgml
    doc/src/sgml/datatype.sgml
    doc/src/sgml/datetime.sgml
    doc/src/sgml/developer.sgml
    doc/src/sgml/dfunc.sgml
    doc/src/sgml/diskusage.sgml
    doc/src/sgml/docguide.sgml
    doc/src/sgml/ecpg.sgml
    doc/src/sgml/extend.sgml
    doc/src/sgml/features.sgml
    doc/src/sgml/filelist.sgml
    doc/src/sgml/fixrtf
    doc/src/sgml/func-ref.sgml
    doc/src/sgml/func.sgml
    doc/src/sgml/geqo.sgml
    doc/src/sgml/gist.sgml
    doc/src/sgml/history.sgml
    doc/src/sgml/indexcost.sgml
    doc/src/sgml/indices.sgml
    doc/src/sgml/info.sgml
    doc/src/sgml/inherit.sgml
    doc/src/sgml/install-win32.sgml
    doc/src/sgml/installation.sgml
    doc/src/sgml/intro.sgml
    doc/src/sgml/jdbc.sgml
    doc/src/sgml/keywords.sgml
    doc/src/sgml/legal.sgml
    doc/src/sgml/libpgeasy.sgml
    doc/src/sgml/libpgtcl.sgml
    doc/src/sgml/libpq++.sgml
    doc/src/sgml/libpq.sgml
    doc/src/sgml/lobj.sgml
    doc/src/sgml/maintenance.sgml
    doc/src/sgml/manage-ag.sgml
    doc/src/sgml/manage.sgml
    doc/src/sgml/monitoring.sgml
    doc/src/sgml/mvcc.sgml
    doc/src/sgml/nls.sgml
    doc/src/sgml/notation.sgml
    doc/src/sgml/odbc.sgml
    doc/src/sgml/page.sgml
    doc/src/sgml/perform.sgml
    doc/src/sgml/plperl.sgml
    doc/src/sgml/plpython.sgml
    doc/src/sgml/plsql.sgml
    doc/src/sgml/pltcl.sgml
    doc/src/sgml/postgres.sgml
    doc/src/sgml/problems.sgml
    doc/src/sgml/programmer.sgml
    doc/src/sgml/protocol.sgml
    doc/src/sgml/pygresql.sgml
    doc/src/sgml/queries.sgml
    doc/src/sgml/query.sgml
    doc/src/sgml/recovery.sgml
    doc/src/sgml/ref/abort.sgml
    doc/src/sgml/ref/allfiles.sgml
    doc/src/sgml/ref/alter_database.sgml
    doc/src/sgml/ref/alter_group.sgml
    doc/src/sgml/ref/alter_table.sgml
    doc/src/sgml/ref/alter_trigger.sgml
    doc/src/sgml/ref/alter_user.sgml
    doc/src/sgml/ref/analyze.sgml
    doc/src/sgml/ref/begin.sgml
    doc/src/sgml/ref/checkpoint.sgml
    doc/src/sgml/ref/close.sgml
    doc/src/sgml/ref/cluster.sgml
    doc/src/sgml/ref/comment.sgml
    doc/src/sgml/ref/commit.sgml
    doc/src/sgml/ref/copy.sgml
    doc/src/sgml/ref/create_aggregate.sgml
    doc/src/sgml/ref/create_constraint.sgml
    doc/src/sgml/ref/create_database.sgml
    doc/src/sgml/ref/create_domain.sgml
    doc/src/sgml/ref/create_function.sgml
    doc/src/sgml/ref/create_group.sgml
    doc/src/sgml/ref/create_index.sgml
    doc/src/sgml/ref/create_language.sgml
    doc/src/sgml/ref/create_operator.sgml
    doc/src/sgml/ref/create_rule.sgml
    doc/src/sgml/ref/create_schema.sgml
    doc/src/sgml/ref/create_sequence.sgml
    doc/src/sgml/ref/create_table.sgml
    doc/src/sgml/ref/create_table_as.sgml
    doc/src/sgml/ref/create_trigger.sgml
    doc/src/sgml/ref/create_type.sgml
    doc/src/sgml/ref/create_user.sgml
    doc/src/sgml/ref/create_view.sgml
    doc/src/sgml/ref/createdb.sgml
    doc/src/sgml/ref/createlang.sgml
    doc/src/sgml/ref/createuser.sgml
    doc/src/sgml/ref/current_date.sgml
    doc/src/sgml/ref/current_time.sgml
    doc/src/sgml/ref/current_timestamp.sgml
    doc/src/sgml/ref/current_user.sgml
    doc/src/sgml/ref/declare.sgml
    doc/src/sgml/ref/delete.sgml
    doc/src/sgml/ref/drop_aggregate.sgml
    doc/src/sgml/ref/drop_database.sgml
    doc/src/sgml/ref/drop_domain.sgml
    doc/src/sgml/ref/drop_function.sgml
    doc/src/sgml/ref/drop_group.sgml
    doc/src/sgml/ref/drop_index.sgml
    doc/src/sgml/ref/drop_language.sgml
    doc/src/sgml/ref/drop_operator.sgml
    doc/src/sgml/ref/drop_rule.sgml
    doc/src/sgml/ref/drop_sequence.sgml
    doc/src/sgml/ref/drop_table.sgml
    doc/src/sgml/ref/drop_trigger.sgml
    doc/src/sgml/ref/drop_type.sgml
    doc/src/sgml/ref/drop_user.sgml
    doc/src/sgml/ref/drop_view.sgml
    doc/src/sgml/ref/dropdb.sgml
    doc/src/sgml/ref/droplang.sgml
    doc/src/sgml/ref/dropuser.sgml
    doc/src/sgml/ref/ecpg-ref.sgml
    doc/src/sgml/ref/end.sgml
    doc/src/sgml/ref/explain.sgml
    doc/src/sgml/ref/fetch.sgml
    doc/src/sgml/ref/grant.sgml
    doc/src/sgml/ref/initdb.sgml
    doc/src/sgml/ref/initlocation.sgml
    doc/src/sgml/ref/insert.sgml
    doc/src/sgml/ref/ipcclean.sgml
    doc/src/sgml/ref/listen.sgml
    doc/src/sgml/ref/load.sgml
    doc/src/sgml/ref/lock.sgml
    doc/src/sgml/ref/move.sgml
    doc/src/sgml/ref/notify.sgml
    doc/src/sgml/ref/pg_config-ref.sgml
    doc/src/sgml/ref/pg_ctl-ref.sgml
    doc/src/sgml/ref/pg_dump.sgml
    doc/src/sgml/ref/pg_dumpall.sgml
    doc/src/sgml/ref/pg_restore.sgml
    doc/src/sgml/ref/pgaccess-ref.sgml
    doc/src/sgml/ref/pgtclsh.sgml
    doc/src/sgml/ref/pgtksh.sgml
    doc/src/sgml/ref/postgres-ref.sgml
    doc/src/sgml/ref/postmaster.sgml
    doc/src/sgml/ref/psql-ref.sgml
    doc/src/sgml/ref/reindex.sgml
    doc/src/sgml/ref/reset.sgml
    doc/src/sgml/ref/revoke.sgml
    doc/src/sgml/ref/rollback.sgml
    doc/src/sgml/ref/select.sgml
    doc/src/sgml/ref/select_into.sgml
    doc/src/sgml/ref/set.sgml
    doc/src/sgml/ref/set_constraints.sgml
    doc/src/sgml/ref/set_session_auth.sgml
    doc/src/sgml/ref/set_transaction.sgml
    doc/src/sgml/ref/show.sgml
    doc/src/sgml/ref/truncate.sgml
    doc/src/sgml/ref/unlisten.sgml
    doc/src/sgml/ref/update.sgml
    doc/src/sgml/ref/vacuum.sgml
    doc/src/sgml/ref/vacuumdb.sgml
    doc/src/sgml/refentry.sgml
    doc/src/sgml/reference.ced
    doc/src/sgml/reference.sgml
    doc/src/sgml/regress.sgml
    doc/src/sgml/release.sgml
    doc/src/sgml/rules.sgml
    doc/src/sgml/runtime.sgml
    doc/src/sgml/sources.sgml
    doc/src/sgml/spi.sgml
    doc/src/sgml/sql.sgml
    doc/src/sgml/standalone-install.sgml
    doc/src/sgml/start.sgml
    doc/src/sgml/stylesheet.css
    doc/src/sgml/stylesheet.dsl
    doc/src/sgml/syntax.sgml
    doc/src/sgml/trigger.sgml
    doc/src/sgml/tutorial.sgml
    doc/src/sgml/typeconv.sgml
    doc/src/sgml/user-manag.sgml
    doc/src/sgml/user.sgml
    doc/src/sgml/version.sgml
    doc/src/sgml/wal.sgml
    doc/src/sgml/xaggr.sgml
    doc/src/sgml/xfunc.sgml
    doc/src/sgml/xindex.sgml
    doc/src/sgml/xoper.sgml
    doc/src/sgml/xplang.sgml
    doc/src/sgml/xtypes.sgml
    doc/src/sgml/y2k.sgml
    register.txt
    src/DEVELOPERS
    src/Makefile
    src/Makefile.global.in
    src/Makefile.shlib
    src/backend/Makefile
    src/backend/access/Makefile
    src/backend/access/common/Makefile
    src/backend/access/common/heaptuple.c
    src/backend/access/common/indextuple.c
    src/backend/access/common/indexvalid.c
    src/backend/access/common/printtup.c
    src/backend/access/common/scankey.c
    src/backend/access/common/tupdesc.c
    src/backend/access/gist/Makefile
    src/backend/access/gist/gist.c
    src/backend/access/gist/gistget.c
    src/backend/access/gist/gistscan.c
    src/backend/access/gist/giststrat.c
    src/backend/access/hash/Makefile
    src/backend/access/hash/hash.c
    src/backend/access/hash/hashfunc.c
    src/backend/access/hash/hashinsert.c
    src/backend/access/hash/hashovfl.c
    src/backend/access/hash/hashpage.c
    src/backend/access/hash/hashscan.c
    src/backend/access/hash/hashsearch.c
    src/backend/access/hash/hashstrat.c
    src/backend/access/hash/hashutil.c
    src/backend/access/heap/Makefile
    src/backend/access/heap/heapam.c
    src/backend/access/heap/hio.c
    src/backend/access/heap/tuptoaster.c
    src/backend/access/index/Makefile
    src/backend/access/index/genam.c
    src/backend/access/index/indexam.c
    src/backend/access/index/istrat.c
    src/backend/access/nbtree/Makefile
    src/backend/access/nbtree/README
    src/backend/access/nbtree/nbtcompare.c
    src/backend/access/nbtree/nbtinsert.c
    src/backend/access/nbtree/nbtpage.c
    src/backend/access/nbtree/nbtree.c
    src/backend/access/nbtree/nbtsearch.c
    src/backend/access/nbtree/nbtsort.c
    src/backend/access/nbtree/nbtstrat.c
    src/backend/access/nbtree/nbtutils.c
    src/backend/access/rtree/Makefile
    src/backend/access/rtree/rtget.c
    src/backend/access/rtree/rtproc.c
    src/backend/access/rtree/rtree.c
    src/backend/access/rtree/rtscan.c
    src/backend/access/rtree/rtstrat.c
    src/backend/access/transam/Makefile
    src/backend/access/transam/clog.c
    src/backend/access/transam/rmgr.c
    src/backend/access/transam/transam.c
    src/backend/access/transam/varsup.c
    src/backend/access/transam/xact.c
    src/backend/access/transam/xid.c
    src/backend/access/transam/xlog.c
    src/backend/access/transam/xlogutils.c
    src/backend/bootstrap/.cvsignore
    src/backend/bootstrap/Makefile
    src/backend/bootstrap/bootparse.y
    src/backend/bootstrap/bootscanner.l
    src/backend/bootstrap/bootstrap.c
    src/backend/catalog/Makefile
    src/backend/catalog/README
    src/backend/catalog/aclchk.c
    src/backend/catalog/catalog.c
    src/backend/catalog/genbki.sh
    src/backend/catalog/heap.c
    src/backend/catalog/index.c
    src/backend/catalog/indexing.c
    src/backend/catalog/namespace.c
    src/backend/catalog/pg_aggregate.c
    src/backend/catalog/pg_largeobject.c
    src/backend/catalog/pg_namespace.c
    src/backend/catalog/pg_operator.c
    src/backend/catalog/pg_proc.c
    src/backend/catalog/pg_type.c
    src/backend/commands/Makefile
    src/backend/commands/_deadcode/recipe.c
    src/backend/commands/_deadcode/recipe.h
    src/backend/commands/_deadcode/version.c
    src/backend/commands/aggregatecmds.c
    src/backend/commands/analyze.c
    src/backend/commands/async.c
    src/backend/commands/cluster.c
    src/backend/commands/comment.c
    src/backend/commands/copy.c
    src/backend/commands/dbcommands.c
    src/backend/commands/define.c
    src/backend/commands/explain.c
    src/backend/commands/functioncmds.c
    src/backend/commands/indexcmds.c
    src/backend/commands/lockcmds.c
    src/backend/commands/operatorcmds.c
    src/backend/commands/portalcmds.c
    src/backend/commands/proclang.c
    src/backend/commands/schemacmds.c
    src/backend/commands/sequence.c
    src/backend/commands/tablecmds.c
    src/backend/commands/trigger.c
    src/backend/commands/typecmds.c
    src/backend/commands/user.c
    src/backend/commands/vacuum.c
    src/backend/commands/vacuumlazy.c
    src/backend/commands/variable.c
    src/backend/commands/view.c
    src/backend/executor/Makefile
    src/backend/executor/README
    src/backend/executor/_deadcode/nodeTee.c
    src/backend/executor/execAmi.c
    src/backend/executor/execJunk.c
    src/backend/executor/execMain.c
    src/backend/executor/execProcnode.c
    src/backend/executor/execQual.c
    src/backend/executor/execScan.c
    src/backend/executor/execTuples.c
    src/backend/executor/execUtils.c
    src/backend/executor/functions.c
    src/backend/executor/instrument.c
    src/backend/executor/nodeAgg.c
    src/backend/executor/nodeAppend.c
    src/backend/executor/nodeFunctionscan.c
    src/backend/executor/nodeGroup.c
    src/backend/executor/nodeHash.c
    src/backend/executor/nodeHashjoin.c
    src/backend/executor/nodeIndexscan.c
    src/backend/executor/nodeLimit.c
    src/backend/executor/nodeMaterial.c
    src/backend/executor/nodeMergejoin.c
    src/backend/executor/nodeNestloop.c
    src/backend/executor/nodeResult.c
    src/backend/executor/nodeSeqscan.c
    src/backend/executor/nodeSetOp.c
    src/backend/executor/nodeSort.c
    src/backend/executor/nodeSubplan.c
    src/backend/executor/nodeSubqueryscan.c
    src/backend/executor/nodeTidscan.c
    src/backend/executor/nodeUnique.c
    src/backend/executor/spi.c
    src/backend/lib/Makefile
    src/backend/lib/bit.c
    src/backend/lib/dllist.c
    src/backend/lib/lispsort.c
    src/backend/lib/stringinfo.c
    src/backend/libpq/Makefile
    src/backend/libpq/README.SSL
    src/backend/libpq/auth.c
    src/backend/libpq/be-fsstubs.c
    src/backend/libpq/be-secure.c
    src/backend/libpq/crypt.c
    src/backend/libpq/hba.c
    src/backend/libpq/md5.c
    src/backend/libpq/pg_hba.conf.sample
    src/backend/libpq/pg_ident.conf.sample
    src/backend/libpq/pqcomm.c
    src/backend/libpq/pqformat.c
    src/backend/libpq/pqsignal.c
    src/backend/main/Makefile
    src/backend/main/main.c
    src/backend/nodes/Makefile
    src/backend/nodes/README
    src/backend/nodes/copyfuncs.c
    src/backend/nodes/equalfuncs.c
    src/backend/nodes/list.c
    src/backend/nodes/makefuncs.c
    src/backend/nodes/nodeFuncs.c
    src/backend/nodes/nodes.c
    src/backend/nodes/outfuncs.c
    src/backend/nodes/print.c
    src/backend/nodes/read.c
    src/backend/nodes/readfuncs.c
    src/backend/optimizer/Makefile
    src/backend/optimizer/README
    src/backend/optimizer/geqo/Makefile
    src/backend/optimizer/geqo/geqo_copy.c
    src/backend/optimizer/geqo/geqo_cx.c
    src/backend/optimizer/geqo/geqo_erx.c
    src/backend/optimizer/geqo/geqo_eval.c
    src/backend/optimizer/geqo/geqo_main.c
    src/backend/optimizer/geqo/geqo_misc.c
    src/backend/optimizer/geqo/geqo_mutation.c
    src/backend/optimizer/geqo/geqo_ox1.c
    src/backend/optimizer/geqo/geqo_ox2.c
    src/backend/optimizer/geqo/geqo_pmx.c
    src/backend/optimizer/geqo/geqo_pool.c
    src/backend/optimizer/geqo/geqo_px.c
    src/backend/optimizer/geqo/geqo_recombination.c
    src/backend/optimizer/geqo/geqo_selection.c
    src/backend/optimizer/path/Makefile
    src/backend/optimizer/path/_deadcode/predmig.c
    src/backend/optimizer/path/_deadcode/xfunc.c
    src/backend/optimizer/path/allpaths.c
    src/backend/optimizer/path/clausesel.c
    src/backend/optimizer/path/costsize.c
    src/backend/optimizer/path/indxpath.c
    src/backend/optimizer/path/joinpath.c
    src/backend/optimizer/path/joinrels.c
    src/backend/optimizer/path/orindxpath.c
    src/backend/optimizer/path/pathkeys.c
    src/backend/optimizer/path/tidpath.c
    src/backend/optimizer/plan/Makefile
    src/backend/optimizer/plan/README
    src/backend/optimizer/plan/createplan.c
    src/backend/optimizer/plan/initsplan.c
    src/backend/optimizer/plan/planmain.c
    src/backend/optimizer/plan/planner.c
    src/backend/optimizer/plan/setrefs.c
    src/backend/optimizer/plan/subselect.c
    src/backend/optimizer/prep/Makefile
    src/backend/optimizer/prep/_deadcode/prepkeyset.c
    src/backend/optimizer/prep/prepqual.c
    src/backend/optimizer/prep/preptlist.c
    src/backend/optimizer/prep/prepunion.c
    src/backend/optimizer/util/Makefile
    src/backend/optimizer/util/clauses.c
    src/backend/optimizer/util/joininfo.c
    src/backend/optimizer/util/pathnode.c
    src/backend/optimizer/util/plancat.c
    src/backend/optimizer/util/relnode.c
    src/backend/optimizer/util/restrictinfo.c
    src/backend/optimizer/util/tlist.c
    src/backend/optimizer/util/var.c
    src/backend/parser/.cvsignore
    src/backend/parser/Makefile
    src/backend/parser/README
    src/backend/parser/analyze.c
    src/backend/parser/gram.y
    src/backend/parser/keywords.c
    src/backend/parser/parse_agg.c
    src/backend/parser/parse_clause.c
    src/backend/parser/parse_coerce.c
    src/backend/parser/parse_expr.c
    src/backend/parser/parse_func.c
    src/backend/parser/parse_node.c
    src/backend/parser/parse_oper.c
    src/backend/parser/parse_relation.c
    src/backend/parser/parse_target.c
    src/backend/parser/parse_type.c
    src/backend/parser/parser.c
    src/backend/parser/scan.l
    src/backend/parser/scansup.c
    src/backend/po/Makefile
    src/backend/po/cs.po
    src/backend/po/de.po
    src/backend/po/hu.po
    src/backend/po/nls.mk
    src/backend/po/ru.po
    src/backend/po/zh_CN.po
    src/backend/po/zh_TW.po
    src/backend/port/Makefile
    src/backend/port/aix/mkldexport.sh
    src/backend/port/beos/Makefile
    src/backend/port/beos/sem.c
    src/backend/port/beos/shm.c
    src/backend/port/beos/support.c
    src/backend/port/darwin/Makefile
    src/backend/port/darwin/README
    src/backend/port/darwin/system.c
    src/backend/port/dynloader/README.dlfcn.aix
    src/backend/port/dynloader/aix.c
    src/backend/port/dynloader/aix.h
    src/backend/port/dynloader/beos.c
    src/backend/port/dynloader/beos.h
    src/backend/port/dynloader/bsdi.c
    src/backend/port/dynloader/bsdi.h
    src/backend/port/dynloader/darwin.c
    src/backend/port/dynloader/darwin.h
    src/backend/port/dynloader/dgux.c
    src/backend/port/dynloader/dgux.h
    src/backend/port/dynloader/freebsd.c
    src/backend/port/dynloader/freebsd.h
    src/backend/port/dynloader/hpux.c
    src/backend/port/dynloader/hpux.h
    src/backend/port/dynloader/irix5.c
    src/backend/port/dynloader/irix5.h
    src/backend/port/dynloader/linux.c
    src/backend/port/dynloader/linux.h
    src/backend/port/dynloader/netbsd.c
    src/backend/port/dynloader/netbsd.h
    src/backend/port/dynloader/nextstep.c
    src/backend/port/dynloader/nextstep.h
    src/backend/port/dynloader/openbsd.c
    src/backend/port/dynloader/openbsd.h
    src/backend/port/dynloader/osf.c
    src/backend/port/dynloader/osf.h
    src/backend/port/dynloader/qnx4.c
    src/backend/port/dynloader/qnx4.h
    src/backend/port/dynloader/sco.c
    src/backend/port/dynloader/sco.h
    src/backend/port/dynloader/solaris.c
    src/backend/port/dynloader/solaris.h
    src/backend/port/dynloader/sunos4.c
    src/backend/port/dynloader/sunos4.h
    src/backend/port/dynloader/svr4.c
    src/backend/port/dynloader/svr4.h
    src/backend/port/dynloader/ultrix4.c
    src/backend/port/dynloader/ultrix4.h
    src/backend/port/dynloader/univel.c
    src/backend/port/dynloader/univel.h
    src/backend/port/dynloader/unixware.c
    src/backend/port/dynloader/unixware.h
    src/backend/port/dynloader/win.c
    src/backend/port/dynloader/win.h
    src/backend/port/gethostname.c
    src/backend/port/getrusage.c
    src/backend/port/hpux/tas.c.template
    src/backend/port/inet_aton.c
    src/backend/port/inet_aton.h
    src/backend/port/ipc_test.c
    src/backend/port/isinf.c
    src/backend/port/memcmp.c
    src/backend/port/nextstep/Makefile
    src/backend/port/nextstep/port.c
    src/backend/port/posix_sema.c
    src/backend/port/qnx4/Makefile
    src/backend/port/qnx4/ipc.h
    src/backend/port/qnx4/isnan.c
    src/backend/port/qnx4/rint.c
    src/backend/port/qnx4/sem.c
    src/backend/port/qnx4/sem.h
    src/backend/port/qnx4/shm.c
    src/backend/port/qnx4/shm.h
    src/backend/port/qnx4/tstrint.c
    src/backend/port/qnx4/tstsem.c
    src/backend/port/qnx4/tstshm.c
    src/backend/port/random.c
    src/backend/port/snprintf.c
    src/backend/port/srandom.c
    src/backend/port/strcasecmp.c
    src/backend/port/strerror.c
    src/backend/port/strtol.c
    src/backend/port/strtoul.c
    src/backend/port/sunos4/Makefile
    src/backend/port/sunos4/float.h
    src/backend/port/sysv_sema.c
    src/backend/port/sysv_shmem.c
    src/backend/port/tas/dummy.s
    src/backend/port/tas/hpux.s
    src/backend/port/tas/solaris_i386.s
    src/backend/port/tas/solaris_sparc.s
    src/backend/postmaster/Makefile
    src/backend/postmaster/pgstat.c
    src/backend/postmaster/postmaster.c
    src/backend/regex/COPYRIGHT
    src/backend/regex/Makefile
    src/backend/regex/WHATSNEW
    src/backend/regex/engine.c
    src/backend/regex/re_format.7
    src/backend/regex/regcomp.c
    src/backend/regex/regerror.c
    src/backend/regex/regex.3
    src/backend/regex/regexec.c
    src/backend/regex/regfree.c
    src/backend/regex/retest.c
    src/backend/rewrite/Makefile
    src/backend/rewrite/rewriteDefine.c
    src/backend/rewrite/rewriteHandler.c
    src/backend/rewrite/rewriteManip.c
    src/backend/rewrite/rewriteRemove.c
    src/backend/rewrite/rewriteSupport.c
    src/backend/storage/Makefile
    src/backend/storage/buffer/Makefile
    src/backend/storage/buffer/README
    src/backend/storage/buffer/buf_init.c
    src/backend/storage/buffer/buf_table.c
    src/backend/storage/buffer/bufmgr.c
    src/backend/storage/buffer/freelist.c
    src/backend/storage/buffer/localbuf.c
    src/backend/storage/file/Makefile
    src/backend/storage/file/buffile.c
    src/backend/storage/file/fd.c
    src/backend/storage/freespace/Makefile
    src/backend/storage/freespace/freespace.c
    src/backend/storage/ipc/Makefile
    src/backend/storage/ipc/README
    src/backend/storage/ipc/ipc.c
    src/backend/storage/ipc/ipci.c
    src/backend/storage/ipc/pmsignal.c
    src/backend/storage/ipc/shmem.c
    src/backend/storage/ipc/shmqueue.c
    src/backend/storage/ipc/sinval.c
    src/backend/storage/ipc/sinvaladt.c
    src/backend/storage/large_object/Makefile
    src/backend/storage/large_object/inv_api.c
    src/backend/storage/lmgr/Makefile
    src/backend/storage/lmgr/README
    src/backend/storage/lmgr/deadlock.c
    src/backend/storage/lmgr/lmgr.c
    src/backend/storage/lmgr/lock.c
    src/backend/storage/lmgr/lwlock.c
    src/backend/storage/lmgr/proc.c
    src/backend/storage/lmgr/s_lock.c
    src/backend/storage/lmgr/spin.c
    src/backend/storage/page/Makefile
    src/backend/storage/page/bufpage.c
    src/backend/storage/page/itemptr.c
    src/backend/storage/smgr/Makefile
    src/backend/storage/smgr/README
    src/backend/storage/smgr/md.c
    src/backend/storage/smgr/mm.c
    src/backend/storage/smgr/smgr.c
    src/backend/storage/smgr/smgrtype.c
    src/backend/tcop/Makefile
    src/backend/tcop/dest.c
    src/backend/tcop/fastpath.c
    src/backend/tcop/postgres.c
    src/backend/tcop/pquery.c
    src/backend/tcop/utility.c
    src/backend/tioga/Arr_TgRecipe.h
    src/backend/tioga/Makefile
    src/backend/tioga/Varray.c
    src/backend/tioga/Varray.h
    src/backend/tioga/tgRecipe.c
    src/backend/tioga/tgRecipe.h
    src/backend/utils/.cvsignore
    src/backend/utils/Gen_fmgrtab.sh
    src/backend/utils/Makefile
    src/backend/utils/adt/Makefile
    src/backend/utils/adt/acl.c
    src/backend/utils/adt/arrayfuncs.c
    src/backend/utils/adt/arrayutils.c
    src/backend/utils/adt/ascii.c
    src/backend/utils/adt/bool.c
    src/backend/utils/adt/cash.c
    src/backend/utils/adt/char.c
    src/backend/utils/adt/date.c
    src/backend/utils/adt/datetime.c
    src/backend/utils/adt/datum.c
    src/backend/utils/adt/encode.c
    src/backend/utils/adt/float.c
    src/backend/utils/adt/format_type.c
    src/backend/utils/adt/formatting.c
    src/backend/utils/adt/geo_ops.c
    src/backend/utils/adt/geo_selfuncs.c
    src/backend/utils/adt/inet_net_ntop.c
    src/backend/utils/adt/inet_net_pton.c
    src/backend/utils/adt/int.c
    src/backend/utils/adt/int8.c
    src/backend/utils/adt/like.c
    src/backend/utils/adt/like_match.c
    src/backend/utils/adt/mac.c
    src/backend/utils/adt/misc.c
    src/backend/utils/adt/nabstime.c
    src/backend/utils/adt/name.c
    src/backend/utils/adt/network.c
    src/backend/utils/adt/not_in.c
    src/backend/utils/adt/numeric.c
    src/backend/utils/adt/numutils.c
    src/backend/utils/adt/oid.c
    src/backend/utils/adt/oracle_compat.c
    src/backend/utils/adt/pg_locale.c
    src/backend/utils/adt/pg_lzcompress.c
    src/backend/utils/adt/pgstatfuncs.c
    src/backend/utils/adt/quote.c
    src/backend/utils/adt/regexp.c
    src/backend/utils/adt/regproc.c
    src/backend/utils/adt/ri_triggers.c
    src/backend/utils/adt/ruleutils.c
    src/backend/utils/adt/selfuncs.c
    src/backend/utils/adt/sets.c
    src/backend/utils/adt/tid.c
    src/backend/utils/adt/timestamp.c
    src/backend/utils/adt/varbit.c
    src/backend/utils/adt/varchar.c
    src/backend/utils/adt/varlena.c
    src/backend/utils/adt/version.c
    src/backend/utils/cache/Makefile
    src/backend/utils/cache/catcache.c
    src/backend/utils/cache/fcache.c
    src/backend/utils/cache/inval.c
    src/backend/utils/cache/lsyscache.c
    src/backend/utils/cache/relcache.c
    src/backend/utils/cache/syscache.c
    src/backend/utils/error/Makefile
    src/backend/utils/error/assert.c
    src/backend/utils/error/elog.c
    src/backend/utils/error/exc.c
    src/backend/utils/error/excabort.c
    src/backend/utils/error/excid.c
    src/backend/utils/error/format.c
    src/backend/utils/fmgr/Makefile
    src/backend/utils/fmgr/README
    src/backend/utils/fmgr/dfmgr.c
    src/backend/utils/fmgr/fmgr.c
    src/backend/utils/hash/Makefile
    src/backend/utils/hash/dynahash.c
    src/backend/utils/hash/hashfn.c
    src/backend/utils/hash/pg_crc.c
    src/backend/utils/init/Makefile
    src/backend/utils/init/findbe.c
    src/backend/utils/init/globals.c
    src/backend/utils/init/miscinit.c
    src/backend/utils/init/postinit.c
    src/backend/utils/mb/Makefile
    src/backend/utils/mb/README
    src/backend/utils/mb/Unicode/ISO10646-GB18030.TXT
    src/backend/utils/mb/Unicode/Makefile
    src/backend/utils/mb/Unicode/UCS_to_8859.pl
    src/backend/utils/mb/Unicode/UCS_to_BIG5.pl
    src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl
    src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl
    src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl
    src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl
    src/backend/utils/mb/Unicode/UCS_to_GB18030.pl
    src/backend/utils/mb/Unicode/UCS_to_GBK.pl
    src/backend/utils/mb/Unicode/UCS_to_JOHAB.pl
    src/backend/utils/mb/Unicode/UCS_to_SJIS.pl
    src/backend/utils/mb/Unicode/UCS_to_UHC.pl
    src/backend/utils/mb/Unicode/UCS_to_WIN874.pl
    src/backend/utils/mb/Unicode/UCS_to_WINX.pl
    src/backend/utils/mb/Unicode/UCS_to_cyrillic.pl
    src/backend/utils/mb/Unicode/alt_to_utf8.map
    src/backend/utils/mb/Unicode/big5_to_utf8.map
    src/backend/utils/mb/Unicode/euc_cn_to_utf8.map
    src/backend/utils/mb/Unicode/euc_jp_to_utf8.map
    src/backend/utils/mb/Unicode/euc_kr_to_utf8.map
    src/backend/utils/mb/Unicode/euc_tw_to_utf8.map
    src/backend/utils/mb/Unicode/gb18030_to_utf8.map
    src/backend/utils/mb/Unicode/gbk_to_utf8.map
    src/backend/utils/mb/Unicode/iso8859_10_to_utf8.map
    src/backend/utils/mb/Unicode/iso8859_13_to_utf8.map
    src/backend/utils/mb/Unicode/iso8859_14_to_utf8.map
    src/backend/utils/mb/Unicode/iso8859_15_to_utf8.map
    src/backend/utils/mb/Unicode/iso8859_16_to_utf8.map
    src/backend/utils/mb/Unicode/iso8859_2_to_utf8.map
    src/backend/utils/mb/Unicode/iso8859_3_to_utf8.map
    src/backend/utils/mb/Unicode/iso8859_4_to_utf8.map
    src/backend/utils/mb/Unicode/iso8859_5_to_utf8.map
    src/backend/utils/mb/Unicode/iso8859_6_to_utf8.map
    src/backend/utils/mb/Unicode/iso8859_7_to_utf8.map
    src/backend/utils/mb/Unicode/iso8859_8_to_utf8.map
    src/backend/utils/mb/Unicode/iso8859_9_to_utf8.map
    src/backend/utils/mb/Unicode/johab_to_utf8.map
    src/backend/utils/mb/Unicode/koi8r_to_utf8.map
    src/backend/utils/mb/Unicode/sjis_to_utf8.map
    src/backend/utils/mb/Unicode/tcvn_to_utf8.map
    src/backend/utils/mb/Unicode/ucs2utf.pl
    src/backend/utils/mb/Unicode/uhc_to_utf8.map
    src/backend/utils/mb/Unicode/utf8_to_alt.map
    src/backend/utils/mb/Unicode/utf8_to_big5.map
    src/backend/utils/mb/Unicode/utf8_to_euc_cn.map
    src/backend/utils/mb/Unicode/utf8_to_euc_jp.map
    src/backend/utils/mb/Unicode/utf8_to_euc_kr.map
    src/backend/utils/mb/Unicode/utf8_to_euc_tw.map
    src/backend/utils/mb/Unicode/utf8_to_gb18030.map
    src/backend/utils/mb/Unicode/utf8_to_gbk.map
    src/backend/utils/mb/Unicode/utf8_to_iso8859_10.map
    src/backend/utils/mb/Unicode/utf8_to_iso8859_13.map
    src/backend/utils/mb/Unicode/utf8_to_iso8859_14.map
    src/backend/utils/mb/Unicode/utf8_to_iso8859_15.map
    src/backend/utils/mb/Unicode/utf8_to_iso8859_16.map
    src/backend/utils/mb/Unicode/utf8_to_iso8859_2.map
    src/backend/utils/mb/Unicode/utf8_to_iso8859_3.map
    src/backend/utils/mb/Unicode/utf8_to_iso8859_4.map
    src/backend/utils/mb/Unicode/utf8_to_iso8859_5.map
    src/backend/utils/mb/Unicode/utf8_to_iso8859_6.map
    src/backend/utils/mb/Unicode/utf8_to_iso8859_7.map
    src/backend/utils/mb/Unicode/utf8_to_iso8859_8.map
    src/backend/utils/mb/Unicode/utf8_to_iso8859_9.map
    src/backend/utils/mb/Unicode/utf8_to_johab.map
    src/backend/utils/mb/Unicode/utf8_to_koi8r.map
    src/backend/utils/mb/Unicode/utf8_to_sjis.map
    src/backend/utils/mb/Unicode/utf8_to_tcvn.map
    src/backend/utils/mb/Unicode/utf8_to_uhc.map
    src/backend/utils/mb/Unicode/utf8_to_win1250.map
    src/backend/utils/mb/Unicode/utf8_to_win1251.map
    src/backend/utils/mb/Unicode/utf8_to_win1256.map
    src/backend/utils/mb/Unicode/utf8_to_win874.map
    src/backend/utils/mb/Unicode/win1250_to_utf8.map
    src/backend/utils/mb/Unicode/win1251_to_utf8.map
    src/backend/utils/mb/Unicode/win1256_to_utf8.map
    src/backend/utils/mb/Unicode/win874_to_utf8.map
    src/backend/utils/mb/alt.c
    src/backend/utils/mb/big5.c
    src/backend/utils/mb/conv.c
    src/backend/utils/mb/encnames.c
    src/backend/utils/mb/iso.c
    src/backend/utils/mb/mbutils.c
    src/backend/utils/mb/sjis.map
    src/backend/utils/mb/wchar.c
    src/backend/utils/mb/win.c
    src/backend/utils/mb/win1251.c
    src/backend/utils/mb/wstrcmp.c
    src/backend/utils/mb/wstrncmp.c
    src/backend/utils/misc/.cvsignore
    src/backend/utils/misc/Makefile
    src/backend/utils/misc/README
    src/backend/utils/misc/database.c
    src/backend/utils/misc/guc-file.l
    src/backend/utils/misc/guc.c
    src/backend/utils/misc/postgresql.conf.sample
    src/backend/utils/misc/ps_status.c
    src/backend/utils/misc/superuser.c
    src/backend/utils/mmgr/Makefile
    src/backend/utils/mmgr/README
    src/backend/utils/mmgr/aset.c
    src/backend/utils/mmgr/mcxt.c
    src/backend/utils/mmgr/portalmem.c
    src/backend/utils/sort/Makefile
    src/backend/utils/sort/logtape.c
    src/backend/utils/sort/tuplesort.c
    src/backend/utils/sort/tuplestore.c
    src/backend/utils/time/Makefile
    src/backend/utils/time/tqual.c
    src/bin/Makefile
    src/bin/initdb/Makefile
    src/bin/initdb/initdb.sh
    src/bin/initlocation/Makefile
    src/bin/initlocation/initlocation.sh
    src/bin/ipcclean/Makefile
    src/bin/ipcclean/ipcclean.sh
    src/bin/pg_config/Makefile
    src/bin/pg_config/pg_config.sh
    src/bin/pg_ctl/Makefile
    src/bin/pg_ctl/pg_ctl.sh
    src/bin/pg_dump/Makefile
    src/bin/pg_dump/README
    src/bin/pg_dump/common.c
    src/bin/pg_dump/cs.po
    src/bin/pg_dump/de.po
    src/bin/pg_dump/nls.mk
    src/bin/pg_dump/pg_backup.h
    src/bin/pg_dump/pg_backup_archiver.c
    src/bin/pg_dump/pg_backup_archiver.h
    src/bin/pg_dump/pg_backup_custom.c
    src/bin/pg_dump/pg_backup_db.c
    src/bin/pg_dump/pg_backup_db.h
    src/bin/pg_dump/pg_backup_files.c
    src/bin/pg_dump/pg_backup_null.c
    src/bin/pg_dump/pg_backup_tar.c
    src/bin/pg_dump/pg_backup_tar.h
    src/bin/pg_dump/pg_dump.c
    src/bin/pg_dump/pg_dump.h
    src/bin/pg_dump/pg_dumpall.sh
    src/bin/pg_dump/pg_restore.c
    src/bin/pg_dump/ru.po
    src/bin/pg_dump/sv.po
    src/bin/pg_dump/zh_CN.po
    src/bin/pg_dump/zh_TW.po
    src/bin/pg_encoding/Makefile
    src/bin/pg_encoding/pg_encoding.c
    src/bin/pg_id/Makefile
    src/bin/pg_id/pg_id.c
    src/bin/pgaccess/Makefile
    src/bin/pgaccess/README
    src/bin/pgaccess/copyright.html
    src/bin/pgaccess/demo/formdemo.sql
    src/bin/pgaccess/doc/html/a_right.gif
    src/bin/pgaccess/doc/html/addindex.gif
    src/bin/pgaccess/doc/html/api.html
    src/bin/pgaccess/doc/html/ball.gif
    src/bin/pgaccess/doc/html/contents.html
    src/bin/pgaccess/doc/html/copyright.html
    src/bin/pgaccess/doc/html/documentation.html
    src/bin/pgaccess/doc/html/download.html
    src/bin/pgaccess/doc/html/faq.html
    src/bin/pgaccess/doc/html/features.html
    src/bin/pgaccess/doc/html/formdemo.sql
    src/bin/pgaccess/doc/html/forms.gif
    src/bin/pgaccess/doc/html/forms.html
    src/bin/pgaccess/doc/html/function.gif
    src/bin/pgaccess/doc/html/help.gif
    src/bin/pgaccess/doc/html/index.html
    src/bin/pgaccess/doc/html/irix.html
    src/bin/pgaccess/doc/html/linux1.gif
    src/bin/pgaccess/doc/html/maillist.html
    src/bin/pgaccess/doc/html/main.html
    src/bin/pgaccess/doc/html/mainwindow.gif
    src/bin/pgaccess/doc/html/newtable.gif
    src/bin/pgaccess/doc/html/newuser.gif
    src/bin/pgaccess/doc/html/old_index.html
    src/bin/pgaccess/doc/html/permissions.gif
    src/bin/pgaccess/doc/html/pg93patch.html
    src/bin/pgaccess/doc/html/pga-rad.html
    src/bin/pgaccess/doc/html/qbtclet.html
    src/bin/pgaccess/doc/html/qbtclet.tcl
    src/bin/pgaccess/doc/html/screenshots.html
    src/bin/pgaccess/doc/html/specialchars.html
    src/bin/pgaccess/doc/html/todo.html
    src/bin/pgaccess/doc/html/tutorial/addref.jpg
    src/bin/pgaccess/doc/html/tutorial/altern_q.jpg
    src/bin/pgaccess/doc/html/tutorial/altern_v.jpg
    src/bin/pgaccess/doc/html/tutorial/copyright.html
    src/bin/pgaccess/doc/html/tutorial/index.html
    src/bin/pgaccess/doc/html/tutorial/intro.html
    src/bin/pgaccess/doc/html/tutorial/irix.html
    src/bin/pgaccess/doc/html/tutorial/newref.txt
    src/bin/pgaccess/doc/html/tutorial/newtable.jpg
    src/bin/pgaccess/doc/html/tutorial/newtable.tga
    src/bin/pgaccess/doc/html/tutorial/problems.html
    src/bin/pgaccess/doc/html/tutorial/screen1.jpg
    src/bin/pgaccess/doc/html/tutorial/sel_tbl.jpg
    src/bin/pgaccess/doc/html/tutorial/start.html
    src/bin/pgaccess/doc/html/tutorial/tut.html
    src/bin/pgaccess/doc/html/tutorial/tut_edit.html
    src/bin/pgaccess/doc/html/tutorial/tut_new.html
    src/bin/pgaccess/doc/html/tutorial/tut_sel1.html
    src/bin/pgaccess/doc/html/tutorial/tut_user.html
    src/bin/pgaccess/doc/html/vdesigner.gif
    src/bin/pgaccess/doc/html/whatsnew.html
    src/bin/pgaccess/doc/html/win32.html
    src/bin/pgaccess/images/icon_button.gif
    src/bin/pgaccess/images/icon_checkbutton.gif
    src/bin/pgaccess/images/icon_entry.gif
    src/bin/pgaccess/images/icon_frame.gif
    src/bin/pgaccess/images/icon_label.gif
    src/bin/pgaccess/images/icon_listbox.gif
    src/bin/pgaccess/images/icon_query.gif
    src/bin/pgaccess/images/icon_radiobutton.gif
    src/bin/pgaccess/images/icon_text.gif
    src/bin/pgaccess/lib/database.tcl
    src/bin/pgaccess/lib/forms.tcl
    src/bin/pgaccess/lib/functions.tcl
    src/bin/pgaccess/lib/help/abort.hlp
    src/bin/pgaccess/lib/help/add_records.hlp
    src/bin/pgaccess/lib/help/alter_table.hlp
    src/bin/pgaccess/lib/help/alter_user.hlp
    src/bin/pgaccess/lib/help/author.hlp
    src/bin/pgaccess/lib/help/begin.hlp
    src/bin/pgaccess/lib/help/close.hlp
    src/bin/pgaccess/lib/help/cluster.hlp
    src/bin/pgaccess/lib/help/commit.hlp
    src/bin/pgaccess/lib/help/copy.hlp
    src/bin/pgaccess/lib/help/copyrights.hlp
    src/bin/pgaccess/lib/help/create_aggregate.hlp
    src/bin/pgaccess/lib/help/create_database.hlp
    src/bin/pgaccess/lib/help/create_function.hlp
    src/bin/pgaccess/lib/help/create_index.hlp
    src/bin/pgaccess/lib/help/create_language.hlp
    src/bin/pgaccess/lib/help/create_operator.hlp
    src/bin/pgaccess/lib/help/create_rule.hlp
    src/bin/pgaccess/lib/help/create_sequence.hlp
    src/bin/pgaccess/lib/help/create_table.hlp
    src/bin/pgaccess/lib/help/create_table_as.hlp
    src/bin/pgaccess/lib/help/create_trigger.hlp
    src/bin/pgaccess/lib/help/create_type.hlp
    src/bin/pgaccess/lib/help/create_user.hlp
    src/bin/pgaccess/lib/help/create_view.hlp
    src/bin/pgaccess/lib/help/data_types.hlp
    src/bin/pgaccess/lib/help/datefunc.hlp
    src/bin/pgaccess/lib/help/declare.hlp
    src/bin/pgaccess/lib/help/delete.hlp
    src/bin/pgaccess/lib/help/drop_aggregate.hlp
    src/bin/pgaccess/lib/help/drop_database.hlp
    src/bin/pgaccess/lib/help/drop_function.hlp
    src/bin/pgaccess/lib/help/drop_index.hlp
    src/bin/pgaccess/lib/help/drop_language.hlp
    src/bin/pgaccess/lib/help/drop_operator.hlp
    src/bin/pgaccess/lib/help/drop_rule.hlp
    src/bin/pgaccess/lib/help/drop_sequence.hlp
    src/bin/pgaccess/lib/help/drop_table.hlp
    src/bin/pgaccess/lib/help/drop_trigger.hlp
    src/bin/pgaccess/lib/help/drop_type.hlp
    src/bin/pgaccess/lib/help/drop_user.hlp
    src/bin/pgaccess/lib/help/drop_view.hlp
    src/bin/pgaccess/lib/help/explain.hlp
    src/bin/pgaccess/lib/help/fetch.hlp
    src/bin/pgaccess/lib/help/form_design.hlp
    src/bin/pgaccess/lib/help/forms.hlp
    src/bin/pgaccess/lib/help/functions.hlp
    src/bin/pgaccess/lib/help/geomfunc.hlp
    src/bin/pgaccess/lib/help/grant.hlp
    src/bin/pgaccess/lib/help/history.hlp
    src/bin/pgaccess/lib/help/index.hlp
    src/bin/pgaccess/lib/help/inheritance.hlp
    src/bin/pgaccess/lib/help/insert.hlp
    src/bin/pgaccess/lib/help/ipv4func.hlp
    src/bin/pgaccess/lib/help/isolation.hlp
    src/bin/pgaccess/lib/help/keywords.hlp
    src/bin/pgaccess/lib/help/listen.hlp
    src/bin/pgaccess/lib/help/load.hlp
    src/bin/pgaccess/lib/help/lock.hlp
    src/bin/pgaccess/lib/help/mathfunc.hlp
    src/bin/pgaccess/lib/help/move.hlp
    src/bin/pgaccess/lib/help/mvcc.hlp
    src/bin/pgaccess/lib/help/new_query.hlp
    src/bin/pgaccess/lib/help/new_table.hlp
    src/bin/pgaccess/lib/help/notify.hlp
    src/bin/pgaccess/lib/help/open_query.hlp
    src/bin/pgaccess/lib/help/open_table.hlp
    src/bin/pgaccess/lib/help/pgfunctions.hlp
    src/bin/pgaccess/lib/help/postgresql.hlp
    src/bin/pgaccess/lib/help/queries.hlp
    src/bin/pgaccess/lib/help/reports.hlp
    src/bin/pgaccess/lib/help/reset.hlp
    src/bin/pgaccess/lib/help/revoke.hlp
    src/bin/pgaccess/lib/help/rollback.hlp
    src/bin/pgaccess/lib/help/schema.hlp
    src/bin/pgaccess/lib/help/scripts.hlp
    src/bin/pgaccess/lib/help/select.hlp
    src/bin/pgaccess/lib/help/select_into.hlp
    src/bin/pgaccess/lib/help/sequences.hlp
    src/bin/pgaccess/lib/help/set.hlp
    src/bin/pgaccess/lib/help/show.hlp
    src/bin/pgaccess/lib/help/sql_guide.hlp
    src/bin/pgaccess/lib/help/sqlfunc.hlp
    src/bin/pgaccess/lib/help/stringfunc.hlp
    src/bin/pgaccess/lib/help/tables.hlp
    src/bin/pgaccess/lib/help/unlisten.hlp
    src/bin/pgaccess/lib/help/update.hlp
    src/bin/pgaccess/lib/help/users.hlp
    src/bin/pgaccess/lib/help/vacuum.hlp
    src/bin/pgaccess/lib/help/view_table_structure.hlp
    src/bin/pgaccess/lib/help/views.hlp
    src/bin/pgaccess/lib/help/visual_designer.hlp
    src/bin/pgaccess/lib/help/y2k.hlp
    src/bin/pgaccess/lib/help.tcl
    src/bin/pgaccess/lib/languages/chinese_big5
    src/bin/pgaccess/lib/languages/chinese_gb
    src/bin/pgaccess/lib/languages/czech
    src/bin/pgaccess/lib/languages/deutsch
    src/bin/pgaccess/lib/languages/euskara
    src/bin/pgaccess/lib/languages/francais
    src/bin/pgaccess/lib/languages/italiano
    src/bin/pgaccess/lib/languages/japanese
    src/bin/pgaccess/lib/languages/magyar
    src/bin/pgaccess/lib/languages/nederlands
    src/bin/pgaccess/lib/languages/portugues
    src/bin/pgaccess/lib/languages/romana
    src/bin/pgaccess/lib/languages/russian.koi8r
    src/bin/pgaccess/lib/languages/russian_win
    src/bin/pgaccess/lib/languages/spanish
    src/bin/pgaccess/lib/mainlib.tcl
    src/bin/pgaccess/lib/preferences.tcl
    src/bin/pgaccess/lib/queries.tcl
    src/bin/pgaccess/lib/reports.tcl
    src/bin/pgaccess/lib/schema.tcl
    src/bin/pgaccess/lib/scripts.tcl
    src/bin/pgaccess/lib/sequences.tcl
    src/bin/pgaccess/lib/tables.tcl
    src/bin/pgaccess/lib/users.tcl
    src/bin/pgaccess/lib/views.tcl
    src/bin/pgaccess/lib/visualqb.tcl
    src/bin/pgaccess/main.tcl
    src/bin/pgaccess/pgaccess.sh
    src/bin/pgtclsh/Makefile
    src/bin/pgtclsh/README
    src/bin/pgtclsh/pgtclAppInit.c
    src/bin/pgtclsh/pgtclUtils.tcl
    src/bin/pgtclsh/pgtkAppInit.c
    src/bin/pgtclsh/updateStats.tcl
    src/bin/psql/.cvsignore
    src/bin/psql/Makefile
    src/bin/psql/command.c
    src/bin/psql/command.h
    src/bin/psql/common.c
    src/bin/psql/common.h
    src/bin/psql/copy.c
    src/bin/psql/copy.h
    src/bin/psql/create_help.pl
    src/bin/psql/cs.po
    src/bin/psql/de.po
    src/bin/psql/describe.c
    src/bin/psql/describe.h
    src/bin/psql/fr.po
    src/bin/psql/help.c
    src/bin/psql/help.h
    src/bin/psql/input.c
    src/bin/psql/input.h
    src/bin/psql/large_obj.c
    src/bin/psql/large_obj.h
    src/bin/psql/mainloop.c
    src/bin/psql/mainloop.h
    src/bin/psql/mbprint.c
    src/bin/psql/mbprint.h
    src/bin/psql/nls.mk
    src/bin/psql/print.c
    src/bin/psql/print.h
    src/bin/psql/prompt.c
    src/bin/psql/prompt.h
    src/bin/psql/ru.po
    src/bin/psql/settings.h
    src/bin/psql/startup.c
    src/bin/psql/stringutils.c
    src/bin/psql/stringutils.h
    src/bin/psql/sv.po
    src/bin/psql/tab-complete.c
    src/bin/psql/tab-complete.h
    src/bin/psql/variables.c
    src/bin/psql/variables.h
    src/bin/psql/win32.mak
    src/bin/psql/zh_CN.po
    src/bin/psql/zh_TW.po
    src/bin/scripts/Makefile
    src/bin/scripts/createdb
    src/bin/scripts/createlang.sh
    src/bin/scripts/createuser
    src/bin/scripts/dropdb
    src/bin/scripts/droplang
    src/bin/scripts/dropuser
    src/bin/scripts/vacuumdb
    src/corba/CosQuery.idl
    src/corba/CosQueryCollection.idl
    src/corba/pgsql.idl
    src/corba/pgsql_int.idl
    src/corba/server.cc
    src/data/charset.conf
    src/data/isocz-wincz.tab
    src/data/koi-alt.tab
    src/data/koi-iso.tab
    src/data/koi-koi.tab
    src/data/koi-mac.tab
    src/data/koi-win.tab
    src/include/Makefile
    src/include/access/attnum.h
    src/include/access/clog.h
    src/include/access/genam.h
    src/include/access/gist.h
    src/include/access/gistscan.h
    src/include/access/hash.h
    src/include/access/heapam.h
    src/include/access/hio.h
    src/include/access/htup.h
    src/include/access/ibit.h
    src/include/access/iqual.h
    src/include/access/istrat.h
    src/include/access/itup.h
    src/include/access/nbtree.h
    src/include/access/printtup.h
    src/include/access/relscan.h
    src/include/access/rmgr.h
    src/include/access/rtree.h
    src/include/access/rtscan.h
    src/include/access/sdir.h
    src/include/access/skey.h
    src/include/access/strat.h
    src/include/access/transam.h
    src/include/access/tupdesc.h
    src/include/access/tupmacs.h
    src/include/access/tuptoaster.h
    src/include/access/valid.h
    src/include/access/xact.h
    src/include/access/xlog.h
    src/include/access/xlogdefs.h
    src/include/access/xlogutils.h
    src/include/bootstrap/bootstrap.h
    src/include/c.h
    src/include/catalog/catalog.h
    src/include/catalog/catname.h
    src/include/catalog/catversion.h
    src/include/catalog/duplicate_oids
    src/include/catalog/heap.h
    src/include/catalog/index.h
    src/include/catalog/indexing.h
    src/include/catalog/namespace.h
    src/include/catalog/pg_aggregate.h
    src/include/catalog/pg_am.h
    src/include/catalog/pg_amop.h
    src/include/catalog/pg_amproc.h
    src/include/catalog/pg_attrdef.h
    src/include/catalog/pg_attribute.h
    src/include/catalog/pg_class.h
    src/include/catalog/pg_control.h
    src/include/catalog/pg_database.h
    src/include/catalog/pg_description.h
    src/include/catalog/pg_group.h
    src/include/catalog/pg_index.h
    src/include/catalog/pg_inherits.h
    src/include/catalog/pg_language.h
    src/include/catalog/pg_largeobject.h
    src/include/catalog/pg_listener.h
    src/include/catalog/pg_namespace.h
    src/include/catalog/pg_opclass.h
    src/include/catalog/pg_operator.h
    src/include/catalog/pg_proc.h
    src/include/catalog/pg_relcheck.h
    src/include/catalog/pg_rewrite.h
    src/include/catalog/pg_shadow.h
    src/include/catalog/pg_statistic.h
    src/include/catalog/pg_trigger.h
    src/include/catalog/pg_type.h
    src/include/catalog/pg_version.h
    src/include/catalog/unused_oids
    src/include/commands/async.h
    src/include/commands/cluster.h
    src/include/commands/comment.h
    src/include/commands/copy.h
    src/include/commands/dbcommands.h
    src/include/commands/defrem.h
    src/include/commands/explain.h
    src/include/commands/lockcmds.h
    src/include/commands/portalcmds.h
    src/include/commands/proclang.h
    src/include/commands/schemacmds.h
    src/include/commands/sequence.h
    src/include/commands/tablecmds.h
    src/include/commands/trigger.h
    src/include/commands/user.h
    src/include/commands/vacuum.h
    src/include/commands/variable.h
    src/include/commands/version.h
    src/include/commands/view.h
    src/include/executor/execdebug.h
    src/include/executor/execdefs.h
    src/include/executor/execdesc.h
    src/include/executor/executor.h
    src/include/executor/functions.h
    src/include/executor/hashjoin.h
    src/include/executor/instrument.h
    src/include/executor/nodeAgg.h
    src/include/executor/nodeAppend.h
    src/include/executor/nodeFunctionscan.h
    src/include/executor/nodeGroup.h
    src/include/executor/nodeHash.h
    src/include/executor/nodeHashjoin.h
    src/include/executor/nodeIndexscan.h
    src/include/executor/nodeLimit.h
    src/include/executor/nodeMaterial.h
    src/include/executor/nodeMergejoin.h
    src/include/executor/nodeNestloop.h
    src/include/executor/nodeResult.h
    src/include/executor/nodeSeqscan.h
    src/include/executor/nodeSetOp.h
    src/include/executor/nodeSort.h
    src/include/executor/nodeSubplan.h
    src/include/executor/nodeSubqueryscan.h
    src/include/executor/nodeTidscan.h
    src/include/executor/nodeUnique.h
    src/include/executor/spi.h
    src/include/executor/spi_priv.h
    src/include/executor/tuptable.h
    src/include/fmgr.h
    src/include/lib/dllist.h
    src/include/lib/lispsort.h
    src/include/lib/stringinfo.h
    src/include/libpq/auth.h
    src/include/libpq/be-fsstubs.h
    src/include/libpq/crypt.h
    src/include/libpq/hba.h
    src/include/libpq/libpq-be.h
    src/include/libpq/libpq-fs.h
    src/include/libpq/libpq.h
    src/include/libpq/password.h
    src/include/libpq/pqcomm.h
    src/include/libpq/pqformat.h
    src/include/libpq/pqsignal.h
    src/include/mb/pg_wchar.h
    src/include/miscadmin.h
    src/include/nodes/execnodes.h
    src/include/nodes/makefuncs.h
    src/include/nodes/memnodes.h
    src/include/nodes/nodeFuncs.h
    src/include/nodes/nodes.h
    src/include/nodes/params.h
    src/include/nodes/parsenodes.h
    src/include/nodes/pg_list.h
    src/include/nodes/plannodes.h
    src/include/nodes/primnodes.h
    src/include/nodes/print.h
    src/include/nodes/readfuncs.h
    src/include/nodes/relation.h
    src/include/optimizer/_deadcode/xfunc.h
    src/include/optimizer/clauses.h
    src/include/optimizer/cost.h
    src/include/optimizer/geqo.h
    src/include/optimizer/geqo_copy.h
    src/include/optimizer/geqo_gene.h
    src/include/optimizer/geqo_misc.h
    src/include/optimizer/geqo_mutation.h
    src/include/optimizer/geqo_pool.h
    src/include/optimizer/geqo_random.h
    src/include/optimizer/geqo_recombination.h
    src/include/optimizer/geqo_selection.h
    src/include/optimizer/joininfo.h
    src/include/optimizer/pathnode.h
    src/include/optimizer/paths.h
    src/include/optimizer/plancat.h
    src/include/optimizer/planmain.h
    src/include/optimizer/planner.h
    src/include/optimizer/prep.h
    src/include/optimizer/restrictinfo.h
    src/include/optimizer/subselect.h
    src/include/optimizer/tlist.h
    src/include/optimizer/var.h
    src/include/parser/analyze.h
    src/include/parser/gramparse.h
    src/include/parser/keywords.h
    src/include/parser/parse_agg.h
    src/include/parser/parse_clause.h
    src/include/parser/parse_coerce.h
    src/include/parser/parse_expr.h
    src/include/parser/parse_func.h
    src/include/parser/parse_node.h
    src/include/parser/parse_oper.h
    src/include/parser/parse_relation.h
    src/include/parser/parse_target.h
    src/include/parser/parse_type.h
    src/include/parser/parser.h
    src/include/parser/parsetree.h
    src/include/parser/scansup.h
    src/include/pg_config.h.in
    src/include/pg_config.h.win32
    src/include/pgstat.h
    src/include/port/aix.h
    src/include/port/beos.h
    src/include/port/bsdi.h
    src/include/port/darwin.h
    src/include/port/dgux.h
    src/include/port/freebsd.h
    src/include/port/hpux.h
    src/include/port/irix5.h
    src/include/port/linux.h
    src/include/port/netbsd.h
    src/include/port/nextstep.h
    src/include/port/openbsd.h
    src/include/port/osf.h
    src/include/port/qnx4.h
    src/include/port/sco.h
    src/include/port/solaris.h
    src/include/port/sunos4.h
    src/include/port/svr4.h
    src/include/port/ultrix4.h
    src/include/port/univel.h
    src/include/port/unixware.h
    src/include/port/win.h
    src/include/port/win32.h
    src/include/postgres.h
    src/include/postgres_ext.h
    src/include/postgres_fe.h
    src/include/regex/cclass.h
    src/include/regex/cname.h
    src/include/regex/regex.h
    src/include/regex/regex2.h
    src/include/regex/utils.h
    src/include/rewrite/prs2lock.h
    src/include/rewrite/rewriteDefine.h
    src/include/rewrite/rewriteHandler.h
    src/include/rewrite/rewriteManip.h
    src/include/rewrite/rewriteRemove.h
    src/include/rewrite/rewriteSupport.h
    src/include/rusagestub.h
    src/include/storage/backendid.h
    src/include/storage/block.h
    src/include/storage/buf.h
    src/include/storage/buf_internals.h
    src/include/storage/buffile.h
    src/include/storage/bufmgr.h
    src/include/storage/bufpage.h
    src/include/storage/fd.h
    src/include/storage/freespace.h
    src/include/storage/ipc.h
    src/include/storage/item.h
    src/include/storage/itemid.h
    src/include/storage/itempos.h
    src/include/storage/itemptr.h
    src/include/storage/large_object.h
    src/include/storage/lmgr.h
    src/include/storage/lock.h
    src/include/storage/lwlock.h
    src/include/storage/off.h
    src/include/storage/page.h
    src/include/storage/pg_sema.h
    src/include/storage/pg_shmem.h
    src/include/storage/pmsignal.h
    src/include/storage/pos.h
    src/include/storage/proc.h
    src/include/storage/relfilenode.h
    src/include/storage/s_lock.h
    src/include/storage/shmem.h
    src/include/storage/sinval.h
    src/include/storage/sinvaladt.h
    src/include/storage/smgr.h
    src/include/storage/spin.h
    src/include/strdup.h
    src/include/tcop/dest.h
    src/include/tcop/fastpath.h
    src/include/tcop/pquery.h
    src/include/tcop/tcopdebug.h
    src/include/tcop/tcopprot.h
    src/include/tcop/utility.h
    src/include/utils/acl.h
    src/include/utils/array.h
    src/include/utils/ascii.h
    src/include/utils/bit.h
    src/include/utils/builtins.h
    src/include/utils/cash.h
    src/include/utils/catcache.h
    src/include/utils/date.h
    src/include/utils/datetime.h
    src/include/utils/datum.h
    src/include/utils/dynahash.h
    src/include/utils/dynamic_loader.h
    src/include/utils/elog.h
    src/include/utils/exc.h
    src/include/utils/excid.h
    src/include/utils/fcache.h
    src/include/utils/fmgrtab.h
    src/include/utils/formatting.h
    src/include/utils/geo_decls.h
    src/include/utils/guc.h
    src/include/utils/hsearch.h
    src/include/utils/inet.h
    src/include/utils/int8.h
    src/include/utils/inval.h
    src/include/utils/logtape.h
    src/include/utils/lsyscache.h
    src/include/utils/memutils.h
    src/include/utils/nabstime.h
    src/include/utils/numeric.h
    src/include/utils/palloc.h
    src/include/utils/pg_crc.h
    src/include/utils/pg_locale.h
    src/include/utils/pg_lzcompress.h
    src/include/utils/portal.h
    src/include/utils/ps_status.h
    src/include/utils/rel.h
    src/include/utils/relcache.h
    src/include/utils/selfuncs.h
    src/include/utils/sets.h
    src/include/utils/syscache.h
    src/include/utils/timestamp.h
    src/include/utils/tqual.h
    src/include/utils/tuplesort.h
    src/include/utils/tuplestore.h
    src/include/utils/varbit.h
    src/interfaces/Makefile
    src/interfaces/cli/example1.c
    src/interfaces/cli/example2.c
    src/interfaces/cli/sqlcli.h
    src/interfaces/jdbc/CHANGELOG
    src/interfaces/jdbc/Implementation
    src/interfaces/jdbc/Makefile
    src/interfaces/jdbc/README
    src/interfaces/jdbc/build.xml
    src/interfaces/jdbc/example/ImageViewer.java
    src/interfaces/jdbc/example/Unicode.java
    src/interfaces/jdbc/example/basic.java
    src/interfaces/jdbc/example/blobtest.java
    src/interfaces/jdbc/example/corba/StockClient.java
    src/interfaces/jdbc/example/corba/StockDB.java
    src/interfaces/jdbc/example/corba/StockDispenserImpl.java
    src/interfaces/jdbc/example/corba/StockItemImpl.java
    src/interfaces/jdbc/example/corba/StockServer.java
    src/interfaces/jdbc/example/corba/readme
    src/interfaces/jdbc/example/corba/stock.idl
    src/interfaces/jdbc/example/corba/stock.sql
    src/interfaces/jdbc/example/datestyle.java
    src/interfaces/jdbc/example/metadata.java
    src/interfaces/jdbc/example/psql.java
    src/interfaces/jdbc/example/threadsafe.java
    src/interfaces/jdbc/jdbc.jpx
    src/interfaces/jdbc/org/postgresql/Connection.java
    src/interfaces/jdbc/org/postgresql/Driver.java.in
    src/interfaces/jdbc/org/postgresql/Field.java
    src/interfaces/jdbc/org/postgresql/PG_Stream.java
    src/interfaces/jdbc/org/postgresql/PostgresqlDataSource.java
    src/interfaces/jdbc/org/postgresql/ResultSet.java
    src/interfaces/jdbc/org/postgresql/Statement.java
    src/interfaces/jdbc/org/postgresql/core/BytePoolDim1.java
    src/interfaces/jdbc/org/postgresql/core/BytePoolDim2.java
    src/interfaces/jdbc/org/postgresql/core/Encoding.java
    src/interfaces/jdbc/org/postgresql/core/MemoryPool.java
    src/interfaces/jdbc/org/postgresql/core/ObjectPool.java
    src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
    src/interfaces/jdbc/org/postgresql/core/SimpleObjectPool.java
    src/interfaces/jdbc/org/postgresql/core/StartupPacket.java
    src/interfaces/jdbc/org/postgresql/errors.properties
    src/interfaces/jdbc/org/postgresql/errors_de.properties
    src/interfaces/jdbc/org/postgresql/errors_fr.properties
    src/interfaces/jdbc/org/postgresql/errors_it.properties
    src/interfaces/jdbc/org/postgresql/errors_nl.properties
    src/interfaces/jdbc/org/postgresql/errors_zh_TW.properties
    src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
    src/interfaces/jdbc/org/postgresql/fastpath/FastpathArg.java
    src/interfaces/jdbc/org/postgresql/geometric/PGbox.java
    src/interfaces/jdbc/org/postgresql/geometric/PGcircle.java
    src/interfaces/jdbc/org/postgresql/geometric/PGline.java
    src/interfaces/jdbc/org/postgresql/geometric/PGlseg.java
    src/interfaces/jdbc/org/postgresql/geometric/PGpath.java
    src/interfaces/jdbc/org/postgresql/geometric/PGpoint.java
    src/interfaces/jdbc/org/postgresql/geometric/PGpolygon.java
    src/interfaces/jdbc/org/postgresql/jdbc1/CallableStatement.java
    src/interfaces/jdbc/org/postgresql/jdbc1/Connection.java
    src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
    src/interfaces/jdbc/org/postgresql/jdbc1/PreparedStatement.java
    src/interfaces/jdbc/org/postgresql/jdbc1/ResultSet.java
    src/interfaces/jdbc/org/postgresql/jdbc1/ResultSetMetaData.java
    src/interfaces/jdbc/org/postgresql/jdbc1/Statement.java
    src/interfaces/jdbc/org/postgresql/jdbc2/Array.java
    src/interfaces/jdbc/org/postgresql/jdbc2/CallableStatement.java
    src/interfaces/jdbc/org/postgresql/jdbc2/Connection.java
    src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
    src/interfaces/jdbc/org/postgresql/jdbc2/PBatchUpdateException.java
    src/interfaces/jdbc/org/postgresql/jdbc2/PreparedStatement.java
    src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java
    src/interfaces/jdbc/org/postgresql/jdbc2/ResultSetMetaData.java
    src/interfaces/jdbc/org/postgresql/jdbc2/Statement.java
    src/interfaces/jdbc/org/postgresql/jdbc2/UpdateableResultSet.java
    src/interfaces/jdbc/org/postgresql/largeobject/BlobInputStream.java
    src/interfaces/jdbc/org/postgresql/largeobject/BlobOutputStream.java
    src/interfaces/jdbc/org/postgresql/largeobject/LargeObject.java
    src/interfaces/jdbc/org/postgresql/largeobject/LargeObjectManager.java
    src/interfaces/jdbc/org/postgresql/largeobject/PGblob.java
    src/interfaces/jdbc/org/postgresql/largeobject/PGclob.java
    src/interfaces/jdbc/org/postgresql/test/JDBC2Tests.java
    src/interfaces/jdbc/org/postgresql/test/README
    src/interfaces/jdbc/org/postgresql/test/jdbc2/ANTTest.java
    src/interfaces/jdbc/org/postgresql/test/jdbc2/BatchExecuteTest.java
    src/interfaces/jdbc/org/postgresql/test/jdbc2/BlobTest.java
    src/interfaces/jdbc/org/postgresql/test/jdbc2/ConnectionTest.java
    src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
    src/interfaces/jdbc/org/postgresql/test/jdbc2/DateTest.java
    src/interfaces/jdbc/org/postgresql/test/jdbc2/DriverTest.java
    src/interfaces/jdbc/org/postgresql/test/jdbc2/EncodingTest.java
    src/interfaces/jdbc/org/postgresql/test/jdbc2/JBuilderTest.java
    src/interfaces/jdbc/org/postgresql/test/jdbc2/MiscTest.java
    src/interfaces/jdbc/org/postgresql/test/jdbc2/ResultSetTest.java
    src/interfaces/jdbc/org/postgresql/test/jdbc2/TimeTest.java
    src/interfaces/jdbc/org/postgresql/test/jdbc2/TimestampTest.java
    src/interfaces/jdbc/org/postgresql/test/jdbc2/UpdateableResultTest.java
    src/interfaces/jdbc/org/postgresql/util/MD5Digest.java
    src/interfaces/jdbc/org/postgresql/util/MessageTranslator.java
    src/interfaces/jdbc/org/postgresql/util/PGbytea.java
    src/interfaces/jdbc/org/postgresql/util/PGmoney.java
    src/interfaces/jdbc/org/postgresql/util/PGobject.java
    src/interfaces/jdbc/org/postgresql/util/PGtokenizer.java
    src/interfaces/jdbc/org/postgresql/util/PSQLException.java
    src/interfaces/jdbc/org/postgresql/util/Serialize.java
    src/interfaces/jdbc/org/postgresql/util/UnixCrypt.java
    src/interfaces/jdbc/org/postgresql/xa/ClientConnection.java
    src/interfaces/jdbc/org/postgresql/xa/TwoPhaseConnection.java
    src/interfaces/jdbc/org/postgresql/xa/TxConnection.java
    src/interfaces/jdbc/org/postgresql/xa/XAConnectionImpl.java
    src/interfaces/jdbc/org/postgresql/xa/XADataSourceImpl.java
    src/interfaces/jdbc/utils/CheckVersion.java
    src/interfaces/jdbc/utils/buildDriver
    src/interfaces/jdbc/utils/changelog.pl
    src/interfaces/libpgeasy/Makefile
    src/interfaces/libpgeasy/README
    src/interfaces/libpgeasy/examples/Makefile
    src/interfaces/libpgeasy/examples/pginsert.c
    src/interfaces/libpgeasy/examples/pgmultiresult.c
    src/interfaces/libpgeasy/examples/pgnulltest.c
    src/interfaces/libpgeasy/examples/pgwordcount.c
    src/interfaces/libpgeasy/halt.c
    src/interfaces/libpgeasy/halt.h
    src/interfaces/libpgeasy/libpgeasy.c
    src/interfaces/libpgeasy/libpgeasy.h
    src/interfaces/libpgtcl/Makefile
    src/interfaces/libpgtcl/README
    src/interfaces/libpgtcl/libpgtcl.def
    src/interfaces/libpgtcl/libpgtcl.h
    src/interfaces/libpgtcl/pgtcl.c
    src/interfaces/libpgtcl/pgtclCmds.c
    src/interfaces/libpgtcl/pgtclCmds.h
    src/interfaces/libpgtcl/pgtclId.c
    src/interfaces/libpgtcl/pgtclId.h
    src/interfaces/libpgtcl/win32.mak
    src/interfaces/libpq/Makefile
    src/interfaces/libpq/README
    src/interfaces/libpq/cs.po
    src/interfaces/libpq/de.po
    src/interfaces/libpq/fe-auth.c
    src/interfaces/libpq/fe-auth.h
    src/interfaces/libpq/fe-connect.c
    src/interfaces/libpq/fe-exec.c
    src/interfaces/libpq/fe-lobj.c
    src/interfaces/libpq/fe-misc.c
    src/interfaces/libpq/fe-print.c
    src/interfaces/libpq/fe-secure.c
    src/interfaces/libpq/fr.po
    src/interfaces/libpq/libpq-fe.h
    src/interfaces/libpq/libpq-int.h
    src/interfaces/libpq/libpq.rc
    src/interfaces/libpq/libpqdll.c
    src/interfaces/libpq/libpqdll.def
    src/interfaces/libpq/nls.mk
    src/interfaces/libpq/pqexpbuffer.c
    src/interfaces/libpq/pqexpbuffer.h
    src/interfaces/libpq/pqsignal.c
    src/interfaces/libpq/pqsignal.h
    src/interfaces/libpq/ru.po
    src/interfaces/libpq/sv.po
    src/interfaces/libpq/win32.c
    src/interfaces/libpq/win32.h
    src/interfaces/libpq/win32.mak
    src/interfaces/libpq/zh_CN.po
    src/interfaces/libpq/zh_TW.po
    src/interfaces/libpq++/CHANGES
    src/interfaces/libpq++/Makefile
    src/interfaces/libpq++/README
    src/interfaces/libpq++/TODO
    src/interfaces/libpq++/examples/Makefile
    src/interfaces/libpq++/examples/testlibpq0.cc
    src/interfaces/libpq++/examples/testlibpq1.cc
    src/interfaces/libpq++/examples/testlibpq2.cc
    src/interfaces/libpq++/examples/testlibpq2.sql
    src/interfaces/libpq++/examples/testlibpq3.cc
    src/interfaces/libpq++/examples/testlibpq3.sql
    src/interfaces/libpq++/examples/testlibpq4.cc
    src/interfaces/libpq++/examples/testlibpq4.sql
    src/interfaces/libpq++/examples/testlibpq5.cc
    src/interfaces/libpq++/examples/testlibpq5.sql
    src/interfaces/libpq++/examples/testlibpq6.cc
    src/interfaces/libpq++/examples/testlo.cc
    src/interfaces/libpq++/libpq++.h
    src/interfaces/libpq++/libpq++dll.rc
    src/interfaces/libpq++/pgconnection.cc
    src/interfaces/libpq++/pgconnection.h
    src/interfaces/libpq++/pgcursordb.cc
    src/interfaces/libpq++/pgcursordb.h
    src/interfaces/libpq++/pgdatabase.cc
    src/interfaces/libpq++/pgdatabase.h
    src/interfaces/libpq++/pglobject.cc
    src/interfaces/libpq++/pglobject.h
    src/interfaces/libpq++/pgtransdb.cc
    src/interfaces/libpq++/pgtransdb.h
    src/interfaces/libpq++/win32.mak
    src/interfaces/odbc/GNUmakefile
    src/interfaces/odbc/bind.c
    src/interfaces/odbc/bind.h
    src/interfaces/odbc/columninfo.c
    src/interfaces/odbc/columninfo.h
    src/interfaces/odbc/connection.c
    src/interfaces/odbc/connection.h
    src/interfaces/odbc/convert.c
    src/interfaces/odbc/convert.h
    src/interfaces/odbc/descriptor.h
    src/interfaces/odbc/dlg_specific.c
    src/interfaces/odbc/dlg_specific.h
    src/interfaces/odbc/dlg_wingui.c
    src/interfaces/odbc/drvconn.c
    src/interfaces/odbc/environ.c
    src/interfaces/odbc/environ.h
    src/interfaces/odbc/execute.c
    src/interfaces/odbc/gpps.c
    src/interfaces/odbc/gpps.h
    src/interfaces/odbc/info.c
    src/interfaces/odbc/info30.c
    src/interfaces/odbc/iodbc.h
    src/interfaces/odbc/isql.h
    src/interfaces/odbc/isqlext.h
    src/interfaces/odbc/license.txt
    src/interfaces/odbc/lobj.c
    src/interfaces/odbc/lobj.h
    src/interfaces/odbc/md5.c
    src/interfaces/odbc/md5.h
    src/interfaces/odbc/misc.c
    src/interfaces/odbc/misc.h
    src/interfaces/odbc/multibyte.c
    src/interfaces/odbc/multibyte.h
    src/interfaces/odbc/notice.txt
    src/interfaces/odbc/odbc.sql
    src/interfaces/odbc/odbcapi.c
    src/interfaces/odbc/odbcapi25w.c
    src/interfaces/odbc/odbcapi30.c
    src/interfaces/odbc/odbcapi30w.c
    src/interfaces/odbc/odbcapiw.c
    src/interfaces/odbc/odbcinst.ini
    src/interfaces/odbc/options.c
    src/interfaces/odbc/parse.c
    src/interfaces/odbc/pgapi30.c
    src/interfaces/odbc/pgapifunc.h
    src/interfaces/odbc/pgtypes.c
    src/interfaces/odbc/pgtypes.h
    src/interfaces/odbc/psqlodbc.c
    src/interfaces/odbc/psqlodbc.h
    src/interfaces/odbc/psqlodbc.rc
    src/interfaces/odbc/psqlodbc.reg
    src/interfaces/odbc/psqlodbc30.reg
    src/interfaces/odbc/psqlodbc30w.reg
    src/interfaces/odbc/psqlodbc_api30.def
    src/interfaces/odbc/psqlodbc_api30w.def
    src/interfaces/odbc/psqlodbc_apiw.def
    src/interfaces/odbc/psqlodbc_win32.def
    src/interfaces/odbc/qresult.c
    src/interfaces/odbc/qresult.h
    src/interfaces/odbc/readme.txt
    src/interfaces/odbc/resource.h
    src/interfaces/odbc/results.c
    src/interfaces/odbc/setup.c
    src/interfaces/odbc/setup.rul
    src/interfaces/odbc/socket.c
    src/interfaces/odbc/socket.h
    src/interfaces/odbc/statement.c
    src/interfaces/odbc/statement.h
    src/interfaces/odbc/tuple.c
    src/interfaces/odbc/tuple.h
    src/interfaces/odbc/tuplelist.c
    src/interfaces/odbc/tuplelist.h
    src/interfaces/odbc/version.h
    src/interfaces/odbc/win32.mak
    src/interfaces/odbc/win32_30.mak
    src/interfaces/odbc/win32_30w.mak
    src/interfaces/odbc/win32w.mak
    src/interfaces/odbc/win_md5.c
    src/interfaces/odbc/win_setup.h
    src/interfaces/odbc/win_unicode.c
    src/interfaces/perl5/Changes
    src/interfaces/perl5/GNUmakefile
    src/interfaces/perl5/MANIFEST
    src/interfaces/perl5/Makefile.PL
    src/interfaces/perl5/Pg.pm
    src/interfaces/perl5/Pg.xs
    src/interfaces/perl5/README
    src/interfaces/perl5/examples/ApachePg.pl
    src/interfaces/perl5/examples/example.newstyle
    src/interfaces/perl5/examples/example.oldstyle
    src/interfaces/perl5/ppport.h
    src/interfaces/perl5/test.pl
    src/interfaces/perl5/typemap
    src/interfaces/python/Announce
    src/interfaces/python/ChangeLog
    src/interfaces/python/GNUmakefile
    src/interfaces/python/PyGreSQL.spec
    src/interfaces/python/README
    src/interfaces/python/README.linux
    src/interfaces/python/Setup.in.raw
    src/interfaces/python/pg.py
    src/interfaces/python/pgdb.py
    src/interfaces/python/pgmodule.c
    src/interfaces/python/setup.py
    src/interfaces/python/tutorial/advanced.py
    src/interfaces/python/tutorial/basics.py
    src/interfaces/python/tutorial/func.py
    src/interfaces/python/tutorial/syscat.py
    src/interfaces/ssl/client.conf
    src/interfaces/ssl/mkcert.sh
    src/interfaces/ssl/pgkeygen.sh
    src/interfaces/ssl/root.conf
    src/interfaces/ssl/server.conf
    src/makefiles/Makefile.aix
    src/makefiles/Makefile.beos
    src/makefiles/Makefile.bsdi
    src/makefiles/Makefile.darwin
    src/makefiles/Makefile.dgux
    src/makefiles/Makefile.freebsd
    src/makefiles/Makefile.hpux
    src/makefiles/Makefile.irix5
    src/makefiles/Makefile.linux
    src/makefiles/Makefile.netbsd
    src/makefiles/Makefile.openbsd
    src/makefiles/Makefile.osf
    src/makefiles/Makefile.qnx4
    src/makefiles/Makefile.sco
    src/makefiles/Makefile.solaris
    src/makefiles/Makefile.sunos4
    src/makefiles/Makefile.svr4
    src/makefiles/Makefile.ultrix4
    src/makefiles/Makefile.univel
    src/makefiles/Makefile.unixware
    src/makefiles/Makefile.win
    src/nls-global.mk
    src/pl/Makefile
    src/pl/plperl/GNUmakefile
    src/pl/plperl/README
    src/pl/plperl/SPI.xs
    src/pl/plperl/eloglvl.c
    src/pl/plperl/eloglvl.h
    src/pl/plperl/plperl.c
    src/pl/plperl/ppport.h
    src/pl/plpgsql/Makefile
    src/pl/plpgsql/src/.cvsignore
    src/pl/plpgsql/src/INSTALL
    src/pl/plpgsql/src/Makefile
    src/pl/plpgsql/src/gram.y
    src/pl/plpgsql/src/pl_comp.c
    src/pl/plpgsql/src/pl_exec.c
    src/pl/plpgsql/src/pl_funcs.c
    src/pl/plpgsql/src/pl_handler.c
    src/pl/plpgsql/src/plpgsql.h
    src/pl/plpgsql/src/scan.l
    src/pl/plpgsql/test/README
    src/pl/plpgsql/test/expected/tables.out
    src/pl/plpgsql/test/expected/test.out
    src/pl/plpgsql/test/expected/triggers.out
    src/pl/plpgsql/test/expected/views.out
    src/pl/plpgsql/test/runtest
    src/pl/plpgsql/test/tables.sql
    src/pl/plpgsql/test/test.sql
    src/pl/plpgsql/test/triggers.sql
    src/pl/plpgsql/test/views.sql
    src/pl/plpython/Makefile
    src/pl/plpython/README
    src/pl/plpython/TODO
    src/pl/plpython/error.expected
    src/pl/plpython/feature.expected
    src/pl/plpython/plpython.c
    src/pl/plpython/plpython.h
    src/pl/plpython/plpython_depopulate.sql
    src/pl/plpython/plpython_deschema.sql
    src/pl/plpython/plpython_drop.sql
    src/pl/plpython/plpython_error.sql
    src/pl/plpython/plpython_function.sql
    src/pl/plpython/plpython_populate.sql
    src/pl/plpython/plpython_schema.sql
    src/pl/plpython/plpython_setof.sql
    src/pl/plpython/plpython_test.sql
    src/pl/plpython/test.sh
    src/pl/tcl/Makefile
    src/pl/tcl/license.terms
    src/pl/tcl/modules/Makefile
    src/pl/tcl/modules/README
    src/pl/tcl/modules/pltcl_delmod.in
    src/pl/tcl/modules/pltcl_listmod.in
    src/pl/tcl/modules/pltcl_loadmod.in
    src/pl/tcl/modules/unknown.pltcl
    src/pl/tcl/pltcl.c
    src/pl/tcl/test/README
    src/pl/tcl/test/runtest
    src/pl/tcl/test/test.expected
    src/pl/tcl/test/test_queries.sql
    src/pl/tcl/test/test_setup.sql
    src/template/aix
    src/template/beos
    src/template/bsdi
    src/template/darwin
    src/template/dgux
    src/template/freebsd
    src/template/hpux
    src/template/irix5
    src/template/linux
    src/template/netbsd
    src/template/nextstep
    src/template/openbsd
    src/template/osf
    src/template/qnx4
    src/template/sco
    src/template/solaris
    src/template/sunos4
    src/template/svr4
    src/template/ultrix4
    src/template/univel
    src/template/unixware
    src/template/win
    src/test/Makefile
    src/test/bench/Makefile
    src/test/bench/WISC-README
    src/test/bench/create.sh
    src/test/bench/create.source
    src/test/bench/perquery
    src/test/bench/query01
    src/test/bench/query02
    src/test/bench/query03
    src/test/bench/query04
    src/test/bench/query05
    src/test/bench/query06
    src/test/bench/query07
    src/test/bench/query08
    src/test/bench/query09
    src/test/bench/query10
    src/test/bench/query11
    src/test/bench/query12
    src/test/bench/query13
    src/test/bench/query14
    src/test/bench/query15
    src/test/bench/query16
    src/test/bench/query17
    src/test/bench/query18
    src/test/bench/query19
    src/test/bench/query20
    src/test/bench/query21
    src/test/bench/query22
    src/test/bench/query23
    src/test/bench/query24
    src/test/bench/query25
    src/test/bench/query26
    src/test/bench/query27
    src/test/bench/query28
    src/test/bench/query29
    src/test/bench/query30
    src/test/bench/query31
    src/test/bench/query32
    src/test/bench/runwisc.sh
    src/test/bench/wholebench.sh
    src/test/examples/Makefile
    src/test/examples/testlibpq.c
    src/test/examples/testlibpq2.c
    src/test/examples/testlibpq2.sql
    src/test/examples/testlibpq3.c
    src/test/examples/testlibpq3.sql
    src/test/examples/testlibpq4.c
    src/test/examples/testlo.c
    src/test/locale/Makefile
    src/test/locale/README
    src/test/locale/de_DE.ISO8859-1/Makefile
    src/test/locale/de_DE.ISO8859-1/README
    src/test/locale/de_DE.ISO8859-1/expected/de-ctype.out
    src/test/locale/de_DE.ISO8859-1/expected/test-de-char.sql.out
    src/test/locale/de_DE.ISO8859-1/expected/test-de-select.sql.out
    src/test/locale/de_DE.ISO8859-1/expected/test-de-sort.out
    src/test/locale/de_DE.ISO8859-1/expected/test-de-text.sql.out
    src/test/locale/de_DE.ISO8859-1/expected/test-de-upper-char.sql.out
    src/test/locale/de_DE.ISO8859-1/expected/test-de-upper-text.sql.out
    src/test/locale/de_DE.ISO8859-1/expected/test-de-upper-varchar.sql.out
    src/test/locale/de_DE.ISO8859-1/expected/test-de-varchar.sql.out
    src/test/locale/de_DE.ISO8859-1/runall
    src/test/locale/de_DE.ISO8859-1/test-de-select.sql.in
    src/test/locale/de_DE.ISO8859-1/test-de-sort.in
    src/test/locale/de_DE.ISO8859-1/test-de-upper.sql.in
    src/test/locale/de_DE.ISO8859-1/test-de.sql.in
    src/test/locale/gr_GR.ISO8859-7/Makefile
    src/test/locale/gr_GR.ISO8859-7/README
    src/test/locale/gr_GR.ISO8859-7/expected/gr-ctype.out
    src/test/locale/gr_GR.ISO8859-7/expected/test-gr-char.sql.out
    src/test/locale/gr_GR.ISO8859-7/expected/test-gr-select.sql.out
    src/test/locale/gr_GR.ISO8859-7/expected/test-gr-sort.out
    src/test/locale/gr_GR.ISO8859-7/expected/test-gr-text.sql.out
    src/test/locale/gr_GR.ISO8859-7/expected/test-gr-varchar.sql.out
    src/test/locale/gr_GR.ISO8859-7/runall
    src/test/locale/gr_GR.ISO8859-7/test-gr-select.sql.in
    src/test/locale/gr_GR.ISO8859-7/test-gr-sort.in
    src/test/locale/gr_GR.ISO8859-7/test-gr.sql.in
    src/test/locale/koi8-r/Makefile
    src/test/locale/koi8-r/expected/koi8-ctype.out
    src/test/locale/koi8-r/expected/test-koi8-char.sql.out
    src/test/locale/koi8-r/expected/test-koi8-select.sql.out
    src/test/locale/koi8-r/expected/test-koi8-sort.out
    src/test/locale/koi8-r/expected/test-koi8-text.sql.out
    src/test/locale/koi8-r/expected/test-koi8-varchar.sql.out
    src/test/locale/koi8-r/runall
    src/test/locale/koi8-r/test-koi8-select.sql.in
    src/test/locale/koi8-r/test-koi8-sort.in
    src/test/locale/koi8-r/test-koi8.sql.in
    src/test/locale/koi8-to-win1251/Makefile
    src/test/locale/koi8-to-win1251/README
    src/test/locale/koi8-to-win1251/expected/test-koi8-char.sql.out
    src/test/locale/koi8-to-win1251/expected/test-koi8-select.sql.out
    src/test/locale/koi8-to-win1251/expected/test-koi8-sort.out
    src/test/locale/koi8-to-win1251/expected/test-koi8-text.sql.out
    src/test/locale/koi8-to-win1251/expected/test-koi8-varchar.sql.out
    src/test/locale/koi8-to-win1251/runall
    src/test/locale/koi8-to-win1251/test-koi8-select.sql.in
    src/test/locale/koi8-to-win1251/test-koi8-sort.in
    src/test/locale/koi8-to-win1251/test-koi8.sql.in
    src/test/locale/sort-test.pl
    src/test/locale/sort-test.py
    src/test/locale/test-ctype.c
    src/test/locale/test-pgsql-locale.c
    src/test/mb/README
    src/test/mb/expected/big5.out
    src/test/mb/expected/euc_cn.out
    src/test/mb/expected/euc_jp.out
    src/test/mb/expected/euc_kr.out
    src/test/mb/expected/euc_tw.out
    src/test/mb/expected/mule_internal.out
    src/test/mb/expected/sjis.out
    src/test/mb/expected/unicode.out
    src/test/mb/mbregress.sh
    src/test/mb/sql/big5.sql
    src/test/mb/sql/euc_cn.sql
    src/test/mb/sql/euc_jp.sql
    src/test/mb/sql/euc_kr.sql
    src/test/mb/sql/euc_tw.sql
    src/test/mb/sql/mule_internal.sql
    src/test/mb/sql/sjis.sql
    src/test/mb/sql/unicode.sql
    src/test/performance/results/PgSQL.970926
    src/test/performance/runtests.pl
    src/test/performance/sqls/connection
    src/test/performance/sqls/crtsimple
    src/test/performance/sqls/crtsimpleidx
    src/test/performance/sqls/drpsimple
    src/test/performance/sqls/inssimple
    src/test/performance/sqls/inssimple.data
    src/test/performance/sqls/orbsimple
    src/test/performance/sqls/slcsimple
    src/test/performance/sqls/slcsimple.data
    src/test/performance/sqls/vacuum
    src/test/performance/start-pgsql.sh
    src/test/regress/GNUmakefile
    src/test/regress/Makefile
    src/test/regress/README
    src/test/regress/data/agg.data
    src/test/regress/data/constrf.data
    src/test/regress/data/constro.data
    src/test/regress/data/dept.data
    src/test/regress/data/desc.data
    src/test/regress/data/emp.data
    src/test/regress/data/hash.data
    src/test/regress/data/onek.data
    src/test/regress/data/person.data
    src/test/regress/data/real_city.data
    src/test/regress/data/rect.data
    src/test/regress/data/streets.data
    src/test/regress/data/stud_emp.data
    src/test/regress/data/student.data
    src/test/regress/data/tenk.data
    src/test/regress/expected/abstime-solaris-1947.out
    src/test/regress/expected/abstime.out
    src/test/regress/expected/aggregates.out
    src/test/regress/expected/alter_table.out
    src/test/regress/expected/arrays.out
    src/test/regress/expected/bit.out
    src/test/regress/expected/boolean.out
    src/test/regress/expected/box.out
    src/test/regress/expected/btree_index.out
    src/test/regress/expected/case.out
    src/test/regress/expected/char.out
    src/test/regress/expected/char_1.out
    src/test/regress/expected/circle.out
    src/test/regress/expected/comments.out
    src/test/regress/expected/create_aggregate.out
    src/test/regress/expected/create_index.out
    src/test/regress/expected/create_misc.out
    src/test/regress/expected/create_operator.out
    src/test/regress/expected/create_table.out
    src/test/regress/expected/create_type.out
    src/test/regress/expected/create_view.out
    src/test/regress/expected/date.out
    src/test/regress/expected/domain.out
    src/test/regress/expected/errors.out
    src/test/regress/expected/euc_cn.out
    src/test/regress/expected/euc_jp.out
    src/test/regress/expected/euc_kr.out
    src/test/regress/expected/euc_tw.out
    src/test/regress/expected/float4-exp-three-digits.out
    src/test/regress/expected/float4.out
    src/test/regress/expected/float8-exp-three-digits.out
    src/test/regress/expected/float8-fp-exception.out
    src/test/regress/expected/float8-small-is-zero.out
    src/test/regress/expected/float8.out
    src/test/regress/expected/foreign_key.out
    src/test/regress/expected/geometry-alpha-precision.out
    src/test/regress/expected/geometry-bsdi-precision.out
    src/test/regress/expected/geometry-i86-gnulibc.out
    src/test/regress/expected/geometry-intel-beos.out
    src/test/regress/expected/geometry-irix.out
    src/test/regress/expected/geometry-positive-zeros-bsd.out
    src/test/regress/expected/geometry-positive-zeros.out
    src/test/regress/expected/geometry-powerpc-aix4.out
    src/test/regress/expected/geometry-powerpc-darwin.out
    src/test/regress/expected/geometry-powerpc-linux-gnulibc1.out
    src/test/regress/expected/geometry-solaris-i386-pc.out
    src/test/regress/expected/geometry-solaris-precision.out
    src/test/regress/expected/geometry-uw7-cc.out
    src/test/regress/expected/geometry-uw7-gcc.out
    src/test/regress/expected/geometry.out
    src/test/regress/expected/hash_index.out
    src/test/regress/expected/horology-no-DST-before-1970.out
    src/test/regress/expected/horology-solaris-1947.out
    src/test/regress/expected/horology.out
    src/test/regress/expected/inet.out
    src/test/regress/expected/inherit.out
    src/test/regress/expected/insert.out
    src/test/regress/expected/int2.out
    src/test/regress/expected/int4.out
    src/test/regress/expected/int8-exp-three-digits.out
    src/test/regress/expected/int8.out
    src/test/regress/expected/interval.out
    src/test/regress/expected/join.out
    src/test/regress/expected/limit.out
    src/test/regress/expected/lseg.out
    src/test/regress/expected/mule_internal.out
    src/test/regress/expected/name.out
    src/test/regress/expected/numeric.out
    src/test/regress/expected/numeric_big.out
    src/test/regress/expected/numerology.out
    src/test/regress/expected/oid.out
    src/test/regress/expected/oidjoins.out
    src/test/regress/expected/opr_sanity.out
    src/test/regress/expected/path.out
    src/test/regress/expected/plpgsql.out
    src/test/regress/expected/point.out
    src/test/regress/expected/polygon.out
    src/test/regress/expected/portals.out
    src/test/regress/expected/portals_p2.out
    src/test/regress/expected/privileges.out
    src/test/regress/expected/random.out
    src/test/regress/expected/reltime.out
    src/test/regress/expected/rules.out
    src/test/regress/expected/sanity_check.out
    src/test/regress/expected/select.out
    src/test/regress/expected/select_distinct.out
    src/test/regress/expected/select_distinct_on.out
    src/test/regress/expected/select_having.out
    src/test/regress/expected/select_having_1.out
    src/test/regress/expected/select_implicit.out
    src/test/regress/expected/select_implicit_1.out
    src/test/regress/expected/select_into.out
    src/test/regress/expected/select_views.out
    src/test/regress/expected/select_views_1.out
    src/test/regress/expected/sql_ascii.out
    src/test/regress/expected/strings.out
    src/test/regress/expected/subselect.out
    src/test/regress/expected/temp.out
    src/test/regress/expected/text.out
    src/test/regress/expected/time.out
    src/test/regress/expected/timestamp.out
    src/test/regress/expected/timestamptz.out
    src/test/regress/expected/timetz.out
    src/test/regress/expected/tinterval-solaris-1947.out
    src/test/regress/expected/tinterval.out
    src/test/regress/expected/transactions.out
    src/test/regress/expected/triggers.out
    src/test/regress/expected/type_sanity.out
    src/test/regress/expected/union.out
    src/test/regress/expected/varchar.out
    src/test/regress/expected/varchar_1.out
    src/test/regress/input/constraints.source
    src/test/regress/input/copy.source
    src/test/regress/input/create_function_1.source
    src/test/regress/input/create_function_2.source
    src/test/regress/input/misc.source
    src/test/regress/output/constraints.source
    src/test/regress/output/copy.source
    src/test/regress/output/create_function_1.source
    src/test/regress/output/create_function_2.source
    src/test/regress/output/misc.source
    src/test/regress/parallel_schedule
    src/test/regress/pg_regress.sh
    src/test/regress/regress.c
    src/test/regress/regressplans.sh
    src/test/regress/resultmap
    src/test/regress/serial_schedule
    src/test/regress/sql/abstime.sql
    src/test/regress/sql/aggregates.sql
    src/test/regress/sql/alter_table.sql
    src/test/regress/sql/arrays.sql
    src/test/regress/sql/bit.sql
    src/test/regress/sql/boolean.sql
    src/test/regress/sql/box.sql
    src/test/regress/sql/btree_index.sql
    src/test/regress/sql/case.sql
    src/test/regress/sql/char.sql
    src/test/regress/sql/circle.sql
    src/test/regress/sql/comments.sql
    src/test/regress/sql/create_aggregate.sql
    src/test/regress/sql/create_index.sql
    src/test/regress/sql/create_misc.sql
    src/test/regress/sql/create_operator.sql
    src/test/regress/sql/create_table.sql
    src/test/regress/sql/create_type.sql
    src/test/regress/sql/create_view.sql
    src/test/regress/sql/date.sql
    src/test/regress/sql/domain.sql
    src/test/regress/sql/drop.sql
    src/test/regress/sql/errors.sql
    src/test/regress/sql/euc_cn.sql
    src/test/regress/sql/euc_jp.sql
    src/test/regress/sql/euc_kr.sql
    src/test/regress/sql/euc_tw.sql
    src/test/regress/sql/float4.sql
    src/test/regress/sql/float8.sql
    src/test/regress/sql/foreign_key.sql
    src/test/regress/sql/geometry.sql
    src/test/regress/sql/hash_index.sql
    src/test/regress/sql/horology.sql
    src/test/regress/sql/inet.sql
    src/test/regress/sql/inherit.sql
    src/test/regress/sql/insert.sql
    src/test/regress/sql/int2.sql
    src/test/regress/sql/int4.sql
    src/test/regress/sql/int8.sql
    src/test/regress/sql/interval.sql
    src/test/regress/sql/join.sql
    src/test/regress/sql/limit.sql
    src/test/regress/sql/lseg.sql
    src/test/regress/sql/mule_internal.sql
    src/test/regress/sql/name.sql
    src/test/regress/sql/numeric.sql
    src/test/regress/sql/numeric_big.sql
    src/test/regress/sql/numerology.sql
    src/test/regress/sql/oid.sql
    src/test/regress/sql/oidjoins.sql
    src/test/regress/sql/opr_sanity.sql
    src/test/regress/sql/path.sql
    src/test/regress/sql/plpgsql.sql
    src/test/regress/sql/point.sql
    src/test/regress/sql/polygon.sql
    src/test/regress/sql/portals.sql
    src/test/regress/sql/portals_p2.sql
    src/test/regress/sql/privileges.sql
    src/test/regress/sql/random.sql
    src/test/regress/sql/reltime.sql
    src/test/regress/sql/rules.sql
    src/test/regress/sql/sanity_check.sql
    src/test/regress/sql/select.sql
    src/test/regress/sql/select_distinct.sql
    src/test/regress/sql/select_distinct_on.sql
    src/test/regress/sql/select_having.sql
    src/test/regress/sql/select_implicit.sql
    src/test/regress/sql/select_into.sql
    src/test/regress/sql/select_views.sql
    src/test/regress/sql/sql_ascii.sql
    src/test/regress/sql/strings.sql
    src/test/regress/sql/subselect.sql
    src/test/regress/sql/temp.sql
    src/test/regress/sql/text.sql
    src/test/regress/sql/time.sql
    src/test/regress/sql/timestamp.sql
    src/test/regress/sql/timestamptz.sql
    src/test/regress/sql/timetz.sql
    src/test/regress/sql/tinterval.sql
    src/test/regress/sql/transactions.sql
    src/test/regress/sql/triggers.sql
    src/test/regress/sql/type_sanity.sql
    src/test/regress/sql/union.sql
    src/test/regress/sql/varchar.sql
    src/tools/RELEASE_CHANGES
    src/tools/backend/README
    src/tools/backend/backend_dirs.html
    src/tools/backend/flow.fig
    src/tools/backend/flow.gif
    src/tools/backend/index.html
    src/tools/ccsym
    src/tools/copyright
    src/tools/entab/Makefile
    src/tools/entab/entab.c
    src/tools/entab/entab.man
    src/tools/entab/halt.c
    src/tools/find_badmacros
    src/tools/find_static
    src/tools/find_typedef
    src/tools/make_ctags
    src/tools/make_diff/README
    src/tools/make_diff/cporig
    src/tools/make_diff/difforig
    src/tools/make_diff/rmorig
    src/tools/make_etags
    src/tools/make_keywords
    src/tools/make_mkid
    src/tools/pgcvslog
    src/tools/pginclude/README
    src/tools/pginclude/pgcompinclude
    src/tools/pginclude/pgdefine
    src/tools/pginclude/pgfixinclude
    src/tools/pginclude/pgrminclude
    src/tools/pgindent/README
    src/tools/pgindent/indent.bsd.patch
    src/tools/pgindent/pgcppindent
    src/tools/pgindent/pgindent
    src/tools/pgindent/pgjindent
    src/tutorial/Makefile
    src/tutorial/README
    src/tutorial/advanced.source
    src/tutorial/basics.source
    src/tutorial/beard.c
    src/tutorial/complex.c
    src/tutorial/complex.source
    src/tutorial/funcs.c
    src/tutorial/funcs.source
    src/tutorial/funcs_new.c
    src/tutorial/syscat.source
    src/utils/Makefile
    src/utils/README
    src/utils/dllinit.c
    src/utils/getopt.c
    src/utils/strdup.c
    src/win32.mak
---
 COPYRIGHT                                     |    23 -
 GNUmakefile.in                                |   127 -
 HISTORY                                       |  3390 -
 INSTALL                                       |   871 -
 Makefile                                      |    36 -
 README                                        |    26 -
 aclocal.m4                                    |    13 -
 config/ac_func_accept_argtypes.m4             |    76 -
 config/c-compiler.m4                          |    94 -
 config/c-library.m4                           |   112 -
 config/config.guess                           |  1308 -
 config/config.sub                             |  1409 -
 config/cxx.m4                                 |    64 -
 config/docbook.m4                             |    93 -
 config/general.m4                             |   135 -
 config/install-sh                             |   250 -
 config/java.m4                                |    61 -
 config/libtool.m4                             |   119 -
 config/missing                                |    33 -
 config/mkinstalldirs                          |    36 -
 config/perl.m4                                |    35 -
 config/prep_buildtree                         |    41 -
 config/programs.m4                            |   192 -
 config/python.m4                              |    84 -
 config/tcl.m4                                 |    89 -
 configure                                     | 18038 -----
 configure.in                                  |  1266 -
 contrib/Makefile                              |    60 -
 contrib/README                                |   205 -
 contrib/array/Makefile                        |    11 -
 contrib/array/README.array_iterator           |    49 -
 contrib/array/array_iterator.c                |   372 -
 contrib/array/array_iterator.h                |    45 -
 contrib/array/array_iterator.sql.in           |   253 -
 contrib/btree_gist/Makefile                   |    12 -
 contrib/btree_gist/README.btree_gist          |    31 -
 contrib/btree_gist/btree_gist.c               |   583 -
 contrib/btree_gist/btree_gist.sql.in          |   270 -
 contrib/btree_gist/data/test_btree.data       |  1000 -
 contrib/btree_gist/data/test_btree_ts.data    |  1000 -
 contrib/btree_gist/expected/btree_gist.out    |    39 -
 contrib/btree_gist/sql/btree_gist.sql         |    36 -
 contrib/chkpass/Makefile                      |    11 -
 contrib/chkpass/README.chkpass                |    22 -
 contrib/chkpass/chkpass.c                     |   196 -
 contrib/chkpass/chkpass.sql.in                |    78 -
 contrib/contrib-global.mk                     |   202 -
 contrib/cube/Makefile                         |    36 -
 contrib/cube/README.cube                      |   289 -
 contrib/cube/buffer.c                         |    84 -
 contrib/cube/buffer.h                         |     8 -
 contrib/cube/cube.c                           |  1174 -
 contrib/cube/cube.sql.in                      |   372 -
 contrib/cube/cubedata.h                       |     6 -
 contrib/cube/cubeparse.y                      |   252 -
 contrib/cube/cubescan.l                       |    54 -
 contrib/cube/data/test_cube.data              |  3100 -
 contrib/cube/expected/cube.out                |   950 -
 contrib/cube/sql/cube.sql                     |   244 -
 contrib/dbase/Makefile                        |    21 -
 contrib/dbase/README.dbf2pg                   |   135 -
 contrib/dbase/dbf.c                           |   520 -
 contrib/dbase/dbf.h                           |   139 -
 contrib/dbase/dbf2pg.1                        |   116 -
 contrib/dbase/dbf2pg.c                        |   954 -
 contrib/dbase/endian.c                        |    49 -
 contrib/dblink/Makefile                       |    15 -
 contrib/dblink/README.dblink                  |   415 -
 contrib/dblink/dblink.c                       |  1429 -
 contrib/dblink/dblink.h                       |   125 -
 contrib/dblink/dblink.sql.in                  |    38 -
 contrib/dbsize/Makefile                       |     9 -
 contrib/dbsize/README.dbsize                  |    11 -
 contrib/dbsize/dbsize.c                       |   164 -
 contrib/dbsize/dbsize.sql.in                  |     7 -
 contrib/earthdistance/Makefile                |    11 -
 contrib/earthdistance/README.earthdistance    |    31 -
 contrib/earthdistance/earthdistance.c         |    72 -
 contrib/earthdistance/earthdistance.sql.in    |    24 -
 contrib/findoidjoins/Makefile                 |    19 -
 contrib/findoidjoins/README.findoidjoins      |    94 -
 contrib/findoidjoins/findoidjoins.c           |   109 -
 contrib/findoidjoins/make_oidjoins_check      |    53 -
 contrib/fulltextindex/Makefile                |    12 -
 contrib/fulltextindex/README.fti              |   201 -
 contrib/fulltextindex/TODO                    |     1 -
 contrib/fulltextindex/fti.c                   |   443 -
 contrib/fulltextindex/fti.pl                  |   209 -
 contrib/fulltextindex/fti.sql.in              |     3 -
 contrib/fulltextindex/timings.sh              |   350 -
 contrib/fuzzystrmatch/Makefile                |    11 -
 contrib/fuzzystrmatch/README.fuzzystrmatch    |   129 -
 contrib/fuzzystrmatch/README.soundex          |    62 -
 contrib/fuzzystrmatch/fuzzystrmatch.c         |   731 -
 contrib/fuzzystrmatch/fuzzystrmatch.h         |   172 -
 contrib/fuzzystrmatch/fuzzystrmatch.sql.in    |    11 -
 contrib/intagg/Makefile                       |    15 -
 contrib/intagg/README.int_aggregate           |    55 -
 contrib/intagg/int_aggregate.c                |   271 -
 contrib/intagg/int_aggregate.sql.in           |    40 -
 contrib/intarray/Makefile                     |    12 -
 contrib/intarray/README.intarray              |   100 -
 contrib/intarray/_int.c                       |  2219 -
 contrib/intarray/_int.sql.in                  |   437 -
 contrib/intarray/bench/bench.pl               |   104 -
 contrib/intarray/bench/create_test.pl         |    73 -
 contrib/intarray/data/test__int.data          |  7000 --
 contrib/intarray/expected/_int.out            |   377 -
 contrib/intarray/sql/_int.sql                 |    84 -
 contrib/ipc_check/README                      |    22 -
 contrib/ipc_check/ipc_check.pl                |    51 -
 contrib/isbn_issn/Makefile                    |    11 -
 contrib/isbn_issn/README.isbn_issn            |    22 -
 contrib/isbn_issn/isbn_issn.c                 |   376 -
 contrib/isbn_issn/isbn_issn.sql.in            |   228 -
 contrib/lo/Makefile                           |    12 -
 contrib/lo/README.lo                          |    69 -
 contrib/lo/lo.c                               |   209 -
 contrib/lo/lo.sql.in                          |    56 -
 contrib/lo/lo_drop.sql                        |    21 -
 contrib/lo/lo_test.sql                        |    57 -
 contrib/mSQL-interface/Makefile               |    30 -
 contrib/mSQL-interface/README.mpgsql          |    86 -
 contrib/mSQL-interface/mpgsql.c               |   365 -
 contrib/mac/README.mac                        |     8 -
 contrib/mac/createoui                         |    52 -
 contrib/mac/dropoui                           |    25 -
 contrib/mac/ouiparse.awk                      |    53 -
 contrib/mac/updateoui                         |    34 -
 contrib/miscutil/Makefile                     |    11 -
 contrib/miscutil/README.misc_utils            |    26 -
 contrib/miscutil/misc_utils.c                 |   113 -
 contrib/miscutil/misc_utils.h                 |    10 -
 contrib/miscutil/misc_utils.sql.in            |    46 -
 contrib/mysql/README                          |     9 -
 contrib/mysql/my2pg.pl                        |   948 -
 contrib/mysql/mysql2pgsql                     |   283 -
 contrib/noupdate/Makefile                     |    11 -
 contrib/noupdate/README.noup                  |    20 -
 contrib/noupdate/noup.c                       |   107 -
 contrib/noupdate/noup.sql.in                  |     6 -
 contrib/oid2name/Makefile                     |    15 -
 contrib/oid2name/README.oid2name              |   129 -
 contrib/oid2name/oid2name.c                   |   467 -
 contrib/oracle/CHANGES                        |    51 -
 contrib/oracle/Ora2Pg.pm                      |  1931 -
 contrib/oracle/README.ora2pg                  |   480 -
 contrib/oracle/TODO                           |    10 -
 contrib/oracle/ora2pg.html                    |   480 -
 contrib/oracle/ora2pg.pl                      |    72 -
 contrib/pg_controldata/Makefile               |    21 -
 contrib/pg_controldata/README.pg_controldata  |    32 -
 contrib/pg_controldata/pg_controldata.c       |   138 -
 contrib/pg_dumplo/Makefile                    |    15 -
 contrib/pg_dumplo/README.pg_dumplo            |   148 -
 contrib/pg_dumplo/lo_export.c                 |   203 -
 contrib/pg_dumplo/lo_import.c                 |   101 -
 contrib/pg_dumplo/main.c                      |   326 -
 contrib/pg_dumplo/pg_dumplo.h                 |    83 -
 contrib/pg_dumplo/utils.c                     |    97 -
 contrib/pg_logger/Makefile                    |    12 -
 contrib/pg_logger/README.pg_logger            |     1 -
 contrib/pg_logger/pg_logger.c                 |   106 -
 contrib/pg_resetxlog/Makefile                 |    21 -
 contrib/pg_resetxlog/README.pg_resetxlog      |    42 -
 contrib/pg_resetxlog/pg_resetxlog.c           |   611 -
 contrib/pg_upgrade/README                     |    14 -
 contrib/pg_upgrade/pg_upgrade                 |   492 -
 contrib/pg_upgrade/pg_upgrade.1               |    98 -
 contrib/pgbench/Makefile                      |    15 -
 contrib/pgbench/README.pgbench                |   170 -
 contrib/pgbench/README.pgbench_jis            |   211 -
 contrib/pgbench/pgbench.c                     |   945 -
 contrib/pgcrypto/API                          |   163 -
 contrib/pgcrypto/Makefile                     |    84 -
 contrib/pgcrypto/README.pgcrypto              |   219 -
 contrib/pgcrypto/blf.c                        |   693 -
 contrib/pgcrypto/blf.h                        |    83 -
 contrib/pgcrypto/crypt-blowfish.c             |   740 -
 contrib/pgcrypto/crypt-des.c                  |   768 -
 contrib/pgcrypto/crypt-gensalt.c              |   195 -
 contrib/pgcrypto/crypt-md5.c                  |   153 -
 contrib/pgcrypto/expected/blowfish.out        |   108 -
 contrib/pgcrypto/expected/crypt-blowfish.out  |    26 -
 contrib/pgcrypto/expected/crypt-des.out       |    26 -
 contrib/pgcrypto/expected/crypt-md5.out       |    26 -
 contrib/pgcrypto/expected/crypt-xdes.out      |    26 -
 contrib/pgcrypto/expected/hmac-md5.out        |    72 -
 contrib/pgcrypto/expected/hmac-sha1.out       |    72 -
 contrib/pgcrypto/expected/init.out            |    17 -
 contrib/pgcrypto/expected/md5.out             |    45 -
 contrib/pgcrypto/expected/rijndael.out        |    69 -
 contrib/pgcrypto/expected/sha1.out            |    45 -
 contrib/pgcrypto/internal.c                   |   596 -
 contrib/pgcrypto/md5.c                        |   403 -
 contrib/pgcrypto/md5.h                        |    79 -
 contrib/pgcrypto/mhash.c                      |   347 -
 contrib/pgcrypto/misc.c                       |    49 -
 contrib/pgcrypto/openssl.c                    |   460 -
 contrib/pgcrypto/pgcrypto.c                   |   568 -
 contrib/pgcrypto/pgcrypto.h                   |    49 -
 contrib/pgcrypto/pgcrypto.sql.in              |    75 -
 contrib/pgcrypto/px-crypt.c                   |   196 -
 contrib/pgcrypto/px-crypt.h                   |    93 -
 contrib/pgcrypto/px-hmac.c                    |   180 -
 contrib/pgcrypto/px.c                         |   336 -
 contrib/pgcrypto/px.h                         |   193 -
 contrib/pgcrypto/random.c                     |   128 -
 contrib/pgcrypto/rijndael.c                   |   669 -
 contrib/pgcrypto/rijndael.h                   |    57 -
 contrib/pgcrypto/rijndael.tbl                 |  1139 -
 contrib/pgcrypto/sha1.c                       |   350 -
 contrib/pgcrypto/sha1.h                       |    75 -
 contrib/pgcrypto/sql/blowfish.sql             |    66 -
 contrib/pgcrypto/sql/crypt-blowfish.sql       |    17 -
 contrib/pgcrypto/sql/crypt-des.sql            |    17 -
 contrib/pgcrypto/sql/crypt-md5.sql            |    17 -
 contrib/pgcrypto/sql/crypt-xdes.sql           |    17 -
 contrib/pgcrypto/sql/hmac-md5.sql             |    46 -
 contrib/pgcrypto/sql/hmac-sha1.sql            |    46 -
 contrib/pgcrypto/sql/init.sql                 |    12 -
 contrib/pgcrypto/sql/md5.sql                  |    12 -
 contrib/pgcrypto/sql/rijndael.sql             |    43 -
 contrib/pgcrypto/sql/sha1.sql                 |    12 -
 contrib/pgstattuple/Makefile                  |    22 -
 contrib/pgstattuple/README.pgstattuple        |    47 -
 contrib/pgstattuple/README.pgstattuple.euc_jp |    81 -
 contrib/pgstattuple/pgstattuple.c             |   155 -
 contrib/pgstattuple/pgstattuple.sql.in        |     4 -
 contrib/retep/CHANGELOG                       |     7 -
 contrib/retep/Implementation                  |   116 -
 contrib/retep/Makefile                        |    30 -
 contrib/retep/README                          |    35 -
 contrib/retep/build.xml                       |    98 -
 contrib/retep/data/cds.dtd                    |    16 -
 contrib/retep/data/cds.xml                    |  2691 -
 contrib/retep/retep.jpx                       |    55 -
 .../retep/uk/org/retep/dtu/DCollection.java   |   228 -
 .../retep/uk/org/retep/dtu/DConstants.java    |    43 -
 contrib/retep/uk/org/retep/dtu/DElement.java  |    31 -
 .../retep/uk/org/retep/dtu/DEnvironment.java  |    30 -
 contrib/retep/uk/org/retep/dtu/DModule.java   |    97 -
 .../retep/uk/org/retep/dtu/DModuleXML.java    |   233 -
 contrib/retep/uk/org/retep/dtu/DNode.java     |   233 -
 .../retep/uk/org/retep/dtu/DProcessor.java    |   191 -
 .../retep/uk/org/retep/dtu/DTransform.java    |   133 -
 contrib/retep/uk/org/retep/tools.properties   |     8 -
 contrib/retep/uk/org/retep/tools/Tool.java    |    33 -
 .../uk/org/retep/util/ExceptionDialog.java    |   141 -
 contrib/retep/uk/org/retep/util/Globals.java  |   170 -
 contrib/retep/uk/org/retep/util/Logger.java   |   150 -
 contrib/retep/uk/org/retep/util/Main.java     |    42 -
 .../uk/org/retep/util/StandaloneApp.java      |    85 -
 .../retep/uk/org/retep/util/hba/Editor.java   |   141 -
 contrib/retep/uk/org/retep/util/hba/Main.java |    47 -
 .../retep/uk/org/retep/util/hba/Record.java   |   238 -
 .../uk/org/retep/util/misc/IPAddress.java     |   125 -
 .../uk/org/retep/util/misc/PropertiesIO.java  |   157 -
 .../org/retep/util/misc/WStringTokenizer.java |   102 -
 .../org/retep/util/models/HBATableModel.java  |    91 -
 .../util/models/PropertiesTableModel.java     |   176 -
 .../retep/uk/org/retep/util/proped/Main.java  |    53 -
 .../org/retep/util/proped/PropertyEditor.java |   381 -
 .../uk/org/retep/xml/core/XMLFactory.java     |   334 -
 .../retep/xml/core/XMLFactoryException.java   |    19 -
 .../uk/org/retep/xml/jdbc/XMLDatabase.java    |   237 -
 .../uk/org/retep/xml/jdbc/XMLResultSet.java   |   505 -
 .../uk/org/retep/xml/parser/TagHandler.java   |   201 -
 .../uk/org/retep/xml/parser/TagListener.java  |    30 -
 .../uk/org/retep/xml/test/XMLExport.java      |   191 -
 contrib/rserv/ApplySnapshot.in                |    54 -
 contrib/rserv/CleanLog.in                     |    49 -
 contrib/rserv/GetSyncID.in                    |    57 -
 contrib/rserv/InitRservTest.in                |   259 -
 contrib/rserv/Makefile                        |    52 -
 contrib/rserv/MasterAddTable.in               |    61 -
 contrib/rserv/MasterInit.in                   |   107 -
 contrib/rserv/MasterSync.in                   |    50 -
 contrib/rserv/PrepareSnapshot.in              |    58 -
 contrib/rserv/README.rserv                    |   133 -
 contrib/rserv/RServ.pm                        |   761 -
 contrib/rserv/Replicate.in                    |   102 -
 contrib/rserv/RservTest.in                    |   313 -
 contrib/rserv/SlaveAddTable.in                |    59 -
 contrib/rserv/SlaveInit.in                    |    65 -
 contrib/rserv/master.sql.in                   |   101 -
 contrib/rserv/regress.sh                      |    32 -
 contrib/rserv/rserv.c                         |   329 -
 contrib/rserv/slave.sql.in                    |    22 -
 contrib/rtree_gist/Makefile                   |    12 -
 contrib/rtree_gist/README.rtree_gist          |    98 -
 contrib/rtree_gist/bench/bench.pl             |    67 -
 contrib/rtree_gist/bench/create_test.pl       |    50 -
 contrib/rtree_gist/data/test_box.data         |  3378 -
 contrib/rtree_gist/expected/rtree_gist.out    |    45 -
 contrib/rtree_gist/rtree_gist.c               |   578 -
 contrib/rtree_gist/rtree_gist.sql.in          |   342 -
 contrib/rtree_gist/sql/rtree_gist.sql         |    38 -
 contrib/seg/Makefile                          |    35 -
 contrib/seg/README.seg                        |   326 -
 contrib/seg/buffer.c                          |    84 -
 contrib/seg/buffer.h                          |     8 -
 contrib/seg/data/test_seg.data                |  2577 -
 contrib/seg/expected/seg.out                  |  1064 -
 contrib/seg/seg-validate.pl                   |    42 -
 contrib/seg/seg.c                             |  1119 -
 contrib/seg/seg.sql.in                        |   396 -
 contrib/seg/segdata.h                         |     9 -
 contrib/seg/segparse.y                        |   187 -
 contrib/seg/segscan.l                         |    53 -
 contrib/seg/sort-segments.pl                  |    20 -
 contrib/seg/sql/seg.sql                       |   223 -
 contrib/spi/Makefile                          |    15 -
 contrib/spi/README.spi                        |   104 -
 contrib/spi/autoinc.c                         |   107 -
 contrib/spi/autoinc.example                   |    35 -
 contrib/spi/autoinc.sql.in                    |     6 -
 contrib/spi/insert_username.c                 |    79 -
 contrib/spi/insert_username.example           |    21 -
 contrib/spi/insert_username.sql.in            |     6 -
 contrib/spi/moddatetime.c                     |   111 -
 contrib/spi/moddatetime.example               |    27 -
 contrib/spi/moddatetime.sql.in                |     6 -
 contrib/spi/preprocessor/README.MAX           |    76 -
 contrib/spi/preprocessor/example.sql          |    37 -
 contrib/spi/preprocessor/step1.c              |    27 -
 contrib/spi/preprocessor/step1.e              |   Bin 8257 -> 0 bytes
 contrib/spi/preprocessor/step2.pl             |   123 -
 contrib/spi/refint.c                          |   609 -
 contrib/spi/refint.example                    |    82 -
 contrib/spi/refint.sql.in                     |    12 -
 contrib/spi/timetravel.c                      |   423 -
 contrib/spi/timetravel.example                |    68 -
 contrib/spi/timetravel.sql.in                 |    12 -
 contrib/start-scripts/freebsd                 |    56 -
 contrib/start-scripts/linux                   |    92 -
 contrib/string/Makefile                       |    11 -
 contrib/string/README.string_io               |    23 -
 contrib/string/string_io.c                    |   372 -
 contrib/string/string_io.h                    |    24 -
 contrib/string/string_io.sql.in               |    79 -
 contrib/tips/Makefile                         |     9 -
 contrib/tips/README.apachelog                 |    91 -
 contrib/tools/add-emacs-variables             |    28 -
 contrib/tools/find-sources                    |    50 -
 contrib/tools/make-tags                       |     9 -
 contrib/tsearch/Makefile                      |    24 -
 contrib/tsearch/README.tsearch                |   348 -
 contrib/tsearch/crc32.c                       |   103 -
 contrib/tsearch/crc32.h                       |    10 -
 contrib/tsearch/data/test_tsearch.data        |   500 -
 contrib/tsearch/deflex.h                      |    29 -
 contrib/tsearch/dict.h                        |    10 -
 contrib/tsearch/dict/porter_english.dct       |  1285 -
 contrib/tsearch/dict/russian_stemming.dct     | 18319 -----
 contrib/tsearch/expected/tsearch.out          |   739 -
 contrib/tsearch/gistidx.c                     |   658 -
 contrib/tsearch/gistidx.h                     |    66 -
 contrib/tsearch/makedict/makedict.pl          |   301 -
 contrib/tsearch/morph.c                       |   217 -
 contrib/tsearch/morph.h                       |    10 -
 contrib/tsearch/parser.h                      |    11 -
 contrib/tsearch/parser.l                      |   320 -
 contrib/tsearch/query.c                       |   797 -
 contrib/tsearch/query.h                       |    52 -
 contrib/tsearch/rewrite.c                     |   292 -
 contrib/tsearch/rewrite.h                     |     7 -
 contrib/tsearch/sql/tsearch.sql               |   162 -
 contrib/tsearch/tsearch.sql.in                |   251 -
 contrib/tsearch/txtidx.c                      |   593 -
 contrib/tsearch/txtidx.h                      |    48 -
 contrib/userlock/Makefile                     |    11 -
 contrib/userlock/README.user_locks            |    54 -
 contrib/userlock/user_locks.c                 |    90 -
 contrib/userlock/user_locks.h                 |    19 -
 contrib/userlock/user_locks.sql.in            |    76 -
 contrib/vacuumlo/Makefile                     |    15 -
 contrib/vacuumlo/README.vacuumlo              |    46 -
 contrib/vacuumlo/vacuumlo.c                   |   458 -
 contrib/xml/Makefile                          |    45 -
 contrib/xml/README                            |   118 -
 contrib/xml/TODO                              |    78 -
 contrib/xml/pgxml.c                           |   347 -
 contrib/xml/pgxml.h                           |    42 -
 contrib/xml/pgxml.source                      |     7 -
 contrib/xml/pgxml_dom.c                       |   262 -
 contrib/xml/pgxml_dom.source                  |     7 -
 doc/FAQ                                       |  1057 -
 doc/FAQ_AIX                                   |    27 -
 doc/FAQ_DEV                                   |   690 -
 doc/FAQ_HPUX                                  |   114 -
 doc/FAQ_IRIX                                  |    75 -
 doc/FAQ_MSWIN                                 |    57 -
 doc/FAQ_QNX4                                  |   230 -
 doc/FAQ_SCO                                   |   139 -
 doc/FAQ_Solaris                               |   102 -
 doc/FAQ_german                                |  1075 -
 doc/FAQ_japanese                              |  1297 -
 doc/FAQ_polish                                |  1174 -
 doc/FAQ_russian                               |  1161 -
 doc/KNOWN_BUGS                                |     4 -
 doc/MISSING_FEATURES                          |     4 -
 doc/Makefile                                  |   103 -
 doc/README.mb.big5                            |   326 -
 doc/README.mb.jp                              |   760 -
 doc/TODO                                      |   533 -
 doc/TODO.detail/README                        |     3 -
 doc/TODO.detail/atttypmod                     |   278 -
 doc/TODO.detail/crossdb                       |   771 -
 doc/TODO.detail/cursor                        |   530 -
 doc/TODO.detail/drop                          |  2222 -
 doc/TODO.detail/exists                        |   191 -
 doc/TODO.detail/foreign                       |   542 -
 doc/TODO.detail/fsync                         |   129 -
 doc/TODO.detail/inheritance                   |  1111 -
 doc/TODO.detail/java                          |  2246 -
 doc/TODO.detail/mmap                          |   577 -
 doc/TODO.detail/namedatalen                   |  1070 -
 doc/TODO.detail/optimizer                     |  2005 -
 doc/TODO.detail/performance                   |  1651 -
 doc/TODO.detail/persistent                    |   102 -
 doc/TODO.detail/pool                          |  1321 -
 doc/TODO.detail/prepare                       |  1697 -
 doc/TODO.detail/privileges                    |   795 -
 doc/TODO.detail/replication                   |  6241 --
 doc/TODO.detail/schema                        |  7817 --
 doc/TODO.detail/tablespaces                   | 10906 ---
 doc/TODO.detail/thread                        |  1495 -
 doc/TODO.detail/transactions                  |  1177 -
 doc/TODO.detail/typeconv                      |   916 -
 doc/TODO.detail/update                        |   512 -
 doc/TODO.detail/vacuum                        |  1870 -
 doc/TODO.detail/view                          |    74 -
 doc/TODO.detail/win32                         |  7321 --
 doc/TODO.detail/yacc                          |   402 -
 doc/bug.template                              |    53 -
 doc/src/FAQ/FAQ.html                          |  1349 -
 doc/src/FAQ/FAQ_DEV.html                      |   840 -
 doc/src/FAQ/FAQ_german.html                   |  1136 -
 doc/src/FAQ/FAQ_japanese.html                 |  1418 -
 doc/src/FAQ/FAQ_polish.html                   |  1448 -
 doc/src/FAQ/FAQ_russian.html                  |  1387 -
 doc/src/Makefile                              |    44 -
 doc/src/graphics/catalogs.ag                  |  1220 -
 doc/src/graphics/catalogs.cgm                 |   Bin 6306 -> 0 bytes
 doc/src/graphics/catalogs.gif                 |   Bin 26163 -> 0 bytes
 doc/src/graphics/catalogs.ps                  |  1018 -
 doc/src/graphics/clientserver.ag              |    99 -
 doc/src/graphics/clientserver.gif             |   Bin 2823 -> 0 bytes
 doc/src/graphics/connections.ag               |   486 -
 doc/src/graphics/connections.gif              |   Bin 9485 -> 0 bytes
 doc/src/sgml/Makefile                         |   231 -
 doc/src/sgml/admin.sgml                       |    62 -
 doc/src/sgml/advanced.sgml                    |   425 -
 doc/src/sgml/arch-dev.sgml                    |  4095 -
 doc/src/sgml/arch-pg.sgml                     |   116 -
 doc/src/sgml/array.sgml                       |   328 -
 doc/src/sgml/backup.sgml                      |   459 -
 doc/src/sgml/biblio.sgml                      |   540 -
 doc/src/sgml/bki.sgml                         |   245 -
 doc/src/sgml/book-decl.sgml                   |    11 -
 doc/src/sgml/catalogs.sgml                    |  2750 -
 doc/src/sgml/charset.sgml                     |  1259 -
 doc/src/sgml/client-auth.sgml                 |   796 -
 doc/src/sgml/compiler.sgml                    |    77 -
 doc/src/sgml/contacts.sgml                    |    35 -
 doc/src/sgml/cvs.sgml                         |   879 -
 doc/src/sgml/datatype.sgml                    |  3113 -
 doc/src/sgml/datetime.sgml                    |  1122 -
 doc/src/sgml/developer.sgml                   |    34 -
 doc/src/sgml/dfunc.sgml                       |   331 -
 doc/src/sgml/diskusage.sgml                   |   109 -
 doc/src/sgml/docguide.sgml                    |  1274 -
 doc/src/sgml/ecpg.sgml                        |  1085 -
 doc/src/sgml/extend.sgml                      |   285 -
 doc/src/sgml/features.sgml                    |  1844 -
 doc/src/sgml/filelist.sgml                    |   112 -
 doc/src/sgml/fixrtf                           |    43 -
 doc/src/sgml/func-ref.sgml                    |    19 -
 doc/src/sgml/func.sgml                        |  5182 --
 doc/src/sgml/geqo.sgml                        |   318 -
 doc/src/sgml/gist.sgml                        |   109 -
 doc/src/sgml/history.sgml                     |   269 -
 doc/src/sgml/indexcost.sgml                   |   291 -
 doc/src/sgml/indices.sgml                     |   933 -
 doc/src/sgml/info.sgml                        |   177 -
 doc/src/sgml/inherit.sgml                     |   188 -
 doc/src/sgml/install-win32.sgml               |   131 -
 doc/src/sgml/installation.sgml                |  1842 -
 doc/src/sgml/intro.sgml                       |   121 -
 doc/src/sgml/jdbc.sgml                        |  2605 -
 doc/src/sgml/keywords.sgml                    |  3202 -
 doc/src/sgml/legal.sgml                       |   105 -
 doc/src/sgml/libpgeasy.sgml                   |   152 -
 doc/src/sgml/libpgtcl.sgml                    |  2239 -
 doc/src/sgml/libpq++.sgml                     |   840 -
 doc/src/sgml/libpq.sgml                       |  2738 -
 doc/src/sgml/lobj.sgml                        |   590 -
 doc/src/sgml/maintenance.sgml                 |   441 -
 doc/src/sgml/manage-ag.sgml                   |   347 -
 doc/src/sgml/manage.sgml                      |   228 -
 doc/src/sgml/monitoring.sgml                  |   555 -
 doc/src/sgml/mvcc.sgml                        |   845 -
 doc/src/sgml/nls.sgml                         |   489 -
 doc/src/sgml/notation.sgml                    |    76 -
 doc/src/sgml/odbc.sgml                        |   805 -
 doc/src/sgml/page.sgml                        |   155 -
 doc/src/sgml/perform.sgml                     |   729 -
 doc/src/sgml/plperl.sgml                      |   333 -
 doc/src/sgml/plpython.sgml                    |   223 -
 doc/src/sgml/plsql.sgml                       |  3003 -
 doc/src/sgml/pltcl.sgml                       |   704 -
 doc/src/sgml/postgres.sgml                    |    58 -
 doc/src/sgml/problems.sgml                    |   356 -
 doc/src/sgml/programmer.sgml                  |   111 -
 doc/src/sgml/protocol.sgml                    |  2102 -
 doc/src/sgml/pygresql.sgml                    |  4484 --
 doc/src/sgml/queries.sgml                     |   958 -
 doc/src/sgml/query.sgml                       |   819 -
 doc/src/sgml/recovery.sgml                    |   104 -
 doc/src/sgml/ref/abort.sgml                   |   154 -
 doc/src/sgml/ref/allfiles.sgml                |   136 -
 doc/src/sgml/ref/alter_database.sgml          |   171 -
 doc/src/sgml/ref/alter_group.sgml             |   160 -
 doc/src/sgml/ref/alter_table.sgml             |   497 -
 doc/src/sgml/ref/alter_trigger.sgml           |   178 -
 doc/src/sgml/ref/alter_user.sgml              |   280 -
 doc/src/sgml/ref/analyze.sgml                 |   220 -
 doc/src/sgml/ref/begin.sgml                   |   229 -
 doc/src/sgml/ref/checkpoint.sgml              |    63 -
 doc/src/sgml/ref/close.sgml                   |   167 -
 doc/src/sgml/ref/cluster.sgml                 |   246 -
 doc/src/sgml/ref/comment.sgml                 |   213 -
 doc/src/sgml/ref/commit.sgml                  |   164 -
 doc/src/sgml/ref/copy.sgml                    |   703 -
 doc/src/sgml/ref/create_aggregate.sgml        |   316 -
 doc/src/sgml/ref/create_constraint.sgml       |   149 -
 doc/src/sgml/ref/create_database.sgml         |   368 -
 doc/src/sgml/ref/create_domain.sgml           |   242 -
 doc/src/sgml/ref/create_function.sgml         |   570 -
 doc/src/sgml/ref/create_group.sgml            |   176 -
 doc/src/sgml/ref/create_index.sgml            |   458 -
 doc/src/sgml/ref/create_language.sgml         |   314 -
 doc/src/sgml/ref/create_operator.sgml         |   506 -
 doc/src/sgml/ref/create_rule.sgml             |   344 -
 doc/src/sgml/ref/create_schema.sgml           |   240 -
 doc/src/sgml/ref/create_sequence.sgml         |   398 -
 doc/src/sgml/ref/create_table.sgml            |   904 -
 doc/src/sgml/ref/create_table_as.sgml         |   170 -
 doc/src/sgml/ref/create_trigger.sgml          |   319 -
 doc/src/sgml/ref/create_type.sgml             |   467 -
 doc/src/sgml/ref/create_user.sgml             |   274 -
 doc/src/sgml/ref/create_view.sgml             |   275 -
 doc/src/sgml/ref/createdb.sgml                |   282 -
 doc/src/sgml/ref/createlang.sgml              |   225 -
 doc/src/sgml/ref/createuser.sgml              |   294 -
 doc/src/sgml/ref/current_date.sgml            |   148 -
 doc/src/sgml/ref/current_time.sgml            |   158 -
 doc/src/sgml/ref/current_timestamp.sgml       |   166 -
 doc/src/sgml/ref/current_user.sgml            |   167 -
 doc/src/sgml/ref/declare.sgml                 |   329 -
 doc/src/sgml/ref/delete.sgml                  |   211 -
 doc/src/sgml/ref/drop_aggregate.sgml          |   176 -
 doc/src/sgml/ref/drop_database.sgml           |   171 -
 doc/src/sgml/ref/drop_domain.sgml             |   185 -
 doc/src/sgml/ref/drop_function.sgml           |   175 -
 doc/src/sgml/ref/drop_group.sgml              |   136 -
 doc/src/sgml/ref/drop_index.sgml              |   167 -
 doc/src/sgml/ref/drop_language.sgml           |   174 -
 doc/src/sgml/ref/drop_operator.sgml           |   225 -
 doc/src/sgml/ref/drop_rule.sgml               |   173 -
 doc/src/sgml/ref/drop_sequence.sgml           |   163 -
 doc/src/sgml/ref/drop_table.sgml              |   196 -
 doc/src/sgml/ref/drop_trigger.sgml            |   172 -
 doc/src/sgml/ref/drop_type.sgml               |   179 -
 doc/src/sgml/ref/drop_user.sgml               |   148 -
 doc/src/sgml/ref/drop_view.sgml               |   208 -
 doc/src/sgml/ref/dropdb.sgml                  |   221 -
 doc/src/sgml/ref/droplang.sgml                |   206 -
 doc/src/sgml/ref/dropuser.sgml                |   213 -
 doc/src/sgml/ref/ecpg-ref.sgml                |   426 -
 doc/src/sgml/ref/end.sgml                     |   168 -
 doc/src/sgml/ref/explain.sgml                 |   274 -
 doc/src/sgml/ref/fetch.sgml                   |   405 -
 doc/src/sgml/ref/grant.sgml                   |   384 -
 doc/src/sgml/ref/initdb.sgml                  |   298 -
 doc/src/sgml/ref/initlocation.sgml            |    88 -
 doc/src/sgml/ref/insert.sgml                  |   271 -
 doc/src/sgml/ref/ipcclean.sgml                |    84 -
 doc/src/sgml/ref/listen.sgml                  |   210 -
 doc/src/sgml/ref/load.sgml                    |    79 -
 doc/src/sgml/ref/lock.sgml                    |   523 -
 doc/src/sgml/ref/move.sgml                    |   148 -
 doc/src/sgml/ref/notify.sgml                  |   252 -
 doc/src/sgml/ref/pg_config-ref.sgml           |   165 -
 doc/src/sgml/ref/pg_ctl-ref.sgml              |   368 -
 doc/src/sgml/ref/pg_dump.sgml                 |   745 -
 doc/src/sgml/ref/pg_dumpall.sgml              |   203 -
 doc/src/sgml/ref/pg_restore.sgml              |   706 -
 doc/src/sgml/ref/pgaccess-ref.sgml            |   405 -
 doc/src/sgml/ref/pgtclsh.sgml                 |    83 -
 doc/src/sgml/ref/pgtksh.sgml                  |    86 -
 doc/src/sgml/ref/postgres-ref.sgml            |   422 -
 doc/src/sgml/ref/postmaster.sgml              |   528 -
 doc/src/sgml/ref/psql-ref.sgml                |  2553 -
 doc/src/sgml/ref/reindex.sgml                 |   270 -
 doc/src/sgml/ref/reset.sgml                   |   122 -
 doc/src/sgml/ref/revoke.sgml                  |   154 -
 doc/src/sgml/ref/rollback.sgml                |   152 -
 doc/src/sgml/ref/select.sgml                  |  1077 -
 doc/src/sgml/ref/select_into.sgml             |   165 -
 doc/src/sgml/ref/set.sgml                     |   515 -
 doc/src/sgml/ref/set_constraints.sgml         |    76 -
 doc/src/sgml/ref/set_session_auth.sgml        |   120 -
 doc/src/sgml/ref/set_transaction.sgml         |   135 -
 doc/src/sgml/ref/show.sgml                    |   124 -
 doc/src/sgml/ref/truncate.sgml                |   142 -
 doc/src/sgml/ref/unlisten.sgml                |   193 -
 doc/src/sgml/ref/update.sgml                  |   219 -
 doc/src/sgml/ref/vacuum.sgml                  |   305 -
 doc/src/sgml/ref/vacuumdb.sgml                |   310 -
 doc/src/sgml/refentry.sgml                    |     1 -
 doc/src/sgml/reference.ced                    |  1597 -
 doc/src/sgml/reference.sgml                   |   218 -
 doc/src/sgml/regress.sgml                     |   437 -
 doc/src/sgml/release.sgml                     |  4444 --
 doc/src/sgml/rules.sgml                       |  2026 -
 doc/src/sgml/runtime.sgml                     |  2736 -
 doc/src/sgml/sources.sgml                     |    84 -
 doc/src/sgml/spi.sgml                         |  3921 -
 doc/src/sgml/sql.sgml                         |  2156 -
 doc/src/sgml/standalone-install.sgml          |    42 -
 doc/src/sgml/start.sgml                       |   420 -
 doc/src/sgml/stylesheet.css                   |    59 -
 doc/src/sgml/stylesheet.dsl                   |   623 -
 doc/src/sgml/syntax.sgml                      |  1503 -
 doc/src/sgml/trigger.sgml                     |   635 -
 doc/src/sgml/tutorial.sgml                    |    72 -
 doc/src/sgml/typeconv.sgml                    |   903 -
 doc/src/sgml/user-manag.sgml                  |   212 -
 doc/src/sgml/user.sgml                        |    59 -
 doc/src/sgml/version.sgml                     |     7 -
 doc/src/sgml/wal.sgml                         |   379 -
 doc/src/sgml/xaggr.sgml                       |   137 -
 doc/src/sgml/xfunc.sgml                       |  1887 -
 doc/src/sgml/xindex.sgml                      |   595 -
 doc/src/sgml/xoper.sgml                       |   507 -
 doc/src/sgml/xplang.sgml                      |   179 -
 doc/src/sgml/xtypes.sgml                      |   207 -
 doc/src/sgml/y2k.sgml                         |    95 -
 register.txt                                  |    25 -
 src/DEVELOPERS                                |     3 -
 src/Makefile                                  |    43 -
 src/Makefile.global.in                        |   501 -
 src/Makefile.shlib                            |   410 -
 src/backend/Makefile                          |   221 -
 src/backend/access/Makefile                   |    30 -
 src/backend/access/common/Makefile            |    31 -
 src/backend/access/common/heaptuple.c         |   772 -
 src/backend/access/common/indextuple.c        |   415 -
 src/backend/access/common/indexvalid.c        |    73 -
 src/backend/access/common/printtup.c          |   516 -
 src/backend/access/common/scankey.c           |    99 -
 src/backend/access/common/tupdesc.c           |   660 -
 src/backend/access/gist/Makefile              |    30 -
 src/backend/access/gist/gist.c                |  1966 -
 src/backend/access/gist/gistget.c             |   344 -
 src/backend/access/gist/gistscan.c            |   421 -
 src/backend/access/gist/giststrat.c           |   125 -
 src/backend/access/hash/Makefile              |    32 -
 src/backend/access/hash/hash.c                |   512 -
 src/backend/access/hash/hashfunc.c            |   207 -
 src/backend/access/hash/hashinsert.c          |   238 -
 src/backend/access/hash/hashovfl.c            |   614 -
 src/backend/access/hash/hashpage.c            |   695 -
 src/backend/access/hash/hashscan.c            |   181 -
 src/backend/access/hash/hashsearch.c          |   432 -
 src/backend/access/hash/hashstrat.c           |    84 -
 src/backend/access/hash/hashutil.c            |   147 -
 src/backend/access/heap/Makefile              |    31 -
 src/backend/access/heap/heapam.c              |  2548 -
 src/backend/access/heap/hio.c                 |   288 -
 src/backend/access/heap/tuptoaster.c          |  1307 -
 src/backend/access/index/Makefile             |    30 -
 src/backend/access/index/genam.c              |   268 -
 src/backend/access/index/indexam.c            |   658 -
 src/backend/access/index/istrat.c             |   479 -
 src/backend/access/nbtree/Makefile            |    32 -
 src/backend/access/nbtree/README              |   181 -
 src/backend/access/nbtree/nbtcompare.c        |   151 -
 src/backend/access/nbtree/nbtinsert.c         |  2101 -
 src/backend/access/nbtree/nbtpage.c           |   484 -
 src/backend/access/nbtree/nbtree.c            |  1189 -
 src/backend/access/nbtree/nbtsearch.c         |  1049 -
 src/backend/access/nbtree/nbtsort.c           |   641 -
 src/backend/access/nbtree/nbtstrat.c          |   138 -
 src/backend/access/nbtree/nbtutils.c          |   563 -
 src/backend/access/rtree/Makefile             |    31 -
 src/backend/access/rtree/rtget.c              |   283 -
 src/backend/access/rtree/rtproc.c             |   193 -
 src/backend/access/rtree/rtree.c              |  1356 -
 src/backend/access/rtree/rtscan.c             |   422 -
 src/backend/access/rtree/rtstrat.c            |   240 -
 src/backend/access/transam/Makefile           |    26 -
 src/backend/access/transam/clog.c             |  1009 -
 src/backend/access/transam/rmgr.c             |    39 -
 src/backend/access/transam/transam.c          |   318 -
 src/backend/access/transam/varsup.c           |   186 -
 src/backend/access/transam/xact.c             |  1656 -
 src/backend/access/transam/xid.c              |    72 -
 src/backend/access/transam/xlog.c             |  3373 -
 src/backend/access/transam/xlogutils.c        |   372 -
 src/backend/bootstrap/.cvsignore              |     3 -
 src/backend/bootstrap/Makefile                |    76 -
 src/backend/bootstrap/bootparse.y             |   338 -
 src/backend/bootstrap/bootscanner.l           |   145 -
 src/backend/bootstrap/bootstrap.c             |  1183 -
 src/backend/catalog/Makefile                  |    57 -
 src/backend/catalog/README                    |   109 -
 src/backend/catalog/aclchk.c                  |  1369 -
 src/backend/catalog/catalog.c                 |   194 -
 src/backend/catalog/genbki.sh                 |   438 -
 src/backend/catalog/heap.c                    |  2028 -
 src/backend/catalog/index.c                   |  2015 -
 src/backend/catalog/indexing.c                |   169 -
 src/backend/catalog/namespace.c               |  1922 -
 src/backend/catalog/pg_aggregate.c            |   190 -
 src/backend/catalog/pg_largeobject.c          |   152 -
 src/backend/catalog/pg_namespace.c            |    81 -
 src/backend/catalog/pg_operator.c             |   895 -
 src/backend/catalog/pg_proc.c                 |   521 -
 src/backend/catalog/pg_type.c                 |   370 -
 src/backend/commands/Makefile                 |    34 -
 src/backend/commands/_deadcode/recipe.c       |  1318 -
 src/backend/commands/_deadcode/recipe.h       |    20 -
 src/backend/commands/_deadcode/version.c      |   346 -
 src/backend/commands/aggregatecmds.c          |   208 -
 src/backend/commands/analyze.c                |  1794 -
 src/backend/commands/async.c                  |   896 -
 src/backend/commands/cluster.c                |   255 -
 src/backend/commands/comment.c                |   809 -
 src/backend/commands/copy.c                   |  1363 -
 src/backend/commands/dbcommands.c             |   761 -
 src/backend/commands/define.c                 |   233 -
 src/backend/commands/explain.c                |   914 -
 src/backend/commands/functioncmds.c           |   587 -
 src/backend/commands/indexcmds.c              |   781 -
 src/backend/commands/lockcmds.c               |    70 -
 src/backend/commands/operatorcmds.c           |   253 -
 src/backend/commands/portalcmds.c             |   220 -
 src/backend/commands/proclang.c               |   174 -
 src/backend/commands/schemacmds.c             |   141 -
 src/backend/commands/sequence.c               |   889 -
 src/backend/commands/tablecmds.c              |  3094 -
 src/backend/commands/trigger.c                |  2163 -
 src/backend/commands/typecmds.c               |   679 -
 src/backend/commands/user.c                   |  1525 -
 src/backend/commands/vacuum.c                 |  2944 -
 src/backend/commands/vacuumlazy.c             |  1120 -
 src/backend/commands/variable.c               |   587 -
 src/backend/commands/view.c                   |   268 -
 src/backend/executor/Makefile                 |    36 -
 src/backend/executor/README                   |    99 -
 src/backend/executor/_deadcode/nodeTee.c      |   499 -
 src/backend/executor/execAmi.c                |   258 -
 src/backend/executor/execJunk.c               |   431 -
 src/backend/executor/execMain.c               |  1941 -
 src/backend/executor/execProcnode.c           |   759 -
 src/backend/executor/execQual.c               |  1929 -
 src/backend/executor/execScan.c               |   147 -
 src/backend/executor/execTuples.c             |   795 -
 src/backend/executor/execUtils.c              |   793 -
 src/backend/executor/functions.c              |   611 -
 src/backend/executor/instrument.c             |   122 -
 src/backend/executor/nodeAgg.c                |  1053 -
 src/backend/executor/nodeAppend.c             |   406 -
 src/backend/executor/nodeFunctionscan.c       |   469 -
 src/backend/executor/nodeGroup.c              |   502 -
 src/backend/executor/nodeHash.c               |   736 -
 src/backend/executor/nodeHashjoin.c           |   713 -
 src/backend/executor/nodeIndexscan.c          |  1050 -
 src/backend/executor/nodeLimit.c              |   311 -
 src/backend/executor/nodeMaterial.c           |   303 -
 src/backend/executor/nodeMergejoin.c          |  1595 -
 src/backend/executor/nodeNestloop.c           |   418 -
 src/backend/executor/nodeResult.c             |   289 -
 src/backend/executor/nodeSeqscan.c            |   366 -
 src/backend/executor/nodeSetOp.c              |   334 -
 src/backend/executor/nodeSort.c               |   397 -
 src/backend/executor/nodeSubplan.c            |   491 -
 src/backend/executor/nodeSubqueryscan.c       |   262 -
 src/backend/executor/nodeTidscan.c            |   496 -
 src/backend/executor/nodeUnique.c             |   237 -
 src/backend/executor/spi.c                    |  1424 -
 src/backend/lib/Makefile                      |    30 -
 src/backend/lib/bit.c                         |    41 -
 src/backend/lib/dllist.c                      |   238 -
 src/backend/lib/lispsort.c                    |    59 -
 src/backend/lib/stringinfo.c                  |   191 -
 src/backend/libpq/Makefile                    |    34 -
 src/backend/libpq/README.SSL                  |    53 -
 src/backend/libpq/auth.c                      |   906 -
 src/backend/libpq/be-fsstubs.c                |   568 -
 src/backend/libpq/be-secure.c                 |   748 -
 src/backend/libpq/crypt.c                     |   141 -
 src/backend/libpq/hba.c                       |  1373 -
 src/backend/libpq/md5.c                       |   351 -
 src/backend/libpq/pg_hba.conf.sample          |   259 -
 src/backend/libpq/pg_ident.conf.sample        |    35 -
 src/backend/libpq/pqcomm.c                    |   778 -
 src/backend/libpq/pqformat.c                  |   328 -
 src/backend/libpq/pqsignal.c                  |   151 -
 src/backend/main/Makefile                     |    30 -
 src/backend/main/main.c                       |   230 -
 src/backend/nodes/Makefile                    |    32 -
 src/backend/nodes/README                      |    65 -
 src/backend/nodes/copyfuncs.c                 |  3076 -
 src/backend/nodes/equalfuncs.c                |  2231 -
 src/backend/nodes/list.c                      |   632 -
 src/backend/nodes/makefuncs.c                 |   260 -
 src/backend/nodes/nodeFuncs.c                 |   120 -
 src/backend/nodes/nodes.c                     |    42 -
 src/backend/nodes/outfuncs.c                  |  1798 -
 src/backend/nodes/print.c                     |   589 -
 src/backend/nodes/read.c                      |   395 -
 src/backend/nodes/readfuncs.c                 |  2204 -
 src/backend/optimizer/Makefile                |    30 -
 src/backend/optimizer/README                  |   501 -
 src/backend/optimizer/geqo/Makefile           |    34 -
 src/backend/optimizer/geqo/geqo_copy.c        |    53 -
 src/backend/optimizer/geqo/geqo_cx.c          |   121 -
 src/backend/optimizer/geqo/geqo_erx.c         |   472 -
 src/backend/optimizer/geqo/geqo_eval.c        |   155 -
 src/backend/optimizer/geqo/geqo_main.c        |   325 -
 src/backend/optimizer/geqo/geqo_misc.c        |   250 -
 src/backend/optimizer/geqo/geqo_mutation.c    |    62 -
 src/backend/optimizer/geqo/geqo_ox1.c         |    91 -
 src/backend/optimizer/geqo/geqo_ox2.c         |   109 -
 src/backend/optimizer/geqo/geqo_pmx.c         |   221 -
 src/backend/optimizer/geqo/geqo_pool.c        |   243 -
 src/backend/optimizer/geqo/geqo_px.c          |   107 -
 .../optimizer/geqo/geqo_recombination.c       |    95 -
 src/backend/optimizer/geqo/geqo_selection.c   |    90 -
 src/backend/optimizer/path/Makefile           |    31 -
 .../optimizer/path/_deadcode/predmig.c        |   810 -
 src/backend/optimizer/path/_deadcode/xfunc.c  |  1479 -
 src/backend/optimizer/path/allpaths.c         |   704 -
 src/backend/optimizer/path/clausesel.c        |   526 -
 src/backend/optimizer/path/costsize.c         |  1458 -
 src/backend/optimizer/path/indxpath.c         |  2188 -
 src/backend/optimizer/path/joinpath.c         |   960 -
 src/backend/optimizer/path/joinrels.c         |   444 -
 src/backend/optimizer/path/orindxpath.c       |   241 -
 src/backend/optimizer/path/pathkeys.c         |  1025 -
 src/backend/optimizer/path/tidpath.c          |   291 -
 src/backend/optimizer/plan/Makefile           |    30 -
 src/backend/optimizer/plan/README             |   156 -
 src/backend/optimizer/plan/createplan.c       |  1974 -
 src/backend/optimizer/plan/initsplan.c        |   968 -
 src/backend/optimizer/plan/planmain.c         |   330 -
 src/backend/optimizer/plan/planner.c          |  1563 -
 src/backend/optimizer/plan/setrefs.c          |   580 -
 src/backend/optimizer/plan/subselect.c        |   741 -
 src/backend/optimizer/prep/Makefile           |    31 -
 .../optimizer/prep/_deadcode/prepkeyset.c     |   222 -
 src/backend/optimizer/prep/prepqual.c         |   973 -
 src/backend/optimizer/prep/preptlist.c        |   237 -
 src/backend/optimizer/prep/prepunion.c        |   886 -
 src/backend/optimizer/util/Makefile           |    31 -
 src/backend/optimizer/util/clauses.c          |  2324 -
 src/backend/optimizer/util/joininfo.c         |    76 -
 src/backend/optimizer/util/pathnode.c         |   620 -
 src/backend/optimizer/util/plancat.c          |   363 -
 src/backend/optimizer/util/relnode.c          |   679 -
 src/backend/optimizer/util/restrictinfo.c     |    82 -
 src/backend/optimizer/util/tlist.c            |   257 -
 src/backend/optimizer/util/var.c              |   370 -
 src/backend/parser/.cvsignore                 |     3 -
 src/backend/parser/Makefile                   |    63 -
 src/backend/parser/README                     |    20 -
 src/backend/parser/analyze.c                  |  3260 -
 src/backend/parser/gram.y                     |  7218 --
 src/backend/parser/keywords.c                 |   384 -
 src/backend/parser/parse_agg.c                |   180 -
 src/backend/parser/parse_clause.c             |  1405 -
 src/backend/parser/parse_coerce.c             |   807 -
 src/backend/parser/parse_expr.c               |  1170 -
 src/backend/parser/parse_func.c               |  1387 -
 src/backend/parser/parse_node.c               |   514 -
 src/backend/parser/parse_oper.c               |   935 -
 src/backend/parser/parse_relation.c           |  1451 -
 src/backend/parser/parse_target.c             |   561 -
 src/backend/parser/parse_type.c               |   505 -
 src/backend/parser/parser.c                   |   110 -
 src/backend/parser/scan.l                     |   666 -
 src/backend/parser/scansup.c                  |   111 -
 src/backend/po/Makefile                       |    12 -
 src/backend/po/cs.po                          | 12241 ---
 src/backend/po/de.po                          | 12284 ---
 src/backend/po/hu.po                          | 12344 ---
 src/backend/po/nls.mk                         |     4 -
 src/backend/po/ru.po                          | 12298 ---
 src/backend/po/zh_CN.po                       | 12182 ---
 src/backend/po/zh_TW.po                       |   339 -
 src/backend/port/Makefile                     |    79 -
 src/backend/port/aix/mkldexport.sh            |    59 -
 src/backend/port/beos/Makefile                |    22 -
 src/backend/port/beos/sem.c                   |   315 -
 src/backend/port/beos/shm.c                   |   139 -
 src/backend/port/beos/support.c               |   346 -
 src/backend/port/darwin/Makefile              |    30 -
 src/backend/port/darwin/README                |    26 -
 src/backend/port/darwin/system.c              |   102 -
 src/backend/port/dynloader/README.dlfcn.aix   |   167 -
 src/backend/port/dynloader/aix.c              |   611 -
 src/backend/port/dynloader/aix.h              |    65 -
 src/backend/port/dynloader/beos.c             |    69 -
 src/backend/port/dynloader/beos.h             |    17 -
 src/backend/port/dynloader/bsdi.c             |    98 -
 src/backend/port/dynloader/bsdi.h             |    52 -
 src/backend/port/dynloader/darwin.c           |    55 -
 src/backend/port/dynloader/darwin.h           |     8 -
 src/backend/port/dynloader/dgux.c             |     6 -
 src/backend/port/dynloader/dgux.h             |    44 -
 src/backend/port/dynloader/freebsd.c          |   108 -
 src/backend/port/dynloader/freebsd.h          |    59 -
 src/backend/port/dynloader/hpux.c             |    68 -
 src/backend/port/dynloader/hpux.h             |    25 -
 src/backend/port/dynloader/irix5.c            |     4 -
 src/backend/port/dynloader/irix5.h            |    46 -
 src/backend/port/dynloader/linux.c            |   111 -
 src/backend/port/dynloader/linux.h            |    58 -
 src/backend/port/dynloader/netbsd.c           |   107 -
 src/backend/port/dynloader/netbsd.h           |    60 -
 src/backend/port/dynloader/nextstep.c         |    81 -
 src/backend/port/dynloader/nextstep.h         |    26 -
 src/backend/port/dynloader/openbsd.c          |   107 -
 src/backend/port/dynloader/openbsd.h          |    59 -
 src/backend/port/dynloader/osf.c              |     4 -
 src/backend/port/dynloader/osf.h              |    47 -
 src/backend/port/dynloader/qnx4.c             |    50 -
 src/backend/port/dynloader/qnx4.h             |    22 -
 src/backend/port/dynloader/sco.c              |     4 -
 src/backend/port/dynloader/sco.h              |    46 -
 src/backend/port/dynloader/solaris.c          |     4 -
 src/backend/port/dynloader/solaris.h          |    38 -
 src/backend/port/dynloader/sunos4.c           |     4 -
 src/backend/port/dynloader/sunos4.h           |    46 -
 src/backend/port/dynloader/svr4.c             |     4 -
 src/backend/port/dynloader/svr4.h             |    46 -
 src/backend/port/dynloader/ultrix4.c          |    68 -
 src/backend/port/dynloader/ultrix4.h          |   124 -
 src/backend/port/dynloader/univel.c           |     4 -
 src/backend/port/dynloader/univel.h           |    46 -
 src/backend/port/dynloader/unixware.c         |     4 -
 src/backend/port/dynloader/unixware.h         |    46 -
 src/backend/port/dynloader/win.c              |     4 -
 src/backend/port/dynloader/win.h              |    46 -
 src/backend/port/gethostname.c                |    24 -
 src/backend/port/getrusage.c                  |    58 -
 src/backend/port/hpux/tas.c.template          |    36 -
 src/backend/port/inet_aton.c                  |   152 -
 src/backend/port/inet_aton.h                  |     3 -
 src/backend/port/ipc_test.c                   |   279 -
 src/backend/port/isinf.c                      |    82 -
 src/backend/port/memcmp.c                     |    36 -
 src/backend/port/nextstep/Makefile            |    28 -
 src/backend/port/nextstep/port.c              |    59 -
 src/backend/port/posix_sema.c                 |   366 -
 src/backend/port/qnx4/Makefile                |    39 -
 src/backend/port/qnx4/ipc.h                   |    31 -
 src/backend/port/qnx4/isnan.c                 |    23 -
 src/backend/port/qnx4/rint.c                  |    37 -
 src/backend/port/qnx4/sem.c                   |   399 -
 src/backend/port/qnx4/sem.h                   |    68 -
 src/backend/port/qnx4/shm.c                   |   276 -
 src/backend/port/qnx4/shm.h                   |    43 -
 src/backend/port/qnx4/tstrint.c               |    34 -
 src/backend/port/qnx4/tstsem.c                |   208 -
 src/backend/port/qnx4/tstshm.c                |   100 -
 src/backend/port/random.c                     |    13 -
 src/backend/port/snprintf.c                   |   470 -
 src/backend/port/srandom.c                    |    13 -
 src/backend/port/strcasecmp.c                 |    78 -
 src/backend/port/strerror.c                   |    31 -
 src/backend/port/strtol.c                     |   140 -
 src/backend/port/strtoul.c                    |   119 -
 src/backend/port/sunos4/Makefile              |    22 -
 src/backend/port/sunos4/float.h               |    31 -
 src/backend/port/sysv_sema.c                  |   522 -
 src/backend/port/sysv_shmem.c                 |   400 -
 src/backend/port/tas/dummy.s                  |     0
 src/backend/port/tas/hpux.s                   |    28 -
 src/backend/port/tas/solaris_i386.s           |    33 -
 src/backend/port/tas/solaris_sparc.s          |    50 -
 src/backend/postmaster/Makefile               |    30 -
 src/backend/postmaster/pgstat.c               |  2715 -
 src/backend/postmaster/postmaster.c           |  2627 -
 src/backend/regex/COPYRIGHT                   |    56 -
 src/backend/regex/Makefile                    |    43 -
 src/backend/regex/WHATSNEW                    |    94 -
 src/backend/regex/engine.c                    |  1110 -
 src/backend/regex/re_format.7                 |   269 -
 src/backend/regex/regcomp.c                   |  1863 -
 src/backend/regex/regerror.c                  |   185 -
 src/backend/regex/regex.3                     |   538 -
 src/backend/regex/regexec.c                   |   194 -
 src/backend/regex/regfree.c                   |    77 -
 src/backend/regex/retest.c                    |    44 -
 src/backend/rewrite/Makefile                  |    31 -
 src/backend/rewrite/rewriteDefine.c           |   461 -
 src/backend/rewrite/rewriteHandler.c          |  1257 -
 src/backend/rewrite/rewriteManip.c            |  1025 -
 src/backend/rewrite/rewriteRemove.c           |   168 -
 src/backend/rewrite/rewriteSupport.c          |    84 -
 src/backend/storage/Makefile                  |    30 -
 src/backend/storage/buffer/Makefile           |    30 -
 src/backend/storage/buffer/README             |    98 -
 src/backend/storage/buffer/buf_init.c         |   293 -
 src/backend/storage/buffer/buf_table.c        |   156 -
 src/backend/storage/buffer/bufmgr.c           |  2205 -
 src/backend/storage/buffer/freelist.c         |   313 -
 src/backend/storage/buffer/localbuf.c         |   275 -
 src/backend/storage/file/Makefile             |    30 -
 src/backend/storage/file/buffile.c            |   576 -
 src/backend/storage/file/fd.c                 |  1336 -
 src/backend/storage/freespace/Makefile        |    30 -
 src/backend/storage/freespace/freespace.c     |  1115 -
 src/backend/storage/ipc/Makefile              |    33 -
 src/backend/storage/ipc/README                |    31 -
 src/backend/storage/ipc/ipc.c                 |   193 -
 src/backend/storage/ipc/ipci.c                |   137 -
 src/backend/storage/ipc/pmsignal.c            |    83 -
 src/backend/storage/ipc/shmem.c               |   379 -
 src/backend/storage/ipc/shmqueue.c            |   257 -
 src/backend/storage/ipc/sinval.c              |   540 -
 src/backend/storage/ipc/sinvaladt.c           |   349 -
 src/backend/storage/large_object/Makefile     |    30 -
 src/backend/storage/large_object/inv_api.c    |   579 -
 src/backend/storage/lmgr/Makefile             |    34 -
 src/backend/storage/lmgr/README               |   424 -
 src/backend/storage/lmgr/deadlock.c           |   760 -
 src/backend/storage/lmgr/lmgr.c               |   356 -
 src/backend/storage/lmgr/lock.c               |  1467 -
 src/backend/storage/lmgr/lwlock.c             |   516 -
 src/backend/storage/lmgr/proc.c               |   972 -
 src/backend/storage/lmgr/s_lock.c             |   297 -
 src/backend/storage/lmgr/spin.c               |    95 -
 src/backend/storage/page/Makefile             |    30 -
 src/backend/storage/page/bufpage.c            |   497 -
 src/backend/storage/page/itemptr.c            |    37 -
 src/backend/storage/smgr/Makefile             |    30 -
 src/backend/storage/smgr/README               |    40 -
 src/backend/storage/smgr/md.c                 |  1104 -
 src/backend/storage/smgr/mm.c                 |   565 -
 src/backend/storage/smgr/smgr.c               |   618 -
 src/backend/storage/smgr/smgrtype.c           |    84 -
 src/backend/tcop/Makefile                     |    30 -
 src/backend/tcop/dest.c                       |   220 -
 src/backend/tcop/fastpath.c                   |   351 -
 src/backend/tcop/postgres.c                   |  2437 -
 src/backend/tcop/pquery.c                     |   279 -
 src/backend/tcop/utility.c                    |   840 -
 src/backend/tioga/Arr_TgRecipe.h              |   130 -
 src/backend/tioga/Makefile                    |    31 -
 src/backend/tioga/Varray.c                    |    48 -
 src/backend/tioga/Varray.h                    |    48 -
 src/backend/tioga/tgRecipe.c                  |   759 -
 src/backend/tioga/tgRecipe.h                  |   136 -
 src/backend/utils/.cvsignore                  |     2 -
 src/backend/utils/Gen_fmgrtab.sh              |   271 -
 src/backend/utils/Makefile                    |    42 -
 src/backend/utils/adt/Makefile                |    44 -
 src/backend/utils/adt/acl.c                   |   945 -
 src/backend/utils/adt/arrayfuncs.c            |  1845 -
 src/backend/utils/adt/arrayutils.c            |   131 -
 src/backend/utils/adt/ascii.c                 |   194 -
 src/backend/utils/adt/bool.c                  |   217 -
 src/backend/utils/adt/cash.c                  |   757 -
 src/backend/utils/adt/char.c                  |   243 -
 src/backend/utils/adt/date.c                  |  2042 -
 src/backend/utils/adt/datetime.c              |  3587 -
 src/backend/utils/adt/datum.c                 |   185 -
 src/backend/utils/adt/encode.c                |   537 -
 src/backend/utils/adt/float.c                 |  1999 -
 src/backend/utils/adt/format_type.c           |   530 -
 src/backend/utils/adt/formatting.c            |  4769 --
 src/backend/utils/adt/geo_ops.c               |  4661 --
 src/backend/utils/adt/geo_selfuncs.c          |    95 -
 src/backend/utils/adt/inet_net_ntop.c         |   219 -
 src/backend/utils/adt/inet_net_pton.c         |   337 -
 src/backend/utils/adt/int.c                   |   983 -
 src/backend/utils/adt/int8.c                  |   817 -
 src/backend/utils/adt/like.c                  |   624 -
 src/backend/utils/adt/like_match.c            |   333 -
 src/backend/utils/adt/mac.c                   |   257 -
 src/backend/utils/adt/misc.c                  |   113 -
 src/backend/utils/adt/nabstime.c              |  1774 -
 src/backend/utils/adt/name.c                  |   300 -
 src/backend/utils/adt/network.c               |   736 -
 src/backend/utils/adt/not_in.c                |   138 -
 src/backend/utils/adt/numeric.c               |  3997 -
 src/backend/utils/adt/numutils.c              |   479 -
 src/backend/utils/adt/oid.c                   |   362 -
 src/backend/utils/adt/oracle_compat.c         |  1011 -
 src/backend/utils/adt/pg_locale.c             |   147 -
 src/backend/utils/adt/pg_lzcompress.c         |   903 -
 src/backend/utils/adt/pgstatfuncs.c           |   371 -
 src/backend/utils/adt/quote.c                 |   289 -
 src/backend/utils/adt/regexp.c                |   350 -
 src/backend/utils/adt/regproc.c               |  1134 -
 src/backend/utils/adt/ri_triggers.c           |  3381 -
 src/backend/utils/adt/ruleutils.c             |  2847 -
 src/backend/utils/adt/selfuncs.c              |  3583 -
 src/backend/utils/adt/sets.c                  |   214 -
 src/backend/utils/adt/tid.c                   |   246 -
 src/backend/utils/adt/timestamp.c             |  3424 -
 src/backend/utils/adt/varbit.c                |  1227 -
 src/backend/utils/adt/varchar.c               |   975 -
 src/backend/utils/adt/varlena.c               |  1424 -
 src/backend/utils/adt/version.c               |    28 -
 src/backend/utils/cache/Makefile              |    31 -
 src/backend/utils/cache/catcache.c            |  1768 -
 src/backend/utils/cache/fcache.c              |    53 -
 src/backend/utils/cache/inval.c               |   736 -
 src/backend/utils/cache/lsyscache.c           |  1389 -
 src/backend/utils/cache/relcache.c            |  3229 -
 src/backend/utils/cache/syscache.c            |   633 -
 src/backend/utils/error/Makefile              |    30 -
 src/backend/utils/error/assert.c              |    72 -
 src/backend/utils/error/elog.c                |   908 -
 src/backend/utils/error/exc.c                 |   198 -
 src/backend/utils/error/excabort.c            |    28 -
 src/backend/utils/error/excid.c               |    54 -
 src/backend/utils/error/format.c              |    36 -
 src/backend/utils/fmgr/Makefile               |    26 -
 src/backend/utils/fmgr/README                 |   504 -
 src/backend/utils/fmgr/dfmgr.c                |   416 -
 src/backend/utils/fmgr/fmgr.c                 |  1589 -
 src/backend/utils/hash/Makefile               |    30 -
 src/backend/utils/hash/dynahash.c             |   950 -
 src/backend/utils/hash/hashfn.c               |    45 -
 src/backend/utils/hash/pg_crc.c               |   417 -
 src/backend/utils/init/Makefile               |    30 -
 src/backend/utils/init/findbe.c               |   230 -
 src/backend/utils/init/globals.c              |    76 -
 src/backend/utils/init/miscinit.c             |  1080 -
 src/backend/utils/init/postinit.c             |   466 -
 src/backend/utils/mb/Makefile                 |    30 -
 src/backend/utils/mb/README                   |    15 -
 .../utils/mb/Unicode/ISO10646-GB18030.TXT     | 63489 ---------------
 src/backend/utils/mb/Unicode/Makefile         |    70 -
 src/backend/utils/mb/Unicode/UCS_to_8859.pl   |   110 -
 src/backend/utils/mb/Unicode/UCS_to_BIG5.pl   |   111 -
 src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl |   112 -
 src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl |   250 -
 src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl |   112 -
 src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl |   134 -
 .../utils/mb/Unicode/UCS_to_GB18030.pl        |    95 -
 src/backend/utils/mb/Unicode/UCS_to_GBK.pl    |   112 -
 src/backend/utils/mb/Unicode/UCS_to_JOHAB.pl  |   111 -
 src/backend/utils/mb/Unicode/UCS_to_SJIS.pl   |   126 -
 src/backend/utils/mb/Unicode/UCS_to_UHC.pl    |   111 -
 src/backend/utils/mb/Unicode/UCS_to_WIN874.pl |   111 -
 src/backend/utils/mb/Unicode/UCS_to_WINX.pl   |   113 -
 .../utils/mb/Unicode/UCS_to_cyrillic.pl       |   112 -
 src/backend/utils/mb/Unicode/alt_to_utf8.map  |   130 -
 src/backend/utils/mb/Unicode/big5_to_utf8.map | 13712 ----
 .../utils/mb/Unicode/euc_cn_to_utf8.map       |  7447 --
 .../utils/mb/Unicode/euc_jp_to_utf8.map       | 13199 ----
 .../utils/mb/Unicode/euc_kr_to_utf8.map       |  8226 --
 .../utils/mb/Unicode/euc_tw_to_utf8.map       | 23577 ------
 .../utils/mb/Unicode/gb18030_to_utf8.map      | 63490 ----------------
 src/backend/utils/mb/Unicode/gbk_to_utf8.map  | 21794 ------
 .../utils/mb/Unicode/iso8859_10_to_utf8.map   |   130 -
 .../utils/mb/Unicode/iso8859_13_to_utf8.map   |   130 -
 .../utils/mb/Unicode/iso8859_14_to_utf8.map   |   130 -
 .../utils/mb/Unicode/iso8859_15_to_utf8.map   |   130 -
 .../utils/mb/Unicode/iso8859_16_to_utf8.map   |   130 -
 .../utils/mb/Unicode/iso8859_2_to_utf8.map    |   130 -
 .../utils/mb/Unicode/iso8859_3_to_utf8.map    |   123 -
 .../utils/mb/Unicode/iso8859_4_to_utf8.map    |   130 -
 .../utils/mb/Unicode/iso8859_5_to_utf8.map    |   130 -
 .../utils/mb/Unicode/iso8859_6_to_utf8.map    |    85 -
 .../utils/mb/Unicode/iso8859_7_to_utf8.map    |   124 -
 .../utils/mb/Unicode/iso8859_8_to_utf8.map    |    94 -
 .../utils/mb/Unicode/iso8859_9_to_utf8.map    |   130 -
 .../utils/mb/Unicode/johab_to_utf8.map        | 17048 -----
 .../utils/mb/Unicode/koi8r_to_utf8.map        |   130 -
 src/backend/utils/mb/Unicode/sjis_to_utf8.map |  7789 --
 src/backend/utils/mb/Unicode/tcvn_to_utf8.map |   130 -
 src/backend/utils/mb/Unicode/ucs2utf.pl       |    20 -
 src/backend/utils/mb/Unicode/uhc_to_utf8.map  | 17050 -----
 src/backend/utils/mb/Unicode/utf8_to_alt.map  |   130 -
 src/backend/utils/mb/Unicode/utf8_to_big5.map | 13706 ----
 .../utils/mb/Unicode/utf8_to_euc_cn.map       |  7447 --
 .../utils/mb/Unicode/utf8_to_euc_jp.map       | 13177 ----
 .../utils/mb/Unicode/utf8_to_euc_kr.map       |  8226 --
 .../utils/mb/Unicode/utf8_to_euc_tw.map       | 17713 -----
 .../utils/mb/Unicode/utf8_to_gb18030.map      | 63490 ----------------
 src/backend/utils/mb/Unicode/utf8_to_gbk.map  | 21794 ------
 .../utils/mb/Unicode/utf8_to_iso8859_10.map   |   130 -
 .../utils/mb/Unicode/utf8_to_iso8859_13.map   |   130 -
 .../utils/mb/Unicode/utf8_to_iso8859_14.map   |   130 -
 .../utils/mb/Unicode/utf8_to_iso8859_15.map   |   130 -
 .../utils/mb/Unicode/utf8_to_iso8859_16.map   |   130 -
 .../utils/mb/Unicode/utf8_to_iso8859_2.map    |   130 -
 .../utils/mb/Unicode/utf8_to_iso8859_3.map    |   123 -
 .../utils/mb/Unicode/utf8_to_iso8859_4.map    |   130 -
 .../utils/mb/Unicode/utf8_to_iso8859_5.map    |   130 -
 .../utils/mb/Unicode/utf8_to_iso8859_6.map    |    85 -
 .../utils/mb/Unicode/utf8_to_iso8859_7.map    |   124 -
 .../utils/mb/Unicode/utf8_to_iso8859_8.map    |    94 -
 .../utils/mb/Unicode/utf8_to_iso8859_9.map    |   130 -
 .../utils/mb/Unicode/utf8_to_johab.map        | 17048 -----
 .../utils/mb/Unicode/utf8_to_koi8r.map        |   130 -
 src/backend/utils/mb/Unicode/utf8_to_sjis.map |  7400 --
 src/backend/utils/mb/Unicode/utf8_to_tcvn.map |   122 -
 src/backend/utils/mb/Unicode/utf8_to_uhc.map  | 17050 -----
 .../utils/mb/Unicode/utf8_to_win1250.map      |   126 -
 .../utils/mb/Unicode/utf8_to_win1251.map      |   129 -
 .../utils/mb/Unicode/utf8_to_win1256.map      |   130 -
 .../utils/mb/Unicode/utf8_to_win874.map       |   100 -
 .../utils/mb/Unicode/win1250_to_utf8.map      |   130 -
 .../utils/mb/Unicode/win1251_to_utf8.map      |   130 -
 .../utils/mb/Unicode/win1256_to_utf8.map      |   130 -
 .../utils/mb/Unicode/win874_to_utf8.map       |   130 -
 src/backend/utils/mb/alt.c                    |    74 -
 src/backend/utils/mb/big5.c                   |   378 -
 src/backend/utils/mb/conv.c                   |  2151 -
 src/backend/utils/mb/encnames.c               |   512 -
 src/backend/utils/mb/iso.c                    |    74 -
 src/backend/utils/mb/mbutils.c                |   477 -
 src/backend/utils/mb/sjis.map                 |   396 -
 src/backend/utils/mb/wchar.c                  |   691 -
 src/backend/utils/mb/win.c                    |    74 -
 src/backend/utils/mb/win1251.c                |    74 -
 src/backend/utils/mb/wstrcmp.c                |    50 -
 src/backend/utils/mb/wstrncmp.c               |    85 -
 src/backend/utils/misc/.cvsignore             |     1 -
 src/backend/utils/misc/Makefile               |    41 -
 src/backend/utils/misc/README                 |   136 -
 src/backend/utils/misc/database.c             |   276 -
 src/backend/utils/misc/guc-file.l             |   365 -
 src/backend/utils/misc/guc.c                  |  2536 -
 src/backend/utils/misc/postgresql.conf.sample |   202 -
 src/backend/utils/misc/ps_status.c            |   293 -
 src/backend/utils/misc/superuser.c            |    93 -
 src/backend/utils/mmgr/Makefile               |    30 -
 src/backend/utils/mmgr/README                 |   393 -
 src/backend/utils/mmgr/aset.c                 |  1086 -
 src/backend/utils/mmgr/mcxt.c                 |   515 -
 src/backend/utils/mmgr/portalmem.c            |   274 -
 src/backend/utils/sort/Makefile               |    30 -
 src/backend/utils/sort/logtape.c              |   924 -
 src/backend/utils/sort/tuplesort.c            |  2216 -
 src/backend/utils/sort/tuplestore.c           |   685 -
 src/backend/utils/time/Makefile               |    30 -
 src/backend/utils/time/tqual.c                |  1019 -
 src/bin/Makefile                              |    34 -
 src/bin/initdb/Makefile                       |    37 -
 src/bin/initdb/initdb.sh                      |  1035 -
 src/bin/initlocation/Makefile                 |    32 -
 src/bin/initlocation/initlocation.sh          |   169 -
 src/bin/ipcclean/Makefile                     |    32 -
 src/bin/ipcclean/ipcclean.sh                  |   113 -
 src/bin/pg_config/Makefile                    |    30 -
 src/bin/pg_config/pg_config.sh                |    78 -
 src/bin/pg_ctl/Makefile                       |    33 -
 src/bin/pg_ctl/pg_ctl.sh                      |   392 -
 src/bin/pg_dump/Makefile                      |    73 -
 src/bin/pg_dump/README                        |    96 -
 src/bin/pg_dump/common.c                      |   545 -
 src/bin/pg_dump/cs.po                         |  1892 -
 src/bin/pg_dump/de.po                         |  1951 -
 src/bin/pg_dump/nls.mk                        |     8 -
 src/bin/pg_dump/pg_backup.h                   |   184 -
 src/bin/pg_dump/pg_backup_archiver.c          |  2524 -
 src/bin/pg_dump/pg_backup_archiver.h          |   316 -
 src/bin/pg_dump/pg_backup_custom.c            |  1034 -
 src/bin/pg_dump/pg_backup_db.c                |   879 -
 src/bin/pg_dump/pg_backup_db.h                |    19 -
 src/bin/pg_dump/pg_backup_files.c             |   558 -
 src/bin/pg_dump/pg_backup_null.c              |   126 -
 src/bin/pg_dump/pg_backup_tar.c               |  1260 -
 src/bin/pg_dump/pg_backup_tar.h               |    34 -
 src/bin/pg_dump/pg_dump.c                     |  5835 --
 src/bin/pg_dump/pg_dump.h                     |   217 -
 src/bin/pg_dump/pg_dumpall.sh                 |   289 -
 src/bin/pg_dump/pg_restore.c                  |   480 -
 src/bin/pg_dump/ru.po                         |  1856 -
 src/bin/pg_dump/sv.po                         |  1705 -
 src/bin/pg_dump/zh_CN.po                      |  1845 -
 src/bin/pg_dump/zh_TW.po                      |   390 -
 src/bin/pg_encoding/Makefile                  |    51 -
 src/bin/pg_encoding/pg_encoding.c             |    89 -
 src/bin/pg_id/Makefile                        |    37 -
 src/bin/pg_id/pg_id.c                         |   104 -
 src/bin/pgaccess/Makefile                     |    44 -
 src/bin/pgaccess/README                       |    82 -
 src/bin/pgaccess/copyright.html               |    40 -
 src/bin/pgaccess/demo/formdemo.sql            |   240 -
 src/bin/pgaccess/doc/html/a_right.gif         |   Bin 207 -> 0 bytes
 src/bin/pgaccess/doc/html/addindex.gif        |   Bin 11402 -> 0 bytes
 src/bin/pgaccess/doc/html/api.html            |   232 -
 src/bin/pgaccess/doc/html/ball.gif            |   Bin 176 -> 0 bytes
 src/bin/pgaccess/doc/html/contents.html       |    29 -
 src/bin/pgaccess/doc/html/copyright.html      |    40 -
 src/bin/pgaccess/doc/html/documentation.html  |    19 -
 src/bin/pgaccess/doc/html/download.html       |    23 -
 src/bin/pgaccess/doc/html/faq.html            |   110 -
 src/bin/pgaccess/doc/html/features.html       |    52 -
 src/bin/pgaccess/doc/html/formdemo.sql        |   216 -
 src/bin/pgaccess/doc/html/forms.gif           |   Bin 20106 -> 0 bytes
 src/bin/pgaccess/doc/html/forms.html          |   203 -
 src/bin/pgaccess/doc/html/function.gif        |   Bin 10022 -> 0 bytes
 src/bin/pgaccess/doc/html/help.gif            |   Bin 7082 -> 0 bytes
 src/bin/pgaccess/doc/html/index.html          |    11 -
 src/bin/pgaccess/doc/html/irix.html           |   133 -
 src/bin/pgaccess/doc/html/linux1.gif          |   Bin 789 -> 0 bytes
 src/bin/pgaccess/doc/html/maillist.html       |    43 -
 src/bin/pgaccess/doc/html/main.html           |    33 -
 src/bin/pgaccess/doc/html/mainwindow.gif      |   Bin 8857 -> 0 bytes
 src/bin/pgaccess/doc/html/newtable.gif        |   Bin 9317 -> 0 bytes
 src/bin/pgaccess/doc/html/newuser.gif         |   Bin 3965 -> 0 bytes
 src/bin/pgaccess/doc/html/old_index.html      |   143 -
 src/bin/pgaccess/doc/html/permissions.gif     |   Bin 10414 -> 0 bytes
 src/bin/pgaccess/doc/html/pg93patch.html      |    25 -
 src/bin/pgaccess/doc/html/pga-rad.html        |    65 -
 src/bin/pgaccess/doc/html/qbtclet.html        |    45 -
 src/bin/pgaccess/doc/html/qbtclet.tcl         |   529 -
 src/bin/pgaccess/doc/html/screenshots.html    |    43 -
 src/bin/pgaccess/doc/html/specialchars.html   |    47 -
 src/bin/pgaccess/doc/html/todo.html           |    11 -
 src/bin/pgaccess/doc/html/tutorial/addref.jpg |   Bin 28655 -> 0 bytes
 .../pgaccess/doc/html/tutorial/altern_q.jpg   |   Bin 13639 -> 0 bytes
 .../pgaccess/doc/html/tutorial/altern_v.jpg   |   Bin 16987 -> 0 bytes
 .../pgaccess/doc/html/tutorial/copyright.html |    40 -
 src/bin/pgaccess/doc/html/tutorial/index.html |    27 -
 src/bin/pgaccess/doc/html/tutorial/intro.html |    39 -
 src/bin/pgaccess/doc/html/tutorial/irix.html  |   133 -
 src/bin/pgaccess/doc/html/tutorial/newref.txt |     1 -
 .../pgaccess/doc/html/tutorial/newtable.jpg   |   Bin 29164 -> 0 bytes
 .../pgaccess/doc/html/tutorial/newtable.tga   |   Bin 44583 -> 0 bytes
 .../pgaccess/doc/html/tutorial/problems.html  |    70 -
 .../pgaccess/doc/html/tutorial/screen1.jpg    |   Bin 15331 -> 0 bytes
 .../pgaccess/doc/html/tutorial/sel_tbl.jpg    |   Bin 15983 -> 0 bytes
 src/bin/pgaccess/doc/html/tutorial/start.html |    74 -
 src/bin/pgaccess/doc/html/tutorial/tut.html   |    50 -
 .../pgaccess/doc/html/tutorial/tut_edit.html  |    39 -
 .../pgaccess/doc/html/tutorial/tut_new.html   |    36 -
 .../pgaccess/doc/html/tutorial/tut_sel1.html  |    36 -
 .../pgaccess/doc/html/tutorial/tut_user.html  |    28 -
 src/bin/pgaccess/doc/html/vdesigner.gif       |   Bin 15903 -> 0 bytes
 src/bin/pgaccess/doc/html/whatsnew.html       |   106 -
 src/bin/pgaccess/doc/html/win32.html          |    45 -
 src/bin/pgaccess/images/icon_button.gif       |   Bin 896 -> 0 bytes
 src/bin/pgaccess/images/icon_checkbutton.gif  |   Bin 873 -> 0 bytes
 src/bin/pgaccess/images/icon_entry.gif        |   Bin 907 -> 0 bytes
 src/bin/pgaccess/images/icon_frame.gif        |   Bin 908 -> 0 bytes
 src/bin/pgaccess/images/icon_label.gif        |   Bin 80 -> 0 bytes
 src/bin/pgaccess/images/icon_listbox.gif      |   Bin 896 -> 0 bytes
 src/bin/pgaccess/images/icon_query.gif        |   Bin 897 -> 0 bytes
 src/bin/pgaccess/images/icon_radiobutton.gif  |   Bin 870 -> 0 bytes
 src/bin/pgaccess/images/icon_text.gif         |   Bin 911 -> 0 bytes
 src/bin/pgaccess/lib/database.tcl             |    58 -
 src/bin/pgaccess/lib/forms.tcl                |  1268 -
 src/bin/pgaccess/lib/functions.tcl            |   182 -
 src/bin/pgaccess/lib/help.tcl                 |   127 -
 src/bin/pgaccess/lib/help/abort.hlp           |    10 -
 src/bin/pgaccess/lib/help/add_records.hlp     |     7 -
 src/bin/pgaccess/lib/help/alter_table.hlp     |    30 -
 src/bin/pgaccess/lib/help/alter_user.hlp      |    49 -
 src/bin/pgaccess/lib/help/author.hlp          |    12 -
 src/bin/pgaccess/lib/help/begin.hlp           |    35 -
 src/bin/pgaccess/lib/help/close.hlp           |    22 -
 src/bin/pgaccess/lib/help/cluster.hlp         |    48 -
 src/bin/pgaccess/lib/help/commit.hlp          |    17 -
 src/bin/pgaccess/lib/help/copy.hlp            |   104 -
 src/bin/pgaccess/lib/help/copyrights.hlp      |    13 -
 .../pgaccess/lib/help/create_aggregate.hlp    |    90 -
 src/bin/pgaccess/lib/help/create_database.hlp |    59 -
 src/bin/pgaccess/lib/help/create_function.hlp |    69 -
 src/bin/pgaccess/lib/help/create_index.hlp    |    87 -
 src/bin/pgaccess/lib/help/create_language.hlp |   130 -
 src/bin/pgaccess/lib/help/create_operator.hlp |   145 -
 src/bin/pgaccess/lib/help/create_rule.hlp     |   132 -
 src/bin/pgaccess/lib/help/create_sequence.hlp |    42 -
 src/bin/pgaccess/lib/help/create_table.hlp    |    39 -
 src/bin/pgaccess/lib/help/create_table_as.hlp |    20 -
 src/bin/pgaccess/lib/help/create_trigger.hlp  |    80 -
 src/bin/pgaccess/lib/help/create_type.hlp     |    24 -
 src/bin/pgaccess/lib/help/create_user.hlp     |    50 -
 src/bin/pgaccess/lib/help/create_view.hlp     |    27 -
 src/bin/pgaccess/lib/help/data_types.hlp      |    48 -
 src/bin/pgaccess/lib/help/datefunc.hlp        |    58 -
 src/bin/pgaccess/lib/help/declare.hlp         |    29 -
 src/bin/pgaccess/lib/help/delete.hlp          |    43 -
 src/bin/pgaccess/lib/help/drop_aggregate.hlp  |    17 -
 src/bin/pgaccess/lib/help/drop_database.hlp   |    14 -
 src/bin/pgaccess/lib/help/drop_function.hlp   |    22 -
 src/bin/pgaccess/lib/help/drop_index.hlp      |    17 -
 src/bin/pgaccess/lib/help/drop_language.hlp   |    17 -
 src/bin/pgaccess/lib/help/drop_operator.hlp   |    32 -
 src/bin/pgaccess/lib/help/drop_rule.hlp       |    17 -
 src/bin/pgaccess/lib/help/drop_sequence.hlp   |    17 -
 src/bin/pgaccess/lib/help/drop_table.hlp      |    17 -
 src/bin/pgaccess/lib/help/drop_trigger.hlp    |    17 -
 src/bin/pgaccess/lib/help/drop_type.hlp       |    20 -
 src/bin/pgaccess/lib/help/drop_user.hlp       |    19 -
 src/bin/pgaccess/lib/help/drop_view.hlp       |    17 -
 src/bin/pgaccess/lib/help/explain.hlp         |    23 -
 src/bin/pgaccess/lib/help/fetch.hlp           |    62 -
 src/bin/pgaccess/lib/help/form_design.hlp     |    27 -
 src/bin/pgaccess/lib/help/forms.hlp           |    19 -
 src/bin/pgaccess/lib/help/functions.hlp       |    32 -
 src/bin/pgaccess/lib/help/geomfunc.hlp        |    73 -
 src/bin/pgaccess/lib/help/grant.hlp           |    52 -
 src/bin/pgaccess/lib/help/history.hlp         |    43 -
 src/bin/pgaccess/lib/help/index.hlp           |    19 -
 src/bin/pgaccess/lib/help/inheritance.hlp     |    49 -
 src/bin/pgaccess/lib/help/insert.hlp          |    54 -
 src/bin/pgaccess/lib/help/ipv4func.hlp        |    28 -
 src/bin/pgaccess/lib/help/isolation.hlp       |    24 -
 src/bin/pgaccess/lib/help/keywords.hlp        |    85 -
 src/bin/pgaccess/lib/help/listen.hlp          |    34 -
 src/bin/pgaccess/lib/help/load.hlp            |    27 -
 src/bin/pgaccess/lib/help/lock.hlp            |    49 -
 src/bin/pgaccess/lib/help/mathfunc.hlp        |    34 -
 src/bin/pgaccess/lib/help/move.hlp            |    43 -
 src/bin/pgaccess/lib/help/mvcc.hlp            |    13 -
 src/bin/pgaccess/lib/help/new_query.hlp       |    22 -
 src/bin/pgaccess/lib/help/new_table.hlp       |    31 -
 src/bin/pgaccess/lib/help/notify.hlp          |    57 -
 src/bin/pgaccess/lib/help/open_query.hlp      |    17 -
 src/bin/pgaccess/lib/help/open_table.hlp      |    19 -
 src/bin/pgaccess/lib/help/pgfunctions.hlp     |    13 -
 src/bin/pgaccess/lib/help/postgresql.hlp      |    13 -
 src/bin/pgaccess/lib/help/queries.hlp         |     8 -
 src/bin/pgaccess/lib/help/reports.hlp         |    10 -
 src/bin/pgaccess/lib/help/reset.hlp           |    21 -
 src/bin/pgaccess/lib/help/revoke.hlp          |    49 -
 src/bin/pgaccess/lib/help/rollback.hlp        |    17 -
 src/bin/pgaccess/lib/help/schema.hlp          |     2 -
 src/bin/pgaccess/lib/help/scripts.hlp         |     2 -
 src/bin/pgaccess/lib/help/select.hlp          |   136 -
 src/bin/pgaccess/lib/help/select_into.hlp     |    17 -
 src/bin/pgaccess/lib/help/sequences.hlp       |    15 -
 src/bin/pgaccess/lib/help/set.hlp             |    54 -
 src/bin/pgaccess/lib/help/show.hlp            |    23 -
 src/bin/pgaccess/lib/help/sql_guide.hlp       |    62 -
 src/bin/pgaccess/lib/help/sqlfunc.hlp         |    21 -
 src/bin/pgaccess/lib/help/stringfunc.hlp      |   102 -
 src/bin/pgaccess/lib/help/tables.hlp          |     8 -
 src/bin/pgaccess/lib/help/unlisten.hlp        |    32 -
 src/bin/pgaccess/lib/help/update.hlp          |    40 -
 src/bin/pgaccess/lib/help/users.hlp           |     2 -
 src/bin/pgaccess/lib/help/vacuum.hlp          |    26 -
 .../lib/help/view_table_structure.hlp         |    15 -
 src/bin/pgaccess/lib/help/views.hlp           |     2 -
 src/bin/pgaccess/lib/help/visual_designer.hlp |    57 -
 src/bin/pgaccess/lib/help/y2k.hlp             |    16 -
 src/bin/pgaccess/lib/languages/chinese_big5   |   587 -
 src/bin/pgaccess/lib/languages/chinese_gb     |   533 -
 src/bin/pgaccess/lib/languages/czech          |   534 -
 src/bin/pgaccess/lib/languages/deutsch        |   535 -
 src/bin/pgaccess/lib/languages/euskara        |   532 -
 src/bin/pgaccess/lib/languages/francais       |   585 -
 src/bin/pgaccess/lib/languages/italiano       |   539 -
 src/bin/pgaccess/lib/languages/japanese       |   548 -
 src/bin/pgaccess/lib/languages/magyar         |   524 -
 src/bin/pgaccess/lib/languages/nederlands     |   534 -
 src/bin/pgaccess/lib/languages/portugues      |   539 -
 src/bin/pgaccess/lib/languages/romana         |   526 -
 src/bin/pgaccess/lib/languages/russian.koi8r  |   535 -
 src/bin/pgaccess/lib/languages/russian_win    |   535 -
 src/bin/pgaccess/lib/languages/spanish        |   568 -
 src/bin/pgaccess/lib/mainlib.tcl              |  1026 -
 src/bin/pgaccess/lib/preferences.tcl          |   274 -
 src/bin/pgaccess/lib/queries.tcl              |   228 -
 src/bin/pgaccess/lib/reports.tcl              |   599 -
 src/bin/pgaccess/lib/schema.tcl               |   594 -
 src/bin/pgaccess/lib/scripts.tcl              |    88 -
 src/bin/pgaccess/lib/sequences.tcl            |   159 -
 src/bin/pgaccess/lib/tables.tcl               |  2245 -
 src/bin/pgaccess/lib/users.tcl                |   155 -
 src/bin/pgaccess/lib/views.tcl                |    45 -
 src/bin/pgaccess/lib/visualqb.tcl             |   776 -
 src/bin/pgaccess/main.tcl                     |   268 -
 src/bin/pgaccess/pgaccess.sh                  |    13 -
 src/bin/pgtclsh/Makefile                      |    58 -
 src/bin/pgtclsh/README                        |    10 -
 src/bin/pgtclsh/pgtclAppInit.c                |   112 -
 src/bin/pgtclsh/pgtclUtils.tcl                |    17 -
 src/bin/pgtclsh/pgtkAppInit.c                 |   114 -
 src/bin/pgtclsh/updateStats.tcl               |    71 -
 src/bin/psql/.cvsignore                       |     1 -
 src/bin/psql/Makefile                         |    98 -
 src/bin/psql/command.c                        |  1918 -
 src/bin/psql/command.h                        |    45 -
 src/bin/psql/common.c                         |   584 -
 src/bin/psql/common.h                         |    40 -
 src/bin/psql/copy.c                           |   490 -
 src/bin/psql/copy.h                           |    23 -
 src/bin/psql/create_help.pl                   |   133 -
 src/bin/psql/cs.po                            |  1126 -
 src/bin/psql/de.po                            |  1157 -
 src/bin/psql/describe.c                       |  1138 -
 src/bin/psql/describe.h                       |    46 -
 src/bin/psql/fr.po                            |  1142 -
 src/bin/psql/help.c                           |   343 -
 src/bin/psql/help.h                           |    19 -
 src/bin/psql/input.c                          |   218 -
 src/bin/psql/input.h                          |    37 -
 src/bin/psql/large_obj.c                      |   376 -
 src/bin/psql/large_obj.h                      |    16 -
 src/bin/psql/mainloop.c                       |   583 -
 src/bin/psql/mainloop.h                       |    21 -
 src/bin/psql/mbprint.c                        |   353 -
 src/bin/psql/mbprint.h                        |    17 -
 src/bin/psql/nls.mk                           |     6 -
 src/bin/psql/print.c                          |  1273 -
 src/bin/psql/print.h                          |    78 -
 src/bin/psql/prompt.c                         |   286 -
 src/bin/psql/prompt.h                         |    24 -
 src/bin/psql/ru.po                            |  1171 -
 src/bin/psql/settings.h                       |    74 -
 src/bin/psql/startup.c                        |   691 -
 src/bin/psql/stringutils.c                    |   198 -
 src/bin/psql/stringutils.h                    |    21 -
 src/bin/psql/sv.po                            |  1129 -
 src/bin/psql/tab-complete.c                   |  1119 -
 src/bin/psql/tab-complete.h                   |    15 -
 src/bin/psql/variables.c                      |   163 -
 src/bin/psql/variables.h                      |    39 -
 src/bin/psql/win32.mak                        |    98 -
 src/bin/psql/zh_CN.po                         |  1127 -
 src/bin/psql/zh_TW.po                         |  1119 -
 src/bin/scripts/Makefile                      |    38 -
 src/bin/scripts/createdb                      |   207 -
 src/bin/scripts/createlang.sh                 |   303 -
 src/bin/scripts/createuser                    |   262 -
 src/bin/scripts/dropdb                        |   147 -
 src/bin/scripts/droplang                      |   267 -
 src/bin/scripts/dropuser                      |   158 -
 src/bin/scripts/vacuumdb                      |   177 -
 src/corba/CosQuery.idl                        |    89 -
 src/corba/CosQueryCollection.idl              |    83 -
 src/corba/pgsql.idl                           |    96 -
 src/corba/pgsql_int.idl                       |     7 -
 src/corba/server.cc                           |    59 -
 src/data/charset.conf                         |    40 -
 src/data/isocz-wincz.tab                      |    12 -
 src/data/koi-alt.tab                          |    85 -
 src/data/koi-iso.tab                          |    75 -
 src/data/koi-koi.tab                          |     2 -
 src/data/koi-mac.tab                          |   130 -
 src/data/koi-win.tab                          |    85 -
 src/include/Makefile                          |    90 -
 src/include/access/attnum.h                   |    63 -
 src/include/access/clog.h                     |    50 -
 src/include/access/genam.h                    |    99 -
 src/include/access/gist.h                     |   188 -
 src/include/access/gistscan.h                 |    27 -
 src/include/access/hash.h                     |   330 -
 src/include/access/heapam.h                   |   205 -
 src/include/access/hio.h                      |    24 -
 src/include/access/htup.h                     |   350 -
 src/include/access/ibit.h                     |    32 -
 src/include/access/iqual.h                    |    31 -
 src/include/access/istrat.h                   |    61 -
 src/include/access/itup.h                     |   143 -
 src/include/access/nbtree.h                   |   402 -
 src/include/access/printtup.h                 |    33 -
 src/include/access/relscan.h                  |    99 -
 src/include/access/rmgr.h                     |    28 -
 src/include/access/rtree.h                    |   138 -
 src/include/access/rtscan.h                   |    23 -
 src/include/access/sdir.h                     |    58 -
 src/include/access/skey.h                     |    51 -
 src/include/access/strat.h                    |    90 -
 src/include/access/transam.h                  |   121 -
 src/include/access/tupdesc.h                  |    78 -
 src/include/access/tupmacs.h                  |   183 -
 src/include/access/tuptoaster.h               |   129 -
 src/include/access/valid.h                    |   122 -
 src/include/access/xact.h                     |   132 -
 src/include/access/xlog.h                     |   222 -
 src/include/access/xlogdefs.h                 |    59 -
 src/include/access/xlogutils.h                |    29 -
 src/include/bootstrap/bootstrap.h             |    64 -
 src/include/c.h                               |   669 -
 src/include/catalog/catalog.h                 |    36 -
 src/include/catalog/catname.h                 |    45 -
 src/include/catalog/catversion.h              |    58 -
 src/include/catalog/duplicate_oids            |    47 -
 src/include/catalog/heap.h                    |    69 -
 src/include/catalog/index.h                   |    74 -
 src/include/catalog/indexing.h                |   197 -
 src/include/catalog/namespace.h               |    90 -
 src/include/catalog/pg_aggregate.h            |   163 -
 src/include/catalog/pg_am.h                   |   111 -
 src/include/catalog/pg_amop.h                 |   429 -
 src/include/catalog/pg_amproc.h               |   133 -
 src/include/catalog/pg_attrdef.h              |    55 -
 src/include/catalog/pg_attribute.h            |   499 -
 src/include/catalog/pg_class.h                |   173 -
 src/include/catalog/pg_control.h              |   122 -
 src/include/catalog/pg_database.h             |    86 -
 src/include/catalog/pg_description.h          |    87 -
 src/include/catalog/pg_group.h                |    44 -
 src/include/catalog/pg_index.h                |    75 -
 src/include/catalog/pg_inherits.h             |    57 -
 src/include/catalog/pg_language.h             |    80 -
 src/include/catalog/pg_largeobject.h          |    62 -
 src/include/catalog/pg_listener.h             |    63 -
 src/include/catalog/pg_namespace.h            |    85 -
 src/include/catalog/pg_opclass.h              |   144 -
 src/include/catalog/pg_operator.h             |   898 -
 src/include/catalog/pg_proc.h                 |  3020 -
 src/include/catalog/pg_relcheck.h             |    55 -
 src/include/catalog/pg_rewrite.h              |    70 -
 src/include/catalog/pg_shadow.h               |    79 -
 src/include/catalog/pg_statistic.h            |   209 -
 src/include/catalog/pg_trigger.h              |    96 -
 src/include/catalog/pg_type.h                 |   550 -
 src/include/catalog/pg_version.h              |    64 -
 src/include/catalog/unused_oids               |    49 -
 src/include/commands/async.h                  |    39 -
 src/include/commands/cluster.h                |    28 -
 src/include/commands/comment.h                |    34 -
 src/include/commands/copy.h                   |    24 -
 src/include/commands/dbcommands.h             |    23 -
 src/include/commands/defrem.h                 |    68 -
 src/include/commands/explain.h                |    21 -
 src/include/commands/lockcmds.h               |    24 -
 src/include/commands/portalcmds.h             |    39 -
 src/include/commands/proclang.h               |    17 -
 src/include/commands/schemacmds.h             |    22 -
 src/include/commands/sequence.h               |    92 -
 src/include/commands/tablecmds.h              |    63 -
 src/include/commands/trigger.h                |   184 -
 src/include/commands/user.h                   |    34 -
 src/include/commands/vacuum.h                 |    60 -
 src/include/commands/variable.h               |    32 -
 src/include/commands/version.h                |    17 -
 src/include/commands/view.h                   |    22 -
 src/include/executor/execdebug.h              |   301 -
 src/include/executor/execdefs.h               |    37 -
 src/include/executor/execdesc.h               |    45 -
 src/include/executor/executor.h               |   182 -
 src/include/executor/functions.h              |    21 -
 src/include/executor/hashjoin.h               |    96 -
 src/include/executor/instrument.h             |    39 -
 src/include/executor/nodeAgg.h                |    28 -
 src/include/executor/nodeAppend.h             |    25 -
 src/include/executor/nodeFunctionscan.h       |    27 -
 src/include/executor/nodeGroup.h              |    36 -
 src/include/executor/nodeHash.h               |    40 -
 src/include/executor/nodeHashjoin.h           |    26 -
 src/include/executor/nodeIndexscan.h          |    28 -
 src/include/executor/nodeLimit.h              |    25 -
 src/include/executor/nodeMaterial.h           |    27 -
 src/include/executor/nodeMergejoin.h          |    25 -
 src/include/executor/nodeNestloop.h           |    26 -
 src/include/executor/nodeResult.h             |    25 -
 src/include/executor/nodeSeqscan.h            |    27 -
 src/include/executor/nodeSetOp.h              |    25 -
 src/include/executor/nodeSort.h               |    27 -
 src/include/executor/nodeSubplan.h            |    19 -
 src/include/executor/nodeSubqueryscan.h       |    25 -
 src/include/executor/nodeTidscan.h            |    27 -
 src/include/executor/nodeUnique.h             |    25 -
 src/include/executor/spi.h                    |   118 -
 src/include/executor/spi_priv.h               |    38 -
 src/include/executor/tuptable.h               |    84 -
 src/include/fmgr.h                            |   402 -
 src/include/lib/dllist.h                      |    85 -
 src/include/lib/lispsort.h                    |    17 -
 src/include/lib/stringinfo.h                  |   114 -
 src/include/libpq/auth.h                      |    31 -
 src/include/libpq/be-fsstubs.h                |    50 -
 src/include/libpq/crypt.h                     |    33 -
 src/include/libpq/hba.h                       |    59 -
 src/include/libpq/libpq-be.h                  |    83 -
 src/include/libpq/libpq-fs.h                  |    24 -
 src/include/libpq/libpq.h                     |    63 -
 src/include/libpq/password.h                  |     6 -
 src/include/libpq/pqcomm.h                    |   183 -
 src/include/libpq/pqformat.h                  |    32 -
 src/include/libpq/pqsignal.h                  |    43 -
 src/include/mb/pg_wchar.h                     |   356 -
 src/include/miscadmin.h                       |   305 -
 src/include/nodes/execnodes.h                 |   807 -
 src/include/nodes/makefuncs.h                 |    61 -
 src/include/nodes/memnodes.h                  |    75 -
 src/include/nodes/nodeFuncs.h                 |    24 -
 src/include/nodes/nodes.h                     |   378 -
 src/include/nodes/params.h                    |   103 -
 src/include/nodes/parsenodes.h                |  1497 -
 src/include/nodes/pg_list.h                   |   153 -
 src/include/nodes/plannodes.h                 |   479 -
 src/include/nodes/primnodes.h                 |   563 -
 src/include/nodes/print.h                     |    38 -
 src/include/nodes/readfuncs.h                 |    31 -
 src/include/nodes/relation.h                  |   644 -
 src/include/optimizer/_deadcode/xfunc.h       |    83 -
 src/include/optimizer/clauses.h               |    78 -
 src/include/optimizer/cost.h                  |   101 -
 src/include/optimizer/geqo.h                  |    80 -
 src/include/optimizer/geqo_copy.h             |    29 -
 src/include/optimizer/geqo_gene.h             |    45 -
 src/include/optimizer/geqo_misc.h             |    36 -
 src/include/optimizer/geqo_mutation.h         |    29 -
 src/include/optimizer/geqo_pool.h             |    41 -
 src/include/optimizer/geqo_random.h           |    38 -
 src/include/optimizer/geqo_recombination.h    |    80 -
 src/include/optimizer/geqo_selection.h        |    30 -
 src/include/optimizer/joininfo.h              |    21 -
 src/include/optimizer/pathnode.h              |    82 -
 src/include/optimizer/paths.h                 |   134 -
 src/include/optimizer/plancat.h               |    40 -
 src/include/optimizer/planmain.h              |    65 -
 src/include/optimizer/planner.h               |    27 -
 src/include/optimizer/prep.h                  |    46 -
 src/include/optimizer/restrictinfo.h          |    24 -
 src/include/optimizer/subselect.h             |    21 -
 src/include/optimizer/tlist.h                 |    36 -
 src/include/optimizer/var.h                   |    28 -
 src/include/parser/analyze.h                  |    26 -
 src/include/parser/gramparse.h                |    38 -
 src/include/parser/keywords.h                 |    25 -
 src/include/parser/parse_agg.h                |    21 -
 src/include/parser/parse_clause.h             |    34 -
 src/include/parser/parse_coerce.h             |    55 -
 src/include/parser/parse_expr.h               |    30 -
 src/include/parser/parse_func.h               |    63 -
 src/include/parser/parse_node.h               |    65 -
 src/include/parser/parse_oper.h               |    51 -
 src/include/parser/parse_relation.h           |    65 -
 src/include/parser/parse_target.h             |    32 -
 src/include/parser/parse_type.h               |    45 -
 src/include/parser/parser.h                   |    22 -
 src/include/parser/parsetree.h                |    62 -
 src/include/parser/scansup.h                  |    20 -
 src/include/pg_config.h.in                    |   761 -
 src/include/pg_config.h.win32                 |    61 -
 src/include/pgstat.h                          |   452 -
 src/include/port/aix.h                        |     8 -
 src/include/port/beos.h                       |    86 -
 src/include/port/bsdi.h                       |    10 -
 src/include/port/darwin.h                     |    13 -
 src/include/port/dgux.h                       |    13 -
 src/include/port/freebsd.h                    |    37 -
 src/include/port/hpux.h                       |    19 -
 src/include/port/irix5.h                      |     3 -
 src/include/port/linux.h                      |    41 -
 src/include/port/netbsd.h                     |    48 -
 src/include/port/nextstep.h                   |    18 -
 src/include/port/openbsd.h                    |    48 -
 src/include/port/osf.h                        |     7 -
 src/include/port/qnx4.h                       |    34 -
 src/include/port/sco.h                        |    23 -
 src/include/port/solaris.h                    |    61 -
 src/include/port/sunos4.h                     |    19 -
 src/include/port/svr4.h                       |    13 -
 src/include/port/ultrix4.h                    |    71 -
 src/include/port/univel.h                     |    24 -
 src/include/port/unixware.h                   |    27 -
 src/include/port/win.h                        |    45 -
 src/include/port/win32.h                      |    29 -
 src/include/postgres.h                        |   612 -
 src/include/postgres_ext.h                    |    46 -
 src/include/postgres_fe.h                     |    23 -
 src/include/regex/cclass.h                    |    99 -
 src/include/regex/cname.h                     |   336 -
 src/include/regex/regex.h                     |   113 -
 src/include/regex/regex2.h                    |   197 -
 src/include/regex/utils.h                     |    64 -
 src/include/rewrite/prs2lock.h                |    46 -
 src/include/rewrite/rewriteDefine.h           |    24 -
 src/include/rewrite/rewriteHandler.h          |    22 -
 src/include/rewrite/rewriteManip.h            |    43 -
 src/include/rewrite/rewriteRemove.h           |    20 -
 src/include/rewrite/rewriteSupport.h          |    25 -
 src/include/rusagestub.h                      |    32 -
 src/include/storage/backendid.h               |    28 -
 src/include/storage/block.h                   |   121 -
 src/include/storage/buf.h                     |    39 -
 src/include/storage/buf_internals.h           |   184 -
 src/include/storage/buffile.h                 |    45 -
 src/include/storage/bufmgr.h                  |   187 -
 src/include/storage/bufpage.h                 |   321 -
 src/include/storage/fd.h                      |    82 -
 src/include/storage/freespace.h               |    51 -
 src/include/storage/ipc.h                     |    36 -
 src/include/storage/item.h                    |    19 -
 src/include/storage/itemid.h                  |    97 -
 src/include/storage/itempos.h                 |    45 -
 src/include/storage/itemptr.h                 |   146 -
 src/include/storage/large_object.h            |    79 -
 src/include/storage/lmgr.h                    |    65 -
 src/include/storage/lock.h                    |   255 -
 src/include/storage/lwlock.h                  |    71 -
 src/include/storage/off.h                     |    58 -
 src/include/storage/page.h                    |    25 -
 src/include/storage/pg_sema.h                 |    76 -
 src/include/storage/pg_shmem.h                |    44 -
 src/include/storage/pmsignal.h                |    39 -
 src/include/storage/pos.h                     |    65 -
 src/include/storage/proc.h                    |   117 -
 src/include/storage/relfilenode.h             |    22 -
 src/include/storage/s_lock.h                  |   521 -
 src/include/storage/shmem.h                   |    99 -
 src/include/storage/sinval.h                  |    92 -
 src/include/storage/sinvaladt.h               |   118 -
 src/include/storage/smgr.h                    |   111 -
 src/include/storage/spin.h                    |    77 -
 src/include/strdup.h                          |     8 -
 src/include/tcop/dest.h                       |   109 -
 src/include/tcop/fastpath.h                   |    18 -
 src/include/tcop/pquery.h                     |    28 -
 src/include/tcop/tcopdebug.h                  |    44 -
 src/include/tcop/tcopprot.h                   |    53 -
 src/include/tcop/utility.h                    |    22 -
 src/include/utils/acl.h                       |   213 -
 src/include/utils/array.h                     |   130 -
 src/include/utils/ascii.h                     |    27 -
 src/include/utils/bit.h                       |    38 -
 src/include/utils/builtins.h                  |   636 -
 src/include/utils/cash.h                      |    49 -
 src/include/utils/catcache.h                  |   186 -
 src/include/utils/date.h                      |   142 -
 src/include/utils/datetime.h                  |   296 -
 src/include/utils/datum.h                     |    49 -
 src/include/utils/dynahash.h                  |    19 -
 src/include/utils/dynamic_loader.h            |    25 -
 src/include/utils/elog.h                      |    68 -
 src/include/utils/exc.h                       |    88 -
 src/include/utils/excid.h                     |    31 -
 src/include/utils/fcache.h                    |    70 -
 src/include/utils/fmgrtab.h                   |    40 -
 src/include/utils/formatting.h                |    36 -
 src/include/utils/geo_decls.h                 |   401 -
 src/include/utils/guc.h                       |   117 -
 src/include/utils/hsearch.h                   |   167 -
 src/include/utils/inet.h                      |    70 -
 src/include/utils/int8.h                      |   112 -
 src/include/utils/inval.h                     |    40 -
 src/include/utils/logtape.h                   |    42 -
 src/include/utils/lsyscache.h                 |    70 -
 src/include/utils/memutils.h                  |   119 -
 src/include/utils/nabstime.h                  |   163 -
 src/include/utils/numeric.h                   |    85 -
 src/include/utils/palloc.h                    |    66 -
 src/include/utils/pg_crc.h                    |   114 -
 src/include/utils/pg_locale.h                 |    39 -
 src/include/utils/pg_lzcompress.h             |   231 -
 src/include/utils/portal.h                    |    70 -
 src/include/utils/ps_status.h                 |    24 -
 src/include/utils/rel.h                       |   261 -
 src/include/utils/relcache.h                  |    82 -
 src/include/utils/selfuncs.h                  |    81 -
 src/include/utils/sets.h                      |    27 -
 src/include/utils/syscache.h                  |    86 -
 src/include/utils/timestamp.h                 |   232 -
 src/include/utils/tqual.h                     |   120 -
 src/include/utils/tuplesort.h                 |   105 -
 src/include/utils/tuplestore.h                |    60 -
 src/include/utils/varbit.h                    |    93 -
 src/interfaces/Makefile                       |    51 -
 src/interfaces/cli/example1.c                 |   173 -
 src/interfaces/cli/example2.c                 |   270 -
 src/interfaces/cli/sqlcli.h                   |   719 -
 src/interfaces/jdbc/CHANGELOG                 |   467 -
 src/interfaces/jdbc/Implementation            |   199 -
 src/interfaces/jdbc/Makefile                  |    42 -
 src/interfaces/jdbc/README                    |   277 -
 src/interfaces/jdbc/build.xml                 |   245 -
 src/interfaces/jdbc/example/ImageViewer.java  |   517 -
 src/interfaces/jdbc/example/Unicode.java      |   278 -
 src/interfaces/jdbc/example/basic.java        |   219 -
 src/interfaces/jdbc/example/blobtest.java     |   255 -
 .../jdbc/example/corba/StockClient.java       |   348 -
 .../jdbc/example/corba/StockDB.java           |   134 -
 .../example/corba/StockDispenserImpl.java     |    92 -
 .../jdbc/example/corba/StockItemImpl.java     |   208 -
 .../jdbc/example/corba/StockServer.java       |    58 -
 src/interfaces/jdbc/example/corba/readme      |    34 -
 src/interfaces/jdbc/example/corba/stock.idl   |    40 -
 src/interfaces/jdbc/example/corba/stock.sql   |    27 -
 src/interfaces/jdbc/example/datestyle.java    |   187 -
 src/interfaces/jdbc/example/metadata.java     |   297 -
 src/interfaces/jdbc/example/psql.java         |   235 -
 src/interfaces/jdbc/example/threadsafe.java   |   403 -
 src/interfaces/jdbc/jdbc.jpx                  |    31 -
 .../jdbc/org/postgresql/Connection.java       |  1246 -
 .../jdbc/org/postgresql/Driver.java.in        |   492 -
 src/interfaces/jdbc/org/postgresql/Field.java |   107 -
 .../jdbc/org/postgresql/PG_Stream.java        |   374 -
 .../org/postgresql/PostgresqlDataSource.java  |   605 -
 .../jdbc/org/postgresql/ResultSet.java        |   264 -
 .../jdbc/org/postgresql/Statement.java        |   331 -
 .../org/postgresql/core/BytePoolDim1.java     |   100 -
 .../org/postgresql/core/BytePoolDim2.java     |    69 -
 .../jdbc/org/postgresql/core/Encoding.java    |   226 -
 .../jdbc/org/postgresql/core/MemoryPool.java  |    19 -
 .../jdbc/org/postgresql/core/ObjectPool.java  |    49 -
 .../org/postgresql/core/QueryExecutor.java    |   211 -
 .../org/postgresql/core/SimpleObjectPool.java |   106 -
 .../org/postgresql/core/StartupPacket.java    |    43 -
 .../jdbc/org/postgresql/errors.properties     |    85 -
 .../jdbc/org/postgresql/errors_de.properties  |    78 -
 .../jdbc/org/postgresql/errors_fr.properties  |     6 -
 .../jdbc/org/postgresql/errors_it.properties  |    76 -
 .../jdbc/org/postgresql/errors_nl.properties  |    66 -
 .../org/postgresql/errors_zh_TW.properties    |    79 -
 .../org/postgresql/fastpath/Fastpath.java     |   291 -
 .../org/postgresql/fastpath/FastpathArg.java  |   109 -
 .../jdbc/org/postgresql/geometric/PGbox.java  |   106 -
 .../org/postgresql/geometric/PGcircle.java    |   112 -
 .../jdbc/org/postgresql/geometric/PGline.java |   104 -
 .../jdbc/org/postgresql/geometric/PGlseg.java |   101 -
 .../jdbc/org/postgresql/geometric/PGpath.java |   151 -
 .../org/postgresql/geometric/PGpoint.java     |   171 -
 .../org/postgresql/geometric/PGpolygon.java   |   108 -
 .../postgresql/jdbc1/CallableStatement.java   |   322 -
 .../jdbc/org/postgresql/jdbc1/Connection.java |   214 -
 .../postgresql/jdbc1/DatabaseMetaData.java    |  2838 -
 .../postgresql/jdbc1/PreparedStatement.java   |   799 -
 .../jdbc/org/postgresql/jdbc1/ResultSet.java  |  1006 -
 .../postgresql/jdbc1/ResultSetMetaData.java   |   476 -
 .../jdbc/org/postgresql/jdbc1/Statement.java  |   144 -
 .../jdbc/org/postgresql/jdbc2/Array.java      |   351 -
 .../postgresql/jdbc2/CallableStatement.java   |   376 -
 .../jdbc/org/postgresql/jdbc2/Connection.java |   333 -
 .../postgresql/jdbc2/DatabaseMetaData.java    |  3247 -
 .../jdbc2/PBatchUpdateException.java          |    49 -
 .../postgresql/jdbc2/PreparedStatement.java   |  1065 -
 .../jdbc/org/postgresql/jdbc2/ResultSet.java  |  1777 -
 .../postgresql/jdbc2/ResultSetMetaData.java   |   538 -
 .../jdbc/org/postgresql/jdbc2/Statement.java  |   381 -
 .../postgresql/jdbc2/UpdateableResultSet.java |  1391 -
 .../largeobject/BlobInputStream.java          |   187 -
 .../largeobject/BlobOutputStream.java         |   119 -
 .../postgresql/largeobject/LargeObject.java   |   320 -
 .../largeobject/LargeObjectManager.java       |   206 -
 .../org/postgresql/largeobject/PGblob.java    |    72 -
 .../org/postgresql/largeobject/PGclob.java    |    77 -
 .../jdbc/org/postgresql/test/JDBC2Tests.java  |   234 -
 .../jdbc/org/postgresql/test/README           |   323 -
 .../org/postgresql/test/jdbc2/ANTTest.java    |    29 -
 .../test/jdbc2/BatchExecuteTest.java          |   199 -
 .../org/postgresql/test/jdbc2/BlobTest.java   |   201 -
 .../postgresql/test/jdbc2/ConnectionTest.java |   340 -
 .../test/jdbc2/DatabaseMetaDataTest.java      |   408 -
 .../org/postgresql/test/jdbc2/DateTest.java   |   142 -
 .../org/postgresql/test/jdbc2/DriverTest.java |    84 -
 .../postgresql/test/jdbc2/EncodingTest.java   |    62 -
 .../postgresql/test/jdbc2/JBuilderTest.java   |    70 -
 .../org/postgresql/test/jdbc2/MiscTest.java   |   102 -
 .../postgresql/test/jdbc2/ResultSetTest.java  |    86 -
 .../org/postgresql/test/jdbc2/TimeTest.java   |   122 -
 .../postgresql/test/jdbc2/TimestampTest.java  |   148 -
 .../test/jdbc2/UpdateableResultTest.java      |   135 -
 .../jdbc/org/postgresql/util/MD5Digest.java   |    80 -
 .../postgresql/util/MessageTranslator.java    |    79 -
 .../jdbc/org/postgresql/util/PGbytea.java     |   102 -
 .../jdbc/org/postgresql/util/PGmoney.java     |   115 -
 .../jdbc/org/postgresql/util/PGobject.java    |   101 -
 .../jdbc/org/postgresql/util/PGtokenizer.java |   204 -
 .../org/postgresql/util/PSQLException.java    |   116 -
 .../jdbc/org/postgresql/util/Serialize.java   |   623 -
 .../jdbc/org/postgresql/util/UnixCrypt.java   |   684 -
 .../org/postgresql/xa/ClientConnection.java   |   567 -
 .../org/postgresql/xa/TwoPhaseConnection.java |   116 -
 .../jdbc/org/postgresql/xa/TxConnection.java  |   129 -
 .../org/postgresql/xa/XAConnectionImpl.java   |   956 -
 .../org/postgresql/xa/XADataSourceImpl.java   |   489 -
 src/interfaces/jdbc/utils/CheckVersion.java   |    74 -
 src/interfaces/jdbc/utils/buildDriver         |    47 -
 src/interfaces/jdbc/utils/changelog.pl        |    23 -
 src/interfaces/libpgeasy/Makefile             |    55 -
 src/interfaces/libpgeasy/README               |    10 -
 src/interfaces/libpgeasy/examples/Makefile    |    22 -
 src/interfaces/libpgeasy/examples/pginsert.c  |    98 -
 .../libpgeasy/examples/pgmultiresult.c        |    68 -
 .../libpgeasy/examples/pgnulltest.c           |   135 -
 .../libpgeasy/examples/pgwordcount.c          |    73 -
 src/interfaces/libpgeasy/halt.c               |    56 -
 src/interfaces/libpgeasy/halt.h               |     6 -
 src/interfaces/libpgeasy/libpgeasy.c          |   344 -
 src/interfaces/libpgeasy/libpgeasy.h          |    18 -
 src/interfaces/libpgtcl/Makefile              |    59 -
 src/interfaces/libpgtcl/README                |    38 -
 src/interfaces/libpgtcl/libpgtcl.def          |     8 -
 src/interfaces/libpgtcl/libpgtcl.h            |    24 -
 src/interfaces/libpgtcl/pgtcl.c               |   165 -
 src/interfaces/libpgtcl/pgtclCmds.c           |  1971 -
 src/interfaces/libpgtcl/pgtclCmds.h           |   132 -
 src/interfaces/libpgtcl/pgtclId.c             |   747 -
 src/interfaces/libpgtcl/pgtclId.h             |    62 -
 src/interfaces/libpgtcl/win32.mak             |   201 -
 src/interfaces/libpq++/CHANGES                |    32 -
 src/interfaces/libpq++/Makefile               |    67 -
 src/interfaces/libpq++/README                 |    25 -
 src/interfaces/libpq++/TODO                   |     4 -
 src/interfaces/libpq++/examples/Makefile      |    38 -
 src/interfaces/libpq++/examples/testlibpq0.cc |    52 -
 src/interfaces/libpq++/examples/testlibpq1.cc |    68 -
 src/interfaces/libpq++/examples/testlibpq2.cc |    57 -
 .../libpq++/examples/testlibpq2.sql           |     5 -
 src/interfaces/libpq++/examples/testlibpq3.cc |    57 -
 .../libpq++/examples/testlibpq3.sql           |     6 -
 src/interfaces/libpq++/examples/testlibpq4.cc |    59 -
 .../libpq++/examples/testlibpq4.sql           |     5 -
 src/interfaces/libpq++/examples/testlibpq5.cc |   103 -
 .../libpq++/examples/testlibpq5.sql           |     6 -
 src/interfaces/libpq++/examples/testlibpq6.cc |    60 -
 src/interfaces/libpq++/examples/testlo.cc     |    50 -
 src/interfaces/libpq++/libpq++.h              |    36 -
 src/interfaces/libpq++/libpq++dll.rc          |    34 -
 src/interfaces/libpq++/pgconnection.cc        |   158 -
 src/interfaces/libpq++/pgconnection.h         |   103 -
 src/interfaces/libpq++/pgcursordb.cc          |    90 -
 src/interfaces/libpq++/pgcursordb.h           |    83 -
 src/interfaces/libpq++/pgdatabase.cc          |   181 -
 src/interfaces/libpq++/pgdatabase.h           |    85 -
 src/interfaces/libpq++/pglobject.cc           |   174 -
 src/interfaces/libpq++/pglobject.h            |    73 -
 src/interfaces/libpq++/pgtransdb.cc           |    53 -
 src/interfaces/libpq++/pgtransdb.h            |    60 -
 src/interfaces/libpq++/win32.mak              |   126 -
 src/interfaces/libpq/Makefile                 |    88 -
 src/interfaces/libpq/README                   |     1 -
 src/interfaces/libpq/cs.po                    |   418 -
 src/interfaces/libpq/de.po                    |   431 -
 src/interfaces/libpq/fe-auth.c                |   735 -
 src/interfaces/libpq/fe-auth.h                |    45 -
 src/interfaces/libpq/fe-connect.c             |  2816 -
 src/interfaces/libpq/fe-exec.c                |  2451 -
 src/interfaces/libpq/fe-lobj.c                |   661 -
 src/interfaces/libpq/fe-misc.c                |   890 -
 src/interfaces/libpq/fe-print.c               |   750 -
 src/interfaces/libpq/fe-secure.c              |   899 -
 src/interfaces/libpq/fr.po                    |   416 -
 src/interfaces/libpq/libpq-fe.h               |   381 -
 src/interfaces/libpq/libpq-int.h              |   381 -
 src/interfaces/libpq/libpq.rc                 |    31 -
 src/interfaces/libpq/libpqdll.c               |    30 -
 src/interfaces/libpq/libpqdll.def             |    92 -
 src/interfaces/libpq/nls.mk                   |     5 -
 src/interfaces/libpq/pqexpbuffer.c            |   307 -
 src/interfaces/libpq/pqexpbuffer.h            |   164 -
 src/interfaces/libpq/pqsignal.c               |    43 -
 src/interfaces/libpq/pqsignal.h               |    27 -
 src/interfaces/libpq/ru.po                    |   432 -
 src/interfaces/libpq/sv.po                    |   413 -
 src/interfaces/libpq/win32.c                  |   182 -
 src/interfaces/libpq/win32.h                  |    36 -
 src/interfaces/libpq/win32.mak                |   199 -
 src/interfaces/libpq/zh_CN.po                 |   414 -
 src/interfaces/libpq/zh_TW.po                 |   414 -
 src/interfaces/odbc/GNUmakefile               |    72 -
 src/interfaces/odbc/bind.c                    |   638 -
 src/interfaces/odbc/bind.h                    |    62 -
 src/interfaces/odbc/columninfo.c              |   191 -
 src/interfaces/odbc/columninfo.h              |    42 -
 src/interfaces/odbc/connection.c              |  2146 -
 src/interfaces/odbc/connection.h              |   359 -
 src/interfaces/odbc/convert.c                 |  3536 -
 src/interfaces/odbc/convert.h                 |    56 -
 src/interfaces/odbc/descriptor.h              |   104 -
 src/interfaces/odbc/dlg_specific.c            |   972 -
 src/interfaces/odbc/dlg_specific.h            |   200 -
 src/interfaces/odbc/dlg_wingui.c              |   523 -
 src/interfaces/odbc/drvconn.c                 |   435 -
 src/interfaces/odbc/environ.c                 |   661 -
 src/interfaces/odbc/environ.h                 |    38 -
 src/interfaces/odbc/execute.c                 |  1090 -
 src/interfaces/odbc/gpps.c                    |   454 -
 src/interfaces/odbc/gpps.h                    |    48 -
 src/interfaces/odbc/info.c                    |  4509 --
 src/interfaces/odbc/info30.c                  |   396 -
 src/interfaces/odbc/iodbc.h                   |    68 -
 src/interfaces/odbc/isql.h                    |   246 -
 src/interfaces/odbc/isqlext.h                 |  1560 -
 src/interfaces/odbc/license.txt               |   962 -
 src/interfaces/odbc/lobj.c                    |   186 -
 src/interfaces/odbc/lobj.h                    |    47 -
 src/interfaces/odbc/md5.c                     |   351 -
 src/interfaces/odbc/md5.h                     |    49 -
 src/interfaces/odbc/misc.c                    |   329 -
 src/interfaces/odbc/misc.h                    |   107 -
 src/interfaces/odbc/multibyte.c               |   433 -
 src/interfaces/odbc/multibyte.h               |    89 -
 src/interfaces/odbc/notice.txt                |    35 -
 src/interfaces/odbc/odbc.sql                  |   228 -
 src/interfaces/odbc/odbcapi.c                 |   716 -
 src/interfaces/odbc/odbcapi25w.c              |    81 -
 src/interfaces/odbc/odbcapi30.c               |   550 -
 src/interfaces/odbc/odbcapi30w.c              |   282 -
 src/interfaces/odbc/odbcapiw.c                |   626 -
 src/interfaces/odbc/odbcinst.ini              |     3 -
 src/interfaces/odbc/options.c                 |   728 -
 src/interfaces/odbc/parse.c                   |  1224 -
 src/interfaces/odbc/pgapi30.c                 |  1656 -
 src/interfaces/odbc/pgapifunc.h               |   294 -
 src/interfaces/odbc/pgtypes.c                 |  1475 -
 src/interfaces/odbc/pgtypes.h                 |   106 -
 src/interfaces/odbc/psqlodbc.c                |   132 -
 src/interfaces/odbc/psqlodbc.h                |   274 -
 src/interfaces/odbc/psqlodbc.rc               |   506 -
 src/interfaces/odbc/psqlodbc.reg              |    16 -
 src/interfaces/odbc/psqlodbc30.reg            |    16 -
 src/interfaces/odbc/psqlodbc30w.reg           |    16 -
 src/interfaces/odbc/psqlodbc_api30.def        |    82 -
 src/interfaces/odbc/psqlodbc_api30w.def       |   107 -
 src/interfaces/odbc/psqlodbc_apiw.def         |    84 -
 src/interfaces/odbc/psqlodbc_win32.def        |    60 -
 src/interfaces/odbc/qresult.c                 |   830 -
 src/interfaces/odbc/qresult.h                 |   146 -
 src/interfaces/odbc/readme.txt                |    84 -
 src/interfaces/odbc/resource.h                |    80 -
 src/interfaces/odbc/results.c                 |  2999 -
 src/interfaces/odbc/setup.c                   |   407 -
 src/interfaces/odbc/setup.rul                 |   495 -
 src/interfaces/odbc/socket.c                  |   354 -
 src/interfaces/odbc/socket.h                  |    95 -
 src/interfaces/odbc/statement.c               |  1194 -
 src/interfaces/odbc/statement.h               |   247 -
 src/interfaces/odbc/tuple.c                   |    66 -
 src/interfaces/odbc/tuple.h                   |    72 -
 src/interfaces/odbc/tuplelist.c               |   216 -
 src/interfaces/odbc/tuplelist.h               |    35 -
 src/interfaces/odbc/version.h                 |    16 -
 src/interfaces/odbc/win32.mak                 |   511 -
 src/interfaces/odbc/win32_30.mak              |   537 -
 src/interfaces/odbc/win32_30w.mak             |   520 -
 src/interfaces/odbc/win32w.mak                |   478 -
 src/interfaces/odbc/win_md5.c                 |    15 -
 src/interfaces/odbc/win_setup.h               |    27 -
 src/interfaces/odbc/win_unicode.c             |   142 -
 src/interfaces/perl5/Changes                  |   126 -
 src/interfaces/perl5/GNUmakefile              |    91 -
 src/interfaces/perl5/MANIFEST                 |    12 -
 src/interfaces/perl5/Makefile.PL              |   107 -
 src/interfaces/perl5/Pg.pm                    |   656 -
 src/interfaces/perl5/Pg.xs                    |  1320 -
 src/interfaces/perl5/README                   |   137 -
 src/interfaces/perl5/examples/ApachePg.pl     |    55 -
 .../perl5/examples/example.newstyle           |   274 -
 .../perl5/examples/example.oldstyle           |   294 -
 src/interfaces/perl5/ppport.h                 |   289 -
 src/interfaces/perl5/test.pl                  |   275 -
 src/interfaces/perl5/typemap                  |    18 -
 src/interfaces/python/Announce                |   158 -
 src/interfaces/python/ChangeLog               |   125 -
 src/interfaces/python/GNUmakefile             |    59 -
 src/interfaces/python/PyGreSQL.spec           |    57 -
 src/interfaces/python/README                  |  1100 -
 src/interfaces/python/README.linux            |    46 -
 src/interfaces/python/Setup.in.raw            |     3 -
 src/interfaces/python/pg.py                   |   277 -
 src/interfaces/python/pgdb.py                 |   446 -
 src/interfaces/python/pgmodule.c              |  3218 -
 src/interfaces/python/setup.py                |    56 -
 src/interfaces/python/tutorial/advanced.py    |   178 -
 src/interfaces/python/tutorial/basics.py      |   296 -
 src/interfaces/python/tutorial/func.py        |   205 -
 src/interfaces/python/tutorial/syscat.py      |   148 -
 src/interfaces/ssl/client.conf                |   120 -
 src/interfaces/ssl/mkcert.sh                  |   114 -
 src/interfaces/ssl/pgkeygen.sh                |    54 -
 src/interfaces/ssl/root.conf                  |   270 -
 src/interfaces/ssl/server.conf                |   118 -
 src/makefiles/Makefile.aix                    |    46 -
 src/makefiles/Makefile.beos                   |    15 -
 src/makefiles/Makefile.bsdi                   |    27 -
 src/makefiles/Makefile.darwin                 |    13 -
 src/makefiles/Makefile.dgux                   |     8 -
 src/makefiles/Makefile.freebsd                |    25 -
 src/makefiles/Makefile.hpux                   |    56 -
 src/makefiles/Makefile.irix5                  |    20 -
 src/makefiles/Makefile.linux                  |    12 -
 src/makefiles/Makefile.netbsd                 |    28 -
 src/makefiles/Makefile.openbsd                |    26 -
 src/makefiles/Makefile.osf                    |     9 -
 src/makefiles/Makefile.qnx4                   |    19 -
 src/makefiles/Makefile.sco                    |    19 -
 src/makefiles/Makefile.solaris                |    28 -
 src/makefiles/Makefile.sunos4                 |    18 -
 src/makefiles/Makefile.svr4                   |    14 -
 src/makefiles/Makefile.ultrix4                |    12 -
 src/makefiles/Makefile.univel                 |     9 -
 src/makefiles/Makefile.unixware               |    37 -
 src/makefiles/Makefile.win                    |    41 -
 src/nls-global.mk                             |   122 -
 src/pl/Makefile                               |    33 -
 src/pl/plperl/GNUmakefile                     |    60 -
 src/pl/plperl/README                          |     8 -
 src/pl/plperl/SPI.xs                          |    63 -
 src/pl/plperl/eloglvl.c                       |    48 -
 src/pl/plperl/eloglvl.h                       |    13 -
 src/pl/plperl/plperl.c                        |   783 -
 src/pl/plperl/ppport.h                        |   289 -
 src/pl/plpgsql/Makefile                       |    19 -
 src/pl/plpgsql/src/.cvsignore                 |     3 -
 src/pl/plpgsql/src/INSTALL                    |    15 -
 src/pl/plpgsql/src/Makefile                   |    96 -
 src/pl/plpgsql/src/gram.y                     |  2102 -
 src/pl/plpgsql/src/pl_comp.c                  |  1338 -
 src/pl/plpgsql/src/pl_exec.c                  |  3411 -
 src/pl/plpgsql/src/pl_funcs.c                 |   958 -
 src/pl/plpgsql/src/pl_handler.c               |   176 -
 src/pl/plpgsql/src/plpgsql.h                  |   616 -
 src/pl/plpgsql/src/scan.l                     |   303 -
 src/pl/plpgsql/test/README                    |    22 -
 src/pl/plpgsql/test/expected/tables.out       |    63 -
 src/pl/plpgsql/test/expected/test.out         |   473 -
 src/pl/plpgsql/test/expected/triggers.out     |   680 -
 src/pl/plpgsql/test/expected/views.out        |   120 -
 src/pl/plpgsql/test/runtest                   |    49 -
 src/pl/plpgsql/test/tables.sql                |   101 -
 src/pl/plpgsql/test/test.sql                  |   272 -
 src/pl/plpgsql/test/triggers.sql              |   892 -
 src/pl/plpgsql/test/views.sql                 |   141 -
 src/pl/plpython/Makefile                      |    60 -
 src/pl/plpython/README                        |    39 -
 src/pl/plpython/TODO                          |    25 -
 src/pl/plpython/error.expected                |    36 -
 src/pl/plpython/feature.expected              |   139 -
 src/pl/plpython/plpython.c                    |  2955 -
 src/pl/plpython/plpython.h                    |    68 -
 src/pl/plpython/plpython_depopulate.sql       |     2 -
 src/pl/plpython/plpython_deschema.sql         |    17 -
 src/pl/plpython/plpython_drop.sql             |    11 -
 src/pl/plpython/plpython_error.sql            |    17 -
 src/pl/plpython/plpython_function.sql         |   328 -
 src/pl/plpython/plpython_populate.sql         |    28 -
 src/pl/plpython/plpython_schema.sql           |    42 -
 src/pl/plpython/plpython_setof.sql            |    11 -
 src/pl/plpython/plpython_test.sql             |    63 -
 src/pl/plpython/test.sh                       |    48 -
 src/pl/tcl/Makefile                           |    84 -
 src/pl/tcl/license.terms                      |    30 -
 src/pl/tcl/modules/Makefile                   |    28 -
 src/pl/tcl/modules/README                     |    19 -
 src/pl/tcl/modules/pltcl_delmod.in            |   115 -
 src/pl/tcl/modules/pltcl_listmod.in           |   121 -
 src/pl/tcl/modules/pltcl_loadmod.in           |   501 -
 src/pl/tcl/modules/unknown.pltcl              |    65 -
 src/pl/tcl/pltcl.c                            |  2417 -
 src/pl/tcl/test/README                        |     8 -
 src/pl/tcl/test/runtest                       |    27 -
 src/pl/tcl/test/test.expected                 |   178 -
 src/pl/tcl/test/test_queries.sql              |    73 -
 src/pl/tcl/test/test_setup.sql                |   432 -
 src/template/aix                              |    10 -
 src/template/beos                             |     1 -
 src/template/bsdi                             |    11 -
 src/template/darwin                           |     6 -
 src/template/dgux                             |     1 -
 src/template/freebsd                          |     7 -
 src/template/hpux                             |     8 -
 src/template/irix5                            |     1 -
 src/template/linux                            |     1 -
 src/template/netbsd                           |     1 -
 src/template/nextstep                         |     4 -
 src/template/openbsd                          |     1 -
 src/template/osf                              |     8 -
 src/template/qnx4                             |     2 -
 src/template/sco                              |     6 -
 src/template/solaris                          |     6 -
 src/template/sunos4                           |     1 -
 src/template/svr4                             |     1 -
 src/template/ultrix4                          |     1 -
 src/template/univel                           |     2 -
 src/template/unixware                         |     5 -
 src/template/win                              |     4 -
 src/test/Makefile                             |    15 -
 src/test/bench/Makefile                       |    60 -
 src/test/bench/WISC-README                    |    28 -
 src/test/bench/create.sh                      |    28 -
 src/test/bench/create.source                  |    17 -
 src/test/bench/perquery                       |    12 -
 src/test/bench/query01                        |     4 -
 src/test/bench/query02                        |     4 -
 src/test/bench/query03                        |     4 -
 src/test/bench/query04                        |     4 -
 src/test/bench/query05                        |     4 -
 src/test/bench/query06                        |     4 -
 src/test/bench/query07                        |     2 -
 src/test/bench/query08                        |     2 -
 src/test/bench/query09                        |     4 -
 src/test/bench/query10                        |     4 -
 src/test/bench/query11                        |     4 -
 src/test/bench/query12                        |     4 -
 src/test/bench/query13                        |     4 -
 src/test/bench/query14                        |     4 -
 src/test/bench/query15                        |     4 -
 src/test/bench/query16                        |     4 -
 src/test/bench/query17                        |     4 -
 src/test/bench/query18                        |     4 -
 src/test/bench/query19                        |     4 -
 src/test/bench/query20                        |     4 -
 src/test/bench/query21                        |     0
 src/test/bench/query22                        |     0
 src/test/bench/query23                        |     4 -
 src/test/bench/query24                        |     0
 src/test/bench/query25                        |     0
 src/test/bench/query26                        |     2 -
 src/test/bench/query27                        |     2 -
 src/test/bench/query28                        |     2 -
 src/test/bench/query29                        |     2 -
 src/test/bench/query30                        |     2 -
 src/test/bench/query31                        |     2 -
 src/test/bench/query32                        |     2 -
 src/test/bench/runwisc.sh                     |    22 -
 src/test/bench/wholebench.sh                  |     5 -
 src/test/examples/Makefile                    |    19 -
 src/test/examples/testlibpq.c                 |   133 -
 src/test/examples/testlibpq2.c                |   111 -
 src/test/examples/testlibpq2.sql              |     5 -
 src/test/examples/testlibpq3.c                |   183 -
 src/test/examples/testlibpq3.sql              |     6 -
 src/test/examples/testlibpq4.c                |   151 -
 src/test/examples/testlo.c                    |   260 -
 src/test/locale/Makefile                      |    20 -
 src/test/locale/README                        |    27 -
 src/test/locale/de_DE.ISO8859-1/Makefile      |    12 -
 src/test/locale/de_DE.ISO8859-1/README        |     2 -
 .../de_DE.ISO8859-1/expected/de-ctype.out     |   257 -
 .../expected/test-de-char.sql.out             |    23 -
 .../expected/test-de-select.sql.out           |     7 -
 .../de_DE.ISO8859-1/expected/test-de-sort.out |    20 -
 .../expected/test-de-text.sql.out             |    23 -
 .../expected/test-de-upper-char.sql.out       |    23 -
 .../expected/test-de-upper-text.sql.out       |    23 -
 .../expected/test-de-upper-varchar.sql.out    |    23 -
 .../expected/test-de-varchar.sql.out          |    23 -
 src/test/locale/de_DE.ISO8859-1/runall        |    67 -
 .../de_DE.ISO8859-1/test-de-select.sql.in     |     1 -
 .../locale/de_DE.ISO8859-1/test-de-sort.in    |    20 -
 .../de_DE.ISO8859-1/test-de-upper.sql.in      |    22 -
 .../locale/de_DE.ISO8859-1/test-de.sql.in     |    22 -
 src/test/locale/gr_GR.ISO8859-7/Makefile      |    12 -
 src/test/locale/gr_GR.ISO8859-7/README        |     2 -
 .../gr_GR.ISO8859-7/expected/gr-ctype.out     |   257 -
 .../expected/test-gr-char.sql.out             |    54 -
 .../expected/test-gr-select.sql.out           |    10 -
 .../gr_GR.ISO8859-7/expected/test-gr-sort.out |     7 -
 .../expected/test-gr-text.sql.out             |    54 -
 .../expected/test-gr-varchar.sql.out          |    54 -
 src/test/locale/gr_GR.ISO8859-7/runall        |    52 -
 .../gr_GR.ISO8859-7/test-gr-select.sql.in     |     1 -
 .../locale/gr_GR.ISO8859-7/test-gr-sort.in    |     7 -
 .../locale/gr_GR.ISO8859-7/test-gr.sql.in     |    53 -
 src/test/locale/koi8-r/Makefile               |    12 -
 .../locale/koi8-r/expected/koi8-ctype.out     |   257 -
 .../koi8-r/expected/test-koi8-char.sql.out    |    54 -
 .../koi8-r/expected/test-koi8-select.sql.out  |     8 -
 .../locale/koi8-r/expected/test-koi8-sort.out |     9 -
 .../koi8-r/expected/test-koi8-text.sql.out    |    54 -
 .../koi8-r/expected/test-koi8-varchar.sql.out |    54 -
 src/test/locale/koi8-r/runall                 |    52 -
 .../locale/koi8-r/test-koi8-select.sql.in     |     1 -
 src/test/locale/koi8-r/test-koi8-sort.in      |     9 -
 src/test/locale/koi8-r/test-koi8.sql.in       |    53 -
 src/test/locale/koi8-to-win1251/Makefile      |    12 -
 src/test/locale/koi8-to-win1251/README        |     4 -
 .../expected/test-koi8-char.sql.out           |    54 -
 .../expected/test-koi8-select.sql.out         |     8 -
 .../expected/test-koi8-sort.out               |     9 -
 .../expected/test-koi8-text.sql.out           |    54 -
 .../expected/test-koi8-varchar.sql.out        |    54 -
 src/test/locale/koi8-to-win1251/runall        |    49 -
 .../koi8-to-win1251/test-koi8-select.sql.in   |     1 -
 .../locale/koi8-to-win1251/test-koi8-sort.in  |     9 -
 .../locale/koi8-to-win1251/test-koi8.sql.in   |    53 -
 src/test/locale/sort-test.pl                  |    11 -
 src/test/locale/sort-test.py                  |    18 -
 src/test/locale/test-ctype.c                  |    76 -
 src/test/locale/test-pgsql-locale.c           |    14 -
 src/test/mb/README                            |     9 -
 src/test/mb/expected/big5.out                 |    84 -
 src/test/mb/expected/euc_cn.out               |    87 -
 src/test/mb/expected/euc_jp.out               |    87 -
 src/test/mb/expected/euc_kr.out               |    87 -
 src/test/mb/expected/euc_tw.out               |    85 -
 src/test/mb/expected/mule_internal.out        |   333 -
 src/test/mb/expected/sjis.out                 |    90 -
 src/test/mb/expected/unicode.out              |    87 -
 src/test/mb/mbregress.sh                      |    60 -
 src/test/mb/sql/big5.sql                      |    20 -
 src/test/mb/sql/euc_cn.sql                    |    19 -
 src/test/mb/sql/euc_jp.sql                    |    19 -
 src/test/mb/sql/euc_kr.sql                    |    19 -
 src/test/mb/sql/euc_tw.sql                    |    20 -
 src/test/mb/sql/mule_internal.sql             |    72 -
 src/test/mb/sql/sjis.sql                      |    20 -
 src/test/mb/sql/unicode.sql                   |    19 -
 src/test/performance/results/PgSQL.970926     |    16 -
 src/test/performance/runtests.pl              |   138 -
 src/test/performance/sqls/connection          |     2 -
 src/test/performance/sqls/crtsimple           |     5 -
 src/test/performance/sqls/crtsimpleidx        |     5 -
 src/test/performance/sqls/drpsimple           |     5 -
 src/test/performance/sqls/inssimple           |    29 -
 src/test/performance/sqls/inssimple.data      |  8192 --
 src/test/performance/sqls/orbsimple           |     2 -
 src/test/performance/sqls/slcsimple           |    14 -
 src/test/performance/sqls/slcsimple.data      |  8192 --
 src/test/performance/sqls/vacuum              |     5 -
 src/test/performance/start-pgsql.sh           |     6 -
 src/test/regress/GNUmakefile                  |   147 -
 src/test/regress/Makefile                     |    12 -
 src/test/regress/README                       |   243 -
 src/test/regress/data/agg.data                |     4 -
 src/test/regress/data/constrf.data            |     2 -
 src/test/regress/data/constro.data            |     2 -
 src/test/regress/data/dept.data               |     2 -
 src/test/regress/data/desc.data               | 10000 ---
 src/test/regress/data/emp.data                |     3 -
 src/test/regress/data/hash.data               | 10000 ---
 src/test/regress/data/onek.data               |  1000 -
 src/test/regress/data/person.data             |    50 -
 src/test/regress/data/real_city.data          |     5 -
 src/test/regress/data/rect.data               |  3100 -
 src/test/regress/data/streets.data            |  5124 --
 src/test/regress/data/stud_emp.data           |     3 -
 src/test/regress/data/student.data            |     2 -
 src/test/regress/data/tenk.data               | 10000 ---
 .../regress/expected/abstime-solaris-1947.out |   129 -
 src/test/regress/expected/abstime.out         |   129 -
 src/test/regress/expected/aggregates.out      |   137 -
 src/test/regress/expected/alter_table.out     |   739 -
 src/test/regress/expected/arrays.out          |   119 -
 src/test/regress/expected/bit.out             |   511 -
 src/test/regress/expected/boolean.out         |   279 -
 src/test/regress/expected/box.out             |   213 -
 src/test/regress/expected/btree_index.out     |   100 -
 src/test/regress/expected/case.out            |   279 -
 src/test/regress/expected/char.out            |   122 -
 src/test/regress/expected/char_1.out          |   122 -
 src/test/regress/expected/circle.out          |    93 -
 src/test/regress/expected/comments.out        |    65 -
 .../regress/expected/create_aggregate.out     |    19 -
 src/test/regress/expected/create_index.out    |    83 -
 src/test/regress/expected/create_misc.out     |   153 -
 src/test/regress/expected/create_operator.out |    28 -
 src/test/regress/expected/create_table.out    |   188 -
 src/test/regress/expected/create_type.out     |    40 -
 src/test/regress/expected/create_view.out     |    17 -
 src/test/regress/expected/date.out            |   144 -
 src/test/regress/expected/domain.out          |   144 -
 src/test/regress/expected/errors.out          |   230 -
 src/test/regress/expected/euc_cn.out          |    87 -
 src/test/regress/expected/euc_jp.out          |    87 -
 src/test/regress/expected/euc_kr.out          |    87 -
 src/test/regress/expected/euc_tw.out          |    85 -
 .../expected/float4-exp-three-digits.out      |   150 -
 src/test/regress/expected/float4.out          |   150 -
 .../expected/float8-exp-three-digits.out      |   264 -
 .../regress/expected/float8-fp-exception.out  |   264 -
 .../regress/expected/float8-small-is-zero.out |   262 -
 src/test/regress/expected/float8.out          |   264 -
 src/test/regress/expected/foreign_key.out     |   964 -
 .../expected/geometry-alpha-precision.out     |   532 -
 .../expected/geometry-bsdi-precision.out      |   532 -
 .../regress/expected/geometry-i86-gnulibc.out |   532 -
 .../regress/expected/geometry-intel-beos.out  |   532 -
 src/test/regress/expected/geometry-irix.out   |   532 -
 .../expected/geometry-positive-zeros-bsd.out  |   532 -
 .../expected/geometry-positive-zeros.out      |   532 -
 .../expected/geometry-powerpc-aix4.out        |   532 -
 .../expected/geometry-powerpc-darwin.out      |   532 -
 .../geometry-powerpc-linux-gnulibc1.out       |   532 -
 .../expected/geometry-solaris-i386-pc.out     |   532 -
 .../expected/geometry-solaris-precision.out   |   532 -
 src/test/regress/expected/geometry-uw7-cc.out |   532 -
 .../regress/expected/geometry-uw7-gcc.out     |   532 -
 src/test/regress/expected/geometry.out        |   532 -
 src/test/regress/expected/hash_index.out      |   198 -
 .../expected/horology-no-DST-before-1970.out  |  2854 -
 .../expected/horology-solaris-1947.out        |  2854 -
 src/test/regress/expected/horology.out        |  2854 -
 src/test/regress/expected/inet.out            |   213 -
 src/test/regress/expected/inherit.out         |   536 -
 src/test/regress/expected/insert.out          |    40 -
 src/test/regress/expected/int2.out            |   215 -
 src/test/regress/expected/int4.out            |   297 -
 .../expected/int8-exp-three-digits.out        |   285 -
 src/test/regress/expected/int8.out            |   285 -
 src/test/regress/expected/interval.out        |   223 -
 src/test/regress/expected/join.out            |  2010 -
 src/test/regress/expected/limit.out           |   110 -
 src/test/regress/expected/lseg.out            |    44 -
 src/test/regress/expected/mule_internal.out   |   333 -
 src/test/regress/expected/name.out            |   124 -
 src/test/regress/expected/numeric.out         |  1112 -
 src/test/regress/expected/numeric_big.out     |   673 -
 src/test/regress/expected/numerology.out      |   136 -
 src/test/regress/expected/oid.out             |    75 -
 src/test/regress/expected/oidjoins.out        |   435 -
 src/test/regress/expected/opr_sanity.out      |   684 -
 src/test/regress/expected/path.out            |    75 -
 src/test/regress/expected/plpgsql.out         |  1536 -
 src/test/regress/expected/point.out           |   225 -
 src/test/regress/expected/polygon.out         |   187 -
 src/test/regress/expected/portals.out         |   678 -
 src/test/regress/expected/portals_p2.out      |   122 -
 src/test/regress/expected/privileges.out      |   559 -
 src/test/regress/expected/random.out          |    35 -
 src/test/regress/expected/reltime.out         |   105 -
 src/test/regress/expected/rules.out           |  1341 -
 src/test/regress/expected/sanity_check.out    |    64 -
 src/test/regress/expected/select.out          |   432 -
 src/test/regress/expected/select_distinct.out |   126 -
 .../regress/expected/select_distinct_on.out   |    66 -
 src/test/regress/expected/select_having.out   |    41 -
 src/test/regress/expected/select_having_1.out |    41 -
 src/test/regress/expected/select_implicit.out |   320 -
 .../regress/expected/select_implicit_1.out    |   320 -
 src/test/regress/expected/select_into.out     |    13 -
 src/test/regress/expected/select_views.out    |  1249 -
 src/test/regress/expected/select_views_1.out  |  1249 -
 src/test/regress/expected/sql_ascii.out       |    87 -
 src/test/regress/expected/strings.out         |   575 -
 src/test/regress/expected/subselect.out       |   167 -
 src/test/regress/expected/temp.out            |    37 -
 src/test/regress/expected/text.out            |    25 -
 src/test/regress/expected/time.out            |    76 -
 src/test/regress/expected/timestamp.out       |  1404 -
 src/test/regress/expected/timestamptz.out     |  1403 -
 src/test/regress/expected/timetz.out          |    80 -
 .../expected/tinterval-solaris-1947.out       |   170 -
 src/test/regress/expected/tinterval.out       |   170 -
 src/test/regress/expected/transactions.out    |    42 -
 src/test/regress/expected/triggers.out        |   256 -
 src/test/regress/expected/type_sanity.out     |   205 -
 src/test/regress/expected/union.out           |   430 -
 src/test/regress/expected/varchar.out         |   111 -
 src/test/regress/expected/varchar_1.out       |   111 -
 src/test/regress/input/constraints.source     |   262 -
 src/test/regress/input/copy.source            |    56 -
 .../regress/input/create_function_1.source    |    69 -
 .../regress/input/create_function_2.source    |    70 -
 src/test/regress/input/misc.source            |   243 -
 src/test/regress/output/constraints.source    |   373 -
 src/test/regress/output/copy.source           |    33 -
 .../regress/output/create_function_1.source   |    61 -
 .../regress/output/create_function_2.source   |    56 -
 src/test/regress/output/misc.source           |   694 -
 src/test/regress/parallel_schedule            |    77 -
 src/test/regress/pg_regress.sh                |   682 -
 src/test/regress/regress.c                    |   686 -
 src/test/regress/regressplans.sh              |   101 -
 src/test/regress/resultmap                    |    53 -
 src/test/regress/serial_schedule              |    85 -
 src/test/regress/sql/abstime.sql              |    67 -
 src/test/regress/sql/aggregates.sql           |    49 -
 src/test/regress/sql/alter_table.sql          |   573 -
 src/test/regress/sql/arrays.sql               |    85 -
 src/test/regress/sql/bit.sql                  |   186 -
 src/test/regress/sql/boolean.sql              |   145 -
 src/test/regress/sql/box.sql                  |   120 -
 src/test/regress/sql/btree_index.sql          |    53 -
 src/test/regress/sql/case.sql                 |   154 -
 src/test/regress/sql/char.sql                 |    75 -
 src/test/regress/sql/circle.sql               |    46 -
 src/test/regress/sql/comments.sql             |    42 -
 src/test/regress/sql/create_aggregate.sql     |    23 -
 src/test/regress/sql/create_index.sql         |   106 -
 src/test/regress/sql/create_misc.sql          |   219 -
 src/test/regress/sql/create_operator.sql      |    34 -
 src/test/regress/sql/create_table.sql         |   222 -
 src/test/regress/sql/create_type.sql          |    44 -
 src/test/regress/sql/create_view.sql          |    21 -
 src/test/regress/sql/date.sql                 |    50 -
 src/test/regress/sql/domain.sql               |   118 -
 src/test/regress/sql/drop.sql                 |   247 -
 src/test/regress/sql/errors.sql               |   252 -
 src/test/regress/sql/euc_cn.sql               |    19 -
 src/test/regress/sql/euc_jp.sql               |    19 -
 src/test/regress/sql/euc_kr.sql               |    19 -
 src/test/regress/sql/euc_tw.sql               |    20 -
 src/test/regress/sql/float4.sql               |    66 -
 src/test/regress/sql/float8.sql               |   128 -
 src/test/regress/sql/foreign_key.sql          |   583 -
 src/test/regress/sql/geometry.sql             |   152 -
 src/test/regress/sql/hash_index.sql           |   154 -
 src/test/regress/sql/horology.sql             |   363 -
 src/test/regress/sql/inet.sql                 |    63 -
 src/test/regress/sql/inherit.sql              |    94 -
 src/test/regress/sql/insert.sql               |    22 -
 src/test/regress/sql/int2.sql                 |    75 -
 src/test/regress/sql/int4.sql                 |   105 -
 src/test/regress/sql/int8.sql                 |    55 -
 src/test/regress/sql/interval.sql             |    68 -
 src/test/regress/sql/join.sql                 |   300 -
 src/test/regress/sql/limit.sql                |    32 -
 src/test/regress/sql/lseg.sql                 |    26 -
 src/test/regress/sql/mule_internal.sql        |    72 -
 src/test/regress/sql/name.sql                 |    54 -
 src/test/regress/sql/numeric.sql              |   703 -
 src/test/regress/sql/numeric_big.sql          |   648 -
 src/test/regress/sql/numerology.sql           |    99 -
 src/test/regress/sql/oid.sql                  |    39 -
 src/test/regress/sql/oidjoins.sql             |   219 -
 src/test/regress/sql/opr_sanity.sql           |   565 -
 src/test/regress/sql/path.sql                 |    39 -
 src/test/regress/sql/plpgsql.sql              |  1416 -
 src/test/regress/sql/point.sql                |    81 -
 src/test/regress/sql/polygon.sql              |   119 -
 src/test/regress/sql/portals.sql              |   170 -
 src/test/regress/sql/portals_p2.sql           |    99 -
 src/test/regress/sql/privileges.sql           |   310 -
 src/test/regress/sql/random.sql               |    28 -
 src/test/regress/sql/reltime.sql              |    51 -
 src/test/regress/sql/rules.sql                |   767 -
 src/test/regress/sql/sanity_check.sql         |    12 -
 src/test/regress/sql/select.sql               |   105 -
 src/test/regress/sql/select_distinct.sql      |    36 -
 src/test/regress/sql/select_distinct_on.sql   |    16 -
 src/test/regress/sql/select_having.sql        |    28 -
 src/test/regress/sql/select_implicit.sql      |   151 -
 src/test/regress/sql/select_into.sql          |    18 -
 src/test/regress/sql/select_views.sql         |    11 -
 src/test/regress/sql/sql_ascii.sql            |    19 -
 src/test/regress/sql/strings.sql              |   199 -
 src/test/regress/sql/subselect.sql            |    77 -
 src/test/regress/sql/temp.sql                 |    49 -
 src/test/regress/sql/text.sql                 |    15 -
 src/test/regress/sql/time.sql                 |    37 -
 src/test/regress/sql/timestamp.sql            |   228 -
 src/test/regress/sql/timestamptz.sql          |   221 -
 src/test/regress/sql/timetz.sql               |    37 -
 src/test/regress/sql/tinterval.sql            |   101 -
 src/test/regress/sql/transactions.sql         |    35 -
 src/test/regress/sql/triggers.sql             |   198 -
 src/test/regress/sql/type_sanity.sql          |   171 -
 src/test/regress/sql/union.sql                |   151 -
 src/test/regress/sql/varchar.sql              |    66 -
 src/tools/RELEASE_CHANGES                     |    25 -
 src/tools/backend/README                      |     3 -
 src/tools/backend/backend_dirs.html           |   431 -
 src/tools/backend/flow.fig                    |   133 -
 src/tools/backend/flow.gif                    |   Bin 29374 -> 0 bytes
 src/tools/backend/index.html                  |   167 -
 src/tools/ccsym                               |    13 -
 src/tools/copyright                           |     5 -
 src/tools/entab/Makefile                      |    29 -
 src/tools/entab/entab.c                       |   220 -
 src/tools/entab/entab.man                     |    51 -
 src/tools/entab/halt.c                        |    58 -
 src/tools/find_badmacros                      |    20 -
 src/tools/find_static                         |    49 -
 src/tools/find_typedef                        |    28 -
 src/tools/make_ctags                          |    12 -
 src/tools/make_diff/README                    |    35 -
 src/tools/make_diff/cporig                    |     8 -
 src/tools/make_diff/difforig                  |    11 -
 src/tools/make_diff/rmorig                    |     6 -
 src/tools/make_etags                          |    10 -
 src/tools/make_keywords                       |    13 -
 src/tools/make_mkid                           |     9 -
 src/tools/pgcvslog                            |   178 -
 src/tools/pginclude/README                    |    14 -
 src/tools/pginclude/pgcompinclude             |    24 -
 src/tools/pginclude/pgdefine                  |    15 -
 src/tools/pginclude/pgfixinclude              |    20 -
 src/tools/pginclude/pgrminclude               |    66 -
 src/tools/pgindent/README                     |    47 -
 src/tools/pgindent/indent.bsd.patch           |    79 -
 src/tools/pgindent/pgcppindent                |    27 -
 src/tools/pgindent/pgindent                   |  1669 -
 src/tools/pgindent/pgjindent                  |    27 -
 src/tutorial/Makefile                         |    34 -
 src/tutorial/README                           |    11 -
 src/tutorial/advanced.source                  |    60 -
 src/tutorial/basics.source                    |   204 -
 src/tutorial/beard.c                          |    78 -
 src/tutorial/complex.c                        |   180 -
 src/tutorial/complex.source                   |   293 -
 src/tutorial/funcs.c                          |   107 -
 src/tutorial/funcs.source                     |   162 -
 src/tutorial/funcs_new.c                      |   133 -
 src/tutorial/syscat.source                    |   149 -
 src/utils/Makefile                            |    34 -
 src/utils/README                              |     6 -
 src/utils/dllinit.c                           |   108 -
 src/utils/getopt.c                            |   125 -
 src/utils/strdup.c                            |    26 -
 src/win32.mak                                 |    41 -
 2695 files changed, 1480784 deletions(-)
 delete mode 100644 COPYRIGHT
 delete mode 100644 GNUmakefile.in
 delete mode 100644 HISTORY
 delete mode 100644 INSTALL
 delete mode 100644 Makefile
 delete mode 100644 README
 delete mode 100644 aclocal.m4
 delete mode 100644 config/ac_func_accept_argtypes.m4
 delete mode 100644 config/c-compiler.m4
 delete mode 100644 config/c-library.m4
 delete mode 100755 config/config.guess
 delete mode 100755 config/config.sub
 delete mode 100644 config/cxx.m4
 delete mode 100644 config/docbook.m4
 delete mode 100644 config/general.m4
 delete mode 100755 config/install-sh
 delete mode 100644 config/java.m4
 delete mode 100644 config/libtool.m4
 delete mode 100755 config/missing
 delete mode 100755 config/mkinstalldirs
 delete mode 100644 config/perl.m4
 delete mode 100644 config/prep_buildtree
 delete mode 100644 config/programs.m4
 delete mode 100644 config/python.m4
 delete mode 100644 config/tcl.m4
 delete mode 100755 configure
 delete mode 100644 configure.in
 delete mode 100644 contrib/Makefile
 delete mode 100644 contrib/README
 delete mode 100644 contrib/array/Makefile
 delete mode 100644 contrib/array/README.array_iterator
 delete mode 100644 contrib/array/array_iterator.c
 delete mode 100644 contrib/array/array_iterator.h
 delete mode 100644 contrib/array/array_iterator.sql.in
 delete mode 100644 contrib/btree_gist/Makefile
 delete mode 100644 contrib/btree_gist/README.btree_gist
 delete mode 100644 contrib/btree_gist/btree_gist.c
 delete mode 100644 contrib/btree_gist/btree_gist.sql.in
 delete mode 100644 contrib/btree_gist/data/test_btree.data
 delete mode 100644 contrib/btree_gist/data/test_btree_ts.data
 delete mode 100644 contrib/btree_gist/expected/btree_gist.out
 delete mode 100644 contrib/btree_gist/sql/btree_gist.sql
 delete mode 100644 contrib/chkpass/Makefile
 delete mode 100644 contrib/chkpass/README.chkpass
 delete mode 100644 contrib/chkpass/chkpass.c
 delete mode 100644 contrib/chkpass/chkpass.sql.in
 delete mode 100644 contrib/contrib-global.mk
 delete mode 100644 contrib/cube/Makefile
 delete mode 100644 contrib/cube/README.cube
 delete mode 100644 contrib/cube/buffer.c
 delete mode 100644 contrib/cube/buffer.h
 delete mode 100644 contrib/cube/cube.c
 delete mode 100644 contrib/cube/cube.sql.in
 delete mode 100644 contrib/cube/cubedata.h
 delete mode 100644 contrib/cube/cubeparse.y
 delete mode 100644 contrib/cube/cubescan.l
 delete mode 100644 contrib/cube/data/test_cube.data
 delete mode 100644 contrib/cube/expected/cube.out
 delete mode 100644 contrib/cube/sql/cube.sql
 delete mode 100644 contrib/dbase/Makefile
 delete mode 100644 contrib/dbase/README.dbf2pg
 delete mode 100644 contrib/dbase/dbf.c
 delete mode 100644 contrib/dbase/dbf.h
 delete mode 100644 contrib/dbase/dbf2pg.1
 delete mode 100644 contrib/dbase/dbf2pg.c
 delete mode 100644 contrib/dbase/endian.c
 delete mode 100644 contrib/dblink/Makefile
 delete mode 100644 contrib/dblink/README.dblink
 delete mode 100644 contrib/dblink/dblink.c
 delete mode 100644 contrib/dblink/dblink.h
 delete mode 100644 contrib/dblink/dblink.sql.in
 delete mode 100644 contrib/dbsize/Makefile
 delete mode 100644 contrib/dbsize/README.dbsize
 delete mode 100644 contrib/dbsize/dbsize.c
 delete mode 100644 contrib/dbsize/dbsize.sql.in
 delete mode 100644 contrib/earthdistance/Makefile
 delete mode 100644 contrib/earthdistance/README.earthdistance
 delete mode 100644 contrib/earthdistance/earthdistance.c
 delete mode 100644 contrib/earthdistance/earthdistance.sql.in
 delete mode 100644 contrib/findoidjoins/Makefile
 delete mode 100644 contrib/findoidjoins/README.findoidjoins
 delete mode 100644 contrib/findoidjoins/findoidjoins.c
 delete mode 100755 contrib/findoidjoins/make_oidjoins_check
 delete mode 100644 contrib/fulltextindex/Makefile
 delete mode 100644 contrib/fulltextindex/README.fti
 delete mode 100644 contrib/fulltextindex/TODO
 delete mode 100644 contrib/fulltextindex/fti.c
 delete mode 100644 contrib/fulltextindex/fti.pl
 delete mode 100644 contrib/fulltextindex/fti.sql.in
 delete mode 100755 contrib/fulltextindex/timings.sh
 delete mode 100644 contrib/fuzzystrmatch/Makefile
 delete mode 100644 contrib/fuzzystrmatch/README.fuzzystrmatch
 delete mode 100644 contrib/fuzzystrmatch/README.soundex
 delete mode 100644 contrib/fuzzystrmatch/fuzzystrmatch.c
 delete mode 100644 contrib/fuzzystrmatch/fuzzystrmatch.h
 delete mode 100644 contrib/fuzzystrmatch/fuzzystrmatch.sql.in
 delete mode 100644 contrib/intagg/Makefile
 delete mode 100644 contrib/intagg/README.int_aggregate
 delete mode 100644 contrib/intagg/int_aggregate.c
 delete mode 100644 contrib/intagg/int_aggregate.sql.in
 delete mode 100644 contrib/intarray/Makefile
 delete mode 100644 contrib/intarray/README.intarray
 delete mode 100644 contrib/intarray/_int.c
 delete mode 100644 contrib/intarray/_int.sql.in
 delete mode 100755 contrib/intarray/bench/bench.pl
 delete mode 100755 contrib/intarray/bench/create_test.pl
 delete mode 100644 contrib/intarray/data/test__int.data
 delete mode 100644 contrib/intarray/expected/_int.out
 delete mode 100644 contrib/intarray/sql/_int.sql
 delete mode 100644 contrib/ipc_check/README
 delete mode 100644 contrib/ipc_check/ipc_check.pl
 delete mode 100644 contrib/isbn_issn/Makefile
 delete mode 100644 contrib/isbn_issn/README.isbn_issn
 delete mode 100644 contrib/isbn_issn/isbn_issn.c
 delete mode 100644 contrib/isbn_issn/isbn_issn.sql.in
 delete mode 100644 contrib/lo/Makefile
 delete mode 100644 contrib/lo/README.lo
 delete mode 100644 contrib/lo/lo.c
 delete mode 100644 contrib/lo/lo.sql.in
 delete mode 100644 contrib/lo/lo_drop.sql
 delete mode 100644 contrib/lo/lo_test.sql
 delete mode 100644 contrib/mSQL-interface/Makefile
 delete mode 100644 contrib/mSQL-interface/README.mpgsql
 delete mode 100644 contrib/mSQL-interface/mpgsql.c
 delete mode 100644 contrib/mac/README.mac
 delete mode 100755 contrib/mac/createoui
 delete mode 100755 contrib/mac/dropoui
 delete mode 100644 contrib/mac/ouiparse.awk
 delete mode 100755 contrib/mac/updateoui
 delete mode 100644 contrib/miscutil/Makefile
 delete mode 100644 contrib/miscutil/README.misc_utils
 delete mode 100644 contrib/miscutil/misc_utils.c
 delete mode 100644 contrib/miscutil/misc_utils.h
 delete mode 100644 contrib/miscutil/misc_utils.sql.in
 delete mode 100644 contrib/mysql/README
 delete mode 100755 contrib/mysql/my2pg.pl
 delete mode 100755 contrib/mysql/mysql2pgsql
 delete mode 100644 contrib/noupdate/Makefile
 delete mode 100644 contrib/noupdate/README.noup
 delete mode 100644 contrib/noupdate/noup.c
 delete mode 100644 contrib/noupdate/noup.sql.in
 delete mode 100644 contrib/oid2name/Makefile
 delete mode 100644 contrib/oid2name/README.oid2name
 delete mode 100644 contrib/oid2name/oid2name.c
 delete mode 100644 contrib/oracle/CHANGES
 delete mode 100644 contrib/oracle/Ora2Pg.pm
 delete mode 100644 contrib/oracle/README.ora2pg
 delete mode 100644 contrib/oracle/TODO
 delete mode 100644 contrib/oracle/ora2pg.html
 delete mode 100755 contrib/oracle/ora2pg.pl
 delete mode 100644 contrib/pg_controldata/Makefile
 delete mode 100644 contrib/pg_controldata/README.pg_controldata
 delete mode 100644 contrib/pg_controldata/pg_controldata.c
 delete mode 100644 contrib/pg_dumplo/Makefile
 delete mode 100644 contrib/pg_dumplo/README.pg_dumplo
 delete mode 100644 contrib/pg_dumplo/lo_export.c
 delete mode 100644 contrib/pg_dumplo/lo_import.c
 delete mode 100644 contrib/pg_dumplo/main.c
 delete mode 100644 contrib/pg_dumplo/pg_dumplo.h
 delete mode 100644 contrib/pg_dumplo/utils.c
 delete mode 100644 contrib/pg_logger/Makefile
 delete mode 100644 contrib/pg_logger/README.pg_logger
 delete mode 100644 contrib/pg_logger/pg_logger.c
 delete mode 100644 contrib/pg_resetxlog/Makefile
 delete mode 100644 contrib/pg_resetxlog/README.pg_resetxlog
 delete mode 100644 contrib/pg_resetxlog/pg_resetxlog.c
 delete mode 100644 contrib/pg_upgrade/README
 delete mode 100755 contrib/pg_upgrade/pg_upgrade
 delete mode 100644 contrib/pg_upgrade/pg_upgrade.1
 delete mode 100644 contrib/pgbench/Makefile
 delete mode 100644 contrib/pgbench/README.pgbench
 delete mode 100644 contrib/pgbench/README.pgbench_jis
 delete mode 100644 contrib/pgbench/pgbench.c
 delete mode 100644 contrib/pgcrypto/API
 delete mode 100644 contrib/pgcrypto/Makefile
 delete mode 100644 contrib/pgcrypto/README.pgcrypto
 delete mode 100644 contrib/pgcrypto/blf.c
 delete mode 100644 contrib/pgcrypto/blf.h
 delete mode 100644 contrib/pgcrypto/crypt-blowfish.c
 delete mode 100644 contrib/pgcrypto/crypt-des.c
 delete mode 100644 contrib/pgcrypto/crypt-gensalt.c
 delete mode 100644 contrib/pgcrypto/crypt-md5.c
 delete mode 100644 contrib/pgcrypto/expected/blowfish.out
 delete mode 100644 contrib/pgcrypto/expected/crypt-blowfish.out
 delete mode 100644 contrib/pgcrypto/expected/crypt-des.out
 delete mode 100644 contrib/pgcrypto/expected/crypt-md5.out
 delete mode 100644 contrib/pgcrypto/expected/crypt-xdes.out
 delete mode 100644 contrib/pgcrypto/expected/hmac-md5.out
 delete mode 100644 contrib/pgcrypto/expected/hmac-sha1.out
 delete mode 100644 contrib/pgcrypto/expected/init.out
 delete mode 100644 contrib/pgcrypto/expected/md5.out
 delete mode 100644 contrib/pgcrypto/expected/rijndael.out
 delete mode 100644 contrib/pgcrypto/expected/sha1.out
 delete mode 100644 contrib/pgcrypto/internal.c
 delete mode 100644 contrib/pgcrypto/md5.c
 delete mode 100644 contrib/pgcrypto/md5.h
 delete mode 100644 contrib/pgcrypto/mhash.c
 delete mode 100644 contrib/pgcrypto/misc.c
 delete mode 100644 contrib/pgcrypto/openssl.c
 delete mode 100644 contrib/pgcrypto/pgcrypto.c
 delete mode 100644 contrib/pgcrypto/pgcrypto.h
 delete mode 100644 contrib/pgcrypto/pgcrypto.sql.in
 delete mode 100644 contrib/pgcrypto/px-crypt.c
 delete mode 100644 contrib/pgcrypto/px-crypt.h
 delete mode 100644 contrib/pgcrypto/px-hmac.c
 delete mode 100644 contrib/pgcrypto/px.c
 delete mode 100644 contrib/pgcrypto/px.h
 delete mode 100644 contrib/pgcrypto/random.c
 delete mode 100644 contrib/pgcrypto/rijndael.c
 delete mode 100644 contrib/pgcrypto/rijndael.h
 delete mode 100644 contrib/pgcrypto/rijndael.tbl
 delete mode 100644 contrib/pgcrypto/sha1.c
 delete mode 100644 contrib/pgcrypto/sha1.h
 delete mode 100644 contrib/pgcrypto/sql/blowfish.sql
 delete mode 100644 contrib/pgcrypto/sql/crypt-blowfish.sql
 delete mode 100644 contrib/pgcrypto/sql/crypt-des.sql
 delete mode 100644 contrib/pgcrypto/sql/crypt-md5.sql
 delete mode 100644 contrib/pgcrypto/sql/crypt-xdes.sql
 delete mode 100644 contrib/pgcrypto/sql/hmac-md5.sql
 delete mode 100644 contrib/pgcrypto/sql/hmac-sha1.sql
 delete mode 100644 contrib/pgcrypto/sql/init.sql
 delete mode 100644 contrib/pgcrypto/sql/md5.sql
 delete mode 100644 contrib/pgcrypto/sql/rijndael.sql
 delete mode 100644 contrib/pgcrypto/sql/sha1.sql
 delete mode 100644 contrib/pgstattuple/Makefile
 delete mode 100644 contrib/pgstattuple/README.pgstattuple
 delete mode 100644 contrib/pgstattuple/README.pgstattuple.euc_jp
 delete mode 100644 contrib/pgstattuple/pgstattuple.c
 delete mode 100644 contrib/pgstattuple/pgstattuple.sql.in
 delete mode 100644 contrib/retep/CHANGELOG
 delete mode 100644 contrib/retep/Implementation
 delete mode 100644 contrib/retep/Makefile
 delete mode 100644 contrib/retep/README
 delete mode 100644 contrib/retep/build.xml
 delete mode 100644 contrib/retep/data/cds.dtd
 delete mode 100644 contrib/retep/data/cds.xml
 delete mode 100644 contrib/retep/retep.jpx
 delete mode 100644 contrib/retep/uk/org/retep/dtu/DCollection.java
 delete mode 100644 contrib/retep/uk/org/retep/dtu/DConstants.java
 delete mode 100644 contrib/retep/uk/org/retep/dtu/DElement.java
 delete mode 100644 contrib/retep/uk/org/retep/dtu/DEnvironment.java
 delete mode 100644 contrib/retep/uk/org/retep/dtu/DModule.java
 delete mode 100644 contrib/retep/uk/org/retep/dtu/DModuleXML.java
 delete mode 100644 contrib/retep/uk/org/retep/dtu/DNode.java
 delete mode 100644 contrib/retep/uk/org/retep/dtu/DProcessor.java
 delete mode 100644 contrib/retep/uk/org/retep/dtu/DTransform.java
 delete mode 100644 contrib/retep/uk/org/retep/tools.properties
 delete mode 100644 contrib/retep/uk/org/retep/tools/Tool.java
 delete mode 100644 contrib/retep/uk/org/retep/util/ExceptionDialog.java
 delete mode 100644 contrib/retep/uk/org/retep/util/Globals.java
 delete mode 100644 contrib/retep/uk/org/retep/util/Logger.java
 delete mode 100644 contrib/retep/uk/org/retep/util/Main.java
 delete mode 100644 contrib/retep/uk/org/retep/util/StandaloneApp.java
 delete mode 100644 contrib/retep/uk/org/retep/util/hba/Editor.java
 delete mode 100644 contrib/retep/uk/org/retep/util/hba/Main.java
 delete mode 100644 contrib/retep/uk/org/retep/util/hba/Record.java
 delete mode 100644 contrib/retep/uk/org/retep/util/misc/IPAddress.java
 delete mode 100644 contrib/retep/uk/org/retep/util/misc/PropertiesIO.java
 delete mode 100644 contrib/retep/uk/org/retep/util/misc/WStringTokenizer.java
 delete mode 100644 contrib/retep/uk/org/retep/util/models/HBATableModel.java
 delete mode 100644 contrib/retep/uk/org/retep/util/models/PropertiesTableModel.java
 delete mode 100644 contrib/retep/uk/org/retep/util/proped/Main.java
 delete mode 100644 contrib/retep/uk/org/retep/util/proped/PropertyEditor.java
 delete mode 100644 contrib/retep/uk/org/retep/xml/core/XMLFactory.java
 delete mode 100644 contrib/retep/uk/org/retep/xml/core/XMLFactoryException.java
 delete mode 100644 contrib/retep/uk/org/retep/xml/jdbc/XMLDatabase.java
 delete mode 100644 contrib/retep/uk/org/retep/xml/jdbc/XMLResultSet.java
 delete mode 100644 contrib/retep/uk/org/retep/xml/parser/TagHandler.java
 delete mode 100644 contrib/retep/uk/org/retep/xml/parser/TagListener.java
 delete mode 100644 contrib/retep/uk/org/retep/xml/test/XMLExport.java
 delete mode 100644 contrib/rserv/ApplySnapshot.in
 delete mode 100644 contrib/rserv/CleanLog.in
 delete mode 100644 contrib/rserv/GetSyncID.in
 delete mode 100644 contrib/rserv/InitRservTest.in
 delete mode 100644 contrib/rserv/Makefile
 delete mode 100644 contrib/rserv/MasterAddTable.in
 delete mode 100644 contrib/rserv/MasterInit.in
 delete mode 100644 contrib/rserv/MasterSync.in
 delete mode 100644 contrib/rserv/PrepareSnapshot.in
 delete mode 100644 contrib/rserv/README.rserv
 delete mode 100644 contrib/rserv/RServ.pm
 delete mode 100644 contrib/rserv/Replicate.in
 delete mode 100644 contrib/rserv/RservTest.in
 delete mode 100644 contrib/rserv/SlaveAddTable.in
 delete mode 100644 contrib/rserv/SlaveInit.in
 delete mode 100644 contrib/rserv/master.sql.in
 delete mode 100755 contrib/rserv/regress.sh
 delete mode 100644 contrib/rserv/rserv.c
 delete mode 100644 contrib/rserv/slave.sql.in
 delete mode 100644 contrib/rtree_gist/Makefile
 delete mode 100644 contrib/rtree_gist/README.rtree_gist
 delete mode 100755 contrib/rtree_gist/bench/bench.pl
 delete mode 100755 contrib/rtree_gist/bench/create_test.pl
 delete mode 100644 contrib/rtree_gist/data/test_box.data
 delete mode 100644 contrib/rtree_gist/expected/rtree_gist.out
 delete mode 100644 contrib/rtree_gist/rtree_gist.c
 delete mode 100644 contrib/rtree_gist/rtree_gist.sql.in
 delete mode 100644 contrib/rtree_gist/sql/rtree_gist.sql
 delete mode 100644 contrib/seg/Makefile
 delete mode 100644 contrib/seg/README.seg
 delete mode 100644 contrib/seg/buffer.c
 delete mode 100644 contrib/seg/buffer.h
 delete mode 100644 contrib/seg/data/test_seg.data
 delete mode 100644 contrib/seg/expected/seg.out
 delete mode 100755 contrib/seg/seg-validate.pl
 delete mode 100644 contrib/seg/seg.c
 delete mode 100644 contrib/seg/seg.sql.in
 delete mode 100644 contrib/seg/segdata.h
 delete mode 100644 contrib/seg/segparse.y
 delete mode 100644 contrib/seg/segscan.l
 delete mode 100755 contrib/seg/sort-segments.pl
 delete mode 100644 contrib/seg/sql/seg.sql
 delete mode 100644 contrib/spi/Makefile
 delete mode 100644 contrib/spi/README.spi
 delete mode 100644 contrib/spi/autoinc.c
 delete mode 100644 contrib/spi/autoinc.example
 delete mode 100644 contrib/spi/autoinc.sql.in
 delete mode 100644 contrib/spi/insert_username.c
 delete mode 100644 contrib/spi/insert_username.example
 delete mode 100644 contrib/spi/insert_username.sql.in
 delete mode 100644 contrib/spi/moddatetime.c
 delete mode 100644 contrib/spi/moddatetime.example
 delete mode 100644 contrib/spi/moddatetime.sql.in
 delete mode 100644 contrib/spi/preprocessor/README.MAX
 delete mode 100644 contrib/spi/preprocessor/example.sql
 delete mode 100644 contrib/spi/preprocessor/step1.c
 delete mode 100755 contrib/spi/preprocessor/step1.e
 delete mode 100755 contrib/spi/preprocessor/step2.pl
 delete mode 100644 contrib/spi/refint.c
 delete mode 100644 contrib/spi/refint.example
 delete mode 100644 contrib/spi/refint.sql.in
 delete mode 100644 contrib/spi/timetravel.c
 delete mode 100644 contrib/spi/timetravel.example
 delete mode 100644 contrib/spi/timetravel.sql.in
 delete mode 100644 contrib/start-scripts/freebsd
 delete mode 100644 contrib/start-scripts/linux
 delete mode 100644 contrib/string/Makefile
 delete mode 100644 contrib/string/README.string_io
 delete mode 100644 contrib/string/string_io.c
 delete mode 100644 contrib/string/string_io.h
 delete mode 100644 contrib/string/string_io.sql.in
 delete mode 100644 contrib/tips/Makefile
 delete mode 100644 contrib/tips/README.apachelog
 delete mode 100755 contrib/tools/add-emacs-variables
 delete mode 100755 contrib/tools/find-sources
 delete mode 100755 contrib/tools/make-tags
 delete mode 100644 contrib/tsearch/Makefile
 delete mode 100644 contrib/tsearch/README.tsearch
 delete mode 100644 contrib/tsearch/crc32.c
 delete mode 100644 contrib/tsearch/crc32.h
 delete mode 100644 contrib/tsearch/data/test_tsearch.data
 delete mode 100644 contrib/tsearch/deflex.h
 delete mode 100644 contrib/tsearch/dict.h
 delete mode 100644 contrib/tsearch/dict/porter_english.dct
 delete mode 100644 contrib/tsearch/dict/russian_stemming.dct
 delete mode 100644 contrib/tsearch/expected/tsearch.out
 delete mode 100644 contrib/tsearch/gistidx.c
 delete mode 100644 contrib/tsearch/gistidx.h
 delete mode 100755 contrib/tsearch/makedict/makedict.pl
 delete mode 100644 contrib/tsearch/morph.c
 delete mode 100644 contrib/tsearch/morph.h
 delete mode 100644 contrib/tsearch/parser.h
 delete mode 100644 contrib/tsearch/parser.l
 delete mode 100644 contrib/tsearch/query.c
 delete mode 100644 contrib/tsearch/query.h
 delete mode 100644 contrib/tsearch/rewrite.c
 delete mode 100644 contrib/tsearch/rewrite.h
 delete mode 100644 contrib/tsearch/sql/tsearch.sql
 delete mode 100644 contrib/tsearch/tsearch.sql.in
 delete mode 100644 contrib/tsearch/txtidx.c
 delete mode 100644 contrib/tsearch/txtidx.h
 delete mode 100644 contrib/userlock/Makefile
 delete mode 100644 contrib/userlock/README.user_locks
 delete mode 100644 contrib/userlock/user_locks.c
 delete mode 100644 contrib/userlock/user_locks.h
 delete mode 100644 contrib/userlock/user_locks.sql.in
 delete mode 100644 contrib/vacuumlo/Makefile
 delete mode 100644 contrib/vacuumlo/README.vacuumlo
 delete mode 100644 contrib/vacuumlo/vacuumlo.c
 delete mode 100644 contrib/xml/Makefile
 delete mode 100644 contrib/xml/README
 delete mode 100644 contrib/xml/TODO
 delete mode 100644 contrib/xml/pgxml.c
 delete mode 100644 contrib/xml/pgxml.h
 delete mode 100644 contrib/xml/pgxml.source
 delete mode 100644 contrib/xml/pgxml_dom.c
 delete mode 100644 contrib/xml/pgxml_dom.source
 delete mode 100644 doc/FAQ
 delete mode 100644 doc/FAQ_AIX
 delete mode 100644 doc/FAQ_DEV
 delete mode 100644 doc/FAQ_HPUX
 delete mode 100644 doc/FAQ_IRIX
 delete mode 100644 doc/FAQ_MSWIN
 delete mode 100644 doc/FAQ_QNX4
 delete mode 100644 doc/FAQ_SCO
 delete mode 100644 doc/FAQ_Solaris
 delete mode 100644 doc/FAQ_german
 delete mode 100644 doc/FAQ_japanese
 delete mode 100644 doc/FAQ_polish
 delete mode 100644 doc/FAQ_russian
 delete mode 100644 doc/KNOWN_BUGS
 delete mode 100644 doc/MISSING_FEATURES
 delete mode 100644 doc/Makefile
 delete mode 100644 doc/README.mb.big5
 delete mode 100644 doc/README.mb.jp
 delete mode 100644 doc/TODO
 delete mode 100644 doc/TODO.detail/README
 delete mode 100644 doc/TODO.detail/atttypmod
 delete mode 100644 doc/TODO.detail/crossdb
 delete mode 100644 doc/TODO.detail/cursor
 delete mode 100644 doc/TODO.detail/drop
 delete mode 100644 doc/TODO.detail/exists
 delete mode 100644 doc/TODO.detail/foreign
 delete mode 100644 doc/TODO.detail/fsync
 delete mode 100644 doc/TODO.detail/inheritance
 delete mode 100644 doc/TODO.detail/java
 delete mode 100644 doc/TODO.detail/mmap
 delete mode 100644 doc/TODO.detail/namedatalen
 delete mode 100644 doc/TODO.detail/optimizer
 delete mode 100644 doc/TODO.detail/performance
 delete mode 100644 doc/TODO.detail/persistent
 delete mode 100644 doc/TODO.detail/pool
 delete mode 100644 doc/TODO.detail/prepare
 delete mode 100644 doc/TODO.detail/privileges
 delete mode 100644 doc/TODO.detail/replication
 delete mode 100644 doc/TODO.detail/schema
 delete mode 100644 doc/TODO.detail/tablespaces
 delete mode 100644 doc/TODO.detail/thread
 delete mode 100644 doc/TODO.detail/transactions
 delete mode 100644 doc/TODO.detail/typeconv
 delete mode 100644 doc/TODO.detail/update
 delete mode 100644 doc/TODO.detail/vacuum
 delete mode 100644 doc/TODO.detail/view
 delete mode 100644 doc/TODO.detail/win32
 delete mode 100644 doc/TODO.detail/yacc
 delete mode 100644 doc/bug.template
 delete mode 100644 doc/src/FAQ/FAQ.html
 delete mode 100644 doc/src/FAQ/FAQ_DEV.html
 delete mode 100644 doc/src/FAQ/FAQ_german.html
 delete mode 100644 doc/src/FAQ/FAQ_japanese.html
 delete mode 100644 doc/src/FAQ/FAQ_polish.html
 delete mode 100644 doc/src/FAQ/FAQ_russian.html
 delete mode 100644 doc/src/Makefile
 delete mode 100644 doc/src/graphics/catalogs.ag
 delete mode 100644 doc/src/graphics/catalogs.cgm
 delete mode 100644 doc/src/graphics/catalogs.gif
 delete mode 100644 doc/src/graphics/catalogs.ps
 delete mode 100644 doc/src/graphics/clientserver.ag
 delete mode 100644 doc/src/graphics/clientserver.gif
 delete mode 100644 doc/src/graphics/connections.ag
 delete mode 100644 doc/src/graphics/connections.gif
 delete mode 100644 doc/src/sgml/Makefile
 delete mode 100644 doc/src/sgml/admin.sgml
 delete mode 100644 doc/src/sgml/advanced.sgml
 delete mode 100644 doc/src/sgml/arch-dev.sgml
 delete mode 100644 doc/src/sgml/arch-pg.sgml
 delete mode 100644 doc/src/sgml/array.sgml
 delete mode 100644 doc/src/sgml/backup.sgml
 delete mode 100644 doc/src/sgml/biblio.sgml
 delete mode 100644 doc/src/sgml/bki.sgml
 delete mode 100644 doc/src/sgml/book-decl.sgml
 delete mode 100644 doc/src/sgml/catalogs.sgml
 delete mode 100644 doc/src/sgml/charset.sgml
 delete mode 100644 doc/src/sgml/client-auth.sgml
 delete mode 100644 doc/src/sgml/compiler.sgml
 delete mode 100644 doc/src/sgml/contacts.sgml
 delete mode 100644 doc/src/sgml/cvs.sgml
 delete mode 100644 doc/src/sgml/datatype.sgml
 delete mode 100644 doc/src/sgml/datetime.sgml
 delete mode 100644 doc/src/sgml/developer.sgml
 delete mode 100644 doc/src/sgml/dfunc.sgml
 delete mode 100644 doc/src/sgml/diskusage.sgml
 delete mode 100644 doc/src/sgml/docguide.sgml
 delete mode 100644 doc/src/sgml/ecpg.sgml
 delete mode 100644 doc/src/sgml/extend.sgml
 delete mode 100644 doc/src/sgml/features.sgml
 delete mode 100644 doc/src/sgml/filelist.sgml
 delete mode 100755 doc/src/sgml/fixrtf
 delete mode 100644 doc/src/sgml/func-ref.sgml
 delete mode 100644 doc/src/sgml/func.sgml
 delete mode 100644 doc/src/sgml/geqo.sgml
 delete mode 100644 doc/src/sgml/gist.sgml
 delete mode 100644 doc/src/sgml/history.sgml
 delete mode 100644 doc/src/sgml/indexcost.sgml
 delete mode 100644 doc/src/sgml/indices.sgml
 delete mode 100644 doc/src/sgml/info.sgml
 delete mode 100644 doc/src/sgml/inherit.sgml
 delete mode 100644 doc/src/sgml/install-win32.sgml
 delete mode 100644 doc/src/sgml/installation.sgml
 delete mode 100644 doc/src/sgml/intro.sgml
 delete mode 100644 doc/src/sgml/jdbc.sgml
 delete mode 100644 doc/src/sgml/keywords.sgml
 delete mode 100644 doc/src/sgml/legal.sgml
 delete mode 100644 doc/src/sgml/libpgeasy.sgml
 delete mode 100644 doc/src/sgml/libpgtcl.sgml
 delete mode 100644 doc/src/sgml/libpq++.sgml
 delete mode 100644 doc/src/sgml/libpq.sgml
 delete mode 100644 doc/src/sgml/lobj.sgml
 delete mode 100644 doc/src/sgml/maintenance.sgml
 delete mode 100644 doc/src/sgml/manage-ag.sgml
 delete mode 100644 doc/src/sgml/manage.sgml
 delete mode 100644 doc/src/sgml/monitoring.sgml
 delete mode 100644 doc/src/sgml/mvcc.sgml
 delete mode 100644 doc/src/sgml/nls.sgml
 delete mode 100644 doc/src/sgml/notation.sgml
 delete mode 100644 doc/src/sgml/odbc.sgml
 delete mode 100644 doc/src/sgml/page.sgml
 delete mode 100644 doc/src/sgml/perform.sgml
 delete mode 100644 doc/src/sgml/plperl.sgml
 delete mode 100644 doc/src/sgml/plpython.sgml
 delete mode 100644 doc/src/sgml/plsql.sgml
 delete mode 100644 doc/src/sgml/pltcl.sgml
 delete mode 100644 doc/src/sgml/postgres.sgml
 delete mode 100644 doc/src/sgml/problems.sgml
 delete mode 100644 doc/src/sgml/programmer.sgml
 delete mode 100644 doc/src/sgml/protocol.sgml
 delete mode 100644 doc/src/sgml/pygresql.sgml
 delete mode 100644 doc/src/sgml/queries.sgml
 delete mode 100644 doc/src/sgml/query.sgml
 delete mode 100644 doc/src/sgml/recovery.sgml
 delete mode 100644 doc/src/sgml/ref/abort.sgml
 delete mode 100644 doc/src/sgml/ref/allfiles.sgml
 delete mode 100644 doc/src/sgml/ref/alter_database.sgml
 delete mode 100644 doc/src/sgml/ref/alter_group.sgml
 delete mode 100644 doc/src/sgml/ref/alter_table.sgml
 delete mode 100644 doc/src/sgml/ref/alter_trigger.sgml
 delete mode 100644 doc/src/sgml/ref/alter_user.sgml
 delete mode 100644 doc/src/sgml/ref/analyze.sgml
 delete mode 100644 doc/src/sgml/ref/begin.sgml
 delete mode 100644 doc/src/sgml/ref/checkpoint.sgml
 delete mode 100644 doc/src/sgml/ref/close.sgml
 delete mode 100644 doc/src/sgml/ref/cluster.sgml
 delete mode 100644 doc/src/sgml/ref/comment.sgml
 delete mode 100644 doc/src/sgml/ref/commit.sgml
 delete mode 100644 doc/src/sgml/ref/copy.sgml
 delete mode 100644 doc/src/sgml/ref/create_aggregate.sgml
 delete mode 100644 doc/src/sgml/ref/create_constraint.sgml
 delete mode 100644 doc/src/sgml/ref/create_database.sgml
 delete mode 100644 doc/src/sgml/ref/create_domain.sgml
 delete mode 100644 doc/src/sgml/ref/create_function.sgml
 delete mode 100644 doc/src/sgml/ref/create_group.sgml
 delete mode 100644 doc/src/sgml/ref/create_index.sgml
 delete mode 100644 doc/src/sgml/ref/create_language.sgml
 delete mode 100644 doc/src/sgml/ref/create_operator.sgml
 delete mode 100644 doc/src/sgml/ref/create_rule.sgml
 delete mode 100644 doc/src/sgml/ref/create_schema.sgml
 delete mode 100644 doc/src/sgml/ref/create_sequence.sgml
 delete mode 100644 doc/src/sgml/ref/create_table.sgml
 delete mode 100644 doc/src/sgml/ref/create_table_as.sgml
 delete mode 100644 doc/src/sgml/ref/create_trigger.sgml
 delete mode 100644 doc/src/sgml/ref/create_type.sgml
 delete mode 100644 doc/src/sgml/ref/create_user.sgml
 delete mode 100644 doc/src/sgml/ref/create_view.sgml
 delete mode 100644 doc/src/sgml/ref/createdb.sgml
 delete mode 100644 doc/src/sgml/ref/createlang.sgml
 delete mode 100644 doc/src/sgml/ref/createuser.sgml
 delete mode 100644 doc/src/sgml/ref/current_date.sgml
 delete mode 100644 doc/src/sgml/ref/current_time.sgml
 delete mode 100644 doc/src/sgml/ref/current_timestamp.sgml
 delete mode 100644 doc/src/sgml/ref/current_user.sgml
 delete mode 100644 doc/src/sgml/ref/declare.sgml
 delete mode 100644 doc/src/sgml/ref/delete.sgml
 delete mode 100644 doc/src/sgml/ref/drop_aggregate.sgml
 delete mode 100644 doc/src/sgml/ref/drop_database.sgml
 delete mode 100644 doc/src/sgml/ref/drop_domain.sgml
 delete mode 100644 doc/src/sgml/ref/drop_function.sgml
 delete mode 100644 doc/src/sgml/ref/drop_group.sgml
 delete mode 100644 doc/src/sgml/ref/drop_index.sgml
 delete mode 100644 doc/src/sgml/ref/drop_language.sgml
 delete mode 100644 doc/src/sgml/ref/drop_operator.sgml
 delete mode 100644 doc/src/sgml/ref/drop_rule.sgml
 delete mode 100644 doc/src/sgml/ref/drop_sequence.sgml
 delete mode 100644 doc/src/sgml/ref/drop_table.sgml
 delete mode 100644 doc/src/sgml/ref/drop_trigger.sgml
 delete mode 100644 doc/src/sgml/ref/drop_type.sgml
 delete mode 100644 doc/src/sgml/ref/drop_user.sgml
 delete mode 100644 doc/src/sgml/ref/drop_view.sgml
 delete mode 100644 doc/src/sgml/ref/dropdb.sgml
 delete mode 100644 doc/src/sgml/ref/droplang.sgml
 delete mode 100644 doc/src/sgml/ref/dropuser.sgml
 delete mode 100644 doc/src/sgml/ref/ecpg-ref.sgml
 delete mode 100644 doc/src/sgml/ref/end.sgml
 delete mode 100644 doc/src/sgml/ref/explain.sgml
 delete mode 100644 doc/src/sgml/ref/fetch.sgml
 delete mode 100644 doc/src/sgml/ref/grant.sgml
 delete mode 100644 doc/src/sgml/ref/initdb.sgml
 delete mode 100644 doc/src/sgml/ref/initlocation.sgml
 delete mode 100644 doc/src/sgml/ref/insert.sgml
 delete mode 100644 doc/src/sgml/ref/ipcclean.sgml
 delete mode 100644 doc/src/sgml/ref/listen.sgml
 delete mode 100644 doc/src/sgml/ref/load.sgml
 delete mode 100644 doc/src/sgml/ref/lock.sgml
 delete mode 100644 doc/src/sgml/ref/move.sgml
 delete mode 100644 doc/src/sgml/ref/notify.sgml
 delete mode 100644 doc/src/sgml/ref/pg_config-ref.sgml
 delete mode 100644 doc/src/sgml/ref/pg_ctl-ref.sgml
 delete mode 100644 doc/src/sgml/ref/pg_dump.sgml
 delete mode 100644 doc/src/sgml/ref/pg_dumpall.sgml
 delete mode 100644 doc/src/sgml/ref/pg_restore.sgml
 delete mode 100644 doc/src/sgml/ref/pgaccess-ref.sgml
 delete mode 100644 doc/src/sgml/ref/pgtclsh.sgml
 delete mode 100644 doc/src/sgml/ref/pgtksh.sgml
 delete mode 100644 doc/src/sgml/ref/postgres-ref.sgml
 delete mode 100644 doc/src/sgml/ref/postmaster.sgml
 delete mode 100644 doc/src/sgml/ref/psql-ref.sgml
 delete mode 100644 doc/src/sgml/ref/reindex.sgml
 delete mode 100644 doc/src/sgml/ref/reset.sgml
 delete mode 100644 doc/src/sgml/ref/revoke.sgml
 delete mode 100644 doc/src/sgml/ref/rollback.sgml
 delete mode 100644 doc/src/sgml/ref/select.sgml
 delete mode 100644 doc/src/sgml/ref/select_into.sgml
 delete mode 100644 doc/src/sgml/ref/set.sgml
 delete mode 100644 doc/src/sgml/ref/set_constraints.sgml
 delete mode 100644 doc/src/sgml/ref/set_session_auth.sgml
 delete mode 100644 doc/src/sgml/ref/set_transaction.sgml
 delete mode 100644 doc/src/sgml/ref/show.sgml
 delete mode 100644 doc/src/sgml/ref/truncate.sgml
 delete mode 100644 doc/src/sgml/ref/unlisten.sgml
 delete mode 100644 doc/src/sgml/ref/update.sgml
 delete mode 100644 doc/src/sgml/ref/vacuum.sgml
 delete mode 100644 doc/src/sgml/ref/vacuumdb.sgml
 delete mode 100644 doc/src/sgml/refentry.sgml
 delete mode 100644 doc/src/sgml/reference.ced
 delete mode 100644 doc/src/sgml/reference.sgml
 delete mode 100644 doc/src/sgml/regress.sgml
 delete mode 100644 doc/src/sgml/release.sgml
 delete mode 100644 doc/src/sgml/rules.sgml
 delete mode 100644 doc/src/sgml/runtime.sgml
 delete mode 100644 doc/src/sgml/sources.sgml
 delete mode 100644 doc/src/sgml/spi.sgml
 delete mode 100644 doc/src/sgml/sql.sgml
 delete mode 100644 doc/src/sgml/standalone-install.sgml
 delete mode 100644 doc/src/sgml/start.sgml
 delete mode 100644 doc/src/sgml/stylesheet.css
 delete mode 100644 doc/src/sgml/stylesheet.dsl
 delete mode 100644 doc/src/sgml/syntax.sgml
 delete mode 100644 doc/src/sgml/trigger.sgml
 delete mode 100644 doc/src/sgml/tutorial.sgml
 delete mode 100644 doc/src/sgml/typeconv.sgml
 delete mode 100644 doc/src/sgml/user-manag.sgml
 delete mode 100644 doc/src/sgml/user.sgml
 delete mode 100644 doc/src/sgml/version.sgml
 delete mode 100644 doc/src/sgml/wal.sgml
 delete mode 100644 doc/src/sgml/xaggr.sgml
 delete mode 100644 doc/src/sgml/xfunc.sgml
 delete mode 100644 doc/src/sgml/xindex.sgml
 delete mode 100644 doc/src/sgml/xoper.sgml
 delete mode 100644 doc/src/sgml/xplang.sgml
 delete mode 100644 doc/src/sgml/xtypes.sgml
 delete mode 100644 doc/src/sgml/y2k.sgml
 delete mode 100644 register.txt
 delete mode 100644 src/DEVELOPERS
 delete mode 100644 src/Makefile
 delete mode 100644 src/Makefile.global.in
 delete mode 100644 src/Makefile.shlib
 delete mode 100644 src/backend/Makefile
 delete mode 100644 src/backend/access/Makefile
 delete mode 100644 src/backend/access/common/Makefile
 delete mode 100644 src/backend/access/common/heaptuple.c
 delete mode 100644 src/backend/access/common/indextuple.c
 delete mode 100644 src/backend/access/common/indexvalid.c
 delete mode 100644 src/backend/access/common/printtup.c
 delete mode 100644 src/backend/access/common/scankey.c
 delete mode 100644 src/backend/access/common/tupdesc.c
 delete mode 100644 src/backend/access/gist/Makefile
 delete mode 100644 src/backend/access/gist/gist.c
 delete mode 100644 src/backend/access/gist/gistget.c
 delete mode 100644 src/backend/access/gist/gistscan.c
 delete mode 100644 src/backend/access/gist/giststrat.c
 delete mode 100644 src/backend/access/hash/Makefile
 delete mode 100644 src/backend/access/hash/hash.c
 delete mode 100644 src/backend/access/hash/hashfunc.c
 delete mode 100644 src/backend/access/hash/hashinsert.c
 delete mode 100644 src/backend/access/hash/hashovfl.c
 delete mode 100644 src/backend/access/hash/hashpage.c
 delete mode 100644 src/backend/access/hash/hashscan.c
 delete mode 100644 src/backend/access/hash/hashsearch.c
 delete mode 100644 src/backend/access/hash/hashstrat.c
 delete mode 100644 src/backend/access/hash/hashutil.c
 delete mode 100644 src/backend/access/heap/Makefile
 delete mode 100644 src/backend/access/heap/heapam.c
 delete mode 100644 src/backend/access/heap/hio.c
 delete mode 100644 src/backend/access/heap/tuptoaster.c
 delete mode 100644 src/backend/access/index/Makefile
 delete mode 100644 src/backend/access/index/genam.c
 delete mode 100644 src/backend/access/index/indexam.c
 delete mode 100644 src/backend/access/index/istrat.c
 delete mode 100644 src/backend/access/nbtree/Makefile
 delete mode 100644 src/backend/access/nbtree/README
 delete mode 100644 src/backend/access/nbtree/nbtcompare.c
 delete mode 100644 src/backend/access/nbtree/nbtinsert.c
 delete mode 100644 src/backend/access/nbtree/nbtpage.c
 delete mode 100644 src/backend/access/nbtree/nbtree.c
 delete mode 100644 src/backend/access/nbtree/nbtsearch.c
 delete mode 100644 src/backend/access/nbtree/nbtsort.c
 delete mode 100644 src/backend/access/nbtree/nbtstrat.c
 delete mode 100644 src/backend/access/nbtree/nbtutils.c
 delete mode 100644 src/backend/access/rtree/Makefile
 delete mode 100644 src/backend/access/rtree/rtget.c
 delete mode 100644 src/backend/access/rtree/rtproc.c
 delete mode 100644 src/backend/access/rtree/rtree.c
 delete mode 100644 src/backend/access/rtree/rtscan.c
 delete mode 100644 src/backend/access/rtree/rtstrat.c
 delete mode 100644 src/backend/access/transam/Makefile
 delete mode 100644 src/backend/access/transam/clog.c
 delete mode 100644 src/backend/access/transam/rmgr.c
 delete mode 100644 src/backend/access/transam/transam.c
 delete mode 100644 src/backend/access/transam/varsup.c
 delete mode 100644 src/backend/access/transam/xact.c
 delete mode 100644 src/backend/access/transam/xid.c
 delete mode 100644 src/backend/access/transam/xlog.c
 delete mode 100644 src/backend/access/transam/xlogutils.c
 delete mode 100644 src/backend/bootstrap/.cvsignore
 delete mode 100644 src/backend/bootstrap/Makefile
 delete mode 100644 src/backend/bootstrap/bootparse.y
 delete mode 100644 src/backend/bootstrap/bootscanner.l
 delete mode 100644 src/backend/bootstrap/bootstrap.c
 delete mode 100644 src/backend/catalog/Makefile
 delete mode 100644 src/backend/catalog/README
 delete mode 100644 src/backend/catalog/aclchk.c
 delete mode 100644 src/backend/catalog/catalog.c
 delete mode 100644 src/backend/catalog/genbki.sh
 delete mode 100644 src/backend/catalog/heap.c
 delete mode 100644 src/backend/catalog/index.c
 delete mode 100644 src/backend/catalog/indexing.c
 delete mode 100644 src/backend/catalog/namespace.c
 delete mode 100644 src/backend/catalog/pg_aggregate.c
 delete mode 100644 src/backend/catalog/pg_largeobject.c
 delete mode 100644 src/backend/catalog/pg_namespace.c
 delete mode 100644 src/backend/catalog/pg_operator.c
 delete mode 100644 src/backend/catalog/pg_proc.c
 delete mode 100644 src/backend/catalog/pg_type.c
 delete mode 100644 src/backend/commands/Makefile
 delete mode 100644 src/backend/commands/_deadcode/recipe.c
 delete mode 100644 src/backend/commands/_deadcode/recipe.h
 delete mode 100644 src/backend/commands/_deadcode/version.c
 delete mode 100644 src/backend/commands/aggregatecmds.c
 delete mode 100644 src/backend/commands/analyze.c
 delete mode 100644 src/backend/commands/async.c
 delete mode 100644 src/backend/commands/cluster.c
 delete mode 100644 src/backend/commands/comment.c
 delete mode 100644 src/backend/commands/copy.c
 delete mode 100644 src/backend/commands/dbcommands.c
 delete mode 100644 src/backend/commands/define.c
 delete mode 100644 src/backend/commands/explain.c
 delete mode 100644 src/backend/commands/functioncmds.c
 delete mode 100644 src/backend/commands/indexcmds.c
 delete mode 100644 src/backend/commands/lockcmds.c
 delete mode 100644 src/backend/commands/operatorcmds.c
 delete mode 100644 src/backend/commands/portalcmds.c
 delete mode 100644 src/backend/commands/proclang.c
 delete mode 100644 src/backend/commands/schemacmds.c
 delete mode 100644 src/backend/commands/sequence.c
 delete mode 100644 src/backend/commands/tablecmds.c
 delete mode 100644 src/backend/commands/trigger.c
 delete mode 100644 src/backend/commands/typecmds.c
 delete mode 100644 src/backend/commands/user.c
 delete mode 100644 src/backend/commands/vacuum.c
 delete mode 100644 src/backend/commands/vacuumlazy.c
 delete mode 100644 src/backend/commands/variable.c
 delete mode 100644 src/backend/commands/view.c
 delete mode 100644 src/backend/executor/Makefile
 delete mode 100644 src/backend/executor/README
 delete mode 100644 src/backend/executor/_deadcode/nodeTee.c
 delete mode 100644 src/backend/executor/execAmi.c
 delete mode 100644 src/backend/executor/execJunk.c
 delete mode 100644 src/backend/executor/execMain.c
 delete mode 100644 src/backend/executor/execProcnode.c
 delete mode 100644 src/backend/executor/execQual.c
 delete mode 100644 src/backend/executor/execScan.c
 delete mode 100644 src/backend/executor/execTuples.c
 delete mode 100644 src/backend/executor/execUtils.c
 delete mode 100644 src/backend/executor/functions.c
 delete mode 100644 src/backend/executor/instrument.c
 delete mode 100644 src/backend/executor/nodeAgg.c
 delete mode 100644 src/backend/executor/nodeAppend.c
 delete mode 100644 src/backend/executor/nodeFunctionscan.c
 delete mode 100644 src/backend/executor/nodeGroup.c
 delete mode 100644 src/backend/executor/nodeHash.c
 delete mode 100644 src/backend/executor/nodeHashjoin.c
 delete mode 100644 src/backend/executor/nodeIndexscan.c
 delete mode 100644 src/backend/executor/nodeLimit.c
 delete mode 100644 src/backend/executor/nodeMaterial.c
 delete mode 100644 src/backend/executor/nodeMergejoin.c
 delete mode 100644 src/backend/executor/nodeNestloop.c
 delete mode 100644 src/backend/executor/nodeResult.c
 delete mode 100644 src/backend/executor/nodeSeqscan.c
 delete mode 100644 src/backend/executor/nodeSetOp.c
 delete mode 100644 src/backend/executor/nodeSort.c
 delete mode 100644 src/backend/executor/nodeSubplan.c
 delete mode 100644 src/backend/executor/nodeSubqueryscan.c
 delete mode 100644 src/backend/executor/nodeTidscan.c
 delete mode 100644 src/backend/executor/nodeUnique.c
 delete mode 100644 src/backend/executor/spi.c
 delete mode 100644 src/backend/lib/Makefile
 delete mode 100644 src/backend/lib/bit.c
 delete mode 100644 src/backend/lib/dllist.c
 delete mode 100644 src/backend/lib/lispsort.c
 delete mode 100644 src/backend/lib/stringinfo.c
 delete mode 100644 src/backend/libpq/Makefile
 delete mode 100644 src/backend/libpq/README.SSL
 delete mode 100644 src/backend/libpq/auth.c
 delete mode 100644 src/backend/libpq/be-fsstubs.c
 delete mode 100644 src/backend/libpq/be-secure.c
 delete mode 100644 src/backend/libpq/crypt.c
 delete mode 100644 src/backend/libpq/hba.c
 delete mode 100644 src/backend/libpq/md5.c
 delete mode 100644 src/backend/libpq/pg_hba.conf.sample
 delete mode 100644 src/backend/libpq/pg_ident.conf.sample
 delete mode 100644 src/backend/libpq/pqcomm.c
 delete mode 100644 src/backend/libpq/pqformat.c
 delete mode 100644 src/backend/libpq/pqsignal.c
 delete mode 100644 src/backend/main/Makefile
 delete mode 100644 src/backend/main/main.c
 delete mode 100644 src/backend/nodes/Makefile
 delete mode 100644 src/backend/nodes/README
 delete mode 100644 src/backend/nodes/copyfuncs.c
 delete mode 100644 src/backend/nodes/equalfuncs.c
 delete mode 100644 src/backend/nodes/list.c
 delete mode 100644 src/backend/nodes/makefuncs.c
 delete mode 100644 src/backend/nodes/nodeFuncs.c
 delete mode 100644 src/backend/nodes/nodes.c
 delete mode 100644 src/backend/nodes/outfuncs.c
 delete mode 100644 src/backend/nodes/print.c
 delete mode 100644 src/backend/nodes/read.c
 delete mode 100644 src/backend/nodes/readfuncs.c
 delete mode 100644 src/backend/optimizer/Makefile
 delete mode 100644 src/backend/optimizer/README
 delete mode 100644 src/backend/optimizer/geqo/Makefile
 delete mode 100644 src/backend/optimizer/geqo/geqo_copy.c
 delete mode 100644 src/backend/optimizer/geqo/geqo_cx.c
 delete mode 100644 src/backend/optimizer/geqo/geqo_erx.c
 delete mode 100644 src/backend/optimizer/geqo/geqo_eval.c
 delete mode 100644 src/backend/optimizer/geqo/geqo_main.c
 delete mode 100644 src/backend/optimizer/geqo/geqo_misc.c
 delete mode 100644 src/backend/optimizer/geqo/geqo_mutation.c
 delete mode 100644 src/backend/optimizer/geqo/geqo_ox1.c
 delete mode 100644 src/backend/optimizer/geqo/geqo_ox2.c
 delete mode 100644 src/backend/optimizer/geqo/geqo_pmx.c
 delete mode 100644 src/backend/optimizer/geqo/geqo_pool.c
 delete mode 100644 src/backend/optimizer/geqo/geqo_px.c
 delete mode 100644 src/backend/optimizer/geqo/geqo_recombination.c
 delete mode 100644 src/backend/optimizer/geqo/geqo_selection.c
 delete mode 100644 src/backend/optimizer/path/Makefile
 delete mode 100644 src/backend/optimizer/path/_deadcode/predmig.c
 delete mode 100644 src/backend/optimizer/path/_deadcode/xfunc.c
 delete mode 100644 src/backend/optimizer/path/allpaths.c
 delete mode 100644 src/backend/optimizer/path/clausesel.c
 delete mode 100644 src/backend/optimizer/path/costsize.c
 delete mode 100644 src/backend/optimizer/path/indxpath.c
 delete mode 100644 src/backend/optimizer/path/joinpath.c
 delete mode 100644 src/backend/optimizer/path/joinrels.c
 delete mode 100644 src/backend/optimizer/path/orindxpath.c
 delete mode 100644 src/backend/optimizer/path/pathkeys.c
 delete mode 100644 src/backend/optimizer/path/tidpath.c
 delete mode 100644 src/backend/optimizer/plan/Makefile
 delete mode 100644 src/backend/optimizer/plan/README
 delete mode 100644 src/backend/optimizer/plan/createplan.c
 delete mode 100644 src/backend/optimizer/plan/initsplan.c
 delete mode 100644 src/backend/optimizer/plan/planmain.c
 delete mode 100644 src/backend/optimizer/plan/planner.c
 delete mode 100644 src/backend/optimizer/plan/setrefs.c
 delete mode 100644 src/backend/optimizer/plan/subselect.c
 delete mode 100644 src/backend/optimizer/prep/Makefile
 delete mode 100644 src/backend/optimizer/prep/_deadcode/prepkeyset.c
 delete mode 100644 src/backend/optimizer/prep/prepqual.c
 delete mode 100644 src/backend/optimizer/prep/preptlist.c
 delete mode 100644 src/backend/optimizer/prep/prepunion.c
 delete mode 100644 src/backend/optimizer/util/Makefile
 delete mode 100644 src/backend/optimizer/util/clauses.c
 delete mode 100644 src/backend/optimizer/util/joininfo.c
 delete mode 100644 src/backend/optimizer/util/pathnode.c
 delete mode 100644 src/backend/optimizer/util/plancat.c
 delete mode 100644 src/backend/optimizer/util/relnode.c
 delete mode 100644 src/backend/optimizer/util/restrictinfo.c
 delete mode 100644 src/backend/optimizer/util/tlist.c
 delete mode 100644 src/backend/optimizer/util/var.c
 delete mode 100644 src/backend/parser/.cvsignore
 delete mode 100644 src/backend/parser/Makefile
 delete mode 100644 src/backend/parser/README
 delete mode 100644 src/backend/parser/analyze.c
 delete mode 100644 src/backend/parser/gram.y
 delete mode 100644 src/backend/parser/keywords.c
 delete mode 100644 src/backend/parser/parse_agg.c
 delete mode 100644 src/backend/parser/parse_clause.c
 delete mode 100644 src/backend/parser/parse_coerce.c
 delete mode 100644 src/backend/parser/parse_expr.c
 delete mode 100644 src/backend/parser/parse_func.c
 delete mode 100644 src/backend/parser/parse_node.c
 delete mode 100644 src/backend/parser/parse_oper.c
 delete mode 100644 src/backend/parser/parse_relation.c
 delete mode 100644 src/backend/parser/parse_target.c
 delete mode 100644 src/backend/parser/parse_type.c
 delete mode 100644 src/backend/parser/parser.c
 delete mode 100644 src/backend/parser/scan.l
 delete mode 100644 src/backend/parser/scansup.c
 delete mode 100644 src/backend/po/Makefile
 delete mode 100644 src/backend/po/cs.po
 delete mode 100644 src/backend/po/de.po
 delete mode 100644 src/backend/po/hu.po
 delete mode 100644 src/backend/po/nls.mk
 delete mode 100644 src/backend/po/ru.po
 delete mode 100644 src/backend/po/zh_CN.po
 delete mode 100644 src/backend/po/zh_TW.po
 delete mode 100644 src/backend/port/Makefile
 delete mode 100755 src/backend/port/aix/mkldexport.sh
 delete mode 100644 src/backend/port/beos/Makefile
 delete mode 100644 src/backend/port/beos/sem.c
 delete mode 100644 src/backend/port/beos/shm.c
 delete mode 100644 src/backend/port/beos/support.c
 delete mode 100644 src/backend/port/darwin/Makefile
 delete mode 100644 src/backend/port/darwin/README
 delete mode 100644 src/backend/port/darwin/system.c
 delete mode 100644 src/backend/port/dynloader/README.dlfcn.aix
 delete mode 100644 src/backend/port/dynloader/aix.c
 delete mode 100644 src/backend/port/dynloader/aix.h
 delete mode 100644 src/backend/port/dynloader/beos.c
 delete mode 100644 src/backend/port/dynloader/beos.h
 delete mode 100644 src/backend/port/dynloader/bsdi.c
 delete mode 100644 src/backend/port/dynloader/bsdi.h
 delete mode 100644 src/backend/port/dynloader/darwin.c
 delete mode 100644 src/backend/port/dynloader/darwin.h
 delete mode 100644 src/backend/port/dynloader/dgux.c
 delete mode 100644 src/backend/port/dynloader/dgux.h
 delete mode 100644 src/backend/port/dynloader/freebsd.c
 delete mode 100644 src/backend/port/dynloader/freebsd.h
 delete mode 100644 src/backend/port/dynloader/hpux.c
 delete mode 100644 src/backend/port/dynloader/hpux.h
 delete mode 100644 src/backend/port/dynloader/irix5.c
 delete mode 100644 src/backend/port/dynloader/irix5.h
 delete mode 100644 src/backend/port/dynloader/linux.c
 delete mode 100644 src/backend/port/dynloader/linux.h
 delete mode 100644 src/backend/port/dynloader/netbsd.c
 delete mode 100644 src/backend/port/dynloader/netbsd.h
 delete mode 100644 src/backend/port/dynloader/nextstep.c
 delete mode 100644 src/backend/port/dynloader/nextstep.h
 delete mode 100644 src/backend/port/dynloader/openbsd.c
 delete mode 100644 src/backend/port/dynloader/openbsd.h
 delete mode 100644 src/backend/port/dynloader/osf.c
 delete mode 100644 src/backend/port/dynloader/osf.h
 delete mode 100644 src/backend/port/dynloader/qnx4.c
 delete mode 100644 src/backend/port/dynloader/qnx4.h
 delete mode 100644 src/backend/port/dynloader/sco.c
 delete mode 100644 src/backend/port/dynloader/sco.h
 delete mode 100644 src/backend/port/dynloader/solaris.c
 delete mode 100644 src/backend/port/dynloader/solaris.h
 delete mode 100644 src/backend/port/dynloader/sunos4.c
 delete mode 100644 src/backend/port/dynloader/sunos4.h
 delete mode 100644 src/backend/port/dynloader/svr4.c
 delete mode 100644 src/backend/port/dynloader/svr4.h
 delete mode 100644 src/backend/port/dynloader/ultrix4.c
 delete mode 100644 src/backend/port/dynloader/ultrix4.h
 delete mode 100644 src/backend/port/dynloader/univel.c
 delete mode 100644 src/backend/port/dynloader/univel.h
 delete mode 100644 src/backend/port/dynloader/unixware.c
 delete mode 100644 src/backend/port/dynloader/unixware.h
 delete mode 100644 src/backend/port/dynloader/win.c
 delete mode 100644 src/backend/port/dynloader/win.h
 delete mode 100644 src/backend/port/gethostname.c
 delete mode 100644 src/backend/port/getrusage.c
 delete mode 100644 src/backend/port/hpux/tas.c.template
 delete mode 100644 src/backend/port/inet_aton.c
 delete mode 100644 src/backend/port/inet_aton.h
 delete mode 100644 src/backend/port/ipc_test.c
 delete mode 100644 src/backend/port/isinf.c
 delete mode 100644 src/backend/port/memcmp.c
 delete mode 100644 src/backend/port/nextstep/Makefile
 delete mode 100644 src/backend/port/nextstep/port.c
 delete mode 100644 src/backend/port/posix_sema.c
 delete mode 100644 src/backend/port/qnx4/Makefile
 delete mode 100644 src/backend/port/qnx4/ipc.h
 delete mode 100644 src/backend/port/qnx4/isnan.c
 delete mode 100644 src/backend/port/qnx4/rint.c
 delete mode 100644 src/backend/port/qnx4/sem.c
 delete mode 100644 src/backend/port/qnx4/sem.h
 delete mode 100644 src/backend/port/qnx4/shm.c
 delete mode 100644 src/backend/port/qnx4/shm.h
 delete mode 100644 src/backend/port/qnx4/tstrint.c
 delete mode 100644 src/backend/port/qnx4/tstsem.c
 delete mode 100644 src/backend/port/qnx4/tstshm.c
 delete mode 100644 src/backend/port/random.c
 delete mode 100644 src/backend/port/snprintf.c
 delete mode 100644 src/backend/port/srandom.c
 delete mode 100644 src/backend/port/strcasecmp.c
 delete mode 100644 src/backend/port/strerror.c
 delete mode 100644 src/backend/port/strtol.c
 delete mode 100644 src/backend/port/strtoul.c
 delete mode 100644 src/backend/port/sunos4/Makefile
 delete mode 100644 src/backend/port/sunos4/float.h
 delete mode 100644 src/backend/port/sysv_sema.c
 delete mode 100644 src/backend/port/sysv_shmem.c
 delete mode 100644 src/backend/port/tas/dummy.s
 delete mode 100644 src/backend/port/tas/hpux.s
 delete mode 100644 src/backend/port/tas/solaris_i386.s
 delete mode 100644 src/backend/port/tas/solaris_sparc.s
 delete mode 100644 src/backend/postmaster/Makefile
 delete mode 100644 src/backend/postmaster/pgstat.c
 delete mode 100644 src/backend/postmaster/postmaster.c
 delete mode 100644 src/backend/regex/COPYRIGHT
 delete mode 100644 src/backend/regex/Makefile
 delete mode 100644 src/backend/regex/WHATSNEW
 delete mode 100644 src/backend/regex/engine.c
 delete mode 100644 src/backend/regex/re_format.7
 delete mode 100644 src/backend/regex/regcomp.c
 delete mode 100644 src/backend/regex/regerror.c
 delete mode 100644 src/backend/regex/regex.3
 delete mode 100644 src/backend/regex/regexec.c
 delete mode 100644 src/backend/regex/regfree.c
 delete mode 100644 src/backend/regex/retest.c
 delete mode 100644 src/backend/rewrite/Makefile
 delete mode 100644 src/backend/rewrite/rewriteDefine.c
 delete mode 100644 src/backend/rewrite/rewriteHandler.c
 delete mode 100644 src/backend/rewrite/rewriteManip.c
 delete mode 100644 src/backend/rewrite/rewriteRemove.c
 delete mode 100644 src/backend/rewrite/rewriteSupport.c
 delete mode 100644 src/backend/storage/Makefile
 delete mode 100644 src/backend/storage/buffer/Makefile
 delete mode 100644 src/backend/storage/buffer/README
 delete mode 100644 src/backend/storage/buffer/buf_init.c
 delete mode 100644 src/backend/storage/buffer/buf_table.c
 delete mode 100644 src/backend/storage/buffer/bufmgr.c
 delete mode 100644 src/backend/storage/buffer/freelist.c
 delete mode 100644 src/backend/storage/buffer/localbuf.c
 delete mode 100644 src/backend/storage/file/Makefile
 delete mode 100644 src/backend/storage/file/buffile.c
 delete mode 100644 src/backend/storage/file/fd.c
 delete mode 100644 src/backend/storage/freespace/Makefile
 delete mode 100644 src/backend/storage/freespace/freespace.c
 delete mode 100644 src/backend/storage/ipc/Makefile
 delete mode 100644 src/backend/storage/ipc/README
 delete mode 100644 src/backend/storage/ipc/ipc.c
 delete mode 100644 src/backend/storage/ipc/ipci.c
 delete mode 100644 src/backend/storage/ipc/pmsignal.c
 delete mode 100644 src/backend/storage/ipc/shmem.c
 delete mode 100644 src/backend/storage/ipc/shmqueue.c
 delete mode 100644 src/backend/storage/ipc/sinval.c
 delete mode 100644 src/backend/storage/ipc/sinvaladt.c
 delete mode 100644 src/backend/storage/large_object/Makefile
 delete mode 100644 src/backend/storage/large_object/inv_api.c
 delete mode 100644 src/backend/storage/lmgr/Makefile
 delete mode 100644 src/backend/storage/lmgr/README
 delete mode 100644 src/backend/storage/lmgr/deadlock.c
 delete mode 100644 src/backend/storage/lmgr/lmgr.c
 delete mode 100644 src/backend/storage/lmgr/lock.c
 delete mode 100644 src/backend/storage/lmgr/lwlock.c
 delete mode 100644 src/backend/storage/lmgr/proc.c
 delete mode 100644 src/backend/storage/lmgr/s_lock.c
 delete mode 100644 src/backend/storage/lmgr/spin.c
 delete mode 100644 src/backend/storage/page/Makefile
 delete mode 100644 src/backend/storage/page/bufpage.c
 delete mode 100644 src/backend/storage/page/itemptr.c
 delete mode 100644 src/backend/storage/smgr/Makefile
 delete mode 100644 src/backend/storage/smgr/README
 delete mode 100644 src/backend/storage/smgr/md.c
 delete mode 100644 src/backend/storage/smgr/mm.c
 delete mode 100644 src/backend/storage/smgr/smgr.c
 delete mode 100644 src/backend/storage/smgr/smgrtype.c
 delete mode 100644 src/backend/tcop/Makefile
 delete mode 100644 src/backend/tcop/dest.c
 delete mode 100644 src/backend/tcop/fastpath.c
 delete mode 100644 src/backend/tcop/postgres.c
 delete mode 100644 src/backend/tcop/pquery.c
 delete mode 100644 src/backend/tcop/utility.c
 delete mode 100644 src/backend/tioga/Arr_TgRecipe.h
 delete mode 100644 src/backend/tioga/Makefile
 delete mode 100644 src/backend/tioga/Varray.c
 delete mode 100644 src/backend/tioga/Varray.h
 delete mode 100644 src/backend/tioga/tgRecipe.c
 delete mode 100644 src/backend/tioga/tgRecipe.h
 delete mode 100644 src/backend/utils/.cvsignore
 delete mode 100644 src/backend/utils/Gen_fmgrtab.sh
 delete mode 100644 src/backend/utils/Makefile
 delete mode 100644 src/backend/utils/adt/Makefile
 delete mode 100644 src/backend/utils/adt/acl.c
 delete mode 100644 src/backend/utils/adt/arrayfuncs.c
 delete mode 100644 src/backend/utils/adt/arrayutils.c
 delete mode 100644 src/backend/utils/adt/ascii.c
 delete mode 100644 src/backend/utils/adt/bool.c
 delete mode 100644 src/backend/utils/adt/cash.c
 delete mode 100644 src/backend/utils/adt/char.c
 delete mode 100644 src/backend/utils/adt/date.c
 delete mode 100644 src/backend/utils/adt/datetime.c
 delete mode 100644 src/backend/utils/adt/datum.c
 delete mode 100644 src/backend/utils/adt/encode.c
 delete mode 100644 src/backend/utils/adt/float.c
 delete mode 100644 src/backend/utils/adt/format_type.c
 delete mode 100644 src/backend/utils/adt/formatting.c
 delete mode 100644 src/backend/utils/adt/geo_ops.c
 delete mode 100644 src/backend/utils/adt/geo_selfuncs.c
 delete mode 100644 src/backend/utils/adt/inet_net_ntop.c
 delete mode 100644 src/backend/utils/adt/inet_net_pton.c
 delete mode 100644 src/backend/utils/adt/int.c
 delete mode 100644 src/backend/utils/adt/int8.c
 delete mode 100644 src/backend/utils/adt/like.c
 delete mode 100644 src/backend/utils/adt/like_match.c
 delete mode 100644 src/backend/utils/adt/mac.c
 delete mode 100644 src/backend/utils/adt/misc.c
 delete mode 100644 src/backend/utils/adt/nabstime.c
 delete mode 100644 src/backend/utils/adt/name.c
 delete mode 100644 src/backend/utils/adt/network.c
 delete mode 100644 src/backend/utils/adt/not_in.c
 delete mode 100644 src/backend/utils/adt/numeric.c
 delete mode 100644 src/backend/utils/adt/numutils.c
 delete mode 100644 src/backend/utils/adt/oid.c
 delete mode 100644 src/backend/utils/adt/oracle_compat.c
 delete mode 100644 src/backend/utils/adt/pg_locale.c
 delete mode 100644 src/backend/utils/adt/pg_lzcompress.c
 delete mode 100644 src/backend/utils/adt/pgstatfuncs.c
 delete mode 100644 src/backend/utils/adt/quote.c
 delete mode 100644 src/backend/utils/adt/regexp.c
 delete mode 100644 src/backend/utils/adt/regproc.c
 delete mode 100644 src/backend/utils/adt/ri_triggers.c
 delete mode 100644 src/backend/utils/adt/ruleutils.c
 delete mode 100644 src/backend/utils/adt/selfuncs.c
 delete mode 100644 src/backend/utils/adt/sets.c
 delete mode 100644 src/backend/utils/adt/tid.c
 delete mode 100644 src/backend/utils/adt/timestamp.c
 delete mode 100644 src/backend/utils/adt/varbit.c
 delete mode 100644 src/backend/utils/adt/varchar.c
 delete mode 100644 src/backend/utils/adt/varlena.c
 delete mode 100644 src/backend/utils/adt/version.c
 delete mode 100644 src/backend/utils/cache/Makefile
 delete mode 100644 src/backend/utils/cache/catcache.c
 delete mode 100644 src/backend/utils/cache/fcache.c
 delete mode 100644 src/backend/utils/cache/inval.c
 delete mode 100644 src/backend/utils/cache/lsyscache.c
 delete mode 100644 src/backend/utils/cache/relcache.c
 delete mode 100644 src/backend/utils/cache/syscache.c
 delete mode 100644 src/backend/utils/error/Makefile
 delete mode 100644 src/backend/utils/error/assert.c
 delete mode 100644 src/backend/utils/error/elog.c
 delete mode 100644 src/backend/utils/error/exc.c
 delete mode 100644 src/backend/utils/error/excabort.c
 delete mode 100644 src/backend/utils/error/excid.c
 delete mode 100644 src/backend/utils/error/format.c
 delete mode 100644 src/backend/utils/fmgr/Makefile
 delete mode 100644 src/backend/utils/fmgr/README
 delete mode 100644 src/backend/utils/fmgr/dfmgr.c
 delete mode 100644 src/backend/utils/fmgr/fmgr.c
 delete mode 100644 src/backend/utils/hash/Makefile
 delete mode 100644 src/backend/utils/hash/dynahash.c
 delete mode 100644 src/backend/utils/hash/hashfn.c
 delete mode 100644 src/backend/utils/hash/pg_crc.c
 delete mode 100644 src/backend/utils/init/Makefile
 delete mode 100644 src/backend/utils/init/findbe.c
 delete mode 100644 src/backend/utils/init/globals.c
 delete mode 100644 src/backend/utils/init/miscinit.c
 delete mode 100644 src/backend/utils/init/postinit.c
 delete mode 100644 src/backend/utils/mb/Makefile
 delete mode 100644 src/backend/utils/mb/README
 delete mode 100644 src/backend/utils/mb/Unicode/ISO10646-GB18030.TXT
 delete mode 100644 src/backend/utils/mb/Unicode/Makefile
 delete mode 100755 src/backend/utils/mb/Unicode/UCS_to_8859.pl
 delete mode 100755 src/backend/utils/mb/Unicode/UCS_to_BIG5.pl
 delete mode 100755 src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl
 delete mode 100755 src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl
 delete mode 100755 src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl
 delete mode 100755 src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl
 delete mode 100755 src/backend/utils/mb/Unicode/UCS_to_GB18030.pl
 delete mode 100644 src/backend/utils/mb/Unicode/UCS_to_GBK.pl
 delete mode 100644 src/backend/utils/mb/Unicode/UCS_to_JOHAB.pl
 delete mode 100755 src/backend/utils/mb/Unicode/UCS_to_SJIS.pl
 delete mode 100644 src/backend/utils/mb/Unicode/UCS_to_UHC.pl
 delete mode 100644 src/backend/utils/mb/Unicode/UCS_to_WIN874.pl
 delete mode 100644 src/backend/utils/mb/Unicode/UCS_to_WINX.pl
 delete mode 100644 src/backend/utils/mb/Unicode/UCS_to_cyrillic.pl
 delete mode 100644 src/backend/utils/mb/Unicode/alt_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/big5_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/euc_cn_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/euc_jp_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/euc_kr_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/euc_tw_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/gb18030_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/gbk_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/iso8859_10_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/iso8859_13_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/iso8859_14_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/iso8859_15_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/iso8859_16_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/iso8859_2_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/iso8859_3_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/iso8859_4_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/iso8859_5_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/iso8859_6_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/iso8859_7_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/iso8859_8_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/iso8859_9_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/johab_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/koi8r_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/sjis_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/tcvn_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/ucs2utf.pl
 delete mode 100644 src/backend/utils/mb/Unicode/uhc_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_alt.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_big5.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_euc_cn.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_euc_jp.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_euc_kr.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_euc_tw.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_gb18030.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_gbk.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_iso8859_10.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_iso8859_13.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_iso8859_14.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_iso8859_15.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_iso8859_16.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_iso8859_2.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_iso8859_3.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_iso8859_4.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_iso8859_5.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_iso8859_6.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_iso8859_7.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_iso8859_8.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_iso8859_9.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_johab.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_koi8r.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_sjis.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_tcvn.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_uhc.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_win1250.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_win1251.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_win1256.map
 delete mode 100644 src/backend/utils/mb/Unicode/utf8_to_win874.map
 delete mode 100644 src/backend/utils/mb/Unicode/win1250_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/win1251_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/win1256_to_utf8.map
 delete mode 100644 src/backend/utils/mb/Unicode/win874_to_utf8.map
 delete mode 100644 src/backend/utils/mb/alt.c
 delete mode 100644 src/backend/utils/mb/big5.c
 delete mode 100644 src/backend/utils/mb/conv.c
 delete mode 100644 src/backend/utils/mb/encnames.c
 delete mode 100644 src/backend/utils/mb/iso.c
 delete mode 100644 src/backend/utils/mb/mbutils.c
 delete mode 100644 src/backend/utils/mb/sjis.map
 delete mode 100644 src/backend/utils/mb/wchar.c
 delete mode 100644 src/backend/utils/mb/win.c
 delete mode 100644 src/backend/utils/mb/win1251.c
 delete mode 100644 src/backend/utils/mb/wstrcmp.c
 delete mode 100644 src/backend/utils/mb/wstrncmp.c
 delete mode 100644 src/backend/utils/misc/.cvsignore
 delete mode 100644 src/backend/utils/misc/Makefile
 delete mode 100644 src/backend/utils/misc/README
 delete mode 100644 src/backend/utils/misc/database.c
 delete mode 100644 src/backend/utils/misc/guc-file.l
 delete mode 100644 src/backend/utils/misc/guc.c
 delete mode 100644 src/backend/utils/misc/postgresql.conf.sample
 delete mode 100644 src/backend/utils/misc/ps_status.c
 delete mode 100644 src/backend/utils/misc/superuser.c
 delete mode 100644 src/backend/utils/mmgr/Makefile
 delete mode 100644 src/backend/utils/mmgr/README
 delete mode 100644 src/backend/utils/mmgr/aset.c
 delete mode 100644 src/backend/utils/mmgr/mcxt.c
 delete mode 100644 src/backend/utils/mmgr/portalmem.c
 delete mode 100644 src/backend/utils/sort/Makefile
 delete mode 100644 src/backend/utils/sort/logtape.c
 delete mode 100644 src/backend/utils/sort/tuplesort.c
 delete mode 100644 src/backend/utils/sort/tuplestore.c
 delete mode 100644 src/backend/utils/time/Makefile
 delete mode 100644 src/backend/utils/time/tqual.c
 delete mode 100644 src/bin/Makefile
 delete mode 100644 src/bin/initdb/Makefile
 delete mode 100644 src/bin/initdb/initdb.sh
 delete mode 100644 src/bin/initlocation/Makefile
 delete mode 100644 src/bin/initlocation/initlocation.sh
 delete mode 100644 src/bin/ipcclean/Makefile
 delete mode 100644 src/bin/ipcclean/ipcclean.sh
 delete mode 100644 src/bin/pg_config/Makefile
 delete mode 100644 src/bin/pg_config/pg_config.sh
 delete mode 100644 src/bin/pg_ctl/Makefile
 delete mode 100755 src/bin/pg_ctl/pg_ctl.sh
 delete mode 100644 src/bin/pg_dump/Makefile
 delete mode 100644 src/bin/pg_dump/README
 delete mode 100644 src/bin/pg_dump/common.c
 delete mode 100644 src/bin/pg_dump/cs.po
 delete mode 100644 src/bin/pg_dump/de.po
 delete mode 100644 src/bin/pg_dump/nls.mk
 delete mode 100644 src/bin/pg_dump/pg_backup.h
 delete mode 100644 src/bin/pg_dump/pg_backup_archiver.c
 delete mode 100644 src/bin/pg_dump/pg_backup_archiver.h
 delete mode 100644 src/bin/pg_dump/pg_backup_custom.c
 delete mode 100644 src/bin/pg_dump/pg_backup_db.c
 delete mode 100644 src/bin/pg_dump/pg_backup_db.h
 delete mode 100644 src/bin/pg_dump/pg_backup_files.c
 delete mode 100644 src/bin/pg_dump/pg_backup_null.c
 delete mode 100644 src/bin/pg_dump/pg_backup_tar.c
 delete mode 100644 src/bin/pg_dump/pg_backup_tar.h
 delete mode 100644 src/bin/pg_dump/pg_dump.c
 delete mode 100644 src/bin/pg_dump/pg_dump.h
 delete mode 100644 src/bin/pg_dump/pg_dumpall.sh
 delete mode 100644 src/bin/pg_dump/pg_restore.c
 delete mode 100644 src/bin/pg_dump/ru.po
 delete mode 100644 src/bin/pg_dump/sv.po
 delete mode 100644 src/bin/pg_dump/zh_CN.po
 delete mode 100644 src/bin/pg_dump/zh_TW.po
 delete mode 100644 src/bin/pg_encoding/Makefile
 delete mode 100644 src/bin/pg_encoding/pg_encoding.c
 delete mode 100644 src/bin/pg_id/Makefile
 delete mode 100644 src/bin/pg_id/pg_id.c
 delete mode 100644 src/bin/pgaccess/Makefile
 delete mode 100644 src/bin/pgaccess/README
 delete mode 100644 src/bin/pgaccess/copyright.html
 delete mode 100644 src/bin/pgaccess/demo/formdemo.sql
 delete mode 100644 src/bin/pgaccess/doc/html/a_right.gif
 delete mode 100644 src/bin/pgaccess/doc/html/addindex.gif
 delete mode 100644 src/bin/pgaccess/doc/html/api.html
 delete mode 100644 src/bin/pgaccess/doc/html/ball.gif
 delete mode 100644 src/bin/pgaccess/doc/html/contents.html
 delete mode 100644 src/bin/pgaccess/doc/html/copyright.html
 delete mode 100644 src/bin/pgaccess/doc/html/documentation.html
 delete mode 100644 src/bin/pgaccess/doc/html/download.html
 delete mode 100644 src/bin/pgaccess/doc/html/faq.html
 delete mode 100644 src/bin/pgaccess/doc/html/features.html
 delete mode 100644 src/bin/pgaccess/doc/html/formdemo.sql
 delete mode 100644 src/bin/pgaccess/doc/html/forms.gif
 delete mode 100644 src/bin/pgaccess/doc/html/forms.html
 delete mode 100644 src/bin/pgaccess/doc/html/function.gif
 delete mode 100644 src/bin/pgaccess/doc/html/help.gif
 delete mode 100644 src/bin/pgaccess/doc/html/index.html
 delete mode 100644 src/bin/pgaccess/doc/html/irix.html
 delete mode 100644 src/bin/pgaccess/doc/html/linux1.gif
 delete mode 100644 src/bin/pgaccess/doc/html/maillist.html
 delete mode 100644 src/bin/pgaccess/doc/html/main.html
 delete mode 100644 src/bin/pgaccess/doc/html/mainwindow.gif
 delete mode 100644 src/bin/pgaccess/doc/html/newtable.gif
 delete mode 100644 src/bin/pgaccess/doc/html/newuser.gif
 delete mode 100644 src/bin/pgaccess/doc/html/old_index.html
 delete mode 100644 src/bin/pgaccess/doc/html/permissions.gif
 delete mode 100644 src/bin/pgaccess/doc/html/pg93patch.html
 delete mode 100644 src/bin/pgaccess/doc/html/pga-rad.html
 delete mode 100644 src/bin/pgaccess/doc/html/qbtclet.html
 delete mode 100644 src/bin/pgaccess/doc/html/qbtclet.tcl
 delete mode 100644 src/bin/pgaccess/doc/html/screenshots.html
 delete mode 100644 src/bin/pgaccess/doc/html/specialchars.html
 delete mode 100644 src/bin/pgaccess/doc/html/todo.html
 delete mode 100644 src/bin/pgaccess/doc/html/tutorial/addref.jpg
 delete mode 100644 src/bin/pgaccess/doc/html/tutorial/altern_q.jpg
 delete mode 100644 src/bin/pgaccess/doc/html/tutorial/altern_v.jpg
 delete mode 100644 src/bin/pgaccess/doc/html/tutorial/copyright.html
 delete mode 100644 src/bin/pgaccess/doc/html/tutorial/index.html
 delete mode 100644 src/bin/pgaccess/doc/html/tutorial/intro.html
 delete mode 100644 src/bin/pgaccess/doc/html/tutorial/irix.html
 delete mode 100644 src/bin/pgaccess/doc/html/tutorial/newref.txt
 delete mode 100644 src/bin/pgaccess/doc/html/tutorial/newtable.jpg
 delete mode 100644 src/bin/pgaccess/doc/html/tutorial/newtable.tga
 delete mode 100644 src/bin/pgaccess/doc/html/tutorial/problems.html
 delete mode 100644 src/bin/pgaccess/doc/html/tutorial/screen1.jpg
 delete mode 100644 src/bin/pgaccess/doc/html/tutorial/sel_tbl.jpg
 delete mode 100644 src/bin/pgaccess/doc/html/tutorial/start.html
 delete mode 100644 src/bin/pgaccess/doc/html/tutorial/tut.html
 delete mode 100644 src/bin/pgaccess/doc/html/tutorial/tut_edit.html
 delete mode 100644 src/bin/pgaccess/doc/html/tutorial/tut_new.html
 delete mode 100644 src/bin/pgaccess/doc/html/tutorial/tut_sel1.html
 delete mode 100644 src/bin/pgaccess/doc/html/tutorial/tut_user.html
 delete mode 100644 src/bin/pgaccess/doc/html/vdesigner.gif
 delete mode 100644 src/bin/pgaccess/doc/html/whatsnew.html
 delete mode 100644 src/bin/pgaccess/doc/html/win32.html
 delete mode 100644 src/bin/pgaccess/images/icon_button.gif
 delete mode 100644 src/bin/pgaccess/images/icon_checkbutton.gif
 delete mode 100644 src/bin/pgaccess/images/icon_entry.gif
 delete mode 100644 src/bin/pgaccess/images/icon_frame.gif
 delete mode 100644 src/bin/pgaccess/images/icon_label.gif
 delete mode 100644 src/bin/pgaccess/images/icon_listbox.gif
 delete mode 100644 src/bin/pgaccess/images/icon_query.gif
 delete mode 100644 src/bin/pgaccess/images/icon_radiobutton.gif
 delete mode 100644 src/bin/pgaccess/images/icon_text.gif
 delete mode 100644 src/bin/pgaccess/lib/database.tcl
 delete mode 100644 src/bin/pgaccess/lib/forms.tcl
 delete mode 100644 src/bin/pgaccess/lib/functions.tcl
 delete mode 100644 src/bin/pgaccess/lib/help.tcl
 delete mode 100644 src/bin/pgaccess/lib/help/abort.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/add_records.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/alter_table.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/alter_user.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/author.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/begin.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/close.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/cluster.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/commit.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/copy.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/copyrights.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/create_aggregate.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/create_database.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/create_function.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/create_index.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/create_language.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/create_operator.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/create_rule.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/create_sequence.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/create_table.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/create_table_as.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/create_trigger.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/create_type.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/create_user.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/create_view.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/data_types.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/datefunc.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/declare.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/delete.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/drop_aggregate.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/drop_database.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/drop_function.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/drop_index.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/drop_language.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/drop_operator.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/drop_rule.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/drop_sequence.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/drop_table.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/drop_trigger.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/drop_type.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/drop_user.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/drop_view.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/explain.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/fetch.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/form_design.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/forms.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/functions.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/geomfunc.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/grant.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/history.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/index.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/inheritance.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/insert.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/ipv4func.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/isolation.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/keywords.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/listen.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/load.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/lock.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/mathfunc.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/move.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/mvcc.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/new_query.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/new_table.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/notify.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/open_query.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/open_table.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/pgfunctions.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/postgresql.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/queries.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/reports.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/reset.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/revoke.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/rollback.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/schema.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/scripts.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/select.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/select_into.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/sequences.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/set.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/show.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/sql_guide.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/sqlfunc.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/stringfunc.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/tables.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/unlisten.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/update.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/users.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/vacuum.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/view_table_structure.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/views.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/visual_designer.hlp
 delete mode 100644 src/bin/pgaccess/lib/help/y2k.hlp
 delete mode 100644 src/bin/pgaccess/lib/languages/chinese_big5
 delete mode 100644 src/bin/pgaccess/lib/languages/chinese_gb
 delete mode 100644 src/bin/pgaccess/lib/languages/czech
 delete mode 100644 src/bin/pgaccess/lib/languages/deutsch
 delete mode 100644 src/bin/pgaccess/lib/languages/euskara
 delete mode 100644 src/bin/pgaccess/lib/languages/francais
 delete mode 100644 src/bin/pgaccess/lib/languages/italiano
 delete mode 100644 src/bin/pgaccess/lib/languages/japanese
 delete mode 100644 src/bin/pgaccess/lib/languages/magyar
 delete mode 100644 src/bin/pgaccess/lib/languages/nederlands
 delete mode 100644 src/bin/pgaccess/lib/languages/portugues
 delete mode 100644 src/bin/pgaccess/lib/languages/romana
 delete mode 100644 src/bin/pgaccess/lib/languages/russian.koi8r
 delete mode 100644 src/bin/pgaccess/lib/languages/russian_win
 delete mode 100644 src/bin/pgaccess/lib/languages/spanish
 delete mode 100644 src/bin/pgaccess/lib/mainlib.tcl
 delete mode 100644 src/bin/pgaccess/lib/preferences.tcl
 delete mode 100644 src/bin/pgaccess/lib/queries.tcl
 delete mode 100644 src/bin/pgaccess/lib/reports.tcl
 delete mode 100644 src/bin/pgaccess/lib/schema.tcl
 delete mode 100644 src/bin/pgaccess/lib/scripts.tcl
 delete mode 100644 src/bin/pgaccess/lib/sequences.tcl
 delete mode 100644 src/bin/pgaccess/lib/tables.tcl
 delete mode 100644 src/bin/pgaccess/lib/users.tcl
 delete mode 100644 src/bin/pgaccess/lib/views.tcl
 delete mode 100644 src/bin/pgaccess/lib/visualqb.tcl
 delete mode 100644 src/bin/pgaccess/main.tcl
 delete mode 100755 src/bin/pgaccess/pgaccess.sh
 delete mode 100644 src/bin/pgtclsh/Makefile
 delete mode 100644 src/bin/pgtclsh/README
 delete mode 100644 src/bin/pgtclsh/pgtclAppInit.c
 delete mode 100644 src/bin/pgtclsh/pgtclUtils.tcl
 delete mode 100644 src/bin/pgtclsh/pgtkAppInit.c
 delete mode 100644 src/bin/pgtclsh/updateStats.tcl
 delete mode 100644 src/bin/psql/.cvsignore
 delete mode 100644 src/bin/psql/Makefile
 delete mode 100644 src/bin/psql/command.c
 delete mode 100644 src/bin/psql/command.h
 delete mode 100644 src/bin/psql/common.c
 delete mode 100644 src/bin/psql/common.h
 delete mode 100644 src/bin/psql/copy.c
 delete mode 100644 src/bin/psql/copy.h
 delete mode 100644 src/bin/psql/create_help.pl
 delete mode 100644 src/bin/psql/cs.po
 delete mode 100644 src/bin/psql/de.po
 delete mode 100644 src/bin/psql/describe.c
 delete mode 100644 src/bin/psql/describe.h
 delete mode 100644 src/bin/psql/fr.po
 delete mode 100644 src/bin/psql/help.c
 delete mode 100644 src/bin/psql/help.h
 delete mode 100644 src/bin/psql/input.c
 delete mode 100644 src/bin/psql/input.h
 delete mode 100644 src/bin/psql/large_obj.c
 delete mode 100644 src/bin/psql/large_obj.h
 delete mode 100644 src/bin/psql/mainloop.c
 delete mode 100644 src/bin/psql/mainloop.h
 delete mode 100644 src/bin/psql/mbprint.c
 delete mode 100644 src/bin/psql/mbprint.h
 delete mode 100644 src/bin/psql/nls.mk
 delete mode 100644 src/bin/psql/print.c
 delete mode 100644 src/bin/psql/print.h
 delete mode 100644 src/bin/psql/prompt.c
 delete mode 100644 src/bin/psql/prompt.h
 delete mode 100644 src/bin/psql/ru.po
 delete mode 100644 src/bin/psql/settings.h
 delete mode 100644 src/bin/psql/startup.c
 delete mode 100644 src/bin/psql/stringutils.c
 delete mode 100644 src/bin/psql/stringutils.h
 delete mode 100644 src/bin/psql/sv.po
 delete mode 100644 src/bin/psql/tab-complete.c
 delete mode 100644 src/bin/psql/tab-complete.h
 delete mode 100644 src/bin/psql/variables.c
 delete mode 100644 src/bin/psql/variables.h
 delete mode 100644 src/bin/psql/win32.mak
 delete mode 100644 src/bin/psql/zh_CN.po
 delete mode 100644 src/bin/psql/zh_TW.po
 delete mode 100644 src/bin/scripts/Makefile
 delete mode 100644 src/bin/scripts/createdb
 delete mode 100644 src/bin/scripts/createlang.sh
 delete mode 100644 src/bin/scripts/createuser
 delete mode 100644 src/bin/scripts/dropdb
 delete mode 100644 src/bin/scripts/droplang
 delete mode 100644 src/bin/scripts/dropuser
 delete mode 100644 src/bin/scripts/vacuumdb
 delete mode 100644 src/corba/CosQuery.idl
 delete mode 100644 src/corba/CosQueryCollection.idl
 delete mode 100644 src/corba/pgsql.idl
 delete mode 100644 src/corba/pgsql_int.idl
 delete mode 100644 src/corba/server.cc
 delete mode 100644 src/data/charset.conf
 delete mode 100644 src/data/isocz-wincz.tab
 delete mode 100644 src/data/koi-alt.tab
 delete mode 100644 src/data/koi-iso.tab
 delete mode 100644 src/data/koi-koi.tab
 delete mode 100644 src/data/koi-mac.tab
 delete mode 100644 src/data/koi-win.tab
 delete mode 100644 src/include/Makefile
 delete mode 100644 src/include/access/attnum.h
 delete mode 100644 src/include/access/clog.h
 delete mode 100644 src/include/access/genam.h
 delete mode 100644 src/include/access/gist.h
 delete mode 100644 src/include/access/gistscan.h
 delete mode 100644 src/include/access/hash.h
 delete mode 100644 src/include/access/heapam.h
 delete mode 100644 src/include/access/hio.h
 delete mode 100644 src/include/access/htup.h
 delete mode 100644 src/include/access/ibit.h
 delete mode 100644 src/include/access/iqual.h
 delete mode 100644 src/include/access/istrat.h
 delete mode 100644 src/include/access/itup.h
 delete mode 100644 src/include/access/nbtree.h
 delete mode 100644 src/include/access/printtup.h
 delete mode 100644 src/include/access/relscan.h
 delete mode 100644 src/include/access/rmgr.h
 delete mode 100644 src/include/access/rtree.h
 delete mode 100644 src/include/access/rtscan.h
 delete mode 100644 src/include/access/sdir.h
 delete mode 100644 src/include/access/skey.h
 delete mode 100644 src/include/access/strat.h
 delete mode 100644 src/include/access/transam.h
 delete mode 100644 src/include/access/tupdesc.h
 delete mode 100644 src/include/access/tupmacs.h
 delete mode 100644 src/include/access/tuptoaster.h
 delete mode 100644 src/include/access/valid.h
 delete mode 100644 src/include/access/xact.h
 delete mode 100644 src/include/access/xlog.h
 delete mode 100644 src/include/access/xlogdefs.h
 delete mode 100644 src/include/access/xlogutils.h
 delete mode 100644 src/include/bootstrap/bootstrap.h
 delete mode 100644 src/include/c.h
 delete mode 100644 src/include/catalog/catalog.h
 delete mode 100644 src/include/catalog/catname.h
 delete mode 100644 src/include/catalog/catversion.h
 delete mode 100755 src/include/catalog/duplicate_oids
 delete mode 100644 src/include/catalog/heap.h
 delete mode 100644 src/include/catalog/index.h
 delete mode 100644 src/include/catalog/indexing.h
 delete mode 100644 src/include/catalog/namespace.h
 delete mode 100644 src/include/catalog/pg_aggregate.h
 delete mode 100644 src/include/catalog/pg_am.h
 delete mode 100644 src/include/catalog/pg_amop.h
 delete mode 100644 src/include/catalog/pg_amproc.h
 delete mode 100644 src/include/catalog/pg_attrdef.h
 delete mode 100644 src/include/catalog/pg_attribute.h
 delete mode 100644 src/include/catalog/pg_class.h
 delete mode 100644 src/include/catalog/pg_control.h
 delete mode 100644 src/include/catalog/pg_database.h
 delete mode 100644 src/include/catalog/pg_description.h
 delete mode 100644 src/include/catalog/pg_group.h
 delete mode 100644 src/include/catalog/pg_index.h
 delete mode 100644 src/include/catalog/pg_inherits.h
 delete mode 100644 src/include/catalog/pg_language.h
 delete mode 100644 src/include/catalog/pg_largeobject.h
 delete mode 100644 src/include/catalog/pg_listener.h
 delete mode 100644 src/include/catalog/pg_namespace.h
 delete mode 100644 src/include/catalog/pg_opclass.h
 delete mode 100644 src/include/catalog/pg_operator.h
 delete mode 100644 src/include/catalog/pg_proc.h
 delete mode 100644 src/include/catalog/pg_relcheck.h
 delete mode 100644 src/include/catalog/pg_rewrite.h
 delete mode 100644 src/include/catalog/pg_shadow.h
 delete mode 100644 src/include/catalog/pg_statistic.h
 delete mode 100644 src/include/catalog/pg_trigger.h
 delete mode 100644 src/include/catalog/pg_type.h
 delete mode 100644 src/include/catalog/pg_version.h
 delete mode 100755 src/include/catalog/unused_oids
 delete mode 100644 src/include/commands/async.h
 delete mode 100644 src/include/commands/cluster.h
 delete mode 100644 src/include/commands/comment.h
 delete mode 100644 src/include/commands/copy.h
 delete mode 100644 src/include/commands/dbcommands.h
 delete mode 100644 src/include/commands/defrem.h
 delete mode 100644 src/include/commands/explain.h
 delete mode 100644 src/include/commands/lockcmds.h
 delete mode 100644 src/include/commands/portalcmds.h
 delete mode 100644 src/include/commands/proclang.h
 delete mode 100644 src/include/commands/schemacmds.h
 delete mode 100644 src/include/commands/sequence.h
 delete mode 100644 src/include/commands/tablecmds.h
 delete mode 100644 src/include/commands/trigger.h
 delete mode 100644 src/include/commands/user.h
 delete mode 100644 src/include/commands/vacuum.h
 delete mode 100644 src/include/commands/variable.h
 delete mode 100644 src/include/commands/version.h
 delete mode 100644 src/include/commands/view.h
 delete mode 100644 src/include/executor/execdebug.h
 delete mode 100644 src/include/executor/execdefs.h
 delete mode 100644 src/include/executor/execdesc.h
 delete mode 100644 src/include/executor/executor.h
 delete mode 100644 src/include/executor/functions.h
 delete mode 100644 src/include/executor/hashjoin.h
 delete mode 100644 src/include/executor/instrument.h
 delete mode 100644 src/include/executor/nodeAgg.h
 delete mode 100644 src/include/executor/nodeAppend.h
 delete mode 100644 src/include/executor/nodeFunctionscan.h
 delete mode 100644 src/include/executor/nodeGroup.h
 delete mode 100644 src/include/executor/nodeHash.h
 delete mode 100644 src/include/executor/nodeHashjoin.h
 delete mode 100644 src/include/executor/nodeIndexscan.h
 delete mode 100644 src/include/executor/nodeLimit.h
 delete mode 100644 src/include/executor/nodeMaterial.h
 delete mode 100644 src/include/executor/nodeMergejoin.h
 delete mode 100644 src/include/executor/nodeNestloop.h
 delete mode 100644 src/include/executor/nodeResult.h
 delete mode 100644 src/include/executor/nodeSeqscan.h
 delete mode 100644 src/include/executor/nodeSetOp.h
 delete mode 100644 src/include/executor/nodeSort.h
 delete mode 100644 src/include/executor/nodeSubplan.h
 delete mode 100644 src/include/executor/nodeSubqueryscan.h
 delete mode 100644 src/include/executor/nodeTidscan.h
 delete mode 100644 src/include/executor/nodeUnique.h
 delete mode 100644 src/include/executor/spi.h
 delete mode 100644 src/include/executor/spi_priv.h
 delete mode 100644 src/include/executor/tuptable.h
 delete mode 100644 src/include/fmgr.h
 delete mode 100644 src/include/lib/dllist.h
 delete mode 100644 src/include/lib/lispsort.h
 delete mode 100644 src/include/lib/stringinfo.h
 delete mode 100644 src/include/libpq/auth.h
 delete mode 100644 src/include/libpq/be-fsstubs.h
 delete mode 100644 src/include/libpq/crypt.h
 delete mode 100644 src/include/libpq/hba.h
 delete mode 100644 src/include/libpq/libpq-be.h
 delete mode 100644 src/include/libpq/libpq-fs.h
 delete mode 100644 src/include/libpq/libpq.h
 delete mode 100644 src/include/libpq/password.h
 delete mode 100644 src/include/libpq/pqcomm.h
 delete mode 100644 src/include/libpq/pqformat.h
 delete mode 100644 src/include/libpq/pqsignal.h
 delete mode 100644 src/include/mb/pg_wchar.h
 delete mode 100644 src/include/miscadmin.h
 delete mode 100644 src/include/nodes/execnodes.h
 delete mode 100644 src/include/nodes/makefuncs.h
 delete mode 100644 src/include/nodes/memnodes.h
 delete mode 100644 src/include/nodes/nodeFuncs.h
 delete mode 100644 src/include/nodes/nodes.h
 delete mode 100644 src/include/nodes/params.h
 delete mode 100644 src/include/nodes/parsenodes.h
 delete mode 100644 src/include/nodes/pg_list.h
 delete mode 100644 src/include/nodes/plannodes.h
 delete mode 100644 src/include/nodes/primnodes.h
 delete mode 100644 src/include/nodes/print.h
 delete mode 100644 src/include/nodes/readfuncs.h
 delete mode 100644 src/include/nodes/relation.h
 delete mode 100644 src/include/optimizer/_deadcode/xfunc.h
 delete mode 100644 src/include/optimizer/clauses.h
 delete mode 100644 src/include/optimizer/cost.h
 delete mode 100644 src/include/optimizer/geqo.h
 delete mode 100644 src/include/optimizer/geqo_copy.h
 delete mode 100644 src/include/optimizer/geqo_gene.h
 delete mode 100644 src/include/optimizer/geqo_misc.h
 delete mode 100644 src/include/optimizer/geqo_mutation.h
 delete mode 100644 src/include/optimizer/geqo_pool.h
 delete mode 100644 src/include/optimizer/geqo_random.h
 delete mode 100644 src/include/optimizer/geqo_recombination.h
 delete mode 100644 src/include/optimizer/geqo_selection.h
 delete mode 100644 src/include/optimizer/joininfo.h
 delete mode 100644 src/include/optimizer/pathnode.h
 delete mode 100644 src/include/optimizer/paths.h
 delete mode 100644 src/include/optimizer/plancat.h
 delete mode 100644 src/include/optimizer/planmain.h
 delete mode 100644 src/include/optimizer/planner.h
 delete mode 100644 src/include/optimizer/prep.h
 delete mode 100644 src/include/optimizer/restrictinfo.h
 delete mode 100644 src/include/optimizer/subselect.h
 delete mode 100644 src/include/optimizer/tlist.h
 delete mode 100644 src/include/optimizer/var.h
 delete mode 100644 src/include/parser/analyze.h
 delete mode 100644 src/include/parser/gramparse.h
 delete mode 100644 src/include/parser/keywords.h
 delete mode 100644 src/include/parser/parse_agg.h
 delete mode 100644 src/include/parser/parse_clause.h
 delete mode 100644 src/include/parser/parse_coerce.h
 delete mode 100644 src/include/parser/parse_expr.h
 delete mode 100644 src/include/parser/parse_func.h
 delete mode 100644 src/include/parser/parse_node.h
 delete mode 100644 src/include/parser/parse_oper.h
 delete mode 100644 src/include/parser/parse_relation.h
 delete mode 100644 src/include/parser/parse_target.h
 delete mode 100644 src/include/parser/parse_type.h
 delete mode 100644 src/include/parser/parser.h
 delete mode 100644 src/include/parser/parsetree.h
 delete mode 100644 src/include/parser/scansup.h
 delete mode 100644 src/include/pg_config.h.in
 delete mode 100644 src/include/pg_config.h.win32
 delete mode 100644 src/include/pgstat.h
 delete mode 100644 src/include/port/aix.h
 delete mode 100644 src/include/port/beos.h
 delete mode 100644 src/include/port/bsdi.h
 delete mode 100644 src/include/port/darwin.h
 delete mode 100644 src/include/port/dgux.h
 delete mode 100644 src/include/port/freebsd.h
 delete mode 100644 src/include/port/hpux.h
 delete mode 100644 src/include/port/irix5.h
 delete mode 100644 src/include/port/linux.h
 delete mode 100644 src/include/port/netbsd.h
 delete mode 100644 src/include/port/nextstep.h
 delete mode 100644 src/include/port/openbsd.h
 delete mode 100644 src/include/port/osf.h
 delete mode 100644 src/include/port/qnx4.h
 delete mode 100644 src/include/port/sco.h
 delete mode 100644 src/include/port/solaris.h
 delete mode 100644 src/include/port/sunos4.h
 delete mode 100644 src/include/port/svr4.h
 delete mode 100644 src/include/port/ultrix4.h
 delete mode 100644 src/include/port/univel.h
 delete mode 100644 src/include/port/unixware.h
 delete mode 100644 src/include/port/win.h
 delete mode 100644 src/include/port/win32.h
 delete mode 100644 src/include/postgres.h
 delete mode 100644 src/include/postgres_ext.h
 delete mode 100644 src/include/postgres_fe.h
 delete mode 100644 src/include/regex/cclass.h
 delete mode 100644 src/include/regex/cname.h
 delete mode 100644 src/include/regex/regex.h
 delete mode 100644 src/include/regex/regex2.h
 delete mode 100644 src/include/regex/utils.h
 delete mode 100644 src/include/rewrite/prs2lock.h
 delete mode 100644 src/include/rewrite/rewriteDefine.h
 delete mode 100644 src/include/rewrite/rewriteHandler.h
 delete mode 100644 src/include/rewrite/rewriteManip.h
 delete mode 100644 src/include/rewrite/rewriteRemove.h
 delete mode 100644 src/include/rewrite/rewriteSupport.h
 delete mode 100644 src/include/rusagestub.h
 delete mode 100644 src/include/storage/backendid.h
 delete mode 100644 src/include/storage/block.h
 delete mode 100644 src/include/storage/buf.h
 delete mode 100644 src/include/storage/buf_internals.h
 delete mode 100644 src/include/storage/buffile.h
 delete mode 100644 src/include/storage/bufmgr.h
 delete mode 100644 src/include/storage/bufpage.h
 delete mode 100644 src/include/storage/fd.h
 delete mode 100644 src/include/storage/freespace.h
 delete mode 100644 src/include/storage/ipc.h
 delete mode 100644 src/include/storage/item.h
 delete mode 100644 src/include/storage/itemid.h
 delete mode 100644 src/include/storage/itempos.h
 delete mode 100644 src/include/storage/itemptr.h
 delete mode 100644 src/include/storage/large_object.h
 delete mode 100644 src/include/storage/lmgr.h
 delete mode 100644 src/include/storage/lock.h
 delete mode 100644 src/include/storage/lwlock.h
 delete mode 100644 src/include/storage/off.h
 delete mode 100644 src/include/storage/page.h
 delete mode 100644 src/include/storage/pg_sema.h
 delete mode 100644 src/include/storage/pg_shmem.h
 delete mode 100644 src/include/storage/pmsignal.h
 delete mode 100644 src/include/storage/pos.h
 delete mode 100644 src/include/storage/proc.h
 delete mode 100644 src/include/storage/relfilenode.h
 delete mode 100644 src/include/storage/s_lock.h
 delete mode 100644 src/include/storage/shmem.h
 delete mode 100644 src/include/storage/sinval.h
 delete mode 100644 src/include/storage/sinvaladt.h
 delete mode 100644 src/include/storage/smgr.h
 delete mode 100644 src/include/storage/spin.h
 delete mode 100644 src/include/strdup.h
 delete mode 100644 src/include/tcop/dest.h
 delete mode 100644 src/include/tcop/fastpath.h
 delete mode 100644 src/include/tcop/pquery.h
 delete mode 100644 src/include/tcop/tcopdebug.h
 delete mode 100644 src/include/tcop/tcopprot.h
 delete mode 100644 src/include/tcop/utility.h
 delete mode 100644 src/include/utils/acl.h
 delete mode 100644 src/include/utils/array.h
 delete mode 100644 src/include/utils/ascii.h
 delete mode 100644 src/include/utils/bit.h
 delete mode 100644 src/include/utils/builtins.h
 delete mode 100644 src/include/utils/cash.h
 delete mode 100644 src/include/utils/catcache.h
 delete mode 100644 src/include/utils/date.h
 delete mode 100644 src/include/utils/datetime.h
 delete mode 100644 src/include/utils/datum.h
 delete mode 100644 src/include/utils/dynahash.h
 delete mode 100644 src/include/utils/dynamic_loader.h
 delete mode 100644 src/include/utils/elog.h
 delete mode 100644 src/include/utils/exc.h
 delete mode 100644 src/include/utils/excid.h
 delete mode 100644 src/include/utils/fcache.h
 delete mode 100644 src/include/utils/fmgrtab.h
 delete mode 100644 src/include/utils/formatting.h
 delete mode 100644 src/include/utils/geo_decls.h
 delete mode 100644 src/include/utils/guc.h
 delete mode 100644 src/include/utils/hsearch.h
 delete mode 100644 src/include/utils/inet.h
 delete mode 100644 src/include/utils/int8.h
 delete mode 100644 src/include/utils/inval.h
 delete mode 100644 src/include/utils/logtape.h
 delete mode 100644 src/include/utils/lsyscache.h
 delete mode 100644 src/include/utils/memutils.h
 delete mode 100644 src/include/utils/nabstime.h
 delete mode 100644 src/include/utils/numeric.h
 delete mode 100644 src/include/utils/palloc.h
 delete mode 100644 src/include/utils/pg_crc.h
 delete mode 100644 src/include/utils/pg_locale.h
 delete mode 100644 src/include/utils/pg_lzcompress.h
 delete mode 100644 src/include/utils/portal.h
 delete mode 100644 src/include/utils/ps_status.h
 delete mode 100644 src/include/utils/rel.h
 delete mode 100644 src/include/utils/relcache.h
 delete mode 100644 src/include/utils/selfuncs.h
 delete mode 100644 src/include/utils/sets.h
 delete mode 100644 src/include/utils/syscache.h
 delete mode 100644 src/include/utils/timestamp.h
 delete mode 100644 src/include/utils/tqual.h
 delete mode 100644 src/include/utils/tuplesort.h
 delete mode 100644 src/include/utils/tuplestore.h
 delete mode 100644 src/include/utils/varbit.h
 delete mode 100644 src/interfaces/Makefile
 delete mode 100644 src/interfaces/cli/example1.c
 delete mode 100644 src/interfaces/cli/example2.c
 delete mode 100644 src/interfaces/cli/sqlcli.h
 delete mode 100644 src/interfaces/jdbc/CHANGELOG
 delete mode 100644 src/interfaces/jdbc/Implementation
 delete mode 100644 src/interfaces/jdbc/Makefile
 delete mode 100644 src/interfaces/jdbc/README
 delete mode 100644 src/interfaces/jdbc/build.xml
 delete mode 100644 src/interfaces/jdbc/example/ImageViewer.java
 delete mode 100644 src/interfaces/jdbc/example/Unicode.java
 delete mode 100644 src/interfaces/jdbc/example/basic.java
 delete mode 100644 src/interfaces/jdbc/example/blobtest.java
 delete mode 100644 src/interfaces/jdbc/example/corba/StockClient.java
 delete mode 100644 src/interfaces/jdbc/example/corba/StockDB.java
 delete mode 100644 src/interfaces/jdbc/example/corba/StockDispenserImpl.java
 delete mode 100644 src/interfaces/jdbc/example/corba/StockItemImpl.java
 delete mode 100644 src/interfaces/jdbc/example/corba/StockServer.java
 delete mode 100644 src/interfaces/jdbc/example/corba/readme
 delete mode 100755 src/interfaces/jdbc/example/corba/stock.idl
 delete mode 100644 src/interfaces/jdbc/example/corba/stock.sql
 delete mode 100644 src/interfaces/jdbc/example/datestyle.java
 delete mode 100644 src/interfaces/jdbc/example/metadata.java
 delete mode 100644 src/interfaces/jdbc/example/psql.java
 delete mode 100644 src/interfaces/jdbc/example/threadsafe.java
 delete mode 100644 src/interfaces/jdbc/jdbc.jpx
 delete mode 100644 src/interfaces/jdbc/org/postgresql/Connection.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/Driver.java.in
 delete mode 100644 src/interfaces/jdbc/org/postgresql/Field.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/PG_Stream.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/PostgresqlDataSource.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/ResultSet.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/Statement.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/core/BytePoolDim1.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/core/BytePoolDim2.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/core/Encoding.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/core/MemoryPool.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/core/ObjectPool.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/core/SimpleObjectPool.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/core/StartupPacket.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/errors.properties
 delete mode 100644 src/interfaces/jdbc/org/postgresql/errors_de.properties
 delete mode 100644 src/interfaces/jdbc/org/postgresql/errors_fr.properties
 delete mode 100644 src/interfaces/jdbc/org/postgresql/errors_it.properties
 delete mode 100644 src/interfaces/jdbc/org/postgresql/errors_nl.properties
 delete mode 100644 src/interfaces/jdbc/org/postgresql/errors_zh_TW.properties
 delete mode 100644 src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/fastpath/FastpathArg.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/geometric/PGbox.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/geometric/PGcircle.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/geometric/PGline.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/geometric/PGlseg.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/geometric/PGpath.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/geometric/PGpoint.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/geometric/PGpolygon.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/jdbc1/CallableStatement.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/jdbc1/Connection.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/jdbc1/PreparedStatement.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/jdbc1/ResultSet.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/jdbc1/ResultSetMetaData.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/jdbc1/Statement.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/jdbc2/Array.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/jdbc2/CallableStatement.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/jdbc2/Connection.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/jdbc2/PBatchUpdateException.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/jdbc2/PreparedStatement.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/jdbc2/ResultSetMetaData.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/jdbc2/Statement.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/jdbc2/UpdateableResultSet.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/largeobject/BlobInputStream.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/largeobject/BlobOutputStream.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/largeobject/LargeObject.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/largeobject/LargeObjectManager.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/largeobject/PGblob.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/largeobject/PGclob.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/test/JDBC2Tests.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/test/README
 delete mode 100644 src/interfaces/jdbc/org/postgresql/test/jdbc2/ANTTest.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/test/jdbc2/BatchExecuteTest.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/test/jdbc2/BlobTest.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/test/jdbc2/ConnectionTest.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/test/jdbc2/DateTest.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/test/jdbc2/DriverTest.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/test/jdbc2/EncodingTest.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/test/jdbc2/JBuilderTest.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/test/jdbc2/MiscTest.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/test/jdbc2/ResultSetTest.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/test/jdbc2/TimeTest.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/test/jdbc2/TimestampTest.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/test/jdbc2/UpdateableResultTest.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/util/MD5Digest.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/util/MessageTranslator.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/util/PGbytea.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/util/PGmoney.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/util/PGobject.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/util/PGtokenizer.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/util/PSQLException.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/util/Serialize.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/util/UnixCrypt.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/xa/ClientConnection.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/xa/TwoPhaseConnection.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/xa/TxConnection.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/xa/XAConnectionImpl.java
 delete mode 100644 src/interfaces/jdbc/org/postgresql/xa/XADataSourceImpl.java
 delete mode 100644 src/interfaces/jdbc/utils/CheckVersion.java
 delete mode 100755 src/interfaces/jdbc/utils/buildDriver
 delete mode 100644 src/interfaces/jdbc/utils/changelog.pl
 delete mode 100644 src/interfaces/libpgeasy/Makefile
 delete mode 100644 src/interfaces/libpgeasy/README
 delete mode 100644 src/interfaces/libpgeasy/examples/Makefile
 delete mode 100644 src/interfaces/libpgeasy/examples/pginsert.c
 delete mode 100644 src/interfaces/libpgeasy/examples/pgmultiresult.c
 delete mode 100644 src/interfaces/libpgeasy/examples/pgnulltest.c
 delete mode 100644 src/interfaces/libpgeasy/examples/pgwordcount.c
 delete mode 100644 src/interfaces/libpgeasy/halt.c
 delete mode 100644 src/interfaces/libpgeasy/halt.h
 delete mode 100644 src/interfaces/libpgeasy/libpgeasy.c
 delete mode 100644 src/interfaces/libpgeasy/libpgeasy.h
 delete mode 100644 src/interfaces/libpgtcl/Makefile
 delete mode 100644 src/interfaces/libpgtcl/README
 delete mode 100644 src/interfaces/libpgtcl/libpgtcl.def
 delete mode 100644 src/interfaces/libpgtcl/libpgtcl.h
 delete mode 100644 src/interfaces/libpgtcl/pgtcl.c
 delete mode 100644 src/interfaces/libpgtcl/pgtclCmds.c
 delete mode 100644 src/interfaces/libpgtcl/pgtclCmds.h
 delete mode 100644 src/interfaces/libpgtcl/pgtclId.c
 delete mode 100644 src/interfaces/libpgtcl/pgtclId.h
 delete mode 100644 src/interfaces/libpgtcl/win32.mak
 delete mode 100644 src/interfaces/libpq++/CHANGES
 delete mode 100644 src/interfaces/libpq++/Makefile
 delete mode 100644 src/interfaces/libpq++/README
 delete mode 100644 src/interfaces/libpq++/TODO
 delete mode 100644 src/interfaces/libpq++/examples/Makefile
 delete mode 100644 src/interfaces/libpq++/examples/testlibpq0.cc
 delete mode 100644 src/interfaces/libpq++/examples/testlibpq1.cc
 delete mode 100644 src/interfaces/libpq++/examples/testlibpq2.cc
 delete mode 100644 src/interfaces/libpq++/examples/testlibpq2.sql
 delete mode 100644 src/interfaces/libpq++/examples/testlibpq3.cc
 delete mode 100644 src/interfaces/libpq++/examples/testlibpq3.sql
 delete mode 100644 src/interfaces/libpq++/examples/testlibpq4.cc
 delete mode 100644 src/interfaces/libpq++/examples/testlibpq4.sql
 delete mode 100644 src/interfaces/libpq++/examples/testlibpq5.cc
 delete mode 100644 src/interfaces/libpq++/examples/testlibpq5.sql
 delete mode 100644 src/interfaces/libpq++/examples/testlibpq6.cc
 delete mode 100644 src/interfaces/libpq++/examples/testlo.cc
 delete mode 100644 src/interfaces/libpq++/libpq++.h
 delete mode 100644 src/interfaces/libpq++/libpq++dll.rc
 delete mode 100644 src/interfaces/libpq++/pgconnection.cc
 delete mode 100644 src/interfaces/libpq++/pgconnection.h
 delete mode 100644 src/interfaces/libpq++/pgcursordb.cc
 delete mode 100644 src/interfaces/libpq++/pgcursordb.h
 delete mode 100644 src/interfaces/libpq++/pgdatabase.cc
 delete mode 100644 src/interfaces/libpq++/pgdatabase.h
 delete mode 100644 src/interfaces/libpq++/pglobject.cc
 delete mode 100644 src/interfaces/libpq++/pglobject.h
 delete mode 100644 src/interfaces/libpq++/pgtransdb.cc
 delete mode 100644 src/interfaces/libpq++/pgtransdb.h
 delete mode 100644 src/interfaces/libpq++/win32.mak
 delete mode 100644 src/interfaces/libpq/Makefile
 delete mode 100644 src/interfaces/libpq/README
 delete mode 100644 src/interfaces/libpq/cs.po
 delete mode 100644 src/interfaces/libpq/de.po
 delete mode 100644 src/interfaces/libpq/fe-auth.c
 delete mode 100644 src/interfaces/libpq/fe-auth.h
 delete mode 100644 src/interfaces/libpq/fe-connect.c
 delete mode 100644 src/interfaces/libpq/fe-exec.c
 delete mode 100644 src/interfaces/libpq/fe-lobj.c
 delete mode 100644 src/interfaces/libpq/fe-misc.c
 delete mode 100644 src/interfaces/libpq/fe-print.c
 delete mode 100644 src/interfaces/libpq/fe-secure.c
 delete mode 100644 src/interfaces/libpq/fr.po
 delete mode 100644 src/interfaces/libpq/libpq-fe.h
 delete mode 100644 src/interfaces/libpq/libpq-int.h
 delete mode 100644 src/interfaces/libpq/libpq.rc
 delete mode 100644 src/interfaces/libpq/libpqdll.c
 delete mode 100644 src/interfaces/libpq/libpqdll.def
 delete mode 100644 src/interfaces/libpq/nls.mk
 delete mode 100644 src/interfaces/libpq/pqexpbuffer.c
 delete mode 100644 src/interfaces/libpq/pqexpbuffer.h
 delete mode 100644 src/interfaces/libpq/pqsignal.c
 delete mode 100644 src/interfaces/libpq/pqsignal.h
 delete mode 100644 src/interfaces/libpq/ru.po
 delete mode 100644 src/interfaces/libpq/sv.po
 delete mode 100644 src/interfaces/libpq/win32.c
 delete mode 100644 src/interfaces/libpq/win32.h
 delete mode 100644 src/interfaces/libpq/win32.mak
 delete mode 100644 src/interfaces/libpq/zh_CN.po
 delete mode 100644 src/interfaces/libpq/zh_TW.po
 delete mode 100644 src/interfaces/odbc/GNUmakefile
 delete mode 100644 src/interfaces/odbc/bind.c
 delete mode 100644 src/interfaces/odbc/bind.h
 delete mode 100644 src/interfaces/odbc/columninfo.c
 delete mode 100644 src/interfaces/odbc/columninfo.h
 delete mode 100644 src/interfaces/odbc/connection.c
 delete mode 100644 src/interfaces/odbc/connection.h
 delete mode 100644 src/interfaces/odbc/convert.c
 delete mode 100644 src/interfaces/odbc/convert.h
 delete mode 100644 src/interfaces/odbc/descriptor.h
 delete mode 100644 src/interfaces/odbc/dlg_specific.c
 delete mode 100644 src/interfaces/odbc/dlg_specific.h
 delete mode 100644 src/interfaces/odbc/dlg_wingui.c
 delete mode 100644 src/interfaces/odbc/drvconn.c
 delete mode 100644 src/interfaces/odbc/environ.c
 delete mode 100644 src/interfaces/odbc/environ.h
 delete mode 100644 src/interfaces/odbc/execute.c
 delete mode 100644 src/interfaces/odbc/gpps.c
 delete mode 100644 src/interfaces/odbc/gpps.h
 delete mode 100644 src/interfaces/odbc/info.c
 delete mode 100644 src/interfaces/odbc/info30.c
 delete mode 100644 src/interfaces/odbc/iodbc.h
 delete mode 100644 src/interfaces/odbc/isql.h
 delete mode 100644 src/interfaces/odbc/isqlext.h
 delete mode 100644 src/interfaces/odbc/license.txt
 delete mode 100644 src/interfaces/odbc/lobj.c
 delete mode 100644 src/interfaces/odbc/lobj.h
 delete mode 100644 src/interfaces/odbc/md5.c
 delete mode 100644 src/interfaces/odbc/md5.h
 delete mode 100644 src/interfaces/odbc/misc.c
 delete mode 100644 src/interfaces/odbc/misc.h
 delete mode 100644 src/interfaces/odbc/multibyte.c
 delete mode 100644 src/interfaces/odbc/multibyte.h
 delete mode 100644 src/interfaces/odbc/notice.txt
 delete mode 100644 src/interfaces/odbc/odbc.sql
 delete mode 100644 src/interfaces/odbc/odbcapi.c
 delete mode 100644 src/interfaces/odbc/odbcapi25w.c
 delete mode 100644 src/interfaces/odbc/odbcapi30.c
 delete mode 100644 src/interfaces/odbc/odbcapi30w.c
 delete mode 100755 src/interfaces/odbc/odbcapiw.c
 delete mode 100644 src/interfaces/odbc/odbcinst.ini
 delete mode 100644 src/interfaces/odbc/options.c
 delete mode 100644 src/interfaces/odbc/parse.c
 delete mode 100644 src/interfaces/odbc/pgapi30.c
 delete mode 100644 src/interfaces/odbc/pgapifunc.h
 delete mode 100644 src/interfaces/odbc/pgtypes.c
 delete mode 100644 src/interfaces/odbc/pgtypes.h
 delete mode 100644 src/interfaces/odbc/psqlodbc.c
 delete mode 100644 src/interfaces/odbc/psqlodbc.h
 delete mode 100644 src/interfaces/odbc/psqlodbc.rc
 delete mode 100644 src/interfaces/odbc/psqlodbc.reg
 delete mode 100644 src/interfaces/odbc/psqlodbc30.reg
 delete mode 100644 src/interfaces/odbc/psqlodbc30w.reg
 delete mode 100755 src/interfaces/odbc/psqlodbc_api30.def
 delete mode 100644 src/interfaces/odbc/psqlodbc_api30w.def
 delete mode 100644 src/interfaces/odbc/psqlodbc_apiw.def
 delete mode 100644 src/interfaces/odbc/psqlodbc_win32.def
 delete mode 100644 src/interfaces/odbc/qresult.c
 delete mode 100644 src/interfaces/odbc/qresult.h
 delete mode 100644 src/interfaces/odbc/readme.txt
 delete mode 100644 src/interfaces/odbc/resource.h
 delete mode 100644 src/interfaces/odbc/results.c
 delete mode 100644 src/interfaces/odbc/setup.c
 delete mode 100644 src/interfaces/odbc/setup.rul
 delete mode 100644 src/interfaces/odbc/socket.c
 delete mode 100644 src/interfaces/odbc/socket.h
 delete mode 100644 src/interfaces/odbc/statement.c
 delete mode 100644 src/interfaces/odbc/statement.h
 delete mode 100644 src/interfaces/odbc/tuple.c
 delete mode 100644 src/interfaces/odbc/tuple.h
 delete mode 100644 src/interfaces/odbc/tuplelist.c
 delete mode 100644 src/interfaces/odbc/tuplelist.h
 delete mode 100644 src/interfaces/odbc/version.h
 delete mode 100644 src/interfaces/odbc/win32.mak
 delete mode 100755 src/interfaces/odbc/win32_30.mak
 delete mode 100644 src/interfaces/odbc/win32_30w.mak
 delete mode 100644 src/interfaces/odbc/win32w.mak
 delete mode 100644 src/interfaces/odbc/win_md5.c
 delete mode 100644 src/interfaces/odbc/win_setup.h
 delete mode 100644 src/interfaces/odbc/win_unicode.c
 delete mode 100644 src/interfaces/perl5/Changes
 delete mode 100644 src/interfaces/perl5/GNUmakefile
 delete mode 100644 src/interfaces/perl5/MANIFEST
 delete mode 100644 src/interfaces/perl5/Makefile.PL
 delete mode 100644 src/interfaces/perl5/Pg.pm
 delete mode 100644 src/interfaces/perl5/Pg.xs
 delete mode 100644 src/interfaces/perl5/README
 delete mode 100644 src/interfaces/perl5/examples/ApachePg.pl
 delete mode 100644 src/interfaces/perl5/examples/example.newstyle
 delete mode 100644 src/interfaces/perl5/examples/example.oldstyle
 delete mode 100644 src/interfaces/perl5/ppport.h
 delete mode 100644 src/interfaces/perl5/test.pl
 delete mode 100644 src/interfaces/perl5/typemap
 delete mode 100644 src/interfaces/python/Announce
 delete mode 100644 src/interfaces/python/ChangeLog
 delete mode 100644 src/interfaces/python/GNUmakefile
 delete mode 100644 src/interfaces/python/PyGreSQL.spec
 delete mode 100644 src/interfaces/python/README
 delete mode 100644 src/interfaces/python/README.linux
 delete mode 100644 src/interfaces/python/Setup.in.raw
 delete mode 100644 src/interfaces/python/pg.py
 delete mode 100644 src/interfaces/python/pgdb.py
 delete mode 100644 src/interfaces/python/pgmodule.c
 delete mode 100755 src/interfaces/python/setup.py
 delete mode 100755 src/interfaces/python/tutorial/advanced.py
 delete mode 100755 src/interfaces/python/tutorial/basics.py
 delete mode 100755 src/interfaces/python/tutorial/func.py
 delete mode 100755 src/interfaces/python/tutorial/syscat.py
 delete mode 100644 src/interfaces/ssl/client.conf
 delete mode 100755 src/interfaces/ssl/mkcert.sh
 delete mode 100644 src/interfaces/ssl/pgkeygen.sh
 delete mode 100644 src/interfaces/ssl/root.conf
 delete mode 100644 src/interfaces/ssl/server.conf
 delete mode 100644 src/makefiles/Makefile.aix
 delete mode 100644 src/makefiles/Makefile.beos
 delete mode 100644 src/makefiles/Makefile.bsdi
 delete mode 100644 src/makefiles/Makefile.darwin
 delete mode 100644 src/makefiles/Makefile.dgux
 delete mode 100644 src/makefiles/Makefile.freebsd
 delete mode 100644 src/makefiles/Makefile.hpux
 delete mode 100644 src/makefiles/Makefile.irix5
 delete mode 100644 src/makefiles/Makefile.linux
 delete mode 100644 src/makefiles/Makefile.netbsd
 delete mode 100644 src/makefiles/Makefile.openbsd
 delete mode 100644 src/makefiles/Makefile.osf
 delete mode 100644 src/makefiles/Makefile.qnx4
 delete mode 100644 src/makefiles/Makefile.sco
 delete mode 100644 src/makefiles/Makefile.solaris
 delete mode 100644 src/makefiles/Makefile.sunos4
 delete mode 100644 src/makefiles/Makefile.svr4
 delete mode 100644 src/makefiles/Makefile.ultrix4
 delete mode 100644 src/makefiles/Makefile.univel
 delete mode 100644 src/makefiles/Makefile.unixware
 delete mode 100644 src/makefiles/Makefile.win
 delete mode 100644 src/nls-global.mk
 delete mode 100644 src/pl/Makefile
 delete mode 100644 src/pl/plperl/GNUmakefile
 delete mode 100644 src/pl/plperl/README
 delete mode 100644 src/pl/plperl/SPI.xs
 delete mode 100644 src/pl/plperl/eloglvl.c
 delete mode 100644 src/pl/plperl/eloglvl.h
 delete mode 100644 src/pl/plperl/plperl.c
 delete mode 100644 src/pl/plperl/ppport.h
 delete mode 100644 src/pl/plpgsql/Makefile
 delete mode 100644 src/pl/plpgsql/src/.cvsignore
 delete mode 100644 src/pl/plpgsql/src/INSTALL
 delete mode 100644 src/pl/plpgsql/src/Makefile
 delete mode 100644 src/pl/plpgsql/src/gram.y
 delete mode 100644 src/pl/plpgsql/src/pl_comp.c
 delete mode 100644 src/pl/plpgsql/src/pl_exec.c
 delete mode 100644 src/pl/plpgsql/src/pl_funcs.c
 delete mode 100644 src/pl/plpgsql/src/pl_handler.c
 delete mode 100644 src/pl/plpgsql/src/plpgsql.h
 delete mode 100644 src/pl/plpgsql/src/scan.l
 delete mode 100644 src/pl/plpgsql/test/README
 delete mode 100644 src/pl/plpgsql/test/expected/tables.out
 delete mode 100644 src/pl/plpgsql/test/expected/test.out
 delete mode 100644 src/pl/plpgsql/test/expected/triggers.out
 delete mode 100644 src/pl/plpgsql/test/expected/views.out
 delete mode 100755 src/pl/plpgsql/test/runtest
 delete mode 100644 src/pl/plpgsql/test/tables.sql
 delete mode 100644 src/pl/plpgsql/test/test.sql
 delete mode 100644 src/pl/plpgsql/test/triggers.sql
 delete mode 100644 src/pl/plpgsql/test/views.sql
 delete mode 100644 src/pl/plpython/Makefile
 delete mode 100644 src/pl/plpython/README
 delete mode 100644 src/pl/plpython/TODO
 delete mode 100644 src/pl/plpython/error.expected
 delete mode 100644 src/pl/plpython/feature.expected
 delete mode 100644 src/pl/plpython/plpython.c
 delete mode 100644 src/pl/plpython/plpython.h
 delete mode 100644 src/pl/plpython/plpython_depopulate.sql
 delete mode 100644 src/pl/plpython/plpython_deschema.sql
 delete mode 100644 src/pl/plpython/plpython_drop.sql
 delete mode 100644 src/pl/plpython/plpython_error.sql
 delete mode 100644 src/pl/plpython/plpython_function.sql
 delete mode 100644 src/pl/plpython/plpython_populate.sql
 delete mode 100644 src/pl/plpython/plpython_schema.sql
 delete mode 100644 src/pl/plpython/plpython_setof.sql
 delete mode 100644 src/pl/plpython/plpython_test.sql
 delete mode 100755 src/pl/plpython/test.sh
 delete mode 100644 src/pl/tcl/Makefile
 delete mode 100644 src/pl/tcl/license.terms
 delete mode 100644 src/pl/tcl/modules/Makefile
 delete mode 100644 src/pl/tcl/modules/README
 delete mode 100644 src/pl/tcl/modules/pltcl_delmod.in
 delete mode 100644 src/pl/tcl/modules/pltcl_listmod.in
 delete mode 100644 src/pl/tcl/modules/pltcl_loadmod.in
 delete mode 100644 src/pl/tcl/modules/unknown.pltcl
 delete mode 100644 src/pl/tcl/pltcl.c
 delete mode 100644 src/pl/tcl/test/README
 delete mode 100755 src/pl/tcl/test/runtest
 delete mode 100644 src/pl/tcl/test/test.expected
 delete mode 100644 src/pl/tcl/test/test_queries.sql
 delete mode 100644 src/pl/tcl/test/test_setup.sql
 delete mode 100644 src/template/aix
 delete mode 100644 src/template/beos
 delete mode 100644 src/template/bsdi
 delete mode 100644 src/template/darwin
 delete mode 100644 src/template/dgux
 delete mode 100644 src/template/freebsd
 delete mode 100644 src/template/hpux
 delete mode 100644 src/template/irix5
 delete mode 100644 src/template/linux
 delete mode 100644 src/template/netbsd
 delete mode 100644 src/template/nextstep
 delete mode 100644 src/template/openbsd
 delete mode 100644 src/template/osf
 delete mode 100644 src/template/qnx4
 delete mode 100644 src/template/sco
 delete mode 100644 src/template/solaris
 delete mode 100644 src/template/sunos4
 delete mode 100644 src/template/svr4
 delete mode 100644 src/template/ultrix4
 delete mode 100644 src/template/univel
 delete mode 100644 src/template/unixware
 delete mode 100644 src/template/win
 delete mode 100644 src/test/Makefile
 delete mode 100644 src/test/bench/Makefile
 delete mode 100644 src/test/bench/WISC-README
 delete mode 100755 src/test/bench/create.sh
 delete mode 100644 src/test/bench/create.source
 delete mode 100644 src/test/bench/perquery
 delete mode 100644 src/test/bench/query01
 delete mode 100644 src/test/bench/query02
 delete mode 100644 src/test/bench/query03
 delete mode 100644 src/test/bench/query04
 delete mode 100644 src/test/bench/query05
 delete mode 100644 src/test/bench/query06
 delete mode 100644 src/test/bench/query07
 delete mode 100644 src/test/bench/query08
 delete mode 100644 src/test/bench/query09
 delete mode 100644 src/test/bench/query10
 delete mode 100644 src/test/bench/query11
 delete mode 100644 src/test/bench/query12
 delete mode 100644 src/test/bench/query13
 delete mode 100644 src/test/bench/query14
 delete mode 100644 src/test/bench/query15
 delete mode 100644 src/test/bench/query16
 delete mode 100644 src/test/bench/query17
 delete mode 100644 src/test/bench/query18
 delete mode 100644 src/test/bench/query19
 delete mode 100644 src/test/bench/query20
 delete mode 100644 src/test/bench/query21
 delete mode 100644 src/test/bench/query22
 delete mode 100644 src/test/bench/query23
 delete mode 100644 src/test/bench/query24
 delete mode 100644 src/test/bench/query25
 delete mode 100644 src/test/bench/query26
 delete mode 100644 src/test/bench/query27
 delete mode 100644 src/test/bench/query28
 delete mode 100644 src/test/bench/query29
 delete mode 100644 src/test/bench/query30
 delete mode 100644 src/test/bench/query31
 delete mode 100644 src/test/bench/query32
 delete mode 100755 src/test/bench/runwisc.sh
 delete mode 100755 src/test/bench/wholebench.sh
 delete mode 100644 src/test/examples/Makefile
 delete mode 100644 src/test/examples/testlibpq.c
 delete mode 100644 src/test/examples/testlibpq2.c
 delete mode 100644 src/test/examples/testlibpq2.sql
 delete mode 100644 src/test/examples/testlibpq3.c
 delete mode 100644 src/test/examples/testlibpq3.sql
 delete mode 100644 src/test/examples/testlibpq4.c
 delete mode 100644 src/test/examples/testlo.c
 delete mode 100644 src/test/locale/Makefile
 delete mode 100644 src/test/locale/README
 delete mode 100644 src/test/locale/de_DE.ISO8859-1/Makefile
 delete mode 100644 src/test/locale/de_DE.ISO8859-1/README
 delete mode 100644 src/test/locale/de_DE.ISO8859-1/expected/de-ctype.out
 delete mode 100644 src/test/locale/de_DE.ISO8859-1/expected/test-de-char.sql.out
 delete mode 100644 src/test/locale/de_DE.ISO8859-1/expected/test-de-select.sql.out
 delete mode 100644 src/test/locale/de_DE.ISO8859-1/expected/test-de-sort.out
 delete mode 100644 src/test/locale/de_DE.ISO8859-1/expected/test-de-text.sql.out
 delete mode 100644 src/test/locale/de_DE.ISO8859-1/expected/test-de-upper-char.sql.out
 delete mode 100644 src/test/locale/de_DE.ISO8859-1/expected/test-de-upper-text.sql.out
 delete mode 100644 src/test/locale/de_DE.ISO8859-1/expected/test-de-upper-varchar.sql.out
 delete mode 100644 src/test/locale/de_DE.ISO8859-1/expected/test-de-varchar.sql.out
 delete mode 100755 src/test/locale/de_DE.ISO8859-1/runall
 delete mode 100644 src/test/locale/de_DE.ISO8859-1/test-de-select.sql.in
 delete mode 100644 src/test/locale/de_DE.ISO8859-1/test-de-sort.in
 delete mode 100644 src/test/locale/de_DE.ISO8859-1/test-de-upper.sql.in
 delete mode 100644 src/test/locale/de_DE.ISO8859-1/test-de.sql.in
 delete mode 100644 src/test/locale/gr_GR.ISO8859-7/Makefile
 delete mode 100644 src/test/locale/gr_GR.ISO8859-7/README
 delete mode 100644 src/test/locale/gr_GR.ISO8859-7/expected/gr-ctype.out
 delete mode 100644 src/test/locale/gr_GR.ISO8859-7/expected/test-gr-char.sql.out
 delete mode 100644 src/test/locale/gr_GR.ISO8859-7/expected/test-gr-select.sql.out
 delete mode 100644 src/test/locale/gr_GR.ISO8859-7/expected/test-gr-sort.out
 delete mode 100644 src/test/locale/gr_GR.ISO8859-7/expected/test-gr-text.sql.out
 delete mode 100644 src/test/locale/gr_GR.ISO8859-7/expected/test-gr-varchar.sql.out
 delete mode 100755 src/test/locale/gr_GR.ISO8859-7/runall
 delete mode 100644 src/test/locale/gr_GR.ISO8859-7/test-gr-select.sql.in
 delete mode 100644 src/test/locale/gr_GR.ISO8859-7/test-gr-sort.in
 delete mode 100644 src/test/locale/gr_GR.ISO8859-7/test-gr.sql.in
 delete mode 100644 src/test/locale/koi8-r/Makefile
 delete mode 100644 src/test/locale/koi8-r/expected/koi8-ctype.out
 delete mode 100644 src/test/locale/koi8-r/expected/test-koi8-char.sql.out
 delete mode 100644 src/test/locale/koi8-r/expected/test-koi8-select.sql.out
 delete mode 100644 src/test/locale/koi8-r/expected/test-koi8-sort.out
 delete mode 100644 src/test/locale/koi8-r/expected/test-koi8-text.sql.out
 delete mode 100644 src/test/locale/koi8-r/expected/test-koi8-varchar.sql.out
 delete mode 100755 src/test/locale/koi8-r/runall
 delete mode 100644 src/test/locale/koi8-r/test-koi8-select.sql.in
 delete mode 100644 src/test/locale/koi8-r/test-koi8-sort.in
 delete mode 100644 src/test/locale/koi8-r/test-koi8.sql.in
 delete mode 100644 src/test/locale/koi8-to-win1251/Makefile
 delete mode 100644 src/test/locale/koi8-to-win1251/README
 delete mode 100644 src/test/locale/koi8-to-win1251/expected/test-koi8-char.sql.out
 delete mode 100644 src/test/locale/koi8-to-win1251/expected/test-koi8-select.sql.out
 delete mode 100644 src/test/locale/koi8-to-win1251/expected/test-koi8-sort.out
 delete mode 100644 src/test/locale/koi8-to-win1251/expected/test-koi8-text.sql.out
 delete mode 100644 src/test/locale/koi8-to-win1251/expected/test-koi8-varchar.sql.out
 delete mode 100755 src/test/locale/koi8-to-win1251/runall
 delete mode 100644 src/test/locale/koi8-to-win1251/test-koi8-select.sql.in
 delete mode 100644 src/test/locale/koi8-to-win1251/test-koi8-sort.in
 delete mode 100644 src/test/locale/koi8-to-win1251/test-koi8.sql.in
 delete mode 100755 src/test/locale/sort-test.pl
 delete mode 100755 src/test/locale/sort-test.py
 delete mode 100644 src/test/locale/test-ctype.c
 delete mode 100644 src/test/locale/test-pgsql-locale.c
 delete mode 100644 src/test/mb/README
 delete mode 100644 src/test/mb/expected/big5.out
 delete mode 100644 src/test/mb/expected/euc_cn.out
 delete mode 100644 src/test/mb/expected/euc_jp.out
 delete mode 100644 src/test/mb/expected/euc_kr.out
 delete mode 100644 src/test/mb/expected/euc_tw.out
 delete mode 100644 src/test/mb/expected/mule_internal.out
 delete mode 100644 src/test/mb/expected/sjis.out
 delete mode 100644 src/test/mb/expected/unicode.out
 delete mode 100644 src/test/mb/mbregress.sh
 delete mode 100644 src/test/mb/sql/big5.sql
 delete mode 100644 src/test/mb/sql/euc_cn.sql
 delete mode 100644 src/test/mb/sql/euc_jp.sql
 delete mode 100644 src/test/mb/sql/euc_kr.sql
 delete mode 100644 src/test/mb/sql/euc_tw.sql
 delete mode 100644 src/test/mb/sql/mule_internal.sql
 delete mode 100644 src/test/mb/sql/sjis.sql
 delete mode 100644 src/test/mb/sql/unicode.sql
 delete mode 100644 src/test/performance/results/PgSQL.970926
 delete mode 100755 src/test/performance/runtests.pl
 delete mode 100644 src/test/performance/sqls/connection
 delete mode 100644 src/test/performance/sqls/crtsimple
 delete mode 100644 src/test/performance/sqls/crtsimpleidx
 delete mode 100644 src/test/performance/sqls/drpsimple
 delete mode 100644 src/test/performance/sqls/inssimple
 delete mode 100644 src/test/performance/sqls/inssimple.data
 delete mode 100644 src/test/performance/sqls/orbsimple
 delete mode 100644 src/test/performance/sqls/slcsimple
 delete mode 100644 src/test/performance/sqls/slcsimple.data
 delete mode 100644 src/test/performance/sqls/vacuum
 delete mode 100755 src/test/performance/start-pgsql.sh
 delete mode 100644 src/test/regress/GNUmakefile
 delete mode 100644 src/test/regress/Makefile
 delete mode 100644 src/test/regress/README
 delete mode 100644 src/test/regress/data/agg.data
 delete mode 100644 src/test/regress/data/constrf.data
 delete mode 100644 src/test/regress/data/constro.data
 delete mode 100644 src/test/regress/data/dept.data
 delete mode 100644 src/test/regress/data/desc.data
 delete mode 100644 src/test/regress/data/emp.data
 delete mode 100644 src/test/regress/data/hash.data
 delete mode 100644 src/test/regress/data/onek.data
 delete mode 100644 src/test/regress/data/person.data
 delete mode 100644 src/test/regress/data/real_city.data
 delete mode 100644 src/test/regress/data/rect.data
 delete mode 100644 src/test/regress/data/streets.data
 delete mode 100644 src/test/regress/data/stud_emp.data
 delete mode 100644 src/test/regress/data/student.data
 delete mode 100644 src/test/regress/data/tenk.data
 delete mode 100644 src/test/regress/expected/abstime-solaris-1947.out
 delete mode 100644 src/test/regress/expected/abstime.out
 delete mode 100644 src/test/regress/expected/aggregates.out
 delete mode 100644 src/test/regress/expected/alter_table.out
 delete mode 100644 src/test/regress/expected/arrays.out
 delete mode 100644 src/test/regress/expected/bit.out
 delete mode 100644 src/test/regress/expected/boolean.out
 delete mode 100644 src/test/regress/expected/box.out
 delete mode 100644 src/test/regress/expected/btree_index.out
 delete mode 100644 src/test/regress/expected/case.out
 delete mode 100644 src/test/regress/expected/char.out
 delete mode 100644 src/test/regress/expected/char_1.out
 delete mode 100644 src/test/regress/expected/circle.out
 delete mode 100644 src/test/regress/expected/comments.out
 delete mode 100644 src/test/regress/expected/create_aggregate.out
 delete mode 100644 src/test/regress/expected/create_index.out
 delete mode 100644 src/test/regress/expected/create_misc.out
 delete mode 100644 src/test/regress/expected/create_operator.out
 delete mode 100644 src/test/regress/expected/create_table.out
 delete mode 100644 src/test/regress/expected/create_type.out
 delete mode 100644 src/test/regress/expected/create_view.out
 delete mode 100644 src/test/regress/expected/date.out
 delete mode 100644 src/test/regress/expected/domain.out
 delete mode 100644 src/test/regress/expected/errors.out
 delete mode 100644 src/test/regress/expected/euc_cn.out
 delete mode 100644 src/test/regress/expected/euc_jp.out
 delete mode 100644 src/test/regress/expected/euc_kr.out
 delete mode 100644 src/test/regress/expected/euc_tw.out
 delete mode 100644 src/test/regress/expected/float4-exp-three-digits.out
 delete mode 100644 src/test/regress/expected/float4.out
 delete mode 100644 src/test/regress/expected/float8-exp-three-digits.out
 delete mode 100644 src/test/regress/expected/float8-fp-exception.out
 delete mode 100644 src/test/regress/expected/float8-small-is-zero.out
 delete mode 100644 src/test/regress/expected/float8.out
 delete mode 100644 src/test/regress/expected/foreign_key.out
 delete mode 100644 src/test/regress/expected/geometry-alpha-precision.out
 delete mode 100644 src/test/regress/expected/geometry-bsdi-precision.out
 delete mode 100644 src/test/regress/expected/geometry-i86-gnulibc.out
 delete mode 100644 src/test/regress/expected/geometry-intel-beos.out
 delete mode 100644 src/test/regress/expected/geometry-irix.out
 delete mode 100644 src/test/regress/expected/geometry-positive-zeros-bsd.out
 delete mode 100644 src/test/regress/expected/geometry-positive-zeros.out
 delete mode 100644 src/test/regress/expected/geometry-powerpc-aix4.out
 delete mode 100644 src/test/regress/expected/geometry-powerpc-darwin.out
 delete mode 100644 src/test/regress/expected/geometry-powerpc-linux-gnulibc1.out
 delete mode 100644 src/test/regress/expected/geometry-solaris-i386-pc.out
 delete mode 100644 src/test/regress/expected/geometry-solaris-precision.out
 delete mode 100644 src/test/regress/expected/geometry-uw7-cc.out
 delete mode 100644 src/test/regress/expected/geometry-uw7-gcc.out
 delete mode 100644 src/test/regress/expected/geometry.out
 delete mode 100644 src/test/regress/expected/hash_index.out
 delete mode 100644 src/test/regress/expected/horology-no-DST-before-1970.out
 delete mode 100644 src/test/regress/expected/horology-solaris-1947.out
 delete mode 100644 src/test/regress/expected/horology.out
 delete mode 100644 src/test/regress/expected/inet.out
 delete mode 100644 src/test/regress/expected/inherit.out
 delete mode 100644 src/test/regress/expected/insert.out
 delete mode 100644 src/test/regress/expected/int2.out
 delete mode 100644 src/test/regress/expected/int4.out
 delete mode 100644 src/test/regress/expected/int8-exp-three-digits.out
 delete mode 100644 src/test/regress/expected/int8.out
 delete mode 100644 src/test/regress/expected/interval.out
 delete mode 100644 src/test/regress/expected/join.out
 delete mode 100644 src/test/regress/expected/limit.out
 delete mode 100644 src/test/regress/expected/lseg.out
 delete mode 100644 src/test/regress/expected/mule_internal.out
 delete mode 100644 src/test/regress/expected/name.out
 delete mode 100644 src/test/regress/expected/numeric.out
 delete mode 100644 src/test/regress/expected/numeric_big.out
 delete mode 100644 src/test/regress/expected/numerology.out
 delete mode 100644 src/test/regress/expected/oid.out
 delete mode 100644 src/test/regress/expected/oidjoins.out
 delete mode 100644 src/test/regress/expected/opr_sanity.out
 delete mode 100644 src/test/regress/expected/path.out
 delete mode 100644 src/test/regress/expected/plpgsql.out
 delete mode 100644 src/test/regress/expected/point.out
 delete mode 100644 src/test/regress/expected/polygon.out
 delete mode 100644 src/test/regress/expected/portals.out
 delete mode 100644 src/test/regress/expected/portals_p2.out
 delete mode 100644 src/test/regress/expected/privileges.out
 delete mode 100644 src/test/regress/expected/random.out
 delete mode 100644 src/test/regress/expected/reltime.out
 delete mode 100644 src/test/regress/expected/rules.out
 delete mode 100644 src/test/regress/expected/sanity_check.out
 delete mode 100644 src/test/regress/expected/select.out
 delete mode 100644 src/test/regress/expected/select_distinct.out
 delete mode 100644 src/test/regress/expected/select_distinct_on.out
 delete mode 100644 src/test/regress/expected/select_having.out
 delete mode 100644 src/test/regress/expected/select_having_1.out
 delete mode 100644 src/test/regress/expected/select_implicit.out
 delete mode 100644 src/test/regress/expected/select_implicit_1.out
 delete mode 100644 src/test/regress/expected/select_into.out
 delete mode 100644 src/test/regress/expected/select_views.out
 delete mode 100644 src/test/regress/expected/select_views_1.out
 delete mode 100644 src/test/regress/expected/sql_ascii.out
 delete mode 100644 src/test/regress/expected/strings.out
 delete mode 100644 src/test/regress/expected/subselect.out
 delete mode 100644 src/test/regress/expected/temp.out
 delete mode 100644 src/test/regress/expected/text.out
 delete mode 100644 src/test/regress/expected/time.out
 delete mode 100644 src/test/regress/expected/timestamp.out
 delete mode 100644 src/test/regress/expected/timestamptz.out
 delete mode 100644 src/test/regress/expected/timetz.out
 delete mode 100644 src/test/regress/expected/tinterval-solaris-1947.out
 delete mode 100644 src/test/regress/expected/tinterval.out
 delete mode 100644 src/test/regress/expected/transactions.out
 delete mode 100644 src/test/regress/expected/triggers.out
 delete mode 100644 src/test/regress/expected/type_sanity.out
 delete mode 100644 src/test/regress/expected/union.out
 delete mode 100644 src/test/regress/expected/varchar.out
 delete mode 100644 src/test/regress/expected/varchar_1.out
 delete mode 100644 src/test/regress/input/constraints.source
 delete mode 100644 src/test/regress/input/copy.source
 delete mode 100644 src/test/regress/input/create_function_1.source
 delete mode 100644 src/test/regress/input/create_function_2.source
 delete mode 100644 src/test/regress/input/misc.source
 delete mode 100644 src/test/regress/output/constraints.source
 delete mode 100644 src/test/regress/output/copy.source
 delete mode 100644 src/test/regress/output/create_function_1.source
 delete mode 100644 src/test/regress/output/create_function_2.source
 delete mode 100644 src/test/regress/output/misc.source
 delete mode 100644 src/test/regress/parallel_schedule
 delete mode 100644 src/test/regress/pg_regress.sh
 delete mode 100644 src/test/regress/regress.c
 delete mode 100755 src/test/regress/regressplans.sh
 delete mode 100644 src/test/regress/resultmap
 delete mode 100644 src/test/regress/serial_schedule
 delete mode 100644 src/test/regress/sql/abstime.sql
 delete mode 100644 src/test/regress/sql/aggregates.sql
 delete mode 100644 src/test/regress/sql/alter_table.sql
 delete mode 100644 src/test/regress/sql/arrays.sql
 delete mode 100644 src/test/regress/sql/bit.sql
 delete mode 100644 src/test/regress/sql/boolean.sql
 delete mode 100644 src/test/regress/sql/box.sql
 delete mode 100644 src/test/regress/sql/btree_index.sql
 delete mode 100644 src/test/regress/sql/case.sql
 delete mode 100644 src/test/regress/sql/char.sql
 delete mode 100644 src/test/regress/sql/circle.sql
 delete mode 100644 src/test/regress/sql/comments.sql
 delete mode 100644 src/test/regress/sql/create_aggregate.sql
 delete mode 100644 src/test/regress/sql/create_index.sql
 delete mode 100644 src/test/regress/sql/create_misc.sql
 delete mode 100644 src/test/regress/sql/create_operator.sql
 delete mode 100644 src/test/regress/sql/create_table.sql
 delete mode 100644 src/test/regress/sql/create_type.sql
 delete mode 100644 src/test/regress/sql/create_view.sql
 delete mode 100644 src/test/regress/sql/date.sql
 delete mode 100644 src/test/regress/sql/domain.sql
 delete mode 100644 src/test/regress/sql/drop.sql
 delete mode 100644 src/test/regress/sql/errors.sql
 delete mode 100644 src/test/regress/sql/euc_cn.sql
 delete mode 100644 src/test/regress/sql/euc_jp.sql
 delete mode 100644 src/test/regress/sql/euc_kr.sql
 delete mode 100644 src/test/regress/sql/euc_tw.sql
 delete mode 100644 src/test/regress/sql/float4.sql
 delete mode 100644 src/test/regress/sql/float8.sql
 delete mode 100644 src/test/regress/sql/foreign_key.sql
 delete mode 100644 src/test/regress/sql/geometry.sql
 delete mode 100644 src/test/regress/sql/hash_index.sql
 delete mode 100644 src/test/regress/sql/horology.sql
 delete mode 100644 src/test/regress/sql/inet.sql
 delete mode 100644 src/test/regress/sql/inherit.sql
 delete mode 100644 src/test/regress/sql/insert.sql
 delete mode 100644 src/test/regress/sql/int2.sql
 delete mode 100644 src/test/regress/sql/int4.sql
 delete mode 100644 src/test/regress/sql/int8.sql
 delete mode 100644 src/test/regress/sql/interval.sql
 delete mode 100644 src/test/regress/sql/join.sql
 delete mode 100644 src/test/regress/sql/limit.sql
 delete mode 100644 src/test/regress/sql/lseg.sql
 delete mode 100644 src/test/regress/sql/mule_internal.sql
 delete mode 100644 src/test/regress/sql/name.sql
 delete mode 100644 src/test/regress/sql/numeric.sql
 delete mode 100644 src/test/regress/sql/numeric_big.sql
 delete mode 100644 src/test/regress/sql/numerology.sql
 delete mode 100644 src/test/regress/sql/oid.sql
 delete mode 100644 src/test/regress/sql/oidjoins.sql
 delete mode 100644 src/test/regress/sql/opr_sanity.sql
 delete mode 100644 src/test/regress/sql/path.sql
 delete mode 100644 src/test/regress/sql/plpgsql.sql
 delete mode 100644 src/test/regress/sql/point.sql
 delete mode 100644 src/test/regress/sql/polygon.sql
 delete mode 100644 src/test/regress/sql/portals.sql
 delete mode 100644 src/test/regress/sql/portals_p2.sql
 delete mode 100644 src/test/regress/sql/privileges.sql
 delete mode 100644 src/test/regress/sql/random.sql
 delete mode 100644 src/test/regress/sql/reltime.sql
 delete mode 100644 src/test/regress/sql/rules.sql
 delete mode 100644 src/test/regress/sql/sanity_check.sql
 delete mode 100644 src/test/regress/sql/select.sql
 delete mode 100644 src/test/regress/sql/select_distinct.sql
 delete mode 100644 src/test/regress/sql/select_distinct_on.sql
 delete mode 100644 src/test/regress/sql/select_having.sql
 delete mode 100644 src/test/regress/sql/select_implicit.sql
 delete mode 100644 src/test/regress/sql/select_into.sql
 delete mode 100644 src/test/regress/sql/select_views.sql
 delete mode 100644 src/test/regress/sql/sql_ascii.sql
 delete mode 100644 src/test/regress/sql/strings.sql
 delete mode 100644 src/test/regress/sql/subselect.sql
 delete mode 100644 src/test/regress/sql/temp.sql
 delete mode 100644 src/test/regress/sql/text.sql
 delete mode 100644 src/test/regress/sql/time.sql
 delete mode 100644 src/test/regress/sql/timestamp.sql
 delete mode 100644 src/test/regress/sql/timestamptz.sql
 delete mode 100644 src/test/regress/sql/timetz.sql
 delete mode 100644 src/test/regress/sql/tinterval.sql
 delete mode 100644 src/test/regress/sql/transactions.sql
 delete mode 100644 src/test/regress/sql/triggers.sql
 delete mode 100644 src/test/regress/sql/type_sanity.sql
 delete mode 100644 src/test/regress/sql/union.sql
 delete mode 100644 src/test/regress/sql/varchar.sql
 delete mode 100644 src/tools/RELEASE_CHANGES
 delete mode 100644 src/tools/backend/README
 delete mode 100644 src/tools/backend/backend_dirs.html
 delete mode 100644 src/tools/backend/flow.fig
 delete mode 100644 src/tools/backend/flow.gif
 delete mode 100644 src/tools/backend/index.html
 delete mode 100755 src/tools/ccsym
 delete mode 100755 src/tools/copyright
 delete mode 100644 src/tools/entab/Makefile
 delete mode 100644 src/tools/entab/entab.c
 delete mode 100644 src/tools/entab/entab.man
 delete mode 100644 src/tools/entab/halt.c
 delete mode 100755 src/tools/find_badmacros
 delete mode 100755 src/tools/find_static
 delete mode 100755 src/tools/find_typedef
 delete mode 100755 src/tools/make_ctags
 delete mode 100644 src/tools/make_diff/README
 delete mode 100755 src/tools/make_diff/cporig
 delete mode 100755 src/tools/make_diff/difforig
 delete mode 100755 src/tools/make_diff/rmorig
 delete mode 100755 src/tools/make_etags
 delete mode 100755 src/tools/make_keywords
 delete mode 100755 src/tools/make_mkid
 delete mode 100755 src/tools/pgcvslog
 delete mode 100644 src/tools/pginclude/README
 delete mode 100755 src/tools/pginclude/pgcompinclude
 delete mode 100755 src/tools/pginclude/pgdefine
 delete mode 100755 src/tools/pginclude/pgfixinclude
 delete mode 100755 src/tools/pginclude/pgrminclude
 delete mode 100644 src/tools/pgindent/README
 delete mode 100644 src/tools/pgindent/indent.bsd.patch
 delete mode 100755 src/tools/pgindent/pgcppindent
 delete mode 100755 src/tools/pgindent/pgindent
 delete mode 100755 src/tools/pgindent/pgjindent
 delete mode 100644 src/tutorial/Makefile
 delete mode 100644 src/tutorial/README
 delete mode 100644 src/tutorial/advanced.source
 delete mode 100644 src/tutorial/basics.source
 delete mode 100644 src/tutorial/beard.c
 delete mode 100644 src/tutorial/complex.c
 delete mode 100644 src/tutorial/complex.source
 delete mode 100644 src/tutorial/funcs.c
 delete mode 100644 src/tutorial/funcs.source
 delete mode 100644 src/tutorial/funcs_new.c
 delete mode 100644 src/tutorial/syscat.source
 delete mode 100644 src/utils/Makefile
 delete mode 100644 src/utils/README
 delete mode 100644 src/utils/dllinit.c
 delete mode 100644 src/utils/getopt.c
 delete mode 100644 src/utils/strdup.c
 delete mode 100644 src/win32.mak

diff --git a/COPYRIGHT b/COPYRIGHT
deleted file mode 100644
index c93355e396..0000000000
--- a/COPYRIGHT
+++ /dev/null
@@ -1,23 +0,0 @@
-PostgreSQL Database Management System
-(formerly known as Postgres, then as Postgres95)
-
-Portions Copyright (c) 1996-2002, The PostgreSQL Global Development Group
-
-Portions Copyright (c) 1994, The Regents of the University of California
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose, without fee, and without a written agreement
-is hereby granted, provided that the above copyright notice and this
-paragraph and the following two paragraphs appear in all copies.
-
-IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
-LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
-DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
diff --git a/GNUmakefile.in b/GNUmakefile.in
deleted file mode 100644
index 56cb1e3574..0000000000
--- a/GNUmakefile.in
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# PostgreSQL top level makefile
-#
-# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.24 2002/03/29 17:32:48 petere Exp $
-#
-
-subdir =
-top_builddir = .
-include $(top_builddir)/src/Makefile.global
-
-all:
-	$(MAKE) -C doc all
-	$(MAKE) -C src all
-	@echo "All of PostgreSQL successfully made. Ready to install."
-
-install:
-	$(MAKE) -C doc install
-	$(MAKE) -C src install
-	@cat $(srcdir)/register.txt
-
-installdirs uninstall distprep:
-	$(MAKE) -C doc $@
-	$(MAKE) -C src $@
-
-install-all-headers:
-	$(MAKE) -C src $@
-
-# clean, distclean, etc should apply to contrib too, even though
-# it's not built by default
-clean:
-	$(MAKE) -C doc $@
-	$(MAKE) -C contrib $@
-	$(MAKE) -C src $@
-# Garbage from autoconf:
-	@rm -rf autom4te.cache/
-
-# Important: distclean `src' last, otherwise Makefile.global
-# will be gone too soon.
-distclean maintainer-clean:
-	-$(MAKE) -C doc $@
-	-$(MAKE) -C contrib $@
-	-$(MAKE) -C src $@
-	-rm -f config.cache config.log config.status GNUmakefile
-# Garbage from autoconf:
-	@rm -rf autom4te.cache/
-
-check: all
-
-check installcheck:
-	$(MAKE) -C src/test $@
-
-GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
-	./config.status $@
-
-
-##########################################################################
-
-distdir	:= postgresql-$(VERSION)
-dummy	:= =install=
-garbage := =*  "#"*  ."#"*  *~*  *.orig  *.rej  core  postgresql-*
-
-dist: $(distdir).tar.gz
-ifeq ($(split-dist), yes)
-dist: postgresql-base-$(VERSION).tar.gz postgresql-docs-$(VERSION).tar.gz postgresql-opt-$(VERSION).tar.gz postgresql-test-$(VERSION).tar.gz
-endif
-dist:
-	-rm -rf $(distdir)
-
-$(distdir).tar: distdir
-	$(TAR) chf $@ $(distdir)
-
-opt_files := src/backend/utils/mb contrib/retep/build.xml \
-	src/tools src/corba src/data src/tutorial \
-	$(addprefix src/bin/, pgaccess pgtclsh pg_encoding) \
-	$(addprefix src/interfaces/, odbc libpq++ libpgtcl perl5 python jdbc) \
-	$(addprefix src/pl/, plperl tcl)
-
-docs_files := doc/postgres.tar.gz doc/src doc/TODO.detail
-
-postgresql-base-$(VERSION).tar: distdir
-	$(TAR) -c $(addprefix --exclude $(distdir)/, $(docs_files) $(opt_files) src/test) \
-	  -f $@ $(distdir)
-
-postgresql-docs-$(VERSION).tar: distdir
-	$(TAR) cf $@ $(addprefix $(distdir)/, $(docs_files))
-
-postgresql-opt-$(VERSION).tar: distdir
-	$(TAR) cf $@ $(addprefix $(distdir)/, $(opt_files))
-
-postgresql-test-$(VERSION).tar: distdir
-	$(TAR) cf $@ $(distdir)/src/test
-
-distdir:
-	-rm -rf $(distdir)* $(dummy)
-	for x in `cd $(top_srcdir) && find . -name CVS -prune -o -print`; do \
-	  file=`expr X$$x : 'X\./\(.*\)'`; \
-	  if test -d "$(top_srcdir)/$$file" ; then \
-	    mkdir "$(distdir)/$$file" && chmod 777 "$(distdir)/$$file";	\
-	  else \
-	    ln "$(top_srcdir)/$$file" "$(distdir)/$$file" >/dev/null 2>&1 \
-	      || cp "$(top_srcdir)/$$file" "$(distdir)/$$file"; \
-	  fi || exit; \
-	done
-	$(MAKE) -C $(distdir) distprep
-	$(MAKE) -C $(distdir) distclean
-
-distcheck: $(distdir).tar.gz
-	-rm -rf $(dummy)
-	mkdir $(dummy)
-	$(GZIP) -d -c $< | $(TAR) xf -
-	install_prefix=`cd $(dummy) && pwd`; \
-	cd $(distdir) \
-	&& ./configure --prefix="$$install_prefix"
-	$(MAKE) -C $(distdir) -q distprep
-	$(MAKE) -C $(distdir)
-	$(MAKE) -C $(distdir) install
-	$(MAKE) -C $(distdir) uninstall
-	@echo "checking whether \`$(MAKE) uninstall' works"
-	test `find $(dummy) ! -type d | wc -l` -eq 0
-	$(MAKE) -C $(distdir) dist
-# Room for improvement: Check here whether this distribution tarball
-# is sufficiently similar to the original one.
-	-rm -rf $(distdir) $(dummy)
-	@echo "Distribution integrity checks out."
-
-.PHONY: dist distdir distcheck
-unexport split-dist
diff --git a/HISTORY b/HISTORY
deleted file mode 100644
index 2d267df499..0000000000
--- a/HISTORY
+++ /dev/null
@@ -1,3390 +0,0 @@
-                                 Release Notes
-
-                                 Release 7.2.1
-
-     Release date: 2002-03-21
-
-   This has a variety of fixes from 7.2.
-
-     ----------------------------------------------------------------------
-
-Migration to version 7.2.1
-
-   A dump/restore is *not* required for those running 7.2.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Ensure that sequence counters do not go backwards after a crash (Tom)
- Fix pgaccess kanji-coversion key binding (Tatsuo)
- Optimizer improvements (Tom)
- cash I/O improvements (Tom)
- New Russian FAQ
- Compile fix for missing AuthBlockSig (Heiko)
- Additional time zones and time zone fixes (Thomas)
- Allow psql \connect to handle mixed case database and user names (Tom)
- Return proper OID on command completion even with ON INSERT rules (Tom)
- Allow COPY FROM to use 8-bit DELIMITERS (Tatsuo)
- Fix bug in extract/date_part for milliseconds/microseconds (Tatsuo)
- Improve handling of multiple UNIONs with different lengths (Tom)
- contrib/btree_gist improvements (Teodor Sigaev)
- contrib/tsearch dictionary improvements, see README.tsearch for
-   an additional installation step (Thomas T. Thai, Teodor Sigaev)
- Fix for array subscripts handling (Tom)
- Allow EXECUTE of "CREATE TABLE AS ... SELECT" in PL/PgSQL (Tom)
-
-
-     ----------------------------------------------------------------------
-
-                                  Release 7.2
-
-     Release date: 2002-02-04
-
-Overview
-
-   This release improves PostgreSQL for use in high-volume applications.
-
-   Major changes in this release:
-
-   VACUUM
-
-           Vacuuming no longer locks tables, thus allowing normal user access
-           during the vacuum. A new "VACUUM FULL" command does old-style
-           vacuum by locking the table and shrinking the on-disk copy of the
-           table.
-
-   Transactions
-
-           There is no longer a problem with installations that exceed four
-           billion transactions.
-
-   OID's
-
-           OID's are now optional. Users can now create tables without OID's
-           for cases where OID usage is excessive.
-
-   Optimizer
-
-           The system now computes histogram column statistics during
-           "ANALYZE", allowing much better optimizer choices.
-
-   Security
-
-           A new MD5 encryption option allows more secure storage and
-           transfer of passwords. A new Unix-domain socket authentication
-           option is available on Linux and BSD systems.
-
-   Statistics
-
-           Administrators can use the new table access statistics module to
-           get fine-grained information about table and index usage.
-
-   Internationalization
-
-           Program and library messages can now be displayed in several
-           languages.
-
-     ----------------------------------------------------------------------
-
-Migration to version 7.2
-
-   A dump/restore using "pg_dump" is required for those wishing to migrate
-   data from any previous release.
-
-   Observe the following incompatibilities:
-
-     * The semantics of the "VACUUM" command have changed in this release.
-       You may wish to update your maintenance procedures accordingly.
-
-     * In this release, comparisons using = NULL will always return false (or
-       NULL, more precisely). Previous releases automatically transformed
-       this syntax to IS NULL. The old behavior can be re-enabled using a
-       "postgresql.conf" parameter.
-
-     * The "pg_hba.conf" and "pg_ident.conf" configuration is now only
-       reloaded after receiving a SIGHUP signal, not with each connection.
-
-     * The function "octet_length()" now returns the uncompressed data
-       length.
-
-     * The date/time value 'current' is no longer available. You will need to
-       rewrite your applications.
-
-     * The timestamp() function is no longer available.  Use timestamp
-       'string' instead, or CAST.
-
-   The SELECT ... LIMIT #,# syntax will be removed in the next release. You
-   should change your queries to use separate LIMIT and OFFSET clauses, e.g.
-   LIMIT 10 OFFSET 20.
-
-     ----------------------------------------------------------------------
-
-Changes
-
-  Server Operation
-
-   Create temporary files in a separate directory (Bruce)
-   Delete orphanded temporary files on postmaster startup (Bruce)
-   Added unique indexes to some system tables (Tom)
-   System table operator reorganization (Oleg Bartunov, Teodor Sigaev, Tom)
-   Renamed pg_log to pg_clog (Tom)
-   Enable SIGTERM, SIGQUIT to kill backends (Jan)
-   Removed compile-time limit on number of backends (Tom)
-   Better cleanup for semaphore resource failure (Tatsuo, Tom)
-   Allow safe transaction ID wraparound (Tom)
-   Removed OID's from some system tables (Tom)
-   Removed "triggered data change violation" error check (Tom)
-   SPI portal creation of prepared/saved plans (Jan)
-   Allow SPI column functions to work for system columns (Tom)
-   Long value compression improvement (Tom)
-   Statistics collector for table, index access (Jan)
-   Truncate extra-long sequence names to a reasonable value (Tom)
-   Measure transaction times in milliseconds (Thomas)
-   Fix TID sequential scans (Hiroshi)
-   Superuser ID now fixed at 1 (Peter E)
-   New pg_ctl "reload" option (Tom)
-
-     ----------------------------------------------------------------------
-
-  Performance
-
-   Optimizer improvements (Tom)
-   New histogram column statistics for optimizer (Tom)
-   Reuse write-ahead log files rather than discarding them (Tom)
-   Cache improvements (Tom)
-   IS NULL, IS NOT NULL optimizer improvement (Tom)
-   Improve lock manager to reduce lock contention (Tom)
-   Keep relcache entries for index access support functions (Tom)
-   Allow better selectivity with NaN and infinities in NUMERIC (Tom)
-   R-tree performance improvements (Kenneth Been)
-   B-tree splits more efficient (Tom)
-
-     ----------------------------------------------------------------------
-
-  Privileges
-
-   Change UPDATE, DELETE permissions to be distinct (Peter E)
-   New REFERENCES, TRIGGER privileges (Peter E)
-   Allow GRANT/REVOKE to/from more than one user at a time (Peter E)
-   New has_table_privilege() function (Joe Conway)
-   Allow non-superuser to vacuum database (Tom)
-   New SET SESSION AUTHORIZATION command (Peter E)
-   Fix bug in privilege modifications on newly created tables (Tom)
-   Disallow access to pg_statistic for non-superuser, add user-accessible views (Tom)
-
-     ----------------------------------------------------------------------
-
-  Client Authentication
-
-   Fork postmaster before doing authentication to prevent hangs (Peter E)
-   Add ident authentication over Unix domain sockets on Linux, *BSD (Helge Bahmann, Oliver Elphick, Teodor Sigaev, Bruce)
-   Add a password authentication method that uses MD5 encryption (Bruce)
-   Allow encryption of stored passwords using MD5 (Bruce)
-   PAM authentication (Dominic J. Eidson)
-   Load pg_hba.conf and pg_ident.conf only on startup and SIGHUP (Bruce)
-
-     ----------------------------------------------------------------------
-
-  Server Configuration
-
-   Interpretation of some time zone abbreviations as Australian rather than North American now settable at run time (Bruce)
-   New parameter to set default transaction isolation level (Peter E)
-   New parameter to enable conversion of "expr = NULL" into "expr IS NULL", off by default (Peter E)
-   New parameter to control memory usage by VACUUM (Tom)
-   New parameter to set client authentication timeout (Tom)
-   New parameter to set maximum number of open files (Tom)
-
-     ----------------------------------------------------------------------
-
-  Queries
-
-   Statements added by INSERT rules now execute after the INSERT (Jan)
-   Prevent unadorned relation names in target list (Bruce)
-   NULLs now sort after all normal values in ORDER BY (Tom)
-   New IS UNKNOWN, IS NOT UNKNOWN Boolean tests (Tom)
-   New SHARE UPDATE EXCLUSIVE lock mode (Tom)
-   New EXPLAIN ANALYZE command that shows run times and row counts (Martijn van Oosterhout)
-   Fix problem with LIMIT and subqueries (Tom)
-   Fix for LIMIT, DISTINCT ON pushed into subqueryies (Tom)
-   Fix nested EXCEPT/INTERSECT (Tom)
-
-     ----------------------------------------------------------------------
-
-  Schema Manipulation
-
-   Fix SERIAL in temporary tables (Bruce)
-   Allow temporary sequences (Bruce)
-   Sequences now use int8 internally (Tom)
-   New SERIAL8 creates int8 columns with sequences, default still SERIAL4 (Tom)
-   Make OIDs optional using WITHOUT OIDS (Tom)
-   Add %TYPE syntax to CREATE TYPE (Ian Lance Taylor)
-   Add ALTER TABLE / DROP CONSTRAINT for CHECK constraints (Christopher Kings-Lynne)
-   New CREATE OR REPLACE FUNCTION to alter existing function (preserving the function OID) (Gavin Sherry)
-   Add ALTER TABLE / ADD [ UNIQUE | PRIMARY ] (Christopher Kings-Lynne)
-   Allow column renaming in views
-   Make ALTER TABLE / RENAME COLUMN update column names of indexes (Brent Verner)
-   Fix for ALTER TABLE / ADD CONSTRAINT ... CHECK with inherited tables (Stephan Szabo)
-   ALTER TABLE RENAME update foreign-key trigger arguments correctly (Brent Verner)
-   DROP AGGREGATE and COMMENT ON AGGREGATE now accept an aggtype (Tom)
-   Add automatic return type data casting for SQL functions (Tom)
-   Allow GiST indexes to handle NULLs and multikey indexes (Oleg Bartunov, Teodor Sigaev, Tom)
-   Enable partial indexes (Martijn van Oosterhout)
-
-     ----------------------------------------------------------------------
-
-  Utility Commands
-
-   Add RESET ALL, SHOW ALL (Marko Kreen)
-   CREATE/ALTER USER/GROUP now allow options in any order (Vince)
-   Add LOCK A, B, C functionality (Neil Padgett)
-   New ENCRYPTED/UNENCRYPTED option to CREATE/ALTER USER (Bruce)
-   New light-weight VACUUM does not lock table; old semantics are available as VACUUM FULL (Tom)
-   Disable COPY TO/FROM on views (Bruce)
-   COPY DELIMITERS string must be exactly one character (Tom)
-   VACUUM warning about index tuples fewer than heap now only appears when appropriate (Martijn van Oosterhout)
-   Fix permission checks for CREATE INDEX (Tom)
-   Disallow inappropriate use of CREATE/DROP INDEX/TRIGGER/VIEW (Tom)
-
-     ----------------------------------------------------------------------
-
-  Data Types and Functions
-
-   SUM(), AVG(), COUNT() now uses int8 internally for speed (Tom)
-   Add convert(), convert2() (Tatsuo)
-   New function bit_length() (Peter E)
-   Make the "n" in CHAR(n)/VARCHAR(n) represents letters, not bytes (Tatsuo)
-   CHAR(), VARCHAR() now reject strings that are too long (Peter E)
-   BIT VARYING now rejects bit strings that are too long (Peter E)
-   BIT now rejects bit strings that do not match declared size (Peter E)
-   INET, CIDR text conversion functions (Alex Pilosov)
-   INET, CIDR operators << and <<= indexable (Alex Pilosov)
-   Bytea \### now requires valid three digit octal number
-   Bytea comparison improvements, now supports =, <>, >, >=, <, and <=
-   Bytea now supports B-tree indexes
-   Bytea now supports LIKE, LIKE...ESCAPE, NOT LIKE, NOT LIKE...ESCAPE
-   Bytea now supports concatenation
-   New bytea functions: position, substring, trim, btrim, and length
-   New encode() function mode, "escaped", converts minimally escaped bytea to/from text
-   Add pg_database_encoding_max_length() (Tatsuo)
-   Add pg_client_encoding() function (Tatsuo)
-   now() returns time with millisecond precision (Thomas)
-   New TIMESTAMP WITHOUT TIMEZONE data type (Thomas)
-   Add ISO date/time specification with "T", yyyy-mm-ddThh:mm:ss (Thomas)
-   New xid/int comparison functions (Hiroshi)
-   Add precision to TIME, TIMESTAMP, and INVERVAL data types (Thomas)
-   Modify type coersion logic to attempt binary-compatible functions first (Tom)
-   New encode() function installed by default (Marko Kreen)
-   Improved to_*() conversion functions (Karel Zak)
-   Optimize LIKE/ILIKE when using single-byte encodings (Tatsuo)
-   New functions in contrib/pgcrypto: crypt(), hmac(), encrypt(), gen_salt() (Marko Kreen)
-   Correct description of translate() function (Bruce)
-   Add INTERVAL argument for SET TIME ZONE (Thomas)
-   Add INTERVAL YEAR TO MONTH (etc.) syntax (Thomas)
-   Optimize length functions when using single-byte encodings (Tatsuo)
-   Fix path_inter, path_distance, path_length, dist_ppath to handle closed paths (Curtis Barrett, Tom)
-   octet_length(text) now returns non-compressed length (Tatsuo, Bruce)
-   Handle "July" full name in date/time literals (Greg Sabino Mullane)
-   Some datatype() function calls now evaluated differently
-   Add support for Julian and ISO time specifications (Thomas)
-
-     ----------------------------------------------------------------------
-
-  Internationalization
-
-   National language support in psql, pg_dump, libpq, and server (Peter E)
-   Message translations in Chinese (simplified, traditional), Czech, French, German, Hungarian, Russian, Swedish (Peter E, Serguei A. Mokhov, Karel Zak, Weiping He, Zhenbang Wei, Kovacs Zoltan)
-   Make trim, ltrim, rtrim, btrim, lpad, rpad, translate multibyte aware (Tatsuo)
-   Add LATIN5,6,7,8,9,10 support (Tatsuo)
-   Add ISO 8859-5,6,7,8 support (Tatsuo)
-   Correct LATIN5 to mean ISO-8859-9, not ISO-8859-5 (Tatsuo)
-   Make mic2ascii() non-ASCII aware (Tatsuo)
-   Reject invalid multibyte character sequences (Tatsuo)
-
-     ----------------------------------------------------------------------
-
-  PL/pgSQL
-
-   Now uses portals for SELECT loops, allowing huge result sets (Jan)
-   CURSOR and REFCURSOR support (Jan)
-   Can now return open cursors (Jan)
-   Add ELSEIF (Klaus Reger)
-   Improve PL/pgSQL error reporting, including location of error (Tom)
-   Allow IS or FOR key words in cursor declaration, for compatibility (Bruce)
-   Fix for SELECT ... FOR UPDATE (Tom)
-   Fix for PERFORM returning multiple rows (Tom)
-   Make PL/pgSQL use the server's type coercion code (Tom)
-   Memory leak fix (Jan, Tom)
-   Make trailing semicolon optional (Tom)
-
-     ----------------------------------------------------------------------
-
-  PL/Perl
-
-   New untrusted PL/Perl (Alex Pilosov)
-   PL/Perl is now built on some platforms even if libperl is not shared (Peter E)
-
-     ----------------------------------------------------------------------
-
-  PL/Tcl
-
-   Now reports errorInfo (Vsevolod Lobko)
-   Add spi_lastoid function (bob@redivi.com)
-
-     ----------------------------------------------------------------------
-
-  PL/Python
-
-   ...is new (Andrew Bosma)
-
-     ----------------------------------------------------------------------
-
-  Psql
-
-   \d displays indexes in unique, primary groupings (Christopher Kings-Lynne)
-   Allow trailing semicolons in backslash commands (Greg Sabino Mullane)
-   Read password from /dev/tty if possible
-   Force new password prompt when changing user and database (Tatsuo, Tom)
-   Format the correct number of columns for Unicode (Patrice)
-
-     ----------------------------------------------------------------------
-
-  Libpq
-
-   New function PQescapeString() to escape quotes in command strings (Florian Weimer)
-   New function PQescapeBytea() escapes binary strings for use as SQL string literals
-
-     ----------------------------------------------------------------------
-
-  JDBC
-
-   Return OID of INSERT (Ken K)
-   Handle more data types (Ken K)
-   Handle single quotes and newlines in strings (Ken K)
-   Handle NULL variables (Ken K)
-   Fix for time zone handling (Barry Lind)
-   Improved Druid support
-   Allow eight-bit characters with non-multibyte server (Barry Lind)
-   Support BIT, BINARY types (Ned Wolpert)
-   Reduce memory usage (Michael Stephens, Dave Cramer)
-   Update DatabaseMetaData (Peter E)
-   Add DatabaseMetaData.getCatalogs() (Peter E)
-   Encoding fixes (Anders Bengtsson)
-   Get/setCatalog methods (Jason Davies)
-   DatabaseMetaData.getColumns() now returns column defaults (Jason Davies)
-   DatabaseMetaData.getColumns() performance improvement (Jeroen van Vianen)
-   Some JDBC1 and JDBC2 merging (Anders Bengtsson)
-   Transaction performance improvements (Barry Lind)
-   Array fixes (Greg Zoller)
-   Serialize addition 
-   Fix batch processing (Rene Pijlman)
-   ExecSQL method reorganization (Anders Bengtsson)
-   GetColumn() fixes (Jeroen van Vianen)
-   Fix isWriteable() function (Rene Pijlman)
-   Improved passage of JDBC2 conformance tests (Rene Pijlman)
-   Add bytea type capability (Barry Lind)
-   Add isNullable() (Rene Pijlman)
-   JDBC date/time test suite fixes (Liam Stewart)
-   Fix for SELECT 'id' AS xxx FROM table (Dave Cramer)
-   Fix DatabaseMetaData to show precision properly (Mark Lillywhite)
-   New getImported/getExported keys (Jason Davies)
-   MD5 password encryption support (Jeremy Wohl)
-   Fix to actually use type cache (Ned Wolpert)
-
-     ----------------------------------------------------------------------
-
-  ODBC
-
-   Remove query size limit (Hiroshi)
-   Remove text field size limit (Hiroshi)
-   Fix for SQLPrimaryKeys in multibyte mode (Hiroshi)
-   Allow ODBC procedure calls (Hiroshi)
-   Improve boolean handing (Aidan Mountford)
-   Most configuration options on setable via DSN (Hiroshi)
-   Multibyte, performance fixes (Hiroshi)
-   Allow driver to be used with iODBC or unixODBC (Peter E)
-   MD5 password encryption support (Bruce)
-   Add more compatibility functions to odbc.sql (Peter E)
-
-     ----------------------------------------------------------------------
-
-  ECPG
-
-   EXECUTE ... INTO implemented (Christof Petig)
-   Multiple row descriptor support (e.g. CARDINALITY) (Christof Petig)
-   Fix for GRANT parameters (Lee Kindness)
-   Fix INITIALLY DEFERRED bug
-   Various bug fixes (Michael, Christof Petig)
-   Auto allocation for indicator variable arrays (int *ind_p=NULL)
-   Auto allocation for string arrays (char **foo_pp=NULL)
-   ECPGfree_auto_mem fixed
-   All function names with external linkage are now prefixed by ECPG
-   Fixes for arrays of structures (Michael)
-
-     ----------------------------------------------------------------------
-
-  Misc. Interfaces
-
-   Python fix fetchone() (Gerhard Haring)
-   Use UTF, Unicode in Tcl where appropriate (Vsevolod Lobko, Reinhard Max)
-   Add Tcl COPY TO/FROM (ljb)
-   Prevent output of default index op class in pg_dump (Tom)
-   Fix libpgeasy memory leak (Bruce)
-
-     ----------------------------------------------------------------------
-
-  Build and Install
-
-   Configure, dynamic loader, and shared library fixes (Peter E)
-   Fixes in QNX 4 port (Bernd Tegge)
-   Fixes in Cygwin and Win32 ports (Jason Tishler, Gerhard Haring, Dmitry Yurtaev, Darko Prenosil, Mikhail Terekhov)
-   Fix for Win32 socket communication failures (Magnus, Mikhail Terekhov)
-   Hurd compile fix (Oliver Elphick)
-   BeOS fixes (Cyril Velter)
-   Remove configure --enable-unicode-conversion, now enabled by multibyte (Tatsuo)
-   AIX fixes (Tatsuo, Andreas)
-   Fix parallel make (Peter E)
-   Install SQL language manual pages into OS-specific directories (Peter E)
-   Rename config.h to pg_config.h (Peter E)
-   Reorganize installation layout of header files (Peter E)
-
-     ----------------------------------------------------------------------
-
-  Source Code
-
-   Remove SEP_CHAR (Bruce)
-   New GUC hooks (Tom)
-   Merge GUC and command line handling (Marko Kreen)
-   Remove EXTEND INDEX (Martijn van Oosterhout, Tom)
-   New pgjindent utility to indent java code (Bruce)
-   Remove define of true/false when compiling under C++ (Leandro Fanzone, Tom)
-   pgindent fixes (Bruce, Tom)
-   Replace strcasecmp() with strcmp() where appropriate (Peter E)
-   Dynahash portability improvements (Tom)
-   Add 'volatile' usage in spinlock structures
-   Improve signal handling logic (Tom)
-
-     ----------------------------------------------------------------------
-
-  Contrib
-
-   New contrib/rtree_gist (Oleg Bartunov, Teodor Sigaev)
-   New contrib/tsearch full-text indexing (Oleg, Teodor Sigaev)
-   Add contrib/dblink for remote database access (Joe Conway)
-   contrib/ora2pg Oracle conversion utility (Gilles Darold)
-   contrib/xml XML conversion utility (John Gray)
-   contrib/fulltextindex fixes (Christopher Kings-Lynne)
-   New contrib/fuzzystrmatch with levenshtein and metaphone, soundex merged (Joe Conway)
-   Add contrib/intarray boolean queries, binary search, fixes (Oleg Bartunov)
-   New pg_upgrade utility (Bruce)
-   Add new pg_resetxlog options (Bruce, Tom)
-     ----------------------------------------------------------------------
-
-                                 Release 7.1.3
-
-     Release date: 2001-08-15
-
-     ----------------------------------------------------------------------
-
-Migration to version 7.1.3
-
-   A dump/restore is *not* required for those running 7.1.X.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Remove unused WAL segements of large transactions (Tom)
- Multiaction rule fix (Tom)
- PL/pgSQL memory allocation fix (Jan)
- VACUUM buffer fix (Tom)
- Regression test fixes (Tom)
- pg_dump fixes for GRANT/REVOKE/comments on views, user-defined types (Tom)
- Fix subselects with DISTINCT ON or LIMIT (Tom)
- BEOS fix
- Disable COPY TO/FROM a view (Tom)
- Cygwin build (Jason Tishler)
-     
-
-     ----------------------------------------------------------------------
-
-                                 Release 7.1.2
-
-     Release date: 2001-05-11
-
-   This has one fix from 7.1.1.
-
-     ----------------------------------------------------------------------
-
-Migration to version 7.1.2
-
-   A dump/restore is *not* required for those running 7.1.X.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Fix PL/pgSQL SELECTs when returning no rows
- Fix for psql backslash core dump
- Referential integrity permission fix
- Optimizer fixes
- pg_dump cleanups
-     
-
-     ----------------------------------------------------------------------
-
-                                 Release 7.1.1
-
-     Release date: 2001-05-05
-
-   This has a variety of fixes from 7.1.
-
-     ----------------------------------------------------------------------
-
-Migration to version 7.1.1
-
-   A dump/restore is *not* required for those running 7.1.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Fix for numeric MODULO operator (Tom)
- pg_dump fixes (Philip)
- pg_dump can dump 7.0 databases (Philip)
- readline 4.2 fixes (Peter E)
- JOIN fixes (Tom)
- AIX, MSWIN, VAX,N32K fixes (Tom)
- Multibytes fixes (Tom)
- Unicode fixes (Tatsuo)
- Optimizer improvements (Tom)
- Fix for whole tuples in functions (Tom)
- Fix for pg_ctl and option strings with spaces (Peter E)
- ODBC fixes (Hiroshi)
- EXTRACT can now take string argument (Thomas)
- Python fixes (Darcy)
-     
-
-     ----------------------------------------------------------------------
-
-                                  Release 7.1
-
-     Release date: 2001-04-13
-
-   This release focuses on removing limitations that have existed in the
-   PostgreSQL code for many years.
-
-   Major changes in this release:
-
-   Write-ahead Log (WAL)
-
-           To maintain database consistency in case of an operating system
-           crash, previous releases of PostgreSQL have forced all data
-           modifications to disk before each transaction commit. With WAL,
-           only one log file must be flushed to disk, greatly improving
-           performance. If you have been using -F in previous releases to
-           disable disk flushes, you may want to consider discontinuing its
-           use.
-
-   TOAST
-
-           TOAST - Previous releases had a compiled-in row length limit,
-           typically 8k - 32k. This limit made storage of long text fields
-           difficult. With TOAST, long rows of any length can be stored with
-           good performance.
-
-   Outer Joins
-
-           We now support outer joins. The UNION/NOT IN workaround for outer
-           joins is no longer required. We use the SQL92 outer join syntax.
-
-   Function Manager
-
-           The previous C function manager did not handle NULLs properly, nor
-           did it support 64-bit CPU's (Alpha). The new function manager
-           does. You can continue using your old custom functions, but you
-           may want to rewrite them in the future to use the new function
-           manager call interface.
-
-   Complex Queries
-
-           A large number of complex queries that were unsupported in
-           previous releases now work. Many combinations of views,
-           aggregates, UNION, LIMIT, cursors, subqueries, and inherited
-           tables now work properly. Inherited tables are now accessed by
-           default. Subqueries in FROM are now supported.
-
-     ----------------------------------------------------------------------
-
-Migration to version 7.1
-
-   A dump/restore using pg_dump is required for those wishing to migrate data
-   from any previous release.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Bug Fixes
- ---------
- Many multi-byte/Unicode/locale fixes (Tatsuo and others)
- More reliable ALTER TABLE RENAME (Tom)
- Kerberos V fixes (David Wragg)
- Fix for INSERT INTO...SELECT where targetlist has subqueries (Tom)
- Prompt username/password on standard error (Bruce)
- Large objects inv_read/inv_write fixes (Tom)
- Fixes for to_char(), to_date(), to_ascii(), and to_timestamp() (Karel,
-     Daniel Baldoni)
- Prevent query expressions from leaking memory (Tom)
- Allow UPDATE of arrays elements (Tom)
- Wake up lock waiters during cancel (Hiroshi)
- Fix rare cursor crash when using hash join (Tom)
- Fix for DROP TABLE/INDEX in rolled-back transaction (Hiroshi)
- Fix psql crash from \l+ if MULTIBYTE enabled (Peter E)
- Fix truncation of rule names during CREATE VIEW (Ross Reedstrom)
- Fix PL/perl (Alex Kapranoff)
- Disallow LOCK on views (Mark Hollomon)
- Disallow INSERT/UPDATE/DELETE on views (Mark Hollomon)
- Disallow DROP RULE, CREATE INDEX, TRUNCATE on views (Mark Hollomon)
- Allow PL/pgSQL accept non-ASCII identifiers (Tatsuo)
- Allow views to proper handle GROUP BY, aggregates, DISTINCT (Tom)
- Fix rare failure with TRUNCATE command (Tom)
- Allow UNION/INTERSECT/EXCEPT to be used with ALL, subqueries, views,
-     DISTINCT, ORDER BY, SELECT...INTO (Tom)
- Fix parser failures during aborted transactions (Tom)
- Allow temporary relations to properly clean up indexes (Bruce)
- Fix VACUUM problem with moving rows in same page (Tom)
- Modify pg_dump to better handle user-defined items in template1 (Philip)
- Allow LIMIT in VIEW (Tom)
- Require cursor FETCH to honor LIMIT (Tom)
- Allow PRIMARY/FOREIGN Key definitions on inherited columns (Stephan)
- Allow ORDER BY, LIMIT in sub-selects (Tom)
- Allow UNION in CREATE RULE (Tom)
- Make ALTER/DROP TABLE rollback-able (Vadim, Tom)
- Store initdb collation in pg_control so collation cannot be changed (Tom)
- Fix INSERT...SELECT with rules (Tom)
- Fix FOR UPDATE inside views and subselects (Tom)
- Fix OVERLAPS operators conform to SQL92 spec regarding NULLs (Tom)
- Fix lpad() and rpad() to handle length less than input string (Tom)
- Fix use of NOTIFY in some rules (Tom)
- Overhaul btree code (Tom)
- Fix NOT NULL use in Pl/pgSQL variables (Tom)
- Overhaul GIST code (Oleg)
- Fix CLUSTER to preserve constraints and column default (Tom)
- Improved deadlock detection handling (Tom)
- Allow multiple SERIAL columns in a table (Tom)
- Prevent occasional index corruption (Vadim)
-
- Enhancements
- ------------
- Add OUTER JOINs (Tom)
- Function manager overhaul (Tom)
- Allow ALTER TABLE RENAME on indexes (Tom)
- Improve CLUSTER (Tom)
- Improve ps status display for more platforms (Peter E, Marc)
- Improve CREATE FUNCTION failure message (Ross)
- JDBC improvements (Peter, Travis Bauer, Christopher Cain, William Webber,
-     Gunnar)
- Grand Unified Configuration scheme/GUC.  Many options can now be set in
-     data/postgresql.conf, postmaster/postgres flags, or SET commands (Peter E)
- Improved handling of file descriptor cache (Tom)
- New warning code about auto-created table alias entries (Bruce)
- Overhaul initdb process (Tom, Peter E)
- Overhaul of inherited tables; inherited tables now accessed by default;
-    new ONLY keyword prevents it (Chris Bitmead, Tom)
- ODBC cleanups/improvements (Nick Gorham, Stephan Szabo, Zoltan Kovacs,
-     Michael Fork)
- Allow renaming of temp tables (Tom)
- Overhaul memory manager contexts (Tom)
- pg_dumpall uses CREATE USER or CREATE GROUP rather using COPY (Peter E)
- Overhaul pg_dump (Philip Warner)
- Allow pg_hba.conf secondary password file to specify only username (Peter E)
- Allow TEMPORARY or TEMP keyword when creating temporary tables (Bruce)
- New memory leak checker (Karel)
- New SET SESSION CHARACTERISTICS (Thomas)
- Allow nested block comments (Thomas)
- Add WITHOUT TIME ZONE type qualifier (Thomas)
- New ALTER TABLE ADD CONSTRAINT (Stephan)
- Use NUMERIC accumulators for INTEGER aggregates (Tom)
- Overhaul aggregate code (Tom)
- New VARIANCE and STDDEV() aggregates
- Improve dependency ordering of pg_dump (Philip)
- New pg_restore command (Philip)
- New pg_dump tar output option (Philip)
- New pg_dump of large objects  (Philip)
- New ESCAPE option to LIKE (Thomas)
- New case-insensitive LIKE - ILIKE (Thomas)
- Allow functional indexes to use binary-compatible type (Tom)
- Allow SQL functions to be used in more contexts (Tom)
- New pg_config utility (Peter E)
- New PL/pgSQL EXECUTE command which allows dynamic SQL and utility statements
-     (Jan)
- New PL/pgSQL GET DIAGNOSTICS statement for SPI value access (Jan)
- New quote_identifiers() and quote_literal() functions (Jan)
- New ALTER TABLE table OWNER TO user command (Mark Hollomon)
- Allow subselects in FROM, i.e. FROM (SELECT ...) [AS] alias (Tom)
- Update PyGreSQL to version 3.1 (D'Arcy)
- Store tables as files named by OID (Vadim)
- New SQL function setval(seq,val,bool) for use in pg_dump (Philip)
- Require DROP VIEW to remove views, no DROP TABLE (Mark)
- Allow DROP VIEW view1, view2 (Mark)
- Allow multiple objects in DROP INDEX, DROP RULE, and DROP TYPE (Tom)
- Allow automatic conversion to/from Unicode (Tatsuo, Eiji)
- New /contrib/pgcrypto hashing functions (Marko Kreen)
- New pg_dumpall --globals-only option (Peter E)
- New CHECKPOINT command for WAL which creates new WAL log file (Vadim)
- New AT TIME ZONE syntax (Thomas)
- Allow location of Unix domain socket to be configurable (David J. MacKenzie)
- Allow postmaster to listen on a specific IP address (David J. MacKenzie)
- Allow socket path name to be specified in hostname by using leading slash
-     (David J. MacKenzie)
- Allow CREATE DATABASE to specify template database (Tom)
- New utility to convert MySQL schema dumps to SQL92 and PostgreSQL (Thomas)
- New /contrib/rserv replication toolkit (Vadim)
- New file format for COPY BINARY (Tom)
- New /contrib/oid2name to map numeric files to table names (B Palmer)
- New "idle in transaction" ps status message (Marc)
- Update to pgaccess 0.98.7 (Constantin Teodorescu)
- pg_ctl now defaults to -w (wait) on shutdown, new -l (log) option
- Add rudimentary dependency checking to pg_dump (Philip)
-
- Types
- -----
- Fix INET/CIDR type ordering and add new functions (Tom)
- Make OID behave as an unsigned type (Tom)
- Allow BIGINT as synonym for INT8 (Peter E)
- New int2 and int8 comparison operators (Tom)
- New BIT and BIT VARYING types (Adriaan Joubert, Tom, Peter E)
- CHAR() no longer faster than VARCHAR() because of TOAST (Tom)
- New GIST seg/cube examples (Gene Selkov)
- Improved round(numeric) handling (Tom)
- Fix CIDR output formatting (Tom)
- New CIDR abbrev() function (Tom)
-
- Performance
- -----------
- Write-Ahead Log (WAL) to provide crash recovery with less performance
-     overhead (Vadim)
- ANALYZE stage of VACUUM no longer exclusively locks table (Bruce)
- Reduced file seeks (Denis Perchine)
- Improve BTREE code for duplicate keys (Tom)
- Store all large objects in a single table (Denis Perchine, Tom)
- Improve memory allocation performance (Karel, Tom)
-
- Source Code
- -----------
- New function manager call conventions (Tom)
- SGI portability fixes (David Kaelbling)
- New configure --enable-syslog option (Peter E)
- New BSDI README (Bruce)
- configure script moved to top level, not /src (Peter E)
- Makefile/configuration/compilation overhaul (Peter E)
- New configure --with-python option (Peter E)
- Solaris cleanups (Peter E)
- Overhaul /contrib Makefiles (Karel)
- New OpenSSL configuration option (Magnus, Peter E)
- AIX fixes (Andreas)
- QNX fixes (Maurizio)
- New heap_open(), heap_openr() API (Tom)
- Remove colon and semi-colon operators (Thomas)
- New pg_class.relkind value for views (Mark Hollomon)
- Rename ichar() to chr() (Karel)
- New documentation for btrim(), ascii(), chr(), repeat() (Karel)
- Fixes for NT/Cygwin (Pete Forman)
- AIX port fixes (Andreas)
- New BeOS port (David Reid, Cyril Velter)
- Add proofreader's changes to docs (Addison-Wesley, Bruce)
- New Alpha spinlock code (Adriaan Joubert, Compaq)
- Unixware port overhaul (Peter E)
- New Darwin/Mac OSX port (Peter Bierman, Bruce Hartzler)
- New FreeBSD Alpha port (Alfred)
- Overhaul shared memory segments (Tom)
- Add IBM S/390 support (Neale Ferguson)
- Moved macmanuf to /contrib (Larry Rosenman)
- Syslog improvements (Larry Rosenman)
- New template0 database that contains no user additions (Tom)
- New /contrib/cube and /contrib/seg GIST sample code (Gene Selkov)
- Allow NetBSD's libedit instead of readline (Peter)
- Improved assembly language source code format (Bruce)
- New contrib/pg_logger
- New --template option to createdb
- New contrib/pg_control utility (Oliver)
- New FreeBSD tools ipc_check, start-scripts/freebsd
-     
-
-     ----------------------------------------------------------------------
-
-                                 Release 7.0.3
-
-     Release date: 2000-11-11
-
-   This has a variety of fixes from 7.0.2.
-
-     ----------------------------------------------------------------------
-
-Migration to version 7.0.3
-
-   A dump/restore is *not* required for those running 7.0.*.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Jdbc fixes (Peter)
- Large object fix (Tom)
- Fix lean in COPY WITH OIDS leak (Tom)
- Fix backwards-index-scan (Tom)
- Fix SELECT ... FOR UPDATE so it checks for duplicate keys (Hiroshi)
- Add --enable-syslog to configure (Marc)
- Fix abort transaction at backend exit in rare cases (Tom)
- Fix for psql \l+ when multi-byte enabled (Tatsuo)
- Allow PL/pgSQL to accept non ascii identifiers (Tatsuo)
- Make vacuum always flush buffers (Tom)
- Fix to allow cancel while waiting for a lock (Hiroshi)
- Fix for memory aloocation problem in user authentication code (Tom)
- Remove bogus use of int4out() (Tom)
- Fixes for multiple subqueries in COALESCE or BETWEEN (Tom)
- Fix for failure of triggers on heap open in certain cases (Jeroen van
-     Vianen)
- Fix for erroneous selectivity of not-equals (Tom)
- Fix for erroneous use of strcmp() (Tom)
- Fix for bug where storage manager accesses items beyond end of file
-     (Tom)
- Fix to include kernel errno message in all smgr elog messages (Tom)
- Fix for '.' not in PATH at build time (SL Baur)
- Fix for out-of-file-descriptors error (Tom)
- Fix to make pg_dump dump 'iscachable' flag for functions (Tom)
- Fix for subselect in targetlist of Append node (Tom)
- Fix for mergejoin plans (Tom)
- Fix TRUNCATE failure on relations with indexes (Tom)
- Avoid database-wide restart on write error (Hiroshi)
- Fix nodeMaterial to honor chgParam by recomputing its output (Tom)
- Fix VACUUM problem with moving chain of update tuples when source and
-     destination of a tuple lie on the same page (Tom)
- Fix user.c CommandCounterIncrement (Tom)
- Fix for AM/PM boundary problem in to_char() (Karel Zak)
- Fix TIME aggregate handling (Tom)
- Fix to_char() to avoid coredump on NULL input (Tom)
- Buffer fix (Tom)
- Fix for inserting/copying longer multibyte strings into char() data
-     types (Tatsuo)
- Fix for crash of backend, on abort (Tom)
-     
-
-     ----------------------------------------------------------------------
-
-                                 Release 7.0.2
-
-     Release date: 2000-06-05
-
-   This is a repackaging of 7.0.1 with added documentation.
-
-     ----------------------------------------------------------------------
-
-Migration to version 7.0.2
-
-   A dump/restore is *not* required for those running 7.*.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Added documentation to tarball.
-     
-
-     ----------------------------------------------------------------------
-
-                                 Release 7.0.1
-
-     Release date: 2000-06-01
-
-   This is a cleanup release for 7.0.
-
-     ----------------------------------------------------------------------
-
-Migration to version 7.0.1
-
-   A dump/restore is *not* required for those running 7.0.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Fix many CLUSTER failures (Tom)
- Allow ALTER TABLE RENAME works on indexes (Tom)
- Fix plpgsql to handle datetime->timestamp and timespan->interval (Bruce)
- New configure --with-setproctitle switch to use setproctitle() (Marc, Bruce)
- Fix the off by one errors in ResultSet from 6.5.3, and more.
- jdbc ResultSet fixes (Joseph Shraibman)
- optimizer tunings (Tom)
- Fix create user for pgaccess
- Fix for UNLISTEN failure
- IRIX fixes (David Kaelbling)
- QNX fixes (Andreas Kardos)
- Reduce COPY IN lock level (Tom)
- Change libpqeasy to use PQconnectdb() style parameters (Bruce)
- Fix pg_dump to handle OID indexes (Tom)
- Fix small memory leak (Tom)
- Solaris fix for createdb/dropdb (Tatsuo)
- Fix for non-blocking connections (Alfred Perlstein)
- Fix improper recovery after RENAME TABLE failures (Tom)
- Copy pg_ident.conf.sample into /lib directory in install (Bruce)
- Add SJIS UDC (NEC selection IBM kanji) support (Eiji Tokuya)
- Fix too long syslog message (Tatsuo)
- Fix problem with quoted indexes that are too long (Tom)
- JDBC ResultSet.getTimestamp() fix (Gregory Krasnow & Floyd Marinescu)
- ecpg changes (Michael)
-     
-
-     ----------------------------------------------------------------------
-
-                                  Release 7.0
-
-     Release date: 2000-05-08
-
-   This release contains improvements in many areas, demonstrating the
-   continued growth of PostgreSQL. There are more improvements and fixes in
-   7.0 than in any previous release. The developers have confidence that this
-   is the best release yet; we do our best to put out only solid releases,
-   and this one is no exception.
-
-   Major changes in this release:
-
-   Foreign Keys
-
-           Foreign keys are now implemented, with the exception of PARTIAL
-           MATCH foreign keys. Many users have been asking for this feature,
-           and we are pleased to offer it.
-
-   Optimizer Overhaul
-
-           Continuing on work started a year ago, the optimizer has been
-           improved, allowing better query plan selection and faster
-           performance with less memory usage.
-
-   Updated psql
-
-           psql, our interactive terminal monitor, has been updated with a
-           variety of new features. See the psql manual page for details.
-
-   Join Syntax
-
-           SQL92 join syntax is now supported, though only as INNER JOINs for
-           this release. JOIN, NATURAL JOIN, JOIN/USING, JOIN/ON are
-           available, as are column correlation names.
-
-     ----------------------------------------------------------------------
-
-Migration to version 7.0
-
-   A dump/restore using pg_dump is required for those wishing to migrate data
-   from any previous release of PostgreSQL. For those upgrading from 6.5.*,
-   you may instead use pg_upgrade to upgrade to this release; however, a full
-   dump/reload installation is always the most robust method for upgrades.
-
-   Interface and compatibility issues to consider for the new release
-   include:
-
-     * The date/time types datetime and timespan have been superseded by the
-       SQL92-defined types timestamp and interval. Although there has been
-       some effort to ease the transition by allowing PostgreSQL to recognize
-       the deprecated type names and translate them to the new type names,
-       this mechanism may not be completely transparent to your existing
-       application.
-
-     * The optimizer has been substantially improved in the area of query
-       cost estimation. In some cases, this will result in decreased query
-       times as the optimizer makes a better choice for the preferred plan.
-       However, in a small number of cases, usually involving pathological
-       distributions of data, your query times may go up. If you are dealing
-       with large amounts of data, you may want to check your queries to
-       verify performance.
-
-     * The JDBC and ODBC interfaces have been upgraded and extended.
-
-     * The string function CHAR_LENGTH is now a native function. Previous
-       versions translated this into a call to LENGTH, which could result in
-       ambiguity with other types implementing LENGTH such as the geometric
-       types.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Bug Fixes
- ---------
- Prevent function calls exceeding maximum number of arguments (Tom)
- Improve CASE construct (Tom)
- Fix SELECT coalesce(f1,0) FROM int4_tbl GROUP BY f1 (Tom)
- Fix SELECT sentence.words[0] FROM sentence GROUP BY sentence.words[0] (Tom)
- Fix GROUP BY scan bug (Tom)
- Improvements in SQL grammar processing (Tom)
- Fix for views involved in INSERT ... SELECT ... (Tom)
- Fix for SELECT a/2, a/2 FROM test_missing_target GROUP BY a/2 (Tom)
- Fix for subselects in INSERT ... SELECT (Tom)
- Prevent INSERT ... SELECT ... ORDER BY (Tom)
- Fixes for relations greater than 2GB, including vacuum
- Improve propagating system table changes to other backends (Tom)
- Improve propagating user table changes to other backends (Tom)
- Fix handling of temp tables in complex situations (Bruce, Tom)
- Allow table locking at table open, improving concurrent reliability (Tom)
- Properly quote sequence names in pg_dump (Ross J. Reedstrom)
- Prevent DROP DATABASE while others accessing
- Prevent any rows from being returned by GROUP BY if no rows processed (Tom)
- Fix SELECT COUNT(1) FROM table WHERE ...' if no rows matching WHERE (Tom)
- Fix pg_upgrade so it works for MVCC (Tom)
- Fix for SELECT ... WHERE x IN (SELECT ... HAVING SUM(x) > 1) (Tom)
- Fix for "f1 datetime DEFAULT 'now'"  (Tom)
- Fix problems with CURRENT_DATE used in DEFAULT (Tom)
- Allow comment-only lines, and ;;; lines too. (Tom)
- Improve recovery after failed disk writes, disk full (Hiroshi)
- Fix cases where table is mentioned in FROM but not joined (Tom)
- Allow HAVING clause without aggregate functions (Tom)
- Fix for "--" comment and no trailing newline, as seen in perl interface
- Improve pg_dump failure error reports (Bruce)
- Allow sorts and hashes to exceed 2GB file sizes (Tom)
- Fix for pg_dump dumping of inherited rules (Tom)
- Fix for NULL handling comparisons (Tom)
- Fix inconsistent state caused by failed CREATE/DROP commands (Hiroshi)
- Fix for dbname with dash
- Prevent DROP INDEX from interfering with other backends (Tom)
- Fix file descriptor leak in verify_password()
- Fix for "Unable to identify an operator =$" problem
- Fix ODBC so no segfault if CommLog and Debug enabled (Dirk Niggemann)
- Fix for recursive exit call (Massimo)
- Fix for extra-long timezones (Jeroen van Vianen)
- Make pg_dump preserve primary key information (Peter E)
- Prevent databases with single quotes (Peter E)
- Prevent DROP DATABASE inside  transaction (Peter E)
- ecpg memory leak fixes (Stephen Birch)
- Fix for SELECT null::text, SELECT int4fac(null) and SELECT 2 + (null) (Tom)
- Y2K timestamp fix (Massimo)
- Fix for VACUUM 'HEAP_MOVED_IN was not expected' errors (Tom)
- Fix for views with tables/columns containing spaces  (Tom)
- Prevent permissions on indexes (Peter E)
- Fix for spinlock stuck problem when error is generated (Hiroshi)
- Fix ipcclean on Linux
- Fix handling of NULL constraint conditions (Tom)
- Fix memory leak in odbc driver (Nick Gorham)
- Fix for permission check on UNION tables (Tom)
- Fix to allow SELECT 'a' LIKE 'a' (Tom)
- Fix for SELECT 1 + NULL (Tom)
- Fixes to CHAR
- Fix log() on numeric type (Tom)
- Deprecate ':' and ';' operators
- Allow vacuum of temporary tables
- Disallow inherited columns with the same name as new columns
- Recover or force failure when disk space is exhausted (Hiroshi)
- Fix INSERT INTO ... SELECT with AS columns matching result columns
- Fix INSERT ... SELECT ... GROUP BY groups by target columns not source columns (Tom)
- Fix CREATE TABLE test (a char(5) DEFAULT text '', b int4) with INSERT (Tom)
- Fix UNION with LIMIT
- Fix CREATE TABLE x AS SELECT 1 UNION SELECT 2
- Fix CREATE TABLE test(col char(2) DEFAULT user)
- Fix mismatched types in CREATE TABLE ... DEFAULT
- Fix SELECT * FROM pg_class where oid in (0,-1)
- Fix SELECT COUNT('asdf') FROM pg_class WHERE oid=12
- Prevent user who can create databases can modifying pg_database table (Peter E)
- Fix btree to give a useful elog when key > 1/2 (page - overhead) (Tom)
- Fix INSERT of 0.0 into DECIMAL(4,4) field (Tom)
-
- Enhancements
- ------------
- New CLI interface include file sqlcli.h, based on SQL3/SQL98
- Remove all limits on query length, row length limit still exists (Tom)
- Update jdbc protocol to 2.0 (Jens Glaser <jens@jens.de>)
- Add TRUNCATE command to quickly truncate relation (Mike Mascari)
- Fix to give super user and createdb user proper update catalog rights (Peter E)
- Allow ecpg bool variables to have NULL values (Christof)
- Issue ecpg error if NULL value for variable with no NULL indicator (Christof)
- Allow ^C to cancel COPY command (Massimo)
- Add SET FSYNC and SHOW PG_OPTIONS commands(Massimo)
- Function name overloading for dynamically-loaded C functions (Frankpitt)
- Add CmdTuples() to libpq++(Vince)
- New CREATE CONSTRAINT TRIGGER and SET CONSTRAINTS commands(Jan)
- Allow CREATE FUNCTION/WITH clause to be used for all language types
- configure --enable-debug adds -g (Peter E)
- configure --disable-debug removes -g (Peter E)
- Allow more complex default expressions (Tom)
- First real FOREIGN KEY constraint trigger functionality (Jan)
- Add FOREIGN KEY ... MATCH FULL ... ON DELETE CASCADE (Jan)
- Add FOREIGN KEY ... MATCH <unspecified> referential actions (Don Baccus)
- Allow WHERE restriction on ctid (physical heap location) (Hiroshi)
- Move pginterface from contrib to interface directory, rename to pgeasy (Bruce)
- Change pgeasy connectdb() parameter ordering (Bruce)
- Require SELECT DISTINCT target list to have all ORDER BY columns (Tom)
- Add Oracle's COMMENT ON command (Mike Mascari <mascarim@yahoo.com>)
- libpq's PQsetNoticeProcessor function now returns previous hook(Peter E)
- Prevent PQsetNoticeProcessor from being set to NULL (Peter E)
- Make USING in COPY optional (Bruce)
- Allow subselects in the target list (Tom)
- Allow subselects on the left side of comparison operators (Tom)
- New parallel regression test (Jan)
- Change backend-side COPY to write files with permissions 644 not 666 (Tom)
- Force permissions on PGDATA directory to be secure, even if it exists (Tom)
- Added psql LASTOID variable to return last inserted oid (Peter E)
- Allow concurrent vacuum and remove pg_vlock vacuum lock file (Tom)
- Add permissions check for vacuum (Peter E)
- New libpq functions to allow asynchronous connections: PQconnectStart(),
-    PQconnectPoll(), PQresetStart(), PQresetPoll(), PQsetenvStart(),
-    PQsetenvPoll(), PQsetenvAbort (Ewan Mellor)
- New libpq PQsetenv() function (Ewan Mellor)
- create/alter user extension (Peter E)
- New postmaster.pid and postmaster.opts under $PGDATA (Tatsuo)
- New scripts for create/drop user/db (Peter E)
- Major psql overhaul (Peter E)
- Add const to libpq interface (Peter E)
- New libpq function PQoidValue (Peter E)
- Show specific non-aggregate causing problem with GROUP BY (Tom)
- Make changes to pg_shadow recreate pg_pwd file (Peter E)
- Add aggregate(DISTINCT ...) (Tom)
- Allow flag to control COPY input/output of NULLs (Peter E)
- Make postgres user have a password by default (Peter E)
- Add CREATE/ALTER/DROP GROUP (Peter E)
- All administration scripts now support --long options (Peter E, Karel)
- Vacuumdb script now supports --all option (Peter E)
- ecpg new portable FETCH syntax
- Add ecpg EXEC SQL IFDEF, EXEC SQL IFNDEF, EXEC SQL ELSE, EXEC SQL ELIF
-         and EXEC SQL ENDIF directives
- Add pg_ctl script to control backend start-up (Tatsuo)
- Add postmaster.opts.default file to store start-up flags (Tatsuo)
- Allow --with-mb=SQL_ASCII
- Increase maximum number of index keys to 16 (Bruce)
- Increase maximum number of function arguments to 16 (Bruce)
- Allow configuration of maximum number of index keys and arguments (Bruce)
- Allow unprivileged users to change their passwords (Peter E)
- Password authentication enabled; required for new users (Peter E)
- Disallow dropping a user who owns a database (Peter E)
- Change initdb option --with-mb to --enable-multibyte
- Add option for initdb to prompts for superuser password (Peter E)
- Allow complex type casts like col::numeric(9,2) and col::int2::float8 (Tom)
- Updated user interfaces on initdb, initlocation, pg_dump, ipcclean (Peter E)
- New pg_char_to_encoding() and pg_encoding_to_char() functions (Tatsuo)
- Libpq non-blocking mode (Alfred Perlstein)
- Improve conversion of types in casts that don't specify a length
- New plperl internal programming language (Mark Hollomon)
- Allow COPY IN to read file that do not end with a newline (Tom)
- Indicate when long identifiers are truncated (Tom)
- Allow aggregates to use type equivalency (Peter E)
- Add Oracle's to_char(), to_date(), to_datetime(), to_timestamp(), to_number()
-         conversion functions (Karel Zak <zakkr@zf.jcu.cz>)
- Add SELECT DISTINCT ON (expr [, expr ...]) targetlist ... (Tom)
- Check to be sure ORDER BY is compatible with the DISTINCT operation (Tom)
- Add NUMERIC and int8 types to ODBC
- Improve EXPLAIN results for Append, Group, Agg, Unique (Tom)
- Add ALTER TABLE ... ADD FOREIGN KEY (Stephan Szabo)
- Allow SELECT .. FOR UPDATE in PL/pgSQL (Hiroshi)
- Enable backward sequential scan even after reaching EOF (Hiroshi)
- Add btree indexing of boolean values, >= and <= (Don Baccus)
- Print current line number when COPY FROM fails (Massimo)
- Recognize POSIX time zone e.g. "PST+8" and "GMT-8" (Thomas)
- Add DEC as synonym for DECIMAL (Thomas)
- Add SESSION_USER as SQL92 keyword, same as CURRENT_USER (Thomas)
- Implement SQL92 column aliases (aka correlation names) (Thomas)
- Implement SQL92 join syntax (Thomas)
- Make INTERVAL reserved word allowed as a column identifier (Thomas)
- Implement REINDEX command (Hiroshi)
- Accept ALL in aggregate function SUM(ALL col) (Tom)
- Prevent GROUP BY from using column aliases (Tom)
- New psql \encoding option (Tatsuo)
- Allow PQrequestCancel() to terminate when in waiting-for-lock state (Hiroshi)
- Allow negation of a negative number in all cases
- Add ecpg descriptors (Christof, Michael)
- Allow CREATE VIEW v AS SELECT f1::char(8) FROM tbl
- Allow casts with length, like foo::char(8)
- New libpq functions PQsetClientEncoding(), PQclientEncoding() (Tatsuo)
- Add support for SJIS user defined characters (Tatsuo)
- Larger views/rules supported
- Make libpq's PQconndefaults() thread-safe (Tom)
- Disable // as comment to be ANSI conforming, should use -- (Tom)
- Allow column aliases on views CREATE VIEW name (collist)
- Fixes for views with subqueries (Tom)
- Allow UPDATE table SET fld = (SELECT ...) (Tom)
- SET command options no longer require quotes
- Update pgaccess to 0.98.6
- New SET SEED command
- New pg_options.sample file
- New SET FSYNC command (Massimo)
- Allow pg_descriptions when creating tables
- Allow pg_descriptions when creating types, columns, and functions
- Allow psql \copy to allow delimiters (Peter E)
- Allow psql to print nulls as distinct from "" [null] (Peter E)
-
- Types
- -----
- Many array fixes (Tom)
- Allow bare column names to be subscripted as arrays (Tom)
- Improve type casting of int and float constants (Tom)
- Cleanups for int8 inputs, range checking, and type conversion (Tom)
- Fix for SELECT timespan('21:11:26'::time) (Tom)
- netmask('x.x.x.x/0') is 255.255.255.255 instead of 0.0.0.0 (Oleg Sharoiko)
- Add btree index on NUMERIC (Jan)
- Perl fix for large objects containing NUL characters (Douglas Thomson)
- ODBC fix for for large objects (free)
- Fix indexing of cidr data type
- Fix for Ethernet MAC addresses (macaddr type) comparisons
- Fix for date/time types when overflows happened in computations (Tom)
- Allow array on int8 (Peter E)
- Fix for rounding/overflow of NUMERIC type, like NUMERIC(4,4) (Tom)
- Allow NUMERIC arrays
- Fix bugs in NUMERIC ceil() and floor() functions (Tom)
- Make char_length()/octet_length including trailing blanks (Tom)
- Made abstime/reltime use int4 instead of time_t (Peter E)
- New lztext data type for compressed text fields
- Revise code to handle coercion of int and float constants (Tom)
- Start at new code to implement a BIT and BIT VARYING type (Adriaan Joubert)
- NUMERIC now accepts scientific notation (Tom)
- NUMERIC to int4 rounds (Tom)
- Convert float4/8 to NUMERIC properly (Tom)
- Allow type conversion with NUMERIC (Thomas)
- Make ISO date style (2000-02-16 09:33) the default (Thomas)
- Add NATIONAL CHAR [ VARYING ] (Thomas)
- Allow NUMERIC round and trunc to accept negative scales (Tom)
- New TIME WITH TIME ZONE type (Thomas)
- Add MAX()/MIN() on time type (Thomas)
- Add abs(), mod(), fac() for int8 (Thomas)
- Rename functions to round(), sqrt(), cbrt(), pow() for float8 (Thomas)
- Add transcendental math functions (e.g. sin(), acos()) for float8 (Thomas)
- Add exp() and ln() for NUMERIC type
- Rename NUMERIC power() to pow() (Thomas)
- Improved TRANSLATE() function (Edwin Ramirez, Tom)
- Allow X=-Y operators  (Tom)
- Allow SELECT float8(COUNT(*))/(SELECT COUNT(*) FROM t) FROM t GROUP BY f1; (Tom)
- Allow LOCALE to use indexes in regular expression searches (Tom)
- Allow creation of functional indexes to use default types
-
- Performance
- -----------
- Prevent exponential space consumption with many AND's and OR's (Tom)
- Collect attribute selectivity values for system columns (Tom)
- Reduce memory usage of aggregates (Tom)
- Fix for LIKE optimization to use indexes with multibyte encodings (Tom)
- Fix r-tree index optimizer selectivity (Thomas)
- Improve optimizer selectivity computations and functions (Tom)
- Optimize btree searching for cases where many equal keys exist (Tom)
- Enable fast LIKE index processing only if index present (Tom)
- Re-use free space on index pages with duplicates (Tom)
- Improve hash join processing (Tom)
- Prevent descending sort if result is already sorted(Hiroshi)
- Allow commuting of index scan query qualifications (Tom)
- Prefer index scans in cases where ORDER BY/GROUP BY is required (Tom)
- Allocate large memory requests in fix-sized chunks for performance (Tom)
- Fix vacuum's performance by reducing memory allocation requests (Tom)
- Implement constant-expression simplification (Bernard Frankpitt, Tom)
- Use secondary columns to be used to determine start of index scan (Hiroshi)
- Prevent quadruple use of disk space when doing internal sorting (Tom)
- Faster sorting by calling fewer functions (Tom)
- Create system indexes to match all system caches (Bruce, Hiroshi)
- Make system caches use system indexes (Bruce)
- Make all system indexes unique (Bruce)
- Improve pg_statistics management for VACUUM speed improvement (Tom)
- Flush backend cache less frequently (Tom, Hiroshi)
- COPY now reuses previous memory allocation, improving performance (Tom)
- Improve optimization cost estimation (Tom)
- Improve optimizer estimate of range queries x > lowbound AND x < highbound (Tom)
- Use DNF instead of CNF where appropriate (Tom, Taral)
- Further cleanup for OR-of-AND WHERE-clauses (Tom)
- Make use of index in OR clauses (x = 1 AND y = 2) OR (x = 2 AND y = 4) (Tom)
- Smarter optimizer computations for random index page access (Tom)
- New SET variable to control optimizer costs (Tom)
- Optimizer queries based on LIMIT, OFFSET, and EXISTS qualifications (Tom)
- Reduce optimizer internal housekeeping of join paths for speedup (Tom)
- Major subquery speedup (Tom)
- Fewer fsync writes when fsync is not disabled (Tom)
- Improved LIKE optimizer estimates (Tom)
- Prevent fsync in SELECT-only queries (Vadim)
- Make index creation use psort code, because it is now faster (Tom)
- Allow creation of sort temp tables > 1 Gig
-
- Source Tree Changes
- -------------------
- Fix for linux PPC compile
- New generic expression-tree-walker subroutine (Tom)
- Change form() to varargform() to prevent portability problems
- Improved range checking for large integers on Alphas
- Clean up #include in /include directory (Bruce)
- Add scripts for checking includes (Bruce)
- Remove un-needed #include's from *.c files (Bruce)
- Change #include's to use <> and "" as appropriate (Bruce)
- Enable WIN32 compilation of libpq
- Alpha spinlock fix from Uncle George <gatgul@voicenet.com>
- Overhaul of optimizer data structures (Tom)
- Fix to cygipc library (Yutaka Tanida)
- Allow pgsql to work on newer Cygwin snapshots (Dan)
- New catalog version number (Tom)
- Add Linux ARM
- Rename heap_replace to heap_update
- Update for QNX (Dr. Andreas Kardos)
- New platform-specific regression handling (Tom)
- Rename oid8 -> oidvector and int28 -> int2vector (Bruce)
- Included all yacc and lex files into the distribution (Peter E.)
- Remove lextest, no longer needed (Peter E)
- Fix for libpq and psql on Win32 (Magnus)
- Internally change datetime and timespan into timestamp and interval (Thomas)
- Fix for plpgsql on BSDI
- Add SQL_ASCII test case to the regression test (Tatsuo)
- configure --with-mb now deprecated (Tatsuo)
- NT fixes
- NetBSD fixes (Johnny C. Lam <lamj@stat.cmu.edu>)
- Fixes for Alpha compiles
- New multibyte encodings
-     
-
-     ----------------------------------------------------------------------
-
-                                 Release 6.5.3
-
-     Release date: 1999-10-13
-
-   This is basically a cleanup release for 6.5.2. We have added a new
-   PgAccess that was missing in 6.5.2, and installed an NT-specific fix.
-
-     ----------------------------------------------------------------------
-
-Migration to version 6.5.3
-
-   A dump/restore is *not* required for those running 6.5.*.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Updated version of pgaccess 0.98
- NT-specific patch
- Fix dumping rules on inherited tables
-     
-
-     ----------------------------------------------------------------------
-
-                                 Release 6.5.2
-
-     Release date: 1999-09-15
-
-   This is basically a cleanup release for 6.5.1. We have fixed a variety of
-   problems reported by 6.5.1 users.
-
-     ----------------------------------------------------------------------
-
-Migration to version 6.5.2
-
-   A dump/restore is *not* required for those running 6.5.*.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- subselect+CASE fixes(Tom)
- Add SHLIB_LINK setting for solaris_i386 and solaris_sparc ports(Daren Sefcik)
- Fixes for CASE in WHERE join clauses(Tom)
- Fix BTScan abort(Tom)
- Repair the check for redundant UNIQUE and PRIMARY KEY indexes(Thomas)
- Improve it so that it checks for multi-column constraints(Thomas)
- Fix for Win32 making problem with MB enabled(Hiroki Kataoka)
- Allow BSD yacc and bison to compile pl code(Bruce)
- Fix SET NAMES working
- int8 fixes(Thomas)
- Fix vacuum's memory consumption(Hiroshi,Tatsuo)
- Reduce the total memory consumption of vacuum(Tom)
- Fix for timestamp(datetime)
- Rule deparsing bugfixes(Tom)
- Fix quoting problems in mkMakefile.tcldefs.sh.in and mkMakefile.tkdefs.sh.in(Tom)
- This is to re-use space on index pages freed by vacuum(Vadim)
- document -x for pg_dump(Bruce)
- Fix for unary operators in rule deparser(Tom)
- Comment out FileUnlink of excess segments during mdtruncate()(Tom)
- Irix linking fix from Yu Cao >yucao@falcon.kla-tencor.com<
- Repair logic error in LIKE: should not return LIKE_ABORT
-    when reach end of pattern before end of text(Tom)
- Repair incorrect cleanup of heap memory allocation during transaction abort(Tom)
- Updated version of pgaccess 0.98
-     
-
-     ----------------------------------------------------------------------
-
-                                 Release 6.5.1
-
-     Release date: 1999-07-15
-
-   This is basically a cleanup release for 6.5. We have fixed a variety of
-   problems reported by 6.5 users.
-
-     ----------------------------------------------------------------------
-
-Migration to version 6.5.1
-
-   A dump/restore is *not* required for those running 6.5.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Add NT README file
- Portability fixes for linux_ppc, Irix, linux_alpha, OpenBSD, alpha
- Remove QUERY_LIMIT, use SELECT...LIMIT
- Fix for EXPLAIN on inheritance(Tom)
- Patch to allow vacuum on multi-segment tables(Hiroshi)
- R-Tree optimizer selectivity fix(Tom)
- ACL file descriptor leak fix(Atsushi Ogawa)
- New expresssion subtree code(Tom)
- Avoid disk writes for read-only transactions(Vadim)
- Fix for removal of temp tables if last transaction was aborted(Bruce)
- Fix to prevent too large tuple from being created(Bruce)
- plpgsql fixes
- Allow port numbers 32k - 64k(Bruce)
- Add ^ precidence(Bruce)
- Rename sort files called pg_temp to pg_sorttemp(Bruce)
- Fix for microseconds in time values(Tom)
- Tutorial source cleanup
- New linux_m68k port
- Fix for sorting of NULL's in some cases(Tom)
- Shared library dependencies fixed (Tom)
- Fixed glitches affecting GROUP BY in subselects(Tom)
- Fix some compiler warnings (Tomoaki Nishiyama)
- Add Win1250 (Czech) support (Pavel Behal)
-     
-
-     ----------------------------------------------------------------------
-
-                                  Release 6.5
-
-     Release date: 1999-06-09
-
-   This release marks a major step in the development team's mastery of the
-   source code we inherited from Berkeley. You will see we are now easily
-   adding major features, thanks to the increasing size and experience of our
-   world-wide development team.
-
-   Here is a brief summary of the more notable changes:
-
-   Multi-version concurrency control(MVCC)
-
-           This removes our old table-level locking, and replaces it with a
-           locking system that is superior to most commercial database
-           systems. In a traditional system, each row that is modified is
-           locked until committed, preventing reads by other users. MVCC uses
-           the natural multi-version nature of PostgreSQL to allow readers to
-           continue reading consistent data during writer activity. Writers
-           continue to use the compact pg_log transaction system. This is all
-           performed without having to allocate a lock for every row like
-           traditional database systems. So, basically, we no longer are
-           restricted by simple table-level locking; we have something better
-           than row-level locking.
-
-   Hot backups from pg_dump
-
-           pg_dump takes advantage of the new MVCC features to give a
-           consistent database dump/backup while the database stays online
-           and available for queries.
-
-   Numeric data type
-
-           We now have a true numeric data type, with user-specified
-           precision.
-
-   Temporary tables
-
-           Temporary tables are guaranteed to have unique names within a
-           database session, and are destroyed on session exit.
-
-   New SQL features
-
-           We now have CASE, INTERSECT, and EXCEPT statement support. We have
-           new LIMIT/OFFSET, SET TRANSACTION ISOLATION LEVEL, SELECT ... FOR
-           UPDATE, and an improved LOCK TABLE command.
-
-   Speedups
-
-           We continue to speed up PostgreSQL, thanks to the variety of
-           talents within our team. We have sped up memory allocation,
-           optimization, table joins, and row transfer routines.
-
-   Ports
-
-           We continue to expand our port list, this time including Windows
-           NT/ix86 and NetBSD/arm32.
-
-   Interfaces
-
-           Most interfaces have new versions, and existing functionality has
-           been improved.
-
-   Documentation
-
-           New and updated material is present throughout the documentation.
-           New FAQs have been contributed for SGI and AIX platforms. The
-           Tutorial has introductory information on SQL from Stefan
-           Simkovics. For the User's Guide, there are reference pages
-           covering the postmaster and more utility programs, and a new
-           appendix contains details on date/time behavior. The
-           Administrator's Guide has a new chapter on troubleshooting from
-           Tom Lane. And the Programmer's Guide has a description of query
-           processing, also from Stefan, and details on obtaining the
-           PostgreSQL source tree via anonymous CVS and CVSup.
-
-     ----------------------------------------------------------------------
-
-Migration to version 6.5
-
-   A dump/restore using pg_dump is required for those wishing to migrate data
-   from any previous release of PostgreSQL. pg_upgrade can *not* be used to
-   upgrade to this release because the on-disk structure of the tables has
-   changed compared to previous releases.
-
-   The new Multi-Version Concurrency Control (MVCC) features can give
-   somewhat different behaviors in multi-user environments. *Read and
-   understand the following section to ensure that your existing applications
-   will give you the behavior you need.*
-
-     ----------------------------------------------------------------------
-
-  Multi-Version Concurrency Control
-
-   Because readers in 6.5 don't lock data, regardless of transaction
-   isolation level, data read by one transaction can be overwritten by
-   another. In other words, if a row is returned by "SELECT" it doesn't mean
-   that this row really exists at the time it is returned (i.e. sometime
-   after the statement or transaction began) nor that the row is protected
-   from being deleted or updated by concurrent transactions before the
-   current transaction does a commit or rollback.
-
-   To ensure the actual existence of a row and protect it against concurrent
-   updates one must use "SELECT FOR UPDATE" or an appropriate "LOCK TABLE"
-   statement. This should be taken into account when porting applications
-   from previous releases of PostgreSQL and other environments.
-
-   Keep the above in mind if you are using "contrib/refint.*" triggers for
-   referential integrity. Additional techniques are required now. One way is
-   to use "LOCK parent_table IN SHARE ROW EXCLUSIVE MODE" command if a
-   transaction is going to update/delete a primary key and use "LOCK
-   parent_table IN SHARE MODE" command if a transaction is going to
-   update/insert a foreign key.
-
-     Note: Note that if you run a transaction in SERIALIZABLE mode then you
-     must execute the "LOCK" commands above before execution of any DML
-     statement ("SELECT/INSERT/DELETE/UPDATE/FETCH/COPY_TO") in the
-     transaction.
-
-   These inconveniences will disappear in the future when the ability to read
-   dirty (uncommitted) data (regardless of isolation level) and true
-   referential integrity will be implemented.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Bug Fixes
- ---------
- Fix text<->float8 and text<->float4 conversion functions(Thomas)
- Fix for creating tables with mixed-case constraints(Billy)
- Change exp()/pow() behavior to generate error on underflow/overflow(Jan)
- Fix bug in pg_dump -z
- Memory overrun cleanups(Tatsuo)
- Fix for lo_import crash(Tatsuo)
- Adjust handling of data type names to suppress double quotes(Thomas)
- Use type coercion for matching columns and DEFAULT(Thomas)
- Fix deadlock so it only checks once after one second of sleep(Bruce)
- Fixes for aggregates and PL/pgsql(Hiroshi)
- Fix for subquery crash(Vadim)
- Fix for libpq function PQfnumber and case-insensitive names(Bahman Rafatjoo)
- Fix for large object write-in-middle, no extra block, memory consumption(Tatsuo)
- Fix for pg_dump -d or -D and  quote special characters in INSERT
- Repair serious problems with dynahash(Tom)
- Fix INET/CIDR portability problems
- Fix problem with selectivity error in ALTER TABLE ADD COLUMN(Bruce)
- Fix executor so mergejoin of different column types works(Tom)
- Fix for Alpha OR selectivity bug
- Fix OR index selectivity problem(Bruce)
- Fix so \d shows proper length for char()/varchar()(Ryan)
- Fix tutorial code(Clark)
- Improve destroyuser checking(Oliver)
- Fix for Kerberos(Rodney McDuff)
- Fix for dropping database while dirty buffers(Bruce)
- Fix so sequence nextval() can be case-sensitive(Bruce)
- Fix !!= operator
- Drop buffers before destroying database files(Bruce)
- Fix case where executor evaluates functions twice(Tatsuo)
- Allow sequence nextval actions to be case-sensitive(Bruce)
- Fix optimizer indexing not working for negative numbers(Bruce)
- Fix for memory leak in executor with fjIsNull
- Fix for aggregate memory leaks(Erik Riedel)
- Allow username containing a dash GRANT permissions
- Cleanup of NULL in inet types
- Clean up system table bugs(Tom)
- Fix problems of PAGER and \? command(Masaaki Sakaida)
- Reduce default multi-segment file size limit to 1GB(Peter)
- Fix for dumping of CREATE OPERATOR(Tom)
- Fix for backward scanning of cursors(Hiroshi Inoue)
- Fix for COPY FROM STDIN when using \i(Tom)
- Fix for subselect is compared inside an expression(Jan)
- Fix handling of error reporting while returning rows(Tom)
- Fix problems with reference to array types(Tom,Jan)
- Prevent UPDATE SET oid(Jan)
- Fix pg_dump so -t option can handle case-sensitive tablenames
- Fixes for GROUP BY in special cases(Tom, Jan)
- Fix for memory leak in failed queries(Tom)
- DEFAULT now supports mixed-case identifiers(Tom)
- Fix for multi-segment uses of DROP/RENAME table, indexes(Ole Gjerde)
- Disable use of pg_dump with both -o and -d options(Bruce)
- Allow pg_dump to properly dump GROUP permissions(Bruce)
- Fix GROUP BY in INSERT INTO table SELECT * FROM table2(Jan)
- Fix for computations in views(Jan)
- Fix for aggregates on array indexes(Tom)
- Fix for DEFAULT handles single quotes in value requiring too many quotes
- Fix security problem with non-super users importing/exporting large objects(Tom)
- Rollback of transaction that creates table cleaned up properly(Tom)
- Fix to allow long table and column names to generate proper serial names(Tom)
-
- Enhancements
- ------------
- Add "vacuumdb" utility
- Speed up libpq by allocating memory better(Tom)
- EXPLAIN all indexes used(Tom)
- Implement CASE, COALESCE, NULLIF  expression(Thomas)
- New pg_dump table output format(Constantin)
- Add string min()/max() functions(Thomas)
- Extend new type coercion techniques to aggregates(Thomas)
- New moddatetime contrib(Terry)
- Update to pgaccess 0.96(Constantin)
- Add routines for single-byte "char" type(Thomas)
- Improved substr() function(Thomas)
- Improved multibyte handling(Tatsuo)
- Multi-version concurrency control/MVCC(Vadim)
- New Serialized mode(Vadim)
- Fix for tables over 2gigs(Peter)
- New SET TRANSACTION ISOLATION LEVEL(Vadim)
- New LOCK TABLE IN ... MODE(Vadim)
- Update ODBC driver(Byron)
- New NUMERIC data type(Jan)
- New SELECT FOR UPDATE(Vadim)
- Handle "NaN" and "Infinity" for input values(Jan)
- Improved date/year handling(Thomas)
- Improved handling of backend connections(Magnus)
- New options ELOG_TIMESTAMPS and USE_SYSLOG options for log files(Massimo)
- New TCL_ARRAYS option(Massimo)
- New INTERSECT and EXCEPT(Stefan)
- New pg_index.indisprimary for primary key tracking(D'Arcy)
- New pg_dump option to allow dropping of tables before creation(Brook)
- Speedup of row output routines(Tom)
- New READ COMMITTED isolation level(Vadim)
- New TEMP tables/indexes(Bruce)
- Prevent sorting if result is already sorted(Jan)
- New memory allocation optimization(Jan)
- Allow psql to do \p\g(Bruce)
- Allow multiple rule actions(Jan)
- Added LIMIT/OFFSET functionality(Jan)
- Improve optimizer when joining a large number of tables(Bruce)
- New intro to SQL from S. Simkovics' Master's Thesis (Stefan, Thomas)
- New intro to backend processing from S. Simkovics' Master's Thesis (Stefan)
- Improved int8 support(Ryan Bradetich, Thomas, Tom)
- New routines to convert between int8 and text/varchar types(Thomas)
- New bushy plans, where meta-tables are joined(Bruce)
- Enable right-hand queries by default(Bruce)
- Allow reliable maximum number of backends to be set at configure time
-       (--with-maxbackends and postmaster switch (-N backends))(Tom)
- GEQO default now 10 tables because of optimizer speedups(Tom)
- Allow NULL=Var for MS-SQL portability(Michael, Bruce)
- Modify contrib check_primary_key() so either "automatic" or "dependent"(Anand)
- Allow psql \d on a view show query(Ryan)
- Speedup for LIKE(Bruce)
- Ecpg fixes/features, see src/interfaces/ecpg/ChangeLog file(Michael)
- JDBC fixes/features, see src/interfaces/jdbc/CHANGELOG(Peter)
- Make % operator have precedence like /(Bruce)
- Add new postgres -O option to allow system table structure changes(Bruce)
- Update contrib/pginterface/findoidjoins script(Tom)
- Major speedup in vacuum of deleted rows with indexes(Vadim)
- Allow non-SQL functions to run different versions based on arguments(Tom)
- Add -E option that shows actual queries sent by \dt and friends(Masaaki Sakaida)
- Add version number in start-up banners for psql(Masaaki Sakaida)
- New contrib/vacuumlo removes large objects not referenced(Peter)
- New initialization for table sizes so non-vacuumed tables perform better(Tom)
- Improve error messages when a connection is rejected(Tom)
- Support for arrays of char() and varchar() fields(Massimo)
- Overhaul of hash code to increase reliability and performance(Tom)
- Update to PyGreSQL 2.4(D'Arcy)
- Changed debug options so -d4 and -d5 produce different node displays(Jan)
- New pg_options: pretty_plan, pretty_parse, pretty_rewritten(Jan)
- Better optimization statistics for system table access(Tom)
- Better handling of non-default block sizes(Massimo)
- Improve GEQO optimizer memory consumption(Tom)
- UNION now suppports ORDER BY of columns not in target list(Jan)
- Major libpq++ improvements(Vince Vielhaber)
- pg_dump now uses -z(ACL's) as default(Bruce)
- backend cache, memory speedups(Tom)
- have pg_dump do everything in one snapshot transaction(Vadim)
- fix for large object memory leakage, fix for pg_dumping(Tom)
- INET type now respects netmask for comparisons
- Make VACUUM ANALYZE only use a readlock(Vadim)
- Allow VIEWs on UNIONS(Jan)
- pg_dump now can generate consistent snapshots on active databases(Vadim)
-
- Source Tree Changes
- -------------------
- Improve port matching(Tom)
- Portability fixes for SunOS
- Add NT/Win32 backend port and enable dynamic loading(Magnus and Daniel Horak)
- New port to Cobalt Qube(Mips) running Linux(Tatsuo)
- Port to NetBSD/m68k(Mr. Mutsuki Nakajima)
- Port to NetBSD/sun3(Mr. Mutsuki Nakajima)
- Port to NetBSD/macppc(Toshimi Aoki)
- Fix for tcl/tk configuration(Vince)
- Removed CURRENT keyword for rule queries(Jan)
- NT dynamic loading now works(Daniel Horak)
- Add ARM32 support(Andrew McMurry)
- Better support for HPUX 11 and Unixware
- Improve file handling to be more uniform, prevent file descriptor leak(Tom)
- New install commands for plpgsql(Jan)
-     
-
-     ----------------------------------------------------------------------
-
-                                 Release 6.4.2
-
-     Release date: 1998-12-20
-
-   The 6.4.1 release was improperly packaged. This also has one additional
-   bug fix.
-
-     ----------------------------------------------------------------------
-
-Migration to version 6.4.2
-
-   A dump/restore is *not* required for those running 6.4.*.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Fix for datetime constant problem on some platforms(Thomas)
-
-     ----------------------------------------------------------------------
-
-                                 Release 6.4.1
-
-     Release date: 1998-12-18
-
-   This is basically a cleanup release for 6.4. We have fixed a variety of
-   problems reported by 6.4 users.
-
-     ----------------------------------------------------------------------
-
-Migration to version 6.4.1
-
-   A dump/restore is *not* required for those running 6.4.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Add pg_dump -N flag to force double quotes around identifiers.  This is
-         the default(Thomas)
- Fix for NOT in where clause causing crash(Bruce)
- EXPLAIN VERBOSE coredump fix(Vadim)
- Fix shared-library problems on Linux
- Fix test for table existance to allow mixed-case and whitespace in
-         the table name(Thomas)
- Fix a couple of pg_dump bugs
- Configure matches template/.similar entries better(Tom)
- Change builtin function names from SPI_* to spi_*
- OR WHERE clause fix(Vadim)
- Fixes for mixed-case table names(Billy)
- contrib/linux/postgres.init.csh/sh fix(Thomas)
- libpq memory overrun fix
- SunOS fixes(Tom)
- Change exp() behavior to generate error on underflow(Thomas)
- pg_dump fixes for memory leak, inheritance constraints, layout change
- update pgaccess to 0.93
- Fix prototype for 64-bit platforms
- Multibyte fixes(Tatsuo)
- New ecpg man page
- Fix memory overruns(Tatsuo)
- Fix for lo_import() crash(Bruce)
- Better search for install program(Tom)
- Timezone fixes(Tom)
- HPUX fixes(Tom)
- Use implicit type coercion for matching DEFAULT values(Thomas)
- Add routines to help with single-byte (internal) character type(Thomas)
- Compilation of libpq for Win32 fixes(Magnus)
- Upgrade to PyGreSQL 2.2(D'Arcy)
-
-     ----------------------------------------------------------------------
-
-                                  Release 6.4
-
-     Release date: 1998-10-30
-
-   There are *many* new features and improvements in this release. Thanks to
-   our developers and maintainers, nearly every aspect of the system has
-   received some attention since the previous release. Here is a brief,
-   incomplete summary:
-
-     * Views and rules are now functional thanks to extensive new code in the
-       rewrite rules system from Jan Wieck. He also wrote a chapter on it for
-       the Programmer's Guide.
-
-     * Jan also contributed a second procedural language, PL/pgSQL, to go
-       with the original PL/pgTCL procedural language he contributed last
-       release.
-
-     * We have optional multiple-byte character set support from Tatsuo Iishi
-       to complement our existing locale support.
-
-     * Client/server communications has been cleaned up, with better support
-       for asynchronous messages and interrupts thanks to Tom Lane.
-
-     * The parser will now perform automatic type coercion to match arguments
-       to available operators and functions, and to match columns and
-       expressions with target columns. This uses a generic mechanism which
-       supports the type extensibility features of PostgreSQL. There is a new
-       chapter in the User's Guide which covers this topic.
-
-     * Three new data types have been added. Two types, inet and cidr,
-       support various forms of IP network, subnet, and machine addressing.
-       There is now an 8-byte integer type available on some platforms. See
-       the chapter on data types in the User's Guide for details. A fourth
-       type, serial, is now supported by the parser as an amalgam of the int4
-       type, a sequence, and a unique index.
-
-     * Several more SQL92-compatible syntax features have been added,
-       including "INSERT DEFAULT VALUES"
-
-     * The automatic configuration and installation system has received some
-       attention, and should be more robust for more platforms than it has
-       ever been.
-
-     ----------------------------------------------------------------------
-
-Migration to version 6.4
-
-   A dump/restore using pg_dump or pg_dumpall is required for those wishing
-   to migrate data from any previous release of PostgreSQL.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Bug Fixes
- ---------
- Fix for a tiny memory leak in PQsetdb/PQfinish(Bryan)
- Remove char2-16 data types, use char/varchar(Darren)
- Pqfn not handles a NOTICE message(Anders)
- Reduced busywaiting overhead for spinlocks with many backends (dg)
- Stuck spinlock detection (dg)
- Fix up "ISO-style" timespan decoding and encoding(Thomas)
- Fix problem with table drop after rollback of transaction(Vadim)
- Change error message and remove non-functional update message(Vadim)
- Fix for COPY array checking
- Fix for SELECT 1 UNION SELECT NULL
- Fix for buffer leaks in large object calls(Pascal)
- Change owner from oid to int4 type(Bruce)
- Fix a bug in the oracle compatibility functions btrim() ltrim() and rtrim()
- Fix for shared invalidation cache overflow(Massimo)
- Prevent file descriptor leaks in failed COPY's(Bruce)
- Fix memory leak in libpgtcl's pg_select(Constantin)
- Fix problems with username/passwords over 8 characters(Tom)
- Fix problems with handling of asynchronous NOTIFY in backend(Tom)
- Fix of many bad system table entries(Tom)
-
- Enhancements
- ------------
- Upgrade ecpg and ecpglib,see src/interfaces/ecpc/ChangeLog(Michael)
- Show the index used in an EXPLAIN(Zeugswetter)
- EXPLAIN  invokes  rule system and shows plan(s) for rewritten queries(Jan)
- Multibyte awareness of many data types and functions, via configure(Tatsuo)
- New configure --with-mb option(Tatsuo)
- New initdb --pgencoding option(Tatsuo)
- New createdb -E multibyte option(Tatsuo)
- Select version(); now returns PostgreSQL version(Jeroen)
- Libpq now allows asynchronous clients(Tom)
- Allow cancel from client of backend query(Tom)
- Psql now cancels query with Control-C(Tom)
- Libpq users need not issue dummy queries to get NOTIFY messages(Tom)
- NOTIFY now sends sender's PID, so you can tell whether it was your own(Tom)
- PGresult struct now includes associated error message, if any(Tom)
- Define "tz_hour" and "tz_minute" arguments to date_part()(Thomas)
- Add routines to convert between varchar and bpchar(Thomas)
- Add routines to allow sizing of varchar and bpchar into target columns(Thomas)
- Add bit flags to support timezonehour and minute in data retrieval(Thomas)
- Allow more variations on valid floating point numbers (e.g. ".1", "1e6")(Thomas)
- Fixes for unary minus parsing with leading spaces(Thomas)
- Implement TIMEZONE_HOUR, TIMEZONE_MINUTE per SQL92 specs(Thomas)
- Check for and properly ignore FOREIGN KEY column constraints(Thomas)
- Define USER as synonym for CURRENT_USER per SQL92 specs(Thomas)
- Enable HAVING clause but no fixes elsewhere yet.
- Make "char" type a synonym for "char(1)" (actually implemented as bpchar)(Thomas)
- Save string type if specified for DEFAULT clause handling(Thomas)
- Coerce operations involving different data types(Thomas)
- Allow some index use for columns of different types(Thomas)
- Add capabilities for automatic type conversion(Thomas)
- Cleanups for large objects, so file is truncated on open(Peter)
- Readline cleanups(Tom)
- Allow psql  \f \ to make spaces as delimiter(Bruce)
- Pass pg_attribute.atttypmod to the frontend for column field lengths(Tom,Bruce)
- Msql compatibility library in /contrib(Aldrin)
- Remove the requirement that ORDER/GROUP BY clause identifiers be
- included in the target list(David)
- Convert columns to match columns in UNION clauses(Thomas)
- Remove fork()/exec() and only do fork()(Bruce)
- Jdbc cleanups(Peter)
- Show backend status on ps command line(only works on some platforms)(Bruce)
- Pg_hba.conf now has a sameuser option in the database field
- Make lo_unlink take oid param, not int4
- New DISABLE_COMPLEX_MACRO for compilers that can't handle our macros(Bruce)
- Libpgtcl now handles NOTIFY as a Tcl event, need not send dummy queries(Tom)
- libpgtcl cleanups(Tom)
- Add -error option to libpgtcl's pg_result command(Tom)
- New locale patch, see docs/README/locale(Oleg)
- Fix for pg_dump so CONSTRAINT and CHECK syntax is correct(ccb)
- New contrib/lo code for large object orphan removal(Peter)
- New psql command "SET CLIENT_ENCODING TO 'encoding'" for multibytes
- feature, see /doc/README.mb(Tatsuo)
- /contrib/noupdate code to revoke update permission on a column
- Libpq can now be compiled on win32(Magnus)
- Add PQsetdbLogin() in libpq
- New 8-byte integer type, checked by configure for OS support(Thomas)
- Better support for quoted table/column names(Thomas)
- Surround table and column names with double-quotes in pg_dump(Thomas)
- PQreset() now works with passwords(Tom)
- Handle case of GROUP BY target list column number out of range(David)
- Allow UNION in subselects
- Add auto-size to screen to \d? commands(Bruce)
- Use UNION to show all \d? results in one query(Bruce)
- Add \d? field search feature(Bruce)
- Pg_dump issues fewer \connect requests(Tom)
- Make pg_dump -z flag work better, document it in manual page(Tom)
- Add HAVING clause with full support for subselects and unions(Stephan)
- Full text indexing routines in contrib/fulltextindex(Maarten)
- Transaction ids now stored in shared memory(Vadim)
- New PGCLIENTENCODING when issuing COPY command(Tatsuo)
- Support for SQL92 syntax "SET NAMES"(Tatsuo)
- Support for LATIN2-5(Tatsuo)
- Add UNICODE regression test case(Tatsuo)
- Lock manager cleanup, new locking modes for LLL(Vadim)
- Allow index use with OR clauses(Bruce)
- Allows "SELECT NULL ORDER BY 1;"
- Explain VERBOSE prints the plan, and now pretty-prints the plan to
- the postmaster log file(Bruce)
- Add indexes display to \d command(Bruce)
- Allow GROUP BY on functions(David)
- New pg_class.relkind for large objects(Bruce)
- New way to send libpq NOTICE messages to a different location(Tom)
- New \w write command to psql(Bruce)
- New /contrib/findoidjoins scans oid columns to find join relationships(Bruce)
- Allow binary-compatible indexes to be considered when checking for valid
- Indexes for restriction clauses containing a constant(Thomas)
- New ISBN/ISSN code in /contrib/isbn_issn
- Allow NOT LIKE, IN, NOT IN, BETWEEN, and NOT BETWEEN constraint(Thomas)
- New rewrite system fixes many problems with rules and views(Jan)
-         * Rules on relations work
-         * Event qualifications on insert/update/delete work
-         * New OLD variable to reference CURRENT, CURRENT will be remove in future
-         * Update rules can reference NEW and OLD in rule qualifications/actions
-         * Insert/update/delete rules on views work
-         * Multiple rule actions are now supported, surrounded by parentheses
-         * Regular users can create views/rules on tables they have RULE permits
-         * Rules and views inherit the permissions on the creator
-         * No rules at the column level
-         * No UPDATE NEW/OLD rules
-         * New pg_tables, pg_indexes, pg_rules and pg_views system views
-         * Only a single action on SELECT rules
-         * Total rewrite overhaul, perhaps for 6.5
-         * handle subselects
-         * handle aggregates on views
-         * handle insert into select from view works
- System indexes are now multi-key(Bruce)
- Oidint2, oidint4, and oidname types are removed(Bruce)
- Use system cache for more system table lookups(Bruce)
- New backend programming language PL/pgSQL in backend/pl(Jan)
- New SERIAL data type, auto-creates sequence/index(Thomas)
- Enable assert checking without a recompile(Massimo)
- User lock enhancements(Massimo)
- New setval() command to set sequence value(Massimo)
- Auto-remove unix socket file on start-up if no postmaster running(Massimo)
- Conditional trace package(Massimo)
- New UNLISTEN command(Massimo)
- Psql and libpq now compile under win32 using win32.mak(Magnus)
- Lo_read no longer stores trailing NULL(Bruce)
- Identifiers are now truncated to 31 characters internally(Bruce)
- Createuser options now availble on the command line
- Code for 64-bit integer supported added, configure tested, int8 type(Thomas)
- Prevent file descriptor leaf from failed COPY(Bruce)
- New pg_upgrade command(Bruce)
- Updated /contrib directories(Massimo)
- New CREATE TABLE DEFAULT VALUES statement available(Thomas)
- New INSERT INTO TABLE DEFAULT VALUES statement available(Thomas)
- New DECLARE and FETCH feature(Thomas)
- libpq's internal structures now not exported(Tom)
- Allow up to 8 key indexes(Bruce)
- Remove ARCHIVE keyword, that is no longer used(Thomas)
- pg_dump -n flag to supress quotes around indentifiers
- disable system columns for views(Jan)
- new INET and CIDR types for network addresses(TomH, Paul)
- no more double quotes in psql output
- pg_dump now dumps views(Terry)
- new SET QUERY_LIMIT(Tatsuo,Jan)
-
- Source Tree Changes
- -------------------
- /contrib cleanup(Jun)
- Inline some small functions called for every row(Bruce)
- Alpha/linux fixes
- Hp/UX cleanups(Tom)
- Multibyte regression tests(Soonmyung.)
- Remove --disabled options from configure
- Define PGDOC to use POSTGRESDIR by default
- Make regression optional
- Remove extra braces code to pgindent(Bruce)
- Add bsdi shared library support(Bruce)
- New --without-CXX support configure option(Brook)
- New FAQ_CVS
- Update backend flowchart in tools/backend(Bruce)
- Change atttypmod from int16 to int32(Bruce, Tom)
- Getrusage() fix for platforms that do not have it(Tom)
- Add PQconnectdb, PGUSER, PGPASSWORD to libpq man page
- NS32K platform fixes(Phil Nelson, John Buller)
- Sco 7/UnixWare 2.x fixes(Billy,others)
- Sparc/Solaris 2.5 fixes(Ryan)
- Pgbuiltin.3 is obsolete, move to doc files(Thomas)
- Even more documention(Thomas)
- Nextstep support(Jacek)
- Aix support(David)
- pginterface manual page(Bruce)
- shared libraries all have version numbers
- merged all OS-specific shared library defines into one file
- smarter TCL/TK configuration checking(Billy)
- smarter perl configuration(Brook)
- configure uses supplied install-sh if no install script found(Tom)
- new Makefile.shlib for shared library configuration(Tom)
-
-     ----------------------------------------------------------------------
-
-                                 Release 6.3.2
-
-     Release date: 1998-04-07
-
-   This is a bug-fix release for 6.3.x. Refer to the release notes for
-   version 6.3 for a more complete summary of new features.
-
-   Summary:
-
-     * Repairs automatic configuration support for some platforms, including
-       Linux, from breakage inadvertently introduced in version 6.3.1.
-
-     * Correctly handles function calls on the left side of BETWEEN and LIKE
-       clauses.
-
-   A dump/restore is NOT required for those running 6.3 or 6.3.1. A make
-   distclean, make, and make install is all that is required. This last step
-   should be performed while the postmaster is not running. You should
-   re-link any custom applications that use PostgreSQL libraries.
-
-   For upgrades from pre-6.3 installations, refer to the installation and
-   migration instructions for version 6.3.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Configure detection improvements for tcl/tk(Brook Milligan, Alvin)
- Manual page improvements(Bruce)
- BETWEEN and LIKE fix(Thomas)
- fix for psql \connect used by pg_dump(Oliver Elphick)
- New odbc driver
- pgaccess, version 0.86
- qsort removed, now uses libc version, cleanups(Jeroen)
- fix for buffer over-runs detected(Maurice Gittens)
- fix for buffer overrun in libpgtcl(Randy Kunkee)
- fix for UNION with DISTINCT or ORDER BY(Bruce)
- gettimeofday configure check(Doug Winterburn)
- Fix "indexes not used" bug(Vadim)
- docs additions(Thomas)
- Fix for backend memory leak(Bruce)
- libreadline cleanup(Erwan MAS)
- Remove DISTDIR(Bruce)
- Makefile dependency cleanup(Jeroen van Vianen)
- ASSERT fixes(Bruce)
-     
-
-     ----------------------------------------------------------------------
-
-                                 Release 6.3.1
-
-     Release date: 1998-03-23
-
-   Summary:
-
-     * Additional support for multibyte character sets.
-
-     * Repair byte ordering for mixed-endian clients and servers.
-
-     * Minor updates to allowed SQL syntax.
-
-     * Improvements to the configuration autodetection for installation.
-
-   A dump/restore is NOT required for those running 6.3. A make distclean,
-   make, and make install is all that is required. This last step should be
-   performed while the postmaster is not running. You should re-link any
-   custom applications that use PostgreSQL libraries.
-
-   For upgrades from pre-6.3 installations, refer to the installation and
-   migration instructions for version 6.3.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- ecpg cleanup/fixes, now version 1.1(Michael Meskes)
- pg_user cleanup(Bruce)
- large object fix for pg_dump and tclsh (alvin)
- LIKE fix for multiple adjacent underscores
- fix for redefining builtin functions(Thomas)
- ultrix4 cleanup
- upgrade to pg_access 0.83
- updated CLUSTER manual page
- multibyte character set support, see doc/README.mb(Tatsuo)
- configure --with-pgport fix
- pg_ident fix
- big-endian fix for backend communications(Kataoka)
- SUBSTR() and substring() fix(Jan)
- several jdbc fixes(Peter)
- libpgtcl improvements, see libptcl/README(Randy Kunkee)
- Fix for "Datasize = 0" error(Vadim)
- Prevent \do from wrapping(Bruce)
- Remove duplicate Russian character set entries
- Sunos4 cleanup
- Allow optional TABLE keyword in LOCK and SELECT INTO(Thomas)
- CREATE SEQUENCE options to allow a negative integer(Thomas)
- Add "PASSWORD" as an allowed column identifier(Thomas)
- Add checks for UNION target fields(Bruce)
- Fix Alpha port(Dwayne Bailey)
- Fix for text arrays containing quotes(Doug Gibson)
- Solaris compile fix(Albert Chin-A-Young)
- Better identify tcl and tk libs and includes(Bruce)
-     
-
-     ----------------------------------------------------------------------
-
-                                  Release 6.3
-
-     Release date: 1998-03-01
-
-   There are *many* new features and improvements in this release. Here is a
-   brief, incomplete summary:
-
-     * Many new SQL features, including full SQL92 subselect capability
-       (everything is here but target-list subselects).
-
-     * Support for client-side environment variables to specify time zone and
-       date style.
-
-     * Socket interface for client/server connection. This is the default now
-       so you may need to start postmaster with the "-i" flag.
-
-     * Better password authorization mechanisms. Default table permissions
-       have changed.
-
-     * Old-style time travel has been removed. Performance has been improved.
-
-     Note: Bruce Momjian wrote the following notes to introduce the new
-     release.
-
-   There are some general 6.3 issues that I want to mention. These are only
-   the big items that can not be described in one sentence. A review of the
-   detailed changes list is still needed.
-
-   First, we now have subselects. Now that we have them, I would like to
-   mention that without subselects, SQL is a very limited language.
-   Subselects are a major feature, and you should review your code for places
-   where subselects provide a better solution for your queries. I think you
-   will find that there are more uses for subselects than you may think.
-   Vadim has put us on the big SQL map with subselects, and fully functional
-   ones too. The only thing you can't do with subselects is to use them in
-   the target list.
-
-   Second, 6.3 uses Unix domain sockets rather than TCP/IP by default. To
-   enable connections from other machines, you have to use the new postmaster
-   -i option, and of course edit "pg_hba.conf". Also, for this reason, the
-   format of "pg_hba.conf" has changed.
-
-   Third, char() fields will now allow faster access than varchar() or text.
-   Specifically, the text and varchar() have a penalty for access to any
-   columns after the first column of this type. char() used to also have this
-   access penalty, but it no longer does. This may suggest that you redesign
-   some of your tables, especially if you have short character columns that
-   you have defined as varchar() or text. This and other changes make 6.3
-   even faster than earlier releases.
-
-   We now have passwords definable independent of any Unix file. There are
-   new SQL USER commands. See the Administrator's Guide for more information.
-   There is a new table, pg_shadow, which is used to store user information
-   and user passwords, and it by default only SELECT-able by the postgres
-   super-user. pg_user is now a view of pg_shadow, and is SELECT-able by
-   PUBLIC. You should keep using pg_user in your application without changes.
-
-   User-created tables now no longer have SELECT permission to PUBLIC by
-   default. This was done because the ANSI standard requires it. You can of
-   course GRANT any permissions you want after the table is created. System
-   tables continue to be SELECT-able by PUBLIC.
-
-   We also have real deadlock detection code. No more sixty-second timeouts.
-   And the new locking code implements a FIFO better, so there should be less
-   resource starvation during heavy use.
-
-   Many complaints have been made about inadequate documentation in previous
-   releases. Thomas has put much effort into many new manuals for this
-   release. Check out the doc/ directory.
-
-   For performance reasons, time travel is gone, but can be implemented using
-   triggers (see "pgsql/contrib/spi/README"). Please check out the new \d
-   command for types, operators, etc. Also, views have their own permissions
-   now, not based on the underlying tables, so permissions on them have to be
-   set separately. Check "/pgsql/interfaces" for some new ways to talk to
-   PostgreSQL.
-
-   This is the first release that really required an explanation for existing
-   users. In many ways, this was necessary because the new release removes
-   many limitations, and the work-arounds people were using are no longer
-   needed.
-
-     ----------------------------------------------------------------------
-
-Migration to version 6.3
-
-   A dump/restore using pg_dump or pg_dumpall is required for those wishing
-   to migrate data from any previous release of PostgreSQL.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Bug Fixes
- ---------
- Fix binary cursors broken by MOVE implementation(Vadim)
- Fix for tcl library crash(Jan)
- Fix for array handling, from Gerhard Hintermayer
- Fix acl error, and remove duplicate pqtrace(Bruce)
- Fix psql \e for empty file(Bruce)
- Fix for textcat on varchar() fields(Bruce)
- Fix for DBT Sendproc (Zeugswetter Andres)
- Fix vacuum analyze syntax problem(Bruce)
- Fix for international identifiers(Tatsuo)
- Fix aggregates on inherited tables(Bruce)
- Fix substr() for out-of-bounds data
- Fix for select 1=1 or 2=2, select 1=1 and 2=2, and select sum(2+2)(Bruce)
- Fix notty output to show status result.  -q option still turns it off(Bruce)
- Fix for count(*), aggs with views and multiple tables and sum(3)(Bruce)
- Fix cluster(Bruce)
- Fix for PQtrace start/stop several times(Bruce)
- Fix a variety of locking problems like newer lock waiters getting
-         lock before older waiters, and having readlock people not share
-         locks if a writer is waiting for a lock, and waiting writers not
-         getting priority over waiting readers(Bruce)
- Fix crashes in psql when executing queries from external files(James)
- Fix problem with multiple order by columns, with the first one having
-         NULL values(Jeroen)
- Use correct hash table support functions for float8 and int4(Thomas)
- Re-enable JOIN= option in CREATE OPERATOR statement (Thomas)
- Change precedence for boolean operators to match expected behavior(Thomas)
- Generate elog(ERROR) on over-large integer(Bruce)
- Allow multiple-argument functions in constraint clauses(Thomas)
- Check boolean input literals for 'true','false','yes','no','1','0'
-         and throw elog(ERROR) if unrecognized(Thomas)
- Major large objects fix
- Fix for GROUP BY showing duplicates(Vadim)
- Fix for index scans in MergeJion(Vadim)
-
- Enhancements
- ------------
- Subselects with EXISTS, IN, ALL, ANY keywords (Vadim, Bruce, Thomas)
- New User Manual(Thomas, others)
- Speedup by inlining some frequently-called functions
- Real deadlock detection, no more timeouts(Bruce)
- Add SQL92 "constants" CURRENT_DATE, CURRENT_TIME, CURRENT_TIMESTAMP,
-         CURRENT_USER(Thomas)
- Modify constraint syntax to be SQL92-compliant(Thomas)
- Implement SQL92 PRIMARY KEY and UNIQUE clauses using indexes(Thomas)
- Recognize SQL92 syntax for FOREIGN KEY. Throw elog notice(Thomas)
- Allow NOT NULL UNIQUE constraint clause (each allowed separately before)(Thomas)
- Allow PostgreSQL-style casting ("::") of non-constants(Thomas)
- Add support for SQL3 TRUE and FALSE boolean constants(Thomas)
- Support SQL92 syntax for IS TRUE/IS FALSE/IS NOT TRUE/IS NOT FALSE(Thomas)
- Allow shorter strings for boolean literals (e.g. "t", "tr", "tru")(Thomas)
- Allow SQL92 delimited identifiers(Thomas)
- Implement SQL92 binary and hexadecimal string decoding (b'10' and x'1F')(Thomas)
- Support SQL92 syntax for type coercion of literal strings
-         (e.g. "DATETIME 'now'")(Thomas)
- Add conversions for int2, int4, and OID types to and from text(Thomas)
- Use shared lock when building indexes(Vadim)
- Free memory allocated for an user query inside transaction block after
-         this query is done, was turned off in <= 6.2.1(Vadim)
- New SQL statement CREATE PROCEDURAL LANGUAGE(Jan)
- New PostgreSQL Procedural Language (PL) backend interface(Jan)
- Rename pg_dump -H option to -h(Bruce)
- Add Java support for passwords, European dates(Peter)
- Use indexes for LIKE and ~, !~ operations(Bruce)
- Add hash functions for datetime and timespan(Thomas)
- Time Travel removed(Vadim, Bruce)
- Add paging for \d and \z, and fix \i(Bruce)
- Add Unix domain socket support to backend and to frontend library(Goran)
- Implement CREATE DATABASE/WITH LOCATION and initlocation utility(Thomas)
- Allow more SQL92 and/or PostgreSQL reserved words as column identifiers(Thomas)
- Augment support for SQL92 SET TIME ZONE...(Thomas)
- SET/SHOW/RESET TIME ZONE uses TZ backend environment variable(Thomas)
- Implement SET keyword = DEFAULT and SET TIME ZONE DEFAULT(Thomas)
- Enable SET TIME ZONE using TZ environment variable(Thomas)
- Add PGDATESTYLE environment variable to frontend and backend initialization(Thomas)
- Add PGTZ, PGCOSTHEAP, PGCOSTINDEX, PGRPLANS, PGGEQO
-         frontend library initialization environment variables(Thomas)
- Regression tests time zone automatically set with "setenv PGTZ PST8PDT"(Thomas)
- Add pg_description table for info on tables, columns, operators, types, and
-         aggregates(Bruce)
- Increase 16 char limit on system table/index names to 32 characters(Bruce)
- Rename system indexes(Bruce)
- Add 'GERMAN' option to SET DATESTYLE(Thomas)
- Define an "ISO-style" timespan output format with "hh:mm:ss" fields(Thomas)
- Allow fractional values for delta times (e.g. '2.5 days')(Thomas)
- Validate numeric input more carefully for delta times(Thomas)
- Implement day of year as possible input to date_part()(Thomas)
- Define timespan_finite() and text_timespan() functions(Thomas)
- Remove archive stuff(Bruce)
- Allow for a pg_password authentication database that is separate from
-         the system password file(Todd)
- Dump ACLs, GRANT, REVOKE permissions(Matt)
- Define text, varchar, and bpchar string length functions(Thomas)
- Fix Query handling for inheritance, and cost computations(Bruce)
- Implement CREATE TABLE/AS SELECT (alternative to SELECT/INTO)(Thomas)
- Allow NOT, IS NULL, IS NOT NULL in constraints(Thomas)
- Implement UNIONs for SELECT(Bruce)
- Add UNION, GROUP, DISTINCT to INSERT(Bruce)
- varchar() stores only necessary bytes on disk(Bruce)
- Fix for BLOBs(Peter)
- Mega-Patch for JDBC...see README_6.3 for list of changes(Peter)
- Remove unused "option" from PQconnectdb()
- New LOCK command and lock manual page describing deadlocks(Bruce)
- Add new psql \da, \dd, \df, \do, \dS, and \dT commands(Bruce)
- Enhance psql \z to show sequences(Bruce)
- Show NOT NULL and DEFAULT in psql \d table(Bruce)
- New psql .psqlrc file start-up(Andrew)
- Modify sample start-up script in contrib/linux to show syslog(Thomas)
- New types for IP and MAC addresses in contrib/ip_and_mac(TomH)
- Unix system time conversions with date/time types in contrib/unixdate(Thomas)
- Update of contrib stuff(Massimo)
- Add Unix socket support to DBD::Pg(Goran)
- New python interface (PyGreSQL 2.0)(D'Arcy)
- New frontend/backend protocol has a version number, network byte order(Phil)
- Security features in pg_hba.conf enhanced and documented, many cleanups(Phil)
- CHAR() now faster access than VARCHAR() or TEXT
- ecpg embedded SQL preprocessor
- Reduce system column overhead(Vadmin)
- Remove pg_time table(Vadim)
- Add pg_type attribute to identify types that need length (bpchar, varchar)
- Add report of offending line when COPY command fails
- Allow VIEW permissions to be set separately from the underlying tables.
-         For security, use GRANT/REVOKE on views as appropriate(Jan)
- Tables now have no default GRANT SELECT TO PUBLIC.  You must
-         explicitly grant such permissions.
- Clean up tutorial examples(Darren)
-
- Source Tree Changes
- -------------------
- Add new html development tools, and flow chart in /tools/backend
- Fix for SCO compiles
- Stratus computer port Robert Gillies
- Added support for shlib for BSD44_derived & i386_solaris
- Make configure more automated(Brook)
- Add script to check regression test results
- Break parser functions into smaller files, group together(Bruce)
- Rename heap_create to heap_create_and_catalog, rename heap_creatr
-         to heap_create()(Bruce)
- Sparc/Linux patch for locking(TomS)
- Remove PORTNAME and reorganize port-specific stuff(Marc)
- Add optimizer README file(Bruce)
- Remove some recursion in optimizer and clean up some code there(Bruce)
- Fix for NetBSD locking(Henry)
- Fix for libptcl make(Tatsuo)
- AIX patch(Darren)
- Change IS TRUE, IS FALSE, ... to expressions using "=" rather than
-         function calls to istrue() or isfalse() to allow optimization(Thomas)
- Various fixes NetBSD/Sparc related(TomH)
- Alpha linux locking(Travis,Ryan)
- Change elog(WARN) to elog(ERROR)(Bruce)
- FAQ for FreeBSD(Marc)
- Bring in the PostODBC source tree as part of our standard distribution(Marc)
- A minor patch for HP/UX 10 vs 9(Stan)
- New pg_attribute.atttypmod for type-specific info like varchar length(Bruce)
- Unixware patches(Billy)
- New i386 'lock' for spin lock asm(Billy)
- Support for multiplexed backends is removed
- Start an OpenBSD port
- Start an AUX port
- Start a Cygnus port
- Add string functions to regression suite(Thomas)
- Expand a few function names formerly truncated to 16 characters(Thomas)
- Remove un-needed malloc() calls and replace with palloc()(Bruce)
-
-     ----------------------------------------------------------------------
-
-                                 Release 6.2.1
-
-     Release date: 1997-10-17
-
-   6.2.1 is a bug-fix and usability release on 6.2.
-
-   Summary:
-
-     * Allow strings to span lines, per SQL92.
-
-     * Include example trigger function for inserting user names on table
-       updates.
-
-   This is a minor bug-fix release on 6.2. For upgrades from pre-6.2 systems,
-   a full dump/reload is required. Refer to the 6.2 release notes for
-   instructions.
-
-     ----------------------------------------------------------------------
-
-Migration from version 6.2 to version 6.2.1
-
-   This is a minor bug-fix release. A dump/reload is not required from
-   version 6.2, but is required from any release prior to 6.2.
-
-   In upgrading from version 6.2, if you choose to dump/reload you will find
-   that avg(money) is now calculated correctly. All other bug fixes take
-   effect upon updating the executables.
-
-   Another way to avoid dump/reload is to use the following SQL command from
-   "psql" to update the existing system table:
-
-   update pg_aggregate set aggfinalfn = 'cash_div_flt8'
-    where aggname = 'avg' and aggbasetype = 790;
-
-   This will need to be done to every existing database, including template1.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Allow TIME and TYPE column names(Thomas)
- Allow larger range of true/false as boolean values(Thomas)
- Support output of "now" and "current"(Thomas)
- Handle DEFAULT with INSERT of NULL properly(Vadim)
- Fix for relation reference counts problem in buffer manager(Vadim)
- Allow strings to span lines, like ANSI(Thomas)
- Fix for backward cursor with ORDER BY(Vadim)
- Fix avg(cash) computation(Thomas)
- Fix for specifying a column twice in ORDER/GROUP BY(Vadim)
- Documented new libpq function to return affected rows, PQcmdTuples(Bruce)
- Trigger function for inserting user names for INSERT/UPDATE(Brook Milligan)
-     
-
-     ----------------------------------------------------------------------
-
-                                  Release 6.2
-
-     Release date: 1997-10-02
-
-   A dump/restore is required for those wishing to migrate data from previous
-   releases of PostgreSQL.
-
-     ----------------------------------------------------------------------
-
-Migration from version 6.1 to version 6.2
-
-   This migration requires a complete dump of the 6.1 database and a restore
-   of the database in 6.2.
-
-   Note that the "pg_dump" and "pg_dumpall" utility from 6.2 should be used
-   to dump the 6.1 database.
-
-     ----------------------------------------------------------------------
-
-Migration from version 1.x to version 6.2
-
-   Those migrating from earlier 1.* releases should first upgrade to 1.09
-   because the COPY output format was improved from the 1.02 release.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Bug Fixes
- ---------
- Fix problems with pg_dump for inheritance, sequences, archive tables(Bruce)
- Fix compile errors on overflow due to shifts, unsigned, and bad prototypes
-          from Solaris(Diab Jerius)
- Fix bugs in geometric line arithmetic (bad intersection calculations)(Thomas)
- Check for geometric intersections at endpoints to avoid rounding ugliness(Thomas)
- Catch non-functional delete attempts(Vadim)
- Change time function names to be more consistent(Michael Reifenberg)
- Check for zero divides(Michael Reifenberg)
- Fix very old bug which made tuples changed/inserted by a commnd
-         visible to the command itself (so we had multiple update of
-         updated tuples, etc)(Vadim)
- Fix for SELECT null, 'fail' FROM pg_am (Patrick)
- SELECT NULL as EMPTY_FIELD now allowed(Patrick)
- Remove un-needed signal stuff from contrib/pginterface
- Fix OR (where x != 1 or x isnull didn't return tuples with x NULL) (Vadim)
- Fix time_cmp function (Vadim)
- Fix handling of functions with non-attribute first argument in
-         WHERE clauses (Vadim)
- Fix GROUP BY when order of entries is different from order
-         in target list (Vadim)
- Fix pg_dump for aggregates without sfunc1 (Vadim)
-
- Enhancements
- ------------
- Default genetic optimizer GEQO parameter is now 8(Bruce)
- Allow use parameters in target list having aggregates in functions(Vadim)
- Added JDBC driver as an interface(Adrian & Peter)
- pg_password utility
- Return number of tuples inserted/affected by INSERT/UPDATE/DELETE etc.(Vadim)
- Triggers implemented with CREATE TRIGGER (SQL3)(Vadim)
- SPI (Server Programming Interface) allows execution of queries inside
-         C-functions (Vadim)
- NOT NULL implemented (SQL92)(Robson Paniago de Miranda)
- Include reserved words for string handling, outer joins, and unions(Thomas)
- Implement extended comments ("/* ... */") using exclusive states(Thomas)
- Add "//" single-line comments(Bruce)
- Remove some restrictions on characters in operator names(Thomas)
- DEFAULT and CONSTRAINT for tables implemented (SQL92)(Vadim & Thomas)
- Add text concatenation operator and function (SQL92)(Thomas)
- Support WITH TIME ZONE syntax (SQL92)(Thomas)
- Support INTERVAL unit TO unit syntax (SQL92)(Thomas)
- Define types DOUBLE PRECISION, INTERVAL, CHARACTER,
-         and CHARACTER VARYING (SQL92)(Thomas)
- Define type FLOAT(p) and rudimentary DECIMAL(p,s), NUMERIC(p,s) (SQL92)(Thomas)
- Define EXTRACT(), POSITION(), SUBSTRING(), and TRIM() (SQL92)(Thomas)
- Define CURRENT_DATE, CURRENT_TIME, CURRENT_TIMESTAMP (SQL92)(Thomas)
- Add syntax and warnings for UNION, HAVING, INNER and OUTER JOIN (SQL92)(Thomas)
- Add more reserved words, mostly for SQL92 compliance(Thomas)
- Allow hh:mm:ss time entry for timespan/reltime types(Thomas)
- Add center() routines for lseg, path, polygon(Thomas)
- Add distance() routines for circle-polygon, polygon-polygon(Thomas)
- Check explicitly for points and polygons contained within polygons
-         using an axis-crossing algorithm(Thomas)
- Add routine to convert circle-box(Thomas)
- Merge conflicting operators for different geometric data types(Thomas)
- Replace distance operator "<===>" with "<->"(Thomas)
- Replace "above" operator "!^" with ">^" and "below" operator "!|" with "<^"(Thomas)
- Add routines for text trimming on both ends, substring, and string position(Thomas)
- Added conversion routines circle(box) and poly(circle)(Thomas)
- Allow internal sorts to be stored in memory rather than in files(Bruce & Vadim)
- Allow functions and operators on internally-identical types to succeed(Bruce)
- Speed up backend start-up after profiling analysis(Bruce)
- Inline frequently called functions for performance(Bruce)
- Reduce open() calls(Bruce)
- psql:  Add PAGER for \h and \?,\C fix
- Fix for psql pager when no tty(Bruce)
- New entab utility(Bruce)
- General trigger functions for referential integrity (Vadim)
- General trigger functions for time travel (Vadim)
- General trigger functions for AUTOINCREMENT/IDENTITY feature (Vadim)
- MOVE implementation (Vadim)
-
- Source Tree Changes
- -------------------
- HPUX 10 patches (Vladimir Turin)
- Added SCO support, (Daniel Harris)
- mkLinux patches (Tatsuo Ishii)
- Change geometric box terminology from "length" to "width"(Thomas)
- Deprecate temporary unstored slope fields in geometric code(Thomas)
- Remove restart instructions from INSTALL(Bruce)
- Look in /usr/ucb first for install(Bruce)
- Fix c++ copy example code(Thomas)
- Add -o to psql manual page(Bruce)
- Prevent relname unallocated string length from being copied into database(Bruce)
- Cleanup for NAMEDATALEN use(Bruce)
- Fix pg_proc names over 15 chars in output(Bruce)
- Add strNcpy() function(Bruce)
- remove some (void) casts that are unnecessary(Bruce)
- new interfaces directory(Marc)
- Replace fopen() calls with calls to fd.c functions(Bruce)
- Make functions static where possible(Bruce)
- enclose unused functions in #ifdef NOT_USED(Bruce)
- Remove call to difftime() in timestamp support to fix SunOS(Bruce & Thomas)
- Changes for Digital Unix
- Portability fix for pg_dumpall(Bruce)
- Rename pg_attribute.attnvals to attdispersion(Bruce)
- "intro/unix" manual page now "pgintro"(Bruce)
- "built-in" manual page now "pgbuiltin"(Bruce)
- "drop" manual page now "drop_table"(Bruce)
- Add "create_trigger", "drop_trigger" manual pages(Thomas)
- Add constraints regression test(Vadim & Thomas)
- Add comments syntax regression test(Thomas)
- Add PGINDENT and support program(Bruce)
- Massive commit to run PGINDENT on all *.c and *.h files(Bruce)
- Files moved to /src/tools directory(Bruce)
- SPI and Trigger programming guides (Vadim & D'Arcy)
-
-     ----------------------------------------------------------------------
-
-                                 Release 6.1.1
-
-     Release date: 1997-07-22
-
-     ----------------------------------------------------------------------
-
-Migration from version 6.1 to version 6.1.1
-
-   This is a minor bug-fix release. A dump/reload is not required from
-   version 6.1, but is required from any release prior to 6.1. Refer to the
-   release notes for 6.1 for more details.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- fix for SET with options (Thomas)
- allow pg_dump/pg_dumpall to preserve ownership of all tables/objects(Bruce)
- new psql \connect option allows changing usernames without changing databases
- fix for initdb --debug option(Yoshihiko Ichikawa))
- lextest cleanup(Bruce)
- hash fixes(Vadim)
- fix date/time month boundary arithmetic(Thomas)
- fix timezone daylight handling for some ports(Thomas, Bruce, Tatsuo)
- timestamp overhauled to use standard functions(Thomas)
- other code cleanup in date/time routines(Thomas)
- psql's \d now case-insensitive(Bruce)
- psql's backslash commands can now have trailing semicolon(Bruce)
- fix memory leak in psql when using \g(Bruce)
- major fix for endian handling of communication to server(Thomas, Tatsuo)
- Fix for Solaris assembler and include files(Yoshihiko Ichikawa)
- allow underscores in usernames(Bruce)
- pg_dumpall now returns proper status, portability fix(Bruce)
-     
-
-     ----------------------------------------------------------------------
-
-                                  Release 6.1
-
-     Release date: 1997-06-08
-
-   The regression tests have been adapted and extensively modified for the
-   6.1 release of PostgreSQL.
-
-   Three new data types (datetime, timespan, and circle) have been added to
-   the native set of PostgreSQL types. Points, boxes, paths, and polygons
-   have had their output formats made consistent across the data types. The
-   polygon output in misc.out has only been spot-checked for correctness
-   relative to the original regression output.
-
-   PostgreSQL 6.1 introduces a new, alternate optimizer which uses genetic
-   algorithms. These algorithms introduce a random behavior in the ordering
-   of query results when the query contains multiple qualifiers or multiple
-   tables (giving the optimizer a choice on order of evaluation). Several
-   regression tests have been modified to explicitly order the results, and
-   hence are insensitive to optimizer choices. A few regression tests are for
-   data types which are inherently unordered (e.g. points and time intervals)
-   and tests involving those types are explicitly bracketed with "set geqo to
-   'off'" and "reset geqo".
-
-   The interpretation of array specifiers (the curly braces around atomic
-   values) appears to have changed sometime after the original regression
-   tests were generated. The current "./expected/*.out" files reflect this
-   new interpretation, which may not be correct!
-
-   The float8 regression test fails on at least some platforms. This is due
-   to differences in implementations of pow() and exp() and the signaling
-   mechanisms used for overflow and underflow conditions.
-
-   The "random" results in the random test should cause the "random" test to
-   be "failed", since the regression tests are evaluated using a simple diff.
-   However, "random" does not seem to produce random results on my test
-   machine (Linux/gcc/i686).
-
-     ----------------------------------------------------------------------
-
-Migration to version 6.1
-
-   This migration requires a complete dump of the 6.0 database and a restore
-   of the database in 6.1.
-
-   Those migrating from earlier 1.* releases should first upgrade to 1.09
-   because the COPY output format was improved from the 1.02 release.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Bug Fixes
- ---------
- packet length checking in library routines
- lock manager priority patch
- check for under/over flow of float8(Bruce)
- multi-table join fix(Vadim)
- SIGPIPE crash fix(Darren)
- large object fixes(Sven)
- allow btree indexes to handle NULLs(Vadim)
- timezone fixes(D'Arcy)
- select SUM(x) can return NULL on no rows(Thomas)
- internal optimizer, executor bug fixes(Vadim)
- fix problem where inner loop in < or <= has no rows(Vadim)
- prevent re-commuting join index clauses(Vadim)
- fix join clauses for multiple tables(Vadim)
- fix hash, hashjoin for arrays(Vadim)
- fix btree for abstime type(Vadim)
- large object fixes(Raymond)
- fix buffer leak in hash indexes (Vadim)
- fix rtree for use in inner scan (Vadim)
- fix gist for use in inner scan, cleanups (Vadim, Andrea)
- avoid unnecessary local buffers allocation (Vadim, Massimo)
- fix local buffers leak in transaction aborts (Vadim)
- fix file manager memmory leaks, cleanups (Vadim, Massimo)
- fix storage manager memmory leaks (Vadim)
- fix btree duplicates handling (Vadim)
- fix deleted tuples re-incarnation caused by vacuum (Vadim)
- fix SELECT varchar()/char() INTO TABLE made zero-length fields(Bruce)
- many psql, pg_dump, and libpq memory leaks fixed using Purify (Igor)
-
- Enhancements
- ------------
- attribute optimization statistics(Bruce)
- much faster new btree bulk load code(Paul)
- BTREE UNIQUE added to bulk load code(Vadim)
- new lock debug code(Massimo)
- massive changes to libpg++(Leo)
- new GEQO optimizer speeds table multi-table optimization(Martin)
- new WARN message for non-unique insert into unique key(Marc)
- update x=-3, no spaces, now valid(Bruce)
- remove case-sensitive identifier handling(Bruce,Thomas,Dan)
- debug backend now pretty-prints tree(Darren)
- new Oracle character functions(Edmund)
- new plaintext password functions(Dan)
- no such class or insufficient privilege changed to distinct messages(Dan)
- new ANSI timestamp function(Dan)
- new ANSI Time and Date types (Thomas)
- move large chunks of data in backend(Martin)
- multi-column btree indexes(Vadim)
- new SET var TO value command(Martin)
- update transaction status on reads(Dan)
- new locale settings for character types(Oleg)
- new SEQUENCE serial number generator(Vadim)
- GROUP BY function now possible(Vadim)
- re-organize regression test(Thomas,Marc)
- new optimizer operation weights(Vadim)
- new psql \z grant/permit option(Marc)
- new MONEY data type(D'Arcy,Thomas)
- tcp socket communication speed improved(Vadim)
- new VACUUM option for attribute statistics, and for certain columns (Vadim)
- many geometric type improvements(Thomas,Keith)
- additional regression tests(Thomas)
- new datestyle variable(Thomas,Vadim,Martin)
- more comparison operators for sorting types(Thomas)
- new conversion functions(Thomas)
- new more compact btree format(Vadim)
- allow pg_dumpall to preserve database ownership(Bruce)
- new SET GEQO=# and R_PLANS variable(Vadim)
- old (!GEQO) optimizer can use right-sided plans (Vadim)
- typechecking improvement in SQL parser(Bruce)
- new SET, SHOW, RESET commands(Thomas,Vadim)
- new \connect database USER option
- new destroydb -i option (Igor)
- new \dt and \di psql commands (Darren)
- SELECT "\n" now escapes newline (A. Duursma)
- new geometry conversion functions from old format (Thomas)
-
- Source tree changes
- -------------------
- new configuration script(Marc)
- readline configuration option added(Marc)
- OS-specific configuration options removed(Marc)
- new OS-specific template files(Marc)
- no more need to edit Makefile.global(Marc)
- re-arrange include files(Marc)
- nextstep patches (Gregor Hoffleit)
- removed WIN32-specific code(Bruce)
- removed postmaster -e option, now only postgres -e option (Bruce)
- merge duplicate library code in front/backends(Martin)
- now works with eBones, international Kerberos(Jun)
- more shared library support
- c++ include file cleanup(Bruce)
- warn about buggy flex(Bruce)
- DG-UX, Ultrix, Irix, AIX portability fixes
-
-     ----------------------------------------------------------------------
-
-                                  Release 6.0
-
-     Release date: 1997-01-29
-
-   A dump/restore is required for those wishing to migrate data from previous
-   releases of PostgreSQL.
-
-     ----------------------------------------------------------------------
-
-Migration from version 1.09 to version 6.0
-
-   This migration requires a complete dump of the 1.09 database and a restore
-   of the database in 6.0.
-
-     ----------------------------------------------------------------------
-
-Migration from pre-1.09 to version 6.0
-
-   Those migrating from earlier 1.* releases should first upgrade to 1.09
-   because the COPY output format was improved from the 1.02 release.
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Bug Fixes
- ---------
- ALTER TABLE bug - running postgress process needs to re-read table definition
- Allow vacuum to be run on one table or entire database(Bruce)
- Array fixes
- Fix array over-runs of memory writes(Kurt)
- Fix elusive btree range/non-range bug(Dan)
- Fix for hash indexes on some types like time and date
- Fix for pg_log size explosion
- Fix permissions on lo_export()(Bruce)
- Fix unitialized reads of memory(Kurt)
- Fixed ALTER TABLE ... char(3) bug(Bruce)
- Fixed a few small memory leaks
- Fixed EXPLAIN handling of options and changed full_path option name
- Fixed output of group acl permissions
- Memory leaks (hunt and destroy with tools like Purify(Kurt)
- Minor improvements to rules system
- NOTIFY fixes
- New asserts for run-checking
- Overhauled parser/analyze code to properly report errors and increase speed
- Pg_dump -d now handles NULL's properly(Bruce)
- Prevent SELECT NULL from crashing server (Bruce)
- Properly report errors when INSERT ... SELECT columns did not match
- Properly report errors when insert column names were not correct
- Psql \g filename now works(Bruce)
- Psql fixed problem with multiple statements on one line with multiple outputs
- Removed duplicate system oid's
- SELECT * INTO TABLE . GROUP/ORDER BY gives unlink error if table exists(Bruce)
- Several fixes for queries that crashed the backend
- Starting quote in insert string errors(Bruce)
- Submitting an empty query now returns empty status, not just " " query(Bruce)
-
- Enhancements
- ------------
- Add EXPLAIN manual page(Bruce)
- Add UNIQUE index capability(Dan)
- Add hostname/user level access control rather than just hostname and user
- Add synonym of != for <>(Bruce)
- Allow "select oid,* from table"
- Allow BY,ORDER BY to specify columns by number, or by non-alias table.column(Bruce)
- Allow COPY from the frontend(Bryan)
- Allow GROUP BY to use alias column name(Bruce)
- Allow actual compression, not just reuse on the same page(Vadim)
- Allow installation-configuration option to auto-add all local users(Bryan)
- Allow libpq to distinguish between text value '' and null(Bruce)
- Allow non-postgres users with createdb privs to destroydb's
- Allow restriction on who can create C functions(Bryan)
- Allow restriction on who can do backend COPY(Bryan)
- Can shrink tables, pg_time and pg_log(Vadim & Erich)
- Change debug level 2 to print queries only, changed debug heading layout(Bruce)
- Change default decimal constant representation from float4 to float8(Bruce)
- European date format now set when postmaster is started
- Execute lowercase function names if not found with exact case
- Fixes for aggregate/GROUP processing, allow 'select sum(func(x),sum(x+y) from z'
- Gist now included in the distrubution(Marc)
- Idend authentication of local users(Bryan)
- Implement BETWEEN qualifier(Bruce)
- Implement IN qualifier(Bruce)
- Libpq has PQgetisnull()(Bruce)
- Libpq++ improvements
- New options to initdb(Bryan)
- Pg_dump allow dump of oid's(Bruce)
- Pg_dump create indexes after tables are loaded for speed(Bruce)
- Pg_dumpall dumps all databases, and the user table
- Pginterface additions for NULL values(Bruce)
- Prevent postmaster from being run as root
- Psql \h and \? is now readable(Bruce)
- Psql allow backslashed, semicolons anywhere on the line(Bruce)
- Psql changed command prompt for lines in query or in quotes(Bruce)
- Psql char(3) now displays as (bp)char in \d output(Bruce)
- Psql return code now more accurate(Bryan?)
- Psql updated help syntax(Bruce)
- Re-visit and fix vacuum(Vadim)
- Reduce size of regression diffs, remove timezone name difference(Bruce)
- Remove compile-time parameters to enable binary distributions(Bryan)
- Reverse meaning of HBA masks(Bryan)
- Secure Authentication of local users(Bryan)
- Speed up vacuum(Vadim)
- Vacuum now had VERBOSE option(Bruce)
-
- Source tree changes
- -------------------
- All functions now have prototypes that are compared against the calls
- Allow asserts to be disabled easly from Makefile.global(Bruce)
- Change oid constants used in code to #define names
- Decoupled sparc and solaris defines(Kurt)
- Gcc -Wall compiles cleanly with warnings only from unfixable constructs
- Major include file reorganization/reduction(Marc)
- Make now stops on compile failure(Bryan)
- Makefile restructuring(Bryan, Marc)
- Merge bsdi_2_1 to bsdi(Bruce)
- Monitor program removed
- Name change from Postgres95 to PostgreSQL
- New config.h file(Marc, Bryan)
- PG_VERSION now set to 6.0 and used by postmaster
- Portability additions, including Ultrix, DG/UX, AIX, and Solaris
- Reduced the number of #define's, centeralized #define's
- Remove duplicate OIDS in system tables(Dan)
- Remove duplicate system catalog info or report mismatches(Dan)
- Removed many os-specific #define's
- Restructured object file generation/location(Bryan, Marc)
- Restructured port-specific file locations(Bryan, Marc)
- Unused/uninialized variables corrected
-
-     ----------------------------------------------------------------------
-
-                                  Release 1.09
-
-     Release date: 1996-11-04
-
-   Sorry, we didn't keep track of changes from 1.02 to 1.09. Some of the
-   changes listed in 6.0 were actually included in the 1.02.1 to 1.09
-   releases.
-
-     ----------------------------------------------------------------------
-
-                                  Release 1.02
-
-     Release date: 1996-08-01
-
-     ----------------------------------------------------------------------
-
-Migration from version 1.02 to version 1.02.1
-
-   Here is a new migration file for 1.02.1. It includes the 'copy' change and
-   a script to convert old ASCII files.
-
-     Note: The following notes are for the benefit of users who want to
-     migrate databases from Postgres95 1.01 and 1.02 to Postgres95 1.02.1.
-
-     If you are starting afresh with Postgres95 1.02.1 and do not need to
-     migrate old databases, you do not need to read any further.
-
-   In order to upgrade older Postgres95 version 1.01 or 1.02 databases to
-   version 1.02.1, the following steps are required:
-
-   
-
-   
-       databases. This is done by running the new 1.02.1 server against your
-       own 1.01 or 1.02 database and applying the queries attached at the end
-       of the file. This can be done easily through "psql". If your 1.01 or
-       1.02 database is named testdb and you have cut the commands from the
-       end of this file and saved them in "addfunc.sql":
-
-         % psql testdb -f addfunc.sql
-
-       Those upgrading 1.02 databases will get a warning when executing the
-       last two statements in the file because they are already present in
-       1.02. This is not a cause for concern.
-
-     ----------------------------------------------------------------------
-
-Dump/Reload Procedure
-
-   If you are trying to reload a pg_dump or text-mode, copy tablename to
-   stdout generated with a previous version, you will need to run the
-   attached "sed" script on the ASCII file before loading it into the
-   database. The old format used '.' as end-of-data, while '\.' is now the
-   end-of-data marker. Also, empty strings are now loaded in as '' rather
-   than NULL. See the copy manual page for full details.
-
-         sed 's/^\.$/\\./g' <in_file >out_file
-
-   If you are loading an older binary copy or non-stdout copy, there is no
-   end-of-data character, and hence no conversion necessary.
-
- -- following lines added by agc to reflect the case-insensitive
- -- regexp searching for varchar (in 1.02), and bpchar (in 1.02.1)
- create operator ~* (leftarg = bpchar, rightarg = text, procedure = texticregexeq);
- create operator !~* (leftarg = bpchar, rightarg = text, procedure = texticregexne);
- create operator ~* (leftarg = varchar, rightarg = text, procedure = texticregexeq);
- create operator !~* (leftarg = varchar, rightarg = text, procedure = texticregexne);
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Source code maintenance and development
-  * worldwide team of volunteers
-  * the source tree now in CVS at ftp.ki.net
-
- Enhancements
-  * psql (and underlying libpq library) now has many more options for
-    formatting output, including HTML
-  * pg_dump now output the schema and/or the data, with many fixes to
-    enhance completeness.
-  * psql used in place of monitor in administration shell scripts.
-    monitor to be depreciated in next release.
-  * date/time functions enhanced
-  * NULL insert/update/comparison fixed/enhanced
-  * TCL/TK lib and shell fixed to work with both tck7.4/tk4.0 and tcl7.5/tk4.1
-
- Bug Fixes (almost too numerous to mention)
-  * indexes
-  * storage management
-  * check for NULL pointer before dereferencing
-  * Makefile fixes
-
- New Ports
-  * added SolarisX86 port
-  * added BSDI 2.1 port
-  * added DGUX port
-
-     ----------------------------------------------------------------------
-
-                                  Release 1.01
-
-     Release date: 1996-02-23
-
-     ----------------------------------------------------------------------
-
-Migration from version 1.0 to version 1.01
-
-   The following notes are for the benefit of users who want to migrate
-   databases from Postgres95 1.0 to Postgres95 1.01.
-
-   If you are starting afresh with Postgres95 1.01 and do not need to migrate
-   old databases, you do not need to read any further.
-
-   In order to Postgres95 version 1.01 with databases created with Postgres95
-   version 1.0, the following steps are required:
-
-   
-       OIDNAMELEN to 20.
-
-   
-
-        
-            data directory (typically the value of your $PGDATA).
-            "src/libpq/pg_hba" shows an example syntax.
-
-        
-            the line
-
-         HBA = 1
-
-            in "src/Makefile.global"
-
-            Note that host-based authentication is turned on by default, and
-            if you do not take steps A or B above, the out-of-the-box 1.01
-            will not allow you to connect to 1.0 databases.
-
-   
-
-   
-       your existing $PGDATA directory.
-
-   
-       path up so that 1.01 binaries are being used.
-
-   
-
-   
-
-   
-       This is done by running the new 1.01 server against your own 1.0
-       database and applying the queries attached and saving in the file
-       1.0_to_1.01.sql. This can be done easily through "psql". If your 1.0
-       database is name testdb:
-
-         % psql testdb -f 1.0_to_1.01.sql
-
-       and then execute the following commands (cut and paste from here):
-
- -- add builtin functions that are new to 1.01
-
- create function int4eqoid (int4, oid) returns bool as 'foo'
- language 'internal';
- create function oideqint4 (oid, int4) returns bool as 'foo'
- language 'internal';
- create function char2icregexeq (char2, text) returns bool as 'foo'
- language 'internal';
- create function char2icregexne (char2, text) returns bool as 'foo'
- language 'internal';
- create function char4icregexeq (char4, text) returns bool as 'foo'
- language 'internal';
- create function char4icregexne (char4, text) returns bool as 'foo'
- language 'internal';
- create function char8icregexeq (char8, text) returns bool as 'foo'
- language 'internal';
- create function char8icregexne (char8, text) returns bool as 'foo'
- language 'internal';
- create function char16icregexeq (char16, text) returns bool as 'foo'
- language 'internal';
- create function char16icregexne (char16, text) returns bool as 'foo'
- language 'internal';
- create function texticregexeq (text, text) returns bool as 'foo'
- language 'internal';
- create function texticregexne (text, text) returns bool as 'foo'
- language 'internal';
-
- -- add builtin functions that are new to 1.01
-
- create operator = (leftarg = int4, rightarg = oid, procedure = int4eqoid);
- create operator = (leftarg = oid, rightarg = int4, procedure = oideqint4);
- create operator ~* (leftarg = char2, rightarg = text, procedure = char2icregexeq);
- create operator !~* (leftarg = char2, rightarg = text, procedure = char2icregexne);
- create operator ~* (leftarg = char4, rightarg = text, procedure = char4icregexeq);
- create operator !~* (leftarg = char4, rightarg = text, procedure = char4icregexne);
- create operator ~* (leftarg = char8, rightarg = text, procedure = char8icregexeq);
- create operator !~* (leftarg = char8, rightarg = text, procedure = char8icregexne);
- create operator ~* (leftarg = char16, rightarg = text, procedure = char16icregexeq);
- create operator !~* (leftarg = char16, rightarg = text, procedure = char16icregexne);
- create operator ~* (leftarg = text, rightarg = text, procedure = texticregexeq);
- create operator !~* (leftarg = text, rightarg = text, procedure = texticregexne);
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Incompatibilities:
-  * 1.01 is backwards compatible with 1.0 database provided the user
-    follow the steps outlined in the MIGRATION_from_1.0_to_1.01 file.
-    If those steps are not taken, 1.01 is not compatible with 1.0 database.
-
- Enhancements:
-  * added PQdisplayTuples() to libpq and changed monitor and psql to use it
-  * added NeXT port (requires SysVIPC implementation)
-  * added CAST .. AS ... syntax
-  * added ASC and DESC keywords
-  * added 'internal' as a possible language for CREATE FUNCTION
-    internal functions are C functions which have been statically linked
-    into the postgres backend.
-  * a new type "name" has been added for system identifiers (table names,
-    attribute names, etc.)  This replaces the old char16 type.   The
-    of name is set by the NAMEDATALEN #define in src/Makefile.global
-  * a readable reference manual that describes the query language.
-  * added host-based access control.  A configuration file ($PGDATA/pg_hba)
-    is used to hold the configuration data.  If host-based access control
-    is not desired, comment out HBA=1 in src/Makefile.global.
-  * changed regex handling to be uniform use of Henry Spencer's regex code
-    regardless of platform.  The regex code is included in the distribution
-  * added functions and operators for case-insensitive regular expressions.
-    The operators are ~* and !~*.
-  * pg_dump uses COPY instead of SELECT loop for better performance
-
- Bug fixes:
-  * fixed an optimizer bug that was causing core dumps when
-    functions calls were used in comparisons in the WHERE clause
-  * changed all uses of getuid to geteuid so that effective uids are used
-  * psql now returns non-zero status on errors when using -c
-  * applied public patches 1-14
-
-     ----------------------------------------------------------------------
-
-                                  Release 1.0
-
-     Release date: 1995-09-05
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Copyright change:
-  * The copyright of Postgres 1.0 has been loosened to be freely modifiable
-    and modifiable for any purpose.  Please read the COPYRIGHT file.
-    Thanks to Professor Michael Stonebraker for making this possible.
-
- Incompatibilities:
-  *  date formats have to be MM-DD-YYYY (or DD-MM-YYYY if you're using
-    EUROPEAN STYLE).  This follows SQL-92 specs.
-  *  "delimiters" is now a keyword
-
- Enhancements:
-  *  sql LIKE syntax has been added
-  *  copy command now takes an optional USING DELIMITER specification.
-    delimiters can be any single-character string.
-  *  IRIX 5.3 port has been added.
-    Thanks to Paul Walmsley and others.
-  *  updated pg_dump to work with new libpq
-  *  \d has been added psql
-    Thanks to Keith Parks
-  *  regexp performance for architectures that use POSIX regex has been
-    improved due to caching of precompiled patterns.
-    Thanks to Alistair Crooks
-  *  a new version of libpq++
-    Thanks to William Wanders
-
- Bug fixes:
-  *  arbitrary userids can be specified in the createuser script
-  *  \c to connect to other databases in psql now works.
-  *  bad pg_proc entry for float4inc() is fixed
-  *  users with usecreatedb field set can now create databases without
-    having to be usesuper
-  *  remove access control entries when the entry no longer has any
-    permissions
-  *  fixed non-portable datetimes implementation
-  *  added kerberos flags to the src/backend/Makefile
-  *  libpq now works with kerberos
-  *  typographic errors in the user manual have been corrected.
-  *  btrees with multiple index never worked, now we tell you they don't
-    work when you try to use them
-
-     ----------------------------------------------------------------------
-
-                            Postgres95 Release 0.03
-
-     Release date: 1995-07-21
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Incompatible changes:
-  * BETA-0.3 IS INCOMPATIBLE WITH DATABASES CREATED WITH PREVIOUS VERSIONS
-    (due to system catalog changes and indexing structure changes).
-  * double-quote (") is deprecated as a quoting character for string literals;
-    you need to convert them to single quotes (').
-  * name of aggregates (eg. int4sum) are renamed in accordance with the
-    SQL standard (eg. sum).
-  * CHANGE ACL syntax is replaced by GRANT/REVOKE syntax.
-  * float literals (eg. 3.14) are now of type float4 (instead of float8 in
-    previous releases); you might have to do typecasting if you depend on it
-    being of type float8.  If you neglect to do the typecasting and you assign
-    a float literal to a field of type float8, you may get incorrect values
-    stored!
-  * LIBPQ has been totally revamped so that frontend applications
-    can connect to multiple backends
-  * the usesysid field in pg_user has been changed from int2 to int4 to
-    allow wider range of Unix user ids.
-  * the netbsd/freebsd/bsd o/s ports have been consolidated into a
-    single BSD44_derived port.  (thanks to Alistair Crooks)
-
- SQL standard-compliance (the following details changes that makes postgres95
- more compliant to the SQL-92 standard):
-  * the following SQL types are now built-in: smallint, int(eger), float, real,
-    char(N), varchar(N), date and time.
-
-    The following are aliases to existing postgres types:
-                 smallint -> int2
-                 integer, int -> int4
-                 float, real  -> float4
-    char(N) and varchar(N) are implemented as truncated text types. In
-    addition, char(N) does blank-padding.
-  * single-quote (') is used for quoting string literals; '' (in addition to
-    \') is supported as means of inserting a single quote in a string
-  * SQL standard aggregate names (MAX, MIN, AVG, SUM, COUNT) are used
-    (Also, aggregates can now be overloaded, i.e. you can define your
-    own MAX aggregate to take in a user-defined type.)
-  * CHANGE ACL removed. GRANT/REVOKE syntax added. 
-    - Privileges can be given to a group using the "GROUP" keyword.
-         For example:
-                 GRANT SELECT ON foobar TO GROUP my_group;
-         The keyword 'PUBLIC' is also supported to mean all users.      
-
-         Privileges can only be granted or revoked to one user or group
-         at a time. 
-
-         "WITH GRANT OPTION" is not supported.  Only class owners can change
-         access control
-    - The default access control is to to grant users readonly access.
-      You must explicitly grant insert/update access to users.  To change
-      this, modify the line in
-                 src/backend/utils/acl.h
-      that defines ACL_WORLD_DEFAULT
-
- Bug fixes:
-  * the bug where aggregates of empty tables were not run has been fixed. Now,
-    aggregates run on empty tables will return the initial conditions of the
-    aggregates. Thus, COUNT of an empty  table will now properly return 0.
-    MAX/MIN of an empty table will return a tuple of value NULL.
-  * allow the use of \; inside the monitor
-  * the LISTEN/NOTIFY asynchronous notification mechanism now work
-  * NOTIFY in rule action bodies now work
-  * hash indexes work, and access methods in general should perform better.
-    creation of large btree indexes should be much faster.  (thanks to Paul
-    Aoki)
-
- Other changes and enhancements:
-  * addition of an EXPLAIN statement used for explaining the query execution
-    plan (eg. "EXPLAIN SELECT * FROM EMP" prints out the execution plan for
-    the query).
-  * WARN and NOTICE messages no longer have timestamps on them. To turn on
-    timestamps of error messages, uncomment the line in
-    src/backend/utils/elog.h:
-         /* define ELOG_TIMESTAMPS */
-  * On an access control violation, the message
-         "Either no such class or insufficient privilege"
-    will be given.  This is the same message that is returned when
-    a class is not found.  This dissuades non-privileged users from
-    guessing the existence of privileged classes.
-  * some additional system catalog changes have been made that are not
-    visible to the user.
-
- libpgtcl changes:
-  * The -oid option has been added to the "pg_result" tcl command.
-    pg_result -oid returns oid of the last tuple inserted.   If the
-    last command was not an INSERT, then pg_result -oid returns "".
-  * the large object interface is available as pg_lo* tcl commands:
-    pg_lo_open, pg_lo_close, pg_lo_creat, etc.
-
- Portability enhancements and New Ports:
-  * flex/lex problems have been cleared up.  Now, you should be able to use
-    flex instead of lex on any platforms.  We no longer make assumptions of
-    what lexer you use based on the platform you use.
-  * The Linux-ELF port is now supported.  Various configuration have been
-    tested:  The following configuration is known to work:
-         kernel 1.2.10, gcc 2.6.3, libc 4.7.2, flex 2.5.2, bison 1.24
-    with everything in ELF format,
-
- New utilities:
-  * ipcclean added to the distribution
-    ipcclean usually does not need to be run, but if your backend crashes
-    and leaves shared memory segments hanging around, ipcclean will
-    clean them up for you.
-
- New documentation:
-  * the user manual has been revised and libpq documentation added.
-
-     ----------------------------------------------------------------------
-
-                            Postgres95 Release 0.02
-
-     Release date: 1995-05-25
-
-     ----------------------------------------------------------------------
-
-Changes
-
- Incompatible changes:
-  * The SQL statement for creating a database is 'CREATE DATABASE' instead
-    of 'CREATEDB'. Similarly, dropping a database is 'DROP DATABASE' instead
-    of 'DESTROYDB'. However, the names of the executables 'createdb' and
-    'destroydb' remain the same.
- 
- New tools:
-  * pgperl - a Perl (4.036) interface to Postgres95
-  * pg_dump - a utility for dumping out a postgres database into a
-         script file containing query commands. The script files are in a ASCII
-         format and can be used to reconstruct the database, even on other
-         machines and other architectures. (Also good for converting
-         a Postgres 4.2 database to Postgres95 database.)
-
- The following ports have been incorporated into postgres95-beta-0.02:
-  * the NetBSD port by Alistair Crooks
-  * the AIX port by Mike Tung
-  * the Windows NT port by Jon Forrest (more stuff but not done yet)
-  * the Linux ELF port by Brian Gallew
-
- The following bugs have been fixed in postgres95-beta-0.02:
-  * new lines not escaped in COPY OUT and problem with COPY OUT when first
-    attribute is a '.'
-  * cannot type return to use the default user id in createuser
-  * SELECT DISTINCT on big tables crashes
-  * Linux installation problems
-  * monitor doesn't allow use of 'localhost' as PGHOST
-  * psql core dumps when doing \c or \l
-  * the "pgtclsh" target missing from src/bin/pgtclsh/Makefile
-  * libpgtcl has a hard-wired default port number
-  * SELECT DISTINCT INTO TABLE hangs
-  * CREATE TYPE doesn't accept 'variable' as the internallength
-  * wrong result using more than 1 aggregate in a SELECT
-
-     ----------------------------------------------------------------------
-
-                            Postgres95 Release 0.01
-
-     Release date: 1995-05-01
-
-   Initial release.
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 1288a9da4a..0000000000
--- a/INSTALL
+++ /dev/null
@@ -1,871 +0,0 @@
-                    PostgreSQL Installation Instructions
-
-  ------------------------------------------------------------------------
-
-Short Version
-
-./configure
-gmake
-su
-gmake install
-adduser postgres
-mkdir /usr/local/pgsql/data
-chown postgres /usr/local/pgsql/data
-su - postgres
-/usr/local/pgsql/bin/initdb -D /usr/local/pgsql/data
-/usr/local/pgsql/bin/postmaster -D /usr/local/pgsql/data >logfile 2>&1 &
-/usr/local/pgsql/bin/createdb test
-/usr/local/pgsql/bin/psql test
-
-The long version is the rest of this document.
-
-  ------------------------------------------------------------------------
-
-Requirements
-
-In general, a modern Unix-compatible platform should be able to run
-PostgreSQL. The platforms that had received specific testing at the time of
-release are listed in the Section called Supported Platforms below. In the
-"doc" subdirectory of the distribution there are several platform-specific
-FAQ documents you might wish to consult if you are having trouble.
-
-The following prerequisites exist for building PostgreSQL:
-
-   * GNU make is required; other make programs will *not* work. GNU make is
-     often installed under the name "gmake"; this document will always refer
-     to it by that name. (On some systems GNU make is the default tool with
-     the name "make".) To test for GNU make enter
-
-     gmake --version
-
-     It is recommended to use version 3.76.1 or later.
-
-   * You need an ISO/ANSI C compiler. Recent versions of GCC are
-     recommendable, but PostgreSQL is known to build with a wide variety of
-     compilers from different vendors.
-
-   * gzip is needed to unpack the distribution in the first place. If you
-     are reading this, you probably already got past that hurdle.
-
-   * The GNU Readline library (for comfortable line editing and command
-     history retrieval) will automatically be used if found. You might wish
-     to install it before proceeding, but it is not essential. (On NetBSD,
-     the "libedit" library is readline-compatible and is used if
-     "libreadline" is not found.)
-
-   * GNU Flex and Bison are needed to build from scratch, but they are *not*
-     required when building from a released source package because
-     pre-generated output files are included in released packages. You will
-     need these programs only when building from a CVS tree or if you
-     changed the actual scanner and parser definition files. If you need
-     them, be sure to get Flex 2.5.4 or later and Bison 1.28 or later. Other
-     yacc programs can sometimes be used, but doing so requires extra effort
-     and is not recommended. Other lex programs will definitely not work.
-
-   * To build on Windows NT or Windows 2000 you need the Cygwin and cygipc
-     packages. See the file "doc/FAQ_MSWIN" for details.
-
-If you need to get a GNU package, you can find it at your local GNU mirror
-site (see http://www.gnu.org/order/ftp.html for a list) or at
-ftp://ftp.gnu.org/gnu/.
-
-Also check that you have sufficient disk space. You will need about 30 MB
-for the source tree during compilation and about 10 MB for the installation
-directory. An empty database cluster takes about 20 MB, databases take about
-five times the amount of space that a flat text file with the same data
-would take. If you are going to run the regression tests you will
-temporarily need an extra 20 MB. Use the "df" command to check for disk
-space.
-
-  ------------------------------------------------------------------------
-
-If You Are Upgrading
-
-The internal data storage format changes with new releases of PostgreSQL.
-Therefore, if you are upgrading an existing installation that does not have
-a version number "7.2.x", you must back up and restore your data as shown
-here. These instructions assume that your existing installation is under the
-"/usr/local/pgsql" directory, and that the data area is in
-"/usr/local/pgsql/data". Substitute your paths appropriately.
-
-  1. Make sure that your database is not updated during or after the backup.
-     This does not affect the integrity of the backup, but the changed data
-     would of course not be included. If necessary, edit the permissions in
-     the file "/usr/local/pgsql/data/pg_hba.conf" (or equivalent) to
-     disallow access from everyone except you.
-
-  2. To dump your database installation, type:
-
-     pg_dumpall > outputfile
-
-     If you need to preserve OIDs (such as when using them as foreign keys),
-     then use the "-o" option when running "pg_dumpall".
-
-     "pg_dumpall" does not save large objects. Check the Administrator's
-     Guide if you need to do this.
-
-     Make sure that you use the "pg_dumpall" command from the version you
-     are currently running. 7.2's "pg_dumpall" should not be used on older
-     databases.
-
-  3. If you are installing the new version at the same location as the old
-     one then shut down the old server, at the latest before you install the
-     new files:
-
-     kill -INT `cat /usr/local/pgsql/data/postmaster.pid`
-
-     Versions prior to 7.0 do not have this "postmaster.pid" file. If you
-     are using such a version you must find out the process id of the server
-     yourself, for example by typing "ps ax | grep postmaster", and supply
-     it to the "kill" command.
-
-     On systems that have PostgreSQL started at boot time, there is probably
-     a start-up file that will accomplish the same thing. For example, on a
-     Red Hat Linux system one might find that
-
-     /etc/rc.d/init.d/postgresql stop
-
-     works. Another possibility is "pg_ctl stop".
-
-  4. If you are installing in the same place as the old version then it is
-     also a good idea to move the old installation out of the way, in case
-     you have trouble and need to revert to it. Use a command like this:
-
-     mv /usr/local/pgsql /usr/local/pgsql.old
-
-After you have installed PostgreSQL 7.2, create a new database directory and
-start the new server. Remember that you must execute these commands while
-logged in to the special database user account (which you already have if
-you are upgrading).
-
-/usr/local/pgsql/bin/initdb -D /usr/local/pgsql/data
-/usr/local/pgsql/bin/postmaster -D /usr/local/pgsql/data
-
-Finally, restore your data with
-
-/usr/local/pgsql/bin/psql -d template1 -f outputfile
-
-using the *new* psql.
-
-You can also install the new version in parallel with the old one to
-decrease the downtime. These topics are discussed at length in the
-Administrator's Guide, which you are encouraged to read in any case.
-
-  ------------------------------------------------------------------------
-
-Installation Procedure
-
-  1. Configuration
-
-     The first step of the installation procedure is to configure the source
-     tree for your system and choose the options you would like. This is
-     done by running the "configure" script. For a default installation
-     simply enter
-
-     ./configure
-
-     This script will run a number of tests to guess values for various
-     system dependent variables and detect some quirks of your operating
-     system, and finally will create several files in the build tree to
-     record what it found.
-
-     The default configuration will build the server and utilities, as well
-     as all client applications and interfaces that require only a C
-     compiler. All files will be installed under "/usr/local/pgsql" by
-     default.
-
-     You can customize the build and installation process by supplying one
-     or more of the following command line options to "configure":
-
-     --prefix=PREFIX
-
-          Install all files under the directory "PREFIX" instead of
-          "/usr/local/pgsql". The actual files will be installed into
-          various subdirectories; no files will ever be installed directly
-          into the "PREFIX" directory.
-
-          If you have special needs, you can also customize the individual
-          subdirectories with the following options.
-
-     --exec-prefix=EXEC-PREFIX
-
-          You can install architecture-dependent files under a different
-          prefix, "EXEC-PREFIX", than what "PREFIX" was set to. This can be
-          useful to share architecture-independent files between hosts. If
-          you omit this, then "EXEC-PREFIX" is set equal to "PREFIX" and
-          both architecture-dependent and independent files will be
-          installed under the same tree, which is probably what you want.
-
-     --bindir=DIRECTORY
-
-          Specifies the directory for executable programs. The default is
-          "EXEC-PREFIX/bin", which normally means "/usr/local/pgsql/bin".
-
-     --datadir=DIRECTORY
-
-          Sets the directory for read-only data files used by the installed
-          programs. The default is "PREFIX/share". Note that this has
-          nothing to do with where your database files will be placed.
-
-     --sysconfdir=DIRECTORY
-
-          The directory for various configuration files, "PREFIX/etc" by
-          default.
-
-     --libdir=DIRECTORY
-
-          The location to install libraries and dynamically loadable
-          modules. The default is "EXEC-PREFIX/lib".
-
-     --includedir=DIRECTORY
-
-          The directory for installing C and C++ header files. The default
-          is "PREFIX/include".
-
-     --docdir=DIRECTORY
-
-          Documentation files, except "man" pages, will be installed into
-          this directory. The default is "PREFIX/doc".
-
-     --mandir=DIRECTORY
-
-          The man pages that come with PostgreSQL will be installed under
-          this directory, in their respective "manx" subdirectories. The
-          default is "PREFIX/man".
-
-          Note: Care has been taken to make it possible to install
-          PostgreSQL into shared installation locations (such as
-          "/usr/local/include") without interfering with the namespace
-          of the rest of the system. First, the string "/postgresql" is
-          automatically appended to datadir, sysconfdir, and docdir,
-          unless the fully expanded directory name already contains the
-          string "postgres" or "pgsql". For example, if you choose
-          "/usr/local" as prefix, the documentation will be installed
-          in "/usr/local/doc/postgresql", but if the prefix is
-          "/opt/postgres", then it will be in "/opt/postgres/doc".
-          Second, the installation layout of the C and C++ header files
-          has been reorganized in the 7.2 release. The public header
-          files of the client interfaces are installed into includedir
-          and are namespace-clean. The internal header files and the
-          server header files are installed into private directories
-          under includedir. See the Programmer's Guide for information
-          about how to get at the header files for each interface.
-          Finally, a private subdirectory will also be created, if
-          appropriate, under libdir for dynamically loadable modules.
-
-     --with-includes=DIRECTORIES
-
-          "DIRECTORIES" is a colon-separated list of directories that will
-          be added to the list the compiler searches for header files. If
-          you have optional packages (such as GNU Readline) installed in a
-          non-standard location, you have to use this option and probably
-          also the corresponding "--with-libraries" option.
-
-          Example: --with-includes=/opt/gnu/include:/usr/sup/include.
-
-     --with-libraries=DIRECTORIES
-
-          "DIRECTORIES" is a colon-separated list of directories to search
-          for libraries. You will probably have to use this option (and the
-          corresponding "--with-includes" option) if you have packages
-          installed in non-standard locations.
-
-          Example: --with-libraries=/opt/gnu/lib:/usr/sup/lib.
-
-     --enable-locale
-
-          Enables locale support. There is a performance penalty associated
-          with locale support, but if you are not in an English-speaking
-          environment you will most likely need this.
-
-     --enable-recode
-
-          Enables single-byte character set recode support. See the
-          Administrator's Guide about this feature.
-
-     --enable-multibyte
-
-          Allows the use of multibyte character encodings (including
-          Unicode) and character set encoding conversion. Read the
-          Administrator's Guide for details.
-
-          Note that some interfaces (such as Tcl or Java) expect all
-          character strings to be in Unicode, so this option will be
-          required to correctly support these interfaces.
-
-     --enable-nls[=LANGUAGES]
-
-          Enables Native Language Support (NLS), that is, the ability to
-          display a program's messages in a language other than English.
-          "LANGUAGES" is a space separated list of codes of the languages
-          that you want supported, for example --enable-nls='de fr'. (The
-          intersection between your list and the set of actually provided
-          translations will be computed automatically.) If you do not
-          specify a list, then all available translations are installed.
-
-          To use this option, you will need an implementation of the gettext
-          API. Some operating systems have this built-in (e.g., Linux,
-          NetBSD, Solaris), for other systems you can download an add-on
-          package from here: http://www.postgresql.org/~petere/gettext.html.
-          If you are using the gettext implementation in the GNU C library
-          then you will additionally need the GNU gettext package for some
-          utility programs. For any of the other implementations you will
-          not need it.
-
-     --with-pgport=NUMBER
-
-          Set "NUMBER" as the default port number for server and clients.
-          The default is 5432. The port can always be changed later on, but
-          if you specify it here then both server and clients will have the
-          same default compiled in, which can be very convenient. Usually
-          the only good reason to select a non-default value is if you
-          intend to run multiple PostgreSQL servers on the same machine.
-
-     --with-CXX
-
-          Build the C++ interface library.
-
-     --with-perl
-
-          Build the Perl interface module. The Perl interface will be
-          installed at the usual place for Perl modules (typically under
-          "/usr/lib/perl"), so you must have root access to perform the
-          installation step (see step 4). You need to have Perl 5 installed
-          to use this option.
-
-     --with-python
-
-          Build the Python interface module. You need to have root access to
-          be able to install the Python module at its default place
-          ("/usr/lib/pythonx.y"). To be able to use this option, you must
-          have Python installed and your system needs to support shared
-          libraries. If you instead want to build a new complete interpreter
-          binary, you will have to do it manually.
-
-     --with-tcl
-
-          Builds components that require Tcl/Tk, which are libpgtcl,
-          pgtclsh, pgtksh, PgAccess, and PL/Tcl. But see below about
-          "--without-tk".
-
-     --without-tk
-
-          If you specify "--with-tcl" and this option, then programs that
-          require Tk (pgtksh and PgAccess) will be excluded.
-
-     --with-tclconfig=DIRECTORY, --with-tkconfig=DIRECTORY
-
-          Tcl/Tk installs the files "tclConfig.sh" and "tkConfig.sh", which
-          contain configuration information needed to build modules
-          interfacing to Tcl or Tk. These files are normally found
-          automatically at their well-known locations, but if you want to
-          use a different version of Tcl or Tk you can specify the directory
-          in which to find them.
-
-     --enable-odbc
-
-          Build the ODBC driver. By default, the driver will be independent
-          of a driver manager. To work better with a driver manager already
-          installed on your system, use one of the following options in
-          addition to this one. More information can be found in the
-          Programmer's Guide.
-
-     --with-iodbc
-
-          Build the ODBC driver for use with iODBC.
-
-     --with-unixodbc
-
-          Build the ODBC driver for use with unixODBC.
-
-     --with-odbcinst=DIRECTORY
-
-          Specifies the directory where the ODBC driver will expect its
-          "odbcinst.ini" configuration file. The default is
-          "/usr/local/pgsql/etc" or whatever you specified as
-          "--sysconfdir". It should be arranged that the driver reads the
-          same file as the driver manager.
-
-          If either the option "--with-iodbc" or the option
-          "--with-unixodbc" is used, this option will be ignored because in
-          that case the driver manager handles the location of the
-          configuration file.
-
-     --with-java
-
-          Build the JDBC driver and associated Java packages. This option
-          requires Ant to be installed (as well as a JDK, of course). Refer
-          to the JDBC driver documentation in the Programmer's Guide for
-          more information.
-
-     --with-krb4[=DIRECTORY], --with-krb5[=DIRECTORY]
-
-          Build with support for Kerberos authentication. You can use either
-          Kerberos version 4 or 5, but not both. The "DIRECTORY" argument
-          specifies the root directory of the Kerberos installation;
-          "/usr/athena" is assumed as default. If the relevant header files
-          and libraries are not under a common parent directory, then you
-          must use the "--with-includes" and "--with-libraries" options in
-          addition to this option. If, on the other hand, the required files
-          are in a location that is searched by default (e.g., "/usr/lib"),
-          then you can leave off the argument.
-
-          "configure" will check for the required header files and libraries
-          to make sure that your Kerberos installation is sufficient before
-          proceeding.
-
-     --with-krb-srvnam=NAME
-
-          The name of the Kerberos service principal. postgres is the
-          default. There's probably no reason to change this.
-
-     --with-openssl[=DIRECTORY]
-
-          Build with support for SSL (encrypted) connections. This requires
-          the OpenSSL package to be installed. The "DIRECTORY" argument
-          specifies the root directory of the OpenSSL installation; the
-          default is "/usr/local/ssl".
-
-          "configure" will check for the required header files and libraries
-          to make sure that your OpenSSL installation is sufficient before
-          proceeding.
-
-     --with-pam
-
-          Build with PAM (Pluggable Authentication Modules) support.
-
-     --enable-syslog
-
-          Enables the PostgreSQL server to use the syslog logging facility.
-          (Using this option does not mean that you must log with syslog or
-          even that it will be done by default, it simply makes it possible
-          to turn that option on at run time.)
-
-     --enable-debug
-
-          Compiles all programs and libraries with debugging symbols. This
-          means that you can run the programs through a debugger to analyze
-          problems. This enlarges the size of the installed executables
-          considerably, and on non-GCC compilers it usually also disables
-          compiler optimization, causing slowdowns. However, having the
-          symbols available is extremely helpful for dealing with any
-          problems that may arise. Currently, this option is recommended for
-          production installations only if you use GCC. But you should
-          always have it on if you are doing development work or running a
-          beta version.
-
-     --enable-cassert
-
-          Enables assertion checks in the server, which test for many "can't
-          happen" conditions. This is invaluable for code development
-          purposes, but the tests slow things down a little. Also, having
-          the tests turned on won't necessarily enhance the stability of
-          your server! The assertion checks are not categorized for
-          severity, and so what might be a relatively harmless bug will
-          still lead to server restarts if it triggers an assertion failure.
-          Currently, this option is not recommended for production use, but
-          you should have it on for development work or when running a beta
-          version.
-
-     --enable-depend
-
-          Enables automatic dependency tracking. With this option, the
-          makefiles are set up so that all affected object files will be
-          rebuilt when any header file is changed. This is useful if you are
-          doing development work, but is just wasted overhead if you intend
-          only to compile once and install. At present, this option will
-          work only if you use GCC.
-
-     If you prefer a C or C++ compiler different from the one "configure"
-     picks then you can set the environment variables CC or CXX,
-     respectively, to the program of your choice. Similarly, you can
-     override the default compiler flags with the CFLAGS and CXXFLAGS
-     variables. For example:
-
-     env CC=/opt/bin/gcc CFLAGS='-O2 -pipe' ./configure
-
-  2. Build
-
-     To start the build, type
-
-     gmake
-
-     (Remember to use GNU make.) The build may take anywhere from 5 minutes
-     to half an hour depending on your hardware. The last line displayed
-     should be
-
-     All of PostgreSQL is successfully made. Ready to install.
-
-  3. Regression Tests
-
-     If you want to test the newly built server before you install it, you
-     can run the regression tests at this point. The regression tests are a
-     test suite to verify that PostgreSQL runs on your machine in the way
-     the developers expected it to. Type
-
-     gmake check
-
-     (This won't work as root; do it as an unprivileged user.) It is
-     possible that some tests fail, due to differences in error message
-     wording or floating point results. The file "src/test/regress/README"
-     and the Administrator's Guide contain detailed information about
-     interpreting the test results. You can repeat this test at any later
-     time by issuing the same command.
-
-  4. Installing The Files
-
-          Note: If you are upgrading an existing system and are going
-          to install the new files over the old ones, then you should
-          have backed up your data and shut down the old server by now,
-          as explained in the Section called If You Are Upgrading
-          above.
-
-     To install PostgreSQL enter
-
-     gmake install
-
-     This will install files into the directories that were specified in
-     step 1. Make sure that you have appropriate permissions to write into
-     that area. Normally you need to do this step as root. Alternatively,
-     you could create the target directories in advance and arrange for
-     appropriate permissions to be granted.
-
-     If you built the Perl or Python interfaces and you were not the root
-     user when you executed the above command then that part of the
-     installation probably failed. In that case you should become the root
-     user and then do
-
-     gmake -C src/interfaces/perl5 install
-     gmake -C src/interfaces/python install
-
-     If you do not have superuser access you are on your own: you can still
-     take the required files and place them in other directories where Perl
-     or Python can find them, but how to do that is left as an exercise.
-
-     The standard installation provides only the header files needed for
-     client application development. If you plan to do any server-side
-     program development (such as custom functions or data types written in
-     C), then you may want to install the entire PostgreSQL include tree
-     into your target include directory. To do that, enter
-
-     gmake install-all-headers
-
-     This adds a megabyte or two to the installation footprint, and is only
-     useful if you don't plan to keep the whole source tree around for
-     reference. (If you do, you can just use the source's include directory
-     when building server-side software.)
-
-     Client-only installation: If you want to install only the client
-     applications and interface libraries, then you can use these commands:
-
-     gmake -C src/bin install
-     gmake -C src/include install
-     gmake -C src/interfaces install
-     gmake -C doc install
-
-     To undo the installation use the command "gmake uninstall". However,
-     this will not remove any created directories.
-
-After the installation you can make room by removing the built files from
-the source tree with the "gmake clean" command. This will preserve the files
-made by the configure program, so that you can rebuild everything with
-"gmake" later on. To reset the source tree to the state in which it was
-distributed, use "gmake distclean". If you are going to build for several
-platforms from the same source tree you must do this and re-configure for
-each build.
-
-If you perform a build and then discover that your configure options were
-wrong, or if you change anything that configure investigates (for example,
-you install GNU Readline), then it's a good idea to do "gmake distclean"
-before reconfiguring and rebuilding. Without this, your changes in
-configuration choices may not propagate everywhere they need to.
-
-  ------------------------------------------------------------------------
-
-Post-Installation Setup
-
-Shared Libraries
-
-On some systems that have shared libraries (which most systems do) you need
-to tell your system how to find the newly installed shared libraries. The
-systems on which this is *not* necessary include BSD/OS, FreeBSD, HP-UX,
-IRIX, Linux, NetBSD, OpenBSD, Tru64 UNIX (formerly Digital UNIX), and
-Solaris.
-
-The method to set the shared library search path varies between platforms,
-but the most widely usable method is to set the environment variable
-LD_LIBRARY_PATH like so: In Bourne shells ("sh", "ksh", "bash", "zsh")
-
-LD_LIBRARY_PATH=/usr/local/pgsql/lib
-export LD_LIBRARY_PATH
-
-or in "csh" or "tcsh"
-
-setenv LD_LIBRARY_PATH /usr/local/pgsql/lib
-
-Replace /usr/local/pgsql/lib with whatever you set "--libdir" to in step 1.
-You should put these commands into a shell start-up file such as
-"/etc/profile" or "~/.bash_profile". Some good information about the caveats
-associated with this method can be found at
-http://www.visi.com/~barr/ldpath.html.
-
-On some systems it might be preferable to set the environment variable
-LD_RUN_PATH *before* building.
-
-If in doubt, refer to the manual pages of your system (perhaps "ld.so" or
-"rld"). If you later on get a message like
-
-psql: error in loading shared libraries
-libpq.so.2.1: cannot open shared object file: No such file or directory
-
-then this step was necessary. Simply take care of it then.
-
-If you are on BSD/OS, Linux, or SunOS 4 and you have root access you can run
-
-/sbin/ldconfig /usr/local/pgsql/lib
-
-(or equivalent directory) after installation to enable the run-time linker
-to find the shared libraries faster. Refer to the manual page of "ldconfig"
-for more information. On FreeBSD, NetBSD, and OpenBSD the command is
-
-/sbin/ldconfig -m /usr/local/pgsql/lib
-
-instead. Other systems are not known to have an equivalent command.
-
-  ------------------------------------------------------------------------
-
-Environment Variables
-
-If you installed into "/usr/local/pgsql" or some other location that is not
-searched for programs by default, you need to add "/usr/local/pgsql/bin" (or
-whatever you set "--bindir" to in step 1) into your PATH. To do this, add
-the following to your shell start-up file, such as "~/.bash_profile" (or
-"/etc/profile", if you want it to affect every user):
-
-PATH=/usr/local/pgsql/bin:$PATH
-
-If you are using "csh" or "tcsh", then use this command:
-
-set path = ( /usr/local/pgsql/bin $path )
-
-To enable your system to find the man documentation, you need to add a line
-like the following to a shell start-up file:
-
-MANPATH=/usr/local/pgsql/man:$MANPATH
-
-The environment variables PGHOST and PGPORT specify to client applications
-the host and port of the database server, overriding the compiled-in
-defaults. If you are going to run client applications remotely then it is
-convenient if every user that plans to use the database sets PGHOST. This is
-not required, however: the settings can be communicated via command line
-options to most client programs.
-
-  ------------------------------------------------------------------------
-
-Getting Started
-
-The following is a quick summary of how to get PostgreSQL up and running
-once installed. The Administrator's Guide contains more information.
-
-  1. Create a user account for the PostgreSQL server. This is the user the
-     server will run as. For production use you should create a separate,
-     unprivileged account ("postgres" is commonly used). If you do not have
-     root access or just want to play around, your own user account is
-     enough, but running the server as root is a security risk and will not
-     work.
-
-     adduser postgres
-
-  2. Create a database installation with the "initdb" command. To run
-     "initdb" you must be logged in to your PostgreSQL server account. It
-     will not work as root.
-
-     root# mkdir /usr/local/pgsql/data
-     root# chown postgres /usr/local/pgsql/data
-     root# su - postgres
-     postgres$ /usr/local/pgsql/bin/initdb -D /usr/local/pgsql/data
-
-     The "-D" option specifies the location where the data will be stored.
-     You can use any path you want, it does not have to be under the
-     installation directory. Just make sure that the server account can
-     write to the directory (or create it, if it doesn't already exist)
-     before starting "initdb", as illustrated here.
-
-  3. The previous step should have told you how to start up the database
-     server. Do so now. The command should look something like
-
-     /usr/local/pgsql/bin/postmaster -D /usr/local/pgsql/data
-
-     This will start the server in the foreground. To put the server in the
-     background use something like
-
-     nohup /usr/local/pgsql/bin/postmaster -D /usr/local/pgsql/data \
-         </dev/null >>server.log 2>&1 </dev/null &
-
-     To stop a server running in the background you can type
-
-     kill `cat /usr/local/pgsql/data/postmaster.pid`
-
-     In order to allow TCP/IP connections (rather than only Unix domain
-     socket ones) you need to pass the "-i" option to "postmaster".
-
-  4. Create a database:
-
-     createdb testdb
-
-     Then enter
-
-     psql testdb
-
-     to connect to that database. At the prompt you can enter SQL commands
-     and start experimenting.
-
-  ------------------------------------------------------------------------
-
-What Now?
-
-   * The PostgreSQL distribution contains a comprehensive documentation set,
-     which you should read sometime. After installation, the documentation
-     can be accessed by pointing your browser to
-     "/usr/local/pgsql/doc/html/index.html", unless you changed the
-     installation directories.
-
-     The Tutorial should be your first reading if you are completely new to
-     SQL databases. If you are familiar with database concepts then you want
-     to proceed with the Administrator's Guide, which contains information
-     about how to set up the database server, database users, and
-     authentication.
-
-   * Usually, you will want to modify your computer so that it will
-     automatically start the database server whenever it boots. Some
-     suggestions for this are in the Administrator's Guide.
-
-   * Run the regression tests against the installed server (using the
-     sequential test method). If you didn't run the tests before
-     installation, you should definitely do it now. This is also explained
-     in the Administrator's Guide.
-
-  ------------------------------------------------------------------------
-
-Supported Platforms
-
-PostgreSQL has been verified by the developer community to work on the
-platforms listed below. A supported platform generally means that PostgreSQL
-builds and installs according to these instructions and that the regression
-tests pass.
-
-     Note: If you are having problems with the installation on a
-     supported platform, please write to <pgsql-bugs@postgresql.org> or
-     <pgsql-ports@postgresql.org>, not to the people listed here.
-
- OS     Processor   Version Reported                         Remarks
- AIX    RS6000      7.2     2001-12-19, Andreas Zeugswetter  see also
-                            (<ZeugswetterA@spardat.at>),     doc/FAQ_AIX
-                            Tatsuo Ishii
-                            (<t-ishii@sra.co.jp>)
- BeOS   x86         7.2     2001-11-29, Cyril Velter         5.0.4
-                            (<cyril.velter@libertysurf.fr>)
- BSD/OS x86         7.2     2001-11-27, Bruce Momjian        4.2
-                            (<pgman@candle.pha.pa.us>)
- FreeBSDAlpha       7.2     2001-12-18, Chris Kings-Lynne
-                            (<chriskl@familyhealth.com.au>)
- FreeBSDx86         7.2     2001-11-14, Chris Kings-Lynne
-                            (<chriskl@familyhealth.com.au>)
- HP-UX  PA-RISC     7.2     2001-11-29, Joseph Conway        11.00 and 10.20;
-                            (<Joseph.Conway@home.com>), Tom  see also
-                            Lane (<tgl@sss.pgh.pa.us>)       doc/FAQ_HPUX
- IRIX   MIPS        7.2     2001-11-28, Luis Amigo           6.5.13, MIPSPro
-                            (<lamigo@atc.unican.es>)         7.30
- Linux  Alpha       7.2     2001-11-16, Tom Lane             2.2.18; tested at
-                            (<tgl@sss.pgh.pa.us>)            SourceForge
- Linux  armv4l      7.2     2001-12-10, Mark Knox            2.2.x
-                            (<segfault@hardline.org>)
- Linux  MIPS        7.2     2001-11-15, Hisao Shibuya        2.0.x; Cobalt
-                            (<shibuya@alpha.or.jp>)          Qube2
- Linux  PlayStation 7.2     2001-12-12, Permaine Cheung      #undef
-        2                   <pcheung@redhat.com>)            HAS_TEST_AND_SET,
-                                                             slock_t
- Linux  PPC74xx     7.2     2001-11-16, Tom Lane             2.2.18; Apple G3
-                            (<tgl@sss.pgh.pa.us>)
- Linux  S/390       7.2     2001-12-12, Permaine Cheung
-                            <pcheung@redhat.com>)
- Linux  Sparc       7.2     2001-11-28, Doug McNaught        2.2.19
-                            (<doug@wireboard.com>)
- Linux  x86         7.2     2001-11-15, Thomas Lockhart      2.0.x, 2.2.x,
-                            (<lockhart@fourpalms.org>)       2.4.x
- MacOS XPPC         7.2     2001-11-28, Gavin Sherry         10.1.x
-                            (<swm@linuxworld.com.au>)
- NetBSD Alpha       7.2     2001-11-20, Thomas Thai          1.5W
-                            (<tom@minnesota.com>)
- NetBSD arm32       7.1     2001-03-21, Patrick Welche       1.5E
-                            (<prlw1@cam.ac.uk>)
- NetBSD m68k        7.0     2000-04-10, Henry B. Hotz        Mac 8xx
-                            (<hotz@jpl.nasa.gov>)
- NetBSD PPC         7.2     2001-11-28, Bill Studenmund      1.5
-                            (<wrstuden@netbsd.org>)
- NetBSD Sparc       7.2     2001-12-03, Matthew Green        32- and 64-bit
-                            (<mrg@eterna.com.au>)            builds
- NetBSD VAX         7.1     2001-03-30, Tom I. Helbekkmo     1.5
-                            (<tih@kpnQwest.no>)
- NetBSD x86         7.2     2001-11-28, Bill Studenmund      1.5
-                            (<wrstuden@netbsd.org>)
- OpenBSDSparc       7.2     2001-11-27, Brandon Palmer       3.0
-                            (<bpalmer@crimelabs.net>)
- OpenBSDx86         7.2     2001-11-26, Brandon Palmer       3.0
-                            (<bpalmer@crimelabs.net>)
- Open   x86         7.2     2001-11-28, OU-8 Larry Rosenman  see also
- UNIX                       (<ler@lerctr.org>), UW-7 Olivier doc/FAQ_SCO
-                            Prenant (<ohp@pyrenet.fr>)
- QNX 4  x86         7.2     2001-12-10, Bernd Tegge          4.25; see also
- RTOS                       (<tegge@repas-aeg.de>)           doc/FAQ_QNX4
- SolarisSparc       7.2     2001-11-12, Andrew Sullivan      2.6-8; see also
-                            (<andrew@libertyrms.com>)        doc/FAQ_Solaris
- Solarisx86         7.2     2001-11-28, Martin Renters       2.8; see also
-                            (<martin@datafax.com>)           doc/FAQ_Solaris
- SunOS 4Sparc       7.2     2001-12-04, Tatsuo Ishii
-                            (<t-ishii@sra.co.jp>)
- Tru64  Alpha       7.2     2001-11-26, Alessio Bragadini    5.0; 4.0g with cc
- UNIX                       (<alessio@albourne.com>), Bernd  and gcc
-                            Tegge (<tegge@repas-aeg.de>)
- Windowsx86         7.2     2001-12-13, Dave Page            with Cygwin; see
-                            (<dpage@vale-housing.co.uk>),    doc/FAQ_MSWIN
-                            Jason Tishler
-                            (<jason@tishler.net>)
- Windowsx86         7.2     2001-12-10, Dave Page            native is
-                            (<dpage@vale-housing.co.uk>)     client-side only;
-                                                             see
-                                                             Administrator's
-                                                             Guide
-
-Unsupported Platforms: The following platforms are either known not to work,
-or they used to work in a previous release and we did not receive explicit
-confirmation of a successful test with version 7.2 at the time this list was
-compiled. We include these here to let you know that these platforms *could*
-be supported if given some attention.
-
- OS         Processor Version Reported                         Remarks
- DG/UX      m88k      6.3     1998-03-01, Brian E Gallew       no recent
- 5.4R4.11                     (<geek+@cmu.edu>)                reports
- MkLinux DR1PPC750    7.0     2001-04-03, Tatsuo Ishii         7.1 needs OS
-                              (<t-ishii@sra.co.jp>)            update?
- NeXTSTEP   x86       6.x     1998-03-01, David Wetzel         bit rot
-                              (<dave@turbocat.de>)             suspected
- QNX RTOS v6x86       7.2     2001-11-20, Igor Kovalenko       patches
-                              (<Igor.Kovalenko@motorola.com>)  available in
-                                                               archives,
-                                                               but too late
-                                                               for 7.2
- SCO        x86       6.5     1999-05-25, Andrew Merrill       7.2 should
- OpenServer                   (<andrew@compclass.com>)         work, but no
- 5                                                             reports; see
-                                                               also
-                                                               doc/FAQ_SCO
- System V R4m88k      6.2.1   1998-03-01, Doug Winterburn      needs new
-                              (<dlw@seavme.xroads.com>)        TAS spinlock
-                                                               code
- System V R4MIPS      6.4     1998-10-28, Frank Ridderbusch    no recent
-                              (<ridderbusch.pad@sni.de>)       reports
- Ultrix     MIPS      7.1     2001-03-26                       TAS spinlock
-                                                               code not
-                                                               detected
- Ultrix     VAX       6.x     1998-03-01
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 9de7cce180..0000000000
--- a/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# The PostgreSQL make files exploit features of GNU make that other
-# makes do not have. Because it is a common mistake for users to try
-# to build Postgres with a different make, we have this make file
-# that, as a service, will look for a GNU make and invoke it, or show
-# an error message if none could be found.
-
-# If the user were using GNU make now, this file would not get used
-# because GNU make uses a make file named "GNUmakefile" in preference
-# to "Makefile" if it exists. PostgreSQL is shipped with a
-# "GNUmakefile". If the user hasn't run the configure script yet, the
-# GNUmakefile won't exist yet, so we catch that case as well.
-
-
-all check install installdirs install-all-headers installcheck uninstall dep depend clean distclean maintainer-clean:
-	@if [ ! -f GNUmakefile ] ; then \
-	   echo "You need to run the 'configure' program first. See the file"; \
-	   echo "'INSTALL' for installation instructions." ; \
-	   false ; \
-	 fi
-	@IFS=':' ; \
-	 for dir in $$PATH; do \
-	   for prog in gmake gnumake make; do \
-	     if [ -f $$dir/$$prog ] && ( $$dir/$$prog -f /dev/null --version 2>/dev/null | grep GNU >/dev/null 2>&1 ) ; then \
-	       GMAKE=$$dir/$$prog; \
-	       break 2; \
-	     fi; \
-	   done; \
-	 done; \
-	\
-	 if [ x"$${GMAKE+set}" = xset ]; then \
-	   echo "Using GNU make found at $${GMAKE}"; \
-	   $${GMAKE} $@ ; \
-	 else \
-	   echo "You must use GNU make to build PostgreSQL." ; \
-	   false; \
-	 fi
diff --git a/README b/README
deleted file mode 100644
index a02403b8b8..0000000000
--- a/README
+++ /dev/null
@@ -1,26 +0,0 @@
-PostgreSQL Database Management System
-=====================================
-  
-This directory contains the source code distribution of the PostgreSQL
-database management system.
-
-PostgreSQL is an advanced object-relational database management system
-that supports an extended subset of the SQL standard, including
-transactions, foreign keys, subqueries, triggers, user-defined types
-and functions.  This distribution also contains several language
-bindings, including C, C++, Perl, Python, and Tcl, as well as drivers
-for JDBC and ODBC.
-
-See the file INSTALL for instructions on how to build and install
-PostgreSQL.  That file also lists supported operating systems and
-hardware platforms and contains information regarding any other
-software packages that are required to build or run the PostgreSQL
-system.  Changes between all PostgreSQL releases are recorded in the
-file HISTORY.  Copyright and license information can be found in the
-file COPYRIGHT.  A comprehensive documentation set is included in this
-distribution; it can be read as described in the installation
-instructions.
-
-The latest version of this software may be obtained at
-ftp://ftp.postgresql.org/pub/.  For more information look at our web
-site located at http://www.postgresql.org/.
diff --git a/aclocal.m4 b/aclocal.m4
deleted file mode 100644
index 1edb7f9800..0000000000
--- a/aclocal.m4
+++ /dev/null
@@ -1,13 +0,0 @@
-dnl $Header: /cvsroot/pgsql/aclocal.m4,v 1.14 2002/03/29 17:32:48 petere Exp $
-m4_include([config/ac_func_accept_argtypes.m4])
-m4_include([config/c-compiler.m4])
-m4_include([config/c-library.m4])
-m4_include([config/cxx.m4])
-m4_include([config/docbook.m4])
-m4_include([config/general.m4])
-m4_include([config/java.m4])
-m4_include([config/libtool.m4])
-m4_include([config/perl.m4])
-m4_include([config/programs.m4])
-m4_include([config/python.m4])
-m4_include([config/tcl.m4])
diff --git a/config/ac_func_accept_argtypes.m4 b/config/ac_func_accept_argtypes.m4
deleted file mode 100644
index f22d905659..0000000000
--- a/config/ac_func_accept_argtypes.m4
+++ /dev/null
@@ -1,76 +0,0 @@
-# $Header: /cvsroot/pgsql/config/ac_func_accept_argtypes.m4,v 1.4 2002/03/29 17:32:53 petere Exp $
-# This comes from the official Autoconf macro archive at
-# <http://research.cys.de/autoconf-archive/>
-# (I removed the $ before the Id CVS keyword below.)
-
-
-dnl @synopsis AC_FUNC_ACCEPT_ARGTYPES
-dnl
-dnl Checks the data types of the three arguments to accept(). Results are
-dnl placed into the symbols ACCEPT_TYPE_ARG[123], consistent with the
-dnl following example:
-dnl
-dnl       #define ACCEPT_TYPE_ARG1 int
-dnl       #define ACCEPT_TYPE_ARG2 struct sockaddr *
-dnl       #define ACCEPT_TYPE_ARG3 socklen_t
-dnl
-dnl This macro requires AC_CHECK_HEADERS to have already verified the
-dnl presence or absence of sys/types.h and sys/socket.h.
-dnl
-dnl NOTE: This is just a modified version of the AC_FUNC_SELECT_ARGTYPES
-dnl macro. Credit for that one goes to David MacKenzie et. al.
-dnl
-dnl @version Id: ac_func_accept_argtypes.m4,v 1.1 1999/12/03 11:29:29 simons Exp $
-dnl @author Daniel Richard G. <skunk@mit.edu>
-dnl
-
-# PostgreSQL local changes: In the original version ACCEPT_TYPE_ARG3
-# is a pointer type. That's kind of useless because then you can't
-# use the macro to define a corresponding variable. We also make the
-# reasonable(?) assumption that you can use arg3 for getsocktype etc.
-# as well (i.e., anywhere POSIX.2 has socklen_t).
-#
-# arg2 can also be `const' (e.g., RH 4.2). Change the order of tests
-# for arg3 so that `int' is first, in case there is no prototype at all.
-#
-# Solaris 7 and 8 have arg3 as 'void *' (disguised as 'Psocklen_t'
-# which is *not* 'socklen_t *').  If we detect that, then we assume
-# 'int' as the result, because that ought to work best.
-
-AC_DEFUN([AC_FUNC_ACCEPT_ARGTYPES],
-[AC_MSG_CHECKING([types of arguments for accept()])
- AC_CACHE_VAL(ac_cv_func_accept_arg1,dnl
- [AC_CACHE_VAL(ac_cv_func_accept_arg2,dnl
-  [AC_CACHE_VAL(ac_cv_func_accept_arg3,dnl
-   [for ac_cv_func_accept_arg1 in 'int' 'unsigned int'; do
-     for ac_cv_func_accept_arg2 in 'struct sockaddr *' 'const struct sockaddr *' 'void *'; do
-      for ac_cv_func_accept_arg3 in 'int' 'size_t' 'socklen_t' 'unsigned int' 'void'; do
-       AC_TRY_COMPILE(
-[#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-extern int accept ($ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *);],
-        [], [ac_not_found=no; break 3], [ac_not_found=yes])
-      done
-     done
-    done
-    if test "$ac_not_found" = yes; then
-      AC_MSG_ERROR([could not determine argument types])
-    fi
-    if test "$ac_cv_func_accept_arg3" = "void"; then
-      ac_cv_func_accept_arg3=int
-    fi
-   ])dnl AC_CACHE_VAL
-  ])dnl AC_CACHE_VAL
- ])dnl AC_CACHE_VAL
- AC_MSG_RESULT([$ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *])
- AC_DEFINE_UNQUOTED(ACCEPT_TYPE_ARG1, $ac_cv_func_accept_arg1,
-                    [Define to the type of arg 1 of 'accept'])
- AC_DEFINE_UNQUOTED(ACCEPT_TYPE_ARG2, $ac_cv_func_accept_arg2,
-                    [Define to the type of arg 2 of 'accept'])
- AC_DEFINE_UNQUOTED(ACCEPT_TYPE_ARG3, $ac_cv_func_accept_arg3,
-                    [Define to the type of arg 3 of 'accept'])
-])
diff --git a/config/c-compiler.m4 b/config/c-compiler.m4
deleted file mode 100644
index 5171e1e6d9..0000000000
--- a/config/c-compiler.m4
+++ /dev/null
@@ -1,94 +0,0 @@
-# Macros to detect C compiler features
-# $Header: /cvsroot/pgsql/config/c-compiler.m4,v 1.5 2002/03/29 17:32:53 petere Exp $
-
-
-# PGAC_C_SIGNED
-# -------------
-# Check if the C compiler understands signed types.
-AC_DEFUN([PGAC_C_SIGNED],
-[AC_CACHE_CHECK(for signed types, pgac_cv_c_signed,
-[AC_TRY_COMPILE([],
-[signed char c; signed short s; signed int i;],
-[pgac_cv_c_signed=yes],
-[pgac_cv_c_signed=no])])
-if test x"$pgac_cv_c_signed" = xno ; then
-  AC_DEFINE(signed,, [Define empty if the C compiler does not understand signed types])
-fi])# PGAC_C_SIGNED
-
-
-
-# PGAC_TYPE_64BIT_INT(TYPE)
-# -------------------------
-# Check if TYPE is a working 64 bit integer type. Set HAVE_TYPE_64 to
-# yes or no respectively, and define HAVE_TYPE_64 if yes.
-AC_DEFUN([PGAC_TYPE_64BIT_INT],
-[define([Ac_define], [translit([have_$1_64], [a-z *], [A-Z_P])])dnl
-define([Ac_cachevar], [translit([pgac_cv_type_$1_64], [ *], [_p])])dnl
-AC_CACHE_CHECK([whether $1 is 64 bits], [Ac_cachevar],
-[AC_TRY_RUN(
-[typedef $1 int64;
-
-/*
- * These are globals to discourage the compiler from folding all the
- * arithmetic tests down to compile-time constants.
- */
-int64 a = 20000001;
-int64 b = 40000005;
-
-int does_int64_work()
-{
-  int64 c,d;
-
-  if (sizeof(int64) != 8)
-    return 0;			/* definitely not the right size */
-
-  /* Do perfunctory checks to see if 64-bit arithmetic seems to work */
-  c = a * b;
-  d = (c + b) / b;
-  if (d != a+1)
-    return 0;
-  return 1;
-}
-main() {
-  exit(! does_int64_work());
-}],
-[Ac_cachevar=yes],
-[Ac_cachevar=no],
-[Ac_cachevar=no
-dnl We will do better here with Autoconf 2.50
-AC_MSG_WARN([64 bit arithmetic disabled when cross-compiling])])])
-
-Ac_define=$Ac_cachevar
-if test x"$Ac_cachevar" = xyes ; then
-  AC_DEFINE(Ac_define,, [Set to 1 if `]$1[' is 64 bits])
-fi
-undefine([Ac_define])dnl
-undefine([Ac_cachevar])dnl
-])# PGAC_TYPE_64BIT_INT
-
-
-
-# PGAC_CHECK_ALIGNOF(TYPE, [INCLUDES = DEFAULT-INCLUDES])
-# -----------------------------------------------------
-# Find the alignment requirement of the given type. Define the result
-# as ALIGNOF_TYPE.  This macro works even when cross compiling.
-# (Modelled after AC_CHECK_SIZEOF.)
-
-AC_DEFUN([PGAC_CHECK_ALIGNOF],
-[AS_LITERAL_IF([$1], [],
-               [AC_FATAL([$0: requires literal arguments])])dnl
-AC_CHECK_TYPE([$1], [], [], [$2])
-AC_CACHE_CHECK([alignment of $1], [AS_TR_SH([pgac_cv_alignof_$1])],
-[if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then
-  _AC_COMPUTE_INT([((char*) & pgac_struct.field) - ((char*) & pgac_struct)],
-                  [AS_TR_SH([pgac_cv_alignof_$1])],
-                  [AC_INCLUDES_DEFAULT([$2])
-struct { char filler; $1 field; } pgac_struct;],
-                  [AC_MSG_ERROR([cannot compute alignment of $1, 77])])
-else
-  AS_TR_SH([pgac_cv_alignof_$1])=0
-fi])dnl
-AC_DEFINE_UNQUOTED(AS_TR_CPP(alignof_$1),
-                   [$AS_TR_SH([pgac_cv_alignof_$1])],
-                   [The alignment requirement of a `$1'])
-])# PGAC_CHECK_ALIGNOF
diff --git a/config/c-library.m4 b/config/c-library.m4
deleted file mode 100644
index 10a91d43b4..0000000000
--- a/config/c-library.m4
+++ /dev/null
@@ -1,112 +0,0 @@
-# Macros that test various C library quirks
-# $Header: /cvsroot/pgsql/config/c-library.m4,v 1.13 2002/03/30 00:59:52 petere Exp $
-
-
-# PGAC_VAR_INT_TIMEZONE
-# ---------------------
-# Check if the global variable `timezone' exists. If so, define
-# HAVE_INT_TIMEZONE.
-AC_DEFUN([PGAC_VAR_INT_TIMEZONE],
-[AC_CACHE_CHECK(for int timezone, pgac_cv_var_int_timezone,
-[AC_TRY_LINK([#include <time.h>
-int res;],
-  [res = timezone / 60;],
-  [pgac_cv_var_int_timezone=yes],
-  [pgac_cv_var_int_timezone=no])])
-if test x"$pgac_cv_var_int_timezone" = xyes ; then
-  AC_DEFINE(HAVE_INT_TIMEZONE,, [Set to 1 if you have the global variable timezone])
-fi])# PGAC_VAR_INT_TIMEZONE
-
-
-# PGAC_FUNC_GETTIMEOFDAY_1ARG
-# ---------------------------
-# Check if gettimeofday() has only one arguments. (Normal is two.)
-# If so, define GETTIMEOFDAY_1ARG.
-AC_DEFUN([PGAC_FUNC_GETTIMEOFDAY_1ARG],
-[AC_CACHE_CHECK(whether gettimeofday takes only one argument,
-pgac_cv_func_gettimeofday_1arg,
-[AC_TRY_COMPILE([#include <sys/time.h>],
-[struct timeval *tp;
-struct timezone *tzp;
-gettimeofday(tp,tzp);],
-[pgac_cv_func_gettimeofday_1arg=no],
-[pgac_cv_func_gettimeofday_1arg=yes])])
-if test x"$pgac_cv_func_gettimeofday_1arg" = xyes ; then
-  AC_DEFINE(GETTIMEOFDAY_1ARG,, [Set to 1 if gettimeofday() takes only 1 argument])
-fi])# PGAC_FUNC_GETTIMEOFDAY_1ARG
-
-
-# PGAC_FUNC_MEMCMP
-# ----------------
-# Check if memcmp() properly handles negative bytes and returns +/-.
-# SunOS does not.
-# AC_FUNC_MEMCMP
-AC_DEFUN([PGAC_FUNC_MEMCMP],
-[AC_CACHE_CHECK(for 8-bit clean memcmp, pgac_cv_func_memcmp_clean,
-[AC_TRY_RUN([
-main()
-{
-  char c0 = 0x40, c1 = 0x80, c2 = 0x81;
-  exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
-}
-], pgac_cv_func_memcmp_clean=yes, pgac_cv_func_memcmp_clean=no,
-pgac_cv_func_memcmp_clean=no)])
-if test $pgac_cv_func_memcmp_clean = no ; then
-  MEMCMP=memcmp.o
-else
-  MEMCMP=
-fi
-AC_SUBST(MEMCMP)dnl
-])
-
-
-# PGAC_UNION_SEMUN
-# ----------------
-# Check if `union semun' exists. Define HAVE_UNION_SEMUN if so.
-# If it doesn't then one could define it as
-# union semun { int val; struct semid_ds *buf; unsigned short *array; }
-AC_DEFUN([PGAC_UNION_SEMUN],
-[AC_CHECK_TYPES([union semun], [], [],
-[#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>])])# PGAC_UNION_SEMUN
-
-
-# PGAC_STRUCT_SOCKADDR_UN
-# -----------------------
-# If `struct sockaddr_un' exists, define HAVE_STRUCT_SOCKADDR_UN. If
-# it is missing then one could define it as { short int sun_family;
-# char sun_path[108]; }. (Requires test for <sys/un.h>!)
-AC_DEFUN([PGAC_STRUCT_SOCKADDR_UN],
-[AC_CHECK_TYPES([struct sockaddr_un], [], [],
-[#include <sys/types.h>
-#ifdef HAVE_SYS_UN_H
-#include <sys/un.h>
-#endif
-])])# PGAC_STRUCT_SOCKADDR_UN
-
-
-# PGAC_FUNC_POSIX_SIGNALS
-# -----------------------
-# Check to see if the machine has the POSIX signal interface. Define
-# HAVE_POSIX_SIGNALS if so. Also set the output variable HAVE_POSIX_SIGNALS
-# to yes or no.
-#
-# Note that this test only compiles a test program, it doesn't check
-# whether the routines actually work. If that becomes a problem, make
-# a fancier check.
-AC_DEFUN([PGAC_FUNC_POSIX_SIGNALS],
-[AC_CACHE_CHECK(for POSIX signal interface, pgac_cv_func_posix_signals,
-[AC_TRY_LINK([#include <signal.h>
-],
-[struct sigaction act, oact;
-sigemptyset(&act.sa_mask);
-act.sa_flags = SA_RESTART;
-sigaction(0, &act, &oact);],
-[pgac_cv_func_posix_signals=yes],
-[pgac_cv_func_posix_signals=no])])
-if test x"$pgac_cv_func_posix_signals" = xyes ; then
-  AC_DEFINE(HAVE_POSIX_SIGNALS,, [Set to 1 if you have the POSIX signal interface])
-fi
-HAVE_POSIX_SIGNALS=$pgac_cv_func_posix_signals
-AC_SUBST(HAVE_POSIX_SIGNALS)])# PGAC_FUNC_POSIX_SIGNALS
diff --git a/config/config.guess b/config/config.guess
deleted file mode 100755
index dc70191a98..0000000000
--- a/config/config.guess
+++ /dev/null
@@ -1,1308 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
-
-timestamp='2001-08-04'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Written by Per Bothner <bothner@cygnus.com>.
-# Please send patches to <config-patches@gnu.org>.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script.
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c ;
-	for c in cc gcc c89 ; do
-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
-	  if test $? = 0 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	rm -f $dummy.c $dummy.o $dummy.rel ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# Netbsd (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	# Determine the machine/vendor (is the vendor relevant).
-	case "${UNAME_MACHINE}" in
-	    amiga) machine=m68k-unknown ;;
-	    arm32) machine=arm-unknown ;;
-	    atari*) machine=m68k-atari ;;
-	    sun3*) machine=m68k-sun ;;
-	    mac68k) machine=m68k-apple ;;
-	    macppc) machine=powerpc-apple ;;
-	    hp3[0-9][05]) machine=m68k-hp ;;
-	    ibmrt|romp-ibm) machine=romp-ibm ;;
-	    *) machine=${UNAME_MACHINE}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE}" in
-	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	cat <<EOF >$dummy.s
-	.data
-\$Lformat:
-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-	.text
-	.globl main
-	.align 4
-	.ent main
-main:
-	.frame \$30,16,\$26,0
-	ldgp \$29,0(\$27)
-	.prologue 1
-	.long 0x47e03d80 # implver \$0
-	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
-	lda \$16,\$Lformat
-	mov \$0,\$17
-	not \$1,\$18
-	jsr \$26,printf
-	ldgp \$29,0(\$26)
-	mov 0,\$16
-	jsr \$26,exit
-	.end main
-EOF
-	eval $set_cc_for_build
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		case `./$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-		esac
-	fi
-	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit 0 ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit 0;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    arc64:OpenBSD:*:*)
-	echo mips64el-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hkmips:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit 0 ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
-    sun3*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	eval $set_cc_for_build
-	$CC_FOR_BUILD $dummy.c -o $dummy \
-	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		eval $set_cc_for_build
-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-		rm -f $dummy.c $dummy
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-              case "${HPUX_REV}" in
-                11.[0-9][0-9])
-                  if [ -x /usr/bin/getconf ]; then
-                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-                        esac ;;
-                    esac
-                  fi ;;
-              esac
-              if [ "${HP_ARCH}" = "" ]; then
-              sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-	eval $set_cc_for_build
-	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
-	if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-	rm -f $dummy.c $dummy
-	fi ;;
-	esac
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	eval $set_cc_for_build
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    hppa*:OpenBSD:*:*)
-	echo hppa-unknown-openbsd
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*X-MP:*:*:*)
-	echo xmp-cray-unicos
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY-2:*:*:*)
-	echo cray2-cray-unicos
-        exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i386-pc-interix
-	exit 0 ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    mips:Linux:*:*)
-	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
-	  big)    echo mips-unknown-linux-gnu && exit 0 ;;
-	  little) echo mipsel-unknown-linux-gnu && exit 0 ;;
-	esac
-	;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev67 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	ld_supported_targets=`cd /; ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;		
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	cat >$dummy.c <<EOF
-#include <features.h>
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __ELF__
-# ifdef __GLIBC__
-#  if __GLIBC__ >= 2
-    printf ("%s-pc-linux-gnu\n", argv[1]);
-#  else
-    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
-#  endif
-# else
-   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
-# endif
-#else
-  printf ("%s-pc-linux-gnuaout\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-	eval $set_cc_for_build
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    M68*:*:R3V[567]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit 0 ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit 0 ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit 0 ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit 0 ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Darwin:*:*)
-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	if test "${UNAME_MACHINE}" = "x86pc"; then
-		UNAME_MACHINE=pc
-	fi
-	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-[KW]:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit 0 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-eval $set_cc_for_build
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-    ftp://ftp.gnu.org/pub/gnu/config/
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/config/config.sub b/config/config.sub
deleted file mode 100755
index f87dc312cb..0000000000
--- a/config/config.sub
+++ /dev/null
@@ -1,1409 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
-
-timestamp='2001-08-02'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Please send patches to <config-patches@gnu.org>.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
-	| d10v | d30v | dsp16xx \
-	| fr30 \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
-	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-	| mipsbe | mipsel | mipsle | mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| ns16k | ns32k \
-	| openrisc \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| s390 | s390x \
-	| sh | sh[34] | sh[34]eb | shbe | shle \
-	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic80 | tron \
-	| v850 \
-	| we32k \
-	| x86 | xscale \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alphapca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armv*-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-	| clipper-* | cray2-* | cydra-* \
-	| d10v-* | d30v-* \
-	| f30[01]-* | f700-* | fr30-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| m32r-* \
-	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipsel-* \
-	| mipsle-* | mipstx39-* | mipstx39el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| s390-* | s390x-* \
-	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \
-	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
-	| v850-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
-		;;
-	[cjt]90)
-		basic_machine=${basic_machine}-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mipsel*-linux*)
-		basic_machine=mipsel-unknown
-		os=-linux-gnu
-		;;
-	mips*-linux*)
-		basic_machine=mips-unknown
-		os=-linux-gnu
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-        pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | k6 | nexgen)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2)
-		basic_machine=i686-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-	        ;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-	        ;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-	        ;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-	        ;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sparclite-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=t3e-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	windows32)
-		basic_machine=i386-pc
-		os=-windows32-msvcrt
-		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
-		;;
-        xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	mips)
-		if [ x$os = x-linux-gnu ]; then
-			basic_machine=mips-unknown
-		else
-			basic_machine=mips-mips
-		fi
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh3 | sh4 | sh3eb | sh4eb)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
-		basic_machine=sparc-sun
-		;;
-        cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	c4x*)
-		basic_machine=c4x-none
-		os=-coff
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto*)
-		os=-nto-qnx
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-ns2 )
-	        os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-	        os=-mint
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-	pdp10-*)
-		os=-tops20
-		;;
-        pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-        *-gould)
-		os=-sysv
-		;;
-        *-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-        *-sgi)
-		os=-irix
-		;;
-        *-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-vxsim* | -vxworks*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/config/cxx.m4 b/config/cxx.m4
deleted file mode 100644
index 5498db091a..0000000000
--- a/config/cxx.m4
+++ /dev/null
@@ -1,64 +0,0 @@
-# Macros to detect certain C++ features
-# $Header: /cvsroot/pgsql/config/Attic/cxx.m4,v 1.3 2002/03/29 20:54:33 petere Exp $
-
-
-# PGAC_CLASS_STRING
-# -----------------
-# Look for class `string'. First look for the <string> header. If this
-# is found a <string> header then it's probably safe to assume that
-# class string exists.  If not, check to make sure that <string.h>
-# defines class `string'.
-AC_DEFUN([PGAC_CLASS_STRING],
-[AC_LANG_PUSH(C++)
-AC_CHECK_HEADER(string,
-                [AC_DEFINE(HAVE_CXX_STRING_HEADER, 1,
-                           [Define to 1 if you have the C++ <string> header])],
-                [AC_CACHE_CHECK([for class string in <string.h>],
-                                [pgac_cv_class_string_in_string_h],
-[AC_TRY_COMPILE([#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-],
-                [string foo = "test"],
-                [pgac_cv_class_string_in_string_h=yes],
-                [pgac_cv_class_string_in_string_h=no])])
-
-  if test x"$pgac_cv_class_string_in_string_h" != xyes ; then
-    AC_MSG_ERROR([neither <string> nor <string.h> seem to define the C++ class 'string'])
-  fi
-])
-AC_LANG_POP(C++)])# PGAC_CLASS_STRING
-
-
-# PGAC_CXX_NAMESPACE_STD
-# ----------------------
-# Check whether the C++ compiler understands `using namespace std'.
-#
-# Note 1: On at least some compilers, it will not work until you've
-# included a header that mentions namespace std. Thus, include the
-# usual suspects before trying it.
-#
-# Note 2: This test does not actually reveal whether the C++ compiler
-# properly understands namespaces in all generality. (GNU C++ 2.8.1
-# is one that doesn't.) However, we don't care.
-AC_DEFUN([PGAC_CXX_NAMESPACE_STD],
-[AC_REQUIRE([PGAC_CLASS_STRING])
-AC_CACHE_CHECK([for namespace std in C++],
-pgac_cv_cxx_namespace_std,
-[
-AC_LANG_PUSH(C++)
-AC_TRY_COMPILE(
-[#include <stdio.h>
-#include <stdlib.h>
-#ifdef HAVE_CXX_STRING_HEADER
-#include <string>
-#endif
-using namespace std;
-], [],
-[pgac_cv_cxx_namespace_std=yes],
-[pgac_cv_cxx_namespace_std=no])
-AC_LANG_POP(C++)])
-
-if test $pgac_cv_cxx_namespace_std = yes ; then
-    AC_DEFINE(HAVE_NAMESPACE_STD, 1, [Define to 1 if the C++ compiler understands 'using namespace std'])
-fi])# PGAC_CXX_NAMESPACE_STD
diff --git a/config/docbook.m4 b/config/docbook.m4
deleted file mode 100644
index b0b6ce0238..0000000000
--- a/config/docbook.m4
+++ /dev/null
@@ -1,93 +0,0 @@
-# $Header: /cvsroot/pgsql/config/docbook.m4,v 1.3 2002/04/14 17:23:20 petere Exp $
-
-# PGAC_PROG_JADE
-# --------------
-AC_DEFUN([PGAC_PROG_JADE],
-[AC_CHECK_PROGS([JADE], [openjade jade])])
-
-
-# PGAC_PROG_NSGMLS
-# ----------------
-AC_DEFUN([PGAC_PROG_NSGMLS],
-[AC_CHECK_PROGS([NSGMLS], [onsgmls nsgmls])])
-
-
-# PGAC_CHECK_DOCBOOK(VERSION)
-# ---------------------------
-AC_DEFUN([PGAC_CHECK_DOCBOOK],
-[AC_REQUIRE([PGAC_PROG_NSGMLS])
-AC_CACHE_CHECK([for DocBook V$1], [pgac_cv_check_docbook],
-[cat >conftest.sgml <<EOF
-<!doctype book PUBLIC "-//OASIS//DTD DocBook V$1//EN">
-<book>
- <title>test</title>
- <chapter>
-  <title>random</title>
-   <sect1>
-    <title>testsect</title>
-    <para>text</para>
-  </sect1>
- </chapter>
-</book>
-EOF
-
-${NSGMLS-false} -s conftest.sgml 1>&AS_MESSAGE_LOG_FD 2>&1
-if test $? -eq 0; then
-  pgac_cv_check_docbook=yes
-else
-  pgac_cv_check_docbook=no
-fi
-rm -f conftest.sgml])
-
-have_docbook=$pgac_cv_check_docbook
-AC_SUBST([have_docbook])
-])# PGAC_CHECK_DOCBOOK
-
-
-# PGAC_PATH_DOCBOOK_STYLESHEETS
-# -----------------------------
-AC_DEFUN([PGAC_PATH_DOCBOOK_STYLESHEETS],
-[AC_ARG_VAR(DOCBOOKSTYLE, [location of DocBook stylesheets])dnl
-AC_MSG_CHECKING([for DocBook stylesheets])
-AC_CACHE_VAL([pgac_cv_path_stylesheets],
-[if test -n "$DOCBOOKSTYLE"; then
-  pgac_cv_path_stylesheets=$DOCBOOKSTYLE
-else
-  for pgac_prefix in /usr /usr/local /opt; do
-    for pgac_infix in share lib; do
-      for pgac_postfix in \
-        sgml/stylesheets/nwalsh-modular \
-        sgml/stylesheets/docbook \
-        sgml/docbook/dsssl/modular \
-        sgml/docbook/dsssl-stylesheets
-      do
-        pgac_candidate=$pgac_prefix/$pgac_infix/$pgac_postfix
-        if test -r "$pgac_candidate/html/docbook.dsl" \
-           && test -r "$pgac_candidate/print/docbook.dsl"
-        then
-          pgac_cv_path_stylesheets=$pgac_candidate
-          break 3
-        fi
-      done
-    done
-  done
-fi])
-DOCBOOKSTYLE=$pgac_cv_path_stylesheets
-AC_SUBST([DOCBOOKSTYLE])
-if test -n "$DOCBOOKSTYLE"; then
-  AC_MSG_RESULT([$DOCBOOKSTYLE])
-else
-  AC_MSG_RESULT(no)
-fi])# PGAC_PATH_DOCBOOK_STYLESHEETS
-
-
-# PGAC_PATH_COLLATEINDEX
-# ----------------------
-AC_DEFUN([PGAC_PATH_COLLATEINDEX],
-[AC_REQUIRE([PGAC_PATH_DOCBOOK_STYLESHEETS])dnl
-if test -n "$DOCBOOKSTYLE"; then
-  AC_PATH_PROGS(COLLATEINDEX, collateindex.pl, [],
-                [$DOCBOOKSTYLE/bin $PATH])
-else
-  AC_PATH_PROGS(COLLATEINDEX, collateindex.pl)
-fi])# PGAC_PATH_COLLATEINDEX
diff --git a/config/general.m4 b/config/general.m4
deleted file mode 100644
index 1a0a60dd60..0000000000
--- a/config/general.m4
+++ /dev/null
@@ -1,135 +0,0 @@
-# $Header: /cvsroot/pgsql/config/general.m4,v 1.2 2002/03/29 17:32:53 petere Exp $
-
-# This file defines new macros to process configure command line
-# arguments, to replace the brain-dead AC_ARG_WITH and AC_ARG_ENABLE.
-# The flaw in these is particularly that they only differentiate
-# between "given" and "not given" and do not provide enough help to
-# process arguments that only accept "yes/no", that require an
-# argument (other than "yes/no"), etc.
-#
-# The point of this implementation is to reduce code size and
-# redundancy in configure.in and to improve robustness and consistency
-# in the option evaluation code.
-
-
-# Convert type and name to shell variable name (e.g., "enable_long_strings")
-m4_define([pgac_arg_to_variable],
-          [$1[]_[]patsubst($2, -, _)])
-
-
-# PGAC_ARG(TYPE, NAME, HELP-STRING,
-#          [ACTION-IF-YES], [ACTION-IF-NO], [ACTION-IF-ARG],
-#          [ACTION-IF-OMITTED])
-# ----------------------------------------------------------
-# This is the base layer. TYPE is either "with" or "enable", depending
-# on what you like. NAME is the rest of the option name, HELP-STRING
-# as usual. ACTION-IF-YES is executed if the option is given without
-# and argument (or "yes", which is the same); similar for ACTION-IF-NO.
-
-AC_DEFUN([PGAC_ARG],
-[
-m4_case([$1],
-
-enable, [
-AC_ARG_ENABLE([$2], [$3], [
-  case [$]enableval in
-    yes)
-      m4_default([$4], :)
-      ;;
-    no)
-      m4_default([$5], :)
-      ;;
-    *)
-      $6
-      ;;
-  esac
-],
-[$7])[]dnl AC_ARG_ENABLE
-],
-
-with, [
-AC_ARG_WITH([$2], [$3], [
-  case [$]withval in
-    yes)
-      m4_default([$4], :)
-      ;;
-    no)
-      m4_default([$5], :)
-      ;;
-    *)
-      $6
-      ;;
-  esac
-],
-[$7])[]dnl AC_ARG_WITH
-],
-
-[m4_fatal([first argument of $0 must be 'enable' or 'with', not '$1'])]
-)
-])# PGAC_ARG
-
-
-# PGAC_ARG_BOOL(TYPE, NAME, DEFAULT, HELP-STRING, 
-#               [ACTION-IF-YES], [ACTION-IF-NO])
-# -----------------------------------------------
-# Accept a boolean option, that is, one that only takes yes or no.
-# ("no" is equivalent to "disable" or "without"). DEFAULT is what
-# should be done if the option is omitted; it should be "yes" or "no".
-# (Consequently, one of ACTION-IF-YES and ACTION-IF-NO will always
-# execute.)
-
-AC_DEFUN([PGAC_ARG_BOOL],
-[PGAC_ARG([$1], [$2], [$4], [$5], [$6], 
-          [AC_MSG_ERROR([no argument expected for --$1-$2 option])],
-          [m4_case([$3],
-                   yes, [pgac_arg_to_variable([$1], [$2])=yes
-$5],
-                   no,  [pgac_arg_to_variable([$1], [$2])=no
-$6],
-                   [m4_fatal([third argument of $0 must be 'yes' or 'no', not '$3'])])])[]dnl
-])# PGAC_ARG_BOOL
-
-
-# PGAC_ARG_REQ(TYPE, NAME, HELP-STRING, [ACTION-IF-GIVEN], [ACTION-IF-NOT-GIVEN])
-# -------------------------------------------------------------------------------
-# This option will require an argument; "yes" or "no" will not be
-# accepted.
-
-AC_DEFUN([PGAC_ARG_REQ],
-[PGAC_ARG([$1], [$2], [$3],
-          [AC_MSG_ERROR([argument required for --$1-$2 option])],
-          [AC_MSG_ERROR([argument required for --$1-$2 option])],
-          [$4],
-          [$5])])# PGAC_ARG_REQ
-
-
-# PGAC_ARG_OPTARG(TYPE, NAME, HELP-STRING, [DEFAULT-ACTION], [ARG-ACTION]
-#                 [ACTION-ENABLED], [ACTION-DISABLED])
-# -----------------------------------------------------------------------
-# This will create an option that behaves as follows: If omitted, or
-# called with "no", then set the enable_variable to "no" and do
-# nothing else. If called with "yes", then execute DEFAULT-ACTION. If
-# called with argument, set enable_variable to "yes" and execute
-# ARG-ACTION. Additionally, execute ACTION-ENABLED if we ended up with
-# "yes" either way, else ACTION-DISABLED.
-#
-# The intent is to allow enabling a feature, and optionally pass an
-# additional piece of information.
-
-AC_DEFUN([PGAC_ARG_OPTARG],
-[PGAC_ARG([$1], [$2], [$3], [$4], [],
-          [pgac_arg_to_variable([$1], [$2])=yes
-$5],
-          [pgac_arg_to_variable([$1], [$2])=no])
-dnl Add this code only if there's a ACTION-ENABLED or ACTION-DISABLED.
-m4_ifval([$6[]$7],
-[
-if test "[$]pgac_arg_to_variable([$1], [$2])" = yes; then
-  m4_default([$6], :)
-m4_ifval([$7],
-[else
-  $7
-])[]dnl
-fi
-])[]dnl
-])# PGAC_ARG_OPTARG
diff --git a/config/install-sh b/config/install-sh
deleted file mode 100755
index ebc66913e9..0000000000
--- a/config/install-sh
+++ /dev/null
@@ -1,250 +0,0 @@
-#! /bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
diff --git a/config/java.m4 b/config/java.m4
deleted file mode 100644
index 2f7de3a42a..0000000000
--- a/config/java.m4
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Autoconf macros for configuring the build of Java JDBC Tools
-#
-# $Header: /cvsroot/pgsql/config/Attic/java.m4,v 1.4 2002/03/29 17:32:54 petere Exp $
-#
-
-
-# _PGAC_PROG_ANT_WORKS
-# --------------------
-AC_DEFUN([_PGAC_PROG_ANT_WORKS],
-[
-  AC_CACHE_CHECK([whether $ANT works], [pgac_cv_prog_ant_works],
-  [
-    cat > conftest.java << EOF
-public class conftest {
-    int testmethod(int a, int b) {
-        return a + b;
-    }
-}
-EOF
-
-    cat > conftest.xml << EOF
-<project name="conftest" default="conftest">
- <target name="conftest">
-  <javac srcdir="." includes="conftest.java">
-  </javac>
- </target>
-</project>
-EOF
-
-    pgac_cmd='$ANT -buildfile conftest.xml 1>&2'
-    AC_TRY_EVAL(pgac_cmd)
-    pgac_save_status=$?
-    if test $? = 0 && test -f ./conftest.class ; then
-      pgac_cv_prog_ant_works=yes
-    else
-      echo "configure: failed java program was:" >&AS_MESSAGE_LOG_FD
-      cat conftest.java >&AS_MESSAGE_LOG_FD
-      echo "configure: failed build file was:" >&AS_MESSAGE_LOG_FD
-      cat conftest.xml >&AS_MESSAGE_LOG_FD
-      pgac_cv_prog_ant_works=no
-    fi
-
-    rm -f conftest* core core.* *.core
-  ])
-
-  if test "$pgac_cv_prog_ant_works" != yes; then
-    AC_MSG_ERROR([ant does not work])
-  fi
-])
-
-
-# PGAC_PATH_ANT
-# -------------
-# Look for the ANT tool and set the output variable 'ANT' to 'ant'
-# if found, empty otherwise
-AC_DEFUN([PGAC_PATH_ANT],
-[
-  AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat])
-  _PGAC_PROG_ANT_WORKS
-])
diff --git a/config/libtool.m4 b/config/libtool.m4
deleted file mode 100644
index 798420d5bc..0000000000
--- a/config/libtool.m4
+++ /dev/null
@@ -1,119 +0,0 @@
-## libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
-## Copyright (C) 1996-1999,2000 Free Software Foundation, Inc.
-## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-##
-## As a special exception to the GNU General Public License, if you
-## distribute this file as part of a program that contains a
-## configuration script generated by Autoconf, you may include it under
-## the same distribution terms that you use for the rest of that program.
-
-# No, PostgreSQL doesn't use libtool (yet), we just borrow stuff from it.
-# This file was taken on 2000-10-20 from the multi-language branch (since
-# that is the branch that PostgreSQL would most likely adopt anyway).
-# --petere
-
-# ... bunch of stuff removed here ...
-
-# AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-dnl ###not for PostgreSQL### AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case "$ac_prog" in
-    # Accept absolute paths.
-changequote(,)dnl
-    [\\/]* | [A-Za-z]:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-changequote([,])dnl
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(ac_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      ac_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  ac_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$ac_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])
-
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  ac_cv_prog_gnu_ld=yes
-else
-  ac_cv_prog_gnu_ld=no
-fi])
-with_gnu_ld=$ac_cv_prog_gnu_ld
-])
-
-# ... more stuff removed ...
diff --git a/config/missing b/config/missing
deleted file mode 100755
index 29865631d5..0000000000
--- a/config/missing
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-
-# This is *not* the GNU `missing' script, although it is similar in
-# concept. You can call it from the makefiles to get consistent
-# behavior when certain utility programs are missing.
-
-case $1 in
-    flex|bison)
-        # `missing flex|bison <input> <output>'
-        input=$2
-        output=$3
-        if test -f "$output"; then
-            echo "\
-***
-WARNING: \`$1' is missing on your system. You should only need it
-if you changed the file \`$input'; these changes will not take effect.
-You can get $1 from a GNU mirror site.
-***"
-            echo "touch $output"
-            touch "$output"
-            exit 0
-        else # ! test -f $output
-            echo "\
-***
-ERROR: \`$1' is missing on your system. It is needed to create the
-file \`$output'. You can either get $1 from a GNU mirror site
-or download an official distribution of PostgreSQL, which contains
-pre-packaged $1 output.
-***"
-            exit 1
-        fi
-        ;;
-esac
diff --git a/config/mkinstalldirs b/config/mkinstalldirs
deleted file mode 100755
index cc8783edce..0000000000
--- a/config/mkinstalldirs
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Last modified: 1994-03-25
-# Public domain
-
-errstatus=0
-
-for file in ${1+"$@"} ; do 
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d in ${1+"$@"} ; do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp" 1>&2
-        mkdir "$pathcomp" > /dev/null 2>&1 || lasterr=$?
-     fi
-
-     if test ! -d "$pathcomp"; then
-	errstatus=$lasterr
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here
diff --git a/config/perl.m4 b/config/perl.m4
deleted file mode 100644
index dc134acc22..0000000000
--- a/config/perl.m4
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Header: /cvsroot/pgsql/config/perl.m4,v 1.2 2002/05/28 16:57:53 petere Exp $
-
-
-# PGAC_PATH_PERL
-# --------------
-AC_DEFUN([PGAC_PATH_PERL],
-[AC_PATH_PROG(PERL, perl)])
-
-
-# PGAC_CHECK_PERL_CONFIG(NAME)
-# ----------------------------
-AC_DEFUN([PGAC_CHECK_PERL_CONFIG],
-[AC_REQUIRE([PGAC_PATH_PERL])
-AC_MSG_CHECKING([for Perl $1])
-perl_$1=`$PERL -MConfig -e 'print $Config{$1}'`
-AC_SUBST(perl_$1)dnl
-AC_MSG_RESULT([$perl_$1])])
-
-
-# PGAC_CHECK_PERL_CONFIGS(NAMES)
-# ------------------------------
-AC_DEFUN([PGAC_CHECK_PERL_CONFIGS],
-[m4_foreach([pgac_item], [$1], [PGAC_CHECK_PERL_CONFIG(pgac_item)])])
-
-
-# PGAC_CHECK_PERL_EMBED_LDFLAGS
-# -----------------------------
-AC_DEFUN([PGAC_CHECK_PERL_EMBED_LDFLAGS],
-[AC_REQUIRE([PGAC_PATH_PERL])
-AC_MSG_CHECKING(for flags to link embedded Perl)
-pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
-pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
-perl_embed_ldflags=`echo X"$pgac_tmp1" | sed "s/^X//;s%$pgac_tmp2%%"`
-AC_SUBST(perl_embed_ldflags)dnl
-AC_MSG_RESULT([$perl_embed_ldflags])])
diff --git a/config/prep_buildtree b/config/prep_buildtree
deleted file mode 100644
index 57d7719673..0000000000
--- a/config/prep_buildtree
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-
-# This script prepares a PostgreSQL build tree.  It is intended
-# to be run by the configure script.
-
-me=`basename $0`
-
-help="\
-Usage: $me sourcetree [buildtree]"
-
-if test -z "$1"; then
-    echo "$help" 1>&2
-    exit 1
-elif test x"$1" = x"--help"; then
-    echo "$help"
-    exit 0
-fi
-
-unset CDPATH
-
-sourcetree=`cd $1 && pwd`
-
-buildtree=`cd ${2:-'.'} && pwd`
-
-for item in `find "$sourcetree" -type d \( -name CVS -prune -o -print \)`; do
-    subdir=`expr "$item" : "$sourcetree\(.*\)"`
-    if test ! -d "$buildtree/$subdir"; then
-        mkdir -p "$buildtree/$subdir" || exit 1
-    fi
-done
-
-for item in `find "$sourcetree" -name Makefile -print -o -name GNUmakefile -print`; do
-    filename=`expr "$item" : "$sourcetree\(.*\)"`
-    if test ! -f "${item}.in"; then
-        if cmp "$item" "$buildtree/$filename" >/dev/null 2>&1; then : ; else
-            ln -fs "$item" "$buildtree/$filename" || exit 1
-        fi
-    fi
-done
-
-exit 0
diff --git a/config/programs.m4 b/config/programs.m4
deleted file mode 100644
index 371b21b918..0000000000
--- a/config/programs.m4
+++ /dev/null
@@ -1,192 +0,0 @@
-# $Header: /cvsroot/pgsql/config/programs.m4,v 1.10 2002/04/10 22:46:33 petere Exp $
-
-
-# PGAC_PATH_FLEX
-# --------------
-# Look for Flex, set the output variable FLEX to its path if found.
-# Avoid the buggy version 2.5.3. Also find Flex if its installed
-# under `lex', but do not accept other Lex programs.
-
-AC_DEFUN([PGAC_PATH_FLEX],
-[AC_CACHE_CHECK([for flex], pgac_cv_path_flex,
-[# Let the user override the test
-if test -n "$FLEX"; then
-  pgac_cv_path_flex=$FLEX
-else
-  pgac_save_IFS=$IFS
-  IFS=:
-  for pgac_dir in $PATH; do
-    if test -z "$pgac_dir" || test x"$pgac_dir" = x"."; then
-      pgac_dir=`pwd`
-    fi
-    for pgac_prog in flex lex; do
-      pgac_candidate="$pgac_dir/$pgac_prog"
-      if test -f "$pgac_candidate" \
-        && $pgac_candidate --version </dev/null >/dev/null 2>&1
-      then
-        echo '%%'  > conftest.l
-        if $pgac_candidate -t conftest.l 2>/dev/null | grep FLEX_SCANNER >/dev/null 2>&1; then
-          if $pgac_candidate --version | grep '2\.5\.3' >/dev/null 2>&1; then
-            pgac_broken_flex=$pgac_candidate
-            continue
-          fi
-
-          pgac_cv_path_flex=$pgac_candidate
-          break 2
-        fi
-      fi
-    done
-  done
-  IFS=$pgac_save_IFS
-  rm -f conftest.l
-  : ${pgac_cv_path_flex=no}
-fi
-])[]dnl AC_CACHE_CHECK
-
-if test x"$pgac_cv_path_flex" = x"no"; then
-  if test -n "$pgac_broken_flex"; then
-    AC_MSG_WARN([
-*** The Flex version 2.5.3 you have at $pgac_broken_flex contains a bug. You
-*** should get version 2.5.4 or later.])
-  fi
-
-  AC_MSG_WARN([
-*** Without Flex you will not be able to build PostgreSQL from CVS or
-*** change any of the scanner definition files.  You can obtain Flex from
-*** a GNU mirror site.  (If you are using the official distribution of
-*** PostgreSQL then you do not need to worry about this because the Flex
-*** output is pre-generated.)])
-fi
-
-if test x"$pgac_cv_path_flex" = x"no"; then
-  FLEX=
-else
-  FLEX=$pgac_cv_path_flex
-fi
-
-AC_SUBST(FLEX)
-AC_SUBST(FLEXFLAGS)
-])# PGAC_PATH_FLEX
-
-
-
-# PGAC_CHECK_READLINE
-# -------------------
-# Check for the readline library and dependent libraries, either
-# termcap or curses.  Also try libedit, since NetBSD's is compatible.
-# Add the required flags to LIBS, define HAVE_LIBREADLINE.
-
-AC_DEFUN([PGAC_CHECK_READLINE],
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_MSG_CHECKING([for readline])
-
-AC_CACHE_VAL([pgac_cv_check_readline],
-[pgac_cv_check_readline=no
-for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do
-  for pgac_rllib in -lreadline -ledit ; do
-    pgac_save_LIBS=$LIBS
-    LIBS="${pgac_rllib}${pgac_lib} $LIBS"
-    AC_TRY_LINK_FUNC([readline], [[
-      # NetBSD and OpenBSD have a broken linker that does not
-      # recognize dependent libraries
-      case $host_os in netbsd* | openbsd* )
-        case $pgac_lib in
-          *curses*) ;;
-          *) pgac_lib=" -lcurses" ;;
-        esac
-      esac
-
-      pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"
-      break 2
-    ]])
-    LIBS=$pgac_save_LIBS
-  done
-done
-LIBS=$pgac_save_LIBS
-])[]dnl AC_CACHE_VAL
-
-if test "$pgac_cv_check_readline" != no ; then
-  AC_DEFINE(HAVE_LIBREADLINE, 1, [Define if you have a function readline library])
-  LIBS="$pgac_cv_check_readline $LIBS"
-  AC_MSG_RESULT([yes ($pgac_cv_check_readline)])
-else
-  AC_MSG_RESULT(no)
-fi])# PGAC_CHECK_READLINE
-
-
-
-# PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER
-# ---------------------------------------
-# Readline versions < 2.1 don't have rl_completion_append_character
-
-AC_DEFUN([PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER],
-[AC_MSG_CHECKING([for rl_completion_append_character])
-AC_TRY_LINK([#include <stdio.h>
-#ifdef HAVE_READLINE_READLINE_H
-# include <readline/readline.h>
-#elif defined(HAVE_READLINE_H)
-# include <readline.h>
-#endif
-],
-[rl_completion_append_character = 'x';],
-[AC_MSG_RESULT(yes)
-AC_DEFINE(HAVE_RL_COMPLETION_APPEND_CHARACTER, 1,
-          [Define if you have rl_completion_append_character])],
-[AC_MSG_RESULT(no)])])# PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER
-
-
-
-# PGAC_CHECK_GETTEXT
-# ------------------
-
-AC_DEFUN([PGAC_CHECK_GETTEXT],
-[
-  AC_SEARCH_LIBS(gettext, intl, [],
-                 [AC_MSG_ERROR([a gettext implementation is required for NLS])])
-  AC_CHECK_HEADER([libintl.h], [],
-                  [AC_MSG_ERROR([header file <libintl.h> is required for NLS])])
-  AC_CHECK_PROGS(MSGFMT, msgfmt)
-  if test -z "$MSGFMT"; then
-    AC_MSG_ERROR([msgfmt is required for NLS])
-  fi
-  AC_CHECK_PROGS(MSGMERGE, msgmerge)
-dnl FIXME: We should probably check for version >=0.10.36.
-  AC_CHECK_PROGS(XGETTEXT, xgettext)
-
-  # Note: share/locale is always the default, independent of $datadir
-  localedir='${prefix}/share/locale'
-  if test x"$prefix" = x"NONE"; then
-    exp_localedir="$ac_default_prefix/share/locale"
-  else
-    exp_localedir="$prefix/share/locale"
-  fi
-
-  AC_SUBST(localedir)
-  AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"],
-                     [location of locale files])
-])# PGAC_CHECK_GETTEXT
-
-
-
-# PGAC_CHECK_STRIP
-# ----------------
-# Check for a 'strip' program, and figure out if that program can
-# strip libraries.
-
-AC_DEFUN([PGAC_CHECK_STRIP],
-[
-  AC_CHECK_TOOL(STRIP, strip, :)
-
-  AC_MSG_CHECKING([whether it is possible to strip libraries])
-  if test x"$STRIP" != x"" && "$STRIP" -V 2>&1 | grep "GNU strip" >/dev/null; then
-    STRIP_STATIC_LIB="$STRIP -x"
-    STRIP_SHARED_LIB="$STRIP --strip-unneeded"
-    AC_MSG_RESULT(yes)
-  else
-    STRIP_STATIC_LIB=:
-    STRIP_SHARED_LIB=:
-    AC_MSG_RESULT(no)
-  fi
-  AC_SUBST(STRIP_STATIC_LIB)
-  AC_SUBST(STRIP_SHARED_LIB)
-])# PGAC_CHECK_STRIP
diff --git a/config/python.m4 b/config/python.m4
deleted file mode 100644
index 6058ef3d2a..0000000000
--- a/config/python.m4
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Autoconf macros for configuring the build of Python extension modules
-#
-# $Header: /cvsroot/pgsql/config/python.m4,v 1.4 2002/03/29 17:32:54 petere Exp $
-#
-
-# PGAC_PATH_PYTHON
-# ----------------
-# Look for Python and set the output variable 'PYTHON'
-# to 'python' if found, empty otherwise.
-AC_DEFUN([PGAC_PATH_PYTHON],
-[AC_PATH_PROG(PYTHON, python)
-if test x"$PYTHON" = x""; then
-  AC_MSG_ERROR([Python not found])
-fi
-])
-
-
-# _PGAC_CHECK_PYTHON_DIRS
-# -----------------------
-# Determine the name of various directory of a given Python installation.
-AC_DEFUN([_PGAC_CHECK_PYTHON_DIRS],
-[AC_REQUIRE([PGAC_PATH_PYTHON])
-AC_MSG_CHECKING([Python installation directories])
-python_version=`${PYTHON} -c "import sys; print sys.version[[:3]]"`
-python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
-python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
-python_configdir="${python_execprefix}/lib/python${python_version}/config"
-python_moduledir="${python_prefix}/lib/python${python_version}/site-packages"
-python_moduleexecdir="${python_execprefix}/lib/python${python_version}/site-packages"
-python_includespec="-I${python_prefix}/include/python${python_version}"
-if test "$python_prefix" != "$python_execprefix"; then
-  python_includespec="-I${python_execprefix}/include/python${python_version} $python_includespec"
-fi
-
-AC_SUBST(python_version)[]dnl
-AC_SUBST(python_prefix)[]dnl
-AC_SUBST(python_execprefix)[]dnl
-AC_SUBST(python_configdir)[]dnl
-AC_SUBST(python_moduledir)[]dnl
-AC_SUBST(python_moduleexecdir)[]dnl
-AC_SUBST(python_includespec)[]dnl
-# This should be enough of a message.
-if test "$python_prefix" != "$python_execprefix"; then
-  AC_MSG_RESULT([$python_prefix/lib/python${python_version} and $python_execprefix/lib/python${python_version}])
-else
-  AC_MSG_RESULT([$python_prefix/lib/python${python_version}])
-fi
-])# _PGAC_CHECK_PYTHON_DIRS
-
-
-# PGAC_CHECK_PYTHON_MODULE_SETUP
-# ------------------------------
-# Finds things required to build a Python extension module.
-# This used to do more, that's why it's separate.
-#
-# It would be nice if we could check whether the current setup allows
-# the build of the shared module. Future project.
-AC_DEFUN([PGAC_CHECK_PYTHON_MODULE_SETUP],
-[
-  AC_REQUIRE([_PGAC_CHECK_PYTHON_DIRS])
-])# PGAC_CHECK_PYTHON_MODULE_SETUP
-
-
-# PGAC_CHECK_PYTHON_EMBED_SETUP
-# -----------------------------
-# Courtesy of the INN 2.3.1 package...
-AC_DEFUN([PGAC_CHECK_PYTHON_EMBED_SETUP],
-[AC_REQUIRE([_PGAC_CHECK_PYTHON_DIRS])
-AC_MSG_CHECKING([how to link an embedded Python application])
-
-_python_libs=`grep '^LIBS=' $python_configdir/Makefile | sed 's/^.*=//'`
-_python_libc=`grep '^LIBC=' $python_configdir/Makefile | sed 's/^.*=//'`
-_python_libm=`grep '^LIBM=' $python_configdir/Makefile | sed 's/^.*=//'`
-_python_liblocalmod=`grep '^LOCALMODLIBS=' $python_configdir/Makefile | sed 's/^.*=//'`
-_python_libbasemod=`grep '^BASEMODLIBS=' $python_configdir/Makefile | sed 's/^.*=//'`
-
-pgac_tab="	" # tab character
-python_libspec=`echo X"-L$python_configdir $_python_libs $_python_libc $_python_libm -lpython$python_version $_python_liblocalmod $_python_libbasemod" | sed -e 's/^X//' -e "s/[[ $pgac_tab]][[ $pgac_tab]]*/ /g"`
-
-AC_MSG_RESULT([${python_libspec}])
-
-AC_SUBST(python_libspec)[]dnl
-])# PGAC_CHECK_PYTHON_EMBED_SETUP
diff --git a/config/tcl.m4 b/config/tcl.m4
deleted file mode 100644
index d3407c924f..0000000000
--- a/config/tcl.m4
+++ /dev/null
@@ -1,89 +0,0 @@
-# $Header: /cvsroot/pgsql/config/tcl.m4,v 1.4 2002/05/24 18:10:17 petere Exp $
-
-# Autoconf macros to check for Tcl related things
-
-
-AC_DEFUN([PGAC_PATH_TCLSH],
-         [AC_PATH_PROGS(TCLSH, [tclsh tcl])])
-
-
-# PGAC_PATH_TCLCONFIGSH([SEARCH-PATH])
-# ------------------------------------
-AC_DEFUN([PGAC_PATH_TCLCONFIGSH],
-[AC_REQUIRE([PGAC_PATH_TCLSH])[]dnl
-AC_BEFORE([$0], [PGAC_PATH_TKCONFIGSH])[]dnl
-AC_MSG_CHECKING([for tclConfig.sh])
-# Let user override test
-if test -z "$TCL_CONFIG_SH"; then
-    pgac_test_dirs="$1"
-
-    set X $pgac_test_dirs; shift
-    if test $[#] -eq 0; then
-        test -z "$TCLSH" && AC_MSG_ERROR([unable to locate tclConfig.sh because no Tcl shell was found])
-        set X `echo 'puts $auto_path' | $TCLSH`; shift
-    fi
-
-    for pgac_dir do
-        if test -r "$pgac_dir/tclConfig.sh"; then
-            TCL_CONFIG_SH=$pgac_dir/tclConfig.sh
-            break
-        fi
-    done
-fi
-
-if test -z "$TCL_CONFIG_SH"; then
-    AC_MSG_RESULT(no)
-    AC_MSG_ERROR([file 'tclConfig.sh' is required for Tcl])
-else
-    AC_MSG_RESULT([$TCL_CONFIG_SH])
-fi
-
-AC_SUBST([TCL_CONFIG_SH])
-])# PGAC_PATH_TCLCONFIGSH
-
-
-# PGAC_PATH_TKCONFIGSH([SEARCH-PATH])
-# ------------------------------------
-AC_DEFUN([PGAC_PATH_TKCONFIGSH],
-[AC_REQUIRE([PGAC_PATH_TCLSH])[]dnl
-AC_MSG_CHECKING([for tkConfig.sh])
-# Let user override test
-if test -z "$TK_CONFIG_SH"; then
-    pgac_test_dirs="$1"
-
-    set X $pgac_test_dirs; shift
-    if test $[#] -eq 0; then
-        test -z "$TCLSH" && AC_MSG_ERROR([unable to locate tkConfig.sh because no Tcl shell was found])
-        set X `echo 'puts $auto_path' | $TCLSH`; shift
-    fi
-
-    for pgac_dir do
-        if test -r "$pgac_dir/tkConfig.sh"; then
-            TK_CONFIG_SH=$pgac_dir/tkConfig.sh
-            break
-        fi
-    done
-fi
-
-if test -z "$TK_CONFIG_SH"; then
-    AC_MSG_RESULT(no)
-    AC_MSG_ERROR([file 'tkConfig.sh' is required for Tk])
-else
-    AC_MSG_RESULT([$TK_CONFIG_SH])
-fi
-
-AC_SUBST([TK_CONFIG_SH])
-])# PGAC_PATH_TKCONFIGSH
-
-
-# PGAC_EVAL_TCLCONFIGSH(FILE, WANTED-VARS)
-# ----------------------------------------
-# Assigns variables listed in WANTED-VARS by reading FILE and
-# evaluating it according to the quoting scheme of tclConfig.sh and
-# tkConfig.sh.  Calls AC_SUBST for each variable.
-
-AC_DEFUN([PGAC_EVAL_TCLCONFIGSH],
-[. "$1"
-m4_foreach([pgac_item], [$2],
-[eval pgac_item=\"[$]pgac_item\"
-AC_SUBST(pgac_item)])])
diff --git a/configure b/configure
deleted file mode 100755
index 19c0cd9faf..0000000000
--- a/configure
+++ /dev/null
@@ -1,18038 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53 for PostgreSQL 7.3devel.
-#
-# Report bugs to <pgsql-bugs@postgresql.org>.
-#
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-#
-# Copyright 2002 PostgreSQL Global Development Group
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-
-# NLS nuisances.
-# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
-    { $as_unset LANG || test "${LANG+set}" != set; } ||
-      { LANG=C; export LANG; }
-(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
-    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
-      { LC_ALL=C; export LC_ALL; }
-(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
-    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
-      { LC_TIME=C; export LC_TIME; }
-(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
-    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
-      { LC_CTYPE=C; export LC_CTYPE; }
-(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
-    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
-      { LANGUAGE=C; export LANGUAGE; }
-(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
-    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
-      { LC_COLLATE=C; export LC_COLLATE; }
-(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
-    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
-      { LC_NUMERIC=C; export LC_NUMERIC; }
-(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
-    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
-      { LC_MESSAGES=C; export LC_MESSAGES; }
-
-
-# Name of the executable.
-as_me=`(basename "$0") 2>/dev/null ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conftest.sh
-  echo  "exit 0"   >>conftest.sh
-  chmod +x conftest.sh
-  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conftest.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME='PostgreSQL'
-PACKAGE_TARNAME='postgresql'
-PACKAGE_VERSION='7.3devel'
-PACKAGE_STRING='PostgreSQL 7.3devel'
-PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
-
-ac_unique_file="src/backend/access/common/heaptuple.c"
-ac_default_prefix=/usr/local/pgsql
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#if HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# if HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#if HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${prefix}/doc'
-mandir='${prefix}/man'
-
-ac_prev=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_option in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_$ac_feature='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -docdir | --docdir | --infodi | --infod | --doc | --inf)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --infodi=* | --infod=* | --doc=* | --inf=*)
-    docdir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_$ac_package=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-              localstatedir libdir includedir oldincludedir docdir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$0" : 'X\(//\)[^/]' \| \
-         X"$0" : 'X\(//\)$' \| \
-         X"$0" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
-ac_env_CXX_set=${CXX+set}
-ac_env_CXX_value=$CXX
-ac_cv_env_CXX_set=${CXX+set}
-ac_cv_env_CXX_value=$CXX
-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_env_CXXFLAGS_value=$CXXFLAGS
-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
-ac_env_CXXCPP_set=${CXXCPP+set}
-ac_env_CXXCPP_value=$CXXCPP
-ac_cv_env_CXXCPP_set=${CXXCPP+set}
-ac_cv_env_CXXCPP_value=$CXXCPP
-ac_env_DOCBOOKSTYLE_set=${DOCBOOKSTYLE+set}
-ac_env_DOCBOOKSTYLE_value=$DOCBOOKSTYLE
-ac_cv_env_DOCBOOKSTYLE_set=${DOCBOOKSTYLE+set}
-ac_cv_env_DOCBOOKSTYLE_value=$DOCBOOKSTYLE
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures PostgreSQL 7.3devel to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of PostgreSQL 7.3devel:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-integer-datetimes  enable 64-bit integer date/time support
-  --enable-recode         enable character set recode support
-  --enable-nls[=LANGUAGES]  enable Native Language Support
-  --disable-shared        do not build shared libraries
-  --disable-rpath         do not embed shared library search path in executables
-  --enable-debug          build with debugging symbols (-g)
-  --enable-depend         turn on automatic dependency tracking
-  --enable-cassert        enable assertion checks (for debugging)
-  --enable-odbc           build the ODBC driver package
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-
-  --with-includes=DIRS    look for additional header files in DIRS
-  --with-libraries=DIRS   look for additional libraries in DIRS
-  --with-libs=DIRS        alternative spelling of --with-libraries
-  --with-pgport=PORTNUM   change default port number 5432
-  --with-maxbackends=N    set default maximum number of connections 32
-  --with-tcl              build Tcl and Tk interfaces
-  --without-tk            do not build Tk interfaces if Tcl is enabled
-  --with-tclconfig=DIR    tclConfig.sh and tkConfig.sh are in DIR
-  --with-tkconfig=DIR     tkConfig.sh is in DIR
-  --with-perl             build Perl interface and PL/Perl
-  --with-python           build Python interface module
-  --with-java             build JDBC interface and Java tools
-  --with-krb4[=DIR]       build with Kerberos 4 support [/usr/athena]
-  --with-krb5[=DIR]       build with Kerberos 5 support [/usr/athena]
-  --with-krb-srvnam=NAME  name of the service principal in Kerberos postgres
-  --with-pam              build with PAM support
-  --with-openssl[=DIR]    build with OpenSSL support [/usr/local/ssl]
-  --without-readline      do not use Readline
-  --without-zlib          do not use Zlib
-  --with-unixodbc         build ODBC driver for unixODBC
-  --with-iodbc            build ODBC driver for iODBC
-  --with-odbcinst=DIR     default directory for odbcinst.ini sysconfdir
-  --with-CXX              build C++ modules (libpq++)
-  --with-gnu-ld           assume the C compiler uses GNU ld default=no
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  CXXCPP      C++ preprocessor
-  DOCBOOKSTYLE
-              location of DocBook stylesheets
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to <pgsql-bugs@postgresql.org>.
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-           test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-PostgreSQL configure 7.3devel
-generated by GNU Autoconf 2.53
-
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-
-Copyright 2002 PostgreSQL Global Development Group
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by PostgreSQL $as_me 7.3devel, which was
-generated by GNU Autoconf 2.53.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell meta-characters.
-ac_configure_args=
-ac_sep=
-for ac_arg
-do
-  case $ac_arg in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n ) continue ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    continue ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-  esac
-  case " $ac_configure_args " in
-    *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-    *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-       ac_sep=" " ;;
-  esac
-  # Get rid of the leading space.
-done
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core core.* *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-        ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_aux_dir=
-for ac_dir in config $srcdir/config; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config $srcdir/config" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in config $srcdir/config" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-
-configure_args=$ac_configure_args
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define PG_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-
-template=
-echo "$as_me:$LINENO: checking which template to use" >&5
-echo $ECHO_N "checking which template to use... $ECHO_C" >&6
-
-
-
-
-# Check whether --with-template or --without-template was given.
-if test "${with_template+set}" = set; then
-  withval="$with_template"
-
-  case $withval in
-    yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-template option" >&5
-echo "$as_me: error: argument required for --with-template option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-    no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-template option" >&5
-echo "$as_me: error: argument required for --with-template option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-    *)
-
-  case $withval in
-    list)   echo; ls "$srcdir/src/template"; exit;;
-    *)      if test -f "$srcdir/src/template/$with_template" ; then
-              template=$withval
-            else
-              { { echo "$as_me:$LINENO: error: '$withval' is not a valid template name. Use 'list' for a list." >&5
-echo "$as_me: error: '$withval' is not a valid template name. Use 'list' for a list." >&2;}
-   { (exit 1); exit 1; }; }
-            fi;;
-  esac
-
-      ;;
-  esac
-
-else
-
-  # --with-template not given
-
-case $host_os in
-     aix*) template=aix ;;
-    beos*) template=beos ;;
-    bsdi*) template=bsdi ;;
-  cygwin*) template=win ;;
-  darwin*) template=darwin ;;
-    dgux*) template=dgux ;;
- freebsd*) template=freebsd ;;
-    hpux*) template=hpux ;;
-    irix*) template=irix5 ;;
-   linux*) template=linux ;;
-  netbsd*) template=netbsd ;;
-nextstep*) template=nextstep ;;
- openbsd*) template=openbsd ;;
-     osf*) template=osf ;;
-     qnx*) template=qnx4 ;;
-     sco*) template=sco ;;
- solaris*) template=solaris ;;
-   sunos*) template=sunos4 ;;
- sysv4.2*)
-        case $host_vendor in
-          univel) template=univel ;;
-        esac ;;
-   sysv4*) template=svr4 ;;
-   sysv5*) template=unixware ;;
-  ultrix*) template=ultrix4 ;;
-esac
-
-  if test x"$template" = x"" ; then
-    { { echo "$as_me:$LINENO: error:
-*******************************************************************
-PostgreSQL has apparently not been ported to your platform yet.
-To try a manual configuration, look into the src/template directory
-for a similar platform and use the '--with-template=' option.
-
-Please also contact <pgsql-ports@postgresql.org> to see about
-rectifying this.  Include the above 'checking host system type...'
-line.
-*******************************************************************
-" >&5
-echo "$as_me: error:
-*******************************************************************
-PostgreSQL has apparently not been ported to your platform yet.
-To try a manual configuration, look into the src/template directory
-for a similar platform and use the '--with-template=' option.
-
-Please also contact <pgsql-ports@postgresql.org> to see about
-rectifying this.  Include the above 'checking host system type...'
-line.
-*******************************************************************
-" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-
-
-fi;
-
-
-echo "$as_me:$LINENO: result: $template" >&5
-echo "${ECHO_T}$template" >&6
-
-PORTNAME=$template
-
-
-# Pick right test-and-set (TAS) code.  Most platforms have inline
-# assembler code in src/include/storage/s_lock.h, so we just use
-# a dummy file here.
-case $host in
-  *-*-hpux*)        need_tas=yes; tas_file=hpux.s ;;
-  sparc-*-solaris*) need_tas=yes; tas_file=solaris_sparc.s ;;
-  i?86-*-solaris*)   need_tas=yes; tas_file=solaris_i386.s ;;
-  *)                need_tas=no;  tas_file=dummy.s ;;
-esac
-ac_config_links="$ac_config_links src/backend/port/tas.s:src/backend/port/tas/${tas_file}"
-
-
-if test "$need_tas" = yes ; then
-  TAS=tas.o
-fi
-
-
-
-
-##
-## Command line options
-##
-
-
-#
-# Add non-standard directories to the include path
-#
-
-
-
-# Check whether --with-includes or --without-includes was given.
-if test "${with_includes+set}" = set; then
-  withval="$with_includes"
-
-  case $withval in
-    yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-includes option" >&5
-echo "$as_me: error: argument required for --with-includes option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-    no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-includes option" >&5
-echo "$as_me: error: argument required for --with-includes option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-    *)
-
-      ;;
-  esac
-
-fi;
-
-
-
-#
-# Add non-standard directories to the library search path
-#
-
-
-
-# Check whether --with-libraries or --without-libraries was given.
-if test "${with_libraries+set}" = set; then
-  withval="$with_libraries"
-
-  case $withval in
-    yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-libraries option" >&5
-echo "$as_me: error: argument required for --with-libraries option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-    no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-libraries option" >&5
-echo "$as_me: error: argument required for --with-libraries option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-    *)
-      LIBRARY_DIRS=$withval
-      ;;
-  esac
-
-fi;
-
-
-
-
-
-# Check whether --with-libs or --without-libs was given.
-if test "${with_libs+set}" = set; then
-  withval="$with_libs"
-
-  case $withval in
-    yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-libs option" >&5
-echo "$as_me: error: argument required for --with-libs option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-    no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-libs option" >&5
-echo "$as_me: error: argument required for --with-libs option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-    *)
-      LIBRARY_DIRS=$withval
-      ;;
-  esac
-
-fi;
-
-
-
-#
-# 64-bit integer date/time storage (--enable-integer-datetimes)
-#
-echo "$as_me:$LINENO: checking whether to build with 64-bit integer date/time support" >&5
-echo $ECHO_N "checking whether to build with 64-bit integer date/time support... $ECHO_C" >&6
-
-
-# Check whether --enable-integer-datetimes or --disable-integer-datetimes was given.
-if test "${enable_integer_datetimes+set}" = set; then
-  enableval="$enable_integer_datetimes"
-
-  case $enableval in
-    yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_INTEGER_DATETIMES 1
-_ACEOF
-
-      ;;
-    no)
-      :
-      ;;
-    *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-integer-datetimes option" >&5
-echo "$as_me: error: no argument expected for --enable-integer-datetimes option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-  esac
-
-else
-  enable_integer_datetimes=no
-
-fi;
-
-echo "$as_me:$LINENO: result: $enable_integer_datetimes" >&5
-echo "${ECHO_T}$enable_integer_datetimes" >&6
-
-
-# Character set recode (--enable-recode)
-#
-echo "$as_me:$LINENO: checking whether to build with recode support" >&5
-echo $ECHO_N "checking whether to build with recode support... $ECHO_C" >&6
-
-
-# Check whether --enable-recode or --disable-recode was given.
-if test "${enable_recode+set}" = set; then
-  enableval="$enable_recode"
-
-  case $enableval in
-    yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define CYR_RECODE 1
-_ACEOF
-
-      ;;
-    no)
-      :
-      ;;
-    *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-recode option" >&5
-echo "$as_me: error: no argument expected for --enable-recode option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-  esac
-
-else
-  enable_recode=no
-
-fi;
-
-echo "$as_me:$LINENO: result: $enable_recode" >&5
-echo "${ECHO_T}$enable_recode" >&6
-
-
-#
-# Multibyte support
-#
-MULTIBYTE=SQL_ASCII
-
-cat >>confdefs.h <<\_ACEOF
-#define MULTIBYTE 1
-_ACEOF
-
-
-
-#
-# NLS
-#
-echo "$as_me:$LINENO: checking whether NLS is wanted" >&5
-echo $ECHO_N "checking whether NLS is wanted... $ECHO_C" >&6
-
-
-# Check whether --enable-nls or --disable-nls was given.
-if test "${enable_nls+set}" = set; then
-  enableval="$enable_nls"
-
-  case $enableval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      enable_nls=yes
-WANTED_LANGUAGES=$enableval
-      ;;
-  esac
-
-else
-  enable_nls=no
-fi;
-
-
-if test "$enable_nls" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_NLS 1
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: result: $enable_nls" >&5
-echo "${ECHO_T}$enable_nls" >&6
-
-
-
-#
-# Default port number (--with-pgport), default 5432
-#
-echo "$as_me:$LINENO: checking for default port number" >&5
-echo $ECHO_N "checking for default port number... $ECHO_C" >&6
-
-
-
-# Check whether --with-pgport or --without-pgport was given.
-if test "${with_pgport+set}" = set; then
-  withval="$with_pgport"
-
-  case $withval in
-    yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-pgport option" >&5
-echo "$as_me: error: argument required for --with-pgport option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-    no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-pgport option" >&5
-echo "$as_me: error: argument required for --with-pgport option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-    *)
-      default_port=$withval
-      ;;
-  esac
-
-else
-  default_port=5432
-fi;
-
-echo "$as_me:$LINENO: result: $default_port" >&5
-echo "${ECHO_T}$default_port" >&6
-# Need both of these because some places want an integer and some a string
-
-cat >>confdefs.h <<_ACEOF
-#define DEF_PGPORT ${default_port}
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define DEF_PGPORT_STR "${default_port}"
-_ACEOF
-
-
-
-#
-# Maximum number of allowed connections (--with-maxbackends), default 32
-#
-echo "$as_me:$LINENO: checking for default soft limit on number of connections" >&5
-echo $ECHO_N "checking for default soft limit on number of connections... $ECHO_C" >&6
-
-
-
-# Check whether --with-maxbackends or --without-maxbackends was given.
-if test "${with_maxbackends+set}" = set; then
-  withval="$with_maxbackends"
-
-  case $withval in
-    yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-maxbackends option" >&5
-echo "$as_me: error: argument required for --with-maxbackends option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-    no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-maxbackends option" >&5
-echo "$as_me: error: argument required for --with-maxbackends option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-    *)
-
-      ;;
-  esac
-
-else
-  with_maxbackends=32
-fi;
-
-echo "$as_me:$LINENO: result: $with_maxbackends" >&5
-echo "${ECHO_T}$with_maxbackends" >&6
-
-cat >>confdefs.h <<_ACEOF
-#define DEF_MAXBACKENDS $with_maxbackends
-_ACEOF
-
-
-
-#
-# Option to disable shared libraries
-#
-
-
-# Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-
-  case $enableval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-shared option" >&5
-echo "$as_me: error: no argument expected for --enable-shared option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-  esac
-
-else
-  enable_shared=yes
-
-fi;
-
-
-
-#
-# '-rpath'-like feature can be disabled
-#
-
-
-# Check whether --enable-rpath or --disable-rpath was given.
-if test "${enable_rpath+set}" = set; then
-  enableval="$enable_rpath"
-
-  case $enableval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-rpath option" >&5
-echo "$as_me: error: no argument expected for --enable-rpath option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-  esac
-
-else
-  enable_rpath=yes
-
-fi;
-
-
-
-
-#
-# --enable-debug adds -g to compiler flags
-#
-
-
-# Check whether --enable-debug or --disable-debug was given.
-if test "${enable_debug+set}" = set; then
-  enableval="$enable_debug"
-
-  case $enableval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-debug option" >&5
-echo "$as_me: error: no argument expected for --enable-debug option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-  esac
-
-else
-  enable_debug=no
-
-fi;
-
-
-
-#
-# C compiler
-#
-
-# For historical reasons you can also use --with-CC to specify the C compiler
-# to use, although the standard way to do this is to set the CC environment
-# variable.
-
-
-
-# Check whether --with-CC or --without-CC was given.
-if test "${with_CC+set}" = set; then
-  withval="$with_CC"
-
-  case $withval in
-    yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-CC option" >&5
-echo "$as_me: error: argument required for --with-CC option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-    no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-CC option" >&5
-echo "$as_me: error: argument required for --with-CC option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-    *)
-      CC=$with_CC
-      ;;
-  esac
-
-fi;
-
-
-case $template in
-  aix) pgac_cc_list="gcc xlc";;
- irix) pgac_cc_list="cc";; # no gcc
-    *) pgac_cc_list="gcc cc";;
-esac
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in $pgac_cc_list
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in $pgac_cc_list
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_CC" && break
-done
-
-  CC=$ac_ct_CC
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output" >&5
-echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null;
-                ls a.out conftest 2>/dev/null;
-                ls a.* conftest.* 2>/dev/null`; do
-  case $ac_file in
-    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;;
-    a.out ) # We found the default executable, but exeext='' is most
-            # certainly right.
-            break;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
-          export ac_cv_exeext
-          break;;
-    * ) break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5
-echo "$as_me: error: C compiler cannot create executables" >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-rm -f a.out a.exe conftest$ac_cv_exeext
-ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
-  case $ac_file in
-    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-          export ac_cv_exeext
-          break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_compiler_gnu=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_prog_cc_g=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   ''\
-   '#include <stdlib.h>' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-$ac_declaration
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-continue
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_declaration
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-# Read the template
-. "$srcdir/src/template/$template" || exit
-
-if test "$ac_env_CFLAGS_set" = set; then
-  CFLAGS=$ac_env_CFLAGS_value
-fi
-if test "$enable_debug" = yes && test "$ac_cv_prog_cc_g" = yes; then
-  CFLAGS="$CFLAGS -g"
-fi
-{ echo "$as_me:$LINENO: using CFLAGS=$CFLAGS" >&5
-echo "$as_me: using CFLAGS=$CFLAGS" >&6;}
-# Check if the compiler still works with the template settings
-echo "$as_me:$LINENO: checking whether the C compiler still works" >&5
-echo $ECHO_N "checking whether the C compiler still works... $ECHO_C" >&6
-
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-   { { echo "$as_me:$LINENO: error: cannot proceed" >&5
-echo "$as_me: error: cannot proceed" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <assert.h>
-                     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <assert.h>
-                     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-# Create compiler version string
-if test x"$GCC" = x"yes" ; then
-  cc_string="GCC `${CC} --version | sed q`"
-else
-  cc_string=$CC
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define PG_VERSION_STR "PostgreSQL $PACKAGE_VERSION on $host, compiled by $cc_string"
-_ACEOF
-
-
-
-#
-# Automatic dependency tracking
-#
-
-
-# Check whether --enable-depend or --disable-depend was given.
-if test "${enable_depend+set}" = set; then
-  enableval="$enable_depend"
-
-  case $enableval in
-    yes)
-      autodepend=yes
-      ;;
-    no)
-      :
-      ;;
-    *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-depend option" >&5
-echo "$as_me: error: no argument expected for --enable-depend option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-  esac
-
-else
-  enable_depend=no
-
-fi;
-
-
-
-
-#
-# Enable assert checks
-#
-
-
-# Check whether --enable-cassert or --disable-cassert was given.
-if test "${enable_cassert+set}" = set; then
-  enableval="$enable_cassert"
-
-  case $enableval in
-    yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_ASSERT_CHECKING 1
-_ACEOF
-
-      ;;
-    no)
-      :
-      ;;
-    *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-cassert option" >&5
-echo "$as_me: error: no argument expected for --enable-cassert option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-  esac
-
-else
-  enable_cassert=no
-
-fi;
-
-
-
-#
-# Include directories
-#
-ac_save_IFS=$IFS
-IFS="${IFS}:"
-# SRCH_INC comes from the template file
-for dir in $with_includes $SRCH_INC; do
-  if test -d "$dir"; then
-    INCLUDES="$INCLUDES -I$dir"
-  else
-    { echo "$as_me:$LINENO: WARNING: *** Include directory $dir does not exist." >&5
-echo "$as_me: WARNING: *** Include directory $dir does not exist." >&2;}
-  fi
-done
-IFS=$ac_save_IFS
-
-
-
-#
-# Library directories
-#
-ac_save_IFS=$IFS
-IFS="${IFS}:"
-# LIBRARY_DIRS comes from command line, SRCH_LIB from template file.
-for dir in $LIBRARY_DIRS $SRCH_LIB; do
-  if test -d "$dir"; then
-    LIBDIRS="$LIBDIRS -L$dir"
-  else
-    { echo "$as_me:$LINENO: WARNING: *** Library directory $dir does not exist." >&5
-echo "$as_me: WARNING: *** Library directory $dir does not exist." >&2;}
-  fi
-done
-IFS=$ac_save_IFS
-
-
-#
-# Tcl/Tk
-#
-echo "$as_me:$LINENO: checking whether to build with Tcl" >&5
-echo $ECHO_N "checking whether to build with Tcl... $ECHO_C" >&6
-
-
-
-# Check whether --with-tcl or --without-tcl was given.
-if test "${with_tcl+set}" = set; then
-  withval="$with_tcl"
-
-  case $withval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-tcl option" >&5
-echo "$as_me: error: no argument expected for --with-tcl option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-  esac
-
-else
-  with_tcl=no
-
-fi;
-
-echo "$as_me:$LINENO: result: $with_tcl" >&5
-echo "${ECHO_T}$with_tcl" >&6
-
-
-# If Tcl is enabled (above) then Tk is also, unless the user disables it using --without-tk
-echo "$as_me:$LINENO: checking whether to build with Tk" >&5
-echo $ECHO_N "checking whether to build with Tk... $ECHO_C" >&6
-if test "$with_tcl" = yes; then
-
-
-
-# Check whether --with-tk or --without-tk was given.
-if test "${with_tk+set}" = set; then
-  withval="$with_tk"
-
-  case $withval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-tk option" >&5
-echo "$as_me: error: no argument expected for --with-tk option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-  esac
-
-else
-  with_tk=yes
-
-fi;
-
-else
-  with_tk=no
-fi
-echo "$as_me:$LINENO: result: $with_tk" >&5
-echo "${ECHO_T}$with_tk" >&6
-
-
-
-# We see if the path to the Tcl/Tk configuration scripts is specified.
-# This will override the use of tclsh to find the paths to search.
-
-
-
-
-# Check whether --with-tclconfig or --without-tclconfig was given.
-if test "${with_tclconfig+set}" = set; then
-  withval="$with_tclconfig"
-
-  case $withval in
-    yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-tclconfig option" >&5
-echo "$as_me: error: argument required for --with-tclconfig option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-    no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-tclconfig option" >&5
-echo "$as_me: error: argument required for --with-tclconfig option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-    *)
-
-      ;;
-  esac
-
-fi;
-
-
-# We see if the path to the Tk configuration scripts is specified.
-# This will override the use of tclsh to find the paths to search.
-
-
-
-
-# Check whether --with-tkconfig or --without-tkconfig was given.
-if test "${with_tkconfig+set}" = set; then
-  withval="$with_tkconfig"
-
-  case $withval in
-    yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-tkconfig option" >&5
-echo "$as_me: error: argument required for --with-tkconfig option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-    no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-tkconfig option" >&5
-echo "$as_me: error: argument required for --with-tkconfig option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-    *)
-
-      ;;
-  esac
-
-fi;
-
-
-#
-# Optionally build Perl modules (Pg.pm and PL/Perl)
-#
-echo "$as_me:$LINENO: checking whether to build Perl modules" >&5
-echo $ECHO_N "checking whether to build Perl modules... $ECHO_C" >&6
-
-
-
-# Check whether --with-perl or --without-perl was given.
-if test "${with_perl+set}" = set; then
-  withval="$with_perl"
-
-  case $withval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-perl option" >&5
-echo "$as_me: error: no argument expected for --with-perl option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-  esac
-
-else
-  with_perl=no
-
-fi;
-
-echo "$as_me:$LINENO: result: $with_perl" >&5
-echo "${ECHO_T}$with_perl" >&6
-
-
-#
-# Optionally build Python interface module
-#
-echo "$as_me:$LINENO: checking whether to build Python modules" >&5
-echo $ECHO_N "checking whether to build Python modules... $ECHO_C" >&6
-
-
-
-# Check whether --with-python or --without-python was given.
-if test "${with_python+set}" = set; then
-  withval="$with_python"
-
-  case $withval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-python option" >&5
-echo "$as_me: error: no argument expected for --with-python option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-  esac
-
-else
-  with_python=no
-
-fi;
-
-echo "$as_me:$LINENO: result: $with_python" >&5
-echo "${ECHO_T}$with_python" >&6
-
-
-#
-# Optionally build the Java/JDBC tools
-#
-echo "$as_me:$LINENO: checking whether to build Java/JDBC tools" >&5
-echo $ECHO_N "checking whether to build Java/JDBC tools... $ECHO_C" >&6
-
-
-
-# Check whether --with-java or --without-java was given.
-if test "${with_java+set}" = set; then
-  withval="$with_java"
-
-  case $withval in
-    yes)
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-  for ac_prog in jakarta-ant ant ant.sh ant.bat
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_ANT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $ANT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ANT="$ANT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ANT="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  ;;
-esac
-fi
-ANT=$ac_cv_path_ANT
-
-if test -n "$ANT"; then
-  echo "$as_me:$LINENO: result: $ANT" >&5
-echo "${ECHO_T}$ANT" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ANT" && break
-done
-
-
-  echo "$as_me:$LINENO: checking whether $ANT works" >&5
-echo $ECHO_N "checking whether $ANT works... $ECHO_C" >&6
-if test "${pgac_cv_prog_ant_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    cat > conftest.java << EOF
-public class conftest {
-    int testmethod(int a, int b) {
-        return a + b;
-    }
-}
-EOF
-
-    cat > conftest.xml << EOF
-<project name="conftest" default="conftest">
- <target name="conftest">
-  <javac srcdir="." includes="conftest.java">
-  </javac>
- </target>
-</project>
-EOF
-
-    pgac_cmd='$ANT -buildfile conftest.xml 1>&2'
-    { (eval echo "$as_me:$LINENO: \"$pgac_cmd\"") >&5
-  (eval $pgac_cmd) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-    pgac_save_status=$?
-    if test $? = 0 && test -f ./conftest.class ; then
-      pgac_cv_prog_ant_works=yes
-    else
-      echo "configure: failed java program was:" >&5
-      cat conftest.java >&5
-      echo "configure: failed build file was:" >&5
-      cat conftest.xml >&5
-      pgac_cv_prog_ant_works=no
-    fi
-
-    rm -f conftest* core core.* *.core
-
-fi
-echo "$as_me:$LINENO: result: $pgac_cv_prog_ant_works" >&5
-echo "${ECHO_T}$pgac_cv_prog_ant_works" >&6
-
-  if test "$pgac_cv_prog_ant_works" != yes; then
-    { { echo "$as_me:$LINENO: error: ant does not work" >&5
-echo "$as_me: error: ant does not work" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-
-
-if test -z "$ANT"; then
-  { { echo "$as_me:$LINENO: error: Ant is required to build Java components" >&5
-echo "$as_me: error: Ant is required to build Java components" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-      ;;
-    no)
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-      ;;
-    *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-java option" >&5
-echo "$as_me: error: no argument expected for --with-java option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-  esac
-
-else
-  with_java=no
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi;
-
-
-
-
-#
-# Kerberos 4
-#
-echo "$as_me:$LINENO: checking whether to build with Kerberos 4 support" >&5
-echo $ECHO_N "checking whether to build with Kerberos 4 support... $ECHO_C" >&6
-
-
-
-# Check whether --with-krb4 or --without-krb4 was given.
-if test "${with_krb4+set}" = set; then
-  withval="$with_krb4"
-
-  case $withval in
-    yes)
-      krb4_prefix=/usr/athena
-      ;;
-    no)
-      :
-      ;;
-    *)
-      with_krb4=yes
-krb4_prefix=$withval
-      ;;
-  esac
-
-else
-  with_krb4=no
-fi;
-
-
-if test "$with_krb4" = yes; then
-
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
-#define KRB4 1
-_ACEOF
-
-
-  if test -d "$krb4_prefix/include"; then
-    INCLUDES="$INCLUDES -I$krb4_prefix/include"
-  fi
-  if test -d "$krb4_prefix/lib"; then
-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
-  fi
-
-  krb_srvtab="/etc/srvtab"
-
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-
-
-
-
-#
-# Kerberos 5
-#
-echo "$as_me:$LINENO: checking whether to build with Kerberos 5 support" >&5
-echo $ECHO_N "checking whether to build with Kerberos 5 support... $ECHO_C" >&6
-
-
-
-# Check whether --with-krb5 or --without-krb5 was given.
-if test "${with_krb5+set}" = set; then
-  withval="$with_krb5"
-
-  case $withval in
-    yes)
-      krb5_prefix=/usr/athena
-      ;;
-    no)
-      :
-      ;;
-    *)
-      with_krb5=yes
-krb5_prefix=$withval
-      ;;
-  esac
-
-else
-  with_krb5=no
-fi;
-
-
-if test "$with_krb5" = yes; then
-
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
-#define KRB5 1
-_ACEOF
-
-
-  if test -d "$krb5_prefix/include"; then
-    INCLUDES="$INCLUDES -I$krb5_prefix/include"
-  fi
-  if test -d "$krb5_prefix/lib"; then
-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
-  fi
-
-  krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
-
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-
-
-
-
-# Using both Kerberos 4 and Kerberos 5 at the same time isn't going to work.
-if test "$with_krb4" = yes && test "$with_krb5" = yes ; then
-  { { echo "$as_me:$LINENO: error: Kerberos 4 and Kerberos 5 support cannot be combined" >&5
-echo "$as_me: error: Kerberos 4 and Kerberos 5 support cannot be combined" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-
-
-#
-# Kerberos configuration parameters
-#
-
-
-
-# Check whether --with-krb-srvnam or --without-krb-srvnam was given.
-if test "${with_krb_srvnam+set}" = set; then
-  withval="$with_krb_srvnam"
-
-  case $withval in
-    yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-krb-srvnam option" >&5
-echo "$as_me: error: argument required for --with-krb-srvnam option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-    no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-krb-srvnam option" >&5
-echo "$as_me: error: argument required for --with-krb-srvnam option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-    *)
-
-      ;;
-  esac
-
-else
-  with_krb_srvnam="postgres"
-fi;
-
-
-cat >>confdefs.h <<_ACEOF
-#define PG_KRB_SRVNAM "$with_krb_srvnam"
-_ACEOF
-
-
-
-#
-# PAM
-#
-echo "$as_me:$LINENO: checking whether to build with PAM support" >&5
-echo $ECHO_N "checking whether to build with PAM support... $ECHO_C" >&6
-
-
-
-# Check whether --with-pam or --without-pam was given.
-if test "${with_pam+set}" = set; then
-  withval="$with_pam"
-
-  case $withval in
-    yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_PAM 1
-_ACEOF
-
-      ;;
-    no)
-      :
-      ;;
-    *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-pam option" >&5
-echo "$as_me: error: no argument expected for --with-pam option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-  esac
-
-else
-  with_pam=no
-
-fi;
-
-echo "$as_me:$LINENO: result: $with_pam" >&5
-echo "${ECHO_T}$with_pam" >&6
-
-
-
-#
-# OpenSSL
-#
-
-
-
-# Check whether --with-openssl or --without-openssl was given.
-if test "${with_openssl+set}" = set; then
-  withval="$with_openssl"
-
-  case $withval in
-    yes)
-      openssl_prefix=/usr/local/ssl
-      ;;
-    no)
-      :
-      ;;
-    *)
-      with_openssl=yes
-openssl_prefix=$withval
-      ;;
-  esac
-
-else
-  with_openssl=no
-fi;
-
-
-if test "$with_openssl" = yes; then
-
-  echo "$as_me:$LINENO: result: building with OpenSSL support" >&5
-echo "${ECHO_T}building with OpenSSL support" >&6
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_SSL 1
-_ACEOF
-
-
-  if test -d "${openssl_prefix}/include" ; then
-    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
-  fi
-  if test -d "${openssl_prefix}/lib" ; then
-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
-  fi
-
-fi
-
-
-
-
-
-#
-# Readline
-#
-
-
-
-# Check whether --with-readline or --without-readline was given.
-if test "${with_readline+set}" = set; then
-  withval="$with_readline"
-
-  case $withval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-readline option" >&5
-echo "$as_me: error: no argument expected for --with-readline option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-  esac
-
-else
-  with_readline=yes
-
-fi;
-
-
-#
-# Zlib
-#
-
-
-
-# Check whether --with-zlib or --without-zlib was given.
-if test "${with_zlib+set}" = set; then
-  withval="$with_zlib"
-
-  case $withval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-zlib option" >&5
-echo "$as_me: error: no argument expected for --with-zlib option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-  esac
-
-else
-  with_zlib=yes
-
-fi;
-
-
-
-
-#
-# Optionally enable the building of the ODBC driver
-#
-
-# Old option name
-if test "${with_odbc+set}" = set && test "${enable_odbc+set}" != set; then
-  enable_odbc=$with_odbc
-fi
-
-echo "$as_me:$LINENO: checking whether to build the ODBC driver" >&5
-echo $ECHO_N "checking whether to build the ODBC driver... $ECHO_C" >&6
-
-
-# Check whether --enable-odbc or --disable-odbc was given.
-if test "${enable_odbc+set}" = set; then
-  enableval="$enable_odbc"
-
-  case $enableval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --enable-odbc option" >&5
-echo "$as_me: error: no argument expected for --enable-odbc option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-  esac
-
-else
-  enable_odbc=no
-
-fi;
-
-
-
-
-# Check whether --with-unixodbc or --without-unixodbc was given.
-if test "${with_unixodbc+set}" = set; then
-  withval="$with_unixodbc"
-
-  case $withval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-unixodbc option" >&5
-echo "$as_me: error: no argument expected for --with-unixodbc option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-  esac
-
-else
-  with_unixodbc=no
-
-fi;
-
-
-
-
-# Check whether --with-iodbc or --without-iodbc was given.
-if test "${with_iodbc+set}" = set; then
-  withval="$with_iodbc"
-
-  case $withval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      { { echo "$as_me:$LINENO: error: no argument expected for --with-iodbc option" >&5
-echo "$as_me: error: no argument expected for --with-iodbc option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-  esac
-
-else
-  with_iodbc=no
-
-fi;
-
-if test "$with_unixodbc" = yes && test "$with_iodbc" = yes; then
-  { { echo "$as_me:$LINENO: error: ODBC driver cannot be built for both unixODBC and iODBC" >&5
-echo "$as_me: error: ODBC driver cannot be built for both unixODBC and iODBC" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test "$with_unixodbc" = yes || test "$with_iodbc" = yes; then
-  enable_odbc=yes
-fi
-case $enable_odbc:$with_unixodbc:$with_iodbc in
-  yes:no:no)    echo "$as_me:$LINENO: result: yes (stand-alone)" >&5
-echo "${ECHO_T}yes (stand-alone)" >&6;;
-  yes:yes:no)   echo "$as_me:$LINENO: result: yes (unixODBC)" >&5
-echo "${ECHO_T}yes (unixODBC)" >&6
-
-cat >>confdefs.h <<\_ACEOF
-#define WITH_UNIXODBC 1
-_ACEOF
-
-                ;;
-  yes:no:yes)   echo "$as_me:$LINENO: result: yes (iODBC)" >&5
-echo "${ECHO_T}yes (iODBC)" >&6
-
-cat >>confdefs.h <<\_ACEOF
-#define WITH_IODBC 1
-_ACEOF
-
-                ;;
-  no:*)         echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6;;
-esac
-
-
-
-
-
-# Allow for overriding the default location of the odbcinst.ini
-# file which is normally ${sysconfdir} (i.e., ${prefix}/etc).
-
-
-
-# Check whether --with-odbcinst or --without-odbcinst was given.
-if test "${with_odbcinst+set}" = set; then
-  withval="$with_odbcinst"
-
-  case $withval in
-    yes)
-      { { echo "$as_me:$LINENO: error: argument required for --with-odbcinst option" >&5
-echo "$as_me: error: argument required for --with-odbcinst option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-    no)
-      { { echo "$as_me:$LINENO: error: argument required for --with-odbcinst option" >&5
-echo "$as_me: error: argument required for --with-odbcinst option" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-    *)
-      odbcinst_ini_dir=$withval
-      ;;
-  esac
-
-else
-  odbcinst_ini_dir="\${sysconfdir}"
-fi;
-
-
-
-
-
-# Assume system is ELF if it predefines __ELF__ as 1,
-# otherwise believe host_os based default.
-case $host_os in
-    freebsd1*|freebsd2*) elf=no;;
-    freebsd3*|freebsd4*) elf=yes;;
-esac
-
-
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#if __ELF__
-  yes
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "yes" >/dev/null 2>&1; then
-  ELF_SYS=true
-else
-  if test "X$elf" = "Xyes" ; then
-  ELF_SYS=true
-else
-  ELF_SYS=
-fi
-fi
-rm -f conftest*
-
-
-
-
-
-#
-# Optionally build C++ code (i.e., libpq++)
-#
-echo "$as_me:$LINENO: checking whether to build C++ modules" >&5
-echo $ECHO_N "checking whether to build C++ modules... $ECHO_C" >&6
-
-
-
-# Check whether --with-CXX or --without-CXX was given.
-if test "${with_CXX+set}" = set; then
-  withval="$with_CXX"
-
-  case $withval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      with_CXX=yes
-CXX=$withval
-      ;;
-  esac
-
-else
-  with_CXX=no
-fi;
-
-
-if test "$with_CXX" = yes; then
-
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-  # If the user has specified CXXFLAGS in the environment, leave it
-  # alone, else use a default.
-
-  ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_CXX" && break
-done
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
-
-  CXX=$ac_ct_CXX
-fi
-
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_compiler_gnu=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
-GXX=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cxx_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_prog_cxx_g=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-for ac_declaration in \
-   ''\
-   '#include <stdlib.h>' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-$ac_declaration
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-continue
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_declaration
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-  if test "$ac_env_CXXFLAGS" != set; then
-    if test "$GXX" = yes; then
-      CXXFLAGS=-O2
-    else
-      case $template in
-	osf)		CXXFLAGS='-O4 -Olimit 2000' ;;
-        unixware)	CXXFLAGS='-O' ;;
-	*)		CXXFLAGS= ;;
-      esac
-    fi
-  fi
-  if test "$enable_debug" = yes && test "$ac_cv_prog_cxx_g" = yes; then
-    CXXFLAGS="$CXXFLAGS -g"
-  fi
-  { echo "$as_me:$LINENO: using CXXFLAGS=$CXXFLAGS" >&5
-echo "$as_me: using CXXFLAGS=$CXXFLAGS" >&6;}
-
-  ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
-if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <assert.h>
-                     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <assert.h>
-                     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-
-
-
-CPPFLAGS="$CPPFLAGS $INCLUDES"
-LDFLAGS="$LDFLAGS $LIBDIRS"
-
-{ echo "$as_me:$LINENO: using CPPFLAGS=$CPPFLAGS" >&5
-echo "$as_me: using CPPFLAGS=$CPPFLAGS" >&6;}
-{ echo "$as_me:$LINENO: using LDFLAGS=$LDFLAGS" >&5
-echo "$as_me: using LDFLAGS=$LDFLAGS" >&6;}
-
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$AWK" && break
-done
-
-echo "$as_me:$LINENO: checking for flex" >&5
-echo $ECHO_N "checking for flex... $ECHO_C" >&6
-if test "${pgac_cv_path_flex+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Let the user override the test
-if test -n "$FLEX"; then
-  pgac_cv_path_flex=$FLEX
-else
-  pgac_save_IFS=$IFS
-  IFS=:
-  for pgac_dir in $PATH; do
-    if test -z "$pgac_dir" || test x"$pgac_dir" = x"."; then
-      pgac_dir=`pwd`
-    fi
-    for pgac_prog in flex lex; do
-      pgac_candidate="$pgac_dir/$pgac_prog"
-      if test -f "$pgac_candidate" \
-        && $pgac_candidate --version </dev/null >/dev/null 2>&1
-      then
-        echo '%%'  > conftest.l
-        if $pgac_candidate -t conftest.l 2>/dev/null | grep FLEX_SCANNER >/dev/null 2>&1; then
-          if $pgac_candidate --version | grep '2\.5\.3' >/dev/null 2>&1; then
-            pgac_broken_flex=$pgac_candidate
-            continue
-          fi
-
-          pgac_cv_path_flex=$pgac_candidate
-          break 2
-        fi
-      fi
-    done
-  done
-  IFS=$pgac_save_IFS
-  rm -f conftest.l
-  : ${pgac_cv_path_flex=no}
-fi
-
-fi
-echo "$as_me:$LINENO: result: $pgac_cv_path_flex" >&5
-echo "${ECHO_T}$pgac_cv_path_flex" >&6
-if test x"$pgac_cv_path_flex" = x"no"; then
-  if test -n "$pgac_broken_flex"; then
-    { echo "$as_me:$LINENO: WARNING:
-*** The Flex version 2.5.3 you have at $pgac_broken_flex contains a bug. You
-*** should get version 2.5.4 or later." >&5
-echo "$as_me: WARNING:
-*** The Flex version 2.5.3 you have at $pgac_broken_flex contains a bug. You
-*** should get version 2.5.4 or later." >&2;}
-  fi
-
-  { echo "$as_me:$LINENO: WARNING:
-*** Without Flex you will not be able to build PostgreSQL from CVS or
-*** change any of the scanner definition files.  You can obtain Flex from
-*** a GNU mirror site.  (If you are using the official distribution of
-*** PostgreSQL then you do not need to worry about this because the Flex
-*** output is pre-generated.)" >&5
-echo "$as_me: WARNING:
-*** Without Flex you will not be able to build PostgreSQL from CVS or
-*** change any of the scanner definition files.  You can obtain Flex from
-*** a GNU mirror site.  (If you are using the official distribution of
-*** PostgreSQL then you do not need to worry about this because the Flex
-*** output is pre-generated.)" >&2;}
-fi
-
-if test x"$pgac_cv_path_flex" = x"no"; then
-  FLEX=
-else
-  FLEX=$pgac_cv_path_flex
-fi
-
-
-
-
-echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6
-fi
-
-
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi;
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:$LINENO: checking for ld used by GCC" >&5
-echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case "$ac_prog" in
-    # Accept absolute paths.
-    [\\/]* | [A-Za-z]:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-else
-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-fi
-if test "${ac_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      ac_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  ac_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$ac_cv_path_LD"
-if test -n "$LD"; then
-  echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-if test "${ac_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  ac_cv_prog_gnu_ld=yes
-else
-  ac_cv_prog_gnu_ld=no
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$ac_cv_prog_gnu_ld" >&6
-with_gnu_ld=$ac_cv_prog_gnu_ld
-
-
-
-
-case $host_os in sysv5*)
-  echo "$as_me:$LINENO: checking whether ld -R works" >&5
-echo $ECHO_N "checking whether ld -R works... $ECHO_C" >&6
-if test "${pgac_cv_prog_ld_R+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    pgac_save_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -Wl,-R/usr/lib"
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  pgac_cv_prog_ld_R=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-pgac_cv_prog_ld_R=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$pgac_save_LDFLAGS
-
-fi
-echo "$as_me:$LINENO: result: $pgac_cv_prog_ld_R" >&5
-echo "${ECHO_T}$pgac_cv_prog_ld_R" >&6
-  ld_R_works=$pgac_cv_prog_ld_R
-
-esac
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  RANLIB=$ac_ct_RANLIB
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-for ac_prog in lorder
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_LORDER+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$LORDER"; then
-  ac_cv_prog_LORDER="$LORDER" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_LORDER="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-LORDER=$ac_cv_prog_LORDER
-if test -n "$LORDER"; then
-  echo "$as_me:$LINENO: result: $LORDER" >&5
-echo "${ECHO_T}$LORDER" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$LORDER" && break
-done
-
-# Extract the first word of "tar", so it can be a program name with args.
-set dummy tar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_TAR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $TAR in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_TAR="$TAR" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_TAR="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  ;;
-esac
-fi
-TAR=$ac_cv_path_TAR
-
-if test -n "$TAR"; then
-  echo "$as_me:$LINENO: result: $TAR" >&5
-echo "${ECHO_T}$TAR" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  STRIP=$ac_ct_STRIP
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-
-  echo "$as_me:$LINENO: checking whether it is possible to strip libraries" >&5
-echo $ECHO_N "checking whether it is possible to strip libraries... $ECHO_C" >&6
-  if test x"$STRIP" != x"" && "$STRIP" -V 2>&1 | grep "GNU strip" >/dev/null; then
-    STRIP_STATIC_LIB="$STRIP -x"
-    STRIP_SHARED_LIB="$STRIP --strip-unneeded"
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-  else
-    STRIP_STATIC_LIB=:
-    STRIP_SHARED_LIB=:
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-  fi
-
-
-
-
-for ac_prog in 'bison -y'
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_YACC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$YACC"; then
-  ac_cv_prog_YACC="$YACC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_YACC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-YACC=$ac_cv_prog_YACC
-if test -n "$YACC"; then
-  echo "$as_me:$LINENO: result: $YACC" >&5
-echo "${ECHO_T}$YACC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$YACC" && break
-done
-
-if test -z "$YACC"; then
-  { echo "$as_me:$LINENO: WARNING:
-*** Without Bison you will not be able to build PostgreSQL from CVS or
-*** change any of the parser definition files.  You can obtain Bison from
-*** a GNU mirror site.  (If you are using the official distribution of
-*** PostgreSQL then you do not need to worry about this because the Bison
-*** output is pre-generated.)  To use a different yacc program (possible,
-*** but not recommended), set the environment variable YACC before running
-*** 'configure'." >&5
-echo "$as_me: WARNING:
-*** Without Bison you will not be able to build PostgreSQL from CVS or
-*** change any of the parser definition files.  You can obtain Bison from
-*** a GNU mirror site.  (If you are using the official distribution of
-*** PostgreSQL then you do not need to worry about this because the Bison
-*** output is pre-generated.)  To use a different yacc program (possible,
-*** but not recommended), set the environment variable YACC before running
-*** 'configure'." >&2;}
-fi
-
-
-if test "$with_tk" = yes; then
-    # Extract the first word of "wish", so it can be a program name with args.
-set dummy wish; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_WISH+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $WISH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_WISH="$WISH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_WISH="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  ;;
-esac
-fi
-WISH=$ac_cv_path_WISH
-
-if test -n "$WISH"; then
-  echo "$as_me:$LINENO: result: $WISH" >&5
-echo "${ECHO_T}$WISH" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -z "$WISH" && { { echo "$as_me:$LINENO: error: 'wish' is required for Tk support" >&5
-echo "$as_me: error: 'wish' is required for Tk support" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PERL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $PERL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  ;;
-esac
-fi
-PERL=$ac_cv_path_PERL
-
-if test -n "$PERL"; then
-  echo "$as_me:$LINENO: result: $PERL" >&5
-echo "${ECHO_T}$PERL" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-if test "$with_perl" = yes; then
-
-echo "$as_me:$LINENO: checking for Perl installsitearch" >&5
-echo $ECHO_N "checking for Perl installsitearch... $ECHO_C" >&6
-perl_installsitearch=`$PERL -MConfig -e 'print $Config{installsitearch}'`
-echo "$as_me:$LINENO: result: $perl_installsitearch" >&5
-echo "${ECHO_T}$perl_installsitearch" >&6
-echo "$as_me:$LINENO: checking for Perl installman3dir" >&5
-echo $ECHO_N "checking for Perl installman3dir... $ECHO_C" >&6
-perl_installman3dir=`$PERL -MConfig -e 'print $Config{installman3dir}'`
-echo "$as_me:$LINENO: result: $perl_installman3dir" >&5
-echo "${ECHO_T}$perl_installman3dir" >&6
-echo "$as_me:$LINENO: checking for Perl archlibexp" >&5
-echo $ECHO_N "checking for Perl archlibexp... $ECHO_C" >&6
-perl_archlibexp=`$PERL -MConfig -e 'print $Config{archlibexp}'`
-echo "$as_me:$LINENO: result: $perl_archlibexp" >&5
-echo "${ECHO_T}$perl_archlibexp" >&6
-echo "$as_me:$LINENO: checking for Perl privlibexp" >&5
-echo $ECHO_N "checking for Perl privlibexp... $ECHO_C" >&6
-perl_privlibexp=`$PERL -MConfig -e 'print $Config{privlibexp}'`
-echo "$as_me:$LINENO: result: $perl_privlibexp" >&5
-echo "${ECHO_T}$perl_privlibexp" >&6
-echo "$as_me:$LINENO: checking for Perl useshrplib" >&5
-echo $ECHO_N "checking for Perl useshrplib... $ECHO_C" >&6
-perl_useshrplib=`$PERL -MConfig -e 'print $Config{useshrplib}'`
-echo "$as_me:$LINENO: result: $perl_useshrplib" >&5
-echo "${ECHO_T}$perl_useshrplib" >&6
-echo "$as_me:$LINENO: checking for Perl man3ext" >&5
-echo $ECHO_N "checking for Perl man3ext... $ECHO_C" >&6
-perl_man3ext=`$PERL -MConfig -e 'print $Config{man3ext}'`
-echo "$as_me:$LINENO: result: $perl_man3ext" >&5
-echo "${ECHO_T}$perl_man3ext" >&6
-
-echo "$as_me:$LINENO: checking for flags to link embedded Perl" >&5
-echo $ECHO_N "checking for flags to link embedded Perl... $ECHO_C" >&6
-pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
-pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
-perl_embed_ldflags=`echo X"$pgac_tmp1" | sed "s/^X//;s%$pgac_tmp2%%"`
-echo "$as_me:$LINENO: result: $perl_embed_ldflags" >&5
-echo "${ECHO_T}$perl_embed_ldflags" >&6
-fi
-
-if test "$with_python" = yes; then
-  # Extract the first word of "python", so it can be a program name with args.
-set dummy python; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PYTHON+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $PYTHON in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  ;;
-esac
-fi
-PYTHON=$ac_cv_path_PYTHON
-
-if test -n "$PYTHON"; then
-  echo "$as_me:$LINENO: result: $PYTHON" >&5
-echo "${ECHO_T}$PYTHON" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-if test x"$PYTHON" = x""; then
-  { { echo "$as_me:$LINENO: error: Python not found" >&5
-echo "$as_me: error: Python not found" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-echo "$as_me:$LINENO: checking Python installation directories" >&5
-echo $ECHO_N "checking Python installation directories... $ECHO_C" >&6
-python_version=`${PYTHON} -c "import sys; print sys.version[:3]"`
-python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
-python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
-python_configdir="${python_execprefix}/lib/python${python_version}/config"
-python_moduledir="${python_prefix}/lib/python${python_version}/site-packages"
-python_moduleexecdir="${python_execprefix}/lib/python${python_version}/site-packages"
-python_includespec="-I${python_prefix}/include/python${python_version}"
-if test "$python_prefix" != "$python_execprefix"; then
-  python_includespec="-I${python_execprefix}/include/python${python_version} $python_includespec"
-fi
-
-# This should be enough of a message.
-if test "$python_prefix" != "$python_execprefix"; then
-  echo "$as_me:$LINENO: result: $python_prefix/lib/python${python_version} and $python_execprefix/lib/python${python_version}" >&5
-echo "${ECHO_T}$python_prefix/lib/python${python_version} and $python_execprefix/lib/python${python_version}" >&6
-else
-  echo "$as_me:$LINENO: result: $python_prefix/lib/python${python_version}" >&5
-echo "${ECHO_T}$python_prefix/lib/python${python_version}" >&6
-fi
-
-
-
-
-
-echo "$as_me:$LINENO: checking how to link an embedded Python application" >&5
-echo $ECHO_N "checking how to link an embedded Python application... $ECHO_C" >&6
-
-_python_libs=`grep '^LIBS=' $python_configdir/Makefile | sed 's/^.*=//'`
-_python_libc=`grep '^LIBC=' $python_configdir/Makefile | sed 's/^.*=//'`
-_python_libm=`grep '^LIBM=' $python_configdir/Makefile | sed 's/^.*=//'`
-_python_liblocalmod=`grep '^LOCALMODLIBS=' $python_configdir/Makefile | sed 's/^.*=//'`
-_python_libbasemod=`grep '^BASEMODLIBS=' $python_configdir/Makefile | sed 's/^.*=//'`
-
-pgac_tab="	" # tab character
-python_libspec=`echo X"-L$python_configdir $_python_libs $_python_libc $_python_libm -lpython$python_version $_python_liblocalmod $_python_libbasemod" | sed -e 's/^X//' -e "s/[ $pgac_tab][ $pgac_tab]*/ /g"`
-
-echo "$as_me:$LINENO: result: ${python_libspec}" >&5
-echo "${ECHO_T}${python_libspec}" >&6
-
-
-fi
-
-
-##
-## Libraries
-##
-
-if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha"
-then
-
-echo "$as_me:$LINENO: checking for main in -lbsd" >&5
-echo $ECHO_N "checking for main in -lbsd... $ECHO_C" >&6
-if test "${ac_cv_lib_bsd_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbsd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_bsd_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_bsd_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_main" >&5
-echo "${ECHO_T}$ac_cv_lib_bsd_main" >&6
-if test $ac_cv_lib_bsd_main = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBBSD 1
-_ACEOF
-
-  LIBS="-lbsd $LIBS"
-
-fi
-
-fi
-
-echo "$as_me:$LINENO: checking for setproctitle in -lutil" >&5
-echo $ECHO_N "checking for setproctitle in -lutil... $ECHO_C" >&6
-if test "${ac_cv_lib_util_setproctitle+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lutil  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char setproctitle ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-setproctitle ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_util_setproctitle=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_util_setproctitle=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_util_setproctitle" >&5
-echo "${ECHO_T}$ac_cv_lib_util_setproctitle" >&6
-if test $ac_cv_lib_util_setproctitle = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBUTIL 1
-_ACEOF
-
-  LIBS="-lutil $LIBS"
-
-fi
-
-
-echo "$as_me:$LINENO: checking for main in -lm" >&5
-echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6
-if test "${ac_cv_lib_m_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_m_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_m_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5
-echo "${ECHO_T}$ac_cv_lib_m_main" >&6
-if test $ac_cv_lib_m_main = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
-
-  LIBS="-lm $LIBS"
-
-fi
-
-
-echo "$as_me:$LINENO: checking for main in -ldl" >&5
-echo $ECHO_N "checking for main in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_dl_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_main" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_main" >&6
-if test $ac_cv_lib_dl_main = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
-
-  LIBS="-ldl $LIBS"
-
-fi
-
-
-echo "$as_me:$LINENO: checking for main in -lnsl" >&5
-echo $ECHO_N "checking for main in -lnsl... $ECHO_C" >&6
-if test "${ac_cv_lib_nsl_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_nsl_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_nsl_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_main" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_main" >&6
-if test $ac_cv_lib_nsl_main = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBNSL 1
-_ACEOF
-
-  LIBS="-lnsl $LIBS"
-
-fi
-
-
-echo "$as_me:$LINENO: checking for main in -lsocket" >&5
-echo $ECHO_N "checking for main in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_socket_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_main" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_main" >&6
-if test $ac_cv_lib_socket_main = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSOCKET 1
-_ACEOF
-
-  LIBS="-lsocket $LIBS"
-
-fi
-
-
-echo "$as_me:$LINENO: checking for main in -lipc" >&5
-echo $ECHO_N "checking for main in -lipc... $ECHO_C" >&6
-if test "${ac_cv_lib_ipc_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lipc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ipc_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_ipc_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_main" >&5
-echo "${ECHO_T}$ac_cv_lib_ipc_main" >&6
-if test $ac_cv_lib_ipc_main = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBIPC 1
-_ACEOF
-
-  LIBS="-lipc $LIBS"
-
-fi
-
-
-echo "$as_me:$LINENO: checking for main in -lIPC" >&5
-echo $ECHO_N "checking for main in -lIPC... $ECHO_C" >&6
-if test "${ac_cv_lib_IPC_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lIPC  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_IPC_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_IPC_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_IPC_main" >&5
-echo "${ECHO_T}$ac_cv_lib_IPC_main" >&6
-if test $ac_cv_lib_IPC_main = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBIPC 1
-_ACEOF
-
-  LIBS="-lIPC $LIBS"
-
-fi
-
-
-echo "$as_me:$LINENO: checking for main in -llc" >&5
-echo $ECHO_N "checking for main in -llc... $ECHO_C" >&6
-if test "${ac_cv_lib_lc_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-llc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_lc_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_lc_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_lc_main" >&5
-echo "${ECHO_T}$ac_cv_lib_lc_main" >&6
-if test $ac_cv_lib_lc_main = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBLC 1
-_ACEOF
-
-  LIBS="-llc $LIBS"
-
-fi
-
-
-echo "$as_me:$LINENO: checking for main in -ldld" >&5
-echo $ECHO_N "checking for main in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_dld_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_main" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_main" >&6
-if test $ac_cv_lib_dld_main = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDLD 1
-_ACEOF
-
-  LIBS="-ldld $LIBS"
-
-fi
-
-
-echo "$as_me:$LINENO: checking for main in -lld" >&5
-echo $ECHO_N "checking for main in -lld... $ECHO_C" >&6
-if test "${ac_cv_lib_ld_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ld_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_ld_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ld_main" >&5
-echo "${ECHO_T}$ac_cv_lib_ld_main" >&6
-if test $ac_cv_lib_ld_main = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBLD 1
-_ACEOF
-
-  LIBS="-lld $LIBS"
-
-fi
-
-
-echo "$as_me:$LINENO: checking for main in -lcompat" >&5
-echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6
-if test "${ac_cv_lib_compat_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcompat  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_compat_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_compat_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
-echo "${ECHO_T}$ac_cv_lib_compat_main" >&6
-if test $ac_cv_lib_compat_main = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCOMPAT 1
-_ACEOF
-
-  LIBS="-lcompat $LIBS"
-
-fi
-
-
-echo "$as_me:$LINENO: checking for main in -lBSD" >&5
-echo $ECHO_N "checking for main in -lBSD... $ECHO_C" >&6
-if test "${ac_cv_lib_BSD_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lBSD  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_BSD_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_BSD_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_BSD_main" >&5
-echo "${ECHO_T}$ac_cv_lib_BSD_main" >&6
-if test $ac_cv_lib_BSD_main = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBBSD 1
-_ACEOF
-
-  LIBS="-lBSD $LIBS"
-
-fi
-
-
-echo "$as_me:$LINENO: checking for main in -lgen" >&5
-echo $ECHO_N "checking for main in -lgen... $ECHO_C" >&6
-if test "${ac_cv_lib_gen_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgen  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gen_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_gen_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gen_main" >&5
-echo "${ECHO_T}$ac_cv_lib_gen_main" >&6
-if test $ac_cv_lib_gen_main = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGEN 1
-_ACEOF
-
-  LIBS="-lgen $LIBS"
-
-fi
-
-
-echo "$as_me:$LINENO: checking for main in -lPW" >&5
-echo $ECHO_N "checking for main in -lPW... $ECHO_C" >&6
-if test "${ac_cv_lib_PW_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lPW  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_PW_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_PW_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_PW_main" >&5
-echo "${ECHO_T}$ac_cv_lib_PW_main" >&6
-if test $ac_cv_lib_PW_main = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPW 1
-_ACEOF
-
-  LIBS="-lPW $LIBS"
-
-fi
-
-
-echo "$as_me:$LINENO: checking for main in -lresolv" >&5
-echo $ECHO_N "checking for main in -lresolv... $ECHO_C" >&6
-if test "${ac_cv_lib_resolv_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_resolv_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_resolv_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_main" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv_main" >&6
-if test $ac_cv_lib_resolv_main = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBRESOLV 1
-_ACEOF
-
-  LIBS="-lresolv $LIBS"
-
-fi
-
-# QNX:
-
-echo "$as_me:$LINENO: checking for main in -lunix" >&5
-echo $ECHO_N "checking for main in -lunix... $ECHO_C" >&6
-if test "${ac_cv_lib_unix_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lunix  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_unix_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_unix_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_unix_main" >&5
-echo "${ECHO_T}$ac_cv_lib_unix_main" >&6
-if test $ac_cv_lib_unix_main = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBUNIX 1
-_ACEOF
-
-  LIBS="-lunix $LIBS"
-
-fi
-
-echo "$as_me:$LINENO: checking for library containing crypt" >&5
-echo $ECHO_N "checking for library containing crypt... $ECHO_C" >&6
-if test "${ac_cv_search_crypt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-ac_cv_search_crypt=no
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char crypt ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-crypt ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_crypt="none required"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_crypt" = no; then
-  for ac_lib in crypt; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char crypt ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-crypt ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_crypt="-l$ac_lib"
-break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  done
-fi
-LIBS=$ac_func_search_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
-echo "${ECHO_T}$ac_cv_search_crypt" >&6
-if test "$ac_cv_search_crypt" != no; then
-  test "$ac_cv_search_crypt" = "none required" || LIBS="$ac_cv_search_crypt $LIBS"
-
-fi
-
-# BeOS:
-
-echo "$as_me:$LINENO: checking for __inet_ntoa in -lbind" >&5
-echo $ECHO_N "checking for __inet_ntoa in -lbind... $ECHO_C" >&6
-if test "${ac_cv_lib_bind___inet_ntoa+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __inet_ntoa ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-__inet_ntoa ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_bind___inet_ntoa=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_bind___inet_ntoa=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bind___inet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_bind___inet_ntoa" >&6
-if test $ac_cv_lib_bind___inet_ntoa = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBBIND 1
-_ACEOF
-
-  LIBS="-lbind $LIBS"
-
-fi
-
-# Solaris:
-echo "$as_me:$LINENO: checking for library containing fdatasync" >&5
-echo $ECHO_N "checking for library containing fdatasync... $ECHO_C" >&6
-if test "${ac_cv_search_fdatasync+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-ac_cv_search_fdatasync=no
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char fdatasync ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-fdatasync ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_fdatasync="none required"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_fdatasync" = no; then
-  for ac_lib in rt posix4; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char fdatasync ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-fdatasync ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_fdatasync="-l$ac_lib"
-break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  done
-fi
-LIBS=$ac_func_search_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_search_fdatasync" >&5
-echo "${ECHO_T}$ac_cv_search_fdatasync" >&6
-if test "$ac_cv_search_fdatasync" != no; then
-  test "$ac_cv_search_fdatasync" = "none required" || LIBS="$ac_cv_search_fdatasync $LIBS"
-
-fi
-
-
-if test "$with_readline" = yes; then
-
-echo "$as_me:$LINENO: checking for readline" >&5
-echo $ECHO_N "checking for readline... $ECHO_C" >&6
-
-if test "${pgac_cv_check_readline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  pgac_cv_check_readline=no
-for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do
-  for pgac_rllib in -lreadline -ledit ; do
-    pgac_save_LIBS=$LIBS
-    LIBS="${pgac_rllib}${pgac_lib} $LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char readline ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-readline ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-      # NetBSD and OpenBSD have a broken linker that does not
-      # recognize dependent libraries
-      case $host_os in netbsd* | openbsd* )
-        case $pgac_lib in
-          *curses*) ;;
-          *) pgac_lib=" -lcurses" ;;
-        esac
-      esac
-
-      pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"
-      break 2
-
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-    LIBS=$pgac_save_LIBS
-  done
-done
-LIBS=$pgac_save_LIBS
-
-fi
-
-if test "$pgac_cv_check_readline" != no ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBREADLINE 1
-_ACEOF
-
-  LIBS="$pgac_cv_check_readline $LIBS"
-  echo "$as_me:$LINENO: result: yes ($pgac_cv_check_readline)" >&5
-echo "${ECHO_T}yes ($pgac_cv_check_readline)" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-  if test x"$pgac_cv_check_readline" = x"no"; then
-    { { echo "$as_me:$LINENO: error: readline library not found
-Use --without-readline to disable readline support." >&5
-echo "$as_me: error: readline library not found
-Use --without-readline to disable readline support." >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-if test "$with_zlib" = yes; then
-
-echo "$as_me:$LINENO: checking for inflate in -lz" >&5
-echo $ECHO_N "checking for inflate in -lz... $ECHO_C" >&6
-if test "${ac_cv_lib_z_inflate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char inflate ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-inflate ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_z_inflate=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_z_inflate=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflate" >&5
-echo "${ECHO_T}$ac_cv_lib_z_inflate" >&6
-if test $ac_cv_lib_z_inflate = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBZ 1
-_ACEOF
-
-  LIBS="-lz $LIBS"
-
-else
-  { { echo "$as_me:$LINENO: error: zlib library not found
-Use --without-zlib to disable zlib support." >&5
-echo "$as_me: error: zlib library not found
-Use --without-zlib to disable zlib support." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-fi
-
-if test "$with_krb4" = yes ; then
-
-echo "$as_me:$LINENO: checking for des_encrypt in -ldes" >&5
-echo $ECHO_N "checking for des_encrypt in -ldes... $ECHO_C" >&6
-if test "${ac_cv_lib_des_des_encrypt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldes  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char des_encrypt ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-des_encrypt ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_des_des_encrypt=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_des_des_encrypt=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_encrypt" >&5
-echo "${ECHO_T}$ac_cv_lib_des_des_encrypt" >&6
-if test $ac_cv_lib_des_des_encrypt = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDES 1
-_ACEOF
-
-  LIBS="-ldes $LIBS"
-
-else
-  { { echo "$as_me:$LINENO: error: library 'des' is required for Kerberos 4" >&5
-echo "$as_me: error: library 'des' is required for Kerberos 4" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-echo "$as_me:$LINENO: checking for krb_sendauth in -lkrb" >&5
-echo $ECHO_N "checking for krb_sendauth in -lkrb... $ECHO_C" >&6
-if test "${ac_cv_lib_krb_krb_sendauth+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lkrb  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char krb_sendauth ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-krb_sendauth ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_krb_krb_sendauth=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_krb_krb_sendauth=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_krb_krb_sendauth" >&5
-echo "${ECHO_T}$ac_cv_lib_krb_krb_sendauth" >&6
-if test $ac_cv_lib_krb_krb_sendauth = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBKRB 1
-_ACEOF
-
-  LIBS="-lkrb $LIBS"
-
-else
-  { { echo "$as_me:$LINENO: error: library 'krb' is required for Kerberos 4" >&5
-echo "$as_me: error: library 'krb' is required for Kerberos 4" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-fi
-
-if test "$with_krb5" = yes ; then
-  echo "$as_me:$LINENO: checking for library containing com_err" >&5
-echo $ECHO_N "checking for library containing com_err... $ECHO_C" >&6
-if test "${ac_cv_search_com_err+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-ac_cv_search_com_err=no
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char com_err ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-com_err ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_com_err="none required"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_com_err" = no; then
-  for ac_lib in krb5 'krb5 -ldes -lasn1 -lroken' com_err; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char com_err ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-com_err ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_com_err="-l$ac_lib"
-break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  done
-fi
-LIBS=$ac_func_search_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_search_com_err" >&5
-echo "${ECHO_T}$ac_cv_search_com_err" >&6
-if test "$ac_cv_search_com_err" != no; then
-  test "$ac_cv_search_com_err" = "none required" || LIBS="$ac_cv_search_com_err $LIBS"
-
-else
-  { { echo "$as_me:$LINENO: error: could not find function 'com_err' required for Kerberos 5" >&5
-echo "$as_me: error: could not find function 'com_err' required for Kerberos 5" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-  echo "$as_me:$LINENO: checking for library containing krb5_encrypt" >&5
-echo $ECHO_N "checking for library containing krb5_encrypt... $ECHO_C" >&6
-if test "${ac_cv_search_krb5_encrypt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-ac_cv_search_krb5_encrypt=no
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char krb5_encrypt ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-krb5_encrypt ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_krb5_encrypt="none required"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_krb5_encrypt" = no; then
-  for ac_lib in krb5 'krb5 -ldes -lasn1 -lroken' crypto k5crypto; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char krb5_encrypt ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-krb5_encrypt ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_krb5_encrypt="-l$ac_lib"
-break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  done
-fi
-LIBS=$ac_func_search_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_search_krb5_encrypt" >&5
-echo "${ECHO_T}$ac_cv_search_krb5_encrypt" >&6
-if test "$ac_cv_search_krb5_encrypt" != no; then
-  test "$ac_cv_search_krb5_encrypt" = "none required" || LIBS="$ac_cv_search_krb5_encrypt $LIBS"
-
-else
-  { { echo "$as_me:$LINENO: error: could not find function 'krb5_encrypt' required for Kerberos 5" >&5
-echo "$as_me: error: could not find function 'krb5_encrypt' required for Kerberos 5" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-  echo "$as_me:$LINENO: checking for library containing krb5_sendauth" >&5
-echo $ECHO_N "checking for library containing krb5_sendauth... $ECHO_C" >&6
-if test "${ac_cv_search_krb5_sendauth+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-ac_cv_search_krb5_sendauth=no
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char krb5_sendauth ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-krb5_sendauth ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_krb5_sendauth="none required"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_krb5_sendauth" = no; then
-  for ac_lib in krb5 'krb5 -ldes -lasn1 -lroken'; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char krb5_sendauth ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-krb5_sendauth ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_krb5_sendauth="-l$ac_lib"
-break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  done
-fi
-LIBS=$ac_func_search_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_search_krb5_sendauth" >&5
-echo "${ECHO_T}$ac_cv_search_krb5_sendauth" >&6
-if test "$ac_cv_search_krb5_sendauth" != no; then
-  test "$ac_cv_search_krb5_sendauth" = "none required" || LIBS="$ac_cv_search_krb5_sendauth $LIBS"
-
-else
-  { { echo "$as_me:$LINENO: error: could not find function 'krb5_sendauth' required for Kerberos 5" >&5
-echo "$as_me: error: could not find function 'krb5_sendauth' required for Kerberos 5" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-fi
-
-if test "$with_openssl" = yes ; then
-
-echo "$as_me:$LINENO: checking for CRYPTO_new_ex_data in -lcrypto" >&5
-echo $ECHO_N "checking for CRYPTO_new_ex_data in -lcrypto... $ECHO_C" >&6
-if test "${ac_cv_lib_crypto_CRYPTO_new_ex_data+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypto  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char CRYPTO_new_ex_data ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-CRYPTO_new_ex_data ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_crypto_CRYPTO_new_ex_data=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_crypto_CRYPTO_new_ex_data=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_new_ex_data" >&5
-echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_new_ex_data" >&6
-if test $ac_cv_lib_crypto_CRYPTO_new_ex_data = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCRYPTO 1
-_ACEOF
-
-  LIBS="-lcrypto $LIBS"
-
-else
-  { { echo "$as_me:$LINENO: error: library 'crypto' is required for OpenSSL" >&5
-echo "$as_me: error: library 'crypto' is required for OpenSSL" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-echo "$as_me:$LINENO: checking for SSL_library_init in -lssl" >&5
-echo $ECHO_N "checking for SSL_library_init in -lssl... $ECHO_C" >&6
-if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lssl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char SSL_library_init ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-SSL_library_init ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ssl_SSL_library_init=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_ssl_SSL_library_init=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_library_init" >&5
-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_library_init" >&6
-if test $ac_cv_lib_ssl_SSL_library_init = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSSL 1
-_ACEOF
-
-  LIBS="-lssl $LIBS"
-
-else
-  { { echo "$as_me:$LINENO: error: library 'ssl' is required for OpenSSL" >&5
-echo "$as_me: error: library 'ssl' is required for OpenSSL" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-fi
-
-if test "$with_pam" = yes ; then
-
-echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
-echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6
-if test "${ac_cv_lib_pam_pam_start+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpam  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char pam_start ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-pam_start ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pam_pam_start=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_pam_pam_start=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5
-echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6
-if test $ac_cv_lib_pam_pam_start = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPAM 1
-_ACEOF
-
-  LIBS="-lpam $LIBS"
-
-else
-  { { echo "$as_me:$LINENO: error: library 'pam' is required for PAM" >&5
-echo "$as_me: error: library 'pam' is required for PAM" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-fi
-
-
-##
-## Header files
-##
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_header_stdc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <ctype.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
-                     || ('j' <= (c) && (c) <= 'r') \
-                     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-        || toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-                  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_header in crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h pwd.h sys/ipc.h sys/pstat.h sys/select.h sys/sem.h sys/socket.h sys/shm.h sys/un.h termios.h kernel/OS.h kernel/image.h SupportDefs.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-  no:yes )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-# At least on IRIX, cpp test for netinet/tcp.h will fail unless
-# netinet/in.h is included first.
-
-for ac_header in netinet/in.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-  no:yes )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in netinet/tcp.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-if test "$with_readline" = yes; then
-
-for ac_header in readline/readline.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-  no:yes )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-else
-
-for ac_header in readline.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-  no:yes )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  { { echo "$as_me:$LINENO: error: readline header not found
-Use --without-readline to disable readline support." >&5
-echo "$as_me: error: readline header not found
-Use --without-readline to disable readline support." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-done
-
-fi
-
-done
-
-
-for ac_header in readline/history.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-  no:yes )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-else
-
-for ac_header in history.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-  no:yes )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  { { echo "$as_me:$LINENO: error: history header not found
-Use --without-readline to disable readline support." >&5
-echo "$as_me: error: history header not found
-Use --without-readline to disable readline support." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-done
-
-fi
-
-done
-
-fi
-
-if test "$with_zlib" = yes; then
-  if test "${ac_cv_header_zlib_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for zlib.h" >&5
-echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
-if test "${ac_cv_header_zlib_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking zlib.h usability" >&5
-echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#include <zlib.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking zlib.h presence" >&5
-echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <zlib.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
-    { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;};;
-  no:yes )
-    { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:$LINENO: checking for zlib.h" >&5
-echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
-if test "${ac_cv_header_zlib_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_zlib_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
-
-fi
-if test $ac_cv_header_zlib_h = yes; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: zlib header not found
-Use --without-zlib to disable zlib support." >&5
-echo "$as_me: error: zlib header not found
-Use --without-zlib to disable zlib support." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-fi
-
-if test "$with_krb4" = yes ; then
-  if test "${ac_cv_header_krb_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for krb.h" >&5
-echo $ECHO_N "checking for krb.h... $ECHO_C" >&6
-if test "${ac_cv_header_krb_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_krb_h" >&5
-echo "${ECHO_T}$ac_cv_header_krb_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking krb.h usability" >&5
-echo $ECHO_N "checking krb.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#include <krb.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking krb.h presence" >&5
-echo $ECHO_N "checking krb.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <krb.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
-    { echo "$as_me:$LINENO: WARNING: krb.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: krb.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: krb.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: krb.h: proceeding with the preprocessor's result" >&2;};;
-  no:yes )
-    { echo "$as_me:$LINENO: WARNING: krb.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: krb.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: krb.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: krb.h: check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: krb.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: krb.h: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:$LINENO: checking for krb.h" >&5
-echo $ECHO_N "checking for krb.h... $ECHO_C" >&6
-if test "${ac_cv_header_krb_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_krb_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_krb_h" >&5
-echo "${ECHO_T}$ac_cv_header_krb_h" >&6
-
-fi
-if test $ac_cv_header_krb_h = yes; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: header file <krb.h> is required for Kerberos 4" >&5
-echo "$as_me: error: header file <krb.h> is required for Kerberos 4" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-fi
-
-if test "$with_krb5" = yes ; then
-  if test "${ac_cv_header_krb5_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for krb5.h" >&5
-echo $ECHO_N "checking for krb5.h... $ECHO_C" >&6
-if test "${ac_cv_header_krb5_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_krb5_h" >&5
-echo "${ECHO_T}$ac_cv_header_krb5_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking krb5.h usability" >&5
-echo $ECHO_N "checking krb5.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#include <krb5.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking krb5.h presence" >&5
-echo $ECHO_N "checking krb5.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <krb5.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
-    { echo "$as_me:$LINENO: WARNING: krb5.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: krb5.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: krb5.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: krb5.h: proceeding with the preprocessor's result" >&2;};;
-  no:yes )
-    { echo "$as_me:$LINENO: WARNING: krb5.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: krb5.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: krb5.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: krb5.h: check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: krb5.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: krb5.h: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:$LINENO: checking for krb5.h" >&5
-echo $ECHO_N "checking for krb5.h... $ECHO_C" >&6
-if test "${ac_cv_header_krb5_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_krb5_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_krb5_h" >&5
-echo "${ECHO_T}$ac_cv_header_krb5_h" >&6
-
-fi
-if test $ac_cv_header_krb5_h = yes; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: header file <krb5.h> is required for Kerberos 5" >&5
-echo "$as_me: error: header file <krb5.h> is required for Kerberos 5" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-  if test "${ac_cv_header_com_err_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for com_err.h" >&5
-echo $ECHO_N "checking for com_err.h... $ECHO_C" >&6
-if test "${ac_cv_header_com_err_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5
-echo "${ECHO_T}$ac_cv_header_com_err_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking com_err.h usability" >&5
-echo $ECHO_N "checking com_err.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#include <com_err.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking com_err.h presence" >&5
-echo $ECHO_N "checking com_err.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <com_err.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
-    { echo "$as_me:$LINENO: WARNING: com_err.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: com_err.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: com_err.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: com_err.h: proceeding with the preprocessor's result" >&2;};;
-  no:yes )
-    { echo "$as_me:$LINENO: WARNING: com_err.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: com_err.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: com_err.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: com_err.h: check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: com_err.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: com_err.h: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:$LINENO: checking for com_err.h" >&5
-echo $ECHO_N "checking for com_err.h... $ECHO_C" >&6
-if test "${ac_cv_header_com_err_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_com_err_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5
-echo "${ECHO_T}$ac_cv_header_com_err_h" >&6
-
-fi
-if test $ac_cv_header_com_err_h = yes; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: header file <com_err.h> is required for Kerberos 5" >&5
-echo "$as_me: error: header file <com_err.h> is required for Kerberos 5" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-fi
-
-if test "$with_openssl" = yes ; then
-  if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
-echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6
-if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
-echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking openssl/ssl.h usability" >&5
-echo $ECHO_N "checking openssl/ssl.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#include <openssl/ssl.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking openssl/ssl.h presence" >&5
-echo $ECHO_N "checking openssl/ssl.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <openssl/ssl.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
-    { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&2;};;
-  no:yes )
-    { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: openssl/ssl.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: openssl/ssl.h: check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
-echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6
-if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_openssl_ssl_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
-echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6
-
-fi
-if test $ac_cv_header_openssl_ssl_h = yes; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: header file <openssl/ssl.h> is required for OpenSSL" >&5
-echo "$as_me: error: header file <openssl/ssl.h> is required for OpenSSL" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-  if test "${ac_cv_header_openssl_err_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for openssl/err.h" >&5
-echo $ECHO_N "checking for openssl/err.h... $ECHO_C" >&6
-if test "${ac_cv_header_openssl_err_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_openssl_err_h" >&5
-echo "${ECHO_T}$ac_cv_header_openssl_err_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking openssl/err.h usability" >&5
-echo $ECHO_N "checking openssl/err.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#include <openssl/err.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking openssl/err.h presence" >&5
-echo $ECHO_N "checking openssl/err.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <openssl/err.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
-    { echo "$as_me:$LINENO: WARNING: openssl/err.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: openssl/err.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/err.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: openssl/err.h: proceeding with the preprocessor's result" >&2;};;
-  no:yes )
-    { echo "$as_me:$LINENO: WARNING: openssl/err.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: openssl/err.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/err.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: openssl/err.h: check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/err.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: openssl/err.h: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:$LINENO: checking for openssl/err.h" >&5
-echo $ECHO_N "checking for openssl/err.h... $ECHO_C" >&6
-if test "${ac_cv_header_openssl_err_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_openssl_err_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_openssl_err_h" >&5
-echo "${ECHO_T}$ac_cv_header_openssl_err_h" >&6
-
-fi
-if test $ac_cv_header_openssl_err_h = yes; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: header file <openssl/err.h> is required for OpenSSL" >&5
-echo "$as_me: error: header file <openssl/err.h> is required for OpenSSL" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-fi
-
-if test "$with_pam" = yes ; then
-  if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
-echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6
-if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
-echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5
-echo $ECHO_N "checking security/pam_appl.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#include <security/pam_appl.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5
-echo $ECHO_N "checking security/pam_appl.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <security/pam_appl.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
-    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;};;
-  no:yes )
-    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: security/pam_appl.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
-echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6
-if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_security_pam_appl_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
-echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6
-
-fi
-if test $ac_cv_header_security_pam_appl_h = yes; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: header file <security/pam_appl.h> is required for PAM" >&5
-echo "$as_me: error: header file <security/pam_appl.h> is required for PAM" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-fi
-
-
-##
-## Types, structures, compiler characteristics
-##
-
-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
-  typedef int charset[2];
-  const charset x;
-  /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *ccp;
-  char **p;
-  /* NEC SVR4.0.2 mips cc rejects this.  */
-  struct point {int x, y;};
-  static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
-     It does not let you subtract one const X* pointer from another in
-     an arm of an if-expression whose if-part is not a constant
-     expression */
-  const char *g = "string";
-  ccp = &g + (g ? g-g : 0);
-  /* HPUX 7.0 cc rejects these. */
-  ++ccp;
-  p = (char**) ccp;
-  ccp = (char const *const *) p;
-  { /* SCO 3.2v4 cc rejects this.  */
-    char *t;
-    char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-    *t++ = 0;
-  }
-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-    int x[] = {25, 17};
-    const int *foo = &x[0];
-    ++foo;
-  }
-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-    typedef const int *iptr;
-    iptr p = 0;
-    ++p;
-  }
-  { /* AIX XL C 1.02.0.0 rejects this saying
-       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
-    struct s *b; b->j = 5;
-  }
-  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-    const int foo = 10;
-  }
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_const=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_c_const=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6
-if test $ac_cv_c_const = no; then
-
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6
-if test "${ac_cv_c_inline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#ifndef __cplusplus
-static $ac_kw int static_foo () {return 0; }
-$ac_kw int foo () {return 0; }
-#endif
-
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_inline=$ac_kw; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6
-case $ac_cv_c_inline in
-  inline | yes) ;;
-  no)
-cat >>confdefs.h <<\_ACEOF
-#define inline
-_ACEOF
- ;;
-  *)  cat >>confdefs.h <<_ACEOF
-#define inline $ac_cv_c_inline
-_ACEOF
- ;;
-esac
-
-echo "$as_me:$LINENO: checking for preprocessor stringizing operator" >&5
-echo $ECHO_N "checking for preprocessor stringizing operator... $ECHO_C" >&6
-if test "${ac_cv_c_stringize+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#define x(y) #y
-
-char *s = x(teststring);
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "#teststring" >/dev/null 2>&1; then
-  ac_cv_c_stringize=no
-else
-  ac_cv_c_stringize=yes
-fi
-rm -f conftest*
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_stringize" >&5
-echo "${ECHO_T}$ac_cv_c_stringize" >&6
-if test $ac_cv_c_stringize = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRINGIZE 1
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for signed types" >&5
-echo $ECHO_N "checking for signed types... $ECHO_C" >&6
-if test "${pgac_cv_c_signed+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-signed char c; signed short s; signed int i;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  pgac_cv_c_signed=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-pgac_cv_c_signed=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $pgac_cv_c_signed" >&5
-echo "${ECHO_T}$pgac_cv_c_signed" >&6
-if test x"$pgac_cv_c_signed" = xno ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define signed
-_ACEOF
-
-fi
-echo "$as_me:$LINENO: checking for working volatile" >&5
-echo $ECHO_N "checking for working volatile... $ECHO_C" >&6
-if test "${ac_cv_c_volatile+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-
-volatile int x;
-int * volatile y;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_volatile=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_c_volatile=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5
-echo "${ECHO_T}$ac_cv_c_volatile" >&6
-if test $ac_cv_c_volatile = no; then
-
-cat >>confdefs.h <<\_ACEOF
-#define volatile
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
-if test "${ac_cv_struct_tm+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <time.h>
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-struct tm *tp; tp->tm_sec;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_struct_tm=time.h
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_struct_tm=sys/time.h
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-echo "${ECHO_T}$ac_cv_struct_tm" >&6
-if test $ac_cv_struct_tm = sys/time.h; then
-
-cat >>confdefs.h <<\_ACEOF
-#define TM_IN_SYS_TIME 1
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
-echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6
-if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <$ac_cv_struct_tm>
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static struct tm ac_aggr;
-if (ac_aggr.tm_zone)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_tm_tm_zone=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_member_struct_tm_tm_zone=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
-echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6
-if test $ac_cv_member_struct_tm_tm_zone = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_TM_TM_ZONE 1
-_ACEOF
-
-
-fi
-
-if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_TM_ZONE 1
-_ACEOF
-
-else
-  echo "$as_me:$LINENO: checking for tzname" >&5
-echo $ECHO_N "checking for tzname... $ECHO_C" >&6
-if test "${ac_cv_var_tzname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <time.h>
-#ifndef tzname /* For SGI.  */
-extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
-#endif
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-atoi(*tzname);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_var_tzname=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_var_tzname=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
-echo "${ECHO_T}$ac_cv_var_tzname" >&6
-  if test $ac_cv_var_tzname = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_TZNAME 1
-_ACEOF
-
-  fi
-fi
-
-echo "$as_me:$LINENO: checking for union semun" >&5
-echo $ECHO_N "checking for union semun... $ECHO_C" >&6
-if test "${ac_cv_type_union_semun+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-if ((union semun *) 0)
-  return 0;
-if (sizeof (union semun))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_union_semun=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_union_semun=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_union_semun" >&5
-echo "${ECHO_T}$ac_cv_type_union_semun" >&6
-if test $ac_cv_type_union_semun = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_UNION_SEMUN 1
-_ACEOF
-
-
-fi
-
-echo "$as_me:$LINENO: checking for struct sockaddr_un" >&5
-echo $ECHO_N "checking for struct sockaddr_un... $ECHO_C" >&6
-if test "${ac_cv_type_struct_sockaddr_un+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#ifdef HAVE_SYS_UN_H
-#include <sys/un.h>
-#endif
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-if ((struct sockaddr_un *) 0)
-  return 0;
-if (sizeof (struct sockaddr_un))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_struct_sockaddr_un=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_struct_sockaddr_un=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_un" >&5
-echo "${ECHO_T}$ac_cv_type_struct_sockaddr_un" >&6
-if test $ac_cv_type_struct_sockaddr_un = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_SOCKADDR_UN 1
-_ACEOF
-
-
-fi
-
-
-echo "$as_me:$LINENO: checking for struct cmsgcred" >&5
-echo $ECHO_N "checking for struct cmsgcred... $ECHO_C" >&6
-if test "${ac_cv_type_struct_cmsgcred+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/ucred.h>
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-if ((struct cmsgcred *) 0)
-  return 0;
-if (sizeof (struct cmsgcred))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_struct_cmsgcred=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_struct_cmsgcred=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_struct_cmsgcred" >&5
-echo "${ECHO_T}$ac_cv_type_struct_cmsgcred" >&6
-if test $ac_cv_type_struct_cmsgcred = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_CMSGCRED 1
-_ACEOF
-
-
-fi
-echo "$as_me:$LINENO: checking for struct fcred" >&5
-echo $ECHO_N "checking for struct fcred... $ECHO_C" >&6
-if test "${ac_cv_type_struct_fcred+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/ucred.h>
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-if ((struct fcred *) 0)
-  return 0;
-if (sizeof (struct fcred))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_struct_fcred=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_struct_fcred=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_struct_fcred" >&5
-echo "${ECHO_T}$ac_cv_type_struct_fcred" >&6
-if test $ac_cv_type_struct_fcred = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_FCRED 1
-_ACEOF
-
-
-fi
-echo "$as_me:$LINENO: checking for struct sockcred" >&5
-echo $ECHO_N "checking for struct sockcred... $ECHO_C" >&6
-if test "${ac_cv_type_struct_sockcred+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/ucred.h>
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-if ((struct sockcred *) 0)
-  return 0;
-if (sizeof (struct sockcred))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_struct_sockcred=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_struct_sockcred=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockcred" >&5
-echo "${ECHO_T}$ac_cv_type_struct_sockcred" >&6
-if test $ac_cv_type_struct_sockcred = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_SOCKCRED 1
-_ACEOF
-
-
-fi
-
-
-if test "$with_zlib" = yes; then
-  # Check that <zlib.h> defines z_streamp (versions before about 1.0.4
-  # did not).  While we could work around the lack of z_streamp, it
-  # seems unwise to encourage people to use such old zlib versions...
-  echo "$as_me:$LINENO: checking for z_streamp" >&5
-echo $ECHO_N "checking for z_streamp... $ECHO_C" >&6
-if test "${ac_cv_type_z_streamp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <zlib.h>
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-if ((z_streamp *) 0)
-  return 0;
-if (sizeof (z_streamp))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_z_streamp=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_z_streamp=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_z_streamp" >&5
-echo "${ECHO_T}$ac_cv_type_z_streamp" >&6
-if test $ac_cv_type_z_streamp = yes; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: zlib version is too old
-Use --without-zlib to disable zlib support." >&5
-echo "$as_me: error: zlib version is too old
-Use --without-zlib to disable zlib support." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-fi
-
-if test "$with_krb5" = yes; then
-# Check for differences between MIT and Heimdal (KTH) releases
-  echo "$as_me:$LINENO: checking for krb5_ticket.enc_part2" >&5
-echo $ECHO_N "checking for krb5_ticket.enc_part2... $ECHO_C" >&6
-if test "${ac_cv_member_krb5_ticket_enc_part2+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <krb5.h>
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static krb5_ticket ac_aggr;
-if (ac_aggr.enc_part2)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_krb5_ticket_enc_part2=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_member_krb5_ticket_enc_part2=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_member_krb5_ticket_enc_part2" >&5
-echo "${ECHO_T}$ac_cv_member_krb5_ticket_enc_part2" >&6
-if test $ac_cv_member_krb5_ticket_enc_part2 = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_KRB5_TICKET_ENC_PART2 1
-_ACEOF
-
-
-else
-  echo "$as_me:$LINENO: checking for krb5_ticket.client" >&5
-echo $ECHO_N "checking for krb5_ticket.client... $ECHO_C" >&6
-if test "${ac_cv_member_krb5_ticket_client+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <krb5.h>
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static krb5_ticket ac_aggr;
-if (ac_aggr.client)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_krb5_ticket_client=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_member_krb5_ticket_client=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_member_krb5_ticket_client" >&5
-echo "${ECHO_T}$ac_cv_member_krb5_ticket_client" >&6
-if test $ac_cv_member_krb5_ticket_client = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_KRB5_TICKET_CLIENT 1
-_ACEOF
-
-
-else
-  { { echo "$as_me:$LINENO: error: could not determine how to get client name from Kerberos 5 ticket" >&5
-echo "$as_me: error: could not determine how to get client name from Kerberos 5 ticket" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-fi
-
-  echo "$as_me:$LINENO: checking for krb5_error.text.data" >&5
-echo $ECHO_N "checking for krb5_error.text.data... $ECHO_C" >&6
-if test "${ac_cv_member_krb5_error_text_data+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <krb5.h>
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static krb5_error ac_aggr;
-if (ac_aggr.text.data)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_krb5_error_text_data=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_member_krb5_error_text_data=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_member_krb5_error_text_data" >&5
-echo "${ECHO_T}$ac_cv_member_krb5_error_text_data" >&6
-if test $ac_cv_member_krb5_error_text_data = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_KRB5_ERROR_TEXT_DATA 1
-_ACEOF
-
-
-else
-  echo "$as_me:$LINENO: checking for krb5_error.e_data" >&5
-echo $ECHO_N "checking for krb5_error.e_data... $ECHO_C" >&6
-if test "${ac_cv_member_krb5_error_e_data+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <krb5.h>
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static krb5_error ac_aggr;
-if (ac_aggr.e_data)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_krb5_error_e_data=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_member_krb5_error_e_data=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_member_krb5_error_e_data" >&5
-echo "${ECHO_T}$ac_cv_member_krb5_error_e_data" >&6
-if test $ac_cv_member_krb5_error_e_data = yes; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: could not determine how to extract Kerberos 5 error messages" >&5
-echo "$as_me: error: could not determine how to extract Kerberos 5 error messages" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-fi
-
-fi
-
-
-##
-## Functions, global variables
-##
-echo "$as_me:$LINENO: checking for int timezone" >&5
-echo $ECHO_N "checking for int timezone... $ECHO_C" >&6
-if test "${pgac_cv_var_int_timezone+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <time.h>
-int res;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-res = timezone / 60;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  pgac_cv_var_int_timezone=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-pgac_cv_var_int_timezone=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $pgac_cv_var_int_timezone" >&5
-echo "${ECHO_T}$pgac_cv_var_int_timezone" >&6
-if test x"$pgac_cv_var_int_timezone" = xyes ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_INT_TIMEZONE
-_ACEOF
-
-fi
-echo "$as_me:$LINENO: checking types of arguments for accept()" >&5
-echo $ECHO_N "checking types of arguments for accept()... $ECHO_C" >&6
- if test "${ac_cv_func_accept_arg1+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-   if test "${ac_cv_func_accept_arg2+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-    if test "${ac_cv_func_accept_arg3+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-     for ac_cv_func_accept_arg1 in 'int' 'unsigned int'; do
-     for ac_cv_func_accept_arg2 in 'struct sockaddr *' 'const struct sockaddr *' 'void *'; do
-      for ac_cv_func_accept_arg3 in 'int' 'size_t' 'socklen_t' 'unsigned int' 'void'; do
-       cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-extern int accept ($ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *);
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_not_found=no; break 3
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_not_found=yes
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-      done
-     done
-    done
-    if test "$ac_not_found" = yes; then
-      { { echo "$as_me:$LINENO: error: could not determine argument types" >&5
-echo "$as_me: error: could not determine argument types" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    if test "$ac_cv_func_accept_arg3" = "void"; then
-      ac_cv_func_accept_arg3=int
-    fi
-
-fi
-
-fi
-
-fi
- echo "$as_me:$LINENO: result: $ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *" >&5
-echo "${ECHO_T}$ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *" >&6
-
-cat >>confdefs.h <<_ACEOF
-#define ACCEPT_TYPE_ARG1 $ac_cv_func_accept_arg1
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define ACCEPT_TYPE_ARG2 $ac_cv_func_accept_arg2
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define ACCEPT_TYPE_ARG3 $ac_cv_func_accept_arg3
-_ACEOF
-
-
-echo "$as_me:$LINENO: checking whether gettimeofday takes only one argument" >&5
-echo $ECHO_N "checking whether gettimeofday takes only one argument... $ECHO_C" >&6
-if test "${pgac_cv_func_gettimeofday_1arg+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <sys/time.h>
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-struct timeval *tp;
-struct timezone *tzp;
-gettimeofday(tp,tzp);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  pgac_cv_func_gettimeofday_1arg=no
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-pgac_cv_func_gettimeofday_1arg=yes
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $pgac_cv_func_gettimeofday_1arg" >&5
-echo "${ECHO_T}$pgac_cv_func_gettimeofday_1arg" >&6
-if test x"$pgac_cv_func_gettimeofday_1arg" = xyes ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define GETTIMEOFDAY_1ARG
-_ACEOF
-
-fi
-
-# SunOS doesn't handle negative byte comparisons properly with +/- return
-echo "$as_me:$LINENO: checking for 8-bit clean memcmp" >&5
-echo $ECHO_N "checking for 8-bit clean memcmp... $ECHO_C" >&6
-if test "${pgac_cv_func_memcmp_clean+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  pgac_cv_func_memcmp_clean=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-main()
-{
-  char c0 = 0x40, c1 = 0x80, c2 = 0x81;
-  exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  pgac_cv_func_memcmp_clean=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-( exit $ac_status )
-pgac_cv_func_memcmp_clean=no
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:$LINENO: result: $pgac_cv_func_memcmp_clean" >&5
-echo "${ECHO_T}$pgac_cv_func_memcmp_clean" >&6
-if test $pgac_cv_func_memcmp_clean = no ; then
-  MEMCMP=memcmp.o
-else
-  MEMCMP=
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_func in cbrt fcvt getopt_long memmove pstat setproctitle setsid sigprocmask sysconf waitpid dlopen fdatasync
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-echo "$as_me:$LINENO: checking whether fdatasync is declared" >&5
-echo $ECHO_N "checking whether fdatasync is declared... $ECHO_C" >&6
-if test "${ac_cv_have_decl_fdatasync+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <unistd.h>
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-#ifndef fdatasync
-  char *p = (char *) fdatasync;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_have_decl_fdatasync=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_have_decl_fdatasync=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_have_decl_fdatasync" >&5
-echo "${ECHO_T}$ac_cv_have_decl_fdatasync" >&6
-if test $ac_cv_have_decl_fdatasync = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FDATASYNC 1
-_ACEOF
-
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FDATASYNC 0
-_ACEOF
-
-
-fi
-
-
-
-echo "$as_me:$LINENO: checking for PS_STRINGS" >&5
-echo $ECHO_N "checking for PS_STRINGS... $ECHO_C" >&6
-if test "${pgac_cv_var_PS_STRINGS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <machine/vmparam.h>
-#include <sys/exec.h>
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-PS_STRINGS->ps_nargvstr = 1;
-PS_STRINGS->ps_argvstr = "foo";
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  pgac_cv_var_PS_STRINGS=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-pgac_cv_var_PS_STRINGS=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $pgac_cv_var_PS_STRINGS" >&5
-echo "${ECHO_T}$pgac_cv_var_PS_STRINGS" >&6
-if test "$pgac_cv_var_PS_STRINGS" = yes ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PS_STRINGS
-_ACEOF
-
-fi
-
-
-# We use our snprintf.c emulation if either snprintf() or vsnprintf()
-# is missing.  Yes, there are machines that have only one.  We may
-# also decide to use snprintf.c if snprintf() is present but does not
-# have working "long long int" support -- see below.
-
-SNPRINTF=''
-
-for ac_func in snprintf
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  SNPRINTF='snprintf.o'
-fi
-done
-
-
-for ac_func in vsnprintf
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  SNPRINTF='snprintf.o'
-fi
-done
-
-
-
-
-# Check whether <stdio.h> declares snprintf() and vsnprintf(); if not,
-# include/c.h will provide declarations.  Note this is a separate test
-# from whether the functions exist in the C library --- there are
-# systems that have the functions but don't bother to declare them :-(
-
-echo "$as_me:$LINENO: checking whether snprintf is declared" >&5
-echo $ECHO_N "checking whether snprintf is declared... $ECHO_C" >&6
-if test "${ac_cv_have_decl_snprintf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-#ifndef snprintf
-  char *p = (char *) snprintf;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_have_decl_snprintf=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_have_decl_snprintf=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_have_decl_snprintf" >&5
-echo "${ECHO_T}$ac_cv_have_decl_snprintf" >&6
-if test $ac_cv_have_decl_snprintf = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SNPRINTF 1
-_ACEOF
-
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SNPRINTF 0
-_ACEOF
-
-
-fi
-echo "$as_me:$LINENO: checking whether vsnprintf is declared" >&5
-echo $ECHO_N "checking whether vsnprintf is declared... $ECHO_C" >&6
-if test "${ac_cv_have_decl_vsnprintf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-#ifndef vsnprintf
-  char *p = (char *) vsnprintf;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_have_decl_vsnprintf=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_have_decl_vsnprintf=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_have_decl_vsnprintf" >&5
-echo "${ECHO_T}$ac_cv_have_decl_vsnprintf" >&6
-if test $ac_cv_have_decl_vsnprintf = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_VSNPRINTF 1
-_ACEOF
-
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_VSNPRINTF 0
-_ACEOF
-
-
-fi
-
-
-
-
-# do this one the hard way in case isinf() is a macro
-echo "$as_me:$LINENO: checking for isinf" >&5
-echo $ECHO_N "checking for isinf... $ECHO_C" >&6
-if test "${ac_cv_func_isinf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <math.h>
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-double x = 0.0; int res = isinf(x);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_isinf=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_func_isinf=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_isinf" >&5
-echo "${ECHO_T}$ac_cv_func_isinf" >&6
-
-if test $ac_cv_func_isinf = yes ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ISINF 1
-_ACEOF
-
-  ISINF=
-else
-  ISINF='isinf.o'
-  # Look for a way to implement a substitute for isinf()
-
-
-
-
-for ac_func in fpclass fp_class fp_class_d class
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- break
-fi
-done
-
-fi
-
-
-
-
-for ac_func in getrusage
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  GETRUSAGE='getrusage.o'
-fi
-done
-
-
-
-for ac_func in srandom
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  SRANDOM='srandom.o'
-fi
-done
-
-
-
-for ac_func in gethostname
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  GETHOSTNAME='gethostname.o'
-fi
-done
-
-
-
-for ac_func in random
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  MISSING_RANDOM='random.o'
-fi
-done
-
-
-
-for ac_func in inet_aton
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  INET_ATON='inet_aton.o'
-fi
-done
-
-
-
-for ac_func in strerror
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  STRERROR='strerror.o'
-fi
-done
-
-
-
-for ac_func in strdup
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  STRDUP='../../utils/strdup.o'
-fi
-done
-
-
-
-for ac_func in strtol
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  STRTOL='strtol.o'
-fi
-done
-
-
-
-for ac_func in strtoul
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  STRTOUL='strtoul.o'
-fi
-done
-
-
-
-for ac_func in strcasecmp
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  STRCASECMP='strcasecmp.o'
-fi
-done
-
-
-
-# On HPUX 9, rint() is not in regular libm.a but in /lib/pa1.1/libm.a;
-# this hackery with HPUXMATHLIB allows us to cope.
-HPUXMATHLIB=""
-case $host_cpu in
-  hppa1.1)
-	if [ -r /lib/pa1.1/libm.a ] ; then
-	    HPUXMATHLIB="-L /lib/pa1.1 -lm"
-	fi ;;
-esac
-
-
-
-for ac_func in rint
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  echo "$as_me:$LINENO: checking for rint in -lm" >&5
-echo $ECHO_N "checking for rint in -lm... $ECHO_C" >&6
-if test "${ac_cv_lib_m_rint+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm $HPUXMATHLIB $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char rint ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-rint ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_m_rint=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_m_rint=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_m_rint" >&5
-echo "${ECHO_T}$ac_cv_lib_m_rint" >&6
-if test $ac_cv_lib_m_rint = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_RINT 1
-_ACEOF
-
-fi
-
-fi
-done
-
-
-
-if test "$with_readline" = yes; then
-  echo "$as_me:$LINENO: checking for rl_completion_append_character" >&5
-echo $ECHO_N "checking for rl_completion_append_character... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <stdio.h>
-#ifdef HAVE_READLINE_READLINE_H
-# include <readline/readline.h>
-#elif defined(HAVE_READLINE_H)
-# include <readline.h>
-#endif
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-rl_completion_append_character = 'x';
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_RL_COMPLETION_APPEND_CHARACTER 1
-_ACEOF
-
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-
-
-for ac_func in rl_completion_matches rl_filename_completion_function
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-fi
-
-
-echo "$as_me:$LINENO: checking for finite" >&5
-echo $ECHO_N "checking for finite... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <math.h>
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-int dummy=finite(1.0);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FINITE 1
-_ACEOF
-
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-
-echo "$as_me:$LINENO: checking for sigsetjmp" >&5
-echo $ECHO_N "checking for sigsetjmp... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <setjmp.h>
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-sigjmp_buf x; sigsetjmp(x, 1);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SIGSETJMP 1
-_ACEOF
-
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-
-echo "$as_me:$LINENO: checking for syslog" >&5
-echo $ECHO_N "checking for syslog... $ECHO_C" >&6
-if test "${ac_cv_func_syslog+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char syslog (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char syslog ();
-char (*f) ();
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_syslog) || defined (__stub___syslog)
-choke me
-#else
-f = syslog;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_syslog=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_func_syslog=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_syslog" >&5
-echo "${ECHO_T}$ac_cv_func_syslog" >&6
-if test $ac_cv_func_syslog = yes; then
-  if test "${ac_cv_header_syslog_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for syslog.h" >&5
-echo $ECHO_N "checking for syslog.h... $ECHO_C" >&6
-if test "${ac_cv_header_syslog_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_syslog_h" >&5
-echo "${ECHO_T}$ac_cv_header_syslog_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking syslog.h usability" >&5
-echo $ECHO_N "checking syslog.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#include <syslog.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking syslog.h presence" >&5
-echo $ECHO_N "checking syslog.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <syslog.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
-    { echo "$as_me:$LINENO: WARNING: syslog.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: syslog.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: syslog.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: syslog.h: proceeding with the preprocessor's result" >&2;};;
-  no:yes )
-    { echo "$as_me:$LINENO: WARNING: syslog.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: syslog.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: syslog.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: syslog.h: check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: syslog.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: syslog.h: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:$LINENO: checking for syslog.h" >&5
-echo $ECHO_N "checking for syslog.h... $ECHO_C" >&6
-if test "${ac_cv_header_syslog_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_syslog_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_syslog_h" >&5
-echo "${ECHO_T}$ac_cv_header_syslog_h" >&6
-
-fi
-if test $ac_cv_header_syslog_h = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYSLOG 1
-_ACEOF
-
-fi
-
-
-fi
-
-
-echo "$as_me:$LINENO: checking for optreset" >&5
-echo $ECHO_N "checking for optreset... $ECHO_C" >&6
-if test "${pgac_cv_var_int_optreset+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <unistd.h>
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-extern int optreset; optreset = 1;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  pgac_cv_var_int_optreset=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-pgac_cv_var_int_optreset=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $pgac_cv_var_int_optreset" >&5
-echo "${ECHO_T}$pgac_cv_var_int_optreset" >&6
-if test x"$pgac_cv_var_int_optreset" = x"yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_INT_OPTRESET 1
-_ACEOF
-
-fi
-
-
-# This test makes sure that run tests work at all.  Sometimes a shared
-# library is found by the linker, but the runtime linker can't find it.
-# This check should come after all modifications of compiler or linker
-# variables, and before any other run tests.
-echo "$as_me:$LINENO: checking test program" >&5
-echo $ECHO_N "checking test program... $ECHO_C" >&6
-if test "$cross_compiling" = yes; then
-  echo "$as_me:$LINENO: result: cross-compiling" >&5
-echo "${ECHO_T}cross-compiling" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-int main() { return 0; }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-( exit $ac_status )
-echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6
-{ { echo "$as_me:$LINENO: error:
-*** Could not execute a simple test program.  This may be a problem
-*** related to locating shared libraries.  Check the file 'config.log'
-*** for the exact reason." >&5
-echo "$as_me: error:
-*** Could not execute a simple test program.  This may be a problem
-*** related to locating shared libraries.  Check the file 'config.log'
-*** for the exact reason." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-
-echo "$as_me:$LINENO: checking whether long int is 64 bits" >&5
-echo $ECHO_N "checking whether long int is 64 bits... $ECHO_C" >&6
-if test "${pgac_cv_type_long_int_64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  pgac_cv_type_long_int_64=no
-{ echo "$as_me:$LINENO: WARNING: 64 bit arithmetic disabled when cross-compiling" >&5
-echo "$as_me: WARNING: 64 bit arithmetic disabled when cross-compiling" >&2;}
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-typedef long int int64;
-
-/*
- * These are globals to discourage the compiler from folding all the
- * arithmetic tests down to compile-time constants.
- */
-int64 a = 20000001;
-int64 b = 40000005;
-
-int does_int64_work()
-{
-  int64 c,d;
-
-  if (sizeof(int64) != 8)
-    return 0;			/* definitely not the right size */
-
-  /* Do perfunctory checks to see if 64-bit arithmetic seems to work */
-  c = a * b;
-  d = (c + b) / b;
-  if (d != a+1)
-    return 0;
-  return 1;
-}
-main() {
-  exit(! does_int64_work());
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  pgac_cv_type_long_int_64=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-( exit $ac_status )
-pgac_cv_type_long_int_64=no
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:$LINENO: result: $pgac_cv_type_long_int_64" >&5
-echo "${ECHO_T}$pgac_cv_type_long_int_64" >&6
-
-HAVE_LONG_INT_64=$pgac_cv_type_long_int_64
-if test x"$pgac_cv_type_long_int_64" = xyes ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LONG_INT_64
-_ACEOF
-
-fi
-
-
-if test x"$HAVE_LONG_INT_64" = x"no" ; then
-  echo "$as_me:$LINENO: checking whether long long int is 64 bits" >&5
-echo $ECHO_N "checking whether long long int is 64 bits... $ECHO_C" >&6
-if test "${pgac_cv_type_long_long_int_64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  pgac_cv_type_long_long_int_64=no
-{ echo "$as_me:$LINENO: WARNING: 64 bit arithmetic disabled when cross-compiling" >&5
-echo "$as_me: WARNING: 64 bit arithmetic disabled when cross-compiling" >&2;}
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-typedef long long int int64;
-
-/*
- * These are globals to discourage the compiler from folding all the
- * arithmetic tests down to compile-time constants.
- */
-int64 a = 20000001;
-int64 b = 40000005;
-
-int does_int64_work()
-{
-  int64 c,d;
-
-  if (sizeof(int64) != 8)
-    return 0;			/* definitely not the right size */
-
-  /* Do perfunctory checks to see if 64-bit arithmetic seems to work */
-  c = a * b;
-  d = (c + b) / b;
-  if (d != a+1)
-    return 0;
-  return 1;
-}
-main() {
-  exit(! does_int64_work());
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  pgac_cv_type_long_long_int_64=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-( exit $ac_status )
-pgac_cv_type_long_long_int_64=no
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:$LINENO: result: $pgac_cv_type_long_long_int_64" >&5
-echo "${ECHO_T}$pgac_cv_type_long_long_int_64" >&6
-
-HAVE_LONG_LONG_INT_64=$pgac_cv_type_long_long_int_64
-if test x"$pgac_cv_type_long_long_int_64" = xyes ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LONG_LONG_INT_64
-_ACEOF
-
-fi
-
-fi
-
-
-
-if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#define INT64CONST(x)  x##LL
-long long int foo = INT64CONST(0x1234567890123456);
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LL_CONSTANTS 1
-_ACEOF
-
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-
-if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then
-  if [ x$SNPRINTF = x ] ; then
-    echo "$as_me:$LINENO: checking whether snprintf handles 'long long int' as %lld" >&5
-echo $ECHO_N "checking whether snprintf handles 'long long int' as %lld... $ECHO_C" >&6
-    if test "$cross_compiling" = yes; then
-   echo "$as_me:$LINENO: result: assuming not on target machine" >&5
-echo "${ECHO_T}assuming not on target machine" >&6
-	# Force usage of our own snprintf, since we cannot test foreign snprintf
-	SNPRINTF='snprintf.o'
-	INT64_FORMAT='"%lld"'
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <stdio.h>
-typedef long long int int64;
-#define INT64_FORMAT "%lld"
-
-int64 a = 20000001;
-int64 b = 40000005;
-
-int does_int64_snprintf_work()
-{
-  int64 c;
-  char buf[100];
-
-  if (sizeof(int64) != 8)
-    return 0;			/* doesn't look like the right size */
-
-  c = a * b;
-  snprintf(buf, 100, INT64_FORMAT, c);
-  if (strcmp(buf, "800000140000005") != 0)
-    return 0;			/* either multiply or snprintf is busted */
-  return 1;
-}
-main() {
-  exit(! does_int64_snprintf_work());
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-	  INT64_FORMAT='"%lld"'
-
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-( exit $ac_status )
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    echo "$as_me:$LINENO: checking whether snprintf handles 'long long int' as %qd" >&5
-echo $ECHO_N "checking whether snprintf handles 'long long int' as %qd... $ECHO_C" >&6
-    if test "$cross_compiling" = yes; then
-   echo "$as_me:$LINENO: result: assuming not on target machine" >&5
-echo "${ECHO_T}assuming not on target machine" >&6
-	# Force usage of our own snprintf, since we cannot test foreign snprintf
-	SNPRINTF='snprintf.o'
-	INT64_FORMAT='"%lld"'
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <stdio.h>
-typedef long long int int64;
-#define INT64_FORMAT "%qd"
-
-int64 a = 20000001;
-int64 b = 40000005;
-
-int does_int64_snprintf_work()
-{
-  int64 c;
-  char buf[100];
-
-  if (sizeof(int64) != 8)
-    return 0;     /* doesn't look like the right size */
-
-  c = a * b;
-  snprintf(buf, 100, INT64_FORMAT, c);
-  if (strcmp(buf, "800000140000005") != 0)
-    return 0;     /* either multiply or snprintf is busted */
-  return 1;
-}
-main() {
-  exit(! does_int64_snprintf_work());
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-    INT64_FORMAT='"%qd"'
-
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-( exit $ac_status )
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-	# Force usage of our own snprintf, since system snprintf is broken
-	SNPRINTF='snprintf.o'
-	INT64_FORMAT='"%lld"'
-
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-  else
-    # here if we previously decided we needed to use our own snprintf
-    INT64_FORMAT='"%lld"'
-  fi
-else
-  # Here if we are not using 'long long int' at all
-  INT64_FORMAT='"%ld"'
-fi
-
-
-cat >>confdefs.h <<_ACEOF
-#define INT64_FORMAT $INT64_FORMAT
-_ACEOF
-
-
-
-
-
-for ac_func in strtoll strtoq
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- break
-fi
-done
-
-
-
-for ac_func in strtoull strtouq
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- break
-fi
-done
-
-
-# Check for one of atexit() or on_exit()
-
-for ac_func in atexit
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-else
-
-for ac_func in on_exit
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  { { echo "$as_me:$LINENO: error: neither atexit() nor on_exit() found" >&5
-echo "$as_me: error: neither atexit() nor on_exit() found" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-done
-
-fi
-done
-
-
-
-echo "$as_me:$LINENO: checking for unsigned long" >&5
-echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6
-if test "${ac_cv_type_unsigned_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-if ((unsigned long *) 0)
-  return 0;
-if (sizeof (unsigned long))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_unsigned_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_unsigned_long=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
-echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6
-
-echo "$as_me:$LINENO: checking size of unsigned long" >&5
-echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6
-if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_unsigned_long" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`
-                    if test $ac_lo -le $ac_mid; then
-                      ac_lo= ac_hi=
-                      break
-                    fi
-                    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_hi=`expr '(' $ac_mid ')' - 1`
-                       if test $ac_mid -le $ac_hi; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo= ac_hi=
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77" >&5
-echo "$as_me: error: cannot compute sizeof (unsigned long), 77" >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-long longval () { return (long) (sizeof (unsigned long)); }
-unsigned long ulongval () { return (long) (sizeof (unsigned long)); }
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (unsigned long))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (unsigned long))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (unsigned long))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_unsigned_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77" >&5
-echo "$as_me: error: cannot compute sizeof (unsigned long), 77" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-else
-  ac_cv_sizeof_unsigned_long=0
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
-_ACEOF
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_DATUM $ac_cv_sizeof_unsigned_long
-_ACEOF
-
-
-# Determine memory alignment requirements for the basic C data types.
-
-echo "$as_me:$LINENO: checking for short" >&5
-echo $ECHO_N "checking for short... $ECHO_C" >&6
-if test "${ac_cv_type_short+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-if ((short *) 0)
-  return 0;
-if (sizeof (short))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_short=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_short=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-echo "${ECHO_T}$ac_cv_type_short" >&6
-
-echo "$as_me:$LINENO: checking alignment of short" >&5
-echo $ECHO_N "checking alignment of short... $ECHO_C" >&6
-if test "${pgac_cv_alignof_short+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_short" = yes; then
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; short field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; short field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`
-                    if test $ac_lo -le $ac_mid; then
-                      ac_lo= ac_hi=
-                      break
-                    fi
-                    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; short field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; short field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_hi=`expr '(' $ac_mid ')' - 1`
-                       if test $ac_mid -le $ac_hi; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo= ac_hi=
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; short field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) pgac_cv_alignof_short=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute alignment of short, 77" >&5
-echo "$as_me: error: cannot compute alignment of short, 77" >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; short field; } pgac_struct;
-long longval () { return ((char*) & pgac_struct.field) - ((char*) & pgac_struct); }
-unsigned long ulongval () { return ((char*) & pgac_struct.field) - ((char*) & pgac_struct); }
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if ((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) < 0)
-    {
-      long i = longval ();
-      if (i != (((char*) & pgac_struct.field) - ((char*) & pgac_struct)))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != (((char*) & pgac_struct.field) - ((char*) & pgac_struct)))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  pgac_cv_alignof_short=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute alignment of short, 77" >&5
-echo "$as_me: error: cannot compute alignment of short, 77" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-else
-  pgac_cv_alignof_short=0
-fi
-fi
-echo "$as_me:$LINENO: result: $pgac_cv_alignof_short" >&5
-echo "${ECHO_T}$pgac_cv_alignof_short" >&6
-cat >>confdefs.h <<_ACEOF
-#define ALIGNOF_SHORT $pgac_cv_alignof_short
-_ACEOF
-
-
-echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6
-if test "${ac_cv_type_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-if ((int *) 0)
-  return 0;
-if (sizeof (int))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_int=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6
-
-echo "$as_me:$LINENO: checking alignment of int" >&5
-echo $ECHO_N "checking alignment of int... $ECHO_C" >&6
-if test "${pgac_cv_alignof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_int" = yes; then
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; int field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; int field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`
-                    if test $ac_lo -le $ac_mid; then
-                      ac_lo= ac_hi=
-                      break
-                    fi
-                    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; int field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; int field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_hi=`expr '(' $ac_mid ')' - 1`
-                       if test $ac_mid -le $ac_hi; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo= ac_hi=
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; int field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) pgac_cv_alignof_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute alignment of int, 77" >&5
-echo "$as_me: error: cannot compute alignment of int, 77" >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; int field; } pgac_struct;
-long longval () { return ((char*) & pgac_struct.field) - ((char*) & pgac_struct); }
-unsigned long ulongval () { return ((char*) & pgac_struct.field) - ((char*) & pgac_struct); }
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if ((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) < 0)
-    {
-      long i = longval ();
-      if (i != (((char*) & pgac_struct.field) - ((char*) & pgac_struct)))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != (((char*) & pgac_struct.field) - ((char*) & pgac_struct)))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  pgac_cv_alignof_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute alignment of int, 77" >&5
-echo "$as_me: error: cannot compute alignment of int, 77" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-else
-  pgac_cv_alignof_int=0
-fi
-fi
-echo "$as_me:$LINENO: result: $pgac_cv_alignof_int" >&5
-echo "${ECHO_T}$pgac_cv_alignof_int" >&6
-cat >>confdefs.h <<_ACEOF
-#define ALIGNOF_INT $pgac_cv_alignof_int
-_ACEOF
-
-
-echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6
-if test "${ac_cv_type_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-if ((long *) 0)
-  return 0;
-if (sizeof (long))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_long=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6
-
-echo "$as_me:$LINENO: checking alignment of long" >&5
-echo $ECHO_N "checking alignment of long... $ECHO_C" >&6
-if test "${pgac_cv_alignof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_long" = yes; then
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; long field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; long field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`
-                    if test $ac_lo -le $ac_mid; then
-                      ac_lo= ac_hi=
-                      break
-                    fi
-                    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; long field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; long field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_hi=`expr '(' $ac_mid ')' - 1`
-                       if test $ac_mid -le $ac_hi; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo= ac_hi=
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; long field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) pgac_cv_alignof_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute alignment of long, 77" >&5
-echo "$as_me: error: cannot compute alignment of long, 77" >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; long field; } pgac_struct;
-long longval () { return ((char*) & pgac_struct.field) - ((char*) & pgac_struct); }
-unsigned long ulongval () { return ((char*) & pgac_struct.field) - ((char*) & pgac_struct); }
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if ((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) < 0)
-    {
-      long i = longval ();
-      if (i != (((char*) & pgac_struct.field) - ((char*) & pgac_struct)))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != (((char*) & pgac_struct.field) - ((char*) & pgac_struct)))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  pgac_cv_alignof_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute alignment of long, 77" >&5
-echo "$as_me: error: cannot compute alignment of long, 77" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-else
-  pgac_cv_alignof_long=0
-fi
-fi
-echo "$as_me:$LINENO: result: $pgac_cv_alignof_long" >&5
-echo "${ECHO_T}$pgac_cv_alignof_long" >&6
-cat >>confdefs.h <<_ACEOF
-#define ALIGNOF_LONG $pgac_cv_alignof_long
-_ACEOF
-
-
-if test x"$HAVE_LONG_LONG_INT_64" = x"yes" ; then
-  echo "$as_me:$LINENO: checking for long long int" >&5
-echo $ECHO_N "checking for long long int... $ECHO_C" >&6
-if test "${ac_cv_type_long_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-if ((long long int *) 0)
-  return 0;
-if (sizeof (long long int))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long_long_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_long_long_int=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5
-echo "${ECHO_T}$ac_cv_type_long_long_int" >&6
-
-echo "$as_me:$LINENO: checking alignment of long long int" >&5
-echo $ECHO_N "checking alignment of long long int... $ECHO_C" >&6
-if test "${pgac_cv_alignof_long_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_long_long_int" = yes; then
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; long long int field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; long long int field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`
-                    if test $ac_lo -le $ac_mid; then
-                      ac_lo= ac_hi=
-                      break
-                    fi
-                    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; long long int field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; long long int field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_hi=`expr '(' $ac_mid ')' - 1`
-                       if test $ac_mid -le $ac_hi; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo= ac_hi=
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; long long int field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) pgac_cv_alignof_long_long_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute alignment of long long int, 77" >&5
-echo "$as_me: error: cannot compute alignment of long long int, 77" >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; long long int field; } pgac_struct;
-long longval () { return ((char*) & pgac_struct.field) - ((char*) & pgac_struct); }
-unsigned long ulongval () { return ((char*) & pgac_struct.field) - ((char*) & pgac_struct); }
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if ((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) < 0)
-    {
-      long i = longval ();
-      if (i != (((char*) & pgac_struct.field) - ((char*) & pgac_struct)))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != (((char*) & pgac_struct.field) - ((char*) & pgac_struct)))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  pgac_cv_alignof_long_long_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute alignment of long long int, 77" >&5
-echo "$as_me: error: cannot compute alignment of long long int, 77" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-else
-  pgac_cv_alignof_long_long_int=0
-fi
-fi
-echo "$as_me:$LINENO: result: $pgac_cv_alignof_long_long_int" >&5
-echo "${ECHO_T}$pgac_cv_alignof_long_long_int" >&6
-cat >>confdefs.h <<_ACEOF
-#define ALIGNOF_LONG_LONG_INT $pgac_cv_alignof_long_long_int
-_ACEOF
-
-
-fi
-echo "$as_me:$LINENO: checking for double" >&5
-echo $ECHO_N "checking for double... $ECHO_C" >&6
-if test "${ac_cv_type_double+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-if ((double *) 0)
-  return 0;
-if (sizeof (double))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_double=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_double=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_double" >&5
-echo "${ECHO_T}$ac_cv_type_double" >&6
-
-echo "$as_me:$LINENO: checking alignment of double" >&5
-echo $ECHO_N "checking alignment of double... $ECHO_C" >&6
-if test "${pgac_cv_alignof_double+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_double" = yes; then
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; double field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; double field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`
-                    if test $ac_lo -le $ac_mid; then
-                      ac_lo= ac_hi=
-                      break
-                    fi
-                    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; double field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; double field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_hi=`expr '(' $ac_mid ')' - 1`
-                       if test $ac_mid -le $ac_hi; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo= ac_hi=
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; double field; } pgac_struct;
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) pgac_cv_alignof_double=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute alignment of double, 77" >&5
-echo "$as_me: error: cannot compute alignment of double, 77" >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-struct { char filler; double field; } pgac_struct;
-long longval () { return ((char*) & pgac_struct.field) - ((char*) & pgac_struct); }
-unsigned long ulongval () { return ((char*) & pgac_struct.field) - ((char*) & pgac_struct); }
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if ((((char*) & pgac_struct.field) - ((char*) & pgac_struct)) < 0)
-    {
-      long i = longval ();
-      if (i != (((char*) & pgac_struct.field) - ((char*) & pgac_struct)))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != (((char*) & pgac_struct.field) - ((char*) & pgac_struct)))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  pgac_cv_alignof_double=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute alignment of double, 77" >&5
-echo "$as_me: error: cannot compute alignment of double, 77" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-else
-  pgac_cv_alignof_double=0
-fi
-fi
-echo "$as_me:$LINENO: result: $pgac_cv_alignof_double" >&5
-echo "${ECHO_T}$pgac_cv_alignof_double" >&6
-cat >>confdefs.h <<_ACEOF
-#define ALIGNOF_DOUBLE $pgac_cv_alignof_double
-_ACEOF
-
-
-
-# Compute maximum alignment of any basic type.
-# We assume long's alignment is at least as strong as char, short, or int;
-# but we must check long long (if it exists) and double.
-
-MAX_ALIGNOF=$pgac_cv_alignof_long
-if test $MAX_ALIGNOF -lt $pgac_cv_alignof_double ; then
-  MAX_ALIGNOF=$pgac_cv_alignof_double
-fi
-if test x"$HAVE_LONG_LONG_INT_64" = xyes && test $MAX_ALIGNOF -lt $pgac_cv_alignof_long_long_int ; then
-  MAX_ALIGNOF="$pgac_cv_alignof_long_long_int"
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define MAXIMUM_ALIGNOF $MAX_ALIGNOF
-_ACEOF
-
-
-
-# Some platforms predefine the types int8, int16, etc.  Only check
-# a (hopefully) representative subset.
-echo "$as_me:$LINENO: checking for int8" >&5
-echo $ECHO_N "checking for int8... $ECHO_C" >&6
-if test "${ac_cv_type_int8+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <stdio.h>
-#ifdef HAVE_SUPPORTDEFS_H
-#include <SupportDefs.h>
-#endif
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-if ((int8 *) 0)
-  return 0;
-if (sizeof (int8))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_int8=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_int8=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_int8" >&5
-echo "${ECHO_T}$ac_cv_type_int8" >&6
-if test $ac_cv_type_int8 = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_INT8 1
-_ACEOF
-
-
-fi
-echo "$as_me:$LINENO: checking for uint8" >&5
-echo $ECHO_N "checking for uint8... $ECHO_C" >&6
-if test "${ac_cv_type_uint8+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <stdio.h>
-#ifdef HAVE_SUPPORTDEFS_H
-#include <SupportDefs.h>
-#endif
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-if ((uint8 *) 0)
-  return 0;
-if (sizeof (uint8))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_uint8=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_uint8=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_uint8" >&5
-echo "${ECHO_T}$ac_cv_type_uint8" >&6
-if test $ac_cv_type_uint8 = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_UINT8 1
-_ACEOF
-
-
-fi
-echo "$as_me:$LINENO: checking for int64" >&5
-echo $ECHO_N "checking for int64... $ECHO_C" >&6
-if test "${ac_cv_type_int64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <stdio.h>
-#ifdef HAVE_SUPPORTDEFS_H
-#include <SupportDefs.h>
-#endif
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-if ((int64 *) 0)
-  return 0;
-if (sizeof (int64))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_int64=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_int64=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_int64" >&5
-echo "${ECHO_T}$ac_cv_type_int64" >&6
-if test $ac_cv_type_int64 = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_INT64 1
-_ACEOF
-
-
-fi
-echo "$as_me:$LINENO: checking for uint64" >&5
-echo $ECHO_N "checking for uint64... $ECHO_C" >&6
-if test "${ac_cv_type_uint64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <stdio.h>
-#ifdef HAVE_SUPPORTDEFS_H
-#include <SupportDefs.h>
-#endif
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-if ((uint64 *) 0)
-  return 0;
-if (sizeof (uint64))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_uint64=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_uint64=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_uint64" >&5
-echo "${ECHO_T}$ac_cv_type_uint64" >&6
-if test $ac_cv_type_uint64 = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_UINT64 1
-_ACEOF
-
-
-fi
-
-
-# We also check for sig_atomic_t, which *should* be defined per ANSI
-# C, but is missing on some old platforms.
-echo "$as_me:$LINENO: checking for sig_atomic_t" >&5
-echo $ECHO_N "checking for sig_atomic_t... $ECHO_C" >&6
-if test "${ac_cv_type_sig_atomic_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <signal.h>
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-if ((sig_atomic_t *) 0)
-  return 0;
-if (sizeof (sig_atomic_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_sig_atomic_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_sig_atomic_t=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_sig_atomic_t" >&5
-echo "${ECHO_T}$ac_cv_type_sig_atomic_t" >&6
-if test $ac_cv_type_sig_atomic_t = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_SIG_ATOMIC_T 1
-_ACEOF
-
-
-fi
-
-
-
-echo "$as_me:$LINENO: checking for POSIX signal interface" >&5
-echo $ECHO_N "checking for POSIX signal interface... $ECHO_C" >&6
-if test "${pgac_cv_func_posix_signals+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <signal.h>
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-struct sigaction act, oact;
-sigemptyset(&act.sa_mask);
-act.sa_flags = SA_RESTART;
-sigaction(0, &act, &oact);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  pgac_cv_func_posix_signals=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-pgac_cv_func_posix_signals=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $pgac_cv_func_posix_signals" >&5
-echo "${ECHO_T}$pgac_cv_func_posix_signals" >&6
-if test x"$pgac_cv_func_posix_signals" = xyes ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_POSIX_SIGNALS
-_ACEOF
-
-fi
-HAVE_POSIX_SIGNALS=$pgac_cv_func_posix_signals
-
-
-
-# Select semaphore implementation type.
-if test x"$USE_NAMED_POSIX_SEMAPHORES" = x"1" ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_NAMED_POSIX_SEMAPHORES 1
-_ACEOF
-
-  SEMA_IMPLEMENTATION="src/backend/port/posix_sema.c"
-else
-  if test x"$USE_UNNAMED_POSIX_SEMAPHORES" = x"1" ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_UNNAMED_POSIX_SEMAPHORES 1
-_ACEOF
-
-    SEMA_IMPLEMENTATION="src/backend/port/posix_sema.c"
-  else
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_SYSV_SEMAPHORES 1
-_ACEOF
-
-    SEMA_IMPLEMENTATION="src/backend/port/sysv_sema.c"
-  fi
-fi
-
-
-# Select shared-memory implementation type.
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_SYSV_SHARED_MEMORY 1
-_ACEOF
-
-SHMEM_IMPLEMENTATION="src/backend/port/sysv_shmem.c"
-
-
-if test "$enable_nls" = yes ; then
-
-  echo "$as_me:$LINENO: checking for library containing gettext" >&5
-echo $ECHO_N "checking for library containing gettext... $ECHO_C" >&6
-if test "${ac_cv_search_gettext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-ac_cv_search_gettext=no
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gettext ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-gettext ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_gettext="none required"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_gettext" = no; then
-  for ac_lib in intl; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gettext ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-gettext ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_gettext="-l$ac_lib"
-break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  done
-fi
-LIBS=$ac_func_search_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_search_gettext" >&5
-echo "${ECHO_T}$ac_cv_search_gettext" >&6
-if test "$ac_cv_search_gettext" != no; then
-  test "$ac_cv_search_gettext" = "none required" || LIBS="$ac_cv_search_gettext $LIBS"
-
-else
-  { { echo "$as_me:$LINENO: error: a gettext implementation is required for NLS" >&5
-echo "$as_me: error: a gettext implementation is required for NLS" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-  if test "${ac_cv_header_libintl_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for libintl.h" >&5
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
-if test "${ac_cv_header_libintl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking libintl.h usability" >&5
-echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#include <libintl.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking libintl.h presence" >&5
-echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <libintl.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
-    { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;};;
-  no:yes )
-    { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:$LINENO: checking for libintl.h" >&5
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
-if test "${ac_cv_header_libintl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_libintl_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
-
-fi
-if test $ac_cv_header_libintl_h = yes; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: header file <libintl.h> is required for NLS" >&5
-echo "$as_me: error: header file <libintl.h> is required for NLS" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-  for ac_prog in msgfmt
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_MSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$MSGFMT"; then
-  ac_cv_prog_MSGFMT="$MSGFMT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_MSGFMT="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-MSGFMT=$ac_cv_prog_MSGFMT
-if test -n "$MSGFMT"; then
-  echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$MSGFMT" && break
-done
-
-  if test -z "$MSGFMT"; then
-    { { echo "$as_me:$LINENO: error: msgfmt is required for NLS" >&5
-echo "$as_me: error: msgfmt is required for NLS" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  for ac_prog in msgmerge
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_MSGMERGE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$MSGMERGE"; then
-  ac_cv_prog_MSGMERGE="$MSGMERGE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_MSGMERGE="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-MSGMERGE=$ac_cv_prog_MSGMERGE
-if test -n "$MSGMERGE"; then
-  echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-echo "${ECHO_T}$MSGMERGE" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$MSGMERGE" && break
-done
-
-  for ac_prog in xgettext
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_XGETTEXT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$XGETTEXT"; then
-  ac_cv_prog_XGETTEXT="$XGETTEXT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_XGETTEXT="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-XGETTEXT=$ac_cv_prog_XGETTEXT
-if test -n "$XGETTEXT"; then
-  echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$XGETTEXT" && break
-done
-
-
-  # Note: share/locale is always the default, independent of $datadir
-  localedir='${prefix}/share/locale'
-  if test x"$prefix" = x"NONE"; then
-    exp_localedir="$ac_default_prefix/share/locale"
-  else
-    exp_localedir="$prefix/share/locale"
-  fi
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define LOCALEDIR "$exp_localedir"
-_ACEOF
-
-
-fi
-
-if test "$with_CXX" = yes; then
-
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-if test "${ac_cv_header_string+set}" = set; then
-  echo "$as_me:$LINENO: checking for string" >&5
-echo $ECHO_N "checking for string... $ECHO_C" >&6
-if test "${ac_cv_header_string+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_string" >&5
-echo "${ECHO_T}$ac_cv_header_string" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking string usability" >&5
-echo $ECHO_N "checking string usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#include <string>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking string presence" >&5
-echo $ECHO_N "checking string presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <string>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
-    { echo "$as_me:$LINENO: WARNING: string: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: string: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: string: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: string: proceeding with the preprocessor's result" >&2;};;
-  no:yes )
-    { echo "$as_me:$LINENO: WARNING: string: present but cannot be compiled" >&5
-echo "$as_me: WARNING: string: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: string: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: string: check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: string: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: string: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:$LINENO: checking for string" >&5
-echo $ECHO_N "checking for string... $ECHO_C" >&6
-if test "${ac_cv_header_string+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_string=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_string" >&5
-echo "${ECHO_T}$ac_cv_header_string" >&6
-
-fi
-if test $ac_cv_header_string = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CXX_STRING_HEADER 1
-_ACEOF
-
-else
-  echo "$as_me:$LINENO: checking for class string in <string.h>" >&5
-echo $ECHO_N "checking for class string in <string.h>... $ECHO_C" >&6
-if test "${pgac_cv_class_string_in_string_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-string foo = "test"
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  pgac_cv_class_string_in_string_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-pgac_cv_class_string_in_string_h=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $pgac_cv_class_string_in_string_h" >&5
-echo "${ECHO_T}$pgac_cv_class_string_in_string_h" >&6
-
-  if test x"$pgac_cv_class_string_in_string_h" != xyes ; then
-    { { echo "$as_me:$LINENO: error: neither <string> nor <string.h> seem to define the C++ class 'string'" >&5
-echo "$as_me: error: neither <string> nor <string.h> seem to define the C++ class 'string'" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-echo "$as_me:$LINENO: checking for namespace std in C++" >&5
-echo $ECHO_N "checking for namespace std in C++... $ECHO_C" >&6
-if test "${pgac_cv_cxx_namespace_std+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef HAVE_CXX_STRING_HEADER
-#include <string>
-#endif
-using namespace std;
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  pgac_cv_cxx_namespace_std=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-pgac_cv_cxx_namespace_std=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $pgac_cv_cxx_namespace_std" >&5
-echo "${ECHO_T}$pgac_cv_cxx_namespace_std" >&6
-
-if test $pgac_cv_cxx_namespace_std = yes ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_NAMESPACE_STD 1
-_ACEOF
-
-fi
-fi
-
-
-# Check for Tcl configuration script tclConfig.sh
-if test "$with_tcl" = yes; then
-    for ac_prog in tclsh tcl
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_TCLSH+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $TCLSH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  ;;
-esac
-fi
-TCLSH=$ac_cv_path_TCLSH
-
-if test -n "$TCLSH"; then
-  echo "$as_me:$LINENO: result: $TCLSH" >&5
-echo "${ECHO_T}$TCLSH" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$TCLSH" && break
-done
-
-echo "$as_me:$LINENO: checking for tclConfig.sh" >&5
-echo $ECHO_N "checking for tclConfig.sh... $ECHO_C" >&6
-# Let user override test
-if test -z "$TCL_CONFIG_SH"; then
-    pgac_test_dirs="$with_tclconfig"
-
-    set X $pgac_test_dirs; shift
-    if test $# -eq 0; then
-        test -z "$TCLSH" && { { echo "$as_me:$LINENO: error: unable to locate tclConfig.sh because no Tcl shell was found" >&5
-echo "$as_me: error: unable to locate tclConfig.sh because no Tcl shell was found" >&2;}
-   { (exit 1); exit 1; }; }
-        set X `echo 'puts $auto_path' | $TCLSH`; shift
-    fi
-
-    for pgac_dir do
-        if test -r "$pgac_dir/tclConfig.sh"; then
-            TCL_CONFIG_SH=$pgac_dir/tclConfig.sh
-            break
-        fi
-    done
-fi
-
-if test -z "$TCL_CONFIG_SH"; then
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    { { echo "$as_me:$LINENO: error: file 'tclConfig.sh' is required for Tcl" >&5
-echo "$as_me: error: file 'tclConfig.sh' is required for Tcl" >&2;}
-   { (exit 1); exit 1; }; }
-else
-    echo "$as_me:$LINENO: result: $TCL_CONFIG_SH" >&5
-echo "${ECHO_T}$TCL_CONFIG_SH" >&6
-fi
-
-
-
-    . "$TCL_CONFIG_SH"
-eval TCL_LIB_FILE=\"$TCL_LIB_FILE\"
-eval TCL_LIBS=\"$TCL_LIBS\"
-eval TCL_LIB_SPEC=\"$TCL_LIB_SPEC\"
-eval TCL_SHARED_BUILD=\"$TCL_SHARED_BUILD\"
-
-    fi
-
-# Check for Tk configuration script tkConfig.sh
-if test "$with_tk" = yes; then
-    echo "$as_me:$LINENO: checking for tkConfig.sh" >&5
-echo $ECHO_N "checking for tkConfig.sh... $ECHO_C" >&6
-# Let user override test
-if test -z "$TK_CONFIG_SH"; then
-    pgac_test_dirs="$with_tkconfig $with_tclconfig"
-
-    set X $pgac_test_dirs; shift
-    if test $# -eq 0; then
-        test -z "$TCLSH" && { { echo "$as_me:$LINENO: error: unable to locate tkConfig.sh because no Tcl shell was found" >&5
-echo "$as_me: error: unable to locate tkConfig.sh because no Tcl shell was found" >&2;}
-   { (exit 1); exit 1; }; }
-        set X `echo 'puts $auto_path' | $TCLSH`; shift
-    fi
-
-    for pgac_dir do
-        if test -r "$pgac_dir/tkConfig.sh"; then
-            TK_CONFIG_SH=$pgac_dir/tkConfig.sh
-            break
-        fi
-    done
-fi
-
-if test -z "$TK_CONFIG_SH"; then
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    { { echo "$as_me:$LINENO: error: file 'tkConfig.sh' is required for Tk" >&5
-echo "$as_me: error: file 'tkConfig.sh' is required for Tk" >&2;}
-   { (exit 1); exit 1; }; }
-else
-    echo "$as_me:$LINENO: result: $TK_CONFIG_SH" >&5
-echo "${ECHO_T}$TK_CONFIG_SH" >&6
-fi
-
-
-
-    . "$TK_CONFIG_SH"
-eval TK_LIBS=\"$TK_LIBS\"
-eval TK_LIB_SPEC=\"$TK_LIB_SPEC\"
-eval TK_XINCLUDES=\"$TK_XINCLUDES\"
-
-fi
-
-
-#
-# Check for DocBook and tools
-#
-for ac_prog in onsgmls nsgmls
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_NSGMLS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$NSGMLS"; then
-  ac_cv_prog_NSGMLS="$NSGMLS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_NSGMLS="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-NSGMLS=$ac_cv_prog_NSGMLS
-if test -n "$NSGMLS"; then
-  echo "$as_me:$LINENO: result: $NSGMLS" >&5
-echo "${ECHO_T}$NSGMLS" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$NSGMLS" && break
-done
-
-for ac_prog in openjade jade
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_JADE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$JADE"; then
-  ac_cv_prog_JADE="$JADE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_JADE="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-JADE=$ac_cv_prog_JADE
-if test -n "$JADE"; then
-  echo "$as_me:$LINENO: result: $JADE" >&5
-echo "${ECHO_T}$JADE" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$JADE" && break
-done
-
-
-echo "$as_me:$LINENO: checking for DocBook V3.1" >&5
-echo $ECHO_N "checking for DocBook V3.1... $ECHO_C" >&6
-if test "${pgac_cv_check_docbook+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.sgml <<EOF
-<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN">
-<book>
- <title>test</title>
- <chapter>
-  <title>random</title>
-   <sect1>
-    <title>testsect</title>
-    <para>text</para>
-  </sect1>
- </chapter>
-</book>
-EOF
-
-${NSGMLS-false} -s conftest.sgml 1>&5 2>&1
-if test $? -eq 0; then
-  pgac_cv_check_docbook=yes
-else
-  pgac_cv_check_docbook=no
-fi
-rm -f conftest.sgml
-fi
-echo "$as_me:$LINENO: result: $pgac_cv_check_docbook" >&5
-echo "${ECHO_T}$pgac_cv_check_docbook" >&6
-
-have_docbook=$pgac_cv_check_docbook
-
-
-echo "$as_me:$LINENO: checking for DocBook stylesheets" >&5
-echo $ECHO_N "checking for DocBook stylesheets... $ECHO_C" >&6
-if test "${pgac_cv_path_stylesheets+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$DOCBOOKSTYLE"; then
-  pgac_cv_path_stylesheets=$DOCBOOKSTYLE
-else
-  for pgac_prefix in /usr /usr/local /opt; do
-    for pgac_infix in share lib; do
-      for pgac_postfix in \
-        sgml/stylesheets/nwalsh-modular \
-        sgml/stylesheets/docbook \
-        sgml/docbook/dsssl/modular \
-        sgml/docbook/dsssl-stylesheets
-      do
-        pgac_candidate=$pgac_prefix/$pgac_infix/$pgac_postfix
-        if test -r "$pgac_candidate/html/docbook.dsl" \
-           && test -r "$pgac_candidate/print/docbook.dsl"
-        then
-          pgac_cv_path_stylesheets=$pgac_candidate
-          break 3
-        fi
-      done
-    done
-  done
-fi
-fi
-
-DOCBOOKSTYLE=$pgac_cv_path_stylesheets
-
-if test -n "$DOCBOOKSTYLE"; then
-  echo "$as_me:$LINENO: result: $DOCBOOKSTYLE" >&5
-echo "${ECHO_T}$DOCBOOKSTYLE" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-if test -n "$DOCBOOKSTYLE"; then
-  for ac_prog in collateindex.pl
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_COLLATEINDEX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $COLLATEINDEX in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_COLLATEINDEX="$COLLATEINDEX" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $DOCBOOKSTYLE/bin $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_COLLATEINDEX="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  ;;
-esac
-fi
-COLLATEINDEX=$ac_cv_path_COLLATEINDEX
-
-if test -n "$COLLATEINDEX"; then
-  echo "$as_me:$LINENO: result: $COLLATEINDEX" >&5
-echo "${ECHO_T}$COLLATEINDEX" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$COLLATEINDEX" && break
-done
-
-else
-  for ac_prog in collateindex.pl
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_COLLATEINDEX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $COLLATEINDEX in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_COLLATEINDEX="$COLLATEINDEX" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_COLLATEINDEX="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  ;;
-esac
-fi
-COLLATEINDEX=$ac_cv_path_COLLATEINDEX
-
-if test -n "$COLLATEINDEX"; then
-  echo "$as_me:$LINENO: result: $COLLATEINDEX" >&5
-echo "${ECHO_T}$COLLATEINDEX" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$COLLATEINDEX" && break
-done
-
-fi
-for ac_prog in sgmlspl
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_SGMLSPL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$SGMLSPL"; then
-  ac_cv_prog_SGMLSPL="$SGMLSPL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_SGMLSPL="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-SGMLSPL=$ac_cv_prog_SGMLSPL
-if test -n "$SGMLSPL"; then
-  echo "$as_me:$LINENO: result: $SGMLSPL" >&5
-echo "${ECHO_T}$SGMLSPL" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$SGMLSPL" && break
-done
-
-
-
-# prepare build tree if outside source tree
-# Note 1: test -ef might not exist, but it's more reliable than `pwd`.
-# Note 2: /bin/pwd might be better than shell's built-in at getting
-#         a symlink-free name.
-if test "$no_create" != yes; then
-  if ( test "$srcdir" -ef . ) >/dev/null 2>&1 || test "`cd $srcdir && /bin/pwd`" = "`/bin/pwd`"; then
-    :
-  else
-    vpath_build=yes
-
-    echo $ECHO_N "preparing build tree... $ECHO_C" >&6
-    pgac_abs_top_srcdir=`cd "$srcdir" && pwd`
-    $SHELL "$ac_aux_dir/prep_buildtree" "$pgac_abs_top_srcdir" "." \
-      || { { echo "$as_me:$LINENO: error: failed" >&5
-echo "$as_me: error: failed" >&2;}
-   { (exit 1); exit 1; }; }
-    echo "$as_me:$LINENO: result: done" >&5
-echo "${ECHO_T}done" >&6
-  fi
-fi
-
-
-ac_config_files="$ac_config_files GNUmakefile src/Makefile.global"
-
-
-ac_config_links="$ac_config_links src/backend/port/dynloader.c:src/backend/port/dynloader/${template}.c src/backend/port/pg_sema.c:${SEMA_IMPLEMENTATION} src/backend/port/pg_shmem.c:${SHMEM_IMPLEMENTATION} src/include/dynloader.h:src/backend/port/dynloader/${template}.h src/include/pg_config_os.h:src/include/port/${template}.h src/Makefile.port:src/makefiles/Makefile.${template}"
-
-
-ac_config_headers="$ac_config_headers src/include/pg_config.h"
-
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overriden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-        "s/'/'\\\\''/g;
-    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if cmp -s $cache_file confcache; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[ 	]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[ 	]*$//;
-}'
-fi
-
-DEFS=-DHAVE_CONFIG_H
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-
-# NLS nuisances.
-# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
-    { $as_unset LANG || test "${LANG+set}" != set; } ||
-      { LANG=C; export LANG; }
-(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
-    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
-      { LC_ALL=C; export LC_ALL; }
-(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
-    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
-      { LC_TIME=C; export LC_TIME; }
-(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
-    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
-      { LC_CTYPE=C; export LC_CTYPE; }
-(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
-    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
-      { LANGUAGE=C; export LANGUAGE; }
-(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
-    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
-      { LC_COLLATE=C; export LC_COLLATE; }
-(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
-    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
-      { LC_NUMERIC=C; export LC_NUMERIC; }
-(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
-    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
-      { LC_MESSAGES=C; export LC_MESSAGES; }
-
-
-# Name of the executable.
-as_me=`(basename "$0") 2>/dev/null ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conftest.sh
-  echo  "exit 0"   >>conftest.sh
-  chmod +x conftest.sh
-  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conftest.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by PostgreSQL $as_me 7.3devel, which was
-generated by GNU Autoconf 2.53.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration links:
-$config_links
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-PostgreSQL config.status 7.3devel
-configured by $0, generated by GNU Autoconf 2.53,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    shift
-    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
-    shift
-    ;;
-  -*);;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_need_defaults=false;;
-  esac
-
-  case $1 in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
-    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    shift
-    CONFIG_FILES="$CONFIG_FILES $1"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $1"
-    ac_need_defaults=false;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-_ACEOF
-
-
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "GNUmakefile" ) CONFIG_FILES="$CONFIG_FILES GNUmakefile" ;;
-  "src/Makefile.global" ) CONFIG_FILES="$CONFIG_FILES src/Makefile.global" ;;
-  "src/backend/port/tas.s" ) CONFIG_LINKS="$CONFIG_LINKS src/backend/port/tas.s:src/backend/port/tas/${tas_file}" ;;
-  "src/backend/port/dynloader.c" ) CONFIG_LINKS="$CONFIG_LINKS src/backend/port/dynloader.c:src/backend/port/dynloader/${template}.c" ;;
-  "src/backend/port/pg_sema.c" ) CONFIG_LINKS="$CONFIG_LINKS src/backend/port/pg_sema.c:${SEMA_IMPLEMENTATION}" ;;
-  "src/backend/port/pg_shmem.c" ) CONFIG_LINKS="$CONFIG_LINKS src/backend/port/pg_shmem.c:${SHMEM_IMPLEMENTATION}" ;;
-  "src/include/dynloader.h" ) CONFIG_LINKS="$CONFIG_LINKS src/include/dynloader.h:src/backend/port/dynloader/${template}.h" ;;
-  "src/include/pg_config_os.h" ) CONFIG_LINKS="$CONFIG_LINKS src/include/pg_config_os.h:src/include/port/${template}.h" ;;
-  "src/Makefile.port" ) CONFIG_LINKS="$CONFIG_LINKS src/Makefile.port:src/makefiles/Makefile.${template}" ;;
-  "src/include/pg_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/include/pg_config.h" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links
-fi
-
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-: ${TMPDIR=/tmp}
-{
-  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=$TMPDIR/cs$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@docdir@,$docdir,;t t
-s,@configure_args@,$configure_args,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@PORTNAME@,$PORTNAME,;t t
-s,@TAS@,$TAS,;t t
-s,@MULTIBYTE@,$MULTIBYTE,;t t
-s,@enable_nls@,$enable_nls,;t t
-s,@WANTED_LANGUAGES@,$WANTED_LANGUAGES,;t t
-s,@default_port@,$default_port,;t t
-s,@enable_shared@,$enable_shared,;t t
-s,@enable_rpath@,$enable_rpath,;t t
-s,@enable_debug@,$enable_debug,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@CPP@,$CPP,;t t
-s,@GCC@,$GCC,;t t
-s,@autodepend@,$autodepend,;t t
-s,@INCLUDES@,$INCLUDES,;t t
-s,@with_tcl@,$with_tcl,;t t
-s,@with_tk@,$with_tk,;t t
-s,@with_perl@,$with_perl,;t t
-s,@with_python@,$with_python,;t t
-s,@ANT@,$ANT,;t t
-s,@with_java@,$with_java,;t t
-s,@with_krb4@,$with_krb4,;t t
-s,@with_krb5@,$with_krb5,;t t
-s,@krb_srvtab@,$krb_srvtab,;t t
-s,@with_pam@,$with_pam,;t t
-s,@with_openssl@,$with_openssl,;t t
-s,@enable_odbc@,$enable_odbc,;t t
-s,@with_unixodbc@,$with_unixodbc,;t t
-s,@with_iodbc@,$with_iodbc,;t t
-s,@odbcinst_ini_dir@,$odbcinst_ini_dir,;t t
-s,@ELF_SYS@,$ELF_SYS,;t t
-s,@CXX@,$CXX,;t t
-s,@CXXFLAGS@,$CXXFLAGS,;t t
-s,@ac_ct_CXX@,$ac_ct_CXX,;t t
-s,@CXXCPP@,$CXXCPP,;t t
-s,@with_CXX@,$with_CXX,;t t
-s,@GXX@,$GXX,;t t
-s,@AWK@,$AWK,;t t
-s,@FLEX@,$FLEX,;t t
-s,@FLEXFLAGS@,$FLEXFLAGS,;t t
-s,@LN_S@,$LN_S,;t t
-s,@LD@,$LD,;t t
-s,@with_gnu_ld@,$with_gnu_ld,;t t
-s,@ld_R_works@,$ld_R_works,;t t
-s,@RANLIB@,$RANLIB,;t t
-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@LORDER@,$LORDER,;t t
-s,@TAR@,$TAR,;t t
-s,@STRIP@,$STRIP,;t t
-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
-s,@STRIP_STATIC_LIB@,$STRIP_STATIC_LIB,;t t
-s,@STRIP_SHARED_LIB@,$STRIP_SHARED_LIB,;t t
-s,@YACC@,$YACC,;t t
-s,@YFLAGS@,$YFLAGS,;t t
-s,@WISH@,$WISH,;t t
-s,@PERL@,$PERL,;t t
-s,@perl_installsitearch@,$perl_installsitearch,;t t
-s,@perl_installman3dir@,$perl_installman3dir,;t t
-s,@perl_archlibexp@,$perl_archlibexp,;t t
-s,@perl_privlibexp@,$perl_privlibexp,;t t
-s,@perl_useshrplib@,$perl_useshrplib,;t t
-s,@perl_man3ext@,$perl_man3ext,;t t
-s,@perl_embed_ldflags@,$perl_embed_ldflags,;t t
-s,@PYTHON@,$PYTHON,;t t
-s,@python_version@,$python_version,;t t
-s,@python_prefix@,$python_prefix,;t t
-s,@python_execprefix@,$python_execprefix,;t t
-s,@python_configdir@,$python_configdir,;t t
-s,@python_moduledir@,$python_moduledir,;t t
-s,@python_moduleexecdir@,$python_moduleexecdir,;t t
-s,@python_includespec@,$python_includespec,;t t
-s,@python_libspec@,$python_libspec,;t t
-s,@MEMCMP@,$MEMCMP,;t t
-s,@SNPRINTF@,$SNPRINTF,;t t
-s,@ISINF@,$ISINF,;t t
-s,@GETRUSAGE@,$GETRUSAGE,;t t
-s,@SRANDOM@,$SRANDOM,;t t
-s,@GETHOSTNAME@,$GETHOSTNAME,;t t
-s,@MISSING_RANDOM@,$MISSING_RANDOM,;t t
-s,@INET_ATON@,$INET_ATON,;t t
-s,@STRERROR@,$STRERROR,;t t
-s,@STRDUP@,$STRDUP,;t t
-s,@STRTOL@,$STRTOL,;t t
-s,@STRTOUL@,$STRTOUL,;t t
-s,@STRCASECMP@,$STRCASECMP,;t t
-s,@HPUXMATHLIB@,$HPUXMATHLIB,;t t
-s,@HAVE_POSIX_SIGNALS@,$HAVE_POSIX_SIGNALS,;t t
-s,@MSGFMT@,$MSGFMT,;t t
-s,@MSGMERGE@,$MSGMERGE,;t t
-s,@XGETTEXT@,$XGETTEXT,;t t
-s,@localedir@,$localedir,;t t
-s,@TCLSH@,$TCLSH,;t t
-s,@TCL_CONFIG_SH@,$TCL_CONFIG_SH,;t t
-s,@TCL_LIB_FILE@,$TCL_LIB_FILE,;t t
-s,@TCL_LIBS@,$TCL_LIBS,;t t
-s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t
-s,@TCL_SHARED_BUILD@,$TCL_SHARED_BUILD,;t t
-s,@TCL_SHLIB_LD_LIBS@,$TCL_SHLIB_LD_LIBS,;t t
-s,@TK_CONFIG_SH@,$TK_CONFIG_SH,;t t
-s,@TK_LIBS@,$TK_LIBS,;t t
-s,@TK_LIB_SPEC@,$TK_LIB_SPEC,;t t
-s,@TK_XINCLUDES@,$TK_XINCLUDES,;t t
-s,@NSGMLS@,$NSGMLS,;t t
-s,@JADE@,$JADE,;t t
-s,@have_docbook@,$have_docbook,;t t
-s,@DOCBOOKSTYLE@,$DOCBOOKSTYLE,;t t
-s,@COLLATEINDEX@,$COLLATEINDEX,;t t
-s,@SGMLSPL@,$SGMLSPL,;t t
-s,@vpath_build@,$vpath_build,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-        cat >$tmp/stdin
-        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$ac_file" : 'X\(//\)[^/]' \| \
-         X"$ac_file" : 'X\(//\)$' \| \
-         X"$ac_file" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { case "$ac_dir" in
-  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
-  *)                      as_incr_dir=.;;
-esac
-as_dummy="$ac_dir"
-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
-  case $as_mkdir_dir in
-    # Skip DOS drivespec
-    ?:) as_incr_dir=$as_mkdir_dir ;;
-    *)
-      as_incr_dir=$as_incr_dir/$as_mkdir_dir
-      test -d "$as_incr_dir" ||
-        mkdir "$as_incr_dir" ||
-	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }
-    ;;
-  esac
-done; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-
-
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-                                     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-         # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-         echo $f;;
-      *) # Relative
-         if test -f "$f"; then
-           # Build tree
-           echo $f
-         elif test -f "$srcdir/$f"; then
-           # Source tree
-           echo $srcdir/$f
-         else
-           # /dev/null tree
-           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-         fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
-ac_dB='[ 	].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-        cat >$tmp/stdin
-        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-         # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-         echo $f;;
-      *) # Relative
-         if test -f "$f"; then
-           # Build tree
-           echo $f
-         elif test -f "$srcdir/$f"; then
-           # Source tree
-           echo $srcdir/$f
-         else
-           # /dev/null tree
-           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-         fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  # Remove the trailing spaces.
-  sed 's/[ 	]*$//' $ac_file_inputs >$tmp/in
-
-_ACEOF
-
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h.  The first handles `#define'
-# templates, and the second `#undef' templates.
-# And first: Protect against being on the right side of a sed subst in
-# config.status.  Protect against being in an unquoted here document
-# in config.status.
-rm -f conftest.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `end' is used to avoid that the second main sed command (meant for
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*\)\(([^)]*)\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-t end
-s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-_ACEOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless.  Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >>conftest.undefs <<\_ACEOF
-s,^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-_ACEOF
-
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo '  if egrep "^[ 	]*#[ 	]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo '  :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
-do
-  # Write a limited-size here document to $tmp/defines.sed.
-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#define' lines.
-  echo '/^[ 	]*#[ 	]*define/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines
-echo '  fi # egrep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
-  # Write a limited-size here document to $tmp/undefs.sed.
-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#undef'
-  echo '/^[ 	]*#[ 	]*undef/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-  rm -f conftest.undefs
-  mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated by configure.  */" >$tmp/config.h
-  else
-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
-  if test x"$ac_file" != x-; then
-    if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$ac_file" : 'X\(//\)[^/]' \| \
-         X"$ac_file" : 'X\(//\)$' \| \
-         X"$ac_file" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-      { case "$ac_dir" in
-  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
-  *)                      as_incr_dir=.;;
-esac
-as_dummy="$ac_dir"
-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
-  case $as_mkdir_dir in
-    # Skip DOS drivespec
-    ?:) as_incr_dir=$as_mkdir_dir ;;
-    *)
-      as_incr_dir=$as_incr_dir/$as_mkdir_dir
-      test -d "$as_incr_dir" ||
-        mkdir "$as_incr_dir" ||
-	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }
-    ;;
-  esac
-done; }
-
-      rm -f $ac_file
-      mv $tmp/config.h $ac_file
-    fi
-  else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
-  fi
-  # Run the commands associated with the file.
-  case $ac_file in
-    src/include/pg_config.h )
-# Update timestamp for pg_config.h (see Makefile.global)
-echo >src/include/stamp-h
- ;;
-  esac
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_LINKS section.
-#
-
-for ac_file in : $CONFIG_LINKS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-
-  { echo "$as_me:$LINENO: linking $srcdir/$ac_source to $ac_dest" >&5
-echo "$as_me: linking $srcdir/$ac_source to $ac_dest" >&6;}
-
-  if test ! -r $srcdir/$ac_source; then
-    { { echo "$as_me:$LINENO: error: $srcdir/$ac_source: file not found" >&5
-echo "$as_me: error: $srcdir/$ac_source: file not found" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  rm -f $ac_dest
-
-  # Make relative symlinks.
-  ac_dest_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$ac_dest" : 'X\(//\)[^/]' \| \
-         X"$ac_dest" : 'X\(//\)$' \| \
-         X"$ac_dest" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { case "$ac_dest_dir" in
-  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
-  *)                      as_incr_dir=.;;
-esac
-as_dummy="$ac_dest_dir"
-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
-  case $as_mkdir_dir in
-    # Skip DOS drivespec
-    ?:) as_incr_dir=$as_mkdir_dir ;;
-    *)
-      as_incr_dir=$as_incr_dir/$as_mkdir_dir
-      test -d "$as_incr_dir" ||
-        mkdir "$as_incr_dir" ||
-	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dest_dir\"" >&5
-echo "$as_me: error: cannot create \"$ac_dest_dir\"" >&2;}
-   { (exit 1); exit 1; }; }
-    ;;
-  esac
-done; }
-
-  ac_builddir=.
-
-if test "$ac_dest_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dest_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-# Don't blindly perform a `cd "$ac_dest_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dest_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dest_dir" && cd $ac_top_builddir && pwd`
-ac_abs_srcdir=`cd "$ac_dest_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dest_dir" && cd $ac_top_srcdir && pwd`
-
-
-  case $srcdir in
-  [\\/$]* | ?:[\\/]* ) ac_rel_source=$srcdir/$ac_source ;;
-      *) ac_rel_source=$ac_top_builddir$srcdir/$ac_source ;;
-  esac
-
-  # Make a symlink if possible; otherwise try a hard link.
-  ln -s $ac_rel_source $ac_dest 2>/dev/null ||
-    ln $srcdir/$ac_source $ac_dest ||
-    { { echo "$as_me:$LINENO: error: cannot link $ac_dest to $srcdir/$ac_source" >&5
-echo "$as_me: error: cannot link $ac_dest to $srcdir/$ac_source" >&2;}
-   { (exit 1); exit 1; }; }
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff --git a/configure.in b/configure.in
deleted file mode 100644
index 0accbce508..0000000000
--- a/configure.in
+++ /dev/null
@@ -1,1266 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl $Header: /cvsroot/pgsql/configure.in,v 1.186 2002/05/28 16:57:53 petere Exp $
-dnl
-dnl Developers, please strive to achieve this order:
-dnl
-dnl 0. Initialization and options processing
-dnl 1. Programs
-dnl 2. Libraries
-dnl 3. Header files
-dnl 4. Types
-dnl 5. Structures
-dnl 6. Compiler characteristics
-dnl 7. Functions, global variables
-dnl 8. System services
-dnl
-dnl Read the Autoconf manual for details.
-dnl
-m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
-dnl
-dnl The GNU folks apparently haven't heard that some people don't use
-dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir".
-m4_define([info], [doc])
-m4_define([infodir], [docdir])
-AC_INIT([PostgreSQL], [7.3devel], [pgsql-bugs@postgresql.org])
-m4_undefine([infodir])
-m4_undefine([info])
-AC_SUBST(docdir)
-
-AC_PREREQ(2.53)
-AC_COPYRIGHT([Copyright 2002 PostgreSQL Global Development Group])
-AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
-AC_CONFIG_AUX_DIR(config)
-AC_PREFIX_DEFAULT(/usr/local/pgsql)
-AC_SUBST(configure_args, [$ac_configure_args])
-
-AC_DEFINE_UNQUOTED(PG_VERSION, "$PACKAGE_VERSION", [PostgreSQL version])
-
-AC_CANONICAL_HOST
-
-template=
-AC_MSG_CHECKING([which template to use])
-
-PGAC_ARG_REQ(with, template, [],
-[
-  case $withval in
-    list)   echo; ls "$srcdir/src/template"; exit;;
-    *)      if test -f "$srcdir/src/template/$with_template" ; then
-              template=$withval
-            else
-              AC_MSG_ERROR(['$withval' is not a valid template name. Use 'list' for a list.])
-            fi;;
-  esac
-],
-[
-  # --with-template not given
-
-case $host_os in
-     aix*) template=aix ;;
-    beos*) template=beos ;;
-    bsdi*) template=bsdi ;;
-  cygwin*) template=win ;;
-  darwin*) template=darwin ;;
-    dgux*) template=dgux ;;
- freebsd*) template=freebsd ;;
-    hpux*) template=hpux ;;
-    irix*) template=irix5 ;;
-   linux*) template=linux ;;
-  netbsd*) template=netbsd ;;
-nextstep*) template=nextstep ;;
- openbsd*) template=openbsd ;;
-     osf*) template=osf ;;
-     qnx*) template=qnx4 ;;
-     sco*) template=sco ;;
- solaris*) template=solaris ;;
-   sunos*) template=sunos4 ;;
- sysv4.2*)
-        case $host_vendor in
-          univel) template=univel ;;
-        esac ;;
-   sysv4*) template=svr4 ;;
-   sysv5*) template=unixware ;;
-  ultrix*) template=ultrix4 ;;
-esac
-
-  if test x"$template" = x"" ; then
-    AC_MSG_ERROR([[
-*******************************************************************
-PostgreSQL has apparently not been ported to your platform yet.
-To try a manual configuration, look into the src/template directory
-for a similar platform and use the '--with-template=' option.
-
-Please also contact <pgsql-ports@postgresql.org> to see about
-rectifying this.  Include the above 'checking host system type...'
-line.
-*******************************************************************
-]])
-  fi
-
-])
-
-AC_MSG_RESULT([$template])
-
-PORTNAME=$template
-AC_SUBST(PORTNAME)
-
-# Pick right test-and-set (TAS) code.  Most platforms have inline
-# assembler code in src/include/storage/s_lock.h, so we just use
-# a dummy file here.
-case $host in
-  *-*-hpux*)        need_tas=yes; tas_file=hpux.s ;;
-  sparc-*-solaris*) need_tas=yes; tas_file=solaris_sparc.s ;;
-  i?86-*-solaris*)   need_tas=yes; tas_file=solaris_i386.s ;;
-  *)                need_tas=no;  tas_file=dummy.s ;;
-esac
-AC_CONFIG_LINKS([src/backend/port/tas.s:src/backend/port/tas/${tas_file}])
-
-if test "$need_tas" = yes ; then
-  TAS=tas.o
-fi
-AC_SUBST(TAS)
-
-
-
-##
-## Command line options
-##
-
-
-#
-# Add non-standard directories to the include path
-#
-PGAC_ARG_REQ(with, includes, [  --with-includes=DIRS    look for additional header files in DIRS])
-
-
-#
-# Add non-standard directories to the library search path
-#
-PGAC_ARG_REQ(with, libraries, [  --with-libraries=DIRS   look for additional libraries in DIRS],
-             [LIBRARY_DIRS=$withval])
-
-PGAC_ARG_REQ(with, libs,      [  --with-libs=DIRS        alternative spelling of --with-libraries],
-             [LIBRARY_DIRS=$withval])
-
-
-#
-# 64-bit integer date/time storage (--enable-integer-datetimes)
-#
-AC_MSG_CHECKING([whether to build with 64-bit integer date/time support])
-PGAC_ARG_BOOL(enable, integer-datetimes, no, [  --enable-integer-datetimes  enable 64-bit integer date/time support],
-              [AC_DEFINE([USE_INTEGER_DATETIMES], 1,
-                         [Set to 1 if you want integer date/time support (--enable-integer-datetimes)])])
-AC_MSG_RESULT([$enable_integer_datetimes])
-
-
-# Character set recode (--enable-recode)
-#
-AC_MSG_CHECKING([whether to build with recode support])
-PGAC_ARG_BOOL(enable, recode, no, [  --enable-recode         enable character set recode support],
-              [AC_DEFINE([CYR_RECODE], 1,
-                         [Set to 1 if you want cyrillic recode support (--enable-recode)])])
-AC_MSG_RESULT([$enable_recode])
-
-
-#
-# Multibyte support
-#
-MULTIBYTE=SQL_ASCII
-AC_DEFINE(MULTIBYTE, 1, [Set to 1 if you want to use multibyte characters (--enable-multibyte)])
-AC_SUBST(MULTIBYTE)
-
-#
-# NLS
-#
-AC_MSG_CHECKING([whether NLS is wanted])
-PGAC_ARG_OPTARG(enable, nls,
-                [[  --enable-nls[=LANGUAGES]  enable Native Language Support]],
-                [],
-                [WANTED_LANGUAGES=$enableval],
-                [AC_DEFINE(ENABLE_NLS, 1,
-                           [Define to 1 if you want National Language Support (--enable-nls)])])
-AC_MSG_RESULT([$enable_nls])
-AC_SUBST(enable_nls)
-AC_SUBST(WANTED_LANGUAGES)
-
-#
-# Default port number (--with-pgport), default 5432
-#
-AC_MSG_CHECKING([for default port number])
-PGAC_ARG_REQ(with, pgport, [  --with-pgport=PORTNUM   change default port number [5432]],
-             [default_port=$withval],
-             [default_port=5432])
-AC_MSG_RESULT([$default_port])
-# Need both of these because some places want an integer and some a string
-AC_DEFINE_UNQUOTED(DEF_PGPORT, ${default_port},
-[The default TCP port number on which the server listens and to which
-clients will try to connect to.  This can be overridden at run-time,
-but it's convenient if your clients have the right default compiled in.
-(--with-pgport=PORTNUM)])
-AC_DEFINE_UNQUOTED(DEF_PGPORT_STR, "${default_port}",
-                   [Default TCP port number as string constant])
-AC_SUBST(default_port)
-
-#
-# Maximum number of allowed connections (--with-maxbackends), default 32
-#
-AC_MSG_CHECKING([for default soft limit on number of connections])
-PGAC_ARG_REQ(with, maxbackends, [  --with-maxbackends=N    set default maximum number of connections [32]],
-             [],
-             [with_maxbackends=32])
-AC_MSG_RESULT([$with_maxbackends])
-AC_DEFINE_UNQUOTED([DEF_MAXBACKENDS], [$with_maxbackends],
-                   [The default soft limit on the number of concurrent connections, i.e., the default for the postmaster -N switch (--with-maxbackends)])
-
-
-#
-# Option to disable shared libraries
-#
-PGAC_ARG_BOOL(enable, shared, yes,
-              [  --disable-shared        do not build shared libraries])
-AC_SUBST(enable_shared)
-
-#
-# '-rpath'-like feature can be disabled
-#
-PGAC_ARG_BOOL(enable, rpath, yes,
-              [  --disable-rpath         do not embed shared library search path in executables])
-AC_SUBST(enable_rpath)
-
-
-#
-# --enable-debug adds -g to compiler flags
-#
-PGAC_ARG_BOOL(enable, debug, no,
-              [  --enable-debug          build with debugging symbols (-g)])
-AC_SUBST(enable_debug)
-
-#
-# C compiler
-#
-
-# For historical reasons you can also use --with-CC to specify the C compiler
-# to use, although the standard way to do this is to set the CC environment
-# variable.
-PGAC_ARG_REQ(with, CC, [], [CC=$with_CC])
-
-case $template in
-  aix) pgac_cc_list="gcc xlc";;
- irix) pgac_cc_list="cc";; # no gcc
-    *) pgac_cc_list="gcc cc";;
-esac
-
-AC_PROG_CC([$pgac_cc_list])
-# Read the template
-. "$srcdir/src/template/$template" || exit
-
-if test "$ac_env_CFLAGS_set" = set; then
-  CFLAGS=$ac_env_CFLAGS_value
-fi
-if test "$enable_debug" = yes && test "$ac_cv_prog_cc_g" = yes; then
-  CFLAGS="$CFLAGS -g"
-fi
-AC_MSG_NOTICE([using CFLAGS=$CFLAGS])
-# Check if the compiler still works with the template settings
-AC_MSG_CHECKING([whether the C compiler still works])
-AC_TRY_LINK([], [return 0;],
-  [AC_MSG_RESULT(yes)],
-  [AC_MSG_RESULT(no)
-   AC_MSG_ERROR([cannot proceed])])
-AC_PROG_CPP
-AC_SUBST(GCC)
-
-# Create compiler version string
-if test x"$GCC" = x"yes" ; then
-  cc_string="GCC `${CC} --version | sed q`"
-else
-  cc_string=$CC
-fi
-AC_DEFINE_UNQUOTED(PG_VERSION_STR, ["PostgreSQL $PACKAGE_VERSION on $host, compiled by $cc_string"], [A canonical string containing the version number, platform, and C compiler])
-
-
-#
-# Automatic dependency tracking
-#
-PGAC_ARG_BOOL(enable, depend, no, [  --enable-depend         turn on automatic dependency tracking],
-              [autodepend=yes])
-AC_SUBST(autodepend)
-
-
-#
-# Enable assert checks
-#
-PGAC_ARG_BOOL(enable, cassert, no, [  --enable-cassert        enable assertion checks (for debugging)],
-              [AC_DEFINE([USE_ASSERT_CHECKING], 1,
-                         [Define to 1 to build with assertion checks])])
-
-
-#
-# Include directories
-#
-ac_save_IFS=$IFS
-IFS="${IFS}:"
-# SRCH_INC comes from the template file
-for dir in $with_includes $SRCH_INC; do
-  if test -d "$dir"; then
-    INCLUDES="$INCLUDES -I$dir"
-  else
-    AC_MSG_WARN([*** Include directory $dir does not exist.])
-  fi
-done
-IFS=$ac_save_IFS
-AC_SUBST(INCLUDES)
-
-
-#
-# Library directories
-#
-ac_save_IFS=$IFS
-IFS="${IFS}:"
-# LIBRARY_DIRS comes from command line, SRCH_LIB from template file.
-for dir in $LIBRARY_DIRS $SRCH_LIB; do
-  if test -d "$dir"; then
-    LIBDIRS="$LIBDIRS -L$dir"
-  else
-    AC_MSG_WARN([*** Library directory $dir does not exist.])
-  fi
-done
-IFS=$ac_save_IFS
-
-
-#
-# Tcl/Tk
-#
-AC_MSG_CHECKING([whether to build with Tcl])
-PGAC_ARG_BOOL(with, tcl, no, [  --with-tcl              build Tcl and Tk interfaces])
-AC_MSG_RESULT([$with_tcl])
-AC_SUBST([with_tcl])
-
-# If Tcl is enabled (above) then Tk is also, unless the user disables it using --without-tk
-AC_MSG_CHECKING([whether to build with Tk])
-if test "$with_tcl" = yes; then
-  PGAC_ARG_BOOL(with, tk, yes, [  --without-tk            do not build Tk interfaces if Tcl is enabled])
-else
-  with_tk=no
-fi
-AC_MSG_RESULT([$with_tk])
-AC_SUBST([with_tk])
-
-
-# We see if the path to the Tcl/Tk configuration scripts is specified.
-# This will override the use of tclsh to find the paths to search.
-
-PGAC_ARG_REQ(with, tclconfig, [  --with-tclconfig=DIR    tclConfig.sh and tkConfig.sh are in DIR])
-
-# We see if the path to the Tk configuration scripts is specified.
-# This will override the use of tclsh to find the paths to search.
-
-PGAC_ARG_REQ(with, tkconfig,  [  --with-tkconfig=DIR     tkConfig.sh is in DIR])
-
-#
-# Optionally build Perl modules (Pg.pm and PL/Perl)
-#
-AC_MSG_CHECKING([whether to build Perl modules])
-PGAC_ARG_BOOL(with, perl, no, [  --with-perl             build Perl interface and PL/Perl])
-AC_MSG_RESULT([$with_perl])
-AC_SUBST(with_perl)
-
-#
-# Optionally build Python interface module
-#
-AC_MSG_CHECKING([whether to build Python modules])
-PGAC_ARG_BOOL(with, python, no, [  --with-python           build Python interface module])
-AC_MSG_RESULT([$with_python])
-AC_SUBST(with_python)
-
-#
-# Optionally build the Java/JDBC tools
-#
-AC_MSG_CHECKING([whether to build Java/JDBC tools])
-PGAC_ARG_BOOL(with, java, no, [  --with-java             build JDBC interface and Java tools],
-[AC_MSG_RESULT(yes)
-PGAC_PATH_ANT
-if test -z "$ANT"; then
-  AC_MSG_ERROR([Ant is required to build Java components])
-fi],
-[AC_MSG_RESULT(no)])
-AC_SUBST(with_java)
-
-dnl A note on the Kerberos and OpenSSL options:
-dnl
-dnl The user can give an argument to the option in order the specify
-dnl the base path of the respective installation (what he specified
-dnl perhaps as --prefix). If no argument is given ($withval is "yes")
-dnl then we take the path where the package installs by default. This
-dnl way the user doesn't have to use redundant --with-includes and
-dnl --with-libraries options, but he can still use them if the layout
-dnl is non-standard.
-
-#
-# Kerberos 4
-#
-AC_MSG_CHECKING([whether to build with Kerberos 4 support])
-PGAC_ARG_OPTARG(with, krb4, [[  --with-krb4[=DIR]       build with Kerberos 4 support [/usr/athena]]],
-                [krb4_prefix=/usr/athena],
-                [krb4_prefix=$withval],
-[
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(KRB4, 1, [Define if you are building with Kerberos 4 support.])
-
-  if test -d "$krb4_prefix/include"; then
-    INCLUDES="$INCLUDES -I$krb4_prefix/include"
-  fi
-  if test -d "$krb4_prefix/lib"; then
-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
-  fi
-
-  krb_srvtab="/etc/srvtab"
-],
-[AC_MSG_RESULT(no)])
-
-AC_SUBST(with_krb4)
-
-
-#
-# Kerberos 5
-#
-AC_MSG_CHECKING([whether to build with Kerberos 5 support])
-PGAC_ARG_OPTARG(with, krb5, [[  --with-krb5[=DIR]       build with Kerberos 5 support [/usr/athena]]],
-              [krb5_prefix=/usr/athena],
-              [krb5_prefix=$withval],
-[
-  AC_MSG_RESULT([yes])
-  AC_DEFINE(KRB5, 1, [Define if you are building with Kerberos 5 support.])
-
-  if test -d "$krb5_prefix/include"; then
-    INCLUDES="$INCLUDES -I$krb5_prefix/include"
-  fi
-  if test -d "$krb5_prefix/lib"; then
-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
-  fi
-
-  krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
-],
-[AC_MSG_RESULT(no)])
-
-AC_SUBST(with_krb5)
-
-
-# Using both Kerberos 4 and Kerberos 5 at the same time isn't going to work.
-if test "$with_krb4" = yes && test "$with_krb5" = yes ; then
-  AC_MSG_ERROR([Kerberos 4 and Kerberos 5 support cannot be combined])
-fi
-
-AC_SUBST(krb_srvtab)
-
-
-#
-# Kerberos configuration parameters
-#
-PGAC_ARG_REQ(with, krb-srvnam,
-             [  --with-krb-srvnam=NAME  name of the service principal in Kerberos [postgres]],
-             [],
-             [with_krb_srvnam="postgres"])
-AC_DEFINE_UNQUOTED([PG_KRB_SRVNAM], ["$with_krb_srvnam"],
-                   [The name of the PostgreSQL service principal in Kerberos])
-
-
-#
-# PAM
-#
-AC_MSG_CHECKING([whether to build with PAM support])
-PGAC_ARG_BOOL(with, pam, no,
-              [  --with-pam              build with PAM support],
-              [AC_DEFINE([USE_PAM], 1, [Define to build with PAM support])])
-AC_MSG_RESULT([$with_pam])
-AC_SUBST(with_pam)
-
-
-#
-# OpenSSL
-#
-PGAC_ARG_OPTARG(with, openssl,
-                [[  --with-openssl[=DIR]    build with OpenSSL support [/usr/local/ssl]]],
-                [openssl_prefix=/usr/local/ssl],
-                [openssl_prefix=$withval],
-[
-  AC_MSG_RESULT([building with OpenSSL support])
-  AC_DEFINE([USE_SSL], 1, [Define to build with (Open)SSL support])
-
-  if test -d "${openssl_prefix}/include" ; then
-    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
-  fi
-  if test -d "${openssl_prefix}/lib" ; then
-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
-  fi
-])
-
-AC_SUBST(with_openssl)
-
-
-#
-# Readline
-#
-PGAC_ARG_BOOL(with, readline, yes,
-              [  --without-readline      do not use Readline])
-
-#
-# Zlib
-#
-PGAC_ARG_BOOL(with, zlib, yes,
-              [  --without-zlib          do not use Zlib])
-
-
-
-#
-# Optionally enable the building of the ODBC driver
-#
- 
-# Old option name
-if test "${with_odbc+set}" = set && test "${enable_odbc+set}" != set; then
-  enable_odbc=$with_odbc
-fi
- 
-AC_MSG_CHECKING([whether to build the ODBC driver])
-PGAC_ARG_BOOL(enable, odbc, no, [  --enable-odbc           build the ODBC driver package])
-PGAC_ARG_BOOL(with, unixodbc, no, [  --with-unixodbc         build ODBC driver for unixODBC])
-PGAC_ARG_BOOL(with, iodbc, no, [  --with-iodbc            build ODBC driver for iODBC])
-if test "$with_unixodbc" = yes && test "$with_iodbc" = yes; then
-  AC_MSG_ERROR([ODBC driver cannot be built for both unixODBC and iODBC])
-fi
-if test "$with_unixodbc" = yes || test "$with_iodbc" = yes; then
-  enable_odbc=yes
-fi
-case $enable_odbc:$with_unixodbc:$with_iodbc in
-  yes:no:no)    AC_MSG_RESULT([yes (stand-alone)]);;
-  yes:yes:no)   AC_MSG_RESULT([yes (unixODBC)])
-                AC_DEFINE(WITH_UNIXODBC, 1, [Define to 1 to build with unixODBC support (--with-unixodbc)])
-                ;;
-  yes:no:yes)   AC_MSG_RESULT([yes (iODBC)])
-                AC_DEFINE(WITH_IODBC, 1, [Define to 1 to build with iODBC support (--with-iodbc)])
-                ;;
-  no:*)         AC_MSG_RESULT(no);;
-esac
-AC_SUBST([enable_odbc])
-AC_SUBST([with_unixodbc])
-AC_SUBST([with_iodbc])
-
-
-# Allow for overriding the default location of the odbcinst.ini
-# file which is normally ${sysconfdir} (i.e., ${prefix}/etc).
-PGAC_ARG_REQ(with, odbcinst,
-             [  --with-odbcinst=DIR     default directory for odbcinst.ini [sysconfdir]],
-             [odbcinst_ini_dir=$withval],
-             [odbcinst_ini_dir="\${sysconfdir}"])
-AC_SUBST([odbcinst_ini_dir])
-
-
-
-# Assume system is ELF if it predefines __ELF__ as 1,
-# otherwise believe host_os based default.
-case $host_os in
-    freebsd1*|freebsd2*) elf=no;;
-    freebsd3*|freebsd4*) elf=yes;;
-esac
-
-AC_EGREP_CPP(yes,
-[#if __ELF__
-  yes
-#endif
-],
-[ELF_SYS=true],
-[if test "X$elf" = "Xyes" ; then
-  ELF_SYS=true
-else
-  ELF_SYS=
-fi])
-AC_SUBST(ELF_SYS)
-
-
-
-#
-# Optionally build C++ code (i.e., libpq++)
-#
-AC_MSG_CHECKING([whether to build C++ modules])
-PGAC_ARG_OPTARG(with, CXX, [  --with-CXX              build C++ modules (libpq++)],
-                [],
-                [CXX=$withval],
-[
-  AC_MSG_RESULT(yes)
-
-  # If the user has specified CXXFLAGS in the environment, leave it
-  # alone, else use a default.
-
-  AC_PROG_CXX
-  if test "$ac_env_CXXFLAGS" != set; then
-    if test "$GXX" = yes; then
-      CXXFLAGS=-O2
-    else
-      case $template in
-	osf)		CXXFLAGS='-O4 -Olimit 2000' ;;
-        unixware)	CXXFLAGS='-O' ;;
-	*)		CXXFLAGS= ;;
-      esac
-    fi
-  fi
-  if test "$enable_debug" = yes && test "$ac_cv_prog_cxx_g" = yes; then
-    CXXFLAGS="$CXXFLAGS -g"
-  fi
-  AC_MSG_NOTICE([using CXXFLAGS=$CXXFLAGS])
-
-  AC_PROG_CXXCPP
-],
-[AC_MSG_RESULT(no)])
-AC_SUBST(with_CXX)
-AC_SUBST(GXX)
-
-CPPFLAGS="$CPPFLAGS $INCLUDES"
-LDFLAGS="$LDFLAGS $LIBDIRS"
-
-AC_MSG_NOTICE([using CPPFLAGS=$CPPFLAGS])
-AC_MSG_NOTICE([using LDFLAGS=$LDFLAGS])
-
-
-AC_PROG_AWK
-PGAC_PATH_FLEX
-AC_PROG_LN_S
-AC_PROG_LD
-AC_SUBST(LD)
-AC_SUBST(with_gnu_ld)
-case $host_os in sysv5*)
-  AC_CACHE_CHECK([whether ld -R works], [pgac_cv_prog_ld_R],
-  [
-    pgac_save_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -Wl,-R/usr/lib"
-    AC_TRY_LINK([], [], [pgac_cv_prog_ld_R=yes], [pgac_cv_prog_ld_R=no])
-    LDFLAGS=$pgac_save_LDFLAGS
-  ])
-  ld_R_works=$pgac_cv_prog_ld_R
-  AC_SUBST(ld_R_works)
-esac
-AC_PROG_RANLIB
-AC_CHECK_PROGS(LORDER, lorder)
-AC_PATH_PROG(TAR, tar)
-PGAC_CHECK_STRIP
-
-AC_CHECK_PROGS(YACC, ['bison -y'])
-if test -z "$YACC"; then
-  AC_MSG_WARN([
-*** Without Bison you will not be able to build PostgreSQL from CVS or
-*** change any of the parser definition files.  You can obtain Bison from
-*** a GNU mirror site.  (If you are using the official distribution of
-*** PostgreSQL then you do not need to worry about this because the Bison
-*** output is pre-generated.)  To use a different yacc program (possible,
-*** but not recommended), set the environment variable YACC before running
-*** 'configure'.])
-fi
-AC_SUBST(YFLAGS)
-
-if test "$with_tk" = yes; then
-    AC_PATH_PROG(WISH, wish)
-    test -z "$WISH" && AC_MSG_ERROR(['wish' is required for Tk support])
-fi
-
-PGAC_PATH_PERL
-if test "$with_perl" = yes; then
-  PGAC_CHECK_PERL_CONFIGS([installsitearch,installman3dir,
-                           archlibexp,privlibexp,useshrplib,man3ext])
-  PGAC_CHECK_PERL_EMBED_LDFLAGS
-fi
-
-if test "$with_python" = yes; then
-  PGAC_PATH_PYTHON
-  PGAC_CHECK_PYTHON_MODULE_SETUP
-  PGAC_CHECK_PYTHON_EMBED_SETUP
-fi
-
-
-##
-## Libraries
-##
-
-if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha"
-then
-	AC_CHECK_LIB(bsd,      main)
-fi
-AC_CHECK_LIB(util,     setproctitle)
-AC_CHECK_LIB(m,        main)
-AC_CHECK_LIB(dl,       main)
-AC_CHECK_LIB(nsl,      main)
-AC_CHECK_LIB(socket,   main)
-AC_CHECK_LIB(ipc,      main)
-AC_CHECK_LIB(IPC,      main)
-AC_CHECK_LIB(lc,       main)
-AC_CHECK_LIB(dld,      main)
-AC_CHECK_LIB(ld,       main)
-AC_CHECK_LIB(compat,   main)
-AC_CHECK_LIB(BSD,      main)
-AC_CHECK_LIB(gen,      main)
-AC_CHECK_LIB(PW,       main)
-AC_CHECK_LIB(resolv,   main)
-# QNX:
-AC_CHECK_LIB([[unix]], main)
-AC_SEARCH_LIBS(crypt,  crypt)
-# BeOS:
-AC_CHECK_LIB(bind,     __inet_ntoa)
-# Solaris:
-AC_SEARCH_LIBS(fdatasync, [rt posix4])
-
-if test "$with_readline" = yes; then
-  PGAC_CHECK_READLINE
-  if test x"$pgac_cv_check_readline" = x"no"; then
-    AC_MSG_ERROR([readline library not found
-Use --without-readline to disable readline support.])
-  fi
-fi
-
-if test "$with_zlib" = yes; then
-  AC_CHECK_LIB(z, inflate, [],
-               [AC_MSG_ERROR([zlib library not found
-Use --without-zlib to disable zlib support.])])
-fi
-
-if test "$with_krb4" = yes ; then
-  AC_CHECK_LIB(des, [des_encrypt], [], [AC_MSG_ERROR([library 'des' is required for Kerberos 4])])
-  AC_CHECK_LIB(krb, [krb_sendauth], [], [AC_MSG_ERROR([library 'krb' is required for Kerberos 4])])
-fi
-
-if test "$with_krb5" = yes ; then
-  AC_SEARCH_LIBS(com_err, [krb5 'krb5 -ldes -lasn1 -lroken' com_err], [],
-                 [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])])
-  AC_SEARCH_LIBS(krb5_encrypt, [krb5 'krb5 -ldes -lasn1 -lroken' crypto k5crypto], [],
-                 [AC_MSG_ERROR([could not find function 'krb5_encrypt' required for Kerberos 5])])
-  AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -ldes -lasn1 -lroken'], [],
-                 [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])])
-fi
-
-if test "$with_openssl" = yes ; then
-  dnl Order matters!
-  AC_CHECK_LIB(crypto, [CRYPTO_new_ex_data], [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])
-  AC_CHECK_LIB(ssl,    [SSL_library_init], [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
-fi
-
-if test "$with_pam" = yes ; then
-  AC_CHECK_LIB(pam,    [pam_start], [], [AC_MSG_ERROR([library 'pam' is required for PAM])])
-fi
-
-
-##
-## Header files
-##
-dnl sys/socket.h is required by AC_FUNC_ACCEPT_ARGTYPES
-AC_CHECK_HEADERS([crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h pwd.h sys/ipc.h sys/pstat.h sys/select.h sys/sem.h sys/socket.h sys/shm.h sys/un.h termios.h kernel/OS.h kernel/image.h SupportDefs.h])
-
-# At least on IRIX, cpp test for netinet/tcp.h will fail unless
-# netinet/in.h is included first.
-AC_CHECK_HEADERS([netinet/in.h])
-AC_CHECK_HEADERS([netinet/tcp.h], [], [],
-[AC_INCLUDES_DEFAULT
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-])
-
-if test "$with_readline" = yes; then
-  AC_CHECK_HEADERS([readline/readline.h], [],
-                   [AC_CHECK_HEADERS([readline.h], [],
-                                     [AC_MSG_ERROR([readline header not found
-Use --without-readline to disable readline support.])])])
-  AC_CHECK_HEADERS([readline/history.h], [],
-                   [AC_CHECK_HEADERS([history.h], [],
-                                     [AC_MSG_ERROR([history header not found
-Use --without-readline to disable readline support.])])])
-fi
-
-if test "$with_zlib" = yes; then
-  AC_CHECK_HEADER(zlib.h, [], [AC_MSG_ERROR([zlib header not found
-Use --without-zlib to disable zlib support.])])
-fi
-
-if test "$with_krb4" = yes ; then
-  AC_CHECK_HEADER(krb.h, [], [AC_MSG_ERROR([header file <krb.h> is required for Kerberos 4])])
-fi
-
-if test "$with_krb5" = yes ; then
-  AC_CHECK_HEADER(krb5.h, [], [AC_MSG_ERROR([header file <krb5.h> is required for Kerberos 5])])
-  AC_CHECK_HEADER(com_err.h, [], [AC_MSG_ERROR([header file <com_err.h> is required for Kerberos 5])])
-fi
-
-if test "$with_openssl" = yes ; then
-  AC_CHECK_HEADER([openssl/ssl.h], [], [AC_MSG_ERROR([header file <openssl/ssl.h> is required for OpenSSL])])
-  AC_CHECK_HEADER([openssl/err.h], [], [AC_MSG_ERROR([header file <openssl/err.h> is required for OpenSSL])])
-fi
-
-if test "$with_pam" = yes ; then
-  AC_CHECK_HEADER([security/pam_appl.h], [], [AC_MSG_ERROR([header file <security/pam_appl.h> is required for PAM])])
-fi
-
-
-##
-## Types, structures, compiler characteristics
-##
-m4_defun([AC_PROG_CC_STDC], []) dnl We don't want that.
-AC_C_CONST
-AC_C_INLINE
-AC_C_STRINGIZE
-PGAC_C_SIGNED
-AC_C_VOLATILE
-AC_STRUCT_TIMEZONE
-PGAC_UNION_SEMUN
-PGAC_STRUCT_SOCKADDR_UN
-
-AC_CHECK_TYPES([struct cmsgcred, struct fcred, struct sockcred], [], [],
-[#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/ucred.h>])
-
-if test "$with_zlib" = yes; then
-  # Check that <zlib.h> defines z_streamp (versions before about 1.0.4
-  # did not).  While we could work around the lack of z_streamp, it
-  # seems unwise to encourage people to use such old zlib versions...
-  AC_CHECK_TYPE(z_streamp, [], [AC_MSG_ERROR([zlib version is too old
-Use --without-zlib to disable zlib support.])],
-                [#include <zlib.h>])
-fi
-
-if test "$with_krb5" = yes; then
-# Check for differences between MIT and Heimdal (KTH) releases
-  AC_CHECK_MEMBERS([krb5_ticket.enc_part2], [],
-                   [AC_CHECK_MEMBERS([krb5_ticket.client], [],
-                                     [AC_MSG_ERROR([could not determine how to get client name from Kerberos 5 ticket])],
-                                     [#include <krb5.h>])],
-                   [#include <krb5.h>])
-  AC_CHECK_MEMBERS([krb5_error.text.data], [],
-                   [AC_CHECK_MEMBER([krb5_error.e_data], [],
-                                    [AC_MSG_ERROR([could not determine how to extract Kerberos 5 error messages])],
-                                    [#include <krb5.h>])],
-                   [#include <krb5.h>])
-fi
-
-
-##
-## Functions, global variables
-##
-PGAC_VAR_INT_TIMEZONE
-AC_FUNC_ACCEPT_ARGTYPES
-PGAC_FUNC_GETTIMEOFDAY_1ARG
-
-# SunOS doesn't handle negative byte comparisons properly with +/- return
-PGAC_FUNC_MEMCMP
-
-AC_CHECK_FUNCS([cbrt fcvt getopt_long memmove pstat setproctitle setsid sigprocmask sysconf waitpid dlopen fdatasync])
-
-AC_CHECK_DECLS(fdatasync, [], [], [#include <unistd.h>])
-
-AC_CACHE_CHECK([for PS_STRINGS], [pgac_cv_var_PS_STRINGS],
-[AC_TRY_LINK(
-[#include <machine/vmparam.h>
-#include <sys/exec.h>
-],
-[PS_STRINGS->ps_nargvstr = 1;
-PS_STRINGS->ps_argvstr = "foo";],
-[pgac_cv_var_PS_STRINGS=yes],
-[pgac_cv_var_PS_STRINGS=no])])
-if test "$pgac_cv_var_PS_STRINGS" = yes ; then
-  AC_DEFINE([HAVE_PS_STRINGS], [], [Define if the PS_STRINGS thing exists.])
-fi
-
-
-# We use our snprintf.c emulation if either snprintf() or vsnprintf()
-# is missing.  Yes, there are machines that have only one.  We may
-# also decide to use snprintf.c if snprintf() is present but does not
-# have working "long long int" support -- see below.
-
-SNPRINTF=''
-AC_CHECK_FUNCS(snprintf, [], SNPRINTF='snprintf.o')
-AC_CHECK_FUNCS(vsnprintf, [], SNPRINTF='snprintf.o')
-AC_SUBST(SNPRINTF)
-
-
-# Check whether <stdio.h> declares snprintf() and vsnprintf(); if not,
-# include/c.h will provide declarations.  Note this is a separate test
-# from whether the functions exist in the C library --- there are
-# systems that have the functions but don't bother to declare them :-(
-
-AC_CHECK_DECLS([snprintf, vsnprintf])
-
-
-# do this one the hard way in case isinf() is a macro
-AC_CACHE_CHECK([for isinf], ac_cv_func_isinf,
-[AC_TRY_LINK(
-[#include <math.h>
-],
-[double x = 0.0; int res = isinf(x);],
-[ac_cv_func_isinf=yes],
-[ac_cv_func_isinf=no])])
-
-if test $ac_cv_func_isinf = yes ; then
-  AC_DEFINE(HAVE_ISINF, 1, [Define to 1 if you have isinf()])
-  ISINF=
-else
-  ISINF='isinf.o'
-  # Look for a way to implement a substitute for isinf()
-  AC_CHECK_FUNCS([fpclass fp_class fp_class_d class], [break])
-fi
-AC_SUBST(ISINF)
-
-
-AC_CHECK_FUNCS(getrusage, [], GETRUSAGE='getrusage.o')
-AC_SUBST(GETRUSAGE)
-AC_CHECK_FUNCS(srandom, [], SRANDOM='srandom.o')
-AC_SUBST(SRANDOM)
-AC_CHECK_FUNCS(gethostname, [], GETHOSTNAME='gethostname.o')
-AC_SUBST(GETHOSTNAME)
-AC_CHECK_FUNCS(random, [], MISSING_RANDOM='random.o')
-AC_SUBST(MISSING_RANDOM)
-AC_CHECK_FUNCS(inet_aton, [], INET_ATON='inet_aton.o')
-AC_SUBST(INET_ATON)
-AC_CHECK_FUNCS(strerror, [], STRERROR='strerror.o')
-AC_SUBST(STRERROR)
-AC_CHECK_FUNCS(strdup, [], STRDUP='../../utils/strdup.o')
-AC_SUBST(STRDUP)
-AC_CHECK_FUNCS(strtol, [], STRTOL='strtol.o')
-AC_SUBST(STRTOL)
-AC_CHECK_FUNCS(strtoul, [], STRTOUL='strtoul.o')
-AC_SUBST(STRTOUL)
-AC_CHECK_FUNCS(strcasecmp, [], STRCASECMP='strcasecmp.o')
-AC_SUBST(STRCASECMP)
-
-# On HPUX 9, rint() is not in regular libm.a but in /lib/pa1.1/libm.a;
-# this hackery with HPUXMATHLIB allows us to cope.
-HPUXMATHLIB=""
-case $host_cpu in
-  hppa1.1) 
-	if [[ -r /lib/pa1.1/libm.a ]] ; then
-	    HPUXMATHLIB="-L /lib/pa1.1 -lm"
-	fi ;;
-esac
-AC_SUBST(HPUXMATHLIB)
-
-AC_CHECK_FUNCS(rint, [],
-               [AC_CHECK_LIB(m, rint, AC_DEFINE(HAVE_RINT), , $HPUXMATHLIB)])
-
-
-if test "$with_readline" = yes; then
-  PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER
-  AC_CHECK_FUNCS([rl_completion_matches rl_filename_completion_function])
-fi
-
-
-dnl Cannot use AC_CHECK_FUNC because finite may be a macro
-AC_MSG_CHECKING(for finite)
-AC_TRY_LINK([#include <math.h>],
-            [int dummy=finite(1.0);],
-            [AC_DEFINE(HAVE_FINITE, 1, [Set to 1 if you have finite()])
-AC_MSG_RESULT(yes)],
-            [AC_MSG_RESULT(no)])
-
-dnl Cannot use AC_CHECK_FUNC because sigsetjmp may be a macro
-dnl (especially on GNU libc)
-dnl See also comments in pg_config.h.
-AC_MSG_CHECKING(for sigsetjmp)
-AC_TRY_LINK([#include <setjmp.h>],
-            [sigjmp_buf x; sigsetjmp(x, 1);],
-            [AC_DEFINE(HAVE_SIGSETJMP, 1, [Set to 1 if you have sigsetjmp()])
-AC_MSG_RESULT(yes)],
-            [AC_MSG_RESULT(no)])
-
-AC_CHECK_FUNC(syslog, 
-	     [AC_CHECK_HEADER(syslog.h,
-	     [AC_DEFINE(HAVE_SYSLOG, 1, [])],
-	     [])])
-
-AC_CACHE_CHECK([for optreset], pgac_cv_var_int_optreset,
-[AC_TRY_LINK([#include <unistd.h>],
-  [extern int optreset; optreset = 1;],
-  [pgac_cv_var_int_optreset=yes],
-  [pgac_cv_var_int_optreset=no])])
-if test x"$pgac_cv_var_int_optreset" = x"yes"; then
-  AC_DEFINE(HAVE_INT_OPTRESET, 1, [Define to 1 if you have the global variable 'int optreset'])
-fi
-
-
-# This test makes sure that run tests work at all.  Sometimes a shared
-# library is found by the linker, but the runtime linker can't find it.
-# This check should come after all modifications of compiler or linker
-# variables, and before any other run tests.
-AC_MSG_CHECKING([test program])
-AC_TRY_RUN([int main() { return 0; }],
-[AC_MSG_RESULT(ok)],
-[AC_MSG_RESULT(failed)
-AC_MSG_ERROR([[
-*** Could not execute a simple test program.  This may be a problem
-*** related to locating shared libraries.  Check the file 'config.log'
-*** for the exact reason.]])],
-[AC_MSG_RESULT([cross-compiling])])
-
-
-dnl Check to see if we have a working 64-bit integer type.
-dnl This breaks down into two steps:
-dnl (1) figure out if the compiler has a 64-bit int type with working
-dnl arithmetic, and if so
-dnl (2) see whether snprintf() can format the type correctly.  (Currently,
-dnl snprintf is the only library routine we really need for int8 support.)
-dnl It's entirely possible to have a compiler that handles a 64-bit type
-dnl when the C library doesn't; this is fairly likely when using gcc on
-dnl an older platform, for example.
-dnl If there is no native snprintf() or it does not handle the 64-bit type,
-dnl we force our own version of snprintf() to be used instead.
-dnl Note this test must be run after our initial check for snprintf/vsnprintf.
-
-PGAC_TYPE_64BIT_INT([long int])
-
-if test x"$HAVE_LONG_INT_64" = x"no" ; then
-  PGAC_TYPE_64BIT_INT([long long int])
-fi
-
-
-dnl If we need to use "long long int", figure out whether nnnLL notation works.
-
-if [[ x"$HAVE_LONG_LONG_INT_64" = xyes ]] ; then
-  AC_TRY_COMPILE([
-#define INT64CONST(x)  x##LL
-long long int foo = INT64CONST(0x1234567890123456);
-],
-	[],
-	[AC_DEFINE(HAVE_LL_CONSTANTS, 1, [Define if you have LL constants])],
-	[])
-fi
-
-
-dnl If we found "long int" is 64 bits, assume snprintf handles it.
-dnl If we found we need to use "long long int", better check.
-dnl We cope with snprintfs that use either %lld or %qd as the format.
-dnl If neither works, fall back to our own snprintf emulation (which we
-dnl know uses %lld).
-
-if [[ x"$HAVE_LONG_LONG_INT_64" = xyes ]] ; then
-  if [[ x$SNPRINTF = x ]] ; then
-    AC_MSG_CHECKING(whether snprintf handles 'long long int' as %lld)
-    AC_TRY_RUN([#include <stdio.h>
-typedef long long int int64;
-#define INT64_FORMAT "%lld"
-
-int64 a = 20000001;
-int64 b = 40000005;
-
-int does_int64_snprintf_work()
-{
-  int64 c;
-  char buf[100];
-
-  if (sizeof(int64) != 8)
-    return 0;			/* doesn't look like the right size */
-
-  c = a * b;
-  snprintf(buf, 100, INT64_FORMAT, c);
-  if (strcmp(buf, "800000140000005") != 0)
-    return 0;			/* either multiply or snprintf is busted */
-  return 1;
-}
-main() {
-  exit(! does_int64_snprintf_work());
-}],
-	[ AC_MSG_RESULT(yes)
-	  INT64_FORMAT='"%lld"'
-	],
-  [ AC_MSG_RESULT(no)
-    AC_MSG_CHECKING(whether snprintf handles 'long long int' as %qd) 
-    AC_TRY_RUN([#include <stdio.h>
-typedef long long int int64;
-#define INT64_FORMAT "%qd"
-   
-int64 a = 20000001;
-int64 b = 40000005;
-   
-int does_int64_snprintf_work()
-{  
-  int64 c;
-  char buf[100];
-
-  if (sizeof(int64) != 8)
-    return 0;     /* doesn't look like the right size */
-
-  c = a * b;
-  snprintf(buf, 100, INT64_FORMAT, c);
-  if (strcmp(buf, "800000140000005") != 0)
-    return 0;     /* either multiply or snprintf is busted */
-  return 1;
-}
-main() {
-  exit(! does_int64_snprintf_work());
-}],
-  [ AC_MSG_RESULT(yes)
-    INT64_FORMAT='"%qd"'
-  ],
-  [ AC_MSG_RESULT(no)
-	# Force usage of our own snprintf, since system snprintf is broken
-	SNPRINTF='snprintf.o'
-	INT64_FORMAT='"%lld"'
-  ],
-  [ AC_MSG_RESULT(assuming not on target machine)
-	# Force usage of our own snprintf, since we cannot test foreign snprintf
-	SNPRINTF='snprintf.o'
-	INT64_FORMAT='"%lld"'
-  ]) ],
-  [ AC_MSG_RESULT(assuming not on target machine)
-	# Force usage of our own snprintf, since we cannot test foreign snprintf
-	SNPRINTF='snprintf.o'
-	INT64_FORMAT='"%lld"'
-  ])
-  else
-    # here if we previously decided we needed to use our own snprintf
-    INT64_FORMAT='"%lld"'
-  fi
-else
-  # Here if we are not using 'long long int' at all
-  INT64_FORMAT='"%ld"'
-fi
-
-AC_DEFINE_UNQUOTED(INT64_FORMAT, $INT64_FORMAT,
-                   [Define this as the appropriate snprintf format for 64-bit ints, if any])
-
-
-AC_CHECK_FUNCS([strtoll strtoq], [break])
-AC_CHECK_FUNCS([strtoull strtouq], [break])
-
-# Check for one of atexit() or on_exit()
-AC_CHECK_FUNCS(atexit, [],
-               [AC_CHECK_FUNCS(on_exit, [],
-                               [AC_MSG_ERROR([neither atexit() nor on_exit() found])])])
-
-dnl Need a #define for the size of Datum (unsigned long)
-
-AC_CHECK_SIZEOF([unsigned long])
-AC_DEFINE_UNQUOTED(SIZEOF_DATUM, $ac_cv_sizeof_unsigned_long, [sizeof(Datum) -- don't change])
-
-# Determine memory alignment requirements for the basic C data types.
-
-PGAC_CHECK_ALIGNOF(short)
-PGAC_CHECK_ALIGNOF(int)
-PGAC_CHECK_ALIGNOF(long)
-if test x"$HAVE_LONG_LONG_INT_64" = x"yes" ; then
-  PGAC_CHECK_ALIGNOF(long long int)
-fi
-PGAC_CHECK_ALIGNOF(double)
-
-# Compute maximum alignment of any basic type.
-# We assume long's alignment is at least as strong as char, short, or int;
-# but we must check long long (if it exists) and double.
-
-MAX_ALIGNOF=$pgac_cv_alignof_long
-if test $MAX_ALIGNOF -lt $pgac_cv_alignof_double ; then
-  MAX_ALIGNOF=$pgac_cv_alignof_double
-fi
-if test x"$HAVE_LONG_LONG_INT_64" = xyes && test $MAX_ALIGNOF -lt $pgac_cv_alignof_long_long_int ; then
-  MAX_ALIGNOF="$pgac_cv_alignof_long_long_int"
-fi
-AC_DEFINE_UNQUOTED(MAXIMUM_ALIGNOF, $MAX_ALIGNOF, [Define as the maximum alignment requirement of any type])
-
-
-# Some platforms predefine the types int8, int16, etc.  Only check
-# a (hopefully) representative subset.
-AC_CHECK_TYPES([int8, uint8, int64, uint64], [], [],
-[#include <stdio.h>
-#ifdef HAVE_SUPPORTDEFS_H
-#include <SupportDefs.h>
-#endif])
-
-# We also check for sig_atomic_t, which *should* be defined per ANSI
-# C, but is missing on some old platforms.
-AC_CHECK_TYPES([sig_atomic_t], [], [], [#include <signal.h>])
-
-
-PGAC_FUNC_POSIX_SIGNALS
-
-
-# Select semaphore implementation type.
-if test x"$USE_NAMED_POSIX_SEMAPHORES" = x"1" ; then
-  AC_DEFINE(USE_NAMED_POSIX_SEMAPHORES, 1, [Define to select named POSIX semaphores])
-  SEMA_IMPLEMENTATION="src/backend/port/posix_sema.c"
-else
-  if test x"$USE_UNNAMED_POSIX_SEMAPHORES" = x"1" ; then
-    AC_DEFINE(USE_UNNAMED_POSIX_SEMAPHORES, 1, [Define to select unnamed POSIX semaphores])
-    SEMA_IMPLEMENTATION="src/backend/port/posix_sema.c"
-  else
-    AC_DEFINE(USE_SYSV_SEMAPHORES, 1, [Define to select SysV-style semaphores])
-    SEMA_IMPLEMENTATION="src/backend/port/sysv_sema.c"
-  fi
-fi
-
-
-# Select shared-memory implementation type.
-AC_DEFINE(USE_SYSV_SHARED_MEMORY, 1, [Define to select SysV-style shared memory])
-SHMEM_IMPLEMENTATION="src/backend/port/sysv_shmem.c"
-
-
-if test "$enable_nls" = yes ; then
-  PGAC_CHECK_GETTEXT
-fi
-
-if test "$with_CXX" = yes; then
-  PGAC_CLASS_STRING
-  PGAC_CXX_NAMESPACE_STD
-fi
-
-
-# Check for Tcl configuration script tclConfig.sh
-if test "$with_tcl" = yes; then
-    PGAC_PATH_TCLCONFIGSH([$with_tclconfig])
-    PGAC_EVAL_TCLCONFIGSH([$TCL_CONFIG_SH],
-                          [TCL_LIB_FILE,TCL_LIBS,TCL_LIB_SPEC,TCL_SHARED_BUILD])
-    AC_SUBST(TCL_SHLIB_LD_LIBS)dnl don't want to double-evaluate that one
-fi
-
-# Check for Tk configuration script tkConfig.sh
-if test "$with_tk" = yes; then
-    PGAC_PATH_TKCONFIGSH([$with_tkconfig $with_tclconfig])
-    PGAC_EVAL_TCLCONFIGSH([$TK_CONFIG_SH], [TK_LIBS,TK_LIB_SPEC,TK_XINCLUDES])
-fi
-
-
-#
-# Check for DocBook and tools
-#
-PGAC_PROG_NSGMLS
-PGAC_PROG_JADE
-PGAC_CHECK_DOCBOOK([3.1])
-PGAC_PATH_DOCBOOK_STYLESHEETS
-PGAC_PATH_COLLATEINDEX
-AC_CHECK_PROGS(SGMLSPL, sgmlspl)
-
-
-# prepare build tree if outside source tree
-# Note 1: test -ef might not exist, but it's more reliable than `pwd`.
-# Note 2: /bin/pwd might be better than shell's built-in at getting
-#         a symlink-free name.
-if test "$no_create" != yes; then
-  if ( test "$srcdir" -ef . ) >/dev/null 2>&1 || test "`cd $srcdir && /bin/pwd`" = "`/bin/pwd`"; then
-    :
-  else
-    AC_SUBST(vpath_build, yes)
-    _AS_ECHO_N([preparing build tree... ])
-    pgac_abs_top_srcdir=`cd "$srcdir" && pwd`
-    $SHELL "$ac_aux_dir/prep_buildtree" "$pgac_abs_top_srcdir" "." \
-      || AC_MSG_ERROR(failed)
-    AC_MSG_RESULT(done)
-  fi
-fi
-
-
-AC_CONFIG_FILES([GNUmakefile src/Makefile.global])
-
-AC_CONFIG_LINKS([
-  src/backend/port/dynloader.c:src/backend/port/dynloader/${template}.c
-  src/backend/port/pg_sema.c:${SEMA_IMPLEMENTATION}
-  src/backend/port/pg_shmem.c:${SHMEM_IMPLEMENTATION}
-  src/include/dynloader.h:src/backend/port/dynloader/${template}.h
-  src/include/pg_config_os.h:src/include/port/${template}.h
-  src/Makefile.port:src/makefiles/Makefile.${template}
-])
-
-AC_CONFIG_HEADERS([src/include/pg_config.h],
-[
-# Update timestamp for pg_config.h (see Makefile.global)
-echo >src/include/stamp-h
-])
-
-AC_OUTPUT
diff --git a/contrib/Makefile b/contrib/Makefile
deleted file mode 100644
index fc265216e1..0000000000
--- a/contrib/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/Makefile,v 1.31 2002/02/22 23:05:34 momjian Exp $
-
-subdir = contrib
-top_builddir = ..
-include $(top_builddir)/src/Makefile.global
-
-WANTED_DIRS = \
-		array		\
-		btree_gist	\
-		chkpass		\
-		cube		\
-		dbase		\
-		dblink		\
-		dbsize		\
-		earthdistance	\
-		findoidjoins	\
-		fulltextindex	\
-		fuzzystrmatch	\
-		intarray	\
-		isbn_issn	\
-		lo		\
-		miscutil	\
-		noupdate	\
-		oid2name	\
-		pg_controldata	\
-		pg_dumplo	\
-		pg_logger	\
-		pg_resetxlog	\
-		pgbench		\
-		pgcrypto	\
-		pgstattuple	\
-		rserv		\
-		rtree_gist	\
-		seg		\
-		spi		\
-		string		\
-		tips		\
-		tsearch		\
-		userlock	\
-		vacuumlo
-
-ifeq ($(with_java),yes)
-WANTED_DIRS += retep
-endif
-
-# Missing:
-#		ipc_check	\ (does not have a makefile)
-#		mSQL-interface	\ (requires msql installed)
-#		mac		\ (does not have a makefile)
-#		mysql		\ (does not have a makefile)
-#		oracle		\ (does not have a makefile)
-#		start-scripts	\ (does not have a makefile)
-#		tools		\ (does not have a makefile)
-#		xml		\ (non-standard makefile)
-
-
-all install installdirs uninstall clean distclean maintainer-clean check installcheck:
-	@for dir in $(WANTED_DIRS); do \
-		$(MAKE) -C $$dir $@ || exit; \
-	done
diff --git a/contrib/README b/contrib/README
deleted file mode 100644
index 1ffef6df32..0000000000
--- a/contrib/README
+++ /dev/null
@@ -1,205 +0,0 @@
-
-The PostgreSQL contrib tree
----------------------------
-
-This subtree contains porting tools, analysis utilities, and plug-in
-features that are not part of the core PostgreSQL system, mainly because
-they address a limited audience or are too experimental to be part of
-the main source tree.  This does not preclude their usefulness.
-
-Each subdirectory contains a README file with information about the
-module.  Most items can be built with `gmake all' and installed with
-`gmake install' in the usual fashion, after you have run the `configure'
-script in the top-level directory.  Some directories supply new
-user-defined functions, operators, or types.  After you have installed
-the files you need to register the new entities in the database system
-by running the commands in the supplied .sql file.  For example,
-
-	$ psql -d dbname -f module.sql
-
-See the PostgreSQL documentation for more information about this
-procedure.
-
-
-Index:
-------
-
-array -
-	Array iterator functions
-	by Massimo Dal Zotto <dz@cs.unitn.it>
-
-btree_gist -
-	Support for emulating BTREE indexing in GiST
-	by Oleg Bartunov <oleg@sai.msu.su> and Teodor Sigaev <teodor@stack.net>
-
-chkpass -
-	An auto-encrypted password datatype
-	by D'Arcy J.M. Cain <darcy@druid.net>
-
-cube -
-	Multidimensional-cube datatype (GiST indexing example)
-	by Gene Selkov, Jr. <selkovjr@mcs.anl.gov>
-
-dbase -
-	Converts from dbase/xbase to PostgreSQL
-	by Maarten.Boekhold <Maarten.Boekhold@reuters.com>,
-	   Frank Koormann <fkoorman@usf.uni-osnabrueck.de>,
-	   Ivan Baldo <lubaldo@adinet.com.uy>
-
-dblink -
-	Allows remote query execution
-	by  Joe Conway <joe.conway@mail.com>
-
-dbsize -
-	Reports database and table disk space
-	by Peter Eisentraut <peter_e@gmx.net>
-
-earthdistance -
-	Operator for computing earth distance for two points
-	by Hal Snyder <hal@vailsys.com>
-
-findoidjoins -
-	Finds the joins used by oid columns by examining the actual
-	values in the oid columns and row oids.
-	by Bruce Momjian <pgman@candle.pha.pa.us>
-
-fulltextindex -
-	Full text indexing using triggers
-	by Maarten Boekhold <maartenb@dutepp0.et.tudelft.nl>
-
-fuzzystrmatch -
-	Levenshtein, metaphone, and soundex fuzzy string matching
-	by Joe Conway <joseph.conway@home.com>, Joel Burton <jburton@scw.org>
-
-intagg -
-	Integer aggregator
-	by  mlw <markw@mohawksoft.com>
-
-
-intarray -
-	Index support for arrays of int4, using GiST
-	by Teodor Sigaev <teodor@stack.net> and Oleg Bartunov <oleg@sai.msu.su>
-
-ipc_check -
-	Simple test script to help in configuring IPC.
-	FreeBSD only, for now.
-
-isbn_issn -
-	PostgreSQL type extensions for ISBN (books) and ISSN (serials)
-	by Garrett A. Wollman <wollman@khavrinen.lcs.mit.edu>
-
-lo -
-	Large Object maintenance
-	by Peter Mount <peter@retep.org.uk> 
-
-mSQL-interface -
-	mSQL API translation library
-	by Aldrin Leal <aldrin@americasnet.com>
-
-mac -
-	Support functions for MAC address types
-	by Lawrence E. Rosenman <ler@lerctr.org>
-
-miscutil -
-	PostgreSQL assert checking and various utility functions
-	by Massimo Dal Zotto <dz@cs.unitn.it>
-
-mysql -
-	utility to convert MySQL schema dumps to SQL92 and PostgreSQL
-	by Thomas Lockhart <lockhart@alumni.caltech.edu>
-	   Max Rudensky <fonin@ziet.zhitomir.ua>
-	   Valentine Danilchuk <valdan@ziet.zhitomir.ua>
-
-noupdate -
-	trigger to prevent updates on single columns
-
-oid2name - 
-	maps numeric files to table names
-	by B Palmer <bpalmer@crimelabs.net>
-
-oracle -
-	converts Oracle database schema to PostgreSQL
-	by Gilles Darold <gilles@darold.net>
-
-pg_controldata -
-	Dump contents of pg_control (database master file)
-	by Oliver Elphick <olly@lfix.co.uk>
-
-pg_dumplo -
-	Dump large objects
-	by Karel Zak <zakkr@zf.jcu.cz>
-
-pg_logger -
-	Stdin-to-syslog gateway for PostgreSQL
-	by Nathan Myers <ncm@nospam.cantrip.org>
-
-pg_resetxlog -
-	Reset the WAL log (pg_xlog) to recover from crash or format change
-	by Tom Lane <tgl@sss.pgh.pa.us>
-
-pg_upgrade -
-	Upgrade from previous PostgreSQL version without pg_dump/reload
-	by Bruce Momjian <pgman@candle.pha.pa.us>
-
-pgbench -
-	TPC-B like benchmarking tool
-	by Tatsuo Ishii <t-ishii@sra.co.jp>
-
-pgcrypto -
-	Cryptographic functions
-	by Marko Kreen <marko@l-t.ee>
-
-pgstattuple -
-	A function returns the percentage of "dead" tuples in a table
-	by Tatsuo Ishii <t-ishii@sra.co.jp>
-
-retep -
-	tools to build retep tools packages
-	by Peter T Mount <peter@retep.org.uk>
-
-rserv -
-	replication server
-	by Vadim B. Mikheev <vadim4o@email.com>
-
-rtree_gist -
-	Support for emulating RTREE indexing in GiST
-	by Oleg Bartunov <oleg@sai.msu.su> and Teodor Sigaev <teodor@stack.net>
-
-seg -
-	Confidence-interval datatype (GiST indexing example)
-	by Gene Selkov, Jr. <selkovjr@mcs.anl.gov>
-
-spi -
-	Various trigger functions, examples for using SPI.
-
-start-scripts - 
-	Scripts for starting the server at boot time.
-	
-string -
-	C-like input/output conversion routines for strings
-	by Massimo Dal Zotto <dz@cs.unitn.it>
-
-tips/apache_logging -
-	Getting Apache to log to PostgreSQL
-	by Terry Mackintosh <terry@terrym.com>
-
-tools -
-	Assorted developer tools
-	by Massimo Dal Zotto <dz@cs.unitn.it>
-
-tsearch -
-	Full-text-index support using GiST
-	by Teodor Sigaev <teodor@stack.net> and Oleg Bartunov
-	<oleg@sai.msu.su>.
-
-userlock -
-	User locks
-	by Massimo Dal Zotto <dz@cs.unitn.it>
-
-vacuumlo -
-	Remove orphaned large objects
-	by Peter T Mount <peter@retep.org.uk>
-
-xml -
-	Storing XML in PostgreSQL
-	by John Gray <jgray@azuli.co.uk>
diff --git a/contrib/array/Makefile b/contrib/array/Makefile
deleted file mode 100644
index 324fd2660a..0000000000
--- a/contrib/array/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/array/Attic/Makefile,v 1.16 2001/09/06 10:49:29 petere Exp $
-
-subdir = contrib/array
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-MODULES = array_iterator
-DATA_built = array_iterator.sql
-DOCS = README.array_iterator
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/array/README.array_iterator b/contrib/array/README.array_iterator
deleted file mode 100644
index b072ebe397..0000000000
--- a/contrib/array/README.array_iterator
+++ /dev/null
@@ -1,49 +0,0 @@
-Array iterator functions, by Massimo Dal Zotto <dz@cs.unitn.it>
-Copyright (C) 1999, Massimo Dal Zotto <dz@cs.unitn.it>
-
-This software is distributed under the GNU General Public License
-either version 2, or (at your option) any later version.
-
-
-This loadable module defines a new class of functions which take
-an array and a scalar value, iterate a scalar operator over the
-elements of the array and the value, and compute a result as
-the logical OR or AND of the iteration results.
-For example array_int4eq returns true if some of the elements
-of an array of int4 is equal to the given value:
-
-	array_int4eq({1,2,3}, 1)  -->  true
-	array_int4eq({1,2,3}, 4)  -->  false
-
-If we have defined T array types and O scalar operators we can
-define T x O x 2 array functions, each of them has a name like
-"array_[all_]<basetype><operation>" and takes an array of type T
-iterating the operator O over all the elements. Note however
-that some of the possible combination are invalid, for example
-the array_int4_like because there is no like operator for int4.
-
-We can then define new operators based on these functions and use
-them to write queries with qualification clauses based on the
-values of some of the elements of an array.
-For example to select rows having some or all element of an array
-attribute equal to a given value or matching a regular expression:
-
-	create table t(id int4[], txt text[]);
-
-	-- select tuples with some id element equal to 123
-	select * from t where t.id *= 123;
-
-	-- select tuples with some txt element matching '[a-z]'
-	select * from t where t.txt *~ '[a-z]';
-
-	-- select tuples with all txt elements matching '^[A-Z]'
-	select * from t where t.txt[1:3] **~ '^[A-Z]';
-
-The scheme is quite general, each operator which operates on a base type
-can be iterated over the elements of an array. It seem to work well but
-defining each new operators requires writing a different C function.
-Furthermore in each function there are two hardcoded OIDs which reference
-a base type and a procedure. Not very portable. Can anyone suggest a
-better and more portable way to do it ?
-
-See also array_iterator.sql for an example on how to use this module.
diff --git a/contrib/array/array_iterator.c b/contrib/array/array_iterator.c
deleted file mode 100644
index 8a2455b673..0000000000
--- a/contrib/array/array_iterator.c
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
- * array_iterator.c --
- *
- * This file defines a new class of operators which take an
- * array and a scalar value, iterate a scalar operator over the
- * elements of the array and the value and compute a result as
- * the logical OR or AND of the iteration results.
- *
- * Copyright (C) 1999, Massimo Dal Zotto <dz@cs.unitn.it>
- * ported to postgreSQL 6.3.2,added oid_functions, 18.1.1999,
- * Tobias Gabele <gabele@wiz.uni-kassel.de>
- *
- * This software is distributed under the GNU General Public License
- * either version 2, or (at your option) any later version.
- */
-
-#include "postgres.h"
-
-#include <ctype.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <string.h>
-
-#include "access/tupmacs.h"
-#include "access/xact.h"
-#include "fmgr.h"
-#include "miscadmin.h"
-#include "utils/array.h"
-#include "utils/builtins.h"
-#include "utils/memutils.h"
-#include "utils/lsyscache.h"
-
-#include "array_iterator.h"
-
-
-static int32
-array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)
-{
-	int16		typlen;
-	bool		typbyval;
-	int			nitems,
-				i;
-	Datum		result;
-	int			ndim,
-			   *dim;
-	char	   *p;
-	FmgrInfo	finfo;
-
-	/* Sanity checks */
-	if (array == (ArrayType *) NULL)
-	{
-		/* elog(WARNING, "array_iterator: array is null"); */
-		return (0);
-	}
-
-	/* detoast input if necessary */
-	array = DatumGetArrayTypeP(PointerGetDatum(array));
-
-	ndim = ARR_NDIM(array);
-	dim = ARR_DIMS(array);
-	nitems = ArrayGetNItems(ndim, dim);
-	if (nitems == 0)
-		return (0);
-
-	/* Lookup element type information */
-	get_typlenbyval(elemtype, &typlen, &typbyval);
-
-	/* Lookup the function entry point */
-	fmgr_info(proc, &finfo);
-	if (finfo.fn_nargs != 2)
-	{
-		elog(ERROR, "array_iterator: proc %u does not take 2 args", proc);
-		return (0);
-	}
-
-	/* Scan the array and apply the operator to each element */
-	result = BoolGetDatum(false);
-	p = ARR_DATA_PTR(array);
-	for (i = 0; i < nitems; i++)
-	{
-		Datum		itemvalue;
-
-		itemvalue = fetch_att(p, typbyval, typlen);
-
-		if (typlen > 0)
-			p += typlen;
-		else
-			p += INTALIGN(*(int32 *) p);
-
-		result = FunctionCall2(&finfo, itemvalue, value);
-
-		if (DatumGetBool(result))
-		{
-			if (!and)
-				return (1);
-		}
-		else
-		{
-			if (and)
-				return (0);
-		}
-	}
-
-	if (and && DatumGetBool(result))
-		return (1);
-	else
-		return (0);
-}
-
-/*
- * Iterator functions for type _text
- */
-
-int32
-array_texteq(ArrayType *array, char *value)
-{
-	return array_iterator((Oid) 25,		/* text */
-						  (Oid) 67,		/* texteq */
-						  0,	/* logical or */
-						  array, (Datum) value);
-}
-
-int32
-array_all_texteq(ArrayType *array, char *value)
-{
-	return array_iterator((Oid) 25,		/* text */
-						  (Oid) 67,		/* texteq */
-						  1,	/* logical and */
-						  array, (Datum) value);
-}
-
-int32
-array_textregexeq(ArrayType *array, char *value)
-{
-	return array_iterator((Oid) 25,		/* text */
-						  (Oid) 1254,	/* textregexeq */
-						  0,	/* logical or */
-						  array, (Datum) value);
-}
-
-int32
-array_all_textregexeq(ArrayType *array, char *value)
-{
-	return array_iterator((Oid) 25,		/* text */
-						  (Oid) 1254,	/* textregexeq */
-						  1,	/* logical and */
-						  array, (Datum) value);
-}
-
-/*
- * Iterator functions for type _varchar. Note that the regexp
- * operators take the second argument of type text.
- */
-
-int32
-array_varchareq(ArrayType *array, char *value)
-{
-	return array_iterator((Oid) 1043,	/* varchar */
-						  (Oid) 1070,	/* varchareq */
-						  0,	/* logical or */
-						  array, (Datum) value);
-}
-
-int32
-array_all_varchareq(ArrayType *array, char *value)
-{
-	return array_iterator((Oid) 1043,	/* varchar */
-						  (Oid) 1070,	/* varchareq */
-						  1,	/* logical and */
-						  array, (Datum) value);
-}
-
-int32
-array_varcharregexeq(ArrayType *array, char *value)
-{
-	return array_iterator((Oid) 1043,	/* varchar */
-						  (Oid) 1254,	/* textregexeq */
-						  0,	/* logical or */
-						  array, (Datum) value);
-}
-
-int32
-array_all_varcharregexeq(ArrayType *array, char *value)
-{
-	return array_iterator((Oid) 1043,	/* varchar */
-						  (Oid) 1254,	/* textregexeq */
-						  1,	/* logical and */
-						  array, (Datum) value);
-}
-
-/*
- * Iterator functions for type _bpchar. Note that the regexp
- * operators take the second argument of type text.
- */
-
-int32
-array_bpchareq(ArrayType *array, char *value)
-{
-	return array_iterator((Oid) 1042,	/* bpchar */
-						  (Oid) 1048,	/* bpchareq */
-						  0,	/* logical or */
-						  array, (Datum) value);
-}
-
-int32
-array_all_bpchareq(ArrayType *array, char *value)
-{
-	return array_iterator((Oid) 1042,	/* bpchar */
-						  (Oid) 1048,	/* bpchareq */
-						  1,	/* logical and */
-						  array, (Datum) value);
-}
-
-int32
-array_bpcharregexeq(ArrayType *array, char *value)
-{
-	return array_iterator((Oid) 1042,	/* bpchar */
-						  (Oid) 1254,	/* textregexeq */
-						  0,	/* logical or */
-						  array, (Datum) value);
-}
-
-int32
-array_all_bpcharregexeq(ArrayType *array, char *value)
-{
-	return array_iterator((Oid) 1042,	/* bpchar */
-						  (Oid) 1254,	/* textregexeq */
-						  1,	/* logical and */
-						  array, (Datum) value);
-}
-
-/*
- * Iterator functions for type _int4
- */
-
-int32
-array_int4eq(ArrayType *array, int4 value)
-{
-	return array_iterator((Oid) 23,		/* int4 */
-						  (Oid) 65,		/* int4eq */
-						  0,	/* logical or */
-						  array, (Datum) value);
-}
-
-int32
-array_all_int4eq(ArrayType *array, int4 value)
-{
-	return array_iterator((Oid) 23,		/* int4 */
-						  (Oid) 65,		/* int4eq */
-						  1,	/* logical and */
-						  array, (Datum) value);
-}
-
-int32
-array_int4ne(ArrayType *array, int4 value)
-{
-	return array_iterator((Oid) 23,		/* int4 */
-						  (Oid) 144,	/* int4ne */
-						  0,	/* logical or */
-						  array, (Datum) value);
-}
-
-int32
-array_all_int4ne(ArrayType *array, int4 value)
-{
-	return array_iterator((Oid) 23,		/* int4 */
-						  (Oid) 144,	/* int4ne */
-						  1,	/* logical and */
-						  array, (Datum) value);
-}
-
-int32
-array_int4gt(ArrayType *array, int4 value)
-{
-	return array_iterator((Oid) 23,		/* int4 */
-						  (Oid) 147,	/* int4gt */
-						  0,	/* logical or */
-						  array, (Datum) value);
-}
-
-int32
-array_all_int4gt(ArrayType *array, int4 value)
-{
-	return array_iterator((Oid) 23,		/* int4 */
-						  (Oid) 147,	/* int4gt */
-						  1,	/* logical and */
-						  array, (Datum) value);
-}
-
-int32
-array_int4ge(ArrayType *array, int4 value)
-{
-	return array_iterator((Oid) 23,		/* int4 */
-						  (Oid) 150,	/* int4ge */
-						  0,	/* logical or */
-						  array, (Datum) value);
-}
-
-int32
-array_all_int4ge(ArrayType *array, int4 value)
-{
-	return array_iterator((Oid) 23,		/* int4 */
-						  (Oid) 150,	/* int4ge */
-						  1,	/* logical and */
-						  array, (Datum) value);
-}
-
-int32
-array_int4lt(ArrayType *array, int4 value)
-{
-	return array_iterator((Oid) 23,		/* int4 */
-						  (Oid) 66,		/* int4lt */
-						  0,	/* logical or */
-						  array, (Datum) value);
-}
-
-int32
-array_all_int4lt(ArrayType *array, int4 value)
-{
-	return array_iterator((Oid) 23,		/* int4 */
-						  (Oid) 66,		/* int4lt */
-						  1,	/* logical and */
-						  array, (Datum) value);
-}
-
-int32
-array_int4le(ArrayType *array, int4 value)
-{
-	return array_iterator((Oid) 23,		/* int4 */
-						  (Oid) 149,	/* int4le */
-						  0,	/* logical or */
-						  array, (Datum) value);
-}
-
-int32
-array_all_int4le(ArrayType *array, int4 value)
-{
-	return array_iterator((Oid) 23,		/* int4 */
-						  (Oid) 149,	/* int4le */
-						  1,	/* logical and */
-						  array, (Datum) value);
-}
-
-/* new tobias gabele 1999 */
-
-int32
-array_oideq(ArrayType *array, Oid value)
-{
-	return array_iterator((Oid) 26,		/* oid */
-						  (Oid) 184,	/* oideq */
-						  0,	/* logical or */
-						  array, (Datum) value);
-}
-
-int32
-array_all_oidne(ArrayType *array, Oid value)
-{
-	return array_iterator((Oid) 26,		/* int4 */
-						  (Oid) 185,	/* oidne */
-						  1,	/* logical and */
-						  array, (Datum) value);
-}
-
-/* end of file */
-
-/*
- * Local Variables:
- *	tab-width: 4
- *	c-indent-level: 4
- *	c-basic-offset: 4
- * End:
- */
diff --git a/contrib/array/array_iterator.h b/contrib/array/array_iterator.h
deleted file mode 100644
index 7889fdc0b2..0000000000
--- a/contrib/array/array_iterator.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef ARRAY_ITERATOR_H
-#define ARRAY_ITERATOR_H
-
-static int32 array_iterator(Oid elemtype, Oid proc, int and,
-			   ArrayType *array, Datum value);
-
-int32		array_texteq(ArrayType *array, char *value);
-int32		array_all_texteq(ArrayType *array, char *value);
-int32		array_textregexeq(ArrayType *array, char *value);
-int32		array_all_textregexeq(ArrayType *array, char *value);
-
-int32		array_varchareq(ArrayType *array, char *value);
-int32		array_all_varchareq(ArrayType *array, char *value);
-int32		array_varcharregexeq(ArrayType *array, char *value);
-int32		array_all_varcharregexeq(ArrayType *array, char *value);
-
-int32		array_bpchareq(ArrayType *array, char *value);
-int32		array_all_bpchareq(ArrayType *array, char *value);
-int32		array_bpcharregexeq(ArrayType *array, char *value);
-int32		array_all_bpcharregexeq(ArrayType *array, char *value);
-
-int32		array_int4eq(ArrayType *array, int4 value);
-int32		array_all_int4eq(ArrayType *array, int4 value);
-int32		array_int4ne(ArrayType *array, int4 value);
-int32		array_all_int4ne(ArrayType *array, int4 value);
-int32		array_int4gt(ArrayType *array, int4 value);
-int32		array_all_int4gt(ArrayType *array, int4 value);
-int32		array_int4ge(ArrayType *array, int4 value);
-int32		array_all_int4ge(ArrayType *array, int4 value);
-int32		array_int4lt(ArrayType *array, int4 value);
-int32		array_all_int4lt(ArrayType *array, int4 value);
-int32		array_int4le(ArrayType *array, int4 value);
-int32		array_all_int4le(ArrayType *array, int4 value);
-
-int32		array_oideq(ArrayType *array, Oid value);
-int32		array_all_oidne(ArrayType *array, Oid value);
-#endif
-
-/*
- * Local Variables:
- *	tab-width: 4
- *	c-indent-level: 4
- *	c-basic-offset: 4
- * End:
- */
diff --git a/contrib/array/array_iterator.sql.in b/contrib/array/array_iterator.sql.in
deleted file mode 100644
index d4182b112e..0000000000
--- a/contrib/array/array_iterator.sql.in
+++ /dev/null
@@ -1,253 +0,0 @@
--- SQL code to define the new array iterator functions and operators
-
--- define the array operators *=, **=, *~ and **~ for type _text
---
-create function array_texteq(_text, text) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create function array_all_texteq(_text, text) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create function array_textregexeq(_text, text) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create function array_all_textregexeq(_text, text) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create operator *= (
-  leftarg=_text, 
-  rightarg=text, 
-  procedure=array_texteq);
-
-create operator **= (
-  leftarg=_text,
-  rightarg=text,
-  procedure=array_all_texteq);
-
-create operator *~ (
-  leftarg=_text,
-  rightarg=text,
-  procedure=array_textregexeq);
-
-create operator **~ (
-  leftarg=_text,
-  rightarg=text,
-  procedure=array_all_textregexeq);
-
-
--- define the array operators *=, **=, *~ and **~ for type _varchar
---
--- NOTE: "varchar" is also a reserved word and must be quoted.
---
-create function array_varchareq(_varchar, varchar) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create function array_all_varchareq(_varchar, varchar) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create function array_varcharregexeq(_varchar, varchar) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create function array_all_varcharregexeq(_varchar, varchar) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create operator *= (
-  leftarg=_varchar, 
-  rightarg="varchar", 
-  procedure=array_varchareq);
-
-create operator **= (
-  leftarg=_varchar,
-  rightarg="varchar",
-  procedure=array_all_varchareq);
-
-create operator *~ (
-  leftarg=_varchar,
-  rightarg="varchar",
-  procedure=array_varcharregexeq);
-
-create operator **~ (
-  leftarg=_varchar,
-  rightarg="varchar",
-  procedure=array_all_varcharregexeq);
-
-
--- define the array operators *=, **=, *~ and **~ for type _bpchar
---
-create function array_bpchareq(_bpchar, bpchar) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create function array_all_bpchareq(_bpchar, bpchar) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create function array_bpcharregexeq(_bpchar, bpchar) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create function array_all_bpcharregexeq(_bpchar, bpchar) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create operator *= (
-  leftarg=_bpchar, 
-  rightarg=bpchar, 
-  procedure=array_bpchareq);
-
-create operator **= (
-  leftarg=_bpchar,
-  rightarg=bpchar,
-  procedure=array_all_bpchareq);
-
-create operator *~ (
-  leftarg=_bpchar,
-  rightarg=bpchar,
-  procedure=array_bpcharregexeq);
-
-create operator **~ (
-  leftarg=_bpchar,
-  rightarg=bpchar,
-  procedure=array_all_bpcharregexeq);
-
-
--- define the array operators *=, **=, *> and **> for type _int4
---
-create function array_int4eq(_int4, int4) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create function array_all_int4eq(_int4, int4) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create function array_int4ne(_int4, int4) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create function array_all_int4ne(_int4, int4) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create function array_int4gt(_int4, int4) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create function array_all_int4gt(_int4, int4) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create function array_int4ge(_int4, int4) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create function array_all_int4ge(_int4, int4) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create function array_int4lt(_int4, int4) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create function array_all_int4lt(_int4, int4) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create function array_int4le(_int4, int4) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create function array_all_int4le(_int4, int4) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create operator *= (
-  leftarg=_int4,
-  rightarg=int4,
-  procedure=array_int4eq);
-
-create operator **= (
-  leftarg=_int4,
-  rightarg=int4,
-  procedure=array_all_int4eq);
-
-create operator *<> (
-  leftarg=_int4,
-  rightarg=int4,
-  procedure=array_int4ne);
-
-create operator **<> (
-  leftarg=_int4,
-  rightarg=int4,
-  procedure=array_all_int4ne);
-
-create operator *> (
-  leftarg=_int4,
-  rightarg=int4,
-  procedure=array_int4gt);
-
-create operator **> (
-  leftarg=_int4,
-  rightarg=int4,
-  procedure=array_all_int4gt);
-
-create operator *>= (
-  leftarg=_int4,
-  rightarg=int4,
-  procedure=array_int4ge);
-
-create operator **>= (
-  leftarg=_int4,
-  rightarg=int4,
-  procedure=array_all_int4ge);
-
-create operator *< (
-  leftarg=_int4,
-  rightarg=int4,
-  procedure=array_int4lt);
-
-create operator **< (
-  leftarg=_int4,
-  rightarg=int4,
-  procedure=array_all_int4lt);
-
-create operator *<= (
-  leftarg=_int4,
-  rightarg=int4,
-  procedure=array_int4le);
-
-create operator **<= (
-  leftarg=_int4,
-  rightarg=int4,
-  procedure=array_all_int4le);
-
--- define the array operators *=, **<>  for type _oid  (added tobias 1. 1999)
---
-create function array_oideq(_oid, oid) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create function array_all_oidne(_oid, oid) returns bool
-  as 'MODULE_PATHNAME' 
-  language 'c';
-
-create operator *= (
-  leftarg=_oid, 
-  rightarg=oid, 
-  procedure=array_oideq);
-
-create operator **<> (
-  leftarg=_oid,
-  rightarg=oid,
-  procedure=array_all_oidne);
-
-
--- end of file
diff --git a/contrib/btree_gist/Makefile b/contrib/btree_gist/Makefile
deleted file mode 100644
index 03aa1479be..0000000000
--- a/contrib/btree_gist/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/btree_gist/Makefile,v 1.3 2001/09/06 10:49:29 petere Exp $
-
-subdir = contrib/btree_gist
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-MODULES = btree_gist
-DATA_built = btree_gist.sql
-DOCS = README.btree_gist
-REGRESS = btree_gist
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/btree_gist/README.btree_gist b/contrib/btree_gist/README.btree_gist
deleted file mode 100644
index d61db62c3c..0000000000
--- a/contrib/btree_gist/README.btree_gist
+++ /dev/null
@@ -1,31 +0,0 @@
-This is B-Tree implementation using GiST for int4 and 
-timestamp types.
-
-All work was done by Teodor Sigaev (teodor@stack.net) and Oleg Bartunov
-(oleg@sai.msu.su). See http://www.sai.msu.su/~megera/postgres/gist
-for additional information.
-
-NOTICE:
-     This version will works only with postgresql version 7.2 and above
-     because of changes in interface of function calling and in system
-     tables.
-
-INSTALLATION:
-
-  gmake
-  gmake install
-  -- load functions
-  psql <database> < btree_gist.sql
-
-REGRESSION TEST:
-
-   gmake installcheck
-
-EXAMPLE USAGE:
-
-   create table test (a int4);
-   -- create index
-   create index testidx on test using gist (a);
-   -- query
-   select * from test where a < 10;
-
diff --git a/contrib/btree_gist/btree_gist.c b/contrib/btree_gist/btree_gist.c
deleted file mode 100644
index c4eb852213..0000000000
--- a/contrib/btree_gist/btree_gist.c
+++ /dev/null
@@ -1,583 +0,0 @@
-#include "postgres.h"
-
-#include "access/gist.h"
-#include "access/itup.h"
-#include "access/nbtree.h"
-
-#include "utils/palloc.h"
-#include "utils/geo_decls.h"
-#include "utils/elog.h"
-
-typedef int (*CMPFUNC) (const void *a, const void *b);
-typedef void (*BINARY_UNION) (Datum *, char *);
-
-typedef struct intkey
-{
-	int4		lower;
-	int4		upper;
-}	INT4KEY;
-
-typedef struct tskey
-{
-	Timestamp	lower;
-	Timestamp	upper;
-}	TSKEY;
-
-/* used for sorting */
-typedef struct rix
-{
-	int			index;
-	char	   *r;
-}	RIX;
-
-/*
-** int4key in/out
-*/
-PG_FUNCTION_INFO_V1(int4key_in);
-PG_FUNCTION_INFO_V1(int4key_out);
-Datum		int4key_in(PG_FUNCTION_ARGS);
-Datum		int4key_out(PG_FUNCTION_ARGS);
-
-/*
-** tskey in/out
-*/
-PG_FUNCTION_INFO_V1(tskey_in);
-PG_FUNCTION_INFO_V1(tskey_out);
-Datum		tskey_in(PG_FUNCTION_ARGS);
-Datum		tskey_out(PG_FUNCTION_ARGS);
-
-/*
-** int4 ops
-*/
-PG_FUNCTION_INFO_V1(gint4_compress);
-PG_FUNCTION_INFO_V1(gint4_union);
-PG_FUNCTION_INFO_V1(gint4_picksplit);
-PG_FUNCTION_INFO_V1(gint4_consistent);
-PG_FUNCTION_INFO_V1(gint4_penalty);
-PG_FUNCTION_INFO_V1(gint4_same);
-
-Datum		gint4_compress(PG_FUNCTION_ARGS);
-Datum		gint4_union(PG_FUNCTION_ARGS);
-Datum		gint4_picksplit(PG_FUNCTION_ARGS);
-Datum		gint4_consistent(PG_FUNCTION_ARGS);
-Datum		gint4_penalty(PG_FUNCTION_ARGS);
-Datum		gint4_same(PG_FUNCTION_ARGS);
-
-static void gint4_binary_union(Datum *r1, char *r2);
-static int	int4key_cmp(const void *a, const void *b);
-
-/*
-** timestamp ops
-*/
-PG_FUNCTION_INFO_V1(gts_compress);
-PG_FUNCTION_INFO_V1(gts_union);
-PG_FUNCTION_INFO_V1(gts_picksplit);
-PG_FUNCTION_INFO_V1(gts_consistent);
-PG_FUNCTION_INFO_V1(gts_penalty);
-PG_FUNCTION_INFO_V1(gts_same);
-
-Datum		gts_compress(PG_FUNCTION_ARGS);
-Datum		gts_union(PG_FUNCTION_ARGS);
-Datum		gts_picksplit(PG_FUNCTION_ARGS);
-Datum		gts_consistent(PG_FUNCTION_ARGS);
-Datum		gts_penalty(PG_FUNCTION_ARGS);
-Datum		gts_same(PG_FUNCTION_ARGS);
-
-static void gts_binary_union(Datum *r1, char *r2);
-static int	tskey_cmp(const void *a, const void *b);
-
-#define TimestampGetDatumFast(X) Float8GetDatumFast(X)
-
-/* define for comparison */
-#define TSGE( ts1, ts2 ) (DatumGetBool(DirectFunctionCall2( \
-		timestamp_ge, \
-		PointerGetDatum( ts1 ), \
-		PointerGetDatum( ts2 ) \
-)))
-#define TSGT( ts1, ts2 ) (DatumGetBool(DirectFunctionCall2( \
-		timestamp_gt, \
-		PointerGetDatum( ts1 ), \
-		PointerGetDatum( ts2 ) \
-)))
-#define TSEQ( ts1, ts2 ) (DatumGetBool(DirectFunctionCall2( \
-		timestamp_eq, \
-		PointerGetDatum( ts1 ), \
-		PointerGetDatum( ts2 ) \
-)))
-#define TSLT( ts1, ts2 ) (DatumGetBool(DirectFunctionCall2( \
-		timestamp_lt, \
-		PointerGetDatum( ts1 ), \
-		PointerGetDatum( ts2 ) \
-)))
-#define TSLE( ts1, ts2 ) (DatumGetBool(DirectFunctionCall2( \
-		timestamp_le, \
-		PointerGetDatum( ts1 ), \
-		PointerGetDatum( ts2 ) \
-)))
-
-/*
-** Common btree-function (for all ops)
-*/
-static GIST_SPLITVEC *btree_picksplit(bytea *entryvec, GIST_SPLITVEC *v,
-				BINARY_UNION bu, CMPFUNC cmp);
-
-PG_FUNCTION_INFO_V1(btree_decompress);
-Datum		btree_decompress(PG_FUNCTION_ARGS);
-
-/**************************************************
- * int4 ops
- **************************************************/
-
-Datum
-gint4_compress(PG_FUNCTION_ARGS)
-{
-	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-	GISTENTRY  *retval;
-
-	if (entry->leafkey)
-	{
-		INT4KEY    *r = palloc(sizeof(INT4KEY));
-
-		retval = palloc(sizeof(GISTENTRY));
-		r->lower = r->upper = (entry->key);
-
-		gistentryinit(*retval, PointerGetDatum(r), entry->rel, entry->page,
-					  entry->offset, sizeof(INT4KEY), FALSE);
-
-	}
-	else
-		retval = entry;
-	PG_RETURN_POINTER(retval);
-}
-
-Datum
-gint4_consistent(PG_FUNCTION_ARGS)
-{
-	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-	int4		query = PG_GETARG_INT32(1);
-	INT4KEY    *kkk = (INT4KEY *) DatumGetPointer(entry->key);
-	StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-	bool		retval;
-
-	switch (strategy)
-	{
-		case BTLessEqualStrategyNumber:
-			retval = (query >= kkk->lower);
-			break;
-		case BTLessStrategyNumber:
-			if (GIST_LEAF(entry))
-				retval = (query > kkk->lower);
-			else
-				retval = (query >= kkk->lower);
-			break;
-		case BTEqualStrategyNumber:
-			/* in leaf page kkk->lower always = kkk->upper */
-			if (GIST_LEAF(entry))
-				retval = (query == kkk->lower);
-			else
-				retval = (kkk->lower <= query && query <= kkk->upper);
-			break;
-		case BTGreaterStrategyNumber:
-			if (GIST_LEAF(entry))
-				retval = (query < kkk->upper);
-			else
-				retval = (query <= kkk->upper);
-			break;
-		case BTGreaterEqualStrategyNumber:
-			retval = (query <= kkk->upper);
-			break;
-		default:
-			retval = FALSE;
-	}
-	PG_RETURN_BOOL(retval);
-}
-
-Datum
-gint4_union(PG_FUNCTION_ARGS)
-{
-	bytea	   *entryvec = (bytea *) PG_GETARG_POINTER(0);
-	int			i,
-				numranges;
-	INT4KEY    *cur,
-			   *out = palloc(sizeof(INT4KEY));
-
-	numranges = (VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY);
-	*(int *) PG_GETARG_POINTER(1) = sizeof(INT4KEY);
-
-	cur = (INT4KEY *) DatumGetPointer((((GISTENTRY *) (VARDATA(entryvec)))[0].key));
-	out->lower = cur->lower;
-	out->upper = cur->upper;
-
-	for (i = 1; i < numranges; i++)
-	{
-		cur = (INT4KEY *) DatumGetPointer((((GISTENTRY *) (VARDATA(entryvec)))[i].key));
-		if (out->lower > cur->lower)
-			out->lower = cur->lower;
-		if (out->upper < cur->upper)
-			out->upper = cur->upper;
-	}
-
-	PG_RETURN_POINTER(out);
-}
-
-Datum
-gint4_penalty(PG_FUNCTION_ARGS)
-{
-	INT4KEY    *origentry = (INT4KEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(0))->key);
-	INT4KEY    *newentry = (INT4KEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
-	float	   *result = (float *) PG_GETARG_POINTER(2);
-
-	*result = Max(newentry->upper - origentry->upper, 0) +
-		Max(origentry->lower - newentry->lower, 0);
-
-	PG_RETURN_POINTER(result);
-}
-
-Datum
-gint4_picksplit(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_POINTER(btree_picksplit(
-									  (bytea *) PG_GETARG_POINTER(0),
-								  (GIST_SPLITVEC *) PG_GETARG_POINTER(1),
-									  gint4_binary_union,
-									  int4key_cmp
-									  ));
-}
-
-Datum
-gint4_same(PG_FUNCTION_ARGS)
-{
-	INT4KEY    *b1 = (INT4KEY *) PG_GETARG_POINTER(0);
-	INT4KEY    *b2 = (INT4KEY *) PG_GETARG_POINTER(1);
-	bool	   *result = (bool *) PG_GETARG_POINTER(2);
-
-	*result = (b1->lower == b2->lower && b1->upper == b2->upper) ? TRUE : FALSE;
-	PG_RETURN_POINTER(result);
-}
-
-static void
-gint4_binary_union(Datum *r1, char *r2)
-{
-	INT4KEY    *b1;
-	INT4KEY    *b2 = (INT4KEY *) r2;
-
-	if (!DatumGetPointer(*r1))
-	{
-		*r1 = PointerGetDatum(palloc(sizeof(INT4KEY)));
-		b1 = (INT4KEY *) DatumGetPointer(*r1);
-		b1->upper = b2->upper;
-		b1->lower = b2->lower;
-	}
-	else
-	{
-		b1 = (INT4KEY *) DatumGetPointer(*r1);
-
-		b1->lower = (b1->lower > b2->lower) ?
-			b2->lower : b1->lower;
-		b1->upper = (b1->upper > b2->upper) ?
-			b1->upper : b2->upper;
-	}
-}
-
-
-static int
-int4key_cmp(const void *a, const void *b)
-{
-	return (((INT4KEY *) (((RIX *) a)->r))->lower - ((INT4KEY *) (((RIX *) b)->r))->lower);
-}
-
-/**************************************************
- * timestamp ops
- **************************************************/
-
-Datum
-gts_compress(PG_FUNCTION_ARGS)
-{
-	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-	GISTENTRY  *retval;
-
-	if (entry->leafkey)
-	{
-		TSKEY	   *r = (TSKEY *) palloc(sizeof(TSKEY));
-		retval = palloc(sizeof(GISTENTRY));
-		r->lower = r->upper = *(Timestamp *) (entry->key);
-		gistentryinit(*retval, PointerGetDatum(r),
-			  entry->rel, entry->page,
-			  entry->offset, sizeof(TSKEY), FALSE);
-	}
-	else
-		retval = entry;
-	PG_RETURN_POINTER(retval);
-}
-
-Datum
-gts_consistent(PG_FUNCTION_ARGS)
-{
-	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-	Timestamp  *query = (Timestamp *) PG_GETARG_POINTER(1);
-	StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-	bool		retval;
-	TSKEY	   *key;
-
-	/*
-	 * * if entry is not leaf, use gbox_internal_consistent, * else use
-	 * gbox_leaf_consistent
-	 */
-	if (!entry->key)
-		return FALSE;
-	key = (TSKEY *) DatumGetPointer(entry->key);
-
-	switch (strategy)
-	{
-		case BTLessEqualStrategyNumber:
-			retval = TSGE(query, &(key->lower));
-			break;
-		case BTLessStrategyNumber:
-			if (GIST_LEAF(entry))
-				retval = TSGT(query, &(key->lower));
-			else
-				retval = TSGE(query, &(key->lower));
-			break;
-		case BTEqualStrategyNumber:
-			/* in leaf page key->lower always = key->upper */
-			if (GIST_LEAF(entry))
-				retval = TSEQ(query, &(key->lower));
-			else
-				retval = (TSLE(&(key->lower), query) && TSLE(query, &(key->upper)));
-			break;
-		case BTGreaterStrategyNumber:
-			if (GIST_LEAF(entry))
-				retval = TSLT(query, &(key->upper));
-			else
-				retval = TSLE(query, &(key->upper));
-			break;
-		case BTGreaterEqualStrategyNumber:
-			retval = TSLE(query, &(key->upper));
-			break;
-		default:
-			retval = FALSE;
-	}
-	PG_RETURN_BOOL(retval);
-}
-
-Datum
-gts_union(PG_FUNCTION_ARGS)
-{
-	bytea	   *entryvec = (bytea *) PG_GETARG_POINTER(0);
-	int			i,
-				numranges;
-	TSKEY	   *cur,
-			   *out = palloc(sizeof(TSKEY));
-
-	numranges = (VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY);
-	*(int *) PG_GETARG_POINTER(1) = sizeof(TSKEY);
-
-	cur = (TSKEY *) DatumGetPointer((((GISTENTRY *) (VARDATA(entryvec)))[0].key));
-	out->lower = cur->lower;
-	out->upper = cur->upper;
-
-	for (i = 1; i < numranges; i++)
-	{
-		cur = (TSKEY *) DatumGetPointer((((GISTENTRY *) (VARDATA(entryvec)))[i].key));
-		if (TSGT(&out->lower, &cur->lower))
-			out->lower = cur->lower;
-		if (TSLT(&out->upper, &cur->upper))
-			out->upper = cur->upper;
-	}
-
-	PG_RETURN_POINTER(out);
-}
-
-Datum
-gts_penalty(PG_FUNCTION_ARGS)
-{
-	TSKEY	   *origentry = (TSKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(0))->key);
-	TSKEY	   *newentry = (TSKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
-	float	   *result = (float *) PG_GETARG_POINTER(2);
-	Interval   *intr;
-
-	intr = DatumGetIntervalP(DirectFunctionCall2(
-												 timestamp_mi,
-									  TimestampGetDatumFast(newentry->upper),
-								   TimestampGetDatumFast(origentry->upper)));
-
-	/* see interval_larger */
-	*result = Max(intr->time + intr->month * (30.0 * 86400), 0);
-	pfree(intr);
-
-	intr = DatumGetIntervalP(DirectFunctionCall2(
-												 timestamp_mi,
-									 TimestampGetDatumFast(origentry->lower),
-									TimestampGetDatumFast(newentry->lower)));
-
-	/* see interval_larger */
-	*result += Max(intr->time + intr->month * (30.0 * 86400), 0);
-	pfree(intr);
-
-	PG_RETURN_POINTER(result);
-}
-
-Datum
-gts_picksplit(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_POINTER(btree_picksplit(
-									  (bytea *) PG_GETARG_POINTER(0),
-								  (GIST_SPLITVEC *) PG_GETARG_POINTER(1),
-									  gts_binary_union,
-									  tskey_cmp
-									  ));
-}
-
-Datum
-gts_same(PG_FUNCTION_ARGS)
-{
-	TSKEY	   *b1 = (TSKEY *) PG_GETARG_POINTER(0);
-	TSKEY	   *b2 = (TSKEY *) PG_GETARG_POINTER(1);
-
-	bool	   *result = (bool *) PG_GETARG_POINTER(2);
-
-	if (b1 && b2)
-		*result = (TSEQ(&(b1->lower), &(b2->lower)) && TSEQ(&(b1->upper), &(b2->upper))) ? TRUE : FALSE;
-	else
-		*result = (b1 == NULL && b2 == NULL) ? TRUE : FALSE;
-	PG_RETURN_POINTER(result);
-}
-
-static void
-gts_binary_union(Datum *r1, char *r2)
-{
-	TSKEY	   *b1;
-	TSKEY	   *b2 = (TSKEY *) r2;
-
-	if (!DatumGetPointer(*r1))
-	{
-		*r1 = PointerGetDatum(palloc(sizeof(TSKEY)));
-		b1 = (TSKEY *) DatumGetPointer(*r1);
-		b1->upper = b2->upper;
-		b1->lower = b2->lower;
-	}
-	else
-	{
-		b1 = (TSKEY *) DatumGetPointer(*r1);
-
-		b1->lower = (TSGT(&b1->lower, &b2->lower)) ?
-			b2->lower : b1->lower;
-		b1->upper = (TSGT(&b1->upper, &b2->upper)) ?
-			b1->upper : b2->upper;
-	}
-}
-
-static int
-tskey_cmp(const void *a, const void *b)
-{
-	return DatumGetInt32(
-						 DirectFunctionCall2(
-											 timestamp_cmp,
-				  TimestampGetDatumFast(((TSKEY *) (((RIX *) a)->r))->lower),
-				   TimestampGetDatumFast(((TSKEY *) (((RIX *) b)->r))->lower)
-											 )
-		);
-}
-
-/**************************************************
- * Common btree-function (for all ops)
- **************************************************/
-
-/*
-** The GiST PickSplit method
-*/
-static GIST_SPLITVEC *
-btree_picksplit(bytea *entryvec, GIST_SPLITVEC *v, BINARY_UNION bu, CMPFUNC cmp)
-{
-	OffsetNumber i;
-	RIX		   *array;
-	OffsetNumber maxoff;
-	int			nbytes;
-
-	maxoff = ((VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY)) - 1;
-	nbytes = (maxoff + 2) * sizeof(OffsetNumber);
-	v->spl_left = (OffsetNumber *) palloc(nbytes);
-	v->spl_right = (OffsetNumber *) palloc(nbytes);
-	v->spl_nleft = 0;
-	v->spl_nright = 0;
-	v->spl_ldatum = PointerGetDatum(0);
-	v->spl_rdatum = PointerGetDatum(0);
-	array = (RIX *) palloc(sizeof(RIX) * (maxoff + 1));
-
-	/* copy the data into RIXes, and sort the RIXes */
-	for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i))
-	{
-		array[i].index = i;
-		array[i].r = (char *) DatumGetPointer((((GISTENTRY *) (VARDATA(entryvec)))[i].key));
-	}
-	qsort((void *) &array[FirstOffsetNumber], maxoff - FirstOffsetNumber + 1,
-		  sizeof(RIX), cmp);
-
-	for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i))
-	{
-		if (i <= (maxoff - FirstOffsetNumber + 1) / 2)
-		{
-			v->spl_left[v->spl_nleft] = array[i].index;
-			v->spl_nleft++;
-			(*bu) (&v->spl_ldatum, array[i].r);
-		}
-		else
-		{
-			v->spl_right[v->spl_nright] = array[i].index;
-			v->spl_nright++;
-			(*bu) (&v->spl_rdatum, array[i].r);
-		}
-	}
-	pfree(array);
-
-	return (v);
-}
-
-/*
-** GiST DeCompress methods
-** do not do anything.
-*/
-Datum
-btree_decompress(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_POINTER(PG_GETARG_POINTER(0));
-}
-
-
-/**************************************************
- * In/Out for keys, not really needed
- **************************************************/
-Datum
-int4key_in(PG_FUNCTION_ARGS)
-{
-	INT4KEY    *key = palloc(sizeof(INT4KEY));
-
-	if (sscanf(PG_GETARG_POINTER(0), "%d|%d", &(key->lower), &(key->upper)) != 2)
-		elog(ERROR, "Error in input format");
-
-	PG_RETURN_POINTER(key);
-}
-
-Datum
-int4key_out(PG_FUNCTION_ARGS)
-{
-	INT4KEY    *key = (INT4KEY *) PG_GETARG_POINTER(0);
-	char	   *str = palloc(sizeof(char) * 22);
-
-	sprintf(str, "%d|%d", key->lower, key->upper);
-	PG_RETURN_POINTER(str);
-}
-
-Datum
-tskey_in(PG_FUNCTION_ARGS)
-{
-	elog(ERROR, "Not implemented");
-	PG_RETURN_POINTER(NULL);
-}
-
-Datum
-tskey_out(PG_FUNCTION_ARGS)
-{
-	elog(ERROR, "Not implemented");
-	PG_RETURN_POINTER(NULL);
-}
diff --git a/contrib/btree_gist/btree_gist.sql.in b/contrib/btree_gist/btree_gist.sql.in
deleted file mode 100644
index 98b868afc7..0000000000
--- a/contrib/btree_gist/btree_gist.sql.in
+++ /dev/null
@@ -1,270 +0,0 @@
-begin transaction;
--- create type of int4 key
-
-CREATE FUNCTION int4key_in(opaque)
-RETURNS opaque
-AS 'MODULE_PATHNAME'
-LANGUAGE 'c' with (isstrict);
-
-CREATE FUNCTION int4key_out(opaque)
-RETURNS opaque
-AS 'MODULE_PATHNAME'
-LANGUAGE 'c' with (isstrict);
-
-CREATE TYPE int4key (
-internallength = 8,
-input = int4key_in,
-output = int4key_out
-);
-
-
---
---
---
--- int4 ops
---
---
---
--- define the GiST support methods
-create function gint4_consistent(opaque,int4,int2) returns bool as 'MODULE_PATHNAME' language 'C';
-
-create function gint4_compress(opaque) returns opaque as 'MODULE_PATHNAME' language 'C';
-
-create function btree_decompress(opaque) returns opaque as 'MODULE_PATHNAME' language 'C';
-
-create function gint4_penalty(opaque,opaque,opaque) returns opaque as 'MODULE_PATHNAME' language 'C' with(isstrict);
-
-create function gint4_picksplit(opaque, opaque) returns opaque as 'MODULE_PATHNAME' language 'C';
-
-create function gint4_union(bytea, opaque) returns int4 as 'MODULE_PATHNAME' language 'C';
-
-create function gint4_same(opaque, opaque, opaque) returns opaque as 'MODULE_PATHNAME' language 'C';
-
--- add a new opclass
-INSERT INTO pg_opclass (opcamid, opcname, opcnamespace, opcowner, opcintype, opcdefault, opckeytype)
-    VALUES (
-        (SELECT oid FROM pg_am WHERE amname = 'gist'),
-        'gist_int4_ops',
-        (SELECT oid FROM pg_namespace WHERE nspname = 'pg_catalog'),
-        1,	-- UID of superuser is hardwired to 1 as of PG 7.3
-        (SELECT oid FROM pg_type WHERE typname = 'int4'),
-        true,
-        (SELECT oid FROM pg_type WHERE typname = 'int4key'));
-
-
-SELECT o.oid AS opoid, o.oprname
-INTO TABLE int_ops_tmp
-FROM pg_operator o, pg_type t
-WHERE o.oprleft = t.oid and o.oprright = t.oid
-   and t.typname = 'int4';
-
--- get the comparators for int4es and store them in a tmp table
-INSERT INTO pg_amop (amopclaid, amopopr, amopstrategy, amopreqcheck)
-   SELECT opcl.oid, c.opoid, 1, 'f'
-   FROM pg_opclass opcl, int_ops_tmp c
-   WHERE opcname = 'gist_int4_ops'
-      and c.oprname = '<';
-
-INSERT INTO pg_amop (amopclaid, amopopr, amopstrategy, amopreqcheck)
-   SELECT opcl.oid, c.opoid, 2, 'f'
-   FROM pg_opclass opcl, int_ops_tmp c
-   WHERE opcname = 'gist_int4_ops'
-      and c.oprname = '<=';
-
-INSERT INTO pg_amop (amopclaid, amopopr, amopstrategy, amopreqcheck)
-   SELECT opcl.oid, c.opoid, 3, 'f'
-   FROM pg_opclass opcl, int_ops_tmp c
-   WHERE opcname = 'gist_int4_ops'
-      and c.oprname = '=';
-
-INSERT INTO pg_amop (amopclaid, amopopr, amopstrategy, amopreqcheck)
-   SELECT opcl.oid, c.opoid, 4, 'f'
-   FROM pg_opclass opcl, int_ops_tmp c
-   WHERE opcname = 'gist_int4_ops'
-      and c.oprname = '>=';
-
-INSERT INTO pg_amop (amopclaid, amopopr, amopstrategy, amopreqcheck)
-   SELECT opcl.oid, c.opoid, 5, 'f'
-   FROM pg_opclass opcl, int_ops_tmp c
-   WHERE opcname = 'gist_int4_ops'
-      and c.oprname = '>';
-
-
-DROP table int_ops_tmp;
-
--- add the entries to amproc for the support methods
--- note the amprocnum numbers associated with each are specific!
-INSERT INTO pg_amproc (amopclaid, amproc, amprocnum)
-   SELECT opcl.oid, pro.oid, 1
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE  opcname = 'gist_int4_ops'
-      and proname = 'gint4_consistent';
-
-INSERT INTO pg_amproc (amopclaid, amproc, amprocnum)
-   SELECT opcl.oid, pro.oid, 2
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE  opcname = 'gist_int4_ops'
-      and proname = 'gint4_union';
-
-INSERT INTO pg_amproc (amopclaid, amproc, amprocnum)
-   SELECT opcl.oid, pro.oid, 3
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE  opcname = 'gist_int4_ops'
-      and proname = 'gint4_compress';
-
-INSERT INTO pg_amproc (amopclaid, amproc, amprocnum)
-   SELECT opcl.oid, pro.oid, 4
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE  opcname = 'gist_int4_ops'
-      and proname = 'btree_decompress';
-
-INSERT INTO pg_amproc (amopclaid, amproc, amprocnum)
-   SELECT opcl.oid, pro.oid, 5
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE  opcname = 'gist_int4_ops'
-      and proname = 'gint4_penalty';
-
-INSERT INTO pg_amproc (amopclaid, amproc, amprocnum)
-   SELECT opcl.oid, pro.oid, 6
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE  opcname = 'gist_int4_ops'
-      and proname = 'gint4_picksplit';
-
-INSERT INTO pg_amproc (amopclaid, amproc, amprocnum)
-   SELECT opcl.oid, pro.oid, 7
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE  opcname = 'gist_int4_ops'
-      and proname = 'gint4_same';
-
---
---
---
--- timestamp ops
--- 
---
---
--- create type of timestamp key
-
-CREATE FUNCTION tskey_in(opaque)
-RETURNS opaque
-AS 'MODULE_PATHNAME'
-LANGUAGE 'c' with (isstrict);
-
-CREATE FUNCTION tskey_out(opaque)
-RETURNS opaque
-AS 'MODULE_PATHNAME'
-LANGUAGE 'c' with (isstrict);
-
-CREATE TYPE tskey (
-internallength = 16,
-input = tskey_in,
-output = tskey_out
-);
-
-create function gts_consistent(opaque,timestamp,int2) returns bool as 'MODULE_PATHNAME' language 'C';
-      
-create function gts_compress(opaque) returns opaque as 'MODULE_PATHNAME' language 'C';
-
-create function gts_penalty(opaque,opaque,opaque) returns opaque as 'MODULE_PATHNAME' language 'C' with(isstrict);
-   
-create function gts_picksplit(opaque, opaque) returns opaque as 'MODULE_PATHNAME' language 'C';
-      
-create function gts_union(bytea, opaque) returns int4 as 'MODULE_PATHNAME' language 'C';
-
-create function gts_same(opaque, opaque, opaque) returns opaque as 'MODULE_PATHNAME' language 'C';
-
--- add a new opclass
-INSERT INTO pg_opclass (opcamid, opcname, opcnamespace, opcowner, opcintype, opcdefault, opckeytype)
-    VALUES (
-        (SELECT oid FROM pg_am WHERE amname = 'gist'),
-        'gist_timestamp_ops',
-        (SELECT oid FROM pg_namespace WHERE nspname = 'pg_catalog'),
-        1,	-- UID of superuser is hardwired to 1 as of PG 7.3
-        (SELECT oid FROM pg_type WHERE typname = 'timestamp'),
-        true,
-        (SELECT oid FROM pg_type WHERE typname = 'tskey'));
-
-SELECT o.oid AS opoid, o.oprname
-INTO TABLE timestamp_ops_tmp
-FROM pg_operator o, pg_type t
-WHERE o.oprleft = t.oid and o.oprright = t.oid
-   and t.typname = 'timestamp';
-
-INSERT INTO pg_amop (amopclaid, amopopr, amopstrategy, amopreqcheck)
-   SELECT opcl.oid, c.opoid, 1, 'f'
-   FROM pg_opclass opcl, timestamp_ops_tmp c
-   WHERE opcname = 'gist_timestamp_ops'
-      and c.oprname = '<';
-
-INSERT INTO pg_amop (amopclaid, amopopr, amopstrategy, amopreqcheck)
-   SELECT opcl.oid, c.opoid, 2, 'f'
-   FROM pg_opclass opcl, timestamp_ops_tmp c
-   WHERE opcname = 'gist_timestamp_ops'
-      and c.oprname = '<=';
-
-INSERT INTO pg_amop (amopclaid, amopopr, amopstrategy, amopreqcheck)
-   SELECT opcl.oid, c.opoid, 3, 'f'
-   FROM pg_opclass opcl, timestamp_ops_tmp c
-   WHERE opcname = 'gist_timestamp_ops'
-      and c.oprname = '=';
-
-INSERT INTO pg_amop (amopclaid, amopopr, amopstrategy, amopreqcheck)
-   SELECT opcl.oid, c.opoid, 4, 'f'
-   FROM pg_opclass opcl, timestamp_ops_tmp c
-   WHERE opcname = 'gist_timestamp_ops'
-      and c.oprname = '>=';
-
-INSERT INTO pg_amop (amopclaid, amopopr, amopstrategy, amopreqcheck)
-   SELECT opcl.oid, c.opoid, 5, 'f'
-   FROM pg_opclass opcl, timestamp_ops_tmp c
-   WHERE opcname = 'gist_timestamp_ops'
-      and c.oprname = '>';
-
-DROP table timestamp_ops_tmp;
-
--- add the entries to amproc for the support methods
--- note the amprocnum numbers associated with each are specific!
-INSERT INTO pg_amproc (amopclaid, amproc, amprocnum)
-   SELECT opcl.oid, pro.oid, 1
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE  opcname = 'gist_timestamp_ops'
-      and proname = 'gts_consistent';
-
-INSERT INTO pg_amproc (amopclaid, amproc, amprocnum)
-   SELECT opcl.oid, pro.oid, 2
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE  opcname = 'gist_timestamp_ops'
-      and proname = 'gts_union';
-
-INSERT INTO pg_amproc (amopclaid, amproc, amprocnum)
-   SELECT opcl.oid, pro.oid, 3
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE  opcname = 'gist_timestamp_ops'
-      and proname = 'gts_compress';
-
-INSERT INTO pg_amproc (amopclaid, amproc, amprocnum)
-   SELECT opcl.oid, pro.oid, 4
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE  opcname = 'gist_timestamp_ops'
-      and proname = 'btree_decompress';
-
-INSERT INTO pg_amproc (amopclaid, amproc, amprocnum)
-   SELECT opcl.oid, pro.oid, 5
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE  opcname = 'gist_timestamp_ops'
-      and proname = 'gts_penalty';
-
-INSERT INTO pg_amproc (amopclaid, amproc, amprocnum)
-   SELECT opcl.oid, pro.oid, 6
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE  opcname = 'gist_timestamp_ops'
-      and proname = 'gts_picksplit';
-
-INSERT INTO pg_amproc (amopclaid, amproc, amprocnum)
-   SELECT opcl.oid, pro.oid, 7
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE  opcname = 'gist_timestamp_ops'
-      and proname = 'gts_same';
-
-end transaction;
-
diff --git a/contrib/btree_gist/data/test_btree.data b/contrib/btree_gist/data/test_btree.data
deleted file mode 100644
index d29aa02c52..0000000000
--- a/contrib/btree_gist/data/test_btree.data
+++ /dev/null
@@ -1,1000 +0,0 @@
-49
-200
-394
-274
-196
-543
-328
-645
-151
-849
-771
-704
-688
-485
-545
-931
-210
-222
-897
-676
-\N
-201
-533
-703
-410
-301
-633
-319
-329
-13
-942
-737
-533
-407
-876
-622
-430
-264
-785
-938
-680
-91
-179
-147
-108
-510
-336
-781
-3
-16
-\N
-136
-494
-570
-333
-447
-185
-\N
-\N
-213
-193
-565
-77
-904
-989
-471
-\N
-566
-117
-102
-515
-105
-\N
-61
-537
-278
-337
-46
-92
-723
-661
-619
-\N
-293
-\N
-919
-227
-536
-917
-779
-418
-15
-235
-425
-\N
-362
-587
-590
-103
-563
-369
-775
-404
-408
-142
-133
-566
-727
-413
-382
-42
-32
-548
-540
-\N
-86
-\N
-58
-685
-11
-907
-274
-94
-987
-971
-383
-757
-327
-38
-854
-257
-318
-159
-224
-39
-\N
-532
-461
-30
-\N
-790
-\N
-828
-35
-606
-845
-\N
-313
-391
-869
-592
-821
-73
-\N
-703
-222
-218
-209
-136
-774
-608
-531
-820
-119
-497
-889
-\N
-592
-899
-\N
-243
-\N
-400
-\N
-894
-\N
-\N
-386
-\N
-550
-840
-606
-160
-386
-723
-16
-693
-601
-338
-368
-74
-436
-734
-806
-433
-679
-857
-679
-319
-85
-\N
-153
-506
-110
-73
-485
-749
-205
-628
-746
-380
-\N
-573
-146
-314
-439
-102
-606
-\N
-179
-\N
-921
-236
-509
-714
-353
-97
-\N
-374
-131
-528
-805
-298
-533
-737
-\N
-135
-119
-294
-725
-826
-393
-740
-487
-932
-\N
-734
-333
-651
-460
-590
-530
-575
-352
-999
-319
-\N
-277
-692
-939
-580
-\N
-\N
-568
-92
-182
-885
-839
-303
-709
-891
-538
-58
-271
-577
-827
-459
-852
-812
-823
-\N
-375
-924
-\N
-799
-297
-795
-853
-751
-\N
-77
-339
-\N
-\N
-506
-577
-864
-118
-444
-731
-355
-390
-787
-352
-570
-389
-771
-110
-278
-59
-862
-846
-\N
-362
-590
-719
-442
-525
-329
-945
-739
-857
-897
-835
-787
-657
-558
-455
-\N
-159
-\N
-672
-795
-\N
-581
-818
-872
-123
-255
-816
-789
-\N
-124
-\N
-900
-\N
-240
-819
-386
-841
-282
-269
-259
-893
-570
-505
-769
-959
-\N
-426
-620
-857
-824
-102
-308
-351
-74
-950
-292
-580
-739
-575
-\N
-594
-\N
-489
-382
-498
-795
-664
-881
-918
-159
-108
-\N
-679
-724
-964
-8
-664
-267
-101
-869
-676
-433
-469
-657
-78
-381
-43
-959
-695
-545
-780
-390
-697
-733
-693
-387
-864
-613
-301
-374
-222
-564
-450
-307
-\N
-\N
-912
-518
-593
-283
-529
-983
-379
-244
-819
-377
-225
-811
-69
-\N
-380
-919
-724
-352
-248
-\N
-416
-788
-663
-395
-394
-707
-352
-658
-759
-825
-881
-563
-271
-\N
-407
-\N
-157
-931
-233
-769
-78
-737
-525
-221
-216
-824
-353
-977
-757
-976
-843
-795
-603
-\N
-85
-795
-382
-998
-136
-904
-563
-354
-288
-2
-835
-\N
-714
-915
-471
-\N
-\N
-676
-556
-119
-490
-909
-\N
-240
-106
-17
-474
-222
-721
-374
-\N
-262
-913
-234
-797
-\N
-723
-9
-126
-886
-617
-311
-241
-413
-134
-545
-145
-867
-120
-271
-\N
-\N
-\N
-177
-\N
-735
-435
-\N
-855
-612
-803
-964
-417
-771
-359
-670
-682
-236
-492
-597
-220
-1
-585
-193
-837
-938
-389
-527
-423
-627
-\N
-924
-741
-760
-280
-819
-128
-585
-412
-\N
-816
-710
-359
-318
-478
-803
-771
-642
-\N
-\N
-842
-490
-462
-727
-214
-629
-276
-\N
-274
-672
-875
-35
-873
-913
-185
-770
-126
-4
-770
-56
-621
-137
-62
-771
-561
-891
-80
-\N
-45
-996
-722
-940
-823
-\N
-883
-225
-788
-519
-317
-763
-563
-689
-635
-905
-500
-859
-55
-205
-651
-537
-787
-973
-195
-542
-\N
-\N
-857
-377
-\N
-\N
-834
-314
-314
-407
-865
-945
-675
-\N
-\N
-5
-715
-248
-168
-862
-37
-366
-936
-136
-\N
-324
-845
-854
-831
-225
-\N
-987
-545
-621
-140
-844
-132
-466
-899
-716
-907
-97
-511
-425
-225
-522
-702
-532
-132
-328
-278
-985
-869
-773
-\N
-633
-624
-114
-879
-142
-762
-729
-890
-430
-241
-267
-616
-9
-457
-168
-\N
-177
-3
-\N
-675
-558
-2
-\N
-310
-548
-992
-597
-950
-48
-33
-173
-460
-890
-757
-983
-492
-777
-22
-261
-973
-106
-666
-558
-226
-681
-\N
-347
-92
-14
-96
-641
-495
-585
-458
-217
-386
-284
-719
-694
-\N
-643
-\N
-928
-976
-44
-941
-396
-\N
-559
-969
-187
-669
-463
-769
-669
-\N
-70
-861
-501
-\N
-349
-44
-951
-375
-869
-441
-515
-322
-867
-983
-152
-623
-730
-148
-899
-236
-833
-961
-389
-448
-975
-523
-225
-\N
-698
-314
-19
-935
-269
-178
-349
-685
-702
-523
-165
-453
-756
-266
-997
-499
-880
-402
-40
-487
-261
-506
-886
-193
-237
-631
-630
-570
-90
-558
-348
-203
-\N
-598
-676
-834
-709
-796
-299
-197
-\N
-94
-997
-458
-871
-964
-808
-321
-\N
-525
-451
-785
-374
-530
-626
-850
-336
-138
-883
-143
-\N
-299
-\N
-754
-667
-820
-777
-438
-339
-600
-276
-987
-270
-949
-\N
-474
-321
-325
-138
-620
-345
-\N
-477
-\N
-690
-714
-897
-36
-469
-965
-259
-715
-580
-\N
-697
-495
-\N
-284
-820
-992
-708
-638
-216
-181
-\N
-101
-\N
-730
-902
-703
-176
-561
-945
-915
-246
-632
-441
-849
-\N
-552
-76
-960
-628
-413
-814
-746
-613
-417
-327
-178
-116
-829
-522
-761
-462
-518
-660
-87
-979
-143
-628
-960
-715
-\N
-288
-\N
-387
-29
-15
-544
-455
-57
-433
-158
-72
-49
-620
-616
-592
-584
-564
-735
-308
-661
-519
-1
-825
-665
-316
-970
-305
-204
-541
-544
-589
-827
-600
-126
-192
-610
-650
-647
-177
-625
-405
-465
-895
-\N
-152
-594
-492
-385
-693
-442
-173
-\N
-946
-934
-200
-532
-750
-158
-981
-670
-572
-608
-135
-48
-208
-\N
-971
-594
-429
-655
diff --git a/contrib/btree_gist/data/test_btree_ts.data b/contrib/btree_gist/data/test_btree_ts.data
deleted file mode 100644
index 7dc9a5b0c6..0000000000
--- a/contrib/btree_gist/data/test_btree_ts.data
+++ /dev/null
@@ -1,1000 +0,0 @@
-\N
-Sun Jun  3 20:40:06 2001
-Sun Jun  3 02:45:19 2001
-Tue May 29 20:31:04 2001
-Fri Jun  1 04:23:33 2001
-Wed May 30 07:38:41 2001
-Sun Jun  3 11:21:57 2001
-Fri Jun  1 01:05:37 2001
-Mon May 28 21:42:37 2001
-Wed May 30 17:54:19 2001
-Mon Jun  4 18:45:50 2001
-Tue May 29 19:55:23 2001
-Tue May 29 12:15:50 2001
-Mon Jun  4 03:14:19 2001
-Tue May 29 08:42:21 2001
-Sun Jun  3 04:31:46 2001
-Tue May 29 15:13:14 2001
-Thu May 31 02:32:09 2001
-Thu May 31 01:12:54 2001
-Tue May 29 16:55:46 2001
-Fri Jun  1 18:01:47 2001
-Mon May 28 22:49:18 2001
-Tue May 29 16:51:44 2001
-Mon Jun  4 07:09:50 2001
-Mon May 28 21:12:17 2001
-Wed May 30 01:17:11 2001
-Thu May 31 02:02:53 2001
-Tue May 29 07:49:47 2001
-Sat Jun  2 16:06:10 2001
-Sun Jun  3 16:18:58 2001
-Tue May 29 03:16:58 2001
-Sat Jun  2 01:36:39 2001
-Sat Jun  2 19:42:28 2001
-Sat Jun  2 03:31:29 2001
-Wed May 30 14:28:07 2001
-Wed May 30 13:48:30 2001
-Sun Jun  3 22:24:38 2001
-Tue May 29 08:47:05 2001
-Mon Jun  4 01:10:50 2001
-Fri Jun  1 21:52:26 2001
-Tue May 29 16:47:26 2001
-Sat Jun  2 18:15:31 2001
-Sat Jun  2 05:56:51 2001
-Sun Jun  3 17:56:22 2001
-Sat Jun  2 11:23:49 2001
-Fri Jun  1 13:25:51 2001
-Wed May 30 22:32:03 2001
-Thu May 31 08:20:54 2001
-\N
-Thu May 31 19:03:04 2001
-Fri Jun  1 20:11:05 2001
-Sun Jun  3 20:09:52 2001
-Wed May 30 05:56:53 2001
-Sat Jun  2 02:33:53 2001
-Fri Jun  1 23:33:12 2001
-Mon Jun  4 14:27:14 2001
-Sun Jun  3 07:17:52 2001
-Sat Jun  2 14:44:01 2001
-Wed May 30 16:15:42 2001
-\N
-Thu May 31 08:24:36 2001
-Mon Jun  4 17:45:29 2001
-Thu May 31 10:46:18 2001
-Tue May 29 11:21:09 2001
-Sat Jun  2 19:27:48 2001
-Sat Jun  2 15:21:37 2001
-Thu May 31 15:07:29 2001
-Mon Jun  4 04:25:42 2001
-Sun Jun  3 19:21:05 2001
-Wed May 30 01:35:52 2001
-\N
-Thu May 31 17:05:54 2001
-Thu May 31 02:22:03 2001
-Wed May 30 10:09:01 2001
-Wed May 30 15:36:50 2001
-Wed May 30 03:13:22 2001
-Tue May 29 19:54:54 2001
-Thu May 31 18:58:16 2001
-Fri Jun  1 11:31:40 2001
-Sat Jun  2 11:01:18 2001
-Wed May 30 10:17:52 2001
-\N
-Sat Jun  2 04:07:24 2001
-Sat Jun  2 07:29:24 2001
-Fri Jun  1 03:17:40 2001
-Thu May 31 20:49:55 2001
-Mon Jun  4 08:07:37 2001
-Sat Jun  2 01:17:04 2001
-Wed May 30 19:59:30 2001
-Fri Jun  1 17:03:00 2001
-Thu May 31 22:50:11 2001
-Tue May 29 00:14:32 2001
-Sat Jun  2 06:53:18 2001
-Fri Jun  1 02:19:00 2001
-Tue May 29 15:22:30 2001
-Sun Jun  3 10:08:27 2001
-Wed May 30 18:30:36 2001
-Wed May 30 08:57:25 2001
-Tue May 29 06:59:32 2001
-Wed May 30 06:29:04 2001
-Tue May 29 13:16:29 2001
-Thu May 31 08:24:46 2001
-Thu May 31 20:50:41 2001
-\N
-Wed May 30 20:34:27 2001
-Wed May 30 17:14:44 2001
-Tue May 29 13:06:28 2001
-Sun Jun  3 09:49:45 2001
-Thu May 31 11:11:56 2001
-Tue May 29 06:37:34 2001
-Mon May 28 22:38:25 2001
-Sat Jun  2 07:51:04 2001
-\N
-Wed May 30 03:53:04 2001
-Tue May 29 00:01:38 2001
-Fri Jun  1 19:23:30 2001
-Thu May 31 08:36:36 2001
-Sun Jun  3 00:04:28 2001
-Thu May 31 02:07:37 2001
-Thu May 31 04:14:15 2001
-Wed May 30 22:23:45 2001
-Mon May 28 22:42:50 2001
-Wed May 30 01:37:14 2001
-Wed May 30 14:03:12 2001
-Sun Jun  3 23:40:54 2001
-Sat Jun  2 14:28:35 2001
-Sat Jun  2 11:48:57 2001
-Mon Jun  4 18:50:42 2001
-Wed May 30 20:56:22 2001
-Sat Jun  2 12:53:46 2001
-\N
-Wed May 30 04:14:41 2001
-Thu May 31 02:12:07 2001
-Mon Jun  4 05:52:07 2001
-Fri Jun  1 05:25:34 2001
-Thu May 31 06:19:47 2001
-Mon Jun  4 03:39:58 2001
-Wed May 30 23:59:02 2001
-Sat Jun  2 11:12:50 2001
-Wed May 30 01:51:48 2001
-Sun Jun  3 03:22:55 2001
-Sat Jun  2 23:24:56 2001
-Sun Jun  3 01:37:30 2001
-Sat Jun  2 14:49:14 2001
-Fri Jun  1 09:21:57 2001
-Sun Jun  3 19:08:13 2001
-\N
-Wed May 30 17:25:06 2001
-Thu May 31 23:43:31 2001
-Wed May 30 19:30:46 2001
-Sun Jun  3 12:12:08 2001
-Thu May 31 15:20:18 2001
-Thu May 31 22:14:37 2001
-Sun Jun  3 17:26:54 2001
-Wed May 30 18:23:42 2001
-Tue May 29 16:17:51 2001
-Sun Jun  3 02:03:30 2001
-Mon May 28 21:46:57 2001
-Sun Jun  3 15:41:51 2001
-Sat Jun  2 23:10:23 2001
-Tue May 29 02:03:28 2001
-Fri Jun  1 13:40:57 2001
-Sun Jun  3 18:39:05 2001
-Wed May 30 21:55:49 2001
-Thu May 31 23:45:28 2001
-Thu May 31 08:32:38 2001
-Tue May 29 22:11:25 2001
-Wed May 30 02:09:08 2001
-Fri Jun  1 03:04:47 2001
-Mon May 28 21:01:12 2001
-Wed May 30 01:55:13 2001
-\N
-Tue May 29 22:52:13 2001
-Wed May 30 01:51:02 2001
-Sun Jun  3 01:34:33 2001
-Wed May 30 15:44:24 2001
-Wed May 30 04:27:54 2001
-Sat Jun  2 20:08:59 2001
-Sat Jun  2 13:11:14 2001
-Sun Jun  3 14:47:03 2001
-Wed May 30 07:41:49 2001
-Tue May 29 05:24:12 2001
-Sat Jun  2 07:03:17 2001
-Thu May 31 08:30:25 2001
-Sun Jun  3 13:48:30 2001
-Wed May 30 11:43:23 2001
-Wed May 30 11:12:01 2001
-Sun Jun  3 09:08:53 2001
-Thu May 31 06:27:12 2001
-Sat Jun  2 02:53:25 2001
-Mon Jun  4 05:23:09 2001
-Sat Jun  2 18:04:07 2001
-\N
-Tue May 29 22:54:17 2001
-Sat Jun  2 18:53:11 2001
-Sun Jun  3 23:55:00 2001
-Fri Jun  1 14:56:29 2001
-\N
-Sun Jun  3 01:10:21 2001
-Sun Jun  3 13:03:24 2001
-Sat Jun  2 12:44:32 2001
-Tue May 29 05:19:28 2001
-Thu May 31 16:36:01 2001
-Mon Jun  4 15:25:04 2001
-\N
-Sun Jun  3 00:58:03 2001
-Thu May 31 10:10:45 2001
-Sun Jun  3 23:10:39 2001
-Thu May 31 17:08:54 2001
-Sat Jun  2 04:44:32 2001
-Mon Jun  4 20:37:32 2001
-Sun Jun  3 14:02:27 2001
-Fri Jun  1 00:15:11 2001
-Wed May 30 19:07:54 2001
-Thu May 31 21:09:07 2001
-Wed May 30 06:43:45 2001
-Thu May 31 17:03:48 2001
-Wed May 30 10:34:25 2001
-Thu May 31 19:30:19 2001
-Wed May 30 03:26:20 2001
-\N
-Tue May 29 11:31:43 2001
-Wed May 30 10:41:13 2001
-Sun Jun  3 22:56:30 2001
-Sat Jun  2 11:24:17 2001
-\N
-Tue May 29 08:31:26 2001
-Sun Jun  3 07:16:34 2001
-Fri Jun  1 07:03:59 2001
-Thu May 31 04:49:56 2001
-Fri Jun  1 14:39:21 2001
-Sat Jun  2 17:07:43 2001
-Tue May 29 01:49:41 2001
-Fri Jun  1 06:20:26 2001
-Mon Jun  4 05:09:06 2001
-Thu May 31 00:14:27 2001
-Sat Jun  2 17:21:41 2001
-\N
-Tue May 29 02:56:39 2001
-Tue May 29 23:27:02 2001
-Mon May 28 23:50:53 2001
-Wed May 30 02:32:23 2001
-Fri Jun  1 12:37:50 2001
-Wed May 30 23:57:32 2001
-Tue May 29 01:50:18 2001
-Mon May 28 22:17:20 2001
-Tue May 29 01:59:52 2001
-Sat Jun  2 18:49:18 2001
-\N
-Wed May 30 05:04:26 2001
-Sat Jun  2 19:04:41 2001
-Sun Jun  3 07:07:43 2001
-Thu May 31 12:32:31 2001
-Sat Jun  2 01:24:29 2001
-\N
-Wed May 30 19:38:53 2001
-Fri Jun  1 02:48:16 2001
-\N
-Wed May 30 16:12:42 2001
-Mon May 28 21:33:51 2001
-Thu May 31 15:02:55 2001
-Sun Jun  3 13:03:45 2001
-Tue May 29 08:44:17 2001
-Wed May 30 21:32:20 2001
-Sun Jun  3 23:50:24 2001
-Tue May 29 00:31:05 2001
-Thu May 31 09:13:07 2001
-Sat Jun  2 11:13:49 2001
-Thu May 31 20:47:16 2001
-Thu May 31 23:08:43 2001
-Wed May 30 11:53:35 2001
-Wed May 30 18:46:04 2001
-Wed May 30 11:35:10 2001
-Wed May 30 02:57:12 2001
-Fri Jun  1 21:02:27 2001
-Sat Jun  2 08:59:07 2001
-\N
-Mon Jun  4 11:42:53 2001
-Sun Jun  3 16:53:56 2001
-Tue May 29 17:44:47 2001
-Fri Jun  1 18:51:21 2001
-Sun Jun  3 04:40:51 2001
-Tue May 29 23:47:08 2001
-Fri Jun  1 17:49:14 2001
-Mon Jun  4 09:00:55 2001
-Thu May 31 04:03:50 2001
-Fri Jun  1 12:29:04 2001
-Thu May 31 22:51:45 2001
-Sat Jun  2 03:50:06 2001
-Fri Jun  1 11:15:33 2001
-Sun Jun  3 21:42:22 2001
-Fri Jun  1 20:15:02 2001
-Fri Jun  1 00:28:51 2001
-Tue May 29 03:43:49 2001
-Mon Jun  4 17:44:11 2001
-Sun Jun  3 05:15:34 2001
-Tue May 29 01:38:51 2001
-Thu May 31 15:54:51 2001
-Tue May 29 13:35:33 2001
-Thu May 31 12:27:53 2001
-Thu May 31 01:12:50 2001
-Mon Jun  4 01:07:39 2001
-Fri Jun  1 17:10:46 2001
-Mon Jun  4 00:09:03 2001
-Thu May 31 14:54:00 2001
-Sun Jun  3 02:28:24 2001
-Sat Jun  2 00:26:46 2001
-Fri Jun  1 19:42:57 2001
-Thu May 31 11:55:21 2001
-Fri Jun  1 08:44:49 2001
-Thu May 31 09:32:30 2001
-Thu May 31 22:04:45 2001
-Thu May 31 11:39:08 2001
-Wed May 30 23:20:32 2001
-Mon Jun  4 07:58:17 2001
-\N
-Mon Jun  4 15:28:43 2001
-Mon Jun  4 04:26:29 2001
-Wed May 30 03:52:48 2001
-Wed May 30 06:52:21 2001
-Sat Jun  2 13:06:29 2001
-Sun Jun  3 23:04:07 2001
-Sun Jun  3 10:34:38 2001
-Sun Jun  3 02:45:33 2001
-Sun Jun  3 01:43:03 2001
-Wed May 30 11:07:31 2001
-Wed May 30 20:26:35 2001
-Sun Jun  3 18:37:10 2001
-Fri Jun  1 06:53:17 2001
-Thu May 31 21:40:41 2001
-Wed May 30 12:39:25 2001
-Mon Jun  4 16:34:29 2001
-Mon Jun  4 09:50:31 2001
-Sun Jun  3 08:39:42 2001
-Thu May 31 08:03:17 2001
-Wed May 30 11:15:20 2001
-Mon Jun  4 19:43:28 2001
-Sat Jun  2 00:24:36 2001
-Mon Jun  4 01:54:40 2001
-Wed May 30 19:49:56 2001
-Wed May 30 10:53:06 2001
-Mon Jun  4 18:11:15 2001
-Sun Jun  3 01:43:14 2001
-Mon May 28 21:02:47 2001
-\N
-Sat Jun  2 01:42:54 2001
-Sat Jun  2 10:15:31 2001
-Thu May 31 15:28:59 2001
-Tue May 29 21:21:39 2001
-Sun Jun  3 20:36:37 2001
-Sun Jun  3 04:50:43 2001
-Fri Jun  1 04:49:37 2001
-Tue May 29 13:13:15 2001
-\N
-Fri Jun  1 03:27:34 2001
-Tue May 29 20:30:51 2001
-Wed May 30 23:09:30 2001
-Fri Jun  1 05:11:20 2001
-\N
-Sat Jun  2 18:29:35 2001
-Tue May 29 09:21:40 2001
-Mon May 28 23:07:57 2001
-Tue May 29 20:06:18 2001
-Thu May 31 00:36:38 2001
-Tue May 29 11:15:38 2001
-Sun Jun  3 08:41:27 2001
-Wed May 30 19:51:16 2001
-\N
-Sat Jun  2 19:50:28 2001
-Sun Jun  3 11:07:04 2001
-Thu May 31 22:56:31 2001
-Thu May 31 02:33:47 2001
-Tue May 29 21:41:08 2001
-Mon Jun  4 20:06:53 2001
-Wed May 30 12:12:35 2001
-Mon May 28 21:05:46 2001
-\N
-Fri Jun  1 03:53:06 2001
-Thu May 31 06:10:59 2001
-Sun Jun  3 22:22:20 2001
-Sat Jun  2 08:53:01 2001
-\N
-Sun Jun  3 23:03:45 2001
-Wed May 30 04:38:42 2001
-Mon Jun  4 03:47:43 2001
-\N
-Wed May 30 13:47:00 2001
-Tue May 29 13:59:04 2001
-Fri Jun  1 08:04:48 2001
-Fri Jun  1 23:10:41 2001
-Sun Jun  3 06:10:43 2001
-Fri Jun  1 09:05:06 2001
-Fri Jun  1 00:58:36 2001
-Wed May 30 23:08:13 2001
-\N
-Fri Jun  1 04:39:19 2001
-Tue May 29 05:05:20 2001
-Mon Jun  4 06:34:52 2001
-Mon Jun  4 01:12:51 2001
-Mon Jun  4 19:28:05 2001
-Wed May 30 04:30:02 2001
-Tue May 29 07:06:29 2001
-Mon Jun  4 01:42:10 2001
-Thu May 31 03:47:17 2001
-Sat Jun  2 20:10:24 2001
-Fri Jun  1 13:33:51 2001
-Thu May 31 02:10:40 2001
-Mon Jun  4 11:40:35 2001
-Wed May 30 11:58:20 2001
-Thu May 31 14:21:17 2001
-Fri Jun  1 15:53:58 2001
-Thu May 31 03:15:55 2001
-Sat Jun  2 23:44:52 2001
-Sun Jun  3 06:50:50 2001
-Fri Jun  1 23:37:43 2001
-Wed May 30 04:47:24 2001
-Fri Jun  1 18:37:01 2001
-Mon Jun  4 05:54:07 2001
-Fri Jun  1 05:24:32 2001
-\N
-Wed May 30 21:24:31 2001
-Mon Jun  4 07:49:01 2001
-Thu May 31 21:30:47 2001
-Tue May 29 22:04:07 2001
-Tue May 29 20:51:36 2001
-\N
-Fri Jun  1 20:47:32 2001
-\N
-Wed May 30 18:05:40 2001
-Sun Jun  3 08:32:17 2001
-Mon Jun  4 05:35:49 2001
-Sat Jun  2 17:02:47 2001
-Tue May 29 15:42:04 2001
-Sun Jun  3 03:10:33 2001
-\N
-Sat Jun  2 02:57:36 2001
-Mon Jun  4 08:31:49 2001
-Tue May 29 16:46:56 2001
-Mon Jun  4 20:33:33 2001
-Mon Jun  4 09:10:45 2001
-Wed May 30 14:46:43 2001
-\N
-Sun Jun  3 05:12:17 2001
-Mon Jun  4 04:12:42 2001
-Sat Jun  2 16:42:20 2001
-Tue May 29 17:29:35 2001
-Tue May 29 16:13:33 2001
-Fri Jun  1 12:46:59 2001
-Thu May 31 11:04:14 2001
-Tue May 29 23:45:19 2001
-\N
-Thu May 31 23:42:08 2001
-Mon Jun  4 15:18:56 2001
-Mon Jun  4 20:33:12 2001
-Fri Jun  1 22:20:35 2001
-Wed May 30 12:53:06 2001
-Mon Jun  4 18:29:15 2001
-Sat Jun  2 03:01:22 2001
-\N
-Sun Jun  3 04:33:18 2001
-Mon May 28 22:23:42 2001
-Sat Jun  2 05:42:57 2001
-\N
-Thu May 31 18:58:14 2001
-Fri Jun  1 17:16:00 2001
-Tue May 29 00:40:26 2001
-Sun Jun  3 09:18:52 2001
-Thu May 31 10:01:25 2001
-Fri Jun  1 08:19:53 2001
-Fri Jun  1 02:15:07 2001
-Thu May 31 11:12:51 2001
-Mon Jun  4 17:36:57 2001
-Mon May 28 21:14:23 2001
-Sun Jun  3 01:10:25 2001
-Wed May 30 22:52:42 2001
-Fri Jun  1 12:41:55 2001
-Sun Jun  3 01:22:21 2001
-Mon Jun  4 00:59:07 2001
-Thu May 31 15:19:57 2001
-Tue May 29 08:47:42 2001
-Tue May 29 06:35:44 2001
-Sun Jun  3 06:41:40 2001
-Fri Jun  1 03:36:12 2001
-Sun Jun  3 06:01:51 2001
-\N
-\N
-\N
-Mon Jun  4 00:35:16 2001
-Sun Jun  3 20:43:44 2001
-Thu May 31 17:03:03 2001
-Sun Jun  3 00:44:32 2001
-Thu May 31 06:26:40 2001
-Mon Jun  4 16:55:01 2001
-Fri Jun  1 23:52:24 2001
-Wed May 30 05:54:54 2001
-Mon Jun  4 01:33:25 2001
-Thu May 31 04:33:42 2001
-Fri Jun  1 03:06:05 2001
-Thu May 31 08:44:54 2001
-Wed May 30 04:50:48 2001
-Thu May 31 23:32:22 2001
-\N
-Wed May 30 05:47:17 2001
-Tue May 29 00:14:58 2001
-Wed May 30 16:38:43 2001
-Wed May 30 09:48:16 2001
-Mon Jun  4 07:21:22 2001
-Sat Jun  2 13:18:48 2001
-Thu May 31 01:52:04 2001
-Mon Jun  4 02:11:26 2001
-Sun Jun  3 06:17:29 2001
-Fri Jun  1 14:53:18 2001
-\N
-\N
-Sun Jun  3 02:05:26 2001
-Sat Jun  2 10:28:04 2001
-Sun Jun  3 04:48:08 2001
-Wed May 30 09:26:19 2001
-Mon May 28 23:34:31 2001
-Sun Jun  3 13:46:32 2001
-Thu May 31 01:07:37 2001
-Sat Jun  2 12:08:18 2001
-\N
-Wed May 30 03:40:30 2001
-Tue May 29 18:35:13 2001
-Sun Jun  3 13:56:51 2001
-Fri Jun  1 07:01:52 2001
-Thu May 31 10:31:06 2001
-Fri Jun  1 21:44:46 2001
-Sun Jun  3 00:22:13 2001
-Thu May 31 10:08:26 2001
-Tue May 29 10:49:29 2001
-Fri Jun  1 02:46:00 2001
-Sun Jun  3 02:08:29 2001
-Thu May 31 00:40:41 2001
-Tue May 29 20:26:38 2001
-\N
-Wed May 30 04:13:05 2001
-Tue May 29 19:42:52 2001
-Sat Jun  2 08:51:50 2001
-Fri Jun  1 00:02:55 2001
-Mon Jun  4 09:21:49 2001
-\N
-Mon May 28 20:47:42 2001
-\N
-Sun Jun  3 16:12:38 2001
-Sat Jun  2 12:12:14 2001
-Sat Jun  2 07:08:40 2001
-Sat Jun  2 17:45:38 2001
-Sun Jun  3 10:49:35 2001
-Tue May 29 01:23:15 2001
-Sat Jun  2 09:01:38 2001
-Thu May 31 15:05:25 2001
-Tue May 29 08:02:41 2001
-Thu May 31 16:03:22 2001
-Mon Jun  4 02:21:36 2001
-Thu May 31 09:09:44 2001
-Mon Jun  4 20:33:40 2001
-Fri Jun  1 19:22:33 2001
-Tue May 29 21:46:52 2001
-Tue May 29 16:17:32 2001
-Sun Jun  3 22:54:05 2001
-\N
-Sat Jun  2 17:06:31 2001
-Tue May 29 01:23:14 2001
-Fri Jun  1 00:26:49 2001
-Fri Jun  1 08:11:03 2001
-Thu May 31 23:38:11 2001
-Thu May 31 07:24:01 2001
-Mon Jun  4 09:25:23 2001
-Thu May 31 22:13:02 2001
-Sun Jun  3 11:37:32 2001
-Mon Jun  4 03:28:00 2001
-Sun Jun  3 23:43:04 2001
-Thu May 31 03:20:54 2001
-Sun Jun  3 07:29:28 2001
-Fri Jun  1 09:20:51 2001
-Fri Jun  1 03:02:32 2001
-\N
-\N
-Mon Jun  4 01:20:28 2001
-Tue May 29 17:00:15 2001
-Sun Jun  3 16:37:38 2001
-Thu May 31 15:10:35 2001
-\N
-Wed May 30 10:45:33 2001
-Tue May 29 21:35:27 2001
-Thu May 31 11:59:22 2001
-Tue May 29 19:21:17 2001
-Sat Jun  2 02:03:20 2001
-Fri Jun  1 15:22:10 2001
-Sun Jun  3 18:30:25 2001
-Thu May 31 02:06:09 2001
-Tue May 29 14:34:44 2001
-Mon Jun  4 12:25:01 2001
-Tue May 29 00:38:48 2001
-Thu May 31 18:45:03 2001
-Mon Jun  4 04:41:41 2001
-Tue May 29 04:56:23 2001
-Sat Jun  2 16:03:09 2001
-Mon Jun  4 08:55:42 2001
-Sat Jun  2 16:38:42 2001
-\N
-\N
-Sat Jun  2 00:00:34 2001
-\N
-Thu May 31 07:46:00 2001
-Fri Jun  1 08:41:21 2001
-Mon Jun  4 02:31:49 2001
-Wed May 30 03:02:20 2001
-Wed May 30 06:59:57 2001
-Thu May 31 15:19:53 2001
-Sun Jun  3 01:27:16 2001
-Sat Jun  2 01:35:23 2001
-\N
-Fri Jun  1 22:27:39 2001
-Sat Jun  2 10:17:13 2001
-Fri Jun  1 13:33:55 2001
-Wed May 30 13:03:05 2001
-Mon Jun  4 11:01:32 2001
-Tue May 29 00:05:35 2001
-Mon Jun  4 00:15:04 2001
-Sat Jun  2 12:17:20 2001
-Sat Jun  2 00:06:55 2001
-Sun Jun  3 20:44:11 2001
-\N
-\N
-Thu May 31 11:39:15 2001
-Sat Jun  2 19:38:01 2001
-Sat Jun  2 23:25:19 2001
-Thu May 31 18:59:37 2001
-Tue May 29 06:00:36 2001
-Mon Jun  4 10:49:43 2001
-Thu May 31 09:03:07 2001
-Mon Jun  4 03:44:33 2001
-Sun Jun  3 16:48:20 2001
-Sat Jun  2 05:04:30 2001
-Thu May 31 08:15:22 2001
-\N
-Mon Jun  4 13:54:06 2001
-Fri Jun  1 08:36:09 2001
-Sat Jun  2 20:22:49 2001
-Mon Jun  4 05:19:25 2001
-Fri Jun  1 10:44:30 2001
-Mon Jun  4 05:06:08 2001
-Sat Jun  2 20:19:29 2001
-Mon Jun  4 17:39:15 2001
-Fri Jun  1 04:16:56 2001
-Fri Jun  1 22:58:31 2001
-Mon Jun  4 20:09:25 2001
-Fri Jun  1 18:14:10 2001
-Sat Jun  2 08:24:33 2001
-Wed May 30 17:45:23 2001
-Sat Jun  2 22:08:54 2001
-Fri Jun  1 11:18:21 2001
-Wed May 30 17:19:04 2001
-Sat Jun  2 17:59:07 2001
-Fri Jun  1 06:34:56 2001
-Thu May 31 00:55:58 2001
-Thu May 31 00:10:09 2001
-Wed May 30 20:06:44 2001
-Sat Jun  2 08:54:43 2001
-Wed May 30 04:25:31 2001
-Sun Jun  3 12:44:50 2001
-Mon Jun  4 00:24:19 2001
-Sun Jun  3 01:54:55 2001
-Fri Jun  1 14:44:14 2001
-Thu May 31 18:06:48 2001
-Sat Jun  2 19:51:22 2001
-Tue May 29 14:51:06 2001
-Thu May 31 07:52:28 2001
-Mon Jun  4 16:15:49 2001
-Thu May 31 14:05:11 2001
-Fri Jun  1 09:37:05 2001
-Sun Jun  3 19:18:03 2001
-Thu May 31 02:47:07 2001
-Tue May 29 12:15:12 2001
-Mon Jun  4 17:54:21 2001
-Wed May 30 01:20:40 2001
-Tue May 29 20:30:46 2001
-\N
-Fri Jun  1 20:24:23 2001
-Thu May 31 14:29:57 2001
-Sun Jun  3 15:56:14 2001
-\N
-Mon Jun  4 01:08:48 2001
-Fri Jun  1 08:43:00 2001
-Sun Jun  3 02:21:13 2001
-Thu May 31 06:05:35 2001
-Wed May 30 22:01:30 2001
-Tue May 29 11:59:52 2001
-Wed May 30 08:57:11 2001
-Mon May 28 22:45:22 2001
-Fri Jun  1 19:57:26 2001
-Thu May 31 11:37:44 2001
-Wed May 30 15:14:58 2001
-Thu May 31 10:33:26 2001
-Thu May 31 22:22:31 2001
-Thu May 31 12:36:52 2001
-Mon Jun  4 01:59:08 2001
-\N
-\N
-\N
-Tue May 29 10:11:09 2001
-\N
-Tue May 29 04:12:23 2001
-Mon Jun  4 05:24:35 2001
-Sat Jun  2 12:10:15 2001
-Thu May 31 07:28:51 2001
-Tue May 29 19:39:54 2001
-Tue May 29 15:29:52 2001
-Fri Jun  1 02:54:21 2001
-Wed May 30 13:39:11 2001
-Sun Jun  3 10:13:42 2001
-Sat Jun  2 13:06:33 2001
-Wed May 30 07:39:12 2001
-\N
-Sat Jun  2 17:46:35 2001
-Tue May 29 06:50:13 2001
-Sun Jun  3 16:15:59 2001
-\N
-Wed May 30 10:58:14 2001
-Sat Jun  2 04:08:45 2001
-Fri Jun  1 08:04:00 2001
-Wed May 30 20:08:33 2001
-Wed May 30 01:04:38 2001
-Thu May 31 10:27:43 2001
-Sat Jun  2 07:40:34 2001
-Tue May 29 10:01:49 2001
-\N
-Mon Jun  4 09:52:34 2001
-Tue May 29 22:03:01 2001
-Fri Jun  1 19:54:17 2001
-Sat Jun  2 09:24:29 2001
-Thu May 31 09:31:38 2001
-\N
-Sat Jun  2 22:44:40 2001
-Thu May 31 16:58:45 2001
-Mon Jun  4 17:00:14 2001
-Sun Jun  3 22:08:04 2001
-Wed May 30 07:10:04 2001
-Fri Jun  1 02:48:34 2001
-Wed May 30 09:02:47 2001
-Sat Jun  2 17:37:10 2001
-Mon Jun  4 01:12:25 2001
-Wed May 30 11:30:45 2001
-Tue May 29 01:08:38 2001
-Sun Jun  3 18:00:32 2001
-Sat Jun  2 04:53:59 2001
-Mon Jun  4 16:01:01 2001
-\N
-Thu May 31 10:31:19 2001
-Wed May 30 19:04:01 2001
-Thu May 31 07:47:32 2001
-Wed May 30 09:14:45 2001
-Tue May 29 10:25:48 2001
-Mon May 28 21:16:26 2001
-Wed May 30 13:41:26 2001
-Sat Jun  2 05:48:37 2001
-\N
-Mon Jun  4 10:39:45 2001
-Thu May 31 21:15:25 2001
-Wed May 30 18:47:04 2001
-Sat Jun  2 18:00:19 2001
-Wed May 30 09:14:11 2001
-Tue May 29 02:50:43 2001
-Sat Jun  2 11:20:26 2001
-Fri Jun  1 20:15:58 2001
-Tue May 29 17:25:43 2001
-Wed May 30 10:26:53 2001
-Tue May 29 22:11:34 2001
-Tue May 29 21:22:11 2001
-Wed May 30 02:21:42 2001
-Sun Jun  3 11:21:58 2001
-\N
-Thu May 31 01:51:59 2001
-Fri Jun  1 09:58:13 2001
-\N
-Tue May 29 20:14:29 2001
-\N
-Sun Jun  3 08:41:19 2001
-Thu May 31 15:43:41 2001
-Mon Jun  4 03:27:28 2001
-Mon Jun  4 07:16:48 2001
-Wed May 30 09:20:24 2001
-Thu May 31 05:15:06 2001
-Wed May 30 22:46:04 2001
-Mon May 28 23:09:17 2001
-Sun Jun  3 08:02:34 2001
-Wed May 30 08:10:27 2001
-Mon Jun  4 18:43:37 2001
-Fri Jun  1 09:47:08 2001
-Thu May 31 09:03:03 2001
-Fri Jun  1 08:00:48 2001
-Wed May 30 03:35:09 2001
-Thu May 31 15:34:51 2001
-Fri Jun  1 09:25:56 2001
-Sun Jun  3 00:12:03 2001
-Sat Jun  2 03:10:27 2001
-Sun Jun  3 01:15:17 2001
-Tue May 29 00:50:57 2001
-Sat Jun  2 11:06:55 2001
-Thu May 31 15:10:57 2001
-Fri Jun  1 19:21:27 2001
-Wed May 30 04:20:23 2001
-Mon Jun  4 06:06:45 2001
-Sat Jun  2 00:26:32 2001
-Thu May 31 18:48:31 2001
-Fri Jun  1 18:06:00 2001
-Thu May 31 22:33:26 2001
-Thu May 31 03:12:30 2001
-Fri Jun  1 18:25:34 2001
-Thu May 31 22:15:49 2001
-Thu May 31 23:51:17 2001
-Fri Jun  1 16:26:23 2001
-Sun Jun  3 01:27:34 2001
-Mon Jun  4 16:41:04 2001
-Tue May 29 02:28:50 2001
-Fri Jun  1 00:04:48 2001
-Sat Jun  2 11:07:09 2001
-Sun Jun  3 19:43:03 2001
-Thu May 31 20:00:50 2001
-Fri Jun  1 04:20:25 2001
-Mon Jun  4 15:06:35 2001
-Sat Jun  2 03:59:59 2001
-\N
-Fri Jun  1 15:57:05 2001
-\N
-Mon Jun  4 19:09:34 2001
-Sat Jun  2 09:13:53 2001
-Mon Jun  4 10:49:00 2001
-Thu May 31 17:35:02 2001
-Mon May 28 21:33:09 2001
-Sat Jun  2 23:57:28 2001
-Tue May 29 03:02:15 2001
-Thu May 31 13:51:11 2001
-Wed May 30 00:39:37 2001
-Wed May 30 20:21:00 2001
-\N
-Wed May 30 08:31:34 2001
-Tue May 29 22:23:46 2001
-Mon Jun  4 13:34:50 2001
-Tue May 29 22:44:31 2001
-Sun Jun  3 01:03:16 2001
-Sat Jun  2 03:35:51 2001
-Thu May 31 21:35:27 2001
-Thu May 31 05:51:43 2001
-Sun Jun  3 23:45:46 2001
-Tue May 29 23:43:03 2001
-Sun Jun  3 08:38:33 2001
-Thu May 31 02:42:18 2001
-Mon Jun  4 00:11:42 2001
-Sun Jun  3 11:45:05 2001
-Sat Jun  2 16:45:14 2001
-\N
-Mon Jun  4 14:57:51 2001
-Tue May 29 12:45:16 2001
-Wed May 30 18:55:42 2001
-Sat Jun  2 15:32:50 2001
-Sat Jun  2 18:05:21 2001
-Sat Jun  2 11:17:04 2001
-Tue May 29 17:55:19 2001
-Sat Jun  2 11:01:19 2001
-Sat Jun  2 14:25:20 2001
-Sun Jun  3 06:04:47 2001
-Mon Jun  4 07:17:11 2001
-Sun Jun  3 18:30:47 2001
-Mon Jun  4 17:43:58 2001
-Sat Jun  2 14:50:46 2001
-Wed May 30 05:12:48 2001
-Tue May 29 03:19:28 2001
-\N
-Tue May 29 23:52:10 2001
-Wed May 30 20:53:02 2001
-Wed May 30 21:57:59 2001
-Sun Jun  3 13:54:02 2001
-\N
-Wed May 30 07:36:16 2001
-Wed May 30 05:23:34 2001
-Tue May 29 15:11:32 2001
-Fri Jun  1 10:34:11 2001
-Sat Jun  2 19:20:29 2001
-Mon May 28 23:29:37 2001
-Tue May 29 05:16:03 2001
-Sun Jun  3 18:30:00 2001
-\N
-\N
-Sat Jun  2 23:55:01 2001
-\N
-\N
-Fri Jun  1 22:02:29 2001
-Mon Jun  4 18:36:37 2001
-Fri Jun  1 22:30:27 2001
-Thu May 31 08:35:03 2001
-Tue May 29 23:17:47 2001
-Wed May 30 10:38:34 2001
-Wed May 30 17:38:03 2001
-Tue May 29 20:11:39 2001
-Thu May 31 01:02:00 2001
-Fri Jun  1 00:18:08 2001
-Wed May 30 16:43:19 2001
-Sun Jun  3 06:24:18 2001
-Wed May 30 01:43:00 2001
-Sun Jun  3 18:18:07 2001
-Sat Jun  2 23:46:58 2001
-Sat Jun  2 15:39:12 2001
-Mon May 28 23:32:18 2001
-Fri Jun  1 05:14:51 2001
-Tue May 29 11:56:47 2001
-Tue May 29 08:16:59 2001
-Sat Jun  2 05:26:56 2001
-Fri Jun  1 03:55:01 2001
-Wed May 30 00:59:31 2001
-Thu May 31 05:19:37 2001
-Wed May 30 17:11:22 2001
-\N
-Fri Jun  1 06:44:57 2001
-Tue May 29 00:12:11 2001
-Wed May 30 08:40:02 2001
-Sat Jun  2 13:18:32 2001
-Tue May 29 05:29:48 2001
-Tue May 29 04:57:40 2001
-Thu May 31 18:15:39 2001
-Thu May 31 15:54:26 2001
-Sat Jun  2 15:26:32 2001
-Fri Jun  1 01:50:55 2001
-\N
-\N
-Wed May 30 06:09:02 2001
-Sun Jun  3 08:33:33 2001
-Thu May 31 18:37:41 2001
-Sun Jun  3 03:45:31 2001
-Wed May 30 05:39:36 2001
-Tue May 29 13:26:37 2001
-Sun Jun  3 08:52:50 2001
-Wed May 30 05:31:07 2001
-Mon Jun  4 05:42:06 2001
-\N
-Thu May 31 11:08:02 2001
-Mon Jun  4 11:43:38 2001
-Mon Jun  4 16:57:34 2001
-Sun Jun  3 02:27:59 2001
-Sun Jun  3 06:17:20 2001
-Mon Jun  4 16:28:26 2001
-Wed May 30 01:10:30 2001
-Sat Jun  2 20:29:35 2001
-Tue May 29 01:41:22 2001
-Tue May 29 18:25:46 2001
-Tue May 29 23:20:17 2001
-Mon Jun  4 06:25:51 2001
-Sun Jun  3 10:51:58 2001
-Fri Jun  1 04:58:46 2001
-Wed May 30 14:42:19 2001
-\N
-Thu May 31 17:27:52 2001
-Thu May 31 22:57:20 2001
-Wed May 30 10:29:59 2001
-Sun Jun  3 16:35:53 2001
-Sat Jun  2 16:59:23 2001
-Wed May 30 05:11:44 2001
-Fri Jun  1 13:47:01 2001
-Mon Jun  4 11:46:01 2001
-Mon Jun  4 02:59:47 2001
-\N
-Thu May 31 22:14:50 2001
-\N
-Sun Jun  3 12:32:00 2001
-Tue May 29 12:40:55 2001
-Thu May 31 15:03:50 2001
-Thu May 31 10:52:21 2001
-Fri Jun  1 21:57:09 2001
-Sun Jun  3 01:46:18 2001
-Sat Jun  2 22:09:17 2001
-Sat Jun  2 10:02:36 2001
-Fri Jun  1 19:22:54 2001
-Wed May 30 22:10:36 2001
-Sun Jun  3 12:51:15 2001
-Thu May 31 22:15:01 2001
-Sun Jun  3 12:53:11 2001
-Mon Jun  4 12:38:50 2001
-Sun Jun  3 12:32:48 2001
-Mon Jun  4 06:58:26 2001
-Sun Jun  3 16:38:46 2001
-Fri Jun  1 18:25:56 2001
-Sun Jun  3 01:18:29 2001
-Sun Jun  3 06:53:41 2001
-Fri Jun  1 01:21:40 2001
-Fri Jun  1 23:55:58 2001
-Mon Jun  4 06:48:52 2001
-Wed May 30 15:02:56 2001
-Sun Jun  3 09:39:30 2001
-Wed May 30 22:21:37 2001
-Fri Jun  1 02:14:43 2001
-Thu May 31 06:59:11 2001
-Thu May 31 04:29:50 2001
-Mon Jun  4 10:23:29 2001
-Mon Jun  4 17:11:31 2001
-\N
-Sun Jun  3 11:03:19 2001
-Fri Jun  1 09:44:07 2001
diff --git a/contrib/btree_gist/expected/btree_gist.out b/contrib/btree_gist/expected/btree_gist.out
deleted file mode 100644
index 2c7cbd620e..0000000000
--- a/contrib/btree_gist/expected/btree_gist.out
+++ /dev/null
@@ -1,39 +0,0 @@
---
--- first, define the datatype.  Turn off echoing so that expected file
--- does not depend on contents of seg.sql.
---
-\set ECHO none
-create table inttmp (b int4);
-\copy inttmp from 'data/test_btree.data'
-create table tstmp ( t timestamp without time zone );
-\copy tstmp from 'data/test_btree_ts.data'
--- without idx
-select count(*) from inttmp where b <=10;
- count 
--------
-    11
-(1 row)
-
-select count(*) from tstmp where t < '2001-05-29 08:33:09';
- count 
--------
-    66
-(1 row)
-
--- create idx
-create index aaaidx on inttmp using gist ( b );
-create index tsidx on tstmp using gist ( t );
---with idx
-set enable_seqscan=off;
-select count(*) from inttmp where b <=10;
- count 
--------
-    11
-(1 row)
-
-select count(*) from tstmp where t < '2001-05-29 08:33:09';
- count 
--------
-    66
-(1 row)
-
diff --git a/contrib/btree_gist/sql/btree_gist.sql b/contrib/btree_gist/sql/btree_gist.sql
deleted file mode 100644
index 31c778b747..0000000000
--- a/contrib/btree_gist/sql/btree_gist.sql
+++ /dev/null
@@ -1,36 +0,0 @@
---
--- first, define the datatype.  Turn off echoing so that expected file
--- does not depend on contents of seg.sql.
---
-\set ECHO none
-\i btree_gist.sql
-\set ECHO all
-
-create table inttmp (b int4);
-
-\copy inttmp from 'data/test_btree.data'
-
-create table tstmp ( t timestamp without time zone );
-
-\copy tstmp from 'data/test_btree_ts.data'
-
--- without idx
-
-select count(*) from inttmp where b <=10;
-
-select count(*) from tstmp where t < '2001-05-29 08:33:09';
-
--- create idx
-
-create index aaaidx on inttmp using gist ( b );
-
-create index tsidx on tstmp using gist ( t );
-
---with idx
-
-set enable_seqscan=off;
-
-select count(*) from inttmp where b <=10;
-
-select count(*) from tstmp where t < '2001-05-29 08:33:09';
-
diff --git a/contrib/chkpass/Makefile b/contrib/chkpass/Makefile
deleted file mode 100644
index afa9ee46fa..0000000000
--- a/contrib/chkpass/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/chkpass/Makefile,v 1.3 2001/09/06 10:49:29 petere Exp $
-
-subdir = contrib/chkpass
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-MODULES = chkpass
-DATA_built = chkpass.sql
-DOCS = README.chkpass
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/chkpass/README.chkpass b/contrib/chkpass/README.chkpass
deleted file mode 100644
index 41b0dea99f..0000000000
--- a/contrib/chkpass/README.chkpass
+++ /dev/null
@@ -1,22 +0,0 @@
-$Header: /cvsroot/pgsql/contrib/chkpass/Attic/README.chkpass,v 1.1 2001/05/03 12:32:13 darcy Exp $
-
-Chkpass is a password type that is automatically checked and converted upon
-entry.  It is stored encrypted.  To compare, simply compare agains a clear
-text password and the comparison function will encrypt it before comparing.
-It also returns an error if the code determines that the password is easily
-crackable.  This is currently a stub that does nothing.
-
-I haven't worried about making this type indexable.  I doubt that anyone
-would ever need to sort a file in order of encrypted password.
-
-If you precede the string with a colon, the encryption and checking are
-skipped so that you can enter existing passwords into the field.
-
-On output, a colon is prepended.  This makes it possible to dump and reload
-passwords without re-encrypting them.  If you want the password (encrypted)
-without the colon then use the raw() function.  This allows you to use the
-type with things like Apache's Auth_PostgreSQL module.
-
-D'Arcy J.M. Cain
-darcy@druid.net
-
diff --git a/contrib/chkpass/chkpass.c b/contrib/chkpass/chkpass.c
deleted file mode 100644
index b2e041f5ba..0000000000
--- a/contrib/chkpass/chkpass.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * PostgreSQL type definitions for chkpass
- * Written by D'Arcy J.M. Cain
- * darcy@druid.net
- * http://www.druid.net/darcy/
- *
- * $Id: chkpass.c,v 1.7 2001/12/19 18:49:24 petere Exp $
- * best viewed with tabs set to 4
- */
-
-#include "postgres.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-#ifdef HAVE_CRYPT_H
-#include <crypt.h>
-#endif
-
-#include "fmgr.h"
-
-/*
- * This type encrypts it's input unless the first character is a colon.
- * The output is the encrypted form with a leading colon.  The output
- * format is designed to allow dump and reload operations to work as
- * expected without doing special tricks.
- */
-
-
-/*
- * This is the internal storage format for CHKPASSs.
- * 15 is all I need but add a little buffer
- */
-
-typedef struct chkpass
-{
-	char		password[16];
-}	chkpass;
-
-/*
- * Various forward declarations:
- */
-
-Datum		chkpass_in(PG_FUNCTION_ARGS);
-Datum		chkpass_out(PG_FUNCTION_ARGS);
-Datum		chkpass_rout(PG_FUNCTION_ARGS);
-
-/* Only equal or not equal make sense */
-Datum		chkpass_eq(PG_FUNCTION_ARGS);
-Datum		chkpass_ne(PG_FUNCTION_ARGS);
-
-
-/* This function checks that the password is a good one
- * It's just a placeholder for now */
-static int
-verify_pass(const char *str)
-{
-	return 0;
-}
-
-/*
- * CHKPASS reader.
- */
-PG_FUNCTION_INFO_V1(chkpass_in)
-Datum
-chkpass_in(PG_FUNCTION_ARGS)
-{
-	char	   *str = PG_GETARG_CSTRING(0);
-	chkpass    *result;
-	char		mysalt[4];
-	static bool random_initialized = false;
-	static char salt_chars[] =
-	"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-	/* special case to let us enter encrypted passwords */
-	if (*str == ':')
-	{
-		result = (chkpass *) palloc(sizeof(chkpass));
-		strncpy(result->password, str + 1, 13);
-		result->password[13] = 0;
-		PG_RETURN_POINTER(result);
-	}
-
-	if (verify_pass(str) != 0)
-	{
-		elog(ERROR, "chkpass_in: purported CHKPASS \"%s\" is a weak password",
-			 str);
-		PG_RETURN_POINTER(NULL);
-	}
-
-	result = (chkpass *) palloc(sizeof(chkpass));
-
-	if (!random_initialized)
-	{
-		srandom((unsigned int) time(NULL));
-		random_initialized = true;
-	}
-
-	mysalt[0] = salt_chars[random() & 0x3f];
-	mysalt[1] = salt_chars[random() & 0x3f];
-	mysalt[2] = 0;				/* technically the terminator is not
-								 * necessary but I like to play safe */
-	strcpy(result->password, crypt(str, mysalt));
-	PG_RETURN_POINTER(result);
-}
-
-/*
- * CHKPASS output function.
- * Just like any string but we know it is max 15 (13 plus colon and terminator.)
- */
-
-PG_FUNCTION_INFO_V1(chkpass_out)
-Datum
-chkpass_out(PG_FUNCTION_ARGS)
-{
-	chkpass    *password = (chkpass *) PG_GETARG_POINTER(0);
-	char	   *result;
-
-	if (password == NULL)
-		PG_RETURN_POINTER(NULL);
-
-	if ((result = (char *) palloc(16)) != NULL)
-	{
-		result[0] = ':';
-		strcpy(result + 1, password->password);
-	}
-
-	PG_RETURN_CSTRING(result);
-}
-
-
-/*
- * special output function that doesn't output the colon
- */
-
-PG_FUNCTION_INFO_V1(chkpass_rout)
-Datum
-chkpass_rout(PG_FUNCTION_ARGS)
-{
-	chkpass    *password = (chkpass *) PG_GETARG_POINTER(0);
-	text	   *result = NULL;
-
-	if (password == NULL)
-		PG_RETURN_POINTER(NULL);
-
-	if ((result = (text *) palloc(VARHDRSZ + 16)) != NULL)
-	{
-		result->vl_len = VARHDRSZ + strlen(password->password);
-		memcpy(result->vl_dat, password->password, strlen(password->password));
-	}
-
-	PG_RETURN_CSTRING(result);
-}
-
-
-/*
- * Boolean tests
- */
-
-PG_FUNCTION_INFO_V1(chkpass_eq)
-Datum
-chkpass_eq(PG_FUNCTION_ARGS)
-{
-	chkpass    *a1 = (chkpass *) PG_GETARG_POINTER(0);
-	text	   *a2 = (text *) PG_GETARG_TEXT_P(1);
-	char		str[10];
-	int			sz = 8;
-
-	if (!a1 || !a2)
-		PG_RETURN_BOOL(0);
-
-	if (a2->vl_len < 12)
-		sz = a2->vl_len - 4;
-	strncpy(str, a2->vl_dat, sz);
-	str[sz] = 0;
-	PG_RETURN_BOOL(strcmp(a1->password, crypt(str, a1->password)) == 0);
-}
-
-PG_FUNCTION_INFO_V1(chkpass_ne)
-Datum
-chkpass_ne(PG_FUNCTION_ARGS)
-{
-	chkpass    *a1 = (chkpass *) PG_GETARG_POINTER(0);
-	text	   *a2 = (text *) PG_GETARG_TEXT_P(1);
-	char		str[10];
-	int			sz = 8;
-
-	if (!a1 || !a2)
-		PG_RETURN_BOOL(0);
-	if (a2->vl_len < 12)
-		sz = a2->vl_len - 4;
-	strncpy(str, a2->vl_dat, sz);
-	str[sz] = 0;
-	PG_RETURN_BOOL(strcmp(a1->password, crypt(str, a1->password)) != 0);
-}
diff --git a/contrib/chkpass/chkpass.sql.in b/contrib/chkpass/chkpass.sql.in
deleted file mode 100644
index 72ad5e559c..0000000000
--- a/contrib/chkpass/chkpass.sql.in
+++ /dev/null
@@ -1,78 +0,0 @@
---
---	PostgreSQL code for CHKPASS.
---  Written by D'Arcy J.M. Cain
---  darcy@druid.net
---  http://www.druid.net/darcy/
--- 
---  $Header: /cvsroot/pgsql/contrib/chkpass/chkpass.sql.in,v 1.1 2001/08/23 16:50:33 tgl Exp $
---
---  best viewed with tabs set to 4
---
-
---
---	Input and output functions and the type itself:
---
-
-create function chkpass_in(opaque)
-	returns opaque
-	as 'MODULE_PATHNAME'
-	language 'c';
-
-create function chkpass_out(opaque)
-	returns opaque
-	as 'MODULE_PATHNAME'
-	language 'c';
-
-create type chkpass (
-	internallength = 16,
-	externallength = 13,
-	input = chkpass_in,
-	output = chkpass_out
-);
-
-create function raw(chkpass)
-	returns text
-	as 'MODULE_PATHNAME', 'chkpass_rout'
-	language 'c';
-
---
---	The various boolean tests:
---
-
-create function eq(chkpass, text)
-	returns bool
-	as 'MODULE_PATHNAME', 'chkpass_eq'
-	language 'c';
-
-create function ne(chkpass, text)
-	returns bool
-	as 'MODULE_PATHNAME', 'chkpass_ne'
-	language 'c';
-
---
---	Now the operators.  Note how some of the parameters to some
---	of the 'create operator' commands are commented out.  This
---	is because they reference as yet undefined operators, and
---	will be implicitly defined when those are, further down.
---
-
-create operator = (
-	leftarg = chkpass,
-	rightarg = text,
-	commutator = =,
---	negator = <>,
-	procedure = eq
-);
-
-create operator <> (
-	leftarg = chkpass,
-	rightarg = text,
-	negator = =,
-	procedure = ne
-);
-
-COMMENT ON TYPE chkpass IS 'password type with checks';
-
---
---	eof
---
diff --git a/contrib/contrib-global.mk b/contrib/contrib-global.mk
deleted file mode 100644
index 415cc273e7..0000000000
--- a/contrib/contrib-global.mk
+++ /dev/null
@@ -1,202 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/contrib-global.mk,v 1.2 2001/09/16 16:11:08 petere Exp $
-
-# This file contains generic rules to build many kinds of simple
-# contrib modules.  You only need to set a few variables and include
-# this file, the rest will be done here.
-#
-# Use the following layout for your Makefile:
-#
-#   subdir = contrib/xxx
-#   top_builddir = ../..
-#   include $(top_builddir)/src/Makefile.global
-#
-#   [variable assignments, see below]
-#   [custom rules, rarely necessary]
-#
-#   include $(top_srcdir)/contrib/contrib-global.mk
-#
-# The following variables can be set:
-#
-#   MODULES -- list of shared objects to be build from source file with
-#     same stem (do not include suffix in this list)
-#   DATA -- random files to install into $PREFIX/share/contrib
-#   DATA_built -- random files to install into $PREFIX/share/contrib,
-#     which need to be built first
-#   DOCS -- random files to install under $PREFIX/doc/contrib
-#   SCRIPTS -- script files (not binaries) to install into $PREFIX/bin
-#   REGRESS -- list of regression test cases (without suffix)
-#
-# or at most one of these two:
-#
-#   PROGRAM -- a binary program to build (list objects files in OBJS)
-#   MODULE_big -- a shared object to build (list object files in OBJS)
-#
-# The following can also be set:
-#
-#   EXTRA_CLEAN -- extra files to remove in 'make clean'
-#   PG_CPPFLAGS -- will be added to CPPFLAGS
-#   PG_LIBS -- will be added to PROGRAM link line
-#   SHLIB_LINK -- will be added to MODULE_big link line
-#
-# Better look at some of the existing uses for examples...
-
-
-override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
-
-ifdef MODULES
-override CFLAGS += $(CFLAGS_SL)
-override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
-endif
-
-ifdef PG_CPPFLAGS
-override CPPFLAGS := $(PG_CPPFLAGS) $(CPPFLAGS)
-endif
-
-all: $(PROGRAM) $(DATA_built) $(addsuffix $(DLSUFFIX), $(MODULES))
-
-ifdef MODULE_big
-# shared library parameters
-NAME = $(MODULE_big)
-SO_MAJOR_VERSION= 0
-SO_MINOR_VERSION= 0
-rpath =
-
-override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
-
-include $(top_srcdir)/src/Makefile.shlib
-
-all: all-lib
-endif # MODULE_big
-
-
-install: all installdirs
-ifneq (,$(DATA)$(DATA_built))
-	@for file in $(addprefix $(srcdir)/, $(DATA)) $(DATA_built); do \
-	  echo "$(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/contrib"; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/contrib; \
-	done
-endif # DATA
-ifdef MODULES
-	@for file in $(addsuffix $(DLSUFFIX), $(MODULES)); do \
-	  echo "$(INSTALL_SHLIB) $$file $(DESTDIR)$(pkglibdir)"; \
-	  $(INSTALL_SHLIB) $$file $(DESTDIR)$(pkglibdir); \
-	done
-endif # MODULES
-ifdef DOCS
-	@for file in $(addprefix $(srcdir)/, $(DOCS)); do \
-	  echo "$(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/contrib"; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/contrib; \
-	done
-endif # DOCS
-ifdef PROGRAM
-	$(INSTALL_PROGRAM) $(PROGRAM)$(X) $(DESTDIR)$(bindir)
-endif # PROGRAM
-ifdef MODULE_big
-	$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/$(MODULE_big)$(DLSUFFIX)
-endif # MODULE_big
-ifdef SCRIPTS
-	@for file in $(addprefix $(srcdir)/, $(SCRIPTS)); do \
-	  echo "$(INSTALL_SCRIPT) $$file $(DESTDIR)$(bindir)"; \
-	  $(INSTALL_SCRIPT) $$file $(DESTDIR)$(bindir); \
-	done
-endif # SCRIPTS
-
-
-installdirs:
-ifneq (,$(DATA)$(DATA_built))
-	$(mkinstalldirs) $(DESTDIR)$(datadir)/contrib
-endif
-ifneq (,$(MODULES)$(MODULE_big))
-	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-endif
-ifdef DOCS
-	$(mkinstalldirs) $(DESTDIR)$(docdir)/contrib
-endif
-ifneq (,$(PROGRAM)$(SCRIPTS))
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-endif
-
-
-uninstall:
-ifneq (,$(DATA)$(DATA_built))
-	rm -f $(addprefix $(DESTDIR)$(datadir)/contrib/, $(DATA) $(DATA_built))
-endif
-ifdef MODULES
-	rm -f $(addprefix $(DESTDIR)$(pkglibdir)/, $(addsuffix $(DLSUFFIX), $(MODULES)))
-endif
-ifdef DOCS
-	rm -f $(addprefix $(DESTDIR)$(docdir)/contrib/, $(DOCS))
-endif
-ifdef PROGRAM
-	rm -f $(DESTDIR)$(bindir)/$(PROGRAM)$(X)
-endif
-ifdef MODULE_big
-	rm -f $(DESTDIR)$(pkglibdir)/$(MODULE_big)$(DLSUFFIX)
-endif
-ifdef SCRIPTS
-	rm -f $(addprefix $(DESTDIR)$(bindir)/, $(SCRIPTS))
-endif
-
-
-clean:
-ifdef MODULES
-	rm -f $(addsuffix $(DLSUFFIX), $(MODULES)) $(addsuffix .o, $(MODULES))
-endif
-ifdef DATA_built
-	rm -f $(DATA_built)
-endif
-ifdef PROGRAM
-	rm -f $(PROGRAM)$(X)
-endif
-ifdef OBJS
-	rm -f $(OBJS)
-endif
-ifdef EXTRA_CLEAN
-	rm -f $(EXTRA_CLEAN)
-endif
-ifdef REGRESS
-# things created by various check targets
-	rm -rf results tmp_check log
-	rm -f regression.diffs regression.out regress.out run_check.out
-ifeq ($(PORTNAME), win)
-	rm -f regress.def
-endif
-endif # REGRESS
-
-ifdef MODULE_big
-clean: clean-lib
-endif
-
-distclean maintainer-clean: clean
-
-
-ifdef REGRESS
-.PHONY: submake
-submake:
-	$(MAKE) -C $(top_builddir)/src/test/regress pg_regress
-
-# against installed postmaster
-installcheck: submake
-	$(top_builddir)/src/test/regress/pg_regress $(REGRESS)
-
-# in-tree test doesn't work yet (no way to install my shared library)
-#check: all submake
-#	$(top_builddir)/src/test/regress/pg_regress --temp-install \
-#	  --top-builddir=$(top_builddir) $(REGRESS)
-check:
-	@echo "'make check' is not supported."
-	@echo "Do 'make install', then 'make installcheck' instead."
-endif # REGRESS
-
-
-# STANDARD RULES
-
-ifneq (,$(MODULES)$(MODULE_big))
-%.sql: %.sql.in
-	sed 's,MODULE_PATHNAME,$$libdir/$*,g' $< >$@
-endif
-
-ifdef PROGRAM
-$(PROGRAM): $(OBJS)
-	$(CC) $(CFLAGS) $(OBJS) $(PG_LIBS) $(LDFLAGS) $(LIBS) -o $@
-endif
diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile
deleted file mode 100644
index 1bf47b90e9..0000000000
--- a/contrib/cube/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/cube/Makefile,v 1.6 2001/11/16 16:32:33 petere Exp $
-
-subdir = contrib/cube
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-MODULE_big = cube
-OBJS= cube.o cubeparse.o cubescan.o buffer.o
-
-DATA_built = cube.sql
-DOCS = README.cube
-REGRESS = cube
-
-
-cubeparse.c: cubeparse.h ;
-
-cubeparse.h: cubeparse.y
-ifdef YACC
-	$(YACC) -d $(YFLAGS) -p cube_yy $<
-	mv -f y.tab.c cubeparse.c
-	mv -f y.tab.h cubeparse.h
-else
-	@$(missing) bison $< $@
-endif
-
-cubescan.c: cubescan.l
-ifdef FLEX
-	$(FLEX) $(FLEXFLAGS) -Pcube_yy -o'$@' $<
-else
-	@$(missing) flex $< $@
-endif
-
-EXTRA_CLEAN = cubeparse.c cubeparse.h cubescan.c y.tab.c y.tab.h
-
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/cube/README.cube b/contrib/cube/README.cube
deleted file mode 100644
index cba90f6744..0000000000
--- a/contrib/cube/README.cube
+++ /dev/null
@@ -1,289 +0,0 @@
-This directory contains the code for the user-defined type,
-CUBE, representing multidimensional cubes.
-
-
-FILES
------
-
-Makefile		building instructions for the shared library
-
-README.cube		the file you are now reading
-
-buffer.c		globals and buffer access utilities shared between 
-			the parser (cubeparse.y) and the scanner (cubescan.l)
-
-buffer.h		function prototypes for buffer.c
-
-cube.c			the implementation of this data type in c
-
-cube.sql.in		SQL code needed to register this type with postgres
-                        (transformed to cube.sql by make)
-               
-cubedata.h		the data structure used to store the cubes
-
-cubeparse.y		the grammar file for the parser (used by cube_in() in cube.c)
- 
-cubescan.l		scanner rules (used by cube_yyparse() in cubeparse.y)
-
-
-INSTALLATION
-============
-
-To install the type, run
-
-	make
-	make install
-
-For this to work, make sure that:
-
-. the cube source directory is in the postgres contrib directory
-. the user running "make install" has postgres administrative authority
-. this user's environment defines the PGLIB and PGDATA variables and has
-  postgres binaries in the PATH.
-
-This only installs the type implementation and documentation.  To make the
-type available in any particular database, do
-
-	psql -d databasename < cube.sql
-
-If you install the type in the template1 database, all subsequently created
-databases will inherit it.
-
-To test the new type, after "make install" do
-
-	make installcheck
-
-If it fails, examine the file regression.diffs to find out the reason (the
-test code is a direct adaptation of the regression tests from the main
-source tree).
-
-
-SYNTAX
-======
-
-The following are valid external representations for the CUBE type:
-
-'x'			A floating point value representing
-			a one-dimensional point or one-dimensional
-			zero length cubement
-
-'(x)'			Same as above
-
-'x1,x2,x3,...,xn'	A point in n-dimensional space,
-			represented internally as a zero volume box
-
-'(x1,x2,x3,...,xn)'	Same as above
-
-'(x),(y)'		1-D cubement starting at x and ending at y
-			or vice versa; the order does not matter
-
-'(x1,...,xn),(y1,...,yn)'	n-dimensional box represented by 
-			a pair of its opposite corners, no matter which.
-			Functions take care of swapping to achieve
-			"lower left -- upper right" representation
-			before computing any values
-
-Grammar
--------
-
-rule 1    box -> O_BRACKET paren_list COMMA paren_list C_BRACKET
-rule 2    box -> paren_list COMMA paren_list
-rule 3    box -> paren_list
-rule 4    box -> list
-rule 5    paren_list -> O_PAREN list C_PAREN
-rule 6    list -> FLOAT
-rule 7    list -> list COMMA FLOAT
-
-Tokens
-------
-
-n		[0-9]+
-integer		[+-]?{n}
-real		[+-]?({n}\.{n}?)|(\.{n})
-FLOAT		({integer}|{real})([eE]{integer})?
-O_BRACKET	\[
-C_BRACKET	\]
-O_PAREN		\(
-C_PAREN		\)
-COMMA		\,
-
-
-Examples of valid CUBE representations:
---------------------------------------
-
-'x'				A floating point value representing
-				a one-dimensional point (or, zero-length
-				one-dimensional interval)
-
-'(x)'				Same as above
-
-'x1,x2,x3,...,xn'		A point in n-dimensional space,
-				represented internally as a zero volume cube
-
-'(x1,x2,x3,...,xn)'		Same as above
-
-'(x),(y)'			A 1-D interval starting at x and ending at y
-				or vice versa; the order does not matter
-
-'[(x),(y)]'			Same as above
-
-'(x1,...,xn),(y1,...,yn)'	An n-dimensional box represented by 
-				a pair of its diagonally opposite corners, 
-				regardless of order. Swapping is provided
-				by all comarison routines to ensure the 
-				"lower left -- upper right" representation
-				before actaul comparison takes place.
-
-'[(x1,...,xn),(y1,...,yn)]'	Same as above
-
-
-White space is ignored, so '[(x),(y)]' can be: '[ ( x ), ( y ) ]'
-
-
-DEFAULTS
-========
-
-I believe this union:
-
-select cube_union('(0,5,2),(2,3,1)','0'); 
-cube_union        
--------------------
-(0, 0, 0),(2, 5, 2)
-(1 row)
-
-does not contradict to the common sense, neither does the intersection
-
-select cube_inter('(0,-1),(1,1)','(-2),(2)');
-cube_inter  
--------------
-(0, 0),(1, 0)
-(1 row)
-
-In all binary operations on differently sized boxes, I assume the smaller
-one to be a cartesian projection, i. e., having zeroes in place of coordinates
-omitted in the string representation. The above examples are equivalent to:
-
-cube_union('(0,5,2),(2,3,1)','(0,0,0),(0,0,0)'); 
-cube_inter('(0,-1),(1,1)','(-2,0),(2,0)');
-
-
-The following containment predicate uses the point syntax,
-while in fact the second argument is internally represented by a box.
-This syntax makes it unnecessary to define the special Point type
-and functions for (box,point) predicates.
-
-select cube_contains('(0,0),(1,1)', '0.5,0.5');
-cube_contains
---------------
-t             
-(1 row)
-
-
-PRECISION
-=========
-
-Values are stored internally as 32-bit floating point numbers. This means that
-numbers with more than 7 significant digits will be truncated.
-
-
-USAGE
-=====
-
-The access method for CUBE is a GiST (gist_cube_ops), which is a
-generalization of R-tree. GiSTs allow the postgres implementation of
-R-tree, originally encoded to support 2-D geometric types such as
-boxes and polygons, to be used with any data type whose data domain
-can be partitioned using the concepts of containment, intersection and
-equality. In other words, everything that can intersect or contain
-its own kind can be indexed with a GiST. That includes, among other
-things, all geometric data types, regardless of their dimensionality
-(see also contrib/seg).
-
-The operators supported by the GiST access method include:
-
-
-[a, b] << [c, d]	Is left of
-
-	The left operand, [a, b], occurs entirely to the left of the
-	right operand, [c, d], on the axis (-inf, inf). It means,
-	[a, b] << [c, d] is true if b < c and false otherwise
-
-[a, b] >> [c, d]	Is right of
-
-	[a, b] is occurs entirely to the right of [c, d]. 
-	[a, b] >> [c, d] is true if b > c and false otherwise
-
-[a, b] &< [c, d]	Over left
-
-	The cubement [a, b] overlaps the cubement [c, d] in such a way
-	that a <= c <= b and b <= d
-
-[a, b] &> [c, d]	Over right
-
-	The cubement [a, b] overlaps the cubement [c, d] in such a way
-	that a > c and b <= c <= d
-
-[a, b] = [c, d]		Same as
-
-	The cubements [a, b] and [c, d] are identical, that is, a == b
-	and c == d
-
-[a, b] @ [c, d]		Contains
-
-	The cubement [a, b] contains the cubement [c, d], that is, 
-	a <= c and b >= d
-
-[a, b] @ [c, d]		Contained in
-
-	The cubement [a, b] is contained in [c, d], that is, 
-	a >= c and b <= d
-
-Although the mnemonics of the following operators is questionable, I
-preserved them to maintain visual consistency with other geometric
-data types defined in Postgres.
-
-Other operators:
-
-[a, b] < [c, d]		Less than
-[a, b] > [c, d]		Greater than
-
-	These operators do not make a lot of sense for any practical
-	purpose but sorting. These operators first compare (a) to (c),
-	and if these are equal, compare (b) to (d). That accounts for
-	reasonably good sorting in most cases, which is useful if
-	you want to use ORDER BY with this type
-
-There are a few other potentially useful functions defined in cube.c 
-that vanished from the schema because I stopped using them. Some of 
-these were meant to support type casting. Let me know if I was wrong: 
-I will then add them back to the schema. I would also appreciate 
-other ideas that would enhance the type and make it more useful.
-
-For examples of usage, see sql/cube.sql
-
-
-CREDITS
-=======
-
-This code is essentially based on the example written for
-Illustra, http://garcia.me.berkeley.edu/~adong/rtree
-
-My thanks are primarily to Prof. Joe Hellerstein
-(http://db.cs.berkeley.edu/~jmh/) for elucidating the gist of the GiST
-(http://gist.cs.berkeley.edu/), and to his former student, Andy Dong
-(http://best.me.berkeley.edu/~adong/), for his exemplar.
-I am also grateful to all postgres developers, present and past, for enabling
-myself to create my own world and live undisturbed in it. And I would like to
-acknowledge my gratitude to Argonne Lab and to the U.S. Department of Energy
-for the years of faithful support of my database research.
-
-------------------------------------------------------------------------
-Gene Selkov, Jr.
-Computational Scientist
-Mathematics and Computer Science Division
-Argonne National Laboratory
-9700 S Cass Ave.
-Building 221
-Argonne, IL 60439-4844
-
-selkovjr@mcs.anl.gov
diff --git a/contrib/cube/buffer.c b/contrib/cube/buffer.c
deleted file mode 100644
index bab7ae303c..0000000000
--- a/contrib/cube/buffer.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* This module defines the parse buffer and routines for setting/reading it */
-
-#include "postgres.h"
-
-#include "utils/elog.h"
-
-static char *PARSE_BUFFER;
-static char *PARSE_BUFFER_PTR;
-static unsigned int PARSE_BUFFER_SIZE;
-static unsigned int SCANNER_POS;
-
-void		set_parse_buffer(char *s);
-void		reset_parse_buffer(void);
-int			read_parse_buffer(void);
-char	   *parse_buffer(void);
-char	   *parse_buffer_ptr(void);
-unsigned int parse_buffer_curr_char(void);
-unsigned int parse_buffer_size(void);
-unsigned int parse_buffer_pos(void);
-
-extern void cube_flush_scanner_buffer(void);	/* defined in cubescan.l */
-
-void
-set_parse_buffer(char *s)
-{
-	PARSE_BUFFER = s;
-	PARSE_BUFFER_SIZE = strlen(s);
-	if (PARSE_BUFFER_SIZE == 0)
-		elog(ERROR, "cube_in: can't parse an empty string");
-	PARSE_BUFFER_PTR = PARSE_BUFFER;
-	SCANNER_POS = 0;
-}
-
-void
-reset_parse_buffer(void)
-{
-	PARSE_BUFFER_PTR = PARSE_BUFFER;
-	SCANNER_POS = 0;
-	cube_flush_scanner_buffer();
-}
-
-int
-read_parse_buffer(void)
-{
-	int			c;
-
-	/*
-	 * c = *PARSE_BUFFER_PTR++; SCANNER_POS++;
-	 */
-	c = PARSE_BUFFER[SCANNER_POS];
-	if (SCANNER_POS < PARSE_BUFFER_SIZE)
-		SCANNER_POS++;
-	return c;
-}
-
-char *
-parse_buffer(void)
-{
-	return PARSE_BUFFER;
-}
-
-unsigned int
-parse_buffer_curr_char(void)
-{
-	return PARSE_BUFFER[SCANNER_POS];
-}
-
-char *
-parse_buffer_ptr(void)
-{
-	return PARSE_BUFFER_PTR;
-}
-
-unsigned int
-parse_buffer_pos(void)
-{
-	return SCANNER_POS;
-}
-
-unsigned int
-parse_buffer_size(void)
-{
-	return PARSE_BUFFER_SIZE;
-}
diff --git a/contrib/cube/buffer.h b/contrib/cube/buffer.h
deleted file mode 100644
index eef9124dac..0000000000
--- a/contrib/cube/buffer.h
+++ /dev/null
@@ -1,8 +0,0 @@
-extern void set_parse_buffer(char *s);
-extern void reset_parse_buffer(void);
-extern int	read_parse_buffer(void);
-extern char *parse_buffer(void);
-extern char *parse_buffer_ptr(void);
-extern unsigned int parse_buffer_curr_char(void);
-extern unsigned int parse_buffer_pos(void);
-extern unsigned int parse_buffer_size(void);
diff --git a/contrib/cube/cube.c b/contrib/cube/cube.c
deleted file mode 100644
index c97e86d3b4..0000000000
--- a/contrib/cube/cube.c
+++ /dev/null
@@ -1,1174 +0,0 @@
-/******************************************************************************
-  This file contains routines that can be bound to a Postgres backend and
-  called by the backend in the process of processing queries.  The calling
-  format for these routines is dictated by Postgres architecture.
-******************************************************************************/
-
-#include "postgres.h"
-
-#include <math.h>
-
-#include "access/gist.h"
-#include "access/rtree.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
-#include "utils/builtins.h"
-
-#include "cubedata.h"
-
-#define max(a,b)		((a) >	(b) ? (a) : (b))
-#define min(a,b)		((a) <= (b) ? (a) : (b))
-#define abs(a)			((a) <	(0) ? (-a) : (a))
-
-extern void set_parse_buffer(char *str);
-extern int	cube_yyparse();
-
-/*
-** Input/Output routines
-*/
-NDBOX	   *cube_in(char *str);
-char	   *cube_out(NDBOX * cube);
-
-
-/*
-** GiST support methods
-*/
-bool		g_cube_consistent(GISTENTRY *entry, NDBOX * query, StrategyNumber strategy);
-GISTENTRY  *g_cube_compress(GISTENTRY *entry);
-GISTENTRY  *g_cube_decompress(GISTENTRY *entry);
-float	   *g_cube_penalty(GISTENTRY *origentry, GISTENTRY *newentry, float *result);
-GIST_SPLITVEC *g_cube_picksplit(bytea *entryvec, GIST_SPLITVEC *v);
-bool		g_cube_leaf_consistent(NDBOX * key, NDBOX * query, StrategyNumber strategy);
-bool		g_cube_internal_consistent(NDBOX * key, NDBOX * query, StrategyNumber strategy);
-NDBOX	   *g_cube_union(bytea *entryvec, int *sizep);
-NDBOX	   *g_cube_binary_union(NDBOX * r1, NDBOX * r2, int *sizep);
-bool	   *g_cube_same(NDBOX * b1, NDBOX * b2, bool *result);
-
-/*
-** R-tree support functions
-*/
-bool		cube_same(NDBOX * a, NDBOX * b);
-bool		cube_different(NDBOX * a, NDBOX * b);
-bool		cube_contains(NDBOX * a, NDBOX * b);
-bool		cube_contained(NDBOX * a, NDBOX * b);
-bool		cube_overlap(NDBOX * a, NDBOX * b);
-NDBOX	   *cube_union(NDBOX * a, NDBOX * b);
-NDBOX	   *cube_inter(NDBOX * a, NDBOX * b);
-float	   *cube_size(NDBOX * a);
-void		rt_cube_size(NDBOX * a, float *sz);
-
-/*
-** These make no sense for this type, but R-tree wants them
-*/
-bool		cube_over_left(NDBOX * a, NDBOX * b);
-bool		cube_over_right(NDBOX * a, NDBOX * b);
-bool		cube_left(NDBOX * a, NDBOX * b);
-bool		cube_right(NDBOX * a, NDBOX * b);
-
-/*
-** miscellaneous
-*/
-bool		cube_lt(NDBOX * a, NDBOX * b);
-bool		cube_gt(NDBOX * a, NDBOX * b);
-float	   *cube_distance(NDBOX * a, NDBOX * b);
-
-/*
-** Auxiliary funxtions
-*/
-static float distance_1D(float a1, float a2, float b1, float b2);
-static NDBOX *swap_corners(NDBOX * a);
-
-
-/*****************************************************************************
- * Input/Output functions
- *****************************************************************************/
-
-/* NdBox = [(lowerleft),(upperright)] */
-/* [(xLL(1)...xLL(N)),(xUR(1)...xUR(n))] */
-NDBOX *
-cube_in(char *str)
-{
-	void	   *result;
-
-	set_parse_buffer(str);
-
-	if (cube_yyparse(&result) != 0)
-		return NULL;
-
-	return ((NDBOX *) result);
-}
-
-/*
- * You might have noticed a slight inconsistency between the following
- * declaration and the SQL definition:
- *	   CREATE FUNCTION cube_out(opaque) RETURNS opaque ...
- * The reason is that the argument pass into cube_out is really just a
- * pointer. POSTGRES thinks all output functions are:
- *	   char *out_func(char *);
- */
-char *
-cube_out(NDBOX * cube)
-{
-	char	   *result;
-	char	   *p;
-	int			equal = 1;
-	int			dim = cube->dim;
-	int			i;
-
-	if (cube == NULL)
-		return (NULL);
-
-	p = result = (char *) palloc(100);
-
-	/*
-	 * while printing the first (LL) corner, check if it is equal to the
-	 * scond one
-	 */
-	p += sprintf(p, "(");
-	for (i = 0; i < dim; i++)
-	{
-		p += sprintf(p, "%g", cube->x[i]);
-		p += sprintf(p, ", ");
-		if (cube->x[i] != cube->x[i + dim])
-			equal = 0;
-	}
-	p -= 2;						/* get rid of the last ", " */
-	p += sprintf(p, ")");
-
-	if (!equal)
-	{
-		p += sprintf(p, ",(");
-		for (i = dim; i < dim * 2; i++)
-		{
-			p += sprintf(p, "%g", cube->x[i]);
-			p += sprintf(p, ", ");
-		}
-		p -= 2;
-		p += sprintf(p, ")");
-	}
-
-	return (result);
-}
-
-
-/*****************************************************************************
- *						   GiST functions
- *****************************************************************************/
-
-/*
-** The GiST Consistent method for boxes
-** Should return false if for all data items x below entry,
-** the predicate x op query == FALSE, where op is the oper
-** corresponding to strategy in the pg_amop table.
-*/
-bool
-g_cube_consistent(GISTENTRY *entry,
-				  NDBOX * query,
-				  StrategyNumber strategy)
-{
-	/*
-	 * if entry is not leaf, use g_cube_internal_consistent, else use
-	 * g_cube_leaf_consistent
-	 */
-	if (GIST_LEAF(entry))
-		return g_cube_leaf_consistent((NDBOX *) DatumGetPointer(entry->key),
-									  query, strategy);
-	else
-		return g_cube_internal_consistent((NDBOX *) DatumGetPointer(entry->key),
-										  query, strategy);
-}
-
-
-/*
-** The GiST Union method for boxes
-** returns the minimal bounding box that encloses all the entries in entryvec
-*/
-NDBOX *
-g_cube_union(bytea *entryvec, int *sizep)
-{
-	int			numranges,
-				i;
-	NDBOX	   *out = (NDBOX *) NULL;
-	NDBOX	   *tmp;
-
-	/*
-	 * fprintf(stderr, "union\n");
-	 */
-	numranges = (VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY);
-	tmp = (NDBOX *) DatumGetPointer((((GISTENTRY *) (VARDATA(entryvec)))[0]).key);
-
-	/*
-	 * sizep = sizeof(NDBOX); -- NDBOX has variable size
-	 */
-	*sizep = tmp->size;
-
-	for (i = 1; i < numranges; i++)
-	{
-		out = g_cube_binary_union(tmp, (NDBOX *)
-		   DatumGetPointer((((GISTENTRY *) (VARDATA(entryvec)))[i]).key),
-								  sizep);
-		if (i > 1)
-			pfree(tmp);
-		tmp = out;
-	}
-
-	return (out);
-}
-
-/*
-** GiST Compress and Decompress methods for boxes
-** do not do anything.
-*/
-GISTENTRY *
-g_cube_compress(GISTENTRY *entry)
-{
-	return (entry);
-}
-
-GISTENTRY *
-g_cube_decompress(GISTENTRY *entry)
-{
-	return (entry);
-}
-
-/*
-** The GiST Penalty method for boxes
-** As in the R-tree paper, we use change in area as our penalty metric
-*/
-float *
-g_cube_penalty(GISTENTRY *origentry, GISTENTRY *newentry, float *result)
-{
-	NDBOX	   *ud;
-	float		tmp1,
-				tmp2;
-
-	ud = cube_union((NDBOX *) DatumGetPointer(origentry->key),
-					(NDBOX *) DatumGetPointer(newentry->key));
-	rt_cube_size(ud, &tmp1);
-	rt_cube_size((NDBOX *) DatumGetPointer(origentry->key), &tmp2);
-	*result = tmp1 - tmp2;
-	pfree(ud);
-
-	/*
-	 * fprintf(stderr, "penalty\n"); fprintf(stderr, "\t%g\n", *result);
-	 */
-	return (result);
-}
-
-
-
-/*
-** The GiST PickSplit method for boxes
-** We use Guttman's poly time split algorithm
-*/
-GIST_SPLITVEC *
-g_cube_picksplit(bytea *entryvec,
-				 GIST_SPLITVEC *v)
-{
-	OffsetNumber i,
-				j;
-	NDBOX	   *datum_alpha,
-			   *datum_beta;
-	NDBOX	   *datum_l,
-			   *datum_r;
-	NDBOX	   *union_d,
-			   *union_dl,
-			   *union_dr;
-	NDBOX	   *inter_d;
-	bool		firsttime;
-	float		size_alpha,
-				size_beta,
-				size_union,
-				size_inter;
-	float		size_waste,
-				waste;
-	float		size_l,
-				size_r;
-	int			nbytes;
-	OffsetNumber seed_1 = 0,
-				seed_2 = 0;
-	OffsetNumber *left,
-			   *right;
-	OffsetNumber maxoff;
-
-	/*
-	 * fprintf(stderr, "picksplit\n");
-	 */
-	maxoff = ((VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY)) - 2;
-	nbytes = (maxoff + 2) * sizeof(OffsetNumber);
-	v->spl_left = (OffsetNumber *) palloc(nbytes);
-	v->spl_right = (OffsetNumber *) palloc(nbytes);
-
-	firsttime = true;
-	waste = 0.0;
-
-	for (i = FirstOffsetNumber; i < maxoff; i = OffsetNumberNext(i))
-	{
-		datum_alpha = (NDBOX *) DatumGetPointer(((GISTENTRY *) (VARDATA(entryvec)))[i].key);
-		for (j = OffsetNumberNext(i); j <= maxoff; j = OffsetNumberNext(j))
-		{
-			datum_beta = (NDBOX *) DatumGetPointer(((GISTENTRY *) (VARDATA(entryvec)))[j].key);
-
-			/* compute the wasted space by unioning these guys */
-			/* size_waste = size_union - size_inter; */
-			union_d = cube_union(datum_alpha, datum_beta);
-			rt_cube_size(union_d, &size_union);
-			inter_d = cube_inter(datum_alpha, datum_beta);
-			rt_cube_size(inter_d, &size_inter);
-			size_waste = size_union - size_inter;
-
-			pfree(union_d);
-
-			if (inter_d != (NDBOX *) NULL)
-				pfree(inter_d);
-
-			/*
-			 * are these a more promising split than what we've already
-			 * seen?
-			 */
-
-			if (size_waste > waste || firsttime)
-			{
-				waste = size_waste;
-				seed_1 = i;
-				seed_2 = j;
-				firsttime = false;
-			}
-		}
-	}
-
-	left = v->spl_left;
-	v->spl_nleft = 0;
-	right = v->spl_right;
-	v->spl_nright = 0;
-
-	datum_alpha = (NDBOX *) DatumGetPointer(((GISTENTRY *) (VARDATA(entryvec)))[seed_1].key);
-	datum_l = cube_union(datum_alpha, datum_alpha);
-	rt_cube_size(datum_l, &size_l);
-	datum_beta = (NDBOX *) DatumGetPointer(((GISTENTRY *) (VARDATA(entryvec)))[seed_2].key);
-	datum_r = cube_union(datum_beta, datum_beta);
-	rt_cube_size(datum_r, &size_r);
-
-	/*
-	 * Now split up the regions between the two seeds.	An important
-	 * property of this split algorithm is that the split vector v has the
-	 * indices of items to be split in order in its left and right
-	 * vectors.  We exploit this property by doing a merge in the code
-	 * that actually splits the page.
-	 *
-	 * For efficiency, we also place the new index tuple in this loop. This
-	 * is handled at the very end, when we have placed all the existing
-	 * tuples and i == maxoff + 1.
-	 */
-
-	maxoff = OffsetNumberNext(maxoff);
-	for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i))
-	{
-		/*
-		 * If we've already decided where to place this item, just put it
-		 * on the right list.  Otherwise, we need to figure out which page
-		 * needs the least enlargement in order to store the item.
-		 */
-
-		if (i == seed_1)
-		{
-			*left++ = i;
-			v->spl_nleft++;
-			continue;
-		}
-		else if (i == seed_2)
-		{
-			*right++ = i;
-			v->spl_nright++;
-			continue;
-		}
-
-		/* okay, which page needs least enlargement? */
-		datum_alpha = (NDBOX *) DatumGetPointer(((GISTENTRY *) (VARDATA(entryvec)))[i].key);
-		union_dl = cube_union(datum_l, datum_alpha);
-		union_dr = cube_union(datum_r, datum_alpha);
-		rt_cube_size(union_dl, &size_alpha);
-		rt_cube_size(union_dr, &size_beta);
-
-		/* pick which page to add it to */
-		if (size_alpha - size_l < size_beta - size_r)
-		{
-			pfree(datum_l);
-			pfree(union_dr);
-			datum_l = union_dl;
-			size_l = size_alpha;
-			*left++ = i;
-			v->spl_nleft++;
-		}
-		else
-		{
-			pfree(datum_r);
-			pfree(union_dl);
-			datum_r = union_dr;
-			size_r = size_alpha;
-			*right++ = i;
-			v->spl_nright++;
-		}
-	}
-	*left = *right = FirstOffsetNumber; /* sentinel value, see dosplit() */
-
-	v->spl_ldatum = PointerGetDatum(datum_l);
-	v->spl_rdatum = PointerGetDatum(datum_r);
-
-	return v;
-}
-
-/*
-** Equality method
-*/
-bool *
-g_cube_same(NDBOX * b1, NDBOX * b2, bool *result)
-{
-	if (cube_same(b1, b2))
-		*result = TRUE;
-	else
-		*result = FALSE;
-
-	/*
-	 * fprintf(stderr, "same: %s\n", (*result ? "TRUE" : "FALSE" ));
-	 */
-	return (result);
-}
-
-/*
-** SUPPORT ROUTINES
-*/
-bool
-g_cube_leaf_consistent(NDBOX * key,
-					   NDBOX * query,
-					   StrategyNumber strategy)
-{
-	bool		retval;
-
-	/*
-	 * fprintf(stderr, "leaf_consistent, %d\n", strategy);
-	 */
-	switch (strategy)
-	{
-		case RTLeftStrategyNumber:
-			retval = (bool) cube_left(key, query);
-			break;
-		case RTOverLeftStrategyNumber:
-			retval = (bool) cube_over_left(key, query);
-			break;
-		case RTOverlapStrategyNumber:
-			retval = (bool) cube_overlap(key, query);
-			break;
-		case RTOverRightStrategyNumber:
-			retval = (bool) cube_over_right(key, query);
-			break;
-		case RTRightStrategyNumber:
-			retval = (bool) cube_right(key, query);
-			break;
-		case RTSameStrategyNumber:
-			retval = (bool) cube_same(key, query);
-			break;
-		case RTContainsStrategyNumber:
-			retval = (bool) cube_contains(key, query);
-			break;
-		case RTContainedByStrategyNumber:
-			retval = (bool) cube_contained(key, query);
-			break;
-		default:
-			retval = FALSE;
-	}
-	return (retval);
-}
-
-bool
-g_cube_internal_consistent(NDBOX * key,
-						   NDBOX * query,
-						   StrategyNumber strategy)
-{
-	bool		retval;
-
-	/*
-	 * fprintf(stderr, "internal_consistent, %d\n", strategy);
-	 */
-	switch (strategy)
-	{
-		case RTLeftStrategyNumber:
-		case RTOverLeftStrategyNumber:
-			retval = (bool) cube_over_left(key, query);
-			break;
-		case RTOverlapStrategyNumber:
-			retval = (bool) cube_overlap(key, query);
-			break;
-		case RTOverRightStrategyNumber:
-		case RTRightStrategyNumber:
-			retval = (bool) cube_right(key, query);
-			break;
-		case RTSameStrategyNumber:
-		case RTContainsStrategyNumber:
-			retval = (bool) cube_contains(key, query);
-			break;
-		case RTContainedByStrategyNumber:
-			retval = (bool) cube_overlap(key, query);
-			break;
-		default:
-			retval = FALSE;
-	}
-	return (retval);
-}
-
-NDBOX *
-g_cube_binary_union(NDBOX * r1, NDBOX * r2, int *sizep)
-{
-	NDBOX	   *retval;
-
-	retval = cube_union(r1, r2);
-	*sizep = retval->size;
-
-	return (retval);
-}
-
-
-/* cube_union */
-NDBOX *
-cube_union(NDBOX * box_a, NDBOX * box_b)
-{
-	int			i;
-	NDBOX	   *result;
-	NDBOX	   *a = swap_corners(box_a);
-	NDBOX	   *b = swap_corners(box_b);
-
-	if (a->dim >= b->dim)
-	{
-		result = palloc(a->size);
-		result->size = a->size;
-		result->dim = a->dim;
-	}
-	else
-	{
-		result = palloc(b->size);
-		result->size = b->size;
-		result->dim = b->dim;
-	}
-
-	/* swap the box pointers if needed */
-	if (a->dim < b->dim)
-	{
-		NDBOX	   *tmp = b;
-
-		b = a;
-		a = tmp;
-	}
-
-	/*
-	 * use the potentially smaller of the two boxes (b) to fill in the
-	 * result, padding absent dimensions with zeroes
-	 */
-	for (i = 0; i < b->dim; i++)
-	{
-		result->x[i] = b->x[i];
-		result->x[i + a->dim] = b->x[i + b->dim];
-	}
-	for (i = b->dim; i < a->dim; i++)
-	{
-		result->x[i] = 0;
-		result->x[i + a->dim] = 0;
-	}
-
-	/* compute the union */
-	for (i = 0; i < a->dim; i++)
-		result->x[i] = min(a->x[i], result->x[i]);
-	for (i = a->dim; i < a->dim * 2; i++)
-		result->x[i] = max(a->x[i], result->x[i]);
-
-	pfree(a);
-	pfree(b);
-
-	return (result);
-}
-
-/* cube_inter */
-NDBOX *
-cube_inter(NDBOX * box_a, NDBOX * box_b)
-{
-	int			i;
-	NDBOX	   *result;
-	NDBOX	   *a = swap_corners(box_a);
-	NDBOX	   *b = swap_corners(box_b);
-
-	if (a->dim >= b->dim)
-	{
-		result = palloc(a->size);
-		result->size = a->size;
-		result->dim = a->dim;
-	}
-	else
-	{
-		result = palloc(b->size);
-		result->size = b->size;
-		result->dim = b->dim;
-	}
-
-	/* swap the box pointers if needed */
-	if (a->dim < b->dim)
-	{
-		NDBOX	   *tmp = b;
-
-		b = a;
-		a = tmp;
-	}
-
-	/*
-	 * use the potentially	smaller of the two boxes (b) to fill in the
-	 * result, padding absent dimensions with zeroes
-	 */
-	for (i = 0; i < b->dim; i++)
-	{
-		result->x[i] = b->x[i];
-		result->x[i + a->dim] = b->x[i + b->dim];
-	}
-	for (i = b->dim; i < a->dim; i++)
-	{
-		result->x[i] = 0;
-		result->x[i + a->dim] = 0;
-	}
-
-	/* compute the intersection */
-	for (i = 0; i < a->dim; i++)
-		result->x[i] = max(a->x[i], result->x[i]);
-	for (i = a->dim; i < a->dim * 2; i++)
-		result->x[i] = min(a->x[i], result->x[i]);
-
-	pfree(a);
-	pfree(b);
-
-	/*
-	 * Is it OK to return a non-null intersection for non-overlapping
-	 * boxes?
-	 */
-	return (result);
-}
-
-/* cube_size */
-float *
-cube_size(NDBOX * a)
-{
-	int			i,
-				j;
-	float	   *result;
-
-	result = (float *) palloc(sizeof(float));
-
-	*result = 1.0;
-	for (i = 0, j = a->dim; i < a->dim; i++, j++)
-		*result = (*result) * abs((a->x[j] - a->x[i]));
-
-	return (result);
-}
-
-void
-rt_cube_size(NDBOX * a, float *size)
-{
-	int			i,
-				j;
-
-	if (a == (NDBOX *) NULL)
-		*size = 0.0;
-	else
-	{
-		*size = 1.0;
-		for (i = 0, j = a->dim; i < a->dim; i++, j++)
-			*size = (*size) * abs((a->x[j] - a->x[i]));
-	}
-	return;
-}
-
-/* The following four methods compare the projections of the boxes
-   onto the 0-th coordinate axis. These methods are useless for dimensions
-   larger than 2, but it seems that R-tree requires all its strategies
-   map to real functions that return something */
-
-/*	is the right edge of (a) located to the left of
-	the right edge of (b)? */
-bool
-cube_over_left(NDBOX * box_a, NDBOX * box_b)
-{
-	NDBOX	   *a;
-	NDBOX	   *b;
-
-	if ((box_a == NULL) || (box_b == NULL))
-		return (FALSE);
-
-	a = swap_corners(box_a);
-	b = swap_corners(box_b);
-
-	return (a->x[a->dim - 1] <= b->x[b->dim - 1] && !cube_left(a, b) && !cube_right(a, b));
-}
-
-/*	is the left edge of (a) located to the right of
-	the left edge of (b)? */
-bool
-cube_over_right(NDBOX * box_a, NDBOX * box_b)
-{
-	NDBOX	   *a;
-	NDBOX	   *b;
-
-	if ((box_a == NULL) || (box_b == NULL))
-		return (FALSE);
-
-	a = swap_corners(box_a);
-	b = swap_corners(box_b);
-
-	return (a->x[a->dim - 1] >= b->x[b->dim - 1] && !cube_left(a, b) && !cube_right(a, b));
-}
-
-
-/* return 'true' if the projection of 'a' is
-   entirely on the left of the projection of 'b' */
-bool
-cube_left(NDBOX * box_a, NDBOX * box_b)
-{
-	NDBOX	   *a;
-	NDBOX	   *b;
-
-	if ((box_a == NULL) || (box_b == NULL))
-		return (FALSE);
-
-	a = swap_corners(box_a);
-	b = swap_corners(box_b);
-
-	return (a->x[a->dim - 1] < b->x[0]);
-}
-
-/* return 'true' if the projection of 'a' is
-   entirely on the right  of the projection of 'b' */
-bool
-cube_right(NDBOX * box_a, NDBOX * box_b)
-{
-	NDBOX	   *a;
-	NDBOX	   *b;
-
-	if ((box_a == NULL) || (box_b == NULL))
-		return (FALSE);
-
-	a = swap_corners(box_a);
-	b = swap_corners(box_b);
-
-	return (a->x[0] > b->x[b->dim - 1]);
-}
-
-/* make up a metric in which one box will be 'lower' than the other
-   -- this can be useful for srting and to determine uniqueness */
-bool
-cube_lt(NDBOX * box_a, NDBOX * box_b)
-{
-	int			i;
-	int			dim;
-	NDBOX	   *a;
-	NDBOX	   *b;
-
-	if ((box_a == NULL) || (box_b == NULL))
-		return (FALSE);
-
-	a = swap_corners(box_a);
-	b = swap_corners(box_b);
-	dim = min(a->dim, b->dim);
-
-	/*
-	 * if all common dimensions are equal, the cube with more dimensions
-	 * wins
-	 */
-	if (cube_same(a, b))
-	{
-		if (a->dim < b->dim)
-			return (TRUE);
-		else
-			return (FALSE);
-	}
-
-	/* compare the common dimensions */
-	for (i = 0; i < dim; i++)
-	{
-		if (a->x[i] > b->x[i])
-			return (FALSE);
-		if (a->x[i] < b->x[i])
-			return (TRUE);
-	}
-	for (i = 0; i < dim; i++)
-	{
-		if (a->x[i + a->dim] > b->x[i + b->dim])
-			return (FALSE);
-		if (a->x[i + a->dim] < b->x[i + b->dim])
-			return (TRUE);
-	}
-
-	/* compare extra dimensions to zero */
-	if (a->dim > b->dim)
-	{
-		for (i = dim; i < a->dim; i++)
-		{
-			if (a->x[i] > 0)
-				return (FALSE);
-			if (a->x[i] < 0)
-				return (TRUE);
-		}
-		for (i = 0; i < dim; i++)
-		{
-			if (a->x[i + a->dim] > 0)
-				return (FALSE);
-			if (a->x[i + a->dim] < 0)
-				return (TRUE);
-		}
-	}
-	if (a->dim < b->dim)
-	{
-		for (i = dim; i < b->dim; i++)
-		{
-			if (b->x[i] > 0)
-				return (TRUE);
-			if (b->x[i] < 0)
-				return (FALSE);
-		}
-		for (i = 0; i < dim; i++)
-		{
-			if (b->x[i + b->dim] > 0)
-				return (TRUE);
-			if (b->x[i + b->dim] < 0)
-				return (FALSE);
-		}
-	}
-
-	return (FALSE);
-}
-
-
-bool
-cube_gt(NDBOX * box_a, NDBOX * box_b)
-{
-	int			i;
-	int			dim;
-	NDBOX	   *a;
-	NDBOX	   *b;
-
-	if ((box_a == NULL) || (box_b == NULL))
-		return (FALSE);
-
-	a = swap_corners(box_a);
-	b = swap_corners(box_b);
-	dim = min(a->dim, b->dim);
-
-	/*
-	 * if all common dimensions are equal, the cube with more dimensions
-	 * wins
-	 */
-	if (cube_same(a, b))
-	{
-		if (a->dim > b->dim)
-			return (TRUE);
-		else
-			return (FALSE);
-	}
-
-	/* compare the common dimensions */
-	for (i = 0; i < dim; i++)
-	{
-		if (a->x[i] < b->x[i])
-			return (FALSE);
-		if (a->x[i] > b->x[i])
-			return (TRUE);
-	}
-	for (i = 0; i < dim; i++)
-	{
-		if (a->x[i + a->dim] < b->x[i + b->dim])
-			return (FALSE);
-		if (a->x[i + a->dim] > b->x[i + b->dim])
-			return (TRUE);
-	}
-
-
-	/* compare extra dimensions to zero */
-	if (a->dim > b->dim)
-	{
-		for (i = dim; i < a->dim; i++)
-		{
-			if (a->x[i] < 0)
-				return (FALSE);
-			if (a->x[i] > 0)
-				return (TRUE);
-		}
-		for (i = 0; i < dim; i++)
-		{
-			if (a->x[i + a->dim] < 0)
-				return (FALSE);
-			if (a->x[i + a->dim] > 0)
-				return (TRUE);
-		}
-	}
-	if (a->dim < b->dim)
-	{
-		for (i = dim; i < b->dim; i++)
-		{
-			if (b->x[i] < 0)
-				return (TRUE);
-			if (b->x[i] > 0)
-				return (FALSE);
-		}
-		for (i = 0; i < dim; i++)
-		{
-			if (b->x[i + b->dim] < 0)
-				return (TRUE);
-			if (b->x[i + b->dim] > 0)
-				return (FALSE);
-		}
-	}
-
-	return (FALSE);
-}
-
-
-/* Equal */
-bool
-cube_same(NDBOX * box_a, NDBOX * box_b)
-{
-	int			i;
-	NDBOX	   *a;
-	NDBOX	   *b;
-
-	if ((box_a == NULL) || (box_b == NULL))
-		return (FALSE);
-
-	a = swap_corners(box_a);
-	b = swap_corners(box_b);
-
-	/* swap the box pointers if necessary */
-	if (a->dim < b->dim)
-	{
-		NDBOX	   *tmp = b;
-
-		b = a;
-		a = tmp;
-	}
-
-	for (i = 0; i < b->dim; i++)
-	{
-		if (a->x[i] != b->x[i])
-			return (FALSE);
-		if (a->x[i + a->dim] != b->x[i + b->dim])
-			return (FALSE);
-	}
-
-	/*
-	 * all dimensions of (b) are compared to those of (a); instead of
-	 * those in (a) absent in (b), compare (a) to zero
-	 */
-	for (i = b->dim; i < a->dim; i++)
-	{
-		if (a->x[i] != 0)
-			return (FALSE);
-		if (a->x[i + a->dim] != 0)
-			return (FALSE);
-	}
-
-	pfree(a);
-	pfree(b);
-
-	return (TRUE);
-}
-
-/* Different */
-bool
-cube_different(NDBOX * box_a, NDBOX * box_b)
-{
-	return (!cube_same(box_a, box_b));
-}
-
-
-/* Contains */
-/* Box(A) CONTAINS Box(B) IFF pt(A) < pt(B) */
-bool
-cube_contains(NDBOX * box_a, NDBOX * box_b)
-{
-	int			i;
-	NDBOX	   *a;
-	NDBOX	   *b;
-
-	if ((box_a == NULL) || (box_b == NULL))
-		return (FALSE);
-
-	a = swap_corners(box_a);
-	b = swap_corners(box_b);
-
-	if (a->dim < b->dim)
-	{
-		/*
-		 * the further comparisons will make sense if the excess
-		 * dimensions of (b) were zeroes
-		 */
-		for (i = a->dim; i < b->dim; i++)
-		{
-			if (b->x[i] != 0)
-				return (FALSE);
-			if (b->x[i + b->dim] != 0)
-				return (FALSE);
-		}
-	}
-
-	/* Can't care less about the excess dimensions of (a), if any */
-	for (i = 0; i < min(a->dim, b->dim); i++)
-	{
-		if (a->x[i] > b->x[i])
-			return (FALSE);
-		if (a->x[i + a->dim] < b->x[i + b->dim])
-			return (FALSE);
-	}
-
-	pfree(a);
-	pfree(b);
-
-	return (TRUE);
-}
-
-/* Contained */
-/* Box(A) Contained by Box(B) IFF Box(B) Contains Box(A) */
-bool
-cube_contained(NDBOX * a, NDBOX * b)
-{
-	if (cube_contains(b, a) == TRUE)
-		return (TRUE);
-	else
-		return (FALSE);
-}
-
-/* Overlap */
-/* Box(A) Overlap Box(B) IFF (pt(a)LL < pt(B)UR) && (pt(b)LL < pt(a)UR) */
-bool
-cube_overlap(NDBOX * box_a, NDBOX * box_b)
-{
-	int			i;
-	NDBOX	   *a;
-	NDBOX	   *b;
-
-	/*
-	 * This *very bad* error was found in the source: if ( (a==NULL) ||
-	 * (b=NULL) ) return(FALSE);
-	 */
-	if ((box_a == NULL) || (box_b == NULL))
-		return (FALSE);
-
-	a = swap_corners(box_a);
-	b = swap_corners(box_b);
-
-	/* swap the box pointers if needed */
-	if (a->dim < b->dim)
-	{
-		NDBOX	   *tmp = b;
-
-		b = a;
-		a = tmp;
-	}
-
-	/* compare within the dimensions of (b) */
-	for (i = 0; i < b->dim; i++)
-	{
-		if (a->x[i] > b->x[i + b->dim])
-			return (FALSE);
-		if (a->x[i + a->dim] < b->x[i])
-			return (FALSE);
-	}
-
-	/* compare to zero those dimensions in (a) absent in (b) */
-	for (i = b->dim; i < a->dim; i++)
-	{
-		if (a->x[i] > 0)
-			return (FALSE);
-		if (a->x[i + a->dim] < 0)
-			return (FALSE);
-	}
-
-	pfree(a);
-	pfree(b);
-
-	return (TRUE);
-}
-
-
-/* Distance */
-/* The distance is computed as a per axis sum of the squared distances
-   between 1D projections of the boxes onto Cartesian axes. Assuming zero
-   distance between overlapping projections, this metric coincides with the
-   "common sense" geometric distance */
-float *
-cube_distance(NDBOX * a, NDBOX * b)
-{
-	int			i;
-	double		d,
-				distance;
-	float	   *result;
-
-	result = (float *) palloc(sizeof(float));
-
-	/* swap the box pointers if needed */
-	if (a->dim < b->dim)
-	{
-		NDBOX	   *tmp = b;
-
-		b = a;
-		a = tmp;
-	}
-
-	distance = 0.0;
-	/* compute within the dimensions of (b) */
-	for (i = 0; i < b->dim; i++)
-	{
-		d = distance_1D(a->x[i], a->x[i + a->dim], b->x[i], b->x[i + b->dim]);
-		distance += d * d;
-	}
-
-	/* compute distance to zero for those dimensions in (a) absent in (b) */
-	for (i = b->dim; i < a->dim; i++)
-	{
-		d = distance_1D(a->x[i], a->x[i + a->dim], 0.0, 0.0);
-		distance += d * d;
-	}
-
-	*result = (float) sqrt(distance);
-
-	return (result);
-}
-
-static float
-distance_1D(float a1, float a2, float b1, float b2)
-{
-	/* interval (a) is entirely on the left of (b) */
-	if ((a1 <= b1) && (a2 <= b1) && (a1 <= b2) && (a2 <= b2))
-		return (min(b1, b2) - max(a1, a2));
-
-	/* interval (a) is entirely on the right of (b) */
-	if ((a1 > b1) && (a2 > b1) && (a1 > b2) && (a2 > b2))
-		return (min(a1, a2) - max(b1, b2));
-
-	/* the rest are all sorts of intersections */
-	return (0.0);
-}
-
-/* normalize the box's co-ordinates by placing min(xLL,xUR) to LL
-   and max(xLL,xUR) to UR
-*/
-static NDBOX *
-swap_corners(NDBOX * a)
-{
-	int			i,
-				j;
-	NDBOX	   *result;
-
-	result = palloc(a->size);
-	result->size = a->size;
-	result->dim = a->dim;
-
-	for (i = 0, j = a->dim; i < a->dim; i++, j++)
-	{
-		result->x[i] = min(a->x[i], a->x[j]);
-		result->x[j] = max(a->x[i], a->x[j]);
-	}
-
-	return (result);
-}
diff --git a/contrib/cube/cube.sql.in b/contrib/cube/cube.sql.in
deleted file mode 100644
index a1a78ca9f5..0000000000
--- a/contrib/cube/cube.sql.in
+++ /dev/null
@@ -1,372 +0,0 @@
--- Create the user-defined type for N-dimensional boxes
--- 
-BEGIN TRANSACTION;
-
-CREATE FUNCTION cube_in(opaque)
-RETURNS opaque
-AS 'MODULE_PATHNAME'
-LANGUAGE 'c';
-
-CREATE FUNCTION cube_out(opaque)
-RETURNS opaque
-AS 'MODULE_PATHNAME'
-LANGUAGE 'c';
-
-CREATE TYPE cube (
-internallength = variable,
-input = cube_in,
-output = cube_out
-);
-
-COMMENT ON TYPE cube IS
-'multi-dimensional cube ''(FLOAT-1, FLOAT-2, ..., FLOAT-N), (FLOAT-1, FLOAT-2, ..., FLOAT-N)''';
-
---
--- External C-functions for R-tree methods
---
-
--- Left/Right methods
-
-CREATE FUNCTION cube_over_left(cube, cube) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION cube_over_left(cube, cube) IS
-'is over and left of (NOT IMPLEMENTED)';
-
-CREATE FUNCTION cube_over_right(cube, cube) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION cube_over_right(cube, cube) IS
-'is over and right of (NOT IMPLEMENTED)';
-
-CREATE FUNCTION cube_left(cube, cube) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION cube_left(cube, cube) IS
-'is left of (NOT IMPLEMENTED)';
-
-CREATE FUNCTION cube_right(cube, cube) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION cube_right(cube, cube) IS
-'is right of (NOT IMPLEMENTED)';
-
-
--- Comparison methods
-
-CREATE FUNCTION cube_lt(cube, cube) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION cube_lt(cube, cube) IS
-'lower than';
-
-CREATE FUNCTION cube_gt(cube, cube) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION cube_gt(cube, cube) IS
-'greater than';
-
-CREATE FUNCTION cube_contains(cube, cube) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION cube_contains(cube, cube) IS
-'contains';
-
-CREATE FUNCTION cube_contained(cube, cube) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION cube_contained(cube, cube) IS
-'contained in';
-
-CREATE FUNCTION cube_overlap(cube, cube) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION cube_overlap(cube, cube) IS
-'overlaps';
-
-CREATE FUNCTION cube_same(cube, cube) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION cube_same(cube, cube) IS
-'same as';
-
-CREATE FUNCTION cube_different(cube, cube) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION cube_different(cube, cube) IS
-'different';
-
--- support routines for indexing
-
-CREATE FUNCTION cube_union(cube, cube) RETURNS cube
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-CREATE FUNCTION cube_inter(cube, cube) RETURNS cube
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-CREATE FUNCTION cube_size(cube) RETURNS float4
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-
--- Misc N-dimensional functions
-
--- proximity routines
-
-CREATE FUNCTION cube_distance(cube, cube) RETURNS float4
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-
---
--- OPERATORS
---
-
-CREATE OPERATOR < (
-   LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_lt,
-   COMMUTATOR = '>',
-   RESTRICT = scalarltsel, JOIN = scalarltjoinsel
-);
-
-CREATE OPERATOR > (
-   LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_gt,
-   COMMUTATOR = '<',
-   RESTRICT = scalargtsel, JOIN = scalargtjoinsel
-);
-
-CREATE OPERATOR << (
-   LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_left,
-   COMMUTATOR = '>>',
-   RESTRICT = positionsel, JOIN = positionjoinsel
-);
-
-CREATE OPERATOR &< (
-   LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_over_left,
-   COMMUTATOR = '&>',
-   RESTRICT = positionsel, JOIN = positionjoinsel
-);
-
-CREATE OPERATOR && (
-   LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_overlap,
-   COMMUTATOR = '&&',
-   RESTRICT = positionsel, JOIN = positionjoinsel
-);
-
-CREATE OPERATOR &> (
-   LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_over_right,
-   COMMUTATOR = '&<',
-   RESTRICT = positionsel, JOIN = positionjoinsel
-);
-
-CREATE OPERATOR >> (
-   LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_right,
-   COMMUTATOR = '<<',
-   RESTRICT = positionsel, JOIN = positionjoinsel
-);
-
-CREATE OPERATOR = (
-   LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_same,
-   COMMUTATOR = '=', NEGATOR = '<>',
-   RESTRICT = eqsel, JOIN = eqjoinsel,
-   SORT1 = '<', SORT2 = '<'
-);
-
-CREATE OPERATOR <> (
-   LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_different,
-   COMMUTATOR = '<>', NEGATOR = '=',
-   RESTRICT = neqsel, JOIN = neqjoinsel
-);
-
-CREATE OPERATOR @ (
-   LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_contains,
-   COMMUTATOR = '~',
-   RESTRICT = contsel, JOIN = contjoinsel
-);
-
-CREATE OPERATOR ~ (
-   LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_contained,
-   COMMUTATOR = '@',
-   RESTRICT = contsel, JOIN = contjoinsel
-);
-
-
--- define the GiST support methods
-CREATE FUNCTION g_cube_consistent(opaque,cube,int4) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-CREATE FUNCTION g_cube_compress(opaque) RETURNS opaque 
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-CREATE FUNCTION g_cube_decompress(opaque) RETURNS opaque 
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-CREATE FUNCTION g_cube_penalty(opaque,opaque,opaque) RETURNS opaque
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-CREATE FUNCTION g_cube_picksplit(opaque, opaque) RETURNS opaque
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-CREATE FUNCTION g_cube_union(bytea, opaque) RETURNS cube 
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-CREATE FUNCTION g_cube_same(cube, cube, opaque) RETURNS opaque 
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-
--- register the default opclass for indexing
-INSERT INTO pg_opclass (opcamid, opcname, opcnamespace, opcowner, opcintype, opcdefault, opckeytype)
-    VALUES (
-        (SELECT oid FROM pg_am WHERE amname = 'gist'),
-        'gist_cube_ops',
-        (SELECT oid FROM pg_namespace WHERE nspname = 'pg_catalog'),
-        1,	-- UID of superuser is hardwired to 1 as of PG 7.3
-        (SELECT oid FROM pg_type WHERE typname = 'cube'),
-        true,
-        0);
-
-
--- get the comparators for boxes and store them in a tmp table
-SELECT o.oid AS opoid, o.oprname
-INTO TEMP TABLE gist_cube_ops_tmp
-FROM pg_operator o, pg_type t
-WHERE o.oprleft = t.oid and o.oprright = t.oid
-   and t.typname = 'cube';
-
--- make sure we have the right operators
--- SELECT * from gist_cube_ops_tmp;
-
--- using the tmp table, generate the amop entries 
-
--- cube_left
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 1, false, c.opoid
-   FROM pg_opclass opcl, gist_cube_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_cube_ops' 
-      and c.oprname = '<<';
-
--- cube_over_left
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 2, false, c.opoid
-   FROM pg_opclass opcl, gist_cube_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_cube_ops' 
-      and c.oprname = '&<';
-
--- cube_overlap
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 3, false, c.opoid
-   FROM pg_opclass opcl, gist_cube_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_cube_ops' 
-      and c.oprname = '&&';
-
--- cube_over_right
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 4, false, c.opoid
-   FROM pg_opclass opcl, gist_cube_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_cube_ops' 
-      and c.oprname = '&>';
-
--- cube_right
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 5, false, c.opoid
-   FROM pg_opclass opcl, gist_cube_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_cube_ops' 
-      and c.oprname = '>>';
-
--- cube_same
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 6, false, c.opoid
-   FROM pg_opclass opcl, gist_cube_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_cube_ops' 
-      and c.oprname = '=';
-
--- cube_contains
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 7, false, c.opoid
-   FROM pg_opclass opcl, gist_cube_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_cube_ops' 
-      and c.oprname = '@';
-
--- cube_contained
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 8, false, c.opoid
-   FROM pg_opclass opcl, gist_cube_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_cube_ops' 
-      and c.oprname = '~';
-
-DROP TABLE gist_cube_ops_tmp;
-
-
--- add the entries to amproc for the support methods
--- note the amprocnum numbers associated with each are specific!
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 1, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_cube_ops'
-      and proname = 'g_cube_consistent';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 2, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_cube_ops'
-      and proname = 'g_cube_union';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 3, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_cube_ops'
-      and proname = 'g_cube_compress';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 4, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_cube_ops'
-      and proname = 'g_cube_decompress';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 5, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_cube_ops'
-      and proname = 'g_cube_penalty';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 6, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_cube_ops'
-      and proname = 'g_cube_picksplit';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 7, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_cube_ops'
-      and proname = 'g_cube_same';
-
-END TRANSACTION;
diff --git a/contrib/cube/cubedata.h b/contrib/cube/cubedata.h
deleted file mode 100644
index a1c5e8efcd..0000000000
--- a/contrib/cube/cubedata.h
+++ /dev/null
@@ -1,6 +0,0 @@
-typedef struct NDBOX
-{
-	unsigned int size;			/* required to be a Postgres varlena type */
-	unsigned int dim;
-	float		x[1];
-}	NDBOX;
diff --git a/contrib/cube/cubeparse.y b/contrib/cube/cubeparse.y
deleted file mode 100644
index 33b7c1ef6b..0000000000
--- a/contrib/cube/cubeparse.y
+++ /dev/null
@@ -1,252 +0,0 @@
-%{
-/* NdBox = [(lowerleft),(upperright)] */
-/* [(xLL(1)...xLL(N)),(xUR(1)...xUR(n))] */
-
-#define YYERROR_VERBOSE   
-#define YYPARSE_PARAM result  /* need this to pass a pointer (void *) to yyparse */
-#define YYSTYPE char *
-#define YYDEBUG 1
-
-#include <string.h>
-#include "cubedata.h"
-#include "buffer.h"
-
-#include "postgres.h"
-#include "utils/palloc.h"
-#include "utils/elog.h"
-
-#undef yylex                 /* falure to redefine yylex will result in a call to  the */
-#define yylex cube_yylex     /* wrong scanner when running inside the postgres backend  */
-
-extern int yylex();           /* defined as cube_yylex in cubescan.c */
-extern int errno;
-
-int cube_yyerror( char *msg );
-int cube_yyparse(void *result);
-
-static int delim_count(char *s, char delim);
-static NDBOX * write_box(unsigned int dim, char *str1, char *str2);
-static NDBOX * write_point_as_box(char *s);
-
-%}
-
-/* BISON Declarations */
-%token FLOAT O_PAREN C_PAREN O_BRACKET C_BRACKET COMMA
-%start box
-
-/* Grammar follows */
-%%
-
-box:
-          O_BRACKET paren_list COMMA paren_list C_BRACKET {
-
-	    int dim;
-	    int c = parse_buffer_curr_char();
-	    int pos = parse_buffer_pos();
-
-	    /* We can't let the parser recognize more than one valid expression:
-	       the job is done and memory is allocated. */
-	    if ( c != '\0' ) {
-	      /* Not at EOF */
-	      reset_parse_buffer();     
-	      elog(ERROR, "(0) bad cube representation; garbage at or before char %d, ('%c', \\%03o)\n", pos, c, c );
-	      YYERROR;
-	    }
-	    
-	    dim = delim_count($2, ',') + 1;
-	    if ( (delim_count($4, ',') + 1) != dim ) {
-	      reset_parse_buffer();     
-	      elog(ERROR, "(1) bad cube representation; different point dimensions in (%s) and (%s)\n", $2, $4);
-	      YYABORT;
-	    }
-	    
-	    *((void **)result) = write_box( dim, $2, $4 );
-    
-          }
-      |
-          paren_list COMMA paren_list {
-	    int dim;
-	    int c = parse_buffer_curr_char();
-	    int pos = parse_buffer_pos();
-
-	    if ( c != '\0' ) {  /* Not at EOF */
-	      reset_parse_buffer();     
-	      elog(ERROR, "(2) bad cube representation; garbage at or before char %d, ('%c', \\%03o)\n", pos, c, c );
-	      YYABORT;
-	    }
-
-	    dim = delim_count($1, ',') + 1;
-	    
-	    if ( (delim_count($3, ',') + 1) != dim ) {
-	      reset_parse_buffer();     
-	      elog(ERROR, "(3) bad cube representation; different point dimensions in (%s) and (%s)\n", $1, $3);
-	      YYABORT;
-	    }
-	    
-	    *((void **)result) = write_box( dim, $1, $3 );
-          }
-      |
-
-          paren_list {
-	    int c = parse_buffer_curr_char();
-	    int pos = parse_buffer_pos();
-
-	    if ( c != '\0') {  /* Not at EOF */
-	      reset_parse_buffer();     
-	      elog(ERROR, "(4) bad cube representation; garbage at or before char %d, ('%c', \\%03o)\n", pos, c, c );
-	      YYABORT;
-	    }
-
-	    if ( yychar != YYEOF) {
-	      /* There's still a lookahead token to be parsed */
-	      reset_parse_buffer();     
-	      elog(ERROR, "(5) bad cube representation; garbage at or before char %d, ('end of input', \\%03o)\n", pos, c);
-	      YYABORT;
-	    }
-
-	    *((void **)result) = write_point_as_box($1);
-          }
-
-      |
-
-          list {
-	    int c = parse_buffer_curr_char();
-	    int pos = parse_buffer_pos();
-
-	    if ( c != '\0') {  /* Not at EOF */
-	      reset_parse_buffer();
-	      elog(ERROR, "(6) bad cube representation; garbage at or before char %d, ('%c', \\%03o)\n", pos, c, c);
-	      YYABORT;
-	    }
-
-	    if ( yychar != YYEOF) {
-	      /* There's still a lookahead token to be parsed */
-	      reset_parse_buffer();
-	      elog(ERROR, "(7) bad cube representation; garbage at or before char %d, ('end of input', \\%03o)\n", pos, c);
-	      YYABORT;
-	    }
-
-	    *((void **)result) = write_point_as_box($1);
-          }
-      ;
-
-paren_list:
-          O_PAREN list C_PAREN {
-             $$ = $2;
-	  }
-      ;
-
-list:
-          FLOAT {
-             $$ = palloc(strlen(parse_buffer()) + 1);
-	     strcpy($$, $1);
-	  }
-      | 
-	  list COMMA FLOAT {
-             $$ = $1;
-	     strcat($$, ",");
-	     strcat($$, $3);
-	  }
-      ;
-
-%%
-
-
-int cube_yyerror ( char *msg ) {
-  char *buf = (char *) palloc(256);
-  int position;
-
-  yyclearin;
-
-  if ( !strcmp(msg, "parse error, expecting `$'") ) {
-    msg = "expecting end of input";
-  }
-
-  position = parse_buffer_pos() > parse_buffer_size() ? parse_buffer_pos() - 1 : parse_buffer_pos();
-
-  sprintf(
-	  buf, 
-	  "%s at or before position %d, character ('%c', \\%03o), input: '%s'\n", 
-	  msg,
-	  position,
-	  parse_buffer()[position - 1],
-	  parse_buffer()[position - 1],
-	  parse_buffer()
-	  );
-
-  reset_parse_buffer();     
-  elog(ERROR, buf);
-  return 0;
-}
-
-static int
-delim_count(char *s, char delim)
-{
-      int        ndelim = 0;
-
-      while ((s = strchr(s, delim)) != NULL)
-      {
-        ndelim++;
-        s++;
-      }
-      return (ndelim);
-}
-
-static NDBOX * 
-write_box(unsigned int dim, char *str1, char *str2)
-{
-  NDBOX * bp;
-  char * s;
-  int i; 
-  int size = offsetof(NDBOX, x[0]) + sizeof(float) * dim * 2;
-	    
-  bp = palloc(size);
-  bp->size = size;
-  bp->dim = dim;
-	    
-  s = str1;
-  bp->x[i=0] = strtod(s, NULL);
-  while ((s = strchr(s, ',')) != NULL) {
-    s++; i++;
-    bp->x[i] = strtod(s, NULL);
-  }	
-  
-  s = str2;
-  bp->x[i=dim] = strtod(s, NULL);
-  while ((s = strchr(s, ',')) != NULL) {
-    s++; i++;
-    bp->x[i] = strtod(s, NULL);
-  }	
-  
-  return(bp);
-}
-
-
-static NDBOX * write_point_as_box(char *str)
-{
-  NDBOX * bp;
-  int i, size;
-  double x;
-  int dim = delim_count(str, ',') + 1;
-  char * s = str;
-  
-  size = offsetof(NDBOX, x[0]) + sizeof(float) * dim * 2;
-
-  bp = palloc(size);
-  bp->size = size;
-  bp->dim = dim;
-  
-  i = 0;
-  x = strtod(s, NULL);
-  bp->x[0] = x;
-  bp->x[dim] = x;
-  while ((s = strchr(s, ',')) != NULL) {
-    s++; i++;
-    x = strtod(s, NULL);
-    bp->x[i] = x;
-    bp->x[i+dim] = x;
-  }	
-
-  return(bp);
-}
-
diff --git a/contrib/cube/cubescan.l b/contrib/cube/cubescan.l
deleted file mode 100644
index e10e7faad8..0000000000
--- a/contrib/cube/cubescan.l
+++ /dev/null
@@ -1,54 +0,0 @@
-%{
-/* 
-** A scanner for EMP-style numeric ranges 
-*/
-
-#define YYSTYPE char *
-#define yylval cube_yylval
-
-#include <stdio.h>
-#include "cubeparse.h"
-#include "buffer.h"
-
-#define YY_NO_UNPUT 1
-#undef  yywrap
-
-/* flex screws a couple symbols when used with the -P otion; fix those */
-#define YY_DECL int cube_yylex YY_PROTO(( void )); \
-int cube_yylex YY_PROTO(( void ))
-
-/* redefined YY_INPUT reads byte-wise from the memory area defined in buffer.c */
-#undef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-{ \
-        int c = read_parse_buffer(); \
-        result = (c == '\0') ?  YY_NULL : (buf[0] = c, 1); \
-}
-
-void cube_flush_scanner_buffer(void); 
-%}
-
-n            [0-9]+
-integer      [+-]?{n}
-real         [+-]?({n}\.{n}?)|(\.{n})
-float        ({integer}|{real})([eE]{integer})?
-
-%%
-
-{float}      yylval = yytext; return FLOAT;
-\[           yylval = "("; return O_BRACKET;
-\]           yylval = ")"; return C_BRACKET;
-\(           yylval = "("; return O_PAREN;
-\)           yylval = ")"; return C_PAREN;
-\,           yylval = ")"; return COMMA;
-[ ]+         /* discard spaces */
-.            return yytext[0]; /* alert parser of the garbage */
-
-%%
-
-int cube_yylex();
-
-void cube_flush_scanner_buffer(void) {
-  fprintf(stderr, "cube_flush_scanner_buffer called\n");
-  YY_FLUSH_BUFFER;
-}
diff --git a/contrib/cube/data/test_cube.data b/contrib/cube/data/test_cube.data
deleted file mode 100644
index d67cd122cf..0000000000
--- a/contrib/cube/data/test_cube.data
+++ /dev/null
@@ -1,3100 +0,0 @@
-(12699,9028),(12654,8987)
-(22689,4680),(22614,4626)
-(43263,47296),(43217,47217)
-(6184,8397),(6182,8379)
-(863,28537),(788,28456)
-(33783,4733),(33746,4693)
-(40456,47134),(40426,47087)
-(45950,8153),(45887,8060)
-(33433,36474),(33399,36460)
-(41106,22017),(41086,21962)
-(19214,36781),(19179,36767)
-(11582,40823),(11498,40737)
-(35565,5404),(35546,5360)
-(26489,17387),(26405,17356)
-(30874,13849),(30796,13814)
-(38255,1619),(38227,1593)
-(4445,32006),(4405,31914)
-(3923,32921),(3876,32913)
-(36054,39464),(36032,39434)
-(46540,6780),(46524,6758)
-(12184,45811),(12118,45787)
-(13198,17090),(13143,17051)
-(30939,44578),(30865,44486)
-(12502,4939),(12431,4902)
-(3250,1108),(3169,1063)
-(34029,41240),(33976,41180)
-(47057,44018),(46967,43927)
-(699,10114),(686,10058)
-(5925,26020),(5845,25979)
-(9462,39388),(9382,39388)
-(270,32616),(226,32607)
-(3959,49145),(3861,49115)
-(207,40886),(179,40879)
-(48480,43312),(48412,43233)
-(37183,37209),(37161,37110)
-(13576,13505),(13521,13487)
-(5877,1037),(5818,1036)
-(6777,16694),(6776,16692)
-(49362,13905),(49299,13845)
-(29356,14606),(29313,14562)
-(5492,6976),(5441,6971)
-(288,49588),(204,49571)
-(36698,37213),(36682,37158)
-(718,41336),(645,41272)
-(8725,23369),(8660,23333)
-(40115,9894),(40025,9818)
-(40051,41181),(40015,41153)
-(5739,1740),(5715,1731)
-(25120,27935),(25054,27876)
-(27475,46084),(27447,46003)
-(33197,3252),(33161,3245)
-(10892,15691),(10869,15662)
-(39012,44712),(38995,44640)
-(4506,6484),(4458,6459)
-(13970,26316),(13964,26236)
-(28009,28104),(27968,28030)
-(5991,27613),(5906,27607)
-(23649,6338),(23610,6314)
-(25942,10008),(25911,9928)
-(25651,29943),(25590,29906)
-(24555,40334),(24546,40330)
-(46870,43762),(46789,43709)
-(20030,2752),(19945,2687)
-(30758,26754),(30718,26678)
-(4320,44673),(4286,44625)
-(1011,15576),(939,15574)
-(41936,40699),(41854,40655)
-(20594,19002),(20561,18995)
-(9388,41056),(9325,41042)
-(34771,46693),(34751,46645)
-(49398,46359),(49332,46357)
-(23115,35380),(23036,35306)
-(46305,34840),(46283,34765)
-(16768,21692),(16691,21647)
-(28695,3128),(28654,3112)
-(22182,7107),(22107,7074)
-(14567,1210),(14468,1139)
-(14156,37139),(14136,37119)
-(33500,38351),(33477,38286)
-(39983,41981),(39944,41954)
-(26773,20824),(26719,20813)
-(42516,22947),(42460,22932)
-(26127,10701),(26044,10650)
-(17808,13803),(17724,13710)
-(14913,49873),(14849,49836)
-(37013,820),(36955,736)
-(39071,1399),(39022,1381)
-(9785,42546),(9687,42540)
-(13423,14066),(13354,14052)
-(3417,14558),(3336,14478)
-(25212,46368),(25128,46316)
-(10124,39848),(10027,39820)
-(39722,39226),(39656,39162)
-(6298,28101),(6250,28076)
-(45852,5846),(45809,5750)
-(48292,4885),(48290,4841)
-(18905,4454),(18894,4424)
-(18965,43474),(18902,43444)
-(39843,28239),(39761,28199)
-(18087,44660),(18019,44632)
-(33886,10382),(33794,10286)
-(38383,13163),(38362,13092)
-(18861,25050),(18842,24965)
-(29887,14326),(29806,14274)
-(18733,11644),(18698,11644)
-(5119,37952),(5089,37950)
-(16191,34884),(16149,34864)
-(29544,1104),(29496,1062)
-(27740,41555),(27701,41540)
-(4672,4087),(4633,4060)
-(45441,38994),(45377,38958)
-(3272,1176),(3232,1146)
-(12820,26606),(12790,26575)
-(30910,7590),(30877,7512)
-(42476,39152),(42377,39127)
-(6562,38490),(6542,38447)
-(30046,20332),(29988,20259)
-(40723,15950),(40671,15949)
-(4945,46857),(4908,46817)
-(47986,16882),(47963,16877)
-(9842,22339),(9805,22305)
-(29831,23169),(29818,23122)
-(12322,34404),(12250,34312)
-(22846,11091),(22759,10992)
-(47627,2424),(47603,2397)
-(18375,43632),(18347,43577)
-(40441,974),(40394,965)
-(34260,10573),(34194,10522)
-(32914,9549),(32828,9503)
-(49023,37827),(48978,37799)
-(22183,10691),(22111,10669)
-(38036,15828),(38014,15759)
-(34604,16801),(34508,16746)
-(26737,29997),(26675,29976)
-(47375,40298),(47293,40210)
-(771,2661),(732,2649)
-(28514,25659),(28504,25577)
-(13438,46494),(13376,46455)
-(7187,17877),(7125,17786)
-(49957,43390),(49897,43384)
-(26543,20067),(26482,20057)
-(16416,29803),(16385,29724)
-(36353,7484),(36286,7414)
-(26498,3377),(26415,3358)
-(28990,32205),(28936,32193)
-(45005,3842),(45001,3816)
-(21672,23566),(21603,23566)
-(33360,43465),(33302,43429)
-(29884,9544),(29838,9520)
-(5599,15012),(5596,14930)
-(22396,21481),(22344,21422)
-(24810,14955),(24780,14887)
-(47114,18866),(47081,18784)
-(39013,39245),(38953,39237)
-(12863,40534),(12803,40529)
-(351,37068),(310,37019)
-(12916,34327),(12891,34240)
-(49191,2694),(49170,2628)
-(24127,38407),(24050,38325)
-(3264,23053),(3213,23007)
-(8172,30385),(8144,30336)
-(19630,35716),(19573,35640)
-(42554,5148),(42521,5117)
-(42168,33453),(42136,33426)
-(17732,32093),(17666,32057)
-(1039,16626),(1037,16587)
-(21287,7757),(21265,7679)
-(47063,8260),(47039,8225)
-(38645,16238),(38561,16204)
-(18258,25358),(18196,25341)
-(30458,1742),(30458,1695)
-(35147,9273),(35121,9233)
-(7670,16625),(7642,16545)
-(49503,23432),(49484,23383)
-(31089,23146),(31062,23093)
-(47758,2734),(47670,2703)
-(35276,1027),(35259,972)
-(26337,17603),(26313,17579)
-(35649,16777),(35626,16777)
-(42454,5105),(42362,5101)
-(21682,24951),(21646,24920)
-(48383,25174),(48303,25156)
-(14672,3532),(14601,3460)
-(22570,22587),(22515,22512)
-(23566,25623),(23484,25573)
-(9530,24542),(9504,24459)
-(41271,451),(41236,401)
-(5556,37528),(5502,37527)
-(12479,25042),(12447,24991)
-(16568,22916),(16499,22864)
-(42700,13084),(42676,12992)
-(35523,40973),(35504,40932)
-(32948,16962),(32857,16901)
-(7808,13469),(7712,13469)
-(13920,35203),(13870,35131)
-(22731,31563),(22658,31557)
-(22909,43956),(22900,43857)
-(33077,35080),(33074,35030)
-(48064,29307),(48022,29280)
-(20232,46682),(20212,46613)
-(29949,16790),(29867,16711)
-(30260,32029),(30180,31979)
-(17184,34503),(17110,34482)
-(16066,42687),(16039,42648)
-(2947,19819),(2857,19788)
-(4900,47934),(4818,47894)
-(27193,19014),(27174,18976)
-(15597,27948),(15590,27939)
-(11090,28623),(11002,28589)
-(26956,18651),(26920,18620)
-(3107,47753),(3103,47711)
-(6745,24151),(6711,24083)
-(43923,19213),(43871,19124)
-(33451,23578),(33370,23534)
-(8944,20605),(8862,20601)
-(14905,7536),(14892,7441)
-(2412,18357),(2383,18354)
-(37060,1443),(36974,1366)
-(15501,6230),(15429,6190)
-(30333,50),(30273,6)
-(35567,9965),(35482,9912)
-(49847,7128),(49798,7067)
-(27685,36396),(27668,36384)
-(43832,18491),(43825,18431)
-(36849,34600),(36785,34589)
-(2348,47938),(2307,47902)
-(20473,22131),(20445,22113)
-(38486,4293),(38471,4288)
-(30611,30451),(30553,30400)
-(3883,21299),(3819,21260)
-(7696,37555),(7644,37534)
-(22399,7913),(22317,7911)
-(42565,38605),(42500,38598)
-(36595,12151),(36500,12106)
-(587,35217),(571,35123)
-(5764,15300),(5764,15231)
-(12003,21265),(11983,21210)
-(42564,4803),(42470,4737)
-(42359,36834),(42271,36746)
-(44700,14680),(44658,14670)
-(19690,5627),(19620,5607)
-(17780,43602),(17714,43565)
-(45073,3491),(45041,3434)
-(35043,2136),(35017,2084)
-(39653,19215),(39646,19198)
-(23970,25560),(23935,25502)
-(28698,49233),(28600,49223)
-(30266,3605),(30245,3540)
-(25538,7857),(25500,7791)
-(17711,1757),(17708,1756)
-(5248,594),(5190,587)
-(2730,32454),(2671,32436)
-(1722,49089),(1635,49067)
-(40954,5743),(40921,5722)
-(21382,4426),(21298,4331)
-(7885,18629),(7872,18605)
-(42838,6459),(42748,6451)
-(8217,19894),(8207,19845)
-(20489,18524),(20433,18520)
-(17383,23559),(17309,23515)
-(38952,38968),(38934,38913)
-(44665,18137),(44636,18051)
-(22416,41220),(22383,41213)
-(9901,664),(9818,646)
-(23475,21981),(23449,21973)
-(41875,17991),(41818,17988)
-(36517,47731),(36509,47713)
-(37595,49849),(37581,49834)
-(38771,32720),(38748,32684)
-(810,38523),(736,38452)
-(29695,14942),(29665,14907)
-(31911,15168),(31906,15113)
-(3454,36839),(3438,36831)
-(4832,47554),(4820,47473)
-(11590,8292),(11539,8272)
-(8193,33323),(8106,33317)
-(16043,14799),(16001,14710)
-(19574,11395),(19514,11316)
-(26290,41424),(26224,41342)
-(22844,12516),(22807,12471)
-(15709,49580),(15655,49553)
-(13387,28084),(13379,28066)
-(2780,38807),(2690,38711)
-(22031,32458),(22028,32377)
-(13511,3351),(13440,3297)
-(14648,26473),(14614,26383)
-(17798,19885),(17726,19852)
-(32355,27940),(32324,27861)
-(43773,21031),(43767,20985)
-(15419,45759),(15403,45666)
-(770,38863),(729,38806)
-(21221,35619),(21183,35596)
-(38924,31021),(38894,30961)
-(7395,32439),(7345,32416)
-(2324,25118),(2268,25074)
-(2958,15089),(2935,15087)
-(2424,160),(2424,81)
-(12123,18644),(12099,18616)
-(7459,30276),(7422,30218)
-(15847,45488),(15814,45428)
-(26409,29897),(26389,29863)
-(12336,34322),(12279,34322)
-(9440,23550),(9396,23466)
-(4991,30850),(4905,30768)
-(47262,11940),(47201,11939)
-(30584,42868),(30555,42838)
-(23144,24089),(23056,24067)
-(35930,11609),(35847,11573)
-(7812,17271),(7789,17203)
-(17946,37554),(17878,37480)
-(27356,32869),(27298,32813)
-(29971,47783),(29933,47697)
-(26075,46494),(25988,46451)
-(39314,41366),(39289,41269)
-(31708,42900),(31688,42865)
-(4510,10231),(4439,10203)
-(43806,8482),(43758,8446)
-(45990,49694),(45927,49617)
-(48815,27640),(48782,27573)
-(41675,26733),(41622,26723)
-(23229,7709),(23175,7693)
-(48976,17733),(48962,17731)
-(10686,41470),(10597,41434)
-(18053,27059),(17989,27012)
-(35495,25950),(35459,25912)
-(41896,45014),(41881,44999)
-(22654,41896),(22572,41801)
-(18581,7087),(18524,6988)
-(14697,22406),(14681,22311)
-(40092,28122),(40043,28030)
-(35844,24243),(35816,24238)
-(1254,25653),(1250,25644)
-(1603,21730),(1556,21640)
-(33048,21779),(32991,21763)
-(29979,1632),(29916,1592)
-(8620,633),(8580,620)
-(22992,27035),(22932,27008)
-(21409,29315),(21390,29309)
-(3610,44748),(3547,44699)
-(20402,9318),(20343,9267)
-(31001,8709),(30908,8658)
-(46840,47640),(46773,47551)
-(49173,4705),(49143,4630)
-(5339,31657),(5251,31622)
-(8644,49668),(8630,49648)
-(45387,2893),(45309,2885)
-(47641,31020),(47584,30941)
-(40238,10636),(40208,10568)
-(19247,36924),(19227,36924)
-(917,19957),(827,19887)
-(40967,17841),(40870,17820)
-(15850,4109),(15794,4085)
-(20181,30916),(20085,30870)
-(161,24465),(107,24374)
-(21737,49690),(21667,49663)
-(10328,20911),(10232,20852)
-(24187,49823),(24128,49768)
-(36084,4578),(36007,4501)
-(38771,31741),(38673,31674)
-(2202,30102),(2111,30006)
-(27322,16074),(27228,16039)
-(6843,17280),(6765,17248)
-(16972,39744),(16912,39700)
-(10608,38741),(10553,38708)
-(4917,34801),(4828,34766)
-(39281,33659),(39268,33618)
-(31706,7119),(31645,7063)
-(3427,44006),(3422,44004)
-(10134,42608),(10044,42599)
-(26294,32080),(26200,32068)
-(21777,34680),(21769,34606)
-(23373,25957),(23314,25915)
-(10710,8401),(10681,8400)
-(42062,19458),(42019,19394)
-(26530,43036),(26458,43004)
-(3394,46081),(3360,46077)
-(38743,33953),(38677,33924)
-(32438,8226),(32345,8160)
-(9210,27333),(9118,27301)
-(19594,1600),(19568,1551)
-(10003,12278),(9952,12255)
-(31737,7206),(31650,7146)
-(16594,15821),(16502,15759)
-(28208,30296),(28189,30278)
-(30602,46237),(30555,46185)
-(20715,5155),(20697,5140)
-(48892,35271),(48793,35210)
-(3175,5590),(3113,5525)
-(34220,27947),(34132,27865)
-(35105,39792),(35011,39727)
-(21919,27314),(21839,27286)
-(23963,3723),(23917,3699)
-(16312,14078),(16236,14045)
-(19233,49824),(19185,49794)
-(1447,11768),(1356,11699)
-(17311,17709),(17224,17653)
-(11962,31709),(11871,31627)
-(21355,40131),(21355,40085)
-(33750,35273),(33724,35180)
-(38896,25539),(38879,25524)
-(39569,44899),(39569,44893)
-(11075,41547),(11039,41500)
-(3215,12202),(3199,12127)
-(46215,33458),(46132,33455)
-(15121,38012),(15083,37974)
-(44448,18726),(44412,18690)
-(3899,38263),(3870,38262)
-(13854,13353),(13786,13298)
-(8252,5402),(8191,5320)
-(46849,37968),(46820,37897)
-(16422,13957),(16376,13897)
-(47369,7665),(47353,7629)
-(11982,40874),(11956,40806)
-(9552,27580),(9496,27562)
-(32247,19399),(32176,19337)
-(32704,2169),(32635,2091)
-(7471,44213),(7411,44130)
-(48433,7096),(48379,7089)
-(37357,6543),(37338,6452)
-(30460,29624),(30433,29535)
-(20350,28794),(20341,28705)
-(6326,32360),(6267,32317)
-(1711,47519),(1654,47430)
-(49540,16510),(49521,16426)
-(26975,618),(26908,579)
-(24118,30880),(24020,30821)
-(3675,15477),(3625,15418)
-(44953,9577),(44953,9530)
-(38323,7965),(38235,7910)
-(6629,36482),(6579,36448)
-(33953,16460),(33878,16408)
-(49222,16790),(49186,16695)
-(17308,16951),(17274,16904)
-(14135,6888),(14077,6833)
-(38617,47768),(38603,47760)
-(7345,10992),(7290,10914)
-(35261,42152),(35176,42096)
-(28586,4809),(28544,4735)
-(37521,25299),(37495,25217)
-(41941,17954),(41912,17915)
-(1209,46863),(1171,46863)
-(20103,34947),(20048,34896)
-(32716,33816),(32656,33769)
-(11113,6531),(11036,6467)
-(48635,7321),(48563,7262)
-(28435,37059),(28349,37014)
-(12311,17208),(12232,17112)
-(1466,48010),(1379,48008)
-(11226,11997),(11223,11925)
-(46896,32540),(46821,32510)
-(32661,31255),(32632,31187)
-(37739,20376),(37655,20306)
-(44002,43326),(43920,43257)
-(30337,1023),(30271,968)
-(34436,23357),(34432,23345)
-(21367,8168),(21353,8091)
-(36370,21611),(36369,21569)
-(4152,36488),(4080,36476)
-(17696,13924),(17664,13853)
-(34252,19395),(34159,19316)
-(12574,3072),(12573,2975)
-(3995,21243),(3943,21167)
-(44553,30126),(44513,30108)
-(4599,45275),(4552,45254)
-(33191,11404),(33176,11348)
-(14245,18633),(14177,18540)
-(32457,20705),(32393,20700)
-(40052,10499),(40016,10457)
-(29824,44065),(29785,44037)
-(31613,12565),(31557,12543)
-(42692,29000),(42652,28996)
-(40680,22219),(40603,22140)
-(33575,27661),(33488,27644)
-(46194,1385),(46184,1355)
-(38442,48501),(38407,48426)
-(25305,21544),(25236,21523)
-(15562,8226),(15561,8208)
-(20844,43614),(20752,43558)
-(22566,30541),(22554,30532)
-(2760,47802),(2672,47789)
-(25515,30745),(25433,30675)
-(48382,45134),(48382,45093)
-(9940,27094),(9871,27087)
-(48690,44361),(48610,44338)
-(18992,11585),(18899,11582)
-(21551,49983),(21492,49885)
-(46778,29113),(46770,29071)
-(43219,9593),(43212,9548)
-(40291,1248),(40224,1190)
-(12687,22225),(12635,22219)
-(49372,38790),(49306,38721)
-(49503,46808),(49411,46798)
-(24745,5162),(24732,5138)
-(5046,26517),(5023,26424)
-(5583,46538),(5495,46531)
-(6084,35950),(6079,35895)
-(3503,23096),(3437,23024)
-(45275,8420),(45244,8418)
-(13514,45251),(13491,45249)
-(42112,2748),(42047,2668)
-(7810,21907),(7806,21878)
-(48378,36029),(48303,35979)
-(32568,48605),(32510,48563)
-(859,18915),(810,18915)
-(41963,17950),(41939,17915)
-(42723,8031),(42685,7955)
-(19587,5965),(19556,5961)
-(8713,33083),(8629,32996)
-(21243,7769),(21226,7740)
-(43752,43026),(43720,42944)
-(7883,41311),(7859,41242)
-(10178,47874),(10157,47826)
-(32177,48725),(32093,48646)
-(22960,2784),(22953,2774)
-(25101,49159),(25087,49090)
-(32142,48915),(32086,48850)
-(6636,44887),(6590,44825)
-(37814,11606),(37769,11578)
-(2870,23198),(2820,23121)
-(21025,16364),(20947,16271)
-(31341,36137),(31269,36114)
-(38921,7906),(38888,7831)
-(6966,17259),(6922,17199)
-(32426,13344),(32401,13253)
-(8084,30572),(8078,30572)
-(42230,47674),(42150,47603)
-(20724,44854),(20724,44830)
-(27471,38453),(27454,38430)
-(24590,37973),(24544,37941)
-(45832,26077),(45772,26031)
-(9589,24239),(9582,24156)
-(37484,49472),(37409,49432)
-(30044,19340),(30004,19333)
-(16966,14632),(16936,14572)
-(9439,40491),(9403,40482)
-(28945,5814),(28913,5805)
-(43788,41302),(43746,41231)
-(33631,43451),(33614,43354)
-(17590,49396),(17510,49324)
-(15173,32572),(15109,32507)
-(1912,23580),(1840,23504)
-(38165,16185),(38076,16154)
-(6729,1179),(6637,1177)
-(6994,45406),(6983,45325)
-(2912,21327),(2908,21305)
-(14678,14244),(14659,14222)
-(29944,14959),(29898,14900)
-(47432,35658),(47407,35610)
-(25542,39243),(25466,39149)
-(5330,7206),(5304,7165)
-(24790,27196),(24695,27118)
-(38806,1961),(38795,1906)
-(23290,4487),(23212,4416)
-(35035,24337),(34990,24297)
-(5549,38948),(5549,38891)
-(24558,15492),(24501,15425)
-(4636,3011),(4574,2933)
-(26522,39986),(26451,39940)
-(33486,18424),(33410,18366)
-(36638,14324),(36625,14287)
-(35115,41236),(35055,41191)
-(31927,16896),(31841,16806)
-(5796,43937),(5697,43886)
-(25681,41645),(25663,41608)
-(10962,42777),(10894,42732)
-(32715,11026),(32672,10991)
-(45803,20406),(45710,20371)
-(34730,17672),(34658,17606)
-(8809,6323),(8798,6232)
-(39471,23837),(39390,23749)
-(34078,17435),(33987,17433)
-(9133,4544),(9041,4509)
-(47274,29126),(47242,29060)
-(6404,28488),(6403,28475)
-(48894,49751),(48846,49694)
-(17324,43023),(17301,42972)
-(15599,8433),(15557,8386)
-(48575,10202),(48488,10175)
-(27638,24428),(27608,24378)
-(45277,47456),(45240,47422)
-(26482,46607),(26482,46570)
-(41400,33898),(41397,33802)
-(49853,18504),(49848,18503)
-(11528,25165),(11476,25080)
-(49902,41752),(49818,41746)
-(1956,47506),(1922,47424)
-(21834,22058),(21802,21964)
-(19414,21842),(19386,21822)
-(34801,13722),(34744,13681)
-(13924,29243),(13835,29160)
-(47749,21986),(47664,21894)
-(47051,39582),(46974,39489)
-(31287,49923),(31236,49913)
-(47429,8625),(47337,8585)
-(46987,44364),(46901,44277)
-(16158,27510),(16099,27467)
-(41184,6400),(41148,6317)
-(1847,42471),(1829,42426)
-(14409,48602),(14320,48555)
-(38137,42951),(38045,42918)
-(42875,2312),(42832,2243)
-(27242,30617),(27181,30535)
-(24882,44559),(24812,44548)
-(22021,1596),(22015,1581)
-(24300,1523),(24250,1443)
-(43946,35909),(43869,35868)
-(816,15988),(776,15967)
-(25243,9401),(25237,9332)
-(27967,25958),(27928,25949)
-(6575,33949),(6484,33900)
-(44812,35980),(44800,35913)
-(37577,13064),(37495,13019)
-(30891,29967),(30814,29884)
-(15829,28836),(15753,28807)
-(11128,34180),(11126,34117)
-(9834,12537),(9801,12508)
-(4899,29069),(4809,29024)
-(29370,38459),(29276,38382)
-(40743,46653),(40647,46559)
-(9618,2723),(9578,2631)
-(32542,26837),(32515,26769)
-(5625,13409),(5576,13355)
-(47490,19229),(47472,19203)
-(48118,40275),(48063,40203)
-(19245,20549),(19227,20546)
-(25312,22243),(25280,22164)
-(18797,28934),(18723,28881)
-(31609,49393),(31512,49366)
-(26183,32888),(26135,32824)
-(46198,26153),(46180,26149)
-(45383,16904),(45353,16888)
-(7132,11408),(7091,11338)
-(48262,43227),(48236,43159)
-(31722,12861),(31675,12810)
-(41695,48924),(41691,48921)
-(48318,12877),(48287,12802)
-(12069,32241),(11978,32231)
-(8395,2694),(8380,2661)
-(19552,34590),(19550,34497)
-(12203,26166),(12187,26143)
-(35745,9571),(35654,9542)
-(22384,22535),(22352,22439)
-(21459,28189),(21360,28189)
-(7418,7203),(7343,7182)
-(39497,48412),(39413,48318)
-(1058,11132),(979,11051)
-(45623,31417),(45548,31381)
-(23887,31921),(23876,31891)
-(7797,1244),(7785,1155)
-(23679,43650),(23594,43644)
-(21891,30561),(21833,30485)
-(4069,6870),(4019,6785)
-(5134,25117),(5103,25034)
-(36101,41895),(36085,41810)
-(39617,39211),(39544,39191)
-(37437,6604),(37434,6585)
-(7749,32601),(7740,32515)
-(26203,34991),(26159,34946)
-(31856,39006),(31783,39003)
-(45828,24767),(45788,24723)
-(49836,35965),(49757,35871)
-(44113,49024),(44033,48995)
-(38237,22326),(38187,22253)
-(45235,19087),(45190,19005)
-(1588,45285),(1520,45254)
-(46628,8701),(46552,8665)
-(47707,18258),(47668,18250)
-(9377,26162),(9325,26079)
-(28331,16766),(28302,16731)
-(15792,27875),(15727,27809)
-(16454,1972),(16415,1967)
-(21012,15828),(20972,15784)
-(27465,30603),(27390,30560)
-(39256,7697),(39225,7604)
-(25908,32801),(25854,32770)
-(25215,40109),(25201,40106)
-(23280,4613),(23190,4596)
-(32440,30879),(32405,30807)
-(49156,4224),(49126,4126)
-(20005,40423),(19911,40370)
-(20978,8226),(20930,8170)
-(32127,22611),(32126,22579)
-(21764,26509),(21701,26455)
-(32923,2834),(32914,2830)
-(7499,25331),(7426,25300)
-(6163,36942),(6107,36908)
-(41118,14583),(41034,14486)
-(21211,33369),(21208,33331)
-(7899,27682),(7853,27603)
-(16546,48436),(16535,48400)
-(24898,40195),(24855,40174)
-(43029,982),(43004,952)
-(26266,7962),(26252,7950)
-(11308,44367),(11210,44322)
-(8902,28402),(8808,28334)
-(11671,19619),(11665,19549)
-(47202,23593),(47153,23505)
-(21981,40220),(21905,40160)
-(46721,2514),(46687,2471)
-(3450,33839),(3424,33811)
-(41854,45864),(41762,45792)
-(40183,47816),(40114,47742)
-(26119,33910),(26077,33816)
-(3430,16518),(3365,16500)
-(40063,32176),(40005,32166)
-(38702,15253),(38679,15187)
-(17719,12291),(17658,12257)
-(46131,30669),(46068,30587)
-(42738,10952),(42731,10907)
-(8721,45155),(8650,45076)
-(45317,26123),(45244,26113)
-(42694,11561),(42614,11490)
-(10043,12479),(10009,12391)
-(27584,2345),(27578,2257)
-(30889,8253),(30866,8167)
-(5176,48928),(5107,48838)
-(9781,21023),(9745,20976)
-(32430,27908),(32404,27859)
-(3984,7391),(3973,7352)
-(18904,8094),(18842,8091)
-(20573,5508),(20482,5496)
-(7806,44368),(7753,44297)
-(18875,41452),(18817,41376)
-(6632,12142),(6566,12079)
-(33066,17865),(33055,17854)
-(45726,19628),(45714,19589)
-(26971,18459),(26941,18423)
-(26554,23641),(26515,23592)
-(45503,1325),(45441,1231)
-(11898,20164),(11880,20115)
-(27868,22837),(27843,22776)
-(34931,8206),(34855,8144)
-(42375,33603),(42350,33539)
-(3184,8308),(3129,8238)
-(26667,15813),(26661,15785)
-(5760,49617),(5730,49546)
-(794,27001),(777,26992)
-(13518,45289),(13459,45235)
-(34430,29754),(34363,29736)
-(37912,24574),(37880,24543)
-(8130,2270),(8083,2258)
-(26930,21516),(26848,21455)
-(3634,33511),(3592,33489)
-(33080,5036),(33035,4972)
-(48389,13942),(48316,13915)
-(9231,5298),(9150,5232)
-(1357,10601),(1321,10548)
-(35175,15295),(35091,15269)
-(33917,36863),(33879,36784)
-(8279,12052),(8239,12021)
-(11868,19083),(11862,19034)
-(24019,30777),(24006,30703)
-(44619,6959),(44618,6938)
-(28610,2626),(28523,2582)
-(29579,41801),(29482,41775)
-(23448,37609),(23396,37534)
-(40676,11252),(40670,11191)
-(39656,14077),(39564,13999)
-(33060,31042),(33033,30950)
-(11720,6816),(11654,6792)
-(13775,28873),(13730,28868)
-(47851,39121),(47802,39084)
-(30923,40255),(30860,40199)
-(44169,15070),(44085,15015)
-(42574,28664),(42558,28590)
-(8993,43487),(8941,43460)
-(40782,11648),(40763,11631)
-(18516,10143),(18423,10137)
-(39068,551),(39005,491)
-(39672,12000),(39575,11913)
-(18508,37761),(18464,37712)
-(19083,35318),(19079,35280)
-(30286,13736),(30222,13672)
-(7223,9164),(7132,9069)
-(20764,29286),(20700,29210)
-(5733,8063),(5699,8058)
-(8566,43873),(8549,43797)
-(22126,27444),(22062,27366)
-(15105,8717),(15078,8660)
-(43987,33145),(43940,33083)
-(46833,38652),(46755,38612)
-(47768,27202),(47681,27169)
-(22792,1183),(22731,1152)
-(25650,43310),(25562,43247)
-(37084,20116),(37045,20057)
-(47461,32556),(47423,32555)
-(41225,18124),(41215,18117)
-(17623,25218),(17553,25158)
-(13770,21703),(13770,21700)
-(48958,35441),(48870,35388)
-(2976,1808),(2892,1802)
-(45118,22318),(45049,22224)
-(42287,26616),(42281,26560)
-(25525,6327),(25468,6244)
-(40756,31634),(40713,31568)
-(23105,26565),(23078,26565)
-(48268,39862),(48265,39827)
-(41656,26254),(41567,26243)
-(28062,17920),(28045,17825)
-(6443,17321),(6402,17238)
-(10191,45466),(10151,45447)
-(18097,39706),(18043,39649)
-(37592,3244),(37569,3197)
-(29809,5978),(29762,5950)
-(12145,11251),(12130,11202)
-(37507,42999),(37446,42956)
-(10820,2866),(10782,2830)
-(36440,42904),(36421,42832)
-(38370,3386),(38279,3311)
-(9345,17279),(9313,17197)
-(20477,14864),(20395,14807)
-(37147,37769),(37110,37729)
-(15325,36135),(15284,36053)
-(29034,32897),(29009,32854)
-(2116,22274),(2037,22216)
-(15078,38330),(15048,38251)
-(7968,33600),(7914,33573)
-(832,23851),(770,23786)
-(38669,4348),(38594,4344)
-(8521,48573),(8425,48564)
-(1060,43320),(969,43289)
-(26170,10150),(26144,10069)
-(32324,8539),(32285,8506)
-(13121,18044),(13109,18021)
-(1597,9383),(1594,9367)
-(49539,35164),(49505,35065)
-(39464,10295),(39409,10261)
-(8921,37898),(8825,37803)
-(31171,47076),(31093,47039)
-(7178,41397),(7108,41304)
-(16240,34832),(16162,34761)
-(2829,20119),(2782,20091)
-(45854,21265),(45810,21250)
-(6382,12106),(6315,12030)
-(22301,46291),(22291,46274)
-(34142,14181),(34078,14158)
-(11258,29748),(11198,29742)
-(37450,6943),(37398,6882)
-(41675,27207),(41643,27130)
-(13578,49562),(13573,49479)
-(37132,37397),(37081,37301)
-(49404,37193),(49332,37170)
-(33536,31809),(33444,31735)
-(45990,42751),(45893,42708)
-(38852,20510),(38802,20509)
-(27453,15836),(27391,15802)
-(9347,29004),(9284,28946)
-(44871,27727),(44778,27668)
-(14978,19646),(14970,19644)
-(23243,47091),(23166,47080)
-(45204,21431),(45167,21370)
-(14082,22316),(14078,22235)
-(42778,22694),(42744,22606)
-(4834,25241),(4760,25196)
-(20497,18110),(20494,18038)
-(45738,35524),(45706,35496)
-(21575,5151),(21493,5092)
-(2194,10052),(2172,9960)
-(47735,24472),(47682,24460)
-(46740,35700),(46695,35609)
-(24647,42807),(24568,42779)
-(18000,30576),(17975,30506)
-(48638,46630),(48544,46628)
-(48508,33600),(48477,33578)
-(38703,45408),(38670,45313)
-(21712,15015),(21625,14956)
-(5840,42007),(5768,41992)
-(44011,11138),(43953,11117)
-(3899,33262),(3897,33238)
-(30142,23967),(30096,23927)
-(36950,13226),(36908,13141)
-(13130,26915),(13071,26873)
-(38576,35408),(38539,35392)
-(16776,46244),(16700,46176)
-(38251,25969),(38168,25948)
-(3512,32256),(3417,32242)
-(31923,31225),(31832,31197)
-(5144,4969),(5124,4937)
-(34499,46164),(34430,46162)
-(39432,31907),(39388,31828)
-(17316,24606),(17221,24533)
-(20751,49352),(20709,49323)
-(41673,30418),(41623,30377)
-(29026,24400),(28971,24345)
-(21929,30617),(21894,30598)
-(35539,12421),(35536,12355)
-(24938,45583),(24870,45525)
-(27442,33090),(27353,33064)
-(23949,12046),(23949,12036)
-(11399,377),(11360,294)
-(47099,9989),(47023,9942)
-(641,33118),(639,33084)
-(13687,41308),(13682,41290)
-(3682,17727),(3645,17660)
-(13262,19396),(13185,19357)
-(18791,389),(18774,366)
-(12489,45384),(12403,45369)
-(12065,6364),(12015,6325)
-(32705,23886),(32619,23827)
-(7004,37333),(6911,37240)
-(28594,38078),(28530,38050)
-(5805,21797),(5710,21701)
-(41145,18905),(41058,18873)
-(35599,10002),(35591,9956)
-(5387,39087),(5326,38994)
-(11703,14003),(11671,13912)
-(4093,10472),(4091,10470)
-(14110,49740),(14063,49695)
-(4170,470),(4097,463)
-(22219,17296),(22164,17221)
-(2505,20879),(2446,20842)
-(47235,24744),(47151,24667)
-(30035,23234),(30013,23197)
-(3489,11659),(3461,11607)
-(38435,46322),(38429,46230)
-(12315,32880),(12277,32854)
-(33350,35297),(33317,35263)
-(18845,37671),(18836,37589)
-(24855,23554),(24783,23520)
-(48251,44461),(48188,44408)
-(17695,43353),(17605,43286)
-(4964,21292),(4893,21270)
-(33919,29907),(33852,29878)
-(29139,40010),(29084,39957)
-(41611,37750),(41572,37741)
-(41773,34717),(41682,34700)
-(8225,7424),(8221,7363)
-(1785,28248),(1771,28219)
-(21553,36307),(21505,36257)
-(7552,18199),(7527,18119)
-(14410,30977),(14349,30944)
-(20940,49142),(20901,49069)
-(36892,5522),(36810,5478)
-(40192,20926),(40179,20926)
-(44702,15182),(44641,15117)
-(43431,4921),(43337,4827)
-(41129,21654),(41084,21642)
-(6205,42785),(6113,42722)
-(23714,10224),(23666,10205)
-(9318,35175),(9274,35139)
-(40698,12676),(40618,12627)
-(49954,1340),(49905,1294)
-(32774,33062),(32763,33062)
-(4336,22183),(4241,22157)
-(10241,47657),(10151,47592)
-(6746,16718),(6666,16634)
-(26842,49694),(26839,49680)
-(34870,47437),(34820,47347)
-(26365,22266),(26326,22183)
-(39859,932),(39829,840)
-(33995,10888),(33902,10793)
-(32972,22342),(32951,22340)
-(19951,10161),(19932,10111)
-(26779,45188),(26745,45151)
-(11235,13593),(11184,13589)
-(27334,20968),(27288,20953)
-(9586,43102),(9488,43085)
-(43935,49759),(43925,49680)
-(10548,37032),(10474,36955)
-(9326,14927),(9295,14848)
-(41340,11312),(41311,11303)
-(6500,44553),(6454,44515)
-(8198,26841),(8104,26749)
-(47761,34183),(47702,34140)
-(43637,17912),(43577,17910)
-(17623,11138),(17590,11122)
-(48122,13132),(48077,13060)
-(27911,39796),(27908,39777)
-(1108,7918),(1080,7832)
-(18776,24329),(18699,24326)
-(1171,37901),(1075,37871)
-(38437,33948),(38364,33907)
-(1913,11593),(1817,11533)
-(22684,266),(22656,181)
-(13299,17075),(13241,17074)
-(6924,30196),(6851,30113)
-(4367,13150),(4298,13053)
-(37381,6101),(37380,6046)
-(10307,28383),(10270,28349)
-(12283,8636),(12256,8610)
-(20230,32775),(20144,32723)
-(32942,12812),(32905,12714)
-(46140,7138),(46140,7047)
-(37235,29436),(37161,29425)
-(42486,25454),(42478,25444)
-(47860,46973),(47842,46961)
-(41760,21026),(41662,20955)
-(29663,20088),(29566,20026)
-(19167,33241),(19101,33235)
-(12306,37845),(12301,37803)
-(11288,873),(11203,857)
-(30309,5120),(30282,5060)
-(46927,19737),(46856,19687)
-(16664,20052),(16649,19989)
-(7330,8675),(7296,8613)
-(45067,45724),(44991,45631)
-(45317,10862),(45218,10842)
-(15012,47009),(14998,46956)
-(47882,10146),(47813,10099)
-(31571,46215),(31511,46148)
-(32257,2619),(32187,2531)
-(38924,41305),(38872,41285)
-(49981,34876),(49898,34786)
-(30501,35099),(30418,35011)
-(45862,41438),(45854,41434)
-(38448,31878),(38391,31822)
-(8278,43463),(8274,43378)
-(5883,30629),(5878,30564)
-(49501,40346),(49447,40275)
-(31651,43116),(31560,43106)
-(44244,32940),(44244,32926)
-(17941,18079),(17938,18035)
-(9518,32524),(9470,32511)
-(30707,43469),(30686,43457)
-(3284,46542),(3187,46477)
-(43423,29642),(43393,29602)
-(19940,16825),(19877,16736)
-(26194,47446),(26194,47407)
-(30386,24675),(30333,24652)
-(42707,44466),(42688,44456)
-(43395,18525),(43320,18467)
-(28346,32259),(28276,32196)
-(45106,40786),(45026,40767)
-(36734,20414),(36722,20363)
-(37140,11569),(37099,11475)
-(8967,6409),(8882,6341)
-(31036,27923),(30993,27890)
-(22442,47682),(22347,47663)
-(32511,24029),(32482,23970)
-(22593,34444),(22519,34399)
-(41534,15495),(41518,15455)
-(35862,19997),(35818,19928)
-(31419,8323),(31404,8285)
-(31036,19023),(30978,19000)
-(46900,15192),(46891,15102)
-(12774,9651),(12765,9604)
-(49985,6436),(49927,6338)
-(7184,47344),(7089,47285)
-(12792,45021),(12740,45011)
-(15019,27192),(14940,27096)
-(35415,23106),(35381,23095)
-(42129,14283),(42095,14245)
-(29375,45807),(29347,45743)
-(21763,24916),(21700,24889)
-(47656,8794),(47579,8774)
-(6139,49571),(6059,49472)
-(44492,45607),(44483,45532)
-(22699,4301),(22628,4240)
-(27407,24241),(27335,24158)
-(38424,34460),(38403,34458)
-(46572,48456),(46554,48402)
-(39676,29056),(39643,28981)
-(4202,33076),(4107,33010)
-(32499,10592),(32482,10575)
-(22504,45417),(22459,45378)
-(49619,40322),(49619,40268)
-(14463,9305),(14426,9224)
-(10070,20300),(10035,20211)
-(35060,28561),(34965,28553)
-(23970,47522),(23887,47428)
-(46803,19155),(46790,19131)
-(46151,49848),(46058,49830)
-(45266,40766),(45209,40738)
-(31041,32195),(31007,32110)
-(41401,17245),(41334,17224)
-(37445,654),(37435,602)
-(45568,31904),(45508,31857)
-(29326,7923),(29285,7896)
-(27078,34643),(27027,34606)
-(34492,43443),(34437,43345)
-(34109,4307),(34083,4265)
-(2755,45325),(2727,45312)
-(12571,24218),(12536,24195)
-(41224,2454),(41149,2445)
-(711,34828),(655,34788)
-(9104,18865),(9036,18850)
-(3508,26816),(3456,26771)
-(20159,16212),(20116,16160)
-(36871,7425),(36777,7421)
-(2751,45244),(2734,45222)
-(35867,28071),(35769,28052)
-(46878,35730),(46850,35725)
-(20610,35086),(20513,35037)
-(3903,32612),(3887,32517)
-(9330,40226),(9289,40169)
-(6338,28242),(6329,28184)
-(35668,18344),(35606,18304)
-(29892,48927),(29878,48879)
-(26999,646),(26932,612)
-(36377,38898),(36338,38847)
-(40289,31459),(40236,31436)
-(30377,1164),(30306,1069)
-(7642,12183),(7590,12112)
-(40325,1716),(40296,1662)
-(36412,38787),(36318,38691)
-(3967,33268),(3923,33261)
-(33914,40774),(33873,40763)
-(45978,41431),(45963,41332)
-(39195,12546),(39120,12520)
-(29962,30878),(29941,30846)
-(9365,10732),(9310,10726)
-(28801,23943),(28740,23885)
-(28934,38858),(28928,38807)
-(22126,45897),(22068,45803)
-(2923,33832),(2918,33751)
-(25116,2276),(25083,2272)
-(31174,14546),(31144,14460)
-(11728,9072),(11658,9004)
-(19804,49195),(19730,49125)
-(23090,28826),(23010,28787)
-(33989,27553),(33947,27486)
-(39702,47613),(39641,47553)
-(31397,3607),(31304,3519)
-(5835,9262),(5791,9226)
-(40112,37022),(40038,36926)
-(12346,29356),(12282,29344)
-(28503,9623),(28469,9591)
-(38449,43143),(38378,43066)
-(36950,37311),(36905,37265)
-(34824,5729),(34818,5706)
-(9288,26969),(9225,26900)
-(2535,42176),(2478,42159)
-(29098,49051),(29085,49031)
-(44759,33326),(44727,33230)
-(42849,2970),(42821,2919)
-(46014,27193),(45985,27151)
-(14506,13713),(14417,13626)
-(19342,44905),(19332,44895)
-(38178,37003),(38147,36925)
-(29179,27310),(29084,27288)
-(42713,10158),(42671,10060)
-(43336,38389),(43290,38326)
-(41260,34410),(41245,34327)
-(27907,2695),(27830,2596)
-(16309,44972),(16222,44966)
-(6230,22262),(6214,22249)
-(9266,39458),(9175,39447)
-(33120,33548),(33087,33538)
-(43659,11416),(43599,11375)
-(49707,39258),(49702,39159)
-(23520,22140),(23486,22072)
-(24736,46502),(24668,46412)
-(7826,16851),(7730,16807)
-(39114,6048),(39056,5965)
-(11859,8753),(11764,8701)
-(42254,48367),(42240,48328)
-(26136,49185),(26056,49175)
-(38395,11209),(38334,11137)
-(33249,9425),(33209,9348)
-(22131,38502),(22112,38460)
-(5306,24344),(5267,24268)
-(30292,1198),(30233,1149)
-(9903,10896),(9850,10806)
-(25568,22911),(25487,22868)
-(22048,43391),(22043,43362)
-(20852,25827),(20851,25766)
-(35204,17119),(35114,17093)
-(5575,43431),(5554,43410)
-(17727,13623),(17678,13560)
-(14721,29520),(14709,29461)
-(40317,42220),(40267,42166)
-(31435,31012),(31386,30931)
-(40655,10103),(40645,10006)
-(35783,17802),(35773,17763)
-(34874,10210),(34856,10200)
-(3694,14279),(3610,14239)
-(27854,5493),(27799,5433)
-(34913,7234),(34894,7220)
-(15758,26445),(15738,26421)
-(23710,7272),(23705,7270)
-(33679,13468),(33628,13415)
-(31271,40495),(31178,40461)
-(759,187),(662,163)
-(14419,40434),(14402,40381)
-(45879,42933),(45814,42872)
-(167,17214),(92,17184)
-(9964,12210),(9958,12195)
-(35834,46257),(35817,46211)
-(26077,5629),(25978,5621)
-(46177,44640),(46082,44544)
-(44780,28753),(44707,28692)
-(35491,24729),(35425,24690)
-(33914,34190),(33914,34131)
-(17709,33253),(17668,33227)
-(45516,11888),(45423,11848)
-(24497,24752),(24411,24710)
-(30333,5952),(30331,5886)
-(444,12587),(430,12497)
-(7592,22353),(7541,22287)
-(13387,37414),(13329,37318)
-(21504,35227),(21449,35210)
-(18533,12909),(18438,12848)
-(41049,27148),(41048,27088)
-(18205,12222),(18151,12140)
-(18026,5164),(18026,5156)
-(34104,29862),(34006,29815)
-(18520,49686),(18454,49602)
-(37000,41493),(36920,41424)
-(43025,25711),(42986,25687)
-(38620,47018),(38535,46934)
-(24119,36813),(24023,36739)
-(48887,26359),(48879,26302)
-(47827,14625),(47810,14609)
-(10792,30746),(10776,30716)
-(30384,40672),(30318,40582)
-(48417,22790),(48358,22746)
-(14854,5819),(14785,5798)
-(19142,44414),(19085,44406)
-(31179,27081),(31145,27005)
-(19692,8711),(19659,8642)
-(39689,14082),(39603,14051)
-(11181,39091),(11119,39002)
-(46015,23374),(45936,23328)
-(12517,49702),(12427,49690)
-(21926,21137),(21841,21111)
-(31956,12509),(31870,12494)
-(5895,2030),(5851,2020)
-(27094,5447),(27014,5377)
-(35781,8717),(35780,8618)
-(14012,12023),(13972,12015)
-(1702,12442),(1696,12419)
-(28549,5251),(28462,5248)
-(26441,21007),(26360,20925)
-(49820,7990),(49771,7967)
-(26424,29698),(26339,29693)
-(35146,6820),(35071,6817)
-(15438,18788),(15435,18729)
-(47115,5235),(47096,5143)
-(33982,9002),(33915,8925)
-(14206,37041),(14174,36955)
-(24300,36616),(24232,36613)
-(44658,1788),(44580,1769)
-(31539,43550),(31463,43464)
-(16722,9673),(16633,9652)
-(44813,20573),(44733,20544)
-(42114,32559),(42040,32552)
-(41561,36244),(41477,36241)
-(39589,33796),(39548,33716)
-(20365,26770),(20329,26709)
-(28511,208),(28479,114)
-(10010,25524),(9930,25508)
-(1549,45666),(1512,45621)
-(16193,1927),(16166,1869)
-(34486,11500),(34421,11401)
-(14048,37944),(13994,37901)
-(21692,9594),(21617,9496)
-(2568,37899),(2557,37811)
-(4360,24503),(4278,24443)
-(50027,49230),(49951,49214)
-(44849,14867),(44836,14813)
-(16695,34896),(16683,34840)
-(12600,35217),(12593,35129)
-(23113,24009),(23030,23962)
-(49907,30225),(49810,30158)
-(18026,25208),(17970,25208)
-(49711,39844),(49651,39790)
-(5427,42682),(5357,42637)
-(23901,14221),(23802,14184)
-(15470,12185),(15376,12163)
-(47302,34023),(47292,34001)
-(24336,17418),(24315,17393)
-(13948,17043),(13903,16970)
-(8555,8986),(8530,8953)
-(48830,6038),(48743,5986)
-(48720,40687),(48623,40610)
-(21161,30970),(21146,30896)
-(9507,36316),(9411,36261)
-(36643,18136),(36614,18106)
-(1858,7457),(1851,7402)
-(24452,44306),(24372,44252)
-(3292,807),(3205,806)
-(6845,30694),(6792,30627)
-(21333,25786),(21237,25751)
-(23008,22574),(22999,22511)
-(8790,8893),(8772,8806)
-(43333,47968),(43264,47900)
-(5377,24103),(5302,24076)
-(18410,23993),(18329,23907)
-(24752,19126),(24713,19069)
-(49772,11378),(49696,11293)
-(3468,12920),(3396,12873)
-(1746,40342),(1736,40333)
-(49187,29737),(49139,29681)
-(27657,44952),(27581,44917)
-(35407,30177),(35345,30151)
-(4071,40568),(4058,40544)
-(25998,30513),(25965,30452)
-(8195,45403),(8097,45310)
-(8276,41689),(8183,41670)
-(48435,28550),(48355,28455)
-(8139,25449),(8136,25380)
-(20302,25574),(20297,25531)
-(22055,46659),(22034,46567)
-(3531,49962),(3463,49934)
-(46828,46938),(46739,46902)
-(42294,786),(42212,739)
-(8779,3292),(8761,3275)
-(48146,46170),(48082,46151)
-(21571,10000),(21531,9919)
-(35526,26029),(35450,25945)
-(38893,22225),(38865,22197)
-(22189,37520),(22132,37497)
-(810,43261),(751,43198)
-(10352,39144),(10290,39093)
-(8740,35435),(8720,35432)
-(31657,13551),(31583,13484)
-(39803,4019),(39755,4014)
-(46353,7853),(46312,7824)
-(30078,48975),(30021,48970)
-(2847,32036),(2819,31966)
-(25250,10147),(25165,10140)
-(15643,38953),(15585,38947)
-(40792,29798),(40731,29731)
-(43249,26858),(43215,26835)
-(47229,2199),(47201,2134)
-(10052,23601),(9958,23570)
-(38981,21615),(38892,21604)
-(3651,45004),(3570,44917)
-(21503,8261),(21409,8166)
-(13518,34201),(13465,34105)
-(13899,25117),(13836,25114)
-(18327,17403),(18301,17349)
-(19503,13648),(19483,13607)
-(3554,19487),(3529,19466)
-(41102,43355),(41070,43314)
-(4663,45858),(4583,45765)
-(3971,3023),(3931,2975)
-(37124,7061),(37080,6993)
-(48530,47172),(48459,47160)
-(14575,29843),(14509,29750)
-(43443,23124),(43357,23038)
-(8864,48290),(8857,48263)
-(41597,39852),(41577,39791)
-(35610,33392),(35556,33353)
-(36415,17906),(36328,17846)
-(24919,43933),(24839,43883)
-(7457,14056),(7395,14051)
-(43851,4090),(43801,4080)
-(43567,18468),(43471,18388)
-(16711,6084),(16652,6055)
-(45888,45934),(45846,45880)
-(45630,9313),(45585,9248)
-(27119,25969),(27094,25884)
-(36155,11420),(36120,11405)
-(41880,47111),(41808,47049)
-(17554,20379),(17482,20374)
-(38848,5936),(38763,5869)
-(28324,31019),(28276,30944)
-(43257,17152),(43176,17091)
-(42717,24613),(42691,24527)
-(16786,41486),(16763,41403)
-(19259,28780),(19160,28711)
-(25843,28265),(25760,28171)
-(48645,34816),(48546,34755)
-(7004,49289),(6976,49236)
-(30261,21833),(30181,21776)
-(5290,46672),(5219,46661)
-(21237,31901),(21188,31849)
-(23340,38537),(23253,38472)
-(17269,3682),(17183,3586)
-(48200,15377),(48110,15369)
-(16546,22195),(16477,22142)
-(21436,8460),(21378,8449)
-(46598,17235),(46577,17138)
-(30212,36184),(30152,36092)
-(18037,155),(17941,109)
-(4945,29201),(4933,29184)
-(32835,18782),(32770,18750)
-(34160,33104),(34120,33007)
-(5151,26989),(5149,26909)
-(1801,15549),(1710,15461)
-(48988,34819),(48951,34764)
-(20904,32547),(20856,32497)
-(32654,35183),(32606,35144)
-(14336,11763),(14328,11712)
-(30546,23808),(30463,23773)
-(6813,21006),(6781,20924)
-(14199,22030),(14185,21934)
-(3783,14709),(3747,14658)
-(49428,47052),(49422,46973)
-(29551,27682),(29470,27654)
-(29170,37260),(29151,37181)
-(48924,24689),(48894,24680)
-(48497,34052),(48453,33966)
-(21263,8203),(21242,8176)
-(46537,3797),(46462,3735)
-(18406,14579),(18393,14563)
-(11583,16529),(11536,16471)
-(10564,46257),(10478,46228)
-(49769,34513),(49761,34458)
-(9202,6482),(9138,6391)
-(40387,37411),(40357,37360)
-(11966,11802),(11888,11751)
-(15551,47438),(15486,47406)
-(12017,43288),(11969,43230)
-(9717,22574),(9701,22495)
-(35083,49443),(35075,49355)
-(33857,9320),(33813,9269)
-(32106,10581),(32012,10560)
-(14345,12485),(14273,12424)
-(24187,46416),(24175,46402)
-(43854,42159),(43808,42129)
-(35399,40707),(35359,40646)
-(29585,25576),(29493,25556)
-(24919,7829),(24911,7753)
-(17049,48390),(17022,48304)
-(25224,35012),(25217,34922)
-(47397,20853),(47346,20779)
-(17221,16558),(17181,16516)
-(8669,16491),(8645,16486)
-(23502,44241),(23484,44164)
-(36169,37046),(36072,37010)
-(44775,32394),(44763,32357)
-(30685,36871),(30662,36792)
-(21783,47642),(21714,47630)
-(34847,27467),(34761,27372)
-(43925,49912),(43888,49878)
-(16455,27861),(16364,27813)
-(38406,18310),(38329,18309)
-(5408,9461),(5319,9426)
-(41856,36900),(41784,36854)
-(23723,4460),(23646,4448)
-(18454,40138),(18430,40046)
-(17505,36822),(17418,36763)
-(36686,33534),(36641,33476)
-(11347,9454),(11289,9436)
-(27816,34752),(27745,34736)
-(44213,8559),(44162,8461)
-(45359,26789),(45315,26776)
-(31249,19475),(31224,19421)
-(25917,44239),(25819,44149)
-(47313,40691),(47264,40685)
-(40577,33848),(40513,33794)
-(9606,45253),(9582,45174)
-(30005,24521),(29910,24496)
-(49332,35375),(49309,35299)
-(12164,33871),(12075,33820)
-(19598,43327),(19593,43314)
-(3818,28584),(3815,28504)
-(35579,8611),(35541,8604)
-(8811,20986),(8750,20954)
-(16139,44777),(16128,44686)
-(35550,41501),(35534,41458)
-(43180,11927),(43109,11891)
-(45798,8465),(45711,8460)
-(18196,6886),(18126,6845)
-(1774,32167),(1701,32073)
-(7030,40790),(7029,40711)
-(11676,23009),(11665,22915)
-(33990,22561),(33953,22474)
-(30366,9447),(30284,9353)
-(37626,32913),(37596,32853)
-(7730,42561),(7665,42470)
-(49347,8403),(49315,8387)
-(6874,3499),(6812,3458)
-(44189,16999),(44169,16964)
-(6312,30167),(6231,30083)
-(18932,6611),(18909,6518)
-(32262,13076),(32223,13057)
-(45989,249),(45910,222)
-(42710,855),(42692,796)
-(25562,9849),(25535,9802)
-(13348,46719),(13260,46689)
-(30022,42196),(30005,42160)
-(22263,45954),(22243,45950)
-(18918,18890),(18820,18795)
-(31918,12003),(31852,11989)
-(12252,39453),(12211,39398)
-(40208,9789),(40194,9759)
-(35943,21767),(35914,21693)
-(18439,10706),(18383,10618)
-(2803,18999),(2778,18925)
-(14953,27444),(14875,27397)
-(12587,22025),(12545,21928)
-(33930,21090),(33918,21009)
-(10444,2606),(10407,2553)
-(28700,29782),(28665,29703)
-(1402,13497),(1397,13465)
-(24155,3075),(24083,3062)
-(38378,1864),(38339,1849)
-(29261,49910),(29247,49818)
-(38139,37073),(38098,37057)
-(24468,41130),(24418,41053)
-(9989,1015),(9959,939)
-(47001,33561),(46994,33518)
-(47058,16030),(46983,16012)
-(35509,1814),(35426,1748)
-(3630,48019),(3597,47923)
-(47781,12986),(47741,12947)
-(16364,9908),(16356,9882)
-(17290,41508),(17287,41410)
-(42423,26477),(42349,26434)
-(10039,920),(9952,833)
-(16851,21338),(16846,21314)
-(23104,7700),(23062,7688)
-(5619,2079),(5611,2075)
-(31471,49632),(31375,49549)
-(25793,12526),(25783,12456)
-(3935,29528),(3866,29513)
-(5957,1646),(5947,1595)
-(2467,22376),(2429,22349)
-(43715,32673),(43664,32595)
-(6726,13093),(6636,12994)
-(31477,18347),(31421,18299)
-(34232,36635),(34200,36552)
-(49061,14516),(49008,14442)
-(43996,6129),(43955,6074)
-(7728,33802),(7670,33703)
-(6131,36766),(6053,36749)
-(35791,16361),(35696,16329)
-(45759,8935),(45675,8886)
-(43634,2029),(43537,1940)
-(4916,32233),(4844,32181)
-(46701,23508),(46623,23477)
-(29590,4893),(29552,4871)
-(38647,4423),(38574,4396)
-(7593,25845),(7497,25751)
-(8510,43552),(8432,43492)
-(18791,39181),(18730,39162)
-(7462,2956),(7454,2858)
-(1394,26795),(1392,26780)
-(16707,21993),(16609,21932)
-(26838,10866),(26803,10836)
-(31642,29842),(31585,29760)
-(21891,3502),(21863,3406)
-(13258,587),(13250,507)
-(6072,47397),(6021,47369)
-(16605,49730),(16579,49659)
-(42830,40981),(42791,40981)
-(12975,3706),(12913,3637)
-(30925,21660),(30826,21649)
-(1455,14229),(1410,14156)
-(17583,16486),(17562,16474)
-(33377,3387),(33333,3381)
-(784,6177),(750,6095)
-(22111,44110),(22106,44013)
-(1444,403),(1346,344)
-(4010,46220),(3982,46212)
-(17932,8150),(17861,8127)
-(38685,31466),(38636,31416)
-(14257,11549),(14242,11522)
-(14990,15217),(14904,15211)
-(21395,21533),(21307,21520)
-(31948,33725),(31885,33694)
-(433,49033),(390,48961)
-(45205,609),(45173,523)
-(25065,35494),(25003,35455)
-(33265,6677),(33224,6611)
-(18179,22345),(18133,22256)
-(3916,13759),(3820,13732)
-(1696,13478),(1604,13436)
-(47203,25980),(47130,25907)
-(24913,13361),(24868,13268)
-(13824,40177),(13792,40130)
-(25671,13555),(25585,13494)
-(20133,37769),(20105,37679)
-(26368,16734),(26288,16726)
-(30545,35438),(30458,35376)
-(48816,22926),(48812,22831)
-(48807,31389),(48739,31330)
-(11003,10859),(10950,10765)
-(17288,8570),(17247,8485)
-(38377,31415),(38331,31379)
-(19085,23425),(19059,23326)
-(40059,17068),(40052,17006)
-(18811,13493),(18734,13394)
-(36319,17197),(36225,17181)
-(14939,38780),(14863,38714)
-(49539,17656),(49479,17629)
-(42530,45951),(42466,45854)
-(27318,26654),(27233,26610)
-(49980,35004),(49937,34963)
-(18326,32558),(18322,32502)
-(45951,28555),(45896,28481)
-(12104,33531),(12014,33501)
-(22311,41113),(22215,41066)
-(25073,18721),(25047,18656)
-(14524,13486),(14510,13390)
-(40040,36688),(40000,36599)
-(21594,11473),(21563,11436)
-(44031,22274),(43938,22187)
-(729,30683),(668,30601)
-(14114,20873),(14102,20803)
-(28239,41377),(28222,41308)
-(26404,11922),(26317,11843)
-(41660,34586),(41585,34501)
-(21128,2384),(21101,2368)
-(30209,16952),(30156,16858)
-(39078,24963),(39045,24898)
-(5598,1348),(5499,1294)
-(38474,7436),(38450,7364)
-(15117,45734),(15024,45693)
-(23909,39853),(23888,39780)
-(24292,30183),(24282,30148)
-(48871,17661),(48868,17637)
-(918,18752),(847,18708)
-(43615,16162),(43606,16104)
-(33763,47410),(33751,47409)
-(4798,6485),(4773,6388)
-(18524,41539),(18433,41518)
-(47745,42449),(47651,42364)
-(38936,21237),(38864,21204)
-(5251,3516),(5194,3475)
-(22269,36269),(22183,36228)
-(18736,40983),(18685,40947)
-(38393,15444),(38356,15363)
-(38134,29898),(38103,29862)
-(37789,39557),(37732,39474)
-(31906,23005),(31838,23003)
-(10647,40094),(10560,40040)
-(9914,41547),(9867,41545)
-(44221,443),(44125,433)
-(41479,10936),(41381,10847)
-(42586,6301),(42563,6235)
-(2504,17588),(2449,17554)
-(7045,18782),(7028,18764)
-(41840,32018),(41768,31938)
-(38416,17158),(38330,17060)
-(8605,39015),(8605,38933)
-(5764,43548),(5719,43496)
-(20789,29902),(20696,29843)
-(36104,47896),(36079,47816)
-(31736,13834),(31722,13832)
-(32617,19701),(32597,19684)
-(1671,18997),(1622,18945)
-(36007,26545),(36005,26535)
-(31864,17494),(31820,17455)
-(27346,28388),(27303,28289)
-(8191,9653),(8133,9589)
-(7501,21616),(7405,21536)
-(35450,9580),(35368,9563)
-(29281,37276),(29247,37255)
-(6225,17192),(6200,17135)
-(43689,8119),(43670,8028)
-(41917,49601),(41835,49563)
-(44295,13116),(44205,13078)
-(22721,44772),(22667,44748)
-(32640,11107),(32636,11050)
-(20639,28851),(20613,28839)
-(32479,10159),(32446,10061)
-(27251,16978),(27196,16959)
-(41401,33148),(41339,33074)
-(49001,8538),(48989,8444)
-(37958,35843),(37874,35802)
-(46969,41229),(46903,41138)
-(18541,8876),(18541,8870)
-(4080,31634),(4061,31627)
-(8097,35240),(8040,35152)
-(18470,21414),(18463,21412)
-(20914,17897),(20838,17869)
-(42688,11681),(42666,11641)
-(47525,25005),(47443,24907)
-(32439,14438),(32397,14400)
-(39667,19626),(39622,19542)
-(1212,44525),(1169,44516)
-(29766,4433),(29668,4401)
-(25847,49657),(25813,49605)
-(33859,17356),(33827,17263)
-(28989,45953),(28904,45854)
-(37211,30830),(37113,30819)
-(45220,26382),(45219,26340)
-(12312,43250),(12234,43246)
-(37775,41504),(37762,41421)
-(45889,33499),(45822,33411)
-(49461,22601),(49369,22553)
-(39857,33844),(39816,33824)
-(46102,15822),(46030,15778)
-(46605,31239),(46598,31170)
-(23925,5856),(23862,5808)
-(15459,4262),(15407,4241)
-(12019,4907),(12015,4818)
-(38258,17973),(38229,17923)
-(40575,29566),(40477,29521)
-(29715,45919),(29697,45891)
-(11694,9510),(11670,9490)
-(7053,44257),(7012,44231)
-(16465,8603),(16391,8505)
-(29170,15592),(29098,15527)
-(20400,37354),(20345,37328)
-(5281,10265),(5252,10184)
-(6084,48782),(6058,48727)
-(11006,6889),(10971,6796)
-(16299,19461),(16286,19411)
-(13718,29192),(13642,29106)
-(3999,2965),(3963,2903)
-(18509,12235),(18430,12208)
-(49542,38575),(49537,38534)
-(15093,41715),(15071,41634)
-(6802,8385),(6714,8300)
-(15127,17507),(15097,17424)
-(36921,3025),(36835,2995)
-(32117,24327),(32101,24262)
-(27244,24151),(27165,24104)
-(36339,42360),(36313,42358)
-(47288,46252),(47245,46184)
-(37867,6649),(37818,6565)
-(14886,22103),(14865,22089)
-(39611,17952),(39513,17951)
-(37329,31436),(37298,31436)
-(5715,39115),(5698,39099)
-(13266,7364),(13203,7296)
-(16076,10945),(16006,10942)
-(7197,41509),(7126,41413)
-(14411,40868),(14330,40772)
-(12872,33481),(12862,33454)
-(17786,19616),(17758,19560)
-(1052,37358),(996,37311)
-(42825,12643),(42762,12625)
-(20007,49858),(19921,49778)
-(27155,6355),(27072,6257)
-(14117,40208),(14022,40155)
-(47280,34069),(47279,34028)
-(17551,15803),(17482,15763)
-(1725,6673),(1676,6649)
-(43984,31128),(43961,31105)
-(43772,47042),(43731,47038)
-(46901,47317),(46817,47228)
-(19877,14179),(19837,14168)
-(20691,19989),(20675,19935)
-(4011,18914),(3963,18817)
-(1023,23378),(933,23317)
-(30051,46118),(29966,46039)
-(43499,46488),(43496,46409)
-(43531,2412),(43447,2396)
-(16034,32285),(15976,32220)
-(12817,21365),(12740,21298)
-(7607,47293),(7585,47293)
-(32512,12218),(32463,12170)
-(1848,21496),(1839,21439)
-(17567,23073),(17478,23046)
-(35813,31847),(35807,31792)
-(563,30859),(540,30842)
-(13145,15488),(13063,15433)
-(36754,37479),(36731,37411)
-(1125,26069),(1057,25997)
-(4539,20676),(4519,20618)
-(8476,34721),(8409,34681)
-(7794,25691),(7727,25656)
-(23842,514),(23800,473)
-(47678,41396),(47668,41365)
-(6837,25974),(6799,25892)
-(13355,11174),(13304,11161)
-(37243,25548),(37158,25471)
-(12528,30208),(12441,30205)
-(14929,1672),(14886,1607)
-(27263,49026),(27263,49010)
-(15892,21645),(15835,21642)
-(29446,48978),(29360,48967)
-(41304,9892),(41211,9825)
-(37418,49393),(37338,49296)
-(41146,32178),(41120,32165)
-(28738,13326),(28722,13266)
-(14899,36595),(14873,36559)
-(1973,31435),(1921,31426)
-(19485,17742),(19421,17661)
-(33072,20995),(32980,20903)
-(47091,30055),(47080,30037)
-(45753,12998),(45686,12992)
-(11528,7826),(11509,7794)
-(21104,13921),(21060,13836)
-(16768,15491),(16747,15470)
-(13279,20396),(13249,20326)
-(4342,49518),(4339,49446)
-(20413,15476),(20349,15447)
-(45532,5649),(45484,5627)
-(18647,27196),(18619,27115)
-(1326,17473),(1261,17400)
-(47646,19644),(47588,19609)
-(35088,1813),(35080,1732)
-(38461,34839),(38410,34838)
-(34358,11540),(34285,11506)
-(26969,7078),(26953,6989)
-(12629,40352),(12617,40264)
-(33800,7037),(33731,6992)
-(24462,13518),(24392,13486)
-(33164,47357),(33096,47329)
-(15422,18451),(15413,18376)
-(19643,12916),(19567,12912)
-(40860,42125),(40770,42050)
-(49103,29614),(49039,29606)
-(36319,35582),(36222,35528)
-(8924,36083),(8873,36018)
-(49603,44022),(49505,44021)
-(7783,40633),(7702,40618)
-(25388,49107),(25346,49042)
-(28375,38947),(28306,38919)
-(47324,22672),(47321,22660)
-(2287,8808),(2266,8719)
-(44343,16339),(44248,16318)
-(2374,28839),(2336,28798)
-(22913,40710),(22819,40688)
-(47747,684),(47658,627)
-(16043,46011),(16021,45984)
-(34958,32168),(34903,32092)
-(4840,49328),(4752,49258)
-(24341,2087),(24330,2009)
-(18378,19374),(18327,19358)
-(48165,7217),(48156,7141)
-(14232,6044),(14182,6004)
-(23080,4196),(22983,4191)
-(259,1850),(175,1820)
-(270,29508),(264,29440)
-(45088,11375),(45050,11295)
-(29666,39386),(29656,39302)
-(8712,8782),(8660,8713)
-(15900,6650),(15855,6561)
-(28946,28348),(28917,28347)
-(32544,25845),(32538,25779)
-(44047,6957),(43951,6942)
-(36465,588),(36382,503)
-(28167,26679),(28150,26673)
-(16065,4268),(15975,4180)
-(12950,23494),(12893,23494)
-(30145,24679),(30056,24654)
-(3027,16162),(3001,16071)
-(8259,34537),(8202,34484)
-(41447,1515),(41427,1454)
-(18407,28362),(18309,28303)
-(21393,41872),(21328,41816)
-(46040,26497),(45996,26408)
-(49944,25163),(49902,25153)
-(16195,11843),(16159,11831)
-(44257,15270),(44254,15214)
-(49760,4791),(49699,4713)
-(22558,33709),(22519,33681)
-(28375,10003),(28336,9938)
-(18179,24310),(18106,24256)
-(707,30688),(664,30669)
-(5851,26118),(5822,26037)
-(4266,1292),(4221,1217)
-(16516,11331),(16432,11248)
-(32374,38277),(32313,38245)
-(21939,8015),(21927,7952)
-(34322,32051),(34242,32003)
-(6262,35977),(6260,35953)
-(16717,38594),(16622,38498)
-(14564,3433),(14535,3425)
-(21078,1000),(20994,974)
-(28584,956),(28575,868)
-(5538,9962),(5465,9870)
-(34183,44102),(34175,44085)
-(42507,10289),(42441,10288)
-(12671,19936),(12594,19920)
-(24835,12179),(24770,12173)
-(15664,11538),(15598,11494)
-(28892,24446),(28821,24350)
-(41654,26720),(41570,26632)
-(36583,387),(36503,357)
-(10842,34824),(10795,34788)
-(11518,42588),(11429,42565)
-(12577,40322),(12486,40266)
-(2453,4045),(2439,3956)
-(31837,33705),(31803,33681)
-(24403,27711),(24383,27705)
-(4431,2748),(4337,2656)
-(3036,2887),(3014,2826)
-(37664,16118),(37615,16022)
-(8606,18063),(8587,18038)
-(24738,25458),(24656,25362)
-(45756,34022),(45671,33948)
-(34079,15236),(33981,15171)
-(9251,22488),(9228,22470)
-(25136,2809),(25126,2717)
-(5548,47695),(5543,47685)
-(13765,40800),(13707,40754)
-(25216,30678),(25144,30677)
-(22441,17169),(22392,17106)
-(1091,4770),(1054,4734)
-(36311,50073),(36258,49987)
-(22461,33163),(22457,33128)
-(35873,28907),(35845,28867)
-(42907,15848),(42904,15785)
-(6549,24897),(6540,24861)
-(21928,37764),(21891,37681)
-(21237,41132),(21139,41086)
-(12207,24266),(12173,24235)
-(40643,49770),(40574,49687)
-(32833,35686),(32815,35674)
-(14545,18143),(14541,18098)
-(33892,42783),(33884,42707)
-(33933,8381),(33921,8369)
-(12450,19044),(12403,19002)
-(10176,45158),(10088,45145)
-(35828,12080),(35732,12022)
-(28102,13694),(28061,13666)
-(49432,31744),(49340,31711)
-(16192,37743),(16162,37697)
-(46830,867),(46756,790)
-(9200,28048),(9159,27986)
-(13397,19369),(13340,19288)
-(30879,43562),(30785,43545)
-(21995,48224),(21920,48143)
-(11871,47569),(11809,47568)
-(29366,22196),(29280,22154)
-(26243,28176),(26203,28116)
-(28995,35031),(28906,35014)
-(29384,39276),(29352,39183)
-(8497,13798),(8471,13789)
-(7412,27226),(7334,27220)
-(25403,47678),(25363,47654)
-(11599,5556),(11574,5502)
-(44056,5123),(44008,5111)
-(49603,30877),(49579,30840)
-(32261,45876),(32206,45865)
-(35104,41659),(35048,41587)
-(5457,35844),(5376,35782)
-(29423,3977),(29354,3959)
-(18059,3001),(17965,2961)
-(8509,5691),(8463,5620)
-(27118,5762),(27083,5747)
-(2991,48605),(2939,48559)
-(44482,3484),(44425,3459)
-(45143,16439),(45046,16365)
-(2236,37531),(2147,37530)
-(41561,3217),(41490,3210)
-(6270,27200),(6171,27166)
-(49195,24871),(49138,24798)
-(46985,38881),(46897,38845)
-(37486,23522),(37404,23441)
-(26907,14490),(26900,14391)
-(30829,16111),(30756,16056)
-(3644,17291),(3587,17262)
-(20508,49775),(20472,49680)
-(43279,8972),(43198,8936)
-(33744,7470),(33734,7439)
-(46303,20538),(46284,20498)
-(10365,48246),(10291,48154)
-(12636,24987),(12545,24933)
-(40998,46992),(40989,46916)
-(30536,6073),(30531,6018)
-(22102,9643),(22051,9594)
-(18616,34348),(18530,34332)
-(8222,8907),(8123,8848)
-(45698,28860),(45698,28770)
-(26958,1748),(26924,1726)
-(26735,35073),(26659,35025)
-(48370,40813),(48293,40737)
-(13140,993),(13108,934)
-(10588,22893),(10528,22883)
-(23645,40789),(23567,40698)
-(49548,12374),(49546,12329)
-(41135,39626),(41100,39602)
-(41374,10856),(41328,10769)
-(12234,5765),(12146,5674)
-(12832,46941),(12764,46917)
-(47886,34532),(47851,34500)
-(23777,10549),(23735,10495)
-(1291,16913),(1194,16873)
-(29239,30554),(29202,30500)
-(36485,30007),(36454,29924)
-(7067,11320),(7045,11229)
-(16939,30482),(16904,30462)
-(27423,34386),(27379,34303)
-(35170,32021),(35155,31979)
-(42570,36477),(42474,36457)
-(19695,679),(19682,594)
-(47537,39450),(47446,39450)
-(19410,22942),(19375,22922)
-(34216,40166),(34152,40158)
-(37000,24351),(36972,24299)
-(24989,1681),(24954,1672)
-(54,38679),(3,38602)
-(41461,40693),(41411,40599)
-(7576,46054),(7545,45963)
-(35505,28262),(35413,28222)
-(1158,16976),(1145,16927)
-(23494,42291),(23437,42229)
-(32894,32519),(32880,32485)
-(604,13413),(509,13401)
-(18396,19712),(18355,19646)
-(26657,28234),(26597,28191)
-(24240,47211),(24154,47191)
-(41778,10741),(41766,10730)
-(44022,43776),(44010,43677)
-(35967,30055),(35906,29969)
-(28878,18042),(28806,18027)
-(31507,27302),(31428,27267)
-(13267,21935),(13265,21872)
-(122,46832),(64,46762)
-(10348,45916),(10306,45844)
-(22962,12644),(22927,12607)
-(6320,22290),(6284,22247)
-(2297,11372),(2216,11298)
-(29366,36660),(29325,36654)
-(13962,39307),(13921,39220)
-(11094,19151),(11092,19143)
-(32289,23776),(32258,23760)
-(36044,17356),(35956,17273)
-(46304,38692),(46232,38675)
-(10934,42999),(10922,42909)
-(4271,21177),(4207,21093)
-(7837,19926),(7747,19905)
-(25537,36605),(25477,36584)
-(22161,14999),(22079,14962)
-(5127,31243),(5074,31213)
-(14904,40664),(14838,40593)
-(29308,8480),(29268,8438)
-(17731,7410),(17699,7352)
-(44840,29293),(44797,29248)
-(15523,31519),(15505,31485)
-(34429,38479),(34421,38478)
-(3530,23456),(3440,23390)
-(4699,6889),(4603,6796)
-(47405,48524),(47389,48514)
-(23357,43160),(23305,43156)
-(16923,1995),(16860,1937)
-(47592,33853),(47537,33758)
-(31624,37490),(31595,37473)
-(42321,13380),(42303,13337)
-(3088,16094),(3079,16060)
-(22884,2955),(22856,2857)
-(17784,23073),(17724,23044)
-(32638,45577),(32553,45512)
-(13876,44091),(13801,44000)
-(27844,24384),(27758,24330)
-(28178,10225),(28155,10167)
-(39910,14277),(39857,14241)
-(30372,19524),(30301,19514)
-(38732,43151),(38724,43151)
-(32628,2068),(32547,2068)
-(13950,28652),(13932,28566)
-(38996,41070),(38919,40993)
-(31759,45246),(31676,45215)
-(5424,34145),(5382,34106)
-(14727,45600),(14699,45547)
-(31429,21537),(31414,21499)
-(14740,3420),(14650,3323)
-(21793,39498),(21743,39471)
-(18102,25924),(18037,25868)
-(33299,683),(33213,594)
-(45882,48765),(45809,48721)
-(49215,4098),(49180,4067)
-(49698,33743),(49614,33663)
-(21532,5215),(21514,5151)
-(24840,26877),(24826,26808)
-(32680,28433),(32631,28364)
-(20661,27511),(20584,27414)
-(28048,30385),(28009,30315)
-(45403,42533),(45389,42464)
-(46531,36947),(46531,36850)
-(36943,32817),(36865,32737)
-(37984,43763),(37888,43748)
-(20593,10650),(20557,10610)
-(5387,40595),(5326,40585)
-(34412,10600),(34352,10539)
-(7237,47546),(7206,47451)
-(39931,26644),(39915,26598)
-(29843,4734),(29800,4669)
-(37503,8867),(37406,8821)
-(2583,2373),(2570,2294)
-(29275,46433),(29256,46350)
-(3332,45620),(3287,45581)
-(22472,39287),(22472,39257)
-(36786,18907),(36708,18884)
-(45503,28576),(45482,28494)
-(33262,28386),(33163,28365)
-(3606,49757),(3538,49697)
-(2082,49380),(1991,49281)
-(12065,3734),(11983,3663)
-(15606,9048),(15596,9028)
-(14687,19309),(14637,19263)
-(4568,15461),(4499,15428)
-(43938,7429),(43923,7391)
-(2168,50012),(2108,49914)
-(16022,8934),(15963,8928)
-(24567,39147),(24561,39102)
-(42781,14149),(42765,14088)
-(39501,21084),(39468,21078)
-(6697,29628),(6693,29584)
-(11441,16164),(11364,16125)
-(39946,1920),(39868,1844)
-(18138,45512),(18111,45438)
-(20799,41217),(20718,41138)
-(30264,16697),(30240,16639)
-(30746,50040),(30727,49992)
-(37429,43273),(37423,43205)
-(22854,28863),(22789,28810)
-(11380,48298),(11287,48242)
-(16471,37273),(16439,37223)
-(32737,39842),(32661,39811)
-(30959,3447),(30949,3357)
-(36396,13263),(36348,13187)
-(29607,14625),(29531,14619)
-(7851,43399),(7824,43334)
-(38515,14575),(38496,14492)
-(29125,3289),(29086,3264)
-(6866,10476),(6839,10424)
-(318,31489),(235,31404)
-(1140,7007),(1113,6945)
-(36574,9291),(36484,9275)
-(40320,40937),(40246,40866)
-(588,25849),(552,25801)
-(6728,42539),(6645,42507)
-(12180,6185),(12123,6123)
-(32913,44123),(32899,44037)
-(25464,16803),(25441,16749)
-(23711,5829),(23695,5750)
-(31424,34930),(31377,34906)
-(42171,8298),(42124,8222)
-(451,31104),(375,31083)
-(39996,3278),(39943,3260)
-(25816,40396),(25735,40362)
-(34471,28587),(34399,28547)
-(45344,21540),(45297,21496)
-(27269,16787),(27246,16763)
-(18070,4469),(18022,4423)
-(12668,16367),(12645,16295)
-(13823,17276),(13730,17251)
-(20555,45544),(20511,45498)
-(35893,42189),(35861,42177)
-(37081,45730),(37076,45705)
-(17270,15651),(17201,15552)
-(48690,46034),(48667,45945)
-(456,16088),(368,16023)
-(48707,12416),(48670,12363)
-(29692,11509),(29614,11483)
-(7005,3668),(6981,3574)
-(12162,389),(12103,309)
-(12371,24983),(12366,24964)
-(6886,48414),(6868,48327)
-(10653,26234),(10624,26142)
-(8526,48205),(8517,48117)
-(10521,31892),(10480,31798)
-(43353,1086),(43281,1071)
-(21007,35650),(20998,35649)
-(2343,4396),(2310,4320)
-(29379,12895),(29284,12891)
-(27662,17407),(27570,17313)
-(9845,29346),(9807,29321)
-(43855,38669),(43790,38599)
-(20461,44189),(20397,44158)
-(11627,17368),(11581,17289)
-(2971,38855),(2938,38807)
-(43204,47082),(43128,47018)
-(9930,46902),(9909,46871)
-(30561,48461),(30536,48365)
-(44059,7591),(44038,7563)
-(46260,16898),(46162,16886)
-(27491,2891),(27396,2814)
-(36512,26034),(36455,25941)
-(31193,20022),(31100,19942)
-(17057,13643),(16960,13621)
-(26897,3399),(26844,3318)
-(1760,5504),(1683,5431)
-(29347,5511),(29346,5450)
-(38761,42083),(38688,41999)
-(11226,4089),(11165,4068)
-(46427,42983),(46361,42970)
-(12958,30737),(12912,30712)
-(44432,46521),(44333,46443)
-(16124,2948),(16113,2852)
-(24704,25422),(24635,25340)
-(30833,46152),(30790,46122)
-(4487,37006),(4473,36968)
-(41047,23376),(41036,23327)
-(16312,49392),(16298,49330)
-(30081,14687),(30042,14660)
-(11160,13954),(11103,13938)
-(33207,23246),(33143,23168)
-(14872,7635),(14860,7585)
-(20139,23987),(20059,23955)
-(10946,49757),(10923,49746)
-(39438,36158),(39426,36134)
-(35502,2385),(35464,2327)
-(17073,42173),(16987,42130)
-(6079,17258),(6068,17195)
-(40458,15752),(40364,15728)
-(23340,7879),(23313,7806)
-(31819,15096),(31762,15059)
-(31159,40864),(31158,40780)
-(26975,32144),(26915,32113)
-(34530,10378),(34440,10298)
-(18855,49577),(18780,49528)
-(16787,16625),(16723,16586)
-(32330,26538),(32314,26458)
-(34270,28674),(34265,28595)
-(10022,16026),(10006,15962)
-(23143,1479),(23095,1469)
-(33676,4483),(33583,4408)
-(31066,22074),(31059,22035)
-(21603,47121),(21563,47082)
-(30051,4244),(30021,4157)
-(30634,39478),(30615,39446)
-(34404,48724),(34393,48724)
-(31103,21414),(31039,21380)
-(22945,47397),(22849,47313)
-(18133,32025),(18073,31941)
-(4053,25759),(3977,25667)
-(39185,39091),(39102,39068)
-(43287,7407),(43225,7314)
-(13137,31188),(13112,31182)
-(46264,1438),(46258,1389)
-(22804,43892),(22769,43822)
-(7542,1044),(7487,983)
-(33022,8321),(32925,8267)
-(384,39161),(286,39073)
-(28205,24401),(28142,24382)
-(31708,39086),(31696,39026)
-(36626,15708),(36560,15690)
-(17099,16924),(17079,16924)
-(10817,6989),(10747,6955)
-(24338,19293),(24291,19277)
-(27566,17576),(27544,17545)
-(23041,38384),(22970,38320)
-(12786,8485),(12702,8435)
-(13876,49473),(13813,49448)
-(31585,46998),(31490,46929)
-(30227,8768),(30206,8715)
-(32062,39306),(32023,39292)
-(25003,35753),(24921,35687)
-(3281,6758),(3232,6704)
-(11395,30299),(11376,30220)
-(5088,15275),(5007,15203)
-(31100,39538),(31003,39444)
-(2741,17877),(2726,17793)
-(42897,48620),(42860,48537)
-(4230,15778),(4181,15776)
-(17835,27530),(17815,27431)
-(34189,10933),(34135,10921)
-(7537,39974),(7494,39973)
-(21554,3507),(21528,3476)
-(9350,32326),(9273,32275)
-(16455,8874),(16420,8793)
-(7346,34235),(7330,34224)
-(16417,48134),(16352,48066)
-(41916,4971),(41849,4886)
-(15856,1522),(15807,1521)
-(41549,40218),(41494,40144)
-(9978,16226),(9972,16181)
-(14856,13312),(14808,13283)
-(38490,41641),(38428,41583)
-(25828,7438),(25807,7378)
-(21876,30633),(21796,30587)
-(1908,14279),(1825,14247)
-(32207,10251),(32121,10184)
-(370,9493),(328,9441)
-(42072,17634),(41974,17600)
-(47298,9910),(47235,9846)
-(17856,11266),(17782,11225)
-(35009,21400),(34956,21396)
-(18337,11145),(18335,11133)
-(25425,9139),(25381,9085)
-(35642,27783),(35621,27782)
-(3629,33164),(3575,33163)
-(17151,41255),(17115,41204)
-(17417,5835),(17402,5751)
-(33407,14226),(33329,14141)
-(1930,29955),(1889,29931)
-(41101,10942),(41065,10844)
-(36333,27288),(36281,27233)
-(21423,36868),(21367,36825)
-(36385,19566),(36341,19510)
-(27073,38301),(27066,38232)
-(43989,34187),(43984,34174)
-(48366,7488),(48316,7483)
-(37497,36075),(37415,36043)
-(46917,9891),(46887,9870)
-(37179,657),(37103,634)
-(3877,44736),(3811,44684)
-(30556,2975),(30547,2962)
-(7629,11447),(7547,11416)
-(45687,48147),(45591,48088)
-(5635,7184),(5571,7146)
-(9611,47327),(9541,47246)
-(7119,48224),(7117,48152)
-(15233,26480),(15138,26430)
-(37468,1526),(37466,1513)
-(20855,2786),(20828,2711)
-(30538,44084),(30480,44061)
-(42231,41527),(42149,41454)
-(14963,13239),(14952,13146)
-(26819,43996),(26745,43934)
-(42172,35953),(42086,35928)
-(28785,12611),(28710,12534)
-(14089,1704),(14047,1629)
-(4343,26242),(4341,26169)
-(20327,42244),(20231,42212)
-(33671,12700),(33666,12630)
-(42144,32642),(42128,32569)
-(26590,19483),(26503,19442)
-(21741,46259),(21723,46226)
-(8822,34700),(8760,34693)
-(2710,33521),(2675,33505)
-(26067,19998),(26026,19989)
-(12244,34509),(12202,34489)
-(47162,598),(47119,499)
-(33093,49382),(33068,49359)
-(35170,26340),(35153,26264)
-(22552,35785),(22490,35735)
-(36791,23032),(36781,22976)
-(22857,10857),(22833,10797)
-(47207,37405),(47138,37365)
-(21867,2836),(21854,2811)
-(3387,31487),(3311,31456)
-(47174,48121),(47167,48101)
-(24415,22232),(24366,22224)
-(7970,29251),(7959,29211)
-(18635,31294),(18539,31221)
-(8403,13380),(8370,13372)
-(738,18097),(737,18054)
-(37238,19195),(37218,19114)
-(582,47934),(570,47897)
-(12359,4635),(12350,4619)
-(43272,2013),(43195,1958)
-(47568,27149),(47521,27088)
-(24695,12827),(24661,12796)
-(26259,14077),(26168,14019)
-(48478,36135),(48425,36092)
-(5230,39250),(5206,39174)
-(3488,18562),(3423,18489)
-(39502,16331),(39460,16275)
-(18296,1478),(18233,1471)
-(28627,12430),(28559,12410)
-(25257,21981),(25206,21954)
-(2410,41192),(2325,41142)
-(43681,9631),(43587,9538)
-(15086,45309),(15064,45270)
-(13824,40807),(13759,40787)
-(7090,2207),(7062,2159)
-(3685,2480),(3630,2391)
-(14810,38335),(14801,38275)
-(26668,38018),(26581,38012)
-(45562,1517),(45506,1424)
-(11001,32481),(10962,32402)
-(27743,25245),(27673,25161)
-(15952,10598),(15948,10535)
-(12705,13308),(12694,13232)
-(31992,21195),(31975,21118)
-(25834,16652),(25745,16626)
-(21022,43625),(20990,43576)
-(45094,27254),(45000,27240)
-(9688,42601),(9643,42533)
-(17746,24659),(17694,24616)
-(1509,38859),(1503,38809)
-(2067,20438),(2041,20369)
-(7885,44528),(7839,44444)
-(27432,33052),(27422,32987)
-(26577,17157),(26563,17142)
-(10815,35985),(10734,35908)
-(44891,24067),(44794,23979)
-(48626,1900),(48595,1850)
-(40659,35541),(40659,35489)
-(22231,26628),(22210,26579)
-(37408,23016),(37375,22919)
-(5920,15916),(5906,15895)
-(33125,9952),(33037,9880)
-(12142,29705),(12141,29670)
-(3672,20995),(3649,20899)
-(39147,31967),(39101,31907)
-(33812,48458),(33748,48399)
-(25038,14639),(24978,14586)
-(3859,16010),(3857,15994)
-(31926,39496),(31889,39417)
-(49300,28064),(49297,28026)
-(24121,38305),(24048,38256)
-(9252,4205),(9155,4149)
-(36124,30451),(36056,30395)
-(28809,49557),(28794,49533)
-(30500,44504),(30471,44476)
-(26866,42395),(26822,42332)
-(48195,1784),(48101,1734)
-(46201,14109),(46112,14097)
-(2415,9975),(2354,9914)
-(30485,9581),(30415,9558)
-(6385,36838),(6305,36838)
-(2799,11189),(2723,11095)
-(21998,20503),(21923,20406)
-(29151,10714),(29090,10671)
-(28850,29276),(28757,29207)
-(43386,48845),(43305,48834)
-(25173,8310),(25101,8294)
-(34244,32352),(34204,32342)
-(35595,23728),(35533,23672)
-(1122,13581),(1119,13538)
-(388,21716),(296,21678)
-(48782,11064),(48701,11005)
-(40293,12997),(40213,12927)
-(28194,46428),(28113,46414)
-(4791,18118),(4708,18105)
-(471,29808),(448,29775)
-(3536,37803),(3447,37737)
-(1336,28416),(1275,28392)
-(16484,48478),(16422,48454)
-(25846,19320),(25811,19296)
-(48669,27703),(48575,27615)
-(24032,44217),(24029,44127)
-(12236,5019),(12233,4986)
-(1179,29838),(1113,29778)
-(33893,22049),(33867,21955)
-(16718,19462),(16700,19440)
-(17992,49438),(17894,49433)
-(35163,39941),(35081,39885)
-(33897,8362),(33853,8328)
-(2480,6640),(2456,6599)
-(28011,19729),(27937,19679)
-(15819,41516),(15809,41440)
-(29818,9136),(29747,9089)
-(28551,37016),(28529,36941)
-(36406,26879),(36374,26872)
-(16821,48925),(16758,48914)
-(23692,48163),(23595,48160)
-(4803,10619),(4759,10522)
-(46600,33581),(46553,33518)
-(41349,11767),(41310,11710)
-(20856,29642),(20799,29562)
-(16559,46161),(16504,46131)
-(23041,1300),(23003,1287)
-(16630,44902),(16554,44853)
-(43065,14299),(43013,14274)
-(24818,22397),(24796,22348)
-(22282,24949),(22218,24921)
-(36668,28538),(36631,28456)
-(8080,1220),(8018,1146)
-(47282,34302),(47277,34269)
-(35603,33558),(35557,33495)
-(44764,32189),(44700,32175)
-(46488,23965),(46449,23868)
-(46314,15047),(46216,15013)
-(6348,25381),(6286,25363)
-(3871,49288),(3819,49251)
-(462,38894),(398,38867)
-(23196,29214),(23136,29169)
-(29024,9775),(29016,9759)
-(42016,18555),(41934,18472)
-(8772,45981),(8692,45973)
-(11028,1351),(10986,1278)
-(26684,21668),(26641,21656)
-(37262,26005),(37260,25947)
-(14899,44069),(14814,44066)
-(39635,18701),(39587,18698)
-(28528,22948),(28457,22857)
-(7755,36528),(7681,36454)
-(32461,1172),(32427,1106)
-(18775,27359),(18736,27329)
-(15379,20031),(15337,19934)
-(45888,33592),(45881,33544)
-(44013,24694),(43962,24645)
-(43347,10699),(43343,10699)
-(49999,27218),(49908,27176)
-(13698,17326),(13630,17317)
-(34850,44313),(34775,44302)
-(38076,49235),(37983,49214)
-(35570,40218),(35500,40136)
-(40062,28973),(40032,28878)
-(3567,39847),(3523,39781)
-(498,2442),(480,2401)
-(29660,43620),(29577,43561)
-(10946,47356),(10878,47351)
-(8073,44233),(8005,44144)
-(9720,13473),(9710,13462)
-(3643,38014),(3598,37932)
-(16887,1408),(16810,1375)
-(7559,27914),(7508,27874)
-(30356,18573),(30275,18569)
-(12193,48176),(12130,48116)
-(11884,7756),(11819,7731)
-(18293,33272),(18227,33234)
-(46697,47874),(46696,47828)
-(35788,32517),(35760,32446)
-(33877,36987),(33821,36958)
-(31253,22819),(31184,22808)
-(7744,23115),(7729,23103)
-(21291,39817),(21219,39778)
-(13877,43379),(13861,43290)
-(42955,1406),(42876,1382)
-(49232,15950),(49210,15880)
-(48419,32001),(48326,31902)
-(18940,43246),(18860,43150)
-(32317,38240),(32310,38201)
-(11307,48298),(11304,48222)
-(38015,18190),(38000,18176)
-(27821,1177),(27818,1131)
-(18935,26757),(18865,26682)
-(42659,48284),(42562,48244)
-(30185,23350),(30146,23291)
-(16496,11970),(16441,11919)
-(162,26040),(120,25963)
-(24238,47784),(24185,47746)
-(32326,8612),(32274,8568)
-(26141,13423),(26051,13407)
-(40132,22815),(40089,22812)
-(21151,48794),(21056,48740)
-(22044,28358),(22031,28334)
-(6680,14746),(6605,14669)
-(40686,25139),(40632,25070)
-(22823,27549),(22816,27507)
-(2513,22841),(2427,22811)
-(36316,27787),(36218,27728)
-(554,35489),(540,35441)
-(536,30674),(534,30609)
-(25385,38468),(25295,38416)
-(19467,47386),(19437,47317)
-(22425,38591),(22387,38536)
-(32493,17321),(32396,17298)
-(40115,47315),(40109,47235)
-(25002,2107),(24963,2104)
-(3901,9790),(3898,9706)
-(40316,1721),(40315,1658)
-(40089,3454),(40074,3443)
-(793,17897),(761,17897)
-(6490,43552),(6434,43522)
-(10825,487),(10820,405)
-(47703,36067),(47641,36011)
-(4480,11671),(4468,11653)
-(37713,10642),(37711,10615)
-(12315,5302),(12273,5203)
-(8709,6617),(8647,6557)
-(24467,30535),(24455,30494)
-(40440,32757),(40369,32668)
-(49449,42447),(49426,42428)
-(44867,11197),(44792,11137)
-(39173,33241),(39143,33187)
-(43836,2212),(43803,2184)
-(23819,47613),(23739,47575)
-(20583,2134),(20485,2042)
-(48922,6169),(48889,6111)
-(5230,44613),(5131,44604)
-(37060,8051),(37032,7975)
-(19148,36711),(19112,36704)
-(36305,4216),(36243,4118)
-(6329,39089),(6302,39047)
-(36703,26367),(36623,26307)
-(44753,19721),(44701,19631)
-(42094,43310),(42094,43285)
-(4276,22377),(4241,22352)
-(30329,18906),(30327,18815)
-(21970,19605),(21871,19590)
-(23722,41924),(23709,41861)
-(30965,39775),(30908,39692)
-(32394,37895),(32351,37890)
-(23968,42162),(23873,42095)
-(1776,2621),(1732,2548)
-(24951,47758),(24900,47679)
-(32917,35771),(32847,35753)
-(5428,27773),(5343,27769)
-(19650,142),(19630,51)
-(39769,17276),(39743,17229)
-(5171,24562),(5119,24470)
-(32976,35249),(32917,35199)
-(4174,24603),(4099,24504)
-(38565,36960),(38535,36926)
-(39084,4328),(39031,4301)
-(32153,38043),(32070,37990)
-(38085,30640),(38041,30603)
-(14269,18426),(14185,18422)
-(42941,30850),(42892,30788)
-(32403,25999),(32339,25960)
-(16906,191),(16816,139)
-(3456,48722),(3418,48721)
-(3050,18287),(3022,18243)
-(6331,8439),(6234,8364)
-(5331,20797),(5319,20793)
-(39225,37408),(39216,37348)
-(34510,19838),(34488,19810)
-(45789,33873),(45770,33786)
-(369,1457),(278,1409)
-(16531,43785),(16482,43729)
-(11974,14789),(11973,14730)
-(23128,6811),(23094,6798)
-(43962,33659),(43944,33599)
-(20967,3115),(20947,3079)
-(39257,38606),(39241,38595)
-(22431,8246),(22381,8235)
-(26007,14672),(25996,14593)
-(24762,4261),(24675,4261)
-(35402,32077),(35343,31988)
-(5141,16476),(5139,16393)
-(16439,17564),(16344,17472)
-(36983,46663),(36903,46567)
-(35170,14144),(35162,14048)
-(22290,7841),(22283,7810)
-(22414,38398),(22404,38319)
-(9011,18177),(8932,18150)
-(154,4019),(138,3990)
-(20447,4998),(20383,4970)
-(38867,35757),(38795,35659)
-(32322,15845),(32227,15804)
-(29889,12142),(29852,12055)
-(36235,36918),(36217,36897)
-(41620,6581),(41568,6581)
-(24758,38504),(24731,38483)
-(42524,12904),(42473,12895)
-(17954,49975),(17865,49915)
-(1938,39019),(1927,39013)
-(4864,33279),(4817,33258)
-(45373,41967),(45313,41885)
-(28786,19028),(28782,18978)
-(41913,44950),(41911,44908)
-(33408,14698),(33392,14681)
-(27602,3460),(27576,3419)
-(3336,3728),(3334,3715)
-(9099,910),(9080,813)
-(34141,6403),(34071,6367)
-(48270,17216),(48252,17130)
-(2549,16546),(2461,16474)
-(27802,33669),(27735,33642)
-(48419,1682),(48323,1583)
-(5094,41211),(5002,41123)
-(11192,6217),(11190,6146)
-(6979,18503),(6959,18421)
-(41210,48187),(41140,48143)
-(15303,29527),(15273,29441)
-(12326,45572),(12267,45570)
-(29293,5861),(29212,5826)
-(23847,37241),(23761,37178)
-(44656,23926),(44653,23831)
-(30043,16194),(29977,16105)
-(902,9358),(879,9339)
-(23850,46501),(23834,46494)
-(42333,13300),(42287,13246)
-(25226,18086),(25169,18005)
-(40252,12082),(40183,12038)
-(49275,18076),(49216,18055)
-(8255,28878),(8238,28862)
-(11325,41286),(11320,41235)
-(16948,18588),(16926,18528)
-(31394,1099),(31374,1038)
-(30705,35772),(30637,35766)
-(3858,39131),(3771,39125)
-(17565,24892),(17515,24808)
-(9221,49715),(9216,49661)
-(44945,25769),(44875,25722)
-(33408,13563),(33310,13527)
-(48505,4407),(48408,4373)
-(21859,37217),(21763,37217)
-(39393,14422),(39335,14364)
-(19905,1154),(19841,1098)
-(25946,10388),(25906,10366)
-(10104,13748),(10027,13746)
-(5822,24629),(5820,24599)
-(38194,11287),(38127,11252)
-(15694,46757),(15625,46716)
-(326,18837),(285,18817)
-(49611,47078),(49533,47052)
-(48233,18850),(48150,18842)
-(29239,9962),(29208,9875)
-(40062,44554),(39973,44460)
-(19135,20729),(19059,20643)
-(31969,40664),(31896,40643)
-(3725,9191),(3711,9095)
-(44280,40158),(44264,40108)
-(37236,42756),(37160,42694)
-(27958,19055),(27888,18959)
-(45270,17661),(45187,17601)
-(12115,39546),(12061,39525)
-(10227,32295),(10168,32231)
-(39264,31123),(39226,31085)
-(6566,40000),(6532,39904)
-(30058,6975),(30012,6903)
-(49631,6909),(49597,6823)
-(42168,10926),(42134,10905)
-(44892,30042),(44858,29970)
-(19540,19803),(19495,19788)
-(18403,25454),(18371,25404)
-(22929,26795),(22841,26722)
-(16648,30213),(16626,30174)
-(3440,7495),(3429,7468)
-(30708,49028),(30643,48998)
-(26258,14164),(26255,14151)
-(44206,31653),(44121,31637)
-(1510,15179),(1426,15130)
-(6986,30496),(6887,30416)
-(7192,43403),(7138,43339)
-(39921,22071),(39866,21976)
-(45870,17011),(45796,16919)
-(15939,9563),(15917,9539)
-(23728,24737),(23691,24725)
-(6444,40416),(6363,40375)
-(21899,23861),(21857,23765)
-(20610,36765),(20533,36742)
-(46520,33082),(46433,32983)
-(21406,20902),(21311,20895)
-(37913,42300),(37814,42269)
-(18216,8177),(18161,8173)
-(32967,8258),(32899,8244)
-(14978,40230),(14971,40149)
-(30343,39152),(30266,39101)
-(25917,5835),(25843,5806)
-(5169,45366),(5141,45314)
-(16221,20898),(16209,20875)
-(13151,19869),(13145,19811)
-(44399,2801),(44337,2713)
-(10959,48311),(10957,48230)
-(4794,11711),(4732,11661)
-(764,10149),(762,10091)
-(15985,46067),(15898,46028)
-(41434,22870),(41342,22867)
-(43769,23796),(43743,23756)
-(10017,18440),(9919,18384)
-(21141,43119),(21097,43112)
-(7782,13424),(7694,13398)
-(25088,36224),(25059,36150)
-(46325,48722),(46241,48631)
-(11042,33125),(11011,33071)
-(22347,13460),(22290,13375)
-(3508,20538),(3483,20536)
-(5331,42945),(5272,42875)
-(2368,15537),(2339,15503)
-(45314,31830),(45254,31817)
-(34358,2649),(34319,2589)
-(17576,30407),(17572,30323)
-(29836,41324),(29746,41287)
-(21036,39996),(21014,39899)
-(26886,6460),(26787,6400)
-(15709,5625),(15627,5558)
-(37415,15979),(37414,15911)
-(47761,16860),(47728,16813)
-(35814,48252),(35755,48173)
-(28559,20810),(28496,20715)
-(12034,11921),(12002,11905)
-(1818,27450),(1805,27406)
-(33810,45499),(33806,45413)
-(17376,18175),(17323,18138)
-(34106,28135),(34049,28106)
-(44947,23165),(44919,23091)
-(37670,41904),(37616,41840)
-(12614,15027),(12555,14969)
-(43301,75),(43227,43)
-(27526,15096),(27450,15088)
-(26947,33409),(26853,33333)
-(1537,43572),(1471,43499)
-(21607,35452),(21605,35375)
-(24869,46565),(24818,46531)
-(4774,30335),(4723,30257)
-(11615,18316),(11579,18310)
-(18444,15819),(18354,15763)
-(47267,22574),(47203,22518)
-(22287,49538),(22203,49511)
-(43010,16270),(43010,16202)
-(1623,8350),(1578,8254)
-(21220,43808),(21137,43748)
-(40397,16471),(40358,16434)
-(34839,1377),(34744,1327)
-(17096,5730),(17090,5637)
-(28156,37782),(28155,37723)
-(3672,5686),(3586,5638)
-(21856,48656),(21840,48638)
-(6907,7791),(6892,7761)
-(17952,21370),(17862,21350)
-(37793,13461),(37784,13381)
-(14740,49655),(14709,49604)
-(21690,6337),(21593,6289)
-(10423,33548),(10364,33498)
-(39187,23274),(39136,23197)
-(21882,37247),(21835,37167)
-(11343,16957),(11281,16914)
-(38279,43400),(38264,43352)
-(23167,30271),(23086,30224)
-(46278,6037),(46180,5964)
-(28626,31165),(28605,31095)
-(31018,367),(30946,333)
-(23541,12541),(23530,12523)
-(49741,14535),(49691,14511)
-(31444,12702),(31425,12612)
-(22406,26536),(22316,26534)
-(6807,9761),(6758,9723)
-(15698,1941),(15687,1848)
-(49310,4625),(49295,4584)
-(21345,18939),(21269,18887)
-(31433,30493),(31411,30439)
-(44980,12400),(44950,12372)
-(25054,13949),(24984,13949)
-(40538,7253),(40483,7212)
-(16967,8627),(16936,8604)
-(26872,3646),(26804,3594)
-(24575,42883),(24530,42883)
-(11823,5755),(11771,5721)
-(2553,46189),(2513,46174)
-(24993,14552),(24898,14470)
-(28453,1719),(28419,1665)
-(8925,22603),(8878,22589)
-(47635,15380),(47546,15378)
-(35378,18112),(35324,18058)
-(27347,22264),(27293,22200)
-(44323,29044),(44273,28958)
-(41538,38324),(41484,38290)
-(19128,49932),(19112,49849)
-(17904,12548),(17867,12503)
-(35103,14426),(35092,14336)
-(29807,10142),(29714,10052)
-(44507,22903),(44462,22847)
-(11419,13324),(11399,13251)
-(8573,42221),(8562,42123)
-(46798,45843),(46765,45765)
-(12028,31783),(11967,31749)
-(10635,45300),(10604,45251)
-(9626,8248),(9587,8194)
-(18290,741),(18246,732)
-(39949,44672),(39932,44641)
-(7897,11692),(7893,11637)
-(20165,42246),(20112,42168)
-(4341,48390),(4285,48338)
-(30126,28913),(30088,28869)
-(40565,1733),(40472,1721)
-(9981,30147),(9915,30133)
-(47292,25511),(47217,25462)
-(20137,24489),(20104,24392)
-(2385,28283),(2381,28189)
-(20429,10052),(20357,10009)
-(8395,38568),(8348,38480)
-(17381,36112),(17349,36038)
-(37845,30953),(37759,30926)
-(27452,12732),(27411,12652)
-(38196,32186),(38114,32116)
-(6527,49356),(6508,49315)
-(43891,29789),(43856,29723)
-(6146,37192),(6085,37107)
-(42012,28897),(41939,28808)
-(14909,13815),(14846,13757)
-(11120,24095),(11035,24049)
-(3132,41545),(3053,41526)
-(40084,40315),(39994,40261)
-(39671,17445),(39576,17361)
-(47135,35853),(47085,35831)
-(39297,1941),(39290,1911)
-(47143,35898),(47072,35880)
-(16017,6711),(15989,6686)
-(47110,30305),(47087,30213)
-(38102,27639),(38091,27602)
-(17954,22544),(17863,22453)
-(39891,11791),(39815,11739)
-(13996,20290),(13922,20278)
-(22284,23143),(22190,23081)
-(25345,24019),(25313,24017)
-(47134,44803),(47055,44761)
-(41360,16573),(41326,16503)
-(10464,1071),(10457,998)
-(23515,47517),(23451,47499)
-(9308,8452),(9238,8392)
-(28695,5657),(28671,5644)
-(45104,9913),(45077,9871)
-(337,455),(240,359)
-(11562,45479),(11472,45428)
-(11952,18466),(11931,18425)
-(35789,5154),(35775,5128)
-(19024,18299),(18979,18230)
-(43056,38113),(42975,38067)
-(10075,26847),(10064,26806)
-(3065,8107),(3029,8038)
-(24766,19059),(24749,18985)
-(14438,24805),(14413,24708)
-(9523,3058),(9485,2998)
-(24516,31262),(24478,31204)
-(49513,26044),(49434,26035)
-(14110,38528),(14103,38461)
-(31679,35618),(31619,35618)
-(10029,20258),(10008,20248)
-(39269,37586),(39233,37539)
-(12343,8197),(12247,8113)
-(11155,44223),(11111,44134)
-(25437,20606),(25338,20534)
-(46604,16156),(46570,16131)
-(4636,14004),(4592,13941)
-(15975,29628),(15912,29556)
-(49887,24274),(49805,24184)
-(11812,13440),(11723,13418)
-(21589,38179),(21531,38085)
-(32255,44463),(32219,44454)
-(15023,12698),(14989,12687)
-(28906,48630),(28818,48568)
-(28886,38905),(28861,38832)
-(34786,22285),(34740,22240)
-(46513,46780),(46425,46780)
-(26626,31759),(26551,31677)
-(19792,25967),(19763,25933)
-(20432,14394),(20388,14365)
-(27092,7301),(27052,7278)
-(22283,987),(22198,928)
-(6197,24363),(6112,24311)
-(46601,49259),(46551,49231)
-(12392,48052),(12363,48038)
-(46116,31386),(46067,31356)
-(7354,16855),(7289,16778)
-(47501,42808),(47495,42761)
-(16461,25487),(16391,25398)
-(42678,18798),(42678,18756)
-(9466,18207),(9419,18185)
-(17467,14177),(17416,14097)
-(28533,31886),(28487,31832)
-(13225,38472),(13188,38395)
-(5180,40970),(5173,40902)
-(83,10271),(15,10265)
-(2111,6784),(2016,6690)
-(41835,11064),(41798,10995)
-(29273,48585),(29181,48536)
-(29066,21615),(28985,21543)
-(19805,44143),(19727,44128)
-(48919,21468),(48875,21467)
-(28790,34287),(28721,34251)
-(10911,33074),(10869,32989)
-(6111,16519),(6032,16489)
-(43889,33838),(43837,33768)
-(32323,21685),(32304,21644)
-(9552,27819),(9539,27753)
-(38266,49852),(38233,49844)
-(37672,48362),(37663,48277)
-(32550,47029),(32529,46931)
-(46307,6620),(46272,6616)
-(23192,46608),(23105,46566)
-(30399,48330),(30335,48239)
-(36268,25058),(36235,24984)
-(19181,8120),(19089,8098)
-(24376,19983),(24294,19925)
-(18297,18375),(18202,18292)
-(31608,6215),(31575,6168)
-(12788,49510),(12784,49468)
-(46071,13013),(46035,12991)
-(27647,8218),(27582,8201)
-(49580,11076),(49537,11050)
-(35501,33782),(35501,33687)
-(19969,3148),(19964,3082)
-(37728,49153),(37726,49152)
-(5322,48440),(5321,48435)
-(48003,10096),(47904,10005)
-(39361,22318),(39348,22236)
-(30488,7456),(30437,7430)
-(18533,39476),(18481,39394)
-(39462,23701),(39433,23604)
-(26701,18300),(26686,18235)
-(17405,35577),(17387,35517)
-(33971,29928),(33953,29919)
-(6328,10241),(6276,10217)
-(32459,44259),(32453,44217)
-(1715,42385),(1647,42357)
-(48113,6960),(48103,6872)
-(30561,4255),(30476,4240)
-(38907,43619),(38827,43553)
-(29149,20773),(29070,20698)
-(17006,1543),(16970,1497)
-(11737,18808),(11714,18788)
-(13019,30534),(13005,30481)
-(39224,31729),(39191,31683)
-(4942,41680),(4907,41596)
-(12287,37187),(12188,37172)
-(30758,29579),(30725,29531)
-(16604,17963),(16581,17912)
-(19459,15888),(19409,15812)
-(34696,24783),(34600,24725)
-(21621,14159),(21558,14110)
-(12193,46149),(12145,46096)
-(37781,4715),(37692,4635)
-(41854,44125),(41807,44040)
-(23604,23585),(23571,23533)
-(7853,36967),(7797,36908)
-(2755,13279),(2720,13206)
-(4314,15424),(4283,15383)
-(29584,12685),(29493,12594)
-(25138,33726),(25042,33691)
-(38393,10270),(38326,10185)
-(4247,12615),(4225,12567)
-(36100,33156),(36100,33107)
-(20024,40796),(20016,40708)
-(3927,44892),(3914,44843)
-(10317,43168),(10226,43096)
-(22057,3419),(22042,3334)
-(37097,21814),(37025,21811)
-(32084,21564),(31996,21491)
-(34079,39921),(34058,39911)
-(23078,47459),(23018,47373)
-(38109,616),(38082,568)
-(11862,40382),(11764,40292)
-(33403,33320),(33389,33289)
-(36639,24829),(36623,24829)
-(12995,45080),(12992,45040)
-(16545,19981),(16532,19891)
-(26155,10659),(26154,10634)
-(24423,255),(24360,213)
-(823,22487),(781,22442)
-(12823,20064),(12735,20040)
-(19688,11710),(19681,11654)
-(2892,20452),(2836,20424)
-(15533,10807),(15464,10711)
-(46994,41143),(46955,41082)
-(18155,2421),(18069,2392)
-(2628,12688),(2605,12602)
-(35128,8396),(35044,8365)
-(44765,49615),(44758,49524)
-(11226,44529),(11178,44515)
-(31334,32463),(31291,32456)
-(43224,23387),(43168,23364)
-(30882,10414),(30798,10395)
-(29139,967),(29139,923)
-(29959,45244),(29877,45223)
-(19946,217),(19941,118)
-(49732,22033),(49642,22012)
-(32914,15360),(32879,15290)
-(47825,21097),(47747,21030)
-(10788,5131),(10746,5086)
-(15497,9698),(15481,9678)
-(10617,47195),(10601,47117)
-(42392,10583),(42340,10550)
-(10753,33520),(10669,33509)
-(5553,21580),(5521,21527)
-(36840,12336),(36817,12320)
-(49785,12554),(49702,12553)
-(17737,38349),(17639,38277)
-(48000,7823),(47956,7814)
-(5019,3184),(4931,3160)
-(30120,3524),(30063,3492)
-(37044,2016),(37001,1942)
-(23496,38566),(23469,38528)
-(17255,48957),(17200,48903)
-(27815,2138),(27808,2090)
-(40440,11129),(40368,11105)
-(35305,21772),(35272,21717)
-(41308,45065),(41229,44973)
-(14893,28807),(14817,28789)
-(30776,45824),(30731,45772)
-(742,40724),(652,40672)
-(5985,41133),(5927,41097)
-(9576,10226),(9540,10218)
-(21407,23207),(21323,23160)
-(44880,34228),(44877,34169)
-(29146,49694),(29143,49682)
-(28502,34886),(28471,34832)
-(30662,5584),(30604,5528)
-(12612,26081),(12552,26001)
-(17166,49308),(17098,49270)
-(9586,14116),(9488,14104)
-(37323,47576),(37264,47482)
-(48009,49713),(48004,49614)
-(49308,23780),(49297,23760)
-(8667,32342),(8592,32294)
-(37826,48560),(37822,48485)
-(24493,18653),(24486,18616)
-(17914,3850),(17887,3775)
-(34270,43873),(34231,43826)
-(7753,44715),(7660,44651)
-(44328,36364),(44265,36350)
-(10146,3030),(10111,2975)
-(35273,40106),(35269,40062)
-(38566,43846),(38547,43760)
-(12400,41394),(12377,41378)
-(45196,38286),(45153,38250)
-(48511,14972),(48428,14883)
-(25939,36328),(25886,36277)
-(38997,11007),(38979,10917)
-(30342,518),(30244,453)
-(6876,7468),(6867,7454)
-(17566,27575),(17566,27480)
-(18869,28538),(18858,28475)
-(16825,33309),(16726,33255)
-(14585,26111),(14490,26035)
-(28743,49392),(28664,49349)
-(26652,23359),(26618,23297)
-(40129,33653),(40102,33584)
-(41074,26393),(41038,26389)
-(3869,33564),(3869,33536)
-(28455,14205),(28364,14163)
-(13866,45603),(13770,45543)
-(21666,30586),(21578,30544)
-(29978,11931),(29893,11868)
-(1594,1043),(1517,971)
-(948,1201),(907,1156)
-(27547,13692),(27545,13677)
-(13661,38184),(13566,38154)
-(2389,40026),(2317,39938)
-(35481,46379),(35481,46320)
-(26917,45698),(26864,45689)
-(23933,41617),(23909,41539)
-(8912,8471),(8862,8401)
-(9625,4747),(9558,4692)
-(34743,35056),(34721,34969)
-(39544,21762),(39475,21717)
-(11741,26330),(11656,26293)
-(39015,1315),(38966,1285)
-(13418,44237),(13326,44202)
-(2107,17672),(2093,17616)
-(42448,28844),(42370,28764)
-(49843,5175),(49808,5145)
-(6536,23000),(6467,22958)
-(11114,5822),(11027,5739)
-(48457,11074),(48384,11024)
-(12343,23110),(12310,23074)
-(17300,24847),(17276,24825)
-(8823,8253),(8793,8238)
-(3449,171),(3354,108)
-(21650,23955),(21605,23883)
-(13260,3234),(13193,3214)
-(25361,10896),(25305,10806)
-(25051,25042),(25011,25001)
-(25044,25088),(25015,25005)
-(25007,25061),(25002,25013)
-(25066,25105),(25003,25007)
-(25028,25012),(25015,25011)
-(25031,25057),(25006,25018)
-(25015,25042),(25004,25012)
-(25091,25049),(25019,25019)
-(25023,25011),(25000,25004)
-(25053,25104),(25010,25012)
-(25058,25001),(25018,25000)
-(25059,25051),(25008,25016)
-(25043,25069),(25007,25004)
-(25006,25101),(25002,25002)
-(25095,25012),(25014,25007)
-(25054,25052),(25019,25013)
-(25108,25077),(25009,25018)
-(25007,25023),(25003,25002)
-(25076,25098),(25002,25016)
-(25030,25077),(25012,25006)
diff --git a/contrib/cube/expected/cube.out b/contrib/cube/expected/cube.out
deleted file mode 100644
index ed94a25b44..0000000000
--- a/contrib/cube/expected/cube.out
+++ /dev/null
@@ -1,950 +0,0 @@
---
---  Test cube datatype
---
---
--- first, define the datatype.  Turn off echoing so that expected file
--- does not depend on contents of cube.sql.
---
-\set ECHO none
---
--- testing the input and output functions
---
--- Any number (a one-dimensional point)
-SELECT '1'::cube AS cube;
- cube 
-------
- (1)
-(1 row)
-
-SELECT '-1'::cube AS cube;
- cube 
-------
- (-1)
-(1 row)
-
-SELECT '1.'::cube AS cube;
- cube 
-------
- (1)
-(1 row)
-
-SELECT '-1.'::cube AS cube;
- cube 
-------
- (-1)
-(1 row)
-
-SELECT '.1'::cube AS cube;
- cube  
--------
- (0.1)
-(1 row)
-
-SELECT '-.1'::cube AS cube;
-ERROR:  parse error, expecting `FLOAT' or `O_PAREN' or `O_BRACKET' at or before position 2, character ('.', \056), input: '-.1'
-
-SELECT '1.0'::cube AS cube;
- cube 
-------
- (1)
-(1 row)
-
-SELECT '-1.0'::cube AS cube;
- cube 
-------
- (-1)
-(1 row)
-
-SELECT '1e7'::cube AS cube;
-  cube   
----------
- (1e+07)
-(1 row)
-
-SELECT '-1e7'::cube AS cube;
-   cube   
-----------
- (-1e+07)
-(1 row)
-
-SELECT '1.0e7'::cube AS cube;
-  cube   
----------
- (1e+07)
-(1 row)
-
-SELECT '-1.0e7'::cube AS cube;
-   cube   
-----------
- (-1e+07)
-(1 row)
-
-SELECT '1e+7'::cube AS cube;
-  cube   
----------
- (1e+07)
-(1 row)
-
-SELECT '-1e+7'::cube AS cube;
-   cube   
-----------
- (-1e+07)
-(1 row)
-
-SELECT '1.0e+7'::cube AS cube;
-  cube   
----------
- (1e+07)
-(1 row)
-
-SELECT '-1.0e+7'::cube AS cube;
-   cube   
-----------
- (-1e+07)
-(1 row)
-
-SELECT '1e-7'::cube AS cube;
-  cube   
----------
- (1e-07)
-(1 row)
-
-SELECT '-1e-7'::cube AS cube;
-   cube   
-----------
- (-1e-07)
-(1 row)
-
-SELECT '1.0e-7'::cube AS cube;
-  cube   
----------
- (1e-07)
-(1 row)
-
-SELECT '-1.0e-7'::cube AS cube;
-   cube   
-----------
- (-1e-07)
-(1 row)
-
-SELECT '1e-700'::cube AS cube;
- cube 
-------
- (0)
-(1 row)
-
-SELECT '-1e-700'::cube AS cube;
- cube 
-------
- (0)
-(1 row)
-
--- simple lists (points)
-SELECT '1,2'::cube AS cube;
-  cube  
---------
- (1, 2)
-(1 row)
-
-SELECT '(1,2)'::cube AS cube;
-  cube  
---------
- (1, 2)
-(1 row)
-
-SELECT '1,2,3,4,5'::cube AS cube;
-      cube       
------------------
- (1, 2, 3, 4, 5)
-(1 row)
-
-SELECT '(1,2,3,4,5)'::cube AS cube;
-      cube       
------------------
- (1, 2, 3, 4, 5)
-(1 row)
-
--- double lists (cubes)
-SELECT '(0),(0)'::cube AS cube;
- cube 
-------
- (0)
-(1 row)
-
-SELECT '(0),(1)'::cube AS cube;
-  cube   
----------
- (0),(1)
-(1 row)
-
-SELECT '[(0),(0)]'::cube AS cube;
- cube 
-------
- (0)
-(1 row)
-
-SELECT '[(0),(1)]'::cube AS cube;
-  cube   
----------
- (0),(1)
-(1 row)
-
-SELECT '(0,0,0,0),(0,0,0,0)'::cube AS cube;
-     cube     
---------------
- (0, 0, 0, 0)
-(1 row)
-
-SELECT '(0,0,0,0),(1,0,0,0)'::cube AS cube;
-           cube            
----------------------------
- (0, 0, 0, 0),(1, 0, 0, 0)
-(1 row)
-
-SELECT '[(0,0,0,0),(0,0,0,0)]'::cube AS cube;
-     cube     
---------------
- (0, 0, 0, 0)
-(1 row)
-
-SELECT '[(0,0,0,0),(1,0,0,0)]'::cube AS cube;
-           cube            
----------------------------
- (0, 0, 0, 0),(1, 0, 0, 0)
-(1 row)
-
--- invalid input: parse errors
-SELECT ''::cube AS cube;
-ERROR:  cube_in: can't parse an empty string
-SELECT 'ABC'::cube AS cube;
-ERROR:  parse error, expecting `FLOAT' or `O_PAREN' or `O_BRACKET' at or before position 1, character ('A', \101), input: 'ABC'
-
-SELECT '()'::cube AS cube;
-ERROR:  parse error, expecting `FLOAT' at or before position 2, character (')', \051), input: '()'
-
-SELECT '[]'::cube AS cube;
-ERROR:  parse error, expecting `O_PAREN' at or before position 2, character (']', \135), input: '[]'
-
-SELECT '[()]'::cube AS cube;
-ERROR:  parse error, expecting `FLOAT' at or before position 3, character (')', \051), input: '[()]'
-
-SELECT '[(1)]'::cube AS cube;
-ERROR:  parse error, expecting `COMMA' at or before position 5, character (']', \135), input: '[(1)]'
-
-SELECT '[(1),]'::cube AS cube;
-ERROR:  parse error, expecting `O_PAREN' at or before position 6, character (']', \135), input: '[(1),]'
-
-SELECT '[(1),2]'::cube AS cube;
-ERROR:  parse error, expecting `O_PAREN' at or before position 7, character (']', \135), input: '[(1),2]'
-
-SELECT '[(1),(2),(3)]'::cube AS cube;
-ERROR:  parse error, expecting `C_BRACKET' at or before position 9, character (',', \054), input: '[(1),(2),(3)]'
-
-SELECT '1,'::cube AS cube;
-ERROR:  parse error, expecting `FLOAT' at or before position 2, character (',', \054), input: '1,'
-
-SELECT '1,2,'::cube AS cube;
-ERROR:  parse error, expecting `FLOAT' at or before position 4, character (',', \054), input: '1,2,'
-
-SELECT '1,,2'::cube AS cube;
-ERROR:  parse error, expecting `FLOAT' at or before position 3, character (',', \054), input: '1,,2'
-
-SELECT '(1,)'::cube AS cube;
-ERROR:  parse error, expecting `FLOAT' at or before position 4, character (')', \051), input: '(1,)'
-
-SELECT '(1,2,)'::cube AS cube;
-ERROR:  parse error, expecting `FLOAT' at or before position 6, character (')', \051), input: '(1,2,)'
-
-SELECT '(1,,2)'::cube AS cube;
-ERROR:  parse error, expecting `FLOAT' at or before position 4, character (',', \054), input: '(1,,2)'
-
--- invalid input: semantic errors and trailing garbage
-SELECT '[(1),(2)],'::cube AS cube; -- 0
-ERROR:  (0) bad cube representation; garbage at or before char 9, (',', \054)
-
-SELECT '[(1,2,3),(2,3)]'::cube AS cube; -- 1
-ERROR:  (1) bad cube representation; different point dimensions in (1,2,3) and (2,3)
-
-SELECT '[(1,2),(1,2,3)]'::cube AS cube; -- 1
-ERROR:  (1) bad cube representation; different point dimensions in (1,2) and (1,2,3)
-
-SELECT '(1),(2),'::cube AS cube; -- 2
-ERROR:  (2) bad cube representation; garbage at or before char 7, (',', \054)
-
-SELECT '(1,2,3),(2,3)'::cube AS cube; -- 3
-ERROR:  (3) bad cube representation; different point dimensions in (1,2,3) and (2,3)
-
-SELECT '(1,2),(1,2,3)'::cube AS cube; -- 3
-ERROR:  (3) bad cube representation; different point dimensions in (1,2) and (1,2,3)
-
-SELECT '(1,2,3)ab'::cube AS cube; -- 4
-ERROR:  (4) bad cube representation; garbage at or before char 8, ('b', \142)
-
-SELECT '(1,2,3)a'::cube AS cube; -- 5
-ERROR:  (5) bad cube representation; garbage at or before char 8, ('end of input', \000)
-
-SELECT '(1,2)('::cube AS cube; -- 5
-ERROR:  (5) bad cube representation; garbage at or before char 6, ('end of input', \000)
-
-SELECT '1,2ab'::cube AS cube; -- 6
-ERROR:  (6) bad cube representation; garbage at or before char 4, ('b', \142)
-
-SELECT '1 e7'::cube AS cube; -- 6
-ERROR:  (6) bad cube representation; garbage at or before char 3, ('7', \067)
-
-SELECT '1,2a'::cube AS cube; -- 7
-ERROR:  (7) bad cube representation; garbage at or before char 4, ('end of input', \000)
-
-SELECT '1..2'::cube AS cube; -- 7
-ERROR:  (7) bad cube representation; garbage at or before char 4, ('end of input', \000)
-
---
--- testing the  operators
---
--- equality/inequality:
---
-SELECT '24, 33.20'::cube    =  '24, 33.20'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '24, 33.20'::cube    != '24, 33.20'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '24, 33.20'::cube    =  '24, 33.21'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '24, 33.20'::cube    != '24, 33.21'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(2,0),(3,1)'::cube  =  '(2,0,0,0,0),(3,1,0,0,0)'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(2,0),(3,1)'::cube  =  '(2,0,0,0,0),(3,1,0,0,1)'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
--- "lower than" / "greater than"
--- (these operators are not useful for anything but ordering)
---
-SELECT '1'::cube   > '2'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '1'::cube   < '2'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '1,1'::cube > '1,2'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '1,1'::cube < '1,2'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(2,0),(3,1)'::cube             > '(2,0,0,0,0),(3,1,0,0,1)'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '(2,0),(3,1)'::cube             < '(2,0,0,0,0),(3,1,0,0,1)'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(2,0),(3,1)'::cube             > '(2,0,0,0,1),(3,1,0,0,0)'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '(2,0),(3,1)'::cube             < '(2,0,0,0,1),(3,1,0,0,0)'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(2,0),(3,1)'::cube             > '(2,0,0,0,0),(3,1,0,0,0)'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '(2,0),(3,1)'::cube             < '(2,0,0,0,0),(3,1,0,0,0)'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(2,0,0,0,0),(3,1,0,0,1)'::cube > '(2,0),(3,1)'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(2,0,0,0,0),(3,1,0,0,1)'::cube < '(2,0),(3,1)'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '(2,0,0,0,1),(3,1,0,0,0)'::cube > '(2,0),(3,1)'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(2,0,0,0,1),(3,1,0,0,0)'::cube < '(2,0),(3,1)'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '(2,0,0,0,0),(3,1,0,0,0)'::cube > '(2,0),(3,1)'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(2,0,0,0,0),(3,1,0,0,0)'::cube < '(2,0),(3,1)'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
--- "overlap"
---
-SELECT '1'::cube && '1'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '1'::cube && '2'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '0'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '1'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '1,1,1'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '[(1,1,1),(2,2,2)]'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '[(1,1),(2,2)]'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '[(2,1,1),(2,2,2)]'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
--- "overlap on the left" / "overlap on the right"
--- (these operators are not useful at all but R-tree seems to be
--- sensitive to their presence)
---
-SELECT '1'::cube &< '0'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '1'::cube &< '1'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '1'::cube &< '2'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '(0),(1)'::cube &< '0'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(0),(1)'::cube &< '1'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '(0),(1)'::cube &< '(0),(0.5)'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(0),(1)'::cube &< '(0),(1)'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(0),(1)'::cube &< '(0),(2)'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(0),(1)'::cube &< '(1),(2)'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '(0),(1)'::cube &< '(2),(3)'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '0'::cube &> '1'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '1'::cube &> '1'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '2'::cube &> '1'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '0'::cube        &> '(0),(1)'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '1'::cube        &> '(0),(1)'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '(0),(0.5)'      &> '(0),(1)'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(0),(1)'::cube  &> '(0),(1)'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(0),(2)'::cube  &> '(0),(1)'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(1),(2)'::cube  &> '(0),(1)'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '(2),(3)'::cube  &> '(0),(1)'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
--- "left" / "right"
--- (these operators are not useful but for 1-D or 2-D cubes, but R-tree
--- seems to want them defined)
---
-SELECT '1'::cube << '0'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '1'::cube << '1'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '1'::cube << '2'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(0),(1)'::cube << '0'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '(0),(1)'::cube << '1'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(0),(1)'::cube << '(0),(0.5)'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '(0),(1)'::cube << '(0),(1)'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '(0),(1)'::cube << '(0),(2)'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '(0),(1)'::cube << '(1),(2)'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(0),(1)'::cube << '(2),(3)'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0'::cube >> '1'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '1'::cube >> '1'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '2'::cube >> '1'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0'::cube        >> '(0),(1)'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '1'::cube        >> '(0),(1)'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(0),(0.5)'      >> '(0),(1)'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '(0),(1)'::cube  >> '(0),(1)'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '(0),(2)'::cube  >> '(0),(1)'::cube AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '(1),(2)'::cube  >> '(0),(1)'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(2),(3)'::cube  >> '(0),(1)'::cube AS bool;
- bool 
-------
- t
-(1 row)
-
--- "contained in" (the left operand is the cube entirely enclosed by
--- the right operand):
---
-SELECT '0'::cube                 ~ '0'::cube                        AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0,0,0'::cube             ~ '0,0,0'::cube                    AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0,0'::cube               ~ '0,0,1'::cube                    AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0,0,0'::cube             ~ '0,0,1'::cube                    AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '1,0,0'::cube             ~ '0,0,1'::cube                    AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '(1,0,0),(0,0,1)'::cube   ~ '(1,0,0),(0,0,1)'::cube          AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(1,0,0),(0,0,1)'::cube   ~ '(-1,-1,-1),(1,1,1)'::cube       AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(1,0,0),(0,0,1)'::cube   ~ '(-1,-1,-1,-1),(1,1,1,1)'::cube  AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0'::cube                 ~ '(-1),(1)'::cube                 AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '1'::cube                 ~ '(-1),(1)'::cube                 AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '-1'::cube                ~ '(-1),(1)'::cube                 AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(-1),(1)'::cube          ~ '(-1),(1)'::cube                 AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(-1),(1)'::cube          ~ '(-1,-1),(1,1)'::cube            AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(-2),(1)'::cube          ~ '(-1),(1)'::cube                 AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '(-2),(1)'::cube          ~ '(-1,-1),(1,1)'::cube            AS bool;
- bool 
-------
- f
-(1 row)
-
--- "contains" (the left operand is the cube that entirely encloses the
--- right operand)
---
-SELECT '0'::cube                        @ '0'::cube                 AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0,0,0'::cube                    @ '0,0,0'::cube             AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0,0,1'::cube                    @ '0,0'::cube               AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0,0,1'::cube                    @ '0,0,0'::cube             AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '0,0,1'::cube                    @ '1,0,0'::cube             AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '(1,0,0),(0,0,1)'::cube          @ '(1,0,0),(0,0,1)'::cube   AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(-1,-1,-1),(1,1,1)'::cube       @ '(1,0,0),(0,0,1)'::cube   AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(-1,-1,-1,-1),(1,1,1,1)'::cube  @ '(1,0,0),(0,0,1)'::cube   AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(-1),(1)'::cube                 @ '0'::cube                 AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(-1),(1)'::cube                 @ '1'::cube                 AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(-1),(1)'::cube                 @ '-1'::cube                AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(-1),(1)'::cube                 @ '(-1),(1)'::cube          AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(-1,-1),(1,1)'::cube            @ '(-1),(1)'::cube          AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '(-1),(1)'::cube                 @ '(-2),(1)'::cube          AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '(-1,-1),(1,1)'::cube            @ '(-2),(1)'::cube          AS bool;
- bool 
-------
- f
-(1 row)
-
--- Load some example data and build the index
--- 
-CREATE TABLE test_cube (c cube);
-\copy test_cube from 'data/test_cube.data'
-CREATE INDEX test_cube_ix ON test_cube USING gist (c);
-SELECT * FROM test_cube	WHERE c && '(3000,1000),(0,0)';
-            c             
---------------------------
- (2424, 160),(2424, 81)
- (759, 187),(662, 163)
- (1444, 403),(1346, 344)
- (337, 455),(240, 359)
- (1594, 1043),(1517, 971)
-(5 rows)
-
--- Test sorting 
-SELECT * FROM test_cube	WHERE c && '(3000,1000),(0,0)' GROUP BY c;
-            c             
---------------------------
- (337, 455),(240, 359)
- (759, 187),(662, 163)
- (1444, 403),(1346, 344)
- (1594, 1043),(1517, 971)
- (2424, 160),(2424, 81)
-(5 rows)
-
diff --git a/contrib/cube/sql/cube.sql b/contrib/cube/sql/cube.sql
deleted file mode 100644
index 0e0de38bc4..0000000000
--- a/contrib/cube/sql/cube.sql
+++ /dev/null
@@ -1,244 +0,0 @@
---
---  Test cube datatype
---
-
---
--- first, define the datatype.  Turn off echoing so that expected file
--- does not depend on contents of cube.sql.
---
-\set ECHO none
-\i cube.sql
-\set ECHO all
-
---
--- testing the input and output functions
---
-
--- Any number (a one-dimensional point)
-SELECT '1'::cube AS cube;
-SELECT '-1'::cube AS cube;
-SELECT '1.'::cube AS cube;
-SELECT '-1.'::cube AS cube;
-SELECT '.1'::cube AS cube;
-SELECT '-.1'::cube AS cube;
-SELECT '1.0'::cube AS cube;
-SELECT '-1.0'::cube AS cube;
-SELECT '1e7'::cube AS cube;
-SELECT '-1e7'::cube AS cube;
-SELECT '1.0e7'::cube AS cube;
-SELECT '-1.0e7'::cube AS cube;
-SELECT '1e+7'::cube AS cube;
-SELECT '-1e+7'::cube AS cube;
-SELECT '1.0e+7'::cube AS cube;
-SELECT '-1.0e+7'::cube AS cube;
-SELECT '1e-7'::cube AS cube;
-SELECT '-1e-7'::cube AS cube;
-SELECT '1.0e-7'::cube AS cube;
-SELECT '-1.0e-7'::cube AS cube;
-SELECT '1e-700'::cube AS cube;
-SELECT '-1e-700'::cube AS cube;
-
--- simple lists (points)
-SELECT '1,2'::cube AS cube;
-SELECT '(1,2)'::cube AS cube;
-SELECT '1,2,3,4,5'::cube AS cube;
-SELECT '(1,2,3,4,5)'::cube AS cube;
-
--- double lists (cubes)
-SELECT '(0),(0)'::cube AS cube;
-SELECT '(0),(1)'::cube AS cube;
-SELECT '[(0),(0)]'::cube AS cube;
-SELECT '[(0),(1)]'::cube AS cube;
-SELECT '(0,0,0,0),(0,0,0,0)'::cube AS cube;
-SELECT '(0,0,0,0),(1,0,0,0)'::cube AS cube;
-SELECT '[(0,0,0,0),(0,0,0,0)]'::cube AS cube;
-SELECT '[(0,0,0,0),(1,0,0,0)]'::cube AS cube;
-
--- invalid input: parse errors
-SELECT ''::cube AS cube;
-SELECT 'ABC'::cube AS cube;
-SELECT '()'::cube AS cube;
-SELECT '[]'::cube AS cube;
-SELECT '[()]'::cube AS cube;
-SELECT '[(1)]'::cube AS cube;
-SELECT '[(1),]'::cube AS cube;
-SELECT '[(1),2]'::cube AS cube;
-SELECT '[(1),(2),(3)]'::cube AS cube;
-SELECT '1,'::cube AS cube;
-SELECT '1,2,'::cube AS cube;
-SELECT '1,,2'::cube AS cube;
-SELECT '(1,)'::cube AS cube;
-SELECT '(1,2,)'::cube AS cube;
-SELECT '(1,,2)'::cube AS cube;
-
--- invalid input: semantic errors and trailing garbage
-SELECT '[(1),(2)],'::cube AS cube; -- 0
-SELECT '[(1,2,3),(2,3)]'::cube AS cube; -- 1
-SELECT '[(1,2),(1,2,3)]'::cube AS cube; -- 1
-SELECT '(1),(2),'::cube AS cube; -- 2
-SELECT '(1,2,3),(2,3)'::cube AS cube; -- 3
-SELECT '(1,2),(1,2,3)'::cube AS cube; -- 3
-SELECT '(1,2,3)ab'::cube AS cube; -- 4
-SELECT '(1,2,3)a'::cube AS cube; -- 5
-SELECT '(1,2)('::cube AS cube; -- 5
-SELECT '1,2ab'::cube AS cube; -- 6
-SELECT '1 e7'::cube AS cube; -- 6
-SELECT '1,2a'::cube AS cube; -- 7
-SELECT '1..2'::cube AS cube; -- 7
-
---
--- testing the  operators
---
-
--- equality/inequality:
---
-SELECT '24, 33.20'::cube    =  '24, 33.20'::cube AS bool;
-SELECT '24, 33.20'::cube    != '24, 33.20'::cube AS bool;
-SELECT '24, 33.20'::cube    =  '24, 33.21'::cube AS bool;
-SELECT '24, 33.20'::cube    != '24, 33.21'::cube AS bool;
-SELECT '(2,0),(3,1)'::cube  =  '(2,0,0,0,0),(3,1,0,0,0)'::cube AS bool;
-SELECT '(2,0),(3,1)'::cube  =  '(2,0,0,0,0),(3,1,0,0,1)'::cube AS bool;
-
--- "lower than" / "greater than"
--- (these operators are not useful for anything but ordering)
---
-SELECT '1'::cube   > '2'::cube AS bool;
-SELECT '1'::cube   < '2'::cube AS bool;
-SELECT '1,1'::cube > '1,2'::cube AS bool;
-SELECT '1,1'::cube < '1,2'::cube AS bool;
-
-SELECT '(2,0),(3,1)'::cube             > '(2,0,0,0,0),(3,1,0,0,1)'::cube AS bool;
-SELECT '(2,0),(3,1)'::cube             < '(2,0,0,0,0),(3,1,0,0,1)'::cube AS bool;
-SELECT '(2,0),(3,1)'::cube             > '(2,0,0,0,1),(3,1,0,0,0)'::cube AS bool;
-SELECT '(2,0),(3,1)'::cube             < '(2,0,0,0,1),(3,1,0,0,0)'::cube AS bool;
-SELECT '(2,0),(3,1)'::cube             > '(2,0,0,0,0),(3,1,0,0,0)'::cube AS bool;
-SELECT '(2,0),(3,1)'::cube             < '(2,0,0,0,0),(3,1,0,0,0)'::cube AS bool;
-SELECT '(2,0,0,0,0),(3,1,0,0,1)'::cube > '(2,0),(3,1)'::cube AS bool;
-SELECT '(2,0,0,0,0),(3,1,0,0,1)'::cube < '(2,0),(3,1)'::cube AS bool;
-SELECT '(2,0,0,0,1),(3,1,0,0,0)'::cube > '(2,0),(3,1)'::cube AS bool;
-SELECT '(2,0,0,0,1),(3,1,0,0,0)'::cube < '(2,0),(3,1)'::cube AS bool;
-SELECT '(2,0,0,0,0),(3,1,0,0,0)'::cube > '(2,0),(3,1)'::cube AS bool;
-SELECT '(2,0,0,0,0),(3,1,0,0,0)'::cube < '(2,0),(3,1)'::cube AS bool;
-
-
--- "overlap"
---
-SELECT '1'::cube && '1'::cube AS bool;
-SELECT '1'::cube && '2'::cube AS bool;
-
-SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '0'::cube AS bool;
-SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '1'::cube AS bool;
-SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '1,1,1'::cube AS bool;
-SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '[(1,1,1),(2,2,2)]'::cube AS bool;
-SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '[(1,1),(2,2)]'::cube AS bool;
-SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '[(2,1,1),(2,2,2)]'::cube AS bool;
-
--- "overlap on the left" / "overlap on the right"
--- (these operators are not useful at all but R-tree seems to be
--- sensitive to their presence)
---
-SELECT '1'::cube &< '0'::cube AS bool;
-SELECT '1'::cube &< '1'::cube AS bool;
-SELECT '1'::cube &< '2'::cube AS bool;
-
-SELECT '(0),(1)'::cube &< '0'::cube AS bool;
-SELECT '(0),(1)'::cube &< '1'::cube AS bool;
-SELECT '(0),(1)'::cube &< '(0),(0.5)'::cube AS bool;
-SELECT '(0),(1)'::cube &< '(0),(1)'::cube AS bool;
-SELECT '(0),(1)'::cube &< '(0),(2)'::cube AS bool;
-SELECT '(0),(1)'::cube &< '(1),(2)'::cube AS bool;
-SELECT '(0),(1)'::cube &< '(2),(3)'::cube AS bool;
-
-SELECT '0'::cube &> '1'::cube AS bool;
-SELECT '1'::cube &> '1'::cube AS bool;
-SELECT '2'::cube &> '1'::cube AS bool;
-
-SELECT '0'::cube        &> '(0),(1)'::cube AS bool;
-SELECT '1'::cube        &> '(0),(1)'::cube AS bool;
-SELECT '(0),(0.5)'      &> '(0),(1)'::cube AS bool;
-SELECT '(0),(1)'::cube  &> '(0),(1)'::cube AS bool;
-SELECT '(0),(2)'::cube  &> '(0),(1)'::cube AS bool;
-SELECT '(1),(2)'::cube  &> '(0),(1)'::cube AS bool;
-SELECT '(2),(3)'::cube  &> '(0),(1)'::cube AS bool;
-
-
--- "left" / "right"
--- (these operators are not useful but for 1-D or 2-D cubes, but R-tree
--- seems to want them defined)
---
-SELECT '1'::cube << '0'::cube AS bool;
-SELECT '1'::cube << '1'::cube AS bool;
-SELECT '1'::cube << '2'::cube AS bool;
-
-SELECT '(0),(1)'::cube << '0'::cube AS bool;
-SELECT '(0),(1)'::cube << '1'::cube AS bool;
-SELECT '(0),(1)'::cube << '(0),(0.5)'::cube AS bool;
-SELECT '(0),(1)'::cube << '(0),(1)'::cube AS bool;
-SELECT '(0),(1)'::cube << '(0),(2)'::cube AS bool;
-SELECT '(0),(1)'::cube << '(1),(2)'::cube AS bool;
-SELECT '(0),(1)'::cube << '(2),(3)'::cube AS bool;
-
-SELECT '0'::cube >> '1'::cube AS bool;
-SELECT '1'::cube >> '1'::cube AS bool;
-SELECT '2'::cube >> '1'::cube AS bool;
-
-SELECT '0'::cube        >> '(0),(1)'::cube AS bool;
-SELECT '1'::cube        >> '(0),(1)'::cube AS bool;
-SELECT '(0),(0.5)'      >> '(0),(1)'::cube AS bool;
-SELECT '(0),(1)'::cube  >> '(0),(1)'::cube AS bool;
-SELECT '(0),(2)'::cube  >> '(0),(1)'::cube AS bool;
-SELECT '(1),(2)'::cube  >> '(0),(1)'::cube AS bool;
-SELECT '(2),(3)'::cube  >> '(0),(1)'::cube AS bool;
-
-
--- "contained in" (the left operand is the cube entirely enclosed by
--- the right operand):
---
-SELECT '0'::cube                 ~ '0'::cube                        AS bool;
-SELECT '0,0,0'::cube             ~ '0,0,0'::cube                    AS bool;
-SELECT '0,0'::cube               ~ '0,0,1'::cube                    AS bool;
-SELECT '0,0,0'::cube             ~ '0,0,1'::cube                    AS bool;
-SELECT '1,0,0'::cube             ~ '0,0,1'::cube                    AS bool;
-SELECT '(1,0,0),(0,0,1)'::cube   ~ '(1,0,0),(0,0,1)'::cube          AS bool;
-SELECT '(1,0,0),(0,0,1)'::cube   ~ '(-1,-1,-1),(1,1,1)'::cube       AS bool;
-SELECT '(1,0,0),(0,0,1)'::cube   ~ '(-1,-1,-1,-1),(1,1,1,1)'::cube  AS bool;
-SELECT '0'::cube                 ~ '(-1),(1)'::cube                 AS bool;
-SELECT '1'::cube                 ~ '(-1),(1)'::cube                 AS bool;
-SELECT '-1'::cube                ~ '(-1),(1)'::cube                 AS bool;
-SELECT '(-1),(1)'::cube          ~ '(-1),(1)'::cube                 AS bool;
-SELECT '(-1),(1)'::cube          ~ '(-1,-1),(1,1)'::cube            AS bool;
-SELECT '(-2),(1)'::cube          ~ '(-1),(1)'::cube                 AS bool;
-SELECT '(-2),(1)'::cube          ~ '(-1,-1),(1,1)'::cube            AS bool;
-
-
--- "contains" (the left operand is the cube that entirely encloses the
--- right operand)
---
-SELECT '0'::cube                        @ '0'::cube                 AS bool;
-SELECT '0,0,0'::cube                    @ '0,0,0'::cube             AS bool;
-SELECT '0,0,1'::cube                    @ '0,0'::cube               AS bool;
-SELECT '0,0,1'::cube                    @ '0,0,0'::cube             AS bool;
-SELECT '0,0,1'::cube                    @ '1,0,0'::cube             AS bool;
-SELECT '(1,0,0),(0,0,1)'::cube          @ '(1,0,0),(0,0,1)'::cube   AS bool;
-SELECT '(-1,-1,-1),(1,1,1)'::cube       @ '(1,0,0),(0,0,1)'::cube   AS bool;
-SELECT '(-1,-1,-1,-1),(1,1,1,1)'::cube  @ '(1,0,0),(0,0,1)'::cube   AS bool;
-SELECT '(-1),(1)'::cube                 @ '0'::cube                 AS bool;
-SELECT '(-1),(1)'::cube                 @ '1'::cube                 AS bool;
-SELECT '(-1),(1)'::cube                 @ '-1'::cube                AS bool;
-SELECT '(-1),(1)'::cube                 @ '(-1),(1)'::cube          AS bool;
-SELECT '(-1,-1),(1,1)'::cube            @ '(-1),(1)'::cube          AS bool;
-SELECT '(-1),(1)'::cube                 @ '(-2),(1)'::cube          AS bool;
-SELECT '(-1,-1),(1,1)'::cube            @ '(-2),(1)'::cube          AS bool;
-
-
--- Load some example data and build the index
--- 
-CREATE TABLE test_cube (c cube);
-
-\copy test_cube from 'data/test_cube.data'
-
-CREATE INDEX test_cube_ix ON test_cube USING gist (c);
-SELECT * FROM test_cube	WHERE c && '(3000,1000),(0,0)';
-
--- Test sorting 
-SELECT * FROM test_cube	WHERE c && '(3000,1000),(0,0)' GROUP BY c;
diff --git a/contrib/dbase/Makefile b/contrib/dbase/Makefile
deleted file mode 100644
index 5089298c3f..0000000000
--- a/contrib/dbase/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/dbase/Attic/Makefile,v 1.4 2001/12/21 05:29:46 momjian Exp $
-
-subdir = contrib/dbase
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-PROGRAM = dbf2pg
-OBJS	= dbf.o dbf2pg.o endian.o
-PG_CPPFLAGS = -I$(libpq_srcdir)
-PG_LIBS = $(libpq)
-
-# Uncomment this to provide charset translation
-#PG_CPPFLAGS += -DHAVE_ICONV_H
-# You might need to uncomment this too, if libiconv is a separate
-# library on your platform
-#PG_LIBS += -liconv
-
-DOCS = README.dbf2pg
-MAN = dbf2pg.1			# XXX not implemented
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/dbase/README.dbf2pg b/contrib/dbase/README.dbf2pg
deleted file mode 100644
index 7203be4029..0000000000
--- a/contrib/dbase/README.dbf2pg
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
-
-dbf2sql(1L)					      dbf2sql(1L)
-
-
-NAME
-       dbf2sql	-  Insert  xBase-style	.dbf-files  into  a Post-
-       greSQL-table
-
-SYNOPSIS
-       "dbf2pg [options] dbf-file"
-       Options:
-       [-v[v]] [-f] [-u | -l] [-c | -D] [-d database] [-t  table]
-       [-h   host]   [-s  oldname=newname[,oldname=newname]]  [-s
-       start] [-e end] [-W] [-U username]  [-B	transaction_size]
-       [-F charset_from [-T charset_to]]
-
-
-DESCRIPTION
-       This  manual  page documents the program dbf2pg.  It takes
-       an xBase-style .dbf-file, and inserts it into  the  speci-
-       fied database and table.
-
-   OPTIONS
-       -v     Display some status-messages.
-
-       -vv    Also display progress.
-
-       -f     Convert  all field-names from the .dbf-file to low-
-	      ercase.
-
-       -u     Convert the contents of all fields to uppercase.
-
-       -l     Convert the contents of all fields to lowercase.
-
-       -c     Create the table specified with -t.  If this  table
-	      already exists, first DROP it.
-
-       -D     Delete the contents of the table specified with -t.
-	      Note that this table has to  exists.  An	error  is
-	      returned if this is not the case.
-
-       -W     Ask for password.
-
-       -d database
-	      Specify  the  database to use. An error is returned
-	      if  this	database  does	not  exists.  Default  is
-	      "test".
-
-       -t table
-	      Specify  the  table  to  insert  in.  An	error  is
-	      returned if this table does not exists. Default  is
-	      "test".
-
-       -h host
-	      Specify  the  host  to which to connect. Default is
-	      "localhost".
-
-
-
-
-
-								1
-
-
-
-
-
-dbf2sql(1L)					      dbf2sql(1L)
-
-
-       -s oldname=newname[,oldname=newname]
-	      Change the name of a field from oldname to newname.
-	      This  is	mainly	used to avoid using reserved SQL-
-	      keywords. Example:
-	      -s SELECT=SEL,COMMIT=doit
-	      This is done  before  the  -f  operator  has  taken
-	      effect!
-
-       -s start
-	      Specify  the  first record-number in the xBase-file
-	      we will insert.
-
-       -e end Specify the last record-number in the xBase-file we
-	      will insert.
-
-       -B transaction_size
-	      Specify  the  number  of	records  per transaction,
-	      default is all records.
-
-       -U username
-	      Log as the specified user in the database.
-
-       -F charset_from
-	      If specified, it converts the data from the  speci-
-	      fied charset. Example:
-	      -F IBM437
-	      Consult  your  system documentation to see the con-
-	      versions available.  This requires iconv to be enabled
-              in the compile.
-
-       -T charset_to
-	      Together with -F charset_from  ,	it  converts  the
-	      data   to   the	specified   charset.  Default  is
-	      "ISO-8859-1".  This requires iconv to be enabled
-              in the compile.
-
-ENVIRONMENT
-       This program is affected by the	environment-variables  as
-       used  by  "PostgresSQL."   See  the documentation of Post-
-       gresSQL for more info.  This program can optionally use iconv 
-       character set conversion routines.
-
-BUGS
-       Fields larger than 8192 characters are not  supported  and
-       could break the program.
-       Some  charset  convertions  could  cause  the output to be
-       larger than the input and could break the program.
-
-
-
-
-
-
-
-
-
-
-
-
-
-								2
-
-
diff --git a/contrib/dbase/dbf.c b/contrib/dbase/dbf.c
deleted file mode 100644
index 053e9adffb..0000000000
--- a/contrib/dbase/dbf.c
+++ /dev/null
@@ -1,520 +0,0 @@
-/* Routines to read and write xBase-files (.dbf)
-
-   By Maarten Boekhold, 29th of oktober 1995
-
-   Modified by Frank Koormann (fkoorman@usf.uni-osnabrueck.de), Jun 10 1996
-	prepare dataarea with memset
-	get systemtime and set filedate
-	set formatstring for real numbers
-*/
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <time.h>
-
-#include "dbf.h"
-
-/* open a dbf-file, get it's field-info and store this information */
-
-dbhead *
-dbf_open(u_char *file, int flags)
-{
-	int			file_no;
-	dbhead	   *dbh;
-	f_descr    *fields;
-	dbf_header *head;
-	dbf_field  *fieldc;
-	int			t;
-
-	if ((dbh = (dbhead *) malloc(sizeof(dbhead))) == NULL)
-		return (dbhead *) DBF_ERROR;
-
-	if ((head = (dbf_header *) malloc(sizeof(dbf_header))) == NULL)
-	{
-		free(dbh);
-		return (dbhead *) DBF_ERROR;
-	}
-
-	if ((fieldc = (dbf_field *) malloc(sizeof(dbf_field))) == NULL)
-	{
-		free(head);
-		free(dbh);
-		return (dbhead *) DBF_ERROR;
-	}
-
-	if ((file_no = open(file, flags)) == -1)
-	{
-		free(fieldc);
-		free(head);
-		free(dbh);
-		return (dbhead *) DBF_ERROR;
-	}
-
-/* read in the disk-header */
-
-	if (read(file_no, head, sizeof(dbf_header)) == -1)
-	{
-		close(file_no);
-		free(fieldc);
-		free(head);
-		free(dbh);
-		return (dbhead *) DBF_ERROR;
-	}
-
-	if (!(head->dbh_dbt & DBH_NORMAL))
-	{
-		close(file_no);
-		free(fieldc);
-		free(head);
-		free(dbh);
-		return (dbhead *) DBF_ERROR;
-	}
-
-	dbh->db_fd = file_no;
-	if (head->dbh_dbt & DBH_MEMO)
-		dbh->db_memo = 1;
-	else
-		dbh->db_memo = 0;
-	dbh->db_year = head->dbh_year;
-	dbh->db_month = head->dbh_month;
-	dbh->db_day = head->dbh_day;
-	dbh->db_hlen = get_short((u_char *) &head->dbh_hlen);
-	dbh->db_records = get_long((u_char *) &head->dbh_records);
-	dbh->db_currec = 0;
-	dbh->db_rlen = get_short((u_char *) &head->dbh_rlen);
-	dbh->db_nfields = (dbh->db_hlen - sizeof(dbf_header)) / sizeof(dbf_field);
-
-	/*
-	 * dbh->db_hlen - sizeof(dbf_header) isn't the correct size, cos
-	 * dbh->hlen is in fact a little more cos of the 0x0D (and possibly
-	 * another byte, 0x4E, I have seen this somewhere). Because of
-	 * rounding everything turns out right :)
-	 */
-
-	if ((fields = (f_descr *) calloc(dbh->db_nfields, sizeof(f_descr)))
-		== NULL)
-	{
-		close(file_no);
-		free(fieldc);
-		free(head);
-		free(dbh);
-		return (dbhead *) DBF_ERROR;
-	}
-
-	for (t = 0; t < dbh->db_nfields; t++)
-	{
-/* Maybe I have calculated the number of fields incorrectly. This can happen
-   when programs reserve lots of space at the end of the header for future
-   expansion. This will catch this situation */
-		if (fields[t].db_name[0] == 0x0D)
-		{
-			dbh->db_nfields = t;
-			break;
-		}
-		read(file_no, fieldc, sizeof(dbf_field));
-		strncpy(fields[t].db_name, fieldc->dbf_name, DBF_NAMELEN);
-		fields[t].db_type = fieldc->dbf_type;
-		fields[t].db_flen = fieldc->dbf_flen;
-		fields[t].db_dec = fieldc->dbf_dec;
-	}
-
-	dbh->db_offset = dbh->db_hlen;
-	dbh->db_fields = fields;
-
-	if ((dbh->db_buff = (u_char *) malloc(dbh->db_rlen)) == NULL)
-		return (dbhead *) DBF_ERROR;
-
-	free(fieldc);
-	free(head);
-
-	return dbh;
-}
-
-int
-dbf_write_head(dbhead * dbh)
-{
-	dbf_header	head;
-	time_t		now;
-	struct tm  *dbf_time;
-
-	if (lseek(dbh->db_fd, 0, SEEK_SET) == -1)
-		return DBF_ERROR;
-
-/* fill up the diskheader */
-
-/* Set dataarea of head to '\0' */
-	memset(&head, '\0', sizeof(dbf_header));
-
-	head.dbh_dbt = DBH_NORMAL;
-	if (dbh->db_memo)
-		head.dbh_dbt = DBH_MEMO;
-
-	now = time((time_t *) NULL);
-	dbf_time = localtime(&now);
-	head.dbh_year = dbf_time->tm_year;
-	head.dbh_month = dbf_time->tm_mon + 1;		/* Months since January +
-												 * 1 */
-	head.dbh_day = dbf_time->tm_mday;
-
-	put_long(head.dbh_records, dbh->db_records);
-	put_short(head.dbh_hlen, dbh->db_hlen);
-	put_short(head.dbh_rlen, dbh->db_rlen);
-
-	if (write(dbh->db_fd, &head, sizeof(dbf_header)) != sizeof(dbf_header))
-		return DBF_ERROR;
-
-	return 0;
-}
-
-int
-dbf_put_fields(dbhead * dbh)
-{
-	dbf_field	field;
-	u_long		t;
-	u_char		end = 0x0D;
-
-	if (lseek(dbh->db_fd, sizeof(dbf_header), SEEK_SET) == -1)
-		return DBF_ERROR;
-
-/* Set dataarea of field to '\0' */
-	memset(&field, '\0', sizeof(dbf_field));
-
-	for (t = 0; t < dbh->db_nfields; t++)
-	{
-		strncpy(field.dbf_name, dbh->db_fields[t].db_name, DBF_NAMELEN - 1);
-		field.dbf_type = dbh->db_fields[t].db_type;
-		field.dbf_flen = dbh->db_fields[t].db_flen;
-		field.dbf_dec = dbh->db_fields[t].db_dec;
-
-		if (write(dbh->db_fd, &field, sizeof(dbf_field)) != sizeof(dbf_field))
-			return DBF_ERROR;
-	}
-
-	if (write(dbh->db_fd, &end, 1) != 1)
-		return DBF_ERROR;
-
-	return 0;
-}
-
-int
-dbf_add_field(dbhead * dbh, u_char *name, u_char type,
-			  u_char length, u_char dec)
-{
-	f_descr    *ptr;
-	u_char	   *foo;
-	u_long		size,
-				field_no;
-
-	size = (dbh->db_nfields + 1) * sizeof(f_descr);
-	if (!(ptr = (f_descr *) realloc(dbh->db_fields, size)))
-		return DBF_ERROR;
-	dbh->db_fields = ptr;
-
-	field_no = dbh->db_nfields;
-	strncpy(dbh->db_fields[field_no].db_name, name, DBF_NAMELEN);
-	dbh->db_fields[field_no].db_type = type;
-	dbh->db_fields[field_no].db_flen = length;
-	dbh->db_fields[field_no].db_dec = dec;
-
-	dbh->db_nfields++;
-	dbh->db_hlen += sizeof(dbf_field);
-	dbh->db_rlen += length;
-
-	if (!(foo = (u_char *) realloc(dbh->db_buff, dbh->db_rlen)))
-		return DBF_ERROR;
-
-	dbh->db_buff = foo;
-
-	return 0;
-}
-
-dbhead *
-dbf_open_new(u_char *name, int flags)
-{
-	dbhead	   *dbh;
-
-	if (!(dbh = (dbhead *) malloc(sizeof(dbhead))))
-		return (dbhead *) DBF_ERROR;
-
-	if (flags & O_CREAT)
-	{
-		if ((dbh->db_fd = open(name, flags, DBF_FILE_MODE)) == -1)
-		{
-			free(dbh);
-			return (dbhead *) DBF_ERROR;
-		}
-	}
-	else
-	{
-		if ((dbh->db_fd = open(name, flags)) == -1)
-		{
-			free(dbh);
-			return (dbhead *) DBF_ERROR;
-		}
-	}
-
-
-	dbh->db_offset = 0;
-	dbh->db_memo = 0;
-	dbh->db_year = 0;
-	dbh->db_month = 0;
-	dbh->db_day = 0;
-	dbh->db_hlen = sizeof(dbf_header) + 1;
-	dbh->db_records = 0;
-	dbh->db_currec = 0;
-	dbh->db_rlen = 1;
-	dbh->db_nfields = 0;
-	dbh->db_buff = NULL;
-	dbh->db_fields = (f_descr *) NULL;
-
-	return dbh;
-}
-
-void
-dbf_close(dbhead * dbh)
-{
-	int			t;
-
-	close(dbh->db_fd);
-
-	for (t = 0; t < dbh->db_nfields; t++)
-		free(&dbh->db_fields[t]);
-
-	if (dbh->db_buff != NULL)
-		free(dbh->db_buff);
-
-	free(dbh);
-}
-
-int
-dbf_get_record(dbhead * dbh, field * fields, u_long rec)
-{
-	u_char	   *data;
-	int			t,
-				i,
-				offset;
-	u_char	   *dbffield,
-			   *end;
-
-/* calculate at which offset we have to read. *DON'T* forget the
-   0x0D which seperates field-descriptions from records!
-
-	Note (april 5 1996): This turns out to be included in db_hlen
-*/
-	offset = dbh->db_hlen + (rec * dbh->db_rlen);
-
-	if (lseek(dbh->db_fd, offset, SEEK_SET) == -1)
-	{
-		lseek(dbh->db_fd, 0, SEEK_SET);
-		dbh->db_offset = 0;
-		return DBF_ERROR;
-	}
-
-	dbh->db_offset = offset;
-	dbh->db_currec = rec;
-	data = dbh->db_buff;
-
-	read(dbh->db_fd, data, dbh->db_rlen);
-
-	if (data[0] == DBF_DELETED)
-		return DBF_DELETED;
-
-	dbffield = &data[1];
-	for (t = 0; t < dbh->db_nfields; t++)
-	{
-		strncpy(fields[t].db_name, dbh->db_fields[t].db_name, DBF_NAMELEN);
-		fields[t].db_type = dbh->db_fields[t].db_type;
-		fields[t].db_flen = dbh->db_fields[t].db_flen;
-		fields[t].db_dec = dbh->db_fields[t].db_dec;
-
-		if (fields[t].db_type == 'C')
-		{
-			end = &dbffield[fields[t].db_flen - 1];
-			i = fields[t].db_flen;
-			while ((i > 0) && ((*end < 0x21) || (*end > 0x7E)))
-			{
-				end--;
-				i--;
-			}
-			strncpy(fields[t].db_contents, dbffield, i);
-			fields[t].db_contents[i] = '\0';
-		}
-		else
-		{
-			end = dbffield;
-			i = fields[t].db_flen;
-			while ((i > 0) && ((*end < 0x21) || (*end > 0x7E)))
-			{
-				end++;
-				i--;
-			}
-			strncpy(fields[t].db_contents, end, i);
-			fields[t].db_contents[i] = '\0';
-		}
-
-		dbffield += fields[t].db_flen;
-	}
-
-	dbh->db_offset += dbh->db_rlen;
-
-	return DBF_VALID;
-}
-
-field *
-dbf_build_record(dbhead * dbh)
-{
-	int			t;
-	field	   *fields;
-
-	if (!(fields = (field *) calloc(dbh->db_nfields, sizeof(field))))
-		return (field *) DBF_ERROR;
-
-	for (t = 0; t < dbh->db_nfields; t++)
-	{
-		if (!(fields[t].db_contents =
-			  (u_char *) malloc(dbh->db_fields[t].db_flen + 1)))
-		{
-			for (t = 0; t < dbh->db_nfields; t++)
-			{
-				if (fields[t].db_contents != 0)
-				{
-					free(fields[t].db_contents);
-					free(fields);
-				}
-				return (field *) DBF_ERROR;
-			}
-		}
-		strncpy(fields[t].db_name, dbh->db_fields[t].db_name, DBF_NAMELEN);
-		fields[t].db_type = dbh->db_fields[t].db_type;
-		fields[t].db_flen = dbh->db_fields[t].db_flen;
-		fields[t].db_dec = dbh->db_fields[t].db_dec;
-	}
-
-	return fields;
-}
-
-void
-dbf_free_record(dbhead * dbh, field * rec)
-{
-	int			t;
-
-	for (t = 0; t < dbh->db_nfields; t++)
-		free(rec[t].db_contents);
-
-	free(rec);
-}
-
-int
-dbf_put_record(dbhead * dbh, field * rec, u_long where)
-{
-	u_long		offset,
-				new,
-				idx,
-				t,
-				h,
-				length;
-	u_char	   *data,
-				end = 0x1a;
-	double		fl;
-	u_char		foo[128],
-				format[32];
-
-/*	offset: offset in file for this record
-	new:	real offset after lseek
-	idx:	index to which place we are inside the 'hardcore'-data for this
-			record
-	t:		field-counter
-	data:	the hardcore-data that is put on disk
-	h:		index into the field-part in the hardcore-data
-	length: length of the data to copy
-	fl:		a float used to get the right precision with real numbers
-	foo:	copy of db_contents when field is not 'C'
-	format: sprintf format-string to get the right precision with real numbers
-
-	NOTE: this declaration of 'foo' can cause overflow when the contents-field
-	is longer the 127 chars (which is highly unlikely, cos it is not used
-	in text-fields).
-*/
-/*	REMEMBER THAT THERE'S A 0x1A AT THE END OF THE FILE, SO DON'T
-	DO A SEEK_END WITH 0!!!!!! USE -1 !!!!!!!!!!
-*/
-
-	if (where > dbh->db_records)
-	{
-		if ((new = lseek(dbh->db_fd, -1, SEEK_END)) == -1)
-			return DBF_ERROR;
-		dbh->db_records++;
-	}
-	else
-	{
-		offset = dbh->db_hlen + (where * dbh->db_rlen);
-		if ((new = lseek(dbh->db_fd, offset, SEEK_SET)) == -1)
-			return DBF_ERROR;
-	}
-
-	dbh->db_offset = new;
-
-	data = dbh->db_buff;
-
-/* Set dataarea of data to ' ' (space) */
-	memset(data, ' ', dbh->db_rlen);
-
-/*	data[0] = DBF_VALID; */
-
-	idx = 1;
-	for (t = 0; t < dbh->db_nfields; t++)
-	{
-/* if field is empty, don't do a thing */
-		if (rec[t].db_contents[0] != '\0')
-		{
-/*	Handle text */
-			if (rec[t].db_type == 'C')
-			{
-				if (strlen(rec[t].db_contents) > rec[t].db_flen)
-					length = rec[t].db_flen;
-				else
-					length = strlen(rec[t].db_contents);
-				strncpy(data + idx, rec[t].db_contents, length);
-			}
-			else
-			{
-/* Handle the rest */
-/* Numeric is special, because of real numbers */
-				if ((rec[t].db_type == 'N') && (rec[t].db_dec != 0))
-				{
-					fl = atof(rec[t].db_contents);
-					sprintf(format, "%%.%df", rec[t].db_dec);
-					sprintf(foo, format, fl);
-				}
-				else
-					strcpy(foo, rec[t].db_contents);
-				if (strlen(foo) > rec[t].db_flen)
-					length = rec[t].db_flen;
-				else
-					length = strlen(foo);
-				h = rec[t].db_flen - length;
-				strncpy(data + idx + h, foo, length);
-			}
-		}
-		idx += rec[t].db_flen;
-	}
-
-	if (write(dbh->db_fd, data, dbh->db_rlen) != dbh->db_rlen)
-		return DBF_ERROR;
-
-/* There's a 0x1A at the end of a dbf-file */
-	if (where == dbh->db_records)
-	{
-		if (write(dbh->db_fd, &end, 1) != 1)
-			return DBF_ERROR;
-	}
-
-	dbh->db_offset += dbh->db_rlen;
-
-	return 0;
-}
diff --git a/contrib/dbase/dbf.h b/contrib/dbase/dbf.h
deleted file mode 100644
index 254e8d19e9..0000000000
--- a/contrib/dbase/dbf.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* header-file for dbf.c
-   declares routines for reading and writing xBase-files (.dbf), and
-   associated structures
-
-   Maarten Boekhold (maarten.boekhold@reuters.com) 29 oktober 1995
-*/
-
-#ifndef _DBF_H
-#define _DBF_H
-
-#include <sys/types.h>
-
-/**********************************************************************
-
-		The DBF-part
-
-***********************************************************************/
-
-#define DBF_FILE_MODE	0644
-
-/* byte offsets for date in dbh_date */
-
-#define DBH_DATE_YEAR	0
-#define DBH_DATE_MONTH	1
-#define DBH_DATE_DAY	2
-
-/* maximum fieldname-length */
-
-#define DBF_NAMELEN 11
-
-/* magic-cookies for the file */
-
-#define DBH_NORMAL	0x03
-#define DBH_MEMO	0x83
-
-/* magic-cookies for the fields */
-
-#define DBF_ERROR	-1
-#define DBF_VALID	0x20
-#define DBF_DELETED 0x2A
-
-/* diskheader */
-
-typedef struct
-{
-	u_char		dbh_dbt;		/* indentification field */
-	u_char		dbh_year;		/* last modification-date */
-	u_char		dbh_month;
-	u_char		dbh_day;
-	u_char		dbh_records[4]; /* number of records */
-	u_char		dbh_hlen[2];	/* length of this header */
-	u_char		dbh_rlen[2];	/* length of a record */
-	u_char		dbh_stub[20];	/* misc stuff we don't need */
-}	dbf_header;
-
-/* disk field-description */
-
-typedef struct
-{
-	u_char		dbf_name[DBF_NAMELEN];	/* field-name terminated with \0 */
-	u_char		dbf_type;		/* field-type */
-	u_char		dbf_reserved[4];	/* some reserved stuff */
-	u_char		dbf_flen;		/* field-length */
-	u_char		dbf_dec;		/* number of decimal positions if type is
-								 * 'N' */
-	u_char		dbf_stub[14];	/* stuff we don't need */
-}	dbf_field;
-
-/* memory field-description */
-
-typedef struct
-{
-	u_char		db_name[DBF_NAMELEN];	/* field-name terminated with \0 */
-	u_char		db_type;		/* field-type */
-	u_char		db_flen;		/* field-length */
-	u_char		db_dec;			/* number of decimal positions */
-}	f_descr;
-
-/* memory dfb-header */
-
-typedef struct
-{
-	int			db_fd;			/* file-descriptor */
-	u_long		db_offset;		/* current offset in file */
-	u_char		db_memo;		/* memo-file present */
-	u_char		db_year;		/* last update as YYMMDD */
-	u_char		db_month;
-	u_char		db_day;
-	u_long		db_hlen;		/* length of the diskheader, for
-								 * calculating the offsets */
-	u_long		db_records;		/* number of records */
-	u_long		db_currec;		/* current record-number starting at 0 */
-	u_short		db_rlen;		/* length of the record */
-	u_char		db_nfields;		/* number of fields */
-	u_char	   *db_buff;		/* record-buffer to save malloc()'s */
-	f_descr    *db_fields;		/* pointer to an array of field-
-								 * descriptions */
-}	dbhead;
-
-/* structure that contains everything a user wants from a field, including
-   the contents (in ASCII). Warning! db_flen may be bigger than the actual
-   length of db_name! This is because a field doesn't have to be completely
-   filled */
-
-typedef struct
-{
-	u_char		db_name[DBF_NAMELEN];	/* field-name terminated with \0 */
-	u_char		db_type;		/* field-type */
-	u_char		db_flen;		/* field-length */
-	u_char		db_dec;			/* number of decimal positions */
-	u_char	   *db_contents;	/* contents of the field in ASCII */
-}	field;
-
-/* prototypes for functions */
-
-extern dbhead *dbf_open(u_char *file, int flags);
-extern int	dbf_write_head(dbhead * dbh);
-extern int	dbf_put_fields(dbhead * dbh);
-extern int dbf_add_field(dbhead * dbh, u_char *name, u_char type,
-			  u_char length, u_char dec);
-extern dbhead *dbf_open_new(u_char *name, int flags);
-extern void dbf_close(dbhead * dbh);
-extern int	dbf_get_record(dbhead * dbh, field * fields, u_long rec);
-extern field *dbf_build_record(dbhead * dbh);
-extern void dbf_free_record(dbhead * dbh, field * fields);
-extern int	dbf_put_record(dbhead * dbh, field * rec, u_long where);
-
-/*********************************************************************
-
-		The endian-part
-
-***********************************************************************/
-
-extern long get_long(u_char *cp);
-extern void put_long(u_char *cp, long lval);
-extern short get_short(u_char *cp);
-extern void put_short(u_char *cp, short lval);
-
-#endif   /* _DBF_H */
diff --git a/contrib/dbase/dbf2pg.1 b/contrib/dbase/dbf2pg.1
deleted file mode 100644
index a377e489c8..0000000000
--- a/contrib/dbase/dbf2pg.1
+++ /dev/null
@@ -1,116 +0,0 @@
-.TH dbf2sql 1L \" -*- nroff -*-
-.SH NAME
-dbf2sql \- Insert xBase\-style .dbf\-files into a PostgreSQL\-table
-.SH SYNOPSIS
-.B dbf2pg [options] dbf-file
-.br
-.br
-Options:
-.br
-[-v[v]] [-f] [-u | -l] [-c | -D] [-d database] [-t table]
-[-h host] [-s oldname=newname[,oldname=newname]]
-[-s start] [-e end] [-W] [-U username] [-B transaction_size]
-[-F charset_from [-T charset_to]]
-
-.SH DESCRIPTION
-This manual page documents the program
-.BR dbf2pg.
-It takes an xBase-style .dbf-file, and inserts it into the specified
-database and table.
-.SS OPTIONS
-.TP
-.I "\-v"
-Display some status-messages.
-.TP
-.I "-vv"
-Also display progress.
-.TP
-.I "-f"
-Convert all field-names from the .dbf-file to lowercase.
-.TP
-.I "-u"
-Convert the contents of all fields to uppercase.
-.TP
-.I "-l"
-Convert the contents of all fields to lowercase.
-.TP
-.I "-c"
-Create the table specified with
-.IR \-t .
-If this table already exists, first
-.BR DROP
-it.
-.TP
-.I "-D"
-Delete the contents of the table specified with
-.IR \-t .
-Note that this table has to exists. An error is returned if this is not the
-case.
-.TP
-.I "-W"
-Ask for password.
-.TP
-.I "-d database"
-Specify the database to use. An error is returned if this database does not
-exists. Default is "test".
-.TP
-.I "-t table"
-Specify the table to insert in. An error is returned if this table does not
-exists. Default is "test".
-.TP
-.I "-h host"
-Specify the host to which to connect. Default is "localhost".
-.TP
-.I "-s oldname=newname[,oldname=newname]"
-Change the name of a field from
-.BR oldname
-to
-.BR newname .
-This is mainly used to avoid using reserved SQL-keywords. Example:
-.br
-.br
--s SELECT=SEL,COMMIT=doit
-.br
-.br
-This is done
-.BR before
-the
-.IR -f
-operator has taken effect!
-.TP
-.I "-s start"
-Specify the first record-number in the xBase-file we will insert.
-.TP
-.I "-e end"
-Specify the last record-number in the xBase-file we will insert.
-.TP
-.I "-B transaction_size"
-Specify the number of records per transaction, default is all records.
-.TP
-.I "-U username"
-Log as the specified user in the database.
-.TP
-.I "-F charset_from"
-If specified, it converts the data from the specified charset. Example:
-.br
-.br
--F IBM437
-.br
-.br
-Consult your system documentation to see the convertions available.
-.TP
-.I "-T charset_to"
-Together with
-.I "-F charset_from"
-, it converts the data to the specified charset. Default is "ISO-8859-1".
-.SH ENVIRONMENT
-This program is affected by the environment-variables as used
-by
-.B PostgresSQL.
-See the documentation of PostgresSQL for more info.
-.SH BUGS
-Fields larger than 8192 characters are not supported and could break the
-program.
-.br
-Some charset convertions could cause the output to be larger than the input
-and could break the program.
diff --git a/contrib/dbase/dbf2pg.c b/contrib/dbase/dbf2pg.c
deleted file mode 100644
index 5f5e9d2823..0000000000
--- a/contrib/dbase/dbf2pg.c
+++ /dev/null
@@ -1,954 +0,0 @@
-/* This program reads in an xbase-dbf file and sends 'inserts' to an
-   PostgreSQL-server with the records in the xbase-file
-
-   M. Boekhold (maarten.boekhold@reuters.com)  okt. 1995
-   oktober 1996: merged sources of dbf2msql.c and dbf2pg.c
-   oktober 1997: removed msql support
-*/
-#include "postgres_fe.h"
-
-#include <fcntl.h>
-#include <unistd.h>
-#include <ctype.h>
-#ifdef HAVE_TERMIOS_H
-#include <termios.h>
-#endif
-#ifdef HAVE_ICONV_H
-#include <iconv.h>
-#endif
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
-
-#include "libpq-fe.h"
-#include "dbf.h"
-
-int			verbose = 0,
-			upper = 0,
-			lower = 0,
-			create = 0,
-			fieldlow = 0;
-int			del = 0;
-unsigned int begin = 0,
-			end = 0;
-unsigned int t_block = 0;
-
-#ifdef HAVE_ICONV_H
-char	   *charset_from = NULL;
-char	   *charset_to = "ISO-8859-1";
-iconv_t		iconv_d;
-char		convert_charset_buff[8192];
-#endif
-
-char	   *host = NULL;
-char	   *dbase = "test";
-char	   *table = "test";
-char	   *username = NULL;
-char	   *password = NULL;
-char	   *subarg = NULL;
-char		escape_buff[8192];
-
-void		do_substitute(char *subarg, dbhead * dbh);
-inline void strtoupper(char *string);
-
-inline void strtolower(char *string);
-void		do_create(PGconn *, char *, dbhead *);
-void		do_inserts(PGconn *, char *, dbhead *);
-int			check_table(PGconn *, char *);
-
-char	   *Escape(char *);
-
-#ifdef HAVE_ICONV_H
-char	   *convert_charset(char *string);
-#endif
-void		usage(void);
-unsigned int isinteger(char *);
-
-char	   *simple_prompt(const char *prompt, int maxlen, bool echo);
-
-
-unsigned int
-isinteger(char *buff)
-{
-	char	   *i = buff;
-
-	while (*i != '\0')
-	{
-		if (i == buff)
-			if ((*i == '-') ||
-				(*i == '+'))
-			{
-				i++;
-				continue;
-			}
-		if (!isdigit((unsigned char) *i))
-			return 0;
-		i++;
-	}
-	return 1;
-}
-
-inline void
-strtoupper(char *string)
-{
-	while (*string != '\0')
-	{
-		*string = toupper((unsigned char) *string);
-		string++;
-	}
-}
-
-inline void
-strtolower(char *string)
-{
-	while (*string != '\0')
-	{
-		*string = tolower((unsigned char) *string);
-		string++;
-	}
-}
-
-/* FIXME: should this check for overflow? */
-char *
-Escape(char *string)
-{
-	char	   *foo,
-			   *bar;
-
-	foo = escape_buff;
-
-	bar = string;
-	while (*bar != '\0')
-	{
-		if ((*bar == '\t') ||
-			(*bar == '\n') ||
-			(*bar == '\\'))
-			*foo++ = '\\';
-		*foo++ = *bar++;
-	}
-	*foo = '\0';
-
-	return escape_buff;
-}
-
-#ifdef HAVE_ICONV_H
-char *
-convert_charset(char *string)
-{
-	size_t		in_size,
-				out_size,
-				nconv;
-	char	   *in_ptr,
-			   *out_ptr;
-
-	in_size = strlen(string) + 1;
-	out_size = sizeof(convert_charset_buff);
-	in_ptr = string;
-	out_ptr = convert_charset_buff;
-
-	iconv(iconv_d, NULL, &in_size, &out_ptr, &out_size);		/* necessary to reset
-																 * state information */
-	while (in_size > 0)
-	{
-		nconv = iconv(iconv_d, &in_ptr, &in_size, &out_ptr, &out_size);
-		if (nconv == (size_t) -1)
-		{
-			printf("WARNING: cannot convert charset of string \"%s\".\n",
-				   string);
-			strcpy(convert_charset_buff, string);
-			return convert_charset_buff;
-		}
-	}
-	*out_ptr = 0;				/* terminate output string */
-	return convert_charset_buff;
-}
-#endif
-
-int
-check_table(PGconn *conn, char *table)
-{
-	char	   *q = "select relname from pg_class where "
-	"relkind='r' and relname !~* '^pg'";
-	PGresult   *res;
-	int			i = 0;
-
-	if (!(res = PQexec(conn, q)))
-	{
-		printf("%s\n", PQerrorMessage(conn));
-		return 0;
-	}
-
-	for (i = 0; i < PQntuples(res); i++)
-	{
-		if (!strcmp(table, PQgetvalue(res, i, PQfnumber(res, "relname"))))
-			return 1;
-	}
-
-	return 0;
-}
-
-void
-usage(void)
-{
-	printf("dbf2pg\n"
-		   "usage: dbf2pg [-u | -l] [-h hostname] [-W] [-U username]\n"
-		   "              [-B transaction_size] [-F charset_from [-T charset_to]]\n"
-		   "              [-s oldname=newname[,oldname=newname[...]]] [-d dbase]\n"
-		   "              [-t table] [-c | -D] [-f] [-v[v]] dbf-file\n");
-}
-
-/* patch submitted by Jeffrey Y. Sue <jysue@aloha.net> */
-/* Provides functionallity for substituting dBase-fieldnames for others */
-/* Mainly for avoiding conflicts between fieldnames and SQL-reserved */
-/* keywords */
-
-void
-do_substitute(char *subarg, dbhead * dbh)
-{
-	/* NOTE: subarg is modified in this function */
-	int			i,
-				bad;
-	char	   *p,
-			   *oldname,
-			   *newname;
-
-	if (!subarg)
-		return;
-	if (verbose > 1)
-		printf("Substituting new field names\n");
-	/* use strstr instead of strtok because of possible empty tokens */
-	oldname = subarg;
-	while (oldname && strlen(oldname) && (p = strstr(oldname, "=")))
-	{
-		*p = '\0';				/* mark end of oldname */
-		newname = ++p;			/* point past \0 of oldname */
-		if (strlen(newname))
-		{						/* if not an empty string */
-			p = strstr(newname, ",");
-			if (p)
-			{
-				*p = '\0';		/* mark end of newname */
-				p++;			/* point past where the comma was */
-			}
-		}
-		if (strlen(newname) >= DBF_NAMELEN)
-		{
-			printf("Truncating new field name %s to %d chars\n",
-				   newname, DBF_NAMELEN - 1);
-			newname[DBF_NAMELEN - 1] = '\0';
-		}
-		bad = 1;
-		for (i = 0; i < dbh->db_nfields; i++)
-		{
-			if (strcmp(dbh->db_fields[i].db_name, oldname) == 0)
-			{
-				bad = 0;
-				strcpy(dbh->db_fields[i].db_name, newname);
-				if (verbose > 1)
-				{
-					printf("Substitute old:%s new:%s\n",
-						   oldname, newname);
-				}
-				break;
-			}
-		}
-		if (bad)
-		{
-			printf("Warning: old field name %s not found\n",
-				   oldname);
-		}
-		oldname = p;
-	}
-}	/* do_substitute */
-
-void
-do_create(PGconn *conn, char *table, dbhead * dbh)
-{
-	char	   *query;
-	char		t[20];
-	int			i,
-				length;
-	PGresult   *res;
-
-	if (verbose > 1)
-		printf("Building CREATE-clause\n");
-
-	if (!(query = (char *) malloc(
-						   (dbh->db_nfields * 40) + 29 + strlen(table))))
-	{
-		fprintf(stderr, "Memory allocation error in function do_create\n");
-		PQfinish(conn);
-		close(dbh->db_fd);
-		free(dbh);
-		exit(1);
-	}
-
-	sprintf(query, "CREATE TABLE %s (", table);
-	length = strlen(query);
-	for (i = 0; i < dbh->db_nfields; i++)
-	{
-		if (!strlen(dbh->db_fields[i].db_name))
-		{
-			continue;
-			/* skip field if length of name == 0 */
-		}
-		if ((strlen(query) != length))
-			strcat(query, ",");
-
-		if (fieldlow)
-			strtolower(dbh->db_fields[i].db_name);
-
-		strcat(query, dbh->db_fields[i].db_name);
-		switch (dbh->db_fields[i].db_type)
-		{
-			case 'D':
-				strcat(query, " date");
-				break;
-			case 'C':
-				if (dbh->db_fields[i].db_flen > 1)
-				{
-					strcat(query, " varchar");
-					sprintf(t, "(%d)",
-							dbh->db_fields[i].db_flen);
-					strcat(query, t);
-				}
-				else
-					strcat(query, " char");
-				break;
-			case 'N':
-				if (dbh->db_fields[i].db_dec != 0)
-					strcat(query, " real");
-				else
-					strcat(query, " int");
-				break;
-			case 'L':
-				strcat(query, " char");
-				break;
-		}
-	}
-
-	strcat(query, ")");
-
-	if (verbose > 1)
-	{
-		printf("Sending create-clause\n");
-		printf("%s\n", query);
-	}
-
-	if ((res = PQexec(conn, query)) == NULL)
-	{
-		fprintf(stderr, "Error creating table!\n");
-		fprintf(stderr, "Detailed report: %s\n", PQerrorMessage(conn));
-		close(dbh->db_fd);
-		free(dbh);
-		free(query);
-		PQfinish(conn);
-		exit(1);
-	}
-
-	PQclear(res);
-	free(query);
-}
-
-/* FIXME: can be optimized to not use strcat, but it is worth the effort? */
-void
-do_inserts(PGconn *conn, char *table, dbhead * dbh)
-{
-	PGresult   *res;
-	field	   *fields;
-	int			i,
-				h,
-				result;
-	char	   *query,
-			   *foo;
-	char		pgdate[10];
-
-	if (verbose > 1)
-		printf("Inserting records\n");
-
-	h = 2;						/* 2 because of terminating \n\0 */
-
-	for (i = 0; i < dbh->db_nfields; i++)
-	{
-		h += dbh->db_fields[i].db_flen > 2 ?
-			dbh->db_fields[i].db_flen :
-			2;					/* account for possible NULL values (\N) */
-		h += 1;					/* the delimiter */
-	}
-
-	/*
-	 * make sure we can build the COPY query, note that we don't need to
-	 * just add this value, since the COPY query is a separate query (see
-	 * below)
-	 */
-	if (h < 17 + strlen(table))
-		h = 17 + strlen(table);
-
-	if (!(query = (char *) malloc(h)))
-	{
-		PQfinish(conn);
-		fprintf(stderr,
-			 "Memory allocation error in function do_inserts (query)\n");
-		close(dbh->db_fd);
-		free(dbh);
-		exit(1);
-	}
-
-	if ((fields = dbf_build_record(dbh)) == (field *) DBF_ERROR)
-	{
-		fprintf(stderr,
-				"Couldn't allocate memory for record in do_insert\n");
-		PQfinish(conn);
-		free(query);
-		dbf_close(dbh);
-		exit(1);
-	}
-
-	if (end == 0)				/* "end" is a user option, if not
-								 * specified, */
-		end = dbh->db_records;	/* then all records are processed. */
-
-	if (t_block == 0)			/* user not specified transaction block
-								 * size */
-		t_block = end - begin;	/* then we set it to be the full data */
-
-	for (i = begin; i < end; i++)
-	{
-		/* we need to start a new transaction and COPY statement */
-		if (((i - begin) % t_block) == 0)
-		{
-			if (verbose > 1)
-				fprintf(stderr, "Transaction: START\n");
-			res = PQexec(conn, "BEGIN");
-			if (res == NULL)
-			{
-				fprintf(stderr, "Error starting transaction!\n");
-				fprintf(stderr, "Detailed report: %s\n", PQerrorMessage(conn));
-				exit(1);
-			}
-			sprintf(query, "COPY %s FROM stdin", table);
-			res = PQexec(conn, query);
-			if (res == NULL)
-			{
-				fprintf(stderr, "Error starting COPY!\n");
-				fprintf(stderr, "Detailed report: %s\n", PQerrorMessage(conn));
-				exit(1);
-			}
-		}
-
-		/* build line and submit */
-		result = dbf_get_record(dbh, fields, i);
-		if (result == DBF_VALID)
-		{
-			query[0] = '\0';
-			for (h = 0; h < dbh->db_nfields; h++)
-			{
-				if (!strlen(fields[h].db_name))
-					continue;
-
-				if (h != 0)		/* not for the first field! */
-					strcat(query, "\t");		/* COPY statement field
-												 * separator */
-
-				if (upper)
-					strtoupper(fields[h].db_contents);
-				if (lower)
-					strtolower(fields[h].db_contents);
-
-				foo = fields[h].db_contents;
-#ifdef HAVE_ICONV_H
-				if (charset_from)
-					foo = convert_charset(foo);
-#endif
-				foo = Escape(foo);
-
-				/* handle the date first - liuk */
-				if (fields[h].db_type == 'D')
-				{
-					if ((strlen(foo) == 8) && isinteger(foo))
-					{
-						sprintf(pgdate, "%c%c%c%c-%c%c-%c%c",
-								foo[0], foo[1], foo[2], foo[3],
-								foo[4], foo[5], foo[6], foo[7]);
-						strcat(query, pgdate);
-					}
-					else
-					{
-						/*
-						 * empty field must be inserted as NULL value in
-						 * this way
-						 */
-						strcat(query, "\\N");
-					}
-				}
-				else if ((fields[h].db_type == 'N') &&
-						 (fields[h].db_dec == 0))
-				{
-					if (isinteger(foo))
-						strcat(query, foo);
-					else
-					{
-						strcat(query, "\\N");
-						if (verbose)
-							fprintf(stderr, "Illegal numeric value found "
-									"in record %d, field \"%s\"\n",
-									i, fields[h].db_name);
-					}
-				}
-				else
-				{
-					strcat(query, foo); /* must be character */
-				}
-			}
-			strcat(query, "\n");
-
-			if ((verbose > 1) && ((i % 100) == 0))
-			{					/* Only show every 100 */
-				printf("Inserting record %d\n", i);		/* records. */
-			}
-			PQputline(conn, query);
-
-		}
-		/* we need to end this copy and transaction */
-		if (((i - begin) % t_block) == t_block - 1)
-		{
-			if (verbose > 1)
-				fprintf(stderr, "Transaction: END\n");
-			PQputline(conn, "\\.\n");
-			if (PQendcopy(conn) != 0)
-			{
-				fprintf(stderr, "Something went wrong while copying. Check "
-						"your tables!\n");
-				exit(1);
-			}
-			res = PQexec(conn, "END");
-			if (res == NULL)
-			{
-				fprintf(stderr, "Error committing work!\n");
-				fprintf(stderr, "Detailed report: %s\n", PQerrorMessage(conn));
-				exit(1);
-			}
-		}
-	}
-
-	/* last row copied in, end copy and transaction */
-	/* remember, i is now 1 greater then when we left the loop */
-	if (((i - begin) % t_block) != 0)
-	{
-		if (verbose > 1)
-			fprintf(stderr, "Transaction: END\n");
-		PQputline(conn, "\\.\n");
-
-		if (PQendcopy(conn) != 0)
-		{
-			fprintf(stderr, "Something went wrong while copying. Check "
-					"your tables!\n");
-		}
-		res = PQexec(conn, "END");
-		if (res == NULL)
-		{
-			fprintf(stderr, "Error committing work!\n");
-			fprintf(stderr, "Detailed report: %s\n", PQerrorMessage(conn));
-			exit(1);
-		}
-	}
-	dbf_free_record(dbh, fields);
-
-	free(query);
-}
-
-
-/*
- * simple_prompt  --- borrowed from psql
- *
- * Generalized function especially intended for reading in usernames and
- * password interactively. Reads from /dev/tty or stdin/stderr.
- *
- * prompt:		The prompt to print
- * maxlen:		How many characters to accept
- * echo:		Set to false if you want to hide what is entered (for passwords)
- *
- * Returns a malloc()'ed string with the input (w/o trailing newline).
- */
-static bool prompt_state = false;
-
-char *
-simple_prompt(const char *prompt, int maxlen, bool echo)
-{
-	int			length;
-	char	   *destination;
-	FILE	   *termin,
-			   *termout;
-
-#ifdef HAVE_TERMIOS_H
-	struct termios t_orig,
-				t;
-#endif
-
-	destination = (char *) malloc(maxlen + 2);
-	if (!destination)
-		return NULL;
-
-	prompt_state = true;		/* disable SIGINT */
-
-	/*
-	 * Do not try to collapse these into one "w+" mode file. Doesn't work
-	 * on some platforms (eg, HPUX 10.20).
-	 */
-	termin = fopen("/dev/tty", "r");
-	termout = fopen("/dev/tty", "w");
-	if (!termin || !termout)
-	{
-		if (termin)
-			fclose(termin);
-		if (termout)
-			fclose(termout);
-		termin = stdin;
-		termout = stderr;
-	}
-
-#ifdef HAVE_TERMIOS_H
-	if (!echo)
-	{
-		tcgetattr(fileno(termin), &t);
-		t_orig = t;
-		t.c_lflag &= ~ECHO;
-		tcsetattr(fileno(termin), TCSAFLUSH, &t);
-	}
-#endif
-
-	if (prompt)
-	{
-		fputs(gettext(prompt), termout);
-		fflush(termout);
-	}
-
-	if (fgets(destination, maxlen, termin) == NULL)
-		destination[0] = '\0';
-
-	length = strlen(destination);
-	if (length > 0 && destination[length - 1] != '\n')
-	{
-		/* eat rest of the line */
-		char		buf[128];
-		int			buflen;
-
-		do
-		{
-			if (fgets(buf, sizeof(buf), termin) == NULL)
-				break;
-			buflen = strlen(buf);
-		} while (buflen > 0 && buf[buflen - 1] != '\n');
-	}
-
-	if (length > 0 && destination[length - 1] == '\n')
-		/* remove trailing newline */
-		destination[length - 1] = '\0';
-
-#ifdef HAVE_TERMIOS_H
-	if (!echo)
-	{
-		tcsetattr(fileno(termin), TCSAFLUSH, &t_orig);
-		fputs("\n", termout);
-		fflush(termout);
-	}
-#endif
-
-	if (termin != stdin)
-	{
-		fclose(termin);
-		fclose(termout);
-	}
-
-	prompt_state = false;		/* SIGINT okay again */
-
-	return destination;
-}
-
-
-int
-main(int argc, char **argv)
-{
-	PGconn	   *conn;
-	int			i;
-	extern int	optind;
-	extern char *optarg;
-	char	   *query;
-	dbhead	   *dbh;
-
-	while ((i = getopt(argc, argv, "DWflucvh:b:e:d:t:s:B:U:F:T:")) != -1)
-	{
-		switch (i)
-		{
-			case 'D':
-				if (create)
-				{
-					usage();
-					printf("Can't use -c and -D at the same time!\n");
-					exit(1);
-				}
-				del = 1;
-				break;
-			case 'W':
-				password = simple_prompt("Password: ", 100, 0);
-				break;
-			case 'f':
-				fieldlow = 1;
-				break;
-			case 'v':
-				verbose++;
-				break;
-			case 'c':
-				if (del)
-				{
-					usage();
-					printf("Can't use -c and -D at the same time!\n");
-					exit(1);
-				}
-				create = 1;
-				break;
-			case 'l':
-				lower = 1;
-				break;
-			case 'u':
-				if (lower)
-				{
-					usage();
-					printf("Can't use -u and -l at the same time!\n");
-					exit(1);
-				}
-				upper = 1;
-				break;
-			case 'b':
-				begin = atoi(optarg);
-				break;
-			case 'e':
-				end = atoi(optarg);
-				break;
-			case 'h':
-				host = (char *) strdup(optarg);
-				break;
-			case 'd':
-				dbase = (char *) strdup(optarg);
-				break;
-			case 't':
-				table = (char *) strdup(optarg);
-				break;
-			case 's':
-				subarg = (char *) strdup(optarg);
-				break;
-			case 'B':
-				t_block = atoi(optarg);
-				break;
-			case 'U':
-				username = (char *) strdup(optarg);
-				break;
-#ifdef HAVE_ICONV_H
-			case 'F':
-				charset_from = (char *) strdup(optarg);
-				break;
-			case 'T':
-				charset_to = (char *) strdup(optarg);
-				break;
-#endif
-			case ':':
-				usage();
-				printf("missing argument!\n");
-				exit(1);
-				break;
-			case '?':
-				usage();
-
-				/*
-				 * FIXME: Ivan thinks this is bad: printf("unknown
-				 * argument: %s\n", argv[0]);
-				 */
-				exit(1);
-				break;
-			default:
-				break;
-		}
-	}
-
-	argc -= optind;
-	argv = &argv[optind];
-
-	if (argc != 1)
-	{
-		usage();
-		if (username)
-			free(username);
-		if (password)
-			free(password);
-		exit(1);
-	}
-
-#ifdef HAVE_ICONV_H
-	if (charset_from)
-	{
-		if (verbose > 1)
-			printf("Setting conversion from charset \"%s\" to \"%s\".\n",
-				   charset_from, charset_to);
-		iconv_d = iconv_open(charset_to, charset_from);
-		if (iconv_d == (iconv_t) - 1)
-		{
-			printf("Cannot convert from charset \"%s\" to charset \"%s\".\n",
-				   charset_from, charset_to);
-			exit(1);
-		}
-	}
-#endif
-
-	if (verbose > 1)
-		printf("Opening dbf-file\n");
-
-	if ((dbh = dbf_open(argv[0], O_RDONLY)) == (dbhead *) - 1)
-	{
-		fprintf(stderr, "Couldn't open xbase-file %s\n", argv[0]);
-		if (username)
-			free(username);
-		if (password)
-			free(password);
-#ifdef HAVE_ICONV_H
-		if (charset_from)
-			iconv_close(iconv_d);
-#endif
-		exit(1);
-	}
-
-	if (fieldlow)
-		for (i = 0; i < dbh->db_nfields; i++)
-			strtolower(dbh->db_fields[i].db_name);
-
-	if (verbose)
-	{
-		printf("dbf-file: %s, PG-dbase: %s, PG-table: %s\n", argv[0],
-			   dbase,
-			   table);
-		printf("Number of records: %ld\n", dbh->db_records);
-		printf("NAME:\t\tLENGTH:\t\tTYPE:\n");
-		printf("-------------------------------------\n");
-		for (i = 0; i < dbh->db_nfields; i++)
-		{
-			printf("%-12s\t%7d\t\t%5c\n", dbh->db_fields[i].db_name,
-				   dbh->db_fields[i].db_flen,
-				   dbh->db_fields[i].db_type);
-		}
-	}
-
-	if (verbose > 1)
-		printf("Making connection to PG-server\n");
-
-	conn = PQsetdbLogin(host, NULL, NULL, NULL, dbase, username, password);
-	if (PQstatus(conn) != CONNECTION_OK)
-	{
-		fprintf(stderr, "Couldn't get a connection with the ");
-		fprintf(stderr, "designated host!\n");
-		fprintf(stderr, "Detailed report: %s\n", PQerrorMessage(conn));
-		close(dbh->db_fd);
-		free(dbh);
-		if (username)
-			free(username);
-		if (password)
-			free(password);
-#ifdef HAVE_ICONV_H
-		if (charset_from)
-			iconv_close(iconv_d);
-#endif
-		exit(1);
-	}
-
-/* Substitute field names */
-	do_substitute(subarg, dbh);
-
-/* create table if specified, else check if target table exists */
-	if (!create)
-	{
-		if (!check_table(conn, table))
-		{
-			printf("Table does not exist!\n");
-			if (username)
-				free(username);
-			if (password)
-				free(password);
-#ifdef HAVE_ICONV_H
-			if (charset_from)
-				iconv_close(iconv_d);
-#endif
-			exit(1);
-		}
-		if (del)
-		{
-			if (!(query = (char *) malloc(13 + strlen(table))))
-			{
-				printf("Memory-allocation error in main (delete)!\n");
-				close(dbh->db_fd);
-				free(dbh);
-				PQfinish(conn);
-				if (username)
-					free(username);
-				if (password)
-					free(password);
-#ifdef HAVE_ICONV_H
-				if (charset_from)
-					iconv_close(iconv_d);
-#endif
-				exit(1);
-			}
-			if (verbose > 1)
-				printf("Deleting from original table\n");
-			sprintf(query, "DELETE FROM %s", table);
-			PQexec(conn, query);
-			free(query);
-		}
-	}
-	else
-	{
-		if (!(query = (char *) malloc(12 + strlen(table))))
-		{
-			printf("Memory-allocation error in main (drop)!\n");
-			close(dbh->db_fd);
-			free(dbh);
-			PQfinish(conn);
-			if (username)
-				free(username);
-			if (password)
-				free(password);
-#ifdef HAVE_ICONV_H
-			if (charset_from)
-				iconv_close(iconv_d);
-#endif
-			exit(1);
-		}
-		if (verbose > 1)
-			printf("Dropping original table (if one exists)\n");
-		sprintf(query, "DROP TABLE %s", table);
-		PQexec(conn, query);
-		free(query);
-
-/* Build a CREATE-clause
-*/
-		do_create(conn, table, dbh);
-	}
-
-/* Build an INSERT-clause
-*/
-	PQexec(conn, "SET DATESTYLE TO 'ISO';");
-	do_inserts(conn, table, dbh);
-
-	if (verbose > 1)
-		printf("Closing up....\n");
-
-	close(dbh->db_fd);
-	free(dbh);
-	PQfinish(conn);
-	if (username)
-		free(username);
-	if (password)
-		free(password);
-#ifdef HAVE_ICONV_H
-	if (charset_from)
-		iconv_close(iconv_d);
-#endif
-	exit(0);
-}
diff --git a/contrib/dbase/endian.c b/contrib/dbase/endian.c
deleted file mode 100644
index f45d958e40..0000000000
--- a/contrib/dbase/endian.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Maarten Boekhold (maarten.boekhold@reuters.com) oktober 1995 */
-
-#include <sys/types.h>
-#include "dbf.h"
-/*
- * routine to change little endian long to host long
- */
-long
-get_long(u_char *cp)
-{
-	long		ret;
-
-	ret = *cp++;
-	ret += ((*cp++) << 8);
-	ret += ((*cp++) << 16);
-	ret += ((*cp++) << 24);
-
-	return ret;
-}
-
-void
-put_long(u_char *cp, long lval)
-{
-	cp[0] = lval & 0xff;
-	cp[1] = (lval >> 8) & 0xff;
-	cp[2] = (lval >> 16) & 0xff;
-	cp[3] = (lval >> 24) & 0xff;
-}
-
-/*
- * routine to change little endian short to host short
- */
-short
-get_short(u_char *cp)
-{
-	short		ret;
-
-	ret = *cp++;
-	ret += ((*cp++) << 8);
-
-	return ret;
-}
-
-void
-put_short(u_char *cp, short sval)
-{
-	cp[0] = sval & 0xff;
-	cp[1] = (sval >> 8) & 0xff;
-}
diff --git a/contrib/dblink/Makefile b/contrib/dblink/Makefile
deleted file mode 100644
index 8b730fab73..0000000000
--- a/contrib/dblink/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/dblink/Makefile,v 1.4 2001/09/06 10:49:29 petere Exp $
-
-subdir = contrib/dblink
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-MODULE_big = dblink
-PG_CPPFLAGS = -I$(libpq_srcdir)
-OBJS	= dblink.o
-SHLIB_LINK = $(libpq)
-
-DATA_built = dblink.sql 
-DOCS = README.dblink
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/dblink/README.dblink b/contrib/dblink/README.dblink
deleted file mode 100644
index 8e6adf069f..0000000000
--- a/contrib/dblink/README.dblink
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
- * dblink
- *
- * Functions returning results from a remote database
- *
- * Copyright (c) Joseph Conway <mail@joeconway.com>, 2001, 2002,
- * ALL RIGHTS RESERVED;
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without a written agreement
- * is hereby granted, provided that the above copyright notice and this
- * paragraph and the following two paragraphs appear in all copies.
- * 
- * IN NO EVENT SHALL THE AUTHOR OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
- * LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
- * DOCUMENTATION, EVEN IF THE AUTHOR OR DISTRIBUTORS HAVE BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE AUTHOR AND DISTRIBUTORS SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE AUTHOR AND DISTRIBUTORS HAS NO OBLIGATIONS TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- */
-
-
-Version 0.4 (7 April, 2002):
-  Functions allowing remote database INSERT/UPDATE/DELETE/SELECT, and
-  various utility functions.
-  Tested under Linux (Red Hat 7.2) and PostgreSQL 7.2 and 7.3devel
-
-Release Notes:
-
-  Version 0.4
-    - removed cursor wrap around input sql to allow for remote
-      execution of INSERT/UPDATE/DELETE
-	- dblink now returns a resource id instead of a real pointer
-    - added several utility functions -- see below
-
-  Version 0.3
-    - fixed dblink invalid pointer causing corrupt elog message
-    - fixed dblink_tok improper handling of null results
-    - fixed examples in README.dblink
-
-  Version 0.2
-    - initial release    
-
-Installation:
-  Place these files in a directory called 'dblink' under 'contrib' in the PostgreSQL source tree. Then run:
-
-    make
-    make install
-
-  You can use dblink.sql to create the functions in your database of choice, e.g.
-
-    psql -U postgres template1 < dblink.sql
-
-  installs following functions into database template1:
-
-     dblink(text,text) RETURNS setof int
-       - returns a resource id for results from remote query
-     dblink_tok(int,int) RETURNS text
-       - extracts and returns individual field results
-     dblink_strtok(text,text,int) RETURNS text
-       - extracts and returns individual token from delimited text
-     dblink_get_pkey(text) RETURNS setof text
-       - returns the field names of a relation's primary key fields
-     dblink_last_oid(int) RETURNS oid
-       - returns the last inserted oid
-     dblink_build_sql_insert(text,int2vector,int2,_text,_text) RETURNS text
-       - builds an insert statement using a local tuple, replacing the
-         selection key field values with alternate supplied values
-     dblink_build_sql_delete(text,int2vector,int2,_text) RETURNS text
-       - builds a delete statement using supplied values for selection
-         key field values
-     dblink_build_sql_update(text,int2vector,int2,_text,_text) RETURNS text
-       - builds an update statement using a local tuple, replacing the
-         selection key field values with alternate supplied values
-     dblink_current_query() RETURNS text
-       - returns the current query string
-     dblink_replace(text,text,text) RETURNS text
-       - replace all occurences of substring-a in the input-string 
-         with substring-b
-
-Documentation
-==================================================================
-Name
-
-dblink -- Returns a resource id for a data set from a remote database
-
-Synopsis
-
-dblink(text connstr, text sql)
-
-Inputs
-
-  connstr
-
-    standard libpq format connection srting, 
-    e.g. "hostaddr=127.0.0.1 port=5432 dbname=mydb user=postgres password=mypasswd"
-
-  sql
-
-    sql statement that you wish to execute on the remote host
-    e.g. "select * from pg_class"
-
-Outputs
-
-  Returns setof int (res_id)
-
-Example usage
-
-  select dblink('hostaddr=127.0.0.1 port=5432 dbname=mydb user=postgres password=mypasswd'
-               ,'select f1, f2 from mytable');
-
-
-==================================================================
-
-Name
-
-dblink_tok -- Returns individual select field results from a dblink remote query
-
-Synopsis
-
-dblink_tok(int res_id, int fnumber)
-
-Inputs
-
-  res_id
-
-    a resource id returned by a call to dblink()
-
-  fnumber
-
-    the ordinal position (zero based) of the field to be returned from the dblink result set
-
-Outputs
-
-  Returns text
-
-Example usage
-
-  select dblink_tok(t1.dblink_p,0) as f1, dblink_tok(t1.dblink_p,1) as f2
-  from (select dblink('hostaddr=127.0.0.1 port=5432 dbname=mydb user=postgres password=mypasswd'
-                     ,'select f1, f2 from mytable') as dblink_p) as t1;
-
-
-==================================================================
-
-A more convenient way to use dblink may be to create a view:
-
- create view myremotetable as
- select dblink_tok(t1.dblink_p,0) as f1, dblink_tok(t1.dblink_p,1) as f2
- from (select dblink('hostaddr=127.0.0.1 port=5432 dbname=template1 user=postgres password=postgres'
-                    ,'select proname, prosrc from pg_proc') as dblink_p) as t1;
-
-Then you can simply write:
-
-   select f1, f2 from myremotetable where f1 like 'bytea%';
-
-==================================================================
-Name
-
-dblink_strtok -- Extracts and returns individual token from delimited text
-
-Synopsis
-
-dblink_strtok(text inputstring, text delimiter, int posn) RETURNS text
-
-Inputs
-
-  inputstring
-
-    any string you want to parse a token out of;
-    e.g. 'f=1&g=3&h=4'
-
-  delimiter
-
-    a single character to use as the delimiter;
-    e.g. '&' or '='
-
-  posn
-
-    the position of the token of interest, 0 based;
-    e.g. 1
-
-Outputs
-
-  Returns text
-
-Example usage
-
-test=# select dblink_strtok(dblink_strtok('f=1&g=3&h=4','&',1),'=',1);
- dblink_strtok
----------------
- 3
-(1 row)
-
-==================================================================
-Name
-
-dblink_get_pkey -- returns the field names of a relation's primary
-                   key fields
-
-Synopsis
-
-dblink_get_pkey(text relname) RETURNS setof text
-
-Inputs
-
-  relname
-
-    any relation name;
-    e.g. 'foobar'
-
-Outputs
-
-  Returns setof text -- one row for each primary key field, in order of
-                        precedence
-
-Example usage
-
-test=# select dblink_get_pkey('foobar');
- dblink_get_pkey
------------------
- f1
- f2
- f3
- f4
- f5
-(5 rows)
-
-
-==================================================================
-Name
-
-dblink_last_oid -- Returns last inserted oid
-
-Synopsis
-
-dblink_last_oid(int res_id) RETURNS oid
-
-Inputs
-
-  res_id
-
-    any resource id returned by dblink function;
-
-Outputs
-
-  Returns oid of last inserted tuple
-
-Example usage
-
-test=# select dblink_last_oid(dblink('hostaddr=127.0.0.1 port=5432 dbname=mydb user=postgres password=mypasswd'
-               ,'insert into mytable (f1, f2) values (1,2)'));
-
- dblink_last_oid
-----------------
- 16553
-(1 row)
-
-
-==================================================================
-Name
-
-dblink_build_sql_insert -- builds an insert statement using a local
-                           tuple, replacing the selection key field
-                           values with alternate supplied values
-dblink_build_sql_delete -- builds a delete statement using supplied
-                           values for selection key field values
-dblink_build_sql_update -- builds an update statement using a local
-                           tuple, replacing the selection key field
-                           values with alternate supplied values
-
-
-Synopsis
-
-dblink_build_sql_insert(text relname
-                         ,int2vector primary_key_attnums
-                         ,int2 num_primary_key_atts
-                         ,_text src_pk_att_vals_array
-                         ,_text tgt_pk_att_vals_array) RETURNS text
-dblink_build_sql_delete(text relname
-                         ,int2vector primary_key_attnums
-                         ,int2 num_primary_key_atts
-                         ,_text tgt_pk_att_vals_array) RETURNS text
-dblink_build_sql_update(text relname
-                         ,int2vector primary_key_attnums
-                         ,int2 num_primary_key_atts
-                         ,_text src_pk_att_vals_array
-                         ,_text tgt_pk_att_vals_array) RETURNS text
-
-Inputs
-
-  relname
-
-    any relation name;
-    e.g. 'foobar'
-
-  primary_key_attnums
-
-    vector of primary key attnums (1 based, see pg_index.indkey);
-    e.g. '1 2'
-
-  num_primary_key_atts
-
-    number of primary key attnums in the vector; e.g. 2
-
-  src_pk_att_vals_array
-
-    array of primary key values, used to look up the local matching
-    tuple, the values of which are then used to construct the SQL
-    statement
-
-  tgt_pk_att_vals_array
-
-    array of primary key values, used to replace the local tuple
-    values in the SQL statement
-
-Outputs
-
-  Returns text -- requested SQL statement
-
-Example usage
-
-test=# select dblink_build_sql_insert('foo','1 2',2,'{"1", "a"}','{"1", "b''a"}');
-             dblink_build_sql_insert
---------------------------------------------------
- INSERT INTO foo(f1,f2,f3) VALUES('1','b''a','1')
-(1 row)
-
-test=# select dblink_build_sql_delete('MyFoo','1 2',2,'{"1", "b"}');
-           dblink_build_sql_delete
----------------------------------------------
- DELETE FROM "MyFoo" WHERE f1='1' AND f2='b'
-(1 row)
-
-test=# select dblink_build_sql_update('foo','1 2',2,'{"1", "a"}','{"1", "b"}');
-                   dblink_build_sql_update
--------------------------------------------------------------
- UPDATE foo SET f1='1',f2='b',f3='1' WHERE f1='1' AND f2='b'
-(1 row)
-
-
-==================================================================
-Name
-
-dblink_current_query -- returns the current query string
-
-Synopsis
-
-dblink_current_query () RETURNS text
-
-Inputs
-
-  None
-
-Outputs
-
-  Returns text -- a copy of the currently executing query
-
-Example usage
-
-test=# select dblink_current_query() from (select dblink('dbname=template1','select oid, proname from pg_proc where proname = ''byteacat''') as f1) as t1;
-                                                                dblink_current_query
------------------------------------------------------------------------------------------------------------------------------------------------------
- select dblink_current_query() from (select dblink('dbname=template1','select oid, proname from pg_proc where proname = ''byteacat''') as f1) as t1;
-(1 row)
-
-
-==================================================================
-Name
-
-dblink_replace -- replace all occurences of substring-a in the
-                  input-string with substring-b
-
-Synopsis
-
-dblink_replace(text input-string, text substring-a, text substring-b) RETURNS text
-
-Inputs
-
-  input-string
-
-    the starting string, before replacement of substring-a
-
-  substring-a
-
-    the substring to find and replace
-
-  substring-b
-
-    the substring to be substituted in place of substring-a
-
-Outputs
-
-  Returns text -- a copy of the starting string, but with all occurences of
-                  substring-a replaced with substring-b
-
-Example usage
-
-test=# select dblink_replace('12345678901234567890','56','hello');
-       dblink_replace
-----------------------------
- 1234hello78901234hello7890
-(1 row)
-
-==================================================================
-
-
--- Joe Conway
-
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
deleted file mode 100644
index 26fa62417f..0000000000
--- a/contrib/dblink/dblink.c
+++ /dev/null
@@ -1,1429 +0,0 @@
-/*
- * dblink.c
- *
- * Functions returning results from a remote database
- *
- * Copyright (c) Joseph Conway <mail@joeconway.com>, 2001, 2002,
- * ALL RIGHTS RESERVED;
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without a written agreement
- * is hereby granted, provided that the above copyright notice and this
- * paragraph and the following two paragraphs appear in all copies.
- *
- * IN NO EVENT SHALL THE AUTHOR OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
- * LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
- * DOCUMENTATION, EVEN IF THE AUTHOR OR DISTRIBUTORS HAVE BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * THE AUTHOR AND DISTRIBUTORS SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE AUTHOR AND DISTRIBUTORS HAS NO OBLIGATIONS TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- */
-
-#include "dblink.h"
-
-
-/*
- * Internal declarations
- */
-static dblink_results *init_dblink_results(MemoryContext fn_mcxt);
-static dblink_array_results *init_dblink_array_results(MemoryContext fn_mcxt);
-static char **get_pkey_attnames(Oid relid, int16 *numatts);
-static char *get_strtok(char *fldtext, char *fldsep, int fldnum);
-static char *get_sql_insert(Oid relid, int16 *pkattnums, int16 pknumatts, char **src_pkattvals, char **tgt_pkattvals);
-static char *get_sql_delete(Oid relid, int16 *pkattnums, int16 pknumatts, char **tgt_pkattvals);
-static char *get_sql_update(Oid relid, int16 *pkattnums, int16 pknumatts, char **src_pkattvals, char **tgt_pkattvals);
-static char *quote_literal_cstr(char *rawstr);
-static char *quote_ident_cstr(char *rawstr);
-static int16 get_attnum_pk_pos(int16 *pkattnums, int16 pknumatts, int16 key);
-static HeapTuple get_tuple_of_interest(Oid relid, int16 *pkattnums, int16 pknumatts, char **src_pkattvals);
-static Oid get_relid_from_relname(text *relname_text);
-static dblink_results	*get_res_ptr(int32 res_id_index);
-static void append_res_ptr(dblink_results *results);
-static void remove_res_ptr(dblink_results *results);
-
-/* Global */
-List	*res_id = NIL;
-int		res_id_index = 0;
-
-PG_FUNCTION_INFO_V1(dblink);
-Datum
-dblink(PG_FUNCTION_ARGS)
-{
-	PGconn			*conn = NULL;
-	PGresult		*res = NULL;
-	dblink_results	*results;
-	char			*optstr;
-	char			*sqlstatement;
-	char			*execstatement;
-	char			*msg;
-	int				ntuples = 0;
-	ReturnSetInfo	*rsi;
-
-	if (fcinfo->resultinfo == NULL || !IsA(fcinfo->resultinfo, ReturnSetInfo))
-		elog(ERROR, "dblink: function called in context that does not accept a set result");
-
-	optstr = DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(PG_GETARG_TEXT_P(0))));
-	sqlstatement = DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(PG_GETARG_TEXT_P(1))));
-
-	if (fcinfo->flinfo->fn_extra == NULL)
-	{
-
-		conn = PQconnectdb(optstr);
-		if (PQstatus(conn) == CONNECTION_BAD)
-		{
-			msg = pstrdup(PQerrorMessage(conn));
-			PQfinish(conn);
-			elog(ERROR, "dblink: connection error: %s", msg);
-		}
-
-		execstatement = (char *) palloc(strlen(sqlstatement) + 1);
-		if (execstatement != NULL)
-		{
-			strcpy(execstatement, sqlstatement);
-			strcat(execstatement, "\0");
-		}
-		else
-			elog(ERROR, "dblink: insufficient memory");
-
-		res = PQexec(conn, execstatement);
-		if (!res || (PQresultStatus(res) != PGRES_COMMAND_OK && PQresultStatus(res) != PGRES_TUPLES_OK))
-		{
-			msg = pstrdup(PQerrorMessage(conn));
-			PQclear(res);
-			PQfinish(conn);
-			elog(ERROR, "dblink: sql error: %s", msg);
-		}
-		else
-		{
-			/*
-			 * got results, start fetching them
-			 */
-			ntuples = PQntuples(res);
-
-			/*
-			 * increment resource index
-			 */
-			res_id_index++;
-
-			results = init_dblink_results(fcinfo->flinfo->fn_mcxt);
-			results->tup_num = 0;
-			results->res_id_index = res_id_index;
-			results->res = res;
-
-			/*
-			 * Append node to res_id to hold pointer to results.
-			 * Needed by dblink_tok to access the data
-			 */
-			append_res_ptr(results);
-
-			/*
-			 * save pointer to results for the next function manager call
-			 */
-			fcinfo->flinfo->fn_extra = (void *) results;
-
-			/* close the connection to the database and cleanup */
-			PQfinish(conn);
-
-			rsi = (ReturnSetInfo *) fcinfo->resultinfo;
-			rsi->isDone = ExprMultipleResult;
-
-			PG_RETURN_INT32(res_id_index);
-		}
-	}
-	else
-	{
-		/*
-		 * check for more results
-		 */
-		results = fcinfo->flinfo->fn_extra;
-
-		results->tup_num++;
-		res_id_index = results->res_id_index;
-		ntuples = PQntuples(results->res);
-
-		if (results->tup_num < ntuples)
-		{
-			/*
-			 * fetch them if available
-			 */
-
-			rsi = (ReturnSetInfo *) fcinfo->resultinfo;
-			rsi->isDone = ExprMultipleResult;
-
-			PG_RETURN_INT32(res_id_index);
-		}
-		else
-		{
-			/*
-			 * or if no more, clean things up
-			 */
-			results = fcinfo->flinfo->fn_extra;
-
-			remove_res_ptr(results);
-			PQclear(results->res);
-			pfree(results);
-			fcinfo->flinfo->fn_extra = NULL;
-
-			rsi = (ReturnSetInfo *) fcinfo->resultinfo;
-			rsi->isDone = ExprEndResult;
-
-			PG_RETURN_NULL();
-		}
-	}
-	PG_RETURN_NULL();
-}
-
-
-/*
- * dblink_tok
- * parse dblink output string
- * return fldnum item (0 based)
- * based on provided field separator
- */
-
-PG_FUNCTION_INFO_V1(dblink_tok);
-Datum
-dblink_tok(PG_FUNCTION_ARGS)
-{
-	dblink_results *results;
-	int				fldnum;
-	text			*result_text;
-	char			*result;
-	int				nfields = 0;
-	int				text_len = 0;
-
-	results = get_res_ptr(PG_GETARG_INT32(0));
-	if (results == NULL)
-	{
-		if (res_id != NIL)
-		{
-			freeList(res_id);
-			res_id = NIL;
-			res_id_index = 0;
-		}
-
-		elog(ERROR, "dblink_tok: function called with invalid resource id");
-	}
-
-	fldnum = PG_GETARG_INT32(1);
-	if (fldnum < 0)
-		elog(ERROR, "dblink_tok: field number < 0 not permitted");
-
-	nfields = PQnfields(results->res);
-	if (fldnum > (nfields - 1))
-		elog(ERROR, "dblink_tok: field number %d does not exist", fldnum);
-
-	if (PQgetisnull(results->res, results->tup_num, fldnum) == 1)
-		PG_RETURN_NULL();
-	else
-	{
-		text_len = PQgetlength(results->res, results->tup_num, fldnum);
-
-		result = (char *) palloc(text_len + 1);
-
-		if (result != NULL)
-		{
-			strcpy(result, PQgetvalue(results->res, results->tup_num, fldnum));
-			strcat(result, "\0");
-		}
-		else
-			elog(ERROR, "dblink: insufficient memory");
-
-		result_text = DatumGetTextP(DirectFunctionCall1(textin, CStringGetDatum(result)));
-
-		PG_RETURN_TEXT_P(result_text);
-	}
-}
-
-
-/*
- * dblink_strtok
- * parse input string
- * return ord item (0 based)
- * based on provided field separator
- */
-PG_FUNCTION_INFO_V1(dblink_strtok);
-Datum
-dblink_strtok(PG_FUNCTION_ARGS)
-{
-	char		*fldtext;
-	char		*fldsep;
-	int			fldnum;
-	char		*buffer;
-	text		*result_text;
-
-	fldtext = DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(PG_GETARG_TEXT_P(0))));
-	fldsep = DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(PG_GETARG_TEXT_P(1))));
-	fldnum = PG_GETARG_INT32(2);
-
-	if (fldtext[0] == '\0')
-	{
-		elog(ERROR, "get_strtok: blank list not permitted");
-	}
-	if (fldsep[0] == '\0')
-	{
-		elog(ERROR, "get_strtok: blank field separator not permitted");
-	}
-
-	buffer = get_strtok(fldtext, fldsep, fldnum);
-
-	pfree(fldtext);
-	pfree(fldsep);
-
-	if (buffer == NULL)
-	{
-		PG_RETURN_NULL();
-	}
-	else
-	{
-		result_text = DatumGetTextP(DirectFunctionCall1(textin, CStringGetDatum(buffer)));
-		pfree(buffer);
-
-		PG_RETURN_TEXT_P(result_text);
-	}
-}
-
-
-/*
- * dblink_get_pkey
- * 
- * Return comma delimited list of primary key
- * fields for the supplied relation,
- * or NULL if none exists.
- */
-PG_FUNCTION_INFO_V1(dblink_get_pkey);
-Datum
-dblink_get_pkey(PG_FUNCTION_ARGS)
-{
-	text					*relname_text;
-	Oid						relid;
-	char					**result;
-	text					*result_text;
-	int16					numatts;
-	ReturnSetInfo			*rsi;
-	dblink_array_results	*ret_set;
-
-	if (fcinfo->resultinfo == NULL || !IsA(fcinfo->resultinfo, ReturnSetInfo))
-		elog(ERROR, "dblink: function called in context that does not accept a set result");
-
-	if (fcinfo->flinfo->fn_extra == NULL)
-	{
-		relname_text = PG_GETARG_TEXT_P(0);
-
-		/*
-		 * Convert relname to rel OID.
-		 */
-		relid = get_relid_from_relname(relname_text);
-		if (!OidIsValid(relid))
-			elog(ERROR, "dblink_get_pkey: relation does not exist");
-
-		/*
-		 * get an array of attnums.
-		 */
-		result = get_pkey_attnames(relid, &numatts);
-
-		if ((result != NULL) && (numatts > 0))
-		{
-			ret_set = init_dblink_array_results(fcinfo->flinfo->fn_mcxt);
-
-			ret_set->elem_num = 0;
-			ret_set->num_elems = numatts;
-			ret_set->res = result;
-
-			fcinfo->flinfo->fn_extra = (void *) ret_set;
-
-			rsi = (ReturnSetInfo *) fcinfo->resultinfo;
-			rsi->isDone = ExprMultipleResult;
-
-			result_text = DatumGetTextP(DirectFunctionCall1(textin, CStringGetDatum(result[ret_set->elem_num])));
-
-			PG_RETURN_TEXT_P(result_text);
-		}
-		else
-		{
-			rsi = (ReturnSetInfo *) fcinfo->resultinfo;
-			rsi->isDone = ExprEndResult;
-
-			PG_RETURN_NULL();
-		}
-	}
-	else
-	{
-		/*
-		 * check for more results
-		 */
-		ret_set = fcinfo->flinfo->fn_extra;
-		ret_set->elem_num++;
-		result = ret_set->res;
-
-		if (ret_set->elem_num < ret_set->num_elems)
-		{
-			/*
-			 * fetch next one
-			 */
-			rsi = (ReturnSetInfo *) fcinfo->resultinfo;
-			rsi->isDone = ExprMultipleResult;
-
-			result_text = DatumGetTextP(DirectFunctionCall1(textin, CStringGetDatum(result[ret_set->elem_num])));
-			PG_RETURN_TEXT_P(result_text);
-		}
-		else
-		{
-			int		i;
-
-			/*
-			 * or if no more, clean things up
-			 */
-			for (i = 0; i < ret_set->num_elems; i++)
-				pfree(result[i]);
-
-			pfree(ret_set->res);
-			pfree(ret_set);
-
-			rsi = (ReturnSetInfo *) fcinfo->resultinfo;
-			rsi->isDone = ExprEndResult;
-
-			PG_RETURN_NULL();
-		}
-	}
-	PG_RETURN_NULL();
-}
-
-
-/*
- * dblink_last_oid
- * return last inserted oid
- */
-PG_FUNCTION_INFO_V1(dblink_last_oid);
-Datum
-dblink_last_oid(PG_FUNCTION_ARGS)
-{
-	dblink_results *results;
-
-	results = get_res_ptr(PG_GETARG_INT32(0));
-	if (results == NULL)
-	{
-		if (res_id != NIL)
-		{
-			freeList(res_id);
-			res_id = NIL;
-			res_id_index = 0;
-		}
-
-		elog(ERROR, "dblink_tok: function called with invalid resource id");
-	}
-
-	PG_RETURN_OID(PQoidValue(results->res));
-}
-
-
-/*
- * dblink_build_sql_insert
- * 
- * Used to generate an SQL insert statement
- * based on an existing tuple in a local relation.
- * This is useful for selectively replicating data
- * to another server via dblink.
- *
- * API:
- * <relname> - name of local table of interest
- * <pkattnums> - an int2vector of attnums which will be used
- * to identify the local tuple of interest
- * <pknumatts> - number of attnums in pkattnums
- * <src_pkattvals_arry> - text array of key values which will be used
- * to identify the local tuple of interest
- * <tgt_pkattvals_arry> - text array of key values which will be used
- * to build the string for execution remotely. These are substituted
- * for their counterparts in src_pkattvals_arry
- */
-PG_FUNCTION_INFO_V1(dblink_build_sql_insert);
-Datum
-dblink_build_sql_insert(PG_FUNCTION_ARGS)
-{
-	Oid			relid;
-	text		*relname_text;
-	int16		*pkattnums;
-	int16		pknumatts;
-	char		**src_pkattvals;
-	char		**tgt_pkattvals;
-	ArrayType	*src_pkattvals_arry;
-	ArrayType	*tgt_pkattvals_arry;
-	int			src_ndim;
-	int			*src_dim;
-	int			src_nitems;
-	int			tgt_ndim;
-	int			*tgt_dim;
-	int			tgt_nitems;
-	int			i;
-	char		*ptr;
-	char		*sql;
-	text		*sql_text;
-
-	relname_text = PG_GETARG_TEXT_P(0);
-
-	/*
-	 * Convert relname to rel OID.
-	 */
-	relid = get_relid_from_relname(relname_text);
-	if (!OidIsValid(relid))
-		elog(ERROR, "dblink_build_sql_insert: relation does not exist");
-
-	pkattnums = (int16 *) PG_GETARG_POINTER(1);
-	pknumatts = PG_GETARG_INT16(2);
-	/*
-	 * There should be at least one key attribute
-	 */
-	if (pknumatts == 0)
-		elog(ERROR, "dblink_build_sql_insert: number of key attributes must be > 0.");
-
-	src_pkattvals_arry = PG_GETARG_ARRAYTYPE_P(3);
-	tgt_pkattvals_arry = PG_GETARG_ARRAYTYPE_P(4);
-
-	/*
-	 * Source array is made up of key values that will be used to
-	 * locate the tuple of interest from the local system.
-	 */
-	src_ndim = ARR_NDIM(src_pkattvals_arry);
-	src_dim = ARR_DIMS(src_pkattvals_arry);
-	src_nitems = ArrayGetNItems(src_ndim, src_dim);
-
-	/*
-	 * There should be one source array key value for each key attnum
-	 */
-	if (src_nitems != pknumatts)
-		elog(ERROR, "dblink_build_sql_insert: source key array length does not match number of key attributes.");
-
-	/*
-	 * get array of pointers to c-strings from the input source array
-	 */
-	src_pkattvals = (char **) palloc(src_nitems * sizeof(char *));
-	ptr = ARR_DATA_PTR(src_pkattvals_arry);
-	for (i = 0; i < src_nitems; i++)
-	{
-		src_pkattvals[i] = DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(ptr)));
-		ptr += INTALIGN(*(int32 *) ptr);
-	}
-
-	/*
-	 * Target array is made up of key values that will be used to
-	 * build the SQL string for use on the remote system.
-	 */
-	tgt_ndim = ARR_NDIM(tgt_pkattvals_arry);
-	tgt_dim = ARR_DIMS(tgt_pkattvals_arry);
-	tgt_nitems = ArrayGetNItems(tgt_ndim, tgt_dim);
-
-	/*
-	 * There should be one target array key value for each key attnum
-	 */
-	if (tgt_nitems != pknumatts)
-		elog(ERROR, "dblink_build_sql_insert: target key array length does not match number of key attributes.");
-
-	/*
-	 * get array of pointers to c-strings from the input target array
-	 */
-	tgt_pkattvals = (char **) palloc(tgt_nitems * sizeof(char *));
-	ptr = ARR_DATA_PTR(tgt_pkattvals_arry);
-	for (i = 0; i < tgt_nitems; i++)
-	{
-		tgt_pkattvals[i] = DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(ptr)));
-		ptr += INTALIGN(*(int32 *) ptr);
-	}
-
-	/*
-	 * Prep work is finally done. Go get the SQL string.
-	 */
-	sql = get_sql_insert(relid, pkattnums, pknumatts, src_pkattvals, tgt_pkattvals);
-
-	/*
-	 * Make it into TEXT for return to the client
-	 */
-	sql_text = DatumGetTextP(DirectFunctionCall1(textin, CStringGetDatum(sql)));
-
-	/*
-	 * And send it
-	 */
-	PG_RETURN_TEXT_P(sql_text);
-}
-
-
-/*
- * dblink_build_sql_delete
- * 
- * Used to generate an SQL delete statement.
- * This is useful for selectively replicating a
- * delete to another server via dblink.
- *
- * API:
- * <relname> - name of remote table of interest
- * <pkattnums> - an int2vector of attnums which will be used
- * to identify the remote tuple of interest
- * <pknumatts> - number of attnums in pkattnums
- * <tgt_pkattvals_arry> - text array of key values which will be used
- * to build the string for execution remotely.
- */
-PG_FUNCTION_INFO_V1(dblink_build_sql_delete);
-Datum
-dblink_build_sql_delete(PG_FUNCTION_ARGS)
-{
-	Oid			relid;
-	text		*relname_text;
-	int16		*pkattnums;
-	int16		pknumatts;
-	char		**tgt_pkattvals;
-	ArrayType	*tgt_pkattvals_arry;
-	int			tgt_ndim;
-	int			*tgt_dim;
-	int			tgt_nitems;
-	int			i;
-	char		*ptr;
-	char		*sql;
-	text		*sql_text;
-
-	relname_text = PG_GETARG_TEXT_P(0);
-
-	/*
-	 * Convert relname to rel OID.
-	 */
-	relid = get_relid_from_relname(relname_text);
-	if (!OidIsValid(relid))
-		elog(ERROR, "dblink_build_sql_delete: relation does not exist");
-
-	pkattnums = (int16 *) PG_GETARG_POINTER(1);
-	pknumatts = PG_GETARG_INT16(2);
-	/*
-	 * There should be at least one key attribute
-	 */
-	if (pknumatts == 0)
-		elog(ERROR, "dblink_build_sql_insert: number of key attributes must be > 0.");
-
-	tgt_pkattvals_arry = PG_GETARG_ARRAYTYPE_P(3);
-
-	/*
-	 * Target array is made up of key values that will be used to
-	 * build the SQL string for use on the remote system.
-	 */
-	tgt_ndim = ARR_NDIM(tgt_pkattvals_arry);
-	tgt_dim = ARR_DIMS(tgt_pkattvals_arry);
-	tgt_nitems = ArrayGetNItems(tgt_ndim, tgt_dim);
-
-	/*
-	 * There should be one target array key value for each key attnum
-	 */
-	if (tgt_nitems != pknumatts)
-		elog(ERROR, "dblink_build_sql_insert: target key array length does not match number of key attributes.");
-
-	/*
-	 * get array of pointers to c-strings from the input target array
-	 */
-	tgt_pkattvals = (char **) palloc(tgt_nitems * sizeof(char *));
-	ptr = ARR_DATA_PTR(tgt_pkattvals_arry);
-	for (i = 0; i < tgt_nitems; i++)
-	{
-		tgt_pkattvals[i] = DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(ptr)));
-		ptr += INTALIGN(*(int32 *) ptr);
-	}
-
-	/*
-	 * Prep work is finally done. Go get the SQL string.
-	 */
-	sql = get_sql_delete(relid, pkattnums, pknumatts, tgt_pkattvals);
-
-	/*
-	 * Make it into TEXT for return to the client
-	 */
-	sql_text = DatumGetTextP(DirectFunctionCall1(textin, CStringGetDatum(sql)));
-
-	/*
-	 * And send it
-	 */
-	PG_RETURN_TEXT_P(sql_text);
-}
-
-
-/*
- * dblink_build_sql_update
- * 
- * Used to generate an SQL update statement
- * based on an existing tuple in a local relation.
- * This is useful for selectively replicating data
- * to another server via dblink.
- *
- * API:
- * <relname> - name of local table of interest
- * <pkattnums> - an int2vector of attnums which will be used
- * to identify the local tuple of interest
- * <pknumatts> - number of attnums in pkattnums
- * <src_pkattvals_arry> - text array of key values which will be used
- * to identify the local tuple of interest
- * <tgt_pkattvals_arry> - text array of key values which will be used
- * to build the string for execution remotely. These are substituted
- * for their counterparts in src_pkattvals_arry
- */
-PG_FUNCTION_INFO_V1(dblink_build_sql_update);
-Datum
-dblink_build_sql_update(PG_FUNCTION_ARGS)
-{
-	Oid			relid;
-	text		*relname_text;
-	int16		*pkattnums;
-	int16		pknumatts;
-	char		**src_pkattvals;
-	char		**tgt_pkattvals;
-	ArrayType	*src_pkattvals_arry;
-	ArrayType	*tgt_pkattvals_arry;
-	int			src_ndim;
-	int			*src_dim;
-	int			src_nitems;
-	int			tgt_ndim;
-	int			*tgt_dim;
-	int			tgt_nitems;
-	int			i;
-	char		*ptr;
-	char		*sql;
-	text		*sql_text;
-
-	relname_text = PG_GETARG_TEXT_P(0);
-
-	/*
-	 * Convert relname to rel OID.
-	 */
-	relid = get_relid_from_relname(relname_text);
-	if (!OidIsValid(relid))
-		elog(ERROR, "dblink_build_sql_update: relation does not exist");
-
-	pkattnums = (int16 *) PG_GETARG_POINTER(1);
-	pknumatts = PG_GETARG_INT16(2);
-	/*
-	 * There should be one source array key values for each key attnum
-	 */
-	if (pknumatts == 0)
-		elog(ERROR, "dblink_build_sql_insert: number of key attributes must be > 0.");
-
-	src_pkattvals_arry = PG_GETARG_ARRAYTYPE_P(3);
-	tgt_pkattvals_arry = PG_GETARG_ARRAYTYPE_P(4);
-
-	/*
-	 * Source array is made up of key values that will be used to
-	 * locate the tuple of interest from the local system.
-	 */
-	src_ndim = ARR_NDIM(src_pkattvals_arry);
-	src_dim = ARR_DIMS(src_pkattvals_arry);
-	src_nitems = ArrayGetNItems(src_ndim, src_dim);
-
-	/*
-	 * There should be one source array key value for each key attnum
-	 */
-	if (src_nitems != pknumatts)
-		elog(ERROR, "dblink_build_sql_insert: source key array length does not match number of key attributes.");
-
-	/*
-	 * get array of pointers to c-strings from the input source array
-	 */
-	src_pkattvals = (char **) palloc(src_nitems * sizeof(char *));
-	ptr = ARR_DATA_PTR(src_pkattvals_arry);
-	for (i = 0; i < src_nitems; i++)
-	{
-		src_pkattvals[i] = DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(ptr)));
-		ptr += INTALIGN(*(int32 *) ptr);
-	}
-
-	/*
-	 * Target array is made up of key values that will be used to
-	 * build the SQL string for use on the remote system.
-	 */
-	tgt_ndim = ARR_NDIM(tgt_pkattvals_arry);
-	tgt_dim = ARR_DIMS(tgt_pkattvals_arry);
-	tgt_nitems = ArrayGetNItems(tgt_ndim, tgt_dim);
-
-	/*
-	 * There should be one target array key value for each key attnum
-	 */
-	if (tgt_nitems != pknumatts)
-		elog(ERROR, "dblink_build_sql_insert: target key array length does not match number of key attributes.");
-
-	/*
-	 * get array of pointers to c-strings from the input target array
-	 */
-	tgt_pkattvals = (char **) palloc(tgt_nitems * sizeof(char *));
-	ptr = ARR_DATA_PTR(tgt_pkattvals_arry);
-	for (i = 0; i < tgt_nitems; i++)
-	{
-		tgt_pkattvals[i] = DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(ptr)));
-		ptr += INTALIGN(*(int32 *) ptr);
-	}
-
-	/*
-	 * Prep work is finally done. Go get the SQL string.
-	 */
-	sql = get_sql_update(relid, pkattnums, pknumatts, src_pkattvals, tgt_pkattvals);
-
-	/*
-	 * Make it into TEXT for return to the client
-	 */
-	sql_text = DatumGetTextP(DirectFunctionCall1(textin, CStringGetDatum(sql)));
-
-	/*
-	 * And send it
-	 */
-	PG_RETURN_TEXT_P(sql_text);
-}
-
-
-/*
- * dblink_current_query
- * return the current query string
- * to allow its use in (among other things)
- * rewrite rules
- */
-PG_FUNCTION_INFO_V1(dblink_current_query);
-Datum
-dblink_current_query(PG_FUNCTION_ARGS)
-{
-	text		*result_text;
-
-	result_text = DatumGetTextP(DirectFunctionCall1(textin, CStringGetDatum(debug_query_string)));
-	PG_RETURN_TEXT_P(result_text);
-}
-
-
-/*
- * dblink_replace_text
- * replace all occurences of 'old_sub_str' in 'orig_str'
- * with 'new_sub_str' to form 'new_str'
- * 
- * returns 'orig_str' if 'old_sub_str' == '' or 'orig_str' == ''
- * otherwise returns 'new_str' 
- */
-PG_FUNCTION_INFO_V1(dblink_replace_text);
-Datum
-dblink_replace_text(PG_FUNCTION_ARGS)
-{
-	text		*left_text;
-	text		*right_text;
-	text		*buf_text;
-	text		*ret_text;
-	char		*ret_str;
-	int			curr_posn;
-	text		*src_text = PG_GETARG_TEXT_P(0);
-	int			src_text_len = DatumGetInt32(DirectFunctionCall1(textlen, PointerGetDatum(src_text)));
-	text		*from_sub_text = PG_GETARG_TEXT_P(1);
-	int			from_sub_text_len = DatumGetInt32(DirectFunctionCall1(textlen, PointerGetDatum(from_sub_text)));
-	text		*to_sub_text = PG_GETARG_TEXT_P(2);
-	char		*to_sub_str = DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(to_sub_text)));
-	StringInfo	str = makeStringInfo();
-
-	if (src_text_len == 0 || from_sub_text_len == 0)
-		PG_RETURN_TEXT_P(src_text);
-
-	buf_text = DatumGetTextPCopy(PointerGetDatum(src_text));
-	curr_posn = DatumGetInt32(DirectFunctionCall2(textpos, PointerGetDatum(buf_text), PointerGetDatum(from_sub_text)));
-
-	while (curr_posn > 0)
-	{
-		left_text = DatumGetTextP(DirectFunctionCall3(text_substr, PointerGetDatum(buf_text), 1, DatumGetInt32(DirectFunctionCall2(textpos, PointerGetDatum(buf_text), PointerGetDatum(from_sub_text))) - 1));
-		right_text = DatumGetTextP(DirectFunctionCall3(text_substr, PointerGetDatum(buf_text), DatumGetInt32(DirectFunctionCall2(textpos, PointerGetDatum(buf_text), PointerGetDatum(from_sub_text))) + from_sub_text_len, -1));
-
-		appendStringInfo(str, DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(left_text))));
-		appendStringInfo(str, to_sub_str);
-
-		pfree(buf_text);
-		pfree(left_text);
-		buf_text = right_text;
-		curr_posn = DatumGetInt32(DirectFunctionCall2(textpos, PointerGetDatum(buf_text), PointerGetDatum(from_sub_text)));
-	}
-
-	appendStringInfo(str, DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(buf_text))));
-	pfree(buf_text);
-
-	ret_str = pstrdup(str->data);
-	ret_text = DatumGetTextP(DirectFunctionCall1(textin, CStringGetDatum(ret_str)));
-
-	PG_RETURN_TEXT_P(ret_text);
-}
-
-
-/*************************************************************
- * internal functions
- */
-
-
-/*
- * init_dblink_results
- *	 - create an empty dblink_results data structure
- */
-static dblink_results *
-init_dblink_results(MemoryContext fn_mcxt)
-{
-	MemoryContext oldcontext;
-	dblink_results *retval;
-
-	oldcontext = MemoryContextSwitchTo(fn_mcxt);
-
-	retval = (dblink_results *) palloc(sizeof(dblink_results));
-	MemSet(retval, 0, sizeof(dblink_results));
-
-	retval->tup_num = -1;
-	retval->res_id_index =-1;
-	retval->res = NULL;
-
-	MemoryContextSwitchTo(oldcontext);
-
-	return retval;
-}
-
-
-/*
- * init_dblink_array_results
- *	 - create an empty dblink_array_results data structure
- */
-static dblink_array_results *
-init_dblink_array_results(MemoryContext fn_mcxt)
-{
-	MemoryContext oldcontext;
-	dblink_array_results *retval;
-
-	oldcontext = MemoryContextSwitchTo(fn_mcxt);
-
-	retval = (dblink_array_results *) palloc(sizeof(dblink_array_results));
-	MemSet(retval, 0, sizeof(dblink_array_results));
-
-	retval->elem_num = -1;
-	retval->num_elems = 0;
-	retval->res = NULL;
-
-	MemoryContextSwitchTo(oldcontext);
-
-	return retval;
-}
-
-/*
- * get_pkey_attnames
- * 
- * Get the primary key attnames for the given relation.
- * Return NULL, and set numatts = 0, if no primary key exists.
- */
-static char **
-get_pkey_attnames(Oid relid, int16 *numatts)
-{
-	Relation		indexRelation;
-	ScanKeyData		entry;
-	HeapScanDesc	scan;
-	HeapTuple		indexTuple;
-	int				i;
-	char			**result = NULL;
-	Relation		rel;
-	TupleDesc		tupdesc;
-
-	/*
-	 * Open relation using relid, get tupdesc
-	 */
-	rel = relation_open(relid, AccessShareLock);
-	tupdesc = rel->rd_att;
-
-	/*
-	 * Initialize numatts to 0 in case no primary key
-	 * exists
-	 */
-	*numatts = 0;
-
-	/*
-	 * Use relid to get all related indexes
-	 */
-	indexRelation = heap_openr(IndexRelationName, AccessShareLock);
-	ScanKeyEntryInitialize(&entry, 0, Anum_pg_index_indrelid,
-						   F_OIDEQ, ObjectIdGetDatum(relid));
-	scan = heap_beginscan(indexRelation, SnapshotNow, 1, &entry);
-
-	while ((indexTuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
-	{
-		Form_pg_index	index = (Form_pg_index) GETSTRUCT(indexTuple);
-
-		/*
-		 * We're only interested if it is the primary key
-		 */
-		if (index->indisprimary == TRUE)
-		{
-			i = 0;
-			while (index->indkey[i++] != 0)
-				(*numatts)++;
-
-			if (*numatts > 0)
-			{
-				result = (char **) palloc(*numatts * sizeof(char *));
-				for (i = 0; i < *numatts; i++)
-					result[i] = SPI_fname(tupdesc, index->indkey[i]);
-			}
-			break;
-		}
-	}
-	heap_endscan(scan);
-	heap_close(indexRelation, AccessShareLock);
-	relation_close(rel, AccessShareLock);
-
-	return result;
-}
-
-
-/*
- * get_strtok
- * 
- * parse input string
- * return ord item (0 based)
- * based on provided field separator
- */
-static char *
-get_strtok(char *fldtext, char *fldsep, int fldnum)
-{
-	int			j = 0;
-	char		*result;
-
-	if (fldnum < 0)
-	{
-		elog(ERROR, "get_strtok: field number < 0 not permitted");
-	}
-
-	if (fldsep[0] == '\0')
-	{
-		elog(ERROR, "get_strtok: blank field separator not permitted");
-	}
-
-	result = strtok(fldtext, fldsep);
-	for (j = 1; j < fldnum + 1; j++)
-	{
-		result = strtok(NULL, fldsep);
-		if (result == NULL)
-			return NULL;
-	} 
-
-	return pstrdup(result);
-}
-
-static char *
-get_sql_insert(Oid relid, int16 *pkattnums, int16 pknumatts, char **src_pkattvals, char **tgt_pkattvals)
-{
-	Relation		rel;
-	char			*relname;
-	HeapTuple		tuple;
-	TupleDesc		tupdesc;
-	int				natts;
-	StringInfo		str = makeStringInfo();
-	char			*sql = NULL;
-	char			*val = NULL;
-	int16			key;
-	unsigned int	i;
-
-	/*
-	 * Open relation using relid
-	 */
-	rel = relation_open(relid, AccessShareLock);
-	relname =  RelationGetRelationName(rel);
-	tupdesc = rel->rd_att;
-	natts = tupdesc->natts;
-
-	tuple = get_tuple_of_interest(relid, pkattnums, pknumatts, src_pkattvals);
-
-	appendStringInfo(str, "INSERT INTO %s(", quote_ident_cstr(relname));
-	for (i = 0; i < natts; i++)
-	{
-		if (i > 0)
-			appendStringInfo(str, ",");
-
-		appendStringInfo(str, NameStr(tupdesc->attrs[i]->attname));
-	}
-
-	appendStringInfo(str, ") VALUES(");
-
-	/*
-	 * remember attvals are 1 based
-	 */
-	for (i = 0; i < natts; i++)
-	{
-		if (i > 0)
-			appendStringInfo(str, ",");
-
-		if (tgt_pkattvals != NULL)
-			key = get_attnum_pk_pos(pkattnums, pknumatts, i + 1);
-		else
-			key = -1;
-
-		if (key > -1)
-			val = pstrdup(tgt_pkattvals[key]);
-		else
-			val = SPI_getvalue(tuple, tupdesc, i + 1);
-
-		if (val != NULL)
-		{
-			appendStringInfo(str, quote_literal_cstr(val));
-			pfree(val);
-		}
-		else
-			appendStringInfo(str, "NULL");
-	}
-	appendStringInfo(str, ")");
-
-	sql = pstrdup(str->data);
-	pfree(str->data);
-	pfree(str);
-	relation_close(rel, AccessShareLock);
-
-	return (sql);
-}
-
-static char *
-get_sql_delete(Oid relid, int16 *pkattnums, int16 pknumatts, char **tgt_pkattvals)
-{
-	Relation		rel;
-	char			*relname;
-	TupleDesc		tupdesc;
-	int				natts;
-	StringInfo		str = makeStringInfo();
-	char			*sql = NULL;
-	char			*val = NULL;
-	unsigned int	i;
-
-	/*
-	 * Open relation using relid
-	 */
-	rel = relation_open(relid, AccessShareLock);
-	relname =  RelationGetRelationName(rel);
-	tupdesc = rel->rd_att;
-	natts = tupdesc->natts;
-
-	appendStringInfo(str, "DELETE FROM %s WHERE ", quote_ident_cstr(relname));
-	for (i = 0; i < pknumatts; i++)
-	{
-		int16	pkattnum = pkattnums[i];
-
-		if (i > 0)
-			appendStringInfo(str, " AND ");
-
-		appendStringInfo(str, NameStr(tupdesc->attrs[pkattnum - 1]->attname));
-
-		if (tgt_pkattvals != NULL)
-			val = pstrdup(tgt_pkattvals[i]);
-		else
-			elog(ERROR, "Target key array must not be NULL");
-
-		if (val != NULL)
-		{
-			appendStringInfo(str, "=");
-			appendStringInfo(str, quote_literal_cstr(val));
-			pfree(val);
-		}
-		else
-			appendStringInfo(str, "IS NULL");
-	}
-
-	sql = pstrdup(str->data);
-	pfree(str->data);
-	pfree(str);
-	relation_close(rel, AccessShareLock);
-
-	return (sql);
-}
-
-static char *
-get_sql_update(Oid relid, int16 *pkattnums, int16 pknumatts, char **src_pkattvals, char **tgt_pkattvals)
-{
-	Relation		rel;
-	char			*relname;
-	HeapTuple		tuple;
-	TupleDesc		tupdesc;
-	int				natts;
-	StringInfo		str = makeStringInfo();
-	char			*sql = NULL;
-	char			*val = NULL;
-	int16			key;
-	int				i;
-
-	/*
-	 * Open relation using relid
-	 */
-	rel = relation_open(relid, AccessShareLock);
-	relname =  RelationGetRelationName(rel);
-	tupdesc = rel->rd_att;
-	natts = tupdesc->natts;
-
-	tuple = get_tuple_of_interest(relid, pkattnums, pknumatts, src_pkattvals);
-
-	appendStringInfo(str, "UPDATE %s SET ", quote_ident_cstr(relname));
-
-	for (i = 0; i < natts; i++)
-	{
-		if (i > 0)
-			appendStringInfo(str, ",");
-
-		appendStringInfo(str, NameStr(tupdesc->attrs[i]->attname));
-		appendStringInfo(str, "=");
-
-		if (tgt_pkattvals != NULL)
-			key = get_attnum_pk_pos(pkattnums, pknumatts, i + 1);
-		else
-			key = -1;
-
-		if (key > -1)
-			val = pstrdup(tgt_pkattvals[key]);
-		else
-			val = SPI_getvalue(tuple, tupdesc, i + 1);
-
-		if (val != NULL)
-		{
-			appendStringInfo(str, quote_literal_cstr(val));
-			pfree(val);
-		}
-		else
-			appendStringInfo(str, "NULL");
-	}
-
-	appendStringInfo(str, " WHERE ");
-
-	for (i = 0; i < pknumatts; i++)
-	{
-		int16	pkattnum = pkattnums[i];
-
-		if (i > 0)
-			appendStringInfo(str, " AND ");
-
-		appendStringInfo(str, NameStr(tupdesc->attrs[pkattnum - 1]->attname));
-
-		if (tgt_pkattvals != NULL)
-			val = pstrdup(tgt_pkattvals[i]);
-		else
-			val = SPI_getvalue(tuple, tupdesc, pkattnum);
-
-		if (val != NULL)
-		{
-			appendStringInfo(str, "=");
-			appendStringInfo(str, quote_literal_cstr(val));
-			pfree(val);
-		}
-		else
-			appendStringInfo(str, "IS NULL");
-	}
-
-	sql = pstrdup(str->data);
-	pfree(str->data);
-	pfree(str);
-	relation_close(rel, AccessShareLock);
-
-	return (sql);
-}
-
-/*
- * Return a properly quoted literal value.
- * Uses quote_literal in quote.c
- */
-static char *
-quote_literal_cstr(char *rawstr)
-{
-	text		*rawstr_text;
-	text		*result_text;
-	char		*result;
-
-	rawstr_text = DatumGetTextP(DirectFunctionCall1(textin, CStringGetDatum(rawstr)));
-	result_text = DatumGetTextP(DirectFunctionCall1(quote_literal, PointerGetDatum(rawstr_text)));
-	result = DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(result_text)));
-
-	return result;
-}
-
-/*
- * Return a properly quoted identifier.
- * Uses quote_ident in quote.c
- */
-static char *
-quote_ident_cstr(char *rawstr)
-{
-	text		*rawstr_text;
-	text		*result_text;
-	char		*result;
-
-	rawstr_text = DatumGetTextP(DirectFunctionCall1(textin, CStringGetDatum(rawstr)));
-	result_text = DatumGetTextP(DirectFunctionCall1(quote_ident, PointerGetDatum(rawstr_text)));
-	result = DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(result_text)));
-
-	return result;
-}
-
-static int16
-get_attnum_pk_pos(int16 *pkattnums, int16 pknumatts, int16 key)
-{
-	int		i;
-
-	/*
-	 * Not likely a long list anyway, so just scan for
-	 * the value
-	 */
-	for (i = 0; i < pknumatts; i++)
-		if (key == pkattnums[i])
-			return i;
-
-	return -1;
-}
-
-static HeapTuple
-get_tuple_of_interest(Oid relid, int16 *pkattnums, int16 pknumatts, char **src_pkattvals)
-{
-	Relation		rel;
-	char			*relname;
-	TupleDesc		tupdesc;
-	StringInfo		str = makeStringInfo();
-	char			*sql = NULL;
-	int				ret;
-	HeapTuple		tuple;
-	int				i;
-	char			*val = NULL;
-
-	/*
-	 * Open relation using relid
-	 */
-	rel = relation_open(relid, AccessShareLock);
-	relname =  RelationGetRelationName(rel);
-	tupdesc = rel->rd_att;
-
-	/*
-	 * Connect to SPI manager
-	 */
-	if ((ret = SPI_connect()) < 0)
-		elog(ERROR, "get_tuple_of_interest: SPI_connect returned %d", ret);
-
-	/*
-	 * Build sql statement to look up tuple of interest
-	 * Use src_pkattvals as the criteria.
-	 */
-	appendStringInfo(str, "SELECT * from %s WHERE ", relname);
-
-	for (i = 0; i < pknumatts; i++)
-	{
-		int16	pkattnum = pkattnums[i];
-
-		if (i > 0)
-			appendStringInfo(str, " AND ");
-
-		appendStringInfo(str, NameStr(tupdesc->attrs[pkattnum - 1]->attname));
-
-		val = pstrdup(src_pkattvals[i]);
-		if (val != NULL)
-		{
-			appendStringInfo(str, "=");
-			appendStringInfo(str, quote_literal_cstr(val));
-			pfree(val);
-		}
-		else
-			appendStringInfo(str, "IS NULL");
-	}
-
-	sql = pstrdup(str->data);
-	pfree(str->data);
-	pfree(str);
-	/*
-	 * Retrieve the desired tuple
-	 */
-	ret = SPI_exec(sql, 0);
-	pfree(sql);
-
-	/*
-	 * Only allow one qualifying tuple
-	 */
-	if ((ret == SPI_OK_SELECT) && (SPI_processed > 1))
-	{
-		elog(ERROR, "get_tuple_of_interest: Source criteria may not match more than one record.");
-	}
-	else if (ret == SPI_OK_SELECT && SPI_processed == 1)
-	{
-		SPITupleTable *tuptable = SPI_tuptable;
-		tuple = SPI_copytuple(tuptable->vals[0]);
-
-		return tuple;
-	}
-	else
-	{
-		/*
-		 * no qualifying tuples
-		 */
-		return NULL;
-	}
-
-	/*
-	 * never reached, but keep compiler quiet
-	 */
-	return NULL;
-}
-
-static Oid
-get_relid_from_relname(text *relname_text)
-{
-#ifdef NamespaceRelationName
-	RangeVar   *relvar;
-	Relation	rel;
-	Oid			relid;
-
-	relvar = makeRangeVarFromNameList(textToQualifiedNameList(relname_text, "get_relid_from_relname"));
-	rel = heap_openrv(relvar, AccessShareLock);
-	relid = RelationGetRelid(rel);
-	relation_close(rel, AccessShareLock);
-#else
-	char	   *relname;
-	Relation	rel;
-	Oid			relid;
-
-	relname = DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(relname_text)));
-	rel = relation_openr(relname, AccessShareLock);
-	relid = RelationGetRelid(rel);
-	relation_close(rel, AccessShareLock);
-#endif   /* NamespaceRelationName */
-
-	return relid;
-}
-
-static dblink_results	*
-get_res_ptr(int32 res_id_index)
-{
-	List	*ptr;
-
-	/*
-	 * short circuit empty list
-	 */
-	if(res_id == NIL)
-		return NULL;
-
-	/*
-	 * OK, should be good to go
-	 */
-	foreach(ptr, res_id)
-	{
-		dblink_results	*this_res_id = (dblink_results *) lfirst(ptr);
-		if (this_res_id->res_id_index == res_id_index)
-			return this_res_id;
-	}
-	return NULL;
-}
-
-/*
- * Add node to global List res_id
- */
-static void
-append_res_ptr(dblink_results *results)
-{
-	res_id = lappend(res_id, results);
-}
-
-/*
- * Remove node from global List
- * using res_id_index
- */
-static void
-remove_res_ptr(dblink_results *results)
-{
-	res_id = lremove(results, res_id);
-
-	if (res_id == NIL)
-		res_id_index = 0;
-}
-
diff --git a/contrib/dblink/dblink.h b/contrib/dblink/dblink.h
deleted file mode 100644
index 4d53005ac6..0000000000
--- a/contrib/dblink/dblink.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * dblink.h
- *
- * Functions returning results from a remote database
- *
- * Copyright (c) Joseph Conway <mail@joeconway.com>, 2001, 2002,
- * ALL RIGHTS RESERVED;
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without a written agreement
- * is hereby granted, provided that the above copyright notice and this
- * paragraph and the following two paragraphs appear in all copies.
- *
- * IN NO EVENT SHALL THE AUTHOR OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
- * LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
- * DOCUMENTATION, EVEN IF THE AUTHOR OR DISTRIBUTORS HAVE BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * THE AUTHOR AND DISTRIBUTORS SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE AUTHOR AND DISTRIBUTORS HAS NO OBLIGATIONS TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- */
-
-#ifndef DBLINK_H
-#define DBLINK_H
-
-#include <string.h>
-#include "postgres.h"
-#include "libpq-fe.h"
-#include "libpq-int.h"
-#include "fmgr.h"
-#include "access/tupdesc.h"
-#include "access/heapam.h"
-#include "catalog/catname.h"
-#include "catalog/pg_index.h"
-#include "catalog/pg_type.h"
-#include "executor/executor.h"
-#include "executor/spi.h"
-#include "lib/stringinfo.h"
-#include "nodes/nodes.h"
-#include "nodes/execnodes.h"
-#include "nodes/pg_list.h"
-#include "parser/parse_type.h"
-#include "tcop/tcopprot.h"
-#include "utils/builtins.h"
-#include "utils/fmgroids.h"
-#include "utils/array.h"
-#include "utils/syscache.h"
-
-#ifdef NamespaceRelationName
-#include "catalog/namespace.h"
-#endif   /* NamespaceRelationName */
-
-/*
- * Max SQL statement size
- */
-#define DBLINK_MAX_SQLSTATE_SIZE		16384
-
-/*
- * This struct holds the results of the remote query.
- * Use fn_extra to hold a pointer to it across calls
- */
-typedef struct
-{
-	/*
-	 * last tuple number accessed
-	 */
-	int			tup_num;
-
-	/*
-	 * resource index number for this context
-	 */
-	int			res_id_index;
-
-	/*
-	 * the actual query results
-	 */
-	PGresult   *res;
-}	dblink_results;
-
-
-/*
- * This struct holds results in the form of an array.
- * Use fn_extra to hold a pointer to it across calls
- */
-typedef struct
-{
-	/*
-	 * elem being accessed
-	 */
-	int			elem_num;
-
-	/*
-	 * number of elems
-	 */
-	int			num_elems;
-
-	/*
-	 * the actual array
-	 */
-	void		*res;
-
-}	dblink_array_results;
-
-/*
- * External declarations
- */
-extern Datum dblink(PG_FUNCTION_ARGS);
-extern Datum dblink_tok(PG_FUNCTION_ARGS);
-extern Datum dblink_strtok(PG_FUNCTION_ARGS);
-extern Datum dblink_get_pkey(PG_FUNCTION_ARGS);
-extern Datum dblink_last_oid(PG_FUNCTION_ARGS);
-extern Datum dblink_build_sql_insert(PG_FUNCTION_ARGS);
-extern Datum dblink_build_sql_delete(PG_FUNCTION_ARGS);
-extern Datum dblink_build_sql_update(PG_FUNCTION_ARGS);
-extern Datum dblink_current_query(PG_FUNCTION_ARGS);
-extern Datum dblink_replace_text(PG_FUNCTION_ARGS);
-
-extern char	*debug_query_string;
-
-#endif   /* DBLINK_H */
diff --git a/contrib/dblink/dblink.sql.in b/contrib/dblink/dblink.sql.in
deleted file mode 100644
index bea4378907..0000000000
--- a/contrib/dblink/dblink.sql.in
+++ /dev/null
@@ -1,38 +0,0 @@
-CREATE OR REPLACE FUNCTION dblink (text,text) RETURNS setof int
-  AS 'MODULE_PATHNAME','dblink' LANGUAGE 'c'
-  WITH (isstrict);
-
-CREATE OR REPLACE FUNCTION dblink_tok (int,int) RETURNS text
-  AS 'MODULE_PATHNAME','dblink_tok' LANGUAGE 'c'
-  WITH (isstrict);
-
-CREATE OR REPLACE FUNCTION dblink_strtok (text,text,int) RETURNS text
-  AS 'MODULE_PATHNAME','dblink_strtok' LANGUAGE 'c'
-  WITH (iscachable, isstrict);
-
-CREATE OR REPLACE FUNCTION dblink_get_pkey (text) RETURNS setof text
-  AS 'MODULE_PATHNAME','dblink_get_pkey' LANGUAGE 'c'
-  WITH (isstrict);
-
-CREATE OR REPLACE FUNCTION dblink_last_oid (int) RETURNS oid
-  AS 'MODULE_PATHNAME','dblink_last_oid' LANGUAGE 'c'
-  WITH (isstrict);
-
-CREATE OR REPLACE FUNCTION dblink_build_sql_insert (text, int2vector, int2, _text, _text) RETURNS text
-  AS 'MODULE_PATHNAME','dblink_build_sql_insert' LANGUAGE 'c'
-  WITH (isstrict);
-
-CREATE OR REPLACE FUNCTION dblink_build_sql_delete (text, int2vector, int2, _text) RETURNS text
-  AS 'MODULE_PATHNAME','dblink_build_sql_delete' LANGUAGE 'c'
-  WITH (isstrict);
-
-CREATE OR REPLACE FUNCTION dblink_build_sql_update (text, int2vector, int2, _text, _text) RETURNS text
-  AS 'MODULE_PATHNAME','dblink_build_sql_update' LANGUAGE 'c'
-  WITH (isstrict);
-
-CREATE OR REPLACE FUNCTION dblink_current_query () RETURNS text
-  AS 'MODULE_PATHNAME','dblink_current_query' LANGUAGE 'c';
-
-CREATE OR REPLACE FUNCTION dblink_replace (text,text,text) RETURNS text
-  AS 'MODULE_PATHNAME','dblink_replace_text' LANGUAGE 'c'
-  WITH (iscachable, isstrict);
diff --git a/contrib/dbsize/Makefile b/contrib/dbsize/Makefile
deleted file mode 100644
index ad72a12be2..0000000000
--- a/contrib/dbsize/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-subdir = contrib/dbsize
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-MODULES = dbsize
-DATA_built = dbsize.sql
-DOCS = README.dbsize
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/dbsize/README.dbsize b/contrib/dbsize/README.dbsize
deleted file mode 100644
index 879341cd02..0000000000
--- a/contrib/dbsize/README.dbsize
+++ /dev/null
@@ -1,11 +0,0 @@
-This module contains two functions that report the size of a given
-database or relation.  E.g.,
-
-SELECT database_size('template1');
-SELECT relation_size('pg_class');
-
-These functions report the actual file system space.  Thus, users can
-avoid digging through the details of the database directories.
-
-Copy this directory to contrib/dbsize in your PostgreSQL source tree.
-Then just run make; make install.
diff --git a/contrib/dbsize/dbsize.c b/contrib/dbsize/dbsize.c
deleted file mode 100644
index b072a86912..0000000000
--- a/contrib/dbsize/dbsize.c
+++ /dev/null
@@ -1,164 +0,0 @@
-#include "postgres.h"
-
-#include <sys/types.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include "access/heapam.h"
-#include "catalog/catalog.h"
-#include "catalog/catname.h"
-#include "catalog/namespace.h"
-#include "catalog/pg_database.h"
-#include "fmgr.h"
-#include "utils/builtins.h"
-#include "utils/fmgroids.h"
-
-
-static char *
-psnprintf(size_t len, const char *fmt,...)
-{
-	va_list		ap;
-	char	   *buf;
-
-	buf = palloc(len);
-
-	va_start(ap, fmt);
-	vsnprintf(buf, len, fmt, ap);
-	va_end(ap);
-
-	return buf;
-}
-
-
-
-/*
- * SQL function: database_size(name) returns bigint
- */
-
-PG_FUNCTION_INFO_V1(database_size);
-
-Datum database_size(PG_FUNCTION_ARGS);
-
-Datum
-database_size(PG_FUNCTION_ARGS)
-{
-	Name		dbname = PG_GETARG_NAME(0);
-
-	HeapTuple	tuple;
-	Relation	relation;
-	ScanKeyData	scanKey;
-	HeapScanDesc scan;
-	Oid			dbid;
-	char	   *dbpath;
-	DIR		   *dirdesc;
-	struct dirent *direntry;
-	int64		totalsize;
-
-	relation = heap_openr(DatabaseRelationName, AccessShareLock);
-	ScanKeyEntryInitialize(&scanKey, 0, Anum_pg_database_datname,
-						   F_NAMEEQ, NameGetDatum(dbname));
-	scan = heap_beginscan(relation, SnapshotNow, 1, &scanKey);
-	tuple = heap_getnext(scan, ForwardScanDirection);
-
-	if (!HeapTupleIsValid(tuple))
-		elog(ERROR, "database %s does not exist", NameStr(*dbname));
-
-	dbid = tuple->t_data->t_oid;
-	if (dbid == InvalidOid)
-		elog(ERROR, "invalid database id");
-
-	heap_endscan(scan);
-	heap_close(relation, NoLock);
-
-	dbpath = GetDatabasePath(dbid);
-
-	dirdesc = opendir(dbpath);
-	if (!dirdesc)
-		elog(ERROR, "could not open directory %s: %s", dbpath, strerror(errno));
-
-	totalsize = 0;
-	for (;;)
-	{
-		char	   *fullname;
-		struct stat statbuf;
-
-		errno = 0;
-		direntry = readdir(dirdesc);
-		if (!direntry)
-		{
-			if (errno)
-				elog(ERROR, "error reading directory: %s", strerror(errno));
-			else
-				break;
-		}
-
-		fullname = psnprintf(strlen(dbpath) + 1 + strlen(direntry->d_name) + 1,
-							 "%s/%s", dbpath, direntry->d_name);
-		if (stat(fullname, &statbuf) == -1)
-			elog(ERROR, "could not stat %s: %s", fullname, strerror(errno));
-		totalsize += statbuf.st_size;
-		pfree(fullname);
-	}
-
-	closedir(dirdesc);
-
-	PG_RETURN_INT64(totalsize);
-}
-
-
-
-/*
- * SQL function: relation_size(text) returns bigint
- */
-
-PG_FUNCTION_INFO_V1(relation_size);
-
-Datum relation_size(PG_FUNCTION_ARGS);
-
-Datum
-relation_size(PG_FUNCTION_ARGS)
-{
-	text	   *relname = PG_GETARG_TEXT_P(0);
-
-	RangeVar   *relrv;
-	Relation	relation;
-	Oid			relnode;
-	int64		totalsize;
-	unsigned int segcount;
-
-	relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname,
-															 "relation_size"));
-	relation = relation_openrv(relrv, AccessShareLock);
-
-	relnode = relation->rd_rel->relfilenode;
-
-	totalsize = 0;
-	segcount = 0;
-	for (;;)
-	{
-		char	   *fullname;
-		struct stat statbuf;
-
-		if (segcount == 0)
-			fullname = psnprintf(25, "%u", (unsigned) relnode);
-		else
-			fullname = psnprintf(50, "%u.%u", (unsigned) relnode, segcount);
-
-		if (stat(fullname, &statbuf) == -1)
-		{
-			if (errno == ENOENT)
-				break;
-			else
-				elog(ERROR, "could not stat %s: %m", fullname);
-		}
-		totalsize += statbuf.st_size;
-		pfree(fullname);
-		segcount++;
-	}
-
-	relation_close(relation, AccessShareLock);
-
-	PG_RETURN_INT64(totalsize);
-}
diff --git a/contrib/dbsize/dbsize.sql.in b/contrib/dbsize/dbsize.sql.in
deleted file mode 100644
index b00a36fa20..0000000000
--- a/contrib/dbsize/dbsize.sql.in
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE FUNCTION database_size (name) RETURNS bigint
-    AS 'MODULE_PATHNAME', 'database_size'
-    LANGUAGE C WITH (isstrict);
-
-CREATE FUNCTION relation_size (text) RETURNS bigint
-    AS 'MODULE_PATHNAME', 'relation_size'
-    LANGUAGE C WITH (isstrict);
diff --git a/contrib/earthdistance/Makefile b/contrib/earthdistance/Makefile
deleted file mode 100644
index 94ad370d59..0000000000
--- a/contrib/earthdistance/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/earthdistance/Makefile,v 1.11 2001/09/06 10:49:29 petere Exp $
-
-subdir = contrib/earthdistance
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-MODULES = earthdistance
-DATA_built = earthdistance.sql
-DOCS = README.earthdistance
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/earthdistance/README.earthdistance b/contrib/earthdistance/README.earthdistance
deleted file mode 100644
index f4ecef80fe..0000000000
--- a/contrib/earthdistance/README.earthdistance
+++ /dev/null
@@ -1,31 +0,0 @@
-Date: Wed, 1 Apr 1998 15:19:32 -0600 (CST)
-From: Hal Snyder <hal@vailsys.com>
-To: vmehr@ctp.com
-Subject: [QUESTIONS] Re: Spatial data, R-Trees
-
-> From: Vivek Mehra <vmehr@ctp.com>
-> Date: Wed, 1 Apr 1998 10:06:50 -0500
-
->  Am just starting out with PostgreSQL and would like to learn more about
-> the spatial data handling ablilities of postgreSQL - in terms of using
-> R-tree indexes, user defined types, operators and functions. 
-> 
-> Would you be able to suggest where I could find some code and SQL to
-> look at to create these?
-
-Here's the setup for adding an operator '<@>' to give distance in
-statute miles between two points on the earth's surface. Coordinates
-are in degrees. Points are taken as (longitude, latitude) and not vice
-versa as longitude is closer to the intuitive idea of x-axis and
-latitude to y-axis.
-
-There's C source, Makefile for FreeBSD, and SQL for installing and
-testing the function.
-
-Let me know if anything looks fishy!
-
-A note on testing C extensions - it seems not enough to drop a function
-and re-create it - if I change a function, I have to stop and restart
-the backend for the new version to be seen. I guess it would be too
-messy to track which functions are added from a .so and do a dlclose
-when the last one is dropped.
diff --git a/contrib/earthdistance/earthdistance.c b/contrib/earthdistance/earthdistance.c
deleted file mode 100644
index c1962272f4..0000000000
--- a/contrib/earthdistance/earthdistance.c
+++ /dev/null
@@ -1,72 +0,0 @@
-#include "postgres.h"
-
-#include <math.h>
-
-#include "utils/geo_decls.h"	/* for Pt */
-
-
-/* Earth's radius is in statute miles. */
-const int	EARTH_RADIUS = 3958.747716;
-const int	TWO_PI = 2.0 * M_PI;
-
-double	   *geo_distance(Point *pt1, Point *pt2);
-
-
-/******************************************************
- *
- * degtorad - convert degrees to radians
- *
- * arg: double, angle in degrees
- *
- * returns: double, same angle in radians
- ******************************************************/
-
-static double
-degtorad(double degrees)
-{
-	return (degrees / 360.0) * TWO_PI;
-}
-
-
-/******************************************************
- *
- * geo_distance - distance between points
- *
- * args:
- *	 a pair of points - for each point,
- *	   x-coordinate is longitude in degrees west of Greenwich
- *	   y-coordinate is latitude in degrees above equator
- *
- * returns: double
- *	 distance between the points in miles on earth's surface
- ******************************************************/
-
-double *
-geo_distance(Point *pt1, Point *pt2)
-{
-
-	double		long1,
-				lat1,
-				long2,
-				lat2;
-	double		longdiff;
-	double	   *resultp = palloc(sizeof(double));
-
-	/* convert degrees to radians */
-
-	long1 = degtorad(pt1->x);
-	lat1 = degtorad(pt1->y);
-
-	long2 = degtorad(pt2->x);
-	lat2 = degtorad(pt2->y);
-
-	/* compute difference in longitudes - want < 180 degrees */
-	longdiff = fabs(long1 - long2);
-	if (longdiff > M_PI)
-		longdiff = TWO_PI - longdiff;
-
-	*resultp = EARTH_RADIUS * acos
-		(sin(lat1) * sin(lat2) + cos(lat1) * cos(lat2) * cos(longdiff));
-
-	return resultp;
-}
diff --git a/contrib/earthdistance/earthdistance.sql.in b/contrib/earthdistance/earthdistance.sql.in
deleted file mode 100644
index 087484da51..0000000000
--- a/contrib/earthdistance/earthdistance.sql.in
+++ /dev/null
@@ -1,24 +0,0 @@
-
---------------- geo_distance
-
-DROP FUNCTION geo_distance (point, point);
-CREATE FUNCTION geo_distance (point, point) RETURNS float8
-  AS 'MODULE_PATHNAME' LANGUAGE 'c'
-  WITH (isstrict);
-
-SELECT geo_distance ('(1,2)'::point, '(3,4)'::point);
-
---------------- geo_distance as operator <@>
-
-DROP OPERATOR <@> (point, point);
-CREATE OPERATOR <@> (
-  leftarg = point,
-  rightarg = point,
-  procedure = geo_distance,
-  commutator = <@>
-);
-
--- ( 87.6, 41.8) is in Chicago
--- (106.7, 35.1) is in Albuquerque
--- The cities are about 1100 miles apart
-SELECT '(87.6,41.8)'::point <@> '(106.7,35.1)'::point;
diff --git a/contrib/findoidjoins/Makefile b/contrib/findoidjoins/Makefile
deleted file mode 100644
index d285abd5a6..0000000000
--- a/contrib/findoidjoins/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.13 2001/09/06 10:49:29 petere Exp $
-
-subdir = contrib/findoidjoins
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-PROGRAM = findoidjoins
-OBJS	= findoidjoins.o
-
-libpgeasy_srcdir = $(top_srcdir)/src/interfaces/libpgeasy
-libpgeasy_builddir = $(top_builddir)/src/interfaces/libpgeasy
-
-PG_CPPFLAGS = -I$(libpgeasy_srcdir) -I$(libpq_srcdir)
-PG_LIBS = -L$(libpgeasy_builddir) -lpgeasy $(libpq)
-
-SCRIPTS = make_oidjoins_check
-DOCS = README.findoidjoins
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/findoidjoins/README.findoidjoins b/contrib/findoidjoins/README.findoidjoins
deleted file mode 100644
index 14c17e1e0e..0000000000
--- a/contrib/findoidjoins/README.findoidjoins
+++ /dev/null
@@ -1,94 +0,0 @@
-
-   			      findoidjoins
-
-This program scans a database, and prints oid fields (also regproc, regclass
-and regtype fields) and the tables they join to.  CAUTION: it is ver-r-r-y
-slow on a large database, or even a not-so-large one.  We don't really
-recommend running it on anything but an empty database, such as template1.
-
-Uses pgeasy library.
-
-Run on an empty database, it returns the system join relationships (shown
-below for 7.2).  Note that unexpected matches may indicate bogus entries
-in system tables --- don't accept a peculiar match without question.
-In particular, a field shown as joining to more than one target table is
-probably messed up.  In 7.2, the *only* field that should join to more
-than one target is pg_description.objoid.  (Running make_oidjoins_check
-is an easy way to spot fields joining to more than one table, BTW.)
-
-The shell script make_oidjoins_check converts findoidjoins' output
-into an SQL script that checks for dangling links (entries in an
-OID or REGPROC column that don't match any row in the expected table).
-Note that fields joining to more than one table are NOT processed.
-
-The result of make_oidjoins_check should be installed as the "oidjoins"
-regression test.  The oidjoins test should be updated after any
-revision in the patterns of cross-links between system tables.
-(Ideally we'd just regenerate the script as part of the regression
-tests themselves, but that seems too slow...)
-
-NOTE: in 7.2, make_oidjoins_check produces one bogus join check, for
-pg_class.relfilenode => pg_class.oid.  This is an artifact and should not
-be added to the oidjoins regress test.
-
----------------------------------------------------------------------------
-
-Join pg_aggregate.aggtransfn => pg_proc.oid
-Join pg_aggregate.aggfinalfn => pg_proc.oid
-Join pg_aggregate.aggbasetype => pg_type.oid
-Join pg_aggregate.aggtranstype => pg_type.oid
-Join pg_aggregate.aggfinaltype => pg_type.oid
-Join pg_am.amgettuple => pg_proc.oid
-Join pg_am.aminsert => pg_proc.oid
-Join pg_am.ambeginscan => pg_proc.oid
-Join pg_am.amrescan => pg_proc.oid
-Join pg_am.amendscan => pg_proc.oid
-Join pg_am.ammarkpos => pg_proc.oid
-Join pg_am.amrestrpos => pg_proc.oid
-Join pg_am.ambuild => pg_proc.oid
-Join pg_am.ambulkdelete => pg_proc.oid
-Join pg_am.amcostestimate => pg_proc.oid
-Join pg_amop.amopclaid => pg_opclass.oid
-Join pg_amop.amopopr => pg_operator.oid
-Join pg_amproc.amopclaid => pg_opclass.oid
-Join pg_amproc.amproc => pg_proc.oid
-Join pg_attribute.attrelid => pg_class.oid
-Join pg_attribute.atttypid => pg_type.oid
-Join pg_class.reltype => pg_type.oid
-Join pg_class.relam => pg_am.oid
-Join pg_class.reltoastrelid => pg_class.oid
-Join pg_class.reltoastidxid => pg_class.oid
-Join pg_description.classoid => pg_class.oid
-Join pg_index.indexrelid => pg_class.oid
-Join pg_index.indrelid => pg_class.oid
-Join pg_opclass.opcamid => pg_am.oid
-Join pg_opclass.opcintype => pg_type.oid
-Join pg_operator.oprleft => pg_type.oid
-Join pg_operator.oprright => pg_type.oid
-Join pg_operator.oprresult => pg_type.oid
-Join pg_operator.oprcom => pg_operator.oid
-Join pg_operator.oprnegate => pg_operator.oid
-Join pg_operator.oprlsortop => pg_operator.oid
-Join pg_operator.oprrsortop => pg_operator.oid
-Join pg_operator.oprcode => pg_proc.oid
-Join pg_operator.oprrest => pg_proc.oid
-Join pg_operator.oprjoin => pg_proc.oid
-Join pg_proc.prolang => pg_language.oid
-Join pg_proc.prorettype => pg_type.oid
-Join pg_rewrite.ev_class => pg_class.oid
-Join pg_statistic.starelid => pg_class.oid
-Join pg_statistic.staop1 => pg_operator.oid
-Join pg_statistic.staop2 => pg_operator.oid
-Join pg_statistic.staop3 => pg_operator.oid
-Join pg_trigger.tgrelid => pg_class.oid
-Join pg_trigger.tgfoid => pg_proc.oid
-Join pg_type.typrelid => pg_class.oid
-Join pg_type.typelem => pg_type.oid
-Join pg_type.typinput => pg_proc.oid
-Join pg_type.typoutput => pg_proc.oid
-Join pg_type.typreceive => pg_proc.oid
-Join pg_type.typsend => pg_proc.oid
-
----------------------------------------------------------------------------
-
-Bruce Momjian (root@candle.pha.pa.us)
diff --git a/contrib/findoidjoins/findoidjoins.c b/contrib/findoidjoins/findoidjoins.c
deleted file mode 100644
index c426b5523a..0000000000
--- a/contrib/findoidjoins/findoidjoins.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * findoidjoins.c, requires src/interfaces/libpgeasy
- *
- */
-#include "postgres_fe.h"
-
-#include "libpq-fe.h"
-#include "halt.h"
-#include "libpgeasy.h"
-
-PGresult   *attres,
-		   *relres;
-
-int
-main(int argc, char **argv)
-{
-	char		query[4000];
-	char		relname[256];
-	char		relname2[256];
-	char		attname[256];
-	char		typname[256];
-	int			count;
-	char		optstr[256];
-
-	if (argc != 2)
-		halt("Usage:  %s database\n", argv[0]);
-
-	snprintf(optstr, 256, "dbname=%s", argv[1]);
-	connectdb(optstr);
-
-	on_error_continue();
-	on_error_stop();
-
-	doquery("BEGIN WORK");
-	doquery("\
-		DECLARE c_attributes BINARY CURSOR FOR \
-		SELECT typname, relname, a.attname \
-		FROM pg_class c, pg_attribute a, pg_type t \
-		WHERE a.attnum > 0 AND \
-			  relkind = 'r' AND \
-			  (typname = 'oid' OR \
-			   typname = 'regproc' OR \
-			   typname = 'regclass' OR \
-			   typname = 'regtype') AND \
-			  a.attrelid = c.oid AND \
-			  a.atttypid = t.oid \
-		ORDER BY 2, a.attnum ; \
-		");
-	doquery("FETCH ALL IN c_attributes");
-	attres = get_result();
-
-	doquery("\
-		DECLARE c_relations BINARY CURSOR FOR \
-		SELECT relname \
-		FROM pg_class c \
-		WHERE relkind = 'r' AND relhasoids \
-		ORDER BY 1; \
-		");
-	doquery("FETCH ALL IN c_relations");
-	relres = get_result();
-
-	set_result(attres);
-	while (fetch(typname, relname, attname) != END_OF_TUPLES)
-	{
-		set_result(relres);
-		reset_fetch();
-		while (fetch(relname2) != END_OF_TUPLES)
-		{
-			unset_result(relres);
-			if (strcmp(typname, "oid") == 0)
-				sprintf(query, "\
-					DECLARE c_matches BINARY CURSOR FOR \
-					SELECT	count(*)::int4 \
-						FROM \"%s\" t1, \"%s\" t2 \
-					WHERE t1.\"%s\" = t2.oid ",
-						relname, relname2, attname);
-			else
-				sprintf(query, "\
-					DECLARE c_matches BINARY CURSOR FOR \
-					SELECT	count(*)::int4 \
-						FROM \"%s\" t1, \"%s\" t2 \
-					WHERE t1.\"%s\"::oid = t2.oid ",
-						relname, relname2, attname);
-
-			doquery(query);
-			doquery("FETCH ALL IN c_matches");
-			fetch(&count);
-			if (count != 0)
-				printf("Join %s.%s => %s.oid\n", relname, attname, relname2);
-			doquery("CLOSE c_matches");
-			set_result(relres);
-		}
-		set_result(attres);
-	}
-
-	set_result(relres);
-	doquery("CLOSE c_relations");
-	PQclear(relres);
-
-	set_result(attres);
-	doquery("CLOSE c_attributes");
-	PQclear(attres);
-	unset_result(attres);
-
-	doquery("COMMIT WORK");
-
-	disconnectdb();
-	return 0;
-}
diff --git a/contrib/findoidjoins/make_oidjoins_check b/contrib/findoidjoins/make_oidjoins_check
deleted file mode 100755
index 72bb645251..0000000000
--- a/contrib/findoidjoins/make_oidjoins_check
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-
-# You first run findoidjoins on the template1 database, and send that
-# output into this script to generate a list of SQL statements.
-
-# NOTE: any field that findoidjoins thinks joins to more than one table
-# will NOT be checked by the output of this script.  You should be
-# suspicious of multiple entries in findoidjoins' output.
-
-# Caution: you may need to use GNU awk.
-AWK=${AWK:-awk}
-
-trap "rm -f /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15
-
-# Read input
-cat "$@" >/tmp/$$
-
-# Look for fields with multiple references.
-cat /tmp/$$ | cut -d' ' -f2 | sort | uniq -d >/tmp/$$a
-if [ -s /tmp/$$a ] ; then
-	echo "Ignoring these fields that link to multiple tables:" 1>&2
-	cat /tmp/$$a 1>&2
-fi
-
-# Get the non-multiply-referenced fields.
-cat /tmp/$$ | while read LINE
-do
-	set -- $LINE
-	grep "$2" /tmp/$$a >/dev/null 2>&1 || echo $LINE
-done >/tmp/$$b
-
-# Generate the output.
-cat /tmp/$$b |
-$AWK -F'[ \.]' '\
-	BEGIN \
-	{
-		printf "\
---\n\
--- This is created by pgsql/contrib/findoidjoins/make_oidjoin_check\n\
---\n";
-	}
-	{
-		printf "\
-SELECT	ctid, %s.%s \n\
-FROM	%s \n\
-WHERE	%s.%s != 0 AND \n\
-	NOT EXISTS(SELECT * FROM %s AS t1 WHERE t1.oid = %s.%s);\n",
-	$2, $3, $2,
-	$2, $3,
-	$5, $2, $3;
-	}'
-
-exit 0
diff --git a/contrib/fulltextindex/Makefile b/contrib/fulltextindex/Makefile
deleted file mode 100644
index 11029ed139..0000000000
--- a/contrib/fulltextindex/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/fulltextindex/Attic/Makefile,v 1.11 2001/09/06 10:49:29 petere Exp $
-
-subdir = contrib/fulltextindex
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-MODULES = fti
-DATA_built = fti.sql
-DOCS = README.fti
-SCRIPTS = fti.pl
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/fulltextindex/README.fti b/contrib/fulltextindex/README.fti
deleted file mode 100644
index 5c3d6362a6..0000000000
--- a/contrib/fulltextindex/README.fti
+++ /dev/null
@@ -1,201 +0,0 @@
-An attempt at some sort of Full Text Indexing for PostgreSQL.
-
-The included software is an attempt to add some sort of Full Text Indexing
-support to PostgreSQL. I mean by this that we can ask questions like:
-
-	Give me all rows that have 'still' and 'nash' in the 'artist' or 'title'
-	fields.
-
-Ofcourse we can write this as:
-
-	select * from cds where (artist ~* 'stills' or title ~* 'stills') and 
-	(artist ~* 'nash' or title ~* 'nash');
-
-But this does not use any indices, and therefore, if your database
-gets very large, it will not have very high performance (the above query
-requires at least one sequential scan, it probably takes 2 due to the
-self-join).
-
-The approach used by this add-on is to define a trigger on the table and
-columns you want to do this queries on. On every insert in the table, it
-takes the value in the specified columns, breaks the text in these columns
-up into pieces, and stores all sub-strings into another table, together
-with a reference to the row in the original table that contained this
-sub-string (it uses the oid of that row).
-
-By now creating an index over the 'fti-table', we can search for
-substrings that occur in the original table. By making a join between
-the fti-table and the orig-table, we can get the actual rows we want
-(this can also be done by using subselects - but subselects are currently
-inefficient in Postgres, and maybe there're other ways too).
-
-The trigger code also allows an array called StopWords, that prevents
-certain words from being indexed.
-
-As an example we take the previous query, where we assume we have all
-sub-strings in the table 'cds-fti':
-
-	select c.*
-	from cds c, cds-fti f1, cds-fti f2
-	where	f1.string ~ '^stills' and
-		f2.string ~ '^nash' and
-		f1.id = c.oid and
-		f2.id = c.oid ;
-
-We can use the ~ (case-sensitive regular expression) here, because of
-the way sub-strings are built: from right to left, ie. house -> 'se' +
-'use' + 'ouse' + 'house'. If a ~ search starts with a ^ (match start of
-string), btree indices can be used by PostgreSQL.
-
-Now, how do we create the trigger that maintains the fti-table? First: the
-fti-table should have the following schema:
-
-	create cds-fti ( string varchar(N), id oid );
-
-Don't change the *names* of the columns, the varchar() can in fact also
-be of text-type. If you do use varchar, make sure the largest possible
-sub-string will fit.
-
-The create the function that contains the trigger::
-
-	create function fti() returns opaque as
-	    '/path/to/fti.so' language 'C';
-
-And finally define the trigger on the 'cds' table:
-
-	create trigger cds-fti-trigger after update or insert or delete on cds
-	    for each row execute procedure fti(cds-fti, artist, title);
-
-Here, the trigger will be defined on table 'cds', it will create
-sub-strings from the fields 'artist' and 'title', and it will place 
-those sub-strings in the table 'cds-fti'.
-
-Now populate the table 'cds'. This will also populate the table 'cds-fti'.
-It's fastest to populate the table *before* you create the indices.  Use the
-supplied 'fti.pl' to assist you with this.
-
-Before you start using the system, you should at least have the following
-indices:
-
-	create index cds-fti-idx on cds-fti (string); -- String matching
-	create index cds-fti-idx on cds-fti (id);     -- For deleting a cds row
-	create index cds-oid-idx on cds (oid);			 -- For joining cds to cds-fti
-
-To get the most performance out of this, you should have 'cds-fti'
-clustered on disk, ie. all rows with the same sub-strings should be
-close to each other. There are 3 ways of doing this:
-
-1. After you have created the indices, execute 'cluster cds-fti-idx on cds-fti'.
-2. Do a 'select * into tmp-table from cds-fti order by string' *before*
-   you create the indices, then 'drop table cds-fti' and
-   'alter table tmp-table rename to cds-fti'
-3. *Before* creating indices, dump the contents of the cds-fti table using
-   'pg_dump -a -t cds-fti dbase-name', remove the \connect
-   from the beginning and the \. from the end, and sort it using the
-   UNIX 'sort' program, and reload the data.
-
-Method 1 is very slow, 2 a lot faster, and for very large tables, 3 is
-preferred.
-
-
-BENCH:
-~~~~~
-
-Maarten Boekhold <maartenb@dutepp0.et.tudelft.nl>
-The following data was generated by the 'timings.sh' script included
-in this directory. It uses a very large table with music-related
-articles as a source for the fti-table. The tables used are:
-
-product    : contains product information  :   540.429 rows
-artist_fti : fti table for product         : 4.501.321 rows
-clustered  : same as above, only clustered : 4.501.321 rows 
-
-A sequential scan of the artist_fti table (and thus also the clustered table)
-takes around 6:16 minutes....
-
-Unfortunately I cannot provide anybody else with this test-data, since I
-am not allowed to redistribute the data (it's a database being sold by
-a couple of wholesale companies). Anyways, it's megabytes, so you probably
-wouldn't want it in this distribution anyways.
-
-I haven't tested this with less data.
-
-The test-machine is a Pentium 133, 64 MB, Linux 2.0.32 with the database
-on a 'QUANTUM BIGFOOT_CY4320A, 4134MB w/67kB Cache, CHS=8960/15/63'. This
-is a very slow disk.
-
-The postmaster was running with:
-
-        postmaster -i -b /usr/local/pgsql/bin/postgres -S 1024 -B 256 \
-                -o -o /usr/local/pgsql/debug-output -F -d 1 
-
-('trashing' means a 'select count(*) from artist_fti' to completely trash
-any disk-caches and buffers....)
-
-TESTING ON UNCLUSTERED FTI
-trashing
-1: ^lapton and ^ric           : 0.050u 0.000s 5m37.484s 0.01%
-2: ^lapton and ^ric           : 0.050u 0.030s 5m32.447s 0.02%
-3: ^lapton and ^ric           : 0.030u 0.020s 5m28.822s 0.01%
-trashing
-1: ^lling and ^tones          : 0.020u 0.030s 0m54.313s 0.09%
-2: ^lling and ^tones          : 0.040u 0.030s 0m5.057s 1.38%
-3: ^lling and ^tones          : 0.010u 0.050s 0m2.072s 2.89%
-trashing
-1: ^aughan and ^evie          : 0.020u 0.030s 0m26.241s 0.19%
-2: ^aughan and ^evie          : 0.050u 0.010s 0m1.316s 4.55%
-3: ^aughan and ^evie          : 0.030u 0.020s 0m1.029s 4.85%
-trashing
-1: ^lling                     : 0.040u 0.010s 0m55.104s 0.09%
-2: ^lling                     : 0.030u 0.030s 0m4.716s 1.27%
-3: ^lling                     : 0.040u 0.010s 0m2.157s 2.31%
-trashing
-1: ^stev and ^ray and ^vaugh  : 0.040u 0.000s 1m5.630s 0.06%
-2: ^stev and ^ray and ^vaugh  : 0.050u 0.020s 1m3.561s 0.11%
-3: ^stev and ^ray and ^vaugh  : 0.050u 0.010s 1m5.923s 0.09%
-trashing
-1: ^lling (no join)           : 0.050u 0.020s 0m24.139s 0.28%
-2: ^lling (no join)           : 0.040u 0.040s 0m1.087s 7.35%
-3: ^lling (no join)           : 0.020u 0.030s 0m0.772s 6.48%
-trashing
-1: ^vaughan (no join)         : 0.040u 0.030s 0m9.075s 0.77%
-2: ^vaughan (no join)         : 0.030u 0.010s 0m0.609s 6.56%
-3: ^vaughan (no join)         : 0.040u 0.010s 0m0.503s 9.94%
-trashing
-1: ^rol (no join)             : 0.020u 0.030s 0m49.898s 0.10%
-2: ^rol (no join)             : 0.030u 0.020s 0m3.136s 1.59%
-3: ^rol (no join)             : 0.030u 0.020s 0m1.231s 4.06%
-
-TESTING ON CLUSTERED FTI
-trashing
-1: ^lapton and ^ric           : 0.020u 0.020s 2m17.120s 0.02%
-2: ^lapton and ^ric           : 0.030u 0.020s 2m11.767s 0.03%
-3: ^lapton and ^ric           : 0.040u 0.010s 2m8.128s 0.03%
-trashing
-1: ^lling and ^tones          : 0.020u 0.030s 0m18.179s 0.27%
-2: ^lling and ^tones          : 0.030u 0.010s 0m1.897s 2.10%
-3: ^lling and ^tones          : 0.040u 0.010s 0m1.619s 3.08%
-trashing
-1: ^aughan and ^evie          : 0.070u 0.010s 0m11.765s 0.67%
-2: ^aughan and ^evie          : 0.040u 0.010s 0m1.198s 4.17%
-3: ^aughan and ^evie          : 0.030u 0.020s 0m0.872s 5.73%
-trashing
-1: ^lling                     : 0.040u 0.000s 0m28.623s 0.13%
-2: ^lling                     : 0.030u 0.010s 0m2.339s 1.70%
-3: ^lling                     : 0.030u 0.010s 0m1.975s 2.02%
-trashing
-1: ^stev and ^ray and ^vaugh  : 0.020u 0.010s 0m17.667s 0.16%
-2: ^stev and ^ray and ^vaugh  : 0.030u 0.010s 0m3.745s 1.06%
-3: ^stev and ^ray and ^vaugh  : 0.030u 0.020s 0m3.439s 1.45%
-trashing
-1: ^lling (no join)           : 0.020u 0.040s 0m2.218s 2.70%
-2: ^lling (no join)           : 0.020u 0.020s 0m0.506s 7.90%
-3: ^lling (no join)           : 0.030u 0.030s 0m0.510s 11.76%
-trashing
-1: ^vaughan (no join)         : 0.040u 0.050s 0m2.048s 4.39%
-2: ^vaughan (no join)         : 0.030u 0.020s 0m0.332s 15.04%
-3: ^vaughan (no join)         : 0.040u 0.010s 0m0.318s 15.72%
-trashing
-1: ^rol (no join)             : 0.020u 0.030s 0m2.384s 2.09%
-2: ^rol (no join)             : 0.020u 0.030s 0m0.676s 7.39%
-3: ^rol (no join)             : 0.020u 0.030s 0m0.697s 7.17%
diff --git a/contrib/fulltextindex/TODO b/contrib/fulltextindex/TODO
deleted file mode 100644
index a1b359256f..0000000000
--- a/contrib/fulltextindex/TODO
+++ /dev/null
@@ -1 +0,0 @@
-Place "stop" words in lookup table
diff --git a/contrib/fulltextindex/fti.c b/contrib/fulltextindex/fti.c
deleted file mode 100644
index aabb2caf9f..0000000000
--- a/contrib/fulltextindex/fti.c
+++ /dev/null
@@ -1,443 +0,0 @@
-#include "postgres.h"
-
-#include <ctype.h>
-
-#include "executor/spi.h"
-#include "commands/trigger.h"
-
-/*
- *	Trigger function accepts variable number of arguments:
- *
- *		1. relation in which to store the substrings
- *		2. fields to extract substrings from
- *
- *	The relation in which to insert *must* have the following layout:
- *
- *		string		varchar(#)
- *		id			oid
- *
- *	 where # is the largest size of the varchar columns being indexed
- *
- *	Example:
- *
- *	-- Create the SQL function based on the compiled shared object
- *	create function fti() returns opaque as
- *	  '/usr/local/pgsql/lib/contrib/fti.so' language 'C';
- *
- *	-- Create the FTI table
- *	create table product_fti (string varchar(255), id oid);
- *
- *	-- Create an index to assist string matches
- *	create index product_fti_string_idx on product_fti (string);
- *
- *	-- Create an index to assist trigger'd deletes
- *	create index product_fti_id_idx on product_fti (id);
- *
- *	-- Create an index on the product oid column to assist joins
- *	-- between the fti table and the product table
- *	create index product_oid_idx on product (oid);
- *
- *	-- Create the trigger to perform incremental changes to the full text index.
- *	create trigger product_fti_trig after update or insert or delete on product
- *	for each row execute procedure fti(product_fti, title, artist);
- *									   ^^^^^^^^^^^
- *									   table where full text index is stored
- *													^^^^^^^^^^^^^
- *													columns to index in the base table
- *
- *	After populating 'product', try something like:
- *
- *	SELECT DISTINCT(p.*) FROM product p, product_fti f1, product_fti f2 WHERE
- *	f1.string ~ '^slippery' AND f2.string ~ '^wet' AND p.oid=f1.id AND p.oid=f2.id;
- *
- *	To check that your indicies are being used correctly, make sure you
- *	EXPLAIN SELECT ... your test query above.
- *
- * CHANGELOG
- * ---------
- *
- *	august 3 2001
- *				 Extended fti function to accept more than one column as a
- *				 parameter and all specified columns are indexed.  Changed
- *				 all uses of sprintf to snprintf.  Made error messages more
- *				 consistent.
- *
- *	march 4 1998 Changed breakup() to return less substrings. Only breakup
- *				 in word parts which are in turn shortened from the start
- *				 of the word (ie. word, ord, rd)
- *				 Did allocation of substring buffer outside of breakup()
- *
- *	oct. 5 1997, fixed a bug in string breakup (where there are more nonalpha
- *				 characters between words then 1).
- *
- *	oct 4-5 1997 implemented the thing, at least the basic functionallity
- *				 of it all....
- *
- * TODO
- * ----
- *
- *	 prevent generating duplicate words for an oid in the fti table
- *	 save a plan for deletes
- *	 create a function that will make the index *after* we have populated
- *	 the main table (probably first delete all contents to be sure there's
- *	 nothing in it, then re-populate the fti-table)
- *
- *	 can we do something with operator overloading or a seperate function
- *	 that can build the final query automatigally?
- */
-
-#define MAX_FTI_QUERY_LENGTH 8192
-
-extern Datum fti(PG_FUNCTION_ARGS);
-static char *breakup(char *, char *);
-static bool is_stopword(char *);
-
-static bool new_tuple = false;
-
-
-#ifdef USE_STOP_WORDS
-
-/* THIS LIST MUST BE IN SORTED ORDER, A BINARY SEARCH IS USED!!!! */
-char	   *StopWords[] = {		/* list of words to skip in indexing */
-	"no",
-	"the",
-	"yes"
-};
-#endif   /* USE_STOP_WORDS */
-
-/* stuff for caching query-plans, stolen from contrib/spi/\*.c */
-typedef struct
-{
-	char	   *ident;
-	int			nplans;
-	void	  **splan;
-}	EPlan;
-
-static EPlan *InsertPlans = NULL;
-static EPlan *DeletePlans = NULL;
-static int	nInsertPlans = 0;
-static int	nDeletePlans = 0;
-
-static EPlan *find_plan(char *ident, EPlan ** eplan, int *nplans);
-
-/***********************************************************************/
-PG_FUNCTION_INFO_V1(fti);
-
-Datum
-fti(PG_FUNCTION_ARGS)
-{
-	TriggerData *trigdata;
-	Trigger    *trigger;		/* to get trigger name */
-	int			nargs;			/* # of arguments */
-	char	  **args;			/* arguments */
-	char	   *relname;		/* triggered relation name */
-	Relation	rel;			/* triggered relation */
-	char	   *indexname;		/* name of table for substrings */
-	HeapTuple	rettuple = NULL;
-	TupleDesc	tupdesc;		/* tuple description */
-	bool		isinsert = false;
-	bool		isdelete = false;
-	int			ret;
-	char		query[MAX_FTI_QUERY_LENGTH];
-	Oid			oid;
-
-	/*
-	 * FILE		 *debug;
-	 */
-
-	/*
-	 * debug = fopen("/dev/xconsole", "w"); fprintf(debug, "FTI: entered
-	 * function\n"); fflush(debug);
-	 */
-
-	if (!CALLED_AS_TRIGGER(fcinfo))
-		elog(ERROR, "Full Text Indexing: Not fired by trigger manager");
-
-	/* It's safe to cast now that we've checked */
-	trigdata = (TriggerData *) fcinfo->context;
-
-	if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
-		elog(ERROR, "Full Text Indexing: Can't process STATEMENT events");
-	if (TRIGGER_FIRED_BEFORE(trigdata->tg_event))
-		elog(ERROR, "Full Text Indexing: Must be fired AFTER event");
-
-	if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event))
-		isinsert = true;
-	if (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event))
-	{
-		isdelete = true;
-		isinsert = true;
-	}
-	if (TRIGGER_FIRED_BY_DELETE(trigdata->tg_event))
-		isdelete = true;
-
-	trigger = trigdata->tg_trigger;
-	rel = trigdata->tg_relation;
-	relname = SPI_getrelname(rel);
-	rettuple = trigdata->tg_trigtuple;
-	if (isdelete && isinsert)	/* is an UPDATE */
-		rettuple = trigdata->tg_newtuple;
-
-	if ((ret = SPI_connect()) < 0)
-		elog(ERROR, "Full Text Indexing: SPI_connect: Failed, returned %d\n", ret);
-
-	nargs = trigger->tgnargs;
-	if (nargs < 2)
-		elog(ERROR, "Full Text Indexing: Trigger must have at least 2 arguments\n");
-
-	args = trigger->tgargs;
-	indexname = args[0];
-	tupdesc = rel->rd_att;		/* what the tuple looks like (?) */
-
-	/* get oid of current tuple, needed by all, so place here */
-	oid = rettuple->t_data->t_oid;
-	if (!OidIsValid(oid))
-		elog(ERROR, "Full Text Indexing: Oid of current tuple is invalid");
-
-	if (isdelete)
-	{
-		void	   *pplan;
-		Oid		   *argtypes;
-		Datum		values[1];
-		EPlan	   *plan;
-		int			i;
-
-		snprintf(query, MAX_FTI_QUERY_LENGTH, "D%s", indexname);
-		for (i = 1; i < nargs; i++)
-			snprintf(query, MAX_FTI_QUERY_LENGTH, "%s$%s", query, args[i]);
-
-		plan = find_plan(query, &DeletePlans, &nDeletePlans);
-		if (plan->nplans <= 0)
-		{
-			argtypes = (Oid *) palloc(sizeof(Oid));
-
-			argtypes[0] = OIDOID;
-
-			snprintf(query, MAX_FTI_QUERY_LENGTH, "DELETE FROM %s WHERE id = $1", indexname);
-			pplan = SPI_prepare(query, 1, argtypes);
-			if (!pplan)
-				elog(ERROR, "Full Text Indexing: SPI_prepare: Returned NULL in delete");
-			pplan = SPI_saveplan(pplan);
-			if (pplan == NULL)
-				elog(ERROR, "Full Text Indexing: SPI_saveplan: Returned NULL in delete");
-
-			plan->splan = (void **) malloc(sizeof(void *));
-			*(plan->splan) = pplan;
-			plan->nplans = 1;
-		}
-
-		values[0] = oid;
-
-		ret = SPI_execp(*(plan->splan), values, NULL, 0);
-		if (ret != SPI_OK_DELETE)
-			elog(ERROR, "Full Text Indexing: SPI_execp: Error executing plan in delete");
-	}
-
-	if (isinsert)
-	{
-		char	   *substring;
-		char	   *column;
-		void	   *pplan;
-		Oid		   *argtypes;
-		Datum		values[2];
-		int			colnum;
-		struct varlena *data;
-		EPlan	   *plan;
-		int			i;
-		char	   *buff;
-		char	   *string;
-
-		snprintf(query, MAX_FTI_QUERY_LENGTH, "I%s", indexname);
-		for (i = 1; i < nargs; i++)
-			snprintf(query, MAX_FTI_QUERY_LENGTH, "%s$%s", query, args[i]);
-
-		plan = find_plan(query, &InsertPlans, &nInsertPlans);
-
-		/* no plan yet, so allocate mem for argtypes */
-		if (plan->nplans <= 0)
-		{
-			argtypes = (Oid *) palloc(2 * sizeof(Oid));
-
-			argtypes[0] = VARCHAROID;	/* create table t_name (string
-										 * varchar, */
-			argtypes[1] = OIDOID;		/* id	  oid);    */
-
-			/* prepare plan to gain speed */
-			snprintf(query, MAX_FTI_QUERY_LENGTH, "INSERT INTO %s (string, id) VALUES ($1, $2)",
-					 indexname);
-			pplan = SPI_prepare(query, 2, argtypes);
-			if (!pplan)
-				elog(ERROR, "Full Text Indexing: SPI_prepare: Returned NULL in insert");
-
-			pplan = SPI_saveplan(pplan);
-			if (pplan == NULL)
-				elog(ERROR, "Full Text Indexing: SPI_saveplan: Returned NULL in insert");
-
-			plan->splan = (void **) malloc(sizeof(void *));
-			*(plan->splan) = pplan;
-			plan->nplans = 1;
-		}
-
-		/* prepare plan for query */
-		for (i = 0; i < nargs - 1; i++)
-		{
-			colnum = SPI_fnumber(tupdesc, args[i + 1]);
-			if (colnum == SPI_ERROR_NOATTRIBUTE)
-				elog(ERROR, "Full Text Indexing: SPI_fnumber: Column '%s' of '%s' not found", args[i + 1], indexname);
-
-			/* Get the char* representation of the column */
-			column = SPI_getvalue(rettuple, tupdesc, colnum);
-
-			/* make sure we don't try to index NULL's */
-			if (column)
-			{
-				string = column;
-				while (*string != '\0')
-				{
-					*string = tolower((unsigned char) *string);
-					string++;
-				}
-
-				data = (struct varlena *) palloc(sizeof(int32) + strlen(column) +1);
-				buff = palloc(strlen(column) + 1);
-				/* saves lots of calls in while-loop and in breakup() */
-
-				new_tuple = true;
-
-				while ((substring = breakup(column, buff)))
-				{
-					int			l;
-
-					l = strlen(substring);
-
-					data->vl_len = l + sizeof(int32);
-					memcpy(VARDATA(data), substring, l);
-					values[0] = PointerGetDatum(data);
-					values[1] = oid;
-
-					ret = SPI_execp(*(plan->splan), values, NULL, 0);
-					if (ret != SPI_OK_INSERT)
-						elog(ERROR, "Full Text Indexing: SPI_execp: Error executing plan in insert");
-				}
-				pfree(buff);
-				pfree(data);
-			}
-		}
-	}
-
-	SPI_finish();
-	return PointerGetDatum(rettuple);
-}
-
-static char *
-breakup(char *string, char *substring)
-{
-	static char *last_start;
-	static char *cur_pos;
-
-	if (new_tuple)
-	{
-		cur_pos = last_start = &string[strlen(string) - 1];
-		new_tuple = false;		/* don't initialize this next time */
-	}
-
-	while (cur_pos > string)	/* don't read before start of 'string' */
-	{
-		/*
-		 * skip pieces at the end of a string that are not alfa-numeric
-		 * (ie. 'string$%^&', last_start first points to '&', and after
-		 * this to 'g'
-		 */
-		if (!isalnum((unsigned char) *last_start))
-		{
-			while (!isalnum((unsigned char) *last_start) &&
-				   last_start > string)
-				last_start--;
-			cur_pos = last_start;
-		}
-
-		cur_pos--;				/* substrings are at minimum 2 characters
-								 * long */
-
-		if (isalnum((unsigned char) *cur_pos))
-		{
-			/* Houston, we have a substring! :) */
-			memcpy(substring, cur_pos, last_start - cur_pos + 1);
-			substring[last_start - cur_pos + 1] = '\0';
-			if (!is_stopword(substring))
-				return substring;
-		}
-		else
-		{
-			last_start = cur_pos - 1;
-			cur_pos = last_start;
-		}
-	}
-
-	return NULL;				/* we've processed all of 'string' */
-}
-
-/* copied from src/backend/parser/keywords.c and adjusted for our situation*/
-static bool
-is_stopword(char *text)
-{
-#ifdef USE_STOP_WORDS
-	char	  **StopLow;		/* for list of stop-words */
-	char	  **StopHigh;
-	char	  **StopMiddle;
-	int			difference;
-
-	StopLow = &StopWords[0];	/* initialize stuff for binary search */
-	StopHigh = endof(StopWords);
-
-	/* Loop invariant: *StopLow <= text < *StopHigh */
-
-	while (StopLow < StopHigh)
-	{
-		StopMiddle = StopLow + (StopHigh - StopLow) / 2;
-		difference = strcmp(*StopMiddle, text);
-		if (difference == 0)
-			return (true);
-		else if (difference < 0)
-			StopLow = StopMiddle + 1;
-		else
-			StopHigh = StopMiddle;
-	}
-#endif   /* USE_STOP_WORDS */
-
-	return (false);
-}
-
-/* for caching of query plans, stolen from contrib/spi/\*.c */
-static EPlan *
-find_plan(char *ident, EPlan ** eplan, int *nplans)
-{
-	EPlan	   *newp;
-	int			i;
-
-	if (*nplans > 0)
-	{
-		for (i = 0; i < *nplans; i++)
-		{
-			if (strcmp((*eplan)[i].ident, ident) == 0)
-				break;
-		}
-		if (i != *nplans)
-			return (*eplan + i);
-		*eplan = (EPlan *) realloc(*eplan, (i + 1) * sizeof(EPlan));
-		newp = *eplan + i;
-	}
-	else
-	{
-		newp = *eplan = (EPlan *) malloc(sizeof(EPlan));
-		(*nplans) = i = 0;
-	}
-
-	newp->ident = (char *) malloc(strlen(ident) + 1);
-	strcpy(newp->ident, ident);
-	newp->nplans = 0;
-	newp->splan = NULL;
-	(*nplans)++;
-
-	return (newp);
-}
diff --git a/contrib/fulltextindex/fti.pl b/contrib/fulltextindex/fti.pl
deleted file mode 100644
index 58080a5425..0000000000
--- a/contrib/fulltextindex/fti.pl
+++ /dev/null
@@ -1,209 +0,0 @@
-#!/usr/bin/perl
-#
-# This script substracts all suffixes of all words in a specific column in a table
-# and generates output that can be loaded into a new table with the
-# psql '\copy' command. The new table should have the following structure:
-#
-#	create table tab (
-#		string text,
-#		id oid
-#	);
-#
-# Note that you cannot use 'copy' (the SQL-command) directly, because
-# there's no '\.' included at the end of the output.
-#
-# The output can be fed through the UNIX commands 'uniq' and 'sort'
-# to generate the smallest and sorted output to populate the fti-table.
-#
-# Example:
-#
-# 	fti.pl -u -d mydb -t mytable -c mycolumn,mycolumn2 -f myfile
-#	sort -o myoutfile myfile
-#	uniq myoutfile sorted-file
-#
-# 	psql -u mydb
-#
-#		\copy my_fti_table from myfile
-#
-#  		create index fti_idx on my_fti_table (string,id);
-#
-#		create function fti() returns opaque as
-#			'/path/to/fti/file/fti.so'
-#		language 'C';
-#
-#		create trigger my_fti_trigger after update or insert or delete
-#			on mytable
-#				for each row execute procedure fti(my_fti_table, mycolumn);
-#
-# Make sure you have an index on mytable(oid) to be able to do somewhat
-# efficient substring searches.
-
-#use lib '/usr/local/pgsql/lib/perl5/';
-use lib '/mnt/web/guide/postgres/lib/perl5/site_perl';
-use Pg;
-use Getopt::Std;
-
-$PGRES_EMPTY_QUERY    = 0 ;
-$PGRES_COMMAND_OK     = 1 ;
-$PGRES_TUPLES_OK      = 2 ;
-$PGRES_COPY_OUT       = 3 ;
-$PGRES_COPY_IN        = 4 ;
-$PGRES_BAD_RESPONSE   = 5 ;
-$PGRES_NONFATAL_ERROR = 6 ;
-$PGRES_FATAL_ERROR    = 7 ;
-
-# the minimum length of word to include in the full text index
-$MIN_WORD_LENGTH = 2;
-
-# the minimum length of the substrings in the full text index
-$MIN_SUBSTRING_LENGTH = 2;
-
-$[ = 0; # make sure string offsets start at 0
-
-sub break_up {
-	my $string = pop @_;
-
-	# convert strings to lower case
-	$string = lc($string);
-	@strings = split(/\W+/, $string);
-	@subs = ();
-
-	foreach $s (@strings) {
-		$len = length($s);
-		next if ($len <= $MIN_WORD_LENGTH);
-		for ($i = 0; $i <= $len - $MIN_SUBSTRING_LENGTH; $i++) {
-			$tmp = substr($s, $i);
-			push(@subs, $tmp);
-		}
-	}
-
-	return @subs;
-}
-
-sub connect_db {
-	my $dbname = shift @_;
-	my $user   = shift @_;
-	my $passwd = shift @_;
-
-	if (!defined($dbname) || $dbname eq "") {
-		return 1;
-	}
-	$connect_string = "dbname=$dbname";
-
-	if ($user ne "") {
-		if ($passwd eq "") {
-			return 0;
-		}
-		$connect_string = "$connect_string user=$user password=$passwd ".
-		  "authtype=password";
-	}
-	
-	$PG_CONN = PQconnectdb($connect_string);
-
-	if (PQstatus($PG_CONN)) {
-		print STDERR "Couldn't make connection with database!\n";
-		print STDERR PQerrorMessage($PG_CONN), "\n";
-		return 0;
-	}
-
-	return 1;
-}
-
-sub quit_prog {
-	close(OUT);
-	unlink $opt_f;
-	if (defined($PG_CONN)) {
-		PQfinish($PG_CONN);
-	}
-	exit 1;
-}
-
-sub get_username {
-	print "Username: ";
-	chop($n = <STDIN>);
-
-    return $n;;
-}
-
-sub get_password {
-	print "Password: ";
-
-	system("stty -echo < /dev/tty");
-	chop($pwd = <STDIN>);
-	print "\n";
-	system("stty echo < /dev/tty");
-
-	return $pwd;
-}
-
-sub main {
-	getopts('d:t:c:f:u');
-
-	if (!$opt_d || !$opt_t || !$opt_c || !$opt_f) {
-		print STDERR "usage: $0 [-u] -d database -t table -c column[,column...] ".
-		  "-f output-file\n";
-		return 1;
-	}
-
-	@cols = split(/,/, $opt_c);
-
-	if (defined($opt_u)) {
-		$uname = get_username();
-		$pwd   = get_password();
-	} else {
-		$uname = "";
-		$pwd   = "";
-	}
-
-	$SIG{'INT'} = 'quit_prog';
-	if (!connect_db($opt_d, $uname, $pwd)) {
-		print STDERR "Connecting to database failed!\n";
-		return 1;
-	}
-
-	if (!open(OUT, ">$opt_f")) {
-		print STDERR "Couldnt' open file '$opt_f' for output!\n";
-		return 1;
-	}
-
-	PQexec($PG_CONN, "begin");
-
-	$query = "declare C cursor for select (\"";
-	$query .= join("\" || ' ' || \"", @cols);
-	$query .= "\") as string, oid from $opt_t";
-	$res = PQexec($PG_CONN, $query);
-	if (!$res || (PQresultStatus($res) != $PGRES_COMMAND_OK)) {
-		print STDERR "Error declaring cursor!\n";
-		print STDERR PQerrorMessage($PG_CONN), "\n";
-		PQfinish($PG_CONN);
-		return 1;
-	}
-	PQclear($res);
-
-	$query = "fetch in C";
-	while (($res = PQexec($PG_CONN, $query)) &&
-		   (PQresultStatus($res) == $PGRES_TUPLES_OK) &&
-		   (PQntuples($res) == 1)) {
-		$col = PQgetvalue($res, 0, 0);
-		$oid = PQgetvalue($res, 0, 1);
-
-		@subs = break_up($col);
-		foreach $i (@subs) {
-			print OUT "$i\t$oid\n";
-		}
-	}
-
-	if (!$res || (PQresultStatus($res) != PGRES_TUPLES_OK)) {
-		print STDERR "Error retrieving data from backend!\n";
-		print STDERR PQerrorMEssage($PG_CONN), "\n";
-		PQfinish($PG_CONN);
-		return 1;
-	}
-
-	PQclear($res);
-	PQfinish($PG_CONN);
-
-	return 0;
-}
-
-exit main();
diff --git a/contrib/fulltextindex/fti.sql.in b/contrib/fulltextindex/fti.sql.in
deleted file mode 100644
index e0da2353c5..0000000000
--- a/contrib/fulltextindex/fti.sql.in
+++ /dev/null
@@ -1,3 +0,0 @@
-create function fti() returns opaque as
-	'MODULE_PATHNAME'
-	language 'C';
\ No newline at end of file
diff --git a/contrib/fulltextindex/timings.sh b/contrib/fulltextindex/timings.sh
deleted file mode 100755
index ad1495128c..0000000000
--- a/contrib/fulltextindex/timings.sh
+++ /dev/null
@@ -1,350 +0,0 @@
-#!/bin/sh
-
-PATH=${PATH}:/usr/local/pgsql/bin
-TIMEFORMAT="%3Uu %3Ss %lR %P%%"
-export PATH TIMEFORMAT
-
-case "$1" in
-  -n)
-	  trashing=0
-	  ;;
-  *)
-	 trashing=1
-	 ;;
-esac
-
-echo "TESTING ON UNCLUSTERED FTI"
-
-# trash disk
-if [ $trashing = 1 ]
-then
-  echo "trashing"
-  psql -q -n -o /dev/null -c "select count(*) from product;" test
-else
-  echo
-fi
-
-Q="select count(p.oid) from product p, artist_fti f1, artist_fti f2
-        where
-                f1.string ~ '^lapton' and f2.string ~ '^ric' and
-                f1.id=p.oid and f2.id=p.oid;"
-
-echo -n "1: ^lapton and ^ric           : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "2: ^lapton and ^ric           : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "3: ^lapton and ^ric           : "
-time psql -q -n -o /dev/null -c "$Q" test
-
-# trash disk
-if [ $trashing = 1 ]
-then
-  echo "trashing"
-  psql -q -n -o /dev/null -c "select count(*) from product;" test
-else
-  echo
-fi
-
-Q="select count(p.oid) from product p, artist_fti f1, artist_fti f2
-        where
-                f1.string ~ '^lling' and f2.string ~ '^tones' and
-                f1.id=p.oid and f2.id=p.oid;"
-
-echo -n "1: ^lling and ^tones          : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "2: ^lling and ^tones          : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "3: ^lling and ^tones          : "
-time psql -q -n -o /dev/null -c "$Q" test
-
-# trash disk
-if [ $trashing = 1 ]
-then
-  echo "trashing"
-  psql -q -n -o /dev/null -c "select count(*) from product;" test
-else
-  echo
-fi
-
-Q="select count(p.oid) from product p, artist_fti f1, artist_fti f2
-        where
-                f1.string ~ '^aughan' and f2.string ~ '^evie' and
-                f1.id=p.oid and f2.id=p.oid;"
-
-echo -n "1: ^aughan and ^evie          : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "2: ^aughan and ^evie          : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "3: ^aughan and ^evie          : "
-time psql -q -n -o /dev/null -c "$Q" test
-
-# trash disk
-if [ $trashing = 1 ]
-then
-  echo "trashing"
-  psql -q -n -o /dev/null -c "select count(*) from product;" test
-else
-  echo
-fi
-
-Q="select count(p.oid) from product p, artist_fti f1
-        where
-                f1.string ~ '^lling' and 
-                p.oid=f1.id;"
-
-echo -n "1: ^lling                     : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "2: ^lling                     : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "3: ^lling                     : "
-time psql -q -n -o /dev/null -c "$Q" test
-
-# trash disk
-if [ $trashing = 1 ]
-then
-  echo "trashing"
-  psql -q -n -o /dev/null -c "select count(*) from product;" test
-else
-  echo
-fi
-
-Q="select count(p.oid) from product p, artist_fti f1, artist_fti f2, artist_fti f3
-        where
-                f1.string ~ '^stev' and
-                f2.string ~ '^ray' and
-                f3.string ~ '^vaugh' and
-                p.oid=f1.id and p.oid=f2.id and p.oid=f3.id;"
-
-echo -n "1: ^stev and ^ray and ^vaugh  : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "2: ^stev and ^ray and ^vaugh  : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "3: ^stev and ^ray and ^vaugh  : "
-time psql -q -n -o /dev/null -c "$Q" test
-
-# trash disk
-if [ $trashing = 1 ]
-then
-  echo "trashing"
-  psql -q -n -o /dev/null -c "select count(*) from product;" test
-else
-  echo
-fi
-
-Q="select count(*) from artist_fti where string ~ '^lling';"
-
-echo -n "1: ^lling (no join)           : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "2: ^lling (no join)           : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "3: ^lling (no join)           : "
-time psql -q -n -o /dev/null -c "$Q" test
-
-# trash disk
-if [ $trashing = 1 ]
-then
-  echo "trashing"
-  psql -q -n -o /dev/null -c "select count(*) from product;" test
-else
-  echo
-fi
-
-Q="select count(*) from artist_fti where string ~ '^vaughan';"
-
-echo -n "1: ^vaughan (no join)         : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "2: ^vaughan (no join)         : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "3: ^vaughan (no join)         : "
-time psql -q -n -o /dev/null -c "$Q" test
-
-# trash disk
-if [ $trashing = 1 ]
-then
-  echo "trashing"
-  psql -q -n -o /dev/null -c "select count(*) from product;" test
-else
-  echo
-fi
-
-Q="select count(*) from artist_fti where string ~ '^rol';"
-
-echo -n "1: ^rol (no join)             : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "2: ^rol (no join)             : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "3: ^rol (no join)             : "
-time psql -q -n -o /dev/null -c "$Q" test
-
-echo
-echo "TESTING ON CLUSTERED FTI"
-
-# trash disk
-if [ $trashing = 1 ]
-then
-  echo "trashing"
-  psql -q -n -o /dev/null -c "select count(*) from product;" test
-else
-  echo
-fi
-
-Q="select count(p.oid) from product p, clustered f1, clustered f2
-        where
-                f1.string ~ '^lapton' and f2.string ~ '^ric' and
-                f1.id=p.oid and f2.id=p.oid;"
-
-echo -n "1: ^lapton and ^ric           : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "2: ^lapton and ^ric           : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "3: ^lapton and ^ric           : "
-time psql -q -n -o /dev/null -c "$Q" test
-
-# trash disk
-if [ $trashing = 1 ]
-then
-  echo "trashing"
-  psql -q -n -o /dev/null -c "select count(*) from product;" test
-else
-  echo
-fi
-
-Q="select count(p.oid) from product p, clustered f1, clustered f2
-        where
-                f1.string ~ '^lling' and f2.string ~ '^tones' and
-                f1.id=p.oid and f2.id=p.oid;"
-
-echo -n "1: ^lling and ^tones          : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "2: ^lling and ^tones          : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "3: ^lling and ^tones          : "
-time psql -q -n -o /dev/null -c "$Q" test
-
-# trash disk
-if [ $trashing = 1 ]
-then
-  echo "trashing"
-  psql -q -n -o /dev/null -c "select count(*) from product;" test
-else
-  echo
-fi
-
-Q="select count(p.oid) from product p, clustered f1, clustered f2
-        where
-                f1.string ~ '^aughan' and f2.string ~ '^evie' and
-                f1.id=p.oid and f2.id=p.oid;"
-
-echo -n "1: ^aughan and ^evie          : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "2: ^aughan and ^evie          : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "3: ^aughan and ^evie          : "
-time psql -q -n -o /dev/null -c "$Q" test
-
-# trash disk
-if [ $trashing = 1 ]
-then
-  echo "trashing"
-  psql -q -n -o /dev/null -c "select count(*) from product;" test
-else
-  echo
-fi
-
-Q="select count(p.oid) from product p, clustered f1
-        where
-                f1.string ~ '^lling' and 
-                p.oid=f1.id;"
-
-echo -n "1: ^lling                     : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "2: ^lling                     : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "3: ^lling                     : "
-time psql -q -n -o /dev/null -c "$Q" test
-
-# trash disk
-if [ $trashing = 1 ]
-then
-  echo "trashing"
-  psql -q -n -o /dev/null -c "select count(*) from product;" test
-else
-  echo
-fi
-
-Q="select count(p.oid) from product p, clustered f1, clustered f2, clustered f3
-        where
-                f1.string ~ '^stev' and
-                f2.string ~ '^ray' and
-                f3.string ~ '^vaugh' and
-                p.oid=f1.id and p.oid=f2.id and p.oid=f3.id;"
-
-echo -n "1: ^stev and ^ray and ^vaugh  : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "2: ^stev and ^ray and ^vaugh  : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "3: ^stev and ^ray and ^vaugh  : "
-time psql -q -n -o /dev/null -c "$Q" test
-
-# trash disk
-if [ $trashing = 1 ]
-then
-  echo "trashing"
-  psql -q -n -o /dev/null -c "select count(*) from product;" test
-else
-  echo
-fi
-
-Q="select count(*) from clustered where string ~ '^lling';"
-
-echo -n "1: ^lling (no join)           : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "2: ^lling (no join)           : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "3: ^lling (no join)           : "
-time psql -q -n -o /dev/null -c "$Q" test
-
-# trash disk
-if [ $trashing = 1 ]
-then
-  echo "trashing"
-  psql -q -n -o /dev/null -c "select count(*) from product;" test
-else
-  echo
-fi
-
-Q="select count(*) from clustered where string ~ '^vaughan';"
-
-echo -n "1: ^vaughan (no join)         : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "2: ^vaughan (no join)         : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "3: ^vaughan (no join)         : "
-time psql -q -n -o /dev/null -c "$Q" test
-
-# trash disk
-if [ $trashing = 1 ]
-then
-  echo "trashing"
-  psql -q -n -o /dev/null -c "select count(*) from product;" test
-else
-  echo
-fi
-
-Q="select count(*) from clustered where string ~ '^rol';"
-
-echo -n "1: ^rol (no join)             : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "2: ^rol (no join)             : "
-time psql -q -n -o /dev/null -c "$Q" test
-echo -n "3: ^rol (no join)             : "
-time psql -q -n -o /dev/null -c "$Q" test
-
-
-
-
-
-
-
-
-
diff --git a/contrib/fuzzystrmatch/Makefile b/contrib/fuzzystrmatch/Makefile
deleted file mode 100644
index 81d61de71c..0000000000
--- a/contrib/fuzzystrmatch/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/fuzzystrmatch/Makefile,v 1.2 2001/09/06 10:49:29 petere Exp $
-
-subdir = contrib/fuzzystrmatch
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-MODULES = fuzzystrmatch
-DATA_built = fuzzystrmatch.sql
-DOCS = README.fuzzystrmatch README.soundex
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/fuzzystrmatch/README.fuzzystrmatch b/contrib/fuzzystrmatch/README.fuzzystrmatch
deleted file mode 100644
index 8d310b4ade..0000000000
--- a/contrib/fuzzystrmatch/README.fuzzystrmatch
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * fuzzystrmatch.c
- *
- * Functions for "fuzzy" comparison of strings
- *
- * Copyright (c) Joseph Conway <joseph.conway@home.com>, 2001;
- *
- * levenshtein()
- * -------------
- * Written based on a description of the algorithm by Michael Gilleland
- * found at http://www.merriampark.com/ld.htm
- * Also looked at levenshtein.c in the PHP 4.0.6 distribution for
- * inspiration.
- *
- * metaphone()
- * -----------
- * Modified for PostgreSQL by Joe Conway.
- * Based on CPAN's "Text-Metaphone-1.96" by Michael G Schwern <schwern@pobox.com>
- * Code slightly modified for use as PostgreSQL function (palloc, elog, etc).
- * Metaphone was originally created by Lawrence Philips and presented in article
- * in "Computer Language" December 1990 issue.
- *
- * soundex()
- * -----------
- * Folded existing soundex contrib into this one. Renamed text_soundex() (C function)
- * to soundex() for consistency.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without a written agreement
- * is hereby granted, provided that the above copyright notice and this
- * paragraph and the following two paragraphs appear in all copies.
- * 
- * IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
- * LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
- * DOCUMENTATION, EVEN IF THE AUTHOR OR DISTRIBUTORS HAVE BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE AUTHOR AND DISTRIBUTORS HAS NO OBLIGATIONS TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- */
-
-
-Version 0.2 (7 August, 2001):
-  Functions to calculate the degree to which two strings match in a "fuzzy" way
-  Tested under Linux (Red Hat 6.2 and 7.0) and PostgreSQL 7.2devel
-
-Release Notes:
-
-  Version 0.2
-    - folded soundex contrib into this one
-
-  Version 0.1
-    - initial release    
-
-Installation:
-  Place these files in a directory called 'fuzzystrmatch' under 'contrib' in the PostgreSQL source tree. Then run:
-
-    make
-    make install
-
-  You can use fuzzystrmatch.sql to create the functions in your database of choice, e.g.
-
-    psql -U postgres template1 < fuzzystrmatch.sql
-
-  installs following functions into database template1:
-
-     levenshtein() - calculates the levenshtein distance between two strings
-     metaphone() - calculates the metaphone code of an input string
-
-Documentation
-==================================================================
-Name
-
-levenshtein -- calculates the levenshtein distance between two strings
-
-Synopsis
-
-levenshtein(text source, text target)
-
-Inputs
-
-  source
-    any text string, 255 characters max, NOT NULL
-
-  target
-    any text string, 255 characters max, NOT NULL
-
-Outputs
-
-  Returns int
-
-Example usage
-
-  select levenshtein('GUMBO','GAMBOL');
-
-==================================================================
-Name
-
-metaphone -- calculates the metaphone code of an input string
-
-Synopsis
-
-metaphone(text source, int max_output_length)
-
-Inputs
-
-  source
-    any text string, 255 characters max, NOT NULL
-
-  max_output_length
-    maximum length of the output metaphone code; if longer, the output
-    is truncated to this length
-
-Outputs
-
-  Returns text
-
-Example usage
-
-  select metaphone('GUMBO',4);
-
-==================================================================
--- Joe Conway
-
diff --git a/contrib/fuzzystrmatch/README.soundex b/contrib/fuzzystrmatch/README.soundex
deleted file mode 100644
index b9a6149542..0000000000
--- a/contrib/fuzzystrmatch/README.soundex
+++ /dev/null
@@ -1,62 +0,0 @@
-NOTE: Modified August 07, 2001 by Joe Conway. Updated for accuracy
-	after combining soundex code into the fuzzystrmatch contrib
----------------------------------------------------------------------
-The Soundex system is a method of matching similar sounding names
-(or any words) to the same code.  It was initially used by the
-United States Census in 1880, 1900, and 1910, but it has little use
-beyond English names (or the English pronunciation of names), and
-it is not a linguistic tool.
-
-The following are some usage examples:
-
-SELECT soundex('hello world!');
-
-CREATE TABLE s (nm text)\g
-
-insert into s values ('john')\g
-insert into s values ('joan')\g
-insert into s values ('wobbly')\g
-
-select * from s
-where soundex(nm) = soundex('john')\g
-
-select nm from s a, s b
-where soundex(a.nm) = soundex(b.nm)
-and a.oid <> b.oid\g
-
-CREATE FUNCTION text_sx_eq(text, text) RETURNS bool AS
-'select soundex($1) = soundex($2)'
-LANGUAGE 'sql'\g
-
-CREATE FUNCTION text_sx_lt(text,text) RETURNS bool AS
-'select soundex($1) < soundex($2)'
-LANGUAGE 'sql'\g
-
-CREATE FUNCTION text_sx_gt(text,text) RETURNS bool AS
-'select soundex($1) > soundex($2)'
-LANGUAGE 'sql';
-
-CREATE FUNCTION text_sx_le(text,text) RETURNS bool AS
-'select soundex($1) <= soundex($2)'
-LANGUAGE 'sql';
-
-CREATE FUNCTION text_sx_ge(text,text) RETURNS bool AS
-'select soundex($1) >= soundex($2)'
-LANGUAGE 'sql';
-
-CREATE FUNCTION text_sx_ne(text,text) RETURNS bool AS
-'select soundex($1) <> soundex($2)'
-LANGUAGE 'sql';
-
-DROP OPERATOR #= (text,text)\g
-
-CREATE OPERATOR #= (leftarg=text, rightarg=text, procedure=text_sx_eq,
-commutator=text_sx_eq)\g
-
-SELECT *
-FROM s
-WHERE text_sx_eq(nm,'john')\g
-
-SELECT *
-from s
-where s.nm #= 'john';
diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.c b/contrib/fuzzystrmatch/fuzzystrmatch.c
deleted file mode 100644
index fbb16f66b3..0000000000
--- a/contrib/fuzzystrmatch/fuzzystrmatch.c
+++ /dev/null
@@ -1,731 +0,0 @@
-/*
- * fuzzystrmatch.c
- *
- * Functions for "fuzzy" comparison of strings
- *
- * Copyright (c) Joseph Conway <joseph.conway@home.com>, 2001;
- *
- * levenshtein()
- * -------------
- * Written based on a description of the algorithm by Michael Gilleland
- * found at http://www.merriampark.com/ld.htm
- * Also looked at levenshtein.c in the PHP 4.0.6 distribution for
- * inspiration.
- *
- * metaphone()
- * -----------
- * Modified for PostgreSQL by Joe Conway.
- * Based on CPAN's "Text-Metaphone-1.96" by Michael G Schwern <schwern@pobox.com>
- * Code slightly modified for use as PostgreSQL function (palloc, elog, etc).
- * Metaphone was originally created by Lawrence Philips and presented in article
- * in "Computer Language" December 1990 issue.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without a written agreement
- * is hereby granted, provided that the above copyright notice and this
- * paragraph and the following two paragraphs appear in all copies.
- *
- * IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
- * LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
- * DOCUMENTATION, EVEN IF THE AUTHOR OR DISTRIBUTORS HAVE BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE AUTHOR AND DISTRIBUTORS HAS NO OBLIGATIONS TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- */
-
-#include "fuzzystrmatch.h"
-
-/*
- * Calculates Levenshtein Distance between two strings.
- * Uses simplest and fastest cost model only, i.e. assumes a cost of 1 for
- * each deletion, substitution, or insertion.
- */
-PG_FUNCTION_INFO_V1(levenshtein);
-Datum
-levenshtein(PG_FUNCTION_ARGS)
-{
-	char	   *str_s;
-	char	   *str_s0;
-	char	   *str_t;
-	int			cols = 0;
-	int			rows = 0;
-	int		   *u_cells;
-	int		   *l_cells;
-	int		   *tmp;
-	int			i;
-	int			j;
-
-	/*
-	 * Fetch the arguments. str_s is referred to as the "source" cols =
-	 * length of source + 1 to allow for the initialization column str_t
-	 * is referred to as the "target", rows = length of target + 1 rows =
-	 * length of target + 1 to allow for the initialization row
-	 */
-	str_s = DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(PG_GETARG_TEXT_P(0))));
-	str_t = DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(PG_GETARG_TEXT_P(1))));
-
-	cols = strlen(str_s) + 1;
-	rows = strlen(str_t) + 1;
-
-	/*
-	 * Restrict the length of the strings being compared to something
-	 * reasonable because we will have to perform rows * cols
-	 * calcualtions. If longer strings need to be compared, increase
-	 * MAX_LEVENSHTEIN_STRLEN to suit (but within your tolerance for speed
-	 * and memory usage).
-	 */
-	if ((cols > MAX_LEVENSHTEIN_STRLEN + 1) || (rows > MAX_LEVENSHTEIN_STRLEN + 1))
-		elog(ERROR, "levenshtein: Arguments may not exceed %d characters in length", MAX_LEVENSHTEIN_STRLEN);
-
-	/*
-	 * If either rows or cols is 0, the answer is the other value. This
-	 * makes sense since it would take that many insertions the build a
-	 * matching string
-	 */
-
-	if (cols == 0)
-		PG_RETURN_INT32(rows);
-
-	if (rows == 0)
-		PG_RETURN_INT32(cols);
-
-	/*
-	 * Allocate two vectors of integers. One will be used for the "upper"
-	 * row, the other for the "lower" row. Initialize the "upper" row to
-	 * 0..cols
-	 */
-	u_cells = palloc(sizeof(int) * cols);
-	for (i = 0; i < cols; i++)
-		u_cells[i] = i;
-
-	l_cells = palloc(sizeof(int) * cols);
-
-	/*
-	 * Use str_s0 to "rewind" the pointer to str_s in the nested for loop
-	 * below
-	 */
-	str_s0 = str_s;
-
-	/*
-	 * Loop throught the rows, starting at row 1. Row 0 is used for the
-	 * initial "upper" row.
-	 */
-	for (j = 1; j < rows; j++)
-	{
-		/*
-		 * We'll always start with col 1, and initialize lower row col 0
-		 * to j
-		 */
-		l_cells[0] = j;
-
-		for (i = 1; i < cols; i++)
-		{
-			int			c = 0;
-			int			c1 = 0;
-			int			c2 = 0;
-			int			c3 = 0;
-
-			/*
-			 * The "cost" value is 0 if the character at the current col
-			 * position in the source string, matches the character at the
-			 * current row position in the target string; cost is 1
-			 * otherwise.
-			 */
-			c = ((CHAREQ(str_s, str_t)) ? 0 : 1);
-
-			/*
-			 * c1 is upper right cell plus 1
-			 */
-			c1 = u_cells[i] + 1;
-
-			/*
-			 * c2 is lower left cell plus 1
-			 */
-			c2 = l_cells[i - 1] + 1;
-
-			/*
-			 * c3 is cell diagonally above to the left plus "cost"
-			 */
-			c3 = u_cells[i - 1] + c;
-
-			/*
-			 * The lower right cell is set to the minimum of c1, c2, c3
-			 */
-			l_cells[i] = (c1 < c2 ? c1 : c2) < c3 ? (c1 < c2 ? c1 : c2) : c3;
-
-			/*
-			 * Increment the pointer to str_s
-			 */
-			NextChar(str_s);
-		}
-
-		/*
-		 * Lower row now becomes the upper row, and the upper row gets
-		 * reused as the new lower row.
-		 */
-		tmp = u_cells;
-		u_cells = l_cells;
-		l_cells = tmp;
-
-		/*
-		 * Increment the pointer to str_t
-		 */
-		NextChar(str_t);
-
-		/*
-		 * Rewind the pointer to str_s
-		 */
-		str_s = str_s0;
-	}
-
-	/*
-	 * Because the final value (at position row, col) was swapped from the
-	 * lower row to the upper row, that's where we'll find it.
-	 */
-	PG_RETURN_INT32(u_cells[cols - 1]);
-}
-
-/*
- * Calculates the metaphone of an input string.
- * Returns number of characters requested
- * (suggested value is 4)
- */
-PG_FUNCTION_INFO_V1(metaphone);
-Datum
-metaphone(PG_FUNCTION_ARGS)
-{
-	int			reqlen;
-	char	   *str_i;
-	size_t		str_i_len;
-	char	   *metaph;
-	text	   *result_text;
-	int			retval;
-
-	str_i = DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(PG_GETARG_TEXT_P(0))));
-	str_i_len = strlen(str_i);
-
-	if (str_i_len > MAX_METAPHONE_STRLEN)
-		elog(ERROR, "metaphone: Input string must not exceed %d characters", MAX_METAPHONE_STRLEN);
-	if (!(str_i_len > 0))
-		elog(ERROR, "metaphone: Input string length must be > 0");
-
-	reqlen = PG_GETARG_INT32(1);
-	if (reqlen > MAX_METAPHONE_STRLEN)
-		elog(ERROR, "metaphone: Requested Metaphone output length must not exceed %d characters", MAX_METAPHONE_STRLEN);
-	if (!(reqlen > 0))
-		elog(ERROR, "metaphone: Requested Metaphone output length must be > 0");
-
-	metaph = palloc(reqlen);
-	memset(metaph, '\0', reqlen);
-
-	retval = _metaphone(str_i, reqlen, &metaph);
-	if (retval == META_SUCCESS)
-	{
-		result_text = DatumGetTextP(DirectFunctionCall1(textin, CStringGetDatum(metaph)));
-		PG_RETURN_TEXT_P(result_text);
-	}
-	else
-	{
-		elog(ERROR, "metaphone: failure");
-
-		/*
-		 * Keep the compiler quiet
-		 */
-		PG_RETURN_NULL();
-	}
-}
-
-
-/*
- * Original code by Michael G Schwern starts here.
- * Code slightly modified for use as PostgreSQL
- * function (palloc, etc). Original includes
- * are rolled into fuzzystrmatch.h
- *------------------------------------------------------------------*/
-
-/* I suppose I could have been using a character pointer instead of
- * accesssing the array directly... */
-
-/* Look at the next letter in the word */
-#define Next_Letter (toupper((unsigned char) word[w_idx+1]))
-/* Look at the current letter in the word */
-#define Curr_Letter (toupper((unsigned char) word[w_idx]))
-/* Go N letters back. */
-#define Look_Back_Letter(n) \
-	(w_idx >= (n) ? toupper((unsigned char) word[w_idx-(n)]) : '\0')
-/* Previous letter.  I dunno, should this return null on failure? */
-#define Prev_Letter (Look_Back_Letter(1))
-/* Look two letters down.  It makes sure you don't walk off the string. */
-#define After_Next_Letter \
-	(Next_Letter != '\0' ? toupper((unsigned char) word[w_idx+2]) : '\0')
-#define Look_Ahead_Letter(n) toupper((unsigned char) Lookahead(word+w_idx, n))
-
-
-/* Allows us to safely look ahead an arbitrary # of letters */
-/* I probably could have just used strlen... */
-char
-Lookahead(char *word, int how_far)
-{
-	char		letter_ahead = '\0';	/* null by default */
-	int			idx;
-
-	for (idx = 0; word[idx] != '\0' && idx < how_far; idx++);
-	/* Edge forward in the string... */
-
-	letter_ahead = word[idx];	/* idx will be either == to how_far or at
-								 * the end of the string */
-	return letter_ahead;
-}
-
-
-/* phonize one letter */
-#define Phonize(c)	do {(*phoned_word)[p_idx++] = c;} while (0)
-/* Slap a null character on the end of the phoned word */
-#define End_Phoned_Word do {(*phoned_word)[p_idx] = '\0';} while (0)
-/* How long is the phoned word? */
-#define Phone_Len	(p_idx)
-
-/* Note is a letter is a 'break' in the word */
-#define Isbreak(c)	(!isalpha((unsigned char) (c)))
-
-
-int
-_metaphone(
- /* IN */
-		   char *word,
-		   int max_phonemes,
- /* OUT */
-		   char **phoned_word
-)
-{
-	int			w_idx = 0;		/* point in the phonization we're at. */
-	int			p_idx = 0;		/* end of the phoned phrase */
-
-	/*-- Parameter checks --*/
-
-	/*
-	 * Shouldn't be necessary, but left these here anyway jec Aug 3, 2001
-	 */
-
-	/* Negative phoneme length is meaningless */
-	if (!(max_phonemes > 0))
-		elog(ERROR, "metaphone: Requested output length must be > 0");
-
-	/* Empty/null string is meaningless */
-	if ((word == NULL) || !(strlen(word) > 0))
-		elog(ERROR, "metaphone: Input string length must be > 0");
-
-	/*-- Allocate memory for our phoned_phrase --*/
-	if (max_phonemes == 0)
-	{							/* Assume largest possible */
-		*phoned_word = palloc(sizeof(char) * strlen(word) +1);
-		if (!*phoned_word)
-			return META_ERROR;
-	}
-	else
-	{
-		*phoned_word = palloc(sizeof(char) * max_phonemes + 1);
-		if (!*phoned_word)
-			return META_ERROR;
-	}
-
-	/*-- The first phoneme has to be processed specially. --*/
-	/* Find our first letter */
-	for (; !isalpha((unsigned char) (Curr_Letter)); w_idx++)
-	{
-		/* On the off chance we were given nothing but crap... */
-		if (Curr_Letter == '\0')
-		{
-			End_Phoned_Word;
-			return META_SUCCESS;	/* For testing */
-		}
-	}
-
-	switch (Curr_Letter)
-	{
-			/* AE becomes E */
-		case 'A':
-			if (Next_Letter == 'E')
-			{
-				Phonize('E');
-				w_idx += 2;
-			}
-			/* Remember, preserve vowels at the beginning */
-			else
-			{
-				Phonize('A');
-				w_idx++;
-			}
-			break;
-			/* [GKP]N becomes N */
-		case 'G':
-		case 'K':
-		case 'P':
-			if (Next_Letter == 'N')
-			{
-				Phonize('N');
-				w_idx += 2;
-			}
-			break;
-
-			/*
-			 * WH becomes H, WR becomes R W if followed by a vowel
-			 */
-		case 'W':
-			if (Next_Letter == 'H' ||
-				Next_Letter == 'R')
-			{
-				Phonize(Next_Letter);
-				w_idx += 2;
-			}
-			else if (isvowel(Next_Letter))
-			{
-				Phonize('W');
-				w_idx += 2;
-			}
-			/* else ignore */
-			break;
-			/* X becomes S */
-		case 'X':
-			Phonize('S');
-			w_idx++;
-			break;
-			/* Vowels are kept */
-
-			/*
-			 * We did A already case 'A': case 'a':
-			 */
-		case 'E':
-		case 'I':
-		case 'O':
-		case 'U':
-			Phonize(Curr_Letter);
-			w_idx++;
-			break;
-		default:
-			/* do nothing */
-			break;
-	}
-
-
-
-	/* On to the metaphoning */
-	for (; Curr_Letter != '\0' &&
-		 (max_phonemes == 0 || Phone_Len < max_phonemes);
-		 w_idx++)
-	{
-		/*
-		 * How many letters to skip because an eariler encoding handled
-		 * multiple letters
-		 */
-		unsigned short int skip_letter = 0;
-
-
-		/*
-		 * THOUGHT:  It would be nice if, rather than having things
-		 * like... well, SCI.  For SCI you encode the S, then have to
-		 * remember to skip the C.	So the phonome SCI invades both S and
-		 * C.  It would be better, IMHO, to skip the C from the S part of
-		 * the encoding. Hell, I'm trying it.
-		 */
-
-		/* Ignore non-alphas */
-		if (!isalpha((unsigned char) (Curr_Letter)))
-			continue;
-
-		/* Drop duplicates, except CC */
-		if (Curr_Letter == Prev_Letter &&
-			Curr_Letter != 'C')
-			continue;
-
-		switch (Curr_Letter)
-		{
-				/* B -> B unless in MB */
-			case 'B':
-				if (Prev_Letter != 'M')
-					Phonize('B');
-				break;
-
-				/*
-				 * 'sh' if -CIA- or -CH, but not SCH, except SCHW. (SCHW
-				 * is handled in S) S if -CI-, -CE- or -CY- dropped if
-				 * -SCI-, SCE-, -SCY- (handed in S) else K
-				 */
-			case 'C':
-				if (MAKESOFT(Next_Letter))
-				{				/* C[IEY] */
-					if (After_Next_Letter == 'A' &&
-						Next_Letter == 'I')
-					{			/* CIA */
-						Phonize(SH);
-					}
-					/* SC[IEY] */
-					else if (Prev_Letter == 'S')
-					{
-						/* Dropped */
-					}
-					else
-						Phonize('S');
-				}
-				else if (Next_Letter == 'H')
-				{
-#ifndef USE_TRADITIONAL_METAPHONE
-					if (After_Next_Letter == 'R' ||
-						Prev_Letter == 'S')
-					{			/* Christ, School */
-						Phonize('K');
-					}
-					else
-						Phonize(SH);
-#else
-					Phonize(SH);
-#endif
-					skip_letter++;
-				}
-				else
-					Phonize('K');
-				break;
-
-				/*
-				 * J if in -DGE-, -DGI- or -DGY- else T
-				 */
-			case 'D':
-				if (Next_Letter == 'G' &&
-					MAKESOFT(After_Next_Letter))
-				{
-					Phonize('J');
-					skip_letter++;
-				}
-				else
-					Phonize('T');
-				break;
-
-				/*
-				 * F if in -GH and not B--GH, D--GH, -H--GH, -H---GH else
-				 * dropped if -GNED, -GN, else dropped if -DGE-, -DGI- or
-				 * -DGY- (handled in D) else J if in -GE-, -GI, -GY and
-				 * not GG else K
-				 */
-			case 'G':
-				if (Next_Letter == 'H')
-				{
-					if (!(NOGHTOF(Look_Back_Letter(3)) ||
-						  Look_Back_Letter(4) == 'H'))
-					{
-						Phonize('F');
-						skip_letter++;
-					}
-					else
-					{
-						/* silent */
-					}
-				}
-				else if (Next_Letter == 'N')
-				{
-					if (Isbreak(After_Next_Letter) ||
-						(After_Next_Letter == 'E' &&
-						 Look_Ahead_Letter(3) == 'D'))
-					{
-						/* dropped */
-					}
-					else
-						Phonize('K');
-				}
-				else if (MAKESOFT(Next_Letter) &&
-						 Prev_Letter != 'G')
-					Phonize('J');
-				else
-					Phonize('K');
-				break;
-				/* H if before a vowel and not after C,G,P,S,T */
-			case 'H':
-				if (isvowel(Next_Letter) &&
-					!AFFECTH(Prev_Letter))
-					Phonize('H');
-				break;
-
-				/*
-				 * dropped if after C else K
-				 */
-			case 'K':
-				if (Prev_Letter != 'C')
-					Phonize('K');
-				break;
-
-				/*
-				 * F if before H else P
-				 */
-			case 'P':
-				if (Next_Letter == 'H')
-					Phonize('F');
-				else
-					Phonize('P');
-				break;
-
-				/*
-				 * K
-				 */
-			case 'Q':
-				Phonize('K');
-				break;
-
-				/*
-				 * 'sh' in -SH-, -SIO- or -SIA- or -SCHW- else S
-				 */
-			case 'S':
-				if (Next_Letter == 'I' &&
-					(After_Next_Letter == 'O' ||
-					 After_Next_Letter == 'A'))
-					Phonize(SH);
-				else if (Next_Letter == 'H')
-				{
-					Phonize(SH);
-					skip_letter++;
-				}
-#ifndef USE_TRADITIONAL_METAPHONE
-				else if (Next_Letter == 'C' &&
-						 Look_Ahead_Letter(2) == 'H' &&
-						 Look_Ahead_Letter(3) == 'W')
-				{
-					Phonize(SH);
-					skip_letter += 2;
-				}
-#endif
-				else
-					Phonize('S');
-				break;
-
-				/*
-				 * 'sh' in -TIA- or -TIO- else 'th' before H else T
-				 */
-			case 'T':
-				if (Next_Letter == 'I' &&
-					(After_Next_Letter == 'O' ||
-					 After_Next_Letter == 'A'))
-					Phonize(SH);
-				else if (Next_Letter == 'H')
-				{
-					Phonize(TH);
-					skip_letter++;
-				}
-				else
-					Phonize('T');
-				break;
-				/* F */
-			case 'V':
-				Phonize('F');
-				break;
-				/* W before a vowel, else dropped */
-			case 'W':
-				if (isvowel(Next_Letter))
-					Phonize('W');
-				break;
-				/* KS */
-			case 'X':
-				Phonize('K');
-				Phonize('S');
-				break;
-				/* Y if followed by a vowel */
-			case 'Y':
-				if (isvowel(Next_Letter))
-					Phonize('Y');
-				break;
-				/* S */
-			case 'Z':
-				Phonize('S');
-				break;
-				/* No transformation */
-			case 'F':
-			case 'J':
-			case 'L':
-			case 'M':
-			case 'N':
-			case 'R':
-				Phonize(Curr_Letter);
-				break;
-			default:
-				/* nothing */
-				break;
-		}						/* END SWITCH */
-
-		w_idx += skip_letter;
-	}							/* END FOR */
-
-	End_Phoned_Word;
-
-	return (META_SUCCESS);
-}	/* END metaphone */
-
-
-/*
- * SQL function: soundex(text) returns text
- */
-PG_FUNCTION_INFO_V1(soundex);
-
-Datum
-soundex(PG_FUNCTION_ARGS)
-{
-	char		outstr[SOUNDEX_LEN + 1];
-	char	   *arg;
-
-	arg = _textout(PG_GETARG_TEXT_P(0));
-
-	_soundex(arg, outstr);
-
-	PG_RETURN_TEXT_P(_textin(outstr));
-}
-
-static void
-_soundex(const char *instr, char *outstr)
-{
-	int			count;
-
-	AssertArg(instr);
-	AssertArg(outstr);
-
-	outstr[SOUNDEX_LEN] = '\0';
-
-	/* Skip leading non-alphabetic characters */
-	while (!isalpha((unsigned char) instr[0]) && instr[0])
-		++instr;
-
-	/* No string left */
-	if (!instr[0])
-	{
-		outstr[0] = (char) 0;
-		return;
-	}
-
-	/* Take the first letter as is */
-	*outstr++ = (char) toupper((unsigned char) *instr++);
-
-	count = 1;
-	while (*instr && count < SOUNDEX_LEN)
-	{
-		if (isalpha((unsigned char) *instr) &&
-			soundex_code(*instr) != soundex_code(*(instr - 1)))
-		{
-			*outstr = soundex_code(instr[0]);
-			if (*outstr != '0')
-			{
-				++outstr;
-				++count;
-			}
-		}
-		++instr;
-	}
-
-	/* Fill with 0's */
-	while (count < SOUNDEX_LEN)
-	{
-		*outstr = '0';
-		++outstr;
-		++count;
-	}
-}
diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.h b/contrib/fuzzystrmatch/fuzzystrmatch.h
deleted file mode 100644
index 59e0d9258c..0000000000
--- a/contrib/fuzzystrmatch/fuzzystrmatch.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * fuzzystrmatch.h
- *
- * Functions for "fuzzy" comparison of strings
- *
- * Copyright (c) Joseph Conway <joseph.conway@home.com>, 2001;
- *
- * levenshtein()
- * -------------
- * Written based on a description of the algorithm by Michael Gilleland
- * found at http://www.merriampark.com/ld.htm
- * Also looked at levenshtein.c in the PHP 4.0.6 distribution for
- * inspiration.
- *
- * metaphone()
- * -----------
- * Modified for PostgreSQL by Joe Conway.
- * Based on CPAN's "Text-Metaphone-1.96" by Michael G Schwern <schwern@pobox.com>
- * Code slightly modified for use as PostgreSQL function (palloc, elog, etc).
- * Metaphone was originally created by Lawrence Philips and presented in article
- * in "Computer Language" December 1990 issue.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without a written agreement
- * is hereby granted, provided that the above copyright notice and this
- * paragraph and the following two paragraphs appear in all copies.
- *
- * IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
- * LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
- * DOCUMENTATION, EVEN IF THE AUTHOR OR DISTRIBUTORS HAVE BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE AUTHOR AND DISTRIBUTORS HAS NO OBLIGATIONS TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- */
-
-#ifndef FUZZYSTRMATCH_H
-#define FUZZYSTRMATCH_H
-
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "postgres.h"
-#include "fmgr.h"
-#include "utils/builtins.h"
-
-
-
-/*
- * External declarations
- */
-extern Datum levenshtein(PG_FUNCTION_ARGS);
-extern Datum metaphone(PG_FUNCTION_ARGS);
-extern Datum soundex(PG_FUNCTION_ARGS);
-
-/*
- * Soundex
- */
-static void _soundex(const char *instr, char *outstr);
-
-#define SOUNDEX_LEN 4
-#define _textin(str) DirectFunctionCall1(textin, CStringGetDatum(str))
-#define _textout(str) DatumGetPointer(DirectFunctionCall1(textout, PointerGetDatum(str)))
-
-/*									ABCDEFGHIJKLMNOPQRSTUVWXYZ */
-static const char *soundex_table = "01230120022455012623010202";
-
-#define soundex_code(letter) soundex_table[toupper((unsigned char) (letter)) - 'A']
-
-
-/*
- * Levenshtein
- */
-#define STRLEN(p) strlen(p)
-#define CHAREQ(p1, p2) (*(p1) == *(p2))
-#define NextChar(p) ((p)++)
-#define MAX_LEVENSHTEIN_STRLEN		255
-
-
-/*
- * Metaphone
- */
-#define MAX_METAPHONE_STRLEN		255
-
-/*
- * Original code by Michael G Schwern starts here.
- * Code slightly modified for use as PostgreSQL
- * function (combined *.h into here).
- *------------------------------------------------------------------*/
-
-/**************************************************************************
-	metaphone -- Breaks english phrases down into their phonemes.
-
-	Input
-		word			--	An english word to be phonized
-		max_phonemes	--	How many phonemes to calculate.  If 0, then it
-							will phonize the entire phrase.
-		phoned_word		--	The final phonized word.  (We'll allocate the
-							memory.)
-	Output
-		error	--	A simple error flag, returns TRUE or FALSE
-
-	NOTES:	ALL non-alpha characters are ignored, this includes whitespace,
-	although non-alpha characters will break up phonemes.
-****************************************************************************/
-
-
-/**************************************************************************
-	my constants -- constants I like
-
-	Probably redundant.
-
-***************************************************************************/
-
-#define META_ERROR			FALSE
-#define META_SUCCESS		TRUE
-#define META_FAILURE		FALSE
-
-
-/*	I add modifications to the traditional metaphone algorithm that you
-	might find in books.  Define this if you want metaphone to behave
-	traditionally */
-#undef USE_TRADITIONAL_METAPHONE
-
-/* Special encodings */
-#define  SH		'X'
-#define  TH		'0'
-
-char		Lookahead(char *word, int how_far);
-int
-_metaphone(
- /* IN */
-		   char *word,
-		   int max_phonemes,
- /* OUT */
-		   char **phoned_word
-);
-
-/* Metachar.h ... little bits about characters for metaphone */
-
-
-/*-- Character encoding array & accessing macros --*/
-/* Stolen directly out of the book... */
-char		_codes[26] = {
-	1, 16, 4, 16, 9, 2, 4, 16, 9, 2, 0, 2, 2, 2, 1, 4, 0, 2, 4, 4, 1, 0, 0, 0, 8, 0
-/*	a  b c	d e f g  h i j k l m n o p q r s t u v w x y z */
-};
-
-
-#define ENCODE(c) (isalpha((unsigned char) (c)) ? _codes[((toupper((unsigned char) (c))) - 'A')] : 0)
-
-#define isvowel(c)	(ENCODE(c) & 1)		/* AEIOU */
-
-/* These letters are passed through unchanged */
-#define NOCHANGE(c) (ENCODE(c) & 2)		/* FJMNR */
-
-/* These form dipthongs when preceding H */
-#define AFFECTH(c)	(ENCODE(c) & 4)		/* CGPST */
-
-/* These make C and G soft */
-#define MAKESOFT(c) (ENCODE(c) & 8)		/* EIY */
-
-/* These prevent GH from becoming F */
-#define NOGHTOF(c)	(ENCODE(c) & 16)	/* BDH */
-
-#endif   /* FUZZYSTRMATCH_H */
diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.sql.in b/contrib/fuzzystrmatch/fuzzystrmatch.sql.in
deleted file mode 100644
index b02f1b28eb..0000000000
--- a/contrib/fuzzystrmatch/fuzzystrmatch.sql.in
+++ /dev/null
@@ -1,11 +0,0 @@
-CREATE FUNCTION levenshtein (text,text) RETURNS int
-  AS 'MODULE_PATHNAME','levenshtein' LANGUAGE 'c' with (iscachable, isstrict);
-
-CREATE FUNCTION metaphone (text,int) RETURNS text
-  AS 'MODULE_PATHNAME','metaphone' LANGUAGE 'c' with (iscachable, isstrict);
-
-CREATE FUNCTION soundex(text) RETURNS text
-  AS 'MODULE_PATHNAME', 'soundex' LANGUAGE 'c' with (iscachable, isstrict);
-
-CREATE FUNCTION text_soundex(text) RETURNS text
-  AS 'MODULE_PATHNAME', 'soundex' LANGUAGE 'c';
diff --git a/contrib/intagg/Makefile b/contrib/intagg/Makefile
deleted file mode 100644
index 60a84b646e..0000000000
--- a/contrib/intagg/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-#############################################
-# Makefile for integer aggregator
-# Copyright (C) 2001 Digital Music Network.
-# by Mark L. Woodward
-# $Header: /cvsroot/pgsql/contrib/intagg/Makefile,v 1.3 2002/02/25 04:16:58 tgl Exp $
-
-subdir = contrib/intagg
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-MODULES = int_aggregate
-DATA_built = int_aggregate.sql
-DOCS = README.int_aggregate
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/intagg/README.int_aggregate b/contrib/intagg/README.int_aggregate
deleted file mode 100644
index 0c7317ccc9..0000000000
--- a/contrib/intagg/README.int_aggregate
+++ /dev/null
@@ -1,55 +0,0 @@
-Integer aggregator/enumerator.
-
-Many database systems have the notion of a one to many table.
-
-A one to many table usually sits between two indexed tables, 
-as: 
-
-create table one_to_many(left int, right int) ;
-
-And it is used like this:
-
-SELECT right.* from right JOIN one_to_many ON (right.id = one_to_many.right) 
-	WHERE  one_to_many.left = item;
-
-This will return all the items in the right hand table for an entry 
-in the left hand table. This is a very common construct in SQL.
-
-Now, this methodology can be cumbersome with a very large number of
-entries in the one_to_many table. Depending on the order in which
-data was entered, a join like this could result in an index scan
-and a fetch for each right hand entry in the table for a particular
-left hand entry.
-
-If you have a very dynamic system, there is not much you can do. 
-However, if you have some data which is fairly static, you can
-create a summary table with the aggregator.
-
-CREATE TABLE summary as SELECT left, int_array_aggregate(right) 
-	AS right FROM one_to_many GROUP BY left;
-
-This will create a table with one row per left item, and an array
-of right items. Now this is pretty useless without some way of using
-the array, thats why there is an array enumerator.
-
-SELECT left, int_array_enum(right) FROM summary WHERE left = item;
-
-The above query using int_array_enum, produces the same results as:
-
-SELECT left, right FROM one_to_many WHERE left = item;
-
-The difference is that the query against the summary table has to get
-only one row from the table, where as the query against "one_to_many"
-must index scan and fetch a row for each entry.
-
-On our system, an EXPLAIN shows a query with a cost of 8488 gets reduced
-to a cost of 329. The query is a join between the one_to_many table,
-
-select right, count(right) from 
-(
-	select left, int_array_enum(right) as right from summary join
-                (select left from left_table where left = item) as lefts
-                 ON (summary.left = lefts.left ) 
-) as list group by right order by count desc ;
-
-
diff --git a/contrib/intagg/int_aggregate.c b/contrib/intagg/int_aggregate.c
deleted file mode 100644
index 6e8d17b747..0000000000
--- a/contrib/intagg/int_aggregate.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Integer array aggregator / enumerator
- *
- * Mark L. Woodward
- * DMN Digital Music Network.
- * www.dmn.com
- *
- * Copyright (C) Digital Music Network
- * December 20, 2001
- *
- * This file is the property of the Digital Music Network (DMN).
- * It is being made available to users of the PostgreSQL system
- * under the BSD license.
- *
- */
-#include "postgres.h"
-
-#include <ctype.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <string.h>
-#include "postgres.h"
-#include "access/heapam.h"
-#include "catalog/catname.h"
-#include "catalog/indexing.h"
-#include "catalog/pg_proc.h"
-#include "executor/executor.h"
-#include "utils/fcache.h"
-#include "utils/sets.h"
-#include "utils/syscache.h"
-#include "access/tupmacs.h"
-#include "access/xact.h"
-#include "fmgr.h"
-#include "miscadmin.h"
-#include "utils/array.h"
-#include "utils/builtins.h"
-#include "utils/memutils.h"
-#include "utils/lsyscache.h"
-
-
-/* This is actually a postgres version of a one dimentional array */
-
-typedef struct agg
-{
-	ArrayType a;
-	int 	items;
-	int 	lower;
-	int4	array[1];
-}PGARRAY;
-
-/* This is used to keep track of our position during enumeration */
-typedef struct callContext
-{
-	PGARRAY *p;
-	int num;
-	int flags;
-}CTX;
-
-#define TOASTED		1
-#define START_NUM 	8
-#define PGARRAY_SIZE(n) (sizeof(PGARRAY) + ((n-1)*sizeof(int4)))
-
-static PGARRAY * GetPGArray(int4 state, int fAdd);
-static PGARRAY *ShrinkPGArray(PGARRAY *p);
-
-Datum int_agg_state(PG_FUNCTION_ARGS);
-Datum int_agg_final_count(PG_FUNCTION_ARGS);
-Datum int_agg_final_array(PG_FUNCTION_ARGS);
-Datum int_enum(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(int_agg_state);
-PG_FUNCTION_INFO_V1(int_agg_final_count);
-PG_FUNCTION_INFO_V1(int_agg_final_array);
-PG_FUNCTION_INFO_V1(int_enum);
-
-/*
- * Manage the aggregation state of the array
- * You need to specify the correct memory context, or it will vanish!
- */
-static PGARRAY * GetPGArray(int4 state, int fAdd)
-{
-	PGARRAY *p = (PGARRAY *) state;
-
-	if(!state)
-	{
-		/* New array */
-		int cb = PGARRAY_SIZE(START_NUM);
-
-		p = (PGARRAY *) MemoryContextAlloc(TopTransactionContext, cb);
-
-		if(!p)
-		{
-			elog(ERROR,"Integer aggregator, cant allocate TopTransactionContext memory");
-			return 0;
-		}
-
-		p->a.size = cb;
-		p->a.ndim= 0;
-		p->a.flags = 0;
-		p->items = 0;
-		p->lower= START_NUM;
-	}
-	else if(fAdd)
-	{	/* Ensure array has space */
-		if(p->items >= p->lower)
-		{
-			PGARRAY *pn;
-			int n = p->lower + p->lower;
-			int cbNew = PGARRAY_SIZE(n);
-
-			pn = (PGARRAY *) repalloc(p, cbNew);
-
-			if(!pn)
-			{	/* Realloc failed! Reallocate new block. */
-				pn = (PGARRAY *) MemoryContextAlloc(TopTransactionContext, cbNew);
-				if(!pn)
-				{
-					elog(ERROR, "Integer aggregator, REALLY REALLY can't alloc memory");
-					return (PGARRAY *) NULL;
-				}
-				memcpy(pn, p, p->a.size);
-				pfree(p);
-			}
-			pn->a.size = cbNew;
-			pn->lower = n;
-			return pn;
-		}
-	}
-	return p;
-}
-
-/* Shrinks the array to its actual size and moves it into the standard
- * memory allocation context, frees working memory  */
-static PGARRAY *ShrinkPGArray(PGARRAY *p)
-{
-	PGARRAY *pnew=NULL;
-	if(p)
-	{
-		/* get target size */
-		int cb = PGARRAY_SIZE(p->items);
-
-		/* use current transaction context */
-		pnew = palloc(cb);
-
-		if(pnew)
-		{
-			/* Fix up the fields in the new structure, so Postgres understands */
-			memcpy(pnew, p, cb);
-			pnew->a.size = cb;
-			pnew->a.ndim=1;
-			pnew->a.flags = 0;
-			pnew->lower = 0;
-		}
-		else
-		{
-			elog(ERROR, "Integer aggregator, can't allocate memory");
-		}
-		pfree(p);
-	}
-	return pnew;
-}
-
-/* Called for each iteration during an aggregate function */
-Datum int_agg_state(PG_FUNCTION_ARGS)
-{
-	int4 state = PG_GETARG_INT32(0);
-	int4 value = PG_GETARG_INT32(1);
-
-	PGARRAY *p = GetPGArray(state, 1);
-	if(!p)
-	{
-		elog(ERROR,"No aggregate storage\n");
-	}
-	else if(p->items >= p->lower)
-	{
-		elog(ERROR,"aggregate storage too small\n");
-	}
-	else
-	{
-		p->array[p->items++]= value;
-	}
-	PG_RETURN_INT32(p);
-}
-
-/* This is the final function used for the integer aggregator. It returns all the integers
- * collected as a one dimentional integer array */
-Datum int_agg_final_array(PG_FUNCTION_ARGS)
-{
-	PGARRAY *pnew = ShrinkPGArray(GetPGArray(PG_GETARG_INT32(0),0));
-	if(pnew)
-	{
-		PG_RETURN_POINTER(pnew);
-	}
-	else
-	{
-		PG_RETURN_NULL();
-	}
-}
-
-/* This function accepts an array, and returns one item for each entry in the array */
-Datum int_enum(PG_FUNCTION_ARGS)
-{
-	CTX *pc;
-	PGARRAY *p = (PGARRAY *) PG_GETARG_POINTER(0);
-	ReturnSetInfo *rsi = (ReturnSetInfo *)fcinfo->resultinfo;
-
-	if(!p)
-	{
-		elog(WARNING, "No data sent\n");
-		return 0;
-	}
-	if(!rsi)
-	{
-		elog(ERROR, "No ReturnSetInfo sent! function must be declared returning a 'setof' integer");
-		PG_RETURN_NULL();
-
-	}
-	if(!fcinfo->context)
-	{
-		/* Allocate a working context */
-		pc = (CTX *) palloc(sizeof(CTX));
-
-		if(!pc)
-		{
-			elog(ERROR, "CTX Alocation failed\n");
-			PG_RETURN_NULL();
-		}
-
-		/* Don't copy atribute if you don't need too */
-		if(VARATT_IS_EXTENDED(p) )
-		{
-			/* Toasted!!! */
-			pc->p = (PGARRAY *) PG_DETOAST_DATUM_COPY(p);
-			pc->flags = TOASTED;
-			if(!pc->p)
-			{
-				elog(ERROR, "Error in toaster!!! no detoasting\n");
-				PG_RETURN_NULL();
-			}
-		}
-		else
-		{
-			/* Untoasted */
-			pc->p = p;
-			pc->flags = 0;
-		}
-		fcinfo->context = (Node *) pc;
-		pc->num=0;
-	}
-	else /* use an existing one */
-	{
-		pc = (CTX *) fcinfo->context;
-	}
-	/* Are we done yet? */
-	if(pc->num >= pc->p->items)
-	{
-		/* We are done */
-		if(pc->flags & TOASTED)
-			pfree(pc->p);
-		pfree(fcinfo->context);
-		fcinfo->context = NULL;
-		rsi->isDone = ExprEndResult ;
-	}
-	else	/* nope, return the next value */
-	{
-		int val = pc->p->array[pc->num++];
-		rsi->isDone = ExprMultipleResult;
-		PG_RETURN_INT32(val);
-	}
-	PG_RETURN_NULL();
-}
diff --git a/contrib/intagg/int_aggregate.sql.in b/contrib/intagg/int_aggregate.sql.in
deleted file mode 100644
index e08324aead..0000000000
--- a/contrib/intagg/int_aggregate.sql.in
+++ /dev/null
@@ -1,40 +0,0 @@
--- Drop functions
-drop function int_agg_state (int4, int4);
-drop function int_agg_final_array (int4);
-drop aggregate int_array_aggregate(int4);
-drop function int_array_enum (int4[]);
-
-
--- Internal function for the aggregate
--- Is called for each item in an aggregation
-create function int_agg_state (int4, int4)
-	returns int4
-	as 'MODULE_FILENAME','int_agg_state'
-	language 'c';
-
--- Internal function for the aggregate
--- Is called at the end of the aggregation, and returns an array.
-create function int_agg_final_array (int4)
-	returns int4[]
-	as 'MODULE_FILENAME','int_agg_final_array'
-	language 'c';
-
--- The aggration funcion.
--- uses the above functions to create an array of integers from an aggregation.
-create aggregate int_array_aggregate
-(
-	BASETYPE = int4,
-	SFUNC = int_agg_state,
-	STYPE = int4,
-	FINALFUNC = int_agg_final_array,
-	INITCOND = 0
-);
-
--- The enumeration function
--- returns each element in a one dimentional integer array
--- as a row.
-create function int_array_enum(int4[])
-	returns setof integer
-	as 'MODULE_FILENAME','int_enum'
-	language 'c';
-
diff --git a/contrib/intarray/Makefile b/contrib/intarray/Makefile
deleted file mode 100644
index 7cb06da2ac..0000000000
--- a/contrib/intarray/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/intarray/Makefile,v 1.8 2001/09/06 10:49:29 petere Exp $
-
-subdir = contrib/intarray
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-MODULES = _int
-DATA_built = _int.sql
-DOCS = README.intarray
-REGRESS = _int
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/intarray/README.intarray b/contrib/intarray/README.intarray
deleted file mode 100644
index f0138a1484..0000000000
--- a/contrib/intarray/README.intarray
+++ /dev/null
@@ -1,100 +0,0 @@
-This is an implementation of RD-tree data structure using GiST interface
-of PostgreSQL. It has built-in lossy compression.
-
-Current implementation provides index support for one-dimensional array of
-int4's - gist__int_ops, suitable for small and medium size of arrays (used on
-default), and gist__intbig_ops for indexing large arrays (we use superimposed
-signature with length of 4096 bits to represent sets).
-
-All work was done by Teodor Sigaev (teodor@stack.net) and Oleg Bartunov
-(oleg@sai.msu.su). See http://www.sai.msu.su/~megera/postgres/gist
-for additional information.
-
-CHANGES:
-
-October 1, 2001
-   1. Change search method in array to binary
-September 28, 2001
-   1. gist__int_ops now is without lossy
-   2. add sort entry in picksplit
-September 21, 2001
-   1. Added support for boolean query (indexable operator @@, looks like
-      a @@ '1|(2&3)', perfomance is better in any case )
-   2. Done some small optimizations
-March 19, 2001
-   1. Added support for toastable keys
-   2. Improved split algorithm for intbig (selection speedup is about 30%)
-
-INSTALLATION:
-
-  gmake
-  gmake install
-  -- load functions
-  psql <database> < _int.sql 
-
-REGRESSION TEST:
-
-   gmake installcheck
-
-EXAMPLE USAGE:
-
-  create table message (mid int not null,sections int[]);
-  create table message_section_map (mid int not null,sid int not null);
-
-  -- create indices
-CREATE unique index message_key on message ( mid );
-CREATE unique index message_section_map_key2 on message_section_map (sid, mid );
-CREATE INDEX message_rdtree_idx on message using gist ( sections gist__int_ops);
-
-  -- select some messages with section in 1 OR 2 - OVERLAP operator
-  select message.mid from message where message.sections && '{1,2}';  
-
-  -- select messages contains in sections 1 AND 2 - CONTAINS operator
-  select message.mid from message where message.sections @ '{1,2}';
-  -- the same, CONTAINED operator
-  select message.mid from message where '{1,2}' ~ message.sections;
-
-BENCHMARK:
-
-  subdirectory bench contains benchmark suite.
-  cd ./bench
-  1. createdb TEST
-  2. psql TEST < ../_int.sql
-  3. ./create_test.pl | psql TEST
-  4. ./bench.pl - perl script to benchmark queries, supports OR, AND queries
-                  with/without RD-Tree. Run script without arguments to 
-                  see availbale options.
-
-     a)test without RD-Tree (OR)
-       ./bench.pl -d TEST -s 1,2 -v
-     b)test with RD-Tree 
-       ./bench.pl -d TEST -s 1,2 -v -r
-
-BENCHMARKS:
-
-Size of table <message>: 200000
-Size of table <message_section_map>: 268538 
-
-Distribution of messages by sections:
-
-section 0: 73899 messages
-section 1: 16298 messages
-section 50: 1241 messages
-section 99: 705 messages
-
-old - without RD-Tree support,
-new - with RD-Tree
-
-+----------+---------------+----------------+
-|Search set|OR, time in sec|AND, time in sec|
-|          +-------+-------+--------+-------+
-|          |  old  |  new  |   old  |  new  |
-+----------+-------+-------+--------+-------+
-|         1|  1.427|  0.215|       -|      -|
-+----------+-------+-------+--------+-------+
-|        99|  1.029|  0.018|       -|      -|
-+----------+-------+-------+--------+-------+
-|       1,2|  1.829|  0.334|   5.654|  0.042|
-+----------+-------+-------+--------+-------+
-| 1,2,50,60|  2.057|  0.359|   5.044|  0.007|
-+----------+-------+-------+--------+-------+
diff --git a/contrib/intarray/_int.c b/contrib/intarray/_int.c
deleted file mode 100644
index d956543af5..0000000000
--- a/contrib/intarray/_int.c
+++ /dev/null
@@ -1,2219 +0,0 @@
-/******************************************************************************
-  This file contains routines that can be bound to a Postgres backend and
-  called by the backend in the process of processing queries.  The calling
-  format for these routines is dictated by Postgres architecture.
-******************************************************************************/
-
-/*
-#define BS_DEBUG
-#define GIST_DEBUG
-#define GIST_QUERY_DEBUG
-*/
-
-#include "postgres.h"
-
-#include <float.h>
-
-#include "access/gist.h"
-#include "access/itup.h"
-#include "access/rtree.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
-#include "utils/array.h"
-#include "utils/builtins.h"
-#include "storage/bufpage.h"
-
-/* number ranges for compression */
-#define MAXNUMRANGE 100
-
-#define max(a,b)		((a) >	(b) ? (a) : (b))
-#define min(a,b)		((a) <= (b) ? (a) : (b))
-#define abs(a)			((a) <	(0) ? -(a) : (a))
-
-/* dimension of array */
-#define NDIM 1
-
-/*
- * flags for gist__int_ops, use ArrayType->flags
- * which is unused (see array.h)
- */
-#define LEAFKEY		(1<<31)
-#define ISLEAFKEY(x)	( ((ArrayType*)(x))->flags & LEAFKEY )
-
-/* useful macros for accessing int4 arrays */
-#define ARRPTR(x)  ( (int4 *) ARR_DATA_PTR(x) )
-#define ARRNELEMS(x)  ArrayGetNItems( ARR_NDIM(x), ARR_DIMS(x))
-
-#define ARRISVOID(x) ( (x) ? ( ( ARR_NDIM(x) == NDIM ) ? ( ( ARRNELEMS( x ) ) ? 0 : 1 ) : ( ( ARR_NDIM(x) ) ? (elog(ERROR,"Array is not one-dimensional: %d dimensions",ARRNELEMS( x )),1) : 0 )  ) : 0 )
-
-#define SORT(x) \
-	do { \
-		 if ( ARRNELEMS( x ) > 1 ) \
-			isort( ARRPTR( x ), ARRNELEMS( x ) ); \
-	} while(0)
-
-#define PREPAREARR(x) \
-	do { \
-		 if ( ARRNELEMS( x ) > 1 ) \
-			if ( isort( ARRPTR( x ), ARRNELEMS( x ) ) ) \
-				x = _int_unique( x ); \
-	} while(0)
-
-/* "wish" function */
-#define WISH_F(a,b,c) (double)( -(double)(((a)-(b))*((a)-(b))*((a)-(b)))*(c) )
-
-
-/* bigint defines */
-#define BITBYTE 8
-#define SIGLENINT  64			/* >122 => key will toast, so very slow!!! */
-#define SIGLEN	( sizeof(int)*SIGLENINT )
-#define SIGLENBIT (SIGLEN*BITBYTE)
-
-typedef char BITVEC[SIGLEN];
-typedef char *BITVECP;
-
-#define SIGPTR(x)  ( (BITVECP) ARR_DATA_PTR(x) )
-
-
-#define LOOPBYTE(a) \
-		for(i=0;i<SIGLEN;i++) {\
-				a;\
-		}
-
-#define LOOPBIT(a) \
-		for(i=0;i<SIGLENBIT;i++) {\
-				a;\
-		}
-
-/* beware of multiple evaluation of arguments to these macros! */
-#define GETBYTE(x,i) ( *( (BITVECP)(x) + (int)( (i) / BITBYTE ) ) )
-#define GETBITBYTE(x,i) ( (*((char*)(x)) >> (i)) & 0x01 )
-#define CLRBIT(x,i)   GETBYTE(x,i) &= ~( 0x01 << ( (i) % BITBYTE ) )
-#define SETBIT(x,i)   GETBYTE(x,i) |=  ( 0x01 << ( (i) % BITBYTE ) )
-#define GETBIT(x,i) ( (GETBYTE(x,i) >> ( (i) % BITBYTE )) & 0x01 )
-#define HASHVAL(val) (((unsigned int)(val)) % SIGLENBIT)
-#define HASH(sign, val) SETBIT((sign), HASHVAL(val))
-
-
-#ifdef GIST_DEBUG
-static void
-printarr(ArrayType *a, int num)
-{
-	char		bbb[16384];
-	char	   *cur;
-	int			l;
-	int		   *d;
-
-	d = ARRPTR(a);
-	*bbb = '\0';
-	cur = bbb;
-	for (l = 0; l < min(num, ARRNELEMS(a)); l++)
-	{
-		sprintf(cur, "%d ", d[l]);
-		cur = strchr(cur, '\0');
-	}
-	elog(DEBUG3, "\t\t%s", bbb);
-}
-static void
-printbitvec(BITVEC bv)
-{
-	int			i;
-	char		str[SIGLENBIT + 1];
-
-	str[SIGLENBIT] = '\0';
-	LOOPBIT(str[i] = (GETBIT(bv, i)) ? '1' : '0');
-
-	elog(DEBUG3, "BV: %s", str);
-}
-
-#endif
-
-/*
-** types for functions
-*/
-typedef ArrayType *(*formarray) (ArrayType *, ArrayType *);
-typedef void (*formfloat) (ArrayType *, float *);
-
-/*
-** usefull function
-*/
-static bool isort(int4 *a, const int len);
-static ArrayType *new_intArrayType(int num);
-static ArrayType *copy_intArrayType(ArrayType *a);
-static ArrayType *resize_intArrayType(ArrayType *a, int num);
-static int	internal_size(int *a, int len);
-static ArrayType *_int_unique(ArrayType *a);
-
-/* common GiST function*/
-static GIST_SPLITVEC *_int_common_picksplit(bytea *entryvec,
-					  GIST_SPLITVEC *v,
-					  formarray unionf,
-					  formarray interf,
-					  formfloat sizef,
-					  float coef);
-static float *_int_common_penalty(GISTENTRY *origentry,
-					GISTENTRY *newentry,
-					float *result,
-					formarray unionf,
-					formfloat sizef);
-static ArrayType *_int_common_union(bytea *entryvec,
-				  int *sizep,
-				  formarray unionf);
-
-/*
-** GiST support methods
-*/
-PG_FUNCTION_INFO_V1( g_int_consistent );
-PG_FUNCTION_INFO_V1( g_int_compress );
-PG_FUNCTION_INFO_V1( g_int_decompress );
-PG_FUNCTION_INFO_V1( g_int_penalty );
-PG_FUNCTION_INFO_V1( g_int_picksplit );
-PG_FUNCTION_INFO_V1( g_int_union );
-PG_FUNCTION_INFO_V1( g_int_same );
-
-Datum	g_int_consistent(PG_FUNCTION_ARGS);
-Datum	g_int_compress(PG_FUNCTION_ARGS);
-Datum	g_int_decompress(PG_FUNCTION_ARGS);
-Datum	g_int_penalty(PG_FUNCTION_ARGS);
-Datum	g_int_picksplit(PG_FUNCTION_ARGS);
-Datum	g_int_union(PG_FUNCTION_ARGS);
-Datum	g_int_same(PG_FUNCTION_ARGS);
-
-
-/*
-** R-tree support functions
-*/
-static bool		inner_int_contains(ArrayType *a, ArrayType *b);
-static bool		inner_int_overlap(ArrayType *a, ArrayType *b);
-static ArrayType  *inner_int_union(ArrayType *a, ArrayType *b);
-static ArrayType  *inner_int_inter(ArrayType *a, ArrayType *b);
-static void		rt__int_size(ArrayType *a, float *sz);
-
-PG_FUNCTION_INFO_V1( _int_different );
-PG_FUNCTION_INFO_V1( _int_same );
-PG_FUNCTION_INFO_V1( _int_contains );
-PG_FUNCTION_INFO_V1( _int_contained );
-PG_FUNCTION_INFO_V1( _int_overlap );
-PG_FUNCTION_INFO_V1( _int_union );
-PG_FUNCTION_INFO_V1( _int_inter );
-
-Datum	_int_different(PG_FUNCTION_ARGS);
-Datum	_int_same(PG_FUNCTION_ARGS);
-Datum	_int_contains(PG_FUNCTION_ARGS);
-Datum	_int_contained(PG_FUNCTION_ARGS);
-Datum	_int_overlap(PG_FUNCTION_ARGS);
-Datum	_int_union(PG_FUNCTION_ARGS);
-Datum	_int_inter(PG_FUNCTION_ARGS);
-
-/*
-** _intbig methods
-*/
-PG_FUNCTION_INFO_V1( g_intbig_consistent );
-PG_FUNCTION_INFO_V1( g_intbig_compress );
-PG_FUNCTION_INFO_V1( g_intbig_decompress );
-PG_FUNCTION_INFO_V1( g_intbig_penalty );
-PG_FUNCTION_INFO_V1( g_intbig_picksplit );
-PG_FUNCTION_INFO_V1( g_intbig_union );
-PG_FUNCTION_INFO_V1( g_intbig_same );
-
-Datum	g_intbig_consistent(PG_FUNCTION_ARGS);
-Datum	g_intbig_compress(PG_FUNCTION_ARGS);
-Datum	g_intbig_decompress(PG_FUNCTION_ARGS);
-Datum	g_intbig_penalty(PG_FUNCTION_ARGS);
-Datum	g_intbig_picksplit(PG_FUNCTION_ARGS);
-Datum	g_intbig_union(PG_FUNCTION_ARGS);
-Datum	g_intbig_same(PG_FUNCTION_ARGS);
-
-static bool _intbig_contains(ArrayType *a, ArrayType *b);
-static bool _intbig_overlap(ArrayType *a, ArrayType *b);
-static ArrayType *_intbig_union(ArrayType *a, ArrayType *b);
-
-static ArrayType *	_intbig_inter(ArrayType *a, ArrayType *b);
-static void rt__intbig_size(ArrayType *a, float *sz);
-
-
-
-/*****************************************************************************
- *		 	Boolean Search
- *****************************************************************************/
-
-#define BooleanSearchStrategy	20
-
-/*
- * item in polish notation with back link
- * to left operand
- */
-typedef struct ITEM {
-	int2    type;
-	int2	left;
-	int4    val;
-} ITEM;
-
-typedef struct {
-	int4	len;
-	int4	size;
-	char	data[1];
-} QUERYTYPE;
-
-#define HDRSIZEQT	( 2*sizeof(int4) )
-#define COMPUTESIZE(size)	( HDRSIZEQT + size * sizeof(ITEM) )
-#define GETQUERY(x)  (ITEM*)( (char*)(x)+HDRSIZEQT )
-
-PG_FUNCTION_INFO_V1(bqarr_in);
-PG_FUNCTION_INFO_V1(bqarr_out);
-Datum   bqarr_in(PG_FUNCTION_ARGS);
-Datum   bqarr_out(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(boolop);
-Datum   boolop(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(rboolop);
-Datum   rboolop(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(querytree);
-Datum   querytree(PG_FUNCTION_ARGS);
-
-static bool signconsistent( QUERYTYPE *query, BITVEC sign, bool leaf );
-static bool execconsistent( QUERYTYPE *query, ArrayType *array, bool leaf );
-
-/*****************************************************************************
- *						   GiST functions
- *****************************************************************************/
-
-/*
-** The GiST Consistent method for _intments
-** Should return false if for all data items x below entry,
-** the predicate x op query == FALSE, where op is the oper
-** corresponding to strategy in the pg_amop table.
-*/
-Datum
-g_int_consistent(PG_FUNCTION_ARGS) {
-	GISTENTRY *entry = (GISTENTRY *)PG_GETARG_POINTER(0);
-	ArrayType *query = ( ArrayType * )PG_GETARG_POINTER(1);
-	StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-	bool		retval;
-
-	if ( strategy == BooleanSearchStrategy )
-		PG_RETURN_BOOL(execconsistent( (QUERYTYPE*)query,
-						(ArrayType *) DatumGetPointer(entry->key),
-						ISLEAFKEY( (ArrayType *) DatumGetPointer(entry->key) ) ) );
-
-	/* XXX are we sure it's safe to scribble on the query object here? */
-	/* XXX what about toasted input? */
-	/* sort query for fast search, key is already sorted */
-	if ( ARRISVOID( query ) )
-		PG_RETURN_BOOL(false);
-	PREPAREARR(query);
-
-	switch (strategy)
-	{
-		case RTOverlapStrategyNumber:
-			retval = inner_int_overlap((ArrayType *) DatumGetPointer(entry->key),
-									   query);
-			break;
-		case RTSameStrategyNumber:
-			if ( GIST_LEAF(entry) )
-				DirectFunctionCall3(
-					g_int_same,
-					entry->key,
-					PointerGetDatum(query),
-					PointerGetDatum(&retval)
-				);
-			else
-				retval = inner_int_contains((ArrayType *) DatumGetPointer(entry->key),
-										query);
-			break;
-		case RTContainsStrategyNumber:
-			retval = inner_int_contains((ArrayType *) DatumGetPointer(entry->key),
-										query);
-			break;
-		case RTContainedByStrategyNumber:
-			if ( GIST_LEAF(entry) )
-				retval = inner_int_contains(query,
-					(ArrayType *) DatumGetPointer(entry->key) );
-			else
-				retval = inner_int_overlap((ArrayType *) DatumGetPointer(entry->key),
-									   query);
-			break;
-		default:
-			retval = FALSE;
-	}
-	PG_RETURN_BOOL(retval);
-}
-
-Datum
-g_int_union(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_POINTER( _int_common_union(
-		(bytea *) PG_GETARG_POINTER(0),
-		(int *) PG_GETARG_POINTER(1),
-		inner_int_union
-	) );
-}
-
-/*
-** GiST Compress and Decompress methods
-*/
-Datum
-g_int_compress(PG_FUNCTION_ARGS)
-{
-	GISTENTRY *entry = (GISTENTRY *)PG_GETARG_POINTER(0);
-	GISTENTRY  *retval;
-	ArrayType  *r;
-	int			len;
-	int		   *dr;
-	int			i,
-				min,
-				cand;
-
-	if (entry->leafkey) {
-		r = (ArrayType *) PG_DETOAST_DATUM_COPY(entry->key);
-		PREPAREARR(r);
-		r->flags |= LEAFKEY;
-		retval = palloc(sizeof(GISTENTRY));
-		gistentryinit(*retval, PointerGetDatum(r),
-				  entry->rel, entry->page, entry->offset, VARSIZE(r), FALSE);
-
-		PG_RETURN_POINTER(retval);
-	}
-
-	r = (ArrayType *) PG_DETOAST_DATUM(entry->key);
-	if ( ISLEAFKEY( r ) || ARRISVOID(r) ) {
-		if ( r != (ArrayType*)DatumGetPointer(entry->key) )
-			pfree(r);
-		PG_RETURN_POINTER(entry);
-	}
-
-	if ( (len=ARRNELEMS(r)) >= 2 * MAXNUMRANGE) {	/* compress */
-		if ( r == (ArrayType*)DatumGetPointer( entry->key) )
-			r = (ArrayType *) PG_DETOAST_DATUM_COPY(entry->key);
-		r = resize_intArrayType(r, 2 * (len));
-
-		dr = ARRPTR(r);
-
-		for (i = len - 1; i >= 0; i--)
-			dr[2 * i] = dr[2 * i + 1] = dr[i];
-
-		len *= 2;
-		cand = 1;
-		while (len > MAXNUMRANGE * 2)
-		{
-			min = 0x7fffffff;
-			for (i = 2; i < len; i += 2)
-				if (min > (dr[i] - dr[i - 1]))
-				{
-					min = (dr[i] - dr[i - 1]);
-					cand = i;
-				}
-			memmove((void *) &dr[cand - 1], (void *) &dr[cand + 1], (len - cand - 1) * sizeof(int));
-			len -= 2;
-		}
-		r = resize_intArrayType(r, len);
-		retval = palloc(sizeof(GISTENTRY));
-		gistentryinit(*retval, PointerGetDatum(r),
-				  entry->rel, entry->page, entry->offset, VARSIZE(r), FALSE);
-		PG_RETURN_POINTER(retval);
-	} else {
-		PG_RETURN_POINTER(entry);
-	}
-
-	PG_RETURN_POINTER(entry);
-}
-
-Datum
-g_int_decompress(PG_FUNCTION_ARGS)
-{
-	GISTENTRY *entry = (GISTENTRY *)PG_GETARG_POINTER(0);
-	GISTENTRY  *retval;
-	ArrayType  *r;
-	int		   *dr,
-				lenr;
-	ArrayType  *in;
-	int			lenin;
-	int		   *din;
-	int			i,
-				j;
-
-	in = (ArrayType *) PG_DETOAST_DATUM(entry->key);
-
-	if ( ARRISVOID(in) ) {
-		PG_RETURN_POINTER(entry);
-	}
-
-	lenin = ARRNELEMS(in);
-
-	if (lenin < 2 * MAXNUMRANGE || ISLEAFKEY( in ) ) { /* not comressed value */
-		if ( in != (ArrayType *) DatumGetPointer(entry->key)) {
-			retval = palloc(sizeof(GISTENTRY));
-			gistentryinit(*retval, PointerGetDatum(in),
-				entry->rel, entry->page, entry->offset, VARSIZE(in), FALSE);
-
-			PG_RETURN_POINTER(retval);
-		}
-		PG_RETURN_POINTER(entry);
-	}
-
-	din = ARRPTR(in);
-	lenr = internal_size(din, lenin);
-
-	r = new_intArrayType(lenr);
-	dr = ARRPTR(r);
-
-	for (i = 0; i < lenin; i += 2)
-		for (j = din[i]; j <= din[i + 1]; j++)
-			if ((!i) || *(dr - 1) != j)
-				*dr++ = j;
-
-	if (in != (ArrayType *) DatumGetPointer(entry->key))
-		pfree(in);
-	retval = palloc(sizeof(GISTENTRY));
-	gistentryinit(*retval, PointerGetDatum(r),
-		entry->rel, entry->page, entry->offset, VARSIZE(r), FALSE);
-
-	PG_RETURN_POINTER(retval);
-}
-
-/*
-** The GiST Penalty method for _intments
-*/
-Datum
-g_int_penalty(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_POINTER( _int_common_penalty(
-		(GISTENTRY *)PG_GETARG_POINTER(0),
-		(GISTENTRY *)PG_GETARG_POINTER(1),
-		(float *)    PG_GETARG_POINTER(2),
-		inner_int_union, rt__int_size
-	) );
-}
-
-
-Datum
-g_int_picksplit(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_POINTER( _int_common_picksplit(
-		(bytea *)PG_GETARG_POINTER(0),
-		(GIST_SPLITVEC *)PG_GETARG_POINTER(1),
-		inner_int_union,
-		inner_int_inter,
-		rt__int_size,
-		0.01
-	) );
-}
-
-/*
-** Equality methods
-*/
-
-
-Datum
-g_int_same(PG_FUNCTION_ARGS)
-{
-	ArrayType	*a = (ArrayType*)PointerGetDatum(PG_GETARG_POINTER(0));
-	ArrayType	*b = (ArrayType*)PointerGetDatum(PG_GETARG_POINTER(1));
-	bool *result = (bool *)PG_GETARG_POINTER(2);
-	int4 n = ARRNELEMS(a);
-	int4 *da, *db;
-
-	if ( n != ARRNELEMS(b) ) {
-		*result = false;
-		PG_RETURN_POINTER(result);
-	}
-	*result = TRUE;
-	da = ARRPTR(a);
-	db = ARRPTR(b);
-	while(n--)
-		if (*da++ != *db++) {
-			*result = FALSE;
-			break;
-		}
-
-	PG_RETURN_POINTER(result);
-}
-
-Datum
-_int_contained(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_BOOL( DatumGetBool(
-		DirectFunctionCall2(
-			_int_contains,
-			PointerGetDatum(PG_GETARG_POINTER(1)),
-			PointerGetDatum(PG_GETARG_POINTER(0))
-		)
-	));
-}
-
-Datum
-_int_contains(PG_FUNCTION_ARGS)
-{
-	ArrayType *a = (ArrayType *)DatumGetPointer(PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(0)));
-	ArrayType *b = (ArrayType *)DatumGetPointer(PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(1)));
-	bool		res;
-
-	if (ARRISVOID(a) || ARRISVOID(b))
-		return FALSE;
-
-	PREPAREARR(a);
-	PREPAREARR(b);
-	res = inner_int_contains(a, b);
-	pfree(a);
-	pfree(b);
-	PG_RETURN_BOOL( res );
-}
-
-static bool
-inner_int_contains(ArrayType *a, ArrayType *b)
-{
-	int			na,
-				nb;
-	int			i,
-				j,
-				n;
-	int		   *da,
-			   *db;
-
-	if (ARRISVOID(a) || ARRISVOID(b))
-		return FALSE;
-
-	na = ARRNELEMS(a);
-	nb = ARRNELEMS(b);
-	da = ARRPTR(a);
-	db = ARRPTR(b);
-
-#ifdef GIST_DEBUG
-	elog(DEBUG3, "contains %d %d", na, nb);
-#endif
-
-	i = j = n = 0;
-	while (i < na && j < nb)
-		if (da[i] < db[j])
-			i++;
-		else if (da[i] == db[j])
-		{
-			n++;
-			i++;
-			j++;
-		}
-		else
-			j++;
-
-	return (n == nb) ? TRUE : FALSE;
-}
-
-/*****************************************************************************
- * Operator class for R-tree indexing
- *****************************************************************************/
-
-Datum
-_int_different(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_BOOL( ! DatumGetBool(
-		DirectFunctionCall2(
-			_int_same,
-			PointerGetDatum(PG_GETARG_POINTER(0)),
-			PointerGetDatum(PG_GETARG_POINTER(1))
-		)
-	));
-}
-
-Datum
-_int_same(PG_FUNCTION_ARGS)
-{
-	ArrayType *a = (ArrayType *)DatumGetPointer(PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(0)));
-	ArrayType *b = (ArrayType *)DatumGetPointer(PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(1)));
-	int			na,
-				nb;
-	int			n;
-	int		   *da,
-			   *db;
-	bool		result;
-	bool		avoid = ARRISVOID(a);
-	bool		bvoid = ARRISVOID(b);
-
-	if (avoid || bvoid)
-		return (avoid && bvoid) ? TRUE : FALSE;
-
-	SORT(a);
-	SORT(b);
-	na = ARRNELEMS(a);
-	nb = ARRNELEMS(b);
-	da = ARRPTR(a);
-	db = ARRPTR(b);
-
-	result = FALSE;
-
-	if (na == nb)
-	{
-		result = TRUE;
-		for (n = 0; n < na; n++)
-			if (da[n] != db[n])
-			{
-				result = FALSE;
-				break;
-			}
-	}
-
-	pfree(a);
-	pfree(b);
-
-	PG_RETURN_BOOL(result);
-}
-
-/*	_int_overlap -- does a overlap b?
- */
-Datum
-_int_overlap(PG_FUNCTION_ARGS)
-{
-	ArrayType *a = (ArrayType *)DatumGetPointer(PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(0)));
-	ArrayType *b = (ArrayType *)DatumGetPointer(PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(1)));
-	bool		result;
-
-	if (ARRISVOID(a) || ARRISVOID(b))
-		return FALSE;
-
-	SORT(a);
-	SORT(b);
-
-	result = inner_int_overlap(a, b);
-
-	pfree(a);
-	pfree(b);
-
-	PG_RETURN_BOOL( result );
-}
-
-static bool
-inner_int_overlap(ArrayType *a, ArrayType *b)
-{
-	int			na,
-				nb;
-	int			i,
-				j;
-	int		   *da,
-			   *db;
-
-	if (ARRISVOID(a) || ARRISVOID(b))
-		return FALSE;
-
-	na = ARRNELEMS(a);
-	nb = ARRNELEMS(b);
-	da = ARRPTR(a);
-	db = ARRPTR(b);
-
-#ifdef GIST_DEBUG
-	elog(DEBUG3, "g_int_overlap");
-#endif
-
-	i = j = 0;
-	while (i < na && j < nb)
-		if (da[i] < db[j])
-			i++;
-		else if (da[i] == db[j])
-			return TRUE;
-		else
-			j++;
-
-	return FALSE;
-}
-
-Datum
-_int_union(PG_FUNCTION_ARGS)
-{
-	ArrayType *a = (ArrayType *)DatumGetPointer(PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(0)));
-	ArrayType *b = (ArrayType *)DatumGetPointer(PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(1)));
-	ArrayType  *result;
-
-	if (!ARRISVOID(a))
-		SORT(a);
-	if (!ARRISVOID(b))
-		SORT(b);
-
-	result = inner_int_union(a, b);
-
-	if (a)
-		pfree(a);
-	if (b)
-		pfree(b);
-
-	PG_RETURN_POINTER( result );
-}
-
-static ArrayType  *
-inner_int_union(ArrayType *a, ArrayType *b)
-{
-	ArrayType  *r = NULL;
-	int			na,
-				nb;
-	int		   *da,
-			   *db,
-			   *dr;
-	int			i,
-				j;
-
-	if (ARRISVOID(a) && ARRISVOID(b))
-		return new_intArrayType(0);
-	if (ARRISVOID(a))
-		r = copy_intArrayType(b);
-	if (ARRISVOID(b))
-		r = copy_intArrayType(a);
-
-	if (r)
-		dr = ARRPTR(r);
-	else
-	{
-		na = ARRNELEMS(a);
-		nb = ARRNELEMS(b);
-		da = ARRPTR(a);
-		db = ARRPTR(b);
-
-		r = new_intArrayType(na + nb);
-		dr = ARRPTR(r);
-
-		/* union */
-		i = j = 0;
-		while (i < na && j < nb)
-			if (da[i] < db[j])
-				*dr++ = da[i++];
-			else
-				*dr++ = db[j++];
-
-		while (i < na)
-			*dr++ = da[i++];
-		while (j < nb)
-			*dr++ = db[j++];
-
-	}
-
-	if (ARRNELEMS(r) > 1)
-		r = _int_unique(r);
-
-	return r;
-}
-
-
-Datum
-_int_inter(PG_FUNCTION_ARGS)
-{
-	ArrayType *a = (ArrayType *)DatumGetPointer(PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(0)));
-	ArrayType *b = (ArrayType *)DatumGetPointer(PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(1)));
-	ArrayType  *result;
-
-	if (ARRISVOID(a) || ARRISVOID(b))
-		PG_RETURN_POINTER(new_intArrayType(0));
-
-	SORT(a);
-	SORT(b);
-
-	result = inner_int_inter(a, b);
-
-	pfree(a);
-	pfree(b);
-
-	PG_RETURN_POINTER( result );
-}
-
-static ArrayType  *
-inner_int_inter(ArrayType *a, ArrayType *b)
-{
-	ArrayType  *r;
-	int			na,
-				nb;
-	int		   *da,
-			   *db,
-			   *dr;
-	int			i,
-				j;
-
-	if (ARRISVOID(a) || ARRISVOID(b))
-		return new_intArrayType(0);
-
-	na = ARRNELEMS(a);
-	nb = ARRNELEMS(b);
-	da = ARRPTR(a);
-	db = ARRPTR(b);
-	r = new_intArrayType(min(na, nb));
-	dr = ARRPTR(r);
-
-	i = j = 0;
-	while (i < na && j < nb)
-		if (da[i] < db[j])
-			i++;
-		else if (da[i] == db[j])
-		{
-			if (i + j == 0 || (i + j > 0 && *(dr - 1) != db[j]))
-				*dr++ = db[j];
-			i++;
-			j++;
-		}
-		else
-			j++;
-
-	if ((dr - ARRPTR(r)) == 0)
-	{
-		pfree(r);
-		return new_intArrayType(0);
-	}
-	else
-		return resize_intArrayType(r, dr - ARRPTR(r));
-}
-
-static void
-rt__int_size(ArrayType *a, float *size)
-{
-	*size = (float) ARRNELEMS(a);
-
-	return;
-}
-
-
-/*****************************************************************************
- *				   Miscellaneous operators and functions
- *****************************************************************************/
-
-/* len >= 2 */
-static bool
-isort(int4 *a, int len)
-{
-	int4			tmp,
-				index;
-	int4		   *cur,
-			   *end;
-	bool		r = FALSE;
-
-	end = a + len;
-	do
-	{
-		index = 0;
-		cur = a + 1;
-		while (cur < end)
-		{
-			if (*(cur - 1) > *cur)
-			{
-				tmp = *(cur - 1);
-				*(cur - 1) = *cur;
-				*cur = tmp;
-				index = 1;
-			}
-			else if (!r && *(cur - 1) == *cur)
-				r = TRUE;
-			cur++;
-		}
-	} while (index);
-	return r;
-}
-
-static ArrayType *
-new_intArrayType(int num)
-{
-	ArrayType  *r;
-	int			nbytes = ARR_OVERHEAD(NDIM) + sizeof(int) * num;
-
-	r = (ArrayType *) palloc(nbytes);
-
-	MemSet(r, 0, nbytes);
-	r->size = nbytes;
-	r->ndim = NDIM;
-	r->flags &= ~LEAFKEY;
-	*((int *) ARR_DIMS(r)) = num;
-	*((int *) ARR_LBOUND(r)) = 1;
-
-	return r;
-}
-
-static ArrayType *
-resize_intArrayType(ArrayType *a, int num)
-{
-	int			nbytes = ARR_OVERHEAD(NDIM) + sizeof(int) * num;
-
-	if (num == ARRNELEMS(a))
-		return a;
-
-	a = (ArrayType *) repalloc(a, nbytes);
-
-	a->size = nbytes;
-	*((int *) ARR_DIMS(a)) = num;
-	return a;
-}
-
-static ArrayType *
-copy_intArrayType(ArrayType *a)
-{
-	ArrayType  *r;
-
-	r = new_intArrayType(ARRNELEMS(a));
-	memmove(r, a, VARSIZE(a));
-	return r;
-}
-
-/* num for compressed key */
-static int
-internal_size(int *a, int len)
-{
-	int			i,
-				size = 0;
-
-	for (i = 0; i < len; i += 2)
-		if (!i || a[i] != a[i - 1])		/* do not count repeated range */
-			size += a[i + 1] - a[i] + 1;
-
-	return size;
-}
-
-/* r is sorted and size of r > 1 */
-static ArrayType *
-_int_unique(ArrayType *r)
-{
-	int		   *tmp,
-			   *dr,
-			   *data;
-	int			num = ARRNELEMS(r);
-
-	data = tmp = dr = ARRPTR(r);
-	while (tmp - data < num)
-		if (*tmp != *dr)
-			*(++dr) = *tmp++;
-		else
-			tmp++;
-	return resize_intArrayType(r, dr + 1 - ARRPTR(r));
-}
-
-/*********************************************************************
-** intbig functions
-*********************************************************************/
-static void
-gensign(BITVEC sign, int *a, int len)
-{
-	int			i;
-
-	/* we assume that the sign vector is previously zeroed */
-	for (i = 0; i < len; i++)
-	{
-		HASH(sign, *a);
-		a++;
-	}
-}
-
-static bool
-_intbig_overlap(ArrayType *a, ArrayType *b)
-{
-	int			i;
-	BITVECP		da,
-				db;
-
-	da = SIGPTR(a);
-	db = SIGPTR(b);
-
-	LOOPBYTE(if (da[i] & db[i]) return TRUE);
-	return FALSE;
-}
-
-static bool
-_intbig_contains(ArrayType *a, ArrayType *b)
-{
-	int			i;
-	BITVECP		da,
-				db;
-
-	da = SIGPTR(a);
-	db = SIGPTR(b);
-
-	LOOPBYTE(if (db[i] & ~da[i]) return FALSE);
-
-	return TRUE;
-}
-
-static void
-rt__intbig_size(ArrayType *a, float *sz)
-{
-	int			i,
-				len = 0;
-	BITVECP		bv = SIGPTR(a);
-
-	LOOPBYTE(
-		len +=
-			GETBITBYTE(bv,0) +
-			GETBITBYTE(bv,1) +
-			GETBITBYTE(bv,2) +
-			GETBITBYTE(bv,3) +
-			GETBITBYTE(bv,4) +
-			GETBITBYTE(bv,5) +
-			GETBITBYTE(bv,6) +
-			GETBITBYTE(bv,7) ;
-		bv = (BITVECP) ( ((char*)bv) + 1 );
-	);
-
-	*sz = (float) len;
-	return;
-}
-
-static ArrayType *
-_intbig_union(ArrayType *a, ArrayType *b)
-{
-	ArrayType  *r;
-	BITVECP		da,
-				db,
-				dr;
-	int			i;
-
-	r = new_intArrayType(SIGLENINT);
-
-	da = SIGPTR(a);
-	db = SIGPTR(b);
-	dr = SIGPTR(r);
-
-	LOOPBYTE(dr[i] = da[i] | db[i]);
-
-	return r;
-}
-
-static ArrayType *
-_intbig_inter(ArrayType *a, ArrayType *b)
-{
-	ArrayType  *r;
-	BITVECP		da,
-				db,
-				dr;
-	int			i;
-
-	r = new_intArrayType(SIGLENINT);
-
-	da = SIGPTR(a);
-	db = SIGPTR(b);
-	dr = SIGPTR(r);
-
-	LOOPBYTE(dr[i] = da[i] & db[i]);
-
-	return r;
-}
-
-Datum
-g_intbig_same(PG_FUNCTION_ARGS)
-{
-	ArrayType *a = (ArrayType *)PG_GETARG_POINTER(0);
-	ArrayType *b = (ArrayType *)PG_GETARG_POINTER(1);
-	bool *result = (bool *)PG_GETARG_POINTER(2);
-	BITVECP		da,
-				db;
-	int			i;
-
-	da = SIGPTR(a);
-	db = SIGPTR(b);
-
-	LOOPBYTE(
-	if (da[i] != db[i])
-	{
-		*result = FALSE;
-		PG_RETURN_POINTER( result );
-	}
-	);
-
-	*result = TRUE;
-	PG_RETURN_POINTER( result );
-}
-
-Datum
-g_intbig_compress(PG_FUNCTION_ARGS)
-{
-	GISTENTRY *entry = (GISTENTRY *)PG_GETARG_POINTER(0);
-	GISTENTRY  *retval;
-	ArrayType  *r,
-			   *in;
-	bool maycompress = true;
-	int i;
-
-	if (DatumGetPointer(entry->key) != NULL)
-		in = (ArrayType *) PG_DETOAST_DATUM(entry->key);
-	else
-		in = NULL;
-
-	if (!entry->leafkey) {
-		LOOPBYTE(
-			if ( ( ((char*)ARRPTR(in))[i] & 0xff ) != 0xff ) {
-				maycompress = false;
-				break;
-			}
-		);
-		if ( maycompress ) {
-			retval = palloc(sizeof(GISTENTRY));
-			r = new_intArrayType(1);
-			gistentryinit(*retval, PointerGetDatum(r),
-				entry->rel, entry->page, entry->offset, VARSIZE(r), FALSE);
-			PG_RETURN_POINTER( retval );
-		}
-		PG_RETURN_POINTER( entry );
-	}
-
-	retval = palloc(sizeof(GISTENTRY));
-	r = new_intArrayType( SIGLENINT );
-
-	if (ARRISVOID(in))
-	{
-		gistentryinit(*retval, PointerGetDatum(r),
-			  entry->rel, entry->page, entry->offset, VARSIZE(r), FALSE);
-		if (in != (ArrayType *) DatumGetPointer(entry->key))
-				pfree(in);
-		PG_RETURN_POINTER (retval);
-	}
-
-	gensign(SIGPTR(r),
-			ARRPTR(in),
-			ARRNELEMS(in));
-
-	LOOPBYTE(
-		if( ( ((char*)ARRPTR(in))[i] & 0xff ) != 0xff ) {
-			maycompress = false;
-			break;
-		}
-	);
-
-	if ( maycompress ) {
-		pfree(r);
-		r = new_intArrayType(1);
-	}
-
-	gistentryinit(*retval, PointerGetDatum(r), entry->rel, entry->page, entry->offset, VARSIZE(r), FALSE);
-
-	if ( in != (ArrayType *) DatumGetPointer(entry->key))
-			pfree(in);
-
-	PG_RETURN_POINTER (retval);
-}
-
-Datum
-g_intbig_decompress(PG_FUNCTION_ARGS)
-{
-	GISTENTRY *entry = (GISTENTRY *)PG_GETARG_POINTER(0);
-	ArrayType  *key;
-
-	key = (ArrayType *) PG_DETOAST_DATUM(entry->key);
-
-	if ( key != (ArrayType *) DatumGetPointer(entry->key))
-	{
-		GISTENTRY  *retval;
-
-		retval = palloc(sizeof(GISTENTRY));
-
-		gistentryinit(*retval, PointerGetDatum(key),
-			entry->rel, entry->page, entry->offset, (key) ? VARSIZE(key) : 0, FALSE);
-		PG_RETURN_POINTER( retval );
-	}
-	if ( ARRNELEMS(key) == 1 ) {
-		GISTENTRY  *retval;
-		ArrayType  *newkey;
-
-		retval = palloc(sizeof(GISTENTRY));
-		newkey = new_intArrayType(SIGLENINT);
-		MemSet( (void*)ARRPTR(newkey), 0xff, SIGLEN );
-
-		gistentryinit(*retval, PointerGetDatum(newkey),
-			entry->rel, entry->page, entry->offset, VARSIZE(newkey), FALSE);
-		PG_RETURN_POINTER( retval );
-	}
-	PG_RETURN_POINTER( entry );
-}
-
-Datum
-g_intbig_picksplit(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_POINTER( _int_common_picksplit(
-		(bytea *)PG_GETARG_POINTER(0),
-		(GIST_SPLITVEC *)PG_GETARG_POINTER(1),
-		_intbig_union,
-		_intbig_inter,
-		rt__intbig_size,
-		0.1
-	) );
-}
-
-Datum
-g_intbig_union(PG_FUNCTION_ARGS)
-{
-		PG_RETURN_POINTER( _int_common_union(
-				(bytea *) PG_GETARG_POINTER(0),
-				(int *) PG_GETARG_POINTER(1),
-				_intbig_union
-		) );
-}
-
-Datum
-g_intbig_penalty(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_POINTER( _int_common_penalty(
-		(GISTENTRY *)PG_GETARG_POINTER(0),
-		(GISTENTRY *)PG_GETARG_POINTER(1),
-		(float *)    PG_GETARG_POINTER(2),
-		_intbig_union, rt__intbig_size
-	) );
-}
-
-Datum
-g_intbig_consistent(PG_FUNCTION_ARGS) {
-		GISTENTRY *entry = (GISTENTRY *)PG_GETARG_POINTER(0);
-		ArrayType *query = ( ArrayType * )PG_GETARG_POINTER(1);
-		StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-	bool		retval;
-	ArrayType  *q;
-
-	if ( strategy == BooleanSearchStrategy )
-		PG_RETURN_BOOL(signconsistent( (QUERYTYPE*)query,
-						SIGPTR((ArrayType *) DatumGetPointer(entry->key)),
-						false ) );
-
-	/* XXX what about toasted input? */
-	if (ARRISVOID(query))
-		return FALSE;
-
-	q = new_intArrayType(SIGLENINT);
-	gensign(SIGPTR(q),
-			ARRPTR(query),
-			ARRNELEMS(query));
-
-	switch (strategy)
-	{
-		case RTOverlapStrategyNumber:
-			retval = _intbig_overlap((ArrayType *) DatumGetPointer(entry->key), q);
-			break;
-		case RTSameStrategyNumber:
-			if ( GIST_LEAF(entry) )
-				DirectFunctionCall3(
-					g_intbig_same,
-					entry->key,
-					PointerGetDatum(q),
-					PointerGetDatum(&retval)
-				);
-			else
-				retval = _intbig_contains((ArrayType *) DatumGetPointer(entry->key), q);
-			break;
-		case RTContainsStrategyNumber:
-			retval = _intbig_contains((ArrayType *) DatumGetPointer(entry->key), q);
-			break;
-		case RTContainedByStrategyNumber:
-			retval = _intbig_overlap((ArrayType *) DatumGetPointer(entry->key), q);
-			break;
-		default:
-			retval = FALSE;
-	}
-	pfree(q);
-	PG_RETURN_BOOL(retval);
-}
-
-/*****************************************************************
-** Common GiST Method
-*****************************************************************/
-
-/*
-** The GiST Union method for _intments
-** returns the minimal set that encloses all the entries in entryvec
-*/
-static ArrayType  *
-_int_common_union(bytea *entryvec, int *sizep, formarray unionf)
-{
-	int			numranges,
-				i;
-	ArrayType  *out = (ArrayType *) NULL;
-	ArrayType  *tmp;
-
-#ifdef GIST_DEBUG
-	elog(DEBUG3, "_int_common_union in");
-#endif
-
-	numranges = (VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY);
-	tmp = (ArrayType *) DatumGetPointer(((GISTENTRY *) VARDATA(entryvec))[0].key);
-
-	for (i = 1; i < numranges; i++)
-	{
-		out = (*unionf) (tmp, (ArrayType *)
-						 DatumGetPointer(((GISTENTRY *) VARDATA(entryvec))[i].key));
-		if (i > 1 && tmp)
-			pfree(tmp);
-		tmp = out;
-	}
-
-	out->flags &= ~LEAFKEY;
-	*sizep = VARSIZE(out);
-	if (*sizep == 0)
-	{
-		pfree(out);
-#ifdef GIST_DEBUG
-		elog(DEBUG3, "_int_common_union out1");
-#endif
-		return NULL;
-	}
-#ifdef GIST_DEBUG
-	elog(DEBUG3, "_int_common_union out");
-#endif
-	return (out);
-
-}
-
-/*****************************************
- * The GiST Penalty method for _intments *
- *****************************************/
-
-static float *
-_int_common_penalty(GISTENTRY *origentry, GISTENTRY *newentry, float *result,
-					formarray unionf,
-					formfloat sizef)
-{
-	ArrayType  *ud;
-	float		tmp1,
-				tmp2;
-
-#ifdef GIST_DEBUG
-	elog(DEBUG3, "penalty");
-#endif
-	ud = (*unionf) ((ArrayType *) DatumGetPointer(origentry->key),
-					(ArrayType *) DatumGetPointer(newentry->key));
-	(*sizef) (ud, &tmp1);
-	(*sizef) ((ArrayType *) DatumGetPointer(origentry->key), &tmp2);
-	*result = tmp1 - tmp2;
-	pfree(ud);
-
-#ifdef GIST_DEBUG
-	elog(DEBUG3, "--penalty\t%g", *result);
-#endif
-
-	return (result);
-}
-
-typedef struct {
-	OffsetNumber	pos;
-	float		cost;
-} SPLITCOST;
-
-static int
-comparecost( const void *a, const void *b ) {
-	if ( ((SPLITCOST*)a)->cost == ((SPLITCOST*)b)->cost )
-		return 0;
-	else
-		return ( ((SPLITCOST*)a)->cost > ((SPLITCOST*)b)->cost ) ? 1 : -1;
-}
-
-/*
-** The GiST PickSplit method for _intments
-** We use Guttman's poly time split algorithm
-*/
-static GIST_SPLITVEC *
-_int_common_picksplit(bytea *entryvec,
-					  GIST_SPLITVEC *v,
-					  formarray unionf,
-					  formarray interf,
-					  formfloat sizef,
-					  float coef)
-{
-	OffsetNumber i,
-				j;
-	ArrayType  *datum_alpha,
-			   *datum_beta;
-	ArrayType  *datum_l,
-			   *datum_r;
-	ArrayType  *union_d,
-			   *union_dl,
-			   *union_dr;
-	ArrayType  *inter_d;
-	bool		firsttime;
-	float		size_alpha,
-				size_beta,
-				size_union,
-				size_inter;
-	float		size_waste,
-				waste;
-	float		size_l,
-				size_r;
-	int			nbytes;
-	OffsetNumber seed_1 = 0,
-				seed_2 = 0;
-	OffsetNumber *left,
-			   *right;
-	OffsetNumber maxoff;
-	SPLITCOST	*costvector;
-
-#ifdef GIST_DEBUG
-	elog(DEBUG3, "--------picksplit %d", (VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY));
-#endif
-
-	maxoff = ((VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY)) - 2;
-	nbytes = (maxoff + 2) * sizeof(OffsetNumber);
-	v->spl_left = (OffsetNumber *) palloc(nbytes);
-	v->spl_right = (OffsetNumber *) palloc(nbytes);
-
-	firsttime = true;
-	waste = 0.0;
-	for (i = FirstOffsetNumber; i < maxoff; i = OffsetNumberNext(i))
-	{
-		datum_alpha = (ArrayType *) DatumGetPointer(((GISTENTRY *) VARDATA(entryvec))[i].key);
-		for (j = OffsetNumberNext(i); j <= maxoff; j = OffsetNumberNext(j))
-		{
-			datum_beta = (ArrayType *) DatumGetPointer(((GISTENTRY *) VARDATA(entryvec))[j].key);
-
-			/* compute the wasted space by unioning these guys */
-			/* size_waste = size_union - size_inter; */
-			union_d = (*unionf) (datum_alpha, datum_beta);
-			(*sizef) (union_d, &size_union);
-			inter_d = (*interf) (datum_alpha, datum_beta);
-			(*sizef) (inter_d, &size_inter);
-			size_waste = size_union - size_inter;
-
-			pfree(union_d);
-
-			if (inter_d != (ArrayType *) NULL)
-				pfree(inter_d);
-
-			/*
-			 * are these a more promising split that what we've already
-			 * seen?
-			 */
-
-			if (size_waste > waste || firsttime)
-			{
-				waste = size_waste;
-				seed_1 = i;
-				seed_2 = j;
-				firsttime = false;
-			}
-		}
-	}
-
-	left = v->spl_left;
-	v->spl_nleft = 0;
-	right = v->spl_right;
-	v->spl_nright = 0;
-	if ( seed_1 == 0 || seed_2 == 0 ) {
-		seed_1 = 1;
-		seed_2 = 2;
-	}
-
-	datum_alpha = (ArrayType *) DatumGetPointer(((GISTENTRY *) VARDATA(entryvec))[seed_1].key);
-	datum_l = copy_intArrayType(datum_alpha);
-	(*sizef) (datum_l, &size_l);
-	datum_beta = (ArrayType *) DatumGetPointer(((GISTENTRY *) VARDATA(entryvec))[seed_2].key);
-	datum_r = copy_intArrayType(datum_beta);
-	(*sizef) (datum_r, &size_r);
-
-	maxoff = OffsetNumberNext(maxoff);
-	/*
-		 * sort entries
-	 */
-	costvector=(SPLITCOST*)palloc( sizeof(SPLITCOST)*maxoff );
-	for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i)) {
-		costvector[i-1].pos = i;
-		datum_alpha = (ArrayType *) DatumGetPointer(((GISTENTRY *) VARDATA(entryvec))[i].key);
-		union_d = (*unionf)(datum_l, datum_alpha);
-		(*sizef)(union_d, &size_alpha);
-		pfree( union_d );
-		union_d = (*unionf)(datum_r, datum_alpha);
-		(*sizef)(union_d, &size_beta);
-		pfree( union_d );
-		costvector[i-1].cost = abs( (size_alpha - size_l) - (size_beta - size_r) );
-	}
-	qsort( (void*)costvector, maxoff, sizeof(SPLITCOST), comparecost );
-
-	/*
-	 * Now split up the regions between the two seeds.	An important
-	 * property of this split algorithm is that the split vector v has the
-	 * indices of items to be split in order in its left and right
-	 * vectors.  We exploit this property by doing a merge in the code
-	 * that actually splits the page.
-	 *
-	 * For efficiency, we also place the new index tuple in this loop. This
-	 * is handled at the very end, when we have placed all the existing
-	 * tuples and i == maxoff + 1.
-	 */
-
-
-	for (j = 0; j < maxoff; j++) {
-		i = costvector[j].pos;
-
-		/*
-		 * If we've already decided where to place this item, just put it
-		 * on the right list.  Otherwise, we need to figure out which page
-		 * needs the least enlargement in order to store the item.
-		 */
-
-		if (i == seed_1)
-		{
-			*left++ = i;
-			v->spl_nleft++;
-			continue;
-		}
-		else if (i == seed_2)
-		{
-			*right++ = i;
-			v->spl_nright++;
-			continue;
-		}
-
-		/* okay, which page needs least enlargement? */
-		datum_alpha = (ArrayType *) DatumGetPointer(((GISTENTRY *) VARDATA(entryvec))[i].key);
-		union_dl = (*unionf) (datum_l, datum_alpha);
-		union_dr = (*unionf) (datum_r, datum_alpha);
-		(*sizef) (union_dl, &size_alpha);
-		(*sizef) (union_dr, &size_beta);
-
-		/* pick which page to add it to */
-		if (size_alpha - size_l < size_beta - size_r + WISH_F(v->spl_nleft, v->spl_nright, coef))
-		{
-			if (datum_l)
-				pfree(datum_l);
-			if (union_dr)
-				pfree(union_dr);
-			datum_l = union_dl;
-			size_l = size_alpha;
-			*left++ = i;
-			v->spl_nleft++;
-		}
-		else
-		{
-			if (datum_r)
-				pfree(datum_r);
-			if (union_dl)
-				pfree(union_dl);
-			datum_r = union_dr;
-			size_r = size_beta;
-			*right++ = i;
-			v->spl_nright++;
-		}
-	}
-	pfree( costvector );
-	*right = *left = FirstOffsetNumber;
-
-	datum_l->flags &= ~LEAFKEY;
-	datum_r->flags &= ~LEAFKEY;
-	v->spl_ldatum = PointerGetDatum(datum_l);
-	v->spl_rdatum = PointerGetDatum(datum_r);
-
-#ifdef GIST_DEBUG
-	elog(DEBUG3, "--------ENDpicksplit %d %d", v->spl_nleft, v->spl_nright);
-#endif
-	return v;
-}
-
-/*****************************************************************************
- *	 	BoolSearch
- *****************************************************************************/
-
-
-#define END     0
-#define ERR     1
-#define VAL     2
-#define OPR     3
-#define OPEN    4
-#define CLOSE   5
-
-/* parser's states */
-#define WAITOPERAND	1
-#define WAITENDOPERAND	2
-#define WAITOPERATOR	3
-
-/*
- * node of query tree, also used
- * for storing polish notation in parser
- */
-typedef struct NODE {
-	int4	type;
-	int4	val;
-	struct NODE 	*next;
-} NODE;
-
-typedef struct {
-	char *buf;
-	int4	state;
-	int4  count;
-	/* reverse polish notation in list (for temprorary usage)*/
-	NODE	*str;
-	/* number in str */
-	int4	num;
-} WORKSTATE;
-
-/*
- * get token from query string
- */
-static int4
-gettoken( WORKSTATE* state, int4* val ) {
-	char nnn[16], *curnnn;
-
-	curnnn=nnn;
-	while(1) {
-		switch(state->state) {
-			case WAITOPERAND:
-				curnnn=nnn;
-				if ( (*(state->buf)>='0' && *(state->buf)<='9') ||
-						*(state->buf)=='-' ) {
-					state->state = WAITENDOPERAND;
-					*curnnn = *(state->buf);
-					curnnn++;
-				} else if ( *(state->buf) == '!' ) {
-					(state->buf)++;
-					*val = (int4)'!';
-					return OPR;
-				} else if ( *(state->buf) == '(' ) {
-					state->count++;
-					(state->buf)++;
-					return OPEN;
-				} else if ( *(state->buf) != ' ' )
-					return ERR;
-				break;
-			case WAITENDOPERAND:
-				if ( *(state->buf)>='0' && *(state->buf)<='9' ) {
-					*curnnn = *(state->buf);
-					curnnn++;
-				} else {
-					*curnnn = '\0';
-					*val=(int4)atoi( nnn );
-					state->state = WAITOPERATOR;
-					return ( state->count && *(state->buf) == '\0' )
-						? ERR : VAL;
-				}
-				break;
-			case WAITOPERATOR:
-				if ( *(state->buf) == '&' || *(state->buf) == '|' ) {
-					state->state = WAITOPERAND;
-					*val = (int4) *(state->buf);
-					(state->buf)++;
-					return OPR;
-				} else if ( *(state->buf) == ')' ) {
-					(state->buf)++;
-					state->count--;
-					return ( state->count <0 ) ? ERR : CLOSE;
-				} else if ( *(state->buf) == '\0' ) {
-					return ( state->count ) ? ERR : END;
-				} else if ( *(state->buf) != ' ' )
-					return ERR;
-				break;
-			default:
-				return ERR;
-				break;
-		}
-		(state->buf)++;
-	}
-	return END;
-}
-
-/*
- * push new one in polish notation reverse view
- */
-static void
-pushquery( WORKSTATE *state, int4 type, int4 val ) {
-	NODE    *tmp = (NODE*)palloc(sizeof(NODE));
-	tmp->type=type;
-	tmp->val =val;
-	tmp->next = state->str;
-	state->str = tmp;
-	state->num++;
-}
-
-#define STACKDEPTH	16
-
-/*
- * make polish notaion of query
- */
-static int4
-makepol(WORKSTATE *state) {
-	int4 val,type;
-	int4	stack[STACKDEPTH];
-	int4	lenstack=0;
-
-	while( (type=gettoken(state, &val))!=END ) {
-		switch(type) {
-			case VAL:
-				pushquery(state, type, val);
-				while ( lenstack && (stack[ lenstack-1 ] == (int4)'&' ||
-						stack[ lenstack-1 ] == (int4)'!') ) {
-					lenstack--;
-					pushquery(state, OPR, stack[ lenstack ]);
-				}
-				break;
-			case OPR:
-				if ( lenstack && val == (int4) '|' ) {
-					pushquery(state, OPR, val);
-				} else {
-					if ( lenstack == STACKDEPTH )
-						elog(ERROR,"Stack too short");
-					stack[ lenstack ] = val;
-					lenstack++;
-				}
-				break;
-			case OPEN:
-				if ( makepol( state ) == ERR ) return ERR;
-				if ( lenstack && (stack[ lenstack-1 ] == (int4)'&' ||
-						stack[ lenstack-1 ] == (int4)'!') ) {
-					lenstack--;
-					pushquery(state, OPR, stack[ lenstack ]);
-				}
-				break;
-			case CLOSE:
-				while ( lenstack ) {
-					lenstack--;
-					pushquery(state, OPR, stack[ lenstack ]);
-				};
-				return END;
-				break;
-			case ERR:
-			default:
-				elog(ERROR,"Syntax error");
-				return ERR;
-
-		}
-	}
-
-	while (lenstack) {
-		lenstack--;
-		pushquery(state, OPR, stack[ lenstack ]);
-	};
-	return END;
-}
-
-typedef struct {
-	int4 *arrb;
-	int4 *arre;
-} CHKVAL;
-
-/*
- * is there value 'val' in array or not ?
- */
-static bool
-checkcondition_arr( void *checkval, int4 val ) {
-	int4      *StopLow = ((CHKVAL*)checkval)->arrb;
-	int4      *StopHigh = ((CHKVAL*)checkval)->arre;
-	int4      *StopMiddle;
-
-	/* Loop invariant: StopLow <= val < StopHigh */
-
-	while (StopLow < StopHigh) {
-		StopMiddle = StopLow + (StopHigh - StopLow) / 2;
-		if (*StopMiddle == val)
-			return (true);
-		else if (*StopMiddle < val )
-			StopLow = StopMiddle + 1;
-		else
-			StopHigh = StopMiddle;
-	}
-	return false;
-}
-
-static bool
-checkcondition_bit( void *checkval, int4 val ) {
-	return GETBIT( checkval, HASHVAL( val ) );
-}
-
-/*
- * check for boolean condition
- */
-static bool
-execute( ITEM* curitem, void *checkval, bool calcnot, bool (*chkcond)(void *checkval, int4 val )) {
-
-	if (  curitem->type == VAL ) {
-		return (*chkcond)( checkval, curitem->val );
-	} else if ( curitem->val == (int4)'!' ) {
-		return ( calcnot ) ?
-			( ( execute(curitem - 1, checkval, calcnot, chkcond) ) ? false : true )
-			: true;
-	} else if ( curitem->val == (int4)'&' ) {
-		if ( execute(curitem + curitem->left, checkval, calcnot, chkcond) )
-			return execute(curitem - 1, checkval, calcnot, chkcond);
-		else
-			return false;
-	} else { /* |-operator */
-		if ( execute(curitem + curitem->left, checkval, calcnot, chkcond) )
-			return true;
-		else
-			return execute(curitem - 1, checkval, calcnot, chkcond);
-	}
-	return false;
-}
-
-/*
- * signconsistent & execconsistent called by *_consistent
- */
-static bool
-signconsistent( QUERYTYPE *query, BITVEC sign, bool calcnot ) {
-	return execute(
-		GETQUERY(query) + query->size-1 ,
-		(void*)sign, calcnot,
-		checkcondition_bit
-	);
-}
-
-static bool
-execconsistent( QUERYTYPE *query, ArrayType *array, bool calcnot ) {
-	CHKVAL  chkval;
-
-	chkval.arrb = ARRPTR(array);
-	chkval.arre = chkval.arrb + ARRNELEMS(array);
-	return execute(
-		GETQUERY(query) + query->size-1 ,
-		(void*)&chkval, calcnot,
-		checkcondition_arr
-	);
-}
-
-/*
- * boolean operations
- */
-Datum
-rboolop(PG_FUNCTION_ARGS) {
-	return DirectFunctionCall2(
-		boolop,
-		PG_GETARG_DATUM(1),
-		PG_GETARG_DATUM(0)
-	);
-}
-
-Datum
-boolop(PG_FUNCTION_ARGS) {
-	ArrayType *val = ( ArrayType * )PG_DETOAST_DATUM_COPY(PG_GETARG_POINTER(0));
-	QUERYTYPE *query = ( QUERYTYPE * )PG_DETOAST_DATUM(PG_GETARG_POINTER(1));
-	CHKVAL  chkval;
-	bool result;
-
-	if ( ARRISVOID( val ) ) {
-		pfree(val);
-		PG_FREE_IF_COPY(query,1);
-		PG_RETURN_BOOL( false );
-	}
-
-	PREPAREARR(val);
-	chkval.arrb = ARRPTR(val);
-	chkval.arre = chkval.arrb + ARRNELEMS(val);
-	result = execute(
-		GETQUERY(query) + query->size-1 ,
-		&chkval, true,
-		checkcondition_arr
-	);
-	pfree(val);
-
-	PG_FREE_IF_COPY(query,1);
-	PG_RETURN_BOOL( result );
-}
-
-static void
-findoprnd( ITEM *ptr, int4 *pos ) {
-#ifdef BS_DEBUG
-	elog(DEBUG3, ( ptr[*pos].type == OPR ) ?
-		"%d  %c" : "%d  %d ", *pos, ptr[*pos].val );
-#endif
-	if ( ptr[*pos].type == VAL ) {
-		ptr[*pos].left = 0;
-		(*pos)--;
-	} else if ( ptr[*pos].val == (int4)'!' ) {
-		ptr[*pos].left = -1;
-		(*pos)--;
-		findoprnd( ptr, pos );
-	} else {
-		ITEM *curitem = &ptr[*pos];
-		int4 tmp = *pos;
-		(*pos)--;
-		findoprnd(ptr,pos);
-		curitem->left = *pos - tmp;
-		findoprnd(ptr,pos);
-	}
-}
-
-
-/*
- * input
- */
-Datum
-bqarr_in(PG_FUNCTION_ARGS) {
-	char *buf=(char*)PG_GETARG_POINTER(0);
-	WORKSTATE state;
-	int4 i;
-	QUERYTYPE	*query;
-	int4 commonlen;
-	ITEM *ptr;
-	NODE *tmp;
-	int4 pos=0;
-#ifdef BS_DEBUG
-	char pbuf[16384],*cur;
-#endif
-
-	state.buf = buf;
-	state.state = WAITOPERAND;
-	state.count = 0;
-	state.num = 0;
-	state.str=NULL;
-
-	/* make polish notation (postfix, but in reverse order) */
-	makepol( &state );
-	if (!state.num)
-		elog( ERROR,"Empty query");
-
-	commonlen = COMPUTESIZE(state.num);
-	query = (QUERYTYPE*) palloc( commonlen );
-	query->len = commonlen;
-	query->size = state.num;
-	ptr = GETQUERY(query);
-
-	for(i=state.num-1; i>=0; i-- ) {
-		ptr[i].type = state.str->type;
-		ptr[i].val = state.str->val;
-		tmp = state.str->next;
-		pfree( state.str );
-		state.str = tmp;
-	}
-
-	pos = query->size-1;
-	findoprnd( ptr, &pos );
-#ifdef BS_DEBUG
-	cur = pbuf;
-	*cur = '\0';
-	for( i=0;i<query->size;i++ ) {
-		if ( ptr[i].type == OPR )
-			sprintf(cur, "%c(%d) ", ptr[i].val, ptr[i].left);
-		else
-			sprintf(cur, "%d ", ptr[i].val );
-		cur = strchr(cur,'\0');
-	}
-	elog(DEBUG3,"POR: %s", pbuf);
-#endif
-
-	PG_RETURN_POINTER( query );
-}
-
-
-/*
- * out function
- */
-typedef struct {
-	ITEM    *curpol;
-	char *buf;
-	char *cur;
-	int4 buflen;
-} INFIX;
-
-#define RESIZEBUF(inf,addsize) while( ( inf->cur - inf->buf ) + addsize + 1 >= inf->buflen ) { \
-	int4 len = inf->cur - inf->buf; \
-	inf->buflen *= 2; \
-	inf->buf = (char*) repalloc( (void*)inf->buf, inf->buflen ); \
-	inf->cur = inf->buf + len; \
-}
-
-static void
-infix(INFIX *in, bool first) {
-	if ( in->curpol->type == VAL ) {
-		RESIZEBUF(in, 11);
-		sprintf(in->cur, "%d", in->curpol->val );
-		in->cur = strchr( in->cur, '\0' );
-		in->curpol--;
-	} else if ( in->curpol->val == (int4)'!' ) {
-		bool isopr = false;
-		RESIZEBUF(in, 1);
-		*(in->cur) = '!';
-		in->cur++;
-		*(in->cur) = '\0';
-		in->curpol--;
-		if ( in->curpol->type == OPR ) {
-			isopr = true;
-			RESIZEBUF(in, 2);
-			sprintf(in->cur, "( ");
-			in->cur = strchr( in->cur, '\0' );
-		}
-		infix( in, isopr );
-		if ( isopr ) {
-			RESIZEBUF(in, 2);
-			sprintf(in->cur, " )");
-			in->cur = strchr( in->cur, '\0' );
-		}
-	} else {
-		int4 op = in->curpol->val;
-		INFIX   nrm;
-
-		in->curpol--;
-		if ( op == (int4)'|' && ! first) {
-			RESIZEBUF(in, 2);
-			sprintf(in->cur, "( ");
-			in->cur = strchr( in->cur, '\0' );
-		}
-
-		nrm.curpol = in->curpol;
-		nrm.buflen = 16;
-		nrm.cur = nrm.buf = (char*)palloc( sizeof(char) * nrm.buflen );
-
-		/* get right operand */
-		infix( &nrm, false );
-
-		/* get & print left operand */
-		in->curpol = nrm.curpol;
-		infix( in, false );
-
-		/* print operator & right operand*/
-		RESIZEBUF(in, 3 + (nrm.cur - nrm.buf) );
-		sprintf(in->cur, " %c %s", op, nrm.buf);
-		in->cur = strchr( in->cur, '\0' );
-		pfree( nrm.buf );
-
-		if ( op == (int4)'|' && ! first) {
-			RESIZEBUF(in, 2);
-			sprintf(in->cur, " )");
-			in->cur = strchr( in->cur, '\0' );
-		}
-	}
-}
-
-
-Datum
-bqarr_out(PG_FUNCTION_ARGS) {
-	QUERYTYPE       *query = (QUERYTYPE*)PG_DETOAST_DATUM(PG_GETARG_POINTER(0));
-	INFIX   nrm;
-
-	if ( query->size == 0 )
-		elog(ERROR,"Empty");
-	nrm.curpol = GETQUERY(query) + query->size - 1;
-	nrm.buflen = 32;
-	nrm.cur = nrm.buf = (char*)palloc( sizeof(char) * nrm.buflen );
-	*(nrm.cur) = '\0';
-	infix( &nrm, true );
-
-	PG_FREE_IF_COPY(query,0);
-	PG_RETURN_POINTER( nrm.buf );
-}
-
-static int4
-countdroptree( ITEM *q, int4 pos ) {
-	if ( q[pos].type == VAL ) {
-		return 1;
-	} else if ( q[pos].val == (int4)'!' ) {
-		return 1+countdroptree(q, pos-1);
-	} else {
-		return 1 + countdroptree(q, pos-1) + countdroptree(q, pos + q[pos].left);
-	}
-}
-
-/*
- * common algorithm:
- * result of all '!' will be = 'true', so
- * we can modify query tree for clearing
- */
-static int4
-shorterquery( ITEM *q, int4 len ) {
-	int4 index,posnot,poscor;
-	bool notisleft = false;
-	int4 drop,i;
-
-	/* out all '!' */
-	do {
-		index=0;
-		drop=0;
-		/* find ! */
-		for(posnot=0; posnot < len; posnot++)
-			if ( q[posnot].type == OPR  && q[posnot].val == (int4)'!') {
-				index=1;
-				break;
-			}
-
-		if ( posnot == len )
-			return len;
-
-		/* last operator is ! */
-		if ( posnot == len-1 )
-			return 0;
-
-		/* find operator for this operand */
-		for( poscor=posnot+1; poscor<len; poscor++) {
-			if ( q[poscor].type == OPR ) {
-				if ( poscor == posnot+1 ) {
-					notisleft = false;
-					break;
-				} else if ( q[poscor].left + poscor == posnot ) {
-					notisleft = true;
-					break;
-				}
-			}
-		}
-		if ( q[poscor].val == (int4)'!' ) {
-			drop = countdroptree(q, poscor);
-			q[poscor-1].type=VAL;
-			for(i=poscor+1;i<len;i++)
-				if ( q[i].type == OPR && q[i].left + i <= poscor )
-					q[i].left += drop - 2;
-			memcpy( (void*)&q[poscor-drop+1],
-				(void*)&q[poscor-1],
-				sizeof(ITEM) * ( len - (poscor-1) ));
-			len -= drop - 2;
-		} else if ( q[poscor].val == (int4)'|' ) {
-			drop = countdroptree(q, poscor);
-			q[poscor-1].type=VAL;
-			q[poscor].val=(int4)'!';
-			q[poscor].left=-1;
-			for(i=poscor+1;i<len;i++)
-				if ( q[i].type == OPR && q[i].left + i < poscor )
-					q[i].left += drop - 2;
-			memcpy( (void*)&q[poscor-drop+1],
-				(void*)&q[poscor-1],
-				sizeof(ITEM) * ( len - (poscor-1) ));
-			len -= drop - 2;
-		} else { /* &-operator */
-			if (
-					(notisleft && q[poscor-1].type == OPR &&
-						q[poscor-1].val == (int4)'!' ) ||
-					(!notisleft && q[poscor+q[poscor].left].type == OPR &&
-						q[poscor+q[poscor].left].val == (int4)'!' )
-				) { /* drop subtree */
-				drop = countdroptree(q, poscor);
-				q[poscor-1].type=VAL;
-				q[poscor].val=(int4)'!';
-				q[poscor].left=-1;
-				for(i=poscor+1;i<len;i++)
-					if ( q[i].type == OPR && q[i].left + i < poscor )
-						q[i].left += drop - 2;
-				memcpy( (void*)&q[poscor-drop+1],
-					(void*)&q[poscor-1],
-					sizeof(ITEM) * ( len - (poscor-1) ));
-				len -= drop - 2;
-			} else { /* drop only operator */
-				int4 subtreepos = ( notisleft ) ?
-					poscor-1 : poscor+q[poscor].left;
-				int4 subtreelen = countdroptree( q, subtreepos );
-				drop = countdroptree(q, poscor);
-				for(i=poscor+1;i<len;i++)
-					if ( q[i].type == OPR && q[i].left + i < poscor )
-						q[i].left += drop - subtreelen;
-				memcpy( (void*)&q[ subtreepos+1 ],
-					(void*)&q[poscor+1],
-					sizeof(ITEM)*( len - (poscor-1) ) );
-				memcpy( (void*)&q[ poscor-drop+1 ],
-					(void*)&q[subtreepos-subtreelen+1],
-					sizeof(ITEM)*( len - (drop-subtreelen) ) );
-				len -= drop - subtreelen;
-			}
-		}
-	} while( index );
-	return len;
-}
-
-
-Datum
-querytree(PG_FUNCTION_ARGS) {
-	QUERYTYPE       *query = (QUERYTYPE*)PG_DETOAST_DATUM(PG_GETARG_POINTER(0));
-	INFIX   nrm;
-	text 	*res;
-	ITEM	*q;
-	int4	len;
-
-	if ( query->size == 0 )
-		elog(ERROR,"Empty");
-
-	q = (ITEM*)palloc( sizeof(ITEM) * query->size );
-	memcpy( (void*)q, GETQUERY(query), sizeof(ITEM) * query->size );
-	len = shorterquery( q, query->size );
-	PG_FREE_IF_COPY(query,0);
-
-	if ( len == 0 ) {
-		res = (text*) palloc( 1 + VARHDRSZ );
-		VARATT_SIZEP(res) = 1 + VARHDRSZ;
-		*((char*)VARDATA(res)) = 'T';
-	} else {
-		nrm.curpol = q + len - 1;
-		nrm.buflen = 32;
-		nrm.cur = nrm.buf = (char*)palloc( sizeof(char) * nrm.buflen );
-		*(nrm.cur) = '\0';
-		infix( &nrm, true );
-
-		res = (text*) palloc( nrm.cur-nrm.buf + VARHDRSZ );
-		VARATT_SIZEP(res) = nrm.cur-nrm.buf + VARHDRSZ;
-		strncpy( VARDATA(res), nrm.buf, nrm.cur-nrm.buf );
-	}
-	pfree(q);
-
-	PG_RETURN_POINTER( res );
-}
diff --git a/contrib/intarray/_int.sql.in b/contrib/intarray/_int.sql.in
deleted file mode 100644
index 4d9031f653..0000000000
--- a/contrib/intarray/_int.sql.in
+++ /dev/null
@@ -1,437 +0,0 @@
--- Create the user-defined type for the 1-D integer arrays (_int4)
--- 
-BEGIN TRANSACTION;
-
--- Query type
-CREATE FUNCTION bqarr_in(opaque)
-RETURNS opaque
-AS 'MODULE_PATHNAME'
-LANGUAGE 'c' with (isstrict);
-
-CREATE FUNCTION bqarr_out(opaque)
-RETURNS opaque
-AS 'MODULE_PATHNAME'
-LANGUAGE 'c' with (isstrict);
-
-CREATE TYPE query_int (
-internallength = -1,
-input = bqarr_in,
-output = bqarr_out
-);
-
---only for debug
-CREATE FUNCTION querytree(query_int)
-RETURNS text
-AS 'MODULE_PATHNAME'
-LANGUAGE 'c' with (isstrict);
-
-
-CREATE FUNCTION boolop(_int4, query_int) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION boolop(_int4, query_int) IS 'boolean operation with array';
-
-CREATE FUNCTION rboolop(query_int, _int4) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION rboolop(query_int, _int4) IS 'boolean operation with array';
-
-CREATE OPERATOR @@ (
-   LEFTARG = _int4, RIGHTARG = query_int, PROCEDURE = boolop,
-   COMMUTATOR = '~~', RESTRICT = contsel, JOIN = contjoinsel
-);
-
-CREATE OPERATOR ~~ (
-   LEFTARG = query_int, RIGHTARG = _int4, PROCEDURE = rboolop,
-   COMMUTATOR = '@@', RESTRICT = contsel, JOIN = contjoinsel
-);
-
-
---
--- External C-functions for R-tree methods
---
-
--- Comparison methods
-
-CREATE FUNCTION _int_contains(_int4, _int4) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION _int_contains(_int4, _int4) IS 'contains';
-
-CREATE FUNCTION _int_contained(_int4, _int4) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION _int_contained(_int4, _int4) IS 'contained in';
-
-CREATE FUNCTION _int_overlap(_int4, _int4) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION _int_overlap(_int4, _int4) IS 'overlaps';
-
-CREATE FUNCTION _int_same(_int4, _int4) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION _int_same(_int4, _int4) IS 'same as';
-
-CREATE FUNCTION _int_different(_int4, _int4) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION _int_different(_int4, _int4) IS 'different';
-
--- support routines for indexing
-
-CREATE FUNCTION _int_union(_int4, _int4) RETURNS _int4
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-CREATE FUNCTION _int_inter(_int4, _int4) RETURNS _int4
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
---
--- OPERATORS
---
-
-CREATE OPERATOR && (
-   LEFTARG = _int4, RIGHTARG = _int4, PROCEDURE = _int_overlap,
-   COMMUTATOR = '&&',
-   RESTRICT = contsel, JOIN = contjoinsel
-);
-
---CREATE OPERATOR = (
---   LEFTARG = _int4, RIGHTARG = _int4, PROCEDURE = _int_same,
---   COMMUTATOR = '=', NEGATOR = '<>',
---   RESTRICT = eqsel, JOIN = eqjoinsel,
---   SORT1 = '<', SORT2 = '<'
---);
-
-CREATE OPERATOR <> (
-   LEFTARG = _int4, RIGHTARG = _int4, PROCEDURE = _int_different,
-   COMMUTATOR = '<>', NEGATOR = '=',
-   RESTRICT = neqsel, JOIN = neqjoinsel
-);
-
-CREATE OPERATOR @ (
-   LEFTARG = _int4, RIGHTARG = _int4, PROCEDURE = _int_contains,
-   COMMUTATOR = '~', RESTRICT = contsel, JOIN = contjoinsel
-);
-
-CREATE OPERATOR ~ (
-   LEFTARG = _int4, RIGHTARG = _int4, PROCEDURE = _int_contained,
-   COMMUTATOR = '@', RESTRICT = contsel, JOIN = contjoinsel
-);
-
-
--- define the GiST support methods
-CREATE FUNCTION g_int_consistent(opaque,_int4,int4) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-CREATE FUNCTION g_int_compress(opaque) RETURNS opaque 
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-CREATE FUNCTION g_int_decompress(opaque) RETURNS opaque 
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-CREATE FUNCTION g_int_penalty(opaque,opaque,opaque) RETURNS opaque
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-CREATE FUNCTION g_int_picksplit(opaque, opaque) RETURNS opaque
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-CREATE FUNCTION g_int_union(bytea, opaque) RETURNS _int4 
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-CREATE FUNCTION g_int_same(_int4, _int4, opaque) RETURNS opaque 
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-
--- register the default opclass for indexing
-INSERT INTO pg_opclass (opcamid, opcname, opcnamespace, opcowner, opcintype, opcdefault, opckeytype)
-    VALUES (
-        (SELECT oid FROM pg_am WHERE amname = 'gist'),
-        'gist__int_ops',
-        (SELECT oid FROM pg_namespace WHERE nspname = 'pg_catalog'),
-        1,	-- UID of superuser is hardwired to 1 as of PG 7.3
-        (SELECT oid FROM pg_type WHERE typname = '_int4'),
-        true,
-        0);
-
-
--- get the comparators for _intments and store them in a tmp table
-SELECT o.oid AS opoid, o.oprname
-INTO TEMP TABLE _int_ops_tmp
-FROM pg_operator o, pg_type t, pg_type tq
-WHERE o.oprleft = t.oid and ( o.oprright = t.oid or o.oprright=tq.oid )
-   and t.typname = '_int4'
-   and tq.typname='query_int';
-
--- make sure we have the right operators
--- SELECT * from _int_ops_tmp;
-
--- using the tmp table, generate the amop entries 
-
--- _int_overlap
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 3, false, c.opoid
-   FROM pg_opclass opcl, _int_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__int_ops' 
-      and c.oprname = '&&';
-
--- _int_same
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 6, true, c.opoid
-   FROM pg_opclass opcl, _int_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__int_ops' 
-      and c.oprname = '=';
-
--- _int_contains
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 7, false, c.opoid
-   FROM pg_opclass opcl, _int_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__int_ops' 
-      and c.oprname = '@';
-
--- _int_contained
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 8, false, c.opoid
-   FROM pg_opclass opcl, _int_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__int_ops' 
-      and c.oprname = '~';
-
---boolean search
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 20, false, c.opoid
-   FROM pg_opclass opcl, _int_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__int_ops' 
-      and c.oprname = '@@';
-
-DROP TABLE _int_ops_tmp;
-
-
--- add the entries to amproc for the support methods
--- note the amprocnum numbers associated with each are specific!
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 1, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__int_ops'
-      and proname = 'g_int_consistent';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 2, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__int_ops'
-      and proname = 'g_int_union';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 3, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__int_ops'
-      and proname = 'g_int_compress';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 4, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__int_ops'
-      and proname = 'g_int_decompress';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 5, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__int_ops'
-      and proname = 'g_int_penalty';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 6, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__int_ops'
-      and proname = 'g_int_picksplit';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 7, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__int_ops'
-      and proname = 'g_int_same';
-
-
----------------------------------------------
--- intbig
----------------------------------------------
--- define the GiST support methods
-CREATE FUNCTION g_intbig_consistent(opaque,_int4,int4) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-CREATE FUNCTION g_intbig_compress(opaque) RETURNS opaque 
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-CREATE FUNCTION g_intbig_decompress(opaque) RETURNS opaque 
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-CREATE FUNCTION g_intbig_penalty(opaque,opaque,opaque) RETURNS opaque
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-CREATE FUNCTION g_intbig_picksplit(opaque, opaque) RETURNS opaque
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-CREATE FUNCTION g_intbig_union(bytea, opaque) RETURNS _int4 
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-CREATE FUNCTION g_intbig_same(_int4, _int4, opaque) RETURNS opaque 
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
--- register the opclass for indexing (not as default)
-INSERT INTO pg_opclass (opcamid, opcname, opcnamespace, opcowner, opcintype, opcdefault, opckeytype)
-    VALUES (
-        (SELECT oid FROM pg_am WHERE amname = 'gist'),
-        'gist__intbig_ops',
-        (SELECT oid FROM pg_namespace WHERE nspname = 'pg_catalog'),
-        1,	-- UID of superuser is hardwired to 1 as of PG 7.3
-        (SELECT oid FROM pg_type WHERE typname = '_int4'),
-        false,
-        0);
-
-
--- get the comparators for _intments and store them in a tmp table
-SELECT o.oid AS opoid, o.oprname
-INTO TEMP TABLE _int_ops_tmp
-FROM pg_operator o, pg_type t, pg_type tq
-WHERE o.oprleft = t.oid and ( o.oprright = t.oid or o.oprright=tq.oid )
-   and t.typname = '_int4'
-   and tq.typname='query_int';
-
--- make sure we have the right operators
--- SELECT * from _int_ops_tmp;
-
--- using the tmp table, generate the amop entries 
--- note: these operators are all lossy
-
--- _int_overlap
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 3, true, c.opoid
-   FROM pg_opclass opcl, _int_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__intbig_ops' 
-      and c.oprname = '&&';
-
--- _int_contains
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 7, true, c.opoid
-   FROM pg_opclass opcl, _int_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__intbig_ops' 
-      and c.oprname = '@';
-
--- _int_contained
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 8, true, c.opoid
-   FROM pg_opclass opcl, _int_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__intbig_ops' 
-      and c.oprname = '~';
-
--- _int_same
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 6, true, c.opoid
-   FROM pg_opclass opcl, _int_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__intbig_ops' 
-      and c.oprname = '=';
-
---boolean search
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 20, true, c.opoid
-   FROM pg_opclass opcl, _int_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__intbig_ops' 
-      and c.oprname = '@@';
-
-DROP TABLE _int_ops_tmp;
-
-
--- add the entries to amproc for the support methods
--- note the amprocnum numbers associated with each are specific!
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 1, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__intbig_ops'
-      and proname = 'g_intbig_consistent';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 2, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__intbig_ops'
-      and proname = 'g_intbig_union';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 3, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__intbig_ops'
-      and proname = 'g_intbig_compress';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 4, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__intbig_ops'
-      and proname = 'g_intbig_decompress';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 5, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__intbig_ops'
-      and proname = 'g_intbig_penalty';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 6, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__intbig_ops'
-      and proname = 'g_intbig_picksplit';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 7, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist__intbig_ops'
-      and proname = 'g_intbig_same';
-
-END TRANSACTION;
diff --git a/contrib/intarray/bench/bench.pl b/contrib/intarray/bench/bench.pl
deleted file mode 100755
index 2e30956721..0000000000
--- a/contrib/intarray/bench/bench.pl
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/bin/perl 
-
-use strict;
-# make sure we are in a sane environment.
-use DBI();
-use DBD::Pg();
-use Time::HiRes qw( usleep ualarm gettimeofday tv_interval );
-use Getopt::Std;
-
-my %opt;
-getopts('d:b:s:veorauc', \%opt);
-
-if ( !( scalar %opt && defined $opt{s} ) ) {
-	print <<EOT;
-Usage:
-$0 -d DATABASE -s SECTIONS [-b NUMBER] [-v] [-e] [-o] [-r] [-a] [-u]
--d DATABASE   	-DATABASE
--b NUMBER   	-number of repeats
--s SECTIONS 	-sections, format	sid1[,sid2[,sid3[...]]]]
--v 		-verbose (show SQL)
--e		-show explain
--r		-use RD-tree index
--a		-AND section
--o		-show output
--u		-unique
--c 		-count
-
-EOT
-	exit;
-}
-
-$opt{d} ||= '_int4';
-my $dbi=DBI->connect('DBI:Pg:dbname='.$opt{d});
-
-my %table;
-my @where;
-
-$table{message}=1;
-
-if ( $opt{a} ) {
-	if ( $opt{r} ) {
-		push @where, "message.sections @ '{$opt{s}}'";
-	} else {
-		foreach my $sid ( split(/[,\s]+/, $opt{s} )) {
-			push @where, "EXISTS ( select  message_section_map.mid from message_section_map where message.mid=message_section_map.mid and message_section_map.sid = $sid )";
-		}
-	}
-} else {
-	if ( $opt{r} ) {
-		push @where, "message.sections && '{$opt{s}}'";
-	} else {
-		$table{message_section_map} = 1;
-		push @where, "message.mid = message_section_map.mid";
-		push @where, "message_section_map.sid in ($opt{s})";
-	}
-}
-
-my $outf;
-if ( $opt{c} ) {
-	$outf = ( $opt{u} ) ? 'count( distinct message.mid )' : 'count( message.mid )';
-} else {
-	$outf = ( $opt{u} ) ? 'distinct( message.mid )' : 'message.mid';
-}
-my $sql = "select $outf from ".join(', ', keys %table)." where ".join(' AND ', @where).';';
-
-if ( $opt{v} ) {
-	print "$sql\n";
-}
-
-if ( $opt{e} ) {
-	$dbi->do("explain $sql");
-}
-
-my $t0 = [gettimeofday];
-my $count=0;
-my $b=$opt{b};
-$b||=1;
-my @a;
-foreach ( 1..$b ) {
-	@a=exec_sql($dbi,$sql);
-	$count=$#a;
-}
-my $elapsed = tv_interval ( $t0, [gettimeofday]);
-if ( $opt{o} ) {
-	foreach ( @a ) {
-		print "$_->{mid}\t$_->{sections}\n";
-	}
-} 
-print sprintf("total: %.02f sec; number: %d; for one: %.03f sec; found %d docs\n", $elapsed, $b, $elapsed/$b, $count+1 );
-$dbi -> disconnect;
-
-sub exec_sql {
-        my ($dbi, $sql, @keys) = @_;
-        my $sth=$dbi->prepare($sql) || die;
-        $sth->execute( @keys ) || die; 
-        my $r;  
-        my @row;
-        while ( defined ( $r=$sth->fetchrow_hashref ) ) {
-                push @row, $r;
-        }               
-        $sth->finish;   
-        return @row;
-}
-
diff --git a/contrib/intarray/bench/create_test.pl b/contrib/intarray/bench/create_test.pl
deleted file mode 100755
index b39d1fb473..0000000000
--- a/contrib/intarray/bench/create_test.pl
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-print <<EOT;
-create table message (
-	mid	int not null,
-	sections	int[]
-);
-create table message_section_map (
-	mid 	int not null,
-	sid	int not null
-);
-
-EOT
-
-open(MSG,">message.tmp") || die;
-open(MAP,">message_section_map.tmp") || die;
-
-srand( 1 );
-#foreach my $i ( 1..1778 ) {
-#foreach my $i ( 1..3443 ) {
-#foreach my $i ( 1..5000 ) {
-#foreach my $i ( 1..29362 ) {
-#foreach my $i ( 1..33331 ) {
-#foreach my $i ( 1..83268 ) {
-foreach my $i ( 1..200000 ) {
-	my @sect;
-	if ( rand() < 0.7 ) {
-		$sect[0] = int( (rand()**4)*100 );
-	} else {
-		my %hash;
-		@sect = grep { $hash{$_}++; $hash{$_} <= 1 } map { int( (rand()**4)*100) } 0..( int(rand()*5) );
-	}
-	if ( $#sect < 0 || rand() < 0.1 ) {
-		print MSG "$i\t\\N\n";
-	} else {
-		print MSG "$i\t{".join(',',@sect)."}\n";
-		map { print MAP "$i\t$_\n" } @sect;
-	}
-}
-close MAP;
-close MSG;
-
-copytable('message');
-copytable('message_section_map');
-
-print <<EOT;
-
-CREATE unique index message_key on message ( mid );
---CREATE unique index message_section_map_key1 on message_section_map ( mid, sid );
-CREATE unique index message_section_map_key2 on message_section_map ( sid, mid );
-CREATE INDEX message_rdtree_idx on message using gist ( sections gist__int_ops );
-VACUUM ANALYZE;
-
-select count(*) from message;
-select count(*) from message_section_map;
-
-
-
-EOT
-
-
-unlink 'message.tmp', 'message_section_map.tmp';
-
-sub copytable {
-	my $t = shift;
-	
-	print "COPY $t from stdin;\n";
-	open( FFF, "$t.tmp") || die;
-	while(<FFF>) { print; }
-	close FFF;
-	print "\\.\n";
-}
diff --git a/contrib/intarray/data/test__int.data b/contrib/intarray/data/test__int.data
deleted file mode 100644
index b3903d0f33..0000000000
--- a/contrib/intarray/data/test__int.data
+++ /dev/null
@@ -1,7000 +0,0 @@
-{18,31,54,95}
-{23,50,13,9,39}
-{99,54,77}
-{79,83,16,63,32}
-{52,41,61,79,94,87}
-{76,59,39,36,21}
-{}
-{41,79,76,96,3}
-{25,59,5,96,32}
-{92,58,12,57}
-{24,48,41,88}
-{39,5,17}
-{10,41,78,25,35}
-{31,89,4}
-{68,74,94}
-{97,78,44,68,81,16}
-{87,76}
-{30,81}
-{72,20,99,26}
-{87,90,98,40,44}
-{24,99,66,61}
-{79,8,48,16}
-{62,99,48,80,75,39}
-{10,60,35,15}
-{45,71,10,97,56}
-{64,79,19,31}
-{30,57,42,31,45}
-{61,42,14,26}
-{12,38,65,36,56,36}
-{17,62,18,56}
-{84,85,90,60,55,17}
-{27,11,82,20,43}
-{14,27,18,48,39,51}
-{53,13,52}
-{56,35,81,60,27}
-{79,89,89,7}
-{65,17,31,17,29,85}
-{21,3}
-{53,55,16,83,4}
-{62,3,63}
-{73,40,99}
-{23,80}
-{2,74,42,37,21}
-{12,16}
-{80,60}
-{19,62,34}
-{38,19,31,6,15,2}
-{63,96,64,4,36,15}
-{9,3}
-{91,87,15,18,7,66}
-{17,10}
-{77,96}
-{11,43,31,2,89}
-{17,77,89,50}
-{24,6,61,88,51}
-{61,50,59,90,5,89}
-{58,1,39,48}
-{78,36,70,92}
-{43,3,22,95,51}
-{}
-{88,64,25,64,86}
-{34,6,49,90,25}
-{86,35,13,22}
-{21,44,83}
-{42,88,72,65,59,96}
-{36,33,1,98}
-{16,54}
-{35,16,44}
-{73,23,20}
-{84,25,1,52,35}
-{27,36,54,87,31}
-{38,47,83,3}
-{64,13}
-{65,84,85,16,22}
-{57,9,39,73}
-{89,11,67,55,73}
-{78,39,84,63,62,45}
-{50,63,8}
-{}
-{96,36,58,65,96}
-{59,86,41,30}
-{90,60,39,47,19}
-{70,100,73,99}
-{}
-{85,14,39}
-{76,53}
-{96,38,52,13,87,85}
-{97,51,15,30,53,87}
-{30,59,9,40,13}
-{31,91,68,79}
-{37,56,39,78,75}
-{82,2,47}
-{33,25,45,40}
-{51,21,92,20,18,76}
-{84,93,36,95,34,69}
-{66,25,5,40}
-{77,6,57,42}
-{}
-{88,81,85,37,12}
-{56,73,38}
-{70,70,6,19}
-{82,54,91}
-{75,8}
-{45,33,64,90,95}
-{8,71,66,12}
-{56,26,68,94}
-{70,77,4,96,62,83}
-{23,87}
-{34,34,4,33}
-{28,84}
-{78,75,77}
-{88,53}
-{27,38}
-{2,2,82}
-{30,52,88,61,33}
-{29,72,94,68}
-{85,72}
-{88,4}
-{63,90,43,66,24,33}
-{88,48,47}
-{3,11,98,37,61}
-{45,65,63,15,38}
-{79,45,56,94}
-{56,74,78,19,76}
-{24,81,64,13,100}
-{93,27,63,71,27,3}
-{74,13,85,86,32,60}
-{98,40,63,13}
-{41,95,19,93,17,84}
-{90,28,100,100,19,2}
-{35,15,54}
-{29,81,77}
-{54,64,63,12,18}
-{38,43,85,21,35}
-{84,28,27,4,80,27}
-{80,77,55,98}
-{13,71,48,55,89,38}
-{58,43,27,5,57}
-{5,33,96,6}
-{73,93,87,69,100,24}
-{58,96,38,85,55,51}
-{37,30,88,4,8,59}
-{24,68,43,48,18,84}
-{23,100,82,30,42}
-{23,36,16,99,27}
-{41,75}
-{66,41,10,37,16,6}
-{54,49,60}
-{4,56,44,72,40}
-{71,96,67,100,59}
-{7,41}
-{8,3,27}
-{38,69,47,68,5,24}
-{43,100,59,62}
-{92,14,34,5,71,48}
-{72,5,91,29,99,36}
-{62,71,37,80,62,50}
-{32,45,17}
-{89,68}
-{52,17,55}
-{21,47,15,92}
-{36,100,5}
-{14,76,59,11,15}
-{59,72}
-{37,55,89,49}
-{87,79,96,20,93}
-{6,44}
-{32,46,25}
-{27,47,76,4,54}
-{2,16}
-{90,36}
-{11,19,27,79}
-{54,4}
-{72,88}
-{14,85,71,69,5,22}
-{31,48}
-{28,35,18}
-{77,55,100,73,57,62}
-{}
-{14,59,53}
-{98,3}
-{13,56}
-{26,61,88,54,88,33}
-{70,12}
-{55,16,15,42,76}
-{13,75}
-{97,38,82,51,86,53}
-{41,76,39,84,32}
-{94,66,47}
-{55,28}
-{}
-{94,65,59,20}
-{55,50,56,14,58}
-{14,94,52,25,69,95}
-{20,96}
-{37,38}
-{26,35,9,98,74}
-{11,9,41,79}
-{36,57,87,69,92,89}
-{11,39,60,4,47,3}
-{97,5}
-{16,58,38,98,42}
-{46,69}
-{35,54}
-{36,79,54}
-{}
-{63,78}
-{12,86,52,29,60,30}
-{29,27,58,86,42,62}
-{42,12,60}
-{90,93,85,29}
-{16,8,45}
-{29,33,85}
-{32,14,6,47,74}
-{14,85,14,26,3}
-{46,71,10,16}
-{30,63}
-{}
-{91,30,56}
-{46,36,68,91,36,88}
-{24,61}
-{66,21,80,14}
-{43,63,50,21,11}
-{38,46,18,51}
-{38,28,70}
-{17,41,76,1,30}
-{47,63}
-{56,80,85,1,7,97}
-{75,5,79,32}
-{5,17,66,51,68}
-{6,83,2}
-{25,40,79,84}
-{58,38,12,68}
-{55,86,20,67,27}
-{58,64}
-{14,51}
-{12,86,57,68}
-{61,91,65,3,83,68}
-{40,31,82,21}
-\N
-{24,64,35,32}
-{32,83,18,27,43,32}
-{50,83}
-{94,84,58,3,25,79}
-{66,2,27,36,24}
-{71,34}
-{17,57}
-{22,40,49,50,10}
-{79,62,94,78}
-{92,79,24,72}
-{23,41}
-{69,60,77,70,18,48}
-{39,45,91,85}
-{27,43,22,21,85}
-{84,51,96,7,18}
-{100,38,69,93,66,39}
-{73,42,35,15,69,98}
-{100,17,37,15,40}
-{1,91,2,17,90,48}
-{18,12,52,24}
-{39,43,89}
-{16,13,88}
-{69,8,75}
-{34,91,54,81}
-{37,68,89,1,56}
-{81,83,39,36,14}
-{12,15,2}
-{14,16,88,43}
-{59,12}
-{1,62,21,94}
-{29,43,70,52,93}
-{29,36,56,78}
-{91,56,86,89,53}
-{14,83,39,94}
-{29,58,72,4,45}
-{76,56,84,28,58}
-{4,52,6,88,43,17}
-{21,1,35,62,77,6}
-{78,74}
-{1,20,93,43}
-\N
-{30,100,35,94,74,64}
-{81,3,21,4}
-{9,19,33}
-{28,62,40,64,26}
-{69,72,26,30,90}
-{52,70,78,43}
-{91,58,33,22,92,26}
-{98,36,96,94,66}
-{86,43,82}
-{93,52,4,58,51}
-\N
-{49,61,80,79,90}
-{50,81,72}
-{57,29}
-{54,31,36}
-{52,31,6,48,2}
-{4,51,37,83,17}
-{60,20,94,82,18}
-{52,64,26,81,69,61}
-{39,8,22,2,8}
-{31,25,95,99}
-{11,72,30,95,20,28}
-{78,87}
-{21,40,98,41,73,33}
-{67,88,42,62,11,47}
-{85,1}
-{4,68,100,72,24}
-{82,43}
-{97,55,47,52}
-{51,52}
-{20,21}
-{69,46,34,59,54,61}
-{9,31,43}
-{68,20}
-{73,63}
-{71,12,93,8,48,10}
-{44,46,42,91,21}
-{98,52}
-{45,60}
-{95,38,30,3}
-{27,77,2,46,53,18}
-{99,5}
-{79,33,34,48,82}
-{3,29,82,72,35}
-{73,75,83}
-{25,43,37,26}
-\N
-{51,95,40}
-{18,23,10,90,15,20}
-{85,66}
-{25,76,22,87,88,18}
-{92,4}
-{27,51}
-{25,77,12,37}
-{44,52,69,39,21,63}
-{94,30,74,36}
-{60,18}
-{62,88,94,93,26}
-{5,72,96,25}
-{99,1,85,98,85,70}
-{33,21,37,19}
-{44,78}
-{47,2,73,32,3}
-{91,35,10,81}
-{80,64,7,45,84}
-{86,16,96,8,88}
-{32,29,84,81,30,8}
-{51,28,6,16}
-{88,51,50,54,56,96}
-{79,19,41,40}
-{40,26,10,26,2}
-{60,34,3,29}
-{68,80,70,56}
-{60,23,39}
-{50,69,6,71,70,25}
-{98,53,94,14,45,11}
-{98,39,64,89,98,32}
-\N
-{45,5,15,23,41,63}
-{54,31,55,58,32}
-{36,56}
-{38,78,65,4,75,38}
-\N
-{40,6,93,40,13,59}
-{42,50,10,65,96}
-{6,94,49}
-{63,44,36,55}
-{40,79}
-{39,75,27}
-{8,31}
-{81,75}
-{99,82,85,34,24,89}
-{86,82,20}
-{63,96}
-{47,83,29}
-{70,46,48}
-{44,11}
-{94,19,84,79,77,22}
-{68,47,100,48,65,77}
-\N
-{76,12,86,58}
-{13,14,79,61,12}
-{68,65,16,93,89}
-{95,18,29,89,92,43}
-{19,12,50,47}
-{82,93,85}
-{71,40,85}
-{95,96,100,86}
-{2,40,71,36,25}
-{11,95,25}
-{79,46,41,35,39}
-\N
-\N
-{88,29}
-{54,14,94,88}
-{59,67,81,41}
-{46,68,78,56,47,30}
-{5,76,87}
-{23,89,47,46}
-{47,98,14,31,1,60}
-{32,14,96,61,37}
-{79,66,93}
-{98,1,77,44}
-{21,68,2,31,17}
-{94,23,15}
-{48,47,57,94,49,71}
-{54,3}
-{99,40,81,86,81}
-{85,12,98,81,5}
-{60,41,21}
-{38,82,55,41,96}
-{11,98,12,69,93}
-{11,70,66,44}
-{23,92,80}
-{10,8,43,97}
-{17,30}
-{78,56,58}
-{84,87,84}
-{12,32,7,58,47,48}
-{29,46}
-{87,34}
-{59,30,72,85,71}
-{67,48,83,98}
-{35,10,73,71,1,77}
-{21,51,16,60,64,12}
-{36,61}
-{54,98}
-{44,74,84}
-{83,14}
-{71,52,48,48,15,92}
-{79,78,98,35}
-{52,29,47,86,96}
-{10,37}
-{21,25}
-{57,22,28,30,97,47}
-{15,28}
-{88,24,98,45,65}
-{78,42}
-{36,70}
-{40,48}
-{72,3,78,69,57,33}
-\N
-{21,96,16,21,75,23}
-{55,5,72,45}
-{99,2,72,29}
-{48,17}
-{84,84,40,1,59}
-{34,11}
-{34,80,45,31}
-{56,82,25,65,22,64}
-{10,4,55}
-{74,67,42,74,80}
-{84,22,42,6,87,30}
-{6,51,89,2,84,78}
-{19,95,93,87,8}
-{45,84,25}
-{7,12,16,92}
-{89,82,16}
-{22,64}
-{16,31,49,48,45,14}
-{69,64,19,14,39,8}
-{40,96,26,48,65}
-{17,45,4,57}
-{73,8}
-{85,89,1,15,74,51}
-\N
-{57,89}
-{25,12,55}
-{39,62,35}
-{85,88,71,98,83}
-{64,63,75,72}
-{100,40,38,1}
-{2,44}
-{13,46,59,43}
-{87,9,93,50}
-{77,7,11,30}
-{61,11,18}
-{19,25,68,83}
-{67,25}
-{54,18,85}
-{96,81,38,11,3}
-{87,32,47,79,62,56}
-{42,49}
-{41,65,24,13,79,75}
-{85,32,96}
-\N
-{3,63,47,84,67,13}
-{53,57,59,61}
-{95,27,8,89,35}
-{76,78,76,76,14,37}
-{31,62,65}
-{97,57,60,80}
-{18,81,93,67}
-{8,10}
-{65,25}
-{68,1,62,63,64,88}
-{27,56,74}
-{29,61,78,40}
-{54,72}
-{96,30,71,21,99}
-{67,11,67}
-{26,65,31}
-{89,90,89,68}
-{56,39,63,39}
-{50,67}
-{72,100,24,84,9}
-{29,57,65,37,3}
-{72,75,79,30}
-{78,44,87,67}
-{100,19}
-{35,60,82}
-{16,83,69,38}
-{29,98,13,60}
-{42,60,87}
-{18,67,60}
-{31,77,50}
-{3,22,40,59,7}
-{82,80}
-\N
-{32,92,70,30,18,35}
-{48,38,92,82}
-{10,92,66,59}
-{4,67,42,21,71}
-{27,88,20,21,9}
-{46,22,27,85,36}
-{42,55,36}
-{24,2,96}
-{96,48,40,48,52}
-{15,5,90,10,68,20}
-{30,2,67,92,96,63}
-{16,82,87,26}
-{88,98,76,29}
-{29,11,94,23}
-{58,20}
-{52,18,55,73}
-{20,81,52,19,37}
-{93,21,97}
-{2,77}
-{46,91,80,48,71,20}
-{87,7,93}
-{68,77,61}
-{59,33,52}
-{67,62,89,2,62,90}
-{30,82,72,44}
-{72,18,60,38}
-{11,14,59}
-{74,65,54,58,67,66}
-{74,56,40,73,50,66}
-{42,17,56,59,53,19}
-{75,25,76,9,72,50}
-{14,57}
-{61,47}
-{90,11,72,13}
-{52,27}
-{80,84,53,55,98}
-{16,26,55,17,79,96}
-{42,73,77}
-{6,84,67,54,96}
-{99,48,99,63,73,77}
-{5,41,72,5,88,81}
-{19,20,20}
-{21,89,55,44}
-{82,67,11,64,61,5}
-{44,34,8,62,53}
-{75,53,66,36,100}
-{46,65,6,70,4}
-{84,10,56,35,18}
-{65,60}
-{88,56,27,11}
-{10,9,97}
-{97,49,100,100,76,32}
-{2,98,57}
-{47,57,84,74,79}
-{80,9,24}
-{96,33,86,28,19}
-{43,76}
-{46,14,55,92}
-{60,69,66,62,22}
-{45,85}
-{45,9,36,13,45,1}
-{24,49,8,37,66,64}
-{98,53,96,47,2}
-{36,44,32,4}
-{77,36,78,51,63}
-{82,36}
-\N
-{54,55,33,45,69,18}
-{82,93}
-{65,59,2,62,10,25}
-{75,70,76,69,7,23}
-{10,34,67,85}
-{94,66,28,40,64,41}
-{35,73,64,28,45,68}
-{75,2}
-{58,49,4,87,19}
-{91,99,11,66,75,70}
-{26,64}
-\N
-{13,51,18}
-{39,33,21,18}
-{27,50,82,2,3,71}
-{51,89,44,53}
-{88,91,34}
-{45,96,27,12,51,52}
-{31,96}
-{2,9,54,89}
-\N
-{57,99}
-{87,84,70,7,98,42}
-{32,80}
-{57,64,28}
-{24,39,76,4,30}
-{59,38,15,45,47,28}
-{71,20,37,1}
-{72,59}
-{7,44}
-{50,37,18,1,58,40}
-{13,18,21,56}
-{72,3,26,74,91}
-{60,22,71,49}
-{55,82,61,8,48,66}
-{28,22,75,41,52}
-{51,63,27,41,16}
-{59,89,40,85,86}
-{12,1}
-{52,11,6}
-{37,10,43,88,15,7}
-{14,94,81}
-{34,56,57,4}
-{81,43,11,88,74,76}
-\N
-{67,10,50,79,70,35}
-{14,51}
-{49,50,23,84}
-{51,41,57,100,19,14}
-{31,55,40,96}
-{8,42,33}
-{83,34,1}
-{56,80,22,93}
-\N
-{8,77,91}
-{58,39}
-{55,30,74}
-{50,22,63,73}
-{80,19,67,70,18}
-{7,99,45,23,59,78}
-{36,97,10,33,22,45}
-{43,78,90}
-\N
-{1,68}
-{63,95,54}
-{5,67,61,37,89}
-{32,97,2,56}
-{83,31,6,80,63}
-\N
-{34,15,30,40,16}
-{13,43,6}
-{35,86,31}
-{45,59,4,95,26}
-{63,48,25}
-{56,97,89,45,87,21}
-{42,81,69}
-{49,99,87}
-{81,21,15,36,70,2}
-{93,41,53}
-{54,71,82}
-{88,90,51}
-{100,35,18}
-{88,81}
-{76,16,87,14}
-{16,83,81,44}
-{16,53,100,91}
-{55,75,92}
-{27,97,76,88,66}
-{14,100,95,95}
-{95,84,93,29,67}
-{32,10}
-{82,12,51}
-{40,6,18,14,29,70}
-{3,100,81}
-{83,69}
-{35,63,31,15}
-{5,100,81,54,37,78}
-{99,76,33}
-{88,85,16}
-{46,20,15,10,6,90}
-{53,15,75,76,94}
-{5,76}
-{16,7,21,70}
-{3,84,15}
-{29,58,73,91}
-{82,39,64}
-{49,66,83,76}
-{79,49,19,67,18,76}
-{9,56,41}
-{12,22,19}
-{62,54}
-{20,73,40}
-{34,53,58,68,96}
-{97,14,61,63}
-{38,55,90,63}
-{83,78,81,29,12,46}
-{96,97,40,89,10}
-{67,33,19,19,74,47}
-{78,31}
-{92,74,93}
-{59,54,90,52,29,87}
-{92,39,55,89,81,21}
-{20,85,64}
-{13,97}
-{88,18,85,24,54,90}
-{67,51,47}
-{27,29,90}
-{48,27,7,92}
-{100,37,24,41,68,66}
-{45,7,100,83,51}
-{34,10}
-{60,36,44}
-{55,46,4}
-{86,64}
-{61,77,98,64}
-{14,82,14,50,1}
-\N
-{53,31}
-{64,43,35,44,98,75}
-{98,15,52,58,76}
-{55,94,92,40,80}
-{1,14,100,42,45,74}
-{13,90,84,97,18,92}
-\N
-{13,91}
-{67,33,15}
-{18,96,38}
-{95,70,34,100}
-{17,29,64,32}
-{19,14,83,69,60,99}
-{69,29,64,61,45,17}
-{78,48,24}
-{40,60,61,93,17}
-{19,89,22,71}
-{48,8,13,11,56}
-{75,18,77,100}
-{29,78}
-{51,92,97,31}
-{83,5,2,97,68,69}
-{39,86,86,94,41}
-{66,21,27}
-{30,84,11,60}
-{50,61,28,46,38,45}
-{12,59,66,80,15,64}
-{69,22}
-{30,54,58,99}
-{14,28,80,22}
-{44,31,14,61,83,72}
-{55,53,78,91,76,55}
-{43,3,90,22,7}
-{51,34,24}
-{3,99,5,72,82}
-{95,38,61}
-{22,8}
-{78,40,93,65,18,26}
-{21,17,19,8,89}
-\N
-\N
-{94,88,27}
-{49,45}
-{67,24,64,86,18,1}
-{5,33,18,84,51}
-{15,71,89,48,94,81}
-{71,69}
-{98,63,73,64}
-{14,75,12}
-{47,42,88,13}
-{35,51,60}
-{63,41}
-{73,11,66,99,8}
-\N
-{2,17,6,44,97}
-{95,24}
-{2,13,35,21}
-{76,29}
-{81,37,21}
-{23,63,27,53}
-{70,66,58,27,4}
-{69,62,22}
-{62,96,44}
-{68,87,99}
-{51,40,81,52,93}
-{81,11,45,92,22,21}
-{5,39,46}
-{44,7}
-{14,63,62,9,12}
-{9,19,90,72,51}
-{70,61,24,36}
-\N
-{29,19,3,30}
-{76,86,28,58,38}
-{59,27}
-{9,65,65,10,37,6}
-{89,51,50,23}
-{65,2}
-{33,51}
-{25,55,69,55,1,78}
-{76,71,93,46,23}
-{70,30,50,11,2,89}
-{74,39}
-{4,29,22,80,15,23}
-{16,30,69,76,61,67}
-{43,34,4,70,36}
-{59,32,25,93,32,98}
-{64,4}
-{52,33,47}
-{31,49,7,62,7,95}
-{44,69,12,45,34,8}
-{81,37,83,35,3}
-{24,74,16,89,94,27}
-{79,71,72,49,88,35}
-{17,96,72,87,48}
-{81,18,50}
-{11,19,70}
-{42,95,42,58,90}
-{27,65,83,86,33}
-{55,7}
-{43,55,92,79}
-{97,55}
-{85,25}
-{93,42,69,44,26,78}
-{2,40,46,19,84}
-{8,42,16,26,87}
-{36,8,42}
-{31,47,61,44,13}
-{85,97,47}
-{27,30,71,88,15,100}
-{69,27,4,19}
-{3,52,31,62,98}
-{64,86}
-{91,6}
-{76,40}
-{57,77,7,40}
-{71,34,48,53,37}
-{36,72}
-{61,99,53,2,31,6}
-{86,15}
-{52,93,59,51}
-{57,27,52}
-{48,67,31,69}
-{34,90,37,73,60,83}
-{71,24,49,59}
-{93,71,90}
-{77,31,77}
-{47,40,32,20}
-{97,40,63,80,44}
-{88,55,10,40}
-{86,36,40,72,38,9}
-{31,97}
-{56,19,55,62,60}
-{53,95}
-{33,36}
-{50,12,55,42,96,100}
-{41,17,100,76}
-{65,1,61,69,64,21}
-{90,92}
-\N
-{74,42,86}
-{2,4}
-{99,78,5,92,1,61}
-{1,69}
-{80,73,60,31}
-\N
-{10,25,13}
-{50,34,75}
-{12,90,6,36,42}
-{23,54,46}
-{67,28,66,87}
-{8,88,88,51,55,32}
-{15,19,24,91,75}
-{80,16,70}
-{41,7,90,37}
-{97,57,32,21}
-{54,74,29,12,55,78}
-{60,76,37,92,44,73}
-{1,56,14}
-{40,79}
-{97,1,30,78,56}
-{36,25,61}
-{33,3,51,30,38}
-{2,94,19,15}
-{7,38,72}
-{96,18,3}
-{18,95,15,62,74,53}
-{59,61}
-{18,66,66,65,4,33}
-{49,83,10}
-{17,52,90,39,61,87}
-{38,92,55,26}
-{8,43}
-{77,51,68,23,47}
-{27,65,24,43,88,73}
-{54,34,30,2,19,62}
-{12,36,81,24,66,8}
-{38,91,90,99,84}
-{51,55,94,97,91,15}
-{50,42,20,22}
-{70,4,22}
-{64,26}
-{56,86,16,21,31,61}
-{7,19,86,49,10,53}
-{81,16,74}
-{95,9,11,46,47}
-{34,23,16}
-{94,38,19,4,4}
-{39,79}
-{41,3,62}
-{84,67,53,90,46}
-{17,46,23}
-{62,1,5,58,52,1}
-{23,83,80,62,19}
-{99,61,77}
-{51,95,48,96,75}
-{39,2,6,95,43,36}
-{69,9,59}
-{62,97,31}
-{75,96}
-{33,29,35,13,94,78}
-{28,71,16,99}
-{72,86,25}
-{5,28,15,33}
-\N
-{13,13,52,20}
-{58,98,83,85,81}
-{13,75,42}
-{7,91,3,83,82,37}
-{72,91}
-{10,67,61}
-\N
-{43,86,76}
-{36,62}
-{64,56}
-{63,13,22,24}
-{76,49,38,23,9,8}
-\N
-{92,58,24,19,96,90}
-{24,37,76,37,1,95}
-{91,9}
-{46,35,48,37,91,76}
-{72,21,6}
-{30,80,39,90,89,18}
-{83,30,67,17}
-{43,36,46,43}
-{4,31,34,36,33,48}
-\N
-{16,49}
-{75,56,8,91,4}
-{92,80}
-{74,72,68,89,7,82}
-{79,17,26}
-{14,15,28,72,58}
-{42,21,9}
-{71,39,98,98,61}
-{68,63,23,74,74,48}
-{91,80,22,100,57,30}
-{63,60}
-{90,9,10,67,89,14}
-{53,93}
-{75,49,34,30,38}
-{2,43}
-{32,4,24,48,23,31}
-{45,24,31,15,51}
-{65,62,21}
-{83,50}
-{10,90,98,86,87,1}
-{63,2,9,17,30}
-\N
-{77,46,60}
-{49,39}
-{37,86,4,63}
-{33,28,37,33}
-{4,88,80,14,47,45}
-{90,64,17,65}
-{60,90,12}
-{7,2,38,33}
-\N
-{39,90,7}
-{89,32}
-{27,47,63,31}
-{54,10,10,73,84,87}
-{55,58,25,87}
-{41,24}
-{71,26,8,31}
-{74,19,33,81,74}
-{47,58}
-{44,16,22,59}
-{2,10,97,16,25}
-{1,98,3,41,6,80}
-{12,13}
-{3,50,61,85}
-{54,5,44,97,71,86}
-{54,72,94}
-{59,13,28,79}
-{73,68,7,13}
-{90,49,63,45}
-{95,47,84}
-{31,79,98,22}
-\N
-{13,15,83,89,87,20}
-{1,58,87}
-{15,21,39}
-{93,27}
-{40,81,13,31}
-{29,52}
-{28,48,36,41}
-\N
-{71,23,89}
-{29,59,31,45,35}
-{49,83,24,19,44,26}
-{41,61,36,34,38,88}
-{66,17,18,9}
-{55,38,93,33}
-{84,42,71,15,12}
-{11,38,78,80,90,92}
-{1,6,28,68,58}
-{96,63,73,22,74,29}
-{65,97,68}
-{92,29,92,36}
-{47,25,30}
-{25,44,67,95,16}
-{7,26,41}
-{79,12,44,69}
-{17,27,4,60}
-{45,30,57}
-{68,24,63}
-{39,64,94,92}
-{27,68,39,68,75,8}
-{88,48,48}
-{86,86,8,54,7,45}
-{93,60,14,90,14}
-{97,42,54,67,38}
-{13,38}
-{84,34,30}
-{34,71,77,71,13}
-{82,18}
-{53,7,79,79}
-{28,65,38,20,93,100}
-{96,10}
-{94,12,93,48,51,20}
-{12,4,41,11,25,59}
-{95,69,23,25,1,19}
-\N
-{44,38}
-{12,4,96,7,48}
-{18,24,52,81,58,77}
-{15,36,1,50,81,23}
-{39,66,74}
-{52,22,99}
-{51,11,77,44,22}
-{51,19,18,91,75}
-{20,17,5,96,63,30}
-{31,56,9,21}
-{45,70,31,62,9}
-{84,22}
-{99,62,97,44,87,90}
-{95,94,95,24,25,47}
-{79,72,57,18,3,26}
-{54,67,37,57}
-{3,90,9,3}
-{95,90,40,7}
-{36,70,76,68,14,71}
-{15,59,7,1,48}
-{91,29,79,62,94}
-{76,36,92,82}
-{50,79,68}
-{55,63,88,87}
-{86,89,49,17}
-{19,74,14,52,8,59}
-{8,58}
-\N
-{77,74,20,39,26,29}
-{38,89}
-{58,21,44,81,17,16}
-{40,72,12,32,90}
-{93,34,92,17,39,85}
-{39,2}
-{43,21,83}
-{81,3,59,28}
-{34,97,52}
-\N
-{84,90,6,74,43,70}
-{41,6,10,98,86,41}
-{13,72,78,11,37,5}
-{100,40,54,75,33}
-{66,31}
-{58,58,75,83}
-{81,90,8,73,87,41}
-{9,63,22}
-{19,66,19,93,52}
-{39,88,13,25,66}
-{80,85,66}
-{66,76,11,71,97,77}
-{70,35,87}
-{36,17,69,2,41}
-{30,85,65,39,38}
-{39,35}
-{64,100}
-{83,53}
-{25,29,29,72}
-{19,63}
-{32,2,82,15}
-{31,31,46,11,2}
-{41,1}
-\N
-{55,41,15}
-{18,61,43,22,100}
-{47,60,16}
-{80,5}
-{52,2,76}
-{40,26}
-{81,12,16,25}
-{31,93,89,20,95,75}
-{26,75,86,1}
-{36,69,70,73,79}
-{38,39}
-{45,49,52}
-{88,53,45,10,49,31}
-{21,14,1,83}
-{7,71}
-{59,38,83,64,44}
-{6,52}
-{99,99,26,54,47,8}
-{13,46,72,5,23}
-{7,86,40,73,55}
-{28,47,50,62,44}
-{32,89}
-{39,48,50,100,62,95}
-{66,56,11,21,58,59}
-{7,44,95,53,95,36}
-{83,33,79}
-{34,65,51,52}
-{67,95,46,45,61}
-{69,84,71,38,46}
-\N
-{24,57,48,27,97}
-{83,91,97,94,37,44}
-{22,31,38,77,21}
-{72,32,53}
-{30,45}
-{93,94,27,95}
-{95,4,79,3}
-{33,90,92,54}
-{55,8,76,39,85,64}
-{82,54,93}
-{31,42,5}
-{38,14,73,12,14}
-{64,13,64,28,32,89}
-{5,28,4,22,72}
-{37,78,94}
-{58,73}
-{24,57,33}
-{48,28}
-{69,42}
-{97,91,75,84}
-{95,69}
-{64,95}
-{1,3}
-{76,38,81,11,90}
-{21,30,54}
-{92,100,97,21}
-{10,76,64}
-{85,79,100,79,76,63}
-{13,96}
-{91,47,84}
-{100,19,45,49}
-{99,71,21,10,69}
-{19,41,7,63,56,85}
-{16,32,6,92}
-\N
-{62,7,22,65}
-{1,86,67,47,83}
-{26,2,100,51,1}
-{20,22,86}
-{74,95,79}
-{8,53}
-{85,59,61,45,83,8}
-{2,76,63,26}
-{40,42,84,55,56,23}
-{37,7,25,14,2,47}
-{86,16,98,41,33}
-{76,30}
-\N
-{16,88,61,4,41,42}
-{59,92,94,76}
-{96,76,57,62,99,61}
-{14,30,23,13,9,32}
-{47,49,86}
-{48,19}
-{73,25,40}
-{29,75,31}
-{53,26}
-{28,95,78,84}
-\N
-{22,77,13,64,68}
-{15,69,82,26}
-{42,37}
-{64,59,95}
-{37,72,86,95}
-{9,59,92,57}
-{65,37,13}
-{93,67,81,54,89}
-{21,52,78,59,30}
-{98,90}
-{17,35,57,4}
-{44,56}
-\N
-\N
-{25,26,13}
-{62,41,60}
-{28,92,16,74,4}
-{92,19,85,77,11}
-{20,67,85,22}
-{75,69,34,29,64,73}
-{70,40,2,29}
-{87,27,70,54,6}
-{10,8,9,62}
-{71,41,14,22,23}
-{83,79,46,37,99}
-{79,42,3,54,20}
-{12,60,42,100,39,33}
-{13,79}
-{95,28,54,52,77,3}
-{55,50,25,41,42,16}
-{96,67,23,54}
-{65,54,32,52,16}
-{100,11,69,96,95}
-{1,18,93}
-{53,78}
-{24,40,47,30,40,11}
-{87,7,12,10,52,90}
-{3,72,95,15,32}
-{60,69,19,8,43,72}
-{88,10,11,55,37}
-{67,48,31,48}
-{98,70,38,97,14}
-\N
-{52,12,94}
-{41,26}
-{81,65}
-{66,74,9,66,12,3}
-{47,6,33,92}
-{95,2,12,90,73,97}
-{23,76,34,23,2,20}
-{7,22,37,83,15}
-{44,61,21,8,36}
-{88,52,8}
-{66,3,67,43,87}
-{16,51,10}
-{66,43,28,69,70}
-{47,2,94}
-{57,67,55}
-{40,59,6}
-{63,19}
-{51,71,68,28}
-{73,97,48,56,70}
-{3,4,28,48,18}
-{31,94,27,70,44}
-{85,18,40,6}
-{78,91,79,88,33}
-{11,90,78,49,97}
-{74,91,27,79,75,53}
-{1,70,3,40,43,99}
-{97,35}
-{58,27,40,6,47,33}
-{43,42,60,94}
-{41,34,23,53}
-{57,44,50}
-{8,10}
-{49,53,22}
-{91,2,90,13}
-{46,80,27,82,42,99}
-{12,96,72,23,83,56}
-{48,82,71,8,35,16}
-{38,69,38,49,47}
-{80,28,13,9}
-\N
-{84,13,12,33}
-{31,57}
-{68,86}
-{4,96,64,19,48,29}
-{66,8}
-{33,86}
-{32,38,86,86,41,84}
-{38,51,31}
-{59,17,76,36}
-{52,87,60,54}
-{7,58}
-{34,52,58,90}
-\N
-{30,67,97,2,1}
-{93,10}
-{47,16,46,8,39,84}
-{90,77,37}
-{92,58}
-{38,94,49,53,11}
-{70,49,35,67,18,28}
-{58,81}
-{79,100,9}
-\N
-{97,13,56}
-{99,40,87,67,58}
-{24,47,19,16}
-{12,27,47,48,3,59}
-{1,58,15}
-{97,28,6}
-{94,50,31}
-{71,34,94,53}
-{26,5}
-{46,66,56,27,37}
-{76,4,1}
-{80,63,40}
-{89,82}
-{39,100,71,82,95,8}
-{81,86,27,83,57,47}
-{30,30,92,8,33}
-{95,20}
-{4,19,8,74}
-{20,32,83,62,19,18}
-{75,29}
-{100,13,6,41,23}
-{63,5,93,72,43}
-{64,13,73}
-{35,91,61,26,41,96}
-{49,56}
-{2,28,80,84}
-{15,48}
-{32,49,96}
-{72,73,57,69,16}
-{95,1,88,64}
-{70,55,88,66}
-{76,66,30,92,1}
-{88,21,74,65,93}
-{72,75,75,3,26}
-{55,32,85,68,84}
-{45,40,93,33,72,20}
-{83,89,6}
-{4,60}
-{72,56}
-{73,7,69,25,96,74}
-{100,72,41,48,63,37}
-{21,72,70,94,67,54}
-{6,9,58,77,35}
-{70,59,35,25}
-{86,96,87,62,13,5}
-{93,52,74,57,58}
-{93,23,88,50,56}
-\N
-{95,72,68}
-{63,52,58,41,54,90}
-{52,23,53,32}
-{93,87,39}
-{23,73,6,46,79,72}
-{44,17,12}
-{79,59}
-{31,62,14,26,75,23}
-{64,72,18,48,63,50}
-{71,40,59,87}
-\N
-{82,17,10}
-{44,29}
-{6,4,39,16,21}
-{94,17}
-{91,61,37,36,9}
-{53,38,7,28,92}
-{95,93,35,18,48}
-{35,77,53,87,97,92}
-{56,28,68,19,28,86}
-\N
-{23,91,56}
-{97,5,89,24}
-{18,81,17,78,63}
-{83,19,46,10,22,66}
-{100,17,45}
-{25,87,61,79}
-{17,57,99,1,39,1}
-\N
-{2,51,26}
-{93,69,84,85,87}
-{40,58,70}
-{86,84,96,41}
-{28,36}
-{39,85}
-{16,84,75,68,87,17}
-{14,84,57}
-{25,85,35,82,56}
-\N
-\N
-{7,30,17,2,66,91}
-{45,17,57,27,98,65}
-{57,86,15,40,68,23}
-{82,32,28,89,41,79}
-{28,3,35,61}
-{76,95,19,81,48,50}
-{34,6,85,47,65,2}
-{70,23,91,33,15}
-{30,24,47,96,61,47}
-{78,88,64,60}
-{87,40,86,97}
-{47,14,54,37,100}
-{48,95,32,77,69}
-{58,12}
-{63,20,49}
-{78,85,41,72,6}
-{39,20,89,21,62,76}
-{71,6,10}
-{63,4,71}
-{51,21,37,63,54}
-{66,6,63,12,58}
-{89,97}
-{64,70}
-{53,1,65}
-{57,73,30,26}
-{15,99,47,89,95,99}
-{12,86,7}
-{50,68,1,31,67}
-{47,86,54,44}
-{78,7,86,76,22}
-{46,71,98,62,67}
-\N
-{64,91,80,63}
-{82,61,17,58}
-{85,64,90}
-{37,26,64,97}
-{68,25,26,61,68}
-{11,21}
-{63,53}
-\N
-{87,88,75,65,10,48}
-{32,7,38,72,44}
-{99,81,59,10}
-{31,58,60,66,41,28}
-{23,27,57,74,4}
-{20,94,28,29}
-{91,5,15,61,50,29}
-{34,58,15,85,65,29}
-{52,50,2,95,87}
-{3,94,54}
-{7,61,96,49}
-{51,70,23}
-{87,49,27,6,7}
-{83,61}
-{36,92,48,57,20,83}
-{53,12,60}
-{60,11}
-{68,43,74,23,66,55}
-{66,8,54,24}
-{48,72,41,74}
-{81,99,50,33,20,13}
-{27,80,60,83,26,74}
-{80,1,59,50,15,99}
-{11,70,20,29}
-{23,84,63}
-{63,24,91,19,28}
-{25,17,95}
-{94,13,81,69,26,89}
-{31,48}
-{45,20,74,51,62,33}
-{77,55,17,63,4,18}
-{89,14}
-{85,85}
-{23,11,85,74}
-{29,76}
-{62,40,96}
-{1,29,25}
-{56,26,12}
-{5,22,6}
-{61,9,6,85}
-\N
-{31,34,49,11,19}
-\N
-{14,20,64,73}
-{63,1,85}
-{2,58,61,100,9}
-{89,92}
-{37,13,81,77}
-{36,26,16,76}
-{78,10,10,92,63}
-{68,6,35,71,92,27}
-{2,88,33,14,85,27}
-{80,95,71,98}
-{8,33,33,55,90}
-{62,74,15,10,64}
-{60,18}
-{6,77}
-{27,38,4,49,27,89}
-{94,84,94,8,98}
-{15,73,47,47,26}
-{73,38,69,90,9,13}
-{17,33,32}
-{51,57,25,40,41,37}
-{77,70}
-{66,10}
-{50,90}
-{96,88,30,65}
-{30,49,100}
-{34,46,19,89,52,24}
-{83,85,62,72,10,64}
-{98,56,23,77,79}
-{97,90,83,85}
-{19,66,70}
-{70,89,59,12,71}
-{24,96,22,4}
-{43,32}
-\N
-{92,85,41}
-{96,90}
-\N
-{4,5,82}
-{58,32,34,86,30}
-{51,8,44}
-{31,96,37,47}
-{51,15,41,97}
-{86,41}
-{41,26,61}
-{62,79,68,73,5}
-{32,9,88,30}
-{89,34,64}
-{70,18}
-{64,31}
-{14,73,1,50,75}
-{57,1}
-{53,92,38,13,56}
-{41,1,87,40,60}
-{83,75,19}
-{69,98,25,64}
-{69,75}
-{84,13,25,8,81}
-{41,52}
-{90,80,17}
-{19,53,72,62,94}
-{29,30,99,32}
-{32,85,73,26,47}
-{6,48,89,93,23}
-{73,47,93,10,48}
-{60,21,26,60,63}
-{85,41}
-{75,61,61,45}
-{51,7,5}
-{9,46}
-{83,36,7,84,96}
-{71,78,55}
-{43,53,88}
-{8,1,80,69}
-{88,86,51,12,37}
-{45,69,40,85}
-\N
-{36,53,60,15,7,7}
-\N
-{92,5}
-\N
-{51,13,34}
-{39,23}
-{16,26,93}
-{91,96,19}
-{89,64,2}
-{8,74,29,24,66}
-{26,19,30,27}
-{81,59,52}
-{99,28}
-{5,12,63,79}
-{14,80,90,83,47,79}
-{67,64,32,58,44,19}
-{27,32,52,79,55}
-{68,87}
-{14,31,20,12}
-{38,99,65,32,15}
-{27,57,35,17,53}
-{63,64,6,60}
-{70,38,47,65}
-{24,87,20,4}
-{86,27,19,56}
-{62,44,1}
-{46,10,26,48}
-{40,57}
-{61,9,59,80,51,20}
-{83,44}
-{77,1}
-{78,63,42}
-{75,93,95,76,9,52}
-{20,58,10,37}
-{72,75,41,73}
-{63,93,5}
-{57,65,47}
-{34,6,51,38,21}
-{54,7,19,9}
-{61,6,47,64,100,86}
-{39,45,55,17}
-{81,53,67,33,70}
-{11,94}
-{57,98}
-{78,81}
-{75,71,20,8,13}
-{3,2,58,95}
-{37,58,5,46,54}
-{40,50,36,27,69}
-{73,42,86}
-{97,73,87,80,38}
-{27,56,94,73}
-{80,81,74}
-{53,79,86}
-{79,4,55,21,34,74}
-{84,63,21,97,92,38}
-{72,38,76,63,97,79}
-\N
-{64,91,100,98}
-{34,10}
-{97,73,7}
-{49,31}
-{87,39,65,96}
-{54,88,60,55,18,4}
-{20,72,96,26}
-{40,51}
-{37,46,89}
-{88,53,3,52,39}
-{10,34,77,95}
-{20,66,84,12}
-{51,19,61}
-{67,35}
-{73,56,89,43,35}
-{94,54,27,63}
-{63,53,21,79,76,49}
-{79,23,28,63,49}
-{47,94,75,11}
-{67,95,56}
-{80,86}
-\N
-{62,73}
-{98,69,11,57,24,90}
-{87,41,77,21,94}
-{21,87}
-{3,40,75}
-{67,53,78,29,16}
-{18,46,70,76,98}
-{14,67,50,63,22}
-{4,2,92,4,8}
-\N
-{41,76,79,95,96,61}
-{35,30,18,57}
-{34,91,89,27}
-{22,25,9,34,85}
-{4,53}
-{23,6,65,86,56,93}
-{54,81,8,59,36,47}
-{90,10,4,25,31,46}
-{91,82,82,80}
-\N
-{64,12,59,21,10}
-{49,93,76,26}
-{22,10,21,15,57}
-{14,29,93,31}
-{68,21}
-{62,95,12}
-{34,74,55,4}
-{26,39,93,31}
-{67,31,63}
-{23,89,98,88}
-{48,93,22,79,28}
-{1,88}
-{95,74,84,18,38}
-\N
-{82,29,22,45,15,81}
-{15,48}
-\N
-{17,36,97,77}
-{93,59,71,15,51,35}
-{67,33,57,11}
-{35,80,72,43}
-{69,89,69,48}
-{52,29,16,52,100,22}
-{60,30,45,19,25}
-{28,3,39,86,13}
-{81,40,25,20,39,5}
-{77,14,93,47,23,6}
-{42,19}
-{52,52,98}
-{9,29}
-{78,77,6,72}
-{2,59,73}
-{13,85,77,26,29}
-{64,63,94}
-{54,76,3}
-{7,1,5,91,100}
-{24,94,57,94,79,55}
-{4,22,1,75}
-{34,53,19,87}
-{69,75}
-{71,47,47,61,42,89}
-{3,32}
-{84,61,4,13,73}
-{74,61}
-{47,65,85}
-{50,84,83,18}
-{51,97,11,3}
-{59,92,4}
-{49,42,65,27,97,52}
-{19,33,40,44,71,100}
-{82,68,99,60,47,59}
-{47,33,82}
-{3,45}
-{47,28,60}
-{3,98,60,30,50}
-\N
-{11,40}
-{33,67,72,43,74}
-{9,49}
-{42,47,48}
-{53,88}
-{17,87,28}
-{20,4,72,62}
-{65,25,22,76,64}
-{9,62,57}
-{59,93,52,93,60}
-{85,85,1,55,50}
-{69,22,57}
-{8,50,81,32,4}
-{80,47}
-{60,88}
-{16,54,80,66}
-{99,87,66,65}
-{60,19,58,18}
-{14,77,66,48,59,41}
-{75,96,82}
-{42,72,93,79}
-{14,23,78,82,40}
-\N
-{29,47,16,41}
-{13,11,45,67,23,92}
-\N
-{8,3,52,41,56}
-{57,41,63}
-{5,50,59,87,50,58}
-{58,99,9}
-{60,99,15,63}
-{59,14,9}
-{68,81,34}
-{83,18,3,94,39}
-{27,52,100,66,48,82}
-{10,23,50,96}
-{72,14,12,68,62}
-\N
-{45,30,55,86,89,48}
-{5,80,97}
-{52,67,86,81}
-{99,4,38,79}
-{21,98,78,71,73}
-{10,23,38,61}
-{12,17,19,70}
-{79,23}
-{55,66,65,60,19}
-{7,34,68,88}
-{37,70,5}
-{41,57,86,31,10,6}
-{70,59,96,78}
-{88,18,32,22,56,21}
-{93,72,81,47,89,72}
-{100,14,49}
-{83,80}
-{73,11,97,14}
-{60,47,32,34,13,29}
-{39,6,88,24,6}
-{54,66,55,52,47}
-{56,89,88,98,94,48}
-{2,37}
-{13,54}
-{68,39,68}
-{60,81,10,85}
-{74,54,14}
-{30,52}
-{41,74,47}
-{77,28,8}
-{90,3,43,89,4}
-{29,46,84,63,79,83}
-{26,15,80,19}
-{76,28,77,6,47,91}
-{51,15}
-{93,15,51}
-{8,68,34,58,15}
-{5,56,57,81}
-{27,87,61,54,41}
-{31,37}
-{68,80,3,98,49,6}
-{96,10,39}
-{25,19,21,72,79}
-{69,1}
-{5,51,61,80}
-{76,25}
-{36,92}
-{54,46,31,87,13,8}
-{25,13,83,57}
-{29,53,73}
-{83,60,26,19}
-{27,89,34,13,20,38}
-{29,74,26,67,65}
-{90,36}
-\N
-{32,15,43,50}
-\N
-{55,86,68,51}
-{91,14,53,70,49,38}
-{75,29,79}
-{19,59,38,44,18,79}
-{43,31,24,20,16}
-{43,83,59,37}
-{61,17,95,61}
-{67,89,1}
-{65,20,46,58,49}
-{72,54,38,52,49}
-{75,12}
-{63,95}
-{99,17,79,11,35}
-{62,60}
-\N
-{69,83,89,73,20}
-{30,60,39,73}
-{78,99,29,45,61,21}
-{38,61}
-{51,15,47,11,4}
-{34,75}
-{57,26,42,42}
-{8,90,4,68}
-{63,70,99,3}
-{74,70,33,50,59}
-{27,18,73,83}
-{36,90}
-{82,77,2,83}
-{90,99}
-{15,25}
-{65,30,39,82,89,34}
-{12,24,64,54,49,83}
-{54,59}
-{63,49,81,36,75,52}
-{6,59,90,55,87}
-\N
-{97,52,54,97,3}
-{8,53,89,42,30}
-{68,42,64}
-{97,42,99,74}
-{19,31,32,52,7}
-{69,83}
-{61,17,35,39}
-{81,47,70,7,63}
-{78,10,63,97,31,48}
-{84,92}
-{64,82,40,39,57,44}
-{39,25,92,33,5}
-{27,74,85}
-{90,67,21,28,84}
-{36,33,62}
-{77,87,98,82,11,88}
-\N
-{11,41,17,91,56}
-{1,1}
-{84,100,8,22,20}
-{57,39,85,5}
-{55,47}
-{13,2,36,59,45}
-{95,66,53,32,29}
-{21,92}
-{35,32,9,58,77}
-{19,71,99,82}
-{19,37,87,43}
-{100,18}
-{67,86,29,40}
-\N
-{66,54,64,55}
-{67,25,18,31}
-{60,26,59,86,26,67}
-{26,21}
-{70,67,30}
-{93,82}
-{89,58,39,91,95}
-{15,86,25,8,12}
-{59,20,41,33,78,87}
-{10,72,89}
-\N
-{52,17,99}
-{77,29,7,7,1}
-{49,96,57,24,66,67}
-{10,26,83,84}
-{82,7,25}
-{66,77,57,25}
-{92,77}
-{24,48}
-{44,26,37,75,11}
-{73,80}
-{51,47,93,21,25,78}
-{76,49,15,98}
-{12,85,63,59,6}
-{25,51,47,58}
-{16,10}
-{17,30}
-{67,5}
-\N
-{54,96,21}
-{12,47}
-{29,90,69,22,89,82}
-{78,93,86,65,66}
-{83,84,58,67,13}
-{85,35,81,27,1,2}
-{76,29}
-{64,82,91}
-{35,89,38,89,10}
-{19,40,96}
-{83,70,85}
-{72,85,70,99}
-{34,1,39,16}
-{84,53,22,86,73}
-{32,23,70,49}
-{15,67,91,11}
-{73,95}
-{71,57,64}
-{88,91,56}
-{12,16}
-\N
-{62,82,26,84}
-{70,51,52,63,96}
-{34,93,49,57}
-{16,5,47}
-{18,59,12,82,83,51}
-{61,93,87,9}
-{46,9,45,38}
-{15,85,28,73}
-{31,99,26,3}
-{66,91,48,73}
-{98,80,9}
-{31,55,42,69,13,58}
-{43,8,70,29,83}
-{39,57,53,70,74}
-{89,13,60,38,89,3}
-{37,28,15}
-{67,77}
-{30,100,89,36,53,75}
-{36,19,48}
-{7,8}
-{12,76,26}
-{14,56,52,47,39,67}
-{87,83,51,2,97,25}
-{51,1}
-{59,69,37}
-{95,93,21}
-{100,92,37}
-{37,23,66,95,7,63}
-{52,56,77,86,46}
-{31,62,17}
-{57,48,79}
-{26,96,40,5,43,54}
-{40,92}
-{75,83,1,73,71}
-{75,61}
-{6,38}
-{35,23,76}
-{52,3,38,25,100,99}
-{45,15,44}
-{96,9,11,35,16,58}
-{9,80,76}
-{22,43,34,43,46}
-{34,68,21}
-{95,70,83}
-{60,7}
-{34,22,68,2}
-{78,30}
-{46,70,90,96}
-{5,24,69,61,32}
-{41,17,79,27}
-{59,88,64}
-{12,48,41,68,15,98}
-{43,84,59,62,36,14}
-{84,8,71,88,4,23}
-{45,67,67,17}
-{14,96,72,66}
-{91,23,4,11,28}
-{18,5}
-{65,51}
-{31,87,33}
-{17,97,76,81,69}
-{56,71}
-{95,23}
-{33,58,66,47}
-{46,99,69}
-{43,87,40}
-{49,1,26}
-{18,36,89,87,25,100}
-{76,37,19}
-{57,91,9,100,23,59}
-{80,60}
-{55,23,32,49}
-{15,73}
-{87,50}
-{43,62,50,54}
-{65,3,89,49,77}
-\N
-{73,12,25,78}
-{79,89,38,59}
-\N
-{44,62,25}
-{96,13,57}
-{35,14,3}
-{90,71}
-{34,8,59,81,63,90}
-{15,90,89,32,69}
-{90,61,54,10,29}
-{22,3,85,41,66}
-{17,4,99,91,45,57}
-{89,32,43,39,61,9}
-{45,40,6}
-{47,100,75,8,85}
-{88,43,89}
-{45,41}
-{54,48,87,66,100,5}
-{58,65,39}
-{17,82}
-{95,14,31,51}
-{30,3,46}
-{8,66,22,52,51,24}
-{61,62,38}
-{4,50,83,32,76}
-{96,36}
-{87,27}
-{82,100,44}
-{30,91,44}
-{29,48,8,38,43,96}
-{56,65}
-{34,36,99,11}
-{11,1,25,65,12,89}
-{17,100,62,53,24}
-{86,81,63}
-{17,63,30,82,87,91}
-{12,63,76,78,85}
-{52,19}
-{21,91,53,86,49,83}
-{67,65,78}
-{8,77}
-{89,1,56,100,72,96}
-{20,51,41,21,30,20}
-{41,73,37,92,9,5}
-{95,34,21,12}
-{28,14,2,62}
-{14,74,33,32}
-{37,82,67}
-{65,99,56,11,21,83}
-{99,51}
-{56,42}
-{59,30,74,40}
-{18,27,63,44,86}
-{48,25,41}
-{5,26,63,88}
-\N
-{24,66,64,1,26}
-{72,74,11,61,70}
-{28,27,90,30}
-{96,35,21}
-{64,100,75,94,88,3}
-{93,79,42}
-\N
-{37,51,4,41}
-{31,68}
-{93,42}
-{76,96,47}
-{8,6,16,57,51,72}
-{67,72}
-{50,36,40}
-{69,28}
-{17,92,40}
-{72,74}
-{76,87,93,22,95,30}
-{14,88}
-{39,56,74,36,25,87}
-{55,68}
-{32,9}
-{35,2,17,86}
-{92,73,82}
-{40,13,95}
-{15,28,95}
-{65,40}
-{47,56}
-{63,72,78,20,22}
-{71,49,4,80}
-{68,16,50,44,29,38}
-{81,96,23}
-{44,73}
-{4,68}
-{30,54,41,66,89}
-{92,33}
-{10,92,49,46,59,42}
-{14,91,18,96,27,37}
-{40,32,12}
-{14,97,15,96,44}
-{75,96,52}
-{50,20,9}
-{39,84,83}
-\N
-{14,48,3}
-{47,85,76,27}
-{5,3,25}
-{55,36,29,76,41,44}
-{34,56}
-{62,29,83,6,58}
-{67,32,85}
-{75,62,4,66,100}
-{47,31,27,43,9,57}
-{92,44,36}
-{31,22}
-{14,88}
-{18,25}
-{82,63}
-{54,67,6,59}
-{90,42,19,91,37,75}
-{70,39,87,52,32}
-{51,20,34}
-{85,62}
-\N
-{95,6,55,93}
-{44,67,15}
-{93,58,20,12}
-{42,6,22,29,36}
-{46,81}
-{57,95,56,52}
-{3,79,69,45,8,74}
-{75,44}
-{4,17,78,96,66,41}
-{27,100}
-{85,76,22,17,45,58}
-{9,12,70,29,96}
-{5,68}
-{54,79,5,19,17,24}
-{99,13,9,52,86}
-{94,6,99,57}
-{71,62}
-{63,50,9}
-{42,42,80}
-{25,96}
-{93,20,10}
-{83,73}
-{14,76,36}
-{57,31,29}
-{17,25,18,18,54,95}
-{34,27,86,37,92,83}
-{57,57,28,32}
-{98,53,60}
-{8,59,41,88,49,46}
-{95,42,30}
-{12,51,98,74,76}
-{6,49,26}
-{21,35,27,32,83,93}
-{16,56,89}
-{85,34,73,74}
-{52,95,22,4,71}
-{96,42,63,88,80,91}
-{78,34,41,99}
-{11,68,27}
-{50,14}
-{78,52,66,15}
-{100,82,1}
-{35,2,93,71,45}
-{4,56,8}
-{83,19,5}
-{82,39,63}
-{50,64,83,87,76}
-{47,59,93,88,22,67}
-{16,6}
-{86,98,88}
-{32,4,52,34,30,71}
-{68,25,97}
-\N
-{19,17,91,84}
-{97,88,89,98,33}
-{37,56,70}
-{27,17}
-{56,58,51}
-{69,80,47,84}
-{89,22,89,88,16,1}
-{95,14}
-{14,95,97}
-{47,15}
-\N
-{19,20,65,74,83,38}
-{57,56}
-{78,67,68,89,1,95}
-{61,84,93}
-{10,56,96,31,56}
-{3,51,90}
-{15,85,42,25,15,41}
-\N
-{50,7,89,89,96}
-{90,10,44}
-{11,43,15,27,30}
-{55,68,48,30,44}
-{38,69,3,95,39,6}
-{57,51,88,94,82,23}
-{69,37,2,67,49}
-{93,94,5,84,39,47}
-{45,47}
-{58,55,79,63,64}
-{63,65,59}
-{42,36,76,75,89,86}
-{41,83,98}
-{13,90,13,46,11,37}
-{76,33,52,65}
-{52,29}
-{20,60,45,23,29}
-{89,6,14,8}
-{91,69,64,72,41}
-{46,91,31,66,83,33}
-{6,58,61,65}
-\N
-\N
-{90,65,16,5}
-{24,46,33,36,47,45}
-{11,62,40,98,21,88}
-{28,95,58,33,27}
-{45,63,99,31,38,90}
-{11,49,41}
-{23,24,82,25,28}
-{42,3,34}
-{52,10,58,88,97,37}
-{20,41,11}
-{86,30}
-{36,92,93,10}
-{5,36,85,50,71}
-{51,75,100,46}
-{55,81,31,45,87,8}
-{83,10,45,81,33}
-{16,94,91,23,76,44}
-{62,73,14,39}
-{16,14,83,100,82,7}
-{25,69,86,12,71}
-{29,86,45}
-{76,62,100,47,57,52}
-{41,21}
-{33,56,58}
-{23,96,44,16,91,86}
-{65,15}
-{3,92,56,4,21}
-{32,39,95}
-{95,87}
-{65,96}
-{16,96,93,100,35,78}
-{64,33,55}
-{96,75,41,40,62}
-{50,50,86,11}
-{93,34,83}
-{19,30,62,67,93,19}
-{53,67}
-{55,46,99}
-{70,32,38,4,84,91}
-{50,36,40}
-{21,93}
-{29,6,10}
-{4,73,45}
-{72,33}
-{36,73,18,55,27,100}
-{65,73,98,90}
-{20,1}
-{59,36,60,87}
-{20,79,63,93,34,31}
-{60,18,92,6}
-{48,34}
-{63,70,78,1,2}
-{15,32}
-{5,15,84,73}
-{32,35,90,11,40,23}
-{91,41,7,52}
-{84,90,88,30}
-{12,10}
-{84,86,36,79}
-{76,45,84,66}
-{41,25,61,96,97}
-{18,100}
-{63,39,17,34,32}
-{22,45,74}
-{83,24,45,48,69,84}
-{43,41,12,44,75,91}
-{69,75,95}
-{100,28,14,66,1,14}
-{94,91,60,36}
-{88,28,54,63}
-{68,78}
-{29,68,6,100}
-{12,84,35,44,59,55}
-{30,59}
-{64,18,40,57}
-{97,97}
-{85,64,73,82,49,88}
-{99,31,24,6,90}
-{23,89,38,20,40,95}
-{84,64}
-{21,3,91,7,7,87}
-{91,74,32,76,43}
-{13,22,96,8,75}
-{59,71}
-\N
-{34,94,45}
-{14,5}
-{95,10,37,74}
-{69,82}
-{6,58,45,49,81}
-{72,72}
-{17,58,10}
-{62,77,9,6,44,62}
-{37,53,49,41}
-{24,11,11}
-{10,57}
-{26,72}
-{18,15,83,60,54,80}
-{88,49,73,92,67}
-{26,88,64,2,59}
-{49,50,3,90,44,49}
-{58,54,43}
-\N
-{86,78,40}
-{42,17,65}
-{1,86,17,6}
-{79,27,37,60,8}
-{46,62,46,22}
-{9,75,17,68,54,35}
-{99,86,64,10,20}
-{3,21,35,6,24,64}
-{25,62,9,50}
-{63,2,79,42,81}
-{44,41,2}
-{99,93,98,78}
-{2,92,9,96}
-{79,82,25,64}
-{47,84,52}
-{97,77}
-\N
-{47,94,38}
-{22,33,76}
-{35,52,11}
-{17,48}
-{1,100,27}
-{87,93,19}
-{72,3,32,78,81}
-{47,28,4,23,79}
-{27,88,7,85}
-{49,40,47}
-\N
-{91,89}
-{80,2}
-{86,78,42,6,81}
-{7,50,25,4,8,22}
-{23,3,64,59,53}
-{1,42,63}
-{95,81,86,31}
-\N
-{81,83,52,47,25,43}
-{17,57,100,49,59,63}
-{44,91,95,72,29,100}
-{80,78,55,41}
-{14,52,20,64,9,87}
-{48,14,82}
-{31,5}
-{64,50,66,38,97}
-{61,2,90,2,64}
-{64,69,26}
-\N
-{64,62,68,89,12}
-{12,10,88,71}
-{41,66}
-\N
-{67,77,25,6}
-{14,75,15,66,19}
-\N
-{88,52}
-{78,56,61}
-{93,88,47,38,52}
-{72,100,54,34,18}
-{77,99,89,53,25}
-{38,51}
-{3,25}
-{83,39,85}
-{60,15,77,59,69}
-{38,64,91,97}
-{65,35,30,8}
-{46,6,48}
-{63,91,29,91,85}
-{43,100,56,60,74,53}
-{95,30}
-{86,63,28,62,37,79}
-{2,48,29}
-{1,44,20,47,56}
-{43,34,86,86,64,14}
-{11,82,99,71,63,41}
-{77,45,74,17,56}
-{18,25}
-{51,82}
-{27,35}
-{1,20,84}
-\N
-{89,37,16,90}
-{58,83,34,88,50,21}
-{61,25,1}
-{41,6}
-{9,100,32,54,38,66}
-{40,53}
-{29,76,16,13,55,31}
-{71,67,54,83,3,82}
-{19,62,18,94,73,38}
-{17,83,8,45,52}
-{80,25,50,59,53}
-{4,2}
-{52,48,6,72}
-{50,32,70}
-{36,97}
-{17,82,36,97,20}
-{22,87}
-{46,29,96,98,14,90}
-{14,92,5}
-{69,9,68}
-{20,86,29,61,54}
-{62,67,87}
-{86,18,31,80,82,45}
-{65,89,67,34,41}
-{44,8,48,38,91}
-{47,32}
-{85,25,56,39}
-{15,54}
-{84,57,44,46}
-{65,61,29,86,77,53}
-\N
-{26,58}
-{76,1,57,93}
-{57,91}
-{13,15,66,11}
-{84,12}
-{43,32}
-{83,24,31}
-{82,9,65,84,27,94}
-{62,93,55,7,39,46}
-{90,100,33,22,61,46}
-{9,51}
-{87,93,82,94}
-{49,45,95,95,66,39}
-{100,56}
-{11,5,78,42,45,37}
-{3,57,80,46,13,34}
-{1,74,53,31,33}
-{11,84,8}
-{27,99,21,31,96,58}
-{99,81,90,17}
-\N
-{66,49,47,55}
-{88,30}
-{76,62,17,88,83}
-{40,7,42,61}
-{17,57,9,64,54,1}
-{9,54,84}
-{50,61}
-{72,15,25,30,6}
-{64,95,69,89,11}
-{64,18,86,25}
-{81,59,70,6,92}
-{78,76}
-{33,40,29}
-{15,63,1,12,14,57}
-{33,81,8,65,26}
-{58,15,56,37,67}
-{2,50,35,92,11,27}
-{17,13}
-{91,100,15,27,39,24}
-{58,48,46}
-{5,95,28}
-{7,21,99}
-{5,15,6,10}
-{82,99}
-{66,22,86,83,76}
-{99,68,39}
-{43,90,22}
-{31,94}
-{21,64,56,26,95,40}
-{7,81,3,53,83}
-{29,42,90,60}
-{53,49}
-\N
-{26,31,14,73,88,51}
-{69,2,100,9,34,16}
-{78,35,97}
-{68,16}
-{34,45,42,73}
-{7,19,55,70,69,11}
-{11,62,61}
-{32,17,51,33,87,6}
-\N
-{54,97,36,13,45,12}
-{46,2,26}
-{14,6,17}
-{99,20,31,61,6,4}
-{60,72,53,31,34,25}
-{88,46,68,78}
-{56,94,49}
-\N
-{33,65}
-{70,51,84}
-{55,91,27,33}
-{22,19}
-{34,78,11,94,3}
-{16,67,91}
-\N
-\N
-{64,5}
-{76,18,83,5}
-{57,13,30,56}
-{60,92,25,31,43}
-{38,17,54,5,2}
-{56,58,39}
-{42,43,5,69,56,89}
-\N
-{50,23,97,85,70,39}
-{97,56,33,90,64,2}
-{9,54,51,26,24,99}
-{18,7,59}
-{44,5,40,69,18}
-{77,96}
-{44,58,47,17,26,45}
-{90,71}
-{88,32,11,96,17,13}
-{42,3}
-{97,28,56,10}
-{38,36}
-{50,52,47,31}
-{64,5,99,77,83}
-{11,56,1}
-{91,92}
-{7,53,35,52}
-{93,65,47,97,44,82}
-\N
-{64,66}
-\N
-{62,4,57,23,34,91}
-{52,55,75,99,27}
-{29,54,44,87,61,96}
-{21,3,66,35,25,80}
-{96,68}
-{3,41,66,81,78}
-{49,98,79,65}
-{71,38}
-{88,79,70,37,3,82}
-{49,74}
-{19,29}
-{57,68,9,8,99}
-{81,88,14}
-{99,29,24,99}
-{55,96,29,89,49}
-\N
-{56,2,84,79,74}
-{30,52,64,74,62,5}
-{88,32,19,25,9}
-{40,11,49}
-{98,52,27}
-{11,86,29,86,6}
-{91,53,63,53,44,28}
-{88,10,30,48}
-{75,64,75}
-{14,92}
-{98,62,35,67,66,35}
-{40,65,11,80,73}
-{1,1,63}
-{85,32,53}
-{91,27,68,50,66,63}
-{66,54,38}
-\N
-{45,43,14,94}
-{62,84}
-{54,24,83,33,46}
-{93,72,2}
-{43,4,14}
-{18,11,5,99,79,94}
-{26,59,9,2}
-{58,69,70,45,14,54}
-{84,5,42,97}
-{7,82,41}
-{69,53,8,55,20}
-{4,13,6,45,83}
-{41,92,41,98,51,85}
-{72,85,74}
-{19,50,79}
-{79,47,47}
-{25,25}
-{17,56,46,30,73,78}
-\N
-{92,42,83,34,92,29}
-{8,52,76,80,9,55}
-{80,100,2,52,24,4}
-{55,15,92,27,86,50}
-{83,79,41,88,86,53}
-\N
-{44,16,90,54}
-{99,20,64}
-{44,30,26,26}
-{35,35,24,74,72}
-{97,24,94,55}
-{78,42,32,76,100,98}
-{31,86,12,87,72,86}
-{87,35,33,88,33}
-{31,83,23}
-{46,51,5,6,71,31}
-{39,97,91,53,39}
-{19,18,25}
-{16,4}
-{65,77,13}
-{61,30,13,26,75}
-{67,9}
-\N
-{31,3}
-{15,19}
-{97,39,71,30}
-{12,96}
-{36,96,82,62,5,74}
-{81,22,46,11,19}
-{97,55}
-{58,67}
-{10,68,79,74,23}
-{29,71}
-{50,59,8,1}
-{12,51,32,7}
-{62,16}
-{48,82}
-{84,21,24,13}
-{46,86}
-{100,96,32,54,13}
-{72,41,3,67}
-{61,9,7,75}
-{39,44,50,30,38,6}
-{63,63,6}
-{69,35,6}
-\N
-{7,91,82,48,55}
-{57,22,31,57}
-{55,72,91}
-\N
-{76,98,43,71,10}
-{100,34}
-{78,53,14,73,23}
-{42,90,28,44,44}
-{90,34,22,81}
-{60,32,56}
-{98,53,58,58,61}
-{61,70,59,78}
-{2,96,27}
-{83,99,25,47,13}
-{17,54,11,47,70}
-{70,43,11,89}
-{93,70,82}
-{72,57}
-{35,95,49,36,19}
-{82,25,16,49,43,93}
-{2,51,96,48,88}
-{20,81}
-{74,4}
-{66,83}
-{90,75,98}
-{25,87,59,92,55,96}
-\N
-{20,80,92,93}
-{59,63,39,3,7,38}
-{64,10,85,22}
-{63,32,18,38,83}
-{49,38,83,54,1}
-{27,97}
-{18,34,84,58,7,86}
-{93,4,67}
-{43,49,32}
-\N
-{29,14,5,50,30}
-{59,15}
-\N
-{76,31,31,47,17,35}
-{95,41,71,27}
-{47,43}
-{75,80,56,78}
-{56,75,43}
-{99,10,100,76,44,1}
-{5,31,72,3,25}
-{21,90,59}
-{59,45,75,93,78,88}
-{76,55,4}
-{20,87,44,94,56,78}
-{38,87,71,13,23}
-{33,6,79,91,92,27}
-{13,15,31,15,11}
-{57,18,57,71,11}
-{67,60,64}
-{66,15}
-{57,45,74}
-{93,91,97,30,12,94}
-{37,83,62,18,28}
-{94,88}
-{12,11,85,10}
-{42,96,89}
-{15,65,5,65}
-{52,58,36,27,10}
-{72,88,76,50,96}
-{40,70,55,93}
-{80,33,24}
-{53,35,50}
-{11,37,55}
-{25,80,32,91,68}
-{11,2,52,39,37}
-{17,51,45,44,85,84}
-{81,21,77,15}
-{67,93,27,70,72,94}
-{86,99,95,98,83,28}
-{9,65}
-{1,26,5,23,5,17}
-{57,82,42,60}
-{46,67,65,98,69,79}
-{41,50,94}
-{77,81}
-{87,82,18,57}
-{88,27}
-\N
-{32,58,81,88,94,90}
-{23,37,65,38,29}
-{61,11,65,77,25}
-{50,53}
-{38,2,11,9,27,94}
-{64,9}
-{1,45,97}
-{61,41,67,46}
-{13,41,90,15,80,82}
-{83,6,9,22,25,37}
-{95,74,22,64}
-{16,17,4,80,66,33}
-{25,42,43,84,96,85}
-{25,93,50,87,6}
-{35,67,90}
-{82,37,59}
-{4,44,83,2,81}
-{78,46}
-{64,79}
-{18,41,3}
-{56,20,51,83}
-{26,77,52,70,93,13}
-{54,53,12,47,57,63}
-{94,48}
-{39,12,41,5,3}
-{28,33,93}
-{20,29,9}
-{75,38,10}
-{96,54,96}
-{47,87}
-{19,35,11,3,80,72}
-{75,56,84,24,55,48}
-{58,5,13,6}
-{10,53,32,6}
-{23,8,59}
-{71,2,35}
-{41,16,99}
-{77,6,16}
-{30,27,56,85,11}
-{47,21,93,82}
-{50,68,85,34,19,57}
-{14,76,58}
-{78,81}
-{68,99}
-{19,79,67}
-{91,73,82,88,44,36}
-{49,18,75,32}
-{54,18,99,74,9}
-{51,58,60,30}
-{99,86,83,22,88}
-{24,42,76,30}
-{86,16,54,69}
-{37,39,72,45}
-{92,62,3,36}
-{31,80}
-{43,22,11,15}
-{38,88,95,25,49}
-{92,21,10,28,47,55}
-{99,18}
-{26,64,72}
-{29,12,17}
-{54,69,49,84}
-{57,42,4,61,10}
-{60,85,74}
-{24,29}
-{91,71}
-{96,49}
-{47,51}
-{88,67,59,18,86}
-{32,18,64,54,41,27}
-{78,100}
-{77,30,85,93,2,20}
-{80,90,68}
-{49,37,5,42}
-{88,12,94,51}
-{85,65,2,41}
-{60,38}
-{87,37,20}
-{27,81,94,37,54,84}
-\N
-\N
-{38,74,78,78,89}
-{3,100}
-{42,80,68}
-{34,17,96,91}
-{7,29,83,71,87,26}
-{28,81,76,8,43,48}
-{74,11}
-{28,85,84,78,59,69}
-{30,22}
-{3,83,75,60,78,11}
-{20,62,18}
-{74,69}
-{91,44,50,62}
-{57,18,9}
-{14,48,21,33}
-{91,1,53,58,92,51}
-{64,41,90,52}
-{81,95,38,78,7,44}
-{65,25,15,90,40,51}
-{66,41,31}
-{5,92}
-{17,98,7,57}
-{97,36,99,77,50,88}
-{96,56}
-{40,62,88,8,53,62}
-{18,91,63,93,94}
-{88,79,43}
-{31,87,98,85}
-{12,88,58,53,77,38}
-{83,10,37,69,1,7}
-{13,47,66}
-{85,33,39,48,6,39}
-{74,87}
-\N
-{26,50,26}
-{48,78,10,39,17}
-{27,43}
-{58,17,18,80}
-{86,43,58,77,67}
-{53,12}
-{9,79,9}
-{85,79,89,88}
-{35,77,22,52}
-{93,64}
-{47,52,90,17}
-{75,15,25,68,28}
-{35,6,68,37,18,53}
-{80,14,2,89,4}
-{52,49,5,66,59,44}
-{5,26,96,1,84}
-{71,8,61,19,72}
-{17,94,84,72,55,83}
-{72,10,16,40,17,75}
-{6,70,15}
-{22,99,7,19}
-{55,19,4}
-{6,47,69,42}
-{17,9,63,44,15}
-{23,20,72}
-{10,80,20,87}
-{99,3,23}
-{11,76,8,77,58,38}
-{45,14}
-{22,89,73,63,54,9}
-{16,19}
-{1,26,29}
-{92,20,65,33,16,40}
-{27,64}
-{22,19,95}
-{36,16,9,30,31,14}
-{40,50,68,52,77,58}
-{35,15,11}
-{67,2}
-\N
-{63,48,76,25}
-{14,65,42,60}
-{61,58,31,51,70,4}
-{35,41,72,29,46,62}
-{98,48}
-{90,23}
-{1,79,80}
-{10,5,54,59,16}
-{15,1,9,75}
-{34,100,90}
-{73,76,25,77}
-{98,82,77,67}
-{79,5,20}
-{9,69,9,52,2}
-{23,22,77,80,79}
-{32,51}
-{23,52,5,33}
-{95,20,96,78,48}
-{100,37,6,15}
-{98,1,53,20,97}
-{5,28,26,78,33}
-{19,75}
-{49,42,30,72}
-{50,98,56,26,87}
-{76,59}
-{51,16,18,48,46,97}
-{80,60,51,43,58,28}
-{23,12,70}
-{40,16,14,18,46,21}
-{72,79,47,57,23}
-{7,17}
-{49,95,6}
-{14,24,29,13,90}
-{82,28,34,55,15,87}
-{31,24,3,50,45}
-{86,95}
-{97,22,17}
-{27,14,27}
-{61,63,31,74}
-{55,81,87,67,90}
-{81,9,79}
-{100,29,43}
-{41,88,37,29}
-{62,57,16,91,60,65}
-{94,90,34,94,27,48}
-{15,36,80,30,23,90}
-{47,91,6,42,93}
-{53,74,5}
-{84,14,56}
-{30,56}
-{10,12,92}
-{33,7,75}
-{96,39,50,77}
-{89,85}
-{20,39,63,22,44,18}
-\N
-{90,23,79,91,85,8}
-\N
-{73,70,52}
-{75,100}
-{27,4,29,96,25}
-{56,31,80,59}
-{1,91}
-{16,67}
-\N
-{17,88,59,41}
-{13,49,29,76,71,9}
-{41,38,16,29,66,40}
-{68,67}
-{39,74,47,71,63,80}
-{4,74,33,92}
-{17,60,82,7,52}
-{62,88,39,19,22}
-{77,21,1,95,42,2}
-{98,62}
-{55,17,81,31,11,88}
-{73,52,18,94}
-{16,64,90,33}
-{87,41,81,95,85}
-{20,55,96,75}
-{71,72,11,11,83}
-{75,94,89,47,41,7}
-{56,48}
-{76,29,74,31,67}
-{47,70,68,36,70}
-{5,69,10,94,54,32}
-{29,96,71}
-{64,28,86,58}
-{82,57}
-{42,2}
-{64,48,59,8,45}
-{61,69,43,40,1}
-{69,84}
-{68,51}
-{32,20}
-{21,7,5,60,35}
-{100,40,18,98,37}
-{50,96}
-{87,10,12,27}
-{47,3,46,43}
-{60,87,10,31}
-{92,87,50,37,72,73}
-{99,61,77,87,29}
-{23,95,31}
-{96,100,43}
-{17,64,84}
-{13,19,57}
-{65,86,4,75,46,69}
-{49,60,99,37,50,11}
-{77,82,88,12}
-{12,95,66,98,63}
-{83,78,68}
-{76,14,87,25,29,14}
-{20,9,99,73,67}
-{42,51}
-{36,22,33,6,63}
-{53,46,22}
-{40,89}
-{37,7,89,17}
-{32,89,16}
-{65,87,4}
-{16,16,57,35}
-{34,90}
-{80,54,1}
-{11,93,34}
-{5,19,31,50,99,33}
-{98,1,33,54,7}
-{45,39,23,78}
-{37,47,98,83,10,5}
-{55,88}
-{42,76,18,99}
-{86,31,25,5,45}
-{67,87,47,1}
-{23,15}
-{78,88,66,96}
-{58,55,41,67,86,41}
-{21,53}
-{90,14,28,38,95,71}
-{20,5,13,52,1,88}
-{29,98,50,75}
-{91,3,24,75,82}
-{62,33}
-{56,69,31,95,66}
-{46,85,40}
-{17,22,67,57,39,16}
-{58,25,92}
-{31,53,82,64,69,40}
-{40,12,30,1,39}
-{78,10,42,40,25}
-{58,27,1,12}
-{28,11,80}
-{36,89,69}
-{50,95}
-{61,63,59,62}
-{51,77}
-{90,24,88,84}
-{61,27,57}
-{51,81,33,75,48}
-{47,30,33,23,44}
-\N
-{79,51}
-{62,44,5}
-{98,83,80}
-{31,33,89,69,19,40}
-{22,38,61}
-\N
-{90,70,10}
-{37,90,49,65,95,52}
-{95,42,4,47}
-{92,100,43,31,27,1}
-{39,17,88,20,2,80}
-{82,64,36,84}
-{31,18,21,18,52,34}
-{3,35,36,33}
-{26,39,69}
-{67,63,66}
-{54,85}
-{65,71}
-{26,14,84}
-{63,82,73,30}
-{66,79,21}
-{71,13}
-{57,25,40,14,22}
-{63,9,91,31}
-{70,63,36,32,93}
-\N
-{11,85,47,31,54}
-{34,47}
-{42,78,92,85}
-{75,64,12,83}
-{33,98,52,91}
-{22,25,91,79,33}
-{33,51,20,77,23,65}
-{83,66,46,24}
-{54,65,31}
-{43,41}
-{52,47,66}
-\N
-{59,85,85,63,83,53}
-{16,76}
-{44,97,48,52}
-{26,36,72}
-{26,55,98,7}
-{70,88,7,87,62,37}
-{11,42}
-{98,38,36,72}
-{51,90,82,33,92}
-{59,80,79}
-{76,77,18,71}
-{34,56,62}
-{85,12,37,66}
-{34,64,74}
-{77,63,28,76,11}
-{2,63,87,50}
-{60,98,60,19,15,57}
-{93,66,33,71,36,3}
-{41,94}
-{62,72,87,19}
-{57,83,36}
-{63,64,21,13,70,32}
-{71,36,9,55,34}
-{92,52,90,45,88}
-{59,54}
-{4,51}
-{55,25,35,90,93,2}
-\N
-{75,15}
-{25,86,43,18,77}
-\N
-{31,40}
-{55,49}
-{67,1,84,20,9}
-{15,1,48,18,100}
-{62,46}
-{4,39,86,55}
-{49,17}
-{65,20,71,49,55,49}
-{40,57,63,14,3}
-{48,68}
-{67,97,58,55,5,34}
-{3,73}
-{79,97}
-{82,63,87,66,32}
-{19,49,96,50,55}
-{32,19,41}
-{17,53}
-{64,81,70}
-{66,75,18,92,54,93}
-{7,94,38,86}
-{16,62,45,19,10,11}
-{18,47}
-{58,96,69}
-{65,25,58,98}
-{29,51,37,40,44}
-{91,78}
-{37,84,85,65}
-{70,61,31,22,32,22}
-{67,12,99,39,78}
-{41,79,46,54,84,22}
-{38,26,43,4,45,75}
-{29,68,35}
-{69,59,69,33}
-{4,46,52,49}
-{1,25,44,12,71,29}
-{38,75,99}
-{83,58,86,6}
-{93,35,35,34}
-{85,26}
-{15,46,95,60}
-{62,63,65,49,10}
-{44,67,19,80,83}
-{63,41,30,43,85}
-{13,46}
-\N
-{13,95,1,34,72,37}
-{4,32,22,47,6}
-{67,65,77,3}
-{40,70,22,44}
-{74,9}
-{44,28,5,32,67,51}
-{55,14}
-{41,3,72,68}
-{64,82,72}
-\N
-{11,88}
-{91,90,92}
-{68,66,95,80,58,54}
-{30,49,11}
-{54,86,59,69,67}
-{56,83,36}
-{15,67,9,47}
-{92,30,78,2,87}
-{12,54,2,1,59,36}
-{84,25,67,38,19,53}
-{28,45}
-{54,84,9,75,59,26}
-{47,35,54,93}
-{36,96,59,75}
-{78,78,52,93}
-{87,96,67}
-{5,61,15,13,27}
-{53,58,6,78,86}
-{43,70}
-{72,38,15,61,58}
-{75,27,30,12,35,71}
-{18,72,35,62,81}
-{45,10}
-{36,91,73,25}
-{81,85,22,34,29}
-\N
-{15,97,82,44,19,83}
-{51,23,18,6,74}
-{53,75}
-{62,9,73,95,37}
-{58,42,33,41,71}
-{5,97}
-{30,2,89,81,93,61}
-{32,3,18,84,24}
-{6,97,20,89,23}
-{27,74}
-{22,86,81}
-{77,19,42}
-{92,9}
-{58,90,59,91,30,54}
-{29,51,92,34}
-{85,68,59}
-{36,83,75}
-{37,50,86,9}
-{79,70}
-{33,46,93}
-{97,17,6,88,10}
-{18,42,88,4}
-{41,95,71,27,95}
-{8,2,81,56}
-{54,94,54,28,70}
-{34,87,20,10,5}
-{36,76,87,5,100}
-{97,91,25,89,89,95}
-{76,26,73}
-{82,23,7,42,58,72}
-{53,16,99}
-{10,34,57,47,2,96}
-{81,93,26,19}
-{8,1}
-{79,55,37,61,62,3}
-{34,16,69,58}
-\N
-{41,7,99,87}
-{70,21,86}
-{59,2,49,45,91,97}
-{37,2,74,2,61,68}
-{97,39,15,4,13,1}
-{67,71,8}
-{51,2,84,38}
-{55,8}
-\N
-{75,27}
-{37,36,49,70,82,41}
-{70,20,85,89,99,90}
-{69,61,100,49,75,35}
-{11,4,67,4,91,17}
-{77,56,65,78,25,8}
-{16,58,6}
-\N
-{88,38,19,88,27,27}
-{12,46}
-{36,67}
-{62,33,96,94,80,96}
-{56,94,12,1,65,54}
-{58,73}
-{19,80,27,72}
-{47,55}
-{14,91}
-{94,75,92,32,19}
-{99,12,91,4,85}
-{56,55}
-{86,83,77,66,66,87}
-{46,68,13,45}
-{49,75,62,35,39}
-{20,25,33}
-\N
-{91,47,56,68,14}
-{88,43,24,42,4}
-{50,24,94,18}
-\N
-{71,54,91,66,97,22}
-{81,16,19,67,6}
-{78,46,81}
-{63,93,71,75,87}
-{90,38,10,85,12}
-{11,24,93,42,25,77}
-{30,14,32,67,70}
-\N
-{86,91,77}
-{73,74,64,66}
-\N
-{7,18}
-{85,94}
-{37,15,55,100,59}
-{55,18,44,79,57}
-\N
-{52,40,97,75}
-{60,53}
-{38,9}
-{27,67,77}
-\N
-{43,83,82,24,35,64}
-{22,75,29}
-{9,19}
-{67,1}
-{15,35,11}
-{65,45,95}
-{65,9}
-{63,84,99,89,6,77}
-{20,44,31}
-{82,50,88}
-{29,12,46,21,98,7}
-{98,71,3,73,6,86}
-{61,44,74,2,45,33}
-{16,56}
-{31,87}
-{72,30,37,94}
-{65,30,82,17,12}
-{86,19}
-{55,76,96,61}
-\N
-{44,92,83}
-{41,22,79,95,20}
-{36,33,86,9,61}
-{22,88,8,57,73,30}
-{63,97}
-{36,53}
-{56,52,48}
-\N
-{35,8,3,93}
-\N
-{53,52}
-{7,48,78,46,70,14}
-{33,92,55,17}
-{39,57}
-{71,43,72,7}
-{92,85,55,38,35}
-{68,30,67,8,18,92}
-{9,85,82,24}
-{46,46,19,14}
-{96,97,31,59}
-{35,99}
-{54,7,20,28,29}
-{20,21,56,82,19,40}
-{2,39}
-{33,49,63,49,93}
-{35,40,26}
-{30,35}
-{94,70,2,23,91,74}
-{34,37,72,19,15}
-{92,21}
-{72,63,64,35,40}
-{59,11,9}
-{24,3}
-{93,75}
-{22,14}
-{63,99}
-{39,47,10,14,3,45}
-{51,74,5,85,70}
-{6,33,15,4,89,20}
-{97,82,29,15,66}
-{47,47}
-{88,79,57,10,68}
-{18,22,13,100,100,67}
-{75,50,9}
-{3,12,34}
-{39,51,20}
-{56,5,63,18}
-{83,44,86,46,37}
-\N
-\N
-{60,16,54,75,62}
-{91,95}
-{39,55,11}
-{37,7}
-{29,49}
-{38,4,52,85,67,38}
-{36,56,2}
-{52,14,92,39,77,16}
-{42,25,49,55}
-{70,10,33}
-{53,46}
-{83,15,28,59}
-{35,69,82,4,58,46}
-{73,55,64,9}
-\N
-\N
-{60,25,8,8,39}
-{50,71,61,64,64}
-\N
-{65,67,67,34}
-{77,59,18,64,16}
-{43,72,32,44,59}
-{55,57}
-{12,47}
-{30,75,89,81}
-{23,92,16,31}
-{64,45,21,74,19}
-{4,47,49,47,96}
-{37,14,20,18,87}
-{61,45,38,39,1,87}
-{4,98,99,52,27}
-\N
-{23,6,50}
-{22,61,46,79}
-{90,54,60,9,49,42}
-{73,27,51,72}
-{73,11,23,60}
-{7,31,52,34}
-{27,68,39}
-{39,8,21,48,64}
-{86,64,92,60}
-{55,36,40,46,23,46}
-{32,79,86,44}
-{72,29}
-{33,87,57}
-{57,87,61,22}
-{67,84}
-{32,99,26,92}
-{22,27,34,82,8}
-{99,25,99}
-\N
-{29,75}
-{39,63,25,45,7}
-{39,67,18,13,18}
-{23,83}
-{77,69,22}
-{60,13,46}
-{2,10,42}
-{37,20,27}
-{30,21}
-{85,15,52}
-{6,89,38}
-{68,22,26,37,96}
-{6,85}
-{93,51,63,46,26,64}
-{79,77,15,26}
-{90,6,39}
-\N
-{50,58,85,27}
-{69,8,72,47}
-{7,59}
-{55,16,54,95}
-{96,5,50}
-\N
-{77,92,13}
-{46,30}
-{43,65}
-{17,65,32}
-{10,6,46,1,47,75}
-{48,82,71}
-{63,12}
-{68,14,10,97,34}
-{15,45,58,100,7,74}
-{9,23,88,1,95}
-{61,60,15,12,58}
-{84,51,46,41,71,26}
-{58,62,39}
-{86,67,31}
-{32,31,89,2,30}
-\N
-{90,74}
-{65,79,76}
-{22,30,77,47,40,23}
-{67,99,56,73}
-{11,24,30,93,89}
-{70,17,65,78}
-{100,6,67,29}
-{39,4,22,59}
-{84,29,70,9}
-{74,43,72,27,55,27}
-{12,39}
-{1,83,100}
-{48,23,9}
-{21,88,21,35,16}
-{92,34,44}
-{91,96,13}
-{93,57,40,79,81}
-{86,3,94,82,43}
-{78,70,19,97,49}
-{47,22,98,36}
-{20,59,65,54,81,27}
-{58,13,73,19,54,96}
-{26,20}
-{70,75,14,70,82}
-{77,67,53,33,83}
-{2,43,36}
-{84,17,28}
-{68,25,95,62,92}
-{47,90,15,69,85,23}
-{92,92,24,37}
-{96,14,14,38,38}
-{80,4}
-{66,86,28,15}
-{18,90,74}
-{93,76}
-{64,96,14}
-{76,41,86,67,64}
-{58,95,2,86}
-{12,60,96,70}
-{22,37,58}
-{1,67}
-{75,23,24,7}
-{3,57,66}
-{57,30,68,100}
-{68,57,33}
-{26,32,65,51,75}
-{40,14,60,97,83}
-{88,96,42}
-{66,21,21,78,34}
-{15,56}
-{86,60,66,66,16}
-{94,6,58}
-{99,63,70,57,10}
-{82,59,62,38,82,51}
-{48,61,9,46,28,57}
-{29,23,61}
-{12,30,42,20}
-{99,65,24,7,97}
-{20,5}
-{6,49,85,56,97,4}
-{62,93,88,86,75,29}
-{46,2,94}
-{57,71,45}
-{38,60,21,78}
-{95,53,92}
-{61,1,88}
-{67,80,49}
-{59,82,1,48}
-{19,94}
-{25,64,16}
-{96,73,50,85}
-{28,17,46}
-{81,51,50,18}
-{57,99,66,93}
-\N
-{23,62,57,94,40}
-{21,6,83}
-{4,11}
-{83,16,50}
-{46,41,23,1}
-{4,15,8}
-{86,51,29,80}
-{48,34,55,81,89}
-{5,2,43,67,66}
-{42,59,37,91,1}
-{14,98,27,80,33}
-{18,58}
-{49,93,60,91,94,88}
-{32,62,64,63,48}
-{51,1,90}
-{56,8,68,49}
-{16,34,79,18,76}
-{66,88,41}
-{31,66,93,44,96,40}
-{100,99,30}
-{37,49,95,91,18,43}
-{95,2,94}
-{84,15,70,31,30,84}
-{31,41,45}
-{9,73,2,7,34}
-{17,35,43,1,25,72}
-{8,70,8}
-{1,93,32,16,71,61}
-{98,51,27,56,46,65}
-{1,11,57,72,33,7}
-{48,96,64,55,75}
-{83,82}
-{7,74,70,29,59,60}
-{29,44,5,77,52}
-{84,58}
-{87,63,62,52,69}
-{29,58,32,11,13,17}
-{35,99,67,67,93}
-{54,31}
-{53,24}
-{58,59,32,22}
-{8,76,23,63,94,54}
-{3,88,75,17,64,91}
-{29,30}
-{3,81,39,9,77,82}
-{77,85,59,56,8}
-{47,12,63,13,40}
-{66,81}
-{67,33}
-{39,46,28,79,95,67}
-{49,13,98,63,10,58}
-{14,42}
-{80,70,60,92}
-{63,54}
-{30,70}
-{60,89,14,62}
-{56,40,94,55}
-{70,31,46,20,95}
-{18,65,89,7,75}
-{60,33,80,43,37,4}
-{85,19,98,79,36,84}
-{69,1,48}
-\N
-{30,87,9,22,99,60}
-\N
-{23,96,9,85}
-{22,94,39,58}
-{30,38,4,97}
-{16,70,62,5}
-{35,52}
-{32,10,72}
-{35,34,40,31,66,80}
-{7,77,14,48,97}
-{67,64,37,22,69}
-{51,53}
-{67,71,90}
-{87,71,45}
-{44,84}
-{19,58,11,34,45,85}
-{68,19,55}
-{27,16}
-{7,14,92,22,33,46}
-{47,2,49,53,63,32}
-{15,39}
-{13,47,84}
-{29,74,97}
-{51,74}
-{70,26,46,33,51}
-{31,86,14,23,61}
-{20,85}
-{21,10,57}
-{90,94,59,72,97}
-{97,30,74,84}
-{15,89,69}
-{11,40,2}
-{68,19,47,28}
-{47,65}
-{2,7,52,53,44}
-{40,74,34,36,78,71}
-{22,60}
-\N
-{37,75,47}
-{53,78,2}
-{4,32,42}
-{35,76,69,88}
-{95,13,3,38,3}
-{74,74,62,90}
-{8,72,42,2}
-{11,43,5,43,70,16}
-{69,19}
-{61,37,26,49}
-{16,100,69,32,35}
-{58,77,26,76}
-{74,87,37,47,84}
-{8,82,29,93,15}
-{74,88,93,85,97,95}
-\N
-{29,23,99,98,36,93}
-{8,36,87,64}
-{71,90,43}
-{7,28,78,46,52}
-{62,25}
-{33,90,7}
-{60,72,39,18,86}
-{98,59,73,24}
-{17,69,2}
-{49,16,63,56}
-{13,37,62,1,95}
-{98,89,69,92}
-{50,26,34}
-{90,16}
-\N
-{40,54,3,79,51,19}
-{29,24}
-{6,12,82,24}
-{92,52}
-{89,2}
-{64,25,68,55,81,2}
-{64,77}
-{71,46,58,50,56,34}
-{94,17,35,30,60,33}
-{37,30,2,40}
-{98,15,16,92,2,50}
-{44,19,82,57}
-{37,34,6}
-{59,43,1,53,79}
-{7,37,14,14,92}
-{80,78,49,81,23,17}
-\N
-{91,51,12,35,79}
-{9,14,2,84}
-{62,3,77}
-{25,5,40,12,40,79}
-{65,88,82,94,89,90}
-{20,35}
-{80,71,83}
-{6,9,83}
-{94,58}
-{2,76,55,61,42,53}
-{60,53,45,82,3}
-{1,37,75,96}
-{82,61,81,10}
-{36,46,1,31,90,45}
-{22,55,11,25,21}
-{69,13,29,20}
-{95,54}
-{16,79,82,67}
-{4,58,84,84}
-{52,7}
-{25,14,94}
-{69,8,67,54}
-{30,71,36}
-{81,78,23,38,76,58}
-{86,59,61}
-{11,42,63,74,99}
-{66,4,55,34,16}
-{39,57}
-{10,81,9,8,21,10}
-{75,55,64,97,7,45}
-{8,46,86}
-{39,100,52}
-{30,51,7,13,54}
-{72,85}
-{10,52}
-\N
-{61,7}
-{93,1}
-\N
-{74,31,3}
-{90,96,26,84}
-{88,58,74}
-{28,45,74,24,74}
-{95,88}
-{42,70,43,64,22}
-{46,83,48,36}
-{81,99,100,43,11}
-{47,24}
-{46,67,63}
-{26,15,36,89}
-{90,11,78,70,81,87}
-{65,90}
-{89,99,21,81,47,38}
-{37,42}
-\N
-{94,51}
-{12,57,95,63,29}
-\N
-{68,99}
-{27,8}
-{16,52,11}
-{72,5,85,44,57,51}
-{11,6,91,7}
-{87,80}
-{94,61,1,38,77,89}
-{93,60,6,98,46}
-{52,47,44}
-{93,66,61,22}
-{7,61}
-{15,83,93,91,12,40}
-{66,3,5,72,72,36}
-{67,72,68}
-{42,42}
-{38,17}
-{75,60,47,39}
-{58,28,51}
-{61,8,61,81,65}
-{46,52,97,84,27,47}
-{97,53,47}
-{64,93,83,72,27}
-{34,79,34,36}
-{25,5,92,37}
-{12,20,55,94}
-{17,43}
-{39,37,16,70}
-{79,62,15,16,64,28}
-{80,87,96,41}
-{51,55,1,94,72}
-{75,22,56}
-{2,55,7,20,39}
-{8,91}
-{73,8,42,73,31}
-{90,90,23}
-{82,68}
-{63,64,68,12,59,19}
-{100,80,23,24,17}
-{23,46}
-{25,13,31}
-{43,95,54,85}
-{40,62,21,21,82}
-{70,20,16}
-{90,11,23,18}
-{16,9}
-{51,57,30,27,21}
-{50,55,75,77,53,33}
-{84,92}
-{14,66,32}
-{44,100,16,30,82}
-{41,48,58,60,7,44}
-{81,76,13}
-{18,26,82}
-{84,35,15,98}
-{52,84}
-{13,80,36,35,28}
-{91,16,71,55}
-{87,89,6,20,28}
-{12,75,92}
-{48,41,55}
-{59,75,26}
-{48,19,48,72}
-{91,4,100,25,17}
-{46,52,97,78,94}
-{7,81,76}
-{54,54,49}
-{89,37}
-{78,22,57}
-{75,25,83}
-{25,89,10,38,96}
-{52,12,1,74,35}
-{13,48,88,7}
-{6,97,20,19,91}
-{53,2,99,76}
-{4,58,46}
-{30,30,89}
-{97,2,87,47,55}
-{14,11,72,83,97,74}
-{44,69,11,51}
-{47,17,86,27}
-{15,19,56,96,24,94}
-{81,67}
-{11,11}
-{20,94,49,36,39}
-{39,78,40,46}
-{33,87}
-{76,89,58}
-{94,74,25}
-{33,77,5,47,55}
-{28,67,99,81,93,83}
-{31,10,19,65,60}
-{53,25,74,24,48}
-{73,69,23,45,88}
-{70,56,41}
-{21,73,72,28,99,5}
-{75,69}
-{78,99}
-{66,49,89,86,2}
-{30,53,18,21}
-{67,69}
-{1,98,38}
-{91,25,16,39}
-\N
-{75,54,93,39,18}
-{96,84}
-\N
-{64,71}
-{6,15,78,50}
-{8,45,26,15,25}
-{8,90,94}
-{52,66,13,98,86,69}
-{3,25,28,56,88}
-{84,72,89}
-{10,33,46,6,57,100}
-{13,91,99,2,49}
-{83,59}
-{88,64,42,50,77,16}
-{81,12,27,45}
-{12,17,31,93,22,53}
-\N
-{28,84,85,35,3}
-\N
-{42,12,86,76,37,63}
-{46,23,18}
-{45,80,76}
-{94,18,100}
-{17,80,84,80}
-{84,88,29,16,10}
-{7,42,90,51,33,40}
-{79,51,22,2}
-{31,30,72,24,23,84}
-\N
-{55,50}
-{69,47,82,29,83}
-{94,56,69,18}
-{7,81,71}
-{95,13,32}
-{66,59,68,62}
-{52,19,62,51,80,32}
-{38,18}
-{73,24,81,58,22}
-{11,59,41,19,96}
-{61,11,56,89,89}
-{61,72,9}
-{63,12,8}
-{76,54,75,84,6,44}
-{74,3,11,62,30,74}
-{46,60,71,55}
-{28,47,52,71,33,33}
-{35,51,37}
-{38,89,40,29,30}
-{18,26,99,89}
-{36,44,8,100,72}
-{1,23,6,5,23}
-\N
-{84,17,16,44,81}
-{29,70,24,85}
-{23,57}
-{20,98,30,23,1,66}
-{82,3}
-{70,7}
-{15,49,58}
-{19,40,70,88,35}
-{45,10}
-{62,89,47,71,55}
-{34,100,88,44,3,91}
-{92,65,16,24,7,9}
-{20,12,61,95,7}
-\N
-{57,49,42,87,88,14}
-{89,99,86,31}
-{32,55,51,78}
-{55,66,78,10,12}
-{37,19}
-{13,5,36,66}
-{89,7,40,45}
-{41,58,41,24,11}
-{98,8,9,27,40}
-{49,83,89}
-{91,36,78,44,100,62}
-{76,78,9,52,57,27}
-{100,59,37}
-{51,1}
-{92,83}
-{45,1,85}
-{8,81,45,94,32}
-{52,26,9,98,7}
-{97,52,4,85,13,11}
-{94,38,58,4,72,91}
-{5,39,26,14,74,51}
-{31,44,37,24,89}
-{8,74}
-{56,93,36,3}
-{23,46,25,90,42}
-{4,98}
-{31,95,27,26,20}
-{3,7,79,9,90}
-{29,22}
-\N
-{35,34}
-{80,28,12,21}
-\N
-\N
-\N
-{36,49,94,83,25,9}
-{6,62,89,93,59}
-{67,75,3,93}
-\N
-{94,62,3}
-{97,36}
-{43,89,26,94}
-{46,56,22}
-{50,15}
-{45,47,39,61}
-{23,32,24,45,43,11}
-{97,66,29,8,52,67}
-{37,1,48}
-{30,84,86,91}
-{4,46,59,35}
-{76,37,41,90}
-{26,28,92,27,88,17}
-{76,37,27,41}
-{74,51,31}
-{16,33}
-{66,85,68}
-{4,81,72,62}
-{65,14}
-\N
-{11,43,28,14,9,43}
-{60,88,95,1}
-{52,92,69,48}
-{37,81,85}
-{57,73,8,79}
-{50,26}
-{52,41,99,6,33}
-{9,34,58,22,9}
-{56,37,19,77,50}
-{93,21,18,90,41,40}
-{28,89,76}
-{4,36}
-{89,54}
-{70,28}
-{66,11,3,47,30,43}
-{69,54,86}
-{45,41,57,34,18}
-{91,46,32,68,42,68}
-{25,87}
-{75,57,12}
-{55,15,68}
-{6,63}
-{22,39,88}
-{77,39,10}
-{39,49,69,61,66,77}
-{78,25,42,73,89}
-{17,47,36,27,79}
-{33,83,44}
-{27,75,12,96,94,87}
-{50,17,95,42,25}
-{67,13,22}
-{59,85,95,2}
-{81,57,83}
-{25,11,72}
-{32,84,97,6,65,52}
-{62,25,24,27,50}
-{80,64,23,74,54,75}
-{97,17,15,100}
-{50,11,41}
-{57,82,40}
-{10,90,41,52,39}
-{4,11,86}
-{79,17,51}
-{48,100,92,77,58}
-{88,67,19}
-{40,96,52,35,16}
-{89,63,32,81,28,63}
-{44,56,66,50,55}
-{28,73,46}
-{32,40}
-{52,65,85}
-\N
-{51,34,18,82,83}
-{49,49,90,71}
-{84,16,74,78,86,10}
-\N
-{73,9,47}
-{51,59,49,90}
-{85,13,78}
-{98,77,18,15,92,85}
-{40,94,66,94}
-{89,51,80,12}
-{23,26,75,17}
-{96,2,51}
-{88,62,90,32}
-{85,19,87,89,30,15}
-{33,38,9,46,19,87}
-{27,45,15}
-{39,79,82,88}
-{31,33}
-{41,64,10,1}
-{35,61,22,76,74}
-{75,11,90,16}
-{71,23,43}
-{35,3,97}
-{88,4,97}
-{100,61,28}
-\N
-{64,74}
-{9,44,81,98,55}
-\N
-\N
-{76,89}
-{18,34,80}
-{77,83,91,50,20,41}
-{65,50,26,65}
-{79,18,90}
-{5,60}
-{42,21}
-{31,70,80}
-{20,98,15,14}
-{58,65,45,6,64}
-\N
-\N
-{88,82,98}
-{75,81,32,34,59}
-{37,14}
-{30,36,55,70,65}
-{84,55,26}
-{56,64,1}
-{31,41,89}
-{46,43,43,90,34,100}
-{78,36,21,14,69}
-{100,10,45}
-{73,69}
-{60,86,5,70,78,99}
-{6,89,92,8}
-{86,68}
-{44,4,71}
-{41,36}
-{95,80,42,94,34}
-{73,29,50,49}
-{61,20,57,17,36}
-{37,58,67}
-{56,83,77,37}
-{98,67,40,10,35,76}
-{54,84,6}
-{7,71}
-{65,74,43,6}
-{62,98,74}
-{81,26,17,22,47}
-{49,32,59,35,11,94}
-{80,50}
-{91,1,50,97}
-{71,35,84}
-{97,4,46,45,8,36}
-\N
-{81,62,76}
-{69,78}
-{89,3,16,64,17,17}
-{78,72,26,88,81}
-{25,34,9}
-{50,27,34}
-\N
-{55,44}
-{61,51,39,53,44,46}
-{23,94,32,92,90}
-{91,47,67}
-{1,13,76,57,63}
-{77,19,73,18,95}
-{100,82,87,6,83,23}
-{69,58,48,97,60,50}
-{4,83,85,6}
-{3,5,91,37,94}
-{91,72,31,32,80}
-{57,23,39,46,50,20}
-{92,28,53}
-{71,27,46}
-\N
-{59,73,29,21,89,30}
-{1,83,96}
-{34,41,65,35}
-{52,89}
-{62,68,80,7}
-{82,82}
-\N
-{11,2,62,46,28,9}
-{9,16}
-\N
-{22,44,73,82,39,86}
-{97,52}
-{46,36,76,56}
-{17,97,26,72}
-{16,78,9,70}
-{65,55,30,91,16}
-{27,45,76}
-{17,5,90}
-{86,52,93,89,42,27}
-{51,70,41,35,1}
-{91,57,66}
-{53,59,62,57,52,56}
-{100,100}
-{32,78,87}
-{61,57,74}
-{86,79}
-{55,94,64}
-{81,20,26,22,23}
-{9,96}
-{86,65,35,19,88}
-{1,37,90,51}
-{79,47}
-{93,93}
-{32,85,69}
-{49,12,6,69}
-{6,44,92,37}
-{28,42,57,28,2,69}
-\N
-{63,90,25}
-{53,28,74,42}
-{83,79,94,37,64,69}
-{93,100,57,84,80}
-{39,93,80}
-{97,92,55}
-{27,6}
-{20,100}
-{19,66,3,66}
-{7,76,15}
-{7,56,92,11}
-{61,76,6,98,52}
-{20,46,51}
-{12,77,45,67}
-{78,79,32,22,21,47}
-{62,35,1}
-{86,66,57,10,47,43}
-{43,24,76,18,87,68}
-{39,52,71,35,87}
-{81,78,8,10}
-{33,70,53,54}
-{25,77,27,68,95}
-{29,53,89,62,51}
-{21,76,33,72,39}
-{13,22}
-{1,1,51,73,20}
-{26,97}
-{64,75,23,94,62,68}
-{25,20,84,57,27}
-{26,7}
-{92,80,17,48,72,73}
-{73,49,88}
-{24,36,70,53}
-{7,79}
-{80,58,33,25,91}
-{19,43,61}
-{54,49,73}
-{51,88,4}
-{9,32,5,83}
-{17,68,90,15,30}
-{98,50,42}
-{29,52}
-{32,41,4}
-{33,97,69,34}
-{94,2,60,5,83}
-{23,86,43,74,35}
-{63,37,38,58,39,14}
-{56,7,82}
-{88,81}
-{50,75}
-{78,49,67,68}
-{10,61,58}
-{84,35,20,30}
-{36,34,48,31,16}
-{35,7,47,22}
-{98,40,56,43}
-{16,4,7,9,44,55}
-{86,90,30,80,47,91}
-{34,91}
-\N
-{12,67,77,23,11}
-{94,8}
-{5,68,31,82}
-{26,65}
-{51,19,86}
-{55,83,39,39,96,51}
-{31,22,70}
-{20,50,15,93}
-{1,55,64}
-{8,2,14,3,40}
-{2,71,25,41,5,5}
-{98,61}
-{21,64}
-{100,76,99,18,78}
-{17,4,69,97,61}
-{52,79,97}
-{52,26}
-\N
-{90,54,2,62,11,51}
-{33,12,34,45,2}
-{91,63,51,42,82}
-{100,79,73,70,54,14}
-{57,94,81,55}
-{13,18,94,17,16,34}
-{58,79}
-{90,64,68,46,95}
-\N
-{37,46}
-{91,94,10,85,100,24}
-{65,86}
-{94,89,7}
-{72,79,77,53,95}
-{65,19,92}
-{41,79,53,8,63}
-{28,60,50,42,9,32}
-\N
-{6,23,97,23,10}
-{12,28,16,39,70,50}
-{26,97,61,48,79,23}
-{38,98,21,34,65,89}
-{29,13,36,19,13,45}
-{72,65,58,81}
-{43,98,84,5}
-{79,41,100}
-{35,30,69,42}
-{59,13}
-{65,90}
-{40,38,21,23}
-{2,19,26,38,66}
-{5,16}
-{84,85,97,84}
-{34,26}
-{87,17,21,32,29,25}
-{75,66,87,90,18}
-{84,32,29,51,71,68}
-{57,25,73,24,53,2}
-{74,16,92}
-{99,60,19}
-{98,14,70,72}
-{24,34}
-{37,34,81,100}
-{67,10,17,60,16,55}
-{39,58,5,23,85,95}
-{75,93,19,31,47}
-{13,27}
-{42,14,32,90}
-{59,79,70}
-{48,96,45,38,58}
-{96,87,84}
-{23,70}
-{25,31,81,36,75,32}
-{64,49}
-{30,18,38}
-{69,27}
-{76,82,43,96,73,17}
-{84,95,97,12,20}
-{57,69,36}
-{60,79,19,67,9,12}
-{32,39,3,21}
-{55,83,51,48}
-\N
-{37,11,98,53,11}
-{2,73,24,18,77,74}
-{69,96,17,49}
-{53,2}
-{1,76,72}
-{35,93}
-{35,36,36,25}
-{59,77,30,13}
-{35,69,36,31}
-\N
-{20,23,51}
-{81,83,57}
-{87,43,40,56,81,64}
-{24,63}
-{29,51,45,93}
-{73,85}
-{59,1}
-\N
-{13,57,14,11,34,91}
-{69,1,4,28,77}
-{63,68,41,53,64,43}
-{11,1,46,40,6,88}
-{51,19,77,10,86,66}
-{74,40}
-{25,54,46,62}
-{94,17,64,15,20,36}
-{100,71}
-{63,66}
-{33,88,5,92}
-{92,86}
-{91,69,75,13,20}
-{57,22,32,33}
-{72,87,44,64,46,6}
-{50,56}
-{36,23,7}
-{74,63,3,6,14,29}
-{91,42,8,11,49}
-{32,64,94,88}
-{91,78,55,27,59}
-{2,20}
-{52,95}
-{57,59,35}
-{51,15,52,24,14,13}
-{64,16,18}
-{50,98,71,10}
-{92,99,92,80,77,73}
-{96,12,70,85,54,73}
-{10,44,30,77}
-{29,47}
-{40,55,62,58,30}
-{59,93,7,21,6,20}
-{58,91}
-{5,70}
-{36,23,58,80}
-{16,93,54}
-{20,8,97}
-{78,32}
-{10,31}
-{24,10}
-{56,14,28,10,45}
-{1,79,53}
-{56,58,86}
-{93,83,17,89,93}
-{12,4,26,45,97,17}
-{42,67,17,13}
-{31,90,59,38,4,20}
-{86,52,67,10}
-\N
-{49,59,10,25}
-{69,88,31,38,7,36}
-{84,21,57}
-\N
-{60,8,19}
-{35,81,66,96}
-{13,95,54,38,31}
-{27,25,34,11,65,64}
-{54,43,20,20,65,95}
-\N
-{19,27,100,69,43}
-{91,8}
-{30,65,98,87,84}
-{83,85,100,16,20,18}
-{80,48,56}
-{61,5,92}
-{14,94,43,91}
-{35,52,60,43}
-{73,25,26,61}
-{66,41,39,16}
-{2,96,90,37,99,92}
-{25,31}
-{72,57,50,82}
-{40,69,5}
-{98,34,66}
-{90,44}
-{34,78,93,15,65,71}
-{98,1,28,36}
-{16,59,79}
-{88,1,14,45}
-{41,91,87,20,72}
-{46,9,81,90,63,32}
-{2,84,29,56}
-{2,57,92,69,63,46}
-{3,32,76,62,36}
-{11,81,3,81,90,16}
-{36,1,42,51}
-{29,86,53,51,85}
-{17,66,16}
-{4,21,25,17,65,92}
-{13,26,33}
-{74,6,46}
-{69,19}
-{47,78,85,46,41}
-{41,62,100,85}
-{22,71,66}
-{28,15,58,84,22,92}
-{68,82,82,85,15,54}
-{34,58,72,35,99}
-{51,100,40,13,61}
-{80,89,94,31,96}
-{48,29,33}
-{32,85,75}
-{76,43,17}
-{79,70,3,64}
-{76,64,85}
-{94,90,3,85}
-{86,21,1,8,54}
-{87,92,30,36,59}
-{20,51,62,17}
-{81,61,86,96,47,67}
-{5,75,97}
-{60,24,79,3}
-{85,49,49,48,61}
-{66,60,58,92,88,90}
-{2,18}
-{42,54}
-{42,83,68}
-{98,76,42,25,90,32}
-{64,36,39,45,34,95}
-{56,43,78,10,63,18}
-{51,40,98}
-{85,11,74,41,14,25}
-{37,12}
-{76,32}
-{6,77,16,86,36,25}
-{23,93,18}
-{75,51,67,29}
-{22,9}
-{18,58,25,88}
-{95,31,12,20,62,54}
-{23,97,89,63,73}
-{77,41,11,27}
-{91,86,97,98}
-{84,6}
-{74,69,55}
-{58,42,92,65,52}
-{77,31}
-{8,91}
-{5,83}
-{64,48}
-{1,37}
-{51,4,49,97,64}
-{29,70,3,62,57,1}
-{91,8,31}
-{86,71}
-\N
-{61,50,8,6,59,76}
-{83,8,54}
-{50,45,66,86,52}
-{75,48,18,88,82}
-{1,52,60,78,45}
-{46,65}
-{53,2,63}
-\N
-{89,97}
-\N
-{75,23}
-{30,58,13,50,2}
-{59,73,52,8,70,39}
-{20,35,77,34,10}
-{55,86,14,74,14}
-{67,46,48}
-{20,9}
-{20,92,62,75,34,98}
-\N
-{72,14,18,46}
-{48,71,92,17,31,13}
-{47,46,42}
-{42,75,14,86}
-{97,55,97,78,72}
-{8,4,96}
-{44,13,13,18,15}
-{16,40,87}
-{87,66,79}
-{14,44}
-{35,79,25,57,99,96}
-{23,66}
-{90,49,24,11,8}
-{50,3,24,55}
-{60,94,68,36}
-{11,20,83}
-{66,100,47,4,56,38}
-{36,34,69}
-{41,57,15,32,84}
-{32,25,100,45,44,44}
-{70,32}
-{15,37,67,63,71,34}
-\N
-{81,62,20,91}
-{32,62,1,68,86,54}
-{20,91,40}
-{79,69,22,98,14}
-{45,42,24,2}
-{30,53,15,62}
-{81,100,42,20,96,42}
-{93,19,7,59,100,49}
-{25,7,18,64}
-{11,27,1}
-{89,67,65}
-{39,97}
-{47,62,30,61,58}
-{4,11,83,18}
-{38,30,95,58,13,81}
-{83,6,33,73,64}
-{89,51,77,45,58,16}
-{13,11,88}
-{96,79,71}
-\N
-{18,66,83,52,84,76}
-{52,17}
-{74,95,16,5,16,51}
-{21,20,16,39,84,71}
-\N
-{75,47,36}
-{65,45,12,5,100}
-{41,74,84,21,73}
-\N
-{8,90,46,39,30}
-{47,84,42,49,17}
-{76,100,35,89,17}
-{61,53,50,31,8}
-{94,53,20,33,15}
-{97,46,62,85,74}
-{8,59,40}
-{95,71,21,41,85,81}
-{55,71,20,74}
-{70,95}
-{61,42}
-{83,74,25,84,18}
-{56,43,46,40}
-{42,78}
-{95,48,98,93,35,98}
-{77,34}
-{4,54,58}
-\N
-{13,54}
-{87,66}
-{12,88,90,95,6,95}
-{65,20,10}
-{62,74,59}
-{49,17,51}
-{14,17,65,3,27,41}
-{43,42,43,46,79}
-{88,75}
-{21,46,84,95,31}
-{17,17,28}
-{32,73,29,11,46,94}
-{3,34,81}
-{80,83,1,92,69,100}
-{9,24,56,17}
-{3,80,57,36,14,94}
-{39,89,54,17,31}
-{70,19,67,21,31,72}
-{82,48,68,52}
-{96,81}
-{92,18,39,50,18}
-{6,54,27,52,28,100}
-{23,40,7,74,93,50}
-{87,51,38,88}
-{98,42,43,30,8,71}
-{33,26}
-{20,21,83,35,99,100}
-{28,77,94,32,1,13}
-{17,15}
-{35,100,9}
-{42,6}
-{16,28,55}
-{7,94,81,60,91}
-{100,63,21,28}
-{65,20,35,16,76}
-{95,3,88,62,1}
-{73,44,46,13,55,69}
-\N
-{60,49,71,77}
-{93,39,75,63,69}
-{97,36}
-\N
-{77,16}
-\N
-{57,30}
-{39,31,56,51}
-{62,78,62,38,54}
-{69,86,99,10,12}
-{11,43}
-{60,70,83}
-{83,82,3,1,60}
-{24,55,61,85}
-{65,72,13,77,79,100}
-\N
-\N
-{28,97,71,78,68,95}
-{34,1,72,79,84}
-{10,49,91,44,27,51}
-{15,48,80,37,69}
-{42,46,32,34,86}
-{80,21,26,50,5,8}
-{61,71,100,78,54,50}
-{36,20,80}
-{67,40,47,68}
-{60,7,36,36,55,2}
-{32,91,13,98,88}
-{15,56,65,23,13}
-{20,66,81}
-{19,36,99,54,86,92}
-{82,28}
-{43,32,91,37,70,68}
-{71,78,82,50}
-{1,31,23,48,10,12}
-{88,96,1,44}
-{27,49,97,29,89,35}
-{63,72,58}
-{79,9,32,64}
-{75,67}
-{46,31,83,54}
-{66,24,6,89}
-{82,10,64}
-\N
-{19,31,52,34,89}
-{16,36,11,12,23}
-{55,50,6,20}
-{81,72}
-{71,74,8,6,31}
-{6,20,96,80}
-{95,85,56,91}
-{36,33,88,12,50}
-{77,44,52,50,50}
-{94,12,7}
-{97,44,40,43,8,21}
-\N
-{61,14,40,75,87}
-{43,21,67,66}
-{46,19,80,12,46,28}
-{56,11,14,59}
-{31,94,50}
-{45,26,61,15}
-{84,45,44,82}
-{9,16,86,54,93,30}
-{50,39,37}
-{35,60,64,55,73,90}
-{61,65,87,20,30}
-{12,59,44}
-{23,8,97}
-{30,59,7}
-{85,32,14,95,38}
-{18,91}
-{10,40,20,8,58}
-{5,58,4,94}
-{100,11,96,70}
-{66,72,7}
-{5,31,89,89,4}
-{81,68,44,37}
-{22,22,76,67,72}
-{22,26,30}
-{73,47,27,18,54,30}
-{44,13,73,95,83}
-{18,93,72}
-{30,22,73,13,16}
-{14,11,66}
-{45,33,59,72,92,81}
-{97,82}
-{30,4}
-{1,9,46,70}
-{47,50,20,71,48,60}
-{26,62,53,70,63,49}
-{39,26}
-{47,94,9}
-{55,3,18,1,75,22}
-{42,87,74,57,60,55}
-{95,46,21,38,27}
-\N
-{13,35,48}
-{24,39,24,67}
-{44,83,49,72}
-{22,8}
-{77,39,87}
-{37,41,44}
-{100,57}
-{48,54,58,79}
-{14,84,40}
-{11,51}
-{23,80}
-{80,82,43,59,2}
-{92,53,56,44,90,66}
-{44,67,78,9}
-{43,91}
-{70,74,100,69}
-{12,5,75}
-{65,51,22,65,56,36}
-{52,54}
-{38,78}
-{30,45,38,99}
-{18,88,88,63,51}
-{61,24,53}
-{72,24,77}
-{61,46}
-{11,83,49,86,27,60}
-{86,60,83,34,33,28}
-{65,15,10,51}
-{98,92}
-{49,49,60,3}
-{58,56,43}
-{19,25,15}
-{24,40,36,49,61}
-{5,62,9}
-{72,8,71}
-{64,85}
-{72,84,67}
-\N
-\N
-{80,87,30,70,21}
-{30,86,95,19,21}
-{17,90,15,89,81}
-{40,51}
-{77,88}
-{14,89,82,62}
-{40,66,93,16,55,45}
-{22,46,31,17,4,71}
-{8,41,88,94,25,61}
-{80,8,23,71,59,53}
-{61,70,23}
-{2,4,79,6,67}
-{27,70,42,68,33}
-{46,27,10}
-{1,93,42,12,8}
-{31,9,19,32,62,15}
-{16,42,81}
-{56,29,12,17,61}
-{52,100,98,42}
-\N
-{29,38}
-{49,40,47,63,22,4}
-{99,70,13}
-{70,28,67,100}
-{37,75,65,63,35}
-{45,67,37,28}
-{42,78,71,39}
-{33,35,76,69}
-{65,84,57,63}
-{17,12,86,23}
-{31,62,79}
-{3,22}
-{85,81,59}
-{38,5,15,100,1,27}
-{36,96,93,46,75}
-{44,61,85,70,71}
-{79,72,86,71,77,9}
-{23,51,47}
-{4,59,48,38,44}
-{93,54,86,98}
-{60,29}
-{49,38}
-{54,84}
-{72,25}
-{51,40,25,27,68}
-{24,17}
-{95,3,82,31,95}
-{56,37,57}
-{15,84,98,16,53}
-{47,36,15}
-{27,36,76}
-{38,82,26}
-{47,70}
-{60,89}
-{59,73,99,7,28,89}
-{87,49,70,76}
-{71,93,76,81,11,46}
-{74,87,92,24,43,22}
-\N
-{26,1,85}
-{18,73,43,94}
-{92,2,73}
-{5,58,85}
-{20,7,39,18,59,90}
-{11,16,19,77,60,56}
-{77,1,95}
-{4,4,11}
-{48,40,56,74,96,29}
-{71,1,62,69}
-\N
-{34,61,26}
-{86,75,13,73,28}
-{17,35}
-{100,29,37,26,47}
-{69,36,52,61}
-\N
-{81,51,54}
-{54,78,46}
-{1,78,96}
-{33,54}
-{72,9,37,30,100}
-{67,10,52}
-{77,19,74}
-{52,27,41,37,98,73}
-{8,74,86}
-{4,40,99,6,59}
-\N
-{98,43}
-{74,91}
-{69,45,73,59,19}
-{87,43,31,85}
-{2,51,54,3}
-{45,73,8,86,4,40}
-{2,51,96}
-{74,5,8,64,1,46}
-{5,64,86,63,12,75}
-{6,62,71,24}
-{56,84,54}
-{61,37,79,63}
-{81,39,78,23,86,74}
-{50,79,34,23}
-{85,36,78,80,19}
-{34,94,1,46}
-{5,23,38,4,78,2}
-{85,100,80,13,73}
-{48,86,9}
-{47,22,65}
-{49,81,18,52,36}
-{84,85}
-{89,15,71,88,44}
-{1,21,81,52,2}
-{53,18,7,53,50,11}
-{91,89}
-\N
-{20,6,20,70,12,32}
-{98,94,70,52,41,35}
-{43,25,2,63}
-{95,86,6,82,2,41}
-{79,24,63}
-{12,96,7,18,48,67}
-{55,35,4,75,28,39}
-{48,46,33,75}
-{10,99,5,5,98,25}
-{43,87,5,53,76,64}
-\N
-{100,13,9,4}
-{4,35,65,56}
-{27,74,88}
-{59,66,10}
-\N
-{59,85,39,48,17,29}
-{59,42,17}
-{27,99,12,21}
-{9,10}
-{15,4,80,25,67,59}
-{12,89,96}
-{50,32,92,49}
-{40,74,10,6,26,43}
-{80,71,29,54}
-{74,82}
-{22,25,27,65,12}
-{84,88,53,43,75}
-{84,16,51,84,46}
-{10,9,44,95}
-{87,19,22,10,44,80}
-{18,20,87,41,86}
-\N
-{9,64,4,33}
-{65,87,23,65,32,92}
-{50,2,23,68}
-{29,8,82,28}
-{54,92,6,2,28,70}
-{23,11,65,78,34}
-{77,85}
-{30,49,59,8,60}
-{77,30,34}
-{55,73}
-{89,68,55,81,8,81}
-{54,28}
-{35,22,67,63,48}
-{43,37,46,56,81}
-{16,78,32,81,77,37}
-{35,80,41,76}
-{4,93}
-{3,32,23}
-{43,18,50}
-{87,5}
-{30,40,91}
-{36,69,17,82,70,57}
-{73,71,47,63,58}
-{24,11,36}
-{2,72,61,76,9}
-{61,97,10,85,92,56}
-{5,44,47}
-{24,57,79}
-{69,39,97,8}
-{78,16}
-{62,52,17,35,28}
-{48,79,66,64,36}
-{14,72,75,30}
-{17,21,41,25}
-{28,100,66,56,15}
-{89,3,32,86,6}
-{67,34,16}
-\N
-{48,27,70,60,1,40}
-{69,34,36,46,95}
-{59,24,84}
-{44,21,90}
-{22,30,5,62,13,58}
-{79,67,44,10,1}
-{67,8}
-{40,48}
-{64,5,65,35}
-{74,45,75,15,31,69}
-{42,3,49,33,52,97}
-{86,59,69,84,53}
-{64,64,41,64,99}
-{47,95,16,78,73,68}
-{54,11,52,90}
-{54,62,79,58,96,59}
-{28,34}
-{52,94,17,42,9}
-{94,22,77,7,56}
-{72,24,47}
-{6,11,3,23}
-{9,6,97,82,40,39}
-{73,47,57,8,7,97}
-{27,26,1,2}
-{64,45,38}
-{71,6,6,83,33}
-{78,28,40}
-{25,8,17,15}
-{24,67,53}
-{72,42}
-{66,25,56,36,32,93}
-{18,11,22}
-{88,9,75,23}
-{20,32,24,44,51,34}
-{76,86,11,7,1,61}
-{11,77,41,55,87,59}
-{62,53,94,46}
-{77,20}
-{74,97,59,78,9}
-{7,94,26,18,77}
-\N
-{49,59}
-{72,22,42,89,14,80}
-{49,14,38,19}
-{43,88,25,58,39,24}
-{21,34,37,65}
-{85,3,46}
-\N
-{11,60,86,65,49,83}
-{51,98,7,28}
-{85,17,34,59,14,86}
-{89,81,48}
-{67,40,11,60,75}
-{13,45,42,22,82,82}
-{98,21,89}
-{30,63}
-{35,45,68}
-{9,29}
-{43,71}
-{82,44,59,72,48}
-{1,48,29,44,14,11}
-{75,33,85}
-{7,32,92}
-{62,14}
-{29,31,1,36,51}
-{92,12,28,20}
-{13,67}
-{88,72,14,22,61,42}
-{15,98,49}
-{65,27,9,76}
-\N
-{15,95,26,12,52,40}
-{17,20,74}
-{57,63,15,22,38}
-{93,71,8}
-{26,84,82}
-{20,52,3,3}
-{72,95}
-{10,9,80}
-{9,9,18,51}
-{74,24,63,63,57,89}
-{64,91,95,18,15}
-{64,37,20,36,74}
-{52,9,53,6}
-{17,31,42}
-{3,73,92,13,62}
-{57,81,58,49}
-{52,56,2,26,18}
-\N
-\N
-{90,90}
-{16,92}
-{66,51,7,19,10}
-{100,81,69,86,95}
-{48,64,81}
-{87,54,73}
-{6,80,100,24,26,8}
-{44,67}
-{27,94,2,25,34}
-{80,25}
-{12,2,77,75,15}
-{63,14,30}
-{85,75,59}
-{72,73,54,44,25,76}
-{95,44,69,91,62}
-{94,73,78,5}
-{28,52}
-{86,31}
-{69,90,95,66}
-{6,10}
-{68,72,112}
-{9,165}
-{91,132,164}
-{57,82,144,167,184}
-{3,6,101,118}
-{111,158}
-{22,29,30,174}
-{41,66}
-{39,76,189}
-{7,20,21,196}
-{52,126,169,171,184}
-{21,77,91,176,196}
-{16,97,121}
-{83,135,137}
-{8,140,160,164,165,195}
-{38,65,185}
-{112,152}
-{111,129,134,148}
-{47,80,114,135,147,165}
-{24,98,119,123}
-{43,48,60,147,154}
-{19,54,138,171,186}
-{156,175}
-{20,51,123,193,193}
-{37,41,136,173,192}
-{14,22,111,125}
-{44,125,160,184}
-{19,75,99,103,107,164}
-{24,113,145}
-{27,157}
-{12,107,133,134}
-{72,94,102,158,194}
-{104,157}
-{122,171}
-{28,47,89,104,112}
-{25,35,82,105,155}
-{106,107,139,181}
-{50,110,132,136}
-{90,110,166}
-{1,1,55,60,85,108}
-{8,22,31,106,172,196}
-{24,69,109,121,154}
-{0,26,44,59,132,175}
-{103,125,172,188,190}
-{11,23,78,109,131}
-{81,146,169,181,196}
-{2,84,113,189}
-{8,46,126,131}
-{13,73,73,125,127}
-{67,117,139,184}
-{29,65,77,120,182}
-{0,87,100,102,135}
-{111,146,156}
-{13,87,123,137,182,197}
-{60,61,164}
-{7,20,186}
-{0,24,53,135,147}
-{94,136}
-{47,168}
-{70,80}
-{43,148}
-{3,81,104,191}
-{104,171,189}
-{9,14,117,160,180}
-{67,158}
-{50,57,66,78,170,197}
-{31,60,73,101,193,197}
-{37,89,92,96,127}
-{29,179}
-{17,47,137,155,157,187}
-{33,77,154}
-{48,63,85,150,184}
-{32,53,61,95,172}
-{20,35,47,171,179,196}
-{2,17,40,169,184}
-{116,127,131,142}
-{16,26,27,87,164,198}
-{58,129}
-{67,98,108,132,157,197}
-{145,157}
-{13,49,56}
-{59,103,180,196}
-{35,65,104,106,120,126}
-{18,96,115,133}
-{27,61}
-{61,194,197}
-{11,27,36,94}
-{15,36,101,128,197}
-{51,62,115,149}
-{83,198}
-{30,120,127,145,184}
-{50,149}
-{13,35,87,117,135,158}
-{57,60,74,113,128,178}
-{11,90,123,163,170}
-{39,121,148,171,198,199}
-{30,77,78,137,140,162}
-{52,69,120,141}
-{9,100,137}
-{56,161}
-{44,57,75,110,154}
-{98,123,155,167}
-{10,60,85,105,164,168}
-{13,92,179,186}
-{13,171,173,176,178}
-{33,53,88,123,144,172}
-{21,57,70,131,151}
-{13,51,63,169,169}
-{36,104,119,166}
-{54,59,84,166,172}
-{7,87,100,102,142,187}
-{2,5,6,43,174}
-{4,26,29,59,77}
-{10,82,98,103,104}
-{104,147}
-{47,55,99}
-{102,154,165}
-{0,96,107,139,157,159}
-{66,167,174}
-{92,97,117}
-{21,75,180,185}
-{54,64,139,180}
-{23,141,189}
-{32,38,147}
-{82,87}
-{6,34,34,161,183}
-{25,64,69,97,122}
-{80,152,170,189}
-{44,78,143,162}
-{52,53,64,69,112,158}
-{77,80,123,150,175}
-{110,121,125,125,128,198}
-{0,8,57,104,127,188}
-{17,46,48,93,129,150}
-{135,193}
-{89,111,135,166,184}
-{132,181}
-{47,54,101,108,125}
-{18,55,103,142}
-{11,125}
-{18,49,58,68,122,153}
-{37,47,137,179,185}
-{57,78,167,187,192}
-{28,32,38,67,77,184}
-{67,83}
-{43,104,191}
-{22,40,118,194}
-{24,53,66,195}
-{27,87,89,101,130,191}
-{71,86,157,167,183}
-{31,87,102}
-{48,53,70,101,149,174}
-{21,33,59,129,195}
-{144,160}
-{4,8,174,194}
-{69,103,127,127,160}
-{6,29,62,77,132}
-{61,69,108,144,174}
-{51,55,109,128,153}
-{10,30}
-{2,5,6,70,146,183}
-{0,1,75,97,166,180}
-{53,78,104}
-{31,45,68,108,161}
-{3,40,78,103,109,130}
-{33,44,159}
-{28,82,93,136,148,157}
-{31,32,76,143,157}
-{2,55,106}
-{21,66,80,129,129,152}
-{1,34,59,128,154,195}
-{10,154,172,177}
-{2,7,31,47,82,125}
-{60,131,149,156}
-{20,141}
-{23,38,43,100}
-{51,70}
-{3,41,164}
-{126,160,165,169}
-{61,71,143}
-{65,70,81,100,146}
-{40,48,57,75,85,85}
-{116,153}
-{31,42,49,103,183}
-{28,44,62,85,133,177}
-{50,68,164,170}
-{4,26,60,87,119,141}
-{5,102,160}
-{20,129,177}
-{98,120,135,157,164,168}
-{66,150}
-{101,101}
-{164,187}
-{43,65,96,166,189}
-{18,36,58,109,118}
-{25,32,135,161,170}
-{55,104,183}
-{69,139,144,181,182}
-{84,131,155}
-{6,18,63,156,159}
-{7,66,67,88}
-{8,46,52,95,178}
-{58,58,83,119,119,163}
-{27,143}
-{78,80,122,149,164,176}
-{6,83,107,183,198}
-{86,199}
-{22,74}
-{28,62,64,114}
-{15,56}
-{41,97,139,152,161,161}
-{48,192}
-{16,62,99,138,155}
-{32,84,145}
-{108,137}
-{93,112,120,155}
-{73,117}
-{20,26,197}
-{4,141}
-{110,132}
-{95,133,142,152,183,193}
-{85,141}
-{53,76,86,131}
-{5,59,73,74,101,130}
-{0,1,64,151,188}
-{15,131,131,174}
-{80,98,106,187}
-{41,102,167,173}
-{9,42,133}
-{103,110,110,134,175,185}
-{168,187}
-{42,47,108,121,165,198}
-{81,171}
-{38,122,123,149}
-{16,79}
-{45,64,131,176,182,197}
-{35,82,87,100,123,196}
-{41,52}
-{33,68}
-{60,140}
-{12,41,152}
-{54,71}
-{88,95,95,146,148,180}
-{47,66,89,121,168,182}
-{15,70,94,122,137,154}
-{42,48,129,162}
-{70,151}
-{11,55,89,118}
-{36,74,121,130,152}
-{46,48,52,120,179}
-{70,81}
-{96,146,183}
-{76,78,108,153}
-{71,168}
-{66,106,108,167}
-{22,44,49,85,87,195}
-{17,52,143,175}
-{86,103}
-{16,46,176}
-{95,111,162,173,198}
-{44,191}
-{7,48,107,115,116}
-{12,120,141,179,184}
-{83,188}
-{83,85,86,139,154}
-{50,74,89,154,179}
-{79,87,120,128,183}
-{13,121}
-{16,52,62,86,168,199}
-{7,16,29,35,157,181}
-{23,48,65,119,180}
-{10,173}
-{7,98,128,143,145,162}
-{23,27,88,91,127}
-{35,53,56,56,118}
-{7,161}
-{0,42,67,174}
-{44,161}
-{75,80,110,170}
-{17,93,117,140,168,196}
-{18,100,150,184}
-{108,132}
-{54,90,97,103,149}
-{9,12,30,43,82,95}
-{131,163}
-{67,99,168}
-{91,150,172}
-{47,164,195}
-{72,90,98}
-{24,78,130,172}
-{1,27,32,64,66,156}
-{7,26,72,88,130,140}
-{56,126,130}
-{1,76,81,122,169,188}
-{60,154}
-{101,103,135,150}
-{22,25,33}
-{99,117}
-{24,95,122,186}
-{48,95,102,108,125,170}
-{13,113,154}
-{155,177}
-{37,73,106}
-{7,64,124,195}
-{101,124,133,157,166,188}
-{27,34,60,100}
-{26,104,163}
-{34,43,108,133,165}
-{64,79,89,122,132}
-{10,96,168}
-{2,22,89,118,122,198}
-{122,192}
-{42,101,104,135,168,181}
-{7,38,63,86,101,152}
-{29,84,89,114,123,184}
-{33,46,59,137,153,175}
-{3,54,66,92}
-{31,34,148,159,185}
-{3,52,97,99}
-{3,26}
-{42,57,62,148,199}
-{15,26,198}
-{14,34,109,111,128,193}
-{107,197}
-{16,107}
-{9,21,136,169}
-{67,97,99,153,165,173}
-{46,76,89,100,164}
-{96,102,150,167,180}
-{31,103,137,146,180}
-{21,40,157,163,170,183}
-{139,170}
-{1,75,82,148,169,198}
-{13,39,107}
-{13,50,97,101,106}
-{52,176}
-{18,169}
-{129,140,146,183,189}
-{95,122,145}
-{5,6,102,130,151}
-{5,118,140,153}
-{27,78,140,164,182}
-{36,140,148}
-{58,100,127}
-{9,16}
-{26,33,119}
-{1,17,18,165}
-{14,182}
-{11,13,48,89,140,165}
-{9,19,78,113}
-{121,171}
-{18,23,46,113,159,162}
-{17,104}
-{50,104,132,167,179}
-{55,89,102,132,176}
-{19,109}
-{60,70,73,153,163}
-{18,127,145}
-{80,106,146,170}
-{10,39,72,74,84,150}
-{3,71}
-{1,10,64}
-{82,95,127,132,141,152}
-{43,55,57,89,120,197}
-{155,182}
-{23,34,57,111,153}
-{99,188}
-{86,114,124}
-{113,191}
-{31,129,184}
-{125,159,159}
-{22,27,81,156}
-{3,54,80,122,128,168}
-{76,112}
-{152,174}
-{22,27,70,172}
-{26,86}
-{49,59,102,186}
-{53,55,75,125}
-{152,199}
-{11,15,46,102,105,168}
-{132,148,154}
-{24,114,121,126,138,165}
-{82,107}
-{36,93,122,184,194}
-{1,59,76,146}
-{73,165}
-{38,98,176}
-{53,72,121,153}
-{127,147}
-{31,77,128,177}
-{107,186,189}
-{119,126,127,160}
-{24,74,148,197}
-{85,126,134,146}
-{76,77,81,134}
-{67,112,159,174,183}
-{22,169,170}
-{79,112,177,199}
-{1,56}
-{21,42,50,172}
-{6,63,105,166,189}
-{31,95,106,152,171,177}
-{21,49,99,101,122,187}
-{63,104,113,161,186}
-{37,126,144,166,173}
-{32,53,147}
-{123,123,130}
-{78,85,177}
-{2,69,95,146,187}
-{6,11,14,43,121}
-{76,105,184}
-{63,96,114,122,195}
-{11,22,34,45,120,156}
-{22,83,119,131,138,167}
-{9,56,96,106,114}
-{92,132,162}
-{25,45,83,119,139,150}
-{19,21,56,59,141}
-{14,26,62,119,180,190}
-{6,34,49,99,139,170}
-{10,56,150,166,166}
-{14,57,119,153,167,198}
-{26,41,150,158,169}
-{152,167}
-{1,61,93,180}
-{46,110,138,199}
-{4,56,81,110,173}
-{28,32,148,185}
-{8,9,28,29,39,195}
-{14,39,68,144}
-{26,37,79,81,110}
-{115,158,161}
-{6,39,145,191}
-{67,118,125,142,184,198}
-{127,163}
-{52,118}
-{22,78,131,156}
-{46,68,86,142,145,197}
-{85,188}
-{37,54,64,147,158}
-{31,134,141,183,185}
-{10,33,135,198}
-{41,124,173,180}
-{0,14,92,129,154,198}
-{39,73,128,154,182,196}
-{40,83,94,168}
-{106,142}
-{76,99}
-{19,62,77,108,165,186}
-{68,90,97,119,176}
-{44,108,193}
-{2,124}
-{137,174,175,176,180}
-{28,62,81,132,165,186}
-{98,112,148,181}
-{86,125}
-{70,161}
-{5,13,188}
-{136,168}
-{82,87}
-{30,42,57}
-{132,136,152}
-{20,59,87,98,195}
-{6,53,112,113,183,195}
-{64,147,157}
-{61,140,192}
-{44,59,88,123,161}
-{90,175}
-{38,46,105,121,159}
-{35,62,66,90,155}
-{2,2,21,38}
-{123,144}
-{117,155}
-{60,86}
-{4,39,129,146,179}
-{66,71,87,135,148,157}
-{29,67,108,196}
-{30,64,76,124,172}
-{36,39,79,130,140,149}
-{30,44,136,196}
-{5,15,20,117,198}
-{20,87,87,121}
-{42,136,142,148}
-{0,56}
-{16,38,56,57}
-{52,138}
-{103,115}
-{10,29,43,93,120,134}
-{44,140,150,180}
-{74,98,132,160}
-{2,62,98,160}
-{14,32,43,63,92}
-{23,87,128,152,177,197}
-{30,86,111,178,180}
-{49,61,114,195,196}
-{133,158,195}
-{18,105,165,190}
-{77,83,175}
-{29,33,51,166,188}
-{37,51,96,103,127}
-{119,125,128,140}
-{8,80,93,189}
-{76,96,110,131,170}
-{81,90}
-{13,25,28,41,128,142}
-{56,62,73,110}
-{60,62,128,136,166,193}
-{34,34,61,74}
-{32,84,87,92,112,181}
-{10,66,93,153}
-{23,77,182}
-{2,7,156}
-{5,13,49,61,103,179}
-{67,136,136,163,181,196}
-{26,60,74,100,160}
-{39,59,69,93,111}
-{9,77,90}
-{1,20,52,75,156,169}
-{25,95,103,157,163,193}
-{95,136}
-{47,108,137,157,164}
-{37,99,151,153,169,189}
-{112,126,139,171,184,195}
-{39,188}
-{4,20,71,80,136,156}
-{24,33,77,82}
-{103,188}
-{74,116}
-{82,90,110,154,194,195}
-{25,149,180}
-{120,123,130,171}
-{20,38,104,126,175,176}
-{14,62,97,130,135,193}
-{35,118}
-{20,42,64,73,76,120}
-{11,40,60,74,144,148}
-{13,26,46,63,76}
-{24,29,98,106}
-{6,139,171,186}
-{5,109,197}
-{20,45,84,125}
-{1,137,150,195}
-{1,8,80,111}
-{57,90,102,167}
-{53,186}
-{8,31,115,145,156,165}
-{10,18,31,116,164}
-{43,47}
-{33,143,154}
-{106,153,174,190}
-{73,106,158}
-{18,137,158,173}
-{73,80,107,123,141,199}
-{17,43,123,130,130,155}
-{15,31,37,91,164,181}
-{38,86}
-{49,105,142,145,173,190}
-{18,107,108,135,138}
-{43,65,107,112,193}
-{8,68,68,74}
-{54,106,108,109,164}
-{53,153}
-{59,134,154,173,180}
-{34,93}
-{11,33,124}
-{8,104}
-{27,37,46,65,125,174}
-{0,122,189}
-{15,74,107,147,188}
-{35,63,78}
-{28,49,123,129,177,193}
-{11,89,104}
-{117,171,197}
-{11,15,62,136,145,145}
-{2,127,193}
-{17,28,42,113,145}
-{31,44,118,148}
-{52,103,128,161,182}
-{45,47,70,102,161,184}
-{15,52,82,86}
-{60,87,102,108,127,170}
-{24,57,102,145,181}
-{12,53}
-{5,52,92,129,164}
-{87,128}
-{80,143,170}
-{59,85,134,139}
-{61,67,110,117,156,157}
-{6,8,60,112,154,170}
-{92,122,133}
-{121,148,161}
-{9,22,61,187}
-{12,40,78,107,176}
-{30,45,58,189,198}
-{83,107,123,148}
-{3,66,98,124,126,150}
-{13,34}
-{16,41,132}
-{16,85}
-{3,25}
-{30,58,138,167}
-{24,36,87,151,159,186}
-{2,4,121,196}
-{79,95,99,107}
-{11,49,146,169}
-{51,90}
-{76,155}
-{26,26,116,120,146,182}
-{44,66,72,117,132,174}
-{7,161,179,197}
-{2,81,158}
-{4,22,59,107,146,170}
-{0,0,133,192}
-{57,82}
-{17,61}
-{28,29,42,77,89,124}
-{53,78,127,188}
-{31,57,103,104,162}
-{9,84,100}
-{3,52,114,133,161,188}
-{8,37,97,158,189}
-{0,13,88}
-{29,79,92,158,160,171}
-{59,63,77,139,165}
-{25,77,116,169}
-{50,88,151,166}
-{52,162,167}
-{32,149,191,194,194}
-{47,57,74,95,97}
-{30,65,96,153,184}
-{80,130,150,172}
-{79,91,141,153,157}
-{93,110,114,194}
-{62,66,156,175}
-{55,56,97,117}
-{74,152,171,186}
-{13,24,50,50,131}
-{0,16,95,141,146,161}
-{1,51,158}
-{37,71,96,122}
-{71,104,145}
-{47,52,124,131,169}
-{111,188}
-{59,61,95,152,156,157}
-{5,31,106,164,176}
-{44,82,113,134,188}
-{13,55,65,99,150}
-{25,73,130,192}
-{88,120,193}
-{79,123,153,175}
-{24,158,162}
-{52,53,81}
-{5,32,78,102}
-{73,97,111,151}
-{71,72,102,151}
-{5,61,73,85,129,151}
-{66,177}
-{26,77,139,152}
-{46,117}
-{55,72,122,148,157,174}
-{3,53,76,184,196}
-{34,36,41,61,194}
-{8,153,163,182}
-{51,59}
-{113,115,149}
-{54,57,78}
-{39,137}
-{75,81,93}
-{5,30,44,80,86,126}
-{68,107,128,160,179}
-{98,108,162}
-{55,126}
-{24,54,121,122}
-{75,90}
-{10,83,139}
-{16,120,148}
-{97,175}
-{53,70,71,120,135,189}
-{9,110,123,150}
-{24,42,44,96,138,170}
-{17,61}
-{23,65,110,135,155,157}
-{19,59,139}
-{50,65,127,179}
-{15,138,152,162}
-{15,34}
-{25,29,63,135,161}
-{47,113,123,129,163}
-{25,138,157,184}
-{50,92,199}
-{110,116}
-{15,36,134,145,165,182}
-{4,75,82,175}
-{24,49,63,89,128}
-{174,182}
-{103,116,119}
-{101,125,180,192}
-{47,66,113,127,148}
-{15,60,118}
-{20,51,90,91,117}
-{25,72,146,199}
-{34,93,199}
-{31,71,106,115,186}
-{1,10,119,144,188,197}
-{49,80,185}
-{134,178,188}
-{42,67,170,172}
-{13,43,91,91}
-{13,31,48,98,155,158}
-{37,44,70,76,141,160}
-{50,60,72}
-{51,65,166,188}
-{11,103,129,144}
-{136,167,181}
-{165,178}
-{34,107}
-{54,120}
-{33,132,136,165,178}
-{60,79,119,127,187,197}
-{27,31,130,132}
-{125,129}
-{97,111}
-{71,171,187,191}
-{68,91,94}
-{94,119,159,178}
-{2,29,51,173}
-{37,61,97,113,147}
-{11,35,79,91}
-{67,71}
-{4,20,103,107,169,179}
-{35,77}
-{71,94}
-{29,31,67,101,172,174}
-{52,122}
-{87,125}
-{129,142,164}
-{13,30,85,139}
-{17,57,65,170,179}
-{46,65,151,167,192,197}
-{31,78,132,136,158}
-{38,161}
-{15,101,111,134}
-{42,118,139,142,178}
-{57,95,132,134}
-{5,42,116,152,173,192}
-{144,199}
-{38,70,77,143,175,188}
-{38,84,93,149}
-{56,98,153,165,170,191}
-{1,52,112,112,131,145}
-{16,132,150,184}
-{14,60,111,153}
-{49,109,112,165}
-{69,136,152}
-{59,90,94,158,168}
-{42,47}
-{18,194}
-{33,70,94,167,175,177}
-{40,57,125,138,159}
-{3,10,31}
-{2,5,8,26,141,181}
-{27,29,142,175,186,195}
-{31,49,99,120}
-{109,123}
-{21,76,112,119,124}
-{41,49,146,173}
-{101,173}
-{49,73,85,89,179}
-{22,36,154,192}
-{136,163}
-{111,165}
-{94,128}
-{81,167}
-{35,165}
-{41,109,119}
-{13,74,80,114}
-{72,106,189}
-{65,172}
-{30,31,35,52,63}
-{80,116}
-{0,149}
-{139,189}
-{0,65,107,153,179}
-{15,40,46,51,75,160}
-{12,28,48,79,105}
-{76,98,146,157,180}
-{45,62,79,83,113,155}
-{130,162,184}
-{78,140,145,181,196,198}
-{108,168}
-{3,13,14,15,77}
-{22,29,68,117,142,143}
-{67,110,122,167,183}
-{22,25,58,93,143,151}
-{53,82,170}
-{1,18,50,98,108,174}
-{58,140}
-{49,179,196}
-{109,171}
-{38,82,132,183}
-{32,151,175}
-{53,90,106,169,187}
-{99,136,141,146,171}
-{27,108,111,155,192}
-{28,77,86}
-{11,109,118,149,154,183}
-{7,74,122,137,185}
-{70,110,151,154,175}
-{7,48,88,181,181,182}
-{97,101,105,123,139,156}
-{19,139}
-{17,107,134}
-{63,64,178}
-{100,133,143}
-{64,173}
-{1,88,109,120,145,160}
-{113,198}
-{84,112,121,184}
-{90,185,193}
-{91,135,155,185}
-{56,191}
-{14,15,48,61,92,171}
-{18,139,152,199}
-{16,80,107,125,144,166}
-{8,92,112,173,176}
-{27,196}
-{9,169,183,190}
-{20,29,40,98,106,182}
-{77,115,149,181}
-{31,65}
-{7,29,62,90,157,178}
-{10,33,79,186}
-{42,74,113,178,192}
-{17,86,88,118}
-{27,58,104,122,166}
-{16,97,102,105,192}
-{16,59,115,127}
-{27,56,60}
-{104,175}
-{52,84}
-{127,137}
-{7,13,18,81,139,140}
-{11,31,81,150,189}
-{44,55,107}
-{45,58,127,137}
-{70,76,80,93,145}
-{27,60}
-{40,76,172}
-{7,123,192}
-{55,170}
-{61,137,137,184,187}
-{49,50,190}
-{99,126,152,164}
-{56,79,88,98,132}
-{45,74,119,123,158,175}
-{66,96}
-{100,114}
-{62,84,111,122}
-{8,22,141,172,181}
-{70,141}
-{3,48,106,193}
-{33,114,168,174,183}
-{46,186,194}
-{58,71,82,122,190}
-{60,67}
-{14,30,132,144,174}
-{9,113,124}
-{11,14,29,63,110,182}
-{4,64,102,168,178}
-{90,108,110,160,165,199}
-{44,86,191}
-{6,19,84,125,125,156}
-{53,105,122,154,175,190}
-{83,177,183}
-{96,103,181}
-{38,156}
-{2,6,60,116,131}
-{12,144}
-{13,73,93,132}
-{142,167}
-{37,61,71,75,121,144}
-{32,43,146}
-{41,59,144,176}
-{11,14,44,54,92,177}
-{37,198}
-{39,80,81,104,138,193}
-{13,73,92,127,149,194}
-{34,57,69,104,118,186}
-{7,48,84,96,108}
-{32,41,64,111}
-{108,131,150,174,195}
-{50,53,184,191}
-{8,32}
-{26,76,88}
-{4,50,100,134,134}
-{36,40,148,158,177}
-{7,16,57,59}
-{35,96,113,129,167}
-{46,63,128,163}
-{8,46,94,97,105,178}
-{12,70}
-{45,93,134,135,188,195}
-{11,52,76,103,131,192}
-{19,45,57,119,123,136}
-{19,62}
-{1,49,64,197}
-{0,42,60,102,134,147}
-{102,152,156,160}
-{51,54,129}
-{50,68,71,72,170}
-{0,11,184}
-{19,105}
-{144,185,191}
-{17,51,76,98,118,135}
-{52,64,143,171}
-{1,46,62,74,81}
-{8,36,129}
-{5,25,96,113,146,152}
-{19,28,59,110,131,142}
-{7,18,176,179}
-{17,21,48,63,121}
-{34,79,81,85,152,155}
-{8,82,104,122,139,193}
-{34,50,128,140,175}
-{51,173}
-{48,128,138}
-{126,129,178}
-{42,51,61,141,170,180}
-{59,91,144}
-{64,74,118,170,191}
-{12,55,116,157,159}
-{97,157}
-{32,34,102,105,178}
-{36,103,125}
-{15,36,184}
-{6,13}
-{0,100,144,185,198}
-{32,47,64,66,118,143}
-{23,112,117}
-{34,44,47,81,124,135}
-{21,49,115}
-{29,158}
-{34,114,127,151}
-{111,199}
-{23,53,76,113,122,123}
-{89,113,117,137}
-{52,76,126,155,164}
-{4,48,78,114,147,179}
-{27,56,151,191}
-{3,183}
-{30,41,72,145}
-{15,41,152,177,196}
-{44,58,124,164,177}
-{9,51,70,174}
-{13,18,81,136,178}
-{85,139,142}
-{12,62,118,156}
-{50,142,149,175}
-{35,38,99,100,128}
-{53,54,92,123,153,160}
-{121,133}
-{12,63,117,148,149,187}
-{88,153,170,192,195}
-{22,51,67,104,141}
-{186,198}
-{39,40,82,159,189}
-{59,74,149}
-{88,99,136,145,191}
-{5,48,90,120,138,193}
-{22,76,155,180}
-{118,122,141,176}
-{87,104,116,159,172,191}
-{63,104,155}
-{8,153,168}
-{119,141,178,179}
-{100,110}
-{14,65,164}
-{2,92,97,117,188}
-{47,59,64,141,148,187}
-{109,137,139,151,169}
-{68,78,156}
-{37,39,103,183,190,194}
-{50,58,74,180}
-{12,121,155,175}
-{26,43,97}
-{102,159,161}
-{3,138,163,179}
-{55,69,78,164}
-{67,87,136}
-{67,150}
-{74,113,199}
-{103,126,187}
-{39,141,155}
-{6,19,25,75,157}
-{10,49,71,105,114,154}
-{3,24,35,54,88}
-{16,25,73,114,181,191}
-{2,2,63,154}
-{68,74,107,187,199}
-{13,235}
-{40,122,203,232,233,235}
-{115,152,193,202,242}
-{3,50,86,111,248}
-{25,66,181,188,279}
-{80,116}
-{38,83,106,119,134}
-{29,63,203}
-{7,27,186,200,201}
-{88,92,94,272,295}
-{35,68,136,158}
-{148,225,293}
-{1,87,195}
-{48,100,203}
-{0,35,61,91,280}
-{130,160,168,216}
-{4,104,148,164}
-{35,40,91,145,155,214}
-{46,107}
-{21,276}
-{42,143,150,238,291}
-{64,70,140,165,228,257}
-{0,148,197}
-{72,131,195,202,251,270}
-{99,195,224,264,292}
-{5,184,186,243}
-{93,132,137,148,228,251}
-{66,125,198,211,285}
-{29,79,180}
-{41,60,65,66,254}
-{4,69,79,207}
-{113,182,203,252,259,298}
-{10,20}
-{99,200,276}
-{109,262}
-{4,87,193,207,220,273}
-{30,183,215}
-{7,138,202,215,217}
-{25,79,194,203,260}
-{128,178}
-{62,152,211,279}
-{57,99,204,280}
-{41,59}
-{18,52,200}
-{81,132,190,275}
-{89,158}
-{32,72,122,228,245,249}
-{24,72,196,233,299}
-{0,5,46,122,213}
-{197,242}
-{43,105,241,272}
-{74,118,158,173,208,288}
-{145,149,197,238,252,297}
-{32,39,189}
-{98,240}
-{65,140,149,197,203,204}
-{103,225,266}
-{84,277,283}
-{35,246}
-{10,101,239}
-{40,75,192,253}
-{106,152,247,272,287}
-{50,293}
-{85,134}
-{59,204}
-{54,64,88,269,286}
-{4,92,111,121,154,182}
-{80,163,202,234,277,298}
-{129,147,158,196,283,290}
-{49,144,232,293}
-{20,29,226,244,274}
-{64,101,185,189,234,268}
-{23,157}
-{56,93,133}
-{9,57,241,289}
-{50,124,181,194,238}
-{11,38,67,69,213}
-{149,220}
-{168,189,267}
-{34,133,235,264,284}
-{81,239,241,260}
-{35,78,80,201,262,297}
-{0,196,285}
-{71,108,239,258,277,278}
-{4,94}
-{77,132,140,251}
-{11,78,132}
-{43,145,188}
-{97,144,148,161,254}
-{109,132}
-{48,83,189,242}
-{115,176,276}
-{162,210}
-{88,109,136,153,154,159}
-{265,280}
-{74,86,195}
-{17,112,188,213,231,266}
-{36,136,160,218,239}
-{179,273}
-{79,118,136,154,200,259}
-{161,212}
-{24,98,178}
-{161,187}
-{45,169,227,236}
-{218,253}
-{10,18,74,258}
-{70,199,210,213,285,291}
-{12,50,69,92,184,186}
-{130,131,163,295}
-{198,239,297}
-{49,86,125,176,234,282}
-{7,129,146,223,269}
-{144,173}
-{30,52,133,228}
-{21,88,176}
-{5,70,299}
-{37,69,285}
-{14,17,45,72,99,197}
-{125,196}
-{30,220}
-{55,103,127,251}
-{108,114,156,200,207,217}
-{7,195,250}
-{64,111,193,202,236}
-{92,115,232,233,240}
-{22,232,260}
-{18,44,191,253,294}
-{40,158}
-{86,92,103,154,207,294}
-{33,177,191,223,235}
-{65,116,158,253}
-{49,125,152,194}
-{100,149,191,266,288}
-{13,64,103,254,283}
-{42,75,80,103,155}
-{77,128,198,280}
-{118,218,287}
-{0,36,52,101,148}
-{1,64,181,201,221}
-{6,44,47,71,150,225}
-{13,85,88,167}
-{31,40,69,91,99,281}
-{60,115,157,224,252,273}
-{30,87,200,270,285}
-{171,293}
-{24,33}
-{59,69,74,118,190,216}
-{147,258,288}
-{62,73,219,232,266}
-{50,74,225,238,271}
-{6,88,115,185,205,262}
-{97,230}
-{76,76,150,211,228,262}
-{134,195}
-{104,235}
-{38,41,204}
-{64,71,124}
-{44,63,111,231}
-{186,188}
-{5,132,225}
-{113,286}
-{43,161,276}
-{8,294}
-{18,90,105,169}
-{213,213}
-{29,45,161,289}
-{79,152}
-{10,110,162,177,217,238}
-{63,98,192,244}
-{118,147,187,281}
-{5,15,36,94,263}
-{40,81,220}
-{29,74,76,157,162,206}
-{11,28,53,68,126,222}
-{73,73,181,239}
-{36,60,164}
-{16,47,82,152,167,289}
-{149,149,219,268,294}
-{97,169}
-{32,160,210,257}
-{32,69}
-{7,63,73,195}
-{54,110}
-{61,75,135,270}
-{22,43,127,174,184,208}
-{106,113,174}
-{0,70,90,239}
-{191,260}
-{43,80,168}
-{25,54,257,263}
-{118,213}
-{110,207,220,251,287}
-{126,139,161,248,252}
-{51,79,116,132,190,291}
-{183,199,200,254}
-{86,233}
-{105,109,176,211}
-{12,109}
-{3,65,158}
-{21,86}
-{12,15,191}
-{181,223,224,256,259,276}
-{112,191,219,232,239}
-{51,215}
-{36,46,278}
-{68,75,169,228,244,270}
-{10,16,52,172,189,274}
-{177,191,197,209,222,282}
-{41,119,190,202}
-{128,277,292,298}
-{34,38}
-{22,36,81,117}
-{81,161,248,279}
-{75,85,103,149,190,211}
-{127,279}
-{50,74,152}
-{122,168,209,240,276,282}
-{66,102,208,239,291}
-{9,113}
-{72,199,237}
-{110,112,135,141,270}
-{26,109,130,159,291}
-{108,206}
-{2,289}
-{63,238}
-{4,57,104,119,142,214}
-{46,97,239}
-{210,297}
-{207,268}
-{13,64,80}
-{62,109,171,195,232}
-{11,260,262,276,292}
-{21,75,78,80,140,226}
-{38,56}
-{122,251,297}
-{108,180,213}
-{57,58,135,231,233}
-{75,136,185,211}
-{52,109,122,174,178,255}
-{65,91,234,249}
-{5,24,53,218}
-{90,211,246}
-{106,242,260}
-{61,136}
-{49,87,177,280}
-{38,89,104,189,297}
-{43,76,293,298}
-{182,255,289}
-{25,57,64,272}
-{23,122,149}
-{49,50,129,153}
-{183,188,204}
-{27,164,226,230}
-{0,13,67,145,160,259}
-{22,32,43,85,105,124}
-{20,199}
-{31,119}
-{14,16,152,158,196}
-{5,59,91,202,217,280}
-{100,128,187}
-{20,193,214,258,272}
-{17,27,55,151,177,219}
-{53,55,63,208,213,230}
-{15,160,258,260}
-{71,147,235,258}
-{26,49,173,234,271}
-{50,52,58,167,257}
-{15,154,213,232}
-{6,35,86,94,286}
-{0,4,83,262,281}
-{93,148,284}
-{28,165,262,290}
-{18,99,160,266}
-{63,223,291,295}
-{103,154,180}
-{12,110,144,221}
-{9,158,203}
-{20,207,275}
-{9,20,48,88,120,289}
-{67,110,133,151,225,297}
-{71,102}
-{168,208}
-{48,137,163,164,280,287}
-{90,209}
-{28,244}
-{107,224,293}
-{86,206}
-{8,113,147,165,285,286}
-{7,159,160,237}
-{0,66,87,146,225,294}
-{58,100,112,124,189}
-{13,108}
-{121,168,216,253}
-{147,242,282}
-{236,240}
-{21,28,83,103,166}
-{30,88,108,280,295}
-{23,136,298}
-{125,290}
-{140,249,276,277}
-{49,81,135,147,164,267}
-{28,63,198,297}
-{30,101,216,232,267,287}
-{54,195,204,223,236,251}
-{27,176,179,204,264,291}
-{136,164,172,273}
-{43,67,81,121,277}
-{128,131,256,269}
-{176,219,289}
-{127,175,259}
-{35,94,153,177,222,253}
-{29,154,178,240,260}
-{165,176,201,243,259}
-{17,298}
-{29,203,232,241,289}
-{107,136,153,238}
-{49,198}
-{68,179,202,253}
-{157,178}
-{23,199,287}
-{131,228}
-{19,19,39,111,138,277}
-{49,86,178,194,223,226}
-{114,201}
-{149,282}
-{109,147,150,176,209,229}
-{122,131,167,228,258}
-{5,40,120,154,266}
-{135,207,238,263}
-{75,128}
-{80,117,296}
-{60,82,122,131,138}
-{57,146,159,233,244,278}
-{15,80,157,182,244,272}
-{114,116,160,176,287}
-{10,133,279}
-{27,115,126,293}
-{89,161}
-{95,120,218}
-{26,269}
-{109,281}
-{53,62,103,107,118,239}
-{185,186,227,252}
-{3,125,146,161,288}
-{171,245,256,283}
-{23,153,201,238}
-{0,82,93,218,242}
-{101,124,137,150,194}
-{21,96,104,201,244,266}
-{88,121,147,155,173,225}
-{24,106,112,193}
-{26,67,115,212,283}
-{23,120,280}
-{45,99}
-{30,66,136,199}
-{17,213}
-{14,37,55,103,265}
-{52,258,284}
-{119,213,272,274,285}
-{43,45,105,254,288}
-{64,81,123,126,164,292}
-{88,229,260}
-{25,117}
-{7,149,197,227,258}
-{74,83,240,246,284,292}
-{2,4,63,103,115,289}
-{92,239}
-{12,26,130,228,265}
-{53,99,131,142,164,291}
-{63,248,259,283}
-{186,215,282}
-{67,110,160}
-{166,191}
-{33,156,224}
-{152,166,190,250,297}
-{123,126,153,199,204}
-{49,70,199,238,238,289}
-{14,18,65,74,146,235}
-{63,77,172,180,186,225}
-{1,48,105,170}
-{37,56,113,133,196}
-{193,261,266}
-{190,273}
-{38,129,261}
-{251,252,253,254,275,296}
-{249,275}
-{167,205,266}
-{27,152,256}
-{19,72,248}
-{40,73,141,249}
-{105,197}
-{156,243,277,282}
-{165,168,227,298}
-{8,31,202,271}
-{10,101,109,167,236,277}
-{33,91,165,192,206,211}
-{102,122,232}
-{190,239,283}
-{160,185}
-{2,13,65,70}
-{11,68,170,192,229,284}
-{66,90,228,237}
-{1,6,92,99,222,242}
-{42,128,133,207,289}
-{12,100,164,191}
-{26,31,120,176,204,220}
-{13,39,95,105,120,182}
-{114,120,295}
-{31,34,55,181,197,235}
-{24,52,64,80,142}
-{3,49,148,255,268}
-{132,175,254}
-{32,71,141}
-{112,116,186,270,271}
-{64,106,209,228,297}
-{128,268}
-{107,208,299}
-{151,173,187,192,213}
-{3,296}
-{20,31,135,153,289}
-{138,193,212,269,277,288}
-{73,92,130,295}
-{73,80,105}
-{50,96,138,199,265}
-{4,7,8,183,260,267}
-{66,71,118,145}
-{15,63,116,160,175,181}
-{88,217}
-{56,69,106,106,127,274}
-{84,205}
-{83,101,241,269}
-{21,254}
-{22,32,83,150,293}
-{198,221}
-{30,46,95,179,197}
-{46,85,208}
-{56,112,236}
-{71,217}
-{31,57,145,253}
-{34,133,170}
-{48,53,119,187,268,287}
-{111,203,229,239}
-{62,136}
-{49,54,187,254,298}
-{20,26,148,159,190,286}
-{3,13,193,252,284}
-{40,137,154,167,248,259}
-{3,47,242,278}
-{77,100,143,232}
-{51,130}
-{66,90,148,220,242,273}
-{143,151,211}
-{10,23}
-{21,30,179}
-{17,47,105,156,193,213}
-{0,23,25,125,144,146}
-{179,209}
-{79,113,117,192}
-{5,53,216,275,285}
-{187,197}
-{22,68,218,221}
-{0,71,78,110,120,173}
-{46,97,117,149,253,286}
-{10,20,129,162,171,195}
-{60,97,130,163,190}
-{57,145,179,283}
-{99,274}
-{151,161,228,251}
-{3,177,192,286}
-{21,81,142}
-{180,283}
-{13,102,131,149,246}
-{19,99,132,162,167,257}
-{15,86,188,260}
-{203,251,281}
-{5,45,138,155,157}
-{1,2,4,213,278}
-{21,123,208,219,263,267}
-{36,106,181,231,238}
-{103,120,168,184,224,287}
-{53,104,139,251}
-{1,91,141,202,268}
-{75,115,216,253}
-{56,167,268,296}
-{66,158,235,249}
-{82,124,198}
-{56,67,112,140,170,176}
-{16,75,266}
-{38,165,200,219,291,297}
-{86,151,229,241,275}
-{0,57,141,176,229,258}
-{18,72,164,195,235}
-{94,282}
-{83,139,242,269,294}
-{9,44,145,251,272}
-{132,203,249,282}
-{7,41,170,254}
-{6,153,193,291}
-{18,134,137,227,261}
-{14,36,115,124,172,229}
-{54,206}
-{49,91,131,185,204}
-{7,242}
-{41,57,161}
-{93,224,241,288}
-{119,288}
-{90,99,117,196,296}
-{67,85,154}
-{147,169,216,264}
-{79,92,164}
-{19,120,132,197,267}
-{76,264}
-{30,133}
-{27,37,93,138,218}
-{152,155,244}
-{41,149,182,259}
-{29,178,224}
-{115,201,268}
-{141,166,253,282}
-{3,65,125,245,264}
-{6,150,159,202,206,277}
-{217,276}
-{28,96,144,193}
-{7,59,190}
-{144,217}
-{10,79,96,100,126,222}
-{7,61,253}
-{14,69,263}
-{3,30,63,125,186,277}
-{2,10,79,100,223}
-{131,131,239}
-{116,195,199,240}
-{87,99,158}
-{52,180}
-{7,12,140,208,275}
-{65,67,83,280}
-{4,52,125,126,137,176}
-{9,48,79,203,217,243}
-{43,206,251}
-{19,112,196,263,266}
-{29,70,256}
-{161,236,258}
-{8,25,42,97,291}
-{63,144,242,271}
-{7,17}
-{1,85,250}
-{104,244,250}
-{18,22,31,99,266,281}
-{51,138,237,268,288}
-{8,40,91,221,273}
-{0,176,230,249,254,255}
-{44,140,176,194,197}
-{56,197,264}
-{229,246,283}
-{53,128,173,233,282}
-{45,193,221}
-{21,80,286}
-{4,18,267}
-{15,97,220}
-{62,70,83,147,149,244}
-{120,134,159,174,250}
-{116,269}
-{23,108}
-{10,91,239}
-{7,128,142,243,286}
-{134,201,245,275,278}
-{13,208,227,288}
-{30,78,85}
-{107,179}
-{31,59,153,217,240,298}
-{27,130,233,282,286}
-{15,59,136,262}
-{85,186,233}
-{10,152,165,181,181}
-{137,183}
-{40,56,125,256,265,280}
-{12,22,120,183}
-{62,229}
-{38,59,81,113,261}
-{67,194,229}
-{7,173}
-{37,43,296}
-{59,162,285}
-{171,200,213,213}
-{116,123,209,234,277}
-{52,175}
-{189,213}
-{30,94,99,228,238}
-{46,101,154,260,272,274}
-{30,32,59}
-{65,172,292}
-{18,22,131,170,271}
-{2,53,88,104,264,265}
-{60,194,288}
-{15,108,121,161,201}
-{40,85,173,195,201,221}
-{54,86,107,174,287}
-{20,71,190,227}
-{16,46,66,175,197,252}
-{130,243,252,282}
-{142,219,266,272}
-{14,202,204,231,241,276}
-{161,172,212,222}
-{15,183,275}
-{83,270}
-{67,204}
-{65,184,264}
-{73,119,183,190,242}
-{53,287}
-{24,171}
-{72,220,220}
-{101,136,176,204,224,280}
-{39,47,282}
-{106,162,238,252}
-{23,242,247,265}
-{98,108,189,209,273}
-{122,245,270}
-{109,127,128,244,299}
-{41,162,186,191}
-{60,196}
-{0,123,129,213,248}
-{29,79,89,91}
-{172,298}
-{122,140,162,228,263,268}
-{2,116,247,294}
-{6,138}
-{17,98,287}
-{53,166,187,219,248,296}
-{15,26,90,175,196}
-{184,193,198}
-{17,69,76,105,183,264}
-{56,101,110}
-{15,108,139,168,272}
-{5,71,104,141}
-{136,179}
-{72,189}
-{54,79,208}
-{98,113,150,184,190,246}
-{37,69,132,210,285}
-{1,29,45,74,109,145}
-{11,72,133,149,216}
-{34,57,84,212,280}
-{131,211,294}
-{70,84,173}
-{193,213,230,266,285,299}
-{57,94,163,182,227}
-{44,133,143}
-{31,32,211}
-{130,142,165,188,194,231}
-{52,61,139,226,239,287}
-{7,103,157}
-{155,224,230}
-{127,135,139}
-{77,237,294}
-{10,213,278}
-{28,90,185,274}
-{59,105,282,297}
-{39,128,174,268}
-{32,158,215}
-{24,145,189,213,278}
-{78,148,230,263}
-{42,68,93,160,287,299}
-{4,12,70,91,191,237}
-{20,294}
-{45,53,77,113,211,240}
-{232,237}
-{125,152,284}
-{58,81,155,215,296}
-{4,8,44}
-{1,52,102,128,184,218}
-{185,199,226,299}
-{10,178,262,285}
-{80,95,230,240,266}
-{4,5,213}
-{156,187,271,298}
-{88,298}
-{109,233,290}
-{47,65,91,105,249,269}
-{97,129}
-{46,92,207}
-{2,163,249,259,291}
-{89,102,140,158,231}
-{162,184,283}
-{36,213}
-{163,259}
-{47,220,250}
-{37,89,105,124,143,198}
-{3,71}
-{142,165,190,256,269,269}
-{152,256}
-{27,49,191,198,220,285}
-{71,73,87,189,260}
-{11,54,90,106,130,216}
-{193,245,252}
-{2,8,57,91,163,184}
-{18,171,283}
-{28,41,110,112}
-{5,57}
-{137,262,285}
-{19,57,156,229,269}
-{138,179,190,199,281}
-{35,98,196,242}
-{122,152}
-{83,132,181,212,280,288}
-{219,298}
-{57,88,103}
-{5,203}
-{98,156,266}
-{10,45,72,169,211}
-{45,101,156,214,269}
-{68,73,81}
-{16,127,259}
-{9,32,246}
-{66,173,261,261,274}
-{17,115,157,169,251}
-{49,158}
-{25,37}
-{2,73,103,178,194,236}
-{238,269,273}
-{162,178,276}
-{48,52,160,237,288}
-{54,82,130,135,169,275}
-{29,142}
-{205,249,253,275,291}
-{60,76,84,115,126}
-{48,108,153,213,231}
-{23,124,175,210,226,293}
-{9,181}
-{20,99,112,166,201,242}
-{102,150,201}
-{41,98,240,244,260}
-{7,44,98,293}
-{0,125,177,283}
-{28,118,124,148,241,290}
-{73,91,122}
-{9,72,109,130,202,290}
-{70,111,120,160,216,262}
-{59,175,296}
-{2,201}
-{83,297}
-{76,293}
-{83,127,136,242,275,285}
-{169,190,195}
-{83,122,186,189,217,229}
-{98,210,229}
-{117,133}
-{74,294}
-{6,31,59,143,156,273}
-{98,180,241}
-{26,52,114,243}
-{112,240}
-{104,217}
-{148,162,259,279}
-{92,101,150,226,272,295}
-{55,86,118,202,237,275}
-{81,203}
-{79,126,177,265}
-{57,193}
-{169,240,244}
-{21,171,190,250,263}
-{23,37,215,235}
-{40,54,240,286}
-{105,177,190,276,285}
-{44,45,122,151}
-{28,31,187}
-{127,135,211}
-{5,13,150,194,259}
-{136,181,280}
-{20,147,158,189,200}
-{15,83,88,128,169}
-{10,14,25,26,150,158}
-{42,101,172,205}
-{85,185,226,236,271}
-{34,127,188,250,268}
-{27,143}
-{26,48,99,110,117,207}
-{22,56,190,269,287}
-{200,278}
-{70,134,138,204,216,298}
-{175,219,297}
-{99,273}
-{206,216}
-{23,214}
-{131,140}
-{11,140,240}
-{73,148}
-{7,66,125,210}
-{2,61,92}
-{0,137}
-{143,188,265}
-{177,238}
-{0,93,163,229}
-{35,49}
-{8,8,111,144,165}
-{99,278}
-{21,44,71,224,252,270}
-{119,150,175,233,245,294}
-{15,87}
-{84,211,217,225}
-{20,41,87,123,124,299}
-{62,120,169}
-{37,43,92,175,206,222}
-{95,168,180,250,269,296}
-{60,228,278,285}
-{173,195,232,276}
-{1,2,139,256,278}
-{51,119}
-{212,238,291}
-{120,172,292}
-{138,279}
-{251,261}
-{151,181,278,296}
-{163,207,220,289,295}
-{89,278,290}
-{24,137,157,206,271,278}
-{7,63,83,89,155,189}
-{2,5,172,195,215,260}
-{243,281}
-{60,125}
-{74,87,222,236}
-{45,70,159,194}
-{69,159,250}
-{150,214,296}
-{101,158,250}
-{56,134}
-{57,87,160,167,247,285}
-{123,269}
-{235,242}
-{79,95,115,167,287}
-{31,56,132,244,276}
-{25,218,241,241}
-{57,82,151,170,204}
-{69,103,288}
-{88,138,154,292}
-{14,98,138,227,245,249}
-{175,222,274}
-{38,139,193,208,277}
-{79,141}
-{5,77,197,209}
-{15,37,77,110,116}
-{26,226}
-{68,93,101,140,233}
-{53,96,170,192,290}
-{29,89,102,216,220}
-{11,85,136,239}
-{158,180,195,200,226}
-{10,49,118,137,172}
-{144,172,183}
-{14,176,188,215,272}
-{42,97,125}
-{114,166}
-{52,61,162,171,249}
-{140,195,242}
-{59,99,233}
-{31,76,136,181,187}
-{81,112,157,168,271,294}
-{8,35,44,48,190,297}
-{145,195,201}
-{160,248,291}
-{94,270,285}
-{116,139,225}
-{111,131,140}
-{158,277}
-{59,229,257}
-{25,47,99,123,239}
-{8,36,205,274,295}
-{132,152,178,192,235}
-{19,40,96,204}
-{7,77}
-{211,282}
-{26,100,180,244,281,296}
-{200,212,286}
-{5,94,151,290}
-{75,80,128,179,269,269}
-{7,111}
-{7,26,69,158,269,276}
-{7,36,74,94,171,215}
-{2,62,65,93,124,271}
-{78,96,109,189}
-{182,197,280,298}
-{17,78,82,85,85,208}
-{6,122,155}
-{14,33,130}
-{1,21,167,169}
-{49,85,158,175,213}
-{59,194}
-{125,132,259,285}
-{20,38,81,89,234,274}
-{106,140,156,287}
-{57,125}
-{53,103,158,204,234,267}
-{0,49,160,189,235}
-{34,115,142,207}
-{162,173,181,190,298}
-{11,76,116,166,191}
-{2,87,99,236,279}
-{40,203}
-{2,33,39,215,254}
-{53,69,83,224,228}
-{79,136,183,216,226,227}
-{10,109,137,163,240}
-{24,126,141}
-{69,255}
-{103,138,230,246,259,283}
-{136,290}
-{13,34,78,145,166,242}
-{38,74,83,242,294}
-{54,248,273}
-{107,162}
-{50,170,176,191,207,275}
-{32,134,166,288,292}
-{163,167,186,274,291,296}
-{31,86,123,156,160}
-{114,133,136,176,281,290}
-{105,147,211}
-{124,151,179,222,299}
-{87,101}
-{145,169,181,205,247}
-{6,266}
-{26,33,52,56,106,116}
-{19,21,65,89,104,168}
-{164,181,208}
-{36,67,92,116,248}
-{145,200,247}
-{155,215}
-{49,212}
-{29,57,105,117,131}
-{2,13,68,128,139,140}
-{193,273,273}
-{3,78,105,111,297}
-{49,142,244}
-{32,259}
-{161,205}
-{96,146,179,259}
-{44,45,211,233}
-{56,91,146,166,285}
-{87,107,120,262,299}
-{76,160,276,297}
-{248,266}
-{5,12,188,240,247}
-{164,206,293}
-{15,18,60,163}
-{53,134,172,230,287,290}
-{117,137,146,153,155}
-{72,270}
-{171,251}
-{80,125,137,141,169}
-{52,108,200,219,225,271}
-{29,78,106,221}
-{21,74,110,273}
-{28,88,98,170}
-{83,104}
-{12,152}
-{7,69,143,246,265,269}
-{62,106,157,200}
-{113,260,272,272,294}
-{16,35,80,121,165,176}
-{96,154,172,198,263}
-{29,53,109,128,129,195}
-{131,230,271,273,295,299}
-{53,160,208,231}
-{23,180,208,249,272}
-{45,208,264}
-{14,29,169}
-{116,147,272}
-{7,193,237,271}
-{158,198,253}
-{41,60,71}
-{110,133,200,249}
-{24,159,255}
-{26,39,61,114,218,229}
-{141,286,299}
-{74,278}
-{67,71,155}
-{151,257,284}
-{13,28,72,131,206}
-{60,152,275,295}
-{88,105,184,185}
-{85,190,205,256,283,285}
-{202,285}
-{14,92,160,200,246,279}
-{42,95,157,195}
-{50,99,224,276}
-{32,97,101,122}
-{66,85}
-{19,146,180,242,269,286}
-{24,86,247,274}
-{54,264,270,284}
-{72,77,85,124,127,285}
-{47,249}
-{25,73,102,237}
-{33,68,84,117,120}
-{29,62,172,240,242,273}
-{42,140,182,248,261,282}
-{118,228,284}
-{1,89,158,294}
-{29,89,122,155,208,283}
-{173,208,229}
-{6,22,142,267,299}
-{22,122,173,245,293}
diff --git a/contrib/intarray/expected/_int.out b/contrib/intarray/expected/_int.out
deleted file mode 100644
index d1b440f5a9..0000000000
--- a/contrib/intarray/expected/_int.out
+++ /dev/null
@@ -1,377 +0,0 @@
---
--- first, define the datatype.  Turn off echoing so that expected file
--- does not depend on contents of seg.sql.
---
-\set ECHO none
---test query_int
-select '1'::query_int;
- query_int 
------------
- 1
-(1 row)
-
-select ' 1'::query_int;
- query_int 
------------
- 1
-(1 row)
-
-select '1 '::query_int;
- query_int 
------------
- 1
-(1 row)
-
-select ' 1 '::query_int;
- query_int 
------------
- 1
-(1 row)
-
-select ' ! 1 '::query_int;
- query_int 
------------
- !1
-(1 row)
-
-select '!1'::query_int;
- query_int 
------------
- !1
-(1 row)
-
-select '1|2'::query_int;
- query_int 
------------
- 1 | 2
-(1 row)
-
-select '1|!2'::query_int;
- query_int 
------------
- 1 | !2
-(1 row)
-
-select '!1|2'::query_int;
- query_int 
------------
- !1 | 2
-(1 row)
-
-select '!1|!2'::query_int;
- query_int 
------------
- !1 | !2
-(1 row)
-
-select '!(!1|!2)'::query_int;
-  query_int   
---------------
- !( !1 | !2 )
-(1 row)
-
-select '!(!1|2)'::query_int;
-  query_int  
--------------
- !( !1 | 2 )
-(1 row)
-
-select '!(1|!2)'::query_int;
-  query_int  
--------------
- !( 1 | !2 )
-(1 row)
-
-select '!(1|2)'::query_int;
- query_int  
-------------
- !( 1 | 2 )
-(1 row)
-
-select '1&2'::query_int;
- query_int 
------------
- 1 & 2
-(1 row)
-
-select '!1&2'::query_int;
- query_int 
------------
- !1 & 2
-(1 row)
-
-select '1&!2'::query_int;
- query_int 
------------
- 1 & !2
-(1 row)
-
-select '!1&!2'::query_int;
- query_int 
------------
- !1 & !2
-(1 row)
-
-select '(1&2)'::query_int;
- query_int 
------------
- 1 & 2
-(1 row)
-
-select '1&(2)'::query_int;
- query_int 
------------
- 1 & 2
-(1 row)
-
-select '!(1)&2'::query_int;
- query_int 
------------
- !1 & 2
-(1 row)
-
-select '!(1&2)'::query_int;
- query_int  
-------------
- !( 1 & 2 )
-(1 row)
-
-select '1|2&3'::query_int;
- query_int 
------------
- 1 | 2 & 3
-(1 row)
-
-select '1|(2&3)'::query_int;
- query_int 
------------
- 1 | 2 & 3
-(1 row)
-
-select '(1|2)&3'::query_int;
-   query_int   
----------------
- ( 1 | 2 ) & 3
-(1 row)
-
-select '1|2&!3'::query_int;
- query_int  
-------------
- 1 | 2 & !3
-(1 row)
-
-select '1|!2&3'::query_int;
- query_int  
-------------
- 1 | !2 & 3
-(1 row)
-
-select '!1|2&3'::query_int;
- query_int  
-------------
- !1 | 2 & 3
-(1 row)
-
-select '!1|(2&3)'::query_int;
- query_int  
-------------
- !1 | 2 & 3
-(1 row)
-
-select '!(1|2)&3'::query_int;
-   query_int    
-----------------
- !( 1 | 2 ) & 3
-(1 row)
-
-select '(!1|2)&3'::query_int;
-   query_int    
-----------------
- ( !1 | 2 ) & 3
-(1 row)
-
-select '1|(2|(4|(5|6)))'::query_int;
-           query_int           
--------------------------------
- 1 | ( 2 | ( 4 | ( 5 | 6 ) ) )
-(1 row)
-
-select '1|2|4|5|6'::query_int;
-           query_int           
--------------------------------
- ( ( ( 1 | 2 ) | 4 ) | 5 ) | 6
-(1 row)
-
-select '1&(2&(4&(5&6)))'::query_int;
-     query_int     
--------------------
- 1 & 2 & 4 & 5 & 6
-(1 row)
-
-select '1&2&4&5&6'::query_int;
-     query_int     
--------------------
- 1 & 2 & 4 & 5 & 6
-(1 row)
-
-select '1&(2&(4&(5|6)))'::query_int;
-       query_int       
------------------------
- 1 & 2 & 4 & ( 5 | 6 )
-(1 row)
-
-select '1&(2&(4&(5|!6)))'::query_int;
-       query_int        
-------------------------
- 1 & 2 & 4 & ( 5 | !6 )
-(1 row)
-
-CREATE TABLE test__int( a int[] );
-\copy test__int from 'data/test__int.data'
-SELECT count(*) from test__int WHERE a && '{23,50}';
- count 
--------
-   403
-(1 row)
-
-SELECT count(*) from test__int WHERE a @@ '23|50';
- count 
--------
-   403
-(1 row)
-
-SELECT count(*) from test__int WHERE a @ '{23,50}';
- count 
--------
-    12
-(1 row)
-
-SELECT count(*) from test__int WHERE a @@ '23&50';
- count 
--------
-    12
-(1 row)
-
-SELECT count(*) from test__int WHERE a @ '{20,23}';
- count 
--------
-    12
-(1 row)
-
-SELECT count(*) from test__int WHERE a @@ '50&68';
- count 
--------
-     9
-(1 row)
-
-SELECT count(*) from test__int WHERE a @ '{20,23}' or a @ '{50,68}';
- count 
--------
-    21
-(1 row)
-
-SELECT count(*) from test__int WHERE a @@ '(20&23)|(50&68)';
- count 
--------
-    21
-(1 row)
-
-CREATE INDEX text_idx on test__int using gist ( a gist__int_ops );
-SELECT count(*) from test__int WHERE a && '{23,50}';
- count 
--------
-   403
-(1 row)
-
-SELECT count(*) from test__int WHERE a @@ '23|50';
- count 
--------
-   403
-(1 row)
-
-SELECT count(*) from test__int WHERE a @ '{23,50}';
- count 
--------
-    12
-(1 row)
-
-SELECT count(*) from test__int WHERE a @@ '23&50';
- count 
--------
-    12
-(1 row)
-
-SELECT count(*) from test__int WHERE a @ '{20,23}';
- count 
--------
-    12
-(1 row)
-
-SELECT count(*) from test__int WHERE a @@ '50&68';
- count 
--------
-     9
-(1 row)
-
-SELECT count(*) from test__int WHERE a @ '{20,23}' or a @ '{50,68}';
- count 
--------
-    21
-(1 row)
-
-SELECT count(*) from test__int WHERE a @@ '(20&23)|(50&68)';
- count 
--------
-    21
-(1 row)
-
-drop index text_idx;
-CREATE INDEX text_idx on test__int using gist ( a gist__intbig_ops );
-SELECT count(*) from test__int WHERE a && '{23,50}';
- count 
--------
-   403
-(1 row)
-
-SELECT count(*) from test__int WHERE a @@ '23|50';
- count 
--------
-   403
-(1 row)
-
-SELECT count(*) from test__int WHERE a @ '{23,50}';
- count 
--------
-    12
-(1 row)
-
-SELECT count(*) from test__int WHERE a @@ '23&50';
- count 
--------
-    12
-(1 row)
-
-SELECT count(*) from test__int WHERE a @ '{20,23}';
- count 
--------
-    12
-(1 row)
-
-SELECT count(*) from test__int WHERE a @@ '50&68';
- count 
--------
-     9
-(1 row)
-
-SELECT count(*) from test__int WHERE a @ '{20,23}' or a @ '{50,68}';
- count 
--------
-    21
-(1 row)
-
-SELECT count(*) from test__int WHERE a @@ '(20&23)|(50&68)';
- count 
--------
-    21
-(1 row)
-
diff --git a/contrib/intarray/sql/_int.sql b/contrib/intarray/sql/_int.sql
deleted file mode 100644
index 52313ef7a1..0000000000
--- a/contrib/intarray/sql/_int.sql
+++ /dev/null
@@ -1,84 +0,0 @@
---
--- first, define the datatype.  Turn off echoing so that expected file
--- does not depend on contents of seg.sql.
---
-\set ECHO none
-\i _int.sql
-\set ECHO all
-
---test query_int
-select '1'::query_int;
-select ' 1'::query_int;
-select '1 '::query_int;
-select ' 1 '::query_int;
-select ' ! 1 '::query_int;
-select '!1'::query_int;
-select '1|2'::query_int;
-select '1|!2'::query_int;
-select '!1|2'::query_int;
-select '!1|!2'::query_int;
-select '!(!1|!2)'::query_int;
-select '!(!1|2)'::query_int;
-select '!(1|!2)'::query_int;
-select '!(1|2)'::query_int;
-select '1&2'::query_int;
-select '!1&2'::query_int;
-select '1&!2'::query_int;
-select '!1&!2'::query_int;
-select '(1&2)'::query_int;
-select '1&(2)'::query_int;
-select '!(1)&2'::query_int;
-select '!(1&2)'::query_int;
-select '1|2&3'::query_int;
-select '1|(2&3)'::query_int;
-select '(1|2)&3'::query_int;
-select '1|2&!3'::query_int;
-select '1|!2&3'::query_int;
-select '!1|2&3'::query_int;
-select '!1|(2&3)'::query_int;
-select '!(1|2)&3'::query_int;
-select '(!1|2)&3'::query_int;
-select '1|(2|(4|(5|6)))'::query_int;
-select '1|2|4|5|6'::query_int;
-select '1&(2&(4&(5&6)))'::query_int;
-select '1&2&4&5&6'::query_int;
-select '1&(2&(4&(5|6)))'::query_int;
-select '1&(2&(4&(5|!6)))'::query_int;
-
-
-CREATE TABLE test__int( a int[] );
-
-\copy test__int from 'data/test__int.data'
-
-SELECT count(*) from test__int WHERE a && '{23,50}';
-SELECT count(*) from test__int WHERE a @@ '23|50';
-SELECT count(*) from test__int WHERE a @ '{23,50}';
-SELECT count(*) from test__int WHERE a @@ '23&50';
-SELECT count(*) from test__int WHERE a @ '{20,23}';
-SELECT count(*) from test__int WHERE a @@ '50&68';
-SELECT count(*) from test__int WHERE a @ '{20,23}' or a @ '{50,68}';
-SELECT count(*) from test__int WHERE a @@ '(20&23)|(50&68)';
-
-CREATE INDEX text_idx on test__int using gist ( a gist__int_ops );
-
-SELECT count(*) from test__int WHERE a && '{23,50}';
-SELECT count(*) from test__int WHERE a @@ '23|50';
-SELECT count(*) from test__int WHERE a @ '{23,50}';
-SELECT count(*) from test__int WHERE a @@ '23&50';
-SELECT count(*) from test__int WHERE a @ '{20,23}';
-SELECT count(*) from test__int WHERE a @@ '50&68';
-SELECT count(*) from test__int WHERE a @ '{20,23}' or a @ '{50,68}';
-SELECT count(*) from test__int WHERE a @@ '(20&23)|(50&68)';
-
-drop index text_idx;
-CREATE INDEX text_idx on test__int using gist ( a gist__intbig_ops );
-
-SELECT count(*) from test__int WHERE a && '{23,50}';
-SELECT count(*) from test__int WHERE a @@ '23|50';
-SELECT count(*) from test__int WHERE a @ '{23,50}';
-SELECT count(*) from test__int WHERE a @@ '23&50';
-SELECT count(*) from test__int WHERE a @ '{20,23}';
-SELECT count(*) from test__int WHERE a @@ '50&68';
-SELECT count(*) from test__int WHERE a @ '{20,23}' or a @ '{50,68}';
-SELECT count(*) from test__int WHERE a @@ '(20&23)|(50&68)';
-
diff --git a/contrib/ipc_check/README b/contrib/ipc_check/README
deleted file mode 100644
index 392902b0d1..0000000000
--- a/contrib/ipc_check/README
+++ /dev/null
@@ -1,22 +0,0 @@
-
-This simple perl script was designed under FreeBSD, and, right now, is
-limited to it.  It provides a simple way of determining and directing
-administrators in what has to be done to get IPC working, and configured.
-
-Usage:
-
-ipc_check.pl 
-
-	- simply checks for semaphores and shared memory being enabled
-	- if one or other is not enabled, appropriate "options" are provided
-	  to get it compiled into the kernel
-
-ipc_check.pl -B <# of buffers>
-
-	- checks to see if there are sufficient shared memory buffers to
-	  run the postmaster with a -B option as provided
-	- if insufficient buffers are provided, appropriate 'sysctl' commands,
-	  and instructions, are provided to the administrator to increase
-          them
-
-
diff --git a/contrib/ipc_check/ipc_check.pl b/contrib/ipc_check/ipc_check.pl
deleted file mode 100644
index cc65294718..0000000000
--- a/contrib/ipc_check/ipc_check.pl
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/perl
-
-# Notes ... -B 1 == 8k
-
-if(@ARGV > 1) {
-  if($ARGV[0] eq "-B") {
-    $buffers = $ARGV[1];
-  }
-}
-
-if($buffers > 0) {
-  $kb_memory_required = $buffers * 8;
-}
-
-$shm = `sysctl kern.ipc | grep shmall`;
-( $junk, $shm_amt ) = split(/ /, $shm);
-chomp($shm_amt);
-$sem = `sysctl kern.ipc | grep semmap`;
-
-print "\n\n";
-if(length($shm) > 0) {
-  printf "shared memory enabled: %d kB available\n", $shm_amt * 4;
-  if($buffers > 0) {
-    if($kb_memory_required / 4 > $shm_amt) {
-      print "\n";
-      print "to provide enough shared memory for a \"-B $buffers\" setting\n";
-      print "issue the following command\n\n";
-      printf "\tsysctl -w kern.ipc.shmall=%d\n", $kb_memory_required / 4;
-      print "\nand add the following to your /etc/sysctl.conf file:\n\n";
-      printf "\tkern.ipc.shmall=%d\n", $kb_memory_required / 4;
-    } else {
-      print "\n";
-      print "no changes to kernel required for a \"-B $buffers\" setting\n";
-    }
-  }
-} else {
-  print "no shared memory support available\n";
-  print "add the following option to your kernel config:\n\n";
-  print "\toptions        SYSVSHM\n\n";
-}
-
-print "\n==========================\n\n";
-if(length($sem) > 0) {
-  print "semaphores enabled\n";
-} else {
-  print "no semaphore support available\n";
-  print "add the following option to your kernel config:\n\n";
-  print "\toptions        SYSVSEM\n\n";
-}
-
-
diff --git a/contrib/isbn_issn/Makefile b/contrib/isbn_issn/Makefile
deleted file mode 100644
index 3310f40944..0000000000
--- a/contrib/isbn_issn/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/isbn_issn/Attic/Makefile,v 1.11 2001/09/06 10:49:29 petere Exp $
-
-subdir = contrib/isbn_issn
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-MODULES = isbn_issn
-DATA_built = isbn_issn.sql
-DOCS = README.isbn_issn
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/isbn_issn/README.isbn_issn b/contrib/isbn_issn/README.isbn_issn
deleted file mode 100644
index 6b734ce905..0000000000
--- a/contrib/isbn_issn/README.isbn_issn
+++ /dev/null
@@ -1,22 +0,0 @@
-
-ISBN (books) and ISSN (serials)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This directory contains definitions for a couple of PostgreSQL
-external types, for a couple of international-standard namespaces:
-ISBN (books) and ISSN (serials).  Rather than just using a char()
-member of the appropriate length, I wanted my database to include
-the validity-checking that both these numbering systems were designed
-to encompass.  A little bit of research revealed the formulae
-for computing the check digits, and I also included some validity
-constraints on the number of hyphens.
-
-The internal representation of these types is intended to be
-compatible with `char16', in the (perhaps vain) hope that
-this will make it possible to create indices of these types
-using char16_ops.
-
-These are based on Tom Ivar Helbekkmo's IP address type definition,
-from which I have copied the entire form of the implementation.
-
-Garrett A. Wollman, August 1998
diff --git a/contrib/isbn_issn/isbn_issn.c b/contrib/isbn_issn/isbn_issn.c
deleted file mode 100644
index 70115ceab2..0000000000
--- a/contrib/isbn_issn/isbn_issn.c
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- *	PostgreSQL type definitions for ISBNs.
- *
- *	$Id: isbn_issn.c,v 1.4 2001/11/05 17:46:23 momjian Exp $
- */
-
-#include "postgres.h"
-
-
-/*
- *	This is the internal storage format for ISBNs.
- *	NB: This is an intentional type pun with builtin type `char16'.
- */
-
-typedef struct isbn
-{
-	char		num[13];
-	char		pad[3];
-}	isbn;
-
-/*
- *	Various forward declarations:
- */
-
-isbn	   *isbn_in(char *str);
-char	   *isbn_out(isbn * addr);
-
-bool		isbn_lt(isbn * a1, isbn * a2);
-bool		isbn_le(isbn * a1, isbn * a2);
-bool		isbn_eq(isbn * a1, isbn * a2);
-bool		isbn_ge(isbn * a1, isbn * a2);
-bool		isbn_gt(isbn * a1, isbn * a2);
-
-bool		isbn_ne(isbn * a1, isbn * a2);
-
-int4		isbn_cmp(isbn * a1, isbn * a2);
-
-int4		isbn_sum(char *str);
-
-/*
- *	ISBN reader.
- */
-
-isbn *
-isbn_in(char *str)
-{
-	isbn	   *result;
-
-	if (strlen(str) != 13)
-	{
-		elog(ERROR, "isbn_in: invalid ISBN \"%s\"", str);
-		return (NULL);
-	}
-	if (isbn_sum(str) != 0)
-	{
-		elog(ERROR, "isbn_in: purported ISBN \"%s\" failed checksum",
-			 str);
-		return (NULL);
-	}
-
-	result = (isbn *) palloc(sizeof(isbn));
-
-	strncpy(result->num, str, 13);
-	memset(result->pad, ' ', 3);
-	return (result);
-}
-
-/*
- * The ISBN checksum is defined as follows:
- *
- * Number the digits from 1 to 9 (call this N).
- * Compute the sum, S, of N * D_N.
- * The check digit, C, is the value which satisfies the equation
- *	S + 10*C === 0 (mod 11)
- * The value 10 for C is written as `X'.
- *
- * For our purposes, we want the complete sum including the check
- * digit; if this is zero, then the checksum passed.  We also check
- * the syntactic validity if the provided string, and return 12
- * if any errors are found.
- */
-int4
-isbn_sum(char *str)
-{
-	int4		sum = 0,
-				dashes = 0,
-				val;
-	int			i;
-
-	for (i = 0; str[i] && i < 13; i++)
-	{
-		switch (str[i])
-		{
-			case '-':
-				if (++dashes > 3)
-					return 12;
-				continue;
-
-			case '0':
-			case '1':
-			case '2':
-			case '3':
-			case '4':
-			case '5':
-			case '6':
-			case '7':
-			case '8':
-			case '9':
-				val = str[i] - '0';
-				break;
-
-			case 'X':
-			case 'x':
-				val = 10;
-				break;
-
-			default:
-				return 12;
-		}
-
-		sum += val * (i + 1 - dashes);
-	}
-	return (sum % 11);
-}
-
-/*
- *	ISBN output function.
- */
-
-char *
-isbn_out(isbn * num)
-{
-	char	   *result;
-
-	if (num == NULL)
-		return (NULL);
-
-	result = (char *) palloc(14);
-
-	result[0] = '\0';
-	strncat(result, num->num, 13);
-	return (result);
-}
-
-/*
- *	Boolean tests for magnitude.
- */
-
-bool
-isbn_lt(isbn * a1, isbn * a2)
-{
-	return (strncmp(a1->num, a2->num, 13) < 0);
-};
-
-bool
-isbn_le(isbn * a1, isbn * a2)
-{
-	return (strncmp(a1->num, a2->num, 13) <= 0);
-};
-
-bool
-isbn_eq(isbn * a1, isbn * a2)
-{
-	return (strncmp(a1->num, a2->num, 13) == 0);
-};
-
-bool
-isbn_ge(isbn * a1, isbn * a2)
-{
-	return (strncmp(a1->num, a2->num, 13) >= 0);
-};
-
-bool
-isbn_gt(isbn * a1, isbn * a2)
-{
-	return (strncmp(a1->num, a2->num, 13) > 0);
-};
-
-bool
-isbn_ne(isbn * a1, isbn * a2)
-{
-	return (strncmp(a1->num, a2->num, 13) != 0);
-};
-
-/*
- *	Comparison function for sorting:
- */
-
-int4
-isbn_cmp(isbn * a1, isbn * a2)
-{
-	return (strncmp(a1->num, a2->num, 13));
-}
-
-
-/* ----------------------------- ISSN --------------------------- */
-
-/*
- *	This is the internal storage format for ISSNs.
- *	NB: This is an intentional type pun with builtin type `char16'.
- */
-
-typedef struct issn
-{
-	char		num[9];
-	char		pad[7];
-}	issn;
-
-/*
- *	Various forward declarations:
- */
-
-issn	   *issn_in(char *str);
-char	   *issn_out(issn * addr);
-
-bool		issn_lt(issn * a1, issn * a2);
-bool		issn_le(issn * a1, issn * a2);
-bool		issn_eq(issn * a1, issn * a2);
-bool		issn_ge(issn * a1, issn * a2);
-bool		issn_gt(issn * a1, issn * a2);
-
-bool		issn_ne(issn * a1, issn * a2);
-
-int4		issn_cmp(issn * a1, issn * a2);
-
-int4		issn_sum(char *str);
-
-/*
- *	ISSN reader.
- */
-
-issn *
-issn_in(char *str)
-{
-	issn	   *result;
-
-	if (strlen(str) != 9)
-	{
-		elog(ERROR, "issn_in: invalid ISSN \"%s\"", str);
-		return (NULL);
-	}
-	if (issn_sum(str) != 0)
-	{
-		elog(ERROR, "issn_in: purported ISSN \"%s\" failed checksum",
-			 str);
-		return (NULL);
-	}
-
-	result = (issn *) palloc(sizeof(issn));
-
-	strncpy(result->num, str, 9);
-	memset(result->pad, ' ', 7);
-	return (result);
-}
-
-/*
- * The ISSN checksum works just like the ISBN sum, only different
- * (of course!).
- * Here, the weights start at 8 and decrease.
- */
-int4
-issn_sum(char *str)
-{
-	int4		sum = 0,
-				dashes = 0,
-				val;
-	int			i;
-
-	for (i = 0; str[i] && i < 9; i++)
-	{
-		switch (str[i])
-		{
-			case '-':
-				if (++dashes > 1)
-					return 12;
-				continue;
-
-			case '0':
-			case '1':
-			case '2':
-			case '3':
-			case '4':
-			case '5':
-			case '6':
-			case '7':
-			case '8':
-			case '9':
-				val = str[i] - '0';
-				break;
-
-			case 'X':
-			case 'x':
-				val = 10;
-				break;
-
-			default:
-				return 12;
-		}
-
-		sum += val * (8 - (i - dashes));
-	}
-	return (sum % 11);
-}
-
-/*
- *	ISSN output function.
- */
-
-char *
-issn_out(issn * num)
-{
-	char	   *result;
-
-	if (num == NULL)
-		return (NULL);
-
-	result = (char *) palloc(14);
-
-	result[0] = '\0';
-	strncat(result, num->num, 9);
-	return (result);
-}
-
-/*
- *	Boolean tests for magnitude.
- */
-
-bool
-issn_lt(issn * a1, issn * a2)
-{
-	return (strncmp(a1->num, a2->num, 9) < 0);
-};
-
-bool
-issn_le(issn * a1, issn * a2)
-{
-	return (strncmp(a1->num, a2->num, 9) <= 0);
-};
-
-bool
-issn_eq(issn * a1, issn * a2)
-{
-	return (strncmp(a1->num, a2->num, 9) == 0);
-};
-
-bool
-issn_ge(issn * a1, issn * a2)
-{
-	return (strncmp(a1->num, a2->num, 9) >= 0);
-};
-
-bool
-issn_gt(issn * a1, issn * a2)
-{
-	return (strncmp(a1->num, a2->num, 9) > 0);
-};
-
-bool
-issn_ne(issn * a1, issn * a2)
-{
-	return (strncmp(a1->num, a2->num, 9) != 0);
-};
-
-/*
- *	Comparison function for sorting:
- */
-
-int4
-issn_cmp(issn * a1, issn * a2)
-{
-	return (strncmp(a1->num, a2->num, 9));
-}
-
-/*
- *	eof
- */
diff --git a/contrib/isbn_issn/isbn_issn.sql.in b/contrib/isbn_issn/isbn_issn.sql.in
deleted file mode 100644
index f837fad378..0000000000
--- a/contrib/isbn_issn/isbn_issn.sql.in
+++ /dev/null
@@ -1,228 +0,0 @@
---
---	PostgreSQL code for ISSNs.
---
---	$Id: isbn_issn.sql.in,v 1.2 2000/06/19 13:53:39 momjian Exp $
---
-
-
---
---	Input and output functions and the type itself:
---
-
-create function issn_in(opaque)
-	returns opaque
-	as 'MODULE_PATHNAME'
-	language 'c';
-
-create function issn_out(opaque)
-	returns opaque
-	as 'MODULE_PATHNAME'
-	language 'c';
-
-create type issn (
-	internallength = 16,
-	externallength = 9,
-	input = issn_in,
-	output = issn_out
-);
-
---
---	The various boolean tests:
---
-
-create function issn_lt(issn, issn)
-	returns bool
-	as 'MODULE_PATHNAME'
-	language 'c';
-
-create function issn_le(issn, issn)
-	returns bool
-	as 'MODULE_PATHNAME'
-	language 'c';
-
-create function issn_eq(issn, issn)
-	returns bool
-	as 'MODULE_PATHNAME'
-	language 'c';
-
-create function issn_ge(issn, issn)
-	returns bool
-	as 'MODULE_PATHNAME'
-	language 'c';
-
-create function issn_gt(issn, issn)
-	returns bool
-	as 'MODULE_PATHNAME'
-	language 'c';
-
-create function issn_ne(issn, issn)
-	returns bool
-	as 'MODULE_PATHNAME'
-	language 'c';
-
---
---	Now the operators.  Note how some of the parameters to some
---	of the 'create operator' commands are commented out.  This
---	is because they reference as yet undefined operators, and
---	will be implicitly defined when those are, further down.
---
-
-create operator < (
-	leftarg = issn,
-	rightarg = issn,
---	negator = >=,
-	procedure = issn_lt
-);
-
-create operator <= (
-	leftarg = issn,
-	rightarg = issn,
---	negator = >,
-	procedure = issn_le
-);
-
-create operator = (
-	leftarg = issn,
-	rightarg = issn,
-	commutator = =,
---	negator = <>,
-	procedure = issn_eq
-);
-
-create operator >= (
-	leftarg = issn,
-	rightarg = issn,
-	negator = <,
-	procedure = issn_ge
-);
-
-create operator > (
-	leftarg = issn,
-	rightarg = issn,
-	negator = <=,
-	procedure = issn_gt
-);
-
-create operator <> (
-	leftarg = issn,
-	rightarg = issn,
-	negator = =,
-	procedure = issn_ne
-);
-
---
---	eof
---
---
---	PostgreSQL code for ISBNs.
---
---	$Id: isbn_issn.sql.in,v 1.2 2000/06/19 13:53:39 momjian Exp $
---
---
---	Input and output functions and the type itself:
---
-
-create function isbn_in(opaque)
-	returns opaque
-	as 'MODULE_PATHNAME'
-	language 'c';
-
-create function isbn_out(opaque)
-	returns opaque
-	as 'MODULE_PATHNAME'
-	language 'c';
-
-create type isbn (
-	internallength = 16,
-	externallength = 13,
-	input = isbn_in,
-	output = isbn_out
-);
-
---
---	The various boolean tests:
---
-
-create function isbn_lt(isbn, isbn)
-	returns bool
-	as 'MODULE_PATHNAME'
-	language 'c';
-
-create function isbn_le(isbn, isbn)
-	returns bool
-	as 'MODULE_PATHNAME'
-	language 'c';
-
-create function isbn_eq(isbn, isbn)
-	returns bool
-	as 'MODULE_PATHNAME'
-	language 'c';
-
-create function isbn_ge(isbn, isbn)
-	returns bool
-	as 'MODULE_PATHNAME'
-	language 'c';
-
-create function isbn_gt(isbn, isbn)
-	returns bool
-	as 'MODULE_PATHNAME'
-	language 'c';
-
-create function isbn_ne(isbn, isbn)
-	returns bool
-	as 'MODULE_PATHNAME'
-	language 'c';
-
---
---	Now the operators.  Note how some of the parameters to some
---	of the 'create operator' commands are commented out.  This
---	is because they reference as yet undefined operators, and
---	will be implicitly defined when those are, further down.
---
-
-create operator < (
-	leftarg = isbn,
-	rightarg = isbn,
---	negator = >=,
-	procedure = isbn_lt
-);
-
-create operator <= (
-	leftarg = isbn,
-	rightarg = isbn,
---	negator = >,
-	procedure = isbn_le
-);
-
-create operator = (
-	leftarg = isbn,
-	rightarg = isbn,
-	commutator = =,
---	negator = <>,
-	procedure = isbn_eq
-);
-
-create operator >= (
-	leftarg = isbn,
-	rightarg = isbn,
-	negator = <,
-	procedure = isbn_ge
-);
-
-create operator > (
-	leftarg = isbn,
-	rightarg = isbn,
-	negator = <=,
-	procedure = isbn_gt
-);
-
-create operator <> (
-	leftarg = isbn,
-	rightarg = isbn,
-	negator = =,
-	procedure = isbn_ne
-);
-
---
---	eof
---
diff --git a/contrib/lo/Makefile b/contrib/lo/Makefile
deleted file mode 100644
index 5743c0d4f5..0000000000
--- a/contrib/lo/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/lo/Makefile,v 1.11 2001/09/06 10:49:29 petere Exp $
-
-subdir = contrib/lo
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-MODULES = lo
-DATA_built = lo.sql
-DATA = lo_drop.sql lo_test.sql
-DOCS = README.lo
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/lo/README.lo b/contrib/lo/README.lo
deleted file mode 100644
index aa06adf084..0000000000
--- a/contrib/lo/README.lo
+++ /dev/null
@@ -1,69 +0,0 @@
-PostgreSQL type extension for managing Large Objects
-----------------------------------------------------
-
-Overview
-
-One of the problems with the JDBC driver (and this affects the ODBC driver
-also), is that the specification assumes that references to BLOBS (Binary
-Large OBjectS) are stored within a table, and if that entry is changed, the
-associated BLOB is deleted from the database.
-
-As PostgreSQL stands, this doesn't occur. It allocates an OID for each object,
-and it is up to the application to store, and ultimately delete the objects.
-
-Now this is fine for new postgresql specific applications, but existing ones
-using JDBC or ODBC wont delete the objects, arising to orphaning - objects
-that are not referenced by anything, and simply occupy disk space.
-
-The Fix
-
-I've fixed this by creating a new data type 'lo', some support functions, and
-a Trigger which handles the orphaning problem.
-
-The 'lo' type was created because we needed to differenciate between normal
-Oid's and Large Objects. Currently the JDBC driver handles this dilema easily,
-but (after talking to Byron), the ODBC driver needed a unique type. They had created an 'lo' type, but not the solution to orphaning.
-
-Install
-
-Ok, first build the shared library, and install. Typing 'make install' in the
-contrib/lo directory should do it.
-
-Then, as the postgres super user, run the lo.sql script. This will install the
-type, and define the support functions.
-
-How to Use
-
-The easiest way is by an example:
-
-> create table image (title text,raster lo);
-> create trigger t_image before update or delete on image for each row execute procedure lo_manage(raster);
-
-Here, a trigger is created for each column that contains a lo type.
-
-Issues
-
-* dropping a table will still orphan any objects it contains, as the trigger
-  is not actioned.
-
-  For now, precede the 'drop table' with 'delete from {table}'. However, this
-  could be fixed by having 'drop table' perform an additional
-
-      'select lo_unlink({colname}::oid) from {tablename}'
-
-  for each column, before actually dropping the table.
-
-* Some frontends may create their own tables, and will not create the
-  associated trigger(s). Also, users may not remember (or know) to create
-  the triggers.
-
-  This can be solved, but would involve changes to the parser.
-
-As the ODBC driver needs a permanent lo type (& JDBC could be optimised to
-use it if it's Oid is fixed), and as the above issues can only be fixed by
-some internal changes, I feel it should become a permanent built-in type.
-
-I'm releasing this into contrib, just to get it out, and tested.
-
-Peter Mount <peter@retep.org.uk> June 13 1998
-
diff --git a/contrib/lo/lo.c b/contrib/lo/lo.c
deleted file mode 100644
index 8215c4cbbc..0000000000
--- a/contrib/lo/lo.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- *	PostgreSQL type definitions for managed LargeObjects.
- *
- *	$Header: /cvsroot/pgsql/contrib/lo/lo.c,v 1.11 2001/12/07 04:18:31 inoue Exp $
- *
- */
-
-#include "postgres.h"
-
-/* Required for largeobjects */
-#include "libpq/libpq-fs.h"
-#include "libpq/be-fsstubs.h"
-
-/* Required for SPI */
-#include "executor/spi.h"
-
-/* Required for triggers */
-#include "commands/trigger.h"
-
-
-#define atooid(x)  ((Oid) strtoul((x), NULL, 10))
-
-
-/*
- *	This is the internal storage format for managed large objects
- *
- */
-
-typedef Oid Blob;
-
-/*
- *	Various forward declarations:
- */
-
-Blob	   *lo_in(char *str);	/* Create from String		*/
-char	   *lo_out(Blob * addr);	/* Output oid as String		*/
-Oid			lo_oid(Blob * addr);	/* Return oid as an oid		*/
-Blob	   *lo(Oid oid);		/* Return Blob based on oid */
-Datum		lo_manage(PG_FUNCTION_ARGS);		/* Trigger handler		   */
-
-/*
- * This creates a large object, and sets its OID to the value in the
- * supplied string.
- *
- * If the string is empty, then a new LargeObject is created, and its oid
- * is placed in the resulting lo.
- */
-Blob *
-lo_in(char *str)
-{
-	Blob	   *result;
-	Oid			oid;
-	int			count;
-
-	if (strlen(str) > 0)
-	{
-		count = sscanf(str, "%u", &oid);
-
-		if (count < 1)
-			elog(ERROR, "lo_in: error in parsing \"%s\"", str);
-
-		if (oid == InvalidOid)
-			elog(ERROR, "lo_in: illegal oid \"%s\"", str);
-	}
-	else
-	{
-		/*
-		 * There is no Oid passed, so create a new one
-		 */
-		oid = DatumGetObjectId(DirectFunctionCall1(lo_creat,
-								   Int32GetDatum(INV_READ | INV_WRITE)));
-		if (oid == InvalidOid)
-			elog(ERROR, "lo_in: InvalidOid returned from lo_creat");
-	}
-
-	result = (Blob *) palloc(sizeof(Blob));
-
-	*result = oid;
-
-	return (result);
-}
-
-/*
- * This simply outputs the Oid of the Blob as a string.
- */
-char *
-lo_out(Blob * addr)
-{
-	char	   *result;
-
-	if (addr == NULL)
-		return (NULL);
-
-	result = (char *) palloc(32);
-	sprintf(result, "%u", *addr);
-	return (result);
-}
-
-/*
- * This function converts Blob to oid.
- *
- * eg: select lo_export(raster::oid,'/path/file') from table;
- *
- */
-Oid
-lo_oid(Blob * addr)
-{
-	if (addr == NULL)
-		return InvalidOid;
-	return (Oid) (*addr);
-}
-
-/*
- * This function is used so we can convert oid's to lo's
- *
- * ie:	insert into table values(lo_import('/path/file')::lo);
- *
- */
-Blob *
-lo(Oid oid)
-{
-	Blob	   *result = (Blob *) palloc(sizeof(Blob));
-
-	*result = oid;
-	return (result);
-}
-
-/*
- * This handles the trigger that protects us from orphaned large objects
- */
-PG_FUNCTION_INFO_V1(lo_manage);
-
-Datum
-lo_manage(PG_FUNCTION_ARGS)
-{
-	TriggerData *trigdata = (TriggerData *) fcinfo->context;
-	int			attnum;			/* attribute number to monitor	*/
-	char	  **args;			/* Args containing attr name	*/
-	TupleDesc	tupdesc;		/* Tuple Descriptor				*/
-	HeapTuple	rettuple;		/* Tuple to be returned			*/
-	bool		isdelete;		/* are we deleting?				*/
-	HeapTuple	newtuple = NULL;	/* The new value for tuple		*/
-	HeapTuple	trigtuple;		/* The original value of tuple	*/
-
-	if (!CALLED_AS_TRIGGER(fcinfo))
-		elog(ERROR, "lo: not fired by trigger manager");
-
-	/*
-	 * Fetch some values from trigdata
-	 */
-	newtuple = trigdata->tg_newtuple;
-	trigtuple = trigdata->tg_trigtuple;
-	tupdesc = trigdata->tg_relation->rd_att;
-	args = trigdata->tg_trigger->tgargs;
-
-	/* tuple to return to Executor */
-	if (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event))
-		rettuple = newtuple;
-	else
-		rettuple = trigtuple;
-
-	/* Are we deleting the row? */
-	isdelete = TRIGGER_FIRED_BY_DELETE(trigdata->tg_event);
-
-	/* Get the column were interested in */
-	attnum = SPI_fnumber(tupdesc, args[0]);
-
-	/*
-	 * Handle updates
-	 *
-	 * Here, if the value of the monitored attribute changes, then the large
-	 * object associated with the original value is unlinked.
-	 */
-	if (newtuple != NULL)
-	{
-		char	   *orig = SPI_getvalue(trigtuple, tupdesc, attnum);
-		char	   *newv = SPI_getvalue(newtuple, tupdesc, attnum);
-
-		if (orig != NULL && (newv == NULL || strcmp(orig, newv)))
-			DirectFunctionCall1(lo_unlink,
-								ObjectIdGetDatum(atooid(orig)));
-
-		if (newv)
-			pfree(newv);
-		if (orig)
-			pfree(orig);
-	}
-
-	/*
-	 * Handle deleting of rows
-	 *
-	 * Here, we unlink the large object associated with the managed attribute
-	 *
-	 */
-	if (isdelete)
-	{
-		char	   *orig = SPI_getvalue(trigtuple, tupdesc, attnum);
-
-		if (orig != NULL)
-		{
-			DirectFunctionCall1(lo_unlink,
-								ObjectIdGetDatum(atooid(orig)));
-
-			pfree(orig);
-		}
-	}
-
-	return PointerGetDatum(rettuple);
-}
diff --git a/contrib/lo/lo.sql.in b/contrib/lo/lo.sql.in
deleted file mode 100644
index f9fed597fd..0000000000
--- a/contrib/lo/lo.sql.in
+++ /dev/null
@@ -1,56 +0,0 @@
---
---	PostgreSQL code for LargeObjects
---
---	$Id: lo.sql.in,v 1.6 2000/11/21 21:51:58 tgl Exp $
---
---
---	Create the data type
---
-
--- used by the lo type, it takes an oid and returns an lo object
-create function lo_in(opaque)
-	returns opaque
-	as 'MODULE_PATHNAME'
-	language 'c';
-
--- used by the lo type, it returns the oid of the object
-create function lo_out(opaque)
-	returns opaque
-	as 'MODULE_PATHNAME'
-	language 'c';
-
--- finally the type itself
-create type lo (
-	internallength = 4,
-	externallength = variable,
-	input = lo_in,
-	output = lo_out
-);
-
--- this returns the oid associated with a lo object
-create function lo_oid(lo)
-	returns oid
-	as 'MODULE_PATHNAME'
-	language 'c';
-
--- same function, named to allow it to be used as a type coercion, eg:
---    create table a (image lo);
---    select image::oid from a;
---
-create function oid(lo)
-	returns oid
-	as 'MODULE_PATHNAME', 'lo_oid'
-	language 'c';
-
--- this allows us to convert an oid to a managed lo object
--- ie: insert into test values (lo_import('/fullpath/file')::lo);
-create function lo(oid)
-	returns lo
-	as 'MODULE_PATHNAME'
-	language 'c';
-
--- This is used in triggers
-create function lo_manage()
-	returns opaque
-	as 'MODULE_PATHNAME'
-	language 'c';
diff --git a/contrib/lo/lo_drop.sql b/contrib/lo/lo_drop.sql
deleted file mode 100644
index 2472715a3d..0000000000
--- a/contrib/lo/lo_drop.sql
+++ /dev/null
@@ -1,21 +0,0 @@
---
--- This removes the type (and a test table)
--- It's used just for development
---
-
--- remove our test table
-drop table a;
-
--- now drop any sql based functions associated with the lo type
-drop function oid(lo);
-
--- now drop the type
-drop type lo;
-
--- as the type is gone, remove the C based functions
-drop function lo_in(opaque);
-drop function lo_out(opaque);
-drop function lo(oid);
-drop function lo_manage();
-
--- the lo stuff is now removed from the system
diff --git a/contrib/lo/lo_test.sql b/contrib/lo/lo_test.sql
deleted file mode 100644
index 0c0da2cfd6..0000000000
--- a/contrib/lo/lo_test.sql
+++ /dev/null
@@ -1,57 +0,0 @@
---
--- This runs some common tests against the type
---
--- It's used just for development
---
-
--- ignore any errors here - simply drop the table if it already exists
-drop table a;
-
--- create the test table
-create table a (fname name,image lo);
-
--- insert a null object
-insert into a values ('null');
-
--- insert an empty large object
-insert into a values ('empty','');
-
--- insert a large object based on a file
-insert into a values ('/etc/group',lo_import('/etc/group')::lo);
-
--- now select the table
-select * from a;
-
--- this select also returns an oid based on the lo column
-select *,image::oid from a;
-
--- now test the trigger
-create trigger t_a before update or delete on a for each row execute procedure lo_manage(image);
-
--- insert
-insert into a values ('aa','');
-select * from a where fname like 'aa%';
-
--- update
-update a set image=lo_import('/etc/group')::lo where fname='aa';
-select * from a where fname like 'aa%';
-
--- update the 'empty' row which should be null
-update a set image=lo_import('/etc/hosts')::lo where fname='empty';
-select * from a where fname like 'empty%';
-update a set image=null where fname='empty';
-select * from a where fname like 'empty%';
-
--- delete the entry
-delete from a where fname='aa';
-select * from a where fname like 'aa%';
-
--- This deletes the table contents. Note, if you comment this out, and
--- expect the drop table to remove the objects, think again. The trigger
--- doesn't get thrown by drop table.
-delete from a;
-
--- finally drop the table
-drop table a;
-
--- end of tests
diff --git a/contrib/mSQL-interface/Makefile b/contrib/mSQL-interface/Makefile
deleted file mode 100644
index 063569d9c7..0000000000
--- a/contrib/mSQL-interface/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# $Header: /cvsroot/pgsql/contrib/mSQL-interface/Attic/Makefile,v 1.7 2001/02/20 19:20:27 petere Exp $
-#
-
-subdir = contrib/mSQL-interface
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-NAME	:= mpgsql
-SO_MAJOR_VERSION := 0
-SO_MINOR_VERSION := 0
-OBJS	:= mpgsql.o
-
-override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
-
-include $(top_srcdir)/src/Makefile.shlib
-
-all: all-lib
-
-install: all installdirs install-lib
-	$(INSTALL_DATA) README.$(NAME) $(docdir)/contrib
-
-installdirs:
-	$(mkinstalldirs) $(libdir) $(docdir)/contrib
-
-uninstall: uninstall-lib
-	rm -f $(docdir)/contrib/README.$(NAME)
-
-clean distclean maintainer-clean: clean-lib
-	rm -f $(OBJS)
diff --git a/contrib/mSQL-interface/README.mpgsql b/contrib/mSQL-interface/README.mpgsql
deleted file mode 100644
index 714ab29056..0000000000
--- a/contrib/mSQL-interface/README.mpgsql
+++ /dev/null
@@ -1,86 +0,0 @@
-
-Hello! :)
-
-(Sorry for my english. But if i wrote in portuguese, you wouldn't
- understand nothing. :])
-
-	I found it's the right place to post this. I'm a newcomer in these
-lists. I hope i did it right. :]
-
-<BOREDOM>
-	When i started using SQL, i started with mSQL. I developed a lot
-of useful apps for me and my job with C, mainly because i loved it's
-elegant, simple api. But for a large project i'm doing in these days, i
-thought is was not enough, because it felt a lot of features i started to
-need, like security and subselects. (and it's not free :))
-	So after looking at the options, choose to start again with
-postgres. It offered everything that i needed, and the documentation is
-really good (remember me to thank the one who wrote'em).
-	But for my little apps, i needed to start porting them to libpq.
-After looking at pq's syntax, i found it was better to write a bridge
-between the mSQL api and libpq. I found that rewriting the libmsql.a
-routines that calls libpq would made things much easier. I guess the
-results are quite good right now.
-</BOREDOM>
-
-	Ok. Lets' summarize it:
-
-	mpgsql.c is the bridge. Acting as a wrapper, it's really good,
-since i could run mSQL. But it's not accurate. Some highlights:
-
-	CONS:
-	* It's not well documented 
-		(this post is it's first documentation attempt, in fact);
-	* It doesn't handle field types correctly. I plan to fix it,
-	  if people start doing feedbacks;
-	* It's limited to 10 simultaneous connections. I plan to enhance
-	  this, i'm just figuring out;
-	* I'd like to make it reentrant/thread safe, although i don't
-	  think this could be done without changing the API structure;
-	* Error Management should be better. This is my first priority
-          now;
-	* Some calls are just empty implementations.
-
-	PROS:
-	* the mSQL Monitor runs Okay. :]
-	* It's really cool. :)
-	* Make mSQL-made applications compatible with postgresql just by
-	  changing link options.
-	* Uses postgreSQL. :]
-	* the mSQL API it's far easier to use and understand than libpq.
-          Consider this example:
-
-#include "msql.h"
-
-void main(int argc, char **argv, char **envp) {
-   int sid;
-	
-   sid = msqlConnect(NULL); /* Connects via unix socket */
-
-   if (sid >= 0) {
-      m_result *rlt;
-      m_row *row;
-      msqlSelectDB(sid, "hosts");
-      if (msqlQuery(sid, "select host_id from hosts")) {
-	 rlt = msqlStoreResult();
-         while (row = (m_row*)msqlFetchRow(rlt)) 
-            printf("hostid: %s\n", row[0]);
-         msqlFreeResult(rlt);
-      }
-      msqlClose(sid);
-   }
-}
-
-	I enclose mpgsql.c inside. I'd like to maintain it, and (maybe, am
-i dreaming) make it as part of the pgsql distribution. I guess it doesn't
-depends on me, but mainly on it's acceptance by its users.
-
-	Hm... i forgot: you'll need a msql.h copy, since it's copyrighted
-by Hughes Technologies Pty Ltd. If you haven't it yes, fetch one
-from www.hughes.com.au.
-
-	I would like to catch users ideas. My next goal is to add better
-error handling, and to make it better documented, and try to let relshow
-run through it. :)
-
-	done. Aldrin Leal <aldrin@americasnet.com>
diff --git a/contrib/mSQL-interface/mpgsql.c b/contrib/mSQL-interface/mpgsql.c
deleted file mode 100644
index 8b59485471..0000000000
--- a/contrib/mSQL-interface/mpgsql.c
+++ /dev/null
@@ -1,365 +0,0 @@
-#include <time.h>
-#include <string.h>
-#include <stdlib.h>
-#include "msql.h"
-#include "libpq-fe.h"
-
-#define HNDMAX 10
-
-PGconn	   *PGh[HNDMAX] = {
-	NULL, NULL, NULL, NULL, NULL,
-	NULL, NULL, NULL, NULL, NULL
-};
-
-#define E_NOHANDLERS 0
-
-char	   *msqlErrors[] = {
-	"Out of database handlers."
-};
-
-char		msqlErrMsg[BUFSIZ],
-		   *tfrom = "dunno";
-PGresult   *queryres = NULL;
-
-int
-msqlConnect(char *host)
-{
-	int			count;
-
-	for (count = 0; count < HNDMAX; count++)
-		if (PGh[count] == NULL)
-			break;
-
-	if (count == HNDMAX)
-	{
-		strncpy(msqlErrMsg, msqlErrors[E_NOHANDLERS], BUFSIZ);
-		return -1;
-	}
-
-	PGh[count] = malloc(sizeof(PGconn));
-	PGh[count]->pghost = host ? strdup(host) : NULL;
-	return count;
-}
-
-int
-msqlSelectDB(int handle, char *dbname)
-{
-	char	   *options = calloc(1, BUFSIZ);
-	char	   *e = getenv("PG_OPTIONS");
-
-	if (e == NULL)
-		e = "";
-
-	if (PGh[handle]->pghost)
-	{
-		strcat(options, "host=");
-		strncat(options, PGh[handle]->pghost, BUFSIZ);
-		strncat(options, " ", BUFSIZ);
-		free(PGh[handle]->pghost);
-		PGh[handle]->pghost = NULL;
-	}
-	strncat(options, "dbname=", BUFSIZ);
-	strncat(options, dbname, BUFSIZ);
-	strncat(options, " ", BUFSIZ);
-	strncat(options, e, BUFSIZ);
-	free(PGh[handle]);
-	PGh[handle] = PQconnectdb(options);
-	free(options);
-	strncpy(msqlErrMsg, PQerrorMessage(PGh[handle]), BUFSIZ);
-	return (PQstatus(PGh[handle]) == CONNECTION_BAD ? -1 : 0);
-}
-
-int
-msqlQuery(int handle, char *query)
-{
-	char	   *tq = strdup(query);
-	char	   *p = tq;
-	PGresult   *res;
-	PGconn	   *conn = PGh[handle];
-	ExecStatusType rcode;
-
-	res = PQexec(conn, p);
-
-	rcode = PQresultStatus(res);
-
-	if (rcode == PGRES_TUPLES_OK)
-	{
-		queryres = res;
-		return PQntuples(res);
-	}
-	else if (rcode == PGRES_FATAL_ERROR || rcode == PGRES_NONFATAL_ERROR)
-	{
-		PQclear(res);
-		queryres = NULL;
-		return -1;
-	}
-	else
-	{
-		PQclear(res);
-		queryres = NULL;
-		return 0;
-	}
-}
-
-int
-msqlCreateDB(int a, char *b)
-{
-	char		tbuf[BUFSIZ];
-
-	sprintf(tbuf, "create database %s", b);
-	return msqlQuery(a, tbuf) >= 0 ? 0 : -1;
-}
-
-int
-msqlDropDB(int a, char *b)
-{
-	char		tbuf[BUFSIZ];
-
-	sprintf(tbuf, "drop database %s", b);
-	return msqlQuery(a, tbuf) >= 0 ? 0 : -1;
-}
-
-int
-msqlShutdown(int a)
-{
-}
-
-int
-msqlGetProtoInfo(void)
-{
-}
-
-int
-msqlReloadAcls(int a)
-{
-}
-
-char *
-msqlGetServerInfo(void)
-{
-}
-
-char *
-msqlGetHostInfo(void)
-{
-}
-
-char *
-msqlUnixTimeToDate(time_t date)
-{
-}
-
-char *
-msqlUnixTimeToTime(time_t time)
-{
-}
-
-void
-msqlClose(int a)
-{
-	PQfinish(PGh[a]);
-	PGh[a] = NULL;
-	if (queryres)
-	{
-		free(queryres);
-		queryres = NULL;
-	}
-}
-
-void
-msqlDataSeek(m_result * result, int count)
-{
-	int			c;
-
-	result->cursor = result->queryData;
-	for (c = 1; c < count; c++)
-		if (result->cursor->next)
-			result->cursor = result->cursor->next;
-}
-
-void
-msqlFieldSeek(m_result * result, int count)
-{
-	int			c;
-
-	result->fieldCursor = result->fieldData;
-	for (c = 1; c < count; c++)
-		if (result->fieldCursor->next)
-			result->fieldCursor = result->fieldCursor->next;
-}
-
-void
-msqlFreeResult(m_result * result)
-{
-	if (result)
-	{
-		/* Clears fields */
-		free(result->fieldData);
-		result->cursor = result->queryData;
-		while (result->cursor)
-		{
-			int			c;
-			m_row		m = result->cursor->data;
-
-			for (c = 0; m[c]; c++)
-				free(m[c]);
-
-			result->cursor = result->cursor->next;
-		}
-		free(result->queryData);
-		free(result);
-	}
-}
-
-m_row
-msqlFetchRow(m_result * row)
-{
-	m_data	   *r = row->cursor;
-
-	if (r)
-	{
-		row->cursor = row->cursor->next;
-		return (m_row) r->data;
-	}
-	return (m_row) NULL;
-}
-
-m_seq *
-msqlGetSequenceInfo(int a, char *b)
-{
-}
-
-m_field *
-msqlFetchField(m_result * mr)
-{
-	m_field    *m = (m_field *) mr->fieldCursor;
-
-	if (m)
-	{
-		mr->fieldCursor = mr->fieldCursor->next;
-		return m;
-	}
-	return NULL;
-}
-
-m_result *
-msqlListDBs(int a)
-{
-	m_result   *m;
-
-	if (msqlQuery(a, "select datname from pg_database") > 0)
-	{
-		m = msqlStoreResult();
-		return m;
-	}
-	else
-		return NULL;
-}
-
-m_result *
-msqlListTables(int a)
-{
-	m_result   *m;
-	char		tbuf[BUFSIZ];
-
-	sprintf(tbuf, "select relname from pg_class where relkind='r' and relowner=%d", getuid());
-	if (msqlQuery(a, tbuf) > 0)
-	{
-		m = msqlStoreResult();
-		return m;
-	}
-	else
-		return NULL;
-}
-
-m_result *
-msqlListFields(int a, char *b)
-{
-
-}
-
-m_result *
-msqlListIndex(int a, char *b, char *c)
-{
-	m_result   *m;
-	char		tbuf[BUFSIZ];
-
-	sprintf(tbuf, "select relname from pg_class where relkind='i' and relowner=%d", getuid());
-	if (msqlQuery(a, tbuf) > 0)
-	{
-		m = msqlStoreResult();
-		return m;
-	}
-	else
-		return NULL;
-}
-
-m_result *
-msqlStoreResult(void)
-{
-	if (queryres)
-	{
-		m_result   *mr = malloc(sizeof(m_result));
-		m_fdata    *mf;
-		m_data	   *md;
-		int			count;
-
-		mr->queryData = mr->cursor = NULL;
-		mr->numRows = PQntuples(queryres);
-		mr->numFields = PQnfields(queryres);
-
-		mf = calloc(PQnfields(queryres), sizeof(m_fdata));
-		for (count = 0; count < PQnfields(queryres); count++)
-		{
-			(m_fdata *) (mf + count)->field.name = strdup(PQfname(queryres, count));
-			(m_fdata *) (mf + count)->field.table = tfrom;
-			(m_fdata *) (mf + count)->field.type = CHAR_TYPE;
-			(m_fdata *) (mf + count)->field.length = PQfsize(queryres, count);
-			(m_fdata *) (mf + count)->next = (m_fdata *) (mf + count + 1);
-		}
-		(m_fdata *) (mf + count - 1)->next = NULL;
-
-		md = calloc(PQntuples(queryres), sizeof(m_data));
-		for (count = 0; count < PQntuples(queryres); count++)
-		{
-			m_row		rows = calloc(PQnfields(queryres) * sizeof(m_row) + 1, 1);
-			int			c;
-
-			for (c = 0; c < PQnfields(queryres); c++)
-				rows[c] = strdup(PQgetvalue(queryres, count, c));
-			(m_data *) (md + count)->data = rows;
-
-			(m_data *) (md + count)->width = PQnfields(queryres);
-			(m_data *) (md + count)->next = (m_data *) (md + count + 1);
-		}
-		(m_data *) (md + count - 1)->next = NULL;
-
-		mr->queryData = mr->cursor = md;
-		mr->fieldCursor = mr->fieldData = mf;
-
-		return mr;
-	}
-	else
-		return NULL;
-}
-
-time_t
-msqlDateToUnixTime(char *a)
-{
-}
-
-time_t
-msqlTimeToUnixTime(char *b)
-{
-}
-
-char *
-msql_tmpnam(void)
-{
-	return tmpnam("/tmp/msql.XXXXXX");
-}
-
-int
-msqlLoadConfigFile(char *a)
-{
-}
diff --git a/contrib/mac/README.mac b/contrib/mac/README.mac
deleted file mode 100644
index f68a5fafa4..0000000000
--- a/contrib/mac/README.mac
+++ /dev/null
@@ -1,8 +0,0 @@
-This directory contains tools to create a mapping table from MAC
-addresses (e.g., Ethernet hardware addresses) to human-readable
-manufacturer strings.  The `createoui' script builds the table
-structure, `updateoui' obtains the current official mapping table
-from the web site of the IEEE, converts it, and stores it in the
-database, `dropoui' removes everything.  Use the --help option to
-get more usage information from the respective script.  All three
-use the psql program; any extra arguments will be passed to psql.
diff --git a/contrib/mac/createoui b/contrib/mac/createoui
deleted file mode 100755
index 56d81c20d3..0000000000
--- a/contrib/mac/createoui
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-# Utility to create manufacturer's oui table
-# OUI is "Organizationally Unique Identifier" assigned by IEEE.
-# There are currently three duplicate listings, so we can not enforce
-# uniqueness in the OUI field.
-# - thomas 2000-08-21
-
-args=
-update=0
-
-while [ $# -gt 0 ]
-do
-    case "$1" in
-    --update)
-        update=1
-        ;;
-    --noupdate)
-        update=0
-        ;;
-    --help)
-        echo "Usage: $0 --[no]update dbname"
-        exit
-        ;;
-    *)
-        args="$args $1"
-        ;;
-    esac
-    shift
-done
-
-psql -e $args <<EOF
--- Table containing OUI portions of MAC address and manufacturer's name
-create table macoui (
-  addr macaddr not null,
-  name text not null
-);
-
--- Create an index to help lookups
-create index macoui_idx on macoui (addr);
-
--- Function to return manufacturer's name given MAC address
-create function manuf (macaddr)
-	returns text as '
-		select name from macoui m where trunc(\$1) = m.addr;
-' language 'SQL';
-EOF
-
-if [ $update -gt 0 ]; then
-    updateoui $args
-fi
-
-exit
diff --git a/contrib/mac/dropoui b/contrib/mac/dropoui
deleted file mode 100755
index 6fffdc92d6..0000000000
--- a/contrib/mac/dropoui
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh
-# Utility to remove manufacturer's oui table
-
-args=
-
-while [ $# -gt 0 ]
-do
-    case "$1" in
-    --help)
-        echo "Usage: $0 dbname"
-        exit
-        ;;
-    *)
-        args="$args $1"
-        ;;
-    esac
-    shift
-done
-
-psql $args <<EOF
-drop function manuf(macaddr);
-drop table macoui;
-EOF
-
-exit
diff --git a/contrib/mac/ouiparse.awk b/contrib/mac/ouiparse.awk
deleted file mode 100644
index 8f2fd00c3d..0000000000
--- a/contrib/mac/ouiparse.awk
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: ouiparse.awk,v 1.2 2000/08/23 13:44:14 thomas Exp $
-#
-# ouiparse.awk
-# Author: Lawrence E. Rosenman <ler@lerctr.org>
-# Original Date: 30 July 2000 (in this form).
-# This AWK script takes the IEEE's oui.txt file and creates insert
-# statements to populate a SQL table with the following attributes:
-# create table oui (
-#        oui macaddr primary key,
-#        manufacturer text);
-# the table name is set by setting the AWK variable TABLE
-# 
-# we translate the character apostrophe (') to double apostrophe ('') inside 
-# the company name to avoid SQL errors.
-#
-
-BEGIN {
-	TABLE="macoui";
-	printf "DELETE FROM %s;",TABLE;
-	printf "BEGIN TRANSACTION;";
-	nrec=0;
-}
-
-END {
-#	if (nrec > 0)
-	printf "COMMIT TRANSACTION;";
-}
-
-# match ONLY lines that begin with 2 hex numbers, -, and another hex number
-/^[0-9a-fA-F][0-9a-fA-F]-[0-9a-fA-F]/ { 
-#	if (nrec >= 100) {
-#		printf "COMMIT TRANSACTION;";
-#		printf "BEGIN TRANSACTION;";
-#		nrec=0;
-#	} else {
-#		nrec++;
-#	}
-	# Get the OUI
-	OUI=$1;
-	# Skip the (hex) tag to get to Company Name
-	Company=$3;
-	# make the OUI look like a macaddr
-	gsub("-",":",OUI);
-	OUI=OUI ":00:00:00"
-	# Pick up the rest of the company name
-	for (i=4;i<=NF;i++)
-		Company=Company " " $i;
-	# Modify any apostrophes (') to avoid grief below.
-	gsub("'","''",Company);
-	# Print out for the SQL table insert
-	printf "INSERT INTO %s (addr, name) VALUES (trunc(macaddr \'%s\'),\'%s\');\n",
-		TABLE,OUI,Company;
-}
diff --git a/contrib/mac/updateoui b/contrib/mac/updateoui
deleted file mode 100755
index 2a6a07c3df..0000000000
--- a/contrib/mac/updateoui
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Utility to create manufacturer's OUI table
-
-args=
-refresh=0
-
-while [ $# -gt 0 ]
-do
-    case "$1" in
-    --refresh|--fetch|-r)
-        refresh=1
-        ;;
-    --norefresh|--nofetch)
-        refresh=0
-        ;;
-    --help)
-        echo "Usage: $0 --[no]refresh dbname"
-        exit
-        ;;
-    *)
-        args="$args $1"
-        ;;
-    esac
-    shift
-done
-
-if [ $refresh -gt 0 ]; then
-    [ -e oui.txt ] && rm -rf oui.txt
-    wget -nd 'http://standards.ieee.org/regauth/oui/oui.txt'
-fi
-
-awk -f ouiparse.awk < oui.txt | psql -e $args
-
-exit
diff --git a/contrib/miscutil/Makefile b/contrib/miscutil/Makefile
deleted file mode 100644
index 95daef72ba..0000000000
--- a/contrib/miscutil/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/miscutil/Attic/Makefile,v 1.16 2001/09/06 10:49:29 petere Exp $
-
-subdir = contrib/miscutil
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-MODULES = misc_utils
-DATA_built = misc_utils.sql
-DOCS = README.misc_utils
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/miscutil/README.misc_utils b/contrib/miscutil/README.misc_utils
deleted file mode 100644
index 0a8eca6c9c..0000000000
--- a/contrib/miscutil/README.misc_utils
+++ /dev/null
@@ -1,26 +0,0 @@
-Miscellaneous utility functions for PostgreSQL.
-Copyright (C) 1999, Massimo Dal Zotto <dz@cs.unitn.it>
-
-This software is distributed under the GNU General Public License
-either version 2, or (at your option) any later version.
-
-backend_pid()
-
-	return the pid of our corresponding backend.
-
-unlisten(relname)
-
-	unlisten from a relation or from all relations if the argument
-	is null, empty or '*'.
-	It is now obsoleted by the new unlisten command but still useful
-	if you want unlisten a name computed by the query.
-	Note that a listen/notify relname can be any ascii string, not
-	just valid relation names.
-
-min(x,y)
-max(x,y)
-
-	return the min or max of two integers.
-
--- 
-Massimo Dal Zotto <dz@cs.unitn.it>
diff --git a/contrib/miscutil/misc_utils.c b/contrib/miscutil/misc_utils.c
deleted file mode 100644
index 26bbabe46f..0000000000
--- a/contrib/miscutil/misc_utils.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * misc_utils.c --
- *
- * This file defines miscellaneous PostgreSQL utility functions.
- *
- * Copyright (C) 1999, Massimo Dal Zotto <dz@cs.unitn.it>
- *
- * This file is distributed under the GNU General Public License
- * either version 2, or (at your option) any later version.
- */
-
-#include "postgres.h"
-
-#include <unistd.h>
-#include <signal.h>
-#include <string.h>
-#include <errno.h>
-
-#include "access/heapam.h"
-#include "access/htup.h"
-#include "access/relscan.h"
-#include "access/skey.h"
-#include "access/tupdesc.h"
-#include "catalog/catname.h"
-#include "catalog/pg_listener.h"
-#include "commands/async.h"
-#include "fmgr.h"
-#include "storage/lmgr.h"
-#include "utils/fmgroids.h"
-#include "utils/palloc.h"
-#include "utils/rel.h"
-#include "utils/tqual.h"
-
-#include "misc_utils.h"
-
-#undef MIN
-#define MIN(x,y)	((x)<=(y) ? (x) : (y))
-
-
-int
-backend_pid()
-{
-	return getpid();
-}
-
-int
-unlisten(char *relname)
-{
-	Async_Unlisten(relname, getpid());
-	return 0;
-}
-
-int
-max(int x, int y)
-{
-	return ((x > y) ? x : y);
-}
-
-int
-min(int x, int y)
-{
-	return ((x < y) ? x : y);
-}
-
-/*
- * Return the number of active listeners on a relation name.
- */
-int
-active_listeners(text *relname)
-{
-	HeapTuple	lTuple;
-	Relation	lRel;
-	HeapScanDesc sRel;
-	TupleDesc	tdesc;
-	ScanKeyData key;
-	Datum		d;
-	bool		isnull;
-	int			len,
-				pid;
-	int			count = 0;
-	int			ourpid = getpid();
-	char		listen_name[NAMEDATALEN];
-
-	lRel = heap_openr(ListenerRelationName, AccessShareLock);
-	tdesc = RelationGetDescr(lRel);
-
-	if (relname && (VARSIZE(relname) > VARHDRSZ))
-	{
-		MemSet(listen_name, 0, NAMEDATALEN);
-		len = MIN(VARSIZE(relname) - VARHDRSZ, NAMEDATALEN - 1);
-		memcpy(listen_name, VARDATA(relname), len);
-		ScanKeyEntryInitialize(&key, 0,
-							   Anum_pg_listener_relname,
-							   F_NAMEEQ,
-							   PointerGetDatum(listen_name));
-		sRel = heap_beginscan(lRel, SnapshotNow, 1, &key);
-	}
-	else
-		sRel = heap_beginscan(lRel, SnapshotNow, 0, (ScanKey) NULL);
-
-	while ((lTuple = heap_getnext(sRel, ForwardScanDirection)) != NULL)
-	{
-		d = heap_getattr(lTuple, Anum_pg_listener_pid, tdesc, &isnull);
-		pid = DatumGetInt32(d);
-		if ((pid == ourpid) || (kill(pid, SIGTSTP) == 0))
-			count++;
-	}
-	heap_endscan(sRel);
-
-	heap_close(lRel, AccessShareLock);
-
-	return count;
-}
diff --git a/contrib/miscutil/misc_utils.h b/contrib/miscutil/misc_utils.h
deleted file mode 100644
index f4577f49de..0000000000
--- a/contrib/miscutil/misc_utils.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef MISC_UTILS_H
-#define MISC_UTILS_H
-
-int			backend_pid(void);
-int			unlisten(char *relname);
-int			max(int x, int y);
-int			min(int x, int y);
-int			active_listeners(text *relname);
-
-#endif
diff --git a/contrib/miscutil/misc_utils.sql.in b/contrib/miscutil/misc_utils.sql.in
deleted file mode 100644
index 39d4fd51e9..0000000000
--- a/contrib/miscutil/misc_utils.sql.in
+++ /dev/null
@@ -1,46 +0,0 @@
--- misc_utils.sql --
---
--- SQL code to define misc functions.
---
--- Copyright (c) 1998, Massimo Dal Zotto <dz@cs.unitn.it>
---
--- This file is distributed under the GNU General Public License
--- either version 2, or (at your option) any later version.
-
--- Return the pid of the backend.
---
-create function backend_pid() returns int4
-  as 'MODULE_PATHNAME'
-  language 'C';
-
--- Unlisten from a relation.
---
-create function "unlisten"(name) returns int4
-  as 'MODULE_PATHNAME'
-  language 'C';
-
--- Unlisten from all relations for this backend.
---
-create function "unlisten"() returns int4
-  as 'select "unlisten"(''*'')'
-  language 'sql';
-
--- min(x,y)
---
-create function min(int4,int4) returns int4
-  as 'MODULE_PATHNAME'
-  language 'C';
-
--- max(x,y)
---
-create function max(int4,int4) returns int4
-  as 'MODULE_PATHNAME'
-  language 'C';
-
--- Return the number of active listeners on a relation
---
-create function active_listeners(text) returns int4
-  as 'MODULE_PATHNAME'
-  language 'C';
-
--- end of file
diff --git a/contrib/mysql/README b/contrib/mysql/README
deleted file mode 100644
index 5511df6c67..0000000000
--- a/contrib/mysql/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Here are two conversion utilities for MySQL dumps.  Use the one you prefer.
-
-The most recent version of my2pg.pl can be obtained from:
-
-	http://ziet.zhitomir.ua/~fonin/code/
-
-Another tool, mysql2pgsql,  can be found at:
-
-	http://www.rot13.org/~dpavlin/sql.html
diff --git a/contrib/mysql/my2pg.pl b/contrib/mysql/my2pg.pl
deleted file mode 100755
index 9ceaca46f5..0000000000
--- a/contrib/mysql/my2pg.pl
+++ /dev/null
@@ -1,948 +0,0 @@
-#!/usr/bin/perl
-
-#
-# My2Pg: MySQL to PostgreSQL dump conversion utility
-#
-# (c) 2000,2001 Maxim Rudensky	<fonin@ziet.zhitomir.ua>
-# (c) 2000 Valentine Danilchuk	<valdan@ziet.zhitomir.ua>
-# All right reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-# This product includes software developed by the Max Rudensky
-# and its contributors.
-# 4. Neither the name of the author nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $My2pg: my2pg.pl,v 1.24 2001/12/06 19:32:20 fonin Exp $
-# $Id: my2pg.pl,v 1.8 2002/04/24 01:42:29 momjian Exp $
-
-# TODO:
-# + Handle SETs
-#   - LIKE implementation
-#   - memory use optimisation in SET_output function
-#   - raw integer values as input values must be OK
-# - Use autoconf & automake to auto-build makefiles
-
-#
-# $Log: my2pg.pl,v $
-# Revision 1.8  2002/04/24 01:42:29  momjian
-# Update to my2pg 1.24.
-#
-# Revision 1.24  2002/04/20 14:15:43  fonin
-# Patch by Felipe Nievinski <fnievinski@terra.com.br>.
-# A table I was re-creating had a composite primary key, and I was using
-# the -d switch to maintain the table and column names
-# adding double quotes around them.
-#
-# The SQL code generated was something like this:
-#
-# CREATE TABLE "rinav" (
-#    "UnidadeAtendimento" INT8 DEFAULT '0' NOT NULL,
-#    "NumeroRinav" INT8 DEFAULT '0' NOT NULL,
-# -- ...
-#    PRIMARY KEY ("UnidadeAtendimento"," NumeroRinav")
-# );
-#
-# Please note the space inside the second column name string in the PK
-# definition. Because of this PostgreSQL was not able to create the table.
-#
-# FIXED.
-#
-# Revision 1.23  2002/02/07 22:13:52  fonin
-# Bugfix by Hans-Juergen Schoenig <hs@cybertec.at>: additional space after
-# FLOAT8 is required.
-#
-# Revision 1.22  2001/12/06 19:32:20  fonin
-# Patch: On line 594 where you check for UNIQUE, I believe the regex should try
-# and match 'UNIQUE KEY'. Otherwise it outputs no unique indexes for the
-# postgres dump.
-# Thanks to Brad Hilton <bhilton@vpop.net>
-#
-# Revision 1.21  2001/08/25 18:55:28  fonin
-# Incorporated changes from Yunliang Yu <yu@math.duke.edu>:
-# - By default table & column names are not quoted; use the new
-#   "-d" option if you want to,
-# - Use conditional substitutions to speed up and preserve
-#   the data integrity.
-# Fixes by Max:
-# - timestamps conversion fix. Shouldn't break now matching binary data and
-# strings.
-#
-# Revision 1.21  2001/07/23 03:04:39  yu
-# Updates & fixes by Yunliang Yu <yu@math.duke.edu>
-# . By default table & column names are not quoted; use the new
-#   "-d" option if you want to,
-# . Use conditional substitutions to speed up and preserve
-#   the data integrity.
-#
-# Revision 1.20  2001/07/05 12:45:05  fonin
-# Timestamp conversion enhancement from Joakim Lemström <jocke@bytewize.com>
-#
-# Revision 1.19  2001/05/07 19:36:38  fonin
-# Fixed a bug in quoting  PRIMARY KEYs, KEYs and UNIQUE indexes with more than 2 columns. Thanks to Jeff Waugh <jaw@ic.net>.
-#
-# Revision 1.18  2001/03/06 22:25:40  fonin
-# Documentation up2dating.
-#
-# Revision 1.17  2001/03/04 13:01:50  fonin
-# Fixes to make work it right with MySQL 3.23 dumps. Tested on mysqldump 8.11.
-# Also, AUTO_INCREMENT->SERIAL fields no more have DEFAULT and NOT NULL 
-# definitions.
-#
-# Revision 1.16  2001/02/02 08:15:34  fonin
-# Sequences should be created BEFORE creating any objects \nthat depends on it.
-#
-# Revision 1.15  2001/01/30 10:13:36  fonin
-# Re-released under BSD-like license.
-#
-# Revision 1.14  2000/12/18 20:55:13  fonin
-# Better -n implementation.
-#
-# Revision 1.13  2000/12/18 15:26:33  fonin
-# Added command-line options. -n forces *CHAR DEFAULT '' NOT NULL to be 
-# converted to *CHAR NULL.
-# AUTO_INCREMENT fields converted not in SERIAL but in 
-# INT* NOT NULL DEFAULT nextval('seqname').
-# Documentation refreshed.
-# Dump enclosed in single transaction from now.
-#
-# Revision 1.12  2000/12/14 20:57:15  fonin
-# Doublequotation bug fixed (in CREATE INDEX ON TABLE (field1,field2))
-#
-# Revision 1.10  2000/11/27 14:18:22  fonin
-# Fixed bug - occasionaly was broken CREATE SEQUENCE generation
-#
-# Revision 1.8  2000/11/24 15:24:16  fonin
-# TIMESTAMP fix: MySQL output YYYYMMDDmmhhss to YYYYMMDD mmhhss
-#
-# Revision 1.7  2000/11/22 23:04:41  fonin
-# TIMESTAMP field fix. Better doublequoting. Splitting output dump
-# into 2 transactions - create/load/indexing first, sequence setvals then. 
-# Added POD documentation.
-#
-#
-
-use Getopt::Std;
-
-my %opts;		# command line options
-my $chareg='';		# CHAR conversion regexps
-my $dq=''; # double quote
-
-# parse command line
-getopts('nhd',\%opts);
-
-# output syntax
-if($opts{h} ne '') {
-    usage();
-    exit;
-}
-
-# convert CHAR types from NOT NULL DEFAULT '' to NULL
-if($opts{n} ne '') {
-    $chareg='\s*?(default\s*?\'\')*?\s*?not\s*?null';
-}
-# want double quotes
-if($opts{d} ne '') {
-    $dq='"';
-}
-
-$|=1;
-
-print("------------------------------------------------------------------");
-print("\n-- My2Pg 1.24 translated dump");
-print("\n--");
-print("\n------------------------------------------------------------------");
-
-print("\n\nBEGIN;\n\n\n");
-
-my %index;		# contains array of CREATE INDEX for each table
-my %seq;		# contains CREATE SEQUENCE for each table
-my %primary;		# contains primary (eg SERIAL) fields for each table
-my %identifier;		# contains generated by this program identifiers
-my $j=-1;		# current position in $index{table}
-my @check;		# CHECK constraint for current
-
-# generating full path to libtypes.c
-my $libtypesource='libtypes.c';
-my $libtypename=`pwd`;
-chomp($libtypename);
-$libtypename.='/libtypes.so';
-
-# push header to libtypes.c
-open(LIBTYPES,">$libtypesource");
-print LIBTYPES "/******************************************************";
-print LIBTYPES "\n * My2Pg \$Revision: 1.8 $ \translated dump";
-print LIBTYPES "\n * User types definitions";
-print LIBTYPES "\n ******************************************************/";
-print LIBTYPES "\n\n#include <postgres.h>\n";
-print LIBTYPES "\n#define ADD_COMMA if(strcmp(result,\"\")!=0) strcat(result,\",\")\n";
-
-# reading STDIN...
-my $tabledef=0; # we are outside a table definition
-while (<>) {
-
-	if(!$tabledef && /^CREATE TABLE \S+/i){
-		$tabledef=1;
-	}elsif($tabledef && /^\);/i){ # /^\w/i
-		$tabledef=0;
-	}
-	
-# Comments start with -- in SQL
-    if(/^#/) {# !/insert into.*\(.*#.*\)/i, in mysqldump output
-	s/#/--/;
-    }
-
-  if($tabledef){##################################
-# Convert numeric types
-    s/tinyint\(\d+\)/INT2/i;
-    s/smallint\(\d+\)/INT2/i;
-    s/mediumint\(\d+\)/INT4/i;
-    s/bigint\(\d+\)/INT8/i;
-    s/int\(\d+\)/INT4/i;
-    s/float(\(\d+,\d*\))/DECIMAL$1/i;
-    s/double precision/FLOAT8 /i;
-    s/([\W])double(\(\d+,\d*\))/$1DECIMAL$2/i;
-    s/([\W])double[\W]/$1FLOAT8 /i;
-    s/([\W])real[\W]/$1FLOAT8 /i;
-    s/([\W])real(\(\d+,\d*\))/$1DECIMAL$2/i;
-    
-# Convert string types
-    s/\w*blob$chareg/text/i;
-    s/mediumtext$chareg/text/i;
-    s/tinytext$chareg/text/i;
-    s/\stext\s+not\s+null/ TEXT DEFAULT '' NOT NULL/i;
-    s/(.*?char\(.*?\))$chareg/$1/i;
-
-# Old and New are reserved words in Postgres    
-    s/^(\s+)Old /${1}MyOld /;
-    s/^(\s+)New /${1}MyNew /;
-
-# Convert DATE types
-    s/datetime/TIMESTAMP/;
-    s/timestamp\(\d+\)/TIMESTAMP/i;
-    s/ date / DATE /i;
-    s/,(\d{4})(\d{2})(\d{2}),/,'$1-$2-$3 00:00:00',/g;
-
-# small hack - convert "default" to uppercase, because below we 
-# enclose all lowercase words in double quotes
-    s/default/DEFAULT/;
-
-# Change all AUTO_INCREMENT fields to SERIAL ones with a pre-defined sequence
-    if(/([\w\d]+)\sint.*auto_increment/i) {
-	$tmpseq=new_name("$table_name"."_"."$+"."_SEQ",28);
-	$seq{$table_name}=$tmpseq;
-	$primary{$table_name}=$+;
-	s/(int.*?) .*AUTO_INCREMENT/$1 DEFAULT nextval\('$tmpseq'\)/i;
-	#s/(int.*?)DEFAULT\s*?'.*?'(.*?)AUTO_INCREMENT/$1$2DEFAULT nextval\('$tmpseq'\)/i;
-    }
-
-# convert UNSIGNED to CHECK constraints
-    if(/^\s+?([\w\d_]+).*?unsigned/i) {
-	$check.=",\n  CHECK ($dq$1$dq>=0)";
-    }
-    s/unsigned//i;
-
-# Limited ENUM support - little heuristic
-    s/enum\('N','Y'\)/BOOL/i;
-    s/enum\('Y','N'\)/BOOL/i;
-# ENUM support
-    if(/^\s+?([\w\d_]+).*?enum\((.*?)\)/i) {
-	my $enumlist=$2;
-	my @item;
-	$item[0]='';
-	while($enumlist=~s/'([\d\w_]+)'//i) {
-	    $item[++$#item]=$1;
-	}
-# forming identifier name
-	$typename=new_name('enum_'.$table_name.'_'.$item[1],28);
-#	$typename=lc('enum_'.$table_name.'_'.$item[1]);
-# creating input type function
-	my $func_in="
-int2* $typename"."_in (char *str) {
-    int2* result;
-
-    if(str==NULL)
-	return NULL;
-    
-    result=(int2*)palloc(sizeof(int2));
-    *result=-1;";
-	for(my $i=0;$i<=$#item;$i++) {
-	    $func_in.="
-    if(strcmp(str,\"$item[$i]\")==0) {
-	*result=$i;
-    }";
-	}
-	$func_in.="
-    if(*result == -1) {
-	elog(ERROR,\"$typename"."_in: incorrect input value\");
-	return NULL;
-    }
-    return (result);
-}\n";
-	$types.="\n---";
-	$types.="\n--- Types for table ".uc($table_name);
-	$types.="\n---\n";
-	print LIBTYPES "\n/*";
-	print LIBTYPES "\n * Types for table ".uc($table_name);
-	print LIBTYPES "\n */\n";
-
-	$types.="\nCREATE FUNCTION $typename"."_in (opaque)
-	RETURNS $typename
-	AS '$libtypename'
-	LANGUAGE 'c'
-	WITH (ISCACHABLE);\n";
-
-# creating output function
-	my $func_out="
-char* $typename"."_out (int2 *outvalue) {
-    char* result;
-
-    if(outvalue==NULL)
-	return NULL;
-
-    result=(char*)palloc(10);
-    switch (*outvalue) {";
-	for(my $i=0;$i<=$#item;$i++) {
-	    $func_out.="
-	case $i:
-	    strcpy(result,\"$item[$i]\");
-	    break;";
-	}
-	$func_out.="
-	default	 :
-	    elog(ERROR,\"$typename"."_out: incorrect stored value\");
-	    return NULL;
-	    break;
-    }
-    return result;
-}\n";
-	$func_out.="\nbool $typename"."_eq(int2* a, int2* b) {
-    return (*a==*b);
-}
-
-bool $typename"."_ne(int2* a, int2* b) {
-    return (*a!=*b);
-}
-
-bool $typename"."_lt(int2* a, int2* b) {
-    return (*a<*b);
-}
-
-bool $typename"."_le(int2* a, int2* b) {
-    return (*a<=*b);
-}
-
-bool $typename"."_gt(int2* a, int2* b) {
-    return (*a>*b);
-}
-
-bool $typename"."_ge(int2* a, int2* b) {
-    return (*a>=*b);
-}\n";
-
-	$types.="\nCREATE FUNCTION $typename"."_out (opaque)
-	RETURNS opaque
-	AS '$libtypename'
-	LANGUAGE 'c'
-	WITH (ISCACHABLE);\n";
-
-	$types.="\nCREATE TYPE $typename (
-	internallength = 2,
-	input = $typename\_in,
-	output = $typename\_out
-);\n";
-
-	$types.="\nCREATE FUNCTION $typename"."_eq ($typename,$typename)
-	RETURNS bool
-	AS '$libtypename'
-	LANGUAGE 'c';
-
-CREATE FUNCTION $typename"."_lt ($typename,$typename)
-	RETURNS bool
-	AS '$libtypename'
-	LANGUAGE 'c';
-
-CREATE FUNCTION $typename"."_le ($typename,$typename)
-	RETURNS bool
-	AS '$libtypename'
-	LANGUAGE 'c';
-
-CREATE FUNCTION $typename"."_gt ($typename,$typename)
-	RETURNS bool
-	AS '$libtypename'
-	LANGUAGE 'c';
-
-CREATE FUNCTION $typename"."_ge ($typename,$typename)
-	RETURNS bool
-	AS '$libtypename'
-	LANGUAGE 'c';
-
-CREATE FUNCTION $typename"."_ne ($typename,$typename)
-	RETURNS bool
-	AS '$libtypename'
-	LANGUAGE 'c';
-
-CREATE OPERATOR < (
-	leftarg = $typename,
-	rightarg = $typename,
---	negator = >=,
-	procedure = $typename"."_lt
-);
-
-CREATE OPERATOR <= (
-	leftarg = $typename,
-	rightarg = $typename,
---	negator = >,
-	procedure = $typename"."_le
-);
-
-CREATE OPERATOR = (
-	leftarg = $typename,
-	rightarg = $typename,
-	commutator = =,
---	negator = <>,
-	procedure = $typename"."_eq
-);
-
-CREATE OPERATOR >= (
-	leftarg = $typename,
-	rightarg = $typename,
-	negator = <,
-	procedure = $typename"."_ge
-);
-
-CREATE OPERATOR > (
-	leftarg = $typename,
-	rightarg = $typename,
-	negator = <=,
-	procedure = $typename"."_gt
-);
-
-CREATE OPERATOR <> (
-	leftarg = $typename,
-	rightarg = $typename,
-	negator = =,
-	procedure = $typename"."_ne
-);\n";
-
-	print LIBTYPES $func_in;
-	print LIBTYPES $func_out;
-	s/enum\(.*?\)/$typename/i;
-    }
-
-# SET support
-    if(/^\s+?([\w\d_]+).*?set\((.*?)\)/i) {
-	my $setlist=$2;
-	my @item;
-	$item[0]='';
-	my $maxlen=0;	# maximal string length
-	while($setlist=~s/'([\d\w_]+)'//i) {
-	    $item[++$#item]=$1;
-	    $maxlen+=length($item[$#item])+1;
-	}
-	$maxlen+=1;
-	my $typesize=int($#item/8);
-	if($typesize<2) {
-	    $typesize=2;
-	}
-	$internalsize=$typesize;
-	$typesize='int'.$typesize;
-#	$typename=lc('set_'.$table_name.'_'.$item[1]);
-	$typename=new_name('set_'.$table_name.'_'.$item[1],28);
-# creating input type function
-	my $func_in="
-$typesize* $typename"."_in (char *str) {
-    $typesize* result;
-    char* token;
-
-    if(str==NULL)
-	return NULL;
-
-    result=($typesize*)palloc(sizeof($typesize));
-    *result=0;
-    if(strcmp(str,\"\")==0)
-	return result;
-    for(token=strtok(str,\",\");token!=NULL;token=strtok(NULL,\",\")) {";
-	for(my $i=0,my $j=1;$i<=$#item;$i++,$j*=2) {
-	    $func_in.="
-	if(strcmp(token,\"$item[$i]\")==0) {
-	    *result|=$j;
-	    continue;
-	}";
-	}
-	$func_in.="
-    }
-
-    if(*result == 0) {
-	elog(ERROR,\"$typename"."_in: incorrect input value\");
-	return NULL;
-    }
-    return (result);
-
-}\n";
-	$types.="\n---";
-	$types.="\n--- Types for table ".uc($table_name);
-	$types.="\n---\n";
-	print LIBTYPES "\n/*";
-	print LIBTYPES "\n * Types for table ".uc($table_name);
-	print LIBTYPES "\n */\n";
-
-	$types.="\nCREATE FUNCTION $typename"."_in (opaque)
-	RETURNS $typename
-	AS '$libtypename'
-	LANGUAGE 'c';\n";
-
-# creating output function
-	my $func_out="
-char* $typename"."_out ($typesize *outvalue) {
-    char* result;
-    int i;
-
-    if(outvalue==NULL)
-	return NULL;
-
-    result=(char*)palloc($maxlen);
-    strcpy(result,\"\");
-    for(i=1;i<=2 << (sizeof(int2)*8);i*=2) {
-	switch (*outvalue & i) {";
-	for(my $i=0,$j=1;$i<=$#item;$i++,$j*=2) {
-	    $func_out.="
-	case $j:";
-	    if($item[$i] ne '') {
-		$func_out.="ADD_COMMA;";
-	    }
-	    $func_out.="strcat(result,\"$item[$i]\");
-	    break;";
-	}
-	$func_out.="
-	default	 :
-	    break;
-	}
-    }
-    
-    return result;
-}\n";
-	$func_out.="\nbool $typename"."_eq($typesize* a, $typesize* b) {
-    return (*a==*b);
-}
-
-$typesize find_in_set($typesize *a, $typesize *b) {
-    int i;
-    
-    for(i=1;i<=sizeof($typesize)*8;i*=2) {
-	if(*a & *b) {
-	    return 1;
-	}
-    }
-    return 0;
-}
-
-\n";
-
-	$types.="\nCREATE FUNCTION $typename"."_out (opaque)
-	RETURNS opaque
-	AS '$libtypename'
-	LANGUAGE 'c';\n";
-
-	$types.="\nCREATE TYPE $typename (
-	internallength = $internalsize,
-	input = $typename\_in,
-	output = $typename\_out
-);\n";
-
-	$types.="\nCREATE FUNCTION $typename"."_eq ($typename,$typename)
-	RETURNS bool
-	AS '$libtypename'
-	LANGUAGE 'c';
-
-CREATE FUNCTION find_in_set ($typename,$typename)
-	RETURNS bool
-	AS '$libtypename'
-	LANGUAGE 'c';
-
-CREATE OPERATOR = (
-	leftarg = $typename,
-	rightarg = $typename,
-	commutator = =,
-	procedure = $typename"."_eq
-);
-
-CREATE OPERATOR <> (
-	leftarg = $typename,
-	rightarg = $typename,
-	commutator = <>,
-	negator = =,
-	procedure = $typename"."_eq
-);
-
-\n";
-
-	print LIBTYPES $func_in;
-	print LIBTYPES $func_out;
-	s/set\(.*?\)/$typename/i;
-    }
-
-# Change multy-field keys to multi-field indices
-# MySQL Dump usually ends the CREATE TABLE statement like this:
-# CREATE TABLE bids (
-#   ...
-#   PRIMARY KEY (bids_id),
-#   KEY offer_id (offer_id,user_id,the_time),
-#   KEY bid_value (bid_value)
-# );
-# We want to replace this with smth like
-# CREATE TABLE bids (
-#   ...
-#   PRIMARY KEY (bids_id),
-# );
-#   CREATE INDEX offer_id ON bids (offer_id,user_id,the_time);
-#   CREATE INDEX bid_value ON bids (bid_value);
-    if (s/CREATE TABLE (.*) /CREATE TABLE $dq$1$dq /i) {
-	if($oldtable ne $table_name) {
-	    $oldtable=$table_name;
-	    $j=-1;
-	    $check='';
-
-	    if($seq{$table_name} ne '') {
-		print "\n\n--";
-		print "\n-- Sequences for table ".uc($table_name);
-		print "\n--\n";
-		print "\nCREATE SEQUENCE ".$seq{$table_name}.";\n\n";
-	    }
-
-	    print $types;
-	    $types='';
-	    $dump=~s/,\n\).*;/\n\);/gmi;
-# removing table options after closing bracket:
-# ) TYPE=ISAM PACK_KEYS=1;
-	    $dump=~s/\n\).*/\n\);/gmi;
-	    print $dump;
-	    $dump='';
-	}
-	$table_name=$1;
-    }
-
-# output CHECK constraints instead UNSIGNED modifiers
-    if(/PRIMARY KEY \((.*)\)/i) {
-	my $tmpfld=$1;
-	$tmpfld=~s/,/","/g if $dq;
-	$tmpfld=~s/ //g;
-	s/PRIMARY KEY (\(.*\))/PRIMARY KEY \($dq$tmpfld$dq\)/i;
-	s/(PRIMARY KEY \(.*\)).*/$1$check\n/i;
-    }
-    
-    if(/^\s*KEY ([\w\d_]+)\s*\((.*)\).*/i) {
-	my $tmpfld=$2; my $ky=$1;
-	$tmpfld=~s/\s*,\s*/","/g if $dq;
-	$index{$table_name}[++$j]="CREATE INDEX ${ky}_$table_name\_index ON $dq$table_name$dq ($dq$tmpfld$dq);";
-    }
-    if(/^\s*UNIQUE.*?([\w\d_]+)\s*\((.*)\).*/i) {
-	my $tmpfld=$2; my $ky=$1;
-	$tmpfld=~s/,/","/g if $dq;
-	$index{$table_name}[++$j]="CREATE UNIQUE INDEX ${ky}_$table_name\_index ON $dq$table_name$dq ($dq$tmpfld$dq);";
-    }
-    s/^\s*UNIQUE (.+).*(\(.*\)).*\n//i;
-    s/^\s*KEY (.+).*(\(.*\)).*\n//i;
-    
-    if($dq && !/^\s*(PRIMARY KEY|UNIQUE |KEY |CREATE TABLE |\);)/i){
-    	s/\s([A-Za-z_\d]+)\s/ $dq$+$dq /;
-    }
-  } ####if($tabledef)###############################
-
-    if($dq && !s/INSERT INTO\s+?(.*?)\s+?/INSERT INTO $dq$1$dq /i) {
-# Quote lowercase identifiers in double quotes
-	#while(!/^--/ && s/\s([A-Za-z_\d]+[a-z][A-Za-z_\d]*)\s/ $dq$+$dq /) {;}
-    }
-
-# Fix timestamps
-    s/'0000-00-00/'0001-01-01/g;
-# may work wrong !!!
-    s/([,(])00000000000000([,)])/$1'00010101 000000'$2/g;
-    s/([,(])(\d{8})(\d{6})([,)])/$1'$2 $3'$4/g;
-    s/([,(])(\d{4})(\d{2})(\d{2})([,)])/$1'$2-$3-$4 00:00:00'$5/g;
-#<Hackzone> ---------------------------------------------------
-#</Hackzone> --------------------------------------------------
-    $dump.=$_;
-}
-
-if($seq{$table_name} ne '') {
-    print "\n\n--";
-    print "\n-- Sequences for table ".uc($table_name);
-    print "\n--\n";
-    print "\nCREATE SEQUENCE ".$seq{$table_name}.";\n\n";
-}
-print $types;
-$dump=~s/,\n\).*;/\n\);/gmi;
-$dump=~s/\n\).*/\n\);/gmi;
-print $dump;
-
-# Output indices for tables
-while(my($table,$ind)=each(%index)) {
-    print "\n\n--";
-    print "\n-- Indexes for table ".uc($table);
-    print "\n--\n";
-    for(my $i=0;$i<=$#{$ind};$i++) {
-	print "\n$ind->[$i]";
-    }
-
-}
-
-while(my($table,$s)=each(%seq)) {
-    print "\n\n--";
-    print "\n-- Sequences for table ".uc($table);
-    print "\n--\n";
-
-    # setting SERIAL sequence values right    
-    if($primary{$table} ne '') {
-	print "\nSELECT SETVAL('".$seq{$table}."',(select case when max($dq".$primary{$table}."$dq)>0 then max($dq".$primary{$table}."$dq)+1 else 1 end from $dq$table$dq));";
-    }
-}
-
-print("\n\nCOMMIT;\n");
-close(LIBTYPES);
-
-open(MAKE,">Makefile");
-print MAKE "#
-# My2Pg \$Revision: 1.8 $ \translated dump
-# Makefile
-#
-
-all: libtypes.so
-
-libtypes.o: libtypes.c
-	gcc -c -fPIC -g -O libtypes.c
-libtypes.so: libtypes.o
-	ld -Bshareable -o libtypes.so libtypes.o";
-close(MAKE);
-
-#
-# Function generates unique identifier
-# Args   : template name, max length
-# Globals: %identifier
-#
-sub new_name() {
-    my $name=lc(shift @_);
-    my $len=shift @_;
-
-# truncate long names
-    if(length($name)>$len) {
-	$name=~s/(.{$len}).*/$1/i;
-    }
-
-# find reserved identifiers
-    if($identifier{$name}!=1) {
-    	$identifier{$name}=1;
-	return $name;
-    }
-    else {
-	for(my $i=1,my $tmpname=$name.$i;$identifier{$tmpname}!=1;) {
-	    $tmpname=$name.$i
-	}
-	$identifier{$tmpname}=1;
-	return $tmpname;
-    }
-
-    die "Error during unique identifier generation :-(";
-}
-
-sub usage() {
-print <<EOF
-my2pg - MySQL to PostgreSQL database dump converter
-
-Copyright (c) 2000 Max Rudensky		<fonin\@ziet.zhitomir.ua>
-Copyright (c) 2000 Valentine Danilchuk	<valdan\@ziet.zhitomir.ua>
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-code source for license details.
-
-SYNTAX:
-    my2pg [-hnd]
-
-OPTIONS:
-    h		- this help
-    n		- convert *CHAR NOT NULL DEFAULT '' types to *CHAR NULL
-    d       - double quotes around table and column names
-EOF
-;
-}
-
-
-=head1 NAME
-
-my2pg - MySQL -> PostgreSQL dump conversion utility.
-
-=head1 SYNTAX
-
-	mysqldump db | ./my2pg.pl [-n] > pgsqldump.sql
-	vi libtypes.c
-	make
-	psql database < pgsqldump.txt
-where
-
-=over 4
-
-=item B<pgsqldump.sql>
-
-- file suitable for loading into PostgreSQL.
-
-=item B<libtypes.c>
-
-- C source for emulated MySQL types (ENUM, SET) generated by B<my2pg>
-
-=back
-
-=head1 OVERVIEW
-
-B<my2pg> utility attempts to convert MySQL database dump to Postgres's one.
-B<my2pg> performs such conversions:
-
-=over 4
-
-=item Type conversion.
-
-It tries to find proper Postgres 
-type for each column.
-Unknown types are silently pushing to output dump;
-ENUM and SET types implemented via user types 
-(C source for such types can be found in 
-B<libtypes.c> file);
-
-=item Identifiers double-quotation.
-
-All column and table 
-names should be enclosed to double-quotes to prevent 
-interferension with reserved words;
-
-=item Converting
-
-AUTO_INCREMENT fields to SERIAL. Actually, creating the sequence and 
-setting default value to nextval('seq'), well, you know :)
-
-=item Converting
-
-KEY(field) to CREATE INDEX i_field on table (field);
-
-=item The same
-
-for UNIQUE keys;
-
-=item Indices
-
-are creating AFTER rows insertion (to speed up the load);
-
-=item Translates '#'
-
-MySQL comments to ANSI SQL '--'
-
-=back
-
-It encloses dump in transaction block to prevent single errors 
-during data load.
-
-=head1 COMMAND-LINE OPTIONS
-
-My2pg takes the following command-line options:
-
-=over 2
-
-=item -n
-
-Convert *CHAR DEFAULT '' NOT NULL types to *CHAR NULL.
-Postgres can't load empty '' strings in NOT NULL fields.
-
-=item -d
-
-Add double quotes around table and column names
-
-=item -h
-
-Show usage banner.
-
-=back
-
-=head1 SIDE EFFECTS
-
-=over 4
-
-=item creates
-
-file B<libtypes.c> in current directory 
-overwriting existed file without any checks;
-
-=item the same
-
-for Makefile.
-
-=back
-
-=head1 BUGS
-
-This program is still beta. Testers wanted.
-Known bugs are:
-
-=over 4
-
-=item Poor doublequotation.
-
-All identifiers such as table and column names should be enclosed in double 
-quotes. Program can't handle upper-case identifiers, 
-like DBA. Lower-case identifiers are OK.
-
-=item SET type emulation is not full. LIKE operation on 
-
-SETs, raw integer input values should be implemented
-
-=item B<Makefile> generated during output is 
-platform-dependent and surely works only on 
-Linux/gcc (FreeBSD/gcc probably works as well - not tested)
-
-=item Generated B<libtypes.c> contain line
-
-	#include <postgres.h>
-
-This file may be located not in standard compiler 
-include path, you need to check it before compiling.
-
-=back
-
-=head1 AUTHORS
-
-B<(c) 2000 Maxim V. Rudensky	 (fonin@ziet.zhitomir.ua)>
-B<(c) 2000 Valentine V. Danilchuk (valdan@ziet.zhitomir.ua)>
-
-=head1 CREDITS
-
-Jeff Waugh <jaw@ic.net>
-Joakim Lemström <jocke@bytewize.com> || <buddyh19@hotmail.com>
-Yunliang Yu <yu@math.duke.edu>
-Brad Hilton <bhilton@vpop.net>
-
-=head1 LICENSE
-
-B<BSD>
-
-=cut
diff --git a/contrib/mysql/mysql2pgsql b/contrib/mysql/mysql2pgsql
deleted file mode 100755
index a51dfde53e..0000000000
--- a/contrib/mysql/mysql2pgsql
+++ /dev/null
@@ -1,283 +0,0 @@
-# -*- perl -*-
-# mysql2pgsql
-# Take a MySQL schema dump and turn it into SQL92 and PostgreSQL form.
-# Thomas Lockhart, (c) 2000, PostgreSQL Inc.
-# Thanks to Tim Perdue at SourceForge.Net for testing and feedback.
-#
-
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-use IO::File;
-use Getopt::Long;
-
-my $progname = "mysql2pgsql";
-my $version = "0.3";
-
-GetOptions("debug!", "verbose!", "version", "path=s", "help", "data!");
-
-my $debug = $opt_debug || 0;
-my $verbose = $opt_verbose || 0;
-my $pathfrom = $opt_path || "";
-my $nodata = (! $opt_data);
-
-$pathfrom = "$pathfrom/" if ($pathfrom =~ /.*[^\/]$/);
-
-print "$0: $progname version $version\n"
-    if ($opt_version || $opt_help);
-print "\t(c) 2000 Thomas Lockhart PostgreSQL Inc.\n"
-    if ($opt_version && $opt_verbose || $opt_help);
-
-if ($opt_help) {
-    print "$0 --verbose --version --help --path=dir --nodata infile ...\n";
-    exit;
-}
-
-while (@ARGV) {
-    my $ostem;
-	my $oname;
-	my $pname;
-	my @xargs;
-
-    $iname = shift @ARGV;
-    $ostem = $iname;
-    $ostem = $1 if ($ostem =~ /.+\/([^\/]+)$/);
-    $ostem = $1 if ($ostem =~ /(.+)[.][^.]*$/);
-
-    $oname = "$ostem.sql92";
-    $pname = "$ostem.init";
-
-	@xargs = ($iname, $oname);
-	push @xargs, $pname unless ($nodata);
-
-    print "@xargs\n" if ($debug);
-
-    TransformDumpFile($iname, $oname, $pname);
-}
-
-exit;
-
-sub TransformDumpFile {
-    local ($iname, $oname, $pname) = @_;
-    local @dlines;
-    local @slines;
-    local @plines;
-    local @tables; # list of tables created
-    local %pkeys;
-    local %pseqs;
-    local %sequences;
-
-    open(IN, "<$iname") || die "Unable to open file $iname";
-
-    while (<IN>) {
-		chomp;
-		push @dlines, $_;
-    }
-
-    print("Calling CreateSchema with $#dlines lines\n") if ($debug);
-    @slines = CreateSchema(@dlines);
-
-    open(OUT, ">$oname") || die "Unable to open output file $oname";
-
-    foreach (@slines) {
-		print "> $_" if ($debug);
-		print OUT "$_";
-    }
-    close(OUT);
-
-    return if (! defined($pname));
-
-    @plines = PopulateSchema(@tables);
-
-    open(OUT, ">$pname") || die "Unable to open output file $pname";
-
-    foreach (@plines) {
-		print "> $_" if ($debug);
-		print OUT "$_";
-    }
-    close(OUT);
-}
-
-sub PopulateSchema {
-    local @tables = @_;
-    local @out;
-    local $pkey;
-    local $pseq;
-
-    foreach (@tables) {
-		$table = $_;
-		$tpath = "$pathfrom$table";
-
-		print "Table is $table\n" if ($debug);
-		push @out, "\n";
-		push @out, "copy $table from '$tpath.txt';\n";
-		if (defined($pkeys{$table})) {
-			foreach ($pkeys{$table}) {
-				$pkey = $_;
-				$pseq = $pseqs{$table};
-
-				print "Key for $table is $pkey on $pseq\n" if ($debug);
-
-#		//push @out, "\$value = select max($pkey) from $table;\n";
-				push @out, "select setval ('$pseq', (select max($pkey) from $table));\n";
-			}
-		}
-    }
-
-    return @out;
-}
-
-sub CreateSchema {
-    local @lines = @_;
-    local @out;
-
-#    undef $last;
-    local %knames;
-
-    push @out, "--\n";
-    push @out, "-- Generated from mysql2pgsql\n";
-    push @out, "-- (c) 2000, Thomas Lockhart, PostgreSQL Inc.\n";
-    push @out, "--\n";
-    push @out, "\n";
-
-    while (@lines) {
-		$_ = shift @lines;
-		print "< $_\n" if ($debug);
-		# Replace hash comments with SQL9x standard syntax
-		$_ = "-- $1" if (/^[\#](.*)/);
-
-		# Found a CREATE TABLE statement?
-		if (/(create\s+table)\s+(\w+)\s+([(])\s*$/i) {
-			$table = $2;
-			$table = "\"$1\"" if ($table =~ /^(user)$/);
-			push @tables, $table;
-			push @tabledef, "create table $table (";
-#	push @out, "$_\n";
-
-			while (@lines) {
-				$_ = shift @lines;
-				print "< $_\n" if ($debug);
-
-				# Replace int(11) with SQL9x standard syntax
-				while (/int\(\d*\)/gi) {
-					$_ = "$`integer$'";
-				}
-
-				# Replace float(10,2) with SQL9x standard syntax
-				while (/(float)\((\d+),\s*(\d+)\)/gi) {
-					$_ = "$`$1($2)$'";
-				}
-
-				# Replace smallinteger with SQL9x syntax
-				while (/smallinteger/gi) {
-					$_ = "$`integer$'";
-				}
-
-				# Replace mediumtext with PostgreSQL syntax
-				while (/(longtext|mediumtext|blob|largeblob)/gi) {
-					$_ = "$`text$'";
-				}
-
-				# Replace integer ... auto_increment with PostgreSQL syntax
-				while (/(\s*)(\w+)\s+integer\s+(.*)\s+auto_increment/gi) {
-					$serid = $table . "_pk_seq";
-					push @out, "-- serial identifier $serid will likely be truncated\n"
-						if (length($serid) >= 32);
-
-					if (length($serid) >= 32) {
-						$excess=(length($serid)-31);
-						$serid = substr($table,0,-($excess)) . "_pk_seq";
-						push @out, "-- serial identifier $serid was truncated\n";
-					}
-                    push @out, "CREATE SEQUENCE $serid;\n\n";
-					$pkeys{$table} = $2;
-					$pseqs{$table} = $serid;
-					push @out, "-- key is $pkeys{$table}, sequence is $pseqs{$table}\n" if ($debug);
-					$_ = "$`$1$2 integer default nextval('$serid') $3$'";
-				}
-
-				# Replace date with double-quoted name
-#	    while (/^(\s*)(date|time)(\s+)/gi) {
-#		$_ = "$1\"$2\"$3$'";
-#	    }
-
-				# Found "KEY"? Then remove it from the CREATE TABLE statement
-				# and instead write a CREATE INDEX statement.
-				if (/^\s*key\s+(\w+)\s*[(](\w[()\w\d,\s]*)[)][,]?/i) {
-					$iname = $1;
-					$column = $2;
-					$iname = $1 if ($iname =~ /^idx_(\w[\_\w\d]+)/);
-					# Sheesh, there can be upper bounds on index string sizes?
-					# Get rid of the length specifier (e.g. filename(45) -> filename)
-					while ($column =~ /(\w[\w\d])[(]\d+[)]/g) {
-						$column = "$`$1$'";
-					}
-#		$column = $1 if ($column =~ /(\w+)[(]\d+[)]/);
-#		push @out, "Index on $table($column) is $iname\n";
-					if (defined($knames{$iname})) {
-						push @out, "-- $iname already exists";
-#		    sprintf($iname, "idx_%_%s", $table, $iname);
-#		    $iname = "idx_" . $table . "_" . $column;
-						# Do not bother with more to the name; it will be too big anyway
-						$iname = $table . "_" . $column;
-						push @out, "; use $iname instead\n";
-					}
-					$knames{$iname} = $iname;
-					$keydef{$column} = $iname;
-#		push @out, "! $_\n";
-#		$last = $tabledef[$#tabledef];
-#		push @out, "? $#tabledef $last\n";
-#		push @out, "match $1\n" if ($last =~ /(.*),\s*$/);
-					# Remove the trailing comma from the previous line, if necessary
-					$tabledef[$#tabledef] = $1
-						if (($#tabledef > 0) && ($tabledef[$#tabledef] =~ /(.*),\s*$/));
-#		push @out, "? $tabledef[$#tabledef]\n";
-
-					# If this is the end of the statement, save it and exit loop
-				} elsif (/^\s*[)]\;/) {
-				push @tabledef, $_;
-#		push @out, "< $_\n";
-				last;
-
-				# Otherwise, just save the line
-			} else {
-#		push @out, "$last\n" if (defined($last));
-#		$last = $_;
-				push @tabledef, $_;
-#		push @out, "$_\n";
-			}
-		}
-
-			foreach $t (@tabledef) {
-				push @out, "$t\n";
-			}
-			undef @tabledef;
-
-			foreach $k (keys %keydef) {
-				push @out, "create index $keydef{$k} on $table ($k);\n";
-			}
-			undef %keydef;
-
-		} else {
-			push @out, "$_\n";
-		}
-    }
-
-#    push @out, "$last\n" if (defined($last));
-
-    foreach (keys %pkeys) {
-		my $val = $pkeys{$_};
-		print "key is $val\n" if ($debug);
-    }
-
-    return @out;
-}
-
-sub StripComma {
-    local $line = shift @_;
-
-    $line = "$1" if ($line =~ /(.*)[,]\s*$/);
-
-    return $line;
-}
diff --git a/contrib/noupdate/Makefile b/contrib/noupdate/Makefile
deleted file mode 100644
index 950db73891..0000000000
--- a/contrib/noupdate/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/noupdate/Attic/Makefile,v 1.9 2001/09/06 10:49:29 petere Exp $
-
-subdir = contrib/noupdate
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-MODULES = noup
-DATA_built = noup.sql
-DOCS = README.noup
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/noupdate/README.noup b/contrib/noupdate/README.noup
deleted file mode 100644
index 1c773dc778..0000000000
--- a/contrib/noupdate/README.noup
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-noupdate
-~~~~~~~~
-
- - trigger to prevent updates on single columns.
-
-
-Example:
-~~~~~~~
-
-CREATE TABLE TEST ( COL1 INT, COL2 INT, COL3 INT );
-
-CREATE TRIGGER BT BEFORE UPDATE ON TEST FOR EACH ROW
-	EXECUTE PROCEDURE 
-	noup ('COL1');
-
--- Now Try
-INSERT INTO TEST VALUES (10,20,30);
-UPDATE TEST SET COL1 = 5;
diff --git a/contrib/noupdate/noup.c b/contrib/noupdate/noup.c
deleted file mode 100644
index 3fac897742..0000000000
--- a/contrib/noupdate/noup.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * noup.c --	functions to remove update permission from a column
- */
-
-#include "executor/spi.h"		/* this is what you need to work with SPI */
-#include "commands/trigger.h"	/* -"- and triggers */
-#include <ctype.h>				/* tolower () */
-
-extern Datum noup(PG_FUNCTION_ARGS);
-
-/*
- * noup () -- revoke permission on column
- *
- * Though it's called without args You have to specify referenced
- * table/column while creating trigger:
- * EXECUTE PROCEDURE noup ('col').
- */
-
-PG_FUNCTION_INFO_V1(noup);
-
-Datum
-noup(PG_FUNCTION_ARGS)
-{
-	TriggerData *trigdata = (TriggerData *) fcinfo->context;
-	Trigger    *trigger;		/* to get trigger name */
-	int			nargs;			/* # of args specified in CREATE TRIGGER */
-	char	  **args;			/* arguments: column names and table name */
-	int			nkeys;			/* # of key columns (= nargs / 2) */
-	Datum	   *kvals;			/* key values */
-	Relation	rel;			/* triggered relation */
-	HeapTuple	tuple = NULL;	/* tuple to return */
-	TupleDesc	tupdesc;		/* tuple description */
-	bool		isnull;			/* to know is some column NULL or not */
-	int			ret;
-	int			i;
-
-	/*
-	 * Some checks first...
-	 */
-
-	/* Called by trigger manager ? */
-	if (!CALLED_AS_TRIGGER(fcinfo))
-		elog(ERROR, "noup: not fired by trigger manager");
-
-	/* Should be called for ROW trigger */
-	if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
-		elog(ERROR, "noup: can't process STATEMENT events");
-
-	/* Not should be called for INSERT */
-	if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event))
-		elog(ERROR, "noup: can't process INSERT events");
-
-	/* Not should be called for DELETE */
-	else if (TRIGGER_FIRED_BY_DELETE(trigdata->tg_event))
-		elog(ERROR, "noup: can't process DELETE events");
-
-	/* check new Tuple */
-	tuple = trigdata->tg_newtuple;
-
-	trigger = trigdata->tg_trigger;
-	nargs = trigger->tgnargs;
-	args = trigger->tgargs;
-
-	nkeys = nargs;
-	rel = trigdata->tg_relation;
-	tupdesc = rel->rd_att;
-
-	/* Connect to SPI manager */
-	if ((ret = SPI_connect()) < 0)
-		elog(ERROR, "noup: SPI_connect returned %d", ret);
-
-	/*
-	 * We use SPI plan preparation feature, so allocate space to place key
-	 * values.
-	 */
-	kvals = (Datum *) palloc(nkeys * sizeof(Datum));
-
-	/* For each column in key ... */
-	for (i = 0; i < nkeys; i++)
-	{
-		/* get index of column in tuple */
-		int			fnumber = SPI_fnumber(tupdesc, args[i]);
-
-		/* Bad guys may give us un-existing column in CREATE TRIGGER */
-		if (fnumber < 0)
-			elog(ERROR, "noup: there is no attribute %s in relation %s",
-				 args[i], SPI_getrelname(rel));
-
-		/* Well, get binary (in internal format) value of column */
-		kvals[i] = SPI_getbinval(tuple, tupdesc, fnumber, &isnull);
-
-		/*
-		 * If it's NOT NULL then cancel update
-		 */
-		if (!isnull)
-		{
-
-			elog(WARNING, "%s: update not allowed", args[i]);
-			SPI_finish();
-			return PointerGetDatum(NULL);
-		}
-
-	}
-
-	SPI_finish();
-	return PointerGetDatum(tuple);
-}
diff --git a/contrib/noupdate/noup.sql.in b/contrib/noupdate/noup.sql.in
deleted file mode 100644
index abf92837d1..0000000000
--- a/contrib/noupdate/noup.sql.in
+++ /dev/null
@@ -1,6 +0,0 @@
-DROP FUNCTION noup ();
-
-CREATE FUNCTION noup ()
-	RETURNS opaque
-	AS 'MODULE_PATHNAME'
-	LANGUAGE 'C';
diff --git a/contrib/oid2name/Makefile b/contrib/oid2name/Makefile
deleted file mode 100644
index c69083c57c..0000000000
--- a/contrib/oid2name/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/oid2name/Makefile,v 1.4 2001/09/06 10:49:29 petere Exp $
-
-subdir = contrib/oid2name
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-PROGRAM = oid2name
-OBJS	= oid2name.o
-
-PG_CPPFLAGS = -I$(libpq_srcdir)
-PG_LIBS = $(libpq)
-
-DOCS = README.oid2name
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/oid2name/README.oid2name b/contrib/oid2name/README.oid2name
deleted file mode 100644
index 2e63ae31ff..0000000000
--- a/contrib/oid2name/README.oid2name
+++ /dev/null
@@ -1,129 +0,0 @@
-This utility allows administrators to view the file structure used by
-PostgreSQL.  Databases are placed in directories based on their OIDs in
-pg_database, and the tables in that directory are named by their OIDs,
-stored in pg_class.relfilenode.  Oid2name connects to the database and
-extracts the OID and table name information.
-
----------------------------------------------------------------------------
-
-It can be used in four ways:
-
-
-oid2name
-
-  This will connect to the template1 database and display all databases
-  in the system:
-
-  $ oid2name
-  All databases:
-  ---------------------------------
-  18720  = test1
-  1      = template1
-  18719  = template0
-  18721  = test
-  18735  = postgres
-  18736  = cssi
-
-
-oid2name -d test [-x]
-
-  This connects to the database test and shows all tables and their OIDs:
-
-  $ oid2name -d test
-  All tables from database "test":
-  ---------------------------------
-  18766  = dns
-  18737  = ips
-  18722  = testdate
-
-
-oid2name -d test -o 18737
-oid2name -d test -t testdate
-
-  This will connect to the database test and display the table name for oid
-  18737 and the oid for table name testdate respectively:
-
-  $ oid2name -d test -o 18737
-  Tablename of oid 18737 from database "test":
-  ---------------------------------
-  18737  = ips
-
-
-  $ oid2name -d test -t testdate 
-  Oid of table testdate from database "test":
-  ---------------------------------
-  18722  = testdate
-
----------------------------------------------------------------------------
-
-Sample session:
-
-$ cd /u/pg/data/base
-$ oid2name
-All databases:
----------------------------------
-16817  = test2
-16578  = x
-16756  = test
-1      = template1
-16569  = template0
-16818  = test3
-16811  = floattest
-
-$ cd 16756
-$ ls 1873*
-18730   18731   18732   18735   18736   18737   18738   18739
-
-$ oid2name -d test -o 18737
-Tablename of oid 18737 from database "test":
----------------------------------
-18737  = ips
-
-$ oid2name -d test -t ips
-Oid of table ips from database "test":
----------------------------------
-18737  = ips
-
-$ # show disk space for every db object
-$ du * | while read SIZE OID
-> do
->	echo "$SIZE      `oid2name -q -d test -o $OID`"
-> done
-24      18737  = ips
-36      18722  = cities
-...
-
-$ # same as above, but sort by largest first
-$ du * | while read SIZE OID
-> do
->	echo "$SIZE      `oid2name -q -d test -o $OID`"
-> done |
-> sort -rn
-2048    19324  = bigtable
-1950    23903  = customers
-...
-
-$ # show disk usage per database
-$ cd /u/pg/data/base
-$ du -s * | 
-> while read SIZE OID
-> do
->	echo "$SIZE      `aspg oid2name -q | grep ^$OID' '`"
-> done |
-> sort -rn
-2256        18721  = test
-2135        18735  = postgres
-..
-
-This can be done in psql with:  
-
-test=> SELECT relpages, relfilenode, relname FROM pg_class ORDER BY relpages DESC;
-
-Each page is typically 8k.  Relpages is updated by VACUUM.
-
----------------------------------------------------------------------------
-
-Mail me with any problems or additions you would like to see.  Clearing 
-house for the code will be at:  http://www.crimelabs.net
-
-b. palmer, bpalmer@crimelabs.net
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
deleted file mode 100644
index 6c3e7d420a..0000000000
--- a/contrib/oid2name/oid2name.c
+++ /dev/null
@@ -1,467 +0,0 @@
-/*
-  oid2name; a postgresql 7.1 (+?) app to map OIDs on the filesystem
-   to table and database names.
-
-  b. palmer, bpalmer@crimelabs.net 1-17-2001
-
- */
-#include "postgres_fe.h"
-
-#include <unistd.h>
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
-
-#include "libpq-fe.h"
-
-/* these are the opts structures for command line params */
-struct options
-{
-	int			getdatabase;
-	int			gettable;
-	int			getoid;
-
-	int			quiet;
-
-	int			systables;
-
-	int			remotehost;
-	int			remoteport;
-	int			remoteuser;
-	int			remotepass;
-
-	int			_oid;
-	char		_dbname[128];
-	char		_tbname[128];
-
-	char		_hostname[128];
-	char		_port[6];
-	char		_username[128];
-	char		_password[128];
-};
-
-/* function prototypes */
-void		get_opts(int, char **, struct options *);
-PGconn	   *sql_conn(const char *, struct options *);
-void		sql_exec_error(int);
-int			sql_exec(PGconn *, const char *, int);
-void		sql_exec_dumpdb(PGconn *);
-void		sql_exec_dumptable(PGconn *, int);
-void		sql_exec_searchtable(PGconn *, const char *);
-void		sql_exec_searchoid(PGconn *, int);
-
-/* fuction to parse command line options and check for some usage errors. */
-void
-get_opts(int argc, char **argv, struct options * my_opts)
-{
-	int			c;
-
-	/* set the defaults */
-	my_opts->getdatabase = 0;
-	my_opts->gettable = 0;
-	my_opts->getoid = 0;
-
-	my_opts->quiet = 0;
-
-	my_opts->systables = 0;
-
-	my_opts->remotehost = 0;
-	my_opts->remoteport = 0;
-	my_opts->remoteuser = 0;
-	my_opts->remotepass = 0;
-
-	/* get opts */
-	while ((c = getopt(argc, argv, "H:p:U:P:d:t:o:qxh?")) != -1)
-	{
-		switch (c)
-		{
-				/* specify the database */
-			case 'd':
-				my_opts->getdatabase = 1;
-				sscanf(optarg, "%s", my_opts->_dbname);
-				break;
-
-				/* specify the table name */
-			case 't':
-				/* make sure we set the database first */
-				if (!my_opts->getdatabase)
-				{
-					fprintf(stderr, "You must specify a database to dump from.\n");
-					exit(1);
-				}
-				/* make sure we don't try to do a -o also */
-				if (my_opts->getoid)
-				{
-					fprintf(stderr, "You can only specify either oid or table\n");
-					exit(1);
-				}
-
-				my_opts->gettable = 1;
-				sscanf(optarg, "%s", my_opts->_tbname);
-
-				break;
-
-				/* specify the oid int */
-			case 'o':
-				/* make sure we set the database first */
-				if (!my_opts->getdatabase)
-				{
-					fprintf(stderr, "You must specify a database to dump from.\n");
-					exit(1);
-				}
-				/* make sure we don't try to do a -t also */
-				if (my_opts->gettable)
-				{
-					fprintf(stderr, "You can only specify either oid or table\n");
-					exit(1);
-				}
-
-				my_opts->getoid = 1;
-				sscanf(optarg, "%i", &my_opts->_oid);
-
-				break;
-
-			case 'q':
-				my_opts->quiet = 1;
-				break;
-
-				/* host to connect to */
-			case 'H':
-				my_opts->remotehost = 1;
-				sscanf(optarg, "%s", my_opts->_hostname);
-				break;
-
-				/* port to connect to on remote host */
-			case 'p':
-				my_opts->remoteport = 1;
-				sscanf(optarg, "%s", my_opts->_port);
-				break;
-
-				/* username */
-			case 'U':
-				my_opts->remoteuser = 1;
-				sscanf(optarg, "%s", my_opts->_username);
-				break;
-
-				/* password */
-			case 'P':
-				my_opts->remotepass = 1;
-				sscanf(optarg, "%s", my_opts->_password);
-				break;
-
-				/* display system tables */
-			case 'x':
-				my_opts->systables = 1;
-				break;
-
-				/* help! (ugly in code for easier editing) */
-			case '?':
-			case 'h':
-				fprintf(stderr, "\
-Usage: pg_oid2name [-d database [-x] ] [-t table | -o oid]\n\
-        default action        display all databases\n\
-        -d database           database to oid2name\n\
-        -x                    display system tables\n\
-        -t table | -o oid     search for table name (-t) or\n\
-                               oid (-o) in -d database\n\
-        -q                    quiet\n\
-        -H host               connect to remote host\n\
-        -p port               host port to connect to\n\
-        -U username           username to connect with\n\
-        -P password           password for username\n\
-");
-				exit(1);
-				break;
-		}
-	}
-}
-
-/* establish connection with database. */
-PGconn *
-sql_conn(const char *dbName, struct options * my_opts)
-{
-	char	   *pghost,
-			   *pgport;
-	char	   *pgoptions,
-			   *pgtty;
-	char	   *pguser,
-			   *pgpass;
-
-	PGconn	   *conn;
-
-	pghost = NULL;
-	pgport = NULL;
-	pgoptions = NULL;			/* special options to start up the backend
-								 * server */
-	pgtty = NULL;				/* debugging tty for the backend server */
-	pguser = NULL;
-	pgpass = NULL;
-
-	/* override the NULLs with the user params if passed */
-	if (my_opts->remotehost)
-	{
-		pghost = (char *) malloc(128);
-		sscanf(my_opts->_hostname, "%s", pghost);
-	}
-
-	if (my_opts->remoteport)
-	{
-		pgport = (char *) malloc(6);
-		sscanf(my_opts->_port, "%s", pgport);
-	}
-
-	if (my_opts->remoteuser)
-	{
-		pguser = (char *) malloc(128);
-		sscanf(my_opts->_username, "%s", pguser);
-	}
-
-	if (my_opts->remotepass)
-	{
-		pgpass = (char *) malloc(128);
-		sscanf(my_opts->_password, "%s", pgpass);
-	}
-
-	/* login */
-	conn = PQsetdbLogin(pghost, pgport, pgoptions, pgtty, dbName, pguser, pgpass);
-
-	/* deal with errors */
-	if (PQstatus(conn) == CONNECTION_BAD)
-	{
-		fprintf(stderr, "Connection to database '%s' failed.\n", dbName);
-		fprintf(stderr, "%s", PQerrorMessage(conn));
-
-		PQfinish(conn);
-		exit(1);
-	}
-
-	/* free data structures: not strictly necessary */
-	if (pghost != NULL)
-		free(pghost);
-	if (pgport != NULL)
-		free(pgport);
-	if (pguser != NULL)
-		free(pguser);
-	if (pgpass != NULL)
-		free(pgpass);
-
-	/* return the conn if good */
-	return conn;
-}
-
-/* If the sql_ command has an error,  this function looks up the error number and prints it out. */
-void
-sql_exec_error(int error_number)
-{
-	fprintf(stderr, "Error number %i.\n", error_number);
-	switch (error_number)
-	{
-		case 3:
-			fprintf(stderr, "Error:  PGRES_COPY_OUT\n");
-			break;
-
-		case 4:
-			fprintf(stderr, "Error:  PGRES_COPY_IN\n");
-			break;
-
-		case 5:
-			fprintf(stderr, "Error:  PGRES_BAD_RESPONCE\n");
-			break;
-
-		case 6:
-			fprintf(stderr, "Error:  PGRES_NONFATAL_ERROR\n");
-			break;
-
-		case 7:
-			fprintf(stderr, "Error:  PGRES_FATAL_ERROR\n");
-			break;
-	}
-}
-
-/* actual code to make call to the database and print the output data */
-int
-sql_exec(PGconn *conn, const char *todo, int match)
-{
-	PGresult   *res;
-
-	int			numbfields;
-	int			error_number;
-	int			i,
-				len;
-
-	/* make the call */
-	res = PQexec(conn, todo);
-
-	/* check and deal with errors */
-	if (!res || PQresultStatus(res) > 2)
-	{
-		error_number = PQresultStatus(res);
-		fprintf(stderr, "There was an error in the SQL command:\n%s\n", todo);
-		sql_exec_error(error_number);
-		fprintf(stderr, "PQerrorMessage = %s\n", PQerrorMessage(conn));
-
-		PQclear(res);
-		PQfinish(conn);
-		exit(-1);
-	}
-
-	/* get the number of fields */
-	numbfields = PQntuples(res);
-
-	/* if we only expect 1 and there mode than,  return -2 */
-	if (match == 1 && numbfields > 1)
-		return -2;
-
-	/* return -1 if there aren't any returns */
-	if (match == 1 && numbfields < 1)
-		return -1;
-
-	/* for each row,  dump the information */
-	for (i = 0; i < numbfields; i++)
-	{
-		len = strlen(PQgetvalue(res, i, 0));
-
-		fprintf(stdout, "%-6s = %s\n", PQgetvalue(res, i, 0), PQgetvalue(res, i, 1));
-	}
-
-	/* clean the PGconn once done */
-	PQclear(res);
-
-	return 0;
-}
-
-/* dump all databases known by the system table */
-void
-sql_exec_dumpdb(PGconn *conn)
-{
-	char		todo[1024];
-
-	/* get the oid and database name from the system pg_database table */
-	sprintf(todo, "select oid,datname from pg_database");
-
-	sql_exec(conn, todo, 0);
-}
-
-/* display all tables in whatever db we are connected to.  don't display the
-   system tables by default */
-void
-sql_exec_dumptable(PGconn *conn, int systables)
-{
-	char		todo[1024];
-
-	/* don't exclude the systables if this is set */
-	if (systables == 1)
-		sprintf(todo, "select relfilenode,relname from pg_class order by relname");
-	else
-		sprintf(todo, "select relfilenode,relname from pg_class where relname not like 'pg_%%' order by relname");
-
-	sql_exec(conn, todo, 0);
-}
-
-/* display the oid for a given tablename for whatever db we are connected
-   to.	do we want to allow %bar% in the search?  Not now. */
-void
-sql_exec_searchtable(PGconn *conn, const char *tablename)
-{
-	int			returnvalue;
-	char		todo[1024];
-
-	/* get the oid and tablename where the name matches tablename */
-	sprintf(todo, "select relfilenode,relname from pg_class where relname = '%s'", tablename);
-
-	returnvalue = sql_exec(conn, todo, 1);
-
-	/* deal with the return errors */
-	if (returnvalue == -1)
-		printf("No tables with that name found\n");
-
-	if (returnvalue == -2)
-		printf("VERY scary:  more than one table with that name found!!\n");
-}
-
-/* same as above */
-void
-sql_exec_searchoid(PGconn *conn, int oid)
-{
-	int			returnvalue;
-	char		todo[1024];
-
-	sprintf(todo, "select relfilenode,relname from pg_class where oid = %i", oid);
-
-	returnvalue = sql_exec(conn, todo, 1);
-
-	if (returnvalue == -1)
-		printf("No tables with that oid found\n");
-
-	if (returnvalue == -2)
-		printf("VERY scary:  more than one table with that oid found!!\n");
-}
-
-int
-main(int argc, char **argv)
-{
-	struct options *my_opts;
-	PGconn	   *pgconn;
-
-	my_opts = (struct options *) malloc(sizeof(struct options));
-
-	/* parse the opts */
-	get_opts(argc, argv, my_opts);
-
-	/* display all the tables in the database */
-	if (my_opts->getdatabase & my_opts->gettable)
-	{
-		if (!my_opts->quiet)
-		{
-			printf("Oid of table %s from database \"%s\":\n", my_opts->_tbname, my_opts->_dbname);
-			printf("---------------------------------\n");
-		}
-		pgconn = sql_conn(my_opts->_dbname, my_opts);
-		sql_exec_searchtable(pgconn, my_opts->_tbname);
-		PQfinish(pgconn);
-
-		exit(1);
-	}
-
-	/* search for the tablename of the given OID */
-	if (my_opts->getdatabase & my_opts->getoid)
-	{
-		if (!my_opts->quiet)
-		{
-			printf("Tablename of oid %i from database \"%s\":\n", my_opts->_oid, my_opts->_dbname);
-			printf("---------------------------------\n");
-		}
-		pgconn = sql_conn(my_opts->_dbname, my_opts);
-		sql_exec_searchoid(pgconn, my_opts->_oid);
-		PQfinish(pgconn);
-
-		exit(1);
-	}
-
-	/* search for the oid for the given tablename */
-	if (my_opts->getdatabase)
-	{
-		if (!my_opts->quiet)
-		{
-			printf("All tables from database \"%s\":\n", my_opts->_dbname);
-			printf("---------------------------------\n");
-		}
-		pgconn = sql_conn(my_opts->_dbname, my_opts);
-		sql_exec_dumptable(pgconn, my_opts->systables);
-		PQfinish(pgconn);
-
-		exit(1);
-	}
-
-	/* display all the databases for the server we are connected to.. */
-	if (!my_opts->quiet)
-	{
-		printf("All databases:\n");
-		printf("---------------------------------\n");
-	}
-	pgconn = sql_conn("template1", my_opts);
-	sql_exec_dumpdb(pgconn);
-	PQfinish(pgconn);
-
-	exit(0);
-}
diff --git a/contrib/oracle/CHANGES b/contrib/oracle/CHANGES
deleted file mode 100644
index 34851ecb65..0000000000
--- a/contrib/oracle/CHANGES
+++ /dev/null
@@ -1,51 +0,0 @@
-2001 05 09 - Initial version 1.0
-
-2001 05 09 - Version 1.1
-	- Add table grant extraction based on group. Oracle ROLES are groups in PG
-
-2001 05 11 - Version 1.2
-	- Views extraction is now really done with the option type=>'VIEW'
-	- Add indexes extraction on tables.
-	- Changes name of constraints, default is now used.
-	- Add debug printing to see that the process is running :-)
-	- Add extraction of only required tablename.
-	- Add extraction of only n to n table indice. Indices of extraction can be obtained
-	  with the option showtableid set to 1.
-	- Fix print of NOT NULL field.
-	- Complete rewrite of the grant extraction
-	- Complete rewrite of most things
-
-2001 06 20 - Version 1.3
-	- Grant/privilege extraction are now done separatly with the option type=>'GRANT'
-	- Sequence extraction with the option type=>'SEQUENCE'
-	- Trigger extraction with the option type=>'TRIGGER'
-	- Function extraction with the option type=>'FUNCTION' and type=>'PROCEDURE'
-	- Complete rewrite of the foreign key extraction
-	- Fix incorrect type translation and many other bug fix
-	- Add schema only extraction by option schema => 'MYSCHEM'
-
-2001 06 27 - Version 1.4
-	- Add online Oracle data extraction and insertion into PG database.
-	- Data export as insert statement (type => DATA)
-	- Data export as copy from stdin statement (type => COPY)
-
-2001 12 28 - Version 1.5
-	- Fix LongReadLen problem when exporting Oracle data on LONG and LOB types
-	  Thanks to Stephane Schildknecht for reporting and testing the fix.
-	- Add more precision on NUMBER type conversion
-	- Add conversion of type LONG, LOB, FILE
-	- Fix a problem when extracting data, sometime table could need to be prefixed
-	  by the schema name.
-	- Fix output of Oracle data extraction. It now require a call to the function
-	  export_data().
-2002 01 07 - Version 1.6
-	- Fix problem exporting NULL value. Thanks to Stephane Schildknecht.
-
-2002 02 14 - Version 1.7
-	- Remove export of OUTLINE object type. Thanks to Jean-Paul ARGUDO.
-
-2002 03 05 - Version 1.8
-	- Add Oracle type FLOAT conversion to float8.
-	- Add column alias extraction on view. Thanks to Jean-Francois RIPOUTEAU
-	- Add PACKAGE extraction (type => DATA).
-
diff --git a/contrib/oracle/Ora2Pg.pm b/contrib/oracle/Ora2Pg.pm
deleted file mode 100644
index e2dabfc75b..0000000000
--- a/contrib/oracle/Ora2Pg.pm
+++ /dev/null
@@ -1,1931 +0,0 @@
-package Ora2Pg;
-#------------------------------------------------------------------------------
-# Project  : Oracle to PostgreSQL database schema converter
-# Name     : Ora2Pg.pm
-# Language : 5.006 built for i686-linux
-# OS       : linux RedHat 6.2 kernel 2.2.14-5
-# Authors  : Gilles Darold, gilles@darold.net
-# Copyright: Copyright (c) 2000 : Gilles Darold - All rights reserved -
-# Function : Main module used to export Oracle database schema to PostgreSQL
-# Usage    : See documentation in this file with perldoc.
-#------------------------------------------------------------------------------
-# This program is free software; you can redistribute it and/or modify it under
-# the same terms as Perl itself.
-#------------------------------------------------------------------------------
-
-#use strict;
-use vars qw($VERSION $PSQL);
-use Carp qw(confess);
-use DBI;
-
-$VERSION = "1.8";
-$PSQL = "psql";
-
-=head1 NAME
-
-Ora2Pg - Oracle to PostgreSQL database schema converter
-
-
-=head1 SYNOPSIS
-
-	BEGIN {
-		$ENV{ORACLE_HOME} = '/usr/local/oracle/oracle816';
-	}
-
-	use strict;
-
-	use Ora2Pg;
-
-	# Init the database connection
-	my $dbsrc = 'dbi:Oracle:host=testdb.samse.fr;sid=TEST;port=1521';
-	my $dbuser = 'system';
-	my $dbpwd = 'manager';
-
-	# Create an instance of the Ora2Pg perl module
-	my $schema = new Ora2Pg (
-		datasource => $dbsrc,           # Database DBD datasource
-		user => $dbuser,                # Database user
-		password => $dbpwd,             # Database password
-		{
-			PrintError => 0,
-			RaiseError => 1,
-			AutoCommit => 0
-		}
-	);
-
-	# Create the POSTGRESQL representation of all objects in the database
-	$schema->export_schema("output.sql");
-
-	exit(0);
-
-or if you only want to extract some tables:
-
-	# Create an instance of the Ora2Pg perl module
-	my @tables = ('tab1', 'tab2', 'tab3');
-	my $schema = new Ora2Pg (
-		datasource => $dbsrc,           # Database DBD datasource
-		user => $dbuser,                # Database user
-		password => $dbpwd,             # Database password
-		tables => \@tables,
-	or					# Tables to extract
-		tables => [('tab1','tab2')],
-		debug => 1			# To show somethings when running
-	);
-
-or if you only want to extract the 10 first tables:
-
-	# Create an instance of the Ora2Pg perl module
-	my $schema = new Ora2Pg (
-		datasource => $dbsrc,           # Database DBD datasource
-		user => $dbuser,                # Database user
-		password => $dbpwd,             # Database password
-		max => 10			# 10 first tables to extract
-	);
-
-or if you only want to extract tables 10 to 20:
-
-	# Create an instance of the Ora2Pg perl module
-	my $schema = new Ora2Pg (
-		datasource => $dbsrc,           # Database DBD datasource
-		user => $dbuser,                # Database user
-		password => $dbpwd,             # Database password
-		min => 10,			# Begin extraction at indice 10
-		max => 20			# End extraction at indice 20
-	);
-
-To choose a particular Oracle schema to export just set the following option
-to your schema name:
-
-	schema => 'APPS'
-
-This schema definition can also be needed when you want to export data. If export
-failed and complain that the table doesn't exists use this to prefix the table name
-by the schema name.
-
-To know at which indices tables can be found during extraction use the option:
-
-	showtableid => 1
-
-To extract all views set the type option as follow:
-
-	type => 'VIEW'
-
-To extract all grants set the type option as follow:
-
-	type => 'GRANT'
-
-To extract all sequences set the type option as follow:
-
-	type => 'SEQUENCE'
-
-To extract all triggers set the type option as follow:
-
-	type => 'TRIGGER'
-
-To extract all functions set the type option as follow:
-
-	type => 'FUNCTION'
-
-To extract all procedures set the type option as follow:
-
-	type => 'PROCEDURE'
-
-To extract all packages and body set the type option as follow:
-
-	type => 'PACKAGE'
-
-Default is table extraction
-
-	type => 'TABLE'
-
-To extract all data from table extraction as INSERT statement use:
-
-	type => 'DATA'
-
-To extract all data from table extraction as COPY statement use:
-
-	type => 'COPY'
-
-and data_limit => n to specify the max tuples to return. If you set
-this options to 0 or nothing, no limitation are used. Additional option
-'table', 'min' and 'max' can also be used.
-
-When use of COPY or DATA you can export data by calling method:
-
-$schema->export_data("output.sql");
-
-Data are dumped to the given filename or to STDOUT with no argument.
-You can also send these data directly to a PostgreSQL backend using
- the following method:
-
-$schema->send_to_pgdb($destdatasrc,$destuser,$destpasswd);
-
-In this case you must call export_data() without argument after the
-call to method send_to_pgdb().
-
-If you set type to COPY and you want to dump data directly to a PG database,
-you must call method send_to_pgdb but data will not be sent via DBD::Pg but
-they will be load to the database using the psql command. Calling this method
-is istill required to be able to extract database name, hostname and port
-information. Edit the $PSQL variable to match the path of your psql
-command (nothing to edit if psql is in your path).
-
-
-=head1 DESCRIPTION
-
-Ora2Pg is a perl OO module used to export an Oracle database schema
-to a PostgreSQL compatible schema.
-
-It simply connect to your Oracle database, extract its structure and
-generate a SQL script that you can load into your PostgreSQL database.
-
-I'm not a Oracle DBA so I don't really know something about its internal
-structure so you may find some incorrect things. Please tell me what is
-wrong and what can be better.
-
-It currently dump the database schema (tables, views, sequences, indexes, grants),
-with primary, unique and foreign keys into PostgreSQL syntax without editing the
-SQL code generated.
-
-It now can dump Oracle data into PostgreSQL DB as online process. You can choose
-what columns can be exported for each table.
-
-Functions, procedures and triggers PL/SQL code generated must be reviewed to match
-the PostgreSQL syntax. Some usefull recommandation on porting Oracle to PostgreSQL
-can be found at http://techdocs.postgresql.org/ under the "Converting from other
-Databases to PostgreSQL" Oracle part. I just notice one thing more is that the
-trunc() function in Oracle is the same for number or date so be carefull when
-porting to PostgreSQL to use trunc() for number and date_trunc() for date.
-
-
-=head1 ABSTRACT
-
-The goal of the Ora2Pg perl module is to cover all part needed to export
-an Oracle database to a PostgreSQL database without other thing that provide
-the connection parameters to the Oracle database.
-
-Features must include:
-
-	- Database schema export (tables, views, sequences, indexes),
-	  with unique, primary and foreign key.
-	- Grants/privileges export by user and group.
-	- Table selection (by name and max table) export.
-	- Predefined functions/triggers/procedures/packages export.
-	- Data export.
-	- Sql query converter (todo)
-
-My knowledge regarding database is really poor especially for Oracle
-so contribution is welcome.
-
-
-=head1 REQUIREMENT
-
-You just need the DBI, DBD::Pg and DBD::Oracle perl module to be installed
-
-
-
-=head1 PUBLIC METHODS
-
-=head2 new HASH_OPTIONS
-
-Creates a new Ora2Pg object.
-
-Supported options are:
-
-	- datasource	: DBD datasource (required)
-	- user		: DBD user (optional with public access)
-	- password	: DBD password (optional with public access)
-	- schema	: Oracle internal schema to extract
-	- type		: Type of data to extract, can be TABLE,VIEW,GRANT,SEQUENCE,
-			  TRIGGER,FUNCTION,PROCEDURE,DATA,COPY,PACKAGE
-	- debug		: Print the current state of the parsing
-	- tables	: Extract only the given tables (arrayref)
-	- showtableid	: Display only the table indice during extraction
-	- min		: Indice to begin extraction. Default to 0
-	- max		: Indice to end extraction. Default to 0 mean no limits
-	- data_limit	: Number max of tuples to return during data extraction (default 10)
-
-Attempt that this list should grow a little more because all initialization is
-done by this way.
-
-=cut
-
-sub new
-{
-	my ($class, %options) = @_;
-
-	# This create an OO perl object
-	my $self = {};
-	bless ($self, $class);
-
-	# Initialize this object
-	$self->_init(%options);
-	
-	# Return the instance
-	return($self);
-}
-
-
-=head2 export_data FILENAME
-
-Print SQL data output to a filename or
-to STDOUT if no file is given. 
-
-Must be used only if type option is set to DATA or COPY
-=cut
-
-sub export_data
-{
-	my ($self, $outfile) = @_;
-
-	$self->_get_sql_data($outfile);
-}
-
-
-=head2 export_sql FILENAME
-
-Print SQL conversion output to a filename or
-simply return these data if no file is given. 
-
-=cut
-
-sub export_schema
-{
-	my ($self, $outfile) = @_;
-
-	if ($outfile) {
-		# Send output to the given file
-		open(FILE,">$outfile") or die "Can't open $outfile: $!";
-		print FILE $self->_get_sql_data();
-		close FILE;
-		return; 
-	}
-
-	# Return data as string
-	return $self->_get_sql_data();
-
-}
-
-
-=head2 send_to_pgdb DEST_DATASRC DEST_USER DEST_PASSWD
-
-Open a DB handle to a PostgreSQL database
-
-=cut
-
-sub send_to_pgdb
-{
-	my ($self, $destsrc, $destuser, $destpasswd) = @_;
-
-        # Connect the database
-        $self->{dbhdest} = DBI->connect($destsrc, $destuser, $destpasswd);
-
-	$destsrc =~ /dbname=([^;]*)/;
-	$self->{dbname} = $1;
-	$destsrc =~ /host=([^;]*)/;
-	$self->{dbhost} = $1;
-	$self->{dbhost} = 'localhost' if (!$self->{dbhost});
-	$destsrc =~ /port=([^;]*)/;
-	$self->{dbport} = $1;
-	$self->{dbport} = 5432 if (!$self->{dbport});
-	$self->{dbuser} = $destuser;
-
-        # Check for connection failure
-        if (!$self->{dbhdest}) {
-		die "Error : $DBI::err ... $DBI::errstr\n";
-	}
-
-}
-
-
-=head2 modify_struct TABLE_NAME ARRAYOF_FIELDNAME
-
-Modify a table structure during export. Only given fieldname
-will be exported. 
-
-=cut
-
-sub modify_struct
-{
-	my ($self, $table, @fields) = @_;
-
-	map { $_ = lc($_) } @fields;
-	$table = lc($table);
-
-	push(@{$self->{modify}{$table}}, @fields);
-
-}
-
-
-
-
-#### Private subroutines ####
-
-=head1 PRIVATE METHODS
-
-=head2 _init HASH_OPTIONS
-
-Initialize a Ora2Pg object instance with a connexion to the
-Oracle database.
-
-=cut
-
-sub _init
-{
-	my ($self, %options) = @_;
-
-        # Connect the database
-        $self->{dbh} = DBI->connect($options{datasource}, $options{user}, $options{password});
-
-        # Check for connection failure
-        if (!$self->{dbh}) {
-		die "Error : $DBI::err ... $DBI::errstr\n";
-	}
-
-	# Save the DB connection
-	$self->{datasource} = $options{datasource};
-	$self->{user} = $options{user};
-	$self->{password} = $options{password};
-
-	$self->{debug} = 0;
-	$self->{debug} = 1 if ($options{debug});
-
-	$self->{limited} = ();
-	$self->{limited} = $options{tables} if ($options{tables});
-
-	$self->{schema} = '';
-	$self->{schema} = $options{schema} if ($options{schema});
-
-	$self->{min} = 0;
-	$self->{min} = $options{min} if ($options{min});
-
-	$self->{max} = 0;
-	$self->{max} = $options{max} if ($options{max});
-
-	$self->{showtableid} = 0;
-	$self->{showtableid} = $options{showtableid} if ($options{showtableid});
-
-	$self->{dbh}->{LongReadLen} = 0;
-	#$self->{dbh}->{LongTruncOk} = 1;
-
-	$self->{data_limit} = 10;
-	$self->{data_current} = 0;
-	$self->{data_limit} = $options{data_limit} if (exists $options{data_limit});
-
-	# Retreive all table informations
-	if (!exists $options{type} || ($options{type} eq 'TABLE') || ($options{type} eq 'DATA') || ($options{type} eq 'COPY')) {
-		$self->_tables();
-	} elsif ($options{type} eq 'VIEW') {
-		$self->{dbh}->{LongReadLen} = 100000;
-		$self->_views();
-	} elsif ($options{type} eq 'GRANT') {
-		$self->_grants();
-	} elsif ($options{type} eq 'SEQUENCE') {
-		$self->_sequences();
-	} elsif ($options{type} eq 'TRIGGER') {
-		$self->{dbh}->{LongReadLen} = 100000;
-		$self->_triggers();
-	} elsif (($options{type} eq 'FUNCTION') || ($options{type} eq 'PROCEDURE')) {
-		$self->{dbh}->{LongReadLen} = 100000;
-		$self->_functions($options{type});
-	} elsif ($options{type} eq 'PACKAGE') {
-		$self->{dbh}->{LongReadLen} = 100000;
-		$self->_packages();
-	} else {
-		die "type option must be TABLE, VIEW, GRANT, SEQUENCE, TRIGGER, PACKAGE, FUNCTION or PROCEDURE\n";
-	}
-	$self->{type} = $options{type};
-
-	# Disconnect from the database
-	$self->{dbh}->disconnect() if ($self->{dbh});
-
-}
-
-
-# We provide a DESTROY method so that the autoloader doesn't
-# bother trying to find it. We also close the DB connexion
-sub DESTROY { }
-
-
-=head2 _grants
-
-This function is used to retrieve all privilege information.
-
-It extract all Oracle's ROLES to convert them as Postgres groups
-and search all users associated to these roles.
-
-Set the main hash $self->{groups}.
-Set the main hash $self->{grantss}.
-
-=cut
-
-sub _grants
-{
-	my ($self) = @_;
-
-print STDERR "Retrieving groups/users information...\n" if ($self->{debug});
-	$self->{users} = $self->_get_users();
-	$self->{groups} = $self->_get_roles();
-	$self->{grants} = $self->_get_all_grants();
-
-}
-
-
-=head2 _sequences
-
-This function is used to retrieve all sequences information.
-
-Set the main hash $self->{sequences}.
-
-=cut
-
-sub _sequences
-{
-	my ($self) = @_;
-
-print STDERR "Retrieving sequences information...\n" if ($self->{debug});
-	$self->{sequences} = $self->_get_sequences();
-
-}
-
-
-=head2 _triggers
-
-This function is used to retrieve all triggers information.
-
-Set the main hash $self->{triggers}.
-
-=cut
-
-sub _triggers
-{
-	my ($self) = @_;
-
-print STDERR "Retrieving triggers information...\n" if ($self->{debug});
-	$self->{triggers} = $self->_get_triggers();
-
-}
-
-
-=head2 _functions
-
-This function is used to retrieve all functions information.
-
-Set the main hash $self->{functions}.
-
-=cut
-
-sub _functions
-{
-	my ($self, $type) = @_;
-
-print STDERR "Retrieving functions information...\n" if ($self->{debug});
-	$self->{functions} = $self->_get_functions($type);
-
-}
-
-
-=head2 _packages
-
-This function is used to retrieve all packages information.
-
-Set the main hash $self->{packages}.
-
-=cut
-
-sub _packages
-{
-	my ($self) = @_;
-
-print STDERR "Retrieving packages information...\n" if ($self->{debug});
-	$self->{packages} = $self->_get_packages();
-
-}
-
-
-=head2 _tables
-
-This function is used to retrieve all table information.
-
-Set the main hash of the database structure $self->{tables}.
-Keys are the names of all tables retrieved from the current
-database. Each table information compose an array associated
-to the table_info key as array reference. In other way:
-
-    $self->{tables}{$class_name}{table_info} = [(OWNER,TYPE)];
-
-DBI TYPE can be TABLE, VIEW, SYSTEM TABLE, GLOBAL TEMPORARY, LOCAL TEMPORARY,
-ALIAS, SYNONYM or a data source specific type identifier. This only extract
-TABLE type.
-
-It also get the following informations in the DBI object to affect the
-main hash of the database structure :
-
-    $self->{tables}{$class_name}{field_name} = $sth->{NAME};
-    $self->{tables}{$class_name}{field_type} = $sth->{TYPE};
-
-It also call these other private subroutine to affect the main hash
-of the database structure :
-
-    @{$self->{tables}{$class_name}{column_info}} = $self->_column_info($class_name);
-    @{$self->{tables}{$class_name}{primary_key}} = $self->_primary_key($class_name);
-    @{$self->{tables}{$class_name}{unique_key}}  = $self->_unique_key($class_name);
-    @{$self->{tables}{$class_name}{foreign_key}} = $self->_foreign_key($class_name);
-
-=cut
-
-sub _tables
-{
-	my ($self) = @_;
-
-	# Get all tables information given by the DBI method table_info
-print STDERR "Retrieving table information...\n" if ($self->{debug});
-
-	my $sth = $self->_table_info or die $self->{dbh}->errstr;
-	my @tables_infos = $sth->fetchall_arrayref();
-
-	if ($self->{showtableid}) {
-		foreach my $table (@tables_infos) {
-			for (my $i=0; $i<=$#{$table};$i++) {
-				print STDERR "[", $i+1, "] ${$table}[$i]->[2]\n";
-			}
-		}
-		return;
-	}
-my @done = ();
-	foreach my $table (@tables_infos) {
-		# Set the table information for each class found
-		my $i = 1;
-print STDERR "Min table dump set to $self->{min}.\n" if ($self->{debug} && $self->{min});
-print STDERR "Max table dump set to $self->{max}.\n" if ($self->{debug} && $self->{max});
-		foreach my $t (@$table) {
-			# Jump to desired extraction
-if (grep(/^${@$t}[2]$/, @done)) {
-print STDERR "Duplicate entry found: ${@$t}[0] - ${@$t}[1] - ${@$t}[2]\n";
-} else {
-push(@done, ${@$t}[2]);
-}
-			$i++, next if ($self->{min} && ($i < $self->{min}));
-			last if ($self->{max} && ($i > $self->{max}));
-			next if (($#{$self->{limited}} >= 0) && !grep(/^${@$t}[2]$/, @{$self->{limited}}));
-print STDERR "[$i] " if ($self->{max} || $self->{min});
-print STDERR "Scanning ${@$t}[2] (@$t)...\n" if ($self->{debug});
-			
-			# Check of uniqueness of the table
-			if (exists $self->{tables}{${@$t}[2]}{field_name}) {
-				print STDERR "Warning duplicate table ${@$t}[2], SYNONYME ? Skipped.\n";
-				next;
-			}
-
-			# usually OWNER,TYPE. QUALIFIER is omitted until I know what to do with that
-			$self->{tables}{${@$t}[2]}{table_info} = [(${@$t}[1],${@$t}[3])];
-			# Set the fields information
-			my $sth = $self->{dbh}->prepare("SELECT * FROM ${@$t}[1].${@$t}[2] WHERE 1=0");
-			if (!defined($sth)) {
-				warn "Can't prepare statement: $DBI::errstr";
-				next;
-			}
-			$sth->execute;
-			if ($sth->err) {
-				warn "Can't execute statement: $DBI::errstr";
-				next;
-			}
-			$self->{tables}{${@$t}[2]}{field_name} = $sth->{NAME};
-			$self->{tables}{${@$t}[2]}{field_type} = $sth->{TYPE};
-
-			@{$self->{tables}{${@$t}[2]}{column_info}} = $self->_column_info(${@$t}[2]);
-			@{$self->{tables}{${@$t}[2]}{primary_key}} = $self->_primary_key(${@$t}[2]);
-			@{$self->{tables}{${@$t}[2]}{unique_key}} = $self->_unique_key(${@$t}[2]);
-			($self->{tables}{${@$t}[2]}{foreign_link}, $self->{tables}{${@$t}[2]}{foreign_key}) = $self->_foreign_key(${@$t}[2]);
-			($self->{tables}{${@$t}[2]}{uniqueness}, $self->{tables}{${@$t}[2]}{indexes}) = $self->_get_indexes(${@$t}[2]);
-			$i++;
-		}
-	}
-
-}
-
-
-=head2 _views
-
-This function is used to retrieve all views information.
-
-Set the main hash of the views definition $self->{views}.
-Keys are the names of all views retrieved from the current
-database values are the text definition of the views.
-
-It then set the main hash as follow:
-
-    # Definition of the view
-    $self->{views}{$table}{text} = $view_infos{$table};
-
-=cut
-
-sub _views
-{
-	my ($self) = @_;
-
-	# Get all views information
-print STDERR "Retrieving views information...\n" if ($self->{debug});
-	my %view_infos = $self->_get_views();
-
-	if ($self->{showtableid}) {
-		my $i = 1;
-		foreach my $table (sort keys %view_infos) {
-			print STDERR "[$i] $table\n";
-			$i++;
-		}
-		return;
-	}
-
-print STDERR "Min view dump set to $self->{min}.\n" if ($self->{debug} && $self->{min});
-print STDERR "Max view dump set to $self->{max}.\n" if ($self->{debug} && $self->{max});
-	my $i = 1;
-	foreach my $table (sort keys %view_infos) {
-		# Set the table information for each class found
-		# Jump to desired extraction
-		next if ($table =~ /\$/);
-		$i++, next if ($self->{min} && ($i < $self->{min}));
-		last if ($self->{max} && ($i > $self->{max}));
-		next if (($#{$self->{limited}} >= 0) && !grep(/^$table$/, @{$self->{limited}}));
-print STDERR "[$i] " if ($self->{max} || $self->{min});
-print STDERR "Scanning $table...\n" if ($self->{debug});
-		$self->{views}{$table}{text} = $view_infos{$table};
-                ## Added JFR : 3/3/02 : Retrieve also aliases from views
-                $self->{views}{$table}{alias}= $view_infos{$table}{alias};
-		$i++;
-	}
-
-}
-
-
-=head2 _get_sql_data
-
-Returns a string containing the entire SQL Schema definition compatible with PostgreSQL
-
-=cut
-
-sub _get_sql_data
-{
-	my ($self, $outfile) = @_;
-
-	my $sql_header = "-- Generated by Ora2Pg, the Oracle database Schema converter, version $VERSION\n";
-	$sql_header .= "-- Copyright 2000 Gilles DAROLD. All rights reserved.\n";
-	$sql_header .= "--\n";
-	$sql_header .= "-- This program is free software; you can redistribute it and/or modify it under\n";
-	$sql_header .= "-- the same terms as Perl itself.\n\n";
-	$sql_header .= "BEGIN TRANSACTION;\n\n";
-
-	my $sql_output = "";
-
-	# Process view only
-	if ($self->{type} eq 'VIEW') {
-print STDERR "Add views definition...\n" if ($self->{debug});
-		foreach my $view (sort keys %{$self->{views}}) {
-			if (!@{$self->{views}{$view}{alias}}) {
-				$sql_output .= "CREATE VIEW \"\L$view\E\" AS $self->{views}{$view}{text};\n";
-			} else {
-				$sql_output .= "CREATE VIEW \"\L$view\E\" (";
-				my $count = 0;
-				foreach my $d (@{$self->{views}{$view}{alias}}) {
-					if ($count == 0) {
-						$count = 1;
-					} else {
-						$sql_output .= ", "
-					}
-					$sql_output .= "$d->[0]";
-				}
-				$sql_output .= ") AS $self->{views}{$view}{text};\n";
-			}
-		}
-
-		if (!$sql_output) {
-			$sql_output = "-- Nothing found of type $self->{type}\n";
-		} else {
-			$sql_output .= "\n";
-		}
-
-		return $sql_header . $sql_output . "\nEND TRANSACTION;\n";
-	}
-
-	# Process grant only
-	if ($self->{type} eq 'GRANT') {
-print STDERR "Add groups/users privileges...\n" if ($self->{debug});
-		# Add groups definition
-		my $groups = '';
-		my @users = ();
-		my @grps = ();
-		foreach (@{$self->{users}}) {
-			next if (exists $self->{groups}{"$_"});
-			next if ($self->{schema} && ($_ ne $self->{schema}));
-			$sql_header .= "CREATE USER $_ WITH PASSWORD 'secret';\n";
-		}
-		foreach my $role (sort keys %{$self->{groups}}) {
-			push(@grps, $role);
-			$groups .= "CREATE GROUP $role WITH USER " . join(',', @{$self->{groups}{$role}}) . ";\n";
-		}
-		$sql_header .= "\n" . $groups . "\n";
-
-		# Add privilege definition
-		my $grants = '';
-		foreach my $table (sort keys %{$self->{grants}}) {
-			$grants .= "REVOKE ALL ON $table FROM PUBLIC;\n";
-			foreach my $priv (sort keys %{$self->{grants}{$table}}) {
-				my $usr = '';
-				my $grp = '';
-				foreach my $user (@{$self->{grants}{$table}{$priv}}) {
-					if (grep(/^$user$/, @grps)) {
-						$grp .= "$user,";
-					} else {
-						$usr .= "$user,";
-					}
-				}
-				$grp =~ s/,$//;
-				$usr =~ s/,$//;
-				if ($grp) {
-					$grants .= "GRANT $priv ON $table TO GROUP $grp;\n";
-				} else {
-					$grants .= "GRANT $priv ON $table TO $usr;\n";
-				}
-			}
-		}
-
-		if (!$grants) {
-			$$grants = "-- Nothing found of type $self->{type}\n";
-		}
-
-		$sql_output .= "\n" . $grants . "\n";
-
-		return $sql_header . $sql_output . "\nEND TRANSACTION;\n";
-	}
-
-	# Process sequences only
-	if ($self->{type} eq 'SEQUENCE') {
-print STDERR "Add sequences definition...\n" if ($self->{debug});
-		foreach my $seq (@{$self->{sequences}}) {
-			my $cache = 1;
-			$cache = $seq->[5] if ($seq->[5]);
-			my $cycle = '';
-			$cycle = ' CYCLE' if ($seq->[6] eq 'Y');
-			if ($seq->[2] > 2147483646) {
-				$seq->[2] = 2147483646;
-			}
-			if ($seq->[1] < -2147483647) {
-				$seq->[1] = -2147483647;
-			}
-			$sql_output .= "CREATE SEQUENCE \L$seq->[0]\E INCREMENT $seq->[3] MINVALUE $seq->[1] MAXVALUE $seq->[2] START $seq->[4] CACHE $cache$cycle;\n";
-		}
-
-		if (!$sql_output) {
-			$sql_output = "-- Nothing found of type $self->{type}\n";
-		}
-
-		return $sql_header . $sql_output . "\nEND TRANSACTION;\n";
-	}
-
-	# Process triggers only. PL/SQL code is pre-converted to PL/PGSQL following
-	# the recommendation of Roberto Mello, see http://techdocs.postgresql.org/
-	# Oracle's PL/SQL to PostgreSQL PL/pgSQL HOWTO  
-	if ($self->{type} eq 'TRIGGER') {
-print STDERR "Add triggers definition...\n" if ($self->{debug});
-		foreach my $trig (@{$self->{triggers}}) {
-			$trig->[1] =~ s/ EACH ROW//;
-			chop($trig->[4]);
-			chomp($trig->[4]);
-			# Check if it's a pg rule
-			if ($trig->[1] =~ /INSTEAD OF/) {
-				$sql_output .= "CREATE RULE \L$trig->[0]\E AS\n\tON \L$trig->[3]\E\n\tDO INSTEAD\n(\n\t$trig->[4]\n);\n\n";
-			} else {
-
-				#--------------------------------------------
-				# PL/SQL to PL/PGSQL code conversion
-				#--------------------------------------------
-				# Change NVL to COALESCE
-				#$trig->[4] =~ s/NVL\(/coalesce(/igs;
-				# Change trunc() to date_trunc('day', field)
-				# Trunc is replaced with date_trunc if we find date in the name of the value
-				# because Oracle have the same trunc function on number and date type :-(((
-				#$trig->[4] =~ s/trunc\(([^\)]*date[^\)]*)\)/date_trunc('day', $1)/igs;
-				# Change SYSDATE to 'now'
-				#$trig->[4] =~ s/SYSDATE/CURRENT_TIMESTAMP/igs;
-				# Change nextval on sequence
-				# Oracle's sequence grammar is sequence_name.nextval.
-				# Postgres's sequence grammar is nextval('sequence_name'). 
-				#$trig->[4] =~ s/(\w+)\.nextval/nextval('$1')/isg;
-				# Escaping Single Quotes
-				#$trig->[4] =~ s/'/''/sg;
-
-				$sql_output .= "CREATE FUNCTION pg_fct_\L$trig->[0]\E () RETURNS OPAQUE AS '\n$trig->[4]\n' LANGUAGE 'plpgsql'\n\n";
-				$sql_output .= "CREATE TRIGGER \L$trig->[0]\E\n\t$trig->[1] $trig->[2] ON \L$trig->[3]\E FOR EACH ROW\n\tEXECUTE PROCEDURE pg_fct_\L$trig->[0]\E();\n\n";
-			}
-		}
-
-		if (!$sql_output) {
-			$sql_output = "-- Nothing found of type $self->{type}\n";
-		}
-
-		return $sql_header . $sql_output . "\nEND TRANSACTION;\n";
-	}
-
-	# Process functions only
-	if (($self->{type} eq 'FUNCTION') || ($self->{type} eq 'PROCEDURE')) {
-print STDERR "Add functions definition...\n" if ($self->{debug});
-		foreach my $fct (sort keys %{$self->{functions}}) {
-			my @tmp = ();
-			if ($self->{functions}{$fct} =~ /^[\s\t]*function/is) {
-				#$self->{functions}{$fct} =~ /function[\s\n\t]*$fct[\s\n\t]*\(([^\)]*)\)/is;
-				$self->{functions}{$fct} =~ /function[\s\n\t]*$fct[\s\n\t]*\(([^\)]*)\)[\s\n\t]*is/is;
-				@tmp = split(/\n/, $1);
-			} else {
-				#$self->{functions}{$fct} =~ /procedure[\s\n\t]*$fct[\s\n\t]*\(([^\)]*)\)/is;
-				$self->{functions}{$fct} =~ /procedure[\s\n\t]*$fct[\s\n\t]*\(([^\)]*)\)[\s\n\t]*is\W/is;
-				@tmp = split(/\n/, $1);
-			}
-			my @argu = split(/,/, join(' ', @tmp));
-			map { s/^.* in //is } @argu;
-			map { s/^.* out //is } @argu;
-			map { $_ = $self->_sql_type(uc($_)) } @argu;
-			$self->{functions}{$fct} =~ /return ([^\s]*) is/is;
-			$self->{functions}{$fct} = "-- Oracle function declaration, please edit to match PostgreSQL syntax.\n$self->{functions}{$fct}";
-			$sql_output .= "-- PostgreSQL possible function declaration, please edit to match your needs.\nCREATE FUNCTION \L$fct\E(" . join(',', @argu) . ") RETURNS " . $self->_sql_type(uc($1)) . " AS '\n$self->{functions}{$fct}\n' LANGUAGE 'sql'\n\n";
-		}
-
-		if (!$sql_output) {
-			$sql_output = "-- Nothing found of type $self->{type}\n";
-		}
-
-		return $sql_header . $sql_output . "\nEND TRANSACTION;\n";
-	}
-
-	# Process functions only
-	if ($self->{type} eq 'PACKAGE') {
-print STDERR "Add packages definition...\n" if ($self->{debug});
-		foreach my $pkg (sort keys %{$self->{packages}}) {
-			$sql_output .= "-- Oracle package '$pkg' declaration, please edit to match PostgreSQL syntax.\n";
-			$sql_output .= "$self->{packages}{$pkg}\n";
-			$sql_output .= "-- End of Oracle package '$pkg' declaration\n\n";
-		}
-
-		if (!$sql_output) {
-			$sql_output = "-- Nothing found of type $self->{type}\n";
-		}
-
-		return $sql_header . $sql_output . "\nEND TRANSACTION;\n";
-	}
-
-
-
-	# Extract data only
-	if (($self->{type} eq 'DATA') || ($self->{type} eq 'COPY')) {
-		# Connect the database
-		$self->{dbh} = DBI->connect($self->{datasource}, $self->{user}, $self->{password});
-		# Check for connection failure
-		if (!$self->{dbh}) {
-			die "Error : $DBI::err ... $DBI::errstr\n";
-		}
-
-		if (!$self->{dbhdest}) {
-			if ($outfile) {
-				open(FILE,">$outfile") or die "Can't open $outfile: $!";
-				print FILE $sql_header;
-			} else {
-				print $sql_header;
-			}
-		} else {
-			if ($self->{type} eq 'COPY') {
-				open(DBH, "| $PSQL -h $self->{dbhost} -p $self->{dbport} -d $self->{dbname}") or die "Can't open $PSQL command, $!\n";
-			}
-		}
-
-		foreach my $table (keys %{$self->{tables}}) {
-print STDERR "Dumping table $table...\n" if ($self->{debug});
-			my @tt = ();
-			my @nn = ();
-			my $s_out = "INSERT INTO \"\L$table\E\" (";
-			if ($self->{type} eq 'COPY') {
-				$s_out = "COPY \"\L$table\E\" FROM stdin;\n";
-			}
-
-			foreach my $i ( 0 .. $#{$self->{tables}{$table}{field_name}} ) {
-				my $fieldname = ${$self->{tables}{$table}{field_name}}[$i];
-				if (exists $self->{modify}{"\L$table\E"}) {
-					next if (!grep(/\L$fieldname\E/, @{$self->{modify}{"\L$table\E"}}));
-				}
-				foreach my $f (@{$self->{tables}{$table}{column_info}}) {
-					next if (${$f}[0] ne "$fieldname");
-					my $type = $self->_sql_type(${$f}[1], ${$f}[2], ${$f}[5], ${$f}[6]);
-					$type = "${$f}[1], ${$f}[2]" if (!$type);
-					push(@tt, $type);
-					push(@nn, ${$f}[0]);
-					if ($self->{type} ne 'COPY') {
-						$s_out .= "\"\L${$f}[0]\E\",";
-					}
-					last;
-				}
-			}
-
-			if ($self->{type} ne 'COPY') {
-				$s_out =~ s/,$//;
-				$s_out .= ") VALUES (";
-			}
-			# Extract all data from the current table
-			$self->{data_current} = 0;
-			$self->{data_end} = 0;
-			while ( !$self->{data_end} ) {
-				my $sth = $self->_get_data($table, \@nn, \@tt);
-				$self->{data_end} = 1 if (!$self->{data_limit});
-				my $count = 0;
-				my $sql = '';
-				if ($self->{type} eq 'COPY') {
-					if ($self->{dbhdest}) {
-						$sql = $s_out;
-					} else {
-						if ($outfile) {
-							print FILE $s_out;
-						} else {
-							print $s_out;
-						}
-					}
-				}
-				while (my $row = $sth->fetch) {
-					if ($self->{type} ne 'COPY') {
-						if ($self->{dbhdest}) {
-							$sql .= $s_out;
-						} else {
-							if ($outfile) {
-								print FILE $s_out;
-							} else {
-								print $s_out;
-							}
-						}
-					}
-					for (my $i = 0; $i <= $#{$row}; $i++) {
-						if ($self->{type} ne 'COPY') {
-							if ($tt[$i] =~ /(char|date|time|text)/) {
-								$row->[$i] =~ s/'/''/gs;
-								if ($row->[$i]) {
-									$row->[$i] = "'$row->[$i]'";
-								} else {
-									$row->[$i] = 'NULL';
-								}
-								if ($self->{dbhdest}) {
-									$sql .= $row->[$i];
-								} else {
-									if ($outfile) {
-										print FILE $row->[$i];
-									} else {
-										print $row->[$i];
-									}
-								}
-							} else {
-								if (!$row->[$i]) {
-									$row->[$i] = 'NULL';
-								}
-								if ($self->{dbhdest}) {
-									$sql .= $row->[$i];
-								} else {
-									if ($outfile) {
-										print FILE $row->[$i];
-									} else {
-										print $row->[$i];
-									}
-								}
-							}
-							if ($i < $#{$row}) {
-								if ($self->{dbhdest}) {
-									$sql .= ",";
-								} else {
-									if ($outfile) {
-										print FILE ",";
-									} else {
-										print ",";
-									}
-								}
-							}
-						} else {
-							if (!$row->[$i]) {
-								$row->[$i] = '\N';
-							}
-							if ($self->{dbhdest}) {
-								$sql .= $row->[$i];
-							} else {
-								if ($outfile) {
-									print FILE $row->[$i];
-								} else {
-									print $row->[$i];
-								}
-							}
-							if ($i < $#{$row}) {
-								if ($self->{dbhdest}) {
-									$sql .= "\t";
-								} else {
-									if ($outfile) {
-										print FILE "\t";
-									} else {
-										print "\t";
-									}
-								}
-							} else {
-								if ($self->{dbhdest}) {
-									$sql .= "\n";
-								} else {
-									if ($outfile) {
-										print FILE "\n";
-									} else {
-										print "\n";
-									}
-								}
-							}
-						}
-					}
-					if ($self->{type} ne 'COPY') {
-						if ($self->{dbhdest}) {
-							$sql .= ");\n";
-						} else {
-							if ($outfile) {
-								print FILE ");\n";
-							} else {
-								print ");\n";
-							}
-						}
-					}
-					$count++;
-				}
-				if ($self->{type} eq 'COPY') {
-					if ($self->{dbhdest}) {
-						$sql .= "\\.\n";
-					} else {
-						if ($outfile) {
-							print FILE "\\.\n";
-						} else {
-							print "\\.\n";
-						}
-					}
-				}
-				if ($self->{data_limit}) {
-					$self->{data_end} = 1 if ($count+1 < $self->{data_limit});
-				}
-				# Insert data if we are in online processing mode
-				if ($self->{dbhdest}) {
-					if ($self->{type} ne 'COPY') {
-						my $s = $self->{dbhdest}->prepare($sql) or die $self->{dbhdest}->errstr . "\n";
-						$s->execute or die $s->errstr . "\n";
-					} else {
-						print DBH "$sql";
-					}
-				}
-			}
-		}
-
-		# Disconnect from the database
-		$self->{dbh}->disconnect() if ($self->{dbh});
-
-		if (!$self->{dbhdest}) {
-			if ($outfile) {
-				print FILE "\nEND TRANSACTION;\n";
-			} else {
-				print "\nEND TRANSACTION;\n";
-			}
-		}
-
-		$self->{dbhdest}->disconnect() if ($self->{dbhdest});
-
-		if ($self->{type} eq 'COPY') {
-			close DBH;
-		}
-
-		return;
-	}
-
-
-	# Dump the database structure
-	foreach my $table (keys %{$self->{tables}}) {
-print STDERR "Dumping table $table...\n" if ($self->{debug});
-		$sql_output .= "CREATE ${$self->{tables}{$table}{table_info}}[1] \"\L$table\E\" (\n";
-		my $sql_ukey = "";
-		my $sql_pkey = "";
-		foreach my $i ( 0 .. $#{$self->{tables}{$table}{field_name}} ) {
-			foreach my $f (@{$self->{tables}{$table}{column_info}}) {
-				next if (${$f}[0] ne "${$self->{tables}{$table}{field_name}}[$i]");
-				my $type = $self->_sql_type(${$f}[1], ${$f}[2], ${$f}[5], ${$f}[6]);
-				$type = "${$f}[1], ${$f}[2]" if (!$type);
-				$sql_output .= "\t\"\L${$f}[0]\E\" $type";
-				# Set the primary key definition 
-				foreach my $k (@{$self->{tables}{$table}{primary_key}}) {
-					next if ($k ne "${$f}[0]");
-					$sql_pkey .= "\"\L$k\E\",";
-					last;
-				}
-				if (${$f}[4] ne "") {
-					$sql_output .= " DEFAULT ${$f}[4]";
-				} elsif (!${$f}[3] || (${$f}[3] eq 'N')) {
-					$sql_output .= " NOT NULL";
-				}
-				# Set the unique key definition 
-				foreach my $k (@{$self->{tables}{$table}{unique_key}}) {
-					next if ( ($k ne "${$f}[0]") || (grep(/^$k$/, @{$self->{tables}{$table}{primary_key}})) );
-					$sql_ukey .= "\"\L$k\E\",";
-					last;
-				}
-				$sql_output .= ",\n";
-				last;
-			}
-		}
-		$sql_ukey =~ s/,$//;
-		$sql_pkey =~ s/,$//;
-		$sql_output .= "\tUNIQUE ($sql_ukey),\n" if ($sql_ukey);
-		$sql_output .= "\tPRIMARY KEY ($sql_pkey),\n" if ($sql_pkey);
-
-		# Add constraint definition
-		my @done = ();
-		foreach my $h (@{$self->{tables}{$table}{foreign_key}}) {
-			next if (grep(/^$h->[0]$/, @done));
-			my $desttable = '';
-			foreach (keys %{$self->{tables}{$table}{foreign_link}{$h->[0]}{remote}}) {
-				$desttable .= "$_";
-			}
-			push(@done, $h->[0]);
-			$sql_output .= "\tCONSTRAINT \L$h->[0]\E FOREIGN KEY (" . lc(join(',', @{$self->{tables}{$table}{foreign_link}{$h->[0]}{local}})) . ") REFERENCES \L$desttable\E (" . lc(join(',', @{$self->{tables}{$table}{foreign_link}{$h->[0]}{remote}{$desttable}})) . ")";
-			$sql_output .= " MATCH $h->[2]" if ($h->[2]);
-			$sql_output .= " ON DELETE $h->[3]";
-			$sql_output .= " $h->[4]";
-			$sql_output .= " INITIALLY $h->[5],\n";
-			
-		}
-		$sql_output =~ s/,$//;
-		$sql_output .= ");\n";
-		foreach my $idx (keys %{$self->{tables}{$table}{indexes}}) {
-			map { s/^/"/ } @{$self->{tables}{$table}{indexes}{$idx}};
-			map { s/$/"/ } @{$self->{tables}{$table}{indexes}{$idx}};
-			my $columns = join(',', @{$self->{tables}{$table}{indexes}{$idx}});
-			my $unique = '';
-			$unique = ' UNIQUE' if ($self->{tables}{$table}{uniqueness}{$idx} eq 'UNIQUE');
-			$sql_output .= "CREATE$unique INDEX \"\L$idx\E\" ON \"\L$table\E\" (\L$columns\E);\n";
-		}
-		$sql_output .= "\n";
-	}
-
-	if (!$sql_output) {
-		$sql_output = "-- Nothing found of type TABLE\n";
-	}
-
-	return $sql_header . $sql_output . "\nEND TRANSACTION;\n";
-}
-
-
-=head2 _get_data TABLE
-
-This function implements a Oracle-native data extraction.
-
-Return a list of array reference containing the data
-
-=cut
-
-sub _get_data
-{
-	my ($self, $table, $name, $type) = @_;
-
-	my $str = "SELECT ";
-	my $tmp = "SELECT ";
-	for my $k (0 .. $#{$name}) {
-		if ( $type->[$k] =~ /(date|time)/) {
-			$str .= "to_char($name->[$k], 'YYYY-MM-DD'),";
-		} else {
-			$str .= "$name->[$k],";
-		}
-		$tmp .= "$name->[$k],";
-	}
-	$str =~ s/,$//;
-	$tmp =~ s/,$//;
-	my $tmp2 = $tmp;
-	$tmp2 =~ s/SELECT /SELECT ROWNUM as noline,/;
-
-	# Fix a problem when the table need to be prefixed by the schema
-	if ($self->{schema}) {
-		$table = "$self->{schema}.$table";
-	}
-	if ($self->{data_limit}) {
-		$str = $tmp . " FROM ( $tmp2 FROM ( $tmp FROM $table) ";
-		$str .= " WHERE ROWNUM < ($self->{data_limit} + $self->{data_current})) ";
-		$str .= " WHERE noline >= $self->{data_current}";
-	} else {
-		$str .= " FROM $table";
-	}
-	$self->{data_current} += $self->{data_limit};
-
-	# Fix a problem when exporting type LONG and LOB
-	$self->{dbh}->{'LongReadLen'} = 1023*1024;
-	$self->{dbh}->{'LongTruncOk'} = 1;
-
-	my $sth = $self->{dbh}->prepare($str) or die $sth->errstr . "\n";
-	$sth->execute or die $sth->errstr . "\n";
-
-	return $sth;	
-
-}
-
-
-=head2 _sql_type INTERNAL_TYPE LENGTH PRECISION SCALE
-
-This function return the PostgreSQL datatype corresponding to the
-Oracle internal type.
-
-=cut
-
-sub _sql_type
-{
-        my ($self, $type, $len, $precision, $scale) = @_;
-
-        my %TYPE = (
-		# Oracle only has one flexible underlying numeric type, NUMBER.
-		# Without precision and scale it is set to PG type float8 to match all needs
-                'NUMBER' => 'float8',
-		# CHAR types limit of 2000 bytes with default to 1 if no length is given.
-		# PG char type has max length set to 8104 so it should match all needs
-                'CHAR' => 'char',
-                'NCHAR' => 'char',
-		# VARCHAR types the limit is 2000 bytes in Oracle 7 and 4000 in Oracle 8.
-		# PG varchar type has max length iset to 8104 so it should match all needs
-                'VARCHAR' => 'varchar',
-                'NVARCHAR' => 'varchar',
-                'VARCHAR2' => 'varchar',
-                'NVARCHAR2' => 'varchar',
-		# The DATE data type is used to store the date and time information.
-		# Pg type timestamp should match all needs
-                'DATE' => 'timestamp',
-		# Type LONG is like VARCHAR2 but with up to 2Gb.
-		# PG type text should match all needs or if you want you could use blob
-                'LONG' => 'text', # Character data of variable length
-                'LONG RAW' => 'text', # Raw binary data of variable length
-		# Types LOB and FILE are like LONG but with up to 4Gb.
-		# PG type text should match all needs or if you want you could use blob (large object)
-                'CLOB' => 'text', # A large object containing single-byte characters
-                'NLOB' => 'text', # A large object containing national character set data
-                'BLOB' => 'text', # Binary large object
-                'BFILE' => 'text', # Locator for external large binary file
-		# The RAW type is presented as hexadecimal characters. The contents are treated as binary data. Limit of 2000 bytes
-		# Pg type text should match all needs or if you want you could use blob (large object)
-                'RAW' => 'text',
-                'ROWID' => 'oid',
-                'LONG RAW' => 'binary',
-                'FLOAT' => 'float8'
-        );
-
-        # Overide the length
-        $len = $precision if ( ($type eq 'NUMBER') && $precision );
-
-        if (exists $TYPE{$type}) {
-		if ($len) {
-			if ( ($type eq "CHAR") || ($type =~ /VARCHAR/) ) {
-				# Type CHAR have default length set to 1
-				# Type VARCHAR(2) must have a given length
-				$len = 1 if (!$len && ($type eq "CHAR"));
-                		return "$TYPE{$type}($len)";
-			} elsif ($type eq "NUMBER") {
-				# This is an integer
-				if (!$scale) {
-					if ($precision) {
-						return "numeric($precision)";
-					}
-				} else {
-					if ($precision) {
-						return "decimal($precision,$scale)";
-					}
-				}
-                		return "$TYPE{$type}";
-			} else {
-                		return "$TYPE{$type}";
-			}
-		} else {
-			
-                	return $TYPE{$type};
-		}
-        }
-
-        return;
-}
-
-
-=head2 _column_info TABLE
-
-This function implements a Oracle-native column information.
-
-Return a list of array reference containing the following informations
-for each column the given a table
-
-[(
-  column name,
-  column type,
-  column length,
-  nullable column,
-  default value
-)]
-
-=cut
-
-sub _column_info
-{
-	my ($self, $table) = @_;
-
-	my $sth = $self->{dbh}->prepare(<<END) or die $self->{dbh}->errstr;
-SELECT COLUMN_NAME, DATA_TYPE, DATA_LENGTH, NULLABLE, DATA_DEFAULT, DATA_PRECISION, DATA_SCALE
-FROM DBA_TAB_COLUMNS
-WHERE TABLE_NAME='$table'
-END
-	$sth->execute or die $sth->errstr;
-	my $data = $sth->fetchall_arrayref();
-if ($self->{debug}) {
-	foreach my $d (@$data) {
-print STDERR "\t$d->[0] => type:$d->[1] , length:$d->[2], precision:$d->[5], scale:$d->[6], nullable:$d->[3] , default:$d->[4]\n";
-	}
-}
-
-	return @$data;	
-
-}
-
-
-=head2 _primary_key TABLE
-
-This function implements a Oracle-native primary key column
-information.
-
-Return a list of all column name defined as primary key
-for the given table.
-
-=cut
-
-sub _primary_key
-{
-	my($self, $table) = @_;
-
-	my $sth = $self->{dbh}->prepare(<<END) or die $self->{dbh}->errstr;
-select   all_cons_columns.COLUMN_NAME
-from     all_constraints, all_cons_columns
-where    all_constraints.CONSTRAINT_TYPE='P'
-and      all_constraints.constraint_name=all_cons_columns.constraint_name
-and      all_constraints.STATUS='ENABLED'
-and      all_constraints.TABLE_NAME='$table'
-order by all_cons_columns.position
-END
-	$sth->execute or die $sth->errstr;
-	my @data = ();
-	while (my $row = $sth->fetch) {
-		push(@data, ${@$row}[0]) if (${@$row}[0] !~ /\$/);
-	}
-	return @data;
-}
-
-
-=head2 _unique_key TABLE
-
-This function implements a Oracle-native unique key column
-information.
-
-Return a list of all column name defined as unique key
-for the given table.
-
-=cut
-
-sub _unique_key
-{
-	my($self, $table) = @_;
-
-	my $sth = $self->{dbh}->prepare(<<END) or die $self->{dbh}->errstr;
-select   all_cons_columns.COLUMN_NAME
-from     all_constraints, all_cons_columns
-where    all_constraints.CONSTRAINT_TYPE='U'
-and      all_constraints.constraint_name=all_cons_columns.constraint_name
-and      all_constraints.STATUS='ENABLED'
-and      all_constraints.TABLE_NAME='$table'
-order by all_cons_columns.position
-END
-	$sth->execute or die $sth->errstr;
-
-	my @data = ();
-	while (my $row = $sth->fetch) {
-		push(@data, ${@$row}[0]) if (${@$row}[0] !~ /\$/);
-	}
-	return @data;
-}
-
-
-=head2 _foreign_key TABLE
-
-This function implements a Oracle-native foreign key reference
-information.
-
-Return a list of hash of hash of array reference. Ouuf! Nothing very difficult.
-The first hash is composed of all foreign key name. The second hash just have
-two key known as 'local' and remote' corresponding to the local table where the
-foreign key is defined and the remote table where the key refer.
-
-The foreign key name is composed as follow:
-
-    'local_table_name->remote_table_name'
-
-Foreign key data consist in two array representing at the same indice the local
-field and the remote field where the first one refer to the second.
-Just like this:
-
-    @{$link{$fkey_name}{local}} = @local_columns;
-    @{$link{$fkey_name}{remote}} = @remote_columns;
-
-=cut
-
-sub _foreign_key
-{
-	my ($self, $table) = @_;
-
-	my $str = "SELECT CONSTRAINT_NAME,R_CONSTRAINT_NAME,SEARCH_CONDITION,DELETE_RULE,DEFERRABLE,DEFERRED FROM DBA_CONSTRAINTS WHERE CONSTRAINT_TYPE='R' AND STATUS='ENABLED' AND TABLE_NAME='$table'";
-	my $sth = $self->{dbh}->prepare($str) or die $self->{dbh}->errstr;
-	$sth->execute or die $sth->errstr;
-
-	my @data = ();
-	my %link = ();
-	my @tab_done = ();
-	while (my $row = $sth->fetch) {
-		next if (grep(/^$row->[0]$/, @tab_done));
-		push(@data, [ @$row ]);
-		push(@tab_done, $row->[0]);
-		my $sql = "SELECT DISTINCT COLUMN_NAME FROM DBA_CONS_COLUMNS WHERE CONSTRAINT_NAME='$row->[0]'";
-		my $sth2 = $self->{dbh}->prepare($sql) or die $self->{dbh}->errstr;
-		$sth2->execute or die $sth2->errstr;
-		my @done = ();
-		while (my $r = $sth2->fetch) {
-			if (!grep(/^$r->[0]$/, @done)) {
-				push(@{$link{$row->[0]}{local}}, $r->[0]);
-				push(@done, $r->[0]);
-			}
-		}
-		$sql = "SELECT DISTINCT TABLE_NAME,COLUMN_NAME FROM DBA_CONS_COLUMNS WHERE CONSTRAINT_NAME='$row->[1]'";
-		$sth2 = $self->{dbh}->prepare($sql) or die $self->{dbh}->errstr;
-		$sth2->execute or die $sth2->errstr;
-		@done = ();
-		while (my $r = $sth2->fetch) {
-			if (!grep(/^$r->[1]$/, @done)) {
-				push(@{$link{$row->[0]}{remote}{$r->[0]}}, $r->[1]);
-				push(@done, $r->[1]);
-			}
-		}
-	}
-
-	return \%link, \@data;
-}
-
-
-=head2 _get_users
-
-This function implements a Oracle-native users information.
-
-Return a hash of all users as an array.
-
-=cut
-
-sub _get_users
-{
-	my($self) = @_;
-
-	# Retrieve all USERS defined in this database
-	my $str = "SELECT USERNAME FROM DBA_USERS";
-	if (!$self->{schema}) {
-		$str .= " WHERE USERNAME <> 'SYS' AND USERNAME <> 'SYSTEM' AND USERNAME <> 'DBSNMP' AND USERNAME <> 'OUTLN'";
-	} else {
-		$str .= " WHERE USERNAME = '$self->{schema}'";
-	}
-	$str .= " ORDER BY USERNAME";
-	my $sth = $self->{dbh}->prepare($str) or die $self->{dbh}->errstr;
-
-	$sth->execute or die $sth->errstr;
-	my @users = ();
-	while (my $row = $sth->fetch) {
-		push(@users, $row->[0]);
-	}
-
-	return \@users;
-}
-
-
-
-=head2 _get_roles
-
-This function implements a Oracle-native roles
-information.
-
-Return a hash of all groups (roles) as an array of associated users.
-
-=cut
-
-sub _get_roles
-{
-	my($self) = @_;
-
-	# Retrieve all ROLES defined in this database
-	my $str = "SELECT GRANTED_ROLE,GRANTEE FROM DBA_ROLE_PRIVS WHERE GRANTEE NOT IN (select distinct role from dba_roles)";
-	if (!$self->{schema}) {
-		$str .= " AND GRANTEE <> 'SYS' AND GRANTEE <> 'SYSTEM' AND GRANTEE <> 'DBSNMP' AND GRANTEE <> 'OUTLN'";
-	} else {
-		$str .= " AND GRANTEE = '$self->{schema}'";
-	}
-	my $sth = $self->{dbh}->prepare($str) or die $self->{dbh}->errstr;
-
-	$sth->execute or die $sth->errstr;
-	my %roles = ();
-	while (my $row = $sth->fetch) {
-		push(@{$roles{"$row->[0]"}}, $row->[1]);
-	}
-
-	return \%roles;
-}
-
-
-=head2 _get_all_grants
-
-This function implements a Oracle-native user privilege
-information.
-
-Return a hash of all tables grants as an array of associated users.
-
-=cut
-
-sub _get_all_grants
-{
-	my($self) = @_;
-
-	my @PG_GRANTS = ('DELETE', 'INSERT', 'SELECT', 'UPDATE');
-
-	# Retrieve all ROLES defined in this database
-	my $str = "SELECT table_name,privilege,grantee FROM DBA_TAB_PRIVS";
-	if ($self->{schema}) {
-		$str .= " WHERE GRANTEE = '$self->{schema}'";
-	} else {
-		$str .= " WHERE GRANTEE <> 'SYS' AND GRANTEE <> 'SYSTEM' AND GRANTEE <> 'DBSNMP' AND GRANTEE <> 'OUTLN'";
-	}
-	$str .= " ORDER BY TABLE_NAME";
-
-	my $sth = $self->{dbh}->prepare($str) or die $self->{dbh}->errstr;
-
-	$sth->execute or die $sth->errstr;
-	my %grants = ();
-	while (my $row = $sth->fetch) {
-		push(@{$grants{"$row->[0]"}{"$row->[1]"}}, $row->[2]) if (grep(/$row->[1]/, @PG_GRANTS));
-	}
-
-	return \%grants;
-}
-
-
-
-=head2 _get_indexes TABLE
-
-This function implements a Oracle-native indexes information.
-
-Return hash of array containing all unique index and a hash of
-array of all indexes name which are not primary keys for the
-given table.
-
-=cut
-
-sub _get_indexes
-{
-	my($self, $table) = @_;
-
-	# Retrieve all indexes 
-	my $str = "SELECT DISTINCT DBA_IND_COLUMNS.INDEX_NAME, DBA_IND_COLUMNS.COLUMN_NAME, DBA_INDEXES.UNIQUENESS FROM DBA_IND_COLUMNS, DBA_INDEXES WHERE DBA_IND_COLUMNS.TABLE_NAME='$table' AND DBA_INDEXES.INDEX_NAME=DBA_IND_COLUMNS.INDEX_NAME AND DBA_IND_COLUMNS.INDEX_NAME NOT IN (SELECT CONSTRAINT_NAME FROM ALL_CONSTRAINTS WHERE TABLE_NAME='$table')";
-	my $sth = $self->{dbh}->prepare($str) or die $self->{dbh}->errstr;
-	$sth->execute or die $sth->errstr;
-
-	my %data = ();
-	my %unique = ();
-	while (my $row = $sth->fetch) {
-		$unique{$row->[0]} = $row->[2];
-		push(@{$data{$row->[0]}}, $row->[1]);
-	}
-
-	return \%unique, \%data;
-}
-
-
-=head2 _get_sequences
-
-This function implements a Oracle-native sequences
-information.
-
-Return a hash of array of sequence name with MIN_VALUE, MAX_VALUE,
-INCREMENT and LAST_NUMBER for the given table.
-
-=cut
-
-sub _get_sequences
-{
-	my($self) = @_;
-
-	# Retrieve all indexes 
-	my $str = "SELECT DISTINCT SEQUENCE_NAME, MIN_VALUE, MAX_VALUE, INCREMENT_BY, LAST_NUMBER, CACHE_SIZE, CYCLE_FLAG FROM DBA_SEQUENCES";
-	if (!$self->{schema}) {
-		$str .= " WHERE SEQUENCE_OWNER <> 'SYS' AND SEQUENCE_OWNER <> 'SYSTEM' AND SEQUENCE_OWNER <> 'DBSNMP' AND SEQUENCE_OWNER <> 'OUTLN'";
-	} else {
-		$str .= " WHERE SEQUENCE_OWNER = '$self->{schema}'";
-	}
-	my $sth = $self->{dbh}->prepare($str) or die $self->{dbh}->errstr;
-	$sth->execute or die $sth->errstr;
-
-	my @seqs = ();
-	while (my $row = $sth->fetch) {
-		push(@seqs, [ @$row ]);
-	}
-
-	return \@seqs;
-}
-
-
-=head2 _get_views
-
-This function implements a Oracle-native views information.
-
-Return a hash of view name with the SQL query it is based on.
-
-=cut
-
-sub _get_views
-{
-	my($self) = @_;
-
-	# Retrieve all views
-	my $str = "SELECT VIEW_NAME,TEXT FROM DBA_VIEWS";
-	if (!$self->{schema}) {
-		$str .= " WHERE OWNER <> 'SYS' AND OWNER <> 'SYSTEM' AND OWNER <> 'DBSNMP' AND OWNER <> 'OUTLN'";
-	} else {
-		$str .= " WHERE OWNER = '$self->{schema}'";
-	}
-	my $sth = $self->{dbh}->prepare($str) or die $self->{dbh}->errstr;
-	$sth->execute or die $sth->errstr;
-
-	my %data = ();
-	while (my $row = $sth->fetch) {
-		$data{$row->[0]} = $row->[1];
-		@{$data{$row->[0]}{alias}} = $self->_alias_info ($row->[0]);
-	}
-
-	return %data;
-}
-
-=head2 _alias_info
-
-This function implements a Oracle-native column information.
-
-Return a list of array reference containing the following informations
-for each alias of the given view
-
-[(
-  column name,
-  column id
-)]
-
-=cut
-
-sub _alias_info
-{
-        my ($self, $view) = @_;
-
-        my $sth = $self->{dbh}->prepare(<<END) or die $self->{dbh}->errstr;
-SELECT COLUMN_NAME, COLUMN_ID
-FROM DBA_TAB_COLUMNS
-WHERE TABLE_NAME='$view'
-END
-        $sth->execute or die $sth->errstr;
-        my $data = $sth->fetchall_arrayref();
-	if ($self->{debug}) {
-        	foreach my $d (@$data) {
-			print STDERR "\t$d->[0] =>  column id:$d->[1]\n";
-        	}
-	}
-
-        return @$data; 
-
-}
-
-=head2 _get_triggers
-
-This function implements a Oracle-native triggers information.
-
-Return an array of refarray of all triggers informations
-
-=cut
-
-sub _get_triggers
-{
-	my($self) = @_;
-
-	# Retrieve all indexes 
-	my $str = "SELECT TRIGGER_NAME, TRIGGER_TYPE, TRIGGERING_EVENT, TABLE_NAME, TRIGGER_BODY FROM DBA_TRIGGERS WHERE STATUS='ENABLED'";
-	if (!$self->{schema}) {
-		$str .= " AND OWNER <> 'SYS' AND OWNER <> 'SYSTEM' AND OWNER <> 'DBSNMP' AND OWNER <> 'OUTLN'";
-	} else {
-		$str .= " AND OWNER = '$self->{schema}'";
-	}
-	my $sth = $self->{dbh}->prepare($str) or die $self->{dbh}->errstr;
-	$sth->execute or die $sth->errstr;
-
-	my @triggers = ();
-	while (my $row = $sth->fetch) {
-		push(@triggers, [ @$row ]);
-	}
-
-	return \@triggers;
-}
-
-
-=head2 _get_functions
-
-This function implements a Oracle-native functions information.
-
-Return a hash of all function name with their PLSQL code
-
-=cut
-
-sub _get_functions
-{
-	my($self, $type) = @_;
-
-	# Retrieve all indexes 
-	my $str = "SELECT DISTINCT OBJECT_NAME,OWNER FROM DBA_OBJECTS WHERE OBJECT_TYPE='$type' AND STATUS='VALID'";
-	if (!$self->{schema}) {
-		$str .= " AND OWNER <> 'SYS' AND OWNER <> 'SYSTEM' AND OWNER <> 'DBSNMP' AND OWNER <> 'OUTLN'";
-	} else {
-		$str .= " AND OWNER = '$self->{schema}'";
-	}
-	my $sth = $self->{dbh}->prepare($str) or die $self->{dbh}->errstr;
-	$sth->execute or die $sth->errstr;
-
-	my %functions = ();
-	my @fct_done = ();
-	while (my $row = $sth->fetch) {
-		next if (grep(/^$row->[0]$/, @fct_done));
-		push(@fct_done, $row->[0]);
-		my $sql = "SELECT TEXT FROM DBA_SOURCE WHERE OWNER='$row->[1]' AND NAME='$row->[0]' ORDER BY LINE";
-		my $sth2 = $self->{dbh}->prepare($sql) or die $self->{dbh}->errstr;
-		$sth2->execute or die $sth2->errstr;
-		while (my $r = $sth2->fetch) {
-			$functions{"$row->[0]"} .= $r->[0];
-		}
-	}
-
-	return \%functions;
-}
-
-
-=head2 _get_packages
-
-This function implements a Oracle-native packages information.
-
-Return a hash of all function name with their PLSQL code
-
-=cut
-
-sub _get_packages
-{
-	my ($self) = @_;
-
-	# Retrieve all indexes 
-	my $str = "SELECT DISTINCT OBJECT_NAME,OWNER FROM DBA_OBJECTS WHERE OBJECT_TYPE='PACKAGE' AND STATUS='VALID'";
-	if (!$self->{schema}) {
-		$str .= " AND OWNER <> 'SYS' AND OWNER <> 'SYSTEM' AND OWNER <> 'DBSNMP' AND OWNER <> 'OUTLN'";
-	} else {
-		$str .= " AND OWNER = '$self->{schema}'";
-	}
-
-	my $sth = $self->{dbh}->prepare($str) or die $self->{dbh}->errstr;
-	$sth->execute or die $sth->errstr;
-
-	my %packages = ();
-	my @fct_done = ();
-	while (my $row = $sth->fetch) {
-print STDERR "\tFound Package: $row->[0]\n" if ($self->{debug});
-		next if (grep(/^$row->[0]$/, @fct_done));
-		push(@fct_done, $row->[0]);
-		my $sql = "SELECT TEXT FROM DBA_SOURCE WHERE OWNER='$row->[1]' AND NAME='$row->[0]' ORDER BY LINE";
-		my $sth2 = $self->{dbh}->prepare($sql) or die $self->{dbh}->errstr;
-		$sth2->execute or die $sth2->errstr;
-		while (my $r = $sth2->fetch) {
-			$packages{"$row->[0]"} .= $r->[0];
-		}
-	}
-
-	return \%packages;
-}
-
-
-
-=head2 _table_info
-
-This function retrieve all Oracle-native tables information.
-
-Return a handle to a DB query statement
-
-=cut
-
-
-sub _table_info
-{
-	my $self = shift;
-
-	my $sql = "SELECT
-                NULL            TABLE_CAT,
-                at.OWNER        TABLE_SCHEM,
-                at.TABLE_NAME,
-                tc.TABLE_TYPE,
-                tc.COMMENTS     REMARKS
-            from ALL_TABLES at, ALL_TAB_COMMENTS tc
-            where at.OWNER = tc.OWNER
-            and at.TABLE_NAME = tc.TABLE_NAME
-	";
-
-	if ($self->{schema}) {
-		$sql .= " and at.OWNER='$self->{schema}'";
-	} else {
-            $sql .= "AND at.OWNER <> 'SYS' AND at.OWNER <> 'SYSTEM' AND at.OWNER <> 'DBSNMP' AND at.OWNER <> 'OUTLN'";
-	}
-        $sql .= " order by tc.TABLE_TYPE, at.OWNER, at.TABLE_NAME";
-        my $sth = $self->{dbh}->prepare( $sql ) or return undef;
-        $sth->execute or return undef;
-        $sth;
-}
-
-1;
-
-__END__
-
-
-=head1 AUTHOR
-
-Gilles Darold <gilles@darold.net>
-
-
-=head1 COPYRIGHT
-
-Copyright (c) 2001 Gilles Darold - All rights reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the same terms as Perl itself.
-
-
-=head1 BUGS
-
-This perl module is in the same state as my knowledge regarding database,
-it can move and not be compatible with older version so I will do my best
-to give you official support for Ora2Pg. Your volontee to help construct
-it and your contribution are welcome.
-
-
-=head1 SEE ALSO
-
-L<DBI>, L<DBD::Oracle>, L<DBD::Pg>
-
-
-=head1 ACKNOWLEDGEMENTS
-
-Thanks to Jason Servetar who decided me to implement data extraction.
-
-=cut
-
-
diff --git a/contrib/oracle/README.ora2pg b/contrib/oracle/README.ora2pg
deleted file mode 100644
index 2d23f816af..0000000000
--- a/contrib/oracle/README.ora2pg
+++ /dev/null
@@ -1,480 +0,0 @@
-NAME
-    Ora2Pg - Oracle to PostgreSQL database schema converter
-
-SYNOPSIS
-            BEGIN {
-                    $ENV{ORACLE_HOME} = '/usr/local/oracle/oracle816';
-            }
-
-            use strict;
-
-            use Ora2Pg;
-
-            # Init the database connection
-            my $dbsrc = 'dbi:Oracle:host=testdb.samse.fr;sid=TEST;port=1521';
-            my $dbuser = 'system';
-            my $dbpwd = 'manager';
-
-            # Create an instance of the Ora2Pg perl module
-            my $schema = new Ora2Pg (
-                    datasource => $dbsrc,           # Database DBD datasource
-                    user => $dbuser,                # Database user
-                    password => $dbpwd,             # Database password
-                    {
-                            PrintError => 0,
-                            RaiseError => 1,
-                            AutoCommit => 0
-                    }
-            );
-
-            # Create the POSTGRESQL representation of all objects in the database
-            $schema->export_schema("output.sql");
-
-            exit(0);
-
-    or if you only want to extract some tables:
-
-            # Create an instance of the Ora2Pg perl module
-            my @tables = ('tab1', 'tab2', 'tab3');
-            my $schema = new Ora2Pg (
-                    datasource => $dbsrc,           # Database DBD datasource
-                    user => $dbuser,                # Database user
-                    password => $dbpwd,             # Database password
-                    tables => \@tables,
-            or                                      # Tables to extract
-                    tables => [('tab1','tab2')],
-                    debug => 1                      # To show somethings when running
-            );
-
-    or if you only want to extract the 10 first tables:
-
-            # Create an instance of the Ora2Pg perl module
-            my $schema = new Ora2Pg (
-                    datasource => $dbsrc,           # Database DBD datasource
-                    user => $dbuser,                # Database user
-                    password => $dbpwd,             # Database password
-                    max => 10                       # 10 first tables to extract
-            );
-
-    or if you only want to extract tables 10 to 20:
-
-            # Create an instance of the Ora2Pg perl module
-            my $schema = new Ora2Pg (
-                    datasource => $dbsrc,           # Database DBD datasource
-                    user => $dbuser,                # Database user
-                    password => $dbpwd,             # Database password
-                    min => 10,                      # Begin extraction at indice 10
-                    max => 20                       # End extraction at indice 20
-            );
-
-    To choose a particular Oracle schema to export just set the following
-    option to your schema name:
-
-            schema => 'APPS'
-
-    This schema definition can also be needed when you want to export data.
-    If export failed and complain that the table doesn't exists use this to
-    prefix the table name by the schema name.
-
-    To know at which indices tables can be found during extraction use the
-    option:
-
-            showtableid => 1
-
-    To extract all views set the type option as follow:
-
-            type => 'VIEW'
-
-    To extract all grants set the type option as follow:
-
-            type => 'GRANT'
-
-    To extract all sequences set the type option as follow:
-
-            type => 'SEQUENCE'
-
-    To extract all triggers set the type option as follow:
-
-            type => 'TRIGGER'
-
-    To extract all functions set the type option as follow:
-
-            type => 'FUNCTION'
-
-    To extract all procedures set the type option as follow:
-
-            type => 'PROCEDURE'
-
-    To extract all packages and body set the type option as follow:
-
-            type => 'PACKAGE'
-
-    Default is table extraction
-
-            type => 'TABLE'
-
-    To extract all data from table extraction as INSERT statement use:
-
-            type => 'DATA'
-
-    To extract all data from table extraction as COPY statement use:
-
-            type => 'COPY'
-
-    and data_limit => n to specify the max tuples to return. If you set this
-    options to 0 or nothing, no limitation are used. Additional option
-    'table', 'min' and 'max' can also be used.
-
-    When use of COPY or DATA you can export data by calling method:
-
-    $schema->export_data("output.sql");
-
-    Data are dumped to the given filename or to STDOUT with no argument. You
-    can also send these data directly to a PostgreSQL backend using the
-    following method:
-
-    $schema->send_to_pgdb($destdatasrc,$destuser,$destpasswd);
-
-    In this case you must call export_data() without argument after the call
-    to method send_to_pgdb().
-
-    If you set type to COPY and you want to dump data directly to a PG
-    database, you must call method send_to_pgdb but data will not be sent
-    via DBD::Pg but they will be load to the database using the psql
-    command. Calling this method is istill required to be able to extract
-    database name, hostname and port information. Edit the $PSQL variable to
-    match the path of your psql command (nothing to edit if psql is in your
-    path).
-
-DESCRIPTION
-    Ora2Pg is a perl OO module used to export an Oracle database schema to a
-    PostgreSQL compatible schema.
-
-    It simply connect to your Oracle database, extract its structure and
-    generate a SQL script that you can load into your PostgreSQL database.
-
-    I'm not a Oracle DBA so I don't really know something about its internal
-    structure so you may find some incorrect things. Please tell me what is
-    wrong and what can be better.
-
-    It currently dump the database schema (tables, views, sequences,
-    indexes, grants), with primary, unique and foreign keys into PostgreSQL
-    syntax without editing the SQL code generated.
-
-    It now can dump Oracle data into PostgreSQL DB as online process. You
-    can choose what columns can be exported for each table.
-
-    Functions, procedures and triggers PL/SQL code generated must be
-    reviewed to match the PostgreSQL syntax. Some usefull recommandation on
-    porting Oracle to PostgreSQL can be found at
-    http://techdocs.postgresql.org/ under the "Converting from other
-    Databases to PostgreSQL" Oracle part. I just notice one thing more is
-    that the trunc() function in Oracle is the same for number or date so be
-    carefull when porting to PostgreSQL to use trunc() for number and
-    date_trunc() for date.
-
-ABSTRACT
-    The goal of the Ora2Pg perl module is to cover all part needed to export
-    an Oracle database to a PostgreSQL database without other thing that
-    provide the connection parameters to the Oracle database.
-
-    Features must include:
-
-            - Database schema export (tables, views, sequences, indexes),
-              with unique, primary and foreign key.
-            - Grants/privileges export by user and group.
-            - Table selection (by name and max table) export.
-            - Predefined functions/triggers/procedures/packages export.
-            - Data export.
-            - Sql query converter (todo)
-
-    My knowledge regarding database is really poor especially for Oracle so
-    contribution is welcome.
-
-REQUIREMENT
-    You just need the DBI, DBD::Pg and DBD::Oracle perl module to be
-    installed
-
-PUBLIC METHODS
-  new HASH_OPTIONS
-
-    Creates a new Ora2Pg object.
-
-    Supported options are:
-
-            - datasource    : DBD datasource (required)
-            - user          : DBD user (optional with public access)
-            - password      : DBD password (optional with public access)
-            - schema        : Oracle internal schema to extract
-            - type          : Type of data to extract, can be TABLE,VIEW,GRANT,SEQUENCE,
-                              TRIGGER,FUNCTION,PROCEDURE,DATA,COPY,PACKAGE
-            - debug         : Print the current state of the parsing
-            - tables        : Extract only the given tables (arrayref)
-            - showtableid   : Display only the table indice during extraction
-            - min           : Indice to begin extraction. Default to 0
-            - max           : Indice to end extraction. Default to 0 mean no limits
-            - data_limit    : Number max of tuples to return during data extraction (default 10)
-
-    Attempt that this list should grow a little more because all
-    initialization is done by this way.
-
-  export_data FILENAME
-
-    Print SQL data output to a filename or to STDOUT if no file is given.
-
-    Must be used only if type option is set to DATA or COPY =cut
-
-    sub export_data { my ($self, $outfile) = @_;
-
-            $self->_get_sql_data($outfile);
-    }
-
-  export_sql FILENAME
-
-    Print SQL conversion output to a filename or simply return these data if
-    no file is given.
-
-  send_to_pgdb DEST_DATASRC DEST_USER DEST_PASSWD
-
-    Open a DB handle to a PostgreSQL database
-
-  modify_struct TABLE_NAME ARRAYOF_FIELDNAME
-
-    Modify a table structure during export. Only given fieldname will be
-    exported.
-
-PRIVATE METHODS
-  _init HASH_OPTIONS
-
-    Initialize a Ora2Pg object instance with a connexion to the Oracle
-    database.
-
-  _grants
-
-    This function is used to retrieve all privilege information.
-
-    It extract all Oracle's ROLES to convert them as Postgres groups and
-    search all users associated to these roles.
-
-    Set the main hash $self->{groups}. Set the main hash $self->{grantss}.
-
-  _sequences
-
-    This function is used to retrieve all sequences information.
-
-    Set the main hash $self->{sequences}.
-
-  _triggers
-
-    This function is used to retrieve all triggers information.
-
-    Set the main hash $self->{triggers}.
-
-  _functions
-
-    This function is used to retrieve all functions information.
-
-    Set the main hash $self->{functions}.
-
-  _packages
-
-    This function is used to retrieve all packages information.
-
-    Set the main hash $self->{packages}.
-
-  _tables
-
-    This function is used to retrieve all table information.
-
-    Set the main hash of the database structure $self->{tables}. Keys are
-    the names of all tables retrieved from the current database. Each table
-    information compose an array associated to the table_info key as array
-    reference. In other way:
-
-        $self->{tables}{$class_name}{table_info} = [(OWNER,TYPE)];
-
-    DBI TYPE can be TABLE, VIEW, SYSTEM TABLE, GLOBAL TEMPORARY, LOCAL
-    TEMPORARY, ALIAS, SYNONYM or a data source specific type identifier.
-    This only extract TABLE type.
-
-    It also get the following informations in the DBI object to affect the
-    main hash of the database structure :
-
-        $self->{tables}{$class_name}{field_name} = $sth->{NAME};
-        $self->{tables}{$class_name}{field_type} = $sth->{TYPE};
-
-    It also call these other private subroutine to affect the main hash of
-    the database structure :
-
-        @{$self->{tables}{$class_name}{column_info}} = $self->_column_info($class_name);
-        @{$self->{tables}{$class_name}{primary_key}} = $self->_primary_key($class_name);
-        @{$self->{tables}{$class_name}{unique_key}}  = $self->_unique_key($class_name);
-        @{$self->{tables}{$class_name}{foreign_key}} = $self->_foreign_key($class_name);
-
-  _views
-
-    This function is used to retrieve all views information.
-
-    Set the main hash of the views definition $self->{views}. Keys are the
-    names of all views retrieved from the current database values are the
-    text definition of the views.
-
-    It then set the main hash as follow:
-
-        # Definition of the view
-        $self->{views}{$table}{text} = $view_infos{$table};
-
-  _get_sql_data
-
-    Returns a string containing the entire SQL Schema definition compatible
-    with PostgreSQL
-
-  _get_data TABLE
-
-    This function implements a Oracle-native data extraction.
-
-    Return a list of array reference containing the data
-
-  _sql_type INTERNAL_TYPE LENGTH PRECISION SCALE
-
-    This function return the PostgreSQL datatype corresponding to the Oracle
-    internal type.
-
-  _column_info TABLE
-
-    This function implements a Oracle-native column information.
-
-    Return a list of array reference containing the following informations
-    for each column the given a table
-
-    [( column name, column type, column length, nullable column, default
-    value )]
-
-  _primary_key TABLE
-
-    This function implements a Oracle-native primary key column information.
-
-    Return a list of all column name defined as primary key for the given
-    table.
-
-  _unique_key TABLE
-
-    This function implements a Oracle-native unique key column information.
-
-    Return a list of all column name defined as unique key for the given
-    table.
-
-  _foreign_key TABLE
-
-    This function implements a Oracle-native foreign key reference
-    information.
-
-    Return a list of hash of hash of array reference. Ouuf! Nothing very
-    difficult. The first hash is composed of all foreign key name. The
-    second hash just have two key known as 'local' and remote' corresponding
-    to the local table where the foreign key is defined and the remote table
-    where the key refer.
-
-    The foreign key name is composed as follow:
-
-        'local_table_name->remote_table_name'
-
-    Foreign key data consist in two array representing at the same indice
-    the local field and the remote field where the first one refer to the
-    second. Just like this:
-
-        @{$link{$fkey_name}{local}} = @local_columns;
-        @{$link{$fkey_name}{remote}} = @remote_columns;
-
-  _get_users
-
-    This function implements a Oracle-native users information.
-
-    Return a hash of all users as an array.
-
-  _get_roles
-
-    This function implements a Oracle-native roles information.
-
-    Return a hash of all groups (roles) as an array of associated users.
-
-  _get_all_grants
-
-    This function implements a Oracle-native user privilege information.
-
-    Return a hash of all tables grants as an array of associated users.
-
-  _get_indexes TABLE
-
-    This function implements a Oracle-native indexes information.
-
-    Return hash of array containing all unique index and a hash of array of
-    all indexes name which are not primary keys for the given table.
-
-  _get_sequences
-
-    This function implements a Oracle-native sequences information.
-
-    Return a hash of array of sequence name with MIN_VALUE, MAX_VALUE,
-    INCREMENT and LAST_NUMBER for the given table.
-
-  _get_views
-
-    This function implements a Oracle-native views information.
-
-    Return a hash of view name with the SQL query it is based on.
-
-  _alias_info
-
-    This function implements a Oracle-native column information.
-
-    Return a list of array reference containing the following informations
-    for each alias of the given view
-
-    [( column name, column id )]
-
-  _get_triggers
-
-    This function implements a Oracle-native triggers information.
-
-    Return an array of refarray of all triggers informations
-
-  _get_functions
-
-    This function implements a Oracle-native functions information.
-
-    Return a hash of all function name with their PLSQL code
-
-  _get_packages
-
-    This function implements a Oracle-native packages information.
-
-    Return a hash of all function name with their PLSQL code
-
-  _table_info
-
-    This function retrieve all Oracle-native tables information.
-
-    Return a handle to a DB query statement
-
-AUTHOR
-    Gilles Darold <gilles@darold.net>
-
-COPYRIGHT
-    Copyright (c) 2001 Gilles Darold - All rights reserved.
-
-    This program is free software; you can redistribute it and/or modify it
-    under the same terms as Perl itself.
-
-BUGS
-    This perl module is in the same state as my knowledge regarding
-    database, it can move and not be compatible with older version so I will
-    do my best to give you official support for Ora2Pg. Your volontee to
-    help construct it and your contribution are welcome.
-
-SEE ALSO
-    the DBI manpage, the DBD::Oracle manpage, the DBD::Pg manpage
-
-ACKNOWLEDGEMENTS
-    Thanks to Jason Servetar who decided me to implement data extraction.
-
diff --git a/contrib/oracle/TODO b/contrib/oracle/TODO
deleted file mode 100644
index c9f4392170..0000000000
--- a/contrib/oracle/TODO
+++ /dev/null
@@ -1,10 +0,0 @@
-Add possible call to perl function for each field value exported
-(data conversion on the fly before dump)
-
-	- Fix problem regarding table/constraint output order.
-
-The following need your help :
-
-	- SQL queries converter.
-	- PL/SQL code converter.
-
diff --git a/contrib/oracle/ora2pg.html b/contrib/oracle/ora2pg.html
deleted file mode 100644
index 544ddcfae5..0000000000
--- a/contrib/oracle/ora2pg.html
+++ /dev/null
@@ -1,480 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Ora2Pg - Oracle to PostgreSQL database schema converter</TITLE>
-<LINK REV="made" HREF="mailto:darold@localhost.localdomain">
-</HEAD>
-
-<BODY>
-
-<A NAME="__index__"></A>
-<!-- INDEX BEGIN -->
-
-<UL>
-
-	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#synopsis">SYNOPSIS</A></LI>
-	<LI><A HREF="#description">DESCRIPTION</A></LI>
-	<LI><A HREF="#abstract">ABSTRACT</A></LI>
-	<LI><A HREF="#requirement">REQUIREMENT</A></LI>
-	<LI><A HREF="#public methods">PUBLIC METHODS</A></LI>
-	<UL>
-
-		<LI><A HREF="#new hash_options">new HASH_OPTIONS</A></LI>
-		<LI><A HREF="#export_data filename">export_data FILENAME</A></LI>
-		<LI><A HREF="#export_sql filename">export_sql FILENAME</A></LI>
-		<LI><A HREF="#send_to_pgdb dest_datasrc dest_user dest_passwd">send_to_pgdb DEST_DATASRC DEST_USER DEST_PASSWD</A></LI>
-		<LI><A HREF="#modify_struct table_name arrayof_fieldname">modify_struct TABLE_NAME ARRAYOF_FIELDNAME</A></LI>
-	</UL>
-
-	<LI><A HREF="#private methods">PRIVATE METHODS</A></LI>
-	<UL>
-
-		<LI><A HREF="#_init hash_options">_init HASH_OPTIONS</A></LI>
-		<LI><A HREF="#_grants">_grants</A></LI>
-		<LI><A HREF="#_sequences">_sequences</A></LI>
-		<LI><A HREF="#_triggers">_triggers</A></LI>
-		<LI><A HREF="#_functions">_functions</A></LI>
-		<LI><A HREF="#_packages">_packages</A></LI>
-		<LI><A HREF="#_tables">_tables</A></LI>
-		<LI><A HREF="#_views">_views</A></LI>
-		<LI><A HREF="#_get_sql_data">_get_sql_data</A></LI>
-		<LI><A HREF="#_get_data table">_get_data TABLE</A></LI>
-		<LI><A HREF="#_sql_type internal_type length precision scale">_sql_type INTERNAL_TYPE LENGTH PRECISION SCALE</A></LI>
-		<LI><A HREF="#_column_info table">_column_info TABLE</A></LI>
-		<LI><A HREF="#_primary_key table">_primary_key TABLE</A></LI>
-		<LI><A HREF="#_unique_key table">_unique_key TABLE</A></LI>
-		<LI><A HREF="#_foreign_key table">_foreign_key TABLE</A></LI>
-		<LI><A HREF="#_get_users">_get_users</A></LI>
-		<LI><A HREF="#_get_roles">_get_roles</A></LI>
-		<LI><A HREF="#_get_all_grants">_get_all_grants</A></LI>
-		<LI><A HREF="#_get_indexes table">_get_indexes TABLE</A></LI>
-		<LI><A HREF="#_get_sequences">_get_sequences</A></LI>
-		<LI><A HREF="#_get_views">_get_views</A></LI>
-		<LI><A HREF="#_alias_info">_alias_info</A></LI>
-		<LI><A HREF="#_get_triggers">_get_triggers</A></LI>
-		<LI><A HREF="#_get_functions">_get_functions</A></LI>
-		<LI><A HREF="#_get_packages">_get_packages</A></LI>
-		<LI><A HREF="#_table_info">_table_info</A></LI>
-	</UL>
-
-	<LI><A HREF="#author">AUTHOR</A></LI>
-	<LI><A HREF="#copyright">COPYRIGHT</A></LI>
-	<LI><A HREF="#bugs">BUGS</A></LI>
-	<LI><A HREF="#see also">SEE ALSO</A></LI>
-	<LI><A HREF="#acknowledgements">ACKNOWLEDGEMENTS</A></LI>
-</UL>
-<!-- INDEX END -->
-
-<HR>
-<P>
-<H1><A NAME="name">NAME</A></H1>
-<P>Ora2Pg - Oracle to PostgreSQL database schema converter</P>
-<P>
-<HR>
-<H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<PRE>
-        BEGIN {
-                $ENV{ORACLE_HOME} = '/usr/local/oracle/oracle816';
-        }</PRE>
-<PRE>
-        use strict;</PRE>
-<PRE>
-        use Ora2Pg;</PRE>
-<PRE>
-        # Init the database connection
-        my $dbsrc = 'dbi:Oracle:host=testdb.samse.fr;sid=TEST;port=1521';
-        my $dbuser = 'system';
-        my $dbpwd = 'manager';</PRE>
-<PRE>
-        # Create an instance of the Ora2Pg perl module
-        my $schema = new Ora2Pg (
-                datasource =&gt; $dbsrc,           # Database DBD datasource
-                user =&gt; $dbuser,                # Database user
-                password =&gt; $dbpwd,             # Database password
-                {
-                        PrintError =&gt; 0,
-                        RaiseError =&gt; 1,
-                        AutoCommit =&gt; 0
-                }
-        );</PRE>
-<PRE>
-        # Create the POSTGRESQL representation of all objects in the database
-        $schema-&gt;export_schema(&quot;output.sql&quot;);</PRE>
-<PRE>
-        exit(0);</PRE>
-<P>or if you only want to extract some tables:</P>
-<PRE>
-        # Create an instance of the Ora2Pg perl module
-        my @tables = ('tab1', 'tab2', 'tab3');
-        my $schema = new Ora2Pg (
-                datasource =&gt; $dbsrc,           # Database DBD datasource
-                user =&gt; $dbuser,                # Database user
-                password =&gt; $dbpwd,             # Database password
-                tables =&gt; \@tables,
-        or                                      # Tables to extract
-                tables =&gt; [('tab1','tab2')],
-                debug =&gt; 1                      # To show somethings when running
-        );</PRE>
-<P>or if you only want to extract the 10 first tables:</P>
-<PRE>
-        # Create an instance of the Ora2Pg perl module
-        my $schema = new Ora2Pg (
-                datasource =&gt; $dbsrc,           # Database DBD datasource
-                user =&gt; $dbuser,                # Database user
-                password =&gt; $dbpwd,             # Database password
-                max =&gt; 10                       # 10 first tables to extract
-        );</PRE>
-<P>or if you only want to extract tables 10 to 20:</P>
-<PRE>
-        # Create an instance of the Ora2Pg perl module
-        my $schema = new Ora2Pg (
-                datasource =&gt; $dbsrc,           # Database DBD datasource
-                user =&gt; $dbuser,                # Database user
-                password =&gt; $dbpwd,             # Database password
-                min =&gt; 10,                      # Begin extraction at indice 10
-                max =&gt; 20                       # End extraction at indice 20
-        );</PRE>
-<P>To choose a particular Oracle schema to export just set the following option
-to your schema name:</P>
-<PRE>
-        schema =&gt; 'APPS'</PRE>
-<P>This schema definition can also be needed when you want to export data. If export
-failed and complain that the table doesn't exists use this to prefix the table name
-by the schema name.</P>
-<P>To know at which indices tables can be found during extraction use the option:</P>
-<PRE>
-        showtableid =&gt; 1</PRE>
-<P>To extract all views set the type option as follow:</P>
-<PRE>
-        type =&gt; 'VIEW'</PRE>
-<P>To extract all grants set the type option as follow:</P>
-<PRE>
-        type =&gt; 'GRANT'</PRE>
-<P>To extract all sequences set the type option as follow:</P>
-<PRE>
-        type =&gt; 'SEQUENCE'</PRE>
-<P>To extract all triggers set the type option as follow:</P>
-<PRE>
-        type =&gt; 'TRIGGER'</PRE>
-<P>To extract all functions set the type option as follow:</P>
-<PRE>
-        type =&gt; 'FUNCTION'</PRE>
-<P>To extract all procedures set the type option as follow:</P>
-<PRE>
-        type =&gt; 'PROCEDURE'</PRE>
-<P>To extract all packages and body set the type option as follow:</P>
-<PRE>
-        type =&gt; 'PACKAGE'</PRE>
-<P>Default is table extraction</P>
-<PRE>
-        type =&gt; 'TABLE'</PRE>
-<P>To extract all data from table extraction as INSERT statement use:</P>
-<PRE>
-        type =&gt; 'DATA'</PRE>
-<P>To extract all data from table extraction as COPY statement use:</P>
-<PRE>
-        type =&gt; 'COPY'</PRE>
-<P>and data_limit =&gt; n to specify the max tuples to return. If you set
-this options to 0 or nothing, no limitation are used. Additional option
-'table', 'min' and 'max' can also be used.</P>
-<P>When use of COPY or DATA you can export data by calling method:</P>
-<P>$schema-&gt;export_data(``output.sql'');</P>
-<P>Data are dumped to the given filename or to STDOUT with no argument.
-You can also send these data directly to a PostgreSQL backend using
- the following method:</P>
-<P>$schema-&gt;send_to_pgdb($destdatasrc,$destuser,$destpasswd);</P>
-<P>In this case you must call <CODE>export_data()</CODE> without argument after the
-call to method send_to_pgdb().</P>
-<P>If you set type to COPY and you want to dump data directly to a PG database,
-you must call method send_to_pgdb but data will not be sent via DBD::Pg but
-they will be load to the database using the psql command. Calling this method
-is istill required to be able to extract database name, hostname and port
-information. Edit the $PSQL variable to match the path of your psql
-command (nothing to edit if psql is in your path).</P>
-<P>
-<HR>
-<H1><A NAME="description">DESCRIPTION</A></H1>
-<P>Ora2Pg is a perl OO module used to export an Oracle database schema
-to a PostgreSQL compatible schema.</P>
-<P>It simply connect to your Oracle database, extract its structure and
-generate a SQL script that you can load into your PostgreSQL database.</P>
-<P>I'm not a Oracle DBA so I don't really know something about its internal
-structure so you may find some incorrect things. Please tell me what is
-wrong and what can be better.</P>
-<P>It currently dump the database schema (tables, views, sequences, indexes, grants),
-with primary, unique and foreign keys into PostgreSQL syntax without editing the
-SQL code generated.</P>
-<P>It now can dump Oracle data into PostgreSQL DB as online process. You can choose
-what columns can be exported for each table.</P>
-<P>Functions, procedures and triggers PL/SQL code generated must be reviewed to match
-the PostgreSQL syntax. Some usefull recommandation on porting Oracle to PostgreSQL
-can be found at <A HREF="http://techdocs.postgresql.org/">http://techdocs.postgresql.org/</A> under the ``Converting from other
-Databases to PostgreSQL'' Oracle part. I just notice one thing more is that the
-<CODE>trunc()</CODE> function in Oracle is the same for number or date so be carefull when
-porting to PostgreSQL to use <CODE>trunc()</CODE> for number and <CODE>date_trunc()</CODE> for date.</P>
-<P>
-<HR>
-<H1><A NAME="abstract">ABSTRACT</A></H1>
-<P>The goal of the Ora2Pg perl module is to cover all part needed to export
-an Oracle database to a PostgreSQL database without other thing that provide
-the connection parameters to the Oracle database.</P>
-<P>Features must include:</P>
-<PRE>
-        - Database schema export (tables, views, sequences, indexes),
-          with unique, primary and foreign key.
-        - Grants/privileges export by user and group.
-        - Table selection (by name and max table) export.
-        - Predefined functions/triggers/procedures/packages export.
-        - Data export.
-        - Sql query converter (todo)</PRE>
-<P>My knowledge regarding database is really poor especially for Oracle
-so contribution is welcome.</P>
-<P>
-<HR>
-<H1><A NAME="requirement">REQUIREMENT</A></H1>
-<P>You just need the DBI, DBD::Pg and DBD::Oracle perl module to be installed</P>
-<P>
-<HR>
-<H1><A NAME="public methods">PUBLIC METHODS</A></H1>
-<P>
-<H2><A NAME="new hash_options">new HASH_OPTIONS</A></H2>
-<P>Creates a new Ora2Pg object.</P>
-<P>Supported options are:</P>
-<PRE>
-        - datasource    : DBD datasource (required)
-        - user          : DBD user (optional with public access)
-        - password      : DBD password (optional with public access)
-        - schema        : Oracle internal schema to extract
-        - type          : Type of data to extract, can be TABLE,VIEW,GRANT,SEQUENCE,
-                          TRIGGER,FUNCTION,PROCEDURE,DATA,COPY,PACKAGE
-        - debug         : Print the current state of the parsing
-        - tables        : Extract only the given tables (arrayref)
-        - showtableid   : Display only the table indice during extraction
-        - min           : Indice to begin extraction. Default to 0
-        - max           : Indice to end extraction. Default to 0 mean no limits
-        - data_limit    : Number max of tuples to return during data extraction (default 10)</PRE>
-<P>Attempt that this list should grow a little more because all initialization is
-done by this way.</P>
-<P>
-<H2><A NAME="export_data filename">export_data FILENAME</A></H2>
-<P>Print SQL data output to a filename or
-to STDOUT if no file is given.</P>
-<P>Must be used only if type option is set to DATA or COPY
-=cut</P>
-<P>sub export_data
-{
-	my ($self, $outfile) = @_;</P>
-<PRE>
-        $self-&gt;_get_sql_data($outfile);
-}</PRE>
-<P>
-<H2><A NAME="export_sql filename">export_sql FILENAME</A></H2>
-<P>Print SQL conversion output to a filename or
-simply return these data if no file is given.</P>
-<P>
-<H2><A NAME="send_to_pgdb dest_datasrc dest_user dest_passwd">send_to_pgdb DEST_DATASRC DEST_USER DEST_PASSWD</A></H2>
-<P>Open a DB handle to a PostgreSQL database</P>
-<P>
-<H2><A NAME="modify_struct table_name arrayof_fieldname">modify_struct TABLE_NAME ARRAYOF_FIELDNAME</A></H2>
-<P>Modify a table structure during export. Only given fieldname
-will be exported.</P>
-<P>
-<HR>
-<H1><A NAME="private methods">PRIVATE METHODS</A></H1>
-<P>
-<H2><A NAME="_init hash_options">_init HASH_OPTIONS</A></H2>
-<P>Initialize a Ora2Pg object instance with a connexion to the
-Oracle database.</P>
-<P>
-<H2><A NAME="_grants">_grants</A></H2>
-<P>This function is used to retrieve all privilege information.</P>
-<P>It extract all Oracle's ROLES to convert them as Postgres groups
-and search all users associated to these roles.</P>
-<P>Set the main hash $self-&gt;{groups}.
-Set the main hash $self-&gt;{grantss}.</P>
-<P>
-<H2><A NAME="_sequences">_sequences</A></H2>
-<P>This function is used to retrieve all sequences information.</P>
-<P>Set the main hash $self-&gt;{sequences}.</P>
-<P>
-<H2><A NAME="_triggers">_triggers</A></H2>
-<P>This function is used to retrieve all triggers information.</P>
-<P>Set the main hash $self-&gt;{triggers}.</P>
-<P>
-<H2><A NAME="_functions">_functions</A></H2>
-<P>This function is used to retrieve all functions information.</P>
-<P>Set the main hash $self-&gt;{functions}.</P>
-<P>
-<H2><A NAME="_packages">_packages</A></H2>
-<P>This function is used to retrieve all packages information.</P>
-<P>Set the main hash $self-&gt;{packages}.</P>
-<P>
-<H2><A NAME="_tables">_tables</A></H2>
-<P>This function is used to retrieve all table information.</P>
-<P>Set the main hash of the database structure $self-&gt;{tables}.
-Keys are the names of all tables retrieved from the current
-database. Each table information compose an array associated
-to the table_info key as array reference. In other way:</P>
-<PRE>
-    $self-&gt;{tables}{$class_name}{table_info} = [(OWNER,TYPE)];</PRE>
-<P>DBI TYPE can be TABLE, VIEW, SYSTEM TABLE, GLOBAL TEMPORARY, LOCAL TEMPORARY,
-ALIAS, SYNONYM or a data source specific type identifier. This only extract
-TABLE type.</P>
-<P>It also get the following informations in the DBI object to affect the
-main hash of the database structure :</P>
-<PRE>
-    $self-&gt;{tables}{$class_name}{field_name} = $sth-&gt;{NAME};
-    $self-&gt;{tables}{$class_name}{field_type} = $sth-&gt;{TYPE};</PRE>
-<P>It also call these other private subroutine to affect the main hash
-of the database structure :</P>
-<PRE>
-    @{$self-&gt;{tables}{$class_name}{column_info}} = $self-&gt;_column_info($class_name);
-    @{$self-&gt;{tables}{$class_name}{primary_key}} = $self-&gt;_primary_key($class_name);
-    @{$self-&gt;{tables}{$class_name}{unique_key}}  = $self-&gt;_unique_key($class_name);
-    @{$self-&gt;{tables}{$class_name}{foreign_key}} = $self-&gt;_foreign_key($class_name);</PRE>
-<P>
-<H2><A NAME="_views">_views</A></H2>
-<P>This function is used to retrieve all views information.</P>
-<P>Set the main hash of the views definition $self-&gt;{views}.
-Keys are the names of all views retrieved from the current
-database values are the text definition of the views.</P>
-<P>It then set the main hash as follow:</P>
-<PRE>
-    # Definition of the view
-    $self-&gt;{views}{$table}{text} = $view_infos{$table};</PRE>
-<P>
-<H2><A NAME="_get_sql_data">_get_sql_data</A></H2>
-<P>Returns a string containing the entire SQL Schema definition compatible with PostgreSQL</P>
-<P>
-<H2><A NAME="_get_data table">_get_data TABLE</A></H2>
-<P>This function implements a Oracle-native data extraction.</P>
-<P>Return a list of array reference containing the data</P>
-<P>
-<H2><A NAME="_sql_type internal_type length precision scale">_sql_type INTERNAL_TYPE LENGTH PRECISION SCALE</A></H2>
-<P>This function return the PostgreSQL datatype corresponding to the
-Oracle internal type.</P>
-<P>
-<H2><A NAME="_column_info table">_column_info TABLE</A></H2>
-<P>This function implements a Oracle-native column information.</P>
-<P>Return a list of array reference containing the following informations
-for each column the given a table</P>
-<P>[(
-  column name,
-  column type,
-  column length,
-  nullable column,
-  default value
-)]</P>
-<P>
-<H2><A NAME="_primary_key table">_primary_key TABLE</A></H2>
-<P>This function implements a Oracle-native primary key column
-information.</P>
-<P>Return a list of all column name defined as primary key
-for the given table.</P>
-<P>
-<H2><A NAME="_unique_key table">_unique_key TABLE</A></H2>
-<P>This function implements a Oracle-native unique key column
-information.</P>
-<P>Return a list of all column name defined as unique key
-for the given table.</P>
-<P>
-<H2><A NAME="_foreign_key table">_foreign_key TABLE</A></H2>
-<P>This function implements a Oracle-native foreign key reference
-information.</P>
-<P>Return a list of hash of hash of array reference. Ouuf! Nothing very difficult.
-The first hash is composed of all foreign key name. The second hash just have
-two key known as 'local' and remote' corresponding to the local table where the
-foreign key is defined and the remote table where the key refer.</P>
-<P>The foreign key name is composed as follow:</P>
-<PRE>
-    'local_table_name-&gt;remote_table_name'</PRE>
-<P>Foreign key data consist in two array representing at the same indice the local
-field and the remote field where the first one refer to the second.
-Just like this:</P>
-<PRE>
-    @{$link{$fkey_name}{local}} = @local_columns;
-    @{$link{$fkey_name}{remote}} = @remote_columns;</PRE>
-<P>
-<H2><A NAME="_get_users">_get_users</A></H2>
-<P>This function implements a Oracle-native users information.</P>
-<P>Return a hash of all users as an array.</P>
-<P>
-<H2><A NAME="_get_roles">_get_roles</A></H2>
-<P>This function implements a Oracle-native roles
-information.</P>
-<P>Return a hash of all groups (roles) as an array of associated users.</P>
-<P>
-<H2><A NAME="_get_all_grants">_get_all_grants</A></H2>
-<P>This function implements a Oracle-native user privilege
-information.</P>
-<P>Return a hash of all tables grants as an array of associated users.</P>
-<P>
-<H2><A NAME="_get_indexes table">_get_indexes TABLE</A></H2>
-<P>This function implements a Oracle-native indexes information.</P>
-<P>Return hash of array containing all unique index and a hash of
-array of all indexes name which are not primary keys for the
-given table.</P>
-<P>
-<H2><A NAME="_get_sequences">_get_sequences</A></H2>
-<P>This function implements a Oracle-native sequences
-information.</P>
-<P>Return a hash of array of sequence name with MIN_VALUE, MAX_VALUE,
-INCREMENT and LAST_NUMBER for the given table.</P>
-<P>
-<H2><A NAME="_get_views">_get_views</A></H2>
-<P>This function implements a Oracle-native views information.</P>
-<P>Return a hash of view name with the SQL query it is based on.</P>
-<P>
-<H2><A NAME="_alias_info">_alias_info</A></H2>
-<P>This function implements a Oracle-native column information.</P>
-<P>Return a list of array reference containing the following informations
-for each alias of the given view</P>
-<P>[(
-  column name,
-  column id
-)]</P>
-<P>
-<H2><A NAME="_get_triggers">_get_triggers</A></H2>
-<P>This function implements a Oracle-native triggers information.</P>
-<P>Return an array of refarray of all triggers informations</P>
-<P>
-<H2><A NAME="_get_functions">_get_functions</A></H2>
-<P>This function implements a Oracle-native functions information.</P>
-<P>Return a hash of all function name with their PLSQL code</P>
-<P>
-<H2><A NAME="_get_packages">_get_packages</A></H2>
-<P>This function implements a Oracle-native packages information.</P>
-<P>Return a hash of all function name with their PLSQL code</P>
-<P>
-<H2><A NAME="_table_info">_table_info</A></H2>
-<P>This function retrieve all Oracle-native tables information.</P>
-<P>Return a handle to a DB query statement</P>
-<P>
-<HR>
-<H1><A NAME="author">AUTHOR</A></H1>
-<P>Gilles Darold &lt;<A HREF="mailto:gilles@darold.net">gilles@darold.net</A>&gt;</P>
-<P>
-<HR>
-<H1><A NAME="copyright">COPYRIGHT</A></H1>
-<P>Copyright (c) 2001 Gilles Darold - All rights reserved.</P>
-<P>This program is free software; you can redistribute it and/or modify it under
-the same terms as Perl itself.</P>
-<P>
-<HR>
-<H1><A NAME="bugs">BUGS</A></H1>
-<P>This perl module is in the same state as my knowledge regarding database,
-it can move and not be compatible with older version so I will do my best
-to give you official support for Ora2Pg. Your volontee to help construct
-it and your contribution are welcome.</P>
-<P>
-<HR>
-<H1><A NAME="see also">SEE ALSO</A></H1>
-<P><EM>DBI</EM>, <A HREF="/DBD/Oracle.html">the DBD::Oracle manpage</A>, <A HREF="/DBD/Pg.html">the DBD::Pg manpage</A></P>
-<P>
-<HR>
-<H1><A NAME="acknowledgements">ACKNOWLEDGEMENTS</A></H1>
-<P>Thanks to Jason Servetar who decided me to implement data extraction.</P>
-
-</BODY>
-
-</HTML>
diff --git a/contrib/oracle/ora2pg.pl b/contrib/oracle/ora2pg.pl
deleted file mode 100755
index 3a15fb7bed..0000000000
--- a/contrib/oracle/ora2pg.pl
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/perl
-#------------------------------------------------------------------------------
-# Project  : Oracle2Postgresql
-# Name     : ora2pg.pl
-# Language : 5.006 built for i686-linux
-# OS       : linux RedHat 6.2 kernel 2.2.14-5
-# Author   : Gilles Darold, gilles@darold.net
-# Copyright: Copyright (c) 2000 : Gilles Darold - All rights reserved -
-# Function : Script used to convert Oracle Database schema to PostgreSQL
-#------------------------------------------------------------------------------
-# Version  : 1.1
-#------------------------------------------------------------------------------
-
-BEGIN {
-        $ENV{ORACLE_HOME} = '/usr/local/oracle/oracle816';
-}
-
-use strict;
-
-use Ora2Pg;
-
-# Initialyze the database connection
-my $dbsrc = 'dbi:Oracle:host=test.mydomain.com;sid=TEST;port=1521';
-my $dbuser = 'system';
-my $dbpwd = 'manager';
-
-# Create an instance of the XSD::DBISchema perl module
-my $schema = new Ora2Pg (
-	datasource => $dbsrc,		# Database DBD datasource
-	user => $dbuser,		# Database user
-	password => $dbpwd,		# Database password
-	debug => 1,			# Verbose mode
-	schema => 'APPS',		# Extract only APPS schema
-	type => 'TABLE',		# Extract table
-#	type => 'PACKAGE',		# Extract PACKAGE information
-#	type => 'DATA',			# Extract data with output as INSERT statement
-#	type => 'COPY',			# Extract data with output as COPY statement
-#	type => 'VIEW',			# Extract views
-#	type => 'GRANT',		# Extract privileges
-#	type => 'SEQUENCE',		# Extract sequences
-#	type => 'TRIGGER',		# Extract triggers
-#	type => 'FUNCTION',		# Extract functions
-#	type => 'PROCEDURE',		# Extract procedures
-#	tables => [('FND_USER_PREFERENCES')],	# unique index + users
-#	tables => [('CUSTOMER_DATA')],		# Unique and primary key
-#	tables => [('TX_DATA')],		# simple indexes
-#	tables => [('NDW_BROWSER_ATTRIBUTES')],	# view
-#	tables => [('TRIP_DATA')],	# Foreign key
-#	showtableid => 1,		# Display only table indice during extraction
-#	min => 1,			# Extract begin at indice 3
-#	max => 10,			# Extract ended at indice 5
-#	data_limit => 1000,		# Extract all data by dump of 1000 tuples
-#	data_limit => 0,		# Extract all data in one pass. Be sure to have enougth memory
-);
-
-# Just export data of the following fields from table 's_txcot'
-#$schema->modify_struct('s_txcot','dossier', 'rub', 'datapp');
-
-# Function to use for extraction when type option is set to DATA or COPY
-	# Send exported data to a PostgreSQL database
-	#$schema->send_to_pgdb('dbi:Pg:dbname=template1;host=localhost;port=5432','test','test');
-
-	# Output the data extracted from Oracle DB to a file or to STDOUT if no argument.
-	# If you set the send_to_pgdb() method the output is given to PG database. See above
-	#$schema->export_data("output.sql");
-
-# Function to use ifor extraction with other type
-	# Create the POSTGRESQL representation of all objects in the database
-	$schema->export_schema("output.sql");
-
-exit(0);
-
diff --git a/contrib/pg_controldata/Makefile b/contrib/pg_controldata/Makefile
deleted file mode 100644
index 80ffad854c..0000000000
--- a/contrib/pg_controldata/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/pg_controldata/Attic/Makefile,v 1.5 2001/09/06 10:49:29 petere Exp $
-
-subdir = contrib/pg_controldata
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-PROGRAM = pg_controldata
-OBJS	= pg_controldata.o pg_crc.o $(SNPRINTF)
-
-pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c
-	rm -f $@ && $(LN_S) $< .
-
-# this only gets done if configure finds system doesn't have snprintf()
-snprintf.c: $(top_srcdir)/src/backend/port/snprintf.c
-	rm -f $@ && $(LN_S) $< .
-
-EXTRA_CLEAN = pg_crc.c snprintf.c
-
-DOCS = README.pg_controldata
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/pg_controldata/README.pg_controldata b/contrib/pg_controldata/README.pg_controldata
deleted file mode 100644
index 85ca0e1467..0000000000
--- a/contrib/pg_controldata/README.pg_controldata
+++ /dev/null
@@ -1,32 +0,0 @@
-I had a need to read such things as the backend locale and the catalog
-version number from the current database, and couldn't find any existing
-program to do that.
-
-The attached utility produces output like this:
-
-$ pg_controldata
-pg_control version number:            71
-Catalog version number:               200101061
-Database state:                       IN_PRODUCTION
-pg_control last modified:             Sat Mar 10 00:07:55 2001
-Current log file id:                  0
-Next log file segment:                9
-Latest checkpoint location:           0/88CAA20
-Prior checkpoint location:            0/70A5D48
-Latest checkpoint's REDO location:    0/88CAA20
-Latest checkpoint's UNDO location:    0/0
-Latest checkpoint's StartUpID:        22
-Latest checkpoint's NextXID:          4711
-Latest checkpoint's NextOID:          444704
-Time of latest checkpoint:            Sat Mar 10 00:07:52 2001
-Database block size:                  8192
-Blocks per segment of large relation: 131072
-LC_COLLATE:                           C
-LC_CTYPE:                             C
-
-
-To access the pg_control file, the program must be run as the Postgres user,
-and PGDATA must be set correctly in its environment.
-
---
-Oliver Elphick                 <olly@lfix.co.uk>
diff --git a/contrib/pg_controldata/pg_controldata.c b/contrib/pg_controldata/pg_controldata.c
deleted file mode 100644
index 1cbd352caf..0000000000
--- a/contrib/pg_controldata/pg_controldata.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * pg_controldata
- *
- * reads the data from $PGDATA/global/pg_control
- *
- * copyright (c) Oliver Elphick <olly@lfix.co.uk>, 2001;
- * licence: BSD
- *
- * $Header: /cvsroot/pgsql/contrib/pg_controldata/Attic/pg_controldata.c,v 1.5 2001/10/25 05:49:19 momjian Exp $
- */
-#include "postgres.h"
-
-#include <unistd.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include "catalog/pg_control.h"
-
-
-static const char *
-dbState(DBState state)
-{
-	switch (state)
-	{
-		case DB_STARTUP:
-			return "STARTUP";
-		case DB_SHUTDOWNED:
-			return "SHUTDOWNED";
-		case DB_SHUTDOWNING:
-			return "SHUTDOWNING";
-		case DB_IN_RECOVERY:
-			return "IN_RECOVERY";
-		case DB_IN_PRODUCTION:
-			return "IN_PRODUCTION";
-	}
-	return "unrecognized status code";
-}
-
-
-int
-main(int argc, char *argv[])
-{
-	ControlFileData ControlFile;
-	int			fd;
-	char		ControlFilePath[MAXPGPATH];
-	char	   *DataDir;
-	crc64		crc;
-	char		pgctime_str[32];
-	char		ckpttime_str[32];
-
-	if (argc > 1)
-		DataDir = argv[1];
-	else
-		DataDir = getenv("PGDATA");
-	if (DataDir == NULL)
-	{
-		fprintf(stderr, "no data directory specified\n");
-		exit(1);
-	}
-
-	snprintf(ControlFilePath, MAXPGPATH, "%s/global/pg_control", DataDir);
-
-	if ((fd = open(ControlFilePath, O_RDONLY)) == -1)
-	{
-		perror("Failed to open $PGDATA/global/pg_control for reading");
-		exit(2);
-	}
-
-	if (read(fd, &ControlFile, sizeof(ControlFileData)) != sizeof(ControlFileData))
-	{
-		perror("Failed to read $PGDATA/global/pg_control");
-		exit(2);
-	}
-	close(fd);
-
-	/* Check the CRC. */
-	INIT_CRC64(crc);
-	COMP_CRC64(crc,
-			   (char *) &ControlFile + sizeof(crc64),
-			   sizeof(ControlFileData) - sizeof(crc64));
-	FIN_CRC64(crc);
-
-	if (!EQ_CRC64(crc, ControlFile.crc))
-		printf("WARNING: Calculated CRC checksum does not match value stored in file.\n"
-			   "Either the file is corrupt, or it has a different layout than this program\n"
-			   "is expecting.  The results below are untrustworthy.\n\n");
-
-	strftime(pgctime_str, 32, "%c",
-			 localtime(&(ControlFile.time)));
-	strftime(ckpttime_str, 32, "%c",
-			 localtime(&(ControlFile.checkPointCopy.time)));
-
-	printf("pg_control version number:            %u\n"
-		   "Catalog version number:               %u\n"
-		   "Database state:                       %s\n"
-		   "pg_control last modified:             %s\n"
-		   "Current log file id:                  %u\n"
-		   "Next log file segment:                %u\n"
-		   "Latest checkpoint location:           %X/%X\n"
-		   "Prior checkpoint location:            %X/%X\n"
-		   "Latest checkpoint's REDO location:    %X/%X\n"
-		   "Latest checkpoint's UNDO location:    %X/%X\n"
-		   "Latest checkpoint's StartUpID:        %u\n"
-		   "Latest checkpoint's NextXID:          %u\n"
-		   "Latest checkpoint's NextOID:          %u\n"
-		   "Time of latest checkpoint:            %s\n"
-		   "Database block size:                  %u\n"
-		   "Blocks per segment of large relation: %u\n"
-		   "LC_COLLATE:                           %s\n"
-		   "LC_CTYPE:                             %s\n",
-
-		   ControlFile.pg_control_version,
-		   ControlFile.catalog_version_no,
-		   dbState(ControlFile.state),
-		   pgctime_str,
-		   ControlFile.logId,
-		   ControlFile.logSeg,
-		   ControlFile.checkPoint.xlogid,
-		   ControlFile.checkPoint.xrecoff,
-		   ControlFile.prevCheckPoint.xlogid,
-		   ControlFile.prevCheckPoint.xrecoff,
-		   ControlFile.checkPointCopy.redo.xlogid,
-		   ControlFile.checkPointCopy.redo.xrecoff,
-		   ControlFile.checkPointCopy.undo.xlogid,
-		   ControlFile.checkPointCopy.undo.xrecoff,
-		   ControlFile.checkPointCopy.ThisStartUpID,
-		   ControlFile.checkPointCopy.nextXid,
-		   ControlFile.checkPointCopy.nextOid,
-		   ckpttime_str,
-		   ControlFile.blcksz,
-		   ControlFile.relseg_size,
-		   ControlFile.lc_collate,
-		   ControlFile.lc_ctype);
-
-	return (0);
-}
diff --git a/contrib/pg_dumplo/Makefile b/contrib/pg_dumplo/Makefile
deleted file mode 100644
index f4be54a4a8..0000000000
--- a/contrib/pg_dumplo/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.11 2001/09/06 10:49:30 petere Exp $
-
-subdir = contrib/pg_dumplo
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-PROGRAM = pg_dumplo
-OBJS	= main.o lo_export.o lo_import.o utils.o
-
-PG_CPPFLAGS = -I$(libpq_srcdir)
-PG_LIBS = $(libpq)
-
-DOCS = README.pg_dumplo
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/pg_dumplo/README.pg_dumplo b/contrib/pg_dumplo/README.pg_dumplo
deleted file mode 100644
index 76ea0f819b..0000000000
--- a/contrib/pg_dumplo/README.pg_dumplo
+++ /dev/null
@@ -1,148 +0,0 @@
-$Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/README.pg_dumplo,v 1.2 2000/11/22 00:00:55 tgl Exp $
-
-pg_dumplo - PostgreSQL large object dumper
-==========================================        
-
-By Karel Zak <zakkr@zf.jcu.cz>
-
-
-Compilation:
-===========
-
-	* run master ./configure in the PG source top directory  
-	* gmake all
-	* gmake install
-	
-THANKS:
-====== 
-
-	<??? I lost his e-mail ???>
-		* option '--all' and pg_class usage
-
-	Pavel Janík ml. <Pavel.Janik@linux.cz>
-		* HOWTO (the rest of this file)
-
-
-How to use pg_dumplo?
-=====================
-
-(c) 2000, Pavel Janík ml. <Pavel.Janik@linux.cz>
-
-
-Q: How do you use pg_dumplo?
-============================
-
-A: This is a small demo of backing up the database table with Large Objects:
-
-
-We will create a demo database and a small and useless table `lo' inside
-it:
-
-SnowWhite:$ createdb test
-CREATE DATABASE
-
-Ok, our database with the name 'test' is created. Now we should create demo
-table which will contain only one column with the name 'id' which will hold
-the OID number of a Large Object:
-
-SnowWhite:$ psql test
-Welcome to psql, the PostgreSQL interactive terminal.
-
-Type:  \copyright for distribution terms
-       \h for help with SQL commands
-       \? for help on internal slash commands
-       \g or terminate with semicolon to execute query
-       \q to quit
-
-test=# CREATE TABLE lo (id oid);
-CREATE
-test=# \lo_import /etc/aliases
-lo_import 19338
-test=# INSERT INTO lo VALUES (19338);
-INSERT 19352 1
-test=# select * from lo;
-  id   
--------
- 19338
-(1 row)
-
-test=# \q
-
-In the above example you can see that we have also imported one "Large
-Object" - the file /etc/aliases. It has an oid of 19338 so we have inserted
-this oid number to the database table lo to the column id. The final SELECT
-shows that we have one record in the table.
-
-Now we can demonstrate the work of pg_dumplo. We will create a dump directory
-which will contain the whole dump of large objects (/tmp/dump):
-
-mkdir -p /tmp/dump
-
-Now we can dump all large objects from the database `test' which have OIDs
-stored in the column `id' in the table `lo':
-
-SnowWhite:$ pg_dumplo -s /tmp/dump -d test -l lo.id
-pg_dumplo: dump lo.id (1 large obj)
-
-Voila, we have the dump of all Large Objects in our directory:
-
-SnowWhite:$ tree /tmp/dump/
-/tmp/dump/
-`-- test
-    |-- lo
-    |   `-- id
-    |       `-- 19338
-    `-- lo_dump.index
-
-3 directories, 2 files
-SnowWhite:$ 
-
-In practice, we'd probably use
-
-SnowWhite:$ pg_dumplo -s /tmp/dump -d test -e
-
-to export all large objects that are referenced by any OID-type column
-in the database.  Calling out specific column(s) with -l is only needed
-for a selective dump.
-
-For routine backup purposes, the dump directory could now be converted into
-an archive file with tar and stored on tape.  Notice that a single dump
-directory can hold the dump of multiple databases.
-
-Now, how can we recreate the contents of the table lo and the Large Object
-database when something went wrong?  To do this, we expect that pg_dump is
-also used to store the definition and contents of the regular tables in
-the database.
-
-SnowWhite:$ pg_dump test >test.backup
-
-Now, if we lose the database:
-
-SnowWhite:$ dropdb test
-DROP DATABASE
-
-we can recreate it and reload the regular tables from the dump file:
-
-SnowWhite:$ createdb test
-CREATE DATABASE
-
-SnowWhite:$ psql test <test.backup
-
-But at this point our database has no large objects in it.  What's more,
-the large-object-referencing columns contain the OIDs of the old large
-objects, which will not be the OIDs they'll have when reloaded.  Never
-fear: pg_dumplo will fix the large object references at the same time
-it reloads the large objects.  We reload the LO data from the dump
-directory like this:
-
-SnowWhite:$ pg_dumplo -s /tmp/dump -d test -i
-19338	lo	id	test/lo/id/19338
-SnowWhite:$
-
-And this is everything.  The contents of table lo will be automatically
-updated to refer to the new large object OIDs.
-
-Summary: In this small example we have shown that pg_dumplo can be used to
-completely dump the database's Large Objects very easily.
-
-For more information see the help ( pg_dumplo -h ).
diff --git a/contrib/pg_dumplo/lo_export.c b/contrib/pg_dumplo/lo_export.c
deleted file mode 100644
index adb216fee2..0000000000
--- a/contrib/pg_dumplo/lo_export.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/* -------------------------------------------------------------------------
- * pg_dumplo
- *
- * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/lo_export.c,v 1.8 2001/10/25 05:49:19 momjian Exp $
- *
- *					Karel Zak 1999-2000
- * -------------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <time.h>
-
-#include <libpq-fe.h>
-#include <libpq/libpq-fs.h>
-
-#include "pg_dumplo.h"
-
-extern int	errno;
-
-
-void
-load_lolist(LODumpMaster * pgLO)
-{
-	LOlist	   *ll;
-	int			i;
-	int			n;
-
-	/*
-	 * Now find any candidate tables who have columns of type oid.
-	 *
-	 * NOTE: System tables including pg_largeobject will be ignored.
-	 * Otherwise we'd end up dumping all LOs, referenced or not.
-	 *
-	 * NOTE: the system oid column is ignored, as it has attnum < 1. This
-	 * shouldn't matter for correctness, but it saves time.
-	 */
-	pgLO->res = PQexec(pgLO->conn,
-					   "SELECT c.relname, a.attname "
-					   "FROM pg_class c, pg_attribute a, pg_type t "
-					   "WHERE a.attnum > 0 "
-					   "    AND a.attrelid = c.oid "
-					   "    AND a.atttypid = t.oid "
-					   "    AND t.typname = 'oid' "
-					   "    AND c.relkind = 'r' "
-					   "    AND c.relname NOT LIKE 'pg_%'");
-
-	if (PQresultStatus(pgLO->res) != PGRES_TUPLES_OK)
-	{
-		fprintf(stderr, "%s: Failed to get LO OIDs:\n%s", progname,
-				PQerrorMessage(pgLO->conn));
-		exit(RE_ERROR);
-	}
-
-	if ((n = PQntuples(pgLO->res)) == 0)
-	{
-		fprintf(stderr, "%s: No OID columns in the database.\n", progname);
-		exit(RE_ERROR);
-	}
-
-	pgLO->lolist = (LOlist *) malloc((n + 1) * sizeof(LOlist));
-
-	if (!pgLO->lolist)
-	{
-		fprintf(stderr, "%s: can't allocate memory\n", progname);
-		exit(RE_ERROR);
-	}
-
-	for (i = 0, ll = pgLO->lolist; i < n; i++, ll++)
-	{
-		ll->lo_table = strdup(PQgetvalue(pgLO->res, i, 0));
-		ll->lo_attr = strdup(PQgetvalue(pgLO->res, i, 1));
-	}
-	ll->lo_table = ll->lo_attr = (char *) NULL;
-
-	PQclear(pgLO->res);
-}
-
-void
-pglo_export(LODumpMaster * pgLO)
-{
-	LOlist	   *ll;
-	int			tuples;
-	char		path[BUFSIZ],
-				Qbuff[QUERY_BUFSIZ];
-
-	if (pgLO->action != ACTION_SHOW)
-	{
-		time_t		t;
-
-		time(&t);
-		fprintf(pgLO->index, "#\n# This is the PostgreSQL large object dump index\n#\n");
-		fprintf(pgLO->index, "#\tDate:     %s", ctime(&t));
-		fprintf(pgLO->index, "#\tHost:     %s\n", pgLO->host);
-		fprintf(pgLO->index, "#\tDatabase: %s\n", pgLO->db);
-		fprintf(pgLO->index, "#\tUser:     %s\n", pgLO->user);
-		fprintf(pgLO->index, "#\n# oid\ttable\tattribut\tinfile\n#\n");
-	}
-
-	pgLO->counter = 0;
-
-	for (ll = pgLO->lolist; ll->lo_table != NULL; ll++)
-	{
-		/*
-		 * Query: find the LOs referenced by this column
-		 */
-		sprintf(Qbuff, "SELECT DISTINCT l.loid FROM \"%s\" x, pg_largeobject l WHERE x.\"%s\" = l.loid",
-				ll->lo_table, ll->lo_attr);
-
-		/* puts(Qbuff); */
-
-		pgLO->res = PQexec(pgLO->conn, Qbuff);
-
-		if (PQresultStatus(pgLO->res) != PGRES_TUPLES_OK)
-		{
-			fprintf(stderr, "%s: Failed to get LO OIDs:\n%s", progname,
-					PQerrorMessage(pgLO->conn));
-		}
-		else if ((tuples = PQntuples(pgLO->res)) == 0)
-		{
-			if (!pgLO->quiet && pgLO->action == ACTION_EXPORT_ATTR)
-				printf("%s: no large objects in \"%s\".\"%s\"\n",
-					   progname, ll->lo_table, ll->lo_attr);
-		}
-		else
-		{
-
-			int			t;
-			char	   *val;
-
-			/*
-			 * Create DIR/FILE
-			 */
-			if (pgLO->action != ACTION_SHOW)
-			{
-
-				sprintf(path, "%s/%s/%s", pgLO->space, pgLO->db,
-						ll->lo_table);
-
-				if (mkdir(path, DIR_UMASK) == -1)
-				{
-					if (errno != EEXIST)
-					{
-						perror(path);
-						exit(RE_ERROR);
-					}
-				}
-
-				sprintf(path, "%s/%s/%s/%s", pgLO->space, pgLO->db,
-						ll->lo_table, ll->lo_attr);
-
-				if (mkdir(path, DIR_UMASK) == -1)
-				{
-					if (errno != EEXIST)
-					{
-						perror(path);
-						exit(RE_ERROR);
-					}
-				}
-
-				if (!pgLO->quiet)
-					printf("dump %s.%s (%d large obj)\n",
-						   ll->lo_table, ll->lo_attr, tuples);
-			}
-
-			pgLO->counter += tuples;
-
-			for (t = 0; t < tuples; t++)
-			{
-				Oid			lo;
-
-				val = PQgetvalue(pgLO->res, t, 0);
-
-				lo = atooid(val);
-
-				if (pgLO->action == ACTION_SHOW)
-				{
-					printf("%s.%s: %u\n", ll->lo_table, ll->lo_attr, lo);
-					continue;
-				}
-
-				sprintf(path, "%s/%s/%s/%s/%s", pgLO->space,
-						pgLO->db, ll->lo_table, ll->lo_attr, val);
-
-				if (lo_export(pgLO->conn, lo, path) < 0)
-					fprintf(stderr, "%s: lo_export failed:\n%s", progname,
-							PQerrorMessage(pgLO->conn));
-
-				else
-					fprintf(pgLO->index, "%s\t%s\t%s\t%s/%s/%s/%s\n", val,
-							ll->lo_table, ll->lo_attr, pgLO->db, ll->lo_table, ll->lo_attr, val);
-			}
-		}
-
-		PQclear(pgLO->res);
-	}
-}
diff --git a/contrib/pg_dumplo/lo_import.c b/contrib/pg_dumplo/lo_import.c
deleted file mode 100644
index aec2aa0cee..0000000000
--- a/contrib/pg_dumplo/lo_import.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -------------------------------------------------------------------------
- * pg_dumplo
- *
- * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/lo_import.c,v 1.6 2001/10/25 05:49:19 momjian Exp $
- *
- *					Karel Zak 1999-2000
- * -------------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <time.h>
-
-#include <libpq-fe.h>
-#include <libpq/libpq-fs.h>
-
-#include "pg_dumplo.h"
-
-extern int	errno;
-
-void
-pglo_import(LODumpMaster * pgLO)
-{
-	LOlist		loa;
-	Oid			new_oid;
-	char		tab[MAX_TABLE_NAME],
-				attr[MAX_ATTR_NAME],
-				path[BUFSIZ],
-				lo_path[BUFSIZ],
-				Qbuff[QUERY_BUFSIZ];
-
-	while (fgets(Qbuff, QUERY_BUFSIZ, pgLO->index))
-	{
-
-		if (*Qbuff == '#')
-			continue;
-
-		if (!pgLO->remove && !pgLO->quiet)
-			printf(Qbuff);
-
-		sscanf(Qbuff, "%u\t%s\t%s\t%s\n", &loa.lo_oid, tab, attr, path);
-		loa.lo_table = tab;
-		loa.lo_attr = attr;
-
-		sprintf(lo_path, "%s/%s", pgLO->space, path);
-
-		/*
-		 * Import LO
-		 */
-		if ((new_oid = lo_import(pgLO->conn, lo_path)) == 0)
-		{
-
-			fprintf(stderr, "%s: %s\n", progname, PQerrorMessage(pgLO->conn));
-
-			PQexec(pgLO->conn, "ROLLBACK");
-			fprintf(stderr, "\n%s: ROLLBACK\n", progname);
-			exit(RE_ERROR);
-		}
-
-		if (pgLO->remove)
-		{
-			notice(pgLO, FALSE);
-			if (lo_unlink(pgLO->conn, loa.lo_oid) < 0)
-				fprintf(stderr, "%s: can't remove LO %u:\n%s",
-						progname, loa.lo_oid, PQerrorMessage(pgLO->conn));
-
-			else if (!pgLO->quiet)
-				printf("remove old %u and create new %u\n",
-					   loa.lo_oid, new_oid);
-			notice(pgLO, TRUE);
-		}
-
-		pgLO->counter++;
-
-		/*
-		 * UPDATE oid in tab
-		 */
-		sprintf(Qbuff, "UPDATE \"%s\" SET \"%s\"=%u WHERE \"%s\"=%u",
-			loa.lo_table, loa.lo_attr, new_oid, loa.lo_attr, loa.lo_oid);
-
-		/* fprintf(stderr, Qbuff); */
-
-		pgLO->res = PQexec(pgLO->conn, Qbuff);
-
-		if (PQresultStatus(pgLO->res) != PGRES_COMMAND_OK)
-		{
-			fprintf(stderr, "%s: %s\n", progname, PQerrorMessage(pgLO->conn));
-			PQclear(pgLO->res);
-			PQexec(pgLO->conn, "ROLLBACK");
-			fprintf(stderr, "\n%s: ROLLBACK\n", progname);
-			exit(RE_ERROR);
-		}
-		PQclear(pgLO->res);
-	}
-}
diff --git a/contrib/pg_dumplo/main.c b/contrib/pg_dumplo/main.c
deleted file mode 100644
index 78456e1234..0000000000
--- a/contrib/pg_dumplo/main.c
+++ /dev/null
@@ -1,326 +0,0 @@
-/* -------------------------------------------------------------------------
- * pg_dumplo
- *
- * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/main.c,v 1.10 2001/11/12 17:44:14 momjian Exp $
- *
- *					Karel Zak 1999-2000
- * -------------------------------------------------------------------------
- */
-
-/* We import postgres_fe.h mostly to get the HAVE_GETOPT_LONG configure result. */
-#ifndef OUT_OF_PG
-#include "postgres_fe.h"
-#endif
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-#include <libpq-fe.h>
-#include <libpq/libpq-fs.h>
-
-#include "pg_dumplo.h"
-
-#ifdef HAVE_GETOPT_LONG
-#include <getopt.h>
-#define no_argument 0
-#define required_argument 1
-#endif
-
-extern int	errno;
-
-char	   *progname = NULL;
-
-int			main(int argc, char **argv);
-static void usage(void);
-static void parse_lolist(LODumpMaster * pgLO);
-
-
-/*-----
- *	The mother of all C functions
- *-----
- */
-int
-main(int argc, char **argv)
-{
-	LODumpMaster _pgLO,
-			   *pgLO = &_pgLO;
-	char	   *pwd = NULL;
-
-	pgLO->argv = argv;
-	pgLO->argc = argc;
-	pgLO->action = 0;
-	pgLO->lolist = NULL;
-	pgLO->user = NULL;
-	pgLO->db = NULL;
-	pgLO->host = NULL;
-	pgLO->port = NULL;
-	pgLO->space = NULL;
-	pgLO->index = NULL;
-	pgLO->remove = FALSE;
-	pgLO->quiet = FALSE;
-	pgLO->counter = 0;
-	pgLO->lolist_start = 0;
-
-	progname = argv[0];
-
-	/*
-	 * Parse ARGV
-	 */
-	if (argc > 1)
-	{
-		int			arg;
-		extern int	optind;
-
-#ifdef HAVE_GETOPT_LONG
-		int			l_index = 0;
-		static struct option l_opt[] = {
-			{"help", no_argument, 0, 'h'},
-			{"user", required_argument, 0, 'u'},
-			{"pwd", required_argument, 0, 'p'},
-			{"db", required_argument, 0, 'd'},
-			{"host", required_argument, 0, 'h'},
-			{"port", required_argument, 0, 'o'},
-			{"space", required_argument, 0, 's'},
-			{"import", no_argument, 0, 'i'},
-			{"export", no_argument, 0, 'e'},
-			{"remove", no_argument, 0, 'r'},
-			{"quiet", no_argument, 0, 'q'},
-			{"all", no_argument, 0, 'a'},
-			{"show", no_argument, 0, 'w'},
-			{NULL, 0, 0, 0}
-		};
-
-		while ((arg = getopt_long(argc, argv, "?aeho:u:p:qd:l:t:irs:w", l_opt, &l_index)) != -1)
-		{
-#else
-		while ((arg = getopt(argc, argv, "?aeho:u:p:qd:l:t:irs:w")) != -1)
-		{
-#endif
-			switch (arg)
-			{
-				case '?':
-				case 'h':
-					usage();
-					exit(RE_OK);
-				case 'u':
-					pgLO->user = strdup(optarg);
-					break;
-				case 't':
-					pgLO->host = strdup(optarg);
-					break;
-				case 'o':
-					pgLO->port = strdup(optarg);
-					break;
-				case 'p':
-					pwd = strdup(optarg);
-					break;
-				case 'd':
-					pgLO->db = strdup(optarg);
-					break;
-				case 's':
-					pgLO->space = strdup(optarg);
-					break;
-				case 'i':
-					pgLO->action = ACTION_IMPORT;
-					break;
-				case 'l':
-					pgLO->action = ACTION_EXPORT_ATTR;
-					pgLO->lolist_start = optind - 1;
-					parse_lolist(pgLO);
-					break;
-				case 'e':
-				case 'a':
-					pgLO->action = ACTION_EXPORT_ALL;
-					break;
-				case 'w':
-					pgLO->action = ACTION_SHOW;
-					break;
-				case 'r':
-					pgLO->remove = TRUE;
-					break;
-				case 'q':
-					pgLO->quiet = TRUE;
-					break;
-				default:
-					fprintf(stderr, "%s: bad arg -%c\n", progname, arg);
-					usage();
-					exit(RE_ERROR);
-			}
-		}
-	}
-	else
-	{
-		usage();
-		exit(RE_ERROR);
-	}
-
-	/*
-	 * Check space
-	 */
-	if (!pgLO->space && !pgLO->action == ACTION_SHOW)
-	{
-		if (!(pgLO->space = getenv("PWD")))
-		{
-			fprintf(stderr, "%s: not set space for dump-tree (option '-s' or $PWD).\n", progname);
-			exit(RE_ERROR);
-		}
-	}
-
-	if (!pgLO->action)
-	{
-		fprintf(stderr, "%s: What do you want - export or import?\n", progname);
-		exit(RE_ERROR);
-	}
-
-	/*
-	 * Make connection
-	 */
-	pgLO->conn = PQsetdbLogin(pgLO->host, pgLO->port, NULL, NULL, pgLO->db,
-							  pgLO->user, pwd);
-
-	if (PQstatus(pgLO->conn) == CONNECTION_BAD)
-	{
-		fprintf(stderr, "%s (connection): %s\n", progname, PQerrorMessage(pgLO->conn));
-		exit(RE_ERROR);
-	}
-	pgLO->host = PQhost(pgLO->conn) ? PQhost(pgLO->conn) : "localhost";
-	pgLO->db = PQdb(pgLO->conn);
-	pgLO->user = PQuser(pgLO->conn);
-
-
-	/*
-	 * Init index file
-	 */
-	if (pgLO->action != ACTION_SHOW)
-		index_file(pgLO);
-
-	PQexec(pgLO->conn, "BEGIN");
-
-	switch (pgLO->action)
-	{
-
-		case ACTION_SHOW:
-		case ACTION_EXPORT_ALL:
-			load_lolist(pgLO);
-			/* FALL THROUGH */
-
-		case ACTION_EXPORT_ATTR:
-			pglo_export(pgLO);
-			if (!pgLO->quiet)
-			{
-				if (pgLO->action == ACTION_SHOW)
-					printf("\nDatabase '%s' contains %d large objects.\n\n", pgLO->db, pgLO->counter);
-				else
-					printf("\nExported %d large objects.\n\n", pgLO->counter);
-			}
-			break;
-
-		case ACTION_IMPORT:
-			pglo_import(pgLO);
-			if (!pgLO->quiet)
-				printf("\nImported %d large objects.\n\n", pgLO->counter);
-			break;
-	}
-
-	PQexec(pgLO->conn, "COMMIT");
-	PQfinish(pgLO->conn);
-
-	if (pgLO->action != ACTION_SHOW)
-		fclose(pgLO->index);
-
-	exit(RE_OK);
-}
-
-static void
-parse_lolist(LODumpMaster * pgLO)
-{
-	LOlist	   *ll;
-	char	  **d,
-			   *loc,
-				buff[MAX_TABLE_NAME + MAX_ATTR_NAME + 1];
-
-	pgLO->lolist = (LOlist *) malloc(pgLO->argc * sizeof(LOlist));
-
-	if (!pgLO->lolist)
-	{
-		fprintf(stderr, "%s: can't allocate memory\n", progname);
-		exit(RE_ERROR);
-	}
-
-	for (d = pgLO->argv + pgLO->lolist_start, ll = pgLO->lolist;
-		 *d != NULL;
-		 d++, ll++)
-	{
-
-		strncpy(buff, *d, MAX_TABLE_NAME + MAX_ATTR_NAME);
-
-		if ((loc = strchr(buff, '.')) == NULL)
-		{
-			fprintf(stderr, "%s: '%s' is bad 'table.attr'\n", progname, buff);
-			exit(RE_ERROR);
-		}
-		*loc = '\0';
-		ll->lo_table = strdup(buff);
-		ll->lo_attr = strdup(++loc);
-	}
-	ll++;
-	ll->lo_table = ll->lo_attr = (char *) NULL;
-}
-
-
-static void
-usage()
-{
-	printf("\npg_dumplo %s - PostgreSQL large objects dump\n", VERSION);
-	puts("pg_dumplo [option]\n\n"
-
-#ifdef HAVE_GETOPT_LONG
-
-		 "-h --help                    this help\n"
-	   "-u --user=<username>         username for connection to server\n"
-	   "-p --password=<password>     password for connection to server\n"
-		 "-d --db=<database>           database name\n"
-		 "-t --host=<hostname>         server hostname\n"
-		 "-o --port=<port>             database server port (default: 5432)\n" 
-		 "-s --space=<dir>             directory with dump tree (for export/import)\n"
-		 "-i --import                  import large obj dump tree to DB\n"
-	"-e --export                  export (dump) large obj to dump tree\n"
-		 "-l <table.attr ...>          dump attribute (columns) with LO to dump tree\n"
-		 "-a --all                     dump all LO in DB (default)\n"
-		 "-r --remove                  if is set '-i' try remove old LO\n"
-		 "-q --quiet                   run quietly\n"
-		 "-w --show                    not dump, but show all LO in DB\n"
-		);						/* puts() */
-
-#else
-		 "-h                           this help\n"
-	   "-u <username>                username for connection to server\n"
-	   "-p <password>                password for connection to server\n"
-		 "-d <database>                database name\n"
-		 "-t <hostname>                server hostname\n"
-		 "-o <port>                    database server port (default: 5432)\n" 
-		 "-s <dir>                     directory with dump tree (for export/import)\n"
-		 "-i                           import large obj dump tree to DB\n"
-	"-e                           export (dump) large obj to dump tree\n"
-		 "-l <table.attr ...>          dump attribute (columns) with LO to dump tree\n"
-		 "-a                           dump all LO in DB (default)\n"
-		 "-r                           if is set '-i' try remove old LO\n"
-		 "-q                           run quietly\n"
-		 "-w                           not dump, but show all LO in DB\n"
-		);						/* puts() */
-#endif
-
-	puts(
-		 "Example (dump):   pg_dumplo -d my_db -s /my_dump/dir -l t1.a t1.b t2.a\n"
-		 "                  pg_dumplo -a -d my_db -s /my_dump/dir\n"
-		 "Example (import): pg_dumplo -i -d my_db -s /my_dump/dir\n"
-		 "Example (show):   pg_dumplo -w -d my_db\n\n"
-		 "Note:  * option '-l' must be last option!\n"
-	"       * option '-i' without option '-r' make new large obj in DB\n"
-		 "         not rewrite old, the '-i' UPDATE oid numbers in table.attr only!\n"
-		 "       * if is not set option -s, the pg_dumplo use $PWD\n"
-		);						/* puts() */
-}
diff --git a/contrib/pg_dumplo/pg_dumplo.h b/contrib/pg_dumplo/pg_dumplo.h
deleted file mode 100644
index 68a5e86061..0000000000
--- a/contrib/pg_dumplo/pg_dumplo.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -------------------------------------------------------------------------
- * pg_dumplo
- *
- * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/pg_dumplo.h,v 1.8 2001/11/12 17:44:14 momjian Exp $
- *
- *					Karel Zak 1999-2000
- * -------------------------------------------------------------------------
- */
-
-#ifndef PG_DUMPLO_H
-#define PG_DUMPLO_H
-
-#include "postgres_ext.h"
-
-#define VERSION "7.1.0"
-
-/* ----------
- * Define
- * ----------
- */
-#define QUERY_BUFSIZ	(8*1024)
-#define DIR_UMASK	0755
-#define FILE_UMASK	0644
-
-#define TRUE		1
-#define FALSE		0
-#define RE_OK		0
-#define RE_ERROR	1
-
-#define MAX_TABLE_NAME	128
-#define MAX_ATTR_NAME	128
-
-#define atooid(x)  ((Oid) strtoul((x), NULL, 10))
-
-/* ----------
- * LO struct
- * ----------
- */
-typedef struct
-{
-	char	   *lo_table,
-			   *lo_attr;
-	Oid			lo_oid;
-}	LOlist;
-
-typedef struct
-{
-	int			action;
-	LOlist	   *lolist;
-	char	  **argv,
-			   *user,
-			   *db,
-			   *host,
-			   *port,
-			   *space;
-	FILE	   *index;
-	int			counter,
-				argc,
-				lolist_start,
-				remove,
-				quiet;
-	PGresult   *res;
-	PGconn	   *conn;
-}	LODumpMaster;
-
-typedef enum
-{
-	ACTION_NONE,
-	ACTION_SHOW,
-	ACTION_EXPORT_ATTR,
-	ACTION_EXPORT_ALL,
-	ACTION_IMPORT
-}	PGLODUMP_ACTIONS;
-
-extern char *progname;
-
-extern void notice(LODumpMaster * pgLO, int set);
-extern void index_file(LODumpMaster * pgLO);
-extern void load_lolist(LODumpMaster * pgLO);
-extern void pglo_export(LODumpMaster * pgLO);
-extern void pglo_import(LODumpMaster * pgLO);
-
-#endif   /* PG_DUMPLO_H */
diff --git a/contrib/pg_dumplo/utils.c b/contrib/pg_dumplo/utils.c
deleted file mode 100644
index d36ee4be08..0000000000
--- a/contrib/pg_dumplo/utils.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -------------------------------------------------------------------------
- * pg_dumplo
- *
- * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/utils.c,v 1.4 2001/03/22 03:59:10 momjian Exp $
- *
- *					Karel Zak 1999-2000
- * -------------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <time.h>
-
-#include <libpq-fe.h>
-#include <libpq/libpq-fs.h>
-
-#include "pg_dumplo.h"
-
-extern int	errno;
-
-static void Dummy_NoticeProcessor(void *arg, const char *message);
-static void Default_NoticeProcessor(void *arg, const char *message);
-
-
-void
-index_file(LODumpMaster * pgLO)
-{
-	char		path[BUFSIZ];
-
-	if (pgLO->action == ACTION_SHOW)
-		return;
-
-	sprintf(path, "%s/%s", pgLO->space, pgLO->db);
-
-	if (pgLO->action == ACTION_EXPORT_ATTR ||
-		pgLO->action == ACTION_EXPORT_ALL)
-	{
-
-		if (mkdir(path, DIR_UMASK) == -1)
-		{
-			if (errno != EEXIST)
-			{
-				perror(path);
-				exit(RE_ERROR);
-			}
-		}
-
-		sprintf(path, "%s/lo_dump.index", path);
-
-		if ((pgLO->index = fopen(path, "w")) == NULL)
-		{
-			perror(path);
-			exit(RE_ERROR);
-		}
-
-	}
-	else if (pgLO->action != ACTION_NONE)
-	{
-
-		sprintf(path, "%s/lo_dump.index", path);
-
-		if ((pgLO->index = fopen(path, "r")) == NULL)
-		{
-			perror(path);
-			exit(RE_ERROR);
-		}
-	}
-}
-
-static
-void
-Dummy_NoticeProcessor(void *arg, const char *message)
-{
-	;
-}
-
-static
-void
-Default_NoticeProcessor(void *arg, const char *message)
-{
-	fprintf(stderr, "%s", message);
-}
-
-void
-notice(LODumpMaster * pgLO, int set)
-{
-	if (set)
-		PQsetNoticeProcessor(pgLO->conn, Default_NoticeProcessor, NULL);
-	else
-		PQsetNoticeProcessor(pgLO->conn, Dummy_NoticeProcessor, NULL);
-}
diff --git a/contrib/pg_logger/Makefile b/contrib/pg_logger/Makefile
deleted file mode 100644
index 1a622bfe2a..0000000000
--- a/contrib/pg_logger/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/pg_logger/Attic/Makefile,v 1.2 2001/09/06 10:49:30 petere Exp $
-
-subdir = contrib/pg_logger
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-PROGRAM = pg_logger
-OBJS	= pg_logger.o
-
-DOCS = README.pg_logger
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/pg_logger/README.pg_logger b/contrib/pg_logger/README.pg_logger
deleted file mode 100644
index aaad73f508..0000000000
--- a/contrib/pg_logger/README.pg_logger
+++ /dev/null
@@ -1 +0,0 @@
-Stdin-to-syslog gateway for PostgreSQL
diff --git a/contrib/pg_logger/pg_logger.c b/contrib/pg_logger/pg_logger.c
deleted file mode 100644
index cb28bf5e7a..0000000000
--- a/contrib/pg_logger/pg_logger.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* pg_logger: stdin-to-syslog gateway for postgresql.
- *
- * Copyright 2001 by Nathan Myers <ncm@nospam.cantrip.org>
- * This software is distributed free of charge with no warranty of any kind.
- * You have permission to make copies for any purpose, provided that (1)
- * this copyright notice is retained unchanged, and (2) you agree to
- * absolve the author of all responsibility for all consequences arising
- * from any use.
- */
-
-#include <stdio.h>
-#include <stddef.h>
-#include <syslog.h>
-#include <string.h>
-
-struct
-{
-	const char *tag;
-	int			size;
-	int			priority;
-}	tags[] =
-
-{
-	{
-		"", 0, LOG_NOTICE
-	},
-	{
-		"emerg:", sizeof("emerg"), LOG_EMERG
-	},
-	{
-		"alert:", sizeof("alert"), LOG_ALERT
-	},
-	{
-		"crit:", sizeof("crit"), LOG_CRIT
-	},
-	{
-		"err:", sizeof("err"), LOG_ERR
-	},
-	{
-		"error:", sizeof("error"), LOG_ERR
-	},
-	{
-		"warning:", sizeof("warning"), LOG_WARNING
-	},
-	{
-		"notice:", sizeof("notice"), LOG_NOTICE
-	},
-	{
-		"info:", sizeof("info"), LOG_INFO
-	},
-	{
-		"debug:", sizeof("debug"), LOG_DEBUG
-	}
-};
-
-int
-main()
-{
-	char		buf[301];
-	int			c;
-	char	   *pos = buf;
-	const char *colon = 0;
-
-#ifndef DEBUG
-	openlog("postgresql", LOG_CONS, LOG_LOCAL1);
-#endif
-	while ((c = getchar()) != EOF)
-	{
-		if (c == '\r')
-			continue;
-		if (c == '\n')
-		{
-			int			level = sizeof(tags) / sizeof(*tags);
-			char	   *bol;
-
-			if (colon == 0 || (size_t) (colon - buf) > sizeof("warning"))
-				level = 1;
-			*pos = 0;
-			while (--level)
-			{
-				if (pos - buf >= tags[level].size
-				 && strncmp(buf, tags[level].tag, tags[level].size) == 0)
-					break;
-			}
-			bol = buf + tags[level].size;
-			if (bol > buf && *bol == ' ')
-				++bol;
-			if (pos - bol > 0)
-			{
-#ifndef DEBUG
-				syslog(tags[level].priority, "%s", bol);
-#else
-				printf("%d/%s\n", tags[level].priority, bol);
-#endif
-			}
-			pos = buf;
-			colon = (char const *) 0;
-			continue;
-		}
-		if (c == ':' && !colon)
-			colon = pos;
-		if ((size_t) (pos - buf) < sizeof(buf) - 1)
-			*pos++ = c;
-	}
-	return 0;
-}
diff --git a/contrib/pg_resetxlog/Makefile b/contrib/pg_resetxlog/Makefile
deleted file mode 100644
index eee05b1eda..0000000000
--- a/contrib/pg_resetxlog/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/Makefile,v 1.3 2001/09/06 10:49:30 petere Exp $
-
-subdir = contrib/pg_resetxlog
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-PROGRAM = pg_resetxlog
-OBJS	= pg_resetxlog.o pg_crc.o $(SNPRINTF)
-
-pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c
-	rm -f $@ && $(LN_S) $< .
-
-# this only gets done if configure finds system doesn't have snprintf()
-snprintf.c: $(top_srcdir)/src/backend/port/snprintf.c
-	rm -f $@ && $(LN_S) $< .
-
-EXTRA_CLEAN = pg_crc.c snprintf.c
-
-DOCS = README.pg_resetxlog
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/pg_resetxlog/README.pg_resetxlog b/contrib/pg_resetxlog/README.pg_resetxlog
deleted file mode 100644
index 9802cdddd3..0000000000
--- a/contrib/pg_resetxlog/README.pg_resetxlog
+++ /dev/null
@@ -1,42 +0,0 @@
-pg_resetxlog is a program to clear the WAL transaction log (stored in
-$PGDATA/pg_xlog/), replacing whatever had been in it with just a dummy
-shutdown-checkpoint record.  It also regenerates the pg_control file
-if necessary.
-
-THIS PROGRAM WILL DESTROY VALUABLE LOG DATA!!!  Don't run it unless you
-really need it!!!
-
-pg_resetxlog is primarily intended for disaster recovery --- that is,
-if your pg_control and/or xlog are hosed badly enough that Postgres refuses
-to start up, this program will get you past that problem and let you get to
-your data files.  But realize that without the xlog, your data files may be
-corrupt due to partially-applied transactions, incomplete index-file
-updates, etc.  You should dump your data, check it for accuracy, then initdb
-and reload.
-
-A secondary purpose is to cope with xlog format changes without requiring
-initdb.  To use pg_resetxlog for this purpose, just be sure that you have
-cleanly shut down your old postmaster (if you're not sure, see the contrib
-module pg_controldata and run it to be sure the DB state is SHUTDOWN).
-Then run pg_resetxlog, and finally install and start the new version of
-the database software.
-
-A tertiary purpose is its use by pg_upgrade to set the next transaction
-id and checkpoint location in pg_control.
-
-To run the program, make sure your postmaster is not running, then
-(as the Postgres admin user) do
-
-	pg_resetxlog $PGDATA
-
-As a safety measure, the target data directory must be specified on the
-command line, it cannot be defaulted.
-
-If pg_resetxlog complains that it can't reconstruct valid data for pg_control,
-you can force it to invent plausible data values with
-
-	pg_resetxlog -f $PGDATA
-
-If this turns out to be necessary then you *definitely* should plan on
-immediate dump, initdb, reload --- any modifications you do to the database
-after "pg_resetxlog -f" would be likely to corrupt things even worse.
diff --git a/contrib/pg_resetxlog/pg_resetxlog.c b/contrib/pg_resetxlog/pg_resetxlog.c
deleted file mode 100644
index cf1782d42e..0000000000
--- a/contrib/pg_resetxlog/pg_resetxlog.c
+++ /dev/null
@@ -1,611 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * pg_resetxlog.c
- *	  A utility to "zero out" the xlog when it's corrupt beyond recovery.
- *	  Can also rebuild pg_control if needed.
- *
- * The theory of operation is fairly simple:
- *	  1. Read the existing pg_control (which will include the last
- *		 checkpoint record).  If it is an old format then update to
- *		 current format.
- *	  2. If pg_control is corrupt, attempt to intuit reasonable values,
- *		 by scanning the old xlog if necessary.
- *	  3. Modify pg_control to reflect a "shutdown" state with a checkpoint
- *		 record at the start of xlog.
- *	  4. Flush the existing xlog files and write a new segment with
- *		 just a checkpoint record in it.  The new segment is positioned
- *		 just past the end of the old xlog, so that existing LSNs in
- *		 data pages will appear to be "in the past".
- * This is all pretty straightforward except for the intuition part of
- * step 2 ...
- *
- *
- * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/pg_resetxlog.c,v 1.18 2002/06/20 20:29:24 momjian Exp $
- *
- *-------------------------------------------------------------------------
- */
-#include "postgres.h"
-
-#include <errno.h>
-#include <unistd.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <dirent.h>
-#ifdef USE_LOCALE
-#include <locale.h>
-#endif
-
-#include "access/xlog.h"
-#include "catalog/catversion.h"
-#include "catalog/pg_control.h"
-
-
-/******************** stuff copied from xlog.c ********************/
-
-/* Increment an xlogid/segment pair */
-#define NextLogSeg(logId, logSeg)	\
-	do { \
-		if ((logSeg) >= XLogSegsPerFile-1) \
-		{ \
-			(logId)++; \
-			(logSeg) = 0; \
-		} \
-		else \
-			(logSeg)++; \
-	} while (0)
-
-#define XLogFileName(path, log, seg)	\
-			snprintf(path, MAXPGPATH, "%s/%08X%08X",	\
-					 XLogDir, log, seg)
-
-/******************** end of stuff copied from xlog.c ********************/
-
-
-static char *DataDir;			/* locations of important stuff */
-static char XLogDir[MAXPGPATH];
-static char ControlFilePath[MAXPGPATH];
-
-static ControlFileData ControlFile;		/* pg_control values */
-static uint32 newXlogId,
-			newXlogSeg;			/* ID/Segment of new XLOG segment */
-static bool guessed = false;	/* T if we had to guess at any values */
-
-
-/*
- * Try to read the existing pg_control file.
- *
- * This routine is also responsible for updating old pg_control versions
- * to the current format.
- */
-static bool
-ReadControlFile(void)
-{
-	int			fd;
-	int			len;
-	char	   *buffer;
-	crc64		crc;
-
-	if ((fd = open(ControlFilePath, O_RDONLY)) < 0)
-	{
-		/*
-		 * If pg_control is not there at all, or we can't read it, the
-		 * odds are we've been handed a bad DataDir path, so give up. User
-		 * can do "touch pg_control" to force us to proceed.
-		 */
-		perror("Failed to open $PGDATA/global/pg_control for reading");
-		if (errno == ENOENT)
-			fprintf(stderr, "If you're sure the PGDATA path is correct, do\n"
-					"  touch %s\n"
-					"and try again.\n", ControlFilePath);
-		exit(1);
-	}
-
-	/* Use malloc to ensure we have a maxaligned buffer */
-	buffer = (char *) malloc(BLCKSZ);
-
-	len = read(fd, buffer, BLCKSZ);
-	if (len < 0)
-	{
-		perror("Failed to read $PGDATA/global/pg_control");
-		exit(1);
-	}
-	close(fd);
-
-	if (len >= sizeof(ControlFileData) &&
-		((ControlFileData *) buffer)->pg_control_version == PG_CONTROL_VERSION)
-	{
-		/* Check the CRC. */
-		INIT_CRC64(crc);
-		COMP_CRC64(crc,
-				   buffer + sizeof(crc64),
-				   sizeof(ControlFileData) - sizeof(crc64));
-		FIN_CRC64(crc);
-
-		if (EQ_CRC64(crc, ((ControlFileData *) buffer)->crc))
-		{
-			/* Valid data... */
-			memcpy(&ControlFile, buffer, sizeof(ControlFile));
-			return true;
-		}
-
-		fprintf(stderr, "pg_control exists but has invalid CRC; proceed with caution.\n");
-		/* We will use the data anyway, but treat it as guessed. */
-		memcpy(&ControlFile, buffer, sizeof(ControlFile));
-		guessed = true;
-		return true;
-	}
-
-	/* Looks like it's a mess. */
-	fprintf(stderr, "pg_control exists but is broken or unknown version; ignoring it.\n");
-	return false;
-}
-
-
-/*
- * Guess at pg_control values when we can't read the old ones.
- */
-static void
-GuessControlValues(void)
-{
-#ifdef USE_LOCALE
-	char	   *localeptr;
-#endif
-
-	/*
-	 * Set up a completely default set of pg_control values.
-	 */
-	guessed = true;
-	memset(&ControlFile, 0, sizeof(ControlFile));
-
-	ControlFile.pg_control_version = PG_CONTROL_VERSION;
-	ControlFile.catalog_version_no = CATALOG_VERSION_NO;
-
-	ControlFile.checkPointCopy.redo.xlogid = 0;
-	ControlFile.checkPointCopy.redo.xrecoff = SizeOfXLogPHD;
-	ControlFile.checkPointCopy.undo = ControlFile.checkPointCopy.redo;
-	ControlFile.checkPointCopy.ThisStartUpID = 0;
-	ControlFile.checkPointCopy.nextXid = (TransactionId) 514;	/* XXX */
-	ControlFile.checkPointCopy.nextOid = BootstrapObjectIdData;
-	ControlFile.checkPointCopy.time = time(NULL);
-
-	ControlFile.state = DB_SHUTDOWNED;
-	ControlFile.time = time(NULL);
-	ControlFile.logId = 0;
-	ControlFile.logSeg = 1;
-	ControlFile.checkPoint = ControlFile.checkPointCopy.redo;
-
-	ControlFile.blcksz = BLCKSZ;
-	ControlFile.relseg_size = RELSEG_SIZE;
-#ifdef USE_LOCALE
-	localeptr = setlocale(LC_COLLATE, "");
-	if (!localeptr)
-	{
-		fprintf(stderr, "Invalid LC_COLLATE setting\n");
-		exit(1);
-	}
-	StrNCpy(ControlFile.lc_collate, localeptr, LOCALE_NAME_BUFLEN);
-	localeptr = setlocale(LC_CTYPE, "");
-	if (!localeptr)
-	{
-		fprintf(stderr, "Invalid LC_CTYPE setting\n");
-		exit(1);
-	}
-	StrNCpy(ControlFile.lc_ctype, localeptr, LOCALE_NAME_BUFLEN);
-#else
-	strcpy(ControlFile.lc_collate, "C");
-	strcpy(ControlFile.lc_ctype, "C");
-#endif
-
-	/*
-	 * XXX eventually, should try to grovel through old XLOG to develop
-	 * more accurate values for startupid, nextXID, and nextOID.
-	 */
-}
-
-
-/*
- * Print the guessed pg_control values when we had to guess.
- *
- * NB: this display should be just those fields that will not be
- * reset by RewriteControlFile().
- */
-static void
-PrintControlValues(bool guessed)
-{
-	printf("%spg_control values:\n\n"
-		   "pg_control version number:            %u\n"
-		   "Catalog version number:               %u\n"
-		   "Current log file id:                  %u\n"
-		   "Next log file segment:                %u\n"
-		   "Latest checkpoint's StartUpID:        %u\n"
-		   "Latest checkpoint's NextXID:          %u\n"
-		   "Latest checkpoint's NextOID:          %u\n"
-		   "Database block size:                  %u\n"
-		   "Blocks per segment of large relation: %u\n"
-		   "LC_COLLATE:                           %s\n"
-		   "LC_CTYPE:                             %s\n",
-
-		   (guessed ? "Guessed-at " : ""),
-		   ControlFile.pg_control_version,
-		   ControlFile.catalog_version_no,
-		   ControlFile.logId,
-		   ControlFile.logSeg,
-		   ControlFile.checkPointCopy.ThisStartUpID,
-		   ControlFile.checkPointCopy.nextXid,
-		   ControlFile.checkPointCopy.nextOid,
-		   ControlFile.blcksz,
-		   ControlFile.relseg_size,
-		   ControlFile.lc_collate,
-		   ControlFile.lc_ctype);
-}
-
-
-/*
- * Write out the new pg_control file.
- */
-static void
-RewriteControlFile(void)
-{
-	int			fd;
-	char		buffer[BLCKSZ]; /* need not be aligned */
-
-	/*
-	 * Adjust fields as needed to force an empty XLOG starting at the next
-	 * available segment.
-	 */
-	newXlogId = ControlFile.logId;
-	newXlogSeg = ControlFile.logSeg;
-	/* be sure we wrap around correctly at end of a logfile */
-	NextLogSeg(newXlogId, newXlogSeg);
-
-	ControlFile.checkPointCopy.redo.xlogid = newXlogId;
-	ControlFile.checkPointCopy.redo.xrecoff =
-		newXlogSeg * XLogSegSize + SizeOfXLogPHD;
-	ControlFile.checkPointCopy.undo = ControlFile.checkPointCopy.redo;
-	ControlFile.checkPointCopy.time = time(NULL);
-
-	ControlFile.state = DB_SHUTDOWNED;
-	ControlFile.time = time(NULL);
-	ControlFile.logId = newXlogId;
-	ControlFile.logSeg = newXlogSeg + 1;
-	ControlFile.checkPoint = ControlFile.checkPointCopy.redo;
-	ControlFile.prevCheckPoint.xlogid = 0;
-	ControlFile.prevCheckPoint.xrecoff = 0;
-
-	/* Contents are protected with a CRC */
-	INIT_CRC64(ControlFile.crc);
-	COMP_CRC64(ControlFile.crc,
-			   (char *) &ControlFile + sizeof(crc64),
-			   sizeof(ControlFileData) - sizeof(crc64));
-	FIN_CRC64(ControlFile.crc);
-
-	/*
-	 * We write out BLCKSZ bytes into pg_control, zero-padding the excess
-	 * over sizeof(ControlFileData).  This reduces the odds of
-	 * premature-EOF errors when reading pg_control.  We'll still fail
-	 * when we check the contents of the file, but hopefully with a more
-	 * specific error than "couldn't read pg_control".
-	 */
-	if (sizeof(ControlFileData) > BLCKSZ)
-	{
-		fprintf(stderr, "sizeof(ControlFileData) is too large ... fix xlog.c\n");
-		exit(1);
-	}
-
-	memset(buffer, 0, BLCKSZ);
-	memcpy(buffer, &ControlFile, sizeof(ControlFileData));
-
-	unlink(ControlFilePath);
-
-	fd = open(ControlFilePath, O_RDWR | O_CREAT | O_EXCL | PG_BINARY, S_IRUSR | S_IWUSR);
-	if (fd < 0)
-	{
-		perror("RewriteControlFile failed to create pg_control file");
-		exit(1);
-	}
-
-	errno = 0;
-	if (write(fd, buffer, BLCKSZ) != BLCKSZ)
-	{
-		/* if write didn't set errno, assume problem is no disk space */
-		if (errno == 0)
-			errno = ENOSPC;
-		perror("RewriteControlFile failed to write pg_control file");
-		exit(1);
-	}
-
-	if (fsync(fd) != 0)
-	{
-		perror("fsync");
-		exit(1);
-	}
-
-	close(fd);
-}
-
-
-/*
- * Remove existing XLOG files
- */
-static void
-KillExistingXLOG(void)
-{
-	DIR		   *xldir;
-	struct dirent *xlde;
-	char		path[MAXPGPATH];
-
-	xldir = opendir(XLogDir);
-	if (xldir == NULL)
-	{
-		perror("KillExistingXLOG: cannot open $PGDATA/pg_xlog directory");
-		exit(1);
-	}
-
-	errno = 0;
-	while ((xlde = readdir(xldir)) != NULL)
-	{
-		if (strlen(xlde->d_name) == 16 &&
-			strspn(xlde->d_name, "0123456789ABCDEF") == 16)
-		{
-			sprintf(path, "%s/%s", XLogDir, xlde->d_name);
-			if (unlink(path) < 0)
-			{
-				perror(path);
-				exit(1);
-			}
-		}
-		errno = 0;
-	}
-	if (errno)
-	{
-		perror("KillExistingXLOG: cannot read $PGDATA/pg_xlog directory");
-		exit(1);
-	}
-	closedir(xldir);
-}
-
-
-/*
- * Write an empty XLOG file, containing only the checkpoint record
- * already set up in ControlFile.
- */
-static void
-WriteEmptyXLOG(void)
-{
-	char	   *buffer;
-	XLogPageHeader page;
-	XLogRecord *record;
-	crc64		crc;
-	char		path[MAXPGPATH];
-	int			fd;
-	int			nbytes;
-
-	/* Use malloc() to ensure buffer is MAXALIGNED */
-	buffer = (char *) malloc(BLCKSZ);
-	page = (XLogPageHeader) buffer;
-
-	/* Set up the first page with initial record */
-	memset(buffer, 0, BLCKSZ);
-	page->xlp_magic = XLOG_PAGE_MAGIC;
-	page->xlp_info = 0;
-	page->xlp_sui = ControlFile.checkPointCopy.ThisStartUpID;
-	page->xlp_pageaddr.xlogid =
-		ControlFile.checkPointCopy.redo.xlogid;
-	page->xlp_pageaddr.xrecoff =
-		ControlFile.checkPointCopy.redo.xrecoff - SizeOfXLogPHD;
-	record = (XLogRecord *) ((char *) page + SizeOfXLogPHD);
-	record->xl_prev.xlogid = 0;
-	record->xl_prev.xrecoff = 0;
-	record->xl_xact_prev = record->xl_prev;
-	record->xl_xid = InvalidTransactionId;
-	record->xl_len = sizeof(CheckPoint);
-	record->xl_info = XLOG_CHECKPOINT_SHUTDOWN;
-	record->xl_rmid = RM_XLOG_ID;
-	memcpy(XLogRecGetData(record), &ControlFile.checkPointCopy,
-		   sizeof(CheckPoint));
-
-	INIT_CRC64(crc);
-	COMP_CRC64(crc, &ControlFile.checkPointCopy, sizeof(CheckPoint));
-	COMP_CRC64(crc, (char *) record + sizeof(crc64),
-			   SizeOfXLogRecord - sizeof(crc64));
-	FIN_CRC64(crc);
-	record->xl_crc = crc;
-
-	/* Write the first page */
-	XLogFileName(path, newXlogId, newXlogSeg);
-
-	unlink(path);
-
-	fd = open(path, O_RDWR | O_CREAT | O_EXCL | PG_BINARY,
-			  S_IRUSR | S_IWUSR);
-	if (fd < 0)
-	{
-		perror(path);
-		exit(1);
-	}
-
-	errno = 0;
-	if (write(fd, buffer, BLCKSZ) != BLCKSZ)
-	{
-		/* if write didn't set errno, assume problem is no disk space */
-		if (errno == 0)
-			errno = ENOSPC;
-		perror("WriteEmptyXLOG: failed to write xlog file");
-		exit(1);
-	}
-
-	/* Fill the rest of the file with zeroes */
-	memset(buffer, 0, BLCKSZ);
-	for (nbytes = BLCKSZ; nbytes < XLogSegSize; nbytes += BLCKSZ)
-	{
-		errno = 0;
-		if (write(fd, buffer, BLCKSZ) != BLCKSZ)
-		{
-			if (errno == 0)
-				errno = ENOSPC;
-			perror("WriteEmptyXLOG: failed to write xlog file");
-			exit(1);
-		}
-	}
-
-	if (fsync(fd) != 0)
-	{
-		perror("fsync");
-		exit(1);
-	}
-
-	close(fd);
-}
-
-
-static void
-usage(void)
-{
-	fprintf(stderr, "Usage: pg_resetxlog [-f] [-n] [-x xid] [ -l fileid seg ] PGDataDirectory\n"
-			"  -f\t\tforce update to be done\n"
-			"  -n\t\tno update, just show extracted pg_control values (for testing)\n"
-			"  -x xid\tset next transaction ID\n"
-			"  -l fileid seg\tforce minimum WAL starting location for new xlog\n");
-	exit(1);
-}
-
-
-int
-main(int argc, char **argv)
-{
-	int			argn;
-	bool		force = false;
-	bool		noupdate = false;
-	TransactionId set_xid = 0;
-	uint32		minXlogId = 0,
-				minXlogSeg = 0;
-	int			fd;
-	char		path[MAXPGPATH];
-
-	for (argn = 1; argn < argc; argn++)
-	{
-		if (argv[argn][0] != '-')
-			break;				/* end of switches */
-		if (strcmp(argv[argn], "-f") == 0)
-			force = true;
-		else if (strcmp(argv[argn], "-n") == 0)
-			noupdate = true;
-		else if (strcmp(argv[argn], "-x") == 0)
-		{
-			argn++;
-			if (argn == argc)
-				usage();
-			set_xid = strtoul(argv[argn], NULL, 0);
-			if (set_xid == 0)
-			{
-				fprintf(stderr, "XID can not be 0.\n");
-				exit(1);
-			}
-		}
-		else if (strcmp(argv[argn], "-l") == 0)
-		{
-			argn++;
-			if (argn == argc)
-				usage();
-			minXlogId = strtoul(argv[argn], NULL, 0);
-			argn++;
-			if (argn == argc)
-				usage();
-			minXlogSeg = strtoul(argv[argn], NULL, 0);
-		}
-		else
-			usage();
-	}
-
-	if (argn != argc - 1)		/* one required non-switch argument */
-		usage();
-
-	DataDir = argv[argn++];
-
-	snprintf(XLogDir, MAXPGPATH, "%s/pg_xlog", DataDir);
-
-	snprintf(ControlFilePath, MAXPGPATH, "%s/global/pg_control", DataDir);
-
-	/*
-	 * Check for a postmaster lock file --- if there is one, refuse to
-	 * proceed, on grounds we might be interfering with a live
-	 * installation.
-	 */
-	snprintf(path, MAXPGPATH, "%s/postmaster.pid", DataDir);
-
-	if ((fd = open(path, O_RDONLY)) < 0)
-	{
-		if (errno != ENOENT)
-		{
-			perror("Failed to open $PGDATA/postmaster.pid for reading");
-			exit(1);
-		}
-	}
-	else
-	{
-		fprintf(stderr, "Lock file '%s' exists --- is a postmaster running?\n"
-				"If not, delete the lock file and try again.\n",
-				path);
-		exit(1);
-	}
-
-	/*
-	 * Attempt to read the existing pg_control file
-	 */
-	if (!ReadControlFile())
-		GuessControlValues();
-
-	/*
-	 * If we had to guess anything, and -f was not given, just print the
-	 * guessed values and exit.  Also print if -n is given.
-	 */
-	if ((guessed && !force) || noupdate)
-	{
-		PrintControlValues(guessed);
-		if (!noupdate)
-		{
-			printf("\nIf these values seem acceptable, use -f to force reset.\n");
-			exit(1);
-		}
-		else
-			exit(0);
-	}
-
-	/*
-	 * Don't reset from a dirty pg_control without -f, either.
-	 */
-	if (ControlFile.state != DB_SHUTDOWNED && !force)
-	{
-		printf("The database was not shut down cleanly.\n"
-			   "Resetting the xlog may cause data to be lost!\n"
-			   "If you want to proceed anyway, use -f to force reset.\n");
-		exit(1);
-	}
-
-	/*
-	 * Else, do the dirty deed.
-	 *
-	 * First adjust fields if required by switches.
-	 */
-	if (set_xid != 0)
-		ControlFile.checkPointCopy.nextXid = set_xid;
-
-	if (minXlogId > ControlFile.logId ||
-		(minXlogId == ControlFile.logId && minXlogSeg > ControlFile.logSeg))
-	{
-		ControlFile.logId = minXlogId;
-		ControlFile.logSeg = minXlogSeg;
-	}
-
-	RewriteControlFile();
-	KillExistingXLOG();
-	WriteEmptyXLOG();
-
-	printf("XLOG reset.\n");
-	return 0;
-}
diff --git a/contrib/pg_upgrade/README b/contrib/pg_upgrade/README
deleted file mode 100644
index d2f25bd56c..0000000000
--- a/contrib/pg_upgrade/README
+++ /dev/null
@@ -1,14 +0,0 @@
-                                 pg_upgrade
-
-This is a version of pg_upgrade which will migrate a 7.1 database to
-7.2, or allow a 7.2 to 7.2 migration if you need to perform an initdb. 
-It has been only lightly tested.  Please report any problems to the
-PostgreSQL lists.
-
-Read the manual page for more information.  To view it:
-
-	nroff -man pg_upgrade.1 | more
-
-Bruce Momjian
-
-2002-01-14
diff --git a/contrib/pg_upgrade/pg_upgrade b/contrib/pg_upgrade/pg_upgrade
deleted file mode 100755
index ad1b3745c3..0000000000
--- a/contrib/pg_upgrade/pg_upgrade
+++ /dev/null
@@ -1,492 +0,0 @@
-#!/bin/sh
-#
-# pg_upgrade: update a database without needing a full dump/reload cycle.
-# CAUTION: Read the manual page before trying to use this!
-
-# $Header: /cvsroot/pgsql/contrib/pg_upgrade/Attic/pg_upgrade,v 1.13 2002/04/09 18:07:24 momjian Exp $
-#
-# To migrate this to newer versions of PostgreSQL:  
-#	1)  Update the version numbers at the top of the file
-#	2)  Search for specific version mentions in the script and update
-#	    accordingly.
-#	3)  Add changes for next version.
-
-#set -x
-
-# UPGRADE_VERSION is the expected old database version
-UPGRADE_VERSION="7.2"
-CUR_VERSION="7.3"
-
-# Set this to "Y" to enable this program
-ENABLE="Y"
-
-if [ "$ENABLE" != "Y" ]
-then
-	echo "Sorry, $0 cannot upgrade database version $SRC_VERSION to $DST_VERSION." 1>&2
-	echo "The on-disk structure of tables has changed." 1>&2
-	echo "You will need to dump and restore using pg_dumpall." 1>&2
-	exit 1
-fi
-
-
-trap "rm -f /tmp/$$.*" 0 1 2 3 15
-
-BASENAME=`basename "$0"`
-PHASE=""
-
-while [ "$#" -ne 0 ]
-do
-	if [ "X$1" = "X-1" ]
-	then	PHASE="1"
-		shift
-	elif [ "X$1" = "X-2" ]
-	then	PHASE="2"
-		shift
-	elif [ "X$1" = "X-D" ]
-	then	PGDATA="$2"
-		shift 2
-	fi
-done
-
-if [ "$PHASE" = "" ]
-then	echo "You must run $BASENAME in either mode 1 or mode 2." 1>&2
-	echo "Usage:  $BASENAME [-D datadir] -1 | -2" 1>&2
-	exit 1
-fi
-
-if [ "$PGDATA" = "" ]
-then	echo "You must set the PGDATA environment variable or specify it with -D." 1>&2
-	echo "Usage:  $BASENAME [-D datadir] -1 | -2" 1>&2
-	exit 1
-fi
-
-if [ ! -d "$PGDATA" ]
-then	echo "$PGDATA does not exist.  Exiting." 1>&2
-	if [ "$PHASE" -eq 2 ]
-	then	echo "Perhaps you didn't run initdb." 1>&2
-	fi
-	exit 1
-fi
-
-if [ "$USER" = "root" -o ! -r "$PGDATA"/PG_VERSION ]
-then	echo "You must run this as the PostgreSQL superuser.  Exiting." 1>&2
-	exit 1
-fi
-
-# Strip off the trailing directory name and store our data there
-# in the hope we are in the same filesystem so 'mv 'works.
-
-INFODIR=`dirname "$PGDATA"`/pg_upgrade_info
-SAVEDATA="$INFODIR"/data
-
-make_dbobjoidmap()
-{
-	psql -d template1 -At -c "SELECT datname FROM pg_database" |
-	grep -v '^template0$' |
-	while read DB
-	do	
-		QUERY="SELECT 	relname, oid
-			FROM 	pg_class
-			WHERE 	relkind = 'r' OR
-				relkind = 'i' OR
-				relkind = 'S' OR
-				relkind = 't';"
-
-		psql -d "$DB" -At -F'	' -c "$QUERY" |
-		while read RELNAME_OID
-		do	
-			echo "$DB	$RELNAME_OID"
-		done
-	done
-}
-
-
-make_dboidmap()
-{
-	psql -d template1 -At -F'	' -c \
-		'SELECT datname, oid FROM pg_database;' |
-	grep -v '^template0$'
-}
-
-
-move_objfiles()
-{
-	# Test to make sure there is a matching file in each place
-
-	if [ ! -f "$SAVEDATA"/base/"$SRC_DBOID"/"$SRC_OID" -a \
-	     ! -h "$SAVEDATA"/base/"$SRC_DBOID"/"$SRC_OID" ]
-	then	echo "Moving of database $DB, OID $SRC_OID, object $OBJ failed." 1>&2
-		echo "File not found.  Exiting." 1>&2
-		return 1
-	fi
-
-	if [ ! -f "$PGDATA"/base/"$DST_DBOID"/"$DST_OID" -a \
-	     ! -h "$PGDATA"/base/"$DST_DBOID"/"$DST_OID" ]
-	then	echo "Moving of database $DB, OID $DST_OID, object $OBJ failed." 1>&2
-		echo "File not found.  Exiting." 1>&2
-		return 1
-	fi
-
-	# Move files
-
-	mv -f "$SAVEDATA"/base/"$SRC_DBOID"/"$SRC_OID" "$PGDATA"/base/"$DST_DBOID"/"$DST_OID"
-	if [ "$?" -ne 0 ]
-	then	echo "Moving of database $DB, OID $SRC_OID, object $OBJ" 1>&2
-		echo "to $DST_OID failed.  Exiting" 1>&2
-		return 1
-	fi
-
-	# handle table extents
-
-	ls "$SAVEDATA"/base/"$SRC_DBOID"/"$SRC_OID".* 2> /dev/null | while read FILE
-	do
-		EXT=`basename "$FILE" | sed 's/^.*\.\(.*\)$/\1/'`
-		mv -f "$FILE" "$PGDATA"/base/"$DST_DBOID"/"$DST_OID"."$EXT"
-		if [ "$?" -ne 0 ]
-		then	echo "Moving of database $DB, OID $SRC_OID, object $OBJ" 1>&2
-			echo "to $DST_OID failed.  Exiting." 1>&2
-			return 1
-		fi
-	done
-}
-
-if [ "$PHASE" -eq 1 ]
-then
-
-	##########################
-	#  Phase 1 starts here   #
-	##########################
-
-
-	if [ ! -d "$PGDATA"/base/1 ]
-	then	echo "There is no database template1 in $PGDATA/base." 1>&2
-		exit 1
-	fi
-
-	# get version
-	SRC_VERSION=`cat "$PGDATA"/PG_VERSION`
-	if [ "$SRC_VERSION" = "" ]
-	then	echo "$BASENAME can not find the PostgreSQL version file" 1>&2
-		echo "'$PGDATA/PG_VERSION'.  Exiting." 1>&2
-		exit 1
-	fi
-
-	if [ 	"$SRC_VERSION" != "$CUR_VERSION" -a \
-		"$SRC_VERSION" != "$UPGRADE_VERSION" ]
-	then	echo "$BASENAME supports versions $UPGRADE_VERSION and $CUR_VERSION only." 1>&2
-		echo "However, your database is version $SRC_VERSION." 1>&2
-		echo "You will need to dump and restore using pg_dumpall.  Exiting." 1>&2
-		exit 1
-	fi
-
-	# If server is down, start it so we can do some work.
-	if ! pg_ctl status | sed -n '1p' | grep "is running" > /dev/null 2>&1
-	then	pg_ctl -w start
-		if [ $? -ne 0 ]
-		then	echo "Can not start server.  Exiting." 1>&2
-			exit 1
-		fi
-	fi
-
-	# create directory for our data
-	if ! rm -rf "$INFODIR" 
-	then	echo "Deletion of old pg_upgrade_info directory $INFODIR failed." 1>&2
-		echo "Exiting." 1>&2
-		exit 1
-	fi
-	if ! mkdir "$INFODIR"
-	then	echo "Creation of new pg_upgrade_info directory $INFODIR failed." 1>&2
-		echo "Exiting." 1>&2
-		exit 1
-	fi
-
-	if ! chmod og-rwx "$INFODIR"
- 	then	echo "Permission change on new pg_upgrade_info directory $INFODIR failed." 1>&2
-		echo "Exiting." 1>&2
-		exit 1
-	fi
-
-
-	# Dump schema
-	pg_dumpall -s > "$INFODIR"/schema
-	if [ $? -ne 0 ]
-	then	echo "Can not dump schema.  Exiting." 1>&2
-		exit 1
-	fi
-	
-	# Generate mappings for database
-	make_dboidmap > "$INFODIR"/dboidmap || exit "$?"
-	make_dbobjoidmap > "$INFODIR"/dbobjoidmap || exit "$?"
-
-	# Vacuum all databases to remove exipired rows.
-	# We will lose our transaction log file during the upgrade so we
-	# have to do this.
-
-	vacuumdb -a
-	if [ $? -ne 0 ]
-	then	echo "Can not vacuum server.  Exiting." 1>&2
-		exit 1
-	fi
-
-	# Stop server so we can move the directory.
-	pg_ctl -w stop
-	if [ $? -ne 0 ]
-	then	echo "Can not stop server.  Exiting." 1>&2
-		exit 1
-	fi
-	
-	# No matter what the directory name, call it data
-	mv "$PGDATA" "$INFODIR"/data
-	if [ $? -ne 0 ]
-	then	echo "Can not move old $PGDATA out of the way.  Exiting." 1>&2
-		exit 1
-	fi
-	echo
-	echo
-	echo "$BASENAME phase 1 completed."
-	echo "Continue with the steps outlined in the $BASENAME manual page."
-	exit 0
-fi
-
-
-	##########################
-	#  Phase 2 starts here   #
-	##########################
-
-# check things
-
-if [ ! -d "$INFODIR" ]
-then	echo "There is no '$INFODIR' directory from the phase 1 run of $BASENAME." 1>&2
-	exit 1	
-fi
-
-if [ ! -d "$SAVEDATA" ]
-then	echo "There is no '$SAVEDATA' directory from the phase 1 run of $BASENAME." 1>&2
-	exit 1	
-fi
-
-if [ ! -f "$SAVEDATA/PG_VERSION" ]
-then	echo "Cannot read '$SAVEDATA/PG_VERSION' --- something is wrong." 1>&2
-	exit 1
-fi
-
-if [ ! -f "$PGDATA/PG_VERSION" ]
-then	echo "Cannot read '$PGDATA/PG_VERSION' --- something is wrong." 1>&2
-	exit 1
-fi
-
-if [ ! -d "$PGDATA/base/1" ]
-then	echo "Cannot find database template1 in '$PGDATA/base'." 1>&2
-	echo "Are you running $BASENAME as the postgres superuser?" 1>&2
-	exit 1
-fi
-
-# Get the actual versions seen in the data dirs.
-
-SRC_VERSION=`cat "$SAVEDATA"/PG_VERSION`
-DST_VERSION=`cat "$PGDATA"/PG_VERSION`
-
-# Check for version compatibility.
-# This code will need to be updated/reviewed for each new PostgreSQL release.
-
-if [ "$DST_VERSION" != "$CUR_VERSION" ]
-then	echo "$BASENAME is for PostgreSQL version $CUR_VERSION" 1>&2
-	echo "but $PGDATA/PG_VERSION contains $DST_VERSION." 1>&2
-	echo "Did you run initdb for version $UPGRADE_VERSION by mistake?" 1>&2
-	exit 1
-fi
-
-# Stop server for pg_resetxlog use
-
-if pg_ctl status | sed -n '1p' | grep "is running" > /dev/null 2>&1
-then	pg_ctl -w stop
-	if [ $? -ne 0 ]
-	then	echo "Can not start server.  Exiting." 1>&2
-		exit 1
-	fi
-fi
-
-# check for proper pg_resetxlog version
-
-pg_resetxlog 2> /dev/null
-# file not found status is normally 127, not 1
-if [ "$?" -ne 1 ]
-then	echo "Unable to find pg_resetxlog in your path." 1>&2
-	echo "Install it from pgsql/contrib/pg_resetxlog and continue.  Exiting." 1>&2
-	exit 1
-fi
-
-if ! pg_resetxlog -x 2>&1 | grep 'xid' > /dev/null 2>&1
-then	echo "Old version of pg_resetxlog found in path." 1>&2
-	echo "Install a newer version of pg_resetxlog from pgsql/contrib/pg_resetxlog." 1>&2
-	echo "Exiting." 1>&2
-	exit 1
-fi
-
-SRC_XID=`pg_resetxlog -n "$SAVEDATA" | grep "NextXID" | awk -F'  *' '{print $4}'`
-DST_XID=`pg_resetxlog -n "$PGDATA" | grep "NextXID" | awk -F'  *' '{print $4}'`
-
-# compare locales to make sure they match
-
-pg_resetxlog -n "$SAVEDATA" | grep "^LC_" > /tmp/$$.0
-pg_resetxlog -n "$PGDATA" | grep "^LC_" > /tmp/$$.1
-if ! diff /tmp/$$.0 /tmp/$$.1 > /dev/null
-then	echo "Locales do not match between the two versions.  Exiting." 1>&2
-	exit 1
-fi
-
-# Restart postmaster
-
-pg_ctl -w start
-if [ $? -ne 0 ]
-then	echo "Can not start server.  Exiting." 1>&2
-	exit 1
-fi
-
-
-###################################
-# Checking done.  Ready to proceed.
-###################################
-
-
-# Execute the schema script to create everything
-
-psql template1 < "$INFODIR"/schema
-if [ $? -ne 0 ]
-then	echo "There were errors in the input script.  Exiting." 1>&2
-	exit 1
-fi
-
-echo "Input script completed, fixing row commit statuses..."
-
-# Generate mappings for new database
-make_dboidmap > /tmp/$$.dboidmap || exit "$?"
-make_dbobjoidmap > /tmp/$$.dbobjoidmap || exit "$?"
-
-# we are done with SQL database access
-# shutdown forces buffers to disk
-
-pg_ctl -w stop
-if [ "$?" -ne 0 ]
-then	echo "Unable to stop database server.  Exiting." 1>&2
-	exit 1
-fi
-
-echo "Commit fixes complete, moving data files..."
-
-# Move table/index/sequence files
-
-cat "$INFODIR"/dbobjoidmap | while read LINE
-do
-	DB=`echo "$LINE" | awk '{print $1}'`
-	OBJ=`echo "$LINE" | awk '{print $2}'`
-
-	# Skip system tables, except for pg_largeobject
-	# pg_toast tables are handled later as part of the
-	# base table move
-	if [ `expr X"$OBJ" : X'pg_'` -eq 4 -a \
-	     `expr X"$OBJ" : X'pg_largeobject'` -ne 15 ]
-	then	continue
-	fi
-
-	SRC_OID=`echo "$LINE" | awk '{print $3}'`
-	SRC_DBOID=`grep "^$DB	" "$INFODIR"/dboidmap | awk '{print $2}'`
-	DST_DBOID=`grep "^$DB	" /tmp/$$.dboidmap | awk '{print $2}'`
-	DST_OID=`grep "^$DB	$OBJ	" /tmp/$$.dbobjoidmap | awk '{print $3}'`
-
-	move_objfiles
-
-	# Handle TOAST files if they exist
-	if grep "^$DB	pg_toast_$SRC_OID	" "$INFODIR"/dbobjoidmap \
-		> /dev/null 2>&1
-	then	# toast heap
-		SAVE_SRC_OID="$SRC_OID"
-		SAVE_DST_OID="$DST_OID"
-		SRC_OID=`grep "^$DB	pg_toast_$SAVE_SRC_OID	" \
-			"$INFODIR"/dbobjoidmap | awk '{print $3}'`
-		DST_OID=`grep "^$DB	pg_toast_$SAVE_DST_OID	" \
-			/tmp/$$.dbobjoidmap | awk '{print $3}'`
-		move_objfiles
-		# toast index
-		SRC_OID=`grep "^$DB	pg_toast_${SAVE_SRC_OID}_idx	" \
-			"$INFODIR"/dbobjoidmap | awk '{print $3}'`
-		DST_OID=`grep "^$DB	pg_toast_${SAVE_DST_OID}_idx	" \
-			/tmp/$$.dbobjoidmap | awk '{print $3}'`
-		move_objfiles
-	fi
-done
-								   
-
-# Set this so future backends don't think these tuples are their own
-# because it matches their own XID.
-# Commit status already updated by vacuum above
-# Set to maximum XID just in case SRC wrapped around recently and
-# is lower than DST's database
-
-if [ "$SRC_XID" -gt "$DST_XID" ]
-then	MAX_XID="$SRC_XID"
-else	MAX_XID="$DST_XID"
-fi
-
-pg_resetxlog -x "$MAX_XID" "$PGDATA"
-if [ "$?" -ne 0 ]
-then	echo "Unable to set new XID.  Exiting." 1>&2
-	exit 1
-fi
-
-# Move over old WAL
-
-rm -r "$PGDATA"/pg_xlog
-mv -f "$SAVEDATA"/pg_xlog "$PGDATA"
-
-# Move over old clog
-
-rm -r "$PGDATA"/pg_clog
-mv -f "$SAVEDATA"/pg_clog "$PGDATA"
-
-# Set last log file id and segment from old database
-
-LOG_ID=`pg_resetxlog -n "$SAVEDATA" | grep "Current log file id:" |
-	awk -F'  *' '{print $5}'`
-if [ "$LOG_ID" = "" ]
-then	echo "Unable to get old log file id.  Exiting." 1>&2
-	exit 1
-fi
-SEG_ID=`pg_resetxlog -n "$SAVEDATA" | grep "Next log file segment:" |
-	awk -F'  *' '{print $5}'`
-if [ "$SEG_ID" = "" ]
-then	echo "Unable to get old log segment id.  Exiting." 1>&2
-	exit 1
-fi
-
-# Set checkpoint location of new database
-
-pg_resetxlog -l "$LOG_ID" "$SEG_ID" "$PGDATA"
-if [ "$?" -ne 0 ]
-then	echo "Unable to set new log file/segment id.  Exiting." 1>&2
-	exit 1
-fi
-
-# Restart server with moved data
-
-pg_ctl -w start
-if [ "$?" -ne 0 ]
-then	echo "Unable to restart database server.  Exiting." 1>&2
-	exit 1
-fi
-
-# Now that we have moved the WAL/transaction log files, vacuum again to
-# mark install rows with fixed transaction ids to prevent problems on xid
-# wraparound.
-
-vacuumdb -a
-if [ $? -ne 0 ]
-then	echo "There were errors during VACUUM.  Exiting." 1>&2
-	exit 1
-fi
-
-echo
-echo
-echo "$BASENAME phase 2 completed."
-echo "You may remove the old database files with 'rm -r $INFODIR'."
-exit 0
diff --git a/contrib/pg_upgrade/pg_upgrade.1 b/contrib/pg_upgrade/pg_upgrade.1
deleted file mode 100644
index e6b05b0a5d..0000000000
--- a/contrib/pg_upgrade/pg_upgrade.1
+++ /dev/null
@@ -1,98 +0,0 @@
-.\"
-.TH PG_UPGRADE 1 "PG_UPGRADE(1)" "14 Jan 2002" "PostgreSQL Client Applications" ""
-.SH NAME
-pg_upgrade \- upgrading from a previous release without reloading
-.SH SYNOPSIS
-pg_upgrade [-D \fIdata_dir\fP] -1 | -2
-.SH DESCRIPTION
-\fBpg_upgrade\fP is a utility for upgrading from a previous PostgreSQL
-release without reloading all the data. It can also be used as a data
-recovery tool.
-.LP
-\fBpg_upgrade\fP must be run in two stages. In phase one you must run
-\fBpg_upgrade\fP with your old database installation in place. In phase
-two, \fBpg_upgrade\fP must be run on a freshly \fBinitdb\fP'ed server.
-In both phases, the same newly installed \fBpg_upgrade\fP script must be
-used.
-.SH Upgrading PostgreSQL with pg_upgrade
-.LP
-1) Back up your existing data directory, preferably using
-\fBpg_dumpall.\fP
-.LP
-2) Copy the program \fIpgsql/contrib/pg_upgrade/pg_upgrade\fP from the
-current PostgreSQL distribution somewhere into your path.
-.LP
-3)  Run phase one of \fBpg_upgrade:\fP
-.LP
-.B $ pg_upgrade -1
-.sp
-to collect information about the old database needed for the upgrade.
-You may use \fI-D\fP to specify the data directory. By default it uses
-the environment variable \fIPGDATA.\fP
-.LP
-4) Do:
-.LP
-.B $ cd pgsql/src
-.br
-.B $ make install
-.sp
-to install the PostgreSQL binaries for the new release.
-.LP
-5)  Do:
-.LP
-.B $ cd pgsql/contrib/pg_resetxlog
-.br
-.B $ make install
-.sp
-to install the \fIpg_resetxlog\fP utility, which is needed during phase
-2 of \fBpg_upgrade\fP.
-.LP
-6) Run initdb to create a new template1 database containing the system
-tables for the new release.  Make sure you use settings similar to those
-used in your previous version.
-.LP
-7) Start the new \fIpostmaster.\fP (Note: it is critical that no users
-connect to the server until the upgrade is complete. You may wish to
-start the postmaster without -i or alter pg_hba.conf temporarily.)
-.LP
-8)  Run phase two of \fBpg_upgrade:\fP
-.LP
-.B $ pg_upgrade -2
-.sp
-The program will do some checking to make sure everything is properly
-configured, and will then recreate all your databases and tables,
-but with no data.  It will then physically move the data files
-containing non-system tables and indexes into the proper 
-subdirectories.
-.LP
-9)  Restore your old \fIpostmaster\fP flags or \fIpg_hba.conf\fP if
-needed to allow user logins.
-.sp
-.LP
-10) Carefully examine the contents of the upgraded databases. If you
-detect problems, you'll need to recover by restoring from your full
-\fBpg_dumpall\fP backup. You can delete the \fIpg_upgrade_info/\fP
-directory when you are satisfied.
-.LP
-The upgraded databases will be in an un-vacuumed state. You will
-probably want to run a \fIVACUUM ANALYZE\fP before beginning production
-work.
-.SH NOTES
-While \fBpg_upgrade\fP is primarly an upgrade tool, it can also be used
-for data recovery. During phase 1, \fBpg_upgrade\fP creates database
-name / oid and database name / table name / oid mapping files in
-\fIpg_upgrade_info/.\fP These files are tab-delimited. If your system is
-too damaged, you may need to manually pull this information out of
-\fBpg_database\fP and \fBpg_class\fP and create the files manually.
-(Keep in mind most tables have \fBpg_toast_OID\fP and
-\fBpg_toast_OID_idx\fP files that store very long values. These must be
-recorded as well.) It also creates a schema-only \fBpg_dumpall.\fP In a
-damaged installation, you may be able to make one of these from a recent
-full \fBpg_dumpall.\fP
-.LP
-Phase 2 rebuilds each database with the schema from the old
-installation. It then moves the physical data files from the old
-installation and makes some modifications so the old data files work
-properly in the new installation.
-.SH SEE ALSO
-initdb(1), postmaster(1), pg_dump(1), pg_dumpall(1), vacuumdb(1)
diff --git a/contrib/pgbench/Makefile b/contrib/pgbench/Makefile
deleted file mode 100644
index e52e577931..0000000000
--- a/contrib/pgbench/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.10 2001/09/06 10:49:30 petere Exp $
-
-subdir = contrib/pgbench
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-PROGRAM = pgbench
-OBJS	= pgbench.o
-
-PG_CPPFLAGS = -I$(libpq_srcdir)
-PG_LIBS = $(libpq)
-
-DOCS = README.pgbench README.pgbench_jis
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/pgbench/README.pgbench b/contrib/pgbench/README.pgbench
deleted file mode 100644
index d052411ab2..0000000000
--- a/contrib/pgbench/README.pgbench
+++ /dev/null
@@ -1,170 +0,0 @@
-pgbench README		2001/10/24 Tatsuo Ishii (t-ishii@sra.co.jp)
-
-o What is pgbench?
-
-  pgbench is a simple program to run a benchmark test sort of
-  "TPC-B". pgbench is a client application of PostgreSQL and runs
-  with PostgreSQL only. It performs lots of small and simple
-  transactions including select/update/insert operations then
-  calculates number of transactions successfully completed within a
-  second (transactions per second, tps). Targeting data includes a
-  table with at least 100k tuples.
-
-  Example outputs from pgbench look like:
-
-	number of clients: 4
-	number of transactions per client: 100
-	number of processed transactions: 400/400
-	tps = 19.875015(including connections establishing)
-	tps = 20.098827(excluding connections establishing)
-
-  Similar program called "JDBCBench" already exists, but it requires
-  Java that may not be available on every platform. Moreover some
-  people concerned about the overhead of Java that might lead
-  inaccurate results. So I decided to write in pure C, and named
-  it "pgbench."
-
-o features of pgbench
-
-  - pgbench is written in C using libpq only. So it is very portable
-    and easy to install.
-
-  - pgbench can simulate concurrent connections using asynchronous
-    capability of libpq. No threading is required.
-
-o How to install pgbench
-
- (1) Configure and build the standard Postgres distribution.
-
-     You can get away with just running configure at the top level
-     and doing "make all" in src/interfaces/libpq.
-
- (2) Run make in this directory.
-
-     You will see an executable file "pgbench".  You can run it here,
-     or install it with the standard Postgres programs by doing
-     "make install".
-
-o How to use pgbench?
-
-  (1) Initialize database by:
-
-	pgbench -i <dbname>
-
-      where <dbname> is the name of database. pgbench uses four tables
-      accounts, branches, history and tellers. These tables will be
-      destroyed. Be very careful if you have tables having same
-      names. Default test data contains:
-
-	table		# of tuples
-	-------------------------
-	branches	1
-	tellers		10
-	accounts	100000
-	history		0
-
-	You can increase the number of tuples by using -s option. See
-	below.
-
-  (2) Run the benchmark test
-
-	pgbench <dbname>
-
-      The default configuration is:
-
-	number of clients: 1
-	number of transactions per client: 10
-
-o options
-
-  pgbench has number of options.
-
-	-h hostname
-		hostname where the backend is running. If this option
-		is omitted, pgbench will connect to the localhost via
-		Unix domain socket.
-
-	-p port
-		the port number that the backend is accepting. default is
-		libpq's default, usually 5432.
-
-	-c number_of_clients
-		Number of clients simulated. default is 1.
-
-	-t number_of_transactions
-		Number of transactions each client runs. default is 10.
-
-	-s scaling_factor
-		this should be used with -i (initialize) option.
-		number of tuples generated will be multiple of the
-		scaling factor. For example, -s 100 will imply 10M
-		(10,000,000) tuples in the accounts table.
-		default is 1.
-
-        -U login
-		Specify db user's login name if it is different from
-		the Unix login name.
-
-	-P password
-		Specify the db password. CAUTION: using this option
-		might be a security hole since ps command will
-		show the password. Use this for TESTING PURPOSE ONLY.
-
-	-n
-		No vacuuming and cleaning the history table prior the
-		test is performed.
-
-	-v
-		Do vacuuming before testing. This will take some time.
-		With neither -n nor -v, pgbench will vacuum tellers and
-		branches tables only.
-
-	-S
-		Perform select only transactions instead of TPC-B.
-
-        -C
-		Establish connection for each transaction, rather than
-		doing it just once at begining of pgbench in the normal
-		mode. This is usefull to measure the connection overhead.
-
-	-d
-		debug option.
-
-
-o What is the "transaction" actually performed in pgbench?
-
-  (1) begin;
-
-  (2) update accounts set abalance = abalance + :delta where aid = :aid;
-
-  (3) select abalance from accounts where aid = :aid;
-
-  (4) update tellers set tbalance = tbalance + :delta where tid = :tid;
-
-  (5) update branches set bbalance = bbalance + :delta where bid = :bid;
-
-  (6) insert into history(tid,bid,aid,delta) values(:tid,:bid,:aid,:delta);
-
-  (7) end;
-
-o License?
-
-Basically it is same as BSD license. See pgbench.c for more details.
-
-o History
-
-2001/10/24
-	* "time"->"mtime"
-
-2001/09/09
-	* Add -U, -P, -C options
-
-2000/1/15 pgbench-1.2 contributed to PostgreSQL
-	* Add -v option
-
-1999/09/29 pgbench-1.1 released
-	* Apply cygwin patches contributed by Yutaka Tanida
-	* More robust when backends die
-	* Add -S option (select only)
-
-1999/09/04 pgbench-1.0 released
diff --git a/contrib/pgbench/README.pgbench_jis b/contrib/pgbench/README.pgbench_jis
deleted file mode 100644
index 6e310b9cd5..0000000000
--- a/contrib/pgbench/README.pgbench_jis
+++ /dev/null
@@ -1,211 +0,0 @@
-pgbench README		2002/02/24 Tatsuo Ishii (t-ishii@sra.co.jp)
-
-$B"#(Bpgbench $B$H$O!)(B
-
-pgbench $B$O(B TPC-B$B$K;w$?%Y%s%A%^!<%/%F%9%H$r9T$J$&%W%m%0%i%`$G$9!%:#$N$H(B
-$B$3$m(B PostgreSQL $B@lMQ$G$9!%(B
-
-pgbench $B$O(B select/update/insert $B$r4^$`%H%i%s%6%/%7%g%s$r<B9T$7!$A4BN$N(B
-$B<B9T;~4V$H<B:]$K40N;$7$?%H%i%s%6%/%7%g%s$N?t$+$i(B 1 $BIC4V$K<B9T$G$-$?%H(B
-$B%i%s%6%/%7%g%s?t(B (tps) $B$rI=<($7$^$9!%=hM}$NBP>]$H$J$k%F!<%V%k$O%G%U%)(B
-$B%k%H$G$O(B 10$BK|%?%W%k$N%G!<%?$r4^$_$^$9!%(B
-
-$B<B:]$NI=<($O0J2<$N$h$&$J46$8$G$9!%(B
-
-number of clients: 4
-number of transactions per client: 100
-number of processed transactions: 400/400
-tps = 19.875015(including connections establishing)
-tps = 20.098827(excluding connections establishing)
-
-pgbench $B$O(B JDBCBench $B$H$$$&!$$b$H$b$H$O(B MySQL $BMQ$K=q$+$l$?(B JDBC $BMQ$N%Y(B
-$B%s%A%^!<%/%W%m%0%i%`$r;29M$K:n@.$5$l$^$7$?!%(B
-
-$B"#(Bpgbench $B$NFCD'(B
-
-o C $B8@8l$H(B libpq $B$@$1$G=q$+$l$F$$$k$N$G0\?"@-$,9b$/!$4JC1$K%$%s%9%H!<(B
-$B%k$G$-$^$9!%(B
-
-o pgbench $B$O(B libpq $B$NHsF14|=hM}5!G=$r;H$C$F%^%k%A%f!<%64D6-$r%7%_%e%l!<(B
-$B%H$7$^$9!%MF0W$KF1;~@\B34D6-$r%F%9%H$G$-$^$9!%(B
-
-$B"#(Bpgbench $B$N%$%s%9%H!<%k(B
-
-(1) PostgreSQL$B$r(Bconfigure$B!$%3%s%Q%$%k$7$^$9!%(Bpgbench$B$N%$%s%9%H!<%k$@$1(B
-    $B$,L\E*$G$"$l$P!$(BPostgreSQL$B$N$9$Y$F$r%3%s%Q%$%k$9$kI,MW$O$"$j$^$;$s!%(B
-	PostgreSQL$B%=!<%9$N%H%C%W%G%#%l%/%H%j$G(Bconfigure$B$r$7$?8e!$(B
-    src/interface/libpq $B$G(B "make all" $B$r<B9T$9$l$P=`Hw40N;$G$9!%(B
-
-(2) $B$3$N%G%#%l%/%H%j$G(B make $B$r<B9T$7$^$9!%$=$&$9$k$H!$(B"pgbench" $B$H$$$&(B
-    $B<B9T%W%m%0%i%`$,$G$-$^$9!%$=$N$^$^<B9T$7$F$b9=$$$^$;$s$7!$(B"make
-    install" $B$r<B9T$7$F(B PostgreSQL $B$NI8=`<B9T%W%m%0%i%`%G%#%l%/%H%j(B
-    ($B%G%U%)%k%H$G$O(B /usr/local/pgsql/bin) $B$K%$%s%9%H!<%k$9$k$3$H$b$G$-(B
-    $B$^$9!%(B
-
-$B"#(Bpgbench $B$N;H$$J}(B
-
-$ pgbench [$B%G!<%?%Y!<%9L>(B]
-
-$B$G$9!%%G!<%?%Y!<%9L>$r>JN,$9$k$H!$%f!<%6L>$HF1$8%G!<%?%Y!<%9$r;XDj$7$?(B
-$B$b$N$H$_$J$7$^$9!%%G!<%?%Y!<%9$O8e=R$N(B -i $B%*%W%7%g%s$r;H$C$F$"$i$+$8$a(B
-$B=i4|2=$7$F$*$/I,MW$,$"$j$^$9!%(B
-
-pgbench $B$K$O$$$m$$$m$J%*%W%7%g%s$,$"$j$^$9!%(B
-
--h $B%[%9%HL>(B	PostgreSQL$B$N%G!<%?%Y!<%9%G!<%b%s(B postmaster $B$NF0(B
-		$B$$$F$$$k%[%9%HL>$r;XDj$7$^$9!%>JN,$9$k$H<+%[%9%H$K(B Unix domain
-		socket $B$G@\B3$7$^$9!%(B
-
--p $B%]!<%HHV9f(B	postmaster $B$N;HMQ$9$k%]!<%HHV9f$r;XDj$7$^$9!%>JN,$9$k$H(B 5432
-		$B$,;XDj$5$l$?$b$N$H$_$J$7$^$9!%(B
-
--c $B%/%i%$%"%s%H?t(B	$BF1;~<B9T%/%i%$%"%s%H?t$r;XDj$7$^$9!%>JN,;~$O(B
-			1 $B$H$J$j$^$9!%(Bpgbench $B$OF1;~<B9T%/%i%$%"%s%HKh$K(B
-			$B%U%!%$%k%G%#%9%/%j%W%?$r;HMQ$9$k$N$G!$;HMQ2DG=(B
-			$B%U%!%$%k%G%#%9%/%j%W%??t$r1[$($k%/%i%$%"%s%H?t$O(B
-			$B;XDj$G$-$^$;$s!%;HMQ2DG=%U%!%$%k%G%#%9%/%j%W%??t(B
-			$B$O(B limit $B$d(B ulimit $B%3%^%s%I$GCN$k$3$H$,$G$-$^$9!%(B
-
--t $B%H%i%s%6%/%7%g%s?t(B	$B3F%/%i%$%"%s%H$,<B9T$9$k%H%i%s%6%/%7%g%s?t$r(B
-			$B;XDj$7$^$9!%>JN,;~$O(B 10 $B$H$J$j$^$9!%(B
-
--s $B%9%1!<%j%s%0%U%!%/%?!<(B
-
-		-i $B%*%W%7%g%s$H0l=o$K;HMQ$7$^$9!%(B
-		$B%9%1!<%j%s%0%U%!%/%?!<$O(B1$B0J>e$N@0?t!%%9%1!<%j%s%0%U%!(B
-		$B%/%?!<$rJQ$($k$3$H$K$h$j!$%F%9%H$NBP>]$H$J$k%F!<%V%k$N(B
-		$BBg$-$5$,(B 10$BK|(B x [$B%9%1!<%j%s%0%U%!%/%?!<(B]$B$K$J$j$^$9!%(B
-		$B%G%U%)%k%H$N%9%1!<%j%s%0%U%!%/%?!<$O(B 1 $B$G$9!%(B
-
--U login	DB$B%f!<%6$N%m%0%$%sL>$r;XDj$7$^$9!%(B
-
--P password	$B%Q%9%o!<%I$r;XDj$7$^$9!%$J$*!$$3$N%*%W%7%g%s$r;H$&$H!$(B
-		$B%Q%9%o!<%I$r(Bps$B%3%^%s%I$G8+$i$l$k$J$I!$%;%-%e%j%F%#%[!<(B
-		$B%k$K$J$k2DG=@-$,$"$k$N$G!$%F%9%HMQ$K$N$_$*;H$$2<$5$$!%(B
-
--n		$B$3$N%*%W%7%g%s$r;XDj$9$k$H!$%Y%s%A%^!<%/3+;OA0$K(B vacuum $B$H(B
-		history $B$N%/%j%"$r9T$J$$$^$;$s!%(B
-
--v		$B$3$N%*%W%7%g%s$r;XDj$9$k$H!$%Y%s%A%^!<%/3+;OA0$K(B vacuum $B$H(B
-		history $B$N%/%j%"$r9T$J$$$^$9!%(B-v $B$H(B -n $B$r>JN,$9$k$H!$(B
-		$B:G>.8B$N(B vacuum $B$J$I$r9T$$$^$9!%$9$J$o$A!$(Bhistory $B$N:o=|!$(B
-		$B$H(B history, branches, history $B$N(B vacuum $B$r9T$$$^$9!%(B
-		$B$3$l$O!$(Bvacuum $B$N;~4V$r:G>.8B$K$7$J$,$i!$%Q%U%)!<%^%s%9$K(B
-		$B1F6A$9$k%4%_A]=|$r8z2LE*$K9T$$$^$9!%DL>o$O(B -v $B$H(B -n $B$r(B
-		$B>JN,$9$k$3$H$r$*$9$9$a$7$^$9!%(B
-
--S		TPC-B$B$N%H%i%s%6%/%7%g%s$G$O$J$/!$8!:w$N$_$N%H%i%s%6%/%7%g%s$r(B
-		$B<B9T$7$^$9!%8!:w%9%T!<%I$rB,Dj$7$?$$$H$-$K;H$$$^$9!%(B
-
--N
-		"branches"$B$H(B"tellers"$B%F!<%V%k$N99?7$r9T$$$^$;$s!%$3$l(B
-		$B$K$h$C$F(B"branches"$B$H(B"tellers"$B$X$NBgNL$N99?7$N6%9g$N$J(B
-		$B$$>uBV$G$NB,Dj$r9T$$$^$9!%$7$?$,$C$F(BTPC-B$B$N%9%Z%C%/$K(B
-		$B$OE,9g$7$J$/$J$j$^$9$,!$$h$j8=<BE*$JIi2Y$r%F%9%H$9$k$3(B
-		$B$H$,$G$-$^$9!%(B
-
--N
-		"branches"$B$H(B"tellers"$B%F!<%V%k$N99?7$r9T$$$^$;$s!%$3$l(B
-		$B$K$h$C$F(B"branches"$B$H(B"tellers"$B$X$NBgNL$N99?7$N6%9g$N$J(B
-		$B$$>uBV$G$NB,Dj$r9T$$$^$9!%$7$?$,$C$F(BTPC-B$B$N%9%Z%C%/$K(B
-		$B$OE,9g$7$J$/$J$j$^$9$,!$$h$j8=<BE*$JIi2Y$r%F%9%H$9$k$3(B
-		$B$H$,$G$-$^$9!%(B
-
--C		$B$3$N%*%W%7%g%s$r;XDj$9$k$H!$:G=i$K3NN)$7$?%3%M%/%7%g%s(B
-		$B$r;H$$2s$9$N$G$O$J$/!$3F%H%i%s%6%/%7%g%s$4$H$K(BDB$B$X$N@\(B
-		$BB3$r9T$$$^$9!%%3%M%/%7%g%s$N%*!<%P!<$X%C%I$rB,Dj$9$k$N(B
-		$B$KM-8z$G$9!%(B
-
--d		$B%G%P%C%0%*%W%7%g%s!%MM!9$J>pJs$,I=<($5$l$^$9!%(B
-
-$B"#%G!<%?%Y!<%9$N=i4|2=(B
-
-pgbench $B$G%Y%s%A%^!<%/%F%9%H$r<B;\$9$k$?$a$K$O!$$"$i$+$8$a%G!<%?%Y!<%9(B
-$B$r=i4|2=$7!$%F%9%H%G!<%?$r:n$kI,MW$,$"$j$^$9!%(B
-
-$ pgbench -i [$B%G!<%?%Y!<%9L>(B]
-
-$B$3$l$K$h$j0J2<$N%F!<%V%k$,:n$i$l$^$9(B($B%9%1!<%j%s%0%U%!%/%?!<(B == 1 $B$N>l9g(B)$B!%(B
-
-$B!vCm0U!v(B
-$BF1$8L>A0$N%F!<%V%k$,$"$k$H:o=|$5$l$F$7$^$&$N$G$4Cm0U2<$5$$!*!*(B
-
-$B%F!<%V%kL>(B	$B%?%W%k?t(B
--------------------------
-branches	1
-tellers		10
-accounts	100000
-history		0
-
-$B%9%1!<%j%s%0%U%!%/%?!<$r(B 10,100,1000 $B$J$I$KJQ99$9$k$H!$>e5-%?%W%k?t$O(B
-$B$=$l$K1~$8$F(B10$BG\!$(B100$BG\!$(B1000$BG\$K$J$j$^$9!%$?$H$($P!$%9%1!<%j%s%0%U%!(B
-$B%/%?!<$r(B 10 $B$H$9$k$H!$(B
-
-$B%F!<%V%kL>(B	$B%?%W%k?t(B
--------------------------
-branches	10
-tellers		100
-accounts	1000000
-history		0
-
-$B$K$J$j$^$9!%(B
-
-$B"#!V%H%i%s%6%/%7%g%s!W$NDj5A(B
-
-pgbench $B$G$O!$0J2<$N%7!<%1%s%9$rA4It40N;$7$F(B1$B%H%i%s%6%/%7%g%s$H?t$($F(B
-$B$$$^$9!%(B
-
-(1) begin;
-
-(2) update accounts set abalance = abalance + :delta where aid = :aid;
-    $B$3$3$G!$(B:delta$B$O(B1$B$+$i(B1000$B$^$G$NCM$r<h$kMp?t!$(B:aid $B$O(B 1$B$+$i(B100000$B$^$G(B
-    $B$NCM$r<h$kMp?t$G$9!%0J2<!$Mp?t$NCM$O$=$l$>$l$3$N%H%i%s%6%/%7%g%s$N(B
-    $BCf$G$OF1$8CM$r;H$$$^$9!%(B
-
-(3) select abalance from accounts where aid = :aid;
-    $B$3$3$G$O(B1$B7o$@$18!:w$5$l$^$9!%(B
-
-(4) update tellers set tbalance = tbalance + :delta where tid = :tid;
-    $B$3$3$G(B :tid $B$O(B 1$B$+$i(B10$B$N4V$NCM$r$H$kMp?t$G$9!%(B
-
-(5) update branches set bbalance = bbalance + :delta where bid = :bid;
-    $B$3$3$G(B :bid $B$O(B 1 $B$+$i(B[$B%9%1%j%s%0%U%!%/%?!<(B]$B$N4V$NCM$r<h$kMp?t$G$9!%(B
-
-(6) insert into history(tid,bid,aid,delta) values(:tid,:bid,:aid,:delta);
-
-(7) end;
-
-$B"#:n<T$H%i%$%;%s%9>r7o(B
-
-pgbench $B$O@P0f(B $BC#IW$K$h$C$F=q$+$l$^$7$?!%%i%$%;%s%9>r7o$O(B pgbench.c $B$N(B
-$BKAF,$K=q$$$F$"$j$^$9!%$3$N>r7o$r<i$k8B$jL5=~$GMxMQ$7!$$^$?<+M3$K:FG[IU(B
-$B$G$-$^$9!%(B
-
-$B"#2~DjMzNr(B
-
-2002/02/24
-	* $B$3$3$+$i$O(B7.3$BMQ$NJQ99$G$9!%(B
-	* CHECKPOINT$B$NH/9T$r$d$a$^$7$?!%(B
-	* -N $B%*%W%7%g%s$rDI2C$7$^$7$?!%(B
-
-2002/02/24
-	* $B$3$3$+$i$O(B7.3$BMQ$NJQ99$G$9!%(B
-	* CHECKPOINT$B$NH/9T$r$d$a$^$7$?!%(B
-	* -N $B%*%W%7%g%s$rDI2C$7$^$7$?!%(B
-
-2001/10/24
-	* PostgreSQL 7.2$B$G!$(B"time"$B$,M=Ls8l$K$J$C$?$N$G!$(B"mtime"$B$KJQ99(B
-	$B$7$?!%(B
-
-2001/09/09
-	* PostgreSQL 7.2$BMQ$K!$(B-U, -P, -C $B%*%W%7%g%s$rDI2C$7$^$7$?!%(B
-
-2000/1/15 pgbench-1.2 $B$O(B PostgreSQL $B$K(B contribute $B$5$l$^$7$?!%(B
-	* -v $B%*%W%7%g%sDI2C(B
-
-1999/09/29 pgbench-1.1 $B%j%j!<%9(B
-	* $BC+ED$5$s$K$h$k(Bcygwin$BBP1~%Q%C%A<h$j9~$_(B
-	* $B%P%C%/%(%s%I%/%i%C%7%e;~$NBP1~(B
-	* -S $B%*%W%7%g%sDI2C(B
-
-1999/09/04 pgbench-1.0 $B%j%j!<%9(B
diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
deleted file mode 100644
index bcac18b236..0000000000
--- a/contrib/pgbench/pgbench.c
+++ /dev/null
@@ -1,945 +0,0 @@
-/*
- * $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.16 2002/02/24 00:17:57 ishii Exp $
- *
- * pgbench: a simple TPC-B like benchmark program for PostgreSQL
- * written by Tatsuo Ishii
- *
- * Copyright (c) 2000-2002  Tatsuo Ishii
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that the above copyright notice appear in all
- * copies and that both that copyright notice and this permission
- * notice appear in supporting documentation, and that the name of the
- * author not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. The author makes no representations about the
- * suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- */
-#include "postgres_fe.h"
-
-#include "libpq-fe.h"
-
-#include <errno.h>
-
-#ifdef WIN32
-#include "win32.h"
-#else
-#include <sys/time.h>
-#include <unistd.h>
-
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-/* for getrlimit */
-#include <sys/resource.h>
-#endif   /* WIN32 */
-
-/********************************************************************
- * some configurable parameters */
-
-#define MAXCLIENTS 1024			/* max number of clients allowed */
-
-int			nclients = 1;		/* default number of simulated clients */
-int			nxacts = 10;		/* default number of transactions per
-								 * clients */
-
-/*
- * scaling factor. for example, tps = 10 will make 1000000 tuples of
- * accounts table.
- */
-int			tps = 1;
-
-/*
- * end of configurable parameters
- *********************************************************************/
-
-#define nbranches	1
-#define ntellers	10
-#define naccounts	100000
-
-int			remains;			/* number of remained clients */
-
-int			is_connect;			/* establish connection  for each
-								 * transactoin */
-
-char	   *pghost = "";
-char	   *pgport = NULL;
-char	   *pgoptions = NULL;
-char	   *pgtty = NULL;
-char	   *login = NULL;
-char	   *pwd = NULL;
-char	   *dbName;
-
-typedef struct
-{
-	PGconn	   *con;			/* connection handle to DB */
-	int			state;			/* state No. */
-	int			cnt;			/* xacts count */
-	int			ecnt;			/* error count */
-	int			listen;			/* none 0 indicates that an async query
-								 * has been sent */
-	int			aid;			/* account id for this transaction */
-	int			bid;			/* branch id for this transaction */
-	int			tid;			/* teller id for this transaction */
-	int			delta;
-	int			abalance;
-}	CState;
-
-static void
-usage()
-{
-	fprintf(stderr, "usage: pgbench [-h hostname][-p port][-c nclients][-t ntransactions][-s scaling_factor][-n][-C][-v][-S][-N][-U login][-P password][-d][dbname]\n");
-	fprintf(stderr, "(initialize mode): pgbench -i [-h hostname][-p port][-s scaling_factor][-U login][-P password][-d][dbname]\n");
-}
-
-/* random number generator */
-static int
-getrand(int min, int max)
-{
-	return (min + (int) (max * 1.0 * rand() / (RAND_MAX + 1.0)));
-}
-
-/* set up a connection to the backend */
-static PGconn *
-doConnect()
-{
-	PGconn	   *con;
-
-	con = PQsetdbLogin(pghost, pgport, pgoptions, pgtty, dbName,
-					   login, pwd);
-	if (con == NULL)
-	{
-		fprintf(stderr, "Connection to database '%s' failed.\n", dbName);
-		fprintf(stderr, "Memory allocatin problem?\n");
-		return (NULL);
-	}
-
-	if (PQstatus(con) == CONNECTION_BAD)
-	{
-		fprintf(stderr, "Connection to database '%s' failed.\n", dbName);
-
-		if (PQerrorMessage(con))
-			fprintf(stderr, "%s", PQerrorMessage(con));
-		else
-			fprintf(stderr, "No explanation from the backend\n");
-
-		return (NULL);
-	}
-	return (con);
-}
-
-/* throw away response from backend */
-static void
-discard_response(CState * state)
-{
-	PGresult   *res;
-
-	do
-	{
-		res = PQgetResult(state->con);
-		if (res)
-			PQclear(res);
-	} while (res);
-}
-
-/* check to see if the SQL result was good */
-static int
-check(CState * state, PGresult *res, int n, int good)
-{
-	CState	   *st = &state[n];
-
-	if (res && PQresultStatus(res) != good)
-	{
-		fprintf(stderr, "Client %d aborted in state %d: %s", n, st->state, PQerrorMessage(st->con));
-		remains--;				/* I've aborted */
-		PQfinish(st->con);
-		st->con = NULL;
-		return (-1);
-	}
-	return (0);					/* OK */
-}
-
-/* process a transaction */
-static void
-doOne(CState * state, int n, int debug, int ttype)
-{
-	char		sql[256];
-	PGresult   *res;
-	CState	   *st = &state[n];
-
-	if (st->listen)
-	{							/* are we receiver? */
-		if (debug)
-			fprintf(stderr, "client %d receiving\n", n);
-		while (PQisBusy(st->con) == TRUE)
-		{
-			if (!PQconsumeInput(st->con))
-			{					/* there's something wrong */
-				fprintf(stderr, "Client %d aborted in state %d. Probably the backend died while processing.\n", n, st->state);
-				remains--;		/* I've aborted */
-				PQfinish(st->con);
-				st->con = NULL;
-				return;
-			}
-		}
-
-		switch (st->state)
-		{
-			case 0:				/* response to "begin" */
-				res = PQgetResult(st->con);
-				if (check(state, res, n, PGRES_COMMAND_OK))
-					return;
-				PQclear(res);
-				discard_response(st);
-				break;
-			case 1:				/* response to "update accounts..." */
-				res = PQgetResult(st->con);
-				if (check(state, res, n, PGRES_COMMAND_OK))
-					return;
-				PQclear(res);
-				discard_response(st);
-				break;
-			case 2:				/* response to "select abalance ..." */
-				res = PQgetResult(st->con);
-				if (check(state, res, n, PGRES_TUPLES_OK))
-					return;
-				PQclear(res);
-				discard_response(st);
-				break;
-			case 3:				/* response to "update tellers ..." */
-				res = PQgetResult(st->con);
-				if (check(state, res, n, PGRES_COMMAND_OK))
-					return;
-				PQclear(res);
-				discard_response(st);
-				break;
-			case 4:				/* response to "update branches ..." */
-				res = PQgetResult(st->con);
-				if (check(state, res, n, PGRES_COMMAND_OK))
-					return;
-				PQclear(res);
-				discard_response(st);
-				break;
-			case 5:				/* response to "insert into history ..." */
-				res = PQgetResult(st->con);
-				if (check(state, res, n, PGRES_COMMAND_OK))
-					return;
-				PQclear(res);
-				discard_response(st);
-				break;
-			case 6:				/* response to "end" */
-				res = PQgetResult(st->con);
-				if (check(state, res, n, PGRES_COMMAND_OK))
-					return;
-				PQclear(res);
-				discard_response(st);
-
-				if (is_connect)
-				{
-					PQfinish(st->con);
-					st->con = NULL;
-				}
-
-				if (++st->cnt >= nxacts)
-				{
-					remains--;	/* I've done */
-					if (st->con != NULL)
-					{
-						PQfinish(st->con);
-						st->con = NULL;
-					}
-					return;
-				}
-				break;
-		}
-
-		/* increment state counter */
-		st->state++;
-		if (st->state > 6)
-			st->state = 0;
-	}
-
-	if (st->con == NULL)
-	{
-		if ((st->con = doConnect()) == NULL)
-		{
-			fprintf(stderr, "Client %d aborted in establishing connection.\n",
-					n);
-			remains--;			/* I've aborted */
-			PQfinish(st->con);
-			st->con = NULL;
-			return;
-		}
-	}
-
-	switch (st->state)
-	{
-		case 0:			/* about to start */
-			strcpy(sql, "begin");
-			st->aid = getrand(1, naccounts * tps);
-			st->bid = getrand(1, nbranches * tps);
-			st->tid = getrand(1, ntellers * tps);
-			st->delta = getrand(1, 1000);
-			break;
-		case 1:
-			sprintf(sql, "update accounts set abalance = abalance + %d where aid = %d\n", st->delta, st->aid);
-			break;
-		case 2:
-			sprintf(sql, "select abalance from accounts where aid = %d", st->aid);
-			break;
-		case 3:
-			if (ttype == 0)
-			{
-			    sprintf(sql, "update tellers set tbalance = tbalance + %d where tid = %d\n",
-				    st->delta, st->tid);
-			    break;
-			}
-		case 4:
-			if (ttype == 0)
-			{
-			    sprintf(sql, "update branches set bbalance = bbalance + %d where bid = %d", st->delta, st->bid);
-			    break;
-			}
-		case 5:
-			sprintf(sql, "insert into history(tid,bid,aid,delta,mtime) values(%d,%d,%d,%d,'now')",
-					st->tid, st->bid, st->aid, st->delta);
-			break;
-		case 6:
-			strcpy(sql, "end");
-			break;
-	}
-
-	if (debug)
-		fprintf(stderr, "client %d sending %s\n", n, sql);
-	if (PQsendQuery(st->con, sql) == 0)
-	{
-		if (debug)
-			fprintf(stderr, "PQsendQuery(%s)failed\n", sql);
-		st->ecnt++;
-	}
-	else
-	{
-		st->listen++;			/* flags that should be listned */
-	}
-}
-
-/* process a select only transaction */
-static void
-doSelectOnly(CState * state, int n, int debug)
-{
-	char		sql[256];
-	PGresult   *res;
-	CState	   *st = &state[n];
-
-	if (st->listen)
-	{							/* are we receiver? */
-		if (debug)
-			fprintf(stderr, "client %d receiving\n", n);
-		while (PQisBusy(st->con) == TRUE)
-		{
-			if (!PQconsumeInput(st->con))
-			{					/* there's something wrong */
-				fprintf(stderr, "Client %d aborted in state %d. Probably the backend died while processing.\n", n, st->state);
-				remains--;		/* I've aborted */
-				PQfinish(st->con);
-				st->con = NULL;
-				return;
-			}
-		}
-
-		switch (st->state)
-		{
-			case 0:				/* response to "select abalance ..." */
-				res = PQgetResult(st->con);
-				if (check(state, res, n, PGRES_TUPLES_OK))
-					return;
-				PQclear(res);
-				discard_response(st);
-
-				if (is_connect)
-				{
-					PQfinish(st->con);
-					st->con = NULL;
-				}
-
-				if (++st->cnt >= nxacts)
-				{
-					remains--;	/* I've done */
-					if (st->con != NULL)
-					{
-						PQfinish(st->con);
-						st->con = NULL;
-					}
-					return;
-				}
-				break;
-		}
-
-		/* increment state counter */
-		st->state++;
-		if (st->state > 0)
-			st->state = 0;
-	}
-
-	if (st->con == NULL)
-	{
-		if ((st->con = doConnect()) == NULL)
-		{
-			fprintf(stderr, "Client %d aborted in establishing connection.\n",
-					n);
-			remains--;			/* I've aborted */
-			PQfinish(st->con);
-			st->con = NULL;
-			return;
-		}
-	}
-
-	switch (st->state)
-	{
-		case 0:
-			st->aid = getrand(1, naccounts * tps);
-			sprintf(sql, "select abalance from accounts where aid = %d", st->aid);
-			break;
-	}
-
-	if (debug)
-		fprintf(stderr, "client %d sending %s\n", n, sql);
-
-	if (PQsendQuery(st->con, sql) == 0)
-	{
-		if (debug)
-			fprintf(stderr, "PQsendQuery(%s)failed\n", sql);
-		st->ecnt++;
-	}
-	else
-	{
-		st->listen++;			/* flags that should be listned */
-	}
-}
-
-/* discard connections */
-static void
-disconnect_all(CState * state)
-{
-	int			i;
-
-	for (i = 0; i < nclients; i++)
-	{
-		if (state[i].con)
-			PQfinish(state[i].con);
-	}
-}
-
-/* create tables and setup data */
-static void
-init()
-{
-	PGconn	   *con;
-	PGresult   *res;
-	static char *DDLs[] = {
-		"drop table branches",
-		"create table branches(bid int, primary key(bid),bbalance int,filler char(88))",
-		"drop table tellers",
-		"create table tellers(tid int, primary key(tid),bid int,tbalance int,filler char(84))",
-		"drop table accounts",
-		"create table accounts(aid int,primary key(aid),bid int,abalance int,filler char(84))",
-		"drop table history",
-	"create table history(tid int,bid int,aid int,delta int,mtime timestamp,filler char(22))"};
-	char		sql[256];
-
-	int			i;
-
-	if ((con = doConnect()) == NULL)
-		exit(1);
-
-	for (i = 0; i < (sizeof(DDLs) / sizeof(char *)); i++)
-	{
-		res = PQexec(con, DDLs[i]);
-		if (strncmp(DDLs[i], "drop", 4) && PQresultStatus(res) != PGRES_COMMAND_OK)
-		{
-			fprintf(stderr, "%s", PQerrorMessage(con));
-			exit(1);
-		}
-		PQclear(res);
-	}
-
-	res = PQexec(con, "begin");
-	if (PQresultStatus(res) != PGRES_COMMAND_OK)
-	{
-		fprintf(stderr, "%s", PQerrorMessage(con));
-		exit(1);
-	}
-
-	for (i = 0; i < nbranches * tps; i++)
-	{
-		sprintf(sql, "insert into branches(bid,bbalance) values(%d,0)", i + 1);
-		res = PQexec(con, sql);
-		if (PQresultStatus(res) != PGRES_COMMAND_OK)
-		{
-			fprintf(stderr, "%s", PQerrorMessage(con));
-			exit(1);
-		}
-		PQclear(res);
-	}
-
-	for (i = 0; i < ntellers * tps; i++)
-	{
-		sprintf(sql, "insert into tellers(tid,bid,tbalance) values (%d,%d,0)"
-				,i + 1, i / ntellers + 1);
-		res = PQexec(con, sql);
-		if (PQresultStatus(res) != PGRES_COMMAND_OK)
-		{
-			fprintf(stderr, "%s", PQerrorMessage(con));
-			exit(1);
-		}
-		PQclear(res);
-	}
-
-	res = PQexec(con, "end");
-	if (PQresultStatus(res) != PGRES_COMMAND_OK)
-	{
-		fprintf(stderr, "%s", PQerrorMessage(con));
-		exit(1);
-	}
-
-
-	/*
-	 * occupy accounts table with some data
-	 */
-	fprintf(stderr, "creating tables...\n");
-	for (i = 0; i < naccounts * tps; i++)
-	{
-		int			j = i + 1;
-
-		if (j % 10000 == 1)
-		{
-			res = PQexec(con, "copy accounts from stdin");
-			if (PQresultStatus(res) != PGRES_COPY_IN)
-			{
-				fprintf(stderr, "%s", PQerrorMessage(con));
-				exit(1);
-			}
-			PQclear(res);
-		}
-
-		sprintf(sql, "%d\t%d\t%d\t\n", j, j / naccounts, 0);
-		if (PQputline(con, sql))
-		{
-			fprintf(stderr, "PQputline failed\n");
-			exit(1);
-		}
-
-		if (j % 10000 == 0)
-		{
-			/*
-			 * every 10000 tuples, we commit the copy command. this should
-			 * avoid generating too much WAL logs
-			 */
-			fprintf(stderr, "%d tuples done.\n", j);
-			if (PQputline(con, "\\.\n"))
-			{
-				fprintf(stderr, "very last PQputline failed\n");
-				exit(1);
-			}
-
-			if (PQendcopy(con))
-			{
-				fprintf(stderr, "PQendcopy failed\n");
-				exit(1);
-			}
-
-#ifdef NOT_USED
-			/*
-			 * do a checkpoint to purge the old WAL logs
-			 */
-			res = PQexec(con, "checkpoint");
-			if (PQresultStatus(res) != PGRES_COMMAND_OK)
-			{
-				fprintf(stderr, "%s", PQerrorMessage(con));
-				exit(1);
-			}
-#endif /* NOT_USED */
-		}
-	}
-
-	/* vacuum */
-	fprintf(stderr, "vacuum...");
-	res = PQexec(con, "vacuum analyze");
-	if (PQresultStatus(res) != PGRES_COMMAND_OK)
-	{
-		fprintf(stderr, "%s", PQerrorMessage(con));
-		exit(1);
-	}
-	fprintf(stderr, "done.\n");
-
-	PQfinish(con);
-}
-
-/* print out results */
-static void
-printResults(
-			 int ttype, CState * state,
-			 struct timeval * tv1, struct timeval * tv2,
-			 struct timeval * tv3)
-{
-	double		t1,
-				t2;
-	int			i;
-	int			normal_xacts = 0;
-	char	*s;
-
-	for (i = 0; i < nclients; i++)
-		normal_xacts += state[i].cnt;
-
-	t1 = (tv3->tv_sec - tv1->tv_sec) * 1000000.0 + (tv3->tv_usec - tv1->tv_usec);
-	t1 = normal_xacts * 1000000.0 / t1;
-
-	t2 = (tv3->tv_sec - tv2->tv_sec) * 1000000.0 + (tv3->tv_usec - tv2->tv_usec);
-	t2 = normal_xacts * 1000000.0 / t2;
-
-	if (ttype == 0)
-	    s = "TPC-B (sort of)";
-	else if (ttype == 2)
-	    s = "Update only accounts";
-	else
-	    s = "SELECT only";
-
-	printf("transaction type: %s\n", s);
-	printf("scaling factor: %d\n", tps);
-	printf("number of clients: %d\n", nclients);
-	printf("number of transactions per client: %d\n", nxacts);
-	printf("number of transactions actually processed: %d/%d\n", normal_xacts, nxacts * nclients);
-	printf("tps = %f(including connections establishing)\n", t1);
-	printf("tps = %f(excluding connections establishing)\n", t2);
-}
-
-
-int
-main(int argc, char **argv)
-{
-	extern char *optarg;
-	extern int	optind,
-				opterr,
-				optopt;
-	int			c;
-	int			is_init_mode = 0;		/* initialize mode? */
-	int			is_no_vacuum = 0;		/* no vacuum at all before
-										 * testing? */
-	int			is_full_vacuum = 0;		/* do full vacuum before testing? */
-	int			debug = 0;		/* debug flag */
-	int			ttype = 0;		/* transaction type. 0: TPC-B, 1: SELECT
-								 * only 
-				 2: skip updation of branches and tellers */
-
-	static CState state[MAXCLIENTS];	/* clients status */
-
-	struct timeval tv1;			/* start up time */
-	struct timeval tv2;			/* after establishing all connections to
-								 * the backend */
-	struct timeval tv3;			/* end time */
-
-	int			i;
-
-	fd_set		input_mask;
-	int			nsocks;			/* return from select(2) */
-	int			maxsock;		/* max socket number to be waited */
-
-#ifndef __CYGWIN__
-	struct rlimit rlim;
-#endif
-
-	PGconn	   *con;
-	PGresult   *res;
-
-	while ((c = getopt(argc, argv, "ih:nvp:dc:t:s:U:P:CNS")) != -1)
-	{
-		switch (c)
-		{
-			case 'i':
-				is_init_mode++;
-				break;
-			case 'h':
-				pghost = optarg;
-				break;
-			case 'n':
-				is_no_vacuum++;
-				break;
-			case 'v':
-				is_full_vacuum++;
-				break;
-			case 'p':
-				pgport = optarg;
-				break;
-			case 'd':
-				debug++;
-				break;
-			case 'S':
-				ttype = 1;
-				break;
-			case 'N':
-				ttype = 2;
-				break;
-			case 'c':
-				nclients = atoi(optarg);
-				if (nclients <= 0 || nclients > MAXCLIENTS)
-				{
-					fprintf(stderr, "wrong number of clients: %d\n", nclients);
-					exit(1);
-				}
-#ifndef __CYGWIN__
-#ifdef RLIMIT_NOFILE			/* most platform uses RLIMIT_NOFILE */
-				if (getrlimit(RLIMIT_NOFILE, &rlim) == -1)
-				{
-#else							/* but BSD doesn't ... */
-				if (getrlimit(RLIMIT_OFILE, &rlim) == -1)
-				{
-#endif   /* HAVE_RLIMIT_NOFILE */
-					fprintf(stderr, "getrlimit failed. reason: %s\n", strerror(errno));
-					exit(1);
-				}
-				if (rlim.rlim_cur <= (nclients + 2))
-				{
-					fprintf(stderr, "You need at least %d open files resource but you are only allowed to use %ld.\n", nclients + 2, (long) rlim.rlim_cur);
-					fprintf(stderr, "Use limit/ulimt to increase the limit before using pgbench.\n");
-					exit(1);
-				}
-#endif   /* #ifndef __CYGWIN__ */
-				break;
-			case 'C':
-				is_connect = 1;
-				break;
-			case 's':
-				tps = atoi(optarg);
-				if (tps <= 0)
-				{
-					fprintf(stderr, "wrong scaling factor: %d\n", tps);
-					exit(1);
-				}
-				break;
-			case 't':
-				nxacts = atoi(optarg);
-				if (nxacts <= 0)
-				{
-					fprintf(stderr, "wrong number of transactions: %d\n", nxacts);
-					exit(1);
-				}
-				break;
-			case 'U':
-				login = optarg;
-				break;
-			case 'P':
-				pwd = optarg;
-				break;
-			default:
-				usage();
-				exit(1);
-				break;
-		}
-	}
-
-	if (argc > optind)
-		dbName = argv[optind];
-	else
-	{
-		dbName = getenv("USER");
-		if (dbName == NULL)
-			dbName = "";
-	}
-
-	if (is_init_mode)
-	{
-		init();
-		exit(0);
-	}
-
-	remains = nclients;
-
-	if (debug)
-	{
-		printf("pghost: %s pgport: %s nclients: %d nxacts: %d dbName: %s\n",
-			   pghost, pgport, nclients, nxacts, dbName);
-	}
-
-	/* opening connection... */
-	con = doConnect();
-	if (con == NULL)
-		exit(1);
-
-	if (PQstatus(con) == CONNECTION_BAD)
-	{
-		fprintf(stderr, "Connection to database '%s' failed.\n", dbName);
-		fprintf(stderr, "%s", PQerrorMessage(con));
-		exit(1);
-	}
-
-	/*
-	 * get the scaling factor that should be same as count(*) from
-	 * branches...
-	 */
-	res = PQexec(con, "select count(*) from branches");
-	if (PQresultStatus(res) != PGRES_TUPLES_OK)
-	{
-		fprintf(stderr, "%s", PQerrorMessage(con));
-		exit(1);
-	}
-	tps = atoi(PQgetvalue(res, 0, 0));
-	if (tps < 0)
-	{
-		fprintf(stderr, "count(*) from branches invalid (%d)\n", tps);
-		exit(1);
-	}
-	PQclear(res);
-
-	if (!is_no_vacuum)
-	{
-		fprintf(stderr, "starting vacuum...");
-		res = PQexec(con, "vacuum branches");
-		if (PQresultStatus(res) != PGRES_COMMAND_OK)
-		{
-			fprintf(stderr, "%s", PQerrorMessage(con));
-			exit(1);
-		}
-		PQclear(res);
-
-		res = PQexec(con, "vacuum tellers");
-		if (PQresultStatus(res) != PGRES_COMMAND_OK)
-		{
-			fprintf(stderr, "%s", PQerrorMessage(con));
-			exit(1);
-		}
-		PQclear(res);
-
-		res = PQexec(con, "delete from history");
-		if (PQresultStatus(res) != PGRES_COMMAND_OK)
-		{
-			fprintf(stderr, "%s", PQerrorMessage(con));
-			exit(1);
-		}
-		PQclear(res);
-		res = PQexec(con, "vacuum history");
-		if (PQresultStatus(res) != PGRES_COMMAND_OK)
-		{
-			fprintf(stderr, "%s", PQerrorMessage(con));
-			exit(1);
-		}
-		PQclear(res);
-
-		fprintf(stderr, "end.\n");
-
-		if (is_full_vacuum)
-		{
-			fprintf(stderr, "starting full vacuum...");
-			res = PQexec(con, "vacuum analyze accounts");
-			if (PQresultStatus(res) != PGRES_COMMAND_OK)
-			{
-				fprintf(stderr, "%s", PQerrorMessage(con));
-				exit(1);
-			}
-			PQclear(res);
-			fprintf(stderr, "end.\n");
-		}
-	}
-	PQfinish(con);
-
-	/* set random seed */
-	gettimeofday(&tv1, 0);
-	srand((uint) tv1.tv_usec);
-
-	/* get start up time */
-	gettimeofday(&tv1, 0);
-
-	if (is_connect == 0)
-	{
-		/* make connections to the database */
-		for (i = 0; i < nclients; i++)
-		{
-			if ((state[i].con = doConnect()) == NULL)
-				exit(1);
-		}
-	}
-
-	/* time after connections set up */
-	gettimeofday(&tv2, 0);
-
-	/* send start up quries in async manner */
-	for (i = 0; i < nclients; i++)
-	{
-		if (ttype == 0 || ttype == 2)
-			doOne(state, i, debug, ttype);
-		else if (ttype == 1)
-			doSelectOnly(state, i, debug);
-	}
-
-	for (;;)
-	{
-		if (remains <= 0)
-		{						/* all done ? */
-			disconnect_all(state);
-			/* get end time */
-			gettimeofday(&tv3, 0);
-			printResults(ttype, state, &tv1, &tv2, &tv3);
-			exit(0);
-		}
-
-		FD_ZERO(&input_mask);
-
-		maxsock = 0;
-		for (i = 0; i < nclients; i++)
-		{
-			if (state[i].con)
-			{
-				int			sock = PQsocket(state[i].con);
-
-				if (sock < 0)
-				{
-					fprintf(stderr, "Client %d: PQsock failed\n", i);
-					disconnect_all(state);
-					exit(1);
-				}
-				FD_SET(sock, &input_mask);
-				if (maxsock < sock)
-					maxsock = sock;
-			}
-		}
-
-		if ((nsocks = select(maxsock + 1, &input_mask, (fd_set *) NULL,
-						  (fd_set *) NULL, (struct timeval *) NULL)) < 0)
-		{
-			if (errno == EINTR)
-				continue;
-			/* must be something wrong */
-			disconnect_all(state);
-			fprintf(stderr, "select failed: %s\n", strerror(errno));
-			exit(1);
-		}
-		else if (nsocks == 0)
-		{						/* timeout */
-			fprintf(stderr, "select timeout\n");
-			for (i = 0; i < nclients; i++)
-			{
-				fprintf(stderr, "client %d:state %d cnt %d ecnt %d listen %d\n",
-						i, state[i].state, state[i].cnt, state[i].ecnt, state[i].listen);
-			}
-			exit(0);
-		}
-
-		/* ok, backend returns reply */
-		for (i = 0; i < nclients; i++)
-		{
-			if (state[i].con && FD_ISSET(PQsocket(state[i].con), &input_mask))
-			{
-				if (ttype == 0 || ttype == 2)
-					doOne(state, i, debug, ttype);
-				else if (ttype == 1)
-					doSelectOnly(state, i, debug);
-			}
-		}
-	}
-}
diff --git a/contrib/pgcrypto/API b/contrib/pgcrypto/API
deleted file mode 100644
index 6664caf8c1..0000000000
--- a/contrib/pgcrypto/API
+++ /dev/null
@@ -1,163 +0,0 @@
-
-C API for pgcrypto
-==================
-
-
-UN*X crypt()
-============
-
-#include <px-crypt.h>
-
-char *
-px_crypt(const char *psw, const char *salt, char *buf, unsigned buflen);
-
-	returns buf or NULL for error.
-
-unsigned px_gen_salt(const char *salt_type, char *dst, int rounds);
-
-	returns salt size.  dst should be PX_MAX_SALT_LEN bytes.
-	'rounds' is algorithm specific.  0 means default for
-	that algorithm.
-
-Random
-======
-
-int px_get_random_bytes(uint8 *dst, int num)
-
-
-Crypto "objects"
-================
-
-PX_MD      - Message digest
-PX_HMAC    - HMAC (Hash MAC)
-PX_Cipher  - cipher+mode: provided by libs
-PX_Combo   - higher-level encryption -> padding, [MD]
-
-Objects are activated with following functions:
-
-int px_find_digest(const char *name, PX_MD **res);
-int px_find_hmac(const char *name, PX_HMAC **res);
-int px_find_cipher(const char *name, PX_Cipher **res);
-int px_find_combo(const char *name, PX_Combo **res);
-
-	returns 0 on success, < 0 on error.  If successful,
-	*res contains pointer to new object.
-
-Message Digest
-==============
-
-uint px_md_result_size(PX_MD *md)
-
-	returns final result size in bytes
-
-void px_md_reset(PX_MD *md)
-
-	resets md to clean state
-
-uint px_md_block_size(PX_MD *md)
-
-	return algorithm block size in bytes
-
-void px_md_update(PX_MD *md, const uint8 *data, uint dlen)
-
-	updates hash state with new data
-
-void px_md_finish(PX_MD *md, uint8 *buf)
-
-	puts final hash state into buf.  buf should have room
-	for px_md_result_size() bytes.
-
-void px_md_free(PX_MD *md)
-
-	frees resources.
-
-HMAC (Hash Message Authentication Code)
-=======================================
-
-int px_hmac_init(PX_HMAC *hmac, const uint8 *key, uint klen)
-
-	initalized hmac state with key.
-
-uint px_hmac_result_size(PX_HMAC *md)
-
-	returns final result size in bytes
-
-void px_hmac_reset(PX_HMAC *md)
-
-	resets md to state after _init()
-
-uint px_hmac_block_size(PX_HMAC *md)
-
-	return algorithm block size in bytes
-
-void px_hmac_update(PX_HMAC *md, const uint8 *data, uint dlen)
-
-	updates hash state with new data
-
-void px_hmac_finish(PX_HMAC *md, uint8 *buf)
-
-	puts final hash state into buf.  buf should have room
-	for px_hmac_result_size() bytes.
-
-void px_hmac_free(PX_HMAC *md)
-
-	frees resources.
-
-
-Cipher
-======
-
-uint px_cipher_key_size(PX_Cipher *c)
-
-	returns max key size in bytes
-
-uint px_cipher_block_size(PX_Cipher *c)
-
-	returns cipher+mode block size in bytes.  So blowfish
-	in CFB mode should return 1.
-
-uint px_cipher_iv_size(PX_Cipher *c)
-
-	returns IV size in bytes.
-
-int px_cipher_init(PX_Cipher *c, uint8 *key, uint klen, uint8 *iv)
-
-	initializes cipher with supplied key and iv.
-
-int px_cipher_encrypt(PX_Cipher *c, uint8 *data, uint dlen, uint8 *res)
-
-	encrypts data.  res must have room for dlen bytes.
-	data must be multiple of px_cipher_block_size().
-
-int px_cipher_decrypt(PX_Cipher *c, uint8 *data, uint dlen, uint8 *res)
-
-	decrypts data.  res must have room for dlen bytes.
-
-void px_cipher_free(PX_Cipher *c)
-
-	frees resources assiocated.
-
-PX_Combo
-========
-
-uint px_combo_encrypt_len(PX_Combo *c, uint dlen)
-
-	calculates max result length for dlen of data.
-
-uint px_combo_decrypt_len(PX_Combo *c, uint dlen)
-
-	calculates result length for dlen of data.
-
-int px_combo_init(PX_Combo *c, uint8 *key, uint klen, uint8 *iv, uint ivlen)
-
-	initializes c with key and iv.  If cipher uses fixed length keys,
-	key will be padded with zeroes to needed length.
-
-int px_combo_encrypt(PX_Combo *c, uint8 *data, uint dlen, uint8 *res, uint rlen)
-
-int px_combo_decrypt(PX_Combo *c, uint8 *data, uint dlen, uint8 *res, uint rlen)
-
-void px_combo_free(PX_Combo *c)
-
-	frees resources assiocated.
-
diff --git a/contrib/pgcrypto/Makefile b/contrib/pgcrypto/Makefile
deleted file mode 100644
index 823d4ff93c..0000000000
--- a/contrib/pgcrypto/Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# $Header: /cvsroot/pgsql/contrib/pgcrypto/Makefile,v 1.9 2001/09/30 22:18:29 momjian Exp $
-#
-
-subdir = contrib/pgcrypto
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-# either 'builtin', 'mhash', 'openssl'
-cryptolib = builtin
-
-# either 'builtin', 'system'
-cryptsrc = builtin
-
-# Random source, preferred order:
-# 'dev'      - read from random device
-#
-# 'openssl'  - use openssl PRNG.
-#              Note that currently pgcrypto does not do any
-#              entropy feeding to it
-#              This works ofcouse only with cryptolib = openssl
-#
-# 'silly'    - use libc random() - very weak
-random = silly
-random_dev = \"/dev/urandom\"
-
-##########################
-
-ifeq ($(cryptolib), builtin)
-CRYPTO_CFLAGS =
-CRYPTO_LDFLAGS =
-SRCS = md5.c sha1.c internal.c blf.c rijndael.c
-endif
-
-ifeq ($(cryptolib), openssl)
-CRYPTO_CFLAGS = -I/usr/include/openssl
-CRYPTO_LDFLAGS = -lcrypto
-SRCS = openssl.c
-endif
-
-ifeq ($(cryptolib), mhash)
-CRYPTO_CFLAGS = -I/usr/local/include
-CRYPTO_LDFLAGS = -L/usr/local/lib -lmcrypt -lmhash -lltdl
-SRCS = mhash.c
-endif
-
-ifeq ($(cryptsrc), builtin)
-SRCS += crypt-blowfish.c crypt-des.c crypt-md5.c 
-else
-CRYPTO_CFLAGS += -DPX_SYSTEM_CRYPT
-endif
-
-ifeq ($(random), dev)
-CRYPTO_CFLAGS += -DRAND_DEV=$(random_dev)
-endif
-ifeq ($(random), openssl)
-CRYPTO_CFLAGS += -DRAND_OPENSSL
-endif
-ifeq ($(random), silly)
-CRYPTO_CFLAGS += -DRAND_SILLY
-endif
-
-MODULE_big	:= pgcrypto
-SRCS		+= pgcrypto.c px.c px-hmac.c px-crypt.c misc.c \
-			crypt-gensalt.c random.c
-OBJS		:= $(SRCS:.c=.o)
-DOCS		:= README.pgcrypto
-DATA_built	:= pgcrypto.sql
-EXTRA_CLEAN	:= gen-rtab
-
-PG_CPPFLAGS	:= $(CRYPTO_CFLAGS) -I$(srcdir) 
-SHLIB_LINK 	:= $(CRYPTO_LDFLAGS)
-
-REGRESS := init md5 sha1 hmac-md5 hmac-sha1 blowfish rijndael \
-		crypt-des crypt-md5 crypt-blowfish crypt-xdes 
-
-include $(top_srcdir)/contrib/contrib-global.mk
-
-rijndael.o: rijndael.tbl
-
-rijndael.tbl:
-	$(CC) $(CPPFLAGS) $(CFLAGS) -DPRINT_TABS rijndael.c -o gen-rtab
-	./gen-rtab > rijndael.tbl
-
diff --git a/contrib/pgcrypto/README.pgcrypto b/contrib/pgcrypto/README.pgcrypto
deleted file mode 100644
index 0480c4caff..0000000000
--- a/contrib/pgcrypto/README.pgcrypto
+++ /dev/null
@@ -1,219 +0,0 @@
-
-pgcrypto 0.4 - cryptographic functions for PostgreSQL.
-======================================================
-by Marko Kreen <marko@l-t.ee>
-
-
-INSTALLATION
-============
-
-Edit makefile, if you want to use any external library.
-
-NB!  Default randomness source is libc random() function.  This
-is so only to get pgcrypto build everywhere.  Randomness is
-needed for gen_salt() function.  So if you plan using it, you
-should definitely change that by editing Makefile.  You should
-be using urandom device if your OS supports it, otherwise link
-pgcrypto against OpenSSL library and use its PRNG.
-
-After editing Makefile:
-
-make
-make install
-
-To run regression tests, install both PostgreSQL and pgcrypto
-and then run
-
-make installcheck
-
-SQL FUNCTIONS
-=============
-
-	If any of arguments are NULL they return NULL.
-
-digest(data::bytea, type::text)::bytea
-
-	Type is here the algorithm to use. E.g. 'md5', 'sha1', ...
-	Returns binary hash.
-
-digest_exists(type::text)::bool
-
-	Returns BOOL whether given hash exists.
-
-hmac(data::bytea, key::bytea, type::text)::bytea
-
-	Calculates Hashed MAC over data.  type is the same as
-	in digest().  Returns binary hash.  Similar to digest()
-	but noone can alter data and re-calculate hash without
-	knowing key.  If the key is larger than hash blocksize
-	it will first hashed and the hash will be used as key.
-	
-	[ HMAC is described in RFC2104. ]
-
-hmac_exists(type::text)::bool
-	Returns BOOL.  It is separate function because all hashes
-	cannot be used in HMAC.
-
-crypt(password::text, salt::text)::text
-
-	Calculates UN*X crypt(3) style hash.  Useful for storing
-	passwords.  For generating salt you should use the
-	gen_salt() function.  Usage:
-
-	New password:
-	
-	  UPDATE .. SET pswhash = crypt(new_psw, gen_salt('md5'));
-	
-	Authentication:
-
-	  SELECT pswhash = crypt(given_psw, pswhash) WHERE .. ;
-	
-	returns BOOL whether the given_psw is correct.  DES crypt
-	has max key of 8 bytes, MD5 has max key at least 2^32-1
-	bytes but may be larger on some platforms...
-
-	Builtin crypt() supports DES, Extended DES, MD5 and Blowfish
-	(variant 2a) algorithms.
-
-gen_salt(type::text)::text
-
-	Generates a new random salt for usage in crypt().  Type
-	
-	'des'	- Old UNIX, not recommended
-	'md5'	- md5-based crypt()
-	'xdes'	- 'Extended DES'
-	'bf'	- Blowfish-based, variant 2a
-
-	When you use --enable-system-crypt then note that system
-	libcrypt may not support them all.
-
-gen_salt(type::text, rounds::int4)::text
-
-	same as above, but lets user specify iteration count
-	for algorithm.  Number is algotithm specific:
-
-	type	default	min	max
-	---------------------------------
-	xdes	725	1	16777215
-	bf	6	4	31
-
-	In case of xdes there is a additional limitation that the
-	count must be a odd number.
-
-	The higher the count, the more time it takes to calculate
-	crypt and therefore the more time to break it.  But beware!
-	With too high count it takes a _very_long_ time to
-	calculate it.
-
-	For maximum security, you should choose the 'bf' crypt
-	and use maximum number of rounds you can still tolerate.
-
-encrypt(data::bytea, key::bytea, type::text)::bytea
-decrypt(data::bytea, key::bytea, type::text)::bytea
-encrypt_iv(data::bytea, key::bytea, iv::bytea, type::text)::bytea
-decrypt_iv(data::bytea, key::bytea, iv::bytea, type::text)::bytea
-
-	Encrypt/decrypt data with cipher, padding data if needed.
-
-	Pseudo-noteup:
-
-	algo ['-' mode] ['/pad:' padding]
-
-	Supported algorithms:
-	
-		bf		- Blowfish
-		aes, rijndael	- Rijndael-128
-
-	Others depend on library and are not tested enough, so
-	play on your own risk.
-
-	Modes: 'cbc' (default), 'ecb'.  Again, library may support
-	more.
-
-	Padding is 'pkcs' (default), 'none'.  'none' is mostly for
-	testing ciphers, you should not need it.
-
-	So, example:
-
-		encrypt(data, 'fooz', 'bf')
-	
-	is equal to
-
-		encrypt(data, 'fooz', 'bf-cbc/pad:pkcs')
-
-	IV is initial value for mode, defaults to all zeroes.
-	It is ignored for ECB.  It is clipped or padded with zeroes
-	if not exactly block size.
-
-
-ALGORITHMS
-==========
-
-The standard functionality at the moment consist of
-
-Hashes: md5, sha1
-Ciphers: bf, aes
-Modes: cbc, ecb
-
-TODO: write stardard names for optional ciphers too.
-
-LIBRARIES
-=========
-
-* crypt()
-
-    internal: des, xdes, md5, bf
-
-    -lcrypt: ??? (whatever you have)
-
-* other:
-
-[ This only list of stuff libraries claim to support.  So
-  pgcrypto may work with all of them.  But ATM tested aree only the
-  standard ciphers.  On others pgcrypto and library may mess something
-  up. You have been warned.  ]
-
-internal (default):
-    Hashes: MD5, SHA1
-    Ciphers: Blowfish, Rijndael-128
-
-
-OpenSSL (0.9.6):
-    Hashes:	MD5, SHA1, RIPEMD160, MD2   
-    Ciphers:	DES, DESX, DES3, RC5, RC4, RC2, IDEA,
-		Blowfish, CAST5
-    License:	BSD-like with strong advertisement
-    Url:	http://www.openssl.org/
-
-
-mhash (0.8.9) + mcrypt (2.4.16):
-    Hashes:	MD5, SHA1, CRC32, CRC32B, GOST, TIGER, RIPEMD160,
-		HAVAL(256,224,192,160,128)
-    Ciphers:	DES, DES3, CAST-128(CAST5), CAST-256, xTEA, 3-way,
-    		SKIPJACK, Blowfish, Twofish, LOKI97, RC2, RC4, RC6,
-		Rijndael-128/192/256, MARS, PANAMA, WAKE, Serpent, IDEA, GOST,
-		SAFER, SAFER+, Enigma
-    License:	LGPL
-    Url:	http://mcrypt.sourceforge.org/
-    Url:	http://mhash.sourceforge.org/
-
-CREDITS
-=======
-
-I have used code from following sources:
-
-DES crypt() by David Burren and others	FreeBSD libcrypt
-MD5 crypt() by Poul-Henning Kamp	FreeBSD libcrypt
-Blowfish crypt() by Solar Designer	www.openwall.com
-Blowfish cipher by Niels Provos		OpenBSD sys/crypto
-Rijndael cipher by Brian Gladman	OpenBSD sys/crypto
-MD5 and SHA1 by WIDE Project		KAME kame/sys/crypto
-
-LEGALESE
-========
-
-* I owe a beer to Poul-Henning.
-
-* This product includes software developed by Niels Provos.
-
-
diff --git a/contrib/pgcrypto/blf.c b/contrib/pgcrypto/blf.c
deleted file mode 100644
index da2047b6cf..0000000000
--- a/contrib/pgcrypto/blf.c
+++ /dev/null
@@ -1,693 +0,0 @@
-/*	$OpenBSD: blf.c,v 1.3 2000/06/17 23:36:22 provos Exp $	*/
-
-/*
- * Blowfish block cipher for OpenBSD
- * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
- * All rights reserved.
- *
- * Implementation advice by David Mazieres <dm@lcs.mit.edu>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *	  must display the following acknowledgement:
- *		This product includes software developed by Niels Provos.
- * 4. The name of the author may not be used to endorse or promote products
- *	  derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * This code is derived from section 14.3 and the given source
- * in section V of Applied Cryptography, second edition.
- * Blowfish is an unpatented fast block cipher designed by
- * Bruce Schneier.
- */
-
-#include <postgres.h>
-#include "px.h"
-
-#include "blf.h"
-
-/* Function for Feistel Networks */
-
-#define F(s, x) ((((s)[		   (((x)>>24)&0xFF)]  \
-		 + (s)[0x100 + (((x)>>16)&0xFF)]) \
-		 ^ (s)[0x200 + (((x)>> 8)&0xFF)]) \
-		 + (s)[0x300 + ( (x)	 &0xFF)])
-
-#define BLFRND(s,p,i,j,n) (i ^= F(s,j) ^ (p)[n])
-
-void
-Blowfish_encipher(blf_ctx * c, uint32 *x)
-{
-	uint32		Xl;
-	uint32		Xr;
-	uint32	   *s = c->S[0];
-	uint32	   *p = c->P;
-
-	Xl = x[0];
-	Xr = x[1];
-
-	Xl ^= p[0];
-	BLFRND(s, p, Xr, Xl, 1);
-	BLFRND(s, p, Xl, Xr, 2);
-	BLFRND(s, p, Xr, Xl, 3);
-	BLFRND(s, p, Xl, Xr, 4);
-	BLFRND(s, p, Xr, Xl, 5);
-	BLFRND(s, p, Xl, Xr, 6);
-	BLFRND(s, p, Xr, Xl, 7);
-	BLFRND(s, p, Xl, Xr, 8);
-	BLFRND(s, p, Xr, Xl, 9);
-	BLFRND(s, p, Xl, Xr, 10);
-	BLFRND(s, p, Xr, Xl, 11);
-	BLFRND(s, p, Xl, Xr, 12);
-	BLFRND(s, p, Xr, Xl, 13);
-	BLFRND(s, p, Xl, Xr, 14);
-	BLFRND(s, p, Xr, Xl, 15);
-	BLFRND(s, p, Xl, Xr, 16);
-
-	x[0] = Xr ^ p[17];
-	x[1] = Xl;
-}
-
-void
-Blowfish_decipher(blf_ctx * c, uint32 *x)
-{
-	uint32		Xl;
-	uint32		Xr;
-	uint32	   *s = c->S[0];
-	uint32	   *p = c->P;
-
-	Xl = x[0];
-	Xr = x[1];
-
-	Xl ^= p[17];
-	BLFRND(s, p, Xr, Xl, 16);
-	BLFRND(s, p, Xl, Xr, 15);
-	BLFRND(s, p, Xr, Xl, 14);
-	BLFRND(s, p, Xl, Xr, 13);
-	BLFRND(s, p, Xr, Xl, 12);
-	BLFRND(s, p, Xl, Xr, 11);
-	BLFRND(s, p, Xr, Xl, 10);
-	BLFRND(s, p, Xl, Xr, 9);
-	BLFRND(s, p, Xr, Xl, 8);
-	BLFRND(s, p, Xl, Xr, 7);
-	BLFRND(s, p, Xr, Xl, 6);
-	BLFRND(s, p, Xl, Xr, 5);
-	BLFRND(s, p, Xr, Xl, 4);
-	BLFRND(s, p, Xl, Xr, 3);
-	BLFRND(s, p, Xr, Xl, 2);
-	BLFRND(s, p, Xl, Xr, 1);
-
-	x[0] = Xr ^ p[0];
-	x[1] = Xl;
-}
-
-void
-Blowfish_initstate(blf_ctx * c)
-{
-
-/* P-box and S-box tables initialized with digits of Pi */
-
-	const blf_ctx initstate =
-
-	{{
-			{
-				0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
-				0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
-				0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
-				0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
-				0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
-				0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
-				0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
-				0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
-				0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
-				0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
-				0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
-				0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
-				0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
-				0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
-				0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
-				0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
-				0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
-				0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
-				0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
-				0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
-				0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
-				0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
-				0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
-				0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
-				0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
-				0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
-				0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
-				0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
-				0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
-				0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
-				0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
-				0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
-				0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
-				0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
-				0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
-				0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
-				0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
-				0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
-				0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
-				0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
-				0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
-				0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
-				0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
-				0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
-				0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
-				0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
-				0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
-				0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
-				0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
-				0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
-				0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
-				0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
-				0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
-				0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
-				0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
-				0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
-				0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
-				0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
-				0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
-				0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
-				0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
-				0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
-				0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
-			0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a},
-			{
-				0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
-				0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
-				0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
-				0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
-				0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
-				0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
-				0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
-				0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
-				0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
-				0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
-				0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
-				0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
-				0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
-				0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
-				0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
-				0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
-				0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
-				0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
-				0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
-				0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
-				0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
-				0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
-				0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
-				0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
-				0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
-				0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
-				0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
-				0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
-				0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
-				0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
-				0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
-				0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
-				0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
-				0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
-				0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
-				0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
-				0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
-				0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
-				0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
-				0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
-				0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
-				0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
-				0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
-				0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
-				0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
-				0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
-				0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
-				0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
-				0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
-				0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
-				0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
-				0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
-				0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
-				0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
-				0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
-				0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
-				0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
-				0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
-				0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
-				0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
-				0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
-				0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
-				0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
-			0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7},
-			{
-				0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
-				0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
-				0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
-				0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
-				0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
-				0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
-				0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
-				0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
-				0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
-				0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
-				0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
-				0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
-				0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
-				0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
-				0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
-				0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
-				0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
-				0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
-				0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
-				0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
-				0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
-				0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
-				0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
-				0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
-				0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
-				0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
-				0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
-				0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
-				0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
-				0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
-				0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
-				0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
-				0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
-				0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
-				0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
-				0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
-				0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
-				0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
-				0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
-				0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
-				0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
-				0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
-				0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
-				0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
-				0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
-				0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
-				0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
-				0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
-				0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
-				0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
-				0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
-				0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
-				0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
-				0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
-				0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
-				0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
-				0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
-				0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
-				0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
-				0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
-				0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
-				0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
-				0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
-			0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0},
-			{
-				0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
-				0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
-				0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
-				0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
-				0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
-				0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
-				0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
-				0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
-				0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
-				0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
-				0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
-				0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
-				0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
-				0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
-				0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
-				0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
-				0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
-				0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
-				0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
-				0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
-				0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
-				0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
-				0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
-				0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
-				0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
-				0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
-				0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
-				0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
-				0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
-				0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
-				0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
-				0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
-				0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
-				0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
-				0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
-				0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
-				0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
-				0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
-				0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
-				0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
-				0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
-				0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
-				0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
-				0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
-				0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
-				0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
-				0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
-				0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
-				0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
-				0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
-				0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
-				0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
-				0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
-				0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
-				0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
-				0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
-				0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
-				0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
-				0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
-				0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
-				0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
-				0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
-				0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
-			0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6}
-	},
-	{
-		0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
-		0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
-		0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
-		0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
-		0x9216d5d9, 0x8979fb1b
-	}};
-
-	*c = initstate;
-
-}
-
-uint32
-Blowfish_stream2word(const uint8 *data, uint16 databytes, uint16 *current)
-{
-	uint8		i;
-	uint16		j;
-	uint32		temp;
-
-	temp = 0x00000000;
-	j = *current;
-
-	for (i = 0; i < 4; i++, j++)
-	{
-		if (j >= databytes)
-			j = 0;
-		temp = (temp << 8) | data[j];
-	}
-
-	*current = j;
-	return temp;
-}
-
-void
-Blowfish_expand0state(blf_ctx * c, const uint8 *key, uint16 keybytes)
-{
-	uint16		i;
-	uint16		j;
-	uint16		k;
-	uint32		temp;
-	uint32		data[2];
-
-	j = 0;
-	for (i = 0; i < BLF_N + 2; i++)
-	{
-		/* Extract 4 int8 to 1 int32 from keystream */
-		temp = Blowfish_stream2word(key, keybytes, &j);
-		c->P[i] = c->P[i] ^ temp;
-	}
-
-	j = 0;
-	data[0] = 0x00000000;
-	data[1] = 0x00000000;
-	for (i = 0; i < BLF_N + 2; i += 2)
-	{
-		Blowfish_encipher(c, data);
-
-		c->P[i] = data[0];
-		c->P[i + 1] = data[1];
-	}
-
-	for (i = 0; i < 4; i++)
-	{
-		for (k = 0; k < 256; k += 2)
-		{
-			Blowfish_encipher(c, data);
-
-			c->S[i][k] = data[0];
-			c->S[i][k + 1] = data[1];
-		}
-	}
-}
-
-
-void
-Blowfish_expandstate(blf_ctx * c, const uint8 *data, uint16 databytes,
-					 const uint8 *key, uint16 keybytes)
-{
-	uint16		i;
-	uint16		j;
-	uint16		k;
-	uint32		temp;
-	uint32		d[2];
-
-	j = 0;
-	for (i = 0; i < BLF_N + 2; i++)
-	{
-		/* Extract 4 int8 to 1 int32 from keystream */
-		temp = Blowfish_stream2word(key, keybytes, &j);
-		c->P[i] = c->P[i] ^ temp;
-	}
-
-	j = 0;
-	d[0] = 0x00000000;
-	d[1] = 0x00000000;
-	for (i = 0; i < BLF_N + 2; i += 2)
-	{
-		d[0] ^= Blowfish_stream2word(data, databytes, &j);
-		d[1] ^= Blowfish_stream2word(data, databytes, &j);
-		Blowfish_encipher(c, d);
-
-		c->P[i] = d[0];
-		c->P[i + 1] = d[1];
-	}
-
-	for (i = 0; i < 4; i++)
-	{
-		for (k = 0; k < 256; k += 2)
-		{
-			d[0] ^= Blowfish_stream2word(data, databytes, &j);
-			d[1] ^= Blowfish_stream2word(data, databytes, &j);
-			Blowfish_encipher(c, d);
-
-			c->S[i][k] = d[0];
-			c->S[i][k + 1] = d[1];
-		}
-	}
-
-}
-
-void
-blf_key(blf_ctx * c, const uint8 *k, uint16 len)
-{
-	/* Initalize S-boxes and subkeys with Pi */
-	Blowfish_initstate(c);
-
-	/* Transform S-boxes and subkeys with key */
-	Blowfish_expand0state(c, k, len);
-}
-
-void
-blf_enc(blf_ctx * c, uint32 *data, uint16 blocks)
-{
-	uint32	   *d;
-	uint16		i;
-
-	d = data;
-	for (i = 0; i < blocks; i++)
-	{
-		Blowfish_encipher(c, d);
-		d += 2;
-	}
-}
-
-void
-blf_dec(blf_ctx * c, uint32 *data, uint16 blocks)
-{
-	uint32	   *d;
-	uint16		i;
-
-	d = data;
-	for (i = 0; i < blocks; i++)
-	{
-		Blowfish_decipher(c, d);
-		d += 2;
-	}
-}
-
-void
-blf_ecb_encrypt(blf_ctx * c, uint8 *data, uint32 len)
-{
-	uint32		l,
-				r,
-				d[2];
-	uint32		i;
-
-	for (i = 0; i < len; i += 8)
-	{
-		l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
-		r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
-		d[0] = l;
-		d[1] = r;
-		Blowfish_encipher(c, d);
-		l = d[0];
-		r = d[1];
-		data[0] = l >> 24 & 0xff;
-		data[1] = l >> 16 & 0xff;
-		data[2] = l >> 8 & 0xff;
-		data[3] = l & 0xff;
-		data[4] = r >> 24 & 0xff;
-		data[5] = r >> 16 & 0xff;
-		data[6] = r >> 8 & 0xff;
-		data[7] = r & 0xff;
-		data += 8;
-	}
-}
-
-void
-blf_ecb_decrypt(blf_ctx * c, uint8 *data, uint32 len)
-{
-	uint32		l,
-				r,
-				d[2];
-	uint32		i;
-
-	for (i = 0; i < len; i += 8)
-	{
-		l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
-		r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
-		d[0] = l;
-		d[1] = r;
-		Blowfish_decipher(c, d);
-		l = d[0];
-		r = d[1];
-		data[0] = l >> 24 & 0xff;
-		data[1] = l >> 16 & 0xff;
-		data[2] = l >> 8 & 0xff;
-		data[3] = l & 0xff;
-		data[4] = r >> 24 & 0xff;
-		data[5] = r >> 16 & 0xff;
-		data[6] = r >> 8 & 0xff;
-		data[7] = r & 0xff;
-		data += 8;
-	}
-}
-
-void
-blf_cbc_encrypt(blf_ctx * c, uint8 *iv, uint8 *data, uint32 len)
-{
-	uint32		l,
-				r,
-				d[2];
-	uint32		i,
-				j;
-
-	for (i = 0; i < len; i += 8)
-	{
-		for (j = 0; j < 8; j++)
-			data[j] ^= iv[j];
-		l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
-		r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
-		d[0] = l;
-		d[1] = r;
-		Blowfish_encipher(c, d);
-		l = d[0];
-		r = d[1];
-		data[0] = l >> 24 & 0xff;
-		data[1] = l >> 16 & 0xff;
-		data[2] = l >> 8 & 0xff;
-		data[3] = l & 0xff;
-		data[4] = r >> 24 & 0xff;
-		data[5] = r >> 16 & 0xff;
-		data[6] = r >> 8 & 0xff;
-		data[7] = r & 0xff;
-		iv = data;
-		data += 8;
-	}
-}
-
-void
-blf_cbc_decrypt(blf_ctx * c, uint8 *iva, uint8 *data, uint32 len)
-{
-	uint32		l,
-				r,
-				d[2];
-	uint8	   *iv;
-	uint32		i,
-				j;
-
-	iv = data + len - 16;
-	data = data + len - 8;
-	for (i = len - 8; i >= 8; i -= 8)
-	{
-		l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
-		r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
-		d[0] = l;
-		d[1] = r;
-		Blowfish_decipher(c, d);
-		l = d[0];
-		r = d[1];
-		data[0] = l >> 24 & 0xff;
-		data[1] = l >> 16 & 0xff;
-		data[2] = l >> 8 & 0xff;
-		data[3] = l & 0xff;
-		data[4] = r >> 24 & 0xff;
-		data[5] = r >> 16 & 0xff;
-		data[6] = r >> 8 & 0xff;
-		data[7] = r & 0xff;
-		for (j = 0; j < 8; j++)
-			data[j] ^= iv[j];
-		iv -= 8;
-		data -= 8;
-	}
-	l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
-	r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
-	d[0] = l;
-	d[1] = r;
-	Blowfish_decipher(c, d);
-	l = d[0];
-	r = d[1];
-	data[0] = l >> 24 & 0xff;
-	data[1] = l >> 16 & 0xff;
-	data[2] = l >> 8 & 0xff;
-	data[3] = l & 0xff;
-	data[4] = r >> 24 & 0xff;
-	data[5] = r >> 16 & 0xff;
-	data[6] = r >> 8 & 0xff;
-	data[7] = r & 0xff;
-	for (j = 0; j < 8; j++)
-		data[j] ^= iva[j];
-}
diff --git a/contrib/pgcrypto/blf.h b/contrib/pgcrypto/blf.h
deleted file mode 100644
index 81159b13be..0000000000
--- a/contrib/pgcrypto/blf.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*	$OpenBSD: blf.h,v 1.3 2001/05/15 02:40:35 deraadt Exp $ */
-
-/*
- * Blowfish - a fast block cipher designed by Bruce Schneier
- *
- * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *	  must display the following acknowledgement:
- *		This product includes software developed by Niels Provos.
- * 4. The name of the author may not be used to endorse or promote products
- *	  derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _BLF_H_
-#define _BLF_H_
-
-/* Schneier states the maximum key length to be 56 bytes.
- * The way how the subkeys are initalized by the key up
- * to (N+2)*4 i.e. 72 bytes are utilized.
- * Warning: For normal blowfish encryption only 56 bytes
- * of the key affect all cipherbits.
- */
-
-#define BLF_N	16				/* Number of Subkeys */
-#define BLF_MAXKEYLEN ((BLF_N-2)*4)		/* 448 bits */
-
-/* Blowfish context */
-typedef struct BlowfishContext
-{
-	uint32		S[4][256];		/* S-Boxes */
-	uint32		P[BLF_N + 2];	/* Subkeys */
-}	blf_ctx;
-
-/* Raw access to customized Blowfish
- *	blf_key is just:
- *	Blowfish_initstate( state )
- *	Blowfish_expand0state( state, key, keylen )
- */
-
-void		Blowfish_encipher(blf_ctx *, uint32 *);
-void		Blowfish_decipher(blf_ctx *, uint32 *);
-void		Blowfish_initstate(blf_ctx *);
-void		Blowfish_expand0state(blf_ctx *, const uint8 *, uint16);
-void		Blowfish_expandstate
-			(blf_ctx *, const uint8 *, uint16, const uint8 *, uint16);
-
-/* Standard Blowfish */
-
-void		blf_key(blf_ctx *, const uint8 *, uint16);
-void		blf_enc(blf_ctx *, uint32 *, uint16);
-void		blf_dec(blf_ctx *, uint32 *, uint16);
-
-/* Converts uint8 to uint32 */
-uint32		Blowfish_stream2word(const uint8 *, uint16, uint16 *);
-
-void		blf_ecb_encrypt(blf_ctx *, uint8 *, uint32);
-void		blf_ecb_decrypt(blf_ctx *, uint8 *, uint32);
-
-void		blf_cbc_encrypt(blf_ctx *, uint8 *, uint8 *, uint32);
-void		blf_cbc_decrypt(blf_ctx *, uint8 *, uint8 *, uint32);
-
-#endif
diff --git a/contrib/pgcrypto/crypt-blowfish.c b/contrib/pgcrypto/crypt-blowfish.c
deleted file mode 100644
index 8e41771be9..0000000000
--- a/contrib/pgcrypto/crypt-blowfish.c
+++ /dev/null
@@ -1,740 +0,0 @@
-/*
- * This code comes from John the Ripper password cracker, with reentrant
- * and crypt(3) interfaces added, but optimizations specific to password
- * cracking removed.
- *
- * Written by Solar Designer <solar@openwall.com> in 1998-2001, and placed
- * in the public domain.
- *
- * There's absolutely no warranty.
- *
- * It is my intent that you should be able to use this on your system,
- * as a part of a software package, or anywhere else to improve security,
- * ensure compatibility, or for any other purpose. I would appreciate
- * it if you give credit where it is due and keep your modifications in
- * the public domain as well, but I don't require that in order to let
- * you place this code and any modifications you make under a license
- * of your choice.
- *
- * This implementation is compatible with OpenBSD bcrypt.c (version 2a)
- * by Niels Provos <provos@physnet.uni-hamburg.de>, and uses some of his
- * ideas. The password hashing algorithm was designed by David Mazieres
- * <dm@lcs.mit.edu>.
- *
- * There's a paper on the algorithm that explains its design decisions:
- *
- *	http://www.usenix.org/events/usenix99/provos.html
- *
- * Some of the tricks in BF_ROUND might be inspired by Eric Young's
- * Blowfish library (I can't be sure if I would think of something if I
- * hadn't seen his code).
- */
-
-#include "postgres.h"
-
-#include "px.h"
-#include "px-crypt.h"
-
-#define __set_errno(v)
-
-#ifndef __set_errno
-#define __set_errno(val) errno = (val)
-#endif
-
-#ifdef __i386__
-#define BF_ASM				0	/* 1 */
-#define BF_SCALE			1
-#elif defined(__alpha__)
-#define BF_ASM				0
-#define BF_SCALE			1
-#else
-#define BF_ASM				0
-#define BF_SCALE			0
-#endif
-
-typedef unsigned int BF_word;
-
-/* Number of Blowfish rounds, this is also hardcoded into a few places */
-#define BF_N				16
-
-typedef BF_word BF_key[BF_N + 2];
-
-typedef struct
-{
-	BF_word		S[4][0x100];
-	BF_key		P;
-}	BF_ctx;
-
-/*
- * Magic IV for 64 Blowfish encryptions that we do at the end.
- * The string is "OrpheanBeholderScryDoubt" on big-endian.
- */
-static BF_word BF_magic_w[6] = {
-	0x4F727068, 0x65616E42, 0x65686F6C,
-	0x64657253, 0x63727944, 0x6F756274
-};
-
-/*
- * P-box and S-box tables initialized with digits of Pi.
- */
-static BF_ctx BF_init_state = {
-	{
-		{
-			0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
-			0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
-			0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
-			0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
-			0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
-			0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
-			0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
-			0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
-			0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
-			0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
-			0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
-			0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
-			0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
-			0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
-			0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
-			0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
-			0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
-			0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
-			0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
-			0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
-			0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
-			0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
-			0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
-			0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
-			0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
-			0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
-			0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
-			0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
-			0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
-			0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
-			0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
-			0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
-			0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
-			0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
-			0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
-			0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
-			0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
-			0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
-			0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
-			0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
-			0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
-			0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
-			0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
-			0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
-			0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
-			0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
-			0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
-			0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
-			0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
-			0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
-			0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
-			0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
-			0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
-			0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
-			0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
-			0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
-			0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
-			0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
-			0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
-			0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
-			0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
-			0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
-			0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
-			0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
-		}, {
-			0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
-			0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
-			0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
-			0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
-			0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
-			0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
-			0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
-			0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
-			0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
-			0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
-			0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
-			0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
-			0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
-			0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
-			0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
-			0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
-			0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
-			0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
-			0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
-			0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
-			0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
-			0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
-			0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
-			0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
-			0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
-			0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
-			0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
-			0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
-			0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
-			0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
-			0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
-			0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
-			0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
-			0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
-			0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
-			0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
-			0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
-			0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
-			0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
-			0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
-			0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
-			0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
-			0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
-			0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
-			0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
-			0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
-			0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
-			0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
-			0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
-			0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
-			0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
-			0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
-			0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
-			0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
-			0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
-			0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
-			0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
-			0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
-			0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
-			0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
-			0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
-			0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
-			0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
-			0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
-		}, {
-			0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
-			0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
-			0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
-			0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
-			0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
-			0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
-			0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
-			0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
-			0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
-			0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
-			0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
-			0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
-			0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
-			0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
-			0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
-			0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
-			0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
-			0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
-			0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
-			0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
-			0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
-			0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
-			0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
-			0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
-			0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
-			0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
-			0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
-			0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
-			0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
-			0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
-			0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
-			0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
-			0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
-			0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
-			0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
-			0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
-			0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
-			0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
-			0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
-			0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
-			0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
-			0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
-			0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
-			0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
-			0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
-			0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
-			0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
-			0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
-			0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
-			0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
-			0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
-			0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
-			0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
-			0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
-			0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
-			0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
-			0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
-			0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
-			0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
-			0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
-			0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
-			0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
-			0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
-			0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
-		}, {
-			0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
-			0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
-			0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
-			0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
-			0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
-			0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
-			0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
-			0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
-			0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
-			0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
-			0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
-			0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
-			0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
-			0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
-			0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
-			0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
-			0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
-			0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
-			0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
-			0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
-			0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
-			0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
-			0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
-			0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
-			0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
-			0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
-			0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
-			0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
-			0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
-			0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
-			0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
-			0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
-			0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
-			0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
-			0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
-			0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
-			0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
-			0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
-			0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
-			0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
-			0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
-			0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
-			0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
-			0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
-			0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
-			0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
-			0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
-			0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
-			0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
-			0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
-			0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
-			0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
-			0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
-			0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
-			0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
-			0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
-			0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
-			0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
-			0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
-			0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
-			0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
-			0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
-			0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
-			0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
-		}
-	}, {
-		0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
-		0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
-		0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
-		0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
-		0x9216d5d9, 0x8979fb1b
-	}
-};
-
-static unsigned char BF_itoa64[64 + 1] =
-"./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-
-static unsigned char BF_atoi64[0x60] = {
-	64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 0, 1,
-	54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 64, 64, 64, 64, 64,
-	64, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
-	17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 64, 64, 64, 64, 64,
-	64, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
-	43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 64, 64, 64, 64, 64
-};
-
-#define BF_safe_atoi64(dst, src) \
-do { \
-	tmp = (unsigned char)(src); \
-	if ((unsigned int)(tmp -= 0x20) >= 0x60) return -1; \
-	tmp = BF_atoi64[tmp]; \
-	if (tmp > 63) return -1; \
-	(dst) = tmp; \
-} while (0)
-
-static int
-BF_decode(BF_word * dst, const char *src, int size)
-{
-	unsigned char *dptr = (unsigned char *) dst;
-	unsigned char *end = dptr + size;
-	unsigned char *sptr = (unsigned char *) src;
-	unsigned int tmp,
-				c1,
-				c2,
-				c3,
-				c4;
-
-	do
-	{
-		BF_safe_atoi64(c1, *sptr++);
-		BF_safe_atoi64(c2, *sptr++);
-		*dptr++ = (c1 << 2) | ((c2 & 0x30) >> 4);
-		if (dptr >= end)
-			break;
-
-		BF_safe_atoi64(c3, *sptr++);
-		*dptr++ = ((c2 & 0x0F) << 4) | ((c3 & 0x3C) >> 2);
-		if (dptr >= end)
-			break;
-
-		BF_safe_atoi64(c4, *sptr++);
-		*dptr++ = ((c3 & 0x03) << 6) | c4;
-	} while (dptr < end);
-
-	return 0;
-}
-
-static void
-BF_encode(char *dst, const BF_word * src, int size)
-{
-	unsigned char *sptr = (unsigned char *) src;
-	unsigned char *end = sptr + size;
-	unsigned char *dptr = (unsigned char *) dst;
-	unsigned int c1,
-				c2;
-
-	do
-	{
-		c1 = *sptr++;
-		*dptr++ = BF_itoa64[c1 >> 2];
-		c1 = (c1 & 0x03) << 4;
-		if (sptr >= end)
-		{
-			*dptr++ = BF_itoa64[c1];
-			break;
-		}
-
-		c2 = *sptr++;
-		c1 |= c2 >> 4;
-		*dptr++ = BF_itoa64[c1];
-		c1 = (c2 & 0x0f) << 2;
-		if (sptr >= end)
-		{
-			*dptr++ = BF_itoa64[c1];
-			break;
-		}
-
-		c2 = *sptr++;
-		c1 |= c2 >> 6;
-		*dptr++ = BF_itoa64[c1];
-		*dptr++ = BF_itoa64[c2 & 0x3f];
-	} while (sptr < end);
-}
-
-static void
-BF_swap(BF_word * x, int count)
-{
-	static int	endianness_check = 1;
-	char	   *is_little_endian = (char *) &endianness_check;
-	BF_word		tmp;
-
-	if (*is_little_endian)
-		do
-		{
-			tmp = *x;
-			tmp = (tmp << 16) | (tmp >> 16);
-			*x++ = ((tmp & 0x00FF00FF) << 8) | ((tmp >> 8) & 0x00FF00FF);
-		} while (--count);
-}
-
-#if BF_SCALE
-/* Architectures which can shift addresses left by 2 bits with no extra cost */
-#define BF_ROUND(L, R, N) \
-	tmp1 = L & 0xFF; \
-	tmp2 = L >> 8; \
-	tmp2 &= 0xFF; \
-	tmp3 = L >> 16; \
-	tmp3 &= 0xFF; \
-	tmp4 = L >> 24; \
-	tmp1 = data.ctx.S[3][tmp1]; \
-	tmp2 = data.ctx.S[2][tmp2]; \
-	tmp3 = data.ctx.S[1][tmp3]; \
-	tmp3 += data.ctx.S[0][tmp4]; \
-	tmp3 ^= tmp2; \
-	R ^= data.ctx.P[N + 1]; \
-	tmp3 += tmp1; \
-	R ^= tmp3;
-#else
-/* Architectures with no complicated addressing modes supported */
-#define BF_INDEX(S, i) \
-	(*((BF_word *)(((unsigned char *)S) + (i))))
-#define BF_ROUND(L, R, N) \
-	tmp1 = L & 0xFF; \
-	tmp1 <<= 2; \
-	tmp2 = L >> 6; \
-	tmp2 &= 0x3FC; \
-	tmp3 = L >> 14; \
-	tmp3 &= 0x3FC; \
-	tmp4 = L >> 22; \
-	tmp4 &= 0x3FC; \
-	tmp1 = BF_INDEX(data.ctx.S[3], tmp1); \
-	tmp2 = BF_INDEX(data.ctx.S[2], tmp2); \
-	tmp3 = BF_INDEX(data.ctx.S[1], tmp3); \
-	tmp3 += BF_INDEX(data.ctx.S[0], tmp4); \
-	tmp3 ^= tmp2; \
-	R ^= data.ctx.P[N + 1]; \
-	tmp3 += tmp1; \
-	R ^= tmp3;
-#endif
-
-/*
- * Encrypt one block, BF_N is hardcoded here.
- */
-#define BF_ENCRYPT \
-	L ^= data.ctx.P[0]; \
-	BF_ROUND(L, R, 0); \
-	BF_ROUND(R, L, 1); \
-	BF_ROUND(L, R, 2); \
-	BF_ROUND(R, L, 3); \
-	BF_ROUND(L, R, 4); \
-	BF_ROUND(R, L, 5); \
-	BF_ROUND(L, R, 6); \
-	BF_ROUND(R, L, 7); \
-	BF_ROUND(L, R, 8); \
-	BF_ROUND(R, L, 9); \
-	BF_ROUND(L, R, 10); \
-	BF_ROUND(R, L, 11); \
-	BF_ROUND(L, R, 12); \
-	BF_ROUND(R, L, 13); \
-	BF_ROUND(L, R, 14); \
-	BF_ROUND(R, L, 15); \
-	tmp4 = R; \
-	R = L; \
-	L = tmp4 ^ data.ctx.P[BF_N + 1];
-
-#if BF_ASM
-
-extern void _BF_body_r(BF_ctx * ctx);
-
-#define BF_body() \
-	_BF_body_r(&data.ctx);
-
-#else
-
-#define BF_body() \
-	L = R = 0; \
-	ptr = data.ctx.P; \
-	do { \
-		ptr += 2; \
-		BF_ENCRYPT; \
-		*(ptr - 2) = L; \
-		*(ptr - 1) = R; \
-	} while (ptr < &data.ctx.P[BF_N + 2]); \
-\
-	ptr = data.ctx.S[0]; \
-	do { \
-		ptr += 2; \
-		BF_ENCRYPT; \
-		*(ptr - 2) = L; \
-		*(ptr - 1) = R; \
-	} while (ptr < &data.ctx.S[3][0xFF]);
-#endif
-
-static void
-BF_set_key(const char *key, BF_key expanded, BF_key initial)
-{
-	const char *ptr = key;
-	int			i,
-				j;
-	BF_word		tmp;
-
-	for (i = 0; i < BF_N + 2; i++)
-	{
-		tmp = 0;
-		for (j = 0; j < 4; j++)
-		{
-			tmp <<= 8;
-			tmp |= *ptr;
-
-			if (!*ptr)
-				ptr = key;
-			else
-				ptr++;
-		}
-
-		expanded[i] = tmp;
-		initial[i] = BF_init_state.P[i] ^ tmp;
-	}
-}
-
-char *
-_crypt_blowfish_rn(const char *key, const char *setting,
-				   char *output, int size)
-{
-	struct
-	{
-		BF_ctx		ctx;
-		BF_key		expanded_key;
-		union
-		{
-			BF_word		salt[4];
-			BF_word		output[6];
-		}			binary;
-	}			data;
-	BF_word		L,
-				R;
-	BF_word		tmp1,
-				tmp2,
-				tmp3,
-				tmp4;
-	BF_word    *ptr;
-	BF_word		count;
-	int			i;
-
-	if (size < 7 + 22 + 31 + 1)
-	{
-		__set_errno(ERANGE);
-		return NULL;
-	}
-
-	if (setting[0] != '$' ||
-		setting[1] != '2' ||
-		setting[2] != 'a' ||
-		setting[3] != '$' ||
-		setting[4] < '0' || setting[4] > '3' ||
-		setting[5] < '0' || setting[5] > '9' ||
-		setting[6] != '$')
-	{
-		__set_errno(EINVAL);
-		return NULL;
-	}
-
-	count = (BF_word) 1 << ((setting[4] - '0') * 10 + (setting[5] - '0'));
-	if (count < 16 || BF_decode(data.binary.salt, &setting[7], 16))
-	{
-		memset(data.binary.salt, 0, sizeof(data.binary.salt));
-		__set_errno(EINVAL);
-		return NULL;
-	}
-	BF_swap(data.binary.salt, 4);
-
-	BF_set_key(key, data.expanded_key, data.ctx.P);
-
-	memcpy(data.ctx.S, BF_init_state.S, sizeof(data.ctx.S));
-
-	L = R = 0;
-	for (i = 0; i < BF_N + 2; i += 2)
-	{
-		L ^= data.binary.salt[i & 2];
-		R ^= data.binary.salt[(i & 2) + 1];
-		BF_ENCRYPT;
-		data.ctx.P[i] = L;
-		data.ctx.P[i + 1] = R;
-	}
-
-	ptr = data.ctx.S[0];
-	do
-	{
-		ptr += 4;
-		L ^= data.binary.salt[(BF_N + 2) & 3];
-		R ^= data.binary.salt[(BF_N + 3) & 3];
-		BF_ENCRYPT;
-		*(ptr - 4) = L;
-		*(ptr - 3) = R;
-
-		L ^= data.binary.salt[(BF_N + 4) & 3];
-		R ^= data.binary.salt[(BF_N + 5) & 3];
-		BF_ENCRYPT;
-		*(ptr - 2) = L;
-		*(ptr - 1) = R;
-	} while (ptr < &data.ctx.S[3][0xFF]);
-
-	do
-	{
-		data.ctx.P[0] ^= data.expanded_key[0];
-		data.ctx.P[1] ^= data.expanded_key[1];
-		data.ctx.P[2] ^= data.expanded_key[2];
-		data.ctx.P[3] ^= data.expanded_key[3];
-		data.ctx.P[4] ^= data.expanded_key[4];
-		data.ctx.P[5] ^= data.expanded_key[5];
-		data.ctx.P[6] ^= data.expanded_key[6];
-		data.ctx.P[7] ^= data.expanded_key[7];
-		data.ctx.P[8] ^= data.expanded_key[8];
-		data.ctx.P[9] ^= data.expanded_key[9];
-		data.ctx.P[10] ^= data.expanded_key[10];
-		data.ctx.P[11] ^= data.expanded_key[11];
-		data.ctx.P[12] ^= data.expanded_key[12];
-		data.ctx.P[13] ^= data.expanded_key[13];
-		data.ctx.P[14] ^= data.expanded_key[14];
-		data.ctx.P[15] ^= data.expanded_key[15];
-		data.ctx.P[16] ^= data.expanded_key[16];
-		data.ctx.P[17] ^= data.expanded_key[17];
-
-		BF_body();
-
-		tmp1 = data.binary.salt[0];
-		tmp2 = data.binary.salt[1];
-		tmp3 = data.binary.salt[2];
-		tmp4 = data.binary.salt[3];
-		data.ctx.P[0] ^= tmp1;
-		data.ctx.P[1] ^= tmp2;
-		data.ctx.P[2] ^= tmp3;
-		data.ctx.P[3] ^= tmp4;
-		data.ctx.P[4] ^= tmp1;
-		data.ctx.P[5] ^= tmp2;
-		data.ctx.P[6] ^= tmp3;
-		data.ctx.P[7] ^= tmp4;
-		data.ctx.P[8] ^= tmp1;
-		data.ctx.P[9] ^= tmp2;
-		data.ctx.P[10] ^= tmp3;
-		data.ctx.P[11] ^= tmp4;
-		data.ctx.P[12] ^= tmp1;
-		data.ctx.P[13] ^= tmp2;
-		data.ctx.P[14] ^= tmp3;
-		data.ctx.P[15] ^= tmp4;
-		data.ctx.P[16] ^= tmp1;
-		data.ctx.P[17] ^= tmp2;
-
-		BF_body();
-	} while (--count);
-
-	for (i = 0; i < 6; i += 2)
-	{
-		L = BF_magic_w[i];
-		R = BF_magic_w[i + 1];
-
-		count = 64;
-		do
-		{
-			BF_ENCRYPT;
-		} while (--count);
-
-		data.binary.output[i] = L;
-		data.binary.output[i + 1] = R;
-	}
-
-	memcpy(output, setting, 7 + 22 - 1);
-	output[7 + 22 - 1] = BF_itoa64[(int)
-					 BF_atoi64[(int) setting[7 + 22 - 1] - 0x20] & 0x30];
-
-/* This has to be bug-compatible with the original implementation, so
- * only encode 23 of the 24 bytes. :-) */
-	BF_swap(data.binary.output, 6);
-	BF_encode(&output[7 + 22], data.binary.output, 23);
-	output[7 + 22 + 31] = '\0';
-
-/* Overwrite the most obvious sensitive data we have on the stack. Note
- * that this does not guarantee there's no sensitive data left on the
- * stack and/or in registers; I'm not aware of portable code that does. */
-	memset(&data, 0, sizeof(data));
-
-	return output;
-}
diff --git a/contrib/pgcrypto/crypt-des.c b/contrib/pgcrypto/crypt-des.c
deleted file mode 100644
index cadbcfd182..0000000000
--- a/contrib/pgcrypto/crypt-des.c
+++ /dev/null
@@ -1,768 +0,0 @@
-/*
- * FreeSec: libcrypt for NetBSD
- *
- * Copyright (c) 1994 David Burren
- * All rights reserved.
- *
- * Adapted for FreeBSD-2.0 by Geoffrey M. Rehmet
- *	this file should now *only* export crypt(), in order to make
- *	binaries of libcrypt exportable from the USA
- *
- * Adapted for FreeBSD-4.0 by Mark R V Murray
- *	this file should now *only* export crypt_des(), in order to make
- *	a module that can be optionally included in libcrypt.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the author nor the names of other contributors
- *	  may be used to endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.	IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/secure/lib/libcrypt/crypt-des.c,v 1.12 1999/09/20 12:39:20 markm Exp $
- *
- * This is an original implementation of the DES and the crypt(3) interfaces
- * by David Burren <davidb@werj.com.au>.
- *
- * An excellent reference on the underlying algorithm (and related
- * algorithms) is:
- *
- *	B. Schneier, Applied Cryptography: protocols, algorithms,
- *	and source code in C, John Wiley & Sons, 1994.
- *
- * Note that in that book's description of DES the lookups for the initial,
- * pbox, and final permutations are inverted (this has been brought to the
- * attention of the author).  A list of errata for this book has been
- * posted to the sci.crypt newsgroup by the author and is available for FTP.
- *
- * ARCHITECTURE ASSUMPTIONS:
- *	It is assumed that the 8-byte arrays passed by reference can be
- *	addressed as arrays of uint32's (ie. the CPU is not picky about
- *	alignment).
- */
-
-#include "postgres.h"
-
-#include "px.h"
-#include "px-crypt.h"
-
-/* for ntohl/htonl */
-#include <netinet/in.h>
-
-#define _PASSWORD_EFMT1 '_'
-
-static uint8 IP[64] = {
-	58, 50, 42, 34, 26, 18, 10, 2, 60, 52, 44, 36, 28, 20, 12, 4,
-	62, 54, 46, 38, 30, 22, 14, 6, 64, 56, 48, 40, 32, 24, 16, 8,
-	57, 49, 41, 33, 25, 17, 9, 1, 59, 51, 43, 35, 27, 19, 11, 3,
-	61, 53, 45, 37, 29, 21, 13, 5, 63, 55, 47, 39, 31, 23, 15, 7
-};
-
-static uint8 inv_key_perm[64];
-static uint8 u_key_perm[56];
-static uint8 key_perm[56] = {
-	57, 49, 41, 33, 25, 17, 9, 1, 58, 50, 42, 34, 26, 18,
-	10, 2, 59, 51, 43, 35, 27, 19, 11, 3, 60, 52, 44, 36,
-	63, 55, 47, 39, 31, 23, 15, 7, 62, 54, 46, 38, 30, 22,
-	14, 6, 61, 53, 45, 37, 29, 21, 13, 5, 28, 20, 12, 4
-};
-
-static uint8 key_shifts[16] = {
-	1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1
-};
-
-static uint8 inv_comp_perm[56];
-static uint8 comp_perm[48] = {
-	14, 17, 11, 24, 1, 5, 3, 28, 15, 6, 21, 10,
-	23, 19, 12, 4, 26, 8, 16, 7, 27, 20, 13, 2,
-	41, 52, 31, 37, 47, 55, 30, 40, 51, 45, 33, 48,
-	44, 49, 39, 56, 34, 53, 46, 42, 50, 36, 29, 32
-};
-
-/*
- *	No E box is used, as it's replaced by some ANDs, shifts, and ORs.
- */
-
-static uint8 u_sbox[8][64];
-static uint8 sbox[8][64] = {
-	{
-		14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7,
-		0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8,
-		4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0,
-		15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13
-	},
-	{
-		15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10,
-		3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5,
-		0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15,
-		13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9
-	},
-	{
-		10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8,
-		13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1,
-		13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7,
-		1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12
-	},
-	{
-		7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15,
-		13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9,
-		10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4,
-		3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14
-	},
-	{
-		2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9,
-		14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6,
-		4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14,
-		11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3
-	},
-	{
-		12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11,
-		10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8,
-		9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6,
-		4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13
-	},
-	{
-		4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1,
-		13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6,
-		1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2,
-		6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12
-	},
-	{
-		13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7,
-		1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2,
-		7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8,
-		2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11
-	}
-};
-
-static uint8 un_pbox[32];
-static uint8 pbox[32] = {
-	16, 7, 20, 21, 29, 12, 28, 17, 1, 15, 23, 26, 5, 18, 31, 10,
-	2, 8, 24, 14, 32, 27, 3, 9, 19, 13, 30, 6, 22, 11, 4, 25
-};
-
-static uint32 _crypt_bits32[32] =
-{
-	0x80000000, 0x40000000, 0x20000000, 0x10000000,
-	0x08000000, 0x04000000, 0x02000000, 0x01000000,
-	0x00800000, 0x00400000, 0x00200000, 0x00100000,
-	0x00080000, 0x00040000, 0x00020000, 0x00010000,
-	0x00008000, 0x00004000, 0x00002000, 0x00001000,
-	0x00000800, 0x00000400, 0x00000200, 0x00000100,
-	0x00000080, 0x00000040, 0x00000020, 0x00000010,
-	0x00000008, 0x00000004, 0x00000002, 0x00000001
-};
-
-static uint8 _crypt_bits8[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
-
-static uint32 saltbits;
-static long old_salt;
-static uint32 *bits28,
-		   *bits24;
-static uint8 init_perm[64],
-			final_perm[64];
-static uint32 en_keysl[16],
-			en_keysr[16];
-static uint32 de_keysl[16],
-			de_keysr[16];
-static int	des_initialised = 0;
-static uint8 m_sbox[4][4096];
-static uint32 psbox[4][256];
-static uint32 ip_maskl[8][256],
-			ip_maskr[8][256];
-static uint32 fp_maskl[8][256],
-			fp_maskr[8][256];
-static uint32 key_perm_maskl[8][128],
-			key_perm_maskr[8][128];
-static uint32 comp_maskl[8][128],
-			comp_maskr[8][128];
-static uint32 old_rawkey0,
-			old_rawkey1;
-
-static inline int
-ascii_to_bin(char ch)
-{
-	if (ch > 'z')
-		return (0);
-	if (ch >= 'a')
-		return (ch - 'a' + 38);
-	if (ch > 'Z')
-		return (0);
-	if (ch >= 'A')
-		return (ch - 'A' + 12);
-	if (ch > '9')
-		return (0);
-	if (ch >= '.')
-		return (ch - '.');
-	return (0);
-}
-
-static void
-des_init()
-{
-	int			i,
-				j,
-				b,
-				k,
-				inbit,
-				obit;
-	uint32	   *p,
-			   *il,
-			   *ir,
-			   *fl,
-			   *fr;
-
-	old_rawkey0 = old_rawkey1 = 0L;
-	saltbits = 0L;
-	old_salt = 0L;
-	bits24 = (bits28 = _crypt_bits32 + 4) + 4;
-
-	/*
-	 * Invert the S-boxes, reordering the input bits.
-	 */
-	for (i = 0; i < 8; i++)
-		for (j = 0; j < 64; j++)
-		{
-			b = (j & 0x20) | ((j & 1) << 4) | ((j >> 1) & 0xf);
-			u_sbox[i][j] = sbox[i][b];
-		}
-
-	/*
-	 * Convert the inverted S-boxes into 4 arrays of 8 bits. Each will
-	 * handle 12 bits of the S-box input.
-	 */
-	for (b = 0; b < 4; b++)
-		for (i = 0; i < 64; i++)
-			for (j = 0; j < 64; j++)
-				m_sbox[b][(i << 6) | j] =
-					(u_sbox[(b << 1)][i] << 4) |
-					u_sbox[(b << 1) + 1][j];
-
-	/*
-	 * Set up the initial & final permutations into a useful form, and
-	 * initialise the inverted key permutation.
-	 */
-	for (i = 0; i < 64; i++)
-	{
-		init_perm[final_perm[i] = IP[i] - 1] = i;
-		inv_key_perm[i] = 255;
-	}
-
-	/*
-	 * Invert the key permutation and initialise the inverted key
-	 * compression permutation.
-	 */
-	for (i = 0; i < 56; i++)
-	{
-		u_key_perm[i] = key_perm[i] - 1;
-		inv_key_perm[key_perm[i] - 1] = i;
-		inv_comp_perm[i] = 255;
-	}
-
-	/*
-	 * Invert the key compression permutation.
-	 */
-	for (i = 0; i < 48; i++)
-		inv_comp_perm[comp_perm[i] - 1] = i;
-
-	/*
-	 * Set up the OR-mask arrays for the initial and final permutations,
-	 * and for the key initial and compression permutations.
-	 */
-	for (k = 0; k < 8; k++)
-	{
-		for (i = 0; i < 256; i++)
-		{
-			*(il = &ip_maskl[k][i]) = 0L;
-			*(ir = &ip_maskr[k][i]) = 0L;
-			*(fl = &fp_maskl[k][i]) = 0L;
-			*(fr = &fp_maskr[k][i]) = 0L;
-			for (j = 0; j < 8; j++)
-			{
-				inbit = 8 * k + j;
-				if (i & _crypt_bits8[j])
-				{
-					if ((obit = init_perm[inbit]) < 32)
-						*il |= _crypt_bits32[obit];
-					else
-						*ir |= _crypt_bits32[obit - 32];
-					if ((obit = final_perm[inbit]) < 32)
-						*fl |= _crypt_bits32[obit];
-					else
-						*fr |= _crypt_bits32[obit - 32];
-				}
-			}
-		}
-		for (i = 0; i < 128; i++)
-		{
-			*(il = &key_perm_maskl[k][i]) = 0L;
-			*(ir = &key_perm_maskr[k][i]) = 0L;
-			for (j = 0; j < 7; j++)
-			{
-				inbit = 8 * k + j;
-				if (i & _crypt_bits8[j + 1])
-				{
-					if ((obit = inv_key_perm[inbit]) == 255)
-						continue;
-					if (obit < 28)
-						*il |= bits28[obit];
-					else
-						*ir |= bits28[obit - 28];
-				}
-			}
-			*(il = &comp_maskl[k][i]) = 0L;
-			*(ir = &comp_maskr[k][i]) = 0L;
-			for (j = 0; j < 7; j++)
-			{
-				inbit = 7 * k + j;
-				if (i & _crypt_bits8[j + 1])
-				{
-					if ((obit = inv_comp_perm[inbit]) == 255)
-						continue;
-					if (obit < 24)
-						*il |= bits24[obit];
-					else
-						*ir |= bits24[obit - 24];
-				}
-			}
-		}
-	}
-
-	/*
-	 * Invert the P-box permutation, and convert into OR-masks for
-	 * handling the output of the S-box arrays setup above.
-	 */
-	for (i = 0; i < 32; i++)
-		un_pbox[pbox[i] - 1] = i;
-
-	for (b = 0; b < 4; b++)
-		for (i = 0; i < 256; i++)
-		{
-			*(p = &psbox[b][i]) = 0L;
-			for (j = 0; j < 8; j++)
-			{
-				if (i & _crypt_bits8[j])
-					*p |= _crypt_bits32[un_pbox[8 * b + j]];
-			}
-		}
-
-	des_initialised = 1;
-}
-
-static void
-setup_salt(long salt)
-{
-	uint32		obit,
-				saltbit;
-	int			i;
-
-	if (salt == old_salt)
-		return;
-	old_salt = salt;
-
-	saltbits = 0L;
-	saltbit = 1;
-	obit = 0x800000;
-	for (i = 0; i < 24; i++)
-	{
-		if (salt & saltbit)
-			saltbits |= obit;
-		saltbit <<= 1;
-		obit >>= 1;
-	}
-}
-
-static int
-des_setkey(const char *key)
-{
-	uint32		k0,
-				k1,
-				rawkey0,
-				rawkey1;
-	int			shifts,
-				round;
-
-	if (!des_initialised)
-		des_init();
-
-	rawkey0 = ntohl(*(uint32 *) key);
-	rawkey1 = ntohl(*(uint32 *) (key + 4));
-
-	if ((rawkey0 | rawkey1)
-		&& rawkey0 == old_rawkey0
-		&& rawkey1 == old_rawkey1)
-	{
-		/*
-		 * Already setup for this key. This optimisation fails on a zero
-		 * key (which is weak and has bad parity anyway) in order to
-		 * simplify the starting conditions.
-		 */
-		return (0);
-	}
-	old_rawkey0 = rawkey0;
-	old_rawkey1 = rawkey1;
-
-	/*
-	 * Do key permutation and split into two 28-bit subkeys.
-	 */
-	k0 = key_perm_maskl[0][rawkey0 >> 25]
-		| key_perm_maskl[1][(rawkey0 >> 17) & 0x7f]
-		| key_perm_maskl[2][(rawkey0 >> 9) & 0x7f]
-		| key_perm_maskl[3][(rawkey0 >> 1) & 0x7f]
-		| key_perm_maskl[4][rawkey1 >> 25]
-		| key_perm_maskl[5][(rawkey1 >> 17) & 0x7f]
-		| key_perm_maskl[6][(rawkey1 >> 9) & 0x7f]
-		| key_perm_maskl[7][(rawkey1 >> 1) & 0x7f];
-	k1 = key_perm_maskr[0][rawkey0 >> 25]
-		| key_perm_maskr[1][(rawkey0 >> 17) & 0x7f]
-		| key_perm_maskr[2][(rawkey0 >> 9) & 0x7f]
-		| key_perm_maskr[3][(rawkey0 >> 1) & 0x7f]
-		| key_perm_maskr[4][rawkey1 >> 25]
-		| key_perm_maskr[5][(rawkey1 >> 17) & 0x7f]
-		| key_perm_maskr[6][(rawkey1 >> 9) & 0x7f]
-		| key_perm_maskr[7][(rawkey1 >> 1) & 0x7f];
-
-	/*
-	 * Rotate subkeys and do compression permutation.
-	 */
-	shifts = 0;
-	for (round = 0; round < 16; round++)
-	{
-		uint32		t0,
-					t1;
-
-		shifts += key_shifts[round];
-
-		t0 = (k0 << shifts) | (k0 >> (28 - shifts));
-		t1 = (k1 << shifts) | (k1 >> (28 - shifts));
-
-		de_keysl[15 - round] =
-			en_keysl[round] = comp_maskl[0][(t0 >> 21) & 0x7f]
-			| comp_maskl[1][(t0 >> 14) & 0x7f]
-			| comp_maskl[2][(t0 >> 7) & 0x7f]
-			| comp_maskl[3][t0 & 0x7f]
-			| comp_maskl[4][(t1 >> 21) & 0x7f]
-			| comp_maskl[5][(t1 >> 14) & 0x7f]
-			| comp_maskl[6][(t1 >> 7) & 0x7f]
-			| comp_maskl[7][t1 & 0x7f];
-
-		de_keysr[15 - round] =
-			en_keysr[round] = comp_maskr[0][(t0 >> 21) & 0x7f]
-			| comp_maskr[1][(t0 >> 14) & 0x7f]
-			| comp_maskr[2][(t0 >> 7) & 0x7f]
-			| comp_maskr[3][t0 & 0x7f]
-			| comp_maskr[4][(t1 >> 21) & 0x7f]
-			| comp_maskr[5][(t1 >> 14) & 0x7f]
-			| comp_maskr[6][(t1 >> 7) & 0x7f]
-			| comp_maskr[7][t1 & 0x7f];
-	}
-	return (0);
-}
-
-static int
-do_des(uint32 l_in, uint32 r_in, uint32 *l_out, uint32 *r_out, int count)
-{
-	/*
-	 * l_in, r_in, l_out, and r_out are in pseudo-"big-endian" format.
-	 */
-	uint32		l,
-				r,
-			   *kl,
-			   *kr,
-			   *kl1,
-			   *kr1;
-	uint32		f,
-				r48l,
-				r48r;
-	int			round;
-
-	if (count == 0)
-		return (1);
-	else if (count > 0)
-	{
-		/*
-		 * Encrypting
-		 */
-		kl1 = en_keysl;
-		kr1 = en_keysr;
-	}
-	else
-	{
-		/*
-		 * Decrypting
-		 */
-		count = -count;
-		kl1 = de_keysl;
-		kr1 = de_keysr;
-	}
-
-	/*
-	 * Do initial permutation (IP).
-	 */
-	l = ip_maskl[0][l_in >> 24]
-		| ip_maskl[1][(l_in >> 16) & 0xff]
-		| ip_maskl[2][(l_in >> 8) & 0xff]
-		| ip_maskl[3][l_in & 0xff]
-		| ip_maskl[4][r_in >> 24]
-		| ip_maskl[5][(r_in >> 16) & 0xff]
-		| ip_maskl[6][(r_in >> 8) & 0xff]
-		| ip_maskl[7][r_in & 0xff];
-	r = ip_maskr[0][l_in >> 24]
-		| ip_maskr[1][(l_in >> 16) & 0xff]
-		| ip_maskr[2][(l_in >> 8) & 0xff]
-		| ip_maskr[3][l_in & 0xff]
-		| ip_maskr[4][r_in >> 24]
-		| ip_maskr[5][(r_in >> 16) & 0xff]
-		| ip_maskr[6][(r_in >> 8) & 0xff]
-		| ip_maskr[7][r_in & 0xff];
-
-	while (count--)
-	{
-		/*
-		 * Do each round.
-		 */
-		kl = kl1;
-		kr = kr1;
-		round = 16;
-		while (round--)
-		{
-			/*
-			 * Expand R to 48 bits (simulate the E-box).
-			 */
-			r48l = ((r & 0x00000001) << 23)
-				| ((r & 0xf8000000) >> 9)
-				| ((r & 0x1f800000) >> 11)
-				| ((r & 0x01f80000) >> 13)
-				| ((r & 0x001f8000) >> 15);
-
-			r48r = ((r & 0x0001f800) << 7)
-				| ((r & 0x00001f80) << 5)
-				| ((r & 0x000001f8) << 3)
-				| ((r & 0x0000001f) << 1)
-				| ((r & 0x80000000) >> 31);
-
-			/*
-			 * Do salting for crypt() and friends, and XOR with the
-			 * permuted key.
-			 */
-			f = (r48l ^ r48r) & saltbits;
-			r48l ^= f ^ *kl++;
-			r48r ^= f ^ *kr++;
-
-			/*
-			 * Do sbox lookups (which shrink it back to 32 bits) and do
-			 * the pbox permutation at the same time.
-			 */
-			f = psbox[0][m_sbox[0][r48l >> 12]]
-				| psbox[1][m_sbox[1][r48l & 0xfff]]
-				| psbox[2][m_sbox[2][r48r >> 12]]
-				| psbox[3][m_sbox[3][r48r & 0xfff]];
-
-			/*
-			 * Now that we've permuted things, complete f().
-			 */
-			f ^= l;
-			l = r;
-			r = f;
-		}
-		r = l;
-		l = f;
-	}
-
-	/*
-	 * Do final permutation (inverse of IP).
-	 */
-	*l_out = fp_maskl[0][l >> 24]
-		| fp_maskl[1][(l >> 16) & 0xff]
-		| fp_maskl[2][(l >> 8) & 0xff]
-		| fp_maskl[3][l & 0xff]
-		| fp_maskl[4][r >> 24]
-		| fp_maskl[5][(r >> 16) & 0xff]
-		| fp_maskl[6][(r >> 8) & 0xff]
-		| fp_maskl[7][r & 0xff];
-	*r_out = fp_maskr[0][l >> 24]
-		| fp_maskr[1][(l >> 16) & 0xff]
-		| fp_maskr[2][(l >> 8) & 0xff]
-		| fp_maskr[3][l & 0xff]
-		| fp_maskr[4][r >> 24]
-		| fp_maskr[5][(r >> 16) & 0xff]
-		| fp_maskr[6][(r >> 8) & 0xff]
-		| fp_maskr[7][r & 0xff];
-	return (0);
-}
-
-static int
-des_cipher(const char *in, char *out, long salt, int count)
-{
-	uint32		buffer[2];
-	uint32		l_out,
-				r_out,
-				rawl,
-				rawr;
-	int			retval;
-
-	if (!des_initialised)
-		des_init();
-
-	setup_salt(salt);
-
-	/* copy data to avoid assuming input is word-aligned */
-	memcpy(buffer, in, sizeof(buffer));
-
-	rawl = ntohl(buffer[0]);
-	rawr = ntohl(buffer[1]);
-
-	retval = do_des(rawl, rawr, &l_out, &r_out, count);
-
-	buffer[0] = htonl(l_out);
-	buffer[1] = htonl(r_out);
-
-	/* copy data to avoid assuming output is word-aligned */
-	memcpy(out, buffer, sizeof(buffer));
-
-	return (retval);
-}
-
-char *
-px_crypt_des(const char *key, const char *setting)
-{
-	int			i;
-	uint32		count,
-				salt,
-				l,
-				r0,
-				r1,
-				keybuf[2];
-	uint8	   *p,
-			   *q;
-	static uint8 output[21];
-
-	if (!des_initialised)
-		des_init();
-
-
-	/*
-	 * Copy the key, shifting each character up by one bit and padding
-	 * with zeros.
-	 */
-	q = (uint8 *) keybuf;
-	while (q - (uint8 *) keybuf - 8)
-	{
-		if ((*q++ = *key << 1))
-			key++;
-	}
-	if (des_setkey((uint8 *) keybuf))
-		return (NULL);
-
-#ifndef DISABLE_XDES
-	if (*setting == _PASSWORD_EFMT1)
-	{
-		/*
-		 * "new"-style: setting - underscore, 4 bytes of count, 4 bytes of
-		 * salt key - unlimited characters
-		 */
-		for (i = 1, count = 0L; i < 5; i++)
-			count |= ascii_to_bin(setting[i]) << (i - 1) * 6;
-
-		for (i = 5, salt = 0L; i < 9; i++)
-			salt |= ascii_to_bin(setting[i]) << (i - 5) * 6;
-
-		while (*key)
-		{
-			/*
-			 * Encrypt the key with itself.
-			 */
-			if (des_cipher((uint8 *) keybuf, (uint8 *) keybuf, 0L, 1))
-				return (NULL);
-
-			/*
-			 * And XOR with the next 8 characters of the key.
-			 */
-			q = (uint8 *) keybuf;
-			while (q - (uint8 *) keybuf - 8 && *key)
-				*q++ ^= *key++ << 1;
-
-			if (des_setkey((uint8 *) keybuf))
-				return (NULL);
-		}
-		strncpy(output, setting, 9);
-
-		/*
-		 * Double check that we weren't given a short setting. If we were,
-		 * the above code will probably have created wierd values for
-		 * count and salt, but we don't really care. Just make sure the
-		 * output string doesn't have an extra NUL in it.
-		 */
-		output[9] = '\0';
-		p = output + strlen(output);
-	}
-	else
-#endif   /* !DISABLE_XDES */
-	{
-		/*
-		 * "old"-style: setting - 2 bytes of salt key - up to 8 characters
-		 */
-		count = 25;
-
-		salt = (ascii_to_bin(setting[1]) << 6)
-			| ascii_to_bin(setting[0]);
-
-		output[0] = setting[0];
-
-		/*
-		 * If the encrypted password that the salt was extracted from is
-		 * only 1 character long, the salt will be corrupted.  We need to
-		 * ensure that the output string doesn't have an extra NUL in it!
-		 */
-		output[1] = setting[1] ? setting[1] : output[0];
-
-		p = output + 2;
-	}
-	setup_salt(salt);
-
-	/*
-	 * Do it.
-	 */
-	if (do_des(0L, 0L, &r0, &r1, count))
-		return (NULL);
-
-	/*
-	 * Now encode the result...
-	 */
-	l = (r0 >> 8);
-	*p++ = _crypt_a64[(l >> 18) & 0x3f];
-	*p++ = _crypt_a64[(l >> 12) & 0x3f];
-	*p++ = _crypt_a64[(l >> 6) & 0x3f];
-	*p++ = _crypt_a64[l & 0x3f];
-
-	l = (r0 << 16) | ((r1 >> 16) & 0xffff);
-	*p++ = _crypt_a64[(l >> 18) & 0x3f];
-	*p++ = _crypt_a64[(l >> 12) & 0x3f];
-	*p++ = _crypt_a64[(l >> 6) & 0x3f];
-	*p++ = _crypt_a64[l & 0x3f];
-
-	l = r1 << 2;
-	*p++ = _crypt_a64[(l >> 12) & 0x3f];
-	*p++ = _crypt_a64[(l >> 6) & 0x3f];
-	*p++ = _crypt_a64[l & 0x3f];
-	*p = 0;
-
-	return (output);
-}
diff --git a/contrib/pgcrypto/crypt-gensalt.c b/contrib/pgcrypto/crypt-gensalt.c
deleted file mode 100644
index c58e794789..0000000000
--- a/contrib/pgcrypto/crypt-gensalt.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Written by Solar Designer and placed in the public domain.
- * See crypt_blowfish.c for more information.
- *
- * This file contains salt generation functions for the traditional and
- * other common crypt(3) algorithms, except for bcrypt which is defined
- * entirely in crypt_blowfish.c.
- *
- * Put bcrypt generator also here as crypt-blowfish.c
- * may not be compiled always.		  -- marko
- */
-
-#include "postgres.h"
-
-#include "px.h"
-#include "px-crypt.h"
-
-#include <errno.h>
-#ifndef __set_errno
-#define __set_errno(val) (errno = (val))
-#endif
-
-typedef unsigned int BF_word;
-
-unsigned char _crypt_itoa64[64 + 1] =
-"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-char *
-_crypt_gensalt_traditional_rn(unsigned long count,
-			  const char *input, int size, char *output, int output_size)
-{
-	if (size < 2 || output_size < 2 + 1 || (count && count != 25))
-	{
-		if (output_size > 0)
-			output[0] = '\0';
-		__set_errno((output_size < 2 + 1) ? ERANGE : EINVAL);
-		return NULL;
-	}
-
-	output[0] = _crypt_itoa64[(unsigned int) input[0] & 0x3f];
-	output[1] = _crypt_itoa64[(unsigned int) input[1] & 0x3f];
-	output[2] = '\0';
-
-	return output;
-}
-
-char *
-_crypt_gensalt_extended_rn(unsigned long count,
-			  const char *input, int size, char *output, int output_size)
-{
-	unsigned long value;
-
-/* Even iteration counts make it easier to detect weak DES keys from a look
- * at the hash, so they should be avoided */
-	if (size < 3 || output_size < 1 + 4 + 4 + 1 ||
-		(count && (count > 0xffffff || !(count & 1))))
-	{
-		if (output_size > 0)
-			output[0] = '\0';
-		__set_errno((output_size < 1 + 4 + 4 + 1) ? ERANGE : EINVAL);
-		return NULL;
-	}
-
-	if (!count)
-		count = 725;
-
-	output[0] = '_';
-	output[1] = _crypt_itoa64[count & 0x3f];
-	output[2] = _crypt_itoa64[(count >> 6) & 0x3f];
-	output[3] = _crypt_itoa64[(count >> 12) & 0x3f];
-	output[4] = _crypt_itoa64[(count >> 18) & 0x3f];
-	value = (unsigned long) input[0] |
-		((unsigned long) input[1] << 8) |
-		((unsigned long) input[2] << 16);
-	output[5] = _crypt_itoa64[value & 0x3f];
-	output[6] = _crypt_itoa64[(value >> 6) & 0x3f];
-	output[7] = _crypt_itoa64[(value >> 12) & 0x3f];
-	output[8] = _crypt_itoa64[(value >> 18) & 0x3f];
-	output[9] = '\0';
-
-	return output;
-}
-
-char *
-_crypt_gensalt_md5_rn(unsigned long count,
-			  const char *input, int size, char *output, int output_size)
-{
-	unsigned long value;
-
-	if (size < 3 || output_size < 3 + 4 + 1 || (count && count != 1000))
-	{
-		if (output_size > 0)
-			output[0] = '\0';
-		__set_errno((output_size < 3 + 4 + 1) ? ERANGE : EINVAL);
-		return NULL;
-	}
-
-	output[0] = '$';
-	output[1] = '1';
-	output[2] = '$';
-	value = (unsigned long) input[0] |
-		((unsigned long) input[1] << 8) |
-		((unsigned long) input[2] << 16);
-	output[3] = _crypt_itoa64[value & 0x3f];
-	output[4] = _crypt_itoa64[(value >> 6) & 0x3f];
-	output[5] = _crypt_itoa64[(value >> 12) & 0x3f];
-	output[6] = _crypt_itoa64[(value >> 18) & 0x3f];
-	output[7] = '\0';
-
-	if (size >= 6 && output_size >= 3 + 4 + 4 + 1)
-	{
-		value = (unsigned long) input[3] |
-			((unsigned long) input[4] << 8) |
-			((unsigned long) input[5] << 16);
-		output[7] = _crypt_itoa64[value & 0x3f];
-		output[8] = _crypt_itoa64[(value >> 6) & 0x3f];
-		output[9] = _crypt_itoa64[(value >> 12) & 0x3f];
-		output[10] = _crypt_itoa64[(value >> 18) & 0x3f];
-		output[11] = '\0';
-	}
-
-	return output;
-}
-
-
-
-static unsigned char BF_itoa64[64 + 1] =
-"./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-
-static void
-BF_encode(char *dst, const BF_word * src, int size)
-{
-	unsigned char *sptr = (unsigned char *) src;
-	unsigned char *end = sptr + size;
-	unsigned char *dptr = (unsigned char *) dst;
-	unsigned int c1,
-				c2;
-
-	do
-	{
-		c1 = *sptr++;
-		*dptr++ = BF_itoa64[c1 >> 2];
-		c1 = (c1 & 0x03) << 4;
-		if (sptr >= end)
-		{
-			*dptr++ = BF_itoa64[c1];
-			break;
-		}
-
-		c2 = *sptr++;
-		c1 |= c2 >> 4;
-		*dptr++ = BF_itoa64[c1];
-		c1 = (c2 & 0x0f) << 2;
-		if (sptr >= end)
-		{
-			*dptr++ = BF_itoa64[c1];
-			break;
-		}
-
-		c2 = *sptr++;
-		c1 |= c2 >> 6;
-		*dptr++ = BF_itoa64[c1];
-		*dptr++ = BF_itoa64[c2 & 0x3f];
-	} while (sptr < end);
-}
-
-char *
-_crypt_gensalt_blowfish_rn(unsigned long count,
-			  const char *input, int size, char *output, int output_size)
-{
-	if (size < 16 || output_size < 7 + 22 + 1 ||
-		(count && (count < 4 || count > 31)))
-	{
-		if (output_size > 0)
-			output[0] = '\0';
-		__set_errno((output_size < 7 + 22 + 1) ? ERANGE : EINVAL);
-		return NULL;
-	}
-
-	if (!count)
-		count = 5;
-
-	output[0] = '$';
-	output[1] = '2';
-	output[2] = 'a';
-	output[3] = '$';
-	output[4] = '0' + count / 10;
-	output[5] = '0' + count % 10;
-	output[6] = '$';
-
-	BF_encode(&output[7], (BF_word *) input, 16);
-	output[7 + 22] = '\0';
-
-	return output;
-}
diff --git a/contrib/pgcrypto/crypt-md5.c b/contrib/pgcrypto/crypt-md5.c
deleted file mode 100644
index 7b45bb2151..0000000000
--- a/contrib/pgcrypto/crypt-md5.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@login.dknet.dk> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- *
- * $FreeBSD: src/lib/libcrypt/crypt-md5.c,v 1.5 1999/12/17 20:21:45 peter Exp $
- *
- */
-/* $Id: crypt-md5.c,v 1.2 2001/10/25 05:49:19 momjian Exp $ */
-
-#include <postgres.h>
-#include "px.h"
-#include "px-crypt.h"
-
-#define MD5_SIZE 16
-/*
- * UNIX password
- */
-
-char *
-px_crypt_md5(const char *pw, const char *salt, char *passwd, unsigned dstlen)
-{
-	static char *magic = "$1$"; /* This string is magic for this
-								 * algorithm.  Having it this way, we can
-								 * get get better later on */
-	static char *p;
-	static const char *sp,
-			   *ep;
-	unsigned char final[MD5_SIZE];
-	int			sl,
-				pl,
-				i;
-	PX_MD	   *ctx,
-			   *ctx1;
-	int			err;
-	unsigned long l;
-
-	if (!passwd || dstlen < 120)
-		return NULL;
-
-	/* Refine the Salt first */
-	sp = salt;
-
-	/* If it starts with the magic string, then skip that */
-	if (!strncmp(sp, magic, strlen(magic)))
-		sp += strlen(magic);
-
-	/* It stops at the first '$', max 8 chars */
-	for (ep = sp; *ep && *ep != '$' && ep < (sp + 8); ep++)
-		continue;
-
-	/* get the length of the true salt */
-	sl = ep - sp;
-
-	/* */
-	err = px_find_digest("md5", &ctx);
-	if (err)
-		return NULL;
-	err = px_find_digest("md5", &ctx1);
-
-	/* The password first, since that is what is most unknown */
-	px_md_update(ctx, pw, strlen(pw));
-
-	/* Then our magic string */
-	px_md_update(ctx, magic, strlen(magic));
-
-	/* Then the raw salt */
-	px_md_update(ctx, sp, sl);
-
-	/* Then just as many characters of the MD5(pw,salt,pw) */
-	px_md_update(ctx1, pw, strlen(pw));
-	px_md_update(ctx1, sp, sl);
-	px_md_update(ctx1, pw, strlen(pw));
-	px_md_finish(ctx1, final);
-	for (pl = strlen(pw); pl > 0; pl -= MD5_SIZE)
-		px_md_update(ctx, final, pl > MD5_SIZE ? MD5_SIZE : pl);
-
-	/* Don't leave anything around in vm they could use. */
-	memset(final, 0, sizeof final);
-
-	/* Then something really weird... */
-	for (i = strlen(pw); i; i >>= 1)
-		if (i & 1)
-			px_md_update(ctx, final, 1);
-		else
-			px_md_update(ctx, pw, 1);
-
-	/* Now make the output string */
-	strcpy(passwd, magic);
-	strncat(passwd, sp, sl);
-	strcat(passwd, "$");
-
-	px_md_finish(ctx, final);
-
-	/*
-	 * and now, just to make sure things don't run too fast On a 60 Mhz
-	 * Pentium this takes 34 msec, so you would need 30 seconds to build a
-	 * 1000 entry dictionary...
-	 */
-	for (i = 0; i < 1000; i++)
-	{
-		px_md_reset(ctx1);
-		if (i & 1)
-			px_md_update(ctx1, pw, strlen(pw));
-		else
-			px_md_update(ctx1, final, MD5_SIZE);
-
-		if (i % 3)
-			px_md_update(ctx1, sp, sl);
-
-		if (i % 7)
-			px_md_update(ctx1, pw, strlen(pw));
-
-		if (i & 1)
-			px_md_update(ctx1, final, MD5_SIZE);
-		else
-			px_md_update(ctx1, pw, strlen(pw));
-		px_md_finish(ctx1, final);
-	}
-
-	p = passwd + strlen(passwd);
-
-	l = (final[0] << 16) | (final[6] << 8) | final[12];
-	_crypt_to64(p, l, 4);
-	p += 4;
-	l = (final[1] << 16) | (final[7] << 8) | final[13];
-	_crypt_to64(p, l, 4);
-	p += 4;
-	l = (final[2] << 16) | (final[8] << 8) | final[14];
-	_crypt_to64(p, l, 4);
-	p += 4;
-	l = (final[3] << 16) | (final[9] << 8) | final[15];
-	_crypt_to64(p, l, 4);
-	p += 4;
-	l = (final[4] << 16) | (final[10] << 8) | final[5];
-	_crypt_to64(p, l, 4);
-	p += 4;
-	l = final[11];
-	_crypt_to64(p, l, 2);
-	p += 2;
-	*p = '\0';
-
-	/* Don't leave anything around in vm they could use. */
-	memset(final, 0, sizeof final);
-
-	px_md_free(ctx1);
-	px_md_free(ctx);
-
-	return passwd;
-}
diff --git a/contrib/pgcrypto/expected/blowfish.out b/contrib/pgcrypto/expected/blowfish.out
deleted file mode 100644
index e7fd632df2..0000000000
--- a/contrib/pgcrypto/expected/blowfish.out
+++ /dev/null
@@ -1,108 +0,0 @@
---
--- Blowfish cipher
---
--- some standard Blowfish testvalues
-select encode(encrypt(
-decode('0000000000000000', 'hex'),
-decode('0000000000000000', 'hex'),
-'bf-ecb/pad:none'), 'hex');
-      encode      
-------------------
- 4ef997456198dd78
-(1 row)
-
-select encode(encrypt(
-decode('ffffffffffffffff', 'hex'),
-decode('ffffffffffffffff', 'hex'),
-'bf-ecb/pad:none'), 'hex');
-      encode      
-------------------
- 51866fd5b85ecb8a
-(1 row)
-
-select encode(encrypt(
-decode('1000000000000001', 'hex'),
-decode('3000000000000000', 'hex'),
-'bf-ecb/pad:none'), 'hex');
-      encode      
-------------------
- 7d856f9a613063f2
-(1 row)
-
-select encode(encrypt(
-decode('1111111111111111', 'hex'),
-decode('1111111111111111', 'hex'),
-'bf-ecb/pad:none'), 'hex');
-      encode      
-------------------
- 2466dd878b963c9d
-(1 row)
-
-select encode(encrypt(
-decode('0123456789abcdef', 'hex'),
-decode('fedcba9876543210', 'hex'),
-'bf-ecb/pad:none'), 'hex');
-      encode      
-------------------
- 0aceab0fc6a0a28d
-(1 row)
-
-select encode(encrypt(
-decode('01a1d6d039776742', 'hex'),
-decode('fedcba9876543210', 'hex'),
-'bf-ecb/pad:none'), 'hex');
-      encode      
-------------------
- 3273b8badc9e9e15
-(1 row)
-
-select encode(encrypt(
-decode('ffffffffffffffff', 'hex'),
-decode('0000000000000000', 'hex'),
-'bf-ecb/pad:none'), 'hex');
-      encode      
-------------------
- 014933e0cdaff6e4
-(1 row)
-
--- setkey
-select encode(encrypt(
-decode('fedcba9876543210', 'hex'),
-decode('f0e1d2c3b4a5968778695a4b3c2d1e0f', 'hex'),
-'bf-ecb/pad:none'), 'hex');
-      encode      
-------------------
- 93142887ee3be15c
-(1 row)
-
--- with padding
-select encode(encrypt(
-decode('01234567890123456789', 'hex'),
-decode('33443344334433443344334433443344', 'hex'),
-'bf-ecb'), 'hex');
-              encode              
-----------------------------------
- 0d04a43a20456dee5ede6ed9e4dcaaa6
-(1 row)
-
--- cbc
--- 28 bytes key
-select encode(encrypt(
-decode('6b77b4d63006dee605b156e27403979358deb9e7154616d959f1652bd5', 'hex'),
-decode('37363534333231204e6f77206973207468652074696d6520666f7220', 'hex'),
-'bf-cbc'), 'hex');
-                              encode                              
-------------------------------------------------------------------
- 4f2beb748c4f689ec755edb9dc252a41b93a3786850b4c75d6a702b6a8e48825
-(1 row)
-
--- 29 bytes key
-select encode(encrypt(
-decode('6b77b4d63006dee605b156e27403979358deb9e7154616d959f1652bd5ff92cc', 'hex'),
-decode('37363534333231204e6f77206973207468652074696d6520666f722000', 'hex'),
-'bf-cbc'), 'hex');
-                                      encode                                      
-----------------------------------------------------------------------------------
- 3ea6357a0ee7fad6d0c4b63464f2aafa40c2e91b4b7e1bba8114932fd92b5c8f111e7e50e7b2e541
-(1 row)
-
diff --git a/contrib/pgcrypto/expected/crypt-blowfish.out b/contrib/pgcrypto/expected/crypt-blowfish.out
deleted file mode 100644
index 7910a4e02e..0000000000
--- a/contrib/pgcrypto/expected/crypt-blowfish.out
+++ /dev/null
@@ -1,26 +0,0 @@
---
--- crypt() and gen_salt(): bcrypt
---
-select crypt('', '$2a$06$RQiOJ.3ELirrXwxIZY8q0O');
-                            crypt                             
---------------------------------------------------------------
- $2a$06$RQiOJ.3ELirrXwxIZY8q0OlGbBEpDmx7IRZlNYvGJ1SHXwNi2cEKK
-(1 row)
-
-select crypt('foox', '$2a$06$RQiOJ.3ELirrXwxIZY8q0O');
-                            crypt                             
---------------------------------------------------------------
- $2a$06$RQiOJ.3ELirrXwxIZY8q0OR3CVJrAfda1z26CCHPnB6mmVZD8p0/C
-(1 row)
-
-create table ctest (data text, res text, salt text);
-insert into ctest values ('password', '', '');
-update ctest set salt = gen_salt('bf', 8);
-update ctest set res = crypt(data, salt);
-select res = crypt(data, res) as "worked" from ctest;
- worked 
---------
- t
-(1 row)
-
-drop table ctest;
diff --git a/contrib/pgcrypto/expected/crypt-des.out b/contrib/pgcrypto/expected/crypt-des.out
deleted file mode 100644
index 76a756eada..0000000000
--- a/contrib/pgcrypto/expected/crypt-des.out
+++ /dev/null
@@ -1,26 +0,0 @@
---
--- crypt() and gen_salt(): crypt-des
---
-select crypt('', 'NB');
-     crypt     
----------------
- NBPx/38Y48kHg
-(1 row)
-
-select crypt('foox', 'NB');
-     crypt     
----------------
- NB53EGGqrrb5E
-(1 row)
-
-create table ctest (data text, res text, salt text);
-insert into ctest values ('password', '', '');
-update ctest set salt = gen_salt('des');
-update ctest set res = crypt(data, salt);
-select res = crypt(data, res) as "worked" from ctest;
- worked 
---------
- t
-(1 row)
-
-drop table ctest;
diff --git a/contrib/pgcrypto/expected/crypt-md5.out b/contrib/pgcrypto/expected/crypt-md5.out
deleted file mode 100644
index 4bd2f33a9f..0000000000
--- a/contrib/pgcrypto/expected/crypt-md5.out
+++ /dev/null
@@ -1,26 +0,0 @@
---
--- crypt() and gen_salt(): md5
---
-select crypt('', '$1$Szzz0yzz');
-               crypt                
-------------------------------------
- $1$Szzz0yzz$To38XrR3BsbXQW2ZpfKjF1
-(1 row)
-
-select crypt('foox', '$1$Szzz0yzz');
-               crypt                
-------------------------------------
- $1$Szzz0yzz$IYL49cd3t9bllsA7Jmz1M1
-(1 row)
-
-create table ctest (data text, res text, salt text);
-insert into ctest values ('password', '', '');
-update ctest set salt = gen_salt('md5');
-update ctest set res = crypt(data, salt);
-select res = crypt(data, res) as "worked" from ctest;
- worked 
---------
- t
-(1 row)
-
-drop table ctest;
diff --git a/contrib/pgcrypto/expected/crypt-xdes.out b/contrib/pgcrypto/expected/crypt-xdes.out
deleted file mode 100644
index d247b552b2..0000000000
--- a/contrib/pgcrypto/expected/crypt-xdes.out
+++ /dev/null
@@ -1,26 +0,0 @@
---
--- crypt() and gen_salt(): extended des
---
-select crypt('', '_J9..j2zz');
-        crypt         
-----------------------
- _J9..j2zzR/nIRDK3pPc
-(1 row)
-
-select crypt('foox', '_J9..j2zz');
-        crypt         
-----------------------
- _J9..j2zzAYKMvO2BYRY
-(1 row)
-
-create table ctest (data text, res text, salt text);
-insert into ctest values ('password', '', '');
-update ctest set salt = gen_salt('xdes', 1001);
-update ctest set res = crypt(data, salt);
-select res = crypt(data, res) as "worked" from ctest;
- worked 
---------
- t
-(1 row)
-
-drop table ctest;
diff --git a/contrib/pgcrypto/expected/hmac-md5.out b/contrib/pgcrypto/expected/hmac-md5.out
deleted file mode 100644
index 5cd55ce440..0000000000
--- a/contrib/pgcrypto/expected/hmac-md5.out
+++ /dev/null
@@ -1,72 +0,0 @@
---
--- HMAC-MD5
---
-select encode(hmac(
-'Hi There',
-decode('0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b', 'hex'),
-'md5'), 'hex');
-              encode              
-----------------------------------
- 9294727a3638bb1c13f48ef8158bfc9d
-(1 row)
-
--- 2
-select encode(hmac(
-'Jefe',
-'what do ya want for nothing?',
-'md5'), 'hex');
-              encode              
-----------------------------------
- 813aead7c4a34bff01a16d61368e7c13
-(1 row)
-
--- 3
-select encode(hmac(
-decode('dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd', 'hex'),
-decode('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
-'md5'), 'hex');
-              encode              
-----------------------------------
- 56be34521d144c88dbb8c733f0e8b3f6
-(1 row)
-
--- 4
-select encode(hmac(
-decode('cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd', 'hex'),
-decode('0102030405060708090a0b0c0d0e0f10111213141516171819', 'hex'),
-'md5'), 'hex');
-              encode              
-----------------------------------
- 697eaf0aca3a3aea3a75164746ffaa79
-(1 row)
-
--- 5
-select encode(hmac(
-'Test With Truncation',
-decode('0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c', 'hex'),
-'md5'), 'hex');
-              encode              
-----------------------------------
- 56461ef2342edc00f9bab995690efd4c
-(1 row)
-
--- 6
-select encode(hmac(
-'Test Using Larger Than Block-Size Key - Hash Key First',
-decode('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
-'md5'), 'hex');
-              encode              
-----------------------------------
- 6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd
-(1 row)
-
--- 7
-select encode(hmac(
-'Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data',
-decode('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
-'md5'), 'hex');
-              encode              
-----------------------------------
- 6f630fad67cda0ee1fb1f562db3aa53e
-(1 row)
-
diff --git a/contrib/pgcrypto/expected/hmac-sha1.out b/contrib/pgcrypto/expected/hmac-sha1.out
deleted file mode 100644
index e4739fe5f3..0000000000
--- a/contrib/pgcrypto/expected/hmac-sha1.out
+++ /dev/null
@@ -1,72 +0,0 @@
---
--- HMAC-MD5
---
-select encode(hmac(
-'Hi There',
-decode('0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b', 'hex'),
-'sha1'), 'hex');
-                  encode                  
-------------------------------------------
- 675b0b3a1b4ddf4e124872da6c2f632bfed957e9
-(1 row)
-
--- 2
-select encode(hmac(
-'Jefe',
-'what do ya want for nothing?',
-'sha1'), 'hex');
-                  encode                  
-------------------------------------------
- 156d4c35468a0339f3fa57a067bf47f814eb7a57
-(1 row)
-
--- 3
-select encode(hmac(
-decode('dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd', 'hex'),
-decode('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
-'sha1'), 'hex');
-                  encode                  
-------------------------------------------
- d730594d167e35d5956fd8003d0db3d3f46dc7bb
-(1 row)
-
--- 4
-select encode(hmac(
-decode('cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd', 'hex'),
-decode('0102030405060708090a0b0c0d0e0f10111213141516171819', 'hex'),
-'sha1'), 'hex');
-                  encode                  
-------------------------------------------
- 4c9007f4026250c6bc8414f9bf50c86c2d7235da
-(1 row)
-
--- 5
-select encode(hmac(
-'Test With Truncation',
-decode('0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c', 'hex'),
-'sha1'), 'hex');
-                  encode                  
-------------------------------------------
- 37268b7e21e84da5720c53c4ba03ad1104039fa7
-(1 row)
-
--- 6
-select encode(hmac(
-'Test Using Larger Than Block-Size Key - Hash Key First',
-decode('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
-'sha1'), 'hex');
-                  encode                  
-------------------------------------------
- aa4ae5e15272d00e95705637ce8a3b55ed402112
-(1 row)
-
--- 7
-select encode(hmac(
-'Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data',
-decode('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
-'sha1'), 'hex');
-                  encode                  
-------------------------------------------
- e8e99d0f45237d786d6bbaa7965c7808bbff1a91
-(1 row)
-
diff --git a/contrib/pgcrypto/expected/init.out b/contrib/pgcrypto/expected/init.out
deleted file mode 100644
index a7c95eb63c..0000000000
--- a/contrib/pgcrypto/expected/init.out
+++ /dev/null
@@ -1,17 +0,0 @@
---
--- init pgcrypto
---
-\set ECHO none
--- check for encoding fn's
-select encode('foo', 'hex');
- encode 
---------
- 666f6f
-(1 row)
-
-select decode('666f6f', 'hex');
- decode 
---------
- foo
-(1 row)
-
diff --git a/contrib/pgcrypto/expected/md5.out b/contrib/pgcrypto/expected/md5.out
deleted file mode 100644
index ec8368042e..0000000000
--- a/contrib/pgcrypto/expected/md5.out
+++ /dev/null
@@ -1,45 +0,0 @@
---
--- MD5 message digest
---
-select encode(digest('', 'md5'), 'hex');
-              encode              
-----------------------------------
- d41d8cd98f00b204e9800998ecf8427e
-(1 row)
-
-select encode(digest('a', 'md5'), 'hex');
-              encode              
-----------------------------------
- 0cc175b9c0f1b6a831c399e269772661
-(1 row)
-
-select encode(digest('abc', 'md5'), 'hex');
-              encode              
-----------------------------------
- 900150983cd24fb0d6963f7d28e17f72
-(1 row)
-
-select encode(digest('message digest', 'md5'), 'hex');
-              encode              
-----------------------------------
- f96b697d7cb7938d525a2f31aaf161d0
-(1 row)
-
-select encode(digest('abcdefghijklmnopqrstuvwxyz', 'md5'), 'hex');
-              encode              
-----------------------------------
- c3fcd3d76192e4007dfb496cca67e13b
-(1 row)
-
-select encode(digest('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789', 'md5'), 'hex');
-              encode              
-----------------------------------
- d174ab98d277d9f5a5611c2c9f419d9f
-(1 row)
-
-select encode(digest('12345678901234567890123456789012345678901234567890123456789012345678901234567890', 'md5'), 'hex');
-              encode              
-----------------------------------
- 57edf4a22be3c955ac49da2e2107b67a
-(1 row)
-
diff --git a/contrib/pgcrypto/expected/rijndael.out b/contrib/pgcrypto/expected/rijndael.out
deleted file mode 100644
index 2f64268944..0000000000
--- a/contrib/pgcrypto/expected/rijndael.out
+++ /dev/null
@@ -1,69 +0,0 @@
---
--- AES / Rijndael-128 cipher
---
--- some standard Rijndael testvalues
-select encode(encrypt(
-decode('00112233445566778899aabbccddeeff', 'hex'),
-decode('000102030405060708090a0b0c0d0e0f', 'hex'),
-'aes-ecb/pad:none'), 'hex');
-              encode              
-----------------------------------
- 69c4e0d86a7b0430d8cdb78070b4c55a
-(1 row)
-
-select encode(encrypt(
-decode('00112233445566778899aabbccddeeff', 'hex'),
-decode('000102030405060708090a0b0c0d0e0f1011121314151617', 'hex'),
-'aes-ecb/pad:none'), 'hex');
-              encode              
-----------------------------------
- dda97ca4864cdfe06eaf70a0ec0d7191
-(1 row)
-
-select encode(encrypt(
-decode('00112233445566778899aabbccddeeff', 'hex'),
-decode('000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f', 'hex'),
-'aes-ecb/pad:none'), 'hex');
-              encode              
-----------------------------------
- 8ea2b7ca516745bfeafc49904b496089
-(1 row)
-
--- cbc
-select encode(encrypt(
-decode('00112233445566778899aabbccddeeff', 'hex'),
-decode('000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f', 'hex'),
-'aes-cbc/pad:none'), 'hex');
-              encode              
-----------------------------------
- 8ea2b7ca516745bfeafc49904b496089
-(1 row)
-
--- key padding
-select encode(encrypt(
-decode('0011223344', 'hex'),
-decode('000102030405', 'hex'),
-'aes-cbc'), 'hex');
-              encode              
-----------------------------------
- 189a28932213f017b246678dbc28655f
-(1 row)
-
-select encode(encrypt(
-decode('0011223344', 'hex'),
-decode('000102030405060708090a0b0c0d0e0f10111213', 'hex'),
-'aes-cbc'), 'hex');
-              encode              
-----------------------------------
- 3b02279162d15580e069d3a71407a556
-(1 row)
-
-select encode(encrypt(
-decode('0011223344', 'hex'),
-decode('000102030405060708090a0b0c0d0e0f101112131415161718191a1b', 'hex'),
-'aes-cbc'), 'hex');
-              encode              
-----------------------------------
- 4facb6a041d53e0a5a73289170901fe7
-(1 row)
-
diff --git a/contrib/pgcrypto/expected/sha1.out b/contrib/pgcrypto/expected/sha1.out
deleted file mode 100644
index 430c881a9f..0000000000
--- a/contrib/pgcrypto/expected/sha1.out
+++ /dev/null
@@ -1,45 +0,0 @@
---
--- SHA1 message digest
---
-select encode(digest('', 'sha1'), 'hex');
-                  encode                  
-------------------------------------------
- da39a3ee5e6b4b0d3255bfef95601890afd80709
-(1 row)
-
-select encode(digest('a', 'sha1'), 'hex');
-                  encode                  
-------------------------------------------
- 86f7e437faa5a7fce15d1ddcb9eaeaea377667b8
-(1 row)
-
-select encode(digest('abc', 'sha1'), 'hex');
-                  encode                  
-------------------------------------------
- a9993e364706816aba3e25717850c26c9cd0d89d
-(1 row)
-
-select encode(digest('message digest', 'sha1'), 'hex');
-                  encode                  
-------------------------------------------
- c12252ceda8be8994d5fa0290a47231c1d16aae3
-(1 row)
-
-select encode(digest('abcdefghijklmnopqrstuvwxyz', 'sha1'), 'hex');
-                  encode                  
-------------------------------------------
- 32d10c7b8cf96570ca04ce37f2a19d84240d3a89
-(1 row)
-
-select encode(digest('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789', 'sha1'), 'hex');
-                  encode                  
-------------------------------------------
- 761c457bf73b14d27e9e9265c46f4b4dda11f940
-(1 row)
-
-select encode(digest('12345678901234567890123456789012345678901234567890123456789012345678901234567890', 'sha1'), 'hex');
-                  encode                  
-------------------------------------------
- 50abf5706a150990a08b2c5ea40fa0e585554732
-(1 row)
-
diff --git a/contrib/pgcrypto/internal.c b/contrib/pgcrypto/internal.c
deleted file mode 100644
index 9a983299e6..0000000000
--- a/contrib/pgcrypto/internal.c
+++ /dev/null
@@ -1,596 +0,0 @@
-/*
- * internal.c
- *		Wrapper for builtin functions
- *
- * Copyright (c) 2001 Marko Kreen
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.	IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: internal.c,v 1.11 2002/01/03 07:21:48 momjian Exp $
- */
-
-
-#include <postgres.h>
-
-#include "px.h"
-
-#include "md5.h"
-#include "sha1.h"
-#include "blf.h"
-#include "rijndael.h"
-
-#ifndef MD5_DIGEST_LENGTH
-#define MD5_DIGEST_LENGTH 16
-#endif
-
-#ifndef SHA1_DIGEST_LENGTH
-#ifdef SHA1_RESULTLEN
-#define SHA1_DIGEST_LENGTH SHA1_RESULTLEN
-#else
-#define SHA1_DIGEST_LENGTH 20
-#endif
-#endif
-
-#define SHA1_BLOCK_SIZE 64
-#define MD5_BLOCK_SIZE 64
-
-static void init_md5(PX_MD * h);
-static void init_sha1(PX_MD * h);
-
-static struct int_digest
-{
-	char	   *name;
-	void		(*init) (PX_MD * h);
-}	int_digest_list[] =
-
-{
-	{
-		"md5", init_md5
-	},
-	{
-		"sha1", init_sha1
-	},
-	{
-		NULL, NULL
-	}
-};
-
-/* MD5 */
-
-static unsigned
-int_md5_len(PX_MD * h)
-{
-	return MD5_DIGEST_LENGTH;
-}
-
-static unsigned
-int_md5_block_len(PX_MD * h)
-{
-	return MD5_BLOCK_SIZE;
-}
-
-static void
-int_md5_update(PX_MD * h, const uint8 *data, unsigned dlen)
-{
-	MD5_CTX    *ctx = (MD5_CTX *) h->p.ptr;
-
-	MD5Update(ctx, data, dlen);
-}
-
-static void
-int_md5_reset(PX_MD * h)
-{
-	MD5_CTX    *ctx = (MD5_CTX *) h->p.ptr;
-
-	MD5Init(ctx);
-}
-
-static void
-int_md5_finish(PX_MD * h, uint8 *dst)
-{
-	MD5_CTX    *ctx = (MD5_CTX *) h->p.ptr;
-
-	MD5Final(dst, ctx);
-}
-
-static void
-int_md5_free(PX_MD * h)
-{
-	MD5_CTX    *ctx = (MD5_CTX *) h->p.ptr;
-
-	px_free(ctx);
-	px_free(h);
-}
-
-/* SHA1 */
-
-static unsigned
-int_sha1_len(PX_MD * h)
-{
-	return SHA1_DIGEST_LENGTH;
-}
-
-static unsigned
-int_sha1_block_len(PX_MD * h)
-{
-	return SHA1_BLOCK_SIZE;
-}
-
-static void
-int_sha1_update(PX_MD * h, const uint8 *data, unsigned dlen)
-{
-	SHA1_CTX   *ctx = (SHA1_CTX *) h->p.ptr;
-
-	SHA1Update(ctx, data, dlen);
-}
-
-static void
-int_sha1_reset(PX_MD * h)
-{
-	SHA1_CTX   *ctx = (SHA1_CTX *) h->p.ptr;
-
-	SHA1Init(ctx);
-}
-
-static void
-int_sha1_finish(PX_MD * h, uint8 *dst)
-{
-	SHA1_CTX   *ctx = (SHA1_CTX *) h->p.ptr;
-
-	SHA1Final(dst, ctx);
-}
-
-static void
-int_sha1_free(PX_MD * h)
-{
-	SHA1_CTX   *ctx = (SHA1_CTX *) h->p.ptr;
-
-	px_free(ctx);
-	px_free(h);
-}
-
-/* init functions */
-
-static void
-init_md5(PX_MD * md)
-{
-	MD5_CTX    *ctx;
-
-	ctx = px_alloc(sizeof(*ctx));
-
-	md->p.ptr = ctx;
-
-	md->result_size = int_md5_len;
-	md->block_size = int_md5_block_len;
-	md->reset = int_md5_reset;
-	md->update = int_md5_update;
-	md->finish = int_md5_finish;
-	md->free = int_md5_free;
-
-	md->reset(md);
-}
-
-static void
-init_sha1(PX_MD * md)
-{
-	SHA1_CTX   *ctx;
-
-	ctx = px_alloc(sizeof(*ctx));
-
-	md->p.ptr = ctx;
-
-	md->result_size = int_sha1_len;
-	md->block_size = int_sha1_block_len;
-	md->reset = int_sha1_reset;
-	md->update = int_sha1_update;
-	md->finish = int_sha1_finish;
-	md->free = int_sha1_free;
-
-	md->reset(md);
-}
-
-/*
- * ciphers generally
- */
-
-#define INT_MAX_KEY		(512/8)
-#define INT_MAX_IV		(128/8)
-
-struct int_ctx
-{
-	uint8		keybuf[INT_MAX_KEY];
-	uint8		iv[INT_MAX_IV];
-	union
-	{
-		blf_ctx		bf;
-		rijndael_ctx rj;
-	}			ctx;
-	unsigned	keylen;
-	int			is_init;
-	int			mode;
-};
-
-static void
-intctx_free(PX_Cipher * c)
-{
-	struct int_ctx *cx = (struct int_ctx *) c->ptr;
-
-	if (cx)
-	{
-		memset(cx, 0, sizeof *cx);
-		px_free(cx);
-	}
-	px_free(c);
-}
-
-/*
- * AES/rijndael
- */
-
-#define MODE_ECB 0
-#define MODE_CBC 1
-
-static unsigned
-rj_block_size(PX_Cipher * c)
-{
-	return 128 / 8;
-}
-
-static unsigned
-rj_key_size(PX_Cipher * c)
-{
-	return 256 / 8;
-}
-
-static unsigned
-rj_iv_size(PX_Cipher * c)
-{
-	return 128 / 8;
-}
-
-static int
-rj_init(PX_Cipher * c, const uint8 *key, unsigned klen, const uint8 *iv)
-{
-	struct int_ctx *cx = (struct int_ctx *) c->ptr;
-
-	if (klen <= 128 / 8)
-		cx->keylen = 128 / 8;
-	else if (klen <= 192 / 8)
-		cx->keylen = 192 / 8;
-	else if (klen <= 256 / 8)
-		cx->keylen = 256 / 8;
-	else
-		return -1;
-
-	memcpy(&cx->keybuf, key, klen);
-
-	if (iv)
-		memcpy(cx->iv, iv, 128 / 8);
-
-	return 0;
-}
-
-static int
-rj_real_init(struct int_ctx * cx, int dir)
-{
-	aes_set_key(&cx->ctx.rj, cx->keybuf, cx->keylen * 8, dir);
-	return 0;
-}
-
-static int
-rj_encrypt(PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res)
-{
-	struct int_ctx *cx = (struct int_ctx *) c->ptr;
-
-	if (!cx->is_init)
-	{
-		if (rj_real_init(cx, 1))
-			return -1;
-	}
-
-	if (dlen == 0)
-		return 0;
-
-	if (dlen & 15)
-		return -1;
-
-	memcpy(res, data, dlen);
-
-	if (cx->mode == MODE_CBC)
-	{
-		aes_cbc_encrypt(&cx->ctx.rj, cx->iv, res, dlen);
-		memcpy(cx->iv, res + dlen - 16, 16);
-	}
-	else
-		aes_ecb_encrypt(&cx->ctx.rj, res, dlen);
-
-	return 0;
-}
-
-static int
-rj_decrypt(PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res)
-{
-	struct int_ctx *cx = (struct int_ctx *) c->ptr;
-
-	if (!cx->is_init)
-		if (rj_real_init(cx, 0))
-			return -1;
-
-	if (dlen == 0)
-		return 0;
-
-	if (dlen & 15)
-		return -1;
-
-	memcpy(res, data, dlen);
-
-	if (cx->mode == MODE_CBC)
-	{
-		aes_cbc_decrypt(&cx->ctx.rj, cx->iv, res, dlen);
-		memcpy(cx->iv, data + dlen - 16, 16);
-	}
-	else
-		aes_ecb_decrypt(&cx->ctx.rj, res, dlen);
-
-	return 0;
-}
-
-/*
- * initializers
- */
-
-static PX_Cipher *
-rj_load(int mode)
-{
-	PX_Cipher  *c;
-	struct int_ctx *cx;
-
-	c = px_alloc(sizeof *c);
-	memset(c, 0, sizeof *c);
-
-	c->block_size = rj_block_size;
-	c->key_size = rj_key_size;
-	c->iv_size = rj_iv_size;
-	c->init = rj_init;
-	c->encrypt = rj_encrypt;
-	c->decrypt = rj_decrypt;
-	c->free = intctx_free;
-
-	cx = px_alloc(sizeof *cx);
-	memset(cx, 0, sizeof *cx);
-	cx->mode = mode;
-
-	c->ptr = cx;
-	return c;
-}
-
-/*
- * blowfish
- */
-
-static unsigned
-bf_block_size(PX_Cipher * c)
-{
-	return 8;
-}
-
-static unsigned
-bf_key_size(PX_Cipher * c)
-{
-	return BLF_MAXKEYLEN;
-}
-
-static unsigned
-bf_iv_size(PX_Cipher * c)
-{
-	return 8;
-}
-
-static int
-bf_init(PX_Cipher * c, const uint8 *key, unsigned klen, const uint8 *iv)
-{
-	struct int_ctx *cx = (struct int_ctx *) c->ptr;
-
-	blf_key(&cx->ctx.bf, key, klen);
-	if (iv)
-		memcpy(cx->iv, iv, 8);
-
-	return 0;
-}
-
-static int
-bf_encrypt(PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res)
-{
-	struct int_ctx *cx = (struct int_ctx *) c->ptr;
-
-	if (dlen == 0)
-		return 0;
-
-	if (dlen & 7)
-		return -1;
-
-	memcpy(res, data, dlen);
-	switch (cx->mode)
-	{
-		case MODE_ECB:
-			blf_ecb_encrypt(&cx->ctx.bf, res, dlen);
-			break;
-		case MODE_CBC:
-			blf_cbc_encrypt(&cx->ctx.bf, cx->iv, res, dlen);
-			memcpy(cx->iv, res + dlen - 8, 8);
-	}
-	return 0;
-}
-
-static int
-bf_decrypt(PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res)
-{
-	struct int_ctx *cx = (struct int_ctx *) c->ptr;
-
-	if (dlen == 0)
-		return 0;
-
-	if (dlen & 7)
-		return -1;
-
-	memcpy(res, data, dlen);
-	switch (cx->mode)
-	{
-		case MODE_ECB:
-			blf_ecb_decrypt(&cx->ctx.bf, res, dlen);
-			break;
-		case MODE_CBC:
-			blf_cbc_decrypt(&cx->ctx.bf, cx->iv, res, dlen);
-			memcpy(cx->iv, data + dlen - 8, 8);
-	}
-	return 0;
-}
-
-static PX_Cipher *
-bf_load(int mode)
-{
-	PX_Cipher  *c;
-	struct int_ctx *cx;
-
-	c = px_alloc(sizeof *c);
-	memset(c, 0, sizeof *c);
-
-	c->block_size = bf_block_size;
-	c->key_size = bf_key_size;
-	c->iv_size = bf_iv_size;
-	c->init = bf_init;
-	c->encrypt = bf_encrypt;
-	c->decrypt = bf_decrypt;
-	c->free = intctx_free;
-
-	cx = px_alloc(sizeof *cx);
-	memset(cx, 0, sizeof *cx);
-	cx->mode = mode;
-	c->ptr = cx;
-	return c;
-}
-
-/* ciphers */
-
-static PX_Cipher *
-rj_128_ecb()
-{
-	return rj_load(MODE_ECB);
-}
-
-static PX_Cipher *
-rj_128_cbc()
-{
-	return rj_load(MODE_CBC);
-}
-
-static PX_Cipher *
-bf_ecb_load()
-{
-	return bf_load(MODE_ECB);
-}
-
-static PX_Cipher *
-bf_cbc_load()
-{
-	return bf_load(MODE_CBC);
-}
-
-static struct
-{
-	char	   *name;
-	PX_Cipher  *(*load) (void);
-}	int_ciphers[] =
-
-{
-	{
-		"bf-cbc", bf_cbc_load
-	},
-	{
-		"bf-ecb", bf_ecb_load
-	},
-	{
-		"aes-128-cbc", rj_128_cbc
-	},
-	{
-		"aes-128-ecb", rj_128_ecb
-	},
-	{
-		NULL, NULL
-	}
-};
-
-static PX_Alias int_aliases[] = {
-	{"bf", "bf-cbc"},
-	{"blowfish", "bf-cbc"},
-	{"aes", "aes-128-cbc"},
-	{"aes-ecb", "aes-128-ecb"},
-	{"aes-cbc", "aes-128-cbc"},
-	{"aes-128", "aes-128-cbc"},
-	{"rijndael", "aes-128-cbc"},
-	{"rijndael-128", "aes-128-cbc"},
-	{NULL, NULL}
-};
-
-/* PUBLIC FUNCTIONS */
-
-int
-px_find_digest(const char *name, PX_MD ** res)
-{
-	struct int_digest *p;
-	PX_MD	   *h;
-
-	for (p = int_digest_list; p->name; p++)
-		if (!strcasecmp(p->name, name))
-		{
-			h = px_alloc(sizeof(*h));
-			p->init(h);
-
-			*res = h;
-
-			return 0;
-		}
-	return -1;
-}
-
-int
-px_find_cipher(const char *name, PX_Cipher ** res)
-{
-	int			i;
-	PX_Cipher  *c = NULL;
-
-	name = px_resolve_alias(int_aliases, name);
-
-	for (i = 0; int_ciphers[i].name; i++)
-		if (!strcmp(int_ciphers[i].name, name))
-		{
-			c = int_ciphers[i].load();
-			break;
-		}
-
-	if (c == NULL)
-		return -1;
-
-	*res = c;
-	return 0;
-}
diff --git a/contrib/pgcrypto/md5.c b/contrib/pgcrypto/md5.c
deleted file mode 100644
index a44ea6f857..0000000000
--- a/contrib/pgcrypto/md5.c
+++ /dev/null
@@ -1,403 +0,0 @@
-/*	$Id: md5.c,v 1.9 2001/11/29 19:40:37 momjian Exp $	*/
-/*	   $KAME: md5.c,v 1.3 2000/02/22 14:01:17 itojun Exp $	   */
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *	  may be used to endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.	IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "postgres.h"
-#include "px.h"
-
-#include "md5.h"
-
-#define SHIFT(X, s) (((X) << (s)) | ((X) >> (32 - (s))))
-
-#define F(X, Y, Z) (((X) & (Y)) | ((~X) & (Z)))
-#define G(X, Y, Z) (((X) & (Z)) | ((Y) & (~Z)))
-#define H(X, Y, Z) ((X) ^ (Y) ^ (Z))
-#define I(X, Y, Z) ((Y) ^ ((X) | (~Z)))
-
-#define ROUND1(a, b, c, d, k, s, i) \
-do { \
-	(a) = (a) + F((b), (c), (d)) + X[(k)] + T[(i)]; \
-	(a) = SHIFT((a), (s)); \
-	(a) = (b) + (a); \
-} while (0)
-
-#define ROUND2(a, b, c, d, k, s, i) \
-do { \
-	(a) = (a) + G((b), (c), (d)) + X[(k)] + T[(i)]; \
-	(a) = SHIFT((a), (s)); \
-	(a) = (b) + (a); \
-} while (0)
-
-#define ROUND3(a, b, c, d, k, s, i) \
-do { \
-	(a) = (a) + H((b), (c), (d)) + X[(k)] + T[(i)]; \
-	(a) = SHIFT((a), (s)); \
-	(a) = (b) + (a); \
-} while (0)
-
-#define ROUND4(a, b, c, d, k, s, i) \
-do { \
-	(a) = (a) + I((b), (c), (d)) + X[(k)] + T[(i)]; \
-	(a) = SHIFT((a), (s)); \
-	(a) = (b) + (a); \
-} while (0)
-
-#define Sa	 7
-#define Sb	12
-#define Sc	17
-#define Sd	22
-
-#define Se	 5
-#define Sf	 9
-#define Sg	14
-#define Sh	20
-
-#define Si	 4
-#define Sj	11
-#define Sk	16
-#define Sl	23
-
-#define Sm	 6
-#define Sn	10
-#define So	15
-#define Sp	21
-
-#define MD5_A0	0x67452301
-#define MD5_B0	0xefcdab89
-#define MD5_C0	0x98badcfe
-#define MD5_D0	0x10325476
-
-/* Integer part of 4294967296 times abs(sin(i)), where i is in radians. */
-static const uint32 T[65] = {
-	0,
-	0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee,
-	0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501,
-	0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be,
-	0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821,
-
-	0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa,
-	0xd62f105d, 0x2441453, 0xd8a1e681, 0xe7d3fbc8,
-	0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed,
-	0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a,
-
-	0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c,
-	0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70,
-	0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x4881d05,
-	0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665,
-
-	0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039,
-	0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1,
-	0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1,
-	0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391,
-};
-
-static const uint8 md5_paddat[MD5_BUFLEN] = {
-	0x80, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static void md5_calc(uint8 *, md5_ctxt *);
-
-void
-md5_init(md5_ctxt * ctxt)
-{
-	ctxt->md5_n = 0;
-	ctxt->md5_i = 0;
-	ctxt->md5_sta = MD5_A0;
-	ctxt->md5_stb = MD5_B0;
-	ctxt->md5_stc = MD5_C0;
-	ctxt->md5_std = MD5_D0;
-	bzero(ctxt->md5_buf, sizeof(ctxt->md5_buf));
-}
-
-void
-md5_loop(md5_ctxt * ctxt, const uint8 *input, unsigned len)
-{
-	unsigned int gap,
-				i;
-
-	ctxt->md5_n += len * 8;		/* byte to bit */
-	gap = MD5_BUFLEN - ctxt->md5_i;
-
-	if (len >= gap)
-	{
-		bcopy((void *) input, (void *) (ctxt->md5_buf + ctxt->md5_i),
-			  gap);
-		md5_calc(ctxt->md5_buf, ctxt);
-
-		for (i = gap; i + MD5_BUFLEN <= len; i += MD5_BUFLEN)
-			md5_calc((uint8 *) (input + i), ctxt);
-
-		ctxt->md5_i = len - i;
-		bcopy((void *) (input + i), (void *) ctxt->md5_buf, ctxt->md5_i);
-	}
-	else
-	{
-		bcopy((void *) input, (void *) (ctxt->md5_buf + ctxt->md5_i),
-			  len);
-		ctxt->md5_i += len;
-	}
-}
-
-void
-md5_pad(md5_ctxt * ctxt)
-{
-	unsigned int gap;
-
-	/* Don't count up padding. Keep md5_n. */
-	gap = MD5_BUFLEN - ctxt->md5_i;
-	if (gap > 8)
-	{
-		bcopy((void *) md5_paddat,
-			  (void *) (ctxt->md5_buf + ctxt->md5_i),
-			  gap - sizeof(ctxt->md5_n));
-	}
-	else
-	{
-		/* including gap == 8 */
-		bcopy((void *) md5_paddat, (void *) (ctxt->md5_buf + ctxt->md5_i),
-			  gap);
-		md5_calc(ctxt->md5_buf, ctxt);
-		bcopy((void *) (md5_paddat + gap),
-			  (void *) ctxt->md5_buf,
-			  MD5_BUFLEN - sizeof(ctxt->md5_n));
-	}
-
-	/* 8 byte word */
-#if BYTE_ORDER == LITTLE_ENDIAN
-	bcopy(&ctxt->md5_n8[0], &ctxt->md5_buf[56], 8);
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	ctxt->md5_buf[56] = ctxt->md5_n8[7];
-	ctxt->md5_buf[57] = ctxt->md5_n8[6];
-	ctxt->md5_buf[58] = ctxt->md5_n8[5];
-	ctxt->md5_buf[59] = ctxt->md5_n8[4];
-	ctxt->md5_buf[60] = ctxt->md5_n8[3];
-	ctxt->md5_buf[61] = ctxt->md5_n8[2];
-	ctxt->md5_buf[62] = ctxt->md5_n8[1];
-	ctxt->md5_buf[63] = ctxt->md5_n8[0];
-#endif
-
-	md5_calc(ctxt->md5_buf, ctxt);
-}
-
-void
-md5_result(uint8 *digest, md5_ctxt * ctxt)
-{
-	/* 4 byte words */
-#if BYTE_ORDER == LITTLE_ENDIAN
-	bcopy(&ctxt->md5_st8[0], digest, 16);
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	digest[0] = ctxt->md5_st8[3];
-	digest[1] = ctxt->md5_st8[2];
-	digest[2] = ctxt->md5_st8[1];
-	digest[3] = ctxt->md5_st8[0];
-	digest[4] = ctxt->md5_st8[7];
-	digest[5] = ctxt->md5_st8[6];
-	digest[6] = ctxt->md5_st8[5];
-	digest[7] = ctxt->md5_st8[4];
-	digest[8] = ctxt->md5_st8[11];
-	digest[9] = ctxt->md5_st8[10];
-	digest[10] = ctxt->md5_st8[9];
-	digest[11] = ctxt->md5_st8[8];
-	digest[12] = ctxt->md5_st8[15];
-	digest[13] = ctxt->md5_st8[14];
-	digest[14] = ctxt->md5_st8[13];
-	digest[15] = ctxt->md5_st8[12];
-#endif
-}
-
-#if BYTE_ORDER == BIG_ENDIAN
-static uint32 X[16];
-#endif
-
-static void
-md5_calc(uint8 *b64, md5_ctxt * ctxt)
-{
-	uint32		A = ctxt->md5_sta;
-	uint32		B = ctxt->md5_stb;
-	uint32		C = ctxt->md5_stc;
-	uint32		D = ctxt->md5_std;
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-	uint32	   *X = (uint32 *) b64;
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	/* 4 byte words */
-	/* what a brute force but fast! */
-	uint8	   *y = (uint8 *) X;
-
-	y[0] = b64[3];
-	y[1] = b64[2];
-	y[2] = b64[1];
-	y[3] = b64[0];
-	y[4] = b64[7];
-	y[5] = b64[6];
-	y[6] = b64[5];
-	y[7] = b64[4];
-	y[8] = b64[11];
-	y[9] = b64[10];
-	y[10] = b64[9];
-	y[11] = b64[8];
-	y[12] = b64[15];
-	y[13] = b64[14];
-	y[14] = b64[13];
-	y[15] = b64[12];
-	y[16] = b64[19];
-	y[17] = b64[18];
-	y[18] = b64[17];
-	y[19] = b64[16];
-	y[20] = b64[23];
-	y[21] = b64[22];
-	y[22] = b64[21];
-	y[23] = b64[20];
-	y[24] = b64[27];
-	y[25] = b64[26];
-	y[26] = b64[25];
-	y[27] = b64[24];
-	y[28] = b64[31];
-	y[29] = b64[30];
-	y[30] = b64[29];
-	y[31] = b64[28];
-	y[32] = b64[35];
-	y[33] = b64[34];
-	y[34] = b64[33];
-	y[35] = b64[32];
-	y[36] = b64[39];
-	y[37] = b64[38];
-	y[38] = b64[37];
-	y[39] = b64[36];
-	y[40] = b64[43];
-	y[41] = b64[42];
-	y[42] = b64[41];
-	y[43] = b64[40];
-	y[44] = b64[47];
-	y[45] = b64[46];
-	y[46] = b64[45];
-	y[47] = b64[44];
-	y[48] = b64[51];
-	y[49] = b64[50];
-	y[50] = b64[49];
-	y[51] = b64[48];
-	y[52] = b64[55];
-	y[53] = b64[54];
-	y[54] = b64[53];
-	y[55] = b64[52];
-	y[56] = b64[59];
-	y[57] = b64[58];
-	y[58] = b64[57];
-	y[59] = b64[56];
-	y[60] = b64[63];
-	y[61] = b64[62];
-	y[62] = b64[61];
-	y[63] = b64[60];
-#endif
-
-	ROUND1(A, B, C, D, 0, Sa, 1);
-	ROUND1(D, A, B, C, 1, Sb, 2);
-	ROUND1(C, D, A, B, 2, Sc, 3);
-	ROUND1(B, C, D, A, 3, Sd, 4);
-	ROUND1(A, B, C, D, 4, Sa, 5);
-	ROUND1(D, A, B, C, 5, Sb, 6);
-	ROUND1(C, D, A, B, 6, Sc, 7);
-	ROUND1(B, C, D, A, 7, Sd, 8);
-	ROUND1(A, B, C, D, 8, Sa, 9);
-	ROUND1(D, A, B, C, 9, Sb, 10);
-	ROUND1(C, D, A, B, 10, Sc, 11);
-	ROUND1(B, C, D, A, 11, Sd, 12);
-	ROUND1(A, B, C, D, 12, Sa, 13);
-	ROUND1(D, A, B, C, 13, Sb, 14);
-	ROUND1(C, D, A, B, 14, Sc, 15);
-	ROUND1(B, C, D, A, 15, Sd, 16);
-
-	ROUND2(A, B, C, D, 1, Se, 17);
-	ROUND2(D, A, B, C, 6, Sf, 18);
-	ROUND2(C, D, A, B, 11, Sg, 19);
-	ROUND2(B, C, D, A, 0, Sh, 20);
-	ROUND2(A, B, C, D, 5, Se, 21);
-	ROUND2(D, A, B, C, 10, Sf, 22);
-	ROUND2(C, D, A, B, 15, Sg, 23);
-	ROUND2(B, C, D, A, 4, Sh, 24);
-	ROUND2(A, B, C, D, 9, Se, 25);
-	ROUND2(D, A, B, C, 14, Sf, 26);
-	ROUND2(C, D, A, B, 3, Sg, 27);
-	ROUND2(B, C, D, A, 8, Sh, 28);
-	ROUND2(A, B, C, D, 13, Se, 29);
-	ROUND2(D, A, B, C, 2, Sf, 30);
-	ROUND2(C, D, A, B, 7, Sg, 31);
-	ROUND2(B, C, D, A, 12, Sh, 32);
-
-	ROUND3(A, B, C, D, 5, Si, 33);
-	ROUND3(D, A, B, C, 8, Sj, 34);
-	ROUND3(C, D, A, B, 11, Sk, 35);
-	ROUND3(B, C, D, A, 14, Sl, 36);
-	ROUND3(A, B, C, D, 1, Si, 37);
-	ROUND3(D, A, B, C, 4, Sj, 38);
-	ROUND3(C, D, A, B, 7, Sk, 39);
-	ROUND3(B, C, D, A, 10, Sl, 40);
-	ROUND3(A, B, C, D, 13, Si, 41);
-	ROUND3(D, A, B, C, 0, Sj, 42);
-	ROUND3(C, D, A, B, 3, Sk, 43);
-	ROUND3(B, C, D, A, 6, Sl, 44);
-	ROUND3(A, B, C, D, 9, Si, 45);
-	ROUND3(D, A, B, C, 12, Sj, 46);
-	ROUND3(C, D, A, B, 15, Sk, 47);
-	ROUND3(B, C, D, A, 2, Sl, 48);
-
-	ROUND4(A, B, C, D, 0, Sm, 49);
-	ROUND4(D, A, B, C, 7, Sn, 50);
-	ROUND4(C, D, A, B, 14, So, 51);
-	ROUND4(B, C, D, A, 5, Sp, 52);
-	ROUND4(A, B, C, D, 12, Sm, 53);
-	ROUND4(D, A, B, C, 3, Sn, 54);
-	ROUND4(C, D, A, B, 10, So, 55);
-	ROUND4(B, C, D, A, 1, Sp, 56);
-	ROUND4(A, B, C, D, 8, Sm, 57);
-	ROUND4(D, A, B, C, 15, Sn, 58);
-	ROUND4(C, D, A, B, 6, So, 59);
-	ROUND4(B, C, D, A, 13, Sp, 60);
-	ROUND4(A, B, C, D, 4, Sm, 61);
-	ROUND4(D, A, B, C, 11, Sn, 62);
-	ROUND4(C, D, A, B, 2, So, 63);
-	ROUND4(B, C, D, A, 9, Sp, 64);
-
-	ctxt->md5_sta += A;
-	ctxt->md5_stb += B;
-	ctxt->md5_stc += C;
-	ctxt->md5_std += D;
-}
diff --git a/contrib/pgcrypto/md5.h b/contrib/pgcrypto/md5.h
deleted file mode 100644
index feadee2e80..0000000000
--- a/contrib/pgcrypto/md5.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$Id: md5.h,v 1.7 2001/11/05 17:46:23 momjian Exp $	*/
-/*	   $KAME: md5.h,v 1.3 2000/02/22 14:01:18 itojun Exp $	   */
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *	  may be used to endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.	IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _NETINET6_MD5_H_
-#define _NETINET6_MD5_H_
-
-#define MD5_BUFLEN	64
-
-typedef struct
-{
-	union
-	{
-		uint32		md5_state32[4];
-		uint8		md5_state8[16];
-	}			md5_st;
-
-#define md5_sta		md5_st.md5_state32[0]
-#define md5_stb		md5_st.md5_state32[1]
-#define md5_stc		md5_st.md5_state32[2]
-#define md5_std		md5_st.md5_state32[3]
-#define md5_st8		md5_st.md5_state8
-
-	union
-	{
-		uint64		md5_count64;
-		uint8		md5_count8[8];
-	}			md5_count;
-#define md5_n	md5_count.md5_count64
-#define md5_n8	md5_count.md5_count8
-
-	unsigned int md5_i;
-	uint8		md5_buf[MD5_BUFLEN];
-}	md5_ctxt;
-
-extern void md5_init(md5_ctxt *);
-extern void md5_loop(md5_ctxt *, const uint8 *, unsigned int);
-extern void md5_pad(md5_ctxt *);
-extern void md5_result(uint8 *, md5_ctxt *);
-
-/* compatibility */
-#define MD5_CTX		md5_ctxt
-#define MD5Init(x)	md5_init((x))
-#define MD5Update(x, y, z)	md5_loop((x), (y), (z))
-#define MD5Final(x, y) \
-do {				\
-	md5_pad((y));		\
-	md5_result((x), (y));	\
-} while (0)
-
-#endif   /* ! _NETINET6_MD5_H_ */
diff --git a/contrib/pgcrypto/mhash.c b/contrib/pgcrypto/mhash.c
deleted file mode 100644
index d0be0a62d5..0000000000
--- a/contrib/pgcrypto/mhash.c
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * mhash.c
- *		Wrapper for mhash and mcrypt libraries.
- *
- * Copyright (c) 2001 Marko Kreen
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.	IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: mhash.c,v 1.7 2001/11/20 18:54:07 momjian Exp $
- */
-
-#include <postgres.h>
-
-#include "px.h"
-
-#include <mhash.h>
-#include <mcrypt.h>
-
-#define MAX_KEY_LENGTH 512
-#define MAX_IV_LENGTH 128
-
-#define DEF_KEY_LEN 16
-
-
-/* DIGEST */
-
-static unsigned
-digest_result_size(PX_MD * h)
-{
-	MHASH		mh = (MHASH) h->p.ptr;
-	hashid		id = mhash_get_mhash_algo(mh);
-
-	return mhash_get_block_size(id);
-}
-
-static unsigned
-digest_block_size(PX_MD * h)
-{
-	MHASH		mh = (MHASH) h->p.ptr;
-	hashid		id = mhash_get_mhash_algo(mh);
-
-	return mhash_get_hash_pblock(id);
-}
-
-static void
-digest_reset(PX_MD * h)
-{
-	MHASH		mh = (MHASH) h->p.ptr;
-	hashid		id = mhash_get_mhash_algo(mh);
-	uint8	   *res = mhash_end(mh);
-
-	mhash_free(res);
-	mh = mhash_init(id);
-	h->p.ptr = mh;
-}
-
-static void
-digest_update(PX_MD * h, const uint8 *data, unsigned dlen)
-{
-	MHASH		mh = (MHASH) h->p.ptr;
-
-	mhash(mh, data, dlen);
-}
-
-static void
-digest_finish(PX_MD * h, uint8 *dst)
-{
-	MHASH		mh = (MHASH) h->p.ptr;
-	unsigned	hlen = digest_result_size(h);
-	hashid		id = mhash_get_mhash_algo(mh);
-	uint8	   *buf = mhash_end(mh);
-
-	memcpy(dst, buf, hlen);
-	mhash_free(buf);
-
-	mh = mhash_init(id);
-	h->p.ptr = mh;
-}
-
-static void
-digest_free(PX_MD * h)
-{
-	MHASH		mh = (MHASH) h->p.ptr;
-	uint8	   *buf = mhash_end(mh);
-
-	mhash_free(buf);
-
-	px_free(h);
-}
-
-/* ENCRYPT / DECRYPT */
-
-static unsigned
-cipher_block_size(PX_Cipher * c)
-{
-	MCRYPT		ctx = (MCRYPT) c->ptr;
-
-	return mcrypt_enc_get_block_size(ctx);
-}
-
-static unsigned
-cipher_key_size(PX_Cipher * c)
-{
-	MCRYPT		ctx = (MCRYPT) c->ptr;
-
-	return mcrypt_enc_get_key_size(ctx);
-}
-
-static unsigned
-cipher_iv_size(PX_Cipher * c)
-{
-	MCRYPT		ctx = (MCRYPT) c->ptr;
-
-	return mcrypt_enc_mode_has_iv(ctx)
-		? mcrypt_enc_get_iv_size(ctx) : 0;
-}
-
-static int
-cipher_init(PX_Cipher * c, const uint8 *key, unsigned klen, const uint8 *iv)
-{
-	int			err;
-	MCRYPT		ctx = (MCRYPT) c->ptr;
-
-	err = mcrypt_generic_init(ctx, (char *) key, klen, (char *) iv);
-	if (err < 0)
-		elog(ERROR, "mcrypt_generic_init error: %s", mcrypt_strerror(err));
-
-	c->pstat = 1;
-	return 0;
-}
-
-static int
-cipher_encrypt(PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res)
-{
-	int			err;
-	MCRYPT		ctx = (MCRYPT) c->ptr;
-
-	memcpy(res, data, dlen);
-
-	err = mcrypt_generic(ctx, res, dlen);
-	if (err < 0)
-		elog(ERROR, "mcrypt_generic error: %s", mcrypt_strerror(err));
-	return 0;
-}
-
-static int
-cipher_decrypt(PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res)
-{
-	int			err;
-	MCRYPT		ctx = (MCRYPT) c->ptr;
-
-	memcpy(res, data, dlen);
-
-	err = mdecrypt_generic(ctx, res, dlen);
-	if (err < 0)
-		elog(ERROR, "mdecrypt_generic error: %s", mcrypt_strerror(err));
-	return 0;
-}
-
-
-static void
-cipher_free(PX_Cipher * c)
-{
-	MCRYPT		ctx = (MCRYPT) c->ptr;
-
-	if (c->pstat)
-		mcrypt_generic_end(ctx);
-	else
-		mcrypt_module_close(ctx);
-
-	px_free(c);
-}
-
-/* Helper functions */
-
-static int
-find_hashid(const char *name)
-{
-	int			res = -1;
-	size_t		hnum,
-				b,
-				i;
-	char	   *mname;
-
-	hnum = mhash_count();
-	for (i = 0; i <= hnum; i++)
-	{
-		mname = mhash_get_hash_name(i);
-		if (mname == NULL)
-			continue;
-		b = strcasecmp(name, mname);
-		free(mname);
-		if (!b)
-		{
-			res = i;
-			break;
-		}
-	}
-
-	return res;
-}
-
-static char *modes[] = {
-	"ecb", "cbc", "cfb", "ofb", "nofb", "stream",
-	"ofb64", "cfb64", NULL
-};
-
-static PX_Alias aliases[] = {
-	{"bf", "blowfish"},
-	{"3des", "tripledes"},
-	{"des3", "tripledes"},
-	{"aes", "rijndael-128"},
-	{"rijndael", "rijndael-128"},
-	{"aes-128", "rijndael-128"},
-	{"aes-192", "rijndael-192"},
-	{"aes-256", "rijndael-256"},
-	{NULL, NULL}
-};
-
-static PX_Alias mode_aliases[] = {
-#if 0							/* N/A */
-	{"cfb", "ncfb"},
-	{"ofb", "nofb"},
-	{"cfb64", "ncfb"},
-#endif
-	/* { "ofb64", "nofb" }, not sure it works */
-	{"cfb8", "cfb"},
-	{"ofb8", "ofb"},
-	{NULL, NULL}
-};
-
-static int
-is_mode(char *s)
-{
-	char	  **p;
-
-	if (*s >= '0' && *s <= '9')
-		return 0;
-
-	for (p = modes; *p; p++)
-		if (!strcmp(s, *p))
-			return 1;
-
-	return 0;
-}
-
-/* PUBLIC FUNCTIONS */
-
-int
-px_find_digest(const char *name, PX_MD ** res)
-{
-	PX_MD	   *h;
-	MHASH		mh;
-	int			i;
-
-	i = find_hashid(name);
-	if (i < 0)
-		return -1;
-
-	mh = mhash_init(i);
-	h = px_alloc(sizeof(*h));
-	h->p.ptr = (void *) mh;
-
-	h->result_size = digest_result_size;
-	h->block_size = digest_block_size;
-	h->reset = digest_reset;
-	h->update = digest_update;
-	h->finish = digest_finish;
-	h->free = digest_free;
-
-	*res = h;
-	return 0;
-}
-
-
-int
-px_find_cipher(const char *name, PX_Cipher ** res)
-{
-	char		nbuf[PX_MAX_NAMELEN + 1];
-	const char *mode = NULL;
-	char	   *p;
-	MCRYPT		ctx;
-
-	PX_Cipher  *c;
-
-	strcpy(nbuf, name);
-
-	if ((p = strrchr(nbuf, '-')) != NULL)
-	{
-		if (is_mode(p + 1))
-		{
-			mode = p + 1;
-			*p = 0;
-		}
-	}
-
-	name = px_resolve_alias(aliases, nbuf);
-
-	if (!mode)
-	{
-		mode = "cbc";
-
-		/*
-		 * if (mcrypt_module_is_block_algorithm(name, NULL)) mode = "cbc";
-		 * else mode = "stream";
-		 */
-	}
-	mode = px_resolve_alias(mode_aliases, mode);
-
-	ctx = mcrypt_module_open((char *) name, NULL, (char *) mode, NULL);
-	if (ctx == (void *) MCRYPT_FAILED)
-		return -1;
-
-	c = palloc(sizeof *c);
-	c->iv_size = cipher_iv_size;
-	c->key_size = cipher_key_size;
-	c->block_size = cipher_block_size;
-	c->init = cipher_init;
-	c->encrypt = cipher_encrypt;
-	c->decrypt = cipher_decrypt;
-	c->free = cipher_free;
-	c->ptr = ctx;
-	c->pstat = 0;
-
-	*res = c;
-	return 0;
-}
diff --git a/contrib/pgcrypto/misc.c b/contrib/pgcrypto/misc.c
deleted file mode 100644
index 5c803c0d5b..0000000000
--- a/contrib/pgcrypto/misc.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 1999
- *		University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the author nor the names of any co-contributors
- *	  may be used to endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY CONTRIBUTORS ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libcrypt/misc.c,v 1.1 1999/09/20 12:45:49 markm Exp $
- *
- */
-
-#include "px-crypt.h"
-
-char		px_crypt_a64[] =
-"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-/* 0000000000111111111122222222223333333333444444444455555555556666 */
-/* 0123456789012345678901234567890123456789012345678901234567890123 */
-
-void
-px_crypt_to64(char *s, unsigned long v, int n)
-{
-	while (--n >= 0)
-	{
-		*s++ = px_crypt_a64[v & 0x3f];
-		v >>= 6;
-	}
-}
diff --git a/contrib/pgcrypto/openssl.c b/contrib/pgcrypto/openssl.c
deleted file mode 100644
index 1ea1778b9b..0000000000
--- a/contrib/pgcrypto/openssl.c
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
- * openssl.c
- *		Wrapper for OpenSSL library.
- *
- * Copyright (c) 2001 Marko Kreen
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.	IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: openssl.c,v 1.10 2001/11/20 18:54:07 momjian Exp $
- */
-
-#include <postgres.h>
-
-#include "px.h"
-
-#include <openssl/evp.h>
-#include <openssl/blowfish.h>
-
-static unsigned
-digest_result_size(PX_MD * h)
-{
-	return EVP_MD_CTX_size((EVP_MD_CTX *) h->p.ptr);
-}
-
-static unsigned
-digest_block_size(PX_MD * h)
-{
-	return EVP_MD_CTX_block_size((EVP_MD_CTX *) h->p.ptr);
-}
-
-static void
-digest_reset(PX_MD * h)
-{
-	EVP_MD_CTX *ctx = (EVP_MD_CTX *) h->p.ptr;
-	const EVP_MD *md;
-
-	md = EVP_MD_CTX_md(ctx);
-
-	EVP_DigestInit(ctx, md);
-}
-
-static void
-digest_update(PX_MD * h, const uint8 *data, unsigned dlen)
-{
-	EVP_MD_CTX *ctx = (EVP_MD_CTX *) h->p.ptr;
-
-	EVP_DigestUpdate(ctx, data, dlen);
-}
-
-static void
-digest_finish(PX_MD * h, uint8 *dst)
-{
-	EVP_MD_CTX *ctx = (EVP_MD_CTX *) h->p.ptr;
-
-	EVP_DigestFinal(ctx, dst, NULL);
-}
-
-static void
-digest_free(PX_MD * h)
-{
-	EVP_MD_CTX *ctx = (EVP_MD_CTX *) h->p.ptr;
-
-	px_free(ctx);
-	px_free(h);
-}
-
-/* CIPHERS */
-
-/*
- * The problem with OpenSSL is that the EVP* family
- * of functions does not allow enough flexibility
- * and forces some of the parameters (keylen,
- * padding) to SSL defaults.
- */
-
-
-typedef struct
-{
-	union
-	{
-		struct
-		{
-			BF_KEY		key;
-			int			num;
-		}			bf;
-		EVP_CIPHER_CTX evp_ctx;
-	}			u;
-	const EVP_CIPHER *evp_ciph;
-	uint8		key[EVP_MAX_KEY_LENGTH];
-	uint8		iv[EVP_MAX_IV_LENGTH];
-	unsigned	klen;
-	unsigned	init;
-}	ossldata;
-
-/* generic EVP */
-
-static unsigned
-gen_evp_block_size(PX_Cipher * c)
-{
-	ossldata   *od = (ossldata *) c->ptr;
-
-	return EVP_CIPHER_block_size(od->evp_ciph);
-}
-
-static unsigned
-gen_evp_key_size(PX_Cipher * c)
-{
-	ossldata   *od = (ossldata *) c->ptr;
-
-	return EVP_CIPHER_key_length(od->evp_ciph);
-}
-
-static unsigned
-gen_evp_iv_size(PX_Cipher * c)
-{
-	unsigned	ivlen;
-	ossldata   *od = (ossldata *) c->ptr;
-
-	ivlen = EVP_CIPHER_iv_length(od->evp_ciph);
-	return ivlen;
-}
-
-static void
-gen_evp_free(PX_Cipher * c)
-{
-	ossldata   *od = (ossldata *) c->ptr;
-
-	memset(od, 0, sizeof(*od));
-	pfree(od);
-	pfree(c);
-}
-
-/* fun */
-
-static int
-gen_evp_init(PX_Cipher * c, const uint8 *key, unsigned klen, const uint8 *iv)
-{
-	ossldata   *od = (ossldata *) c->ptr;
-	unsigned	bs = gen_evp_block_size(c);
-
-	if (iv)
-		memcpy(od->iv, iv, bs);
-	else
-		memset(od->iv, 0, bs);
-	memcpy(od->key, key, klen);
-	od->klen = klen;
-	od->init = 0;
-	return 0;
-}
-
-static void
-_gen_init(PX_Cipher * c, int enc)
-{
-	ossldata   *od = c->ptr;
-
-	od->evp_ciph->init(&od->u.evp_ctx, od->key, od->iv, enc);
-	od->init = 1;
-	od->u.evp_ctx.encrypt = enc;
-}
-
-static int
-gen_evp_encrypt(PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res)
-{
-	ossldata   *od = c->ptr;
-
-	if (!od->init)
-		_gen_init(c, 1);
-	od->evp_ciph->do_cipher(&od->u.evp_ctx, res, data, dlen);
-	return 0;
-}
-
-static int
-gen_evp_decrypt(PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res)
-{
-	ossldata   *od = c->ptr;
-
-	if (!od->init)
-		_gen_init(c, 0);
-	od->evp_ciph->do_cipher(&od->u.evp_ctx, res, data, dlen);
-	return 0;
-}
-
-/* Blowfish */
-
-static int
-bf_init(PX_Cipher * c, const uint8 *key, unsigned klen, const uint8 *iv)
-{
-	ossldata   *od = c->ptr;
-
-	BF_set_key(&od->u.bf.key, klen, key);
-	if (iv)
-		memcpy(od->iv, iv, BF_BLOCK);
-	else
-		memset(od->iv, 0, BF_BLOCK);
-	od->u.bf.num = 0;
-	return 0;
-}
-
-static int
-bf_ecb_encrypt(PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res)
-{
-	unsigned	bs = gen_evp_block_size(c),
-				i;
-	ossldata   *od = c->ptr;
-
-	for (i = 0; i < dlen / bs; i++)
-		BF_ecb_encrypt(data + i * bs, res + i * bs, &od->u.bf.key, BF_ENCRYPT);
-	return 0;
-}
-
-static int
-bf_ecb_decrypt(PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res)
-{
-	unsigned	bs = gen_evp_block_size(c),
-				i;
-	ossldata   *od = c->ptr;
-
-	for (i = 0; i < dlen / bs; i++)
-		BF_ecb_encrypt(data + i * bs, res + i * bs, &od->u.bf.key, BF_DECRYPT);
-	return 0;
-}
-
-static int
-bf_cbc_encrypt(PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res)
-{
-	ossldata   *od = c->ptr;
-
-	BF_cbc_encrypt(data, res, dlen, &od->u.bf.key, od->iv, BF_ENCRYPT);
-	return 0;
-}
-
-static int
-bf_cbc_decrypt(PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res)
-{
-	ossldata   *od = c->ptr;
-
-	BF_cbc_encrypt(data, res, dlen, &od->u.bf.key, od->iv, BF_DECRYPT);
-	return 0;
-}
-
-static int
-bf_cfb64_encrypt(PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res)
-{
-	ossldata   *od = c->ptr;
-
-	BF_cfb64_encrypt(data, res, dlen, &od->u.bf.key, od->iv,
-					 &od->u.bf.num, BF_ENCRYPT);
-	return 0;
-}
-
-static int
-bf_cfb64_decrypt(PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res)
-{
-	ossldata   *od = c->ptr;
-
-	BF_cfb64_encrypt(data, res, dlen, &od->u.bf.key, od->iv,
-					 &od->u.bf.num, BF_DECRYPT);
-	return 0;
-}
-
-static int
-bf_ofb64_encrypt(PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res)
-{
-	ossldata   *od = c->ptr;
-
-	BF_ofb64_encrypt(data, res, dlen, &od->u.bf.key, od->iv, &od->u.bf.num);
-	return 0;
-}
-
-static int
-bf_ofb64_decrypt(PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res)
-{
-	ossldata   *od = c->ptr;
-
-	BF_ofb64_encrypt(data, res, dlen, &od->u.bf.key, od->iv, &od->u.bf.num);
-	return 0;
-}
-
-/*
- * aliases
- */
-
-static PX_Alias ossl_aliases[] = {
-	{"bf", "bf-cbc"},
-	{"blowfish", "bf-cbc"},
-	{"blowfish-cbc", "bf-cbc"},
-	{"blowfish-ecb", "bf-ecb"},
-	{"blowfish-cfb", "bf-cfb"},
-	{"blowfish-ofb", "bf-ofb"},
-	{NULL}
-};
-
-/*
-static PX_Alias ossl_mode_aliases [] = {
-	{ "cfb64", "cfb" },
-	{ "ofb64", "ofb" },
-	{ NULL }
-};*/
-
-/*
- * Special handlers
- */
-struct
-{
-	char	   *name;
-	PX_Cipher	cf;
-}	spec_types[] =
-
-{
-	{
-		"bf-cbc",
-		{
-			gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size,
-			bf_init, bf_cbc_encrypt, bf_cbc_decrypt, gen_evp_free
-		}
-	},
-	{
-		"bf-ecb",
-		{
-			gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size,
-			bf_init, bf_ecb_encrypt, bf_ecb_decrypt, gen_evp_free
-		}
-	},
-	{
-		"bf-cfb",
-		{
-			gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size,
-			bf_init, bf_cfb64_encrypt, bf_cfb64_decrypt, gen_evp_free
-		}
-	},
-	{
-		"bf-ofb",
-		{
-			gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size,
-			bf_init, bf_ofb64_encrypt, bf_ofb64_decrypt, gen_evp_free
-		}
-	},
-	{
-		NULL
-	}
-};
-
-/*
- * Generic EVP_* functions handler
- */
-static PX_Cipher gen_evp_handler = {
-	gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size,
-	gen_evp_init, gen_evp_encrypt, gen_evp_decrypt, gen_evp_free
-};
-
-static int	px_openssl_initialized = 0;
-
-/* ATM not needed
-static void *o_alloc(unsigned s) { return px_alloc(s); }
-static void *o_realloc(void *p) { return px_realloc(p); }
-static void o_free(void *p) { px_free(p); }
-*/
-
-/* PUBLIC functions */
-
-int
-px_find_digest(const char *name, PX_MD ** res)
-{
-	const EVP_MD *md;
-	EVP_MD_CTX *ctx;
-	PX_MD	   *h;
-
-	if (!px_openssl_initialized)
-	{
-		px_openssl_initialized = 1;
-		/* CRYPTO_set_mem_functions(o_alloc, o_realloc, o_free); */
-		OpenSSL_add_all_algorithms();
-	}
-
-	md = EVP_get_digestbyname(name);
-	if (md == NULL)
-		return -1;
-
-	ctx = px_alloc(sizeof(*ctx));
-	EVP_DigestInit(ctx, md);
-
-	h = px_alloc(sizeof(*h));
-	h->result_size = digest_result_size;
-	h->block_size = digest_block_size;
-	h->reset = digest_reset;
-	h->update = digest_update;
-	h->finish = digest_finish;
-	h->free = digest_free;
-	h->p.ptr = (void *) ctx;
-
-	*res = h;
-	return 0;
-}
-
-
-int
-px_find_cipher(const char *name, PX_Cipher ** res)
-{
-	unsigned	i;
-	PX_Cipher  *c = NULL,
-			   *csrc;
-	ossldata   *od;
-
-	const EVP_CIPHER *evp_c;
-
-	if (!px_openssl_initialized)
-	{
-		px_openssl_initialized = 1;
-		/* CRYPTO_set_mem_functions(o_alloc, o_realloc, o_free); */
-		OpenSSL_add_all_algorithms();
-	}
-
-	name = px_resolve_alias(ossl_aliases, name);
-	evp_c = EVP_get_cipherbyname(name);
-	if (evp_c == NULL)
-		return -1;
-
-	od = px_alloc(sizeof(*od));
-	memset(od, 0, sizeof(*od));
-	od->evp_ciph = evp_c;
-
-	csrc = NULL;
-
-	for (i = 0; spec_types[i].name; i++)
-		if (!strcmp(name, spec_types[i].name))
-		{
-			csrc = &spec_types[i].cf;
-			break;
-		}
-
-	if (csrc == NULL)
-		csrc = &gen_evp_handler;
-
-	c = px_alloc(sizeof(*c));
-	memcpy(c, csrc, sizeof(*c));
-	c->ptr = od;
-
-	*res = c;
-	return 0;
-}
diff --git a/contrib/pgcrypto/pgcrypto.c b/contrib/pgcrypto/pgcrypto.c
deleted file mode 100644
index d3dc36dc9a..0000000000
--- a/contrib/pgcrypto/pgcrypto.c
+++ /dev/null
@@ -1,568 +0,0 @@
-/*
- * pgcrypto.c
- *		Various cryptographic stuff for PostgreSQL.
- *
- * Copyright (c) 2001 Marko Kreen
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.	IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: pgcrypto.c,v 1.12 2001/12/30 23:09:41 tgl Exp $
- */
-
-#include <postgres.h>
-#include <fmgr.h>
-#include <ctype.h>
-
-#include "px.h"
-#include "px-crypt.h"
-#include "pgcrypto.h"
-
-/* private stuff */
-
-typedef int (*PFN) (const char *name, void **res);
-static void *
-			find_provider(text *name, PFN pf, char *desc, int silent);
-
-/* SQL function: hash(text, text) returns text */
-PG_FUNCTION_INFO_V1(pg_digest);
-
-Datum
-pg_digest(PG_FUNCTION_ARGS)
-{
-	bytea	   *arg;
-	text	   *name;
-	unsigned	len,
-				hlen;
-	PX_MD	   *md;
-	bytea	   *res;
-
-	if (PG_ARGISNULL(0) || PG_ARGISNULL(1))
-		PG_RETURN_NULL();
-
-	name = PG_GETARG_TEXT_P(1);
-
-	/* will give error if fails */
-	md = find_provider(name, (PFN) px_find_digest, "Digest", 0);
-
-	hlen = px_md_result_size(md);
-
-	res = (text *) palloc(hlen + VARHDRSZ);
-	VARATT_SIZEP(res) = hlen + VARHDRSZ;
-
-	arg = PG_GETARG_BYTEA_P(0);
-	len = VARSIZE(arg) - VARHDRSZ;
-
-	px_md_update(md, VARDATA(arg), len);
-	px_md_finish(md, VARDATA(res));
-	px_md_free(md);
-
-	PG_FREE_IF_COPY(arg, 0);
-	PG_FREE_IF_COPY(name, 1);
-
-	PG_RETURN_BYTEA_P(res);
-}
-
-/* check if given hash exists */
-PG_FUNCTION_INFO_V1(pg_digest_exists);
-
-Datum
-pg_digest_exists(PG_FUNCTION_ARGS)
-{
-	text	   *name;
-	PX_MD	   *res;
-
-	if (PG_ARGISNULL(0))
-		PG_RETURN_NULL();
-
-	name = PG_GETARG_TEXT_P(0);
-
-	res = find_provider(name, (PFN) px_find_digest, "Digest", 1);
-
-	PG_FREE_IF_COPY(name, 0);
-
-	if (res == NULL)
-		PG_RETURN_BOOL(false);
-
-	res->free(res);
-
-	PG_RETURN_BOOL(true);
-}
-
-/* SQL function: hmac(data:text, key:text, type:text) */
-PG_FUNCTION_INFO_V1(pg_hmac);
-
-Datum
-pg_hmac(PG_FUNCTION_ARGS)
-{
-	bytea	   *arg;
-	bytea	   *key;
-	text	   *name;
-	unsigned	len,
-				hlen,
-				klen;
-	PX_HMAC    *h;
-	bytea	   *res;
-
-	if (PG_ARGISNULL(0) || PG_ARGISNULL(1) || PG_ARGISNULL(2))
-		PG_RETURN_NULL();
-
-	name = PG_GETARG_TEXT_P(2);
-
-	/* will give error if fails */
-	h = find_provider(name, (PFN) px_find_hmac, "HMAC", 0);
-
-	hlen = px_hmac_result_size(h);
-
-	res = (text *) palloc(hlen + VARHDRSZ);
-	VARATT_SIZEP(res) = hlen + VARHDRSZ;
-
-	arg = PG_GETARG_BYTEA_P(0);
-	key = PG_GETARG_BYTEA_P(1);
-	len = VARSIZE(arg) - VARHDRSZ;
-	klen = VARSIZE(key) - VARHDRSZ;
-
-	px_hmac_init(h, VARDATA(key), klen);
-	px_hmac_update(h, VARDATA(arg), len);
-	px_hmac_finish(h, VARDATA(res));
-	px_hmac_free(h);
-
-	PG_FREE_IF_COPY(arg, 0);
-	PG_FREE_IF_COPY(key, 1);
-	PG_FREE_IF_COPY(name, 2);
-
-	PG_RETURN_BYTEA_P(res);
-}
-
-/* check if given hmac type exists */
-PG_FUNCTION_INFO_V1(pg_hmac_exists);
-
-Datum
-pg_hmac_exists(PG_FUNCTION_ARGS)
-{
-	text	   *name;
-	PX_HMAC    *h;
-
-	if (PG_ARGISNULL(0))
-		PG_RETURN_NULL();
-
-	name = PG_GETARG_TEXT_P(0);
-
-	h = find_provider(name, (PFN) px_find_hmac, "HMAC", 1);
-
-	PG_FREE_IF_COPY(name, 0);
-
-	if (h != NULL)
-	{
-		px_hmac_free(h);
-		PG_RETURN_BOOL(true);
-	}
-	PG_RETURN_BOOL(false);
-}
-
-
-/* SQL function: pg_gen_salt(text) returns text */
-PG_FUNCTION_INFO_V1(pg_gen_salt);
-
-Datum
-pg_gen_salt(PG_FUNCTION_ARGS)
-{
-	text	   *arg0;
-	unsigned	len;
-	text	   *res;
-	char		buf[PX_MAX_SALT_LEN + 1];
-
-	if (PG_ARGISNULL(0))
-		PG_RETURN_NULL();
-
-	arg0 = PG_GETARG_TEXT_P(0);
-
-	len = VARSIZE(arg0) - VARHDRSZ;
-	len = len > PX_MAX_SALT_LEN ? PX_MAX_SALT_LEN : len;
-	memcpy(buf, VARDATA(arg0), len);
-	buf[len] = 0;
-	len = px_gen_salt(buf, buf, 0);
-	if (len == 0)
-		elog(ERROR, "No such crypt algorithm");
-
-	res = (text *) palloc(len + VARHDRSZ);
-	VARATT_SIZEP(res) = len + VARHDRSZ;
-	memcpy(VARDATA(res), buf, len);
-
-	PG_FREE_IF_COPY(arg0, 0);
-
-	PG_RETURN_TEXT_P(res);
-}
-
-/* SQL function: pg_gen_salt(text, int4) returns text */
-PG_FUNCTION_INFO_V1(pg_gen_salt_rounds);
-
-Datum
-pg_gen_salt_rounds(PG_FUNCTION_ARGS)
-{
-	text	   *arg0;
-	int			rounds;
-	unsigned	len;
-	text	   *res;
-	char		buf[PX_MAX_SALT_LEN + 1];
-
-	if (PG_ARGISNULL(0) || PG_ARGISNULL(1))
-		PG_RETURN_NULL();
-
-	arg0 = PG_GETARG_TEXT_P(0);
-	rounds = PG_GETARG_INT32(1);
-
-	len = VARSIZE(arg0) - VARHDRSZ;
-	len = len > PX_MAX_SALT_LEN ? PX_MAX_SALT_LEN : len;
-	memcpy(buf, VARDATA(arg0), len);
-	buf[len] = 0;
-	len = px_gen_salt(buf, buf, rounds);
-	if (len == 0)
-		elog(ERROR, "No such crypt algorithm or bad number of rounds");
-
-	res = (text *) palloc(len + VARHDRSZ);
-	VARATT_SIZEP(res) = len + VARHDRSZ;
-	memcpy(VARDATA(res), buf, len);
-
-	PG_FREE_IF_COPY(arg0, 0);
-
-	PG_RETURN_TEXT_P(res);
-}
-
-/* SQL function: pg_crypt(psw:text, salt:text) returns text */
-PG_FUNCTION_INFO_V1(pg_crypt);
-
-Datum
-pg_crypt(PG_FUNCTION_ARGS)
-{
-	text	   *arg0;
-	text	   *arg1;
-	unsigned	len0,
-				len1,
-				clen;
-	char	   *buf0,
-			   *buf1,
-			   *cres,
-			   *resbuf;
-	text	   *res;
-
-	if (PG_ARGISNULL(0) || PG_ARGISNULL(1))
-		PG_RETURN_NULL();
-
-	arg0 = PG_GETARG_TEXT_P(0);
-	arg1 = PG_GETARG_TEXT_P(1);
-	len0 = VARSIZE(arg0) - VARHDRSZ;
-	len1 = VARSIZE(arg1) - VARHDRSZ;
-
-	buf0 = palloc(len0 + 1);
-	buf1 = palloc(len1 + 1);
-
-	memcpy(buf0, VARDATA(arg0), len0);
-	memcpy(buf1, VARDATA(arg1), len1);
-
-	buf0[len0] = '\0';
-	buf1[len1] = '\0';
-
-	resbuf = palloc(PX_MAX_CRYPT);
-
-	memset(resbuf, 0, PX_MAX_CRYPT);
-
-	cres = px_crypt(buf0, buf1, resbuf, PX_MAX_CRYPT);
-
-	pfree(buf0);
-	pfree(buf1);
-
-	if (cres == NULL)
-		elog(ERROR, "crypt(3) returned NULL");
-
-	clen = strlen(cres);
-
-	res = (text *) palloc(clen + VARHDRSZ);
-	VARATT_SIZEP(res) = clen + VARHDRSZ;
-	memcpy(VARDATA(res), cres, clen);
-	pfree(resbuf);
-
-	PG_FREE_IF_COPY(arg0, 0);
-	PG_FREE_IF_COPY(arg1, 1);
-
-	PG_RETURN_TEXT_P(res);
-}
-
-/* SQL function: pg_encrypt(text, text, text) returns text */
-PG_FUNCTION_INFO_V1(pg_encrypt);
-
-Datum
-pg_encrypt(PG_FUNCTION_ARGS)
-{
-	int			err;
-	bytea	   *data,
-			   *key,
-			   *res;
-	text	   *type;
-	PX_Combo   *c;
-	unsigned	dlen,
-				klen,
-				rlen;
-
-	if (PG_ARGISNULL(0) || PG_ARGISNULL(1) || PG_ARGISNULL(2))
-		PG_RETURN_NULL();
-
-	type = PG_GETARG_TEXT_P(2);
-	c = find_provider(type, (PFN) px_find_combo, "Cipher", 0);
-
-	data = PG_GETARG_BYTEA_P(0);
-	key = PG_GETARG_BYTEA_P(1);
-	dlen = VARSIZE(data) - VARHDRSZ;
-	klen = VARSIZE(key) - VARHDRSZ;
-
-	rlen = px_combo_encrypt_len(c, dlen);
-	res = palloc(VARHDRSZ + rlen);
-
-	err = px_combo_init(c, VARDATA(key), klen, NULL, 0);
-	if (!err)
-		err = px_combo_encrypt(c, VARDATA(data), dlen, VARDATA(res), &rlen);
-	px_combo_free(c);
-
-	PG_FREE_IF_COPY(data, 0);
-	PG_FREE_IF_COPY(key, 1);
-	PG_FREE_IF_COPY(type, 2);
-
-	if (err)
-	{
-		pfree(res);
-		elog(ERROR, "encrypt error: %d", err);
-	}
-
-	VARATT_SIZEP(res) = VARHDRSZ + rlen;
-	PG_RETURN_BYTEA_P(res);
-}
-
-/* SQL function: pg_decrypt(text, text, text) returns text */
-PG_FUNCTION_INFO_V1(pg_decrypt);
-
-Datum
-pg_decrypt(PG_FUNCTION_ARGS)
-{
-	int			err;
-	bytea	   *data,
-			   *key,
-			   *res;
-	text	   *type;
-	PX_Combo   *c;
-	unsigned	dlen,
-				klen,
-				rlen;
-
-	if (PG_ARGISNULL(0) || PG_ARGISNULL(1) || PG_ARGISNULL(2))
-		PG_RETURN_NULL();
-
-	type = PG_GETARG_TEXT_P(2);
-	c = find_provider(type, (PFN) px_find_combo, "Cipher", 0);
-
-	data = PG_GETARG_BYTEA_P(0);
-	key = PG_GETARG_BYTEA_P(1);
-	dlen = VARSIZE(data) - VARHDRSZ;
-	klen = VARSIZE(key) - VARHDRSZ;
-
-	rlen = px_combo_decrypt_len(c, dlen);
-	res = palloc(VARHDRSZ + rlen);
-
-	err = px_combo_init(c, VARDATA(key), klen, NULL, 0);
-	if (!err)
-		err = px_combo_decrypt(c, VARDATA(data), dlen, VARDATA(res), &rlen);
-
-	px_combo_free(c);
-
-	if (err)
-		elog(ERROR, "decrypt error: %d", err);
-
-	VARATT_SIZEP(res) = VARHDRSZ + rlen;
-
-	PG_FREE_IF_COPY(data, 0);
-	PG_FREE_IF_COPY(key, 1);
-	PG_FREE_IF_COPY(type, 2);
-
-	PG_RETURN_BYTEA_P(res);
-}
-
-/* SQL function: pg_encrypt(text, text, text) returns text */
-PG_FUNCTION_INFO_V1(pg_encrypt_iv);
-
-Datum
-pg_encrypt_iv(PG_FUNCTION_ARGS)
-{
-	int			err;
-	bytea	   *data,
-			   *key,
-			   *iv,
-			   *res;
-	text	   *type;
-	PX_Combo   *c;
-	unsigned	dlen,
-				klen,
-				ivlen,
-				rlen;
-
-	if (PG_ARGISNULL(0) || PG_ARGISNULL(1)
-		|| PG_ARGISNULL(2) || PG_ARGISNULL(3))
-		PG_RETURN_NULL();
-
-	type = PG_GETARG_TEXT_P(3);
-	c = find_provider(type, (PFN) px_find_combo, "Cipher", 0);
-
-	data = PG_GETARG_BYTEA_P(0);
-	key = PG_GETARG_BYTEA_P(1);
-	iv = PG_GETARG_BYTEA_P(2);
-	dlen = VARSIZE(data) - VARHDRSZ;
-	klen = VARSIZE(key) - VARHDRSZ;
-	ivlen = VARSIZE(iv) - VARHDRSZ;
-
-	rlen = px_combo_encrypt_len(c, dlen);
-	res = palloc(VARHDRSZ + rlen);
-
-	err = px_combo_init(c, VARDATA(key), klen, VARDATA(iv), ivlen);
-	if (!err)
-		px_combo_encrypt(c, VARDATA(data), dlen, VARDATA(res), &rlen);
-
-	px_combo_free(c);
-
-	if (err)
-		elog(ERROR, "encrypt_iv error: %d", err);
-
-	VARATT_SIZEP(res) = VARHDRSZ + rlen;
-
-	PG_FREE_IF_COPY(data, 0);
-	PG_FREE_IF_COPY(key, 1);
-	PG_FREE_IF_COPY(iv, 2);
-	PG_FREE_IF_COPY(type, 3);
-
-	PG_RETURN_BYTEA_P(res);
-}
-
-/* SQL function: pg_decrypt_iv(text, text, text) returns text */
-PG_FUNCTION_INFO_V1(pg_decrypt_iv);
-
-Datum
-pg_decrypt_iv(PG_FUNCTION_ARGS)
-{
-	int			err;
-	bytea	   *data,
-			   *key,
-			   *iv,
-			   *res;
-	text	   *type;
-	PX_Combo   *c;
-	unsigned	dlen,
-				klen,
-				rlen,
-				ivlen;
-
-	if (PG_ARGISNULL(0) || PG_ARGISNULL(1)
-		|| PG_ARGISNULL(2) || PG_ARGISNULL(3))
-		PG_RETURN_NULL();
-
-	type = PG_GETARG_TEXT_P(3);
-	c = find_provider(type, (PFN) px_find_combo, "Cipher", 0);
-
-	data = PG_GETARG_BYTEA_P(0);
-	key = PG_GETARG_BYTEA_P(1);
-	iv = PG_GETARG_BYTEA_P(2);
-	dlen = VARSIZE(data) - VARHDRSZ;
-	klen = VARSIZE(key) - VARHDRSZ;
-	ivlen = VARSIZE(iv) - VARHDRSZ;
-
-	rlen = px_combo_decrypt_len(c, dlen);
-	res = palloc(VARHDRSZ + rlen);
-
-	err = px_combo_init(c, VARDATA(key), klen, VARDATA(iv), ivlen);
-	if (!err)
-		px_combo_decrypt(c, VARDATA(data), dlen, VARDATA(res), &rlen);
-
-	px_combo_free(c);
-
-	if (err)
-		elog(ERROR, "decrypt_iv error: %d", err);
-
-	VARATT_SIZEP(res) = VARHDRSZ + rlen;
-
-	PG_FREE_IF_COPY(data, 0);
-	PG_FREE_IF_COPY(key, 1);
-	PG_FREE_IF_COPY(iv, 2);
-	PG_FREE_IF_COPY(type, 3);
-
-	PG_RETURN_BYTEA_P(res);
-}
-
-/* SQL function: pg_decrypt(text, text, text) returns text */
-PG_FUNCTION_INFO_V1(pg_cipher_exists);
-
-Datum
-pg_cipher_exists(PG_FUNCTION_ARGS)
-{
-	text	   *arg;
-	PX_Combo   *c;
-
-	if (PG_ARGISNULL(0))
-		PG_RETURN_NULL();
-
-	arg = PG_GETARG_TEXT_P(0);
-
-	c = find_provider(arg, (PFN) px_find_combo, "Cipher", 1);
-	if (c != NULL)
-		px_combo_free(c);
-
-	PG_RETURN_BOOL((c != NULL) ? true : false);
-}
-
-
-static void *
-find_provider(text *name,
-			  PFN provider_lookup,
-			  char *desc, int silent)
-{
-	void	   *res;
-	char		buf[PX_MAX_NAMELEN + 1],
-			   *p;
-	unsigned	len;
-	unsigned	i;
-	int			err;
-
-	len = VARSIZE(name) - VARHDRSZ;
-	if (len > PX_MAX_NAMELEN)
-	{
-		if (silent)
-			return NULL;
-		elog(ERROR, "%s type does not exist (name too long)", desc);
-	}
-
-	p = VARDATA(name);
-	for (i = 0; i < len; i++)
-		buf[i] = tolower((unsigned char) p[i]);
-	buf[len] = 0;
-
-	err = provider_lookup(buf, &res);
-
-	if (err && !silent)
-		elog(ERROR, "%s type does not exist: '%s'", desc, buf);
-
-	return err ? NULL : res;
-}
diff --git a/contrib/pgcrypto/pgcrypto.h b/contrib/pgcrypto/pgcrypto.h
deleted file mode 100644
index 0d8c1174f2..0000000000
--- a/contrib/pgcrypto/pgcrypto.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * pgcrypto.h
- *		Header file for pgcrypto.
- *
- * Copyright (c) 2000 Marko Kreen
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.	IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: pgcrypto.h,v 1.7 2001/10/28 06:25:41 momjian Exp $
- */
-
-#ifndef _PG_CRYPTO_H
-#define _PG_CRYPTO_H
-
-/* exported functions */
-Datum		pg_digest(PG_FUNCTION_ARGS);
-Datum		pg_digest_exists(PG_FUNCTION_ARGS);
-Datum		pg_hmac(PG_FUNCTION_ARGS);
-Datum		pg_hmac_exists(PG_FUNCTION_ARGS);
-Datum		pg_gen_salt(PG_FUNCTION_ARGS);
-Datum		pg_gen_salt_rounds(PG_FUNCTION_ARGS);
-Datum		pg_crypt(PG_FUNCTION_ARGS);
-Datum		pg_encrypt(PG_FUNCTION_ARGS);
-Datum		pg_decrypt(PG_FUNCTION_ARGS);
-Datum		pg_encrypt_iv(PG_FUNCTION_ARGS);
-Datum		pg_decrypt_iv(PG_FUNCTION_ARGS);
-Datum		pg_cipher_exists(PG_FUNCTION_ARGS);
-
-#endif
diff --git a/contrib/pgcrypto/pgcrypto.sql.in b/contrib/pgcrypto/pgcrypto.sql.in
deleted file mode 100644
index 3efb2ed969..0000000000
--- a/contrib/pgcrypto/pgcrypto.sql.in
+++ /dev/null
@@ -1,75 +0,0 @@
-
--- drop function digest(text, text);
--- drop function digest(bytea, text);
--- drop function digest_exists(text);
--- drop function hmac(text, text, text);
--- drop function hmac(bytea, bytea, text);
--- drop function hmac_exists(text);
--- drop function crypt(text, text);
--- drop function gen_salt(text);
--- drop function gen_salt(text, int4);
--- drop function encrypt(bytea, bytea, text);
--- drop function decrypt(bytea, bytea, text);
--- drop function encrypt_iv(bytea, bytea, bytea, text);
--- drop function decrypt_iv(bytea, bytea, bytea, text);
--- drop function cipher_exists(text);
-
-
-
-CREATE FUNCTION digest(text, text) RETURNS bytea
-  AS 'MODULE_PATHNAME',
-  'pg_digest' LANGUAGE 'C';
-
-CREATE FUNCTION digest(bytea, text) RETURNS bytea
-  AS 'MODULE_PATHNAME',
-  'pg_digest' LANGUAGE 'C';
-
-CREATE FUNCTION digest_exists(text) RETURNS bool
-  AS 'MODULE_PATHNAME',
-  'pg_digest_exists' LANGUAGE 'C';
-
-CREATE FUNCTION hmac(text, text, text) RETURNS bytea
-  AS 'MODULE_PATHNAME',
-  'pg_hmac' LANGUAGE 'C';
-
-CREATE FUNCTION hmac(bytea, bytea, text) RETURNS bytea
-  AS 'MODULE_PATHNAME',
-  'pg_hmac' LANGUAGE 'C';
-
-CREATE FUNCTION hmac_exists(text) RETURNS bool
-  AS 'MODULE_PATHNAME',
-  'pg_hmac_exists' LANGUAGE 'C';
-
-CREATE FUNCTION crypt(text, text) RETURNS text
-  AS 'MODULE_PATHNAME',
-  'pg_crypt' LANGUAGE 'C';
-
-CREATE FUNCTION gen_salt(text) RETURNS text
-  AS 'MODULE_PATHNAME',
-  'pg_gen_salt' LANGUAGE 'C';
-
-CREATE FUNCTION gen_salt(text, int4) RETURNS text
-  AS 'MODULE_PATHNAME',
-  'pg_gen_salt_rounds' LANGUAGE 'C';
-
-CREATE FUNCTION encrypt(bytea, bytea, text) RETURNS bytea
-  AS 'MODULE_PATHNAME',
-  'pg_encrypt' LANGUAGE 'C';
-
-CREATE FUNCTION decrypt(bytea, bytea, text) RETURNS bytea
-  AS 'MODULE_PATHNAME',
-  'pg_decrypt' LANGUAGE 'C';
-
-CREATE FUNCTION encrypt_iv(bytea, bytea, bytea, text) RETURNS bytea
-  AS 'MODULE_PATHNAME',
-  'pg_encrypt_iv' LANGUAGE 'C';
-
-CREATE FUNCTION decrypt_iv(bytea, bytea, bytea, text) RETURNS bytea
-  AS 'MODULE_PATHNAME',
-  'pg_decrypt_iv' LANGUAGE 'C';
-
-CREATE FUNCTION cipher_exists(text) RETURNS bool
-  AS 'MODULE_PATHNAME',
-  'pg_cipher_exists' LANGUAGE 'C';
-
-
diff --git a/contrib/pgcrypto/px-crypt.c b/contrib/pgcrypto/px-crypt.c
deleted file mode 100644
index 898fa8a5c7..0000000000
--- a/contrib/pgcrypto/px-crypt.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * px-crypt.c
- *		Wrapper for various crypt algorithms.
- *
- * Copyright (c) 2001 Marko Kreen
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.	IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: px-crypt.c,v 1.6 2001/11/20 18:54:07 momjian Exp $
- */
-
-#include <postgres.h>
-#include "px.h"
-#include "px-crypt.h"
-
-
-#ifndef PX_SYSTEM_CRYPT
-
-static char *
-run_crypt_des(const char *psw, const char *salt,
-			  char *buf, unsigned len)
-{
-	char	   *res;
-
-	res = px_crypt_des(psw, salt);
-	if (strlen(res) > len - 1)
-		return NULL;
-	strcpy(buf, res);
-	return buf;
-}
-
-static char *
-run_crypt_md5(const char *psw, const char *salt,
-			  char *buf, unsigned len)
-{
-	char	   *res;
-
-	res = px_crypt_md5(psw, salt, buf, len);
-	return res;
-}
-
-static char *
-run_crypt_bf(const char *psw, const char *salt,
-			 char *buf, unsigned len)
-{
-	char	   *res;
-
-	res = _crypt_blowfish_rn(psw, salt, buf, len);
-	return res;
-}
-
-static struct
-{
-	char	   *id;
-	unsigned	id_len;
-	char	   *(*crypt) (const char *psw, const char *salt,
-									  char *buf, unsigned len);
-}	px_crypt_list[] =
-
-{
-	{
-		"$2a$", 4, run_crypt_bf
-	},
-	{
-		"$2$", 3, NULL
-	},							/* N/A */
-	{
-		"$1$", 3, run_crypt_md5
-	},
-	{
-		"_", 1, run_crypt_des
-	},
-	{
-		"", 0, run_crypt_des
-	},
-	{
-		NULL, 0, NULL
-	}
-};
-
-char *
-px_crypt(const char *psw, const char *salt, char *buf, unsigned len)
-{
-	int			i;
-
-	for (i = 0; px_crypt_list[i].id; i++)
-	{
-		if (!px_crypt_list[i].id_len)
-			break;
-		if (!strncmp(salt, px_crypt_list[i].id, px_crypt_list[i].id_len))
-			break;
-	}
-
-	if (px_crypt_list[i].crypt == NULL)
-		return NULL;
-
-	return px_crypt_list[i].crypt(psw, salt, buf, len);
-}
-
-#else							/* PX_SYSTEM_CRYPT */
-
-extern char *crypt(const char *psw, const char *salt);
-
-char *
-px_crypt(const char *psw, const char *salt,
-		 char *buf, unsigned len)
-{
-	char	   *res;
-
-	res = crypt(psw, salt);
-	if (!res || strlen(res) >= len)
-		return NULL;
-	strcpy(buf, res);
-	return buf;
-}
-#endif
-
-/*
- * salt generators
- */
-
-struct generator
-{
-	char	   *name;
-	char	   *(*gen) (unsigned long count, const char *input, int size,
-									char *output, int output_size);
-	int			input_len;
-	int			def_rounds;
-	int			min_rounds;
-	int			max_rounds;
-};
-
-static struct generator gen_list[] = {
-	{"des", _crypt_gensalt_traditional_rn, 2, 0, 0, 0},
-	{"md5", _crypt_gensalt_md5_rn, 6, 0, 0, 0},
-	{"xdes", _crypt_gensalt_extended_rn, 3, PX_XDES_ROUNDS, 1, 0xFFFFFF},
-	{"bf", _crypt_gensalt_blowfish_rn, 16, PX_BF_ROUNDS, 4, 31},
-	{NULL, NULL, 0, 0, 0}
-};
-
-unsigned
-px_gen_salt(const char *salt_type, char *buf, int rounds)
-{
-	int			i,
-				res;
-	struct generator *g;
-	char	   *p;
-	char		rbuf[16];
-
-	for (i = 0; gen_list[i].name; i++)
-	{
-		g = &gen_list[i];
-		if (strcasecmp(g->name, salt_type) != 0)
-			continue;
-
-		if (g->def_rounds)
-		{
-			if (rounds == 0)
-				rounds = g->def_rounds;
-
-			if (rounds < g->min_rounds || rounds > g->max_rounds)
-				return 0;
-		}
-
-		res = px_get_random_bytes(rbuf, g->input_len);
-		if (res != g->input_len)
-			return 0;
-
-		p = g->gen(rounds, rbuf, g->input_len, buf, PX_MAX_SALT_LEN);
-		memset(rbuf, 0, sizeof(rbuf));
-
-		return p != NULL ? strlen(p) : 0;
-	}
-
-	return 0;
-}
diff --git a/contrib/pgcrypto/px-crypt.h b/contrib/pgcrypto/px-crypt.h
deleted file mode 100644
index 2c1bcbf4b6..0000000000
--- a/contrib/pgcrypto/px-crypt.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * px-crypt.h
- *		Header file for px_crypt().
- *
- * Copyright (c) 2001 Marko Kreen
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.	IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: px-crypt.h,v 1.5 2001/11/05 17:46:23 momjian Exp $
- */
-
-#ifndef _PX_CRYPT_H
-#define _PX_CRYPT_H
-
-/* max room for result */
-#define PX_MAX_CRYPT  128
-
-/* max salt returned by gen_salt() */
-#define PX_MAX_SALT_LEN		128
-
-/* default rounds for xdes salt */
-/* NetBSD bin/passwd/local_passwd.c has (29 * 25)*/
-#define PX_XDES_ROUNDS		(29 * 25)
-
-/* default for blowfish salt */
-#define PX_BF_ROUNDS		6
-
-/*
- * main interface
- */
-char	   *px_crypt(const char *psw, const char *salt, char *buf, unsigned buflen);
-unsigned	px_gen_salt(const char *salt_type, char *dst, int rounds);
-
-/*
- * internal functions
- */
-
-/* misc.c */
-extern void px_crypt_to64(char *s, unsigned long v, int n);
-extern char px_crypt_a64[];
-
-/* avoid conflicts with system libs */
-#define _crypt_to64 px_crypt_to64
-#define _crypt_a64 px_crypt_a64
-
-/* crypt-gensalt.c */
-char *_crypt_gensalt_traditional_rn(unsigned long count,
-			 const char *input, int size, char *output, int output_size);
-char *_crypt_gensalt_extended_rn(unsigned long count,
-			 const char *input, int size, char *output, int output_size);
-char *_crypt_gensalt_md5_rn(unsigned long count,
-			 const char *input, int size, char *output, int output_size);
-char *_crypt_gensalt_blowfish_rn(unsigned long count,
-			 const char *input, int size, char *output, int output_size);
-
-#ifndef PX_SYSTEM_CRYPT
-
-/* disable 'extended DES crypt' */
-/* #define DISABLE_XDES */
-
-/* crypt-blowfish.c */
-char *_crypt_blowfish_rn(const char *key, const char *setting,
-				   char *output, int size);
-
-/* crypt-des.c */
-char	   *px_crypt_des(const char *key, const char *setting);
-
-/* crypt-md5.c */
-char *px_crypt_md5(const char *pw, const char *salt,
-			 char *dst, unsigned dstlen);
-#endif   /* !PX_SYSTEM_CRYPT */
-
-#endif   /* _PX_CRYPT_H */
diff --git a/contrib/pgcrypto/px-hmac.c b/contrib/pgcrypto/px-hmac.c
deleted file mode 100644
index fd4eb441df..0000000000
--- a/contrib/pgcrypto/px-hmac.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * px-hmac.c
- *		HMAC implementation.
- *
- * Copyright (c) 2001 Marko Kreen
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.	IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: px-hmac.c,v 1.4 2001/11/20 18:54:07 momjian Exp $
- */
-
-
-#include <postgres.h>
-
-#include "px.h"
-
-#define HMAC_IPAD 0x36
-#define HMAC_OPAD 0x5C
-
-static unsigned
-hmac_result_size(PX_HMAC * h)
-{
-	return px_md_result_size(h->md);
-}
-
-static unsigned
-hmac_block_size(PX_HMAC * h)
-{
-	return px_md_block_size(h->md);
-}
-
-static void
-hmac_init(PX_HMAC * h, const uint8 *key, unsigned klen)
-{
-	unsigned	bs,
-				hlen,
-				i;
-	uint8	   *keybuf;
-	PX_MD	   *md = h->md;
-
-	bs = px_md_block_size(md);
-	hlen = px_md_result_size(md);
-	keybuf = px_alloc(bs);
-	memset(keybuf, 0, bs);
-
-	if (klen > bs)
-	{
-		px_md_update(md, key, klen);
-		px_md_finish(md, keybuf);
-		px_md_reset(md);
-	}
-	else
-		memcpy(keybuf, key, klen);
-
-	for (i = 0; i < bs; i++)
-	{
-		h->p.ipad[i] = keybuf[i] ^ HMAC_IPAD;
-		h->p.opad[i] = keybuf[i] ^ HMAC_OPAD;
-	}
-
-	memset(keybuf, 0, bs);
-	px_free(keybuf);
-
-	px_md_update(md, h->p.ipad, bs);
-}
-
-static void
-hmac_reset(PX_HMAC * h)
-{
-	PX_MD	   *md = h->md;
-	unsigned	bs = px_md_block_size(md);
-
-	px_md_reset(md);
-	px_md_update(md, h->p.ipad, bs);
-}
-
-static void
-hmac_update(PX_HMAC * h, const uint8 *data, unsigned dlen)
-{
-	px_md_update(h->md, data, dlen);
-}
-
-static void
-hmac_finish(PX_HMAC * h, uint8 *dst)
-{
-	PX_MD	   *md = h->md;
-	unsigned	bs,
-				hlen;
-	uint8	   *buf;
-
-	bs = px_md_block_size(md);
-	hlen = px_md_result_size(md);
-
-	buf = px_alloc(hlen);
-
-	px_md_finish(md, buf);
-
-	px_md_reset(md);
-	px_md_update(md, h->p.opad, bs);
-	px_md_update(md, buf, hlen);
-	px_md_finish(md, dst);
-
-	memset(buf, 0, hlen);
-	px_free(buf);
-}
-
-static void
-hmac_free(PX_HMAC * h)
-{
-	unsigned	bs;
-
-	bs = px_md_block_size(h->md);
-	px_md_free(h->md);
-
-	memset(h->p.ipad, 0, bs);
-	memset(h->p.opad, 0, bs);
-	px_free(h->p.ipad);
-	px_free(h->p.opad);
-	px_free(h);
-}
-
-
-/* PUBLIC FUNCTIONS */
-
-int
-px_find_hmac(const char *name, PX_HMAC ** res)
-{
-	int			err;
-	PX_MD	   *md;
-	PX_HMAC    *h;
-	unsigned	bs;
-
-	err = px_find_digest(name, &md);
-	if (err)
-		return err;
-
-	bs = px_md_block_size(md);
-	if (bs < 2)
-	{
-		px_md_free(md);
-		return -1;
-	}
-
-	h = px_alloc(sizeof(*h));
-	h->p.ipad = px_alloc(bs);
-	h->p.opad = px_alloc(bs);
-	h->md = md;
-
-	h->result_size = hmac_result_size;
-	h->block_size = hmac_block_size;
-	h->reset = hmac_reset;
-	h->update = hmac_update;
-	h->finish = hmac_finish;
-	h->free = hmac_free;
-	h->init = hmac_init;
-
-	*res = h;
-
-	return 0;
-}
diff --git a/contrib/pgcrypto/px.c b/contrib/pgcrypto/px.c
deleted file mode 100644
index ed7e330edc..0000000000
--- a/contrib/pgcrypto/px.c
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * px.c
- *		Various cryptographic stuff for PostgreSQL.
- *
- * Copyright (c) 2001 Marko Kreen
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.	IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: px.c,v 1.7 2002/03/06 06:09:10 momjian Exp $
- */
-
-#include <postgres.h>
-
-#include "px.h"
-
-
-const char *
-px_resolve_alias(const PX_Alias * list, const char *name)
-{
-	while (list->name)
-	{
-		if (!strcasecmp(list->alias, name))
-			return list->name;
-		list++;
-	}
-	return name;
-}
-
-/*
- * combo - cipher + padding (+ checksum)
- */
-
-static unsigned
-combo_encrypt_len(PX_Combo * cx, unsigned dlen)
-{
-	return dlen + 512;
-}
-
-static unsigned
-combo_decrypt_len(PX_Combo * cx, unsigned dlen)
-{
-	return dlen;
-}
-
-static int
-combo_init(PX_Combo * cx, const uint8 *key, unsigned klen,
-		   const uint8 *iv, unsigned ivlen)
-{
-	int			err;
-	unsigned	bs,
-				ks,
-				ivs;
-	PX_Cipher  *c = cx->cipher;
-	uint8	   *ivbuf = NULL;
-	uint8	   *keybuf;
-
-	bs = px_cipher_block_size(c);
-	ks = px_cipher_key_size(c);
-
-	ivs = px_cipher_iv_size(c);
-	if (ivs > 0)
-	{
-		ivbuf = px_alloc(ivs);
-		memset(ivbuf, 0, ivs);
-		if (ivlen > ivs)
-			memcpy(ivbuf, iv, ivs);
-		else
-			memcpy(ivbuf, iv, ivlen);
-	}
-
-	if (klen > ks)
-		klen = ks;
-	keybuf = px_alloc(ks);
-	memset(keybuf, 0, ks);
-	memcpy(keybuf, key, klen);
-
-	err = px_cipher_init(c, keybuf, klen, ivbuf);
-
-	if (ivbuf)
-		px_free(ivbuf);
-	px_free(keybuf);
-
-	return err;
-}
-
-static int
-combo_encrypt(PX_Combo * cx, const uint8 *data, unsigned dlen,
-			  uint8 *res, unsigned *rlen)
-{
-	int			err = 0;
-	uint8	   *bbuf;
-	unsigned	bs,
-				maxlen,
-				bpos,
-				i,
-				pad;
-
-	PX_Cipher  *c = cx->cipher;
-
-	bbuf = NULL;
-	maxlen = *rlen;
-	bs = px_cipher_block_size(c);
-
-	/* encrypt */
-	if (bs > 1)
-	{
-		bbuf = px_alloc(bs * 4);
-		bpos = dlen % bs;
-		*rlen = dlen - bpos;
-		memcpy(bbuf, data + *rlen, bpos);
-
-		/* encrypt full-block data */
-		if (*rlen)
-		{
-			err = px_cipher_encrypt(c, data, *rlen, res);
-			if (err)
-				goto out;
-		}
-
-		/* bbuf has now bpos bytes of stuff */
-		if (cx->padding)
-		{
-			pad = bs - (bpos % bs);
-			for (i = 0; i < pad; i++)
-				bbuf[bpos++] = pad;
-		}
-		else if (bpos % bs)
-		{
-			/* ERROR? */
-			pad = bs - (bpos % bs);
-			for (i = 0; i < pad; i++)
-				bbuf[bpos++] = 0;
-		}
-
-		/* encrypt the rest - pad */
-		if (bpos)
-		{
-			err = px_cipher_encrypt(c, bbuf, bpos, res + *rlen);
-			*rlen += bpos;
-		}
-	}
-	else
-	{
-		/* stream cipher/mode - no pad needed */
-		err = px_cipher_encrypt(c, data, dlen, res);
-		if (err)
-			goto out;
-		*rlen = dlen;
-	}
-out:
-	if (bbuf)
-		px_free(bbuf);
-
-	return err;
-}
-
-static int
-combo_decrypt(PX_Combo * cx, const uint8 *data, unsigned dlen,
-			  uint8 *res, unsigned *rlen)
-{
-	unsigned	bs,
-				i,
-				pad;
-	unsigned	pad_ok;
-
-	PX_Cipher  *c = cx->cipher;
-
-	bs = px_cipher_block_size(c);
-	if (bs > 1 && (dlen % bs) != 0)
-		goto block_error;
-
-	/* decrypt */
-	*rlen = dlen;
-	px_cipher_decrypt(c, data, dlen, res);
-
-	/* unpad */
-	if (bs > 1 && cx->padding)
-	{
-		pad = res[*rlen - 1];
-		pad_ok = 0;
-		if (pad > 0 && pad <= bs && pad <= *rlen)
-		{
-			pad_ok = 1;
-			for (i = *rlen - pad; i < *rlen; i++)
-				if (res[i] != pad)
-				{
-					pad_ok = 0;
-					break;
-				}
-		}
-
-		if (pad_ok)
-			*rlen -= pad;
-	}
-
-	return 0;
-
-	/* error reporting should be done in pgcrypto.c */
-block_error:
-	elog(WARNING, "Data not a multiple of block size");
-	return -1;
-}
-
-static void
-combo_free(PX_Combo * cx)
-{
-	if (cx->cipher)
-		px_cipher_free(cx->cipher);
-	memset(cx, 0, sizeof(*cx));
-	px_free(cx);
-}
-
-/* PARSER */
-
-static int
-parse_cipher_name(char *full, char **cipher, char **pad)
-{
-	char	   *p,
-			   *p2,
-			   *q;
-
-	*cipher = full;
-	*pad = NULL;
-
-	p = strchr(full, '/');
-	if (p != NULL)
-		*p++ = 0;
-	while (p != NULL)
-	{
-		if ((q = strchr(p, '/')) != NULL)
-			*q++ = 0;
-
-		if (!*p)
-		{
-			p = q;
-			continue;
-		}
-		p2 = strchr(p, ':');
-		if (p2 != NULL)
-		{
-			*p2++ = 0;
-			if (!strcmp(p, "pad"))
-				*pad = p2;
-			else
-				return -1;
-		}
-		else
-			return -1;
-
-		p = q;
-	}
-	return 0;
-}
-
-/* provider */
-
-int
-px_find_combo(const char *name, PX_Combo ** res)
-{
-	int			err;
-	char	   *buf,
-			   *s_cipher,
-			   *s_pad;
-
-	PX_Combo   *cx;
-
-	cx = px_alloc(sizeof(*cx));
-	memset(cx, 0, sizeof(*cx));
-
-	buf = px_alloc(strlen(name) + 1);
-	strcpy(buf, name);
-
-	err = parse_cipher_name(buf, &s_cipher, &s_pad);
-	if (err)
-	{
-		px_free(buf);
-		px_free(cx);
-		return err;
-	}
-
-	err = px_find_cipher(s_cipher, &cx->cipher);
-	if (err)
-		goto err1;
-
-	if (s_pad != NULL)
-	{
-		if (!strcmp(s_pad, "pkcs"))
-			cx->padding = 1;
-		else if (!strcmp(s_pad, "none"))
-			cx->padding = 0;
-		else
-			goto err1;
-	}
-	else
-		cx->padding = 1;
-
-	cx->init = combo_init;
-	cx->encrypt = combo_encrypt;
-	cx->decrypt = combo_decrypt;
-	cx->encrypt_len = combo_encrypt_len;
-	cx->decrypt_len = combo_decrypt_len;
-	cx->free = combo_free;
-
-	px_free(buf);
-
-	*res = cx;
-
-	return 0;
-
-err1:
-	if (cx->cipher)
-		px_cipher_free(cx->cipher);
-	px_free(cx);
-	px_free(buf);
-	return -1;
-}
diff --git a/contrib/pgcrypto/px.h b/contrib/pgcrypto/px.h
deleted file mode 100644
index e000883d39..0000000000
--- a/contrib/pgcrypto/px.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * px.h
- *		Header file for pgcrypto.
- *
- * Copyright (c) 2001 Marko Kreen
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.	IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: px.h,v 1.7 2001/11/30 17:39:20 momjian Exp $
- */
-
-#ifndef __PX_H
-#define __PX_H
-
-#include <sys/types.h>
-#ifdef HAVE_ENDIAN_H
-#include <endian.h>
-#endif
-
-#ifndef BYTE_ORDER
-#error BYTE_ORDER must be defined as LITTLE_ENDIAN or BIG_ENDIAN
-#endif
-
-
-#if 1
-
-#define px_alloc(s) palloc(s)
-#define px_realloc(p, s) prealloc(p, s)
-#define px_free(p)	pfree(p)
-
-#else
-
-void	   *xalloc(size_t s);
-void	   *xrealloc(void *p, size_t s);
-void		xfree(void *p);
-
-#define px_alloc(s) xalloc(s)
-#define px_realloc(p, s) xrealloc(p, s)
-#define px_free(p)	xfree(p)
-#endif
-
-/* max len of 'type' parms */
-#define PX_MAX_NAMELEN		128
-
-/* max salt returned */
-#define PX_MAX_SALT_LEN		128
-
-
-typedef struct px_digest PX_MD;
-typedef struct px_alias PX_Alias;
-typedef struct px_hmac PX_HMAC;
-typedef struct px_cipher PX_Cipher;
-typedef struct px_combo PX_Combo;
-
-struct px_digest
-{
-	unsigned	(*result_size) (PX_MD * h);
-	unsigned	(*block_size) (PX_MD * h);
-	void		(*reset) (PX_MD * h);
-	void		(*update) (PX_MD * h, const uint8 *data, unsigned dlen);
-	void		(*finish) (PX_MD * h, uint8 *dst);
-	void		(*free) (PX_MD * h);
-	/* private */
-	union
-	{
-		unsigned	code;
-		const void *ptr;
-	}			p;
-};
-
-struct px_alias
-{
-	char	   *alias;
-	char	   *name;
-};
-
-struct px_hmac
-{
-	unsigned	(*result_size) (PX_HMAC * h);
-	unsigned	(*block_size) (PX_HMAC * h);
-	void		(*reset) (PX_HMAC * h);
-	void		(*update) (PX_HMAC * h, const uint8 *data, unsigned dlen);
-	void		(*finish) (PX_HMAC * h, uint8 *dst);
-	void		(*free) (PX_HMAC * h);
-	void		(*init) (PX_HMAC * h, const uint8 *key, unsigned klen);
-
-	PX_MD	   *md;
-	/* private */
-	struct
-	{
-		uint8	   *ipad;
-		uint8	   *opad;
-	}			p;
-};
-
-struct px_cipher
-{
-	unsigned	(*block_size) (PX_Cipher * c);
-	unsigned	(*key_size) (PX_Cipher * c);	/* max key len */
-	unsigned	(*iv_size) (PX_Cipher * c);
-
-	int			(*init) (PX_Cipher * c, const uint8 *key, unsigned klen, const uint8 *iv);
-	int			(*encrypt) (PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res);
-	int			(*decrypt) (PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res);
-	void		(*free) (PX_Cipher * c);
-	/* private */
-	void	   *ptr;
-	int			pstat;			/* mcrypt uses it */
-};
-
-struct px_combo
-{
-	int			(*init) (PX_Combo * cx, const uint8 *key, unsigned klen,
-									 const uint8 *iv, unsigned ivlen);
-	int			(*encrypt) (PX_Combo * cx, const uint8 *data, unsigned dlen,
-										uint8 *res, unsigned *rlen);
-	int			(*decrypt) (PX_Combo * cx, const uint8 *data, unsigned dlen,
-										uint8 *res, unsigned *rlen);
-	unsigned	(*encrypt_len) (PX_Combo * cx, unsigned dlen);
-	unsigned	(*decrypt_len) (PX_Combo * cx, unsigned dlen);
-	void		(*free) (PX_Combo * cx);
-
-	PX_Cipher  *cipher;
-	unsigned	padding;
-};
-
-int			px_find_digest(const char *name, PX_MD ** res);
-int			px_find_hmac(const char *name, PX_HMAC ** res);
-int			px_find_cipher(const char *name, PX_Cipher ** res);
-int			px_find_combo(const char *name, PX_Combo ** res);
-
-int			px_get_random_bytes(uint8 *dst, unsigned count);
-
-const char *px_resolve_alias(const PX_Alias * aliases, const char *name);
-
-#define px_md_result_size(md)		(md)->result_size(md)
-#define px_md_block_size(md)		(md)->block_size(md)
-#define px_md_reset(md)			(md)->reset(md)
-#define px_md_update(md, data, dlen)	(md)->update(md, data, dlen)
-#define px_md_finish(md, buf)		(md)->finish(md, buf)
-#define px_md_free(md)			(md)->free(md)
-
-#define px_hmac_result_size(hmac)	(hmac)->result_size(hmac)
-#define px_hmac_block_size(hmac)	(hmac)->block_size(hmac)
-#define px_hmac_reset(hmac)		(hmac)->reset(hmac)
-#define px_hmac_init(hmac, key, klen)	(hmac)->init(hmac, key, klen)
-#define px_hmac_update(hmac, data, dlen) (hmac)->update(hmac, data, dlen)
-#define px_hmac_finish(hmac, buf)	(hmac)->finish(hmac, buf)
-#define px_hmac_free(hmac)		(hmac)->free(hmac)
-
-
-#define px_cipher_key_size(c)		(c)->key_size(c)
-#define px_cipher_block_size(c)		(c)->block_size(c)
-#define px_cipher_iv_size(c)		(c)->iv_size(c)
-#define px_cipher_init(c, k, klen, iv)	(c)->init(c, k, klen, iv)
-#define px_cipher_encrypt(c, data, dlen, res) \
-					(c)->encrypt(c, data, dlen, res)
-#define px_cipher_decrypt(c, data, dlen, res) \
-					(c)->decrypt(c, data, dlen, res)
-#define px_cipher_free(c)		(c)->free(c)
-
-
-#define px_combo_encrypt_len(c, dlen)	(c)->encrypt_len(c, dlen)
-#define px_combo_decrypt_len(c, dlen)	(c)->decrypt_len(c, dlen)
-#define px_combo_init(c, key, klen, iv, ivlen) \
-					(c)->init(c, key, klen, iv, ivlen)
-#define px_combo_encrypt(c, data, dlen, res, rlen) \
-					(c)->encrypt(c, data, dlen, res, rlen)
-#define px_combo_decrypt(c, data, dlen, res, rlen) \
-					(c)->decrypt(c, data, dlen, res, rlen)
-#define px_combo_free(c)		(c)->free(c)
-
-#endif   /* __PX_H */
diff --git a/contrib/pgcrypto/random.c b/contrib/pgcrypto/random.c
deleted file mode 100644
index ce5f838a0c..0000000000
--- a/contrib/pgcrypto/random.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * random.c
- *		Random functions.
- *
- * Copyright (c) 2001 Marko Kreen
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.	IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: random.c,v 1.5 2001/11/05 17:46:23 momjian Exp $
- */
-
-
-#include <postgres.h>
-
-#include "px.h"
-
-
-#ifdef RAND_DEV
-
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-static int
-safe_read(int fd, void *buf, size_t count)
-{
-	int			done = 0;
-	char	   *p = buf;
-	int			res;
-
-	while (count)
-	{
-		res = read(fd, p, count);
-		if (res <= 0)
-		{
-			if (errno == EINTR)
-				continue;
-			return -1;
-		}
-		p += res;
-		done += res;
-		count -= res;
-	}
-	return done;
-}
-
-int
-px_get_random_bytes(uint8 *dst, unsigned count)
-{
-	int			fd;
-	int			res;
-
-	fd = open(RAND_DEV, O_RDONLY);
-	if (fd == -1)
-		return -1;
-	res = safe_read(fd, dst, count);
-	close(fd);
-	return res;
-}
-#endif   /* RAND_DEV */
-
-#ifdef RAND_SILLY
-
-int
-px_get_random_bytes(uint8 *dst, unsigned count)
-{
-	int			i;
-
-	for (i = 0; i < count; i++)
-		*dst++ = random();
-	return i;
-}
-#endif   /* RAND_SILLY */
-
-#ifdef RAND_OPENSSL
-
-#include <openssl/evp.h>
-#include <openssl/blowfish.h>
-#include <openssl/rand.h>
-#include <openssl/err.h>
-
-static int	openssl_random_init = 0;
-
-int
-px_get_random_bytes(uint8 *dst, unsigned count)
-{
-	int			res;
-
-	if (!openssl_random_init)
-	{
-		if (RAND_get_rand_method() == NULL)
-			RAND_set_rand_method(RAND_SSLeay());
-		openssl_random_init = 1;
-	}
-
-	/*
-	 * OpenSSL random should re-feeded occasionally. From /dev/urandom
-	 * preferrably.
-	 */
-
-	res = RAND_bytes(dst, count);
-	if (res > 0)
-		return count;
-
-	return -1;
-}
-
-#endif   /* RAND_OPENSSL */
diff --git a/contrib/pgcrypto/rijndael.c b/contrib/pgcrypto/rijndael.c
deleted file mode 100644
index fd4572a8e9..0000000000
--- a/contrib/pgcrypto/rijndael.c
+++ /dev/null
@@ -1,669 +0,0 @@
-/*	$OpenBSD: rijndael.c,v 1.6 2000/12/09 18:51:34 markus Exp $ */
-
-/* This is an independent implementation of the encryption algorithm:	*/
-/*																		*/
-/*		   RIJNDAEL by Joan Daemen and Vincent Rijmen					*/
-/*																		*/
-/* which is a candidate algorithm in the Advanced Encryption Standard	*/
-/* programme of the US National Institute of Standards and Technology.	*/
-/*																		*/
-/* Copyright in this implementation is held by Dr B R Gladman but I		*/
-/* hereby give permission for its free direct or derivative use subject */
-/* to acknowledgment of its origin and compliance with any conditions	*/
-/* that the originators of the algorithm place on its exploitation.		*/
-/*																		*/
-/* Dr Brian Gladman (gladman@seven77.demon.co.uk) 14th January 1999		*/
-
-/* Timing data for Rijndael (rijndael.c)
-
-Algorithm: rijndael (rijndael.c)
-
-128 bit key:
-Key Setup:	  305/1389 cycles (encrypt/decrypt)
-Encrypt:	   374 cycles =    68.4 mbits/sec
-Decrypt:	   352 cycles =    72.7 mbits/sec
-Mean:		   363 cycles =    70.5 mbits/sec
-
-192 bit key:
-Key Setup:	  277/1595 cycles (encrypt/decrypt)
-Encrypt:	   439 cycles =    58.3 mbits/sec
-Decrypt:	   425 cycles =    60.2 mbits/sec
-Mean:		   432 cycles =    59.3 mbits/sec
-
-256 bit key:
-Key Setup:	  374/1960 cycles (encrypt/decrypt)
-Encrypt:	   502 cycles =    51.0 mbits/sec
-Decrypt:	   498 cycles =    51.4 mbits/sec
-Mean:		   500 cycles =    51.2 mbits/sec
-
-*/
-
-#include <postgres.h>
-#include "px.h"
-
-#include "rijndael.h"
-
-#define PRE_CALC_TABLES
-#define LARGE_TABLES
-
-static void gen_tabs(void);
-
-/* 3. Basic macros for speeding up generic operations				*/
-
-/* Circular rotate of 32 bit values									*/
-
-#define rotr(x,n)	(((x) >> ((int)(n))) | ((x) << (32 - (int)(n))))
-#define rotl(x,n)	(((x) << ((int)(n))) | ((x) >> (32 - (int)(n))))
-
-/* Invert byte order in a 32 bit variable							*/
-
-#define bswap(x)	((rotl(x, 8) & 0x00ff00ff) | (rotr(x, 8) & 0xff00ff00))
-
-/* Extract byte from a 32 bit quantity (little endian notation)		*/
-
-#define byte(x,n)	((u1byte)((x) >> (8 * n)))
-
-#if BYTE_ORDER != LITTLE_ENDIAN
-#define BYTE_SWAP
-#endif
-
-#ifdef	BYTE_SWAP
-#define io_swap(x)	bswap(x)
-#else
-#define io_swap(x)	(x)
-#endif
-
-#ifdef PRINT_TABS
-#undef PRE_CALC_TABLES
-#endif
-
-#ifdef PRE_CALC_TABLES
-
-#include "rijndael.tbl"
-#define tab_gen		1
-
-#else							/* !PRE_CALC_TABLES */
-
-static u1byte pow_tab[256];
-static u1byte log_tab[256];
-static u1byte sbx_tab[256];
-static u1byte isb_tab[256];
-static u4byte rco_tab[10];
-static u4byte ft_tab[4][256];
-static u4byte it_tab[4][256];
-
-#ifdef	LARGE_TABLES
-static u4byte fl_tab[4][256];
-static u4byte il_tab[4][256];
-#endif
-
-static u4byte tab_gen = 0;
-#endif   /* !PRE_CALC_TABLES */
-
-#define ff_mult(a,b)	(a && b ? pow_tab[(log_tab[a] + log_tab[b]) % 255] : 0)
-
-#define f_rn(bo, bi, n, k)							\
-	bo[n] =  ft_tab[0][byte(bi[n],0)] ^				\
-			 ft_tab[1][byte(bi[(n + 1) & 3],1)] ^	\
-			 ft_tab[2][byte(bi[(n + 2) & 3],2)] ^	\
-			 ft_tab[3][byte(bi[(n + 3) & 3],3)] ^ *(k + n)
-
-#define i_rn(bo, bi, n, k)							\
-	bo[n] =  it_tab[0][byte(bi[n],0)] ^				\
-			 it_tab[1][byte(bi[(n + 3) & 3],1)] ^	\
-			 it_tab[2][byte(bi[(n + 2) & 3],2)] ^	\
-			 it_tab[3][byte(bi[(n + 1) & 3],3)] ^ *(k + n)
-
-#ifdef LARGE_TABLES
-
-#define ls_box(x)				 \
-	( fl_tab[0][byte(x, 0)] ^	 \
-	  fl_tab[1][byte(x, 1)] ^	 \
-	  fl_tab[2][byte(x, 2)] ^	 \
-	  fl_tab[3][byte(x, 3)] )
-
-#define f_rl(bo, bi, n, k)							\
-	bo[n] =  fl_tab[0][byte(bi[n],0)] ^				\
-			 fl_tab[1][byte(bi[(n + 1) & 3],1)] ^	\
-			 fl_tab[2][byte(bi[(n + 2) & 3],2)] ^	\
-			 fl_tab[3][byte(bi[(n + 3) & 3],3)] ^ *(k + n)
-
-#define i_rl(bo, bi, n, k)							\
-	bo[n] =  il_tab[0][byte(bi[n],0)] ^				\
-			 il_tab[1][byte(bi[(n + 3) & 3],1)] ^	\
-			 il_tab[2][byte(bi[(n + 2) & 3],2)] ^	\
-			 il_tab[3][byte(bi[(n + 1) & 3],3)] ^ *(k + n)
-
-#else
-
-#define ls_box(x)							 \
-	((u4byte)sbx_tab[byte(x, 0)] <<  0) ^	 \
-	((u4byte)sbx_tab[byte(x, 1)] <<  8) ^	 \
-	((u4byte)sbx_tab[byte(x, 2)] << 16) ^	 \
-	((u4byte)sbx_tab[byte(x, 3)] << 24)
-
-#define f_rl(bo, bi, n, k)										\
-	bo[n] = (u4byte)sbx_tab[byte(bi[n],0)] ^					\
-		rotl(((u4byte)sbx_tab[byte(bi[(n + 1) & 3],1)]),  8) ^	\
-		rotl(((u4byte)sbx_tab[byte(bi[(n + 2) & 3],2)]), 16) ^	\
-		rotl(((u4byte)sbx_tab[byte(bi[(n + 3) & 3],3)]), 24) ^ *(k + n)
-
-#define i_rl(bo, bi, n, k)										\
-	bo[n] = (u4byte)isb_tab[byte(bi[n],0)] ^					\
-		rotl(((u4byte)isb_tab[byte(bi[(n + 3) & 3],1)]),  8) ^	\
-		rotl(((u4byte)isb_tab[byte(bi[(n + 2) & 3],2)]), 16) ^	\
-		rotl(((u4byte)isb_tab[byte(bi[(n + 1) & 3],3)]), 24) ^ *(k + n)
-#endif
-
-static void
-gen_tabs(void)
-{
-#ifndef PRE_CALC_TABLES
-	u4byte		i,
-				t;
-	u1byte		p,
-				q;
-
-	/* log and power tables for GF(2**8) finite field with	*/
-	/* 0x11b as modular polynomial - the simplest prmitive	*/
-	/* root is 0x11, used here to generate the tables		*/
-
-	for (i = 0, p = 1; i < 256; ++i)
-	{
-		pow_tab[i] = (u1byte) p;
-		log_tab[p] = (u1byte) i;
-
-		p = p ^ (p << 1) ^ (p & 0x80 ? 0x01b : 0);
-	}
-
-	log_tab[1] = 0;
-	p = 1;
-
-	for (i = 0; i < 10; ++i)
-	{
-		rco_tab[i] = p;
-
-		p = (p << 1) ^ (p & 0x80 ? 0x1b : 0);
-	}
-
-	/* note that the affine byte transformation matrix in	*/
-	/* rijndael specification is in big endian format with	*/
-	/* bit 0 as the most significant bit. In the remainder	*/
-	/* of the specification the bits are numbered from the	*/
-	/* least significant end of a byte.						*/
-
-	for (i = 0; i < 256; ++i)
-	{
-		p = (i ? pow_tab[255 - log_tab[i]] : 0);
-		q = p;
-		q = (q >> 7) | (q << 1);
-		p ^= q;
-		q = (q >> 7) | (q << 1);
-		p ^= q;
-		q = (q >> 7) | (q << 1);
-		p ^= q;
-		q = (q >> 7) | (q << 1);
-		p ^= q ^ 0x63;
-		sbx_tab[i] = (u1byte) p;
-		isb_tab[p] = (u1byte) i;
-	}
-
-	for (i = 0; i < 256; ++i)
-	{
-		p = sbx_tab[i];
-
-#ifdef	LARGE_TABLES
-
-		t = p;
-		fl_tab[0][i] = t;
-		fl_tab[1][i] = rotl(t, 8);
-		fl_tab[2][i] = rotl(t, 16);
-		fl_tab[3][i] = rotl(t, 24);
-#endif
-		t = ((u4byte) ff_mult(2, p)) |
-			((u4byte) p << 8) |
-			((u4byte) p << 16) |
-			((u4byte) ff_mult(3, p) << 24);
-
-		ft_tab[0][i] = t;
-		ft_tab[1][i] = rotl(t, 8);
-		ft_tab[2][i] = rotl(t, 16);
-		ft_tab[3][i] = rotl(t, 24);
-
-		p = isb_tab[i];
-
-#ifdef	LARGE_TABLES
-
-		t = p;
-		il_tab[0][i] = t;
-		il_tab[1][i] = rotl(t, 8);
-		il_tab[2][i] = rotl(t, 16);
-		il_tab[3][i] = rotl(t, 24);
-#endif
-		t = ((u4byte) ff_mult(14, p)) |
-			((u4byte) ff_mult(9, p) << 8) |
-			((u4byte) ff_mult(13, p) << 16) |
-			((u4byte) ff_mult(11, p) << 24);
-
-		it_tab[0][i] = t;
-		it_tab[1][i] = rotl(t, 8);
-		it_tab[2][i] = rotl(t, 16);
-		it_tab[3][i] = rotl(t, 24);
-	}
-
-	tab_gen = 1;
-#endif   /* !PRE_CALC_TABLES */
-}
-
-
-#define star_x(x) (((x) & 0x7f7f7f7f) << 1) ^ ((((x) & 0x80808080) >> 7) * 0x1b)
-
-#define imix_col(y,x)		\
-	u	= star_x(x);		\
-	v	= star_x(u);		\
-	w	= star_x(v);		\
-	t	= w ^ (x);			\
-   (y)	= u ^ v ^ w;		\
-   (y) ^= rotr(u ^ t,  8) ^ \
-		  rotr(v ^ t, 16) ^ \
-		  rotr(t,24)
-
-/* initialise the key schedule from the user supplied key	*/
-
-#define loop4(i)									\
-do {   t = ls_box(rotr(t,  8)) ^ rco_tab[i];		   \
-	t ^= e_key[4 * i];	   e_key[4 * i + 4] = t;	\
-	t ^= e_key[4 * i + 1]; e_key[4 * i + 5] = t;	\
-	t ^= e_key[4 * i + 2]; e_key[4 * i + 6] = t;	\
-	t ^= e_key[4 * i + 3]; e_key[4 * i + 7] = t;	\
-} while (0)
-
-#define loop6(i)									\
-do {   t = ls_box(rotr(t,  8)) ^ rco_tab[i];		   \
-	t ^= e_key[6 * i];	   e_key[6 * i + 6] = t;	\
-	t ^= e_key[6 * i + 1]; e_key[6 * i + 7] = t;	\
-	t ^= e_key[6 * i + 2]; e_key[6 * i + 8] = t;	\
-	t ^= e_key[6 * i + 3]; e_key[6 * i + 9] = t;	\
-	t ^= e_key[6 * i + 4]; e_key[6 * i + 10] = t;	\
-	t ^= e_key[6 * i + 5]; e_key[6 * i + 11] = t;	\
-} while (0)
-
-#define loop8(i)									\
-do {   t = ls_box(rotr(t,  8)) ^ rco_tab[i];		   \
-	t ^= e_key[8 * i];	   e_key[8 * i + 8] = t;	\
-	t ^= e_key[8 * i + 1]; e_key[8 * i + 9] = t;	\
-	t ^= e_key[8 * i + 2]; e_key[8 * i + 10] = t;	\
-	t ^= e_key[8 * i + 3]; e_key[8 * i + 11] = t;	\
-	t  = e_key[8 * i + 4] ^ ls_box(t);				\
-	e_key[8 * i + 12] = t;							\
-	t ^= e_key[8 * i + 5]; e_key[8 * i + 13] = t;	\
-	t ^= e_key[8 * i + 6]; e_key[8 * i + 14] = t;	\
-	t ^= e_key[8 * i + 7]; e_key[8 * i + 15] = t;	\
-} while (0)
-
-rijndael_ctx *
-rijndael_set_key(rijndael_ctx * ctx, const u4byte * in_key, const u4byte key_len,
-				 int encrypt)
-{
-	u4byte		i,
-				t,
-				u,
-				v,
-				w;
-	u4byte	   *e_key = ctx->e_key;
-	u4byte	   *d_key = ctx->d_key;
-
-	ctx->decrypt = !encrypt;
-
-	if (!tab_gen)
-		gen_tabs();
-
-	ctx->k_len = (key_len + 31) / 32;
-
-	e_key[0] = io_swap(in_key[0]);
-	e_key[1] = io_swap(in_key[1]);
-	e_key[2] = io_swap(in_key[2]);
-	e_key[3] = io_swap(in_key[3]);
-
-	switch (ctx->k_len)
-	{
-		case 4:
-			t = e_key[3];
-			for (i = 0; i < 10; ++i)
-				loop4(i);
-			break;
-
-		case 6:
-			e_key[4] = io_swap(in_key[4]);
-			t = e_key[5] = io_swap(in_key[5]);
-			for (i = 0; i < 8; ++i)
-				loop6(i);
-			break;
-
-		case 8:
-			e_key[4] = io_swap(in_key[4]);
-			e_key[5] = io_swap(in_key[5]);
-			e_key[6] = io_swap(in_key[6]);
-			t = e_key[7] = io_swap(in_key[7]);
-			for (i = 0; i < 7; ++i)
-				loop8(i);
-			break;
-	}
-
-	if (!encrypt)
-	{
-		d_key[0] = e_key[0];
-		d_key[1] = e_key[1];
-		d_key[2] = e_key[2];
-		d_key[3] = e_key[3];
-
-		for (i = 4; i < 4 * ctx->k_len + 24; ++i)
-			imix_col(d_key[i], e_key[i]);
-	}
-
-	return ctx;
-}
-
-/* encrypt a block of text	*/
-
-#define f_nround(bo, bi, k) \
-	f_rn(bo, bi, 0, k);		\
-	f_rn(bo, bi, 1, k);		\
-	f_rn(bo, bi, 2, k);		\
-	f_rn(bo, bi, 3, k);		\
-	k += 4
-
-#define f_lround(bo, bi, k) \
-	f_rl(bo, bi, 0, k);		\
-	f_rl(bo, bi, 1, k);		\
-	f_rl(bo, bi, 2, k);		\
-	f_rl(bo, bi, 3, k)
-
-void
-rijndael_encrypt(rijndael_ctx * ctx, const u4byte * in_blk, u4byte * out_blk)
-{
-	u4byte		k_len = ctx->k_len;
-	u4byte	   *e_key = ctx->e_key;
-	u4byte		b0[4],
-				b1[4],
-			   *kp;
-
-	b0[0] = io_swap(in_blk[0]) ^ e_key[0];
-	b0[1] = io_swap(in_blk[1]) ^ e_key[1];
-	b0[2] = io_swap(in_blk[2]) ^ e_key[2];
-	b0[3] = io_swap(in_blk[3]) ^ e_key[3];
-
-	kp = e_key + 4;
-
-	if (k_len > 6)
-	{
-		f_nround(b1, b0, kp);
-		f_nround(b0, b1, kp);
-	}
-
-	if (k_len > 4)
-	{
-		f_nround(b1, b0, kp);
-		f_nround(b0, b1, kp);
-	}
-
-	f_nround(b1, b0, kp);
-	f_nround(b0, b1, kp);
-	f_nround(b1, b0, kp);
-	f_nround(b0, b1, kp);
-	f_nround(b1, b0, kp);
-	f_nround(b0, b1, kp);
-	f_nround(b1, b0, kp);
-	f_nround(b0, b1, kp);
-	f_nround(b1, b0, kp);
-	f_lround(b0, b1, kp);
-
-	out_blk[0] = io_swap(b0[0]);
-	out_blk[1] = io_swap(b0[1]);
-	out_blk[2] = io_swap(b0[2]);
-	out_blk[3] = io_swap(b0[3]);
-}
-
-/* decrypt a block of text	*/
-
-#define i_nround(bo, bi, k) \
-	i_rn(bo, bi, 0, k);		\
-	i_rn(bo, bi, 1, k);		\
-	i_rn(bo, bi, 2, k);		\
-	i_rn(bo, bi, 3, k);		\
-	k -= 4
-
-#define i_lround(bo, bi, k) \
-	i_rl(bo, bi, 0, k);		\
-	i_rl(bo, bi, 1, k);		\
-	i_rl(bo, bi, 2, k);		\
-	i_rl(bo, bi, 3, k)
-
-void
-rijndael_decrypt(rijndael_ctx * ctx, const u4byte * in_blk, u4byte * out_blk)
-{
-	u4byte		b0[4],
-				b1[4],
-			   *kp;
-	u4byte		k_len = ctx->k_len;
-	u4byte	   *e_key = ctx->e_key;
-	u4byte	   *d_key = ctx->d_key;
-
-	b0[0] = io_swap(in_blk[0]) ^ e_key[4 * k_len + 24];
-	b0[1] = io_swap(in_blk[1]) ^ e_key[4 * k_len + 25];
-	b0[2] = io_swap(in_blk[2]) ^ e_key[4 * k_len + 26];
-	b0[3] = io_swap(in_blk[3]) ^ e_key[4 * k_len + 27];
-
-	kp = d_key + 4 * (k_len + 5);
-
-	if (k_len > 6)
-	{
-		i_nround(b1, b0, kp);
-		i_nround(b0, b1, kp);
-	}
-
-	if (k_len > 4)
-	{
-		i_nround(b1, b0, kp);
-		i_nround(b0, b1, kp);
-	}
-
-	i_nround(b1, b0, kp);
-	i_nround(b0, b1, kp);
-	i_nround(b1, b0, kp);
-	i_nround(b0, b1, kp);
-	i_nround(b1, b0, kp);
-	i_nround(b0, b1, kp);
-	i_nround(b1, b0, kp);
-	i_nround(b0, b1, kp);
-	i_nround(b1, b0, kp);
-	i_lround(b0, b1, kp);
-
-	out_blk[0] = io_swap(b0[0]);
-	out_blk[1] = io_swap(b0[1]);
-	out_blk[2] = io_swap(b0[2]);
-	out_blk[3] = io_swap(b0[3]);
-}
-
-/*
- * conventional interface
- *
- * ATM it hopes all data is 4-byte aligned - which
- * should be true for PX.  -marko
- */
-
-void
-aes_set_key(rijndael_ctx * ctx, const uint8 *key, unsigned keybits, int enc)
-{
-	uint32	   *k;
-
-	k = (uint32 *) key;
-	rijndael_set_key(ctx, k, keybits, enc);
-}
-
-void
-aes_ecb_encrypt(rijndael_ctx * ctx, uint8 *data, unsigned len)
-{
-	unsigned	bs = 16;
-	uint32	   *d;
-
-	while (len >= bs)
-	{
-		d = (uint32 *) data;
-		rijndael_encrypt(ctx, d, d);
-
-		len -= bs;
-		data += bs;
-	}
-}
-
-void
-aes_ecb_decrypt(rijndael_ctx * ctx, uint8 *data, unsigned len)
-{
-	unsigned	bs = 16;
-	uint32	   *d;
-
-	while (len >= bs)
-	{
-		d = (uint32 *) data;
-		rijndael_decrypt(ctx, d, d);
-
-		len -= bs;
-		data += bs;
-	}
-}
-
-void
-aes_cbc_encrypt(rijndael_ctx * ctx, uint8 *iva, uint8 *data, unsigned len)
-{
-	uint32	   *iv = (uint32 *) iva;
-	uint32	   *d = (uint32 *) data;
-	unsigned	bs = 16;
-
-	while (len >= bs)
-	{
-		d[0] ^= iv[0];
-		d[1] ^= iv[1];
-		d[2] ^= iv[2];
-		d[3] ^= iv[3];
-
-		rijndael_encrypt(ctx, d, d);
-
-		iv = d;
-		d += bs / 4;
-		len -= bs;
-	}
-}
-
-void
-aes_cbc_decrypt(rijndael_ctx * ctx, uint8 *iva, uint8 *data, unsigned len)
-{
-	uint32	   *d = (uint32 *) data;
-	unsigned	bs = 16;
-	uint32		buf[4],
-				iv[4];
-
-	memcpy(iv, iva, bs);
-	while (len >= bs)
-	{
-		buf[0] = d[0];
-		buf[1] = d[1];
-		buf[2] = d[2];
-		buf[3] = d[3];
-
-		rijndael_decrypt(ctx, buf, d);
-
-		d[0] ^= iv[0];
-		d[1] ^= iv[1];
-		d[2] ^= iv[2];
-		d[3] ^= iv[3];
-
-		iv[0] = buf[0];
-		iv[1] = buf[1];
-		iv[2] = buf[2];
-		iv[3] = buf[3];
-		d += 4;
-		len -= bs;
-	}
-}
-
-/*
- * pre-calculate tables.
- *
- * On i386 lifts 17k from .bss to .rodata
- * and avoids 1k code and setup time.
- *	  -marko
- */
-#ifdef PRINT_TABS
-
-static void
-show256u8(char *name, uint8 *data)
-{
-	int			i;
-
-	printf("static const u1byte  %s[256] = {\n  ", name);
-	for (i = 0; i < 256;)
-	{
-		printf("%u", pow_tab[i++]);
-		if (i < 256)
-			printf(i % 16 ? ", " : ",\n  ");
-	}
-	printf("\n};\n\n");
-}
-
-
-static void
-show4x256u32(char *name, uint32 data[4][256])
-{
-	int			i,
-				j;
-
-	printf("static const u4byte  %s[4][256] = {\n{\n  ", name);
-	for (i = 0; i < 4; i++)
-	{
-		for (j = 0; j < 256;)
-		{
-			printf("0x%08x", data[i][j]);
-			j++;
-			if (j < 256)
-				printf(j % 4 ? ", " : ",\n  ");
-		}
-		printf(i < 3 ? "\n}, {\n  " : "\n}\n");
-	}
-	printf("};\n\n");
-}
-
-int
-main()
-{
-	int			i;
-	char	   *hdr = "/* Generated by rijndael.c */\n\n";
-
-	gen_tabs();
-
-	printf(hdr);
-	show256u8("pow_tab", pow_tab);
-	show256u8("log_tab", log_tab);
-	show256u8("sbx_tab", sbx_tab);
-	show256u8("isb_tab", isb_tab);
-
-	show4x256u32("ft_tab", ft_tab);
-	show4x256u32("it_tab", it_tab);
-#ifdef LARGE_TABLES
-	show4x256u32("fl_tab", fl_tab);
-	show4x256u32("il_tab", il_tab);
-#endif
-	printf("static const u4byte rco_tab[10] = {\n  ");
-	for (i = 0; i < 10; i++)
-	{
-		printf("0x%08x", rco_tab[i]);
-		if (i < 9)
-			printf(", ");
-		if (i == 4)
-			printf("\n  ");
-	}
-	printf("\n};\n\n");
-	return 0;
-}
-
-#endif
diff --git a/contrib/pgcrypto/rijndael.h b/contrib/pgcrypto/rijndael.h
deleted file mode 100644
index 41c1a2a122..0000000000
--- a/contrib/pgcrypto/rijndael.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$OpenBSD: rijndael.h,v 1.3 2001/05/09 23:01:32 markus Exp $ */
-
-/* This is an independent implementation of the encryption algorithm:	*/
-/*																		*/
-/*		   RIJNDAEL by Joan Daemen and Vincent Rijmen					*/
-/*																		*/
-/* which is a candidate algorithm in the Advanced Encryption Standard	*/
-/* programme of the US National Institute of Standards and Technology.	*/
-/*																		*/
-/* Copyright in this implementation is held by Dr B R Gladman but I		*/
-/* hereby give permission for its free direct or derivative use subject */
-/* to acknowledgment of its origin and compliance with any conditions	*/
-/* that the originators of the algorithm place on its exploitation.		*/
-/*																		*/
-/* Dr Brian Gladman (gladman@seven77.demon.co.uk) 14th January 1999		*/
-
-#ifndef _RIJNDAEL_H_
-#define _RIJNDAEL_H_
-
-/* 1. Standard types for AES cryptography source code				*/
-
-typedef uint8 u1byte;			/* an 8 bit unsigned character type */
-typedef uint16 u2byte;			/* a 16 bit unsigned integer type	*/
-typedef uint32 u4byte;			/* a 32 bit unsigned integer type	*/
-
-typedef int8 s1byte;			/* an 8 bit signed character type	*/
-typedef int16 s2byte;			/* a 16 bit signed integer type		*/
-typedef int32 s4byte;			/* a 32 bit signed integer type		*/
-
-typedef struct _rijndael_ctx
-{
-	u4byte		k_len;
-	int			decrypt;
-	u4byte		e_key[64];
-	u4byte		d_key[64];
-}	rijndael_ctx;
-
-
-/* 2. Standard interface for AES cryptographic routines				*/
-
-/* These are all based on 32 bit unsigned values and will therefore */
-/* require endian conversions for big-endian architectures			*/
-
-rijndael_ctx *
-			rijndael_set_key(rijndael_ctx *, const u4byte *, const u4byte, int);
-void		rijndael_encrypt(rijndael_ctx *, const u4byte *, u4byte *);
-void		rijndael_decrypt(rijndael_ctx *, const u4byte *, u4byte *);
-
-/* conventional interface */
-
-void		aes_set_key(rijndael_ctx * ctx, const uint8 *key, unsigned keybits, int enc);
-void		aes_ecb_encrypt(rijndael_ctx * ctx, uint8 *data, unsigned len);
-void		aes_ecb_decrypt(rijndael_ctx * ctx, uint8 *data, unsigned len);
-void		aes_cbc_encrypt(rijndael_ctx * ctx, uint8 *iva, uint8 *data, unsigned len);
-void		aes_cbc_decrypt(rijndael_ctx * ctx, uint8 *iva, uint8 *data, unsigned len);
-
-#endif   /* _RIJNDAEL_H_ */
diff --git a/contrib/pgcrypto/rijndael.tbl b/contrib/pgcrypto/rijndael.tbl
deleted file mode 100644
index bc0a3822cc..0000000000
--- a/contrib/pgcrypto/rijndael.tbl
+++ /dev/null
@@ -1,1139 +0,0 @@
-/* Generated by rijndael.c */
-
-static const u1byte  pow_tab[256] = {
-  1, 3, 5, 15, 17, 51, 85, 255, 26, 46, 114, 150, 161, 248, 19, 53,
-  95, 225, 56, 72, 216, 115, 149, 164, 247, 2, 6, 10, 30, 34, 102, 170,
-  229, 52, 92, 228, 55, 89, 235, 38, 106, 190, 217, 112, 144, 171, 230, 49,
-  83, 245, 4, 12, 20, 60, 68, 204, 79, 209, 104, 184, 211, 110, 178, 205,
-  76, 212, 103, 169, 224, 59, 77, 215, 98, 166, 241, 8, 24, 40, 120, 136,
-  131, 158, 185, 208, 107, 189, 220, 127, 129, 152, 179, 206, 73, 219, 118, 154,
-  181, 196, 87, 249, 16, 48, 80, 240, 11, 29, 39, 105, 187, 214, 97, 163,
-  254, 25, 43, 125, 135, 146, 173, 236, 47, 113, 147, 174, 233, 32, 96, 160,
-  251, 22, 58, 78, 210, 109, 183, 194, 93, 231, 50, 86, 250, 21, 63, 65,
-  195, 94, 226, 61, 71, 201, 64, 192, 91, 237, 44, 116, 156, 191, 218, 117,
-  159, 186, 213, 100, 172, 239, 42, 126, 130, 157, 188, 223, 122, 142, 137, 128,
-  155, 182, 193, 88, 232, 35, 101, 175, 234, 37, 111, 177, 200, 67, 197, 84,
-  252, 31, 33, 99, 165, 244, 7, 9, 27, 45, 119, 153, 176, 203, 70, 202,
-  69, 207, 74, 222, 121, 139, 134, 145, 168, 227, 62, 66, 198, 81, 243, 14,
-  18, 54, 90, 238, 41, 123, 141, 140, 143, 138, 133, 148, 167, 242, 13, 23,
-  57, 75, 221, 124, 132, 151, 162, 253, 28, 36, 108, 180, 199, 82, 246, 1
-};
-
-static const u1byte  log_tab[256] = {
-  1, 3, 5, 15, 17, 51, 85, 255, 26, 46, 114, 150, 161, 248, 19, 53,
-  95, 225, 56, 72, 216, 115, 149, 164, 247, 2, 6, 10, 30, 34, 102, 170,
-  229, 52, 92, 228, 55, 89, 235, 38, 106, 190, 217, 112, 144, 171, 230, 49,
-  83, 245, 4, 12, 20, 60, 68, 204, 79, 209, 104, 184, 211, 110, 178, 205,
-  76, 212, 103, 169, 224, 59, 77, 215, 98, 166, 241, 8, 24, 40, 120, 136,
-  131, 158, 185, 208, 107, 189, 220, 127, 129, 152, 179, 206, 73, 219, 118, 154,
-  181, 196, 87, 249, 16, 48, 80, 240, 11, 29, 39, 105, 187, 214, 97, 163,
-  254, 25, 43, 125, 135, 146, 173, 236, 47, 113, 147, 174, 233, 32, 96, 160,
-  251, 22, 58, 78, 210, 109, 183, 194, 93, 231, 50, 86, 250, 21, 63, 65,
-  195, 94, 226, 61, 71, 201, 64, 192, 91, 237, 44, 116, 156, 191, 218, 117,
-  159, 186, 213, 100, 172, 239, 42, 126, 130, 157, 188, 223, 122, 142, 137, 128,
-  155, 182, 193, 88, 232, 35, 101, 175, 234, 37, 111, 177, 200, 67, 197, 84,
-  252, 31, 33, 99, 165, 244, 7, 9, 27, 45, 119, 153, 176, 203, 70, 202,
-  69, 207, 74, 222, 121, 139, 134, 145, 168, 227, 62, 66, 198, 81, 243, 14,
-  18, 54, 90, 238, 41, 123, 141, 140, 143, 138, 133, 148, 167, 242, 13, 23,
-  57, 75, 221, 124, 132, 151, 162, 253, 28, 36, 108, 180, 199, 82, 246, 1
-};
-
-static const u1byte  sbx_tab[256] = {
-  1, 3, 5, 15, 17, 51, 85, 255, 26, 46, 114, 150, 161, 248, 19, 53,
-  95, 225, 56, 72, 216, 115, 149, 164, 247, 2, 6, 10, 30, 34, 102, 170,
-  229, 52, 92, 228, 55, 89, 235, 38, 106, 190, 217, 112, 144, 171, 230, 49,
-  83, 245, 4, 12, 20, 60, 68, 204, 79, 209, 104, 184, 211, 110, 178, 205,
-  76, 212, 103, 169, 224, 59, 77, 215, 98, 166, 241, 8, 24, 40, 120, 136,
-  131, 158, 185, 208, 107, 189, 220, 127, 129, 152, 179, 206, 73, 219, 118, 154,
-  181, 196, 87, 249, 16, 48, 80, 240, 11, 29, 39, 105, 187, 214, 97, 163,
-  254, 25, 43, 125, 135, 146, 173, 236, 47, 113, 147, 174, 233, 32, 96, 160,
-  251, 22, 58, 78, 210, 109, 183, 194, 93, 231, 50, 86, 250, 21, 63, 65,
-  195, 94, 226, 61, 71, 201, 64, 192, 91, 237, 44, 116, 156, 191, 218, 117,
-  159, 186, 213, 100, 172, 239, 42, 126, 130, 157, 188, 223, 122, 142, 137, 128,
-  155, 182, 193, 88, 232, 35, 101, 175, 234, 37, 111, 177, 200, 67, 197, 84,
-  252, 31, 33, 99, 165, 244, 7, 9, 27, 45, 119, 153, 176, 203, 70, 202,
-  69, 207, 74, 222, 121, 139, 134, 145, 168, 227, 62, 66, 198, 81, 243, 14,
-  18, 54, 90, 238, 41, 123, 141, 140, 143, 138, 133, 148, 167, 242, 13, 23,
-  57, 75, 221, 124, 132, 151, 162, 253, 28, 36, 108, 180, 199, 82, 246, 1
-};
-
-static const u1byte  isb_tab[256] = {
-  1, 3, 5, 15, 17, 51, 85, 255, 26, 46, 114, 150, 161, 248, 19, 53,
-  95, 225, 56, 72, 216, 115, 149, 164, 247, 2, 6, 10, 30, 34, 102, 170,
-  229, 52, 92, 228, 55, 89, 235, 38, 106, 190, 217, 112, 144, 171, 230, 49,
-  83, 245, 4, 12, 20, 60, 68, 204, 79, 209, 104, 184, 211, 110, 178, 205,
-  76, 212, 103, 169, 224, 59, 77, 215, 98, 166, 241, 8, 24, 40, 120, 136,
-  131, 158, 185, 208, 107, 189, 220, 127, 129, 152, 179, 206, 73, 219, 118, 154,
-  181, 196, 87, 249, 16, 48, 80, 240, 11, 29, 39, 105, 187, 214, 97, 163,
-  254, 25, 43, 125, 135, 146, 173, 236, 47, 113, 147, 174, 233, 32, 96, 160,
-  251, 22, 58, 78, 210, 109, 183, 194, 93, 231, 50, 86, 250, 21, 63, 65,
-  195, 94, 226, 61, 71, 201, 64, 192, 91, 237, 44, 116, 156, 191, 218, 117,
-  159, 186, 213, 100, 172, 239, 42, 126, 130, 157, 188, 223, 122, 142, 137, 128,
-  155, 182, 193, 88, 232, 35, 101, 175, 234, 37, 111, 177, 200, 67, 197, 84,
-  252, 31, 33, 99, 165, 244, 7, 9, 27, 45, 119, 153, 176, 203, 70, 202,
-  69, 207, 74, 222, 121, 139, 134, 145, 168, 227, 62, 66, 198, 81, 243, 14,
-  18, 54, 90, 238, 41, 123, 141, 140, 143, 138, 133, 148, 167, 242, 13, 23,
-  57, 75, 221, 124, 132, 151, 162, 253, 28, 36, 108, 180, 199, 82, 246, 1
-};
-
-static const u4byte  ft_tab[4][256] = {
-{
-  0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6,
-  0x0df2f2ff, 0xbd6b6bd6, 0xb16f6fde, 0x54c5c591,
-  0x50303060, 0x03010102, 0xa96767ce, 0x7d2b2b56,
-  0x19fefee7, 0x62d7d7b5, 0xe6abab4d, 0x9a7676ec,
-  0x45caca8f, 0x9d82821f, 0x40c9c989, 0x877d7dfa,
-  0x15fafaef, 0xeb5959b2, 0xc947478e, 0x0bf0f0fb,
-  0xecadad41, 0x67d4d4b3, 0xfda2a25f, 0xeaafaf45,
-  0xbf9c9c23, 0xf7a4a453, 0x967272e4, 0x5bc0c09b,
-  0xc2b7b775, 0x1cfdfde1, 0xae93933d, 0x6a26264c,
-  0x5a36366c, 0x413f3f7e, 0x02f7f7f5, 0x4fcccc83,
-  0x5c343468, 0xf4a5a551, 0x34e5e5d1, 0x08f1f1f9,
-  0x937171e2, 0x73d8d8ab, 0x53313162, 0x3f15152a,
-  0x0c040408, 0x52c7c795, 0x65232346, 0x5ec3c39d,
-  0x28181830, 0xa1969637, 0x0f05050a, 0xb59a9a2f,
-  0x0907070e, 0x36121224, 0x9b80801b, 0x3de2e2df,
-  0x26ebebcd, 0x6927274e, 0xcdb2b27f, 0x9f7575ea,
-  0x1b090912, 0x9e83831d, 0x742c2c58, 0x2e1a1a34,
-  0x2d1b1b36, 0xb26e6edc, 0xee5a5ab4, 0xfba0a05b,
-  0xf65252a4, 0x4d3b3b76, 0x61d6d6b7, 0xceb3b37d,
-  0x7b292952, 0x3ee3e3dd, 0x712f2f5e, 0x97848413,
-  0xf55353a6, 0x68d1d1b9, 0x00000000, 0x2cededc1,
-  0x60202040, 0x1ffcfce3, 0xc8b1b179, 0xed5b5bb6,
-  0xbe6a6ad4, 0x46cbcb8d, 0xd9bebe67, 0x4b393972,
-  0xde4a4a94, 0xd44c4c98, 0xe85858b0, 0x4acfcf85,
-  0x6bd0d0bb, 0x2aefefc5, 0xe5aaaa4f, 0x16fbfbed,
-  0xc5434386, 0xd74d4d9a, 0x55333366, 0x94858511,
-  0xcf45458a, 0x10f9f9e9, 0x06020204, 0x817f7ffe,
-  0xf05050a0, 0x443c3c78, 0xba9f9f25, 0xe3a8a84b,
-  0xf35151a2, 0xfea3a35d, 0xc0404080, 0x8a8f8f05,
-  0xad92923f, 0xbc9d9d21, 0x48383870, 0x04f5f5f1,
-  0xdfbcbc63, 0xc1b6b677, 0x75dadaaf, 0x63212142,
-  0x30101020, 0x1affffe5, 0x0ef3f3fd, 0x6dd2d2bf,
-  0x4ccdcd81, 0x140c0c18, 0x35131326, 0x2fececc3,
-  0xe15f5fbe, 0xa2979735, 0xcc444488, 0x3917172e,
-  0x57c4c493, 0xf2a7a755, 0x827e7efc, 0x473d3d7a,
-  0xac6464c8, 0xe75d5dba, 0x2b191932, 0x957373e6,
-  0xa06060c0, 0x98818119, 0xd14f4f9e, 0x7fdcdca3,
-  0x66222244, 0x7e2a2a54, 0xab90903b, 0x8388880b,
-  0xca46468c, 0x29eeeec7, 0xd3b8b86b, 0x3c141428,
-  0x79dedea7, 0xe25e5ebc, 0x1d0b0b16, 0x76dbdbad,
-  0x3be0e0db, 0x56323264, 0x4e3a3a74, 0x1e0a0a14,
-  0xdb494992, 0x0a06060c, 0x6c242448, 0xe45c5cb8,
-  0x5dc2c29f, 0x6ed3d3bd, 0xefacac43, 0xa66262c4,
-  0xa8919139, 0xa4959531, 0x37e4e4d3, 0x8b7979f2,
-  0x32e7e7d5, 0x43c8c88b, 0x5937376e, 0xb76d6dda,
-  0x8c8d8d01, 0x64d5d5b1, 0xd24e4e9c, 0xe0a9a949,
-  0xb46c6cd8, 0xfa5656ac, 0x07f4f4f3, 0x25eaeacf,
-  0xaf6565ca, 0x8e7a7af4, 0xe9aeae47, 0x18080810,
-  0xd5baba6f, 0x887878f0, 0x6f25254a, 0x722e2e5c,
-  0x241c1c38, 0xf1a6a657, 0xc7b4b473, 0x51c6c697,
-  0x23e8e8cb, 0x7cdddda1, 0x9c7474e8, 0x211f1f3e,
-  0xdd4b4b96, 0xdcbdbd61, 0x868b8b0d, 0x858a8a0f,
-  0x907070e0, 0x423e3e7c, 0xc4b5b571, 0xaa6666cc,
-  0xd8484890, 0x05030306, 0x01f6f6f7, 0x120e0e1c,
-  0xa36161c2, 0x5f35356a, 0xf95757ae, 0xd0b9b969,
-  0x91868617, 0x58c1c199, 0x271d1d3a, 0xb99e9e27,
-  0x38e1e1d9, 0x13f8f8eb, 0xb398982b, 0x33111122,
-  0xbb6969d2, 0x70d9d9a9, 0x898e8e07, 0xa7949433,
-  0xb69b9b2d, 0x221e1e3c, 0x92878715, 0x20e9e9c9,
-  0x49cece87, 0xff5555aa, 0x78282850, 0x7adfdfa5,
-  0x8f8c8c03, 0xf8a1a159, 0x80898909, 0x170d0d1a,
-  0xdabfbf65, 0x31e6e6d7, 0xc6424284, 0xb86868d0,
-  0xc3414182, 0xb0999929, 0x772d2d5a, 0x110f0f1e,
-  0xcbb0b07b, 0xfc5454a8, 0xd6bbbb6d, 0x3a16162c
-}, {
-  0x6363c6a5, 0x7c7cf884, 0x7777ee99, 0x7b7bf68d,
-  0xf2f2ff0d, 0x6b6bd6bd, 0x6f6fdeb1, 0xc5c59154,
-  0x30306050, 0x01010203, 0x6767cea9, 0x2b2b567d,
-  0xfefee719, 0xd7d7b562, 0xabab4de6, 0x7676ec9a,
-  0xcaca8f45, 0x82821f9d, 0xc9c98940, 0x7d7dfa87,
-  0xfafaef15, 0x5959b2eb, 0x47478ec9, 0xf0f0fb0b,
-  0xadad41ec, 0xd4d4b367, 0xa2a25ffd, 0xafaf45ea,
-  0x9c9c23bf, 0xa4a453f7, 0x7272e496, 0xc0c09b5b,
-  0xb7b775c2, 0xfdfde11c, 0x93933dae, 0x26264c6a,
-  0x36366c5a, 0x3f3f7e41, 0xf7f7f502, 0xcccc834f,
-  0x3434685c, 0xa5a551f4, 0xe5e5d134, 0xf1f1f908,
-  0x7171e293, 0xd8d8ab73, 0x31316253, 0x15152a3f,
-  0x0404080c, 0xc7c79552, 0x23234665, 0xc3c39d5e,
-  0x18183028, 0x969637a1, 0x05050a0f, 0x9a9a2fb5,
-  0x07070e09, 0x12122436, 0x80801b9b, 0xe2e2df3d,
-  0xebebcd26, 0x27274e69, 0xb2b27fcd, 0x7575ea9f,
-  0x0909121b, 0x83831d9e, 0x2c2c5874, 0x1a1a342e,
-  0x1b1b362d, 0x6e6edcb2, 0x5a5ab4ee, 0xa0a05bfb,
-  0x5252a4f6, 0x3b3b764d, 0xd6d6b761, 0xb3b37dce,
-  0x2929527b, 0xe3e3dd3e, 0x2f2f5e71, 0x84841397,
-  0x5353a6f5, 0xd1d1b968, 0x00000000, 0xededc12c,
-  0x20204060, 0xfcfce31f, 0xb1b179c8, 0x5b5bb6ed,
-  0x6a6ad4be, 0xcbcb8d46, 0xbebe67d9, 0x3939724b,
-  0x4a4a94de, 0x4c4c98d4, 0x5858b0e8, 0xcfcf854a,
-  0xd0d0bb6b, 0xefefc52a, 0xaaaa4fe5, 0xfbfbed16,
-  0x434386c5, 0x4d4d9ad7, 0x33336655, 0x85851194,
-  0x45458acf, 0xf9f9e910, 0x02020406, 0x7f7ffe81,
-  0x5050a0f0, 0x3c3c7844, 0x9f9f25ba, 0xa8a84be3,
-  0x5151a2f3, 0xa3a35dfe, 0x404080c0, 0x8f8f058a,
-  0x92923fad, 0x9d9d21bc, 0x38387048, 0xf5f5f104,
-  0xbcbc63df, 0xb6b677c1, 0xdadaaf75, 0x21214263,
-  0x10102030, 0xffffe51a, 0xf3f3fd0e, 0xd2d2bf6d,
-  0xcdcd814c, 0x0c0c1814, 0x13132635, 0xececc32f,
-  0x5f5fbee1, 0x979735a2, 0x444488cc, 0x17172e39,
-  0xc4c49357, 0xa7a755f2, 0x7e7efc82, 0x3d3d7a47,
-  0x6464c8ac, 0x5d5dbae7, 0x1919322b, 0x7373e695,
-  0x6060c0a0, 0x81811998, 0x4f4f9ed1, 0xdcdca37f,
-  0x22224466, 0x2a2a547e, 0x90903bab, 0x88880b83,
-  0x46468cca, 0xeeeec729, 0xb8b86bd3, 0x1414283c,
-  0xdedea779, 0x5e5ebce2, 0x0b0b161d, 0xdbdbad76,
-  0xe0e0db3b, 0x32326456, 0x3a3a744e, 0x0a0a141e,
-  0x494992db, 0x06060c0a, 0x2424486c, 0x5c5cb8e4,
-  0xc2c29f5d, 0xd3d3bd6e, 0xacac43ef, 0x6262c4a6,
-  0x919139a8, 0x959531a4, 0xe4e4d337, 0x7979f28b,
-  0xe7e7d532, 0xc8c88b43, 0x37376e59, 0x6d6ddab7,
-  0x8d8d018c, 0xd5d5b164, 0x4e4e9cd2, 0xa9a949e0,
-  0x6c6cd8b4, 0x5656acfa, 0xf4f4f307, 0xeaeacf25,
-  0x6565caaf, 0x7a7af48e, 0xaeae47e9, 0x08081018,
-  0xbaba6fd5, 0x7878f088, 0x25254a6f, 0x2e2e5c72,
-  0x1c1c3824, 0xa6a657f1, 0xb4b473c7, 0xc6c69751,
-  0xe8e8cb23, 0xdddda17c, 0x7474e89c, 0x1f1f3e21,
-  0x4b4b96dd, 0xbdbd61dc, 0x8b8b0d86, 0x8a8a0f85,
-  0x7070e090, 0x3e3e7c42, 0xb5b571c4, 0x6666ccaa,
-  0x484890d8, 0x03030605, 0xf6f6f701, 0x0e0e1c12,
-  0x6161c2a3, 0x35356a5f, 0x5757aef9, 0xb9b969d0,
-  0x86861791, 0xc1c19958, 0x1d1d3a27, 0x9e9e27b9,
-  0xe1e1d938, 0xf8f8eb13, 0x98982bb3, 0x11112233,
-  0x6969d2bb, 0xd9d9a970, 0x8e8e0789, 0x949433a7,
-  0x9b9b2db6, 0x1e1e3c22, 0x87871592, 0xe9e9c920,
-  0xcece8749, 0x5555aaff, 0x28285078, 0xdfdfa57a,
-  0x8c8c038f, 0xa1a159f8, 0x89890980, 0x0d0d1a17,
-  0xbfbf65da, 0xe6e6d731, 0x424284c6, 0x6868d0b8,
-  0x414182c3, 0x999929b0, 0x2d2d5a77, 0x0f0f1e11,
-  0xb0b07bcb, 0x5454a8fc, 0xbbbb6dd6, 0x16162c3a
-}, {
-  0x63c6a563, 0x7cf8847c, 0x77ee9977, 0x7bf68d7b,
-  0xf2ff0df2, 0x6bd6bd6b, 0x6fdeb16f, 0xc59154c5,
-  0x30605030, 0x01020301, 0x67cea967, 0x2b567d2b,
-  0xfee719fe, 0xd7b562d7, 0xab4de6ab, 0x76ec9a76,
-  0xca8f45ca, 0x821f9d82, 0xc98940c9, 0x7dfa877d,
-  0xfaef15fa, 0x59b2eb59, 0x478ec947, 0xf0fb0bf0,
-  0xad41ecad, 0xd4b367d4, 0xa25ffda2, 0xaf45eaaf,
-  0x9c23bf9c, 0xa453f7a4, 0x72e49672, 0xc09b5bc0,
-  0xb775c2b7, 0xfde11cfd, 0x933dae93, 0x264c6a26,
-  0x366c5a36, 0x3f7e413f, 0xf7f502f7, 0xcc834fcc,
-  0x34685c34, 0xa551f4a5, 0xe5d134e5, 0xf1f908f1,
-  0x71e29371, 0xd8ab73d8, 0x31625331, 0x152a3f15,
-  0x04080c04, 0xc79552c7, 0x23466523, 0xc39d5ec3,
-  0x18302818, 0x9637a196, 0x050a0f05, 0x9a2fb59a,
-  0x070e0907, 0x12243612, 0x801b9b80, 0xe2df3de2,
-  0xebcd26eb, 0x274e6927, 0xb27fcdb2, 0x75ea9f75,
-  0x09121b09, 0x831d9e83, 0x2c58742c, 0x1a342e1a,
-  0x1b362d1b, 0x6edcb26e, 0x5ab4ee5a, 0xa05bfba0,
-  0x52a4f652, 0x3b764d3b, 0xd6b761d6, 0xb37dceb3,
-  0x29527b29, 0xe3dd3ee3, 0x2f5e712f, 0x84139784,
-  0x53a6f553, 0xd1b968d1, 0x00000000, 0xedc12ced,
-  0x20406020, 0xfce31ffc, 0xb179c8b1, 0x5bb6ed5b,
-  0x6ad4be6a, 0xcb8d46cb, 0xbe67d9be, 0x39724b39,
-  0x4a94de4a, 0x4c98d44c, 0x58b0e858, 0xcf854acf,
-  0xd0bb6bd0, 0xefc52aef, 0xaa4fe5aa, 0xfbed16fb,
-  0x4386c543, 0x4d9ad74d, 0x33665533, 0x85119485,
-  0x458acf45, 0xf9e910f9, 0x02040602, 0x7ffe817f,
-  0x50a0f050, 0x3c78443c, 0x9f25ba9f, 0xa84be3a8,
-  0x51a2f351, 0xa35dfea3, 0x4080c040, 0x8f058a8f,
-  0x923fad92, 0x9d21bc9d, 0x38704838, 0xf5f104f5,
-  0xbc63dfbc, 0xb677c1b6, 0xdaaf75da, 0x21426321,
-  0x10203010, 0xffe51aff, 0xf3fd0ef3, 0xd2bf6dd2,
-  0xcd814ccd, 0x0c18140c, 0x13263513, 0xecc32fec,
-  0x5fbee15f, 0x9735a297, 0x4488cc44, 0x172e3917,
-  0xc49357c4, 0xa755f2a7, 0x7efc827e, 0x3d7a473d,
-  0x64c8ac64, 0x5dbae75d, 0x19322b19, 0x73e69573,
-  0x60c0a060, 0x81199881, 0x4f9ed14f, 0xdca37fdc,
-  0x22446622, 0x2a547e2a, 0x903bab90, 0x880b8388,
-  0x468cca46, 0xeec729ee, 0xb86bd3b8, 0x14283c14,
-  0xdea779de, 0x5ebce25e, 0x0b161d0b, 0xdbad76db,
-  0xe0db3be0, 0x32645632, 0x3a744e3a, 0x0a141e0a,
-  0x4992db49, 0x060c0a06, 0x24486c24, 0x5cb8e45c,
-  0xc29f5dc2, 0xd3bd6ed3, 0xac43efac, 0x62c4a662,
-  0x9139a891, 0x9531a495, 0xe4d337e4, 0x79f28b79,
-  0xe7d532e7, 0xc88b43c8, 0x376e5937, 0x6ddab76d,
-  0x8d018c8d, 0xd5b164d5, 0x4e9cd24e, 0xa949e0a9,
-  0x6cd8b46c, 0x56acfa56, 0xf4f307f4, 0xeacf25ea,
-  0x65caaf65, 0x7af48e7a, 0xae47e9ae, 0x08101808,
-  0xba6fd5ba, 0x78f08878, 0x254a6f25, 0x2e5c722e,
-  0x1c38241c, 0xa657f1a6, 0xb473c7b4, 0xc69751c6,
-  0xe8cb23e8, 0xdda17cdd, 0x74e89c74, 0x1f3e211f,
-  0x4b96dd4b, 0xbd61dcbd, 0x8b0d868b, 0x8a0f858a,
-  0x70e09070, 0x3e7c423e, 0xb571c4b5, 0x66ccaa66,
-  0x4890d848, 0x03060503, 0xf6f701f6, 0x0e1c120e,
-  0x61c2a361, 0x356a5f35, 0x57aef957, 0xb969d0b9,
-  0x86179186, 0xc19958c1, 0x1d3a271d, 0x9e27b99e,
-  0xe1d938e1, 0xf8eb13f8, 0x982bb398, 0x11223311,
-  0x69d2bb69, 0xd9a970d9, 0x8e07898e, 0x9433a794,
-  0x9b2db69b, 0x1e3c221e, 0x87159287, 0xe9c920e9,
-  0xce8749ce, 0x55aaff55, 0x28507828, 0xdfa57adf,
-  0x8c038f8c, 0xa159f8a1, 0x89098089, 0x0d1a170d,
-  0xbf65dabf, 0xe6d731e6, 0x4284c642, 0x68d0b868,
-  0x4182c341, 0x9929b099, 0x2d5a772d, 0x0f1e110f,
-  0xb07bcbb0, 0x54a8fc54, 0xbb6dd6bb, 0x162c3a16
-}, {
-  0xc6a56363, 0xf8847c7c, 0xee997777, 0xf68d7b7b,
-  0xff0df2f2, 0xd6bd6b6b, 0xdeb16f6f, 0x9154c5c5,
-  0x60503030, 0x02030101, 0xcea96767, 0x567d2b2b,
-  0xe719fefe, 0xb562d7d7, 0x4de6abab, 0xec9a7676,
-  0x8f45caca, 0x1f9d8282, 0x8940c9c9, 0xfa877d7d,
-  0xef15fafa, 0xb2eb5959, 0x8ec94747, 0xfb0bf0f0,
-  0x41ecadad, 0xb367d4d4, 0x5ffda2a2, 0x45eaafaf,
-  0x23bf9c9c, 0x53f7a4a4, 0xe4967272, 0x9b5bc0c0,
-  0x75c2b7b7, 0xe11cfdfd, 0x3dae9393, 0x4c6a2626,
-  0x6c5a3636, 0x7e413f3f, 0xf502f7f7, 0x834fcccc,
-  0x685c3434, 0x51f4a5a5, 0xd134e5e5, 0xf908f1f1,
-  0xe2937171, 0xab73d8d8, 0x62533131, 0x2a3f1515,
-  0x080c0404, 0x9552c7c7, 0x46652323, 0x9d5ec3c3,
-  0x30281818, 0x37a19696, 0x0a0f0505, 0x2fb59a9a,
-  0x0e090707, 0x24361212, 0x1b9b8080, 0xdf3de2e2,
-  0xcd26ebeb, 0x4e692727, 0x7fcdb2b2, 0xea9f7575,
-  0x121b0909, 0x1d9e8383, 0x58742c2c, 0x342e1a1a,
-  0x362d1b1b, 0xdcb26e6e, 0xb4ee5a5a, 0x5bfba0a0,
-  0xa4f65252, 0x764d3b3b, 0xb761d6d6, 0x7dceb3b3,
-  0x527b2929, 0xdd3ee3e3, 0x5e712f2f, 0x13978484,
-  0xa6f55353, 0xb968d1d1, 0x00000000, 0xc12ceded,
-  0x40602020, 0xe31ffcfc, 0x79c8b1b1, 0xb6ed5b5b,
-  0xd4be6a6a, 0x8d46cbcb, 0x67d9bebe, 0x724b3939,
-  0x94de4a4a, 0x98d44c4c, 0xb0e85858, 0x854acfcf,
-  0xbb6bd0d0, 0xc52aefef, 0x4fe5aaaa, 0xed16fbfb,
-  0x86c54343, 0x9ad74d4d, 0x66553333, 0x11948585,
-  0x8acf4545, 0xe910f9f9, 0x04060202, 0xfe817f7f,
-  0xa0f05050, 0x78443c3c, 0x25ba9f9f, 0x4be3a8a8,
-  0xa2f35151, 0x5dfea3a3, 0x80c04040, 0x058a8f8f,
-  0x3fad9292, 0x21bc9d9d, 0x70483838, 0xf104f5f5,
-  0x63dfbcbc, 0x77c1b6b6, 0xaf75dada, 0x42632121,
-  0x20301010, 0xe51affff, 0xfd0ef3f3, 0xbf6dd2d2,
-  0x814ccdcd, 0x18140c0c, 0x26351313, 0xc32fecec,
-  0xbee15f5f, 0x35a29797, 0x88cc4444, 0x2e391717,
-  0x9357c4c4, 0x55f2a7a7, 0xfc827e7e, 0x7a473d3d,
-  0xc8ac6464, 0xbae75d5d, 0x322b1919, 0xe6957373,
-  0xc0a06060, 0x19988181, 0x9ed14f4f, 0xa37fdcdc,
-  0x44662222, 0x547e2a2a, 0x3bab9090, 0x0b838888,
-  0x8cca4646, 0xc729eeee, 0x6bd3b8b8, 0x283c1414,
-  0xa779dede, 0xbce25e5e, 0x161d0b0b, 0xad76dbdb,
-  0xdb3be0e0, 0x64563232, 0x744e3a3a, 0x141e0a0a,
-  0x92db4949, 0x0c0a0606, 0x486c2424, 0xb8e45c5c,
-  0x9f5dc2c2, 0xbd6ed3d3, 0x43efacac, 0xc4a66262,
-  0x39a89191, 0x31a49595, 0xd337e4e4, 0xf28b7979,
-  0xd532e7e7, 0x8b43c8c8, 0x6e593737, 0xdab76d6d,
-  0x018c8d8d, 0xb164d5d5, 0x9cd24e4e, 0x49e0a9a9,
-  0xd8b46c6c, 0xacfa5656, 0xf307f4f4, 0xcf25eaea,
-  0xcaaf6565, 0xf48e7a7a, 0x47e9aeae, 0x10180808,
-  0x6fd5baba, 0xf0887878, 0x4a6f2525, 0x5c722e2e,
-  0x38241c1c, 0x57f1a6a6, 0x73c7b4b4, 0x9751c6c6,
-  0xcb23e8e8, 0xa17cdddd, 0xe89c7474, 0x3e211f1f,
-  0x96dd4b4b, 0x61dcbdbd, 0x0d868b8b, 0x0f858a8a,
-  0xe0907070, 0x7c423e3e, 0x71c4b5b5, 0xccaa6666,
-  0x90d84848, 0x06050303, 0xf701f6f6, 0x1c120e0e,
-  0xc2a36161, 0x6a5f3535, 0xaef95757, 0x69d0b9b9,
-  0x17918686, 0x9958c1c1, 0x3a271d1d, 0x27b99e9e,
-  0xd938e1e1, 0xeb13f8f8, 0x2bb39898, 0x22331111,
-  0xd2bb6969, 0xa970d9d9, 0x07898e8e, 0x33a79494,
-  0x2db69b9b, 0x3c221e1e, 0x15928787, 0xc920e9e9,
-  0x8749cece, 0xaaff5555, 0x50782828, 0xa57adfdf,
-  0x038f8c8c, 0x59f8a1a1, 0x09808989, 0x1a170d0d,
-  0x65dabfbf, 0xd731e6e6, 0x84c64242, 0xd0b86868,
-  0x82c34141, 0x29b09999, 0x5a772d2d, 0x1e110f0f,
-  0x7bcbb0b0, 0xa8fc5454, 0x6dd6bbbb, 0x2c3a1616
-}
-};
-
-static const u4byte  it_tab[4][256] = {
-{
-  0x50a7f451, 0x5365417e, 0xc3a4171a, 0x965e273a,
-  0xcb6bab3b, 0xf1459d1f, 0xab58faac, 0x9303e34b,
-  0x55fa3020, 0xf66d76ad, 0x9176cc88, 0x254c02f5,
-  0xfcd7e54f, 0xd7cb2ac5, 0x80443526, 0x8fa362b5,
-  0x495ab1de, 0x671bba25, 0x980eea45, 0xe1c0fe5d,
-  0x02752fc3, 0x12f04c81, 0xa397468d, 0xc6f9d36b,
-  0xe75f8f03, 0x959c9215, 0xeb7a6dbf, 0xda595295,
-  0x2d83bed4, 0xd3217458, 0x2969e049, 0x44c8c98e,
-  0x6a89c275, 0x78798ef4, 0x6b3e5899, 0xdd71b927,
-  0xb64fe1be, 0x17ad88f0, 0x66ac20c9, 0xb43ace7d,
-  0x184adf63, 0x82311ae5, 0x60335197, 0x457f5362,
-  0xe07764b1, 0x84ae6bbb, 0x1ca081fe, 0x942b08f9,
-  0x58684870, 0x19fd458f, 0x876cde94, 0xb7f87b52,
-  0x23d373ab, 0xe2024b72, 0x578f1fe3, 0x2aab5566,
-  0x0728ebb2, 0x03c2b52f, 0x9a7bc586, 0xa50837d3,
-  0xf2872830, 0xb2a5bf23, 0xba6a0302, 0x5c8216ed,
-  0x2b1ccf8a, 0x92b479a7, 0xf0f207f3, 0xa1e2694e,
-  0xcdf4da65, 0xd5be0506, 0x1f6234d1, 0x8afea6c4,
-  0x9d532e34, 0xa055f3a2, 0x32e18a05, 0x75ebf6a4,
-  0x39ec830b, 0xaaef6040, 0x069f715e, 0x51106ebd,
-  0xf98a213e, 0x3d06dd96, 0xae053edd, 0x46bde64d,
-  0xb58d5491, 0x055dc471, 0x6fd40604, 0xff155060,
-  0x24fb9819, 0x97e9bdd6, 0xcc434089, 0x779ed967,
-  0xbd42e8b0, 0x888b8907, 0x385b19e7, 0xdbeec879,
-  0x470a7ca1, 0xe90f427c, 0xc91e84f8, 0x00000000,
-  0x83868009, 0x48ed2b32, 0xac70111e, 0x4e725a6c,
-  0xfbff0efd, 0x5638850f, 0x1ed5ae3d, 0x27392d36,
-  0x64d90f0a, 0x21a65c68, 0xd1545b9b, 0x3a2e3624,
-  0xb1670a0c, 0x0fe75793, 0xd296eeb4, 0x9e919b1b,
-  0x4fc5c080, 0xa220dc61, 0x694b775a, 0x161a121c,
-  0x0aba93e2, 0xe52aa0c0, 0x43e0223c, 0x1d171b12,
-  0x0b0d090e, 0xadc78bf2, 0xb9a8b62d, 0xc8a91e14,
-  0x8519f157, 0x4c0775af, 0xbbdd99ee, 0xfd607fa3,
-  0x9f2601f7, 0xbcf5725c, 0xc53b6644, 0x347efb5b,
-  0x7629438b, 0xdcc623cb, 0x68fcedb6, 0x63f1e4b8,
-  0xcadc31d7, 0x10856342, 0x40229713, 0x2011c684,
-  0x7d244a85, 0xf83dbbd2, 0x1132f9ae, 0x6da129c7,
-  0x4b2f9e1d, 0xf330b2dc, 0xec52860d, 0xd0e3c177,
-  0x6c16b32b, 0x99b970a9, 0xfa489411, 0x2264e947,
-  0xc48cfca8, 0x1a3ff0a0, 0xd82c7d56, 0xef903322,
-  0xc74e4987, 0xc1d138d9, 0xfea2ca8c, 0x360bd498,
-  0xcf81f5a6, 0x28de7aa5, 0x268eb7da, 0xa4bfad3f,
-  0xe49d3a2c, 0x0d927850, 0x9bcc5f6a, 0x62467e54,
-  0xc2138df6, 0xe8b8d890, 0x5ef7392e, 0xf5afc382,
-  0xbe805d9f, 0x7c93d069, 0xa92dd56f, 0xb31225cf,
-  0x3b99acc8, 0xa77d1810, 0x6e639ce8, 0x7bbb3bdb,
-  0x097826cd, 0xf418596e, 0x01b79aec, 0xa89a4f83,
-  0x656e95e6, 0x7ee6ffaa, 0x08cfbc21, 0xe6e815ef,
-  0xd99be7ba, 0xce366f4a, 0xd4099fea, 0xd67cb029,
-  0xafb2a431, 0x31233f2a, 0x3094a5c6, 0xc066a235,
-  0x37bc4e74, 0xa6ca82fc, 0xb0d090e0, 0x15d8a733,
-  0x4a9804f1, 0xf7daec41, 0x0e50cd7f, 0x2ff69117,
-  0x8dd64d76, 0x4db0ef43, 0x544daacc, 0xdf0496e4,
-  0xe3b5d19e, 0x1b886a4c, 0xb81f2cc1, 0x7f516546,
-  0x04ea5e9d, 0x5d358c01, 0x737487fa, 0x2e410bfb,
-  0x5a1d67b3, 0x52d2db92, 0x335610e9, 0x1347d66d,
-  0x8c61d79a, 0x7a0ca137, 0x8e14f859, 0x893c13eb,
-  0xee27a9ce, 0x35c961b7, 0xede51ce1, 0x3cb1477a,
-  0x59dfd29c, 0x3f73f255, 0x79ce1418, 0xbf37c773,
-  0xeacdf753, 0x5baafd5f, 0x146f3ddf, 0x86db4478,
-  0x81f3afca, 0x3ec468b9, 0x2c342438, 0x5f40a3c2,
-  0x72c31d16, 0x0c25e2bc, 0x8b493c28, 0x41950dff,
-  0x7101a839, 0xdeb30c08, 0x9ce4b4d8, 0x90c15664,
-  0x6184cb7b, 0x70b632d5, 0x745c6c48, 0x4257b8d0
-}, {
-  0xa7f45150, 0x65417e53, 0xa4171ac3, 0x5e273a96,
-  0x6bab3bcb, 0x459d1ff1, 0x58faacab, 0x03e34b93,
-  0xfa302055, 0x6d76adf6, 0x76cc8891, 0x4c02f525,
-  0xd7e54ffc, 0xcb2ac5d7, 0x44352680, 0xa362b58f,
-  0x5ab1de49, 0x1bba2567, 0x0eea4598, 0xc0fe5de1,
-  0x752fc302, 0xf04c8112, 0x97468da3, 0xf9d36bc6,
-  0x5f8f03e7, 0x9c921595, 0x7a6dbfeb, 0x595295da,
-  0x83bed42d, 0x217458d3, 0x69e04929, 0xc8c98e44,
-  0x89c2756a, 0x798ef478, 0x3e58996b, 0x71b927dd,
-  0x4fe1beb6, 0xad88f017, 0xac20c966, 0x3ace7db4,
-  0x4adf6318, 0x311ae582, 0x33519760, 0x7f536245,
-  0x7764b1e0, 0xae6bbb84, 0xa081fe1c, 0x2b08f994,
-  0x68487058, 0xfd458f19, 0x6cde9487, 0xf87b52b7,
-  0xd373ab23, 0x024b72e2, 0x8f1fe357, 0xab55662a,
-  0x28ebb207, 0xc2b52f03, 0x7bc5869a, 0x0837d3a5,
-  0x872830f2, 0xa5bf23b2, 0x6a0302ba, 0x8216ed5c,
-  0x1ccf8a2b, 0xb479a792, 0xf207f3f0, 0xe2694ea1,
-  0xf4da65cd, 0xbe0506d5, 0x6234d11f, 0xfea6c48a,
-  0x532e349d, 0x55f3a2a0, 0xe18a0532, 0xebf6a475,
-  0xec830b39, 0xef6040aa, 0x9f715e06, 0x106ebd51,
-  0x8a213ef9, 0x06dd963d, 0x053eddae, 0xbde64d46,
-  0x8d5491b5, 0x5dc47105, 0xd406046f, 0x155060ff,
-  0xfb981924, 0xe9bdd697, 0x434089cc, 0x9ed96777,
-  0x42e8b0bd, 0x8b890788, 0x5b19e738, 0xeec879db,
-  0x0a7ca147, 0x0f427ce9, 0x1e84f8c9, 0x00000000,
-  0x86800983, 0xed2b3248, 0x70111eac, 0x725a6c4e,
-  0xff0efdfb, 0x38850f56, 0xd5ae3d1e, 0x392d3627,
-  0xd90f0a64, 0xa65c6821, 0x545b9bd1, 0x2e36243a,
-  0x670a0cb1, 0xe757930f, 0x96eeb4d2, 0x919b1b9e,
-  0xc5c0804f, 0x20dc61a2, 0x4b775a69, 0x1a121c16,
-  0xba93e20a, 0x2aa0c0e5, 0xe0223c43, 0x171b121d,
-  0x0d090e0b, 0xc78bf2ad, 0xa8b62db9, 0xa91e14c8,
-  0x19f15785, 0x0775af4c, 0xdd99eebb, 0x607fa3fd,
-  0x2601f79f, 0xf5725cbc, 0x3b6644c5, 0x7efb5b34,
-  0x29438b76, 0xc623cbdc, 0xfcedb668, 0xf1e4b863,
-  0xdc31d7ca, 0x85634210, 0x22971340, 0x11c68420,
-  0x244a857d, 0x3dbbd2f8, 0x32f9ae11, 0xa129c76d,
-  0x2f9e1d4b, 0x30b2dcf3, 0x52860dec, 0xe3c177d0,
-  0x16b32b6c, 0xb970a999, 0x489411fa, 0x64e94722,
-  0x8cfca8c4, 0x3ff0a01a, 0x2c7d56d8, 0x903322ef,
-  0x4e4987c7, 0xd138d9c1, 0xa2ca8cfe, 0x0bd49836,
-  0x81f5a6cf, 0xde7aa528, 0x8eb7da26, 0xbfad3fa4,
-  0x9d3a2ce4, 0x9278500d, 0xcc5f6a9b, 0x467e5462,
-  0x138df6c2, 0xb8d890e8, 0xf7392e5e, 0xafc382f5,
-  0x805d9fbe, 0x93d0697c, 0x2dd56fa9, 0x1225cfb3,
-  0x99acc83b, 0x7d1810a7, 0x639ce86e, 0xbb3bdb7b,
-  0x7826cd09, 0x18596ef4, 0xb79aec01, 0x9a4f83a8,
-  0x6e95e665, 0xe6ffaa7e, 0xcfbc2108, 0xe815efe6,
-  0x9be7bad9, 0x366f4ace, 0x099fead4, 0x7cb029d6,
-  0xb2a431af, 0x233f2a31, 0x94a5c630, 0x66a235c0,
-  0xbc4e7437, 0xca82fca6, 0xd090e0b0, 0xd8a73315,
-  0x9804f14a, 0xdaec41f7, 0x50cd7f0e, 0xf691172f,
-  0xd64d768d, 0xb0ef434d, 0x4daacc54, 0x0496e4df,
-  0xb5d19ee3, 0x886a4c1b, 0x1f2cc1b8, 0x5165467f,
-  0xea5e9d04, 0x358c015d, 0x7487fa73, 0x410bfb2e,
-  0x1d67b35a, 0xd2db9252, 0x5610e933, 0x47d66d13,
-  0x61d79a8c, 0x0ca1377a, 0x14f8598e, 0x3c13eb89,
-  0x27a9ceee, 0xc961b735, 0xe51ce1ed, 0xb1477a3c,
-  0xdfd29c59, 0x73f2553f, 0xce141879, 0x37c773bf,
-  0xcdf753ea, 0xaafd5f5b, 0x6f3ddf14, 0xdb447886,
-  0xf3afca81, 0xc468b93e, 0x3424382c, 0x40a3c25f,
-  0xc31d1672, 0x25e2bc0c, 0x493c288b, 0x950dff41,
-  0x01a83971, 0xb30c08de, 0xe4b4d89c, 0xc1566490,
-  0x84cb7b61, 0xb632d570, 0x5c6c4874, 0x57b8d042
-}, {
-  0xf45150a7, 0x417e5365, 0x171ac3a4, 0x273a965e,
-  0xab3bcb6b, 0x9d1ff145, 0xfaacab58, 0xe34b9303,
-  0x302055fa, 0x76adf66d, 0xcc889176, 0x02f5254c,
-  0xe54ffcd7, 0x2ac5d7cb, 0x35268044, 0x62b58fa3,
-  0xb1de495a, 0xba25671b, 0xea45980e, 0xfe5de1c0,
-  0x2fc30275, 0x4c8112f0, 0x468da397, 0xd36bc6f9,
-  0x8f03e75f, 0x9215959c, 0x6dbfeb7a, 0x5295da59,
-  0xbed42d83, 0x7458d321, 0xe0492969, 0xc98e44c8,
-  0xc2756a89, 0x8ef47879, 0x58996b3e, 0xb927dd71,
-  0xe1beb64f, 0x88f017ad, 0x20c966ac, 0xce7db43a,
-  0xdf63184a, 0x1ae58231, 0x51976033, 0x5362457f,
-  0x64b1e077, 0x6bbb84ae, 0x81fe1ca0, 0x08f9942b,
-  0x48705868, 0x458f19fd, 0xde94876c, 0x7b52b7f8,
-  0x73ab23d3, 0x4b72e202, 0x1fe3578f, 0x55662aab,
-  0xebb20728, 0xb52f03c2, 0xc5869a7b, 0x37d3a508,
-  0x2830f287, 0xbf23b2a5, 0x0302ba6a, 0x16ed5c82,
-  0xcf8a2b1c, 0x79a792b4, 0x07f3f0f2, 0x694ea1e2,
-  0xda65cdf4, 0x0506d5be, 0x34d11f62, 0xa6c48afe,
-  0x2e349d53, 0xf3a2a055, 0x8a0532e1, 0xf6a475eb,
-  0x830b39ec, 0x6040aaef, 0x715e069f, 0x6ebd5110,
-  0x213ef98a, 0xdd963d06, 0x3eddae05, 0xe64d46bd,
-  0x5491b58d, 0xc471055d, 0x06046fd4, 0x5060ff15,
-  0x981924fb, 0xbdd697e9, 0x4089cc43, 0xd967779e,
-  0xe8b0bd42, 0x8907888b, 0x19e7385b, 0xc879dbee,
-  0x7ca1470a, 0x427ce90f, 0x84f8c91e, 0x00000000,
-  0x80098386, 0x2b3248ed, 0x111eac70, 0x5a6c4e72,
-  0x0efdfbff, 0x850f5638, 0xae3d1ed5, 0x2d362739,
-  0x0f0a64d9, 0x5c6821a6, 0x5b9bd154, 0x36243a2e,
-  0x0a0cb167, 0x57930fe7, 0xeeb4d296, 0x9b1b9e91,
-  0xc0804fc5, 0xdc61a220, 0x775a694b, 0x121c161a,
-  0x93e20aba, 0xa0c0e52a, 0x223c43e0, 0x1b121d17,
-  0x090e0b0d, 0x8bf2adc7, 0xb62db9a8, 0x1e14c8a9,
-  0xf1578519, 0x75af4c07, 0x99eebbdd, 0x7fa3fd60,
-  0x01f79f26, 0x725cbcf5, 0x6644c53b, 0xfb5b347e,
-  0x438b7629, 0x23cbdcc6, 0xedb668fc, 0xe4b863f1,
-  0x31d7cadc, 0x63421085, 0x97134022, 0xc6842011,
-  0x4a857d24, 0xbbd2f83d, 0xf9ae1132, 0x29c76da1,
-  0x9e1d4b2f, 0xb2dcf330, 0x860dec52, 0xc177d0e3,
-  0xb32b6c16, 0x70a999b9, 0x9411fa48, 0xe9472264,
-  0xfca8c48c, 0xf0a01a3f, 0x7d56d82c, 0x3322ef90,
-  0x4987c74e, 0x38d9c1d1, 0xca8cfea2, 0xd498360b,
-  0xf5a6cf81, 0x7aa528de, 0xb7da268e, 0xad3fa4bf,
-  0x3a2ce49d, 0x78500d92, 0x5f6a9bcc, 0x7e546246,
-  0x8df6c213, 0xd890e8b8, 0x392e5ef7, 0xc382f5af,
-  0x5d9fbe80, 0xd0697c93, 0xd56fa92d, 0x25cfb312,
-  0xacc83b99, 0x1810a77d, 0x9ce86e63, 0x3bdb7bbb,
-  0x26cd0978, 0x596ef418, 0x9aec01b7, 0x4f83a89a,
-  0x95e6656e, 0xffaa7ee6, 0xbc2108cf, 0x15efe6e8,
-  0xe7bad99b, 0x6f4ace36, 0x9fead409, 0xb029d67c,
-  0xa431afb2, 0x3f2a3123, 0xa5c63094, 0xa235c066,
-  0x4e7437bc, 0x82fca6ca, 0x90e0b0d0, 0xa73315d8,
-  0x04f14a98, 0xec41f7da, 0xcd7f0e50, 0x91172ff6,
-  0x4d768dd6, 0xef434db0, 0xaacc544d, 0x96e4df04,
-  0xd19ee3b5, 0x6a4c1b88, 0x2cc1b81f, 0x65467f51,
-  0x5e9d04ea, 0x8c015d35, 0x87fa7374, 0x0bfb2e41,
-  0x67b35a1d, 0xdb9252d2, 0x10e93356, 0xd66d1347,
-  0xd79a8c61, 0xa1377a0c, 0xf8598e14, 0x13eb893c,
-  0xa9ceee27, 0x61b735c9, 0x1ce1ede5, 0x477a3cb1,
-  0xd29c59df, 0xf2553f73, 0x141879ce, 0xc773bf37,
-  0xf753eacd, 0xfd5f5baa, 0x3ddf146f, 0x447886db,
-  0xafca81f3, 0x68b93ec4, 0x24382c34, 0xa3c25f40,
-  0x1d1672c3, 0xe2bc0c25, 0x3c288b49, 0x0dff4195,
-  0xa8397101, 0x0c08deb3, 0xb4d89ce4, 0x566490c1,
-  0xcb7b6184, 0x32d570b6, 0x6c48745c, 0xb8d04257
-}, {
-  0x5150a7f4, 0x7e536541, 0x1ac3a417, 0x3a965e27,
-  0x3bcb6bab, 0x1ff1459d, 0xacab58fa, 0x4b9303e3,
-  0x2055fa30, 0xadf66d76, 0x889176cc, 0xf5254c02,
-  0x4ffcd7e5, 0xc5d7cb2a, 0x26804435, 0xb58fa362,
-  0xde495ab1, 0x25671bba, 0x45980eea, 0x5de1c0fe,
-  0xc302752f, 0x8112f04c, 0x8da39746, 0x6bc6f9d3,
-  0x03e75f8f, 0x15959c92, 0xbfeb7a6d, 0x95da5952,
-  0xd42d83be, 0x58d32174, 0x492969e0, 0x8e44c8c9,
-  0x756a89c2, 0xf478798e, 0x996b3e58, 0x27dd71b9,
-  0xbeb64fe1, 0xf017ad88, 0xc966ac20, 0x7db43ace,
-  0x63184adf, 0xe582311a, 0x97603351, 0x62457f53,
-  0xb1e07764, 0xbb84ae6b, 0xfe1ca081, 0xf9942b08,
-  0x70586848, 0x8f19fd45, 0x94876cde, 0x52b7f87b,
-  0xab23d373, 0x72e2024b, 0xe3578f1f, 0x662aab55,
-  0xb20728eb, 0x2f03c2b5, 0x869a7bc5, 0xd3a50837,
-  0x30f28728, 0x23b2a5bf, 0x02ba6a03, 0xed5c8216,
-  0x8a2b1ccf, 0xa792b479, 0xf3f0f207, 0x4ea1e269,
-  0x65cdf4da, 0x06d5be05, 0xd11f6234, 0xc48afea6,
-  0x349d532e, 0xa2a055f3, 0x0532e18a, 0xa475ebf6,
-  0x0b39ec83, 0x40aaef60, 0x5e069f71, 0xbd51106e,
-  0x3ef98a21, 0x963d06dd, 0xddae053e, 0x4d46bde6,
-  0x91b58d54, 0x71055dc4, 0x046fd406, 0x60ff1550,
-  0x1924fb98, 0xd697e9bd, 0x89cc4340, 0x67779ed9,
-  0xb0bd42e8, 0x07888b89, 0xe7385b19, 0x79dbeec8,
-  0xa1470a7c, 0x7ce90f42, 0xf8c91e84, 0x00000000,
-  0x09838680, 0x3248ed2b, 0x1eac7011, 0x6c4e725a,
-  0xfdfbff0e, 0x0f563885, 0x3d1ed5ae, 0x3627392d,
-  0x0a64d90f, 0x6821a65c, 0x9bd1545b, 0x243a2e36,
-  0x0cb1670a, 0x930fe757, 0xb4d296ee, 0x1b9e919b,
-  0x804fc5c0, 0x61a220dc, 0x5a694b77, 0x1c161a12,
-  0xe20aba93, 0xc0e52aa0, 0x3c43e022, 0x121d171b,
-  0x0e0b0d09, 0xf2adc78b, 0x2db9a8b6, 0x14c8a91e,
-  0x578519f1, 0xaf4c0775, 0xeebbdd99, 0xa3fd607f,
-  0xf79f2601, 0x5cbcf572, 0x44c53b66, 0x5b347efb,
-  0x8b762943, 0xcbdcc623, 0xb668fced, 0xb863f1e4,
-  0xd7cadc31, 0x42108563, 0x13402297, 0x842011c6,
-  0x857d244a, 0xd2f83dbb, 0xae1132f9, 0xc76da129,
-  0x1d4b2f9e, 0xdcf330b2, 0x0dec5286, 0x77d0e3c1,
-  0x2b6c16b3, 0xa999b970, 0x11fa4894, 0x472264e9,
-  0xa8c48cfc, 0xa01a3ff0, 0x56d82c7d, 0x22ef9033,
-  0x87c74e49, 0xd9c1d138, 0x8cfea2ca, 0x98360bd4,
-  0xa6cf81f5, 0xa528de7a, 0xda268eb7, 0x3fa4bfad,
-  0x2ce49d3a, 0x500d9278, 0x6a9bcc5f, 0x5462467e,
-  0xf6c2138d, 0x90e8b8d8, 0x2e5ef739, 0x82f5afc3,
-  0x9fbe805d, 0x697c93d0, 0x6fa92dd5, 0xcfb31225,
-  0xc83b99ac, 0x10a77d18, 0xe86e639c, 0xdb7bbb3b,
-  0xcd097826, 0x6ef41859, 0xec01b79a, 0x83a89a4f,
-  0xe6656e95, 0xaa7ee6ff, 0x2108cfbc, 0xefe6e815,
-  0xbad99be7, 0x4ace366f, 0xead4099f, 0x29d67cb0,
-  0x31afb2a4, 0x2a31233f, 0xc63094a5, 0x35c066a2,
-  0x7437bc4e, 0xfca6ca82, 0xe0b0d090, 0x3315d8a7,
-  0xf14a9804, 0x41f7daec, 0x7f0e50cd, 0x172ff691,
-  0x768dd64d, 0x434db0ef, 0xcc544daa, 0xe4df0496,
-  0x9ee3b5d1, 0x4c1b886a, 0xc1b81f2c, 0x467f5165,
-  0x9d04ea5e, 0x015d358c, 0xfa737487, 0xfb2e410b,
-  0xb35a1d67, 0x9252d2db, 0xe9335610, 0x6d1347d6,
-  0x9a8c61d7, 0x377a0ca1, 0x598e14f8, 0xeb893c13,
-  0xceee27a9, 0xb735c961, 0xe1ede51c, 0x7a3cb147,
-  0x9c59dfd2, 0x553f73f2, 0x1879ce14, 0x73bf37c7,
-  0x53eacdf7, 0x5f5baafd, 0xdf146f3d, 0x7886db44,
-  0xca81f3af, 0xb93ec468, 0x382c3424, 0xc25f40a3,
-  0x1672c31d, 0xbc0c25e2, 0x288b493c, 0xff41950d,
-  0x397101a8, 0x08deb30c, 0xd89ce4b4, 0x6490c156,
-  0x7b6184cb, 0xd570b632, 0x48745c6c, 0xd04257b8
-}
-};
-
-static const u4byte  fl_tab[4][256] = {
-{
-  0x00000063, 0x0000007c, 0x00000077, 0x0000007b,
-  0x000000f2, 0x0000006b, 0x0000006f, 0x000000c5,
-  0x00000030, 0x00000001, 0x00000067, 0x0000002b,
-  0x000000fe, 0x000000d7, 0x000000ab, 0x00000076,
-  0x000000ca, 0x00000082, 0x000000c9, 0x0000007d,
-  0x000000fa, 0x00000059, 0x00000047, 0x000000f0,
-  0x000000ad, 0x000000d4, 0x000000a2, 0x000000af,
-  0x0000009c, 0x000000a4, 0x00000072, 0x000000c0,
-  0x000000b7, 0x000000fd, 0x00000093, 0x00000026,
-  0x00000036, 0x0000003f, 0x000000f7, 0x000000cc,
-  0x00000034, 0x000000a5, 0x000000e5, 0x000000f1,
-  0x00000071, 0x000000d8, 0x00000031, 0x00000015,
-  0x00000004, 0x000000c7, 0x00000023, 0x000000c3,
-  0x00000018, 0x00000096, 0x00000005, 0x0000009a,
-  0x00000007, 0x00000012, 0x00000080, 0x000000e2,
-  0x000000eb, 0x00000027, 0x000000b2, 0x00000075,
-  0x00000009, 0x00000083, 0x0000002c, 0x0000001a,
-  0x0000001b, 0x0000006e, 0x0000005a, 0x000000a0,
-  0x00000052, 0x0000003b, 0x000000d6, 0x000000b3,
-  0x00000029, 0x000000e3, 0x0000002f, 0x00000084,
-  0x00000053, 0x000000d1, 0x00000000, 0x000000ed,
-  0x00000020, 0x000000fc, 0x000000b1, 0x0000005b,
-  0x0000006a, 0x000000cb, 0x000000be, 0x00000039,
-  0x0000004a, 0x0000004c, 0x00000058, 0x000000cf,
-  0x000000d0, 0x000000ef, 0x000000aa, 0x000000fb,
-  0x00000043, 0x0000004d, 0x00000033, 0x00000085,
-  0x00000045, 0x000000f9, 0x00000002, 0x0000007f,
-  0x00000050, 0x0000003c, 0x0000009f, 0x000000a8,
-  0x00000051, 0x000000a3, 0x00000040, 0x0000008f,
-  0x00000092, 0x0000009d, 0x00000038, 0x000000f5,
-  0x000000bc, 0x000000b6, 0x000000da, 0x00000021,
-  0x00000010, 0x000000ff, 0x000000f3, 0x000000d2,
-  0x000000cd, 0x0000000c, 0x00000013, 0x000000ec,
-  0x0000005f, 0x00000097, 0x00000044, 0x00000017,
-  0x000000c4, 0x000000a7, 0x0000007e, 0x0000003d,
-  0x00000064, 0x0000005d, 0x00000019, 0x00000073,
-  0x00000060, 0x00000081, 0x0000004f, 0x000000dc,
-  0x00000022, 0x0000002a, 0x00000090, 0x00000088,
-  0x00000046, 0x000000ee, 0x000000b8, 0x00000014,
-  0x000000de, 0x0000005e, 0x0000000b, 0x000000db,
-  0x000000e0, 0x00000032, 0x0000003a, 0x0000000a,
-  0x00000049, 0x00000006, 0x00000024, 0x0000005c,
-  0x000000c2, 0x000000d3, 0x000000ac, 0x00000062,
-  0x00000091, 0x00000095, 0x000000e4, 0x00000079,
-  0x000000e7, 0x000000c8, 0x00000037, 0x0000006d,
-  0x0000008d, 0x000000d5, 0x0000004e, 0x000000a9,
-  0x0000006c, 0x00000056, 0x000000f4, 0x000000ea,
-  0x00000065, 0x0000007a, 0x000000ae, 0x00000008,
-  0x000000ba, 0x00000078, 0x00000025, 0x0000002e,
-  0x0000001c, 0x000000a6, 0x000000b4, 0x000000c6,
-  0x000000e8, 0x000000dd, 0x00000074, 0x0000001f,
-  0x0000004b, 0x000000bd, 0x0000008b, 0x0000008a,
-  0x00000070, 0x0000003e, 0x000000b5, 0x00000066,
-  0x00000048, 0x00000003, 0x000000f6, 0x0000000e,
-  0x00000061, 0x00000035, 0x00000057, 0x000000b9,
-  0x00000086, 0x000000c1, 0x0000001d, 0x0000009e,
-  0x000000e1, 0x000000f8, 0x00000098, 0x00000011,
-  0x00000069, 0x000000d9, 0x0000008e, 0x00000094,
-  0x0000009b, 0x0000001e, 0x00000087, 0x000000e9,
-  0x000000ce, 0x00000055, 0x00000028, 0x000000df,
-  0x0000008c, 0x000000a1, 0x00000089, 0x0000000d,
-  0x000000bf, 0x000000e6, 0x00000042, 0x00000068,
-  0x00000041, 0x00000099, 0x0000002d, 0x0000000f,
-  0x000000b0, 0x00000054, 0x000000bb, 0x00000016
-}, {
-  0x00006300, 0x00007c00, 0x00007700, 0x00007b00,
-  0x0000f200, 0x00006b00, 0x00006f00, 0x0000c500,
-  0x00003000, 0x00000100, 0x00006700, 0x00002b00,
-  0x0000fe00, 0x0000d700, 0x0000ab00, 0x00007600,
-  0x0000ca00, 0x00008200, 0x0000c900, 0x00007d00,
-  0x0000fa00, 0x00005900, 0x00004700, 0x0000f000,
-  0x0000ad00, 0x0000d400, 0x0000a200, 0x0000af00,
-  0x00009c00, 0x0000a400, 0x00007200, 0x0000c000,
-  0x0000b700, 0x0000fd00, 0x00009300, 0x00002600,
-  0x00003600, 0x00003f00, 0x0000f700, 0x0000cc00,
-  0x00003400, 0x0000a500, 0x0000e500, 0x0000f100,
-  0x00007100, 0x0000d800, 0x00003100, 0x00001500,
-  0x00000400, 0x0000c700, 0x00002300, 0x0000c300,
-  0x00001800, 0x00009600, 0x00000500, 0x00009a00,
-  0x00000700, 0x00001200, 0x00008000, 0x0000e200,
-  0x0000eb00, 0x00002700, 0x0000b200, 0x00007500,
-  0x00000900, 0x00008300, 0x00002c00, 0x00001a00,
-  0x00001b00, 0x00006e00, 0x00005a00, 0x0000a000,
-  0x00005200, 0x00003b00, 0x0000d600, 0x0000b300,
-  0x00002900, 0x0000e300, 0x00002f00, 0x00008400,
-  0x00005300, 0x0000d100, 0x00000000, 0x0000ed00,
-  0x00002000, 0x0000fc00, 0x0000b100, 0x00005b00,
-  0x00006a00, 0x0000cb00, 0x0000be00, 0x00003900,
-  0x00004a00, 0x00004c00, 0x00005800, 0x0000cf00,
-  0x0000d000, 0x0000ef00, 0x0000aa00, 0x0000fb00,
-  0x00004300, 0x00004d00, 0x00003300, 0x00008500,
-  0x00004500, 0x0000f900, 0x00000200, 0x00007f00,
-  0x00005000, 0x00003c00, 0x00009f00, 0x0000a800,
-  0x00005100, 0x0000a300, 0x00004000, 0x00008f00,
-  0x00009200, 0x00009d00, 0x00003800, 0x0000f500,
-  0x0000bc00, 0x0000b600, 0x0000da00, 0x00002100,
-  0x00001000, 0x0000ff00, 0x0000f300, 0x0000d200,
-  0x0000cd00, 0x00000c00, 0x00001300, 0x0000ec00,
-  0x00005f00, 0x00009700, 0x00004400, 0x00001700,
-  0x0000c400, 0x0000a700, 0x00007e00, 0x00003d00,
-  0x00006400, 0x00005d00, 0x00001900, 0x00007300,
-  0x00006000, 0x00008100, 0x00004f00, 0x0000dc00,
-  0x00002200, 0x00002a00, 0x00009000, 0x00008800,
-  0x00004600, 0x0000ee00, 0x0000b800, 0x00001400,
-  0x0000de00, 0x00005e00, 0x00000b00, 0x0000db00,
-  0x0000e000, 0x00003200, 0x00003a00, 0x00000a00,
-  0x00004900, 0x00000600, 0x00002400, 0x00005c00,
-  0x0000c200, 0x0000d300, 0x0000ac00, 0x00006200,
-  0x00009100, 0x00009500, 0x0000e400, 0x00007900,
-  0x0000e700, 0x0000c800, 0x00003700, 0x00006d00,
-  0x00008d00, 0x0000d500, 0x00004e00, 0x0000a900,
-  0x00006c00, 0x00005600, 0x0000f400, 0x0000ea00,
-  0x00006500, 0x00007a00, 0x0000ae00, 0x00000800,
-  0x0000ba00, 0x00007800, 0x00002500, 0x00002e00,
-  0x00001c00, 0x0000a600, 0x0000b400, 0x0000c600,
-  0x0000e800, 0x0000dd00, 0x00007400, 0x00001f00,
-  0x00004b00, 0x0000bd00, 0x00008b00, 0x00008a00,
-  0x00007000, 0x00003e00, 0x0000b500, 0x00006600,
-  0x00004800, 0x00000300, 0x0000f600, 0x00000e00,
-  0x00006100, 0x00003500, 0x00005700, 0x0000b900,
-  0x00008600, 0x0000c100, 0x00001d00, 0x00009e00,
-  0x0000e100, 0x0000f800, 0x00009800, 0x00001100,
-  0x00006900, 0x0000d900, 0x00008e00, 0x00009400,
-  0x00009b00, 0x00001e00, 0x00008700, 0x0000e900,
-  0x0000ce00, 0x00005500, 0x00002800, 0x0000df00,
-  0x00008c00, 0x0000a100, 0x00008900, 0x00000d00,
-  0x0000bf00, 0x0000e600, 0x00004200, 0x00006800,
-  0x00004100, 0x00009900, 0x00002d00, 0x00000f00,
-  0x0000b000, 0x00005400, 0x0000bb00, 0x00001600
-}, {
-  0x00630000, 0x007c0000, 0x00770000, 0x007b0000,
-  0x00f20000, 0x006b0000, 0x006f0000, 0x00c50000,
-  0x00300000, 0x00010000, 0x00670000, 0x002b0000,
-  0x00fe0000, 0x00d70000, 0x00ab0000, 0x00760000,
-  0x00ca0000, 0x00820000, 0x00c90000, 0x007d0000,
-  0x00fa0000, 0x00590000, 0x00470000, 0x00f00000,
-  0x00ad0000, 0x00d40000, 0x00a20000, 0x00af0000,
-  0x009c0000, 0x00a40000, 0x00720000, 0x00c00000,
-  0x00b70000, 0x00fd0000, 0x00930000, 0x00260000,
-  0x00360000, 0x003f0000, 0x00f70000, 0x00cc0000,
-  0x00340000, 0x00a50000, 0x00e50000, 0x00f10000,
-  0x00710000, 0x00d80000, 0x00310000, 0x00150000,
-  0x00040000, 0x00c70000, 0x00230000, 0x00c30000,
-  0x00180000, 0x00960000, 0x00050000, 0x009a0000,
-  0x00070000, 0x00120000, 0x00800000, 0x00e20000,
-  0x00eb0000, 0x00270000, 0x00b20000, 0x00750000,
-  0x00090000, 0x00830000, 0x002c0000, 0x001a0000,
-  0x001b0000, 0x006e0000, 0x005a0000, 0x00a00000,
-  0x00520000, 0x003b0000, 0x00d60000, 0x00b30000,
-  0x00290000, 0x00e30000, 0x002f0000, 0x00840000,
-  0x00530000, 0x00d10000, 0x00000000, 0x00ed0000,
-  0x00200000, 0x00fc0000, 0x00b10000, 0x005b0000,
-  0x006a0000, 0x00cb0000, 0x00be0000, 0x00390000,
-  0x004a0000, 0x004c0000, 0x00580000, 0x00cf0000,
-  0x00d00000, 0x00ef0000, 0x00aa0000, 0x00fb0000,
-  0x00430000, 0x004d0000, 0x00330000, 0x00850000,
-  0x00450000, 0x00f90000, 0x00020000, 0x007f0000,
-  0x00500000, 0x003c0000, 0x009f0000, 0x00a80000,
-  0x00510000, 0x00a30000, 0x00400000, 0x008f0000,
-  0x00920000, 0x009d0000, 0x00380000, 0x00f50000,
-  0x00bc0000, 0x00b60000, 0x00da0000, 0x00210000,
-  0x00100000, 0x00ff0000, 0x00f30000, 0x00d20000,
-  0x00cd0000, 0x000c0000, 0x00130000, 0x00ec0000,
-  0x005f0000, 0x00970000, 0x00440000, 0x00170000,
-  0x00c40000, 0x00a70000, 0x007e0000, 0x003d0000,
-  0x00640000, 0x005d0000, 0x00190000, 0x00730000,
-  0x00600000, 0x00810000, 0x004f0000, 0x00dc0000,
-  0x00220000, 0x002a0000, 0x00900000, 0x00880000,
-  0x00460000, 0x00ee0000, 0x00b80000, 0x00140000,
-  0x00de0000, 0x005e0000, 0x000b0000, 0x00db0000,
-  0x00e00000, 0x00320000, 0x003a0000, 0x000a0000,
-  0x00490000, 0x00060000, 0x00240000, 0x005c0000,
-  0x00c20000, 0x00d30000, 0x00ac0000, 0x00620000,
-  0x00910000, 0x00950000, 0x00e40000, 0x00790000,
-  0x00e70000, 0x00c80000, 0x00370000, 0x006d0000,
-  0x008d0000, 0x00d50000, 0x004e0000, 0x00a90000,
-  0x006c0000, 0x00560000, 0x00f40000, 0x00ea0000,
-  0x00650000, 0x007a0000, 0x00ae0000, 0x00080000,
-  0x00ba0000, 0x00780000, 0x00250000, 0x002e0000,
-  0x001c0000, 0x00a60000, 0x00b40000, 0x00c60000,
-  0x00e80000, 0x00dd0000, 0x00740000, 0x001f0000,
-  0x004b0000, 0x00bd0000, 0x008b0000, 0x008a0000,
-  0x00700000, 0x003e0000, 0x00b50000, 0x00660000,
-  0x00480000, 0x00030000, 0x00f60000, 0x000e0000,
-  0x00610000, 0x00350000, 0x00570000, 0x00b90000,
-  0x00860000, 0x00c10000, 0x001d0000, 0x009e0000,
-  0x00e10000, 0x00f80000, 0x00980000, 0x00110000,
-  0x00690000, 0x00d90000, 0x008e0000, 0x00940000,
-  0x009b0000, 0x001e0000, 0x00870000, 0x00e90000,
-  0x00ce0000, 0x00550000, 0x00280000, 0x00df0000,
-  0x008c0000, 0x00a10000, 0x00890000, 0x000d0000,
-  0x00bf0000, 0x00e60000, 0x00420000, 0x00680000,
-  0x00410000, 0x00990000, 0x002d0000, 0x000f0000,
-  0x00b00000, 0x00540000, 0x00bb0000, 0x00160000
-}, {
-  0x63000000, 0x7c000000, 0x77000000, 0x7b000000,
-  0xf2000000, 0x6b000000, 0x6f000000, 0xc5000000,
-  0x30000000, 0x01000000, 0x67000000, 0x2b000000,
-  0xfe000000, 0xd7000000, 0xab000000, 0x76000000,
-  0xca000000, 0x82000000, 0xc9000000, 0x7d000000,
-  0xfa000000, 0x59000000, 0x47000000, 0xf0000000,
-  0xad000000, 0xd4000000, 0xa2000000, 0xaf000000,
-  0x9c000000, 0xa4000000, 0x72000000, 0xc0000000,
-  0xb7000000, 0xfd000000, 0x93000000, 0x26000000,
-  0x36000000, 0x3f000000, 0xf7000000, 0xcc000000,
-  0x34000000, 0xa5000000, 0xe5000000, 0xf1000000,
-  0x71000000, 0xd8000000, 0x31000000, 0x15000000,
-  0x04000000, 0xc7000000, 0x23000000, 0xc3000000,
-  0x18000000, 0x96000000, 0x05000000, 0x9a000000,
-  0x07000000, 0x12000000, 0x80000000, 0xe2000000,
-  0xeb000000, 0x27000000, 0xb2000000, 0x75000000,
-  0x09000000, 0x83000000, 0x2c000000, 0x1a000000,
-  0x1b000000, 0x6e000000, 0x5a000000, 0xa0000000,
-  0x52000000, 0x3b000000, 0xd6000000, 0xb3000000,
-  0x29000000, 0xe3000000, 0x2f000000, 0x84000000,
-  0x53000000, 0xd1000000, 0x00000000, 0xed000000,
-  0x20000000, 0xfc000000, 0xb1000000, 0x5b000000,
-  0x6a000000, 0xcb000000, 0xbe000000, 0x39000000,
-  0x4a000000, 0x4c000000, 0x58000000, 0xcf000000,
-  0xd0000000, 0xef000000, 0xaa000000, 0xfb000000,
-  0x43000000, 0x4d000000, 0x33000000, 0x85000000,
-  0x45000000, 0xf9000000, 0x02000000, 0x7f000000,
-  0x50000000, 0x3c000000, 0x9f000000, 0xa8000000,
-  0x51000000, 0xa3000000, 0x40000000, 0x8f000000,
-  0x92000000, 0x9d000000, 0x38000000, 0xf5000000,
-  0xbc000000, 0xb6000000, 0xda000000, 0x21000000,
-  0x10000000, 0xff000000, 0xf3000000, 0xd2000000,
-  0xcd000000, 0x0c000000, 0x13000000, 0xec000000,
-  0x5f000000, 0x97000000, 0x44000000, 0x17000000,
-  0xc4000000, 0xa7000000, 0x7e000000, 0x3d000000,
-  0x64000000, 0x5d000000, 0x19000000, 0x73000000,
-  0x60000000, 0x81000000, 0x4f000000, 0xdc000000,
-  0x22000000, 0x2a000000, 0x90000000, 0x88000000,
-  0x46000000, 0xee000000, 0xb8000000, 0x14000000,
-  0xde000000, 0x5e000000, 0x0b000000, 0xdb000000,
-  0xe0000000, 0x32000000, 0x3a000000, 0x0a000000,
-  0x49000000, 0x06000000, 0x24000000, 0x5c000000,
-  0xc2000000, 0xd3000000, 0xac000000, 0x62000000,
-  0x91000000, 0x95000000, 0xe4000000, 0x79000000,
-  0xe7000000, 0xc8000000, 0x37000000, 0x6d000000,
-  0x8d000000, 0xd5000000, 0x4e000000, 0xa9000000,
-  0x6c000000, 0x56000000, 0xf4000000, 0xea000000,
-  0x65000000, 0x7a000000, 0xae000000, 0x08000000,
-  0xba000000, 0x78000000, 0x25000000, 0x2e000000,
-  0x1c000000, 0xa6000000, 0xb4000000, 0xc6000000,
-  0xe8000000, 0xdd000000, 0x74000000, 0x1f000000,
-  0x4b000000, 0xbd000000, 0x8b000000, 0x8a000000,
-  0x70000000, 0x3e000000, 0xb5000000, 0x66000000,
-  0x48000000, 0x03000000, 0xf6000000, 0x0e000000,
-  0x61000000, 0x35000000, 0x57000000, 0xb9000000,
-  0x86000000, 0xc1000000, 0x1d000000, 0x9e000000,
-  0xe1000000, 0xf8000000, 0x98000000, 0x11000000,
-  0x69000000, 0xd9000000, 0x8e000000, 0x94000000,
-  0x9b000000, 0x1e000000, 0x87000000, 0xe9000000,
-  0xce000000, 0x55000000, 0x28000000, 0xdf000000,
-  0x8c000000, 0xa1000000, 0x89000000, 0x0d000000,
-  0xbf000000, 0xe6000000, 0x42000000, 0x68000000,
-  0x41000000, 0x99000000, 0x2d000000, 0x0f000000,
-  0xb0000000, 0x54000000, 0xbb000000, 0x16000000
-}
-};
-
-static const u4byte  il_tab[4][256] = {
-{
-  0x00000052, 0x00000009, 0x0000006a, 0x000000d5,
-  0x00000030, 0x00000036, 0x000000a5, 0x00000038,
-  0x000000bf, 0x00000040, 0x000000a3, 0x0000009e,
-  0x00000081, 0x000000f3, 0x000000d7, 0x000000fb,
-  0x0000007c, 0x000000e3, 0x00000039, 0x00000082,
-  0x0000009b, 0x0000002f, 0x000000ff, 0x00000087,
-  0x00000034, 0x0000008e, 0x00000043, 0x00000044,
-  0x000000c4, 0x000000de, 0x000000e9, 0x000000cb,
-  0x00000054, 0x0000007b, 0x00000094, 0x00000032,
-  0x000000a6, 0x000000c2, 0x00000023, 0x0000003d,
-  0x000000ee, 0x0000004c, 0x00000095, 0x0000000b,
-  0x00000042, 0x000000fa, 0x000000c3, 0x0000004e,
-  0x00000008, 0x0000002e, 0x000000a1, 0x00000066,
-  0x00000028, 0x000000d9, 0x00000024, 0x000000b2,
-  0x00000076, 0x0000005b, 0x000000a2, 0x00000049,
-  0x0000006d, 0x0000008b, 0x000000d1, 0x00000025,
-  0x00000072, 0x000000f8, 0x000000f6, 0x00000064,
-  0x00000086, 0x00000068, 0x00000098, 0x00000016,
-  0x000000d4, 0x000000a4, 0x0000005c, 0x000000cc,
-  0x0000005d, 0x00000065, 0x000000b6, 0x00000092,
-  0x0000006c, 0x00000070, 0x00000048, 0x00000050,
-  0x000000fd, 0x000000ed, 0x000000b9, 0x000000da,
-  0x0000005e, 0x00000015, 0x00000046, 0x00000057,
-  0x000000a7, 0x0000008d, 0x0000009d, 0x00000084,
-  0x00000090, 0x000000d8, 0x000000ab, 0x00000000,
-  0x0000008c, 0x000000bc, 0x000000d3, 0x0000000a,
-  0x000000f7, 0x000000e4, 0x00000058, 0x00000005,
-  0x000000b8, 0x000000b3, 0x00000045, 0x00000006,
-  0x000000d0, 0x0000002c, 0x0000001e, 0x0000008f,
-  0x000000ca, 0x0000003f, 0x0000000f, 0x00000002,
-  0x000000c1, 0x000000af, 0x000000bd, 0x00000003,
-  0x00000001, 0x00000013, 0x0000008a, 0x0000006b,
-  0x0000003a, 0x00000091, 0x00000011, 0x00000041,
-  0x0000004f, 0x00000067, 0x000000dc, 0x000000ea,
-  0x00000097, 0x000000f2, 0x000000cf, 0x000000ce,
-  0x000000f0, 0x000000b4, 0x000000e6, 0x00000073,
-  0x00000096, 0x000000ac, 0x00000074, 0x00000022,
-  0x000000e7, 0x000000ad, 0x00000035, 0x00000085,
-  0x000000e2, 0x000000f9, 0x00000037, 0x000000e8,
-  0x0000001c, 0x00000075, 0x000000df, 0x0000006e,
-  0x00000047, 0x000000f1, 0x0000001a, 0x00000071,
-  0x0000001d, 0x00000029, 0x000000c5, 0x00000089,
-  0x0000006f, 0x000000b7, 0x00000062, 0x0000000e,
-  0x000000aa, 0x00000018, 0x000000be, 0x0000001b,
-  0x000000fc, 0x00000056, 0x0000003e, 0x0000004b,
-  0x000000c6, 0x000000d2, 0x00000079, 0x00000020,
-  0x0000009a, 0x000000db, 0x000000c0, 0x000000fe,
-  0x00000078, 0x000000cd, 0x0000005a, 0x000000f4,
-  0x0000001f, 0x000000dd, 0x000000a8, 0x00000033,
-  0x00000088, 0x00000007, 0x000000c7, 0x00000031,
-  0x000000b1, 0x00000012, 0x00000010, 0x00000059,
-  0x00000027, 0x00000080, 0x000000ec, 0x0000005f,
-  0x00000060, 0x00000051, 0x0000007f, 0x000000a9,
-  0x00000019, 0x000000b5, 0x0000004a, 0x0000000d,
-  0x0000002d, 0x000000e5, 0x0000007a, 0x0000009f,
-  0x00000093, 0x000000c9, 0x0000009c, 0x000000ef,
-  0x000000a0, 0x000000e0, 0x0000003b, 0x0000004d,
-  0x000000ae, 0x0000002a, 0x000000f5, 0x000000b0,
-  0x000000c8, 0x000000eb, 0x000000bb, 0x0000003c,
-  0x00000083, 0x00000053, 0x00000099, 0x00000061,
-  0x00000017, 0x0000002b, 0x00000004, 0x0000007e,
-  0x000000ba, 0x00000077, 0x000000d6, 0x00000026,
-  0x000000e1, 0x00000069, 0x00000014, 0x00000063,
-  0x00000055, 0x00000021, 0x0000000c, 0x0000007d
-}, {
-  0x00005200, 0x00000900, 0x00006a00, 0x0000d500,
-  0x00003000, 0x00003600, 0x0000a500, 0x00003800,
-  0x0000bf00, 0x00004000, 0x0000a300, 0x00009e00,
-  0x00008100, 0x0000f300, 0x0000d700, 0x0000fb00,
-  0x00007c00, 0x0000e300, 0x00003900, 0x00008200,
-  0x00009b00, 0x00002f00, 0x0000ff00, 0x00008700,
-  0x00003400, 0x00008e00, 0x00004300, 0x00004400,
-  0x0000c400, 0x0000de00, 0x0000e900, 0x0000cb00,
-  0x00005400, 0x00007b00, 0x00009400, 0x00003200,
-  0x0000a600, 0x0000c200, 0x00002300, 0x00003d00,
-  0x0000ee00, 0x00004c00, 0x00009500, 0x00000b00,
-  0x00004200, 0x0000fa00, 0x0000c300, 0x00004e00,
-  0x00000800, 0x00002e00, 0x0000a100, 0x00006600,
-  0x00002800, 0x0000d900, 0x00002400, 0x0000b200,
-  0x00007600, 0x00005b00, 0x0000a200, 0x00004900,
-  0x00006d00, 0x00008b00, 0x0000d100, 0x00002500,
-  0x00007200, 0x0000f800, 0x0000f600, 0x00006400,
-  0x00008600, 0x00006800, 0x00009800, 0x00001600,
-  0x0000d400, 0x0000a400, 0x00005c00, 0x0000cc00,
-  0x00005d00, 0x00006500, 0x0000b600, 0x00009200,
-  0x00006c00, 0x00007000, 0x00004800, 0x00005000,
-  0x0000fd00, 0x0000ed00, 0x0000b900, 0x0000da00,
-  0x00005e00, 0x00001500, 0x00004600, 0x00005700,
-  0x0000a700, 0x00008d00, 0x00009d00, 0x00008400,
-  0x00009000, 0x0000d800, 0x0000ab00, 0x00000000,
-  0x00008c00, 0x0000bc00, 0x0000d300, 0x00000a00,
-  0x0000f700, 0x0000e400, 0x00005800, 0x00000500,
-  0x0000b800, 0x0000b300, 0x00004500, 0x00000600,
-  0x0000d000, 0x00002c00, 0x00001e00, 0x00008f00,
-  0x0000ca00, 0x00003f00, 0x00000f00, 0x00000200,
-  0x0000c100, 0x0000af00, 0x0000bd00, 0x00000300,
-  0x00000100, 0x00001300, 0x00008a00, 0x00006b00,
-  0x00003a00, 0x00009100, 0x00001100, 0x00004100,
-  0x00004f00, 0x00006700, 0x0000dc00, 0x0000ea00,
-  0x00009700, 0x0000f200, 0x0000cf00, 0x0000ce00,
-  0x0000f000, 0x0000b400, 0x0000e600, 0x00007300,
-  0x00009600, 0x0000ac00, 0x00007400, 0x00002200,
-  0x0000e700, 0x0000ad00, 0x00003500, 0x00008500,
-  0x0000e200, 0x0000f900, 0x00003700, 0x0000e800,
-  0x00001c00, 0x00007500, 0x0000df00, 0x00006e00,
-  0x00004700, 0x0000f100, 0x00001a00, 0x00007100,
-  0x00001d00, 0x00002900, 0x0000c500, 0x00008900,
-  0x00006f00, 0x0000b700, 0x00006200, 0x00000e00,
-  0x0000aa00, 0x00001800, 0x0000be00, 0x00001b00,
-  0x0000fc00, 0x00005600, 0x00003e00, 0x00004b00,
-  0x0000c600, 0x0000d200, 0x00007900, 0x00002000,
-  0x00009a00, 0x0000db00, 0x0000c000, 0x0000fe00,
-  0x00007800, 0x0000cd00, 0x00005a00, 0x0000f400,
-  0x00001f00, 0x0000dd00, 0x0000a800, 0x00003300,
-  0x00008800, 0x00000700, 0x0000c700, 0x00003100,
-  0x0000b100, 0x00001200, 0x00001000, 0x00005900,
-  0x00002700, 0x00008000, 0x0000ec00, 0x00005f00,
-  0x00006000, 0x00005100, 0x00007f00, 0x0000a900,
-  0x00001900, 0x0000b500, 0x00004a00, 0x00000d00,
-  0x00002d00, 0x0000e500, 0x00007a00, 0x00009f00,
-  0x00009300, 0x0000c900, 0x00009c00, 0x0000ef00,
-  0x0000a000, 0x0000e000, 0x00003b00, 0x00004d00,
-  0x0000ae00, 0x00002a00, 0x0000f500, 0x0000b000,
-  0x0000c800, 0x0000eb00, 0x0000bb00, 0x00003c00,
-  0x00008300, 0x00005300, 0x00009900, 0x00006100,
-  0x00001700, 0x00002b00, 0x00000400, 0x00007e00,
-  0x0000ba00, 0x00007700, 0x0000d600, 0x00002600,
-  0x0000e100, 0x00006900, 0x00001400, 0x00006300,
-  0x00005500, 0x00002100, 0x00000c00, 0x00007d00
-}, {
-  0x00520000, 0x00090000, 0x006a0000, 0x00d50000,
-  0x00300000, 0x00360000, 0x00a50000, 0x00380000,
-  0x00bf0000, 0x00400000, 0x00a30000, 0x009e0000,
-  0x00810000, 0x00f30000, 0x00d70000, 0x00fb0000,
-  0x007c0000, 0x00e30000, 0x00390000, 0x00820000,
-  0x009b0000, 0x002f0000, 0x00ff0000, 0x00870000,
-  0x00340000, 0x008e0000, 0x00430000, 0x00440000,
-  0x00c40000, 0x00de0000, 0x00e90000, 0x00cb0000,
-  0x00540000, 0x007b0000, 0x00940000, 0x00320000,
-  0x00a60000, 0x00c20000, 0x00230000, 0x003d0000,
-  0x00ee0000, 0x004c0000, 0x00950000, 0x000b0000,
-  0x00420000, 0x00fa0000, 0x00c30000, 0x004e0000,
-  0x00080000, 0x002e0000, 0x00a10000, 0x00660000,
-  0x00280000, 0x00d90000, 0x00240000, 0x00b20000,
-  0x00760000, 0x005b0000, 0x00a20000, 0x00490000,
-  0x006d0000, 0x008b0000, 0x00d10000, 0x00250000,
-  0x00720000, 0x00f80000, 0x00f60000, 0x00640000,
-  0x00860000, 0x00680000, 0x00980000, 0x00160000,
-  0x00d40000, 0x00a40000, 0x005c0000, 0x00cc0000,
-  0x005d0000, 0x00650000, 0x00b60000, 0x00920000,
-  0x006c0000, 0x00700000, 0x00480000, 0x00500000,
-  0x00fd0000, 0x00ed0000, 0x00b90000, 0x00da0000,
-  0x005e0000, 0x00150000, 0x00460000, 0x00570000,
-  0x00a70000, 0x008d0000, 0x009d0000, 0x00840000,
-  0x00900000, 0x00d80000, 0x00ab0000, 0x00000000,
-  0x008c0000, 0x00bc0000, 0x00d30000, 0x000a0000,
-  0x00f70000, 0x00e40000, 0x00580000, 0x00050000,
-  0x00b80000, 0x00b30000, 0x00450000, 0x00060000,
-  0x00d00000, 0x002c0000, 0x001e0000, 0x008f0000,
-  0x00ca0000, 0x003f0000, 0x000f0000, 0x00020000,
-  0x00c10000, 0x00af0000, 0x00bd0000, 0x00030000,
-  0x00010000, 0x00130000, 0x008a0000, 0x006b0000,
-  0x003a0000, 0x00910000, 0x00110000, 0x00410000,
-  0x004f0000, 0x00670000, 0x00dc0000, 0x00ea0000,
-  0x00970000, 0x00f20000, 0x00cf0000, 0x00ce0000,
-  0x00f00000, 0x00b40000, 0x00e60000, 0x00730000,
-  0x00960000, 0x00ac0000, 0x00740000, 0x00220000,
-  0x00e70000, 0x00ad0000, 0x00350000, 0x00850000,
-  0x00e20000, 0x00f90000, 0x00370000, 0x00e80000,
-  0x001c0000, 0x00750000, 0x00df0000, 0x006e0000,
-  0x00470000, 0x00f10000, 0x001a0000, 0x00710000,
-  0x001d0000, 0x00290000, 0x00c50000, 0x00890000,
-  0x006f0000, 0x00b70000, 0x00620000, 0x000e0000,
-  0x00aa0000, 0x00180000, 0x00be0000, 0x001b0000,
-  0x00fc0000, 0x00560000, 0x003e0000, 0x004b0000,
-  0x00c60000, 0x00d20000, 0x00790000, 0x00200000,
-  0x009a0000, 0x00db0000, 0x00c00000, 0x00fe0000,
-  0x00780000, 0x00cd0000, 0x005a0000, 0x00f40000,
-  0x001f0000, 0x00dd0000, 0x00a80000, 0x00330000,
-  0x00880000, 0x00070000, 0x00c70000, 0x00310000,
-  0x00b10000, 0x00120000, 0x00100000, 0x00590000,
-  0x00270000, 0x00800000, 0x00ec0000, 0x005f0000,
-  0x00600000, 0x00510000, 0x007f0000, 0x00a90000,
-  0x00190000, 0x00b50000, 0x004a0000, 0x000d0000,
-  0x002d0000, 0x00e50000, 0x007a0000, 0x009f0000,
-  0x00930000, 0x00c90000, 0x009c0000, 0x00ef0000,
-  0x00a00000, 0x00e00000, 0x003b0000, 0x004d0000,
-  0x00ae0000, 0x002a0000, 0x00f50000, 0x00b00000,
-  0x00c80000, 0x00eb0000, 0x00bb0000, 0x003c0000,
-  0x00830000, 0x00530000, 0x00990000, 0x00610000,
-  0x00170000, 0x002b0000, 0x00040000, 0x007e0000,
-  0x00ba0000, 0x00770000, 0x00d60000, 0x00260000,
-  0x00e10000, 0x00690000, 0x00140000, 0x00630000,
-  0x00550000, 0x00210000, 0x000c0000, 0x007d0000
-}, {
-  0x52000000, 0x09000000, 0x6a000000, 0xd5000000,
-  0x30000000, 0x36000000, 0xa5000000, 0x38000000,
-  0xbf000000, 0x40000000, 0xa3000000, 0x9e000000,
-  0x81000000, 0xf3000000, 0xd7000000, 0xfb000000,
-  0x7c000000, 0xe3000000, 0x39000000, 0x82000000,
-  0x9b000000, 0x2f000000, 0xff000000, 0x87000000,
-  0x34000000, 0x8e000000, 0x43000000, 0x44000000,
-  0xc4000000, 0xde000000, 0xe9000000, 0xcb000000,
-  0x54000000, 0x7b000000, 0x94000000, 0x32000000,
-  0xa6000000, 0xc2000000, 0x23000000, 0x3d000000,
-  0xee000000, 0x4c000000, 0x95000000, 0x0b000000,
-  0x42000000, 0xfa000000, 0xc3000000, 0x4e000000,
-  0x08000000, 0x2e000000, 0xa1000000, 0x66000000,
-  0x28000000, 0xd9000000, 0x24000000, 0xb2000000,
-  0x76000000, 0x5b000000, 0xa2000000, 0x49000000,
-  0x6d000000, 0x8b000000, 0xd1000000, 0x25000000,
-  0x72000000, 0xf8000000, 0xf6000000, 0x64000000,
-  0x86000000, 0x68000000, 0x98000000, 0x16000000,
-  0xd4000000, 0xa4000000, 0x5c000000, 0xcc000000,
-  0x5d000000, 0x65000000, 0xb6000000, 0x92000000,
-  0x6c000000, 0x70000000, 0x48000000, 0x50000000,
-  0xfd000000, 0xed000000, 0xb9000000, 0xda000000,
-  0x5e000000, 0x15000000, 0x46000000, 0x57000000,
-  0xa7000000, 0x8d000000, 0x9d000000, 0x84000000,
-  0x90000000, 0xd8000000, 0xab000000, 0x00000000,
-  0x8c000000, 0xbc000000, 0xd3000000, 0x0a000000,
-  0xf7000000, 0xe4000000, 0x58000000, 0x05000000,
-  0xb8000000, 0xb3000000, 0x45000000, 0x06000000,
-  0xd0000000, 0x2c000000, 0x1e000000, 0x8f000000,
-  0xca000000, 0x3f000000, 0x0f000000, 0x02000000,
-  0xc1000000, 0xaf000000, 0xbd000000, 0x03000000,
-  0x01000000, 0x13000000, 0x8a000000, 0x6b000000,
-  0x3a000000, 0x91000000, 0x11000000, 0x41000000,
-  0x4f000000, 0x67000000, 0xdc000000, 0xea000000,
-  0x97000000, 0xf2000000, 0xcf000000, 0xce000000,
-  0xf0000000, 0xb4000000, 0xe6000000, 0x73000000,
-  0x96000000, 0xac000000, 0x74000000, 0x22000000,
-  0xe7000000, 0xad000000, 0x35000000, 0x85000000,
-  0xe2000000, 0xf9000000, 0x37000000, 0xe8000000,
-  0x1c000000, 0x75000000, 0xdf000000, 0x6e000000,
-  0x47000000, 0xf1000000, 0x1a000000, 0x71000000,
-  0x1d000000, 0x29000000, 0xc5000000, 0x89000000,
-  0x6f000000, 0xb7000000, 0x62000000, 0x0e000000,
-  0xaa000000, 0x18000000, 0xbe000000, 0x1b000000,
-  0xfc000000, 0x56000000, 0x3e000000, 0x4b000000,
-  0xc6000000, 0xd2000000, 0x79000000, 0x20000000,
-  0x9a000000, 0xdb000000, 0xc0000000, 0xfe000000,
-  0x78000000, 0xcd000000, 0x5a000000, 0xf4000000,
-  0x1f000000, 0xdd000000, 0xa8000000, 0x33000000,
-  0x88000000, 0x07000000, 0xc7000000, 0x31000000,
-  0xb1000000, 0x12000000, 0x10000000, 0x59000000,
-  0x27000000, 0x80000000, 0xec000000, 0x5f000000,
-  0x60000000, 0x51000000, 0x7f000000, 0xa9000000,
-  0x19000000, 0xb5000000, 0x4a000000, 0x0d000000,
-  0x2d000000, 0xe5000000, 0x7a000000, 0x9f000000,
-  0x93000000, 0xc9000000, 0x9c000000, 0xef000000,
-  0xa0000000, 0xe0000000, 0x3b000000, 0x4d000000,
-  0xae000000, 0x2a000000, 0xf5000000, 0xb0000000,
-  0xc8000000, 0xeb000000, 0xbb000000, 0x3c000000,
-  0x83000000, 0x53000000, 0x99000000, 0x61000000,
-  0x17000000, 0x2b000000, 0x04000000, 0x7e000000,
-  0xba000000, 0x77000000, 0xd6000000, 0x26000000,
-  0xe1000000, 0x69000000, 0x14000000, 0x63000000,
-  0x55000000, 0x21000000, 0x0c000000, 0x7d000000
-}
-};
-
-static const u4byte rco_tab[10] = {
-  0x00000001, 0x00000002, 0x00000004, 0x00000008, 0x00000010, 
-  0x00000020, 0x00000040, 0x00000080, 0x0000001b, 0x00000036
-};
-
diff --git a/contrib/pgcrypto/sha1.c b/contrib/pgcrypto/sha1.c
deleted file mode 100644
index 4f9a1b3984..0000000000
--- a/contrib/pgcrypto/sha1.c
+++ /dev/null
@@ -1,350 +0,0 @@
-/*	$Id: sha1.c,v 1.11 2001/11/29 19:40:37 momjian Exp $ */
-/*	   $KAME: sha1.c,v 1.3 2000/02/22 14:01:18 itojun Exp $    */
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *	  may be used to endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.	IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-/*
- * FIPS pub 180-1: Secure Hash Algorithm (SHA-1)
- * based on: http://csrc.nist.gov/fips/fip180-1.txt
- * implemented by Jun-ichiro itojun Itoh <itojun@itojun.org>
- */
-
-#include "postgres.h"
-#include "px.h"
-
-#include "sha1.h"
-
-/* sanity check */
-#if BYTE_ORDER != BIG_ENDIAN
-#if BYTE_ORDER != LITTLE_ENDIAN
-#define unsupported 1
-#endif
-#endif
-
-#ifndef unsupported
-
-/* constant table */
-static uint32 _K[] = {0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6};
-
-#define K(t)	_K[(t) / 20]
-
-#define F0(b, c, d) (((b) & (c)) | ((~(b)) & (d)))
-#define F1(b, c, d) (((b) ^ (c)) ^ (d))
-#define F2(b, c, d) (((b) & (c)) | ((b) & (d)) | ((c) & (d)))
-#define F3(b, c, d) (((b) ^ (c)) ^ (d))
-
-#define S(n, x)		(((x) << (n)) | ((x) >> (32 - n)))
-
-#define H(n)	(ctxt->h.b32[(n)])
-#define COUNT	(ctxt->count)
-#define BCOUNT	(ctxt->c.b64[0] / 8)
-#define W(n)	(ctxt->m.b32[(n)])
-
-#define PUTBYTE(x) \
-do { \
-	ctxt->m.b8[(COUNT % 64)] = (x);		\
-	COUNT++;				\
-	COUNT %= 64;				\
-	ctxt->c.b64[0] += 8;			\
-	if (COUNT % 64 == 0)			\
-		sha1_step(ctxt);		\
-} while (0)
-
-#define PUTPAD(x) \
-do { \
-	ctxt->m.b8[(COUNT % 64)] = (x);		\
-	COUNT++;				\
-	COUNT %= 64;				\
-	if (COUNT % 64 == 0)			\
-		sha1_step(ctxt);		\
-} while (0)
-
-static void sha1_step(struct sha1_ctxt *);
-
-static void
-sha1_step(struct sha1_ctxt * ctxt)
-{
-	uint32		a,
-				b,
-				c,
-				d,
-				e;
-	size_t		t,
-				s;
-	uint32		tmp;
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-	struct sha1_ctxt tctxt;
-
-	bcopy(&ctxt->m.b8[0], &tctxt.m.b8[0], 64);
-	ctxt->m.b8[0] = tctxt.m.b8[3];
-	ctxt->m.b8[1] = tctxt.m.b8[2];
-	ctxt->m.b8[2] = tctxt.m.b8[1];
-	ctxt->m.b8[3] = tctxt.m.b8[0];
-	ctxt->m.b8[4] = tctxt.m.b8[7];
-	ctxt->m.b8[5] = tctxt.m.b8[6];
-	ctxt->m.b8[6] = tctxt.m.b8[5];
-	ctxt->m.b8[7] = tctxt.m.b8[4];
-	ctxt->m.b8[8] = tctxt.m.b8[11];
-	ctxt->m.b8[9] = tctxt.m.b8[10];
-	ctxt->m.b8[10] = tctxt.m.b8[9];
-	ctxt->m.b8[11] = tctxt.m.b8[8];
-	ctxt->m.b8[12] = tctxt.m.b8[15];
-	ctxt->m.b8[13] = tctxt.m.b8[14];
-	ctxt->m.b8[14] = tctxt.m.b8[13];
-	ctxt->m.b8[15] = tctxt.m.b8[12];
-	ctxt->m.b8[16] = tctxt.m.b8[19];
-	ctxt->m.b8[17] = tctxt.m.b8[18];
-	ctxt->m.b8[18] = tctxt.m.b8[17];
-	ctxt->m.b8[19] = tctxt.m.b8[16];
-	ctxt->m.b8[20] = tctxt.m.b8[23];
-	ctxt->m.b8[21] = tctxt.m.b8[22];
-	ctxt->m.b8[22] = tctxt.m.b8[21];
-	ctxt->m.b8[23] = tctxt.m.b8[20];
-	ctxt->m.b8[24] = tctxt.m.b8[27];
-	ctxt->m.b8[25] = tctxt.m.b8[26];
-	ctxt->m.b8[26] = tctxt.m.b8[25];
-	ctxt->m.b8[27] = tctxt.m.b8[24];
-	ctxt->m.b8[28] = tctxt.m.b8[31];
-	ctxt->m.b8[29] = tctxt.m.b8[30];
-	ctxt->m.b8[30] = tctxt.m.b8[29];
-	ctxt->m.b8[31] = tctxt.m.b8[28];
-	ctxt->m.b8[32] = tctxt.m.b8[35];
-	ctxt->m.b8[33] = tctxt.m.b8[34];
-	ctxt->m.b8[34] = tctxt.m.b8[33];
-	ctxt->m.b8[35] = tctxt.m.b8[32];
-	ctxt->m.b8[36] = tctxt.m.b8[39];
-	ctxt->m.b8[37] = tctxt.m.b8[38];
-	ctxt->m.b8[38] = tctxt.m.b8[37];
-	ctxt->m.b8[39] = tctxt.m.b8[36];
-	ctxt->m.b8[40] = tctxt.m.b8[43];
-	ctxt->m.b8[41] = tctxt.m.b8[42];
-	ctxt->m.b8[42] = tctxt.m.b8[41];
-	ctxt->m.b8[43] = tctxt.m.b8[40];
-	ctxt->m.b8[44] = tctxt.m.b8[47];
-	ctxt->m.b8[45] = tctxt.m.b8[46];
-	ctxt->m.b8[46] = tctxt.m.b8[45];
-	ctxt->m.b8[47] = tctxt.m.b8[44];
-	ctxt->m.b8[48] = tctxt.m.b8[51];
-	ctxt->m.b8[49] = tctxt.m.b8[50];
-	ctxt->m.b8[50] = tctxt.m.b8[49];
-	ctxt->m.b8[51] = tctxt.m.b8[48];
-	ctxt->m.b8[52] = tctxt.m.b8[55];
-	ctxt->m.b8[53] = tctxt.m.b8[54];
-	ctxt->m.b8[54] = tctxt.m.b8[53];
-	ctxt->m.b8[55] = tctxt.m.b8[52];
-	ctxt->m.b8[56] = tctxt.m.b8[59];
-	ctxt->m.b8[57] = tctxt.m.b8[58];
-	ctxt->m.b8[58] = tctxt.m.b8[57];
-	ctxt->m.b8[59] = tctxt.m.b8[56];
-	ctxt->m.b8[60] = tctxt.m.b8[63];
-	ctxt->m.b8[61] = tctxt.m.b8[62];
-	ctxt->m.b8[62] = tctxt.m.b8[61];
-	ctxt->m.b8[63] = tctxt.m.b8[60];
-#endif
-
-	a = H(0);
-	b = H(1);
-	c = H(2);
-	d = H(3);
-	e = H(4);
-
-	for (t = 0; t < 20; t++)
-	{
-		s = t & 0x0f;
-		if (t >= 16)
-			W(s) = S(1, W((s + 13) & 0x0f) ^ W((s + 8) & 0x0f) ^ W((s + 2) & 0x0f) ^ W(s));
-		tmp = S(5, a) + F0(b, c, d) + e + W(s) + K(t);
-		e = d;
-		d = c;
-		c = S(30, b);
-		b = a;
-		a = tmp;
-	}
-	for (t = 20; t < 40; t++)
-	{
-		s = t & 0x0f;
-		W(s) = S(1, W((s + 13) & 0x0f) ^ W((s + 8) & 0x0f) ^ W((s + 2) & 0x0f) ^ W(s));
-		tmp = S(5, a) + F1(b, c, d) + e + W(s) + K(t);
-		e = d;
-		d = c;
-		c = S(30, b);
-		b = a;
-		a = tmp;
-	}
-	for (t = 40; t < 60; t++)
-	{
-		s = t & 0x0f;
-		W(s) = S(1, W((s + 13) & 0x0f) ^ W((s + 8) & 0x0f) ^ W((s + 2) & 0x0f) ^ W(s));
-		tmp = S(5, a) + F2(b, c, d) + e + W(s) + K(t);
-		e = d;
-		d = c;
-		c = S(30, b);
-		b = a;
-		a = tmp;
-	}
-	for (t = 60; t < 80; t++)
-	{
-		s = t & 0x0f;
-		W(s) = S(1, W((s + 13) & 0x0f) ^ W((s + 8) & 0x0f) ^ W((s + 2) & 0x0f) ^ W(s));
-		tmp = S(5, a) + F3(b, c, d) + e + W(s) + K(t);
-		e = d;
-		d = c;
-		c = S(30, b);
-		b = a;
-		a = tmp;
-	}
-
-	H(0) = H(0) + a;
-	H(1) = H(1) + b;
-	H(2) = H(2) + c;
-	H(3) = H(3) + d;
-	H(4) = H(4) + e;
-
-	bzero(&ctxt->m.b8[0], 64);
-}
-
-/*------------------------------------------------------------*/
-
-void
-sha1_init(struct sha1_ctxt * ctxt)
-{
-	bzero(ctxt, sizeof(struct sha1_ctxt));
-	H(0) = 0x67452301;
-	H(1) = 0xefcdab89;
-	H(2) = 0x98badcfe;
-	H(3) = 0x10325476;
-	H(4) = 0xc3d2e1f0;
-}
-
-void
-sha1_pad(struct sha1_ctxt * ctxt)
-{
-	size_t		padlen;			/* pad length in bytes */
-	size_t		padstart;
-
-	PUTPAD(0x80);
-
-	padstart = COUNT % 64;
-	padlen = 64 - padstart;
-	if (padlen < 8)
-	{
-		bzero(&ctxt->m.b8[padstart], padlen);
-		COUNT += padlen;
-		COUNT %= 64;
-		sha1_step(ctxt);
-		padstart = COUNT % 64;	/* should be 0 */
-		padlen = 64 - padstart; /* should be 64 */
-	}
-	bzero(&ctxt->m.b8[padstart], padlen - 8);
-	COUNT += (padlen - 8);
-	COUNT %= 64;
-#if BYTE_ORDER == BIG_ENDIAN
-	PUTPAD(ctxt->c.b8[0]);
-	PUTPAD(ctxt->c.b8[1]);
-	PUTPAD(ctxt->c.b8[2]);
-	PUTPAD(ctxt->c.b8[3]);
-	PUTPAD(ctxt->c.b8[4]);
-	PUTPAD(ctxt->c.b8[5]);
-	PUTPAD(ctxt->c.b8[6]);
-	PUTPAD(ctxt->c.b8[7]);
-#else
-	PUTPAD(ctxt->c.b8[7]);
-	PUTPAD(ctxt->c.b8[6]);
-	PUTPAD(ctxt->c.b8[5]);
-	PUTPAD(ctxt->c.b8[4]);
-	PUTPAD(ctxt->c.b8[3]);
-	PUTPAD(ctxt->c.b8[2]);
-	PUTPAD(ctxt->c.b8[1]);
-	PUTPAD(ctxt->c.b8[0]);
-#endif
-}
-
-void
-sha1_loop(struct sha1_ctxt * ctxt, const uint8 *input0, size_t len)
-{
-	const uint8 *input;
-	size_t		gaplen;
-	size_t		gapstart;
-	size_t		off;
-	size_t		copysiz;
-
-	input = (const uint8 *) input0;
-	off = 0;
-
-	while (off < len)
-	{
-		gapstart = COUNT % 64;
-		gaplen = 64 - gapstart;
-
-		copysiz = (gaplen < len - off) ? gaplen : len - off;
-		bcopy(&input[off], &ctxt->m.b8[gapstart], copysiz);
-		COUNT += copysiz;
-		COUNT %= 64;
-		ctxt->c.b64[0] += copysiz * 8;
-		if (COUNT % 64 == 0)
-			sha1_step(ctxt);
-		off += copysiz;
-	}
-}
-
-void
-sha1_result(struct sha1_ctxt * ctxt, uint8 *digest0)
-{
-	uint8	   *digest;
-
-	digest = (uint8 *) digest0;
-	sha1_pad(ctxt);
-#if BYTE_ORDER == BIG_ENDIAN
-	bcopy(&ctxt->h.b8[0], digest, 20);
-#else
-	digest[0] = ctxt->h.b8[3];
-	digest[1] = ctxt->h.b8[2];
-	digest[2] = ctxt->h.b8[1];
-	digest[3] = ctxt->h.b8[0];
-	digest[4] = ctxt->h.b8[7];
-	digest[5] = ctxt->h.b8[6];
-	digest[6] = ctxt->h.b8[5];
-	digest[7] = ctxt->h.b8[4];
-	digest[8] = ctxt->h.b8[11];
-	digest[9] = ctxt->h.b8[10];
-	digest[10] = ctxt->h.b8[9];
-	digest[11] = ctxt->h.b8[8];
-	digest[12] = ctxt->h.b8[15];
-	digest[13] = ctxt->h.b8[14];
-	digest[14] = ctxt->h.b8[13];
-	digest[15] = ctxt->h.b8[12];
-	digest[16] = ctxt->h.b8[19];
-	digest[17] = ctxt->h.b8[18];
-	digest[18] = ctxt->h.b8[17];
-	digest[19] = ctxt->h.b8[16];
-#endif
-}
-
-#endif   /* unsupported */
diff --git a/contrib/pgcrypto/sha1.h b/contrib/pgcrypto/sha1.h
deleted file mode 100644
index 096a9a40ad..0000000000
--- a/contrib/pgcrypto/sha1.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*	$Id: sha1.h,v 1.8 2001/11/05 17:46:23 momjian Exp $ */
-/*	   $KAME: sha1.h,v 1.4 2000/02/22 14:01:18 itojun Exp $    */
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *	  may be used to endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.	IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-/*
- * FIPS pub 180-1: Secure Hash Algorithm (SHA-1)
- * based on: http://csrc.nist.gov/fips/fip180-1.txt
- * implemented by Jun-ichiro itojun Itoh <itojun@itojun.org>
- */
-
-#ifndef _NETINET6_SHA1_H_
-#define _NETINET6_SHA1_H_
-
-struct sha1_ctxt
-{
-	union
-	{
-		uint8		b8[20];
-		uint32		b32[5];
-	}			h;
-	union
-	{
-		uint8		b8[8];
-		uint64		b64[1];
-	}			c;
-	union
-	{
-		uint8		b8[64];
-		uint32		b32[16];
-	}			m;
-	uint8		count;
-};
-
-extern void sha1_init(struct sha1_ctxt *);
-extern void sha1_pad(struct sha1_ctxt *);
-extern void sha1_loop(struct sha1_ctxt *, const uint8 *, size_t);
-extern void sha1_result(struct sha1_ctxt *, uint8 *);
-
-/* compatibilty with other SHA1 source codes */
-typedef struct sha1_ctxt SHA1_CTX;
-
-#define SHA1Init(x)		sha1_init((x))
-#define SHA1Update(x, y, z) sha1_loop((x), (y), (z))
-#define SHA1Final(x, y)		sha1_result((y), (x))
-
-#define SHA1_RESULTLEN	(160/8)
-
-#endif   /* _NETINET6_SHA1_H_ */
diff --git a/contrib/pgcrypto/sql/blowfish.sql b/contrib/pgcrypto/sql/blowfish.sql
deleted file mode 100644
index e1fa7b1f49..0000000000
--- a/contrib/pgcrypto/sql/blowfish.sql
+++ /dev/null
@@ -1,66 +0,0 @@
---
--- Blowfish cipher
---
-
--- some standard Blowfish testvalues
-select encode(encrypt(
-decode('0000000000000000', 'hex'),
-decode('0000000000000000', 'hex'),
-'bf-ecb/pad:none'), 'hex');
-
-select encode(encrypt(
-decode('ffffffffffffffff', 'hex'),
-decode('ffffffffffffffff', 'hex'),
-'bf-ecb/pad:none'), 'hex');
-
-select encode(encrypt(
-decode('1000000000000001', 'hex'),
-decode('3000000000000000', 'hex'),
-'bf-ecb/pad:none'), 'hex');
-
-select encode(encrypt(
-decode('1111111111111111', 'hex'),
-decode('1111111111111111', 'hex'),
-'bf-ecb/pad:none'), 'hex');
-
-select encode(encrypt(
-decode('0123456789abcdef', 'hex'),
-decode('fedcba9876543210', 'hex'),
-'bf-ecb/pad:none'), 'hex');
-
-select encode(encrypt(
-decode('01a1d6d039776742', 'hex'),
-decode('fedcba9876543210', 'hex'),
-'bf-ecb/pad:none'), 'hex');
-
-select encode(encrypt(
-decode('ffffffffffffffff', 'hex'),
-decode('0000000000000000', 'hex'),
-'bf-ecb/pad:none'), 'hex');
-
--- setkey
-select encode(encrypt(
-decode('fedcba9876543210', 'hex'),
-decode('f0e1d2c3b4a5968778695a4b3c2d1e0f', 'hex'),
-'bf-ecb/pad:none'), 'hex');
-
--- with padding
-select encode(encrypt(
-decode('01234567890123456789', 'hex'),
-decode('33443344334433443344334433443344', 'hex'),
-'bf-ecb'), 'hex');
-
--- cbc
-
--- 28 bytes key
-select encode(encrypt(
-decode('6b77b4d63006dee605b156e27403979358deb9e7154616d959f1652bd5', 'hex'),
-decode('37363534333231204e6f77206973207468652074696d6520666f7220', 'hex'),
-'bf-cbc'), 'hex');
-
--- 29 bytes key
-select encode(encrypt(
-decode('6b77b4d63006dee605b156e27403979358deb9e7154616d959f1652bd5ff92cc', 'hex'),
-decode('37363534333231204e6f77206973207468652074696d6520666f722000', 'hex'),
-'bf-cbc'), 'hex');
-
diff --git a/contrib/pgcrypto/sql/crypt-blowfish.sql b/contrib/pgcrypto/sql/crypt-blowfish.sql
deleted file mode 100644
index 6b82fdff63..0000000000
--- a/contrib/pgcrypto/sql/crypt-blowfish.sql
+++ /dev/null
@@ -1,17 +0,0 @@
---
--- crypt() and gen_salt(): bcrypt
---
-
-select crypt('', '$2a$06$RQiOJ.3ELirrXwxIZY8q0O');
-
-select crypt('foox', '$2a$06$RQiOJ.3ELirrXwxIZY8q0O');
-
-create table ctest (data text, res text, salt text);
-insert into ctest values ('password', '', '');
-
-update ctest set salt = gen_salt('bf', 8);
-update ctest set res = crypt(data, salt);
-select res = crypt(data, res) as "worked" from ctest;
-
-drop table ctest;
-
diff --git a/contrib/pgcrypto/sql/crypt-des.sql b/contrib/pgcrypto/sql/crypt-des.sql
deleted file mode 100644
index 2a2fbfb36c..0000000000
--- a/contrib/pgcrypto/sql/crypt-des.sql
+++ /dev/null
@@ -1,17 +0,0 @@
---
--- crypt() and gen_salt(): crypt-des
---
-
-select crypt('', 'NB');
-
-select crypt('foox', 'NB');
-
-create table ctest (data text, res text, salt text);
-insert into ctest values ('password', '', '');
-
-update ctest set salt = gen_salt('des');
-update ctest set res = crypt(data, salt);
-select res = crypt(data, res) as "worked" from ctest;
-
-drop table ctest;
-
diff --git a/contrib/pgcrypto/sql/crypt-md5.sql b/contrib/pgcrypto/sql/crypt-md5.sql
deleted file mode 100644
index 8ef8dbae0f..0000000000
--- a/contrib/pgcrypto/sql/crypt-md5.sql
+++ /dev/null
@@ -1,17 +0,0 @@
---
--- crypt() and gen_salt(): md5
---
-
-select crypt('', '$1$Szzz0yzz');
-
-select crypt('foox', '$1$Szzz0yzz');
-
-create table ctest (data text, res text, salt text);
-insert into ctest values ('password', '', '');
-
-update ctest set salt = gen_salt('md5');
-update ctest set res = crypt(data, salt);
-select res = crypt(data, res) as "worked" from ctest;
-
-drop table ctest;
-
diff --git a/contrib/pgcrypto/sql/crypt-xdes.sql b/contrib/pgcrypto/sql/crypt-xdes.sql
deleted file mode 100644
index 6fd85b929a..0000000000
--- a/contrib/pgcrypto/sql/crypt-xdes.sql
+++ /dev/null
@@ -1,17 +0,0 @@
---
--- crypt() and gen_salt(): extended des
---
-
-select crypt('', '_J9..j2zz');
-
-select crypt('foox', '_J9..j2zz');
-
-create table ctest (data text, res text, salt text);
-insert into ctest values ('password', '', '');
-
-update ctest set salt = gen_salt('xdes', 1001);
-update ctest set res = crypt(data, salt);
-select res = crypt(data, res) as "worked" from ctest;
-
-drop table ctest;
-
diff --git a/contrib/pgcrypto/sql/hmac-md5.sql b/contrib/pgcrypto/sql/hmac-md5.sql
deleted file mode 100644
index d3cd1f649d..0000000000
--- a/contrib/pgcrypto/sql/hmac-md5.sql
+++ /dev/null
@@ -1,46 +0,0 @@
---
--- HMAC-MD5
---
-
-select encode(hmac(
-'Hi There',
-decode('0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b', 'hex'),
-'md5'), 'hex');
-
--- 2
-select encode(hmac(
-'Jefe',
-'what do ya want for nothing?',
-'md5'), 'hex');
-
--- 3
-select encode(hmac(
-decode('dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd', 'hex'),
-decode('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
-'md5'), 'hex');
-
--- 4
-select encode(hmac(
-decode('cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd', 'hex'),
-decode('0102030405060708090a0b0c0d0e0f10111213141516171819', 'hex'),
-'md5'), 'hex');
-
--- 5
-select encode(hmac(
-'Test With Truncation',
-decode('0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c', 'hex'),
-'md5'), 'hex');
-
--- 6
-select encode(hmac(
-'Test Using Larger Than Block-Size Key - Hash Key First',
-decode('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
-'md5'), 'hex');
-
--- 7
-select encode(hmac(
-'Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data',
-decode('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
-'md5'), 'hex');
-
-
diff --git a/contrib/pgcrypto/sql/hmac-sha1.sql b/contrib/pgcrypto/sql/hmac-sha1.sql
deleted file mode 100644
index f08c438963..0000000000
--- a/contrib/pgcrypto/sql/hmac-sha1.sql
+++ /dev/null
@@ -1,46 +0,0 @@
---
--- HMAC-MD5
---
-
-select encode(hmac(
-'Hi There',
-decode('0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b', 'hex'),
-'sha1'), 'hex');
-
--- 2
-select encode(hmac(
-'Jefe',
-'what do ya want for nothing?',
-'sha1'), 'hex');
-
--- 3
-select encode(hmac(
-decode('dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd', 'hex'),
-decode('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
-'sha1'), 'hex');
-
--- 4
-select encode(hmac(
-decode('cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd', 'hex'),
-decode('0102030405060708090a0b0c0d0e0f10111213141516171819', 'hex'),
-'sha1'), 'hex');
-
--- 5
-select encode(hmac(
-'Test With Truncation',
-decode('0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c', 'hex'),
-'sha1'), 'hex');
-
--- 6
-select encode(hmac(
-'Test Using Larger Than Block-Size Key - Hash Key First',
-decode('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
-'sha1'), 'hex');
-
--- 7
-select encode(hmac(
-'Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data',
-decode('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
-'sha1'), 'hex');
-
-
diff --git a/contrib/pgcrypto/sql/init.sql b/contrib/pgcrypto/sql/init.sql
deleted file mode 100644
index 8bddb73773..0000000000
--- a/contrib/pgcrypto/sql/init.sql
+++ /dev/null
@@ -1,12 +0,0 @@
---
--- init pgcrypto
---
-
-\set ECHO none
-\i pgcrypto.sql
-\set ECHO all
-
--- check for encoding fn's
-select encode('foo', 'hex');
-select decode('666f6f', 'hex');
-
diff --git a/contrib/pgcrypto/sql/md5.sql b/contrib/pgcrypto/sql/md5.sql
deleted file mode 100644
index 78e4cfee0f..0000000000
--- a/contrib/pgcrypto/sql/md5.sql
+++ /dev/null
@@ -1,12 +0,0 @@
---
--- MD5 message digest
---
-
-select encode(digest('', 'md5'), 'hex');
-select encode(digest('a', 'md5'), 'hex');
-select encode(digest('abc', 'md5'), 'hex');
-select encode(digest('message digest', 'md5'), 'hex');
-select encode(digest('abcdefghijklmnopqrstuvwxyz', 'md5'), 'hex');
-select encode(digest('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789', 'md5'), 'hex');
-select encode(digest('12345678901234567890123456789012345678901234567890123456789012345678901234567890', 'md5'), 'hex');
-
diff --git a/contrib/pgcrypto/sql/rijndael.sql b/contrib/pgcrypto/sql/rijndael.sql
deleted file mode 100644
index fbacdc6dfc..0000000000
--- a/contrib/pgcrypto/sql/rijndael.sql
+++ /dev/null
@@ -1,43 +0,0 @@
---
--- AES / Rijndael-128 cipher
---
-
--- some standard Rijndael testvalues
-select encode(encrypt(
-decode('00112233445566778899aabbccddeeff', 'hex'),
-decode('000102030405060708090a0b0c0d0e0f', 'hex'),
-'aes-ecb/pad:none'), 'hex');
-
-select encode(encrypt(
-decode('00112233445566778899aabbccddeeff', 'hex'),
-decode('000102030405060708090a0b0c0d0e0f1011121314151617', 'hex'),
-'aes-ecb/pad:none'), 'hex');
-
-select encode(encrypt(
-decode('00112233445566778899aabbccddeeff', 'hex'),
-decode('000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f', 'hex'),
-'aes-ecb/pad:none'), 'hex');
-
--- cbc
-select encode(encrypt(
-decode('00112233445566778899aabbccddeeff', 'hex'),
-decode('000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f', 'hex'),
-'aes-cbc/pad:none'), 'hex');
-
--- key padding
-
-select encode(encrypt(
-decode('0011223344', 'hex'),
-decode('000102030405', 'hex'),
-'aes-cbc'), 'hex');
-
-select encode(encrypt(
-decode('0011223344', 'hex'),
-decode('000102030405060708090a0b0c0d0e0f10111213', 'hex'),
-'aes-cbc'), 'hex');
-
-select encode(encrypt(
-decode('0011223344', 'hex'),
-decode('000102030405060708090a0b0c0d0e0f101112131415161718191a1b', 'hex'),
-'aes-cbc'), 'hex');
-
diff --git a/contrib/pgcrypto/sql/sha1.sql b/contrib/pgcrypto/sql/sha1.sql
deleted file mode 100644
index 11ee5426cb..0000000000
--- a/contrib/pgcrypto/sql/sha1.sql
+++ /dev/null
@@ -1,12 +0,0 @@
---
--- SHA1 message digest
---
-
-select encode(digest('', 'sha1'), 'hex');
-select encode(digest('a', 'sha1'), 'hex');
-select encode(digest('abc', 'sha1'), 'hex');
-select encode(digest('message digest', 'sha1'), 'hex');
-select encode(digest('abcdefghijklmnopqrstuvwxyz', 'sha1'), 'hex');
-select encode(digest('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789', 'sha1'), 'hex');
-select encode(digest('12345678901234567890123456789012345678901234567890123456789012345678901234567890', 'sha1'), 'hex');
-
diff --git a/contrib/pgstattuple/Makefile b/contrib/pgstattuple/Makefile
deleted file mode 100644
index 88f1b658d4..0000000000
--- a/contrib/pgstattuple/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# pgstattuple Makefile
-#
-# $Id: Makefile,v 1.1 2001/10/01 01:52:38 ishii Exp $
-#
-#-------------------------------------------------------------------------
-
-subdir = contrib/pgstattuple
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-MODULE_big	:= pgstattuple
-SRCS		+= pgstattuple.c
-OBJS		:= $(SRCS:.c=.o)
-DOCS		:= README.pgstattuple README.pgstattuple.euc_jp
-DATA_built	:= pgstattuple.sql
-
-PG_CPPFLAGS	:=
-SHLIB_LINK 	:=
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/pgstattuple/README.pgstattuple b/contrib/pgstattuple/README.pgstattuple
deleted file mode 100644
index 7237b9a4dc..0000000000
--- a/contrib/pgstattuple/README.pgstattuple
+++ /dev/null
@@ -1,47 +0,0 @@
-pgstattuple README			2001/10/01 Tatsuo Ishii
-
-1. What is pgstattuple?
-
-   pgstattuple returns the percentage of the "dead" tuples of a
-   table. This will help users to judge if vacuum is needed.
-
-   In addition, pgstattuple prints more detailed information using
-   NOTICE.
-
-test=# select pgstattuple('tellers');
-NOTICE:  physical length: 0.08MB live tuples: 20 (0.00MB, 1.17%) dead tuples: 320 (0.01MB, 18.75%) free/reusable space: 0.01MB (18.06%) overhead: 62.02%
- pgstattuple 
--------------
-       18.75
-(1 row)
-
-   Above example shows tellers table includes 18.75% dead tuples.
-
-   physical length	physical size of the table in MB
-   live tuples		information on the live tuples
-   dead tuples		information on the dead tuples
-   free/reusable space	available space
-   overhead		overhead space
-
-2. Installing pgstattuple
-
-    $ make
-    $ make install
-    $ psql -e -f /usr/local/pgsql/share/contrib/pgstattuple.sql test
-
-3. Using pgstattuple
-
-   pgstattuple can be called as a function:
-
-   pgstattuple(TEXT) RETURNS FLOAT8
-
-   The argument is the table name.  pgstattuple returns the percentage
-   of the "dead" tuples of a table.
-
-4. Notes
-
-   pgstattuple acquires only a read lock on the table. So concurrent
-   update may affect the result.
-
-   pgstattuple judges a tuple is "dead" if HeapTupleSatisfiesNow()
-   returns false.
diff --git a/contrib/pgstattuple/README.pgstattuple.euc_jp b/contrib/pgstattuple/README.pgstattuple.euc_jp
deleted file mode 100644
index 5142e9b6a9..0000000000
--- a/contrib/pgstattuple/README.pgstattuple.euc_jp
+++ /dev/null
@@ -1,81 +0,0 @@
-$Id: README.pgstattuple.euc_jp,v 1.2 2001/12/20 01:56:08 ishii Exp $
-
-pgstattuple README		2001/10/01 ÀаæãÉ×
-
-1. pgstattuple¤È¤Ï
-
-   pgstattuple¤Ï¡¤UPDATE¤äDELETE¤Çºî¤é¤ì¤¿¥Æ¡¼¥Ö¥ë¤Î¥´¥ßÎΰè¤ÎÂ礭¤µ¤ò¡¤
-   ¥Æ¡¼¥Ö¥ë¼«ÂΤÎʪÍýŪ¤ÊÂ礭¤µ¤ËÂФ¹¤ë¥Ñ¡¼¥»¥ó¥Æ¡¼¥¸¤ÇÊֵѤ·¤Þ¤¹¡¥¤Ä
-   ¤Þ¤ê¡¤ÊÖµÑÃͤ¬Â礭¤±¤ì¤Ð¡¤¤½¤ì¤À¤±¥´¥ß¤â¿¤¤¤Î¤Ç¡¤vacuum¤ò¤«¤±¤ëɬ
-   Íפ¬¤¢¤ë¤È¤¤¤¦È½ÃǤνõ¤±¤Ë¤Ê¤ë¤ï¤±¤Ç¤¹¡¥
-
-   ¤³¤ì¤À¤±¤Ç¤Ï¾ðÊóÎ̤¬¾¯¤Ê¤¤¤Î¤Ç¡¤NOTICE¥á¥Ã¥»¡¼¥¸¤Ç¤¤¤í¤ó¤Ê¾ðÊó¤ò¤Ä
-   ¤¤¤Ç¤Ë½ÐÎϤ·¤Þ¤¹¡¥
-
-test=# select pgstattuple('tellers');
-NOTICE:  physical length: 0.08MB live tuples: 20 (0.00MB, 1.17%) dead tuples: 320 (0.01MB, 18.75%) free/reusable space: 0.01MB (18.06%) overhead: 62.02%
- pgstattuple 
--------------
-       18.75
-(1 row)
-
-   ¤³¤Î¼Â¹ÔÎã¤Ç¤Ï¡¤19%¤Û¤É¤¬¥´¥ß¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤³¤È¤¬»Ç¤¨¤Þ¤¹¡¥NOTICE¥á¥Ã
-   ¥»¡¼¥¸¤Î¸«Êý¤â½ñ¤¤¤Æ¤ª¤­¤Þ¤¹¡¥
-
-   physical length	¥Æ¡¼¥Ö¥ë¤ÎʪÍýŪ¤Ê¥µ¥¤¥º¤òMBñ°Ì¤Çɽ¼¨
-   live tuples		¥´¥ß¤Ç¤Ï¤Ê¤¤¥¿¥×¥ë¤Ë´Ø¤¹¤ë¾ðÊó¡¥¥¿¥×¥ë¿ô¡¤³Æ
-			¥¿¥×¥ë¤¬Àê¤á¤ëÎΰè¤Î¹ç·×¡¤¥Æ¡¼¥Ö¥ëÁ´ÂΤËÂФ¹¤ë
-			ÈæΨ¤òɽ¼¨¤·¤Þ¤¹¡¥
-   dead tuples		¥´¥ß¤Ë¤Ê¤Ã¤¿¥¿¥×¥ë¤Ë´Ø¤¹¤ë¾ðÊó¡¥
-   free/reusable space	ÍøÍѲÄǽ¤Ê̤»ÈÍÑÎΰè¤äºÆÍøÍѲÄǽÎΰè
-   overhead		´ÉÍý¤Î¤¿¤á¤ÎÎΰ褬¥Æ¡¼¥Ö¥ëÁ´ÂΤËÀê¤á¤ëÈæΨ
-
-2. pgstattuple¤Î¥¤¥ó¥¹¥È¡¼¥ë
-
-   PostgreSQL¤¬/usr/local/pgsql¤Ë¥¤¥ó¥¹¥È¡¼¥ëºÑ¤Ç¤¢¤ê¡¤test¥Ç¡¼¥¿¥Ù¡¼
-   ¥¹¤Ëpgstattuple¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¤Î¼ê½ç¤ò¼¨¤·¤Þ¤¹¡¥
-
-    $ make
-    $ make install
-
-    ¥æ¡¼¥¶ÄêµÁ´Ø¿ô¤òÅÐÏ¿¤·¤Þ¤¹¡¥
-
-    $ psql -e -f /usr/local/pgsql/share/contrib/pgstattuple.sql test
-
-
-3. pgstattuple¤Î»È¤¤Êý
-
-   pgstattuple¤Î¸Æ¤Ó½Ð¤··Á¼°¤Ï°Ê²¼¤Ç¤¹¡¥
-
-   pgstattuple(NAME) RETURNS FLOAT8
-
-   Âè°ì°ú¿ô: ¥Æ¡¼¥Ö¥ë̾
-
-   ´Ø¿ô¤ÎÌá¤ê¤ÏUPDATE¤äDELETE¤Çºî¤é¤ì¤¿¥Æ¡¼¥Ö¥ë¤Î¥´¥ßÎΰè¤ÎÂ礭¤µ¤Ç¡¤
-   ¥Æ¡¼¥Ö¥ë¤ÎʪÍýŪ¤ÊÂ礭¤µ¤ËÂФ¹¤ë³ä¹ç(¥Ñ¡¼¥»¥ó¥È)¤ÇÊֵѤ·¤Þ¤¹¡¥
-
-   ¤Ê¤ª¡¤pgstattuple¤Ï¥Æ¡¼¥Ö¥ë¤ËAccessShareLock¤·¤«¤«¤±¤Ê¤¤¤Î¤Ç¡¤
-   pgstattuple ¤ò¼Â¹ÔÃæ¤Ë³ºÅö¥Æ¡¼¥Ö¥ë¤Ë¹¹¿·¤äºï½ü¤¬È¯À¸¤¹¤ë¤È¡¤Àµ¤·¤¯
-   ¤Ê¤¤·ë²Ì¤òÊÖ¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡¥
-
-   pgstattuple¤¬¥¿¥×¥ë¤ò¡Ö¥´¥ß¡×¤ÈȽÃǤ¹¤ë´ð½à¤Ï¡¤
-   HeapTupleSatisfiesNow()¤¬µ¶¤òÊÖ¤·¤¿¤È¤­¤Ç¤¹¡¥
-
-4. pgstattuple¤Î¥é¥¤¥»¥ó¥¹¾ò·ï¤Ë¤Ä¤¤¤Æ
-
-   pgstattuple.c¤ÎËÁƬ¤Ë½ñ¤¤¤Æ¤¢¤ëÄ̤ê¤Ç¤¹¡¥¤Þ¤¿¡¤pgstattuple ¤Ï´°Á´¤Ë̵ÊÝ
-   ¾Ú¤Ç¤¹¡¥pgstattuple ¤ò»ÈÍѤ·¤¿¤³¤È¤Ë¤è¤Ã¤ÆÀ¸¤¸¤ë¤¤¤«¤Ê¤ë·ë²Ì¤Ë´Ø¤·¤Æ
-   ¤âÀÕǤ¤òÉ餤¤Þ¤»¤ó¡¥
-
-5. ²þÄûÍúÎò
-
-   2001/12/20 Tom Lane¤Ë¤è¤ë½¤Àµ
-
-   	Fix pgstattuple to acquire a read lock on the target table.  This
-	prevents embarassments such as having the table dropped or truncated
-	partway through the scan.  Also, fix free space calculation to include
-	pages that currently contain no tuples.
-
-   2001/10/01 PostgreSQL 7.2 ÍÑcontrib module¤ËÅÐÏ¿
-
-   2001/08/30 pgstattuple ¥Ð¡¼¥¸¥ç¥ó 0.1¥ê¥ê¡¼¥¹
diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c
deleted file mode 100644
index 498f820952..0000000000
--- a/contrib/pgstattuple/pgstattuple.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * $Header: /cvsroot/pgsql/contrib/pgstattuple/pgstattuple.c,v 1.6 2002/05/20 23:51:40 tgl Exp $
- *
- * Copyright (c) 2001  Tatsuo Ishii
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose, without fee, and without a
- * written agreement is hereby granted, provided that the above
- * copyright notice and this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE TO ANY PARTY FOR DIRECT,
- * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
- * LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
- * DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * THE AUTHOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS
- * IS" BASIS, AND THE AUTHOR HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE,
- * SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-
-#include "postgres.h"
-
-#include "fmgr.h"
-#include "access/heapam.h"
-#include "access/transam.h"
-#include "catalog/namespace.h"
-#include "utils/builtins.h"
-
-
-PG_FUNCTION_INFO_V1(pgstattuple);
-
-extern Datum pgstattuple(PG_FUNCTION_ARGS);
-
-/* ----------
- * pgstattuple:
- * returns the percentage of dead tuples
- *
- * C FUNCTION definition
- * pgstattuple(NAME) returns FLOAT8
- * ----------
- */
-Datum
-pgstattuple(PG_FUNCTION_ARGS)
-{
-	text	   *relname = PG_GETARG_TEXT_P(0);
-	RangeVar   *relrv;
-	Relation	rel;
-	HeapScanDesc scan;
-	HeapTuple	tuple;
-	BlockNumber nblocks;
-	BlockNumber block = 0;		/* next block to count free space in */
-	BlockNumber tupblock;
-	Buffer		buffer;
-	double		table_len;
-	uint64		tuple_len = 0;
-	uint64		dead_tuple_len = 0;
-	uint64		tuple_count = 0;
-	uint64		dead_tuple_count = 0;
-	double		tuple_percent;
-	double		dead_tuple_percent;
-	uint64		free_space = 0; /* free/reusable space in bytes */
-	double		free_percent;	/* free/reusable space in % */
-
-	relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname,
-														"pgstattuple"));
-	rel = heap_openrv(relrv, AccessShareLock);
-
-	nblocks = RelationGetNumberOfBlocks(rel);
-	scan = heap_beginscan(rel, SnapshotAny, 0, NULL);
-
-	while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
-	{
-		if (HeapTupleSatisfiesNow(tuple->t_data))
-		{
-			tuple_len += tuple->t_len;
-			tuple_count++;
-		}
-		else
-		{
-			dead_tuple_len += tuple->t_len;
-			dead_tuple_count++;
-		}
-
-		/*
-		 * To avoid physically reading the table twice, try to do the
-		 * free-space scan in parallel with the heap scan.  However,
-		 * heap_getnext may find no tuples on a given page, so we cannot
-		 * simply examine the pages returned by the heap scan.
-		 */
-		tupblock = BlockIdGetBlockNumber(&tuple->t_self.ip_blkid);
-
-		while (block <= tupblock)
-		{
-			buffer = ReadBuffer(rel, block);
-			free_space += PageGetFreeSpace((Page) BufferGetPage(buffer));
-			ReleaseBuffer(buffer);
-			block++;
-		}
-	}
-	heap_endscan(scan);
-
-	while (block < nblocks)
-	{
-		buffer = ReadBuffer(rel, block);
-		free_space += PageGetFreeSpace((Page) BufferGetPage(buffer));
-		ReleaseBuffer(buffer);
-		block++;
-	}
-
-	heap_close(rel, AccessShareLock);
-
-	table_len = (double) nblocks *BLCKSZ;
-
-	if (nblocks == 0)
-	{
-		tuple_percent = 0.0;
-		dead_tuple_percent = 0.0;
-		free_percent = 0.0;
-	}
-	else
-	{
-		tuple_percent = (double) tuple_len *100.0 / table_len;
-		dead_tuple_percent = (double) dead_tuple_len *100.0 / table_len;
-		free_percent = (double) free_space *100.0 / table_len;
-	}
-
-	elog(DEBUG3, "physical length: %.2fMB live tuples: %.0f (%.2fMB, %.2f%%) dead tuples: %.0f (%.2fMB, %.2f%%) free/reusable space: %.2fMB (%.2f%%) overhead: %.2f%%",
-
-		 table_len / (1024 * 1024),		/* physical length in MB */
-
-		 (double) tuple_count,	/* number of live tuples */
-		 (double) tuple_len / (1024 * 1024),		/* live tuples in MB */
-		 tuple_percent,			/* live tuples in % */
-
-		 (double) dead_tuple_count,	/* number of dead tuples */
-		 (double) dead_tuple_len / (1024 * 1024), /* dead tuples in MB */
-		 dead_tuple_percent,	/* dead tuples in % */
-
-		 (double) free_space / (1024 * 1024), /* free/available space in
-											   * MB */
-
-		 free_percent,			/* free/available space in % */
-
-	/* overhead in % */
-		 (nblocks == 0) ? 0.0 : 100.0
-		 - tuple_percent
-		 - dead_tuple_percent
-		 - free_percent);
-
-	PG_RETURN_FLOAT8(dead_tuple_percent);
-}
diff --git a/contrib/pgstattuple/pgstattuple.sql.in b/contrib/pgstattuple/pgstattuple.sql.in
deleted file mode 100644
index b49a13483f..0000000000
--- a/contrib/pgstattuple/pgstattuple.sql.in
+++ /dev/null
@@ -1,4 +0,0 @@
-DROP FUNCTION pgstattuple(text);
-CREATE FUNCTION pgstattuple(text) RETURNS float8
-AS 'MODULE_PATHNAME', 'pgstattuple'
-LANGUAGE 'c' WITH (isstrict);
diff --git a/contrib/retep/CHANGELOG b/contrib/retep/CHANGELOG
deleted file mode 100644
index 188c40129e..0000000000
--- a/contrib/retep/CHANGELOG
+++ /dev/null
@@ -1,7 +0,0 @@
-Fri Mar 02 16:08:00 GMT 2001 peter@retep.org.uk
-    - Started importing in the rest of the retep tools.
-
-Tue Jan 23 10:19:00 GMT 2001 peter@retep.org.uk
-    - Finished the XML Export classes
-	- First of the test data suite now in CVS.
-
diff --git a/contrib/retep/Implementation b/contrib/retep/Implementation
deleted file mode 100644
index b3125acf0e..0000000000
--- a/contrib/retep/Implementation
+++ /dev/null
@@ -1,116 +0,0 @@
-Retep Tools Implementation
---------------------------
-
-
-The tools are designed to be put into a single jar file, but each one is
-executable either individually or part of one single application.
-
-To run the big application, you can either:
-
-  java -jar retepTools.jar
-
-or with the retepTools.jar in the classpath run:
-
-  java uk.org.retep.tools.Main
-
-Windows users: For you you can also double click the retepTools.jar as windows
-will automatically run javac for you.
-
-To run the individual tools, you must have the .jar file in your classpath and
-then run the relevant Main class.
-
-Tool                          Type        Class
-------------------------------------------------------------------------------
-pg_hba.conf Editor/repairer   Editor      uk.org.retep.util.hba.Main
-Properties Editor             Editor      uk.org.retep.util.proped.Main
-
-
-Layout of the classes
----------------------
-
-Simply, tools that work on property files (Java properties, resource files,
-configuration settings - pg_hba.conf for example) go under uk.org.retep.util in
-their own package. Other utility classes (like PropertyIO) go in to the
-uk.org.retep.util.misc package except for certain ones where they are related.
-
-ie: TableModels. In swing you have JTable which uses a TableModel to display
-(and possibly update) some data. These go under uk.org.retep.util.models where
-you will find PropertiesTableModel for example. This one allows a Properties
-object to be displayed & updated.
-
-Come core classes like Logger, ExceptionDialog etc go into the main
-uk.org.retep.util package.
-
-Directory/Package                   Contents
-------------------------------------------------------------------------------
-uk.org.retep                        Home of the tools.properties file
-uk.org.retep.tools                  The main all-in-one application
-uk.org.retep.dtu                    The Data Transform Unit
-uk.org.retep.util                   Core utility classes
-uk.org.retep.util.hba               pg_hba.conf editor/repairer
-uk.org.retep.util.misc              Misc utility classes
-uk.org.retep.util.models            Swing table models
-uk.org.retep.util.proped            Property Editor
-uk.org.retep.util.xml.core          Basic XML Factory
-uk.org.retep.util.xml.jdbc          JDBC/XML interface
-uk.org.retep.util.xml.parser        Simple SAX parser
-
-Structure of a tool
--------------------
-
-Each tool has at least 2 base classes, and an entry in the tools.properties
-file. For this example, I'll show you the Properties Editor:
-
-Base package      uk.org.retep.util.proped
-Main tool class   uk.org.retep.util.proped.PropertyEditor
-Standalone class  uk.org.retep.util.proped.Main
-
-The main tool class is the entry point used by the main application. Because
-they are used in a GUI, this class must extend javax.swing.JComponent and
-implement the uk.org.retep.tools.Tool interface. (NB: You will find I always
-use JPanel, but JComponent is used here so that any swing class can be used
-you are not limited to JPanel.)
-
-The standalone class is a basic static class that implements the main method.
-It should extend the uk.org.retep.misc.StandaloneApp class and be written along
-the lines of the following example:
-
-      import uk.org.retep.util.StandaloneApp;
-      import javax.swing.JComponent;
-
-      public class Main extends StandaloneApp
-      {
-        public Main(String[] args)
-        throws Exception
-        {
-          super(args);
-        }
-
-        public JComponent init()
-        throws Exception
-        {
-          // Your initialisation here. In this case the PropertyEditor
-          PropertyEditor panel = new PropertyEditor();
-
-          // do stuff here, ie load a file if supplied
-
-          // return the tool
-          return panel;
-        }
-
-        public static void main(String[] args)
-        throws Exception
-        {
-          Main main = new Main(args);
-          main.pack();
-          main.setVisible(true);
-        }
-      }
-
-you will find a template in the uk.org.retep.util.Main class. Simply copy this
-classes source, as it gives you the basic stub. Just add your own implementation
-if init() like the one above. Look at the full Main class for the
-PropertiesEditor to see how to get at the command line args.
-
-By convention, the standalone class is named Main.
-
diff --git a/contrib/retep/Makefile b/contrib/retep/Makefile
deleted file mode 100644
index e5de9c7ac8..0000000000
--- a/contrib/retep/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile for contributed retep tools
-#
-# Copyright (c) 2001, PostgreSQL Global Development Group
-#
-# $Header: /cvsroot/pgsql/contrib/retep/Attic/Makefile,v 1.1 2001/07/06 23:07:20 petere Exp $
-#
-#-------------------------------------------------------------------------
-
-subdir = contrib/retep
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-all:
-	$(ANT) -buildfile $(srcdir)/build.xml all
-
-install: installdirs
-	$(ANT) -buildfile $(srcdir)/build.xml install \
-	  -Dinstall.directory=$(javadir)
-
-installdirs:
-	$(mkinstalldirs) $(javadir)
-
-uninstall:
-	$(ANT) -buildfile $(srcdir)/build.xml uninstall \
-	  -Dinstall.directory=$(javadir)
-
-clean distclean maintainer-clean:
-	$(ANT) -buildfile $(srcdir)/build.xml clean
diff --git a/contrib/retep/README b/contrib/retep/README
deleted file mode 100644
index 5355c9d99f..0000000000
--- a/contrib/retep/README
+++ /dev/null
@@ -1,35 +0,0 @@
-Before you ask what retepTools are, they are my personal suite of utilities.
-About 90% of them are JDBC related (either they use JDBC, or I use them in
-developing the JDBC driver).
-
-Now, because of various reasons I won't go into now, in January 2001 I decided
-to release the entire lot to the public. I could have used something like
-SourceForge, but as they are mainly JDBC related I thought here is the best
-place.
-
-Now all (bar retepPDF, see end-note) will over the next few months be going
-into the /contrib/retep directory. They range from simple XML Inport/Export
-classes to entire sub-systems that can be plugged into applications.
-
-All this lot were never released, so I'm placing them under PostgreSQL's
-licence.
-
-Please refer to Implementation for details of what package does what.
-
-It all requires Java2SE (JDK1.2) as a minimum. I do have some plans for some
-EJB tools later, so those will need Java2EE, but not yet ;-)
-
-Peter Mount
-peter@retep.org.uk
-March 2 2001
-
-retepPDF: This is not included for two reasons:
-
-1: It's big and not really related in any way to PostgreSQL
-2: More importantly, I (may be foolishly) released it some 3 years ago under
-   the LGPL. As a few people have added to it, it's not really possible to
-   change the licence, and I don't want to polute PostgreSQL's source tree ;-)
-
-retepGraph: This was an old graphics library. It's been obsolete for 3 years
-now, so it's not going in.
-
diff --git a/contrib/retep/build.xml b/contrib/retep/build.xml
deleted file mode 100644
index 04a8db5c2f..0000000000
--- a/contrib/retep/build.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-  build file to build the donated retep tools packages
-
-  $Header: /cvsroot/pgsql/contrib/retep/Attic/build.xml,v 1.8 2001/07/06 23:07:20 petere Exp $
-
--->
-
-<!DOCTYPE project [
-  <!ENTITY jarname "retepTools.jar">
-]>
-
-<project name="retep" default="all" basedir=".">
-
-  <!-- set global properties for this build -->
-  <property name="srcdir"  value="." />
-  <property name="builddir" value="build" />
-  <property name="package" value="uk/org/retep" />
-  <property name="jardir"  value="jars" />
-
-  <!-- Some checks used to build dependent on the environment -->
-  <target name="checks">
-    <available property="jdk1.2+" classname="java.lang.ThreadLocal" />
-    <available property="jdk1.3+" classname="java.lang.StrictMath" />
-    <available property="jdk1.2e+" classname="javax.sql.DataSource" />
-    <available property="xml" classname="org.xml.sax.Parser" />
-  </target>
-
-  <target name="warning" depends="checks" unless="jdk1.2+">
-    <echo>
-*** WARNING: Contributed retep tools need jdk1.2 or later.
-***          Compilation NOT done
-    </echo>
-  </target>
-
-
-  <!-- default target -->
-  <target name="all">
-    <antcall target="jar" />
-  </target>
-
-
-  <!-- Builds the various jar files -->
-  <target name="jar" depends="compile">
-    <jar jarfile="${jardir}/&jarname;" whenempty="fail">
-       <fileset dir="${builddir}">
-         <include name="**/*.class" />
-       </fileset>
-
-       <fileset dir="${srcdir}">
-         <include name="**/*.properties" />
-       </fileset>
-    </jar>
-  </target> 
-
-
-  <!-- Builds the XML Tools -->
-  <target name="compile" depends="checks,prepare,warning" if="jdk1.2+">
-    <javac srcdir="${srcdir}" destdir="${builddir}">
-      <include name="${package}/**" />
-      <exclude name="${package}/**" unless="jdk1.2+" />
-    </javac>
-  </target>
-
-
-  <!-- Prepares the build by creating a directory to place the class files -->
-  <target name="prepare">
-    <mkdir dir="${builddir}" />
-    <mkdir dir="${jardir}" />
-  </target>
-
-
-  <target name="install" depends="all" if="install.directory">
-    <copy todir="${install.directory}" overwrite="true" filtering="off">
-      <fileset dir="${jardir}">
-        <include name="&jarname;" />
-      </fileset>
-    </copy>
-  </target>
-
-
-  <target name="uninstall" if="install.directory">
-    <delete>
-      <fileset dir="${install.directory}">
-        <include name="&jarname;" />
-      </fileset>
-    </delete>
-  </target>
-
-
-  <!-- This target removes any class files from the build directory -->
-  <target name="clean">
-    <delete quiet="true" dir="${builddir}" />
-    <delete quiet="true" dir="${jardir}" />
-  </target>
-
-</project>
diff --git a/contrib/retep/data/cds.dtd b/contrib/retep/data/cds.dtd
deleted file mode 100644
index df542c3476..0000000000
--- a/contrib/retep/data/cds.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ELEMENT album (track*)+>
-<!ATTLIST album
-title CDATA #IMPLIED
- aid CDATA #IMPLIED
->
-<!ELEMENT catalogue (group)>
-<!ELEMENT group (album*)>
-<!ATTLIST group
- name CDATA #IMPLIED
->
-<!ELEMENT track (#PCDATA)>
-<!ATTLIST track
- tid CDATA #IMPLIED
- id CDATA #IMPLIED
->
-
diff --git a/contrib/retep/data/cds.xml b/contrib/retep/data/cds.xml
deleted file mode 100644
index fb0203bda9..0000000000
--- a/contrib/retep/data/cds.xml
+++ /dev/null
@@ -1,2691 +0,0 @@
-<catalogue>
-  <group name="(hed) Planet Earth">
-    <album aid="1" title="Broke">
-      <track id="1" tid="1">01 - Kiling Time</track>
-      <track id="2" tid="2">02 - Waiting To Die</track>
-      <track id="3" tid="3">03 - Feel Good</track>
-      <track id="4" tid="4">04 - Bartender</track>
-      <track id="5" tid="5">05 - Crazy Legs</track>
-      <track id="6" tid="6">06 - Pac Bell</track>
-      <track id="7" tid="7">07 - I Got You</track>
-      <track id="8" tid="8">08 - Boom (How You Like That)</track>
-      <track id="9" tid="9">09 - Swan Dive</track>
-      <track id="10" tid="10">10 - Stevie</track>
-      <track id="11" tid="11">11 - Jesus (Of Nazareth)</track>
-      <track id="12" tid="12">12 - The Meadow</track>
-  </group>
-  <group name="2 Unlimited">
-    </album>
-    <album aid="2" title="2 Unlimited">
-      <track id="13" tid="1">jump for joy</track>
-    </album>
-    <album aid="3" title="NO Limits!">
-      <track id="14" tid="1">01 - No Limit</track>
-      <track id="15" tid="2">02 - Tribal Dance</track>
-      <track id="16" tid="3">03 - Mysterious</track>
-      <track id="17" tid="4">04 - Faces</track>
-      <track id="18" tid="5">05 - Maximum Overdrive</track>
-      <track id="19" tid="6">06 - The Power Age</track>
-      <track id="20" tid="7">07 - Break The Chain</track>
-      <track id="21" tid="8">08 - Kiss Me Bliss Me</track>
-      <track id="22" tid="9">09 - Thow The Groove Down</track>
-      <track id="23" tid="10">10 - R.U.O.K</track>
-      <track id="24" tid="11">11 - Let The Beat Control Your Body</track>
-      <track id="25" tid="12">12 - Invinite Me To Trance</track>
-      <track id="26" tid="13">13 - Where Are You Now</track>
-      <track id="27" tid="14">14 - Shelter For A Rainy Day</track>
-      <track id="28" tid="15">15 - Get Ready For This (WILDE MIX)</track>
-      <track id="29" tid="16">16 - No Limit - (AUTOMATIC BREAKBEAT REMIX)</track>
-  </group>
-  <group name="2-Raum Wohnung">
-    </album>
-    <album aid="4" title="Wir trafen uns in einem Garten">
-      <track id="30" tid="1">01 - 2-Raum Wohnung - Wir trafen uns in einem Garten</track>
-      <track id="31" tid="2">02 - 2-Raum Wohnung - Wir trafen uns in einem Garten (Inga Humpes Version)</track>
-      <track id="32" tid="3">03 - 2-Raum Wohnung - Wir trafen uns in einem Garten mit Max</track>
-      <track id="33" tid="4">04 - 2-Raum Wohnung - Wir trafen uns in einem Garten (i-oI - Remix)</track>
-  </group>
-  <group name="2000 Black">
-    </album>
-    <album aid="5" title="The GooDgOOd">
-      <track id="34" tid="1">01 - Track  1</track>
-      <track id="35" tid="2">02 - Track  2</track>
-      <track id="36" tid="3">03 - Track  3</track>
-      <track id="37" tid="4">04 - Track  4</track>
-      <track id="38" tid="5">05 - Track  5</track>
-      <track id="39" tid="6">06 - Track  6</track>
-      <track id="40" tid="7">07 - Track  7</track>
-      <track id="41" tid="8">08 - Track  8</track>
-      <track id="42" tid="9">09 - Track  9</track>
-      <track id="43" tid="10">10 - Track 10</track>
-      <track id="44" tid="11">11 - Track 11</track>
-      <track id="45" tid="12">12 - Track 12</track>
-      <track id="46" tid="13">13 - Track 13</track>
-  </group>
-  <group name="23rd spirit">
-    </album>
-    <album aid="6" title="the homegrown edition">
-      <track id="47" tid="1">01 - Show me something good</track>
-      <track id="48" tid="2">02 - Feel 'ya</track>
-      <track id="49" tid="3">03 - Find Your Own Peace</track>
-      <track id="50" tid="4">04 - Nourishing The Ocean</track>
-      <track id="51" tid="5">05 - Walking</track>
-      <track id="52" tid="6">06 - Bring Out Your Love</track>
-      <track id="53" tid="7">07 - Primetime</track>
-      <track id="54" tid="8">08 - Stormy</track>
-      <track id="55" tid="9">09 - Philosophie</track>
-      <track id="56" tid="10">10 - No</track>
-      <track id="57" tid="11">11 - Dharma</track>
-      <track id="58" tid="12">12 - Shine On</track>
-  </group>
-  <group name="2Pac">
-    </album>
-    <album aid="7" title="All Eyes On Me">
-      <track id="59" tid="1">01 - Ambitionz As A Ridah</track>
-      <track id="60" tid="2">02 - All bout u</track>
-      <track id="61" tid="3">03 - Skandalouz</track>
-      <track id="62" tid="4">04 - Got My Mind Made Up</track>
-      <track id="63" tid="5">05 - How Do You Want It</track>
-      <track id="64" tid="6">06 - 2 Of Amerikaz Most Wanted</track>
-      <track id="65" tid="7">07 - No More Pain</track>
-      <track id="66" tid="8">08 - Heartz of Men</track>
-      <track id="67" tid="9">09 - Life Goes On</track>
-      <track id="68" tid="10">10 - Only God can judge me</track>
-      <track id="69" tid="11">11 - Tradin War Stories</track>
-      <track id="70" tid="12">12 - California Love(RMX)</track>
-      <track id="71" tid="13">13 - I Ain't Mad At Cha</track>
-      <track id="72" tid="14">14 - What'z Ya Phone Number</track>
-    </album>
-    <album aid="8" title="Changes (Maxi)">
-      <track id="73" tid="1">01 - Radio Mix</track>
-      <track id="74" tid="2">02 - Instrumental</track>
-      <track id="75" tid="3">03 - Album Mix</track>
-    </album>
-    <album aid="9" title="R U Still Down  [Remember Me]|CD1">
-      <track id="76" tid="1">01 - Redemption</track>
-      <track id="77" tid="2">02 - Open Fire</track>
-      <track id="78" tid="3">03 - R U Still Down_ (Remeber Me)</track>
-      <track id="79" tid="4">04 - Hellrazor</track>
-      <track id="80" tid="5">05 - Thug Style</track>
-      <track id="81" tid="6">06 - Where Do We Go From Here</track>
-      <track id="82" tid="7">07 - I Wonder If Heaven Got A Ghetto</track>
-      <track id="83" tid="8">08 - Nothing To Lose</track>
-      <track id="84" tid="9">09 - I'm Gettin Money</track>
-      <track id="85" tid="10">10 - Lie To Kick It</track>
-      <track id="86" tid="11">11 - Fuck All Y'all</track>
-      <track id="87" tid="12">12 - Let Them Thangs Go</track>
-      <track id="88" tid="13">13 - Definition Of A Thug Nigga</track>
-    </album>
-    <album aid="10" title="R U Still Down  [Remember Me]|CD2">
-      <track id="89" tid="1">01 - Ready 4 Whatever</track>
-      <track id="90" tid="2">02 - When I Get Free</track>
-      <track id="91" tid="3">03 - Hold On Be Strong</track>
-      <track id="92" tid="4">04 - I'm Losin It</track>
-      <track id="93" tid="5">05 - Fake Ass Bitches</track>
-      <track id="94" tid="6">06 - Do For Love</track>
-      <track id="95" tid="7">07 - Enemies With Me</track>
-      <track id="96" tid="8">08 - Nothin But Love</track>
-      <track id="97" tid="9">09 - 16 On Death Row</track>
-      <track id="98" tid="10">10 - I Wonder If Heaven Got A Ghetto (Hip-hop Version)</track>
-      <track id="99" tid="11">11 - When I Get Free</track>
-      <track id="100" tid="12">12 - Black Starry Night (Interlude)</track>
-      <track id="101" tid="13">13 - Only Fear Of Death</track>
-  </group>
-  <group name="3p">
-    </album>
-    <album aid="11" title="3p (License to kill) (Maxi)">
-      <track id="102" tid="1">01 - Original Version</track>
-      <track id="103" tid="2">02 - SNA Club Mix</track>
-      <track id="104" tid="3">03 - Jack Daniel´s</track>
-  </group>
-  <group name="4 hero">
-    </album>
-    <album aid="12" title="Two Pages - Page 1">
-      <track id="105" tid="1">01-Loveless</track>
-      <track id="106" tid="2">02-Golden Age of Life</track>
-      <track id="107" tid="3">03-Planeteria</track>
-      <track id="108" tid="4">04-Third Stream</track>
-      <track id="109" tid="5">05-Escape That</track>
-      <track id="110" tid="6">06-Cosmic Tree</track>
-      <track id="111" tid="7">07-Spirits in Transit</track>
-      <track id="112" tid="8">08-The Action</track>
-      <track id="113" tid="9">09-Star Chasers</track>
-      <track id="114" tid="10">10-Wishful Thinking</track>
-      <track id="115" tid="11">11-Universal Reprise</track>
-    </album>
-    <album aid="13" title="Two Pages - Page 2">
-      <track id="116" tid="1">01-We who are not as others</track>
-      <track id="117" tid="2">02-Humans</track>
-      <track id="118" tid="3">03-In the shadows</track>
-      <track id="119" tid="4">04-Mathmatical Probability</track>
-      <track id="120" tid="5">05-Greys</track>
-      <track id="121" tid="6">06-Pegasus 51</track>
-      <track id="122" tid="7">07-!$^^$%</track>
-      <track id="123" tid="8">08-Wormholes</track>
-      <track id="124" tid="9">09-Dauntless</track>
-    </album>
-    <album aid="14" title="Two Pages Reinterpretations">
-      <track id="125" tid="1">01-Planetaria (Hefner Remix)</track>
-      <track id="126" tid="2">02-We Who Are Not As Others (Jazzaova Version)</track>
-      <track id="127" tid="3">03-Mathematical Probability (Mustang Remix)</track>
-      <track id="128" tid="4">04-Escape That (New Sector Movements Selekshan 2 Sector Rub Remix)</track>
-      <track id="129" tid="5">05-Escape That (Off-World Remix)</track>
-      <track id="130" tid="6">06-Dauntless (Restless Soul South Pacific Remix)</track>
-      <track id="131" tid="7">07-Star Chasers (Masters at Work Main Mix)</track>
-      <track id="132" tid="8">08-Star Chasers (Azymuth Remix)</track>
-      <track id="133" tid="9">09-The Action (Shawn J Period Remix)</track>
-      <track id="134" tid="10">10-We Who Are Not As Others (Alpha Omega Remix)</track>
-      <track id="135" tid="11">11-We Who Are Not As Others (Sonar Circle Remix)</track>
-  </group>
-  <group name="4 Non Blondes">
-    </album>
-    <album aid="15" title="4 Non Blondes">
-      <track id="136" tid="1">01 - Train</track>
-      <track id="137" tid="2">02 - Superfly</track>
-      <track id="138" tid="3">03 - What's Up</track>
-      <track id="139" tid="4">04 - Pleasantly Blue</track>
-      <track id="140" tid="5">05 - Morphin & Chocolate</track>
-      <track id="141" tid="6">06 - Spaceman</track>
-      <track id="142" tid="7">07 - Old Mr. Heffer</track>
-      <track id="143" tid="8">08 - Calling All The People</track>
-      <track id="144" tid="9">09 - Dear Mr. President</track>
-      <track id="145" tid="10">10 - Drifting</track>
-      <track id="146" tid="11">11 - No Place Like Home</track>
-  </group>
-  <group name="90125">
-    </album>
-    <album aid="16" title="90125">
-      <track id="147" tid="1">01 - Owner Of A Lonely Heart</track>
-      <track id="148" tid="2">02 - Hold On</track>
-      <track id="149" tid="3">03 - It Can Happen</track>
-      <track id="150" tid="4">04 - Changes</track>
-      <track id="151" tid="5">05 - Cinema</track>
-      <track id="152" tid="6">06 - Leave It</track>
-      <track id="153" tid="7">07 - Our Song</track>
-      <track id="154" tid="8">08 - City Of Love</track>
-      <track id="155" tid="9">09 - Hearts</track>
-  </group>
-  <group name="A">
-    </album>
-    <album aid="17" title="A vs Monkey Kong">
-      <track id="156" tid="1">01 - For Starters</track>
-      <track id="157" tid="2">02 - Monkey Kong</track>
-      <track id="158" tid="3">03 - A</track>
-      <track id="159" tid="4">04 - Old Folks</track>
-      <track id="160" tid="5">05 - Hopper Jonnus Fang</track>
-      <track id="161" tid="6">06 - Summer On The Underground</track>
-      <track id="162" tid="7">07 - Warning</track>
-      <track id="163" tid="8">08 - If It Ain't Broke Fix It Anyway</track>
-      <track id="164" tid="9">09 - I Love Lake Tahoe</track>
-      <track id="165" tid="10">10 - Don't Be Punks</track>
-      <track id="166" tid="11">11 - Down On The Floor</track>
-      <track id="167" tid="12">12 - Jason's Addiction</track>
-      <track id="168" tid="13">13 - Miles Away</track>
-      <track id="169" tid="14">14 - Getting Around</track>
-  </group>
-  <group name="A Guy Called Gerald">
-    </album>
-    <album aid="18" title="Essence">
-      <track id="170" tid="1">01-The Universe-A Guy Called Gerald</track>
-      <track id="171" tid="2">02-The First Breath-A Guy Called Gerald</track>
-      <track id="172" tid="3">03-Humanity-A Guy Called Gerald</track>
-      <track id="173" tid="4">04-Multiplies-A Guy Called Gerald</track>
-      <track id="174" tid="5">05-Fever (Or a Flame)-A Guy Called Gerald</track>
-      <track id="175" tid="6">06-Could you Understand-A Guy Called Gerald</track>
-      <track id="176" tid="7">07-Alien Report-A Guy Called Gerald</track>
-      <track id="177" tid="8">08-Glow-A Guy Called Gerald</track>
-      <track id="178" tid="9">09-Beaches & Deserts-A Guy Called Gerald</track>
-      <track id="179" tid="10">10-Final Call-A Guy Called Gerald</track>
-      <track id="180" tid="11">11-I Make It-A Guy Called Gerald</track>
-      <track id="181" tid="12">12-Universal Spirit-A Guy Called Gerald</track>
-      <track id="182" tid="13">13-Hurry To Go Easy-A Guy Called Gerald</track>
-      <track id="183" tid="14">14-Scale Circle-A Guy Called Gerald</track>
-      <track id="184" tid="15">15-Landed-A Guy Called Gerald</track>
-  </group>
-  <group name="A Teens">
-    </album>
-    <album aid="19" title="The ABBA Generation">
-      <track id="185" tid="1">01 A Teens - Mamma Mia</track>
-      <track id="186" tid="2">03 A Teens - Super Trouper</track>
-      <track id="187" tid="3">02 A Teens - gimme gimme gimme (a man after midnight)</track>
-      <track id="188" tid="4">04 A Teens - One of us</track>
-      <track id="189" tid="5">05 A Teens - Voulez vous</track>
-      <track id="190" tid="6">06 A Teens - SOS</track>
-      <track id="191" tid="7">07 A Teens - Dancing Queen</track>
-      <track id="192" tid="8">08 A Teens - Take a chance on me</track>
-      <track id="193" tid="9">09 A Teens - Lay all your love on me</track>
-      <track id="194" tid="10">10 A Teens - The name of the game</track>
-      <track id="195" tid="11">11 ATeens - Our last summer</track>
-  </group>
-  <group name="a-ha">
-    </album>
-    <album aid="20" title="Headlines and Deadlines">
-      <track id="196" tid="1">01 - Take On Me</track>
-      <track id="197" tid="2">02  - Cry Wolf</track>
-      <track id="198" tid="3">03 - Touchy</track>
-      <track id="199" tid="4">04 - You Are The One</track>
-      <track id="200" tid="5">05 - Manhattan Skyline</track>
-      <track id="201" tid="6">06 - The Blood That Moves The Body</track>
-      <track id="202" tid="7">07 - Early Morning</track>
-      <track id="203" tid="8">08 - Hunting High And Low</track>
-      <track id="204" tid="9">09 - Move To Memphis</track>
-      <track id="205" tid="10">10 - I've Been Losing You</track>
-      <track id="206" tid="11">11 - The Living Daylights</track>
-      <track id="207" tid="12">12 - Crying In The Rain</track>
-      <track id="208" tid="13">13 - I Call Your Name</track>
-      <track id="209" tid="14">14 - Stay On These Roads</track>
-      <track id="210" tid="15">15 - Train Of Thought</track>
-      <track id="211" tid="16">16 - The Sun Always Shines On TV</track>
-    </album>
-    <album aid="21" title="hunting high and low">
-      <track id="212" tid="1">01 - Take on me</track>
-      <track id="213" tid="2">02 - Train of Thought</track>
-      <track id="214" tid="3">03 - Hunting High and Low</track>
-      <track id="215" tid="4">04 - The Blue Sky</track>
-      <track id="216" tid="5">05 - Living a Boy's Adventure Tale </track>
-      <track id="217" tid="6">06 - The Sun Always Shines On TV</track>
-      <track id="218" tid="7">07 - And You Tell Me</track>
-      <track id="219" tid="8">08 - Love Is Reason</track>
-      <track id="220" tid="9">09 - I Dream Myself Alive</track>
-      <track id="221" tid="10">10 - Here I Stand and Face the Rain</track>
-    </album>
-    <album aid="22" title="Minor Earth Major Sky">
-      <track id="222" tid="1">01 - minor earth major sky</track>
-      <track id="223" tid="2">02 - little black heart</track>
-      <track id="224" tid="3">03 - velvet</track>
-      <track id="225" tid="4">04 - summer moved on</track>
-      <track id="226" tid="5">05 - the sun never shone that day</track>
-      <track id="227" tid="6">06 - to let you win</track>
-      <track id="228" tid="7">07 - the company man</track>
-      <track id="229" tid="8">08 - thought that it was you</track>
-      <track id="230" tid="9">09 - i wish i cared</track>
-      <track id="231" tid="10">10 - barely hanging on</track>
-      <track id="232" tid="11">11 - you will never get over me</track>
-      <track id="233" tid="12">12 - i wont forget here</track>
-      <track id="234" tid="13">13 - mary ellen makes the moment count</track>
-  </group>
-  <group name="ABBA">
-    </album>
-    <album aid="23" title="Gold">
-      <track id="235" tid="1">01 - Dancing Queen</track>
-      <track id="236" tid="2">02 - Knowing Me, Knowing You</track>
-      <track id="237" tid="3">03 - Take A Chance On Me</track>
-      <track id="238" tid="4">04 - Mamma Mia</track>
-      <track id="239" tid="5">05 - Lay All Your Love On Me</track>
-      <track id="240" tid="6">06 - Super Trouper</track>
-      <track id="241" tid="7">07 - I Have A Dream</track>
-      <track id="242" tid="8">08 - The Winner Takes It All</track>
-      <track id="243" tid="9">09 - Money, Money, Money</track>
-      <track id="244" tid="10">10 - S.O.S</track>
-      <track id="245" tid="11">11 - Chiquitita</track>
-      <track id="246" tid="12">12 - Fernando</track>
-      <track id="247" tid="13">13 - Voulez Vous</track>
-      <track id="248" tid="14">14 - Gimme! Gimme! Gimme!</track>
-      <track id="249" tid="15">15 - Does Your Mother Know</track>
-      <track id="250" tid="16">16 - One Of Us</track>
-      <track id="251" tid="17">17 - The Name Of The Game</track>
-      <track id="252" tid="18">18 - Thank You For The Musik</track>
-      <track id="253" tid="19">19 - Waterloo</track>
-    </album>
-    <album aid="24" title="Golden Stars">
-      <track id="254" tid="1">01 - Waterloo</track>
-      <track id="255" tid="2">02 - Honey, Honey</track>
-      <track id="256" tid="3">03 - So long</track>
-      <track id="257" tid="4">04 - I do</track>
-      <track id="258" tid="5">05 - SOS</track>
-      <track id="259" tid="6">06 - Mamma mia</track>
-      <track id="260" tid="7">07 - Fernando</track>
-      <track id="261" tid="8">09 - Money, Money, Money</track>
-      <track id="262" tid="9">10 - The name of the game</track>
-      <track id="263" tid="10">11 - Take a chance on me</track>
-      <track id="264" tid="11">12 - Chiquitita</track>
-      <track id="265" tid="12">13 - I have a dream</track>
-      <track id="266" tid="13">14 - The winner takes it all</track>
-      <track id="267" tid="14">15 - Super trouper</track>
-      <track id="268" tid="15">16 - Thank you for the music</track>
-    </album>
-    <album aid="25" title="More Gold">
-      <track id="269" tid="1">01 - Summer Night City</track>
-      <track id="270" tid="2">02 - Angeleyes</track>
-      <track id="271" tid="3">03 - The Day Before You Came</track>
-      <track id="272" tid="4">04 - Eagle</track>
-      <track id="273" tid="5">05 - I Do, I Do, I Do, I Do, I Do</track>
-      <track id="274" tid="6">06 - So Long</track>
-      <track id="275" tid="7">07 - Honey Honey</track>
-      <track id="276" tid="8">08 - The Visitors</track>
-      <track id="277" tid="9">09 - Our Last Summer</track>
-      <track id="278" tid="10">10 - On & On</track>
-      <track id="279" tid="11">11 - Ring Ring</track>
-      <track id="280" tid="12">12 - I Wonder</track>
-      <track id="281" tid="13">13 - Lovelight</track>
-      <track id="282" tid="14">14 - Head Over Heels</track>
-      <track id="283" tid="15">15 - When I Kissed The Teacher</track>
-      <track id="284" tid="16">16 - I Am The City</track>
-      <track id="285" tid="17">17 - Cassandra</track>
-      <track id="286" tid="18">18 - Under Attack</track>
-      <track id="287" tid="19">19 - When All Is Said And Done</track>
-      <track id="288" tid="20">20 - The Way Old Friends Do</track>
-    </album>
-    <album aid="26" title="The Complete Single Collection|CD1">
-      <track id="289" tid="1">01 - People Need Love</track>
-      <track id="290" tid="2">02 - Ring Ring</track>
-      <track id="291" tid="3">03 - Waterloo</track>
-      <track id="292" tid="4">04 - Waterloo (German Version) </track>
-      <track id="293" tid="5">05 - Honey Honey</track>
-      <track id="294" tid="6">06 - So Long</track>
-      <track id="295" tid="7">07 - I Do, I Do, I Do, I Do, I Do</track>
-      <track id="296" tid="8">08 - S.O.S</track>
-      <track id="297" tid="9">09 - Mamma Mia</track>
-      <track id="298" tid="10">10 - Fernando</track>
-      <track id="299" tid="11">11 - Dancing Queen</track>
-      <track id="300" tid="12">12 - Money, Money, Money</track>
-      <track id="301" tid="13">13 - Knowing Me, Knowing You</track>
-      <track id="302" tid="14">14 - The Name Of The Game</track>
-      <track id="303" tid="15">15 - Take A Chance On Me</track>
-      <track id="304" tid="16">16 - Eagle</track>
-      <track id="305" tid="17">17 - Thank You For The Music</track>
-      <track id="306" tid="18">18 - Summer Night City</track>
-    </album>
-    <album aid="27" title="The Complete Single Collection|CD2">
-      <track id="307" tid="1">01 - Chiquitita</track>
-      <track id="308" tid="2">02 - Does Your Mother Know</track>
-      <track id="309" tid="3">03 - Voulez-Vous</track>
-      <track id="310" tid="4">04 - Gimme! Gimme! Gimme! (A Man After Midnight)</track>
-      <track id="311" tid="5">05 - I Have A Dream</track>
-      <track id="312" tid="6">06 - The Winner Takes It All</track>
-      <track id="313" tid="7">07 - Super Trouper</track>
-      <track id="314" tid="8">08 - Lay All Your Love On Me</track>
-      <track id="315" tid="9">09 - One Of Us</track>
-      <track id="316" tid="10">10 - Head Over Heels</track>
-      <track id="317" tid="11">11 - The Day Before You Came</track>
-      <track id="318" tid="12">12 - Under Attack</track>
-      <track id="319" tid="13">13 - Ring Ring (German Version)</track>
-      <track id="320" tid="14">14 - Happy New Year</track>
-      <track id="321" tid="15">15 - Wer Im Wartesaal Der Liebe Steht</track>
-  </group>
-  <group name="Absolute Beginner">
-    </album>
-    <album aid="28" title="Bamboole">
-      <track id="322" tid="1">01. Absolute Beginner - Das Boot</track>
-      <track id="323" tid="2">02. Absolute Beginner - Hammerhart</track>
-      <track id="324" tid="3">03. Absolute Beginner - Rock On</track>
-      <track id="325" tid="4">04. Absolute Beginner - Liebeslied</track>
-      <track id="326" tid="5">05. Absolute Beginner - Füchse</track>
-      <track id="327" tid="6">06. Absolute Beginner - Fahr'n</track>
-      <track id="328" tid="7">07. Absolute Beginner - Showmaster</track>
-      <track id="329" tid="8">08. Absolute Beginner - Geht Was</track>
-      <track id="330" tid="9">09. Absolute Beginner - Geh bitte</track>
-      <track id="331" tid="10">10. Absolute Beginner - Nie Nett</track>
-      <track id="332" tid="11">11. Absolute Beginner - Mikro in der Hand</track>
-      <track id="333" tid="12">12. Absolute Beginner - Nicht Allein</track>
-      <track id="334" tid="13">5Sterne Delux - Dein Herz schlägt schneller</track>
-  </group>
-  <group name="Abwaerts">
-    </album>
-    <album aid="29" title="Hurra">
-      <track id="335" tid="1">01-Zonenzombie</track>
-      <track id="336" tid="2">02-Papier</track>
-      <track id="337" tid="3">03-Friss den Stahl</track>
-      <track id="338" tid="4">04-Charly</track>
-      <track id="339" tid="5">05-Die Ballade von Karl Arsch</track>
-      <track id="340" tid="6">06-Europa</track>
-      <track id="341" tid="7">07-Terror und Schrott</track>
-      <track id="342" tid="8">08-Küss mich</track>
-      <track id="343" tid="9">09-Weit daneben gepisst</track>
-      <track id="344" tid="10">10-Welt voll Harmonie</track>
-      <track id="345" tid="11">11-Die Zeit</track>
-      <track id="346" tid="12">12-Unfall</track>
-      <track id="347" tid="13">13-Ich und die Wirklichkeit</track>
-      <track id="348" tid="14">14Die Reise</track>
-  </group>
-  <group name="AC-DC">
-    </album>
-    <album aid="30" title="The Best">
-      <track id="349" tid="1">01 AC-DC - Riff Raff</track>
-      <track id="350" tid="2">02 AC-DC - Let There Be Rock</track>
-      <track id="351" tid="3">03 AC-DC - Whole Lotta Rosie</track>
-      <track id="352" tid="4">04 AC-DC - Sin City</track>
-      <track id="353" tid="5">05 AC-DC - Dirty Deeds Done Dirt Cheap</track>
-      <track id="354" tid="6">06 AC-DC - Baby Please Don't Go</track>
-      <track id="355" tid="7">07 AC-DC - Big Balls</track>
-      <track id="356" tid="8">08 AC-DC - Walk All Over You</track>
-      <track id="357" tid="9">09 AC-DC - Hard As Rock</track>
-      <track id="358" tid="10">10 AC-DC - Hells Bells</track>
-      <track id="359" tid="11">11 AC-DC - What Next To The Moon</track>
-      <track id="360" tid="12">12 AC-DC - Shake Your Foundations</track>
-      <track id="361" tid="13">13 AC-DC - Gone Shooting</track>
-      <track id="362" tid="14">14 AC-DC - Thunderstuck</track>
-  </group>
-  <group name="Ace of Base">
-    </album>
-    <album aid="31" title="Flowers">
-      <track id="363" tid="1">01 - Life Is A Flower</track>
-      <track id="364" tid="2">02 - Always Have, Always Will</track>
-      <track id="365" tid="3">03 - Cruel Summer</track>
-      <track id="366" tid="4">04 - Travel To Romantis</track>
-      <track id="367" tid="5">05 - Adventures In Paradise</track>
-      <track id="368" tid="6">06 - Dr. Sun</track>
-      <track id="369" tid="7">07 - Cecilia</track>
-      <track id="370" tid="8">08 - He Decides</track>
-      <track id="371" tid="9">09 - I Pray</track>
-      <track id="372" tid="10">10 - Tokyo Girl</track>
-      <track id="373" tid="11">11 - Don't Go Away</track>
-      <track id="374" tid="12">12 - Captain Nemo</track>
-      <track id="375" tid="13">13 - Donnie</track>
-      <track id="376" tid="14">14 - Cruel Summer (Big Bonus Mix)</track>
-    </album>
-    <album aid="32" title="Happy Nation">
-      <track id="377" tid="1">01 - Voules-Vous Dancer</track>
-      <track id="378" tid="2">02 - All That She Wants</track>
-      <track id="379" tid="3">03 - Münchhausen (Just Chaos)</track>
-      <track id="380" tid="4">04 - Happy Nation</track>
-      <track id="381" tid="5">05 - Waiting For Magic</track>
-      <track id="382" tid="6">06 - Fashion Party</track>
-      <track id="383" tid="7">07 - Wheel Of Fortune</track>
-      <track id="384" tid="8">08 - Dancer In A Daydream</track>
-      <track id="385" tid="9">09 - My Mind -Mindles Mix-</track>
-      <track id="386" tid="10">10 - W.O.F. -Original Club Mix-</track>
-      <track id="387" tid="11">11 - Dimension Of Depth</track>
-      <track id="388" tid="12">12 - Young And Proud</track>
-      <track id="389" tid="13">13 - A.T.S.W. -Banghra Version-</track>
-    </album>
-    <album aid="33" title="The Sign (Maxi-CD)">
-      <track id="390" tid="1">01 - The sign (radio edit)</track>
-      <track id="391" tid="2">02 - The sign (long version)</track>
-  </group>
-  <group name="Achim Reichel">
-    </album>
-    <album aid="34" title="Melancholie und Sturmflut">
-      <track id="392" tid="1">01 - Made in Paradise</track>
-      <track id="393" tid="2">02 - Auf der Rolltreppe</track>
-      <track id="394" tid="3">03 - Kuddel Daddel Du</track>
-      <track id="395" tid="4">04 - Die Zauberin</track>
-      <track id="396" tid="5">06 - Sturmflut</track>
-      <track id="397" tid="6">07 - Robert der Roboter</track>
-      <track id="398" tid="7">08 - Melancholie</track>
-      <track id="399" tid="8">09 - Karawane ins Glück</track>
-      <track id="400" tid="9">10 - Das Lied von Susi und Johnny</track>
-      <track id="401" tid="10">11 - Mein Herz ist ein Ufo</track>
-  </group>
-  <group name="Acid Scout">
-    </album>
-    <album aid="35" title="Safari">
-      <track id="402" tid="1">01 - acid marathon 1</track>
-      <track id="403" tid="2">02 - acid marathon 2</track>
-      <track id="404" tid="3">03 - acid marathon 3</track>
-      <track id="405" tid="4">04 - washaa</track>
-      <track id="406" tid="5">05 - acid marathon 4</track>
-      <track id="407" tid="6">06 - jing jang</track>
-      <track id="408" tid="7">07 - in front of da outland</track>
-      <track id="409" tid="8">08 - mondonon</track>
-      <track id="410" tid="9">09 - clock seven</track>
-      <track id="411" tid="10">10 - 4 degrees</track>
-      <track id="412" tid="11">11 - balance</track>
-      <track id="413" tid="12">12 - + + + acid</track>
-  </group>
-  <group name="Adam F">
-    </album>
-    <album aid="36" title="Colours">
-      <track id="414" tid="1">01 - Intro</track>
-      <track id="415" tid="2">02 - 73</track>
-      <track id="416" tid="3">03 - Metropolis</track>
-      <track id="417" tid="4">04 - Music in my Mind</track>
-      <track id="418" tid="5">05 - Jaxx</track>
-      <track id="419" tid="6">06 - Mother Death</track>
-      <track id="420" tid="7">07 - The Tree Knows Everything</track>
-      <track id="421" tid="8">08 - Circles</track>
-      <track id="422" tid="9">09 - Dirty Happy</track>
-      <track id="423" tid="10">10 - F-Jam</track>
-      <track id="424" tid="11">11 - Colours</track>
-      <track id="425" tid="12">12 - Aromatherapy</track>
-  </group>
-  <group name="Adoniran Barbosa">
-    </album>
-    <album aid="37" title="Meus Momentos">
-      <track id="426" tid="1">01 - Tiro Ao  lvaro</track>
-      <track id="427" tid="2">02 - Iracema</track>
-      <track id="428" tid="3">03 - Trem Das Onze</track>
-      <track id="429" tid="4">04 - Saudosa Maloca</track>
-      <track id="430" tid="5">05 - O Samba Do Arnesto</track>
-      <track id="431" tid="6">06 - Torresmo   Milanesa</track>
-      <track id="432" tid="7">07 - Viaduto Santa Efig nia</track>
-      <track id="433" tid="8">08 - Bom Dia Tristeza</track>
-      <track id="434" tid="9">09 - As Mariposas</track>
-      <track id="435" tid="10">10 - Despejo Na Favela</track>
-      <track id="436" tid="11">11 - Ag enta a M o, Jo o</track>
-      <track id="437" tid="12">12 - Vide Verso Meu Endere o</track>
-      <track id="438" tid="13">13 - Acende O Candieiro</track>
-      <track id="439" tid="14">14 - No Morro Da Casa Verde</track>
-      <track id="440" tid="15">15 - Vila Esperan a</track>
-      <track id="441" tid="16">16 - Fica Mais Um Pouco Amor</track>
-      <track id="442" tid="17">17 - Apaga O Fogo Man </track>
-  </group>
-  <group name="Adriana Calcanhoto">
-    </album>
-    <album aid="38" title="A F brica Do Poema">
-      <track id="443" tid="1">01 - Por que voc  faz cinema-</track>
-      <track id="444" tid="2">02 - A f brica do Poema</track>
-      <track id="445" tid="3">03 - Bagatelas</track>
-      <track id="446" tid="4">04 - Metade</track>
-      <track id="447" tid="5">05 - Sudoeste</track>
-      <track id="448" tid="6">06 - O verme e a estrela</track>
-      <track id="449" tid="7">07 - Estrelas</track>
-      <track id="450" tid="8">08 - Aconteceu</track>
-      <track id="451" tid="9">09 - Cariocas</track>
-      <track id="452" tid="10">10 - Morro dois irm os</track>
-      <track id="453" tid="11">11 - Inverno</track>
-      <track id="454" tid="12">12 - Roleta russa</track>
-      <track id="455" tid="13">13 - Tema de Alice</track>
-      <track id="456" tid="14">14 - Portrait of Gertrude</track>
-      <track id="457" tid="15">15 - Minha m sica</track>
-  </group>
-  <group name="Aerosmith">
-    </album>
-    <album aid="39" title="Get a Grip">
-      <track id="458" tid="1">Amazing</track>
-      <track id="459" tid="2">Boogie Man</track>
-      <track id="460" tid="3">Can't Stop Messin'</track>
-      <track id="461" tid="4">Crazy</track>
-      <track id="462" tid="5">Cryin'</track>
-      <track id="463" tid="6">Eat the Rich</track>
-      <track id="464" tid="7">Fever</track>
-      <track id="465" tid="8">Flesh</track>
-      <track id="466" tid="9">Get a Grip</track>
-      <track id="467" tid="10">Gotta Love It</track>
-      <track id="468" tid="11">Intro</track>
-      <track id="469" tid="12">Line Up</track>
-      <track id="470" tid="13">Livin' on the Edge</track>
-      <track id="471" tid="14">Shut Up And Dance</track>
-      <track id="472" tid="15">Walk On Down</track>
-    </album>
-    <album aid="40" title="Nine Lives">
-      <track id="473" tid="1">01 - Nine Lives</track>
-      <track id="474" tid="2">02 - Falling In Love</track>
-      <track id="475" tid="3">03 - Hole In My Soul</track>
-      <track id="476" tid="4">04 - Taste Of India</track>
-      <track id="477" tid="5">05 - Full Circle</track>
-      <track id="478" tid="6">06 - Something's Gotta Give</track>
-      <track id="479" tid="7">07 - Ain't That A Bitch</track>
-      <track id="480" tid="8">08 - Take Me To The Farm</track>
-      <track id="481" tid="9">09 - Crash</track>
-      <track id="482" tid="10">10 - Kiss Your Past Good-bye</track>
-      <track id="483" tid="11">11 - Pink</track>
-      <track id="484" tid="12">12 - Falling Off</track>
-      <track id="485" tid="13">13 - Attitude Adjustment</track>
-  </group>
-  <group name="Afro Cuban All Stars">
-    </album>
-    <album aid="41" title="A Toda Cuba le Gusta">
-      <track id="486" tid="1">01 - Amor Verdadero</track>
-      <track id="487" tid="2">02 - Alto Songo</track>
-      <track id="488" tid="3">03 - Habana Del Este</track>
-      <track id="489" tid="4">04 - A Toda Cuba Le Gusta</track>
-      <track id="490" tid="5">05 - Fiesta de la Rumba</track>
-      <track id="491" tid="6">06 - Los Sitio' Asere</track>
-      <track id="492" tid="7">07 - Pio Mentiroso</track>
-      <track id="493" tid="8">08 - Maria Caracoles</track>
-      <track id="494" tid="9">09 - Clasiqueando con Ruben</track>
-      <track id="495" tid="10">10 - Elube Chango</track>
-  </group>
-  <group name="AG Geige">
-    </album>
-    <album aid="42" title="Trickbeat">
-      <track id="496" tid="1">01 - Das Möbiusband - Zeychen und Wunder</track>
-      <track id="497" tid="2">02 - Triebwerk</track>
-      <track id="498" tid="3">03 - Felix</track>
-      <track id="499" tid="4">04 - Kosmonauten</track>
-      <track id="500" tid="5">05 - Fingerwalze</track>
-      <track id="501" tid="6">06 - So sollte es nicht sein!</track>
-      <track id="502" tid="7">07 - Küchenlied</track>
-      <track id="503" tid="8">08 - Das Scheusal</track>
-      <track id="504" tid="9">09 - Déjà vu (Snap Mix #2)</track>
-      <track id="505" tid="10">10 - Hasensong</track>
-      <track id="506" tid="11">11 - Schöner leben</track>
-      <track id="507" tid="12">12 - Rohleder's</track>
-      <track id="508" tid="13">13 - Maximale Gier</track>
-      <track id="509" tid="14">14 - Nach Hause (instr.)</track>
-      <track id="510" tid="15">15 - Gesichter</track>
-      <track id="511" tid="16">16 - Stadt-Fisch</track>
-  </group>
-  <group name="aim">
-    </album>
-    <album aid="43" title="Cold Water Music">
-      <track id="512" tid="1">01-Intro</track>
-      <track id="513" tid="2">02-Cold Water Music</track>
-      <track id="514" tid="3">03-The Force</track>
-      <track id="515" tid="4">04-Sail</track>
-      <track id="516" tid="5">05-Downstate</track>
-      <track id="517" tid="6">06-Ain't Got Time To Waste</track>
-      <track id="518" tid="7">07-Fat City (Interlude)</track>
-      <track id="519" tid="8">08-True To Hip Hop</track>
-      <track id="520" tid="9">09-Demonique</track>
-      <track id="521" tid="10">10-A Tree, A Rock And A Cloud</track>
-      <track id="522" tid="11">11-Journey To The End Of The Night</track>
-      <track id="523" tid="12">12-From Here To Fame</track>
-  </group>
-  <group name="Air">
-    </album>
-    <album aid="44" title="Kelly watch the stars (Maxi)">
-      <track id="524" tid="1">01 - Original mix</track>
-      <track id="525" tid="2">02 - Sexy boy</track>
-      <track id="526" tid="3">03 - Album version</track>
-      <track id="527" tid="4">04 - Remember</track>
-    </album>
-    <album aid="45" title="Moon Safari">
-      <track id="528" tid="1">01 - La Femme D'Argent</track>
-      <track id="529" tid="2">02 - Sexy Boy</track>
-      <track id="530" tid="3">03 - All I Need</track>
-      <track id="531" tid="4">04 - Kelly Watch The Stars</track>
-      <track id="532" tid="5">05 - Talisman</track>
-      <track id="533" tid="6">06 - Remember</track>
-      <track id="534" tid="7">07 - You Make It Easy</track>
-      <track id="535" tid="8">08 - Ce Matin La</track>
-      <track id="536" tid="9">09 - New Star In The Sky</track>
-      <track id="537" tid="10">10 - Le Voyage De Pénélope</track>
-    </album>
-    <album aid="46" title="Premiers Symptomes">
-      <track id="538" tid="1">01 - Modular Mix</track>
-      <track id="539" tid="2">02 - Casanova 70</track>
-      <track id="540" tid="3">03 - Les Professionnels</track>
-      <track id="541" tid="4">04 - J'ai dormi sous l'Eau</track>
-      <track id="542" tid="5">05 - Le Soleil est pres de Moi</track>
-      <track id="543" tid="6">06 - Californie</track>
-      <track id="544" tid="7">07 - Brakes On</track>
-    </album>
-    <album aid="47" title="The Virgin Suicides">
-      <track id="545" tid="1">01 - playground love</track>
-      <track id="546" tid="2">02 - clouds up</track>
-      <track id="547" tid="3">03 - bathroom girl</track>
-      <track id="548" tid="4">04 - cemetary party</track>
-      <track id="549" tid="5">05 - dark messages</track>
-      <track id="550" tid="6">06 - the word 'hurricane'</track>
-      <track id="551" tid="7">07 - dirty trip</track>
-      <track id="552" tid="8">08 - highschool lover</track>
-      <track id="553" tid="9">09 - afternoon sister</track>
-      <track id="554" tid="10">10 - ghost song</track>
-      <track id="555" tid="11">11 - empty house</track>
-      <track id="556" tid="12">12 - dead bodies</track>
-      <track id="557" tid="13">13 - suicide underground</track>
-  </group>
-  <group name="Aktuell">
-    </album>
-    <album aid="48" title="2000_03">
-      <track id="558" tid="1">A Teens - Super Trouper</track>
-      <track id="559" tid="2">Aqua - Cartoon Heroes</track>
-      <track id="560" tid="3">Backstreet Boys - Show Me The Meaning Of Being Lonely</track>
-      <track id="561" tid="4">Bloodhound Gang - The Bad Touch</track>
-      <track id="562" tid="5">Die Toten Hosen - Unsterblich</track>
-      <track id="563" tid="6">Enrique Iglesias - Rhythm Divine</track>
-      <track id="564" tid="7">Highland - Bella Stella</track>
-      <track id="565" tid="8">HIM - Join me</track>
-      <track id="566" tid="9">Lene Marlin -  Sitting Down Here</track>
-      <track id="567" tid="10">Madonna - American Pie</track>
-      <track id="568" tid="11">Marc Anthony - I Need To Know</track>
-      <track id="569" tid="12">Melanie C - Northern Star</track>
-      <track id="570" tid="13">Metallica - Nothing Else Matters</track>
-      <track id="571" tid="14">Modern Talking - China In Your Eyes (Ext.Version)</track>
-      <track id="572" tid="15">N'Sync - Bye Bye Bye</track>
-      <track id="573" tid="16">Natural Born Hippies - Am I Not Sweet</track>
-      <track id="574" tid="17">Oli.P - Niemals Mehr</track>
-      <track id="575" tid="18">Prezioso feat. Marvin- Tell Me Why</track>
-      <track id="576" tid="19">Santana - Maria Maria</track>
-      <track id="577" tid="20">Sash! - Adelante [Original Mix]</track>
-      <track id="578" tid="21">Stefan Raab - Wadde Hadde Dudde Da</track>
-      <track id="579" tid="22">Sting - Desert Rose</track>
-      <track id="580" tid="23">Thomas D. - Liebesbrief</track>
-      <track id="581" tid="24">Vengaboys - Shalala Lala</track>
-      <track id="582" tid="25">Yamboo - Come With Me</track>
-    </album>
-    <album aid="49" title="2000_06">
-      <track id="583" tid="1">01_Blank & Jones - The Nightfly</track>
-      <track id="584" tid="2">02_Passion Fruit - Wonderland</track>
-      <track id="585" tid="3">03_GIGI D'AGOSTINO - The Riddle</track>
-      <track id="586" tid="4">04_Echt - Junimond</track>
-      <track id="587" tid="5">05_Bon Jovi - It´s My Life</track>
-      <track id="588" tid="6">06_Backstreet Boys - The One</track>
-      <track id="589" tid="7">07_Venga Boys - Uncle John From Jamaica</track>
-      <track id="590" tid="8">08_GIGI D'AGOSTINO - Another Way</track>
-      <track id="591" tid="9">09_Ace Of Base - Hallo Hallo</track>
-      <track id="592" tid="10">10_Melanie C - Never Be The Same Again</track>
-      <track id="593" tid="11">11_Anton Aus Tirol Feat DJ Ötzi - Gemma Bier Trinken</track>
-      <track id="594" tid="12">12_Britney Spears - Oops I Did It Again</track>
-      <track id="595" tid="13">13_GIGI D'AGOSTINO - La Passion</track>
-      <track id="596" tid="14">14_Reamonn - Supergirl</track>
-      <track id="597" tid="15">15_John Davies - I Promised Myself</track>
-      <track id="598" tid="16">16_Fools Garden - Suzy</track>
-      <track id="599" tid="17">17_Bomfunk MC's - Freestyler</track>
-      <track id="600" tid="18">18_Die Toten Hosen - Bayern</track>
-      <track id="601" tid="19">19_Die Band Ohne Namen - Take My Heart</track>
-    </album>
-    <album aid="50" title="2000_08">
-      <track id="602" tid="1">Anastacia - I'm Outta Love </track>
-      <track id="603" tid="2">Andreas Stenschke - Just When I Needed You Most</track>
-      <track id="604" tid="3">Antonia Feat. Sandra - ...Ich Bin Viel Schöner</track>
-      <track id="605" tid="4">Azuca - Este Chico (I Fall In Love With You) (Radio Mix)</track>
-      <track id="606" tid="5">Bastian Raagas - You Complete Me (Radio Dance Version)</track>
-      <track id="607" tid="6">Captain Jack - Only You</track>
-      <track id="608" tid="7">Celine Dion - I Want You To Need Me (Radio Edit)</track>
-      <track id="609" tid="8">Celine Dion - I Want You To Need Me (Thunderpuss Radio Mix)</track>
-      <track id="610" tid="9">Chayanne - Boom Boom (Spanglish Version)</track>
-      <track id="611" tid="10">Eskobar - Good Day For Dying (Radio Edit)</track>
-      <track id="612" tid="11">Hooverphonic - Mad About You (Radio Edit)</track>
-      <track id="613" tid="12">Madonna - Music (CD Version)</track>
-      <track id="614" tid="13">Monaco - I´ve Got A Feeling (Radio Edit)</track>
-      <track id="615" tid="14">Red Sector - Invasion Over Berlin (Short Energy Mix)</track>
-      <track id="616" tid="15">Senait - Aura (Radio Edit)</track>
-      <track id="617" tid="16">Sharon Williams - Life Is So Strong (Single Edit)</track>
-      <track id="618" tid="17">Sladdgo - Was Du Woll</track>
-      <track id="619" tid="18">Sonique - It Feels So Good</track>
-      <track id="620" tid="19">Sound Convoy - Hey Baby ( Radio Edit )</track>
-      <track id="621" tid="20">Verena - Ist das alles</track>
-    </album>
-    <album aid="51" title="2000_11">
-      <track id="622" tid="1">Berger - Zeig mir Dein Gesicht</track>
-      <track id="623" tid="2">Britney Spears - Lucky</track>
-      <track id="624" tid="3">Darude - Sandstorm</track>
-      <track id="625" tid="4">Marque - Electronic Lady</track>
-      <track id="626" tid="5">Mel C - I Turn To You</track>
-      <track id="627" tid="6">Mr President - Up´n Away 2k</track>
-      <track id="628" tid="7">N Sync 02 - It's Gonna Be Me</track>
-      <track id="629" tid="8">Orange Blue - She's Got That Light</track>
-      <track id="630" tid="9">Rednex - Hold Me (For A While)</track>
-      <track id="631" tid="10">Rednex - The Spirit Of The Hawk</track>
-      <track id="632" tid="11">Ronan Keating - Life is a Rollercoaster</track>
-      <track id="633" tid="12">Sasha - Owner Of My Heart</track>
-      <track id="634" tid="13">Tic Tac Toe - Ich liebe Disch</track>
-      <track id="635" tid="14">Toploader - Dancing in the Moonlight</track>
-      <track id="636" tid="15">Vanessa Amorosi - Absolutely Everybody</track>
-      <track id="637" tid="16">Whitney Houston & Enrique Iglesias - Could I Have This Kiss Forever</track>
-  </group>
-  <group name="Al Bano & Romina Power">
-    </album>
-    <album aid="52" title="Ihre großen Erfolge">
-      <track id="638" tid="1">01 - Che Angelo Sei (Amore Mio)</track>
-      <track id="639" tid="2">02 - Tu Soltanto Tu (Mi Hai Fatto Innamorare)</track>
-      <track id="640" tid="3">03 - Ci Sara</track>
-      <track id="641" tid="4">04 - Imagini 77</track>
-      <track id="642" tid="5">05 - Canto Di Libertá</track>
-      <track id="643" tid="6">06 - Abbandonati</track>
-      <track id="644" tid="7">07 - Prima Notte D´amore</track>
-      <track id="645" tid="8">08 - Sharazan</track>
-      <track id="646" tid="9">09 - Felicitá</track>
-      <track id="647" tid="10">10 - Meditando</track>
-      <track id="648" tid="11">11 - Caro Gesú</track>
-      <track id="649" tid="12">12 - E Fu Subito Amore</track>
-      <track id="650" tid="13">13 - Angeli</track>
-      <track id="651" tid="14">14 - Aria Pura</track>
-      <track id="652" tid="15">15 - Lo Ti Cerco</track>
-      <track id="653" tid="16">16 - Canzone Blu</track>
-  </group>
-  <group name="Alanis Morissette">
-    </album>
-    <album aid="53" title="Jagged Little Pill">
-      <track id="654" tid="1">01 - All I Really Want</track>
-      <track id="655" tid="2">02 - You Oughta Know</track>
-      <track id="656" tid="3">03 - Perfect</track>
-      <track id="657" tid="4">04 - Hand In My Pocket</track>
-      <track id="658" tid="5">05 - Right Through You</track>
-      <track id="659" tid="6">06 - Forgiven</track>
-      <track id="660" tid="7">07 - You Learn</track>
-      <track id="661" tid="8">08 - Head Over Feet</track>
-      <track id="662" tid="9">09 - Mary Jane</track>
-      <track id="663" tid="10">10 - Ironic</track>
-      <track id="664" tid="11">11 - Not the Doctor</track>
-      <track id="665" tid="12">12 - Wake Up</track>
-      <track id="666" tid="13">13 - You Oughta Know (remix)</track>
-    </album>
-    <album aid="54" title="MTV Unplugged">
-      <track id="667" tid="1">01 - You Learn-1</track>
-      <track id="668" tid="2">01 - You Learn</track>
-      <track id="669" tid="3">02 - Joining You</track>
-      <track id="670" tid="4">03 - No Pressure Over Cappuccino</track>
-      <track id="671" tid="5">04 - That I Would Be Good</track>
-      <track id="672" tid="6">05 - Head Over Feet</track>
-      <track id="673" tid="7">06 - Princes Familiar</track>
-      <track id="674" tid="8">07 - I Was Hoping</track>
-      <track id="675" tid="9">08 - Ironic</track>
-      <track id="676" tid="10">09 - These R The Thoughts</track>
-      <track id="677" tid="11">10 - King Of Pain</track>
-      <track id="678" tid="12">11 - You Oughta Know</track>
-      <track id="679" tid="13">12 - Uninvited</track>
-    </album>
-    <album aid="55" title="Supposed Former Infatuation Junkie">
-      <track id="680" tid="1">Alanis Morisette - 01 Front Row</track>
-      <track id="681" tid="2">Alanis Morisette - 02 Baba</track>
-      <track id="682" tid="3">Alanis Morisette - 03 Thank U</track>
-      <track id="683" tid="4">Alanis Morisette - 04 Are You Still Mad</track>
-      <track id="684" tid="5">Alanis Morisette - 05 Sympathetic Character</track>
-      <track id="685" tid="6">Alanis Morisette - 06 That I Would be Good</track>
-      <track id="686" tid="7">Alanis Morisette - 07 The Couch</track>
-      <track id="687" tid="8">Alanis Morisette - 08 Can't Not</track>
-  </group>
-  <group name="Alex Gopher">
-    </album>
-    <album aid="56" title="You my Baby & I">
-      <track id="688" tid="1">01 - Time</track>
-      <track id="689" tid="2">02 - Tryin'</track>
-      <track id="690" tid="3">03 - The Child</track>
-      <track id="691" tid="4">04 - Ralph & Kathy</track>
-      <track id="692" tid="5">05 - With U</track>
-      <track id="693" tid="6">06 - You, my Baby & I</track>
-      <track id="694" tid="7">07 - 06 10 98</track>
-      <track id="695" tid="8">08 - Party People</track>
-      <track id="696" tid="9">09 - Consolidated</track>
-      <track id="697" tid="10">10 - Quiet Storm</track>
-  </group>
-  <group name="Alex Reece">
-    </album>
-    <album aid="57" title="So Far">
-      <track id="698" tid="1">01 - Feel the Sunshine</track>
-      <track id="699" tid="2">02 - Jazz Master</track>
-      <track id="700" tid="3">03 - Intro 1</track>
-      <track id="701" tid="4">04 - Acid Lab</track>
-      <track id="702" tid="5">05 - Pulp Friction</track>
-      <track id="703" tid="6">06 - Candles</track>
-      <track id="704" tid="7">07 - Ibiza</track>
-      <track id="705" tid="8">08 - Intro 2</track>
-      <track id="706" tid="9">09 - Out of Time</track>
-      <track id="707" tid="10">10 - U R</track>
-  </group>
-  <group name="Alphaville">
-    </album>
-    <album aid="58" title="First Harvest 1984-92">
-      <track id="708" tid="1">01 - Big In Japan</track>
-      <track id="709" tid="2">02 - Sounds Like A Melody</track>
-      <track id="710" tid="3">03 - Sensations</track>
-      <track id="711" tid="4">04 - The Mysteries Of Love</track>
-      <track id="712" tid="5">05 - Lassie Come Home</track>
-      <track id="713" tid="6">06 - Jerusalem</track>
-      <track id="714" tid="7">07 - Dance With Me</track>
-      <track id="715" tid="8">08 - For A Million</track>
-      <track id="716" tid="9">09 - A Victory Of Love</track>
-      <track id="717" tid="10">10 - The Jet Set</track>
-      <track id="718" tid="11">11 - Red Rose</track>
-      <track id="719" tid="12">12 - Romeos</track>
-      <track id="720" tid="13">13 - Summer Rain</track>
-      <track id="721" tid="14">14 - Forever Young</track>
-      <track id="722" tid="15">15 - Big In Japan [Culture Mix]</track>
-    </album>
-    <album aid="59" title="Forever young">
-      <track id="723" tid="1">A Victory Of Love</track>
-      <track id="724" tid="2">Big In Japan</track>
-      <track id="725" tid="3">Fallen Angel</track>
-      <track id="726" tid="4">Forever Young</track>
-      <track id="727" tid="5">In The Mood</track>
-      <track id="728" tid="6">Lies</track>
-      <track id="729" tid="7">Sounds Like A Melody</track>
-      <track id="730" tid="8">Summer In Berlin</track>
-      <track id="731" tid="9">The Jet Set</track>
-      <track id="732" tid="10">To Germany With Love</track>
-  </group>
-  <group name="Amanda Lear">
-    </album>
-    <album aid="60" title="Super 20">
-      <track id="733" tid="1">01 - Follow Me</track>
-      <track id="734" tid="2">02 - Gold</track>
-      <track id="735" tid="3">03 - Mother Look What They've Done To Me</track>
-      <track id="736" tid="4">04 - Run Baby Run</track>
-      <track id="737" tid="5">05 - Queen Of China Town</track>
-      <track id="738" tid="6">06 - The Sphinx</track>
-      <track id="739" tid="7">07 - Blood And Honey</track>
-      <track id="740" tid="8">08 - Fashion Pack</track>
-      <track id="741" tid="9">09 - Fabulous Lover Love Me</track>
-      <track id="742" tid="10">10 - Diamonds</track>
-      <track id="743" tid="11">11 - Egal</track>
-      <track id="744" tid="12">12 - Fever</track>
-      <track id="745" tid="13">13 - Never Trus A Pretty Face</track>
-      <track id="746" tid="14">14 - Alphabet</track>
-      <track id="747" tid="15">15 - Im A Photograph</track>
-      <track id="748" tid="16">16 - Blue Tango</track>
-      <track id="749" tid="17">17 - Tomorrow</track>
-      <track id="750" tid="18">18 - The Lady In Black</track>
-      <track id="751" tid="19">19 - I Need A Man</track>
-      <track id="752" tid="20">20 - Nymphomania</track>
-  </group>
-  <group name="Amanda Marshall">
-    </album>
-    <album aid="61" title="Amanda Marshall">
-      <track id="753" tid="1">01 - Let it rain</track>
-      <track id="754" tid="2">02 - Birmingham</track>
-      <track id="755" tid="3">03 - Fall from grace</track>
-      <track id="756" tid="4">04 - Dark Horse</track>
-      <track id="757" tid="5">05 - Beautiful goodbye</track>
-      <track id="758" tid="6">06 - Sitting on the top of the world</track>
-      <track id="759" tid="7">07 - Last exit to eden</track>
-      <track id="760" tid="8">08 - Trust me (This is love)</track>
-      <track id="761" tid="9">09 - Let's got lost</track>
-      <track id="762" tid="10">10 - Promises</track>
-    </album>
-    <album aid="62" title="Dark Horse (Maxi-CD)">
-      <track id="763" tid="1">01 - Dark Horse</track>
-      <track id="764" tid="2">02 - Let It Rain</track>
-      <track id="765" tid="3">03 - Birmingham</track>
-    </album>
-    <album aid="63" title="Tuesday's child">
-      <track id="766" tid="1">01 - Believe in you</track>
-      <track id="767" tid="2">02 - Love lift me</track>
-      <track id="768" tid="3">03 - Why don't you love me-</track>
-      <track id="769" tid="4">04 - Too little, too late</track>
-      <track id="770" tid="5">05 - If I didn't have you</track>
-      <track id="771" tid="6">06 - Ride</track>
-      <track id="772" tid="7">07 - Right here all along</track>
-      <track id="773" tid="8">08 - Wishful thinking</track>
-      <track id="774" tid="9">09 - Shades of grey</track>
-      <track id="775" tid="10">10 - Give up giving in</track>
-      <track id="776" tid="11">11 - Best of me</track>
-      <track id="777" tid="12">12 - Never said goodbye</track>
-      <track id="778" tid="13">13 - Out of bounds</track>
-  </group>
-  <group name="Amon Tobin">
-    </album>
-    <album aid="64" title="Bricolage">
-      <track id="779" tid="1">01 - Stoney Street</track>
-      <track id="780" tid="2">02 - Easy Muffin</track>
-      <track id="781" tid="3">03 - Yasawas</track>
-      <track id="782" tid="4">04 - Creatures</track>
-      <track id="783" tid="5">05 - Chomp Samba</track>
-      <track id="784" tid="6">06 - The New York Editor</track>
-      <track id="785" tid="7">07 - Defocus</track>
-      <track id="786" tid="8">08 - The Nasty</track>
-      <track id="787" tid="9">09 - Bitter & Twisted</track>
-      <track id="788" tid="10">10 - Wires & Snakes</track>
-      <track id="789" tid="11">11 - One Day In My Garden</track>
-      <track id="790" tid="12">12 - Dream Sequence</track>
-      <track id="791" tid="13">13 - One Small Step</track>
-      <track id="792" tid="14">14 - Mission</track>
-    </album>
-    <album aid="65" title="Supermodified">
-      <track id="793" tid="1">01 - Get Your Snack On</track>
-      <track id="794" tid="2">02 - Four Ton Mantis</track>
-      <track id="795" tid="3">03 - Slowly</track>
-      <track id="796" tid="4">04 - Marine Machines</track>
-      <track id="797" tid="5">05 - Golfer vrs Boxer</track>
-      <track id="798" tid="6">06 - Deo</track>
-      <track id="799" tid="7">07 - Precursor (feat. Quadraceptor)</track>
-      <track id="800" tid="8">08 - Saboteur</track>
-      <track id="801" tid="9">09 - Chocolate Lovely</track>
-      <track id="802" tid="10">10 - Rhino Jockey</track>
-      <track id="803" tid="11">11 - Keepin' It Steel (The Anvil Track)</track>
-      <track id="804" tid="12">12 - Natureland</track>
-  </group>
-  <group name="Anastacia">
-    </album>
-    <album aid="66" title="Not That Kind">
-      <track id="805" tid="1">01 - Not That Kind</track>
-      <track id="806" tid="2">02 - I'm Outta Love</track>
-      <track id="807" tid="3">03 - Cowboys & Kisses</track>
-      <track id="808" tid="4">04 - Who's Gonna Stop The Rain</track>
-      <track id="809" tid="5">05 - Love Is Alive</track>
-      <track id="810" tid="6">06 - I Ask Of You</track>
-      <track id="811" tid="7">07 - Wishing Well</track>
-      <track id="812" tid="8">08 - Made For Lovin' You</track>
-      <track id="813" tid="9">09 - Black Roses</track>
-      <track id="814" tid="10">10 - Yo Trippin'</track>
-      <track id="815" tid="11">11 - One More Chance</track>
-      <track id="816" tid="12">12 - Some Old Story</track>
-  </group>
-  <group name="And One">
-    </album>
-    <album aid="67" title="9.9.99">
-      <track id="817" tid="1">01 - Get you closer</track>
-      <track id="818" tid="2">02 - Michael caine</track>
-      <track id="819" tid="3">03 - Evil boys</track>
-      <track id="820" tid="4">04 - Pimmelmann</track>
-      <track id="821" tid="5">05 - Und wieder</track>
-      <track id="822" tid="6">06 - Love & fingers</track>
-      <track id="823" tid="7">07 - Pray</track>
-      <track id="824" tid="8">08 - Men in uniform</track>
-      <track id="825" tid="9">09 - Hypnotize</track>
-      <track id="826" tid="10">10 - Der erste Schritt</track>
-    </album>
-    <album aid="68" title="Anguish">
-      <track id="827" tid="1">01 - Devil airlines</track>
-      <track id="828" tid="2">02 - Second front</track>
-      <track id="829" tid="3">03 - Metalhammer</track>
-      <track id="830" tid="4">04 - Menschen</track>
-      <track id="831" tid="5">05 - And one</track>
-      <track id="832" tid="6">06 - Only one</track>
-      <track id="833" tid="7">07 - Crimetime</track>
-      <track id="834" tid="8">08 - Synthetik</track>
-      <track id="835" tid="9">09 - Geld</track>
-      <track id="836" tid="10">10 - Second voice</track>
-      <track id="837" tid="11">11 - Exit</track>
-      <track id="838" tid="12">12 - Anguish</track>
-      <track id="839" tid="13">13 - Deliverance</track>
-      <track id="840" tid="14">14 - Metalhammer (Heavy mix)</track>
-    </album>
-    <album aid="69" title="Get you closer (Maxi)">
-      <track id="841" tid="1">01 - Get You Closer (Radio Mix)</track>
-      <track id="842" tid="2">02 - Get You Closer (Club Mix)</track>
-      <track id="843" tid="3">03 - Pimmelmann (Nixmix)</track>
-    </album>
-    <album aid="70" title="Ist">
-      <track id="844" tid="1">01 - Ego</track>
-      <track id="845" tid="2">02 - Murder murder</track>
-      <track id="846" tid="3">03 - Driving with my darling</track>
-      <track id="847" tid="4">04 - The only guest</track>
-      <track id="848" tid="5">05 - Dein Duft</track>
-      <track id="849" tid="6">06 - It happend last night</track>
-      <track id="850" tid="7">07 - When the feet hurt</track>
-      <track id="851" tid="8">08 - The secret</track>
-      <track id="852" tid="9">09 - Fuer</track>
-      <track id="853" tid="10">10 - Second day</track>
-      <track id="854" tid="11">11 - Body nerv</track>
-      <track id="855" tid="12">12 - Take some more</track>
-      <track id="856" tid="13">13 - Deutschmaschine</track>
-      <track id="857" tid="14">14 - Heart of stone</track>
-      <track id="858" tid="15">15 - Ghama voodoo</track>
-      <track id="859" tid="16">16 - Bonus</track>
-    </album>
-    <album aid="71" title="Maschinenstuermer">
-      <track id="860" tid="1">01 - Nachtschicht in der hassfabrik</track>
-      <track id="861" tid="2">02 - Teufel oder engel</track>
-      <track id="862" tid="3">03 - Klon mich lieber nicht!</track>
-      <track id="863" tid="4">04 - Maschinenstuermer</track>
-      <track id="864" tid="5">05 - Bedienungsanleitungen</track>
-    </album>
-    <album aid="72" title="Nordhausen">
-      <track id="865" tid="1">01 - Und dafuer</track>
-      <track id="866" tid="2">02 - Sometimes</track>
-      <track id="867" tid="3">03 - Movie star</track>
-      <track id="868" tid="4">04 - Uns geht's gut</track>
-      <track id="869" tid="5">05 - My warrior</track>
-      <track id="870" tid="6">06 - Creatures</track>
-      <track id="871" tid="7">07 - Sweety sweety</track>
-      <track id="872" tid="8">08 - Schluss mit lustig</track>
-      <track id="873" tid="9">09 - Sitata tirulala</track>
-      <track id="874" tid="10">10 - Friends in heaven</track>
-      <track id="875" tid="11">11 - Mirror in your heart</track>
-      <track id="876" tid="12">12 - Nordhausen</track>
-    </album>
-    <album aid="73" title="Sometimes">
-      <track id="877" tid="1">01 - Sometimes (Radio Edit)</track>
-      <track id="878" tid="2">02 - High (Bonus)</track>
-      <track id="879" tid="3">03 - White Doves (Bonus)</track>
-      <track id="880" tid="4">04 - Technoman (Live !)</track>
-      <track id="881" tid="5">05 - Sometimes (Instr.)</track>
-      <track id="882" tid="6">06 - Nordhausen (Album Mix)</track>
-    </album>
-    <album aid="74" title="Spot">
-      <track id="883" tid="1">01 - Wild pain</track>
-      <track id="884" tid="2">02 - Life isnt easy in germany</track>
-      <track id="885" tid="3">03 - Consequence of time</track>
-      <track id="886" tid="4">04 - Spontanverkehr</track>
-      <track id="887" tid="5">05 - Friend of stars</track>
-      <track id="888" tid="6">06 - Hall of souls</track>
-      <track id="889" tid="7">07 - Recover you</track>
-      <track id="890" tid="8">08 - Der erste Stein</track>
-      <track id="891" tid="9">09 - Tanz der Arroganz</track>
-      <track id="892" tid="10">10 - The and</track>
-      <track id="893" tid="11">11 - Spot</track>
-      <track id="894" tid="12">41 - Wild pain (maxi)</track>
-    </album>
-    <album aid="75" title="Virgin Superstar">
-      <track id="895" tid="1">01 - Virgin superstar</track>
-      <track id="896" tid="2">02 - Wasted</track>
-      <track id="897" tid="3">03 - You don't love me anymore</track>
-      <track id="898" tid="4">04 - Goodbye Germany</track>
-      <track id="899" tid="5">05 - Wet spot</track>
-      <track id="900" tid="6">06 - Panzer Mensch</track>
-      <track id="901" tid="7">07 - My story</track>
-      <track id="902" tid="8">08 - Life to lose</track>
-      <track id="903" tid="9">09 - Not the only one</track>
-      <track id="904" tid="10">10 - Don't need the drugs</track>
-      <track id="905" tid="11">11 - Mr Jenka</track>
-    </album>
-    <album aid="76" title="Wasted (Maxi)">
-      <track id="906" tid="1">01 - Wasted (Radio Edit)</track>
-      <track id="907" tid="2">02 - Forever J (Bonus)</track>
-      <track id="908" tid="3">03 - Wasted (Naghavi Mix)</track>
-      <track id="909" tid="4">04 - Maschinenhimmel (Bonus)</track>
-      <track id="910" tid="5">05 - Lawrence Of Arabia (Bonus)</track>
-  </group>
-  <group name="Andrea Parker">
-    </album>
-    <album aid="77" title="Andrea Parker">
-      <track id="911" tid="1">01-Track  1</track>
-      <track id="912" tid="2">02-Track  2</track>
-      <track id="913" tid="3">03-Track  3</track>
-      <track id="914" tid="4">04-Track  4</track>
-      <track id="915" tid="5">05-Track  5</track>
-      <track id="916" tid="6">06-Track  6</track>
-      <track id="917" tid="7">07-Track  7</track>
-      <track id="918" tid="8">08-Track  8</track>
-      <track id="919" tid="9">09-Track  9</track>
-      <track id="920" tid="10">10-Track  10</track>
-      <track id="921" tid="11">11-Track  11</track>
-      <track id="922" tid="12">12-Track  12</track>
-      <track id="923" tid="13">13-Track  13</track>
-      <track id="924" tid="14">14-Track  14</track>
-      <track id="925" tid="15">15-Track  15</track>
-      <track id="926" tid="16">16-Track  16</track>
-      <track id="927" tid="17">17-Track  17</track>
-      <track id="928" tid="18">18-Track  18</track>
-  </group>
-  <group name="Andreas Dorau">
-    </album>
-    <album aid="78" title="70 minuten musik ungeklaerter herkunft">
-      <track id="929" tid="1">01 - lass uns brennen</track>
-      <track id="930" tid="2">02 - girls in love</track>
-      <track id="931" tid="3">03 - so ist das nun mal</track>
-      <track id="932" tid="4">04 - ab</track>
-      <track id="933" tid="5">05 - allein im park</track>
-      <track id="934" tid="6">06 - das weisst nur du</track>
-      <track id="935" tid="7">07 - du bist da</track>
-      <track id="936" tid="8">08 - blaumeise yvonne</track>
-      <track id="937" tid="9">09 - es ist nur der rauch</track>
-      <track id="938" tid="10">10 - in mich selbst verliebt</track>
-      <track id="939" tid="11">11 - wenn du menschen triffst</track>
-      <track id="940" tid="12">12 - das maedchen auf dem foto</track>
-      <track id="941" tid="13">13 - scheinzahm</track>
-    </album>
-    <album aid="79" title="girls in love (maxi)">
-      <track id="942" tid="1">01 - girls in love (original version)</track>
-      <track id="943" tid="2">02 - girls in love (grungerman remix)</track>
-      <track id="944" tid="3">03 - girls in love (forever sweet remix)</track>
-      <track id="945" tid="4">04 - singen hoeren</track>
-    </album>
-    <album aid="80" title="girls in love - ich weiss es nicht">
-      <track id="946" tid="1">01 - girls in love</track>
-      <track id="947" tid="2">02 - ich weiss es nicht (tegel a23)</track>
-      <track id="948" tid="3">03 - es ist nur der rauch</track>
-      <track id="949" tid="4">04 - ich weiss es nicht</track>
-    </album>
-    <album aid="81" title="so ist das nun mal (maxi)">
-      <track id="950" tid="1">01 - so ist das nun mal</track>
-      <track id="951" tid="2">02 - linda</track>
-      <track id="952" tid="3">03 - so ist das nun mal (mike ink mix)</track>
-      <track id="953" tid="4">04 - so ist das nun mal (reinhard & tobias happy sundays mix)</track>
-  </group>
-  <group name="Angelo Branduardi">
-    </album>
-    <album aid="82" title="Il dito e la luna">
-      <track id="954" tid="1">01 - Il giocatore di biliardo</track>
-      <track id="955" tid="2">02 - La comica finale</track>
-      <track id="956" tid="3">03 - Il dito e la luna</track>
-      <track id="957" tid="4">04 - L'ultimo giorno del circo</track>
-      <track id="958" tid="5">05 - Per ogni matematico</track>
-      <track id="959" tid="6">06 - La parola ai mimi</track>
-      <track id="960" tid="7">07 - L'uso dell'amore</track>
-      <track id="961" tid="8">08 - Lamento di un uomo di neve</track>
-      <track id="962" tid="9">09 - La regola del filo a piombo</track>
-      <track id="963" tid="10">10 - Vita quotidana di uno spettro</track>
-      <track id="964" tid="11">11 - La leggenda del collezionista</track>
-      <track id="965" tid="12">12 - Confesso che ho vissuto</track>
-    </album>
-    <album aid="83" title="il ladro">
-      <track id="966" tid="1">01 - il ladro</track>
-      <track id="967" tid="2">02 - Madame</track>
-      <track id="968" tid="3">03 - bella faccia</track>
-      <track id="969" tid="4">04 - uomini di passaggio</track>
-      <track id="970" tid="5">05 - Ballerina</track>
-      <track id="971" tid="6">06 - Amazzonia</track>
-      <track id="972" tid="7">07 - il bambino dei topi</track>
-      <track id="973" tid="8">08 - il tempo di partire</track>
-      <track id="974" tid="9">09 - il grido</track>
-      <track id="975" tid="10">10 - ai confini dell'asia</track>
-      <track id="976" tid="11">11 - Festa</track>
-    </album>
-    <album aid="84" title="L'infinitamente Piccolo">
-      <track id="977" tid="1">01 - Il Cantico Delle Creature</track>
-      <track id="978" tid="2">02 - Il Sultano Di Babilonia E La Prostituta</track>
-      <track id="979" tid="3">03 - Il Lupo Di Gubbio</track>
-      <track id="980" tid="4">04 - Audite Poverelle</track>
-      <track id="981" tid="5">05 - Divina Commedia - Paradiso, Canto XI</track>
-      <track id="982" tid="6">06 - Il Trattato Dei Miracoli</track>
-      <track id="983" tid="7">07 - Nelle Paludi Di Venezia Francesco Si Fermò Per Pregare E Tutto Tacue</track>
-      <track id="984" tid="8">08 - La Regola</track>
-      <track id="985" tid="9">09 - La Predica Della Perfetta Letizia</track>
-      <track id="986" tid="10">10 - La Morte Di Francesco</track>
-      <track id="987" tid="11">11 - Salmo</track>
-  </group>
-  <group name="Anne Clark">
-    </album>
-    <album aid="85" title="Joined up writting and The sitting room">
-      <track id="988" tid="1">01 - Nothing at all</track>
-      <track id="989" tid="2">02 - Weltschmerz</track>
-      <track id="990" tid="3">03 - Killing time</track>
-      <track id="991" tid="4">04 - True love tales</track>
-      <track id="992" tid="5">05 - Self destruct</track>
-      <track id="993" tid="6">06 - Out darkness</track>
-      <track id="994" tid="7">07 - The sitting room</track>
-      <track id="995" tid="8">08 - Swimming</track>
-      <track id="996" tid="9">09 - An ordinary life</track>
-      <track id="997" tid="10">10 - Shades</track>
-      <track id="998" tid="11">11 - Short story</track>
-      <track id="999" tid="12">12 - The power game</track>
-      <track id="1000" tid="13">13 - All we have to be thankful for</track>
-    </album>
-    <album aid="86" title="Letter Of Thanks To A Friend">
-      <track id="1001" tid="1">Letter Of Thanks To A Friend (club edit)</track>
-      <track id="1002" tid="2">Letter Of Thanks To A Friend (instrumental edit)</track>
-      <track id="1003" tid="3">Letter Of Thanks To A Friend (radio edit)</track>
-    </album>
-    <album aid="87" title="Our darkness (Remix '97)">
-      <track id="1004" tid="1">01 - Hardfloor 97 Radio edit</track>
-      <track id="1005" tid="2">02 - Hardfloor 97 version</track>
-      <track id="1006" tid="3">03 - Total eclipse remix</track>
-    </album>
-    <album aid="88" title="Pressure Points">
-      <track id="1007" tid="1">01 - Heaven</track>
-      <track id="1008" tid="2">02 - Red Sands</track>
-      <track id="1009" tid="3">03 - Alarm Call</track>
-      <track id="1010" tid="4">04 - Tide</track>
-      <track id="1011" tid="5">05 - The Interruption</track>
-      <track id="1012" tid="6">06 - The Power Game</track>
-      <track id="1013" tid="7">07 - World Without Warning</track>
-      <track id="1014" tid="8">08 - Bursting</track>
-      <track id="1015" tid="9">09 - Lovers Retreat</track>
-    </album>
-    <album aid="89" title="Promotion Copy">
-      <track id="1016" tid="1">If I could</track>
-      <track id="1017" tid="2">Our Darkness-2</track>
-      <track id="1018" tid="3">Our Darkness</track>
-    </album>
-    <album aid="90" title="Psychometry">
-      <track id="1019" tid="1">At Midnight</track>
-      <track id="1020" tid="2">Closed Circuit</track>
-      <track id="1021" tid="3">Come In</track>
-      <track id="1022" tid="4">Dedication</track>
-      <track id="1023" tid="5">Echoes Remain Forever</track>
-      <track id="1024" tid="6">Fragility</track>
-      <track id="1025" tid="7">Improvisation</track>
-      <track id="1026" tid="8">Interlude</track>
-      <track id="1027" tid="9">Journey By Night</track>
-      <track id="1028" tid="10">Killing Time</track>
-      <track id="1029" tid="11">So Quiet Here</track>
-      <track id="1030" tid="12">Swallow Song</track>
-      <track id="1031" tid="13">That We Have Been Here</track>
-      <track id="1032" tid="14">The Sitting Room</track>
-      <track id="1033" tid="15">The Spinning Turning Of The Summer Earth</track>
-      <track id="1034" tid="16">This Be The Verse</track>
-      <track id="1035" tid="17">Unstill Life</track>
-      <track id="1036" tid="18">Windmills Of Your Mind</track>
-      <track id="1037" tid="19">World Without Warning</track>
-    </album>
-    <album aid="91" title="RSVP (Live)">
-      <track id="1038" tid="1">01 - Up</track>
-      <track id="1039" tid="2">02 - Homecoming</track>
-      <track id="1040" tid="3">03 - Red sands</track>
-      <track id="1041" tid="4">04 - The power game</track>
-      <track id="1042" tid="5">05 - Cane hill</track>
-      <track id="1043" tid="6">06 - Leaving</track>
-      <track id="1044" tid="7">07 - Heaven</track>
-      <track id="1045" tid="8">08 - The last emotion</track>
-      <track id="1046" tid="9">09 - Killing time</track>
-      <track id="1047" tid="10">10 - Wallies</track>
-      <track id="1048" tid="11">11 - Out darkness</track>
-      <track id="1049" tid="12">12 - Now</track>
-      <track id="1050" tid="13">13 - This be the verse</track>
-      <track id="1051" tid="14">14 - Sleeper in metropolis</track>
-    </album>
-    <album aid="92" title="the best of Anne Clark">
-      <track id="1052" tid="1">01 - the sitting room</track>
-      <track id="1053" tid="2">02 - swimming</track>
-      <track id="1054" tid="3">03 - an ordinary live</track>
-      <track id="1055" tid="4">04 - shades</track>
-      <track id="1056" tid="5">06 - the power game</track>
-      <track id="1057" tid="6">07 - all we have to be thankful</track>
-      <track id="1058" tid="7">08 - contact</track>
-      <track id="1059" tid="8">09 - sleeper in metropolis</track>
-      <track id="1060" tid="9">10 - poem for a nuclear romance</track>
-      <track id="1061" tid="10">11 - wallies</track>
-      <track id="1062" tid="11">12 - the lovers audition</track>
-      <track id="1063" tid="12">13 - poets turmoil no 364</track>
-      <track id="1064" tid="13">14 - echoes remain forever</track>
-      <track id="1065" tid="14">15 - all night party</track>
-      <track id="1066" tid="15">16 - pandoras box</track>
-      <track id="1067" tid="16">17 - feel</track>
-      <track id="1068" tid="17">18 - the last emotion</track>
-      <track id="1069" tid="18">19 - nothing at all</track>
-      <track id="1070" tid="19">20 - true love tales</track>
-      <track id="1071" tid="20">21 - self destruct</track>
-      <track id="1072" tid="21">23 - weltschmerz</track>
-      <track id="1073" tid="22">24 - our darkness remix 12</track>
-      <track id="1074" tid="23">x0 - killing time</track>
-      <track id="1075" tid="24">y0 - for</track>
-    </album>
-    <album aid="93" title="To Love And Be Loved">
-      <track id="1076" tid="1">Acropolis</track>
-      <track id="1077" tid="2">Athens</track>
-      <track id="1078" tid="3">Dream Made Real</track>
-      <track id="1079" tid="4">Elegy For A Lost Summer</track>
-      <track id="1080" tid="5">Letter Of Thanks To A Friend</track>
-      <track id="1081" tid="6">Mundesley Beach</track>
-      <track id="1082" tid="7">Painting</track>
-      <track id="1083" tid="8">The Healing</track>
-      <track id="1084" tid="9">The Key</track>
-      <track id="1085" tid="10">Virtuality</track>
-    </album>
-    <album aid="94" title="Wordprocessing">
-      <track id="1086" tid="1">01 Anne Clark - Virtuality ( Global Youth Remix )</track>
-      <track id="1087" tid="2">02 Anne Clark - The Healing ( Aural Float Treatment )</track>
-      <track id="1088" tid="3">03 Anne Clark - Sleeper In Metropolis ( Hardfloor 97 Version )</track>
-      <track id="1089" tid="4">04 Anne Clark - Letter Of Thanks To A Friend ( Radi Mate Mix By Mouse On Mars )</track>
-      <track id="1090" tid="5">05 Anne Clark - Nida ( Saafi Bros. Remix )</track>
-      <track id="1091" tid="6">06 Anne Clark - Our Darkness ( Hardfloor 97 Version )</track>
-      <track id="1092" tid="7">07 Anne Clark - Homecoming ( Pascal F.E.O.S. Remix )</track>
-      <track id="1093" tid="8">08 Anne Clark - Sleeper In Metropolis ( Sleepers Revenge Mix by Sven Väth & Ralf Hildenbeutel )</track>
-      <track id="1094" tid="9">09 Anne Clark - Contact ( Contact 2017 Mix by the Mover )</track>
-      <track id="1095" tid="10">10 Anne Clark - Wallies ( Night Of The Hunter Remix By Juno Reactor )</track>
-      <track id="1096" tid="11">11 Anne Clark - Our Darkness ( Total Eclipse Remix )</track>
-  </group>
-  <group name="Anouk">
-    </album>
-    <album aid="95" title="Nobodys wife (Maxi)">
-      <track id="1097" tid="1">01 - Radio edit</track>
-      <track id="1098" tid="2">02 - Album version</track>
-      <track id="1099" tid="3">03 - Instrumental</track>
-      <track id="1100" tid="4">04 - It is a shame</track>
-  </group>
-  <group name="Anrufbeantworter">
-    </album>
-    <album aid="96" title="comic">
-      <track id="1101" tid="1">abe</track>
-      <track id="1102" tid="2">barney2</track>
-      <track id="1103" tid="3">barney3</track>
-      <track id="1104" tid="4">bart</track>
-      <track id="1105" tid="5">bfpvny</track>
-      <track id="1106" tid="6">bush</track>
-      <track id="1107" tid="7">cfuture</track>
-      <track id="1108" tid="8">duffy</track>
-      <track id="1109" tid="9">eckat</track>
-      <track id="1110" tid="10">fett</track>
-      <track id="1111" tid="11">feuerste</track>
-      <track id="1112" tid="12">homer</track>
-      <track id="1113" tid="13">homer2</track>
-      <track id="1114" tid="14">homer3</track>
-      <track id="1115" tid="15">homer4</track>
-      <track id="1116" tid="16">homer5</track>
-      <track id="1117" tid="17">krusty</track>
-      <track id="1118" tid="18">moe</track>
-      <track id="1119" tid="19">moe2</track>
-      <track id="1120" tid="20">nafzu</track>
-      <track id="1121" tid="21">ned</track>
-      <track id="1122" tid="22">nick</track>
-      <track id="1123" tid="23">prfsimon</track>
-      <track id="1124" tid="24">roehrich</track>
-      <track id="1125" tid="25">sexchat</track>
-      <track id="1126" tid="26">simpson</track>
-      <track id="1127" tid="27">spd</track>
-      <track id="1128" tid="28">spd2</track>
-      <track id="1129" tid="29">troymc</track>
-    </album>
-    <album aid="97" title="erotic">
-      <track id="1130" tid="1">0190maen</track>
-      <track id="1131" tid="2">0190weib</track>
-      <track id="1132" tid="3">anonym</track>
-      <track id="1133" tid="4">bettdecke</track>
-      <track id="1134" tid="5">domina</track>
-      <track id="1135" tid="6">hotline</track>
-      <track id="1136" tid="7">otto</track>
-      <track id="1137" tid="8">peppig</track>
-      <track id="1138" tid="9">sexchat</track>
-      <track id="1139" tid="10">sexshop</track>
-      <track id="1140" tid="11">sigilive</track>
-      <track id="1141" tid="12">susi3</track>
-      <track id="1142" tid="13">telsex</track>
-    </album>
-    <album aid="98" title="misc">
-      <track id="1143" tid="1">3_schritte</track>
-      <track id="1144" tid="2">abends</track>
-      <track id="1145" tid="3">ali</track>
-      <track id="1146" tid="4">anwalt</track>
-      <track id="1147" tid="5">baby</track>
-      <track id="1148" tid="6">bananen</track>
-      <track id="1149" tid="7">beichte</track>
-      <track id="1150" tid="8">bleib_ma_dran</track>
-      <track id="1151" tid="9">boehme</track>
-      <track id="1152" tid="10">butler</track>
-      <track id="1153" tid="11">f-prinzp</track>
-      <track id="1154" tid="12">franzoesisch</track>
-      <track id="1155" tid="13">friedhof</track>
-      <track id="1156" tid="14">geld</track>
-      <track id="1157" tid="15">genervt</track>
-      <track id="1158" tid="16">heller</track>
-      <track id="1159" tid="17">hengst</track>
-      <track id="1160" tid="18">horoskop</track>
-      <track id="1161" tid="19">hypnose</track>
-      <track id="1162" tid="20">indianer</track>
-      <track id="1163" tid="21">inkasso</track>
-      <track id="1164" tid="22">kind</track>
-      <track id="1165" tid="23">klh-ende</track>
-      <track id="1166" tid="24">klhradio</track>
-      <track id="1167" tid="25">kontonr</track>
-      <track id="1168" tid="26">lauter</track>
-      <track id="1169" tid="27">mallorca</track>
-      <track id="1170" tid="28">mamifix</track>
-      <track id="1171" tid="29">maschine</track>
-      <track id="1172" tid="30">maxmanu</track>
-      <track id="1173" tid="31">mensch</track>
-      <track id="1174" tid="32">mir</track>
-      <track id="1175" tid="33">mkp</track>
-      <track id="1176" tid="34">morgens</track>
-      <track id="1177" tid="35">nervoes</track>
-      <track id="1178" tid="36">omm</track>
-      <track id="1179" tid="37">polizei</track>
-      <track id="1180" tid="38">privater_anschiss</track>
-      <track id="1181" tid="39">rezept4</track>
-      <track id="1182" tid="40">talent</track>
-      <track id="1183" tid="41">toupet</track>
-      <track id="1184" tid="42">versteigerung</track>
-      <track id="1185" tid="43">werbung</track>
-      <track id="1186" tid="44">y2kfrau</track>
-      <track id="1187" tid="45">y2kmann</track>
-    </album>
-    <album aid="99" title="music">
-      <track id="1188" tid="1">bayer</track>
-      <track id="1189" tid="2">beatles</track>
-      <track id="1190" tid="3">chanchan</track>
-      <track id="1191" tid="4">delasoul</track>
-      <track id="1192" tid="5">dtkuhn</track>
-      <track id="1193" tid="6">feschajaga</track>
-      <track id="1194" tid="7">george</track>
-      <track id="1195" tid="8">helge2</track>
-      <track id="1196" tid="9">howard</track>
-      <track id="1197" tid="10">kaktus</track>
-      <track id="1198" tid="11">mouskour</track>
-      <track id="1199" tid="12">python</track>
-      <track id="1200" tid="13">python2</track>
-      <track id="1201" tid="14">raab</track>
-      <track id="1202" tid="15">ringdong</track>
-      <track id="1203" tid="16">ruehmann</track>
-      <track id="1204" tid="17">schwein</track>
-      <track id="1205" tid="18">spice</track>
-      <track id="1206" tid="19">tmwywfm</track>
-    </album>
-    <album aid="100" title="office">
-      <track id="1207" tid="1">12oder3</track>
-      <track id="1208" tid="2">24uhr</track>
-      <track id="1209" tid="3">anschlu2</track>
-      <track id="1210" tid="4">arabia</track>
-      <track id="1211" tid="5">assigned</track>
-      <track id="1212" tid="6">cutoff</track>
-      <track id="1213" tid="7">d1_1</track>
-      <track id="1214" tid="8">d2_3</track>
-      <track id="1215" tid="9">d2_4</track>
-      <track id="1216" tid="10">ende</track>
-      <track id="1217" tid="11">erreicht</track>
-      <track id="1218" tid="12">gehalten</track>
-      <track id="1219" tid="13">geschaltet</track>
-      <track id="1220" tid="14">importan</track>
-      <track id="1221" tid="15">interoute</track>
-      <track id="1222" tid="16">japan</track>
-      <track id="1223" tid="17">kingcall1</track>
-      <track id="1224" tid="18">kingcall2</track>
-      <track id="1225" tid="19">maschendrahtzaun</track>
-      <track id="1226" tid="20">mittagspause</track>
-      <track id="1227" tid="21">nachrich</track>
-      <track id="1228" tid="22">nica</track>
-      <track id="1229" tid="23">talkline</track>
-      <track id="1230" tid="24">tmobil</track>
-      <track id="1231" tid="25">urlaub</track>
-      <track id="1232" tid="26">vorwahl</track>
-    </album>
-    <album aid="101" title="promis">
-      <track id="1233" tid="1">bbecker</track>
-      <track id="1234" tid="2">bbecker2</track>
-      <track id="1235" tid="3">brandt</track>
-      <track id="1236" tid="4">bushkohl</track>
-      <track id="1237" tid="5">cdu</track>
-      <track id="1238" tid="6">coolman</track>
-      <track id="1239" tid="7">faust</track>
-      <track id="1240" tid="8">gerdschroeder</track>
-      <track id="1241" tid="9">gerdschroeder2</track>
-      <track id="1242" tid="10">gerdschroeder3</track>
-      <track id="1243" tid="11">gerdschroeder4</track>
-      <track id="1244" tid="12">gott</track>
-      <track id="1245" tid="13">grizmek3</track>
-      <track id="1246" tid="14">halrvord</track>
-      <track id="1247" tid="15">helge4</track>
-      <track id="1248" tid="16">honikohl</track>
-      <track id="1249" tid="17">kohl</track>
-      <track id="1250" tid="18">kohl2</track>
-      <track id="1251" tid="19">kohl3</track>
-      <track id="1252" tid="20">kohl4</track>
-      <track id="1253" tid="21">kohlsingt</track>
-      <track id="1254" tid="22">kork</track>
-      <track id="1255" tid="23">lndnberg</track>
-      <track id="1256" tid="24">loddar</track>
-      <track id="1257" tid="25">loriot</track>
-      <track id="1258" tid="26">michael</track>
-      <track id="1259" tid="27">mission</track>
-      <track id="1260" tid="28">moser</track>
-      <track id="1261" tid="29">papst2</track>
-      <track id="1262" tid="30">ranicki</track>
-      <track id="1263" tid="31">ranicki2</track>
-      <track id="1264" tid="32">scherz</track>
-      <track id="1265" tid="33">supereh</track>
-      <track id="1266" tid="34">susi3</track>
-      <track id="1267" tid="35">weihnachtsmann</track>
-      <track id="1268" tid="36">wiebitte</track>
-      <track id="1269" tid="37">wummwend</track>
-    </album>
-    <album aid="102" title="sfstars">
-      <track id="1270" tid="1">3947</track>
-      <track id="1271" tid="2">borg</track>
-      <track id="1272" tid="3">c3po</track>
-      <track id="1273" tid="4">cluster</track>
-      <track id="1274" tid="5">dsn</track>
-      <track id="1275" tid="6">dukat</track>
-      <track id="1276" tid="7">dukat2</track>
-      <track id="1277" tid="8">hansolo</track>
-      <track id="1278" tid="9">holodoc</track>
-      <track id="1279" tid="10">janeway</track>
-      <track id="1280" tid="11">kim2</track>
-      <track id="1281" tid="12">kira</track>
-      <track id="1282" tid="13">kirk</track>
-      <track id="1283" tid="14">mib</track>
-      <track id="1284" tid="15">nog</track>
-      <track id="1285" tid="16">obrien</track>
-      <track id="1286" tid="17">obrien2</track>
-      <track id="1287" tid="18">odo</track>
-      <track id="1288" tid="19">picard</track>
-      <track id="1289" tid="20">r2d2</track>
-      <track id="1290" tid="21">riker</track>
-      <track id="1291" tid="22">schatten</track>
-      <track id="1292" tid="23">sisko</track>
-      <track id="1293" tid="24">sisko2</track>
-      <track id="1294" tid="25">spock</track>
-      <track id="1295" tid="26">spock2</track>
-      <track id="1296" tid="27">tng</track>
-      <track id="1297" tid="28">tos</track>
-      <track id="1298" tid="29">uhura</track>
-      <track id="1299" tid="30">voyager</track>
-      <track id="1300" tid="31">worfdax</track>
-      <track id="1301" tid="32">zimmerm</track>
-    </album>
-    <album aid="103" title="tvstars">
-      <track id="1302" tid="1">ab_lilo_5</track>
-      <track id="1303" tid="2">airforc2</track>
-      <track id="1304" tid="3">airforce</track>
-      <track id="1305" tid="4">albundy</track>
-      <track id="1306" tid="5">alf</track>
-      <track id="1307" tid="6">alf2</track>
-      <track id="1308" tid="7">berti</track>
-      <track id="1309" tid="8">bestofrichie</track>
-      <track id="1310" tid="9">bond</track>
-      <track id="1311" tid="10">bond2</track>
-      <track id="1312" tid="11">boning</track>
-      <track id="1313" tid="12">bully</track>
-      <track id="1314" tid="13">bvogts</track>
-      <track id="1315" tid="14">clousea2</track>
-      <track id="1316" tid="15">clouseau</track>
-      <track id="1317" tid="16">conan</track>
-      <track id="1318" tid="17">ddf</track>
-      <track id="1319" tid="18">delasoul</track>
-      <track id="1320" tid="19">drebin</track>
-      <track id="1321" tid="20">drebins</track>
-      <track id="1322" tid="21">dtkuhn</track>
-      <track id="1323" tid="22">duke</track>
-      <track id="1324" tid="23">elaine</track>
-      <track id="1325" tid="24">emil</track>
-      <track id="1326" tid="25">erhardt</track>
-      <track id="1327" tid="26">george</track>
-      <track id="1328" tid="27">georgebush</track>
-      <track id="1329" tid="28">ghostbusters</track>
-      <track id="1330" tid="29">hartman</track>
-      <track id="1331" tid="30">helge</track>
-      <track id="1332" tid="31">helge2</track>
-      <track id="1333" tid="32">helge3</track>
-      <track id="1334" tid="33">krause</track>
-      <track id="1335" tid="34">lector</track>
-      <track id="1336" tid="35">lose</track>
-      <track id="1337" tid="36">mulder</track>
-      <track id="1338" tid="37">mulder2</track>
-      <track id="1339" tid="38">nypd</track>
-      <track id="1340" tid="39">ohotte</track>
-      <track id="1341" tid="40">osterwelle</track>
-      <track id="1342" tid="41">python3</track>
-      <track id="1343" tid="42">python4</track>
-      <track id="1344" tid="43">python5</track>
-      <track id="1345" tid="44">raab</track>
-      <track id="1346" tid="45">renegade</track>
-      <track id="1347" tid="46">richie</track>
-      <track id="1348" tid="47">richie2</track>
-      <track id="1349" tid="48">richie3</track>
-      <track id="1350" tid="49">richie4</track>
-      <track id="1351" tid="50">richie5</track>
-      <track id="1352" tid="51">rockfor2</track>
-      <track id="1353" tid="52">rockford</track>
-      <track id="1354" tid="53">scully</track>
-      <track id="1355" tid="54">scully2</track>
-      <track id="1356" tid="55">scully3</track>
-      <track id="1357" tid="56">seinfeld</track>
-      <track id="1358" tid="57">seth</track>
-      <track id="1359" tid="58">sigi</track>
-      <track id="1360" tid="59">smeister</track>
-      <track id="1361" tid="60">thejade</track>
-      <track id="1362" tid="61">tnet-box</track>
-      <track id="1363" tid="62">tooltime</track>
-      <track id="1364" tid="63">twachter</track>
-      <track id="1365" tid="64">venkman</track>
-      <track id="1366" tid="65">ventura</track>
-      <track id="1367" tid="66">ventura2</track>
-      <track id="1368" tid="67">verona</track>
-      <track id="1369" tid="68">wallace</track>
-      <track id="1370" tid="69">xfiles</track>
-  </group>
-  <group name="Aphex Twin">
-    </album>
-    <album aid="104" title="''Girl-Boy'' E.P">
-      <track id="1371" tid="1">01 - Girl Boy (nls mix)</track>
-      <track id="1372" tid="2">02 - Milk Man</track>
-      <track id="1373" tid="3">03 - Inkey$</track>
-      <track id="1374" tid="4">04 - Girl Boy [£18 snarerush mix]</track>
-      <track id="1375" tid="5">05 - Beetles</track>
-      <track id="1376" tid="6">06 - Girl Boy [redruth mix]</track>
-    </album>
-    <album aid="105" title="...I care because you do">
-      <track id="1377" tid="1">01 - Acrid Avid Jamshred</track>
-      <track id="1378" tid="2">02 - The Waxen Pith</track>
-      <track id="1379" tid="3">03 - Wax the Nip</track>
-      <track id="1380" tid="4">04 - Icct Hedral (Edit)</track>
-      <track id="1381" tid="5">05 - Ventolin (Video Version)</track>
-      <track id="1382" tid="6">06 - Come On You Slags</track>
-      <track id="1383" tid="7">07 - Start As You Mean To Go On</track>
-      <track id="1384" tid="8">08 - Wet Tip Hen Ax</track>
-      <track id="1385" tid="9">09 - Mookid</track>
-      <track id="1386" tid="10">10 - Alberto Balsam</track>
-      <track id="1387" tid="11">11 - Cow Cud Is A Twin</track>
-      <track id="1388" tid="12">12 - Next Heap With</track>
-    </album>
-    <album aid="106" title="Anologue Bubblebath 3">
-      <track id="1389" tid="1">01 - .215061</track>
-      <track id="1390" tid="2">02 - .1993841</track>
-      <track id="1391" tid="3">03 - .0180871R</track>
-      <track id="1392" tid="4">04 - .942937</track>
-      <track id="1393" tid="5">05 - .0180871L</track>
-      <track id="1394" tid="6">06 - .000890569</track>
-      <track id="1395" tid="7">07 - .55278037732581</track>
-      <track id="1396" tid="8">08 - (CAT 00897-AA1)</track>
-      <track id="1397" tid="9">09 - (CAT 00897-A1)</track>
-      <track id="1398" tid="10">10 - AFX 6-B</track>
-      <track id="1399" tid="11">11 - (CD Only Track #1)</track>
-      <track id="1400" tid="12">12 - (CD Only Track #2)</track>
-      <track id="1401" tid="13">13 - (CAT 00897-A2)</track>
-    </album>
-    <album aid="107" title="Classics">
-      <track id="1402" tid="1">01 - Digeridoo</track>
-      <track id="1403" tid="2">02 - Flaphead</track>
-      <track id="1404" tid="3">03 - Phloam</track>
-      <track id="1405" tid="4">04 - Isopropanol</track>
-      <track id="1406" tid="5">05 - Polynomial-C</track>
-      <track id="1407" tid="6">06 - Tamphex (Hedphuq Mix)</track>
-      <track id="1408" tid="7">07 - Phlange Phace</track>
-      <track id="1409" tid="8">08 - Dodeccaheedron</track>
-      <track id="1410" tid="9">09 - Analogue Bubblebath 1</track>
-      <track id="1411" tid="10">10 - Metapharstic</track>
-      <track id="1412" tid="11">11 - We have arrived (Aphex Twin QQT Mix)</track>
-      <track id="1413" tid="12">12 - We have arrived (Aphex Twin TTQ Mix)</track>
-      <track id="1414" tid="13">13 - Digeridoo (Live in Cornwall, 1990)</track>
-    </album>
-    <album aid="108" title="Come To Daddy">
-      <track id="1415" tid="1">01 - Come To Daddy, Pappy Mix</track>
-      <track id="1416" tid="2">02 - Flim</track>
-      <track id="1417" tid="3">03 - Come To Daddy, Little Lord Faulteroy Mix</track>
-      <track id="1418" tid="4">04 - Bucephalus Bouncing Ball</track>
-      <track id="1419" tid="5">05 - To Cure A Weakling Child, Contour Regard</track>
-      <track id="1420" tid="6">06 - Funny Little Man</track>
-      <track id="1421" tid="7">07 - Come To Daddy, Mummy Mix</track>
-      <track id="1422" tid="8">08 - IZ-US</track>
-    </album>
-    <album aid="109" title="Donkey Rhubarb">
-      <track id="1423" tid="1">01 - Donkey Rhubarb</track>
-      <track id="1424" tid="2">02 - Vaz Deferenz</track>
-      <track id="1425" tid="3">03 - Icct Hedral (Philip Glass Orchestration)</track>
-      <track id="1426" tid="4">04 - Pancake Lizard</track>
-    </album>
-    <album aid="110" title="Expert Knob Twiddlers (with Mike Paradinas)">
-      <track id="1427" tid="1">01 - Mr. Frosty</track>
-      <track id="1428" tid="2">02 - Jelly Fish</track>
-      <track id="1429" tid="3">03 - Eggy Toast</track>
-      <track id="1430" tid="4">04 - Reg</track>
-      <track id="1431" tid="5">05 - Vodka</track>
-      <track id="1432" tid="6">06 - Winner Takes All</track>
-      <track id="1433" tid="7">07 - Giant Deflating Football</track>
-      <track id="1434" tid="8">08 - Upright Kangaroo</track>
-      <track id="1435" tid="9">09 - The Sound of Beady Eyes</track>
-      <track id="1436" tid="10">10 - Bu Bu Bu Ba</track>
-    </album>
-    <album aid="111" title="on">
-      <track id="1437" tid="1">01 - on</track>
-      <track id="1438" tid="2">02 - 73-yips</track>
-      <track id="1439" tid="3">03 - d-scape</track>
-      <track id="1440" tid="4">04 - xepha</track>
-    </album>
-    <album aid="112" title="on remixes">
-      <track id="1441" tid="1">01 - d-scape mix</track>
-      <track id="1442" tid="2">02 - reload mix</track>
-      <track id="1443" tid="3">03 - mu-ziq mix</track>
-      <track id="1444" tid="4">04 - 28 mix</track>
-    </album>
-    <album aid="113" title="Polygon Window - Quoth">
-      <track id="1445" tid="1">01 - Quoth (Original)</track>
-      <track id="1446" tid="2">02 - Iketa</track>
-      <track id="1447" tid="3">03 - Quoth (Wooden Thump Mix)</track>
-      <track id="1448" tid="4">04 - Bike Pump Meets Bucket</track>
-      <track id="1449" tid="5">05 - (Unlisted)</track>
-    </album>
-    <album aid="114" title="Polygon Window - Surfing On Sine Waves">
-      <track id="1450" tid="1">01 - Polygon Window</track>
-      <track id="1451" tid="2">02 - Audax Powder</track>
-      <track id="1452" tid="3">03 - Quoth</track>
-      <track id="1453" tid="4">04 - If It Really Is Me</track>
-      <track id="1454" tid="5">05 - Supremacy II</track>
-      <track id="1455" tid="6">06 - UT1 - dot</track>
-      <track id="1456" tid="7">07 - -no title-</track>
-      <track id="1457" tid="8">08 - Quixote</track>
-      <track id="1458" tid="9">09 - Quino-phec</track>
-    </album>
-    <album aid="115" title="Richard D. James Album">
-      <track id="1459" tid="1">01 - 4</track>
-      <track id="1460" tid="2">02 - Cornish Acid</track>
-      <track id="1461" tid="3">03 - Peek 824545201</track>
-      <track id="1462" tid="4">04 - Fingerbib</track>
-      <track id="1463" tid="5">05 - Corn Mouth</track>
-      <track id="1464" tid="6">06 - To Cure A Weakling Child</track>
-      <track id="1465" tid="7">07 - Goon Gumpas</track>
-      <track id="1466" tid="8">08 - Yellow Calx</track>
-      <track id="1467" tid="9">09 - Girl-Boy Song</track>
-      <track id="1468" tid="10">10 - Logon Rock Witch</track>
-    </album>
-    <album aid="116" title="Selected Ambient Works 85-92 (Volume I)">
-      <track id="1469" tid="1">01 - Xtal</track>
-      <track id="1470" tid="2">02 - Tha</track>
-      <track id="1471" tid="3">03 - Pulsewidth</track>
-      <track id="1472" tid="4">04 - Ageispolis</track>
-      <track id="1473" tid="5">05 - i</track>
-      <track id="1474" tid="6">06 - Green Calx</track>
-      <track id="1475" tid="7">07 - Heliosphan</track>
-      <track id="1476" tid="8">08 - We are the Music Makers</track>
-      <track id="1477" tid="9">09 - Schottkey 7th Path</track>
-      <track id="1478" tid="10">10 - Ptolemy</track>
-      <track id="1479" tid="11">11 - Hedphelym</track>
-      <track id="1480" tid="12">12 - Delphium</track>
-      <track id="1481" tid="13">13 - Actium</track>
-    </album>
-    <album aid="117" title="Selected Ambient Works II|CD1">
-      <track id="1482" tid="1">01 - Cliffs</track>
-      <track id="1483" tid="2">02 - Radiator</track>
-      <track id="1484" tid="3">03 - Rhubarb</track>
-      <track id="1485" tid="4">04 - Hankie</track>
-      <track id="1486" tid="5">05 - Grass</track>
-      <track id="1487" tid="6">06 - Mold</track>
-      <track id="1488" tid="7">07 - Curtains</track>
-      <track id="1489" tid="8">08 - Blur</track>
-      <track id="1490" tid="9">09 - Weathered stone</track>
-      <track id="1491" tid="10">10 - Tree</track>
-      <track id="1492" tid="11">11 - Domino</track>
-      <track id="1493" tid="12">12 - White blur 1</track>
-    </album>
-    <album aid="118" title="Ventolin E.P">
-      <track id="1494" tid="1">01 - Ventolin (Salbutamol Mix)</track>
-      <track id="1495" tid="2">02 - Ventolin (Praze-An-Beeble Mix)</track>
-      <track id="1496" tid="3">03 - Ventolin (Marazanvose Mix)</track>
-      <track id="1497" tid="4">04 - Ventolin (Plain-An-Gwarry Mix)</track>
-      <track id="1498" tid="5">05 - Ventolin (The Coppice Mix)</track>
-      <track id="1499" tid="6">06 - Ventolin (Crowsmengegus Mix)</track>
-    </album>
-    <album aid="119" title="Ventolin EP (The Remixes)">
-      <track id="1500" tid="1">01 - Ventolin (wheeze mix)</track>
-      <track id="1501" tid="2">02 - Ventolin CARHARRACK mix</track>
-      <track id="1502" tid="3">03 - Ventolin PROBUS mix</track>
-      <track id="1503" tid="4">04 - Ventolin (cylob mix)</track>
-      <track id="1504" tid="5">05 - Ventolin (deep gong mix)</track>
-      <track id="1505" tid="6">06 - Ventolin (asthma beats mix)</track>
-  </group>
-  <group name="Aphrodite Recordings">
-    </album>
-    <album aid="120" title="Aphrodite Recordings">
-      <track id="1506" tid="1">01 (Aphrodite) - Aphromoods</track>
-      <track id="1507" tid="2">02 (Amazon II) - King Of The Beats</track>
-      <track id="1508" tid="3">03 (Aladdin) - Woman That Rolls!</track>
-      <track id="1509" tid="4">04 (Aphrodite) - Spice (Of The Gods Remix)</track>
-      <track id="1510" tid="5">05 (Aladdin) - Summer Breeze</track>
-      <track id="1511" tid="6">06 (Amazon II) - Music's Hypnotising</track>
-      <track id="1512" tid="7">07 (Aphrodite (Vortex Mix)) - Listen To The Rythm</track>
-      <track id="1513" tid="8">08 (Aphrodite) - Dub Moods (The Greatest Trick)</track>
-      <track id="1514" tid="9">09 (Aphrodite) - Style From The Dark Side</track>
-      <track id="1515" tid="10">10 (Aphrodite) - Tower Bass!</track>
-      <track id="1516" tid="11">11 (Aphrodite feat. Gail Mclean) - I Wanted It More And</track>
-      <track id="1517" tid="12">12 (Aphrodite) - Sweet Mind</track>
-  </group>
-  <group name="Apollo 440">
-    </album>
-    <album aid="121" title="Electro Glide In Blue">
-      <track id="1518" tid="1">01 - Sealth Overture</track>
-      <track id="1519" tid="2">02 - Ain't Talkin' 'Bout Dub</track>
-      <track id="1520" tid="3">03 - Altamont Super-Highway Revisted</track>
-      <track id="1521" tid="4">04 - Electro Glide In Blue</track>
-      <track id="1522" tid="5">05 - Vanishing Point</track>
-      <track id="1523" tid="6">06 - Tears Of The Gods</track>
-      <track id="1524" tid="7">07 - Carrera Rapida</track>
-      <track id="1525" tid="8">08 - Krupa</track>
-      <track id="1526" tid="9">09 - White Man's Throat!s</track>
-      <track id="1527" tid="10">10 - Pain In Any Language</track>
-      <track id="1528" tid="11">11 - Stealth Mass In F#m!s</track>
-    </album>
-    <album aid="122" title="Gettin' High On Your Own Supply">
-      <track id="1529" tid="1">01 - Are we a rock band or what</track>
-      <track id="1530" tid="2">02 - Stop the rock</track>
-      <track id="1531" tid="3">03 - Crazee Horse</track>
-      <track id="1532" tid="4">04 - Cold Rock the Mic</track>
-      <track id="1533" tid="5">05 - Lost in Space (Theme)</track>
-      <track id="1534" tid="6">06 - For forty days</track>
-      <track id="1535" tid="7">07 - Heart Go Boom</track>
-      <track id="1536" tid="8">08 - The Machine in the ghost</track>
-      <track id="1537" tid="9">09 - Blackbeat</track>
-      <track id="1538" tid="10">10 - Stadium parking lot</track>
-      <track id="1539" tid="11">11 - YO, Future</track>
-      <track id="1540" tid="12">12 - High on your own supply</track>
-      <track id="1541" tid="13">13 - The Perfect crime</track>
-    </album>
-    <album aid="123" title="Millennium Fever">
-      <track id="1542" tid="1">02 - Liquid Cool</track>
-      <track id="1543" tid="2">03 - Film Me And Finish Me Off</track>
-      <track id="1544" tid="3">04 - I Need Something Stronger</track>
-      <track id="1545" tid="4">05 - Pain Is A Close Up</track>
-      <track id="1546" tid="5">06 - Omega Point</track>
-      <track id="1547" tid="6">07 - Don't Fear The Reaper</track>
-      <track id="1548" tid="7">08 - Astral Amerika</track>
-      <track id="1549" tid="8">09 - Millennium Fever</track>
-      <track id="1550" tid="9">10 - Stealth Requiem</track>
-  </group>
-  <group name="Apoptygma Berzerk">
-    </album>
-    <album aid="124" title="7">
-      <track id="1551" tid="1">01 - Love Never Dies, Part I</track>
-      <track id="1552" tid="2">02 - Mourn</track>
-      <track id="1553" tid="3">03 - Non-Stop Violence</track>
-      <track id="1554" tid="4">04 - 25 Cromwell St.</track>
-      <track id="1555" tid="5">05 - Rebel</track>
-      <track id="1556" tid="6">06 - Deep Red</track>
-      <track id="1557" tid="7">07 - Nearer</track>
-      <track id="1558" tid="8">08 - Half Asleep</track>
-      <track id="1559" tid="9">09 - Love Never Dies, Part II</track>
-    </album>
-    <album aid="125" title="Kathy's_Song">
-      <track id="1560" tid="1">01_-_Kathy's_Song_(Ferry_Corsten_RMX)</track>
-      <track id="1561" tid="2">02_-_Kathy's_Song_(Single_version)</track>
-      <track id="1562" tid="3">03_-_Kathy's_Song_(Victoria_mix_by_VNV_Nation)</track>
-      <track id="1563" tid="4">04_-_Kathy's_Song_(Beborn_Beton_RMX)</track>
-      <track id="1564" tid="5">05_-_Kathy's_Song_(Ferry_Corsten_RMX)(12-_version)</track>
-      <track id="1565" tid="6">06_-_Kathy's_Song_(C-64_version)</track>
-    </album>
-    <album aid="126" title="Mourn EP">
-      <track id="1566" tid="1">01 - Mourn (APB Remix)</track>
-      <track id="1567" tid="2">02 - Mourn (Ihrmx)</track>
-      <track id="1568" tid="3">03 - Mourn (Original Version)</track>
-      <track id="1569" tid="4">04 - Untitled Too (Sweep remix)</track>
-      <track id="1570" tid="5">05 - Ohm Sweet Ohm</track>
-      <track id="1571" tid="6">06 - Electricity</track>
-      <track id="1572" tid="7">07 - Snutt 7</track>
-    </album>
-    <album aid="127" title="Non-Stop Violence">
-      <track id="1573" tid="1">01 - Non-Stop Violence [CNN version]</track>
-      <track id="1574" tid="2">02 - Near [Banilla Dream version]</track>
-      <track id="1575" tid="3">03 - Burnin' Heretic [Live]</track>
-    </album>
-    <album aid="128" title="Soli Deo Gloria">
-      <track id="1576" tid="1">01 - Like Blood From The Beloved (part 1)</track>
-      <track id="1577" tid="2">02 - Bitch</track>
-      <track id="1578" tid="3">03 - Burnin Heretic (album version)</track>
-      <track id="1579" tid="4">04 - Stich</track>
-      <track id="1580" tid="5">05 - Walk With Me</track>
-      <track id="1581" tid="6">06 - Backdraft</track>
-      <track id="1582" tid="7">07 - Arp (808 edit)</track>
-      <track id="1583" tid="8">08 - Spiritual Reality</track>
-      <track id="1584" tid="9">09 - Skyscraping (schizophreniac)</track>
-      <track id="1585" tid="10">10 - All Tomorrows Parties</track>
-      <track id="1586" tid="11">11 - The Sentinel</track>
-      <track id="1587" tid="12">12 - Ashes To Ashes `93</track>
-      <track id="1588" tid="13">13 - Like Blood From The Beloved (part 2)</track>
-    </album>
-    <album aid="129" title="The Apopcalyptic Manifesto">
-      <track id="1589" tid="1">01 - Apb goes C-64</track>
-      <track id="1590" tid="2">02 - Deep Red</track>
-      <track id="1591" tid="3">03 - Bitch</track>
-      <track id="1592" tid="4">04 - Stitch</track>
-      <track id="1593" tid="5">05 - Spiritual Reality</track>
-      <track id="1594" tid="6">06 - Electronic Warfare</track>
-      <track id="1595" tid="7">07 - All Tomorrows Parties</track>
-      <track id="1596" tid="8">08 - Arp</track>
-      <track id="1597" tid="9">09 - Burnin´ Heretic (Album version)</track>
-      <track id="1598" tid="10">10 - Ledelsens Mening</track>
-      <track id="1599" tid="11">11 - Backdraft</track>
-      <track id="1600" tid="12">12 - Ashes to Ashes (German Slam version)</track>
-      <track id="1601" tid="13">13 - The Approach of Death</track>
-      <track id="1602" tid="14">14 - Ashes to Ashes (Original 12- version)</track>
-      <track id="1603" tid="15">15 - Wrack´em to Pieces</track>
-      <track id="1604" tid="16">16 - Burning Heretics (Crisp version)</track>
-    </album>
-    <album aid="130" title="Welcome To Earth">
-      <track id="1605" tid="1">01 - Everything We Know Is Wrong</track>
-      <track id="1606" tid="2">02 - Starsign</track>
-      <track id="1607" tid="3">03 - Eclipse</track>
-      <track id="1608" tid="4">04 - Help Me</track>
-      <track id="1609" tid="5">05 - Kathy's Song (Come Lie Next To Me)</track>
-      <track id="1610" tid="6">06 - Untiled 3</track>
-      <track id="1611" tid="7">07 - Moment Of Tranquililty</track>
-      <track id="1612" tid="8">08 - Fade To Black</track>
-      <track id="1613" tid="9">09 - 64K</track>
-      <track id="1614" tid="10">10 - Paranoia</track>
-      <track id="1615" tid="11">11 - Soultaker</track>
-      <track id="1616" tid="12">12 - LNDP 3</track>
-      <track id="1617" tid="13">13 - Time To Move On + Bonus (ABP Goes C-64 Again)</track>
-  </group>
-  <group name="Aretha Franklin">
-    </album>
-    <album aid="131" title="Greatest Hits">
-      <track id="1618" tid="1">01 Aretha Franklin - Freeway Of Love</track>
-      <track id="1619" tid="2">02 Aretha Franklin - I Knew You Were Waiting</track>
-      <track id="1620" tid="3">03 Aretha Franklin - Jump To It</track>
-      <track id="1621" tid="4">04 Aretha Franklin - Willing To Forgive</track>
-      <track id="1622" tid="5">05 Aretha Franklin - Doctor's Orders</track>
-      <track id="1623" tid="6">06 Aretha Franklin - United Together</track>
-      <track id="1624" tid="7">07 Aretha Franklin - Who's Zoomin' Who</track>
-      <track id="1625" tid="8">08 Aretha Franklin - A Deeper Love</track>
-      <track id="1626" tid="9">09 Aretha Franklin - Honey</track>
-      <track id="1627" tid="10">10 Aretha Franklin - Get It Right</track>
-      <track id="1628" tid="11">11 Aretha Franklin - Another Night</track>
-      <track id="1629" tid="12">12 Aretha Franklin - Ever Changing Times</track>
-      <track id="1630" tid="13">13 Aretha Franklin - Jimmy Lee</track>
-      <track id="1631" tid="14">14 Aretha Franklin - You Make Me Feel</track>
-      <track id="1632" tid="15">15 Aretha Franklin - I Dreamed A Dream</track>
-      <track id="1633" tid="16">16 Aretha Franklin - Jumpin' Jack Flash</track>
-  </group>
-  <group name="Armando">
-    </album>
-    <album aid="132" title="One World One Future">
-      <track id="1634" tid="1">SN1B6208B_Trk01A</track>
-      <track id="1635" tid="2">SN1B6208B_Trk02A</track>
-      <track id="1636" tid="3">SN1B6208B_Trk03A</track>
-      <track id="1637" tid="4">SN1B6208B_Trk04A</track>
-      <track id="1638" tid="5">SN1B6208B_Trk05A</track>
-      <track id="1639" tid="6">SN1B6208B_Trk06A</track>
-      <track id="1640" tid="7">SN1B6208B_Trk07A</track>
-      <track id="1641" tid="8">SN1B6208B_Trk08A</track>
-      <track id="1642" tid="9">SN1B6208B_Trk09A</track>
-      <track id="1643" tid="10">SN1B6208B_Trk10A</track>
-      <track id="1644" tid="11">SN1B6208B_Trk11A</track>
-      <track id="1645" tid="12">SN1B6208B_Trk12A</track>
-      <track id="1646" tid="13">SN1B6208B_Trk13A</track>
-      <track id="1647" tid="14">SN1B6208B_Trk14A</track>
-  </group>
-  <group name="Armando Manzanero">
-    </album>
-    <album aid="133" title="Lo mejor de">
-      <track id="1648" tid="1">01 - Adoro</track>
-      <track id="1649" tid="2">02 - Somos novios</track>
-      <track id="1650" tid="3">03 - Cuando estoy contigo</track>
-      <track id="1651" tid="4">04 - Pensando en ti</track>
-      <track id="1652" tid="5">05- Contigo amor</track>
-      <track id="1653" tid="6">06 - Cariño mio</track>
-      <track id="1654" tid="7">07 - Yo te quiero</track>
-      <track id="1655" tid="8">08 - Esta tarde vi llover</track>
-      <track id="1656" tid="9">09 - Voy a apagar la luz</track>
-      <track id="1657" tid="10">10 - Contigo aprendi</track>
-      <track id="1658" tid="11">11 - No</track>
-      <track id="1659" tid="12">12 - Esperare</track>
-      <track id="1660" tid="13">13 - Pero te extraño</track>
-      <track id="1661" tid="14">14 - Me vas a recordar</track>
-      <track id="1662" tid="15">15 - Mia</track>
-  </group>
-  <group name="Arschgefickte Gummivotzen">
-    </album>
-    <album aid="134" title="Arschgefickte Gummivotzen">
-      <track id="1663" tid="1">(01).im.wagen.vor.mir</track>
-      <track id="1664" tid="2">(02).ferien.auf.dem.bauernhof</track>
-      <track id="1665" tid="3">(03).das.frivole.wiedersehen</track>
-      <track id="1666" tid="4">(04).spermadin</track>
-    </album>
-    <album aid="135" title="Covenant|united states of mind">
-      <track id="1667" tid="1">02 - No Man's Land</track>
-  </group>
-  <group name="Arschkrampen">
-    </album>
-    <album aid="136" title="Zicken & Würmer II">
-      <track id="1668" tid="1">16 - Poppen muss Spass machen</track>
-      <track id="1669" tid="2">19 - Der Ausdenker</track>
-      <track id="1670" tid="3">17 - Heiligabend</track>
-      <track id="1671" tid="4">15 - Drei Eier</track>
-      <track id="1672" tid="5">18 - Gertrud ist abgerissen</track>
-      <track id="1673" tid="6">12 - Einbruch bei Gertrud - In der Haseluenner Lubjanka</track>
-      <track id="1674" tid="7">13 - Einbruch bei Gertrud - Die Verhandlung</track>
-      <track id="1675" tid="8">14 - Oeffentlicher Nahverkehr</track>
-      <track id="1676" tid="9">10 - Ruesselwaesche</track>
-      <track id="1677" tid="10">11 - Einbruch bei Gertrud - Gertrud hat noch zu</track>
-      <track id="1678" tid="11">09 - Schneeraeumen am Arsch</track>
-      <track id="1679" tid="12">08 - Oedipus Kurt</track>
-      <track id="1680" tid="13">01 - Ferkel nervt</track>
-      <track id="1681" tid="14">02 - Arschkrampen im Krieg - Der Kessel von Goebelgrad</track>
-      <track id="1682" tid="15">03 - Arschkrampen im Krieg - Der 7 Mai 1945</track>
-      <track id="1683" tid="16">04 - Arschkrampen im Krieg - Nacht ueber Gotenhafen</track>
-      <track id="1684" tid="17">05 - Es plaestert</track>
-      <track id="1685" tid="18">06 - Pflaumen pfluecken</track>
-      <track id="1686" tid="19">07 - Weitstrullen</track>
-    </album>
-    <album aid="137" title="Aggi Aggi">
-      <track id="1687" tid="1">19 - Kampfruf des Negers</track>
-      <track id="1688" tid="2">02 - Die alte Kultur</track>
-      <track id="1689" tid="3">08 - Schwanzmessen</track>
-      <track id="1690" tid="4">20 - Die Leguane greifen an</track>
-      <track id="1691" tid="5">01 - Was hier denn los</track>
-      <track id="1692" tid="6">18 - Schluepfer rasseln in Fickstadt</track>
-      <track id="1693" tid="7">05 - Am Tag als der Leguan</track>
-      <track id="1694" tid="8">03 - Entfuehrer und Enthueller</track>
-      <track id="1695" tid="9">04 - Wie gehts eigentlich Praenki</track>
-      <track id="1696" tid="10">21 - Erste Kritik</track>
-      <track id="1697" tid="11">07 - Excusez-moi</track>
-      <track id="1698" tid="12">06 - Zu den Quellen des Amazonas</track>
-      <track id="1699" tid="13">09 - Gelegenheit zum Gespraech</track>
-      <track id="1700" tid="14">13 - Gehts Praenki besser</track>
-      <track id="1701" tid="15">16 - Praenki is kaputt</track>
-      <track id="1702" tid="16">14 - An den Ufern des Urinoko</track>
-      <track id="1703" tid="17">15 - Zicken her</track>
-      <track id="1704" tid="18">12 - Eckis Plattentip</track>
-      <track id="1705" tid="19">11 - Brettermeier duebelt</track>
-      <track id="1706" tid="20">10 - Goebelblanca</track>
-      <track id="1707" tid="21">17 - Feuchte BIRAFO</track>
-    </album>
-    <album aid="138" title="Arschkrampen Tekkno (Maxi)">
-      <track id="1708" tid="1">04 - Brettermeier (Karaoke Version)</track>
-      <track id="1709" tid="2">03 - Brettermeier (Radio Version)</track>
-      <track id="1710" tid="3">02 - 18 Bier mit Tsatsiki</track>
-      <track id="1711" tid="4">01 - Brettermeier die Pottsau</track>
-    </album>
-    <album aid="139" title="Ekeleregend">
-      <track id="1712" tid="1">02 - Der kleine Pisser</track>
-      <track id="1713" tid="2">03 - Die Alpen</track>
-      <track id="1714" tid="3">01 - Damals in der Bretterpenne</track>
-      <track id="1715" tid="4">04 - Gedichte</track>
-      <track id="1716" tid="5">10 - Telephonsex</track>
-      <track id="1717" tid="6">09 - Bluemel und Laesch</track>
-      <track id="1718" tid="7">12 - Gurkenrost</track>
-      <track id="1719" tid="8">11 - Groehlen un Suppe</track>
-      <track id="1720" tid="9">16 - Jingle - Arschkrampenzeit</track>
-      <track id="1721" tid="10">15 - Arschregen</track>
-      <track id="1722" tid="11">14 - Kurtin</track>
-      <track id="1723" tid="12">13 - Cassette im Arsch</track>
-    </album>
-    <album aid="140" title="Sooo Siehddas Aus">
-      <track id="1724" tid="1">01 - Ich bin ein Ferkelwaemser</track>
-      <track id="1725" tid="2">05 - Der Iwan is nich ohne</track>
-      <track id="1726" tid="3">03 - Allegorie ueber Stalingrad</track>
-      <track id="1727" tid="4">02 - Frauen stehen auf Macht</track>
-      <track id="1728" tid="5">04 - Der Negerueberfall</track>
-      <track id="1729" tid="6">06 - Hier Bretter-Control</track>
-      <track id="1730" tid="7">07 - Goebel-Solo</track>
-      <track id="1731" tid="8">08 - Kurt is in Kur</track>
-      <track id="1732" tid="9">20 - Absage</track>
-      <track id="1733" tid="10">17 - Kurt im Schrank</track>
-      <track id="1734" tid="11">19 - Gertrud hat zu</track>
-      <track id="1735" tid="12">09 - Guergen erinnert sich</track>
-      <track id="1736" tid="13">10 - Der Tomatenkopp</track>
-      <track id="1737" tid="14">16 - Ab inne Truhe</track>
-      <track id="1738" tid="15">12 - Der Gammel</track>
-      <track id="1739" tid="16">15 - Gesucht wird Albert Brettermeier</track>
-      <track id="1740" tid="17">11 - Kurt Kong</track>
-      <track id="1741" tid="18">13 - Bei Gertrud</track>
-      <track id="1742" tid="19">18 - Kurt hat Geburtstag</track>
-      <track id="1743" tid="20">14 - Wir fahn nach Wakaluba</track>
-    </album>
-    <album aid="141" title="Zicken & Würmer I">
-      <track id="1744" tid="1">01 - Stracciatella</track>
-      <track id="1745" tid="2">22 - Die letzte Folge</track>
-      <track id="1746" tid="3">21 - Ferkels Schwester</track>
-      <track id="1747" tid="4">20 - Hier spricht Ramke</track>
-      <track id="1748" tid="5">16 - Wuggi baut um</track>
-      <track id="1749" tid="6">14 - Zasta Krockett der verwarzte Rochen</track>
-      <track id="1750" tid="7">15 - Die Ex-Verlobte</track>
-      <track id="1751" tid="8">17 - Robinson Kurt</track>
-      <track id="1752" tid="9">11 - dammte Pekinesenkotze - Telephon</track>
-      <track id="1753" tid="10">13 - Wischmeyer ruft an</track>
-      <track id="1754" tid="11">19 - Reingeroemert</track>
-      <track id="1755" tid="12">18 - Der grosse Hatti Mueller</track>
-      <track id="1756" tid="13">02 - The Making of Arschkrampen</track>
-      <track id="1757" tid="14">03 - Der Vollidiot</track>
-      <track id="1758" tid="15">04 - Geheimagent Ferkel</track>
-      <track id="1759" tid="16">05 - Die Hackfresse</track>
-      <track id="1760" tid="17">06 - Die Kimmen der Adler</track>
-      <track id="1761" tid="18">07 - Schrappige Zicken</track>
-      <track id="1762" tid="19">08 - Wie gehzn Wuggi</track>
-      <track id="1763" tid="20">09 - Kurt will heiraten 1 - Krissa die Hundekopffegerin</track>
-      <track id="1764" tid="21">10 - Kurt will heiraten 2 - Der Hochzeitstag</track>
-      <track id="1765" tid="22">12 - Kurt will heiraten 3 - Die Vermaehlung</track>
-  </group>
-  <group name="Art of Trance">
-    </album>
-    <album aid="142" title="Madagasca (Maxi)">
-      <track id="1766" tid="1">01 - Madagasca</track>
-      <track id="1767" tid="2">02 - Madagasca Cygnus X Remix</track>
-    </album>
-    <album aid="143" title="Voice Of Earth">
-      <track id="1768" tid="1">01 - Breathe</track>
-      <track id="1769" tid="2">02 - Monsoon</track>
-      <track id="1770" tid="3">03 - The Hummer</track>
-      <track id="1771" tid="4">04 - Madagascar</track>
-      <track id="1772" tid="5">05 - Requiem</track>
-      <track id="1773" tid="6">06 - Dud UK</track>
-      <track id="1774" tid="7">07 - Easter Island</track>
-      <track id="1775" tid="8">08 - Stealth</track>
-      <track id="1776" tid="9">09 - Panorama</track>
-      <track id="1777" tid="10">10 - Voice Of Earth</track>
-  </group>
-  <group name="Artful Dodger">
-    </album>
-    <album aid="144" title="Movin Too Fast">
-      <track id="1778" tid="1">01 - Movin Too Fast - Radio Mix</track>
-      <track id="1779" tid="2">02 - Movin Too Fast - Bump & Flex Vocal</track>
-      <track id="1780" tid="3">03 - Movin Too Fast - Pussy 2000 Vocal</track>
-    </album>
-    <album aid="145" title="Artful Dodger">
-      <track id="1781" tid="1">Re-Rewind - The artful dodger</track>
-    </album>
-    <album aid="146" title="woman trouble">
-      <track id="1782" tid="1">01 - woman trouble (radio edit)</track>
-      <track id="1783" tid="2">02 - woman trouble (original version radio edit)</track>
-      <track id="1784" tid="3">03 - woman trouble (sunkids future discotech edit)</track>
-      <track id="1785" tid="4">04 - woman trouble (wideboy's pickapocket or two radio edit)</track>
-  </group>
-  <group name="Artificial Intelligence">
-    </album>
-    <album aid="147" title="Vol. 1">
-      <track id="1786" tid="1">01 - The Dice Man - Polygon Window</track>
-      <track id="1787" tid="2">02 - Musicology - Telefone 529</track>
-      <track id="1788" tid="3">03 - Autechre - Crystel</track>
-      <track id="1789" tid="4">04 - I.A.O - The Clan</track>
-      <track id="1790" tid="5">05 - Speedy J - De-Orbit</track>
-      <track id="1791" tid="6">06 - Musicology - Preminition</track>
-      <track id="1792" tid="7">07 - UP! - Spiritual High</track>
-      <track id="1793" tid="8">08 - Autechre - The Egg</track>
-      <track id="1794" tid="9">09 - Speedy J - Fill 3</track>
-      <track id="1795" tid="10">10 - Dr Alex Paterson - Loving You Live</track>
-    </album>
-    <album aid="148" title="Vol. 2">
-      <track id="1796" tid="1">01 - Mark Franklin - Release to the System</track>
-      <track id="1797" tid="2">02 - The Higher Intelligence Agency - Selinite</track>
-      <track id="1798" tid="3">03 - Link - Arcadian</track>
-      <track id="1799" tid="4">04 - B12 - Scriptures</track>
-      <track id="1800" tid="5">05 - Autechre - Chatter</track>
-      <track id="1801" tid="6">06 - Speedy J - Symmetry</track>
-      <track id="1802" tid="7">07 - Beaumont Hannant - Utuba</track>
-      <track id="1803" tid="8">08 - Richard H. Kirk - Reality Net</track>
-      <track id="1804" tid="9">09 - Balil - Parasight</track>
-      <track id="1805" tid="10">10 - Seefeel - Spangle</track>
-  </group>
-  <group name="Artificial Joy Club">
-    </album>
-    <album aid="149" title="Sick And Beautiful">
-      <track id="1806" tid="1">01 - Sick And Beautiful Radio Edit</track>
-      <track id="1807" tid="2">02 - Sick And Beautiful Quick Fix Mix</track>
-      <track id="1808" tid="3">03 - My Heaven</track>
-  </group>
-  <group name="Arturo Benedetti">
-    </album>
-    <album aid="150" title="CD2 Great Pianists of the 20th Century">
-      <track id="1809" tid="1">01 - Track  1</track>
-      <track id="1810" tid="2">02 - Track  2</track>
-      <track id="1811" tid="3">03 - Track  3</track>
-      <track id="1812" tid="4">04 - Track  4</track>
-      <track id="1813" tid="5">05 - Track  5</track>
-      <track id="1814" tid="6">06 - Track  6</track>
-      <track id="1815" tid="7">07 - Track  7</track>
-      <track id="1816" tid="8">08 - Track  8</track>
-      <track id="1817" tid="9">09 - Track  9</track>
-      <track id="1818" tid="10">10 - Track 10</track>
-      <track id="1819" tid="11">11 - Track 11</track>
-      <track id="1820" tid="12">12 - Track 12</track>
-    </album>
-    <album aid="151" title="Great Pianists of the 20th Century">
-      <track id="1821" tid="1">01 - Track  1</track>
-      <track id="1822" tid="2">02 - Track  2</track>
-      <track id="1823" tid="3">03 - Track  3</track>
-      <track id="1824" tid="4">04 - Track  4</track>
-      <track id="1825" tid="5">05 - Track  5</track>
-      <track id="1826" tid="6">06 - Track  6</track>
-      <track id="1827" tid="7">07 - Track  7</track>
-      <track id="1828" tid="8">08 - Track  8</track>
-      <track id="1829" tid="9">09 - Track  9</track>
-      <track id="1830" tid="10">10 - Track 10</track>
-      <track id="1831" tid="11">11 - Track 11</track>
-      <track id="1832" tid="12">12 - Track 12</track>
-      <track id="1833" tid="13">13 - Track 13</track>
-      <track id="1834" tid="14">14 - Track 14</track>
-      <track id="1835" tid="15">15 - Track 15</track>
-      <track id="1836" tid="16">16 - Track 16</track>
-      <track id="1837" tid="17">17 - Track 17</track>
-      <track id="1838" tid="18">18 - Track 18</track>
-  </group>
-  <group name="Asion Dub Foundation">
-    </album>
-    <album aid="152" title="Rafi's Revenge">
-      <track id="1839" tid="1">01 - naxalite</track>
-      <track id="1840" tid="2">02 - buzzin'</track>
-      <track id="1841" tid="3">03 - black white</track>
-      <track id="1842" tid="4">04 - assassin</track>
-      <track id="1843" tid="5">05 - hypocrite</track>
-      <track id="1844" tid="6">06 - charge</track>
-      <track id="1845" tid="7">07 - free satpal ram</track>
-      <track id="1846" tid="8">08 - dub mentality</track>
-      <track id="1847" tid="9">09 - culture move</track>
-      <track id="1848" tid="10">10 - operation eagle lie</track>
-      <track id="1849" tid="11">11 - change</track>
-      <track id="1850" tid="12">12 - tribute to john stevens</track>
-  </group>
-  <group name="ATB">
-    </album>
-    <album aid="153" title="The Fields Of Love (Maxi; feat York)">
-      <track id="1851" tid="1">01 - The Fields Of Love Airplay Mix</track>
-      <track id="1852" tid="2">02 - The Fields Of Love Original Club Mix</track>
-      <track id="1853" tid="3">03 - The Fields Of Love York Remix</track>
-      <track id="1854" tid="4">04 - The Fields Of Love Instrumental</track>
-    </album>
-    <album aid="154" title="The summer (Maxi)">
-      <track id="1855" tid="1">01 - Aiplay mix</track>
-      <track id="1856" tid="2">02 - Clubb mix</track>
-      <track id="1857" tid="3">03 - Instrumental clubb mix</track>
-      <track id="1858" tid="4">04 - Ibiza influence mix</track>
-  </group>
-  <group name="Auktyon">
-    </album>
-    <album aid="155" title="Auktyon & Hvost_Chainik vina">
-      <track id="1859" tid="1">AudioTrack 01</track>
-      <track id="1860" tid="2">AudioTrack 02</track>
-      <track id="1861" tid="3">AudioTrack 03</track>
-      <track id="1862" tid="4">AudioTrack 04</track>
-      <track id="1863" tid="5">AudioTrack 05</track>
-      <track id="1864" tid="6">AudioTrack 06</track>
-      <track id="1865" tid="7">AudioTrack 07</track>
-      <track id="1866" tid="8">AudioTrack 08</track>
-      <track id="1867" tid="9">AudioTrack 09</track>
-      <track id="1868" tid="10">AudioTrack 10</track>
-      <track id="1869" tid="11">AudioTrack 11</track>
-      <track id="1870" tid="12">AudioTrack 12</track>
-    </album>
-    <album aid="156" title="Auktyon & Hvost_Jiletz versin">
-      <track id="1871" tid="1">AudioTrack 01</track>
-      <track id="1872" tid="2">AudioTrack 02</track>
-      <track id="1873" tid="3">AudioTrack 03</track>
-      <track id="1874" tid="4">AudioTrack 04</track>
-      <track id="1875" tid="5">AudioTrack 05</track>
-      <track id="1876" tid="6">AudioTrack 06</track>
-      <track id="1877" tid="7">AudioTrack 07</track>
-      <track id="1878" tid="8">AudioTrack 08</track>
-      <track id="1879" tid="9">AudioTrack 09</track>
-      <track id="1880" tid="10">AudioTrack 10</track>
-      <track id="1881" tid="11">AudioTrack 11</track>
-      <track id="1882" tid="12">AudioTrack 12</track>
-      <track id="1883" tid="13">AudioTrack 13</track>
-      <track id="1884" tid="14">AudioTrack 14</track>
-      <track id="1885" tid="15">AudioTrack 15</track>
-    </album>
-    <album aid="157" title="Auktyon & Leonid Fedorov_Chetirispolovinojtonni">
-      <track id="1886" tid="1">AudioTrack 01</track>
-      <track id="1887" tid="2">AudioTrack 02</track>
-      <track id="1888" tid="3">AudioTrack 03</track>
-      <track id="1889" tid="4">AudioTrack 04</track>
-      <track id="1890" tid="5">AudioTrack 05</track>
-      <track id="1891" tid="6">AudioTrack 06</track>
-      <track id="1892" tid="7">AudioTrack 07</track>
-      <track id="1893" tid="8">AudioTrack 08</track>
-      <track id="1894" tid="9">AudioTrack 09</track>
-      <track id="1895" tid="10">AudioTrack 10</track>
-      <track id="1896" tid="11">AudioTrack 11</track>
-      <track id="1897" tid="12">AudioTrack 12</track>
-      <track id="1898" tid="13">AudioTrack 13</track>
-      <track id="1899" tid="14">AudioTrack 14</track>
-      <track id="1900" tid="15">AudioTrack 15</track>
-      <track id="1901" tid="16">AudioTrack 16</track>
-      <track id="1902" tid="17">AudioTrack 17</track>
-      <track id="1903" tid="18">AudioTrack 18</track>
-    </album>
-    <album aid="158" title="Auktyon_Bodun">
-      <track id="1904" tid="1">AudioTrack 01</track>
-      <track id="1905" tid="2">AudioTrack 02</track>
-      <track id="1906" tid="3">AudioTrack 03</track>
-      <track id="1907" tid="4">AudioTrack 04</track>
-      <track id="1908" tid="5">AudioTrack 05</track>
-      <track id="1909" tid="6">AudioTrack 06</track>
-      <track id="1910" tid="7">AudioTrack 07</track>
-      <track id="1911" tid="8">AudioTrack 08</track>
-      <track id="1912" tid="9">AudioTrack 09</track>
-      <track id="1913" tid="10">AudioTrack 10</track>
-      <track id="1914" tid="11">AudioTrack 11</track>
-    </album>
-    <album aid="159" title="Auktyon_Dobserver">
-      <track id="1915" tid="1">AudioTrack 01</track>
-      <track id="1916" tid="2">AudioTrack 02</track>
-      <track id="1917" tid="3">AudioTrack 03</track>
-      <track id="1918" tid="4">AudioTrack 04</track>
-      <track id="1919" tid="5">AudioTrack 05</track>
-      <track id="1920" tid="6">AudioTrack 06</track>
-      <track id="1921" tid="7">AudioTrack 07</track>
-      <track id="1922" tid="8">AudioTrack 08</track>
-      <track id="1923" tid="9">AudioTrack 09</track>
-      <track id="1924" tid="10">AudioTrack 10</track>
-      <track id="1925" tid="11">AudioTrack 11</track>
-      <track id="1926" tid="12">AudioTrack 12</track>
-      <track id="1927" tid="13">AudioTrack 13</track>
-      <track id="1928" tid="14">AudioTrack 14</track>
-      <track id="1929" tid="15">AudioTrack 15</track>
-      <track id="1930" tid="16">AudioTrack 16</track>
-      <track id="1931" tid="17">AudioTrack 17</track>
-      <track id="1932" tid="18">AudioTrack 18</track>
-    </album>
-    <album aid="160" title="Auktyon_Jopa">
-      <track id="1933" tid="1">AudioTrack 01</track>
-      <track id="1934" tid="2">AudioTrack 02</track>
-      <track id="1935" tid="3">AudioTrack 03</track>
-      <track id="1936" tid="4">AudioTrack 04</track>
-      <track id="1937" tid="5">AudioTrack 05</track>
-      <track id="1938" tid="6">AudioTrack 06</track>
-      <track id="1939" tid="7">AudioTrack 07</track>
-      <track id="1940" tid="8">AudioTrack 08</track>
-      <track id="1941" tid="9">AudioTrack 09</track>
-      <track id="1942" tid="10">AudioTrack 10</track>
-    </album>
-    <album aid="161" title="Auktyon_Kak ja stal predatelem">
-      <track id="1943" tid="1">AudioTrack 01</track>
-      <track id="1944" tid="2">AudioTrack 02</track>
-      <track id="1945" tid="3">AudioTrack 03</track>
-      <track id="1946" tid="4">AudioTrack 04</track>
-      <track id="1947" tid="5">AudioTrack 05</track>
-      <track id="1948" tid="6">AudioTrack 06</track>
-      <track id="1949" tid="7">AudioTrack 07</track>
-      <track id="1950" tid="8">AudioTrack 08</track>
-      <track id="1951" tid="9">AudioTrack 09</track>
-      <track id="1952" tid="10">AudioTrack 10</track>
-    </album>
-    <album aid="162" title="Auktyon_Ptiza">
-      <track id="1953" tid="1">AudioTrack 01</track>
-      <track id="1954" tid="2">AudioTrack 02</track>
-      <track id="1955" tid="3">AudioTrack 03</track>
-      <track id="1956" tid="4">AudioTrack 04</track>
-      <track id="1957" tid="5">AudioTrack 05</track>
-      <track id="1958" tid="6">AudioTrack 06</track>
-      <track id="1959" tid="7">AudioTrack 07</track>
-      <track id="1960" tid="8">AudioTrack 08</track>
-      <track id="1961" tid="9">AudioTrack 09</track>
-      <track id="1962" tid="10">AudioTrack 10</track>
-      <track id="1963" tid="11">AudioTrack 11</track>
-    </album>
-    <album aid="163" title="Auktyon_V Bagdade vse spokojno">
-      <track id="1964" tid="1">AudioTrack 01</track>
-      <track id="1965" tid="2">AudioTrack 02</track>
-      <track id="1966" tid="3">AudioTrack 03</track>
-      <track id="1967" tid="4">AudioTrack 04</track>
-      <track id="1968" tid="5">AudioTrack 05</track>
-      <track id="1969" tid="6">AudioTrack 06</track>
-      <track id="1970" tid="7">AudioTrack 07</track>
-      <track id="1971" tid="8">AudioTrack 08</track>
-  </group>
-  <group name="Autechre">
-    </album>
-    <album aid="164" title="Peel Session">
-      <track id="1972" tid="1">01 - Peel Session</track>
-      <track id="1973" tid="2">02 - Peel Sesion</track>
-      <track id="1974" tid="3">03 - Peel Sesion</track>
-  </group>
-  <group name="Ayla">
-    </album>
-    <album aid="165" title="Ayla part 2 (Maxi)">
-      <track id="1975" tid="1">01 - Radio mix</track>
-      <track id="1976" tid="2">02 - Extended mix</track>
-      <track id="1977" tid="3">03 - Club mix</track>
-      <track id="1978" tid="4">04 - Atmosphere mix</track>
-  </group>
-  <group name="B Real, Busta Rhymes, Coolio, LL Cool J & Method Man">
-    </album>
-    <album aid="166" title="Hit 'em High (The Monstars' Anthem)">
-      <track id="1979" tid="1">(01) Radio Version</track>
-      <track id="1980" tid="2">(02) Extended Mix</track>
-      <track id="1981" tid="3">(03) Extended Track Masters Remix</track>
-      <track id="1982" tid="4">(04) Original Instrumental</track>
-  </group>
-  <group name="B.B. King & Eric Clapton">
-    </album>
-    <album aid="167" title="Riding With The King">
-      <track id="1983" tid="1">01 - Riding With The King</track>
-      <track id="1984" tid="2">02 - Ten Long Years</track>
-      <track id="1985" tid="3">03 - Key To The Highway</track>
-      <track id="1986" tid="4">04 - Marry You</track>
-      <track id="1987" tid="5">05 - Three O'Clock Blues</track>
-      <track id="1988" tid="6">06 - Help The Poor</track>
-      <track id="1989" tid="7">07 - I Wanna Be</track>
-      <track id="1990" tid="8">08 - Worried Life Blues</track>
-      <track id="1991" tid="9">09 - Days Of Old</track>
-      <track id="1992" tid="10">10 - When My Heart Beats Like A Hammer</track>
-      <track id="1993" tid="11">11 - Hold On I'm Coming</track>
-      <track id="1994" tid="12">12 - Come Rain Or Come Shine</track>
-  </group>
-  <group name="Babylon Zoo">
-    </album>
-    <album aid="168" title="The Boy With The X-Ray Eyes">
-      <track id="1995" tid="1">01 - Animal Army</track>
-      <track id="1996" tid="2">02 - Spaceman</track>
-      <track id="1997" tid="3">03 - Zodiac Sign</track>
-      <track id="1998" tid="4">04 - Paris Green</track>
-      <track id="1999" tid="5">05 - Confused Art</track>
-      <track id="2000" tid="6">06 - Caffeine</track>
-      <track id="2001" tid="7">07 - The Boy With The X-Ray Eyes</track>
-      <track id="2002" tid="8">08 - Don't Feed The Animals</track>
-      <track id="2003" tid="9">09 - Fire Guided Light</track>
-      <track id="2004" tid="10">10 - Is Your Soul For Sale</track>
-      <track id="2005" tid="11">11 - I'm Cracking Up I Need A Pill</track>
-  </group>
-  <group name="Bacharach & David They Write The Songs">
-    </album>
-    <album aid="169" title="Bacharach & David They Write The Songs">
-      <track id="2006" tid="1">(There's) Always Something There To Remind Me - Sandie Shaw</track>
-      <track id="2007" tid="2">(They Long To Be) Close To You - Isaac Hayes </track>
-      <track id="2008" tid="3">A House Is Not A Home - Luther Vandross</track>
-      <track id="2009" tid="4">Anyone Who Had A Heart - Luther Vandross</track>
-      <track id="2010" tid="5">Arthur's Theme (Best That You Can Do) - Christopher Cross</track>
-      <track id="2011" tid="6">I Just Don't Know What To Do With Myself - Dusty Springfield</track>
-      <track id="2012" tid="7">I Say A Little Prayer - Aretha Franklin</track>
-      <track id="2013" tid="8">I'll Never Fall In Love Again - Bobby Gentry</track>
-      <track id="2014" tid="9">Make It Easy On Yourself - The Walker Brothers</track>
-      <track id="2015" tid="10">Reach Out For Me - Dionne Warwick</track>
-      <track id="2016" tid="11">The Look Of Love - Dusty Springfield</track>
-      <track id="2017" tid="12">This Guy's In Love With You - Burt Bacharach</track>
-      <track id="2018" tid="13">Trains And Boats And Planes - Billy J Kramer & The Dakotas</track>
-      <track id="2019" tid="14">Walk On By - Dionne Warwick</track>
-      <track id="2020" tid="15">What The World Needs Now Is Love - Jackie De Shannon</track>
-      <track id="2021" tid="16">Windows Of The World - The Pretenders</track>
-      <track id="2022" tid="17">You'll Never Get To Heaven (If You Break My Heart) - The Stylistics</track>
-  </group>
-  <group name="Bad Boys Blue">
-    </album>
-    <album aid="170" title="Super 20">
-      <track id="2023" tid="1">01 - Lady In Black (Radio Edit)</track>
-      <track id="2024" tid="2">02 - Come Back And Stay</track>
-      <track id="2025" tid="3">03 - Gimme, Gimme Your Lovin' (Little Lady)</track>
-      <track id="2026" tid="4">04 - Hungry For Love (Radio Edit)</track>
-      <track id="2027" tid="5">05 - Don't Walk Away, Suzanne</track>
-      <track id="2028" tid="6">06 - L.O.V.E. In My Car</track>
-      <track id="2029" tid="7">07 - You're A Woman</track>
-      <track id="2030" tid="8">08 - A World Without You (Michelle) - Radio Edit</track>
-      <track id="2031" tid="9">09 - I Wanna Hear Your Heartbeat (Sunday Girl)</track>
-      <track id="2032" tid="10">10 - Pretty Young Girl</track>
-      <track id="2033" tid="11">11 - Kisses And Tears (My One And Only)</track>
-      <track id="2034" tid="12">12 - Love Really Hurts Without You</track>
-      <track id="2035" tid="13">13 - Lovers In The Sand</track>
-      <track id="2036" tid="14">14 - Kiss You All Over, Baby (New Version)</track>
-      <track id="2037" tid="15">15 - Hot Girls - Bad Boys</track>
-      <track id="2038" tid="16">16 - One Night In Heaven</track>
-      <track id="2039" tid="17">17 - Baby I Love You</track>
-      <track id="2040" tid="18">18 - Love Is No Crime</track>
-      <track id="2041" tid="19">19 - Inside Of Me</track>
-  </group>
-  <group name="Bad Religion">
-    </album>
-    <album aid="171" title="The Gray Race">
-      <track id="2042" tid="1">01 - The Gray Race</track>
-      <track id="2043" tid="2">02 - Them And Us</track>
-      <track id="2044" tid="3">03 - A Walk</track>
-      <track id="2045" tid="4">04 - Parallel</track>
-      <track id="2046" tid="5">05 - Punk Rock Song</track>
-      <track id="2047" tid="6">06 - Empty Causes</track>
-      <track id="2048" tid="7">07 - Nobody Listens</track>
-      <track id="2049" tid="8">08 - Pitty The Dead</track>
-      <track id="2050" tid="9">09 - Spirit Shine</track>
-      <track id="2051" tid="10">10 - The Streets Of America</track>
-      <track id="2052" tid="11">11 - Ten In 2010</track>
-      <track id="2053" tid="12">12 - Victory</track>
-      <track id="2054" tid="13">13 - Drunk Sincerity</track>
-      <track id="2055" tid="14">14 - Come Join Us</track>
-      <track id="2056" tid="15">15 - Cease</track>
-      <track id="2057" tid="16">16 - Punk Rock Song (In German)</track>
-  </group>
-  <group name="Badesalz">
-    </album>
-    <album aid="172" title="Die wo da so">
-      <track id="2058" tid="1">01 - Weckruf</track>
-      <track id="2059" tid="2">02 - I want your Sex</track>
-      <track id="2060" tid="3">03 - Papa</track>
-      <track id="2061" tid="4">04 - Bako</track>
-      <track id="2062" tid="5">05 - Hassi Janes</track>
-      <track id="2063" tid="6">06 - Operation</track>
-      <track id="2064" tid="7">07 - In der Waschanlach</track>
-      <track id="2065" tid="8">08 - Sound</track>
-      <track id="2066" tid="9">09 - Was glaubst du</track>
-      <track id="2067" tid="10">10 - German Music</track>
-      <track id="2068" tid="11">11 - Papa</track>
-      <track id="2069" tid="12">12 - Immer schlimmer</track>
-      <track id="2070" tid="13">13 - Lichterkette</track>
-      <track id="2071" tid="14">14 - Thomas und Heidi</track>
-      <track id="2072" tid="15">15 - Dixi-Band</track>
-      <track id="2073" tid="16">16 - Bubblegum-Time</track>
-      <track id="2074" tid="17">17 - Richie und Headbanger</track>
-      <track id="2075" tid="18">18 - Schwarz und Weiß</track>
-      <track id="2076" tid="19">19 - 6,50 Sicherheitsgebühr</track>
-      <track id="2077" tid="20">20 - Gesang</track>
-      <track id="2078" tid="21">21 - Wahltag</track>
-      <track id="2079" tid="22">22 - Mabadaja Mabadaga ja</track>
-      <track id="2080" tid="23">23 - Megabreit Computerdeppen</track>
-      <track id="2081" tid="24">24 - Papa</track>
-      <track id="2082" tid="25">25 - Neschperblues</track>
-      <track id="2083" tid="26">26 - Revolte in der Schule</track>
-      <track id="2084" tid="27">27 - Bongo Karl</track>
-      <track id="2085" tid="28">28 - Babu</track>
-      <track id="2086" tid="29">29 - Gereizt</track>
-      <track id="2087" tid="30">30 - Parfüm</track>
-      <track id="2088" tid="31">31 - Halleluja</track>
-      <track id="2089" tid="32">32 - Papa</track>
-      <track id="2090" tid="33">33 - Superdepp</track>
-      <track id="2091" tid="34">34 - Dialog</track>
-      <track id="2092" tid="35">35 - Belgische Äpfel</track>
-      <track id="2093" tid="36">36 - Dressur</track>
-    </album>
-    <album aid="173" title="Wie Mutter und Tochter">
-      <track id="2094" tid="1">01 - viel zu harmlos</track>
-      <track id="2095" tid="2">02 - handy song</track>
-      <track id="2096" tid="3">04 - tamagotchi</track>
-      <track id="2097" tid="4">05 - wetzlar</track>
-      <track id="2098" tid="5">06 - der erste kontakt</track>
-      <track id="2099" tid="6">07 - versprochen</track>
-      <track id="2100" tid="7">08 - gianni</track>
-      <track id="2101" tid="8">09 - pappa vol.17</track>
-      <track id="2102" tid="9">10 - ying und yang</track>
-      <track id="2103" tid="10">11 - styling</track>
-      <track id="2104" tid="11">12 - kasperle gegen drogen</track>
-      <track id="2105" tid="12">13 - der spanische apotheker</track>
-      <track id="2106" tid="13">14 - gute argumente</track>
-      <track id="2107" tid="14">15 - session</track>
-      <track id="2108" tid="15">16 - nachdenklichkeit</track>
-      <track id="2109" tid="16">17 - naturschauspiel</track>
-      <track id="2110" tid="17">18 - schmusebär</track>
-      <track id="2111" tid="18">19 - hobbies</track>
-      <track id="2112" tid="19">20 - bali mach uff!</track>
-      <track id="2113" tid="20">21 - was war das... </track>
-      <track id="2114" tid="21">22 - der kunde ist könig</track>
-      <track id="2115" tid="22">23 - jazz</track>
-      <track id="2116" tid="23">24 - pappa vol.18</track>
-      <track id="2117" tid="24">25 - die hochzeit</track>
-      <track id="2118" tid="25">26 - der neue star</track>
-      <track id="2119" tid="26">27 - route 66</track>
-      <track id="2120" tid="27">28 - ziegenkäsegeschäft</track>
-      <track id="2121" tid="28">29 - mutter und tochter</track>
-      <track id="2122" tid="29">30 - alle jahre wieder</track>
-      <track id="2123" tid="30">31 - besorgt</track>
-      <track id="2124" tid="31">32 - kreuzworträtsel</track>
-      <track id="2125" tid="32">33 - sensibilität</track>
-      <track id="2126" tid="33">34 - die wahrscheinlichkeit</track>
-      <track id="2127" tid="34">35 - f.e.v.a</track>
-      <track id="2128" tid="35">36 - private geheimnisse</track>
-      <track id="2129" tid="36">37 - back for good (leider live)</track>
-    </album>
-    <album aid="174" title="Zarte Metzger">
-      <track id="2130" tid="1">01 - Zarte Metzger</track>
-      <track id="2131" tid="2">02 - Jesu S.</track>
-      <track id="2132" tid="3">03 - Seelachs</track>
-      <track id="2133" tid="4">04 - Aufgespürt</track>
-      <track id="2134" tid="5">05 - Fitneß-Tom</track>
-      <track id="2135" tid="6">06 - Der Brautstrauß</track>
-      <track id="2136" tid="7">07 - Der Rollo</track>
-      <track id="2137" tid="8">08 - Pappa Vol. 15</track>
-      <track id="2138" tid="9">09 - Zivilcourage</track>
-      <track id="2139" tid="10">10 - Kamm tugesser</track>
-      <track id="2140" tid="11">11 - Tobias</track>
-      <track id="2141" tid="12">12 - Radlacka</track>
-      <track id="2142" tid="13">13 - Kevin Costner</track>
-      <track id="2143" tid="14">14 - Moderne Väter</track>
-      <track id="2144" tid="15">15 - 0190634 . . .</track>
-      <track id="2145" tid="16">16 - Dabrauchemergarnetdrübberredde</track>
-      <track id="2146" tid="17">17 - Stones-Revival-Revival</track>
-      <track id="2147" tid="18">18 - Weichei - Das Musical 1. Akt</track>
-      <track id="2148" tid="19">19 - Themenabend</track>
-      <track id="2149" tid="20">20 - Song für Witta Pohl</track>
-      <track id="2150" tid="21">21 - Herr Seiler</track>
-      <track id="2151" tid="22">22 - Duell bei Hanau 1420 (Orginal-Aufnahme)</track>
-      <track id="2152" tid="23">23 - Pappa Vol. 16</track>
-      <track id="2153" tid="24">24 - Kippen holen</track>
-      <track id="2154" tid="25">25 - Wie bei Axel</track>
-      <track id="2155" tid="26">26 - Die Demo</track>
-      <track id="2156" tid="27">27 - Sin kaa breetsche da</track>
-      <track id="2157" tid="28">28 - Natur</track>
-      <track id="2158" tid="29">29 - Die Gaby und Ich</track>
-      <track id="2159" tid="30">30 - Glück gehabt</track>
-      <track id="2160" tid="31">31 - Weichei - Das Musical 3. Akt</track>
-      <track id="2161" tid="32">32 - Der Wettkönig</track>
-      <track id="2162" tid="33">33 - Waldfest</track>
-      <track id="2163" tid="34">34 - Tierfreunde</track>
-      <track id="2164" tid="35">35 - Der australische Freund</track>
-      <track id="2165" tid="36">36 - Du</track>
-  </group>
-  <group name="Bahamadia">
-    </album>
-    <album aid="175" title="Kollage">
-      <track id="2166" tid="1">01-Intro</track>
-      <track id="2167" tid="2">02-Word Play</track>
-      <track id="2168" tid="3">03-Spontaneity</track>
-      <track id="2169" tid="4">04-Rugged ruff</track>
-      <track id="2170" tid="5">05-Interlude</track>
-      <track id="2171" tid="6">06-I confess</track>
-      <track id="2172" tid="7">07-UKNOWHOWWEDU</track>
-      <track id="2173" tid="8">08-Interlude</track>
-      <track id="2174" tid="9">09-Total wreck</track>
-      <track id="2175" tid="10">10-Innovation</track>
-      <track id="2176" tid="11">11-Da jawn</track>
-      <track id="2177" tid="12">12-Interlude</track>
-      <track id="2178" tid="13">13-True honey buns (dat freak sht)</track>
-      <track id="2179" tid="14">14-3 tha hard way</track>
-      <track id="2180" tid="15">15-Biggest part of me</track>
-      <track id="2181" tid="16">16-Path to rhythm</track>
-  </group>
-  <group name="Baka Beyond">
-    </album>
-    <album aid="176" title="Spirit of the forest">
-      <track id="2182" tid="1">1 - Spirit of the forest</track>
-      <track id="2183" tid="2">2 - The man who danced too slowly</track>
-      <track id="2184" tid="3">3 - Ngombi</track>
-      <track id="2185" tid="4">4 - Baka play baka</track>
-      <track id="2186" tid="5">5 - Nahwia</track>
-      <track id="2187" tid="6">6 - Eeya be</track>
-      <track id="2188" tid="7">7 - Canya Jam</track>
-      <track id="2189" tid="8">8 - Bounaka</track>
-  </album>
-</group>
-</catalogue>
diff --git a/contrib/retep/retep.jpx b/contrib/retep/retep.jpx
deleted file mode 100644
index dcf68ac8ce..0000000000
--- a/contrib/retep/retep.jpx
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--JBuilder XML Project-->
-<project>
-  <property category="idl" name="ProcessIDL" value="false" />
-  <property category="runtime.0" name="RunnableType" value="com.borland.jbuilder.runtime.ApplicationRunner" />
-  <property category="runtime.0" name="application.class" value="uk.org.retep.util.hba.Main" />
-  <property category="runtime.0" name="application.parameters" value="-d2 pg_hba.conf" />
-  <property category="runtime.0" name="appserver.ejbJarsSaved" value="1" />
-  <property category="runtime.0" name="appserver.parameters" value="-jts -jns -jss -jdb" />
-  <property category="runtime.0" name="appserver.servername" value="ejbcontainer" />
-  <property category="runtime.0" name="appserver.vmparameters" value="" />
-  <property category="runtime.0" name="jsprunner.docbase" value="." />
-  <property category="runtime.0" name="jsprunner.jspfile" value="E%|/docs/java/xml/example6" />
-  <property category="sys" name="AuthorLabel" value="@author" />
-  <property category="sys" name="BackupPath" value="bak" />
-  <property category="sys" name="BeansInstantiate" value="false" />
-  <property category="sys" name="BraceStyle" value="1" />
-  <property category="sys" name="CheckStable" value="1" />
-  <property category="sys" name="Company" value="" />
-  <property category="sys" name="CompanyLabel" value="Company:" />
-  <property category="sys" name="Copyright" value="Copyright (c) 2001" />
-  <property category="sys" name="CopyrightLabel" value="Copyright:" />
-  <property category="sys" name="DefaultPackage" value="uk.org.retep.util.misc" />
-  <property category="sys" name="Description" value="" />
-  <property category="sys" name="DescriptionLabel" value="Description:" />
-  <property category="sys" name="DocPath" value="doc" />
-  <property category="sys" name="EventMatch" value="false" />
-  <property category="sys" name="EventStyle" value="1" />
-  <property category="sys" name="ExcludeClassEnabled" value="0" />
-  <property category="sys" name="InstanceVisibility" value="0" />
-  <property category="sys" name="JDK" value="java 1.3.0-C" />
-  <property category="sys" name="LastTag" value="0" />
-  <property category="sys" name="Libraries" value="JAXP;Oracle JDBC;JDK1.3 JRE" />
-  <property category="sys" name="MakeStable" value="0" />
-  <property category="sys" name="OutPath" value="build" />
-  <property category="sys" name="SourcePath" value="." />
-  <property category="sys" name="Title" value="" />
-  <property category="sys" name="TitleLabel" value="Title:" />
-  <property category="sys" name="Version" value="1.0" />
-  <property category="sys" name="VersionLabel" value="@version" />
-  <property category="sys" name="WorkingDirectory" value="." />
-  <node type="Package" name="uk.org.retep.dtu" />
-  <node type="Package" name="uk.org.retep.tools" />
-  <node type="Package" name="uk.org.retep.util" />
-  <node type="Package" name="uk.org.retep.xml.core" />
-  <node type="Package" name="uk.org.retep.xml.jdbc" />
-  <node type="Package" name="uk.org.retep.xml.parser" />
-  <file path="build.xml" />
-  <file path="CHANGELOG" />
-  <file path="Implementation" />
-  <file path="uk/org/retep/util/models/PropertiesTableModel.java" />
-  <file path="README" />
-</project>
-
diff --git a/contrib/retep/uk/org/retep/dtu/DCollection.java b/contrib/retep/uk/org/retep/dtu/DCollection.java
deleted file mode 100644
index e97fc067c4..0000000000
--- a/contrib/retep/uk/org/retep/dtu/DCollection.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package uk.org.retep.dtu;
-
-import uk.org.retep.xml.core.XMLFactory;
-import uk.org.retep.xml.core.XMLFactoryException;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Iterator;
-
-public class DCollection implements Collection
-{
-  protected int num,max,inc;
-
-  protected DElement elements[];
-
-  public DCollection()
-  {
-    this(10);
-  }
-
-  public DCollection(int aIncrement)
-  {
-    num=0;
-    max=0;
-    inc=aIncrement;
-    elements=null;
-  }
-
-  protected void resize()
-  {
-    if(num>=max) {
-      max+=inc;
-      DElement n[] = new DElement[max];
-      if(elements!=null) {
-        System.arraycopy(elements,0,n,0,elements.length);
-      }
-      elements=n;
-    }
-  }
-
-  public int size()
-  {
-    return num;
-  }
-
-  public boolean isEmpty()
-  {
-    return (num==0);
-  }
-
-  /**
-   * Checks the list using it's XML id.
-   */
-  public synchronized boolean contains(Object parm1)
-  {
-    if(parm1 instanceof DElement) {
-      DElement e = (DElement) parm1;
-      int ei = e.getID();
-
-      // out of range?
-      if(ei<0 || ei>=num)
-        return false;
-
-      return elements[ei].equals(e);
-    }
-
-    return false;
-  }
-
-  public Iterator iterator()
-  {
-    return new iterator(this);
-  }
-
-  /**
-   * Inner class to implement an Iterator
-   */
-  protected class iterator implements Iterator
-  {
-    protected DCollection c;
-    protected int i;
-
-    public iterator(DCollection aCollection)
-    {
-      c=aCollection;
-      i=0;
-    }
-
-    public boolean hasNext()
-    {
-      return i<c.size();
-    }
-
-    public Object next() {
-      return c.getElement(i++);
-    }
-
-    public void remove() {
-    }
-  }
-
-  public synchronized Object[] toArray()
-  {
-    Object o[] = new Object[num];
-    System.arraycopy(elements,0,o,0,num);
-    return o;
-  }
-
-  public Object[] toArray(Object[] parm1)
-  {
-    /**@todo: Implement this java.util.Collection method*/
-    throw new java.lang.UnsupportedOperationException("Method toArray() not yet implemented.");
-  }
-
-  /**
-   * Adds a node to the Collection, and sets it's ID to its position in the Collection
-   */
-  public synchronized boolean add(Object parm1)
-  {
-    if(parm1 instanceof DElement) {
-      DElement e = (DElement) parm1;
-
-      // Do nothing if it's already in a Collection
-      if(e.getID()>-1) {
-        return false;
-      }
-
-      // Add to the Collection
-      resize();
-      e.setID(num);
-      elements[num++] = e;
-      return true;
-    }
-    return false;
-  }
-
-  public synchronized boolean remove(Object parm1)
-  {
-    if(parm1 instanceof DElement) {
-      DElement e = (DElement) parm1;
-      int ei = e.getID();
-      if(ei<0 || ei>=num)
-        return false;
-
-      // Mark the node as parentless
-      e.setID(-1);
-
-      // Now remove from the array by moving latter nodes, fixing their ids
-      // in the process
-      for(int j=ei,k=ei+1;k<num;j++,k++) {
-        elements[j]=elements[k];
-        elements[j].setID(j);
-      }
-      num--;
-      return true;
-    }
-
-    return false;
-  }
-
-  public boolean containsAll(Collection parm1)
-  {
-    /**@todo: Implement this java.util.Collection method*/
-    throw new java.lang.UnsupportedOperationException("Method containsAll() not yet implemented.");
-  }
-
-  public boolean addAll(Collection parm1)
-  {
-    /**@todo: Implement this java.util.Collection method*/
-    throw new java.lang.UnsupportedOperationException("Method addAll() not yet implemented.");
-  }
-
-  public boolean removeAll(Collection parm1)
-  {
-    /**@todo: Implement this java.util.Collection method*/
-    throw new java.lang.UnsupportedOperationException("Method removeAll() not yet implemented.");
-  }
-
-  public boolean retainAll(Collection parm1)
-  {
-    /**@todo: Implement this java.util.Collection method*/
-    throw new java.lang.UnsupportedOperationException("Method retainAll() not yet implemented.");
-  }
-
-  public synchronized void clear()
-  {
-    // Mark each node as parentless
-    for(int i=0;i<num;i++) {
-      elements[i].setID(-1);
-    }
-
-    // dispose the array
-    num=0;
-    max=0;
-    elements=null;
-  }
-
-  /**
-   * Returns the element with supplied id.
-   * @return element or null
-   */
-  public synchronized DElement getElement(int id)
-  {
-    if(id<0 || id>=num)
-      return null;
-
-    return elements[id];
-  }
-
-  /**
-   * Repairs the collection, ensuring all id's are correct
-   */
-  public synchronized void repair()
-  {
-    for(int i=0;i<num;i++) {
-      elements[i].setID(i);
-    }
-  }
-
-  public synchronized void saveXML(XMLFactory aFactory)
-  throws IOException, XMLFactoryException
-  {
-    for(int i=0;i<num;i++) {
-      elements[i].saveXML(aFactory);
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/dtu/DConstants.java b/contrib/retep/uk/org/retep/dtu/DConstants.java
deleted file mode 100644
index fb825d735b..0000000000
--- a/contrib/retep/uk/org/retep/dtu/DConstants.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package uk.org.retep.dtu;
-
-public class DConstants
-{
-  /**
-   * A global version number
-   */
-  public static final String XML_VERSION_ID = "V7.1-2001-02-26";
-
-  /**
-   * XML Tag names
-   */
-  public static final String XML_DISPLAYNAME= "DISPLAYNAME";
-  public static final String XML_FROM       = "FROM";
-  public static final String XML_ID         = "ID";
-  public static final String XML_MODULE     = "MODULE";
-  public static final String XML_NODE       = "NODE";
-  public static final String XML_TO         = "TO";
-  public static final String XML_TRANSFORM  = "TRANSFORM";
-  public static final String XML_TYPE       = "TYPE";
-  public static final String XML_VERSION    = "VERSION";
-  public static final String XML_X          = "X";
-  public static final String XML_Y          = "Y";
-
-  public static final int NOP       = 0;      // No operation or always run transform
-  public static final int SUCCESS   = 1;      // Run transform only if DNode.OK
-  public static final int ERROR     = 2;      // Run transform only if DNode.ERROR
-
-  /**
-   * Node types 20-39 reserved for Transformation types
-   */
-  public static final int TRANSFORMBASE = 20;
-
-  /**
-   * Node types 20-99 reserved for Internal Node implementations
-   */
-  public static final int INTERNALBASE = 50;
-
-  /**
-   * Node types 100+ are for user extensions
-   */
-  public static final int USERBASE  = 100;
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/dtu/DElement.java b/contrib/retep/uk/org/retep/dtu/DElement.java
deleted file mode 100644
index 73fa7e87e8..0000000000
--- a/contrib/retep/uk/org/retep/dtu/DElement.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package uk.org.retep.dtu;
-
-import uk.org.retep.xml.core.XMLFactory;
-import uk.org.retep.xml.core.XMLFactoryException;
-
-import java.io.IOException;
-
-public interface DElement
-{
-  /**
-   * Fetch the unique ID of this Element
-   */
-  public int getID();
-
-  /**
-   * Sets the unique id - normally set by DCollection
-   */
-  public void setID(int id);
-
-  /**
-   * @return the type of the Element
-   */
-  public int getType();
-
-  /**
-   * Set's the element type
-   */
-  public void setType(int aType);
-
-  public void saveXML(XMLFactory aFactory) throws IOException, XMLFactoryException;
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/dtu/DEnvironment.java b/contrib/retep/uk/org/retep/dtu/DEnvironment.java
deleted file mode 100644
index 2efcfe81a1..0000000000
--- a/contrib/retep/uk/org/retep/dtu/DEnvironment.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package uk.org.retep.dtu;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-
-public class DEnvironment
-{
-  protected HashMap dsrc;
-
-  public DEnvironment()
-  {
-    dsrc=new HashMap();
-  }
-
-  public void addDataSource(String aKey,Object aObject)
-  {
-    dsrc.put(aKey,aObject);
-  }
-
-  public Object getDataSource(String aKey)
-  {
-    return dsrc.get(aKey);
-  }
-
-  public Iterator getDataSources()
-  {
-    return dsrc.values().iterator();
-  }
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/dtu/DModule.java b/contrib/retep/uk/org/retep/dtu/DModule.java
deleted file mode 100644
index 21d037f267..0000000000
--- a/contrib/retep/uk/org/retep/dtu/DModule.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package uk.org.retep.dtu;
-
-import uk.org.retep.xml.core.XMLFactory;
-import uk.org.retep.xml.core.XMLFactoryException;
-import uk.org.retep.xml.parser.TagListener;
-import uk.org.retep.util.Logger;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Iterator;
-
-/**
- * DModule represents a programatic module of steps used within the DTU
- */
-public class DModule implements Serializable
-{
-  // The nodes and transitions between them
-  protected DCollection nodes;
-
-  protected String displayName;
-
-  public static final String DEFAULT_DISPLAYNAME = "unnamed module";
-
-  public DModule()
-  {
-    nodes=new DCollection();
-    displayName=DEFAULT_DISPLAYNAME;
-    Logger.log(Logger.DEBUG,"new DModule",this);
-  }
-
-  // Expensive!
-  public DNode getNode(int id)
-  {
-    return (DNode) nodes.getElement(id);
-  }
-
-  public DNode addNode(DNode aNode)
-  {
-    Logger.log(Logger.DEBUG,"DModule.addNode",aNode);
-    nodes.add(aNode);
-    return aNode;
-  }
-
-  public void removeNode(DNode aNode)
-  {
-    Logger.log(Logger.DEBUG,"DModule.removeNode",aNode);
-    nodes.remove(aNode);
-  }
-
-  public void clear()
-  {
-    Logger.log(Logger.DEBUG,"DModule.clear",this);
-    nodes.clear();
-  }
-
-  public void setDisplayName(String aName)
-  {
-    Logger.log(Logger.DEBUG,"DModule.setDisplayName",aName);
-    displayName = aName;
-  }
-
-  public String getDisplayName()
-  {
-    return displayName;
-  }
-
-  public Iterator iterator()
-  {
-    return nodes.iterator();
-  }
-
-  /**
-   * Writes an XML representation of this module to an XMLFactory. The caller
-   * must close the factory after use!
-   */
-  public synchronized void saveXML(XMLFactory aFactory)
-  throws IOException, XMLFactoryException
-  {
-    Logger.log(Logger.DEBUG,"DModule.saveXML start",this);
-    Iterator it;
-
-    aFactory.startTag(DConstants.XML_MODULE);
-    aFactory.addAttribute(DConstants.XML_DISPLAYNAME,displayName);
-    aFactory.addAttribute(DConstants.XML_VERSION,DConstants.XML_VERSION_ID);
-
-    // The nodes
-    nodes.saveXML(aFactory);
-
-    // The transforms
-    //trans.saveXML(aFactory);
-
-    aFactory.endTag(); // MODULE
-    Logger.log(Logger.DEBUG,"DModule.saveXML end",this);
-  }
-
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/dtu/DModuleXML.java b/contrib/retep/uk/org/retep/dtu/DModuleXML.java
deleted file mode 100644
index 31552cd8d7..0000000000
--- a/contrib/retep/uk/org/retep/dtu/DModuleXML.java
+++ /dev/null
@@ -1,233 +0,0 @@
-package uk.org.retep.dtu;
-
-import uk.org.retep.xml.core.XMLFactory;
-import uk.org.retep.xml.core.XMLFactoryException;
-import uk.org.retep.xml.parser.TagHandler;
-import uk.org.retep.xml.parser.TagListener;
-import uk.org.retep.util.Logger;
-
-import java.io.CharArrayWriter;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.ArrayList;
-
-import org.xml.sax.InputSource;
-import org.xml.sax.Parser;
-import org.xml.sax.SAXException;
-import javax.xml.parsers.ParserConfigurationException;
-
-public class DModuleXML implements TagListener
-{
-  protected TagHandler handler;
-
-  protected DModule module = null;
-  protected DNode node = null;
-  protected DTransform trans = null;
-
-  protected ArrayList txmap;
-
-  public DModuleXML()
-  {
-    handler = new TagHandler();
-    handler.addTagListener(this);
-
-    txmap = new ArrayList();
-
-    Logger.log(Logger.DEBUG,"DModuleXML initialised");
-  }
-
-  public TagHandler getTagHandler()
-  {
-    return handler;
-  }
-
-  /**
-   * Used to optimise the switch handling in tagStart.
-   *
-   * The values of each T_* constant must match the corresponding element no
-   * in the tags static array.
-   */
-  private static final int T_DEFAULT=-1;
-  private static final int T_MODULE =0;
-  private static final int T_NODE   =1;
-  private static final int T_TRANS  =2;
-  private static final String tags[] = {
-    DConstants.XML_MODULE,
-    DConstants.XML_NODE,
-    DConstants.XML_TRANSFORM
-  };
-
-  /**
-   * This is called when a tag has just been started.
-   * <p><b>NB:</b> args is volatile, so if you use it beyond the lifetime of
-   * this call, then you must make a copy of the HashMap (and not use simply
-   * store this HashMap).
-   * @param level The number of tags above this
-   * @param tag The tag name
-   * @param args A HashMap of any arguments
-   */
-  public void tagStart(int level,String tag,HashMap args)
-  {
-    Logger.log(Logger.DEBUG,"DModuleXML.tagStart",tag);
-
-    // Prefetch some common attributes
-    String sType = (String) args.get(DConstants.XML_TYPE);
-    String sX = (String) args.get(DConstants.XML_X);
-    String sY = (String) args.get(DConstants.XML_Y);
-
-    int type=-1,x=-1,y=-1;
-
-    if(sType!=null) {
-      type = Integer.parseInt(sType);
-    }
-
-    if(sX!=null) {
-      y = Integer.parseInt(sX);
-    }
-
-    if(sY!=null) {
-      x = Integer.parseInt(sY);
-    }
-
-    // Match the tag against the tags array (used for switch() )
-    int tagID=T_DEFAULT;
-    for(int i=0;i<tags.length;i++) {
-      if(tag.equals(tags[i])) {
-        tagID=i;
-      }
-    }
-
-    switch(tagID)
-      {
-          // The main module tag
-        case T_MODULE:
-          module = new DModule();
-
-          String sDisplayName = (String) args.get(DConstants.XML_DISPLAYNAME);
-          if(sDisplayName!=null) {
-            module.setDisplayName(sDisplayName);
-          }
-          break;
-
-          // Basic nodes
-        case T_NODE:
-          node = new DNode();
-          node.setType(type);
-          module.addNode(node);
-          break;
-
-          // Basic transforms
-        case T_TRANS:
-          trans = new DTransform();
-          trans.setType(type);
-
-          // When finished we fix the transforms
-          int to = Integer.parseInt((String) args.get(DConstants.XML_TO));
-          txmap.add(new tx(node,trans,to));
-
-          break;
-
-        default:
-          // ignore unknown tags for now
-          break;
-      }
-  }
-
-  protected class tx
-  {
-    public DNode node;
-    public DTransform transform;
-    public int toID;
-
-    public tx(DNode aNode,DTransform aTransform,int aID)
-    {
-      node=aNode;
-      transform=aTransform;
-      toID=aID;
-    }
-  }
-
-  /**
-   * This method is called by ContHandler to process a tag once it has been
-   * fully processed.
-   * <p><b>NB:</b> content is volatile, so you must copy its contents if you use
-   * it beyond the lifetime of this call.
-   * @param content CharArrayWriter containing the content of the tag.
-   */
-  public void tagContent(CharArrayWriter content)
-  {
-    // Ignore
-  }
-
-  public void fixTransforms()
-  {
-    DNode     to;
-    Iterator  it = txmap.iterator();
-
-    while(it.hasNext()) {
-      tx x = (tx) it.next();
-
-      //Logger.log(Logger.DEBUG,"Fixing transform "+x.toID,x.transform,Integer.toString(x.node.getID()),Integer.toString(module.getNode(x.toID).getID()));
-      to    = module.getNode(x.toID);
-
-      x.transform.setFrom(x.node);
-      x.transform.setTo(to);
-      //to.setFrom(x.transform);
-    }
-
-  }
-
-  /**
-   * Parse an InputSource and return the contained module.
-   * @return DModule loaded, null if the xml file does not contain a module.
-   */
-  public DModule parse(InputSource is)
-  throws IOException,SAXException
-  {
-    getTagHandler().parse(is);
-    fixTransforms();
-    return module;
-  }
-
-  /**
-   * Parse an uri and return the contained module.
-   * @return DModule loaded, null if the xml file does not contain a module.
-   */
-  public DModule parse(String uri)
-  throws IOException,SAXException
-  {
-    getTagHandler().parse(uri);
-    fixTransforms();
-    return module;
-  }
-
-  /**
-   * Debug test - read xml from one file and save to another.
-   */
-  public static void main(String args[]) throws Exception
-  {
-    if(args.length!=2) {
-      System.err.println("Syntax: java DModuleXML in-file out-file");
-      System.exit(1);
-    }
-
-    Logger.setLevel(Logger.DEBUG);
-
-    Logger.log(Logger.INFO,"DModuleXML Read test1.xml");
-    DModuleXML dm = new DModuleXML();
-    DModule module = dm.parse(new InputSource(new FileInputStream(args[0])));
-
-    Logger.log(Logger.INFO,"Parse complete");
-
-    Logger.log(Logger.INFO,"DModuleXML Write XML");
-    FileWriter fw = new FileWriter(args[1]);
-    module.saveXML(new XMLFactory(fw));
-    fw.close();
-    Logger.log(Logger.INFO,"Write complete");
-
-    DProcessor.run(module);
-  }
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/dtu/DNode.java b/contrib/retep/uk/org/retep/dtu/DNode.java
deleted file mode 100644
index 7a8321741c..0000000000
--- a/contrib/retep/uk/org/retep/dtu/DNode.java
+++ /dev/null
@@ -1,233 +0,0 @@
-package uk.org.retep.dtu;
-
-import uk.org.retep.util.Logger;
-import uk.org.retep.xml.core.XMLFactory;
-import uk.org.retep.xml.core.XMLFactoryException;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Iterator;
-
-/**
- * This is the base class for all nodes.
- */
-public class DNode implements DElement, Serializable
-{
-  // The id of this node
-  protected int id;
-
-  // The type of this node
-  protected int type;
-
-  protected int x,y;
-
-  public static final int OK      = 0;  // Node last ran fine
-  public static final int ERROR   = 1;  // Node failed on last run
-
-  /**
-   * This type of node does nothing
-   */
-  public static int NOP   = 0; // No action
-
-  public DNode()
-  {
-    this(NOP);
-  }
-
-  public DNode(int aType)
-  {
-    id=-1;
-    type=aType;
-
-    // Init the transform linkage
-    mf=mt=5;
-    nf=nt=0;
-    fn = new DTransform[mf];
-    tn = new DTransform[mt];
-
-    Logger.log(Logger.DEBUG,"new DNode");
-  }
-
-  public int getID()
-  {
-    return id;
-  }
-
-  public void setID(int aID)
-  {
-    id=aID;
-    Logger.log(Logger.DEBUG,"DNode.setID",aID);
-  }
-
-  public int getType()
-  {
-    return type;
-  }
-
-  public void setType(int aType)
-  {
-    type=aType;
-    Logger.log(Logger.DEBUG,"DNode.setType",aType);
-  }
-
-  /**
-   */
-  public void saveXML(XMLFactory aFactory)
-  throws IOException, XMLFactoryException
-  {
-    Logger.log(Logger.DEBUG,"DNode.saveXML start",this);
-    Iterator it;
-
-    aFactory.startTag(DConstants.XML_NODE);
-    aFactory.addAttribute(DConstants.XML_ID,new Integer(getID()));
-    aFactory.addAttribute(DConstants.XML_TYPE,new Integer(getType()));
-
-    // used for display only
-    aFactory.addAttribute(DConstants.XML_X,new Integer(getX()));
-    aFactory.addAttribute(DConstants.XML_Y,new Integer(getY()));
-
-    // Save the transforms here (only the from list required)
-    for(int i=0;i<nf;i++) {
-      fn[i].saveXML(aFactory);
-    }
-
-    aFactory.endTag(); // NODE
-    Logger.log(Logger.DEBUG,"DNode.saveXML finish",this);
-  }
-
-  public void setPosition(int aX,int aY)
-  {
-    x=aX;
-    y=aY;
-  }
-
-  public int getX()
-  {
-    return x;
-  }
-
-  public int getY()
-  {
-    return y;
-  }
-
-  public void setX(int aX)
-  {
-    x=aX;
-  }
-
-  public void setY(int aY)
-  {
-    y=aY;
-  }
-
-  /**
-   * This must be overidden to do something
-   * @return Return status
-   */
-  public int run(DEnvironment env)
-  {
-    return OK;
-  }
-
-  /**
-   * Node Transforms...
-   */
-  protected int nf,mf,nt,mt;
-  protected DTransform fn[],tn[];
-
-  /**
-   * Executes the transform
-   */
-  public DTransform getTransform(int aID)
-  {
-    return tn[aID];
-  }
-
-  /**
-   * @return number of transforms
-   */
-  public int getFromTransforms()
-  {
-    return nf;
-  }
-
-  /**
-   * @return number of transforms
-   */
-  public int getToTransforms()
-  {
-    return nt;
-  }
-
-  /**
-   * Adds a transform to this node (called by DTransform)
-   */
-  protected synchronized void setFrom(DTransform aTransform)
-  {
-    for(int i=0;i<nf;i++) {
-      if(fn[i].equals(aTransform)) {
-        return;
-      }
-    }
-    if(nf>=mf) {
-      mf+=5;
-      DTransform nn[] = new DTransform[mf];
-      System.arraycopy(fn,0,nn,0,nf);
-      fn=nn;
-    }
-    fn[nf++]=aTransform;
-  }
-
-  /**
-   * Adds a transform to this node (called by DTransform)
-   */
-  protected synchronized void setTo(DTransform aTransform)
-  {
-    for(int i=0;i<nt;i++) {
-      if(tn[i].equals(aTransform)) {
-        return;
-      }
-    }
-    if(nt>=mt) {
-      mt+=5;
-      DTransform nn[] = new DTransform[mt];
-      System.arraycopy(tn,0,nn,0,nt);
-      tn=nn;
-    }
-    tn[nt++]=aTransform;
-  }
-
-  /**
-   * Removes a transform (called by DTransform)
-   */
-  protected synchronized void removeFrom(DTransform aTransform)
-  {
-    for(int i=0;i<nf;i++) {
-      if(tn[i].equals(aTransform)) {
-        for(int j=i+1;j<nf;j++,i++) {
-          fn[i]=fn[j];
-        }
-        nf--;
-        return;
-      }
-    }
-  }
-
-  /**
-   * Removes a transform (called by DTransform)
-   */
-  protected synchronized void removeTo(DTransform aTransform)
-  {
-    for(int i=0;i<nt;i++) {
-      if(tn[i].equals(aTransform)) {
-        for(int j=i+1;j<nt;j++,i++) {
-          tn[i]=tn[j];
-        }
-        nt--;
-        return;
-      }
-    }
-  }
-
-}
diff --git a/contrib/retep/uk/org/retep/dtu/DProcessor.java b/contrib/retep/uk/org/retep/dtu/DProcessor.java
deleted file mode 100644
index 7745a18484..0000000000
--- a/contrib/retep/uk/org/retep/dtu/DProcessor.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package uk.org.retep.dtu;
-
-import uk.org.retep.util.Logger;
-
-import java.util.Iterator;
-
-/**
- * This class processes a Module. It's implemented as a Thread and there can
- * be many threads running on a single module
- */
-public class DProcessor
-{
-  /**
-   * This starts a module
-   */
-  public static DProcessor run(DModule aModule) {
-    // 3600000 is 1 hour in milliseconds
-    return run(aModule,3600000);
-  }
-
-  /**
-   * This starts a module
-   */
-  public static DProcessor run(DModule aModule,long timeout) {
-    return new DProcessor(aModule,timeout);
-  }
-
-  protected DProcessor(DModule aModule,long timeout) {
-    ThreadGroup group = new ThreadGroup(aModule.getDisplayName()+" DProcessor");
-
-    // Setup the environment
-    DEnvironment env = new DEnvironment();
-
-    // loop for any nodes without a transform pointing _to_ it.
-    Iterator it = aModule.iterator();
-    while(it.hasNext()) {
-      DNode node = (DNode) it.next();
-
-      // Only start if we have no predecessor
-      if(node.getFromTransforms()==0) {
-        proc proc = new proc(group,aModule,node,env);
-        proc.start();
-      }
-    }
-
-    // Now wait until all the threads have finished
-    boolean running=true;
-    try {
-      int cnt=1; // must loop at least once!
-
-      while(cnt>0) {
-        int numThreads = group.activeCount();
-        Thread threads[] = new Thread[numThreads];
-        cnt = group.enumerate(threads,false);
-
-        //Logger.log(Logger.DEBUG,"Waiting on threads",cnt);
-        while(cnt>0) {
-          //Logger.log(Logger.DEBUG,"Waiting on thread",cnt);
-          threads[--cnt].join(timeout);
-        }
-
-        Logger.log(Logger.DEBUG,"All threads appear to have died, retesting");
-      }
-    } catch(InterruptedException ie) {
-      Logger.log(Logger.ERROR,"DProcessor, exception caught while waiting for threads to die",ie);
-    }
-
-    // finally close any open datasources
-    Logger.log(Logger.DEBUG,"DProcessor cleanup");
-
-    Logger.log(Logger.DEBUG,"DProcessor finished");
-  }
-
-  class proc implements Runnable
-  {
-    protected DModule module; // The module being run
-    protected DNode   pc;     // current Program Counter
-
-    protected DEnvironment env; // Shared environment
-
-    // Used when launching new threads only
-    protected DTransform trans; // If not null, a transform to run first
-    protected int status;
-
-    protected Thread thread;
-
-    /**
-     * Start processing from DNode aNode. This is called by DProcessor at
-     * initialisation only.
-     */
-    protected proc(ThreadGroup aGroup,DModule aModule,DNode aNode,DEnvironment aEnv)
-    {
-      // aGroup will be null when forking...
-      if(aGroup==null) {
-        thread = new Thread(this);
-      } else {
-        thread = new Thread(aGroup,this);
-      }
-
-      module = aModule;
-      pc = aNode;
-      env = aEnv;
-    }
-
-    /**
-     * Start processing the DTransform aTransform from aNode (does not execute
-     * the node). This is called by this inner class itself when forking new
-     * threads.
-     */
-    protected proc(DModule aModule,DNode aNode,DEnvironment aEnv,DTransform aTransform,int aStatus)
-    {
-      this(null,aModule,aNode,aEnv);
-      trans = aTransform;
-      status = aStatus;
-    }
-
-    /**
-     * Start this thread
-     */
-    public void start()
-    {
-      thread.start();
-    }
-
-    public void run()
-    {
-      // Handle an initial transform first. It's used when a new Thread was created.
-      if(trans!=null) {
-        transform(trans,false,status);
-        trans=null;
-      }
-
-      while(pc!=null) {
-        //Logger.log(Logger.DEBUG,"running node ",pc.getID());
-
-        // Process the node
-        int status = pc.run(env);
-        //Logger.log(Logger.DEBUG,"      status ",status);
-
-        // Now the transforms. This thread continues with the first one that runs,
-        // but any others that will also run will do so in their own thread.
-        // If no transform runs (or there are none), then the thread will die.
-        int numTrans = pc.getToTransforms();
-        boolean fork=false;
-        for(int i=0;i<numTrans;i++) {
-          fork = transform(pc.getTransform(i),fork,status);
-          //Logger.log(Logger.DEBUG,"fork",fork?"true":"false");
-        }
-        //Logger.log(Logger.DEBUG,"fork",fork?"true":"false");
-        if(!fork) {
-          // No transforms ran, so we quit this thread
-          pc=null;
-        }
-
-        // This lets the other threads a chance to run
-        Thread.yield();
-      }
-    }
-
-    /**
-     * This executes a transform
-     * @param aTransform DTransform to execute
-     * @param fork true then a new process is triggered
-     * @param status The return status of the previous node
-     * @return true if the transform ran or a fork occured.
-     */
-    public boolean transform(DTransform aTransform,boolean fork,int status)
-    {
-      // Check to see if the transform will run (based on the calling nodes return
-      // status
-      if(!aTransform.willRun(status,env)) {
-        return false;
-      }
-
-      if(fork) {
-        // Create the new processor but this time we want a transform to run
-        proc proc = new proc(module,pc,env,aTransform,status);
-        return true;
-      }
-
-      if(aTransform.run(env)) {
-        pc=aTransform.getTo();
-        return true;
-      }
-
-      return false;
-    }
-
-  } // class proc
-
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/dtu/DTransform.java b/contrib/retep/uk/org/retep/dtu/DTransform.java
deleted file mode 100644
index 88aac19768..0000000000
--- a/contrib/retep/uk/org/retep/dtu/DTransform.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package uk.org.retep.dtu;
-
-import uk.org.retep.xml.core.XMLFactory;
-import uk.org.retep.xml.core.XMLFactoryException;
-
-import java.io.IOException;
-
-/**
- * This manages the links between two nodes.
- */
-public class DTransform
-{
-  protected DNode from,to;
-  protected int type;
-
-  public DTransform()
-  {
-    this(null,null);
-  }
-
-  public DTransform(DNode aFrom,DNode aTo)
-  {
-    from=aFrom;
-    to=aTo;
-  }
-
-  public int getType()
-  {
-    return type;
-  }
-
-  public void setType(int aType)
-  {
-    type=aType;
-  }
-
-  public void setFrom(DNode aNode)
-  {
-    if(from!=null) {
-      from.removeTo(this);
-    }
-
-    from=aNode;
-    from.setTo(this);
-  }
-
-  public DNode getFrom()
-  {
-    return from;
-  }
-
-  public void setTo(DNode aNode)
-  {
-    if(to!=null) {
-      to.removeFrom(this);
-    }
-
-    to=aNode;
-    aNode.setFrom(this);
-  }
-
-  public DNode getTo()
-  {
-    return to;
-  }
-
-  /**
-   * This ensures the minimum tag/attributes are generated.
-   * To extend, extend saveCustomXML() which is called by this method
-   * appropriately.
-   */
-  public final void saveXML(XMLFactory aFactory)
-  throws IOException, XMLFactoryException
-  {
-    // Bare minimum is the tag type, and the destination node's id
-    aFactory.startTag(DConstants.XML_TRANSFORM);
-    aFactory.addAttribute(DConstants.XML_TYPE,Integer.toString(getType()));
-    aFactory.addAttribute(DConstants.XML_TO,Integer.toString(to.getID()));
-    saveCustomXML(aFactory);
-    aFactory.endTag();
-  }
-
-  /**
-   * Custom transformations must overide this method and write direct to the
-   * supplied XMLFactory. A tag is currently open when the method is called, but
-   * is closed immediately this method exits.
-   */
-  public void saveCustomXML(XMLFactory aFactory)
-  throws IOException, XMLFactoryException
-  {
-    // Default method does nothing...
-  }
-
-  /**
-   * Checks to see if we should run based on the calling nodes status. Overide
-   * this to add this sort of checking.
-   *
-   * @param status The return status of the calling node
-   * @param env DEnvironment we are using
-   * @return true if we will run.
-   */
-  public boolean willRun(int status,DEnvironment env)
-  {
-    switch(getType())
-    {
-      // NOP is the generic link - always run
-      case DConstants.NOP:
-        return true;
-
-      // SUCCESS only runs if the previous node was OK
-      case DConstants.SUCCESS:
-        return status==DNode.OK;
-
-      case DConstants.ERROR:
-        return status==DNode.ERROR;
-
-      // Default - always run. Overide the method if you need to change this
-      default:
-        return true;
-    }
-  }
-
-  /**
-   * Overide this for a transform to do something.
-   * @param env DEnvironment we are using
-   * @return true if we actually ran. DProcessor will jump to the getTo() node if so.
-   */
-  public boolean run(DEnvironment env)
-  {
-    return true;
-  }
-
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/tools.properties b/contrib/retep/uk/org/retep/tools.properties
deleted file mode 100644
index 38dc668aea..0000000000
--- a/contrib/retep/uk/org/retep/tools.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Written by Retep PropertyEditor
-#Sat Mar 03 16:29:44 GMT+00:00 2001
-tool.hba=pg_hba.conf editor
-tool.hba.class=uk.org.retep.util.hba.Editor
-tool.proped.class=uk.org.retep.util.proped.PropertyEditor
-tool.hba.type=Misc
-tool.proped.type=Misc
-tool.proped=Properties Editor
diff --git a/contrib/retep/uk/org/retep/tools/Tool.java b/contrib/retep/uk/org/retep/tools/Tool.java
deleted file mode 100644
index ffd19ae90c..0000000000
--- a/contrib/retep/uk/org/retep/tools/Tool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package uk.org.retep.tools;
-
-import javax.swing.JMenuBar;
-
-/**
- * Tools can implement this interface to provide the parent manager (the big
- * application or the StandaloneApp class) enough details to display them.
- *
- * If a tool does not implement this class, it gets basic treatment.
- *
- * @author
- * @version 1.0
- */
-
-public interface Tool
-{
-  /**
-   * @return the JMenuBar for this tool, null if none.
-   */
-  public JMenuBar getMenuBar();
-
-  /**
-   * @return the title string to go into the JFrame/JInternalFrame's title bar.
-   */
-  public String getTitle();
-
-  /**
-   * Called by StandaloneApp to indicate this is within a StandaloneApp.
-   * You should assume you are not in standalone mode until this is called.
-   */
-  public void setStandaloneMode(boolean aMode);
-
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/util/ExceptionDialog.java b/contrib/retep/uk/org/retep/util/ExceptionDialog.java
deleted file mode 100644
index ea3d5c43c9..0000000000
--- a/contrib/retep/uk/org/retep/util/ExceptionDialog.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package uk.org.retep.util;
-
-import java.awt.*;
-import javax.swing.*;
-import java.awt.event.*;
-
-/**
- * Display an Exception to the user
- * @author
- * @version 1.0
- */
-
-public class ExceptionDialog extends JDialog
-{
-  // This is used to store the parent frame.
-  // Classes like StandaloneApp set's this so that the
-  // displayException() method can work without knowing/finding out
-  // the parent Frame/JFrame.
-  private static Frame globalFrame;
-
-  private static ExceptionDialog globalDialog;
-
-  JPanel panel1 = new JPanel();
-  BorderLayout borderLayout1 = new BorderLayout();
-  JTextArea message = new JTextArea();
-  JPanel jPanel1 = new JPanel();
-  JButton jButton1 = new JButton();
-  GridLayout gridLayout1 = new GridLayout();
-  JButton jButton2 = new JButton();
-  JLabel jLabel1 = new JLabel();
-
-  public ExceptionDialog(Frame frame, String title, boolean modal)
-  {
-    super(frame, title, modal);
-    try
-    {
-      jbInit();
-      pack();
-    }
-    catch(Exception ex)
-    {
-      ex.printStackTrace();
-    }
-  }
-
-  public ExceptionDialog()
-  {
-    this(null, "", false);
-  }
-  void jbInit() throws Exception
-  {
-    panel1.setLayout(borderLayout1);
-    message.setBorder(BorderFactory.createLoweredBevelBorder());
-    message.setText("jTextArea1");
-    message.setBackground(Color.lightGray);
-    message.setEditable(false);
-    jButton1.setText("Close");
-    jButton1.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        jButton1_actionPerformed(e);
-      }
-    });
-    jPanel1.setLayout(gridLayout1);
-    jButton2.setEnabled(false);
-    jButton2.setText("Stack Trace");
-    jLabel1.setEnabled(false);
-    getContentPane().add(panel1);
-    panel1.add(message, BorderLayout.CENTER);
-    this.getContentPane().add(jPanel1, BorderLayout.SOUTH);
-    jPanel1.add(jButton2, null);
-    jPanel1.add(jLabel1, null);
-    jPanel1.add(jButton1, null);
-  }
-
-  /**
-   * Sets the Frame used to display all dialog boxes.
-   */
-  public static void setFrame(Frame aFrame)
-  {
-    globalFrame = aFrame;
-  }
-
-  /**
-   * Displays a dialog based on the exception
-   * @param ex Exception that was thrown
-   */
-  public static void displayException(Exception ex)
-  {
-    displayException(ex,null);
-  }
-
-  /**
-   * Displays a dialog based on the exception
-   * @param ex Exception that was thrown
-   */
-  public static void displayException(Exception ex,String msg)
-  {
-    String cname = ex.getClass().getName();
-    int i=cname.lastIndexOf(".");
-    displayException(cname.substring(i+1),ex,msg);
-  }
-
-  public static void displayException(String title,Exception ex)
-  {
-    displayException(title,ex,null);
-  }
-
-  public static void displayException(String title,Exception ex,String msg)
-  {
-    Logger.log(Logger.ERROR,title,ex.getMessage());
-
-    // Default to a stack trace if no frame set
-    if(globalFrame==null) {
-      ex.printStackTrace();
-      return;
-    }
-
-    if(globalDialog==null) {
-      globalDialog=new ExceptionDialog(globalFrame,title,true);
-      globalDialog.pack();
-    }
-
-    globalDialog.setTitle(title);
-
-    if(msg!=null) {
-      globalDialog.message.setText(msg);
-      globalDialog.message.append(":\n");
-    }
-    globalDialog.message.append(ex.getMessage());
-
-    globalDialog.pack();
-    globalDialog.setVisible(true);
-  }
-
-  void jButton1_actionPerformed(ActionEvent e)
-  {
-    setVisible(false);
-  }
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/util/Globals.java b/contrib/retep/uk/org/retep/util/Globals.java
deleted file mode 100644
index c0e3548a32..0000000000
--- a/contrib/retep/uk/org/retep/util/Globals.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package uk.org.retep.util;
-
-import uk.org.retep.util.Logger;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Properties;
-
-/**
- * This is a Singleton that stores global properties, command line arguments
- * etc.
- *
- * All tools are guranteed that this will exist.
- *
- * @author
- * @version 1.0
- */
-
-public class Globals
-{
-  private static final Globals SINGLETON = new Globals();
-
-  private Hashtable   global= new Hashtable();
-  private Properties  props = new Properties();
-  private ArrayList   args  = new ArrayList();
-
-  private Globals()
-  {
-  }
-
-  public static Globals getInstance()
-  {
-    return SINGLETON;
-  }
-
-  /**
-   * Retrieves an object from the global pool
-   * @param aKey key of the object
-   * @return The object, null if not found
-   */
-  public Object get(Object aKey)
-  {
-    return global.get(aKey);
-  }
-
-  /**
-   * Stores an object into the global pool
-   * @param aKey key of the object
-   * @param aObj the object to store
-   * @return aObj
-   */
-  public Object put(Object aKey,Object aObj)
-  {
-    return global.put(aKey,aObj);
-  }
-
-  /**
-   * Returns a Properties object of all properties
-   */
-  /*
-  public Properties getProperties()
-  {
-    return props;
-  }
-  */
-
-  /**
-   * @param aProp a property supplied to the command line
-   * @return property or NULL if not present
-   */
-  public String getProperty(String aProp)
-  {
-    return props.getProperty(aProp);
-  }
-
-  /**
-   * @param aProp a property supplied to the command line
-   * @param aDefault default to return if property was not supplied
-   * @return property value
-   */
-  public String getProperty(String aProp,String aDefault)
-  {
-    return props.getProperty(aProp,aDefault);
-  }
-
-  /**
-   * @param aID ID of the argument, 0 ... getArgumentCount()-1
-   * @return argument
-   */
-  public String getArgument(int aID)
-  {
-    return (String) args.get(aID);
-  }
-
-  /**
-   * Returns an array of String objects representing the arguments
-   */
-  public String[] getArguments()
-  {
-    return (String[]) args.toArray();
-  }
-
-  /**
-   * Returns an Iterator of the arguments
-   */
-  public Iterator getArgumentIterator()
-  {
-    return args.iterator();
-  }
-
-  /**
-   * @return number of arguments
-   */
-  public int getArgumentCount()
-  {
-    return args.size();
-  }
-
-  /**
-   * Parses the command line arguments
-   */
-  public void parseArguments(String[] aArgs)
-  throws Exception
-  {
-    for(int i=0;i<aArgs.length;i++) {
-      String arg = aArgs[i];
-      if(arg.startsWith("--") || arg.startsWith("-")) {
-        if(arg.length()>1) {
-          // Split the option at the first '=' char if any
-          int s = arg.startsWith("--") ? 2 : 1 ;  // -- or -
-          int e = arg.indexOf("=");
-          String key,val;
-          if(e>s) {
-            // Format: -key=value
-            key=arg.substring(s,e-1);
-            val=arg.substring(e+1);
-          } else if(e>-1 && e<=s) {
-            // Can't have a property without a key!
-            throw new Exception("Invalid option -=");
-          } else {
-            key=arg.substring(s);
-            val=""; // can't be null
-          }
-
-          if(key.equals("d")) {
-            // -d | --d is reserved to set the Logger level
-            int level=0;
-            if(!val.equals("")) {
-              level=Integer.parseInt(val);
-            }
-            Logger.setLevel(level);
-          } else {
-            // Add all other properties into the Properties object
-            props.put(key,val);
-            Logger.log(Logger.INFO,"Argument",key,val);
-          }
-
-        } else {
-          // Just a - on its own?
-          System.out.println("Unknown option: -");
-        }
-      } else {
-        // Add the argument to the array
-        args.add(arg);
-      }
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/util/Logger.java b/contrib/retep/uk/org/retep/util/Logger.java
deleted file mode 100644
index c272f1d005..0000000000
--- a/contrib/retep/uk/org/retep/util/Logger.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package uk.org.retep.util;
-
-import java.io.CharArrayWriter;
-import java.io.PrintWriter;
-
-public class Logger
-{
-  protected static int level;
-  protected static PrintWriter logger;
-
-  public static final int NONE  = -1;
-  public static final int INFO  = 0;
-  public static final int ERROR = 1;
-  public static final int DEBUG = 2;
-  public static final int ALL   = 3;
-
-  static {
-    level = NONE;
-    logger = null;
-  };
-
-  private static final String levels[] = {
-    "INFO :",
-    "ERROR:",
-    "DEBUG:",
-    "ALL  :"
-  };
-
-  public static void setLevel(int aLevel)
-  {
-    // Incase we have not yet set a logger
-    if(logger==null) {
-      logger = new PrintWriter(System.out);
-    }
-
-    if(aLevel<NONE) {
-      aLevel=NONE;
-    } else if(aLevel>ALL) {
-      aLevel=ALL;
-    }
-
-    level=aLevel;
-
-    if(level>NONE) {
-      log(INFO,"Log level changed to",level,levels[level]);
-    }
-  }
-
-  public static void setLogger(PrintWriter pw)
-  {
-    if(logger!=null) {
-      try {
-        logger.flush();
-        logger.close();
-      } catch(Exception ex) {
-        logger=pw;
-        log(ERROR,"Exception while closing logger",ex);
-      }
-    }
-    logger=pw;
-  }
-
-  public static void log(String msg)
-  {
-    log(INFO,msg);
-  }
-
-  public static void log(int aLevel,String msg)
-  {
-    write(aLevel,msg,null);
-  }
-
-  public static void log(int aLevel,String msg,int arg1)
-  {
-    Object o[] = {new Integer(arg1)};
-    write(aLevel,msg,o);
-  }
-
-  public static void log(int aLevel,String msg,int arg1,Object arg2)
-  {
-    Object o[] = {new Integer(arg1),arg2};
-    write(aLevel,msg,o);
-  }
-
-  public static void log(int aLevel,String msg,double arg1)
-  {
-    Object o[] = {new Double(arg1)};
-    write(aLevel,msg,o);
-  }
-
-  public static void log(int aLevel,String msg,double arg1,Object arg2)
-  {
-    Object o[] = {new Double(arg1),arg2};
-    write(aLevel,msg,o);
-  }
-
-  public static void log(int aLevel,String msg,Object arg1)
-  {
-    Object o[] = {arg1};
-    write(aLevel,msg,o);
-  }
-
-  public static void log(int aLevel,String msg,Object arg1,Object arg2)
-  {
-    Object o[] = {arg1,arg2};
-    write(aLevel,msg,o);
-  }
-
-  public static void log(int aLevel,String msg,Object arg1,Object arg2,Object arg3)
-  {
-    Object o[] = {arg1,arg2,arg3};
-    write(aLevel,msg,o);
-  }
-
-  public static void log(int aLevel,String msg,Throwable t)
-  {
-    CharArrayWriter buffer = new CharArrayWriter();
-    PrintWriter printWriter = new PrintWriter(buffer);
-    t.printStackTrace(printWriter);
-    Object o[] = {buffer.toString()};
-    buffer.close();
-    write(aLevel,msg,o);
-  }
-
-  private static void write(int aLevel,String aMsg,Object args[])
-  {
-    // Can't be above ALL
-    if(aLevel>ALL) {
-      aLevel=ALL;
-    }
-
-    // Ignore if below or equal to NONE
-    if(aLevel<INFO || aLevel>level) {
-      return;
-    }
-
-    logger.print("Logger:");
-    logger.print(levels[aLevel]);
-    logger.print(aMsg);
-    if(args!=null) {
-      for(int a=0;a<args.length;a++) {
-        logger.print(":");
-        logger.print(args[a]);
-      }
-    }
-    logger.println();
-    logger.flush();
-  }
-
-}
diff --git a/contrib/retep/uk/org/retep/util/Main.java b/contrib/retep/uk/org/retep/util/Main.java
deleted file mode 100644
index 5df75e0802..0000000000
--- a/contrib/retep/uk/org/retep/util/Main.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package uk.org.retep.util;
-
-import uk.org.retep.util.StandaloneApp;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-
-/**
- * This is a template for your own Tools. Copy not extend this class. Please
- * refer to Implementation for details.
- *
- * All you need to to is implement the init() method.
- *
- * $Id: Main.java,v 1.1 2001/03/05 09:15:36 peter Exp $
- */
-
-public class Main extends StandaloneApp
-{
-  public Main(String[] args)
-  throws Exception
-  {
-    super(args);
-  }
-
-  public JComponent init()
-  throws Exception
-  {
-    // Create your tool here, then do things like load files based on the
-    // command line arguments. Then return that tool.
-
-    // NB: This just allows us to compile. You're implementation must return
-    // the Tool itself.
-    return new JLabel("Replace with your own tool!");
-  }
-
-  public static void main(String[] args)
-  throws Exception
-  {
-    Main main = new Main(args);
-    main.pack();
-    main.setVisible(true);
-  }
-}
diff --git a/contrib/retep/uk/org/retep/util/StandaloneApp.java b/contrib/retep/uk/org/retep/util/StandaloneApp.java
deleted file mode 100644
index 8340a56645..0000000000
--- a/contrib/retep/uk/org/retep/util/StandaloneApp.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package uk.org.retep.util;
-
-import uk.org.retep.tools.Tool;
-import uk.org.retep.util.Globals;
-import uk.org.retep.util.ExceptionDialog;
-
-import java.awt.*;
-import javax.swing.*;
-import java.awt.event.*;
-
-/**
- * This provides the basic services needed for enabling some of the tools to
- * run in a Stand-alone fassion.
- *
- * Note: Because it's designed for standalone use, if this window is closed,
- * the JVM is terminated. Do not use for normal application use.
- *
- * $Id: StandaloneApp.java,v 1.2 2001/03/05 10:18:48 peter Exp $
- *
- * @author
- * @version 1.0
- */
-
-public abstract class StandaloneApp extends JFrame
-{
-  public StandaloneApp(String[] aArgs)
-  throws Exception
-  {
-    super(); // Initialise JFrame
-
-    // Allow dialogs to work with us
-    ExceptionDialog.setFrame(this);
-
-    // Add a window listener
-    this.addWindowListener(new java.awt.event.WindowAdapter()
-    {
-      public void windowClosing(WindowEvent e)
-      {
-        System.exit(0);
-      }
-    });
-
-    // Parse the command line arguments
-    Globals.getInstance().parseArguments(aArgs);
-
-    // Now initialise this tool (init is overidden)
-    JComponent tool = null;
-    try {
-      tool = init();
-    } catch(Exception ex) {
-      ex.printStackTrace();
-      System.exit(1);
-    }
-
-    // Now add to this frame
-    this.getContentPane().add(tool, BorderLayout.CENTER);
-
-    // Finally call the Tool interface
-    if(tool instanceof Tool) {
-      Tool t = (Tool) tool;
-
-      // Notify the tool we are a standalone
-      t.setStandaloneMode(true);
-
-      // Fetch the title
-      setTitle(t.getTitle());
-
-      // and a MenuBar (if needed)
-      JMenuBar mb = t.getMenuBar();
-      if(mb!=null) {
-        setJMenuBar(t.getMenuBar());
-      }
-    } else {
-      // Ok, set a default title string
-      setTitle("RetepTools Standalone");
-    }
-
-  }
-
-  /**
-   * You must overide this method with your initialiser.
-   */
-  public abstract JComponent init() throws Exception;
-
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/util/hba/Editor.java b/contrib/retep/uk/org/retep/util/hba/Editor.java
deleted file mode 100644
index 6571bfebb7..0000000000
--- a/contrib/retep/uk/org/retep/util/hba/Editor.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package uk.org.retep.util.hba;
-
-import uk.org.retep.tools.Tool;
-import uk.org.retep.util.models.HBATableModel;
-
-import java.awt.*;
-import java.io.*;
-import java.util.*;
-import javax.swing.table.*;
-import javax.swing.*;
-
-/**
- * pg_hba.conf editor (& repairer)
- *
- * @author
- * @version 1.0
- */
-
-public class Editor extends JPanel implements Tool
-{
-  BorderLayout borderLayout1 = new BorderLayout();
-  HBATableModel model = new HBATableModel();
-  JPanel jPanel1 = new JPanel();
-  GridBagLayout gridBagLayout1 = new GridBagLayout();
-  JLabel jLabel1 = new JLabel();
-  JComboBox typeEntry = new JComboBox();
-  JLabel jLabel2 = new JLabel();
-  JLabel jLabel3 = new JLabel();
-  JLabel jLabel4 = new JLabel();
-  JTextField ipEntry = new JTextField();
-  JTextField maskEntry = new JTextField();
-  JComboBox authEntry = new JComboBox();
-  JTextField argEntry = new JTextField();
-  JLabel jLabel5 = new JLabel();
-  JPanel jPanel2 = new JPanel();
-  FlowLayout flowLayout1 = new FlowLayout();
-  JButton jButton1 = new JButton();
-  JButton jButton2 = new JButton();
-  JScrollPane jScrollPane1 = new JScrollPane();
-  JButton jButton3 = new JButton();
-  JTable jTable1 = new JTable();
-
-  public Editor()
-  {
-    try
-    {
-      jbInit();
-    }
-    catch(Exception ex)
-    {
-      ex.printStackTrace();
-    }
-  }
-  void jbInit() throws Exception
-  {
-    this.setLayout(borderLayout1);
-    jTable1.setPreferredSize(new Dimension(600, 300));
-    jTable1.setModel(model);
-    this.setPreferredSize(new Dimension(600, 300));
-    this.add(jScrollPane1, BorderLayout.CENTER);
-    jScrollPane1.getViewport().add(jTable1, null);
-    jPanel1.setLayout(gridBagLayout1);
-    jLabel1.setText("Type");
-    jLabel2.setText("IP Address");
-    jLabel3.setText("Mask");
-    jLabel4.setText("Authentication");
-    ipEntry.setText("jTextField1");
-    maskEntry.setText("jTextField2");
-    argEntry.setText("jTextField3");
-    jLabel5.setText("Argument");
-    jPanel2.setLayout(flowLayout1);
-    jButton1.setText("New entry");
-    jButton2.setText("Validate");
-    jButton3.setText("Devele");
-    this.add(jPanel1, BorderLayout.SOUTH);
-    jPanel1.add(jLabel1, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0
-            ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-    jPanel1.add(typeEntry, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0
-            ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-    jPanel1.add(jLabel2, new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0
-            ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-    jPanel1.add(jLabel3, new GridBagConstraints(3, 1, 1, 1, 0.0, 0.0
-            ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-    jPanel1.add(jLabel4, new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0
-            ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-    jPanel1.add(ipEntry, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0
-            ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-    jPanel1.add(maskEntry, new GridBagConstraints(4, 1, 1, 1, 0.0, 0.0
-            ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-    jPanel1.add(authEntry, new GridBagConstraints(2, 2, 1, 1, 0.0, 0.0
-            ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-    jPanel1.add(argEntry, new GridBagConstraints(4, 2, 1, 1, 0.0, 0.0
-            ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-    jPanel1.add(jLabel5, new GridBagConstraints(3, 2, 1, 1, 0.0, 0.0
-            ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-    jPanel1.add(jPanel2, new GridBagConstraints(0, 3, 5, 1, 0.0, 0.0
-            ,GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-    jPanel2.add(jButton3, null);
-    jPanel2.add(jButton1, null);
-    jPanel2.add(jButton2, null);
-  }
-
-  public void openFile(String aFilename)
-  throws IOException
-  {
-    FileInputStream fis = new FileInputStream(aFilename);
-    BufferedReader br = new BufferedReader(new InputStreamReader(fis));
-    ArrayList list = model.getArray();
-
-    String s = br.readLine();
-    while(s!=null) {
-      if(s.startsWith("#")) {
-        // ignore comments
-      } else {
-        Record rec = Record.parseLine(s);
-        if(rec!=null) {
-          rec.validate();
-          list.add(rec);
-        }
-      }
-      s=br.readLine();
-    }
-
-    model.fireTableDataChanged();
-  }
-
-  public JMenuBar getMenuBar()
-  {
-    return null;
-  }
-
-  public String getTitle()
-  {
-    return "pg_hba.conf Editor/Repair tool";
-  }
-
-  public void setStandaloneMode(boolean aMode)
-  {
-  }
-
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/util/hba/Main.java b/contrib/retep/uk/org/retep/util/hba/Main.java
deleted file mode 100644
index 3d9343140b..0000000000
--- a/contrib/retep/uk/org/retep/util/hba/Main.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package uk.org.retep.util.hba;
-
-import uk.org.retep.util.ExceptionDialog;
-import uk.org.retep.util.Globals;
-import uk.org.retep.util.Logger;
-import uk.org.retep.util.StandaloneApp;
-
-import java.io.IOException;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-
-/**
- * Standalone entry point for the Properties editor
- *
- * $Id: Main.java,v 1.1 2001/03/05 09:15:37 peter Exp $
- */
-
-public class Main extends StandaloneApp
-{
-  public Main(String[] args)
-  throws Exception
-  {
-    super(args);
-  }
-
-  public JComponent init()
-  throws Exception
-  {
-    Globals globals = Globals.getInstance();
-
-    Editor editor = new Editor();
-
-    if(globals.getArgumentCount()>0) {
-      editor.openFile(globals.getArgument(0));
-    }
-
-    return editor;
-  }
-
-  public static void main(String[] args)
-  throws Exception
-  {
-    Main main = new Main(args);
-    main.pack();
-    main.setVisible(true);
-  }
-}
diff --git a/contrib/retep/uk/org/retep/util/hba/Record.java b/contrib/retep/uk/org/retep/util/hba/Record.java
deleted file mode 100644
index b91e6dc49d..0000000000
--- a/contrib/retep/uk/org/retep/util/hba/Record.java
+++ /dev/null
@@ -1,238 +0,0 @@
-package uk.org.retep.util.hba;
-
-import uk.org.retep.util.Logger;
-import uk.org.retep.util.misc.IPAddress;
-import uk.org.retep.util.misc.WStringTokenizer;
-
-/**
- * Used to store the entries of a pg_hba.conf file
- * @author
- * @version 1.0
- */
-
-public class Record
-{
-  int       type;
-  String    dbname;
-  IPAddress ip;
-  IPAddress mask;
-  int       authType;
-  String    authArg;
-
-  public static final int TYPE_LOCAL    = 0;
-  public static final int TYPE_HOST     = 1;
-  public static final int TYPE_HOSTSSL  = 2;
-
-  public static final String types[] = {
-    "local","host","hostssl"
-  };
-
-  public static final int AUTH_TRUST    = 0;
-  public static final int AUTH_PASSWORD = 1;
-  public static final int AUTH_CRYPT    = 2;
-  public static final int AUTH_IDENT    = 3;
-  public static final int AUTH_KRB4     = 4;
-  public static final int AUTH_KRB5     = 5;
-  public static final int AUTH_REJECT   = 6;
-
-  public static final String auths[] = {
-    "trust","password","crypt",
-    "ident",
-    "krb4","krb5",
-    "reject"
-  };
-
-  private static final String spc = " ";
-
-  public Record()
-  {
-  }
-
-  public int getType()
-  {
-    return type;
-  }
-
-  public void setType(int aType)
-  {
-    type=aType;
-  }
-
-  public String getDatabase()
-  {
-    return dbname;
-  }
-
-  public void setDatabase(String aDB)
-  {
-    dbname=aDB;
-  }
-
-  public int getAuthType()
-  {
-    return authType;
-  }
-
-  public void setAuthType(int aType)
-  {
-    authType=aType;
-  }
-
-  public String getAuthArgs()
-  {
-    return authArg;
-  }
-
-  public void setAuthArgs(String aArg)
-  {
-    authArg=aArg;
-  }
-
-  public IPAddress getIP()
-  {
-    return ip;
-  }
-
-  public void setIP(String aArg)
-  {
-    setIP(new IPAddress(aArg));
-  }
-
-  public void setIP(IPAddress aArg)
-  {
-    ip=aArg;
-  }
-
-    public IPAddress getMask()
-  {
-    return mask;
-  }
-
-  public void setMask(String aArg)
-  {
-    setMask(new IPAddress(aArg));
-  }
-
-  public void setMask(IPAddress aArg)
-  {
-    mask=aArg;
-  }
-
-  public String toString()
-  {
-    StringBuffer buf = new StringBuffer();
-    write(buf);
-    return buf.toString();
-  }
-
-  public void write(StringBuffer buf)
-  {
-    buf.append(types[type]).append(spc);
-
-    if(type==TYPE_HOST || type==TYPE_HOSTSSL) {
-      buf.append(getIP()).append(spc);
-      buf.append(getMask()).append(spc);
-    }
-
-    buf.append(auths[authType]);
-
-    // Now the authArg
-    switch(type)
-    {
-      // These have no authArgs
-      case AUTH_TRUST:
-      case AUTH_REJECT:
-      case AUTH_KRB4:
-      case AUTH_KRB5:
-        break;
-
-      // These must have an arg
-      case AUTH_IDENT:
-        buf.append(spc).append(getAuthArgs());
-        break;
-
-      // These may have an optional arg
-      case AUTH_PASSWORD:
-      case AUTH_CRYPT:
-        if(!(authArg==null || authArg.equals("")))
-          buf.append(spc).append(getAuthArgs());
-        break;
-    }
-  }
-
-  private static WStringTokenizer tok;
-
-  public static Record parseLine(String s)
-  {
-    Record res = new Record();
-    int type;
-
-    if(s==null || s.equals("") || s.startsWith("#"))
-      return null;
-
-    if(tok==null)
-      tok=new WStringTokenizer();
-
-    tok.setString(s);
-
-    type=WStringTokenizer.matchToken(types,tok.nextToken());
-    res.setType(type);
-
-    res.setDatabase(tok.nextToken());
-
-    if(type==TYPE_HOST || type==TYPE_HOSTSSL) {
-      res.setIP(new IPAddress(tok.nextToken()));
-      res.setMask(new IPAddress(tok.nextToken()));
-    }
-
-    res.setAuthType(WStringTokenizer.matchToken(auths,tok.nextToken()));
-    res.setAuthArgs(tok.nextToken());
-
-    return res;
-  }
-
-  public static final int VALID         = 0;
-  public static final int INVALID_TYPE  = 1;
-  public static final int INVALID_IPREQUIRED  = 2;
-
-  /**
-   * Validates the record
-   */
-  public int validate()
-  {
-    switch(type)
-    {
-      case TYPE_HOST:
-      case TYPE_HOSTSSL:
-        if(ip==null || ip.isInvalid()) {
-          Logger.log(Logger.INFO,"pg_hba.conf: IP missing or invalid - repairing");
-          setMask("127.0.0.1");
-        }
-
-        if(mask==null || mask.isInvalid() || !ip.validateMask(mask)) {
-          Logger.log(Logger.INFO,"pg_hba.conf: IP address without mask - repairing");
-          setMask(ip.getMask());
-        }
-
-        break;
-
-      case TYPE_LOCAL:
-        break;
-
-      default:
-        return INVALID_TYPE;
-    }
-
-    return VALID;
-  }
-
-  /*
-# host       all        192.168.54.1   255.255.255.255    reject
-# host       all        0.0.0.0        0.0.0.0            krb5
-# host       all        192.168.0.0    255.255.0.0        ident     omicron
-#
-
-local        all                                           trust
-host         all         127.0.0.1     255.255.255.255     trust
-*/
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/util/misc/IPAddress.java b/contrib/retep/uk/org/retep/util/misc/IPAddress.java
deleted file mode 100644
index a04babde3a..0000000000
--- a/contrib/retep/uk/org/retep/util/misc/IPAddress.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package uk.org.retep.util.misc;
-
-import java.util.StringTokenizer;
-
-/**
- * Represent an IP address
- * @author
- * @version 1.0
- */
-
-public class IPAddress
-{
-  protected long    address;
-  protected long    b[] = new long[4];
-  protected boolean invalid=true;
-
-  public IPAddress()
-  {
-  }
-
-  public IPAddress(String s)
-  {
-    setAddress(s);
-  }
-
-  public synchronized void setAddress(String s)
-  {
-    if(s==null || s.equals("")) {
-      invalid=true;
-      return;
-    }
-
-    address=0;
-    StringTokenizer tok = new StringTokenizer(s,".");
-    int i=0;
-    while(i<4 && tok.hasMoreElements()) {
-      b[i++] = Long.parseLong(tok.nextToken());
-    }
-    while(i<4) {
-      b[i++]=0;
-    }
-
-    invalid=false;
-    refresh();
-  }
-
-  public void refresh()
-  {
-    if(invalid)
-      return;
-    address = (b[0]<<24) | (b[1]<<16) | (b[2]<<8) | (b[3]);
-  }
-
-  public boolean isInvalid()
-  {
-    refresh();
-    return invalid;
-  }
-
-  public String toString()
-  {
-    refresh();
-    if(invalid)
-      return "*INVALID*";
-
-    return Long.toString(b[0])+"."+Long.toString(b[1])+"."+Long.toString(b[2])+"."+Long.toString(b[3]);
-  }
-
-  public boolean equals(Object o)
-  {
-    if(o instanceof IPAddress) {
-      IPAddress ip = (IPAddress) o;
-
-      refresh();
-      ip.refresh();
-
-      if(ip.invalid == invalid)
-        return false;
-
-      return address==ip.address;
-    }
-    return false;
-  }
-
-  private static int gethoststart(long b)
-  {
-    if((b & 0x80)==0x00) return 1; // class A
-    if((b & 0xc0)==0x80) return 2; // class B
-    if((b & 0xe0)==0xc0) return 3; // class C
-    return 4;                      // class D
-  }
-
-  public boolean validateMask(IPAddress mask)
-  {
-    // If were a network check the host mask
-    int i=gethoststart(b[0]);
-System.out.println("Host start "+i);
-    while(i<4 && b[i]==0) {
-      if(mask.b[i++]>0)
-        return false;
-    }
-
-    for(i=0;i<4;i++) {
-      if((b[i]&mask.b[i])!=b[i])
-        return false;
-    }
-
-    return true;
-  }
-
-  public IPAddress getMask()
-  {
-    IPAddress mask = new IPAddress();
-    int i=3;
-    while(i>-1 && b[i]==0) {
-      mask.b[i--]=0;
-    }
-    while(i>-1) {
-      mask.b[i--]=255;
-    }
-    mask.invalid=false;
-    mask.refresh();
-    return mask;
-  }
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/util/misc/PropertiesIO.java b/contrib/retep/uk/org/retep/util/misc/PropertiesIO.java
deleted file mode 100644
index 7bed62c4d2..0000000000
--- a/contrib/retep/uk/org/retep/util/misc/PropertiesIO.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package uk.org.retep.util.misc;
-
-import java.io.*;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.TreeMap;
-
-/**
- * Misc Properties utilities..
- * @author
- * @version 1.0
- */
-
-public class PropertiesIO
-{
-
-  public PropertiesIO()
-  {
-  }
-
-  /**
-   * Builds a TreeMap based on the given Properties object. This is useful
-   * because the keys will be in sorted order.
-   */
-  public static TreeMap getTreeMap(Properties p)
-  {
-    TreeMap map = new TreeMap();
-    Iterator e = p.keySet().iterator();
-    while(e.hasNext()) {
-      Object k = e.next();
-      map.put(k,p.get(k));
-    }
-    return map;
-  }
-
-  /**
-   * Writes a Properties file to the writer. This is similar to Properties.save
-   * except you can pick the key/value separator
-   */
-  public static synchronized void save(Properties p,OutputStream out,char sep,String header)
-  throws IOException
-  {
-    save(p,p.keySet().iterator(),out,sep,header);
-  }
-
-  /**
-   * Writes a Properties file to the writer. This is similar to Properties.save
-   * except you can pick the key/value separator and the keys are written
-   * in a sorted manner
-   */
-  public static synchronized void saveSorted(Properties p,OutputStream out,char sep,String header)
-  throws IOException
-  {
-    save(p,getTreeMap(p).keySet().iterator(),out,sep,header);
-  }
-
-  /**
-   * This is the same as save, only the keys in the enumeration are written.
-   */
-  public static synchronized void save(Properties p,Iterator e, OutputStream out,char sep,String header)
-  throws IOException
-  {
-    BufferedWriter w = new BufferedWriter(new OutputStreamWriter(out, "8859_1"));
-
-    if (header != null) {
-      w.write('#');
-      w.write(header);
-      w.newLine();
-    }
-
-    w.write('#');
-    w.write(new Date().toString());
-    w.newLine();
-
-    while(e.hasNext()) {
-      String key = (String)e.next();
-      w.write(encode(key,true));
-      w.write(sep);
-      w.write(encode((String)p.get(key),false));
-      w.newLine();
-    }
-    w.flush();
-  }
-
-  private static final String specialSaveChars = "=: \t\r\n\f#!";
-
-  /**
-   * Encodes a string in a way similar to the JDK's Properties method
-   */
-  public static String encode(String s, boolean escapeSpace)
-  {
-    int l=s.length();
-    StringBuffer buf = new StringBuffer(l<<1);
-
-    for(int i=0;i<l;i++) {
-      char c = s.charAt(i);
-      switch(c)
-        {
-          case ' ':
-            if(i==0 || escapeSpace) {
-              buf.append('\\');
-            }
-            buf.append(' ');
-            break;
-
-          case '\\':
-            buf.append('\\').append('\\');
-            break;
-
-          case '\t':
-            buf.append('\\').append('t');
-            break;
-
-          case '\n':
-            buf.append('\\').append('n');
-            break;
-
-          case '\r':
-            buf.append('\\').append('r');
-            break;
-
-          case '\f':
-            buf.append('\\').append('f');
-            break;
-
-          default:
-            if((c<0x20)||(c>0x7e)) {
-              buf.append('\\').append('u');
-              buf.append(toHex((c >> 12) & 0xF));
-              buf.append(toHex((c >>  8) & 0xF));
-              buf.append(toHex((c >>  4) & 0xF));
-              buf.append(toHex( c        & 0xF));
-            } else {
-              if (specialSaveChars.indexOf(c) != -1)
-                buf.append('\\');
-              buf.append(c);
-            }
-        }
-    }
-    return buf.toString();
-  }
-
-  /**
-   * Convert a nibble to a hex character
-   * @param	nibble	the nibble to convert.
-   */
-  public static char toHex(int n) {
-    return hd[(n & 0xF)];
-  }
-
-  /** A table of hex digits */
-  private static final char[] hd = {
-    '0','1','2','3','4','5','6','7',
-    '8','9','A','B','C','D','E','F'
-  };
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/util/misc/WStringTokenizer.java b/contrib/retep/uk/org/retep/util/misc/WStringTokenizer.java
deleted file mode 100644
index 763676cfb3..0000000000
--- a/contrib/retep/uk/org/retep/util/misc/WStringTokenizer.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package uk.org.retep.util.misc;
-
-/**
- * Similar to StringTokenizer but handles white spaces and multiple delimiters
- * between tokens. It also handles quotes
- *
- * @author
- * @version 1.0
- */
-
-public class WStringTokenizer
-{
-  String string;
-  int pos,len;
-
-  /**
-   * Constructor
-   */
-  public WStringTokenizer()
-  {
-  }
-
-  /**
-   * Constructor: set the initial string
-   * @param aString String to tokenise
-   */
-  public WStringTokenizer(String aString)
-  {
-    setString(aString);
-  }
-
-  /**
-   * @param aString String to tokenise
-   */
-  public void setString(String aString)
-  {
-    string=aString;
-    pos=0;
-    len=string.length();
-  }
-
-  /**
-   * @return true if more tokens may be possible
-   */
-  public boolean hasMoreTokens()
-  {
-    return !(string==null || pos==len);
-  }
-
-  /**
-   * @return next token, null if complete.
-   */
-  public String nextToken()
-  {
-    char c;
-    boolean q=false;
-
-    if(!hasMoreTokens())
-      return null;
-
-    // find start of token
-    while(pos<len) {
-      c = string.charAt(pos);
-      if(c=='\'' || c=='\"')
-        q=!q;
-      if(q || c==' '||c=='\t')
-        pos++;
-      else
-        break;
-    }
-
-    // find last char of token
-    int p=pos;
-    while(pos<len) {
-      c = string.charAt(pos);
-      if(c=='\'' || c=='\"')
-        q=!q;
-      if(!q && (c==' '||c=='\t') )
-        break;
-      else
-        pos++;
-    }
-
-    return string.substring(p,pos);
-  }
-
-  /**
-   * Compare a string against an array of strings and return the index
-   * @param t array to compare against (all lowercase)
-   * @param s string to test
-   * @return index in t of s, -1 if not present
-   */
-  public static int matchToken(String[] t,String s)
-  {
-    s=s.toLowerCase();
-    for(int i=0;i<t.length;i++)
-      if(t[i].equals(s))
-        return i;
-    return -1;
-  }
-
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/util/models/HBATableModel.java b/contrib/retep/uk/org/retep/util/models/HBATableModel.java
deleted file mode 100644
index fb7bb72baf..0000000000
--- a/contrib/retep/uk/org/retep/util/models/HBATableModel.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package uk.org.retep.util.models;
-
-import uk.org.retep.util.hba.Record;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import javax.swing.table.*;
-
-/**
- * A TableModel to display the contents of a pg_hba.conf file
- * @author
- * @version 1.0
- */
-
-public class HBATableModel extends AbstractTableModel
-{
-  ArrayList list = new ArrayList();
-
-  private static final String cols[] = {
-    "Type","Database","IP Address","IP Mask","Authentication","Arguments"
-  };
-
-
-  public HBATableModel()
-  {
-  }
-
-  public ArrayList getArray()
-  {
-    return list;
-  }
-
-  public int getColumnCount()
-  {
-    return cols.length;
-  }
-
-  public Object getValueAt(int aRow, int aCol)
-  {
-    Record rec = (Record) list.get(aRow);
-    int t;
-
-    switch(aCol)
-    {
-      case 0:
-        t = rec.getType();
-        return t<0 ? "ERR" : Record.types[t] ;
-
-      case 1:
-        return rec.getDatabase();
-
-      case 2:
-        return rec.getIP();
-
-      case 3:
-        return rec.getMask();
-
-      case 4:
-        t=rec.getAuthType();
-        return t<0 ? "ERR" : Record.auths[t] ;
-
-      case 5:
-        return rec.getAuthArgs();
-
-      default:
-        return "";
-    }
-  }
-
-  public int getRowCount()
-  {
-    return list.size();
-  }
-
-  public boolean isCellEditable(int rowIndex, int columnIndex)
-  {
-    /**@todo: Override this javax.swing.table.AbstractTableModel method*/
-    return super.isCellEditable( rowIndex,  columnIndex);
-  }
-
-  public String getColumnName(int aColumn)
-  {
-    return cols[aColumn];
-  }
-
-  public void setValueAt(Object aValue, int rowIndex, int columnIndex)
-  {
-    /**@todo: Override this javax.swing.table.AbstractTableModel method*/
-    super.setValueAt( aValue,  rowIndex,  columnIndex);
-  }
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/util/models/PropertiesTableModel.java b/contrib/retep/uk/org/retep/util/models/PropertiesTableModel.java
deleted file mode 100644
index d48b166e9c..0000000000
--- a/contrib/retep/uk/org/retep/util/models/PropertiesTableModel.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package uk.org.retep.util.models;
-
-import uk.org.retep.util.Logger;
-import uk.org.retep.util.misc.PropertiesIO;
-
-import java.io.*;
-import java.util.*;
-import javax.swing.table.*;
-
-import java.text.*;
-
-/**
- * A TableModel that shows a view of a PropertyFile object
- *
- * $Id: PropertiesTableModel.java,v 1.1 2001/03/05 09:15:37 peter Exp $
- *
- * @author
- * @version 1.0
- */
-public class PropertiesTableModel extends AbstractTableModel
-{
-  // The properties
-  protected TreeMap properties;
-  protected Properties origProperties;
-  protected Object keys[];
-
-  public PropertiesTableModel()
-  {
-    this(new Properties());
-  }
-
-  public PropertiesTableModel(Properties aProperties)
-  {
-    setProperties(aProperties);
-  }
-
-  public synchronized int getKeyRow(Object k)
-  {
-    for(int i=0;i<keys.length;i++) {
-      if(keys[i].equals(k)) {
-        return i;
-      }
-    }
-    return -1;
-  }
-
-  /**
-   * Best not use this one to update, use the put method in this class!
-   */
-  public Properties getProperties()
-  {
-    return origProperties;
-  }
-
-  public synchronized void put(Object k,Object v)
-  {
-    properties.put(k,v);
-    origProperties.put(k,v);
-    refresh();
-  }
-
-  public Object get(Object k)
-  {
-    return origProperties.get(k);
-  }
-
-  public synchronized void remove(Object k)
-  {
-    properties.remove(k);
-    origProperties.remove(k);
-    refresh();
-  }
-
-  public boolean contains(Object o)
-  {
-    return origProperties.contains(o);
-  }
-
-  public boolean containsKey(Object o)
-  {
-    return origProperties.containsKey(o);
-  }
-
-  public boolean containsValue(Object o)
-  {
-    return origProperties.containsValue(o);
-  }
-
-  public void setProperties(Properties aProperties)
-  {
-    origProperties=aProperties;
-    properties = PropertiesIO.getTreeMap(aProperties);
-    refresh();
-  }
-
-  public void refresh()
-  {
-    keys = properties.keySet().toArray();
-    fireTableDataChanged();
-  }
-
-  private static final String cols[] = {
-    "Property","Value"
-  };
-
-  public int getColumnCount()
-  {
-    return cols.length;
-  }
-
-  public Object getValueAt(int aRow, int aColumn)
-  {
-    if(aRow<0 || aRow>=keys.length || aColumn<0 || aColumn>=cols.length)
-      return null;
-
-    Object key = keys[aRow];
-
-    switch(aColumn)
-    {
-      case 0:
-        return key;
-
-      case 1:
-        return properties.get(key);
-
-      default:
-        return null;
-    }
-  }
-
-  public int getRowCount()
-  {
-    return keys.length;
-  }
-
-  public String getColumnName(int aColumn)
-  {
-    return cols[aColumn];
-  }
-
-  public void setValueAt(Object aValue, int aRow, int aColumn)
-  {
-    if(aRow<0 || aRow>=keys.length || aColumn<0 || aColumn>=cols.length)
-      return;
-
-    switch(aColumn)
-      {
-        // Rename the key (only if not already present). If already present
-        // the refresh() will replace with the old one anyhow...
-        case 0:
-          if(!properties.containsKey(aValue)) {
-            Object oldValue = get(keys[aRow]);
-            remove(keys[aRow]);
-            put(aValue,oldValue);
-          }
-          refresh();
-          break;
-
-        // Update the value...
-        case 1:
-          put(keys[aRow],aValue);
-          //refresh();
-          break;
-
-        default:
-          // Should never be called
-          Logger.log(Logger.ERROR,"PropertiesTableModel: Column range",aColumn);
-      }
-  }
-
-  public boolean isCellEditable(int aRow, int aColumn)
-  {
-    return true;
-  }
-
-}
diff --git a/contrib/retep/uk/org/retep/util/proped/Main.java b/contrib/retep/uk/org/retep/util/proped/Main.java
deleted file mode 100644
index 6f2c73bc68..0000000000
--- a/contrib/retep/uk/org/retep/util/proped/Main.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package uk.org.retep.util.proped;
-
-import uk.org.retep.util.ExceptionDialog;
-import uk.org.retep.util.Globals;
-import uk.org.retep.util.Logger;
-import uk.org.retep.util.StandaloneApp;
-
-import java.io.IOException;
-import java.util.Iterator;
-import javax.swing.JComponent;
-
-/**
- * Standalone entry point for the Properties editor
- *
- * $Id: Main.java,v 1.1 2001/03/05 09:15:38 peter Exp $
- */
-
-public class Main extends StandaloneApp
-{
-  public Main(String[] args)
-  throws Exception
-  {
-    super(args);
-  }
-
-  public JComponent init()
-  throws Exception
-  {
-    Globals globals = Globals.getInstance();
-
-    PropertyEditor panel = new PropertyEditor();
-
-    // Only handle 1 open at a time in standalone mode
-    if(globals.getArgumentCount()>0) {
-      try {
-        panel.openFile(globals.getArgument(0));
-      } catch(IOException ioe) {
-        ExceptionDialog.displayException(ioe,"while loading "+globals.getArgument(0));
-        throw (Exception) ioe.fillInStackTrace();
-      }
-    }
-
-    return panel;
-  }
-
-  public static void main(String[] args)
-  throws Exception
-  {
-    Main main = new Main(args);
-    main.pack();
-    main.setVisible(true);
-  }
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/util/proped/PropertyEditor.java b/contrib/retep/uk/org/retep/util/proped/PropertyEditor.java
deleted file mode 100644
index b5c19e1087..0000000000
--- a/contrib/retep/uk/org/retep/util/proped/PropertyEditor.java
+++ /dev/null
@@ -1,381 +0,0 @@
-package uk.org.retep.util.proped;
-
-import uk.org.retep.util.ExceptionDialog;
-import uk.org.retep.util.misc.PropertiesIO;
-import uk.org.retep.util.models.PropertiesTableModel;
-
-import java.awt.*;
-import java.io.*;
-import java.util.*;
-import javax.swing.*;
-import java.awt.event.*;
-
-/**
- * A property file editor
- *
- * $Id: PropertyEditor.java,v 1.1 2001/03/05 09:15:38 peter Exp $
- *
- * @author
- * @version 1.0
- */
-
-public class PropertyEditor
-extends JPanel
-implements uk.org.retep.tools.Tool
-{
-  BorderLayout borderLayout1 = new BorderLayout();
-
-  // The filename, null if not set
-  String filename;
-  File file;
-
-  JScrollPane jScrollPane1 = new JScrollPane();
-  JTable contentTable = new JTable();
-
-  PropertiesTableModel model = new PropertiesTableModel();
-
-  boolean standaloneMode;
-
-  private static final String TITLE_PREFIX = "Retep PropertyEditor";
-  JPopupMenu popupMenu = new JPopupMenu();
-  JMenuItem newPopupItem = new JMenuItem();
-  JMenuItem dupPopupItem = new JMenuItem();
-  JMenuItem delPopupItem = new JMenuItem();
-  JMenuBar menuBar = new JMenuBar();
-  JMenu jMenu1 = new JMenu();
-  JMenuItem jMenuItem4 = new JMenuItem();
-  JMenuItem jMenuItem5 = new JMenuItem();
-  JMenuItem jMenuItem6 = new JMenuItem();
-  JMenuItem jMenuItem7 = new JMenuItem();
-  JMenuItem jMenuItem8 = new JMenuItem();
-  JMenuItem closeMenuItem = new JMenuItem();
-
-  public PropertyEditor()
-  {
-    try
-    {
-      jbInit();
-    }
-    catch(Exception ex)
-    {
-      ex.printStackTrace();
-    }
-  }
-
-  /**
-   * @return the default menubar
-   */
-  public JMenuBar getMenuBar()
-  {
-    return menuBar;
-  }
-
-  /**
-   * @return the File menu
-   */
-  public JMenu getMenu()
-  {
-    return jMenu1;
-  }
-
-  /**
-   * @return the recomended title string for the parent JFrame/JInternalFrame
-   */
-  public String getTitle()
-  {
-    if(filename==null) {
-      return TITLE_PREFIX;
-    }
-    return TITLE_PREFIX+": "+filename;
-  }
-
-  /**
-   * Sets menus up to Standalone mode
-   */
-  public void setStandaloneMode(boolean aMode)
-  {
-    standaloneMode=aMode;
-    if(aMode) {
-      closeMenuItem.setText("Exit");
-    } else {
-      closeMenuItem.setText("Close");
-    }
-  }
-
-  public boolean isStandalone()
-  {
-    return standaloneMode;
-  }
-
-  public void openFile(String aFile)
-  throws IOException
-  {
-    openFile(new File(aFile));
-  }
-
-  public void openFile(File aFile)
-  throws IOException
-  {
-    FileInputStream fis = new FileInputStream(aFile);
-    Properties p = new Properties();
-    p.load(fis);
-    fis.close();
-    model.setProperties(p);
-
-    file=aFile;
-    filename = aFile.getAbsolutePath();
-  }
-
-  public void saveFile(File aFile)
-  throws IOException
-  {
-    FileOutputStream fis = new FileOutputStream(aFile);
-    PropertiesIO.save(model.getProperties(),fis,'=',"Written by "+TITLE_PREFIX);
-    fis.close();
-
-    filename = aFile.getAbsolutePath();
-    file = aFile;
-  }
-
-  void jbInit() throws Exception
-  {
-    this.setLayout(borderLayout1);
-    contentTable.setToolTipText("");
-    contentTable.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
-    contentTable.setModel(model);
-    contentTable.addMouseListener(new java.awt.event.MouseAdapter()
-    {
-      public void mouseClicked(MouseEvent e)
-      {
-        contentTable_mouseClicked(e);
-      }
-      public void mouseReleased(MouseEvent e)
-      {
-        contentTable_mouseReleased(e);
-      }
-    });
-    newPopupItem.setText("New");
-    newPopupItem.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        newPopupItem_actionPerformed(e);
-      }
-    });
-    dupPopupItem.setText("Duplicate");
-    dupPopupItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(67, java.awt.event.KeyEvent.CTRL_MASK, false));
-    dupPopupItem.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        dupPopupItem_actionPerformed(e);
-      }
-    });
-    delPopupItem.setText("Delete");
-    delPopupItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(68, java.awt.event.KeyEvent.CTRL_MASK, false));
-    delPopupItem.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        delPopupItem_actionPerformed(e);
-      }
-    });
-    jMenu1.setText("File");
-    jMenuItem4.setText("Open");
-    jMenuItem4.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        jMenuItem4_actionPerformed(e);
-      }
-    });
-    jMenuItem5.setText("Save");
-    jMenuItem5.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        jMenuItem5_actionPerformed(e);
-      }
-    });
-    jMenuItem6.setText("Save As");
-    jMenuItem6.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        jMenuItem6_actionPerformed(e);
-      }
-    });
-    jMenuItem7.setText("Revert");
-    jMenuItem7.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        jMenuItem7_actionPerformed(e);
-      }
-    });
-    jMenuItem8.setText("Print");
-    closeMenuItem.setText("Close");
-    closeMenuItem.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        closeMenuItem_actionPerformed(e);
-      }
-    });
-    jMenu2.setText("Edit");
-    jMenuItem1.setText("New");
-    jMenuItem1.setAccelerator(javax.swing.KeyStroke.getKeyStroke(78, java.awt.event.KeyEvent.CTRL_MASK, false));
-    jMenuItem1.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        newPopupItem_actionPerformed(e);
-      }
-    });
-    jMenuItem2.setText("Duplicate");
-    jMenuItem3.setText("Delete");
-    this.add(jScrollPane1, BorderLayout.CENTER);
-    jScrollPane1.getViewport().add(contentTable, null);
-    popupMenu.add(newPopupItem);
-    popupMenu.add(dupPopupItem);
-    popupMenu.add(delPopupItem);
-    menuBar.add(jMenu1);
-    menuBar.add(jMenu2);
-    jMenu1.add(jMenuItem4);
-    jMenu1.add(jMenuItem5);
-    jMenu1.add(jMenuItem6);
-    jMenu1.add(jMenuItem7);
-    jMenu1.addSeparator();
-    jMenu1.add(jMenuItem8);
-    jMenu1.addSeparator();
-    jMenu1.add(closeMenuItem);
-    jMenu2.add(jMenuItem1);
-    jMenu2.add(jMenuItem2);
-    jMenu2.add(jMenuItem3);
-  }
-
-  Point popupPoint = new Point();
-  JMenu jMenu2 = new JMenu();
-  JMenuItem jMenuItem1 = new JMenuItem();
-  JMenuItem jMenuItem2 = new JMenuItem();
-  JMenuItem jMenuItem3 = new JMenuItem();
-  void contentTable_mouseClicked(MouseEvent e)
-  {
-    if(e.isPopupTrigger()) {
-      popupPoint.setLocation(e.getX(),e.getY());
-      popupMenu.show(contentTable,e.getX(),e.getY());
-    }
-  }
-
-  void contentTable_mouseReleased(MouseEvent e)
-  {
-    contentTable_mouseClicked(e);
-  }
-
-  void jMenuItem4_actionPerformed(ActionEvent e)
-  {
-    JFileChooser fc = new JFileChooser();
-    if(fc.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) {
-      try {
-        openFile(fc.getSelectedFile());
-      } catch(IOException ioe) {
-        ExceptionDialog.displayException(ioe);
-      }
-    }
-  }
-
-  void closeMenuItem_actionPerformed(ActionEvent e)
-  {
-    if(standaloneMode) {
-      System.exit(0);
-    } else {
-      filename="";
-      file=null;
-      model.setProperties(new Properties());
-    }
-  }
-
-  void newPopupItem_actionPerformed(ActionEvent e)
-  {
-    int y = contentTable.rowAtPoint(popupPoint);
-
-    // create a new unique key based on the current one
-    String key=(String) model.getValueAt(y,0);
-
-    if(key==null) {
-      key="new-key";
-    }
-
-    int uid=1;
-    while(model.containsKey(key+uid)) {
-      uid++;
-    }
-
-    key=key+uid;
-    model.put(key,"");
-    contentTable.clearSelection();
-  }
-
-  void dupPopupItem_actionPerformed(ActionEvent e)
-  {
-    int y = contentTable.rowAtPoint(popupPoint);
-
-    // create a new unique key based on the current one
-    String key=(String) model.getValueAt(y,0);
-    Object val=model.get(key);
-
-    int uid=1;
-    while(model.containsKey(key+uid)) {
-      uid++;
-    }
-
-    key=key+uid;
-    model.put(key,val);
-    contentTable.clearSelection();
-  }
-
-  void delPopupItem_actionPerformed(ActionEvent e)
-  {
-    int y = contentTable.rowAtPoint(popupPoint);
-    model.remove(model.getValueAt(y,0));
-  }
-
-  void jMenuItem6_actionPerformed(ActionEvent e)
-  {
-    JFileChooser fc = new JFileChooser();
-    if(fc.showSaveDialog(this) == JFileChooser.APPROVE_OPTION) {
-      try {
-        saveFile(fc.getSelectedFile());
-      } catch(IOException ioe) {
-        ExceptionDialog.displayException(ioe);
-      }
-    }
-  }
-
-  void jMenuItem5_actionPerformed(ActionEvent e)
-  {
-    if(filename==null) {
-      jMenuItem6_actionPerformed(e);
-    } else {
-      try {
-        saveFile(file);
-      } catch(IOException ioe) {
-        ExceptionDialog.displayException(ioe);
-      }
-    }
-  }
-
-  void jMenuItem7_actionPerformed(ActionEvent e)
-  {
-    // add check here
-    if(file!=null) {
-      try {
-        openFile(file);
-      } catch(IOException ioe) {
-        ExceptionDialog.displayException(ioe);
-      }
-    } else {
-      jMenuItem4_actionPerformed(e);
-    }
-  }
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/xml/core/XMLFactory.java b/contrib/retep/uk/org/retep/xml/core/XMLFactory.java
deleted file mode 100644
index 09565b0011..0000000000
--- a/contrib/retep/uk/org/retep/xml/core/XMLFactory.java
+++ /dev/null
@@ -1,334 +0,0 @@
-package uk.org.retep.xml.core;
-
-import java.io.IOException;
-import java.io.Writer;
-
-/**
- * An XMLFactory is used to render XML Tags, accounting for nesting etc
- */
-public class XMLFactory
-{
-  /**
-   * The lest level (ie, how many tags down the tree we are)
-   */
-  protected int level;
-
-  /**
-   * The size of our tag name cache
-   */
-  protected int maxlevel;
-
-  /**
-   * Our tag name cache
-   */
-  protected String[] names;
-
-  /**
-   * Used to keep track of how formatting is done
-   */
-  protected boolean hascontent;
-  protected boolean[] contbuf;
-
-  /**
-   * Scratch used by nest()
-   */
-  private char[] nestbuf;
-
-  /**
-   * The destination Writer
-   */
-  protected Writer out;
-
-  /**
-   * True if we are still within a tag
-   */
-  protected boolean inTag;
-
-  /**
-   * True if we have just created a tag so parameters are valid
-   */
-  protected boolean inArg;
-
-  /**
-   * Constructs an XMLFactory with no output Writer
-   */
-  public XMLFactory()
-  {
-    this(10);
-  }
-
-  /**
-   * Constructs an XMLFactory with no output Writer
-   * @param m Expected number of leaves in the XML Tree
-   */
-  public XMLFactory(int m)
-  {
-    // Initialise the names cache
-    level=0;
-    maxlevel=m;
-    names=new String[maxlevel];
-    contbuf=new boolean[maxlevel];
-
-    // This is used by nest()
-    nestbuf=new char[maxlevel];
-    for(int i=0;i<maxlevel;i++)
-      nestbuf[i]=' ';
-  }
-
-  /**
-   * Constructs an XMLFactory
-   * @param out Writer to send the output to
-   */
-  public XMLFactory(Writer out)
-  throws IOException
-  {
-    this();
-    setWriter(out);
-  }
-
-  /**
-   * Constructs an XMLFactory
-   * @param out Writer to send the output to
-   * @param encoding The XML encoding
-   */
-  public XMLFactory(Writer out,String encoding)
-  throws IOException
-  {
-    this();
-    setWriter(out,encoding);
-  }
-
-  /**
-   * Constructs an XMLFactory
-   * @param out Writer to send the output to
-   * @param m Expected number of leaves in the XML Tree
-   */
-  public XMLFactory(int m,Writer out)
-  throws IOException
-  {
-    this(m);
-    setWriter(out);
-  }
-
-  /**
-   * Constructs an XMLFactory
-   * @param out Writer to send the output to
-   * @param encoding The XML encoding
-   * @param m Expected number of leaves in the XML Tree
-   */
-  public XMLFactory(int m,Writer out,String encoding)
-  throws IOException
-  {
-    this(m);
-    setWriter(out,encoding);
-  }
-
-  /**
-   * Sets the Writer to send the output to. This call will also send the
-   * XML header.
-   *
-   * @param out Writer to send output to
-   */
-  public void setWriter(Writer out)
-  throws IOException
-  {
-    setWriter(out,"ISO-8859-1");
-  }
-
-  /**
-   * Sets the Writer to send the output to. This call will also send the
-   * XML header using the supplied encoding. It is up to the user code to
-   * implement this encoding.
-   *
-   * @param out Writer to send output to
-   * @param encoding Encoding of the XML Output
-   */
-  public void setWriter(Writer out,String encoding)
-  throws IOException
-  {
-    this.out=out;
-    out.write("<?xml version=\"1.0\" encoding=\"");
-    out.write(encoding);
-    out.write("\" ?>\n");
-  }
-
-  /**
-   * @return Writer the XML is being sent out on.
-   */
-  public Writer getWriter() {
-    return out;
-  }
-
-  /**
-   * This starts a tag
-   * @param name The tag name
-   */
-  public void startTag(String name)
-  throws IOException
-  {
-    if(inTag && inArg) {
-      // Handles two startTag() calls in succession.
-      out.write(">");
-    }
-
-    nest(level);
-    out.write('<');
-    out.write(name);
-    inTag=true;
-    inArg=true;
-
-    // cache the current tag name
-    names[level]=name;
-
-    // cache the current hascontent value & reset
-    contbuf[level]=hascontent;
-    hascontent=false;
-
-    // increase the level and the cache's as necessary
-    level++;
-    if(level>maxlevel) {
-      maxlevel=maxlevel+10;
-
-      String n[]=new String[maxlevel];
-      System.arraycopy(names,0,n,0,level);
-      names=n;
-
-      boolean b[] = new boolean[maxlevel];
-      System.arraycopy(contbuf,0,b,0,level);
-      contbuf=b;
-    }
-  }
-
-  /**
-   * This ends a tag
-   */
-  public void endTag()
-  throws IOException, XMLFactoryException
-  {
-    if(level<1)
-      throw new XMLFactoryException("endTag called above root node");
-
-    level--;
-
-    if(inArg) {
-      // We are still within the opening tag
-      out.write(" />");
-    } else {
-      // We must have written some content or child tags
-
-      // hascontent is true if addContent() was called. If it was never called
-      // to get here some child tags must have been written, so we call nest()
-      // so that the close tag is on it's own line, and everything looks neat
-      // and tidy.
-      if(!hascontent)
-        nest(level);
-
-      out.write("</");
-      out.write(names[level]);
-      out.write('>');
-    }
-
-    inArg=false;    // The parent tag must be told it now has content
-    inTag= level>0; // Are we still in a tag?
-    hascontent=contbuf[level];  // retrieve this level's hascontent value
-  }
-
-  /**
-   * This completes the document releasing any open resources.
-   */
-  public void close()
-  throws IOException, XMLFactoryException
-  {
-    while(level>0)
-      endTag();
-    out.write('\n');
-    out.flush();
-  }
-
-  /**
-   * This writes an attribute to the current tag. If the value is null, then no action is taken.
-   * @param name Name of the parameter
-   * @param value Value of the parameter
-   * @throw XMLFactoryException if out of context
-   */
-  public void addAttribute(String name,Object value)
-  throws IOException, XMLFactoryException
-  {
-    if(value==null)
-      return;
-
-    if(inArg) {
-      out.write(' ');
-      out.write(name);
-      out.write("=\"");
-      out.write(encode(value.toString()));
-      out.write("\"");
-    } else
-      throw new XMLFactoryException("Cannot add attribute outside of a tag");
-  }
-
-  /**
-   * This writes some content to the current tag. Once this has been called,
-   * you cannot add any more attributes to the current tag. Note, if c is null,
-   * no action is taken.
-   * @param c content to add.
-   */
-  public void addContent(Object c)
-  throws IOException, XMLFactoryException
-  {
-    if(c==null)
-      return;
-
-    if(inTag) {
-      if(inArg) {
-        // close the open tag
-        out.write('>');
-        inArg=false;
-      }
-      out.write(c.toString());
-
-      // This is used by endTag()
-      hascontent=true;
-    } else
-      throw new XMLFactoryException("Cannot add content outside of a tag");
-  }
-
-  /**
-   * This adds a comment to the XML file. This is normally used at the start of
-   * any XML output.
-   * @parm c Comment to include
-   */
-  public void addComment(Object c)
-  throws IOException, XMLFactoryException
-  {
-    if(inTag)
-      throw new XMLFactoryException("Cannot add comments within a tag");
-
-    out.write("\n<!-- ");
-    out.write(c.toString());
-    out.write(" -->");
-  }
-
-  /**
-   * Indents the output according to the level
-   * @param level The indent level to generate
-   */
-  protected void nest(int level)
-  throws IOException
-  {
-    out.write('\n');
-    while(level>nestbuf.length) {
-      out.write(nestbuf,0,nestbuf.length);
-      level-=nestbuf.length;
-    }
-    out.write(nestbuf,0,level);
-  }
-
-  /**
-   * Encodes the string so that any XML tag chars are translated
-   */
-  protected String encode(String s) {
-    return s;
-  }
-
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/xml/core/XMLFactoryException.java b/contrib/retep/uk/org/retep/xml/core/XMLFactoryException.java
deleted file mode 100644
index 5f9d497209..0000000000
--- a/contrib/retep/uk/org/retep/xml/core/XMLFactoryException.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package uk.org.retep.xml.core;
-
-/**
- * Title:
- * Description:
- * Copyright:    Copyright (c) 2001
- * Company:
- * @author
- * @version 1.0
- */
-
-public class XMLFactoryException extends Exception
-{
-
-  public XMLFactoryException(String s)
-  {
-    super(s);
-  }
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/xml/jdbc/XMLDatabase.java b/contrib/retep/uk/org/retep/xml/jdbc/XMLDatabase.java
deleted file mode 100644
index 50aaaa1d90..0000000000
--- a/contrib/retep/uk/org/retep/xml/jdbc/XMLDatabase.java
+++ /dev/null
@@ -1,237 +0,0 @@
-package uk.org.retep.xml.jdbc;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import uk.org.retep.xml.core.XMLFactory;
-import uk.org.retep.xml.core.XMLFactoryException;
-
-public class XMLDatabase
-{
-  /**
-   * The XMLFactory being used by this instance
-   */
-  protected XMLFactory factory;
-
-  /**
-   * Constructor. setXMLFactory() must be called if this method is used.
-   */
-  public XMLDatabase()
-  {
-  }
-
-  /**
-   * Constructor
-   * @param fac XMLFactory to use
-   */
-  public XMLDatabase(XMLFactory fac)
-  {
-    this();
-    setXMLFactory(fac);
-  }
-
-  /**
-   * Sets the factory to use.
-   * @param factory XMLFactory to use
-   */
-  public void setXMLFactory(XMLFactory factory)
-  {
-    this.factory=factory;
-  }
-
-  /**
-   * @return the XMLFactory being used.
-   */
-  public XMLFactory getXMLFactory()
-  {
-    return factory;
-  }
-
-  /**
-   * Flushes all output to the Writer.
-   * @throw IOException from Writer
-   * @throw XMLFactoryException from XMLFactory
-   */
-  public void close()
-  throws IOException, XMLFactoryException
-  {
-    factory.close();
-  }
-
-  /**
-   * writes the schema of a table.
-   * @param con Connection to database
-   * @param table Table name
-   * @throw IOException from Writer
-   * @throw SQLException from JDBC
-   * @throw XMLFactoryException from XMLFactory
-   */
-  public void writeTable(Connection con,String table)
-  throws IOException,SQLException,XMLFactoryException
-  {
-    writeTable(con.getMetaData(),table);
-  }
-
-  /**
-   * writes the schema of a table.
-   * @param db DatabaseMetaData for the database
-   * @param table Table name
-   * @throw IOException from Writer
-   * @throw SQLException from JDBC
-   * @throw XMLFactoryException from XMLFactory
-   */
-  public void writeTable(DatabaseMetaData db,String table)
-  throws IOException,SQLException,XMLFactoryException
-  {
-    writeTable(db,null,null,table);
-  }
-
-  /**
-   * writes the schema of a table.
-   * @param db DatabaseMetaData for the database
-   * @param table Table name
-   * @throw IOException from Writer
-   * @throw SQLException from JDBC
-   * @throw XMLFactoryException from XMLFactory
-   */
-  public void writeTable(DatabaseMetaData db,String cat,String schem,String table)
-  throws IOException,SQLException,XMLFactoryException
-  {
-    ResultSet trs;
-
-    factory.startTag("TABLE");
-    factory.addAttribute("NAME",table);
-    // fetch the remarks for this table (if any)
-    trs = db.getTables(null,null,table,null);
-    if(trs!=null) {
-      if(trs.next()) {
-        String rem = trs.getString(5);
-        if(rem!=null)
-          factory.addContent(rem);
-      }
-      trs.close();
-    }
-
-    trs = db.getColumns(null,null,table,"%");
-    if(trs!=null) {
-      while(trs.next()) {
-        factory.startTag("COLUMN");
-        factory.addAttribute("NAME",trs.getString(4));
-        factory.addAttribute("TYPE",trs.getString(6));
-        factory.addAttribute("COLUMN_SIZE",trs.getString(7));
-        factory.addAttribute("DECIMAL_DIGITS",trs.getString(9));
-        factory.addAttribute("NUM_PREC_RADIX",trs.getString(10));
-        factory.addAttribute("NULLABLE",trs.getString(11));
-        factory.addAttribute("COLUMN_DEF",trs.getString(13));
-        factory.addAttribute("CHAR_OCTET_LENGTH",trs.getString(16));
-        factory.addAttribute("ORDINAL_POSITION",trs.getString(17));
-        factory.addAttribute("IS_NULLABLE",trs.getString(18));
-        factory.addAttribute("TABLE_CAT",trs.getString(1));
-        factory.addAttribute("TABLE_SCHEM",trs.getString(2));
-        String rem = trs.getString(12);
-        if(rem!=null)
-          factory.addContent(rem);
-        factory.endTag();
-      }
-      trs.close();
-    }
-
-    factory.endTag();
-  }
-
-  /**
-   * This generates the schema of an entire database.
-   * @param db Connection to database
-   * @param table Table pattern
-   * @throw IOException from Writer
-   * @throw SQLException from JDBC
-   * @throw XMLFactoryException from XMLFactory
-   * @see java.sql.DatabaseMetaData.getTables()
-   */
-  public void writeDatabase(Connection db,String table)
-  throws IOException, SQLException, XMLFactoryException
-  {
-    writeDatabase(db.getMetaData(),null,null,table);
-  }
-
-  /**
-   * This generates the schema of an entire database.
-   * @param db DatabaseMetaData of database
-   * @param table Table pattern
-   * @throw IOException from Writer
-   * @throw SQLException from JDBC
-   * @throw XMLFactoryException from XMLFactory
-   * @see java.sql.DatabaseMetaData.getTables()
-   */
-  public void writeDatabase(DatabaseMetaData db,String table)
-  throws IOException, SQLException, XMLFactoryException
-  {
-    writeDatabase(db,null,null,table);
-  }
-
-  /**
-   * This generates the schema of an entire database.
-   * @param db DatabaseMetaData of database
-   * @param cat Catalog (may be null)
-   * @param schem Schema (may be null)
-   * @param table Table pattern
-   * @throw IOException from Writer
-   * @throw SQLException from JDBC
-   * @throw XMLFactoryException from XMLFactory
-   * @see java.sql.DatabaseMetaData.getTables()
-   */
-  public void writeDatabase(Connection db)
-  throws IOException, SQLException, XMLFactoryException
-  {
-    writeDatabase(db.getMetaData(),null,null,"%");
-  }
-
-  /**
-   * This generates the schema of an entire database.
-   * @param db DatabaseMetaData of database
-   * @param cat Catalog (may be null)
-   * @param schem Schema (may be null)
-   * @param table Table pattern
-   * @throw IOException from Writer
-   * @throw SQLException from JDBC
-   * @throw XMLFactoryException from XMLFactory
-   * @see java.sql.DatabaseMetaData.getTables()
-   */
-  public void writeDatabase(DatabaseMetaData db)
-  throws IOException, SQLException, XMLFactoryException
-  {
-    writeDatabase(db,null,null,"%");
-  }
-
-  /**
-   * This generates the schema of an entire database.
-   * @param db DatabaseMetaData of database
-   * @param cat Catalog (may be null)
-   * @param schem Schema (may be null)
-   * @param table Table pattern
-   * @throw IOException from Writer
-   * @throw SQLException from JDBC
-   * @throw XMLFactoryException from XMLFactory
-   * @see java.sql.DatabaseMetaData.getTables()
-   */
-  public void writeDatabase(DatabaseMetaData db,String cat,String schem,String table)
-  throws IOException, SQLException, XMLFactoryException
-  {
-    ResultSet rs = db.getTables(cat,schem,table,null);
-    if(rs!=null) {
-      factory.startTag("DATABASE");
-      factory.addAttribute("PRODUCT",db.getDatabaseProductName());
-      factory.addAttribute("VERSION",db.getDatabaseProductVersion());
-
-      while(rs.next()) {
-        writeTable(db,rs.getString(1),rs.getString(2),rs.getString(3));
-      }
-
-      factory.endTag();
-      rs.close();
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/xml/jdbc/XMLResultSet.java b/contrib/retep/uk/org/retep/xml/jdbc/XMLResultSet.java
deleted file mode 100644
index ee020df940..0000000000
--- a/contrib/retep/uk/org/retep/xml/jdbc/XMLResultSet.java
+++ /dev/null
@@ -1,505 +0,0 @@
-package uk.org.retep.xml.jdbc;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.util.Properties;
-import uk.org.retep.xml.core.XMLFactory;
-import uk.org.retep.xml.core.XMLFactoryException;
-
-/**
- * This class takes a java.sql.ResultSet object and generates an XML stream
- * based on it's contents.
- *
- * $Id: XMLResultSet.java,v 1.1 2001/01/23 10:22:20 peter Exp $
- */
-public class XMLResultSet
-{
-  /**
-   * The current ResultSet to process
-   */
-  protected ResultSet rs;
-
-  /**
-   * The XMLFactory being used by this instance
-   */
-  protected XMLFactory factory;
-
-  /**
-   * The default properties used when none are supplied by the user
-   */
-  protected static Properties defaults;
-
-  /**
-   * The default property name for defining the tag name used to define a
-   * ResultSet
-   */
-  public static String RESULTSET_NAME = "resultset.name";
-
-  /**
-   * The default tag name for a resultset
-   */
-  public static String DEFAULT_RESULTSET_NAME = "RESULTSET";
-
-  /**
-   * The default property name for defining the tag name used to define a row
-   */
-  public static String ROW_NAME = "row.name";
-
-  /**
-   * The default tag name for a row
-   */
-  public static String DEFAULT_ROW_NAME = "RECORD";
-
-  /**
-   * The default tag name for a resultset
-   */
-  public static String COLNAME = ".name";
-
-  /**
-   * The value of the property (named as its related column) used to define
-   * how the column is generated. This indicates that the columns data is
-   * enclosed within a pair of tags, ie: &lt;id&gt;1234&lt;/id&gt;
-   */
-  public static String CONTENT = "content";
-
-  /**
-   * The value of the property (named as its related column) used to define
-   * how the column is generated. This indicates that the columns data is
-   * an attribute in the columns tag. ie: <id value="1234" />
-   */
-  public static String ATTRIBUTE = "attribute";
-
-  /**
-   * This is the default attribute name used when the ATTRIBUTE option is set.
-   */
-  public static String DEFAULT_ATTRIBUTE = "VALUE";
-
-  /**
-   * The value of the property (named as its related column) used to define
-   * how the column is generated. This indicates that the columns data is
-   * an attribute in the parent's tag. ie: <row id="1234" />
-   */
-  public static String ROW_ATTRIBUTE = "row";
-
-  /**
-   * This property name marks the begining row number within the ResultSet to
-   * start processing.
-   */
-  public static String FIRST_ROW = "row.first";
-
-  /**
-   * This property name marks the last row number within the ResultSet to
-   * end processing.
-   */
-  public static String LAST_ROW = "row.last";
-
-  /**
-   * Constructor
-   */
-  public XMLResultSet()
-  {
-    factory = new XMLFactory();
-  }
-
-  /**
-   * Constructor
-   */
-  public XMLResultSet(ResultSet rs)
-  {
-    this();
-    setResultSet(rs);
-  }
-
-  /**
-   * Sets the ResultSet to use
-   * @param rs ResultSet
-   */
-  public void setResultSet(ResultSet rs)
-  {
-    this.rs=rs;
-  }
-
-  /**
-   * @return the current ResultSet
-   *
-   */
-  public ResultSet getResultSet()
-  {
-    return rs;
-  }
-
-  /**
-   * Sets the Writer to send all output to
-   * @param out Writer
-   * @throws IOException from XMLFactory
-   * @see XMLFactory.setWriter
-   */
-  public void setWriter(Writer out)
-  throws IOException
-  {
-    factory.setWriter(out);
-  }
-
-  /**
-   * @return Writer output is going to
-   */
-  public Writer getWriter()
-  {
-    return factory.getWriter();
-  }
-
-  /**
-   * @return XMLFactory being used
-   */
-  public XMLFactory getXMLFactory()
-  {
-    return factory;
-  }
-
-  /**
-   * Flushes all output to the Writer
-   * @throw IOException from Writer
-   * @throw XMLFactoryException from XMLFactory
-   */
-  public void close()
-  throws IOException, XMLFactoryException
-  {
-    factory.close();
-  }
-
-  /**
-   * Returns the default properties used by translate() and buildDTD()
-   * @return Properties default property settings
-   */
-  public static Properties getDefaultProperties()
-  {
-    if(defaults==null) {
-      defaults=new Properties();
-      defaults.setProperty(RESULTSET_NAME,DEFAULT_RESULTSET_NAME);
-      defaults.setProperty(ROW_NAME,DEFAULT_ROW_NAME);
-    }
-    return defaults;
-  }
-
-  /**
-   * This generates an XML version of a ResultSet sending it to the supplied
-   * Writer.
-   * @param rs ResultSet to convert
-   * @param p Properties for the conversion
-   * @param out Writer to send output to (replaces existing one)
-   * @throws XMLFactoryException from XMLFactory
-   * @throws IOException from Writer
-   * @throws SQLException from ResultSet
-   */
-  public void translate(ResultSet rs,Properties p,Writer out)
-  throws XMLFactoryException, IOException, SQLException
-  {
-    factory.setWriter(out);
-    translate(rs,p);
-  }
-
-  /**
-   * This generates an XML version of a ResultSet sending it to the supplied
-   * Writer using a default tag struct
-   * @param rs ResultSet to convert
-   * @param out Writer to send output to (replaces existing one)
-   * @throws XMLFactoryException from XMLFactory
-   * @throws IOException from Writer
-   * @throws SQLException from ResultSet
-   */
-  public void translate(ResultSet rs,Writer out)
-  throws XMLFactoryException, IOException, SQLException
-  {
-    factory.setWriter(out);
-    translate(rs,(Properties)null);
-  }
-
-  /**
-   * This generates an XML version of a ResultSet sending it to the current
-   * output stream using a default tag structure.
-   * @param rs ResultSet to convert
-   * @throws XMLFactoryException from XMLFactory
-   * @throws IOException from Writer
-   * @throws SQLException from ResultSet
-   */
-  public void translate(ResultSet rs)
-  throws XMLFactoryException, IOException, SQLException
-  {
-    translate(rs,(Properties)null);
-  }
-
-  /**
-   * This generates an XML version of a ResultSet sending it to the current
-   * output stream.
-   * @param rs ResultSet to convert
-   * @param p Properties for the conversion
-   * @throws XMLFactoryException from XMLFactory
-   * @throws IOException from Writer
-   * @throws SQLException from ResultSet
-   */
-  public void translate(ResultSet rs,Properties p)
-  throws XMLFactoryException, IOException, SQLException
-  {
-    // if we don't pass any properties, create an empty one and cache it if
-    // further calls do the same
-    if(p==null) {
-      p=getDefaultProperties();
-    }
-
-    // Fetch some common values
-    String setName = p.getProperty(RESULTSET_NAME,DEFAULT_RESULTSET_NAME);
-    String rowName = p.getProperty(ROW_NAME,DEFAULT_ROW_NAME);
-
-    ResultSetMetaData rsmd = rs.getMetaData();
-    int numcols = rsmd.getColumnCount();
-
-    String colname[] = new String[numcols];   // field name cache
-    int    coltype[] = new int[numcols];  // true to use attribute false content
-    String colattr[] = new String[numcols];   // Attribute name
-
-    // These deal with when an attribute is to go into the row's tag parameters
-    int parentFields[] = getRowAttributes(numcols,colname,colattr,coltype,rsmd,p); // used to cache the id's
-    int numParents= parentFields==null ? 0 : parentFields.length;            // number of parent fields
-    boolean haveParent= numParents>0;                 // true only if we need to us these
-
-    // This allows some limiting of the output result
-    int firstRow = Integer.parseInt(p.getProperty(FIRST_ROW,"0"));
-    int lastRow = Integer.parseInt(p.getProperty(LAST_ROW,"0"));
-    int curRow=0;
-
-    // Start the result set's tag
-    factory.startTag(setName);
-
-    while(rs.next()) {
-     if(firstRow<=curRow && (lastRow==0 || curRow<lastRow)) {
-      factory.startTag(rowName);
-
-      if(haveParent) {
-        // Add any ROW_ATTRIBUTE entries
-        for(int i=0;i<numParents;i++)
-          factory.addAttribute(colname[i],rs.getString(i+1));
-      }
-
-      // Process any CONTENT & ATTRIBUTE entries.
-      // This skips if all the entries are ROW_ATTRIBUTE's
-      if(numParents < numcols) {
-        for(int i=1;i<=numcols;i++) {
-          // Now do we write the value as an argument or as PCDATA?
-          switch(coltype[i-1]) {
-            case 1:
-              factory.startTag(colname[i-1]);
-              factory.addAttribute(colattr[i-1],rs.getString(i));
-              factory.endTag();
-              break;
-
-            case 0:
-              factory.startTag(colname[i-1]);
-              factory.addContent(rs.getString(i));
-              factory.endTag();
-              break;
-
-            default:
-              // Unknown type. This should only be called for ROW_ATTRIBUTE which
-              // is handled before this loop.
-              break;
-          }
-        }
-      }
-
-      // End the row
-      factory.endTag();
-    }
-   curRow++;
-
-   } // check for firstRow <= curRow <= lastRow
-
-   // Close the result set's tag
-   factory.endTag();
-  }
-
-  /**
-   * This method takes a ResultSet and writes it's DTD to the current writer
-   * @param rs ResultSet
-   */
-  public void buildDTD(ResultSet rs)
-  throws IOException, SQLException
-  {
-    buildDTD(rs,null,getWriter());
-  }
-
-  /**
-   * This method takes a ResultSet and writes it's DTD to the current writer
-   * @param rs ResultSet
-   * @param out Writer to send output to
-   */
-  public void buildDTD(ResultSet rs,Writer out)
-  throws IOException, SQLException
-  {
-    buildDTD(rs,null,out);
-  }
-
-  /**
-   * This method takes a ResultSet and writes it's DTD to the current writer
-   * @param rs ResultSet
-   * @param out Writer to send output to
-   */
-  public void buildDTD(ResultSet rs,Properties p)
-  throws IOException, SQLException
-  {
-    buildDTD(rs,p,getWriter());
-  }
-
-  /**
-   * This method takes a ResultSet and writes it's DTD to the current a.
-   *
-   * <p>ToDo:<ol>
-   * <li>Add ability to have NULLABLE columns appear as optional (ie instead of
-   * x, have x? (DTD for Optional). Can't use + or * as that indicates more than
-   * 1 instance).
-   * </ol>
-   *
-   * @param rs ResultSet
-   * @param p Properties defining tag types (as translate)
-   * @param out Writer to send output to
-   */
-  public void buildDTD(ResultSet rs,Properties p,Writer out)
-  throws IOException, SQLException
-  {
-    // if we don't pass any properties, create an empty one and cache it if
-    // further calls do the same
-    if(p==null) {
-      p=getDefaultProperties();
-    }
-
-    // Fetch some common values
-    String setName = p.getProperty(RESULTSET_NAME,DEFAULT_RESULTSET_NAME);
-    String rowName = p.getProperty(ROW_NAME,DEFAULT_ROW_NAME);
-
-    ResultSetMetaData rsmd = rs.getMetaData();
-    int numcols = rsmd.getColumnCount();
-
-    String colname[] = new String[numcols];   // field name cache
-    int    coltype[] = new int[numcols];  // true to use attribute false content
-    String colattr[] = new String[numcols];   // Attribute name
-
-    // These deal with when an attribute is to go into the row's tag parameters
-    int parentFields[] = getRowAttributes(numcols,colname,colattr,coltype,rsmd,p); // used to cache the id's
-    int numParents= parentFields==null ? 0 : parentFields.length;            // number of parent fields
-    boolean haveParent= numParents>0;                 // true only if we need to us these
-
-    // Now the dtd defining the ResultSet
-    out.write("<!ELEMENT ");
-    out.write(setName);
-    out.write(" (");
-    out.write(rowName);
-    out.write("*)>\n");
-
-    // Now the dtd defining each row
-    out.write("<!ELEMENT ");
-    out.write(rowName);
-    out.write(" (");
-    boolean s=false;
-    for(int i=0;i<numcols;i++) {
-      if(coltype[i]!=2) { // not ROW_ATTRIBUTE
-        if(s)
-          out.write(",");
-        out.write(colname[i]);
-        s=true;
-      }
-    }
-    out.write(")>\n");
-
-    // Now handle any ROW_ATTRIBUTE's
-    if(haveParent) {
-      out.write("<!ATTLIST ");
-      out.write(rowName);
-      for(int i=0;i<numParents;i++) {
-        out.write("\n ");
-        out.write(colname[parentFields[i]]);
-        out.write(" CDATA #IMPLIED");
-      }
-      out.write("\n>\n");
-    }
-
-    // Now add any CONTENT & ATTRIBUTE fields
-    for(int i=0;i<numcols;i++) {
-      if(coltype[i]!=2) {
-        out.write("<!ELEMENT ");
-        out.write(colname[i]);
-
-        // CONTENT
-        if(coltype[i]==0) {
-          out.write(" (#PCDATA)");
-        } else {
-          out.write(" EMPTY");
-        }
-
-        out.write(">\n");
-
-        // ATTRIBUTE
-        if(coltype[i]==1) {
-          out.write("<!ATTLIST ");
-          out.write(colname[i]);
-          out.write("\n ");
-          out.write(colattr[i]);
-          out.write(" CDATA #IMPLIED\n>\n");
-        }
-      }
-    }
-  }
-
-   /**
-    * Private method used by the core translate and buildDTD methods.
-    * @param numcols Number of columns in ResultSet
-    * @param colname Array of column names
-    * @param colattr Array of column attribute names
-    * @param coltype Array of column types
-    * @param rsmd ResultSetMetaData for ResultSet
-    * @param p Properties being used
-    * @return array containing field numbers which should appear as attributes
-    * within the rows tag.
-    * @throws SQLException from JDBC
-    */
-  private int[] getRowAttributes(int numcols,
-      String colname[],String colattr[],
-      int coltype[],
-      ResultSetMetaData rsmd,Properties p)
-  throws SQLException
-  {
-    int pf[] = null;
-    int nf = 0;
-
-    // Now we put a columns value as an attribute if the property
-    // fieldname=attribute (ie myname=attribute)
-    // and if the fieldname.name property exists, use it as the attribute name
-    for(int i=0;i<numcols;i++) {
-      colname[i] = rsmd.getColumnName(i+1);
-      colattr[i] = p.getProperty(colname[i]+COLNAME,DEFAULT_ATTRIBUTE);
-      if(p.getProperty(colname[i],CONTENT).equals(ROW_ATTRIBUTE)) {
-        // Ok, ROW_ATTRIBUTE's need to be cached, so add them in here
-        coltype[i]=2;
-        if(pf==null) {
-          pf = new int[numcols]; // Max possible number of entries
-        }
-        pf[nf++] = i;
-      } else {
-        // Normal CONTENT or ATTRIBUTE entry
-        coltype[i] = p.getProperty(colname[i],CONTENT).equals(ATTRIBUTE) ? 1 : 0;
-      }
-    }
-
-    // Form an array exactly nf elements long
-    if(nf>0) {
-      int r[] = new int[nf];
-      System.arraycopy(pf,0,r,0,nf);
-      return r;
-    }
-
-    // Return null if no tags are to appear as attributes to the row's tag
-    return null;
-  }
-
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/xml/parser/TagHandler.java b/contrib/retep/uk/org/retep/xml/parser/TagHandler.java
deleted file mode 100644
index 78deb0ec0a..0000000000
--- a/contrib/retep/uk/org/retep/xml/parser/TagHandler.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package uk.org.retep.xml.parser;
-
-import java.io.CharArrayWriter;
-import java.io.IOException;
-import java.util.List;
-import java.util.Iterator;
-import java.util.HashSet;
-import java.util.ArrayList;
-import java.util.HashMap;
-import org.xml.sax.AttributeList;
-import org.xml.sax.HandlerBase;
-import org.xml.sax.InputSource;
-import org.xml.sax.Parser;
-import org.xml.sax.SAXException;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-/**
- * This class implements the base of the XML handler. You create an instance,
- * register classes (who implement TagListener) that are interested in the tags
- * and pass it to SAX.
- *
- * <p>Or you create an instance, register the TagListeners and use the getParser()
- * method to create a Parser. Then start parsing by calling it's parse() method.
- */
-
-public class TagHandler extends HandlerBase {
-
-  /**
-   * The current active level
-   */
-  private int level;
-
-  /**
-   * cache used to handle nesting of tags
-   */
-  private List contents;
-
-  /**
-   * cache used to handle nesting of tags
-   */
-  private List tags;
-
-  /**
-   * cache used to handle nesting of tags
-   */
-  private List args;
-
-  // Current active content writer
-  private CharArrayWriter content;
-
-  // List of TagListener's who want to be fed data
-  private HashSet tagListeners;
-
-  /**
-   * default constructor
-   */
-  public TagHandler() {
-    level=0;
-    contents = new ArrayList();
-    tags = new ArrayList();
-    args = new ArrayList();
-    tagListeners = new HashSet();
-  }
-
-  /**
-   * Called by SAX when a tag is begun. This simply creates a new level in the
-   * cache and stores the parameters and tag name in there.
-   */
-  public void startElement(String p0, AttributeList p1) throws SAXException {
-
-    // Now move up and fetch a CharArrayWriter from the cache
-    // creating if this is the first time at this level
-    if(contents.size()<=level) {
-      contents.add(new CharArrayWriter());
-      tags.add(p0);
-      args.add(new HashMap());
-    }
-
-    content=(CharArrayWriter) contents.get(level);
-    content.reset();
-
-    // Also cache the tag's text and argument list
-    tags.set(level,p0);
-
-    HashMap h = (HashMap) args.get(level);
-    h.clear();
-    for(int i=p1.getLength()-1;i>-1;i--) {
-      h.put(p1.getName(i),p1.getValue(i));
-    }
-
-    // Now notify any TagListeners
-    Iterator it = tagListeners.iterator();
-    while(it.hasNext())
-      ( (TagListener) it.next() ).tagStart(level,p0,h);
-
-    // Now move up a level
-    level++;
-  }
-
-  /**
-   * This is called by SAX at the end of a tag. This calls handleTag() and then
-   * raises the level, so that the previous parent tag may continue.
-   */
-  public void endElement(String p0) throws SAXException {
-    // move up a level retrieving that level's current content
-    // Now this exception should never occur as the underlying parser should
-    // actually trap it.
-    if(level<1)
-      throw new SAXException("Already at top level?");
-    level--;
-
-    // Now notify any TagListeners
-    Iterator it = tagListeners.iterator();
-    while(it.hasNext())
-      ( (TagListener) it.next() ).tagContent(content);
-
-    // allows large content to be released early
-    content.reset();
-
-    // Now reset content to the previous level
-    content=(CharArrayWriter) contents.get(level);
-  }
-
-  /**
-   * Called by SAX so that content between the start and end tags are captured.
-   */
-  public void characters(char[] p0, int p1, int p2) throws SAXException {
-    content.write(p0,p1,p2);
-  }
-
-  /**
-   * Adds a TagListener so that it is notified of tags as they are processed.
-   * @param handler TagListener to add
-   */
-  public void addTagListener(TagListener h) {
-    tagListeners.add(h);
-  }
-
-  /**
-   * Removes the TagListener so it no longer receives notifications of tags
-   */
-  public void removeTagListener(TagListener h) {
-    tagListeners.remove(h);
-  }
-
-  /**
-   * This method returns a org.xml.sax.Parser object that will parse the
-   * contents of a URI.
-   *
-   * <p>Normally you would call this method, then call the parse(uri) method of
-   * the returned object.
-   * @return org.xml.sax.Parser object
-   */
-  public Parser getParser()
-  throws SAXException
-  {
-    try {
-      SAXParserFactory spf = SAXParserFactory.newInstance();
-
-      String validation = System.getProperty ("javax.xml.parsers.validation", "false");
-      if (validation.equalsIgnoreCase("true"))
-        spf.setValidating (true);
-
-      SAXParser sp = spf.newSAXParser();
-      Parser parser = sp.getParser ();
-
-      parser.setDocumentHandler(this);
-
-      return(parser);
-    } catch(ParserConfigurationException pce) {
-      throw new SAXException(pce.toString());
-    }
-  }
-
-  /**
-   * This method will parse the specified URI.
-   *
-   * <p>Internally this is the same as getParser().parse(uri);
-   * @param uri The URI to parse
-   */
-  public void parse(String uri)
-  throws IOException, SAXException
-  {
-    getParser().parse(uri);
-  }
-
-  /**
-   * This method will parse the specified InputSource.
-   *
-   * <p>Internally this is the same as getParser().parse(is);
-   * @param is The InputSource to parse
-   */
-  public void parse(InputSource is)
-  throws IOException, SAXException
-  {
-    getParser().parse(is);
-  }
-
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/xml/parser/TagListener.java b/contrib/retep/uk/org/retep/xml/parser/TagListener.java
deleted file mode 100644
index 24146b3e24..0000000000
--- a/contrib/retep/uk/org/retep/xml/parser/TagListener.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package uk.org.retep.xml.parser;
-
-import java.util.HashMap;
-import java.io.CharArrayWriter;
-
-/**
- * This interface defines the methods a class needs to implement if it wants the
- * xml parser to notify it of any xml tags.
- */
-
-public interface TagListener {
-  /**
-   * This is called when a tag has just been started.
-   * <p><b>NB:</b> args is volatile, so if you use it beyond the lifetime of
-   * this call, then you must make a copy of the HashMap (and not use simply
-   * store this HashMap).
-   * @param level The number of tags above this
-   * @param tag The tag name
-   * @param args A HashMap of any arguments
-   */
-  public void tagStart(int level,String tag,HashMap args);
-  /**
-   * This method is called by ContHandler to process a tag once it has been
-   * fully processed.
-   * <p><b>NB:</b> content is volatile, so you must copy its contents if you use
-   * it beyond the lifetime of this call.
-   * @param content CharArrayWriter containing the content of the tag.
-   */
-  public void tagContent(CharArrayWriter content);
-}
\ No newline at end of file
diff --git a/contrib/retep/uk/org/retep/xml/test/XMLExport.java b/contrib/retep/uk/org/retep/xml/test/XMLExport.java
deleted file mode 100644
index 116f250906..0000000000
--- a/contrib/retep/uk/org/retep/xml/test/XMLExport.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package uk.org.retep.xml.test;
-
-import java.lang.Exception;
-import java.io.*;
-import java.sql.*;
-import java.util.Properties;
-import uk.org.retep.xml.core.XMLFactoryException;
-import uk.org.retep.xml.jdbc.XMLDatabase;
-import uk.org.retep.xml.jdbc.XMLResultSet;
-
-/**
- * This "test" class is a fully functional tool in its own right. It utilises
- * the xml classes to query and export to XML, or to dump database structures
- * into XML.
- */
-
-public class XMLExport
-{
-  /**
-   * The current Database Connection
-   */
-  protected Connection conn;
-  protected Statement stat;
-  protected String drvr,url,table;
-
-  protected XMLResultSet xrs;
-  protected XMLDatabase xdb;
-  protected Properties prop;
-  protected boolean outXML;
-  protected boolean outDTD;
-  protected boolean outTAB;
-  protected int maxRows=0;
-
-  public XMLExport(String[] args)
-  throws IOException,SQLException,XMLFactoryException,ClassNotFoundException
-  {
-    xrs = new XMLResultSet();
-    xrs.setWriter(new OutputStreamWriter(System.out));
-    //Properties p = new Properties(xrs.getDefaultProperties());
-    prop = (Properties) xrs.getDefaultProperties().clone();
-
-    xdb = new XMLDatabase(xrs.getXMLFactory());
-
-    for(int i=0;i<args.length;i++) {
-      String arg=args[i];
-      if(arg.startsWith("-D")) {
-        // Load JDBC Driver
-        drvr=arg.substring(2);
-        Class.forName(drvr);
-        System.out.println("Now using JDBC Driver: "+drvr);
-      } else if(arg.startsWith("-J")) {
-        // Open a JDBC Connection (closing the existing one, if any)
-        close();
-        url  = arg.substring(2);
-        conn = DriverManager.getConnection(url);
-        System.out.println("Opened "+url);
-        stat=null;
-      } else if(arg.startsWith("-M")) {
-        // Set the maximum number of rows to process (0=no limit)
-        maxRows=Integer.parseInt(arg.substring(2));
-        if(maxRows<0)
-          maxRows=0;
-        prop.setProperty(XMLResultSet.FIRST_ROW,"0");
-        prop.setProperty(XMLResultSet.LAST_ROW,Integer.toString(maxRows));
-      } else if(arg.startsWith("-O")) {
-        // Set the output file for XML & DTD
-        xrs.setWriter(new FileWriter(arg.substring(2)));
-        System.out.println("XML/DTD Output now going to "+arg.substring(2));
-      } else if(arg.startsWith("-P")) {
-        // Set a parameter for XML & DTD
-        int p = arg.indexOf('=');
-        prop.setProperty(arg.substring(2,p),arg.substring(p+1));
-      } else if(arg.startsWith("-S")) {
-        // -Stable generate schema of just table
-        // -S generate schema of entire database
-        if(arg.length()>2) {
-          String table=arg.substring(2);
-          System.out.println("Generating XML Schema of table "+table);
-          xdb.writeTable(conn,table);
-          xdb.close();
-        } else {
-          System.out.println("Generating XML Schema of database");
-          xdb.writeDatabase(conn);
-          xdb.close();
-        }
-      } else if(arg.equals("-V")) {
-        // Select table output
-        outXML=outDTD=false;
-      } else if(arg.equals("-X")) {
-        // Select XML output
-        outXML=true;
-        outDTD=outTAB=false;
-      } else if(arg.equals("-Y")) {
-        // Select DTD output
-        outXML=outTAB=false;
-        outDTD=true;
-      } else if(arg.startsWith("-")) {
-        System.err.println("Unknown argument: "+arg);
-        System.exit(1);
-      } else {
-        // Ok, anything not starting with "-" are queries
-        if(stat==null)
-          stat=conn.createStatement();
-
-        System.out.println("Executing "+arg);
-        ResultSet rs = stat.executeQuery(arg);
-        if(rs!=null) {
-          if(outXML) {
-            xrs.translate(rs,prop);
-            xrs.close();
-          } else if(outDTD) {
-            // Output the DTD
-            xrs.buildDTD(rs,prop);
-            xrs.close();
-          } else {
-            // Normal resultset output
-            int rc=0;
-
-            ResultSetMetaData rsmd = rs.getMetaData();
-            int nc = rsmd.getColumnCount();
-            boolean us=false;
-            for(int c=0;c<nc;c++) {
-              if(us)
-                System.out.print("\t");
-              System.out.print(rsmd.getColumnName(c+1));
-              us=true;
-            }
-            System.out.println();
-
-            while(rs.next() && (maxRows==0 || rc<maxRows)) {
-              us=false;
-              for(int c=0;c<nc;c++) {
-                if(us)
-                  System.out.print("\t");
-                System.out.print(rs.getString(c+1));
-                us=true;
-              }
-              System.out.println();
-              rc++;
-            }
-
-            System.out.println("Returned "+rc+" rows.");
-          }
-          rs.close();
-        }
-      }
-    }
-
-    close();
-  }
-
-  public void close() throws SQLException
-  {
-    if(conn!=null) {
-      conn.close();
-      System.out.println("Closed "+url);
-      conn=null;
-      stat=null;
-    }
-  }
-
-  public static void main(String[] args)
-  {
-    if(args.length==0) {
-      System.out.println("Useage: java uk.org.retep.xml.test.XMLExport [args ...]\nwhere args are:\n"+
-        "-Dclass.name  JDBC Driver Class\n"+
-        "-Jurl         JDBC URL\n"+
-        "-Mmax         Maximum number of rows to process\n"+
-        "-Ofilename    Send all XML or DTD output to file\n"+
-        "-Pkey=value   Property passed on to XMLResultSet\n"+
-        "-S[table]     Write XML description of table. Whole DB if table left out.\n"+
-        "-V            Default: Write result to System.out\n"+
-        "-X            Write result in XML to System.out\n"+
-        "-Y            Write DTD describing result to System.out\n"+
-        "\nAny other argument not starting with - is treated as an SQL Query\n"+
-        "\nFor example:\n"+
-        "To dump the table structure of a database into db.xml, use\n   $ java uk.org.retep.xml.test.XMLExport -Doracle.jdbc.driver.OracleDriver -Jjdbc:oracle:thin:dbname/username@localhost:1521:ISORCL -Odb.xml -S\n"+
-        "To dump the structure of a single table PRODUCTS and write into products.xml, use\n   $ clear;java uk.org.retep.xml.test.XMLExport -Doracle.jdbc.driver.OracleDriver-Jjdbc:oracle:thin:dbname/username@localhost:1521:ISORCL -Oproducts.xml -SPRODUCT\n"+
-        "To query a table and write the results into standard out as XML, use\n   $ java uk.org.retep.xml.test.XMLExport -Doracle.jdbc.driver.OracleDriver -Jjdbc:oracle:thin:dbname/username@localhost:1521:ISORCL -M5 -PSKU=row -PIMAGE=attribute -X \"select sku,image,template from product\"\n"+
-        "To query a table and write a DTD describing the ResultSet, use\n   $ java uk.org.retep.xml.test.XMLExport -Doracle.jdbc.driver.OracleDriver -Jjdbc:oracle:thin:dbname/username@localhost:1521:ISORCL -M5 -PSKU=row -PIMAGE=attribute -Y \"select sku,image,template from product\"\n"
-      );
-      System.exit(1);
-    }
-
-    try {
-      XMLExport XMLExport1 = new XMLExport(args);
-    } catch(Exception e) {
-      e.printStackTrace();
-    }
-  }
-}
\ No newline at end of file
diff --git a/contrib/rserv/ApplySnapshot.in b/contrib/rserv/ApplySnapshot.in
deleted file mode 100644
index 695605f139..0000000000
--- a/contrib/rserv/ApplySnapshot.in
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- perl -*-
-# ApplySnapshot
-# Vadim Mikheev, (c) 2000, PostgreSQL Inc.
-
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-use lib "@LIBDIR@";
-use IO::File;
-use RServ;
-use Getopt::Long;
-
-$| = 1;
-
-$result = GetOptions("debug!", "verbose!", "help",
-		     "host=s", "user=s", "password=s");
-
-my $debug = $opt_debug || 0;
-my $verbose = $opt_verbose || 0;
-my $snapshot = $opt_snapshot || "__Snapshot";
-
-if (defined($opt_help) || (scalar(@ARGV) < 1)) {
-    print "Usage: $0 --host=name --user=name --password=string slavedb\n";
-    exit ((scalar(@ARGV) < 1)? 1:0);
-}
-
-my $slave = $ARGV[0] || "slave";
-
-my $sinfo = "dbname=$slave";
-$sinfo = "$sinfo host=$opt_host" if (defined($opt_host));
-$sinfo = "$sinfo user=$opt_user" if (defined($opt_user));
-$sinfo = "$sinfo password=$opt_password" if (defined($opt_password));
-
-my $conn = Pg::connectdb($sinfo);
-
-my $inpf = new IO::File;
-$inpf = STDIN;
-
-$RServ::quiet = !$verbose;
-
-$res = ApplySnapshot ($conn, $inpf);
-
-if ($res > 0)
-{
-	printf STDERR "Snapshot applied\n";
-}
-elsif ($res != 0)
-{
-	printf STDERR "ERROR\n";
-	exit(1);
-}
-
-exit(0);
diff --git a/contrib/rserv/CleanLog.in b/contrib/rserv/CleanLog.in
deleted file mode 100644
index f15baea0b1..0000000000
--- a/contrib/rserv/CleanLog.in
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- perl -*-
-# CleanLog
-# Vadim Mikheev, (c) 2000, PostgreSQL Inc.
-
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-use lib "@LIBDIR@";
-
-use Getopt::Long;
-use RServ;
-
-$| = 1;
-
-$result = GetOptions("debug!", "verbose!", "help", "snapshot=s",
-		     "host=s", "user=s", "password=s");
-
-my $debug = $opt_debug || 0;
-my $verbose = $opt_verbose || 0;
-my $snapshot = $opt_snapshot || "__Snapshot";
-
-if (defined($opt_help) || (scalar(@ARGV) < 2) || ($ARGV[1] !~ /^\d+$/)) {
-    print "Usage: $PROGRAM_NAME --host=name --user=name --password=string masterdb syncid\n";
-    exit ((scalar(@ARGV) < 2)? 1: 0);
-}
-
-my $dbname = $ARGV[0];
-my $howold = $ARGV[1];
-
-my $minfo = "dbname=$dbname";
-$minfo = "$minfo host=$opt_host" if (defined($opt_host));
-$minfo = "$minfo user=$opt_user" if (defined($opt_user));
-$minfo = "$minfo password=$opt_password" if (defined($opt_password));
-
-print "Master connection is $minfo\n" if ($debug);
-print "Slave connection is $sinfo\n" if ($debug);
-
-my $conn = Pg::connectdb($minfo);
-
-$RServ::quiet = !$verbose;
-
-$res = CleanLog($conn, $howold);
-
-exit(1) if $res < 0;
-
-printf STDERR "Deleted %d log records\n", $res if $res > 0;
-
-exit(0);
diff --git a/contrib/rserv/GetSyncID.in b/contrib/rserv/GetSyncID.in
deleted file mode 100644
index 10f4a93e47..0000000000
--- a/contrib/rserv/GetSyncID.in
+++ /dev/null
@@ -1,57 +0,0 @@
-# -*- perl -*-
-# GetSyncID
-# Vadim Mikheev, (c) 2000, PostgreSQL Inc.
-
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-use lib "@LIBDIR@";
-
-use Pg;
-use Getopt::Long;
-use RServ;
-
-$| = 1;
-
-my $verbose = 1;
-
-$result = GetOptions("debug!", "verbose!", "help",
-		     "host=s", "user=s", "password=s");
-
-my $debug = $opt_debug || 0;
-my $verbose = $opt_verbose if (defined($opt_verbose));
-
-if (defined($opt_help) || (scalar(@ARGV) < 1)) {
-    print "Usage: $0 --host=name --user=name --password=string slavedb\n";
-    exit ((scalar(@ARGV) < 1)? 1: 0);
-}
-
-my $dbname = $ARGV[0];
-
-my $sinfo = "dbname=$dbname";
-$sinfo = "$sinfo host=$opt_host" if (defined($opt_host));
-$sinfo = "$sinfo user=$opt_user" if (defined($opt_user));
-$sinfo = "$sinfo password=$opt_password" if (defined($opt_password));
-
-print("Connecting to '$sinfo'\n") if ($debug || $verbose);
-my $conn = Pg::connectdb($sinfo);
-
-$RServ::quiet = !$verbose;
-
-$res = GetSyncID($conn);
-
-die "ERROR\n" if $res < 0;
-
-if (! defined $res)
-{
-    printf STDERR "No SyncID found\n";
-}
-else
-{
-    print("Last SyncID applied: ") if ($verbose);
-    printf "%d", $res;
-    print("\n") if ($verbose);
-}
-
-exit(0);
diff --git a/contrib/rserv/InitRservTest.in b/contrib/rserv/InitRservTest.in
deleted file mode 100644
index 414744c6c0..0000000000
--- a/contrib/rserv/InitRservTest.in
+++ /dev/null
@@ -1,259 +0,0 @@
-#!/bin/sh
-# InitRservTest
-# erServer demonstration implementation
-# (c) 2000 Vadim Mikheev, PostgreSQL Inc.
-
-[ -n "$RSERV_PERL" ] || RSERV_PERL=@LIBDIR@
-[ -n "$RSERV_SQL" ] || RSERV_SQL=@SQLDIR@
-[ -n "$RSERV_BIN" ] || RSERV_BIN=@BINDIR@
-export RSERV_PERL
-export RSERV_SQL
-export RSERV_BIN
-
-pargs=
-
-while [[ $1 == -* ]]; do
-    case "$1" in
-	--user)
-	    shift
-	    pargs="$pargs -U $1"
-	    ;;
-	--host)
-	    shift
-	    pargs="$pargs -h $1"
-	    ;;
-	*)
-	    echo "Usage: $0 --user name --host name masterdb slavedb"
-	    exit 1
-	    ;;
-    esac
-    shift
-done
-
-masterdb=$1
-slavedb=$2
-
-[ "${masterdb}" != "" ] || masterdb=master
-[ "${slavedb}" != "" ] || slavedb=slave
-
-echo "Master -> $masterdb"
-echo "Slave  -> $slavedb"
-
-############################################################################
-
-fill()
-{
-	table="create table test (i text, k int, l int);
-copy test from stdin;
-Line: 1	1	1
-Line: 2	2	2
-Line: 3	3	3
-Line: 4	4	4
-Line: 5	5	5
-Line: 6	6	6
-Line: 7	7	7
-Line: 8	8	8
-Line: 9	9	9
-Line: 10	10	10
-Line: 11	11	11
-Line: 12	12	12
-Line: 13	13	13
-Line: 14	14	14
-Line: 15	15	15
-Line: 16	16	16
-Line: 17	17	17
-Line: 18	18	18
-Line: 19	19	19
-Line: 20	20	20
-Line: 21	21	21
-Line: 22	22	22
-Line: 23	23	23
-Line: 24	24	24
-Line: 25	25	25
-Line: 26	26	26
-Line: 27	27	27
-Line: 28	28	28
-Line: 29	29	29
-Line: 30	30	30
-Line: 31	31	31
-Line: 32	32	32
-Line: 33	33	33
-Line: 34	34	34
-Line: 35	35	35
-Line: 36	36	36
-Line: 37	37	37
-Line: 38	38	38
-Line: 39	39	39
-Line: 40	40	40
-Line: 41	41	41
-Line: 42	42	42
-Line: 43	43	43
-Line: 44	44	44
-Line: 45	45	45
-Line: 46	46	46
-Line: 47	47	47
-Line: 48	48	48
-Line: 49	49	49
-Line: 50	50	50
-Line: 51	51	51
-Line: 52	52	52
-Line: 53	53	53
-Line: 54	54	54
-Line: 55	55	55
-Line: 56	56	56
-Line: 57	57	57
-Line: 58	58	58
-Line: 59	59	59
-Line: 60	60	60
-Line: 61	61	61
-Line: 62	62	62
-Line: 63	63	63
-Line: 64	64	64
-Line: 65	65	65
-Line: 66	66	66
-Line: 67	67	67
-Line: 68	68	68
-Line: 69	69	69
-Line: 70	70	70
-Line: 71	71	71
-Line: 72	72	72
-Line: 73	73	73
-Line: 74	74	74
-Line: 75	75	75
-Line: 76	76	76
-Line: 77	77	77
-Line: 78	78	78
-Line: 79	79	79
-Line: 80	80	80
-Line: 81	81	81
-Line: 82	82	82
-Line: 83	83	83
-Line: 84	84	84
-Line: 85	85	85
-Line: 86	86	86
-Line: 87	87	87
-Line: 88	88	88
-Line: 89	89	89
-Line: 90	90	90
-Line: 91	91	91
-Line: 92	92	92
-Line: 93	93	93
-Line: 94	94	94
-Line: 95	95	95
-Line: 96	96	96
-Line: 97	97	97
-Line: 98	98	98
-Line: 99	99	99
-Line: 100	100	100
-\\.";
-	echo "$table" | psql $pargs $1 || exit
-	if [ "$1" = "$masterdb" ]
-	then
-		rm -rf __tmpf__
-		psql $pargs -c "select * into table testoid from test" $1 || exit
-		psql $pargs -c "copy testoid with oids to '`pwd`/__tmpf__'" $1 || exit
-		psql $pargs -c "select * into table teststr from test" $1 || exit
-	else
-		psql $pargs -c "select * into table testoid from test where k < 0" $1 || exit
-		psql $pargs -c "copy testoid with oids from '`pwd`/__tmpf__'" $1 || exit
-		psql $pargs -c "select * into table teststr from test" $1 || exit
-		rm -rf __tmpf__
-	fi
-	psql $pargs -c "create unique index i_test on test (k)" $1 || exit
-	psql $pargs -c "create unique index i_testoid on testoid (oid)" $1 || exit
-	psql $pargs -c "create unique index i_teststr on teststr (i)" $1 || exit
-	psql $pargs -c vacuum $1 || exit
-}
-
-############################################################################
-
-echo
-echo
-echo '                            ATTENTION'
-echo
-echo This script will destroy databases with names MASTER and SLAVE
-echo
-echo -n "Are you going to continue ? [Y/N] "
-
-read answ
-
-case $answ in
-    Y*|y*)
-        ;;
-    *)
-        exit
-        ;;
-esac
-
-echo
-echo
-
-sql="drop database $masterdb"
-echo $sql
-psql $pargs -c "$sql" template1
-sql="create database $masterdb"
-echo $sql
-psql $pargs -c "$sql" template1 || exit
-
-echo Setup master system
-psql $pargs $masterdb < $RSERV_SQL/master.sql || exit
-
-echo Wait for template1 to become available...
-sleep 1
-
-sql="drop database $slavedb"
-echo $sql
-psql $pargs -c "$sql" template1
-sql="create database $slavedb"
-echo $sql
-psql $pargs -c "$sql" template1 || exit
-
-echo Setup slave system
-psql $pargs $slavedb < $RSERV_SQL/slave.sql || exit
-
-echo Create and fill test, testoid and teststr tables in master db
-fill $masterdb
-echo
-echo Register test, testoid and teststr tables for replication on master
-echo
-$RSERV_BIN/MasterAddTable $masterdb test k
-$RSERV_BIN/MasterAddTable $masterdb testoid oid
-$RSERV_BIN/MasterAddTable $masterdb teststr i
-
-echo Create and fill test, testoid and teststr tables in slave db
-fill $slavedb
-echo
-echo Register test, testoid and teststr tables for replication on slave
-echo
-$RSERV_BIN/SlaveAddTable $slavedb test k
-$RSERV_BIN/SlaveAddTable $slavedb testoid oid
-$RSERV_BIN/SlaveAddTable $slavedb teststr i
-
-echo 
-echo 
-echo 
-echo 
-echo 
-echo 
-echo 
-echo 
-echo "            Now make changes in $masterdb db and run"
-echo 
-echo "                Replicate $masterdb $slavedb"
-echo 
-echo "            to replicate the master on the slave."
-echo 
-echo "            You may also use the RservTest tcl utility"
-echo "            to demonstrate this functionality."
-echo 
-echo 
-echo 
-echo 
-echo 
-echo 
-echo 
-echo 
-
-exit
-
-############################################################################
diff --git a/contrib/rserv/Makefile b/contrib/rserv/Makefile
deleted file mode 100644
index 2725119746..0000000000
--- a/contrib/rserv/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# Makefile for erServer demonstration implementation
-# (c) 2000 Vadim Mikheev, PostgreSQL Inc.
-
-subdir = contrib/rserv
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-NAME	= rserv
-SONAME	= $(NAME)$(DLSUFFIX)
-SQLS	= master.sql slave.sql
-TCLS	= RservTest
-PERLS	= MasterInit MasterAddTable Replicate MasterSync CleanLog
-PERLS	+= SlaveInit SlaveAddTable GetSyncID
-PERLS	+= PrepareSnapshot ApplySnapshot
-SCRIPTS	= InitRservTest
-
-override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
-override CFLAGS += $(CFLAGS_SL)
-override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
-
-
-all: $(SQLS) $(TCLS) $(PERLS) $(SCRIPTS) $(SONAME)
-
-%.sql: %.sql.in
-	sed 's,@MODULE_FILENAME@,$$libdir/$(NAME),g' $< >$@
-
-$(PERLS) $(TCLS) $(SCRIPTS): %: %.in
-	sed -e 's,@MODULE_FILENAME@,$$libdir/$(NAME),g' \
-	    -e 's:@SQLDIR@:$(datadir)/contrib:g' \
-	    -e 's:@BINDIR@:$(bindir):g' \
-	    -e 's:@LIBDIR@:$(datadir)/contrib:g' $< >$@
-	chmod a+x $@
-
-
-install: all installdirs
-	for file in $(SQLS); do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/contrib || exit ; \
-	done
-	for file in $(TCLS) $(PERLS) $(SCRIPTS); do \
-	  $(INSTALL_SCRIPT) $$file $(DESTDIR)$(bindir) || exit ; \
-	done
-	$(INSTALL_DATA) $(srcdir)/RServ.pm $(DESTDIR)$(datadir)/contrib
-	$(INSTALL_SHLIB) $(SONAME) $(DESTDIR)$(pkglibdir)
-	$(INSTALL_DATA) $(srcdir)/README.$(NAME) $(DESTDIR)$(docdir)/contrib
-
-installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/contrib \
-	  $(DESTDIR)$(pkglibdir) $(DESTDIR)$(docdir)/contrib
-
-
-clean distclean maintainer-clean:
-	rm -f $(SQLS) $(TCLS) $(PERLS) $(SCRIPTS) $(SONAME) $(NAME).o
diff --git a/contrib/rserv/MasterAddTable.in b/contrib/rserv/MasterAddTable.in
deleted file mode 100644
index 3d92b47cbd..0000000000
--- a/contrib/rserv/MasterAddTable.in
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- perl -*-
-# MasterAddTable
-# Vadim Mikheev, (c) 2000, PostgreSQL Inc.
-
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-use Pg;
-use Getopt::Long;
-
-$| = 1;
-
-$result = GetOptions("debug!", "verbose!", "help",
-		     "host=s", "user=s", "password=s");
-
-my $debug = $opt_debug || 0;
-my $verbose = $opt_verbose || 0;
-
-if (defined($opt_help) || (scalar(@ARGV) < 3)) {
-    print "Usage: $0 --host=name --user=name --password=string masterdb table column\n";
-    exit ((scalar(@ARGV) < 3)? 1: 0);
-}
-
-my $dbname = $ARGV[0];
-my $table = $ARGV[1];
-my $keyname = $ARGV[2];
-
-my $minfo = "dbname=$dbname";
-$minfo = "$minfo host=$opt_host" if (defined($opt_host));
-$minfo = "$minfo user=$opt_user" if (defined($opt_user));
-$minfo = "$minfo password=$opt_password" if (defined($opt_password));
-
-my $conn = Pg::connectdb($minfo);
-
-my $result = $conn->exec("BEGIN");
-die $conn->errorMessage if $result->resultStatus ne PGRES_COMMAND_OK;
-
-$result = $conn->exec("select pgc.oid, pga.attnum from pg_class pgc" . 
-					  ", pg_attribute pga where pgc.relname = '$table'" .
-					  " and pgc.oid = pga.attrelid" . 
-					  " and pga.attname = '$keyname'");
-die $conn->errorMessage if $result->resultStatus ne PGRES_TUPLES_OK;
-
-my @row = $result->fetchrow;
-die "Can't find table/key\n" if ! defined $row[0] || ! defined $row[1];
-
-$result = $conn->exec("create trigger _RSERV_TRIGGER_T_ after" . 
-					  " insert or update or delete on $table" .
-					  " for each row execute procedure" . 
-					  " _rserv_log_('$row[1]')");
-die $conn->errorMessage if $result->resultStatus ne PGRES_COMMAND_OK;
-
-$result = $conn->exec("insert into _RSERV_TABLES_ (tname, cname, reloid, key)" . 
-					  " values ('$table', '$keyname', $row[0], $row[1])");
-die $conn->errorMessage if $result->resultStatus ne PGRES_COMMAND_OK;
-
-$result = $conn->exec("COMMIT");
-die $conn->errorMessage if $result->resultStatus ne PGRES_COMMAND_OK;
-
-exit(0);
diff --git a/contrib/rserv/MasterInit.in b/contrib/rserv/MasterInit.in
deleted file mode 100644
index 68854c743a..0000000000
--- a/contrib/rserv/MasterInit.in
+++ /dev/null
@@ -1,107 +0,0 @@
-# -*- perl -*-
-# MasterInit
-# Vadim Mikheev, (c) 2000, PostgreSQL Inc.
-
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-use Pg;
-use Getopt::Long;
-
-$| = 1;
-
-$result = GetOptions("debug!", "verbose!", "help",
-		     "host=s", "user=s", "password=s");
-
-my $debug = $opt_debug || 0;
-my $verbose = $opt_verbose || 0;
-
-if (defined($opt_help) || (scalar(@ARGV) < 1)) {
-    print "Usage: $0 --host=name --user=name --password=string masterdb\n";
-    exit ((scalar(@ARGV) < 1)? 1:0);
-}
-
-my $master = $ARGV[0] || "master";
-
-my $minfo = "dbname=$master";
-$minfo = "$minfo host=$opt_host" if (defined($opt_host));
-$minfo = "$minfo user=$opt_user" if (defined($opt_user));
-$minfo = "$minfo password=$opt_password" if (defined($opt_password));
-
-sub RollbackAndQuit {
-    $conn = shift @_;
-
-    print STDERR "Error in query: ", $conn->errorMessage;
-    $conn->exec("ROLLBACK");
-    exit (-1);
-}
-
-my $conn = Pg::connectdb($minfo);
-if ($conn->status != PGRES_CONNECTION_OK) {
-    print STDERR "Failed opening $minfo\n";
-    exit 1;
-}
-
-my $result = $conn->exec("BEGIN");
-RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK);
-
-$result = $conn->exec("set transaction isolation level serializable");
-RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK);
-
-# List of slave servers
-$result = $conn->exec("create table _RSERV_SERVERS_" .
-					  " (server serial, host text, post int4, dbase text)");
-RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK);
-
-# List of replicated tables
-$result = $conn->exec("create table _RSERV_TABLES_" .
-					  " (tname name, cname name, reloid oid, key int4)");
-RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK);
-
-# Bookkeeping log for row replication
-$result = $conn->exec("create table _RSERV_LOG_" .
-					  " (reloid oid, logid int4, logtime timestamp, deleted int4, key text)");
-RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK);
-
-# This is to speedup lookup of deleted tuples
-$result = $conn->exec("create index _RSERV_LOG_INDX_DLT_ID_ on _RSERV_LOG_ (deleted, logid)");
-RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK);
-
-# This is to speedup cleanup
-$result = $conn->exec("create index _RSERV_LOG_INDX_TM_ID_ on _RSERV_LOG_ (logtime, logid)");
-RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK);
-
-# This is to speedup trigger and lookup of updated tuples
-$result = $conn->exec("create index _RSERV_LOG_INDX_REL_KEY_ on _RSERV_LOG_ (reloid, key)");
-RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK);
-
-# Sync point for each slave server
-$result = $conn->exec("create table _RSERV_SYNC_" .
-					  " (server int4, syncid int4, synctime timestamp" .
-					  ", status int4, minid int4, maxid int4, active text)");
-RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK);
-
-$result = $conn->exec("create index _RSERV_SYNC_INDX_SRV_ID_ on _RSERV_SYNC_ (server, syncid)");
-RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK);
-
-# Sync point reference numbers
-$result = $conn->exec("create sequence _rserv_sync_seq_");
-RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK);
-
-$result = $conn->exec("CREATE FUNCTION _rserv_log_() RETURNS opaque" .
-					  " AS '@MODULE_FILENAME@' LANGUAGE 'c'");
-RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK);
-
-$result = $conn->exec("CREATE FUNCTION _rserv_sync_(int4) RETURNS int4" .
-					  " AS '@MODULE_FILENAME@' LANGUAGE 'c'");
-RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK);
-
-$result = $conn->exec("CREATE FUNCTION _rserv_debug_(int4) RETURNS int4" .
-					  " AS '@MODULE_FILENAME@' LANGUAGE 'c'");
-RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK);
-
-$result = $conn->exec("COMMIT");
-RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK);
-
-exit (0);
diff --git a/contrib/rserv/MasterSync.in b/contrib/rserv/MasterSync.in
deleted file mode 100644
index 8328d78cc1..0000000000
--- a/contrib/rserv/MasterSync.in
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- perl -*-
-# MasterSync
-# Vadim Mikheev, (c) 2000, PostgreSQL Inc.
-
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-use lib "@LIBDIR@";
-
-use Getopt::Long;
-use RServ;
-
-$| = 1;
-
-$result = GetOptions("debug!", "verbose!", "quiet!", "help",
-		     "host=s", "user=s", "password=s");
-
-my $debug = $opt_debug || 0;
-my $verbose = $opt_verbose || 0;
-my $quiet = $opt_quiet || 0;
-
-if (defined($opt_help) || (scalar(@ARGV) < 2) || ($ARGV[1] !~ /^\d+$/)) {
-    print "Usage: $0 --host=name --user=name --password=string masterdb syncid\n";
-    exit ((scalar(@ARGV) < 2)? 1:0);
-}
-
-my $master = $ARGV[0] || "master";
-my $server = 0;
-my $syncid = $ARGV[1] || die "SyncID not specified";
-
-my $minfo = "dbname=$master";
-$minfo = "$minfo host=$opt_host" if (defined($opt_host));
-$minfo = "$minfo user=$opt_user" if (defined($opt_user));
-$minfo = "$minfo password=$opt_password" if (defined($opt_password));
-
-my $conn = Pg::connectdb($minfo);
-
-$RServ::quiet = !$verbose;
-
-$res = SyncSyncID($conn, $server, $syncid);
-
-if ($res == 0)
-{
-    printf STDERR "SyncID updated on $master\n" if ($verbose);
-    exit(0);
-}
-
-printf STDERR "ERROR\n" unless ($quiet);
-exit(1);
diff --git a/contrib/rserv/PrepareSnapshot.in b/contrib/rserv/PrepareSnapshot.in
deleted file mode 100644
index bd0fa237dc..0000000000
--- a/contrib/rserv/PrepareSnapshot.in
+++ /dev/null
@@ -1,58 +0,0 @@
-# -*- perl -*-
-# PrepareSnapshot
-# Vadim Mikheev, (c) 2000, PostgreSQL Inc.
-
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-use lib "@LIBDIR@";
-
-use IO::File;
-use Getopt::Long;
-use RServ;
-
-$| = 1;
-
-$result = GetOptions("debug!", "verbose!", "help", "snapshot=s",
-		     "host=s", "user=s", "password=s");
-
-my $debug = $opt_debug || 0;
-my $verbose = $opt_verbose || 0;
-my $snapshot = $opt_snapshot || "__Snapshot";
-
-if (defined($opt_help) || (scalar(@ARGV) < 1)) {
-    print "Usage: $0 --snapshot=file --host=name --user=name --password=string masterdb\n";
-    exit ((scalar(@ARGV) < 1)? 1:0);
-}
-
-my $master = $ARGV[0] || "master";
-my $server = 0;
-
-my $minfo = "dbname=$master";
-$minfo = "$minfo host=$opt_host" if (defined($opt_host));
-$minfo = "$minfo user=$opt_user" if (defined($opt_user));
-$minfo = "$minfo password=$opt_password" if (defined($opt_password));
-
-my $conn = Pg::connectdb($minfo);
-
-my $outf = new IO::File;
-$outf = STDOUT;
-
-$RServ::quiet = !$verbose;
-
-$res = PrepareSnapshot ($conn, $outf, $server);
-
-if ($res == 0)
-{
-	printf STDERR "Sync-ed\n";
-	exit(0);
-}
-if ($res > 0)
-{
-	printf STDERR "Snapshot dumped to STDOUT\n";
-	exit(0);
-}
-
-printf STDERR "ERROR\n";
-exit(1);
diff --git a/contrib/rserv/README.rserv b/contrib/rserv/README.rserv
deleted file mode 100644
index 1a61fefd2d..0000000000
--- a/contrib/rserv/README.rserv
+++ /dev/null
@@ -1,133 +0,0 @@
-erServer demonstration implementation
-(c) 2000, Vadim Mikheev and Thomas Lockhart, PostgreSQL Inc.
-
-Version 0.1:
-  Replicates a master database to a single slave database.
-  Tested under Linux (Mandrake 7.2).
-
-Requirements:
-
-- PostgreSQL >= 7.0.X
-  A separate Makefile is required for PostgreSQL 7.0.x and earlier
-- Perl5 and the PostgreSQL perl interface
-- TCL and the PostgreSQL tcl interface (for demo only)
-
-
-How to compile:
-
-- make all
-- make install
-
-Scripts and libraries are installed in places which are consistant
-with the way other contrib/ code is installed; underneath the core
-items in a contrib/ directory.
-
-
-The toolset:
-
-MasterInit dbname
-  sets up structures and user-defined functions for a master
-  database. 
-
-SlaveInit dbname
-  sets up structures for a slave database. Does not include triggers,
-  but only bookkeeping tables. 
-
-MasterAddTable dbname table column
-  sets up triggers for the specified table and column. Note that this
-  column must be updated for replication to occur. 
-
-SlaveAddTable dbname table column
-  sets up bookkeeping for the specified table and column.
-
-Replicate masterdb slavedb
-  actually replicate changes from a master to single slave. Note that
-  this must be repeated to replicate to multiple slaves, but the
-  bookkeeping for each slave is handled separately so each can be
-  updated at different times and with different sets of changes.
-
-GetSyncID [--noverbose] slavedb
-  returns the last syncid the specified slave has seen. May be used
-  in conjunction with SyncSyncID and CleanLog using the --noverbose
-  option.
-
-MasterSync masterdb syncid
-  registers a syncid with the specified master database. Used to
-  propagate replication success back to the master database.
-
-CleanLog masterdb syncid
-  removes obsolete entries in the master database replication log
-  table up to the specified replication sequence number.
-
-Other utilities:
-
-PrepareSnapshot
-  build a file of replication information from the specified masterdb.
-
-ApplySnapshot
-  use a file of replication information to apply to the specified
-  slavedb. 
-
-
-How to run a demo:
-
-Run the InitRservTest script. It will create two local databases
-'master' & 'slave' with table 'test' in them. It accepts the following
-arguments:
-  --help
-    Print a usage message and quit.
-  --user name
-    Access the database with another username.
-  --host name
-    Access a remote database. Note that the shared library *must* be
-    visible in the same path as installed on the build machine.
-  masterdb
-  slavedb
-    Names of test databases. Defaults to 'master' and 'slave',
-	respectively.
-
-Once the test databases are set up, simply updating the master table
-is sufficient to log a replication event. You can update the table
-test then run "Replicate master slave", or you can use the demo
-program RservTest.
-
-Run the tcl/tk GUI demo program, RservTest. It has a single window,
-which has four buttons and three data entry boxes.
-
-  --------------------------------------------------
- |   PostgreSQL Asynchronous Replication            |
- |        Master          Slave                     |
- |      < master    >   < slave      >              |
- |                                                  |
- |  [ Update    ]   <                         >     |
- |  [ Replicate ]                                   |
- |  [ Show      ]   ____________                    |
- |                                                  |
- |            [ Quit ]                              |
- |                                                  |
-  --------------------------------------------------
-
-The demo has the following behaviors:
-
-If you enter a string into the data entry field to the right of
-[Update], then that string will be used to either update the master
-database or to query the slave database.
-
-If you click [Update], then the string in the data entry box will be
-entered into the master database.
-
-If you click [Replicate], then all changes since the last replication
-will be propagated to the slave database.
-
-If you click [Show], then the slave database will be queried to find
-the string in the data entry box to the right of the [Update]
-button. If the string does not (yet) exist in the slave database, then
-"n/a" will appear to the right of the [Show] button. If the string
-does exist in the slave database, then it will be printed to the right
-of the [Show] button.
-
-
-Todo:
-1. Support for multiple slave servers.
-2. Explicit support for master/slave failover.
-3. More docs.
diff --git a/contrib/rserv/RServ.pm b/contrib/rserv/RServ.pm
deleted file mode 100644
index de0f037cbe..0000000000
--- a/contrib/rserv/RServ.pm
+++ /dev/null
@@ -1,761 +0,0 @@
-# -*- perl -*-
-# RServ.pm
-# Vadim Mikheev, (c) 2000, PostgreSQL Inc.
-
-package RServ;
-
-require Exporter;
-@ISA = qw(Exporter);
-@EXPORT = qw(PrepareSnapshot ApplySnapshot GetSyncID SyncSyncID CleanLog);
-@EXPORT_OK = qw();
-
-use Pg;
-
-$debug = 0;
-$quiet = 1;
-
-my %Mtables = ();
-my %Stables = ();
-
-sub PrepareSnapshot
-{
-	my ($conn, $outf, $server) = @_; # (@_[0], @_[1], @_[2]);
-
-	my $result = $conn->exec("BEGIN");
-	if ($result->resultStatus ne PGRES_COMMAND_OK)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(-1);
-	}
-	$result = $conn->exec("set transaction isolation level serializable");
-	if ($result->resultStatus ne PGRES_COMMAND_OK)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(-1);
-	}
-
-	# MAP oid --> tabname, keyname
-	$result = $conn->exec("select pgc.oid, pgc.relname, pga.attname" . 
-						  " from _RSERV_TABLES_ rt, pg_class pgc, pg_attribute pga" . 
-						  " where pgc.oid = rt.reloid and pga.attrelid = rt.reloid" .
-						  " and pga.attnum = rt.key");
-	if ($result->resultStatus ne PGRES_TUPLES_OK)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(-1);
-	}
-
-	my @row;
-	while (@row = $result->fetchrow)
-	{
-	#	printf "$row[0], $row[1], $row[2]\n";
-		push @{$Mtables{$row[0]}}, $row[1], $row[2];
-	}
-
-	# Read last succeeded sync
-	$sql = "select syncid, synctime, minid, maxid, active from _RSERV_SYNC_" . 
-		" where server = $server and syncid = (select max(syncid) from" . 
-			" _RSERV_SYNC_ where server = $server and status > 0)";
-
-	printf "$sql\n" if $debug;
-
-	$result = $conn->exec($sql);
-	if ($result->resultStatus ne PGRES_TUPLES_OK)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(-1);
-	}
-
-	my @lastsync = $result->fetchrow;
-
-	my $sinfo = "";
-	if ($lastsync[3] ne '')	# sync info
-	{
-		$sinfo = "and (l.logid >= $lastsync[3]";
-		$sinfo .= " or l.logid in ($lastsync[4])" if $lastsync[4] ne '';
-		$sinfo .= ")";
-	}
-
-	my $havedeal = 0;
-
-	# DELETED rows
-	$sql = "select l.reloid, l.key from _RSERV_LOG_ l" .
-		" where l.deleted = 1 $sinfo order by l.reloid";
-
-	printf "$sql\n" if $debug;
-
-	$result = $conn->exec($sql);
-	if ($result->resultStatus ne PGRES_TUPLES_OK)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(-1);
-	}
-
-	$lastoid = '';
-	while (@row = $result->fetchrow)
-	{
-		next unless exists $Mtables{$row[0]};
-		if ($lastoid != $row[0])
-		{
-			if ($lastoid eq '')
-			{
-				my $syncid = GetSYNCID($conn, $outf);
-				return($syncid) if $syncid < 0;
-				$havedeal = 1;
-			}
-			else
-			{
-				printf $outf "\\.\n";
-			}
-			printf $outf "-- DELETE $Mtables{$row[0]}[0]\n";
-			$lastoid = $row[0];
-		}
-		if (! defined $row[1])
-		{
-			print STDERR "NULL key\n" unless ($quiet);
-			$conn->exec("ROLLBACK");
-			return(-2);
-		}
-		printf $outf "%s\n", OutputValue($row[1]);
-	}
-	printf $outf "\\.\n" if $lastoid ne '';
-
-	# UPDATED rows
-
-	my ($taboid, $tabname, $tabkey);
-	foreach $taboid (keys %Mtables)
-	{
-		($tabname, $tabkey) = @{$Mtables{$taboid}};
-		my $oidkey = ($tabkey eq 'oid') ? "_$tabname.oid," : '';
-		$sql = sprintf "select $oidkey _$tabname.* from _RSERV_LOG_ l," .
-			" $tabname _$tabname where l.reloid = $taboid and l.deleted = 0 $sinfo" .
-				" and l.key = _$tabname.${tabkey}::text";
-
-		printf "$sql\n" if $debug;
-
-		$result = $conn->exec($sql);
-		if ($result->resultStatus ne PGRES_TUPLES_OK)
-		{
-			printf $outf "-- ERROR\n" if $havedeal;
-			print STDERR $conn->errorMessage unless ($quiet);
-			$conn->exec("ROLLBACK");
-			return(-1);
-		}
-		next if $result->ntuples <= 0;
-		if (! $havedeal)
-		{
-			my $syncid = GetSYNCID($conn, $outf);
-			return($syncid) if $syncid < 0;
-			$havedeal = 1;
-		}
-		printf $outf "-- UPDATE $tabname\n";
-		while (@row = $result->fetchrow)
-		{
-			for ($i = 0; $i <= $#row; $i++)
-			{
-				printf $outf "	" if $i;
-				printf $outf "%s", OutputValue($row[$i]);
-			}
-			printf $outf "\n";
-		}
-		printf $outf "\\.\n";
-	}
-
-	unless ($havedeal)
-	{
-		$conn->exec("ROLLBACK");
-		return(0);
-	}
-
-	# Remember this snapshot info
-	$result = $conn->exec("select _rserv_sync_($server)");
-	if ($result->resultStatus ne PGRES_TUPLES_OK)
-	{
-		printf $outf "-- ERROR\n";
-		print STDERR $conn->errorMessage unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(-1);
-	}
-
-	$result = $conn->exec("COMMIT");
-	if ($result->resultStatus ne PGRES_COMMAND_OK)
-	{
-		printf $outf "-- ERROR\n";
-		print STDERR $conn->errorMessage unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(-1);
-	}
-	printf $outf "-- OK\n";
-
-	return(1);
-
-}
-
-sub OutputValue
-{
-	my ($val) = @_; # @_[0];
-
-	return("\\N") unless defined $val;
-
-	$val =~ s/\\/\\\\/g;
-	$val =~ s/	/\\011/g;
-	$val =~ s/\n/\\012/g;
-	$val =~ s/\'/\\047/g;
-
-	return($val);
-}
-
-# Get syncid for new snapshot
-sub GetSYNCID
-{
-	my ($conn, $outf) = @_; # (@_[0], @_[1]);
-
-	my $result = $conn->exec("select nextval('_rserv_sync_seq_')");
-	if ($result->resultStatus ne PGRES_TUPLES_OK)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(-1);
-	}
-
-	my @row = $result->fetchrow;
-
-	printf $outf "-- SYNCID $row[0]\n";
-	return($row[0]);
-}
-
-
-sub CleanLog
-{
-	my ($conn, $howold) = @_; # (@_[0], @_[1]);
-
-	my $result = $conn->exec("BEGIN");
-	if ($result->resultStatus ne PGRES_COMMAND_OK)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(-1);
-	}
-
-	my $sql = "select rs.maxid, rs.active from _RSERV_SYNC_ rs" .
-		" where rs.syncid = (select max(rs2.syncid) from _RSERV_SYNC_ rs2" .
-			" where rs2.server = rs.server and rs2.status > 0) order by rs.maxid";
-
-	printf "$sql\n" if $debug;
-
-	$result = $conn->exec($sql);
-	if ($result->resultStatus ne PGRES_TUPLES_OK)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		return(-1);
-	}
-	my $maxid = '';
-	my %active = ();
-	while (my @row = $result->fetchrow)
-	{
-		$maxid = $row[0] if $maxid eq '';
-		last if $row[0] > $maxid;
-		my @ids = split(/[ 	]+,[ 	]+/, $row[1]);
-		foreach $aid (@ids)
-		{
-			$active{$aid} = 1 unless exists $active{$aid};
-		}
-	}
-	if ($maxid eq '')
-	{
-		print STDERR "No Sync IDs\n" unless ($quiet);
-		return(0);
-	}
-	my $alist = join(',', keys %active);
-	my $sinfo = "logid < $maxid";
-	$sinfo .= " and logid not in ($alist)" if $alist ne '';
-	
-	$sql = "delete from _RSERV_LOG_ where " . 
-		"logtime < now() - '$howold second'::interval and $sinfo";
-
-	printf "$sql\n" if $debug;
-
-	$result = $conn->exec($sql);
-	if ($result->resultStatus ne PGRES_COMMAND_OK)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(-1);
-	}
-	$maxid = $result->cmdTuples;
-
-	$result = $conn->exec("COMMIT");
-	if ($result->resultStatus ne PGRES_COMMAND_OK)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(-1);
-	}
-
-	return($maxid);
-}
-
-sub ApplySnapshot
-{
-	my ($conn, $inpf) = @_; # (@_[0], @_[1]);
-
-	my $result = $conn->exec("BEGIN");
-	if ($result->resultStatus ne PGRES_COMMAND_OK)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(-1);
-	}
-
-	$result = $conn->exec("SET CONSTRAINTS ALL DEFERRED");
-	if ($result->resultStatus ne PGRES_COMMAND_OK)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(-1);
-	}
-
-	# MAP name --> oid, keyname, keynum
-	my $sql = "select pgc.oid, pgc.relname, pga.attname, rt.key" . 
-		" from _RSERV_SLAVE_TABLES_ rt, pg_class pgc, pg_attribute pga" . 
-			" where pgc.oid = rt.reloid and pga.attrelid = rt.reloid" .
-				" and pga.attnum = rt.key";
-	$result = $conn->exec($sql);
-	if ($result->resultStatus ne PGRES_TUPLES_OK)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(-1);
-	}
-
-	while (@row = $result->fetchrow)
-	{
-	#	printf "	%s	%s\n", $row[1], $row[0];
-		push @{$Stables{$row[1]}}, $row[0], $row[2], $row[3];
-	}
-
-	my $ok = 0;
-	my $syncid = '';
-	while(<$inpf>)
-	{
-		$_ =~ s/\n//;
-		my ($cmt, $cmd, $prm) = split (/[ 	]+/, $_, 3);
-		if ($cmt ne '--')
-		{
-			printf STDERR "Invalid format\n" unless ($quiet);
-			$conn->exec("ROLLBACK");
-			return(-2);
-		}
-		if ($cmd eq 'DELETE')
-		{
-			if ($syncid eq '')
-			{
-				printf STDERR "Sync ID unspecified\n" unless ($quiet);
-				$conn->exec("ROLLBACK");
-				return(-2);
-			}
-			$result = DoDelete($conn, $inpf, $prm);
-			if ($result)
-			{
-				$conn->exec("ROLLBACK");
-				return($result);
-			}
-		}
-		elsif ($cmd eq 'UPDATE')
-		{
-			if ($syncid eq '')
-			{
-				printf STDERR "Sync ID unspecified\n" unless ($quiet);
-				$conn->exec("ROLLBACK");
-				return(-2);
-			}
-			$result = DoUpdate($conn, $inpf, $prm);
-			if ($result)
-			{
-				$conn->exec("ROLLBACK");
-				return($result);
-			}
-		}
-		elsif ($cmd eq 'SYNCID')
-		{
-			if ($syncid ne '')
-			{
-				printf STDERR "Second Sync ID ?!\n" unless ($quiet);
-				$conn->exec("ROLLBACK");
-				return(-2);
-			}
-			if ($prm !~ /^\d+$/)
-			{
-				printf STDERR "Invalid Sync ID $prm\n" unless ($quiet);
-				$conn->exec("ROLLBACK");
-				return(-2);
-			}
-			$syncid = $prm;
-
-			printf STDERR "Sync ID $syncid\n" unless ($quiet);
-
-			$result = $conn->exec("select syncid, synctime from " . 
-								  "_RSERV_SLAVE_SYNC_ where syncid = " . 
-								  "(select max(syncid) from _RSERV_SLAVE_SYNC_)");
-			if ($result->resultStatus ne PGRES_TUPLES_OK)
-			{
-				print STDERR $conn->errorMessage unless ($quiet);
-				$conn->exec("ROLLBACK");
-				return(-1);
-			}
-			my @row = $result->fetchrow;
-			if (! defined $row[0])
-			{
-				$result = $conn->exec("insert into" .
-									  " _RSERV_SLAVE_SYNC_(syncid, synctime) values ($syncid, now())");
-			}
-			elsif ($row[0] >= $prm)
-			{
-				printf STDERR "Sync-ed to ID $row[0] ($row[1])\n" unless ($quiet);
-				$conn->exec("ROLLBACK");
-				return(0);
-			}
-			else
-			{
-				$result = $conn->exec("update _RSERV_SLAVE_SYNC_" .
-									  " set syncid = $syncid, synctime = now()");
-			}
-			if ($result->resultStatus ne PGRES_COMMAND_OK)
-			{
-				print STDERR $conn->errorMessage unless ($quiet);
-				$conn->exec("ROLLBACK");
-				return(-1);
-			}
-		}
-		elsif ($cmd eq 'OK')
-		{
-			$ok = 1;
-			last;
-		}
-		elsif ($cmd eq 'ERROR')
-		{
-			printf STDERR "ERROR signaled\n" unless ($quiet);
-			$conn->exec("ROLLBACK");
-			return(-2);
-		}
-		else
-		{
-			printf STDERR "Unknown command $cmd\n" unless ($quiet);
-			$conn->exec("ROLLBACK");
-			return(-2);
-		}
-	}
-
-	if (! $ok)
-	{
-		printf STDERR "No OK flag in input\n" unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(-2);
-	}
-
-	$result = $conn->exec("COMMIT");
-	if ($result->resultStatus ne PGRES_COMMAND_OK)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(-1);
-	}
-
-	return(1);
-}
-
-sub DoDelete
-{
-	my ($conn, $inpf, $tabname) = @_; # (@_[0], @_[1], @_[2]);
-
-	my $ok = 0;
-	while(<$inpf>)
-	{
-		if ($_ !~ /\n$/)
-		{
-			printf STDERR "Invalid format\n" unless ($quiet);
-			return(-2);
-		}
-		my $key = $_;
-		$key =~ s/\n//;
-		if ($key eq '\.')
-		{
-			$ok = 1;
-			last;
-		}
-
-		my $sql = "delete from $tabname where $Stables{$tabname}->[1] = '$key'";
-
-		printf "$sql\n" if $debug;
-
-		my $result = $conn->exec($sql);
-		if ($result->resultStatus ne PGRES_COMMAND_OK)
-		{
-			print STDERR $conn->errorMessage unless ($quiet);
-			return(-1);
-		}
-	}
-
-	if (! $ok)
-	{
-		printf STDERR "No end of input in DELETE section\n" unless ($quiet);
-		return(-2);
-	}
-
-	return(0);
-}
-
-
-sub DoUpdate
-{
-	my ($conn, $inpf, $tabname) = @_; # (@_[0], @_[1], @_[2]);
-	my $oidkey = ($Stables{$tabname}->[2] < 0) ? 1 : 0;
-
-	my @CopyBuf = ();
-	my $CBufLen = 0;
-	my $CBufMax = 16 * 1024 * 1024;	# max size of buf for copy
-
-	my $sql = "select attnum, attname from pg_attribute" .
-		" where attrelid = $Stables{$tabname}->[0] and attnum > 0";
-
-	my $result = $conn->exec($sql);
-	if ($result->resultStatus ne PGRES_TUPLES_OK)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		return(-1);
-	}
-
-	my @anames = ();
-	while (@row = $result->fetchrow)
-	{
-		$anames[$row[0]] = $row[1];
-	}
-
-	my $istring;
-	my $ok = 0;
-	while(<$inpf>)
-	{
-		if ($_ !~ /\n$/)
-		{
-			printf STDERR "Invalid format\n" unless ($quiet);
-			return(-2);
-		}
-		$istring = $_;
-		$istring =~ s/\n//;
-		if ($istring eq '\.')
-		{
-			$ok = 1;
-			last;
-		}
-		my @vals = split(/	/, $istring);
-		if ($oidkey)
-		{
-			if ($vals[0] !~ /^\d+$/ || $vals[0] <= 0)
-			{
-				printf STDERR "Invalid OID\n" unless ($quiet);
-				return(-2);
-			}
-			$oidkey = $vals[0];
-		}
-		else
-		{
-			unshift @vals, '';
-		}
-
-		$sql = "update $tabname set ";
-		my $ocnt = 0;
-		for (my $i = 1; $i <= $#anames; $i++)
-		{
-			if ($vals[$i] eq '\N')
-			{
-				if ($i == $Stables{$tabname}->[2])
-				{
-					printf STDERR "NULL key\n" unless ($quiet);
-					return(-2);
-				}
-				$vals[$i] = 'null';
-			}
-			else
-			{
-				$vals[$i] = "'" . $vals[$i] . "'";
-				next if $i == $Stables{$tabname}->[2];
-			}
-			$ocnt++;
-			$sql .= ', ' if $ocnt > 1;
-			$sql .= "$anames[$i] = $vals[$i]";
-		}
-		if ($oidkey)
-		{
-			$sql .= " where $Stables{$tabname}->[1] = $oidkey";
-		}
-		else
-		{
-			$sql .= " where $Stables{$tabname}->[1] = $vals[$Stables{$tabname}->[2]]";
-		}
-
-		printf "$sql\n" if $debug;
-
-		$result = $conn->exec($sql);
-		if ($result->resultStatus ne PGRES_COMMAND_OK)
-		{
-			print STDERR $conn->errorMessage unless ($quiet);
-			return(-1);
-		}
-		next if $result->cmdTuples == 1;	# updated
-
-		if ($result->cmdTuples > 1)
-		{
-			printf STDERR "Duplicate keys\n" unless ($quiet);
-			return(-2);
-		}
-
-		# no key - copy
-		push @CopyBuf, "$istring\n";
-		$CBufLen += length($istring);
-
-		if ($CBufLen >= $CBufMax)
-		{
-			$result = DoCopy($conn, $tabname, $oidkey, \@CopyBuf);
-			return($result) if $result;
-			@CopyBuf = ();
-			$CBufLen = 0;
-		}
-	}
-
-	if (! $ok)
-	{
-		printf STDERR "No end of input in UPDATE section\n" unless ($quiet);
-		return(-2);
-	}
-
-	if ($CBufLen)
-	{
-		$result = DoCopy($conn, $tabname, $oidkey, \@CopyBuf);
-		return($result) if $result;
-	}
-
-	return(0);
-}
-
-
-sub DoCopy
-{
-	my ($conn, $tabname, $withoids, $CBuf) = @_; # (@_[0], @_[1], @_[2], @_[3]);
-
-	my $sql = "COPY $tabname " . (($withoids) ? "WITH OIDS " : '') . 
-"FROM STDIN";
-	my $result = $conn->exec($sql);
-	if ($result->resultStatus ne PGRES_COPY_IN)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		return(-1);
-	}
-
-	foreach $str (@{$CBuf})
-	{
-		$conn->putline($str);
-	}
-
-	$conn->putline("\\.\n");
-
-	if ($conn->endcopy)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		return(-1);
-	}
-
-	return(0);
-
-}
-
-
-#
-# Returns last SyncID applied on Slave
-#
-sub GetSyncID
-{
-	my ($conn) = @_; # (@_[0]);
-	
-	my $result = $conn->exec("select max(syncid) from _RSERV_SLAVE_SYNC_");
-	if ($result->resultStatus ne PGRES_TUPLES_OK)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		return(-1);
-	}
-	my @row = $result->fetchrow;
-	return(undef) unless defined $row[0];	# null
-	return($row[0]);
-}
-
-#
-# Updates _RSERV_SYNC_ on Master with Slave SyncID
-#
-sub SyncSyncID
-{
-	my ($conn, $server, $syncid) = @_; # (@_[0], @_[1], @_[2]);
-	
-	my $result = $conn->exec("BEGIN");
-	if ($result->resultStatus ne PGRES_COMMAND_OK)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(-1);
-	}
-
-	$result = $conn->exec("select synctime, status from _RSERV_SYNC_" .
-						  " where server = $server and syncid = $syncid" .
-						  " for update");
-	if ($result->resultStatus ne PGRES_TUPLES_OK)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(-1);
-	}
-	my @row = $result->fetchrow;
-	if (! defined $row[0])
-	{
-		printf STDERR "No SyncID $syncid found for server $server\n" unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(0);
-	}
-	if ($row[1] > 0)
-	{
-		printf STDERR "SyncID $syncid for server $server already updated\n" unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(0);
-	}
-	$result = $conn->exec("update _RSERV_SYNC_" .
-						  " set synctime = now(), status = 1" .
-						  " where server = $server and syncid = $syncid");
-	if ($result->resultStatus ne PGRES_COMMAND_OK)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(-1);
-	}
-	$result = $conn->exec("delete from _RSERV_SYNC_" .
-						  " where server = $server and syncid < $syncid");
-	if ($result->resultStatus ne PGRES_COMMAND_OK)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(-1);
-	}
-
-	$result = $conn->exec("COMMIT");
-	if ($result->resultStatus ne PGRES_COMMAND_OK)
-	{
-		print STDERR $conn->errorMessage unless ($quiet);
-		$conn->exec("ROLLBACK");
-		return(-1);
-	}
-
-	return(1);
-}
-
-1;
diff --git a/contrib/rserv/Replicate.in b/contrib/rserv/Replicate.in
deleted file mode 100644
index bd7c089a59..0000000000
--- a/contrib/rserv/Replicate.in
+++ /dev/null
@@ -1,102 +0,0 @@
-# -*- perl -*-
-# Replicate
-# Vadim Mikheev, (c) 2000, PostgreSQL Inc.
-
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-use lib "@LIBDIR@";
-
-use IO::File;
-use Getopt::Long;
-use RServ;
-
-$| = 1;
-
-$result = GetOptions("debug!", "verbose!", "help", "snapshot=s",
-		     "masterhost=s", "slavehost=s", "host=s",
-		     "masteruser=s", "slaveuser=s", "user=s",
-		     "masterpassword=s", "slavepassword=s", "password=s");
-
-my $debug = $opt_debug || 0;
-my $verbose = $opt_verbose || 0;
-my $snapshot = $opt_snapshot || "__Snapshot";
-
-if (defined($opt_help) || (scalar(@ARGV) < 2)) {
-    print "Usage: $0 --snapshot=file --host=name --user=name --password=string masterdb slavedb\n";
-    print "\t--masterhost=name --masteruser=name --masterpassword=string\n";
-    print "\t--slavehost=name --slaveuser=name --slavepassword=string\n";
-    exit ((scalar(@ARGV) < 2)? 1:0);
-}
-
-my $master = $ARGV[0] || "master";
-my $slave = $ARGV[1] || "slave";
-my $server = 0;
-
-my $minfo = "dbname=$master";
-$minfo = "$minfo host=$opt_masterhost" if (defined($opt_masterhost));
-$minfo = "$minfo user=$opt_masteruser" if (defined($opt_masteruser));
-$minfo = "$minfo password=$opt_masterpassword" if (defined($opt_masterpassword));
-my $sinfo = "dbname=$slave";
-$sinfo = "$sinfo host=$opt_slavehost" if (defined($opt_slavehost));
-$sinfo = "$sinfo user=$opt_slaveuser" if (defined($opt_slaveuser));
-$sinfo = "$sinfo password=$opt_slavepassword" if (defined($opt_slavepassword));
-
-print "Master connection is $minfo\n" if ($debug);
-print "Slave connection is $sinfo\n" if ($debug);
-
-my $mconn = Pg::connectdb($minfo);
-my $sconn = Pg::connectdb($sinfo);
-
-$RServ::quiet = !$verbose;
-
-SyncSync($mconn, $sconn);
-
-my $outf = new IO::File;
-open $outf, ">$snapshot";
-print "\n>>>>>>>>>>>>> Prepare Snapshot\n\n" if ($verbose);
-$res = PrepareSnapshot($mconn, $outf, $server);
-close $outf;
-die "\n>>>>>>>>>>>>> ERROR\n" if $res < 0;
-if ($res == 0)
-{
-	print "\n>>>>>>>>>>>>> DBases are sync-ed\n" if ($verbose);
-	exit(0);
-}
-
-my $inpf = new IO::File;
-open $inpf, "<$snapshot";
-print "\n>>>>>>>>>>>>> Apply Snapshot\n\n" if ($verbose);
-$res = ApplySnapshot($sconn, $inpf);
-close $inpf;
-die "\n>>>>>>>>>>>>> ERROR\n" if $res < 0;
-
-if ($res > 0)
-{
-	print "Snapshot applied\n" if ($verbose);
-	unlink $snapshot unless ($debug);
-	SyncSync($mconn, $sconn);
-}
-
-exit(0);
-
-###########################################################################
-
-sub SyncSync
-{
-    ($mconn, $sconn) = @_;
-
-    print "\n>>>>>>>>>>>>> Sync SyncID\n\n" if ($verbose);
-    print "Get last SyncID from Slave DB\n" if ($verbose);
-    $syncid = GetSyncID($sconn);
-    if ($syncid > 0)
-    {
-	print "Last SyncID applied: $syncid\n" if ($verbose);
-	print "Sync SyncID\n" if ($verbose);
-
-	$res = SyncSyncID($mconn, $server, $syncid);
-
-	print "Succeeded\n" if (($res > 0) && ($verbose));
-    }
-}
diff --git a/contrib/rserv/RservTest.in b/contrib/rserv/RservTest.in
deleted file mode 100644
index 252c3226e1..0000000000
--- a/contrib/rserv/RservTest.in
+++ /dev/null
@@ -1,313 +0,0 @@
-#!/bin/sh
-# pgserv.tcl
-# (c) 2000 Thomas Lockhart, PostgreSQL Inc.
-# The next line will reinvoke as wish *DO NOT REMOVE OR ALTER* \
-exec wish "$0" "$@"
-
-puts "Starting Replication Server demo"
-
-set RSERV_BIN "@BINDIR@"
-
-# Bring in the interfaces we will be using...
-
-#package require Pgtcl
-load libpgtcl[info sharedlibextension]
-
-# elog
-# Information or error log and exit handler
-proc {elog} {level message} {
-    global show
-    switch -exact -- $level {
-        DEBUG {
-            if {$show(debug)} {
-                puts "DEBUG $message"
-            }
-        }
-        ERROR {
-            if {$show(error)} {
-                puts "ERROR $message"
-            }
-        FATAL {
-            if ($show(error)} {
-                puts "FATAL $message"
-            }
-            exit 1
-        }
-        default {
-            puts "INFO $message"
-        }
-    }
-}
-
-proc {ShowUsage} {} {
-    global argv0
-    puts "Usage: $argv0 --host name --user name --password string masterdb slavedb"
-    puts "\t--masterhost name --masteruser name --masterpassword string"
-    puts "\t--slavehost name --slaveuser name --slavepassword string"
-}
-
-# Initial values for database access
-# master, slave variables are tied to text input boxes,
-# and will be updated on user input
-proc {SetDbInfo} {db name {host ""} {user ""} {pass ""}} {
-    global dbinfo
-    set dbinfo($db,name) $name
-    set dbinfo($db,host) $host
-    set dbinfo($db,user) $user
-    set dbinfo($db,pass) $pass
-}
-
-# ConnInfo
-# Connection information for pgtcl library
-proc {ConnInfo} {{db master}} {
-    global dbinfo
-    set ci "dbname=$dbinfo($db,name)"
-    if {[string length $dbinfo($db,host)] > 0} {
-        set ci "$ci host=$dbinfo($db,host)"
-    }
-    if {[string length $dbinfo($db,user)] > 0} {
-        set ci "$ci user=$dbinfo($db,user)"
-    }
-    if {[string length $dbinfo($db,pass)] > 0} {
-        set ci "$ci password=$dbinfo($db,pass)"
-    }
-#    puts "Construct conninfo $ci"
-    return $ci
-}
-
-# ConnInfoParams
-# Connection information for (perl) callable programs
-proc {ConnInfoParams} {{db master}} {
-    global dbinfo
-    set ci ""
-    if {[string length $dbinfo($db,host)] > 0} {
-        set ci "$ci --host=$dbinfo($db,host)"
-    }
-    if {[string length $dbinfo($db,user)] > 0} {
-        set ci "$ci --user=$dbinfo($db,user)"
-    }
-    if {[string length $dbinfo($db,pass)] > 0} {
-        set ci "$ci --password=$dbinfo($db,pass)"
-    }
-#    puts "Construct conninfo $ci"
-    return $ci
-}
-
-# ConnInfoMaster
-# Connection information for (perl) callable programs
-proc {ConnInfoMaster} {{db master}} {
-    global dbinfo
-    set ci $dbinfo($db,name)
-    if {[string length $dbinfo($db,host)] > 0} {
-        set ci "$ci --masterhost=$dbinfo($db,host)"
-    }
-    if {[string length $dbinfo($db,user)] > 0} {
-        set ci "$ci --masteruser=$dbinfo($db,user)"
-    }
-    if {[string length $dbinfo($db,pass)] > 0} {
-        set ci "$ci --masterpassword=$dbinfo($db,pass)"
-    }
-#    puts "Construct conninfo $ci"
-    return $ci
-}
-
-# ConnInfoSlave
-# Connection information for (perl) callable programs
-proc {ConnInfoSlave} {{db slave}} {
-    global dbinfo
-    set ci $dbinfo($db,name)
-    if {[string length $dbinfo($db,host)] > 0} {
-        set ci "$ci --slavehost=$dbinfo($db,host)"
-    }
-    if {[string length $dbinfo($db,user)] > 0} {
-        set ci "$ci --slaveuser=$dbinfo($db,user)"
-    }
-    if {[string length $dbinfo($db,pass)] > 0} {
-        set ci "$ci --slavepassword=$dbinfo($db,pass)"
-    }
-#    puts "Construct conninfo $ci"
-    return $ci
-}
-
-
-SetDbInfo master master localhost
-SetDbInfo slave slave localhost
-set dbinfo(snapshot,name) "__Snapshot"
-
-set update ""
-
-set show(debug) 1
-set show(error) 1
-
-set argi 0
-while {$argi < $argc} {
-#    puts "argi is $argi; argc is $argc"
-    set arg [lindex $argv $argi]
-    switch -glob -- $arg {
-        -h -
-        --host {
-            incr argi
-            set dbinfo(master,host) [lindex $argv $argi]
-            set dbinfo(slave,host) [lindex $argv $argi]
-        }
-        --masterhost {
-            incr argi
-            set dbinfo(master,host) [lindex $argv $argi]
-        }
-        --slavehost {
-            incr argi
-            set dbinfo(slave,host) [lindex $argv $argi]
-        }
-        -u -
-        --user {
-            incr argi
-            set dbinfo(master,user) [lindex $argv $argi]
-            set dbinfo(slave,user) [lindex $argv $argi]
-        }
-        --masteruser {
-            incr argi
-            set dbinfo(master,user) [lindex $argv $argi]
-        }
-        --slaveuser {
-            incr argi
-            set dbinfo(slave,user) [lindex $argv $argi]
-        }
-        -s -
-        --snapshot {
-            incr argi
-            set dbinfo(snapshot,name) [lindex $argv $argi]
-        }
-        -* {
-            elog ERROR "$argv0: invalid parameter '$arg'"
-            ShowUsage
-            exit 1
-        }
-        default {
-            break
-        }
-    }
-    incr argi
-}
-
-if {$argi < $argc} {
-    set dbinfo(master,name) [lindex $argv $argi]
-    incr argi
-}
-if {$argi < $argc} {
-    set dbinfo(slave,name) [lindex $argv $argi]
-    incr argi
-}
-if {$argi < $argc} {
-    elog "$argv0: too many parameters"
-    ShowUsage
-    exit 1
-}
-
-elog DEBUG "User is $dbinfo(master,user) $dbinfo(slave,user)"
-elog DEBUG "Host is $dbinfo(master,host) $dbinfo(slave,host)"
-
-#
-# TK layout
-#
-
-wm title . "Async Replication"
-
-wm geom . 400x400
-
-proc {CreateResultFrame} {b l w} {
-    pack [frame $b -borderwidth 10] -fill x
-    pack [button $b.run -text $l -command $l -width $w] -side left
-#    pack [entry $b.e -textvariable NewRow] -side left
-}
-
-set t .top
-pack [frame $t -borderwidth 10] -fill x
-pack [frame $t.h -borderwidth 10] -fill x
-pack [label $t.h.h -text "PostgreSQL Async Replication Server"]
-
-set b .b
-pack [frame $b -borderwidth 10] -fill x
-pack [frame $b.l -borderwidth 10] -fill x
-pack [label $b.l.ml -text "Master"] -side left
-pack [label $b.l.sl -text "Slave"] -side right
-pack [entry $b.m -textvariable dbinfo(master,name) -width 25] -side left
-pack [entry $b.s -textvariable dbinfo(slave,name) -width 25] -side right
-
-set b .u
-pack [frame $b -borderwidth 10] -fill x
-pack [button $b.run -text update -command Update -width 10] -side left
-pack [entry $b.e -textvariable update -width 50] -side left
-
-set r [CreateResultFrame .r Replicate 10]
-
-set b .s
-pack [frame $b -borderwidth 10] -fill x
-pack [button $b.b -text Show -command Show -width 10] -side left
-pack [label $b.e -text ""] -side left
-
-set b .button
-pack [frame $b -borderwidth 10] -fill x
-
-pack [button $b.quit -text "Quit" -command Shutdown]
-
-#
-# Functions mapped to buttons
-#
-
-proc {Update} {} {
-    global dbinfo
-    global update
-
-    elog DEBUG "Opening database [ConnInfo master]..."
-    set res [catch {set db [pg_connect -conninfo "[ConnInfo master]"]} msg]
-    if {$res} {
-        elog ERROR "Database '$dbinfo(master,name)' is not available: $res ($msg)"
-    } else {
-        elog DEBUG "Insert $update into database $dbinfo(master,name)..."
-        set res [pg_exec $db "insert into test select '$update', max(k)+1, max(l)+1 from test"]
-        elog DEBUG [pg_result $res -status]
-        catch {pg_disconnect $db}
-    }
-}
-
-proc {Replicate} {} {
-    global dbinfo
-    global RSERV_BIN
-
-    elog DEBUG "Replicating [ConnInfoCmd master]..."
-    exec "$RSERV_BIN/Replicate" --snapshot=$dbinfo(snapshot,name) [ConnInfoParams] [ConnInfoMaster] [ConnInfoSlave]
-}
-
-proc {Show} {} {
-    global dbinfo
-    global update
-
-    elog DEBUG "Opening database [ConnInfo slave]..."
-    set res [catch {set db [pg_connect -conninfo "[ConnInfo slave]"]} msg]
-    if {$res} {
-        elog ERROR "DB $dbinfo(slave,name) not available: $res ($msg)"
-    } else {
-        elog DEBUG "Select $update from database $dbinfo(slave,name)..."
-       set res [pg_exec $db "select i from test where i='$update'"]
-        if {[pg_result $res -status] != "PGRES_TUPLES_OK"} {
-            .s.e config -text "n/a"
-        } else {
-            set ntups [pg_result $res -numTuples]
-            if {$ntups <= 0} {
-                .s.e config -text "n/a"
-            } else {
-                for {set i 0} {$i < $ntups} {incr i} {
-                    set val [pg_result $res -getTuple $i]
-                    .s.e config -text $val
-                }
-            }
-            pg_result $res -clear
-        }
-        catch {pg_disconnect $db}
-    }
-}
-
-proc {Shutdown} {} {
-    global dbinfo
-    exit
-}
diff --git a/contrib/rserv/SlaveAddTable.in b/contrib/rserv/SlaveAddTable.in
deleted file mode 100644
index 432e922aa2..0000000000
--- a/contrib/rserv/SlaveAddTable.in
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- perl -*-
-# SlaveAddTable
-# Vadim Mikheev, (c) 2000, PostgreSQL Inc.
-
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-use Pg;
-use Getopt::Long;
-
-$| = 1;
-
-$result = GetOptions("debug!", "verbose!", "help",
-		     "host=s", "user=s", "password=s");
-
-my $debug = $opt_debug || 0;
-my $verbose = $opt_verbose || 0;
-
-if (defined($opt_help) || (scalar(@ARGV) < 3)) {
-    print "Usage: $0 --host=name --user=name --password=string slavedb table column\n";
-    exit ((scalar(@ARGV) < 3)? 1: 0);
-}
-
-my $dbname = $ARGV[0];
-my $table = $ARGV[1];
-my $keyname = $ARGV[2];
-
-my $sinfo = "dbname=$dbname";
-$sinfo = "$sinfo host=$opt_host" if (defined($opt_host));
-$sinfo = "$sinfo user=$opt_user" if (defined($opt_user));
-$sinfo = "$sinfo password=$opt_password" if (defined($opt_password));
-
-my $dbname = $ARGV[0];
-my $table = $ARGV[1];
-my $keyname = $ARGV[2];
-
-my $conn = Pg::connectdb($sinfo);
-
-my $result = $conn->exec("BEGIN");
-die $conn->errorMessage if $result->resultStatus ne PGRES_COMMAND_OK;
-
-$result = $conn->exec("select pgc.oid, pga.attnum from pg_class pgc" . 
-					  ", pg_attribute pga" .
-					  " where pgc.relname = '$table' and pgc.oid = pga.attrelid" . 
-					  " and pga.attname = '$keyname'");
-die $conn->errorMessage if $result->resultStatus ne PGRES_TUPLES_OK;
-
-my @row = $result->fetchrow;
-die "Can't find table/key\n" if ! defined $row[0] || ! defined $row[1];
-
-$result = $conn->exec("insert into _RSERV_SLAVE_TABLES_ (tname, cname, reloid, key)" . 
-					  " values ('$table', '$keyname', $row[0], $row[1])");
-die $conn->errorMessage if $result->resultStatus ne PGRES_COMMAND_OK;
-
-$result = $conn->exec("COMMIT");
-die $conn->errorMessage if $result->resultStatus ne PGRES_COMMAND_OK;
-
-exit(0);
diff --git a/contrib/rserv/SlaveInit.in b/contrib/rserv/SlaveInit.in
deleted file mode 100644
index bbe152fe8e..0000000000
--- a/contrib/rserv/SlaveInit.in
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- perl -*-
-# SlaveInit
-# Vadim Mikheev, (c) 2000, PostgreSQL Inc.
-
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-use Pg;
-use Getopt::Long;
-
-$| = 1;
-
-$result = GetOptions("debug!", "verbose!", "quiet!", "help",
-		     "host=s", "user=s", "password=s");
-
-my $debug = $opt_debug || 0;
-my $verbose = $opt_verbose || 0;
-my $quiet = $opt_quiet || 0;
-
-if (defined($opt_help) || (scalar(@ARGV) < 1)) {
-    print "Usage: $0 --host=name --user=name --password=string slavedb\n";
-    exit ((scalar(@ARGV) < 1)? 1:0);
-}
-
-my $slave = $ARGV[0] || "slave";
-
-my $sinfo = "dbname=$slave";
-$sinfo = "$sinfo host=$opt_host" if (defined($opt_host));
-$sinfo = "$sinfo user=$opt_user" if (defined($opt_user));
-$sinfo = "$sinfo password=$opt_password" if (defined($opt_password));
-
-sub RollbackAndQuit {
-    my $conn = shift @_;
-
-    print STDERR $conn->errorMessage;
-    $conn->exec("ROLLBACK");
-    exit (-1);
-}
-
-print("Connecting to $sinfo\n") if ($debug || $verbose);
-my $conn = Pg::connectdb($sinfo);
-if ($conn->status != PGRES_CONNECTION_OK) {
-    print STDERR "Failed opening $sinfo\n";
-    exit 1;
-}
-
-my $result = $conn->exec("BEGIN");
-RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK);
-
-$result = $conn->exec("set transaction isolation level serializable");
-RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK);
-
-$result = $conn->exec("create table _RSERV_SLAVE_TABLES_" .
-		      " (tname name, cname name, reloid oid, key int4)");
-RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK);
-
-$result = $conn->exec("create table _RSERV_SLAVE_SYNC_" .
-		      " (syncid int4, synctime timestamp)");
-RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK);
-
-$result = $conn->exec("COMMIT");
-RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK);
-
-exit (0);
diff --git a/contrib/rserv/master.sql.in b/contrib/rserv/master.sql.in
deleted file mode 100644
index f8d37148b9..0000000000
--- a/contrib/rserv/master.sql.in
+++ /dev/null
@@ -1,101 +0,0 @@
--- erServer
--- Master server setup for erServer demonstration implementation
--- (c) 2000 Vadim Mikheev, PostgreSQL Inc.
---
-
---
--- Slave servers
---
-drop table _RSERV_SERVERS_;
-
-create table _RSERV_SERVERS_
-(
-	server	int4,	-- slave server id
-	host	text,	-- server' host
-	port	int4,	-- server' port
-	dbase	text	-- db name
-);
-
-
---
--- Tables to sync
---
-drop table _RSERV_TABLES_;
-
-create table _RSERV_TABLES_
-(
-	tname  name,	-- table name
-	cname  name,	-- column name
-	reloid	oid,	-- table oid
-	key		int4	-- key attnum 
-);
-
-
---
--- Log for inserts/updates/deletes to sync-ed tables
---
-drop table _RSERV_LOG_;
-
-create table _RSERV_LOG_
-(
-	reloid		oid,
-	logid		int4,		-- xid of last update xaction
-	logtime		timestamp,	-- last update xaction start time
-	deleted		int4,		-- deleted or inserted/updated
-	key			text		-- 
-);
-
--- This is to speedup lookup deleted tuples
-create index _RSERV_LOG_INDX_DLT_ID_ on _RSERV_LOG_ (deleted, logid);
-
--- This is to speedup cleanup
-create index _RSERV_LOG_INDX_TM_ID_ on _RSERV_LOG_ (logtime, logid);
-
--- This is to speedup trigger and lookup updated tuples
-create index _RSERV_LOG_INDX_REL_KEY_ on _RSERV_LOG_ (reloid, key);
-
-
---
--- How much each slave servers are sync-ed
---
-drop table _RSERV_SYNC_;
-
-create table _RSERV_SYNC_
-(
-	server		int4,
-	syncid		int4,		-- from _rserv_sync_seq_
-	synctime	timestamp,	-- 
-	status		int4,		-- prepared (0) | applied
-	minid		int4,		-- min xid from serializable snapshot
-	maxid		int4,		-- max xid from serializable snapshot
-	active		text		-- list of active xactions
-);
-
-create index _RSERV_SYNC_INDX_SRV_ID_ on _RSERV_SYNC_ (server, syncid);
-
-drop sequence _rserv_sync_seq_;
-create sequence _rserv_sync_seq_;
-
-drop function _rserv_log_();
-
-CREATE FUNCTION _rserv_log_()
-	RETURNS opaque
-	AS '@MODULE_FILENAME@'
-	LANGUAGE 'c'
-;
-
-drop function _rserv_sync_(int4);
-
-CREATE FUNCTION _rserv_sync_(int4)
-	RETURNS int4
-	AS '@MODULE_FILENAME@'
-	LANGUAGE 'c'
-;
-
-drop function _rserv_debug_(int4);
-
-CREATE FUNCTION _rserv_debug_(int4)
-	RETURNS int4
-	AS '@MODULE_FILENAME@'
-	LANGUAGE 'c'
-;
diff --git a/contrib/rserv/regress.sh b/contrib/rserv/regress.sh
deleted file mode 100755
index 96ca481934..0000000000
--- a/contrib/rserv/regress.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-# regress.sh
-# rserv regression test script
-# (c) 2000 Thomas Lockhart, PostgreSQL Inc.
-
-dropdb master
-dropdb slave
-
-createdb master
-createdb slave
-
-MasterInit master
-SlaveInit slave
-
-psql -c "create table t1 (i int, t text, d timestamp default text 'now');" master
-MasterAddTable master t1 d
-
-psql -c "create table t1 (i int, t text, d timestamp default text 'now');" slave
-SlaveAddTable slave t1 d
-
-psql -c "insert into t1 values (1, 'one');" master
-psql -c "insert into t1 values (2, 'two');" master
-
-Replicate master slave
-MasterSync master `GetSyncID --noverbose slave`
-
-psql -c "insert into t1 values (3, 'three');" master
-psql -c "insert into t1 values (4, 'four');" master
-
-Replicate master slave
-MasterSync master `GetSyncID --noverbose slave`
-
-exit
diff --git a/contrib/rserv/rserv.c b/contrib/rserv/rserv.c
deleted file mode 100644
index 401cc5fd9c..0000000000
--- a/contrib/rserv/rserv.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/* rserv.c
- * Support functions for erServer replication.
- * (c) 2000 Vadim Mikheev, PostgreSQL Inc.
- */
-
-#include "executor/spi.h"		/* this is what you need to work with SPI */
-#include "commands/trigger.h"	/* -"- and triggers */
-#include "utils/tqual.h"		/* -"- and SnapshotData */
-#include <ctype.h>				/* tolower () */
-
-#ifdef PG_FUNCTION_INFO_V1
-#define CurrentTriggerData ((TriggerData *) fcinfo->context)
-#endif
-
-#ifdef PG_FUNCTION_INFO_V1
-PG_FUNCTION_INFO_V1(_rserv_log_);
-PG_FUNCTION_INFO_V1(_rserv_sync_);
-PG_FUNCTION_INFO_V1(_rserv_debug_);
-Datum		_rserv_log_(PG_FUNCTION_ARGS);
-Datum		_rserv_sync_(PG_FUNCTION_ARGS);
-Datum		_rserv_debug_(PG_FUNCTION_ARGS);
-
-#else
-HeapTuple	_rserv_log_(void);
-int32		_rserv_sync_(int32);
-int32		_rserv_debug_(int32);
-#endif
-
-static int	debug = 0;
-
-static char *OutputValue(char *key, char *buf, int size);
-
-#ifdef PG_FUNCTION_INFO_V1
-Datum
-_rserv_log_(PG_FUNCTION_ARGS)
-#else
-HeapTuple
-_rserv_log_()
-#endif
-{
-	Trigger    *trigger;		/* to get trigger name */
-	int			nargs;			/* # of args specified in CREATE TRIGGER */
-	char	  **args;			/* argument: argnum */
-	Relation	rel;			/* triggered relation */
-	HeapTuple	tuple;			/* tuple to return */
-	HeapTuple	newtuple = NULL;	/* tuple to return */
-	TupleDesc	tupdesc;		/* tuple description */
-	int			keynum;
-	char	   *key;
-	char	   *okey;
-	char	   *newkey = NULL;
-	int			deleted;
-	char		sql[8192];
-	char		outbuf[8192];
-	char		oidbuf[64];
-	int			ret;
-
-	/* Called by trigger manager ? */
-	if (!CurrentTriggerData)
-		elog(ERROR, "_rserv_log_: triggers are not initialized");
-
-	/* Should be called for ROW trigger */
-	if (TRIGGER_FIRED_FOR_STATEMENT(CurrentTriggerData->tg_event))
-		elog(ERROR, "_rserv_log_: can't process STATEMENT events");
-
-	tuple = CurrentTriggerData->tg_trigtuple;
-
-	trigger = CurrentTriggerData->tg_trigger;
-	nargs = trigger->tgnargs;
-	args = trigger->tgargs;
-
-	if (nargs != 1)				/* odd number of arguments! */
-		elog(ERROR, "_rserv_log_: need in *one* argument");
-
-	keynum = atoi(args[0]);
-
-	if (keynum < 0 && keynum != ObjectIdAttributeNumber)
-		elog(ERROR, "_rserv_log_: invalid keynum %d", keynum);
-
-	rel = CurrentTriggerData->tg_relation;
-	tupdesc = rel->rd_att;
-
-	deleted = (TRIGGER_FIRED_BY_DELETE(CurrentTriggerData->tg_event)) ?
-		1 : 0;
-
-	if (TRIGGER_FIRED_BY_UPDATE(CurrentTriggerData->tg_event))
-		newtuple = CurrentTriggerData->tg_newtuple;
-
-#ifndef PG_FUNCTION_INFO_V1
-
-	/*
-	 * Setting CurrentTriggerData to NULL prevents direct calls to trigger
-	 * functions in queries. Normally, trigger functions have to be called
-	 * by trigger manager code only.
-	 */
-	CurrentTriggerData = NULL;
-#endif
-
-	/* Connect to SPI manager */
-	if ((ret = SPI_connect()) < 0)
-		elog(ERROR, "_rserv_log_: SPI_connect returned %d", ret);
-
-	if (keynum == ObjectIdAttributeNumber)
-	{
-		sprintf(oidbuf, "%u", tuple->t_data->t_oid);
-		key = oidbuf;
-	}
-	else
-		key = SPI_getvalue(tuple, tupdesc, keynum);
-
-	if (key == NULL)
-		elog(ERROR, "_rserv_log_: key must be not null");
-
-	if (newtuple && keynum != ObjectIdAttributeNumber)
-	{
-		newkey = SPI_getvalue(newtuple, tupdesc, keynum);
-		if (newkey == NULL)
-			elog(ERROR, "_rserv_log_: key must be not null");
-		if (strcmp(newkey, key) == 0)
-			newkey = NULL;
-		else
-			deleted = 1;		/* old key was deleted */
-	}
-
-	if (strpbrk(key, "\\	\n'"))
-		okey = OutputValue(key, outbuf, sizeof(outbuf));
-	else
-		okey = key;
-
-	sprintf(sql, "update _RSERV_LOG_ set logid = %d, logtime = now(), "
-			"deleted = %d where reloid = %u and key = '%s'",
-			GetCurrentTransactionId(), deleted, rel->rd_id, okey);
-
-	if (debug)
-		elog(DEBUG3, sql);
-
-	ret = SPI_exec(sql, 0);
-
-	if (ret < 0)
-		elog(ERROR, "_rserv_log_: SPI_exec(update) returned %d", ret);
-
-	/*
-	 * If no tuple was UPDATEd then do INSERT...
-	 */
-	if (SPI_processed > 1)
-		elog(ERROR, "_rserv_log_: duplicate tuples");
-	else if (SPI_processed == 0)
-	{
-		sprintf(sql, "insert into _RSERV_LOG_ "
-				"(reloid, logid, logtime, deleted, key) "
-				"values (%u, %d, now(), %d, '%s')",
-				rel->rd_id, GetCurrentTransactionId(),
-				deleted, okey);
-
-		if (debug)
-			elog(DEBUG3, sql);
-
-		ret = SPI_exec(sql, 0);
-
-		if (ret < 0)
-			elog(ERROR, "_rserv_log_: SPI_exec(insert) returned %d", ret);
-	}
-
-	if (okey != key && okey != outbuf)
-		pfree(okey);
-
-	if (newkey)
-	{
-		if (strpbrk(newkey, "\\	\n'"))
-			okey = OutputValue(newkey, outbuf, sizeof(outbuf));
-		else
-			okey = newkey;
-
-		sprintf(sql, "insert into _RSERV_LOG_ "
-				"(reloid, logid, logtime, deleted, key) "
-				"values (%u, %d, now(), 0, '%s')",
-				rel->rd_id, GetCurrentTransactionId(), okey);
-
-		if (debug)
-			elog(DEBUG3, sql);
-
-		ret = SPI_exec(sql, 0);
-
-		if (ret < 0)
-			elog(ERROR, "_rserv_log_: SPI_exec returned %d", ret);
-
-		if (okey != newkey && okey != outbuf)
-			pfree(okey);
-	}
-
-	SPI_finish();
-
-#ifdef PG_FUNCTION_INFO_V1
-	return (PointerGetDatum(tuple));
-#else
-	return (tuple);
-#endif
-}
-
-#ifdef PG_FUNCTION_INFO_V1
-Datum
-_rserv_sync_(PG_FUNCTION_ARGS)
-#else
-int32
-_rserv_sync_(int32 server)
-#endif
-{
-#ifdef PG_FUNCTION_INFO_V1
-	int32		server = PG_GETARG_INT32(0);
-#endif
-	char		sql[8192];
-	char		buf[8192];
-	char	   *active = buf;
-	uint32		xcnt;
-	int			ret;
-
-	if (SerializableSnapshot == NULL)
-		elog(ERROR, "_rserv_sync_: SerializableSnapshot is NULL");
-
-	buf[0] = 0;
-	for (xcnt = 0; xcnt < SerializableSnapshot->xcnt; xcnt++)
-	{
-		sprintf(buf + strlen(buf), "%s%u", (xcnt) ? ", " : "",
-				SerializableSnapshot->xip[xcnt]);
-	}
-
-	if ((ret = SPI_connect()) < 0)
-		elog(ERROR, "_rserv_sync_: SPI_connect returned %d", ret);
-
-	sprintf(sql, "insert into _RSERV_SYNC_ "
-			"(server, syncid, synctime, status, minid, maxid, active) "
-	  "values (%u, currval('_rserv_sync_seq_'), now(), 0, %d, %d, '%s')",
-			server, SerializableSnapshot->xmin, SerializableSnapshot->xmax, active);
-
-	ret = SPI_exec(sql, 0);
-
-	if (ret < 0)
-		elog(ERROR, "_rserv_sync_: SPI_exec returned %d", ret);
-
-	SPI_finish();
-
-	return (0);
-}
-
-#ifdef PG_FUNCTION_INFO_V1
-Datum
-_rserv_debug_(PG_FUNCTION_ARGS)
-#else
-int32
-_rserv_debug_(int32 newval)
-#endif
-{
-#ifdef PG_FUNCTION_INFO_V1
-	int32		newval = PG_GETARG_INT32(0);
-#endif
-	int32		oldval = debug;
-
-	debug = newval;
-
-	return (oldval);
-}
-
-#define ExtendBy	1024
-
-static char *
-OutputValue(char *key, char *buf, int size)
-{
-	int			i = 0;
-	char	   *out = buf;
-	char	   *subst = NULL;
-	int			slen = 0;
-
-	size--;
-	for (;;)
-	{
-		switch (*key)
-		{
-			case '\\':
-				subst = "\\\\";
-				slen = 2;
-				break;
-			case '	':
-				subst = "\\011";
-				slen = 4;
-				break;
-			case '\n':
-				subst = "\\012";
-				slen = 4;
-				break;
-			case '\'':
-				subst = "\\047";
-				slen = 4;
-				break;
-			case '\0':
-				out[i] = 0;
-				return (out);
-			default:
-				slen = 1;
-				break;
-		}
-
-		if (i + slen >= size)
-		{
-			if (out == buf)
-			{
-				out = (char *) palloc(size + ExtendBy);
-				strncpy(out, buf, i);
-				size += ExtendBy;
-			}
-			else
-			{
-				out = (char *) repalloc(out, size + ExtendBy);
-				size += ExtendBy;
-			}
-		}
-
-		if (slen == 1)
-			out[i++] = *key;
-		else
-		{
-			memcpy(out + i, subst, slen);
-			i += slen;
-		}
-		key++;
-	}
-
-	return (out);
-
-}
diff --git a/contrib/rserv/slave.sql.in b/contrib/rserv/slave.sql.in
deleted file mode 100644
index 93ac5caced..0000000000
--- a/contrib/rserv/slave.sql.in
+++ /dev/null
@@ -1,22 +0,0 @@
--- erServer
--- Slave server setup for erServer demonstration implementation
--- (c) 2000 Vadim Mikheev, PostgreSQL Inc.
---
-
-drop table _RSERV_SLAVE_TABLES_;
-
-create table _RSERV_SLAVE_TABLES_
-(
-	tname  name,	-- table name
-	cname  name,	-- column name
-	reloid	oid,	-- table oid
-	key		int4	-- key attnum 
-);
-
-drop table _RSERV_SLAVE_SYNC_;
-
-create table _RSERV_SLAVE_SYNC_
-(
-	syncid		int4,
-	synctime	timestamp
-);
diff --git a/contrib/rtree_gist/Makefile b/contrib/rtree_gist/Makefile
deleted file mode 100644
index 7cb8767942..0000000000
--- a/contrib/rtree_gist/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/rtree_gist/Attic/Makefile,v 1.3 2001/09/06 10:49:30 petere Exp $
-
-subdir = contrib/rtree_gist
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-MODULES = rtree_gist
-DATA_built = rtree_gist.sql
-DOCS = README.rtree_gist
-REGRESS = rtree_gist
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/rtree_gist/README.rtree_gist b/contrib/rtree_gist/README.rtree_gist
deleted file mode 100644
index bcc6a8ed66..0000000000
--- a/contrib/rtree_gist/README.rtree_gist
+++ /dev/null
@@ -1,98 +0,0 @@
-This is R-Tree implementation using GiST.
-Code (for PG95) are taken from http://s2k-ftp.cs.berkeley.edu:8000/gist/pggist/
-and changed according to new version of GiST (7.1 and above)
-
-All work was done by Teodor Sigaev (teodor@stack.net) and Oleg Bartunov
-(oleg@sai.msu.su). See http://www.sai.msu.su/~megera/postgres/gist
-for additional information.
-
-CHANGES:
-     Oct 10 MSD 2001
-
-     1. Implemented new linear algorithm for picksplit
-         ref. ( 'New Linear Node Splitting Algorithm for R-tree',
-               C.H.Ang and T.C.Tan )
-
-     Tue May 29 17:04:16 MSD 2001
-     
-     1. Small fixes in polygon code
-        Thanks to Dave Blasby <dblasby@refractions.net>
-
-     Mon May 28 19:42:14 MSD 2001
-
-     1. Full implementation of R-tree using GiST - gist_box_ops,gist_poly_ops
-     2. gist_poly_ops is lossy
-     3. NULLs support
-     4. works with multi-key GiST
-     
-NOTICE:
-     This version will works only with postgresql version 7.1 and above
-     because of changes in interface of function calling.
-
-INSTALLATION:
-
-  gmake
-  gmake install
-  -- load functions
-  psql <database> < rtree_gist.sql
-
-REGRESSION TEST:
-
-   gmake installcheck
-
-EXAMPLE USAGE:
-
-   create table boxtmp (b box);
-   -- create index
-   create index bix on boxtmp using gist (b gist_box_ops);
-   -- query
-   select * from boxtmp where b && '(1000,1000,0,0)'::box;
-
-
-BENCHMARKS:
-
- subdirectory bench contains benchmark suite.
- Prerequisities: perl, DBI, DBD:Pg, Time::HiRes
-
-  cd ./bench
-  1. createdb TEST
-  2. psql TEST < ../box.sql
-  3. ./create_test.pl | psql TEST 
-     -- change $NUM - number of rows in test dataset
-  4. ./bench.pl - perl script to benchmark queries. 
-                  Run script without arguments to see available options.
-
-     a)test without GiST index, using built-in R-Tree
-       ./bench.pl -d TEST 
-     b)test R-Tree using GiST index
-       ./bench.pl -d TEST -g 
-
-
-RESULTS:
-
-1. One interesting thing is that insertion time for built-in R-Tree is 
-   about 8 times more than ones for GiST implementation of R-Tree !!!
-2. Postmaster requires much more memory for built-in R-Tree
-3. Search time depends on dataset. In our case we got:
-        +------------+-----------+--------------+
-        |Number boxes|R-tree, sec|R-tree using  |
-        |            |           |   GiST, sec  |
-        +------------+-----------+--------------+
-        |          10|      0.002|         0.002|
-        +------------+-----------+--------------+
-        |         100|      0.002|         0.002|
-        +------------+-----------+--------------+
-        |        1000|      0.002|         0.002|
-        +------------+-----------+--------------+
-        |       10000|      0.015|         0.025|
-        +------------+-----------+--------------+
-        |       20000|      0.029|         0.048|
-        +------------+-----------+--------------+
-        |       40000|      0.055|         0.092|
-        +------------+-----------+--------------+
-        |       80000|      0.113|         0.178|
-        +------------+-----------+--------------+
-        |      160000|      0.338|         0.337|
-        +------------+-----------+--------------+
-        |      320000|      0.674|         0.673|
-        +------------+-----------+--------------+
diff --git a/contrib/rtree_gist/bench/bench.pl b/contrib/rtree_gist/bench/bench.pl
deleted file mode 100755
index e6bc1332cf..0000000000
--- a/contrib/rtree_gist/bench/bench.pl
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-# make sure we are in a sane environment.
-use DBI();
-use DBD::Pg();
-use Time::HiRes qw( usleep ualarm gettimeofday tv_interval );
-use Getopt::Std;
-my %opt;
-getopts('d:b:gv', \%opt);
-
-if ( !( scalar %opt ) ) {
-	print <<EOT;
-Usage:
-$0 -d DATABASE -b N [-v] [-g]
--d DATABASE  - DATABASE name
--b N    -number of cycles
--v      - print sql
--g      -use GiST index( default built-in R-tree )
-
-EOT
-	exit;
-}
-
-$opt{d} ||= 'TEST';
-my $dbi=DBI->connect('DBI:Pg:dbname='.$opt{d}) || die "Couldn't connect DB: $opt{d} !\n";
-
-my $sql;
-my $notice;
-my $sss = '(3000,3000,2990,2990)';
-if ( $opt{g} ) {
-	$notice = "Testing GiST implementation of R-Tree";
-	$sql = "select count(*) from boxtmp where b && '$sss'::box;";
-} else {
-	$notice = "Testing built-in implementation of R-Tree";
-	$sql = "select count(*) from boxtmp2 where b && '$sss'::box;";
-}
-
-my $t0 = [gettimeofday];
-my $count=0;
-my $b=$opt{b};
-
-$b ||=1;  
-foreach ( 1..$b ) {
-	my @a=exec_sql($dbi,$sql);
-	$count=$#a;
-}
-my $elapsed = tv_interval ( $t0, [gettimeofday]);
-print "$notice:\n";
-print "$sql\n" if ( $opt{v} );
-print "Done\n";
-print sprintf("total: %.02f sec; number: %d; for one: %.03f sec; found %d docs\n", $elapsed, $b, $elapsed/$b, $count+1 );
-$dbi -> disconnect;
-
-sub exec_sql {
-        my ($dbi, $sql, @keys) = @_;
-        my $sth=$dbi->prepare($sql) || die;
-        $sth->execute( @keys ) || die; 
-        my $r;  
-        my @row;
-        while ( defined ( $r=$sth->fetchrow_hashref ) ) {
-                push @row, $r;
-        }               
-        $sth->finish;   
-        return @row;
-}
-
diff --git a/contrib/rtree_gist/bench/create_test.pl b/contrib/rtree_gist/bench/create_test.pl
deleted file mode 100755
index 1c06b6863d..0000000000
--- a/contrib/rtree_gist/bench/create_test.pl
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/perl
-use strict;
-
-my $NUM = 20000;
-print "drop table boxtmp;\n"; 
-print "drop table boxtmp2;\n"; 
-
-print "create table boxtmp (b box);\n";
-print "create table boxtmp2 (b box);\n";
-
-srand(1);
-open(DAT,">bbb.dat") || die;
-foreach ( 1..$NUM ) {
-	#print DAT '(',int( 500+500*rand() ),',',int( 500+500*rand() ),',',int( 500*rand() ),',',int( 500*rand() ),")\n";
-	my ( $x1,$y1, $x2,$y2 ) = (
-		10000*rand(),
-		10000*rand(),
-		10000*rand(),
-		10000*rand()
-	);
-	print DAT '(',
-		max($x1,$x2),',',
-		max($y1,$y2),',',
-		min($x1,$x2),',',
-		min($y1,$y2),")\n";
-}
-close DAT;
-
-print "copy boxtmp from stdin;\n";
-open(DAT,"bbb.dat") || die;
-while(<DAT>) { print; }
-close DAT;
-print "\\.\n";
-
-print "copy boxtmp2 from stdin;\n";
-open(DAT,"bbb.dat") || die;
-while(<DAT>) { print; }
-close DAT;
-print "\\.\n";
-
-print "create index bix on boxtmp using gist (b gist_box_ops);\n";
-print "create index bix2 on boxtmp2 using rtree (b box_ops);\n";
-
-
-sub min {
-	return ( $_[0] < $_[1] ) ? $_[0] : $_[1];
-}
-sub max {
-	return ( $_[0] > $_[1] ) ? $_[0] : $_[1];
-}
diff --git a/contrib/rtree_gist/data/test_box.data b/contrib/rtree_gist/data/test_box.data
deleted file mode 100644
index e32b6fe251..0000000000
--- a/contrib/rtree_gist/data/test_box.data
+++ /dev/null
@@ -1,3378 +0,0 @@
-(12699,9028,12654,8987)
-(22689,4680,22614,4626)
-(43263,47296,43217,47217)
-(6184,8397,6182,8379)
-(863,28537,788,28456)
-(33783,4733,33746,4693)
-(40456,47134,40426,47087)
-(45950,8153,45887,8060)
-(33433,36474,33399,36460)
-(41106,22017,41086,21962)
-(19214,36781,19179,36767)
-(11582,40823,11498,40737)
-(35565,5404,35546,5360)
-(26489,17387,26405,17356)
-(30874,13849,30796,13814)
-(38255,1619,38227,1593)
-(4445,32006,4405,31914)
-(3923,32921,3876,32913)
-(36054,39464,36032,39434)
-(46540,6780,46524,6758)
-(12184,45811,12118,45787)
-(13198,17090,13143,17051)
-(30939,44578,30865,44486)
-(12502,4939,12431,4902)
-(3250,1108,3169,1063)
-(34029,41240,33976,41180)
-(47057,44018,46967,43927)
-(699,10114,686,10058)
-(5925,26020,5845,25979)
-(9462,39388,9382,39388)
-(270,32616,226,32607)
-(3959,49145,3861,49115)
-(207,40886,179,40879)
-(48480,43312,48412,43233)
-(37183,37209,37161,37110)
-(13576,13505,13521,13487)
-(5877,1037,5818,1036)
-(6777,16694,6776,16692)
-(49362,13905,49299,13845)
-(29356,14606,29313,14562)
-(5492,6976,5441,6971)
-(288,49588,204,49571)
-(36698,37213,36682,37158)
-(718,41336,645,41272)
-(8725,23369,8660,23333)
-(40115,9894,40025,9818)
-(40051,41181,40015,41153)
-(5739,1740,5715,1731)
-(25120,27935,25054,27876)
-(27475,46084,27447,46003)
-\N
-(33197,3252,33161,3245)
-(10892,15691,10869,15662)
-(39012,44712,38995,44640)
-(4506,6484,4458,6459)
-(13970,26316,13964,26236)
-(28009,28104,27968,28030)
-(5991,27613,5906,27607)
-(23649,6338,23610,6314)
-(25942,10008,25911,9928)
-(25651,29943,25590,29906)
-\N
-(24555,40334,24546,40330)
-(46870,43762,46789,43709)
-\N
-(20030,2752,19945,2687)
-(30758,26754,30718,26678)
-\N
-(4320,44673,4286,44625)
-\N
-(1011,15576,939,15574)
-(41936,40699,41854,40655)
-(20594,19002,20561,18995)
-(9388,41056,9325,41042)
-(34771,46693,34751,46645)
-(49398,46359,49332,46357)
-\N
-(23115,35380,23036,35306)
-(46305,34840,46283,34765)
-(16768,21692,16691,21647)
-(28695,3128,28654,3112)
-(22182,7107,22107,7074)
-(14567,1210,14468,1139)
-(14156,37139,14136,37119)
-(33500,38351,33477,38286)
-(39983,41981,39944,41954)
-(26773,20824,26719,20813)
-(42516,22947,42460,22932)
-(26127,10701,26044,10650)
-(17808,13803,17724,13710)
-(14913,49873,14849,49836)
-(37013,820,36955,736)
-(39071,1399,39022,1381)
-\N
-(9785,42546,9687,42540)
-(13423,14066,13354,14052)
-(3417,14558,3336,14478)
-(25212,46368,25128,46316)
-(10124,39848,10027,39820)
-(39722,39226,39656,39162)
-(6298,28101,6250,28076)
-(45852,5846,45809,5750)
-(48292,4885,48290,4841)
-(18905,4454,18894,4424)
-(18965,43474,18902,43444)
-(39843,28239,39761,28199)
-(18087,44660,18019,44632)
-(33886,10382,33794,10286)
-(38383,13163,38362,13092)
-(18861,25050,18842,24965)
-(29887,14326,29806,14274)
-(18733,11644,18698,11644)
-(5119,37952,5089,37950)
-(16191,34884,16149,34864)
-(29544,1104,29496,1062)
-(27740,41555,27701,41540)
-(4672,4087,4633,4060)
-(45441,38994,45377,38958)
-(3272,1176,3232,1146)
-(12820,26606,12790,26575)
-(30910,7590,30877,7512)
-(42476,39152,42377,39127)
-(6562,38490,6542,38447)
-(30046,20332,29988,20259)
-(40723,15950,40671,15949)
-(4945,46857,4908,46817)
-(47986,16882,47963,16877)
-(9842,22339,9805,22305)
-(29831,23169,29818,23122)
-(12322,34404,12250,34312)
-(22846,11091,22759,10992)
-(47627,2424,47603,2397)
-(18375,43632,18347,43577)
-(40441,974,40394,965)
-(34260,10573,34194,10522)
-(32914,9549,32828,9503)
-(49023,37827,48978,37799)
-(22183,10691,22111,10669)
-\N
-(38036,15828,38014,15759)
-(34604,16801,34508,16746)
-(26737,29997,26675,29976)
-(47375,40298,47293,40210)
-(771,2661,732,2649)
-(28514,25659,28504,25577)
-(13438,46494,13376,46455)
-(7187,17877,7125,17786)
-(49957,43390,49897,43384)
-(26543,20067,26482,20057)
-(16416,29803,16385,29724)
-(36353,7484,36286,7414)
-(26498,3377,26415,3358)
-(28990,32205,28936,32193)
-(45005,3842,45001,3816)
-(21672,23566,21603,23566)
-(33360,43465,33302,43429)
-\N
-(29884,9544,29838,9520)
-\N
-(5599,15012,5596,14930)
-(22396,21481,22344,21422)
-(24810,14955,24780,14887)
-(47114,18866,47081,18784)
-(39013,39245,38953,39237)
-(12863,40534,12803,40529)
-(351,37068,310,37019)
-\N
-(12916,34327,12891,34240)
-\N
-(49191,2694,49170,2628)
-(24127,38407,24050,38325)
-(3264,23053,3213,23007)
-(8172,30385,8144,30336)
-(19630,35716,19573,35640)
-(42554,5148,42521,5117)
-(42168,33453,42136,33426)
-(17732,32093,17666,32057)
-(1039,16626,1037,16587)
-(21287,7757,21265,7679)
-(47063,8260,47039,8225)
-(38645,16238,38561,16204)
-(18258,25358,18196,25341)
-(30458,1742,30458,1695)
-(35147,9273,35121,9233)
-(7670,16625,7642,16545)
-(49503,23432,49484,23383)
-(31089,23146,31062,23093)
-(47758,2734,47670,2703)
-\N
-(35276,1027,35259,972)
-(26337,17603,26313,17579)
-(35649,16777,35626,16777)
-(42454,5105,42362,5101)
-(21682,24951,21646,24920)
-\N
-(48383,25174,48303,25156)
-(14672,3532,14601,3460)
-(22570,22587,22515,22512)
-(23566,25623,23484,25573)
-(9530,24542,9504,24459)
-(41271,451,41236,401)
-(5556,37528,5502,37527)
-(12479,25042,12447,24991)
-(16568,22916,16499,22864)
-(42700,13084,42676,12992)
-\N
-(35523,40973,35504,40932)
-(32948,16962,32857,16901)
-(7808,13469,7712,13469)
-(13920,35203,13870,35131)
-(22731,31563,22658,31557)
-\N
-(22909,43956,22900,43857)
-(33077,35080,33074,35030)
-(48064,29307,48022,29280)
-(20232,46682,20212,46613)
-(29949,16790,29867,16711)
-(30260,32029,30180,31979)
-(17184,34503,17110,34482)
-(16066,42687,16039,42648)
-(2947,19819,2857,19788)
-(4900,47934,4818,47894)
-(27193,19014,27174,18976)
-\N
-(15597,27948,15590,27939)
-(11090,28623,11002,28589)
-(26956,18651,26920,18620)
-(3107,47753,3103,47711)
-(6745,24151,6711,24083)
-(43923,19213,43871,19124)
-(33451,23578,33370,23534)
-(8944,20605,8862,20601)
-(14905,7536,14892,7441)
-(2412,18357,2383,18354)
-(37060,1443,36974,1366)
-(15501,6230,15429,6190)
-\N
-(30333,50,30273,6)
-(35567,9965,35482,9912)
-(49847,7128,49798,7067)
-\N
-(27685,36396,27668,36384)
-(43832,18491,43825,18431)
-(36849,34600,36785,34589)
-(2348,47938,2307,47902)
-\N
-(20473,22131,20445,22113)
-(38486,4293,38471,4288)
-(30611,30451,30553,30400)
-(3883,21299,3819,21260)
-(7696,37555,7644,37534)
-(22399,7913,22317,7911)
-(42565,38605,42500,38598)
-(36595,12151,36500,12106)
-(587,35217,571,35123)
-(5764,15300,5764,15231)
-(12003,21265,11983,21210)
-(42564,4803,42470,4737)
-(42359,36834,42271,36746)
-(44700,14680,44658,14670)
-(19690,5627,19620,5607)
-(17780,43602,17714,43565)
-(45073,3491,45041,3434)
-(35043,2136,35017,2084)
-\N
-(39653,19215,39646,19198)
-(23970,25560,23935,25502)
-(28698,49233,28600,49223)
-(30266,3605,30245,3540)
-(25538,7857,25500,7791)
-(17711,1757,17708,1756)
-(5248,594,5190,587)
-(2730,32454,2671,32436)
-(1722,49089,1635,49067)
-(40954,5743,40921,5722)
-\N
-(21382,4426,21298,4331)
-(7885,18629,7872,18605)
-(42838,6459,42748,6451)
-(8217,19894,8207,19845)
-(20489,18524,20433,18520)
-(17383,23559,17309,23515)
-(38952,38968,38934,38913)
-(44665,18137,44636,18051)
-(22416,41220,22383,41213)
-(9901,664,9818,646)
-(23475,21981,23449,21973)
-(41875,17991,41818,17988)
-(36517,47731,36509,47713)
-(37595,49849,37581,49834)
-(38771,32720,38748,32684)
-(810,38523,736,38452)
-(29695,14942,29665,14907)
-(31911,15168,31906,15113)
-(3454,36839,3438,36831)
-(4832,47554,4820,47473)
-\N
-(11590,8292,11539,8272)
-(8193,33323,8106,33317)
-(16043,14799,16001,14710)
-(19574,11395,19514,11316)
-(26290,41424,26224,41342)
-(22844,12516,22807,12471)
-\N
-(15709,49580,15655,49553)
-(13387,28084,13379,28066)
-(2780,38807,2690,38711)
-(22031,32458,22028,32377)
-(13511,3351,13440,3297)
-(14648,26473,14614,26383)
-(17798,19885,17726,19852)
-(32355,27940,32324,27861)
-(43773,21031,43767,20985)
-(15419,45759,15403,45666)
-(770,38863,729,38806)
-(21221,35619,21183,35596)
-(38924,31021,38894,30961)
-(7395,32439,7345,32416)
-(2324,25118,2268,25074)
-(2958,15089,2935,15087)
-(2424,160,2424,81)
-(12123,18644,12099,18616)
-(7459,30276,7422,30218)
-(15847,45488,15814,45428)
-(26409,29897,26389,29863)
-(12336,34322,12279,34322)
-(9440,23550,9396,23466)
-(4991,30850,4905,30768)
-(47262,11940,47201,11939)
-(30584,42868,30555,42838)
-(23144,24089,23056,24067)
-\N
-(35930,11609,35847,11573)
-(7812,17271,7789,17203)
-(17946,37554,17878,37480)
-(27356,32869,27298,32813)
-(29971,47783,29933,47697)
-(26075,46494,25988,46451)
-(39314,41366,39289,41269)
-(31708,42900,31688,42865)
-(4510,10231,4439,10203)
-(43806,8482,43758,8446)
-(45990,49694,45927,49617)
-(48815,27640,48782,27573)
-(41675,26733,41622,26723)
-(23229,7709,23175,7693)
-(48976,17733,48962,17731)
-(10686,41470,10597,41434)
-(18053,27059,17989,27012)
-\N
-(35495,25950,35459,25912)
-(41896,45014,41881,44999)
-(22654,41896,22572,41801)
-(18581,7087,18524,6988)
-\N
-(14697,22406,14681,22311)
-(40092,28122,40043,28030)
-(35844,24243,35816,24238)
-(1254,25653,1250,25644)
-(1603,21730,1556,21640)
-(33048,21779,32991,21763)
-(29979,1632,29916,1592)
-(8620,633,8580,620)
-(22992,27035,22932,27008)
-(21409,29315,21390,29309)
-(3610,44748,3547,44699)
-(20402,9318,20343,9267)
-(31001,8709,30908,8658)
-(46840,47640,46773,47551)
-(49173,4705,49143,4630)
-(5339,31657,5251,31622)
-(8644,49668,8630,49648)
-(45387,2893,45309,2885)
-(47641,31020,47584,30941)
-(40238,10636,40208,10568)
-(19247,36924,19227,36924)
-(917,19957,827,19887)
-(40967,17841,40870,17820)
-(15850,4109,15794,4085)
-(20181,30916,20085,30870)
-(161,24465,107,24374)
-(21737,49690,21667,49663)
-(10328,20911,10232,20852)
-(24187,49823,24128,49768)
-(36084,4578,36007,4501)
-(38771,31741,38673,31674)
-(2202,30102,2111,30006)
-(27322,16074,27228,16039)
-(6843,17280,6765,17248)
-(16972,39744,16912,39700)
-(10608,38741,10553,38708)
-\N
-(4917,34801,4828,34766)
-(39281,33659,39268,33618)
-(31706,7119,31645,7063)
-(3427,44006,3422,44004)
-\N
-(10134,42608,10044,42599)
-(26294,32080,26200,32068)
-(21777,34680,21769,34606)
-(23373,25957,23314,25915)
-(10710,8401,10681,8400)
-(42062,19458,42019,19394)
-(26530,43036,26458,43004)
-(3394,46081,3360,46077)
-(38743,33953,38677,33924)
-(32438,8226,32345,8160)
-(9210,27333,9118,27301)
-(19594,1600,19568,1551)
-(10003,12278,9952,12255)
-(31737,7206,31650,7146)
-(16594,15821,16502,15759)
-(28208,30296,28189,30278)
-(30602,46237,30555,46185)
-(20715,5155,20697,5140)
-(48892,35271,48793,35210)
-(3175,5590,3113,5525)
-(34220,27947,34132,27865)
-(35105,39792,35011,39727)
-(21919,27314,21839,27286)
-\N
-(23963,3723,23917,3699)
-(16312,14078,16236,14045)
-(19233,49824,19185,49794)
-(1447,11768,1356,11699)
-(17311,17709,17224,17653)
-(11962,31709,11871,31627)
-(21355,40131,21355,40085)
-(33750,35273,33724,35180)
-(38896,25539,38879,25524)
-(39569,44899,39569,44893)
-(11075,41547,11039,41500)
-(3215,12202,3199,12127)
-(46215,33458,46132,33455)
-(15121,38012,15083,37974)
-(44448,18726,44412,18690)
-(3899,38263,3870,38262)
-(13854,13353,13786,13298)
-(8252,5402,8191,5320)
-(46849,37968,46820,37897)
-(16422,13957,16376,13897)
-(47369,7665,47353,7629)
-(11982,40874,11956,40806)
-\N
-(9552,27580,9496,27562)
-(32247,19399,32176,19337)
-(32704,2169,32635,2091)
-(7471,44213,7411,44130)
-(48433,7096,48379,7089)
-(37357,6543,37338,6452)
-(30460,29624,30433,29535)
-(20350,28794,20341,28705)
-(6326,32360,6267,32317)
-(1711,47519,1654,47430)
-(49540,16510,49521,16426)
-\N
-(26975,618,26908,579)
-(24118,30880,24020,30821)
-(3675,15477,3625,15418)
-(44953,9577,44953,9530)
-(38323,7965,38235,7910)
-(6629,36482,6579,36448)
-(33953,16460,33878,16408)
-(49222,16790,49186,16695)
-(17308,16951,17274,16904)
-(14135,6888,14077,6833)
-(38617,47768,38603,47760)
-(7345,10992,7290,10914)
-(35261,42152,35176,42096)
-(28586,4809,28544,4735)
-(37521,25299,37495,25217)
-(41941,17954,41912,17915)
-(1209,46863,1171,46863)
-(20103,34947,20048,34896)
-(32716,33816,32656,33769)
-(11113,6531,11036,6467)
-(48635,7321,48563,7262)
-(28435,37059,28349,37014)
-(12311,17208,12232,17112)
-(1466,48010,1379,48008)
-(11226,11997,11223,11925)
-(46896,32540,46821,32510)
-(32661,31255,32632,31187)
-(37739,20376,37655,20306)
-(44002,43326,43920,43257)
-(30337,1023,30271,968)
-(34436,23357,34432,23345)
-\N
-(21367,8168,21353,8091)
-(36370,21611,36369,21569)
-(4152,36488,4080,36476)
-(17696,13924,17664,13853)
-(34252,19395,34159,19316)
-(12574,3072,12573,2975)
-(3995,21243,3943,21167)
-(44553,30126,44513,30108)
-\N
-(4599,45275,4552,45254)
-(33191,11404,33176,11348)
-\N
-(14245,18633,14177,18540)
-(32457,20705,32393,20700)
-(40052,10499,40016,10457)
-(29824,44065,29785,44037)
-(31613,12565,31557,12543)
-(42692,29000,42652,28996)
-\N
-(40680,22219,40603,22140)
-\N
-(33575,27661,33488,27644)
-(46194,1385,46184,1355)
-(38442,48501,38407,48426)
-(25305,21544,25236,21523)
-(15562,8226,15561,8208)
-\N
-(20844,43614,20752,43558)
-(22566,30541,22554,30532)
-(2760,47802,2672,47789)
-(25515,30745,25433,30675)
-(48382,45134,48382,45093)
-(9940,27094,9871,27087)
-\N
-(48690,44361,48610,44338)
-(18992,11585,18899,11582)
-(21551,49983,21492,49885)
-(46778,29113,46770,29071)
-(43219,9593,43212,9548)
-(40291,1248,40224,1190)
-(12687,22225,12635,22219)
-(49372,38790,49306,38721)
-(49503,46808,49411,46798)
-(24745,5162,24732,5138)
-(5046,26517,5023,26424)
-(5583,46538,5495,46531)
-(6084,35950,6079,35895)
-(3503,23096,3437,23024)
-\N
-(45275,8420,45244,8418)
-(13514,45251,13491,45249)
-(42112,2748,42047,2668)
-\N
-(7810,21907,7806,21878)
-(48378,36029,48303,35979)
-(32568,48605,32510,48563)
-(859,18915,810,18915)
-(41963,17950,41939,17915)
-\N
-(42723,8031,42685,7955)
-\N
-(19587,5965,19556,5961)
-(8713,33083,8629,32996)
-(21243,7769,21226,7740)
-(43752,43026,43720,42944)
-(7883,41311,7859,41242)
-(10178,47874,10157,47826)
-(32177,48725,32093,48646)
-(22960,2784,22953,2774)
-(25101,49159,25087,49090)
-(32142,48915,32086,48850)
-(6636,44887,6590,44825)
-(37814,11606,37769,11578)
-(2870,23198,2820,23121)
-(21025,16364,20947,16271)
-(31341,36137,31269,36114)
-(38921,7906,38888,7831)
-(6966,17259,6922,17199)
-(32426,13344,32401,13253)
-(8084,30572,8078,30572)
-(42230,47674,42150,47603)
-(20724,44854,20724,44830)
-(27471,38453,27454,38430)
-(24590,37973,24544,37941)
-(45832,26077,45772,26031)
-(9589,24239,9582,24156)
-(37484,49472,37409,49432)
-(30044,19340,30004,19333)
-(16966,14632,16936,14572)
-(9439,40491,9403,40482)
-(28945,5814,28913,5805)
-(43788,41302,43746,41231)
-(33631,43451,33614,43354)
-(17590,49396,17510,49324)
-(15173,32572,15109,32507)
-(1912,23580,1840,23504)
-(38165,16185,38076,16154)
-(6729,1179,6637,1177)
-\N
-(6994,45406,6983,45325)
-(2912,21327,2908,21305)
-(14678,14244,14659,14222)
-(29944,14959,29898,14900)
-(47432,35658,47407,35610)
-(25542,39243,25466,39149)
-(5330,7206,5304,7165)
-(24790,27196,24695,27118)
-(38806,1961,38795,1906)
-(23290,4487,23212,4416)
-\N
-(35035,24337,34990,24297)
-(5549,38948,5549,38891)
-(24558,15492,24501,15425)
-(4636,3011,4574,2933)
-(26522,39986,26451,39940)
-(33486,18424,33410,18366)
-(36638,14324,36625,14287)
-(35115,41236,35055,41191)
-(31927,16896,31841,16806)
-(5796,43937,5697,43886)
-(25681,41645,25663,41608)
-(10962,42777,10894,42732)
-(32715,11026,32672,10991)
-(45803,20406,45710,20371)
-(34730,17672,34658,17606)
-(8809,6323,8798,6232)
-\N
-(39471,23837,39390,23749)
-\N
-(34078,17435,33987,17433)
-(9133,4544,9041,4509)
-(47274,29126,47242,29060)
-(6404,28488,6403,28475)
-(48894,49751,48846,49694)
-(17324,43023,17301,42972)
-(15599,8433,15557,8386)
-(48575,10202,48488,10175)
-(27638,24428,27608,24378)
-(45277,47456,45240,47422)
-(26482,46607,26482,46570)
-(41400,33898,41397,33802)
-\N
-(49853,18504,49848,18503)
-(11528,25165,11476,25080)
-(49902,41752,49818,41746)
-(1956,47506,1922,47424)
-(21834,22058,21802,21964)
-\N
-(19414,21842,19386,21822)
-(34801,13722,34744,13681)
-(13924,29243,13835,29160)
-(47749,21986,47664,21894)
-(47051,39582,46974,39489)
-(31287,49923,31236,49913)
-(47429,8625,47337,8585)
-(46987,44364,46901,44277)
-(16158,27510,16099,27467)
-(41184,6400,41148,6317)
-(1847,42471,1829,42426)
-\N
-(14409,48602,14320,48555)
-\N
-(38137,42951,38045,42918)
-(42875,2312,42832,2243)
-(27242,30617,27181,30535)
-(24882,44559,24812,44548)
-(22021,1596,22015,1581)
-(24300,1523,24250,1443)
-(43946,35909,43869,35868)
-(816,15988,776,15967)
-(25243,9401,25237,9332)
-(27967,25958,27928,25949)
-(6575,33949,6484,33900)
-(44812,35980,44800,35913)
-(37577,13064,37495,13019)
-\N
-(30891,29967,30814,29884)
-(15829,28836,15753,28807)
-(11128,34180,11126,34117)
-(9834,12537,9801,12508)
-(4899,29069,4809,29024)
-(29370,38459,29276,38382)
-(40743,46653,40647,46559)
-(9618,2723,9578,2631)
-(32542,26837,32515,26769)
-(5625,13409,5576,13355)
-(47490,19229,47472,19203)
-(48118,40275,48063,40203)
-(19245,20549,19227,20546)
-(25312,22243,25280,22164)
-(18797,28934,18723,28881)
-(31609,49393,31512,49366)
-(26183,32888,26135,32824)
-(46198,26153,46180,26149)
-\N
-(45383,16904,45353,16888)
-(7132,11408,7091,11338)
-(48262,43227,48236,43159)
-(31722,12861,31675,12810)
-\N
-(41695,48924,41691,48921)
-(48318,12877,48287,12802)
-(12069,32241,11978,32231)
-(8395,2694,8380,2661)
-(19552,34590,19550,34497)
-(12203,26166,12187,26143)
-(35745,9571,35654,9542)
-(22384,22535,22352,22439)
-(21459,28189,21360,28189)
-(7418,7203,7343,7182)
-(39497,48412,39413,48318)
-(1058,11132,979,11051)
-(45623,31417,45548,31381)
-\N
-(23887,31921,23876,31891)
-(7797,1244,7785,1155)
-(23679,43650,23594,43644)
-(21891,30561,21833,30485)
-(4069,6870,4019,6785)
-(5134,25117,5103,25034)
-(36101,41895,36085,41810)
-(39617,39211,39544,39191)
-(37437,6604,37434,6585)
-\N
-(7749,32601,7740,32515)
-(26203,34991,26159,34946)
-(31856,39006,31783,39003)
-(45828,24767,45788,24723)
-\N
-(49836,35965,49757,35871)
-(44113,49024,44033,48995)
-(38237,22326,38187,22253)
-(45235,19087,45190,19005)
-(1588,45285,1520,45254)
-(46628,8701,46552,8665)
-(47707,18258,47668,18250)
-(9377,26162,9325,26079)
-(28331,16766,28302,16731)
-(15792,27875,15727,27809)
-(16454,1972,16415,1967)
-(21012,15828,20972,15784)
-(27465,30603,27390,30560)
-(39256,7697,39225,7604)
-(25908,32801,25854,32770)
-(25215,40109,25201,40106)
-\N
-(23280,4613,23190,4596)
-(32440,30879,32405,30807)
-(49156,4224,49126,4126)
-(20005,40423,19911,40370)
-(20978,8226,20930,8170)
-(32127,22611,32126,22579)
-(21764,26509,21701,26455)
-\N
-(32923,2834,32914,2830)
-(7499,25331,7426,25300)
-(6163,36942,6107,36908)
-(41118,14583,41034,14486)
-(21211,33369,21208,33331)
-(7899,27682,7853,27603)
-(16546,48436,16535,48400)
-(24898,40195,24855,40174)
-(43029,982,43004,952)
-(26266,7962,26252,7950)
-\N
-(11308,44367,11210,44322)
-(8902,28402,8808,28334)
-(11671,19619,11665,19549)
-(47202,23593,47153,23505)
-(21981,40220,21905,40160)
-(46721,2514,46687,2471)
-(3450,33839,3424,33811)
-(41854,45864,41762,45792)
-(40183,47816,40114,47742)
-(26119,33910,26077,33816)
-(3430,16518,3365,16500)
-(40063,32176,40005,32166)
-(38702,15253,38679,15187)
-(17719,12291,17658,12257)
-(46131,30669,46068,30587)
-(42738,10952,42731,10907)
-(8721,45155,8650,45076)
-(45317,26123,45244,26113)
-(42694,11561,42614,11490)
-(10043,12479,10009,12391)
-(27584,2345,27578,2257)
-(30889,8253,30866,8167)
-\N
-(5176,48928,5107,48838)
-(9781,21023,9745,20976)
-(32430,27908,32404,27859)
-(3984,7391,3973,7352)
-(18904,8094,18842,8091)
-(20573,5508,20482,5496)
-(7806,44368,7753,44297)
-(18875,41452,18817,41376)
-(6632,12142,6566,12079)
-(33066,17865,33055,17854)
-(45726,19628,45714,19589)
-(26971,18459,26941,18423)
-(26554,23641,26515,23592)
-(45503,1325,45441,1231)
-(11898,20164,11880,20115)
-(27868,22837,27843,22776)
-(34931,8206,34855,8144)
-(42375,33603,42350,33539)
-(3184,8308,3129,8238)
-(26667,15813,26661,15785)
-\N
-(5760,49617,5730,49546)
-(794,27001,777,26992)
-(13518,45289,13459,45235)
-\N
-(34430,29754,34363,29736)
-(37912,24574,37880,24543)
-(8130,2270,8083,2258)
-\N
-(26930,21516,26848,21455)
-(3634,33511,3592,33489)
-(33080,5036,33035,4972)
-(48389,13942,48316,13915)
-(9231,5298,9150,5232)
-(1357,10601,1321,10548)
-\N
-(35175,15295,35091,15269)
-(33917,36863,33879,36784)
-(8279,12052,8239,12021)
-(11868,19083,11862,19034)
-(24019,30777,24006,30703)
-(44619,6959,44618,6938)
-(28610,2626,28523,2582)
-(29579,41801,29482,41775)
-(23448,37609,23396,37534)
-(40676,11252,40670,11191)
-(39656,14077,39564,13999)
-(33060,31042,33033,30950)
-(11720,6816,11654,6792)
-(13775,28873,13730,28868)
-(47851,39121,47802,39084)
-(30923,40255,30860,40199)
-(44169,15070,44085,15015)
-(42574,28664,42558,28590)
-(8993,43487,8941,43460)
-(40782,11648,40763,11631)
-(18516,10143,18423,10137)
-(39068,551,39005,491)
-\N
-(39672,12000,39575,11913)
-(18508,37761,18464,37712)
-(19083,35318,19079,35280)
-(30286,13736,30222,13672)
-(7223,9164,7132,9069)
-(20764,29286,20700,29210)
-(5733,8063,5699,8058)
-(8566,43873,8549,43797)
-(22126,27444,22062,27366)
-(15105,8717,15078,8660)
-(43987,33145,43940,33083)
-\N
-(46833,38652,46755,38612)
-(47768,27202,47681,27169)
-(22792,1183,22731,1152)
-(25650,43310,25562,43247)
-(37084,20116,37045,20057)
-(47461,32556,47423,32555)
-\N
-(41225,18124,41215,18117)
-(17623,25218,17553,25158)
-(13770,21703,13770,21700)
-(48958,35441,48870,35388)
-(2976,1808,2892,1802)
-(45118,22318,45049,22224)
-(42287,26616,42281,26560)
-(25525,6327,25468,6244)
-\N
-(40756,31634,40713,31568)
-(23105,26565,23078,26565)
-(48268,39862,48265,39827)
-(41656,26254,41567,26243)
-(28062,17920,28045,17825)
-(6443,17321,6402,17238)
-(10191,45466,10151,45447)
-(18097,39706,18043,39649)
-(37592,3244,37569,3197)
-(29809,5978,29762,5950)
-(12145,11251,12130,11202)
-(37507,42999,37446,42956)
-(10820,2866,10782,2830)
-(36440,42904,36421,42832)
-(38370,3386,38279,3311)
-(9345,17279,9313,17197)
-(20477,14864,20395,14807)
-(37147,37769,37110,37729)
-(15325,36135,15284,36053)
-(29034,32897,29009,32854)
-(2116,22274,2037,22216)
-(15078,38330,15048,38251)
-(7968,33600,7914,33573)
-(832,23851,770,23786)
-(38669,4348,38594,4344)
-(8521,48573,8425,48564)
-(1060,43320,969,43289)
-(26170,10150,26144,10069)
-(32324,8539,32285,8506)
-(13121,18044,13109,18021)
-(1597,9383,1594,9367)
-(49539,35164,49505,35065)
-(39464,10295,39409,10261)
-(8921,37898,8825,37803)
-(31171,47076,31093,47039)
-(7178,41397,7108,41304)
-(16240,34832,16162,34761)
-(2829,20119,2782,20091)
-(45854,21265,45810,21250)
-(6382,12106,6315,12030)
-(22301,46291,22291,46274)
-(34142,14181,34078,14158)
-(11258,29748,11198,29742)
-\N
-(37450,6943,37398,6882)
-(41675,27207,41643,27130)
-(13578,49562,13573,49479)
-(37132,37397,37081,37301)
-(49404,37193,49332,37170)
-(33536,31809,33444,31735)
-(45990,42751,45893,42708)
-(38852,20510,38802,20509)
-(27453,15836,27391,15802)
-(9347,29004,9284,28946)
-(44871,27727,44778,27668)
-(14978,19646,14970,19644)
-(23243,47091,23166,47080)
-(45204,21431,45167,21370)
-(14082,22316,14078,22235)
-(42778,22694,42744,22606)
-(4834,25241,4760,25196)
-(20497,18110,20494,18038)
-(45738,35524,45706,35496)
-(21575,5151,21493,5092)
-(2194,10052,2172,9960)
-\N
-(47735,24472,47682,24460)
-(46740,35700,46695,35609)
-(24647,42807,24568,42779)
-(18000,30576,17975,30506)
-(48638,46630,48544,46628)
-(48508,33600,48477,33578)
-(38703,45408,38670,45313)
-(21712,15015,21625,14956)
-(5840,42007,5768,41992)
-(44011,11138,43953,11117)
-(3899,33262,3897,33238)
-(30142,23967,30096,23927)
-(36950,13226,36908,13141)
-(13130,26915,13071,26873)
-(38576,35408,38539,35392)
-(16776,46244,16700,46176)
-(38251,25969,38168,25948)
-\N
-(3512,32256,3417,32242)
-(31923,31225,31832,31197)
-(5144,4969,5124,4937)
-(34499,46164,34430,46162)
-\N
-(39432,31907,39388,31828)
-(17316,24606,17221,24533)
-(20751,49352,20709,49323)
-(41673,30418,41623,30377)
-(29026,24400,28971,24345)
-(21929,30617,21894,30598)
-(35539,12421,35536,12355)
-(24938,45583,24870,45525)
-\N
-(27442,33090,27353,33064)
-(23949,12046,23949,12036)
-(11399,377,11360,294)
-(47099,9989,47023,9942)
-(641,33118,639,33084)
-(13687,41308,13682,41290)
-\N
-(3682,17727,3645,17660)
-(13262,19396,13185,19357)
-(18791,389,18774,366)
-(12489,45384,12403,45369)
-\N
-(12065,6364,12015,6325)
-\N
-(32705,23886,32619,23827)
-\N
-(7004,37333,6911,37240)
-(28594,38078,28530,38050)
-(5805,21797,5710,21701)
-(41145,18905,41058,18873)
-(35599,10002,35591,9956)
-(5387,39087,5326,38994)
-(11703,14003,11671,13912)
-(4093,10472,4091,10470)
-\N
-(14110,49740,14063,49695)
-(4170,470,4097,463)
-(22219,17296,22164,17221)
-(2505,20879,2446,20842)
-\N
-(47235,24744,47151,24667)
-(30035,23234,30013,23197)
-(3489,11659,3461,11607)
-(38435,46322,38429,46230)
-(12315,32880,12277,32854)
-(33350,35297,33317,35263)
-(18845,37671,18836,37589)
-(24855,23554,24783,23520)
-(48251,44461,48188,44408)
-(17695,43353,17605,43286)
-(4964,21292,4893,21270)
-(33919,29907,33852,29878)
-(29139,40010,29084,39957)
-(41611,37750,41572,37741)
-(41773,34717,41682,34700)
-(8225,7424,8221,7363)
-(1785,28248,1771,28219)
-(21553,36307,21505,36257)
-(7552,18199,7527,18119)
-\N
-(14410,30977,14349,30944)
-\N
-(20940,49142,20901,49069)
-(36892,5522,36810,5478)
-(40192,20926,40179,20926)
-(44702,15182,44641,15117)
-(43431,4921,43337,4827)
-(41129,21654,41084,21642)
-(6205,42785,6113,42722)
-(23714,10224,23666,10205)
-(9318,35175,9274,35139)
-(40698,12676,40618,12627)
-(49954,1340,49905,1294)
-(32774,33062,32763,33062)
-(4336,22183,4241,22157)
-(10241,47657,10151,47592)
-(6746,16718,6666,16634)
-(26842,49694,26839,49680)
-(34870,47437,34820,47347)
-(26365,22266,26326,22183)
-(39859,932,39829,840)
-(33995,10888,33902,10793)
-(32972,22342,32951,22340)
-\N
-(19951,10161,19932,10111)
-(26779,45188,26745,45151)
-(11235,13593,11184,13589)
-(27334,20968,27288,20953)
-(9586,43102,9488,43085)
-(43935,49759,43925,49680)
-(10548,37032,10474,36955)
-(9326,14927,9295,14848)
-(41340,11312,41311,11303)
-(6500,44553,6454,44515)
-\N
-(8198,26841,8104,26749)
-(47761,34183,47702,34140)
-(43637,17912,43577,17910)
-(17623,11138,17590,11122)
-(48122,13132,48077,13060)
-(27911,39796,27908,39777)
-(1108,7918,1080,7832)
-(18776,24329,18699,24326)
-(1171,37901,1075,37871)
-(38437,33948,38364,33907)
-(1913,11593,1817,11533)
-(22684,266,22656,181)
-(13299,17075,13241,17074)
-(6924,30196,6851,30113)
-\N
-(4367,13150,4298,13053)
-(37381,6101,37380,6046)
-(10307,28383,10270,28349)
-(12283,8636,12256,8610)
-(20230,32775,20144,32723)
-(32942,12812,32905,12714)
-(46140,7138,46140,7047)
-(37235,29436,37161,29425)
-(42486,25454,42478,25444)
-(47860,46973,47842,46961)
-(41760,21026,41662,20955)
-(29663,20088,29566,20026)
-(19167,33241,19101,33235)
-(12306,37845,12301,37803)
-(11288,873,11203,857)
-(30309,5120,30282,5060)
-(46927,19737,46856,19687)
-(16664,20052,16649,19989)
-(7330,8675,7296,8613)
-(45067,45724,44991,45631)
-(45317,10862,45218,10842)
-(15012,47009,14998,46956)
-(47882,10146,47813,10099)
-(31571,46215,31511,46148)
-(32257,2619,32187,2531)
-(38924,41305,38872,41285)
-(49981,34876,49898,34786)
-(30501,35099,30418,35011)
-\N
-(45862,41438,45854,41434)
-(38448,31878,38391,31822)
-(8278,43463,8274,43378)
-(5883,30629,5878,30564)
-(49501,40346,49447,40275)
-(31651,43116,31560,43106)
-(44244,32940,44244,32926)
-\N
-(17941,18079,17938,18035)
-(9518,32524,9470,32511)
-(30707,43469,30686,43457)
-(3284,46542,3187,46477)
-(43423,29642,43393,29602)
-(19940,16825,19877,16736)
-(26194,47446,26194,47407)
-(30386,24675,30333,24652)
-(42707,44466,42688,44456)
-\N
-(43395,18525,43320,18467)
-(28346,32259,28276,32196)
-(45106,40786,45026,40767)
-(36734,20414,36722,20363)
-(37140,11569,37099,11475)
-(8967,6409,8882,6341)
-(31036,27923,30993,27890)
-(22442,47682,22347,47663)
-(32511,24029,32482,23970)
-(22593,34444,22519,34399)
-(41534,15495,41518,15455)
-\N
-(35862,19997,35818,19928)
-(31419,8323,31404,8285)
-(31036,19023,30978,19000)
-(46900,15192,46891,15102)
-(12774,9651,12765,9604)
-(49985,6436,49927,6338)
-(7184,47344,7089,47285)
-(12792,45021,12740,45011)
-(15019,27192,14940,27096)
-(35415,23106,35381,23095)
-(42129,14283,42095,14245)
-(29375,45807,29347,45743)
-(21763,24916,21700,24889)
-(47656,8794,47579,8774)
-(6139,49571,6059,49472)
-(44492,45607,44483,45532)
-(22699,4301,22628,4240)
-(27407,24241,27335,24158)
-\N
-(38424,34460,38403,34458)
-(46572,48456,46554,48402)
-(39676,29056,39643,28981)
-(4202,33076,4107,33010)
-(32499,10592,32482,10575)
-(22504,45417,22459,45378)
-(49619,40322,49619,40268)
-(14463,9305,14426,9224)
-(10070,20300,10035,20211)
-(35060,28561,34965,28553)
-(23970,47522,23887,47428)
-(46803,19155,46790,19131)
-\N
-(46151,49848,46058,49830)
-(45266,40766,45209,40738)
-(31041,32195,31007,32110)
-(41401,17245,41334,17224)
-(37445,654,37435,602)
-(45568,31904,45508,31857)
-(29326,7923,29285,7896)
-(27078,34643,27027,34606)
-(34492,43443,34437,43345)
-(34109,4307,34083,4265)
-(2755,45325,2727,45312)
-(12571,24218,12536,24195)
-(41224,2454,41149,2445)
-(711,34828,655,34788)
-(9104,18865,9036,18850)
-(3508,26816,3456,26771)
-(20159,16212,20116,16160)
-(36871,7425,36777,7421)
-(2751,45244,2734,45222)
-(35867,28071,35769,28052)
-(46878,35730,46850,35725)
-(20610,35086,20513,35037)
-(3903,32612,3887,32517)
-(9330,40226,9289,40169)
-(6338,28242,6329,28184)
-(35668,18344,35606,18304)
-(29892,48927,29878,48879)
-(26999,646,26932,612)
-(36377,38898,36338,38847)
-(40289,31459,40236,31436)
-(30377,1164,30306,1069)
-(7642,12183,7590,12112)
-(40325,1716,40296,1662)
-(36412,38787,36318,38691)
-(3967,33268,3923,33261)
-(33914,40774,33873,40763)
-(45978,41431,45963,41332)
-(39195,12546,39120,12520)
-(29962,30878,29941,30846)
-(9365,10732,9310,10726)
-(28801,23943,28740,23885)
-(28934,38858,28928,38807)
-(22126,45897,22068,45803)
-(2923,33832,2918,33751)
-(25116,2276,25083,2272)
-(31174,14546,31144,14460)
-(11728,9072,11658,9004)
-(19804,49195,19730,49125)
-(23090,28826,23010,28787)
-(33989,27553,33947,27486)
-(39702,47613,39641,47553)
-(31397,3607,31304,3519)
-(5835,9262,5791,9226)
-(40112,37022,40038,36926)
-(12346,29356,12282,29344)
-(28503,9623,28469,9591)
-(38449,43143,38378,43066)
-(36950,37311,36905,37265)
-(34824,5729,34818,5706)
-(9288,26969,9225,26900)
-(2535,42176,2478,42159)
-(29098,49051,29085,49031)
-(44759,33326,44727,33230)
-(42849,2970,42821,2919)
-(46014,27193,45985,27151)
-(14506,13713,14417,13626)
-(19342,44905,19332,44895)
-(38178,37003,38147,36925)
-(29179,27310,29084,27288)
-(42713,10158,42671,10060)
-(43336,38389,43290,38326)
-(41260,34410,41245,34327)
-(27907,2695,27830,2596)
-(16309,44972,16222,44966)
-(6230,22262,6214,22249)
-\N
-(9266,39458,9175,39447)
-(33120,33548,33087,33538)
-(43659,11416,43599,11375)
-(49707,39258,49702,39159)
-(23520,22140,23486,22072)
-(24736,46502,24668,46412)
-(7826,16851,7730,16807)
-(39114,6048,39056,5965)
-(11859,8753,11764,8701)
-(42254,48367,42240,48328)
-(26136,49185,26056,49175)
-(38395,11209,38334,11137)
-(33249,9425,33209,9348)
-(22131,38502,22112,38460)
-(5306,24344,5267,24268)
-(30292,1198,30233,1149)
-(9903,10896,9850,10806)
-(25568,22911,25487,22868)
-(22048,43391,22043,43362)
-(20852,25827,20851,25766)
-(35204,17119,35114,17093)
-(5575,43431,5554,43410)
-(17727,13623,17678,13560)
-(14721,29520,14709,29461)
-(40317,42220,40267,42166)
-(31435,31012,31386,30931)
-(40655,10103,40645,10006)
-(35783,17802,35773,17763)
-(34874,10210,34856,10200)
-(3694,14279,3610,14239)
-(27854,5493,27799,5433)
-(34913,7234,34894,7220)
-(15758,26445,15738,26421)
-(23710,7272,23705,7270)
-\N
-(33679,13468,33628,13415)
-\N
-(31271,40495,31178,40461)
-(759,187,662,163)
-(14419,40434,14402,40381)
-(45879,42933,45814,42872)
-(167,17214,92,17184)
-(9964,12210,9958,12195)
-(35834,46257,35817,46211)
-(26077,5629,25978,5621)
-(46177,44640,46082,44544)
-(44780,28753,44707,28692)
-(35491,24729,35425,24690)
-(33914,34190,33914,34131)
-(17709,33253,17668,33227)
-(45516,11888,45423,11848)
-(24497,24752,24411,24710)
-(30333,5952,30331,5886)
-(444,12587,430,12497)
-(7592,22353,7541,22287)
-\N
-(13387,37414,13329,37318)
-\N
-(21504,35227,21449,35210)
-(18533,12909,18438,12848)
-(41049,27148,41048,27088)
-(18205,12222,18151,12140)
-(18026,5164,18026,5156)
-(34104,29862,34006,29815)
-(18520,49686,18454,49602)
-(37000,41493,36920,41424)
-(43025,25711,42986,25687)
-(38620,47018,38535,46934)
-(24119,36813,24023,36739)
-(48887,26359,48879,26302)
-(47827,14625,47810,14609)
-(10792,30746,10776,30716)
-(30384,40672,30318,40582)
-(48417,22790,48358,22746)
-(14854,5819,14785,5798)
-(19142,44414,19085,44406)
-(31179,27081,31145,27005)
-\N
-(19692,8711,19659,8642)
-(39689,14082,39603,14051)
-(11181,39091,11119,39002)
-(46015,23374,45936,23328)
-(12517,49702,12427,49690)
-(21926,21137,21841,21111)
-(31956,12509,31870,12494)
-(5895,2030,5851,2020)
-(27094,5447,27014,5377)
-(35781,8717,35780,8618)
-(14012,12023,13972,12015)
-(1702,12442,1696,12419)
-(28549,5251,28462,5248)
-(26441,21007,26360,20925)
-(49820,7990,49771,7967)
-(26424,29698,26339,29693)
-(35146,6820,35071,6817)
-\N
-(15438,18788,15435,18729)
-(47115,5235,47096,5143)
-(33982,9002,33915,8925)
-(14206,37041,14174,36955)
-(24300,36616,24232,36613)
-(44658,1788,44580,1769)
-\N
-(31539,43550,31463,43464)
-\N
-(16722,9673,16633,9652)
-(44813,20573,44733,20544)
-\N
-(42114,32559,42040,32552)
-(41561,36244,41477,36241)
-(39589,33796,39548,33716)
-(20365,26770,20329,26709)
-(28511,208,28479,114)
-(10010,25524,9930,25508)
-\N
-(1549,45666,1512,45621)
-(16193,1927,16166,1869)
-(34486,11500,34421,11401)
-(14048,37944,13994,37901)
-(21692,9594,21617,9496)
-(2568,37899,2557,37811)
-(4360,24503,4278,24443)
-(50027,49230,49951,49214)
-(44849,14867,44836,14813)
-(16695,34896,16683,34840)
-(12600,35217,12593,35129)
-(23113,24009,23030,23962)
-(49907,30225,49810,30158)
-(18026,25208,17970,25208)
-(49711,39844,49651,39790)
-(5427,42682,5357,42637)
-(23901,14221,23802,14184)
-(15470,12185,15376,12163)
-(47302,34023,47292,34001)
-(24336,17418,24315,17393)
-(13948,17043,13903,16970)
-(8555,8986,8530,8953)
-(48830,6038,48743,5986)
-(48720,40687,48623,40610)
-(21161,30970,21146,30896)
-(9507,36316,9411,36261)
-\N
-(36643,18136,36614,18106)
-(1858,7457,1851,7402)
-(24452,44306,24372,44252)
-\N
-(3292,807,3205,806)
-(6845,30694,6792,30627)
-(21333,25786,21237,25751)
-(23008,22574,22999,22511)
-(8790,8893,8772,8806)
-(43333,47968,43264,47900)
-(5377,24103,5302,24076)
-(18410,23993,18329,23907)
-(24752,19126,24713,19069)
-(49772,11378,49696,11293)
-(3468,12920,3396,12873)
-(1746,40342,1736,40333)
-(49187,29737,49139,29681)
-(27657,44952,27581,44917)
-\N
-(35407,30177,35345,30151)
-(4071,40568,4058,40544)
-(25998,30513,25965,30452)
-(8195,45403,8097,45310)
-(8276,41689,8183,41670)
-\N
-(48435,28550,48355,28455)
-\N
-(8139,25449,8136,25380)
-(20302,25574,20297,25531)
-\N
-(22055,46659,22034,46567)
-(3531,49962,3463,49934)
-(46828,46938,46739,46902)
-(42294,786,42212,739)
-(8779,3292,8761,3275)
-(48146,46170,48082,46151)
-(21571,10000,21531,9919)
-(35526,26029,35450,25945)
-(38893,22225,38865,22197)
-(22189,37520,22132,37497)
-(810,43261,751,43198)
-(10352,39144,10290,39093)
-(8740,35435,8720,35432)
-(31657,13551,31583,13484)
-(39803,4019,39755,4014)
-(46353,7853,46312,7824)
-(30078,48975,30021,48970)
-(2847,32036,2819,31966)
-(25250,10147,25165,10140)
-\N
-(15643,38953,15585,38947)
-(40792,29798,40731,29731)
-(43249,26858,43215,26835)
-(47229,2199,47201,2134)
-(10052,23601,9958,23570)
-(38981,21615,38892,21604)
-(3651,45004,3570,44917)
-(21503,8261,21409,8166)
-(13518,34201,13465,34105)
-(13899,25117,13836,25114)
-(18327,17403,18301,17349)
-(19503,13648,19483,13607)
-(3554,19487,3529,19466)
-(41102,43355,41070,43314)
-(4663,45858,4583,45765)
-(3971,3023,3931,2975)
-(37124,7061,37080,6993)
-(48530,47172,48459,47160)
-(14575,29843,14509,29750)
-(43443,23124,43357,23038)
-(8864,48290,8857,48263)
-(41597,39852,41577,39791)
-(35610,33392,35556,33353)
-(36415,17906,36328,17846)
-(24919,43933,24839,43883)
-(7457,14056,7395,14051)
-(43851,4090,43801,4080)
-(43567,18468,43471,18388)
-(16711,6084,16652,6055)
-(45888,45934,45846,45880)
-(45630,9313,45585,9248)
-(27119,25969,27094,25884)
-(36155,11420,36120,11405)
-(41880,47111,41808,47049)
-\N
-(17554,20379,17482,20374)
-(38848,5936,38763,5869)
-(28324,31019,28276,30944)
-(43257,17152,43176,17091)
-(42717,24613,42691,24527)
-(16786,41486,16763,41403)
-(19259,28780,19160,28711)
-(25843,28265,25760,28171)
-(48645,34816,48546,34755)
-(7004,49289,6976,49236)
-(30261,21833,30181,21776)
-(5290,46672,5219,46661)
-(21237,31901,21188,31849)
-(23340,38537,23253,38472)
-(17269,3682,17183,3586)
-\N
-(48200,15377,48110,15369)
-(16546,22195,16477,22142)
-(21436,8460,21378,8449)
-\N
-(46598,17235,46577,17138)
-\N
-(30212,36184,30152,36092)
-(18037,155,17941,109)
-(4945,29201,4933,29184)
-(32835,18782,32770,18750)
-(34160,33104,34120,33007)
-(5151,26989,5149,26909)
-(1801,15549,1710,15461)
-(48988,34819,48951,34764)
-(20904,32547,20856,32497)
-\N
-(32654,35183,32606,35144)
-(14336,11763,14328,11712)
-(30546,23808,30463,23773)
-(6813,21006,6781,20924)
-\N
-(14199,22030,14185,21934)
-(3783,14709,3747,14658)
-(49428,47052,49422,46973)
-(29551,27682,29470,27654)
-(29170,37260,29151,37181)
-(48924,24689,48894,24680)
-(48497,34052,48453,33966)
-\N
-(21263,8203,21242,8176)
-(46537,3797,46462,3735)
-(18406,14579,18393,14563)
-\N
-(11583,16529,11536,16471)
-(10564,46257,10478,46228)
-(49769,34513,49761,34458)
-\N
-(9202,6482,9138,6391)
-(40387,37411,40357,37360)
-(11966,11802,11888,11751)
-(15551,47438,15486,47406)
-(12017,43288,11969,43230)
-(9717,22574,9701,22495)
-\N
-(35083,49443,35075,49355)
-(33857,9320,33813,9269)
-(32106,10581,32012,10560)
-(14345,12485,14273,12424)
-(24187,46416,24175,46402)
-(43854,42159,43808,42129)
-(35399,40707,35359,40646)
-(29585,25576,29493,25556)
-(24919,7829,24911,7753)
-\N
-(17049,48390,17022,48304)
-(25224,35012,25217,34922)
-(47397,20853,47346,20779)
-(17221,16558,17181,16516)
-(8669,16491,8645,16486)
-(23502,44241,23484,44164)
-(36169,37046,36072,37010)
-(44775,32394,44763,32357)
-(30685,36871,30662,36792)
-(21783,47642,21714,47630)
-(34847,27467,34761,27372)
-(43925,49912,43888,49878)
-(16455,27861,16364,27813)
-(38406,18310,38329,18309)
-(5408,9461,5319,9426)
-(41856,36900,41784,36854)
-(23723,4460,23646,4448)
-(18454,40138,18430,40046)
-(17505,36822,17418,36763)
-(36686,33534,36641,33476)
-(11347,9454,11289,9436)
-\N
-(27816,34752,27745,34736)
-(44213,8559,44162,8461)
-(45359,26789,45315,26776)
-(31249,19475,31224,19421)
-(25917,44239,25819,44149)
-(47313,40691,47264,40685)
-(40577,33848,40513,33794)
-(9606,45253,9582,45174)
-(30005,24521,29910,24496)
-(49332,35375,49309,35299)
-\N
-(12164,33871,12075,33820)
-(19598,43327,19593,43314)
-\N
-(3818,28584,3815,28504)
-\N
-(35579,8611,35541,8604)
-(8811,20986,8750,20954)
-(16139,44777,16128,44686)
-(35550,41501,35534,41458)
-(43180,11927,43109,11891)
-(45798,8465,45711,8460)
-(18196,6886,18126,6845)
-(1774,32167,1701,32073)
-(7030,40790,7029,40711)
-(11676,23009,11665,22915)
-(33990,22561,33953,22474)
-\N
-(30366,9447,30284,9353)
-(37626,32913,37596,32853)
-(7730,42561,7665,42470)
-(49347,8403,49315,8387)
-(6874,3499,6812,3458)
-(44189,16999,44169,16964)
-(6312,30167,6231,30083)
-(18932,6611,18909,6518)
-(32262,13076,32223,13057)
-(45989,249,45910,222)
-(42710,855,42692,796)
-(25562,9849,25535,9802)
-(13348,46719,13260,46689)
-(30022,42196,30005,42160)
-\N
-(22263,45954,22243,45950)
-(18918,18890,18820,18795)
-(31918,12003,31852,11989)
-(12252,39453,12211,39398)
-(40208,9789,40194,9759)
-(35943,21767,35914,21693)
-(18439,10706,18383,10618)
-(2803,18999,2778,18925)
-(14953,27444,14875,27397)
-(12587,22025,12545,21928)
-(33930,21090,33918,21009)
-(10444,2606,10407,2553)
-(28700,29782,28665,29703)
-\N
-(1402,13497,1397,13465)
-\N
-(24155,3075,24083,3062)
-(38378,1864,38339,1849)
-(29261,49910,29247,49818)
-(38139,37073,38098,37057)
-\N
-(24468,41130,24418,41053)
-(9989,1015,9959,939)
-(47001,33561,46994,33518)
-(47058,16030,46983,16012)
-(35509,1814,35426,1748)
-(3630,48019,3597,47923)
-(47781,12986,47741,12947)
-(16364,9908,16356,9882)
-(17290,41508,17287,41410)
-(42423,26477,42349,26434)
-(10039,920,9952,833)
-(16851,21338,16846,21314)
-\N
-(23104,7700,23062,7688)
-(5619,2079,5611,2075)
-(31471,49632,31375,49549)
-(25793,12526,25783,12456)
-(3935,29528,3866,29513)
-\N
-(5957,1646,5947,1595)
-(2467,22376,2429,22349)
-(43715,32673,43664,32595)
-(6726,13093,6636,12994)
-(31477,18347,31421,18299)
-(34232,36635,34200,36552)
-(49061,14516,49008,14442)
-(43996,6129,43955,6074)
-(7728,33802,7670,33703)
-\N
-(6131,36766,6053,36749)
-(35791,16361,35696,16329)
-(45759,8935,45675,8886)
-(43634,2029,43537,1940)
-(4916,32233,4844,32181)
-(46701,23508,46623,23477)
-(29590,4893,29552,4871)
-(38647,4423,38574,4396)
-(7593,25845,7497,25751)
-(8510,43552,8432,43492)
-(18791,39181,18730,39162)
-(7462,2956,7454,2858)
-(1394,26795,1392,26780)
-(16707,21993,16609,21932)
-(26838,10866,26803,10836)
-(31642,29842,31585,29760)
-(21891,3502,21863,3406)
-(13258,587,13250,507)
-(6072,47397,6021,47369)
-(16605,49730,16579,49659)
-(42830,40981,42791,40981)
-(12975,3706,12913,3637)
-(30925,21660,30826,21649)
-(1455,14229,1410,14156)
-\N
-(17583,16486,17562,16474)
-(33377,3387,33333,3381)
-(784,6177,750,6095)
-(22111,44110,22106,44013)
-(1444,403,1346,344)
-(4010,46220,3982,46212)
-(17932,8150,17861,8127)
-(38685,31466,38636,31416)
-(14257,11549,14242,11522)
-(14990,15217,14904,15211)
-(21395,21533,21307,21520)
-\N
-(31948,33725,31885,33694)
-(433,49033,390,48961)
-(45205,609,45173,523)
-(25065,35494,25003,35455)
-(33265,6677,33224,6611)
-(18179,22345,18133,22256)
-(3916,13759,3820,13732)
-(1696,13478,1604,13436)
-(47203,25980,47130,25907)
-(24913,13361,24868,13268)
-(13824,40177,13792,40130)
-(25671,13555,25585,13494)
-\N
-(20133,37769,20105,37679)
-\N
-(26368,16734,26288,16726)
-(30545,35438,30458,35376)
-(48816,22926,48812,22831)
-(48807,31389,48739,31330)
-(11003,10859,10950,10765)
-(17288,8570,17247,8485)
-(38377,31415,38331,31379)
-\N
-(19085,23425,19059,23326)
-(40059,17068,40052,17006)
-(18811,13493,18734,13394)
-(36319,17197,36225,17181)
-(14939,38780,14863,38714)
-(49539,17656,49479,17629)
-(42530,45951,42466,45854)
-(27318,26654,27233,26610)
-(49980,35004,49937,34963)
-(18326,32558,18322,32502)
-(45951,28555,45896,28481)
-(12104,33531,12014,33501)
-(22311,41113,22215,41066)
-(25073,18721,25047,18656)
-\N
-(14524,13486,14510,13390)
-(40040,36688,40000,36599)
-(21594,11473,21563,11436)
-(44031,22274,43938,22187)
-(729,30683,668,30601)
-(14114,20873,14102,20803)
-(28239,41377,28222,41308)
-(26404,11922,26317,11843)
-(41660,34586,41585,34501)
-\N
-(21128,2384,21101,2368)
-(30209,16952,30156,16858)
-(39078,24963,39045,24898)
-(5598,1348,5499,1294)
-\N
-(38474,7436,38450,7364)
-(15117,45734,15024,45693)
-\N
-(23909,39853,23888,39780)
-(24292,30183,24282,30148)
-(48871,17661,48868,17637)
-(918,18752,847,18708)
-\N
-(43615,16162,43606,16104)
-(33763,47410,33751,47409)
-(4798,6485,4773,6388)
-\N
-(18524,41539,18433,41518)
-(47745,42449,47651,42364)
-(38936,21237,38864,21204)
-\N
-(5251,3516,5194,3475)
-(22269,36269,22183,36228)
-(18736,40983,18685,40947)
-(38393,15444,38356,15363)
-(38134,29898,38103,29862)
-(37789,39557,37732,39474)
-(31906,23005,31838,23003)
-(10647,40094,10560,40040)
-(9914,41547,9867,41545)
-(44221,443,44125,433)
-(41479,10936,41381,10847)
-(42586,6301,42563,6235)
-(2504,17588,2449,17554)
-(7045,18782,7028,18764)
-(41840,32018,41768,31938)
-(38416,17158,38330,17060)
-\N
-(8605,39015,8605,38933)
-(5764,43548,5719,43496)
-\N
-(20789,29902,20696,29843)
-\N
-(36104,47896,36079,47816)
-(31736,13834,31722,13832)
-(32617,19701,32597,19684)
-(1671,18997,1622,18945)
-(36007,26545,36005,26535)
-(31864,17494,31820,17455)
-(27346,28388,27303,28289)
-(8191,9653,8133,9589)
-(7501,21616,7405,21536)
-(35450,9580,35368,9563)
-(29281,37276,29247,37255)
-(6225,17192,6200,17135)
-\N
-(43689,8119,43670,8028)
-(41917,49601,41835,49563)
-(44295,13116,44205,13078)
-(22721,44772,22667,44748)
-(32640,11107,32636,11050)
-(20639,28851,20613,28839)
-\N
-(32479,10159,32446,10061)
-(27251,16978,27196,16959)
-(41401,33148,41339,33074)
-\N
-(49001,8538,48989,8444)
-(37958,35843,37874,35802)
-(46969,41229,46903,41138)
-(18541,8876,18541,8870)
-(4080,31634,4061,31627)
-(8097,35240,8040,35152)
-(18470,21414,18463,21412)
-(20914,17897,20838,17869)
-(42688,11681,42666,11641)
-(47525,25005,47443,24907)
-(32439,14438,32397,14400)
-\N
-(39667,19626,39622,19542)
-(1212,44525,1169,44516)
-(29766,4433,29668,4401)
-(25847,49657,25813,49605)
-(33859,17356,33827,17263)
-(28989,45953,28904,45854)
-(37211,30830,37113,30819)
-\N
-(45220,26382,45219,26340)
-(12312,43250,12234,43246)
-(37775,41504,37762,41421)
-(45889,33499,45822,33411)
-(49461,22601,49369,22553)
-(39857,33844,39816,33824)
-(46102,15822,46030,15778)
-(46605,31239,46598,31170)
-(23925,5856,23862,5808)
-(15459,4262,15407,4241)
-(12019,4907,12015,4818)
-(38258,17973,38229,17923)
-(40575,29566,40477,29521)
-\N
-(29715,45919,29697,45891)
-(11694,9510,11670,9490)
-(7053,44257,7012,44231)
-(16465,8603,16391,8505)
-(29170,15592,29098,15527)
-(20400,37354,20345,37328)
-(5281,10265,5252,10184)
-(6084,48782,6058,48727)
-(11006,6889,10971,6796)
-(16299,19461,16286,19411)
-(13718,29192,13642,29106)
-(3999,2965,3963,2903)
-(18509,12235,18430,12208)
-(49542,38575,49537,38534)
-(15093,41715,15071,41634)
-(6802,8385,6714,8300)
-(15127,17507,15097,17424)
-(36921,3025,36835,2995)
-(32117,24327,32101,24262)
-(27244,24151,27165,24104)
-(36339,42360,36313,42358)
-(47288,46252,47245,46184)
-(37867,6649,37818,6565)
-(14886,22103,14865,22089)
-(39611,17952,39513,17951)
-(37329,31436,37298,31436)
-(5715,39115,5698,39099)
-(13266,7364,13203,7296)
-(16076,10945,16006,10942)
-(7197,41509,7126,41413)
-(14411,40868,14330,40772)
-(12872,33481,12862,33454)
-(17786,19616,17758,19560)
-(1052,37358,996,37311)
-(42825,12643,42762,12625)
-(20007,49858,19921,49778)
-(27155,6355,27072,6257)
-(14117,40208,14022,40155)
-(47280,34069,47279,34028)
-(17551,15803,17482,15763)
-(1725,6673,1676,6649)
-(43984,31128,43961,31105)
-(43772,47042,43731,47038)
-(46901,47317,46817,47228)
-(19877,14179,19837,14168)
-(20691,19989,20675,19935)
-(4011,18914,3963,18817)
-(1023,23378,933,23317)
-(30051,46118,29966,46039)
-(43499,46488,43496,46409)
-\N
-(43531,2412,43447,2396)
-\N
-(16034,32285,15976,32220)
-(12817,21365,12740,21298)
-(7607,47293,7585,47293)
-(32512,12218,32463,12170)
-(1848,21496,1839,21439)
-(17567,23073,17478,23046)
-(35813,31847,35807,31792)
-\N
-(563,30859,540,30842)
-(13145,15488,13063,15433)
-(36754,37479,36731,37411)
-(1125,26069,1057,25997)
-(4539,20676,4519,20618)
-(8476,34721,8409,34681)
-(7794,25691,7727,25656)
-(23842,514,23800,473)
-(47678,41396,47668,41365)
-(6837,25974,6799,25892)
-(13355,11174,13304,11161)
-\N
-(37243,25548,37158,25471)
-(12528,30208,12441,30205)
-(14929,1672,14886,1607)
-(27263,49026,27263,49010)
-(15892,21645,15835,21642)
-(29446,48978,29360,48967)
-(41304,9892,41211,9825)
-(37418,49393,37338,49296)
-(41146,32178,41120,32165)
-(28738,13326,28722,13266)
-(14899,36595,14873,36559)
-(1973,31435,1921,31426)
-(19485,17742,19421,17661)
-(33072,20995,32980,20903)
-(47091,30055,47080,30037)
-(45753,12998,45686,12992)
-\N
-(11528,7826,11509,7794)
-(21104,13921,21060,13836)
-(16768,15491,16747,15470)
-(13279,20396,13249,20326)
-(4342,49518,4339,49446)
-(20413,15476,20349,15447)
-(45532,5649,45484,5627)
-(18647,27196,18619,27115)
-(1326,17473,1261,17400)
-(47646,19644,47588,19609)
-(35088,1813,35080,1732)
-(38461,34839,38410,34838)
-(34358,11540,34285,11506)
-\N
-(26969,7078,26953,6989)
-(12629,40352,12617,40264)
-(33800,7037,33731,6992)
-(24462,13518,24392,13486)
-(33164,47357,33096,47329)
-(15422,18451,15413,18376)
-(19643,12916,19567,12912)
-(40860,42125,40770,42050)
-(49103,29614,49039,29606)
-(36319,35582,36222,35528)
-(8924,36083,8873,36018)
-(49603,44022,49505,44021)
-(7783,40633,7702,40618)
-(25388,49107,25346,49042)
-(28375,38947,28306,38919)
-(47324,22672,47321,22660)
-(2287,8808,2266,8719)
-(44343,16339,44248,16318)
-(2374,28839,2336,28798)
-(22913,40710,22819,40688)
-\N
-(47747,684,47658,627)
-(16043,46011,16021,45984)
-(34958,32168,34903,32092)
-(4840,49328,4752,49258)
-(24341,2087,24330,2009)
-(18378,19374,18327,19358)
-(48165,7217,48156,7141)
-(14232,6044,14182,6004)
-(23080,4196,22983,4191)
-(259,1850,175,1820)
-(270,29508,264,29440)
-(45088,11375,45050,11295)
-(29666,39386,29656,39302)
-(8712,8782,8660,8713)
-(15900,6650,15855,6561)
-(28946,28348,28917,28347)
-(32544,25845,32538,25779)
-(44047,6957,43951,6942)
-(36465,588,36382,503)
-\N
-(28167,26679,28150,26673)
-(16065,4268,15975,4180)
-(12950,23494,12893,23494)
-(30145,24679,30056,24654)
-(3027,16162,3001,16071)
-(8259,34537,8202,34484)
-(41447,1515,41427,1454)
-(18407,28362,18309,28303)
-(21393,41872,21328,41816)
-(46040,26497,45996,26408)
-\N
-(49944,25163,49902,25153)
-\N
-(16195,11843,16159,11831)
-(44257,15270,44254,15214)
-(49760,4791,49699,4713)
-(22558,33709,22519,33681)
-(28375,10003,28336,9938)
-(18179,24310,18106,24256)
-(707,30688,664,30669)
-(5851,26118,5822,26037)
-(4266,1292,4221,1217)
-(16516,11331,16432,11248)
-(32374,38277,32313,38245)
-(21939,8015,21927,7952)
-(34322,32051,34242,32003)
-(6262,35977,6260,35953)
-(16717,38594,16622,38498)
-(14564,3433,14535,3425)
-(21078,1000,20994,974)
-(28584,956,28575,868)
-(5538,9962,5465,9870)
-(34183,44102,34175,44085)
-\N
-(42507,10289,42441,10288)
-(12671,19936,12594,19920)
-(24835,12179,24770,12173)
-(15664,11538,15598,11494)
-(28892,24446,28821,24350)
-(41654,26720,41570,26632)
-(36583,387,36503,357)
-(10842,34824,10795,34788)
-(11518,42588,11429,42565)
-(12577,40322,12486,40266)
-(2453,4045,2439,3956)
-(31837,33705,31803,33681)
-(24403,27711,24383,27705)
-(4431,2748,4337,2656)
-\N
-(3036,2887,3014,2826)
-(37664,16118,37615,16022)
-(8606,18063,8587,18038)
-(24738,25458,24656,25362)
-(45756,34022,45671,33948)
-(34079,15236,33981,15171)
-(9251,22488,9228,22470)
-(25136,2809,25126,2717)
-(5548,47695,5543,47685)
-(13765,40800,13707,40754)
-(25216,30678,25144,30677)
-(22441,17169,22392,17106)
-(1091,4770,1054,4734)
-(36311,50073,36258,49987)
-(22461,33163,22457,33128)
-(35873,28907,35845,28867)
-(42907,15848,42904,15785)
-(6549,24897,6540,24861)
-(21928,37764,21891,37681)
-(21237,41132,21139,41086)
-(12207,24266,12173,24235)
-(40643,49770,40574,49687)
-(32833,35686,32815,35674)
-\N
-(14545,18143,14541,18098)
-(33892,42783,33884,42707)
-(33933,8381,33921,8369)
-(12450,19044,12403,19002)
-(10176,45158,10088,45145)
-(35828,12080,35732,12022)
-(28102,13694,28061,13666)
-(49432,31744,49340,31711)
-(16192,37743,16162,37697)
-(46830,867,46756,790)
-(9200,28048,9159,27986)
-(13397,19369,13340,19288)
-(30879,43562,30785,43545)
-(21995,48224,21920,48143)
-\N
-(11871,47569,11809,47568)
-(29366,22196,29280,22154)
-(26243,28176,26203,28116)
-(28995,35031,28906,35014)
-(29384,39276,29352,39183)
-(8497,13798,8471,13789)
-(7412,27226,7334,27220)
-(25403,47678,25363,47654)
-(11599,5556,11574,5502)
-(44056,5123,44008,5111)
-(49603,30877,49579,30840)
-(32261,45876,32206,45865)
-(35104,41659,35048,41587)
-\N
-(5457,35844,5376,35782)
-(29423,3977,29354,3959)
-(18059,3001,17965,2961)
-(8509,5691,8463,5620)
-\N
-(27118,5762,27083,5747)
-(2991,48605,2939,48559)
-(44482,3484,44425,3459)
-(45143,16439,45046,16365)
-(2236,37531,2147,37530)
-(41561,3217,41490,3210)
-\N
-(6270,27200,6171,27166)
-(49195,24871,49138,24798)
-\N
-(46985,38881,46897,38845)
-(37486,23522,37404,23441)
-(26907,14490,26900,14391)
-(30829,16111,30756,16056)
-(3644,17291,3587,17262)
-(20508,49775,20472,49680)
-\N
-(43279,8972,43198,8936)
-(33744,7470,33734,7439)
-(46303,20538,46284,20498)
-(10365,48246,10291,48154)
-(12636,24987,12545,24933)
-(40998,46992,40989,46916)
-(30536,6073,30531,6018)
-(22102,9643,22051,9594)
-(18616,34348,18530,34332)
-(8222,8907,8123,8848)
-(45698,28860,45698,28770)
-(26958,1748,26924,1726)
-\N
-(26735,35073,26659,35025)
-(48370,40813,48293,40737)
-(13140,993,13108,934)
-(10588,22893,10528,22883)
-(23645,40789,23567,40698)
-(49548,12374,49546,12329)
-(41135,39626,41100,39602)
-(41374,10856,41328,10769)
-(12234,5765,12146,5674)
-(12832,46941,12764,46917)
-(47886,34532,47851,34500)
-(23777,10549,23735,10495)
-(1291,16913,1194,16873)
-\N
-(29239,30554,29202,30500)
-\N
-(36485,30007,36454,29924)
-(7067,11320,7045,11229)
-(16939,30482,16904,30462)
-(27423,34386,27379,34303)
-(35170,32021,35155,31979)
-(42570,36477,42474,36457)
-(19695,679,19682,594)
-(47537,39450,47446,39450)
-(19410,22942,19375,22922)
-(34216,40166,34152,40158)
-(37000,24351,36972,24299)
-(24989,1681,24954,1672)
-(54,38679,3,38602)
-(41461,40693,41411,40599)
-(7576,46054,7545,45963)
-(35505,28262,35413,28222)
-(1158,16976,1145,16927)
-(23494,42291,23437,42229)
-(32894,32519,32880,32485)
-(604,13413,509,13401)
-(18396,19712,18355,19646)
-\N
-(26657,28234,26597,28191)
-(24240,47211,24154,47191)
-(41778,10741,41766,10730)
-(44022,43776,44010,43677)
-(35967,30055,35906,29969)
-(28878,18042,28806,18027)
-(31507,27302,31428,27267)
-(13267,21935,13265,21872)
-(122,46832,64,46762)
-(10348,45916,10306,45844)
-(22962,12644,22927,12607)
-(6320,22290,6284,22247)
-(2297,11372,2216,11298)
-(29366,36660,29325,36654)
-(13962,39307,13921,39220)
-(11094,19151,11092,19143)
-(32289,23776,32258,23760)
-\N
-(36044,17356,35956,17273)
-(46304,38692,46232,38675)
-(10934,42999,10922,42909)
-(4271,21177,4207,21093)
-(7837,19926,7747,19905)
-(25537,36605,25477,36584)
-(22161,14999,22079,14962)
-(5127,31243,5074,31213)
-\N
-(14904,40664,14838,40593)
-(29308,8480,29268,8438)
-(17731,7410,17699,7352)
-(44840,29293,44797,29248)
-(15523,31519,15505,31485)
-(34429,38479,34421,38478)
-(3530,23456,3440,23390)
-(4699,6889,4603,6796)
-(47405,48524,47389,48514)
-\N
-(23357,43160,23305,43156)
-(16923,1995,16860,1937)
-(47592,33853,47537,33758)
-(31624,37490,31595,37473)
-(42321,13380,42303,13337)
-(3088,16094,3079,16060)
-(22884,2955,22856,2857)
-(17784,23073,17724,23044)
-(32638,45577,32553,45512)
-(13876,44091,13801,44000)
-(27844,24384,27758,24330)
-(28178,10225,28155,10167)
-(39910,14277,39857,14241)
-(30372,19524,30301,19514)
-(38732,43151,38724,43151)
-(32628,2068,32547,2068)
-(13950,28652,13932,28566)
-(38996,41070,38919,40993)
-(31759,45246,31676,45215)
-\N
-(5424,34145,5382,34106)
-(14727,45600,14699,45547)
-\N
-(31429,21537,31414,21499)
-(14740,3420,14650,3323)
-(21793,39498,21743,39471)
-(18102,25924,18037,25868)
-(33299,683,33213,594)
-(45882,48765,45809,48721)
-(49215,4098,49180,4067)
-(49698,33743,49614,33663)
-(21532,5215,21514,5151)
-(24840,26877,24826,26808)
-(32680,28433,32631,28364)
-(20661,27511,20584,27414)
-(28048,30385,28009,30315)
-(45403,42533,45389,42464)
-(46531,36947,46531,36850)
-(36943,32817,36865,32737)
-\N
-(37984,43763,37888,43748)
-(20593,10650,20557,10610)
-(5387,40595,5326,40585)
-(34412,10600,34352,10539)
-(7237,47546,7206,47451)
-(39931,26644,39915,26598)
-(29843,4734,29800,4669)
-(37503,8867,37406,8821)
-(2583,2373,2570,2294)
-(29275,46433,29256,46350)
-(3332,45620,3287,45581)
-(22472,39287,22472,39257)
-(36786,18907,36708,18884)
-(45503,28576,45482,28494)
-(33262,28386,33163,28365)
-(3606,49757,3538,49697)
-(2082,49380,1991,49281)
-(12065,3734,11983,3663)
-(15606,9048,15596,9028)
-(14687,19309,14637,19263)
-(4568,15461,4499,15428)
-\N
-(43938,7429,43923,7391)
-\N
-(2168,50012,2108,49914)
-(16022,8934,15963,8928)
-(24567,39147,24561,39102)
-\N
-(42781,14149,42765,14088)
-(39501,21084,39468,21078)
-(6697,29628,6693,29584)
-(11441,16164,11364,16125)
-(39946,1920,39868,1844)
-\N
-(18138,45512,18111,45438)
-\N
-(20799,41217,20718,41138)
-(30264,16697,30240,16639)
-\N
-(30746,50040,30727,49992)
-(37429,43273,37423,43205)
-(22854,28863,22789,28810)
-(11380,48298,11287,48242)
-(16471,37273,16439,37223)
-(32737,39842,32661,39811)
-(30959,3447,30949,3357)
-(36396,13263,36348,13187)
-(29607,14625,29531,14619)
-(7851,43399,7824,43334)
-(38515,14575,38496,14492)
-(29125,3289,29086,3264)
-(6866,10476,6839,10424)
-(318,31489,235,31404)
-(1140,7007,1113,6945)
-(36574,9291,36484,9275)
-\N
-(40320,40937,40246,40866)
-(588,25849,552,25801)
-(6728,42539,6645,42507)
-(12180,6185,12123,6123)
-(32913,44123,32899,44037)
-(25464,16803,25441,16749)
-(23711,5829,23695,5750)
-(31424,34930,31377,34906)
-(42171,8298,42124,8222)
-(451,31104,375,31083)
-(39996,3278,39943,3260)
-(25816,40396,25735,40362)
-(34471,28587,34399,28547)
-(45344,21540,45297,21496)
-(27269,16787,27246,16763)
-(18070,4469,18022,4423)
-\N
-(12668,16367,12645,16295)
-(13823,17276,13730,17251)
-(20555,45544,20511,45498)
-(35893,42189,35861,42177)
-(37081,45730,37076,45705)
-(17270,15651,17201,15552)
-(48690,46034,48667,45945)
-(456,16088,368,16023)
-(48707,12416,48670,12363)
-(29692,11509,29614,11483)
-(7005,3668,6981,3574)
-(12162,389,12103,309)
-(12371,24983,12366,24964)
-(6886,48414,6868,48327)
-(10653,26234,10624,26142)
-(8526,48205,8517,48117)
-(10521,31892,10480,31798)
-(43353,1086,43281,1071)
-(21007,35650,20998,35649)
-(2343,4396,2310,4320)
-(29379,12895,29284,12891)
-(27662,17407,27570,17313)
-(9845,29346,9807,29321)
-(43855,38669,43790,38599)
-\N
-(20461,44189,20397,44158)
-(11627,17368,11581,17289)
-(2971,38855,2938,38807)
-(43204,47082,43128,47018)
-(9930,46902,9909,46871)
-(30561,48461,30536,48365)
-(44059,7591,44038,7563)
-(46260,16898,46162,16886)
-(27491,2891,27396,2814)
-(36512,26034,36455,25941)
-(31193,20022,31100,19942)
-(17057,13643,16960,13621)
-(26897,3399,26844,3318)
-(1760,5504,1683,5431)
-(29347,5511,29346,5450)
-(38761,42083,38688,41999)
-(11226,4089,11165,4068)
-(46427,42983,46361,42970)
-(12958,30737,12912,30712)
-(44432,46521,44333,46443)
-(16124,2948,16113,2852)
-\N
-(24704,25422,24635,25340)
-(30833,46152,30790,46122)
-(4487,37006,4473,36968)
-(41047,23376,41036,23327)
-(16312,49392,16298,49330)
-(30081,14687,30042,14660)
-(11160,13954,11103,13938)
-(33207,23246,33143,23168)
-(14872,7635,14860,7585)
-(20139,23987,20059,23955)
-(10946,49757,10923,49746)
-(39438,36158,39426,36134)
-(35502,2385,35464,2327)
-(17073,42173,16987,42130)
-(6079,17258,6068,17195)
-(40458,15752,40364,15728)
-(23340,7879,23313,7806)
-\N
-(31819,15096,31762,15059)
-(31159,40864,31158,40780)
-(26975,32144,26915,32113)
-(34530,10378,34440,10298)
-(18855,49577,18780,49528)
-(16787,16625,16723,16586)
-(32330,26538,32314,26458)
-(34270,28674,34265,28595)
-(10022,16026,10006,15962)
-(23143,1479,23095,1469)
-(33676,4483,33583,4408)
-(31066,22074,31059,22035)
-(21603,47121,21563,47082)
-(30051,4244,30021,4157)
-(30634,39478,30615,39446)
-(34404,48724,34393,48724)
-(31103,21414,31039,21380)
-(22945,47397,22849,47313)
-(18133,32025,18073,31941)
-(4053,25759,3977,25667)
-(39185,39091,39102,39068)
-(43287,7407,43225,7314)
-(13137,31188,13112,31182)
-(46264,1438,46258,1389)
-(22804,43892,22769,43822)
-(7542,1044,7487,983)
-(33022,8321,32925,8267)
-(384,39161,286,39073)
-(28205,24401,28142,24382)
-(31708,39086,31696,39026)
-(36626,15708,36560,15690)
-(17099,16924,17079,16924)
-(10817,6989,10747,6955)
-(24338,19293,24291,19277)
-(27566,17576,27544,17545)
-(23041,38384,22970,38320)
-\N
-(12786,8485,12702,8435)
-(13876,49473,13813,49448)
-(31585,46998,31490,46929)
-\N
-(30227,8768,30206,8715)
-(32062,39306,32023,39292)
-(25003,35753,24921,35687)
-(3281,6758,3232,6704)
-\N
-(11395,30299,11376,30220)
-(5088,15275,5007,15203)
-(31100,39538,31003,39444)
-(2741,17877,2726,17793)
-(42897,48620,42860,48537)
-(4230,15778,4181,15776)
-(17835,27530,17815,27431)
-(34189,10933,34135,10921)
-(7537,39974,7494,39973)
-(21554,3507,21528,3476)
-(9350,32326,9273,32275)
-(16455,8874,16420,8793)
-\N
-(7346,34235,7330,34224)
-(16417,48134,16352,48066)
-\N
-(41916,4971,41849,4886)
-(15856,1522,15807,1521)
-(41549,40218,41494,40144)
-\N
-(9978,16226,9972,16181)
-(14856,13312,14808,13283)
-(38490,41641,38428,41583)
-(25828,7438,25807,7378)
-(21876,30633,21796,30587)
-(1908,14279,1825,14247)
-\N
-(32207,10251,32121,10184)
-(370,9493,328,9441)
-(42072,17634,41974,17600)
-\N
-(47298,9910,47235,9846)
-(17856,11266,17782,11225)
-(35009,21400,34956,21396)
-(18337,11145,18335,11133)
-\N
-(25425,9139,25381,9085)
-(35642,27783,35621,27782)
-(3629,33164,3575,33163)
-(17151,41255,17115,41204)
-(17417,5835,17402,5751)
-(33407,14226,33329,14141)
-(1930,29955,1889,29931)
-(41101,10942,41065,10844)
-(36333,27288,36281,27233)
-(21423,36868,21367,36825)
-(36385,19566,36341,19510)
-(27073,38301,27066,38232)
-(43989,34187,43984,34174)
-(48366,7488,48316,7483)
-(37497,36075,37415,36043)
-(46917,9891,46887,9870)
-(37179,657,37103,634)
-(3877,44736,3811,44684)
-(30556,2975,30547,2962)
-(7629,11447,7547,11416)
-(45687,48147,45591,48088)
-(5635,7184,5571,7146)
-(9611,47327,9541,47246)
-(7119,48224,7117,48152)
-(15233,26480,15138,26430)
-(37468,1526,37466,1513)
-\N
-(20855,2786,20828,2711)
-(30538,44084,30480,44061)
-(42231,41527,42149,41454)
-(14963,13239,14952,13146)
-(26819,43996,26745,43934)
-(42172,35953,42086,35928)
-(28785,12611,28710,12534)
-(14089,1704,14047,1629)
-(4343,26242,4341,26169)
-(20327,42244,20231,42212)
-(33671,12700,33666,12630)
-(42144,32642,42128,32569)
-(26590,19483,26503,19442)
-(21741,46259,21723,46226)
-(8822,34700,8760,34693)
-\N
-(2710,33521,2675,33505)
-(26067,19998,26026,19989)
-(12244,34509,12202,34489)
-\N
-(47162,598,47119,499)
-(33093,49382,33068,49359)
-(35170,26340,35153,26264)
-(22552,35785,22490,35735)
-(36791,23032,36781,22976)
-(22857,10857,22833,10797)
-\N
-(47207,37405,47138,37365)
-(21867,2836,21854,2811)
-(3387,31487,3311,31456)
-(47174,48121,47167,48101)
-(24415,22232,24366,22224)
-(7970,29251,7959,29211)
-(18635,31294,18539,31221)
-(8403,13380,8370,13372)
-(738,18097,737,18054)
-(37238,19195,37218,19114)
-(582,47934,570,47897)
-(12359,4635,12350,4619)
-(43272,2013,43195,1958)
-(47568,27149,47521,27088)
-(24695,12827,24661,12796)
-(26259,14077,26168,14019)
-\N
-(48478,36135,48425,36092)
-(5230,39250,5206,39174)
-(3488,18562,3423,18489)
-(39502,16331,39460,16275)
-(18296,1478,18233,1471)
-\N
-(28627,12430,28559,12410)
-(25257,21981,25206,21954)
-\N
-(2410,41192,2325,41142)
-(43681,9631,43587,9538)
-\N
-(15086,45309,15064,45270)
-(13824,40807,13759,40787)
-(7090,2207,7062,2159)
-(3685,2480,3630,2391)
-(14810,38335,14801,38275)
-(26668,38018,26581,38012)
-(45562,1517,45506,1424)
-(11001,32481,10962,32402)
-(27743,25245,27673,25161)
-(15952,10598,15948,10535)
-(12705,13308,12694,13232)
-(31992,21195,31975,21118)
-(25834,16652,25745,16626)
-(21022,43625,20990,43576)
-(45094,27254,45000,27240)
-(9688,42601,9643,42533)
-(17746,24659,17694,24616)
-(1509,38859,1503,38809)
-(2067,20438,2041,20369)
-(7885,44528,7839,44444)
-(27432,33052,27422,32987)
-(26577,17157,26563,17142)
-(10815,35985,10734,35908)
-(44891,24067,44794,23979)
-(48626,1900,48595,1850)
-\N
-(40659,35541,40659,35489)
-(22231,26628,22210,26579)
-(37408,23016,37375,22919)
-(5920,15916,5906,15895)
-\N
-(33125,9952,33037,9880)
-(12142,29705,12141,29670)
-(3672,20995,3649,20899)
-(39147,31967,39101,31907)
-\N
-(33812,48458,33748,48399)
-(25038,14639,24978,14586)
-(3859,16010,3857,15994)
-(31926,39496,31889,39417)
-(49300,28064,49297,28026)
-(24121,38305,24048,38256)
-(9252,4205,9155,4149)
-(36124,30451,36056,30395)
-(28809,49557,28794,49533)
-(30500,44504,30471,44476)
-(26866,42395,26822,42332)
-(48195,1784,48101,1734)
-(46201,14109,46112,14097)
-\N
-(2415,9975,2354,9914)
-(30485,9581,30415,9558)
-(6385,36838,6305,36838)
-(2799,11189,2723,11095)
-(21998,20503,21923,20406)
-(29151,10714,29090,10671)
-(28850,29276,28757,29207)
-(43386,48845,43305,48834)
-(25173,8310,25101,8294)
-(34244,32352,34204,32342)
-(35595,23728,35533,23672)
-(1122,13581,1119,13538)
-\N
-(388,21716,296,21678)
-(48782,11064,48701,11005)
-(40293,12997,40213,12927)
-\N
-(28194,46428,28113,46414)
-(4791,18118,4708,18105)
-(471,29808,448,29775)
-(3536,37803,3447,37737)
-(1336,28416,1275,28392)
-(16484,48478,16422,48454)
-(25846,19320,25811,19296)
-(48669,27703,48575,27615)
-(24032,44217,24029,44127)
-(12236,5019,12233,4986)
-(1179,29838,1113,29778)
-(33893,22049,33867,21955)
-(16718,19462,16700,19440)
-(17992,49438,17894,49433)
-(35163,39941,35081,39885)
-(33897,8362,33853,8328)
-(2480,6640,2456,6599)
-(28011,19729,27937,19679)
-(15819,41516,15809,41440)
-(29818,9136,29747,9089)
-(28551,37016,28529,36941)
-(36406,26879,36374,26872)
-(16821,48925,16758,48914)
-(23692,48163,23595,48160)
-\N
-(4803,10619,4759,10522)
-(46600,33581,46553,33518)
-(41349,11767,41310,11710)
-(20856,29642,20799,29562)
-(16559,46161,16504,46131)
-(23041,1300,23003,1287)
-(16630,44902,16554,44853)
-(43065,14299,43013,14274)
-(24818,22397,24796,22348)
-(22282,24949,22218,24921)
-(36668,28538,36631,28456)
-(8080,1220,8018,1146)
-(47282,34302,47277,34269)
-(35603,33558,35557,33495)
-(44764,32189,44700,32175)
-\N
-(46488,23965,46449,23868)
-(46314,15047,46216,15013)
-(6348,25381,6286,25363)
-(3871,49288,3819,49251)
-(462,38894,398,38867)
-(23196,29214,23136,29169)
-(29024,9775,29016,9759)
-(42016,18555,41934,18472)
-(8772,45981,8692,45973)
-(11028,1351,10986,1278)
-(26684,21668,26641,21656)
-\N
-(37262,26005,37260,25947)
-(14899,44069,14814,44066)
-\N
-(39635,18701,39587,18698)
-(28528,22948,28457,22857)
-(7755,36528,7681,36454)
-(32461,1172,32427,1106)
-\N
-(18775,27359,18736,27329)
-(15379,20031,15337,19934)
-(45888,33592,45881,33544)
-(44013,24694,43962,24645)
-\N
-(43347,10699,43343,10699)
-(49999,27218,49908,27176)
-(13698,17326,13630,17317)
-(34850,44313,34775,44302)
-(38076,49235,37983,49214)
-(35570,40218,35500,40136)
-(40062,28973,40032,28878)
-(3567,39847,3523,39781)
-(498,2442,480,2401)
-(29660,43620,29577,43561)
-(10946,47356,10878,47351)
-(8073,44233,8005,44144)
-(9720,13473,9710,13462)
-(3643,38014,3598,37932)
-(16887,1408,16810,1375)
-(7559,27914,7508,27874)
-(30356,18573,30275,18569)
-(12193,48176,12130,48116)
-(11884,7756,11819,7731)
-(18293,33272,18227,33234)
-(46697,47874,46696,47828)
-(35788,32517,35760,32446)
-(33877,36987,33821,36958)
-(31253,22819,31184,22808)
-(7744,23115,7729,23103)
-(21291,39817,21219,39778)
-(13877,43379,13861,43290)
-(42955,1406,42876,1382)
-(49232,15950,49210,15880)
-(48419,32001,48326,31902)
-(18940,43246,18860,43150)
-(32317,38240,32310,38201)
-(11307,48298,11304,48222)
-(38015,18190,38000,18176)
-(27821,1177,27818,1131)
-(18935,26757,18865,26682)
-(42659,48284,42562,48244)
-(30185,23350,30146,23291)
-\N
-(16496,11970,16441,11919)
-(162,26040,120,25963)
-(24238,47784,24185,47746)
-(32326,8612,32274,8568)
-(26141,13423,26051,13407)
-(40132,22815,40089,22812)
-(21151,48794,21056,48740)
-\N
-(22044,28358,22031,28334)
-(6680,14746,6605,14669)
-(40686,25139,40632,25070)
-(22823,27549,22816,27507)
-(2513,22841,2427,22811)
-(36316,27787,36218,27728)
-(554,35489,540,35441)
-(536,30674,534,30609)
-\N
-(25385,38468,25295,38416)
-(19467,47386,19437,47317)
-(22425,38591,22387,38536)
-(32493,17321,32396,17298)
-(40115,47315,40109,47235)
-(25002,2107,24963,2104)
-(3901,9790,3898,9706)
-\N
-(40316,1721,40315,1658)
-(40089,3454,40074,3443)
-(793,17897,761,17897)
-(6490,43552,6434,43522)
-(10825,487,10820,405)
-(47703,36067,47641,36011)
-\N
-(4480,11671,4468,11653)
-(37713,10642,37711,10615)
-(12315,5302,12273,5203)
-\N
-(8709,6617,8647,6557)
-(24467,30535,24455,30494)
-(40440,32757,40369,32668)
-(49449,42447,49426,42428)
-(44867,11197,44792,11137)
-(39173,33241,39143,33187)
-(43836,2212,43803,2184)
-(23819,47613,23739,47575)
-(20583,2134,20485,2042)
-(48922,6169,48889,6111)
-(5230,44613,5131,44604)
-(37060,8051,37032,7975)
-(19148,36711,19112,36704)
-(36305,4216,36243,4118)
-(6329,39089,6302,39047)
-(36703,26367,36623,26307)
-(44753,19721,44701,19631)
-(42094,43310,42094,43285)
-(4276,22377,4241,22352)
-(30329,18906,30327,18815)
-(21970,19605,21871,19590)
-(23722,41924,23709,41861)
-(30965,39775,30908,39692)
-(32394,37895,32351,37890)
-(23968,42162,23873,42095)
-(1776,2621,1732,2548)
-(24951,47758,24900,47679)
-(32917,35771,32847,35753)
-(5428,27773,5343,27769)
-\N
-(19650,142,19630,51)
-(39769,17276,39743,17229)
-(5171,24562,5119,24470)
-(32976,35249,32917,35199)
-\N
-(4174,24603,4099,24504)
-(38565,36960,38535,36926)
-(39084,4328,39031,4301)
-(32153,38043,32070,37990)
-(38085,30640,38041,30603)
-(14269,18426,14185,18422)
-(42941,30850,42892,30788)
-(32403,25999,32339,25960)
-(16906,191,16816,139)
-(3456,48722,3418,48721)
-(3050,18287,3022,18243)
-(6331,8439,6234,8364)
-(5331,20797,5319,20793)
-(39225,37408,39216,37348)
-(34510,19838,34488,19810)
-(45789,33873,45770,33786)
-(369,1457,278,1409)
-(16531,43785,16482,43729)
-(11974,14789,11973,14730)
-(23128,6811,23094,6798)
-(43962,33659,43944,33599)
-(20967,3115,20947,3079)
-(39257,38606,39241,38595)
-(22431,8246,22381,8235)
-(26007,14672,25996,14593)
-(24762,4261,24675,4261)
-(35402,32077,35343,31988)
-(5141,16476,5139,16393)
-(16439,17564,16344,17472)
-(36983,46663,36903,46567)
-(35170,14144,35162,14048)
-(22290,7841,22283,7810)
-(22414,38398,22404,38319)
-(9011,18177,8932,18150)
-\N
-(154,4019,138,3990)
-(20447,4998,20383,4970)
-(38867,35757,38795,35659)
-(32322,15845,32227,15804)
-\N
-(29889,12142,29852,12055)
-(36235,36918,36217,36897)
-(41620,6581,41568,6581)
-(24758,38504,24731,38483)
-(42524,12904,42473,12895)
-(17954,49975,17865,49915)
-(1938,39019,1927,39013)
-(4864,33279,4817,33258)
-(45373,41967,45313,41885)
-(28786,19028,28782,18978)
-(41913,44950,41911,44908)
-(33408,14698,33392,14681)
-(27602,3460,27576,3419)
-(3336,3728,3334,3715)
-(9099,910,9080,813)
-(34141,6403,34071,6367)
-(48270,17216,48252,17130)
-(2549,16546,2461,16474)
-(27802,33669,27735,33642)
-(48419,1682,48323,1583)
-(5094,41211,5002,41123)
-(11192,6217,11190,6146)
-(6979,18503,6959,18421)
-(41210,48187,41140,48143)
-(15303,29527,15273,29441)
-(12326,45572,12267,45570)
-(29293,5861,29212,5826)
-(23847,37241,23761,37178)
-(44656,23926,44653,23831)
-(30043,16194,29977,16105)
-(902,9358,879,9339)
-(23850,46501,23834,46494)
-(42333,13300,42287,13246)
-(25226,18086,25169,18005)
-(40252,12082,40183,12038)
-(49275,18076,49216,18055)
-(8255,28878,8238,28862)
-(11325,41286,11320,41235)
-(16948,18588,16926,18528)
-(31394,1099,31374,1038)
-(30705,35772,30637,35766)
-(3858,39131,3771,39125)
-(17565,24892,17515,24808)
-(9221,49715,9216,49661)
-(44945,25769,44875,25722)
-(33408,13563,33310,13527)
-(48505,4407,48408,4373)
-(21859,37217,21763,37217)
-(39393,14422,39335,14364)
-\N
-(19905,1154,19841,1098)
-(25946,10388,25906,10366)
-(10104,13748,10027,13746)
-(5822,24629,5820,24599)
-(38194,11287,38127,11252)
-(15694,46757,15625,46716)
-(326,18837,285,18817)
-(49611,47078,49533,47052)
-(48233,18850,48150,18842)
-\N
-(29239,9962,29208,9875)
-(40062,44554,39973,44460)
-(19135,20729,19059,20643)
-(31969,40664,31896,40643)
-\N
-(3725,9191,3711,9095)
-(44280,40158,44264,40108)
-(37236,42756,37160,42694)
-(27958,19055,27888,18959)
-(45270,17661,45187,17601)
-(12115,39546,12061,39525)
-(10227,32295,10168,32231)
-(39264,31123,39226,31085)
-(6566,40000,6532,39904)
-(30058,6975,30012,6903)
-(49631,6909,49597,6823)
-(42168,10926,42134,10905)
-(44892,30042,44858,29970)
-(19540,19803,19495,19788)
-(18403,25454,18371,25404)
-(22929,26795,22841,26722)
-(16648,30213,16626,30174)
-(3440,7495,3429,7468)
-(30708,49028,30643,48998)
-(26258,14164,26255,14151)
-(44206,31653,44121,31637)
-(1510,15179,1426,15130)
-(6986,30496,6887,30416)
-(7192,43403,7138,43339)
-(39921,22071,39866,21976)
-(45870,17011,45796,16919)
-(15939,9563,15917,9539)
-(23728,24737,23691,24725)
-(6444,40416,6363,40375)
-(21899,23861,21857,23765)
-(20610,36765,20533,36742)
-(46520,33082,46433,32983)
-(21406,20902,21311,20895)
-\N
-(37913,42300,37814,42269)
-(18216,8177,18161,8173)
-(32967,8258,32899,8244)
-(14978,40230,14971,40149)
-(30343,39152,30266,39101)
-(25917,5835,25843,5806)
-\N
-(5169,45366,5141,45314)
-\N
-(16221,20898,16209,20875)
-(13151,19869,13145,19811)
-(44399,2801,44337,2713)
-\N
-(10959,48311,10957,48230)
-(4794,11711,4732,11661)
-(764,10149,762,10091)
-(15985,46067,15898,46028)
-(41434,22870,41342,22867)
-(43769,23796,43743,23756)
-(10017,18440,9919,18384)
-(21141,43119,21097,43112)
-(7782,13424,7694,13398)
-(25088,36224,25059,36150)
-(46325,48722,46241,48631)
-\N
-(11042,33125,11011,33071)
-(22347,13460,22290,13375)
-(3508,20538,3483,20536)
-(5331,42945,5272,42875)
-\N
-(2368,15537,2339,15503)
-(45314,31830,45254,31817)
-(34358,2649,34319,2589)
-\N
-(17576,30407,17572,30323)
-(29836,41324,29746,41287)
-(21036,39996,21014,39899)
-(26886,6460,26787,6400)
-(15709,5625,15627,5558)
-(37415,15979,37414,15911)
-(47761,16860,47728,16813)
-(35814,48252,35755,48173)
-\N
-(28559,20810,28496,20715)
-(12034,11921,12002,11905)
-(1818,27450,1805,27406)
-(33810,45499,33806,45413)
-(17376,18175,17323,18138)
-(34106,28135,34049,28106)
-(44947,23165,44919,23091)
-(37670,41904,37616,41840)
-(12614,15027,12555,14969)
-(43301,75,43227,43)
-\N
-(27526,15096,27450,15088)
-(26947,33409,26853,33333)
-(1537,43572,1471,43499)
-\N
-(21607,35452,21605,35375)
-(24869,46565,24818,46531)
-(4774,30335,4723,30257)
-(11615,18316,11579,18310)
-(18444,15819,18354,15763)
-(47267,22574,47203,22518)
-(22287,49538,22203,49511)
-(43010,16270,43010,16202)
-\N
-(1623,8350,1578,8254)
-(21220,43808,21137,43748)
-(40397,16471,40358,16434)
-\N
-(34839,1377,34744,1327)
-(17096,5730,17090,5637)
-\N
-(28156,37782,28155,37723)
-(3672,5686,3586,5638)
-(21856,48656,21840,48638)
-(6907,7791,6892,7761)
-(17952,21370,17862,21350)
-(37793,13461,37784,13381)
-(14740,49655,14709,49604)
-(21690,6337,21593,6289)
-\N
-(10423,33548,10364,33498)
-\N
-(39187,23274,39136,23197)
-\N
-(21882,37247,21835,37167)
-\N
-(11343,16957,11281,16914)
-(38279,43400,38264,43352)
-(23167,30271,23086,30224)
-(46278,6037,46180,5964)
-(28626,31165,28605,31095)
-\N
-(31018,367,30946,333)
-(23541,12541,23530,12523)
-(49741,14535,49691,14511)
-(31444,12702,31425,12612)
-\N
-(22406,26536,22316,26534)
-(6807,9761,6758,9723)
-(15698,1941,15687,1848)
-(49310,4625,49295,4584)
-(21345,18939,21269,18887)
-(31433,30493,31411,30439)
-(44980,12400,44950,12372)
-(25054,13949,24984,13949)
-(40538,7253,40483,7212)
-(16967,8627,16936,8604)
-(26872,3646,26804,3594)
-(24575,42883,24530,42883)
-(11823,5755,11771,5721)
-\N
-(2553,46189,2513,46174)
-(24993,14552,24898,14470)
-(28453,1719,28419,1665)
-(8925,22603,8878,22589)
-(47635,15380,47546,15378)
-(35378,18112,35324,18058)
-(27347,22264,27293,22200)
-\N
-(44323,29044,44273,28958)
-(41538,38324,41484,38290)
-(19128,49932,19112,49849)
-(17904,12548,17867,12503)
-(35103,14426,35092,14336)
-(29807,10142,29714,10052)
-(44507,22903,44462,22847)
-(11419,13324,11399,13251)
-(8573,42221,8562,42123)
-(46798,45843,46765,45765)
-(12028,31783,11967,31749)
-(10635,45300,10604,45251)
-(9626,8248,9587,8194)
-(18290,741,18246,732)
-(39949,44672,39932,44641)
-(7897,11692,7893,11637)
-(20165,42246,20112,42168)
-(4341,48390,4285,48338)
-(30126,28913,30088,28869)
-(40565,1733,40472,1721)
-(9981,30147,9915,30133)
-(47292,25511,47217,25462)
-(20137,24489,20104,24392)
-(2385,28283,2381,28189)
-(20429,10052,20357,10009)
-(8395,38568,8348,38480)
-(17381,36112,17349,36038)
-(37845,30953,37759,30926)
-(27452,12732,27411,12652)
-(38196,32186,38114,32116)
-\N
-(6527,49356,6508,49315)
-(43891,29789,43856,29723)
-(6146,37192,6085,37107)
-\N
-(42012,28897,41939,28808)
-\N
-(14909,13815,14846,13757)
-(11120,24095,11035,24049)
-(3132,41545,3053,41526)
-(40084,40315,39994,40261)
-(39671,17445,39576,17361)
-(47135,35853,47085,35831)
-(39297,1941,39290,1911)
-(47143,35898,47072,35880)
-(16017,6711,15989,6686)
-(47110,30305,47087,30213)
-(38102,27639,38091,27602)
-(17954,22544,17863,22453)
-(39891,11791,39815,11739)
-(13996,20290,13922,20278)
-(22284,23143,22190,23081)
-(25345,24019,25313,24017)
-(47134,44803,47055,44761)
-(41360,16573,41326,16503)
-(10464,1071,10457,998)
-\N
-(23515,47517,23451,47499)
-(9308,8452,9238,8392)
-(28695,5657,28671,5644)
-(45104,9913,45077,9871)
-(337,455,240,359)
-(11562,45479,11472,45428)
-(11952,18466,11931,18425)
-\N
-(35789,5154,35775,5128)
-(19024,18299,18979,18230)
-(43056,38113,42975,38067)
-(10075,26847,10064,26806)
-(3065,8107,3029,8038)
-(24766,19059,24749,18985)
-(14438,24805,14413,24708)
-(9523,3058,9485,2998)
-(24516,31262,24478,31204)
-(49513,26044,49434,26035)
-(14110,38528,14103,38461)
-(31679,35618,31619,35618)
-(10029,20258,10008,20248)
-(39269,37586,39233,37539)
-(12343,8197,12247,8113)
-(11155,44223,11111,44134)
-(25437,20606,25338,20534)
-(46604,16156,46570,16131)
-(4636,14004,4592,13941)
-(15975,29628,15912,29556)
-(49887,24274,49805,24184)
-(11812,13440,11723,13418)
-(21589,38179,21531,38085)
-(32255,44463,32219,44454)
-(15023,12698,14989,12687)
-(28906,48630,28818,48568)
-(28886,38905,28861,38832)
-(34786,22285,34740,22240)
-\N
-(46513,46780,46425,46780)
-\N
-(26626,31759,26551,31677)
-(19792,25967,19763,25933)
-(20432,14394,20388,14365)
-(27092,7301,27052,7278)
-(22283,987,22198,928)
-(6197,24363,6112,24311)
-(46601,49259,46551,49231)
-(12392,48052,12363,48038)
-(46116,31386,46067,31356)
-(7354,16855,7289,16778)
-(47501,42808,47495,42761)
-(16461,25487,16391,25398)
-(42678,18798,42678,18756)
-(9466,18207,9419,18185)
-(17467,14177,17416,14097)
-(28533,31886,28487,31832)
-(13225,38472,13188,38395)
-(5180,40970,5173,40902)
-(83,10271,15,10265)
-(2111,6784,2016,6690)
-(41835,11064,41798,10995)
-(29273,48585,29181,48536)
-(29066,21615,28985,21543)
-(19805,44143,19727,44128)
-(48919,21468,48875,21467)
-(28790,34287,28721,34251)
-(10911,33074,10869,32989)
-(6111,16519,6032,16489)
-(43889,33838,43837,33768)
-(32323,21685,32304,21644)
-(9552,27819,9539,27753)
-(38266,49852,38233,49844)
-(37672,48362,37663,48277)
-(32550,47029,32529,46931)
-(46307,6620,46272,6616)
-(23192,46608,23105,46566)
-(30399,48330,30335,48239)
-(36268,25058,36235,24984)
-(19181,8120,19089,8098)
-(24376,19983,24294,19925)
-(18297,18375,18202,18292)
-\N
-(31608,6215,31575,6168)
-(12788,49510,12784,49468)
-(46071,13013,46035,12991)
-(27647,8218,27582,8201)
-(49580,11076,49537,11050)
-\N
-(35501,33782,35501,33687)
-(19969,3148,19964,3082)
-(37728,49153,37726,49152)
-(5322,48440,5321,48435)
-(48003,10096,47904,10005)
-(39361,22318,39348,22236)
-(30488,7456,30437,7430)
-(18533,39476,18481,39394)
-(39462,23701,39433,23604)
-(26701,18300,26686,18235)
-(17405,35577,17387,35517)
-(33971,29928,33953,29919)
-(6328,10241,6276,10217)
-(32459,44259,32453,44217)
-(1715,42385,1647,42357)
-(48113,6960,48103,6872)
-(30561,4255,30476,4240)
-(38907,43619,38827,43553)
-(29149,20773,29070,20698)
-(17006,1543,16970,1497)
-\N
-(11737,18808,11714,18788)
-(13019,30534,13005,30481)
-(39224,31729,39191,31683)
-(4942,41680,4907,41596)
-(12287,37187,12188,37172)
-(30758,29579,30725,29531)
-\N
-(16604,17963,16581,17912)
-(19459,15888,19409,15812)
-(34696,24783,34600,24725)
-(21621,14159,21558,14110)
-(12193,46149,12145,46096)
-(37781,4715,37692,4635)
-(41854,44125,41807,44040)
-(23604,23585,23571,23533)
-(7853,36967,7797,36908)
-(2755,13279,2720,13206)
-(4314,15424,4283,15383)
-(29584,12685,29493,12594)
-(25138,33726,25042,33691)
-(38393,10270,38326,10185)
-(4247,12615,4225,12567)
-(36100,33156,36100,33107)
-(20024,40796,20016,40708)
-(3927,44892,3914,44843)
-(10317,43168,10226,43096)
-(22057,3419,22042,3334)
-(37097,21814,37025,21811)
-(32084,21564,31996,21491)
-(34079,39921,34058,39911)
-(23078,47459,23018,47373)
-(38109,616,38082,568)
-(11862,40382,11764,40292)
-(33403,33320,33389,33289)
-(36639,24829,36623,24829)
-(12995,45080,12992,45040)
-(16545,19981,16532,19891)
-(26155,10659,26154,10634)
-(24423,255,24360,213)
-(823,22487,781,22442)
-(12823,20064,12735,20040)
-(19688,11710,19681,11654)
-(2892,20452,2836,20424)
-(15533,10807,15464,10711)
-(46994,41143,46955,41082)
-(18155,2421,18069,2392)
-(2628,12688,2605,12602)
-(35128,8396,35044,8365)
-(44765,49615,44758,49524)
-(11226,44529,11178,44515)
-(31334,32463,31291,32456)
-(43224,23387,43168,23364)
-(30882,10414,30798,10395)
-(29139,967,29139,923)
-(29959,45244,29877,45223)
-(19946,217,19941,118)
-(49732,22033,49642,22012)
-(32914,15360,32879,15290)
-(47825,21097,47747,21030)
-(10788,5131,10746,5086)
-\N
-(15497,9698,15481,9678)
-(10617,47195,10601,47117)
-(42392,10583,42340,10550)
-(10753,33520,10669,33509)
-(5553,21580,5521,21527)
-(36840,12336,36817,12320)
-(49785,12554,49702,12553)
-(17737,38349,17639,38277)
-(48000,7823,47956,7814)
-(5019,3184,4931,3160)
-(30120,3524,30063,3492)
-(37044,2016,37001,1942)
-(23496,38566,23469,38528)
-(17255,48957,17200,48903)
-(27815,2138,27808,2090)
-(40440,11129,40368,11105)
-(35305,21772,35272,21717)
-(41308,45065,41229,44973)
-(14893,28807,14817,28789)
-(30776,45824,30731,45772)
-(742,40724,652,40672)
-(5985,41133,5927,41097)
-(9576,10226,9540,10218)
-(21407,23207,21323,23160)
-(44880,34228,44877,34169)
-(29146,49694,29143,49682)
-(28502,34886,28471,34832)
-\N
-(30662,5584,30604,5528)
-(12612,26081,12552,26001)
-(17166,49308,17098,49270)
-(9586,14116,9488,14104)
-(37323,47576,37264,47482)
-(48009,49713,48004,49614)
-(49308,23780,49297,23760)
-(8667,32342,8592,32294)
-(37826,48560,37822,48485)
-\N
-(24493,18653,24486,18616)
-(17914,3850,17887,3775)
-(34270,43873,34231,43826)
-(7753,44715,7660,44651)
-(44328,36364,44265,36350)
-(10146,3030,10111,2975)
-(35273,40106,35269,40062)
-\N
-(38566,43846,38547,43760)
-(12400,41394,12377,41378)
-(45196,38286,45153,38250)
-(48511,14972,48428,14883)
-(25939,36328,25886,36277)
-(38997,11007,38979,10917)
-(30342,518,30244,453)
-(6876,7468,6867,7454)
-(17566,27575,17566,27480)
-(18869,28538,18858,28475)
-(16825,33309,16726,33255)
-(14585,26111,14490,26035)
-(28743,49392,28664,49349)
-(26652,23359,26618,23297)
-\N
-(40129,33653,40102,33584)
-(41074,26393,41038,26389)
-(3869,33564,3869,33536)
-(28455,14205,28364,14163)
-(13866,45603,13770,45543)
-(21666,30586,21578,30544)
-(29978,11931,29893,11868)
-(1594,1043,1517,971)
-(948,1201,907,1156)
-(27547,13692,27545,13677)
-(13661,38184,13566,38154)
-(2389,40026,2317,39938)
-(35481,46379,35481,46320)
-\N
-(26917,45698,26864,45689)
-(23933,41617,23909,41539)
-(8912,8471,8862,8401)
-(9625,4747,9558,4692)
-(34743,35056,34721,34969)
-(39544,21762,39475,21717)
-\N
-(11741,26330,11656,26293)
-(39015,1315,38966,1285)
-(13418,44237,13326,44202)
-(2107,17672,2093,17616)
-(42448,28844,42370,28764)
-(49843,5175,49808,5145)
-(6536,23000,6467,22958)
-(11114,5822,11027,5739)
-(48457,11074,48384,11024)
-(12343,23110,12310,23074)
-(17300,24847,17276,24825)
-(8823,8253,8793,8238)
-(3449,171,3354,108)
-\N
-(21650,23955,21605,23883)
-(13260,3234,13193,3214)
-(25361,10896,25305,10806)
-(25051,25042,25011,25001)
-(25044,25088,25015,25005)
-\N
-(25007,25061,25002,25013)
-(25066,25105,25003,25007)
-(25028,25012,25015,25011)
-(25031,25057,25006,25018)
-(25015,25042,25004,25012)
-(25091,25049,25019,25019)
-(25023,25011,25000,25004)
-\N
-(25053,25104,25010,25012)
-(25058,25001,25018,25000)
-(25059,25051,25008,25016)
-(25043,25069,25007,25004)
-(25006,25101,25002,25002)
-(25095,25012,25014,25007)
-(25054,25052,25019,25013)
-(25108,25077,25009,25018)
-(25007,25023,25003,25002)
-\N
-(25076,25098,25002,25016)
-(25030,25077,25012,25006)
diff --git a/contrib/rtree_gist/expected/rtree_gist.out b/contrib/rtree_gist/expected/rtree_gist.out
deleted file mode 100644
index 74ac7e640d..0000000000
--- a/contrib/rtree_gist/expected/rtree_gist.out
+++ /dev/null
@@ -1,45 +0,0 @@
---
--- first, define the datatype.  Turn off echoing so that expected file
--- does not depend on contents of seg.sql.
---
-\set ECHO none
-create table boxtmp (b box);
-\copy boxtmp from 'data/test_box.data'
-select count(*) from boxtmp where b && '(1000,1000,0,0)'::box;
- count 
--------
-     2
-(1 row)
-
-create index bix on boxtmp using rtree (b);
-select count(*) from boxtmp where b && '(1000,1000,0,0)'::box;
- count 
--------
-     2
-(1 row)
-
-drop index bix;
-create index bix on boxtmp using gist (b);
-select count(*) from boxtmp where b && '(1000,1000,0,0)'::box;
- count 
--------
-     2
-(1 row)
-
-create table polytmp (p polygon);
-\copy polytmp from 'data/test_box.data'
-create index pix on polytmp using rtree (p);
-select count(*) from polytmp where p && '(1000,1000),(0,0)'::polygon;
- count 
--------
-     2
-(1 row)
-
-drop index pix;
-create index pix on polytmp using gist (p);
-select count(*) from polytmp where p && '(1000,1000),(0,0)'::polygon;
- count 
--------
-     2
-(1 row)
-
diff --git a/contrib/rtree_gist/rtree_gist.c b/contrib/rtree_gist/rtree_gist.c
deleted file mode 100644
index 580ca6427f..0000000000
--- a/contrib/rtree_gist/rtree_gist.c
+++ /dev/null
@@ -1,578 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * rtree_gist.c
- *	  pg_amproc entries for GiSTs over 2-D boxes.
- * This gives R-tree behavior, with Guttman's poly-time split algorithm.
- *
- *
- *
- * IDENTIFICATION
- *	$Header: /cvsroot/pgsql/contrib/rtree_gist/Attic/rtree_gist.c,v 1.5 2002/05/28 15:24:53 tgl Exp $
- *
- *-------------------------------------------------------------------------
- */
-#include "postgres.h"
-
-#include "access/gist.h"
-#include "access/itup.h"
-#include "access/rtree.h"
-#include "utils/palloc.h"
-#include "utils/geo_decls.h"
-#include "utils/elog.h"
-
-typedef Datum (*RDF) (PG_FUNCTION_ARGS);
-typedef Datum (*BINARY_UNION) (Datum, Datum, int *);
-typedef float (*SIZE_BOX) (Datum);
-
-/*
-** box ops
-*/
-PG_FUNCTION_INFO_V1(gbox_compress);
-PG_FUNCTION_INFO_V1(gbox_union);
-PG_FUNCTION_INFO_V1(gbox_picksplit);
-PG_FUNCTION_INFO_V1(gbox_consistent);
-PG_FUNCTION_INFO_V1(gbox_penalty);
-PG_FUNCTION_INFO_V1(gbox_same);
-
-Datum		gbox_compress(PG_FUNCTION_ARGS);
-Datum		gbox_union(PG_FUNCTION_ARGS);
-Datum		gbox_picksplit(PG_FUNCTION_ARGS);
-Datum		gbox_consistent(PG_FUNCTION_ARGS);
-Datum		gbox_penalty(PG_FUNCTION_ARGS);
-Datum		gbox_same(PG_FUNCTION_ARGS);
-
-static bool gbox_leaf_consistent(BOX *key, BOX *query, StrategyNumber strategy);
-static float size_box(Datum box);
-
-/*
-** Polygon ops
-*/
-PG_FUNCTION_INFO_V1(gpoly_compress);
-PG_FUNCTION_INFO_V1(gpoly_consistent);
-
-Datum		gpoly_compress(PG_FUNCTION_ARGS);
-Datum		gpoly_consistent(PG_FUNCTION_ARGS);
-
-/*
-** Common rtree-function (for all ops)
-*/
-static bool rtree_internal_consistent(BOX *key, BOX *query, StrategyNumber strategy);
-
-PG_FUNCTION_INFO_V1(rtree_decompress);
-
-Datum		rtree_decompress(PG_FUNCTION_ARGS);
-
-/**************************************************
- * Box ops
- **************************************************/
-
-/*
-** The GiST Consistent method for boxes
-** Should return false if for all data items x below entry,
-** the predicate x op query == FALSE, where op is the oper
-** corresponding to strategy in the pg_amop table.
-*/
-Datum
-gbox_consistent(PG_FUNCTION_ARGS)
-{
-	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-	BOX		   *query = (BOX *) PG_GETARG_POINTER(1);
-	StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
-	/*
-	 * * if entry is not leaf, use gbox_internal_consistent, * else use
-	 * gbox_leaf_consistent
-	 */
-	if (!(DatumGetPointer(entry->key) != NULL && query))
-		PG_RETURN_BOOL(FALSE);
-
-	if (GIST_LEAF(entry))
-		PG_RETURN_BOOL(gbox_leaf_consistent((BOX *) DatumGetPointer(entry->key), query, strategy));
-	else
-		PG_RETURN_BOOL(rtree_internal_consistent((BOX *) DatumGetPointer(entry->key), query, strategy));
-}
-
-
-/*
-** The GiST Union method for boxes
-** returns the minimal bounding box that encloses all the entries in entryvec
-*/
-Datum
-gbox_union(PG_FUNCTION_ARGS)
-{
-	bytea	   *entryvec = (bytea *) PG_GETARG_POINTER(0);
-	int		   *sizep = (int *) PG_GETARG_POINTER(1);
-	int			numranges,
-				i;
-	BOX		   *cur,
-			   *pageunion;
-
-	numranges = (VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY);
-	pageunion = (BOX *) palloc(sizeof(BOX));
-	cur = DatumGetBoxP(((GISTENTRY *) VARDATA(entryvec))[0].key);
-	memcpy((void *) pageunion, (void *) cur, sizeof(BOX));
-
-	for (i = 1; i < numranges; i++)
-	{
-		cur = DatumGetBoxP(((GISTENTRY *) VARDATA(entryvec))[i].key);
-		if (pageunion->high.x < cur->high.x)
-			pageunion->high.x = cur->high.x;
-		if (pageunion->low.x > cur->low.x)
-			pageunion->low.x = cur->low.x;
-		if (pageunion->high.y < cur->high.y)
-			pageunion->high.y = cur->high.y;
-		if (pageunion->low.y > cur->low.y)
-			pageunion->low.y = cur->low.y;
-	}
-	*sizep = sizeof(BOX);
-
-	PG_RETURN_POINTER(pageunion);
-}
-
-/*
-** GiST Compress methods for boxes
-** do not do anything.
-*/
-Datum
-gbox_compress(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_POINTER(PG_GETARG_POINTER(0));
-}
-
-/*
-** The GiST Penalty method for boxes
-** As in the R-tree paper, we use change in area as our penalty metric
-*/
-Datum
-gbox_penalty(PG_FUNCTION_ARGS)
-{
-	GISTENTRY  *origentry = (GISTENTRY *) PG_GETARG_POINTER(0);
-	GISTENTRY  *newentry = (GISTENTRY *) PG_GETARG_POINTER(1);
-	float	   *result = (float *) PG_GETARG_POINTER(2);
-	Datum		ud;
-	float		tmp1;
-
-	ud = DirectFunctionCall2(rt_box_union, origentry->key, newentry->key);
-	tmp1 = size_box(ud);
-	if (DatumGetPointer(ud) != NULL)
-		pfree(DatumGetPointer(ud));
-
-	*result = tmp1 - size_box(origentry->key);
-	PG_RETURN_POINTER(result);
-}
-
-typedef struct {
-	BOX 	*key;
-	int 	pos;
-} KBsort;
-
-static int
-compare_KB(const void* a, const void* b) {
-	BOX *abox = ((KBsort*)a)->key; 
-	BOX *bbox = ((KBsort*)b)->key;
-	float sa = (abox->high.x - abox->low.x) * (abox->high.y - abox->low.y);
-	float sb = (bbox->high.x - bbox->low.x) * (bbox->high.y - bbox->low.y);
-
-	if ( sa==sb ) return 0;
-	return ( sa>sb ) ? 1 : -1;
-}
-
-/*
-** The GiST PickSplit method
-** New linear algorithm, see 'New Linear Node Splitting Algorithm for R-tree',
-** C.H.Ang and T.C.Tan
-*/
-Datum
-gbox_picksplit(PG_FUNCTION_ARGS)
-{
-	bytea	   *entryvec = (bytea *) PG_GETARG_POINTER(0);
-	GIST_SPLITVEC *v = (GIST_SPLITVEC *) PG_GETARG_POINTER(1);
-	OffsetNumber i;
-	OffsetNumber *listL,
-			   *listR,
-			   *listB,
-			   *listT;
-	BOX		   *unionL,
-			   *unionR,
-			   *unionB,
-			   *unionT;
-	int			posL,
-				posR,
-				posB,
-				posT;
-	BOX			pageunion;
-	BOX		   *cur;
-	char		direction = ' ';
-	bool		allisequal = true;
-	OffsetNumber maxoff;
-	int			nbytes;
-
-	posL = posR = posB = posT = 0;
-	maxoff = ((VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY)) - 1;
-
-	cur = DatumGetBoxP(((GISTENTRY *) VARDATA(entryvec))[FirstOffsetNumber].key);
-	memcpy((void *) &pageunion, (void *) cur, sizeof(BOX));
-
-	/* find MBR */
-	for (i = OffsetNumberNext(FirstOffsetNumber); i <= maxoff; i = OffsetNumberNext(i))
-	{
-		cur = DatumGetBoxP(((GISTENTRY *) VARDATA(entryvec))[i].key);
-		if ( allisequal == true &&  (
-				pageunion.high.x != cur->high.x || 
-				pageunion.high.y != cur->high.y || 
-				pageunion.low.x != cur->low.x || 
-				pageunion.low.y != cur->low.y 
-			) ) 
-			allisequal = false;
- 
-		if (pageunion.high.x < cur->high.x)
-			pageunion.high.x = cur->high.x;
-		if (pageunion.low.x > cur->low.x)
-			pageunion.low.x = cur->low.x;
-		if (pageunion.high.y < cur->high.y)
-			pageunion.high.y = cur->high.y;
-		if (pageunion.low.y > cur->low.y)
-			pageunion.low.y = cur->low.y;
-	}
-
-	nbytes = (maxoff + 2) * sizeof(OffsetNumber);
-	listL = (OffsetNumber *) palloc(nbytes);
-	listR = (OffsetNumber *) palloc(nbytes);
-	unionL = (BOX *) palloc(sizeof(BOX));
-	unionR = (BOX *) palloc(sizeof(BOX));
-	if (allisequal)
-	{
-		cur = DatumGetBoxP(((GISTENTRY *) VARDATA(entryvec))[OffsetNumberNext(FirstOffsetNumber)].key);
-		if (memcmp((void *) cur, (void *) &pageunion, sizeof(BOX)) == 0)
-		{
-			v->spl_left = listL;
-			v->spl_right = listR;
-			v->spl_nleft = v->spl_nright = 0;
-			memcpy((void *) unionL, (void *) &pageunion, sizeof(BOX));
-			memcpy((void *) unionR, (void *) &pageunion, sizeof(BOX));
-
-			for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i))
-			{
-				if (i <= (maxoff - FirstOffsetNumber + 1) / 2)
-				{
-					v->spl_left[v->spl_nleft] = i;
-					v->spl_nleft++;
-				}
-				else
-				{
-					v->spl_right[v->spl_nright] = i;
-					v->spl_nright++;
-				}
-			}
-			v->spl_ldatum = BoxPGetDatum(unionL);
-			v->spl_rdatum = BoxPGetDatum(unionR);
-
-			PG_RETURN_POINTER(v);
-		}
-	}
-
-	listB = (OffsetNumber *) palloc(nbytes);
-	listT = (OffsetNumber *) palloc(nbytes);
-	unionB = (BOX *) palloc(sizeof(BOX));
-	unionT = (BOX *) palloc(sizeof(BOX));
-
-#define ADDLIST( list, unionD, pos, num ) do { \
-	if ( pos ) { \
-		if ( unionD->high.x < cur->high.x ) unionD->high.x	= cur->high.x; \
-		if ( unionD->low.x	> cur->low.x  ) unionD->low.x	= cur->low.x; \
-		if ( unionD->high.y < cur->high.y ) unionD->high.y	= cur->high.y; \
-		if ( unionD->low.y	> cur->low.y  ) unionD->low.y	= cur->low.y; \
-	} else { \
-			memcpy( (void*)unionD, (void*) cur, sizeof( BOX ) );  \
-	} \
-	list[pos] = num; \
-	(pos)++; \
-} while(0)
-
-	for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i))
-	{
-		cur = DatumGetBoxP(((GISTENTRY *) VARDATA(entryvec))[i].key);
-		if (cur->low.x - pageunion.low.x < pageunion.high.x - cur->high.x)
-			ADDLIST(listL, unionL, posL,i);
-		else
-			ADDLIST(listR, unionR, posR,i);
-		if (cur->low.y - pageunion.low.y < pageunion.high.y - cur->high.y)
-			ADDLIST(listB, unionB, posB,i);
-		else
-			ADDLIST(listT, unionT, posT,i);
-	}
-
-	/* bad disposition, sort by ascending and resplit */
-	if ( (posR==0 || posL==0) && (posT==0 || posB==0) ) {
-		KBsort *arr = (KBsort*)palloc( sizeof(KBsort) * maxoff );
-		posL = posR = posB = posT = 0;
-		for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i)) {
-			arr[i-1].key = DatumGetBoxP(((GISTENTRY *) VARDATA(entryvec))[i].key);
-			arr[i-1].pos = i;
-		}
-		qsort( arr, maxoff, sizeof(KBsort), compare_KB );
-		for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i)) {
-			cur = arr[i-1].key;
-			if (cur->low.x - pageunion.low.x < pageunion.high.x - cur->high.x)
-				ADDLIST(listL, unionL, posL,arr[i-1].pos);
-			else if ( cur->low.x - pageunion.low.x == pageunion.high.x - cur->high.x ) {
-				if ( posL>posR )
-					ADDLIST(listR, unionR, posR,arr[i-1].pos);
-				else
-					ADDLIST(listL, unionL, posL,arr[i-1].pos);
-			} else
-				ADDLIST(listR, unionR, posR,arr[i-1].pos);
-
-			if (cur->low.y - pageunion.low.y < pageunion.high.y - cur->high.y)
-				ADDLIST(listB, unionB, posB,arr[i-1].pos);
-			else if ( cur->low.y - pageunion.low.y == pageunion.high.y - cur->high.y ) {
-				if ( posB>posT )
-					ADDLIST(listT, unionT, posT,arr[i-1].pos);
-				else
-					ADDLIST(listB, unionB, posB,arr[i-1].pos);
-			} else
-				ADDLIST(listT, unionT, posT,arr[i-1].pos);
-		}
-		pfree(arr);
-	}
-
-	/* which split more optimal? */
-	if (Max(posL, posR) < Max(posB, posT))
-		direction = 'x';
-	else if (Max(posL, posR) > Max(posB, posT))
-		direction = 'y';
-	else
-	{
-		Datum		interLR = DirectFunctionCall2(rt_box_inter,
-												  BoxPGetDatum(unionL),
-												  BoxPGetDatum(unionR));
-		Datum		interBT = DirectFunctionCall2(rt_box_inter,
-												  BoxPGetDatum(unionB),
-												  BoxPGetDatum(unionT));
-		float		sizeLR,
-					sizeBT;
-
-		sizeLR = size_box(interLR);
-		sizeBT = size_box(interBT);
-
-		if (sizeLR < sizeBT)
-			direction = 'x';
-		else
-			direction = 'y';
-	}
-
-	if (direction == 'x')
-	{
-		pfree(unionB);
-		pfree(listB);
-		pfree(unionT);
-		pfree(listT);
-
-		v->spl_left = listL;
-		v->spl_right = listR;
-		v->spl_nleft = posL;
-		v->spl_nright = posR;
-		v->spl_ldatum = BoxPGetDatum(unionL);
-		v->spl_rdatum = BoxPGetDatum(unionR);
-	}
-	else
-	{
-		pfree(unionR);
-		pfree(listR);
-		pfree(unionL);
-		pfree(listL);
-
-		v->spl_left = listB;
-		v->spl_right = listT;
-		v->spl_nleft = posB;
-		v->spl_nright = posT;
-		v->spl_ldatum = BoxPGetDatum(unionB);
-		v->spl_rdatum = BoxPGetDatum(unionT);
-	}
-
-	PG_RETURN_POINTER(v);
-}
-
-/*
-** Equality method
-*/
-Datum
-gbox_same(PG_FUNCTION_ARGS)
-{
-	BOX		   *b1 = (BOX *) PG_GETARG_POINTER(0);
-	BOX		   *b2 = (BOX *) PG_GETARG_POINTER(1);
-	bool	   *result = (bool *) PG_GETARG_POINTER(2);
-
-	if (b1 && b2)
-		*result = DatumGetBool(DirectFunctionCall2(box_same, PointerGetDatum(b1), PointerGetDatum(b2)));
-	else
-		*result = (b1 == NULL && b2 == NULL) ? TRUE : FALSE;
-	PG_RETURN_POINTER(result);
-}
-
-/*
-** SUPPORT ROUTINES for boxes
-*/
-static bool
-gbox_leaf_consistent(BOX *key,
-					 BOX *query,
-					 StrategyNumber strategy)
-{
-	bool		retval;
-
-	switch (strategy)
-	{
-		case RTLeftStrategyNumber:
-			retval = DatumGetBool(DirectFunctionCall2(box_left, PointerGetDatum(key), PointerGetDatum(query)));
-			break;
-		case RTOverLeftStrategyNumber:
-			retval = DatumGetBool(DirectFunctionCall2(box_overleft, PointerGetDatum(key), PointerGetDatum(query)));
-			break;
-		case RTOverlapStrategyNumber:
-			retval = DatumGetBool(DirectFunctionCall2(box_overlap, PointerGetDatum(key), PointerGetDatum(query)));
-			break;
-		case RTOverRightStrategyNumber:
-			retval = DatumGetBool(DirectFunctionCall2(box_overright, PointerGetDatum(key), PointerGetDatum(query)));
-			break;
-		case RTRightStrategyNumber:
-			retval = DatumGetBool(DirectFunctionCall2(box_right, PointerGetDatum(key), PointerGetDatum(query)));
-			break;
-		case RTSameStrategyNumber:
-			retval = DatumGetBool(DirectFunctionCall2(box_same, PointerGetDatum(key), PointerGetDatum(query)));
-			break;
-		case RTContainsStrategyNumber:
-			retval = DatumGetBool(DirectFunctionCall2(box_contain, PointerGetDatum(key), PointerGetDatum(query)));
-			break;
-		case RTContainedByStrategyNumber:
-			retval = DatumGetBool(DirectFunctionCall2(box_contained, PointerGetDatum(key), PointerGetDatum(query)));
-			break;
-		default:
-			retval = FALSE;
-	}
-	return (retval);
-}
-
-static float
-size_box(Datum box)
-{
-	if (DatumGetPointer(box) != NULL)
-	{
-		float		size;
-
-		DirectFunctionCall2(rt_box_size,
-							box, PointerGetDatum(&size));
-		return size;
-	}
-	else
-		return 0.0;
-}
-
-/**************************************************
- * Polygon ops
- **************************************************/
-
-Datum
-gpoly_compress(PG_FUNCTION_ARGS)
-{
-	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-	GISTENTRY  *retval;
-
-	if (entry->leafkey)
-	{
-		retval = palloc(sizeof(GISTENTRY));
-		if (DatumGetPointer(entry->key) != NULL)
-		{
-			POLYGON    *in;
-			BOX		   *r;
-
-			in = (POLYGON *) PG_DETOAST_DATUM(entry->key);
-			r = (BOX *) palloc(sizeof(BOX));
-			memcpy((void *) r, (void *) &(in->boundbox), sizeof(BOX));
-			if (in != (POLYGON *) DatumGetPointer(entry->key))
-				pfree(in);
-
-			gistentryinit(*retval, PointerGetDatum(r),
-						  entry->rel, entry->page,
-						  entry->offset, sizeof(BOX), FALSE);
-
-		}
-		else
-		{
-			gistentryinit(*retval, (Datum) 0,
-						  entry->rel, entry->page,
-						  entry->offset, 0, FALSE);
-		}
-	}
-	else
-		retval = entry;
-	PG_RETURN_POINTER(retval);
-}
-
-Datum
-gpoly_consistent(PG_FUNCTION_ARGS)
-{
-	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-	POLYGON    *query = (POLYGON *) PG_DETOAST_DATUM(PG_GETARG_POINTER(1));
-	StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-	bool		result;
-
-	/*
-	 * * if entry is not leaf, use gbox_internal_consistent, * else use
-	 * gbox_leaf_consistent
-	 */
-	if (!(DatumGetPointer(entry->key) != NULL && query))
-		PG_RETURN_BOOL(FALSE);
-
-	result = rtree_internal_consistent((BOX *) DatumGetPointer(entry->key),
-									   &(query->boundbox), strategy);
-
-	PG_FREE_IF_COPY(query, 1);
-	PG_RETURN_BOOL(result);
-}
-
-/*****************************************
- * Common rtree-function (for all ops)
- *****************************************/
-
-static bool
-rtree_internal_consistent(BOX *key,
-						  BOX *query,
-						  StrategyNumber strategy)
-{
-	bool		retval;
-
-	switch (strategy)
-	{
-		case RTLeftStrategyNumber:
-		case RTOverLeftStrategyNumber:
-			retval = DatumGetBool(DirectFunctionCall2(box_overleft, PointerGetDatum(key), PointerGetDatum(query)));
-			break;
-		case RTOverlapStrategyNumber:
-			retval = DatumGetBool(DirectFunctionCall2(box_overlap, PointerGetDatum(key), PointerGetDatum(query)));
-			break;
-		case RTOverRightStrategyNumber:
-		case RTRightStrategyNumber:
-			retval = DatumGetBool(DirectFunctionCall2(box_right, PointerGetDatum(key), PointerGetDatum(query)));
-			break;
-		case RTSameStrategyNumber:
-		case RTContainsStrategyNumber:
-			retval = DatumGetBool(DirectFunctionCall2(box_contain, PointerGetDatum(key), PointerGetDatum(query)));
-			break;
-		case RTContainedByStrategyNumber:
-			retval = DatumGetBool(DirectFunctionCall2(box_overlap, PointerGetDatum(key), PointerGetDatum(query)));
-			break;
-		default:
-			retval = FALSE;
-	}
-	return (retval);
-}
-
-/*
-** GiST DeCompress methods
-** do not do anything.
-*/
-Datum
-rtree_decompress(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_POINTER(PG_GETARG_POINTER(0));
-}
diff --git a/contrib/rtree_gist/rtree_gist.sql.in b/contrib/rtree_gist/rtree_gist.sql.in
deleted file mode 100644
index 0d1770381f..0000000000
--- a/contrib/rtree_gist/rtree_gist.sql.in
+++ /dev/null
@@ -1,342 +0,0 @@
-begin transaction;
---
---
---
--- BOX ops
---
---
---
--- define the GiST support methods
-create function gbox_consistent(opaque,box,int4) returns bool as 'MODULE_PATHNAME' language 'C';
-
-create function gbox_compress(opaque) returns opaque as 'MODULE_PATHNAME' language 'C';
-
-create function rtree_decompress(opaque) returns opaque as 'MODULE_PATHNAME' language 'C';
-
-create function gbox_penalty(opaque,opaque,opaque) returns opaque as 'MODULE_PATHNAME' language 'C' with (isstrict);
-
-create function gbox_picksplit(opaque, opaque) returns opaque as 'MODULE_PATHNAME' language 'C';
-
-create function gbox_union(bytea, opaque) returns box as 'MODULE_PATHNAME' language 'C';
-
-create function gbox_same(box, box, opaque) returns opaque as 'MODULE_PATHNAME' language 'C';
-
--- add a new opclass
-INSERT INTO pg_opclass (opcamid, opcname, opcnamespace, opcowner, opcintype, opcdefault, opckeytype)
-    VALUES (
-        (SELECT oid FROM pg_am WHERE amname = 'gist'),
-        'gist_box_ops',
-        (SELECT oid FROM pg_namespace WHERE nspname = 'pg_catalog'),
-        1,	-- UID of superuser is hardwired to 1 as of PG 7.3
-        (SELECT oid FROM pg_type WHERE typname = 'box'),
-        true,
-        0);
-
--- get the comparators for boxes and store them in a tmp table
-SELECT o.oid AS opoid, o.oprname
-INTO TEMP TABLE rt_ops_tmp
-FROM pg_operator o, pg_type t
-WHERE o.oprleft = t.oid 
-   and t.typname = 'box';
-
--- using the tmp table, generate the amop entries 
--- box_left
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr) 
-   SELECT opcl.oid, 1, false, c.opoid
-   FROM pg_opclass opcl, rt_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_box_ops' 
-      and c.oprname = '<<';
-
--- box_overleft
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr) 
-   SELECT opcl.oid, 2, false, c.opoid
-   FROM pg_opclass opcl, rt_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_box_ops' 
-      and c.oprname = '&<';
-
--- box_overlap
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr) 
-   SELECT opcl.oid, 3, false, c.opoid
-   FROM pg_opclass opcl, rt_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_box_ops' 
-      and c.oprname = '&&';
-
--- box_overright
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr) 
-   SELECT opcl.oid, 4, false, c.opoid
-   FROM pg_opclass opcl, rt_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_box_ops' 
-      and c.oprname = '&>';
-
--- box_right
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 5, false, c.opoid
-   FROM pg_opclass opcl, rt_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_box_ops' 
-      and c.oprname = '>>';
-
--- box_same
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr) 
-   SELECT opcl.oid, 6, false, c.opoid
-   FROM pg_opclass opcl, rt_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_box_ops' 
-      and c.oprname = '~=';
-
--- box_contains
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 7, false, c.opoid
-   FROM pg_opclass opcl, rt_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_box_ops' 
-      and c.oprname = '~';
-
--- box_contained
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 8, false, c.opoid
-   FROM pg_opclass opcl, rt_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_box_ops' 
-      and c.oprname = '@';
-
-DROP table rt_ops_tmp;
-
--- add the entries to amproc for the support methods
--- note the amprocnum numbers associated with each are specific!
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 1, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_box_ops'
-      and proname = 'gbox_consistent';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 2, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_box_ops'
-      and proname = 'gbox_union';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 3, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_box_ops'
-      and proname = 'gbox_compress';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 4, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_box_ops'
-      and proname = 'rtree_decompress';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 5, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_box_ops'
-      and proname = 'gbox_penalty';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 6, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_box_ops'
-      and proname = 'gbox_picksplit';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 7, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_box_ops'
-      and proname = 'gbox_same';
-
---
---
---
--- POLYGON ops
---
---
---
--- define the GiST support methods
-create function gpoly_consistent(opaque,polygon,int4) returns bool as 'MODULE_PATHNAME' language 'C';
-
-create function gpoly_compress(opaque) returns opaque as 'MODULE_PATHNAME' language 'C';
-
--- add a new opclass
-INSERT INTO pg_opclass (opcamid, opcname, opcnamespace, opcowner, opcintype, opcdefault, opckeytype)
-    VALUES (
-        (SELECT oid FROM pg_am WHERE amname = 'gist'),
-        'gist_poly_ops',
-        (SELECT oid FROM pg_namespace WHERE nspname = 'pg_catalog'),
-        1,	-- UID of superuser is hardwired to 1 as of PG 7.3
-        (SELECT oid FROM pg_type WHERE typname = 'polygon'),
-        true,
-        (SELECT oid FROM pg_type WHERE typname = 'box'));
-
--- get the comparators for polygons and store them in a tmp table
--- hack for 757 (poly_contain_pt) Teodor
-SELECT o.oid AS opoid, o.oprname
-INTO TEMP TABLE rt_ops_tmp
-FROM pg_operator o, pg_type t
-WHERE o.oprleft = t.oid and o.oid <> 757
-   and t.typname = 'polygon';
-
--- using the tmp table, generate the amop entries 
--- poly_left
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr) 
-   SELECT opcl.oid, 1, true, c.opoid
-   FROM pg_opclass opcl, rt_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_poly_ops' 
-      and c.oprname = '<<';
-
--- poly_overleft
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr) 
-   SELECT opcl.oid, 2, true, c.opoid
-   FROM pg_opclass opcl, rt_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_poly_ops' 
-      and c.oprname = '&<';
-
--- poly_overlap
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr) 
-   SELECT opcl.oid, 3, true, c.opoid
-   FROM pg_opclass opcl, rt_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_poly_ops' 
-      and c.oprname = '&&';
-
--- poly_overright
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr) 
-   SELECT opcl.oid, 4, true, c.opoid
-   FROM pg_opclass opcl, rt_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_poly_ops' 
-      and c.oprname = '&>';
-
--- poly_right
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 5, true, c.opoid
-   FROM pg_opclass opcl, rt_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_poly_ops' 
-      and c.oprname = '>>';
-
--- poly_same
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr) 
-   SELECT opcl.oid, 6, true, c.opoid
-   FROM pg_opclass opcl, rt_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_poly_ops' 
-      and c.oprname = '~=';
-
--- poly_contains
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 7, true, c.opoid
-   FROM pg_opclass opcl, rt_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_poly_ops' 
-      and c.oprname = '~';
-
--- poly_contained
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 8, true, c.opoid
-   FROM pg_opclass opcl, rt_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_poly_ops' 
-      and c.oprname = '@';
-
-DROP table rt_ops_tmp;
-
--- add the entries to amproc for the support methods
--- note the amprocnum numbers associated with each are specific!
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 1, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_poly_ops'
-      and proname = 'gpoly_consistent';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 2, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_poly_ops'
-      and proname = 'gbox_union';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 3, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_poly_ops'
-      and proname = 'gpoly_compress';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 4, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_poly_ops'
-      and proname = 'rtree_decompress';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 5, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_poly_ops'
-      and proname = 'gbox_penalty';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 6, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_poly_ops'
-      and proname = 'gbox_picksplit';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 7, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_poly_ops'
-      and proname = 'gbox_same';
-
-end transaction;
-
diff --git a/contrib/rtree_gist/sql/rtree_gist.sql b/contrib/rtree_gist/sql/rtree_gist.sql
deleted file mode 100644
index 7a2a7faf85..0000000000
--- a/contrib/rtree_gist/sql/rtree_gist.sql
+++ /dev/null
@@ -1,38 +0,0 @@
---
--- first, define the datatype.  Turn off echoing so that expected file
--- does not depend on contents of seg.sql.
---
-\set ECHO none
-\i rtree_gist.sql
-\set ECHO all
-
-create table boxtmp (b box);
-
-\copy boxtmp from 'data/test_box.data'
-
-select count(*) from boxtmp where b && '(1000,1000,0,0)'::box;
-
-create index bix on boxtmp using rtree (b);
-
-select count(*) from boxtmp where b && '(1000,1000,0,0)'::box;
-
-drop index bix;
-
-create index bix on boxtmp using gist (b);
-
-select count(*) from boxtmp where b && '(1000,1000,0,0)'::box;
-
-create table polytmp (p polygon);
-
-\copy polytmp from 'data/test_box.data'
-
-create index pix on polytmp using rtree (p);
-
-select count(*) from polytmp where p && '(1000,1000),(0,0)'::polygon;
-
-drop index pix;
-
-create index pix on polytmp using gist (p);
-
-select count(*) from polytmp where p && '(1000,1000),(0,0)'::polygon;
-
diff --git a/contrib/seg/Makefile b/contrib/seg/Makefile
deleted file mode 100644
index ac9b543d83..0000000000
--- a/contrib/seg/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/seg/Makefile,v 1.6 2001/11/16 16:32:33 petere Exp $
-
-subdir = contrib/seg
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-MODULE_big = seg
-OBJS = seg.o segparse.o segscan.o buffer.o
-DATA_built = seg.sql
-DOCS = README.seg
-REGRESS = seg
-
-
-segparse.c: segparse.h ;
-
-segparse.h: segparse.y
-ifdef YACC
-	$(YACC) -d $(YFLAGS) -p seg_yy $<
-	mv -f y.tab.c segparse.c
-	mv -f y.tab.h segparse.h
-else
-	@$(missing) bison $< $@
-endif
-
-segscan.c: segscan.l
-ifdef FLEX
-	$(FLEX) $(FLEXFLAGS) -Pseg_yy -o'$@' $<
-else
-	@$(missing) flex $< $@
-endif
-
-EXTRA_CLEAN = segparse.c segparse.h segscan.c y.tab.c y.tab.h
-
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/seg/README.seg b/contrib/seg/README.seg
deleted file mode 100644
index 5c80ebcd5c..0000000000
--- a/contrib/seg/README.seg
+++ /dev/null
@@ -1,326 +0,0 @@
-This directory contains the code for the user-defined type,
-SEG, representing laboratory measurements as floating point
-intervals. 
-
-RATIONALE
-=========
-
-The geometry of measurements is usually more complex than that of a
-point in a numeric continuum. A measurement is usually a segment of
-that continuum with somewhat fuzzy limits. The measurements come out
-as intervals because of uncertainty and randomness, as well as because
-the value being measured may naturally be an interval indicating some
-condition, such as the temperature range of stability of a protein.
-
-Using just common sense, it appears more convenient to store such data
-as intervals, rather than pairs of numbers. In practice, it even turns
-out more efficient in most applications.
-
-Further along the line of common sense, the fuzziness of the limits
-suggests that the use of traditional numeric data types leads to a
-certain loss of information. Consider this: your instrument reads
-6.50, and you input this reading into the database. What do you get
-when you fetch it? Watch:
-
-test=> select 6.50 as "pH";
- pH
----
-6.5
-(1 row)
-
-In the world of measurements, 6.50 is not the same as 6.5. It may
-sometimes be critically different. The experimenters usually write
-down (and publish) the digits they trust. 6.50 is actually a fuzzy
-interval contained within a bigger and even fuzzier interval, 6.5,
-with their center points being (probably) the only common feature they
-share. We definitely do not want such different data items to appear the
-same.
-
-Conclusion? It is nice to have a special data type that can record the
-limits of an interval with arbitrarily variable precision. Variable in
-a sense that each data element records its own precision.
-
-Check this out:
-
-test=> select '6.25 .. 6.50'::seg as "pH";
-          pH
-------------
-6.25 .. 6.50
-(1 row)
-
-
-FILES
-=====
-
-Makefile		building instructions for the shared library
-
-README.seg		the file you are now reading
-
-buffer.c		global variables and buffer access utilities 
-			shared between the parser (segparse.y) and the
-			scanner (segscan.l)
-
-buffer.h		function prototypes for buffer.c
-
-seg.c			the implementation of this data type in c
-
-seg.sql.in		SQL code needed to register this type with postgres
-			(transformed to seg.sql by make)
-
-segdata.h		the data structure used to store the segments
-
-segparse.y		the grammar file for the parser (used by seg_in() in seg.c)
- 
-segscan.l		scanner rules (used by seg_yyparse() in segparse.y)
-
-seg-validate.pl		a simple input validation script. It is probably a 
-			little stricter than the type itself: for example, 
-			it rejects '22 ' because of the trailing space. Use 
-			as a filter to discard bad values from a single column;
-			redirect to /dev/null to see the offending input
-
-sort-segments.pl	a script to sort the tables having a SEG type column
-
-
-INSTALLATION
-============
-
-To install the type, run
-
-	make
-	make install
-
-For this to work, make sure that:
-
-. the seg source directory is in the postgres contrib directory
-. the user running "make install" has postgres administrative authority
-. this user's environment defines the PGLIB and PGDATA variables and has
-  postgres binaries in the PATH.
-
-This only installs the type implementation and documentation.  To make the
-type available in any particular database, do
-
-	psql -d databasename < seg.sql
-
-If you install the type in the template1 database, all subsequently created
-databases will inherit it.
-
-To test the new type, after "make install" do
-
-	make installcheck
-
-If it fails, examine the file regression.diffs to find out the reason (the
-test code is a direct adaptation of the regression tests from the main
-source tree).
-
-
-SYNTAX
-======
-
-The external representation of an interval is formed using one or two
-floating point numbers joined by the range operator ('..' or '...'). 
-Optional certainty indicators (<, > and ~) are ignored by the internal 
-logics, but are retained in the data.
-
-Grammar
--------
-
-rule 1    seg -> boundary PLUMIN deviation
-rule 2    seg -> boundary RANGE boundary
-rule 3    seg -> boundary RANGE
-rule 4    seg -> RANGE boundary
-rule 5    seg -> boundary
-rule 6    boundary -> FLOAT
-rule 7    boundary -> EXTENSION FLOAT
-rule 8    deviation -> FLOAT
-
-Tokens
-------
-
-RANGE        (\.\.)(\.)?
-PLUMIN       \'\+\-\'
-integer      [+-]?[0-9]+
-real         [+-]?[0-9]+\.[0-9]+
-FLOAT        ({integer}|{real})([eE]{integer})?
-EXTENSION    [<>~]
-
-
-Examples of valid SEG representations:
---------------------------------------
-
-Any number	(rules 5,6) -- creates a zero-length segment (a point,
-		if you will)
-
-~5.0		(rules 5,7) -- creates a zero-length segment AND records 
-		'~' in the data. This notation reads 'approximately 5.0', 
-		but its meaning is not recognized by the code. It is ignored 
-		until you get the value back. View it is a short-hand comment.
-
-<5.0		(rules 5,7) -- creates a point at 5.0; '<' is ignored but 
-		is preserved as a comment
-
->5.0		(rules 5,7) -- creates a point at 5.0; '>' is ignored but
-		is preserved as a comment
-
-5(+-)0.3
-5'+-'0.3	(rules 1,8) -- creates an interval '4.7..5.3'. As of this 
-		writing (02/09/2000), this mechanism isn't completely accurate 
-		in determining the number of significant digits for the 
-		boundaries. For example, it adds an extra digit to the lower
-		boundary if the resulting interval includes a power of ten:
-
-		template1=> select '10(+-)1'::seg as seg;
-		      seg
-		---------
-		9.0 .. 11 -- should be: 9 .. 11
-
-		Also, the (+-) notation is not preserved: 'a(+-)b' will 
-		always be returned as '(a-b) .. (a+b)'. The purpose of this 
-		notation is to allow input from certain data sources without 
-		conversion.
-
-50 .. 		(rule 3) -- everything that is greater than or equal to 50
-
-.. 0		(rule 4) -- everything that is less than or equal to 0
-
-1.5e-2 .. 2E-2 	(rule 2) -- creates an interval (0.015 .. 0.02)
-
-1 ... 2		The same as 1...2, or 1 .. 2, or 1..2 (space is ignored).
-		Because of the widespread use of '...' in the data sources,
-		I decided to stick to is as a range operator. This, and
-		also the fact that the white space around the range operator
-		is ignored, creates a parsing conflict with numeric constants 
-		starting with a	decimal point.
-
-
-Examples of invalid SEG input:
-------------------------------
-
-.1e7		should be: 0.1e7
-.1 .. .2	should be: 0.1 .. 0.2
-2.4 E4		should be: 2.4E4
-
-The following, although it is not a syntax error, is disallowed to improve
-the sanity of the data:
-
-5 .. 2		should be: 2 .. 5
-
-
-PRECISION
-=========
-
-The segments are stored internally as pairs of 32-bit floating point
-numbers. It means that the numbers with more than 7 significant digits
-will be truncated.
-
-The numbers with less than or exactly 7 significant digits retain their
-original precision. That is, if your query returns 0.00, you will be
-sure that the trailing zeroes are not the artifacts of formatting: they
-reflect the precision of the original data. The number of leading
-zeroes does not affect precision: the value 0.0067 is considered to
-have just 2 significant digits.
-
-
-USAGE
-=====
-
-The access method for SEG is a GiST (gist_seg_ops), which is a
-generalization of R-tree. GiSTs allow the postgres implementation of
-R-tree, originally encoded to support 2-D geometric types such as
-boxes and polygons, to be used with any data type whose data domain
-can be partitioned using the concepts of containment, intersection and
-equality. In other words, everything that can intersect or contain
-its own kind can be indexed with a GiST. That includes, among other
-things, all geometric data types, regardless of their dimensionality
-(see also contrib/cube).
-
-The operators supported by the GiST access method include:
-
-
-[a, b] << [c, d]	Is left of
-
-	The left operand, [a, b], occurs entirely to the left of the
-	right operand, [c, d], on the axis (-inf, inf). It means,
-	[a, b] << [c, d] is true if b < c and false otherwise
-
-[a, b] >> [c, d]	Is right of
-
-	[a, b] is occurs entirely to the right of [c, d]. 
-	[a, b] >> [c, d] is true if b > c and false otherwise
-
-[a, b] &< [c, d]	Over left
-
-	The segment [a, b] overlaps the segment [c, d] in such a way
-	that a <= c <= b and b <= d
-
-[a, b] &> [c, d]	Over right
-
-	The segment [a, b] overlaps the segment [c, d] in such a way
-	that a > c and b <= c <= d
-
-[a, b] = [c, d]		Same as
-
-	The segments [a, b] and [c, d] are identical, that is, a == b
-	and c == d
-
-[a, b] @ [c, d]		Contains
-
-	The segment [a, b] contains the segment [c, d], that is, 
-	a <= c and b >= d
-
-[a, b] @ [c, d]		Contained in
-
-	The segment [a, b] is contained in [c, d], that is, 
-	a >= c and b <= d
-
-Although the mnemonics of the following operators is questionable, I
-preserved them to maintain visual consistency with other geometric
-data types defined in Postgres.
-
-Other operators:
-
-[a, b] < [c, d]		Less than
-[a, b] > [c, d]		Greater than
-
-	These operators do not make a lot of sense for any practical
-	purpose but sorting. These operators first compare (a) to (c),
-	and if these are equal, compare (b) to (d). That accounts for
-	reasonably good sorting in most cases, which is useful if
-	you want to use ORDER BY with this type
-
-There are a few other potentially useful functions defined in seg.c 
-that vanished from the schema because I stopped using them. Some of 
-these were meant to support type casting. Let me know if I was wrong: 
-I will then add them back to the schema. I would also appreciate 
-other ideas that would enhance the type and make it more useful.
-
-For examples of usage, see sql/seg.sql
-
-NOTE: The performance of an R-tree index can largely depend on the
-order of input values. It may be very helpful to sort the input table
-on the SEG column (see the script sort-segments.pl for an example)
-
-
-CREDITS
-=======
-
-My thanks are primarily to Prof. Joe Hellerstein
-(http://db.cs.berkeley.edu/~jmh/) for elucidating the gist of the GiST
-(http://gist.cs.berkeley.edu/). I am also grateful to all postgres
-developers, present and past, for enabling myself to create my own
-world and live undisturbed in it. And I would like to acknowledge my
-gratitude to Argonne Lab and to the U.S. Department of Energy for the
-years of faithful support of my database research.
-
-
-------------------------------------------------------------------------
-Gene Selkov, Jr.
-Computational Scientist
-Mathematics and Computer Science Division
-Argonne National Laboratory
-9700 S Cass Ave.
-Building 221
-Argonne, IL 60439-4844
-
-selkovjr@mcs.anl.gov
-
diff --git a/contrib/seg/buffer.c b/contrib/seg/buffer.c
deleted file mode 100644
index baeba5e515..0000000000
--- a/contrib/seg/buffer.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* This module defines the parse buffer and routines for setting/reading it */
-
-#include "postgres.h"
-
-#include "utils/elog.h"
-
-static char *PARSE_BUFFER;
-static char *PARSE_BUFFER_PTR;
-static unsigned int PARSE_BUFFER_SIZE;
-static unsigned int SCANNER_POS;
-
-void		set_parse_buffer(char *s);
-void		reset_parse_buffer(void);
-int			read_parse_buffer(void);
-char	   *parse_buffer(void);
-char	   *parse_buffer_ptr(void);
-unsigned int parse_buffer_curr_char(void);
-unsigned int parse_buffer_size(void);
-unsigned int parse_buffer_pos(void);
-
-extern void seg_flush_scanner_buffer(void);		/* defined in segscan.l */
-
-void
-set_parse_buffer(char *s)
-{
-	PARSE_BUFFER = s;
-	PARSE_BUFFER_SIZE = strlen(s);
-	if (PARSE_BUFFER_SIZE == 0)
-		elog(ERROR, "seg_in: can't parse an empty string");
-	PARSE_BUFFER_PTR = PARSE_BUFFER;
-	SCANNER_POS = 0;
-}
-
-void
-reset_parse_buffer(void)
-{
-	PARSE_BUFFER_PTR = PARSE_BUFFER;
-	SCANNER_POS = 0;
-	seg_flush_scanner_buffer();
-}
-
-int
-read_parse_buffer(void)
-{
-	int			c;
-
-	/*
-	 * c = *PARSE_BUFFER_PTR++; SCANNER_POS++;
-	 */
-	c = PARSE_BUFFER[SCANNER_POS];
-	if (SCANNER_POS < PARSE_BUFFER_SIZE)
-		SCANNER_POS++;
-	return c;
-}
-
-char *
-parse_buffer(void)
-{
-	return PARSE_BUFFER;
-}
-
-unsigned int
-parse_buffer_curr_char(void)
-{
-	return PARSE_BUFFER[SCANNER_POS];
-}
-
-char *
-parse_buffer_ptr(void)
-{
-	return PARSE_BUFFER_PTR;
-}
-
-unsigned int
-parse_buffer_pos(void)
-{
-	return SCANNER_POS;
-}
-
-unsigned int
-parse_buffer_size(void)
-{
-	return PARSE_BUFFER_SIZE;
-}
diff --git a/contrib/seg/buffer.h b/contrib/seg/buffer.h
deleted file mode 100644
index eef9124dac..0000000000
--- a/contrib/seg/buffer.h
+++ /dev/null
@@ -1,8 +0,0 @@
-extern void set_parse_buffer(char *s);
-extern void reset_parse_buffer(void);
-extern int	read_parse_buffer(void);
-extern char *parse_buffer(void);
-extern char *parse_buffer_ptr(void);
-extern unsigned int parse_buffer_curr_char(void);
-extern unsigned int parse_buffer_pos(void);
-extern unsigned int parse_buffer_size(void);
diff --git a/contrib/seg/data/test_seg.data b/contrib/seg/data/test_seg.data
deleted file mode 100644
index dba9ac9045..0000000000
--- a/contrib/seg/data/test_seg.data
+++ /dev/null
@@ -1,2577 +0,0 @@
-...10.3
-...10.5
-...3.5
-...3.9
-...4.9
-...40
-...5.6
-...5.8
-...6.0
-...6.6
-...6.7
-...6.75
-...7.0
-...7.2
-...7.3
-...7.5
-...7.6
-...7.8
-...8.0
-...8.5
-...8.6
-...8.8
-...8.9
-...9.0
-...9.2
-...9.3
-...9.5
-...9.6
-...90
-...<3.0
-...<5.8
-...<7
-...<7.0
-...<8.0
-...<8.2
-...<8.9
-...>10
-...>7.2
-...>7.7
-...>8.0
-...>82
-...>9.0
-< 1.0...3.8
-< 1.5...4.1
-< 1.5...4.15
-< 10...>11.6
-< 2...>4
-< 2.0...3.4
-< 2.0...4.2
-< 2.0...>8.0
-< 2.5...4.7
-< 2.5...5.5
-< 2.5...>8.5
-< 3...>5
-< 3.0...
-< 3.0...4.5
-< 3.0...6.0
-< 3.0...6.5
-< 3.0...9.0
-< 3.0...>10
-< 3.0...>11.0
-< 3.0...>8.0
-< 3.0...>9.0
-< 3.0...>9.5
-< 3.5
-< 3.5...4.3
-< 3.5...5.3
-< 3.5...5.6
-< 3.5...6.0
-< 3.5...8.4
-< 3.6...>6.5
-< 3.7...5.4
-< 4...9.5
-< 4...>5
-< 4...>6.0
-< 4.0...
-< 4.0...10.5
-< 4.0...5.3
-< 4.0...5.75
-< 4.0...6.0
-< 4.0...7.3
-< 4.0...7.5
-< 4.0...7.7
-< 4.0...8.5
-< 4.0...>12
-< 4.0...>5.0
-< 4.0...>6.0
-< 4.0...>7.5
-< 4.0...>8.0
-< 4.0...>8.1
-< 4.0...>9.0
-< 4.2...5.2
-< 4.2...5.3
-< 4.2...5.4
-< 4.2...6.2
-< 4.3...>9.0
-< 4.4
-< 4.4...6.0
-< 4.4...<6.0
-< 4.5...6.3
-< 4.5...7.2
-< 4.5...>12
-< 4.5...>5.0
-< 4.5...>5.5
-< 4.5...>6
-< 4.5...>7.5
-< 4.5...>8
-< 4.5...>9.5
-< 4.7...>9.3
-< 4.8...>6.4
-< 5...7.5
-< 5...7.7
-< 5...>7
-< 5...>8
-< 5...>8.0
-< 5.0
-< 5.0...10
-< 5.0...6.3
-< 5.0...7.4
-< 5.0...7.7
-< 5.0...8.1
-< 5.0...8.3
-< 5.0...8.5
-< 5.0...8.8
-< 5.0...9.5
-< 5.0...<9.0
-< 5.0...>10
-< 5.0...>10.0
-< 5.0...>10.5
-< 5.0...>11
-< 5.0...>6.0
-< 5.0...>6.6
-< 5.0...>7.5
-< 5.0...>8.0
-< 5.0...>8.5
-< 5.0...>8.6
-< 5.0...>9.0
-< 5.2...7.3
-< 5.2...8.2
-< 5.2...8.5
-< 5.2...>5.8
-< 5.2...>7.6
-< 5.3
-< 5.3...6.5
-< 5.3...7.5
-< 5.3...7.8
-< 5.4...6.35
-< 5.5...10
-< 5.5...6.3
-< 5.5...7.0
-< 5.5...7.5
-< 5.5...8.4
-< 5.5...8.5
-< 5.5...>10
-< 5.5...>10.0
-< 5.5...>10.5
-< 5.5...>6.5
-< 5.5...>7
-< 5.5...>7.5
-< 5.5...>8
-< 5.5...>8.0
-< 5.5...>8.5
-< 5.5...>8.7
-< 5.5...>8.9
-< 5.5...>9.0
-< 5.6...6.75
-< 5.75...>9.0
-< 5.8...7.8
-< 5.8...>11
-< 5.8...>8.2
-< 5.9...>8.0
-< 6...>10.5
-< 6...>8
-< 6...>9.5
-< 6.0
-< 6.0...6.8
-< 6.0...7.15
-< 6.0...7.6
-< 6.0...7.7
-< 6.0...8.0
-< 6.0...8.2
-< 6.0...8.5
-< 6.0...9.0
-< 6.0...9.5
-< 6.0...>10
-< 6.0...>10.0
-< 6.0...>11
-< 6.0...>7.0
-< 6.0...>8.0
-< 6.0...>8.2
-< 6.0...>8.5
-< 6.0...>8.6
-< 6.0...>9.0
-< 6.0...>9.6
-< 6.3...9.5
-< 6.3...>6.7
-< 6.3...>7.8
-< 6.35...>7.7
-< 6.4...>8.0
-< 6.4...>8.7
-< 6.5...11
-< 6.5...7.25
-< 6.5...8.0
-< 6.5...8.2
-< 6.5...8.4
-< 6.5...8.5
-< 6.5...9.7
-< 6.5...>10.0
-< 6.5...>10.5
-< 6.5...>7.5
-< 6.5...>8.0
-< 6.5...>8.5
-< 6.5...>8.6
-< 6.5...>8.7
-< 6.5...>9.0
-< 6.5...>9.5
-< 6.6...>7.5
-< 6.6...>8.5
-< 6.8...7.8
-< 6.8...9.5
-< 6.8...>7.5
-< 6.8...>8.6
-< 6.8...>9.0
-< 6.9...9.0
-< 7...9.2
-< 7...>11
-< 7...>7.5
-< 7...>9.5
-< 7.0
-< 7.0...10
-< 7.0...10.5
-< 7.0...11.0
-< 7.0...8.2
-< 7.0...8.3
-< 7.0...8.4
-< 7.0...8.55
-< 7.0...8.7
-< 7.0...8.8
-< 7.0...9.0
-< 7.0...<8.0
-< 7.0...>10.5
-< 7.0...>11
-< 7.0...>11.0
-< 7.0...>7.0
-< 7.0...>7.3
-< 7.0...>7.4
-< 7.0...>7.5
-< 7.0...>7.75
-< 7.0...>7.8
-< 7.0...>8.0
-< 7.0...>8.2
-< 7.0...>8.5
-< 7.0...>8.6
-< 7.0...>8.9
-< 7.0...>9.0
-< 7.0...>9.5
-< 7.2...8.3
-< 7.2...>7.5
-< 7.2...>7.8
-< 7.2...>8.0
-< 7.2...>8.2
-< 7.2...>8.6
-< 7.2...>8.8
-< 7.4...>7.8
-< 7.4...>8.0
-< 7.4...>8.1
-< 7.4...>8.6
-< 7.4...>8.8
-< 7.5...9.0
-< 7.5...>10
-< 7.5...>8.0
-< 7.5...>8.5
-< 7.5...>8.7
-< 7.5...>9
-< 7.5...>9.0
-< 7.5...>9.5
-< 7.6...>7.8
-< 7.6...>8.0
-< 7.6...>8.5
-< 7.6...>8.6
-< 7.6...>8.9
-< 7.8...>9.0
-< 7.9...>8.3
-< 8.0
-< 8.0...>10.0
-< 8.0...>8.5
-< 8.0...>9.0
-< 8.0...>9.4
-< 8.0...>9.5
-< 8.2...9.8
-< 8.2...>8.6
-< 8.5...>10.5
-< 8.5...>11
-< 8.5...>9.5
-< 9...10.5
-<1.0...3.5
-<1.0...3.7
-<1.0...4.0
-<1.0...>13.0
-<1.0...>5.5
-<10.5...11.5
-<12.0...12.5
-<2...10
-<2...>4
-<2.0
-<2.0...11
-<2.0...3.5
-<2.0...5.7
-<2.0...6.0
-<2.0...6.8
-<2.0...9.7
-<2.0...>6.5
-<2.0...>9.0
-<2.3...
-<2.3...>11.0
-<2.4...6.8
-<2.5...7.7
-<2.5...>8.0
-<2.8...>8.0
-<3.0...4.6
-<3.0...5.5
-<3.0...6.0
-<3.0...6.3
-<3.0...6.4
-<3.0...6.8
-<3.0...7.0
-<3.0...7.5
-<3.0...8.3
-<3.0...>10.5
-<3.0...>5.0
-<3.0...>7.0
-<3.0...>7.2
-<3.0...>8.5
-<3.0...>8.7
-<3.0...>9.0
-<3.5...6.0
-<3.5...8.0
-<3.5...<7.0
-<3.5...>10.0
-<3.55...5.3
-<3.7...4.9
-<3.7...5.0
-<4...6.5
-<4.0...10.0
-<4.0...10.5
-<4.0...6.1
-<4.0...6.3
-<4.0...6.5
-<4.0...7.7
-<4.0...8.2
-<4.0...<9.0
-<4.0...>10
-<4.0...>10.0
-<4.0...>10.5
-<4.0...>6.0
-<4.0...>8.0
-<4.0...>9.0
-<4.1...>8.0
-<4.3...7.6
-<4.5...6.3
-<4.5...6.5
-<4.5...>6.5
-<4.5...>9.5
-<4.8...>7.4
-<4.9...>9.5
-<5...>6
-<5...>6.0
-<5...>8
-<5.0...10.0
-<5.0...6.0
-<5.0...6.6
-<5.0...6.8
-<5.0...7.0
-<5.0...7.5
-<5.0...8.2
-<5.0...9.5
-<5.0...>11.0
-<5.0...>5.5
-<5.0...>7.0
-<5.0...>8.0
-<5.0...>9.0
-<5.2...7.5
-<5.2...>6.8
-<5.2...>8.0
-<5.3...10.2
-<5.3...>10.5
-<5.4...8.0
-<5.4...8.5
-<5.4...>8.2
-<5.4...>9.1
-<5.5...6.5
-<5.5...7.0
-<5.5...7.5
-<5.5...8.2
-<5.5...8.3
-<5.5...8.5
-<5.5...8.6
-<5.5...>10.0
-<5.5...>7.0
-<5.5...>7.5
-<5.5...>8.0
-<5.5...>8.5
-<5.5...>9.0
-<5.6...7.5
-<5.6...>6.4
-<5.6...>7.4
-<5.6...>8.0
-<5.6...>8.5
-<5.7...>7.1
-<5.8...7.4
-<5.8...>6.7
-<5.8...>6.8
-<5.8...>7.0
-<5.8...>7.8
-<5.8...>8.8
-<5.85...>9.5
-<6...>9
-<6.0...10.0
-<6.0...6.8
-<6.0...7.1
-<6.0...7.2
-<6.0...7.7
-<6.0...8.0
-<6.0...8.2
-<6.0...8.4
-<6.0...8.5
-<6.0...8.6
-<6.0...9.1
-<6.0...9.2
-<6.0...9.3
-<6.0...9.5
-<6.0...>10
-<6.0...>11.0
-<6.0...>7.0
-<6.0...>7.5
-<6.0...>7.6
-<6.0...>7.9
-<6.0...>8.0
-<6.0...>8.3
-<6.0...>8.5
-<6.0...>8.6
-<6.0...>9.0
-<6.0...>9.2
-<6.0...>9.5
-<6.1...8.4
-<6.1...>6.6
-<6.1...>8.1
-<6.2
-<6.2...6.9
-<6.2...8.3
-<6.2...>7.5
-<6.2...>8.5
-<6.2...>8.7
-<6.3...10.0
-<6.3...7.4
-<6.3...9.6
-<6.3...>7.0
-<6.3...>8.0
-<6.4...7.6
-<6.4...8.5
-<6.4...>8.5
-<6.4...>9.0
-<6.5...7.8
-<6.5...8.2
-<6.5...9.2
-<6.5...>7.0
-<6.5...>7.5
-<6.5...>8.0
-<6.5...>8.5
-<6.5...>8.7
-<6.5...>9.0
-<6.5...>9.5
-<6.6
-<6.6...8.0
-<6.8...8.0
-<6.8...8.2
-<6.8...>7.5
-<6.8...>8.5
-<6.8...>9.5
-<7...9
-<7...>10
-<7.0...7.5
-<7.0...9.0
-<7.0...9.0
-<7.0...9.4
-<7.0...9.5
-<7.0...9.5
-<7.0...>10
-<7.0...>10.0
-<7.0...>11.5
-<7.0...>7.5
-<7.0...>8.0
-<7.0...>8.3
-<7.0...>8.4
-<7.0...>8.5
-<7.0...>9.0
-<7.2...8.8
-<7.2...9.0
-<7.2...>8.2
-<7.2...>8.8
-<7.2...>9.5
-<7.3...>8.0
-<7.4...8.8
-<7.4...9.6
-<7.4...>8.5
-<7.4...>8.7
-<7.5...8.5
-<7.5...<9.0
-<7.5...>8.0
-<7.5...>8.5
-<7.5...>9.5
-<7.6...>8.4
-<7.6...>9.4
-<7.8...>10.2
-<7.8...>8.2
-<8.0
-<8.0...10.0
-<8.0...>8.5
-<8.0...>8.8
-<8.0...>9.0
-<8.2...>10.2
-<8.5...9.6
-<8.5...>9.0
-<8.5...>9.5
-<8.6...>10.6
-<9.1...10.3
-<9.2...>11.0
-<9.5...12
-<9.5...>12.2
-> 11.0
-> 3.0...<7.0
-> 4.0...<10.0
-> 4.0...<9.0
-> 4.5...<9.0
-> 5.0
-> 5.0...<10.0
-> 5.0...<11
-> 5.5...
-> 5.6
-> 5.9...<9.5
-> 6.0...8.0
-> 6.0...<11.5
-> 6.0...<8.0
-> 6.0...>10.0
-> 6.2...<7.4
-> 7.0...<10
-> 7.0...>8.5
-> 7.0...>8.6
-> 7.0...>8.7
-> 7.15...
-> 8.0
-> 8.7
-> 9.3
-> 9.5
->10.5
->120
->2.3...
->3.0...<7.0
->3.8...<8.0
->4.0...<10
->5.0...<7.0
->5.0...>8.0
->5.0...>9.2
->5.25...6.5
->5.5...>9.3
->5.6...<8.2
->6.0...>11.0
->6.5...>8.0
->6.6...<7.3
->6.8...>8.5
->6.9...>8.0
->7.0
->7.0...<9.0
->7.0...<9.5
->7.3...
->7.5...<10.5
->8.0
->8.4
->8.5
->9.0
->9.4
->9.5
->95
-~10
-~23
-~5.0...>9.0
-~6.0
-~6.4...~8.5
-~6.8
-~7.0
-~7.5
-~8.0
-~8.0...~10.0
-1.0
-1.0...4.0
-1.0...5.0
-1.1
-1.1...3.6
-1.2...3.2
-1.2...3.5
-1.3...12.0
-1.4...2.0
-1.4...8.2
-1.5
-1.5...10.5
-1.5...4.2
-1.5...4.5
-1.6...3.8
-1.6...7.2
-1.7
-1.7...2.4
-1.7...3.2
-1.7...5.0
-1.7...5.7
-1.8
-1.8...3.8
-1.8...>9.0
-1.9...3.6
-2
-2.0
-2.0...10.0
-2.0...11.0
-2.0...11.5
-2.0...2.5
-2.0...3.2
-2.0...3.5
-2.0...4.0
-2.0...4.3
-2.0...4.4
-2.0...4.6
-2.0...4.75
-2.0...4.8
-2.0...5.0
-2.0...5.5
-2.0...6.5
-2.0...7.0
-2.0...7.5
-2.0...8.0
-2.0...9.0
-2.0...>10
-2.0...>4.0
-2.0...>5.5
-2.1
-2.1...11.8
-2.1...4.2
-2.2
-2.2...11.2
-2.2...4.1
-2.2...4.2
-2.2...5.9
-2.2...6.4
-2.2...6.8
-2.3...10.6
-2.3...4.1
-2.3...4.3
-2.3...4.5
-2.3...4.7
-2.3...6.0
-2.4
-2.4...11.3
-2.4...4.5
-2.4...5.6
-2.4...5.7
-2.4...6.3
-2.5
-2.5...11
-2.5...11.2
-2.5...11.5
-2.5...11.8
-2.5...3.0
-2.5...3.7
-2.5...4.1
-2.5...4.5
-2.5...4.6
-2.5...5.0
-2.5...5.1
-2.5...5.5
-2.5...6.0
-2.5...6.3
-2.5...7.0
-2.5...9.0
-2.5...>3.5
-2.5...>4.0
-2.52
-2.56
-2.6...
-2.6...10.0
-2.6...9.3
-2.6...>4.0
-2.6...>9.4
-2.62
-2.7
-2.7...12.0
-2.7...3.7
-2.7...3.8
-2.7...4.5
-2.7...4.7
-2.7...6.0
-2.7...6.4
-2.7...7.0
-2.7...8.0
-2.75...5.25
-2.79
-2.8
-2.8...11.0
-2.8...3.4
-2.8...4.0
-2.8...7.0
-2.8...8.0
-2.8...9.0
-2.8...9.7
-2.9...3.7
-2.9...4.5
-2.9...5.0
-2.9...5.6
-2.9...6.1
-2.9...7.6
-2.9...9.0
-2.97
-3
-3...10.0
-3...10.5
-3...5.5
-3...58
-3...6
-3...8
-3.0
-3.0...10
-3.0...10.0
-3.0...10.5
-3.0...11.0
-3.0...3.5
-3.0...4.0
-3.0...4.5
-3.0...4.9
-3.0...5.0
-3.0...5.4
-3.0...5.6
-3.0...5.65
-3.0...6.0
-3.0...6.3
-3.0...6.5
-3.0...6.7
-3.0...6.9
-3.0...7.0
-3.0...7.2
-3.0...7.5
-3.0...8.0
-3.0...8.5
-3.0...8.7
-3.0...9.0
-3.0...9.7
-3.0...>10
-3.0...>10.0
-3.0...>8.0
-3.00...5.0
-3.1
-3.1...11.5
-3.1...5.2
-3.1...5.8
-3.1...6.8
-3.1...7.8
-3.15...7.25
-3.2
-3.2...10.0
-3.2...4.2
-3.2...4.6
-3.2...5.4
-3.2...5.8
-3.2...6.25
-3.2...6.8
-3.2...8.1
-3.2...>8.0
-3.2...>9.9
-3.22
-3.3
-3.3...4.7
-3.3...5.3
-3.3...5.5
-3.3...5.6
-3.3...6.0
-3.3...6.5
-3.3...6.7
-3.3...7.2
-3.3...7.4
-3.3...7.5
-3.3...7.8
-3.3...9.0
-3.4
-3.4...4.1
-3.4...4.7
-3.4...5.5
-3.4...6.2
-3.4...6.4
-3.4...8.2
-3.4...>8.0
-3.5
-3.5...10
-3.5...10.0
-3.5...10.5
-3.5...10.8
-3.5...11.0
-3.5...11.5
-3.5...12.2
-3.5...4.0
-3.5...4.4
-3.5...4.5
-3.5...5.0
-3.5...5.3
-3.5...5.5
-3.5...5.6
-3.5...6
-3.5...6.0
-3.5...6.3
-3.5...6.4
-3.5...6.5
-3.5...6.6
-3.5...6.7
-3.5...7.0
-3.5...7.2
-3.5...7.3
-3.5...7.5
-3.5...8.5
-3.5...8.6
-3.5...8.7
-3.5...9.0
-3.5...9.5
-3.5...>11.0
-3.5...>5.0
-3.5...>8.5
-3.5...>9.0
-3.6
-3.6...3.8
-3.6...4.55
-3.6...4.6
-3.6...4.8
-3.6...5.4
-3.6...5.5
-3.6...6
-3.6...6.0
-3.6...6.6
-3.6...6.8
-3.6...7.0
-3.6...7.7
-3.6...8.6
-3.6...8.7
-3.6...8.8
-3.7
-3.7...10.0
-3.7...10.6
-3.7...4.6
-3.7...5.3
-3.7...6.2
-3.7...6.3
-3.7...6.5
-3.7...6.7
-3.7...8.2
-3.7...8.3
-3.7...9.1
-3.7...>10
-3.7...>11
-3.75...5.7
-3.8
-3.8...10
-3.8...4.0
-3.8...4.5
-3.8...4.8
-3.8...5.5
-3.8...5.8
-3.8...5.9
-3.8...6.2
-3.8...7.7
-3.8...8.3
-3.8...8.7
-3.9
-3.9...5.5
-3.9...6.8
-3.9...7.8
-3.9...>7.5
-3.9...>8.5
-3.9...>9.0
-3.95
-4
-4...10
-4...11.0
-4...12
-4...5
-4...6.9
-4...7
-4...7.5
-4...8
-4...9
-4...>11
-4...>8
-4.0
-4.0...
-4.0...10
-4.0...10.0
-4.0...10.4
-4.0...10.5
-4.0...11.0
-4.0...11.7
-4.0...12.5
-4.0...13.0
-4.0...4.4
-4.0...4.5
-4.0...4.8
-4.0...5.0
-4.0...5.1
-4.0...5.2
-4.0...5.5
-4.0...5.7
-4.0...5.75
-4.0...5.8
-4.0...6.0
-4.0...6.1
-4.0...6.2
-4.0...6.3
-4.0...6.5
-4.0...60
-4.0...7.0
-4.0...7.2
-4.0...7.3
-4.0...7.5
-4.0...7.7
-4.0...7.9
-4.0...8.0
-4.0...8.1
-4.0...8.2
-4.0...8.3
-4.0...8.5
-4.0...8.8
-4.0...9.0
-4.0...9.4
-4.0...>10
-4.0...>11
-4.0...>9.0
-4.1
-4.1...10.5
-4.1...5.6
-4.1...5.8
-4.1...6.0
-4.1...7.2
-4.1...8.0
-4.1...9.1
-4.15...5.25
-4.15...6.25
-4.15...6.5
-4.2
-4.2...11.0
-4.2...11.5
-4.2...11.7
-4.2...5.0
-4.2...5.3
-4.2...5.35
-4.2...5.4
-4.2...5.6
-4.2...5.7
-4.2...6.0
-4.2...6.3
-4.2...6.4
-4.2...6.7
-4.2...7.1
-4.2...7.2
-4.2...7.3
-4.2...8.0
-4.2...8.4
-4.2...9.5
-4.2...>7.0
-4.2...>7.3
-4.2...>9.0
-4.2...>9.5
-4.25
-4.25...5.00
-4.25...9.75
-4.3
-4.3...10.3
-4.3...5.3
-4.3...5.7
-4.3...5.8
-4.3...6.0
-4.3...6.3
-4.3...6.5
-4.3...6.8
-4.3...7.0
-4.3...7.2
-4.3...7.3
-4.3...7.5
-4.3...7.6
-4.3...8
-4.3...8.2
-4.3...8.5
-4.3...8.6
-4.3...>5.0
-4.3...>6.0
-4.3...>7.0
-4.3...>8.0
-4.35
-4.4
-4.4...10.7
-4.4...4.6
-4.4...4.8
-4.4...6.0
-4.4...6.2
-4.4...6.4
-4.4...6.6
-4.4...6.7
-4.4...7.0
-4.4...7.2
-4.4...7.5
-4.4...7.6
-4.4...8.5
-4.4...9.3
-4.5
-4.5...10
-4.5...10.0
-4.5...10.5
-4.5...11.0
-4.5...11.5
-4.5...115
-4.5...12.5
-4.5...4.8
-4.5...5.0
-4.5...5.2
-4.5...5.5
-4.5...5.7
-4.5...5.8
-4.5...6.0
-4.5...6.2
-4.5...6.4
-4.5...6.5
-4.5...6.8
-4.5...7
-4.5...7.0
-4.5...7.1
-4.5...7.3
-4.5...7.5
-4.5...7.6
-4.5...7.7
-4.5...7.8
-4.5...7.9
-4.5...8.0
-4.5...8.3
-4.5...8.5
-4.5...8.6
-4.5...8.7
-4.5...8.8
-4.5...8.9
-4.5...9.0
-4.5...9.3
-4.5...9.4
-4.5...9.5
-4.5...<12
-4.5...>10
-4.5...>12
-4.5...>6.0
-4.5...>7.0
-4.5...>7.5
-4.5...>8.0
-4.5...>8.5
-4.5...>9.0
-4.6
-4.6 
-4.6...4.8
-4.6...5.0
-4.6...5.2
-4.6...6.3
-4.6...6.4
-4.6...6.5
-4.6...6.6
-4.6...7.0
-4.6...7.2
-4.6...7.4
-4.6...7.5
-4.6...8.2
-4.6...8.5
-4.6...8.6
-4.6...8.7
-4.6...<6.5
-4.6...>10
-4.6...>11
-4.6...>7.4
-4.6...>8.0
-4.6...~7.0
-4.7
-4.7...10.8
-4.7...11
-4.7...11.8
-4.7...5.6
-4.7...6.0
-4.7...6.2
-4.7...6.3
-4.7...6.6
-4.7...6.7
-4.7...7.0
-4.7...7.4
-4.7...7.5
-4.7...7.7
-4.7...7.8
-4.7...8.0
-4.7...8.3
-4.7...8.4
-4.7...8.5
-4.7...9.3
-4.7...9.5
-4.7...9.6
-4.7...9.7
-4.7...>10
-4.7...>10.0
-4.7...>10.5
-4.7...>6.5
-4.7...>8.0
-4.75
-4.8
-4.8...
-4.8...10.3
-4.8...11.5
-4.8...11.6
-4.8...12.5
-4.8...5.2
-4.8...5.9
-4.8...6.0
-4.8...6.2
-4.8...6.3
-4.8...7.0
-4.8...7.3
-4.8...7.4
-4.8...7.5
-4.8...7.6
-4.8...7.7
-4.8...7.75
-4.8...8.0
-4.8...8.2
-4.8...8.4
-4.8...8.6
-4.8...9.0
-4.8...9.3
-4.8...9.7
-4.8...>10.0
-4.8...>8.0
-4.8...>9.0
-4.85
-4.9
-4.9...
-4.9...6.5
-4.9...7.2
-4.9...7.8
-4.9...8.2
-4.9...8.3
-4.9...9.0
-4.9...9.5
-4.9...<6.0
-4.9...>12
-4.9...>7.5
-4.9...>9.5
-5
-5...10.0
-5...10.5
-5...11
-5...11.5
-5...12
-5...30
-5...6
-5...6.6
-5...7
-5...8
-5...8.5
-5...9
-5...9.5
-5.0
-5.0...10
-5.0...10.0
-5.0...10.2
-5.0...10.3
-5.0...10.5
-5.0...11
-5.0...11.0
-5.0...11.2
-5.0...11.4
-5.0...11.5
-5.0...11.6
-5.0...11.7
-5.0...12.0
-5.0...5.5
-5.0...5.7
-5.0...6.0
-5.0...6.1
-5.0...6.2
-5.0...6.4
-5.0...6.5
-5.0...6.6
-5.0...6.8
-5.0...6.9
-5.0...7.0
-5.0...7.2
-5.0...7.3
-5.0...7.4
-5.0...7.5
-5.0...7.6
-5.0...7.7
-5.0...7.8
-5.0...8.0
-5.0...8.2
-5.0...8.3
-5.0...8.4
-5.0...8.5
-5.0...8.6
-5.0...8.7
-5.0...9.0
-5.0...9.0 
-5.0...9.2
-5.0...9.5
-5.0...>10
-5.0...>10.0
-5.0...>11
-5.0...>12
-5.0...>12.0
-5.0...>7.0
-5.0...>8.0
-5.0...>8.4
-5.0...>8.5
-5.0...>9.0
-5.02...6.74
-5.1
-5.1...5.3
-5.1...5.4
-5.1...6.2
-5.1...6.3
-5.1...6.4
-5.1...6.6
-5.1...6.8
-5.1...7.0
-5.1...7.2
-5.1...7.3
-5.1...7.8
-5.1...8.0
-5.1...8.3
-5.1...8.7
-5.1...>7.0
-5.15
-5.2
-5.2...10.0
-5.2...10.8
-5.2...11.5
-5.2...5.3
-5.2...5.5
-5.2...5.7
-5.2...6.0
-5.2...6.2
-5.2...6.4
-5.2...6.7
-5.2...6.8
-5.2...6.9
-5.2...7.0
-5.2...7.3
-5.2...7.4
-5.2...7.5
-5.2...7.6
-5.2...7.7
-5.2...7.9
-5.2...8.0
-5.2...8.2
-5.2...8.4
-5.2...8.5
-5.2...8.7
-5.2...8.8
-5.2...9.0
-5.2...9.5
-5.2...9.6
-5.2...9.7
-5.2...9.9
-5.2...>10.0
-5.2...>11
-5.2...>12
-5.2...>6.5
-5.2...>7.0
-5.2...>7.5
-5.2...>8
-5.2...>8.0
-5.25...7.5
-5.25...8.5
-5.25...>12
-5.3
-5.3...
-5.3...10.0
-5.3...10.1
-5.3...10.2
-5.3...10.5
-5.3...10.6
-5.3...11.5
-5.3...13
-5.3...5.5
-5.3...5.8
-5.3...7.0
-5.3...7.2
-5.3...7.4
-5.3...7.5
-5.3...7.6
-5.3...7.8
-5.3...8.0
-5.3...8.2
-5.3...8.3
-5.3...8.6
-5.3...8.7
-5.3...8.8
-5.3...8.9
-5.3...9.0
-5.3...9.3
-5.3...9.5
-5.3...9.7
-5.3...9.9
-5.3...>7.8
-5.3...>9.0
-5.3...>90
-5.35
-5.4
-5.4...
-5.4...10
-5.4...10.5
-5.4...5.8
-5.4...6.8
-5.4...7.0
-5.4...7.1
-5.4...7.2
-5.4...7.3
-5.4...7.7
-5.4...7.8
-5.4...8.2
-5.4...8.5
-5.4...9.4
-5.4...>10.0
-5.4...>11.0
-5.4...>9.0
-5.45
-5.5
-5.5...
-5.5...10.0
-5.5...10.2
-5.5...10.5
-5.5...11
-5.5...11.5
-5.5...11.7
-5.5...12
-5.5...12.5
-5.5...13.5
-5.5...5.6
-5.5...5.7
-5.5...5.8
-5.5...6
-5.5...6.0
-5.5...6.2
-5.5...6.3
-5.5...6.5
-5.5...6.7
-5.5...6.8
-5.5...7.0
-5.5...7.1
-5.5...7.2
-5.5...7.3
-5.5...7.4
-5.5...7.5
-5.5...7.6
-5.5...7.7
-5.5...7.9
-5.5...8.0
-5.5...8.1
-5.5...8.2
-5.5...8.5
-5.5...8.6
-5.5...8.7
-5.5...9.0
-5.5...9.1
-5.5...9.3
-5.5...9.5
-5.5...9.7
-5.5...<6.8
-5.5...>10
-5.5...>10.0
-5.5...>11
-5.5...>11.0
-5.5...>12
-5.5...>7.0
-5.5...>8.0
-5.5...>9.0
-5.5...>9.5
-5.55
-5.55...7.8
-5.56
-5.6
-5.6...10
-5.6...10.1
-5.6...6.0
-5.6...6.2
-5.6...6.4
-5.6...6.6
-5.6...7.0
-5.6...7.1
-5.6...7.2
-5.6...7.3
-5.6...7.4
-5.6...7.5
-5.6...7.6
-5.6...7.7
-5.6...8.0
-5.6...8.3
-5.6...8.4
-5.6...8.5
-5.6...8.75
-5.6...8.8
-5.6...9
-5.6...9.0
-5.6...9.4
-5.6...9.5
-5.6...9.6
-5.6...>11
-5.6...>7.0
-5.6...>7.5
-5.6...>8.0
-5.6...>9.0
-5.65
-5.7
-5.7...
-5.7...10
-5.7...10.0
-5.7...11
-5.7...6.0
-5.7...6.2
-5.7...6.3
-5.7...6.5
-5.7...6.8
-5.7...7.0
-5.7...7.2
-5.7...7.3
-5.7...7.5
-5.7...7.6
-5.7...7.65
-5.7...7.7
-5.7...7.8
-5.7...7.9
-5.7...8.0
-5.7...8.4
-5.7...8.5
-5.7...8.7
-5.7...8.9
-5.7...9.0
-5.7...9.2
-5.7...9.4
-5.7...9.7
-5.7...>10.0
-5.7...>11
-5.7...>6.6
-5.7...>7.2
-5.7...>8.5
-5.7...>9.0
-5.73
-5.75
-5.75...7.3
-5.8
-5.8...10.0
-5.8...11
-5.8...6.0
-5.8...6.2
-5.8...6.5
-5.8...6.7
-5.8...6.8
-5.8...6.9
-5.8...7.0
-5.8...7.2
-5.8...7.3
-5.8...7.4
-5.8...7.5
-5.8...7.6
-5.8...7.7
-5.8...7.8
-5.8...8.0
-5.8...8.1
-5.8...8.2
-5.8...8.3
-5.8...8.4
-5.8...8.5
-5.8...8.6
-5.8...8.8
-5.8...9.0
-5.8...9.2
-5.8...9.3
-5.8...9.8
-5.8...>10.5
-5.8...>11
-5.8...>6.7
-5.8...>6.8
-5.8...>8.0
-5.8...>9.0
-5.85
-5.87
-5.9
-5.9...
-5.9...10.2
-5.9...6.0
-5.9...6.5
-5.9...7.3
-5.9...7.5
-5.9...7.7
-5.9...8.0
-5.9...8.2
-5.9...8.3
-5.9...8.4
-5.9...8.5
-5.9...8.7
-5.9...9.0
-5.9...>7.0
-5.9...>8.5
-5.92
-5.95...8.0
-6
-6...10
-6...11
-6...11.5
-6...6.5
-6...8
-6...8.0
-6...8.5
-6...9
-6...9.2
-6...9.3
-6...>10
-6...>12
-6...>7.2
-6...>8
-6.0
-6.0 
-6.0...10
-6.0...10.0
-6.0...10.2
-6.0...10.3
-6.0...10.4
-6.0...10.5
-6.0...11
-6.0...11.0
-6.0...11.5
-6.0...13
-6.0...6.2
-6.0...6.3
-6.0...6.4
-6.0...6.5
-6.0...6.6
-6.0...6.7
-6.0...6.8
-6.0...7.0
-6.0...7.2
-6.0...7.3
-6.0...7.4
-6.0...7.5
-6.0...7.6
-6.0...7.7
-6.0...7.8
-6.0...8.0
-6.0...8.1
-6.0...8.2
-6.0...8.3
-6.0...8.4
-6.0...8.5
-6.0...8.5 
-6.0...8.6
-6.0...8.7
-6.0...8.9
-6.0...9.0
-6.0...9.1
-6.0...9.2
-6.0...9.3
-6.0...9.4
-6.0...9.5
-6.0...9.7
-6.0...9.8
-6.0...9.9
-6.0...>10.0
-6.0...>10.5
-6.0...>11
-6.0...>7.0
-6.0...>7.5
-6.0...>8.0
-6.0...>8.2
-6.0...>8.5
-6.0...>8.7
-6.0...>9.0
-6.0...>9.5
-6.01
-6.1
-6.1...
-6.1...10
-6.1...10.8
-6.1...6.2
-6.1...6.6
-6.1...6.8
-6.1...6.9
-6.1...7.0
-6.1...7.2
-6.1...7.5
-6.1...7.6
-6.1...7.7
-6.1...7.8
-6.1...7.9
-6.1...8.0
-6.1...8.2
-6.1...8.5
-6.1...8.7
-6.1...8.9
-6.1...9.0
-6.1...9.3
-6.1...9.4
-6.1...>12
-6.1...>8.0
-6.1...>8.2
-6.1...>8.5
-6.1...>9.0
-6.1...>9.5
-6.15
-6.18
-6.2
-6.2...10
-6.2...10.0
-6.2...10.5
-6.2...11
-6.2...6.4
-6.2...6.5
-6.2...6.8
-6.2...6.9
-6.2...7.0
-6.2...7.2
-6.2...7.4
-6.2...7.5
-6.2...7.6
-6.2...7.7
-6.2...7.8
-6.2...8.0
-6.2...8.1
-6.2...8.2
-6.2...8.3
-6.2...8.4
-6.2...8.5
-6.2...8.6
-6.2...8.7
-6.2...8.8
-6.2...9.0
-6.2...9.1
-6.2...9.2
-6.2...9.5
-6.2...9.7
-6.2...9.8
-6.2...>10.5
-6.2...>11.5
-6.2...>7.1
-6.2...>7.8
-6.2...>8.0
-6.2...>9.0
-6.2...>9.5
-6.23...8.07
-6.24
-6.25
-6.25...7.5
-6.25...>9.0
-6.3
-6.3...
-6.3...10.0
-6.3...10.2
-6.3...10.4
-6.3...10.5
-6.3...6.4
-6.3...6.5
-6.3...6.6
-6.3...6.7
-6.3...6.8
-6.3...7.3
-6.3...7.5
-6.3...7.7
-6.3...7.8
-6.3...7.9
-6.3...8.0
-6.3...8.2
-6.3...8.3
-6.3...8.5
-6.3...8.6
-6.3...8.7
-6.3...8.9
-6.3...9.0
-6.3...9.1
-6.3...9.2
-6.3...9.3
-6.3...9.4
-6.3...9.5
-6.3...9.7
-6.3...9.8
-6.3...>10.0
-6.3...>11
-6.3...>7.5
-6.3...>7.8
-6.3...>8.0
-6.3...>8.1
-6.3...>8.3
-6.3...>8.5
-6.3...>9.0
-6.3...>9.2
-6.35
-6.4
-6.4...7.7
-6.4...10
-6.4...10.8
-6.4...6.7
-6.4...6.8
-6.4...7.0
-6.4...7.2
-6.4...7.4
-6.4...7.5
-6.4...7.6
-6.4...7.7
-6.4...7.8
-6.4...8.0
-6.4...8.1
-6.4...8.2
-6.4...8.3
-6.4...8.4
-6.4...8.6
-6.4...8.7
-6.4...8.8
-6.4...9.0
-6.4...9.3
-6.4...>10
-6.4...>11.0
-6.4...>7.8
-6.4...>8.0
-6.4...>8.5
-6.4...>8.6
-6.4...>9.0
-6.4...>9.1
-6.4...>9.2
-6.4...>9.5
-6.42
-6.5
-6.5 
-6.5...
-6.5...10
-6.5...10.0
-6.5...10.2
-6.5...10.3
-6.5...10.5
-6.5...11
-6.5...11.0
-6.5...11.5
-6.5...12.0
-6.5...6.7
-6.5...6.75
-6.5...6.8
-6.5...6.9
-6.5...7.0
-6.5...7.1
-6.5...7.3
-6.5...7.4
-6.5...7.5
-6.5...7.6
-6.5...7.7
-6.5...7.8
-6.5...7.9
-6.5...8.0
-6.5...8.1
-6.5...8.2
-6.5...8.25
-6.5...8.3
-6.5...8.4
-6.5...8.5
-6.5...8.6
-6.5...8.7
-6.5...8.8
-6.5...8.9
-6.5...9
-6.5...9.0
-6.5...9.2
-6.5...9.3
-6.5...9.5
-6.5...9.7
-6.5...9.8
-6.5...>10
-6.5...>10.0
-6.5...>11
-6.5...>11.0
-6.5...>12.0
-6.5...>7.0
-6.5...>7.9
-6.5...>8.0
-6.5...>8.3
-6.5...>8.5
-6.5...>8.7
-6.5...>8.8
-6.5...>9.0
-6.5...>9.5
-6.51
-6.55
-6.6
-6.6...
-6.6...7.0
-6.6...7.1
-6.6...7.3
-6.6...7.4
-6.6...7.5
-6.6...7.9
-6.6...8.3
-6.6...8.4
-6.6...8.5
-6.6...8.6
-6.6...8.7
-6.6...8.8
-6.6...8.9
-6.6...9.0
-6.6...9.4
-6.6...9.7
-6.6...9.8
-6.6...>10.0
-6.6...>10.3
-6.6...>11
-6.6...>9.0
-6.6...>9.5
-6.65...8.6
-6.67
-6.7
-6.7...
-6.7...10.2
-6.7...11.5
-6.7...6.8
-6.7...6.9
-6.7...7.0
-6.7...7.3
-6.7...7.4
-6.7...7.5
-6.7...7.6
-6.7...7.8
-6.7...8.0
-6.7...8.1
-6.7...8.2
-6.7...8.3
-6.7...8.5
-6.7...8.6
-6.7...8.7
-6.7...8.8
-6.7...8.9
-6.7...9.0
-6.7...9.1
-6.7...9.2
-6.7...9.5
-6.7...9.7
-6.7...9.8
-6.7...>10
-6.7...>7.0
-6.7...>7.5
-6.7...>8.0
-6.7...>8.5
-6.7...>8.6
-6.7...>9
-6.7...>9.0
-6.7...>9.3
-6.74...8.0
-6.75
-6.75...
-6.75...9.5
-6.75...>9
-6.75...>9.0
-6.75...>9.5
-6.76...8.10
-6.8 
-6.8...
-6.8...10
-6.8...10.0
-6.8...10.5
-6.8...6.9
-6.8...7.0
-6.8...7.1
-6.8...7.2
-6.8...7.3
-6.8...7.5
-6.8...7.6
-6.8...7.7
-6.8...7.8
-6.8...7.9
-6.8...8.0
-6.8...8.2
-6.8...8.25
-6.8...8.3
-6.8...8.5
-6.8...8.6
-6.8...8.7
-6.8...8.8
-6.8...8.9
-6.8...9.0
-6.8...9.1
-6.8...9.3
-6.8...9.4
-6.8...9.5
-6.8...9.6
-6.8...9.9
-6.8...>10.0
-6.8...>7.9
-6.8...>8.0
-6.8...>8.1
-6.8...>8.5
-6.8...>9.0
-6.8...>9.1
-6.80...>8.5
-6.81...7.53
-6.85
-6.86
-6.88
-6.9
-6.9...
-6.9...10.4
-6.9...12.2
-6.9...7.0
-6.9...7.1
-6.9...7.3
-6.9...7.6
-6.9...7.9
-6.9...8.0
-6.9...8.2
-6.9...8.4
-6.9...8.5
-6.9...8.6
-6.9...8.7
-6.9...8.8
-6.9...9.0
-6.9...9.1
-6.9...9.2
-6.9...9.5
-6.9...9.7
-6.9...>7.1
-6.9...>8
-6.9...>8.5
-6.9...>9
-6.9...>9.0
-6.9...>9.3
-6.9...>9.5
-6.9...>90
-7
-7...10
-7...10.5
-7...11
-7...7.5
-7...8
-7...8.5
-7...8.8
-7...9
-7...>10
-7...>10.5
-7...>9.5
-7.0
-7.0 
-7.0...
-7.0...10
-7.0...10.0
-7.0...10.2
-7.0...10.3
-7.0...10.5
-7.0...10.7
-7.0...11
-7.0...11.0
-7.0...11.5
-7.0...7.2
-7.0...7.2 
-7.0...7.3
-7.0...7.4
-7.0...7.5
-7.0...7.6
-7.0...7.8
-7.0...7.9
-7.0...8.0
-7.0...8.1
-7.0...8.2
-7.0...8.3
-7.0...8.4
-7.0...8.5
-7.0...8.6
-7.0...8.67
-7.0...8.7
-7.0...8.8
-7.0...8.9
-7.0...9.0
-7.0...9.1
-7.0...9.2
-7.0...9.3
-7.0...9.4
-7.0...9.5
-7.0...9.7
-7.0...9.75
-7.0...9.8
-7.0...9.9
-7.0...<8.0
-7.0...>10
-7.0...>10.0
-7.0...>10.5
-7.0...>11
-7.0...>11.5
-7.0...>7.8
-7.0...>8.5
-7.0...>8.7
-7.0...>9
-7.0...>9.0
-7.0...>9.5
-7.00
-7.01
-7.03
-7.05
-7.07
-7.1
-7.1...10.1
-7.1...10.3
-7.1...7.9
-7.1...8.1
-7.1...8.2
-7.1...8.3
-7.1...8.4
-7.1...8.6
-7.1...8.7
-7.1...8.9
-7.1...9.0
-7.1...9.2
-7.1...9.3
-7.1...9.4
-7.1...9.8
-7.1...>8.3
-7.1...>8.5
-7.1...>9.0
-7.1...>9.5
-7.10
-7.15
-7.15...8.3
-7.2
-7.2...10.0
-7.2...10.2
-7.2...10.5
-7.2...13.5
-7.2...7.3
-7.2...7.4
-7.2...7.5
-7.2...7.6
-7.2...7.8
-7.2...8.0
-7.2...8.2
-7.2...8.3
-7.2...8.6
-7.2...8.7
-7.2...8.8
-7.2...8.9
-7.2...9.0
-7.2...9.1
-7.2...9.2
-7.2...9.3
-7.2...9.5
-7.2...9.6
-7.2...9.7
-7.2...9.8
-7.2...>10
-7.2...>10.0
-7.2...>11
-7.2...>8.0
-7.2...>8.5
-7.2...>8.7
-7.2...>9.0
-7.2...>9.1
-7.2...>9.2
-7.2...>9.5
-7.24
-7.25
-7.25...7.75
-7.25...8.1
-7.25...8.25
-7.25...8.4
-7.25...8.6
-7.25...8.7
-7.25...9.25
-7.25...>10.0
-7.25...>8.0
-7.25...>8.25
-7.25...>9.0
-7.26
-7.3
-7.3...
-7.3...10.2
-7.3...10.5
-7.3...11
-7.3...7.5
-7.3...7.6
-7.3...7.8
-7.3...7.9
-7.3...8.0
-7.3...8.2
-7.3...8.3
-7.3...8.4
-7.3...8.5
-7.3...8.6
-7.3...8.8
-7.3...8.9
-7.3...9.0
-7.3...9.15
-7.3...9.2
-7.3...9.4
-7.3...9.5
-7.3...9.8
-7.3...9.9
-7.3...>10
-7.3...>10.0
-7.3...>10.5
-7.3...>7.8
-7.3...>8.0
-7.3...>8.3
-7.3...>9.0
-7.3...>9.2
-7.3...>9.3
-7.3...>9.5
-7.3...>9.75
-7.3...>90
-7.32
-7.35
-7.4
-7.4...
-7.4...10
-7.4...10.0
-7.4...12.1
-7.4...7.6
-7.4...7.8
-7.4...8.0
-7.4...8.2
-7.4...8.3
-7.4...8.4
-7.4...8.5
-7.4...8.6
-7.4...8.7
-7.4...8.8
-7.4...9.0
-7.4...9.2
-7.4...9.3
-7.4...9.6
-7.4...9.7
-7.4...9.8
-7.4...>10.0
-7.4...>8
-7.4...>8.5
-7.4...>8.6
-7.4...>8.7
-7.4...>9.0
-7.45
-7.5
-7.5 
-7.5...
-7.5...10
-7.5...10.0
-7.5...10.1
-7.5...10.2
-7.5...10.3
-7.5...10.5
-7.5...10.8
-7.5...11
-7.5...11.0
-7.5...11.5
-7.5...12.0
-7.5...7.6
-7.5...7.8
-7.5...8
-7.5...8.0
-7.5...8.1
-7.5...8.2
-7.5...8.4
-7.5...8.5
-7.5...8.6
-7.5...8.7
-7.5...9.0
-7.5...9.1
-7.5...9.2
-7.5...9.3
-7.5...9.4
-7.5...9.5
-7.5...9.6
-7.5...9.7
-7.5...9.8
-7.5...>10
-7.5...>10.0
-7.5...>10.5
-7.5...>11.0
-7.5...>8.3
-7.5...>8.5
-7.5...>8.7
-7.5...>8.75
-7.5...>9
-7.5...>9.0
-7.5...>9.2
-7.5...>9.5
-7.54
-7.55
-7.6
-7.6 
-7.6...10.3
-7.6...10.5
-7.6...7.8
-7.6...7.9
-7.6...8.0
-7.6...8.2
-7.6...8.3
-7.6...8.4
-7.6...8.5
-7.6...8.6
-7.6...8.8
-7.6...9.0
-7.6...9.2
-7.6...9.3
-7.6...9.4
-7.6...9.5
-7.6...9.7
-7.6...>10.0
-7.6...>10.3
-7.6...>10.5
-7.6...>11
-7.6...>8.25
-7.6...>8.8
-7.6...>9.0
-7.6...>9.5
-7.65
-7.7...
-7.7...10
-7.7...10.0
-7.7...10.3
-7.7...10.5
-7.7...11.0
-7.7...11.5
-7.7...7.8
-7.7...8.0
-7.7...8.3
-7.7...8.5
-7.7...8.7
-7.7...9.0
-7.7...9.25
-7.7...9.4
-7.7...9.5
-7.7...9.8
-7.7...>10.5
-7.7...>8.5
-7.7...>8.6
-7.7...>9.0
-7.7...>9.5
-7.72...8.7
-7.75
-7.75...
-7.75...8.1
-7.78
-7.8
-7.8...10.2
-7.8...7.9
-7.8...8.0
-7.8...8.1
-7.8...8.2
-7.8...8.4
-7.8...8.5
-7.8...8.7
-7.8...8.8
-7.8...8.9
-7.8...9.0
-7.8...9.2
-7.8...9.3
-7.8...9.4
-7.8...9.6
-7.8...<9.8
-7.8...>10.0
-7.8...>8.8
-7.8...>8.9
-7.8...>9.0
-7.8...>9.1
-7.8...>9.4
-7.80
-7.85
-7.9
-7.9...10.9
-7.9...8.1
-7.9...8.2
-7.9...8.3
-7.9...8.5
-7.9...8.6
-7.9...8.9
-7.9...9.0
-7.9...9.3
-7.96
-8
-8...10
-8...10.2
-8...10.5
-8...11.0
-8...8.5
-8...9
-8...>10
-8...>11
-8.0
-8.0...10
-8.0...10.0
-8.0...10.2
-8.0...10.3
-8.0...10.5
-8.0...10.8
-8.0...11.0
-8.0...11.2
-8.0...11.7
-8.0...12.0
-8.0...8.5
-8.0...8.12
-8.0...8.2
-8.0...8.4
-8.0...8.5
-8.0...8.6
-8.0...8.7
-8.0...8.8
-8.0...8.9
-8.0...9.0
-8.0...9.2
-8.0...9.4
-8.0...9.5
-8.0...9.7
-8.0...>10
-8.0...>10.0
-8.0...>10.5
-8.0...>11
-8.0...>13.0
-8.0...>8.75
-8.0...>9.0
-8.0...>9.2
-8.0...>9.5
-8.1
-8.1...10.5
-8.1...10.9
-8.1...8.2
-8.1...8.3
-8.1...8.4
-8.1...8.6
-8.1...8.7
-8.1...8.75
-8.1...8.9
-8.1...9.1
-8.1...9.9
-8.1...>9.5
-8.13
-8.15
-8.2
-8.2...
-8.2...10.2
-8.2...10.4
-8.2...8.4
-8.2...8.5
-8.2...8.8
-8.2...8.9
-8.2...9.0
-8.2...9.6
-8.2...9.8
-8.2...>10
-8.2...>10.5
-8.2...>11
-8.2...>11.0
-8.2...>8.8
-8.2...>9.3
-8.20
-8.25
-8.25...10.2
-8.27
-8.27...10
-8.28
-8.3
-8.3...
-8.3...10.2
-8.3...10.3
-8.3...10.8
-8.3...8.4
-8.3...8.5
-8.3...8.6
-8.3...8.8
-8.3...9.6
-8.3...9.9
-8.3...>9.5
-8.3...>9.8
-8.35
-8.4
-8.4...10.1
-8.4...8.5
-8.4...8.6
-8.4...8.7
-8.4...8.8
-8.4...8.9
-8.4...9.0
-8.4...9.2
-8.4...9.5
-8.4...<9.8
-8.4...>10.0
-8.4...>10.5
-8.4...>9.8
-8.48
-8.5
-8.5...
-8.5...10.0
-8.5...10.3
-8.5...10.5
-8.5...10.7
-8.5...10.8
-8.5...11
-8.5...11.0
-8.5...12.5
-8.5...8.6
-8.5...8.8
-8.5...9.0
-8.5...9.1
-8.5...9.2
-8.5...9.3
-8.5...9.4
-8.5...9.5
-8.5...9.9
-8.5...>10
-8.5...>11
-8.5...>11.5
-8.5...>9.5
-8.6
-8.6...10.2
-8.6...10.3
-8.6...11
-8.6...8.7
-8.6...8.8
-8.6...8.9
-8.6...9.4
-8.6...>11
-8.6...>99
-8.65
-8.7
-8.7...10.6
-8.7...11.2
-8.7...11.3
-8.7...11.7
-8.7...8.9
-8.7...9.1
-8.7...9.6
-8.7...9.8
-8.75
-8.8
-8.8...10.3
-8.8...10.7
-8.8...9.0
-8.8...9.2
-8.8...9.8
-8.8...>9.8
-8.9
-8.9...10.3
-8.9...10.4
-8.9...10.9
-8.9...11.5
-8.9...9.2
-9
-9.8
-9...10
-9...11
-9...>12
-9.0
-9.0...
-9.0...10
-9.0...10.0
-9.0...10.5
-9.0...10.7
-9.0...11
-9.0...11.0
-9.0...11.1
-9.0...11.2
-9.0...11.3
-9.0...11.5
-9.0...12
-9.0...9.2
-9.0...9.5
-9.0...>10.7
-9.0...>11.0
-9.1
-9.1...10
-9.1...10.1
-9.1...9.5
-9.15
-9.2
-9.2...10
-9.2...10.8
-9.2...12
-9.2...9.3
-9.2...9.4
-9.2...9.5
-9.2...9.6
-9.25
-9.3
-9.4
-9.4...10
-9.4...12.2
-9.4...9.7
-9.5
-9.5...
-9.5...10
-9.5...10.0
-9.5...10.4
-9.5...10.5
-9.5...10.6
-9.5...11.2
-9.5...9.8
-9.5...>10.2
-9.5...>10.5
-9.55
-9.6
-9.6...10
-9.6...10.2
-9.6...11.5
-9.6...>11.2
-9.63
-9.7
-9.7...11
-9.7...11.5
-9.7...9.8
-9.7...>12
-9.75
-9.76
-9.8
-9.8...10.0
-9.8...10.1
-9.8...>12.5
-9.9
-9.99
-10
-10...10.5
-10...11
-10.0
-10.0...10.4
-10.0...10.5
-10.0...11.25
-10.0...11.5
-10.0...12.5
-10.0...>12.5
-10.2
-10.2...11.8
-10.25
-10.3
-10.32
-10.4
-10.45
-10.5
-10.5...11.0
-10.5...11.5
-10.5...<13.5
-10.6
-10.7
-10.7...12.3
-10.70
-10.75
-10.8
-11
-11 
-11.0
-11.3
-11.5
-11.5...12.5
-11.75
-12
-12.0
-12.2
-14
-15
-16
-16.7
-17
-18
-19
-19.8
-20
-20.0
-22
-22 
-22.9
-23
-23...25
-23.7
-24
-24.0
diff --git a/contrib/seg/expected/seg.out b/contrib/seg/expected/seg.out
deleted file mode 100644
index 9abfdc2ecb..0000000000
--- a/contrib/seg/expected/seg.out
+++ /dev/null
@@ -1,1064 +0,0 @@
---
---  Test seg datatype
---
---
--- first, define the datatype.  Turn off echoing so that expected file
--- does not depend on contents of seg.sql.
---
-\set ECHO none
---
--- testing the input and output functions
---
--- Any number
-SELECT '1'::seg AS seg;
- seg 
------
- 1
-(1 row)
-
-SELECT '-1'::seg AS seg;
- seg 
------
- -1
-(1 row)
-
-SELECT '1.0'::seg AS seg;
- seg 
------
- 1.0
-(1 row)
-
-SELECT '-1.0'::seg AS seg;
- seg  
-------
- -1.0
-(1 row)
-
-SELECT '1e7'::seg AS seg;
-  seg  
--------
- 1e+07
-(1 row)
-
-SELECT '-1e7'::seg AS seg;
-  seg   
---------
- -1e+07
-(1 row)
-
-SELECT '1.0e7'::seg AS seg;
-   seg   
----------
- 1.0e+07
-(1 row)
-
-SELECT '-1.0e7'::seg AS seg;
-   seg    
-----------
- -1.0e+07
-(1 row)
-
-SELECT '1e+7'::seg AS seg;
-  seg  
--------
- 1e+07
-(1 row)
-
-SELECT '-1e+7'::seg AS seg;
-  seg   
---------
- -1e+07
-(1 row)
-
-SELECT '1.0e+7'::seg AS seg;
-   seg   
----------
- 1.0e+07
-(1 row)
-
-SELECT '-1.0e+7'::seg AS seg;
-   seg    
-----------
- -1.0e+07
-(1 row)
-
-SELECT '1e-7'::seg AS seg;
-  seg  
--------
- 1e-07
-(1 row)
-
-SELECT '-1e-7'::seg AS seg;
-  seg   
---------
- -1e-07
-(1 row)
-
-SELECT '1.0e-7'::seg AS seg;
-   seg   
----------
- 1.0e-07
-(1 row)
-
-SELECT '-1.0e-7'::seg AS seg;
-   seg    
-----------
- -1.0e-07
-(1 row)
-
-SELECT '2e-6'::seg AS seg;
-  seg  
--------
- 2e-06
-(1 row)
-
-SELECT '2e-5'::seg AS seg;
-  seg  
--------
- 2e-05
-(1 row)
-
-SELECT '2e-4'::seg AS seg;
-  seg   
---------
- 0.0002
-(1 row)
-
-SELECT '2e-3'::seg AS seg;
-  seg  
--------
- 0.002
-(1 row)
-
-SELECT '2e-2'::seg AS seg;
- seg  
-------
- 0.02
-(1 row)
-
-SELECT '2e-1'::seg AS seg;
- seg 
------
- 0.2
-(1 row)
-
-SELECT '2e-0'::seg AS seg;
- seg 
------
- 2
-(1 row)
-
-SELECT '2e+0'::seg AS seg;
- seg 
------
- 2
-(1 row)
-
-SELECT '2e+1'::seg AS seg;
- seg 
------
- 2e1
-(1 row)
-
-SELECT '2e+2'::seg AS seg;
- seg 
------
- 2e2
-(1 row)
-
-SELECT '2e+3'::seg AS seg;
- seg 
------
- 2e3
-(1 row)
-
-SELECT '2e+4'::seg AS seg;
- seg 
------
- 2e4
-(1 row)
-
-SELECT '2e+5'::seg AS seg;
-  seg  
--------
- 2e+05
-(1 row)
-
-SELECT '2e+6'::seg AS seg;
-  seg  
--------
- 2e+06
-(1 row)
-
--- Significant digits preserved
-SELECT '1'::seg AS seg;
- seg 
------
- 1
-(1 row)
-
-SELECT '1.0'::seg AS seg;
- seg 
------
- 1.0
-(1 row)
-
-SELECT '1.00'::seg AS seg;
- seg  
-------
- 1.00
-(1 row)
-
-SELECT '1.000'::seg AS seg;
-  seg  
--------
- 1.000
-(1 row)
-
-SELECT '1.0000'::seg AS seg;
-  seg   
---------
- 1.0000
-(1 row)
-
-SELECT '1.00000'::seg AS seg;
-   seg   
----------
- 1.00000
-(1 row)
-
-SELECT '1.000000'::seg AS seg;
-   seg   
----------
- 1.00000
-(1 row)
-
-SELECT '0.000000120'::seg AS seg;
-   seg    
-----------
- 1.20e-07
-(1 row)
-
-SELECT '3.400e5'::seg AS seg;
-    seg    
------------
- 3.400e+05
-(1 row)
-
--- Digits truncated
-SELECT '12.34567890123456'::seg AS seg;
-   seg   
----------
- 12.3457
-(1 row)
-
--- Numbers with certainty indicators
-SELECT '~6.5'::seg AS seg;
- seg  
-------
- ~6.5
-(1 row)
-
-SELECT '<6.5'::seg AS seg;
- seg  
-------
- <6.5
-(1 row)
-
-SELECT '>6.5'::seg AS seg;
- seg  
-------
- >6.5
-(1 row)
-
-SELECT '~ 6.5'::seg AS seg;
- seg  
-------
- ~6.5
-(1 row)
-
-SELECT '< 6.5'::seg AS seg;
- seg  
-------
- <6.5
-(1 row)
-
-SELECT '> 6.5'::seg AS seg;
- seg  
-------
- >6.5
-(1 row)
-
--- Open intervals
-SELECT '0..'::seg AS seg;
- seg  
-------
- 0 ..
-(1 row)
-
-SELECT '0...'::seg AS seg;
- seg  
-------
- 0 ..
-(1 row)
-
-SELECT '0 ..'::seg AS seg;
- seg  
-------
- 0 ..
-(1 row)
-
-SELECT '0 ...'::seg AS seg;
- seg  
-------
- 0 ..
-(1 row)
-
-SELECT '..0'::seg AS seg;
- seg  
-------
- .. 0
-(1 row)
-
-SELECT '...0'::seg AS seg;
- seg  
-------
- .. 0
-(1 row)
-
-SELECT '.. 0'::seg AS seg;
- seg  
-------
- .. 0
-(1 row)
-
-SELECT '... 0'::seg AS seg;
- seg  
-------
- .. 0
-(1 row)
-
--- Finite intervals
-SELECT '0 .. 1'::seg AS seg;
-  seg   
---------
- 0 .. 1
-(1 row)
-
-SELECT '-1 .. 0'::seg AS seg;
-   seg   
----------
- -1 .. 0
-(1 row)
-
-SELECT '-1 .. 1'::seg AS seg;
-   seg   
----------
- -1 .. 1
-(1 row)
-
--- (+/-) intervals
-SELECT '0(+-)1'::seg AS seg;
-   seg   
----------
- -1 .. 1
-(1 row)
-
-SELECT '0(+-)1.0'::seg AS seg;
-     seg     
--------------
- -1.0 .. 1.0
-(1 row)
-
-SELECT '1.0(+-)0.005'::seg AS seg;
-      seg       
-----------------
- 0.995 .. 1.005
-(1 row)
-
-SELECT '101(+-)1'::seg AS seg;
-       seg        
-------------------
- 1.00e2 .. 1.02e2
-(1 row)
-
--- incorrect number of significant digits in 99.0:
-SELECT '100(+-)1'::seg AS seg;
-      seg       
-----------------
- 99.0 .. 1.01e2
-(1 row)
-
--- invalid input
-SELECT ''::seg AS seg;
-ERROR:  seg_in: can't parse an empty string
-SELECT 'ABC'::seg AS seg;
-ERROR:  parse error, expecting `FLOAT' or `RANGE' or `EXTENSION' at or near position 1, character ('A', \101), input: 'ABC'
-
-SELECT '1ABC'::seg AS seg;
-ERROR:  expecting end of input at or near position 2, character ('A', \101), input: '1ABC'
-
-SELECT '1.'::seg AS seg;
-ERROR:  expecting end of input at or near position 2, character ('.', \056), input: '1.'
-
-SELECT '1.....'::seg AS seg;
-ERROR:  expecting end of input at or near position 6, character ('.', \056), input: '1.....'
-
-SELECT '.1'::seg AS seg;
-ERROR:  parse error, expecting `FLOAT' or `RANGE' or `EXTENSION' at or near position 2, character ('1', \061), input: '.1'
-
-SELECT '1..2.'::seg AS seg;
-ERROR:  expecting end of input at or near position 5, character ('.', \056), input: '1..2.'
-
-SELECT '1 e7'::seg AS seg;
-ERROR:  expecting end of input at or near position 3, character ('e', \145), input: '1 e7'
-
-SELECT '1e700'::seg AS seg;
-ERROR:  numeric value 1e700 unrepresentable
---
--- testing the  operators
---
--- equality/inequality:
---
-SELECT '24 .. 33.20'::seg = '24 .. 33.20'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '24 .. 33.20'::seg = '24 .. 33.21'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '24 .. 33.20'::seg != '24 .. 33.20'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '24 .. 33.20'::seg != '24 .. 33.21'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
--- overlap
---
-SELECT '1'::seg && '1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '1'::seg && '2'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '0 ..'::seg && '0 ..'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0 .. 1'::seg && '0 .. 1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '..0'::seg && '0..'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '-1 .. 0.1'::seg && '0 .. 1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '-1 .. 0'::seg && '0 .. 1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '-1 .. -0.0001'::seg && '0 .. 1'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '0 ..'::seg && '1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0 .. 1'::seg && '1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0 .. 1'::seg && '2'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '0 .. 2'::seg && '1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '1'::seg && '0 .. 1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '2'::seg && '0 .. 1'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '1'::seg && '0 .. 2'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
--- overlap on the left
---
-SELECT '1'::seg &< '0'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '1'::seg &< '1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '1'::seg &< '2'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '0 .. 1'::seg &< '0'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '0 .. 1'::seg &< '1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0 .. 1'::seg &< '2'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '0 .. 1'::seg &< '0 .. 0.5'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '0 .. 1'::seg &< '0 .. 1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0 .. 1'::seg &< '0 .. 2'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0 .. 1'::seg &< '1 .. 2'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0 .. 1'::seg &< '2 .. 3'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
--- overlap on the right
---
-SELECT '0'::seg &> '1'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '1'::seg &> '1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '2'::seg &> '1'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '0'::seg &> '0 .. 1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '1'::seg &> '0 .. 1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '2'::seg &> '0 .. 1'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '0 .. 0.5'::seg &> '0 .. 1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0 .. 1'::seg &> '0 .. 1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0 .. 2'::seg &> '0 .. 2'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '1 .. 2'::seg &> '0 .. 1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '2 .. 3'::seg &> '0 .. 1'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
--- left
---
-SELECT '1'::seg << '0'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '1'::seg << '1'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '1'::seg << '2'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0 .. 1'::seg << '0'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '0 .. 1'::seg << '1'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '0 .. 1'::seg << '2'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0 .. 1'::seg << '0 .. 0.5'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '0 .. 1'::seg << '0 .. 1'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '0 .. 1'::seg << '0 .. 2'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '0 .. 1'::seg << '1 .. 2'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '0 .. 1'::seg << '2 .. 3'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
--- right
---
-SELECT '0'::seg >> '1'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '1'::seg >> '1'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '2'::seg >> '1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0'::seg >> '0 .. 1'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '1'::seg >> '0 .. 1'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '2'::seg >> '0 .. 1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0 .. 0.5'::seg >> '0 .. 1'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '0 .. 1'::seg >> '0 .. 1'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '0 .. 2'::seg >> '0 .. 2'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '1 .. 2'::seg >> '0 .. 1'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '2 .. 3'::seg >> '0 .. 1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
--- "contained in" (the left value belongs within the interval specified in the right value):
---
-SELECT '0'::seg        ~ '0'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0'::seg        ~ '0 ..'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0'::seg        ~ '.. 0'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0'::seg        ~ '-1 .. 1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0'::seg        ~ '-1 .. 1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '-1'::seg       ~ '-1 .. 1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '1'::seg        ~ '-1 .. 1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '-1 .. 1'::seg  ~ '-1 .. 1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
--- "contains" (the left value contains the interval specified in the right value):
---
-SELECT '0'::seg @ '0'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '0 .. '::seg ~ '0'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '.. 0'::seg ~ '0'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '-1 .. 1'::seg ~ '0'::seg AS bool;
- bool 
-------
- f
-(1 row)
-
-SELECT '0'::seg ~ '-1 .. 1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '-1'::seg ~ '-1 .. 1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
-SELECT '1'::seg ~ '-1 .. 1'::seg AS bool;
- bool 
-------
- t
-(1 row)
-
--- Load some example data and build the index
--- 
-CREATE TABLE test_seg (s seg);
-\copy test_seg from 'data/test_seg.data'
-CREATE INDEX test_seg_ix ON test_seg USING gist (s);
-SELECT count(*) FROM test_seg WHERE s @ '11..11.3';
- count 
--------
-   143
-(1 row)
-
--- Test sorting 
-SELECT * FROM test_seg WHERE s @ '11..11.3' GROUP BY s;
-        s        
------------------
- .. 4.0e1
- .. >8.2e1
- .. 9.0e1
- <1.0 .. >13.0
- 1.3 .. 12.0
- 2.0 .. 11.5
- 2.1 .. 11.8
- <2.3 ..
- >2.3 ..
- 2.4 .. 11.3
- 2.5 .. 11.5
- 2.5 .. 11.8
- 2.6 ..
- 2.7 .. 12.0
- <3.0 ..
- 3 .. 5.8e1
- 3.1 .. 11.5
- 3.5 .. 11.5
- 3.5 .. 12.2
- <4.0 .. >1.2e1
- <4.0 ..
- 4 .. 1.2e1
- 4.0 .. 11.7
- 4.0 .. 12.5
- 4.0 .. 13.0
- 4.0 .. 6.0e1
- 4.0 ..
- 4.2 .. 11.5
- 4.2 .. 11.7
- <4.5 .. >1.2e1
- 4.5 .. 11.5
- 4.5 .. <1.2e1
- 4.5 .. >1.2e1
- 4.5 .. 12.5
- 4.5 .. 1.15e2
- 4.7 .. 11.8
- 4.8 .. 11.5
- 4.8 .. 11.6
- 4.8 .. 12.5
- 4.8 ..
- 4.9 .. >1.2e1
- 4.9 ..
- 5 .. 11.5
- 5 .. 1.2e1
- 5 .. 3.0e1
- 5.0 .. 11.4
- 5.0 .. 11.5
- 5.0 .. 11.6
- 5.0 .. 11.7
- 5.0 .. 12.0
- 5.0 .. >12.0
- 5.0 .. >1.2e1
- 5.2 .. 11.5
- 5.2 .. >1.2e1
- 5.25 .. >1.2e1
- 5.3 .. 11.5
- 5.3 .. 1.3e1
- 5.3 .. >9.0e1
- 5.3 ..
- 5.4 ..
- 5.5 .. 11.5
- 5.5 .. 11.7
- 5.5 .. 1.2e1
- 5.5 .. >1.2e1
- 5.5 .. 12.5
- 5.5 .. 13.5
- 5.5 ..
- >5.5 ..
- 5.7 ..
- 5.9 ..
- 6 .. 11.5
- 6 .. >1.2e1
- 6.0 .. 11.5
- 6.0 .. 1.3e1
- >6.0 .. <11.5
- 6.1 .. >1.2e1
- 6.1 ..
- 6.2 .. >11.5
- 6.3 ..
- 6.5 .. 11.5
- 6.5 .. 12.0
- 6.5 .. >12.0
- 6.5 ..
- 6.6 ..
- 6.7 .. 11.5
- 6.7 ..
- 6.75 ..
- 6.8 ..
- 6.9 .. 12.2
- 6.9 .. >9.0e1
- 6.9 ..
- <7.0 .. >11.5
- 7.0 .. 11.5
- 7.0 .. >11.5
- 7.0 ..
- >7.15 ..
- 7.2 .. 13.5
- 7.3 .. >9.0e1
- 7.3 ..
- >7.3 ..
- 7.4 .. 12.1
- 7.4 ..
- 7.5 .. 11.5
- 7.5 .. 12.0
- 7.5 ..
- 7.7 .. 11.5
- 7.7 ..
- 7.75 ..
- 8.0 .. 11.7
- 8.0 .. 12.0
- 8.0 .. >13.0
- 8.2 ..
- 8.3 ..
- 8.5 .. >11.5
- 8.5 .. 12.5
- 8.5 ..
- 8.6 .. >9.9e1
- 8.7 .. 11.3
- 8.7 .. 11.7
- 8.9 .. 11.5
- 9 .. >1.2e1
- 9.0 .. 11.3
- 9.0 .. 11.5
- 9.0 .. 1.2e1
- 9.0 ..
- 9.2 .. 1.2e1
- 9.4 .. 12.2
- <9.5 .. 1.2e1
- <9.5 .. >12.2
- 9.5 ..
- 9.6 .. 11.5
- 9.7 .. 11.5
- 9.7 .. >1.2e1
- 9.8 .. >12.5
- <1.0e1 .. >11.6
- 10.0 .. 11.5
- 10.0 .. 12.5
- 10.0 .. >12.5
- 10.2 .. 11.8
- <10.5 .. 11.5
- 10.5 .. 11.5
- 10.5 .. <13.5
- 10.7 .. 12.3
-(143 rows)
-
diff --git a/contrib/seg/seg-validate.pl b/contrib/seg/seg-validate.pl
deleted file mode 100755
index 9272936aef..0000000000
--- a/contrib/seg/seg-validate.pl
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/perl
-$integer = '[+-]?[0-9]+';
-$real    = '[+-]?[0-9]+\.[0-9]+';
-
-$RANGE   = '(\.\.)(\.)?';
-$PLUMIN  = q(\'\+\-\');
-$FLOAT   = "(($integer)|($real))([eE]($integer))?";
-$EXTENSION = '<|>|~';
-
-$boundary = "($EXTENSION)?$FLOAT";
-$deviation = $FLOAT;
-
-$rule_1 = $boundary . $PLUMIN . $deviation;
-$rule_2 = $boundary . $RANGE . $boundary;
-$rule_3 = $boundary . $RANGE;
-$rule_4 = $RANGE . $boundary;
-$rule_5 = $boundary;
-
-
-print "$rule_5\n";
-while (<>) {
-#  s/ +//g;
-  if ( /^($rule_1)$/ ) {
-    print;
-  }
-  elsif ( /^($rule_2)$/ ) {
-    print;
-  }
-  elsif ( /^($rule_3)$/ ) {
-    print;
-  }
-  elsif ( /^($rule_4)$/ ) {
-    print;
-  }
-  elsif ( /^($rule_5)$/ ) {
-    print;
-  }
-  else {
-    print STDERR "error in $_\n";
-  }
-
-}
diff --git a/contrib/seg/seg.c b/contrib/seg/seg.c
deleted file mode 100644
index 097304b638..0000000000
--- a/contrib/seg/seg.c
+++ /dev/null
@@ -1,1119 +0,0 @@
-/******************************************************************************
-  This file contains routines that can be bound to a Postgres backend and
-  called by the backend in the process of processing queries.  The calling
-  format for these routines is dictated by Postgres architecture.
-******************************************************************************/
-
-#include "postgres.h"
-
-#include <float.h>
-
-#include "access/gist.h"
-#include "access/rtree.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
-#include "utils/builtins.h"
-
-#include "segdata.h"
-
-#define max(a,b)		((a) >	(b) ? (a) : (b))
-#define min(a,b)		((a) <= (b) ? (a) : (b))
-#define abs(a)			((a) <	(0) ? (-a) : (a))
-
-/*
-#define GIST_DEBUG
-#define GIST_QUERY_DEBUG
-*/
-
-extern void set_parse_buffer(char *str);
-extern int	seg_yyparse();
-
-/*
-extern int	 seg_yydebug;
-*/
-
-/*
-** Input/Output routines
-*/
-SEG		   *seg_in(char *str);
-char	   *seg_out(SEG * seg);
-float32		seg_lower(SEG * seg);
-float32		seg_upper(SEG * seg);
-float32		seg_center(SEG * seg);
-
-/*
-** GiST support methods
-*/
-bool		gseg_consistent(GISTENTRY *entry, SEG * query, StrategyNumber strategy);
-GISTENTRY  *gseg_compress(GISTENTRY *entry);
-GISTENTRY  *gseg_decompress(GISTENTRY *entry);
-float	   *gseg_penalty(GISTENTRY *origentry, GISTENTRY *newentry, float *result);
-GIST_SPLITVEC *gseg_picksplit(bytea *entryvec, GIST_SPLITVEC *v);
-bool		gseg_leaf_consistent(SEG * key, SEG * query, StrategyNumber strategy);
-bool		gseg_internal_consistent(SEG * key, SEG * query, StrategyNumber strategy);
-SEG		   *gseg_union(bytea *entryvec, int *sizep);
-SEG		   *gseg_binary_union(SEG * r1, SEG * r2, int *sizep);
-bool	   *gseg_same(SEG * b1, SEG * b2, bool *result);
-
-
-/*
-** R-tree suport functions
-*/
-bool		seg_same(SEG * a, SEG * b);
-bool		seg_contains_int(SEG * a, int *b);
-bool		seg_contains_float4(SEG * a, float4 *b);
-bool		seg_contains_float8(SEG * a, float8 *b);
-bool		seg_contains(SEG * a, SEG * b);
-bool		seg_contained(SEG * a, SEG * b);
-bool		seg_overlap(SEG * a, SEG * b);
-bool		seg_left(SEG * a, SEG * b);
-bool		seg_over_left(SEG * a, SEG * b);
-bool		seg_right(SEG * a, SEG * b);
-bool		seg_over_right(SEG * a, SEG * b);
-SEG		   *seg_union(SEG * a, SEG * b);
-SEG		   *seg_inter(SEG * a, SEG * b);
-void		rt_seg_size(SEG * a, float *sz);
-float	   *seg_size(SEG * a);
-
-/*
-** Various operators
-*/
-int32		seg_cmp(SEG * a, SEG * b);
-bool		seg_lt(SEG * a, SEG * b);
-bool		seg_le(SEG * a, SEG * b);
-bool		seg_gt(SEG * a, SEG * b);
-bool		seg_ge(SEG * a, SEG * b);
-bool		seg_different(SEG * a, SEG * b);
-
-/*
-** Auxiliary funxtions
-*/
-static int	restore(char *s, float val, int n);
-int			significant_digits(char *s);
-
-
-/*****************************************************************************
- * Input/Output functions
- *****************************************************************************/
-
-SEG *
-seg_in(char *str)
-{
-	SEG		   *result = palloc(sizeof(SEG));
-
-	set_parse_buffer(str);
-
-	/*
-	 * seg_yydebug = 1;
-	 */
-	if (seg_yyparse(result) != 0)
-	{
-		pfree(result);
-		return NULL;
-	}
-	return (result);
-}
-
-/*
- * You might have noticed a slight inconsistency between the following
- * declaration and the SQL definition:
- *	   CREATE FUNCTION seg_out(opaque) RETURNS opaque ...
- * The reason is that the argument passed into seg_out is really just a
- * pointer. POSTGRES thinks all output functions are:
- *	   char *out_func(char *);
- */
-char *
-seg_out(SEG * seg)
-{
-	char	   *result;
-	char	   *p;
-
-	if (seg == NULL)
-		return (NULL);
-
-	p = result = (char *) palloc(40);
-
-	if (seg->l_ext == '>' || seg->l_ext == '<' || seg->l_ext == '~')
-		p += sprintf(p, "%c", seg->l_ext);
-
-	if (seg->lower == seg->upper && seg->l_ext == seg->u_ext)
-	{
-		/*
-		 * indicates that this interval was built by seg_in off a single
-		 * point
-		 */
-		p += restore(p, seg->lower, seg->l_sigd);
-	}
-	else
-	{
-		if (seg->l_ext != '-')
-		{
-			/* print the lower boudary if exists */
-			p += restore(p, seg->lower, seg->l_sigd);
-			p += sprintf(p, " ");
-		}
-		p += sprintf(p, "..");
-		if (seg->u_ext != '-')
-		{
-			/* print the upper boudary if exists */
-			p += sprintf(p, " ");
-			if (seg->u_ext == '>' || seg->u_ext == '<' || seg->l_ext == '~')
-				p += sprintf(p, "%c", seg->u_ext);
-			p += restore(p, seg->upper, seg->u_sigd);
-		}
-	}
-
-	return (result);
-}
-
-float32
-seg_center(SEG * seg)
-{
-	float32		result = (float32) palloc(sizeof(float32data));
-
-	if (!seg)
-		return (float32) NULL;
-
-	*result = ((float) seg->lower + (float) seg->upper) / 2.0;
-	return (result);
-}
-
-float32
-seg_lower(SEG * seg)
-{
-	float32		result = (float32) palloc(sizeof(float32data));
-
-	if (!seg)
-		return (float32) NULL;
-
-	*result = (float) seg->lower;
-	return (result);
-}
-
-float32
-seg_upper(SEG * seg)
-{
-	float32		result = (float32) palloc(sizeof(float32data));
-
-	if (!seg)
-		return (float32) NULL;
-
-	*result = (float) seg->upper;
-	return (result);
-}
-
-
-/*****************************************************************************
- *						   GiST functions
- *****************************************************************************/
-
-/*
-** The GiST Consistent method for segments
-** Should return false if for all data items x below entry,
-** the predicate x op query == FALSE, where op is the oper
-** corresponding to strategy in the pg_amop table.
-*/
-bool
-gseg_consistent(GISTENTRY *entry,
-				SEG * query,
-				StrategyNumber strategy)
-{
-	/*
-	 * * if entry is not leaf, use gseg_internal_consistent, * else use
-	 * gseg_leaf_consistent
-	 */
-	if (GIST_LEAF(entry))
-		return (gseg_leaf_consistent((SEG *) DatumGetPointer(entry->key), query, strategy));
-	else
-		return (gseg_internal_consistent((SEG *) DatumGetPointer(entry->key), query, strategy));
-}
-
-/*
-** The GiST Union method for segments
-** returns the minimal bounding seg that encloses all the entries in entryvec
-*/
-SEG *
-gseg_union(bytea *entryvec, int *sizep)
-{
-	int			numranges,
-				i;
-	SEG		   *out = (SEG *) NULL;
-	SEG		   *tmp;
-
-#ifdef GIST_DEBUG
-	fprintf(stderr, "union\n");
-#endif
-
-	numranges = (VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY);
-	tmp = (SEG *) DatumGetPointer(((GISTENTRY *) VARDATA(entryvec))[0].key);
-	*sizep = sizeof(SEG);
-
-	for (i = 1; i < numranges; i++)
-	{
-		out = gseg_binary_union(tmp, (SEG *)
-			   DatumGetPointer(((GISTENTRY *) VARDATA(entryvec))[i].key),
-								sizep);
-		if (i > 1)
-			pfree(tmp);
-		tmp = out;
-	}
-
-	return (out);
-}
-
-/*
-** GiST Compress and Decompress methods for segments
-** do not do anything.
-*/
-GISTENTRY *
-gseg_compress(GISTENTRY *entry)
-{
-	return (entry);
-}
-
-GISTENTRY *
-gseg_decompress(GISTENTRY *entry)
-{
-	return (entry);
-}
-
-/*
-** The GiST Penalty method for segments
-** As in the R-tree paper, we use change in area as our penalty metric
-*/
-float *
-gseg_penalty(GISTENTRY *origentry, GISTENTRY *newentry, float *result)
-{
-	SEG		   *ud;
-	float		tmp1,
-				tmp2;
-
-	ud = seg_union((SEG *) DatumGetPointer(origentry->key),
-				   (SEG *) DatumGetPointer(newentry->key));
-	rt_seg_size(ud, &tmp1);
-	rt_seg_size((SEG *) DatumGetPointer(origentry->key), &tmp2);
-	*result = tmp1 - tmp2;
-	pfree(ud);
-
-#ifdef GIST_DEBUG
-	fprintf(stderr, "penalty\n");
-	fprintf(stderr, "\t%g\n", *result);
-#endif
-
-	return (result);
-}
-
-
-
-/*
-** The GiST PickSplit method for segments
-** We use Guttman's poly time split algorithm
-*/
-GIST_SPLITVEC *
-gseg_picksplit(bytea *entryvec,
-			   GIST_SPLITVEC *v)
-{
-	OffsetNumber i,
-				j;
-	SEG		   *datum_alpha,
-			   *datum_beta;
-	SEG		   *datum_l,
-			   *datum_r;
-	SEG		   *union_d,
-			   *union_dl,
-			   *union_dr;
-	SEG		   *inter_d;
-	bool		firsttime;
-	float		size_alpha,
-				size_beta,
-				size_union,
-				size_inter;
-	float		size_waste,
-				waste;
-	float		size_l,
-				size_r;
-	int			nbytes;
-	OffsetNumber seed_1 = 0,
-				seed_2 = 0;
-	OffsetNumber *left,
-			   *right;
-	OffsetNumber maxoff;
-
-#ifdef GIST_DEBUG
-	fprintf(stderr, "picksplit\n");
-#endif
-
-	maxoff = ((VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY)) - 2;
-	nbytes = (maxoff + 2) * sizeof(OffsetNumber);
-	v->spl_left = (OffsetNumber *) palloc(nbytes);
-	v->spl_right = (OffsetNumber *) palloc(nbytes);
-
-	firsttime = true;
-	waste = 0.0;
-
-	for (i = FirstOffsetNumber; i < maxoff; i = OffsetNumberNext(i))
-	{
-		datum_alpha = (SEG *) DatumGetPointer(((GISTENTRY *) VARDATA(entryvec))[i].key);
-		for (j = OffsetNumberNext(i); j <= maxoff; j = OffsetNumberNext(j))
-		{
-			datum_beta = (SEG *) DatumGetPointer(((GISTENTRY *) VARDATA(entryvec))[j].key);
-
-			/* compute the wasted space by unioning these guys */
-			/* size_waste = size_union - size_inter; */
-			union_d = seg_union(datum_alpha, datum_beta);
-			rt_seg_size(union_d, &size_union);
-			inter_d = seg_inter(datum_alpha, datum_beta);
-			rt_seg_size(inter_d, &size_inter);
-			size_waste = size_union - size_inter;
-
-			pfree(union_d);
-
-			if (inter_d != (SEG *) NULL)
-				pfree(inter_d);
-
-			/*
-			 * are these a more promising split that what we've already
-			 * seen?
-			 */
-
-			if (size_waste > waste || firsttime)
-			{
-				waste = size_waste;
-				seed_1 = i;
-				seed_2 = j;
-				firsttime = false;
-			}
-		}
-	}
-
-	left = v->spl_left;
-	v->spl_nleft = 0;
-	right = v->spl_right;
-	v->spl_nright = 0;
-
-	datum_alpha = (SEG *) DatumGetPointer(((GISTENTRY *) VARDATA(entryvec))[seed_1].key);
-	datum_l = seg_union(datum_alpha, datum_alpha);
-	rt_seg_size(datum_l, &size_l);
-	datum_beta = (SEG *) DatumGetPointer(((GISTENTRY *) VARDATA(entryvec))[seed_2].key);
-	datum_r = seg_union(datum_beta, datum_beta);
-	rt_seg_size(datum_r, &size_r);
-
-	/*
-	 * Now split up the regions between the two seeds.	An important
-	 * property of this split algorithm is that the split vector v has the
-	 * indices of items to be split in order in its left and right
-	 * vectors.  We exploit this property by doing a merge in the code
-	 * that actually splits the page.
-	 *
-	 * For efficiency, we also place the new index tuple in this loop. This
-	 * is handled at the very end, when we have placed all the existing
-	 * tuples and i == maxoff + 1.
-	 */
-
-	maxoff = OffsetNumberNext(maxoff);
-	for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i))
-	{
-		/*
-		 * If we've already decided where to place this item, just put it
-		 * on the right list.  Otherwise, we need to figure out which page
-		 * needs the least enlargement in order to store the item.
-		 */
-
-		if (i == seed_1)
-		{
-			*left++ = i;
-			v->spl_nleft++;
-			continue;
-		}
-		else if (i == seed_2)
-		{
-			*right++ = i;
-			v->spl_nright++;
-			continue;
-		}
-
-		/* okay, which page needs least enlargement? */
-		datum_alpha = (SEG *) DatumGetPointer(((GISTENTRY *) VARDATA(entryvec))[i].key);
-		union_dl = seg_union(datum_l, datum_alpha);
-		union_dr = seg_union(datum_r, datum_alpha);
-		rt_seg_size(union_dl, &size_alpha);
-		rt_seg_size(union_dr, &size_beta);
-
-		/* pick which page to add it to */
-		if (size_alpha - size_l < size_beta - size_r)
-		{
-			pfree(datum_l);
-			pfree(union_dr);
-			datum_l = union_dl;
-			size_l = size_alpha;
-			*left++ = i;
-			v->spl_nleft++;
-		}
-		else
-		{
-			pfree(datum_r);
-			pfree(union_dl);
-			datum_r = union_dr;
-			size_r = size_alpha;
-			*right++ = i;
-			v->spl_nright++;
-		}
-	}
-	*left = *right = FirstOffsetNumber; /* sentinel value, see dosplit() */
-
-	v->spl_ldatum = PointerGetDatum(datum_l);
-	v->spl_rdatum = PointerGetDatum(datum_r);
-
-	return v;
-}
-
-/*
-** Equality methods
-*/
-bool *
-gseg_same(SEG * b1, SEG * b2, bool *result)
-{
-	if (seg_same(b1, b2))
-		*result = TRUE;
-	else
-		*result = FALSE;
-
-#ifdef GIST_DEBUG
-	fprintf(stderr, "same: %s\n", (*result ? "TRUE" : "FALSE"));
-#endif
-
-	return (result);
-}
-
-/*
-** SUPPORT ROUTINES
-*/
-bool
-gseg_leaf_consistent(SEG * key,
-					 SEG * query,
-					 StrategyNumber strategy)
-{
-	bool		retval;
-
-#ifdef GIST_QUERY_DEBUG
-	fprintf(stderr, "leaf_consistent, %d\n", strategy);
-#endif
-
-	switch (strategy)
-	{
-		case RTLeftStrategyNumber:
-			retval = (bool) seg_left(key, query);
-			break;
-		case RTOverLeftStrategyNumber:
-			retval = (bool) seg_over_left(key, query);
-			break;
-		case RTOverlapStrategyNumber:
-			retval = (bool) seg_overlap(key, query);
-			break;
-		case RTOverRightStrategyNumber:
-			retval = (bool) seg_over_right(key, query);
-			break;
-		case RTRightStrategyNumber:
-			retval = (bool) seg_right(key, query);
-			break;
-		case RTSameStrategyNumber:
-			retval = (bool) seg_same(key, query);
-			break;
-		case RTContainsStrategyNumber:
-			retval = (bool) seg_contains(key, query);
-			break;
-		case RTContainedByStrategyNumber:
-			retval = (bool) seg_contained(key, query);
-			break;
-		default:
-			retval = FALSE;
-	}
-	return (retval);
-}
-
-bool
-gseg_internal_consistent(SEG * key,
-						 SEG * query,
-						 StrategyNumber strategy)
-{
-	bool		retval;
-
-#ifdef GIST_QUERY_DEBUG
-	fprintf(stderr, "internal_consistent, %d\n", strategy);
-#endif
-
-	switch (strategy)
-	{
-		case RTLeftStrategyNumber:
-		case RTOverLeftStrategyNumber:
-			retval = (bool) seg_over_left(key, query);
-			break;
-		case RTOverlapStrategyNumber:
-			retval = (bool) seg_overlap(key, query);
-			break;
-		case RTOverRightStrategyNumber:
-		case RTRightStrategyNumber:
-			retval = (bool) seg_right(key, query);
-			break;
-		case RTSameStrategyNumber:
-		case RTContainsStrategyNumber:
-			retval = (bool) seg_contains(key, query);
-			break;
-		case RTContainedByStrategyNumber:
-			retval = (bool) seg_overlap(key, query);
-			break;
-		default:
-			retval = FALSE;
-	}
-	return (retval);
-}
-
-SEG *
-gseg_binary_union(SEG * r1, SEG * r2, int *sizep)
-{
-	SEG		   *retval;
-
-	retval = seg_union(r1, r2);
-	*sizep = sizeof(SEG);
-
-	return (retval);
-}
-
-
-bool
-seg_contains(SEG * a, SEG * b)
-{
-	return ((a->lower <= b->lower) && (a->upper >= b->upper));
-}
-
-bool
-seg_contained(SEG * a, SEG * b)
-{
-	return (seg_contains(b, a));
-}
-
-/*****************************************************************************
- * Operator class for R-tree indexing
- *****************************************************************************/
-
-bool
-seg_same(SEG * a, SEG * b)
-{
-	return seg_cmp(a, b) == 0;
-}
-
-/*	seg_overlap -- does a overlap b?
- */
-bool
-seg_overlap(SEG * a, SEG * b)
-{
-	return (
-			((a->upper >= b->upper) && (a->lower <= b->upper))
-			||
-			((b->upper >= a->upper) && (b->lower <= a->upper))
-		);
-}
-
-/*	seg_overleft -- is the right edge of (a) located to the left of the right edge of (b)?
- */
-bool
-seg_over_left(SEG * a, SEG * b)
-{
-	return (a->upper <= b->upper && !seg_left(a, b) && !seg_right(a, b));
-}
-
-/*	seg_left -- is (a) entirely on the left of (b)?
- */
-bool
-seg_left(SEG * a, SEG * b)
-{
-	return (a->upper < b->lower);
-}
-
-/*	seg_right -- is (a) entirely on the right of (b)?
- */
-bool
-seg_right(SEG * a, SEG * b)
-{
-	return (a->lower > b->upper);
-}
-
-/*	seg_overright -- is the left edge of (a) located to the right of the left edge of (b)?
- */
-bool
-seg_over_right(SEG * a, SEG * b)
-{
-	return (a->lower >= b->lower && !seg_left(a, b) && !seg_right(a, b));
-}
-
-
-SEG *
-seg_union(SEG * a, SEG * b)
-{
-	SEG		   *n;
-
-	n = (SEG *) palloc(sizeof(*n));
-
-	/* take max of upper endpoints */
-	if (a->upper > b->upper)
-	{
-		n->upper = a->upper;
-		n->u_sigd = a->u_sigd;
-		n->u_ext = a->u_ext;
-	}
-	else
-	{
-		n->upper = b->upper;
-		n->u_sigd = b->u_sigd;
-		n->u_ext = b->u_ext;
-	}
-
-	/* take min of lower endpoints */
-	if (a->lower < b->lower)
-	{
-		n->lower = a->lower;
-		n->l_sigd = a->l_sigd;
-		n->l_ext = a->l_ext;
-	}
-	else
-	{
-		n->lower = b->lower;
-		n->l_sigd = b->l_sigd;
-		n->l_ext = b->l_ext;
-	}
-
-	return (n);
-}
-
-
-SEG *
-seg_inter(SEG * a, SEG * b)
-{
-	SEG		   *n;
-
-	n = (SEG *) palloc(sizeof(*n));
-
-	/* take min of upper endpoints */
-	if (a->upper < b->upper)
-	{
-		n->upper = a->upper;
-		n->u_sigd = a->u_sigd;
-		n->u_ext = a->u_ext;
-	}
-	else
-	{
-		n->upper = b->upper;
-		n->u_sigd = b->u_sigd;
-		n->u_ext = b->u_ext;
-	}
-
-	/* take max of lower endpoints */
-	if (a->lower > b->lower)
-	{
-		n->lower = a->lower;
-		n->l_sigd = a->l_sigd;
-		n->l_ext = a->l_ext;
-	}
-	else
-	{
-		n->lower = b->lower;
-		n->l_sigd = b->l_sigd;
-		n->l_ext = b->l_ext;
-	}
-
-	return (n);
-}
-
-void
-rt_seg_size(SEG * a, float *size)
-{
-	if (a == (SEG *) NULL || a->upper <= a->lower)
-		*size = 0.0;
-	else
-		*size = (float) abs(a->upper - a->lower);
-
-	return;
-}
-
-float *
-seg_size(SEG * a)
-{
-	float	   *result;
-
-	result = (float *) palloc(sizeof(float));
-
-	*result = (float) abs(a->upper - a->lower);
-
-	return (result);
-}
-
-
-/*****************************************************************************
- *				   Miscellaneous operators
- *****************************************************************************/
-int32
-seg_cmp(SEG * a, SEG * b)
-{
-	/*
-	 * First compare on lower boundary position
-	 */
-	if (a->lower < b->lower)
-		return -1;
-	if (a->lower > b->lower)
-		return 1;
-
-	/*
-	 * a->lower == b->lower, so consider type of boundary.
-	 *
-	 * A '-' lower bound is < any other kind (this could only be relevant if
-	 * -HUGE is used as a regular data value). A '<' lower bound is < any
-	 * other kind except '-'. A '>' lower bound is > any other kind.
-	 */
-	if (a->l_ext != b->l_ext)
-	{
-		if (a->l_ext == '-')
-			return -1;
-		if (b->l_ext == '-')
-			return 1;
-		if (a->l_ext == '<')
-			return -1;
-		if (b->l_ext == '<')
-			return 1;
-		if (a->l_ext == '>')
-			return 1;
-		if (b->l_ext == '>')
-			return -1;
-	}
-
-	/*
-	 * For other boundary types, consider # of significant digits first.
-	 */
-	if (a->l_sigd < b->l_sigd)	/* (a) is blurred and is likely to include
-								 * (b) */
-		return -1;
-	if (a->l_sigd > b->l_sigd)	/* (a) is less blurred and is likely to be
-								 * included in (b) */
-		return 1;
-
-	/*
-	 * For same # of digits, an approximate boundary is more blurred than
-	 * exact.
-	 */
-	if (a->l_ext != b->l_ext)
-	{
-		if (a->l_ext == '~')	/* (a) is approximate, while (b) is exact */
-			return -1;
-		if (b->l_ext == '~')
-			return 1;
-		/* can't get here unless data is corrupt */
-		elog(ERROR, "seg_cmp: bogus lower boundary types %d %d",
-			 (int) a->l_ext, (int) b->l_ext);
-	}
-
-	/* at this point, the lower boundaries are identical */
-
-	/*
-	 * First compare on upper boundary position
-	 */
-	if (a->upper < b->upper)
-		return -1;
-	if (a->upper > b->upper)
-		return 1;
-
-	/*
-	 * a->upper == b->upper, so consider type of boundary.
-	 *
-	 * A '-' upper bound is > any other kind (this could only be relevant if
-	 * HUGE is used as a regular data value). A '<' upper bound is < any
-	 * other kind. A '>' upper bound is > any other kind except '-'.
-	 */
-	if (a->u_ext != b->u_ext)
-	{
-		if (a->u_ext == '-')
-			return 1;
-		if (b->u_ext == '-')
-			return -1;
-		if (a->u_ext == '<')
-			return -1;
-		if (b->u_ext == '<')
-			return 1;
-		if (a->u_ext == '>')
-			return 1;
-		if (b->u_ext == '>')
-			return -1;
-	}
-
-	/*
-	 * For other boundary types, consider # of significant digits first.
-	 * Note result here is converse of the lower-boundary case.
-	 */
-	if (a->u_sigd < b->u_sigd)	/* (a) is blurred and is likely to include
-								 * (b) */
-		return 1;
-	if (a->u_sigd > b->u_sigd)	/* (a) is less blurred and is likely to be
-								 * included in (b) */
-		return -1;
-
-	/*
-	 * For same # of digits, an approximate boundary is more blurred than
-	 * exact.  Again, result is converse of lower-boundary case.
-	 */
-	if (a->u_ext != b->u_ext)
-	{
-		if (a->u_ext == '~')	/* (a) is approximate, while (b) is exact */
-			return 1;
-		if (b->u_ext == '~')
-			return -1;
-		/* can't get here unless data is corrupt */
-		elog(ERROR, "seg_cmp: bogus upper boundary types %d %d",
-			 (int) a->u_ext, (int) b->u_ext);
-	}
-
-	return 0;
-}
-
-bool
-seg_lt(SEG * a, SEG * b)
-{
-	return seg_cmp(a, b) < 0;
-}
-
-bool
-seg_le(SEG * a, SEG * b)
-{
-	return seg_cmp(a, b) <= 0;
-}
-
-bool
-seg_gt(SEG * a, SEG * b)
-{
-	return seg_cmp(a, b) > 0;
-}
-
-
-bool
-seg_ge(SEG * a, SEG * b)
-{
-	return seg_cmp(a, b) >= 0;
-}
-
-bool
-seg_different(SEG * a, SEG * b)
-{
-	return seg_cmp(a, b) != 0;
-}
-
-
-
-/*****************************************************************************
- *				   Auxiliary functions
- *****************************************************************************/
-
-/* The purpose of this routine is to print the floating point
- * value with exact number of significant digits. Its behaviour
- * is similar to %.ng except it prints 8.00 where %.ng would
- * print 8
- */
-static int
-restore(char *result, float val, int n)
-{
-	static char efmt[8] = {'%', '-', '1', '5', '.', '#', 'e', 0};
-	char		buf[25] = {
-		'0', '0', '0', '0', '0',
-		'0', '0', '0', '0', '0',
-		'0', '0', '0', '0', '0',
-		'0', '0', '0', '0', '0',
-		'0', '0', '0', '0', '\0'
-	};
-	char	   *p;
-	char	   *mant;
-	int			exp;
-	int			i,
-				dp,
-				sign;
-
-	/*
-	 * put a cap on the number of siugnificant digits to avoid nonsense in
-	 * the output
-	 */
-	n = min(n, FLT_DIG);
-
-	/* remember the sign */
-	sign = (val < 0 ? 1 : 0);
-
-	efmt[5] = '0' + (n - 1) % 10;		/* makes %-15.(n-1)e -- this
-										 * format guarantees that the
-										 * exponent is always present */
-
-	sprintf(result, efmt, val);
-
-	/* trim the spaces left by the %e */
-	for (p = result; *p != ' '; p++);
-	*p = '\0';
-
-	/* get the exponent */
-	mant = (char *) strtok(strdup(result), "e");
-	exp = atoi(strtok(NULL, "e"));
-
-	if (exp == 0)
-	{
-		/* use the supplied mantyssa with sign */
-		strcpy((char *) index(result, 'e'), "");
-	}
-	else
-	{
-		if (abs(exp) <= 4)
-		{
-			/*
-			 * remove the decimal point from the mantyssa and write the
-			 * digits to the buf array
-			 */
-			for (p = result + sign, i = 10, dp = 0; *p != 'e'; p++, i++)
-			{
-				buf[i] = *p;
-				if (*p == '.')
-				{
-					dp = i--;	/* skip the decimal point */
-				}
-			}
-			if (dp == 0)
-				dp = i--;		/* no decimal point was found in the above
-								 * for() loop */
-
-			if (exp > 0)
-			{
-				if (dp - 10 + exp >= n)
-				{
-					/*
-					 * the decimal point is behind the last significant
-					 * digit; the digits in between must be converted to
-					 * the exponent and the decimal point placed after the
-					 * first digit
-					 */
-					exp = dp - 10 + exp - n;
-					buf[10 + n] = '\0';
-
-					/* insert the decimal point */
-					if (n > 1)
-					{
-						dp = 11;
-						for (i = 23; i > dp; i--)
-							buf[i] = buf[i - 1];
-						buf[dp] = '.';
-					}
-
-					/*
-					 * adjust the exponent by the number of digits after
-					 * the decimal point
-					 */
-					if (n > 1)
-						sprintf(&buf[11 + n], "e%d", exp + n - 1);
-					else
-						sprintf(&buf[11], "e%d", exp + n - 1);
-
-					if (sign)
-					{
-						buf[9] = '-';
-						strcpy(result, &buf[9]);
-					}
-					else
-						strcpy(result, &buf[10]);
-				}
-				else
-				{				/* insert the decimal point */
-					dp += exp;
-					for (i = 23; i > dp; i--)
-						buf[i] = buf[i - 1];
-					buf[11 + n] = '\0';
-					buf[dp] = '.';
-					if (sign)
-					{
-						buf[9] = '-';
-						strcpy(result, &buf[9]);
-					}
-					else
-						strcpy(result, &buf[10]);
-				}
-			}
-			else
-			{					/* exp <= 0 */
-				dp += exp - 1;
-				buf[10 + n] = '\0';
-				buf[dp] = '.';
-				if (sign)
-				{
-					buf[dp - 2] = '-';
-					strcpy(result, &buf[dp - 2]);
-				}
-				else
-					strcpy(result, &buf[dp - 1]);
-			}
-		}
-
-		/* do nothing for abs(exp) > 4; %e must be OK */
-		/* just get rid of zeroes after [eE]- and +zeroes after [Ee]. */
-
-		/* ... this is not done yet. */
-	}
-	return (strlen(result));
-}
-
-
-/*
-** Miscellany
-*/
-
-bool
-seg_contains_int(SEG * a, int *b)
-{
-	return ((a->lower <= *b) && (a->upper >= *b));
-}
-
-bool
-seg_contains_float4(SEG * a, float4 *b)
-{
-	return ((a->lower <= *b) && (a->upper >= *b));
-}
-
-bool
-seg_contains_float8(SEG * a, float8 *b)
-{
-	return ((a->lower <= *b) && (a->upper >= *b));
-}
-
-/* find out the number of significant digits in a string representing
- * a floating point number
- */
-int
-significant_digits(char *s)
-{
-	char	   *p = s;
-	int			n,
-				c,
-				zeroes;
-
-	zeroes = 1;
-	/* skip leading zeroes and sign */
-	for (c = *p; (c == '0' || c == '+' || c == '-') && c != 0; c = *(++p));
-
-	/* skip decimal point and following zeroes */
-	for (c = *p; (c == '0' || c == '.') && c != 0; c = *(++p))
-	{
-		if (c != '.')
-			zeroes++;
-	}
-
-	/* count significant digits (n) */
-	for (c = *p, n = 0; c != 0; c = *(++p))
-	{
-		if (!((c >= '0' && c <= '9') || (c == '.')))
-			break;
-		if (c != '.')
-			n++;
-	}
-
-	if (!n)
-		return (zeroes);
-
-	return (n);
-}
diff --git a/contrib/seg/seg.sql.in b/contrib/seg/seg.sql.in
deleted file mode 100644
index f8acddeb35..0000000000
--- a/contrib/seg/seg.sql.in
+++ /dev/null
@@ -1,396 +0,0 @@
--- Create the user-defined type for 1-D floating point intervals (seg)
--- 
-BEGIN TRANSACTION;
-
-CREATE FUNCTION seg_in(opaque)
-RETURNS opaque
-AS 'MODULE_PATHNAME'
-LANGUAGE 'c';
-
-CREATE FUNCTION seg_out(opaque)
-RETURNS opaque
-AS 'MODULE_PATHNAME'
-LANGUAGE 'c';
-
-CREATE TYPE seg (
-internallength = 12,
-input = seg_in,
-output = seg_out
-);
-
-COMMENT ON TYPE seg IS
-'floating point interval ''FLOAT .. FLOAT'', ''.. FLOAT'', ''FLOAT ..'' or ''FLOAT''';
-
---
--- External C-functions for R-tree methods
---
-
--- Left/Right methods
-
-CREATE FUNCTION seg_over_left(seg, seg) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION seg_over_left(seg, seg) IS
-'is over and left of';
-
-CREATE FUNCTION seg_over_right(seg, seg) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION seg_over_right(seg, seg) IS
-'is over and right of';
-
-CREATE FUNCTION seg_left(seg, seg) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION seg_left(seg, seg) IS
-'is left of';
-
-CREATE FUNCTION seg_right(seg, seg) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION seg_right(seg, seg) IS
-'is right of';
-
-
--- Comparison methods
-
-CREATE FUNCTION seg_lt(seg, seg) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION seg_lt(seg, seg) IS
-'less than';
-
-CREATE FUNCTION seg_le(seg, seg) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION seg_le(seg, seg) IS
-'less than or equal';
-
-CREATE FUNCTION seg_gt(seg, seg) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION seg_gt(seg, seg) IS
-'greater than';
-
-CREATE FUNCTION seg_ge(seg, seg) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION seg_ge(seg, seg) IS
-'greater than or equal';
-
-CREATE FUNCTION seg_contains(seg, seg) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION seg_contains(seg, seg) IS
-'contains';
-
-CREATE FUNCTION seg_contained(seg, seg) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION seg_contained(seg, seg) IS
-'contained in';
-
-CREATE FUNCTION seg_overlap(seg, seg) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION seg_overlap(seg, seg) IS
-'overlaps';
-
-CREATE FUNCTION seg_same(seg, seg) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION seg_same(seg, seg) IS
-'same as';
-
-CREATE FUNCTION seg_different(seg, seg) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-COMMENT ON FUNCTION seg_different(seg, seg) IS
-'different';
-
--- support routines for indexing
-
-CREATE FUNCTION seg_union(seg, seg) RETURNS seg
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-CREATE FUNCTION seg_inter(seg, seg) RETURNS seg
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-CREATE FUNCTION seg_size(seg) RETURNS float4
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
--- miscellaneous
-
-CREATE FUNCTION seg_upper(seg) RETURNS float4
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-CREATE FUNCTION seg_lower(seg) RETURNS float4
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-
---
--- OPERATORS
---
-
-CREATE OPERATOR < (
-   LEFTARG = seg, RIGHTARG = seg, PROCEDURE = seg_lt,
-   COMMUTATOR = '>', NEGATOR = '>=',
-   RESTRICT = scalarltsel, JOIN = scalarltjoinsel
-);
-
-CREATE OPERATOR <= (
-   LEFTARG = seg, RIGHTARG = seg, PROCEDURE = seg_le,
-   COMMUTATOR = '>=', NEGATOR = '>',
-   RESTRICT = scalarltsel, JOIN = scalarltjoinsel
-);
-
-CREATE OPERATOR > (
-   LEFTARG = seg, RIGHTARG = seg, PROCEDURE = seg_gt,
-   COMMUTATOR = '<', NEGATOR = '<=',
-   RESTRICT = scalargtsel, JOIN = scalargtjoinsel
-);
-
-CREATE OPERATOR >= (
-   LEFTARG = seg, RIGHTARG = seg, PROCEDURE = seg_ge,
-   COMMUTATOR = '<=', NEGATOR = '<',
-   RESTRICT = scalargtsel, JOIN = scalargtjoinsel
-);
-
-CREATE OPERATOR << (
-   LEFTARG = seg, RIGHTARG = seg, PROCEDURE = seg_left,
-   COMMUTATOR = '>>',
-   RESTRICT = positionsel, JOIN = positionjoinsel
-);
-
-CREATE OPERATOR &< (
-   LEFTARG = seg, RIGHTARG = seg, PROCEDURE = seg_over_left,
-   COMMUTATOR = '&>',
-   RESTRICT = positionsel, JOIN = positionjoinsel
-);
-
-CREATE OPERATOR && (
-   LEFTARG = seg, RIGHTARG = seg, PROCEDURE = seg_overlap,
-   COMMUTATOR = '&&',
-   RESTRICT = positionsel, JOIN = positionjoinsel
-);
-
-CREATE OPERATOR &> (
-   LEFTARG = seg, RIGHTARG = seg, PROCEDURE = seg_over_right,
-   COMMUTATOR = '&<',
-   RESTRICT = positionsel, JOIN = positionjoinsel
-);
-
-CREATE OPERATOR >> (
-   LEFTARG = seg, RIGHTARG = seg, PROCEDURE = seg_right,
-   COMMUTATOR = '<<',
-   RESTRICT = positionsel, JOIN = positionjoinsel
-);
-
-CREATE OPERATOR = (
-   LEFTARG = seg, RIGHTARG = seg, PROCEDURE = seg_same,
-   COMMUTATOR = '=', NEGATOR = '<>',
-   RESTRICT = eqsel, JOIN = eqjoinsel,
-   SORT1 = '<', SORT2 = '<'
-);
-
-CREATE OPERATOR <> (
-   LEFTARG = seg, RIGHTARG = seg, PROCEDURE = seg_different,
-   COMMUTATOR = '<>', NEGATOR = '=',
-   RESTRICT = neqsel, JOIN = neqjoinsel
-);
-
-CREATE OPERATOR @ (
-   LEFTARG = seg, RIGHTARG = seg, PROCEDURE = seg_contains,
-   COMMUTATOR = '~',
-   RESTRICT = contsel, JOIN = contjoinsel
-);
-
-CREATE OPERATOR ~ (
-   LEFTARG = seg, RIGHTARG = seg, PROCEDURE = seg_contained,
-   COMMUTATOR = '@',
-   RESTRICT = contsel, JOIN = contjoinsel
-);
-
-
--- define the GiST support methods
-CREATE FUNCTION gseg_consistent(opaque,seg,int4) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-CREATE FUNCTION gseg_compress(opaque) RETURNS opaque 
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-CREATE FUNCTION gseg_decompress(opaque) RETURNS opaque 
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-CREATE FUNCTION gseg_penalty(opaque,opaque,opaque) RETURNS opaque
-	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
-
-CREATE FUNCTION gseg_picksplit(opaque, opaque) RETURNS opaque
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-CREATE FUNCTION gseg_union(bytea, opaque) RETURNS seg 
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-CREATE FUNCTION gseg_same(seg, seg, opaque) RETURNS opaque 
-	AS 'MODULE_PATHNAME' LANGUAGE 'c';
-
-
--- register the default opclass for indexing
-INSERT INTO pg_opclass (opcamid, opcname, opcnamespace, opcowner, opcintype, opcdefault, opckeytype)
-    VALUES (
-        (SELECT oid FROM pg_am WHERE amname = 'gist'),
-        'gist_seg_ops',
-        (SELECT oid FROM pg_namespace WHERE nspname = 'pg_catalog'),
-        1,	-- UID of superuser is hardwired to 1 as of PG 7.3
-        (SELECT oid FROM pg_type WHERE typname = 'seg'),
-        true,
-        0);
-
-
--- get the comparators for segments and store them in a tmp table
-SELECT o.oid AS opoid, o.oprname
-INTO TEMP TABLE seg_ops_tmp
-FROM pg_operator o, pg_type t
-WHERE o.oprleft = t.oid and o.oprright = t.oid
-   and t.typname = 'seg';
-
--- make sure we have the right operators
--- SELECT * from seg_ops_tmp;
-
--- using the tmp table, generate the amop entries 
-
--- seg_left
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 1, false, c.opoid
-   FROM pg_opclass opcl, seg_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_seg_ops' 
-      and c.oprname = '<<';
-
--- seg_overleft
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 2, false, c.opoid
-   FROM pg_opclass opcl, seg_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_seg_ops' 
-      and c.oprname = '&<';
-
--- seg_overlap
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 3, false, c.opoid
-   FROM pg_opclass opcl, seg_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_seg_ops' 
-      and c.oprname = '&&';
-
--- seg_overright
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 4, false, c.opoid
-   FROM pg_opclass opcl, seg_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_seg_ops' 
-      and c.oprname = '&>';
-
--- seg_right
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 5, false, c.opoid
-   FROM pg_opclass opcl, seg_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_seg_ops' 
-      and c.oprname = '>>';
-
--- seg_same
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 6, false, c.opoid
-   FROM pg_opclass opcl, seg_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_seg_ops' 
-      and c.oprname = '=';
-
--- seg_contains
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 7, false, c.opoid
-   FROM pg_opclass opcl, seg_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_seg_ops' 
-      and c.oprname = '@';
-
--- seg_contained
-INSERT INTO pg_amop (amopclaid, amopstrategy, amopreqcheck, amopopr)
-   SELECT opcl.oid, 8, false, c.opoid
-   FROM pg_opclass opcl, seg_ops_tmp c
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_seg_ops' 
-      and c.oprname = '~';
-
-DROP TABLE seg_ops_tmp;
-
-
--- add the entries to amproc for the support methods
--- note the amprocnum numbers associated with each are specific!
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 1, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_seg_ops'
-      and proname = 'gseg_consistent';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 2, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_seg_ops'
-      and proname = 'gseg_union';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 3, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_seg_ops'
-      and proname = 'gseg_compress';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 4, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_seg_ops'
-      and proname = 'gseg_decompress';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 5, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_seg_ops'
-      and proname = 'gseg_penalty';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 6, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_seg_ops'
-      and proname = 'gseg_picksplit';
-
-INSERT INTO pg_amproc (amopclaid, amprocnum, amproc)
-   SELECT opcl.oid, 7, pro.oid
-   FROM pg_opclass opcl, pg_proc pro
-   WHERE
-      opcamid = (SELECT oid FROM pg_am WHERE amname = 'gist')
-      and opcname = 'gist_seg_ops'
-      and proname = 'gseg_same';
-
-END TRANSACTION;
diff --git a/contrib/seg/segdata.h b/contrib/seg/segdata.h
deleted file mode 100644
index 69d85e0bc0..0000000000
--- a/contrib/seg/segdata.h
+++ /dev/null
@@ -1,9 +0,0 @@
-typedef struct SEG
-{
-	float		lower;
-	float		upper;
-	char		l_sigd;
-	char		u_sigd;
-	char		l_ext;
-	char		u_ext;
-}	SEG;
diff --git a/contrib/seg/segparse.y b/contrib/seg/segparse.y
deleted file mode 100644
index 3c2d6c28c0..0000000000
--- a/contrib/seg/segparse.y
+++ /dev/null
@@ -1,187 +0,0 @@
-%{
-#define YYERROR_VERBOSE   
-#define YYPARSE_PARAM result  /* need this to pass a pointer (void *) to yyparse */
-  
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-#include "segdata.h"
-#include "buffer.h"
-  
-#include "postgres.h"
-#include "utils/elog.h"
-  
-#ifdef __CYGWIN__
-#define HUGE HUGE_VAL
-#endif /* __CYGWIN__ */
-
-#undef yylex                  /* falure to redefine yylex will result in calling the */
-#define yylex seg_yylex       /* wrong scanner when running inside postgres backend  */
-
-  extern int errno;
-  extern int yylex();           /* defined as seg_yylex in segscan.c */
-  extern int significant_digits( char *str );    /* defined in seg.c */
-  
-  int seg_yyerror( char *msg );
-  int seg_yyparse( void *result );
-
-  float seg_atof( char *value );
-
-#define MAX(X,Y) ((X) > (Y) ? (X) : (Y))
-#define MIN(X,Y) ((X) < (Y) ? (X) : (Y))
-#define ABS(X) ((X) < 0 ? (-X) : (X))
-
-  long threshold;
-  char strbuf[25] = {
-    '0', '0', '0', '0', '0',
-    '0', '0', '0', '0', '0',
-    '0', '0', '0', '0', '0',
-    '0', '0', '0', '0', '0',
-    '0', '0', '0', '0', '\0'
-  };
-
-%}
-
-/* BISON Declarations */
-%union {
-  struct BND {
-    float val;
-    char  ext;
-    char  sigd;
-  } bnd;
-  char * text;
-}
-%token <text> FLOAT
-%token <text> RANGE
-%token <text> PLUMIN
-%token <text> EXTENSION
-%type  <bnd>  boundary
-%type  <bnd>  deviation
-%start range
-
-/* Grammar follows */
-%%
-
-
-range:
-          boundary PLUMIN deviation {
-	    ((SEG *)result)->lower = $1.val - $3.val;
-	    ((SEG *)result)->upper = $1.val + $3.val;
-	    sprintf(strbuf, "%g", ((SEG *)result)->lower);
-	    ((SEG *)result)->l_sigd = MAX(MIN(6, significant_digits(strbuf)), MAX($1.sigd, $3.sigd));
-	    sprintf(strbuf, "%g", ((SEG *)result)->upper);
-	    ((SEG *)result)->u_sigd = MAX(MIN(6, significant_digits(strbuf)), MAX($1.sigd, $3.sigd));
-	    ((SEG *)result)->l_ext = '\0';
-	    ((SEG *)result)->u_ext = '\0';
-          }
-      |
-          boundary RANGE boundary {
-	    ((SEG *)result)->lower = $1.val;
-	    ((SEG *)result)->upper = $3.val;
-	    if ( ((SEG *)result)->lower > ((SEG *)result)->upper ) {
-	      reset_parse_buffer();     
-	      elog(ERROR, "swapped boundaries: %g is greater than %g", ((SEG *)result)->lower, ((SEG *)result)->upper );
-	      YYERROR;
-	    }
-	    ((SEG *)result)->l_sigd = $1.sigd;
-	    ((SEG *)result)->u_sigd = $3.sigd;
-	    ((SEG *)result)->l_ext = ( $1.ext ? $1.ext : '\0' );
-	    ((SEG *)result)->u_ext = ( $3.ext ? $3.ext : '\0' );
-          }
-      |
-          boundary RANGE {
-	    ((SEG *)result)->lower = $1.val;
-	    ((SEG *)result)->upper = HUGE;
-	    ((SEG *)result)->l_sigd = $1.sigd;
-	    ((SEG *)result)->u_sigd = 0;
-	    ((SEG *)result)->l_ext = ( $1.ext ? $1.ext : '\0' );
-	    ((SEG *)result)->u_ext = '-';
-          }
-      ;
-      |
-          RANGE boundary {
-	    ((SEG *)result)->lower = -HUGE;
-	    ((SEG *)result)->upper = $2.val;
-	    ((SEG *)result)->l_sigd = 0;
-	    ((SEG *)result)->u_sigd = $2.sigd;
-	    ((SEG *)result)->l_ext = '-';
-	    ((SEG *)result)->u_ext = ( $2.ext ? $2.ext : '\0' );
-          }
-      |
-          boundary {
-	    ((SEG *)result)->lower = ((SEG *)result)->upper = $1.val;
-	    ((SEG *)result)->l_sigd = ((SEG *)result)->u_sigd = $1.sigd;
-	    ((SEG *)result)->l_ext = ((SEG *)result)->u_ext = ( $1.ext ? $1.ext : '\0' );
-          }
-      ;
-
-boundary:
-          FLOAT {
-             $$.ext = '\0';
-	     $$.sigd = significant_digits($1);
-             $$.val = seg_atof($1);
-	  }
-      | 
-	  EXTENSION FLOAT {
-             $$.ext = $1[0];
-	     $$.sigd = significant_digits($2);
-             $$.val = seg_atof($2);
-	  }
-      ;
-
-deviation:
-          FLOAT {
-             $$.ext = '\0';
-	     $$.sigd = significant_digits($1);
-             $$.val = seg_atof($1);
-	  }
-      ;
-
-%%
-
-
-float seg_atof ( char *value ) {
-  float result;
-  char *buf = (char *) palloc(256);
-
-  errno = 0;
-  sscanf(value, "%f", &result);
-
-  if ( errno ) {
-    sprintf(buf, "numeric value %s unrepresentable", value);
-    reset_parse_buffer();     
-    elog(ERROR, buf);
-  }
-
-  return result;
-}
-
-
-int seg_yyerror ( char *msg ) {
-  char *buf = (char *) palloc(256);
-  int position;
-
-  yyclearin;
-
-  if ( !strcmp(msg, "parse error, expecting `$'") ) {
-    msg = "expecting end of input";
-  }
-
-  position = parse_buffer_pos() > parse_buffer_size() ? parse_buffer_pos() - 1 : parse_buffer_pos();
-
-  sprintf(
-	  buf, 
-	  "%s at or near position %d, character ('%c', \\%03o), input: '%s'\n", 
-	  msg,
-	  position,
-	  parse_buffer()[position - 1],
-	  parse_buffer()[position - 1],
-	  parse_buffer()
-	  );
-
-  reset_parse_buffer();     
-  elog(ERROR, buf);
-  return 0;
-}
-
-
diff --git a/contrib/seg/segscan.l b/contrib/seg/segscan.l
deleted file mode 100644
index ea9032685a..0000000000
--- a/contrib/seg/segscan.l
+++ /dev/null
@@ -1,53 +0,0 @@
-%{
-/* 
-** A scanner for EMP-style numeric ranges 
-*/
-
-#include <string.h>
-#include <stdio.h>
-#include "segparse.h"
-#include "buffer.h"
-
-#define YY_NO_UNPUT 1
-#undef  yywrap
-
-/* flex screws a couple symbols when used with the -P otion; fix those */
-#define YY_DECL int seg_yylex YY_PROTO(( void )); \
-int seg_yylex YY_PROTO(( void ))
-#define yylval seg_yylval
-
-/* redefined YY_INPUT reads byte-wise from the memory area defined in buffer.c */
-#undef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-{ \
-        int c = read_parse_buffer(); \
-        result = (c == '\0') ?  YY_NULL : (buf[0] = c, 1); \
-}
-
-void seg_flush_scanner_buffer(void); 
-%}
-
-range        (\.\.)(\.)?
-plumin       (\'\+\-\')|(\(\+\-)\)
-integer      [+-]?[0-9]+
-real         [+-]?[0-9]+\.[0-9]+
-float        ({integer}|{real})([eE]{integer})?
-
-%%
-
-{range}      yylval.text = yytext; return RANGE;
-{plumin}     yylval.text = yytext; return PLUMIN;
-{float}      yylval.text = yytext; return FLOAT;
-\<           yylval.text = "<"; return EXTENSION;
-\>           yylval.text = ">"; return EXTENSION;
-\~           yylval.text = "~"; return EXTENSION;
-[ ]+         /* discard spaces */
-.            return yytext[0]; /* alert parser of the garbage */
-
-%%
-
-int seg_yylex();
-
-void seg_flush_scanner_buffer(void) {
-  YY_FLUSH_BUFFER;
-}
diff --git a/contrib/seg/sort-segments.pl b/contrib/seg/sort-segments.pl
deleted file mode 100755
index 1205d3b972..0000000000
--- a/contrib/seg/sort-segments.pl
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/perl
-
-# this script will sort any table with the segment data type in its last column
-
-while (<>) {
-  chomp;
-  push @rows, $_;
-}
-
-foreach ( sort { 
-  @ar = split("\t", $a);
-  $valA = pop @ar;
-  $valA =~ s/[~<> ]+//g;
-  @ar = split("\t", $b);
-  $valB = pop @ar;
-  $valB =~ s/[~<> ]+//g;
-  $valA <=> $valB
-} @rows ) {
-  print "$_\n";;
-}
diff --git a/contrib/seg/sql/seg.sql b/contrib/seg/sql/seg.sql
deleted file mode 100644
index 95394c95d0..0000000000
--- a/contrib/seg/sql/seg.sql
+++ /dev/null
@@ -1,223 +0,0 @@
---
---  Test seg datatype
---
-
---
--- first, define the datatype.  Turn off echoing so that expected file
--- does not depend on contents of seg.sql.
---
-\set ECHO none
-\i seg.sql
-\set ECHO all
-
---
--- testing the input and output functions
---
-
--- Any number
-SELECT '1'::seg AS seg;
-SELECT '-1'::seg AS seg;
-SELECT '1.0'::seg AS seg;
-SELECT '-1.0'::seg AS seg;
-SELECT '1e7'::seg AS seg;
-SELECT '-1e7'::seg AS seg;
-SELECT '1.0e7'::seg AS seg;
-SELECT '-1.0e7'::seg AS seg;
-SELECT '1e+7'::seg AS seg;
-SELECT '-1e+7'::seg AS seg;
-SELECT '1.0e+7'::seg AS seg;
-SELECT '-1.0e+7'::seg AS seg;
-SELECT '1e-7'::seg AS seg;
-SELECT '-1e-7'::seg AS seg;
-SELECT '1.0e-7'::seg AS seg;
-SELECT '-1.0e-7'::seg AS seg;
-SELECT '2e-6'::seg AS seg;
-SELECT '2e-5'::seg AS seg;
-SELECT '2e-4'::seg AS seg;
-SELECT '2e-3'::seg AS seg;
-SELECT '2e-2'::seg AS seg;
-SELECT '2e-1'::seg AS seg;
-SELECT '2e-0'::seg AS seg;
-SELECT '2e+0'::seg AS seg;
-SELECT '2e+1'::seg AS seg;
-SELECT '2e+2'::seg AS seg;
-SELECT '2e+3'::seg AS seg;
-SELECT '2e+4'::seg AS seg;
-SELECT '2e+5'::seg AS seg;
-SELECT '2e+6'::seg AS seg;
-
-
--- Significant digits preserved
-SELECT '1'::seg AS seg;
-SELECT '1.0'::seg AS seg;
-SELECT '1.00'::seg AS seg;
-SELECT '1.000'::seg AS seg;
-SELECT '1.0000'::seg AS seg;
-SELECT '1.00000'::seg AS seg;
-SELECT '1.000000'::seg AS seg;
-SELECT '0.000000120'::seg AS seg;
-SELECT '3.400e5'::seg AS seg;
-
--- Digits truncated
-SELECT '12.34567890123456'::seg AS seg;
-
--- Numbers with certainty indicators
-SELECT '~6.5'::seg AS seg;
-SELECT '<6.5'::seg AS seg;
-SELECT '>6.5'::seg AS seg;
-SELECT '~ 6.5'::seg AS seg;
-SELECT '< 6.5'::seg AS seg;
-SELECT '> 6.5'::seg AS seg;
-
--- Open intervals
-SELECT '0..'::seg AS seg;
-SELECT '0...'::seg AS seg;
-SELECT '0 ..'::seg AS seg;
-SELECT '0 ...'::seg AS seg;
-SELECT '..0'::seg AS seg;
-SELECT '...0'::seg AS seg;
-SELECT '.. 0'::seg AS seg;
-SELECT '... 0'::seg AS seg;
-
--- Finite intervals
-SELECT '0 .. 1'::seg AS seg;
-SELECT '-1 .. 0'::seg AS seg;
-SELECT '-1 .. 1'::seg AS seg;
-
--- (+/-) intervals
-SELECT '0(+-)1'::seg AS seg;
-SELECT '0(+-)1.0'::seg AS seg;
-SELECT '1.0(+-)0.005'::seg AS seg;
-SELECT '101(+-)1'::seg AS seg;
--- incorrect number of significant digits in 99.0:
-SELECT '100(+-)1'::seg AS seg;
-
--- invalid input
-SELECT ''::seg AS seg;
-SELECT 'ABC'::seg AS seg;
-SELECT '1ABC'::seg AS seg;
-SELECT '1.'::seg AS seg;
-SELECT '1.....'::seg AS seg;
-SELECT '.1'::seg AS seg;
-SELECT '1..2.'::seg AS seg;
-SELECT '1 e7'::seg AS seg;
-SELECT '1e700'::seg AS seg;
-
---
--- testing the  operators
---
-
--- equality/inequality:
---
-SELECT '24 .. 33.20'::seg = '24 .. 33.20'::seg AS bool;
-SELECT '24 .. 33.20'::seg = '24 .. 33.21'::seg AS bool;
-SELECT '24 .. 33.20'::seg != '24 .. 33.20'::seg AS bool;
-SELECT '24 .. 33.20'::seg != '24 .. 33.21'::seg AS bool;
-
--- overlap
---
-SELECT '1'::seg && '1'::seg AS bool;
-SELECT '1'::seg && '2'::seg AS bool;
-SELECT '0 ..'::seg && '0 ..'::seg AS bool;
-SELECT '0 .. 1'::seg && '0 .. 1'::seg AS bool;
-SELECT '..0'::seg && '0..'::seg AS bool;
-SELECT '-1 .. 0.1'::seg && '0 .. 1'::seg AS bool;
-SELECT '-1 .. 0'::seg && '0 .. 1'::seg AS bool;
-SELECT '-1 .. -0.0001'::seg && '0 .. 1'::seg AS bool;
-SELECT '0 ..'::seg && '1'::seg AS bool;
-SELECT '0 .. 1'::seg && '1'::seg AS bool;
-SELECT '0 .. 1'::seg && '2'::seg AS bool;
-SELECT '0 .. 2'::seg && '1'::seg AS bool;
-SELECT '1'::seg && '0 .. 1'::seg AS bool;
-SELECT '2'::seg && '0 .. 1'::seg AS bool;
-SELECT '1'::seg && '0 .. 2'::seg AS bool;
-
--- overlap on the left
---
-SELECT '1'::seg &< '0'::seg AS bool;
-SELECT '1'::seg &< '1'::seg AS bool;
-SELECT '1'::seg &< '2'::seg AS bool;
-SELECT '0 .. 1'::seg &< '0'::seg AS bool;
-SELECT '0 .. 1'::seg &< '1'::seg AS bool;
-SELECT '0 .. 1'::seg &< '2'::seg AS bool;
-SELECT '0 .. 1'::seg &< '0 .. 0.5'::seg AS bool;
-SELECT '0 .. 1'::seg &< '0 .. 1'::seg AS bool;
-SELECT '0 .. 1'::seg &< '0 .. 2'::seg AS bool;
-SELECT '0 .. 1'::seg &< '1 .. 2'::seg AS bool;
-SELECT '0 .. 1'::seg &< '2 .. 3'::seg AS bool;
-
--- overlap on the right
---
-SELECT '0'::seg &> '1'::seg AS bool;
-SELECT '1'::seg &> '1'::seg AS bool;
-SELECT '2'::seg &> '1'::seg AS bool;
-SELECT '0'::seg &> '0 .. 1'::seg AS bool;
-SELECT '1'::seg &> '0 .. 1'::seg AS bool;
-SELECT '2'::seg &> '0 .. 1'::seg AS bool;
-SELECT '0 .. 0.5'::seg &> '0 .. 1'::seg AS bool;
-SELECT '0 .. 1'::seg &> '0 .. 1'::seg AS bool;
-SELECT '0 .. 2'::seg &> '0 .. 2'::seg AS bool;
-SELECT '1 .. 2'::seg &> '0 .. 1'::seg AS bool;
-SELECT '2 .. 3'::seg &> '0 .. 1'::seg AS bool;
-
--- left
---
-SELECT '1'::seg << '0'::seg AS bool;
-SELECT '1'::seg << '1'::seg AS bool;
-SELECT '1'::seg << '2'::seg AS bool;
-SELECT '0 .. 1'::seg << '0'::seg AS bool;
-SELECT '0 .. 1'::seg << '1'::seg AS bool;
-SELECT '0 .. 1'::seg << '2'::seg AS bool;
-SELECT '0 .. 1'::seg << '0 .. 0.5'::seg AS bool;
-SELECT '0 .. 1'::seg << '0 .. 1'::seg AS bool;
-SELECT '0 .. 1'::seg << '0 .. 2'::seg AS bool;
-SELECT '0 .. 1'::seg << '1 .. 2'::seg AS bool;
-SELECT '0 .. 1'::seg << '2 .. 3'::seg AS bool;
-
--- right
---
-SELECT '0'::seg >> '1'::seg AS bool;
-SELECT '1'::seg >> '1'::seg AS bool;
-SELECT '2'::seg >> '1'::seg AS bool;
-SELECT '0'::seg >> '0 .. 1'::seg AS bool;
-SELECT '1'::seg >> '0 .. 1'::seg AS bool;
-SELECT '2'::seg >> '0 .. 1'::seg AS bool;
-SELECT '0 .. 0.5'::seg >> '0 .. 1'::seg AS bool;
-SELECT '0 .. 1'::seg >> '0 .. 1'::seg AS bool;
-SELECT '0 .. 2'::seg >> '0 .. 2'::seg AS bool;
-SELECT '1 .. 2'::seg >> '0 .. 1'::seg AS bool;
-SELECT '2 .. 3'::seg >> '0 .. 1'::seg AS bool;
-
-
--- "contained in" (the left value belongs within the interval specified in the right value):
---
-SELECT '0'::seg        ~ '0'::seg AS bool;
-SELECT '0'::seg        ~ '0 ..'::seg AS bool;
-SELECT '0'::seg        ~ '.. 0'::seg AS bool;
-SELECT '0'::seg        ~ '-1 .. 1'::seg AS bool;
-SELECT '0'::seg        ~ '-1 .. 1'::seg AS bool;
-SELECT '-1'::seg       ~ '-1 .. 1'::seg AS bool;
-SELECT '1'::seg        ~ '-1 .. 1'::seg AS bool;
-SELECT '-1 .. 1'::seg  ~ '-1 .. 1'::seg AS bool;
-
--- "contains" (the left value contains the interval specified in the right value):
---
-SELECT '0'::seg @ '0'::seg AS bool;
-SELECT '0 .. '::seg ~ '0'::seg AS bool;
-SELECT '.. 0'::seg ~ '0'::seg AS bool;
-SELECT '-1 .. 1'::seg ~ '0'::seg AS bool;
-SELECT '0'::seg ~ '-1 .. 1'::seg AS bool;
-SELECT '-1'::seg ~ '-1 .. 1'::seg AS bool;
-SELECT '1'::seg ~ '-1 .. 1'::seg AS bool;
-
--- Load some example data and build the index
--- 
-CREATE TABLE test_seg (s seg);
-
-\copy test_seg from 'data/test_seg.data'
-
-CREATE INDEX test_seg_ix ON test_seg USING gist (s);
-SELECT count(*) FROM test_seg WHERE s @ '11..11.3';
-
--- Test sorting 
-SELECT * FROM test_seg WHERE s @ '11..11.3' GROUP BY s;
diff --git a/contrib/spi/Makefile b/contrib/spi/Makefile
deleted file mode 100644
index cf4c0d1dbf..0000000000
--- a/contrib/spi/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.21 2001/09/06 10:49:30 petere Exp $
-
-subdir = contrib/spi
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-MODULES = autoinc insert_username moddatetime refint timetravel
-DATA_built = $(addsuffix .sql, $(MODULES))
-DOCS	= README.spi $(addsuffix .example, $(MODULES))
-
-ifdef REFINT_VERBOSE
-PG_CPPFLAGS = -DREFINT_VERBOSE
-endif
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/spi/README.spi b/contrib/spi/README.spi
deleted file mode 100644
index 65868f0fc7..0000000000
--- a/contrib/spi/README.spi
+++ /dev/null
@@ -1,104 +0,0 @@
-
-Here are general trigger functions provided as workable examples
-of using SPI and triggers. "General" means that functions may be
-used for defining triggers for any tables but you have to specify
-table/field names (as described below) while creating a trigger.
-
-1. refint.c - functions for implementing referential integrity.
-
-check_primary_key () is to used for foreign keys of a table.
-   
-   You are to create trigger (BEFORE INSERT OR UPDATE) using this 
-function on a table referencing another table. You are to specify
-as function arguments: triggered table column names which correspond
-to foreign key, referenced table name and column names in referenced
-table which correspond to primary/unique key.
-   You may create as many triggers as you need - one trigger for
-one reference.
-
-check_foreign_key () is to used for primary/unique keys of a table.
-
-   You are to create trigger (BEFORE DELETE OR UPDATE) using this
-function on a table referenced by another table(s). You are to specify
-as function arguments: number of references for which function has to
-performe checking, action if referencing key found ('cascade' - to delete
-corresponding foreign key, 'restrict' - to abort transaction if foreign keys 
-exist, 'setnull' - to set foreign key referencing primary/unique key
-being deleted to null), triggered table column names which correspond
-to primary/unique key, referencing table name and column names corresponding
-to foreign key (, ... - as many referencing tables/keys as specified
-by first argument).
-   Note, that NOT NULL constraint and unique index have to be defined by
-youself.
-
-   There are examples in refint.example and regression tests
-(sql/triggers.sql).
-
-   To CREATE FUNCTIONs use refint.sql (will be made by gmake from
-refint.source).
-
-
-2. timetravel.c - functions for implementing time travel feature.
-
-   Old internally supported time-travel (TT) used insert/delete
-transaction commit times. To get the same feature using triggers
-you are to add to a table two columns of abstime type to store
-date when a tuple was inserted (start_date) and changed/deleted 
-(stop_date):
-
-CREATE TABLE XXX (
-	...		...
-	date_on		abstime default currabstime(),
-	date_off	abstime default 'infinity'
-	...		...
-);
-
-- so, tuples being inserted with NULLs in date_on/date_off will get
-_current_date_ in date_on (name of start_date column in XXX) and INFINITY in
-date_off (name of stop_date column in XXX).
-
-   Tuples with stop_date equal INFINITY are "valid now": when trigger will
-be fired for UPDATE/DELETE of a tuple with stop_date NOT equal INFINITY then
-this tuple will not be changed/deleted!
-
-   If stop_date equal INFINITY then on
-
-UPDATE: only stop_date in tuple being updated will be changed to current
-date and new tuple with new data (coming from SET ... in UPDATE) will be
-inserted. Start_date in this new tuple will be setted to current date and
-stop_date - to INFINITY.
-
-DELETE: new tuple will be inserted with stop_date setted to current date
-(and with the same data in other columns as in tuple being deleted).
-
-   NOTE:
-1. To get tuples "valid now" you are to add _stop_date_ = 'infinity'
-   to WHERE. Internally supported TT allowed to avoid this...
-   Fixed rewriting RULEs could help here...
-   As work arround you may use VIEWs...
-2. You can't change start/stop date columns with UPDATE! 
-   Use set_timetravel (below) if you need in this.
-
-   FUNCTIONs:
-
-timetravel() is general trigger function.
-
-   You are to create trigger BEFORE (!!!) UPDATE OR DELETE using this
-function on a time-traveled table. You are to specify two arguments: name of
-start_date column and name of stop_date column in triggered table.
-
-currabstime() may be used in DEFAULT for start_date column to get
-current date.
-
-set_timetravel() allows you turn time-travel ON/OFF for a table:
-
-   set_timetravel('XXX', 1) will turn TT ON for table XXX (and report
-old status).
-   set_timetravel('XXX', 0) will turn TT OFF for table XXX (-"-).
-
-Turning TT OFF allows you do with a table ALL what you want.
-
-   There is example in timetravel.example.
-
-   To CREATE FUNCTIONs use timetravel.sql (will be made by gmake from
-timetravel.source).
diff --git a/contrib/spi/autoinc.c b/contrib/spi/autoinc.c
deleted file mode 100644
index 92d3e97c22..0000000000
--- a/contrib/spi/autoinc.c
+++ /dev/null
@@ -1,107 +0,0 @@
-
-#include "executor/spi.h"		/* this is what you need to work with SPI */
-#include "commands/trigger.h"	/* -"- and triggers */
-#include "commands/sequence.h"	/* for nextval() */
-
-extern Datum autoinc(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(autoinc);
-
-Datum
-autoinc(PG_FUNCTION_ARGS)
-{
-	TriggerData *trigdata = (TriggerData *) fcinfo->context;
-	Trigger    *trigger;		/* to get trigger name */
-	int			nargs;			/* # of arguments */
-	int		   *chattrs;		/* attnums of attributes to change */
-	int			chnattrs = 0;	/* # of above */
-	Datum	   *newvals;		/* vals of above */
-	char	  **args;			/* arguments */
-	char	   *relname;		/* triggered relation name */
-	Relation	rel;			/* triggered relation */
-	HeapTuple	rettuple = NULL;
-	TupleDesc	tupdesc;		/* tuple description */
-	bool		isnull;
-	int			i;
-
-	if (!CALLED_AS_TRIGGER(fcinfo))
-		elog(ERROR, "autoinc: not fired by trigger manager");
-	if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
-		elog(ERROR, "autoinc: can't process STATEMENT events");
-	if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
-		elog(ERROR, "autoinc: must be fired before event");
-
-	if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event))
-		rettuple = trigdata->tg_trigtuple;
-	else if (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event))
-		rettuple = trigdata->tg_newtuple;
-	else
-		elog(ERROR, "autoinc: can't process DELETE events");
-
-	rel = trigdata->tg_relation;
-	relname = SPI_getrelname(rel);
-
-	trigger = trigdata->tg_trigger;
-
-	nargs = trigger->tgnargs;
-	if (nargs <= 0 || nargs % 2 != 0)
-		elog(ERROR, "autoinc (%s): even number gt 0 of arguments was expected", relname);
-
-	args = trigger->tgargs;
-	tupdesc = rel->rd_att;
-
-	chattrs = (int *) palloc(nargs / 2 * sizeof(int));
-	newvals = (Datum *) palloc(nargs / 2 * sizeof(Datum));
-
-	for (i = 0; i < nargs;)
-	{
-		int			attnum = SPI_fnumber(tupdesc, args[i]);
-		int32		val;
-		Datum		seqname;
-
-		if (attnum < 0)
-			elog(ERROR, "autoinc (%s): there is no attribute %s",
-				 relname, args[i]);
-		if (SPI_gettypeid(tupdesc, attnum) != INT4OID)
-			elog(ERROR, "autoinc (%s): attribute %s must be of INT4 type",
-				 relname, args[i]);
-
-		val = DatumGetInt32(SPI_getbinval(rettuple, tupdesc, attnum, &isnull));
-
-		if (!isnull && val != 0)
-		{
-			i += 2;
-			continue;
-		}
-
-		i++;
-		chattrs[chnattrs] = attnum;
-		seqname = DirectFunctionCall1(textin,
-									  CStringGetDatum(args[i]));
-		newvals[chnattrs] = DirectFunctionCall1(nextval, seqname);
-		/* nextval now returns int64; coerce down to int32 */
-		newvals[chnattrs] = Int32GetDatum((int32) DatumGetInt64(newvals[chnattrs]));
-		if (DatumGetInt32(newvals[chnattrs]) == 0)
-		{
-			newvals[chnattrs] = DirectFunctionCall1(nextval, seqname);
-			newvals[chnattrs] = Int32GetDatum((int32) DatumGetInt64(newvals[chnattrs]));
-		}
-		pfree(DatumGetTextP(seqname));
-		chnattrs++;
-		i++;
-	}
-
-	if (chnattrs > 0)
-	{
-		rettuple = SPI_modifytuple(rel, rettuple, chnattrs, chattrs, newvals, NULL);
-		if (rettuple == NULL)
-			elog(ERROR, "autoinc (%s): %d returned by SPI_modifytuple",
-				 relname, SPI_result);
-	}
-
-	pfree(relname);
-	pfree(chattrs);
-	pfree(newvals);
-
-	return PointerGetDatum(rettuple);
-}
diff --git a/contrib/spi/autoinc.example b/contrib/spi/autoinc.example
deleted file mode 100644
index a2f470dc2d..0000000000
--- a/contrib/spi/autoinc.example
+++ /dev/null
@@ -1,35 +0,0 @@
-DROP SEQUENCE next_id;
-DROP TABLE ids;
-
-CREATE SEQUENCE next_id START -2 MINVALUE -2;
-
-CREATE TABLE ids (
-	id		int4,
-	idesc		text
-);
-
-CREATE TRIGGER ids_nextid 
-	BEFORE INSERT OR UPDATE ON ids
-	FOR EACH ROW 
-	EXECUTE PROCEDURE autoinc (id, next_id);
-
-INSERT INTO ids VALUES (0, 'first (-2 ?)');
-INSERT INTO ids VALUES (null, 'second (-1 ?)');
-INSERT INTO ids(idesc) VALUES ('third (1 ?!)');
-
-SELECT * FROM ids;
-
-UPDATE ids SET id = null, idesc = 'first: -2 --> 2' 
-	WHERE idesc = 'first (-2 ?)';
-UPDATE ids SET id = 0, idesc = 'second: -1 --> 3' 
-	WHERE id = -1;
-UPDATE ids SET id = 4, idesc = 'third: 1 --> 4' 
-	WHERE id = 1;
-
-SELECT * FROM ids;
-
-SELECT 'Wasn''t it 4 ?' as nextval, nextval ('next_id') as value;
-
-insert into ids (idesc) select textcat (idesc, '. Copy.') from ids;
-
-SELECT * FROM ids;
diff --git a/contrib/spi/autoinc.sql.in b/contrib/spi/autoinc.sql.in
deleted file mode 100644
index 3676742943..0000000000
--- a/contrib/spi/autoinc.sql.in
+++ /dev/null
@@ -1,6 +0,0 @@
-DROP FUNCTION autoinc();
-
-CREATE FUNCTION autoinc() 
-	RETURNS opaque 
-	AS 'MODULE_PATHNAME'
-	LANGUAGE 'C';
diff --git a/contrib/spi/insert_username.c b/contrib/spi/insert_username.c
deleted file mode 100644
index 0bedaa98ae..0000000000
--- a/contrib/spi/insert_username.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * insert_username.c
- * $Modified: Thu Oct 16 08:13:42 1997 by brook $
- *
- * insert user name in response to a trigger
- * usage:  insert_username (column_name)
- */
-