Update to v6.5.3.

Submitted by:	Ichiro Fukuhara <ichiro@ichiro.org> (maintainer)
PR:		ports/14809

13 files changed, 412 insertions, 572 deletions

diff --git a/japanese/postgresql/Makefile b/japanese/postgresql/Makefile
index 035eead35514..e1744ae85765 100644
--- a/japanese/postgresql/Makefile
+++ b/japanese/postgresql/Makefile
@@ -1,34 +1,33 @@
 # New ports collection makefile for:	PostgreSQL-j
-# Version required:	6.4.2+Multibyte-patch
-# Date created:		25 Nov 1998
+# Version required:	6.5.3
+# Date created:		09 Nov 1999
 # Whom:			Ichiro Fukuhara <ichiro@ichiro.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	postgresql-6.4.2
-PKGNAME=	ja-postgresql-6.4.2
+DISTNAME=	postgresql-6.5.3
+PKGNAME=	ja-postgresql-6.5.3
 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.4.2/
-
-PATCH_SITES=	ftp://ftp.sra.co.jp/pub/cmd/postgres/6.4.2/patches/
-PATCHFILES=	jumbo-990217.patch.gz
+		ftp://ftp.sra.co.jp/pub/cmd/postgres/6.5.3/
 
 MAINTAINER=	ichiro@ichiro.org
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
-PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} --forward --quiet -E -p1
-PLISTS=		PLIST
+PLISTS=
 
 # 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)
 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"
+MAKE_ENV=	USE_TCL=true USE_TK=true TCL_INCDIR=${TCL_INCDIR}
+WITH_TCL=	--with-tcl
+WITH_TK=	--with-tk
+WITH_TCLCONFIG=	--with-tclconfig=${PREFIX}/lib/tcl8.0jp
+WITH_TKCONFIG=	--with-tkconfig=${PREFIX}/lib/tk8.0jp
 LIB_DEPENDS=	tcl80jp.1:${PORTSDIR}/japanese/tcl80 \
 		tk80jp.1:${PORTSDIR}/japanese/tk80
 PLISTS+=	PLIST.tcl
@@ -38,9 +37,11 @@ WITH_MB=	--with-mb=${MULTIBYTE}
 .endif
 .if defined(USE_PERL)
 WITH_PERL=      --with-perl
+PLISTS+=	PLIST.pl
 .endif
 .if defined(USE_ODBC)
 WITH_ODBC=      --with-odbc
+PLISTS+=	PLIST.odbc
 .endif
 
 NO_PACKAGE=	"Requires ${PGSQL_UID} uid"
@@ -50,7 +51,9 @@ MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
 CONFIGURE_ARGS= --prefix=${PREFIX}/${INSTALL_DIR} \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
-		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" ${WITH_TCL}\
+		${WITH_TCL} ${WITH_TCLCONFIG} \
+		${WITH_TK} ${WITH_TKCONFIG} \
+		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		--with-libraries=${PREFIX}/lib \
 		${WITH_MB} ${WITH_PERL} ${WITH_ODBC}
 
@@ -110,10 +113,18 @@ post-build:
 	@ ${ECHO} "Detailed instructions, see INSTALL file under ${WRKDIR}...  "
 	@ ${ECHO} "------------------------------------------------------------"
 	@${RM} -f ${WRKDIR}/PLIST
-.for i in ${PLISTS}
+.for i in ${PLISTS} PLIST
 	${CAT} ${PKGDIR}/${i} >> ${WRKDIR}/PLIST
 .endfor
