Restore PG_SUBPREFIX logic.

4 files changed, 706 insertions, 677 deletions

diff --git a/databases/postgresql90-client/Makefile b/databases/postgresql90-client/Makefile
index ff58052b4ed..edaa658f3dc 100644
--- a/databases/postgresql90-client/Makefile
+++ b/databases/postgresql90-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/12/19 09:53:27 adam Exp $
+# $NetBSD: Makefile,v 1.4 2010/12/24 03:41:38 asau Exp $
 
 PKGNAME=	${DISTNAME:C/-/90-client-/}
 COMMENT=	PostgreSQL database client programs
@@ -41,7 +41,11 @@ BUILD_DIRS=	${INSTALL_DIRS}
 BUILD_DIRS+=	src/backend
 
 .for f in pg_service.conf psqlrc
-CONF_FILES+=	${PREFIX}/share/postgresql/${f}.sample ${PKG_SYSCONFDIR}/${f}
+. if !empty(PG_SUBPREFIX)
+CONF_FILES+=	${PG_SUBPREFIX:/=}/share/postgresql/${f}.sample ${PKG_SYSCONFDIR}/${f}
+. else
+CONF_FILES+=	${PG_SUBPREFIX}share/postgresql/${f}.sample ${PKG_SYSCONFDIR}/${f}
+. endif
 .endfor
 
 # XXX work around core dumps with the native libedit
@@ -59,12 +63,19 @@ SUBST_SED.pgxs=		-e 's,${WRKDIR}/.tools,${PREFIX},'
 SUBST_SED.pgxs+=	-e 's,${WRKDIR}/.wrapper,${PREFIX},'
 SUBST_SED.pgxs+=	-e 's,${WRKSRC},/dev/null,'
 
-INSTALLATION_DIRS+=	lib/postgresql/pgxs
-INSTALLATION_DIRS+=	lib/postgresql/pgxs/config
-INSTALLATION_DIRS+=	lib/postgresql/pgxs/src
-INSTALLATION_DIRS+=	lib/postgresql/pgxs/src/makefiles
+.if !empty(PG_SUBPREFIX)
+INSTALLATION_DIRS+=	$(PG_SUBPREFIX:/=)/lib/postgresql/pgxs
+INSTALLATION_DIRS+=	$(PG_SUBPREFIX:/=)/lib/postgresql/pgxs/config
+INSTALLATION_DIRS+=	$(PG_SUBPREFIX:/=)/lib/postgresql/pgxs/src
+INSTALLATION_DIRS+=	$(PG_SUBPREFIX:/=)/lib/postgresql/pgxs/src/makefiles
+.else
+INSTALLATION_DIRS+=	$(PG_SUBPREFIX)lib/postgresql/pgxs
+INSTALLATION_DIRS+=	$(PG_SUBPREFIX)lib/postgresql/pgxs/config
+INSTALLATION_DIRS+=	$(PG_SUBPREFIX)lib/postgresql/pgxs/src
+INSTALLATION_DIRS+=	$(PG_SUBPREFIX)lib/postgresql/pgxs/src/makefiles
+.endif
 
-DEST_PGXS=	${DESTDIR}${PREFIX}/lib/postgresql/pgxs
+DEST_PGXS=	${DESTDIR}${PREFIX}/$(PG_SUBPREFIX)/lib/postgresql/pgxs
 PGXS_FILES=	config/install-sh
 PGXS_FILES+=	src/makefiles/pgxs.mk src/Makefile.global
 PGXS_FILES+=	src/Makefile.port src/Makefile.shlib
