Updated databases/postgresql to 7.3.1.

      ==================================================================
      | NOTE:  A dump-and-restore is required to update your databases |
      |        if you wish to update postgresql-server. If your        |
      |        application examines the system catalogs, additional    |
      |        changes will be required due to the introduction of     |
      |        schemas in 7.3; for more information, see:              |
      |                                                                |
      |   http://www.ca.postgresql.org/docs/momjian/upgrade_tips_7.3   |
      ==================================================================

Major changes from version 7.2.3 include:

   Schemas
          Schemas allow users to create objects in separate namespaces,
          so two people or applications can have tables with the same
          name. There is also a public schema for shared tables.
          Table/index creation can be restricted by removing permissions
          on the public schema.

   Drop Column
          PostgreSQL now supports the ALTER TABLE ... DROP COLUMN
          functionality.

   Table Functions
          Functions returning multiple rows and/or multiple columns are
          now much easier to use than before. You can call such a "table
          function" in the SELECT FROM clause, treating its output like a
          table. Also, PL/pgSQL functions can now return sets.

   Prepared Queries
          PostgreSQL now supports prepared queries, for improved
          performance.

   Dependency Tracking
          PostgreSQL now records object dependencies, which allows
          improvements in many areas. "DROP" statements now take either
          CASCADE or RESTRICT to control whether dependent objects are
          also dropped.

   Privileges
          Functions and procedural languages now have privileges, and
          functions can be defined to run with the privileges of their
          creator.

   Internationalization
          Both multibyte and locale support are now always enabled.

   Logging
          A variety of logging options have been enhanced.

   Interfaces
          A large number of interfaces have been moved to
          http://gborg.postgresql.org where they can be developed and
          released independently.

   Functions/Identifiers
          By default, functions can now take up to 32 parameters, and
          identifiers can be up to 63 bytes long. Also, OPAQUE is now
          deprecated: there are specific "pseudo-datatypes" to represent
          each of the former meanings of OPAQUE in function argument and
          result types.

3 files changed, 371 insertions, 373 deletions

diff --git a/databases/postgresql-lib/Makefile b/databases/postgresql-lib/Makefile
index 481f613098a..5e55edb1280 100644
--- a/databases/postgresql-lib/Makefile
+++ b/databases/postgresql-lib/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2002/10/19 03:03:50 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/01/05 20:12:23 jlam Exp $
 
 PKGNAME=		postgresql-lib-${BASE_VERS}
 COMMENT=		PostgreSQL database headers and libraries
 
