Upgrade to v6.4.

This version of port does not support complete packing list
for -DMULTIBYTE, -DUSE_PERL or -DUSE_ODBC options.  I'll
fix it later.

PR:             ports/8856, ports/8976
Submitted by:   Ichiro Fukuhara <ichiro@ichiro.org>

18 files changed, 1995 insertions, 789 deletions

diff --git a/japanese/postgresql-tcltk/Makefile b/japanese/postgresql-tcltk/Makefile
index 31db55929a7c..6bdc835753ee 100644
--- a/japanese/postgresql-tcltk/Makefile
+++ b/japanese/postgresql-tcltk/Makefile
@@ -1,34 +1,47 @@
 # New ports collection makefile for:	PostgreSQL-j
-# Version required:	6.3.2+Multibyte-patch
-# Date created:		20 Aug 1998
+# Version required:	6.4+Multibyte-patch
+# Date created:		25 Nov 1998
 # Whom:			Ichiro Fukuhara <ichiro@ichiro.org>
 #
-# $Id: Makefile,v 1.2 1998/09/28 10:30:52 asami Exp $
+# $Id$
 #
 
-DISTNAME=	postgresql-6.3.2
-PKGNAME=	ja-postgresql-6.3.2
+DISTNAME=	postgresql-v6.4
+PKGNAME=	ja-postgresql-6.4
 CATEGORIES=	japanese databases
 MASTER_SITES=	ftp://ftp.postgresql.org/pub/ \
 		ftp://ftp.jaist.ac.jp/pub/dbms/PostgreSQL/ \
-		ftp://ftp.sra.co.jp/pub/cmd/postgres/6.3.2/
+		ftp://ftp.sra.co.jp/pub/cmd/postgres/6.4/
 
-PATCH_SITES=	ftp://ftp.sra.co.jp/pub/cmd/postgres/6.3.2/patches/FreeBSD/
-PATCHFILES=	jumbo_981104.patch.gz
+PATCH_SITES=	ftp://ftp.sra.co.jp/pub/cmd/postgres/6.4/patches/
+PATCHFILES=	jumbo-981124.patch.gz
 
 MAINTAINER=	ichiro@ichiro.org
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} --forward --quiet -E -p1
+PLISTS=		PLIST
 
 # if you want to use the tcl/tk frontend pgaccess, then you need to build
 # postgresql with tcl support by typing: make USE_TCL=yes
 .if defined(USE_TCL)
-MAKE_ENV=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl7.6
-LIB_DEPENDS=	tcl76jp.1:${PORTSDIR}/japanese/tcl76 \
-		tk42jp.1:${PORTSDIR}/japanese/tk42
-WITH_TCL=	--with-tcl
-PLIST=		${PKGDIR}/PLIST.tcl
+TCL_INCDIR=	${PREFIX}/include/tcl8.0jp
+TK_INCDIR=	${PREFIX}/include/tk8.0jp
+MAKE_ENV=	USE_TCL=true TCL_INCDIR=${TCL_INCDIR}
+WITH_TCL=	--with-tcl --with-tclconfig="${PREFIX}/lib/tcl8.0jp ${PREFIX}/lib/tk8.0jp"
+LIB_DEPENDS=	tcl80jp.1:${PORTSDIR}/japanese/tcl80 \
+		tk80jp.1:${PORTSDIR}/japanese/tk80
+PLISTS+=	PLIST.tcl
+.endif
+.if defined(MULTIBYTE)
+WITH_MB=	--with-mb=${MULTIBYTE}
+.endif
+.if defined(USE_PERL)
+WITH_PERL=      --with-perl
+.endif
+.if defined(USE_ODBC)
+WITH_ODBC=      --with-odbc
+PLISTS+=	PLIST.odbc
 .endif
 
 NO_PACKAGE=	"Requires ${PGSQL_UID} uid"
@@ -38,15 +51,18 @@ MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
 CONFIGURE_ARGS= --prefix=${PREFIX}/${INSTALL_DIR} \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
-		--with-includes=${PREFIX}/include ${WITH_TCL} \
-		--with-libraries=${PREFIX}/lib --with-mb=EUC_JP
+		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" ${WITH_TCL}\
+		--with-libraries=${PREFIX}/lib \
+		${WITH_MB} ${WITH_PERL} ${WITH_ODBC}
+
+INSTALL_TARGET= install install-man
 
 MAN1=		cleardbdir.1 createdb.1 createuser.1 destroydb.1 \
-		destroyuser.1 ecpg.1 initdb.1 ipcclean.1 initlocation.1 \
-		pg_dump.1 pg_dumpall.1 pg_passwd.1 pgintro.1 postgres.1 \
-		postmaster.1 psql.1
-MAN3=		catalogs.3 large_objects.3 libpq.3 oracle_compat.3 pgbuiltin.3
-MAN5=		bki.5 page.5 pg_hba.conf.5
+		destroyuser.1 ecpg.1 initdb.1 initlocation.1 \
+		ipcclean.1 pg_dump.1 pg_dumpall.1 pg_passwd.1 \
+		pg_upgrade.1 postgres.1 postmaster.1 psql.1
+MAN3=		catalogs.3 libpq.3
+MAN5=		pg_hba.conf.5
 MANL=		abort.l alter_table.l alter_user.l begin.l close.l cluster.l \
 		commit.l copy.l create_aggregate.l create_database.l \
 		create_function.l create_index.l create_language.l \
@@ -57,12 +73,13 @@ MANL=		abort.l alter_table.l alter_user.l begin.l close.l cluster.l \
 		drop_language.l drop_operator.l drop_rule.l drop_sequence.l \
 		drop_table.l drop_trigger.l drop_type.l drop_user.l \
 		drop_view.l end.l explain.l fetch.l grant.l insert.l listen.l \
-		load.l lock.l move.l notify.l reset.l revoke.l \
-		rollback.l select.l set.l show.l sql.l update.l vacuum.l
+		load.l lock.l move.l notify.l reset.l revoke.l rollback.l \
+		select.l set.l show.l sql.l update.l vacuum.l
 
 MANPREFIX=	${PREFIX}/${INSTALL_DIR}
 
 PLIST_SUB=	INSTALL_DIR=${INSTALL_DIR}
+PLIST=		${WRKDIR}/PLIST
 
 # These values are easily overridable like as
 #   "make PGQL_UID=postgresql PGSQL_GID=postgresql install"
@@ -71,13 +88,20 @@ PGSQL_UID=	pgsql
 PGSQL_GID=	pgsql
 
 pre-fetch:
-.if !defined(USE_TCL)
+.if !defined(USE_TCL) & !defined(USE_PERL) & !defined(USE_ODBC) & !defined(MULTIBYTE)
+
+	@${ECHO_MSG} "To build the \"MULTIBYTE PostgreSQL\", type:"
+	@${ECHO_MSG} "    make MULTIBYTE={EUC_JP,EUC_CN,EUC_KR,EUC_TW,UNICODE,MULE_INTERNAL,LATIN1-5}"
+	@${ECHO_MSG} "          USE_TCL=yes, USE_PERL=yes, USE_ODBC=yes"
+	@${ECHO_MSG} ""
 	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:"
-	@${ECHO_MSG} "    make USE_TCL=yes"
+	@${ECHO_MSG} "		make USE_TCL=yes"
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."
 .endif
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	find ${WRKDIR} -name '*.orig' -exec ${RM} {} \;
 
@@ -86,17 +110,19 @@ post-build:
 	@ ${ECHO} "Dump existing databases, before installing new db version !!"
 	@ ${ECHO} "Detailed instructions, see INSTALL file under ${WRKDIR}...  "
 	@ ${ECHO} "------------------------------------------------------------"
+	@${RM} -f ${WRKDIR}/PLIST
+.for i in ${PLISTS}
+	${CAT} ${PKGDIR}/${i} >> ${WRKDIR}/PLIST
+.endfor
 
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	${RM} -rf ${PREFIX}/${INSTALL_DIR}
 .endif
 	@ ${MKDIR} ${PREFIX}/${INSTALL_DIR}
-	@ ${SED} "s=PGSQL_UID=${PGSQL_UID}=g ; s=PGSQL_GID=${PGSQL_GID}=g ; \
-		s=INSTALL_DIR=${INSTALL_DIR}=g" < ${SCRIPTDIR}/createuser.tmpl \
-		> ${WRKDIR}/createuser
-	@ ${SETENV} ${MAKE_ENV} perl ${WRKDIR}/createuser
-
+	@ ${SETENV} INSTALL_DIR=${INSTALL_DIR} \
+	     	    PGSQL_UID=${PGSQL_UID} PGSQL_GID=${PGSQL_GID} \
+		 ${SH} ${PKGDIR}/INSTALL PRE-INSTALL
 post-install:
 	@ if [ ! -f ${PREFIX}/${INSTALL_DIR}/.profile ]; then \
 		${ECHO} "PATH=${PATH}:${PREFIX}/${INSTALL_DIR}/bin" \
@@ -123,7 +149,7 @@ post-install:
 	@ chown -R ${PGSQL_UID}:${PGSQL_GID} ${PREFIX}/${INSTALL_DIR}
 	@ ${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'
 	@ ${LDCONFIG} -m ${PREFIX}/${INSTALL_DIR}/lib
-	@ su -l ${PGSQL_UID} -c '${PREFIX}/${INSTALL_DIR}/bin/initdb --pglib=${PREFIX}/${INSTALL_DIR}/lib --pgdata=${PREFIX}/${INSTALL_DIR}/data'
+	@ /usr/bin/su -l ${PGSQL_UID} -c '${PREFIX}/${INSTALL_DIR}/bin/initdb --pglib=${PREFIX}/${INSTALL_DIR}/lib --pgdata=${PREFIX}/${INSTALL_DIR}/data'
 	@ ${SED} "s=!!PG_PATH!!=${PREFIX}/${INSTALL_DIR}=g ; s=!!PGSQL_UID!!=${PGSQL_UID}=g" \
 		< ${FILESDIR}/pgsql.sh.tmpl > ${PREFIX}/etc/rc.d/pgsql.sh
 	@ chmod 554 ${PREFIX}/etc/rc.d/pgsql.sh
@@ -136,5 +162,10 @@ post-install:
 .if !defined(BATCH)
 	@ more -e ${FILESDIR}/post-install-notes
 .endif
+#.if (${PORTOBJFORMAT} == "elf")
+#	@${ECHO} "Hack for ELF library..."
+#	@${RM} ${PREFIX}/${INSTALL_DIR}/lib/libpg.so.2.0
+#	@${RM} ${PREFIX}/${INSTALL_DIR}/lib/libpg++.so.2.0
+#.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/postgresql-tcltk/distinfo b/japanese/postgresql-tcltk/distinfo
index 2c981a8e7977..da2303a66330 100644
--- a/japanese/postgresql-tcltk/distinfo
+++ b/japanese/postgresql-tcltk/distinfo
@@ -1,2 +1,2 @@
-MD5 (postgresql-6.3.2.tar.gz) = 8902842461c9a42854ba9883bee56a4c
-MD5 (jumbo_981104.patch.gz) = b3dfe9e1fe61106133d71808723318e9
+MD5 (postgresql-v6.4.tar.gz) = 8a6e224f90b0201757eb05aa0068bfa9
+MD5 (jumbo-981124.patch.gz) = 7050d2c2221c004d1b3778f8965be92d
diff --git a/japanese/postgresql-tcltk/files/patch-ad b/japanese/postgresql-tcltk/files/patch-ad
index 3529936565aa..56f482cd4dd8 100644
--- a/japanese/postgresql-tcltk/files/patch-ad
+++ b/japanese/postgresql-tcltk/files/patch-ad
@@ -5,8 +5,8 @@
  SHARED_LIB:-fpic -DPIC
 -CFLAGS:-O2 -m486 -pipe
 +CFLAGS:-pipe -O2
- SRCH_INC:/usr/local/include
- SRCH_LIB:/usr/local/lib
+ SRCH_INC:
+ SRCH_LIB:
 -USE_LOCALE:no
 +USE_LOCALE:yes
  DLSUFFIX:.so
diff --git a/japanese/postgresql-tcltk/pkg-install b/japanese/postgresql-tcltk/pkg-install
new file mode 100644
index 000000000000..e589ba9ef351
--- /dev/null
+++ b/japanese/postgresql-tcltk/pkg-install
@@ -0,0 +1,98 @@
+#!/bin/sh
+# an installation script for postgresql
+
+check_pw()
+{
+    if which -s pw; then
+	:
+    else
+	cat <<EOF
+
+This system looks like a pre-2.2 version of FreeBSD.  We see that it
+is missing the "pw" utility.  We need this utility.  Please get and
+install it, and try again.  You can get the source from:
+
+  ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/usr.sbin/pw.tar.gz
+
+EOF
+	exit 1
+    fi
+}
+
+ask() {
+    local question default answer
+
+    question=$1
+    default=$2
+    if [ -z "${PACKAGE_BUILDING}" ]; then
+	read -p "${question} (y/n) [${default}]? " answer
+    fi
+    if [ x${answer} = x ]; then
+	answer=${default}
+    fi
+    echo ${answer}
+}
+
+yesno() {
+    local dflt question answer
+
+    question=$1
+    dflt=$2
+    while :; do
+	answer=$(ask "${question}" "${dflt}")
+	case "${answer}" in
+	[Yy]*)		return 0;;
+	[Nn]*)		return 1;;
+	esac
+	echo "Please answer yes or no."
+    done
+}
+
+case $1 in
+PRE-INSTALL)
+
+    ## Hack /etc/master.passwd ##
+    # check
+    id_70=`id -nu 70 2> /dev/null`
+    id_pgsql=`id -u ${PGSQL_UID} 2> /dev/null`
+    if [ X"$id_pgsql" != X ]; then
+	exit 0
+    elif [ X"$id_70" != X ]; then
+	cat <<EOF
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+This system already has an account whose name is '$id_70' and ID number is 70.
+
+   '`id $id_70`'
+
+For PostgreSQL in this port or package, UID:GID of '${PGSQL_UID}' has to be 70:70.
+Please try again after you delete the account.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+EOF
+	exit 1
+    fi
+
+    # add an account of PostgreSQL to this system
+    echo ""
+    echo "You need a group '${PGSQL_GID}' whose ID number is 70"
+    if yesno "Would you like to create it automatically?" y; then
+	# We need a command 'pw(8)'
+	check_pw
+	pw groupadd ${PGSQL_GID} -g 70 || exit
+    else
+	echo "Please create it, and try again."
+	exit 1
+    fi
+    echo ""
+    echo "You need an account '${PGSQL_UID}' whose ID number is 70"
+    if yesno "Would you like to create it automatically?" y; then
+	# We need a command 'pw(8)'
+	check_pw
+	pw useradd ${PGSQL_UID} -u 70 -g ${PGSQL_GID} -h - -d /usr/local/${INSTALL_DIR} \
+		-s /bin/sh -c "PostgreSQL pseudo-user" || exit
+    else
+	echo "Please create it, and try again."
+	exit 1
+    fi
+    ;;
+esac
diff --git a/japanese/postgresql-tcltk/pkg-plist b/japanese/postgresql-tcltk/pkg-plist
index 7bb058674f8c..7e5f02270176 100644
--- a/japanese/postgresql-tcltk/pkg-plist
+++ b/japanese/postgresql-tcltk/pkg-plist
@@ -1,131 +1,130 @@
 etc/rc.d/pgsql.sh
 %%INSTALL_DIR%%/.profile
+%%INSTALL_DIR%%/bin/postgres
+%%INSTALL_DIR%%/bin/postmaster
+%%INSTALL_DIR%%/bin/ecpg
+%%INSTALL_DIR%%/bin/pg_id
+%%INSTALL_DIR%%/bin/pg_version
+%%INSTALL_DIR%%/bin/psql
+%%INSTALL_DIR%%/bin/pg_dump
+%%INSTALL_DIR%%/bin/pg_dumpall
+%%INSTALL_DIR%%/bin/pg_upgrade
+%%INSTALL_DIR%%/bin/pg_passwd
 %%INSTALL_DIR%%/bin/cleardbdir
 %%INSTALL_DIR%%/bin/createdb
 %%INSTALL_DIR%%/bin/createuser
 %%INSTALL_DIR%%/bin/destroydb
 %%INSTALL_DIR%%/bin/destroyuser
-%%INSTALL_DIR%%/bin/ecpg
 %%INSTALL_DIR%%/bin/initdb
 %%INSTALL_DIR%%/bin/initlocation
 %%INSTALL_DIR%%/bin/ipcclean
-%%INSTALL_DIR%%/bin/pg_dump
-%%INSTALL_DIR%%/bin/pg_dumpall
-%%INSTALL_DIR%%/bin/pg_id
-%%INSTALL_DIR%%/bin/pg_passwd
-%%INSTALL_DIR%%/bin/pg_version
-%%INSTALL_DIR%%/bin/postgres
-%%INSTALL_DIR%%/bin/postmaster
-%%INSTALL_DIR%%/bin/psql
-%%INSTALL_DIR%%/data/PG_VERSION
-%%INSTALL_DIR%%/data/base/template1/PG_VERSION
-%%INSTALL_DIR%%/data/base/template1/pg_aggregate
-%%INSTALL_DIR%%/data/base/template1/pg_am
-%%INSTALL_DIR%%/data/base/template1/pg_amop
-%%INSTALL_DIR%%/data/base/template1/pg_amproc
-%%INSTALL_DIR%%/data/base/template1/pg_attrdef
-%%INSTALL_DIR%%/data/base/template1/pg_attrdef_adrelid_index
+%%INSTALL_DIR%%/lib/global1.bki.source
+%%INSTALL_DIR%%/lib/global1.description
+%%INSTALL_DIR%%/lib/local1_template1.bki.source
+%%INSTALL_DIR%%/lib/local1_template1.description
+%%INSTALL_DIR%%/lib/pg_hba.conf.sample
+%%INSTALL_DIR%%/lib/pg_geqo.sample
+%%INSTALL_DIR%%/lib/libpq.a
+%%INSTALL_DIR%%/lib/libpq.so.2
+%%INSTALL_DIR%%/lib/libpq.so
+%%INSTALL_DIR%%/lib/libecpg.a
+%%INSTALL_DIR%%/lib/libecpg.so.2.6
+%%INSTALL_DIR%%/lib/libecpg.so
+%%INSTALL_DIR%%/lib/libpq++.a
+%%INSTALL_DIR%%/lib/libpq++.so.2
+%%INSTALL_DIR%%/lib/libpq++.so
+%%INSTALL_DIR%%/lib/plpgsql.so
+%%INSTALL_DIR%%/include/fmgr.h
+%%INSTALL_DIR%%/include/lib/dllist.h
+%%INSTALL_DIR%%/include/libpq/pqcomm.h
+%%INSTALL_DIR%%/include/libpq/libpq-fs.h
+%%INSTALL_DIR%%/include/utils/geo_decls.h
+%%INSTALL_DIR%%/include/utils/elog.h
+%%INSTALL_DIR%%/include/utils/palloc.h
+%%INSTALL_DIR%%/include/access/attnum.h
+%%INSTALL_DIR%%/include/executor/spi.h
+%%INSTALL_DIR%%/include/commands/trigger.h
+%%INSTALL_DIR%%/include/os.h
+%%INSTALL_DIR%%/include/config.h
+%%INSTALL_DIR%%/include/c.h
+%%INSTALL_DIR%%/include/postgres.h
+%%INSTALL_DIR%%/include/postgres_ext.h
+%%INSTALL_DIR%%/include/libpq-fe.h
+%%INSTALL_DIR%%/include/libpq-int.h
+%%INSTALL_DIR%%/include/ecpgerrno.h
+%%INSTALL_DIR%%/include/ecpglib.h
+%%INSTALL_DIR%%/include/ecpgtype.h
+%%INSTALL_DIR%%/include/sqlca.h
+%%INSTALL_DIR%%/include/libpq++/pgenv.h
+%%INSTALL_DIR%%/include/libpq++/pgconnection.h
+%%INSTALL_DIR%%/include/libpq++/pgdatabase.h
+%%INSTALL_DIR%%/include/libpq++/pgtransdb.h
+%%INSTALL_DIR%%/include/libpq++/pgcursordb.h
+%%INSTALL_DIR%%/include/libpq++/pglobject.h
+%%INSTALL_DIR%%/include/libpq++.h
+%%INSTALL_DIR%%/data/base/template1/pg_proc
+%%INSTALL_DIR%%/data/base/template1/pg_type
 %%INSTALL_DIR%%/data/base/template1/pg_attribute
-%%INSTALL_DIR%%/data/base/template1/pg_attribute_attrelid_index
-%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnam_index
-%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnum_index
 %%INSTALL_DIR%%/data/base/template1/pg_class
-%%INSTALL_DIR%%/data/base/template1/pg_class_oid_index
-%%INSTALL_DIR%%/data/base/template1/pg_class_relname_index
-%%INSTALL_DIR%%/data/base/template1/pg_description
-%%INSTALL_DIR%%/data/base/template1/pg_description_objoid_index
-%%INSTALL_DIR%%/data/base/template1/pg_index
-%%INSTALL_DIR%%/data/base/template1/pg_inheritproc
 %%INSTALL_DIR%%/data/base/template1/pg_inherits
-%%INSTALL_DIR%%/data/base/template1/pg_internal.init
-%%INSTALL_DIR%%/data/base/template1/pg_ipl
-%%INSTALL_DIR%%/data/base/template1/pg_language
-%%INSTALL_DIR%%/data/base/template1/pg_listener
-%%INSTALL_DIR%%/data/base/template1/pg_opclass
+%%INSTALL_DIR%%/data/base/template1/pg_index
+%%INSTALL_DIR%%/data/base/template1/pg_statistic
 %%INSTALL_DIR%%/data/base/template1/pg_operator
+%%INSTALL_DIR%%/data/base/template1/pg_opclass
+%%INSTALL_DIR%%/data/base/template1/pg_am
+%%INSTALL_DIR%%/data/base/template1/pg_amop
+%%INSTALL_DIR%%/data/base/template1/pg_amproc
+%%INSTALL_DIR%%/data/base/template1/pg_language
 %%INSTALL_DIR%%/data/base/template1/pg_parg
