Update to slave of databases/postgresql7 after repocopy from

japanese/postgresql7.

PR:		ports/43433
Submitted by:	Saito Tomokatsu <saito@a2z.co.jp>

22 files changed, 187 insertions, 1606 deletions

diff --git a/japanese/postgresql-tcltk/Makefile b/japanese/postgresql-tcltk/Makefile
index de0ef6531db5..ebc51188042b 100644
--- a/japanese/postgresql-tcltk/Makefile
+++ b/japanese/postgresql-tcltk/Makefile
@@ -5,198 +5,53 @@
 # $FreeBSD$
 #
 
-PORTNAME=	postgresql
-PORTVERSION=	7.1.3
+PORTNAME=	postgresql-tcltk
 CATEGORIES=	japanese databases
-MASTER_SITES=	ftp://ftp.sra.co.jp/pub/cmd/postgres/${PORTVERSION}/ \
-	ftp://ftp.postgresql.org/pub/v${PORTVERSION}/ \
-	${MASTER_SITE_RINGSERVER}
-MASTER_SITE_SUBDIR=	misc/db/postgresql-jp/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
-DIST_SUBDIR=	postgresql
-
-PATCH_SITES=	ftp://ftp.net-newbie.com/pub/postgres/
-PATCHFILES=	psqlj-7.1.2.diff.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	saito@a2z.co.jp
 
-BUILD_DEPENDS=	${PATCH}:${PORTSDIR}/devel/patch
-
-.if ${MACHINE_ARCH} == "alpha"
-BROKEN=		doesn\'t build on the alpha yet
-.endif
-
-USE_SUBMAKE=	yes
-INSTALLS_SHLIB=	YES
-LDCONFIG_DIRS=	%%PREFIX%%/lib
-
-PATCH=	${LOCALBASE}/bin/gpatch
+POSTGRESQL_SUBPORT=YES
+.include <${.CURDIR}/../../databases/postgresql7/Makefile>
 
-PLIST=	${WRKDIR}/.PLIST.generated
-USE_GMAKE=	YES
-HAS_CONFIGURE=	YES
-CONFIGURE_ARGS=	--enable-locale \
-		--enable-syslog --with-CXX \
-		--sysconfdir=${PREFIX}/etc/postgresql \
-		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
-		--with-libraries=${PREFIX}/lib
-.if defined(WITH_OLD_LAYOUT)
-CONFIGURE_ARGS+=--docdir=${PREFIX}/share/doc --includedir=${PREFIX}/pgsql/include \
-		--datadir=${PREFIX}/share \
-		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
-		--prefix=${PREFIX}/pgsql
-PG_PREFIX=	pgsql/
-PG_INCLUDE=	pgsql/include
-LDCONFIG_DIRS=	%%PREFIX%%/pgsql/lib
-MANPREFIX=	${PREFIX}/pgsql
-.else
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=--docdir=${PREFIX}/share/doc --includedir=${PREFIX}/include/pgsql
-PG_PREFIX=""
-PG_INCLUDE=	include/pgsql
-.endif
+LIB_DEPENDS=	tcl80jp.1:${PORTSDIR}/japanese/tcl80 \
+		pq:${PORTSDIR}/databases/postgresql7
 
-PLIST_SUB=	PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" WITH_TCL="${WITH_TCL}"
+# you can use "make TCLVERSION=8.4" or similar for your favourite tcl version
+TCLVERSION?=	8.0jp
+PLIST_SUB+=	TCLVERSION=${TCLVERSION}
+CONFIGURE_ARGS=	--with-tcl \
+		--with-tclconfig=${TCLCONFIG} \
+		--with-includes=${INCDIRS}
 
-MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
-		dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 pg_config.1 \
-		pg_ctl.1 pg_dump.1 pg_dumpall.1 pg_passwd.1 pg_restore.1 \
-		pgaccess.1 pgtclsh.1 pgtksh.1 postgres.1 postmaster.1 psql.1 \
-		vacuumdb.1
-MANL=		abort.l alter_group.l alter_table.l alter_user.l \
-		begin.l checkpoint.l close.l cluster.l comment.l commit.l copy.l \
-		create_aggregate.l create_constraint_trigger.l \
-		create_database.l create_function.l create_group.l \
-		create_index.l create_language.l create_operator.l \
-		create_rule.l create_sequence.l create_table.l \
-		create_table_as.l create_trigger.l create_type.l \
-		create_user.l create_view.l declare.l delete.l \
-		drop_aggregate.l drop_database.l drop_function.l \
-		drop_group.l drop_index.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 reindex.l \
-		reset.l revoke.l rollback.l select.l select_into.l \
-		set.l set_constraints.l set_transaction.l show.l \
-		truncate.l unlisten.l update.l vacuum.l
+TCL_INCDIR=	${LOCALBASE}/include/tcl${TCLVERSION}
+TCLCONFIG=	${LOCALBASE}/lib/tcl${TCLVERSION}
+MAKE_ENV+=	TCL_INCDIR=${TCL_INCDIR}
 
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		WRKDIR="${WRKDIR}" \
-		FILESDIR="${FILESDIR}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		NO_OPENSSL="${NO_OPENSSL}" \
-		DISTNAME="${DISTNAME}"
-
-# We must .include here because we need the Makefile.inc @ pre-install
-# to determine the correct plist.
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.else
-# make utility targets like depends and describe happy
-LIB_DEPENDS=	tcl80jp:${PORTSDIR}/japanese/tcl80 \
+CONFIGURE_ARGS+= --with-tkconfig="${TKCONFIG}"
+TK_INCDIR=	${LOCALBASE}/include/tk${TCLVERSION}
+CONFIGURE_ENV+=	WISH=${LOCALBASE}/bin/wish${TCLVERSION}
+LIB_DEPENDS+=	tcl80jp:${PORTSDIR}/japanese/tcl80 \
 		tk80jp:${PORTSDIR}/japanese/tk80
-.endif
-
-pre-everything::
-	@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql
+TKCONFIG=	${LOCALBASE}/lib/tk${TCLVERSION}
+INCDIRS=	${TCL_INCDIR}:${TK_INCDIR}
+PLIST_SUB+=	TK=""
 
-pre-install:
-	@ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
-.if !defined(BATCH)
-# remind folks twice for a while, so they really don't miss the layout shift
-	@ ${SED} "s|/usr/local|${PREFIX}|g" < ${PKGMESSAGE} | head -n 25 | more -e
-.endif
-	@ ${CP} ${PKGDIR}/pkg-plist ${PLIST}
-.if defined(WITHOUT_MULTIBYTE)
-	@${CP} ${PLIST} ${PLIST}.nomulti ;\
-	 ${GREP} -v bin/pg_encoding ${PLIST}.nomulti > ${PLIST}
-.endif
-.if defined(WITH_TCL)
-	@ ${CP} ${PLIST} ${PLIST}.notcl ;\
-	  ${CAT} ${PKGDIR}/${TCL_PLIST} ${PLIST}.notcl > ${PLIST} ;\
-	  ${RM} ${PLIST}.notcl
-.endif
-.if defined(WITH_ODBC)
-	@ ${CP} ${PLIST} ${PLIST}.noodbc ;\
-	  ${CAT} ${PKGDIR}/pkg-plist.odbc ${PLIST}.noodbc > ${PLIST} ;\
-	  ${RM} ${PLIST}.noodbc
-.endif
-.if defined(WITH_JDBC)
-	@ ${CP} ${PLIST} ${PLIST}.nojdbc ;\
-	  ${CAT} ${PKGDIR}/pkg-plist.jdbc ${PLIST}.nojdbc > ${PLIST} ;\
-	  ${RM} ${PLIST}.nojdbc
-.endif
-.if !defined(NOPORTDOCS)
-	@ ${CAT} ${PKGDIR}/pkg-plist.doc >> ${PLIST}
+do-build:
+	@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/bin/pgtclsh
+	@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/interfaces/libpgtcl
+.if !defined(WITHOUT_TK)
+	@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/bin/pgaccess
 .endif
 
-post-install:
-# install shell defaults for pgsql user
-.for i in profile cshrc
-	@ ${SED} "s|%%PREFIX%%|${PREFIX}|g; s|%%PG_PREFIX%%|${PG_PREFIX}|g" \
-		< ${FILESDIR}/dot.$i.in \
-		> ${PREFIX}/share/postgresql/dot.$i.dist; \
-	${CP} ${PREFIX}/share/postgresql/dot.$i.dist ~pgsql/; \
-	if [ ! -f ~pgsql/.$i ]; then \
-		${CP} ${PREFIX}/share/postgresql/dot.$i.dist ~pgsql/.$i; \
-	fi
-.endfor
-	@ ${SED} -e "s|%%PREFIX%%|${PREFIX}|g; s|%%PG_PREFIX%%|${PG_PREFIX}|g" \
-		< ${FILESDIR}/pgsql.sh.tmpl \
-		> ${PREFIX}/etc/rc.d/010.pgsql.sh
-	@ ${CHMOD} 554 ${PREFIX}/etc/rc.d/010.pgsql.sh
-	@ ${CHOWN} root:pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh
-.if defined(WITH_TCL)
+do-install:
+	@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/bin/pgtclsh install
+	@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/interfaces/libpgtcl install
+.if !defined(WITHOUT_TK)
+	@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/bin/pgaccess install
+.endif
 # Preparing a loadable TCL-package (pkgIndex.tcl)