-USE_BUILDLINK2=		# defined
-
-.include "../../databases/postgresql/Makefile.common"
+.include "../postgresql/Makefile.common"
 
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 BUILD_DIRS=		${WRKSRC}/src/include
@@ -28,6 +26,8 @@ post-install:
 		${MAKE_PROGRAM} install-all-headers
 	${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz             \
 		`${SED} -e "s|^#.*||" ${FILESDIR}/man.lib`
+	${RM} -f ${PREFIX}/include/pgsql
+	${LN} -sf postgresql ${PREFIX}/include/pgsql
 
 .include "../../security/openssl/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql-lib/PLIST b/databases/postgresql-lib/PLIST
index d71b6c6d694..ef4d0f8548f 100644
--- a/databases/postgresql-lib/PLIST
+++ b/databases/postgresql-lib/PLIST
@@ -1,373 +1,370 @@
-@comment $NetBSD: PLIST,v 1.3 2002/04/04 07:41:03 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/01/05 20:12:24 jlam Exp $
 bin/ecpg
-include/pgsql/ecpgerrno.h
-include/pgsql/ecpglib.h
-include/pgsql/ecpgtype.h
-include/pgsql/internal/c.h
-include/pgsql/internal/lib/dllist.h
-include/pgsql/internal/libpq-int.h
-include/pgsql/internal/libpq/pqcomm.h
-include/pgsql/internal/postgres_fe.h
-include/pgsql/internal/pqexpbuffer.h
-include/pgsql/libpgeasy.h
-include/pgsql/libpq++.h
-include/pgsql/libpq++/pgconnection.h
-include/pgsql/libpq++/pgcursordb.h
-include/pgsql/libpq++/pgdatabase.h
-include/pgsql/libpq++/pglobject.h
-include/pgsql/libpq++/pgtransdb.h
-include/pgsql/libpq-fe.h
-include/pgsql/libpq/libpq-fs.h
-include/pgsql/pg_config.h
-include/pgsql/pg_config_os.h
-include/pgsql/postgres_ext.h
-include/pgsql/server/access/attnum.h
-include/pgsql/server/access/clog.h
-include/pgsql/server/access/genam.h
-include/pgsql/server/access/gist.h
-include/pgsql/server/access/gistscan.h
-include/pgsql/server/access/hash.h
-include/pgsql/server/access/heapam.h
-include/pgsql/server/access/hio.h
-include/pgsql/server/access/htup.h
-include/pgsql/server/access/ibit.h
-include/pgsql/server/access/iqual.h
-include/pgsql/server/access/istrat.h
-include/pgsql/server/access/itup.h
-include/pgsql/server/access/nbtree.h
-include/pgsql/server/access/printtup.h
-include/pgsql/server/access/relscan.h
-include/pgsql/server/access/rmgr.h
-include/pgsql/server/access/rtree.h
-include/pgsql/server/access/rtscan.h
-include/pgsql/server/access/sdir.h
-include/pgsql/server/access/skey.h
-include/pgsql/server/access/strat.h
-include/pgsql/server/access/transam.h
-include/pgsql/server/access/tupdesc.h
-include/pgsql/server/access/tupmacs.h
-include/pgsql/server/access/tuptoaster.h
-include/pgsql/server/access/valid.h
-include/pgsql/server/access/xact.h
-include/pgsql/server/access/xlog.h
-include/pgsql/server/access/xlogdefs.h
-include/pgsql/server/access/xlogutils.h
-include/pgsql/server/bootstrap/bootstrap.h
-include/pgsql/server/c.h
-include/pgsql/server/catalog/catalog.h
-include/pgsql/server/catalog/catname.h
-include/pgsql/server/catalog/catversion.h
-include/pgsql/server/catalog/heap.h
-include/pgsql/server/catalog/index.h
-include/pgsql/server/catalog/indexing.h
-include/pgsql/server/catalog/pg_aggregate.h
-include/pgsql/server/catalog/pg_am.h
-include/pgsql/server/catalog/pg_amop.h
-include/pgsql/server/catalog/pg_amproc.h
-include/pgsql/server/catalog/pg_attrdef.h
-include/pgsql/server/catalog/pg_attribute.h
-include/pgsql/server/catalog/pg_class.h
-include/pgsql/server/catalog/pg_control.h
-include/pgsql/server/catalog/pg_database.h
-include/pgsql/server/catalog/pg_description.h
-include/pgsql/server/catalog/pg_group.h
-include/pgsql/server/catalog/pg_index.h
-include/pgsql/server/catalog/pg_inherits.h
-include/pgsql/server/catalog/pg_language.h
-include/pgsql/server/catalog/pg_largeobject.h
-include/pgsql/server/catalog/pg_listener.h
-include/pgsql/server/catalog/pg_opclass.h
-include/pgsql/server/catalog/pg_operator.h
-include/pgsql/server/catalog/pg_proc.h
-include/pgsql/server/catalog/pg_relcheck.h
-include/pgsql/server/catalog/pg_rewrite.h
-include/pgsql/server/catalog/pg_shadow.h
-include/pgsql/server/catalog/pg_statistic.h
-include/pgsql/server/catalog/pg_trigger.h
-include/pgsql/server/catalog/pg_type.h
-include/pgsql/server/catalog/pg_version.h
-include/pgsql/server/commands/async.h
-include/pgsql/server/commands/cluster.h
-include/pgsql/server/commands/command.h
-include/pgsql/server/commands/comment.h
-include/pgsql/server/commands/copy.h
-include/pgsql/server/commands/creatinh.h
-include/pgsql/server/commands/dbcommands.h
-include/pgsql/server/commands/defrem.h
-include/pgsql/server/commands/explain.h
-include/pgsql/server/commands/proclang.h
-include/pgsql/server/commands/rename.h
-include/pgsql/server/commands/sequence.h
-include/pgsql/server/commands/trigger.h
-include/pgsql/server/commands/user.h
-include/pgsql/server/commands/vacuum.h
-include/pgsql/server/commands/variable.h
-include/pgsql/server/commands/version.h
-include/pgsql/server/commands/view.h
-include/pgsql/server/dynloader.h
-include/pgsql/server/executor/execFlatten.h
-include/pgsql/server/executor/execdebug.h
-include/pgsql/server/executor/execdefs.h
-include/pgsql/server/executor/execdesc.h
-include/pgsql/server/executor/executor.h
-include/pgsql/server/executor/functions.h
-include/pgsql/server/executor/hashjoin.h
-include/pgsql/server/executor/instrument.h
-include/pgsql/server/executor/nodeAgg.h
-include/pgsql/server/executor/nodeAppend.h
-include/pgsql/server/executor/nodeGroup.h
-include/pgsql/server/executor/nodeHash.h
-include/pgsql/server/executor/nodeHashjoin.h
-include/pgsql/server/executor/nodeIndexscan.h
-include/pgsql/server/executor/nodeLimit.h
-include/pgsql/server/executor/nodeMaterial.h
-include/pgsql/server/executor/nodeMergejoin.h
-include/pgsql/server/executor/nodeNestloop.h
-include/pgsql/server/executor/nodeResult.h
-include/pgsql/server/executor/nodeSeqscan.h
-include/pgsql/server/executor/nodeSetOp.h
-include/pgsql/server/executor/nodeSort.h
-include/pgsql/server/executor/nodeSubplan.h
-include/pgsql/server/executor/nodeSubqueryscan.h
-include/pgsql/server/executor/nodeTidscan.h
-include/pgsql/server/executor/nodeUnique.h
-include/pgsql/server/executor/spi.h
-include/pgsql/server/executor/spi_priv.h
-include/pgsql/server/executor/tuptable.h
-include/pgsql/server/fmgr.h
-include/pgsql/server/lib/dllist.h
-include/pgsql/server/lib/lispsort.h
-include/pgsql/server/lib/stringinfo.h
-include/pgsql/server/libpq/auth.h
-include/pgsql/server/libpq/be-fsstubs.h
-include/pgsql/server/libpq/crypt.h
-include/pgsql/server/libpq/hba.h
-include/pgsql/server/libpq/libpq-be.h
-include/pgsql/server/libpq/libpq-fs.h
-include/pgsql/server/libpq/libpq.h
-include/pgsql/server/libpq/password.h
-include/pgsql/server/libpq/pqcomm.h
-include/pgsql/server/libpq/pqformat.h
-include/pgsql/server/libpq/pqsignal.h
-include/pgsql/server/mb/pg_wchar.h
-include/pgsql/server/miscadmin.h
-include/pgsql/server/nodes/execnodes.h
-include/pgsql/server/nodes/makefuncs.h
-include/pgsql/server/nodes/memnodes.h
-include/pgsql/server/nodes/nodeFuncs.h
-include/pgsql/server/nodes/nodes.h
-include/pgsql/server/nodes/params.h
-include/pgsql/server/nodes/parsenodes.h
-include/pgsql/server/nodes/pg_list.h
-include/pgsql/server/nodes/plannodes.h
-include/pgsql/server/nodes/primnodes.h
-include/pgsql/server/nodes/print.h
-include/pgsql/server/nodes/readfuncs.h
-include/pgsql/server/nodes/relation.h
-include/pgsql/server/optimizer/clauses.h
-include/pgsql/server/optimizer/cost.h
-include/pgsql/server/optimizer/geqo.h
-include/pgsql/server/optimizer/geqo_copy.h
-include/pgsql/server/optimizer/geqo_gene.h
-include/pgsql/server/optimizer/geqo_misc.h
-include/pgsql/server/optimizer/geqo_mutation.h
-include/pgsql/server/optimizer/geqo_pool.h
-include/pgsql/server/optimizer/geqo_random.h
-include/pgsql/server/optimizer/geqo_recombination.h
-include/pgsql/server/optimizer/geqo_selection.h
-include/pgsql/server/optimizer/joininfo.h
-include/pgsql/server/optimizer/pathnode.h
-include/pgsql/server/optimizer/paths.h
-include/pgsql/server/optimizer/plancat.h
-include/pgsql/server/optimizer/planmain.h
-include/pgsql/server/optimizer/planner.h
-include/pgsql/server/optimizer/prep.h
-include/pgsql/server/optimizer/restrictinfo.h
-include/pgsql/server/optimizer/subselect.h
-include/pgsql/server/optimizer/tlist.h
-include/pgsql/server/optimizer/var.h
-include/pgsql/server/parser/analyze.h
-include/pgsql/server/parser/gramparse.h
-include/pgsql/server/parser/keywords.h
-include/pgsql/server/parser/parse_agg.h
-include/pgsql/server/parser/parse_clause.h
-include/pgsql/server/parser/parse_coerce.h
-include/pgsql/server/parser/parse_expr.h
-include/pgsql/server/parser/parse_func.h
-include/pgsql/server/parser/parse_node.h
-include/pgsql/server/parser/parse_oper.h
-include/pgsql/server/parser/parse_relation.h
-include/pgsql/server/parser/parse_target.h
-include/pgsql/server/parser/parse_type.h
-include/pgsql/server/parser/parser.h
-include/pgsql/server/parser/parsetree.h
-include/pgsql/server/parser/scansup.h
-include/pgsql/server/pg_config.h
-include/pgsql/server/pg_config_os.h
-include/pgsql/server/pgstat.h
-include/pgsql/server/port/aix.h
-include/pgsql/server/port/beos.h
-include/pgsql/server/port/bsdi.h
-include/pgsql/server/port/darwin.h
-include/pgsql/server/port/dgux.h
-include/pgsql/server/port/freebsd.h
-include/pgsql/server/port/hpux.h
-include/pgsql/server/port/irix5.h
-include/pgsql/server/port/linux.h
-include/pgsql/server/port/netbsd.h
-include/pgsql/server/port/nextstep.h
-include/pgsql/server/port/openbsd.h
-include/pgsql/server/port/osf.h
-include/pgsql/server/port/qnx4.h
-include/pgsql/server/port/sco.h
-include/pgsql/server/port/solaris.h
-include/pgsql/server/port/sunos4.h
-include/pgsql/server/port/svr4.h
-include/pgsql/server/port/ultrix4.h
-include/pgsql/server/port/univel.h
-include/pgsql/server/port/unixware.h
-include/pgsql/server/port/win.h
-include/pgsql/server/port/win32.h
-include/pgsql/server/postgres.h
-include/pgsql/server/postgres_ext.h
-include/pgsql/server/postgres_fe.h
-include/pgsql/server/regex/cclass.h
-include/pgsql/server/regex/cname.h
-include/pgsql/server/regex/regex.h
-include/pgsql/server/regex/regex2.h
-include/pgsql/server/regex/utils.h
-include/pgsql/server/rewrite/prs2lock.h
-include/pgsql/server/rewrite/rewriteDefine.h
-include/pgsql/server/rewrite/rewriteHandler.h
-include/pgsql/server/rewrite/rewriteManip.h
-include/pgsql/server/rewrite/rewriteRemove.h
-include/pgsql/server/rewrite/rewriteSupport.h
-include/pgsql/server/rusagestub.h
-include/pgsql/server/storage/backendid.h
-include/pgsql/server/storage/block.h
-include/pgsql/server/storage/buf.h
-include/pgsql/server/storage/buf_internals.h
-include/pgsql/server/storage/buffile.h
-include/pgsql/server/storage/bufmgr.h
-include/pgsql/server/storage/bufpage.h
-include/pgsql/server/storage/fd.h
-include/pgsql/server/storage/freespace.h
-include/pgsql/server/storage/ipc.h
-include/pgsql/server/storage/item.h
-include/pgsql/server/storage/itemid.h
-include/pgsql/server/storage/itempos.h
-include/pgsql/server/storage/itemptr.h
-include/pgsql/server/storage/large_object.h
-include/pgsql/server/storage/lmgr.h
-include/pgsql/server/storage/lock.h
-include/pgsql/server/storage/lwlock.h
-include/pgsql/server/storage/off.h
-include/pgsql/server/storage/page.h
-include/pgsql/server/storage/pmsignal.h
-include/pgsql/server/storage/pos.h
-include/pgsql/server/storage/proc.h
-include/pgsql/server/storage/relfilenode.h
-include/pgsql/server/storage/s_lock.h
-include/pgsql/server/storage/shmem.h
-include/pgsql/server/storage/sinval.h
-include/pgsql/server/storage/sinvaladt.h
-include/pgsql/server/storage/smgr.h
-include/pgsql/server/storage/spin.h
-include/pgsql/server/strdup.h
-include/pgsql/server/tcop/dest.h
-include/pgsql/server/tcop/fastpath.h
-include/pgsql/server/tcop/pquery.h
-include/pgsql/server/tcop/tcopdebug.h
-include/pgsql/server/tcop/tcopprot.h
-include/pgsql/server/tcop/utility.h
-include/pgsql/server/utils/acl.h
-include/pgsql/server/utils/array.h
-include/pgsql/server/utils/ascii.h
-include/pgsql/server/utils/bit.h
-include/pgsql/server/utils/builtins.h
-include/pgsql/server/utils/cash.h
-include/pgsql/server/utils/catcache.h
-include/pgsql/server/utils/date.h
-include/pgsql/server/utils/datetime.h
-include/pgsql/server/utils/datum.h
-include/pgsql/server/utils/dynahash.h
-include/pgsql/server/utils/dynamic_loader.h
-include/pgsql/server/utils/elog.h
-include/pgsql/server/utils/exc.h
-include/pgsql/server/utils/excid.h
-include/pgsql/server/utils/fcache.h
-include/pgsql/server/utils/fmgrtab.h
-include/pgsql/server/utils/formatting.h
-include/pgsql/server/utils/geo_decls.h
-include/pgsql/server/utils/guc.h
-include/pgsql/server/utils/hsearch.h
-include/pgsql/server/utils/inet.h
-include/pgsql/server/utils/int8.h
-include/pgsql/server/utils/inval.h
-include/pgsql/server/utils/logtape.h
-include/pgsql/server/utils/lsyscache.h
-include/pgsql/server/utils/memutils.h
-include/pgsql/server/utils/nabstime.h
-include/pgsql/server/utils/numeric.h
-include/pgsql/server/utils/palloc.h
-include/pgsql/server/utils/pg_crc.h
-include/pgsql/server/utils/pg_locale.h
-include/pgsql/server/utils/pg_lzcompress.h
-include/pgsql/server/utils/portal.h
-include/pgsql/server/utils/ps_status.h
-include/pgsql/server/utils/rel.h
-include/pgsql/server/utils/relcache.h
-include/pgsql/server/utils/selfuncs.h
-include/pgsql/server/utils/sets.h
-include/pgsql/server/utils/syscache.h
-include/pgsql/server/utils/temprel.h
-include/pgsql/server/utils/timestamp.h
-include/pgsql/server/utils/tqual.h
-include/pgsql/server/utils/tuplesort.h
-include/pgsql/server/utils/tuplestore.h
-include/pgsql/server/utils/varbit.h
-include/pgsql/sql3types.h
-include/pgsql/sqlca.h
+include/postgresql/ecpgerrno.h
+include/postgresql/ecpglib.h
+include/postgresql/ecpgtype.h
+include/postgresql/internal/c.h
+include/postgresql/internal/lib/dllist.h
+include/postgresql/internal/libpq-int.h
+include/postgresql/internal/libpq/pqcomm.h
+include/postgresql/internal/postgres_fe.h
+include/postgresql/internal/pqexpbuffer.h
+include/postgresql/libpq-fe.h
+include/postgresql/libpq/libpq-fs.h
+include/postgresql/pg_config.h
+include/postgresql/pg_config_os.h
+include/postgresql/postgres_ext.h
+include/postgresql/server/access/attnum.h
+include/postgresql/server/access/clog.h
+include/postgresql/server/access/genam.h
+include/postgresql/server/access/gist.h
+include/postgresql/server/access/gistscan.h
+include/postgresql/server/access/hash.h
+include/postgresql/server/access/heapam.h
+include/postgresql/server/access/hio.h
+include/postgresql/server/access/htup.h
+include/postgresql/server/access/ibit.h
+include/postgresql/server/access/iqual.h
+include/postgresql/server/access/istrat.h
+include/postgresql/server/access/itup.h
+include/postgresql/server/access/nbtree.h
+include/postgresql/server/access/printtup.h
+include/postgresql/server/access/relscan.h
+include/postgresql/server/access/rmgr.h
+include/postgresql/server/access/rtree.h
+include/postgresql/server/access/rtscan.h
+include/postgresql/server/access/sdir.h
+include/postgresql/server/access/skey.h
+include/postgresql/server/access/strat.h
+include/postgresql/server/access/transam.h
+include/postgresql/server/access/tupdesc.h
+include/postgresql/server/access/tupmacs.h
+include/postgresql/server/access/tuptoaster.h
+include/postgresql/server/access/valid.h
+include/postgresql/server/access/xact.h
+include/postgresql/server/access/xlog.h
+include/postgresql/server/access/xlogdefs.h
+include/postgresql/server/access/xlogutils.h
+include/postgresql/server/bootstrap/bootstrap.h
+include/postgresql/server/c.h
+include/postgresql/server/catalog/catalog.h
+include/postgresql/server/catalog/catname.h
+include/postgresql/server/catalog/catversion.h
+include/postgresql/server/catalog/dependency.h
+include/postgresql/server/catalog/heap.h
+include/postgresql/server/catalog/index.h
+include/postgresql/server/catalog/indexing.h
+include/postgresql/server/catalog/namespace.h
+include/postgresql/server/catalog/pg_aggregate.h
+include/postgresql/server/catalog/pg_am.h
+include/postgresql/server/catalog/pg_amop.h
+include/postgresql/server/catalog/pg_amproc.h
+include/postgresql/server/catalog/pg_attrdef.h
+include/postgresql/server/catalog/pg_attribute.h
+include/postgresql/server/catalog/pg_cast.h
+include/postgresql/server/catalog/pg_class.h
+include/postgresql/server/catalog/pg_constraint.h
+include/postgresql/server/catalog/pg_control.h
+include/postgresql/server/catalog/pg_conversion.h
+include/postgresql/server/catalog/pg_database.h
+include/postgresql/server/catalog/pg_depend.h
+include/postgresql/server/catalog/pg_description.h
+include/postgresql/server/catalog/pg_group.h
+include/postgresql/server/catalog/pg_index.h
+include/postgresql/server/catalog/pg_inherits.h
+include/postgresql/server/catalog/pg_language.h
+include/postgresql/server/catalog/pg_largeobject.h
+include/postgresql/server/catalog/pg_listener.h
+include/postgresql/server/catalog/pg_namespace.h
+include/postgresql/server/catalog/pg_opclass.h
+include/postgresql/server/catalog/pg_operator.h
+include/postgresql/server/catalog/pg_proc.h
+include/postgresql/server/catalog/pg_rewrite.h
+include/postgresql/server/catalog/pg_shadow.h
+include/postgresql/server/catalog/pg_statistic.h
+include/postgresql/server/catalog/pg_trigger.h
+include/postgresql/server/catalog/pg_type.h
+include/postgresql/server/catalog/pg_version.h
+include/postgresql/server/commands/async.h
+include/postgresql/server/commands/cluster.h
+include/postgresql/server/commands/comment.h
+include/postgresql/server/commands/conversioncmds.h
+include/postgresql/server/commands/copy.h
+include/postgresql/server/commands/dbcommands.h
+include/postgresql/server/commands/defrem.h
+include/postgresql/server/commands/explain.h
+include/postgresql/server/commands/lockcmds.h
+include/postgresql/server/commands/portalcmds.h
+include/postgresql/server/commands/prepare.h
+include/postgresql/server/commands/proclang.h
+include/postgresql/server/commands/schemacmds.h
+include/postgresql/server/commands/sequence.h
+include/postgresql/server/commands/tablecmds.h
+include/postgresql/server/commands/trigger.h
+include/postgresql/server/commands/user.h
+include/postgresql/server/commands/vacuum.h
+include/postgresql/server/commands/variable.h
+include/postgresql/server/commands/version.h
+include/postgresql/server/commands/view.h
+include/postgresql/server/dynloader.h
+include/postgresql/server/executor/execdebug.h
+include/postgresql/server/executor/execdefs.h
+include/postgresql/server/executor/execdesc.h
+include/postgresql/server/executor/executor.h
+include/postgresql/server/executor/functions.h
+include/postgresql/server/executor/hashjoin.h
+include/postgresql/server/executor/instrument.h
+include/postgresql/server/executor/nodeAgg.h
+include/postgresql/server/executor/nodeAppend.h
+include/postgresql/server/executor/nodeFunctionscan.h
+include/postgresql/server/executor/nodeGroup.h
+include/postgresql/server/executor/nodeHash.h
+include/postgresql/server/executor/nodeHashjoin.h
+include/postgresql/server/executor/nodeIndexscan.h
+include/postgresql/server/executor/nodeLimit.h
+include/postgresql/server/executor/nodeMaterial.h
+include/postgresql/server/executor/nodeMergejoin.h
+include/postgresql/server/executor/nodeNestloop.h
+include/postgresql/server/executor/nodeResult.h
+include/postgresql/server/executor/nodeSeqscan.h
+include/postgresql/server/executor/nodeSetOp.h
+include/postgresql/server/executor/nodeSort.h
+include/postgresql/server/executor/nodeSubplan.h
+include/postgresql/server/executor/nodeSubqueryscan.h
+include/postgresql/server/executor/nodeTidscan.h
+include/postgresql/server/executor/nodeUnique.h
+include/postgresql/server/executor/spi.h
+include/postgresql/server/executor/spi_priv.h
+include/postgresql/server/executor/tuptable.h
+include/postgresql/server/fmgr.h
+include/postgresql/server/funcapi.h
+include/postgresql/server/lib/dllist.h
+include/postgresql/server/lib/lispsort.h
+include/postgresql/server/lib/stringinfo.h
+include/postgresql/server/libpq/auth.h
+include/postgresql/server/libpq/be-fsstubs.h
+include/postgresql/server/libpq/crypt.h
+include/postgresql/server/libpq/hba.h
+include/postgresql/server/libpq/libpq-be.h
+include/postgresql/server/libpq/libpq-fs.h
+include/postgresql/server/libpq/libpq.h
+include/postgresql/server/libpq/password.h
+include/postgresql/server/libpq/pqcomm.h
+include/postgresql/server/libpq/pqformat.h
+include/postgresql/server/libpq/pqsignal.h
+include/postgresql/server/mb/pg_wchar.h
+include/postgresql/server/miscadmin.h
+include/postgresql/server/nodes/execnodes.h
+include/postgresql/server/nodes/makefuncs.h
+include/postgresql/server/nodes/memnodes.h
+include/postgresql/server/nodes/nodeFuncs.h
+include/postgresql/server/nodes/nodes.h
+include/postgresql/server/nodes/params.h
+include/postgresql/server/nodes/parsenodes.h
+include/postgresql/server/nodes/pg_list.h
+include/postgresql/server/nodes/plannodes.h
+include/postgresql/server/nodes/primnodes.h
+include/postgresql/server/nodes/print.h
+include/postgresql/server/nodes/readfuncs.h
+include/postgresql/server/nodes/relation.h
+include/postgresql/server/optimizer/clauses.h
+include/postgresql/server/optimizer/cost.h
+include/postgresql/server/optimizer/geqo.h
+include/postgresql/server/optimizer/geqo_copy.h
+include/postgresql/server/optimizer/geqo_gene.h
+include/postgresql/server/optimizer/geqo_misc.h
+include/postgresql/server/optimizer/geqo_mutation.h
+include/postgresql/server/optimizer/geqo_pool.h
+include/postgresql/server/optimizer/geqo_random.h
+include/postgresql/server/optimizer/geqo_recombination.h
+include/postgresql/server/optimizer/geqo_selection.h
+include/postgresql/server/optimizer/joininfo.h
+include/postgresql/server/optimizer/pathnode.h
+include/postgresql/server/optimizer/paths.h
+include/postgresql/server/optimizer/plancat.h
+include/postgresql/server/optimizer/planmain.h
+include/postgresql/server/optimizer/planner.h
+include/postgresql/server/optimizer/prep.h
+include/postgresql/server/optimizer/restrictinfo.h
+include/postgresql/server/optimizer/subselect.h
+include/postgresql/server/optimizer/tlist.h
+include/postgresql/server/optimizer/var.h
+include/postgresql/server/parser/analyze.h
+include/postgresql/server/parser/gramparse.h
+include/postgresql/server/parser/keywords.h
+include/postgresql/server/parser/parse.h
+include/postgresql/server/parser/parse_agg.h
+include/postgresql/server/parser/parse_clause.h
+include/postgresql/server/parser/parse_coerce.h
+include/postgresql/server/parser/parse_expr.h
+include/postgresql/server/parser/parse_func.h
+include/postgresql/server/parser/parse_node.h
+include/postgresql/server/parser/parse_oper.h
+include/postgresql/server/parser/parse_relation.h
+include/postgresql/server/parser/parse_target.h
+include/postgresql/server/parser/parse_type.h
+include/postgresql/server/parser/parser.h
+include/postgresql/server/parser/parsetree.h
+include/postgresql/server/parser/scansup.h
+include/postgresql/server/pg_config.h
+include/postgresql/server/pg_config_os.h
+include/postgresql/server/pgstat.h
+include/postgresql/server/port/aix.h
+include/postgresql/server/port/beos.h
+include/postgresql/server/port/bsdi.h
+include/postgresql/server/port/darwin.h
+include/postgresql/server/port/dgux.h
+include/postgresql/server/port/freebsd.h
+include/postgresql/server/port/hpux.h
+include/postgresql/server/port/irix5.h
+include/postgresql/server/port/linux.h
+include/postgresql/server/port/netbsd.h
+include/postgresql/server/port/nextstep.h
+include/postgresql/server/port/openbsd.h
+include/postgresql/server/port/osf.h
+include/postgresql/server/port/qnx4.h
+include/postgresql/server/port/sco.h
+include/postgresql/server/port/solaris.h
+include/postgresql/server/port/sunos4.h
+include/postgresql/server/port/svr4.h
+include/postgresql/server/port/ultrix4.h
+include/postgresql/server/port/univel.h
+include/postgresql/server/port/unixware.h
+include/postgresql/server/port/win.h
+include/postgresql/server/port/win32.h
+include/postgresql/server/postgres.h
+include/postgresql/server/postgres_ext.h
+include/postgresql/server/postgres_fe.h
+include/postgresql/server/regex/cclass.h
+include/postgresql/server/regex/cname.h
+include/postgresql/server/regex/regex.h
+include/postgresql/server/regex/regex2.h
+include/postgresql/server/regex/utils.h
+include/postgresql/server/rewrite/prs2lock.h
+include/postgresql/server/rewrite/rewriteDefine.h
+include/postgresql/server/rewrite/rewriteHandler.h
+include/postgresql/server/rewrite/rewriteManip.h
+include/postgresql/server/rewrite/rewriteRemove.h
+include/postgresql/server/rewrite/rewriteSupport.h
+include/postgresql/server/rusagestub.h
+include/postgresql/server/storage/backendid.h
+include/postgresql/server/storage/block.h
+include/postgresql/server/storage/buf.h
+include/postgresql/server/storage/buf_internals.h
+include/postgresql/server/storage/buffile.h
+include/postgresql/server/storage/bufmgr.h
+include/postgresql/server/storage/bufpage.h
+include/postgresql/server/storage/fd.h
+include/postgresql/server/storage/freespace.h
+include/postgresql/server/storage/ipc.h
+include/postgresql/server/storage/item.h
+include/postgresql/server/storage/itemid.h
+include/postgresql/server/storage/itempos.h
+include/postgresql/server/storage/itemptr.h
+include/postgresql/server/storage/large_object.h
+include/postgresql/server/storage/lmgr.h
+include/postgresql/server/storage/lock.h
+include/postgresql/server/storage/lwlock.h
+include/postgresql/server/storage/off.h
+include/postgresql/server/storage/page.h
+include/postgresql/server/storage/pg_sema.h
+include/postgresql/server/storage/pg_shmem.h
+include/postgresql/server/storage/pmsignal.h
+include/postgresql/server/storage/pos.h
+include/postgresql/server/storage/proc.h
+include/postgresql/server/storage/relfilenode.h
+include/postgresql/server/storage/s_lock.h
+include/postgresql/server/storage/shmem.h
+include/postgresql/server/storage/sinval.h
+include/postgresql/server/storage/sinvaladt.h
+include/postgresql/server/storage/smgr.h
+include/postgresql/server/storage/spin.h
+include/postgresql/server/strdup.h
+include/postgresql/server/tcop/dest.h
+include/postgresql/server/tcop/fastpath.h
+include/postgresql/server/tcop/pquery.h
+include/postgresql/server/tcop/tcopdebug.h
+include/postgresql/server/tcop/tcopprot.h
+include/postgresql/server/tcop/utility.h
+include/postgresql/server/utils/acl.h
+include/postgresql/server/utils/array.h
+include/postgresql/server/utils/ascii.h
+include/postgresql/server/utils/bit.h
+include/postgresql/server/utils/builtins.h
+include/postgresql/server/utils/cash.h
+include/postgresql/server/utils/catcache.h
+include/postgresql/server/utils/date.h
+include/postgresql/server/utils/datetime.h
+include/postgresql/server/utils/datum.h
+include/postgresql/server/utils/dynahash.h
+include/postgresql/server/utils/dynamic_loader.h
+include/postgresql/server/utils/elog.h
+include/postgresql/server/utils/fcache.h
+include/postgresql/server/utils/fmgroids.h
+include/postgresql/server/utils/fmgrtab.h
+include/postgresql/server/utils/formatting.h
+include/postgresql/server/utils/geo_decls.h
+include/postgresql/server/utils/guc.h
+include/postgresql/server/utils/hsearch.h
+include/postgresql/server/utils/inet.h
+include/postgresql/server/utils/int8.h
+include/postgresql/server/utils/inval.h
+include/postgresql/server/utils/logtape.h
+include/postgresql/server/utils/lsyscache.h
+include/postgresql/server/utils/memutils.h
+include/postgresql/server/utils/nabstime.h
+include/postgresql/server/utils/numeric.h
+include/postgresql/server/utils/palloc.h
+include/postgresql/server/utils/pg_crc.h
+include/postgresql/server/utils/pg_locale.h
+include/postgresql/server/utils/pg_lzcompress.h
+include/postgresql/server/utils/portal.h
+include/postgresql/server/utils/ps_status.h
+include/postgresql/server/utils/rel.h
+include/postgresql/server/utils/relcache.h
+include/postgresql/server/utils/selfuncs.h
+include/postgresql/server/utils/sets.h
+include/postgresql/server/utils/syscache.h
+include/postgresql/server/utils/timestamp.h
+include/postgresql/server/utils/tqual.h
+include/postgresql/server/utils/tuplesort.h
+include/postgresql/server/utils/tuplestore.h
+include/postgresql/server/utils/varbit.h
+include/postgresql/sql3types.h
+include/postgresql/sqlca.h
 lib/libecpg.a
 lib/libecpg.so
 lib/libecpg.so.3
-lib/libecpg.so.3.3
-lib/libpgeasy.a
-lib/libpgeasy.so
-lib/libpgeasy.so.2
-lib/libpgeasy.so.2.2
-lib/libpq++.a
-lib/libpq++.so
-lib/libpq++.so.4
-lib/libpq++.so.4.0
+lib/libecpg.so.3.4
 lib/libpq.a
 lib/libpq.so
-lib/libpq.so.2
-lib/libpq.so.2.2
+lib/libpq.so.3
+lib/libpq.so.3.0
 lib/postgresql/plpgsql.so
 man/man1/ecpg.1
-@dirrm include/pgsql/server/utils
-@dirrm include/pgsql/server/tcop
-@dirrm include/pgsql/server/storage
-@dirrm include/pgsql/server/rewrite
-@dirrm include/pgsql/server/regex
-@dirrm include/pgsql/server/port
-@dirrm include/pgsql/server/parser
-@dirrm include/pgsql/server/optimizer
-@dirrm include/pgsql/server/nodes
-@dirrm include/pgsql/server/mb
-@dirrm include/pgsql/server/libpq
-@dirrm include/pgsql/server/lib
-@dirrm include/pgsql/server/executor
-@dirrm include/pgsql/server/commands
-@dirrm include/pgsql/server/catalog
-@dirrm include/pgsql/server/bootstrap
-@dirrm include/pgsql/server/access
-@dirrm include/pgsql/server
-@dirrm include/pgsql/internal/libpq
-@dirrm include/pgsql/internal/lib
-@dirrm include/pgsql/internal
-@dirrm include/pgsql/libpq
-@dirrm include/pgsql/libpq++
 @dirrm lib/postgresql
-@unexec ${RMDIR} -p %D/include/pgsql 2>/dev/null || ${TRUE}
+@dirrm include/postgresql/server/utils
+@dirrm include/postgresql/server/tcop
+@dirrm include/postgresql/server/storage
+@dirrm include/postgresql/server/rewrite
+@dirrm include/postgresql/server/regex
+@dirrm include/postgresql/server/port
+@dirrm include/postgresql/server/parser
+@dirrm include/postgresql/server/optimizer
+@dirrm include/postgresql/server/nodes
+@dirrm include/postgresql/server/mb
+@dirrm include/postgresql/server/libpq
+@dirrm include/postgresql/server/lib
+@dirrm include/postgresql/server/executor
+@dirrm include/postgresql/server/commands
+@dirrm include/postgresql/server/catalog
+@dirrm include/postgresql/server/bootstrap
+@dirrm include/postgresql/server/access
+@dirrm include/postgresql/server
+@dirrm include/postgresql/libpq
+@dirrm include/postgresql/internal/libpq
+@dirrm include/postgresql/internal/lib
+@dirrm include/postgresql/internal
+@dirrm include/postgresql
+@exec ${RM} -f %D/include/pgsql; ${LN} -sf postgresql %D/include/pgsql || ${TRUE}
+@unexec ${RM} -f %D/include/pgsql || ${TRUE}
diff --git a/databases/postgresql-lib/buildlink2.mk b/databases/postgresql-lib/buildlink2.mk
index 6134cbf6e07..972b8aed8e8 100644
--- a/databases/postgresql-lib/buildlink2.mk
+++ b/databases/postgresql-lib/buildlink2.mk
@@ -1,20 +1,21 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:25 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/01/05 20:12:24 jlam Exp $
 
 .if !defined(POSTGRESQL_LIB_BUILDLINK2_MK)
 POSTGRESQL_LIB_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			postgresql-lib
-BUILDLINK_DEPENDS.postgresql-lib?=	postgresql-{6.5.3*,7.0*,lib-*}
+BUILDLINK_DEPENDS.postgresql-lib?=	postgresql-lib>=7.3.1
 BUILDLINK_PKGSRCDIR.postgresql-lib?=	../../databases/postgresql-lib
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.postgresql-lib=postgresql-lib
 BUILDLINK_PREFIX.postgresql-lib_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.postgresql-lib=		include/pgsql/*/*/*.h
+BUILDLINK_FILES.postgresql-lib=		include/postgresql/*/*/*.h
+BUILDLINK_FILES.postgresql-lib+=	include/postgresql/*/*.h
+BUILDLINK_FILES.postgresql-lib+=	include/postgresql/*.h
+BUILDLINK_FILES.postgresql-lib+=	include/pgsql/*/*/*.h
 BUILDLINK_FILES.postgresql-lib+=	include/pgsql/*/*.h
 BUILDLINK_FILES.postgresql-lib+=	include/pgsql/*.h
 BUILDLINK_FILES.postgresql-lib+=	lib/libecpg.*
-BUILDLINK_FILES.postgresql-lib+=	lib/libpgeasy.*
-BUILDLINK_FILES.postgresql-lib+=	lib/libpq++.*
 BUILDLINK_FILES.postgresql-lib+=	lib/libpq.*
 
 .include "../../security/openssl/buildlink2.mk"