-%%INSTALL_DIR%%/data/base/template1/pg_proc
+%%INSTALL_DIR%%/data/base/template1/pg_aggregate
+%%INSTALL_DIR%%/data/base/template1/pg_ipl
+%%INSTALL_DIR%%/data/base/template1/pg_inheritproc
+%%INSTALL_DIR%%/data/base/template1/pg_rewrite
+%%INSTALL_DIR%%/data/base/template1/pg_listener
+%%INSTALL_DIR%%/data/base/template1/pg_description
+%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnam_index
+%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnum_index
+%%INSTALL_DIR%%/data/base/template1/pg_attribute_attrelid_index
 %%INSTALL_DIR%%/data/base/template1/pg_proc_oid_index
-%%INSTALL_DIR%%/data/base/template1/pg_proc_proname_index
+%%INSTALL_DIR%%/data/base/template1/pg_proc_proname_narg_type_index
 %%INSTALL_DIR%%/data/base/template1/pg_proc_prosrc_index
+%%INSTALL_DIR%%/data/base/template1/pg_type_oid_index
+%%INSTALL_DIR%%/data/base/template1/pg_type_typname_index
+%%INSTALL_DIR%%/data/base/template1/pg_class_oid_index
+%%INSTALL_DIR%%/data/base/template1/pg_class_relname_index
+%%INSTALL_DIR%%/data/base/template1/pg_attrdef
+%%INSTALL_DIR%%/data/base/template1/pg_attrdef_adrelid_index
 %%INSTALL_DIR%%/data/base/template1/pg_relcheck
 %%INSTALL_DIR%%/data/base/template1/pg_relcheck_rcrelid_index
-%%INSTALL_DIR%%/data/base/template1/pg_rewrite
-%%INSTALL_DIR%%/data/base/template1/pg_statistic
 %%INSTALL_DIR%%/data/base/template1/pg_trigger
 %%INSTALL_DIR%%/data/base/template1/pg_trigger_tgrelid_index
-%%INSTALL_DIR%%/data/base/template1/pg_type
-%%INSTALL_DIR%%/data/base/template1/pg_type_oid_index
-%%INSTALL_DIR%%/data/base/template1/pg_type_typname_index
+%%INSTALL_DIR%%/data/base/template1/pg_description_objoid_index
+%%INSTALL_DIR%%/data/base/template1/PG_VERSION
+%%INSTALL_DIR%%/data/base/template1/pg_internal.init
 %%INSTALL_DIR%%/data/base/template1/pg_user
-%%INSTALL_DIR%%/data/base/template1/pg_version
+%%INSTALL_DIR%%/data/base/template1/pg_rules
+%%INSTALL_DIR%%/data/base/template1/pg_views
+%%INSTALL_DIR%%/data/base/template1/pg_tables
+%%INSTALL_DIR%%/data/base/template1/pg_indexes
+%%INSTALL_DIR%%/data/pg_variable
 %%INSTALL_DIR%%/data/pg_database
-%%INSTALL_DIR%%/data/pg_geqo.sample
+%%INSTALL_DIR%%/data/pg_shadow
 %%INSTALL_DIR%%/data/pg_group
-%%INSTALL_DIR%%/data/pg_hba.conf
 %%INSTALL_DIR%%/data/pg_log
+%%INSTALL_DIR%%/data/PG_VERSION
+%%INSTALL_DIR%%/data/pg_hba.conf
+%%INSTALL_DIR%%/data/pg_geqo.sample
 %%INSTALL_DIR%%/data/pg_pwd
-%%INSTALL_DIR%%/data/pg_shadow
-%%INSTALL_DIR%%/data/pg_variable
-%%INSTALL_DIR%%/include/access/attnum.h
-%%INSTALL_DIR%%/include/c.h
-%%INSTALL_DIR%%/include/commands/trigger.h
-%%INSTALL_DIR%%/include/config.h
-%%INSTALL_DIR%%/include/ecpglib.h
-%%INSTALL_DIR%%/include/ecpgtype.h
-%%INSTALL_DIR%%/include/executor/spi.h
-%%INSTALL_DIR%%/include/fmgr.h
-%%INSTALL_DIR%%/include/lib/dllist.h
-%%INSTALL_DIR%%/include/libpq-fe.h
-%%INSTALL_DIR%%/include/libpq/libpq-fs.h
-%%INSTALL_DIR%%/include/libpq/pqcomm.h
-%%INSTALL_DIR%%/include/os.h
-%%INSTALL_DIR%%/include/postgres.h
-%%INSTALL_DIR%%/include/postgres_ext.h
-%%INSTALL_DIR%%/include/sqlca.h
-%%INSTALL_DIR%%/include/utils/elog.h
-%%INSTALL_DIR%%/include/utils/geo_decls.h
-%%INSTALL_DIR%%/include/utils/palloc.h
-%%INSTALL_DIR%%/lib/global1.bki.source
-%%INSTALL_DIR%%/lib/global1.description
-%%INSTALL_DIR%%/lib/libecpg.a
-%%INSTALL_DIR%%/lib/libecpg.so
-%%INSTALL_DIR%%/lib/libecpg.so.1.1
-%%INSTALL_DIR%%/lib/libpq.a
-%%INSTALL_DIR%%/lib/libpq.so
-%%INSTALL_DIR%%/lib/libpq.so.1.1
-%%INSTALL_DIR%%/lib/local1_template1.bki.source
-%%INSTALL_DIR%%/lib/local1_template1.description
-%%INSTALL_DIR%%/lib/pg_geqo.sample
-%%INSTALL_DIR%%/lib/pg_hba.conf.sample
 %%INSTALL_DIR%%/post-install-notes
-share/doc/%%INSTALL_DIR%%/FAQ
-share/doc/%%INSTALL_DIR%%/FAQ_FreeBSD
-share/doc/%%INSTALL_DIR%%/FAQ_Irix
-share/doc/%%INSTALL_DIR%%/FAQ_Linux
-share/doc/%%INSTALL_DIR%%/Makefile
-share/doc/%%INSTALL_DIR%%/README.GEQO
-share/doc/%%INSTALL_DIR%%/README.fsync
-share/doc/%%INSTALL_DIR%%/README.mb
-share/doc/%%INSTALL_DIR%%/README.mb.jp
-share/doc/%%INSTALL_DIR%%/README.support
-share/doc/%%INSTALL_DIR%%/TODO
-share/doc/%%INSTALL_DIR%%/TODO.GEQO
-share/doc/%%INSTALL_DIR%%/admin.ps.gz
-share/doc/%%INSTALL_DIR%%/admin.tar.gz
-share/doc/%%INSTALL_DIR%%/bug.template
-share/doc/%%INSTALL_DIR%%/postgres.tar.gz
-share/doc/%%INSTALL_DIR%%/programmer.ps.gz
-share/doc/%%INSTALL_DIR%%/programmer.tar.gz
-share/doc/%%INSTALL_DIR%%/src/Makefile
-share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.gif
+share/doc/%%INSTALL_DIR%%/src/graphics/connections.ag
 share/doc/%%INSTALL_DIR%%/src/graphics/clientserver.ag
 share/doc/%%INSTALL_DIR%%/src/graphics/clientserver.gif
-share/doc/%%INSTALL_DIR%%/src/graphics/connections.ag
+share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.gif
 share/doc/%%INSTALL_DIR%%/src/graphics/connections.gif
 share/doc/%%INSTALL_DIR%%/src/graphics/layout.ag
 share/doc/%%INSTALL_DIR%%/src/graphics/layout.gif
-share/doc/%%INSTALL_DIR%%/src/sgml/Makefile
+share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.ps
+share/doc/%%INSTALL_DIR%%/src/sgml/xtypes.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/admin.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/advanced.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/arch-dev.sgml
@@ -145,9 +144,9 @@ share/doc/%%INSTALL_DIR%%/src/sgml/func-ref.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/geqo.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/gist.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/inherit.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/intro.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/install.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/intro-pg.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/intro.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/jdbc.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/libpgtcl.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/libpq.sgml
@@ -177,13 +176,130 @@ share/doc/%%INSTALL_DIR%%/src/sgml/xaggr.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/xfunc.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/xindex.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/xoper.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/xtypes.sgml
-share/doc/%%INSTALL_DIR%%/tutorial.ps.gz
-share/doc/%%INSTALL_DIR%%/tutorial.tar.gz
-share/doc/%%INSTALL_DIR%%/user.ps.gz
+share/doc/%%INSTALL_DIR%%/src/sgml/Makefile
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/vacuum.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/allfiles.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/alter_table.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/alter_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/begin.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/close.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/cluster.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/commands.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/commit.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/copy.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_aggregate.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_database.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_function.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_index.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_language.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_operator.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_rule.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_sequence.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_table.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_trigger.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_type.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_view.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/createdb.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/createuser.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_date.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_time.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_timestamp.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/declare.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/delete.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/destroydb.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/destroyuser.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_aggregate.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_database.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_index.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_function.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_language.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_operator.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_rule.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_sequence.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_table.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_trigger.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_type.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_view.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/explain.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/fetch.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/grant.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/initdb.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/initlocation.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/insert.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/listen.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/load.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/lock.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/move.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/notify.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/reset.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/pg_dump.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/pg_dumpall.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/pg_upgrade.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/psql-ref.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/revoke.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/rollback.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/select.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/set.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/show.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/unlisten.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/update.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/abort.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/about.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/bki.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/config.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/current.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/oper.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/func.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/history.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/indices.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/info.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/installation.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/intro-ag.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/keys.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/legal.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/libpq++.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/notation.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/page.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/pg_options.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/reference.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/runtime.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/security.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/signals.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/syntax.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/typeconv.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/xplang.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/y2k.sgml
+share/doc/%%INSTALL_DIR%%/src/Makefile
 share/doc/%%INSTALL_DIR%%/user.tar.gz
-share/doc/%%INSTALL_DIR%%/userguide.ps
+share/doc/%%INSTALL_DIR%%/user.ps.gz
+share/doc/%%INSTALL_DIR%%/tutorial.tar.gz
+share/doc/%%INSTALL_DIR%%/tutorial.ps.gz
+share/doc/%%INSTALL_DIR%%/programmer.tar.gz
+share/doc/%%INSTALL_DIR%%/programmer.ps.gz
+share/doc/%%INSTALL_DIR%%/postgres.tar.gz
+share/doc/%%INSTALL_DIR%%/bug.template
+share/doc/%%INSTALL_DIR%%/admin.tar.gz
+share/doc/%%INSTALL_DIR%%/admin.ps.gz
+share/doc/%%INSTALL_DIR%%/TODO
+share/doc/%%INSTALL_DIR%%/README.mb.jp
+share/doc/%%INSTALL_DIR%%/README.mb
+share/doc/%%INSTALL_DIR%%/README.fsync
+share/doc/%%INSTALL_DIR%%/Makefile
+share/doc/%%INSTALL_DIR%%/FAQ_Linux
+share/doc/%%INSTALL_DIR%%/FAQ_Irix
+share/doc/%%INSTALL_DIR%%/FAQ_FreeBSD
+share/doc/%%INSTALL_DIR%%/FAQ
+share/doc/%%INSTALL_DIR%%/README.locale
+share/doc/%%INSTALL_DIR%%/README.inet
+share/doc/%%INSTALL_DIR%%/FAQ_DEV
+share/doc/%%INSTALL_DIR%%/FAQ_CVS
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @dirrm share/doc/%%INSTALL_DIR%%/src/graphics
+@dirrm share/doc/%%INSTALL_DIR%%/src/sgml/ref
 @dirrm share/doc/%%INSTALL_DIR%%/src/sgml
 @dirrm share/doc/%%INSTALL_DIR%%/src
 @dirrm share/doc/%%INSTALL_DIR%%
@@ -191,20 +307,21 @@ share/doc/%%INSTALL_DIR%%/userguide.ps
 @dirrm %%INSTALL_DIR%%/data/base/template1
 @dirrm %%INSTALL_DIR%%/data/base
 @dirrm %%INSTALL_DIR%%/data
-@dirrm %%INSTALL_DIR%%/include/access
-@dirrm %%INSTALL_DIR%%/include/commands
-@dirrm %%INSTALL_DIR%%/include/executor
-@dirrm %%INSTALL_DIR%%/include/include
-@dirrm %%INSTALL_DIR%%/include/lib
+@dirrm %%INSTALL_DIR%%/include/utils
+@dirrm %%INSTALL_DIR%%/include/libpq++
 @dirrm %%INSTALL_DIR%%/include/libpq
-@dirrm %%INSTALL_DIR%%/include/port/bsd
+@dirrm %%INSTALL_DIR%%/include/lib
+@exec mkdir -p %D/%%INSTALL_DIR%%/include/port/freebsd
+@dirrm %%INSTALL_DIR%%/include/port/freebsd
 @dirrm %%INSTALL_DIR%%/include/port
-@dirrm %%INSTALL_DIR%%/include/utils
+@dirrm %%INSTALL_DIR%%/include/executor
+@dirrm %%INSTALL_DIR%%/include/commands
+@dirrm %%INSTALL_DIR%%/include/access
 @dirrm %%INSTALL_DIR%%/include
 @dirrm %%INSTALL_DIR%%/lib
-@dirrm %%INSTALL_DIR%%/man/man1
-@dirrm %%INSTALL_DIR%%/man/man3
-@dirrm %%INSTALL_DIR%%/man/man5
 @dirrm %%INSTALL_DIR%%/man/manl
+@dirrm %%INSTALL_DIR%%/man/man5
+@dirrm %%INSTALL_DIR%%/man/man3
+@dirrm %%INSTALL_DIR%%/man/man1
 @dirrm %%INSTALL_DIR%%/man
 @dirrm %%INSTALL_DIR%%
diff --git a/japanese/postgresql-tcltk/pkg-plist.tcl b/japanese/postgresql-tcltk/pkg-plist.tcl
index 4f5184ce3ec3..602ebba8399e 100644
--- a/japanese/postgresql-tcltk/pkg-plist.tcl
+++ b/japanese/postgresql-tcltk/pkg-plist.tcl
@@ -1,137 +1,170 @@
 etc/rc.d/pgsql.sh
 %%INSTALL_DIR%%/.profile
+%%INSTALL_DIR%%/bin
+%%INSTALL_DIR%%/bin/postgres
+%%INSTALL_DIR%%/bin/postmaster
+%%INSTALL_DIR%%/bin/ecpg
+%%INSTALL_DIR%%/bin/pg_id
+%%INSTALL_DIR%%/bin/pg_version
+%%INSTALL_DIR%%/bin/psql
+%%INSTALL_DIR%%/bin/pg_dump
+%%INSTALL_DIR%%/bin/pg_dumpall
+%%INSTALL_DIR%%/bin/pg_upgrade
+%%INSTALL_DIR%%/bin/pg_passwd
 %%INSTALL_DIR%%/bin/cleardbdir
 %%INSTALL_DIR%%/bin/createdb
 %%INSTALL_DIR%%/bin/createuser
 %%INSTALL_DIR%%/bin/destroydb
 %%INSTALL_DIR%%/bin/destroyuser
-%%INSTALL_DIR%%/bin/ecpg
 %%INSTALL_DIR%%/bin/initdb
 %%INSTALL_DIR%%/bin/initlocation
 %%INSTALL_DIR%%/bin/ipcclean
-%%INSTALL_DIR%%/bin/pg_dump
-%%INSTALL_DIR%%/bin/pg_dumpall
-%%INSTALL_DIR%%/bin/pg_id
-%%INSTALL_DIR%%/bin/pg_passwd
-%%INSTALL_DIR%%/bin/pg_version
+%%INSTALL_DIR%%/bin/pg_encoding
 %%INSTALL_DIR%%/bin/pgtclsh
 %%INSTALL_DIR%%/bin/pgtksh
-%%INSTALL_DIR%%/bin/postgres
-%%INSTALL_DIR%%/bin/postmaster
-%%INSTALL_DIR%%/bin/psql
-%%INSTALL_DIR%%/data/PG_VERSION
-%%INSTALL_DIR%%/data/base/template1/PG_VERSION
-%%INSTALL_DIR%%/data/base/template1/pg_aggregate
-%%INSTALL_DIR%%/data/base/template1/pg_am
-%%INSTALL_DIR%%/data/base/template1/pg_amop
-%%INSTALL_DIR%%/data/base/template1/pg_amproc
-%%INSTALL_DIR%%/data/base/template1/pg_attrdef
-%%INSTALL_DIR%%/data/base/template1/pg_attrdef_adrelid_index
+%%INSTALL_DIR%%/lib
+%%INSTALL_DIR%%/lib/global1.bki.source
+%%INSTALL_DIR%%/lib/global1.description
+%%INSTALL_DIR%%/lib/local1_template1.bki.source
+%%INSTALL_DIR%%/lib/local1_template1.description
+%%INSTALL_DIR%%/lib/pg_hba.conf.sample
+%%INSTALL_DIR%%/lib/pg_geqo.sample
+%%INSTALL_DIR%%/lib/libpq.a
+%%INSTALL_DIR%%/lib/libpq.so.2.0
+%%INSTALL_DIR%%/lib/libpq.so.2
+%%INSTALL_DIR%%/lib/libpq.so
+%%INSTALL_DIR%%/lib/libecpg.a
+%%INSTALL_DIR%%/lib/libecpg.so.2.6.2
+%%INSTALL_DIR%%/lib/libecpg.so.2
+%%INSTALL_DIR%%/lib/libecpg.so
+%%INSTALL_DIR%%/lib/libpq++.a
+%%INSTALL_DIR%%/lib/libpq++.so.2.0
+%%INSTALL_DIR%%/lib/libpq++.so.2
+%%INSTALL_DIR%%/lib/libpq++.so
+%%INSTALL_DIR%%/lib/libpgtcl.a
+%%INSTALL_DIR%%/lib/libpgtcl.so.2.0
+%%INSTALL_DIR%%/lib/libpgtcl.so.2
+%%INSTALL_DIR%%/lib/libpgtcl.so
+%%INSTALL_DIR%%/lib/libpsqlodbc.a
+%%INSTALL_DIR%%/lib/libpsqlodbc.so.0.25
+%%INSTALL_DIR%%/lib/libpsqlodbc.so.0
+%%INSTALL_DIR%%/lib/libpsqlodbc.so
+%%INSTALL_DIR%%/lib/plpgsql.so
+%%INSTALL_DIR%%/lib/pltcl.so
+%%INSTALL_DIR%%/include
+%%INSTALL_DIR%%/include/fmgr.h
+%%INSTALL_DIR%%/include/port
+%%INSTALL_DIR%%/include/port/freebsd
+%%INSTALL_DIR%%/include/lib
+%%INSTALL_DIR%%/include/lib/dllist.h
+%%INSTALL_DIR%%/include/libpq
+%%INSTALL_DIR%%/include/libpq/pqcomm.h
+%%INSTALL_DIR%%/include/libpq/libpq-fs.h
+%%INSTALL_DIR%%/include/utils
+%%INSTALL_DIR%%/include/utils/geo_decls.h
+%%INSTALL_DIR%%/include/utils/elog.h
+%%INSTALL_DIR%%/include/utils/palloc.h
+%%INSTALL_DIR%%/include/access
+%%INSTALL_DIR%%/include/access/attnum.h
+%%INSTALL_DIR%%/include/executor
+%%INSTALL_DIR%%/include/executor/spi.h
+%%INSTALL_DIR%%/include/commands
+%%INSTALL_DIR%%/include/commands/trigger.h
+%%INSTALL_DIR%%/include/os.h
+%%INSTALL_DIR%%/include/config.h
+%%INSTALL_DIR%%/include/c.h
+%%INSTALL_DIR%%/include/postgres.h
+%%INSTALL_DIR%%/include/postgres_ext.h
+%%INSTALL_DIR%%/include/libpq-fe.h
+%%INSTALL_DIR%%/include/libpq-int.h
+%%INSTALL_DIR%%/include/ecpgerrno.h
+%%INSTALL_DIR%%/include/ecpglib.h
+%%INSTALL_DIR%%/include/ecpgtype.h
+%%INSTALL_DIR%%/include/sqlca.h
+%%INSTALL_DIR%%/include/libpq++
+%%INSTALL_DIR%%/include/libpq++/pgenv.h
+%%INSTALL_DIR%%/include/libpq++/pgconnection.h
+%%INSTALL_DIR%%/include/libpq++/pgdatabase.h
+%%INSTALL_DIR%%/include/libpq++/pgtransdb.h
+%%INSTALL_DIR%%/include/libpq++/pgcursordb.h
+%%INSTALL_DIR%%/include/libpq++/pglobject.h
+%%INSTALL_DIR%%/include/libpq++.h
+%%INSTALL_DIR%%/include/libpgtcl.h
+%%INSTALL_DIR%%/include/iodbc
+%%INSTALL_DIR%%/include/iodbc/iodbc.h
+%%INSTALL_DIR%%/include/iodbc/isql.h
+%%INSTALL_DIR%%/include/iodbc/isqlext.h
+%%INSTALL_DIR%%/odbcinst.ini
+%%INSTALL_DIR%%/data
+%%INSTALL_DIR%%/data/base
+%%INSTALL_DIR%%/data/base/template1
+%%INSTALL_DIR%%/data/base/template1/pg_proc
+%%INSTALL_DIR%%/data/base/template1/pg_type
 %%INSTALL_DIR%%/data/base/template1/pg_attribute
-%%INSTALL_DIR%%/data/base/template1/pg_attribute_attrelid_index
-%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnam_index
-%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnum_index
 %%INSTALL_DIR%%/data/base/template1/pg_class
-%%INSTALL_DIR%%/data/base/template1/pg_class_oid_index
-%%INSTALL_DIR%%/data/base/template1/pg_class_relname_index
-%%INSTALL_DIR%%/data/base/template1/pg_description
-%%INSTALL_DIR%%/data/base/template1/pg_description_objoid_index
-%%INSTALL_DIR%%/data/base/template1/pg_index
-%%INSTALL_DIR%%/data/base/template1/pg_inheritproc
 %%INSTALL_DIR%%/data/base/template1/pg_inherits