diff --git a/databases/postgresql90-client/PLIST b/databases/postgresql90-client/PLIST
index 94ce0f1ae34..962f2a31821 100644
--- a/databases/postgresql90-client/PLIST
+++ b/databases/postgresql90-client/PLIST
@@ -1,660 +1,660 @@
-@comment $NetBSD: PLIST,v 1.3 2010/12/19 09:53:27 adam Exp $
-bin/clusterdb
-bin/createdb
-bin/createlang
-bin/createuser
-bin/dropdb
-bin/droplang
-bin/dropuser
-bin/ecpg
-bin/initdb
-bin/pg_config
-bin/pg_controldata
-bin/pg_ctl
-bin/pg_dump
-bin/pg_dumpall
-bin/pg_resetxlog
-bin/pg_restore
-bin/psql
-bin/reindexdb
-bin/vacuumdb
-include/ecpg_config.h
-include/ecpg_informix.h
-include/ecpgerrno.h
-include/ecpglib.h
-include/ecpgtype.h
-include/libpq-events.h
-include/libpq-fe.h
-include/libpq/libpq-fs.h
-include/pg_config.h
-include/pg_config_manual.h
-include/pg_config_os.h
-include/pgtypes_date.h
-include/pgtypes_error.h
-include/pgtypes_interval.h
-include/pgtypes_numeric.h
-include/pgtypes_timestamp.h
-include/postgres_ext.h
-include/postgresql/informix/esql/datetime.h
-include/postgresql/informix/esql/decimal.h
-include/postgresql/informix/esql/sqltypes.h
-include/postgresql/internal/c.h
-include/postgresql/internal/libpq-int.h
-include/postgresql/internal/libpq/pqcomm.h
-include/postgresql/internal/port.h
-include/postgresql/internal/postgres_fe.h
-include/postgresql/internal/pqexpbuffer.h
-include/postgresql/server/access/attnum.h
-include/postgresql/server/access/clog.h
-include/postgresql/server/access/genam.h
-include/postgresql/server/access/gin.h
-include/postgresql/server/access/gist.h
-include/postgresql/server/access/gist_private.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/itup.h
-include/postgresql/server/access/multixact.h
-include/postgresql/server/access/nbtree.h
-include/postgresql/server/access/printtup.h
-include/postgresql/server/access/reloptions.h
-include/postgresql/server/access/relscan.h
-include/postgresql/server/access/rewriteheap.h
-include/postgresql/server/access/rmgr.h
-include/postgresql/server/access/sdir.h
-include/postgresql/server/access/skey.h
-include/postgresql/server/access/slru.h
-include/postgresql/server/access/subtrans.h
-include/postgresql/server/access/sysattr.h
-include/postgresql/server/access/transam.h
-include/postgresql/server/access/tupconvert.h
-include/postgresql/server/access/tupdesc.h
-include/postgresql/server/access/tupmacs.h
-include/postgresql/server/access/tuptoaster.h
-include/postgresql/server/access/twophase.h
-include/postgresql/server/access/twophase_rmgr.h
-include/postgresql/server/access/valid.h
-include/postgresql/server/access/visibilitymap.h
-include/postgresql/server/access/xact.h
-include/postgresql/server/access/xlog.h
-include/postgresql/server/access/xlog_internal.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/catversion.h
-include/postgresql/server/catalog/dependency.h
-include/postgresql/server/catalog/genbki.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_auth_members.h
-include/postgresql/server/catalog/pg_authid.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_conversion_fn.h
-include/postgresql/server/catalog/pg_database.h
-include/postgresql/server/catalog/pg_db_role_setting.h
-include/postgresql/server/catalog/pg_default_acl.h
-include/postgresql/server/catalog/pg_depend.h
-include/postgresql/server/catalog/pg_description.h
-include/postgresql/server/catalog/pg_enum.h
-include/postgresql/server/catalog/pg_foreign_data_wrapper.h
-include/postgresql/server/catalog/pg_foreign_server.h
-include/postgresql/server/catalog/pg_index.h
-include/postgresql/server/catalog/pg_inherits.h
-include/postgresql/server/catalog/pg_inherits_fn.h
-include/postgresql/server/catalog/pg_language.h
-include/postgresql/server/catalog/pg_largeobject.h
-include/postgresql/server/catalog/pg_largeobject_metadata.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_opfamily.h
-include/postgresql/server/catalog/pg_pltemplate.h
-include/postgresql/server/catalog/pg_proc.h
-include/postgresql/server/catalog/pg_proc_fn.h
-include/postgresql/server/catalog/pg_rewrite.h
-include/postgresql/server/catalog/pg_shdepend.h
-include/postgresql/server/catalog/pg_shdescription.h
-include/postgresql/server/catalog/pg_statistic.h
-include/postgresql/server/catalog/pg_tablespace.h
-include/postgresql/server/catalog/pg_trigger.h
-include/postgresql/server/catalog/pg_ts_config.h
-include/postgresql/server/catalog/pg_ts_config_map.h
-include/postgresql/server/catalog/pg_ts_dict.h
-include/postgresql/server/catalog/pg_ts_parser.h
-include/postgresql/server/catalog/pg_ts_template.h
-include/postgresql/server/catalog/pg_type.h
-include/postgresql/server/catalog/pg_type_fn.h
-include/postgresql/server/catalog/pg_user_mapping.h
-include/postgresql/server/catalog/schemapg.h
-include/postgresql/server/catalog/storage.h
-include/postgresql/server/catalog/toasting.h
-include/postgresql/server/commands/alter.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/discard.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/tablespace.h
-include/postgresql/server/commands/trigger.h
-include/postgresql/server/commands/typecmds.h
-include/postgresql/server/commands/user.h
-include/postgresql/server/commands/vacuum.h
-include/postgresql/server/commands/variable.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/nodeBitmapAnd.h
-include/postgresql/server/executor/nodeBitmapHeapscan.h
-include/postgresql/server/executor/nodeBitmapIndexscan.h
-include/postgresql/server/executor/nodeBitmapOr.h
-include/postgresql/server/executor/nodeCtescan.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/nodeLockRows.h
-include/postgresql/server/executor/nodeMaterial.h
-include/postgresql/server/executor/nodeMergejoin.h
-include/postgresql/server/executor/nodeModifyTable.h
-include/postgresql/server/executor/nodeNestloop.h
-include/postgresql/server/executor/nodeRecursiveunion.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/nodeValuesscan.h
-include/postgresql/server/executor/nodeWindowAgg.h
-include/postgresql/server/executor/nodeWorktablescan.h
-include/postgresql/server/executor/spi.h
-include/postgresql/server/executor/spi_priv.h
-include/postgresql/server/executor/tstoreReceiver.h
-include/postgresql/server/executor/tuptable.h
-include/postgresql/server/fmgr.h
-include/postgresql/server/foreign/foreign.h
-include/postgresql/server/funcapi.h
-include/postgresql/server/getaddrinfo.h
-include/postgresql/server/getopt_long.h
-include/postgresql/server/lib/dllist.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/ip.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/md5.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/bitmapset.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/nodes/tidbitmap.h
-include/postgresql/server/nodes/value.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/placeholder.h
-include/postgresql/server/optimizer/plancat.h
-include/postgresql/server/optimizer/planmain.h
-include/postgresql/server/optimizer/planner.h
-include/postgresql/server/optimizer/predtest.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/gram.h
-include/postgresql/server/parser/gramparse.h
-include/postgresql/server/parser/keywords.h
-include/postgresql/server/parser/kwlist.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_cte.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_param.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/parse_utilcmd.h
-include/postgresql/server/parser/parser.h
-include/postgresql/server/parser/parsetree.h
-include/postgresql/server/parser/scanner.h
-include/postgresql/server/parser/scansup.h
-include/postgresql/server/pg_config.h
-include/postgresql/server/pg_config_manual.h
-include/postgresql/server/pg_config_os.h
-include/postgresql/server/pg_trace.h
-include/postgresql/server/pgstat.h
-include/postgresql/server/pgtime.h
-include/postgresql/server/port.h
-include/postgresql/server/port/aix.h
-include/postgresql/server/port/bsdi.h
-include/postgresql/server/port/cygwin.h
-include/postgresql/server/port/darwin.h
-include/postgresql/server/port/dgux.h
-include/postgresql/server/port/dragonfly.h
-include/postgresql/server/port/freebsd.h
-include/postgresql/server/port/hpux.h
-include/postgresql/server/port/irix.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/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/win32.h
-include/postgresql/server/port/win32/arpa/inet.h
-include/postgresql/server/port/win32/dlfcn.h
-include/postgresql/server/port/win32/grp.h
-include/postgresql/server/port/win32/netdb.h
-include/postgresql/server/port/win32/netinet/in.h
-include/postgresql/server/port/win32/pwd.h
-include/postgresql/server/port/win32/sys/socket.h
-include/postgresql/server/port/win32/sys/wait.h
-include/postgresql/server/port/win32_msvc/dirent.h
-include/postgresql/server/port/win32_msvc/sys/file.h
-include/postgresql/server/port/win32_msvc/sys/param.h
-include/postgresql/server/port/win32_msvc/sys/time.h
-include/postgresql/server/port/win32_msvc/unistd.h
-include/postgresql/server/port/win32_msvc/utime.h
-include/postgresql/server/portability/instr_time.h
-include/postgresql/server/postgres.h
-include/postgresql/server/postgres_ext.h
-include/postgresql/server/postgres_fe.h
-include/postgresql/server/postmaster/autovacuum.h
-include/postgresql/server/postmaster/bgwriter.h
-include/postgresql/server/postmaster/fork_process.h
-include/postgresql/server/postmaster/pgarch.h
-include/postgresql/server/postmaster/postmaster.h
-include/postgresql/server/postmaster/syslogger.h
-include/postgresql/server/postmaster/walwriter.h
-include/postgresql/server/regex/regcustom.h
-include/postgresql/server/regex/regerrs.h
-include/postgresql/server/regex/regex.h
-include/postgresql/server/regex/regguts.h
-include/postgresql/server/replication/walprotocol.h
-include/postgresql/server/replication/walreceiver.h
-include/postgresql/server/replication/walsender.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/snowball/header.h
-include/postgresql/server/snowball/libstemmer/api.h
-include/postgresql/server/snowball/libstemmer/header.h
-include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_danish.h
-include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_dutch.h
-include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_english.h
-include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_finnish.h
-include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_french.h
-include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_german.h
-include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_hungarian.h
-include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_italian.h
-include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_norwegian.h
-include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_porter.h
-include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_portuguese.h
-include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_spanish.h
-include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_swedish.h
-include/postgresql/server/snowball/libstemmer/stem_ISO_8859_2_romanian.h
-include/postgresql/server/snowball/libstemmer/stem_KOI8_R_russian.h
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_danish.h
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_dutch.h
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_english.h
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_finnish.h
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_french.h
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_german.h
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_hungarian.h
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_italian.h
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_norwegian.h
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_porter.h
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_portuguese.h
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_romanian.h
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_russian.h
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_spanish.h
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_swedish.h
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_turkish.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/fsm_internals.h
-include/postgresql/server/storage/indexfsm.h
-include/postgresql/server/storage/ipc.h
-include/postgresql/server/storage/item.h
-include/postgresql/server/storage/itemid.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/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/procarray.h
-include/postgresql/server/storage/procsignal.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/storage/standby.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/tsearch/dicts/regis.h
-include/postgresql/server/tsearch/dicts/spell.h
-include/postgresql/server/tsearch/ts_cache.h
-include/postgresql/server/tsearch/ts_locale.h
-include/postgresql/server/tsearch/ts_public.h
-include/postgresql/server/tsearch/ts_type.h
-include/postgresql/server/tsearch/ts_utils.h
-include/postgresql/server/utils/acl.h
-include/postgresql/server/utils/array.h
-include/postgresql/server/utils/ascii.h
-include/postgresql/server/utils/attoptcache.h
-include/postgresql/server/utils/builtins.h
-include/postgresql/server/utils/bytea.h
-include/postgresql/server/utils/cash.h
-include/postgresql/server/utils/catcache.h
-include/postgresql/server/utils/combocid.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/errcodes.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/guc_tables.h
-include/postgresql/server/utils/help_config.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/pg_rusage.h
-include/postgresql/server/utils/plancache.h
-include/postgresql/server/utils/portal.h
-include/postgresql/server/utils/probes.h
-include/postgresql/server/utils/ps_status.h
-include/postgresql/server/utils/rbtree.h
-include/postgresql/server/utils/rel.h
-include/postgresql/server/utils/relcache.h
-include/postgresql/server/utils/relmapper.h
-include/postgresql/server/utils/resowner.h
-include/postgresql/server/utils/selfuncs.h
-include/postgresql/server/utils/snapmgr.h
-include/postgresql/server/utils/snapshot.h
-include/postgresql/server/utils/spccache.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/typcache.h
-include/postgresql/server/utils/tzparser.h
-include/postgresql/server/utils/uuid.h
-include/postgresql/server/utils/varbit.h
-include/postgresql/server/utils/xml.h
-include/postgresql/server/windowapi.h
-include/sql3types.h
-include/sqlca.h
-include/sqlda-compat.h
-include/sqlda-native.h
-include/sqlda.h
-lib/libecpg.la
-lib/libecpg_compat.la
-lib/libpgport.a
-lib/libpgtypes.la
-lib/libpq.la
-lib/postgresql/pgxs/config/install-sh
-lib/postgresql/pgxs/src/Makefile.global
-lib/postgresql/pgxs/src/Makefile.port
-lib/postgresql/pgxs/src/Makefile.shlib
-lib/postgresql/pgxs/src/makefiles/pgxs.mk
-lib/postgresql/pgxs/src/nls-global.mk
-share/locale/cs/LC_MESSAGES/initdb-9.0.mo
-share/locale/cs/LC_MESSAGES/libpq5-9.0.mo
-share/locale/cs/LC_MESSAGES/pgscripts-9.0.mo
-share/locale/cs/LC_MESSAGES/psql-9.0.mo
-share/locale/de/LC_MESSAGES/ecpg-9.0.mo
-share/locale/de/LC_MESSAGES/ecpglib6-9.0.mo
-share/locale/de/LC_MESSAGES/initdb-9.0.mo
-share/locale/de/LC_MESSAGES/libpq5-9.0.mo
-share/locale/de/LC_MESSAGES/pg_config-9.0.mo
-share/locale/de/LC_MESSAGES/pg_controldata-9.0.mo
-share/locale/de/LC_MESSAGES/pg_ctl-9.0.mo
-share/locale/de/LC_MESSAGES/pg_dump-9.0.mo
-share/locale/de/LC_MESSAGES/pg_resetxlog-9.0.mo
-share/locale/de/LC_MESSAGES/pgscripts-9.0.mo
-share/locale/de/LC_MESSAGES/psql-9.0.mo
-share/locale/es/LC_MESSAGES/ecpg-9.0.mo
-share/locale/es/LC_MESSAGES/ecpglib6-9.0.mo
-share/locale/es/LC_MESSAGES/initdb-9.0.mo
-share/locale/es/LC_MESSAGES/libpq5-9.0.mo
-share/locale/es/LC_MESSAGES/pg_config-9.0.mo
-share/locale/es/LC_MESSAGES/pg_controldata-9.0.mo
-share/locale/es/LC_MESSAGES/pg_ctl-9.0.mo
-share/locale/es/LC_MESSAGES/pg_dump-9.0.mo
-share/locale/es/LC_MESSAGES/pg_resetxlog-9.0.mo
-share/locale/es/LC_MESSAGES/pgscripts-9.0.mo
-share/locale/es/LC_MESSAGES/psql-9.0.mo
-share/locale/fr/LC_MESSAGES/ecpg-9.0.mo
-share/locale/fr/LC_MESSAGES/ecpglib6-9.0.mo
-share/locale/fr/LC_MESSAGES/initdb-9.0.mo
-share/locale/fr/LC_MESSAGES/libpq5-9.0.mo
-share/locale/fr/LC_MESSAGES/pg_config-9.0.mo
-share/locale/fr/LC_MESSAGES/pg_controldata-9.0.mo
-share/locale/fr/LC_MESSAGES/pg_ctl-9.0.mo
-share/locale/fr/LC_MESSAGES/pg_dump-9.0.mo
-share/locale/fr/LC_MESSAGES/pg_resetxlog-9.0.mo
-share/locale/fr/LC_MESSAGES/pgscripts-9.0.mo
-share/locale/fr/LC_MESSAGES/psql-9.0.mo
-share/locale/it/LC_MESSAGES/ecpg-9.0.mo
-share/locale/it/LC_MESSAGES/ecpglib6-9.0.mo
-share/locale/it/LC_MESSAGES/initdb-9.0.mo
-share/locale/it/LC_MESSAGES/libpq5-9.0.mo
-share/locale/it/LC_MESSAGES/pg_config-9.0.mo
-share/locale/it/LC_MESSAGES/pg_controldata-9.0.mo
-share/locale/it/LC_MESSAGES/pg_ctl-9.0.mo
-share/locale/it/LC_MESSAGES/pg_dump-9.0.mo
-share/locale/it/LC_MESSAGES/pg_resetxlog-9.0.mo
-share/locale/it/LC_MESSAGES/pgscripts-9.0.mo
-share/locale/ja/LC_MESSAGES/ecpg-9.0.mo
-share/locale/ja/LC_MESSAGES/ecpglib6-9.0.mo
-share/locale/ja/LC_MESSAGES/initdb-9.0.mo
-share/locale/ja/LC_MESSAGES/libpq5-9.0.mo
-share/locale/ja/LC_MESSAGES/pg_config-9.0.mo
-share/locale/ja/LC_MESSAGES/pg_controldata-9.0.mo
-share/locale/ja/LC_MESSAGES/pg_ctl-9.0.mo
-share/locale/ja/LC_MESSAGES/pg_dump-9.0.mo
-share/locale/ja/LC_MESSAGES/pg_resetxlog-9.0.mo
-share/locale/ja/LC_MESSAGES/pgscripts-9.0.mo
-share/locale/ja/LC_MESSAGES/psql-9.0.mo
-share/locale/ko/LC_MESSAGES/ecpg-9.0.mo
-share/locale/ko/LC_MESSAGES/initdb-9.0.mo
-share/locale/ko/LC_MESSAGES/libpq5-9.0.mo
-share/locale/ko/LC_MESSAGES/pg_config-9.0.mo
-share/locale/ko/LC_MESSAGES/pg_controldata-9.0.mo
-share/locale/ko/LC_MESSAGES/pg_ctl-9.0.mo
-share/locale/ko/LC_MESSAGES/pg_dump-9.0.mo
-share/locale/ko/LC_MESSAGES/pg_resetxlog-9.0.mo
-share/locale/ko/LC_MESSAGES/pgscripts-9.0.mo
-share/locale/nb/LC_MESSAGES/pg_config-9.0.mo
-share/locale/pt_BR/LC_MESSAGES/ecpg-9.0.mo
-share/locale/pt_BR/LC_MESSAGES/ecpglib6-9.0.mo
-share/locale/pt_BR/LC_MESSAGES/initdb-9.0.mo
-share/locale/pt_BR/LC_MESSAGES/libpq5-9.0.mo
-share/locale/pt_BR/LC_MESSAGES/pg_config-9.0.mo
-share/locale/pt_BR/LC_MESSAGES/pg_controldata-9.0.mo
-share/locale/pt_BR/LC_MESSAGES/pg_ctl-9.0.mo
-share/locale/pt_BR/LC_MESSAGES/pg_dump-9.0.mo
-share/locale/pt_BR/LC_MESSAGES/pg_resetxlog-9.0.mo
-share/locale/pt_BR/LC_MESSAGES/pgscripts-9.0.mo
-share/locale/pt_BR/LC_MESSAGES/psql-9.0.mo
-share/locale/ro/LC_MESSAGES/initdb-9.0.mo
-share/locale/ro/LC_MESSAGES/pg_config-9.0.mo
-share/locale/ro/LC_MESSAGES/pg_controldata-9.0.mo
-share/locale/ro/LC_MESSAGES/pg_resetxlog-9.0.mo
-share/locale/ro/LC_MESSAGES/pgscripts-9.0.mo
-share/locale/ru/LC_MESSAGES/initdb-9.0.mo
-share/locale/ru/LC_MESSAGES/libpq5-9.0.mo
-share/locale/ru/LC_MESSAGES/pg_config-9.0.mo
-share/locale/ru/LC_MESSAGES/pg_ctl-9.0.mo
-share/locale/ru/LC_MESSAGES/pg_resetxlog-9.0.mo
-share/locale/sv/LC_MESSAGES/initdb-9.0.mo
-share/locale/sv/LC_MESSAGES/libpq5-9.0.mo
-share/locale/sv/LC_MESSAGES/pg_config-9.0.mo
-share/locale/sv/LC_MESSAGES/pg_controldata-9.0.mo
-share/locale/sv/LC_MESSAGES/pg_ctl-9.0.mo
-share/locale/sv/LC_MESSAGES/pg_dump-9.0.mo
-share/locale/sv/LC_MESSAGES/pg_resetxlog-9.0.mo
-share/locale/sv/LC_MESSAGES/pgscripts-9.0.mo
-share/locale/sv/LC_MESSAGES/psql-9.0.mo
-share/locale/ta/LC_MESSAGES/initdb-9.0.mo
-share/locale/ta/LC_MESSAGES/libpq5-9.0.mo
-share/locale/ta/LC_MESSAGES/pg_config-9.0.mo
-share/locale/ta/LC_MESSAGES/pg_controldata-9.0.mo
-share/locale/ta/LC_MESSAGES/pg_ctl-9.0.mo
-share/locale/ta/LC_MESSAGES/pg_resetxlog-9.0.mo
-share/locale/ta/LC_MESSAGES/pgscripts-9.0.mo
-share/locale/tr/LC_MESSAGES/ecpg-9.0.mo
-share/locale/tr/LC_MESSAGES/ecpglib6-9.0.mo
-share/locale/tr/LC_MESSAGES/initdb-9.0.mo
-share/locale/tr/LC_MESSAGES/libpq5-9.0.mo
-share/locale/tr/LC_MESSAGES/pg_config-9.0.mo
-share/locale/tr/LC_MESSAGES/pg_controldata-9.0.mo
-share/locale/tr/LC_MESSAGES/pg_ctl-9.0.mo
-share/locale/tr/LC_MESSAGES/pg_dump-9.0.mo
-share/locale/tr/LC_MESSAGES/pg_resetxlog-9.0.mo
-share/locale/tr/LC_MESSAGES/pgscripts-9.0.mo
-share/locale/tr/LC_MESSAGES/psql-9.0.mo
-share/locale/zh_CN/LC_MESSAGES/ecpg-9.0.mo
-share/locale/zh_CN/LC_MESSAGES/ecpglib6-9.0.mo
-share/locale/zh_CN/LC_MESSAGES/initdb-9.0.mo
-share/locale/zh_CN/LC_MESSAGES/libpq5-9.0.mo
-share/locale/zh_CN/LC_MESSAGES/pg_config-9.0.mo
-share/locale/zh_CN/LC_MESSAGES/pg_controldata-9.0.mo
-share/locale/zh_CN/LC_MESSAGES/pg_ctl-9.0.mo
-share/locale/zh_CN/LC_MESSAGES/pg_dump-9.0.mo
-share/locale/zh_CN/LC_MESSAGES/pg_resetxlog-9.0.mo
-share/locale/zh_CN/LC_MESSAGES/pgscripts-9.0.mo
-share/locale/zh_CN/LC_MESSAGES/psql-9.0.mo
-share/locale/zh_TW/LC_MESSAGES/ecpg-9.0.mo
-share/locale/zh_TW/LC_MESSAGES/initdb-9.0.mo
-share/locale/zh_TW/LC_MESSAGES/libpq5-9.0.mo
-share/locale/zh_TW/LC_MESSAGES/pg_config-9.0.mo
-share/locale/zh_TW/LC_MESSAGES/pg_controldata-9.0.mo
-share/locale/zh_TW/LC_MESSAGES/pg_ctl-9.0.mo
-share/locale/zh_TW/LC_MESSAGES/pg_dump-9.0.mo
-share/locale/zh_TW/LC_MESSAGES/pg_resetxlog-9.0.mo
-share/locale/zh_TW/LC_MESSAGES/pgscripts-9.0.mo
-share/postgresql/pg_service.conf.sample
-share/postgresql/psqlrc.sample
+@comment $NetBSD: PLIST,v 1.4 2010/12/24 03:41:38 asau Exp $
+${PG_SUBPREFIX}bin/clusterdb
+${PG_SUBPREFIX}bin/createdb
+${PG_SUBPREFIX}bin/createlang
+${PG_SUBPREFIX}bin/createuser
+${PG_SUBPREFIX}bin/dropdb
+${PG_SUBPREFIX}bin/droplang
+${PG_SUBPREFIX}bin/dropuser
+${PG_SUBPREFIX}bin/ecpg
+${PG_SUBPREFIX}bin/initdb
+${PG_SUBPREFIX}bin/pg_config
+${PG_SUBPREFIX}bin/pg_controldata
+${PG_SUBPREFIX}bin/pg_ctl
+${PG_SUBPREFIX}bin/pg_dump
+${PG_SUBPREFIX}bin/pg_dumpall
+${PG_SUBPREFIX}bin/pg_resetxlog
+${PG_SUBPREFIX}bin/pg_restore
+${PG_SUBPREFIX}bin/psql
+${PG_SUBPREFIX}bin/reindexdb
+${PG_SUBPREFIX}bin/vacuumdb
+${PG_SUBPREFIX}include/ecpg_config.h
+${PG_SUBPREFIX}include/ecpg_informix.h
+${PG_SUBPREFIX}include/ecpgerrno.h
+${PG_SUBPREFIX}include/ecpglib.h
+${PG_SUBPREFIX}include/ecpgtype.h
+${PG_SUBPREFIX}include/libpq-events.h
+${PG_SUBPREFIX}include/libpq-fe.h
+${PG_SUBPREFIX}include/libpq/libpq-fs.h
+${PG_SUBPREFIX}include/pg_config.h
+${PG_SUBPREFIX}include/pg_config_manual.h
+${PG_SUBPREFIX}include/pg_config_os.h
+${PG_SUBPREFIX}include/pgtypes_date.h
+${PG_SUBPREFIX}include/pgtypes_error.h
+${PG_SUBPREFIX}include/pgtypes_interval.h
+${PG_SUBPREFIX}include/pgtypes_numeric.h
+${PG_SUBPREFIX}include/pgtypes_timestamp.h
+${PG_SUBPREFIX}include/postgres_ext.h
+${PG_SUBPREFIX}include/postgresql/informix/esql/datetime.h
+${PG_SUBPREFIX}include/postgresql/informix/esql/decimal.h
+${PG_SUBPREFIX}include/postgresql/informix/esql/sqltypes.h
+${PG_SUBPREFIX}include/postgresql/internal/c.h
+${PG_SUBPREFIX}include/postgresql/internal/libpq-int.h
+${PG_SUBPREFIX}include/postgresql/internal/libpq/pqcomm.h
+${PG_SUBPREFIX}include/postgresql/internal/port.h
+${PG_SUBPREFIX}include/postgresql/internal/postgres_fe.h
+${PG_SUBPREFIX}include/postgresql/internal/pqexpbuffer.h
+${PG_SUBPREFIX}include/postgresql/server/access/attnum.h
+${PG_SUBPREFIX}include/postgresql/server/access/clog.h
+${PG_SUBPREFIX}include/postgresql/server/access/genam.h
+${PG_SUBPREFIX}include/postgresql/server/access/gin.h
+${PG_SUBPREFIX}include/postgresql/server/access/gist.h
+${PG_SUBPREFIX}include/postgresql/server/access/gist_private.h
+${PG_SUBPREFIX}include/postgresql/server/access/gistscan.h
+${PG_SUBPREFIX}include/postgresql/server/access/hash.h
+${PG_SUBPREFIX}include/postgresql/server/access/heapam.h
+${PG_SUBPREFIX}include/postgresql/server/access/hio.h
+${PG_SUBPREFIX}include/postgresql/server/access/htup.h
+${PG_SUBPREFIX}include/postgresql/server/access/itup.h
+${PG_SUBPREFIX}include/postgresql/server/access/multixact.h
+${PG_SUBPREFIX}include/postgresql/server/access/nbtree.h
+${PG_SUBPREFIX}include/postgresql/server/access/printtup.h
+${PG_SUBPREFIX}include/postgresql/server/access/reloptions.h
+${PG_SUBPREFIX}include/postgresql/server/access/relscan.h
+${PG_SUBPREFIX}include/postgresql/server/access/rewriteheap.h
+${PG_SUBPREFIX}include/postgresql/server/access/rmgr.h
+${PG_SUBPREFIX}include/postgresql/server/access/sdir.h
+${PG_SUBPREFIX}include/postgresql/server/access/skey.h
+${PG_SUBPREFIX}include/postgresql/server/access/slru.h
+${PG_SUBPREFIX}include/postgresql/server/access/subtrans.h
+${PG_SUBPREFIX}include/postgresql/server/access/sysattr.h
+${PG_SUBPREFIX}include/postgresql/server/access/transam.h
+${PG_SUBPREFIX}include/postgresql/server/access/tupconvert.h
+${PG_SUBPREFIX}include/postgresql/server/access/tupdesc.h
+${PG_SUBPREFIX}include/postgresql/server/access/tupmacs.h
+${PG_SUBPREFIX}include/postgresql/server/access/tuptoaster.h
+${PG_SUBPREFIX}include/postgresql/server/access/twophase.h
+${PG_SUBPREFIX}include/postgresql/server/access/twophase_rmgr.h
+${PG_SUBPREFIX}include/postgresql/server/access/valid.h
+${PG_SUBPREFIX}include/postgresql/server/access/visibilitymap.h
+${PG_SUBPREFIX}include/postgresql/server/access/xact.h
+${PG_SUBPREFIX}include/postgresql/server/access/xlog.h
+${PG_SUBPREFIX}include/postgresql/server/access/xlog_internal.h
+${PG_SUBPREFIX}include/postgresql/server/access/xlogdefs.h
+${PG_SUBPREFIX}include/postgresql/server/access/xlogutils.h
+${PG_SUBPREFIX}include/postgresql/server/bootstrap/bootstrap.h
+${PG_SUBPREFIX}include/postgresql/server/c.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/catalog.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/catversion.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/dependency.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/genbki.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/heap.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/index.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/indexing.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/namespace.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_aggregate.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_am.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_amop.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_amproc.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_attrdef.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_attribute.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_auth_members.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_authid.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_cast.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_class.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_constraint.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_control.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_conversion.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_conversion_fn.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_database.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_db_role_setting.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_default_acl.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_depend.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_description.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_enum.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_foreign_data_wrapper.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_foreign_server.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_index.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_inherits.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_inherits_fn.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_language.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_largeobject.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_largeobject_metadata.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_namespace.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_opclass.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_operator.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_opfamily.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_pltemplate.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_proc.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_proc_fn.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_rewrite.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_shdepend.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_shdescription.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_statistic.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_tablespace.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_trigger.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_ts_config.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_ts_config_map.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_ts_dict.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_ts_parser.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_ts_template.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_type.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_type_fn.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/pg_user_mapping.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/schemapg.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/storage.h
+${PG_SUBPREFIX}include/postgresql/server/catalog/toasting.h
+${PG_SUBPREFIX}include/postgresql/server/commands/alter.h
+${PG_SUBPREFIX}include/postgresql/server/commands/async.h
+${PG_SUBPREFIX}include/postgresql/server/commands/cluster.h
+${PG_SUBPREFIX}include/postgresql/server/commands/comment.h
+${PG_SUBPREFIX}include/postgresql/server/commands/conversioncmds.h
+${PG_SUBPREFIX}include/postgresql/server/commands/copy.h
+${PG_SUBPREFIX}include/postgresql/server/commands/dbcommands.h
+${PG_SUBPREFIX}include/postgresql/server/commands/defrem.h
+${PG_SUBPREFIX}include/postgresql/server/commands/discard.h
+${PG_SUBPREFIX}include/postgresql/server/commands/explain.h
+${PG_SUBPREFIX}include/postgresql/server/commands/lockcmds.h
+${PG_SUBPREFIX}include/postgresql/server/commands/portalcmds.h
+${PG_SUBPREFIX}include/postgresql/server/commands/prepare.h
+${PG_SUBPREFIX}include/postgresql/server/commands/proclang.h
+${PG_SUBPREFIX}include/postgresql/server/commands/schemacmds.h
+${PG_SUBPREFIX}include/postgresql/server/commands/sequence.h
+${PG_SUBPREFIX}include/postgresql/server/commands/tablecmds.h
+${PG_SUBPREFIX}include/postgresql/server/commands/tablespace.h
+${PG_SUBPREFIX}include/postgresql/server/commands/trigger.h
+${PG_SUBPREFIX}include/postgresql/server/commands/typecmds.h
+${PG_SUBPREFIX}include/postgresql/server/commands/user.h
+${PG_SUBPREFIX}include/postgresql/server/commands/vacuum.h
+${PG_SUBPREFIX}include/postgresql/server/commands/variable.h
+${PG_SUBPREFIX}include/postgresql/server/commands/view.h
+${PG_SUBPREFIX}include/postgresql/server/dynloader.h
+${PG_SUBPREFIX}include/postgresql/server/executor/execdebug.h
+${PG_SUBPREFIX}include/postgresql/server/executor/execdefs.h
+${PG_SUBPREFIX}include/postgresql/server/executor/execdesc.h
+${PG_SUBPREFIX}include/postgresql/server/executor/executor.h
+${PG_SUBPREFIX}include/postgresql/server/executor/functions.h
+${PG_SUBPREFIX}include/postgresql/server/executor/hashjoin.h
+${PG_SUBPREFIX}include/postgresql/server/executor/instrument.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeAgg.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeAppend.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeBitmapAnd.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeBitmapHeapscan.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeBitmapIndexscan.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeBitmapOr.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeCtescan.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeFunctionscan.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeGroup.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeHash.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeHashjoin.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeIndexscan.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeLimit.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeLockRows.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeMaterial.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeMergejoin.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeModifyTable.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeNestloop.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeRecursiveunion.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeResult.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeSeqscan.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeSetOp.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeSort.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeSubplan.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeSubqueryscan.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeTidscan.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeUnique.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeValuesscan.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeWindowAgg.h
+${PG_SUBPREFIX}include/postgresql/server/executor/nodeWorktablescan.h
+${PG_SUBPREFIX}include/postgresql/server/executor/spi.h
+${PG_SUBPREFIX}include/postgresql/server/executor/spi_priv.h
+${PG_SUBPREFIX}include/postgresql/server/executor/tstoreReceiver.h
+${PG_SUBPREFIX}include/postgresql/server/executor/tuptable.h
+${PG_SUBPREFIX}include/postgresql/server/fmgr.h
+${PG_SUBPREFIX}include/postgresql/server/foreign/foreign.h
+${PG_SUBPREFIX}include/postgresql/server/funcapi.h
+${PG_SUBPREFIX}include/postgresql/server/getaddrinfo.h
+${PG_SUBPREFIX}include/postgresql/server/getopt_long.h
+${PG_SUBPREFIX}include/postgresql/server/lib/dllist.h
+${PG_SUBPREFIX}include/postgresql/server/lib/stringinfo.h
+${PG_SUBPREFIX}include/postgresql/server/libpq/auth.h
+${PG_SUBPREFIX}include/postgresql/server/libpq/be-fsstubs.h
+${PG_SUBPREFIX}include/postgresql/server/libpq/crypt.h
+${PG_SUBPREFIX}include/postgresql/server/libpq/hba.h
+${PG_SUBPREFIX}include/postgresql/server/libpq/ip.h
+${PG_SUBPREFIX}include/postgresql/server/libpq/libpq-be.h
+${PG_SUBPREFIX}include/postgresql/server/libpq/libpq-fs.h
+${PG_SUBPREFIX}include/postgresql/server/libpq/libpq.h
+${PG_SUBPREFIX}include/postgresql/server/libpq/md5.h
+${PG_SUBPREFIX}include/postgresql/server/libpq/pqcomm.h
+${PG_SUBPREFIX}include/postgresql/server/libpq/pqformat.h
+${PG_SUBPREFIX}include/postgresql/server/libpq/pqsignal.h
+${PG_SUBPREFIX}include/postgresql/server/mb/pg_wchar.h
+${PG_SUBPREFIX}include/postgresql/server/miscadmin.h
+${PG_SUBPREFIX}include/postgresql/server/nodes/bitmapset.h
+${PG_SUBPREFIX}include/postgresql/server/nodes/execnodes.h
+${PG_SUBPREFIX}include/postgresql/server/nodes/makefuncs.h
+${PG_SUBPREFIX}include/postgresql/server/nodes/memnodes.h
+${PG_SUBPREFIX}include/postgresql/server/nodes/nodeFuncs.h
+${PG_SUBPREFIX}include/postgresql/server/nodes/nodes.h
+${PG_SUBPREFIX}include/postgresql/server/nodes/params.h
+${PG_SUBPREFIX}include/postgresql/server/nodes/parsenodes.h
+${PG_SUBPREFIX}include/postgresql/server/nodes/pg_list.h
+${PG_SUBPREFIX}include/postgresql/server/nodes/plannodes.h
+${PG_SUBPREFIX}include/postgresql/server/nodes/primnodes.h
+${PG_SUBPREFIX}include/postgresql/server/nodes/print.h
+${PG_SUBPREFIX}include/postgresql/server/nodes/readfuncs.h
+${PG_SUBPREFIX}include/postgresql/server/nodes/relation.h
+${PG_SUBPREFIX}include/postgresql/server/nodes/tidbitmap.h
+${PG_SUBPREFIX}include/postgresql/server/nodes/value.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/clauses.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/cost.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/geqo.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/geqo_copy.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/geqo_gene.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/geqo_misc.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/geqo_mutation.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/geqo_pool.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/geqo_random.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/geqo_recombination.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/geqo_selection.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/joininfo.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/pathnode.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/paths.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/placeholder.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/plancat.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/planmain.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/planner.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/predtest.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/prep.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/restrictinfo.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/subselect.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/tlist.h
+${PG_SUBPREFIX}include/postgresql/server/optimizer/var.h
+${PG_SUBPREFIX}include/postgresql/server/parser/analyze.h
+${PG_SUBPREFIX}include/postgresql/server/parser/gram.h
+${PG_SUBPREFIX}include/postgresql/server/parser/gramparse.h
+${PG_SUBPREFIX}include/postgresql/server/parser/keywords.h
+${PG_SUBPREFIX}include/postgresql/server/parser/kwlist.h
+${PG_SUBPREFIX}include/postgresql/server/parser/parse_agg.h
+${PG_SUBPREFIX}include/postgresql/server/parser/parse_clause.h
+${PG_SUBPREFIX}include/postgresql/server/parser/parse_coerce.h
+${PG_SUBPREFIX}include/postgresql/server/parser/parse_cte.h
+${PG_SUBPREFIX}include/postgresql/server/parser/parse_expr.h
+${PG_SUBPREFIX}include/postgresql/server/parser/parse_func.h
+${PG_SUBPREFIX}include/postgresql/server/parser/parse_node.h
+${PG_SUBPREFIX}include/postgresql/server/parser/parse_oper.h
+${PG_SUBPREFIX}include/postgresql/server/parser/parse_param.h
+${PG_SUBPREFIX}include/postgresql/server/parser/parse_relation.h
+${PG_SUBPREFIX}include/postgresql/server/parser/parse_target.h
+${PG_SUBPREFIX}include/postgresql/server/parser/parse_type.h
+${PG_SUBPREFIX}include/postgresql/server/parser/parse_utilcmd.h
+${PG_SUBPREFIX}include/postgresql/server/parser/parser.h
+${PG_SUBPREFIX}include/postgresql/server/parser/parsetree.h
+${PG_SUBPREFIX}include/postgresql/server/parser/scanner.h
+${PG_SUBPREFIX}include/postgresql/server/parser/scansup.h
+${PG_SUBPREFIX}include/postgresql/server/pg_config.h
+${PG_SUBPREFIX}include/postgresql/server/pg_config_manual.h
+${PG_SUBPREFIX}include/postgresql/server/pg_config_os.h
+${PG_SUBPREFIX}include/postgresql/server/pg_trace.h
+${PG_SUBPREFIX}include/postgresql/server/pgstat.h
+${PG_SUBPREFIX}include/postgresql/server/pgtime.h
+${PG_SUBPREFIX}include/postgresql/server/port.h
+${PG_SUBPREFIX}include/postgresql/server/port/aix.h
+${PG_SUBPREFIX}include/postgresql/server/port/bsdi.h
+${PG_SUBPREFIX}include/postgresql/server/port/cygwin.h
+${PG_SUBPREFIX}include/postgresql/server/port/darwin.h
+${PG_SUBPREFIX}include/postgresql/server/port/dgux.h
+${PG_SUBPREFIX}include/postgresql/server/port/dragonfly.h
+${PG_SUBPREFIX}include/postgresql/server/port/freebsd.h
+${PG_SUBPREFIX}include/postgresql/server/port/hpux.h
+${PG_SUBPREFIX}include/postgresql/server/port/irix.h
+${PG_SUBPREFIX}include/postgresql/server/port/linux.h
+${PG_SUBPREFIX}include/postgresql/server/port/netbsd.h
+${PG_SUBPREFIX}include/postgresql/server/port/nextstep.h
+${PG_SUBPREFIX}include/postgresql/server/port/openbsd.h
+${PG_SUBPREFIX}include/postgresql/server/port/osf.h
+${PG_SUBPREFIX}include/postgresql/server/port/sco.h
+${PG_SUBPREFIX}include/postgresql/server/port/solaris.h
+${PG_SUBPREFIX}include/postgresql/server/port/sunos4.h
+${PG_SUBPREFIX}include/postgresql/server/port/svr4.h
+${PG_SUBPREFIX}include/postgresql/server/port/ultrix4.h
+${PG_SUBPREFIX}include/postgresql/server/port/univel.h
+${PG_SUBPREFIX}include/postgresql/server/port/unixware.h
+${PG_SUBPREFIX}include/postgresql/server/port/win32.h
+${PG_SUBPREFIX}include/postgresql/server/port/win32/arpa/inet.h
+${PG_SUBPREFIX}include/postgresql/server/port/win32/dlfcn.h
+${PG_SUBPREFIX}include/postgresql/server/port/win32/grp.h
+${PG_SUBPREFIX}include/postgresql/server/port/win32/netdb.h
+${PG_SUBPREFIX}include/postgresql/server/port/win32/netinet/in.h
+${PG_SUBPREFIX}include/postgresql/server/port/win32/pwd.h
+${PG_SUBPREFIX}include/postgresql/server/port/win32/sys/socket.h
+${PG_SUBPREFIX}include/postgresql/server/port/win32/sys/wait.h
+${PG_SUBPREFIX}include/postgresql/server/port/win32_msvc/dirent.h
+${PG_SUBPREFIX}include/postgresql/server/port/win32_msvc/sys/file.h
+${PG_SUBPREFIX}include/postgresql/server/port/win32_msvc/sys/param.h
+${PG_SUBPREFIX}include/postgresql/server/port/win32_msvc/sys/time.h
+${PG_SUBPREFIX}include/postgresql/server/port/win32_msvc/unistd.h
+${PG_SUBPREFIX}include/postgresql/server/port/win32_msvc/utime.h
+${PG_SUBPREFIX}include/postgresql/server/portability/instr_time.h
+${PG_SUBPREFIX}include/postgresql/server/postgres.h
+${PG_SUBPREFIX}include/postgresql/server/postgres_ext.h
+${PG_SUBPREFIX}include/postgresql/server/postgres_fe.h
+${PG_SUBPREFIX}include/postgresql/server/postmaster/autovacuum.h
+${PG_SUBPREFIX}include/postgresql/server/postmaster/bgwriter.h
+${PG_SUBPREFIX}include/postgresql/server/postmaster/fork_process.h
+${PG_SUBPREFIX}include/postgresql/server/postmaster/pgarch.h
+${PG_SUBPREFIX}include/postgresql/server/postmaster/postmaster.h
+${PG_SUBPREFIX}include/postgresql/server/postmaster/syslogger.h
+${PG_SUBPREFIX}include/postgresql/server/postmaster/walwriter.h
+${PG_SUBPREFIX}include/postgresql/server/regex/regcustom.h
+${PG_SUBPREFIX}include/postgresql/server/regex/regerrs.h
+${PG_SUBPREFIX}include/postgresql/server/regex/regex.h
+${PG_SUBPREFIX}include/postgresql/server/regex/regguts.h
+${PG_SUBPREFIX}include/postgresql/server/replication/walprotocol.h
+${PG_SUBPREFIX}include/postgresql/server/replication/walreceiver.h
+${PG_SUBPREFIX}include/postgresql/server/replication/walsender.h
+${PG_SUBPREFIX}include/postgresql/server/rewrite/prs2lock.h
+${PG_SUBPREFIX}include/postgresql/server/rewrite/rewriteDefine.h
+${PG_SUBPREFIX}include/postgresql/server/rewrite/rewriteHandler.h
+${PG_SUBPREFIX}include/postgresql/server/rewrite/rewriteManip.h
+${PG_SUBPREFIX}include/postgresql/server/rewrite/rewriteRemove.h
+${PG_SUBPREFIX}include/postgresql/server/rewrite/rewriteSupport.h
+${PG_SUBPREFIX}include/postgresql/server/rusagestub.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/header.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/api.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/header.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_danish.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_dutch.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_english.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_finnish.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_french.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_german.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_hungarian.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_italian.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_norwegian.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_porter.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_portuguese.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_spanish.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_swedish.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_ISO_8859_2_romanian.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_KOI8_R_russian.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_UTF_8_danish.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_UTF_8_dutch.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_UTF_8_english.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_UTF_8_finnish.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_UTF_8_french.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_UTF_8_german.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_UTF_8_hungarian.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_UTF_8_italian.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_UTF_8_norwegian.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_UTF_8_porter.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_UTF_8_portuguese.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_UTF_8_romanian.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_UTF_8_russian.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_UTF_8_spanish.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_UTF_8_swedish.h
+${PG_SUBPREFIX}include/postgresql/server/snowball/libstemmer/stem_UTF_8_turkish.h
+${PG_SUBPREFIX}include/postgresql/server/storage/backendid.h
+${PG_SUBPREFIX}include/postgresql/server/storage/block.h
+${PG_SUBPREFIX}include/postgresql/server/storage/buf.h
+${PG_SUBPREFIX}include/postgresql/server/storage/buf_internals.h
+${PG_SUBPREFIX}include/postgresql/server/storage/buffile.h
+${PG_SUBPREFIX}include/postgresql/server/storage/bufmgr.h
+${PG_SUBPREFIX}include/postgresql/server/storage/bufpage.h
+${PG_SUBPREFIX}include/postgresql/server/storage/fd.h
+${PG_SUBPREFIX}include/postgresql/server/storage/freespace.h
+${PG_SUBPREFIX}include/postgresql/server/storage/fsm_internals.h
+${PG_SUBPREFIX}include/postgresql/server/storage/indexfsm.h
+${PG_SUBPREFIX}include/postgresql/server/storage/ipc.h
+${PG_SUBPREFIX}include/postgresql/server/storage/item.h
+${PG_SUBPREFIX}include/postgresql/server/storage/itemid.h
+${PG_SUBPREFIX}include/postgresql/server/storage/itemptr.h
+${PG_SUBPREFIX}include/postgresql/server/storage/large_object.h
+${PG_SUBPREFIX}include/postgresql/server/storage/lmgr.h
+${PG_SUBPREFIX}include/postgresql/server/storage/lock.h
+${PG_SUBPREFIX}include/postgresql/server/storage/lwlock.h
+${PG_SUBPREFIX}include/postgresql/server/storage/off.h
+${PG_SUBPREFIX}include/postgresql/server/storage/pg_sema.h
+${PG_SUBPREFIX}include/postgresql/server/storage/pg_shmem.h
+${PG_SUBPREFIX}include/postgresql/server/storage/pmsignal.h
+${PG_SUBPREFIX}include/postgresql/server/storage/pos.h
+${PG_SUBPREFIX}include/postgresql/server/storage/proc.h
+${PG_SUBPREFIX}include/postgresql/server/storage/procarray.h
+${PG_SUBPREFIX}include/postgresql/server/storage/procsignal.h
+${PG_SUBPREFIX}include/postgresql/server/storage/relfilenode.h
+${PG_SUBPREFIX}include/postgresql/server/storage/s_lock.h
+${PG_SUBPREFIX}include/postgresql/server/storage/shmem.h
+${PG_SUBPREFIX}include/postgresql/server/storage/sinval.h
+${PG_SUBPREFIX}include/postgresql/server/storage/sinvaladt.h
+${PG_SUBPREFIX}include/postgresql/server/storage/smgr.h
+${PG_SUBPREFIX}include/postgresql/server/storage/spin.h
+${PG_SUBPREFIX}include/postgresql/server/storage/standby.h
+${PG_SUBPREFIX}include/postgresql/server/tcop/dest.h
+${PG_SUBPREFIX}include/postgresql/server/tcop/fastpath.h
+${PG_SUBPREFIX}include/postgresql/server/tcop/pquery.h
+${PG_SUBPREFIX}include/postgresql/server/tcop/tcopdebug.h
+${PG_SUBPREFIX}include/postgresql/server/tcop/tcopprot.h
+${PG_SUBPREFIX}include/postgresql/server/tcop/utility.h
+${PG_SUBPREFIX}include/postgresql/server/tsearch/dicts/regis.h
+${PG_SUBPREFIX}include/postgresql/server/tsearch/dicts/spell.h
+${PG_SUBPREFIX}include/postgresql/server/tsearch/ts_cache.h
+${PG_SUBPREFIX}include/postgresql/server/tsearch/ts_locale.h
+${PG_SUBPREFIX}include/postgresql/server/tsearch/ts_public.h
+${PG_SUBPREFIX}include/postgresql/server/tsearch/ts_type.h
+${PG_SUBPREFIX}include/postgresql/server/tsearch/ts_utils.h
+${PG_SUBPREFIX}include/postgresql/server/utils/acl.h
+${PG_SUBPREFIX}include/postgresql/server/utils/array.h
+${PG_SUBPREFIX}include/postgresql/server/utils/ascii.h
+${PG_SUBPREFIX}include/postgresql/server/utils/attoptcache.h
+${PG_SUBPREFIX}include/postgresql/server/utils/builtins.h
+${PG_SUBPREFIX}include/postgresql/server/utils/bytea.h
+${PG_SUBPREFIX}include/postgresql/server/utils/cash.h
+${PG_SUBPREFIX}include/postgresql/server/utils/catcache.h
+${PG_SUBPREFIX}include/postgresql/server/utils/combocid.h
+${PG_SUBPREFIX}include/postgresql/server/utils/date.h
+${PG_SUBPREFIX}include/postgresql/server/utils/datetime.h
+${PG_SUBPREFIX}include/postgresql/server/utils/datum.h
+${PG_SUBPREFIX}include/postgresql/server/utils/dynahash.h
+${PG_SUBPREFIX}include/postgresql/server/utils/dynamic_loader.h
+${PG_SUBPREFIX}include/postgresql/server/utils/elog.h
+${PG_SUBPREFIX}include/postgresql/server/utils/errcodes.h
+${PG_SUBPREFIX}include/postgresql/server/utils/fmgroids.h
+${PG_SUBPREFIX}include/postgresql/server/utils/fmgrtab.h
+${PG_SUBPREFIX}include/postgresql/server/utils/formatting.h
+${PG_SUBPREFIX}include/postgresql/server/utils/geo_decls.h
+${PG_SUBPREFIX}include/postgresql/server/utils/guc.h
+${PG_SUBPREFIX}include/postgresql/server/utils/guc_tables.h
+${PG_SUBPREFIX}include/postgresql/server/utils/help_config.h
+${PG_SUBPREFIX}include/postgresql/server/utils/hsearch.h
+${PG_SUBPREFIX}include/postgresql/server/utils/inet.h
+${PG_SUBPREFIX}include/postgresql/server/utils/int8.h
+${PG_SUBPREFIX}include/postgresql/server/utils/inval.h
+${PG_SUBPREFIX}include/postgresql/server/utils/logtape.h
+${PG_SUBPREFIX}include/postgresql/server/utils/lsyscache.h
+${PG_SUBPREFIX}include/postgresql/server/utils/memutils.h
+${PG_SUBPREFIX}include/postgresql/server/utils/nabstime.h
+${PG_SUBPREFIX}include/postgresql/server/utils/numeric.h
+${PG_SUBPREFIX}include/postgresql/server/utils/palloc.h
+${PG_SUBPREFIX}include/postgresql/server/utils/pg_crc.h
+${PG_SUBPREFIX}include/postgresql/server/utils/pg_locale.h
+${PG_SUBPREFIX}include/postgresql/server/utils/pg_lzcompress.h
+${PG_SUBPREFIX}include/postgresql/server/utils/pg_rusage.h
+${PG_SUBPREFIX}include/postgresql/server/utils/plancache.h
+${PG_SUBPREFIX}include/postgresql/server/utils/portal.h
+${PG_SUBPREFIX}include/postgresql/server/utils/probes.h
+${PG_SUBPREFIX}include/postgresql/server/utils/ps_status.h
+${PG_SUBPREFIX}include/postgresql/server/utils/rbtree.h
+${PG_SUBPREFIX}include/postgresql/server/utils/rel.h
+${PG_SUBPREFIX}include/postgresql/server/utils/relcache.h
+${PG_SUBPREFIX}include/postgresql/server/utils/relmapper.h
+${PG_SUBPREFIX}include/postgresql/server/utils/resowner.h
+${PG_SUBPREFIX}include/postgresql/server/utils/selfuncs.h
+${PG_SUBPREFIX}include/postgresql/server/utils/snapmgr.h
+${PG_SUBPREFIX}include/postgresql/server/utils/snapshot.h
+${PG_SUBPREFIX}include/postgresql/server/utils/spccache.h
+${PG_SUBPREFIX}include/postgresql/server/utils/syscache.h
+${PG_SUBPREFIX}include/postgresql/server/utils/timestamp.h
+${PG_SUBPREFIX}include/postgresql/server/utils/tqual.h
+${PG_SUBPREFIX}include/postgresql/server/utils/tuplesort.h
+${PG_SUBPREFIX}include/postgresql/server/utils/tuplestore.h
+${PG_SUBPREFIX}include/postgresql/server/utils/typcache.h
+${PG_SUBPREFIX}include/postgresql/server/utils/tzparser.h
+${PG_SUBPREFIX}include/postgresql/server/utils/uuid.h
+${PG_SUBPREFIX}include/postgresql/server/utils/varbit.h
+${PG_SUBPREFIX}include/postgresql/server/utils/xml.h
+${PG_SUBPREFIX}include/postgresql/server/windowapi.h
+${PG_SUBPREFIX}include/sql3types.h
+${PG_SUBPREFIX}include/sqlca.h
+${PG_SUBPREFIX}include/sqlda-compat.h
+${PG_SUBPREFIX}include/sqlda-native.h
+${PG_SUBPREFIX}include/sqlda.h
+${PG_SUBPREFIX}lib/libecpg.la
+${PG_SUBPREFIX}lib/libecpg_compat.la
+${PG_SUBPREFIX}lib/libpgport.a
+${PG_SUBPREFIX}lib/libpgtypes.la
+${PG_SUBPREFIX}lib/libpq.la
+${PG_SUBPREFIX}lib/postgresql/pgxs/config/install-sh
+${PG_SUBPREFIX}lib/postgresql/pgxs/src/Makefile.global
+${PG_SUBPREFIX}lib/postgresql/pgxs/src/Makefile.port
+${PG_SUBPREFIX}lib/postgresql/pgxs/src/Makefile.shlib
+${PG_SUBPREFIX}lib/postgresql/pgxs/src/makefiles/pgxs.mk
+${PG_SUBPREFIX}lib/postgresql/pgxs/src/nls-global.mk
+${PG_SUBPREFIX}share/locale/cs/LC_MESSAGES/initdb-9.0.mo
+${PG_SUBPREFIX}share/locale/cs/LC_MESSAGES/libpq5-9.0.mo
+${PG_SUBPREFIX}share/locale/cs/LC_MESSAGES/pgscripts-9.0.mo
+${PG_SUBPREFIX}share/locale/cs/LC_MESSAGES/psql-9.0.mo
+${PG_SUBPREFIX}share/locale/de/LC_MESSAGES/ecpg-9.0.mo
+${PG_SUBPREFIX}share/locale/de/LC_MESSAGES/ecpglib6-9.0.mo
+${PG_SUBPREFIX}share/locale/de/LC_MESSAGES/initdb-9.0.mo
+${PG_SUBPREFIX}share/locale/de/LC_MESSAGES/libpq5-9.0.mo
+${PG_SUBPREFIX}share/locale/de/LC_MESSAGES/pg_config-9.0.mo
+${PG_SUBPREFIX}share/locale/de/LC_MESSAGES/pg_controldata-9.0.mo
+${PG_SUBPREFIX}share/locale/de/LC_MESSAGES/pg_ctl-9.0.mo
+${PG_SUBPREFIX}share/locale/de/LC_MESSAGES/pg_dump-9.0.mo
+${PG_SUBPREFIX}share/locale/de/LC_MESSAGES/pg_resetxlog-9.0.mo
+${PG_SUBPREFIX}share/locale/de/LC_MESSAGES/pgscripts-9.0.mo
+${PG_SUBPREFIX}share/locale/de/LC_MESSAGES/psql-9.0.mo
+${PG_SUBPREFIX}share/locale/es/LC_MESSAGES/ecpg-9.0.mo
+${PG_SUBPREFIX}share/locale/es/LC_MESSAGES/ecpglib6-9.0.mo
+${PG_SUBPREFIX}share/locale/es/LC_MESSAGES/initdb-9.0.mo
+${PG_SUBPREFIX}share/locale/es/LC_MESSAGES/libpq5-9.0.mo
+${PG_SUBPREFIX}share/locale/es/LC_MESSAGES/pg_config-9.0.mo
+${PG_SUBPREFIX}share/locale/es/LC_MESSAGES/pg_controldata-9.0.mo
+${PG_SUBPREFIX}share/locale/es/LC_MESSAGES/pg_ctl-9.0.mo
+${PG_SUBPREFIX}share/locale/es/LC_MESSAGES/pg_dump-9.0.mo
+${PG_SUBPREFIX}share/locale/es/LC_MESSAGES/pg_resetxlog-9.0.mo
+${PG_SUBPREFIX}share/locale/es/LC_MESSAGES/pgscripts-9.0.mo
+${PG_SUBPREFIX}share/locale/es/LC_MESSAGES/psql-9.0.mo
+${PG_SUBPREFIX}share/locale/fr/LC_MESSAGES/ecpg-9.0.mo
+${PG_SUBPREFIX}share/locale/fr/LC_MESSAGES/ecpglib6-9.0.mo
+${PG_SUBPREFIX}share/locale/fr/LC_MESSAGES/initdb-9.0.mo
+${PG_SUBPREFIX}share/locale/fr/LC_MESSAGES/libpq5-9.0.mo
+${PG_SUBPREFIX}share/locale/fr/LC_MESSAGES/pg_config-9.0.mo
+${PG_SUBPREFIX}share/locale/fr/LC_MESSAGES/pg_controldata-9.0.mo
+${PG_SUBPREFIX}share/locale/fr/LC_MESSAGES/pg_ctl-9.0.mo
+${PG_SUBPREFIX}share/locale/fr/LC_MESSAGES/pg_dump-9.0.mo
+${PG_SUBPREFIX}share/locale/fr/LC_MESSAGES/pg_resetxlog-9.0.mo
+${PG_SUBPREFIX}share/locale/fr/LC_MESSAGES/pgscripts-9.0.mo
+${PG_SUBPREFIX}share/locale/fr/LC_MESSAGES/psql-9.0.mo
+${PG_SUBPREFIX}share/locale/it/LC_MESSAGES/ecpg-9.0.mo
+${PG_SUBPREFIX}share/locale/it/LC_MESSAGES/ecpglib6-9.0.mo
+${PG_SUBPREFIX}share/locale/it/LC_MESSAGES/initdb-9.0.mo
+${PG_SUBPREFIX}share/locale/it/LC_MESSAGES/libpq5-9.0.mo
+${PG_SUBPREFIX}share/locale/it/LC_MESSAGES/pg_config-9.0.mo
+${PG_SUBPREFIX}share/locale/it/LC_MESSAGES/pg_controldata-9.0.mo
+${PG_SUBPREFIX}share/locale/it/LC_MESSAGES/pg_ctl-9.0.mo
+${PG_SUBPREFIX}share/locale/it/LC_MESSAGES/pg_dump-9.0.mo
+${PG_SUBPREFIX}share/locale/it/LC_MESSAGES/pg_resetxlog-9.0.mo
+${PG_SUBPREFIX}share/locale/it/LC_MESSAGES/pgscripts-9.0.mo
+${PG_SUBPREFIX}share/locale/ja/LC_MESSAGES/ecpg-9.0.mo
+${PG_SUBPREFIX}share/locale/ja/LC_MESSAGES/ecpglib6-9.0.mo
+${PG_SUBPREFIX}share/locale/ja/LC_MESSAGES/initdb-9.0.mo
+${PG_SUBPREFIX}share/locale/ja/LC_MESSAGES/libpq5-9.0.mo
+${PG_SUBPREFIX}share/locale/ja/LC_MESSAGES/pg_config-9.0.mo
+${PG_SUBPREFIX}share/locale/ja/LC_MESSAGES/pg_controldata-9.0.mo
+${PG_SUBPREFIX}share/locale/ja/LC_MESSAGES/pg_ctl-9.0.mo
+${PG_SUBPREFIX}share/locale/ja/LC_MESSAGES/pg_dump-9.0.mo
+${PG_SUBPREFIX}share/locale/ja/LC_MESSAGES/pg_resetxlog-9.0.mo
+${PG_SUBPREFIX}share/locale/ja/LC_MESSAGES/pgscripts-9.0.mo
+${PG_SUBPREFIX}share/locale/ja/LC_MESSAGES/psql-9.0.mo
+${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/ecpg-9.0.mo
+${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/initdb-9.0.mo
+${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/libpq5-9.0.mo
+${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/pg_config-9.0.mo
+${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/pg_controldata-9.0.mo
+${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/pg_ctl-9.0.mo
+${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/pg_dump-9.0.mo
+${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/pg_resetxlog-9.0.mo
+${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/pgscripts-9.0.mo
+${PG_SUBPREFIX}share/locale/nb/LC_MESSAGES/pg_config-9.0.mo
+${PG_SUBPREFIX}share/locale/pt_BR/LC_MESSAGES/ecpg-9.0.mo
+${PG_SUBPREFIX}share/locale/pt_BR/LC_MESSAGES/ecpglib6-9.0.mo
+${PG_SUBPREFIX}share/locale/pt_BR/LC_MESSAGES/initdb-9.0.mo
+${PG_SUBPREFIX}share/locale/pt_BR/LC_MESSAGES/libpq5-9.0.mo
+${PG_SUBPREFIX}share/locale/pt_BR/LC_MESSAGES/pg_config-9.0.mo
+${PG_SUBPREFIX}share/locale/pt_BR/LC_MESSAGES/pg_controldata-9.0.mo
+${PG_SUBPREFIX}share/locale/pt_BR/LC_MESSAGES/pg_ctl-9.0.mo
+${PG_SUBPREFIX}share/locale/pt_BR/LC_MESSAGES/pg_dump-9.0.mo
+${PG_SUBPREFIX}share/locale/pt_BR/LC_MESSAGES/pg_resetxlog-9.0.mo
+${PG_SUBPREFIX}share/locale/pt_BR/LC_MESSAGES/pgscripts-9.0.mo
+${PG_SUBPREFIX}share/locale/pt_BR/LC_MESSAGES/psql-9.0.mo
+${PG_SUBPREFIX}share/locale/ro/LC_MESSAGES/initdb-9.0.mo
+${PG_SUBPREFIX}share/locale/ro/LC_MESSAGES/pg_config-9.0.mo
+${PG_SUBPREFIX}share/locale/ro/LC_MESSAGES/pg_controldata-9.0.mo
+${PG_SUBPREFIX}share/locale/ro/LC_MESSAGES/pg_resetxlog-9.0.mo
+${PG_SUBPREFIX}share/locale/ro/LC_MESSAGES/pgscripts-9.0.mo
+${PG_SUBPREFIX}share/locale/ru/LC_MESSAGES/initdb-9.0.mo
+${PG_SUBPREFIX}share/locale/ru/LC_MESSAGES/libpq5-9.0.mo
+${PG_SUBPREFIX}share/locale/ru/LC_MESSAGES/pg_config-9.0.mo
+${PG_SUBPREFIX}share/locale/ru/LC_MESSAGES/pg_ctl-9.0.mo
+${PG_SUBPREFIX}share/locale/ru/LC_MESSAGES/pg_resetxlog-9.0.mo
+${PG_SUBPREFIX}share/locale/sv/LC_MESSAGES/initdb-9.0.mo
+${PG_SUBPREFIX}share/locale/sv/LC_MESSAGES/libpq5-9.0.mo
+${PG_SUBPREFIX}share/locale/sv/LC_MESSAGES/pg_config-9.0.mo
+${PG_SUBPREFIX}share/locale/sv/LC_MESSAGES/pg_controldata-9.0.mo
+${PG_SUBPREFIX}share/locale/sv/LC_MESSAGES/pg_ctl-9.0.mo
+${PG_SUBPREFIX}share/locale/sv/LC_MESSAGES/pg_dump-9.0.mo
+${PG_SUBPREFIX}share/locale/sv/LC_MESSAGES/pg_resetxlog-9.0.mo
+${PG_SUBPREFIX}share/locale/sv/LC_MESSAGES/pgscripts-9.0.mo
+${PG_SUBPREFIX}share/locale/sv/LC_MESSAGES/psql-9.0.mo
+${PG_SUBPREFIX}share/locale/ta/LC_MESSAGES/initdb-9.0.mo
+${PG_SUBPREFIX}share/locale/ta/LC_MESSAGES/libpq5-9.0.mo
+${PG_SUBPREFIX}share/locale/ta/LC_MESSAGES/pg_config-9.0.mo
+${PG_SUBPREFIX}share/locale/ta/LC_MESSAGES/pg_controldata-9.0.mo
+${PG_SUBPREFIX}share/locale/ta/LC_MESSAGES/pg_ctl-9.0.mo
+${PG_SUBPREFIX}share/locale/ta/LC_MESSAGES/pg_resetxlog-9.0.mo
+${PG_SUBPREFIX}share/locale/ta/LC_MESSAGES/pgscripts-9.0.mo
+${PG_SUBPREFIX}share/locale/tr/LC_MESSAGES/ecpg-9.0.mo
+${PG_SUBPREFIX}share/locale/tr/LC_MESSAGES/ecpglib6-9.0.mo
+${PG_SUBPREFIX}share/locale/tr/LC_MESSAGES/initdb-9.0.mo
+${PG_SUBPREFIX}share/locale/tr/LC_MESSAGES/libpq5-9.0.mo
+${PG_SUBPREFIX}share/locale/tr/LC_MESSAGES/pg_config-9.0.mo
+${PG_SUBPREFIX}share/locale/tr/LC_MESSAGES/pg_controldata-9.0.mo
+${PG_SUBPREFIX}share/locale/tr/LC_MESSAGES/pg_ctl-9.0.mo
+${PG_SUBPREFIX}share/locale/tr/LC_MESSAGES/pg_dump-9.0.mo
+${PG_SUBPREFIX}share/locale/tr/LC_MESSAGES/pg_resetxlog-9.0.mo
+${PG_SUBPREFIX}share/locale/tr/LC_MESSAGES/pgscripts-9.0.mo
+${PG_SUBPREFIX}share/locale/tr/LC_MESSAGES/psql-9.0.mo
+${PG_SUBPREFIX}share/locale/zh_CN/LC_MESSAGES/ecpg-9.0.mo
+${PG_SUBPREFIX}share/locale/zh_CN/LC_MESSAGES/ecpglib6-9.0.mo
+${PG_SUBPREFIX}share/locale/zh_CN/LC_MESSAGES/initdb-9.0.mo
+${PG_SUBPREFIX}share/locale/zh_CN/LC_MESSAGES/libpq5-9.0.mo
+${PG_SUBPREFIX}share/locale/zh_CN/LC_MESSAGES/pg_config-9.0.mo
+${PG_SUBPREFIX}share/locale/zh_CN/LC_MESSAGES/pg_controldata-9.0.mo
+${PG_SUBPREFIX}share/locale/zh_CN/LC_MESSAGES/pg_ctl-9.0.mo
+${PG_SUBPREFIX}share/locale/zh_CN/LC_MESSAGES/pg_dump-9.0.mo
+${PG_SUBPREFIX}share/locale/zh_CN/LC_MESSAGES/pg_resetxlog-9.0.mo
+${PG_SUBPREFIX}share/locale/zh_CN/LC_MESSAGES/pgscripts-9.0.mo
+${PG_SUBPREFIX}share/locale/zh_CN/LC_MESSAGES/psql-9.0.mo
+${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/ecpg-9.0.mo
+${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/initdb-9.0.mo
+${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/libpq5-9.0.mo
+${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/pg_config-9.0.mo
+${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/pg_controldata-9.0.mo
+${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/pg_ctl-9.0.mo
+${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/pg_dump-9.0.mo
+${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/pg_resetxlog-9.0.mo
+${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/pgscripts-9.0.mo
+${PG_SUBPREFIX}share/postgresql/pg_service.conf.sample
+${PG_SUBPREFIX}share/postgresql/psqlrc.sample
diff --git a/databases/postgresql90/Makefile.common b/databases/postgresql90/Makefile.common
index ccce4ca8a43..2d47d619e74 100644
--- a/databases/postgresql90/Makefile.common
+++ b/databases/postgresql90/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2010/12/24 03:34:33 asau Exp $
+# $NetBSD: Makefile.common,v 1.7 2010/12/24 03:41:38 asau Exp $
 #
 # used by databases/postgresql90-adminpack/Makefile
 # used by databases/postgresql90-client/Makefile
@@ -49,10 +49,31 @@ PG_TEMPLATE.IRIX=	irix5
 PG_TEMPLATE.${OPSYS}=	${LOWER_OPSYS}
 .endif
 
+PG_SUBPREFIX=		# empty
+.if empty(PG_SUBPREFIX)
+PG_PREFIX=		${PREFIX}
+PLIST_SUBST+=		PG_SUBPREFIX=
+.else
+PG_PREFIX=		${PREFIX}/${PG_SUBPREFIX}
+BUILD_DEFS+=		PG_SUBPREFIX
+PLIST_SUBST+=		PG_SUBPREFIX=${PG_SUBPREFIX:/=}/
+BUILDLINK_PASSTHRU_DIRS+=	${PG_PREFIX}
+.endif
+PG_DATA_DIR=		${PG_PREFIX}/share/postgresql
+PG_DOC_DIR=		${PG_PREFIX}/share/doc/postgresql
+PG_LOCALE_DIR=		${PG_PREFIX}/${PKGLOCALEDIR}/locale
+PG_ETC_DIR=		${PKG_SYSCONFDIR:S/^${PREFIX}\//${PG_PREFIX}\//}
+
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/postgresql
+CONFIGURE_ARGS+=	--bindir=${PG_PREFIX}/bin
+CONFIGURE_ARGS+=	--libdir=${PG_PREFIX}/lib
+CONFIGURE_ARGS+=	--includedir=${PG_PREFIX}/include
+CONFIGURE_ARGS+=	--sysconfdir=${PG_ETC_DIR}
+CONFIGURE_ARGS+=	--datadir=${PG_DATA_DIR}
+CONFIGURE_ARGS+=	--localedir=${PG_LOCALE_DIR}
+CONFIGURE_ARGS+=	--with-docdir=${PG_DOC_DIR}
 CONFIGURE_ARGS+=	--with-template=${PG_TEMPLATE.${OPSYS}}
+GNU_CONFIGURE_MANDIR=	$(PG_PREFIX)/$(PKGMANDIR)
 
 CONFIGURE_ARGS+=	--enable-nls
 CONFIGURE_ARGS+=	--without-perl
@@ -109,3 +130,6 @@ post-extract:
 .endif
 
 .include "../../databases/postgresql90/options.mk"
+
+# Help to generate PLIST
+PRINT_PLIST_AWK+=	{sub("^${PG_SUBPREFIX}/", ""); $$0 = "$${PG_SUBPREFIX}" $$0;}
diff --git a/databases/postgresql90/files/Makefile.custom b/databases/postgresql90/files/Makefile.custom
index d2ee4223714..675f0bf4afb 100644
--- a/databases/postgresql90/files/Makefile.custom
+++ b/databases/postgresql90/files/Makefile.custom
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.custom,v 1.1.1.1 2010/09/21 07:50:46 adam Exp $
+# $NetBSD: Makefile.custom,v 1.2 2010/12/24 03:41:38 asau Exp $
 #
 # This file is included at the end of Makefile.global, which is included
 # by every sub-Makefile in the build tree.  Makefiles for shared
@@ -8,12 +8,6 @@
 # Override any OS-specific locations for where to put SQL man pages.
 sqlmansect = 7
 
-# Override installation paths to avoid logic in Makefile.global.
-includedir = $(prefix)/include
-libdir = $(exec_prefix)/lib
-pkglibdir = $(libdir)/postgresql
-pkgincludedir = $(includedir)/postgresql
-
 # INSTALLED_LIBPQ is passed in from the environment and tells the build
 # system how to link to an installed libpq.*.
 #