-	@${MKDIR} ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3
+	@${MKDIR} ${PREFIX}/lib/tcl${TCLVERSION}/Pgtcl1.3
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pkgIndex.tcl.in \
-		> ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl
-.endif
-.if defined(WITH_JDBC)
-	@ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
-	@ ${INSTALL_DATA} ${WRKSRC}/src/interfaces/jdbc/jars/postgresql.jar \
-			  ${PREFIX}/share/java/classes/postgresql.jar
-	@ ${ECHO_MSG} "---------------------------------------------------------"
-	@ ${ECHO_MSG} "Putting postgresql.jar in"
-	@ ${ECHO_MSG} "${PREFIX}/share/java/classes/postgresql.jar"
-	@ ${ECHO_MSG} "Add this to your CLASSPATH!"
-	@ ${ECHO_MSG} "ALSO NOTE: path inside jar file modified from 6.5.x:"
-	@ ${ECHO_MSG} "  'postgresql.*' -> 'org.postgresql.*'!"
-	@ ${ECHO_MSG} "---------------------------------------------------------"
-.if !defined(NOPORTDOCS)
-	@ ${MKDIR} -m 0555 ${PREFIX}/share/examples/postgresql ;\
-	  cd ${WRKSRC}/src/interfaces/jdbc/example ;\
-	  pax -rw . ${PREFIX}/share/examples/postgresql
-.for i in README Implementation
-	@ ${INSTALL_DATA} ${WRKSRC}/src/interfaces/jdbc/$i \
-			  ${PREFIX}/share/examples/postgresql
-.endfor
-	@ ${ECHO_MSG} "---------------------------------------------------------------"
-	@ ${ECHO_MSG} "Putting java examples into ${PREFIX}/share/examples/postgresql"
-	@ ${ECHO_MSG} "---------------------------------------------------------------"
-.endif
-.endif
-.if !defined(DEBUG_FLAGS)
-.for file in ecpg pg_dump pg_id pg_passwd pg_restore postgres psql
-	@ strip ${PREFIX}/${PG_PREFIX}bin/${file}
-.endfor
-.endif
-# information overload mode activated, sorry about this... ;-)
-	@ ${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\
-		${SED} "s|/usr/local|${PREFIX}|g" |\
-		tee ${PREFIX}/share/postgresql/post-install-notes ;\
-	${INSTALL_DATA} ${PREFIX}/share/postgresql/post-install-notes ~pgsql/. ;\
-	${CHOWN} -R pgsql:pgsql ~pgsql/.
-.if defined(WITH_OLD_LAYOUT)
-	@ ${CHOWN} root:pgsql ${PREFIX}/${PG_PREFIX}lib
-.endif
-
-post-clean:
-	@ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
-post-extract: ${POSTEXTRACT}
+		> ${PREFIX}/lib/tcl${TCLVERSION}/Pgtcl1.3/pkgIndex.tcl
 
 .include <bsd.port.mk>
diff --git a/japanese/postgresql-tcltk/distinfo b/japanese/postgresql-tcltk/distinfo
deleted file mode 100644
index 5dbd7261d4a3..000000000000
--- a/japanese/postgresql-tcltk/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (postgresql/postgresql-7.1.3.tar.gz) = a92c77092034fb35c7b3bb82beebd54b
-MD5 (postgresql/psqlj-7.1.2.diff.gz) = f596edc4f16b9bc7ce5fb65e8ed2bbf3
diff --git a/japanese/postgresql-tcltk/files/dot.cshrc.in b/japanese/postgresql-tcltk/files/dot.cshrc.in
deleted file mode 100644
index a326041bff7b..000000000000
--- a/japanese/postgresql-tcltk/files/dot.cshrc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-set path = ( %%PREFIX%%/%%PG_PREFIX%%bin $path )
-
-setenv PGLIB %%PREFIX%%/%%PG_PREFIX%%lib
-
-# note: PGDATA can be overridden by the -D startup option
-setenv PGDATA $HOME/data
-
-#You might want to set some locale stuff here
-#setenv PGDATESTYLE ISO
-#setenv LC_ALL sv_SE.ISO_8859-1
-
-# if you want to make regression tests use this TZ
-#setenv TZ PST8PDT
diff --git a/japanese/postgresql-tcltk/files/dot.profile.in b/japanese/postgresql-tcltk/files/dot.profile.in
deleted file mode 100644
index 4aca6aadd19a..000000000000
--- a/japanese/postgresql-tcltk/files/dot.profile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-# both new and old layout's paths, but new path first...
-PATH=%%PREFIX%%/%%PG_PREFIX%%bin:${PATH}
-
-PGLIB=%%PREFIX%%/%%PG_PREFIX%%lib
-
-# note: PGDATA can be overridden by the -D startup option
-PGDATA=${HOME}/data
-
-export PATH PGLIB PGDATA
-
-#You might want to set some locale stuff here
-#PGDATESTYLE=ISO
-#LC_ALL=sv_SE.ISO_8859-1
-#export PGDATESTYLE LC_ALL
-
-# if you want to make regression tests use this TZ
-#TZ=PST8PDT
-#export TZ
diff --git a/japanese/postgresql-tcltk/files/patch-aj b/japanese/postgresql-tcltk/files/patch-aj
deleted file mode 100644
index 94c0d6d79991..000000000000
--- a/japanese/postgresql-tcltk/files/patch-aj
+++ /dev/null
@@ -1,118 +0,0 @@
---- src/bin/pg_passwd/pg_passwd.c.orig	Sat Mar 24 01:54:55 2001
-+++ src/bin/pg_passwd/pg_passwd.c	Wed Apr 18 04:54:14 2001
-@@ -7,6 +7,12 @@
- #include <errno.h>
- #include <time.h>
- #include <ctype.h>
-+
-+#if defined(__FreeBSD__)
-+#include <pwd.h>  /* defines _PASSWORD_LEN, max # of characters in a password */
-+#include <sys/time.h> /* gettimeofday for password salt */
-+#endif
-+
- #define issaltchar(c)	(isalnum((unsigned char) (c)) || (c) == '.' || (c) == '/')
- 
- #ifdef HAVE_TERMIOS_H
-@@ -23,18 +29,31 @@
-  * We assume that the output of crypt(3) is always 13 characters,
-  * and that at most 8 characters can usefully be sent to it.
-  *
-+ * For FreeBSD, take these values from /usr/include/pwd.h
-  * Postgres usernames are assumed to be less than NAMEDATALEN chars long.
-  */
-+#if defined(__FreeBSD__)
-+#define CLEAR_PASSWD_LEN   _PASSWORD_LEN
-+#define CRYPTED_PASSWD_LEN _PASSWORD_LEN /* max length, not containing NULL */
-+#define SALT_LEN 10
-+#else
- #define CLEAR_PASSWD_LEN 8		/* not including null */
- #define CRYPTED_PASSWD_LEN 13	/* not including null */
-+#define SALT_LEN 3
-+#endif
-+
-+static unsigned char itoa64[] =		/* 0 ... 63 => ascii - 64 */
-+	"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-+
- 
- const char *progname;
- 
- static void usage(void);
-+static void to64(char *s, long v, int n);
- static void read_pwd_file(char *filename);
- static void write_pwd_file(char *filename, char *bkname);
- static void encrypt_pwd(char key[CLEAR_PASSWD_LEN + 1],
--			char salt[3],
-+			char salt[SALT_LEN],
- 			char passwd[CRYPTED_PASSWD_LEN + 1]);
- static void prompt_for_username(char *username);
- static void prompt_for_password(char *prompt, char *password);
-@@ -47,6 +66,15 @@
- 	printf("Report bugs to <pgsql-bugs@postgresql.org>.\n");
- }
- 
-+static void
-+to64(char *s, long v, int n)
-+{
-+	while (--n >= 0) {
-+		*s++ = itoa64[v&0x3f];
-+		v >>= 6;
-+	}
-+}
-+
- typedef struct
- {
- 	char	   *uname;
-@@ -154,7 +182,7 @@
- 			if (q != NULL)
- 				*(q++) = '\0';
- 
--			if (strlen(p) != CRYPTED_PASSWD_LEN && strcmp(p, "+") != 0)
-+			if (strlen(p) > CRYPTED_PASSWD_LEN && strcmp(p, "+") != 0)
- 			{
- 				fprintf(stderr, "%s:%d: warning: invalid password length\n",
- 						filename, npwds + 1);
-@@ -221,15 +249,25 @@
- 
- static void
- encrypt_pwd(char key[CLEAR_PASSWD_LEN + 1],
--			char salt[3],
-+			char salt[SALT_LEN],
- 			char passwd[CRYPTED_PASSWD_LEN + 1])
- {
-+#if !defined(__FreeBSD__)
- 	int			n;
--
-+#endif
- 	/* select a salt, if not already given */
- 	if (salt[0] == '\0')
- 	{
-+#if defined(__FreeBSD__)
-+		struct timeval tv;
-+		srandomdev();
-+		gettimeofday(&tv,0);
-+		to64(&salt[0], random(), 3);
-+		to64(&salt[3], tv.tv_usec, 3);
-+		to64(&salt[6], tv.tv_sec, 2);
-+		salt[8] = '\0';
- 		srand(time(NULL));
-+#else
- 		do
- 		{
- 			n = rand() % 256;
-@@ -241,6 +279,7 @@
- 		} while (!issaltchar(n));
- 		salt[1] = n;
- 		salt[2] = '\0';
-+#endif
- 	}
- 
- 	/* get encrypted password */
-@@ -335,7 +374,7 @@
- 	char	   *filename;
- 	char		bkname[MAXPGPATH];
- 	char		username[NAMEDATALEN];
--	char		salt[3];
-+	char		salt[SALT_LEN];
- 	char		key[CLEAR_PASSWD_LEN + 1],
- 				key2[CLEAR_PASSWD_LEN + 1];
- 	char		e_passwd[CRYPTED_PASSWD_LEN + 1];
diff --git a/japanese/postgresql-tcltk/files/patch-contrib-retep-build b/japanese/postgresql-tcltk/files/patch-contrib-retep-build
deleted file mode 100644
index 30df3a0e72c9..000000000000
--- a/japanese/postgresql-tcltk/files/patch-contrib-retep-build
+++ /dev/null
@@ -1,10 +0,0 @@
---- contrib/retep/build.xml~	Fri Mar 16 22:50:36 2001
-+++ contrib/retep/build.xml	Wed Apr 18 09:24:20 2001
-@@ -38,6 +38,7 @@
-   <target name="compile" depends="checks,prepare">
-     <javac srcdir="${src}" destdir="${dest}">
-       <include name="${package}/**" />
-+      <exclude name="${package}/**" unless="jdk1.2+" />
-     </javac>
-   </target>
- 
diff --git a/japanese/postgresql-tcltk/files/patch-doc-makefile b/japanese/postgresql-tcltk/files/patch-doc-makefile
deleted file mode 100644
index fa27bed2af3f..000000000000
--- a/japanese/postgresql-tcltk/files/patch-doc-makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- doc/Makefile~	Sun Jan  7 03:03:22 2001
-+++ doc/Makefile	Wed Apr 18 08:12:30 2001
-@@ -43,10 +43,13 @@
- 	gzip -d -c man.tar.gz | ( cd $(DESTDIR)$(mandir) && $(TAR) xf - )
- endif
- 
--
- installdirs:
--	$(mkinstalldirs) $(DESTDIR)$(mandir) $(DESTDIR)$(docdir)/html
--
-+ifdef found_html
-+	$(mkinstalldirs) $(DESTDIR)$(docdir)/html
-+endif
-+ifdef found_man
-+	$(mkinstalldirs) $(DESTDIR)$(mandir)
-+endif
- 
- uninstall:
- ifdef found_html
diff --git a/japanese/postgresql-tcltk/files/patch-jdbc-build-xml b/japanese/postgresql-tcltk/files/patch-jdbc-build-xml
deleted file mode 100644
index b1c703a9c978..000000000000
--- a/japanese/postgresql-tcltk/files/patch-jdbc-build-xml
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/interfaces/jdbc/build.xml~	Fri Mar 16 22:50:43 2001
-+++ src/interfaces/jdbc/build.xml	Wed Apr 18 08:57:57 2001
-@@ -120,6 +120,7 @@
-     <javac srcdir="${src}" destdir="${dest}">
-       <include name="example/**" />
-       <exclude name="example/corba/**"/>
-+      <exclude name="example/blobtest.java" unless="jdk1.2+"/>
-     </javac>
-   </target>
- 
diff --git a/japanese/postgresql-tcltk/files/pgsql.sh.tmpl b/japanese/postgresql-tcltk/files/pgsql.sh.tmpl
deleted file mode 100644
index cd78771219ed..000000000000
--- a/japanese/postgresql-tcltk/files/pgsql.sh.tmpl
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-#
-# For postmaster startup options, edit $PGDATA/postgresql.conf
-
-PGBIN=%%PREFIX%%/%%PG_PREFIX%%bin
-
-case $1 in
-start)
-    [ -d %%PREFIX%%/%%PG_PREFIX%%lib ] && /sbin/ldconfig -m %%PREFIX%%/%%PG_PREFIX%%lib
-    [ -x ${PGBIN}/pg_ctl ] && {
-	su -l pgsql -c \
-	    '[ -d ${PGDATA} ] && exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -s -w -l ~pgsql/errlog'
-	echo -n ' pgsql'
-    }
-    ;;
-
-stop)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	su -l pgsql -c 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl stop -s -m fast'
-	echo -n ' pgsql'
-    }
-    ;;
-
-status)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	exec su -l pgsql -c 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl status'
-    }
-    ;;
-
-*)
-    echo "usage: `basename $0` {start|stop|status}" >&2
-    exit 64
-    ;;
-esac
diff --git a/japanese/postgresql-tcltk/files/post-install-notes b/japanese/postgresql-tcltk/files/post-install-notes
deleted file mode 100644
index 6b7192b31895..000000000000
--- a/japanese/postgresql-tcltk/files/post-install-notes
+++ /dev/null
@@ -1,22 +0,0 @@
-
-Now that PostgreSQL is installed, you should read the documentation and
-implementation guides. These can be found at:
-
-		http://www.PostgreSQL.org/docs
-
-You may wish to subscribe to the PostgreSQL user-support mailing list.
-Send an e-mail to pgsql-questions-request@postgresql.org with the
-text "subscribe" in the message body.
-
-If you built PostgreSQL with TCL/TK support, you can use the pgaccess
-utility to get a TCL/TK based database frontend for database
-operations. You do NOT need to install the pgaccess port separately.
-
-If you built in the TCL support, you can load the Pg package into your
-TCL scripts as easily as ``package require Pgtcl''.
-
-If you built with Java support, add
-/usr/local/share/java/classes/postgresql.jar to your classpath.
-
-If you have many tables and many clients running, consider raising
-kern.maxfiles using sysctl(8).
diff --git a/japanese/postgresql-tcltk/files/pre-install-notes b/japanese/postgresql-tcltk/files/pre-install-notes
deleted file mode 100644
index 697ce3cedb79..000000000000
--- a/japanese/postgresql-tcltk/files/pre-install-notes
+++ /dev/null
@@ -1,21 +0,0 @@
- * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-%%PREFIX%%/bin
-%%PREFIX%%/lib
-%%PREFIX%%/include/pgsql
-
-You *must* move away your old installation to avoid problems with
-ldconfig(8) and user's PATH:s. If you rather install using the
-old-fashion layout, cancel at next screen and run make as:
-
-$ make -DWITH_OLD_LAYOUT
-
-As always, you *must* dump existing databases before stopping and
-removing your old postgresql, as part of the update.  This is *NOT*
-done by this port!
-
-If you want JAVA support, I will try to determine your JAVA_HOME using
-javavmwrapper. If you want a different JVM, please set JAVA_HOME.
diff --git a/japanese/postgresql-tcltk/pkg-comment b/japanese/postgresql-tcltk/pkg-comment
index 2125016b133c..e9ecbb8442ee 100644
--- a/japanese/postgresql-tcltk/pkg-comment
+++ b/japanese/postgresql-tcltk/pkg-comment
@@ -1 +1 @@
-A robust, next generation, object-relational DBMS
+An TCL interface to the database PostgreSQL, including a tk GUI
diff --git a/japanese/postgresql-tcltk/pkg-descr b/japanese/postgresql-tcltk/pkg-descr
index 463e4e49815f..32561ddf75c7 100644
--- a/japanese/postgresql-tcltk/pkg-descr
+++ b/japanese/postgresql-tcltk/pkg-descr
@@ -1,24 +1,8 @@
-PostgreSQL is a robust, next-generation, Object-Relational DBMS (ORDBMS), 
-derived from the Berkeley Postgres database management system.  While 
-PostgreSQL retains the powerful object-relational data model, rich data types 
-and easy extensibility of Postgres, it replaces the PostQuel query language 
-with an extended subset of SQL.
+libpgtcl is a library that implements Tcl commands for front-end
+clients to interact with the Postgresql backends.
 