-%%INSTALL_DIR%%/data/base/template1/pg_internal.init
-%%INSTALL_DIR%%/data/base/template1/pg_ipl
-%%INSTALL_DIR%%/data/base/template1/pg_language
-%%INSTALL_DIR%%/data/base/template1/pg_listener
-%%INSTALL_DIR%%/data/base/template1/pg_opclass
+%%INSTALL_DIR%%/data/base/template1/pg_index
+%%INSTALL_DIR%%/data/base/template1/pg_statistic
 %%INSTALL_DIR%%/data/base/template1/pg_operator
+%%INSTALL_DIR%%/data/base/template1/pg_opclass
+%%INSTALL_DIR%%/data/base/template1/pg_am
+%%INSTALL_DIR%%/data/base/template1/pg_amop
+%%INSTALL_DIR%%/data/base/template1/pg_amproc
+%%INSTALL_DIR%%/data/base/template1/pg_language
 %%INSTALL_DIR%%/data/base/template1/pg_parg
-%%INSTALL_DIR%%/data/base/template1/pg_proc
+%%INSTALL_DIR%%/data/base/template1/pg_aggregate
+%%INSTALL_DIR%%/data/base/template1/pg_ipl
+%%INSTALL_DIR%%/data/base/template1/pg_inheritproc
+%%INSTALL_DIR%%/data/base/template1/pg_rewrite
+%%INSTALL_DIR%%/data/base/template1/pg_listener
+%%INSTALL_DIR%%/data/base/template1/pg_description
+%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnam_index
+%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnum_index
+%%INSTALL_DIR%%/data/base/template1/pg_attribute_attrelid_index
 %%INSTALL_DIR%%/data/base/template1/pg_proc_oid_index
-%%INSTALL_DIR%%/data/base/template1/pg_proc_proname_index
+%%INSTALL_DIR%%/data/base/template1/pg_proc_proname_narg_type_index
 %%INSTALL_DIR%%/data/base/template1/pg_proc_prosrc_index
+%%INSTALL_DIR%%/data/base/template1/pg_type_oid_index
+%%INSTALL_DIR%%/data/base/template1/pg_type_typname_index
+%%INSTALL_DIR%%/data/base/template1/pg_class_oid_index
+%%INSTALL_DIR%%/data/base/template1/pg_class_relname_index
+%%INSTALL_DIR%%/data/base/template1/pg_attrdef
+%%INSTALL_DIR%%/data/base/template1/pg_attrdef_adrelid_index
 %%INSTALL_DIR%%/data/base/template1/pg_relcheck
 %%INSTALL_DIR%%/data/base/template1/pg_relcheck_rcrelid_index
-%%INSTALL_DIR%%/data/base/template1/pg_rewrite
-%%INSTALL_DIR%%/data/base/template1/pg_statistic
 %%INSTALL_DIR%%/data/base/template1/pg_trigger
 %%INSTALL_DIR%%/data/base/template1/pg_trigger_tgrelid_index
-%%INSTALL_DIR%%/data/base/template1/pg_type
-%%INSTALL_DIR%%/data/base/template1/pg_type_oid_index
-%%INSTALL_DIR%%/data/base/template1/pg_type_typname_index
+%%INSTALL_DIR%%/data/base/template1/pg_description_objoid_index
+%%INSTALL_DIR%%/data/base/template1/PG_VERSION
+%%INSTALL_DIR%%/data/base/template1/pg_internal.init
 %%INSTALL_DIR%%/data/base/template1/pg_user
-%%INSTALL_DIR%%/data/base/template1/pg_version
+%%INSTALL_DIR%%/data/base/template1/pg_rules
+%%INSTALL_DIR%%/data/base/template1/pg_views
+%%INSTALL_DIR%%/data/base/template1/pg_tables
+%%INSTALL_DIR%%/data/base/template1/pg_indexes
+%%INSTALL_DIR%%/data/pg_variable
 %%INSTALL_DIR%%/data/pg_database
-%%INSTALL_DIR%%/data/pg_geqo.sample
+%%INSTALL_DIR%%/data/pg_shadow
 %%INSTALL_DIR%%/data/pg_group
-%%INSTALL_DIR%%/data/pg_hba.conf
 %%INSTALL_DIR%%/data/pg_log
+%%INSTALL_DIR%%/data/PG_VERSION
+%%INSTALL_DIR%%/data/pg_hba.conf
+%%INSTALL_DIR%%/data/pg_geqo.sample
 %%INSTALL_DIR%%/data/pg_pwd
-%%INSTALL_DIR%%/data/pg_shadow
-%%INSTALL_DIR%%/data/pg_variable
-%%INSTALL_DIR%%/include/access/attnum.h
-%%INSTALL_DIR%%/include/c.h
-%%INSTALL_DIR%%/include/commands/trigger.h
-%%INSTALL_DIR%%/include/config.h
-%%INSTALL_DIR%%/include/ecpglib.h
-%%INSTALL_DIR%%/include/ecpgtype.h
-%%INSTALL_DIR%%/include/executor/spi.h
-%%INSTALL_DIR%%/include/fmgr.h
-%%INSTALL_DIR%%/include/lib/dllist.h
-%%INSTALL_DIR%%/include/libpgtcl.h
-%%INSTALL_DIR%%/include/libpq-fe.h
-%%INSTALL_DIR%%/include/libpq/libpq-fs.h
-%%INSTALL_DIR%%/include/libpq/pqcomm.h
-%%INSTALL_DIR%%/include/os.h
-%%INSTALL_DIR%%/include/postgres.h
-%%INSTALL_DIR%%/include/postgres_ext.h
-%%INSTALL_DIR%%/include/sqlca.h
-%%INSTALL_DIR%%/include/utils/elog.h
-%%INSTALL_DIR%%/include/utils/geo_decls.h
-%%INSTALL_DIR%%/include/utils/palloc.h
-%%INSTALL_DIR%%/lib/global1.bki.source
-%%INSTALL_DIR%%/lib/global1.description
-%%INSTALL_DIR%%/lib/libecpg.a
-%%INSTALL_DIR%%/lib/libecpg.so
-%%INSTALL_DIR%%/lib/libecpg.so.1.1
-%%INSTALL_DIR%%/lib/libpgtcl.a
-%%INSTALL_DIR%%/lib/libpgtcl.so
-%%INSTALL_DIR%%/lib/libpgtcl.so.1.0
-%%INSTALL_DIR%%/lib/libpq.a
-%%INSTALL_DIR%%/lib/libpq.so
-%%INSTALL_DIR%%/lib/libpq.so.1.1
-%%INSTALL_DIR%%/lib/local1_template1.bki.source
-%%INSTALL_DIR%%/lib/local1_template1.description
-%%INSTALL_DIR%%/lib/pg_geqo.sample
-%%INSTALL_DIR%%/lib/pg_hba.conf.sample
 %%INSTALL_DIR%%/post-install-notes
-share/doc/%%INSTALL_DIR%%/FAQ
-share/doc/%%INSTALL_DIR%%/FAQ_FreeBSD
-share/doc/%%INSTALL_DIR%%/FAQ_Irix
-share/doc/%%INSTALL_DIR%%/FAQ_Linux
-share/doc/%%INSTALL_DIR%%/Makefile
-share/doc/%%INSTALL_DIR%%/README.GEQO
-share/doc/%%INSTALL_DIR%%/README.fsync
-share/doc/%%INSTALL_DIR%%/README.mb
-share/doc/%%INSTALL_DIR%%/README.mb.jp
-share/doc/%%INSTALL_DIR%%/README.support
-share/doc/%%INSTALL_DIR%%/TODO
-share/doc/%%INSTALL_DIR%%/TODO.GEQO
-share/doc/%%INSTALL_DIR%%/admin.ps.gz
-share/doc/%%INSTALL_DIR%%/admin.tar.gz
-share/doc/%%INSTALL_DIR%%/bug.template
-share/doc/%%INSTALL_DIR%%/postgres.tar.gz
-share/doc/%%INSTALL_DIR%%/programmer.ps.gz
-share/doc/%%INSTALL_DIR%%/programmer.tar.gz
-share/doc/%%INSTALL_DIR%%/src/Makefile
-share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.gif
+share/doc/%%INSTALL_DIR%%/
+share/doc/%%INSTALL_DIR%%/src
+share/doc/%%INSTALL_DIR%%/src/graphics
+share/doc/%%INSTALL_DIR%%/src/graphics/connections.ag
 share/doc/%%INSTALL_DIR%%/src/graphics/clientserver.ag
 share/doc/%%INSTALL_DIR%%/src/graphics/clientserver.gif
-share/doc/%%INSTALL_DIR%%/src/graphics/connections.ag
+share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.gif
 share/doc/%%INSTALL_DIR%%/src/graphics/connections.gif
 share/doc/%%INSTALL_DIR%%/src/graphics/layout.ag
 share/doc/%%INSTALL_DIR%%/src/graphics/layout.gif
-share/doc/%%INSTALL_DIR%%/src/sgml/Makefile
+share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.ps
+share/doc/%%INSTALL_DIR%%/src/sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/xtypes.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/admin.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/advanced.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/arch-dev.sgml
@@ -151,9 +184,9 @@ share/doc/%%INSTALL_DIR%%/src/sgml/func-ref.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/geqo.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/gist.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/inherit.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/intro.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/install.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/intro-pg.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/intro.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/jdbc.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/libpgtcl.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/libpq.sgml
@@ -183,13 +216,135 @@ share/doc/%%INSTALL_DIR%%/src/sgml/xaggr.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/xfunc.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/xindex.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/xoper.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/xtypes.sgml
-share/doc/%%INSTALL_DIR%%/tutorial.ps.gz
-share/doc/%%INSTALL_DIR%%/tutorial.tar.gz
-share/doc/%%INSTALL_DIR%%/user.ps.gz
+share/doc/%%INSTALL_DIR%%/src/sgml/Makefile
+share/doc/%%INSTALL_DIR%%/src/sgml/ref
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/vacuum.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/allfiles.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/alter_table.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/alter_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/begin.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/close.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/cluster.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/commands.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/commit.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/copy.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_aggregate.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_database.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_function.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_index.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_language.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_operator.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_rule.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_sequence.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_table.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_trigger.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_type.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_view.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/createdb.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/createuser.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_date.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_time.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_timestamp.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/declare.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/delete.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/destroydb.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/destroyuser.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_aggregate.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_database.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_index.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_function.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_language.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_operator.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_rule.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_sequence.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_table.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_trigger.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_type.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_view.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/explain.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/fetch.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/grant.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/initdb.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/initlocation.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/insert.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/listen.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/load.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/lock.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/move.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/notify.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/reset.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/pg_dump.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/pg_dumpall.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/pg_upgrade.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/psql-ref.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/revoke.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/rollback.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/select.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/set.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/show.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/unlisten.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/update.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/abort.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/about.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/bki.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/config.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/current.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/oper.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/func.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/history.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/indices.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/info.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/installation.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/intro-ag.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/keys.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/legal.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/libpq++.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/notation.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/page.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/pg_options.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/reference.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/runtime.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/security.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/signals.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/syntax.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/typeconv.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/xplang.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/y2k.sgml
+share/doc/%%INSTALL_DIR%%/src/Makefile
 share/doc/%%INSTALL_DIR%%/user.tar.gz
+share/doc/%%INSTALL_DIR%%/user.ps.gz
+share/doc/%%INSTALL_DIR%%/tutorial.tar.gz
+share/doc/%%INSTALL_DIR%%/tutorial.ps.gz
+share/doc/%%INSTALL_DIR%%/programmer.tar.gz
+share/doc/%%INSTALL_DIR%%/programmer.ps.gz
+share/doc/%%INSTALL_DIR%%/postgres.tar.gz
+share/doc/%%INSTALL_DIR%%/bug.template
+share/doc/%%INSTALL_DIR%%/admin.tar.gz
+share/doc/%%INSTALL_DIR%%/admin.ps.gz
+share/doc/%%INSTALL_DIR%%/TODO.GEQO
+share/doc/%%INSTALL_DIR%%/TODO
+share/doc/%%INSTALL_DIR%%/README.support
+share/doc/%%INSTALL_DIR%%/README.mb.jp
+share/doc/%%INSTALL_DIR%%/README.mb
+share/doc/%%INSTALL_DIR%%/README.fsync
+share/doc/%%INSTALL_DIR%%/README.GEQO
+share/doc/%%INSTALL_DIR%%/Makefile
+share/doc/%%INSTALL_DIR%%/FAQ_Linux
+share/doc/%%INSTALL_DIR%%/FAQ_Irix
+share/doc/%%INSTALL_DIR%%/FAQ_FreeBSD
+share/doc/%%INSTALL_DIR%%/FAQ
 share/doc/%%INSTALL_DIR%%/userguide.ps
+share/doc/%%INSTALL_DIR%%/README.locale
+share/doc/%%INSTALL_DIR%%/README.inet
+share/doc/%%INSTALL_DIR%%/FAQ_DEV
+share/doc/%%INSTALL_DIR%%/FAQ_CVS
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @dirrm share/doc/%%INSTALL_DIR%%/src/graphics
+@dirrm share/doc/%%INSTALL_DIR%%/src/sgml/ref
 @dirrm share/doc/%%INSTALL_DIR%%/src/sgml
 @dirrm share/doc/%%INSTALL_DIR%%/src
 @dirrm share/doc/%%INSTALL_DIR%%
@@ -197,20 +352,21 @@ share/doc/%%INSTALL_DIR%%/userguide.ps
 @dirrm %%INSTALL_DIR%%/data/base/template1
 @dirrm %%INSTALL_DIR%%/data/base
 @dirrm %%INSTALL_DIR%%/data
-@dirrm %%INSTALL_DIR%%/include/access
-@dirrm %%INSTALL_DIR%%/include/commands
-@dirrm %%INSTALL_DIR%%/include/executor
-@dirrm %%INSTALL_DIR%%/include/include
-@dirrm %%INSTALL_DIR%%/include/lib
-@dirrm %%INSTALL_DIR%%/include/libpq
-@dirrm %%INSTALL_DIR%%/include/port/bsd
-@dirrm %%INSTALL_DIR%%/include/port
 @dirrm %%INSTALL_DIR%%/include/utils
+@dirrm %%INSTALL_DIR%%/include/port/freebsd
+@dirrm %%INSTALL_DIR%%/include/port
+@dirrm %%INSTALL_DIR%%/include/libpq++
+@dirrm %%INSTALL_DIR%%/include/libpq
+@dirrm %%INSTALL_DIR%%/include/lib
+@dirrm %%INSTALL_DIR%%/include/executor
+@dirrm %%INSTALL_DIR%%/include/commands
+@dirrm %%INSTALL_DIR%%/include/access
 @dirrm %%INSTALL_DIR%%/include
 @dirrm %%INSTALL_DIR%%/lib
-@dirrm %%INSTALL_DIR%%/man/man1
-@dirrm %%INSTALL_DIR%%/man/man3
-@dirrm %%INSTALL_DIR%%/man/man5
 @dirrm %%INSTALL_DIR%%/man/manl
+@dirrm %%INSTALL_DIR%%/man/man5
+@dirrm %%INSTALL_DIR%%/man/man3
+@dirrm %%INSTALL_DIR%%/man/man1
 @dirrm %%INSTALL_DIR%%/man
 @dirrm %%INSTALL_DIR%%
+@dirrm pgsql
diff --git a/japanese/postgresql/Makefile b/japanese/postgresql/Makefile
index 31db55929a7c..6bdc835753ee 100644
--- a/japanese/postgresql/Makefile
+++ b/japanese/postgresql/Makefile
@@ -1,34 +1,47 @@
 # New ports collection makefile for:	PostgreSQL-j
-# Version required:	6.3.2+Multibyte-patch
-# Date created:		20 Aug 1998
+# Version required:	6.4+Multibyte-patch
+# Date created:		25 Nov 1998
 # Whom:			Ichiro Fukuhara <ichiro@ichiro.org>
 #
-# $Id: Makefile,v 1.2 1998/09/28 10:30:52 asami Exp $
+# $Id$
 #
 
-DISTNAME=	postgresql-6.3.2
-PKGNAME=	ja-postgresql-6.3.2
+DISTNAME=	postgresql-v6.4
+PKGNAME=	ja-postgresql-6.4
 CATEGORIES=	japanese databases
 MASTER_SITES=	ftp://ftp.postgresql.org/pub/ \
 		ftp://ftp.jaist.ac.jp/pub/dbms/PostgreSQL/ \
-		ftp://ftp.sra.co.jp/pub/cmd/postgres/6.3.2/
+		ftp://ftp.sra.co.jp/pub/cmd/postgres/6.4/
 
-PATCH_SITES=	ftp://ftp.sra.co.jp/pub/cmd/postgres/6.3.2/patches/FreeBSD/
-PATCHFILES=	jumbo_981104.patch.gz
+PATCH_SITES=	ftp://ftp.sra.co.jp/pub/cmd/postgres/6.4/patches/
+PATCHFILES=	jumbo-981124.patch.gz
 
 MAINTAINER=	ichiro@ichiro.org
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} --forward --quiet -E -p1
+PLISTS=		PLIST
 
 # if you want to use the tcl/tk frontend pgaccess, then you need to build
 # postgresql with tcl support by typing: make USE_TCL=yes
 .if defined(USE_TCL)
-MAKE_ENV=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl7.6
-LIB_DEPENDS=	tcl76jp.1:${PORTSDIR}/japanese/tcl76 \
-		tk42jp.1:${PORTSDIR}/japanese/tk42
-WITH_TCL=	--with-tcl
-PLIST=		${PKGDIR}/PLIST.tcl
+TCL_INCDIR=	${PREFIX}/include/tcl8.0jp
+TK_INCDIR=	${PREFIX}/include/tk8.0jp
+MAKE_ENV=	USE_TCL=true TCL_INCDIR=${TCL_INCDIR}
+WITH_TCL=	--with-tcl --with-tclconfig="${PREFIX}/lib/tcl8.0jp ${PREFIX}/lib/tk8.0jp"
+LIB_DEPENDS=	tcl80jp.1:${PORTSDIR}/japanese/tcl80 \
+		tk80jp.1:${PORTSDIR}/japanese/tk80
+PLISTS+=	PLIST.tcl
+.endif
+.if defined(MULTIBYTE)
+WITH_MB=	--with-mb=${MULTIBYTE}
+.endif
+.if defined(USE_PERL)
+WITH_PERL=      --with-perl
+.endif
+.if defined(USE_ODBC)
+WITH_ODBC=      --with-odbc
+PLISTS+=	PLIST.odbc
 .endif
 
 NO_PACKAGE=	"Requires ${PGSQL_UID} uid"
@@ -38,15 +51,18 @@ MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
 CONFIGURE_ARGS= --prefix=${PREFIX}/${INSTALL_DIR} \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
-		--with-includes=${PREFIX}/include ${WITH_TCL} \
-		--with-libraries=${PREFIX}/lib --with-mb=EUC_JP
+		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" ${WITH_TCL}\
+		--with-libraries=${PREFIX}/lib \
+		${WITH_MB} ${WITH_PERL} ${WITH_ODBC}
+
+INSTALL_TARGET= install install-man
 
 MAN1=		cleardbdir.1 createdb.1 createuser.1 destroydb.1 \
-		destroyuser.1 ecpg.1 initdb.1 ipcclean.1 initlocation.1 \
-		pg_dump.1 pg_dumpall.1 pg_passwd.1 pgintro.1 postgres.1 \
-		postmaster.1 psql.1
-MAN3=		catalogs.3 large_objects.3 libpq.3 oracle_compat.3 pgbuiltin.3
-MAN5=		bki.5 page.5 pg_hba.conf.5
+		destroyuser.1 ecpg.1 initdb.1 initlocation.1 \
+		ipcclean.1 pg_dump.1 pg_dumpall.1 pg_passwd.1 \
+		pg_upgrade.1 postgres.1 postmaster.1 psql.1
+MAN3=		catalogs.3 libpq.3
+MAN5=		pg_hba.conf.5
 MANL=		abort.l alter_table.l alter_user.l begin.l close.l cluster.l \
 		commit.l copy.l create_aggregate.l create_database.l \
 		create_function.l create_index.l create_language.l \
@@ -57,12 +73,13 @@ MANL=		abort.l alter_table.l alter_user.l begin.l close.l cluster.l \
 		drop_language.l drop_operator.l drop_rule.l drop_sequence.l \
 		drop_table.l drop_trigger.l drop_type.l drop_user.l \
 		drop_view.l end.l explain.l fetch.l grant.l insert.l listen.l \
-		load.l lock.l move.l notify.l reset.l revoke.l \
-		rollback.l select.l set.l show.l sql.l update.l vacuum.l
+		load.l lock.l move.l notify.l reset.l revoke.l rollback.l \
+		select.l set.l show.l sql.l update.l vacuum.l
 
 MANPREFIX=	${PREFIX}/${INSTALL_DIR}
 
 PLIST_SUB=	INSTALL_DIR=${INSTALL_DIR}
+PLIST=		${WRKDIR}/PLIST
 
 # These values are easily overridable like as
 #   "make PGQL_UID=postgresql PGSQL_GID=postgresql install"
@@ -71,13 +88,20 @@ PGSQL_UID=	pgsql
 PGSQL_GID=	pgsql
 
 pre-fetch:
-.if !defined(USE_TCL)
+.if !defined(USE_TCL) & !defined(USE_PERL) & !defined(USE_ODBC) & !defined(MULTIBYTE)
+
+	@${ECHO_MSG} "To build the \"MULTIBYTE PostgreSQL\", type:"
+	@${ECHO_MSG} "    make MULTIBYTE={EUC_JP,EUC_CN,EUC_KR,EUC_TW,UNICODE,MULE_INTERNAL,LATIN1-5}"
+	@${ECHO_MSG} "          USE_TCL=yes, USE_PERL=yes, USE_ODBC=yes"
+	@${ECHO_MSG} ""
 	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:"
-	@${ECHO_MSG} "    make USE_TCL=yes"
+	@${ECHO_MSG} "		make USE_TCL=yes"
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."
 .endif
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	find ${WRKDIR} -name '*.orig' -exec ${RM} {} \;
 
@@ -86,17 +110,19 @@ post-build:
 	@ ${ECHO} "Dump existing databases, before installing new db version !!"
 	@ ${ECHO} "Detailed instructions, see INSTALL file under ${WRKDIR}...  "
 	@ ${ECHO} "------------------------------------------------------------"