-
+.if defined(USE_TCL)
+	${CAT} ${PKGDIR}/PLIST.tcl.dirrm >> ${WRKDIR}/PLIST
+.endif
+.if defined(USE_ODBC)
+	${CAT} ${PKGDIR}/PLIST.odbc.dirrm >> ${WRKDIR}/PLIST
+	${CAT} ${PKGDIR}/PLIST.dirrm >> ${WRKDIR}/PLIST
+.else
+	${CAT} ${PKGDIR}/PLIST.dirrm >> ${WRKDIR}/PLIST
+.endif
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	${RM} -rf ${PREFIX}/${INSTALL_DIR}
@@ -157,18 +168,14 @@ post-install:
 	@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/${INSTALL_DIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/${INSTALL_DIR}
-	${CP} -r ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/${INSTALL_DIR}
-.for f in . src src/sgml src/sgml/ref src/graphics 
-	@${RM} -r ${PREFIX}/share/doc/${INSTALL_DIR}/$f/CVS
+	${CP} -R ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/${INSTALL_DIR}
+.for f in . src src/sgml src/sgml/ref src/graphics
+	@${RM} -rf ${PREFIX}/share/doc/${INSTALL_DIR}/$f/CVS
+	@${RM} -f ${PREFIX}/share/doc/${INSTALL_DIR}/$f/#cvs*
 .endfor
 .endif
 .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.post.mk>
diff --git a/japanese/postgresql/distinfo b/japanese/postgresql/distinfo
index 7e1055702140..d831c26206f7 100644
--- a/japanese/postgresql/distinfo
+++ b/japanese/postgresql/distinfo
@@ -1,2 +1 @@
-MD5 (postgresql-6.4.2.tar.gz) = 4f5e0409921892ca08fff2d8c099b3d7
-MD5 (jumbo-990217.patch.gz) = 1eab227a77332aed198ff12e36ed2a8d
+MD5 (postgresql-6.5.3.tar.gz) = 098d1ee4316500a2d033ced3ebd5b831
diff --git a/japanese/postgresql/files/patch-aa b/japanese/postgresql/files/patch-aa
new file mode 100644
index 000000000000..45b29e125834
--- /dev/null
+++ b/japanese/postgresql/files/patch-aa
@@ -0,0 +1,14 @@
+--- template/freebsd.orig	Sat Sep 18 20:12:51 1998
++++ template/freebsd	at Wed 16 20:13:06 1999
+@@ -1,9 +1,9 @@
+ AROPT:cq
+ SHARED_LIB:-fpic -DPIC
+-CFLAGS:-O2 -m486 -pipe
++CFLAGS:-pipe -O2
+ SRCH_INC:
+ SRCH_LIB:
+-USE_LOCALE:no
++USE_LOCALE:yes
+ DLSUFFIX:.so
+ YFLAGS:-d
+ YACC:bison -y
diff --git a/japanese/postgresql/files/patch-ab b/japanese/postgresql/files/patch-ab
new file mode 100644
index 000000000000..cb53b5b7de93
--- /dev/null
+++ b/japanese/postgresql/files/patch-ab
@@ -0,0 +1,67 @@
+--- bin/pg_passwd/pg_passwd.c.orig	Thu May 27 16:00:40 1999
++++ bin/pg_passwd/pg_passwd.c	Tue Jun 15 19:27:47 1999
+@@ -26,11 +26,17 @@
+ 
+ #endif
+ 
++#ifndef _POSIX_SOURCE
++# define       _PASSWORD_LEN   128     /* max length, not containing NULL */
++#endif
++
++
+ char	   *comname;
+ static void	usage(FILE *stream);
+ static void	read_pwd_file(char *filename);
++static void	encrypt_pwd(char key[9], char salt[3], char passwd[_PASSWORD_LEN+1]);
++int		check_pwd(char key[9], char passwd[_PASSWORD_LEN+1]);
+ static void	write_pwd_file(char *filename, char *bkname);
+-static void	encrypt_pwd(char key[9], char salt[3], char passwd[14]);
+ static void	prompt_for_username(char *username);
+ static void	prompt_for_password(char *prompt, char *password);
+ 
+@@ -158,7 +164,7 @@
+ 
+ 		if (q != NULL)
+ 			*(q++) = '\0';
+-		if (strlen(p) != 13)
++		if (strlen(p) > _PASSWORD_LEN)
+ 		{
+ 			fprintf(stderr, "WARNING: %s: line %d: illegal password length.\n",
+ 					filename, npwds + 1);
+@@ -222,7 +228,7 @@
+ }
+ 
+ static void
+-encrypt_pwd(char key[9], char salt[3], char passwd[14])
++encrypt_pwd(char key[9], char salt[3], char passwd[_PASSWORD_LEN+1])
+ {
+ 	int			n;
+ 
+@@ -254,9 +260,7 @@
+ 
+ #ifdef NOT_USED
+ static int
+-check_pwd(char key[9], char passwd[14])
+ {
+-	char		shouldbe[14];
+ 	char		salt[3];
+ 
+ 	salt[0] = passwd[0];
+@@ -264,7 +268,7 @@
+ 	salt[2] = '\0';
+ 	encrypt_pwd(key, salt, shouldbe);
+ 
+-	return strncmp(shouldbe, passwd, 13) == 0 ? 1 : 0;
++	return strncmp(shouldbe, passwd, _PASSWORD_LEN) == 0 ? 1 : 0;
+ }
+ #endif
+ 
+@@ -339,7 +343,7 @@
+ 	char		salt[3];
+ 	char		key[9],
+ 				key2[9];
+-	char		e_passwd[14];
++	char		e_passwd[_PASSWORD_LEN+1];
+ 	int			i;
+ 
+ 	comname = argv[0];
diff --git a/japanese/postgresql/files/patch-ac b/japanese/postgresql/files/patch-ac
new file mode 100644
index 000000000000..2a9e180e0958
--- /dev/null
+++ b/japanese/postgresql/files/patch-ac
@@ -0,0 +1,11 @@
+--- interfaces/libpgtcl/Makefile.in.orig	Mon Feb  8 07:10:45 1999
++++ interfaces/libpgtcl/Makefile.in	Tue Jun 15 19:32:36 1999
+@@ -27,7 +27,7 @@
+ 
+ OBJS= pgtcl.o pgtclCmds.o pgtclId.o
+ 
+-SHLIB_LINK+= -L../libpq -lpq
++SHLIB_LINK+= -L../libpq -lpq -lcrypt
+ 
+ # If crypt is a separate library, rather than part of libc, it may need
+ # to be referenced separately to keep (broken) linkers happy.  (This is
diff --git a/japanese/postgresql/files/patch-ad b/japanese/postgresql/files/patch-ad
index 56f482cd4dd8..ce5713717369 100644
--- a/japanese/postgresql/files/patch-ad
+++ b/japanese/postgresql/files/patch-ad
@@ -1,14 +1,13 @@
---- template/freebsd.orig	Sat Jun 14 20:12:51 1997
-+++ template/freebsd	Sat Jun 14 20:13:06 1997
-@@ -1,9 +1,9 @@
- AROPT:cq
- SHARED_LIB:-fpic -DPIC
--CFLAGS:-O2 -m486 -pipe
-+CFLAGS:-pipe -O2
- SRCH_INC:
- SRCH_LIB:
--USE_LOCALE:no
-+USE_LOCALE:yes
- DLSUFFIX:.so
- YFLAGS:-d
- YACC:bison -y
+--- pl/tcl/Makefile.org	Mon Dec 14 08:47:17 1998
++++ pl/tcl/Makefile	Thu Feb 25 22:20:28 1999
+@@ -55,8 +55,8 @@
+ SHLIB_EXTRA_LIBS=
+ endif
+ 
+-%$(TCL_SHLIB_SUFFIX):	%.o
+-	$(TCL_SHLIB_LD) -o $@ $< $(TCL_LIB_SPEC) $(SHLIB_EXTRA_LIBS)
++#%$(TCL_SHLIB_SUFFIX):	%.o
++#	$(TCL_SHLIB_LD) -o $@ $< $(TCL_LIB_SPEC) $(SHLIB_EXTRA_LIBS)
+ 
+ 
+ #
diff --git a/japanese/postgresql/pkg-plist b/japanese/postgresql/pkg-plist
index 06fcfeae0c9d..b0075a9476ef 100644
--- a/japanese/postgresql/pkg-plist
+++ b/japanese/postgresql/pkg-plist
@@ -1,130 +1,83 @@
 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/createlang
 %%INSTALL_DIR%%/bin/createuser
 %%INSTALL_DIR%%/bin/destroydb
+%%INSTALL_DIR%%/bin/destroylang
 %%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_upgrade
+%%INSTALL_DIR%%/bin/pg_version
+%%INSTALL_DIR%%/bin/postgres
+%%INSTALL_DIR%%/bin/postmaster
+%%INSTALL_DIR%%/bin/psql
+%%INSTALL_DIR%%/bin/vacuumdb
 %%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/libecpg.so.3
 %%INSTALL_DIR%%/lib/libpq++.a
-%%INSTALL_DIR%%/lib/libpq++.so.2
 %%INSTALL_DIR%%/lib/libpq++.so
+%%INSTALL_DIR%%/lib/libpq++.so.3
+%%INSTALL_DIR%%/lib/libpq.a
+%%INSTALL_DIR%%/lib/libpq.so
+%%INSTALL_DIR%%/lib/libpq.so.2
+%%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%%/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/config.h
 %%INSTALL_DIR%%/include/ecpgerrno.h
 %%INSTALL_DIR%%/include/ecpglib.h
 %%INSTALL_DIR%%/include/ecpgtype.h
+%%INSTALL_DIR%%/include/fmgr.h
+%%INSTALL_DIR%%/include/libpq++.H
+%%INSTALL_DIR%%/include/libpq-fe.h
+%%INSTALL_DIR%%/include/libpq-int.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/libpq++/pgenv.h
+%%INSTALL_DIR%%/include/access/attnum.h
+%%INSTALL_DIR%%/include/commands/trigger.h
+%%INSTALL_DIR%%/include/executor/spi.h
+%%INSTALL_DIR%%/include/lib/dllist.h
+%%INSTALL_DIR%%/include/libpq/pqcomm.h
+%%INSTALL_DIR%%/include/libpq/libpq-fs.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++/pgdatabase.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_class
-%%INSTALL_DIR%%/data/base/template1/pg_inherits
-%%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_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_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_trigger
-%%INSTALL_DIR%%/data/base/template1/pg_trigger_tgrelid_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_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_shadow
-%%INSTALL_DIR%%/data/pg_group
-%%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%%/include/libpq++/pgtransdb.h
+%%INSTALL_DIR%%/include/utils/elog.h
+%%INSTALL_DIR%%/include/utils/geo_decls.h
+%%INSTALL_DIR%%/include/utils/mcxt.h
+%%INSTALL_DIR%%/include/utils/palloc.h
 %%INSTALL_DIR%%/post-install-notes
-share/doc/%%INSTALL_DIR%%/src/graphics/connections.ag
+share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.ag
+share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.cgm
+share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.gif
+share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.ps
 share/doc/%%INSTALL_DIR%%/src/graphics/clientserver.ag
 share/doc/%%INSTALL_DIR%%/src/graphics/clientserver.gif
-share/doc/%%INSTALL_DIR%%/src/graphics/catalogs.gif
+share/doc/%%INSTALL_DIR%%/src/graphics/connections.ag
 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/graphics/catalogs.ps
-share/doc/%%INSTALL_DIR%%/src/sgml/xtypes.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/Makefile
+share/doc/%%INSTALL_DIR%%/src/sgml/about.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
@@ -132,52 +85,81 @@ share/doc/%%INSTALL_DIR%%/src/sgml/arch-pg.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/arch.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/array.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/biblio.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/bki.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/compiler.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/config.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/contacts.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/cvs.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/datatype.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/datetime.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/dfunc.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/docguide.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/ecpg.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/environ.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/extend.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/func-ref.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/func.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/geqo.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/gist.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/inherit.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/intro.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/install-win32.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/install.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/installation.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/intro-ag.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/keys.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/layout.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/legal.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/libpgtcl.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/libpq++.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/libpq.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/lobj.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/manage.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/manage-ag.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/mvcc.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/notation.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/odbc.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/pgaccess.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/oper.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/page.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/pg_options.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/ports.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/postgres.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/programmer.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/protocol.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/psql.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/query-ug.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/query.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/recovery.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/reference.ced
+share/doc/%%INSTALL_DIR%%/src/sgml/reference.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/regress.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/release.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/rules.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/spi.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/sql.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/start-ag.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/start.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/storage.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/syntax.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/trigger.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/trouble.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/tutorial.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/typeconv.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/user.sgml
 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/Makefile
-share/doc/%%INSTALL_DIR%%/src/sgml/ref/vacuum.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/xplang.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/xtypes.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/y2k.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/abort.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
@@ -196,6 +178,7 @@ 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_table_as.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
@@ -212,8 +195,8 @@ 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_index.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
@@ -234,46 +217,28 @@ 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/pgaccess-ref.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/pgadmin-ref.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/postgres-ref.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/postmaster.sgml
 share/doc/%%INSTALL_DIR%%/src/sgml/ref/psql-ref.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/reset.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/select_into.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/sgml/ref/vacuum.sgml
+share/doc/%%INSTALL_DIR%%/src/sgml/ref/vacuumdb.sgml
 share/doc/%%INSTALL_DIR%%/src/Makefile
 share/doc/%%INSTALL_DIR%%/user.tar.gz
+share/doc/%%INSTALL_DIR%%/internals.ps
 share/doc/%%INSTALL_DIR%%/user.ps.gz
 share/doc/%%INSTALL_DIR%%/tutorial.tar.gz
 share/doc/%%INSTALL_DIR%%/tutorial.ps.gz
@@ -284,45 +249,25 @@ 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%%/README.inet
+share/doc/%%INSTALL_DIR%%/README.locale
+share/doc/%%INSTALL_DIR%%/README.mb
+share/doc/%%INSTALL_DIR%%/README.mb.jp
 share/doc/%%INSTALL_DIR%%/Makefile
-share/doc/%%INSTALL_DIR%%/FAQ_Linux
-share/doc/%%INSTALL_DIR%%/FAQ_Irix
-share/doc/%%INSTALL_DIR%%/FAQ_HPUX
-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_AIX
 share/doc/%%INSTALL_DIR%%/FAQ_DEV
-share/doc/%%INSTALL_DIR%%/FAQ_CVS
+share/doc/%%INSTALL_DIR%%/FAQ_DigitalUnix
+share/doc/%%INSTALL_DIR%%/FAQ_FreeBSD
+share/doc/%%INSTALL_DIR%%/FAQ_HPUX
+share/doc/%%INSTALL_DIR%%/FAQ_Irix
+share/doc/%%INSTALL_DIR%%/FAQ_Linux
+share/doc/%%INSTALL_DIR%%/FAQ_SCO
+share/doc/%%INSTALL_DIR%%/FAQ_Solaris
+share/doc/%%INSTALL_DIR%%/KNOWN_BUGS
+share/doc/%%INSTALL_DIR%%/MISSING_FEATURES
+share/doc/%%INSTALL_DIR%%/README.Charsets
+share/doc/%%INSTALL_DIR%%/README.NT
 @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%%
-@dirrm %%INSTALL_DIR%%/bin
-@dirrm %%INSTALL_DIR%%/data/base/template1
-@dirrm %%INSTALL_DIR%%/data/base
-@dirrm %%INSTALL_DIR%%/data
-@dirrm %%INSTALL_DIR%%/include/utils
-@dirrm %%INSTALL_DIR%%/include/libpq++
-@dirrm %%INSTALL_DIR%%/include/libpq
-@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/executor
-@dirrm %%INSTALL_DIR%%/include/commands
-@dirrm %%INSTALL_DIR%%/include/access
-@dirrm %%INSTALL_DIR%%/include
-@dirrm %%INSTALL_DIR%%/lib
-@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.dirrm b/japanese/postgresql/pkg-plist.dirrm
new file mode 100644
index 000000000000..c3f5c31c1128
--- /dev/null
+++ b/japanese/postgresql/pkg-plist.dirrm
@@ -0,0 +1,27 @@
+@exec /usr/bin/su -l pgsql -c '%D/%%INSTALL_DIR%%/bin/initdb --pglib=%D/%%INSTALL_DIR%%/lib --pgdata=%D/%%INSTALL_DIR%%/data'
+@exec mkdir -p %D/%%INSTALL_DIR%%/include/port/freebsd
+@dirrm %%INSTALL_DIR%%/include/port/freebsd
+@dirrm %%INSTALL_DIR%%/include/port
+@unexec rm -rf %D/pgsql/data
+@unexec rm -rf %D/pgsql/errlog
+@dirrm share/doc/%%INSTALL_DIR%%/src/sgml/ref
+@dirrm share/doc/%%INSTALL_DIR%%/src/sgml
+@dirrm share/doc/%%INSTALL_DIR%%/src/graphics
+@dirrm share/doc/%%INSTALL_DIR%%/src
+@dirrm share/doc/%%INSTALL_DIR%%
+@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%%/lib
+@dirrm %%INSTALL_DIR%%/include/utils
+@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%%/bin
+@dirrm %%INSTALL_DIR%%
diff --git a/japanese/postgresql/pkg-plist.odbc b/japanese/postgresql/pkg-plist.odbc
new file mode 100644
index 000000000000..8cba0e5c977c
--- /dev/null
+++ b/japanese/postgresql/pkg-plist.odbc
@@ -0,0 +1,7 @@
+%%INSTALL_DIR%%/lib/libpsqlodbc.a
+%%INSTALL_DIR%%/lib/libpsqlodbc.so
+%%INSTALL_DIR%%/lib/libpsqlodbc.so.0
+%%INSTALL_DIR%%/include/iodbc/iodbc.h
+%%INSTALL_DIR%%/include/iodbc/isql.h
+%%INSTALL_DIR%%/include/iodbc/isqlext.h
+%%INSTALL_DIR%%/odbcinst.ini
diff --git a/japanese/postgresql/pkg-plist.odbc.dirrm b/japanese/postgresql/pkg-plist.odbc.dirrm
new file mode 100644
index 000000000000..e6ca5307161c
--- /dev/null
+++ b/japanese/postgresql/pkg-plist.odbc.dirrm
@@ -0,0 +1 @@
+@dirrm %%INSTALL_DIR%%/include/iodbc
diff --git a/japanese/postgresql/pkg-plist.pl b/japanese/postgresql/pkg-plist.pl
new file mode 100644
index 000000000000..7694c1236477
--- /dev/null
+++ b/japanese/postgresql/pkg-plist.pl
@@ -0,0 +1 @@
+%%INSTALL_DIR%%/lib/pltcl.so
diff --git a/japanese/postgresql/pkg-plist.tcl b/japanese/postgresql/pkg-plist.tcl
index 602ebba8399e..1752c248ce13 100644
--- a/japanese/postgresql/pkg-plist.tcl
+++ b/japanese/postgresql/pkg-plist.tcl
@@ -1,372 +1,129 @@
-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/initdb
-%%INSTALL_DIR%%/bin/initlocation
-%%INSTALL_DIR%%/bin/ipcclean
-%%INSTALL_DIR%%/bin/pg_encoding
 %%INSTALL_DIR%%/bin/pgtclsh
 %%INSTALL_DIR%%/bin/pgtksh
-%%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%%/bin/pgaccess
 %%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%%/lib/libpgtcl.so.2
 %%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_class
-%%INSTALL_DIR%%/data/base/template1/pg_inherits
-%%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_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_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_trigger
-%%INSTALL_DIR%%/data/base/template1/pg_trigger_tgrelid_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_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_shadow
-%%INSTALL_DIR%%/data/pg_group
-%%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%%/post-install-notes
-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/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/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
-share/doc/%%INSTALL_DIR%%/src/sgml/arch-pg.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/arch.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/array.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/biblio.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/compiler.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/contacts.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/datatype.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/dfunc.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/docguide.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/ecpg.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/environ.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/extend.sgml
-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/jdbc.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/libpgtcl.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/libpq.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/lobj.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/manage.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/odbc.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/pgaccess.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/ports.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/postgres.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/programmer.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/protocol.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/psql.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/query-ug.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/query.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/recovery.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/regress.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/release.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/rules.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/spi.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/start-ag.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/start.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/storage.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/trigger.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/tutorial.sgml
-share/doc/%%INSTALL_DIR%%/src/sgml/user.sgml
-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/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%%
-@dirrm %%INSTALL_DIR%%/bin
-@dirrm %%INSTALL_DIR%%/data/base/template1
-@dirrm %%INSTALL_DIR%%/data/base
-@dirrm %%INSTALL_DIR%%/data
-@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/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
+%%INSTALL_DIR%%/pgaccess/images/icon_button.gif
+%%INSTALL_DIR%%/pgaccess/images/icon_checkbutton.gif
+%%INSTALL_DIR%%/pgaccess/images/icon_entry.gif
+%%INSTALL_DIR%%/pgaccess/images/icon_frame.gif
+%%INSTALL_DIR%%/pgaccess/images/icon_label.gif
+%%INSTALL_DIR%%/pgaccess/images/icon_listbox.gif
+%%INSTALL_DIR%%/pgaccess/images/icon_query.gif
+%%INSTALL_DIR%%/pgaccess/images/icon_radiobutton.gif
+%%INSTALL_DIR%%/pgaccess/images/icon_text.gif
+%%INSTALL_DIR%%/pgaccess/lib/help/abort.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/add_records.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/alter_table.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/alter_user.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/author.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/begin.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/close.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/cluster.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/commit.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/copy.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/copyrights.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/create_aggregate.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/create_database.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/create_function.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/create_index.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/create_language.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/create_operator.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/create_rule.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/create_sequence.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/create_table.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/create_table_as.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/create_trigger.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/create_type.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/create_user.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/create_view.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/data_types.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/datefunc.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/declare.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/delete.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/drop_aggregate.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/drop_database.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/drop_function.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/drop_index.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/drop_language.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/drop_operator.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/drop_rule.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/drop_sequence.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/drop_table.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/drop_trigger.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/drop_type.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/drop_user.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/drop_view.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/explain.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/fetch.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/form_design.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/forms.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/functions.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/geomfunc.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/grant.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/history.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/index.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/inheritance.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/insert.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/ipv4func.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/isolation.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/keywords.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/listen.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/load.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/lock.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/mathfunc.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/move.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/mvcc.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/new_query.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/new_table.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/notify.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/open_query.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/open_table.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/pgfunctions.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/postgresql.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/queries.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/reports.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/reset.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/revoke.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/rollback.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/schema.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/scripts.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/select.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/select_into.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/sequences.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/set.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/show.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/sql_guide.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/sqlfunc.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/stringfunc.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/tables.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/unlisten.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/update.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/users.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/vacuum.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/view_table_structure.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/views.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/visual_designer.hlp
+%%INSTALL_DIR%%/pgaccess/lib/help/y2k.hlp
+%%INSTALL_DIR%%/pgaccess/lib/languages/francais
+%%INSTALL_DIR%%/pgaccess/lib/languages/italiano
+%%INSTALL_DIR%%/pgaccess/lib/languages/magyar
+%%INSTALL_DIR%%/pgaccess/lib/languages/romana
+%%INSTALL_DIR%%/pgaccess/main.tcl
+%%INSTALL_DIR%%/pgaccess/lib/database.tcl
+%%INSTALL_DIR%%/pgaccess/lib/forms.tcl
+%%INSTALL_DIR%%/pgaccess/lib/functions.tcl
+%%INSTALL_DIR%%/pgaccess/lib/help.tcl
+%%INSTALL_DIR%%/pgaccess/lib/mainlib.tcl
+%%INSTALL_DIR%%/pgaccess/lib/preferences.tcl
+%%INSTALL_DIR%%/pgaccess/lib/queries.tcl
+%%INSTALL_DIR%%/pgaccess/lib/reports.tcl
+%%INSTALL_DIR%%/pgaccess/lib/schema.tcl
+%%INSTALL_DIR%%/pgaccess/lib/scripts.tcl
+%%INSTALL_DIR%%/pgaccess/lib/sequences.tcl
+%%INSTALL_DIR%%/pgaccess/lib/tables.tcl
+%%INSTALL_DIR%%/pgaccess/lib/users.tcl
+%%INSTALL_DIR%%/pgaccess/lib/views.tcl
+%%INSTALL_DIR%%/pgaccess/lib/visualqb.tcl
diff --git a/japanese/postgresql/pkg-plist.tcl.dirrm b/japanese/postgresql/pkg-plist.tcl.dirrm
new file mode 100644
index 000000000000..888e0722beb7
--- /dev/null
+++ b/japanese/postgresql/pkg-plist.tcl.dirrm
@@ -0,0 +1,5 @@
+@dirrm %%INSTALL_DIR%%/pgaccess/images
+@dirrm %%INSTALL_DIR%%/pgaccess/lib/help
+@dirrm %%INSTALL_DIR%%/pgaccess/lib/languages
+@dirrm %%INSTALL_DIR%%/pgaccess/lib
+@dirrm %%INSTALL_DIR%%/pgaccess