-The original Postgres code was the effort of many graduate students, 
-undergraduate students, and staff programmers working under the direction of 
-Professor Michael Stonebraker at the University of California, Berkeley. In 
-1995, Andrew Yu and Jolly Chen took on the task of converting the DBMS query 
-language to SQL and created a new database system which came to known as 
-Postgres95. Many others contributed to the porting, testing, debugging and 
-enhancement of the Postgres95 code. As the code improved, and 1995 faded into 
-memory, PostgreSQL was born.
+pgaccess is a great graphical database management tool for PostgreSQL.
 
-PostgreSQL development is presently being performed by a team of Internet 
-developers who are now responsible for all current and future development. The 
-development team coordinator is Marc G. Fournier (scrappy@PostgreSQL.ORG). 
-Support is available from the PostgreSQL developer/user community through the 
-support mailing list (questions@PostgreSQL.ORG).
-
-PostgreSQL is free and the complete source is available.
+This software is part of the standard PostgreSQL distribution.
 
 WWW: http://www.postgresql.org/
diff --git a/japanese/postgresql-tcltk/pkg-install b/japanese/postgresql-tcltk/pkg-install
deleted file mode 100644
index 73477dd0b598..000000000000
--- a/japanese/postgresql-tcltk/pkg-install
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh
-
-# $FreeBSD: /tmp/pcvs/ports/japanese/postgresql-tcltk/Attic/pkg-install,v 1.6 2001-05-08 12:35:59 knu Exp $
-
-PATH=/bin:/usr/sbin
-
-DB_DIR=${PKG_PREFIX}/pgsql
-
-case $2 in
-PRE-INSTALL)
-	USER=pgsql
-	GROUP=${USER}
-	UID=70
-	GID=${UID}
-
-	if pw group show "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if pw groupadd ${GROUP} -g ${GID}; then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if pw user show "${USER}" 2>/dev/null; then
-		echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-d ${DB_DIR} -c "PostgreSQL Daemon"
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if ! [ -x ~pgsql ] ; then 
-		mkdir -p ${DB_DIR}
-		chown pgsql:pgsql ${DB_DIR}
-	fi
-	;;
-
-esac
diff --git a/japanese/postgresql-tcltk/pkg-message b/japanese/postgresql-tcltk/pkg-message
deleted file mode 100644
index b686422872c1..000000000000
--- a/japanese/postgresql-tcltk/pkg-message
+++ /dev/null
@@ -1,38 +0,0 @@
-
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include/pgsql
-
-You *must* move away your old installation from users' and
-ldconfig(8)'s PATHs. If you rather install using the old-fashion
-layout, cancel now and build the port with "make -DWITH_OLD_LAYOUT".
-
-The pgsql user's home dir is /usr/local/pgsql by default, but can be
-changed with for example chpass(1). Datadir defaults to ~pgsql/data,
-but can be changed by modifying the ~pgsql/.profile script.
-
-As always, you *must* dump existing databases before stopping and
-removing your old postgresql, as part of the update.  This is *NOT*
-done by this port!
-
-======================================================================
-
-To initialize the database, you should run initdb as the "pgsql" user.
-
-Example:
-
-  su -l pgsql -c initdb
-
-You can then start PostgreSQL by running:
-
-  /usr/local/etc/rc.d/010.pgsql.sh start
-
-For postmaster settings, see ~pgsql/data/postmaster.conf
-======================================================================
diff --git a/japanese/postgresql-tcltk/pkg-plist b/japanese/postgresql-tcltk/pkg-plist
index 49fa6c4e33ad..bd3771fa3e75 100644
--- a/japanese/postgresql-tcltk/pkg-plist
+++ b/japanese/postgresql-tcltk/pkg-plist
@@ -1,91 +1,148 @@
-%%PG_PREFIX%%bin/postmaster
-%%PG_PREFIX%%bin/postgres
-%%PG_PREFIX%%bin/ecpg
-%%PG_PREFIX%%bin/initdb
-%%PG_PREFIX%%bin/initlocation
-%%PG_PREFIX%%bin/ipcclean
-%%PG_PREFIX%%bin/pg_ctl
-%%PG_PREFIX%%bin/pg_dump
-%%PG_PREFIX%%bin/pg_restore
-%%PG_PREFIX%%bin/pg_encoding
-%%PG_PREFIX%%bin/pg_dumpall
-%%PG_PREFIX%%bin/pg_id
-%%PG_PREFIX%%bin/pg_passwd
-%%PG_PREFIX%%bin/psql
-%%PG_PREFIX%%bin/psqlj
-%%PG_PREFIX%%bin/createdb
-%%PG_PREFIX%%bin/dropdb
-%%PG_PREFIX%%bin/createuser
-%%PG_PREFIX%%bin/dropuser
-%%PG_PREFIX%%bin/droplang
-%%PG_PREFIX%%bin/vacuumdb
-%%PG_PREFIX%%bin/createlang
-%%PG_PREFIX%%bin/pg_config
-etc/rc.d/010.pgsql.sh
-%%PG_INCLUDE%%/lib/dllist.h
-@dirrm %%PG_INCLUDE%%/lib
-%%PG_INCLUDE%%/libpq/pqcomm.h
-%%PG_INCLUDE%%/libpq/libpq-fs.h
-@dirrm %%PG_INCLUDE%%/libpq
-%%PG_INCLUDE%%/libpq++/pgconnection.h
-%%PG_INCLUDE%%/libpq++/pgdatabase.h
-%%PG_INCLUDE%%/libpq++/pgtransdb.h
-%%PG_INCLUDE%%/libpq++/pgcursordb.h
-%%PG_INCLUDE%%/libpq++/pglobject.h
-@dirrm %%PG_INCLUDE%%/libpq++
-%%PG_INCLUDE%%/c.h
-%%PG_INCLUDE%%/postgres_ext.h
-%%PG_INCLUDE%%/postgres_fe.h
-%%PG_INCLUDE%%/os.h
-%%PG_INCLUDE%%/config.h
-%%PG_INCLUDE%%/libpq-fe.h
-%%PG_INCLUDE%%/libpq-int.h
-%%PG_INCLUDE%%/pqexpbuffer.h
-%%PG_INCLUDE%%/ecpgerrno.h
-%%PG_INCLUDE%%/ecpglib.h
-%%PG_INCLUDE%%/ecpgtype.h
-%%PG_INCLUDE%%/sqlca.h
-%%PG_INCLUDE%%/sql3types.h
-%%PG_INCLUDE%%/libpgeasy.h
-%%PG_INCLUDE%%/libpq++.h
-@dirrm %%PG_INCLUDE%%
-%%PG_PREFIX%%lib/libpq.so
-%%PG_PREFIX%%lib/libpq.a
-%%PG_PREFIX%%lib/libpq.so.2
-%%PG_PREFIX%%lib/libecpg.so
-%%PG_PREFIX%%lib/libecpg.a
-%%PG_PREFIX%%lib/libecpg.so.3
-%%PG_PREFIX%%lib/libpgeasy.so
-%%PG_PREFIX%%lib/libpgeasy.a
-%%PG_PREFIX%%lib/libpgeasy.so.2
-%%PG_PREFIX%%lib/libpq++.so
-%%PG_PREFIX%%lib/libpq++.a
-%%PG_PREFIX%%lib/libpq++.so.3
-%%PG_PREFIX%%lib/plpgsql.so
-share/postgresql/global.bki
-share/postgresql/global.description
-share/postgresql/post-install-notes
-share/postgresql/template1.bki
-share/postgresql/template1.description
-share/postgresql/pg_hba.conf.sample
-share/postgresql/pg_ident.conf.sample
-share/postgresql/postgresql.conf.sample
-@unexec if cmp -s ~pgsql/.profile %D/share/postgresql/dot.profile.dist; then rm -f ~pgsql/.profile; fi
-@unexec if cmp -s ~pgsql/.cshrc %D/share/postgresql/dot.cshrc.dist; then rm -f ~pgsql/.cshrc; fi
-@unexec [ -f ~pgsql/dot.profile.dist ] && rm ~pgsql/dot.profile.dist
-@unexec [ -f ~pgsql/dot.cshrc.dist ] && rm ~pgsql/dot.cshrc.dist
-@exec [ -f %D/share/postgresql/post-install-notes ] && cp %D/share/postgresql/post-install-notes ~pgsql && chown pgsql:pgsql ~pgsql/post-install-notes
-@unexec [ -f ~pgsql/post-install-notes ] && rm ~pgsql/post-install-notes
-share/postgresql/dot.profile.dist
-share/postgresql/dot.cshrc.dist
-@dirrm share/postgresql
-@exec [ -f %D/share/postgresql/dot.profile.dist ] && cp %D/share/postgresql/dot.profile.dist ~pgsql/.
-@exec [ -f %D/share/postgresql/dot.cshrc.dist ] && cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.
-@exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile)
-@exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc)
-@unexec rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true
-@unexec rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true
-@unexec rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true
-@unexec rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true
-@unexec rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true
-@unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually."
+bin/pgtclsh
+include/libpgtcl.h
+lib/tcl%%TCLVERSION%%/Pgtcl1.3/pkgIndex.tcl
+@dirrm lib/tcl%%TCLVERSION%%/Pgtcl1.3
+lib/libpgtcl.a
+lib/libpgtcl.so
+lib/libpgtcl.so.2
+%%TK%%bin/pgtksh
+%%TK%%bin/pgaccess
+%%TK%%share/postgresql/pgaccess/lib/help/abort.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/add_records.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/alter_table.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/alter_user.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/author.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/begin.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/close.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/cluster.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/commit.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/copy.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/copyrights.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/create_aggregate.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/create_database.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/create_function.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/create_index.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/create_language.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/create_operator.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/create_rule.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/create_sequence.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/create_table.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/create_table_as.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/create_trigger.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/create_type.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/create_user.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/create_view.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/data_types.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/datefunc.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/declare.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/delete.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/drop_aggregate.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/drop_database.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/drop_function.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/drop_index.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/drop_language.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/drop_operator.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/drop_rule.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/drop_sequence.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/drop_table.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/drop_trigger.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/drop_type.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/drop_user.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/drop_view.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/explain.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/fetch.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/form_design.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/forms.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/functions.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/geomfunc.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/grant.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/history.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/index.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/inheritance.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/insert.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/ipv4func.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/isolation.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/keywords.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/listen.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/load.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/lock.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/mathfunc.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/move.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/mvcc.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/new_query.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/new_table.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/notify.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/open_query.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/open_table.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/pgfunctions.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/postgresql.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/queries.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/reports.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/reset.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/revoke.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/rollback.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/schema.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/scripts.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/select.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/select_into.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/sequences.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/set.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/show.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/sql_guide.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/sqlfunc.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/stringfunc.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/tables.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/unlisten.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/update.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/users.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/vacuum.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/view_table_structure.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/views.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/visual_designer.hlp
+%%TK%%share/postgresql/pgaccess/lib/help/y2k.hlp
+%%TK%%@dirrm share/postgresql/pgaccess/lib/help
+%%TK%%share/postgresql/pgaccess/lib/languages/chinese_big5
+%%TK%%share/postgresql/pgaccess/lib/languages/chinese_gb
+%%TK%%share/postgresql/pgaccess/lib/languages/czech
+%%TK%%share/postgresql/pgaccess/lib/languages/deutsch
+%%TK%%share/postgresql/pgaccess/lib/languages/euskara
+%%TK%%share/postgresql/pgaccess/lib/languages/francais
+%%TK%%share/postgresql/pgaccess/lib/languages/italiano
+%%TK%%share/postgresql/pgaccess/lib/languages/japanese
+%%TK%%share/postgresql/pgaccess/lib/languages/magyar
+%%TK%%share/postgresql/pgaccess/lib/languages/nederlands
+%%TK%%share/postgresql/pgaccess/lib/languages/portugues
+%%TK%%share/postgresql/pgaccess/lib/languages/romana
+%%TK%%share/postgresql/pgaccess/lib/languages/russian.koi8r
+%%TK%%share/postgresql/pgaccess/lib/languages/russian_win
+%%TK%%share/postgresql/pgaccess/lib/languages/spanish
+%%TK%%@dirrm share/postgresql/pgaccess/lib/languages
+%%TK%%share/postgresql/pgaccess/lib/database.tcl
+%%TK%%share/postgresql/pgaccess/lib/forms.tcl
+%%TK%%share/postgresql/pgaccess/lib/functions.tcl
+%%TK%%share/postgresql/pgaccess/lib/help.tcl
+%%TK%%share/postgresql/pgaccess/lib/mainlib.tcl
+%%TK%%share/postgresql/pgaccess/lib/preferences.tcl
+%%TK%%share/postgresql/pgaccess/lib/queries.tcl
+%%TK%%share/postgresql/pgaccess/lib/reports.tcl
+%%TK%%share/postgresql/pgaccess/lib/schema.tcl
+%%TK%%share/postgresql/pgaccess/lib/scripts.tcl
+%%TK%%share/postgresql/pgaccess/lib/sequences.tcl
+%%TK%%share/postgresql/pgaccess/lib/tables.tcl
+%%TK%%share/postgresql/pgaccess/lib/users.tcl
+%%TK%%share/postgresql/pgaccess/lib/views.tcl
+%%TK%%share/postgresql/pgaccess/lib/visualqb.tcl
+%%TK%%@dirrm share/postgresql/pgaccess/lib
+%%TK%%share/postgresql/pgaccess/images/icon_button.gif
+%%TK%%share/postgresql/pgaccess/images/icon_checkbutton.gif
+%%TK%%share/postgresql/pgaccess/images/icon_entry.gif
+%%TK%%share/postgresql/pgaccess/images/icon_frame.gif
+%%TK%%share/postgresql/pgaccess/images/icon_label.gif
+%%TK%%share/postgresql/pgaccess/images/icon_listbox.gif
+%%TK%%share/postgresql/pgaccess/images/icon_query.gif
+%%TK%%share/postgresql/pgaccess/images/icon_radiobutton.gif
+%%TK%%share/postgresql/pgaccess/images/icon_text.gif
+%%TK%%@dirrm share/postgresql/pgaccess/images
+%%TK%%share/postgresql/pgaccess/main.tcl
+%%TK%%@dirrm share/postgresql/pgaccess
+%%TK%%@unexec rmdir %D/share/postgresql 2>/dev/null || true
diff --git a/japanese/postgresql-tcltk/pkg-plist.doc b/japanese/postgresql-tcltk/pkg-plist.doc
deleted file mode 100644
index 984fe5473b44..000000000000
--- a/japanese/postgresql-tcltk/pkg-plist.doc
+++ /dev/null
@@ -1,494 +0,0 @@
-share/doc/postgresql/html/admin.html
-share/doc/postgresql/html/advanced.html
-share/doc/postgresql/html/altern-locations.html
-share/doc/postgresql/html/app-createdb.html
-share/doc/postgresql/html/app-createlang.html
-share/doc/postgresql/html/app-createuser.html
-share/doc/postgresql/html/app-dropdb.html
-share/doc/postgresql/html/app-droplang.html
-share/doc/postgresql/html/app-dropuser.html
-share/doc/postgresql/html/app-ecpg.html
-share/doc/postgresql/html/app-initdb.html
-share/doc/postgresql/html/app-initlocation.html
-share/doc/postgresql/html/app-ipcclean.html
-share/doc/postgresql/html/app-pg-ctl.html
-share/doc/postgresql/html/app-pg-dumpall.html
-share/doc/postgresql/html/app-pg-passwd.html
-share/doc/postgresql/html/app-pgaccess.html
-share/doc/postgresql/html/app-pgadmin.html
-share/doc/postgresql/html/app-pgconfig.html
-share/doc/postgresql/html/app-pgdump.html
-share/doc/postgresql/html/app-pgrestore.html
-share/doc/postgresql/html/app-pgtclsh.html
-share/doc/postgresql/html/app-pgtksh.html
-share/doc/postgresql/html/app-postgres.html
-share/doc/postgresql/html/app-postmaster.html
-share/doc/postgresql/html/app-psql.html
-share/doc/postgresql/html/app-vacuumdb.html
-share/doc/postgresql/html/applevel-consistency.html
-share/doc/postgresql/html/arch-pg.html
-share/doc/postgresql/html/arch.html
-share/doc/postgresql/html/arrays.html
-share/doc/postgresql/html/auth-methods.html
-share/doc/postgresql/html/backup-file.html
-share/doc/postgresql/html/backup.html
-share/doc/postgresql/html/biblio.html
-share/doc/postgresql/html/bki-commands.html
-share/doc/postgresql/html/bki-example.html
-share/doc/postgresql/html/bki.html
-share/doc/postgresql/html/bug-reporting.html
-share/doc/postgresql/html/catalog-pg-aggregate.html
-share/doc/postgresql/html/catalog-pg-attrdef.html
-share/doc/postgresql/html/catalog-pg-attribute.html
-share/doc/postgresql/html/catalog-pg-class.html
-share/doc/postgresql/html/catalog-pg-database.html
-share/doc/postgresql/html/catalog-pg-description.html
-share/doc/postgresql/html/catalog-pg-group.html
-share/doc/postgresql/html/catalog-pg-index.html
-share/doc/postgresql/html/catalog-pg-inherits.html
-share/doc/postgresql/html/catalog-pg-language.html
-share/doc/postgresql/html/catalog-pg-operator.html
-share/doc/postgresql/html/catalog-pg-proc.html
-share/doc/postgresql/html/catalog-pg-relcheck.html
-share/doc/postgresql/html/catalog-pg-shadow.html
-share/doc/postgresql/html/catalog-pg-type.html
-share/doc/postgresql/html/catalogs.html
-share/doc/postgresql/html/charset.html
-share/doc/postgresql/html/client-authentication-problems.html
-share/doc/postgresql/html/client-authentication.html
-share/doc/postgresql/html/compiler.html
-share/doc/postgresql/html/connect-estab.html
-share/doc/postgresql/html/creating-cluster.html
-share/doc/postgresql/html/cvs-tree.html
-share/doc/postgresql/html/cvs.html
-share/doc/postgresql/html/cvsup.html
-share/doc/postgresql/html/datatype-bit.html
-share/doc/postgresql/html/datatype-boolean.html
-share/doc/postgresql/html/datatype-character.html
-share/doc/postgresql/html/datatype-datetime.html
-share/doc/postgresql/html/datatype-geometric.html
-share/doc/postgresql/html/datatype-money.html
-share/doc/postgresql/html/ecpg.html
-share/doc/postgresql/html/datatype-net-types.html
-share/doc/postgresql/html/datatype.html
-share/doc/postgresql/html/datetime-appendix.html
-share/doc/postgresql/html/db-accessing.html
-share/doc/postgresql/html/db-destroy.html
-share/doc/postgresql/html/developer.html
-share/doc/postgresql/html/doc-build.html
-share/doc/postgresql/html/doc-sources.html
-share/doc/postgresql/html/doc-toolsets.html
-share/doc/postgresql/html/docguide.html
-share/doc/postgresql/html/ecpg-concept.html
-share/doc/postgresql/html/ecpg-develop.html
-share/doc/postgresql/html/ecpg-limitations.html
-share/doc/postgresql/html/ecpg-porting.html
-share/doc/postgresql/html/ecpg-use.html
-share/doc/postgresql/html/executor.html
-share/doc/postgresql/html/explicit-joins.html
-share/doc/postgresql/html/extend.html
-share/doc/postgresql/html/functions-datetime.html
-share/doc/postgresql/html/functions-aggregate.html
-share/doc/postgresql/html/functions-comparison.html
-share/doc/postgresql/html/functions-conditional.html
-share/doc/postgresql/html/functions-formatting.html
-share/doc/postgresql/html/functions-geometry.html
-share/doc/postgresql/html/functions-matching.html
-share/doc/postgresql/html/functions-math.html
-share/doc/postgresql/html/functions-misc.html
-share/doc/postgresql/html/functions-net.html
-share/doc/postgresql/html/functions-string.html
-share/doc/postgresql/html/functions.html
-share/doc/postgresql/html/geqo-intro2.html
-share/doc/postgresql/html/geqo-pg-intro.html
-share/doc/postgresql/html/geqo.html
-share/doc/postgresql/html/gist.html
-share/doc/postgresql/html/groups.html
-share/doc/postgresql/html/history.html
-share/doc/postgresql/html/index.html
-share/doc/postgresql/html/indexcost.html
-share/doc/postgresql/html/indices-functional.html
-share/doc/postgresql/html/indices-multicolumn.html
-share/doc/postgresql/html/indices-opclass.html
-share/doc/postgresql/html/indices-types.html
-share/doc/postgresql/html/indices-unique.html
-share/doc/postgresql/html/indices.html
-share/doc/postgresql/html/inherit.html
-share/doc/postgresql/html/install-getsource.html
-share/doc/postgresql/html/install-post.html
-share/doc/postgresql/html/install-procedure.html
-share/doc/postgresql/html/install-requirements.html
-share/doc/postgresql/html/install-upgrading.html
-share/doc/postgresql/html/install-win32.html
-share/doc/postgresql/html/installation.html
-share/doc/postgresql/html/jdbc-ext.html
-share/doc/postgresql/html/jdbc-lo.html
-share/doc/postgresql/html/jdbc.html
-share/doc/postgresql/html/jdbc-query.html
-share/doc/postgresql/html/jdbc-reading.html
-share/doc/postgresql/html/jdbc-thread.html
-share/doc/postgresql/html/jdbc-update.html
-share/doc/postgresql/html/jdbc-use.html
-share/doc/postgresql/html/kernel-resources.html
-share/doc/postgresql/html/keys.html
-share/doc/postgresql/html/largeobjects.html
-share/doc/postgresql/html/libpgtcl-examples.html
-share/doc/postgresql/html/libpgtcl-ref.html
-share/doc/postgresql/html/libpq-async.html
-share/doc/postgresql/html/libpq-control.html
-share/doc/postgresql/html/libpq-copy.html
-share/doc/postgresql/html/libpq-envars.html
-share/doc/postgresql/html/libpq-example.html
-share/doc/postgresql/html/libpq-exec.html
-share/doc/postgresql/html/libpq-fastpath.html
-share/doc/postgresql/html/libpq-notify.html
-share/doc/postgresql/html/libpq.html
-share/doc/postgresql/html/libpq-threading.html
-share/doc/postgresql/html/libpq-trace.html
-share/doc/postgresql/html/libpqplusplus.html
-share/doc/postgresql/html/libpqpp-classes.html
-share/doc/postgresql/html/libpqpp-connect.html
-share/doc/postgresql/html/libpqpp-copy.html
-share/doc/postgresql/html/libpqpp-exec.html
-share/doc/postgresql/html/libpqpp-notify.html
-share/doc/postgresql/html/lisp.html
-share/doc/postgresql/html/ln1274.html
-share/doc/postgresql/html/ln11330.html
-share/doc/postgresql/html/ln15181.html
-share/doc/postgresql/html/ln25010.html
-share/doc/postgresql/html/ln24.html
-share/doc/postgresql/html/ln37176.html
-share/doc/postgresql/html/ln8.html
-share/doc/postgresql/html/lo-funcs.html
-share/doc/postgresql/html/lo-implementation.html
-share/doc/postgresql/html/lo-interfaces.html
-share/doc/postgresql/html/lo-libpq.html
-share/doc/postgresql/html/lo-sample.html
-share/doc/postgresql/html/locking-indices.html
-share/doc/postgresql/html/locking-tables.html
-share/doc/postgresql/html/manage-ag-accessdb.html
-share/doc/postgresql/html/manage-ag-dropdb.html
-share/doc/postgresql/html/manage.html
-share/doc/postgresql/html/managing-databases.html
-share/doc/postgresql/html/migration.html
-share/doc/postgresql/html/more-advanced.html
-share/doc/postgresql/html/multibyte.html
-share/doc/postgresql/html/mvcc.html
-share/doc/postgresql/html/non-atomic-values.html
-share/doc/postgresql/html/notation.html
-share/doc/postgresql/html/odbc-applixware.html
-share/doc/postgresql/html/odbc-config.html
-share/doc/postgresql/html/odbc-install.html
-share/doc/postgresql/html/odbc-windows.html
-share/doc/postgresql/html/odbc.html
-share/doc/postgresql/html/organization.html
-share/doc/postgresql/html/overview.html
-share/doc/postgresql/html/page.html
-share/doc/postgresql/html/parser-stage.html
-share/doc/postgresql/html/partial-index.html
-share/doc/postgresql/html/performance-tips.html
-share/doc/postgresql/html/perm-functions.html
-share/doc/postgresql/html/pg-system-catalogs.html
-share/doc/postgresql/html/pgeasy-chapter.html
-share/doc/postgresql/html/pgtcl-pgconndefaults.html
-share/doc/postgresql/html/pgtcl-pgconnect.html
-share/doc/postgresql/html/pgtcl-pgdisconnect.html
-share/doc/postgresql/html/pgtcl-pgexec.html
-share/doc/postgresql/html/pgtcl-pglisten.html
-share/doc/postgresql/html/pgtcl-pgloclose.html
-share/doc/postgresql/html/pgtcl-pglocreat.html
-share/doc/postgresql/html/pgtcl-pgloexport.html
-share/doc/postgresql/html/pgtcl-pgloimport.html
-share/doc/postgresql/html/pgtcl-pglolseek.html
-share/doc/postgresql/html/pgtcl-pgloopen.html
-share/doc/postgresql/html/pgtcl-pgloread.html
-share/doc/postgresql/html/pgtcl-pglotell.html
-share/doc/postgresql/html/pgtcl-pglounlink.html
-share/doc/postgresql/html/pgtcl-pglowrite.html
-share/doc/postgresql/html/pgtcl-pgresult.html
-share/doc/postgresql/html/pgtcl-pgselect.html
-share/doc/postgresql/html/pgtcl.html
-share/doc/postgresql/html/planner-optimizer.html
-share/doc/postgresql/html/plperl-use.html
-share/doc/postgresql/html/plperl.html
-share/doc/postgresql/html/plpgsql-description.html
-share/doc/postgresql/html/plpgsql-examples.html
-share/doc/postgresql/html/plpgsql-porting.html
-share/doc/postgresql/html/plpgsql-trigger.html
-share/doc/postgresql/html/plpgsql.html
-share/doc/postgresql/html/pltcl-description.html
-share/doc/postgresql/html/pltcl.html
-share/doc/postgresql/html/populate.html
-share/doc/postgresql/html/postgres.html
-share/doc/postgresql/html/postmaster-shutdown.html
-share/doc/postgresql/html/postmaster-start.html
-share/doc/postgresql/html/preface.html
-share/doc/postgresql/html/privileges.html
-share/doc/postgresql/html/programmer-client.html
-share/doc/postgresql/html/programmer-pl.html
-share/doc/postgresql/html/programmer-server.html
-share/doc/postgresql/html/programmer.html
-share/doc/postgresql/html/protocol-message-formats.html
-share/doc/postgresql/html/protocol-message-types.html
-share/doc/postgresql/html/protocol-protocol.html
-share/doc/postgresql/html/protocol.html
-share/doc/postgresql/html/pygresql.html
-share/doc/postgresql/html/pygresql-close.html
-share/doc/postgresql/html/pygresql-connect.html
-share/doc/postgresql/html/pygresql-db-api.html
-share/doc/postgresql/html/pygresql-db-clear.html
-share/doc/postgresql/html/pygresql-db-delete.html
-share/doc/postgresql/html/pygresql-db-get-attnames.html
-share/doc/postgresql/html/pygresql-db-get-databases.html
-share/doc/postgresql/html/pygresql-db-get-tables.html
-share/doc/postgresql/html/pygresql-db-get.html
-share/doc/postgresql/html/pygresql-db-insert.html
-share/doc/postgresql/html/pygresql-db-pkey.html
-share/doc/postgresql/html/pygresql-db-update.html
-share/doc/postgresql/html/pygresql-endcopy.html
-share/doc/postgresql/html/pygresql-fileno.html
-share/doc/postgresql/html/pygresql-get-defbase.html
-share/doc/postgresql/html/pygresql-get-defhost.html
-share/doc/postgresql/html/pygresql-get-defopt.html
-share/doc/postgresql/html/pygresql-get-defport.html
-share/doc/postgresql/html/pygresql-get-deftty.html
-share/doc/postgresql/html/pygresql-getline.html
-share/doc/postgresql/html/pygresql-getlo.html
-share/doc/postgresql/html/pygresql-getnotify.html
-share/doc/postgresql/html/pygresql-inserttable.html
-share/doc/postgresql/html/pygresql-locreate.html
-share/doc/postgresql/html/pygresql-loimport.html
-share/doc/postgresql/html/pygresql-pg-db.html
-share/doc/postgresql/html/pygresql-pg-functions.html
-share/doc/postgresql/html/pygresql-pg-pglarge.html
-share/doc/postgresql/html/pygresql-pg-pgobject.html
-share/doc/postgresql/html/pygresql-pg-pgqueryobject.html
-share/doc/postgresql/html/pygresql-pglargeobject-close.html
-share/doc/postgresql/html/pygresql-pglargeobject-export.html
-share/doc/postgresql/html/pygresql-pglargeobject-open.html
-share/doc/postgresql/html/pygresql-pglargeobject-read.html
-share/doc/postgresql/html/pygresql-pglargeobject-seek.html
-share/doc/postgresql/html/pygresql-pglargeobject-size.html
-share/doc/postgresql/html/pygresql-pglargeobject-tell.html
-share/doc/postgresql/html/pygresql-pglargeobject-unlink.html
-share/doc/postgresql/html/pygresql-pglargeobject-write.html
-share/doc/postgresql/html/pygresql-pgqueryobject-dictresult.html
-share/doc/postgresql/html/pygresql-pgqueryobject-fieldname.html
-share/doc/postgresql/html/query.html
-share/doc/postgresql/html/pygresql-pgqueryobject-fieldnum.html
-share/doc/postgresql/html/pygresql-pgqueryobject-getresult.html
-share/doc/postgresql/html/pygresql-pgqueryobject-listfields.html
-share/doc/postgresql/html/pygresql-pgqueryobject-ntuples.html
-share/doc/postgresql/html/pygresql-putline.html
-share/doc/postgresql/html/pygresql-query.html
-share/doc/postgresql/html/pygresql-reset.html
-share/doc/postgresql/html/pygresql-set-defbase.html
-share/doc/postgresql/html/pygresql-set-defhost.html
-share/doc/postgresql/html/pygresql-set-defopt.html
-share/doc/postgresql/html/pygresql-set-defport.html
-share/doc/postgresql/html/pygresql-set-deftty.html
-share/doc/postgresql/html/queries-limit.html
-share/doc/postgresql/html/queries-order.html
-share/doc/postgresql/html/queries-select-lists.html
-share/doc/postgresql/html/queries-union.html
-share/doc/postgresql/html/queries.html
-share/doc/postgresql/html/query-agg.html
-share/doc/postgresql/html/query-concepts.html
-share/doc/postgresql/html/query-delete.html
-share/doc/postgresql/html/query-join.html
-share/doc/postgresql/html/query-populate.html
-share/doc/postgresql/html/query-query.html
-share/doc/postgresql/html/query-selectinto.html
-share/doc/postgresql/html/query-table.html
-share/doc/postgresql/html/query-update.html
-share/doc/postgresql/html/recode.html
-share/doc/postgresql/html/recovery.html
-share/doc/postgresql/html/reference-client.html
-share/doc/postgresql/html/reference-server.html
-share/doc/postgresql/html/reference.html
-share/doc/postgresql/html/regress-platform.html
-share/doc/postgresql/html/regress.html
-share/doc/postgresql/html/release-0-01.html
-share/doc/postgresql/html/release-0-02.html
-share/doc/postgresql/html/release-0-03.html
-share/doc/postgresql/html/release-1-0.html
-share/doc/postgresql/html/release-1-01.html
-share/doc/postgresql/html/release-1-02.html
-share/doc/postgresql/html/release-1-09.html
-share/doc/postgresql/html/release-6-0.html
-share/doc/postgresql/html/release-6-1-1.html
-share/doc/postgresql/html/release-6-1.html
-share/doc/postgresql/html/release-6-2-1.html
-share/doc/postgresql/html/release-6-2.html
-share/doc/postgresql/html/release-6-3-1.html
-share/doc/postgresql/html/release-6-3-2.html
-share/doc/postgresql/html/release-6-3.html
-share/doc/postgresql/html/release-6-4-1.html
-share/doc/postgresql/html/release-6-4-2.html
-share/doc/postgresql/html/release-6-4.html
-share/doc/postgresql/html/release-6-5-1.html
-share/doc/postgresql/html/release-6-5-2.html
-share/doc/postgresql/html/release-6-5-3.html
-share/doc/postgresql/html/release-6-5.html
-share/doc/postgresql/html/release-7-0-1.html
-share/doc/postgresql/html/release-7-0-2.html
-share/doc/postgresql/html/release-7-0-3.html
-share/doc/postgresql/html/release-7-0.html
-share/doc/postgresql/html/release-7-1.html
-share/doc/postgresql/html/release-7-1-1.html
-share/doc/postgresql/html/release-7-1-2.html
-share/doc/postgresql/html/release.html
-share/doc/postgresql/html/relmodel-formal.html
-share/doc/postgresql/html/relmodel-oper.html
-share/doc/postgresql/html/resources.html
-share/doc/postgresql/html/rule-system.html
-share/doc/postgresql/html/rules-insert.html
-share/doc/postgresql/html/rules-permissions.html
-share/doc/postgresql/html/rules-triggers.html
-share/doc/postgresql/html/rules-views.html
-share/doc/postgresql/html/rules.html
-share/doc/postgresql/html/runtime-config.html
-share/doc/postgresql/html/runtime.html
-share/doc/postgresql/html/source.html
-share/doc/postgresql/html/spi-examples.html
-share/doc/postgresql/html/spi-interface-support.html
-share/doc/postgresql/html/spi-memory.html
-share/doc/postgresql/html/spi-spiconnect.html
-share/doc/postgresql/html/spi-spicopytuple.html
-share/doc/postgresql/html/spi-spiexec.html
-share/doc/postgresql/html/spi-spiexecp.html
-share/doc/postgresql/html/spi-spifinish.html
-share/doc/postgresql/html/spi-spifname.html
-share/doc/postgresql/html/spi-spifnumber.html
-share/doc/postgresql/html/spi-spigetbinval.html
-share/doc/postgresql/html/spi-spigetrelname.html
-share/doc/postgresql/html/spi-spigettype.html
-share/doc/postgresql/html/spi-spigettypeid.html
-share/doc/postgresql/html/spi-spigetvalue.html
-share/doc/postgresql/html/spi-spimodifytuple.html
-share/doc/postgresql/html/spi-spipalloc.html
-share/doc/postgresql/html/spi-spipfree.html
-share/doc/postgresql/html/spi-spiprepare.html
-share/doc/postgresql/html/spi-spirepalloc.html
-share/doc/postgresql/html/spi-spisaveplan.html
-share/doc/postgresql/html/spi-visibility.html
-share/doc/postgresql/html/spi.html
-share/doc/postgresql/html/sql-abort.html
-share/doc/postgresql/html/sql-altergroup.html
-share/doc/postgresql/html/sql-altertable.html
-share/doc/postgresql/html/sql-alteruser.html
-share/doc/postgresql/html/sql-begin.html
-share/doc/postgresql/html/sql-checkpoint.html
-share/doc/postgresql/html/sql-close.html
-share/doc/postgresql/html/sql-cluster.html
-share/doc/postgresql/html/sql-commands.html
-share/doc/postgresql/html/sql-comment.html
-share/doc/postgresql/html/sql-commit.html
-share/doc/postgresql/html/sql-copy.html
-share/doc/postgresql/html/sql-createaggregate.html
-share/doc/postgresql/html/sql-createconstraint.html
-share/doc/postgresql/html/sql-createdatabase.html
-share/doc/postgresql/html/sql-createfunction.html
-share/doc/postgresql/html/sql-creategroup.html
-share/doc/postgresql/html/sql-createindex.html
-share/doc/postgresql/html/sql-createlanguage.html
-share/doc/postgresql/html/sql-createoperator.html
-share/doc/postgresql/html/sql-createrule.html
-share/doc/postgresql/html/sql-createsequence.html
-share/doc/postgresql/html/sql-createtable.html
-share/doc/postgresql/html/sql-createtableas.html
-share/doc/postgresql/html/sql-createtrigger.html
-share/doc/postgresql/html/sql-createtype.html
-share/doc/postgresql/html/sql-createuser.html
-share/doc/postgresql/html/sql-createview.html
-share/doc/postgresql/html/sql-declare.html
-share/doc/postgresql/html/sql-delete.html
-share/doc/postgresql/html/sql-dropaggregate.html
-share/doc/postgresql/html/sql-dropdatabase.html
-share/doc/postgresql/html/sql-dropfunction.html
-share/doc/postgresql/html/sql-dropgroup.html
-share/doc/postgresql/html/sql-dropindex.html
-share/doc/postgresql/html/sql-droplanguage.html
-share/doc/postgresql/html/sql-dropoperator.html
-share/doc/postgresql/html/sql-droprule.html
-share/doc/postgresql/html/sql-dropsequence.html
-share/doc/postgresql/html/sql-droptable.html
-share/doc/postgresql/html/sql-droptrigger.html
-share/doc/postgresql/html/sql-droptype.html
-share/doc/postgresql/html/sql-dropuser.html
-share/doc/postgresql/html/sql-dropview.html
-share/doc/postgresql/html/sql-end.html
-share/doc/postgresql/html/sql-explain.html
-share/doc/postgresql/html/sql-expressions.html
-share/doc/postgresql/html/sql-fetch.html
-share/doc/postgresql/html/sql-grant.html
-share/doc/postgresql/html/sql-insert.html
-share/doc/postgresql/html/sql-keywords-appendix.html
-share/doc/postgresql/html/sql-language.html
-share/doc/postgresql/html/sql-listen.html
-share/doc/postgresql/html/sql-load.html
-share/doc/postgresql/html/sql-lock.html
-share/doc/postgresql/html/sql-move.html
-share/doc/postgresql/html/sql-notify.html
-share/doc/postgresql/html/sql-precedence.html
-share/doc/postgresql/html/sql-reindex.html
-share/doc/postgresql/html/sql-reset.html
-share/doc/postgresql/html/sql-revoke.html
-share/doc/postgresql/html/sql-rollback.html
-share/doc/postgresql/html/sql-select.html
-share/doc/postgresql/html/sql-selectinto.html
-share/doc/postgresql/html/sql-set-constraints.html
-share/doc/postgresql/html/sql-set-transaction.html
-share/doc/postgresql/html/sql-set.html
-share/doc/postgresql/html/sql-show.html
-share/doc/postgresql/html/sql-syntax-columns.html
-share/doc/postgresql/html/sql-syntax.html
-share/doc/postgresql/html/sql-truncate.html
-share/doc/postgresql/html/sql-unlisten.html
-share/doc/postgresql/html/sql-update.html
-share/doc/postgresql/html/sql-vacuum.html
-share/doc/postgresql/html/sql.html
-share/doc/postgresql/html/ssh-tunnels.html
-share/doc/postgresql/html/ssl-tcp.html
-share/doc/postgresql/html/start-manage-db.html
-share/doc/postgresql/html/start-psql.html
-share/doc/postgresql/html/start.html
-share/doc/postgresql/html/storage.html
-share/doc/postgresql/html/supported-platforms.html
-share/doc/postgresql/html/timing-results.html
-share/doc/postgresql/html/transaction-iso.html
-share/doc/postgresql/html/trigger-datachanges.html
-share/doc/postgresql/html/trigger-examples.html
-share/doc/postgresql/html/trigger-manager.html
-share/doc/postgresql/html/triggers.html
-share/doc/postgresql/html/tutorial.html
-share/doc/postgresql/html/type-system.html
-share/doc/postgresql/html/typeconv-func.html
-share/doc/postgresql/html/typeconv-oper.html
-share/doc/postgresql/html/typeconv-query.html
-share/doc/postgresql/html/typeconv-union-case.html
-share/doc/postgresql/html/typeconv.html
-share/doc/postgresql/html/units-history.html
-share/doc/postgresql/html/user-manag.html
-share/doc/postgresql/html/user.html
-share/doc/postgresql/html/wal-configuration.html
-share/doc/postgresql/html/wal-implementation.html
-share/doc/postgresql/html/wal.html
-share/doc/postgresql/html/xact-read-committed.html
-share/doc/postgresql/html/xact-serializable.html
-share/doc/postgresql/html/xaggr.html
-share/doc/postgresql/html/xfunc-c.html
-share/doc/postgresql/html/xfunc-internal.html
-share/doc/postgresql/html/xfunc-overload.html
-share/doc/postgresql/html/xfunc-pl.html
-share/doc/postgresql/html/xfunc.html
-share/doc/postgresql/html/xindex.html
-share/doc/postgresql/html/xoper.html
-share/doc/postgresql/html/xplang.html
-share/doc/postgresql/html/xtypes.html
-share/doc/postgresql/html/y2k.html
-share/doc/postgresql/html/catalogs.gif
-share/doc/postgresql/html/clientserver.gif
-share/doc/postgresql/html/connections.gif
-@dirrm share/doc/postgresql/html
-@dirrm share/doc/postgresql
diff --git a/japanese/postgresql-tcltk/pkg-plist.jdbc b/japanese/postgresql-tcltk/pkg-plist.jdbc
deleted file mode 100644
index 8f7bd41a54d7..000000000000
--- a/japanese/postgresql-tcltk/pkg-plist.jdbc
+++ /dev/null
@@ -1,27 +0,0 @@
-share/examples/postgresql/corba/StockClient.java
-share/examples/postgresql/corba/StockDB.java
-share/examples/postgresql/corba/StockDispenserImpl.java
-share/examples/postgresql/corba/StockItemImpl.java
-share/examples/postgresql/corba/StockServer.java
-share/examples/postgresql/corba/readme
-share/examples/postgresql/corba/stock.idl
-share/examples/postgresql/corba/stock.sql
-@dirrm share/examples/postgresql/corba
-share/examples/postgresql/ImageViewer.java
-share/examples/postgresql/Unicode.java
-share/examples/postgresql/basic.java
-share/examples/postgresql/blobtest.java
-share/examples/postgresql/datestyle.java
-share/examples/postgresql/metadata.java
-share/examples/postgresql/psql.java
-share/examples/postgresql/threadsafe.java
-share/examples/postgresql/README
-share/examples/postgresql/Implementation
-@dirrm share/examples/postgresql
-share/postgresql/java/postgresql-examples.jar
-share/postgresql/java/postgresql.jar
-share/postgresql/java/retepTools.jar
-@dirrm share/postgresql/java
-share/java/classes/postgresql.jar
-@unexec rmdir %D/share/java/classes 2>/dev/null || true
-@unexec rmdir %D/share/java 2>/dev/null || true
diff --git a/japanese/postgresql-tcltk/pkg-plist.notk b/japanese/postgresql-tcltk/pkg-plist.notk
deleted file mode 100644
index 8dcbc5f88bd6..000000000000
--- a/japanese/postgresql-tcltk/pkg-plist.notk
+++ /dev/null
@@ -1,6 +0,0 @@
-%%PG_PREFIX%%bin/pgtclsh
-%%PG_INCLUDE%%/libpgtcl.h
-%%PG_PREFIX%%lib/libpgtcl.a
-%%PG_PREFIX%%lib/libpgtcl.so
-%%PG_PREFIX%%lib/libpgtcl.so.2
-%%PG_PREFIX%%lib/pltcl.so
diff --git a/japanese/postgresql-tcltk/pkg-plist.odbc b/japanese/postgresql-tcltk/pkg-plist.odbc
deleted file mode 100644
index f047b7cb64a1..000000000000
--- a/japanese/postgresql-tcltk/pkg-plist.odbc
+++ /dev/null
@@ -1,10 +0,0 @@
-%%PG_INCLUDE%%/iodbc/iodbc.h
-%%PG_INCLUDE%%/iodbc/isql.h
-%%PG_INCLUDE%%/iodbc/isqlext.h
-@dirrm %%PG_INCLUDE%%/iodbc
-%%PG_PREFIX%%lib/libpsqlodbc.a
-%%PG_PREFIX%%lib/libpsqlodbc.so
-%%PG_PREFIX%%lib/libpsqlodbc.so.0
-etc/postgresql/odbcinst.ini
-@dirrm etc/postgresql
-share/postgresql/odbc.sql
diff --git a/japanese/postgresql-tcltk/pkg-plist.tcl b/japanese/postgresql-tcltk/pkg-plist.tcl
deleted file mode 100644
index da5f4367cb80..000000000000
--- a/japanese/postgresql-tcltk/pkg-plist.tcl
+++ /dev/null
@@ -1,148 +0,0 @@
-%%PG_PREFIX%%bin/pgaccess
-%%PG_PREFIX%%bin/pgtclsh
-%%PG_PREFIX%%bin/pgtksh
-%%PG_INCLUDE%%/libpgtcl.h
-%%PG_PREFIX%%lib/libpgtcl.a
-%%PG_PREFIX%%lib/libpgtcl.so
-%%PG_PREFIX%%lib/libpgtcl.so.2
-%%PG_PREFIX%%lib/pltcl.so
-lib/tcl%%WITH_TCL%%/Pgtcl1.3/pkgIndex.tcl
-share/postgresql/pgaccess/images/icon_button.gif
-share/postgresql/pgaccess/images/icon_checkbutton.gif
-share/postgresql/pgaccess/images/icon_entry.gif
-share/postgresql/pgaccess/images/icon_frame.gif
-share/postgresql/pgaccess/images/icon_label.gif
-share/postgresql/pgaccess/images/icon_listbox.gif
-share/postgresql/pgaccess/images/icon_query.gif
-share/postgresql/pgaccess/images/icon_radiobutton.gif
-share/postgresql/pgaccess/images/icon_text.gif
-share/postgresql/pgaccess/lib/database.tcl
-share/postgresql/pgaccess/lib/forms.tcl
-share/postgresql/pgaccess/lib/functions.tcl
-share/postgresql/pgaccess/lib/help/abort.hlp
-share/postgresql/pgaccess/lib/help/add_records.hlp
-share/postgresql/pgaccess/lib/help/alter_table.hlp
-share/postgresql/pgaccess/lib/help/alter_user.hlp
-share/postgresql/pgaccess/lib/help/author.hlp
-share/postgresql/pgaccess/lib/help/begin.hlp
-share/postgresql/pgaccess/lib/help/close.hlp
-share/postgresql/pgaccess/lib/help/cluster.hlp
-share/postgresql/pgaccess/lib/help/commit.hlp
-share/postgresql/pgaccess/lib/help/copy.hlp
-share/postgresql/pgaccess/lib/help/copyrights.hlp
-share/postgresql/pgaccess/lib/help/create_aggregate.hlp
-share/postgresql/pgaccess/lib/help/create_database.hlp
-share/postgresql/pgaccess/lib/help/create_function.hlp
-share/postgresql/pgaccess/lib/help/create_index.hlp
-share/postgresql/pgaccess/lib/help/create_language.hlp
-share/postgresql/pgaccess/lib/help/create_operator.hlp
-share/postgresql/pgaccess/lib/help/create_rule.hlp
-share/postgresql/pgaccess/lib/help/create_sequence.hlp
-share/postgresql/pgaccess/lib/help/create_table.hlp
-share/postgresql/pgaccess/lib/help/create_table_as.hlp
-share/postgresql/pgaccess/lib/help/create_trigger.hlp
-share/postgresql/pgaccess/lib/help/create_type.hlp
-share/postgresql/pgaccess/lib/help/create_user.hlp
-share/postgresql/pgaccess/lib/help/create_view.hlp
-share/postgresql/pgaccess/lib/help/data_types.hlp
-share/postgresql/pgaccess/lib/help/datefunc.hlp
-share/postgresql/pgaccess/lib/help/declare.hlp
-share/postgresql/pgaccess/lib/help/delete.hlp
-share/postgresql/pgaccess/lib/help/drop_aggregate.hlp
-share/postgresql/pgaccess/lib/help/drop_database.hlp
-share/postgresql/pgaccess/lib/help/drop_function.hlp
-share/postgresql/pgaccess/lib/help/drop_index.hlp
-share/postgresql/pgaccess/lib/help/drop_language.hlp
-share/postgresql/pgaccess/lib/help/drop_operator.hlp
-share/postgresql/pgaccess/lib/help/drop_rule.hlp
-share/postgresql/pgaccess/lib/help/drop_sequence.hlp
-share/postgresql/pgaccess/lib/help/drop_table.hlp
-share/postgresql/pgaccess/lib/help/drop_trigger.hlp
-share/postgresql/pgaccess/lib/help/drop_type.hlp
-share/postgresql/pgaccess/lib/help/drop_user.hlp
-share/postgresql/pgaccess/lib/help/drop_view.hlp
-share/postgresql/pgaccess/lib/help/explain.hlp
-share/postgresql/pgaccess/lib/help/fetch.hlp
-share/postgresql/pgaccess/lib/help/form_design.hlp
-share/postgresql/pgaccess/lib/help/forms.hlp
-share/postgresql/pgaccess/lib/help/functions.hlp
-share/postgresql/pgaccess/lib/help/geomfunc.hlp
-share/postgresql/pgaccess/lib/help/grant.hlp
-share/postgresql/pgaccess/lib/help/history.hlp
-share/postgresql/pgaccess/lib/help/index.hlp
-share/postgresql/pgaccess/lib/help/inheritance.hlp
-share/postgresql/pgaccess/lib/help/insert.hlp
-share/postgresql/pgaccess/lib/help/ipv4func.hlp
-share/postgresql/pgaccess/lib/help/isolation.hlp
-share/postgresql/pgaccess/lib/help/keywords.hlp
-share/postgresql/pgaccess/lib/help/listen.hlp
-share/postgresql/pgaccess/lib/help/load.hlp
-share/postgresql/pgaccess/lib/help/lock.hlp
-share/postgresql/pgaccess/lib/help/mathfunc.hlp
-share/postgresql/pgaccess/lib/help/move.hlp
-share/postgresql/pgaccess/lib/help/mvcc.hlp
-share/postgresql/pgaccess/lib/help/new_query.hlp
-share/postgresql/pgaccess/lib/help/new_table.hlp
-share/postgresql/pgaccess/lib/help/notify.hlp
-share/postgresql/pgaccess/lib/help/open_query.hlp
-share/postgresql/pgaccess/lib/help/open_table.hlp
-share/postgresql/pgaccess/lib/help/pgfunctions.hlp
-share/postgresql/pgaccess/lib/help/postgresql.hlp
-share/postgresql/pgaccess/lib/help/queries.hlp
-share/postgresql/pgaccess/lib/help/reports.hlp
-share/postgresql/pgaccess/lib/help/reset.hlp
-share/postgresql/pgaccess/lib/help/revoke.hlp
-share/postgresql/pgaccess/lib/help/rollback.hlp
-share/postgresql/pgaccess/lib/help/schema.hlp
-share/postgresql/pgaccess/lib/help/scripts.hlp
-share/postgresql/pgaccess/lib/help/select.hlp
-share/postgresql/pgaccess/lib/help/select_into.hlp
-share/postgresql/pgaccess/lib/help/sequences.hlp
-share/postgresql/pgaccess/lib/help/set.hlp
-share/postgresql/pgaccess/lib/help/show.hlp
-share/postgresql/pgaccess/lib/help/sql_guide.hlp
-share/postgresql/pgaccess/lib/help/sqlfunc.hlp
-share/postgresql/pgaccess/lib/help/stringfunc.hlp
-share/postgresql/pgaccess/lib/help/tables.hlp
-share/postgresql/pgaccess/lib/help/unlisten.hlp
-share/postgresql/pgaccess/lib/help/update.hlp
-share/postgresql/pgaccess/lib/help/users.hlp
-share/postgresql/pgaccess/lib/help/vacuum.hlp
-share/postgresql/pgaccess/lib/help/view_table_structure.hlp
-share/postgresql/pgaccess/lib/help/views.hlp
-share/postgresql/pgaccess/lib/help/visual_designer.hlp
-share/postgresql/pgaccess/lib/help/y2k.hlp
-share/postgresql/pgaccess/lib/help.tcl
-share/postgresql/pgaccess/lib/languages/czech
-share/postgresql/pgaccess/lib/languages/chinese_big5
-share/postgresql/pgaccess/lib/languages/chinese_gb
-share/postgresql/pgaccess/lib/languages/deutsch
-share/postgresql/pgaccess/lib/languages/euskara
-share/postgresql/pgaccess/lib/languages/francais
-share/postgresql/pgaccess/lib/languages/italiano
-share/postgresql/pgaccess/lib/languages/japanese
-share/postgresql/pgaccess/lib/languages/magyar
-share/postgresql/pgaccess/lib/languages/nederlands
-share/postgresql/pgaccess/lib/languages/portugues
-share/postgresql/pgaccess/lib/languages/romana
-share/postgresql/pgaccess/lib/languages/russian.koi8r
-share/postgresql/pgaccess/lib/languages/russian_win
-share/postgresql/pgaccess/lib/languages/spanish
-share/postgresql/pgaccess/lib/mainlib.tcl
-share/postgresql/pgaccess/lib/preferences.tcl
-share/postgresql/pgaccess/lib/queries.tcl
-share/postgresql/pgaccess/lib/reports.tcl
-share/postgresql/pgaccess/lib/schema.tcl
-share/postgresql/pgaccess/lib/scripts.tcl
-share/postgresql/pgaccess/lib/sequences.tcl
-share/postgresql/pgaccess/lib/tables.tcl
-share/postgresql/pgaccess/lib/users.tcl
-share/postgresql/pgaccess/lib/views.tcl
-share/postgresql/pgaccess/lib/visualqb.tcl
-share/postgresql/pgaccess/main.tcl
-@dirrm share/postgresql/pgaccess/images
-@dirrm share/postgresql/pgaccess/lib/help
-@dirrm share/postgresql/pgaccess/lib/languages
-@dirrm share/postgresql/pgaccess/lib
-@dirrm share/postgresql/pgaccess
-@dirrm lib/tcl%%WITH_TCL%%/Pgtcl1.3
diff --git a/japanese/postgresql-tcltk/scripts/configure.postgresql b/japanese/postgresql-tcltk/scripts/configure.postgresql
deleted file mode 100644
index 6215d5b6dad3..000000000000
--- a/japanese/postgresql-tcltk/scripts/configure.postgresql
+++ /dev/null
@@ -1,277 +0,0 @@
-#!/bin/sh
-# -*- tab-width: 4; -*-
-# ex:ts=4
-#
-# $FreeBSD: /tmp/pcvs/ports/japanese/postgresql-tcltk/scripts/Attic/configure.postgresql,v 1.3 2001-06-13 15:30:50 knu Exp $
-#
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-if [ ! "${BATCH}" ]; then
-	dialog --title "Backup your data NOW" \
-	--msgbox "`sed -e \"s#%%PREFIX%%#${PREFIX}#\" < ${FILESDIR}/pre-install-notes`" \
-	-1 -1
-fi
-
-if [ "${BATCH}" ]; then
-	set \"MultiByte\" \"ODBC\" \"SSL\" \"TCL\" \"TCLTK\"
-else
-	/usr/bin/dialog --title "configuration options" --clear \
-					--checklist "\n\
-Please select desired options:" -1 -1 7 \
-JDBC       "Java DataBase Connectivity" OFF \
-MultiByte  "Multibyte for Multilingualism" ON \
-ODBC       "Open Database Connectivity" ON \
-TCL        "Tcl" ON \
-TCLTK      "Tcl/Tk" ON \
-SSL        "Secure Socket Layer" ON \
-KRB5       "Kerberos 5" OFF \
-2> /tmp/checklist.tmp.$$
-
-	retval=$?
-
-	if [ -s /tmp/checklist.tmp.$$ ]; then
-		set `cat /tmp/checklist.tmp.$$`
-	fi
-	rm -f /tmp/checklist.tmp.$$
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-while [ "$1" ]; do
-	case $1 in
-		\"JDBC\")
-			# We use JAVA_HOME if set correctly. If the user has
-			# specified a JVM with JAVA_HOME or via the javavmwrapper,
-			# we validate that it really exists. It is unnecessarily
-			# complicated and error prone to try to figure out the
-			# correct java version just to be able to determine a
-			# BUILD_DEPEND in this case. Instead, assume that a set
-			# JAVA_HOME together with simple sanity check mean we have
-			# an installed JVM, and we don't bother setting
-			# BUILD_DEPENDS.
-
-			echo "# JDBC"
-			# if JAVA_HOME is set and exists, use it
-			if [ "${JAVA_HOME}" -a -x "${JAVA_HOME}/bin/javac" ]; then
-				echo JAVA_HOME=${JAVA_HOME}
-			else
-				# No JAVA_HOME, check javavmwrapper's config file
-				if [ -r "${LOCALBASE}/etc/javavms" ]; then
-					VMS=`/usr/bin/sed 's|#.*||' < "${LOCALBASE}/etc/javavms" | uniq`
-					for JAVAVM in ${VMS}; do
-						if [ -x "${JAVAVM}" ]; then
-							JAVA_HOME=`echo ${JAVAVM} | /usr/bin/sed 's|/bin/java$||`
-							break
-						fi
-					done
-				fi
-				if [ "${JAVA_HOME}" -a -x "${JAVA_HOME}/bin/javac" ]; then
-					# yep, wrapper was good
-					echo JAVA_HOME=${JAVA_HOME}
-				else
-					# nothing, use our boring 1.1.8, the only native non-beta jdk :(
-					echo BUILD_DEPENDS+=    \${LOCALBASE}/jdk1.1.8/bin/javac:\${PORTSDIR}/java/jdk
-					echo JAVA_HOME=\${LOCALBASE}/jdk1.1.8
-				fi
-			fi
-			cat <<-EOF
-				BUILD_DEPENDS+=	\${LOCALBASE}/bin/ant:\${PORTSDIR}/devel/jakarta-ant
-				CONFIGURE_ENV+= ANT=\${LOCALBASE}/bin/ant
-				WITH_JDBC=YES
-				MAKE_ENV+=	JAVA_HOME=\${JAVA_HOME}
-				SCRIPTS_ENV+=	JAVA_HOME=\${JAVA_HOME}
-				CONFIGURE_ARGS+=	--with-java
-
-			EOF
-			;;
-		\"MultiByte\")
-			MULTIBYTE=1
-			;;
-		\"ODBC\")
-			cat <<-EOF
-				# ODBC
-				WITH_ODBC=YES
-				CONFIGURE_ARGS+=  --with-odbc
-
-			EOF
-			;;
-		\"TCL\")
-			TCL=1
-			;;
-		\"TCLTK\")
-			echo "#TCLTK"
-			echo WITH_TK=YES
-			echo
-			TCL=1
-			;;
-		\"SSL\")
-			cat <<-EOF
-				# SSL
-				USE_OPENSSL=    yes
-				CFLAGS+=	-DUSE_SSL
-				WITH_SSL=	yes
-				CONFIGURE_ENV+=	LDFLAGS="-L\${OPENSSLLIB} -lssl -lcrypto"
-				CONFIGURE_ARGS+=	--with-openssl
-
-			EOF
-			;;
-		\"KRB5\")
-			KRB5=1
-			;;
-		\"nothing\"|true)
-			;;
-		*)
-			echo "Invalid option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-    shift
-done
-
-exec > /dev/stderr
-
-# if multibyte, determine charset
-echo "# Multibyte" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-if [ ! "${MULTIBYTE}" ]; then
-	echo "WITHOUT_MULTIBYTE=YES" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-else
-	if [ "${BATCH}" ]; then
-		set "nothing"
-	else
-		/usr/bin/dialog --title "configuration options" --clear \
-						--radiolist "\n\
-Please select desired options:" -1 -1 16 \
-EUC_JP        "EUC_JP" ON  \
-SQL_ASCII     "SQL_ASCII" OFF \
-LATIN1        "LATIN1" OFF \
-LATIN2        "LATIN2" OFF \
-LATIN3        "LATIN3" OFF \
-LATIN4        "LATIN4" OFF \
-LATIN5        "LATIN5" OFF \
-EUC_KR        "EUC_KR" OFF \
-EUC_TW        "EUC_TW" OFF \
-KOI8          "KOI8" OFF \
-UNICODE       "UNICODE" OFF \
-MULE_INTERNAL "MULE_INTERNAL" OFF \
-WIN           "WIN" OFF \
-ALT           "ALT" OFF \
-2> /tmp/checklist.tmp.$$
-
-		retval=$?
-
-		if [ -s /tmp/checklist.tmp.$$ ]; then
-			set `cat /tmp/checklist.tmp.$$`
-		fi
-		rm -f /tmp/checklist.tmp.$$
-		if [ $retval = 1 ]; then
-			echo "Cancel pressed."
-			rm ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
-		fi
-	fi
-
-    if [ "$1" = "nothing" ]; then
-		echo "CONFIGURE_ARGS+=	--enable-multibyte" \
-			>> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	else
-		echo "CONFIGURE_ARGS+=	--enable-multibyte=$1" \
-			>> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	fi
-fi
-echo
-
-if [ "${TCL}" ]; then
-	echo "# TCL" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	if [ "${BATCH}" ]; then
-		echo WITH_TCL=8.0jp  >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	else
-		dialog --title "TCL version" \
-			   --inputbox "Please enter japanese TCL version. Default is 8.0jp." -1 -1 "8.0jp" \
-			2> /tmp/checklist.tmp.$$
-		retval=$?
-		if [ -s /tmp/checklist.tmp.$$ ]; then
-			set `cat /tmp/checklist.tmp.$$`
-		fi
-		rm -f /tmp/checklist.tmp.$$
-		case $retval in
-			0)	if [ -z "$*" ]; then
-					echo "Nothing selected"
-				fi
-				;;
-			1)	echo "Cancel pressed."
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-				;;
-		esac
-		echo WITH_TCL=\"$1\" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	fi
-	cat <<-EOF >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-		CONFIGURE_ARGS+= --with-tcl --with-tclconfig="\${TCLCONFIG}"
-		TCLV=\${WITH_TCL:S/.//}
-		TCLP=\${TCLV:S/jp//}
-		TCL_INCDIR=		\${LOCALBASE}/include/tcl\${WITH_TCL}
-		MAKE_ENV+=		TCL_INCDIR=\${TCL_INCDIR}
-		LIB_DEPENDS+=	tcl\${TCLV}:\${PORTSDIR}/japanese/tcl\${TCLP}
-		TCLCONFIG=		"\${LOCALBASE}/lib/tcl\${WITH_TCL}"
-		.if defined(WITH_TK)
-		CONFIGURE_ARGS+= --with-tkconfig="\${TKCONFIG}"
-		TK_INCDIR=		\${LOCALBASE}/include/tk\${WITH_TCL}
-		CONFIGURE_ENV+=	WISH=\${LOCALBASE}/bin/wish\${WITH_TCL}
-		LIB_DEPENDS+=	tk\${TCLV}:\${PORTSDIR}/japanese/tk\${TCLP}
-		TKCONFIG=		"\${LOCALBASE}/lib/tk\${WITH_TCL}"
-		TCLCONFIG+=		\${TKCONFIG}
-		TCL_PLIST=     pkg-plist.tcl
-		.else
-		TCL_PLIST=     pkg-plist.notk
-		CONFIGURE_ARGS+=        --without-tk
-		.endif
-
-	EOF
-fi
-
-if [ "${KRB5}" ]; then
-	if [ "${BATCH}" ]; then
-		# never gets here, but what the heck...
-		echo KRB5_HOME=\${LOCALBASE} >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	else
-		dialog --inputbox "Please enter the KRB5_HOME path" -1 -1 "${KRB_HOME:-${LOCALBASE}}" \
-			2> /tmp/checklist.tmp.$$
-		retval=$?
-		if [ -s /tmp/checklist.tmp.$$ ]; then
-			set `cat /tmp/checklist.tmp.$$`
-		fi
-		rm -f /tmp/checklist.tmp.$$
-		case $retval in
-			0)	if [ -z "$*" ]; then
-					echo "No input"
-				fi
-				;;
-			1)	echo "Cancel pressed."
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-				;;
-		esac
-		echo KRB5_HOME=\"$1\" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	fi
-	cat <<-EOF >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-		.if defined(KRB5_HOME) && exists(\${KRB5_HOME})
-		CONFIGURE_KRB=	--with-krb5=\${KRB5_HOME}
-		.endif
-
-	EOF
-fi