+	@${RM} -f ${WRKDIR}/PLIST
+.for i in ${PLISTS}
+	${CAT} ${PKGDIR}/${i} >> ${WRKDIR}/PLIST
+.endfor
 
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	${RM} -rf ${PREFIX}/${INSTALL_DIR}
 .endif
 	@ ${MKDIR} ${PREFIX}/${INSTALL_DIR}
-	@ ${SED} "s=PGSQL_UID=${PGSQL_UID}=g ; s=PGSQL_GID=${PGSQL_GID}=g ; \
-		s=INSTALL_DIR=${INSTALL_DIR}=g" < ${SCRIPTDIR}/createuser.tmpl \
-		> ${WRKDIR}/createuser
-	@ ${SETENV} ${MAKE_ENV} perl ${WRKDIR}/createuser
-
+	@ ${SETENV} INSTALL_DIR=${INSTALL_DIR} \
+	     	    PGSQL_UID=${PGSQL_UID} PGSQL_GID=${PGSQL_GID} \
+		 ${SH} ${PKGDIR}/INSTALL PRE-INSTALL
 post-install:
 	@ if [ ! -f ${PREFIX}/${INSTALL_DIR}/.profile ]; then \
 		${ECHO} "PATH=${PATH}:${PREFIX}/${INSTALL_DIR}/bin" \
@@ -123,7 +149,7 @@ post-install:
 	@ chown -R ${PGSQL_UID}:${PGSQL_GID} ${PREFIX}/${INSTALL_DIR}
 	@ ${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'
 	@ ${LDCONFIG} -m ${PREFIX}/${INSTALL_DIR}/lib
-	@ su -l ${PGSQL_UID} -c '${PREFIX}/${INSTALL_DIR}/bin/initdb --pglib=${PREFIX}/${INSTALL_DIR}/lib --pgdata=${PREFIX}/${INSTALL_DIR}/data'
+	@ /usr/bin/su -l ${PGSQL_UID} -c '${PREFIX}/${INSTALL_DIR}/bin/initdb --pglib=${PREFIX}/${INSTALL_DIR}/lib --pgdata=${PREFIX}/${INSTALL_DIR}/data'
 	@ ${SED} "s=!!PG_PATH!!=${PREFIX}/${INSTALL_DIR}=g ; s=!!PGSQL_UID!!=${PGSQL_UID}=g" \
 		< ${FILESDIR}/pgsql.sh.tmpl > ${PREFIX}/etc/rc.d/pgsql.sh
 	@ chmod 554 ${PREFIX}/etc/rc.d/pgsql.sh
@@ -136,5 +162,10 @@ post-install:
 .if !defined(BATCH)
 	@ more -e ${FILESDIR}/post-install-notes
 .endif
+#.if (${PORTOBJFORMAT} == "elf")
+#	@${ECHO} "Hack for ELF library..."
+#	@${RM} ${PREFIX}/${INSTALL_DIR}/lib/libpg.so.2.0
+#	@${RM} ${PREFIX}/${INSTALL_DIR}/lib/libpg++.so.2.0
+#.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/postgresql/distinfo b/japanese/postgresql/distinfo
index 2c981a8e7977..da2303a66330 100644
--- a/japanese/postgresql/distinfo
+++ b/japanese/postgresql/distinfo
@@ -1,2 +1,2 @@
-MD5 (postgresql-6.3.2.tar.gz) = 8902842461c9a42854ba9883bee56a4c
-MD5 (jumbo_981104.patch.gz) = b3dfe9e1fe61106133d71808723318e9
+MD5 (postgresql-v6.4.tar.gz) = 8a6e224f90b0201757eb05aa0068bfa9
+MD5 (jumbo-981124.patch.gz) = 7050d2c2221c004d1b3778f8965be92d
diff --git a/japanese/postgresql/files/patch-ad b/japanese/postgresql/files/patch-ad
index 3529936565aa..56f482cd4dd8 100644
--- a/japanese/postgresql/files/patch-ad
+++ b/japanese/postgresql/files/patch-ad
@@ -5,8 +5,8 @@
  SHARED_LIB:-fpic -DPIC
 -CFLAGS:-O2 -m486 -pipe
 +CFLAGS:-pipe -O2
- SRCH_INC:/usr/local/include
- SRCH_LIB:/usr/local/lib
+ SRCH_INC:
+ SRCH_LIB:
 -USE_LOCALE:no
 +USE_LOCALE:yes
  DLSUFFIX:.so
diff --git a/japanese/postgresql/pkg-install b/japanese/postgresql/pkg-install
new file mode 100644
index 000000000000..e589ba9ef351
--- /dev/null
+++ b/japanese/postgresql/pkg-install
@@ -0,0 +1,98 @@
+#!/bin/sh
+# an installation script for postgresql
+
+check_pw()
+{
+    if which -s pw; then
+	:
+    else
+	cat <<EOF
+
+This system looks like a pre-2.2 version of FreeBSD.  We see that it
+is missing the "pw" utility.  We need this utility.  Please get and
+install it, and try again.  You can get the source from:
+
+  ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/usr.sbin/pw.tar.gz
+
+EOF
+	exit 1
+    fi
+}
+
+ask() {
+    local question default answer
+
+    question=$1
+    default=$2
+    if [ -z "${PACKAGE_BUILDING}" ]; then
+	read -p "${question} (y/n) [${default}]? " answer
+    fi
+    if [ x${answer} = x ]; then
+	answer=${default}
+    fi
+    echo ${answer}
+}
+
+yesno() {
+    local dflt question answer
+
+    question=$1
+    dflt=$2
+    while :; do
+	answer=$(ask "${question}" "${dflt}")
+	case "${answer}" in
+	[Yy]*)		return 0;;
+	[Nn]*)		return 1;;
+	esac
+	echo "Please answer yes or no."
+    done
+}
+
+case $1 in
+PRE-INSTALL)
+
+    ## Hack /etc/master.passwd ##
+    # check
+    id_70=`id -nu 70 2> /dev/null`
+    id_pgsql=`id -u ${PGSQL_UID} 2> /dev/null`
+    if [ X"$id_pgsql" != X ]; then
+	exit 0
+    elif [ X"$id_70" != X ]; then
+	cat <<EOF
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+This system already has an account whose name is '$id_70' and ID number is 70.
+
+   '`id $id_70`'
+
+For PostgreSQL in this port or package, UID:GID of '${PGSQL_UID}' has to be 70:70.
+Please try again after you delete the account.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+EOF
+	exit 1
+    fi
+
+    # add an account of PostgreSQL to this system
+    echo ""
+    echo "You need a group '${PGSQL_GID}' whose ID number is 70"
+    if yesno "Would you like to create it automatically?" y; then
+	# We need a command 'pw(8)'
+	check_pw
+	pw groupadd ${PGSQL_GID} -g 70 || exit
+    else
+	echo "Please create it, and try again."
+	exit 1
+    fi
+    echo ""
+    echo "You need an account '${PGSQL_UID}' whose ID number is 70"
+    if yesno "Would you like to create it automatically?" y; then
+	# We need a command 'pw(8)'
+	check_pw
+	pw useradd ${PGSQL_UID} -u 70 -g ${PGSQL_GID} -h - -d /usr/local/${INSTALL_DIR} \
+		-s /bin/sh -c "PostgreSQL pseudo-user" || exit
+    else
+	echo "Please create it, and try again."
+	exit 1
+    fi
+    ;;
+esac
diff --git a/japanese/postgresql/pkg-plist b/japanese/postgresql/pkg-plist
index 7bb058674f8c..7e5f02270176 100644
--- a/japanese/postgresql/pkg-plist
+++ b/japanese/postgresql/pkg-plist
@@ -1,131 +1,130 @@
 etc/rc.d/pgsql.sh
 %%INSTALL_DIR%%/.profile
+%%INSTALL_DIR%%/bin/postgres
+%%INSTALL_DIR%%/bin/postmaster
+%%INSTALL_DIR%%/bin/ecpg
+%%INSTALL_DIR%%/bin/pg_id
+%%INSTALL_DIR%%/bin/pg_version
+%%INSTALL_DIR%%/bin/psql
+%%INSTALL_DIR%%/bin/pg_dump
+%%INSTALL_DIR%%/bin/pg_dumpall
+%%INSTALL_DIR%%/bin/pg_upgrade
+%%INSTALL_DIR%%/bin/pg_passwd
 %%INSTALL_DIR%%/bin/cleardbdir
 %%INSTALL_DIR%%/bin/createdb
 %%INSTALL_DIR%%/bin/createuser
 %%INSTALL_DIR%%/bin/destroydb
 %%INSTALL_DIR%%/bin/destroyuser
-%%INSTALL_DIR%%/bin/ecpg
 %%INSTALL_DIR%%/bin/initdb
 %%INSTALL_DIR%%/bin/initlocation
 %%INSTALL_DIR%%/bin/ipcclean
-%%INSTALL_DIR%%/bin/pg_dump
-%%INSTALL_DIR%%/bin/pg_dumpall
-%%INSTALL_DIR%%/bin/pg_id
-%%INSTALL_DIR%%/bin/pg_passwd
-%%INSTALL_DIR%%/bin/pg_version
-%%INSTALL_DIR%%/bin/postgres
-%%INSTALL_DIR%%/bin/postmaster
-%%INSTALL_DIR%%/bin/psql
-%%INSTALL_DIR%%/data/PG_VERSION
-%%INSTALL_DIR%%/data/base/template1/PG_VERSION
-%%INSTALL_DIR%%/data/base/template1/pg_aggregate
-%%INSTALL_DIR%%/data/base/template1/pg_am
-%%INSTALL_DIR%%/data/base/template1/pg_amop
-%%INSTALL_DIR%%/data/base/template1/pg_amproc
-%%INSTALL_DIR%%/data/base/template1/pg_attrdef
-%%INSTALL_DIR%%/data/base/template1/pg_attrdef_adrelid_index
+%%INSTALL_DIR%%/lib/global1.bki.source
+%%INSTALL_DIR%%/lib/global1.description
+%%INSTALL_DIR%%/lib/local1_template1.bki.source
+%%INSTALL_DIR%%/lib/local1_template1.description
+%%INSTALL_DIR%%/lib/pg_hba.conf.sample
+%%INSTALL_DIR%%/lib/pg_geqo.sample
+%%INSTALL_DIR%%/lib/libpq.a
+%%INSTALL_DIR%%/lib/libpq.so.2
+%%INSTALL_DIR%%/lib/libpq.so
+%%INSTALL_DIR%%/lib/libecpg.a
+%%INSTALL_DIR%%/lib/libecpg.so.2.6
+%%INSTALL_DIR%%/lib/libecpg.so
+%%INSTALL_DIR%%/lib/libpq++.a
+%%INSTALL_DIR%%/lib/libpq++.so.2
+%%INSTALL_DIR%%/lib/libpq++.so
+%%INSTALL_DIR%%/lib/plpgsql.so
+%%INSTALL_DIR%%/include/fmgr.h
+%%INSTALL_DIR%%/include/lib/dllist.h
+%%INSTALL_DIR%%/include/libpq/pqcomm.h
+%%INSTALL_DIR%%/include/libpq/libpq-fs.h
+%%INSTALL_DIR%%/include/utils/geo_decls.h
+%%INSTALL_DIR%%/include/utils/elog.h
+%%INSTALL_DIR%%/include/utils/palloc.h
+%%INSTALL_DIR%%/include/access/attnum.h
+%%INSTALL_DIR%%/include/executor/spi.h
+%%INSTALL_DIR%%/include/commands/trigger.h
+%%INSTALL_DIR%%/include/os.h
+%%INSTALL_DIR%%/include/config.h
+%%INSTALL_DIR%%/include/c.h
+%%INSTALL_DIR%%/include/postgres.h
+%%INSTALL_DIR%%/include/postgres_ext.h
+%%INSTALL_DIR%%/include/libpq-fe.h
+%%INSTALL_DIR%%/include/libpq-int.h
+%%INSTALL_DIR%%/include/ecpgerrno.h
+%%INSTALL_DIR%%/include/ecpglib.h
+%%INSTALL_DIR%%/include/ecpgtype.h
+%%INSTALL_DIR%%/include/sqlca.h
+%%INSTALL_DIR%%/include/libpq++/pgenv.h
+%%INSTALL_DIR%%/include/libpq++/pgconnection.h
+%%INSTALL_DIR%%/include/libpq++/pgdatabase.h
+%%INSTALL_DIR%%/include/libpq++/pgtransdb.h
+%%INSTALL_DIR%%/include/libpq++/pgcursordb.h
+%%INSTALL_DIR%%/include/libpq++/pglobject.h
+%%INSTALL_DIR%%/include/libpq++.h
+%%INSTALL_DIR%%/data/base/template1/pg_proc
+%%INSTALL_DIR%%/data/base/template1/pg_type
 %%INSTALL_DIR%%/data/base/template1/pg_attribute
-%%INSTALL_DIR%%/data/base/template1/pg_attribute_attrelid_index
-%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnam_index
-%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnum_index
 %%INSTALL_DIR%%/data/base/template1/pg_class
-%%INSTALL_DIR%%/data/base/template1/pg_class_oid_index
-%%INSTALL_DIR%%/data/base/template1/pg_class_relname_index
-%%INSTALL_DIR%%/data/base/template1/pg_description
-%%INSTALL_DIR%%/data/base/template1/pg_description_objoid_index
-%%INSTALL_DIR%%/data/base/template1/pg_index
-%%INSTALL_DIR%%/data/base/template1/pg_inheritproc
 %%INSTALL_DIR%%/data/base/template1/pg_inherits
-%%INSTALL_DIR%%/data/base/template1/pg_internal.init
-%%INSTALL_DIR%%/data/base/template1/pg_ipl
-%%INSTALL_DIR%%/data/base/template1/pg_language
-%%INSTALL_DIR%%/data/base/template1/pg_listener
-%%INSTALL_DIR%%/data/base/template1/pg_opclass
+%%INSTALL_DIR%%/data/base/template1/pg_index
+%%INSTALL_DIR%%/data/base/template1/pg_statistic
 %%INSTALL_DIR%%/data/base/template1/pg_operator
+%%INSTALL_DIR%%/data/base/template1/pg_opclass
+%%INSTALL_DIR%%/data/base/template1/pg_am
+%%INSTALL_DIR%%/data/base/template1/pg_amop
+%%INSTALL_DIR%%/data/base/template1/pg_amproc
+%%INSTALL_DIR%%/data/base/template1/pg_language
 %%INSTALL_DIR%%/data/base/template1/pg_parg
-%%INSTALL_DIR%%/data/base/template1/pg_proc
+%%INSTALL_DIR%%/data/base/template1/pg_aggregate
+%%INSTALL_DIR%%/data/base/template1/pg_ipl
+%%INSTALL_DIR%%/data/base/template1/pg_inheritproc
+%%INSTALL_DIR%%/data/base/template1/pg_rewrite
+%%INSTALL_DIR%%/data/base/template1/pg_listener
+%%INSTALL_DIR%%/data/base/template1/pg_description
+%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnam_index
+%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnum_index
+%%INSTALL_DIR%%/data/base/template1/pg_attribute_attrelid_index
 %%INSTALL_DIR%%/data/base/template1/pg_proc_oid_index
-%%INSTALL_DIR%%/data/base/template1/pg_proc_proname_index
+%%INSTALL_DIR%%/data/base/template1/pg_proc_proname_narg_type_index
 %%INSTALL_DIR%%/data/base/template1/pg_proc_prosrc_index
+%%INSTALL_DIR%%/data/base/template1/pg_type_oid_index
+%%INSTALL_DIR%%/data/base/template1/pg_type_typname_index
+%%INSTALL_DIR%%/data/base/template1/pg_class_oid_index
+%%INSTALL_DIR%%/data/base/template1/pg_class_relname_index
+%%INSTALL_DIR%%/data/base/template1/pg_attrdef
+%%INSTALL_DIR%%/data/base/template1/pg_attrdef_adrelid_index
 %%INSTALL_DIR%%/data/base/template1/pg_relcheck
 %%INSTALL_DIR%%/data/base/template1/pg_relcheck_rcrelid_index
-%%INSTALL_DIR%%/data/base/template1/pg_rewrite
-%%INSTALL_DIR%%/data/base/template1/pg_statistic
 %%INSTALL_DIR%%/data/base/template1/pg_trigger
 %%INSTALL_DIR%%/data/base/template1/pg_trigger_tgrelid_index
-%%INSTALL_DIR%%/data/base/template1/pg_type
-%%INSTALL_DIR%%/data/base/template1/pg_type_oid_index
-%%INSTALL_DIR%%/data/base/template1/pg_type_typname_index
+%%INSTALL_DIR%%/data/base/template1/pg_description_objoid_index
+%%INSTALL_DIR%%/data/base/template1/PG_VERSION
+%%INSTALL_DIR%%/data/base/template1/pg_internal.init
 %%INSTALL_DIR%%/data/base/template1/pg_user
-%%INSTALL_DIR%%/data/base/template1/pg_version
+%%INSTALL_DIR%%/data/base/template1/pg_rules
+%%INSTALL_DIR%%/data/base/template1/pg_views
+%%INSTALL_DIR%%/data/base/template1/pg_tables
+%%INSTALL_DIR%%/data/base/template1/pg_indexes
+%%INSTALL_DIR%%/data/pg_variable
 %%INSTALL_DIR%%/data/pg_database
-%%INSTALL_DIR%%/data/pg_geqo.sample
+%%INSTALL_DIR%%/data/pg_shadow
 %%INSTALL_DIR%%/data/pg_group
-%%INSTALL_DIR%%/data/pg_hba.conf
 %%INSTALL_DIR%%/data/pg_log
+%%INSTALL_DIR%%/data/PG_VERSION
+%%INSTALL_DIR%%/data/pg_hba.conf
+%%INSTALL_DIR%%/data/pg_geqo.sample
 %%INSTALL_DIR%%/data/pg_pwd
-%%INSTALL_DIR%%/data/pg_shadow
-%%INSTALL_DIR%%/data/pg_variable
-%%INSTALL_DIR%%/include/access/attnum.h
-%%INSTALL_DIR%%/include/c.h
-%%INSTALL_DIR%%/include/commands/trigger.h
-%%INSTALL_DIR%%/include/config.h
-%%INSTALL_DIR%%/include/ecpglib.h
-%%INSTALL_DIR%%/include/ecpgtype.h
-%%INSTALL_DIR%%/include/executor/spi.h
-%%INSTALL_DIR%%/include/fmgr.h
-%%INSTALL_DIR%%/include/lib/dllist.h
-%%INSTALL_DIR%%/include/libpq-fe.h
-%%INSTALL_DIR%%/include/libpq/libpq-fs.h
-%%INSTALL_DIR%%/include/libpq/pqcomm.h
-%%INSTALL_DIR%%/include/os.h
-%%INSTALL_DIR%%/include/postgres.h
-%%INSTALL_DIR%%/include/postgres_ext.h
-%%INSTALL_DIR%%/include/sqlca.h
-%%INSTALL_DIR%%/include/utils/elog.h
-%%INSTALL_DIR%%/include/utils/geo_decls.h
-%%INSTALL_DIR%%/include/utils/palloc.h
-%%INSTALL_DIR%%/lib/global1.bki.source
-%%INSTALL_DIR%%/lib/global1.description
-%%INSTALL_DIR%%/lib/libecpg.a
-%%INSTALL_DIR%%/lib/libecpg.so
-%%INSTALL_DIR%%/lib/libecpg.so.1.1
-%%INSTALL_DIR%%/lib/libpq.a
-%%INSTALL_DIR%%/lib/libpq.so
-%%INSTALL_DIR%%/lib/libpq.so.1.1
-%%INSTALL_DIR%%/lib/local1_template1.bki.source
-%%INSTALL_DIR%%/lib/local1_template1.description
-%%INSTALL_DIR%%/lib/pg_geqo.sample
-%%INSTALL_DIR%%/lib/pg_hba.conf.sample
 %%INSTALL_DIR%%/post-install-notes
-share/doc/%%INSTALL_DIR%%/FAQ
-share/doc/%%INSTALL_DIR%%/FAQ_FreeBSD
-share/doc/%%INSTALL_DIR%%/FAQ_Irix
-share/doc/%%INSTALL_DIR%%/FAQ_Linux
-share/doc/%%INSTALL_DIR%%/Makefile
-share/doc/%%INSTALL_DIR%%/README.GEQO
-share/doc/%%INSTALL_DIR%%/README.fsync
-share/doc/%%INSTALL_DIR%%/README.mb
-share/doc/%%INSTALL_DIR%%/README.mb.jp
-share/doc/%%INSTALL_DIR%%/README.support
-share/doc/%%INSTALL_DIR%%/TODO
-share/doc/%%INSTALL_DIR%%/TODO.GEQO
-share/doc/%%INSTALL_DIR%%/admin.ps.gz
-share/doc/%%INSTALL_DIR%%/admin.tar.gz
-share/doc/%%INSTALL_DIR%%/bug.template
-share/doc/%%INSTALL_DIR%%/postgres.tar.gz
-share/doc/%%INSTALL_DIR%%/programmer.ps.gz
-share/doc/%%INSTALL_DIR%%/programmer.tar.gz
-share/doc/%%INSTALL_DIR%%/src/Makefile
-share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.gif
+share/doc/%%INSTALL_DIR%%/src/graphics/connections.ag
 share/doc/%%INSTALL_DIR%%/src/graphics/clientserver.ag
 share/doc/%%INSTALL_DIR%%/src/graphics/clientserver.gif
-share/doc/%%INSTALL_DIR%%/src/graphics/connections.ag
+share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.gif
 share/doc/%%INSTALL_DIR%%/src/graphics/connections.gif
 share/doc/%%INSTALL_DIR%%/src/graphics/layout.ag
 share/doc/%%INSTALL_DIR%%/src/graphics/layout.gif
-share/doc/%%INSTALL_DIR%%/src/sgml/Makefile
+share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.ps
+share/doc/%%INSTALL_DIR%%/src/sgml/xtypes.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/admin.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/advanced.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/arch-dev.sgml
@@ -145,9 +144,9 @@ share/doc/%%INSTALL_DIR%%/src/sgml/func-ref.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/geqo.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/gist.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/inherit.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/intro.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/install.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/intro-pg.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/intro.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/jdbc.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/libpgtcl.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/libpq.sgml
@@ -177,13 +176,130 @@ share/doc/%%INSTALL_DIR%%/src/sgml/xaggr.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/xfunc.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/xindex.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/xoper.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/xtypes.sgml
-share/doc/%%INSTALL_DIR%%/tutorial.ps.gz
-share/doc/%%INSTALL_DIR%%/tutorial.tar.gz
-share/doc/%%INSTALL_DIR%%/user.ps.gz
+share/doc/%%INSTALL_DIR%%/src/sgml/Makefile
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/vacuum.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/allfiles.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/alter_table.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/alter_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/begin.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/close.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/cluster.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/commands.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/commit.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/copy.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_aggregate.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_database.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_function.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_index.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_language.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_operator.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_rule.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_sequence.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_table.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_trigger.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_type.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_view.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/createdb.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/createuser.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_date.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_time.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_timestamp.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/declare.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/delete.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/destroydb.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/destroyuser.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_aggregate.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_database.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_index.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_function.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_language.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_operator.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_rule.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_sequence.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_table.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_trigger.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_type.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_view.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/explain.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/fetch.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/grant.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/initdb.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/initlocation.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/insert.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/listen.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/load.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/lock.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/move.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/notify.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/reset.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/pg_dump.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/pg_dumpall.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/pg_upgrade.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/psql-ref.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/revoke.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/rollback.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/select.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/set.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/show.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/unlisten.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/update.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/abort.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/about.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/bki.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/config.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/current.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/oper.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/func.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/history.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/indices.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/info.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/installation.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/intro-ag.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/keys.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/legal.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/libpq++.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/notation.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/page.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/pg_options.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/reference.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/runtime.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/security.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/signals.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/syntax.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/typeconv.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/xplang.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/y2k.sgml
+share/doc/%%INSTALL_DIR%%/src/Makefile
 share/doc/%%INSTALL_DIR%%/user.tar.gz
-share/doc/%%INSTALL_DIR%%/userguide.ps
+share/doc/%%INSTALL_DIR%%/user.ps.gz
+share/doc/%%INSTALL_DIR%%/tutorial.tar.gz
+share/doc/%%INSTALL_DIR%%/tutorial.ps.gz
+share/doc/%%INSTALL_DIR%%/programmer.tar.gz
+share/doc/%%INSTALL_DIR%%/programmer.ps.gz
+share/doc/%%INSTALL_DIR%%/postgres.tar.gz
+share/doc/%%INSTALL_DIR%%/bug.template
+share/doc/%%INSTALL_DIR%%/admin.tar.gz
+share/doc/%%INSTALL_DIR%%/admin.ps.gz
+share/doc/%%INSTALL_DIR%%/TODO
+share/doc/%%INSTALL_DIR%%/README.mb.jp
+share/doc/%%INSTALL_DIR%%/README.mb
+share/doc/%%INSTALL_DIR%%/README.fsync
+share/doc/%%INSTALL_DIR%%/Makefile
+share/doc/%%INSTALL_DIR%%/FAQ_Linux
+share/doc/%%INSTALL_DIR%%/FAQ_Irix
+share/doc/%%INSTALL_DIR%%/FAQ_FreeBSD
+share/doc/%%INSTALL_DIR%%/FAQ
+share/doc/%%INSTALL_DIR%%/README.locale
+share/doc/%%INSTALL_DIR%%/README.inet
+share/doc/%%INSTALL_DIR%%/FAQ_DEV
+share/doc/%%INSTALL_DIR%%/FAQ_CVS
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @dirrm share/doc/%%INSTALL_DIR%%/src/graphics
+@dirrm share/doc/%%INSTALL_DIR%%/src/sgml/ref
 @dirrm share/doc/%%INSTALL_DIR%%/src/sgml
 @dirrm share/doc/%%INSTALL_DIR%%/src
 @dirrm share/doc/%%INSTALL_DIR%%
@@ -191,20 +307,21 @@ share/doc/%%INSTALL_DIR%%/userguide.ps
 @dirrm %%INSTALL_DIR%%/data/base/template1
 @dirrm %%INSTALL_DIR%%/data/base
 @dirrm %%INSTALL_DIR%%/data
-@dirrm %%INSTALL_DIR%%/include/access
-@dirrm %%INSTALL_DIR%%/include/commands
-@dirrm %%INSTALL_DIR%%/include/executor
-@dirrm %%INSTALL_DIR%%/include/include
-@dirrm %%INSTALL_DIR%%/include/lib
+@dirrm %%INSTALL_DIR%%/include/utils
+@dirrm %%INSTALL_DIR%%/include/libpq++
 @dirrm %%INSTALL_DIR%%/include/libpq
-@dirrm %%INSTALL_DIR%%/include/port/bsd
+@dirrm %%INSTALL_DIR%%/include/lib
+@exec mkdir -p %D/%%INSTALL_DIR%%/include/port/freebsd
+@dirrm %%INSTALL_DIR%%/include/port/freebsd
 @dirrm %%INSTALL_DIR%%/include/port
-@dirrm %%INSTALL_DIR%%/include/utils
+@dirrm %%INSTALL_DIR%%/include/executor
+@dirrm %%INSTALL_DIR%%/include/commands
+@dirrm %%INSTALL_DIR%%/include/access
 @dirrm %%INSTALL_DIR%%/include
 @dirrm %%INSTALL_DIR%%/lib
-@dirrm %%INSTALL_DIR%%/man/man1
-@dirrm %%INSTALL_DIR%%/man/man3
-@dirrm %%INSTALL_DIR%%/man/man5
 @dirrm %%INSTALL_DIR%%/man/manl
+@dirrm %%INSTALL_DIR%%/man/man5
+@dirrm %%INSTALL_DIR%%/man/man3
+@dirrm %%INSTALL_DIR%%/man/man1
 @dirrm %%INSTALL_DIR%%/man
 @dirrm %%INSTALL_DIR%%
diff --git a/japanese/postgresql/pkg-plist.tcl b/japanese/postgresql/pkg-plist.tcl
index 4f5184ce3ec3..602ebba8399e 100644
--- a/japanese/postgresql/pkg-plist.tcl
+++ b/japanese/postgresql/pkg-plist.tcl
@@ -1,137 +1,170 @@
 etc/rc.d/pgsql.sh
 %%INSTALL_DIR%%/.profile
+%%INSTALL_DIR%%/bin
+%%INSTALL_DIR%%/bin/postgres
+%%INSTALL_DIR%%/bin/postmaster
+%%INSTALL_DIR%%/bin/ecpg
+%%INSTALL_DIR%%/bin/pg_id
+%%INSTALL_DIR%%/bin/pg_version
+%%INSTALL_DIR%%/bin/psql
+%%INSTALL_DIR%%/bin/pg_dump
+%%INSTALL_DIR%%/bin/pg_dumpall
+%%INSTALL_DIR%%/bin/pg_upgrade
+%%INSTALL_DIR%%/bin/pg_passwd
 %%INSTALL_DIR%%/bin/cleardbdir
 %%INSTALL_DIR%%/bin/createdb
 %%INSTALL_DIR%%/bin/createuser
 %%INSTALL_DIR%%/bin/destroydb
 %%INSTALL_DIR%%/bin/destroyuser
-%%INSTALL_DIR%%/bin/ecpg
 %%INSTALL_DIR%%/bin/initdb
 %%INSTALL_DIR%%/bin/initlocation
 %%INSTALL_DIR%%/bin/ipcclean
-%%INSTALL_DIR%%/bin/pg_dump
-%%INSTALL_DIR%%/bin/pg_dumpall
-%%INSTALL_DIR%%/bin/pg_id
-%%INSTALL_DIR%%/bin/pg_passwd
-%%INSTALL_DIR%%/bin/pg_version
+%%INSTALL_DIR%%/bin/pg_encoding
 %%INSTALL_DIR%%/bin/pgtclsh
 %%INSTALL_DIR%%/bin/pgtksh
-%%INSTALL_DIR%%/bin/postgres
-%%INSTALL_DIR%%/bin/postmaster
-%%INSTALL_DIR%%/bin/psql
-%%INSTALL_DIR%%/data/PG_VERSION
-%%INSTALL_DIR%%/data/base/template1/PG_VERSION
-%%INSTALL_DIR%%/data/base/template1/pg_aggregate
-%%INSTALL_DIR%%/data/base/template1/pg_am
-%%INSTALL_DIR%%/data/base/template1/pg_amop
-%%INSTALL_DIR%%/data/base/template1/pg_amproc
-%%INSTALL_DIR%%/data/base/template1/pg_attrdef
-%%INSTALL_DIR%%/data/base/template1/pg_attrdef_adrelid_index
+%%INSTALL_DIR%%/lib
+%%INSTALL_DIR%%/lib/global1.bki.source
+%%INSTALL_DIR%%/lib/global1.description
+%%INSTALL_DIR%%/lib/local1_template1.bki.source
+%%INSTALL_DIR%%/lib/local1_template1.description
+%%INSTALL_DIR%%/lib/pg_hba.conf.sample
+%%INSTALL_DIR%%/lib/pg_geqo.sample
+%%INSTALL_DIR%%/lib/libpq.a
+%%INSTALL_DIR%%/lib/libpq.so.2.0
+%%INSTALL_DIR%%/lib/libpq.so.2
+%%INSTALL_DIR%%/lib/libpq.so
+%%INSTALL_DIR%%/lib/libecpg.a
+%%INSTALL_DIR%%/lib/libecpg.so.2.6.2
+%%INSTALL_DIR%%/lib/libecpg.so.2
+%%INSTALL_DIR%%/lib/libecpg.so
+%%INSTALL_DIR%%/lib/libpq++.a
+%%INSTALL_DIR%%/lib/libpq++.so.2.0
+%%INSTALL_DIR%%/lib/libpq++.so.2
+%%INSTALL_DIR%%/lib/libpq++.so
+%%INSTALL_DIR%%/lib/libpgtcl.a
+%%INSTALL_DIR%%/lib/libpgtcl.so.2.0
+%%INSTALL_DIR%%/lib/libpgtcl.so.2
+%%INSTALL_DIR%%/lib/libpgtcl.so
+%%INSTALL_DIR%%/lib/libpsqlodbc.a
+%%INSTALL_DIR%%/lib/libpsqlodbc.so.0.25
+%%INSTALL_DIR%%/lib/libpsqlodbc.so.0
+%%INSTALL_DIR%%/lib/libpsqlodbc.so
+%%INSTALL_DIR%%/lib/plpgsql.so
+%%INSTALL_DIR%%/lib/pltcl.so
+%%INSTALL_DIR%%/include
+%%INSTALL_DIR%%/include/fmgr.h
+%%INSTALL_DIR%%/include/port
+%%INSTALL_DIR%%/include/port/freebsd
+%%INSTALL_DIR%%/include/lib
+%%INSTALL_DIR%%/include/lib/dllist.h
+%%INSTALL_DIR%%/include/libpq
+%%INSTALL_DIR%%/include/libpq/pqcomm.h
+%%INSTALL_DIR%%/include/libpq/libpq-fs.h
+%%INSTALL_DIR%%/include/utils
+%%INSTALL_DIR%%/include/utils/geo_decls.h
+%%INSTALL_DIR%%/include/utils/elog.h
+%%INSTALL_DIR%%/include/utils/palloc.h
+%%INSTALL_DIR%%/include/access
+%%INSTALL_DIR%%/include/access/attnum.h
+%%INSTALL_DIR%%/include/executor
+%%INSTALL_DIR%%/include/executor/spi.h
+%%INSTALL_DIR%%/include/commands
+%%INSTALL_DIR%%/include/commands/trigger.h
+%%INSTALL_DIR%%/include/os.h
+%%INSTALL_DIR%%/include/config.h
+%%INSTALL_DIR%%/include/c.h
+%%INSTALL_DIR%%/include/postgres.h
+%%INSTALL_DIR%%/include/postgres_ext.h
+%%INSTALL_DIR%%/include/libpq-fe.h
+%%INSTALL_DIR%%/include/libpq-int.h
+%%INSTALL_DIR%%/include/ecpgerrno.h
+%%INSTALL_DIR%%/include/ecpglib.h
+%%INSTALL_DIR%%/include/ecpgtype.h
+%%INSTALL_DIR%%/include/sqlca.h
+%%INSTALL_DIR%%/include/libpq++
+%%INSTALL_DIR%%/include/libpq++/pgenv.h
+%%INSTALL_DIR%%/include/libpq++/pgconnection.h
+%%INSTALL_DIR%%/include/libpq++/pgdatabase.h
+%%INSTALL_DIR%%/include/libpq++/pgtransdb.h
+%%INSTALL_DIR%%/include/libpq++/pgcursordb.h
+%%INSTALL_DIR%%/include/libpq++/pglobject.h
+%%INSTALL_DIR%%/include/libpq++.h
+%%INSTALL_DIR%%/include/libpgtcl.h
+%%INSTALL_DIR%%/include/iodbc
+%%INSTALL_DIR%%/include/iodbc/iodbc.h
+%%INSTALL_DIR%%/include/iodbc/isql.h
+%%INSTALL_DIR%%/include/iodbc/isqlext.h
+%%INSTALL_DIR%%/odbcinst.ini
+%%INSTALL_DIR%%/data
+%%INSTALL_DIR%%/data/base
+%%INSTALL_DIR%%/data/base/template1
+%%INSTALL_DIR%%/data/base/template1/pg_proc
+%%INSTALL_DIR%%/data/base/template1/pg_type
 %%INSTALL_DIR%%/data/base/template1/pg_attribute
-%%INSTALL_DIR%%/data/base/template1/pg_attribute_attrelid_index
-%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnam_index
-%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnum_index
 %%INSTALL_DIR%%/data/base/template1/pg_class
-%%INSTALL_DIR%%/data/base/template1/pg_class_oid_index
-%%INSTALL_DIR%%/data/base/template1/pg_class_relname_index
-%%INSTALL_DIR%%/data/base/template1/pg_description
-%%INSTALL_DIR%%/data/base/template1/pg_description_objoid_index
-%%INSTALL_DIR%%/data/base/template1/pg_index
-%%INSTALL_DIR%%/data/base/template1/pg_inheritproc
 %%INSTALL_DIR%%/data/base/template1/pg_inherits
-%%INSTALL_DIR%%/data/base/template1/pg_internal.init
-%%INSTALL_DIR%%/data/base/template1/pg_ipl
-%%INSTALL_DIR%%/data/base/template1/pg_language
-%%INSTALL_DIR%%/data/base/template1/pg_listener
-%%INSTALL_DIR%%/data/base/template1/pg_opclass
+%%INSTALL_DIR%%/data/base/template1/pg_index
+%%INSTALL_DIR%%/data/base/template1/pg_statistic
 %%INSTALL_DIR%%/data/base/template1/pg_operator
+%%INSTALL_DIR%%/data/base/template1/pg_opclass
+%%INSTALL_DIR%%/data/base/template1/pg_am
+%%INSTALL_DIR%%/data/base/template1/pg_amop
+%%INSTALL_DIR%%/data/base/template1/pg_amproc
+%%INSTALL_DIR%%/data/base/template1/pg_language
 %%INSTALL_DIR%%/data/base/template1/pg_parg
-%%INSTALL_DIR%%/data/base/template1/pg_proc
+%%INSTALL_DIR%%/data/base/template1/pg_aggregate
+%%INSTALL_DIR%%/data/base/template1/pg_ipl
+%%INSTALL_DIR%%/data/base/template1/pg_inheritproc
+%%INSTALL_DIR%%/data/base/template1/pg_rewrite
+%%INSTALL_DIR%%/data/base/template1/pg_listener
+%%INSTALL_DIR%%/data/base/template1/pg_description
+%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnam_index
+%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnum_index
+%%INSTALL_DIR%%/data/base/template1/pg_attribute_attrelid_index
 %%INSTALL_DIR%%/data/base/template1/pg_proc_oid_index
-%%INSTALL_DIR%%/data/base/template1/pg_proc_proname_index
+%%INSTALL_DIR%%/data/base/template1/pg_proc_proname_narg_type_index
 %%INSTALL_DIR%%/data/base/template1/pg_proc_prosrc_index
+%%INSTALL_DIR%%/data/base/template1/pg_type_oid_index
+%%INSTALL_DIR%%/data/base/template1/pg_type_typname_index
+%%INSTALL_DIR%%/data/base/template1/pg_class_oid_index
+%%INSTALL_DIR%%/data/base/template1/pg_class_relname_index
+%%INSTALL_DIR%%/data/base/template1/pg_attrdef
+%%INSTALL_DIR%%/data/base/template1/pg_attrdef_adrelid_index
 %%INSTALL_DIR%%/data/base/template1/pg_relcheck
 %%INSTALL_DIR%%/data/base/template1/pg_relcheck_rcrelid_index
-%%INSTALL_DIR%%/data/base/template1/pg_rewrite
-%%INSTALL_DIR%%/data/base/template1/pg_statistic
 %%INSTALL_DIR%%/data/base/template1/pg_trigger
 %%INSTALL_DIR%%/data/base/template1/pg_trigger_tgrelid_index
-%%INSTALL_DIR%%/data/base/template1/pg_type
-%%INSTALL_DIR%%/data/base/template1/pg_type_oid_index
-%%INSTALL_DIR%%/data/base/template1/pg_type_typname_index
+%%INSTALL_DIR%%/data/base/template1/pg_description_objoid_index
+%%INSTALL_DIR%%/data/base/template1/PG_VERSION
+%%INSTALL_DIR%%/data/base/template1/pg_internal.init
 %%INSTALL_DIR%%/data/base/template1/pg_user
-%%INSTALL_DIR%%/data/base/template1/pg_version
+%%INSTALL_DIR%%/data/base/template1/pg_rules
+%%INSTALL_DIR%%/data/base/template1/pg_views
+%%INSTALL_DIR%%/data/base/template1/pg_tables
+%%INSTALL_DIR%%/data/base/template1/pg_indexes
+%%INSTALL_DIR%%/data/pg_variable
 %%INSTALL_DIR%%/data/pg_database
-%%INSTALL_DIR%%/data/pg_geqo.sample
+%%INSTALL_DIR%%/data/pg_shadow
 %%INSTALL_DIR%%/data/pg_group
-%%INSTALL_DIR%%/data/pg_hba.conf
 %%INSTALL_DIR%%/data/pg_log
+%%INSTALL_DIR%%/data/PG_VERSION
+%%INSTALL_DIR%%/data/pg_hba.conf
+%%INSTALL_DIR%%/data/pg_geqo.sample
 %%INSTALL_DIR%%/data/pg_pwd
-%%INSTALL_DIR%%/data/pg_shadow
-%%INSTALL_DIR%%/data/pg_variable
-%%INSTALL_DIR%%/include/access/attnum.h
-%%INSTALL_DIR%%/include/c.h
-%%INSTALL_DIR%%/include/commands/trigger.h
-%%INSTALL_DIR%%/include/config.h
-%%INSTALL_DIR%%/include/ecpglib.h
-%%INSTALL_DIR%%/include/ecpgtype.h
-%%INSTALL_DIR%%/include/executor/spi.h
-%%INSTALL_DIR%%/include/fmgr.h
-%%INSTALL_DIR%%/include/lib/dllist.h
-%%INSTALL_DIR%%/include/libpgtcl.h
-%%INSTALL_DIR%%/include/libpq-fe.h
-%%INSTALL_DIR%%/include/libpq/libpq-fs.h
-%%INSTALL_DIR%%/include/libpq/pqcomm.h
-%%INSTALL_DIR%%/include/os.h
-%%INSTALL_DIR%%/include/postgres.h
-%%INSTALL_DIR%%/include/postgres_ext.h
-%%INSTALL_DIR%%/include/sqlca.h
-%%INSTALL_DIR%%/include/utils/elog.h
-%%INSTALL_DIR%%/include/utils/geo_decls.h
-%%INSTALL_DIR%%/include/utils/palloc.h
-%%INSTALL_DIR%%/lib/global1.bki.source
-%%INSTALL_DIR%%/lib/global1.description
-%%INSTALL_DIR%%/lib/libecpg.a
-%%INSTALL_DIR%%/lib/libecpg.so
-%%INSTALL_DIR%%/lib/libecpg.so.1.1
-%%INSTALL_DIR%%/lib/libpgtcl.a
-%%INSTALL_DIR%%/lib/libpgtcl.so
-%%INSTALL_DIR%%/lib/libpgtcl.so.1.0
-%%INSTALL_DIR%%/lib/libpq.a
-%%INSTALL_DIR%%/lib/libpq.so
-%%INSTALL_DIR%%/lib/libpq.so.1.1
-%%INSTALL_DIR%%/lib/local1_template1.bki.source
-%%INSTALL_DIR%%/lib/local1_template1.description
-%%INSTALL_DIR%%/lib/pg_geqo.sample
-%%INSTALL_DIR%%/lib/pg_hba.conf.sample
 %%INSTALL_DIR%%/post-install-notes
-share/doc/%%INSTALL_DIR%%/FAQ
-share/doc/%%INSTALL_DIR%%/FAQ_FreeBSD
-share/doc/%%INSTALL_DIR%%/FAQ_Irix
-share/doc/%%INSTALL_DIR%%/FAQ_Linux
-share/doc/%%INSTALL_DIR%%/Makefile
-share/doc/%%INSTALL_DIR%%/README.GEQO
-share/doc/%%INSTALL_DIR%%/README.fsync
-share/doc/%%INSTALL_DIR%%/README.mb
-share/doc/%%INSTALL_DIR%%/README.mb.jp
-share/doc/%%INSTALL_DIR%%/README.support
-share/doc/%%INSTALL_DIR%%/TODO
-share/doc/%%INSTALL_DIR%%/TODO.GEQO
-share/doc/%%INSTALL_DIR%%/admin.ps.gz
-share/doc/%%INSTALL_DIR%%/admin.tar.gz
-share/doc/%%INSTALL_DIR%%/bug.template
-share/doc/%%INSTALL_DIR%%/postgres.tar.gz
-share/doc/%%INSTALL_DIR%%/programmer.ps.gz
-share/doc/%%INSTALL_DIR%%/programmer.tar.gz
-share/doc/%%INSTALL_DIR%%/src/Makefile
-share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.gif
+share/doc/%%INSTALL_DIR%%/
+share/doc/%%INSTALL_DIR%%/src
+share/doc/%%INSTALL_DIR%%/src/graphics
+share/doc/%%INSTALL_DIR%%/src/graphics/connections.ag
 share/doc/%%INSTALL_DIR%%/src/graphics/clientserver.ag
 share/doc/%%INSTALL_DIR%%/src/graphics/clientserver.gif
-share/doc/%%INSTALL_DIR%%/src/graphics/connections.ag
+share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.gif
 share/doc/%%INSTALL_DIR%%/src/graphics/connections.gif
 share/doc/%%INSTALL_DIR%%/src/graphics/layout.ag
 share/doc/%%INSTALL_DIR%%/src/graphics/layout.gif
-share/doc/%%INSTALL_DIR%%/src/sgml/Makefile
+share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.ps
+share/doc/%%INSTALL_DIR%%/src/sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/xtypes.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/admin.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/advanced.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/arch-dev.sgml
@@ -151,9 +184,9 @@ share/doc/%%INSTALL_DIR%%/src/sgml/func-ref.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/geqo.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/gist.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/inherit.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/intro.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/install.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/intro-pg.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/intro.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/jdbc.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/libpgtcl.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/libpq.sgml
@@ -183,13 +216,135 @@ share/doc/%%INSTALL_DIR%%/src/sgml/xaggr.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/xfunc.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/xindex.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/xoper.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/xtypes.sgml
-share/doc/%%INSTALL_DIR%%/tutorial.ps.gz
-share/doc/%%INSTALL_DIR%%/tutorial.tar.gz
-share/doc/%%INSTALL_DIR%%/user.ps.gz
+share/doc/%%INSTALL_DIR%%/src/sgml/Makefile
+share/doc/%%INSTALL_DIR%%/src/sgml/ref
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/vacuum.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/allfiles.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/alter_table.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/alter_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/begin.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/close.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/cluster.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/commands.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/commit.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/copy.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_aggregate.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_database.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_function.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_index.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_language.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_operator.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_rule.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_sequence.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_table.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_trigger.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_type.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_view.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/createdb.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/createuser.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_date.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_time.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_timestamp.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/declare.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/delete.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/destroydb.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/destroyuser.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_aggregate.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_database.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_index.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_function.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_language.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_operator.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_rule.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_sequence.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_table.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_trigger.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_type.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_view.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/explain.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/fetch.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/grant.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/initdb.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/initlocation.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/insert.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/listen.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/load.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/lock.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/move.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/notify.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/reset.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/pg_dump.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/pg_dumpall.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/pg_upgrade.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/psql-ref.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/revoke.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/rollback.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/select.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/set.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/show.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/unlisten.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/update.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/abort.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/about.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/bki.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/config.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/current.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/oper.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/func.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/history.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/indices.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/info.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/installation.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/intro-ag.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/keys.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/legal.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/libpq++.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/notation.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/page.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/pg_options.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/reference.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/runtime.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/security.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/signals.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/syntax.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/typeconv.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/xplang.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/y2k.sgml
+share/doc/%%INSTALL_DIR%%/src/Makefile
 share/doc/%%INSTALL_DIR%%/user.tar.gz
+share/doc/%%INSTALL_DIR%%/user.ps.gz
+share/doc/%%INSTALL_DIR%%/tutorial.tar.gz
+share/doc/%%INSTALL_DIR%%/tutorial.ps.gz
+share/doc/%%INSTALL_DIR%%/programmer.tar.gz
+share/doc/%%INSTALL_DIR%%/programmer.ps.gz
+share/doc/%%INSTALL_DIR%%/postgres.tar.gz
+share/doc/%%INSTALL_DIR%%/bug.template
+share/doc/%%INSTALL_DIR%%/admin.tar.gz
+share/doc/%%INSTALL_DIR%%/admin.ps.gz
+share/doc/%%INSTALL_DIR%%/TODO.GEQO
+share/doc/%%INSTALL_DIR%%/TODO
+share/doc/%%INSTALL_DIR%%/README.support
+share/doc/%%INSTALL_DIR%%/README.mb.jp
+share/doc/%%INSTALL_DIR%%/README.mb
+share/doc/%%INSTALL_DIR%%/README.fsync
+share/doc/%%INSTALL_DIR%%/README.GEQO
+share/doc/%%INSTALL_DIR%%/Makefile
+share/doc/%%INSTALL_DIR%%/FAQ_Linux
+share/doc/%%INSTALL_DIR%%/FAQ_Irix
+share/doc/%%INSTALL_DIR%%/FAQ_FreeBSD
+share/doc/%%INSTALL_DIR%%/FAQ
 share/doc/%%INSTALL_DIR%%/userguide.ps
+share/doc/%%INSTALL_DIR%%/README.locale
+share/doc/%%INSTALL_DIR%%/README.inet
+share/doc/%%INSTALL_DIR%%/FAQ_DEV
+share/doc/%%INSTALL_DIR%%/FAQ_CVS
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @dirrm share/doc/%%INSTALL_DIR%%/src/graphics
+@dirrm share/doc/%%INSTALL_DIR%%/src/sgml/ref
 @dirrm share/doc/%%INSTALL_DIR%%/src/sgml
 @dirrm share/doc/%%INSTALL_DIR%%/src
 @dirrm share/doc/%%INSTALL_DIR%%
@@ -197,20 +352,21 @@ share/doc/%%INSTALL_DIR%%/userguide.ps
 @dirrm %%INSTALL_DIR%%/data/base/template1
 @dirrm %%INSTALL_DIR%%/data/base
 @dirrm %%INSTALL_DIR%%/data
-@dirrm %%INSTALL_DIR%%/include/access
-@dirrm %%INSTALL_DIR%%/include/commands
-@dirrm %%INSTALL_DIR%%/include/executor
-@dirrm %%INSTALL_DIR%%/include/include
-@dirrm %%INSTALL_DIR%%/include/lib
-@dirrm %%INSTALL_DIR%%/include/libpq
-@dirrm %%INSTALL_DIR%%/include/port/bsd
-@dirrm %%INSTALL_DIR%%/include/port
 @dirrm %%INSTALL_DIR%%/include/utils
+@dirrm %%INSTALL_DIR%%/include/port/freebsd
+@dirrm %%INSTALL_DIR%%/include/port
+@dirrm %%INSTALL_DIR%%/include/libpq++
+@dirrm %%INSTALL_DIR%%/include/libpq
+@dirrm %%INSTALL_DIR%%/include/lib
+@dirrm %%INSTALL_DIR%%/include/executor
+@dirrm %%INSTALL_DIR%%/include/commands
+@dirrm %%INSTALL_DIR%%/include/access
 @dirrm %%INSTALL_DIR%%/include
 @dirrm %%INSTALL_DIR%%/lib
-@dirrm %%INSTALL_DIR%%/man/man1
-@dirrm %%INSTALL_DIR%%/man/man3
-@dirrm %%INSTALL_DIR%%/man/man5
 @dirrm %%INSTALL_DIR%%/man/manl
+@dirrm %%INSTALL_DIR%%/man/man5
+@dirrm %%INSTALL_DIR%%/man/man3
+@dirrm %%INSTALL_DIR%%/man/man1
 @dirrm %%INSTALL_DIR%%/man
 @dirrm %%INSTALL_DIR%%
+@dirrm pgsql
diff --git a/japanese/postgresql7/Makefile b/japanese/postgresql7/Makefile
index 31db55929a7c..6bdc835753ee 100644
--- a/japanese/postgresql7/Makefile
+++ b/japanese/postgresql7/Makefile
@@ -1,34 +1,47 @@
 # New ports collection makefile for:	PostgreSQL-j
-# Version required:	6.3.2+Multibyte-patch
-# Date created:		20 Aug 1998
+# Version required:	6.4+Multibyte-patch
+# Date created:		25 Nov 1998
 # Whom:			Ichiro Fukuhara <ichiro@ichiro.org>
 #
-# $Id: Makefile,v 1.2 1998/09/28 10:30:52 asami Exp $
+# $Id$
 #
 
-DISTNAME=	postgresql-6.3.2
-PKGNAME=	ja-postgresql-6.3.2
+DISTNAME=	postgresql-v6.4
+PKGNAME=	ja-postgresql-6.4
 CATEGORIES=	japanese databases
 MASTER_SITES=	ftp://ftp.postgresql.org/pub/ \
 		ftp://ftp.jaist.ac.jp/pub/dbms/PostgreSQL/ \
-		ftp://ftp.sra.co.jp/pub/cmd/postgres/6.3.2/
+		ftp://ftp.sra.co.jp/pub/cmd/postgres/6.4/
 
-PATCH_SITES=	ftp://ftp.sra.co.jp/pub/cmd/postgres/6.3.2/patches/FreeBSD/
-PATCHFILES=	jumbo_981104.patch.gz
+PATCH_SITES=	ftp://ftp.sra.co.jp/pub/cmd/postgres/6.4/patches/
+PATCHFILES=	jumbo-981124.patch.gz
 
 MAINTAINER=	ichiro@ichiro.org
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} --forward --quiet -E -p1
+PLISTS=		PLIST
 
 # if you want to use the tcl/tk frontend pgaccess, then you need to build
 # postgresql with tcl support by typing: make USE_TCL=yes
 .if defined(USE_TCL)
-MAKE_ENV=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl7.6
-LIB_DEPENDS=	tcl76jp.1:${PORTSDIR}/japanese/tcl76 \
-		tk42jp.1:${PORTSDIR}/japanese/tk42
-WITH_TCL=	--with-tcl
-PLIST=		${PKGDIR}/PLIST.tcl
+TCL_INCDIR=	${PREFIX}/include/tcl8.0jp
+TK_INCDIR=	${PREFIX}/include/tk8.0jp
+MAKE_ENV=	USE_TCL=true TCL_INCDIR=${TCL_INCDIR}
+WITH_TCL=	--with-tcl --with-tclconfig="${PREFIX}/lib/tcl8.0jp ${PREFIX}/lib/tk8.0jp"
+LIB_DEPENDS=	tcl80jp.1:${PORTSDIR}/japanese/tcl80 \
+		tk80jp.1:${PORTSDIR}/japanese/tk80
+PLISTS+=	PLIST.tcl
+.endif
+.if defined(MULTIBYTE)
+WITH_MB=	--with-mb=${MULTIBYTE}
+.endif
+.if defined(USE_PERL)
+WITH_PERL=      --with-perl
+.endif
+.if defined(USE_ODBC)
+WITH_ODBC=      --with-odbc
+PLISTS+=	PLIST.odbc
 .endif
 
 NO_PACKAGE=	"Requires ${PGSQL_UID} uid"
@@ -38,15 +51,18 @@ MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
 CONFIGURE_ARGS= --prefix=${PREFIX}/${INSTALL_DIR} \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
-		--with-includes=${PREFIX}/include ${WITH_TCL} \
-		--with-libraries=${PREFIX}/lib --with-mb=EUC_JP
+		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" ${WITH_TCL}\
+		--with-libraries=${PREFIX}/lib \
+		${WITH_MB} ${WITH_PERL} ${WITH_ODBC}
+
+INSTALL_TARGET= install install-man
 
 MAN1=		cleardbdir.1 createdb.1 createuser.1 destroydb.1 \
-		destroyuser.1 ecpg.1 initdb.1 ipcclean.1 initlocation.1 \
-		pg_dump.1 pg_dumpall.1 pg_passwd.1 pgintro.1 postgres.1 \
-		postmaster.1 psql.1
-MAN3=		catalogs.3 large_objects.3 libpq.3 oracle_compat.3 pgbuiltin.3
-MAN5=		bki.5 page.5 pg_hba.conf.5
+		destroyuser.1 ecpg.1 initdb.1 initlocation.1 \
+		ipcclean.1 pg_dump.1 pg_dumpall.1 pg_passwd.1 \
+		pg_upgrade.1 postgres.1 postmaster.1 psql.1
+MAN3=		catalogs.3 libpq.3
+MAN5=		pg_hba.conf.5
 MANL=		abort.l alter_table.l alter_user.l begin.l close.l cluster.l \
 		commit.l copy.l create_aggregate.l create_database.l \
 		create_function.l create_index.l create_language.l \
@@ -57,12 +73,13 @@ MANL=		abort.l alter_table.l alter_user.l begin.l close.l cluster.l \
 		drop_language.l drop_operator.l drop_rule.l drop_sequence.l \
 		drop_table.l drop_trigger.l drop_type.l drop_user.l \
 		drop_view.l end.l explain.l fetch.l grant.l insert.l listen.l \
-		load.l lock.l move.l notify.l reset.l revoke.l \
-		rollback.l select.l set.l show.l sql.l update.l vacuum.l
+		load.l lock.l move.l notify.l reset.l revoke.l rollback.l \
+		select.l set.l show.l sql.l update.l vacuum.l
 
 MANPREFIX=	${PREFIX}/${INSTALL_DIR}
 
 PLIST_SUB=	INSTALL_DIR=${INSTALL_DIR}
+PLIST=		${WRKDIR}/PLIST
 
 # These values are easily overridable like as
 #   "make PGQL_UID=postgresql PGSQL_GID=postgresql install"
@@ -71,13 +88,20 @@ PGSQL_UID=	pgsql
 PGSQL_GID=	pgsql
 
 pre-fetch:
-.if !defined(USE_TCL)
+.if !defined(USE_TCL) & !defined(USE_PERL) & !defined(USE_ODBC) & !defined(MULTIBYTE)
+
+	@${ECHO_MSG} "To build the \"MULTIBYTE PostgreSQL\", type:"
+	@${ECHO_MSG} "    make MULTIBYTE={EUC_JP,EUC_CN,EUC_KR,EUC_TW,UNICODE,MULE_INTERNAL,LATIN1-5}"
+	@${ECHO_MSG} "          USE_TCL=yes, USE_PERL=yes, USE_ODBC=yes"
+	@${ECHO_MSG} ""
 	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:"
-	@${ECHO_MSG} "    make USE_TCL=yes"
+	@${ECHO_MSG} "		make USE_TCL=yes"
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."
 .endif
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	find ${WRKDIR} -name '*.orig' -exec ${RM} {} \;
 
@@ -86,17 +110,19 @@ post-build:
 	@ ${ECHO} "Dump existing databases, before installing new db version !!"
 	@ ${ECHO} "Detailed instructions, see INSTALL file under ${WRKDIR}...  "
 	@ ${ECHO} "------------------------------------------------------------"
+	@${RM} -f ${WRKDIR}/PLIST
+.for i in ${PLISTS}
+	${CAT} ${PKGDIR}/${i} >> ${WRKDIR}/PLIST
+.endfor
 
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	${RM} -rf ${PREFIX}/${INSTALL_DIR}
 .endif
 	@ ${MKDIR} ${PREFIX}/${INSTALL_DIR}
-	@ ${SED} "s=PGSQL_UID=${PGSQL_UID}=g ; s=PGSQL_GID=${PGSQL_GID}=g ; \
-		s=INSTALL_DIR=${INSTALL_DIR}=g" < ${SCRIPTDIR}/createuser.tmpl \
-		> ${WRKDIR}/createuser
-	@ ${SETENV} ${MAKE_ENV} perl ${WRKDIR}/createuser
-
+	@ ${SETENV} INSTALL_DIR=${INSTALL_DIR} \
+	     	    PGSQL_UID=${PGSQL_UID} PGSQL_GID=${PGSQL_GID} \
+		 ${SH} ${PKGDIR}/INSTALL PRE-INSTALL
 post-install:
 	@ if [ ! -f ${PREFIX}/${INSTALL_DIR}/.profile ]; then \
 		${ECHO} "PATH=${PATH}:${PREFIX}/${INSTALL_DIR}/bin" \
@@ -123,7 +149,7 @@ post-install:
 	@ chown -R ${PGSQL_UID}:${PGSQL_GID} ${PREFIX}/${INSTALL_DIR}
 	@ ${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'
 	@ ${LDCONFIG} -m ${PREFIX}/${INSTALL_DIR}/lib
-	@ su -l ${PGSQL_UID} -c '${PREFIX}/${INSTALL_DIR}/bin/initdb --pglib=${PREFIX}/${INSTALL_DIR}/lib --pgdata=${PREFIX}/${INSTALL_DIR}/data'
+	@ /usr/bin/su -l ${PGSQL_UID} -c '${PREFIX}/${INSTALL_DIR}/bin/initdb --pglib=${PREFIX}/${INSTALL_DIR}/lib --pgdata=${PREFIX}/${INSTALL_DIR}/data'
 	@ ${SED} "s=!!PG_PATH!!=${PREFIX}/${INSTALL_DIR}=g ; s=!!PGSQL_UID!!=${PGSQL_UID}=g" \
 		< ${FILESDIR}/pgsql.sh.tmpl > ${PREFIX}/etc/rc.d/pgsql.sh
 	@ chmod 554 ${PREFIX}/etc/rc.d/pgsql.sh
@@ -136,5 +162,10 @@ post-install:
 .if !defined(BATCH)
 	@ more -e ${FILESDIR}/post-install-notes
 .endif
+#.if (${PORTOBJFORMAT} == "elf")
+#	@${ECHO} "Hack for ELF library..."
+#	@${RM} ${PREFIX}/${INSTALL_DIR}/lib/libpg.so.2.0
+#	@${RM} ${PREFIX}/${INSTALL_DIR}/lib/libpg++.so.2.0
+#.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/postgresql7/distinfo b/japanese/postgresql7/distinfo
index 2c981a8e7977..da2303a66330 100644
--- a/japanese/postgresql7/distinfo
+++ b/japanese/postgresql7/distinfo
@@ -1,2 +1,2 @@
-MD5 (postgresql-6.3.2.tar.gz) = 8902842461c9a42854ba9883bee56a4c
-MD5 (jumbo_981104.patch.gz) = b3dfe9e1fe61106133d71808723318e9
+MD5 (postgresql-v6.4.tar.gz) = 8a6e224f90b0201757eb05aa0068bfa9
+MD5 (jumbo-981124.patch.gz) = 7050d2c2221c004d1b3778f8965be92d
diff --git a/japanese/postgresql7/files/patch-ad b/japanese/postgresql7/files/patch-ad
index 3529936565aa..56f482cd4dd8 100644
--- a/japanese/postgresql7/files/patch-ad
+++ b/japanese/postgresql7/files/patch-ad
@@ -5,8 +5,8 @@
  SHARED_LIB:-fpic -DPIC
 -CFLAGS:-O2 -m486 -pipe
 +CFLAGS:-pipe -O2
- SRCH_INC:/usr/local/include
- SRCH_LIB:/usr/local/lib
+ SRCH_INC:
+ SRCH_LIB:
 -USE_LOCALE:no
 +USE_LOCALE:yes
  DLSUFFIX:.so
diff --git a/japanese/postgresql7/pkg-install b/japanese/postgresql7/pkg-install
new file mode 100644
index 000000000000..e589ba9ef351
--- /dev/null
+++ b/japanese/postgresql7/pkg-install
@@ -0,0 +1,98 @@
+#!/bin/sh
+# an installation script for postgresql
+
+check_pw()
+{
+    if which -s pw; then
+	:
+    else
+	cat <<EOF
+
+This system looks like a pre-2.2 version of FreeBSD.  We see that it
+is missing the "pw" utility.  We need this utility.  Please get and
+install it, and try again.  You can get the source from:
+
+  ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/usr.sbin/pw.tar.gz
+
+EOF
+	exit 1
+    fi
+}
+
+ask() {
+    local question default answer
+
+    question=$1
+    default=$2
+    if [ -z "${PACKAGE_BUILDING}" ]; then
+	read -p "${question} (y/n) [${default}]? " answer
+    fi
+    if [ x${answer} = x ]; then
+	answer=${default}
+    fi
+    echo ${answer}
+}
+
+yesno() {
+    local dflt question answer
+
+    question=$1
+    dflt=$2
+    while :; do
+	answer=$(ask "${question}" "${dflt}")
+	case "${answer}" in
+	[Yy]*)		return 0;;
+	[Nn]*)		return 1;;
+	esac
+	echo "Please answer yes or no."
+    done
+}
+
+case $1 in
+PRE-INSTALL)
+
+    ## Hack /etc/master.passwd ##
+    # check
+    id_70=`id -nu 70 2> /dev/null`
+    id_pgsql=`id -u ${PGSQL_UID} 2> /dev/null`
+    if [ X"$id_pgsql" != X ]; then
+	exit 0
+    elif [ X"$id_70" != X ]; then
+	cat <<EOF
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+This system already has an account whose name is '$id_70' and ID number is 70.
+
+   '`id $id_70`'
+
+For PostgreSQL in this port or package, UID:GID of '${PGSQL_UID}' has to be 70:70.
+Please try again after you delete the account.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+EOF
+	exit 1
+    fi
+
+    # add an account of PostgreSQL to this system
+    echo ""
+    echo "You need a group '${PGSQL_GID}' whose ID number is 70"
+    if yesno "Would you like to create it automatically?" y; then
+	# We need a command 'pw(8)'
+	check_pw
+	pw groupadd ${PGSQL_GID} -g 70 || exit
+    else
+	echo "Please create it, and try again."
+	exit 1
+    fi
+    echo ""
+    echo "You need an account '${PGSQL_UID}' whose ID number is 70"
+    if yesno "Would you like to create it automatically?" y; then
+	# We need a command 'pw(8)'
+	check_pw
+	pw useradd ${PGSQL_UID} -u 70 -g ${PGSQL_GID} -h - -d /usr/local/${INSTALL_DIR} \
+		-s /bin/sh -c "PostgreSQL pseudo-user" || exit
+    else
+	echo "Please create it, and try again."
+	exit 1
+    fi
+    ;;
+esac
diff --git a/japanese/postgresql7/pkg-plist b/japanese/postgresql7/pkg-plist
index 7bb058674f8c..7e5f02270176 100644
--- a/japanese/postgresql7/pkg-plist
+++ b/japanese/postgresql7/pkg-plist
@@ -1,131 +1,130 @@
 etc/rc.d/pgsql.sh
 %%INSTALL_DIR%%/.profile
+%%INSTALL_DIR%%/bin/postgres
+%%INSTALL_DIR%%/bin/postmaster
+%%INSTALL_DIR%%/bin/ecpg
+%%INSTALL_DIR%%/bin/pg_id
+%%INSTALL_DIR%%/bin/pg_version
+%%INSTALL_DIR%%/bin/psql
+%%INSTALL_DIR%%/bin/pg_dump
+%%INSTALL_DIR%%/bin/pg_dumpall
+%%INSTALL_DIR%%/bin/pg_upgrade
+%%INSTALL_DIR%%/bin/pg_passwd
 %%INSTALL_DIR%%/bin/cleardbdir
 %%INSTALL_DIR%%/bin/createdb
 %%INSTALL_DIR%%/bin/createuser
 %%INSTALL_DIR%%/bin/destroydb
 %%INSTALL_DIR%%/bin/destroyuser
-%%INSTALL_DIR%%/bin/ecpg
 %%INSTALL_DIR%%/bin/initdb
 %%INSTALL_DIR%%/bin/initlocation
 %%INSTALL_DIR%%/bin/ipcclean
-%%INSTALL_DIR%%/bin/pg_dump
-%%INSTALL_DIR%%/bin/pg_dumpall
-%%INSTALL_DIR%%/bin/pg_id
-%%INSTALL_DIR%%/bin/pg_passwd
-%%INSTALL_DIR%%/bin/pg_version
-%%INSTALL_DIR%%/bin/postgres
-%%INSTALL_DIR%%/bin/postmaster
-%%INSTALL_DIR%%/bin/psql
-%%INSTALL_DIR%%/data/PG_VERSION
-%%INSTALL_DIR%%/data/base/template1/PG_VERSION
-%%INSTALL_DIR%%/data/base/template1/pg_aggregate
-%%INSTALL_DIR%%/data/base/template1/pg_am
-%%INSTALL_DIR%%/data/base/template1/pg_amop
-%%INSTALL_DIR%%/data/base/template1/pg_amproc
-%%INSTALL_DIR%%/data/base/template1/pg_attrdef
-%%INSTALL_DIR%%/data/base/template1/pg_attrdef_adrelid_index
+%%INSTALL_DIR%%/lib/global1.bki.source
+%%INSTALL_DIR%%/lib/global1.description
+%%INSTALL_DIR%%/lib/local1_template1.bki.source
+%%INSTALL_DIR%%/lib/local1_template1.description
+%%INSTALL_DIR%%/lib/pg_hba.conf.sample
+%%INSTALL_DIR%%/lib/pg_geqo.sample
+%%INSTALL_DIR%%/lib/libpq.a
+%%INSTALL_DIR%%/lib/libpq.so.2
+%%INSTALL_DIR%%/lib/libpq.so
+%%INSTALL_DIR%%/lib/libecpg.a
+%%INSTALL_DIR%%/lib/libecpg.so.2.6
+%%INSTALL_DIR%%/lib/libecpg.so
+%%INSTALL_DIR%%/lib/libpq++.a
+%%INSTALL_DIR%%/lib/libpq++.so.2
+%%INSTALL_DIR%%/lib/libpq++.so
+%%INSTALL_DIR%%/lib/plpgsql.so
+%%INSTALL_DIR%%/include/fmgr.h
+%%INSTALL_DIR%%/include/lib/dllist.h
+%%INSTALL_DIR%%/include/libpq/pqcomm.h
+%%INSTALL_DIR%%/include/libpq/libpq-fs.h
+%%INSTALL_DIR%%/include/utils/geo_decls.h
+%%INSTALL_DIR%%/include/utils/elog.h
+%%INSTALL_DIR%%/include/utils/palloc.h
+%%INSTALL_DIR%%/include/access/attnum.h
+%%INSTALL_DIR%%/include/executor/spi.h
+%%INSTALL_DIR%%/include/commands/trigger.h
+%%INSTALL_DIR%%/include/os.h
+%%INSTALL_DIR%%/include/config.h
+%%INSTALL_DIR%%/include/c.h
+%%INSTALL_DIR%%/include/postgres.h
+%%INSTALL_DIR%%/include/postgres_ext.h
+%%INSTALL_DIR%%/include/libpq-fe.h
+%%INSTALL_DIR%%/include/libpq-int.h
+%%INSTALL_DIR%%/include/ecpgerrno.h
+%%INSTALL_DIR%%/include/ecpglib.h
+%%INSTALL_DIR%%/include/ecpgtype.h
+%%INSTALL_DIR%%/include/sqlca.h
+%%INSTALL_DIR%%/include/libpq++/pgenv.h
+%%INSTALL_DIR%%/include/libpq++/pgconnection.h
+%%INSTALL_DIR%%/include/libpq++/pgdatabase.h
+%%INSTALL_DIR%%/include/libpq++/pgtransdb.h
+%%INSTALL_DIR%%/include/libpq++/pgcursordb.h
+%%INSTALL_DIR%%/include/libpq++/pglobject.h
+%%INSTALL_DIR%%/include/libpq++.h
+%%INSTALL_DIR%%/data/base/template1/pg_proc
+%%INSTALL_DIR%%/data/base/template1/pg_type
 %%INSTALL_DIR%%/data/base/template1/pg_attribute
-%%INSTALL_DIR%%/data/base/template1/pg_attribute_attrelid_index
-%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnam_index
-%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnum_index
 %%INSTALL_DIR%%/data/base/template1/pg_class
-%%INSTALL_DIR%%/data/base/template1/pg_class_oid_index
-%%INSTALL_DIR%%/data/base/template1/pg_class_relname_index
-%%INSTALL_DIR%%/data/base/template1/pg_description
-%%INSTALL_DIR%%/data/base/template1/pg_description_objoid_index
-%%INSTALL_DIR%%/data/base/template1/pg_index
-%%INSTALL_DIR%%/data/base/template1/pg_inheritproc
 %%INSTALL_DIR%%/data/base/template1/pg_inherits
-%%INSTALL_DIR%%/data/base/template1/pg_internal.init
-%%INSTALL_DIR%%/data/base/template1/pg_ipl
-%%INSTALL_DIR%%/data/base/template1/pg_language
-%%INSTALL_DIR%%/data/base/template1/pg_listener
-%%INSTALL_DIR%%/data/base/template1/pg_opclass
+%%INSTALL_DIR%%/data/base/template1/pg_index
+%%INSTALL_DIR%%/data/base/template1/pg_statistic
 %%INSTALL_DIR%%/data/base/template1/pg_operator
+%%INSTALL_DIR%%/data/base/template1/pg_opclass
+%%INSTALL_DIR%%/data/base/template1/pg_am
+%%INSTALL_DIR%%/data/base/template1/pg_amop
+%%INSTALL_DIR%%/data/base/template1/pg_amproc
+%%INSTALL_DIR%%/data/base/template1/pg_language
 %%INSTALL_DIR%%/data/base/template1/pg_parg
-%%INSTALL_DIR%%/data/base/template1/pg_proc
+%%INSTALL_DIR%%/data/base/template1/pg_aggregate
+%%INSTALL_DIR%%/data/base/template1/pg_ipl
+%%INSTALL_DIR%%/data/base/template1/pg_inheritproc
+%%INSTALL_DIR%%/data/base/template1/pg_rewrite
+%%INSTALL_DIR%%/data/base/template1/pg_listener
+%%INSTALL_DIR%%/data/base/template1/pg_description
+%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnam_index
+%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnum_index
+%%INSTALL_DIR%%/data/base/template1/pg_attribute_attrelid_index
 %%INSTALL_DIR%%/data/base/template1/pg_proc_oid_index
-%%INSTALL_DIR%%/data/base/template1/pg_proc_proname_index
+%%INSTALL_DIR%%/data/base/template1/pg_proc_proname_narg_type_index
 %%INSTALL_DIR%%/data/base/template1/pg_proc_prosrc_index
+%%INSTALL_DIR%%/data/base/template1/pg_type_oid_index
+%%INSTALL_DIR%%/data/base/template1/pg_type_typname_index
+%%INSTALL_DIR%%/data/base/template1/pg_class_oid_index
+%%INSTALL_DIR%%/data/base/template1/pg_class_relname_index
+%%INSTALL_DIR%%/data/base/template1/pg_attrdef
+%%INSTALL_DIR%%/data/base/template1/pg_attrdef_adrelid_index
 %%INSTALL_DIR%%/data/base/template1/pg_relcheck
 %%INSTALL_DIR%%/data/base/template1/pg_relcheck_rcrelid_index
-%%INSTALL_DIR%%/data/base/template1/pg_rewrite
-%%INSTALL_DIR%%/data/base/template1/pg_statistic
 %%INSTALL_DIR%%/data/base/template1/pg_trigger
 %%INSTALL_DIR%%/data/base/template1/pg_trigger_tgrelid_index
-%%INSTALL_DIR%%/data/base/template1/pg_type
-%%INSTALL_DIR%%/data/base/template1/pg_type_oid_index
-%%INSTALL_DIR%%/data/base/template1/pg_type_typname_index
+%%INSTALL_DIR%%/data/base/template1/pg_description_objoid_index
+%%INSTALL_DIR%%/data/base/template1/PG_VERSION
+%%INSTALL_DIR%%/data/base/template1/pg_internal.init
 %%INSTALL_DIR%%/data/base/template1/pg_user
-%%INSTALL_DIR%%/data/base/template1/pg_version
+%%INSTALL_DIR%%/data/base/template1/pg_rules
+%%INSTALL_DIR%%/data/base/template1/pg_views
+%%INSTALL_DIR%%/data/base/template1/pg_tables
+%%INSTALL_DIR%%/data/base/template1/pg_indexes
+%%INSTALL_DIR%%/data/pg_variable
 %%INSTALL_DIR%%/data/pg_database
-%%INSTALL_DIR%%/data/pg_geqo.sample
+%%INSTALL_DIR%%/data/pg_shadow
 %%INSTALL_DIR%%/data/pg_group
-%%INSTALL_DIR%%/data/pg_hba.conf
 %%INSTALL_DIR%%/data/pg_log
+%%INSTALL_DIR%%/data/PG_VERSION
+%%INSTALL_DIR%%/data/pg_hba.conf
+%%INSTALL_DIR%%/data/pg_geqo.sample
 %%INSTALL_DIR%%/data/pg_pwd
-%%INSTALL_DIR%%/data/pg_shadow
-%%INSTALL_DIR%%/data/pg_variable
-%%INSTALL_DIR%%/include/access/attnum.h
-%%INSTALL_DIR%%/include/c.h
-%%INSTALL_DIR%%/include/commands/trigger.h
-%%INSTALL_DIR%%/include/config.h
-%%INSTALL_DIR%%/include/ecpglib.h
-%%INSTALL_DIR%%/include/ecpgtype.h
-%%INSTALL_DIR%%/include/executor/spi.h
-%%INSTALL_DIR%%/include/fmgr.h
-%%INSTALL_DIR%%/include/lib/dllist.h
-%%INSTALL_DIR%%/include/libpq-fe.h
-%%INSTALL_DIR%%/include/libpq/libpq-fs.h
-%%INSTALL_DIR%%/include/libpq/pqcomm.h
-%%INSTALL_DIR%%/include/os.h
-%%INSTALL_DIR%%/include/postgres.h
-%%INSTALL_DIR%%/include/postgres_ext.h
-%%INSTALL_DIR%%/include/sqlca.h
-%%INSTALL_DIR%%/include/utils/elog.h
-%%INSTALL_DIR%%/include/utils/geo_decls.h
-%%INSTALL_DIR%%/include/utils/palloc.h
-%%INSTALL_DIR%%/lib/global1.bki.source
-%%INSTALL_DIR%%/lib/global1.description
-%%INSTALL_DIR%%/lib/libecpg.a
-%%INSTALL_DIR%%/lib/libecpg.so
-%%INSTALL_DIR%%/lib/libecpg.so.1.1
-%%INSTALL_DIR%%/lib/libpq.a
-%%INSTALL_DIR%%/lib/libpq.so
-%%INSTALL_DIR%%/lib/libpq.so.1.1
-%%INSTALL_DIR%%/lib/local1_template1.bki.source
-%%INSTALL_DIR%%/lib/local1_template1.description
-%%INSTALL_DIR%%/lib/pg_geqo.sample
-%%INSTALL_DIR%%/lib/pg_hba.conf.sample
 %%INSTALL_DIR%%/post-install-notes
-share/doc/%%INSTALL_DIR%%/FAQ
-share/doc/%%INSTALL_DIR%%/FAQ_FreeBSD
-share/doc/%%INSTALL_DIR%%/FAQ_Irix
-share/doc/%%INSTALL_DIR%%/FAQ_Linux
-share/doc/%%INSTALL_DIR%%/Makefile
-share/doc/%%INSTALL_DIR%%/README.GEQO
-share/doc/%%INSTALL_DIR%%/README.fsync
-share/doc/%%INSTALL_DIR%%/README.mb
-share/doc/%%INSTALL_DIR%%/README.mb.jp
-share/doc/%%INSTALL_DIR%%/README.support
-share/doc/%%INSTALL_DIR%%/TODO
-share/doc/%%INSTALL_DIR%%/TODO.GEQO
-share/doc/%%INSTALL_DIR%%/admin.ps.gz
-share/doc/%%INSTALL_DIR%%/admin.tar.gz
-share/doc/%%INSTALL_DIR%%/bug.template
-share/doc/%%INSTALL_DIR%%/postgres.tar.gz
-share/doc/%%INSTALL_DIR%%/programmer.ps.gz
-share/doc/%%INSTALL_DIR%%/programmer.tar.gz
-share/doc/%%INSTALL_DIR%%/src/Makefile
-share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.gif
+share/doc/%%INSTALL_DIR%%/src/graphics/connections.ag
 share/doc/%%INSTALL_DIR%%/src/graphics/clientserver.ag
 share/doc/%%INSTALL_DIR%%/src/graphics/clientserver.gif
-share/doc/%%INSTALL_DIR%%/src/graphics/connections.ag
+share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.gif
 share/doc/%%INSTALL_DIR%%/src/graphics/connections.gif
 share/doc/%%INSTALL_DIR%%/src/graphics/layout.ag
 share/doc/%%INSTALL_DIR%%/src/graphics/layout.gif
-share/doc/%%INSTALL_DIR%%/src/sgml/Makefile
+share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.ps
+share/doc/%%INSTALL_DIR%%/src/sgml/xtypes.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/admin.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/advanced.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/arch-dev.sgml
@@ -145,9 +144,9 @@ share/doc/%%INSTALL_DIR%%/src/sgml/func-ref.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/geqo.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/gist.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/inherit.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/intro.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/install.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/intro-pg.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/intro.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/jdbc.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/libpgtcl.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/libpq.sgml
@@ -177,13 +176,130 @@ share/doc/%%INSTALL_DIR%%/src/sgml/xaggr.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/xfunc.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/xindex.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/xoper.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/xtypes.sgml
-share/doc/%%INSTALL_DIR%%/tutorial.ps.gz
-share/doc/%%INSTALL_DIR%%/tutorial.tar.gz
-share/doc/%%INSTALL_DIR%%/user.ps.gz
+share/doc/%%INSTALL_DIR%%/src/sgml/Makefile
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/vacuum.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/allfiles.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/alter_table.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/alter_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/begin.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/close.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/cluster.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/commands.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/commit.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/copy.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_aggregate.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_database.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_function.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_index.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_language.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_operator.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_rule.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_sequence.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_table.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_trigger.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_type.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_view.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/createdb.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/createuser.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_date.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_time.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_timestamp.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/declare.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/delete.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/destroydb.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/destroyuser.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_aggregate.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_database.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_index.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_function.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_language.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_operator.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_rule.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_sequence.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_table.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_trigger.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_type.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_view.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/explain.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/fetch.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/grant.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/initdb.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/initlocation.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/insert.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/listen.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/load.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/lock.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/move.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/notify.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/reset.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/pg_dump.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/pg_dumpall.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/pg_upgrade.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/psql-ref.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/revoke.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/rollback.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/select.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/set.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/show.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/unlisten.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/update.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/abort.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/about.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/bki.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/config.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/current.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/oper.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/func.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/history.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/indices.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/info.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/installation.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/intro-ag.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/keys.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/legal.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/libpq++.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/notation.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/page.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/pg_options.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/reference.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/runtime.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/security.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/signals.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/syntax.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/typeconv.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/xplang.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/y2k.sgml
+share/doc/%%INSTALL_DIR%%/src/Makefile
 share/doc/%%INSTALL_DIR%%/user.tar.gz
-share/doc/%%INSTALL_DIR%%/userguide.ps
+share/doc/%%INSTALL_DIR%%/user.ps.gz
+share/doc/%%INSTALL_DIR%%/tutorial.tar.gz
+share/doc/%%INSTALL_DIR%%/tutorial.ps.gz
+share/doc/%%INSTALL_DIR%%/programmer.tar.gz
+share/doc/%%INSTALL_DIR%%/programmer.ps.gz
+share/doc/%%INSTALL_DIR%%/postgres.tar.gz
+share/doc/%%INSTALL_DIR%%/bug.template
+share/doc/%%INSTALL_DIR%%/admin.tar.gz
+share/doc/%%INSTALL_DIR%%/admin.ps.gz
+share/doc/%%INSTALL_DIR%%/TODO
+share/doc/%%INSTALL_DIR%%/README.mb.jp
+share/doc/%%INSTALL_DIR%%/README.mb
+share/doc/%%INSTALL_DIR%%/README.fsync
+share/doc/%%INSTALL_DIR%%/Makefile
+share/doc/%%INSTALL_DIR%%/FAQ_Linux
+share/doc/%%INSTALL_DIR%%/FAQ_Irix
+share/doc/%%INSTALL_DIR%%/FAQ_FreeBSD
+share/doc/%%INSTALL_DIR%%/FAQ
+share/doc/%%INSTALL_DIR%%/README.locale
+share/doc/%%INSTALL_DIR%%/README.inet
+share/doc/%%INSTALL_DIR%%/FAQ_DEV
+share/doc/%%INSTALL_DIR%%/FAQ_CVS
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @dirrm share/doc/%%INSTALL_DIR%%/src/graphics
+@dirrm share/doc/%%INSTALL_DIR%%/src/sgml/ref
 @dirrm share/doc/%%INSTALL_DIR%%/src/sgml
 @dirrm share/doc/%%INSTALL_DIR%%/src
 @dirrm share/doc/%%INSTALL_DIR%%
@@ -191,20 +307,21 @@ share/doc/%%INSTALL_DIR%%/userguide.ps
 @dirrm %%INSTALL_DIR%%/data/base/template1
 @dirrm %%INSTALL_DIR%%/data/base
 @dirrm %%INSTALL_DIR%%/data
-@dirrm %%INSTALL_DIR%%/include/access
-@dirrm %%INSTALL_DIR%%/include/commands
-@dirrm %%INSTALL_DIR%%/include/executor
-@dirrm %%INSTALL_DIR%%/include/include
-@dirrm %%INSTALL_DIR%%/include/lib
+@dirrm %%INSTALL_DIR%%/include/utils
+@dirrm %%INSTALL_DIR%%/include/libpq++
 @dirrm %%INSTALL_DIR%%/include/libpq
-@dirrm %%INSTALL_DIR%%/include/port/bsd
+@dirrm %%INSTALL_DIR%%/include/lib
+@exec mkdir -p %D/%%INSTALL_DIR%%/include/port/freebsd
+@dirrm %%INSTALL_DIR%%/include/port/freebsd
 @dirrm %%INSTALL_DIR%%/include/port
-@dirrm %%INSTALL_DIR%%/include/utils
+@dirrm %%INSTALL_DIR%%/include/executor
+@dirrm %%INSTALL_DIR%%/include/commands
+@dirrm %%INSTALL_DIR%%/include/access
 @dirrm %%INSTALL_DIR%%/include
 @dirrm %%INSTALL_DIR%%/lib
-@dirrm %%INSTALL_DIR%%/man/man1
-@dirrm %%INSTALL_DIR%%/man/man3
-@dirrm %%INSTALL_DIR%%/man/man5
 @dirrm %%INSTALL_DIR%%/man/manl
+@dirrm %%INSTALL_DIR%%/man/man5
+@dirrm %%INSTALL_DIR%%/man/man3
+@dirrm %%INSTALL_DIR%%/man/man1
 @dirrm %%INSTALL_DIR%%/man
 @dirrm %%INSTALL_DIR%%
diff --git a/japanese/postgresql7/pkg-plist.tcl b/japanese/postgresql7/pkg-plist.tcl
index 4f5184ce3ec3..602ebba8399e 100644
--- a/japanese/postgresql7/pkg-plist.tcl
+++ b/japanese/postgresql7/pkg-plist.tcl
@@ -1,137 +1,170 @@
 etc/rc.d/pgsql.sh
 %%INSTALL_DIR%%/.profile
+%%INSTALL_DIR%%/bin
+%%INSTALL_DIR%%/bin/postgres
+%%INSTALL_DIR%%/bin/postmaster
+%%INSTALL_DIR%%/bin/ecpg
+%%INSTALL_DIR%%/bin/pg_id
+%%INSTALL_DIR%%/bin/pg_version
+%%INSTALL_DIR%%/bin/psql
+%%INSTALL_DIR%%/bin/pg_dump
+%%INSTALL_DIR%%/bin/pg_dumpall
+%%INSTALL_DIR%%/bin/pg_upgrade
+%%INSTALL_DIR%%/bin/pg_passwd
 %%INSTALL_DIR%%/bin/cleardbdir
 %%INSTALL_DIR%%/bin/createdb
 %%INSTALL_DIR%%/bin/createuser
 %%INSTALL_DIR%%/bin/destroydb
 %%INSTALL_DIR%%/bin/destroyuser
-%%INSTALL_DIR%%/bin/ecpg
 %%INSTALL_DIR%%/bin/initdb
 %%INSTALL_DIR%%/bin/initlocation
 %%INSTALL_DIR%%/bin/ipcclean
-%%INSTALL_DIR%%/bin/pg_dump
-%%INSTALL_DIR%%/bin/pg_dumpall
-%%INSTALL_DIR%%/bin/pg_id
-%%INSTALL_DIR%%/bin/pg_passwd
-%%INSTALL_DIR%%/bin/pg_version
+%%INSTALL_DIR%%/bin/pg_encoding
 %%INSTALL_DIR%%/bin/pgtclsh
 %%INSTALL_DIR%%/bin/pgtksh
-%%INSTALL_DIR%%/bin/postgres
-%%INSTALL_DIR%%/bin/postmaster
-%%INSTALL_DIR%%/bin/psql
-%%INSTALL_DIR%%/data/PG_VERSION
-%%INSTALL_DIR%%/data/base/template1/PG_VERSION
-%%INSTALL_DIR%%/data/base/template1/pg_aggregate
-%%INSTALL_DIR%%/data/base/template1/pg_am
-%%INSTALL_DIR%%/data/base/template1/pg_amop
-%%INSTALL_DIR%%/data/base/template1/pg_amproc
-%%INSTALL_DIR%%/data/base/template1/pg_attrdef
-%%INSTALL_DIR%%/data/base/template1/pg_attrdef_adrelid_index
+%%INSTALL_DIR%%/lib
+%%INSTALL_DIR%%/lib/global1.bki.source
+%%INSTALL_DIR%%/lib/global1.description
+%%INSTALL_DIR%%/lib/local1_template1.bki.source
+%%INSTALL_DIR%%/lib/local1_template1.description
+%%INSTALL_DIR%%/lib/pg_hba.conf.sample
+%%INSTALL_DIR%%/lib/pg_geqo.sample
+%%INSTALL_DIR%%/lib/libpq.a
+%%INSTALL_DIR%%/lib/libpq.so.2.0
+%%INSTALL_DIR%%/lib/libpq.so.2
+%%INSTALL_DIR%%/lib/libpq.so
+%%INSTALL_DIR%%/lib/libecpg.a
+%%INSTALL_DIR%%/lib/libecpg.so.2.6.2
+%%INSTALL_DIR%%/lib/libecpg.so.2
+%%INSTALL_DIR%%/lib/libecpg.so
+%%INSTALL_DIR%%/lib/libpq++.a
+%%INSTALL_DIR%%/lib/libpq++.so.2.0
+%%INSTALL_DIR%%/lib/libpq++.so.2
+%%INSTALL_DIR%%/lib/libpq++.so
+%%INSTALL_DIR%%/lib/libpgtcl.a
+%%INSTALL_DIR%%/lib/libpgtcl.so.2.0
+%%INSTALL_DIR%%/lib/libpgtcl.so.2
+%%INSTALL_DIR%%/lib/libpgtcl.so
+%%INSTALL_DIR%%/lib/libpsqlodbc.a
+%%INSTALL_DIR%%/lib/libpsqlodbc.so.0.25
+%%INSTALL_DIR%%/lib/libpsqlodbc.so.0
+%%INSTALL_DIR%%/lib/libpsqlodbc.so
+%%INSTALL_DIR%%/lib/plpgsql.so
+%%INSTALL_DIR%%/lib/pltcl.so
+%%INSTALL_DIR%%/include
+%%INSTALL_DIR%%/include/fmgr.h
+%%INSTALL_DIR%%/include/port
+%%INSTALL_DIR%%/include/port/freebsd
+%%INSTALL_DIR%%/include/lib
+%%INSTALL_DIR%%/include/lib/dllist.h
+%%INSTALL_DIR%%/include/libpq
+%%INSTALL_DIR%%/include/libpq/pqcomm.h
+%%INSTALL_DIR%%/include/libpq/libpq-fs.h
+%%INSTALL_DIR%%/include/utils
+%%INSTALL_DIR%%/include/utils/geo_decls.h
+%%INSTALL_DIR%%/include/utils/elog.h
+%%INSTALL_DIR%%/include/utils/palloc.h
+%%INSTALL_DIR%%/include/access
+%%INSTALL_DIR%%/include/access/attnum.h
+%%INSTALL_DIR%%/include/executor
+%%INSTALL_DIR%%/include/executor/spi.h
+%%INSTALL_DIR%%/include/commands
+%%INSTALL_DIR%%/include/commands/trigger.h
+%%INSTALL_DIR%%/include/os.h
+%%INSTALL_DIR%%/include/config.h
+%%INSTALL_DIR%%/include/c.h
+%%INSTALL_DIR%%/include/postgres.h
+%%INSTALL_DIR%%/include/postgres_ext.h
+%%INSTALL_DIR%%/include/libpq-fe.h
+%%INSTALL_DIR%%/include/libpq-int.h
+%%INSTALL_DIR%%/include/ecpgerrno.h
+%%INSTALL_DIR%%/include/ecpglib.h
+%%INSTALL_DIR%%/include/ecpgtype.h
+%%INSTALL_DIR%%/include/sqlca.h
+%%INSTALL_DIR%%/include/libpq++
+%%INSTALL_DIR%%/include/libpq++/pgenv.h
+%%INSTALL_DIR%%/include/libpq++/pgconnection.h
+%%INSTALL_DIR%%/include/libpq++/pgdatabase.h
+%%INSTALL_DIR%%/include/libpq++/pgtransdb.h
+%%INSTALL_DIR%%/include/libpq++/pgcursordb.h
+%%INSTALL_DIR%%/include/libpq++/pglobject.h
+%%INSTALL_DIR%%/include/libpq++.h
+%%INSTALL_DIR%%/include/libpgtcl.h
+%%INSTALL_DIR%%/include/iodbc
+%%INSTALL_DIR%%/include/iodbc/iodbc.h
+%%INSTALL_DIR%%/include/iodbc/isql.h
+%%INSTALL_DIR%%/include/iodbc/isqlext.h
+%%INSTALL_DIR%%/odbcinst.ini
+%%INSTALL_DIR%%/data
+%%INSTALL_DIR%%/data/base
+%%INSTALL_DIR%%/data/base/template1
+%%INSTALL_DIR%%/data/base/template1/pg_proc
+%%INSTALL_DIR%%/data/base/template1/pg_type
 %%INSTALL_DIR%%/data/base/template1/pg_attribute
-%%INSTALL_DIR%%/data/base/template1/pg_attribute_attrelid_index
-%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnam_index
-%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnum_index
 %%INSTALL_DIR%%/data/base/template1/pg_class
-%%INSTALL_DIR%%/data/base/template1/pg_class_oid_index
-%%INSTALL_DIR%%/data/base/template1/pg_class_relname_index
-%%INSTALL_DIR%%/data/base/template1/pg_description
-%%INSTALL_DIR%%/data/base/template1/pg_description_objoid_index
-%%INSTALL_DIR%%/data/base/template1/pg_index
-%%INSTALL_DIR%%/data/base/template1/pg_inheritproc
 %%INSTALL_DIR%%/data/base/template1/pg_inherits
-%%INSTALL_DIR%%/data/base/template1/pg_internal.init
-%%INSTALL_DIR%%/data/base/template1/pg_ipl
-%%INSTALL_DIR%%/data/base/template1/pg_language
-%%INSTALL_DIR%%/data/base/template1/pg_listener
-%%INSTALL_DIR%%/data/base/template1/pg_opclass
+%%INSTALL_DIR%%/data/base/template1/pg_index
+%%INSTALL_DIR%%/data/base/template1/pg_statistic
 %%INSTALL_DIR%%/data/base/template1/pg_operator
+%%INSTALL_DIR%%/data/base/template1/pg_opclass
+%%INSTALL_DIR%%/data/base/template1/pg_am
+%%INSTALL_DIR%%/data/base/template1/pg_amop
+%%INSTALL_DIR%%/data/base/template1/pg_amproc
+%%INSTALL_DIR%%/data/base/template1/pg_language
 %%INSTALL_DIR%%/data/base/template1/pg_parg
-%%INSTALL_DIR%%/data/base/template1/pg_proc
+%%INSTALL_DIR%%/data/base/template1/pg_aggregate
+%%INSTALL_DIR%%/data/base/template1/pg_ipl
+%%INSTALL_DIR%%/data/base/template1/pg_inheritproc
+%%INSTALL_DIR%%/data/base/template1/pg_rewrite
+%%INSTALL_DIR%%/data/base/template1/pg_listener
+%%INSTALL_DIR%%/data/base/template1/pg_description
+%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnam_index
+%%INSTALL_DIR%%/data/base/template1/pg_attribute_relid_attnum_index
+%%INSTALL_DIR%%/data/base/template1/pg_attribute_attrelid_index
 %%INSTALL_DIR%%/data/base/template1/pg_proc_oid_index
-%%INSTALL_DIR%%/data/base/template1/pg_proc_proname_index
+%%INSTALL_DIR%%/data/base/template1/pg_proc_proname_narg_type_index
 %%INSTALL_DIR%%/data/base/template1/pg_proc_prosrc_index
+%%INSTALL_DIR%%/data/base/template1/pg_type_oid_index
+%%INSTALL_DIR%%/data/base/template1/pg_type_typname_index
+%%INSTALL_DIR%%/data/base/template1/pg_class_oid_index
+%%INSTALL_DIR%%/data/base/template1/pg_class_relname_index
+%%INSTALL_DIR%%/data/base/template1/pg_attrdef
+%%INSTALL_DIR%%/data/base/template1/pg_attrdef_adrelid_index
 %%INSTALL_DIR%%/data/base/template1/pg_relcheck
 %%INSTALL_DIR%%/data/base/template1/pg_relcheck_rcrelid_index
-%%INSTALL_DIR%%/data/base/template1/pg_rewrite
-%%INSTALL_DIR%%/data/base/template1/pg_statistic
 %%INSTALL_DIR%%/data/base/template1/pg_trigger
 %%INSTALL_DIR%%/data/base/template1/pg_trigger_tgrelid_index
-%%INSTALL_DIR%%/data/base/template1/pg_type
-%%INSTALL_DIR%%/data/base/template1/pg_type_oid_index
-%%INSTALL_DIR%%/data/base/template1/pg_type_typname_index
+%%INSTALL_DIR%%/data/base/template1/pg_description_objoid_index
+%%INSTALL_DIR%%/data/base/template1/PG_VERSION
+%%INSTALL_DIR%%/data/base/template1/pg_internal.init
 %%INSTALL_DIR%%/data/base/template1/pg_user
-%%INSTALL_DIR%%/data/base/template1/pg_version
+%%INSTALL_DIR%%/data/base/template1/pg_rules
+%%INSTALL_DIR%%/data/base/template1/pg_views
+%%INSTALL_DIR%%/data/base/template1/pg_tables
+%%INSTALL_DIR%%/data/base/template1/pg_indexes
+%%INSTALL_DIR%%/data/pg_variable
 %%INSTALL_DIR%%/data/pg_database
-%%INSTALL_DIR%%/data/pg_geqo.sample
+%%INSTALL_DIR%%/data/pg_shadow
 %%INSTALL_DIR%%/data/pg_group
-%%INSTALL_DIR%%/data/pg_hba.conf
 %%INSTALL_DIR%%/data/pg_log
+%%INSTALL_DIR%%/data/PG_VERSION
+%%INSTALL_DIR%%/data/pg_hba.conf
+%%INSTALL_DIR%%/data/pg_geqo.sample
 %%INSTALL_DIR%%/data/pg_pwd
-%%INSTALL_DIR%%/data/pg_shadow
-%%INSTALL_DIR%%/data/pg_variable
-%%INSTALL_DIR%%/include/access/attnum.h
-%%INSTALL_DIR%%/include/c.h
-%%INSTALL_DIR%%/include/commands/trigger.h
-%%INSTALL_DIR%%/include/config.h
-%%INSTALL_DIR%%/include/ecpglib.h
-%%INSTALL_DIR%%/include/ecpgtype.h
-%%INSTALL_DIR%%/include/executor/spi.h
-%%INSTALL_DIR%%/include/fmgr.h
-%%INSTALL_DIR%%/include/lib/dllist.h
-%%INSTALL_DIR%%/include/libpgtcl.h
-%%INSTALL_DIR%%/include/libpq-fe.h
-%%INSTALL_DIR%%/include/libpq/libpq-fs.h
-%%INSTALL_DIR%%/include/libpq/pqcomm.h
-%%INSTALL_DIR%%/include/os.h
-%%INSTALL_DIR%%/include/postgres.h
-%%INSTALL_DIR%%/include/postgres_ext.h
-%%INSTALL_DIR%%/include/sqlca.h
-%%INSTALL_DIR%%/include/utils/elog.h
-%%INSTALL_DIR%%/include/utils/geo_decls.h
-%%INSTALL_DIR%%/include/utils/palloc.h
-%%INSTALL_DIR%%/lib/global1.bki.source
-%%INSTALL_DIR%%/lib/global1.description
-%%INSTALL_DIR%%/lib/libecpg.a
-%%INSTALL_DIR%%/lib/libecpg.so
-%%INSTALL_DIR%%/lib/libecpg.so.1.1
-%%INSTALL_DIR%%/lib/libpgtcl.a
-%%INSTALL_DIR%%/lib/libpgtcl.so
-%%INSTALL_DIR%%/lib/libpgtcl.so.1.0
-%%INSTALL_DIR%%/lib/libpq.a
-%%INSTALL_DIR%%/lib/libpq.so
-%%INSTALL_DIR%%/lib/libpq.so.1.1
-%%INSTALL_DIR%%/lib/local1_template1.bki.source
-%%INSTALL_DIR%%/lib/local1_template1.description
-%%INSTALL_DIR%%/lib/pg_geqo.sample
-%%INSTALL_DIR%%/lib/pg_hba.conf.sample
 %%INSTALL_DIR%%/post-install-notes
-share/doc/%%INSTALL_DIR%%/FAQ
-share/doc/%%INSTALL_DIR%%/FAQ_FreeBSD
-share/doc/%%INSTALL_DIR%%/FAQ_Irix
-share/doc/%%INSTALL_DIR%%/FAQ_Linux
-share/doc/%%INSTALL_DIR%%/Makefile
-share/doc/%%INSTALL_DIR%%/README.GEQO
-share/doc/%%INSTALL_DIR%%/README.fsync
-share/doc/%%INSTALL_DIR%%/README.mb
-share/doc/%%INSTALL_DIR%%/README.mb.jp
-share/doc/%%INSTALL_DIR%%/README.support
-share/doc/%%INSTALL_DIR%%/TODO
-share/doc/%%INSTALL_DIR%%/TODO.GEQO
-share/doc/%%INSTALL_DIR%%/admin.ps.gz
-share/doc/%%INSTALL_DIR%%/admin.tar.gz
-share/doc/%%INSTALL_DIR%%/bug.template
-share/doc/%%INSTALL_DIR%%/postgres.tar.gz
-share/doc/%%INSTALL_DIR%%/programmer.ps.gz
-share/doc/%%INSTALL_DIR%%/programmer.tar.gz
-share/doc/%%INSTALL_DIR%%/src/Makefile
-share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.gif
+share/doc/%%INSTALL_DIR%%/
+share/doc/%%INSTALL_DIR%%/src
+share/doc/%%INSTALL_DIR%%/src/graphics
+share/doc/%%INSTALL_DIR%%/src/graphics/connections.ag
 share/doc/%%INSTALL_DIR%%/src/graphics/clientserver.ag
 share/doc/%%INSTALL_DIR%%/src/graphics/clientserver.gif
-share/doc/%%INSTALL_DIR%%/src/graphics/connections.ag
+share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.gif
 share/doc/%%INSTALL_DIR%%/src/graphics/connections.gif
 share/doc/%%INSTALL_DIR%%/src/graphics/layout.ag
 share/doc/%%INSTALL_DIR%%/src/graphics/layout.gif
-share/doc/%%INSTALL_DIR%%/src/sgml/Makefile
+share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.ps
+share/doc/%%INSTALL_DIR%%/src/sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/xtypes.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/admin.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/advanced.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/arch-dev.sgml
@@ -151,9 +184,9 @@ share/doc/%%INSTALL_DIR%%/src/sgml/func-ref.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/geqo.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/gist.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/inherit.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/intro.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/install.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/intro-pg.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/intro.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/jdbc.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/libpgtcl.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/libpq.sgml
@@ -183,13 +216,135 @@ share/doc/%%INSTALL_DIR%%/src/sgml/xaggr.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/xfunc.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/xindex.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/xoper.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/xtypes.sgml
-share/doc/%%INSTALL_DIR%%/tutorial.ps.gz
-share/doc/%%INSTALL_DIR%%/tutorial.tar.gz
-share/doc/%%INSTALL_DIR%%/user.ps.gz
+share/doc/%%INSTALL_DIR%%/src/sgml/Makefile
+share/doc/%%INSTALL_DIR%%/src/sgml/ref
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/vacuum.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/allfiles.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/alter_table.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/alter_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/begin.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/close.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/cluster.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/commands.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/commit.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/copy.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_aggregate.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_database.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_function.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_index.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_language.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_operator.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_rule.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_sequence.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_table.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_trigger.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_type.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/create_view.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/createdb.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/createuser.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_date.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_time.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_timestamp.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/current_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/declare.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/delete.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/destroydb.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/destroyuser.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_aggregate.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_database.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_index.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_function.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_language.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_operator.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_rule.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_sequence.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_table.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_trigger.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_type.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_user.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/drop_view.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/explain.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/fetch.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/grant.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/initdb.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/initlocation.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/insert.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/listen.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/load.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/lock.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/move.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/notify.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/reset.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/pg_dump.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/pg_dumpall.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/pg_upgrade.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/psql-ref.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/revoke.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/rollback.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/select.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/set.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/show.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/unlisten.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/update.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/abort.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/about.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/bki.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/config.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/current.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/oper.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/func.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/history.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/indices.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/info.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/installation.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/intro-ag.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/keys.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/legal.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/libpq++.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/notation.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/page.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/pg_options.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/reference.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/runtime.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/security.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/signals.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/syntax.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/typeconv.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/xplang.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/y2k.sgml
+share/doc/%%INSTALL_DIR%%/src/Makefile
 share/doc/%%INSTALL_DIR%%/user.tar.gz
+share/doc/%%INSTALL_DIR%%/user.ps.gz
+share/doc/%%INSTALL_DIR%%/tutorial.tar.gz
+share/doc/%%INSTALL_DIR%%/tutorial.ps.gz
+share/doc/%%INSTALL_DIR%%/programmer.tar.gz
+share/doc/%%INSTALL_DIR%%/programmer.ps.gz
+share/doc/%%INSTALL_DIR%%/postgres.tar.gz
+share/doc/%%INSTALL_DIR%%/bug.template
+share/doc/%%INSTALL_DIR%%/admin.tar.gz
+share/doc/%%INSTALL_DIR%%/admin.ps.gz
+share/doc/%%INSTALL_DIR%%/TODO.GEQO
+share/doc/%%INSTALL_DIR%%/TODO
+share/doc/%%INSTALL_DIR%%/README.support
+share/doc/%%INSTALL_DIR%%/README.mb.jp
+share/doc/%%INSTALL_DIR%%/README.mb
+share/doc/%%INSTALL_DIR%%/README.fsync
+share/doc/%%INSTALL_DIR%%/README.GEQO
+share/doc/%%INSTALL_DIR%%/Makefile
+share/doc/%%INSTALL_DIR%%/FAQ_Linux
+share/doc/%%INSTALL_DIR%%/FAQ_Irix
+share/doc/%%INSTALL_DIR%%/FAQ_FreeBSD
+share/doc/%%INSTALL_DIR%%/FAQ
 share/doc/%%INSTALL_DIR%%/userguide.ps
+share/doc/%%INSTALL_DIR%%/README.locale
+share/doc/%%INSTALL_DIR%%/README.inet
+share/doc/%%INSTALL_DIR%%/FAQ_DEV
+share/doc/%%INSTALL_DIR%%/FAQ_CVS
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @dirrm share/doc/%%INSTALL_DIR%%/src/graphics
+@dirrm share/doc/%%INSTALL_DIR%%/src/sgml/ref
 @dirrm share/doc/%%INSTALL_DIR%%/src/sgml
 @dirrm share/doc/%%INSTALL_DIR%%/src
 @dirrm share/doc/%%INSTALL_DIR%%
@@ -197,20 +352,21 @@ share/doc/%%INSTALL_DIR%%/userguide.ps
 @dirrm %%INSTALL_DIR%%/data/base/template1
 @dirrm %%INSTALL_DIR%%/data/base
 @dirrm %%INSTALL_DIR%%/data
-@dirrm %%INSTALL_DIR%%/include/access
-@dirrm %%INSTALL_DIR%%/include/commands
-@dirrm %%INSTALL_DIR%%/include/executor
-@dirrm %%INSTALL_DIR%%/include/include
-@dirrm %%INSTALL_DIR%%/include/lib
-@dirrm %%INSTALL_DIR%%/include/libpq
-@dirrm %%INSTALL_DIR%%/include/port/bsd
-@dirrm %%INSTALL_DIR%%/include/port
 @dirrm %%INSTALL_DIR%%/include/utils
+@dirrm %%INSTALL_DIR%%/include/port/freebsd
+@dirrm %%INSTALL_DIR%%/include/port
+@dirrm %%INSTALL_DIR%%/include/libpq++
+@dirrm %%INSTALL_DIR%%/include/libpq
+@dirrm %%INSTALL_DIR%%/include/lib
+@dirrm %%INSTALL_DIR%%/include/executor
+@dirrm %%INSTALL_DIR%%/include/commands
+@dirrm %%INSTALL_DIR%%/include/access
 @dirrm %%INSTALL_DIR%%/include
 @dirrm %%INSTALL_DIR%%/lib
-@dirrm %%INSTALL_DIR%%/man/man1
-@dirrm %%INSTALL_DIR%%/man/man3
-@dirrm %%INSTALL_DIR%%/man/man5
 @dirrm %%INSTALL_DIR%%/man/manl
+@dirrm %%INSTALL_DIR%%/man/man5
+@dirrm %%INSTALL_DIR%%/man/man3
+@dirrm %%INSTALL_DIR%%/man/man1
 @dirrm %%INSTALL_DIR%%/man
 @dirrm %%INSTALL_DIR%%
+@dirrm pgsql